From a0f50936358898177f2e36edcb7fadc290e47be8 Mon Sep 17 00:00:00 2001
From: Vanessasaurus <814322+vsoch@users.noreply.github.com>
Date: Fri, 3 Jun 2022 02:56:15 -0600
Subject: [PATCH 001/734] Bump urlchecker-action version (#2101)

---
 .github/workflows/documentation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
index 3c1211b7b36..60e51d900b2 100644
--- a/.github/workflows/documentation.yaml
+++ b/.github/workflows/documentation.yaml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Check URLs in files
-        uses: urlstechie/urlchecker-action@0.2.31
+        uses: urlstechie/urlchecker-action@0.0.27
         with:
           exclude_patterns: localhost,127.0.,192.168.
           exclude_urls: https://api.server,https://graph.microsoft.com/User.Read,https://dev-a63ggcut.auth0.com/

From 8aea5ca2d24afd29e5a224dd3cb0ae86e224159e Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 3 Jun 2022 13:07:05 +0400
Subject: [PATCH 002/734] Fix helm icon URL (#2060)

---
 charts/kafka-ui/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index f1be768f337..822f089f2b0 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -4,4 +4,4 @@ description: A Helm chart for kafka-UI
 type: application
 version: 0.0.3
 appVersion: latest
-icon: https://github.com/provectus/kafka-ui/raw/master/images/kafka-ui-logo.png
+icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

From 801aeec6665c353dd132f0466e704c862a6f8c64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jun 2022 13:23:39 +0300
Subject: [PATCH 003/734] Bump eslint from 8.15.0 to 8.16.0 in
 /kafka-ui-react-app (#2071)

Bumps [eslint](https://github.com/eslint/eslint) from 8.15.0 to 8.16.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.15.0...v8.16.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/package-lock.json | 120 +++++++--------------------
 1 file changed, 30 insertions(+), 90 deletions(-)

diff --git a/kafka-ui-react-app/package-lock.json b/kafka-ui-react-app/package-lock.json
index 20f1c48d384..0a87d3d00c5 100644
--- a/kafka-ui-react-app/package-lock.json
+++ b/kafka-ui-react-app/package-lock.json
@@ -5471,14 +5471,14 @@
       "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz",
-      "integrity": "sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
         "espree": "^9.3.2",
-        "globals": "^13.9.0",
+        "globals": "^13.15.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -5525,14 +5525,6 @@
         }
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -8320,15 +8312,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -12736,11 +12719,11 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz",
-      "integrity": "sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
+      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
       "dependencies": {
-        "@eslint/eslintrc": "^1.2.3",
+        "@eslint/eslintrc": "^1.3.0",
         "@humanwhocodes/config-array": "^0.9.2",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
@@ -12758,7 +12741,7 @@
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
         "glob-parent": "^6.0.1",
-        "globals": "^13.6.0",
+        "globals": "^13.15.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
@@ -14369,14 +14352,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/eslint/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/eslint/node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -15655,9 +15630,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.14.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.14.0.tgz",
-      "integrity": "sha512-ERO68sOYwm5UuLvSJTY7w7NP2c8S4UcXs3X1GBX8cwOr+ShOcDBbCY5mH4zxz0jsYCdJ8ve8Mv9n2YGJMB1aeg==",
+      "version": "13.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
+      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -15688,15 +15663,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/globby/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -16229,10 +16195,9 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "dev": true,
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "engines": {
         "node": ">= 4"
       }
@@ -33982,14 +33947,14 @@
       "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
     },
     "@eslint/eslintrc": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz",
-      "integrity": "sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
         "espree": "^9.3.2",
-        "globals": "^13.9.0",
+        "globals": "^13.15.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -34021,11 +33986,6 @@
             "ms": "2.1.2"
           }
         },
-        "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
-        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -36084,12 +36044,6 @@
             "slash": "^3.0.0"
           }
         },
-        "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -39392,11 +39346,11 @@
       }
     },
     "eslint": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz",
-      "integrity": "sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
+      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
       "requires": {
-        "@eslint/eslintrc": "^1.2.3",
+        "@eslint/eslintrc": "^1.3.0",
         "@humanwhocodes/config-array": "^0.9.2",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
@@ -39414,7 +39368,7 @@
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
         "glob-parent": "^6.0.1",
-        "globals": "^13.6.0",
+        "globals": "^13.15.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
@@ -39489,11 +39443,6 @@
             "is-glob": "^4.0.3"
           }
         },
-        "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
-        },
         "js-yaml": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -41480,9 +41429,9 @@
       }
     },
     "globals": {
-      "version": "13.14.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.14.0.tgz",
-      "integrity": "sha512-ERO68sOYwm5UuLvSJTY7w7NP2c8S4UcXs3X1GBX8cwOr+ShOcDBbCY5mH4zxz0jsYCdJ8ve8Mv9n2YGJMB1aeg==",
+      "version": "13.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
+      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
       "requires": {
         "type-fest": "^0.20.2"
       }
@@ -41499,14 +41448,6 @@
         "ignore": "^5.2.0",
         "merge2": "^1.4.1",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-          "dev": true
-        }
       }
     },
     "graceful-fs": {
@@ -41899,10 +41840,9 @@
       "dev": true
     },
     "ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-      "dev": true
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
     },
     "immer": {
       "version": "9.0.12",

From 4b70cbbde4b0f23dc6d010841fe5020536a23e4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jun 2022 13:24:13 +0300
Subject: [PATCH 004/734] Bump @types/react-dom from 18.0.3 to 18.0.5 in
 /kafka-ui-react-app (#2072)

Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 18.0.3 to 18.0.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom)

---
updated-dependencies:
- dependency-name: "@types/react-dom"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/package-lock.json | 32 ++++++----------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/kafka-ui-react-app/package-lock.json b/kafka-ui-react-app/package-lock.json
index 0a87d3d00c5..3e54ab370e7 100644
--- a/kafka-ui-react-app/package-lock.json
+++ b/kafka-ui-react-app/package-lock.json
@@ -7249,14 +7249,6 @@
         "react-dom": "^18.0.0"
       }
     },
-    "node_modules/@testing-library/react/node_modules/@types/react-dom": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.3.tgz",
-      "integrity": "sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ==",
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
     "node_modules/@testing-library/user-event": {
       "version": "13.5.0",
       "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
@@ -7614,10 +7606,9 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.3.tgz",
-      "integrity": "sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ==",
-      "dev": true,
+      "version": "18.0.5",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
+      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
       "dependencies": {
         "@types/react": "*"
       }
@@ -35213,16 +35204,6 @@
         "@babel/runtime": "^7.12.5",
         "@testing-library/dom": "^8.5.0",
         "@types/react-dom": "^18.0.0"
-      },
-      "dependencies": {
-        "@types/react-dom": {
-          "version": "18.0.3",
-          "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.3.tgz",
-          "integrity": "sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ==",
-          "requires": {
-            "@types/react": "*"
-          }
-        }
       }
     },
     "@testing-library/user-event": {
@@ -35569,10 +35550,9 @@
       }
     },
     "@types/react-dom": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.3.tgz",
-      "integrity": "sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ==",
-      "dev": true,
+      "version": "18.0.5",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
+      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
       "requires": {
         "@types/react": "*"
       }

From c1bdbec2b2d9158c9c210f77748d330812e28e2a Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 3 Jun 2022 16:36:06 +0400
Subject: [PATCH 005/734] Fix basic auth logout page (#2106)

---
 .../config/auth/BasicAuthSecurityConfig.java  | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
index 4ee3e53b5b5..6bd56a877fe 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
@@ -1,14 +1,18 @@
 package com.provectus.kafka.ui.config.auth;
 
 import com.provectus.kafka.ui.util.EmptyRedirectStrategy;
+import java.net.URI;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
+import org.springframework.security.config.web.server.SecurityWebFiltersOrder;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 import org.springframework.security.web.server.authentication.RedirectServerAuthenticationSuccessHandler;
+import org.springframework.security.web.server.authentication.logout.RedirectServerLogoutSuccessHandler;
+import org.springframework.security.web.server.ui.LogoutPageGeneratingWebFilter;
 
 @Configuration
 @EnableWebFluxSecurity
@@ -16,25 +20,28 @@
 @Log4j2
 public class BasicAuthSecurityConfig extends AbstractAuthSecurityConfig {
 
+  public static final String LOGIN_URL = "/auth";
+  public static final String LOGOUT_URL = "/auth?logout";
+
   @Bean
   public SecurityWebFilterChain configure(ServerHttpSecurity http) {
     log.info("Configuring LOGIN_FORM authentication.");
-    http.authorizeExchange()
-        .pathMatchers(AUTH_WHITELIST)
-        .permitAll()
-        .anyExchange()
-        .authenticated();
-
-    final RedirectServerAuthenticationSuccessHandler handler = new RedirectServerAuthenticationSuccessHandler();
-    handler.setRedirectStrategy(new EmptyRedirectStrategy());
-
-    http
-        .httpBasic().and()
-        .formLogin()
-        .loginPage("/auth")
-        .authenticationSuccessHandler(handler);
-
-    return http.csrf().disable().build();
+
+    final var authHandler = new RedirectServerAuthenticationSuccessHandler();
+    authHandler.setRedirectStrategy(new EmptyRedirectStrategy());
+
+    final var logoutSuccessHandler = new RedirectServerLogoutSuccessHandler();
+    logoutSuccessHandler.setLogoutSuccessUrl(URI.create(LOGOUT_URL));
+
+    return http
+        .addFilterAfter(new LogoutPageGeneratingWebFilter(), SecurityWebFiltersOrder.REACTOR_CONTEXT)
+        .csrf().disable()
+        .authorizeExchange()
+        .pathMatchers(AUTH_WHITELIST).permitAll()
+        .anyExchange().authenticated()
+        .and().formLogin().loginPage(LOGIN_URL).authenticationSuccessHandler(authHandler)
+        .and().logout().logoutSuccessHandler(logoutSuccessHandler)
+        .and().build();
   }
 
 }

From 0f0d51d386034d2822f8b8a91496962a31ed647a Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 6 Jun 2022 11:34:32 +0400
Subject: [PATCH 006/734] fixing problem of endless loading after deleting
 multiple topics (#2095)

---
 .../src/redux/reducers/topics/__test__/reducer.spec.ts           | 1 +
 kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
index c4a0657970a..70d85d46dc4 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
@@ -557,6 +557,7 @@ describe('topics Slice', () => {
           { type: deleteTopics.pending.type },
           { type: deleteTopic.pending.type },
           { type: deleteTopic.pending.type },
+          { type: fetchTopicsList.pending.type },
           { type: deleteTopics.fulfilled.type },
         ]);
       });
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
index dfeb437b242..525f7548419 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
@@ -313,6 +313,7 @@ export const deleteTopics = createAsyncThunk<
     topicNames.forEach((topicName) => {
       dispatch(deleteTopic({ clusterName, topicName }));
     });
+    dispatch(fetchTopicsList({ clusterName }));
 
     return undefined;
   } catch (err) {

From c64519c2c1b724306b8a76c2908c586e6e20acd4 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 6 Jun 2022 11:41:57 +0400
Subject: [PATCH 007/734] fixing connector task count to work without refresh
 (#2099)

---
 .../src/redux/reducers/connect/__test__/reducer.spec.ts         | 1 +
 kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/redux/reducers/connect/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/connect/__test__/reducer.spec.ts
index 3630753b716..61e422d8670 100644
--- a/kafka-ui-react-app/src/redux/reducers/connect/__test__/reducer.spec.ts
+++ b/kafka-ui-react-app/src/redux/reducers/connect/__test__/reducer.spec.ts
@@ -726,6 +726,7 @@ describe('Connect slice', () => {
           );
           expect(getTypeAndPayload(store)).toEqual([
             { type: updateConnectorConfig.pending.type, payload: undefined },
+            { type: fetchConnector.pending.type },
             ...getAlertActions(store),
             {
               type: updateConnectorConfig.fulfilled.type,
diff --git a/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts b/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts
index 9402b3c2e8c..4b0299a6191 100644
--- a/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts
@@ -322,7 +322,7 @@ export const updateConnectorConfig = createAsyncThunk<
         connectorName,
         requestBody: connectorConfig,
       });
-
+      dispatch(fetchConnector({ clusterName, connectName, connectorName }));
       dispatch(
         showSuccessAlert({
           id: `connector-${connectorName}-${clusterName}`,

From 7db40577b5745e241071a47696838553fd875ccb Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 6 Jun 2022 11:49:30 +0400
Subject: [PATCH 008/734] fixing schema version path issue (#2100)

---
 kafka-ui-react-app/src/components/Schemas/Details/Details.tsx | 4 ++--
 kafka-ui-react-app/src/components/Schemas/Schemas.tsx         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index ae11da54b0c..e54683decbd 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -3,7 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import {
   ClusterSubjectParam,
   clusterSchemaEditPageRelativePath,
-  clusterSchemaSchemaDiffRelativePath,
+  clusterSchemaSchemaDiffPageRelativePath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
@@ -90,7 +90,7 @@ const Details: React.FC = () => {
               buttonSize="M"
               buttonType="primary"
               to={{
-                pathname: clusterSchemaSchemaDiffRelativePath,
+                pathname: clusterSchemaSchemaDiffPageRelativePath,
                 search: `leftVersion=${versions[0]?.version}&rightVersion=${versions[0]?.version}`,
               }}
             >
diff --git a/kafka-ui-react-app/src/components/Schemas/Schemas.tsx b/kafka-ui-react-app/src/components/Schemas/Schemas.tsx
index e98cd333754..45facd46a9e 100644
--- a/kafka-ui-react-app/src/components/Schemas/Schemas.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Schemas.tsx
@@ -3,6 +3,7 @@ import { Route, Routes } from 'react-router-dom';
 import {
   clusterSchemaEditRelativePath,
   clusterSchemaNewRelativePath,
+  clusterSchemaSchemaDiffRelativePath,
   RouteParams,
 } from 'lib/paths';
 import List from 'components/Schemas/List/List';
@@ -48,7 +49,7 @@ const Schemas: React.FC = () => {
         }
       />
       <Route
-        path={clusterSchemaEditRelativePath}
+        path={clusterSchemaSchemaDiffRelativePath}
         element={
           <BreadcrumbRoute>
             <DiffContainer />

From 657025dfd46cad53a22592e6e0d083191c18b3ad Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 6 Jun 2022 12:14:48 +0400
Subject: [PATCH 009/734] adding success alert for topic recreation and fixed
 select arrow position (#2104)

---
 .../components/common/Icons/DropdownArrowIcon.tsx    |  1 +
 .../redux/reducers/topics/__test__/reducer.spec.ts   | 12 ++++++++++++
 .../src/redux/reducers/topics/topicsSlice.ts         | 10 +++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx
index 22c783ac55a..f19a9b45ad2 100644
--- a/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx
@@ -13,6 +13,7 @@ const DropdownArrowIcon: React.FC<Props> = ({ isOpen }) => {
       width="24"
       height="24"
       fill="none"
+      style={{ position: 'absolute', right: '5px' }}
       stroke="currentColor"
       strokeWidth="2"
       color={theme.icons.dropdownArrowIcon}
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
index 70d85d46dc4..9a3bc5c8db2 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
@@ -585,6 +585,18 @@ describe('topics Slice', () => {
 
         expect(getTypeAndPayload(store)).toEqual([
           { type: recreateTopic.pending.type },
+          { type: showSuccessAlert.pending.type },
+          {
+            type: alertAdded.type,
+            payload: {
+              id: 'message-topic-local',
+              title: '',
+              type: 'success',
+              createdAt: global.Date.now(),
+              message: 'Topic successfully recreated!',
+            },
+          },
+          { type: showSuccessAlert.fulfilled.type },
           {
             type: recreateTopic.fulfilled.type,
             payload: { [topicName]: { ...recreateResponse } },
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
index 525f7548419..55c2f267199 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
@@ -220,9 +220,17 @@ export const deleteTopic = createAsyncThunk<
 export const recreateTopic = createAsyncThunk<
   { topic: Topic },
   RecreateTopicRequest
->('topic/recreateTopic', async (payload, { rejectWithValue }) => {
+>('topic/recreateTopic', async (payload, { rejectWithValue, dispatch }) => {
   try {
+    const { topicName, clusterName } = payload;
     const topic = await topicsApiClient.recreateTopic(payload);
+    dispatch(
+      showSuccessAlert({
+        id: `message-${topicName}-${clusterName}`,
+        message: 'Topic successfully recreated!',
+      })
+    );
+
     return { topic };
   } catch (err) {
     return rejectWithValue(await getResponse(err as Response));

From 070fba4d08c7667b3b21bfb77a4ab3066c91fafb Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 6 Jun 2022 12:32:47 +0400
Subject: [PATCH 010/734] Using new API endpoint for KSQLDB instead of
 deprecated one (#2098)

* using new API endpoint for KSQLDB instead of deprecated one

* adding type and interface for header and accessors
---
 .../src/components/KsqlDb/List/List.tsx       |  9 ++++++++-
 .../src/components/KsqlDb/List/ListItem.tsx   |  8 +++++---
 .../KsqlDb/List/__test__/ListItem.spec.tsx    |  5 +++--
 .../src/redux/interfaces/ksqlDb.ts            | 19 ++++++++++++++++---
 .../src/redux/reducers/ksqlDb/ksqlDbSlice.ts  | 19 +++++++++++++------
 5 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
index 1c0d5ffcc1c..8a0e2b42a9c 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
@@ -11,8 +11,15 @@ import PageHeading from 'components/common/PageHeading/PageHeading';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { Button } from 'components/common/Button/Button';
+import { KsqlDescription } from 'redux/interfaces/ksqlDb';
 
-const headers = [
+export type KsqlDescriptionAccessor = keyof KsqlDescription;
+
+interface HeadersType {
+  Header: string;
+  accessor: KsqlDescriptionAccessor;
+}
+const headers: HeadersType[] = [
   { Header: 'Type', accessor: 'type' },
   { Header: 'Name', accessor: 'name' },
   { Header: 'Topic', accessor: 'topic' },
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx
index 65390caa2cc..59ec84095e7 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx
@@ -1,14 +1,16 @@
 import React from 'react';
+import { KsqlDescription } from 'redux/interfaces/ksqlDb';
+import { KsqlDescriptionAccessor } from 'components/KsqlDb/List/List';
 
 interface Props {
-  accessors: string[];
-  data: Record<string, string>;
+  accessors: KsqlDescriptionAccessor[];
+  data: KsqlDescription;
 }
 
 const ListItem: React.FC<Props> = ({ accessors, data }) => {
   return (
     <tr>
-      {accessors.map((accessor: string) => (
+      {accessors.map((accessor) => (
         <td key={accessor}>{data[accessor]}</td>
       ))}
     </tr>
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/ListItem.spec.tsx
index 0942ee89185..9014d06d4f2 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/ListItem.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/ListItem.spec.tsx
@@ -3,6 +3,7 @@ import { clusterKsqlDbPath } from 'lib/paths';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/dom';
 import ListItem from 'components/KsqlDb/List/ListItem';
+import { KsqlDescription } from 'redux/interfaces/ksqlDb';
 
 const clusterName = 'local';
 
@@ -10,7 +11,7 @@ const renderComponent = ({
   accessors,
   data,
 }: {
-  accessors: string[];
+  accessors: (keyof KsqlDescription)[];
   data: Record<string, string>;
 }) => {
   render(
@@ -24,7 +25,7 @@ const renderComponent = ({
 describe('KsqlDb List Item', () => {
   it('renders placeholder on one data', async () => {
     renderComponent({
-      accessors: ['accessors'],
+      accessors: ['accessors' as keyof KsqlDescription],
       data: { accessors: 'accessors text' },
     });
 
diff --git a/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts b/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
index 2290fb3ac88..93c53733681 100644
--- a/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
@@ -1,4 +1,8 @@
-import { KsqlCommandV2Response } from 'generated-sources';
+import {
+  KsqlCommandV2Response,
+  KsqlStreamDescription,
+  KsqlTableDescription,
+} from 'generated-sources';
 
 export interface KsqlTables {
   data: {
@@ -8,7 +12,16 @@ export interface KsqlTables {
 }
 
 export interface KsqlState {
-  tables: Dictionary<string>[];
-  streams: Dictionary<string>[];
+  tables: KsqlTableDescription[];
+  streams: KsqlStreamDescription[];
   executionResult: KsqlCommandV2Response | null;
 }
+
+export interface KsqlDescription {
+  type?: string;
+  name?: string;
+  topic?: string;
+  keyFormat?: string;
+  valueFormat?: string;
+  isWindowed?: boolean;
+}
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
index 33f65a81759..84dd356606f 100644
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
@@ -26,15 +26,13 @@ export const transformKsqlResponse = (
   );
 
 const getTables = (clusterName: ClusterName) =>
-  ksqlDbApiClient.executeKsqlCommand({
+  ksqlDbApiClient.listTables({
     clusterName,
-    ksqlCommand: { ksql: 'SHOW TABLES;' },
   });
 
 const getStreams = (clusterName: ClusterName) =>
-  ksqlDbApiClient.executeKsqlCommand({
+  ksqlDbApiClient.listStreams({
     clusterName,
-    ksqlCommand: { ksql: 'SHOW STREAMS;' },
   });
 
 export const fetchKsqlDbTables = createAsyncThunk(
@@ -45,9 +43,18 @@ export const fetchKsqlDbTables = createAsyncThunk(
       getStreams(clusterName),
     ]);
 
+    const processedTables = tables.map((table) => ({
+      type: 'TABLE',
+      ...table,
+    }));
+    const processedStreams = streams.map((stream) => ({
+      type: 'STREAM',
+      ...stream,
+    }));
+
     return {
-      tables: tables.data ? transformKsqlResponse(tables.data) : [],
-      streams: streams.data ? transformKsqlResponse(streams.data) : [],
+      tables: processedTables,
+      streams: processedStreams,
     };
   }
 );

From 1ca8873d35af5e3f130026d056aa26d88c0cc643 Mon Sep 17 00:00:00 2001
From: Kirill Morozov <grifx.design@gmail.com>
Date: Mon, 6 Jun 2022 14:18:10 +0300
Subject: [PATCH 011/734] Added buttons wrapping (#2126)

* Added buttons wrapping

* Layout improved
---
 .../src/components/Connect/Details/Actions/Actions.tsx         | 2 ++
 .../src/components/common/PageHeading/PageHeading.tsx          | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index db26a27deee..4c855859594 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -14,6 +14,8 @@ import { Button } from 'components/common/Button/Button';
 
 const ConnectorActionsWrapperStyled = styled.div`
   display: flex;
+  flex-wrap: wrap;
+  align-items: center;
   gap: 8px;
 `;
 
diff --git a/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.tsx b/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.tsx
index 426532ef4cc..da9903067fb 100644
--- a/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.tsx
+++ b/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.tsx
@@ -21,11 +21,10 @@ const PageHeading: React.FC<PropsWithChildren<Props>> = ({
 };
 
 export default styled(PageHeading)`
-  height: 56px;
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 0px 16px;
+  padding: 16px;
 
   & > div {
     display: flex;

From e5f2df86dd4f395f649943971dcf420e25aa3875 Mon Sep 17 00:00:00 2001
From: sbritprovectus <85669187+sbritprovectus@users.noreply.github.com>
Date: Mon, 6 Jun 2022 21:05:43 +0300
Subject: [PATCH 012/734] Fix e2e tests (#1543)

* Fix tests. Change folders structure

* Activate tests

* Update selenoid.yaml, broesers.json. Add pull of selenoid browser image.

* Change method of pulling chrome image

* Fix browsers.json and return the pulling of browser image

* Update pom.

* Update pom

* Fix pom

* Fix java version in pom

* Migrate to selenium containers

* Return selenoid container. Fix using of BASE_URL

* Delete video recording for Selenoid container

* expose kafka-ui port

Signed-off-by: Roman Zabaluev <rzabaluev@provectus.com>

* Fix tests run

* Delete comment from workflow file

* Stop using containers and migrate to WDM.

* Delete comments. Update dependencies.

* Comment using of  TestConfiguration.BASE_URL.replace("localhost", "host.docker.internal");

* Retern changes

* Clean code

* Update e2e-checks.yaml

* Update e2e-checks.yaml

* Fix skip test parameter in tests project

* Delete host.docker.internal in base tests

* Return previous usage of testcontainers

* Delete base url configuration

* Revert versions in pom.xml

* Return some values

* Small fixes for stabilize tests

* Trying to fix tests running on github

* Update base test

* Fix selenide url

Signed-off-by: Roman Zabaluev <rzabaluev@provectus.com>

* Fix selenide url

Signed-off-by: Roman Zabaluev <rzabaluev@provectus.com>

* test stuff

Signed-off-by: Roman Zabaluev <rzabaluev@provectus.com>

* added extra-hosts host.docker.internal:host-gateway

* added extra-hosts host.docker.internal:host-gateway

* added extra-hosts host.docker.internal:host-gateway

* added command --add-host

* separate driver container

* small refactoring, change selenoid to BrowserWebDriverContainer

* changed in BaseTest port from 8678 to 8080

* changed tests with xpath and added additional actions (click javascrip, click with action)

* added issue to allure reporting

* provided fix for connectors tests

* deleted afterAll annotation

* fixed tests with ConnectorsTests

* fixed tests with Topics

* removed commented action with click

* Revert unnecessary changes

* Fix workflow

* added @Disabled for test- update topic dui to issue https://github.com/provectus/kafka-ui/issues/1500

* removed dependency, testconteiners version

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: kshpilchyna <kshpilchyna@provectus.com>
---
 .github/workflows/e2e-checks.yaml             |   6 +-
 .../compose/kafka-ui-connectors.yaml          |   2 +-
 kafka-ui-e2e-checks/README.md                 |   7 +-
 kafka-ui-e2e-checks/docker/selenoid.yaml      |  10 +-
 kafka-ui-e2e-checks/pom.xml                   |  25 +-
 kafka-ui-e2e-checks/screenshots/main.png      | Bin 232054 -> 38538 bytes
 .../selenoid/config/browsers.json             |  10 +-
 .../config_for_create_connector.json          |  33 +--
 .../config_for_create_connector_via_api.json  |  21 +-
 .../config_for_update_connector.json          |  33 +--
 .../resources/delete_connector_config.json    |   2 +-
 .../com/provectus/kafka/ui/SmokeTests.java    |   5 -
 .../com/provectus/kafka/ui/base/BaseTest.java | 160 ++++++-------
 .../kafka/ui/base/TestConfiguration.java      |  11 +-
 .../provectus/kafka/ui/helpers/ApiHelper.java |  63 +++--
 .../kafka/ui/pages/ConnectorCreateView.java   |  36 ---
 .../kafka/ui/pages/ConnectorUpdateView.java   |  25 --
 .../kafka/ui/pages/ConnectorsView.java        |  41 ----
 .../provectus/kafka/ui/pages/MainPage.java    |  91 ++++---
 .../com/provectus/kafka/ui/pages/Pages.java   |   5 +
 .../provectus/kafka/ui/pages/TopicView.java   | 111 ---------
 .../provectus/kafka/ui/pages/TopicsList.java  |  47 ----
 .../pages/connector/ConnectorCreateView.java  |  42 ++++
 .../pages/connector/ConnectorUpdateView.java  |  47 ++++
 .../pages/{ => connector}/ConnectorsList.java |  32 +--
 .../ui/pages/connector/ConnectorsView.java    |  43 ++++
 .../topic/TopicCreateEditSettingsView.java    | 224 ++++++++++++++++++
 .../kafka/ui/pages/topic/TopicView.java       |  72 ++++++
 .../kafka/ui/pages/topic/TopicsList.java      |  64 +++++
 .../kafka/ui/tests/ConnectorsTests.java       |  73 +++---
 .../provectus/kafka/ui/tests/TopicTests.java  |  67 +++---
 .../kafka/ui/utils/BrowserUtils.java          |  23 ++
 pom.xml                                       |   2 +-
 33 files changed, 882 insertions(+), 551 deletions(-)
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorCreateView.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorUpdateView.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorsView.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicView.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicsList.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
 rename kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/{ => connector}/ConnectorsList.java (56%)
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/utils/BrowserUtils.java

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 574aa922adf..9117dffb245 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -27,9 +27,9 @@ jobs:
         run: |
           cat "./kafka-ui-e2e-checks/.env.ci" >> "./kafka-ui-e2e-checks/.env"
       - name: pull docker
-        id: pull_selenoid
+        id: pull_chrome
         run: |
-          docker pull selenoid/vnc:chrome_86.0
+          docker pull selenium/standalone-chrome
       - name: Set up JDK 1.13
         uses: actions/setup-java@v1
         with:
@@ -38,7 +38,7 @@ jobs:
         id: build_app
         run: |
           mvn versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          mvn clean package -DskipTests ${{ github.event.inputs.extraMavenOptions }}
+          mvn clean package -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
       - name: compose app
         id: compose_app
         # use the following command until #819 will be fixed
diff --git a/documentation/compose/kafka-ui-connectors.yaml b/documentation/compose/kafka-ui-connectors.yaml
index 4b3d4e42755..c8e48860a97 100644
--- a/documentation/compose/kafka-ui-connectors.yaml
+++ b/documentation/compose/kafka-ui-connectors.yaml
@@ -1,5 +1,5 @@
 ---
-version: '2'
+version: '3.5'
 services:
 
   kafka-ui:
diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index 25be125c30b..a970ef38dd2 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -55,7 +55,12 @@ docker-compose -f kafka-ui.yaml up -d
 cd kafka-ui-e2e-checks/docker
 docker-compose -f selenoid.yaml up -d
 ```
-3. Run checks 
+3. Compile `kafka-ui-contract` project
+```
+cd <projectRoot>/kafka-ui-contract
+mvn clean compile
+```
+4. Run checks 
 ```
 cd kafka-ui-e2e-checks
 mvn test
diff --git a/kafka-ui-e2e-checks/docker/selenoid.yaml b/kafka-ui-e2e-checks/docker/selenoid.yaml
index 5e9bc170b26..df2f0955069 100644
--- a/kafka-ui-e2e-checks/docker/selenoid.yaml
+++ b/kafka-ui-e2e-checks/docker/selenoid.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
   selenoid:
     network_mode: bridge
-    image: aerokube/selenoid:1.10.3
+    image: aerokube/selenoid:1.10.7
     volumes:
       - "../selenoid/config:/etc/selenoid"
       - "/var/run/docker.sock:/var/run/docker.sock"
@@ -22,4 +22,10 @@ services:
       - selenoid
     ports:
       - "8081:8080"
-    command: [ "--selenoid-uri", "http://selenoid:4444" ]
+    command: [ "--selenoid-uri", "http://localhost:4444" ]
+
+  selenoid-chrome:
+    network_mode: bridge
+    image: selenoid/vnc:chrome_96.0
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 5c74d9b28d5..4148cf368b6 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -14,18 +14,18 @@
         <kafka-ui-contract>${project.version}</kafka-ui-contract>
         <junit.version>5.8.2</junit.version>
         <aspectj.version>1.9.8</aspectj.version>
-        <allure.version>2.17.1</allure.version>
+        <allure.version>2.17.2</allure.version>
         <json-smart.version>1.3.3</json-smart.version>
-        <testcontainers.version>1.15.2</testcontainers.version>
-        <selenide.version>5.16.2</selenide.version>
+        <testcontainers.version>1.16.3</testcontainers.version>
+        <selenide.version>6.3.0</selenide.version>
         <assertj.version>3.17.1</assertj.version>
         <google.auto-service.version>1.0-rc7</google.auto-service.version>
         <hamcrest.version>2.2</hamcrest.version>
         <slf4j.version>1.7.32</slf4j.version>
-        <testcontainers.junit-jupiter.version>1.15.1</testcontainers.junit-jupiter.version>
-        <allure.java-commons.version>2.13.6</allure.java-commons.version>
+        <testcontainers.junit-jupiter.version>1.16.3</testcontainers.junit-jupiter.version>
+        <allure.java-commons.version>2.17.2</allure.java-commons.version>
         <dotenv.version>2.2.0</dotenv.version>
-        <junit.platform-launcher.version>1.6.2</junit.platform-launcher.version>
+        <junit.platform-launcher.version>1.8.2</junit.platform-launcher.version>
         <allure.maven-plugin.version>2.6</allure.maven-plugin.version>
         <ashot.version>1.5.4</ashot.version>
         <allure.screendiff-plugin.version>2.17.2</allure.screendiff-plugin.version>
@@ -236,6 +236,12 @@
             <version>${kafka-ui-contract}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>selenium</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -275,6 +281,13 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${maven.surefire-plugin.version}</version>
                         <configuration>
+                            <testFailureIgnore>false</testFailureIgnore>
+                            <systemProperties>
+                                <property>
+                                    <name>junit.jupiter.extensions.autodetection.enabled</name>
+                                    <value>true</value>
+                                </property>
+                            </systemProperties>
                             <argLine>
                                 -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
                             </argLine>
diff --git a/kafka-ui-e2e-checks/screenshots/main.png b/kafka-ui-e2e-checks/screenshots/main.png
index 694cc5cb1d50ea0d226e57cc45fddffea68829d8..be6817331461c99a6e8bbe403f7f57deca7320f3 100644
GIT binary patch
literal 38538
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

literal 232054
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
Ma_tJ^Cm9F-0g~JUM*si-

diff --git a/kafka-ui-e2e-checks/selenoid/config/browsers.json b/kafka-ui-e2e-checks/selenoid/config/browsers.json
index f22de7eca11..6387ffd1394 100644
--- a/kafka-ui-e2e-checks/selenoid/config/browsers.json
+++ b/kafka-ui-e2e-checks/selenoid/config/browsers.json
@@ -1,11 +1,11 @@
 {
   "chrome": {
-    "default": "86.0",
+    "default": "96.0",
     "versions": {
-      "86.0": {
-        "hosts": ["host.docker.internal:172.17.0.1"],
-        "image": "selenoid/vnc:chrome_86.0",
-        "port": "4444"
+      "96.0": {
+        "image": "selenoid/vnc_chrome:96.0",
+        "port": "4444",
+        "path": "/"
       }
     }
   }
diff --git a/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector.json b/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector.json
index 832c4ffb710..fbe9fea6551 100644
--- a/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector.json
+++ b/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector.json
@@ -1,17 +1,18 @@
 {
-"connector.class": "io.confluent.connect.jdbc.JdbcSinkConnector",
-"connection.url": "jdbc:postgresql://postgres-db:5432/test",
-"connection.user": "dev_user",
-"connection.password": "12345",
-"topics": "topic_for_connector",
-"table.name.format": "sink_activities_e2e_test_connector_creating",
-"key.converter": "org.apache.kafka.connect.storage.StringConverter",
-"key.converter.schema.registry.url": "http://schemaregistry0:8085",
-"value.converter": "org.apache.kafka.connect.json.JsonConverter",
-"value.converter.schema.registry.url": "http://schemaregistry0:8085",
-"auto.create": "true",
-"pk.mode": "record_value",
-"pk.fields": "id",
-"insert.mode": "upsert",
-"errors.log.enable": "true",
-"errors.log.include.messages": "true"
\ No newline at end of file
+  "connector.class": "io.confluent.connect.jdbc.JdbcSinkConnector",
+  "connection.url": "jdbc:postgresql://postgres-db:5432/test",
+  "connection.user": "dev_user",
+  "connection.password": "12345",
+  "topics": "topic_for_connector",
+  "table.name.format": "sink_activities_e2e_test_connector_creating",
+  "key.converter": "org.apache.kafka.connect.storage.StringConverter",
+  "key.converter.schema.registry.url": "http://schemaregistry0:8085",
+  "value.converter": "org.apache.kafka.connect.json.JsonConverter",
+  "value.converter.schema.registry.url": "http://schemaregistry0:8085",
+  "auto.create": "true",
+  "pk.mode": "record_value",
+  "pk.fields": "id",
+  "insert.mode": "upsert",
+  "errors.log.enable": "true",
+  "errors.log.include.messages": "true"
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector_via_api.json b/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector_via_api.json
index be759ed8c76..5c5b7aba84b 100644
--- a/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector_via_api.json
+++ b/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector_via_api.json
@@ -1,18 +1,7 @@
 {
-"connector.class": "io.confluent.connect.jdbc.JdbcSinkConnector",
-"connection.url": "jdbc:postgresql://postgres-db:5432/test",
-"connection.user": "dev_user",
-"connection.password": "12345",
-"topics": "topic_for_connector",
-"table.name.format": "sink_activities_e2e_test_connector_updating",
-"key.converter": "org.apache.kafka.connect.storage.StringConverter",
-"key.converter.schema.registry.url": "http://schemaregistry0:8085",
-"value.converter": "org.apache.kafka.connect.json.JsonConverter",
-"value.converter.schema.registry.url": "http://schemaregistry0:8085",
-"auto.create": "true",
-"pk.mode": "record_value",
-"pk.fields": "id",
-"insert.mode": "upsert",
-"errors.log.enable": "true",
-"errors.log.include.messages": "true"
+  "connector.class": "io.confluent.connect.jdbc.JdbcSinkConnector",
+  "connection.url": "jdbc:postgresql://postgres-db:5432/test",
+  "connection.user": "dev_user",
+  "connection.password": "12345",
+  "topics": "topic_for_connector"
 }
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/main/resources/config_for_update_connector.json b/kafka-ui-e2e-checks/src/main/resources/config_for_update_connector.json
index dce01cc6ccf..141b24b3d5d 100644
--- a/kafka-ui-e2e-checks/src/main/resources/config_for_update_connector.json
+++ b/kafka-ui-e2e-checks/src/main/resources/config_for_update_connector.json
@@ -1,17 +1,18 @@
 {
-"connector.class": "io.confluent.connect.jdbc.JdbcSinkConnector",
-"connection.url": "jdbc:postgresql://postgres-db:5432/test",
-"connection.user": "dev_user",
-"connection.password": "12345",
-"topics": "topic_for_update_connector",
-"table.name.format": "sink_activities_e2e_test_connector_updating",
-"key.converter": "org.apache.kafka.connect.storage.StringConverter",
-"key.converter.schema.registry.url": "http://schemaregistry0:8085",
-"value.converter": "org.apache.kafka.connect.json.JsonConverter",
-"value.converter.schema.registry.url": "http://schemaregistry0:8085",
-"auto.create": "true",
-"pk.mode": "record_value",
-"pk.fields": "id",
-"insert.mode": "upsert",
-"errors.log.enable": "true",
-"errors.log.include.messages": "true"
+  "connector.class": "io.confluent.connect.jdbc.JdbcSinkConnector",
+  "connection.url": "jdbc:postgresql://postgres-db:5432/test",
+  "connection.user": "dev_user",
+  "connection.password": "12345",
+  "topics": "topic_for_update_connector",
+  "table.name.format": "sink_activities_e2e_test_connector_updating",
+  "key.converter": "org.apache.kafka.connect.storage.StringConverter",
+  "key.converter.schema.registry.url": "http://schemaregistry0:8085",
+  "value.converter": "org.apache.kafka.connect.json.JsonConverter",
+  "value.converter.schema.registry.url": "http://schemaregistry0:8085",
+  "auto.create": "true",
+  "pk.mode": "record_value",
+  "pk.fields": "id",
+  "insert.mode": "upsert",
+  "errors.log.enable": "true",
+  "errors.log.include.messages": "true"
+}
diff --git a/kafka-ui-e2e-checks/src/main/resources/delete_connector_config.json b/kafka-ui-e2e-checks/src/main/resources/delete_connector_config.json
index ad696e5b827..c5adc99444e 100644
--- a/kafka-ui-e2e-checks/src/main/resources/delete_connector_config.json
+++ b/kafka-ui-e2e-checks/src/main/resources/delete_connector_config.json
@@ -9,7 +9,7 @@
   "key.converter.schema.registry.url": "http://schemaregistry0:8085",
   "value.converter": "org.apache.kafka.connect.json.JsonConverter",
   "value.converter.schema.registry.url": "http://schemaregistry0:8085",
-  "auto.create": "true",
+  "auto.create": "false",
   "pk.mode": "record_value",
   "pk.fields": "id",
   "insert.mode": "upsert",
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
index af88cc03887..214dd8d6f50 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
@@ -1,19 +1,14 @@
 package com.provectus.kafka.ui;
 
 import com.provectus.kafka.ui.base.BaseTest;
-import io.qameta.allure.Issue;
 import lombok.SneakyThrows;
-import org.junit.Ignore;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-@Disabled // TODO #1480
 public class SmokeTests extends BaseTest {
     @Test
     @SneakyThrows
     @DisplayName("main page should load")
-    @Issue("380")
     void mainPageLoads() {
         pages.open()
                 .isOnPage();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index a5ac78f5660..6a866ee0004 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -1,118 +1,118 @@
 package com.provectus.kafka.ui.base;
 
 import com.codeborne.selenide.Configuration;
+import com.codeborne.selenide.WebDriverRunner;
 import com.codeborne.selenide.logevents.SelenideLogger;
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.pages.Pages;
 import com.provectus.kafka.ui.screenshots.Screenshooter;
 import com.provectus.kafka.ui.steps.Steps;
 import io.github.cdimascio.dotenv.Dotenv;
+import io.qameta.allure.Allure;
 import io.qameta.allure.selenide.AllureSelenide;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayNameGeneration;
-import org.openqa.selenium.remote.DesiredCapabilities;
-import org.testcontainers.containers.BindMode;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.utility.DockerImageName;
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.TakesScreenshot;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.remote.RemoteWebDriver;
+import org.testcontainers.Testcontainers;
+import org.testcontainers.containers.BrowserWebDriverContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.Arrays;
 
 @Slf4j
 @DisplayNameGeneration(CamelCaseToSpacedDisplayNameGenerator.class)
 public class BaseTest {
 
-  protected Steps steps = Steps.INSTANCE;
-  protected Pages pages = Pages.INSTANCE;
-  protected Helpers helpers = Helpers.INSTANCE;
+    protected Steps steps = Steps.INSTANCE;
+    protected Pages pages = Pages.INSTANCE;
+    protected Helpers helpers = Helpers.INSTANCE;
 
-  private Screenshooter screenshooter = new Screenshooter();
+    private Screenshooter screenshooter = new Screenshooter();
 
-  public void compareScreenshots(String name) {
-    screenshooter.compareScreenshots(name);
-  }
+    public static BrowserWebDriverContainer<?> webDriverContainer =
+            new BrowserWebDriverContainer<>()
+                    .withCapabilities(new ChromeOptions()
+                            .addArguments("--no-sandbox")
+                            .addArguments("--disable-dev-shm-usage"))
+                    .waitingFor(Wait.defaultWaitStrategy().withStartupTimeout(Duration.ofSeconds(90)));
 
-  public void compareScreenshots(String name, Boolean shouldUpdateScreenshots) {
-    screenshooter.compareScreenshots(name, shouldUpdateScreenshots);
-  }
+    public void compareScreenshots(String name) {
+        screenshooter.compareScreenshots(name);
+    }
 
-  public static GenericContainer selenoid =
-      new GenericContainer(DockerImageName.parse("aerokube/selenoid:latest-release"))
-          .withExposedPorts(4444)
-          .withFileSystemBind("selenoid/config/", "/etc/selenoid", BindMode.READ_WRITE)
-          .withFileSystemBind("/var/run/docker.sock", "/var/run/docker.sock", BindMode.READ_WRITE)
-          .withFileSystemBind("selenoid/video", "/opt/selenoid/video", BindMode.READ_WRITE)
-          .withFileSystemBind("selenoid/logs", "/opt/selenoid/logs", BindMode.READ_WRITE)
-          .withEnv("OVERRIDE_VIDEO_OUTPUT_DIR", "/opt/selenoid/video")
-          .withCommand(
-              "-conf", "/etc/selenoid/browsers.json", "-log-output-dir", "/opt/selenoid/logs");
+    public void compareScreenshots(String name, Boolean shouldUpdateScreenshots) {
+        screenshooter.compareScreenshots(name, shouldUpdateScreenshots);
+    }
 
-  static {
-    if (!new File("./.env").exists()) {
-      try {
-        FileUtils.copyFile(new File(".env.example"), new File(".env"));
-      } catch (IOException e) {
-        log.error("couldn't copy .env.example to .env. Please add .env");
-        e.printStackTrace();
-      }
+    @BeforeAll
+    public static void start() {
+        Testcontainers.exposeHostPorts(8080);
+        webDriverContainer.start();
+        webDriverContainer.isRunning();
+        RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
+        WebDriverRunner.setWebDriver(remoteWebDriver);
     }
-    Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue()));
-    if (TestConfiguration.CLEAR_REPORTS_DIR) {
-      clearReports();
+
+    static {
+        if (!new File("./.env").exists()) {
+            try {
+                FileUtils.copyFile(new File(".env.example"), new File(".env"));
+            } catch (IOException e) {
+                log.error("couldn't copy .env.example to .env. Please add .env");
+                e.printStackTrace();
+            }
+        }
+        Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue()));
+        if (TestConfiguration.CLEAR_REPORTS_DIR) {
+            clearReports();
+        }
+        setup();
     }
-    setupSelenoid();
-  }
 
-  @AfterAll
-  public static void afterAll() {
-//    closeWebDriver();
-//    selenoid.close();
-  }
 
-  @SneakyThrows
-  private static void setupSelenoid() {
-    String remote = TestConfiguration.SELENOID_URL;
-    if (TestConfiguration.SHOULD_START_SELENOID) {
-      selenoid.start();
-      remote =
-          "http://%s:%s/wd/hub"
-              .formatted(selenoid.getContainerIpAddress(), selenoid.getMappedPort(4444));
+    @AfterEach
+    public void afterMethod() {
+        webDriverContainer.getWebDriver().manage().deleteAllCookies();
+        Allure.addAttachment("Screenshot",
+                new ByteArrayInputStream(((TakesScreenshot) webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
     }
 
-    Configuration.reportsFolder = TestConfiguration.REPORTS_FOLDER;
-    if (!TestConfiguration.USE_LOCAL_BROWSER) {
-      Configuration.remote = remote;
-      TestConfiguration.BASE_URL =
-          TestConfiguration.BASE_URL.replace("localhost", "host.docker.internal");
-    }
-    Configuration.screenshots = TestConfiguration.SCREENSHOTS;
-    Configuration.savePageSource = TestConfiguration.SAVE_PAGE_SOURCE;
-    Configuration.reopenBrowserOnFail = TestConfiguration.REOPEN_BROWSER_ON_FAIL;
-    Configuration.browser = TestConfiguration.BROWSER;
-    Configuration.baseUrl = TestConfiguration.BASE_URL;
-    Configuration.browserSize = TestConfiguration.BROWSER_SIZE;
-    var capabilities = new DesiredCapabilities();
-//    DesiredCapabilities capabilities = DesiredCapabilities.chrome();
-    capabilities.setCapability("enableVNC", TestConfiguration.ENABLE_VNC);
-    Configuration.browserCapabilities = capabilities;
+    @SneakyThrows
+    private static void setup() {
 
-    SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
-  }
+        Configuration.reportsFolder = TestConfiguration.REPORTS_FOLDER;
+        Configuration.screenshots = TestConfiguration.SCREENSHOTS;
+        Configuration.savePageSource = TestConfiguration.SAVE_PAGE_SOURCE;
+        Configuration.reopenBrowserOnFail = TestConfiguration.REOPEN_BROWSER_ON_FAIL;
+        Configuration.browser = TestConfiguration.BROWSER;
+        Configuration.baseUrl = TestConfiguration.BASE_WEB_URL;
+        Configuration.timeout = 10000;
+        Configuration.browserSize = TestConfiguration.BROWSER_SIZE;
+        SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
+    }
 
-  public static void clearReports() {
-    log.info("Clearing reports dir [%s]...".formatted(TestConfiguration.REPORTS_FOLDER));
-    File allureResults = new File(TestConfiguration.REPORTS_FOLDER);
-    if (allureResults.isDirectory()) {
-      File[] list = allureResults.listFiles();
-      if (list != null)
-        Arrays.stream(list)
-            .sequential()
-            .filter(e -> !e.getName().equals("categories.json"))
-            .forEach(File::delete);
+    public static void clearReports() {
+        log.info("Clearing reports dir [%s]...".formatted(TestConfiguration.REPORTS_FOLDER));
+        File allureResults = new File(TestConfiguration.REPORTS_FOLDER);
+        if (allureResults.isDirectory()) {
+            File[] list = allureResults.listFiles();
+            if (list != null) {
+                Arrays.stream(list)
+                        .sequential()
+                        .filter(e -> !e.getName().equals("categories.json"))
+                        .forEach(File::delete);
+            }
+        }
     }
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java
index 09c85db1c04..dbc18e228f4 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java
@@ -3,17 +3,10 @@
 public class TestConfiguration {
   public static boolean CLEAR_REPORTS_DIR =
       Boolean.parseBoolean(System.getProperty("CLEAR_REPORTS_DIR", "true"));
-
-  public static boolean SHOULD_START_SELENOID =
-      Boolean.parseBoolean(System.getProperty("SHOULD_START_SELENOID", "false"));
-
-  public static String BASE_URL = System.getProperty("BASE_URL", "http://localhost:8080/");
-
+  public static String BASE_API_URL = System.getProperty("BASE_URL", "http://localhost:8080");
+  public static String BASE_WEB_URL = System.getProperty("BASE_DOCKER_URL", "http://host.testcontainers.internal:8080");
   public static boolean USE_LOCAL_BROWSER =
       Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "true"));
-
-  public static String SELENOID_URL =
-      System.getProperty("SELENOID_URL", "http://localhost:4444/wd/hub");
   public static String REPORTS_FOLDER = System.getProperty("REPORTS_FOLDER", "allure-results");
   public static Boolean SCREENSHOTS =
       Boolean.parseBoolean(System.getProperty("SCREENSHOTS", "false"));
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java
index 926bf4504c6..f0b8ff78421 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java
@@ -1,54 +1,71 @@
 package com.provectus.kafka.ui.helpers;
 
-import com.provectus.kafka.ui.api.api.KafkaConnectApi;
-import com.provectus.kafka.ui.api.api.MessagesApi;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
 import com.provectus.kafka.ui.api.ApiClient;
+import com.provectus.kafka.ui.api.api.KafkaConnectApi;
+import com.provectus.kafka.ui.api.api.MessagesApi;
 import com.provectus.kafka.ui.api.api.TopicsApi;
 import com.provectus.kafka.ui.api.model.CreateTopicMessage;
+import com.provectus.kafka.ui.api.model.ErrorResponse;
 import com.provectus.kafka.ui.api.model.NewConnector;
 import com.provectus.kafka.ui.api.model.TopicCreation;
+import com.provectus.kafka.ui.base.TestConfiguration;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.codeborne.selenide.Selenide.sleep;
+
+
+@Slf4j
 public class ApiHelper {
+
     int partitions = 1;
     int replicationFactor = 1;
     String newTopic = "new-topic";
-    String baseURL = "http://localhost:8080/";
+    String baseURL = TestConfiguration.BASE_API_URL;
+
 
     @SneakyThrows
     private TopicsApi topicApi() {
-        ApiClient defaultClient = new ApiClient();
-        defaultClient.setBasePath(baseURL);
-        TopicsApi topicsApi = new TopicsApi(defaultClient);
-        return topicsApi;
+        return new TopicsApi(new ApiClient().setBasePath(baseURL));
     }
 
-    @SneakyThrows
+
     public void createTopic(String clusterName, String topicName) {
         TopicCreation topic = new TopicCreation();
         topic.setName(topicName);
         topic.setPartitions(partitions);
         topic.setReplicationFactor(replicationFactor);
-        topicApi().createTopic(clusterName,topic).block();
+        deleteTopic(clusterName, topicName);
+        sleep(2000);
+        try {
+            topicApi().createTopic(clusterName, topic).block();
+        } catch (WebClientResponseException ex) {
+            ex.printStackTrace();
+        }
     }
 
-    @SneakyThrows
+
     public void deleteTopic(String clusterName, String topicName) {
         try {
             topicApi().deleteTopic(clusterName, topicName).block();
         } catch (WebClientResponseException ex) {
-            if (ex.getRawStatusCode() != 404)  // except already deleted
+            ErrorResponse errorResponse = new Gson().fromJson(ex.getResponseBodyAsString(), ErrorResponse.class);
+            if (errorResponse.getMessage().startsWith("This server does not host this")) {
+                log.info("This server does not host this " + topicName);
+            } else {
                 throw ex;
+            }
         }
     }
 
     @SneakyThrows
-    private KafkaConnectApi connectorApi(){
+    private KafkaConnectApi connectorApi() {
         ApiClient defaultClient = new ApiClient();
         defaultClient.setBasePath(baseURL);
         KafkaConnectApi connectorsApi = new KafkaConnectApi(defaultClient);
@@ -59,9 +76,7 @@ private KafkaConnectApi connectorApi(){
     public void deleteConnector(String clusterName, String connectName, String connectorName) {
         try {
             connectorApi().deleteConnector(clusterName, connectName, connectorName).block();
-        } catch (WebClientResponseException ex) {
-            if (ex.getRawStatusCode() != 404)
-                throw ex;
+        } catch (WebClientResponseException ignore) {
         }
     }
 
@@ -71,9 +86,17 @@ public void createConnector(String clusterName, String connectName, String conne
         connector.setName(connectorName);
         Map<String, Object> configMap = new ObjectMapper().readValue(configJson, HashMap.class);
         connector.setConfig(configMap);
+        try {
+            connectorApi().deleteConnector(clusterName, connectName, connectorName).block();
+        } catch (WebClientResponseException ignored){
+        }
         connectorApi().createConnector(clusterName, connectName, connector).block();
     }
 
+    public String getFirstConnectName(String clusterName) {
+        return connectorApi().getConnects(clusterName).blockFirst().getName();
+    }
+
     @SneakyThrows
     private MessagesApi messageApi() {
         ApiClient defaultClient = new ApiClient();
@@ -83,10 +106,16 @@ private MessagesApi messageApi() {
     }
 
     @SneakyThrows
-    public void sendMessage(String clusterName, String topicName, String messageContentJson, String messageKey){
+    public void sendMessage(String clusterName, String topicName, String messageContentJson,
+            String messageKey) {
         CreateTopicMessage createMessage = new CreateTopicMessage();
+        createMessage.partition(0);
         createMessage.setContent(messageContentJson);
         createMessage.setKey(messageKey);
-        messageApi().sendTopicMessages(clusterName, topicName, createMessage).block();
+        try {
+            messageApi().sendTopicMessages(clusterName, topicName, createMessage).block();
+        } catch (WebClientResponseException ex) {
+            ex.getRawStatusCode();
+        }
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorCreateView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorCreateView.java
deleted file mode 100644
index fc4f65363f1..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorCreateView.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.provectus.kafka.ui.pages;
-
-import com.codeborne.selenide.Condition;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import io.qameta.allure.Step;
-import lombok.experimental.ExtensionMethod;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-
-import static com.codeborne.selenide.Selenide.$;
-import static com.provectus.kafka.ui.screenshots.Screenshooter.log;
-import static java.lang.Thread.sleep;
-
-@ExtensionMethod(WaitUtils.class)
-public class ConnectorCreateView {
-    private static final String path = "ui/clusters/secondLocal/connectors/create_new";
-
-    @Step
-    public ConnectorsView setConnectorConfig(String connectName, String configJson) throws InterruptedException {
-        $(By.xpath("//input[@name='name']")).sendKeys(connectName);
-        $(".ace_text-input").sendKeys(Keys.BACK_SPACE);
-        $(".ace_text-input").sendKeys(Keys.BACK_SPACE);
-        $(".ace_text-input").sendKeys(String.valueOf(configJson.toCharArray()));
-        $(By.xpath("//input[@name='name']")).click();
-        $(By.xpath("//input[@type='submit']")).click();
-        sleep(2000);
-        log.info("Connector config is submitted");
-        return new ConnectorsView();
-    }
-
-    @Step
-    public ConnectorCreateView isOnConnectorCreatePage() {
-        $(By.xpath("//input[@name='name']")).shouldBe(Condition.visible);
-        return this;
-    }
-}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorUpdateView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorUpdateView.java
deleted file mode 100644
index ef69b0abf93..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorUpdateView.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.provectus.kafka.ui.pages;
-
-import io.qameta.allure.Step;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-
-import static com.codeborne.selenide.Selenide.$;
-import static org.openqa.selenium.Keys.*;
-
-public class ConnectorUpdateView {
-    @Step
-    public ConnectorUpdateView updateConnectorConfig(String configJson) {
-        String os = System.getProperty("os.name");
-        Keys CMD = os.equalsIgnoreCase("Mac OS X") ? COMMAND : CONTROL;
-
-        $(".ace_text-input").sendKeys(CMD, "a");
-        $(".ace_text-input").sendKeys(Keys.BACK_SPACE);
-        $(".ace_text-input").sendKeys(String.valueOf(configJson.toCharArray()));
-        $(".ace_text-input").sendKeys(CMD, "a");
-        $(".ace_text-input").sendKeys(SHIFT, TAB);
-        $("div.ace_content").click();
-        $(By.xpath("//input[@type='submit']")).click();
-        return this;
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorsView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorsView.java
deleted file mode 100644
index 8fc0bbbf9a9..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorsView.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.provectus.kafka.ui.pages;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.base.TestConfiguration;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import io.qameta.allure.Step;
-import lombok.experimental.ExtensionMethod;
-import org.openqa.selenium.By;
-
-import static com.codeborne.selenide.Selenide.$;
-
-@ExtensionMethod(WaitUtils.class)
-public class ConnectorsView {
-    private static final String path = "ui/clusters/%s/connects/first/connectors/%s";
-
-    @Step
-    public ConnectorsView goTo(String cluster, String connector) {
-        Selenide.open(TestConfiguration.BASE_URL + path.formatted(cluster, connector));
-        return this;
-    }
-
-    @Step
-    public ConnectorUpdateView openEditConfig() {
-        $(By.xpath("//a/span[text()='Edit config']")).click();
-        return new ConnectorUpdateView();
-    }
-
-    @Step
-    public void clickDeleteButton() {
-        $(By.xpath("//span[text()='Delete']")).click();
-        $(By.xpath("//button[text()='Confirm']")).click();
-    }
-
-    @Step
-    public void connectorIsVisibleOnOverview() {
-        $(By.xpath("//a[text() ='Tasks']")).click();
-        $(By.xpath("//a[text() ='Config']")).click();
-        $(By.xpath("//span[text()='Edit config']")).waitUntil(Condition.visible, 100);
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java
index cb4f922688a..7bc96928621 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java
@@ -2,54 +2,69 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
+import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.base.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.pages.topic.TopicsList;
 import io.qameta.allure.Step;
 import lombok.SneakyThrows;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.*;
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
 
 @ExtensionMethod({WaitUtils.class})
 public class MainPage {
 
-  private static final String path = "";
-
-  @Step
-  public MainPage goTo(){
-    Selenide.open(TestConfiguration.BASE_URL+path);
-    return this;
-  }
-  @Step
-  public MainPage isOnPage() {
-    $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
-    $(By.xpath("//h5[text()='Clusters']")).shouldBe(Condition.visible);
-    return this;
-  }
-
-  @SneakyThrows
-  public void topicIsVisible(String topicName) {
-    By.xpath("//div[contains(@class,'section')]//table//a[text()='%s']".formatted(topicName)).refreshUntil(Condition.visible);
-  }
-
-  public enum SideMenuOptions {
-    BROKERS("Brokers"),
-    TOPICS("Topics"),
-    CONSUMERS("Consumers"),
-    SCHEMA_REGISTRY("Schema registry");
-
-    String value;
-
-    SideMenuOptions(String value) {
-      this.value = value;
+    private static final String path = "/";
+
+    @Step
+    public MainPage goTo() {
+        Selenide.open(TestConfiguration.BASE_WEB_URL + path);
+        return this;
+    }
+
+    @Step
+    public MainPage isOnPage() {
+        $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
+        $("input[name=switchRoundedDefault]").parent().$("span").shouldBe(Condition.visible);
+        return this;
+    }
+
+    @SneakyThrows
+    public void topicIsVisible(String topicName) {
+        new TopicsList().isTopicVisible(topicName);
+    }
+
+    public void topicIsNotVisible(String topicName){
+        new TopicsList().isTopicNotVisible(topicName);
+    }
+
+
+    public enum SideMenuOptions {
+        BROKERS("Brokers"),
+        TOPICS("Topics"),
+        CONSUMERS("Consumers"),
+        SCHEMA_REGISTRY("Schema registry");
+
+        String value;
+
+        SideMenuOptions(String value) {
+            this.value = value;
+        }
+    }
+
+    @Step
+    public MainPage goToSideMenu(String clusterName, SideMenuOptions option) {
+        SelenideElement clusterElement = $x(String.format("//aside/ul/li[contains(.,'%s')]", clusterName)).shouldBe(Condition.visible);
+        if (clusterElement.parent().$$x(".//ul").size() == 0) {
+            clusterElement.click();
+        }
+        clusterElement
+                .parent()
+                .$x(String.format(".//ul/li[contains(.,'%s')]", option.value))
+                .click();
+        return this;
     }
-  }
-
-  @Step
-  public MainPage goToSideMenu(String clusterName, SideMenuOptions option) {
-    $(By.xpath("//aside//*[a[text()='%s']]//a[text()='%s']".formatted(clusterName, option.value)))
-        .click();
-    return this;
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java
index b46b2152373..0044201cc24 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java
@@ -1,5 +1,10 @@
 package com.provectus.kafka.ui.pages;
 
+import com.provectus.kafka.ui.pages.connector.ConnectorsList;
+import com.provectus.kafka.ui.pages.connector.ConnectorsView;
+import com.provectus.kafka.ui.pages.topic.TopicView;
+import com.provectus.kafka.ui.pages.topic.TopicsList;
+
 public class Pages {
 
     public static Pages INSTANCE = new Pages();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicView.java
deleted file mode 100644
index 56196cb772b..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicView.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.provectus.kafka.ui.pages;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.base.TestConfiguration;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import io.qameta.allure.Step;
-import lombok.SneakyThrows;
-import lombok.experimental.ExtensionMethod;
-import org.junit.jupiter.api.Assertions;
-import org.openqa.selenium.By;
-
-import static com.codeborne.selenide.Selenide.*;
-
-@ExtensionMethod({WaitUtils.class})
-public class TopicView {
-    private static final String path = "ui/clusters/%s/topics/%s";
-    private final SelenideElement cleanupPolicy = $(By.name("cleanupPolicy"));
-    private final SelenideElement timeToRetain = $(By.id("timeToRetain"));
-    private final SelenideElement maxSizeOnDisk = $(By.name("retentionBytes"));
-    private final SelenideElement maxMessageBytes = $(By.name("maxMessageBytes"));
-
-    @Step
-    public TopicView goTo(String cluster,String topic){
-        Selenide.open(TestConfiguration.BASE_URL+path.formatted(cluster,topic));
-        return this;
-    }
-
-    @Step
-    public TopicsList isOnTopicViewPage() {
-        $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
-        $(By.xpath("//a[text()='All Topics']")).shouldBe(Condition.visible);
-        return new TopicsList();
-    }
-
-    @Step
-    public TopicsList isOnTopicListPage() {
-        $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
-        $(By.xpath("//span[text()='All Topics']")).shouldBe(Condition.visible);
-        return new TopicsList();
-    }
-
-    @SneakyThrows
-    public TopicView openEditSettings() {
-        $(By.xpath("//a[@class=\"button\" and text()='Edit settings']")).click();
-        return this;
-    }
-
-    @SneakyThrows
-    public TopicView clickDeleteTopicButton() {
-        By.xpath("//*[text()='Delete Topic']").refreshUntil(Condition.visible);
-        $(By.xpath("//*[text()='Delete Topic']")).click();
-        $(By.xpath("//*[text()='Confirm']")).click();
-        return this;
-    }
-
-    @SneakyThrows
-    public TopicView changeCleanupPolicy(String cleanupPolicyValue) {
-        cleanupPolicy.click();
-        $(By.xpath("//select/option[@value = '%s']".formatted(cleanupPolicyValue))).click();
-        return this;
-    }
-
-    @SneakyThrows
-    public TopicView changeTimeToRetainValue(String timeToRetainValue) {
-        timeToRetain.clear();
-        timeToRetain.sendKeys(String.valueOf(timeToRetainValue));
-        return this;
-    }
-
-    @SneakyThrows
-    public TopicView changeMaxSizeOnDisk(String maxSizeOnDiskValue) {
-        maxSizeOnDisk.click();
-        $(By.xpath("//select/option[text() = '%s']".formatted(maxSizeOnDiskValue))).click();
-        return this;
-    }
-
-    @SneakyThrows
-    public TopicView changeMaxMessageBytes(String maxMessageBytesValue) {
-        maxMessageBytes.clear();
-        maxMessageBytes.sendKeys(String.valueOf(maxMessageBytesValue));
-        return this;
-    }
-
-    @SneakyThrows
-    public TopicView submitSettingChanges() {
-        $(By.xpath("//input[@type='submit']")).click();
-        return this;
-    }
-
-    public TopicView cleanupPolicyIs(String value) {
-        cleanupPolicy.waitForSelectedValue(value);
-        return this;
-    }
-
-    public TopicView timeToRetainIs(String time) {
-        Assertions.assertEquals(time, timeToRetain.getValue());
-        return this;
-    }
-
-    public TopicView maxSizeOnDiskIs(String size) {
-        Assertions.assertEquals(size, maxSizeOnDisk.getSelectedText());
-        return this;
-    }
-
-    public TopicView maxMessageBytesIs(String bytes) {
-        Assertions.assertEquals(bytes, maxMessageBytes.getValue());
-        return this;
-    }
-}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicsList.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicsList.java
deleted file mode 100644
index 341bfea9fd9..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicsList.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.provectus.kafka.ui.pages;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.base.TestConfiguration;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import io.qameta.allure.Step;
-import lombok.SneakyThrows;
-import lombok.experimental.ExtensionMethod;
-import org.openqa.selenium.By;
-
-import static com.codeborne.selenide.Selenide.$;
-
-@ExtensionMethod(WaitUtils.class)
-public class TopicsList {
-    private static final String path = "ui/clusters/%s/topics";
-
-    @Step
-    public TopicsList goTo(String cluster) {
-        Selenide.open(TestConfiguration.BASE_URL+path.formatted(cluster));
-        return this;
-    }
-
-    @Step
-    public TopicsList isOnPage() {
-        $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
-        $(By.xpath("//span[text()='All Topics']")).shouldBe(Condition.visible);
-        return this;
-    }
-
-    @SneakyThrows
-    public TopicsList openTopic(String topicName) {
-        By.xpath("//div[contains(@class,'section')]//table//a[text()='%s']"
-                .formatted(topicName)).refreshUntil(Condition.visible);
-        $(By.xpath("//div[contains(@class,'section')]//table//a[text()='%s']".formatted(topicName)))
-                .click();
-        return this;
-    }
-
-    @SneakyThrows
-    public TopicsList isNotVisible(String topicName) {
-        By.xpath("//div[contains(@class,'section')]//table").refreshUntil(Condition.visible);
-        $(By.xpath("//a[text()='%s']".formatted(topicName))).shouldNotBe(Condition.visible);
-        return this;
-    }
-
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
new file mode 100644
index 00000000000..111d8544630
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
@@ -0,0 +1,42 @@
+package com.provectus.kafka.ui.pages.connector;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+import io.qameta.allure.Step;
+import lombok.experimental.ExtensionMethod;
+import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.provectus.kafka.ui.screenshots.Screenshooter.log;
+import static java.lang.Thread.sleep;
+
+@ExtensionMethod(WaitUtils.class)
+public class ConnectorCreateView {
+
+    SelenideElement nameField = $(By.xpath("//input[@name='name']"));
+    SelenideElement contentTextArea = $(".ace_text-input");
+    SelenideElement submitButton = $(By.xpath("//button[@type='submit']"));
+
+    private static final String path = "/ui/clusters/secondLocal/connectors/create_new";
+
+    @Step("Set connector config JSON")
+    public ConnectorsView setConnectorConfig(String connectName, String configJson) throws InterruptedException {
+        nameField.setValue(connectName);
+        $("#config").click();
+        contentTextArea.setValue("");
+        contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
+        nameField.click();
+        BrowserUtils.javaExecutorClick(submitButton);
+        sleep(4000);
+        log.info("Connector config is submitted");
+        return new ConnectorsView();
+    }
+
+    @Step("Verify that page 'Create Connector' opened")
+    public ConnectorCreateView isOnConnectorCreatePage() {
+        nameField.shouldBe(Condition.visible);
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
new file mode 100644
index 00000000000..d793cdd03c0
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
@@ -0,0 +1,47 @@
+package com.provectus.kafka.ui.pages.connector;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+import io.qameta.allure.Step;
+import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selectors.byLinkText;
+import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.screenshots.Screenshooter.log;
+
+public class ConnectorUpdateView {
+    SelenideElement submitButton = $(By.xpath("//button[@type='submit']"));
+    SelenideElement contentTextArea = $("[wrap]");
+
+
+    @Step("Update connector from new JSON")
+    public ConnectorUpdateView updateConnectorConfig(String configJson) {
+        BrowserUtils.javaExecutorClick($("#config"));
+        String str = configJson.replace("\r\n", "");
+        executeJavaScript(
+                "function clearAndNot(){" +
+                        "var editor = ace.edit('config');" +
+                        "editor.setValue(\"\");" +
+                        "editor.setValue('" + str + "');}" +
+                        "clearAndNot();");
+        $("#config").click();
+        submitButton.click();
+        $(byLinkText("Edit Config")).shouldBe(Condition.visible);
+        sleep(3000);
+        return this;
+    }
+
+    @Step("Set connector config JSON")
+    public ConnectorsView updConnectorConfig(String configJson) throws InterruptedException {
+        contentTextArea.doubleClick();
+        contentTextArea.setValue("");
+        contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
+        $("#config").click();
+        submitButton.shouldBe(Condition.enabled);
+        BrowserUtils.javaExecutorClick(submitButton);
+        sleep(4000);
+        log.info("Connector config is submitted");
+        return new ConnectorsView();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorsList.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
similarity index 56%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorsList.java
rename to kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
index 3503079d360..c7fe0927532 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ConnectorsList.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
@@ -1,57 +1,57 @@
-package com.provectus.kafka.ui.pages;
+package com.provectus.kafka.ui.pages.connector;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.provectus.kafka.ui.base.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import lombok.SneakyThrows;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.*;
 
 @ExtensionMethod(WaitUtils.class)
 public class ConnectorsList {
-    private static final String path = "ui/clusters/%s/connectors";
 
-    @Step
+    private static final String path = "/ui/clusters/%s/connectors";
+
+    @Step("Open URL to {cluster}")
     public ConnectorsList goTo(String cluster) {
-        Selenide.open(TestConfiguration.BASE_URL+path.formatted(cluster));
+        Selenide.open(TestConfiguration.BASE_WEB_URL + String.format(path, cluster));
         return this;
     }
 
     @Step
     public ConnectorsList isOnPage() {
-        $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
-        $(By.xpath("//span[text()='All Connectors']")).shouldBe(Condition.visible);
+        $(By.xpath("//h1[text()='Connectors']")).shouldBe(Condition.visible);
         return this;
     }
 
-    @Step
+    @Step("Click on button 'Create Connector'")
     public ConnectorCreateView clickCreateConnectorButton() {
-        $(By.xpath("//a[text()='Create Connector']")).click();
+        BrowserUtils.javaExecutorClick($x("//button[text()='Create Connector']"));
         return new ConnectorCreateView();
     }
 
     @SneakyThrows
     public ConnectorsList openConnector(String connectorName) {
-        $(By.xpath("//*/tr/td[1]/a[text()='%s']".formatted(connectorName)))
-                .click();
+        $(By.linkText(connectorName)).click();
         return this;
     }
 
     @SneakyThrows
     public ConnectorsList isNotVisible(String connectorName) {
-        By.xpath("//div[contains(@class,'section')]//table").refreshUntil(Condition.visible);
-        $(By.xpath("//a[text()='%s']".formatted(connectorName))).shouldNotBe(Condition.visible);
+        $(By.xpath("//table")).shouldBe(Condition.visible);
+        $x("//tbody//td[1]//a[text()='" + connectorName + "']").shouldBe(Condition.not(Condition.visible));
         return this;
     }
 
-    @Step
+    @Step("Verify that connector {connectorName} is visible in the list")
     public ConnectorsList connectorIsVisibleInList(String connectorName, String topicName) {
-        By.xpath("//a[text() = '%s']".formatted(connectorName)).refreshUntil(Condition.visible);
-        By.xpath("//a[text() = '%s']".formatted(topicName)).refreshUntil(Condition.visible);
+        $x("//table//a[@href='/ui/clusters/local/connects/first/connectors/" + connectorName +"']").shouldBe(Condition.visible);
+       $$(By.linkText(topicName));
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
new file mode 100644
index 00000000000..7fb30466aa2
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
@@ -0,0 +1,43 @@
+package com.provectus.kafka.ui.pages.connector;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.Selenide;
+import com.provectus.kafka.ui.base.TestConfiguration;
+import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+import io.qameta.allure.Step;
+import lombok.experimental.ExtensionMethod;
+import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+
+@ExtensionMethod(WaitUtils.class)
+public class ConnectorsView {
+    private static final String path = "/ui/clusters/%s/connects/first/connectors/%s";
+
+    @Step
+    public ConnectorsView goTo(String cluster, String connector) {
+        Selenide.open(TestConfiguration.BASE_WEB_URL + path.format(cluster, connector));
+        return this;
+    }
+
+    @Step("Open 'Edit Config' of connector")
+    public ConnectorUpdateView openEditConfig() {
+        BrowserUtils.javaExecutorClick($x("//button[@type='button']/span[.='Edit Config']"));
+        return new ConnectorUpdateView();
+    }
+
+    @Step("Click 'Delete' button")
+    public void clickDeleteButton() {
+        BrowserUtils.javaExecutorClick($x("//span[text()='Delete']"));
+        $(By.xpath("//button[text()='Submit']")).shouldBe(Condition.visible).click();
+    }
+
+    @Step
+    public void connectorIsVisibleOnOverview() {
+        $(By.xpath("//a[text() ='Tasks']")).shouldBe(Condition.visible);
+        $(By.xpath("//a[text() ='Config']")).shouldBe(Condition.visible);
+        $(By.xpath("//a[text() ='Overview']")).shouldBe(Condition.visible);
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
new file mode 100644
index 00000000000..0e850e50722
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
@@ -0,0 +1,224 @@
+package com.provectus.kafka.ui.pages.topic;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$$;
+import static com.codeborne.selenide.Selenide.$x;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.codeborne.selenide.*;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+import org.openqa.selenium.By;
+
+public class TopicCreateEditSettingsView {
+
+    private final SelenideElement timeToRetain = $(By.cssSelector("input#timeToRetain"));
+    private final SelenideElement maxMessageBytes = $(By.name("maxMessageBytes"));
+
+    public TopicCreateEditSettingsView setTopicName(String topicName){
+        $("input#topicFormName").setValue(topicName);
+        return this;
+    }
+
+    public TopicCreateEditSettingsView setMinInsyncReplicas(Integer minInsyncReplicas) {
+        $("input[name=minInsyncReplicas]").setValue(minInsyncReplicas.toString());
+        return this;
+    }
+
+    public TopicCreateEditSettingsView setTimeToRetainDataInMs(Long ms) {
+        timeToRetain.setValue(ms.toString());
+        return this;
+    }
+
+    public TopicCreateEditSettingsView setTimeToRetainDataInMs(String ms) {
+        timeToRetain.setValue(ms);
+        return this;
+    }
+
+
+    public TopicCreateEditSettingsView setMaxSizeOnDiskInGB(String value) {
+        KafkaUISelectElement kafkaUISelectElement = new KafkaUISelectElement("retentionBytes");
+        kafkaUISelectElement.selectByVisibleText(value);
+        return this;
+    }
+
+    public TopicCreateEditSettingsView setMaxMessageBytes(Long bytes) {
+        maxMessageBytes.setValue(bytes.toString());
+        return this;
+    }
+
+    public TopicCreateEditSettingsView setMaxMessageBytes(String bytes) {
+        return setMaxMessageBytes(Long.parseLong(bytes));
+    }
+
+    public TopicCreateEditSettingsView setTimeToRetainDataInMsUsingButtons(String value) {
+        timeToRetain
+                .parent()
+                .parent()
+                .$$("button")
+                .find(Condition.exactText(value))
+                .click();
+        return this;
+    }
+
+
+    public TopicCreateEditSettingsView selectCleanupPolicy(CleanupPolicyValue cleanupPolicyValue) {
+        return selectFromDropDownByOptionValue("cleanupPolicy",
+                cleanupPolicyValue.getOptionValue());
+    }
+
+    public TopicCreateEditSettingsView selectCleanupPolicy(String cleanupPolicyOptionValue) {
+        $("ul#topicFormCleanupPolicy").click();
+        $x("//li[text()='" + cleanupPolicyOptionValue +"']").click();
+        return this;
+    }
+
+
+    public TopicCreateEditSettingsView selectRetentionBytes(String visibleValue) {
+        return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
+    }
+
+    public TopicCreateEditSettingsView selectRetentionBytes(Long optionValue) {
+        return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
+    }
+
+    public TopicView sendData() {
+        BrowserUtils.javaExecutorClick($(".ezTgzA.sc-bYEvvW"));
+        return new TopicView();
+    }
+
+    public TopicCreateEditSettingsView addCustomParameter(String customParameterName,
+                                                          String customParameterValue) {
+        ElementsCollection customParametersElements =
+                $$("ul[role=listbox][name^=customParams][name$=name]");
+        KafkaUISelectElement kafkaUISelectElement = null;
+        if (customParametersElements.size() == 1) {
+            if ("Select".equals(customParametersElements.first().getText())) {
+                kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.first());
+            }
+        } else {
+            $$("button")
+                    .find(Condition.exactText("Add Custom Parameter"))
+                    .click();
+            customParametersElements = $$("ul[role=listbox][name^=customParams][name$=name]");
+            kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.last());
+        }
+        kafkaUISelectElement.selectByVisibleText(customParameterName);
+        $("input[name=\"customParams.%d.value\"]".formatted(customParametersElements.size() - 1))
+                .setValue(customParameterValue);
+        return this;
+    }
+
+    public TopicCreateEditSettingsView updateCustomParameter(String customParameterName,
+                                                             String customParameterValue) {
+        SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
+                .find(Condition.exactText(customParameterName));
+        String name = selenideElement.getAttribute("name");
+        name = name.substring(0, name.lastIndexOf("."));
+        $("input[name^=%s]".formatted(name)).setValue(customParameterValue);
+        return this;
+    }
+
+    public TopicCreateEditSettingsView cleanupPolicyIs(String value) {
+        String cleanupPolicy = new KafkaUISelectElement("cleanupPolicy")
+                .getCurrentValue();
+        assertThat(cleanupPolicy)
+                .as("Clear policy value should be " + value)
+                .isEqualToIgnoringCase(value);
+        return this;
+    }
+
+    public TopicCreateEditSettingsView timeToRetainIs(String time) {
+        String value = timeToRetain.getValue();
+        assertThat(value)
+                .as("Time to retain data (in ms) should be " + time)
+                .isEqualTo(time);
+        return this;
+    }
+
+    public TopicCreateEditSettingsView maxSizeOnDiskIs(String size) {
+        String retentionBytes = new KafkaUISelectElement("retentionBytes")
+                .getCurrentValue();
+        assertThat(retentionBytes)
+                .as("Max size on disk in GB should be " + size)
+                .isEqualTo(size);
+        return this;
+    }
+
+    public TopicCreateEditSettingsView maxMessageBytesIs(String bytes) {
+        String value = maxMessageBytes.getValue();
+        assertThat(value)
+                .as("Maximum message size in bytes should be " + bytes)
+                .isEqualTo(bytes);
+        return this;
+    }
+
+
+    private static class KafkaUISelectElement {
+
+        private SelenideElement selectElement;
+
+        public KafkaUISelectElement(String selectElementName) {
+            this.selectElement = $("ul[role=listbox][name="+selectElementName+"]");
+        }
+
+        public KafkaUISelectElement(SelenideElement selectElement) {
+            this.selectElement = selectElement;
+        }
+
+        public void selectByOptionValue(String optionValue) {
+            selectElement.click();
+            selectElement
+                    .$$x(".//ul/li[@role='option']")
+                    .find(Condition.attribute("value", optionValue))
+                    .click(ClickOptions.usingJavaScript());
+        }
+
+        public void selectByVisibleText(String visibleText) {
+            selectElement.click();
+            selectElement
+                    .$$("ul>li[role=option]")
+                    .find(Condition.exactText(visibleText))
+                    .click();
+        }
+
+        public String getCurrentValue() {
+            return selectElement.$("li").getText();
+        }
+    }
+
+    public enum CleanupPolicyValue {
+        DELETE("delete", "Delete"),
+        COMPACT("compact", "Compact"),
+        COMPACT_DELETE("compact,delete", "Compact,Delete");
+
+        private final String optionValue;
+        private final String visibleText;
+
+        CleanupPolicyValue(String optionValue, String visibleText) {
+            this.optionValue = optionValue;
+            this.visibleText = visibleText;
+        }
+
+        public String getOptionValue() {
+            return optionValue;
+        }
+
+        public String getVisibleText() {
+            return visibleText;
+        }
+    }
+
+    private TopicCreateEditSettingsView selectFromDropDownByOptionValue(String dropDownElementName,
+                                                                        String optionValue) {
+        KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
+        select.selectByOptionValue(optionValue);
+        return this;
+    }
+
+    private TopicCreateEditSettingsView selectFromDropDownByVisibleText(String dropDownElementName,
+                                                                        String visibleText) {
+        KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
+        select.selectByVisibleText(visibleText);
+        return this;
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java
new file mode 100644
index 00000000000..7911e0d240f
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -0,0 +1,72 @@
+package com.provectus.kafka.ui.pages.topic;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.Selenide;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.base.TestConfiguration;
+import com.provectus.kafka.ui.extensions.WaitUtils;
+import io.qameta.allure.Step;
+import lombok.SneakyThrows;
+import lombok.experimental.ExtensionMethod;
+
+import static com.codeborne.selenide.Selectors.byLinkText;
+import static com.codeborne.selenide.Selenide.*;
+
+@ExtensionMethod({WaitUtils.class})
+public class TopicView {
+
+    private static final String path = "/ui/clusters/%s/topics/%s";
+    private final SelenideElement dotMenuHeader = $(".fPWftu.sc-fHYyUA > .dropdown.is-right");
+    private final SelenideElement dotMenuFooter = $$(".dropdown.is-right button").get(1);
+
+    @Step
+    public TopicView goTo(String cluster, String topic) {
+        Selenide.open(TestConfiguration.BASE_WEB_URL + String.format(path, cluster, topic));
+        return this;
+    }
+
+    @Step
+    public TopicView isOnTopicViewPage() {
+       $("nav[role=navigation] a.is-active.is-primary").shouldBe(Condition.visible);
+        return this;
+    }
+
+    @SneakyThrows
+    public TopicCreateEditSettingsView openEditSettings() {
+        dotMenuHeader.click();
+        $x("//a[text()= '" + DotMenuHeaderItems.EDIT_SETTINGS.getValue() +"']").click();
+        return new TopicCreateEditSettingsView();
+    }
+
+
+    @SneakyThrows
+    public TopicsList deleteTopic() {
+        dotMenuHeader.click();
+        $("#dropdown-menu").$(byLinkText(DotMenuHeaderItems.REMOVE_TOPIC.getValue())).click();
+        $$("div[role=\"dialog\"] button").find(Condition.exactText("Submit")).click();
+        return new TopicsList();
+    }
+
+    private enum DotMenuHeaderItems {
+        EDIT_SETTINGS("Edit settings"),
+        CLEAR_MESSAGES("Clear messages"),
+        REMOVE_TOPIC("Remove topic");
+
+        private String value;
+
+        DotMenuHeaderItems(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return "DotMenuHeaderItems{" +
+                    "value='" + value + '\'' +
+                    '}';
+        }
+    }
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
new file mode 100644
index 00000000000..2d442391cda
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -0,0 +1,64 @@
+package com.provectus.kafka.ui.pages.topic;
+
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.Selenide;
+import com.provectus.kafka.ui.base.TestConfiguration;
+import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+import io.qameta.allure.Step;
+import lombok.SneakyThrows;
+import lombok.experimental.ExtensionMethod;
+import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selenide.*;
+
+@ExtensionMethod(WaitUtils.class)
+public class TopicsList {
+
+    private static final String path = "/ui/clusters/%s/topics";
+
+    @Step
+    public TopicsList goTo(String cluster) {
+        Selenide.open(TestConfiguration.BASE_WEB_URL + String.format(path, cluster));
+        return this;
+    }
+
+    @Step
+    public TopicsList isOnPage() {
+        $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
+        $(By.xpath("//h1[text()='All Topics']")).shouldBe(Condition.visible);
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditSettingsView pressCreateNewTopic(){
+        BrowserUtils.javaExecutorClick($(".qEXNn.sc-bYEvvW"));
+        return new TopicCreateEditSettingsView();
+    }
+
+    @Step
+    public TopicsList isTopicVisible(String topicName) {
+        $$("tbody td>a")
+                .shouldBe(CollectionCondition.sizeGreaterThan(4))
+                .find(Condition.exactText(topicName))
+                .shouldBe(Condition.visible);
+        return this;
+    }
+
+    @SneakyThrows
+    public TopicView openTopic(String topicName) {
+        $(By.linkText(topicName)).click();
+        return new TopicView();
+    }
+
+    @SneakyThrows
+    public TopicsList isTopicNotVisible(String topicName) {
+        $$x("//table/tbody/tr/td[2]")
+                .shouldBe(CollectionCondition.sizeGreaterThanOrEqual(4))
+                .find(Condition.exactText(topicName))
+                .shouldBe(Condition.not(Condition.visible));
+        return this;
+    }
+
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 468c087d495..3731b53a120 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -5,17 +5,19 @@
 import com.provectus.kafka.ui.helpers.ApiHelper;
 import com.provectus.kafka.ui.helpers.Helpers;
 import lombok.SneakyThrows;
-import org.junit.Ignore;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 
-@Disabled // TODO #1480
 public class ConnectorsTests extends BaseTest {
 
-    public static final String LOCAL = "local";
+    public static final String LOCAL_CLUSTER = "local";
     public static final String SINK_CONNECTOR = "sink_postgres_activities_e2e_checks";
     public static final String TOPIC_FOR_CONNECTOR = "topic_for_connector";
+    public static final String TOPIC_FOR_DELETE_CONNECTOR = "topic_for_delete_connector";
     public static final String TOPIC_FOR_UPDATE_CONNECTOR = "topic_for_update_connector";
-    public static final String FIRST = "first";
+    public static final String FIRST_CONNECTOR = "first";
     public static final String CONNECTOR_FOR_DELETE = "sink_postgres_activities_e2e_checks_for_delete";
     public static final String CONNECTOR_FOR_UPDATE = "sink_postgres_activities_e2e_checks_for_update";
 
@@ -24,60 +26,75 @@ public class ConnectorsTests extends BaseTest {
     public static void beforeAll() {
         ApiHelper apiHelper = Helpers.INSTANCE.apiHelper;
 
+        String connectorToDelete = FileUtils.getResourceAsString("delete_connector_config.json");
+        String connectorToUpdate = FileUtils.getResourceAsString("config_for_create_connector_via_api.json");
         String message = FileUtils.getResourceAsString("message_content_create_topic.json");
-        apiHelper.createTopic(LOCAL, TOPIC_FOR_CONNECTOR);
-        apiHelper.sendMessage(LOCAL, TOPIC_FOR_CONNECTOR, message, " ");
+
+        apiHelper.deleteTopic(LOCAL_CLUSTER, CONNECTOR_FOR_DELETE);
+
+        apiHelper.createTopic(LOCAL_CLUSTER, TOPIC_FOR_CONNECTOR);
+        apiHelper.sendMessage(LOCAL_CLUSTER, TOPIC_FOR_CONNECTOR, message, " ");
+
+        apiHelper.createTopic(LOCAL_CLUSTER, TOPIC_FOR_DELETE_CONNECTOR);
+        apiHelper.sendMessage(LOCAL_CLUSTER, TOPIC_FOR_DELETE_CONNECTOR, message, " ");
+
+        apiHelper.createTopic(LOCAL_CLUSTER, TOPIC_FOR_UPDATE_CONNECTOR);
+        apiHelper.sendMessage(LOCAL_CLUSTER, TOPIC_FOR_UPDATE_CONNECTOR, message, " ");
+
+        apiHelper.createConnector(LOCAL_CLUSTER, FIRST_CONNECTOR, CONNECTOR_FOR_DELETE, connectorToDelete);
+        apiHelper.createConnector(LOCAL_CLUSTER, FIRST_CONNECTOR, CONNECTOR_FOR_UPDATE, connectorToUpdate);
     }
 
     @AfterAll
     @SneakyThrows
     public static void afterAll() {
         ApiHelper apiHelper = Helpers.INSTANCE.apiHelper;
-        apiHelper.deleteConnector(LOCAL, FIRST, SINK_CONNECTOR);
-        apiHelper.deleteTopic(LOCAL, TOPIC_FOR_CONNECTOR);
+        apiHelper.deleteConnector(LOCAL_CLUSTER, FIRST_CONNECTOR, SINK_CONNECTOR);
+        apiHelper.deleteConnector(LOCAL_CLUSTER, FIRST_CONNECTOR, CONNECTOR_FOR_UPDATE);
+        apiHelper.deleteTopic(LOCAL_CLUSTER, TOPIC_FOR_CONNECTOR);
+        apiHelper.deleteTopic(LOCAL_CLUSTER, TOPIC_FOR_DELETE_CONNECTOR);
+        apiHelper.deleteTopic(LOCAL_CLUSTER, TOPIC_FOR_UPDATE_CONNECTOR);
     }
 
     @SneakyThrows
     @DisplayName("should create a connector")
     @Test
-    void createConnector() {
-        pages.openConnectorsList(LOCAL)
+    public void createConnector() {
+        pages.openConnectorsList(LOCAL_CLUSTER)
                 .isOnPage()
                 .clickCreateConnectorButton()
                 .isOnConnectorCreatePage()
                 .setConnectorConfig(
                         SINK_CONNECTOR,
-                        FileUtils.getResourceAsString("config_for_create_connector.json")
-                );
-        pages.openConnectorsList(LOCAL).connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR);
+                        FileUtils.getResourceAsString("config_for_create_connector.json"));
+        pages.openConnectorsList(LOCAL_CLUSTER)
+                .isOnPage()
+                .connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR);
     }
 
     //disable test due 500 error during create connector via api
     @SneakyThrows
     @DisplayName("should update a connector")
     @Test
-    @Disabled
-    void updateConnector() {
-        pages.openConnectorsList(LOCAL)
+    public void updateConnector() {
+        pages.openConnectorsList(LOCAL_CLUSTER)
                 .isOnPage()
                 .openConnector(CONNECTOR_FOR_UPDATE);
-        pages.openConnectorsView(LOCAL, CONNECTOR_FOR_UPDATE)
-                .openEditConfig()
-                .updateConnectorConfig(
-                        FileUtils.getResourceAsString("config_for_update_connector.json"));
-        pages.openConnectorsList(LOCAL).connectorIsVisibleInList(CONNECTOR_FOR_UPDATE, TOPIC_FOR_UPDATE_CONNECTOR);
+                pages.connectorsView.connectorIsVisibleOnOverview();
+        pages.connectorsView.openEditConfig()
+                        .updConnectorConfig(FileUtils.getResourceAsString("config_for_update_connector.json"));
+        pages.openConnectorsList(LOCAL_CLUSTER).connectorIsVisibleInList(CONNECTOR_FOR_UPDATE, TOPIC_FOR_UPDATE_CONNECTOR);
     }
 
     @SneakyThrows
     @DisplayName("should delete connector")
     @Test
-    @Disabled
-    void deleteConnector() {
-        pages.openConnectorsList(LOCAL)
+    public void deleteConnector() {
+        pages.openConnectorsList(LOCAL_CLUSTER)
                 .isOnPage()
                 .openConnector(CONNECTOR_FOR_DELETE);
-        pages.openConnectorsView(LOCAL, CONNECTOR_FOR_DELETE)
-                .clickDeleteButton();
-        pages.openConnectorsList(LOCAL).isNotVisible(CONNECTOR_FOR_DELETE);
+                pages.connectorsView.clickDeleteButton();
+        pages.openConnectorsList(LOCAL_CLUSTER)
+                .isNotVisible(CONNECTOR_FOR_DELETE);
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 670e0bcbe92..00d1c4fb34e 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -3,20 +3,17 @@
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.pages.MainPage;
+import io.qameta.allure.Issue;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled // TODO #1480
 public class TopicTests extends BaseTest {
 
     public static final String NEW_TOPIC = "new-topic";
     public static final String TOPIC_TO_UPDATE = "topic-to-update";
     public static final String TOPIC_TO_DELETE = "topic-to-delete";
     public static final String SECOND_LOCAL = "secondLocal";
-    public static final String COMPACT_POLICY_VALUE = "compact";
+    public static final String COMPACT_POLICY_VALUE = "Compact";
     public static final String UPDATED_TIME_TO_RETAIN_VALUE = "604800001";
     public static final String UPDATED_MAX_SIZE_ON_DISK = "20 GB";
     public static final String UPDATED_MAX_MESSAGE_BYTES = "1000020";
@@ -33,41 +30,51 @@ public static void beforeAll() {
     public static void afterAll() {
         Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, TOPIC_TO_UPDATE);
         Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, TOPIC_TO_DELETE);
+        Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, NEW_TOPIC);
     }
 
     @SneakyThrows
     @DisplayName("should create a topic")
     @Test
-    void createTopic() {
-        try {
-            helpers.apiHelper.createTopic(SECOND_LOCAL, NEW_TOPIC);
-            pages.open()
-                    .isOnPage()
-                    .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
-                    .topicIsVisible(NEW_TOPIC);
-        } finally {
-            helpers.apiHelper.deleteTopic(SECOND_LOCAL, NEW_TOPIC);
-        }
+    public void createTopic() {
+        pages.open()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS);
+        pages.topicsList.pressCreateNewTopic()
+                .setTopicName(NEW_TOPIC)
+                .sendData()
+                .isOnTopicViewPage();
+        pages.open()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
+                .topicIsVisible(NEW_TOPIC);
+        helpers.apiHelper.deleteTopic(SECOND_LOCAL, NEW_TOPIC);
+        pages.open()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
+                .topicIsNotVisible(NEW_TOPIC);
     }
 
+    @Disabled("Due to issue https://github.com/provectus/kafka-ui/issues/1500 ignore this test")
     @SneakyThrows
     @DisplayName("should update a topic")
+    @Issue("1500")
     @Test
-    void updateTopic() {
+    public void updateTopic() {
         pages.openTopicsList(SECOND_LOCAL)
-                .isOnPage()
-                .openTopic(TOPIC_TO_UPDATE);
+                .isOnPage();
         pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
                 .openEditSettings()
-                .changeCleanupPolicy(COMPACT_POLICY_VALUE)
-                .changeTimeToRetainValue(UPDATED_TIME_TO_RETAIN_VALUE)
-                .changeMaxSizeOnDisk(UPDATED_MAX_SIZE_ON_DISK)
-                .changeMaxMessageBytes(UPDATED_MAX_MESSAGE_BYTES)
-                .submitSettingChanges()
+                .selectCleanupPolicy(COMPACT_POLICY_VALUE)
+                .setMinInsyncReplicas(10)
+                .setTimeToRetainDataInMs(UPDATED_TIME_TO_RETAIN_VALUE)
+                .setMaxSizeOnDiskInGB(UPDATED_MAX_SIZE_ON_DISK)
+                .setMaxMessageBytes(UPDATED_MAX_MESSAGE_BYTES)
+                .sendData()
                 .isOnTopicViewPage();
+
+        pages.openTopicsList(SECOND_LOCAL)
+                .isOnPage();
         pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
                 .openEditSettings()
-        // Assertions
+                // Assertions
                 .cleanupPolicyIs(COMPACT_POLICY_VALUE)
                 .timeToRetainIs(UPDATED_TIME_TO_RETAIN_VALUE)
                 .maxSizeOnDiskIs(UPDATED_MAX_SIZE_ON_DISK)
@@ -77,13 +84,13 @@ void updateTopic() {
     @SneakyThrows
     @DisplayName("should delete topic")
     @Test
-    void deleteTopic() {
+    public void deleteTopic() {
         pages.openTopicsList(SECOND_LOCAL)
                 .isOnPage()
-                .openTopic(TOPIC_TO_DELETE);
-        pages.openTopicView(SECOND_LOCAL, TOPIC_TO_DELETE)
-                .clickDeleteTopicButton()
-                .isOnTopicListPage()
-                .isNotVisible(TOPIC_TO_DELETE);
+                .openTopic(TOPIC_TO_DELETE)
+                .isOnTopicViewPage()
+                .deleteTopic()
+                .isOnPage()
+                .isTopicNotVisible(TOPIC_TO_DELETE);
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/utils/BrowserUtils.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/utils/BrowserUtils.java
new file mode 100644
index 00000000000..7549c5c1111
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/utils/BrowserUtils.java
@@ -0,0 +1,23 @@
+package com.provectus.kafka.ui.utils;
+
+import com.codeborne.selenide.Selenide;
+import com.codeborne.selenide.SelenideElement;
+import org.openqa.selenium.NoSuchElementException;
+
+public class BrowserUtils {
+
+    public static void javaExecutorClick(SelenideElement element){
+        Selenide.executeJavaScript("arguments[0].click();", element);
+    }
+
+    public static void waitElementPresentJavaExecutor( SelenideElement element ) {
+        try {
+            Selenide.executeJavaScript("return typeof(arguments[0]) != 'undefined' && arguments[0] != null;",
+                    element);
+        }
+        catch(org.openqa.selenium.StaleElementReferenceException | NoSuchElementException ex){
+            Selenide.executeJavaScript("return typeof(arguments[0]) != 'undefined' && arguments[0] != null;",
+                    element);
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
index e7c5898b15f..a73aaf08258 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
         <avro.version>1.11.0</avro.version>
         <confluent.version>7.0.1</confluent.version>
         <apache.commons.version>2.11.1</apache.commons.version>
-        <test.containers.version>1.16.2</test.containers.version>
+        <test.containers.version>1.17.1</test.containers.version>
         <junit-jupiter-engine.version>5.7.2</junit-jupiter-engine.version>
         <mockito.version>2.21.0</mockito.version>
         <assertj.version>3.19.0</assertj.version>

From e6f3157508de4faa965cc7a82d4049a65e6dfcbd Mon Sep 17 00:00:00 2001
From: Smbat Siradeghyan <104761619+ssiradeghyan@users.noreply.github.com>
Date: Mon, 6 Jun 2022 22:15:48 +0400
Subject: [PATCH 013/734] Add UI for broker log dirs (#1992)

* change brokker table

* add broker page

* add tests for broker page

* add test for broker

* add test for broker

* remove unused import

* fix comments

* fix coments

* fix new coments

* fix comments

* fix coments

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../src/components/Brokers/Broker/Broker.tsx  |  96 ++++++++++
 .../Brokers/Broker/__test__/Broker.spec.tsx   |  90 ++++++++++
 .../src/components/Brokers/Brokers.tsx        | 167 +++---------------
 .../components/Brokers/List/BrokersList.tsx   | 149 ++++++++++++++++
 .../__test__/BrokersList.spec.tsx}            |   8 +-
 .../Brokers/__tests__/Brokers.spec.tsx        |  33 ++++
 .../Brokers/utils/translateLogdir.ts          |  17 ++
 kafka-ui-react-app/src/lib/paths.ts           |   9 +
 .../reducers/brokers/__test__/fixtures.ts     |  31 ++++
 9 files changed, 454 insertions(+), 146 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/List/BrokersList.tsx
 rename kafka-ui-react-app/src/components/Brokers/{__test__/Brokers.spec.tsx => List/__test__/BrokersList.spec.tsx} (96%)
 create mode 100644 kafka-ui-react-app/src/components/Brokers/__tests__/Brokers.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/utils/translateLogdir.ts

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
new file mode 100644
index 00000000000..32a6ae702a0
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -0,0 +1,96 @@
+import React, { useState } from 'react';
+import useInterval from 'lib/hooks/useInterval';
+import PageHeading from 'components/common/PageHeading/PageHeading';
+import { BrokersApi, Configuration } from 'generated-sources';
+import { BASE_PARAMS } from 'lib/constants';
+import * as Metrics from 'components/common/Metrics';
+import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
+import {
+  fetchBrokers,
+  fetchClusterStats,
+  selectStats,
+} from 'redux/reducers/brokers/brokersSlice';
+import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
+import useAppParams from 'lib/hooks/useAppParams';
+import { translateLogdir } from 'components/Brokers/utils/translateLogdir';
+import { SmartTable } from 'components/common/SmartTable/SmartTable';
+import { TableColumn } from 'components/common/SmartTable/TableColumn';
+import { useTableState } from 'lib/hooks/useTableState';
+import { ClusterBrokerParam } from 'lib/paths';
+
+const apiClientConf = new Configuration(BASE_PARAMS);
+export const brokersApiClient = new BrokersApi(apiClientConf);
+
+export interface BrokerLogdirState {
+  name: string;
+  error: string;
+  topics: number;
+  partitions: number;
+}
+
+const Broker: React.FC = () => {
+  const dispatch = useAppDispatch();
+  const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
+
+  const [logdirs, setLogdirs] = useState<BrokerLogdirState[]>([]);
+  const { diskUsage, items } = useAppSelector(selectStats);
+
+  React.useEffect(() => {
+    brokersApiClient
+      .getAllBrokersLogdirs({
+        clusterName,
+        broker: [Number(brokerId)],
+      })
+      .then((res) => {
+        if (res && res[0]) {
+          setLogdirs([translateLogdir(res[0])]);
+        }
+      });
+    dispatch(fetchClusterStats(clusterName));
+    dispatch(fetchBrokers(clusterName));
+  }, [clusterName, brokerId, dispatch]);
+
+  const tableState = useTableState<BrokerLogdirState, string>(logdirs, {
+    idSelector: (logdir) => logdir.name,
+    totalPages: 0,
+  });
+
+  const brokerItem = items?.find((item) => item.id === Number(brokerId));
+  const brokerDiskUsage = diskUsage?.find(
+    (item) => item.brokerId === Number(brokerId)
+  );
+
+  useInterval(() => {
+    fetchClusterStats(clusterName);
+    fetchBrokers(clusterName);
+  }, 5000);
+  return (
+    <>
+      <PageHeading text={`Broker ${brokerId}`} />
+      <Metrics.Wrapper>
+        <Metrics.Section>
+          <Metrics.Indicator label="Segment Size">
+            <BytesFormatted value={brokerDiskUsage?.segmentSize} />
+          </Metrics.Indicator>
+          <Metrics.Indicator label="Segment Count">
+            {brokerDiskUsage?.segmentCount}
+          </Metrics.Indicator>
+          <Metrics.Indicator label="Port">{brokerItem?.port}</Metrics.Indicator>
+          <Metrics.Indicator label="Host">{brokerItem?.host}</Metrics.Indicator>
+        </Metrics.Section>
+      </Metrics.Wrapper>
+      <SmartTable
+        tableState={tableState}
+        placeholder="Log dir data not available"
+        isFullwidth
+      >
+        <TableColumn title="Name" field="name" />
+        <TableColumn title="Error" field="error" />
+        <TableColumn title="Topics" field="topics" />
+        <TableColumn title="Partitions" field="partitions" />
+      </SmartTable>
+    </>
+  );
+};
+
+export default Broker;
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
new file mode 100644
index 00000000000..ab9f5616585
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import { screen, waitFor } from '@testing-library/dom';
+import { clusterBrokerPath } from 'lib/paths';
+import fetchMock from 'fetch-mock';
+import { clusterStatsPayloadBroker } from 'redux/reducers/brokers/__test__/fixtures';
+import { act } from '@testing-library/react';
+import Broker from 'components/Brokers/Broker/Broker';
+import { BrokersLogdirs } from 'generated-sources';
+
+describe('Broker Component', () => {
+  afterEach(() => fetchMock.reset());
+
+  const clusterName = 'local';
+  const brokerId = 1;
+
+  const renderComponent = () =>
+    render(
+      <WithRoute path={clusterBrokerPath()}>
+        <Broker />
+      </WithRoute>,
+      {
+        initialEntries: [clusterBrokerPath(clusterName, brokerId)],
+      }
+    );
+
+  describe('Broker', () => {
+    const fetchBrokerMockUrl = `/api/clusters/${clusterName}/brokers/logdirs?broker=${brokerId}`;
+
+    const actRender = async (
+      mockData: BrokersLogdirs[] = clusterStatsPayloadBroker
+    ) => {
+      const fetchBrokerMock = fetchMock.getOnce(fetchBrokerMockUrl, mockData);
+
+      await act(() => {
+        renderComponent();
+      });
+      await waitFor(() => expect(fetchBrokerMock.called()).toBeTruthy());
+    };
+
+    it('renders', async () => {
+      await actRender();
+
+      expect(screen.getByRole('table')).toBeInTheDocument();
+      const rows = screen.getAllByRole('row');
+      expect(rows.length).toEqual(2);
+    });
+
+    it('show warning when broker not found', async () => {
+      await actRender([]);
+
+      expect(
+        screen.getByText('Log dir data not available')
+      ).toBeInTheDocument();
+    });
+
+    it('show broker found', async () => {
+      await actRender();
+      const topicCount = screen.getByText(
+        clusterStatsPayloadBroker[0].topics?.length || 0
+      );
+      const partitionsCount = screen.getByText(
+        clusterStatsPayloadBroker[0].topics?.reduce(
+          (previousValue, currentValue) =>
+            previousValue + (currentValue.partitions?.length || 0),
+          0
+        ) || 0
+      );
+      expect(topicCount).toBeInTheDocument();
+      expect(partitionsCount).toBeInTheDocument();
+    });
+
+    it('show 0s when broker has not topics', async () => {
+      await actRender([{ ...clusterStatsPayloadBroker[0], topics: undefined }]);
+
+      expect(screen.getAllByText(0).length).toEqual(2);
+    });
+
+    it('show - when broker has not name', async () => {
+      await actRender([{ ...clusterStatsPayloadBroker[0], name: undefined }]);
+
+      expect(screen.getByText('-')).toBeInTheDocument();
+    });
+
+    it('show - when broker has not error', async () => {
+      await actRender([{ ...clusterStatsPayloadBroker[0], error: undefined }]);
+      expect(screen.getByText('-')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
index 80ced9baed5..3ddf362709c 100644
--- a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
@@ -1,146 +1,29 @@
 import React from 'react';
-import useInterval from 'lib/hooks/useInterval';
-import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import { Table } from 'components/common/table/Table/Table.styled';
-import PageHeading from 'components/common/PageHeading/PageHeading';
-import * as Metrics from 'components/common/Metrics';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
-import { ClusterNameRoute } from 'lib/paths';
-import {
-  fetchBrokers,
-  fetchClusterStats,
-  selectStats,
-} from 'redux/reducers/brokers/brokersSlice';
-import useAppParams from 'lib/hooks/useAppParams';
+import { Route, Routes } from 'react-router-dom';
+import { getNonExactPath, RouteParams } from 'lib/paths';
+import BrokersList from 'components/Brokers/List/BrokersList';
+import Broker from 'components/Brokers/Broker/Broker';
+import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 
-const Brokers: React.FC = () => {
-  const dispatch = useAppDispatch();
-  const { clusterName } = useAppParams<ClusterNameRoute>();
-  const {
-    brokerCount,
-    activeControllers,
-    onlinePartitionCount,
-    offlinePartitionCount,
-    inSyncReplicasCount,
-    outOfSyncReplicasCount,
-    underReplicatedPartitionCount,
-    diskUsage,
-    version,
-    items,
-  } = useAppSelector(selectStats);
-
-  const replicas = (inSyncReplicasCount ?? 0) + (outOfSyncReplicasCount ?? 0);
-  const areAllInSync = inSyncReplicasCount && replicas === inSyncReplicasCount;
-  const partitionIsOffline = offlinePartitionCount && offlinePartitionCount > 0;
-  React.useEffect(() => {
-    dispatch(fetchClusterStats(clusterName));
-    dispatch(fetchBrokers(clusterName));
-  }, [clusterName, dispatch]);
-
-  useInterval(() => {
-    fetchClusterStats(clusterName);
-    fetchBrokers(clusterName);
-  }, 5000);
-
-  return (
-    <>
-      <PageHeading text="Brokers" />
-      <Metrics.Wrapper>
-        <Metrics.Section title="Uptime">
-          <Metrics.Indicator label="Total Brokers">
-            {brokerCount}
-          </Metrics.Indicator>
-          <Metrics.Indicator label="Active Controllers">
-            {activeControllers}
-          </Metrics.Indicator>
-          <Metrics.Indicator label="Version">{version}</Metrics.Indicator>
-        </Metrics.Section>
-        <Metrics.Section title="Partitions">
-          <Metrics.Indicator
-            label="Online"
-            isAlert
-            alertType={partitionIsOffline ? 'error' : 'success'}
-          >
-            {partitionIsOffline ? (
-              <Metrics.RedText>{onlinePartitionCount}</Metrics.RedText>
-            ) : (
-              onlinePartitionCount
-            )}
-            <Metrics.LightText>
-              {' '}
-              of {(onlinePartitionCount || 0) + (offlinePartitionCount || 0)}
-            </Metrics.LightText>
-          </Metrics.Indicator>
-          <Metrics.Indicator
-            label="URP"
-            title="Under replicated partitions"
-            isAlert
-            alertType={!underReplicatedPartitionCount ? 'success' : 'error'}
-          >
-            {!underReplicatedPartitionCount ? (
-              <Metrics.LightText>
-                {underReplicatedPartitionCount}
-              </Metrics.LightText>
-            ) : (
-              <Metrics.RedText>{underReplicatedPartitionCount}</Metrics.RedText>
-            )}
-          </Metrics.Indicator>
-          <Metrics.Indicator
-            label="In Sync Replicas"
-            isAlert
-            alertType={areAllInSync ? 'success' : 'error'}
-          >
-            {areAllInSync ? (
-              replicas
-            ) : (
-              <Metrics.RedText>{inSyncReplicasCount}</Metrics.RedText>
-            )}
-            <Metrics.LightText> of {replicas}</Metrics.LightText>
-          </Metrics.Indicator>
-          <Metrics.Indicator label="Out Of Sync Replicas">
-            {outOfSyncReplicasCount}
-          </Metrics.Indicator>
-        </Metrics.Section>
-      </Metrics.Wrapper>
-      <Table isFullwidth>
-        <thead>
-          <tr>
-            <TableHeaderCell title="Broker" />
-            <TableHeaderCell title="Segment Size (Mb)" />
-            <TableHeaderCell title="Segment Count" />
-            <TableHeaderCell title="Port" />
-            <TableHeaderCell title="Host" />
-          </tr>
-        </thead>
-        <tbody>
-          {(!diskUsage || diskUsage.length === 0) && (
-            <tr>
-              <td colSpan={10}>Disk usage data not available</td>
-            </tr>
-          )}
-
-          {diskUsage &&
-            diskUsage.length !== 0 &&
-            diskUsage.map(({ brokerId, segmentSize, segmentCount }) => {
-              const brokerItem = items?.find((item) => item.id === brokerId);
-
-              return (
-                <tr key={brokerId}>
-                  <td>{brokerId}</td>
-                  <td>
-                    <BytesFormatted value={segmentSize} />
-                  </td>
-                  <td>{segmentCount}</td>
-                  <td>{brokerItem?.port}</td>
-                  <td>{brokerItem?.host}</td>
-                </tr>
-              );
-            })}
-        </tbody>
-      </Table>
-    </>
-  );
-};
+const Brokers: React.FC = () => (
+  <Routes>
+    <Route
+      index
+      element={
+        <BreadcrumbRoute>
+          <BrokersList />
+        </BreadcrumbRoute>
+      }
+    />
+    <Route
+      path={getNonExactPath(RouteParams.brokerId)}
+      element={
+        <BreadcrumbRoute>
+          <Broker />
+        </BreadcrumbRoute>
+      }
+    />
+  </Routes>
+);
 
 export default Brokers;
diff --git a/kafka-ui-react-app/src/components/Brokers/List/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/List/BrokersList.tsx
new file mode 100644
index 00000000000..e2451a8fe2d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/List/BrokersList.tsx
@@ -0,0 +1,149 @@
+import React from 'react';
+import { ClusterName } from 'redux/interfaces';
+import useInterval from 'lib/hooks/useInterval';
+import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
+import { NavLink } from 'react-router-dom';
+import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
+import { Table } from 'components/common/table/Table/Table.styled';
+import PageHeading from 'components/common/PageHeading/PageHeading';
+import * as Metrics from 'components/common/Metrics';
+import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
+import {
+  fetchBrokers,
+  fetchClusterStats,
+  selectStats,
+} from 'redux/reducers/brokers/brokersSlice';
+import useAppParams from 'lib/hooks/useAppParams';
+
+const BrokersList: React.FC = () => {
+  const dispatch = useAppDispatch();
+  const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
+  const {
+    brokerCount,
+    activeControllers,
+    onlinePartitionCount,
+    offlinePartitionCount,
+    inSyncReplicasCount,
+    outOfSyncReplicasCount,
+    underReplicatedPartitionCount,
+    diskUsage,
+    version,
+    items,
+  } = useAppSelector(selectStats);
+
+  const replicas = (inSyncReplicasCount ?? 0) + (outOfSyncReplicasCount ?? 0);
+  const areAllInSync = inSyncReplicasCount && replicas === inSyncReplicasCount;
+  const partitionIsOffline = offlinePartitionCount && offlinePartitionCount > 0;
+  React.useEffect(() => {
+    dispatch(fetchClusterStats(clusterName));
+    dispatch(fetchBrokers(clusterName));
+  }, [clusterName, dispatch]);
+
+  useInterval(() => {
+    fetchClusterStats(clusterName);
+    fetchBrokers(clusterName);
+  }, 5000);
+  return (
+    <>
+      <PageHeading text="Broker" />
+      <Metrics.Wrapper>
+        <Metrics.Section title="Uptime">
+          <Metrics.Indicator label="Total Broker">
+            {brokerCount}
+          </Metrics.Indicator>
+          <Metrics.Indicator label="Active Controllers">
+            {activeControllers}
+          </Metrics.Indicator>
+          <Metrics.Indicator label="Version">{version}</Metrics.Indicator>
+        </Metrics.Section>
+        <Metrics.Section title="Partitions">
+          <Metrics.Indicator
+            label="Online"
+            isAlert
+            alertType={partitionIsOffline ? 'error' : 'success'}
+          >
+            {partitionIsOffline ? (
+              <Metrics.RedText>{onlinePartitionCount}</Metrics.RedText>
+            ) : (
+              onlinePartitionCount
+            )}
+            <Metrics.LightText>
+              {' '}
+              of {(onlinePartitionCount || 0) + (offlinePartitionCount || 0)}
+            </Metrics.LightText>
+          </Metrics.Indicator>
+          <Metrics.Indicator
+            label="URP"
+            title="Under replicated partitions"
+            isAlert
+            alertType={!underReplicatedPartitionCount ? 'success' : 'error'}
+          >
+            {!underReplicatedPartitionCount ? (
+              <Metrics.LightText>
+                {underReplicatedPartitionCount}
+              </Metrics.LightText>
+            ) : (
+              <Metrics.RedText>{underReplicatedPartitionCount}</Metrics.RedText>
+            )}
+          </Metrics.Indicator>
+          <Metrics.Indicator
+            label="In Sync Replicas"
+            isAlert
+            alertType={areAllInSync ? 'success' : 'error'}
+          >
+            {areAllInSync ? (
+              replicas
+            ) : (
+              <Metrics.RedText>{inSyncReplicasCount}</Metrics.RedText>
+            )}
+            <Metrics.LightText> of {replicas}</Metrics.LightText>
+          </Metrics.Indicator>
+          <Metrics.Indicator label="Out Of Sync Replicas">
+            {outOfSyncReplicasCount}
+          </Metrics.Indicator>
+        </Metrics.Section>
+      </Metrics.Wrapper>
+      <Table isFullwidth>
+        <thead>
+          <tr>
+            <TableHeaderCell title="Broker" />
+            <TableHeaderCell title="Segment Size" />
+            <TableHeaderCell title="Segment Count" />
+            <TableHeaderCell title="Port" />
+            <TableHeaderCell title="Host" />
+          </tr>
+        </thead>
+        <tbody>
+          {(!diskUsage || diskUsage.length === 0) && (
+            <tr>
+              <td colSpan={10}>Disk usage data not available</td>
+            </tr>
+          )}
+
+          {diskUsage &&
+            diskUsage.length !== 0 &&
+            diskUsage.map(({ brokerId, segmentSize, segmentCount }) => {
+              const brokerItem = items?.find((item) => item.id === brokerId);
+              return (
+                <tr key={brokerId}>
+                  <td>
+                    <NavLink to={`${brokerId}`} role="link">
+                      {brokerId}
+                    </NavLink>
+                  </td>
+                  <td>
+                    <BytesFormatted value={segmentSize} />
+                  </td>
+                  <td>{segmentCount}</td>
+                  <td>{brokerItem?.port}</td>
+                  <td>{brokerItem?.host}</td>
+                </tr>
+              );
+            })}
+        </tbody>
+      </Table>
+    </>
+  );
+};
+
+export default BrokersList;
diff --git a/kafka-ui-react-app/src/components/Brokers/__test__/Brokers.spec.tsx b/kafka-ui-react-app/src/components/Brokers/List/__test__/BrokersList.spec.tsx
similarity index 96%
rename from kafka-ui-react-app/src/components/Brokers/__test__/Brokers.spec.tsx
rename to kafka-ui-react-app/src/components/Brokers/List/__test__/BrokersList.spec.tsx
index 8e5d0157903..3d38e840900 100644
--- a/kafka-ui-react-app/src/components/Brokers/__test__/Brokers.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/List/__test__/BrokersList.spec.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
-import Brokers from 'components/Brokers/Brokers';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen, waitFor } from '@testing-library/dom';
 import { clusterBrokersPath } from 'lib/paths';
 import fetchMock from 'fetch-mock';
 import { clusterStatsPayload } from 'redux/reducers/brokers/__test__/fixtures';
 import { act } from '@testing-library/react';
+import BrokersList from 'components/Brokers/List/BrokersList';
 
-describe('Brokers Component', () => {
+describe('BrokersList Component', () => {
   afterEach(() => fetchMock.reset());
 
   const clusterName = 'local';
@@ -18,14 +18,14 @@ describe('Brokers Component', () => {
   const renderComponent = () =>
     render(
       <WithRoute path={clusterBrokersPath()}>
-        <Brokers />
+        <BrokersList />
       </WithRoute>,
       {
         initialEntries: [clusterBrokersPath(clusterName)],
       }
     );
 
-  describe('Brokers', () => {
+  describe('BrokersList', () => {
     let fetchBrokersMock: fetchMock.FetchMockStatic;
     const fetchStatsUrl = `/api/clusters/${clusterName}/stats`;
 
diff --git a/kafka-ui-react-app/src/components/Brokers/__tests__/Brokers.spec.tsx b/kafka-ui-react-app/src/components/Brokers/__tests__/Brokers.spec.tsx
new file mode 100644
index 00000000000..b445c752c4f
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/__tests__/Brokers.spec.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { render } from 'lib/testHelpers';
+import { screen } from '@testing-library/react';
+import { clusterBrokerPath } from 'lib/paths';
+import Brokers from 'components/Brokers/Brokers';
+
+const brokersList = 'brokersList';
+const broker = 'brokers';
+
+jest.mock('components/Brokers/List/BrokersList', () => () => (
+  <div>{brokersList}</div>
+));
+jest.mock('components/Brokers/Broker/Broker', () => () => <div>{broker}</div>);
+
+describe('Brokers Component', () => {
+  const clusterName = 'clusterName';
+  const brokerId = '1';
+  const renderComponent = (path?: string) => {
+    return render(<Brokers />, {
+      initialEntries: path ? [path] : undefined,
+    });
+  };
+
+  it('renders BrokersList', () => {
+    renderComponent();
+    expect(screen.getByText(brokersList)).toBeInTheDocument();
+  });
+
+  it('renders Broker', () => {
+    renderComponent(clusterBrokerPath(clusterName, brokerId));
+    expect(screen.getByText(broker)).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/translateLogdir.ts b/kafka-ui-react-app/src/components/Brokers/utils/translateLogdir.ts
new file mode 100644
index 00000000000..afdfbfa6633
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/utils/translateLogdir.ts
@@ -0,0 +1,17 @@
+import { BrokersLogdirs } from 'generated-sources';
+import { BrokerLogdirState } from 'components/Brokers/Broker/Broker';
+
+export const translateLogdir = (data: BrokersLogdirs): BrokerLogdirState => {
+  const partitionsCount =
+    data.topics?.reduce(
+      (prevValue, value) => prevValue + (value.partitions?.length || 0),
+      0
+    ) || 0;
+
+  return {
+    name: data.name || '-',
+    error: data.error || '-',
+    topics: data.topics?.length || 0,
+    partitions: partitionsCount,
+  };
+};
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index a608d136aa6..1c4caef0904 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -1,4 +1,5 @@
 import {
+  BrokerId,
   ClusterName,
   ConnectName,
   ConnectorName,
@@ -19,6 +20,7 @@ export enum RouteParams {
   topicName = ':topicName',
   connectName = ':connectName',
   connectorName = ':connectorName',
+  brokerId = ':brokerId',
 }
 
 export const getNonExactPath = (path: string) => `${path}/*`;
@@ -35,6 +37,13 @@ export const clusterBrokersPath = (
   clusterName: ClusterName = RouteParams.clusterName
 ) => `${clusterPath(clusterName)}/${clusterBrokerRelativePath}`;
 
+export const clusterBrokerPath = (
+  clusterName: ClusterName = RouteParams.clusterName,
+  brokerId: BrokerId | string = RouteParams.brokerId
+) => `${clusterBrokersPath(clusterName)}/${brokerId}`;
+
+export type ClusterBrokerParam = { clusterName: ClusterName; brokerId: string };
+
 // Consumer Groups
 export const clusterConsumerGroupsRelativePath = 'consumer-groups';
 export const clusterConsumerGroupResetRelativePath = 'reset-offsets';
diff --git a/kafka-ui-react-app/src/redux/reducers/brokers/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/brokers/__test__/fixtures.ts
index b5b953e6696..864bd7fbc59 100644
--- a/kafka-ui-react-app/src/redux/reducers/brokers/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/redux/reducers/brokers/__test__/fixtures.ts
@@ -1,3 +1,5 @@
+import { BrokersLogdirs } from 'generated-sources';
+
 export const brokersPayload = [
   { id: 1, host: 'b-1.test.kafka.amazonaws.com' },
   { id: 2, host: 'b-2.test.kafka.amazonaws.com' },
@@ -49,3 +51,32 @@ export const updatedBrokersReducerState = {
   ],
   version: '2.2.1',
 };
+
+const partitions = {
+  broker: 2,
+  offsetLag: 0,
+  partition: 2,
+  size: 0,
+};
+const topics = {
+  name: '_confluent-ksql-devquery_CTAS_NUMBER_OF_TESTS_59-Aggregate-Aggregate-Materialize-changelog',
+  partitions: [partitions],
+};
+
+export const clusterStatsPayloadBroker: BrokersLogdirs[] = [
+  {
+    error: 'NONE',
+    name: '/opt/kafka/data-0/logs',
+    topics: [
+      {
+        ...topics,
+        partitions: [partitions, partitions, partitions],
+      },
+      topics,
+      {
+        ...topics,
+        partitions: [],
+      },
+    ],
+  },
+];

From f98c26e4fae6b64cf97ed6061d685f08c021b17e Mon Sep 17 00:00:00 2001
From: azatsafin <azat.safin@gmail.com>
Date: Tue, 7 Jun 2022 00:46:01 +0300
Subject: [PATCH 014/734] Helm: add support for external application config in
 yaml format (#2020)

* support yamlConfigMap

* add support of external config map

* remove test config

* update helm version and readme

* pass kafka-ui.yaml directly as helm chart value

* fix configmap metadata name

* update readme

Co-authored-by: Azat Safin <azsafin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 charts/kafka-ui/Chart.yaml                    |  2 +-
 charts/kafka-ui/README.md                     | 23 +++++----
 charts/kafka-ui/templates/configmap.yaml      |  4 +-
 .../templates/configmap_fromValues.yaml       | 11 ++++
 charts/kafka-ui/templates/deployment.yaml     | 50 ++++++++++++++++---
 charts/kafka-ui/values.yaml                   | 28 +++++++++--
 6 files changed, 96 insertions(+), 22 deletions(-)
 create mode 100644 charts/kafka-ui/templates/configmap_fromValues.yaml

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 822f089f2b0..1177e74887c 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.0.3
+version: 0.0.4
 appVersion: latest
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/README.md b/charts/kafka-ui/README.md
index eac7aa04fd2..5d08629dcb5 100644
--- a/charts/kafka-ui/README.md
+++ b/charts/kafka-ui/README.md
@@ -6,16 +6,19 @@ Most of the Helm charts parameters are common, follow table describe unique para
 
 ### Kafka-UI parameters
 
-| Parameter| Description| Default|
-|---|---|---|
-| `existingConfigMap`| Name of the existing ConfigMap with Kafka-UI environment variables | `nil`|
-| `existingSecret`| Name of the existing Secret with Kafka-UI environment variables| `nil`|
-| `envs.secret`| Set of the sensitive environment variables to pass to Kafka-UI | `{}`|
-| `envs.config`| Set of the environment variables to pass to Kafka-UI | `{}`|
-| `networkPolicy.enabled` | Enable network policies | `false`|
-| `networkPolicy.egressRules.customRules` | Custom network egress policy rules | `[]`|
-| `networkPolicy.ingressRules.customRules` | Custom network ingress policy rules | `[]`|
-| `podLabels` | Extra labels for Kafka-UI pod | `{}`|
+| Parameter                                | Description                                                                                                                                    | Default |
+| ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `existingConfigMap`                      | Name of the existing ConfigMap with Kafka-UI environment variables                                                                             | `nil`   |
+| `existingSecret`                         | Name of the existing Secret with Kafka-UI environment variables                                                                                | `nil`   |
+| `envs.secret`                            | Set of the sensitive environment variables to pass to Kafka-UI                                                                                 | `{}`    |
+| `envs.config`                            | Set of the environment variables to pass to Kafka-UI                                                                                           | `{}`    |
+| `yamlApplicationConfigConfigMap`         | Map with name and keyName keys, name refers to the existing ConfigMap, keyName refers to the ConfigMap key with Kafka-UI config in Yaml format | `{}`    |
+| `yamlApplicationConfig`                  | Kafka-UI config in Yaml format                                                                                                                 | `{}`    |
+| `networkPolicy.enabled`                  | Enable network policies                                                                                                                        | `false` |
+| `networkPolicy.egressRules.customRules`  | Custom network egress policy rules                                                                                                             | `[]`    |
+| `networkPolicy.ingressRules.customRules` | Custom network ingress policy rules                                                                                                            | `[]`    |
+| `podLabels`                              | Extra labels for Kafka-UI pod                                                                                                                  | `{}`    |
+
 
 ## Example
 
diff --git a/charts/kafka-ui/templates/configmap.yaml b/charts/kafka-ui/templates/configmap.yaml
index c802e575222..22d2a69946f 100644
--- a/charts/kafka-ui/templates/configmap.yaml
+++ b/charts/kafka-ui/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.envs.config -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -5,4 +6,5 @@ metadata:
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 data:
-  {{- toYaml .Values.envs.config | nindent 2 }}
\ No newline at end of file
+  {{- toYaml .Values.envs.config | nindent 2 }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/kafka-ui/templates/configmap_fromValues.yaml b/charts/kafka-ui/templates/configmap_fromValues.yaml
new file mode 100644
index 00000000000..55a4e3b328d
--- /dev/null
+++ b/charts/kafka-ui/templates/configmap_fromValues.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.yamlApplicationConfig -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "kafka-ui.fullname" . }}-fromvalues
+  labels:
+    {{- include "kafka-ui.labels" . | nindent 4 }}
+data:
+  config.yml: 
+    {{- toYaml .Values.yamlApplicationConfig | nindent 4}}
+{{ end }}
\ No newline at end of file
diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index 630d93c8329..22149bb7513 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -42,23 +42,37 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- with .Values.env }}
+          {{- if or .Values.env  .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
           env:
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.env }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+            {{- if or .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
+            - name: SPRING_CONFIG_LOCATION
+              {{- if .Values.yamlApplicationConfig }}
+              value: /kafka-ui/config.yml
+              {{- else if .Values.yamlApplicationConfigConfigMap }}
+              value: /kafka-ui/{{ .Values.yamlApplicationConfigConfigMap.keyName | default "config.yml" }}
+              {{- end }}
+            {{- end }}
           {{- end }}
           envFrom:
             {{- if .Values.existingConfigMap }}
             - configMapRef:
                 name: {{ .Values.existingConfigMap }}
             {{- end }}
+            {{- if .Values.envs.config }}
             - configMapRef:
                 name: {{ include "kafka-ui.fullname" . }}
+            {{- end }}
             {{- if .Values.existingSecret }}
             - secretRef:
                 name: {{ .Values.existingSecret }}
             {{- end }}
+            {{- if .Values.envs.secret}}
             - secretRef:
                 name: {{ include "kafka-ui.fullname" . }}
+            {{- end}}    
           ports:
             - name: http
               containerPort: 8080
@@ -81,13 +95,35 @@ spec:
             timeoutSeconds: 10
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          {{- with .Values.volumeMounts }}
+          {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap}}
           volumeMounts:
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.volumeMounts }} 
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+            {{- if .Values.yamlApplicationConfig }}
+            - name: kafka-ui-yaml-conf
+              mountPath: /kafka-ui/
+            {{- end }}
+            {{- if .Values.yamlApplicationConfigConfigMap}}
+            - name: kafka-ui-yaml-conf-configmap
+              mountPath: /kafka-ui/
+            {{- end }}
           {{- end }}
-      {{- with .Values.volumes }}
+      {{- if or .Values.yamlApplicationConfig .Values.volumes .Values.yamlApplicationConfigConfigMap}}
       volumes:
-        {{- toYaml . | nindent 8 }}
+        {{- with .Values.volumes }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- if .Values.yamlApplicationConfig }}
+        - name: kafka-ui-yaml-conf
+          configMap: 
+            name: {{ include "kafka-ui.fullname" . }}-fromvalues
+        {{- end }}
+        {{- if .Values.yamlApplicationConfigConfigMap}}
+        - name: kafka-ui-yaml-conf-configmap
+          configMap: 
+            name: {{ .Values.yamlApplicationConfigConfigMap.name }}
+        {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
@@ -100,4 +136,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
\ No newline at end of file
diff --git a/charts/kafka-ui/values.yaml b/charts/kafka-ui/values.yaml
index 33dcfb0b300..904cb4e6cc2 100644
--- a/charts/kafka-ui/values.yaml
+++ b/charts/kafka-ui/values.yaml
@@ -21,6 +21,25 @@ serviceAccount:
   name: ""
 
 existingConfigMap: ""
+yamlApplicationConfig:
+  {}
+  # kafka:
+  #   clusters:
+  #     - name: yaml
+  #       bootstrapServers: kafka-service:9092
+  # spring:
+  #   security:
+  #     oauth2:
+  # auth:
+  #   type: disabled
+  # management:
+  #   health:
+  #     ldap:
+  #       enabled: false
+yamlApplicationConfigConfigMap:
+  {}
+  # keyName: config.yml
+  # name: configMapName
 existingSecret: ""
 envs:
   secret: {}
@@ -50,10 +69,12 @@ networkPolicy:
 podAnnotations: {}
 podLabels: {}
 
-podSecurityContext: {}
+podSecurityContext:
+  {}
   # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL
@@ -97,7 +118,8 @@ ingress:
   # Http paths to add to the Ingress after the default path
   succeedingPaths: []
 
-resources: {}
+resources:
+  {}
   # limits:
   #   cpu: 200m
   #   memory: 512Mi

From 5fa2bcf5b2d9cd3a90b008d925fd26af82f90647 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Tue, 7 Jun 2022 11:29:06 +0400
Subject: [PATCH 015/734] fixing ksql table (#2115)

---
 kafka-ui-react-app/src/components/KsqlDb/List/List.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
index 8a0e2b42a9c..0e5ccc9facb 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
@@ -73,7 +73,6 @@ const List: FC = () => {
           <Table isFullwidth>
             <thead>
               <tr>
-                <TableHeaderCell title={' '} key="empty cell" />
                 {headers.map(({ Header, accessor }) => (
                   <TableHeaderCell title={Header} key={accessor} />
                 ))}

From 3cd0c2897a30b77854f5b95c06967df8b70efebf Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Tue, 7 Jun 2022 11:15:30 +0300
Subject: [PATCH 016/734] get rid of unused bulma styles. small UI refactoring
 (#2130)

* Get rid of bulma

* Refactor SecondaryTabs

* Refactor Messages View

* Refactor Inputs

* get rid of unused components

* refactoring

* Remove unused bulma styles
---
 .../src/components/App.styled.ts              |  1 +
 .../components/Connect/Details/Details.tsx    |  1 +
 .../src/components/Connect/New/New.styled.ts  | 10 +-
 .../src/components/Connect/New/New.tsx        | 17 ++--
 .../ResetOffsets/ResetOffsets.styled.ts       | 47 ++++-----
 .../Details/ResetOffsets/ResetOffsets.tsx     | 22 ++---
 .../src/components/Topics/List/List.styled.ts |  4 +
 .../src/components/Topics/List/List.tsx       |  8 +-
 .../Topics/Topic/Details/Details.tsx          |  3 +-
 .../Messages/Filters/Filters.styled.ts        | 54 ++++++-----
 .../Details/Messages/Filters/Filters.tsx      |  8 +-
 .../MessageContent/MessageContent.styled.ts   | 37 +++++++-
 .../MessageContent/MessageContent.tsx         | 23 +++--
 .../__tests__/MessageContent.spec.tsx         | 23 +++--
 .../Topic/Details/Settings/ConfigListItem.tsx | 16 +---
 .../Topic/Details/Settings/Settings.styled.ts | 21 ++--
 .../__test__/Settings.styled.spec.tsx         | 41 --------
 .../Topic/SendMessage/SendMessage.styled.tsx  | 16 ++++
 .../Topics/Topic/SendMessage/SendMessage.tsx  | 43 ++++-----
 .../SendMessage/__test__/SendMessage.spec.tsx | 22 +++--
 .../common/Breadcrumb/Breadcrumb.tsx          |  7 +-
 .../DynamicTextButton/DynamicTextButton.tsx   | 43 ---------
 .../__tests__/DynamicTextButton.spec.tsx      | 36 -------
 .../EditorViewer/EditorViewer.styled.ts       |  6 ++
 .../common/EditorViewer/EditorViewer.tsx      | 10 +-
 .../EditorViewer/StyledWrapper.styled.ts      |  8 --
 .../components/common/Input/Input.styled.ts   | 46 ++++++---
 .../src/components/common/Input/Input.tsx     | 29 ++----
 .../common/Input/InputIcon.styled.ts          | 19 ----
 .../common/Pagination/Pagination.tsx          |  4 +-
 .../Pagination/__tests__/Pagination.spec.tsx  |  6 --
 .../common/Tabs/SecondaryTabs.styled.ts       | 38 --------
 .../src/components/common/Tabs/Tabs.tsx       | 55 -----------
 .../common/Tabs/__tests__/Tabs.spec.tsx       | 37 --------
 .../SortableColumnHeader.tsx                  | 26 -----
 .../__tests__/SortableColumnHeader.spec.tsx   | 32 -------
 .../src/theme/bulma_overrides.scss            | 95 -------------------
 kafka-ui-react-app/src/theme/index.scss       | 57 ++---------
 kafka-ui-react-app/src/theme/theme.ts         |  2 +
 kafka-ui-react-app/src/theme/variables.scss   | 12 ---
 40 files changed, 287 insertions(+), 698 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.styled.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/DynamicTextButton/DynamicTextButton.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/DynamicTextButton/__tests__/DynamicTextButton.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/common/EditorViewer/StyledWrapper.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/common/Input/InputIcon.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/common/Tabs/SecondaryTabs.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/common/Tabs/Tabs.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Tabs/__tests__/Tabs.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/table/SortableCulumnHeader/SortableColumnHeader.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/table/__tests__/SortableColumnHeader.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/theme/bulma_overrides.scss
 delete mode 100644 kafka-ui-react-app/src/theme/variables.scss

diff --git a/kafka-ui-react-app/src/components/App.styled.ts b/kafka-ui-react-app/src/components/App.styled.ts
index cb01bd94fc0..b35b324828c 100644
--- a/kafka-ui-react-app/src/components/App.styled.ts
+++ b/kafka-ui-react-app/src/components/App.styled.ts
@@ -14,6 +14,7 @@ export const Container = styled.main(
     margin-top: ${theme.layout.navBarHeight};
     margin-left: ${theme.layout.navBarWidth};
     position: relative;
+    padding-bottom: 30px;
     z-index: 20;
 
     @media screen and (max-width: 1023px) {
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Details.tsx b/kafka-ui-react-app/src/components/Connect/Details/Details.tsx
index f36fe3fedfd..e96dafbe447 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Details.tsx
@@ -74,6 +74,7 @@ const Details: React.FC<DetailsProps> = ({
             connectorName
           )}
           className={({ isActive }) => (isActive ? 'is-active' : '')}
+          end
         >
           Overview
         </NavLink>
diff --git a/kafka-ui-react-app/src/components/Connect/New/New.styled.ts b/kafka-ui-react-app/src/components/Connect/New/New.styled.ts
index c24eff561a3..010dd25938f 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.styled.ts
+++ b/kafka-ui-react-app/src/components/Connect/New/New.styled.ts
@@ -1,4 +1,4 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 
 export const NewConnectFormStyled = styled.form`
   padding: 0 16px 16px;
@@ -10,3 +10,11 @@ export const NewConnectFormStyled = styled.form`
     align-self: flex-start;
   }
 `;
+
+export const Filed = styled.div<{ $hidden: boolean }>(
+  ({ $hidden }) =>
+    $hidden &&
+    css`
+      display: none;
+    `
+);
diff --git a/kafka-ui-react-app/src/components/Connect/New/New.tsx b/kafka-ui-react-app/src/components/Connect/New/New.tsx
index a7b307b283a..6abd51e61f3 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/New.tsx
@@ -10,7 +10,6 @@ import { clusterConnectConnectorPath, ClusterNameRoute } from 'lib/paths';
 import yup from 'lib/yupExtended';
 import Editor from 'components/common/Editor/Editor';
 import PageLoader from 'components/common/PageLoader/PageLoader';
-import { InputLabel } from 'components/common/Input/InputLabel.styled';
 import Select from 'components/common/Select/Select';
 import { FormError } from 'components/common/Input/Input.styled';
 import Input from 'components/common/Input/Input';
@@ -18,6 +17,7 @@ import { Button } from 'components/common/Button/Button';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { createConnector } from 'redux/reducers/connect/connectSlice';
 import { useAppDispatch } from 'lib/hooks/redux';
+import Heading from 'components/common/heading/Heading.styled';
 
 import * as S from './New.styled';
 
@@ -74,11 +74,6 @@ const New: React.FC<NewProps> = ({
     }
   }, [connects, getValues, setValue]);
 
-  const connectNameFieldClassName = React.useMemo(
-    () => (connects.length > 1 ? '' : 'is-hidden'),
-    [connects]
-  );
-
   const onSubmit = async (values: FormValues) => {
     const { connector } = await dispatch(
       createConnector({
@@ -121,8 +116,8 @@ const New: React.FC<NewProps> = ({
         onSubmit={handleSubmit(onSubmit)}
         aria-label="Create connect form"
       >
-        <div className={['field', connectNameFieldClassName].join(' ')}>
-          <InputLabel>Connect *</InputLabel>
+        <S.Filed $hidden={connects.length <= 1}>
+          <Heading level={3}>Connect *</Heading>
           <Controller
             defaultValue={connectOptions[0].value}
             control={control}
@@ -142,10 +137,10 @@ const New: React.FC<NewProps> = ({
           <FormError>
             <ErrorMessage errors={errors} name="connectName" />
           </FormError>
-        </div>
+        </S.Filed>
 
         <div>
-          <InputLabel>Name *</InputLabel>
+          <Heading level={3}>Name</Heading>
           <Input
             inputSize="M"
             placeholder="Connector Name"
@@ -159,7 +154,7 @@ const New: React.FC<NewProps> = ({
         </div>
 
         <div>
-          <InputLabel>Config *</InputLabel>
+          <Heading level={3}>Config</Heading>
           <Controller
             control={control}
             name="config"
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts
index 828d8a3997e..65c5b8371dd 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts
@@ -1,6 +1,7 @@
+import ReactDatePicker from 'react-datepicker';
 import styled from 'styled-components';
 
-export const ResetOffsetsStyledWrapper = styled.div`
+export const Wrapper = styled.div`
   padding: 16px;
   padding-top: 0;
 
@@ -23,32 +24,32 @@ export const ResetOffsetsStyledWrapper = styled.div`
       }
     }
   }
+`;
 
-  & .date-picker {
-    height: 32px;
-    border: 1px ${(props) => props.theme.select.borderColor.normal} solid;
-    border-radius: 4px;
-    font-size: 14px;
-    width: 50%;
-    padding-left: 12px;
-    color: ${(props) => props.theme.select.color.normal};
+export const DatePickerInput = styled(ReactDatePicker)`
+  height: 32px;
+  border: 1px ${(props) => props.theme.select.borderColor.normal} solid;
+  border-radius: 4px;
+  font-size: 14px;
+  width: 50%;
+  padding-left: 12px;
+  color: ${(props) => props.theme.select.color.normal};
 
-    background-image: url('data:image/svg+xml,%3Csvg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M1 1L5 5L9 1" stroke="%23454F54"/%3E%3C/svg%3E%0A') !important;
-    background-repeat: no-repeat !important;
-    background-position-x: 96% !important;
-    background-position-y: 55% !important;
-    appearance: none !important;
+  background-image: url('data:image/svg+xml,%3Csvg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M1 1L5 5L9 1" stroke="%23454F54"/%3E%3C/svg%3E%0A') !important;
+  background-repeat: no-repeat !important;
+  background-position-x: 96% !important;
+  background-position-y: 55% !important;
+  appearance: none !important;
 
-    &:hover {
-      cursor: pointer;
-    }
-    &:focus {
-      outline: none;
-    }
+  &:hover {
+    cursor: pointer;
+  }
+  &:focus {
+    outline: none;
   }
 `;
 
-export const MainSelectorsWrapperStyled = styled.div`
+export const MainSelectors = styled.div`
   display: flex;
   gap: 16px;
   & > * {
@@ -56,14 +57,14 @@ export const MainSelectorsWrapperStyled = styled.div`
   }
 `;
 
-export const OffsetsWrapperStyled = styled.div`
+export const OffsetsWrapper = styled.div`
   display: flex;
   width: 100%;
   flex-wrap: wrap;
   gap: 16px;
 `;
 
-export const OffsetsTitleStyled = styled.h1`
+export const OffsetsTitle = styled.h1`
   font-size: 18px;
   font-weight: 500;
 `;
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
index 7c32d76c0fc..b0d716f1bcf 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
@@ -32,12 +32,7 @@ import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 
-import {
-  MainSelectorsWrapperStyled,
-  OffsetsWrapperStyled,
-  ResetOffsetsStyledWrapper,
-  OffsetsTitleStyled,
-} from './ResetOffsets.styled';
+import * as S from './ResetOffsets.styled';
 
 interface FormType {
   topic: string;
@@ -176,9 +171,9 @@ const ResetOffsets: React.FC = () => {
   return (
     <FormProvider {...methods}>
       <PageHeading text="Reset offsets" />
-      <ResetOffsetsStyledWrapper>
+      <S.Wrapper>
         <form onSubmit={handleSubmit(onSubmit)}>
-          <MainSelectorsWrapperStyled>
+          <S.MainSelectors>
             <div>
               <InputLabel id="topicLabel">Topic</InputLabel>
               <Controller
@@ -239,7 +234,7 @@ const ResetOffsets: React.FC = () => {
                 labelledBy="Select partitions"
               />
             </div>
-          </MainSelectorsWrapperStyled>
+          </S.MainSelectors>
           {resetTypeValue === ConsumerGroupOffsetsResetType.TIMESTAMP &&
             selectedPartitions.length > 0 && (
               <div>
@@ -256,7 +251,6 @@ const ResetOffsets: React.FC = () => {
                       showTimeInput
                       timeInputLabel="Time:"
                       dateFormat="MMMM d, yyyy h:mm aa"
-                      className="date-picker"
                     />
                   )}
                 />
@@ -270,8 +264,8 @@ const ResetOffsets: React.FC = () => {
           {resetTypeValue === ConsumerGroupOffsetsResetType.OFFSET &&
             selectedPartitions.length > 0 && (
               <div>
-                <OffsetsTitleStyled>Offsets</OffsetsTitleStyled>
-                <OffsetsWrapperStyled>
+                <S.OffsetsTitle>Offsets</S.OffsetsTitle>
+                <S.OffsetsWrapper>
                   {fields.map((field, index) => (
                     <div key={field.id}>
                       <InputLabel htmlFor={`partitionsOffsets.${index}.offset`}>
@@ -299,7 +293,7 @@ const ResetOffsets: React.FC = () => {
                       />
                     </div>
                   ))}
-                </OffsetsWrapperStyled>
+                </S.OffsetsWrapper>
               </div>
             )}
           <Button
@@ -311,7 +305,7 @@ const ResetOffsets: React.FC = () => {
             Submit
           </Button>
         </form>
-      </ResetOffsetsStyledWrapper>
+      </S.Wrapper>
     </FormProvider>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/List/List.styled.ts b/kafka-ui-react-app/src/components/Topics/List/List.styled.ts
index abda595b459..c1324deb7d2 100644
--- a/kafka-ui-react-app/src/components/Topics/List/List.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/List/List.styled.ts
@@ -26,3 +26,7 @@ export const ActionsTd = styled(Td)`
   overflow: visible;
   width: 50px;
 `;
+
+export const ActionsContainer = styled.div`
+  text-align: right !important;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/List/List.tsx b/kafka-ui-react-app/src/components/Topics/List/List.tsx
index 42a9796c968..be8609cae0e 100644
--- a/kafka-ui-react-app/src/components/Topics/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/List.tsx
@@ -46,7 +46,7 @@ import {
   TitleCell,
   TopicSizeCell,
 } from './TopicsTableCells';
-import { ActionsTd } from './List.styled';
+import * as S from './List.styled';
 
 export interface TopicsListProps {
   areTopicsFetching: boolean;
@@ -239,7 +239,7 @@ const List: React.FC<TopicsListProps> = ({
 
       return (
         <>
-          <div className="has-text-right">
+          <S.ActionsContainer>
             {!isHidden && (
               <Dropdown label={<VerticalElipsisIcon />} right>
                 {cleanUpPolicy === CleanUpPolicy.DELETE && (
@@ -257,7 +257,7 @@ const List: React.FC<TopicsListProps> = ({
                 </DropdownItem>
               </Dropdown>
             )}
-          </div>
+          </S.ActionsContainer>
           <ConfirmationModal
             isOpen={isClearMessagesModalOpen}
             onCancel={closeClearMessagesModal}
@@ -404,7 +404,7 @@ const List: React.FC<TopicsListProps> = ({
             <TableColumn
               maxWidth="4%"
               cell={ActionsCell}
-              customTd={ActionsTd}
+              customTd={S.ActionsTd}
             />
           </SmartTable>
         </div>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
index 69540fdc284..177d258d922 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
@@ -189,7 +189,8 @@ const Details: React.FC<Props> = ({
       <Navbar role="navigation">
         <NavLink
           to="."
-          className={({ isActive }) => (isActive ? 'is-active is-primary' : '')}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+          end
         >
           Overview
         </NavLink>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
index e0010944a84..296c27b4ecb 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
@@ -1,5 +1,7 @@
+import Input from 'components/common/Input/Input';
 import Select from 'components/common/Select/Select';
 import styled, { css } from 'styled-components';
+import DatePicker from 'react-datepicker';
 
 interface SavedFilterProps {
   selected: boolean;
@@ -44,34 +46,34 @@ export const SeekTypeSelectorWrapper = styled.div`
       border-radius: 4px 0 0 4px !important;
     }
   }
+`;
 
-  & .offset-selector {
-    border-radius: 0 4px 4px 0 !important;
-    border-left: none;
-  }
+export const OffsetSelector = styled(Input)`
+  border-radius: 0 4px 4px 0 !important;
+  border-left: none;
+`;
 
-  & .date-picker {
-    height: 32px;
-    border: 1px ${(props) => props.theme.select.borderColor.normal} solid;
-    border-left: none;
-    border-radius: 0 4px 4px 0;
-    font-size: 14px;
-    width: 100%;
-    padding-left: 12px;
-    color: ${(props) => props.theme.select.color.normal};
-
-    background-image: url('data:image/svg+xml,%3Csvg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M1 1L5 5L9 1" stroke="%23454F54"/%3E%3C/svg%3E%0A') !important;
-    background-repeat: no-repeat !important;
-    background-position-x: 96% !important;
-    background-position-y: 55% !important;
-    appearance: none !important;
-
-    &:hover {
-      cursor: pointer;
-    }
-    &:focus {
-      outline: none;
-    }
+export const DatePickerInput = styled(DatePicker)`
+  height: 32px;
+  border: 1px ${(props) => props.theme.select.borderColor.normal} solid;
+  border-left: none;
+  border-radius: 0 4px 4px 0;
+  font-size: 14px;
+  width: 100%;
+  padding-left: 12px;
+  color: ${(props) => props.theme.select.color.normal};
+
+  background-image: url('data:image/svg+xml,%3Csvg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M1 1L5 5L9 1" stroke="%23454F54"/%3E%3C/svg%3E%0A') !important;
+  background-repeat: no-repeat !important;
+  background-position-x: 96% !important;
+  background-position-y: 55% !important;
+  appearance: none !important;
+
+  &:hover {
+    cursor: pointer;
+  }
+  &:focus {
+    outline: none;
   }
 `;
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
index cb561992873..0d1cb96a47e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
@@ -13,12 +13,10 @@ import {
 import React, { useContext } from 'react';
 import { omitBy } from 'lodash';
 import { useNavigate, useLocation } from 'react-router-dom';
-import DatePicker from 'react-datepicker';
 import MultiSelect from 'components/common/MultiSelect/MultiSelect.styled';
 import { Option } from 'react-multi-select-component/dist/lib/interfaces';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { BASE_PARAMS } from 'lib/constants';
-import Input from 'components/common/Input/Input';
 import Select from 'components/common/Select/Select';
 import { Button } from 'components/common/Button/Button';
 import Search from 'components/common/Search/Search';
@@ -398,24 +396,22 @@ const Filters: React.FC<FiltersProps> = ({
               disabled={isTailing}
             />
             {currentSeekType === SeekType.OFFSET ? (
-              <Input
+              <S.OffsetSelector
                 id="offset"
                 type="text"
                 inputSize="M"
                 value={offset}
-                className="offset-selector"
                 placeholder="Offset"
                 onChange={({ target: { value } }) => setOffset(value)}
                 disabled={isTailing}
               />
             ) : (
-              <DatePicker
+              <S.DatePickerInput
                 selected={timestamp}
                 onChange={(date: Date | null) => setTimestamp(date)}
                 showTimeInput
                 timeInputLabel="Time:"
                 dateFormat="MMMM d, yyyy HH:mm"
-                className="date-picker"
                 placeholderText="Select timestamp"
                 disabled={isTailing}
               />
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
index 092bf6803b8..de0967b4ab8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
@@ -1,4 +1,5 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
+import * as SEditorViewer from 'components/common/EditorViewer/EditorViewer.styled';
 
 export const Wrapper = styled.tr`
   background-color: ${({ theme }) => theme.topicMetaData.backgroundColor};
@@ -25,9 +26,15 @@ export const ContentBox = styled.div`
   padding: 24px;
   border-radius: 8px 0 0 8px;
   flex-grow: 3;
+  display: flex;
+  flex-direction: column;
   & nav {
     padding-bottom: 16px;
   }
+
+  ${SEditorViewer.Wrapper} {
+    flex-grow: 1;
+  }
 `;
 
 export const MetadataWrapper = styled.div`
@@ -77,3 +84,31 @@ export const PaginationButton = styled.button`
   cursor: pointer;
   font-size: 14px;
 `;
+
+export const Tab = styled.button<{ $active?: boolean }>(
+  ({ theme, $active }) => css`
+    background-color: ${theme.secondaryTab.backgroundColor[
+      $active ? 'active' : 'normal'
+    ]};
+    color: ${theme.secondaryTab.color[$active ? 'active' : 'normal']};
+    padding: 6px 16px;
+    height: 32px;
+    border: 1px solid ${theme.layout.stuffBorderColor};
+    cursor: pointer;
+    &:hover {
+      background-color: ${theme.secondaryTab.backgroundColor.hover};
+      color: ${theme.secondaryTab.color.hover};
+    }
+    &:first-child {
+      border-radius: 4px 0 0 4px;
+    }
+    &:last-child {
+      border-radius: 0 4px 4px 0;
+    }
+    &:not(:last-child) {
+      border-right: 0px;
+    }
+  `
+);
+
+export const Tabs = styled.nav``;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx
index 5d226b11159..0b8d47a5bf7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx
@@ -1,7 +1,6 @@
 import { TopicMessageTimestampTypeEnum, SchemaType } from 'generated-sources';
 import React from 'react';
 import EditorViewer from 'components/common/EditorViewer/EditorViewer';
-import { SecondaryTabs } from 'components/common/Tabs/SecondaryTabs.styled';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import dayjs from 'dayjs';
 
@@ -62,29 +61,29 @@ const MessageContent: React.FC<MessageContentProps> = ({
       <td colSpan={10}>
         <S.Section>
           <S.ContentBox>
-            <SecondaryTabs>
-              <button
+            <S.Tabs>
+              <S.Tab
                 type="button"
-                className={activeTab === 'key' ? 'is-active' : ''}
+                $active={activeTab === 'key'}
                 onClick={handleKeyTabClick}
               >
                 Key
-              </button>
-              <button
-                className={activeTab === 'content' ? 'is-active' : ''}
+              </S.Tab>
+              <S.Tab
+                $active={activeTab === 'content'}
                 type="button"
                 onClick={handleContentTabClick}
               >
                 Content
-              </button>
-              <button
-                className={activeTab === 'headers' ? 'is-active' : ''}
+              </S.Tab>
+              <S.Tab
+                $active={activeTab === 'headers'}
                 type="button"
                 onClick={handleHeadersTabClick}
               >
                 Headers
-              </button>
-            </SecondaryTabs>
+              </S.Tab>
+            </S.Tabs>
             <EditorViewer
               data={activeTabContent() || ''}
               maxLines={28}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.spec.tsx
index ee6b15da917..ea9589341d0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.spec.tsx
@@ -8,6 +8,7 @@ import MessageContent, {
 import { TopicMessageTimestampTypeEnum } from 'generated-sources';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
+import theme from 'theme/theme';
 
 const setupWrapper = (props?: Partial<MessageContentProps>) => {
   return (
@@ -49,26 +50,34 @@ describe('MessageContent screen', () => {
   });
 
   describe('when switched to display the key', () => {
-    it('has a tab with is-active classname', () => {
+    it('makes key tab active', () => {
       const keyTab = screen.getAllByText('Key');
       userEvent.click(keyTab[0]);
-      expect(keyTab[0]).toHaveClass('is-active');
+      expect(keyTab[0]).toHaveStyleRule(
+        'background-color',
+        theme.secondaryTab.backgroundColor.active
+      );
     });
   });
 
   describe('when switched to display the headers', () => {
-    it('has a tab with is-active classname', () => {
+    it('makes Headers tab active', () => {
       userEvent.click(screen.getByText('Headers'));
-      expect(screen.getByText('Headers')).toHaveClass('is-active');
+      expect(screen.getByText('Headers')).toHaveStyleRule(
+        'background-color',
+        theme.secondaryTab.backgroundColor.active
+      );
     });
   });
 
   describe('when switched to display the content', () => {
-    it('has a tab with is-active classname', () => {
-      userEvent.click(screen.getByText('Headers'));
+    it('makes content tab active', () => {
       const contentTab = screen.getAllByText('Content');
       userEvent.click(contentTab[0]);
-      expect(contentTab[0]).toHaveClass('is-active');
+      expect(contentTab[0]).toHaveStyleRule(
+        'background-color',
+        theme.secondaryTab.backgroundColor.active
+      );
     });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/ConfigListItem.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/ConfigListItem.tsx
index 121ab456848..cc0b36caa05 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/ConfigListItem.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/ConfigListItem.tsx
@@ -13,17 +13,11 @@ const ConfigListItem: React.FC<ListItemProps> = ({
   const hasCustomValue = !!defaultValue && value !== defaultValue;
 
   return (
-    <S.ConfigList>
-      <S.ConfigItemCell $hasCustomValue={hasCustomValue}>
-        {name}
-      </S.ConfigItemCell>
-      <S.ConfigItemCell $hasCustomValue={hasCustomValue}>
-        {value}
-      </S.ConfigItemCell>
-      <td className="has-text-grey" title="Default Value">
-        {hasCustomValue && defaultValue}
-      </td>
-    </S.ConfigList>
+    <S.Row $hasCustomValue={hasCustomValue}>
+      <td>{name}</td>
+      <td>{value}</td>
+      <td title="Default Value">{hasCustomValue && defaultValue}</td>
+    </S.Row>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.styled.ts
index bc15ab49a9d..30aa0f2afe6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.styled.ts
@@ -1,10 +1,13 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 
-export const ConfigList = styled.tr`
-  & > td:last-child {
-    color: ${({ theme }) => theme.configList.color};
-  }
-`;
-export const ConfigItemCell = styled.td<{ $hasCustomValue: boolean }>`
-  font-weight: ${(props) => (props.$hasCustomValue ? 500 : 400)} !important;
-`;
+export const Row = styled.tr<{ $hasCustomValue?: boolean }>(
+  ({ theme, $hasCustomValue }) => css`
+    & > td {
+      font-weight: ${$hasCustomValue ? 500 : 400};
+      &:last-child {
+        color: ${theme.configList.color};
+        font-weight: 400;
+      }
+    }
+  `
+);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.styled.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.styled.spec.tsx
deleted file mode 100644
index 01c5981e438..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.styled.spec.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { screen } from '@testing-library/react';
-import { render } from 'lib/testHelpers';
-import { ConfigItemCell } from 'components/Topics/Topic/Details/Settings/Settings.styled';
-
-describe('Settings styled Components', () => {
-  describe('ConfigItemCell Component', () => {
-    const renderComponent = (
-      props: Partial<{ $hasCustomValue: boolean }> = {}
-    ) => {
-      return render(
-        <table>
-          <tbody>
-            <tr>
-              <ConfigItemCell
-                $hasCustomValue={
-                  '$hasCustomValue' in props ? !!props.$hasCustomValue : false
-                }
-              />
-            </tr>
-          </tbody>
-        </table>
-      );
-    };
-    it('should check the true rendering ConfigItemList', () => {
-      renderComponent({ $hasCustomValue: true });
-      expect(screen.getByRole('cell')).toHaveStyleRule(
-        'font-weight',
-        '500 !important'
-      );
-    });
-
-    it('should check the true rendering ConfigItemList', () => {
-      renderComponent();
-      expect(screen.getByRole('cell')).toHaveStyleRule(
-        'font-weight',
-        '400 !important'
-      );
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx
index c4c32d5d464..55613b1694c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx
@@ -5,3 +5,19 @@ export const Wrapper = styled.div`
   padding: 1.25rem;
   border-radius: 6px;
 `;
+
+export const Columns = styled.div`
+  margin: -0.75rem;
+  margin-bottom: 0.75rem;
+
+  @media screen and (min-width: 769px) {
+    display: flex;
+  }
+`;
+
+export const Column = styled.div`
+  flex-basis: 0;
+  flex-grow: 1;
+  flex-shrink: 1;
+  padding: 0.75rem;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 567e094e8aa..c2a0feaa78a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -24,6 +24,7 @@ import {
 } from 'redux/reducers/topics/selectors';
 import Select, { SelectOption } from 'components/common/Select/Select';
 import useAppParams from 'lib/hooks/useAppParams';
+import Heading from 'components/common/heading/Heading.styled';
 
 import validateMessage from './validateMessage';
 import * as S from './SendMessage.styled';
@@ -166,15 +167,9 @@ const SendMessage: React.FC = () => {
   return (
     <S.Wrapper>
       <form onSubmit={handleSubmit(onSubmit)}>
-        <div className="columns">
-          <div>
-            <label
-              className="label"
-              id="selectPartitionOptions"
-              htmlFor="selectPartitionOptions"
-            >
-              Partition
-            </label>
+        <S.Columns>
+          <S.Column>
+            <Heading level={3}>Partition</Heading>
             <Controller
               control={control}
               name="partition"
@@ -191,12 +186,12 @@ const SendMessage: React.FC = () => {
                 />
               )}
             />
-          </div>
-        </div>
+          </S.Column>
+        </S.Columns>
 
-        <div className="columns">
-          <div className="column is-one-half">
-            <label className="label">Key</label>
+        <S.Columns>
+          <S.Column>
+            <Heading level={3}>Key</Heading>
             <Controller
               control={control}
               name="key"
@@ -209,9 +204,9 @@ const SendMessage: React.FC = () => {
                 />
               )}
             />
-          </div>
-          <div className="column is-one-half">
-            <label className="label">Content</label>
+          </S.Column>
+          <S.Column>
+            <Heading level={3}>Content</Heading>
             <Controller
               control={control}
               name="content"
@@ -224,11 +219,11 @@ const SendMessage: React.FC = () => {
                 />
               )}
             />
-          </div>
-        </div>
-        <div className="columns">
-          <div className="column">
-            <label className="label">Headers</label>
+          </S.Column>
+        </S.Columns>
+        <S.Columns>
+          <S.Column>
+            <Heading level={3}>Headers</Heading>
             <Controller
               control={control}
               name="headers"
@@ -242,8 +237,8 @@ const SendMessage: React.FC = () => {
                 />
               )}
             />
-          </div>
-        </div>
+          </S.Column>
+        </S.Columns>
         <Button
           buttonSize="M"
           buttonType="primary"
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
index dcc9e839dba..ec37ec33200 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
@@ -64,7 +64,7 @@ const renderAndSubmitData = async (error: string[] = []) => {
   await renderComponent();
   expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
   await act(() => {
-    userEvent.click(screen.getByLabelText('Partition'));
+    userEvent.click(screen.getByRole('listbox'));
   });
   await act(() => {
     userEvent.click(screen.getAllByRole('option')[1]);
@@ -108,7 +108,8 @@ describe('SendMessage', () => {
   });
 
   describe('when schema is fetched', () => {
-    const url = `/api/clusters/${clusterName}/topics/${topicName}/messages`;
+    const messagesUrl = `/api/clusters/${clusterName}/topics/${topicName}/messages`;
+    const detailsUrl = `/api/clusters/${clusterName}/topics/${topicName}`;
 
     beforeEach(() => {
       fetchMock.getOnce(
@@ -118,20 +119,25 @@ describe('SendMessage', () => {
     });
 
     it('calls sendTopicMessage on submit', async () => {
-      const sendTopicMessageMock = fetchMock.postOnce(url, 200);
+      const sendTopicMessageMock = fetchMock.postOnce(messagesUrl, 200);
+      const fetchTopicDetailsMock = fetchMock.getOnce(detailsUrl, 200);
+
       await renderAndSubmitData();
-      expect(sendTopicMessageMock.called(url)).toBeTruthy();
+      expect(sendTopicMessageMock.called(messagesUrl)).toBeTruthy();
+      expect(fetchTopicDetailsMock.called(detailsUrl)).toBeTruthy();
       expect(mockNavigate).toHaveBeenLastCalledWith(
         `../${clusterTopicMessagesRelativePath}`
       );
     });
 
     it('should make the sendTopicMessage but most find an error within it', async () => {
-      const sendTopicMessageMock = fetchMock.postOnce(url, {
+      const sendTopicMessageMock = fetchMock.postOnce(messagesUrl, {
         throws: 'Error',
       });
+      const fetchTopicDetailsMock = fetchMock.getOnce(detailsUrl, 200);
       await renderAndSubmitData();
-      expect(sendTopicMessageMock.called(url)).toBeTruthy();
+      expect(sendTopicMessageMock.called()).toBeTruthy();
+      expect(fetchTopicDetailsMock.called(detailsUrl)).toBeFalsy();
       expect(screen.getByRole('alert')).toBeInTheDocument();
       expect(mockNavigate).toHaveBeenLastCalledWith(
         `../${clusterTopicMessagesRelativePath}`
@@ -139,9 +145,9 @@ describe('SendMessage', () => {
     });
 
     it('should check and view validation error message when is not valid', async () => {
-      const sendTopicMessageMock = fetchMock.postOnce(url, 200);
+      const sendTopicMessageMock = fetchMock.postOnce(messagesUrl, 200);
       await renderAndSubmitData(['error']);
-      expect(sendTopicMessageMock.called(url)).toBeFalsy();
+      expect(sendTopicMessageMock.called(messagesUrl)).toBeFalsy();
       expect(mockNavigate).not.toHaveBeenCalled();
     });
   });
diff --git a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.tsx b/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.tsx
index d935db2fac6..9dd09943a2c 100644
--- a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.tsx
+++ b/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.tsx
@@ -1,6 +1,5 @@
 import React, { useContext } from 'react';
 import { Link } from 'react-router-dom';
-import cn from 'classnames';
 import { clusterPath } from 'lib/paths';
 import { BREADCRUMB_DEFINITIONS } from 'lib/constants';
 
@@ -40,11 +39,7 @@ const Breadcrumb: React.FC = () => {
           </Link>
         </li>
       ))}
-      <li
-        className={cn('is-active', {
-          'is-size-4 has-text-weight-medium is-capitalized': links.length < 2,
-        })}
-      >
+      <li>
         <span>{links[links.length - 1]}</span>
       </li>
     </BreadcrumbWrapper>
diff --git a/kafka-ui-react-app/src/components/common/DynamicTextButton/DynamicTextButton.tsx b/kafka-ui-react-app/src/components/common/DynamicTextButton/DynamicTextButton.tsx
deleted file mode 100644
index 732cfa5178f..00000000000
--- a/kafka-ui-react-app/src/components/common/DynamicTextButton/DynamicTextButton.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { useRef } from 'react';
-import cx from 'classnames';
-
-interface DynamicTextButtonProps {
-  onClick(): void;
-  className?: string;
-  title: string;
-  delay?: number;
-  render(clicked: boolean): React.ReactNode;
-}
-
-const DynamicTextButton: React.FC<DynamicTextButtonProps> = ({
-  onClick,
-  className,
-  title,
-  render,
-  delay = 3000,
-}) => {
-  const [clicked, setClicked] = React.useState(false);
-
-  const timeout = useRef(0);
-
-  const clickHandler = () => {
-    onClick();
-    setClicked(true);
-    timeout.current = window.setTimeout(() => setClicked(false), delay);
-  };
-
-  React.useEffect(() => () => window.clearTimeout(timeout.current));
-
-  return (
-    <button
-      className={cx('button', className)}
-      title={title}
-      type="button"
-      onClick={clickHandler}
-    >
-      {render(clicked)}
-    </button>
-  );
-};
-
-export default DynamicTextButton;
diff --git a/kafka-ui-react-app/src/components/common/DynamicTextButton/__tests__/DynamicTextButton.spec.tsx b/kafka-ui-react-app/src/components/common/DynamicTextButton/__tests__/DynamicTextButton.spec.tsx
deleted file mode 100644
index 21dec04e806..00000000000
--- a/kafka-ui-react-app/src/components/common/DynamicTextButton/__tests__/DynamicTextButton.spec.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import DynamicTextButton from 'components/common/DynamicTextButton/DynamicTextButton';
-import { render } from 'lib/testHelpers';
-import userEvent from '@testing-library/user-event';
-import { screen } from '@testing-library/react';
-
-describe('DynamicButton', () => {
-  const mockCallback = jest.fn();
-  it('exectutes callback', () => {
-    render(
-      <DynamicTextButton
-        onClick={mockCallback}
-        title="title"
-        render={() => 'text'}
-      />
-    );
-
-    userEvent.click(screen.getByTitle('title'));
-    expect(mockCallback).toBeCalled();
-  });
-
-  it('changes the text', () => {
-    render(
-      <DynamicTextButton
-        onClick={mockCallback}
-        title="title"
-        render={(clicked) => (clicked ? 'active' : 'default')}
-      />
-    );
-
-    const button = screen.getByTitle('title');
-    expect(button).toHaveTextContent('default');
-    userEvent.click(button);
-    expect(button).toHaveTextContent('active');
-  });
-});
diff --git a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts
new file mode 100644
index 00000000000..dc925485732
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts
@@ -0,0 +1,6 @@
+import styled from 'styled-components';
+
+export const Wrapper = styled.div`
+  background-color: ${({ theme }) => theme.viewer.wrapper};
+  padding: 8px 16px;
+`;
diff --git a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx
index 8caff44cbb8..23456c402e9 100644
--- a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx
+++ b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import Editor from 'components/common/Editor/Editor';
 import { SchemaType } from 'generated-sources';
 
-import { StyledWrapper } from './StyledWrapper.styled';
+import * as S from './EditorViewer.styled';
 
 export interface FullMessageProps {
   data: string;
@@ -23,7 +23,7 @@ const EditorViewer: React.FC<FullMessageProps> = ({
 }) => {
   try {
     return (
-      <StyledWrapper>
+      <S.Wrapper>
         <Editor
           isFixedHeight
           schemaType={schemaType}
@@ -36,13 +36,13 @@ const EditorViewer: React.FC<FullMessageProps> = ({
           }}
           readOnly
         />
-      </StyledWrapper>
+      </S.Wrapper>
     );
   } catch (e) {
     return (
-      <StyledWrapper>
+      <S.Wrapper>
         <p>{data}</p>
-      </StyledWrapper>
+      </S.Wrapper>
     );
   }
 };
diff --git a/kafka-ui-react-app/src/components/common/EditorViewer/StyledWrapper.styled.ts b/kafka-ui-react-app/src/components/common/EditorViewer/StyledWrapper.styled.ts
deleted file mode 100644
index cd2bccaae54..00000000000
--- a/kafka-ui-react-app/src/components/common/EditorViewer/StyledWrapper.styled.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled, { css } from 'styled-components';
-
-export const StyledWrapper = styled.div(
-  ({ theme }) => css`
-    background-color: ${theme.viewer.wrapper};
-    padding: 8px 16px;
-  `
-);
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
index 06bcce4f42b..6d75e55a9ed 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
@@ -5,41 +5,45 @@ export interface InputProps {
   hasLeftIcon: boolean;
 }
 
+export const Wrapper = styled.div`
+  position: relative;
+`;
+
 export const Input = styled.input<InputProps>(
-  ({ theme, ...props }) => css`
-    border: 1px ${theme.input.borderColor.normal} solid;
+  ({ theme: { input }, inputSize, hasLeftIcon }) => css`
+    border: 1px ${input.borderColor.normal} solid;
     border-radius: 4px;
-    height: ${props.inputSize === 'M' ? '32px' : '40px'};
+    height: ${inputSize === 'M' ? '32px' : '40px'};
     width: 100%;
-    padding-left: ${props.hasLeftIcon ? '36px' : '12px'};
+    padding-left: ${hasLeftIcon ? '36px' : '12px'};
     font-size: 14px;
 
     &::placeholder {
-      color: ${theme.input.color.placeholder.normal};
+      color: ${input.color.placeholder.normal};
       font-size: 14px;
     }
     &:hover {
-      border-color: ${theme.input.borderColor.hover};
+      border-color: ${input.borderColor.hover};
     }
     &:focus {
       outline: none;
-      border-color: ${theme.input.borderColor.focus};
+      border-color: ${input.borderColor.focus};
       &::placeholder {
         color: transparent;
       }
     }
     &:disabled {
-      color: ${theme.input.color.disabled};
-      border-color: ${theme.input.borderColor.disabled};
+      color: ${input.color.disabled};
+      border-color: ${input.borderColor.disabled};
       cursor: not-allowed;
     }
     &:read-only {
-      color: ${theme.input.color.readOnly};
+      color: ${input.color.readOnly};
       border: none;
-      background-color: ${theme.input.backgroundColor.readOnly};
+      background-color: ${input.backgroundColor.readOnly};
       &:focus {
         &::placeholder {
-          color: ${theme.input.color.placeholder.readOnly};
+          color: ${input.color.placeholder.readOnly};
         }
       }
       cursor: not-allowed;
@@ -51,3 +55,21 @@ export const FormError = styled.p`
   color: ${({ theme }) => theme.input.error};
   font-size: 12px;
 `;
+
+interface InputIconProps {
+  className: string;
+  position: 'left' | 'right';
+  inputSize: 'M' | 'L';
+}
+
+export const InputIcon = styled.i<InputIconProps>`
+  position: absolute;
+  top: 50%;
+  line-height: 0;
+  z-index: 1;
+  left: ${({ position }) => (position === 'left' ? '12px' : 'unset')};
+  right: ${({ position }) => (position === 'right' ? '15px' : 'unset')};
+  height: 11px;
+  width: 11px;
+  color: ${({ theme }) => theme.input.icon.color};
+`;
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.tsx b/kafka-ui-react-app/src/components/common/Input/Input.tsx
index ecc5eea317e..fd7951332f0 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/Input.tsx
@@ -1,8 +1,6 @@
 import React from 'react';
 import { RegisterOptions, useFormContext } from 'react-hook-form';
-import styled from 'styled-components';
 
-import { InputIcon } from './InputIcon.styled';
 import * as S from './Input.styled';
 
 export interface InputProps
@@ -15,7 +13,6 @@ export interface InputProps
 }
 
 const Input: React.FC<InputProps> = ({
-  className,
   name,
   hookFormOptions,
   leftIcon,
@@ -25,39 +22,33 @@ const Input: React.FC<InputProps> = ({
 }) => {
   const methods = useFormContext();
   return (
-    <div className={className}>
+    <S.Wrapper>
       {leftIcon && (
-        <InputIcon className={leftIcon} position="left" inputSize={inputSize} />
+        <S.InputIcon
+          className={leftIcon}
+          position="left"
+          inputSize={inputSize}
+        />
       )}
       {name ? (
         <S.Input
-          className={className}
           inputSize={inputSize}
           {...methods.register(name, { ...hookFormOptions })}
           hasLeftIcon={!!leftIcon}
           {...rest}
         />
       ) : (
-        <S.Input
-          className={className}
-          inputSize={inputSize}
-          hasLeftIcon={!!leftIcon}
-          {...rest}
-        />
+        <S.Input inputSize={inputSize} hasLeftIcon={!!leftIcon} {...rest} />
       )}
       {rightIcon && (
-        <InputIcon
+        <S.InputIcon
           className={rightIcon}
           position="right"
           inputSize={inputSize}
         />
       )}
-    </div>
+    </S.Wrapper>
   );
 };
 
-const InputWrapper = styled(Input)`
-  position: relative;
-`;
-
-export default InputWrapper;
+export default Input;
diff --git a/kafka-ui-react-app/src/components/common/Input/InputIcon.styled.ts b/kafka-ui-react-app/src/components/common/Input/InputIcon.styled.ts
deleted file mode 100644
index 470bb330dd2..00000000000
--- a/kafka-ui-react-app/src/components/common/Input/InputIcon.styled.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import styled from 'styled-components';
-
-interface Props {
-  className: string;
-  position: 'left' | 'right';
-  inputSize: 'M' | 'L';
-}
-
-export const InputIcon = styled.i<Props>`
-  position: absolute;
-  top: 50%;
-  line-height: 0;
-  z-index: 1;
-  left: ${(props) => (props.position === 'left' ? '12px' : 'unset')};
-  right: ${(props) => (props.position === 'right' ? '15px' : 'unset')};
-  height: 11px;
-  width: 11px;
-  color: ${({ theme }) => theme.input.icon.color};
-`;
diff --git a/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx b/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
index 7da12b479de..67a11f95866 100644
--- a/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
+++ b/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
@@ -90,7 +90,7 @@ const Pagination: React.FC<PaginationProps> = ({ totalPages }) => {
           )}
           {!pages.includes(2) && (
             <li>
-              <span className="pagination-ellipsis">&hellip;</span>
+              <span>&hellip;</span>
             </li>
           )}
           {pages.map((p) => (
@@ -103,7 +103,7 @@ const Pagination: React.FC<PaginationProps> = ({ totalPages }) => {
           ))}
           {!pages.includes(totalPages - 1) && (
             <li>
-              <span className="pagination-ellipsis">&hellip;</span>
+              <span>&hellip;</span>
             </li>
           )}
           {!pages.includes(totalPages) && (
diff --git a/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx b/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx
index 260d2c93445..52fbd355bf4 100644
--- a/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx
@@ -50,17 +50,11 @@ describe('Pagination', () => {
     it('renders 1 spread element after first page control', () => {
       setupComponent('?page=8');
       expect(screen.getAllByRole('listitem')[1]).toHaveTextContent('…');
-      expect(screen.getAllByRole('listitem')[1].firstChild).toHaveClass(
-        'pagination-ellipsis'
-      );
     });
 
     it('renders 1 spread element before last spread control', () => {
       setupComponent('?page=2');
       expect(screen.getAllByRole('listitem')[7]).toHaveTextContent('…');
-      expect(screen.getAllByRole('listitem')[7].firstChild).toHaveClass(
-        'pagination-ellipsis'
-      );
     });
 
     it('renders 2 spread elements', () => {
diff --git a/kafka-ui-react-app/src/components/common/Tabs/SecondaryTabs.styled.ts b/kafka-ui-react-app/src/components/common/Tabs/SecondaryTabs.styled.ts
deleted file mode 100644
index c41fa23fb2b..00000000000
--- a/kafka-ui-react-app/src/components/common/Tabs/SecondaryTabs.styled.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import styled from 'styled-components';
-
-export const SecondaryTabs = styled.nav`
-  & button {
-    background-color: ${(props) =>
-      props.theme.secondaryTab.backgroundColor.normal};
-    color: ${(props) => props.theme.secondaryTab.color.normal};
-    padding: 6px;
-    height: 32px;
-    min-width: 57px;
-    border: 1px solid ${(props) => props.theme.layout.stuffBorderColor};
-    cursor: pointer;
-
-    &:hover {
-      background-color: ${(props) =>
-        props.theme.secondaryTab.backgroundColor.hover};
-      color: ${(props) => props.theme.secondaryTab.color.hover};
-    }
-
-    &.is-active {
-      background-color: ${(props) =>
-        props.theme.secondaryTab.backgroundColor.active};
-      color: ${(props) => props.theme.secondaryTab.color.active};
-    }
-  }
-
-  & > * {
-    &:first-child {
-      border-radius: 4px 0 0 4px;
-    }
-    &:last-child {
-      border-radius: 0 4px 4px 0;
-    }
-    &:not(:last-child) {
-      border-right: 0px;
-    }
-  }
-`;
diff --git a/kafka-ui-react-app/src/components/common/Tabs/Tabs.tsx b/kafka-ui-react-app/src/components/common/Tabs/Tabs.tsx
deleted file mode 100644
index 9ff6c20a02f..00000000000
--- a/kafka-ui-react-app/src/components/common/Tabs/Tabs.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* eslint-disable jsx-a11y/anchor-is-valid */
-import React, { PropsWithChildren } from 'react';
-import classNames from 'classnames';
-
-interface TabsProps {
-  tabs: string[];
-  defaultSelectedIndex?: number;
-  onChange?(index: number): void;
-}
-
-const Tabs: React.FC<PropsWithChildren<TabsProps>> = ({
-  tabs,
-  defaultSelectedIndex = 0,
-  onChange,
-  children,
-}) => {
-  const [selectedIndex, setSelectedIndex] =
-    React.useState(defaultSelectedIndex);
-
-  React.useEffect(() => {
-    setSelectedIndex(defaultSelectedIndex);
-  }, [defaultSelectedIndex]);
-
-  const handleChange = (index: number) => {
-    setSelectedIndex(index);
-    onChange?.(index);
-  };
-
-  return (
-    <>
-      <div className="tabs">
-        <ul>
-          {tabs.map((tab, index) => (
-            <li
-              key={tab}
-              className={classNames({ 'is-active': index === selectedIndex })}
-            >
-              <a
-                role="button"
-                tabIndex={index}
-                onClick={() => handleChange(index)}
-                onKeyDown={() => handleChange(index)}
-              >
-                {tab}
-              </a>
-            </li>
-          ))}
-        </ul>
-      </div>
-      {React.Children.toArray(children)[selectedIndex]}
-    </>
-  );
-};
-
-export default Tabs;
diff --git a/kafka-ui-react-app/src/components/common/Tabs/__tests__/Tabs.spec.tsx b/kafka-ui-react-app/src/components/common/Tabs/__tests__/Tabs.spec.tsx
deleted file mode 100644
index 2c6c88b178c..00000000000
--- a/kafka-ui-react-app/src/components/common/Tabs/__tests__/Tabs.spec.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import Tabs from 'components/common/Tabs/Tabs';
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-describe('Tabs component', () => {
-  const tabs: string[] = ['Tab 1', 'Tab 2', 'Tab 3'];
-
-  const child1 = <div data-testid="child_1" />;
-  const child2 = <div data-testid="child_2" />;
-  const child3 = <div data-testid="child_3" />;
-
-  beforeEach(() =>
-    render(
-      <Tabs tabs={tabs}>
-        {child1}
-        {child2}
-        {child3}
-      </Tabs>
-    )
-  );
-
-  it('renders the tabs with default index 0', () => {
-    expect(screen.getAllByRole('listitem')[0]).toHaveClass('is-active');
-  });
-  it('renders the list of tabs', () => {
-    screen.queryAllByRole('button').forEach((link, idx) => {
-      expect(link).toHaveTextContent(tabs[idx]);
-    });
-  });
-  it('expects list items to be in the document', () => {
-    screen.queryAllByRole('button').forEach((link, idx) => {
-      userEvent.click(link);
-      expect(screen.getByTestId(`child_${idx + 1}`)).toBeInTheDocument();
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/common/table/SortableCulumnHeader/SortableColumnHeader.tsx b/kafka-ui-react-app/src/components/common/table/SortableCulumnHeader/SortableColumnHeader.tsx
deleted file mode 100644
index 1e58044c4bd..00000000000
--- a/kafka-ui-react-app/src/components/common/table/SortableCulumnHeader/SortableColumnHeader.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import React from 'react';
-import cx from 'classnames';
-
-export interface ListHeaderProps {
-  value: any;
-  title: string;
-  orderBy: any;
-  setOrderBy: React.Dispatch<React.SetStateAction<any>>;
-}
-
-const ListHeaderCell: React.FC<ListHeaderProps> = ({
-  value,
-  title,
-  orderBy,
-  setOrderBy,
-}) => (
-  <th
-    className={cx('is-clickable', orderBy === value && 'has-text-link-dark')}
-    onClick={() => setOrderBy(value)}
-  >
-    {title}
-  </th>
-);
-
-export default ListHeaderCell;
diff --git a/kafka-ui-react-app/src/components/common/table/__tests__/SortableColumnHeader.spec.tsx b/kafka-ui-react-app/src/components/common/table/__tests__/SortableColumnHeader.spec.tsx
deleted file mode 100644
index 14fa1114add..00000000000
--- a/kafka-ui-react-app/src/components/common/table/__tests__/SortableColumnHeader.spec.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import SortableColumnHeader from 'components/common/table/SortableCulumnHeader/SortableColumnHeader';
-import { TopicColumnsToSort } from 'generated-sources';
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-describe('ListHeader', () => {
-  const setOrderBy = jest.fn();
-  const component = (
-    <table>
-      <thead>
-        <tr>
-          <SortableColumnHeader
-            value={TopicColumnsToSort.NAME}
-            title="Name"
-            orderBy={null}
-            setOrderBy={setOrderBy}
-          />
-        </tr>
-      </thead>
-    </table>
-  );
-
-  describe('on column click', () => {
-    it('calls setOrderBy', () => {
-      render(component);
-      userEvent.click(screen.getByRole('columnheader'));
-      expect(setOrderBy).toHaveBeenCalledTimes(1);
-      expect(setOrderBy).toHaveBeenCalledWith(TopicColumnsToSort.NAME);
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/theme/bulma_overrides.scss b/kafka-ui-react-app/src/theme/bulma_overrides.scss
deleted file mode 100644
index f7e8a234e90..00000000000
--- a/kafka-ui-react-app/src/theme/bulma_overrides.scss
+++ /dev/null
@@ -1,95 +0,0 @@
-.has {
-  &-text-overflow-ellipsis {
-    flex: 1;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  &-text-nowrap {
-    white-space: nowrap;
-  }
-
-  &-content-overflow-ellipsis {
-    max-height: 73px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    background-color: #fff;
-
-    background: -webkit-linear-gradient(
-      90deg,
-      rgba(0, 0, 0, 0.1) 0%,
-      rgba(0, 0, 0, 1) 40%
-    );
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-  }
-}
-
-.breadcrumb li {
-  &.is-active > span {
-    padding: 0 0.75em;
-  }
-
-  &:first-child > span {
-    padding-left: 0;
-  }
-}
-
-.section {
-  animation: fadein 0.5s;
-}
-
-.select.is-block select {
-  width: 100%;
-}
-
-.notification {
-  &.is-light {
-    &.is-primary {
-      background-color: #ebfffc;
-      color: #00947e;
-    }
-
-    &.is-danger {
-      background-color: #feecf0;
-      color: #cc0f35;
-    }
-  }
-}
-
-.is-family-code {
-  font-family: 'Roboto Mono', sans-serif !important;
-  font-size: 0.9rem;
-  line-height: 1.5em;
-}
-
-@keyframes fadein {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-.level.level-multiline {
-  flex-wrap: wrap;
-  .level-item.is-one-third {
-    flex-basis: 26%;
-  }
-  .level-item.is-one-third:nth-child(n + 4) {
-    margin-top: 10px;
-  }
-}
-
-.is-size-8 {
-  font-size: $size-8;
-}
-
-.tag:not(body) {
-  font-size: 0.75rem;
-  height: 1.75em;
-  line-height: 1.75;
-}
diff --git a/kafka-ui-react-app/src/theme/index.scss b/kafka-ui-react-app/src/theme/index.scss
index 04db81e19bb..6e13e349e21 100644
--- a/kafka-ui-react-app/src/theme/index.scss
+++ b/kafka-ui-react-app/src/theme/index.scss
@@ -1,59 +1,11 @@
 @import '@fortawesome/fontawesome-free/css/all.min.css';
-@import 'src/theme/variables';
-
-// utilities
-@import "bulma/sass/utilities/initial-variables";
-@import "bulma/sass/utilities/functions";
-@import "bulma/sass/utilities/derived-variables";
-@import "bulma/sass/utilities/mixins";
-@import "bulma/sass/utilities/controls";
-@import "bulma/sass/utilities/extends";
 
 // Base
 @import "bulma/sass/base/minireset";
 @import "bulma/sass/base/generic";
-@import "bulma/sass/base/animations";
-
-// Elements
-
-// Form
-@import "bulma/sass/form/shared";
-@import "bulma/sass/form/input-textarea";
-@import "bulma/sass/form/checkbox-radio";
-@import "bulma/sass/form/select";
-@import "bulma/sass/form/file";
-@import "bulma/sass/form/tools";
 
 // Components
-@import "bulma/sass/components/breadcrumb";
-@import "bulma/sass/components/card";
 @import "bulma/sass/components/dropdown";
-@import "bulma/sass/components/level";
-@import "bulma/sass/components/media";
-@import "bulma/sass/components/menu";
-@import "bulma/sass/components/message";
-@import "bulma/sass/components/modal";
-@import "bulma/sass/components/navbar";
-@import "bulma/sass/components/pagination";
-@import "bulma/sass/components/panel";
-@import "bulma/sass/components/tabs";
-
-// Grid
-@import "bulma/sass/grid/columns";
-@import "bulma/sass/grid/tiles";
-
-// Helpers
-@import "bulma/sass/helpers/color";
-@import "bulma/sass/helpers/flexbox";
-@import "bulma/sass/helpers/float";
-@import "bulma/sass/helpers/other";
-@import "bulma/sass/helpers/overflow";
-@import "bulma/sass/helpers/position";
-@import "bulma/sass/helpers/spacing";
-@import "bulma/sass/helpers/typography";
-@import "bulma/sass/helpers/visibility";
-
-@import 'src/theme/bulma_overrides';
 
 @import url('https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@400;500&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap');
@@ -77,3 +29,12 @@ input, select, textarea, button {
 code {
   font-family: 'Roboto Mono', sans-serif;
 }
+
+@keyframes fadein {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index fba48c6c85d..c9fd10566a6 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -115,6 +115,8 @@ const theme = {
       3: {
         fontSize: '16px',
         lineHeight: '24px',
+        fontWeight: 400,
+        marginBottom: '16px',
       },
       4: {
         fontSize: '14px',
diff --git a/kafka-ui-react-app/src/theme/variables.scss b/kafka-ui-react-app/src/theme/variables.scss
deleted file mode 100644
index d3ce861d2a2..00000000000
--- a/kafka-ui-react-app/src/theme/variables.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-// Typography
-$size-7: 0.875rem;
-$size-8: 0.75rem;
-$body-line-height: 1.34;
-$body-color: hsl(0, 100%, 0%);
-
-// Section
-$section-padding-desktop: 0 0 0.5rem;
-$section-padding: 1rem 1.5rem 3rem;
-
-// Tag
-$tag-radius: 16px;

From 70656b7fc0cde184ae4d866be6974d383468d907 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Tue, 7 Jun 2022 13:30:15 +0300
Subject: [PATCH 017/734] Use react-query for server state managment (#2133)

* Use react-query for server state managment

* Refactor using of react query
---
 kafka-ui-react-app/package-lock.json          | 177 +++++++++++++++++-
 kafka-ui-react-app/package.json               |   1 +
 .../src/components/Brokers/Broker/Broker.tsx  |  54 ++----
 .../Brokers/Broker/__test__/Broker.spec.tsx   | 121 +++++-------
 .../src/components/Brokers/Brokers.tsx        |   2 +-
 .../{List => BrokersList}/BrokersList.tsx     |  28 +--
 .../__test__/BrokersList.spec.tsx             |  16 +-
 .../{__tests__ => __test__}/Brokers.spec.tsx  |   7 +-
 .../Brokers}/__test__/fixtures.ts             |   8 +-
 .../src/components/Cluster/Cluster.tsx        | 114 +++++------
 .../Cluster/__tests__/Cluster.spec.tsx        |   8 +-
 .../components/Schemas/Details/Details.tsx    |   2 +-
 .../src/components/Schemas/Edit/Edit.tsx      |   2 +-
 .../GlobalSchemaSelector.tsx                  |   6 +-
 .../src/components/Schemas/New/New.tsx        |   6 +-
 .../Topics/Topic/SendMessage/SendMessage.tsx  |   2 +-
 kafka-ui-react-app/src/index.tsx              |   7 +-
 kafka-ui-react-app/src/lib/api.ts             |  23 +++
 .../src/lib/hooks/useBrokers.tsx              |  11 ++
 .../src/lib/hooks/useBrokersLogDirs.tsx       |  18 ++
 .../src/lib/hooks/useClusterStats.tsx         |  11 ++
 .../src/lib/hooks/useInterval.ts              |  25 ---
 kafka-ui-react-app/src/lib/testHelpers.tsx    |  13 +-
 .../reducers/brokers/__test__/reducer.spec.ts | 113 -----------
 .../brokers/__test__/selectors.spec.ts        |  83 --------
 .../redux/reducers/brokers/brokersSlice.ts    |  52 -----
 .../src/redux/reducers/brokers/selectors.ts   |  43 -----
 .../redux/reducers/clusters/clustersSlice.ts  |  14 +-
 .../redux/reducers/connect/connectSlice.ts    |   7 +-
 .../consumerGroups/consumerGroupsSlice.ts     |  16 +-
 .../src/redux/reducers/index.ts               |   2 -
 .../src/redux/reducers/ksqlDb/ksqlDbSlice.ts  |  12 +-
 .../src/redux/reducers/loader/loaderSlice.ts  |   6 +-
 .../redux/reducers/schemas/schemasSlice.ts    |   8 +-
 .../topicMessages/topicMessagesSlice.ts       |   7 +-
 .../src/redux/reducers/topics/topicsSlice.ts  |  20 +-
 36 files changed, 437 insertions(+), 608 deletions(-)
 rename kafka-ui-react-app/src/components/Brokers/{List => BrokersList}/BrokersList.tsx (87%)
 rename kafka-ui-react-app/src/components/Brokers/{List => BrokersList}/__test__/BrokersList.spec.tsx (92%)
 rename kafka-ui-react-app/src/components/Brokers/{__tests__ => __test__}/Brokers.spec.tsx (84%)
 rename kafka-ui-react-app/src/{redux/reducers/brokers => components/Brokers}/__test__/fixtures.ts (91%)
 create mode 100644 kafka-ui-react-app/src/lib/api.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useBrokers.tsx
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useBrokersLogDirs.tsx
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useClusterStats.tsx
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/useInterval.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/brokers/__test__/reducer.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/brokers/__test__/selectors.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/brokers/brokersSlice.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts

diff --git a/kafka-ui-react-app/package-lock.json b/kafka-ui-react-app/package-lock.json
index 3e54ab370e7..09491bf665d 100644
--- a/kafka-ui-react-app/package-lock.json
+++ b/kafka-ui-react-app/package-lock.json
@@ -33,6 +33,7 @@
         "react-dom": "^18.1.0",
         "react-hook-form": "7.6.9",
         "react-multi-select-component": "^4.0.6",
+        "react-query": "^3.39.1",
         "react-redux": "^7.2.6",
         "react-router-dom": "^6.3.0",
         "redux": "^4.1.1",
@@ -10512,6 +10513,14 @@
         "node": ">= 8.0.0"
       }
     },
+    "node_modules/big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -10617,6 +10626,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/broadcast-channel": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
+      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
+      "dependencies": {
+        "@babel/runtime": "^7.7.2",
+        "detect-node": "^2.1.0",
+        "js-sha3": "0.8.0",
+        "microseconds": "0.2.0",
+        "nano-time": "1.0.0",
+        "oblivious-set": "1.0.0",
+        "rimraf": "3.0.2",
+        "unload": "2.2.0"
+      }
+    },
     "node_modules/browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
@@ -12170,8 +12194,7 @@
     "node_modules/detect-node": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
     },
     "node_modules/detect-port-alt": {
       "version": "1.1.6",
@@ -19028,6 +19051,11 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -19699,6 +19727,15 @@
         "tmpl": "1.0.x"
       }
     },
+    "node_modules/match-sorter": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
+      "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5",
+        "remove-accents": "0.4.2"
+      }
+    },
     "node_modules/mdn-data": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -19769,6 +19806,11 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/microseconds": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
+      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
+    },
     "node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -19928,6 +19970,14 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "node_modules/nano-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
+      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
+      "dependencies": {
+        "big-integer": "^1.6.16"
+      }
+    },
     "node_modules/nanoclone": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
@@ -21380,6 +21430,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/oblivious-set": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
+      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
+    },
     "node_modules/obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -24123,6 +24178,31 @@
         "react": "^16.8.0 || ^17"
       }
     },
+    "node_modules/react-query": {
+      "version": "3.39.1",
+      "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",
+      "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "broadcast-channel": "^3.4.1",
+        "match-sorter": "^6.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-redux": {
       "version": "7.2.6",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz",
@@ -26803,6 +26883,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/remove-accents": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
+      "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
+    },
     "node_modules/renderkid": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
@@ -28980,6 +29065,15 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/unload": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
+      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
+      "dependencies": {
+        "@babel/runtime": "^7.6.2",
+        "detect-node": "^2.0.4"
+      }
+    },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -37665,6 +37759,11 @@
         "tryer": "^1.0.1"
       }
     },
+    "big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -37756,6 +37855,21 @@
         "fill-range": "^7.0.1"
       }
     },
+    "broadcast-channel": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
+      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
+      "requires": {
+        "@babel/runtime": "^7.7.2",
+        "detect-node": "^2.1.0",
+        "js-sha3": "0.8.0",
+        "microseconds": "0.2.0",
+        "nano-time": "1.0.0",
+        "oblivious-set": "1.0.0",
+        "rimraf": "3.0.2",
+        "unload": "2.2.0"
+      }
+    },
     "browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
@@ -38900,8 +39014,7 @@
     "detect-node": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-      "dev": true
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
     },
     "detect-port-alt": {
       "version": "1.1.6",
@@ -44027,6 +44140,11 @@
         }
       }
     },
+    "js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -44554,6 +44672,15 @@
         "tmpl": "1.0.x"
       }
     },
+    "match-sorter": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
+      "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "remove-accents": "0.4.2"
+      }
+    },
     "mdn-data": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -44609,6 +44736,11 @@
         "picomatch": "^2.2.3"
       }
     },
+    "microseconds": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
+      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
+    },
     "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -44723,6 +44855,14 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "nano-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
+      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
+      "requires": {
+        "big-integer": "^1.6.16"
+      }
+    },
     "nanoclone": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
@@ -45756,6 +45896,11 @@
         }
       }
     },
+    "oblivious-set": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
+      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
+    },
     "obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -47729,6 +47874,16 @@
         "warning": "^4.0.2"
       }
     },
+    "react-query": {
+      "version": "3.39.1",
+      "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",
+      "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "broadcast-channel": "^3.4.1",
+        "match-sorter": "^6.0.2"
+      }
+    },
     "react-redux": {
       "version": "7.2.6",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz",
@@ -49725,6 +49880,11 @@
       "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
       "dev": true
     },
+    "remove-accents": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
+      "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
+    },
     "renderkid": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
@@ -51313,6 +51473,15 @@
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true
     },
+    "unload": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
+      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
+      "requires": {
+        "@babel/runtime": "^7.6.2",
+        "detect-node": "^2.0.4"
+      }
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index f30fba154b7..c997b4de036 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -29,6 +29,7 @@
     "react-dom": "^18.1.0",
     "react-hook-form": "7.6.9",
     "react-multi-select-component": "^4.0.6",
+    "react-query": "^3.39.1",
     "react-redux": "^7.2.6",
     "react-router-dom": "^6.3.0",
     "redux": "^4.1.1",
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index 32a6ae702a0..bef308d891f 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -1,15 +1,6 @@
-import React, { useState } from 'react';
-import useInterval from 'lib/hooks/useInterval';
+import React from 'react';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import { BrokersApi, Configuration } from 'generated-sources';
-import { BASE_PARAMS } from 'lib/constants';
 import * as Metrics from 'components/common/Metrics';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
-import {
-  fetchBrokers,
-  fetchClusterStats,
-  selectStats,
-} from 'redux/reducers/brokers/brokersSlice';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import useAppParams from 'lib/hooks/useAppParams';
 import { translateLogdir } from 'components/Brokers/utils/translateLogdir';
@@ -17,9 +8,9 @@ import { SmartTable } from 'components/common/SmartTable/SmartTable';
 import { TableColumn } from 'components/common/SmartTable/TableColumn';
 import { useTableState } from 'lib/hooks/useTableState';
 import { ClusterBrokerParam } from 'lib/paths';
-
-const apiClientConf = new Configuration(BASE_PARAMS);
-export const brokersApiClient = new BrokersApi(apiClientConf);
+import useClusterStats from 'lib/hooks/useClusterStats';
+import useBrokers from 'lib/hooks/useBrokers';
+import useBrokersLogDirs from 'lib/hooks/useBrokersLogDirs';
 
 export interface BrokerLogdirState {
   name: string;
@@ -29,41 +20,24 @@ export interface BrokerLogdirState {
 }
 
 const Broker: React.FC = () => {
-  const dispatch = useAppDispatch();
   const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
 
-  const [logdirs, setLogdirs] = useState<BrokerLogdirState[]>([]);
-  const { diskUsage, items } = useAppSelector(selectStats);
-
-  React.useEffect(() => {
-    brokersApiClient
-      .getAllBrokersLogdirs({
-        clusterName,
-        broker: [Number(brokerId)],
-      })
-      .then((res) => {
-        if (res && res[0]) {
-          setLogdirs([translateLogdir(res[0])]);
-        }
-      });
-    dispatch(fetchClusterStats(clusterName));
-    dispatch(fetchBrokers(clusterName));
-  }, [clusterName, brokerId, dispatch]);
+  const { data: clusterStats } = useClusterStats(clusterName);
+  const { data: brokers } = useBrokers(clusterName);
+  const { data: logDirs } = useBrokersLogDirs(clusterName, Number(brokerId));
 
-  const tableState = useTableState<BrokerLogdirState, string>(logdirs, {
-    idSelector: (logdir) => logdir.name,
+  const preparedRows = logDirs?.map(translateLogdir) || [];
+  const tableState = useTableState<BrokerLogdirState, string>(preparedRows, {
+    idSelector: ({ name }) => name,
     totalPages: 0,
   });
 
-  const brokerItem = items?.find((item) => item.id === Number(brokerId));
-  const brokerDiskUsage = diskUsage?.find(
+  if (!clusterStats) return null;
+
+  const brokerItem = brokers?.find(({ id }) => id === Number(brokerId));
+  const brokerDiskUsage = clusterStats.diskUsage?.find(
     (item) => item.brokerId === Number(brokerId)
   );
-
-  useInterval(() => {
-    fetchClusterStats(clusterName);
-    fetchBrokers(clusterName);
-  }, 5000);
   return (
     <>
       <PageHeading text={`Broker ${brokerId}`} />
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
index ab9f5616585..728a4b251d8 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
@@ -3,88 +3,65 @@ import { render, WithRoute } from 'lib/testHelpers';
 import { screen, waitFor } from '@testing-library/dom';
 import { clusterBrokerPath } from 'lib/paths';
 import fetchMock from 'fetch-mock';
-import { clusterStatsPayloadBroker } from 'redux/reducers/brokers/__test__/fixtures';
 import { act } from '@testing-library/react';
 import Broker from 'components/Brokers/Broker/Broker';
-import { BrokersLogdirs } from 'generated-sources';
+import {
+  clusterStatsPayload,
+  brokerLogDirsPayload,
+  brokersPayload,
+} from 'components/Brokers/__test__/fixtures';
+
+const clusterName = 'local';
+const brokerId = 1;
+const fetchStatsUrl = `/api/clusters/${clusterName}/stats`;
+const fetchBrokersUrl = `/api/clusters/${clusterName}/brokers`;
+const fetchLogDirsUrl = `/api/clusters/${clusterName}/brokers/logdirs`;
 
 describe('Broker Component', () => {
-  afterEach(() => fetchMock.reset());
-
-  const clusterName = 'local';
-  const brokerId = 1;
-
-  const renderComponent = () =>
-    render(
-      <WithRoute path={clusterBrokerPath()}>
-        <Broker />
-      </WithRoute>,
-      {
-        initialEntries: [clusterBrokerPath(clusterName, brokerId)],
-      }
-    );
-
-  describe('Broker', () => {
-    const fetchBrokerMockUrl = `/api/clusters/${clusterName}/brokers/logdirs?broker=${brokerId}`;
-
-    const actRender = async (
-      mockData: BrokersLogdirs[] = clusterStatsPayloadBroker
-    ) => {
-      const fetchBrokerMock = fetchMock.getOnce(fetchBrokerMockUrl, mockData);
-
-      await act(() => {
-        renderComponent();
-      });
-      await waitFor(() => expect(fetchBrokerMock.called()).toBeTruthy());
-    };
-
-    it('renders', async () => {
-      await actRender();
-
-      expect(screen.getByRole('table')).toBeInTheDocument();
-      const rows = screen.getAllByRole('row');
-      expect(rows.length).toEqual(2);
-    });
-
-    it('show warning when broker not found', async () => {
-      await actRender([]);
-
-      expect(
-        screen.getByText('Log dir data not available')
-      ).toBeInTheDocument();
-    });
+  afterEach(() => {
+    fetchMock.reset();
+  });
 
-    it('show broker found', async () => {
-      await actRender();
-      const topicCount = screen.getByText(
-        clusterStatsPayloadBroker[0].topics?.length || 0
+  const renderComponent = async () => {
+    const fetchStatsMock = fetchMock.get(fetchStatsUrl, clusterStatsPayload);
+    const fetchBrokersMock = fetchMock.get(fetchBrokersUrl, brokersPayload);
+    await act(() => {
+      render(
+        <WithRoute path={clusterBrokerPath()}>
+          <Broker />
+        </WithRoute>,
+        {
+          initialEntries: [clusterBrokerPath(clusterName, brokerId)],
+        }
       );
-      const partitionsCount = screen.getByText(
-        clusterStatsPayloadBroker[0].topics?.reduce(
-          (previousValue, currentValue) =>
-            previousValue + (currentValue.partitions?.length || 0),
-          0
-        ) || 0
-      );
-      expect(topicCount).toBeInTheDocument();
-      expect(partitionsCount).toBeInTheDocument();
     });
+    await waitFor(() => expect(fetchStatsMock.called()).toBeTruthy());
+    expect(fetchBrokersMock.called()).toBeTruthy();
+  };
 
-    it('show 0s when broker has not topics', async () => {
-      await actRender([{ ...clusterStatsPayloadBroker[0], topics: undefined }]);
-
-      expect(screen.getAllByText(0).length).toEqual(2);
+  it('shows warning when server returns empty logDirs response', async () => {
+    const fetchLogDirsMock = fetchMock.getOnce(fetchLogDirsUrl, [], {
+      query: { broker: brokerId },
     });
+    await renderComponent();
+    await waitFor(() => expect(fetchLogDirsMock.called()).toBeTruthy());
+    expect(screen.getByText('Log dir data not available')).toBeInTheDocument();
+  });
 
-    it('show - when broker has not name', async () => {
-      await actRender([{ ...clusterStatsPayloadBroker[0], name: undefined }]);
-
-      expect(screen.getByText('-')).toBeInTheDocument();
-    });
+  it('shows broker found', async () => {
+    const fetchLogDirsMock = fetchMock.getOnce(
+      fetchLogDirsUrl,
+      brokerLogDirsPayload,
+      {
+        query: { broker: brokerId },
+      }
+    );
 
-    it('show - when broker has not error', async () => {
-      await actRender([{ ...clusterStatsPayloadBroker[0], error: undefined }]);
-      expect(screen.getByText('-')).toBeInTheDocument();
-    });
+    await renderComponent();
+    await waitFor(() => expect(fetchLogDirsMock.called()).toBeTruthy());
+    const topicCount = screen.getByText(3);
+    const partitionsCount = screen.getByText(4);
+    expect(topicCount).toBeInTheDocument();
+    expect(partitionsCount).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
index 3ddf362709c..76a5e4cad88 100644
--- a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Route, Routes } from 'react-router-dom';
 import { getNonExactPath, RouteParams } from 'lib/paths';
-import BrokersList from 'components/Brokers/List/BrokersList';
+import BrokersList from 'components/Brokers/BrokersList/BrokersList';
 import Broker from 'components/Brokers/Broker/Broker';
 import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 
diff --git a/kafka-ui-react-app/src/components/Brokers/List/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
similarity index 87%
rename from kafka-ui-react-app/src/components/Brokers/List/BrokersList.tsx
rename to kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index e2451a8fe2d..36e36368c3a 100644
--- a/kafka-ui-react-app/src/components/Brokers/List/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -1,23 +1,22 @@
 import React from 'react';
 import { ClusterName } from 'redux/interfaces';
-import useInterval from 'lib/hooks/useInterval';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { NavLink } from 'react-router-dom';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { Table } from 'components/common/table/Table/Table.styled';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
-import {
-  fetchBrokers,
-  fetchClusterStats,
-  selectStats,
-} from 'redux/reducers/brokers/brokersSlice';
 import useAppParams from 'lib/hooks/useAppParams';
+import useBrokers from 'lib/hooks/useBrokers';
+import useClusterStats from 'lib/hooks/useClusterStats';
 
 const BrokersList: React.FC = () => {
-  const dispatch = useAppDispatch();
   const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
+  const { data: clusterStats } = useClusterStats(clusterName);
+  const { data: brokers } = useBrokers(clusterName);
+
+  if (!clusterStats) return null;
+
   const {
     brokerCount,
     activeControllers,
@@ -28,21 +27,12 @@ const BrokersList: React.FC = () => {
     underReplicatedPartitionCount,
     diskUsage,
     version,
-    items,
-  } = useAppSelector(selectStats);
+  } = clusterStats;
 
   const replicas = (inSyncReplicasCount ?? 0) + (outOfSyncReplicasCount ?? 0);
   const areAllInSync = inSyncReplicasCount && replicas === inSyncReplicasCount;
   const partitionIsOffline = offlinePartitionCount && offlinePartitionCount > 0;
-  React.useEffect(() => {
-    dispatch(fetchClusterStats(clusterName));
-    dispatch(fetchBrokers(clusterName));
-  }, [clusterName, dispatch]);
 
-  useInterval(() => {
-    fetchClusterStats(clusterName);
-    fetchBrokers(clusterName);
-  }, 5000);
   return (
     <>
       <PageHeading text="Broker" />
@@ -123,7 +113,7 @@ const BrokersList: React.FC = () => {
           {diskUsage &&
             diskUsage.length !== 0 &&
             diskUsage.map(({ brokerId, segmentSize, segmentCount }) => {
-              const brokerItem = items?.find((item) => item.id === brokerId);
+              const brokerItem = brokers?.find(({ id }) => id === brokerId);
               return (
                 <tr key={brokerId}>
                   <td>
diff --git a/kafka-ui-react-app/src/components/Brokers/List/__test__/BrokersList.spec.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
similarity index 92%
rename from kafka-ui-react-app/src/components/Brokers/List/__test__/BrokersList.spec.tsx
rename to kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
index 3d38e840900..437cc44cd4c 100644
--- a/kafka-ui-react-app/src/components/Brokers/List/__test__/BrokersList.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
@@ -3,9 +3,12 @@ import { render, WithRoute } from 'lib/testHelpers';
 import { screen, waitFor } from '@testing-library/dom';
 import { clusterBrokersPath } from 'lib/paths';
 import fetchMock from 'fetch-mock';
-import { clusterStatsPayload } from 'redux/reducers/brokers/__test__/fixtures';
 import { act } from '@testing-library/react';
-import BrokersList from 'components/Brokers/List/BrokersList';
+import BrokersList from 'components/Brokers/BrokersList/BrokersList';
+import {
+  brokersPayload,
+  clusterStatsPayload,
+} from 'components/Brokers/__test__/fixtures';
 
 describe('BrokersList Component', () => {
   afterEach(() => fetchMock.reset());
@@ -30,17 +33,14 @@ describe('BrokersList Component', () => {
     const fetchStatsUrl = `/api/clusters/${clusterName}/stats`;
 
     beforeEach(() => {
-      fetchBrokersMock = fetchMock.getOnce(
+      fetchBrokersMock = fetchMock.get(
         `/api/clusters/${clusterName}/brokers`,
-        clusterStatsPayload
+        brokersPayload
       );
     });
 
     it('renders', async () => {
-      const fetchStatsMock = fetchMock.getOnce(
-        fetchStatsUrl,
-        clusterStatsPayload
-      );
+      const fetchStatsMock = fetchMock.get(fetchStatsUrl, clusterStatsPayload);
       await act(() => {
         renderComponent();
       });
diff --git a/kafka-ui-react-app/src/components/Brokers/__tests__/Brokers.spec.tsx b/kafka-ui-react-app/src/components/Brokers/__test__/Brokers.spec.tsx
similarity index 84%
rename from kafka-ui-react-app/src/components/Brokers/__tests__/Brokers.spec.tsx
rename to kafka-ui-react-app/src/components/Brokers/__test__/Brokers.spec.tsx
index b445c752c4f..1b4bf761544 100644
--- a/kafka-ui-react-app/src/components/Brokers/__tests__/Brokers.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/__test__/Brokers.spec.tsx
@@ -7,7 +7,7 @@ import Brokers from 'components/Brokers/Brokers';
 const brokersList = 'brokersList';
 const broker = 'brokers';
 
-jest.mock('components/Brokers/List/BrokersList', () => () => (
+jest.mock('components/Brokers/BrokersList/BrokersList', () => () => (
   <div>{brokersList}</div>
 ));
 jest.mock('components/Brokers/Broker/Broker', () => () => <div>{broker}</div>);
@@ -15,11 +15,10 @@ jest.mock('components/Brokers/Broker/Broker', () => () => <div>{broker}</div>);
 describe('Brokers Component', () => {
   const clusterName = 'clusterName';
   const brokerId = '1';
-  const renderComponent = (path?: string) => {
-    return render(<Brokers />, {
+  const renderComponent = (path?: string) =>
+    render(<Brokers />, {
       initialEntries: path ? [path] : undefined,
     });
-  };
 
   it('renders BrokersList', () => {
     renderComponent();
diff --git a/kafka-ui-react-app/src/redux/reducers/brokers/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts
similarity index 91%
rename from kafka-ui-react-app/src/redux/reducers/brokers/__test__/fixtures.ts
rename to kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts
index 864bd7fbc59..372257a263a 100644
--- a/kafka-ui-react-app/src/redux/reducers/brokers/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts
@@ -52,7 +52,7 @@ export const updatedBrokersReducerState = {
   version: '2.2.1',
 };
 
-const partitions = {
+const partition = {
   broker: 2,
   offsetLag: 0,
   partition: 2,
@@ -60,17 +60,17 @@ const partitions = {
 };
 const topics = {
   name: '_confluent-ksql-devquery_CTAS_NUMBER_OF_TESTS_59-Aggregate-Aggregate-Materialize-changelog',
-  partitions: [partitions],
+  partitions: [partition],
 };
 
-export const clusterStatsPayloadBroker: BrokersLogdirs[] = [
+export const brokerLogDirsPayload: BrokersLogdirs[] = [
   {
     error: 'NONE',
     name: '/opt/kafka/data-0/logs',
     topics: [
       {
         ...topics,
-        partitions: [partitions, partitions, partitions],
+        partitions: [partition, partition, partition],
       },
       topics,
       {
diff --git a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
index e60346ceae5..e91b8e8317b 100644
--- a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Suspense } from 'react';
 import { useSelector } from 'react-redux';
 import { Routes, Navigate, Route, Outlet } from 'react-router-dom';
 import useAppParams from 'lib/hooks/useAppParams';
@@ -22,12 +22,14 @@ import Topics from 'components/Topics/Topics';
 import Schemas from 'components/Schemas/Schemas';
 import Connect from 'components/Connect/Connect';
 import ClusterContext from 'components/contexts/ClusterContext';
-import Brokers from 'components/Brokers/Brokers';
 import ConsumersGroups from 'components/ConsumerGroups/ConsumerGroups';
 import KsqlDb from 'components/KsqlDb/KsqlDb';
 import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb';
 import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 import { BreadcrumbProvider } from 'components/common/Breadcrumb/Breadcrumb.provider';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+
+const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
 
 const Cluster: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
@@ -63,79 +65,81 @@ const Cluster: React.FC = () => {
   return (
     <BreadcrumbProvider>
       <Breadcrumb />
-      <ClusterContext.Provider value={contextValue}>
-        <Routes>
-          <Route
-            path={getNonExactPath(clusterBrokerRelativePath)}
-            element={
-              <BreadcrumbRoute>
-                <Brokers />
-              </BreadcrumbRoute>
-            }
-          />
-          <Route
-            path={getNonExactPath(clusterTopicsRelativePath)}
-            element={
-              <BreadcrumbRoute>
-                <Topics />
-              </BreadcrumbRoute>
-            }
-          />
-          <Route
-            path={getNonExactPath(clusterConsumerGroupsRelativePath)}
-            element={
-              <BreadcrumbRoute>
-                <ConsumersGroups />
-              </BreadcrumbRoute>
-            }
-          />
-          {hasSchemaRegistryConfigured && (
+      <Suspense fallback={<PageLoader />}>
+        <ClusterContext.Provider value={contextValue}>
+          <Routes>
             <Route
-              path={getNonExactPath(clusterSchemasRelativePath)}
+              path={getNonExactPath(clusterBrokerRelativePath)}
               element={
                 <BreadcrumbRoute>
-                  <Schemas />
+                  <Brokers />
                 </BreadcrumbRoute>
               }
             />
-          )}
-          {hasKafkaConnectConfigured && (
             <Route
-              path={getNonExactPath(clusterConnectsRelativePath)}
+              path={getNonExactPath(clusterTopicsRelativePath)}
               element={
                 <BreadcrumbRoute>
-                  <Connect />
+                  <Topics />
                 </BreadcrumbRoute>
               }
             />
-          )}
-          {hasKafkaConnectConfigured && (
             <Route
-              path={getNonExactPath(clusterConnectorsRelativePath)}
+              path={getNonExactPath(clusterConsumerGroupsRelativePath)}
               element={
                 <BreadcrumbRoute>
-                  <Connect />
+                  <ConsumersGroups />
                 </BreadcrumbRoute>
               }
             />
-          )}
-          {hasKsqlDbConfigured && (
+            {hasSchemaRegistryConfigured && (
+              <Route
+                path={getNonExactPath(clusterSchemasRelativePath)}
+                element={
+                  <BreadcrumbRoute>
+                    <Schemas />
+                  </BreadcrumbRoute>
+                }
+              />
+            )}
+            {hasKafkaConnectConfigured && (
+              <Route
+                path={getNonExactPath(clusterConnectsRelativePath)}
+                element={
+                  <BreadcrumbRoute>
+                    <Connect />
+                  </BreadcrumbRoute>
+                }
+              />
+            )}
+            {hasKafkaConnectConfigured && (
+              <Route
+                path={getNonExactPath(clusterConnectorsRelativePath)}
+                element={
+                  <BreadcrumbRoute>
+                    <Connect />
+                  </BreadcrumbRoute>
+                }
+              />
+            )}
+            {hasKsqlDbConfigured && (
+              <Route
+                path={getNonExactPath(clusterKsqlDbRelativePath)}
+                element={
+                  <BreadcrumbRoute>
+                    <KsqlDb />
+                  </BreadcrumbRoute>
+                }
+              />
+            )}
             <Route
-              path={getNonExactPath(clusterKsqlDbRelativePath)}
-              element={
-                <BreadcrumbRoute>
-                  <KsqlDb />
-                </BreadcrumbRoute>
-              }
+              path="/"
+              element={<Navigate to={clusterBrokerRelativePath} replace />}
             />
-          )}
-          <Route
-            path="/"
-            element={<Navigate to={clusterBrokerRelativePath} replace />}
-          />
-        </Routes>
-        <Outlet />
-      </ClusterContext.Provider>
+          </Routes>
+          <Outlet />
+        </ClusterContext.Provider>
+      </Suspense>
     </BreadcrumbProvider>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
index 2ef3a0de958..b41f17b369b 100644
--- a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
@@ -15,6 +15,7 @@ import {
   clusterSchemasPath,
   clusterTopicsPath,
 } from 'lib/paths';
+import { act } from 'react-dom/test-utils';
 
 const CLusterCompText = {
   Topics: 'Topics',
@@ -45,16 +46,17 @@ jest.mock('components/KsqlDb/KsqlDb', () => () => (
 ));
 
 describe('Cluster', () => {
-  const renderComponent = (pathname: string) =>
+  const renderComponent = (pathname: string) => {
     render(
       <WithRoute path={`${clusterPath()}/*`}>
         <Cluster />
       </WithRoute>,
       { initialEntries: [pathname], store }
     );
+  };
 
-  it('renders Brokers', () => {
-    renderComponent(clusterBrokersPath('second'));
+  it('renders Brokers', async () => {
+    await act(() => renderComponent(clusterBrokersPath('second')));
     expect(screen.getByText(CLusterCompText.Brokers)).toBeInTheDocument();
   });
   it('renders Topics', () => {
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index e54683decbd..386fc505903 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -21,7 +21,6 @@ import {
   fetchSchemaVersions,
   getAreSchemaLatestFulfilled,
   getAreSchemaVersionsFulfilled,
-  schemasApiClient,
   SCHEMAS_VERSIONS_FETCH_ACTION,
   SCHEMA_LATEST_FETCH_ACTION,
   selectAllSchemaVersions,
@@ -32,6 +31,7 @@ import { getResponse } from 'lib/errorHandling';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 import { TableTitle } from 'components/common/table/TableTitle/TableTitle.styled';
 import useAppParams from 'lib/hooks/useAppParams';
+import { schemasApiClient } from 'lib/api';
 
 import LatestVersionItem from './LatestVersion/LatestVersionItem';
 import SchemaVersion from './SchemaVersion/SchemaVersion';
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
index 625da9f88e5..550496d7451 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
@@ -16,7 +16,6 @@ import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import {
   schemaAdded,
-  schemasApiClient,
   fetchLatestSchema,
   getSchemaLatest,
   SCHEMA_LATEST_FETCH_ACTION,
@@ -27,6 +26,7 @@ import { serverErrorAlertAdded } from 'redux/reducers/alerts/alertsSlice';
 import { getResponse } from 'lib/errorHandling';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
+import { schemasApiClient } from 'lib/api';
 
 import * as S from './Edit.styled';
 
diff --git a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
index 77f74351146..dfe84c8f02e 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
@@ -8,11 +8,9 @@ import usePagination from 'lib/hooks/usePagination';
 import useSearch from 'lib/hooks/useSearch';
 import useAppParams from 'lib/hooks/useAppParams';
 import { serverErrorAlertAdded } from 'redux/reducers/alerts/alertsSlice';
-import {
-  fetchSchemas,
-  schemasApiClient,
-} from 'redux/reducers/schemas/schemasSlice';
+import { fetchSchemas } from 'redux/reducers/schemas/schemasSlice';
 import { ClusterNameRoute } from 'lib/paths';
+import { schemasApiClient } from 'lib/api';
 
 import * as S from './GlobalSchemaSelector.styled';
 
diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.tsx b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
index 9f796d47e01..0d9d171b1f2 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
@@ -13,14 +13,12 @@ import Select, { SelectOption } from 'components/common/Select/Select';
 import { Button } from 'components/common/Button/Button';
 import { Textarea } from 'components/common/Textbox/Textarea.styled';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import {
-  schemaAdded,
-  schemasApiClient,
-} from 'redux/reducers/schemas/schemasSlice';
+import { schemaAdded } from 'redux/reducers/schemas/schemasSlice';
 import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import { serverErrorAlertAdded } from 'redux/reducers/alerts/alertsSlice';
 import { getResponse } from 'lib/errorHandling';
+import { schemasApiClient } from 'lib/api';
 
 import * as S from './New.styled';
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index c2a0feaa78a..c8898c7ad27 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -6,7 +6,6 @@ import {
   RouteParamsClusterTopic,
 } from 'lib/paths';
 import jsf from 'json-schema-faker';
-import { messagesApiClient } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import {
   fetchTopicMessageSchema,
   fetchTopicDetails,
@@ -25,6 +24,7 @@ import {
 import Select, { SelectOption } from 'components/common/Select/Select';
 import useAppParams from 'lib/hooks/useAppParams';
 import Heading from 'components/common/heading/Heading.styled';
+import { messagesApiClient } from 'lib/api';
 
 import validateMessage from './validateMessage';
 import * as S from './SendMessage.styled';
diff --git a/kafka-ui-react-app/src/index.tsx b/kafka-ui-react-app/src/index.tsx
index 7c28aad2217..054cb901e96 100644
--- a/kafka-ui-react-app/src/index.tsx
+++ b/kafka-ui-react-app/src/index.tsx
@@ -2,12 +2,15 @@ import React from 'react';
 import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
+import { QueryClient, QueryClientProvider } from 'react-query';
 import * as serviceWorker from 'serviceWorker';
 import App from 'components/App';
 import { store } from 'redux/store';
 import 'theme/index.scss';
 import 'lib/constants';
 
+const queryClient = new QueryClient();
+
 const container =
   document.getElementById('root') || document.createElement('div');
 const root = createRoot(container);
@@ -15,7 +18,9 @@ const root = createRoot(container);
 root.render(
   <Provider store={store}>
     <BrowserRouter basename={window.basePath || '/'}>
-      <App />
+      <QueryClientProvider client={queryClient}>
+        <App />
+      </QueryClientProvider>
     </BrowserRouter>
   </Provider>
 );
diff --git a/kafka-ui-react-app/src/lib/api.ts b/kafka-ui-react-app/src/lib/api.ts
new file mode 100644
index 00000000000..a207403970a
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/api.ts
@@ -0,0 +1,23 @@
+import {
+  BrokersApi,
+  ClustersApi,
+  Configuration,
+  ConsumerGroupsApi,
+  KafkaConnectApi,
+  KsqlApi,
+  MessagesApi,
+  SchemasApi,
+  TopicsApi,
+} from 'generated-sources';
+import { BASE_PARAMS } from 'lib/constants';
+
+const apiClientConf = new Configuration(BASE_PARAMS);
+
+export const brokersApiClient = new BrokersApi(apiClientConf);
+export const clustersApiClient = new ClustersApi(apiClientConf);
+export const kafkaConnectApiClient = new KafkaConnectApi(apiClientConf);
+export const consumerGroupsApiClient = new ConsumerGroupsApi(apiClientConf);
+export const ksqlDbApiClient = new KsqlApi(apiClientConf);
+export const topicsApiClient = new TopicsApi(apiClientConf);
+export const messagesApiClient = new MessagesApi(apiClientConf);
+export const schemasApiClient = new SchemasApi(apiClientConf);
diff --git a/kafka-ui-react-app/src/lib/hooks/useBrokers.tsx b/kafka-ui-react-app/src/lib/hooks/useBrokers.tsx
new file mode 100644
index 00000000000..dc5511ee3ac
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useBrokers.tsx
@@ -0,0 +1,11 @@
+import { brokersApiClient } from 'lib/api';
+import { useQuery } from 'react-query';
+import { ClusterName } from 'redux/interfaces';
+
+export default function useBrokers(clusterName: ClusterName) {
+  return useQuery(
+    ['brokers', clusterName],
+    () => brokersApiClient.getBrokers({ clusterName }),
+    { suspense: true, refetchInterval: 5000 }
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/useBrokersLogDirs.tsx b/kafka-ui-react-app/src/lib/hooks/useBrokersLogDirs.tsx
new file mode 100644
index 00000000000..e00ed4c966c
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useBrokersLogDirs.tsx
@@ -0,0 +1,18 @@
+import { brokersApiClient } from 'lib/api';
+import { useQuery } from 'react-query';
+import { ClusterName } from 'redux/interfaces';
+
+export default function useBrokersLogDirs(
+  clusterName: ClusterName,
+  brokerId: number
+) {
+  return useQuery(
+    ['logDirs', clusterName, brokerId],
+    () =>
+      brokersApiClient.getAllBrokersLogdirs({
+        clusterName,
+        broker: [brokerId],
+      }),
+    { suspense: true, refetchInterval: 5000 }
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/useClusterStats.tsx b/kafka-ui-react-app/src/lib/hooks/useClusterStats.tsx
new file mode 100644
index 00000000000..2a8ff5392a4
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useClusterStats.tsx
@@ -0,0 +1,11 @@
+import { clustersApiClient } from 'lib/api';
+import { useQuery } from 'react-query';
+import { ClusterName } from 'redux/interfaces';
+
+export default function useClusterStats(clusterName: ClusterName) {
+  return useQuery(
+    ['clusterStats', clusterName],
+    () => clustersApiClient.getClusterStats({ clusterName }),
+    { suspense: true, refetchInterval: 5000 }
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/useInterval.ts b/kafka-ui-react-app/src/lib/hooks/useInterval.ts
deleted file mode 100644
index 5c314030c5c..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/useInterval.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-type Callback = () => void;
-
-const useInterval = (callback: Callback, delay: number) => {
-  const savedCallback = React.useRef<Callback>();
-
-  React.useEffect(() => {
-    savedCallback.current = callback;
-  }, [callback]);
-
-  // eslint-disable-next-line consistent-return
-  React.useEffect(() => {
-    const tick = () => {
-      if (savedCallback.current) savedCallback.current();
-    };
-
-    if (delay !== null) {
-      const id = setInterval(tick, delay);
-      return () => clearInterval(id);
-    }
-  }, [delay]);
-};
-
-export default useInterval;
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index 40f85a49203..18350e26c1c 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -14,6 +14,7 @@ import { RootState } from 'redux/interfaces';
 import { configureStore } from '@reduxjs/toolkit';
 import rootReducer from 'redux/reducers';
 import mockStoreCreator from 'redux/store/configureStore/mockStoreCreator';
+import { QueryClient, QueryClientProvider } from 'react-query';
 
 interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
   preloadedState?: Partial<RootState>;
@@ -57,6 +58,10 @@ const customRender = (
     ...renderOptions
   }: CustomRenderOptions = {}
 ) => {
+  // use new QueryClient instance for each test run to avoid issues with cache
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false } },
+  });
   // overrides @testing-library/react render.
   const AllTheProviders: React.FC<PropsWithChildren<unknown>> = ({
     children,
@@ -64,9 +69,11 @@ const customRender = (
     return (
       <ThemeProvider theme={theme}>
         <Provider store={store}>
-          <MemoryRouter initialEntries={initialEntries}>
-            {children}
-          </MemoryRouter>
+          <QueryClientProvider client={queryClient}>
+            <MemoryRouter initialEntries={initialEntries}>
+              {children}
+            </MemoryRouter>
+          </QueryClientProvider>
         </Provider>
       </ThemeProvider>
     );
diff --git a/kafka-ui-react-app/src/redux/reducers/brokers/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/brokers/__test__/reducer.spec.ts
deleted file mode 100644
index 55ef49445f6..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/brokers/__test__/reducer.spec.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import fetchMock from 'fetch-mock-jest';
-import reducer, {
-  initialState,
-  fetchBrokers,
-  fetchClusterStats,
-} from 'redux/reducers/brokers/brokersSlice';
-import mockStoreCreator from 'redux/store/configureStore/mockStoreCreator';
-
-import {
-  brokersPayload,
-  clusterStatsPayload,
-  initialBrokersReducerState,
-  updatedBrokersReducerState,
-} from './fixtures';
-
-const store = mockStoreCreator;
-const clusterName = 'test-sluster-name';
-
-describe('Brokers slice', () => {
-  describe('reducer', () => {
-    it('returns the initial state', () => {
-      expect(reducer(undefined, { type: fetchBrokers.pending })).toEqual(
-        initialState
-      );
-    });
-    it('reacts on fetchBrokers.fullfiled and returns payload', () => {
-      expect(
-        reducer(initialState, {
-          type: fetchBrokers.fulfilled,
-          payload: brokersPayload,
-        })
-      ).toEqual({
-        ...initialState,
-        items: brokersPayload,
-      });
-    });
-    it('reacts on fetchClusterStats.fullfiled and returns payload', () => {
-      expect(
-        reducer(initialBrokersReducerState, {
-          type: fetchClusterStats.fulfilled,
-          payload: clusterStatsPayload,
-        })
-      ).toEqual(updatedBrokersReducerState);
-    });
-  });
-
-  describe('thunks', () => {
-    afterEach(() => {
-      fetchMock.restore();
-      store.clearActions();
-    });
-
-    describe('fetchBrokers', () => {
-      it('creates fetchBrokers.fulfilled when broker are fetched', async () => {
-        fetchMock.getOnce(
-          `/api/clusters/${clusterName}/brokers`,
-          brokersPayload
-        );
-        await store.dispatch(fetchBrokers(clusterName));
-        expect(
-          store.getActions().map(({ type, payload }) => ({ type, payload }))
-        ).toEqual([
-          { type: fetchBrokers.pending.type },
-          {
-            type: fetchBrokers.fulfilled.type,
-            payload: brokersPayload,
-          },
-        ]);
-      });
-
-      it('creates fetchBrokers.rejected when fetched clusters', async () => {
-        fetchMock.getOnce(`/api/clusters/${clusterName}/brokers`, 422);
-        await store.dispatch(fetchBrokers(clusterName));
-        expect(
-          store.getActions().map(({ type, payload }) => ({ type, payload }))
-        ).toEqual([
-          { type: fetchBrokers.pending.type },
-          { type: fetchBrokers.rejected.type },
-        ]);
-      });
-    });
-
-    describe('fetchClusterStats', () => {
-      it('creates fetchClusterStats.fulfilled when broker are fetched', async () => {
-        fetchMock.getOnce(
-          `/api/clusters/${clusterName}/stats`,
-          clusterStatsPayload
-        );
-        await store.dispatch(fetchClusterStats(clusterName));
-        expect(
-          store.getActions().map(({ type, payload }) => ({ type, payload }))
-        ).toEqual([
-          { type: fetchClusterStats.pending.type },
-          {
-            type: fetchClusterStats.fulfilled.type,
-            payload: clusterStatsPayload,
-          },
-        ]);
-      });
-
-      it('creates fetchClusterStats.rejected when fetched clusters', async () => {
-        fetchMock.getOnce(`/api/clusters/${clusterName}/stats`, 422);
-        await store.dispatch(fetchClusterStats(clusterName));
-        expect(
-          store.getActions().map(({ type, payload }) => ({ type, payload }))
-        ).toEqual([
-          { type: fetchClusterStats.pending.type },
-          { type: fetchClusterStats.rejected.type },
-        ]);
-      });
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/reducers/brokers/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/brokers/__test__/selectors.spec.ts
deleted file mode 100644
index 119d984cf6a..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/brokers/__test__/selectors.spec.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { store } from 'redux/store';
-import * as selectors from 'redux/reducers/brokers/selectors';
-import {
-  fetchBrokers,
-  fetchClusterStats,
-} from 'redux/reducers/brokers/brokersSlice';
-
-import { brokersPayload, updatedBrokersReducerState } from './fixtures';
-
-const { dispatch, getState } = store;
-
-describe('Brokers selectors', () => {
-  describe('Initial State', () => {
-    it('returns broker count', () => {
-      expect(selectors.getBrokerCount(getState())).toEqual(0);
-    });
-    it('returns active controllers', () => {
-      expect(selectors.getActiveControllers(getState())).toEqual(0);
-    });
-    it('returns online partition count', () => {
-      expect(selectors.getOnlinePartitionCount(getState())).toEqual(0);
-    });
-    it('returns offline partition count', () => {
-      expect(selectors.getOfflinePartitionCount(getState())).toEqual(0);
-    });
-    it('returns in sync replicas count', () => {
-      expect(selectors.getInSyncReplicasCount(getState())).toEqual(0);
-    });
-    it('returns out of sync replicas count', () => {
-      expect(selectors.getOutOfSyncReplicasCount(getState())).toEqual(0);
-    });
-    it('returns under replicated partition count', () => {
-      expect(selectors.getUnderReplicatedPartitionCount(getState())).toEqual(0);
-    });
-    it('returns disk usage', () => {
-      expect(selectors.getDiskUsage(getState())).toEqual([]);
-    });
-    it('returns version', () => {
-      expect(selectors.getVersion(getState())).toBeUndefined();
-    });
-  });
-
-  describe('state', () => {
-    beforeAll(() => {
-      dispatch({ type: fetchBrokers.fulfilled.type, payload: brokersPayload });
-      dispatch({
-        type: fetchClusterStats.fulfilled.type,
-        payload: updatedBrokersReducerState,
-      });
-    });
-
-    it('returns broker count', () => {
-      expect(selectors.getBrokerCount(getState())).toEqual(2);
-    });
-    it('returns active controllers', () => {
-      expect(selectors.getActiveControllers(getState())).toEqual(1);
-    });
-    it('returns online partition count', () => {
-      expect(selectors.getOnlinePartitionCount(getState())).toEqual(138);
-    });
-    it('returns offline partition count', () => {
-      expect(selectors.getOfflinePartitionCount(getState())).toEqual(0);
-    });
-    it('returns in sync replicas count', () => {
-      expect(selectors.getInSyncReplicasCount(getState())).toEqual(239);
-    });
-    it('returns out of sync replicas count', () => {
-      expect(selectors.getOutOfSyncReplicasCount(getState())).toEqual(0);
-    });
-    it('returns under replicated partition count', () => {
-      expect(selectors.getUnderReplicatedPartitionCount(getState())).toEqual(0);
-    });
-    it('returns disk usage', () => {
-      expect(selectors.getDiskUsage(getState())).toEqual([
-        { brokerId: 0, segmentSize: 334567, segmentCount: 245 },
-        { brokerId: 1, segmentSize: 12345678, segmentCount: 121 },
-      ]);
-    });
-    it('returns version', () => {
-      expect(selectors.getVersion(getState())).toEqual('2.2.1');
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/reducers/brokers/brokersSlice.ts b/kafka-ui-react-app/src/redux/reducers/brokers/brokersSlice.ts
deleted file mode 100644
index d7c762e4a62..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/brokers/brokersSlice.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { BrokersApi, ClustersApi, Configuration } from 'generated-sources';
-import { BrokersState, ClusterName, RootState } from 'redux/interfaces';
-import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { BASE_PARAMS } from 'lib/constants';
-
-const apiClientConf = new Configuration(BASE_PARAMS);
-export const brokersApiClient = new BrokersApi(apiClientConf);
-export const clustersApiClient = new ClustersApi(apiClientConf);
-
-export const fetchBrokers = createAsyncThunk(
-  'brokers/fetchBrokers',
-  (clusterName: ClusterName) => brokersApiClient.getBrokers({ clusterName })
-);
-
-export const fetchClusterStats = createAsyncThunk(
-  'brokers/fetchClusterStats',
-  (clusterName: ClusterName) =>
-    clustersApiClient.getClusterStats({ clusterName })
-);
-
-export const initialState: BrokersState = {
-  items: [],
-  brokerCount: 0,
-  activeControllers: 0,
-  onlinePartitionCount: 0,
-  offlinePartitionCount: 0,
-  inSyncReplicasCount: 0,
-  outOfSyncReplicasCount: 0,
-  underReplicatedPartitionCount: 0,
-  diskUsage: [],
-};
-
-export const brokersSlice = createSlice({
-  name: 'brokers',
-  initialState,
-  reducers: {},
-  extraReducers: (builder) => {
-    builder.addCase(fetchBrokers.pending, () => initialState);
-    builder.addCase(fetchBrokers.fulfilled, (state, { payload }) => ({
-      ...state,
-      items: payload,
-    }));
-    builder.addCase(fetchClusterStats.fulfilled, (state, { payload }) => ({
-      ...state,
-      ...payload,
-    }));
-  },
-});
-
-export const selectStats = (state: RootState) => state.brokers;
-
-export default brokersSlice.reducer;
diff --git a/kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts b/kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts
deleted file mode 100644
index 31654a70d83..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { createSelector } from '@reduxjs/toolkit';
-import { RootState, BrokersState } from 'redux/interfaces';
-
-const brokersState = ({ brokers }: RootState): BrokersState => brokers;
-
-export const getBrokerCount = createSelector(
-  brokersState,
-  ({ brokerCount }) => brokerCount
-);
-export const getActiveControllers = createSelector(
-  brokersState,
-  ({ activeControllers }) => activeControllers
-);
-export const getOnlinePartitionCount = createSelector(
-  brokersState,
-  ({ onlinePartitionCount }) => onlinePartitionCount
-);
-export const getOfflinePartitionCount = createSelector(
-  brokersState,
-  ({ offlinePartitionCount }) => offlinePartitionCount
-);
-export const getInSyncReplicasCount = createSelector(
-  brokersState,
-  ({ inSyncReplicasCount }) => inSyncReplicasCount
-);
-export const getOutOfSyncReplicasCount = createSelector(
-  brokersState,
-  ({ outOfSyncReplicasCount }) => outOfSyncReplicasCount
-);
-export const getUnderReplicatedPartitionCount = createSelector(
-  brokersState,
-  ({ underReplicatedPartitionCount }) => underReplicatedPartitionCount
-);
-
-export const getDiskUsage = createSelector(
-  brokersState,
-  ({ diskUsage }) => diskUsage
-);
-
-export const getVersion = createSelector(
-  brokersState,
-  ({ version }) => version
-);
diff --git a/kafka-ui-react-app/src/redux/reducers/clusters/clustersSlice.ts b/kafka-ui-react-app/src/redux/reducers/clusters/clustersSlice.ts
index 0a3e589bab6..9b750b2d2db 100644
--- a/kafka-ui-react-app/src/redux/reducers/clusters/clustersSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/clusters/clustersSlice.ts
@@ -3,20 +3,12 @@ import {
   createSlice,
   createSelector,
 } from '@reduxjs/toolkit';
-import {
-  ClustersApi,
-  Configuration,
-  Cluster,
-  ServerStatus,
-  ClusterFeaturesEnum,
-} from 'generated-sources';
-import { BASE_PARAMS, AsyncRequestStatus } from 'lib/constants';
+import { Cluster, ServerStatus, ClusterFeaturesEnum } from 'generated-sources';
+import { clustersApiClient } from 'lib/api';
+import { AsyncRequestStatus } from 'lib/constants';
 import { RootState } from 'redux/interfaces';
 import { createFetchingSelector } from 'redux/reducers/loader/selectors';
 
-const apiClientConf = new Configuration(BASE_PARAMS);
-export const clustersApiClient = new ClustersApi(apiClientConf);
-
 export const fetchClusters = createAsyncThunk(
   'clusters/fetchClusters',
   async () => {
diff --git a/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts b/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts
index 4b0299a6191..a3ef930bbab 100644
--- a/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts
@@ -1,18 +1,16 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import {
-  Configuration,
   Connect,
   Connector,
   ConnectorAction,
   ConnectorState,
   ConnectorTaskStatus,
   FullConnectorInfo,
-  KafkaConnectApi,
   NewConnector,
   Task,
   TaskId,
 } from 'generated-sources';
-import { BASE_PARAMS } from 'lib/constants';
+import { kafkaConnectApiClient } from 'lib/api';
 import { getResponse } from 'lib/errorHandling';
 import {
   ClusterName,
@@ -24,9 +22,6 @@ import {
 } from 'redux/interfaces';
 import { showSuccessAlert } from 'redux/reducers/alerts/alertsSlice';
 
-const apiClientConf = new Configuration(BASE_PARAMS);
-export const kafkaConnectApiClient = new KafkaConnectApi(apiClientConf);
-
 export const fetchConnects = createAsyncThunk<
   { connects: Connect[] },
   ClusterName
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
index d34d4594de9..7cf4482b2a1 100644
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
@@ -6,14 +6,12 @@ import {
   PayloadAction,
 } from '@reduxjs/toolkit';
 import {
-  Configuration,
   ConsumerGroupDetails,
   ConsumerGroupOrdering,
-  ConsumerGroupsApi,
   ConsumerGroupsPageResponse,
   SortOrder,
 } from 'generated-sources';
-import { BASE_PARAMS, AsyncRequestStatus } from 'lib/constants';
+import { AsyncRequestStatus } from 'lib/constants';
 import { getResponse } from 'lib/errorHandling';
 import {
   ClusterName,
@@ -23,9 +21,7 @@ import {
 } from 'redux/interfaces';
 import { createFetchingSelector } from 'redux/reducers/loader/selectors';
 import { EntityState } from '@reduxjs/toolkit/src/entities/models';
-
-const apiClientConf = new Configuration(BASE_PARAMS);
-export const api = new ConsumerGroupsApi(apiClientConf);
+import { consumerGroupsApiClient } from 'lib/api';
 
 export const fetchConsumerGroupsPaged = createAsyncThunk<
   ConsumerGroupsPageResponse,
@@ -44,7 +40,7 @@ export const fetchConsumerGroupsPaged = createAsyncThunk<
     { rejectWithValue }
   ) => {
     try {
-      const response = await api.getConsumerGroupsPageRaw({
+      const response = await consumerGroupsApiClient.getConsumerGroupsPageRaw({
         clusterName,
         orderBy,
         sortOrder,
@@ -66,7 +62,7 @@ export const fetchConsumerGroupDetails = createAsyncThunk<
   'consumerGroups/fetchConsumerGroupDetails',
   async ({ clusterName, consumerGroupID }, { rejectWithValue }) => {
     try {
-      return await api.getConsumerGroup({
+      return await consumerGroupsApiClient.getConsumerGroup({
         clusterName,
         id: consumerGroupID,
       });
@@ -83,7 +79,7 @@ export const deleteConsumerGroup = createAsyncThunk<
   'consumerGroups/deleteConsumerGroup',
   async ({ clusterName, consumerGroupID }, { rejectWithValue }) => {
     try {
-      await api.deleteConsumerGroup({
+      await consumerGroupsApiClient.deleteConsumerGroup({
         clusterName,
         id: consumerGroupID,
       });
@@ -105,7 +101,7 @@ export const resetConsumerGroupOffsets = createAsyncThunk<
     { rejectWithValue }
   ) => {
     try {
-      await api.resetConsumerGroupOffsets({
+      await consumerGroupsApiClient.resetConsumerGroupOffsets({
         clusterName,
         id: consumerGroupID,
         consumerGroupOffsetsReset: {
diff --git a/kafka-ui-react-app/src/redux/reducers/index.ts b/kafka-ui-react-app/src/redux/reducers/index.ts
index f345d9d858c..801490912f4 100644
--- a/kafka-ui-react-app/src/redux/reducers/index.ts
+++ b/kafka-ui-react-app/src/redux/reducers/index.ts
@@ -1,7 +1,6 @@
 import { combineReducers } from '@reduxjs/toolkit';
 import clusters from 'redux/reducers/clusters/clustersSlice';
 import loader from 'redux/reducers/loader/loaderSlice';
-import brokers from 'redux/reducers/brokers/brokersSlice';
 import alerts from 'redux/reducers/alerts/alertsSlice';
 import schemas from 'redux/reducers/schemas/schemasSlice';
 import connect from 'redux/reducers/connect/connectSlice';
@@ -16,7 +15,6 @@ export default combineReducers({
   topics,
   topicMessages,
   clusters,
-  brokers,
   consumerGroups,
   schemas,
   connect,
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
index 84dd356606f..2d80c1d2244 100644
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
@@ -1,16 +1,8 @@
 import { KsqlState } from 'redux/interfaces/ksqlDb';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { BASE_PARAMS } from 'lib/constants';
-import {
-  Configuration,
-  ExecuteKsqlRequest,
-  KsqlApi,
-  Table as KsqlTable,
-} from 'generated-sources';
+import { ExecuteKsqlRequest, Table as KsqlTable } from 'generated-sources';
 import { ClusterName } from 'redux/interfaces';
-
-const apiClientConf = new Configuration(BASE_PARAMS);
-export const ksqlDbApiClient = new KsqlApi(apiClientConf);
+import { ksqlDbApiClient } from 'lib/api';
 
 export const transformKsqlResponse = (
   rawTable: Required<KsqlTable>
diff --git a/kafka-ui-react-app/src/redux/reducers/loader/loaderSlice.ts b/kafka-ui-react-app/src/redux/reducers/loader/loaderSlice.ts
index 47950d4559b..ef84ea97bfb 100644
--- a/kafka-ui-react-app/src/redux/reducers/loader/loaderSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/loader/loaderSlice.ts
@@ -4,13 +4,9 @@ import {
   UnknownAsyncThunkPendingAction,
   UnknownAsyncThunkRejectedAction,
 } from '@reduxjs/toolkit/dist/matchers';
-import { ClustersApi, Configuration } from 'generated-sources';
-import { BASE_PARAMS, AsyncRequestStatus } from 'lib/constants';
+import { AsyncRequestStatus } from 'lib/constants';
 import { LoaderSliceState } from 'redux/interfaces';
 
-const apiClientConf = new Configuration(BASE_PARAMS);
-export const clustersApiClient = new ClustersApi(apiClientConf);
-
 export const initialState: LoaderSliceState = {};
 
 export const loaderSlice = createSlice({
diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts b/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
index 899cdc64a66..9ce44ed58ce 100644
--- a/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
@@ -5,21 +5,17 @@ import {
   createSlice,
 } from '@reduxjs/toolkit';
 import {
-  Configuration,
-  SchemasApi,
   SchemaSubject,
   SchemaSubjectsResponse,
   GetSchemasRequest,
   GetLatestSchemaRequest,
 } from 'generated-sources';
-import { BASE_PARAMS, AsyncRequestStatus } from 'lib/constants';
+import { schemasApiClient } from 'lib/api';
+import { AsyncRequestStatus } from 'lib/constants';
 import { getResponse } from 'lib/errorHandling';
 import { ClusterName, RootState } from 'redux/interfaces';
 import { createFetchingSelector } from 'redux/reducers/loader/selectors';
 
-const apiClientConf = new Configuration(BASE_PARAMS);
-export const schemasApiClient = new SchemasApi(apiClientConf);
-
 export const SCHEMA_LATEST_FETCH_ACTION = 'schemas/latest/fetch';
 export const fetchLatestSchema = createAsyncThunk<
   SchemaSubject,
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
index 8760c954943..9861d0025bf 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
@@ -1,13 +1,10 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { TopicMessagesState, ClusterName, TopicName } from 'redux/interfaces';
-import { TopicMessage, Configuration, MessagesApi } from 'generated-sources';
-import { BASE_PARAMS } from 'lib/constants';
+import { TopicMessage } from 'generated-sources';
 import { getResponse } from 'lib/errorHandling';
 import { showSuccessAlert } from 'redux/reducers/alerts/alertsSlice';
 import { fetchTopicDetails } from 'redux/reducers/topics/topicsSlice';
-
-const apiClientConf = new Configuration(BASE_PARAMS);
-export const messagesApiClient = new MessagesApi(apiClientConf);
+import { messagesApiClient } from 'lib/api';
 
 export const clearTopicMessages = createAsyncThunk<
   undefined,
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
index 55c2f267199..120060dba6d 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
@@ -1,9 +1,6 @@
 import { v4 } from 'uuid';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import {
-  Configuration,
-  TopicsApi,
-  ConsumerGroupsApi,
   TopicsResponse,
   TopicDetails,
   GetTopicsRequest,
@@ -18,7 +15,6 @@ import {
   RecreateTopicRequest,
   SortOrder,
   TopicColumnsToSort,
-  MessagesApi,
   GetTopicSchemaRequest,
   TopicMessageSchema,
 } from 'generated-sources';
@@ -30,15 +26,14 @@ import {
   TopicFormDataRaw,
   ClusterName,
 } from 'redux/interfaces';
-import { BASE_PARAMS } from 'lib/constants';
 import { getResponse } from 'lib/errorHandling';
 import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import { showSuccessAlert } from 'redux/reducers/alerts/alertsSlice';
-
-const apiClientConf = new Configuration(BASE_PARAMS);
-const topicsApiClient = new TopicsApi(apiClientConf);
-const topicConsumerGroupsApiClient = new ConsumerGroupsApi(apiClientConf);
-const messagesApiClient = new MessagesApi(apiClientConf);
+import {
+  consumerGroupsApiClient,
+  messagesApiClient,
+  topicsApiClient,
+} from 'lib/api';
 
 export const fetchTopicsList = createAsyncThunk<
   TopicsResponse,
@@ -143,8 +138,9 @@ export const fetchTopicConsumerGroups = createAsyncThunk<
 >('topic/fetchTopicConsumerGroups', async (payload, { rejectWithValue }) => {
   try {
     const { topicName } = payload;
-    const consumerGroups =
-      await topicConsumerGroupsApiClient.getTopicConsumerGroups(payload);
+    const consumerGroups = await consumerGroupsApiClient.getTopicConsumerGroups(
+      payload
+    );
 
     return { consumerGroups, topicName };
   } catch (err) {

From 19f27e7b92906d594965569977f916e1b5703648 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 14:21:30 +0300
Subject: [PATCH 018/734] Bump @reduxjs/toolkit from 1.8.1 to 1.8.2 in
 /kafka-ui-react-app (#2066)

Bumps [@reduxjs/toolkit](https://github.com/reduxjs/redux-toolkit) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/reduxjs/redux-toolkit/releases)
- [Commits](https://github.com/reduxjs/redux-toolkit/compare/1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: "@reduxjs/toolkit"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 kafka-ui-react-app/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-react-app/package-lock.json b/kafka-ui-react-app/package-lock.json
index 09491bf665d..24ede1b674a 100644
--- a/kafka-ui-react-app/package-lock.json
+++ b/kafka-ui-react-app/package-lock.json
@@ -6773,9 +6773,9 @@
       }
     },
     "node_modules/@reduxjs/toolkit": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.1.tgz",
-      "integrity": "sha512-Q6mzbTpO9nOYRnkwpDlFOAbQnd3g7zj7CtHAZWz5SzE5lcV97Tf8f3SzOO8BoPOMYBFgfZaqTUZqgGu+a0+Fng==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.2.tgz",
+      "integrity": "sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==",
       "dependencies": {
         "immer": "^9.0.7",
         "redux": "^4.1.2",
@@ -34985,9 +34985,9 @@
       "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
     },
     "@reduxjs/toolkit": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.1.tgz",
-      "integrity": "sha512-Q6mzbTpO9nOYRnkwpDlFOAbQnd3g7zj7CtHAZWz5SzE5lcV97Tf8f3SzOO8BoPOMYBFgfZaqTUZqgGu+a0+Fng==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.2.tgz",
+      "integrity": "sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==",
       "requires": {
         "immer": "^9.0.7",
         "redux": "^4.1.2",

From 3c984fc4514ef20edf10a5cfffead494ed7a1ffe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 14:22:05 +0300
Subject: [PATCH 019/734] Bump @testing-library/dom from 8.11.1 to 8.13.0 in
 /kafka-ui-react-app (#2067)

Bumps [@testing-library/dom](https://github.com/testing-library/dom-testing-library) from 8.11.1 to 8.13.0.
- [Release notes](https://github.com/testing-library/dom-testing-library/releases)
- [Changelog](https://github.com/testing-library/dom-testing-library/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/dom-testing-library/compare/v8.11.1...v8.13.0)

---
updated-dependencies:
- dependency-name: "@testing-library/dom"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-react-app/package-lock.json b/kafka-ui-react-app/package-lock.json
index 24ede1b674a..07edf778df5 100644
--- a/kafka-ui-react-app/package-lock.json
+++ b/kafka-ui-react-app/package-lock.json
@@ -7159,9 +7159,9 @@
       }
     },
     "node_modules/@testing-library/dom": {
-      "version": "8.11.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.11.1.tgz",
-      "integrity": "sha512-3KQDyx9r0RKYailW2MiYrSSKEfH0GTkI51UGEvJenvcoDoeRYs0PZpi2SXqtnMClQvCqdtTTpOfFETDTVADpAg==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
+      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -35229,9 +35229,9 @@
       }
     },
     "@testing-library/dom": {
-      "version": "8.11.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.11.1.tgz",
-      "integrity": "sha512-3KQDyx9r0RKYailW2MiYrSSKEfH0GTkI51UGEvJenvcoDoeRYs0PZpi2SXqtnMClQvCqdtTTpOfFETDTVADpAg==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
+      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
       "requires": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",

From 45dc7f616c7fe192a5e7ca2899f3a6126e2ad06e Mon Sep 17 00:00:00 2001
From: Arsen Simonyan <103444767+simonyandev@users.noreply.github.com>
Date: Tue, 7 Jun 2022 16:05:58 +0400
Subject: [PATCH 020/734] Add logout button UI (#1854)

* add logout button ui

* adding redirect to /logout

Co-authored-by: rAzizbekyan <razizbekyan@provectus.com>
Co-authored-by: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
---
 .../src/components/App.styled.ts              | 18 ++++++++
 kafka-ui-react-app/src/components/App.tsx     | 42 +++++++++++--------
 .../src/components/__tests__/App.spec.tsx     | 12 +++++-
 3 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/kafka-ui-react-app/src/components/App.styled.ts b/kafka-ui-react-app/src/components/App.styled.ts
index b35b324828c..64f3296861d 100644
--- a/kafka-ui-react-app/src/components/App.styled.ts
+++ b/kafka-ui-react-app/src/components/App.styled.ts
@@ -1,6 +1,8 @@
 import styled, { css } from 'styled-components';
 import { Link } from 'react-router-dom';
 
+import { Button } from './common/Button/Button';
+
 export const Layout = styled.div`
   min-width: 1200px;
 
@@ -108,6 +110,8 @@ export const Navbar = styled.nav(
 
 export const NavbarBrand = styled.div`
   display: flex;
+  justify-content: space-between;
+  align-items: center !important;
   flex-shrink: 0;
   align-items: stretch;
   min-height: 3.25rem;
@@ -205,3 +209,17 @@ export const AlertsContainer = styled.div`
     max-width: initial;
   }
 `;
+
+export const LogoutButton = styled(Button)(
+  ({ theme }) => css`
+    color: ${theme.button.primary.invertedColors.normal};
+    background: none !important;
+    padding: 0 8px;
+  `
+);
+
+export const LogoutLink = styled(Link)(
+  () => css`
+    margin-right: 16px;
+  `
+);
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 5f4824f125d..c0740f79417 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -44,25 +44,33 @@ const App: React.FC = () => {
       <S.Layout>
         <S.Navbar role="navigation" aria-label="Page Header">
           <S.NavbarBrand>
-            <S.NavbarBurger
-              onClick={onBurgerClick}
-              onKeyDown={onBurgerClick}
-              role="button"
-              tabIndex={0}
-            >
-              <S.Span role="separator" />
-              <S.Span role="separator" />
-              <S.Span role="separator" />
-            </S.NavbarBurger>
+            <S.NavbarBrand>
+              <S.NavbarBurger
+                onClick={onBurgerClick}
+                onKeyDown={onBurgerClick}
+                role="button"
+                tabIndex={0}
+                aria-label="burger"
+              >
+                <S.Span role="separator" />
+                <S.Span role="separator" />
+                <S.Span role="separator" />
+              </S.NavbarBurger>
 
-            <S.Hyperlink to="/">
-              <Logo />
-              UI for Apache Kafka
-            </S.Hyperlink>
+              <S.Hyperlink to="/">
+                <Logo />
+                UI for Apache Kafka
+              </S.Hyperlink>
 
-            <S.NavbarItem>
-              {GIT_TAG && <Version tag={GIT_TAG} commit={GIT_COMMIT} />}
-            </S.NavbarItem>
+              <S.NavbarItem>
+                {GIT_TAG && <Version tag={GIT_TAG} commit={GIT_COMMIT} />}
+              </S.NavbarItem>
+            </S.NavbarBrand>
+            <S.LogoutLink to="/logout">
+              <S.LogoutButton buttonType="primary" buttonSize="M">
+                Log out
+              </S.LogoutButton>
+            </S.LogoutLink>
           </S.NavbarBrand>
         </S.Navbar>
 
diff --git a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
index c7cf41ecd8d..9f48fb25ada 100644
--- a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
+++ b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
@@ -6,6 +6,9 @@ import { clustersPayload } from 'redux/reducers/clusters/__test__/fixtures';
 import userEvent from '@testing-library/user-event';
 import fetchMock from 'fetch-mock';
 
+const burgerButtonOptions = { name: 'burger' };
+const logoutButtonOptions = { name: 'Log out' };
+
 describe('App', () => {
   describe('initial state', () => {
     beforeEach(() => {
@@ -24,11 +27,16 @@ describe('App', () => {
         within(header).getByText('UI for Apache Kafka')
       ).toBeInTheDocument();
       expect(within(header).getAllByRole('separator').length).toEqual(3);
-      expect(within(header).getByRole('button')).toBeInTheDocument();
+      expect(
+        within(header).getByRole('button', burgerButtonOptions)
+      ).toBeInTheDocument();
+      expect(
+        within(header).getByRole('button', logoutButtonOptions)
+      ).toBeInTheDocument();
     });
     it('handle burger click correctly', () => {
       const header = screen.getByLabelText('Page Header');
-      const burger = within(header).getByRole('button');
+      const burger = within(header).getByRole('button', burgerButtonOptions);
       const sidebar = screen.getByLabelText('Sidebar');
       const overlay = screen.getByLabelText('Overlay');
       expect(sidebar).toBeInTheDocument();

From f294b1bbad4cc93f07a685f63cad9e71f02eb8a3 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Tue, 7 Jun 2022 18:28:38 +0300
Subject: [PATCH 021/734] Import Brokers page without lazy (#2142)

---
 kafka-ui-react-app/src/components/Cluster/Cluster.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
index e91b8e8317b..f4da3e984a2 100644
--- a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
@@ -18,6 +18,7 @@ import {
   clusterTopicsRelativePath,
   getNonExactPath,
 } from 'lib/paths';
+import Brokers from 'components/Brokers/Brokers';
 import Topics from 'components/Topics/Topics';
 import Schemas from 'components/Schemas/Schemas';
 import Connect from 'components/Connect/Connect';
@@ -29,8 +30,6 @@ import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 import { BreadcrumbProvider } from 'components/common/Breadcrumb/Breadcrumb.provider';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 
-const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
-
 const Cluster: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const isReadOnly = useSelector(getClustersReadonlyStatus(clusterName));

From 2fcb0d1abef83189fbd1cf26167baad3074f1ac4 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <ilia-2k@rambler.ru>
Date: Wed, 8 Jun 2022 16:00:19 +0400
Subject: [PATCH 022/734] Fix timeouts with huge amount of topics (#2019)

* partitioning getTopicsConfig & describeTopics calls for cases where topics count is big

* comments added

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/service/ReactiveAdminClient.java | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index dedd609743c..731824cdf08 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -4,6 +4,8 @@
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterators;
 import com.provectus.kafka.ui.exception.IllegalEntityStateException;
 import com.provectus.kafka.ui.exception.NotFoundException;
 import com.provectus.kafka.ui.util.MapUtil;
@@ -11,6 +13,7 @@
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -18,6 +21,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
@@ -131,6 +136,16 @@ public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig() {
   }
 
   public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig(Collection<String> topicNames) {
+    // we need to partition calls, because it can lead to AdminClient timeouts in case of large topics count
+    return partitionCalls(
+        topicNames,
+        200,
+        this::getTopicsConfigImpl,
+        (m1, m2) -> ImmutableMap.<String, List<ConfigEntry>>builder().putAll(m1).putAll(m2).build()
+    );
+  }
+
+  private Mono<Map<String, List<ConfigEntry>>> getTopicsConfigImpl(Collection<String> topicNames) {
     List<ConfigResource> resources = topicNames.stream()
         .map(topicName -> new ConfigResource(ConfigResource.Type.TOPIC, topicName))
         .collect(toList());
@@ -162,6 +177,16 @@ public Mono<Map<String, TopicDescription>> describeTopics() {
   }
 
   public Mono<Map<String, TopicDescription>> describeTopics(Collection<String> topics) {
+    // we need to partition calls, because it can lead to AdminClient timeouts in case of large topics count
+    return partitionCalls(
+        topics,
+        200,
+        this::describeTopicsImpl,
+        (m1, m2) -> ImmutableMap.<String, TopicDescription>builder().putAll(m1).putAll(m2).build()
+    );
+  }
+
+  private Mono<Map<String, TopicDescription>> describeTopicsImpl(Collection<String> topics) {
     return toMonoWithExceptionFilter(
         client.describeTopics(topics).values(),
         UnknownTopicOrPartitionException.class
@@ -402,6 +427,27 @@ private Mono<Void> alterConfig(String topicName, Map<String, String> configs) {
     return toMono(client.alterConfigs(Map.of(topicResource, config)).all());
   }
 
+  /**
+   * Splits input collection into batches, applies each batch sequentially to function
+   * and merges output Monos into one Mono.
+   */
+  private static <R, I> Mono<R> partitionCalls(Collection<I> items,
+                                               int partitionSize,
+                                               Function<Collection<I>, Mono<R>> call,
+                                               BiFunction<R, R, R> merger) {
+    if (items.isEmpty()) {
+      return call.apply(items);
+    }
+    Iterator<List<I>> parts = Iterators.partition(items.iterator(), partitionSize);
+    Mono<R> mono = call.apply(parts.next());
+    while (parts.hasNext()) {
+      var nextPart = parts.next();
+      // calls will be executed sequentially
+      mono = mono.flatMap(res1 -> call.apply(nextPart).map(res2 -> merger.apply(res1, res2)));
+    }
+    return mono;
+  }
+
   @Override
   public void close() {
     client.close();

From 16ac428610e448486e1f3402cd45def2aa462499 Mon Sep 17 00:00:00 2001
From: Kirill Morozov <grifx.design@gmail.com>
Date: Thu, 9 Jun 2022 10:01:53 +0300
Subject: [PATCH 023/734] Burger fixed (#2131)

* Burger fixed

* Used function 'closeSidebar'

* Removed unused import

* Added whitespace before return

* Added useCallBack wrapper for closeSidebar function

* Added useCallBack wrapper for closeSidebar function

* Delete backend.yml

* backend.yml restored

* Extra spaces removed
---
 kafka-ui-react-app/src/components/App.styled.ts | 2 +-
 kafka-ui-react-app/src/components/App.tsx       | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-react-app/src/components/App.styled.ts b/kafka-ui-react-app/src/components/App.styled.ts
index 64f3296861d..94400cea879 100644
--- a/kafka-ui-react-app/src/components/App.styled.ts
+++ b/kafka-ui-react-app/src/components/App.styled.ts
@@ -88,7 +88,7 @@ export const Overlay = styled.div<{ $visible: boolean }>(
         bottom: 0;
         right: 0;
         visibility: 'visible';
-        opacity: 1;
+        opacity: 0.7;
         background-color: ${theme.layout.overlay.backgroundColor};
       }
     `}
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index c0740f79417..91b74145e44 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { Routes, Route, useLocation } from 'react-router-dom';
 import { GIT_TAG, GIT_COMMIT } from 'lib/constants';
 import { clusterPath, getNonExactPath } from 'lib/paths';
@@ -25,15 +25,13 @@ const App: React.FC = () => {
   const areClustersFulfilled = useAppSelector(getAreClustersFulfilled);
   const clusters = useAppSelector(getClusterList);
   const [isSidebarVisible, setIsSidebarVisible] = React.useState(false);
-
   const onBurgerClick = () => setIsSidebarVisible(!isSidebarVisible);
-  const closeSidebar = () => setIsSidebarVisible(false);
-
+  const closeSidebar = useCallback(() => setIsSidebarVisible(false), []);
   const location = useLocation();
 
   React.useEffect(() => {
     closeSidebar();
-  }, [closeSidebar, location]);
+  }, [location, closeSidebar]);
 
   React.useEffect(() => {
     dispatch(fetchClusters());

From 3b69b67c60bc2168b1793496f0360ab1b3e6cabf Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Thu, 9 Jun 2022 12:29:03 +0400
Subject: [PATCH 024/734] Adding isWindowed column to ksql table (#2138)

* adding isWindowed column to ksql table

* removing unnecessary code
---
 kafka-ui-react-app/src/components/KsqlDb/List/List.tsx          | 1 +
 kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx      | 2 +-
 .../KsqlDb/Query/renderer/TableRenderer/TableRenderer.tsx       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
index 0e5ccc9facb..543aaa43f55 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
@@ -25,6 +25,7 @@ const headers: HeadersType[] = [
   { Header: 'Topic', accessor: 'topic' },
   { Header: 'Key Format', accessor: 'keyFormat' },
   { Header: 'Value Format', accessor: 'valueFormat' },
+  { Header: 'Is Windowed', accessor: 'isWindowed' },
 ];
 
 const accessors = headers.map((header) => header.accessor);
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx
index 59ec84095e7..e9d073bb5d5 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx
@@ -11,7 +11,7 @@ const ListItem: React.FC<Props> = ({ accessors, data }) => {
   return (
     <tr>
       {accessors.map((accessor) => (
-        <td key={accessor}>{data[accessor]}</td>
+        <td key={accessor}>{data[accessor]?.toString()}</td>
       ))}
     </tr>
   );
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.tsx
index e34b3d25db5..aaf4755b0a2 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.tsx
@@ -73,7 +73,7 @@ const TableRenderer: React.FC<Props> = ({ table }) => {
             rows.map((row) => (
               <tr key={row.id}>
                 {row.cells.map((cell) => (
-                  <td key={cell.id}>{cell.value}</td>
+                  <td key={cell.id}>{cell.value.toString()}</td>
                 ))}
               </tr>
             ))

From e4dc1134abe45ee72c10d454eb7e4e326c52e194 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 9 Jun 2022 15:50:43 +0400
Subject: [PATCH 025/734] Fix possible CWE-94 in a workflow

---
 .github/workflows/backend.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index aa9237618b5..1d5b01275f0 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -38,13 +38,15 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_BACKEND }}
+          HEAD_REF: ${{ github.head_ref }}
+          BASE_REF: ${{ github.base_ref }}
         run: |
           mvn versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
           mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
           -Dsonar.projectKey=com.provectus:kafka-ui_backend \
           -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
-          -Dsonar.pullrequest.branch=${{ github.head_ref }} \
-          -Dsonar.pullrequest.base=${{ github.base_ref }}
+          -Dsonar.pullrequest.branch=$HEAD_REF \
+          -Dsonar.pullrequest.base=$BASE_REF
       - name: Build and analyze push master
         if: ${{ github.event_name == 'push' }}
         env:

From 396341dbf7a52fa8fc9daf7c444893f1a29fa520 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <ilia-2k@rambler.ru>
Date: Tue, 14 Jun 2022 15:31:00 +0400
Subject: [PATCH 026/734] Backend: topic analysis (#1965)

* Topic Analyzer implementation

* small cleanup

* hourly stats added

* imports fix

* compilation fixes

* PR fixes

* PR fixes (renaming)

* tests compilation fix

* apis improved

* checkstyle fix

* renaming

* node version rollback

* Fix naming

Signed-off-by: Roman Zabaluev <rzabaluev@provectus.com>

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-api/pom.xml                          |   5 +
 .../kafka/ui/controller/TopicsController.java |  28 +++
 .../kafka/ui/exception/ErrorCode.java         |   3 +-
 .../ui/exception/TopicAnalysisException.java  |  13 ++
 .../service/analyze/AnalysisTasksStore.java   | 117 +++++++++++
 .../service/analyze/TopicAnalysisService.java | 156 ++++++++++++++
 .../service/analyze/TopicAnalysisStats.java   | 141 +++++++++++++
 .../ui/service/analyze/TopicIdentity.java     |  17 ++
 .../service/TopicsServicePaginationTest.java  |   4 +-
 .../analyze/TopicAnalysisServiceTest.java     |  62 ++++++
 .../main/resources/swagger/kafka-ui-api.yaml  | 194 ++++++++++++++++++
 pom.xml                                       |   1 +
 12 files changed, 739 insertions(+), 2 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/TopicAnalysisException.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/AnalysisTasksStore.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicIdentity.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisServiceTest.java

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 9665aad565f..c3d30e9ab61 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -212,6 +212,11 @@
             <artifactId>groovy-json</artifactId>
             <version>${groovy.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.datasketches</groupId>
+            <artifactId>datasketches-java</artifactId>
+            <version>${datasketches-java.version}</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
index e30a540c903..ccfe898fdcb 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
@@ -11,6 +11,7 @@
 import com.provectus.kafka.ui.model.ReplicationFactorChangeDTO;
 import com.provectus.kafka.ui.model.ReplicationFactorChangeResponseDTO;
 import com.provectus.kafka.ui.model.SortOrderDTO;
+import com.provectus.kafka.ui.model.TopicAnalysisDTO;
 import com.provectus.kafka.ui.model.TopicColumnsToSortDTO;
 import com.provectus.kafka.ui.model.TopicConfigDTO;
 import com.provectus.kafka.ui.model.TopicCreationDTO;
@@ -19,6 +20,7 @@
 import com.provectus.kafka.ui.model.TopicUpdateDTO;
 import com.provectus.kafka.ui.model.TopicsResponseDTO;
 import com.provectus.kafka.ui.service.TopicsService;
+import com.provectus.kafka.ui.service.analyze.TopicAnalysisService;
 import java.util.Comparator;
 import java.util.List;
 import javax.validation.Valid;
@@ -40,6 +42,7 @@ public class TopicsController extends AbstractController implements TopicsApi {
   private static final Integer DEFAULT_PAGE_SIZE = 25;
 
   private final TopicsService topicsService;
+  private final TopicAnalysisService topicAnalysisService;
   private final ClusterMapper clusterMapper;
 
   @Override
@@ -181,4 +184,29 @@ public Mono<ResponseEntity<ReplicationFactorChangeResponseDTO>> changeReplicatio
             topicsService.changeReplicationFactor(getCluster(clusterName), topicName, rfc))
         .map(ResponseEntity::ok);
   }
+
+  @Override
+  public Mono<ResponseEntity<Void>> analyzeTopic(String clusterName, String topicName, ServerWebExchange exchange) {
+    return topicAnalysisService.analyze(getCluster(clusterName), topicName)
+        .thenReturn(ResponseEntity.ok().build());
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> cancelTopicAnalysis(String clusterName, String topicName,
+                                                       ServerWebExchange exchange) {
+    topicAnalysisService.cancelAnalysis(getCluster(clusterName), topicName);
+    return Mono.just(ResponseEntity.ok().build());
+  }
+
+
+  @Override
+  public Mono<ResponseEntity<TopicAnalysisDTO>> getTopicAnalysis(String clusterName,
+                                                                 String topicName,
+                                                                 ServerWebExchange exchange) {
+    return Mono.just(
+        topicAnalysisService.getTopicAnalysis(getCluster(clusterName), topicName)
+            .map(ResponseEntity::ok)
+            .orElseGet(() -> ResponseEntity.notFound().build())
+    );
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java
index 2c801d3d05c..ecd1915316f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java
@@ -26,7 +26,8 @@ public enum ErrorCode {
   INVALID_REQUEST(4014, HttpStatus.BAD_REQUEST),
   RECREATE_TOPIC_TIMEOUT(4015, HttpStatus.REQUEST_TIMEOUT),
   INVALID_ENTITY_STATE(4016, HttpStatus.BAD_REQUEST),
-  SCHEMA_NOT_DELETED(4017, HttpStatus.INTERNAL_SERVER_ERROR);
+  SCHEMA_NOT_DELETED(4017, HttpStatus.INTERNAL_SERVER_ERROR),
+  TOPIC_ANALYSIS_ERROR(4018, HttpStatus.BAD_REQUEST);
 
   static {
     // codes uniqueness check
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/TopicAnalysisException.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/TopicAnalysisException.java
new file mode 100644
index 00000000000..ecf80febc1d
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/TopicAnalysisException.java
@@ -0,0 +1,13 @@
+package com.provectus.kafka.ui.exception;
+
+public class TopicAnalysisException extends CustomBaseException {
+
+  public TopicAnalysisException(String message) {
+    super(message);
+  }
+
+  @Override
+  public ErrorCode getErrorCode() {
+    return ErrorCode.TOPIC_ANALYSIS_ERROR;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/AnalysisTasksStore.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/AnalysisTasksStore.java
new file mode 100644
index 00000000000..d5ed1a36d6b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/AnalysisTasksStore.java
@@ -0,0 +1,117 @@
+package com.provectus.kafka.ui.service.analyze;
+
+import com.google.common.base.Throwables;
+import com.provectus.kafka.ui.model.TopicAnalysisDTO;
+import com.provectus.kafka.ui.model.TopicAnalysisProgressDTO;
+import com.provectus.kafka.ui.model.TopicAnalysisResultDTO;
+import java.io.Closeable;
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import lombok.Builder;
+import lombok.SneakyThrows;
+import lombok.Value;
+
+class AnalysisTasksStore {
+
+  private final Map<TopicIdentity, RunningAnalysis> running = new ConcurrentHashMap<>();
+  private final Map<TopicIdentity, TopicAnalysisResultDTO> completed = new ConcurrentHashMap<>();
+
+  void setAnalysisError(TopicIdentity topicId,
+                        Instant collectionStartedAt,
+                        Throwable th) {
+    running.remove(topicId);
+    completed.put(
+        topicId,
+        new TopicAnalysisResultDTO()
+            .startedAt(collectionStartedAt.toEpochMilli())
+            .finishedAt(System.currentTimeMillis())
+            .error(Throwables.getStackTraceAsString(th))
+    );
+  }
+
+  void setAnalysisResult(TopicIdentity topicId,
+                         Instant collectionStartedAt,
+                         TopicAnalysisStats totalStats,
+                         Map<Integer, TopicAnalysisStats> partitionStats) {
+    running.remove(topicId);
+    completed.put(topicId,
+        new TopicAnalysisResultDTO()
+            .startedAt(collectionStartedAt.toEpochMilli())
+            .finishedAt(System.currentTimeMillis())
+            .totalStats(totalStats.toDto(null))
+            .partitionStats(
+                partitionStats.entrySet().stream()
+                    .map(e -> e.getValue().toDto(e.getKey()))
+                    .collect(Collectors.toList())
+            ));
+  }
+
+  void updateProgress(TopicIdentity topicId,
+                      long msgsScanned,
+                      long bytesScanned,
+                      Double completeness) {
+    running.computeIfPresent(topicId, (k, state) ->
+        state.toBuilder()
+            .msgsScanned(msgsScanned)
+            .bytesScanned(bytesScanned)
+            .completenessPercent(completeness)
+            .build());
+  }
+
+  void registerNewTask(TopicIdentity topicId, Closeable task) {
+    running.put(topicId, new RunningAnalysis(Instant.now(), 0.0, 0, 0, task));
+  }
+
+  void cancelAnalysis(TopicIdentity topicId) {
+    Optional.ofNullable(running.remove(topicId))
+        .ifPresent(RunningAnalysis::stopTask);
+  }
+
+  boolean isAnalysisInProgress(TopicIdentity id) {
+    return running.containsKey(id);
+  }
+
+  Optional<TopicAnalysisDTO> getTopicAnalysis(TopicIdentity id) {
+    var runningState = running.get(id);
+    var completedState = completed.get(id);
+    if (runningState == null && completedState == null) {
+      return Optional.empty();
+    }
+    return Optional.of(createAnalysisDto(runningState, completedState));
+  }
+
+  private TopicAnalysisDTO createAnalysisDto(@Nullable RunningAnalysis runningState,
+                                             @Nullable TopicAnalysisResultDTO completedState) {
+    return new TopicAnalysisDTO()
+        .progress(runningState != null ? runningState.toDto() : null)
+        .result(completedState);
+  }
+
+  @Value
+  @Builder(toBuilder = true)
+  private static class RunningAnalysis {
+    Instant startedAt;
+    double completenessPercent;
+    long msgsScanned;
+    long bytesScanned;
+    Closeable task;
+
+    TopicAnalysisProgressDTO toDto() {
+      return new TopicAnalysisProgressDTO()
+          .startedAt(startedAt.toEpochMilli())
+          .bytesScanned(bytesScanned)
+          .msgsScanned(msgsScanned)
+          .completenessPercent(BigDecimal.valueOf(completenessPercent));
+    }
+
+    @SneakyThrows
+    void stopTask() {
+      task.close();
+    }
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
new file mode 100644
index 00000000000..757b469a6b3
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
@@ -0,0 +1,156 @@
+package com.provectus.kafka.ui.service.analyze;
+
+import com.provectus.kafka.ui.exception.TopicAnalysisException;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.TopicAnalysisDTO;
+import com.provectus.kafka.ui.service.ConsumerGroupService;
+import com.provectus.kafka.ui.service.TopicsService;
+import com.provectus.kafka.ui.util.OffsetsSeek.WaitingOffsets;
+import java.io.Closeable;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.errors.InterruptException;
+import org.apache.kafka.common.errors.WakeupException;
+import org.apache.kafka.common.utils.Bytes;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class TopicAnalysisService {
+
+  private final AnalysisTasksStore analysisTasksStore = new AnalysisTasksStore();
+
+  private final TopicsService topicsService;
+  private final ConsumerGroupService consumerGroupService;
+
+  public Mono<Void> analyze(KafkaCluster cluster, String topicName) {
+    return topicsService.getTopicDetails(cluster, topicName)
+        .doOnNext(topic ->
+            startAnalysis(
+                cluster,
+                topicName,
+                topic.getPartitionCount(),
+                topic.getPartitions().values()
+                    .stream()
+                    .mapToLong(p -> p.getOffsetMax() - p.getOffsetMin())
+                    .sum()
+            )
+        ).then();
+  }
+
+  private synchronized void startAnalysis(KafkaCluster cluster,
+                                          String topic,
+                                          int partitionsCnt,
+                                          long approxNumberOfMsgs) {
+    var topicId = new TopicIdentity(cluster, topic);
+    if (analysisTasksStore.isAnalysisInProgress(topicId)) {
+      throw new TopicAnalysisException("Topic is already analyzing");
+    }
+    var task = new AnalysisTask(cluster, topicId, partitionsCnt, approxNumberOfMsgs);
+    analysisTasksStore.registerNewTask(topicId, task);
+    Schedulers.boundedElastic().schedule(task);
+  }
+
+  public void cancelAnalysis(KafkaCluster cluster, String topicName) {
+    analysisTasksStore.cancelAnalysis(new TopicIdentity(cluster, topicName));
+  }
+
+  public Optional<TopicAnalysisDTO> getTopicAnalysis(KafkaCluster cluster, String topicName) {
+    return analysisTasksStore.getTopicAnalysis(new TopicIdentity(cluster, topicName));
+  }
+
+  class AnalysisTask implements Runnable, Closeable {
+
+    private final Instant startedAt = Instant.now();
+
+    private final TopicIdentity topicId;
+    private final int partitionsCnt;
+    private final long approxNumberOfMsgs;
+
+    private final TopicAnalysisStats totalStats = new TopicAnalysisStats();
+    private final Map<Integer, TopicAnalysisStats> partitionStats = new HashMap<>();
+
+    private final KafkaConsumer<Bytes, Bytes> consumer;
+
+    AnalysisTask(KafkaCluster cluster, TopicIdentity topicId, int partitionsCnt, long approxNumberOfMsgs) {
+      this.topicId = topicId;
+      this.approxNumberOfMsgs = approxNumberOfMsgs;
+      this.partitionsCnt = partitionsCnt;
+      this.consumer = consumerGroupService.createConsumer(
+          cluster,
+          // to improve polling throughput
+          Map.of(
+              ConsumerConfig.RECEIVE_BUFFER_CONFIG, "-1", //let OS tune buffer size
+              ConsumerConfig.MAX_POLL_RECORDS_CONFIG, "100000"
+          )
+      );
+    }
+
+    @Override
+    public void close() {
+      consumer.wakeup();
+    }
+
+    @Override
+    public void run() {
+      try {
+        log.info("Starting {} topic analysis", topicId);
+        var topicPartitions = IntStream.range(0, partitionsCnt)
+            .peek(i -> partitionStats.put(i, new TopicAnalysisStats()))
+            .mapToObj(i -> new TopicPartition(topicId.topicName, i))
+            .collect(Collectors.toList());
+
+        consumer.assign(topicPartitions);
+        consumer.seekToBeginning(topicPartitions);
+
+        var waitingOffsets = new WaitingOffsets(topicId.topicName, consumer, topicPartitions);
+        for (int emptyPolls = 0; !waitingOffsets.endReached() && emptyPolls < 3; ) {
+          var polled = consumer.poll(Duration.ofSeconds(3));
+          emptyPolls = polled.isEmpty() ? emptyPolls + 1 : 0;
+          polled.forEach(r -> {
+            totalStats.apply(r);
+            partitionStats.get(r.partition()).apply(r);
+            waitingOffsets.markPolled(r);
+          });
+          updateProgress();
+        }
+        analysisTasksStore.setAnalysisResult(topicId, startedAt, totalStats, partitionStats);
+        log.info("{} topic analysis finished", topicId);
+      } catch (WakeupException | InterruptException cancelException) {
+        log.info("{} topic analysis stopped", topicId);
+        // calling cancel for cases when our thread was interrupted by some non-user cancellation reason
+        analysisTasksStore.cancelAnalysis(topicId);
+      } catch (Throwable th) {
+        log.error("Error analyzing topic {}", topicId, th);
+        analysisTasksStore.setAnalysisError(topicId, startedAt, th);
+      } finally {
+        consumer.close();
+      }
+    }
+
+    private void updateProgress() {
+      if (totalStats.totalMsgs > 0 && approxNumberOfMsgs != 0) {
+        analysisTasksStore.updateProgress(
+            topicId,
+            totalStats.totalMsgs,
+            totalStats.keysSize.sum + totalStats.valuesSize.sum,
+            Math.min(100.0, (((double) totalStats.totalMsgs) / approxNumberOfMsgs) * 100)
+        );
+      }
+    }
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java
new file mode 100644
index 00000000000..2d8e0dc38f8
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java
@@ -0,0 +1,141 @@
+package com.provectus.kafka.ui.service.analyze;
+
+import com.provectus.kafka.ui.model.TopicAnalysisSizeStatsDTO;
+import com.provectus.kafka.ui.model.TopicAnalysisStatsDTO;
+import com.provectus.kafka.ui.model.TopicAnalysisStatsHourlyMsgCountsDTO;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import org.apache.datasketches.hll.HllSketch;
+import org.apache.datasketches.quantiles.DoublesSketch;
+import org.apache.datasketches.quantiles.UpdateDoublesSketch;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.common.utils.Bytes;
+
+class TopicAnalysisStats {
+
+  Long totalMsgs = 0L;
+  Long minOffset;
+  Long maxOffset;
+
+  Long minTimestamp;
+  Long maxTimestamp;
+
+  long nullKeys = 0L;
+  long nullValues = 0L;
+
+  final SizeStats keysSize = new SizeStats();
+  final SizeStats valuesSize = new SizeStats();
+
+  final HllSketch uniqKeys = new HllSketch();
+  final HllSketch uniqValues = new HllSketch();
+
+  final HourlyCounts hourlyCounts = new HourlyCounts();
+
+  static class SizeStats {
+    long sum = 0;
+    Long min;
+    Long max;
+    final UpdateDoublesSketch sizeSketch = DoublesSketch.builder().build();
+
+    void apply(byte[] bytes) {
+      int len = bytes.length;
+      sum += len;
+      min = minNullable(min, len);
+      max = maxNullable(max, len);
+      sizeSketch.update(len);
+    }
+
+    TopicAnalysisSizeStatsDTO toDto() {
+      return new TopicAnalysisSizeStatsDTO()
+          .sum(sum)
+          .min(min)
+          .max(max)
+          .avg((long) (((double) sum) / sizeSketch.getN()))
+          .prctl50((long) sizeSketch.getQuantile(0.5))
+          .prctl75((long) sizeSketch.getQuantile(0.75))
+          .prctl95((long) sizeSketch.getQuantile(0.95))
+          .prctl99((long) sizeSketch.getQuantile(0.99))
+          .prctl999((long) sizeSketch.getQuantile(0.999));
+    }
+  }
+
+  static class HourlyCounts {
+
+    // hour start ms -> count
+    private final Map<Long, Long> hourlyStats = new HashMap<>();
+    private final long minTs = Instant.now().minus(Duration.ofDays(14)).toEpochMilli();
+
+    void apply(ConsumerRecord<?, ?> rec) {
+      if (rec.timestamp() > minTs) {
+        var hourStart = rec.timestamp() - rec.timestamp() % (1_000 * 60 * 60);
+        hourlyStats.compute(hourStart, (h, cnt) -> cnt == null ? 1 : cnt + 1);
+      }
+    }
+
+    List<TopicAnalysisStatsHourlyMsgCountsDTO> toDto() {
+      return hourlyStats.entrySet().stream()
+          .sorted(Comparator.comparingLong(Map.Entry::getKey))
+          .map(e -> new TopicAnalysisStatsHourlyMsgCountsDTO()
+              .hourStart(e.getKey())
+              .count(e.getValue()))
+          .collect(Collectors.toList());
+    }
+  }
+
+  void apply(ConsumerRecord<Bytes, Bytes> rec) {
+    totalMsgs++;
+    minTimestamp = minNullable(minTimestamp, rec.timestamp());
+    maxTimestamp = maxNullable(maxTimestamp, rec.timestamp());
+    minOffset = minNullable(minOffset, rec.offset());
+    maxOffset = maxNullable(maxOffset, rec.offset());
+    hourlyCounts.apply(rec);
+
+    if (rec.key() != null) {
+      byte[] keyBytes = rec.key().get();
+      keysSize.apply(keyBytes);
+      uniqKeys.update(keyBytes);
+    } else {
+      nullKeys++;
+    }
+
+    if (rec.value() != null) {
+      byte[] valueBytes = rec.value().get();
+      valuesSize.apply(valueBytes);
+      uniqValues.update(valueBytes);
+    } else {
+      nullValues++;
+    }
+  }
+
+  TopicAnalysisStatsDTO toDto(@Nullable Integer partition) {
+    return new TopicAnalysisStatsDTO()
+        .partition(partition)
+        .totalMsgs(totalMsgs)
+        .minOffset(minOffset)
+        .maxOffset(maxOffset)
+        .minTimestamp(minTimestamp)
+        .maxTimestamp(maxTimestamp)
+        .nullKeys(nullKeys)
+        .nullValues(nullValues)
+        // because of hll error estimated size can be greater that actual msgs count
+        .approxUniqKeys(Math.min(totalMsgs, (long) uniqKeys.getEstimate()))
+        .approxUniqValues(Math.min(totalMsgs, (long) uniqValues.getEstimate()))
+        .keySize(keysSize.toDto())
+        .valueSize(valuesSize.toDto())
+        .hourlyMsgCounts(hourlyCounts.toDto());
+  }
+
+  private static Long maxNullable(@Nullable Long v1, long v2) {
+    return v1 == null ? v2 : Math.max(v1, v2);
+  }
+
+  private static Long minNullable(@Nullable Long v1, long v2) {
+    return v1 == null ? v2 : Math.min(v1, v2);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicIdentity.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicIdentity.java
new file mode 100644
index 00000000000..bfe75c1772b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicIdentity.java
@@ -0,0 +1,17 @@
+package com.provectus.kafka.ui.service.analyze;
+
+import com.provectus.kafka.ui.model.KafkaCluster;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ToString
+@EqualsAndHashCode
+class TopicIdentity {
+  final String clusterName;
+  final String topicName;
+
+  public TopicIdentity(KafkaCluster cluster, String topic) {
+    this.clusterName = cluster.getName();
+    this.topicName = topic;
+  }
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
index 76b1e8c4cb6..42e44b08975 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
@@ -17,6 +17,7 @@
 import com.provectus.kafka.ui.model.SortOrderDTO;
 import com.provectus.kafka.ui.model.TopicColumnsToSortDTO;
 import com.provectus.kafka.ui.model.TopicDTO;
+import com.provectus.kafka.ui.service.analyze.TopicAnalysisService;
 import com.provectus.kafka.ui.util.JmxClusterUtil;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -41,7 +42,8 @@ class TopicsServicePaginationTest {
   private final ClustersStorage clustersStorage = mock(ClustersStorage.class);
   private final ClusterMapper clusterMapper = new ClusterMapperImpl();
 
-  private final TopicsController topicsController  = new TopicsController(topicsService, clusterMapper);
+  private final TopicsController topicsController  = new TopicsController(
+      topicsService, mock(TopicAnalysisService.class), clusterMapper);
 
   private void init(Map<String, InternalTopic> topicsInCache) {
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisServiceTest.java
new file mode 100644
index 00000000000..7d02219e9c1
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisServiceTest.java
@@ -0,0 +1,62 @@
+package com.provectus.kafka.ui.service.analyze;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.AbstractIntegrationTest;
+import com.provectus.kafka.ui.producer.KafkaTestProducer;
+import com.provectus.kafka.ui.service.ClustersStorage;
+import java.time.Duration;
+import java.util.UUID;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
+
+
+class TopicAnalysisServiceTest extends AbstractIntegrationTest {
+
+  @Autowired
+  private ClustersStorage clustersStorage;
+
+  @Autowired
+  private TopicAnalysisService topicAnalysisService;
+
+  @Test
+  void savesResultWhenAnalysisIsCompleted() {
+    String topic = "analyze_test_" + UUID.randomUUID();
+    createTopic(new NewTopic(topic, 2, (short) 1));
+    fillTopic(topic, 1_000);
+
+    var cluster = clustersStorage.getClusterByName(LOCAL).get();
+    topicAnalysisService.analyze(cluster, topic).block();
+
+    Awaitility.await()
+        .atMost(Duration.ofSeconds(20))
+        .untilAsserted(() -> {
+          assertThat(topicAnalysisService.getTopicAnalysis(cluster, topic))
+              .hasValueSatisfying(state -> {
+                assertThat(state.getProgress()).isNull();
+                assertThat(state.getResult()).isNotNull();
+                var completedAnalyze = state.getResult();
+                assertThat(completedAnalyze.getTotalStats().getTotalMsgs()).isEqualTo(1_000);
+                assertThat(completedAnalyze.getPartitionStats().size()).isEqualTo(2);
+              });
+        });
+  }
+
+  private void fillTopic(String topic, int cnt) {
+    try (var producer = KafkaTestProducer.forKafka(kafka)) {
+      for (int i = 0; i < cnt; i++) {
+        producer.send(
+            new ProducerRecord<>(
+                topic,
+                RandomStringUtils.randomAlphabetic(5),
+                RandomStringUtils.randomAlphabetic(10)));
+      }
+    }
+  }
+
+
+}
\ No newline at end of file
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 1416609982c..63f313e2ac1 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -363,6 +363,76 @@ paths:
         404:
           description: Not found
 
+  /api/clusters/{clusterName}/topics/{topicName}/analysis:
+    get:
+      tags:
+        - Topics
+      summary: getTopicAnalysis
+      operationId: getTopicAnalysis
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: topicName
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TopicAnalysis'
+        404:
+          description: Not found
+    post:
+      tags:
+        - Topics
+      summary: analyzeTopic
+      operationId: analyzeTopic
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: topicName
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        200:
+          description: Analysis started
+        404:
+          description: Not found
+    delete:
+      tags:
+        - Topics
+      summary: cancelTopicAnalysis
+      operationId: cancelTopicAnalysis
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: topicName
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        200:
+          description: Analysis cancelled
+        404:
+          description: Not found
+
+
   /api/clusters/{clusterName}/topics/{topicName}:
     get:
       tags:
@@ -1911,6 +1981,130 @@ components:
       required:
         - name
 
+    TopicAnalysis:
+      type: object
+      description: "Represents analysis state. Note: 'progress' and 'result' fields are set exclusively depending on analysis state."
+      properties:
+        progress:
+          $ref: '#/components/schemas/TopicAnalysisProgress'
+        result:
+          $ref: '#/components/schemas/TopicAnalysisResult'
+
+    TopicAnalysisProgress:
+      type: object
+      properties:
+        startedAt:
+          type: integer
+          format: int64
+        completenessPercent:
+          type: number
+        msgsScanned:
+          type: integer
+          format: int64
+        bytesScanned:
+          type: integer
+          format: int64
+
+    TopicAnalysisResult:
+      type: object
+      properties:
+        startedAt:
+          type: integer
+          format: int64
+        finishedAt:
+          type: integer
+          format: int64
+        error:
+          type: string
+        totalStats:
+          $ref: '#/components/schemas/TopicAnalysisStats'
+        partitionStats:
+          type: array
+          items:
+            $ref: "#/components/schemas/TopicAnalysisStats"
+
+    TopicAnalysisStats:
+      type: object
+      properties:
+        partition:
+          type: integer
+          format: int32
+          description: "null if this is total stats"
+        totalMsgs:
+          type: integer
+          format: int64
+        minOffset:
+          type: integer
+          format: int64
+        maxOffset:
+          type: integer
+          format: int64
+        minTimestamp:
+          type: integer
+          format: int64
+        maxTimestamp:
+          type: integer
+          format: int64
+        nullKeys:
+          type: integer
+          format: int64
+        nullValues:
+          type: integer
+          format: int64
+        approxUniqKeys:
+          type: integer
+          format: int64
+        approxUniqValues:
+          type: integer
+          format: int64
+        keySize:
+          $ref: "#/components/schemas/TopicAnalysisSizeStats"
+        valueSize:
+          $ref: "#/components/schemas/TopicAnalysisSizeStats"
+        hourlyMsgCounts:
+          type: array
+          items:
+            type: object
+            properties:
+              hourStart:
+                type: integer
+                format: int64
+              count:
+                type: integer
+                format: int64
+
+    TopicAnalysisSizeStats:
+      type: object
+      description: "All sizes in bytes"
+      properties:
+        sum:
+          type: integer
+          format: int64
+        min:
+          type: integer
+          format: int64
+        max:
+          type: integer
+          format: int64
+        avg:
+          type: integer
+          format: int64
+        prctl50:
+          type: integer
+          format: int64
+        prctl75:
+          type: integer
+          format: int64
+        prctl95:
+          type: integer
+          format: int64
+        prctl99:
+          type: integer
+          format: int64
+        prctl999:
+          type: integer
+          format: int64
+
     Replica:
       type: object
       properties:
diff --git a/pom.xml b/pom.xml
index a73aaf08258..924108bd762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
         <assertj.version>3.19.0</assertj.version>
         <antlr4-maven-plugin.version>4.7.1</antlr4-maven-plugin.version>
         <groovy.version>3.0.9</groovy.version>
+        <datasketches-java.version>3.1.0</datasketches-java.version>
 
         <frontend-generated-sources-directory>..//kafka-ui-react-app/src/generated-sources
         </frontend-generated-sources-directory>

From 4ebc74212cea7741dd68362881430517322fd018 Mon Sep 17 00:00:00 2001
From: ChristinaKristane <65531624+ChristinaKristane@users.noreply.github.com>
Date: Tue, 14 Jun 2022 23:15:03 +0300
Subject: [PATCH 027/734] [e2e] Produce message tests, schema registry tests
 (#984)

* #825 add methods for creating Schema Registry

* #825 Produced message added and Schema Registry added

* add test for produced message

* update topic test

* fix test 'produce message', added tag for docker selenium image

* added schema registry rests

* changed schema value

* changed locator for schema selector

* added verification container running, need to close before new test class

* fix for timeout exception, removed deletion of cookies

* small fix for remote driver

* small fix for remote driver v2

* fix for api deletion if not exist

Co-authored-by: kshpilchyna <kshpilchyna@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../com/provectus/kafka/ui/base/BaseTest.java |  42 +++--
 .../kafka/ui/base/TestConfiguration.java      |   5 +-
 .../provectus/kafka/ui/helpers/ApiHelper.java |  64 ++++---
 .../provectus/kafka/ui/pages/MainPage.java    |  20 ++-
 .../com/provectus/kafka/ui/pages/Pages.java   |   5 +-
 .../kafka/ui/pages/ProduceMessagePage.java    |  43 +++++
 .../pages/connector/ConnectorUpdateView.java  |   6 +-
 .../ui/pages/schema/SchemaCreateView.java     |  51 ++++++
 .../kafka/ui/pages/schema/SchemaEditView.java |  52 ++++++
 .../ui/pages/schema/SchemaRegistryList.java   |  40 +++++
 .../kafka/ui/pages/schema/SchemaView.java     |  38 +++++
 .../topic/TopicCreateEditSettingsView.java    |   7 +-
 .../kafka/ui/pages/topic/TopicView.java       |  59 +++++--
 .../kafka/ui/tests/ConnectorsTests.java       |   4 +-
 .../kafka/ui/tests/SchemasTests.java          | 161 ++++++++++++++++++
 .../provectus/kafka/ui/tests/TopicTests.java  |  29 ++++
 .../src/test/resources/producedkey.txt        |   1 +
 .../src/test/resources/schema_Json_Value.json |   7 +
 .../resources/schema_avro_for_update.json     |  24 +++
 .../src/test/resources/schema_avro_value.json |  15 ++
 .../test/resources/schema_protobuf_value.txt  |   5 +
 .../src/test/resources/testData.txt           |   1 +
 22 files changed, 607 insertions(+), 72 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/producedkey.txt
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/schema_Json_Value.json
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/schema_avro_for_update.json
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/schema_avro_value.json
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/schema_protobuf_value.txt
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/testData.txt

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 6a866ee0004..2f41f8a95b3 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -13,9 +13,8 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.*;
+import org.openqa.selenium.Dimension;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.chrome.ChromeOptions;
@@ -23,11 +22,11 @@
 import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.time.Duration;
 import java.util.Arrays;
 
 @Slf4j
@@ -40,12 +39,9 @@ public class BaseTest {
 
     private Screenshooter screenshooter = new Screenshooter();
 
-    public static BrowserWebDriverContainer<?> webDriverContainer =
-            new BrowserWebDriverContainer<>()
-                    .withCapabilities(new ChromeOptions()
-                            .addArguments("--no-sandbox")
-                            .addArguments("--disable-dev-shm-usage"))
-                    .waitingFor(Wait.defaultWaitStrategy().withStartupTimeout(Duration.ofSeconds(90)));
+    private static final String IMAGE_NAME = TestConfiguration.IMAGE_NAME;
+    private static final String IMAGE_TAG = TestConfiguration.IMAGE_TAG;
+    protected static BrowserWebDriverContainer<?> webDriverContainer = null;
 
     public void compareScreenshots(String name) {
         screenshooter.compareScreenshots(name);
@@ -55,13 +51,32 @@ public void compareScreenshots(String name, Boolean shouldUpdateScreenshots) {
         screenshooter.compareScreenshots(name, shouldUpdateScreenshots);
     }
 
+    @BeforeEach
+    public void setWebDriver(){
+        RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
+        WebDriverRunner.setWebDriver(remoteWebDriver);
+        remoteWebDriver.manage().window().setSize(new Dimension(1440, 1024));
+    }
+
     @BeforeAll
     public static void start() {
+        DockerImageName image = DockerImageName.parse(IMAGE_NAME).withTag(IMAGE_TAG);
+        webDriverContainer = new BrowserWebDriverContainer<>(image)
+                .withCapabilities(new ChromeOptions().addArguments("--disable-dev-shm-usage"))
+                .waitingFor(Wait.forHttp("/"))
+                .waitingFor(Wait.forLogMessage(".*Started Selenium Standalone.*", 1));
         Testcontainers.exposeHostPorts(8080);
         webDriverContainer.start();
         webDriverContainer.isRunning();
-        RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
-        WebDriverRunner.setWebDriver(remoteWebDriver);
+        webDriverContainer.isHostAccessible();
+    }
+
+    @AfterAll
+    public static void tearDown(){
+        if(webDriverContainer.isRunning()) {
+            webDriverContainer.close();
+            webDriverContainer.stop();
+        }
     }
 
     static {
@@ -80,17 +95,14 @@ public static void start() {
         setup();
     }
 
-
     @AfterEach
     public void afterMethod() {
-        webDriverContainer.getWebDriver().manage().deleteAllCookies();
         Allure.addAttachment("Screenshot",
                 new ByteArrayInputStream(((TakesScreenshot) webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
     }
 
     @SneakyThrows
     private static void setup() {
-
         Configuration.reportsFolder = TestConfiguration.REPORTS_FOLDER;
         Configuration.screenshots = TestConfiguration.SCREENSHOTS;
         Configuration.savePageSource = TestConfiguration.SAVE_PAGE_SOURCE;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java
index dbc18e228f4..f28533cfa4f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java
@@ -9,7 +9,7 @@ public class TestConfiguration {
       Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "true"));
   public static String REPORTS_FOLDER = System.getProperty("REPORTS_FOLDER", "allure-results");
   public static Boolean SCREENSHOTS =
-      Boolean.parseBoolean(System.getProperty("SCREENSHOTS", "false"));
+      Boolean.parseBoolean(System.getProperty("SCREENSHOTS", "true"));
   public static Boolean SAVE_PAGE_SOURCE =
       Boolean.parseBoolean(System.getProperty("SAVE_PAGE_SOURCE", "false"));
   public static Boolean REOPEN_BROWSER_ON_FAIL =
@@ -17,4 +17,7 @@ public class TestConfiguration {
   public static String BROWSER = System.getProperty("BROWSER", "chrome");
   public static String BROWSER_SIZE = System.getProperty("BROWSER_SIZE", "1920x1080");
   public static Boolean ENABLE_VNC = Boolean.parseBoolean(System.getProperty("ENABLE_VNC", "true"));
+  public static String IMAGE_NAME = System.getProperty("SELENIUM_DOCKER_IMAGE", "selenium/standalone-chrome");
+  public static String IMAGE_TAG = System.getProperty("SELENIUM_IMAGE_TAG", "102.0");
+
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java
index f0b8ff78421..c1394c8218c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java
@@ -1,15 +1,12 @@
 package com.provectus.kafka.ui.helpers;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
 import com.provectus.kafka.ui.api.ApiClient;
 import com.provectus.kafka.ui.api.api.KafkaConnectApi;
 import com.provectus.kafka.ui.api.api.MessagesApi;
+import com.provectus.kafka.ui.api.api.SchemasApi;
 import com.provectus.kafka.ui.api.api.TopicsApi;
-import com.provectus.kafka.ui.api.model.CreateTopicMessage;
-import com.provectus.kafka.ui.api.model.ErrorResponse;
-import com.provectus.kafka.ui.api.model.NewConnector;
-import com.provectus.kafka.ui.api.model.TopicCreation;
+import com.provectus.kafka.ui.api.model.*;
 import com.provectus.kafka.ui.base.TestConfiguration;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -35,7 +32,22 @@ private TopicsApi topicApi() {
         return new TopicsApi(new ApiClient().setBasePath(baseURL));
     }
 
+    @SneakyThrows
+    private SchemasApi schemaApi() {
+        return new SchemasApi(new ApiClient().setBasePath(baseURL));
+    }
+
+    @SneakyThrows
+    private KafkaConnectApi connectorApi() {
+        return new KafkaConnectApi(new ApiClient().setBasePath(baseURL));
+    }
+
+    @SneakyThrows
+    private MessagesApi messageApi() {
+        return new MessagesApi(new ApiClient().setBasePath(baseURL));
+    }
 
+    @SneakyThrows
     public void createTopic(String clusterName, String topicName) {
         TopicCreation topic = new TopicCreation();
         topic.setName(topicName);
@@ -50,26 +62,32 @@ public void createTopic(String clusterName, String topicName) {
         }
     }
 
-
     public void deleteTopic(String clusterName, String topicName) {
         try {
             topicApi().deleteTopic(clusterName, topicName).block();
+        } catch (WebClientResponseException ignore) {
+        }
+    }
+
+    @SneakyThrows
+    public void createSchema(String clusterName, String schemaName, SchemaType type, String schemaValue) {
+        NewSchemaSubject schemaSubject = new NewSchemaSubject();
+        schemaSubject.setSubject(schemaName);
+        schemaSubject.setSchema(schemaValue);
+        schemaSubject.setSchemaType(type);
+        try {
+            schemaApi().createNewSchema(clusterName, schemaSubject).block();
         } catch (WebClientResponseException ex) {
-            ErrorResponse errorResponse = new Gson().fromJson(ex.getResponseBodyAsString(), ErrorResponse.class);
-            if (errorResponse.getMessage().startsWith("This server does not host this")) {
-                log.info("This server does not host this " + topicName);
-            } else {
-                throw ex;
-            }
+            ex.printStackTrace();
         }
     }
 
     @SneakyThrows
-    private KafkaConnectApi connectorApi() {
-        ApiClient defaultClient = new ApiClient();
-        defaultClient.setBasePath(baseURL);
-        KafkaConnectApi connectorsApi = new KafkaConnectApi(defaultClient);
-        return connectorsApi;
+    public void deleteSchema(String clusterName, String schemaName) {
+        try {
+            schemaApi().deleteSchema(clusterName, schemaName).block();
+        } catch (WebClientResponseException ignore) {
+        }
     }
 
     @SneakyThrows
@@ -88,7 +106,7 @@ public void createConnector(String clusterName, String connectName, String conne
         connector.setConfig(configMap);
         try {
             connectorApi().deleteConnector(clusterName, connectName, connectorName).block();
-        } catch (WebClientResponseException ignored){
+        } catch (WebClientResponseException ignored) {
         }
         connectorApi().createConnector(clusterName, connectName, connector).block();
     }
@@ -97,17 +115,9 @@ public String getFirstConnectName(String clusterName) {
         return connectorApi().getConnects(clusterName).blockFirst().getName();
     }
 
-    @SneakyThrows
-    private MessagesApi messageApi() {
-        ApiClient defaultClient = new ApiClient();
-        defaultClient.setBasePath(baseURL);
-        MessagesApi messagesApi = new MessagesApi(defaultClient);
-        return messagesApi;
-    }
-
     @SneakyThrows
     public void sendMessage(String clusterName, String topicName, String messageContentJson,
-            String messageKey) {
+                            String messageKey) {
         CreateTopicMessage createMessage = new CreateTopicMessage();
         createMessage.partition(0);
         createMessage.setContent(messageContentJson);
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java
index 7bc96928621..66a8d37eebd 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java
@@ -42,18 +42,20 @@ public void topicIsNotVisible(String topicName){
     }
 
 
-    public enum SideMenuOptions {
-        BROKERS("Brokers"),
-        TOPICS("Topics"),
-        CONSUMERS("Consumers"),
-        SCHEMA_REGISTRY("Schema registry");
+  public enum SideMenuOptions {
+    BROKERS("Brokers"),
+    TOPICS("Topics"),
+    CONSUMERS("Consumers"),
+    SCHEMA_REGISTRY("Schema Registry");
 
-        String value;
+    String value;
 
-        SideMenuOptions(String value) {
-            this.value = value;
-        }
+    SideMenuOptions(String value) {
+      this.value = value;
     }
+  }
+
+
 
     @Step
     public MainPage goToSideMenu(String clusterName, SideMenuOptions option) {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java
index 0044201cc24..298bc22d8cf 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.pages.connector.ConnectorsList;
 import com.provectus.kafka.ui.pages.connector.ConnectorsView;
+import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
 import com.provectus.kafka.ui.pages.topic.TopicView;
 import com.provectus.kafka.ui.pages.topic.TopicsList;
 
@@ -12,11 +13,13 @@ public class Pages {
     public MainPage mainPage = new MainPage();
     public TopicsList topicsList = new TopicsList();
     public TopicView topicView = new TopicView();
+    public ProduceMessagePage produceMessagePage = new ProduceMessagePage();
     public ConnectorsList connectorsList = new ConnectorsList();
     public ConnectorsView connectorsView = new ConnectorsView();
+    public SchemaRegistryList schemaRegistry = new SchemaRegistryList();
 
     public MainPage open() {
-       return openMainPage();
+        return openMainPage();
     }
 
     public MainPage openMainPage() {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
new file mode 100644
index 00000000000..3d430bb76e5
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
@@ -0,0 +1,43 @@
+package com.provectus.kafka.ui.pages;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.topic.TopicView;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.Wait;
+
+public class ProduceMessagePage{
+
+    private final SelenideElement keyField = $(By.xpath("//div[@id = 'key']/textarea"));
+    private final SelenideElement contentField = $(By.xpath("//div[@id = 'content']/textarea"));
+    private final SelenideElement headersField = $(By.xpath("//div[@id = 'headers']/textarea"));
+    private final SelenideElement sendBtn = $(By.xpath("//button[@type = 'submit']"));
+
+    public ProduceMessagePage setKeyField(String value) {
+        Wait().until(ExpectedConditions.urlContains("message"));
+        keyField.sendKeys(Keys.chord(Keys.DELETE));
+        keyField.setValue(value);
+        return this;
+    }
+
+    public ProduceMessagePage setContentFiled(String value) {
+        Wait().until(ExpectedConditions.urlContains("message"));
+        contentField.sendKeys(Keys.DELETE);
+        contentField.setValue(value);
+        return this;
+    }
+
+    public ProduceMessagePage setHeaderFiled(String value) {
+        headersField.setValue(value);
+        return new ProduceMessagePage();
+    }
+
+    public TopicView submitProduceMessage() {
+        sendBtn.shouldBe(Condition.visible).click();
+        return new TopicView();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
index d793cdd03c0..4e7e7b52202 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
@@ -5,6 +5,7 @@
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
 
 import static com.codeborne.selenide.Selectors.byLinkText;
 import static com.codeborne.selenide.Selenide.*;
@@ -33,8 +34,9 @@ public ConnectorUpdateView updateConnectorConfig(String configJson) {
     }
 
     @Step("Set connector config JSON")
-    public ConnectorsView updConnectorConfig(String configJson) throws InterruptedException {
-        contentTextArea.doubleClick();
+    public ConnectorsView updConnectorConfig(String configJson) {
+        $("#config").click();
+        contentTextArea.sendKeys(Keys.LEFT_CONTROL+"a");
         contentTextArea.setValue("");
         contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
         $("#config").click();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
new file mode 100644
index 00000000000..641a08e12aa
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
@@ -0,0 +1,51 @@
+package com.provectus.kafka.ui.pages.schema;
+
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+
+public class SchemaCreateView {
+
+    private SelenideElement subjectName = $(By.xpath("//input[@name='subject']"));
+    private SelenideElement schemaField = $(By.xpath("//textarea[@name='schema']"));
+    private SelenideElement submitSchemaButton = $(By.xpath("//button[@type='submit']"));
+
+    public SchemaCreateView selectSchemaTypeFromDropdown(SchemaType schemaType) {
+        $("ul[role='listbox']").click();
+        $x("//li[text()='" + schemaType.getValue() + "']").click();
+        return this;
+    }
+
+    public SchemaView clickSubmit() {
+        BrowserUtils.javaExecutorClick(submitSchemaButton);
+        return new SchemaView();
+    }
+
+    public SchemaCreateView setSubjectName(String name) {
+        subjectName.setValue(name);
+        return this;
+    }
+
+    public SchemaCreateView setSchemaField(String text) {
+        schemaField.setValue(text);
+        return this;
+    }
+
+    public enum SchemaType {
+        AVRO("AVRO"),
+        JSON("JSON"),
+        PROTOBUF("PROTOBUF");
+
+        String value;
+
+        SchemaType(String value) {
+            this.value = value;
+        }
+        public String getValue(){
+            return value;
+        }
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
new file mode 100644
index 00000000000..87f52d5bbf8
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
@@ -0,0 +1,52 @@
+package com.provectus.kafka.ui.pages.schema;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.Selenide;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.api.model.CompatibilityLevel;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+import io.qameta.allure.Step;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+
+public class SchemaEditView {
+
+    SelenideElement newSchemaTextArea = $("#newSchema [wrap]");
+
+
+    public SchemaEditView selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType schemaType) {
+        $x("//ul[@name='schemaType']").click();
+        $x("//li[text()='" + schemaType.getValue() + "']").click();
+        return this;
+    }
+
+    public SchemaEditView selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum level) {
+        $x("//ul[@name='compatibilityLevel']").click();
+        $x("//li[text()='" + level.getValue() + "']").click();
+        return this;
+    }
+
+    public SchemaView clickSubmit() {
+        BrowserUtils.javaExecutorClick($(By.xpath("//button[@type='submit']")));
+        return new SchemaView();
+    }
+
+    @Step("Set new schema value")
+    public SchemaEditView setNewSchemaValue(String configJson) {
+        $("#newSchema").click();
+        newSchemaTextArea.sendKeys(Keys.CONTROL + "a", Keys.BACK_SPACE);
+        Selenide.executeJavaScript("arguments[0].value = '';", $("#newSchema"));
+        newSchemaTextArea.setValue(configJson);
+        return this;
+    }
+
+
+    public SchemaRegistryList removeSchema() {
+        $(By.xpath("//*[contains(text(),'Remove')]")).click();
+        $(By.xpath("//*[text()='Confirm']")).shouldBe(Condition.visible).click();
+        return new SchemaRegistryList();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
new file mode 100644
index 00000000000..b7fe3f75e34
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -0,0 +1,40 @@
+package com.provectus.kafka.ui.pages.schema;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+import io.qameta.allure.Step;
+import lombok.SneakyThrows;
+import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selenide.*;
+
+public class SchemaRegistryList {
+
+    private SelenideElement schemaButton = $(By.xpath("//*[contains(text(),'Create Schema')]"));
+
+    public SchemaCreateView clickCreateSchema() {
+        BrowserUtils.javaExecutorClick(schemaButton);
+        return new SchemaCreateView();
+    }
+
+    public SchemaView openSchema(String schemaName) {
+        $(By.xpath("//*[contains(text(),'" + schemaName + "')]")).click();
+        return new SchemaView();
+    }
+
+    @SneakyThrows
+    public SchemaRegistryList isNotVisible(String schemaName) {
+        $x(String.format("//*[contains(text(),'%s')]",schemaName)).shouldNotBe(Condition.visible);
+        return this;
+    }
+
+    @Step
+    public SchemaRegistryList isSchemaVisible(String schemaName) {
+        $$("tbody td>a")
+                .find(Condition.exactText(schemaName))
+                .shouldBe(Condition.visible);
+        return this;
+    }
+}
+
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
new file mode 100644
index 00000000000..cce7ecefc4c
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
@@ -0,0 +1,38 @@
+package com.provectus.kafka.ui.pages.schema;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.api.model.CompatibilityLevel;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+import io.qameta.allure.Step;
+import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+
+public class SchemaView {
+
+    @Step
+    public SchemaView isOnSchemaViewPage() {
+        $("div#schema").shouldBe(Condition.visible);
+        return this;
+    }
+
+    @Step
+    public SchemaView isCompatibility(CompatibilityLevel.CompatibilityEnum compatibility){
+        $x("//div//p[.='" + compatibility.getValue() + "']").shouldBe(Condition.visible);
+        return this;
+    }
+
+    @Step
+    public SchemaEditView openEditSchema(){
+        $x("//button[text()= 'Edit Schema']").click();
+        return new SchemaEditView();
+    }
+
+    public SchemaRegistryList removeSchema() {
+        BrowserUtils.javaExecutorClick($(".dropdown.is-right button"));
+        $(By.xpath("//*[contains(text(),'Remove')]")).click();
+        $(By.xpath("//*[text()='Submit']")).shouldBe(Condition.visible).click();
+        return new SchemaRegistryList();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
index 0e850e50722..e2d293632ee 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
@@ -14,7 +14,7 @@ public class TopicCreateEditSettingsView {
     private final SelenideElement timeToRetain = $(By.cssSelector("input#timeToRetain"));
     private final SelenideElement maxMessageBytes = $(By.name("maxMessageBytes"));
 
-    public TopicCreateEditSettingsView setTopicName(String topicName){
+    public TopicCreateEditSettingsView setTopicName(String topicName) {
         $("input#topicFormName").setValue(topicName);
         return this;
     }
@@ -68,11 +68,10 @@ public TopicCreateEditSettingsView selectCleanupPolicy(CleanupPolicyValue cleanu
 
     public TopicCreateEditSettingsView selectCleanupPolicy(String cleanupPolicyOptionValue) {
         $("ul#topicFormCleanupPolicy").click();
-        $x("//li[text()='" + cleanupPolicyOptionValue +"']").click();
+        $x("//li[text()='" + cleanupPolicyOptionValue + "']").click();
         return this;
     }
 
-
     public TopicCreateEditSettingsView selectRetentionBytes(String visibleValue) {
         return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
     }
@@ -158,7 +157,7 @@ private static class KafkaUISelectElement {
         private SelenideElement selectElement;
 
         public KafkaUISelectElement(String selectElementName) {
-            this.selectElement = $("ul[role=listbox][name="+selectElementName+"]");
+            this.selectElement = $("ul[role=listbox][name=" + selectElementName + "]");
         }
 
         public KafkaUISelectElement(SelenideElement selectElement) {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index 7911e0d240f..25d750387ee 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -5,9 +5,12 @@
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.base.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.pages.ProduceMessagePage;
+import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import lombok.SneakyThrows;
 import lombok.experimental.ExtensionMethod;
+import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selectors.byLinkText;
 import static com.codeborne.selenide.Selenide.*;
@@ -16,7 +19,7 @@
 public class TopicView {
 
     private static final String path = "/ui/clusters/%s/topics/%s";
-    private final SelenideElement dotMenuHeader = $(".fPWftu.sc-fHYyUA > .dropdown.is-right");
+    private final SelenideElement dotMenuHeader = $$(".dropdown.is-right button").first();
     private final SelenideElement dotMenuFooter = $$(".dropdown.is-right button").get(1);
 
     @Step
@@ -27,30 +30,47 @@ public TopicView goTo(String cluster, String topic) {
 
     @Step
     public TopicView isOnTopicViewPage() {
-       $("nav[role=navigation] a.is-active.is-primary").shouldBe(Condition.visible);
+        $(By.linkText("Overview")).shouldBe(Condition.visible);
         return this;
     }
 
     @SneakyThrows
     public TopicCreateEditSettingsView openEditSettings() {
-        dotMenuHeader.click();
-        $x("//a[text()= '" + DotMenuHeaderItems.EDIT_SETTINGS.getValue() +"']").click();
+        BrowserUtils.javaExecutorClick(dotMenuHeader);
+        $x("//a[text()= '" + DotMenuHeaderItems.EDIT_SETTINGS.getValue() + "']").click();
         return new TopicCreateEditSettingsView();
     }
 
+    @Step
+    public TopicView openTopicMenu(TopicMenu menu) {
+        $(By.linkText(menu.getValue())).shouldBe(Condition.visible).click();
+        return this;
+    }
 
     @SneakyThrows
     public TopicsList deleteTopic() {
-        dotMenuHeader.click();
+        BrowserUtils.javaExecutorClick(dotMenuHeader);
         $("#dropdown-menu").$(byLinkText(DotMenuHeaderItems.REMOVE_TOPIC.getValue())).click();
         $$("div[role=\"dialog\"] button").find(Condition.exactText("Submit")).click();
         return new TopicsList();
     }
 
+    @SneakyThrows
+    public ProduceMessagePage clickOnButton(String buttonName) {
+        BrowserUtils.javaExecutorClick($(By.xpath("//div//button[text()='%s']".formatted(buttonName))));
+        return new ProduceMessagePage();
+    }
+
+    public boolean isKeyMessageVisible(String keyMessage) {
+        return keyMessage.equals($("td[title]").getText());
+    }
+
+    public boolean isContentMessageVisible(String contentMessage) {
+        return contentMessage.equals($(".bPpPJI.sc-gkdBiK").getText());
+    }
+
     private enum DotMenuHeaderItems {
-        EDIT_SETTINGS("Edit settings"),
-        CLEAR_MESSAGES("Clear messages"),
-        REMOVE_TOPIC("Remove topic");
+        EDIT_SETTINGS("Edit settings"), CLEAR_MESSAGES("Clear messages"), REMOVE_TOPIC("Remove topic");
 
         private String value;
 
@@ -64,9 +84,26 @@ public String getValue() {
 
         @Override
         public String toString() {
-            return "DotMenuHeaderItems{" +
-                    "value='" + value + '\'' +
-                    '}';
+            return "DotMenuHeaderItems{" + "value='" + value + '\'' + '}';
+        }
+    }
+
+    public enum TopicMenu {
+        OVERVIEW("Overview"), MESSAGES("Messages"), CONSUMERS("Consumers"), SETTINGS("Settings");
+
+        private String value;
+
+        TopicMenu(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return "TopicMenu{" + "value='" + value + '\'' + '}';
         }
     }
 }
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 3731b53a120..da850acb39d 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -72,7 +72,6 @@ public void createConnector() {
                 .connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR);
     }
 
-    //disable test due 500 error during create connector via api
     @SneakyThrows
     @DisplayName("should update a connector")
     @Test
@@ -83,7 +82,8 @@ public void updateConnector() {
                 pages.connectorsView.connectorIsVisibleOnOverview();
         pages.connectorsView.openEditConfig()
                         .updConnectorConfig(FileUtils.getResourceAsString("config_for_update_connector.json"));
-        pages.openConnectorsList(LOCAL_CLUSTER).connectorIsVisibleInList(CONNECTOR_FOR_UPDATE, TOPIC_FOR_UPDATE_CONNECTOR);
+        pages.openConnectorsList(LOCAL_CLUSTER)
+                .connectorIsVisibleInList(CONNECTOR_FOR_UPDATE, TOPIC_FOR_UPDATE_CONNECTOR);
     }
 
     @SneakyThrows
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
new file mode 100644
index 00000000000..c69b83825d0
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -0,0 +1,161 @@
+package com.provectus.kafka.ui.tests;
+
+import com.provectus.kafka.ui.api.model.CompatibilityLevel;
+import com.provectus.kafka.ui.api.model.SchemaType;
+import com.provectus.kafka.ui.base.BaseTest;
+import com.provectus.kafka.ui.helpers.Helpers;
+import com.provectus.kafka.ui.pages.MainPage;
+import com.provectus.kafka.ui.pages.schema.SchemaCreateView;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.*;
+
+import static org.apache.kafka.common.utils.Utils.readFileAsString;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class SchemasTests extends BaseTest {
+
+    public static final String SECOND_LOCAL = "secondLocal";
+    public static final String SCHEMA_AVRO_CREATE = "avro_schema";
+    public static final String SCHEMA_JSON_CREATE = "json_schema";
+    public static final String SCHEMA_PROTOBUF_CREATE = "protobuf_schema";
+    public static final String SCHEMA_AVRO_API_UPDATE = "avro_schema_for_update_api";
+    public static final String SCHEMA_AVRO_API = "avro_schema_api";
+    public static final String SCHEMA_JSON_API = "json_schema_api";
+    public static final String SCHEMA_PROTOBUF_API = "protobuf_schema_api";
+    private static final String PATH_AVRO_VALUE = System.getProperty("user.dir") + "/src/test/resources/schema_avro_value.json";
+    private static final String PATH_AVRO_FOR_UPDATE = System.getProperty("user.dir") + "/src/test/resources/schema_avro_for_update.json";
+    private static final String PATH_PROTOBUF_VALUE = System.getProperty("user.dir") + "/src/test/resources/schema_protobuf_value.txt";
+    private static final String PATH_JSON_VALUE = System.getProperty("user.dir") + "/src/test/resources/schema_Json_Value.json";
+
+    @BeforeAll
+    @SneakyThrows
+    public static void beforeAll() {
+        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_AVRO_API_UPDATE, SchemaType.AVRO, readFileAsString(PATH_AVRO_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_AVRO_API, SchemaType.AVRO, readFileAsString(PATH_AVRO_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_JSON_API, SchemaType.JSON, readFileAsString(PATH_JSON_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_PROTOBUF_API, SchemaType.PROTOBUF, readFileAsString(PATH_PROTOBUF_VALUE));
+    }
+
+    @AfterAll
+    @SneakyThrows
+    public static void afterAll() {
+        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_AVRO_CREATE);
+        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_JSON_CREATE);
+        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_PROTOBUF_CREATE);
+        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_AVRO_API_UPDATE);
+        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_AVRO_API);
+        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_JSON_API);
+        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_PROTOBUF_API);
+
+    }
+
+    @SneakyThrows
+    @DisplayName("should create AVRO schema")
+    @Test
+    @Order(1)
+    void createSchemaAvro() {
+        pages.openMainPage()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.clickCreateSchema()
+                .setSubjectName(SCHEMA_AVRO_CREATE)
+                .setSchemaField(readFileAsString(PATH_AVRO_VALUE))
+                .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.AVRO)
+                .clickSubmit()
+                .isOnSchemaViewPage();
+        pages.mainPage
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.isSchemaVisible(SCHEMA_AVRO_CREATE);
+    }
+
+    @SneakyThrows
+    @DisplayName("should update AVRO schema")
+    @Test
+    @Order(2)
+    void updateSchemaAvro() {
+        pages.openMainPage()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.openSchema(SCHEMA_AVRO_API_UPDATE)
+                .isOnSchemaViewPage()
+                .openEditSchema()
+                .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
+                .setNewSchemaValue(readFileAsString(PATH_AVRO_FOR_UPDATE))
+                .clickSubmit()
+                .isOnSchemaViewPage()
+                .isCompatibility(CompatibilityLevel.CompatibilityEnum.NONE);
+    }
+
+    @SneakyThrows
+    @DisplayName("should delete AVRO schema")
+    @Test
+    @Order(3)
+    void deleteSchemaAvro() {
+        pages.openMainPage()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.openSchema(SCHEMA_AVRO_API)
+                .isOnSchemaViewPage()
+                .removeSchema()
+                .isNotVisible(SCHEMA_AVRO_API);
+    }
+
+    @SneakyThrows
+    @DisplayName("should create JSON schema")
+    @Test
+    @Order(4)
+    void createSchemaJson() {
+        pages.openMainPage()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.clickCreateSchema()
+                .setSubjectName(SCHEMA_JSON_CREATE)
+                .setSchemaField(readFileAsString(PATH_JSON_VALUE))
+                .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.JSON)
+                .clickSubmit()
+                .isOnSchemaViewPage();
+        pages.mainPage
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.isSchemaVisible(SCHEMA_JSON_CREATE);
+    }
+
+    @SneakyThrows
+    @DisplayName("should delete JSON schema")
+    @Test
+    @Order(5)
+    void deleteSchemaJson() {
+        pages.openMainPage()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.openSchema(SCHEMA_JSON_API)
+                .isOnSchemaViewPage()
+                .removeSchema()
+                .isNotVisible(SCHEMA_JSON_API);
+    }
+
+    @SneakyThrows
+    @DisplayName("should create PROTOBUF schema")
+    @Test
+    @Order(6)
+    void createSchemaProtobuf() {
+        pages.openMainPage()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.clickCreateSchema()
+                .setSubjectName(SCHEMA_PROTOBUF_CREATE)
+                .setSchemaField(readFileAsString(PATH_PROTOBUF_VALUE))
+                .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.PROTOBUF)
+                .clickSubmit()
+                .isOnSchemaViewPage();
+        pages.mainPage
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.isSchemaVisible(SCHEMA_PROTOBUF_CREATE);
+    }
+
+    @SneakyThrows
+    @DisplayName("should delete PROTOBUF schema")
+    @Test
+    @Order(7)
+    void deleteSchemaProtobuf() {
+        pages.openMainPage()
+                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        pages.schemaRegistry.openSchema(SCHEMA_PROTOBUF_API)
+                .isOnSchemaViewPage()
+                .removeSchema()
+                .isNotVisible(SCHEMA_PROTOBUF_API);
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 00d1c4fb34e..fc2c8ccfaa3 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -3,10 +3,14 @@
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.pages.MainPage;
+import com.provectus.kafka.ui.pages.topic.TopicView;
 import io.qameta.allure.Issue;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
 
+import static org.apache.kafka.common.utils.Utils.readFileAsString;
+
+
 public class TopicTests extends BaseTest {
 
     public static final String NEW_TOPIC = "new-topic";
@@ -17,6 +21,11 @@ public class TopicTests extends BaseTest {
     public static final String UPDATED_TIME_TO_RETAIN_VALUE = "604800001";
     public static final String UPDATED_MAX_SIZE_ON_DISK = "20 GB";
     public static final String UPDATED_MAX_MESSAGE_BYTES = "1000020";
+    private static final String KEY_TO_PRODUCE_MESSAGE = System.getProperty("user.dir") + "/src/test/resources/producedkey.txt";
+    private static final String CONTENT_TO_PRODUCE_MESSAGE = System.getProperty("user.dir") + "/src/test/resources/testData.txt";
+
+
+
 
     @BeforeAll
     @SneakyThrows
@@ -61,6 +70,7 @@ public void updateTopic() {
         pages.openTopicsList(SECOND_LOCAL)
                 .isOnPage();
         pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
+                .isOnTopicViewPage()
                 .openEditSettings()
                 .selectCleanupPolicy(COMPACT_POLICY_VALUE)
                 .setMinInsyncReplicas(10)
@@ -93,4 +103,23 @@ public void deleteTopic() {
                 .isOnPage()
                 .isTopicNotVisible(TOPIC_TO_DELETE);
     }
+
+    @Disabled("Due to issue https://github.com/provectus/kafka-ui/issues/2140 ignore this test")
+    @Issue("2140")
+    @SneakyThrows
+    @DisplayName("produce message")
+    @Test
+    void produceMessage(){
+        pages.openTopicsList(SECOND_LOCAL)
+                .isOnPage()
+                .openTopic(TOPIC_TO_UPDATE)
+                .isOnTopicViewPage()
+                .openTopicMenu(TopicView.TopicMenu.MESSAGES)
+                .clickOnButton("Produce Message")
+                .setContentFiled(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE))
+                .setKeyField(readFileAsString(KEY_TO_PRODUCE_MESSAGE))
+                .submitProduceMessage();
+                Assertions.assertTrue(pages.topicView.isKeyMessageVisible(readFileAsString(KEY_TO_PRODUCE_MESSAGE)));
+                Assertions.assertTrue(pages.topicView.isContentMessageVisible(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE)));
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/resources/producedkey.txt b/kafka-ui-e2e-checks/src/test/resources/producedkey.txt
new file mode 100644
index 00000000000..f1ccb75d55d
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/producedkey.txt
@@ -0,0 +1 @@
+"key"
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/resources/schema_Json_Value.json b/kafka-ui-e2e-checks/src/test/resources/schema_Json_Value.json
new file mode 100644
index 00000000000..5c5b7aba84b
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/schema_Json_Value.json
@@ -0,0 +1,7 @@
+{
+  "connector.class": "io.confluent.connect.jdbc.JdbcSinkConnector",
+  "connection.url": "jdbc:postgresql://postgres-db:5432/test",
+  "connection.user": "dev_user",
+  "connection.password": "12345",
+  "topics": "topic_for_connector"
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/resources/schema_avro_for_update.json b/kafka-ui-e2e-checks/src/test/resources/schema_avro_for_update.json
new file mode 100644
index 00000000000..2979d69a9bf
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/schema_avro_for_update.json
@@ -0,0 +1,24 @@
+{
+  "type": "record",
+  "name": "Message",
+  "namespace": "com.provectus.kafka",
+  "fields": [
+    {
+      "name": "text",
+      "type": [
+        "null",
+        "string"
+      ],
+      "default": null
+    },
+    {
+      "name": "value",
+      "type": [
+        "null",
+        "string",
+        "long"
+      ],
+      "default": null
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/resources/schema_avro_value.json b/kafka-ui-e2e-checks/src/test/resources/schema_avro_value.json
new file mode 100644
index 00000000000..1bc30f6d1cf
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/schema_avro_value.json
@@ -0,0 +1,15 @@
+{
+  "type": "record",
+  "name": "Student",
+  "namespace": "DataFlair",
+  "fields": [
+    {
+      "name": "Name",
+      "type": "string"
+    },
+    {
+      "name": "Age",
+      "type": "int"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/resources/schema_protobuf_value.txt b/kafka-ui-e2e-checks/src/test/resources/schema_protobuf_value.txt
new file mode 100644
index 00000000000..ec0000121c2
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/schema_protobuf_value.txt
@@ -0,0 +1,5 @@
+enum SchemaType {
+  AVRO = 0;
+  JSON = 1;
+  PROTOBUF = 2;
+  }
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/resources/testData.txt b/kafka-ui-e2e-checks/src/test/resources/testData.txt
new file mode 100644
index 00000000000..9b9d3b66546
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/testData.txt
@@ -0,0 +1 @@
+"print"

From d859dd6b3f4bcdcc9143a2e02695eca95be0fd9f Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:56:47 +0400
Subject: [PATCH 028/734] fix adding message for topics (#2161)

---
 .../src/components/Topics/Topic/SendMessage/SendMessage.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index c8898c7ad27..11fa6c08e3e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -142,7 +142,7 @@ const SendMessage: React.FC = () => {
             key: !key ? null : key,
             content: !content ? null : content,
             headers,
-            partition,
+            partition: !partition ? 0 : partition,
           },
         });
         dispatch(fetchTopicDetails({ clusterName, topicName }));

From 1b71ccb9755041e18ff540d5c57318243b38876d Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Wed, 15 Jun 2022 16:59:02 +0300
Subject: [PATCH 029/734] Migrate React app to Vite (#2153)

* Ejected CRA

* Cleanup

* jest

* Cleanup

* refactor cluster widgets

* configure build

* configure build

* configure coverage

* Experiment with lazy

* add ace to vendor

* Cleanup
---
 kafka-ui-api/pom.xml                          |     4 +-
 kafka-ui-contract/pom.xml                     |     2 +-
 kafka-ui-react-app/.babelrc                   |     7 +
 kafka-ui-react-app/README.md                  |     3 +-
 .../config/jest/cssTransform.js               |    14 +
 kafka-ui-react-app/{public => }/index.html    |     9 +-
 kafka-ui-react-app/jest.config.ts             |    32 +
 kafka-ui-react-app/package-lock.json          | 63533 +++++-----------
 kafka-ui-react-app/package.json               |    46 +-
 kafka-ui-react-app/sonar-project.properties   |     2 +-
 .../src/components/Cluster/Cluster.tsx        |    17 +-
 .../Cluster/__tests__/Cluster.spec.tsx        |    24 +-
 .../ClustersWidget/ClustersWidget.tsx         |    22 +-
 ...m.styled.tsx => TopicForm.styled.spec.tsx} |     0
 kafka-ui-react-app/src/index.tsx              |     6 -
 kafka-ui-react-app/src/lib/constants.ts       |     4 +-
 kafka-ui-react-app/src/react-app-env.d.ts     |     4 +-
 kafka-ui-react-app/src/serviceWorker.ts       |   145 -
 kafka-ui-react-app/src/setupProxy.js          |    15 -
 kafka-ui-react-app/src/setupTests.ts          |     1 +
 kafka-ui-react-app/tsconfig.json              |     7 +-
 kafka-ui-react-app/vite.config.ts             |    55 +
 22 files changed, 19534 insertions(+), 44418 deletions(-)
 create mode 100644 kafka-ui-react-app/.babelrc
 create mode 100644 kafka-ui-react-app/config/jest/cssTransform.js
 rename kafka-ui-react-app/{public => }/index.html (54%)
 create mode 100644 kafka-ui-react-app/jest.config.ts
 rename kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/{TopicForm.styled.tsx => TopicForm.styled.spec.tsx} (100%)
 delete mode 100644 kafka-ui-react-app/src/serviceWorker.ts
 delete mode 100644 kafka-ui-react-app/src/setupProxy.js
 create mode 100644 kafka-ui-react-app/vite.config.ts

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index c3d30e9ab61..a034f0d8500 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -401,8 +401,8 @@
                         <configuration>
                             <workingDirectory>../kafka-ui-react-app</workingDirectory>
                             <environmentVariables>
-                                <REACT_APP_TAG>${project.version}</REACT_APP_TAG>
-                                <REACT_APP_COMMIT>${git.commit.id.abbrev}</REACT_APP_COMMIT>
+                                <VITE_TAG>${project.version}</VITE_TAG>
+                                <VITE_COMMIT>${git.commit.id.abbrev}</VITE_COMMIT>
                             </environmentVariables>
                         </configuration>
                         <executions>
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index 581999c2953..7750803affb 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -138,7 +138,7 @@
                         <configuration>
                             <workingDirectory>../kafka-ui-react-app</workingDirectory>
                             <environmentVariables>
-                                <REACT_APP_TAG>${project.version}</REACT_APP_TAG>
+                                <VITE_TAG>${project.version}</VITE_TAG>
                             </environmentVariables>
                         </configuration>
                         <executions>
diff --git a/kafka-ui-react-app/.babelrc b/kafka-ui-react-app/.babelrc
new file mode 100644
index 00000000000..202d425a099
--- /dev/null
+++ b/kafka-ui-react-app/.babelrc
@@ -0,0 +1,7 @@
+{
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react",
+    "@babel/preset-typescript"
+  ]
+}
diff --git a/kafka-ui-react-app/README.md b/kafka-ui-react-app/README.md
index dfd8e75dfe3..8ca57b92d91 100644
--- a/kafka-ui-react-app/README.md
+++ b/kafka-ui-react-app/README.md
@@ -41,8 +41,7 @@ npm run gen:sources
 
 Create or update existing `.env.local` file with
 ```
-HTTPS=true # if needed
-DEV_PROXY= https://api.server # your API server
+VITE_DEV_PROXY= https://api.server # your API server
 ```
 
 Run the application
diff --git a/kafka-ui-react-app/config/jest/cssTransform.js b/kafka-ui-react-app/config/jest/cssTransform.js
new file mode 100644
index 00000000000..8f65114812a
--- /dev/null
+++ b/kafka-ui-react-app/config/jest/cssTransform.js
@@ -0,0 +1,14 @@
+'use strict';
+
+// This is a custom Jest transformer turning style imports into empty objects.
+// http://facebook.github.io/jest/docs/en/webpack.html
+
+module.exports = {
+  process() {
+    return 'module.exports = {};';
+  },
+  getCacheKey() {
+    // The output is always the same.
+    return 'cssTransform';
+  },
+};
diff --git a/kafka-ui-react-app/public/index.html b/kafka-ui-react-app/index.html
similarity index 54%
rename from kafka-ui-react-app/public/index.html
rename to kafka-ui-react-app/index.html
index a49f8a1b7ce..4fe0d8df0a5 100644
--- a/kafka-ui-react-app/public/index.html
+++ b/kafka-ui-react-app/index.html
@@ -2,10 +2,10 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" sizes="any"><!-- 32×32 -->
-    <link rel="icon" href="%PUBLIC_URL%/favicon/icon.svg" type="image/svg+xml">
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon/apple-touch-icon.png"><!-- 180×180 -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="icon" href="/favicon.ico" sizes="any"><!-- 32×32 -->
+    <link rel="icon" href="/favicon/icon.svg" type="image/svg+xml">
+    <link rel="apple-touch-icon" href="/favicon/apple-touch-icon.png"><!-- 180×180 -->
+    <link rel="manifest" href="/manifest.json" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>UI for Apache Kafka</title>
@@ -16,5 +16,6 @@
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
+    <script type="module" src="/src/index.tsx"></script>
   </body>
 </html>
diff --git a/kafka-ui-react-app/jest.config.ts b/kafka-ui-react-app/jest.config.ts
new file mode 100644
index 00000000000..ef667cdf864
--- /dev/null
+++ b/kafka-ui-react-app/jest.config.ts
@@ -0,0 +1,32 @@
+import type { Config } from '@jest/types';
+
+export default {
+  roots: ['<rootDir>/src'],
+  collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}', '!src/**/*.d.ts'],
+  coveragePathIgnorePatterns: [
+    '/node_modules/',
+    '<rootDir>/src/generated-sources/',
+    '<rootDir>/vite.config.ts',
+    '<rootDir>/src/index.tsx',
+    '<rootDir>/src/serviceWorker.ts',
+  ],
+  setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
+  testMatch: [
+    '<rootDir>/src/**/__{test,tests}__/**/*.{spec,test}.{js,jsx,ts,tsx}',
+  ],
+  testEnvironment: 'jsdom',
+  transform: {
+    '\\.[jt]sx?$': 'babel-jest',
+    '^.+\\.css$': '<rootDir>/config/jest/cssTransform.js',
+  },
+  transformIgnorePatterns: [
+    '[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|cjs|ts|tsx)$',
+    '^.+\\.module\\.(css|sass|scss)$',
+  ],
+  modulePaths: ['<rootDir>/src'],
+  watchPlugins: [
+    'jest-watch-typeahead/filename',
+    'jest-watch-typeahead/testname',
+  ],
+  resetMocks: true,
+} as Config.InitialOptions;
diff --git a/kafka-ui-react-app/package-lock.json b/kafka-ui-react-app/package-lock.json
index 07edf778df5..dbb41a66744 100644
--- a/kafka-ui-react-app/package-lock.json
+++ b/kafka-ui-react-app/package-lock.json
@@ -8,6 +8,7 @@
       "name": "kafka-ui",
       "version": "0.4.0",
       "dependencies": {
+        "@babel/core": "^7.16.0",
         "@fortawesome/fontawesome-free": "^6.1.1",
         "@hookform/error-message": "^2.0.0",
         "@hookform/resolvers": "^2.7.1",
@@ -15,14 +16,16 @@
         "@rooks/use-outside-click-ref": "^4.10.1",
         "@testing-library/react": "^13.2.0",
         "@types/yup": "^0.29.13",
+        "@vitejs/plugin-react": "^1.3.2",
         "ace-builds": "^1.4.12",
         "ajv": "^8.6.3",
+        "babel-jest": "^27.4.2",
         "bulma": "^0.9.3",
         "classnames": "^2.2.6",
         "dayjs": "^1.11.2",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-import-resolver-typescript": "^2.7.1",
         "fetch-mock": "^9.11.0",
+        "jest": "^27.4.3",
+        "jest-watch-typeahead": "^1.0.0",
         "json-schema-faker": "^0.5.0-rcv.39",
         "lodash": "^4.17.21",
         "node-fetch": "^2.6.1",
@@ -38,13 +41,19 @@
         "react-router-dom": "^6.3.0",
         "redux": "^4.1.1",
         "redux-thunk": "^2.3.0",
-        "sass": "^1.43.4",
+        "sass": "^1.52.3",
         "styled-components": "^5.3.1",
         "use-debounce": "^8.0.1",
         "uuid": "^8.3.1",
+        "vite": "^2.9.11",
+        "vite-tsconfig-paths": "^3.5.0",
+        "whatwg-fetch": "^3.6.2",
         "yup": "^0.32.9"
       },
       "devDependencies": {
+        "@babel/preset-env": "^7.18.2",
+        "@babel/preset-react": "^7.17.12",
+        "@babel/preset-typescript": "^7.17.12",
         "@jest/types": "^28.1.0",
         "@openapitools/openapi-generator-cli": "^2.5.1",
         "@testing-library/dom": "^8.11.1",
@@ -65,10 +74,13 @@
         "@typescript-eslint/eslint-plugin": "^5.10.0",
         "@typescript-eslint/parser": "^5.27.0",
         "dotenv": "^16.0.1",
-        "eslint": "^8.15.0",
+        "eslint": "^8.3.0",
         "eslint-config-airbnb": "^19.0.4",
         "eslint-config-airbnb-typescript": "^17.0.0",
         "eslint-config-prettier": "^8.5.0",
+        "eslint-config-react-app": "^7.0.1",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-import-resolver-typescript": "^2.7.1",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-jest-dom": "^4.0.2",
         "eslint-plugin-jsx-a11y": "^6.5.1",
@@ -76,13 +88,11 @@
         "eslint-plugin-react": "^7.29.4",
         "eslint-plugin-react-hooks": "^4.5.0",
         "fetch-mock-jest": "^1.5.1",
-        "http-proxy-middleware": "^2.0.6",
         "husky": "^7.0.1",
         "jest-sonar-reporter": "^2.0.0",
         "jest-styled-components": "^7.0.8",
         "lint-staged": "^12.1.2",
         "prettier": "^2.3.1",
-        "react-scripts": "5.0.1",
         "redux-mock-store": "^1.5.4",
         "rimraf": "^3.0.2",
         "ts-jest": "^28.0.3",
@@ -98,7 +108,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
       "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.1.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -107,62 +116,45 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@apideck/better-ajv-errors": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.3.tgz",
-      "integrity": "sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg==",
-      "dev": true,
-      "dependencies": {
-        "json-schema": "^0.4.0",
-        "jsonpointer": "^5.0.0",
-        "leven": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "ajv": ">=8"
-      }
-    },
     "node_modules/@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
       "dependencies": {
-        "@babel/highlight": "^7.14.5"
+        "@babel/highlight": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz",
-      "integrity": "sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w==",
+      "version": "7.17.10",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
+      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz",
-      "integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==",
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.5",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helpers": "^7.14.6",
-        "@babel/parser": "^7.14.6",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz",
+      "integrity": "sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==",
+      "dependencies": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.18.2",
+        "@babel/helper-compilation-targets": "^7.18.2",
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helpers": "^7.18.2",
+        "@babel/parser": "^7.18.0",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.18.2",
+        "@babel/types": "^7.18.2",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -189,12 +181,9 @@
       }
     },
     "node_modules/@babel/core/node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -215,14 +204,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/core/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/@babel/eslint-parser": {
       "version": "7.17.0",
       "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
@@ -251,32 +232,37 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz",
-      "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
+      "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
       "dependencies": {
-        "@babel/types": "^7.14.5",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "@babel/types": "^7.18.2",
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "jsesc": "^2.5.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/generator/node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
+      "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
-      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -295,36 +281,14 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
-      "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz",
+      "integrity": "sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==",
       "dependencies": {
-        "@babel/compat-data": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.20.2",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -343,9 +307,9 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz",
-      "integrity": "sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz",
+      "integrity": "sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.16.7",
@@ -363,36 +327,85 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz",
+      "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0-0"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
       },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz",
+      "integrity": "sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
+    "node_modules/@babel/helper-explode-assignable-expression": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.16.7"
@@ -401,11 +414,10 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-function-name": {
+    "node_modules/@babel/helper-function-name": {
       "version": "7.17.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
       "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
       "dependencies": {
         "@babel/template": "^7.16.7",
         "@babel/types": "^7.17.0"
@@ -414,11 +426,10 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-hoist-variables": {
+    "node_modules/@babel/helper-hoist-variables": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
       "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.16.7"
       },
@@ -426,7 +437,7 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-member-expression-to-functions": {
+    "node_modules/@babel/helper-member-expression-to-functions": {
       "version": "7.17.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
       "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
@@ -438,7 +449,36 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-optimise-call-expression": {
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+      "dependencies": {
+        "@babel/types": "^7.16.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz",
+      "integrity": "sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.17.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.18.0",
+        "@babel/types": "^7.18.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
       "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
@@ -450,27 +490,71 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-replace-supers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
+      "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz",
+      "integrity": "sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.2",
+        "@babel/helper-member-expression-to-functions": "^7.17.7",
         "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/traverse": "^7.18.2",
+        "@babel/types": "^7.18.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz",
+      "integrity": "sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==",
+      "dependencies": {
+        "@babel/types": "^7.18.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-split-export-declaration": {
+    "node_modules/@babel/helper-split-export-declaration": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
       "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.16.7"
       },
@@ -478,82 +562,67 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-validator-identifier": {
+    "node_modules/@babel/helper-validator-identifier": {
       "version": "7.16.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
       "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-      "dev": true,
+    "node_modules/@babel/helpers": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz",
+      "integrity": "sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.18.2",
+        "@babel/types": "^7.18.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
+    "node_modules/@babel/highlight": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/ansi-styles": {
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -561,11 +630,10 @@
         "node": ">=4"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/chalk": {
+    "node_modules/@babel/highlight/node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -575,52 +643,18 @@
         "node": ">=4"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/has-flag": {
+    "node_modules/@babel/highlight/node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/supports-color": {
+    "node_modules/@babel/highlight/node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -628,14 +662,24 @@
         "node": ">=4"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
-      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
+    "node_modules/@babel/parser": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz",
+      "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==",
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
+      "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^5.0.1"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -644,581 +688,638 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz",
+      "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==",
       "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz",
+      "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+    "node_modules/@babel/plugin-proposal-class-static-block": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz",
+      "integrity": "sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
+        "@babel/helper-create-class-features-plugin": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
+        "@babel/core": "^7.12.0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/@babel/plugin-proposal-decorators": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz",
+      "integrity": "sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "@babel/helper-create-class-features-plugin": "^7.17.9",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/plugin-syntax-decorators": "^7.17.0",
+        "charcodes": "^0.2.0"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=6.9.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
+    "node_modules/@babel/plugin-proposal-dynamic-import": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+    "node_modules/@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz",
+      "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==",
       "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@babel/plugin-proposal-json-strings": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz",
+      "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz",
+      "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz",
+      "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==",
       "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz",
+      "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==",
+      "dev": true,
       "dependencies": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-compilation-targets": "^7.17.10",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
+    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+      "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==",
+      "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz",
-      "integrity": "sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ==",
+    "node_modules/@babel/plugin-proposal-private-methods": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz",
+      "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==",
+      "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz",
+      "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==",
+      "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz",
-      "integrity": "sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
+    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz",
+      "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==",
+      "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
-      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
+    "node_modules/@babel/plugin-syntax-decorators": {
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz",
+      "integrity": "sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==",
+      "dev": true,
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz",
-      "integrity": "sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==",
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
-      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/helper-validator-identifier": {
+    "node_modules/@babel/plugin-syntax-flow": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.7.tgz",
+      "integrity": "sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==",
       "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz",
+      "integrity": "sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dependencies": {
-        "@babel/types": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
-      "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==",
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+    "node_modules/@babel/plugin-syntax-jsx": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz",
+      "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dependencies": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
+        "@babel/helper-plugin-utils": "^7.10.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.8.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
+    "node_modules/@babel/plugin-syntax-typescript": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz",
+      "integrity": "sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz",
+      "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz",
+      "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz",
+      "integrity": "sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz",
+      "integrity": "sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.18.2",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-replace-supers": "^7.18.2",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "globals": "^11.1.0"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=6.9.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/globals": {
+    "node_modules/@babel/plugin-transform-classes/node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
@@ -1227,154 +1328,106 @@
         "node": ">=4"
       }
     },
-    "node_modules/@babel/helper-wrap-function/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-wrap-function/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz",
+      "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz",
-      "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==",
-      "dependencies": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz",
+      "integrity": "sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==",
+      "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+      "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz",
+      "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==",
+      "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz",
-      "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
+        "node": ">=6.9.0"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
-      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
       "dev": true,
       "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
         "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+    "node_modules/@babel/plugin-transform-flow-strip-types": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.7.tgz",
+      "integrity": "sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
+        "@babel/plugin-syntax-flow": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.13.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
-      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.18.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz",
+      "integrity": "sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1383,13 +1436,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-properties": {
+    "node_modules/@babel/plugin-transform-function-name": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
-      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
         "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
@@ -1399,35 +1453,28 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
-      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz",
+      "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.17.6",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.12.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz",
-      "integrity": "sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==",
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.17.9",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/plugin-syntax-decorators": "^7.17.0",
-        "charcodes": "^0.2.0"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1436,267 +1483,160 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz",
+      "integrity": "sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz",
+      "integrity": "sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-simple-access": "^7.18.2",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
         "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz",
+      "integrity": "sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "engines": {
         "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz",
+      "integrity": "sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-replace-supers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz",
+      "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz",
+      "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/template": {
+    "node_modules/@babel/plugin-transform-object-super": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz",
+      "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-proposal-decorators/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
+        "node": ">=6.9.0"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
+    "node_modules/@babel/plugin-transform-react-display-name": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
+      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1705,14 +1645,16 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
-      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
-      "dev": true,
+    "node_modules/@babel/plugin-transform-react-jsx": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz",
+      "integrity": "sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-jsx": "^7.17.12",
+        "@babel/types": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1721,14 +1663,12 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-json-strings": {
+    "node_modules/@babel/plugin-transform-react-jsx-development": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
-      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
+      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
+        "@babel/plugin-transform-react-jsx": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1737,14 +1677,12 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
-      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
-      "dev": true,
+    "node_modules/@babel/plugin-transform-react-jsx-self": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.17.12.tgz",
+      "integrity": "sha512-7S9G2B44EnYOx74mue02t1uD8ckWZ/ee6Uz/qfdzc35uWHX5NgRy9i+iJSb2LFRgMd+QV9zNcStQaazzzZ3n3Q==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1753,14 +1691,12 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+    "node_modules/@babel/plugin-transform-react-jsx-source": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
-      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.16.7.tgz",
+      "integrity": "sha512-rONFiQz9vgbsnaMtQlZCjIRwhJvlrPET8TabIUK2hzlXw9B9s2Ieaxte1SCOOXMbWRHodbKixNf3BLcWVOQ8Bw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1769,14 +1705,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
+    "node_modules/@babel/plugin-transform-react-pure-annotations": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz",
+      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1785,17 +1721,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz",
-      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz",
+      "integrity": "sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.17.0",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "regenerator-transform": "^0.15.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1804,84 +1737,42 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/@babel/compat-data": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz",
+      "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==",
       "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.17.12"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/@babel/helper-compilation-targets": {
+    "node_modules/@babel/plugin-transform-runtime": {
       "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-      "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz",
+      "integrity": "sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.20.2",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
         "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread/node_modules/semver": {
+    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
@@ -1890,14 +1781,13 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1906,15 +1796,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz",
+      "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1923,13 +1812,12 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
-      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.10",
         "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
@@ -1939,16 +1827,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
-      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz",
+      "integrity": "sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1957,99 +1842,195 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz",
+      "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-property-in-object/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+    "node_modules/@babel/plugin-transform-typescript": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz",
+      "integrity": "sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==",
       "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-typescript": "^7.17.12"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-private-property-in-object/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+    "node_modules/@babel/plugin-transform-unicode-regex": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
-      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.16.7",
         "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+    "node_modules/@babel/preset-env": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz",
+      "integrity": "sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-compilation-targets": "^7.18.2",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12",
+        "@babel/plugin-proposal-async-generator-functions": "^7.17.12",
+        "@babel/plugin-proposal-class-properties": "^7.17.12",
+        "@babel/plugin-proposal-class-static-block": "^7.18.0",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
+        "@babel/plugin-proposal-json-strings": "^7.17.12",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.18.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.17.12",
+        "@babel/plugin-proposal-private-methods": "^7.17.12",
+        "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.17.12",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.17.12",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.17.12",
+        "@babel/plugin-transform-async-to-generator": "^7.17.12",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.17.12",
+        "@babel/plugin-transform-classes": "^7.17.12",
+        "@babel/plugin-transform-computed-properties": "^7.17.12",
+        "@babel/plugin-transform-destructuring": "^7.18.0",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.17.12",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.18.1",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.17.12",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.18.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.18.2",
+        "@babel/plugin-transform-modules-systemjs": "^7.18.0",
+        "@babel/plugin-transform-modules-umd": "^7.18.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12",
+        "@babel/plugin-transform-new-target": "^7.17.12",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.17.12",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.18.0",
+        "@babel/plugin-transform-reserved-words": "^7.17.12",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.17.12",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.18.2",
+        "@babel/plugin-transform-typeof-symbol": "^7.17.12",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.18.2",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.22.1",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+    "node_modules/@babel/preset-react": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.17.12.tgz",
+      "integrity": "sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-react-display-name": "^7.16.7",
+        "@babel/plugin-transform-react-jsx": "^7.17.12",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2058,13 +2039,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz",
-      "integrity": "sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==",
+    "node_modules/@babel/preset-typescript": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz",
+      "integrity": "sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-typescript": "^7.17.12"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2073,1989 +2056,2042 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
+    "node_modules/@babel/runtime": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
+      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "regenerator-runtime": "^0.13.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.6.tgz",
+      "integrity": "sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
+        "core-js-pure": "^3.14.0",
+        "regenerator-runtime": "^0.13.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-flow": {
+    "node_modules/@babel/template": {
       "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.7.tgz",
-      "integrity": "sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
+    "node_modules/@babel/traverse": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz",
+      "integrity": "sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.18.2",
+        "@babel/helper-environment-visitor": "^7.18.2",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.18.0",
+        "@babel/types": "^7.18.2",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz",
-      "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==",
-      "dev": true,
+    "node_modules/@babel/traverse/node_modules/debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+    "node_modules/@babel/traverse/node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
+    "node_modules/@babel/traverse/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
+    "node_modules/@babel/types": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz",
+      "integrity": "sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "to-fast-properties": "^2.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
     },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "devOptional": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
+        "@jridgewell/trace-mapping": "0.3.9"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "devOptional": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
+    "node_modules/@cush/relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@cush/relative/-/relative-1.0.0.tgz",
+      "integrity": "sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA=="
+    },
+    "node_modules/@emotion/is-prop-valid": {
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@emotion/memoize": "0.7.4"
       }
     },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+    "node_modules/@emotion/memoize": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
+    },
+    "node_modules/@emotion/stylis": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
+      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
+    },
+    "node_modules/@emotion/unitless": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.2",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz",
-      "integrity": "sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ==",
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
-      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "argparse": "^2.0.1"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@babel/plugin-transform-async-to-generator/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-async-to-generator/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
+    "node_modules/@eslint/eslintrc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
-    "node_modules/@babel/plugin-transform-async-to-generator/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
+    "node_modules/@fortawesome/fontawesome-free": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz",
+      "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg==",
+      "hasInstallScript": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
+    "node_modules/@hookform/error-message": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@hookform/error-message/-/error-message-2.0.0.tgz",
+      "integrity": "sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==",
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0",
+        "react-hook-form": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
-      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
+    "node_modules/@hookform/resolvers": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.8.9.tgz",
+      "integrity": "sha512-IXwGpjewxScF4N2kuyYDip6ABqH4lCg9n1f1mp0vbmKik+u+nestpbtdEs6U1WQZxwaoK/2APv1+MEr4czX7XA==",
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "react-hook-form": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
-      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "globals": "^11.1.0"
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=10.10.0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+    "node_modules/@humanwhocodes/config-array/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-      "dev": true,
+    "node_modules/@humanwhocodes/config-array/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-      "dev": true,
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dependencies": {
-        "@babel/types": "^7.17.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-      "dev": true,
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-replace-supers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
+    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
+    "node_modules/@jest/console": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.0.tgz",
+      "integrity": "sha512-tscn3dlJFGay47kb4qVruQg/XWlmvU0xp3EJOjzzY+sBaI+YgwKcvAmTcyYU7xEiLLIY5HCdWRooAL8dqkFlDA==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@jest/types": "^28.1.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^28.1.0",
+        "jest-util": "^28.1.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-      "dev": true,
+    "node_modules/@jest/core": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
+      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "@jest/console": "^27.5.1",
+        "@jest/reporters": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-changed-files": "^27.5.1",
+        "jest-config": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-resolve-dependencies": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "jest-watcher": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
+    "node_modules/@jest/core/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+    "node_modules/@jest/core/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+    "node_modules/@jest/core/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
+    "node_modules/@jest/core/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
+    "node_modules/@jest/core/node_modules/emittery": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
+    "node_modules/@jest/core/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+    "node_modules/@jest/core/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
-      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
-      "dev": true,
+    "node_modules/@jest/core/node_modules/jest-watcher": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
+      "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^27.5.1",
+        "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz",
-      "integrity": "sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==",
-      "dev": true,
+    "node_modules/@jest/environment": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
-      "dev": true,
+    "node_modules/@jest/environment/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
-      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
-      "dev": true,
+    "node_modules/@jest/environment/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
-      "dev": true,
+    "node_modules/@jest/fake-timers/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-flow-strip-types": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.7.tgz",
-      "integrity": "sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==",
-      "dev": true,
+    "node_modules/@jest/fake-timers/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-flow": "^7.16.7"
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@jest/fake-timers/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
-      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
-      "dev": true,
+    "node_modules/@jest/fake-timers/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
-      "dev": true,
+    "node_modules/@jest/globals": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
+      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@jest/environment": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "expect": "^27.5.1"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dev": true,
+    "node_modules/@jest/globals/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/compat-data": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/@jest/globals/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-compilation-targets": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-      "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
-      "dev": true,
+    "node_modules/@jest/reporters": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
+      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
       "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.20.2",
-        "semver": "^6.3.0"
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-haste-map": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^8.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
+    "node_modules/@jest/reporters/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
+    "node_modules/@jest/reporters/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-      "dev": true,
+    "node_modules/@jest/reporters/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
+    "node_modules/@jest/reporters/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
+    "node_modules/@jest/reporters/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
+    "node_modules/@jest/reporters/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+    "node_modules/@jest/schemas": {
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
+      "integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "@sinclair/typebox": "^0.23.3"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
+    "node_modules/@jest/source-map": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
+      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "source-map": "^0.6.0"
       },
       "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+    "node_modules/@jest/test-result": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.0.tgz",
+      "integrity": "sha512-sBBFIyoPzrZho3N+80P35A5oAkSKlGfsEFfXFWuPGBsW40UAjCkGakZhn4UQK4iQlW2vgCDMRDOob9FGKV8YoQ==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@jest/console": "^28.1.0",
+        "@jest/types": "^28.1.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+    "node_modules/@jest/test-sequencer": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
+      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@jest/test-result": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-runtime": "^27.5.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
-      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
-      "dev": true,
+    "node_modules/@jest/test-sequencer/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
-      "dev": true,
+    "node_modules/@jest/test-sequencer/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
-      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
-      "dev": true,
+    "node_modules/@jest/test-sequencer/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dev": true,
+    "node_modules/@jest/test-sequencer/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-      "dev": true,
+    "node_modules/@jest/test-sequencer/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
       "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
+    "node_modules/@jest/test-sequencer/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
+    "node_modules/@jest/transform": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
+      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^27.5.1",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dev": true,
+    "node_modules/@jest/transform/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-      "dev": true,
+    "node_modules/@jest/transform/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-simple-access": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-      "dev": true,
+    "node_modules/@jest/transform/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "@babel/types": "^7.17.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "dev": true,
+    "node_modules/@jest/types": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.0.tgz",
+      "integrity": "sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@jest/schemas": "^28.0.2",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^17.0.8",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
+      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
+      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
+      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.11.tgz",
+      "integrity": "sha512-RllI476aSMsxzeI9TtlSMoNTgHDxEmnl6GkkHwhr0vdL8W+0WuesyI8Vd3rBOfrwtPXbPxdT9ADJdiOKgzxPQA==",
       "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "node_modules/@nestjs/common": {
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-8.4.4.tgz",
+      "integrity": "sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "axios": "0.26.1",
+        "iterare": "1.2.1",
+        "tslib": "2.3.1",
+        "uuid": "8.3.2"
       },
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/nest"
+      },
+      "peerDependencies": {
+        "cache-manager": "*",
+        "class-transformer": "*",
+        "class-validator": "*",
+        "reflect-metadata": "^0.1.12",
+        "rxjs": "^7.1.0"
+      },
+      "peerDependenciesMeta": {
+        "cache-manager": {
+          "optional": true
+        },
+        "class-transformer": {
+          "optional": true
+        },
+        "class-validator": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/@nestjs/common/node_modules/tslib": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+      "dev": true
+    },
+    "node_modules/@nestjs/core": {
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-8.4.4.tgz",
+      "integrity": "sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==",
       "dev": true,
+      "hasInstallScript": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "@nuxtjs/opencollective": "0.3.2",
+        "fast-safe-stringify": "2.1.1",
+        "iterare": "1.2.1",
+        "object-hash": "3.0.0",
+        "path-to-regexp": "3.2.0",
+        "tslib": "2.3.1",
+        "uuid": "8.3.2"
       },
-      "engines": {
-        "node": ">=6.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/nest"
+      },
+      "peerDependencies": {
+        "@nestjs/common": "^8.0.0",
+        "@nestjs/microservices": "^8.0.0",
+        "@nestjs/platform-express": "^8.0.0",
+        "@nestjs/websockets": "^8.0.0",
+        "reflect-metadata": "^0.1.12",
+        "rxjs": "^7.1.0"
       },
       "peerDependenciesMeta": {
-        "supports-color": {
+        "@nestjs/microservices": {
+          "optional": true
+        },
+        "@nestjs/platform-express": {
+          "optional": true
+        },
+        "@nestjs/websockets": {
           "optional": true
         }
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/@nestjs/core/node_modules/path-to-regexp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",
+      "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==",
+      "dev": true
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+    "node_modules/@nestjs/core/node_modules/tslib": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
       "dev": true
     },
-    "node_modules/@babel/plugin-transform-modules-amd/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 8"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz",
-      "integrity": "sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==",
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">= 8"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
+      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
+    "node_modules/@nuxtjs/opencollective": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz",
+      "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
+        "chalk": "^4.1.0",
+        "consola": "^2.15.0",
+        "node-fetch": "^2.6.1"
+      },
+      "bin": {
+        "opencollective": "bin/opencollective.js"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8.0.0",
+        "npm": ">=5.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+    "node_modules/@openapitools/openapi-generator-cli": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.5.1.tgz",
+      "integrity": "sha512-WSRQBU0dCSVD+0Qv8iCsv0C4iMaZe/NpJ/CT4SmrEYLH3txoKTE8wEfbdj/kqShS8Or0YEGDPUzhSIKY151L0w==",
       "dev": true,
+      "hasInstallScript": true,
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "@nestjs/common": "8.4.4",
+        "@nestjs/core": "8.4.4",
+        "@nuxtjs/opencollective": "0.3.2",
+        "chalk": "4.1.2",
+        "commander": "8.3.0",
+        "compare-versions": "4.1.3",
+        "concurrently": "6.5.1",
+        "console.table": "0.10.0",
+        "fs-extra": "10.0.1",
+        "glob": "7.1.6",
+        "inquirer": "8.2.2",
+        "lodash": "4.17.21",
+        "reflect-metadata": "0.1.13",
+        "rxjs": "7.5.5",
+        "tslib": "2.0.3"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
+      "bin": {
+        "openapi-generator-cli": "main.js"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/openapi_generator"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/fs-extra": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
+      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-simple-access": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.17.0"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/rxjs": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "tslib": "^2.1.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/rxjs/node_modules/tslib": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+      "dev": true
+    },
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/tslib": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==",
+      "dev": true
+    },
+    "node_modules/@popperjs/core": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
+      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
+    "node_modules/@reduxjs/toolkit": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.2.tgz",
+      "integrity": "sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "immer": "^9.0.7",
+        "redux": "^4.1.2",
+        "redux-thunk": "^2.4.1",
+        "reselect": "^4.1.5"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependencies": {
+        "react": "^16.9.0 || ^17.0.0 || ^18",
+        "react-redux": "^7.2.1 || ^8.0.0-beta"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-redux": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/@rooks/use-outside-click-ref": {
+      "version": "4.11.2",
+      "resolved": "https://registry.npmjs.org/@rooks/use-outside-click-ref/-/use-outside-click-ref-4.11.2.tgz",
+      "integrity": "sha512-w2bCW69zcpLh0KmN/odAuBsQ3sps+73KEu7zMOi0o4YMfDo+tXcqwlTJiLYysd0BEoQC9pNIklzZmI9zZep69g==",
+      "peerDependencies": {
+        "react": ">=16.8.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-      "dev": true,
+    "node_modules/@rushstack/eslint-patch": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
+      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
+      "dev": true
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.23.5",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
+      "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg=="
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "type-detect": "4.0.8"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@sinonjs/commons": "^1.7.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+    "node_modules/@testing-library/dom": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
+      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^4.2.0",
+        "aria-query": "^5.0.0",
+        "chalk": "^4.1.0",
+        "dom-accessibility-api": "^0.5.9",
+        "lz-string": "^1.4.4",
+        "pretty-format": "^27.0.2"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
+    "node_modules/@testing-library/dom/node_modules/aria-query": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
+      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
       "engines": {
-        "node": ">=4"
+        "node": ">=6.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/@testing-library/dom/node_modules/dom-accessibility-api": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz",
+      "integrity": "sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g=="
+    },
+    "node_modules/@testing-library/jest-dom": {
+      "version": "5.16.4",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz",
+      "integrity": "sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "@babel/runtime": "^7.9.2",
+        "@types/testing-library__jest-dom": "^5.9.1",
+        "aria-query": "^5.0.0",
+        "chalk": "^3.0.0",
+        "css": "^3.0.0",
+        "css.escape": "^1.5.1",
+        "dom-accessibility-api": "^0.5.6",
+        "lodash": "^4.17.15",
+        "redent": "^3.0.0"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": ">=8",
+        "npm": ">=6",
+        "yarn": ">=1"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+    "node_modules/@testing-library/jest-dom/node_modules/aria-query": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
+      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=6.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/has-flag": {
+    "node_modules/@testing-library/jest-dom/node_modules/chalk": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.17.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz",
-      "integrity": "sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==",
-      "dev": true,
+    "node_modules/@testing-library/react": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.2.0.tgz",
+      "integrity": "sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g==",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
+        "@babel/runtime": "^7.12.5",
+        "@testing-library/dom": "^8.5.0",
+        "@types/react-dom": "^18.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=12"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+    "node_modules/@testing-library/user-event": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
+      "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "@babel/runtime": "^7.12.5"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=10",
+        "npm": ">=6"
+      },
+      "peerDependencies": {
+        "@testing-library/dom": ">=7.21.4"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
-      },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+      "devOptional": true
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+      "devOptional": true
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
+      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+      "devOptional": true
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
+      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+      "devOptional": true
+    },
+    "node_modules/@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.1.19",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
+      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dev": true,
+    "node_modules/@types/babel__template": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-      "dev": true,
+    "node_modules/@types/babel__traverse": {
+      "version": "7.17.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
+      "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/types": "^7.3.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-simple-access": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-      "dev": true,
+    "node_modules/@types/eventsource": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@types/eventsource/-/eventsource-1.1.8.tgz",
+      "integrity": "sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==",
+      "dev": true
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
       "dependencies": {
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/node": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "dev": true,
+    "node_modules/@types/history": {
+      "version": "4.7.11",
+      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
+      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
+      "dev": true
+    },
+    "node_modules/@types/hoist-non-react-statics": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/istanbul-lib-coverage": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/istanbul-lib-report": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
+    "node_modules/@types/jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.1.tgz",
+      "integrity": "sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "jest-matcher-utils": "^27.0.0",
+        "pretty-format": "^27.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
+    "node_modules/@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+    "node_modules/@types/lodash": {
+      "version": "4.14.177",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
+      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
+      "dev": true
+    },
+    "node_modules/@types/node": {
+      "version": "16.11.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
+      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+      "dev": true
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
+      "integrity": "sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg=="
+    },
+    "node_modules/@types/prop-types": {
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+    },
+    "node_modules/@types/react": {
+      "version": "18.0.9",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz",
+      "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "@types/prop-types": "*",
+        "@types/scheduler": "*",
+        "csstype": "^3.0.2"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/debug": {
+    "node_modules/@types/react-datepicker": {
       "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.3.4.tgz",
+      "integrity": "sha512-5nTTz37KdTUgMZ1AAxztMWNtEnIMVRo8oCAEhIv0a6uUqDjvSKaMyPRpBV+8chi6f/A8wlTKJIpojpXca2dx3A==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+        "@popperjs/core": "^2.9.2",
+        "@types/react": "*",
+        "date-fns": "^2.0.1",
+        "react-popper": "^2.2.5"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+    "node_modules/@types/react-dom": {
+      "version": "18.0.5",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
+      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
       "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "@types/react": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
-      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
+    "node_modules/@types/react-redux": {
+      "version": "7.1.22",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
+      "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@types/hoist-non-react-statics": "^3.3.0",
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0",
+        "redux": "^4.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+    "node_modules/@types/react-router": {
+      "version": "5.1.18",
+      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
+      "integrity": "sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/history": "^4.7.11",
+        "@types/react": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
+    "node_modules/@types/react-router-dom": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
+      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+    "node_modules/@types/redux-mock-store": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@types/redux-mock-store/-/redux-mock-store-1.0.3.tgz",
+      "integrity": "sha512-Wqe3tJa6x9MxMN4DJnMfZoBRBRak1XTPklqj4qkVm5VBpZnC8PSADf4kLuFQ9NAdHaowfWoEeUMz7NWc2GMtnA==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "redux": "^4.0.5"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+    "node_modules/@types/scheduler": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
+    },
+    "node_modules/@types/styled-components": {
+      "version": "5.1.18",
+      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.18.tgz",
+      "integrity": "sha512-xPTYmWP7Mxk5TAD3pYsqjwA9G5fAI8e/S51QUJEl7EQD1siKCdiYXIWiH2lzoHRl+QqbQCJMcGv3YTF3OmyPdQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/hoist-non-react-statics": "*",
+        "@types/react": "*",
+        "csstype": "^3.0.2"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+    "node_modules/@types/testing-library__jest-dom": {
+      "version": "5.14.1",
+      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz",
+      "integrity": "sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/jest": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-      "dev": true,
+    "node_modules/@types/uuid": {
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
+      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
+      "dev": true
+    },
+    "node_modules/@types/yargs": {
+      "version": "17.0.10",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
+      "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-simple-access": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
+    "node_modules/@types/yargs-parser": {
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA=="
+    },
+    "node_modules/@types/yup": {
+      "version": "0.29.13",
+      "resolved": "https://registry.npmjs.org/@types/yup/-/yup-0.29.13.tgz",
+      "integrity": "sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g=="
+    },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz",
+      "integrity": "sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.17.0"
+        "@typescript-eslint/scope-manager": "5.10.0",
+        "@typescript-eslint/type-utils": "5.10.0",
+        "@typescript-eslint/utils": "5.10.0",
+        "debug": "^4.3.2",
+        "functional-red-black-tree": "^1.0.1",
+        "ignore": "^5.1.8",
+        "regexpp": "^3.2.0",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
+    "node_modules/@typescript-eslint/experimental-utils": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.23.0.tgz",
+      "integrity": "sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "@typescript-eslint/utils": "5.23.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
+      "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@typescript-eslint/types": "5.23.0",
+        "@typescript-eslint/visitor-keys": "5.23.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/types": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
+      "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
       "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
+      "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "@typescript-eslint/types": "5.23.0",
+        "@typescript-eslint/visitor-keys": "5.23.0",
+        "debug": "^4.3.2",
+        "globby": "^11.0.4",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/utils": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
+      "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "@types/json-schema": "^7.0.9",
+        "@typescript-eslint/scope-manager": "5.23.0",
+        "@typescript-eslint/types": "5.23.0",
+        "@typescript-eslint/typescript-estree": "5.23.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
+      "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@typescript-eslint/types": "5.23.0",
+        "eslint-visitor-keys": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/debug": {
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
@@ -4072,292 +4108,264 @@
         }
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/ms": {
+    "node_modules/@typescript-eslint/experimental-utils/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/@babel/plugin-transform-modules-umd/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/@typescript-eslint/parser": {
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz",
+      "integrity": "sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@typescript-eslint/scope-manager": "5.27.0",
+        "@typescript-eslint/types": "5.27.0",
+        "@typescript-eslint/typescript-estree": "5.27.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz",
-      "integrity": "sha512-v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA==",
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz",
+      "integrity": "sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.17.0"
+        "@typescript-eslint/types": "5.27.0",
+        "@typescript-eslint/visitor-keys": "5.27.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
-      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz",
+      "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz",
+      "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
+        "@typescript-eslint/types": "5.27.0",
+        "@typescript-eslint/visitor-keys": "5.27.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.16.7"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz",
+      "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
+        "@typescript-eslint/types": "5.27.0",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+    "node_modules/@typescript-eslint/parser/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
+        "node": ">=6.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
+    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-replace-supers": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-      "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-member-expression-to-functions": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
+    "node_modules/@typescript-eslint/parser/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz",
+      "integrity": "sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "@typescript-eslint/types": "5.10.0",
+        "@typescript-eslint/visitor-keys": "5.10.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz",
+      "integrity": "sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@typescript-eslint/utils": "5.10.0",
+        "debug": "^4.3.2",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.0.tgz",
+      "integrity": "sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
       "engines": {
-        "node": ">=4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz",
+      "integrity": "sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@typescript-eslint/types": "5.10.0",
+        "@typescript-eslint/visitor-keys": "5.10.0",
+        "debug": "^4.3.2",
+        "globby": "^11.0.4",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -4371,3827 +4379,3331 @@
         }
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/ms": {
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/@babel/plugin-transform-object-super/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.0.tgz",
+      "integrity": "sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@types/json-schema": "^7.0.9",
+        "@typescript-eslint/scope-manager": "5.10.0",
+        "@typescript-eslint/types": "5.10.0",
+        "@typescript-eslint/typescript-estree": "5.10.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
-      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+    "node_modules/@typescript-eslint/utils/node_modules/@types/json-schema": {
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz",
+      "integrity": "sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@typescript-eslint/types": "5.10.0",
+        "eslint-visitor-keys": "^3.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@babel/plugin-transform-react-constant-elements": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.6.tgz",
-      "integrity": "sha512-OBv9VkyyKtsHZiHLoSfCn+h6yU7YKX8nrs32xUmOa1SRSk+t03FosB6fBZ0Yz4BpD1WV7l73Nsad+2Tz7APpqw==",
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
+      "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
-      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
-      "dev": true,
+    "node_modules/@vitejs/plugin-react": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-1.3.2.tgz",
+      "integrity": "sha512-aurBNmMo0kz1O4qRoY+FM4epSA39y3ShWGuqfLRA/3z0oEJAdtoSfgA3aO98/PCCHAqMaduLxIxErWrVKIFzXA==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/core": "^7.17.10",
+        "@babel/plugin-transform-react-jsx": "^7.17.3",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+        "@babel/plugin-transform-react-jsx-self": "^7.16.7",
+        "@babel/plugin-transform-react-jsx-source": "^7.16.7",
+        "@rollup/pluginutils": "^4.2.1",
+        "react-refresh": "^0.13.0",
+        "resolve": "^1.22.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz",
-      "integrity": "sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==",
-      "dev": true,
+    "node_modules/@vitejs/plugin-react/node_modules/@rollup/pluginutils": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
+      "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-jsx": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "estree-walker": "^2.0.1",
+        "picomatch": "^2.2.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">= 8.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
-      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.16.7"
-      },
+    "node_modules/@vitejs/plugin-react/node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+    },
+    "node_modules/@vitejs/plugin-react/node_modules/react-refresh": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.13.0.tgz",
+      "integrity": "sha512-XP8A9BT0CpRBD+NYLLeIhld/RqG9+gktUjW1FkE+Vm7OCinbG1SshcK5tb9ls4kzvjZr9mOQc7HYgBngEyPAXg==",
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
+    },
+    "node_modules/ace-builds": {
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
+      "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
+    },
+    "node_modules/acorn": {
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dev": true,
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/@babel/plugin-transform-react-jsx/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "debug": "4"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 6.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz",
-      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
-      "dev": true,
+    "node_modules/agent-base/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@babel/plugin-transform-react-pure-annotations/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+    "node_modules/agent-base/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/plugin-transform-react-pure-annotations/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+    "node_modules/ajv": {
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
+      "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@babel/plugin-transform-react-pure-annotations/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6"
       }
     },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
-      "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
-      "dev": true,
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dependencies": {
-        "regenerator-transform": "^0.15.0"
+        "type-fest": "^0.21.3"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
-      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz",
-      "integrity": "sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig==",
-      "dev": true,
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "semver": "^6.3.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@babel/plugin-transform-runtime/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dev": true,
+    "node_modules/ansi-styles/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-runtime/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
+    "node_modules/ansi-styles/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
-    "node_modules/@babel/plugin-transform-runtime/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
+    "node_modules/anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "devOptional": true
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+    "node_modules/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=6.0"
       }
     },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
-      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
+    "node_modules/array-includes": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+    "node_modules/array-includes/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
-      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
+    "node_modules/array-includes/node_modules/es-abstract": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.4.1",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
-      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
+    "node_modules/array-includes/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz",
-      "integrity": "sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==",
+    "node_modules/array-includes/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-typescript": "^7.16.7"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+    "node_modules/array-includes/node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+    "node_modules/array-includes/node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-env": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.17.10.tgz",
-      "integrity": "sha512-YNgyBHZQpeoBSRBg0xixsZzfT58Ze1iZrajvv0lJc70qDDGuGfonEnMGfWeSY0mQ3JTuCWFbMkzFRVafOyJx4g==",
+    "node_modules/array-includes/node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-compilation-targets": "^7.17.10",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-class-static-block": "^7.17.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-        "@babel/plugin-proposal-json-strings": "^7.16.7",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.17.3",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.11",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.7",
-        "@babel/plugin-transform-async-to-generator": "^7.16.8",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.16.7",
-        "@babel/plugin-transform-classes": "^7.16.7",
-        "@babel/plugin-transform-computed-properties": "^7.16.7",
-        "@babel/plugin-transform-destructuring": "^7.17.7",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.16.7",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.16.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.16.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.17.9",
-        "@babel/plugin-transform-modules-systemjs": "^7.17.8",
-        "@babel/plugin-transform-modules-umd": "^7.16.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.10",
-        "@babel/plugin-transform-new-target": "^7.16.7",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.16.7",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.17.9",
-        "@babel/plugin-transform-reserved-words": "^7.16.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.16.7",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.16.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.17.10",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.22.1",
-        "semver": "^6.3.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/compat-data": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
+    "node_modules/array-includes/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-compilation-targets": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-      "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
+    "node_modules/array-includes/node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.20.2",
-        "semver": "^6.3.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+    "node_modules/array-includes/node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+    "node_modules/array-includes/node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/array-includes/node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-env/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
+    "node_modules/array-includes/node_modules/string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/@babel/preset-env/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
+    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-react": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz",
-      "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==",
+    "node_modules/array-includes/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-react-display-name": "^7.16.7",
-        "@babel/plugin-transform-react-jsx": "^7.16.7",
-        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-react/node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@babel/preset-typescript": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz",
-      "integrity": "sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==",
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-typescript": "^7.16.7"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/preset-typescript/node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+    "node_modules/array.prototype.flat/node_modules/es-abstract": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
       "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
-      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.4.1",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.6.tgz",
-      "integrity": "sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==",
+    "node_modules/array.prototype.flat/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
-      "dependencies": {
-        "core-js-pure": "^3.14.0",
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      },
+    "node_modules/array.prototype.flat/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.5.tgz",
-      "integrity": "sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "node": ">= 0.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/traverse/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
+    "node_modules/array.prototype.flat/node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
       "engines": {
-        "node": ">=6.0"
+        "node": ">= 0.4"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@babel/traverse/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+    "node_modules/array.prototype.flat/node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/@babel/types": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz",
-      "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "to-fast-properties": "^2.0.0"
+        "node": ">= 0.4"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
-    },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+    "node_modules/array.prototype.flat/node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+    "node_modules/array.prototype.flat/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/normalize.css": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz",
-      "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==",
-      "dev": true
-    },
-    "node_modules/@csstools/postcss-color-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.0.tgz",
-      "integrity": "sha512-5D5ND/mZWcQoSfYnSPsXtuiFxhzmhxt6pcjrFLJyldj+p0ZN2vvRpYNX+lahFTtMhAYOa2WmkdGINr0yP0CvGA==",
+    "node_modules/array.prototype.flat/node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^12 || ^14 || >=16"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/postcss-color-function/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/@csstools/postcss-font-format-keywords": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.0.tgz",
-      "integrity": "sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==",
+    "node_modules/array.prototype.flat/node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
+        "call-bind": "^1.0.2"
       },
-      "peerDependencies": {
-        "postcss": "^8.3"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/postcss-font-format-keywords/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
+    "node_modules/array.prototype.flat/node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/@csstools/postcss-hwb-function": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.0.tgz",
-      "integrity": "sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA==",
+    "node_modules/array.prototype.flat/node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
-        "node": "^12 || ^14 || >=16"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "postcss": "^8.3"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/postcss-hwb-function/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/@csstools/postcss-ic-unit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.0.tgz",
-      "integrity": "sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==",
+    "node_modules/array.prototype.flat/node_modules/string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dev": true,
       "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "peerDependencies": {
-        "postcss": "^8.3"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/postcss-ic-unit/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/@csstools/postcss-is-pseudo-class": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.3.tgz",
-      "integrity": "sha512-wMQ3GMWrJyRQfvBJsD38ndF/nwHT32xevSn8w2X+iCoWqmhhoj0K7HgdGW8XQhah6sdENBa8yS9gRosdezaQZw==",
+    "node_modules/array.prototype.flat/node_modules/string.prototype.trimend/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "@csstools/selector-specificity": "^1.0.0",
-        "postcss-selector-parser": "^6.0.10"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": "^12 || ^14 || >=16"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/postcss-normalize-display-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.0.tgz",
-      "integrity": "sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==",
+    "node_modules/array.prototype.flat/node_modules/string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "peerDependencies": {
-        "postcss": "^8.3"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/postcss-normalize-display-values/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/@csstools/postcss-oklab-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.0.tgz",
-      "integrity": "sha512-e/Q5HopQzmnQgqimG9v3w2IG4VRABsBq3itOcn4bnm+j4enTgQZ0nWsaH/m9GV2otWGQ0nwccYL5vmLKyvP1ww==",
+    "node_modules/array.prototype.flat/node_modules/string.prototype.trimstart/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": "^12 || ^14 || >=16"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/postcss-oklab-function/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
+    "node_modules/array.prototype.flat/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/@csstools/postcss-progressive-custom-properties": {
+    "node_modules/array.prototype.flatmap": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
-      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
+      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
-        "node": "^12 || ^14 || >=16"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "postcss": "^8.3"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/postcss-progressive-custom-properties/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/@csstools/postcss-stepped-value-functions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.0.tgz",
-      "integrity": "sha512-q8c4bs1GumAiRenmFjASBcWSLKrbzHzWl6C2HcaAxAXIiL2rUlUWbqQZUjwVG5tied0rld19j/Mm90K3qI26vw==",
+    "node_modules/array.prototype.flatmap/node_modules/es-abstract": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
       "dev": true,
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.4.1",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       },
       "engines": {
-        "node": "^12 || ^14 || >=16"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/postcss-stepped-value-functions/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
+    "node_modules/array.prototype.flatmap/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/@csstools/postcss-unset-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.1.tgz",
-      "integrity": "sha512-f1G1WGDXEU/RN1TWAxBPQgQudtLnLQPyiWdtypkPC+mVYNKFKH/HYXSxH4MVNqwF8M0eDsoiU7HumJHCg/L/jg==",
+    "node_modules/array.prototype.flatmap/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
       "engines": {
-        "node": "^12 || ^14 || >=16"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-1.0.0.tgz",
-      "integrity": "sha512-RkYG5KiGNX0fJ5YoI0f4Wfq2Yo74D25Hru4fxTOioYdQvHBxcrrtTTyT5Ozzh2ejcNrhFy7IEts2WyEY7yi5yw==",
+    "node_modules/array.prototype.flatmap/node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true,
       "engines": {
-        "node": "^12 || ^14 || >=16"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3",
-        "postcss-selector-parser": "^6.0.10"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@emotion/is-prop-valid": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
-      "dependencies": {
-        "@emotion/memoize": "0.7.4"
+    "node_modules/array.prototype.flatmap/node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@emotion/memoize": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
-    },
-    "node_modules/@emotion/stylis": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
-    },
-    "node_modules/@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+    "node_modules/array.prototype.flatmap/node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
       "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.3.2",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/array.prototype.flatmap/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "call-bind": "^1.0.2"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-    },
-    "node_modules/@eslint/eslintrc/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/array.prototype.flatmap/node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">= 0.4"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+    "node_modules/array.prototype.flatmap/node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
       "dependencies": {
-        "argparse": "^2.0.1"
+        "call-bind": "^1.0.2"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
+    "node_modules/array.prototype.flatmap/node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz",
-      "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg==",
-      "hasInstallScript": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@hookform/error-message": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@hookform/error-message/-/error-message-2.0.0.tgz",
-      "integrity": "sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==",
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0",
-        "react-hook-form": "^7.0.0"
-      }
-    },
-    "node_modules/@hookform/resolvers": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.8.9.tgz",
-      "integrity": "sha512-IXwGpjewxScF4N2kuyYDip6ABqH4lCg9n1f1mp0vbmKik+u+nestpbtdEs6U1WQZxwaoK/2APv1+MEr4czX7XA==",
-      "peerDependencies": {
-        "react-hook-form": "^7.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/array.prototype.flatmap/node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">= 0.4"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dev": true,
       "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimend/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimstart/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/array.prototype.flatmap/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+      "dev": true
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 4.5.0"
       }
     },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+    "node_modules/axe-core": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz",
+      "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/@jest/console": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.0.tgz",
-      "integrity": "sha512-tscn3dlJFGay47kb4qVruQg/XWlmvU0xp3EJOjzzY+sBaI+YgwKcvAmTcyYU7xEiLLIY5HCdWRooAL8dqkFlDA==",
+    "node_modules/axios": {
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
       "dev": true,
       "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "follow-redirects": "^1.14.8"
       }
     },
-    "node_modules/@jest/core": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.0.tgz",
-      "integrity": "sha512-/2PTt0ywhjZ4NwNO4bUqD9IVJfmFVhVKGlhvSpmEfUCuxYf/3NHcKmRFI+I71lYzbTT3wMuYpETDCTHo81gC/g==",
-      "dev": true,
-      "peer": true,
+    "node_modules/axobject-query": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+      "dev": true
+    },
+    "node_modules/babel-jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
       "dependencies": {
-        "@jest/console": "^28.1.0",
-        "@jest/reporters": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/transform": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^27.5.1",
         "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^28.0.2",
-        "jest-config": "^28.1.0",
-        "jest-haste-map": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.0",
-        "jest-resolve-dependencies": "^28.1.0",
-        "jest-runner": "^28.1.0",
-        "jest-runtime": "^28.1.0",
-        "jest-snapshot": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "jest-watcher": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.0",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       },
       "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/@jest/core/node_modules/jest-haste-map": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-      "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-      "dev": true,
-      "peer": true,
+    "node_modules/babel-jest/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/graceful-fs": "^4.1.3",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@jest/core/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+    "node_modules/babel-jest/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@jest/core/node_modules/jest-resolve": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.0.tgz",
-      "integrity": "sha512-vvfN7+tPNnnhDvISuzD1P+CRVP8cK0FHXRwPAcdDaQv4zgvwvag2n55/h5VjYcM5UJG7L4TwE5tZlzcI0X2Lhw==",
+    "node_modules/babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "object.assign": "^4.1.0"
       }
     },
-    "node_modules/@jest/core/node_modules/jest-validate": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-      "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
-      "dev": true,
-      "peer": true,
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dependencies": {
-        "@jest/types": "^28.1.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "leven": "^3.1.0",
-        "pretty-format": "^28.1.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@jest/core/node_modules/jest-worker": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-      "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-      "dev": true,
-      "peer": true,
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@jest/core/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+    "node_modules/babel-plugin-macros": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@babel/runtime": "^7.12.5",
+        "cosmiconfig": "^7.0.0",
+        "resolve": "^1.19.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=10",
+        "npm": ">=6"
       }
     },
-    "node_modules/@jest/core/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/@jest/core/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "semver": "^6.1.1"
       },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/environment": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.0.tgz",
-      "integrity": "sha512-S44WGSxkRngzHslhV6RoAExekfF7Qhwa6R5+IYFa81mpcj0YgdBnRSmvHe3SNwOt64yXaE5GG8Y2xM28ii5ssA==",
+    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@jest/fake-timers": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "jest-mock": "^28.1.0"
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/expect": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.0.tgz",
-      "integrity": "sha512-be9ETznPLaHOmeJqzYNIXv1ADEzENuQonIoobzThOYPuK/6GhrWNIJDVTgBLCrz3Am73PyEU2urQClZp0hLTtA==",
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "expect": "^28.1.0",
-        "jest-snapshot": "^28.1.0"
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@jest/expect-utils": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.0.tgz",
-      "integrity": "sha512-5BrG48dpC0sB80wpeIX5FU6kolDJI4K0n5BM9a5V38MGx0pyRvUBSS0u2aNTdDzmOrCjhOg8pGs6a20ivYkdmw==",
-      "dev": true,
-      "peer": true,
+    "node_modules/babel-plugin-styled-components": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz",
+      "integrity": "sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==",
       "dependencies": {
-        "jest-get-type": "^28.0.2"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-module-imports": "^7.0.0",
+        "babel-plugin-syntax-jsx": "^6.18.0",
+        "lodash": "^4.17.11"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "peerDependencies": {
+        "styled-components": ">= 2"
       }
     },
-    "node_modules/@jest/fake-timers": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.0.tgz",
-      "integrity": "sha512-Xqsf/6VLeAAq78+GNPzI7FZQRf5cCHj1qgQxCjws9n8rKw8r1UYoeaALwBvyuzOkpU3c1I6emeMySPa96rxtIg==",
-      "dev": true,
-      "peer": true,
+    "node_modules/babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
+    },
+    "node_modules/babel-plugin-transform-react-remove-prop-types": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
+      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==",
+      "dev": true
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
       "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@sinonjs/fake-timers": "^9.1.1",
-        "@types/node": "*",
-        "jest-message-util": "^28.1.0",
-        "jest-mock": "^28.1.0",
-        "jest-util": "^28.1.0"
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@jest/globals": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.0.tgz",
-      "integrity": "sha512-3m7sTg52OTQR6dPhsEQSxAvU+LOBbMivZBwOvKEZ+Rb+GyxVnXi9HKgOTYkx/S99T8yvh17U4tNNJPIEQmtwYw==",
-      "dev": true,
-      "peer": true,
+    "node_modules/babel-preset-jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
       "dependencies": {
-        "@jest/environment": "^28.1.0",
-        "@jest/expect": "^28.1.0",
-        "@jest/types": "^28.1.0"
+        "babel-plugin-jest-hoist": "^27.5.1",
+        "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@jest/reporters": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.0.tgz",
-      "integrity": "sha512-qxbFfqap/5QlSpIizH9c/bFCDKsQlM4uAKSOvZrP+nIdrjqre3FmKzpTtYyhsaVcOSNK7TTt2kjm+4BJIjysFA==",
+    "node_modules/babel-preset-react-app": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
+      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/transform": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-util": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^9.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
+        "@babel/core": "^7.16.0",
+        "@babel/plugin-proposal-class-properties": "^7.16.0",
+        "@babel/plugin-proposal-decorators": "^7.16.4",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
+        "@babel/plugin-proposal-private-methods": "^7.16.0",
+        "@babel/plugin-transform-flow-strip-types": "^7.16.0",
+        "@babel/plugin-transform-react-display-name": "^7.16.0",
+        "@babel/plugin-transform-runtime": "^7.16.4",
+        "@babel/preset-env": "^7.16.4",
+        "@babel/preset-react": "^7.16.0",
+        "@babel/preset-typescript": "^7.16.0",
+        "@babel/runtime": "^7.16.3",
+        "babel-plugin-macros": "^3.1.0",
+        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
       }
     },
-    "node_modules/@jest/reporters/node_modules/jest-worker": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-      "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
+    "node_modules/babel-preset-react-app/node_modules/@babel/runtime": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
+      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "regenerator-runtime": "^0.13.4"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@jest/reporters/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "node": ">=0.6"
       }
     },
-    "node_modules/@jest/schemas": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
-      "integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
-      "dev": true,
-      "dependencies": {
-        "@sinclair/typebox": "^0.23.3"
-      },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@jest/source-map": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.0.2.tgz",
-      "integrity": "sha512-Y9dxC8ZpN3kImkk0LkK5XCEneYMAXlZ8m5bflmSL5vrwyeUpJfentacCUg6fOb8NOpOO7hz2+l37MV77T6BFPw==",
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
       }
     },
-    "node_modules/@jest/test-result": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.0.tgz",
-      "integrity": "sha512-sBBFIyoPzrZho3N+80P35A5oAkSKlGfsEFfXFWuPGBsW40UAjCkGakZhn4UQK4iQlW2vgCDMRDOob9FGKV8YoQ==",
-      "dev": true,
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dependencies": {
-        "@jest/console": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@jest/test-sequencer": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.0.tgz",
-      "integrity": "sha512-tZCEiVWlWNTs/2iK9yi6o3AlMfbbYgV4uuZInSVdzZ7ftpHZhCMuhvk2HLYhCZzLgPFQ9MnM1YaxMnh3TILFiQ==",
-      "dev": true,
-      "peer": true,
+    "node_modules/broadcast-channel": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
+      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
       "dependencies": {
-        "@jest/test-result": "^28.1.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
-        "slash": "^3.0.0"
+        "@babel/runtime": "^7.7.2",
+        "detect-node": "^2.1.0",
+        "js-sha3": "0.8.0",
+        "microseconds": "0.2.0",
+        "nano-time": "1.0.0",
+        "oblivious-set": "1.0.0",
+        "rimraf": "3.0.2",
+        "unload": "2.2.0"
+      }
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+    },
+    "node_modules/browserslist": {
+      "version": "4.20.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz",
+      "integrity": "sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        }
+      ],
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001349",
+        "electron-to-chromium": "^1.4.147",
+        "escalade": "^3.1.1",
+        "node-releases": "^2.0.5",
+        "picocolors": "^1.0.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/@jest/test-sequencer/node_modules/jest-haste-map": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-      "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
+        "fast-json-stable-stringify": "2.x"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "node": ">= 6"
       }
     },
-    "node_modules/@jest/test-sequencer/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dependencies": {
+        "node-int64": "^0.4.0"
       }
     },
-    "node_modules/@jest/test-sequencer/node_modules/jest-worker": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-      "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "dev": true,
-      "peer": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
-    "node_modules/@jest/test-sequencer/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "node_modules/bulma": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.3.tgz",
+      "integrity": "sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g=="
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@jest/transform": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.0.tgz",
-      "integrity": "sha512-omy2xe5WxlAfqmsTjTPxw+iXRTRnf+NtX0ToG+4S0tABeb4KsKmPUHq5UBuwunHg3tJRwgEQhEp0M/8oiatLEA==",
-      "dev": true,
-      "peer": true,
+    "node_modules/camelize": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
+      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001352",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz",
+      "integrity": "sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        }
+      ]
+    },
+    "node_modules/chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
       "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^28.1.0",
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@jest/transform/node_modules/jest-haste-map": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-      "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/charcodes": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
+      "integrity": "sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==",
       "dev": true,
-      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
       "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">= 8.10.0"
       },
       "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/@jest/transform/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
+    "node_modules/ci-info": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.1.tgz",
+      "integrity": "sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg=="
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
+      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
+    },
+    "node_modules/classnames": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
+      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true,
-      "peer": true,
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/@jest/transform/node_modules/jest-worker": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-      "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "restore-cursor": "^3.1.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@jest/transform/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/cli-spinners": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
+      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@jest/types": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.0.tgz",
-      "integrity": "sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==",
+    "node_modules/cli-truncate": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
       "dev": true,
       "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "slice-ansi": "^5.0.0",
+        "string-width": "^5.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+    "node_modules/cli-truncate/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "dev": true,
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
-      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
+    "node_modules/cli-truncate/node_modules/ansi-styles": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
+      "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
       "dev": true,
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
-      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
+    "node_modules/cli-truncate/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.11.tgz",
-      "integrity": "sha512-RllI476aSMsxzeI9TtlSMoNTgHDxEmnl6GkkHwhr0vdL8W+0WuesyI8Vd3rBOfrwtPXbPxdT9ADJdiOKgzxPQA==",
+    "node_modules/cli-truncate/node_modules/is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-      "dev": true
-    },
-    "node_modules/@nestjs/common": {
-      "version": "8.4.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-8.4.4.tgz",
-      "integrity": "sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==",
+    "node_modules/cli-truncate/node_modules/slice-ansi": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
       "dependencies": {
-        "axios": "0.26.1",
-        "iterare": "1.2.1",
-        "tslib": "2.3.1",
-        "uuid": "8.3.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/nest"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       },
-      "peerDependencies": {
-        "cache-manager": "*",
-        "class-transformer": "*",
-        "class-validator": "*",
-        "reflect-metadata": "^0.1.12",
-        "rxjs": "^7.1.0"
+      "engines": {
+        "node": ">=12"
       },
-      "peerDependenciesMeta": {
-        "cache-manager": {
-          "optional": true
-        },
-        "class-transformer": {
-          "optional": true
-        },
-        "class-validator": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/@nestjs/common/node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
-    "node_modules/@nestjs/core": {
-      "version": "8.4.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-8.4.4.tgz",
-      "integrity": "sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==",
+    "node_modules/cli-truncate/node_modules/string-width": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.0.1.tgz",
+      "integrity": "sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==",
       "dev": true,
-      "hasInstallScript": true,
       "dependencies": {
-        "@nuxtjs/opencollective": "0.3.2",
-        "fast-safe-stringify": "2.1.1",
-        "iterare": "1.2.1",
-        "object-hash": "3.0.0",
-        "path-to-regexp": "3.2.0",
-        "tslib": "2.3.1",
-        "uuid": "8.3.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/nest"
+        "emoji-regex": "^9.2.2",
+        "is-fullwidth-code-point": "^4.0.0",
+        "strip-ansi": "^7.0.1"
       },
-      "peerDependencies": {
-        "@nestjs/common": "^8.0.0",
-        "@nestjs/microservices": "^8.0.0",
-        "@nestjs/platform-express": "^8.0.0",
-        "@nestjs/websockets": "^8.0.0",
-        "reflect-metadata": "^0.1.12",
-        "rxjs": "^7.1.0"
+      "engines": {
+        "node": ">=12"
       },
-      "peerDependenciesMeta": {
-        "@nestjs/microservices": {
-          "optional": true
-        },
-        "@nestjs/platform-express": {
-          "optional": true
-        },
-        "@nestjs/websockets": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@nestjs/core/node_modules/path-to-regexp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",
-      "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==",
-      "dev": true
-    },
-    "node_modules/@nestjs/core/node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+    "node_modules/cli-truncate/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
       "dev": true,
       "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+    "node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
       "dev": true,
       "engines": {
-        "node": ">= 8"
+        "node": ">= 10"
       }
     },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
-      "dev": true,
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/@nuxtjs/opencollective": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz",
-      "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==",
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
       "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "consola": "^2.15.0",
-        "node-fetch": "^2.6.1"
-      },
-      "bin": {
-        "opencollective": "bin/opencollective.js"
-      },
       "engines": {
-        "node": ">=8.0.0",
-        "npm": ">=5.0.0"
+        "node": ">=0.8"
       }
     },
-    "node_modules/@openapitools/openapi-generator-cli": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.5.1.tgz",
-      "integrity": "sha512-WSRQBU0dCSVD+0Qv8iCsv0C4iMaZe/NpJ/CT4SmrEYLH3txoKTE8wEfbdj/kqShS8Or0YEGDPUzhSIKY151L0w==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "@nestjs/common": "8.4.4",
-        "@nestjs/core": "8.4.4",
-        "@nuxtjs/opencollective": "0.3.2",
-        "chalk": "4.1.2",
-        "commander": "8.3.0",
-        "compare-versions": "4.1.3",
-        "concurrently": "6.5.1",
-        "console.table": "0.10.0",
-        "fs-extra": "10.0.1",
-        "glob": "7.1.6",
-        "inquirer": "8.2.2",
-        "lodash": "4.17.21",
-        "reflect-metadata": "0.1.13",
-        "rxjs": "7.5.5",
-        "tslib": "2.0.3"
-      },
-      "bin": {
-        "openapi-generator-cli": "main.js"
-      },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "engines": {
-        "node": ">=10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/openapi_generator"
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
       }
     },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
     },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
-      "dev": true,
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "delayed-stream": "~1.0.0"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/rxjs": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
+    "node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
       "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
+      "engines": {
+        "node": ">= 12"
       }
     },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/rxjs/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+    "node_modules/compare-versions": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-4.1.3.tgz",
+      "integrity": "sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==",
       "dev": true
     },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==",
-      "dev": true
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.6.tgz",
-      "integrity": "sha512-IIWxofIYt/AbMwoeBgj+O2aAXLrlCQVg+A4a2zfpXFNHgP8o8rvi3v+oe5t787Lj+KXlKOh8BAiUp9bhuELXhg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-html-community": "^0.0.8",
-        "common-path-prefix": "^3.0.0",
-        "core-js-pure": "^3.8.1",
-        "error-stack-parser": "^2.0.6",
-        "find-up": "^5.0.0",
-        "html-entities": "^2.1.0",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "source-map": "^0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13"
+    "node_modules/concurrently": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.5.1.tgz",
+      "integrity": "sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "date-fns": "^2.16.1",
+        "lodash": "^4.17.21",
+        "rxjs": "^6.6.3",
+        "spawn-command": "^0.0.2-1",
+        "supports-color": "^8.1.0",
+        "tree-kill": "^1.2.2",
+        "yargs": "^16.2.0"
       },
-      "peerDependencies": {
-        "@types/webpack": "4.x || 5.x",
-        "react-refresh": ">=0.10.0 <1.0.0",
-        "sockjs-client": "^1.4.0",
-        "type-fest": ">=0.17.0 <3.0.0",
-        "webpack": ">=4.43.0 <6.0.0",
-        "webpack-dev-server": "3.x || 4.x",
-        "webpack-hot-middleware": "2.x",
-        "webpack-plugin-serve": "0.x || 1.x"
+      "bin": {
+        "concurrently": "bin/concurrently.js"
       },
-      "peerDependenciesMeta": {
-        "@types/webpack": {
-          "optional": true
-        },
-        "sockjs-client": {
-          "optional": true
-        },
-        "type-fest": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        },
-        "webpack-hot-middleware": {
-          "optional": true
-        },
-        "webpack-plugin-serve": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "node_modules/concurrently/node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "tslib": "^1.9.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "npm": ">=2.0.0"
       }
     },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+    "node_modules/concurrently/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^5.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "node_modules/consola": {
+      "version": "2.15.3",
+      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
+      "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
+      "dev": true
+    },
+    "node_modules/console.table": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/console.table/-/console.table-0.10.0.tgz",
+      "integrity": "sha1-CRcCVYiHW+/XDPLv9L7yxuLXXQQ=",
       "dev": true,
       "dependencies": {
-        "yocto-queue": "^0.1.0"
+        "easy-table": "1.1.0"
       },
       "engines": {
-        "node": ">=10"
-      },
+        "node": "> 0.10"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/convert-source-map/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/core-js": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
+      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==",
+      "hasInstallScript": true,
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+    "node_modules/core-js-compat": {
+      "version": "3.22.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.5.tgz",
+      "integrity": "sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
+        "browserslist": "^4.20.3",
+        "semver": "7.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+    "node_modules/core-js-compat/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+    "node_modules/core-js-pure": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
+      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
       "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==",
+      "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/@reduxjs/toolkit": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.2.tgz",
-      "integrity": "sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==",
-      "dependencies": {
-        "immer": "^9.0.7",
-        "redux": "^4.1.2",
-        "redux-thunk": "^2.4.1",
-        "reselect": "^4.1.5"
-      },
-      "peerDependencies": {
-        "react": "^16.9.0 || ^17.0.0 || ^18",
-        "react-redux": "^7.2.1 || ^8.0.0-beta"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-redux": {
-          "optional": true
-        }
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/@rollup/plugin-babel": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
-      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
+    "node_modules/cosmiconfig": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@rollup/pluginutils": "^3.1.0"
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
       },
       "engines": {
-        "node": ">= 10.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "@types/babel__core": "^7.1.9",
-        "rollup": "^1.20.0||^2.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/babel__core": {
-          "optional": true
-        }
+        "node": ">=10"
       }
     },
-    "node_modules/@rollup/plugin-node-resolve": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
-      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
-      "dev": true,
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "devOptional": true
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dependencies": {
-        "@rollup/pluginutils": "^3.1.0",
-        "@types/resolve": "1.17.1",
-        "builtin-modules": "^3.1.0",
-        "deepmerge": "^4.2.2",
-        "is-module": "^1.0.0",
-        "resolve": "^1.19.0"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">= 10.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/@rollup/plugin-replace": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
-      "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
+    "node_modules/css": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
+      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
       "dev": true,
       "dependencies": {
-        "@rollup/pluginutils": "^3.1.0",
-        "magic-string": "^0.25.7"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0 || ^2.0.0"
+        "inherits": "^2.0.4",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.6.0"
       }
     },
-    "node_modules/@rollup/pluginutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "0.0.39",
-        "estree-walker": "^1.0.1",
-        "picomatch": "^2.2.2"
-      },
+    "node_modules/css-color-keywords": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=",
       "engines": {
-        "node": ">= 8.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/@rollup/pluginutils/node_modules/@types/estree": {
-      "version": "0.0.39",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-      "dev": true
-    },
-    "node_modules/@rooks/use-outside-click-ref": {
-      "version": "4.11.2",
-      "resolved": "https://registry.npmjs.org/@rooks/use-outside-click-ref/-/use-outside-click-ref-4.11.2.tgz",
-      "integrity": "sha512-w2bCW69zcpLh0KmN/odAuBsQ3sps+73KEu7zMOi0o4YMfDo+tXcqwlTJiLYysd0BEoQC9pNIklzZmI9zZep69g==",
-      "peerDependencies": {
-        "react": ">=16.8.0"
+    "node_modules/css-to-react-native": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz",
+      "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==",
+      "dependencies": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^4.0.2"
       }
     },
-    "node_modules/@rushstack/eslint-patch": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
-      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
+    "node_modules/css.escape": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
+      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
       "dev": true
     },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.23.5",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
-      "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==",
-      "dev": true
+    "node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
     },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-      "dev": true,
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dependencies": {
-        "type-detect": "4.0.8"
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
-      }
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
     },
-    "node_modules/@surma/rollup-plugin-off-main-thread": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
-      "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
-      "dev": true,
-      "dependencies": {
-        "ejs": "^3.1.6",
-        "json5": "^2.2.0",
-        "magic-string": "^0.25.0",
-        "string.prototype.matchall": "^4.0.6"
-      }
+    "node_modules/csstype": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
+      "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
     },
-    "node_modules/@surma/rollup-plugin-off-main-thread/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/damerau-levenshtein": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
+      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
+      "dev": true
     },
-    "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
-      "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
+    "node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-remove-jsx-attribute": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz",
-      "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg==",
-      "dev": true,
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
       }
     },
-    "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz",
-      "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
+    "node_modules/data-urls/node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "dependencies": {
+        "punycode": "^2.1.1"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz",
-      "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ==",
-      "dev": true,
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "node": ">=8"
       }
     },
-    "node_modules/@svgr/babel-plugin-svg-dynamic-title": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz",
-      "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg==",
-      "dev": true,
+    "node_modules/data-urls/node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "node": ">=10.4"
       }
     },
-    "node_modules/@svgr/babel-plugin-svg-em-dimensions": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
-      "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dependencies": {
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-transform-react-native-svg": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz",
-      "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q==",
-      "dev": true,
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
       }
     },
-    "node_modules/@svgr/babel-plugin-transform-svg-component": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
-      "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==",
+    "node_modules/date-fns": {
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
+      "integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=0.11"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
       }
     },
-    "node_modules/@svgr/babel-preset": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
-      "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
-      "dev": true,
-      "dependencies": {
-        "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
-        "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
-        "@svgr/babel-plugin-remove-jsx-empty-expression": "^5.0.1",
-        "@svgr/babel-plugin-replace-jsx-attribute-value": "^5.0.1",
-        "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
-        "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
-        "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
-        "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
+    "node_modules/dayjs": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz",
+      "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw=="
     },
-    "node_modules/@svgr/core": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
-      "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
-        "@svgr/plugin-jsx": "^5.5.0",
-        "camelcase": "^6.2.0",
-        "cosmiconfig": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/@svgr/hast-util-to-babel-ast": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
-      "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
+    "node_modules/decimal.js": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.12.6"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "node": ">=0.10"
       }
     },
-    "node_modules/@svgr/plugin-jsx": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
-      "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@svgr/babel-preset": "^5.5.0",
-        "@svgr/hast-util-to-babel-ast": "^5.5.0",
-        "svg-parser": "^2.0.2"
-      },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@svgr/plugin-svgo": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
-      "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
+    "node_modules/defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
       "dev": true,
       "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "deepmerge": "^4.2.2",
-        "svgo": "^1.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "clone": "^1.0.2"
       }
     },
-    "node_modules/@svgr/webpack": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
-      "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==",
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/plugin-transform-react-constant-elements": "^7.12.1",
-        "@babel/preset-env": "^7.12.1",
-        "@babel/preset-react": "^7.12.5",
-        "@svgr/core": "^5.5.0",
-        "@svgr/plugin-jsx": "^5.5.0",
-        "@svgr/plugin-svgo": "^5.5.0",
-        "loader-utils": "^2.0.0"
+        "object-keys": "^1.0.12"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@testing-library/dom": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
-      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
-        "pretty-format": "^27.0.2"
-      },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/@testing-library/dom/node_modules/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "engines": {
-        "node": ">=6.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@testing-library/dom/node_modules/dom-accessibility-api": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz",
-      "integrity": "sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g=="
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
     },
-    "node_modules/@testing-library/jest-dom": {
-      "version": "5.16.4",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz",
-      "integrity": "sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
-        "aria-query": "^5.0.0",
-        "chalk": "^3.0.0",
-        "css": "^3.0.0",
-        "css.escape": "^1.5.1",
-        "dom-accessibility-api": "^0.5.6",
-        "lodash": "^4.17.15",
-        "redent": "^3.0.0"
-      },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "devOptional": true,
       "engines": {
-        "node": ">=8",
-        "npm": ">=6",
-        "yarn": ">=1"
+        "node": ">=0.3.1"
       }
     },
-    "node_modules/@testing-library/jest-dom/node_modules/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
-      "dev": true,
+    "node_modules/diff-match-patch": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
+      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
+    },
+    "node_modules/diff-sequences": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
       "engines": {
-        "node": ">=6.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/@testing-library/jest-dom/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "path-type": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@testing-library/react": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.2.0.tgz",
-      "integrity": "sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g==",
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
       "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^8.5.0",
-        "@types/react-dom": "^18.0.0"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@testing-library/user-event": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
-      "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
-      "dev": true,
+    "node_modules/dom-accessibility-api": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz",
+      "integrity": "sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==",
+      "dev": true
+    },
+    "node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
       "dependencies": {
-        "@babel/runtime": "^7.12.5"
+        "webidl-conversions": "^5.0.0"
       },
       "engines": {
-        "node": ">=10",
-        "npm": ">=6"
-      },
-      "peerDependencies": {
-        "@testing-library/dom": ">=7.21.4"
+        "node": ">=8"
       }
     },
-    "node_modules/@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-      "dev": true,
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
       }
     },
-    "node_modules/@trysound/sax": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+    "node_modules/dotenv": {
+      "version": "16.0.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",
+      "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==",
       "dev": true,
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
-      "dev": true
-    },
-    "node_modules/@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.1.19",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
+    "node_modules/easy-table": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz",
+      "integrity": "sha1-hvmrTBAvA3G3KXuSplHVgkvIy3M=",
       "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
+      "optionalDependencies": {
+        "wcwidth": ">=1.0.1"
       }
     },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.151",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.151.tgz",
+      "integrity": "sha512-XaG2LpZi9fdiWYOqJh0dJy4SlVywCvpgYXhzOlZTp4JqSKqxn5URqOjbm9OMYB3aInA2GuHQiem1QUOc1yT0Pw=="
     },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
+    "node_modules/emittery": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
+      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.17.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
-      "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.3.0"
-      }
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "dev": true,
       "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
       }
     },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-      "dev": true,
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dependencies": {
-        "@types/node": "*"
+        "is-arrayish": "^0.2.1"
       }
     },
-    "node_modules/@types/connect": {
-      "version": "3.4.34",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz",
-      "integrity": "sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==",
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
       "dev": true,
       "dependencies": {
-        "@types/node": "*"
+        "has": "^1.0.3"
       }
     },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
       "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@types/eslint": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
-      "integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
+    "node_modules/esbuild": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.43.tgz",
+      "integrity": "sha512-Uf94+kQmy/5jsFwKWiQB4hfo/RkM9Dh7b79p8yqd1tshULdr25G2szLz631NoH3s2ujnKEKVD16RmOxvCNKRFA==",
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "esbuild-android-64": "0.14.43",
+        "esbuild-android-arm64": "0.14.43",
+        "esbuild-darwin-64": "0.14.43",
+        "esbuild-darwin-arm64": "0.14.43",
+        "esbuild-freebsd-64": "0.14.43",
+        "esbuild-freebsd-arm64": "0.14.43",
+        "esbuild-linux-32": "0.14.43",
+        "esbuild-linux-64": "0.14.43",
+        "esbuild-linux-arm": "0.14.43",
+        "esbuild-linux-arm64": "0.14.43",
+        "esbuild-linux-mips64le": "0.14.43",
+        "esbuild-linux-ppc64le": "0.14.43",
+        "esbuild-linux-riscv64": "0.14.43",
+        "esbuild-linux-s390x": "0.14.43",
+        "esbuild-netbsd-64": "0.14.43",
+        "esbuild-openbsd-64": "0.14.43",
+        "esbuild-sunos-64": "0.14.43",
+        "esbuild-windows-32": "0.14.43",
+        "esbuild-windows-64": "0.14.43",
+        "esbuild-windows-arm64": "0.14.43"
+      }
+    },
+    "node_modules/esbuild-android-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.43.tgz",
+      "integrity": "sha512-kqFXAS72K6cNrB6RiM7YJ5lNvmWRDSlpi7ZuRZ1hu1S3w0zlwcoCxWAyM23LQUyZSs1PbjHgdbbfYAN8IGh6xg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
+    "node_modules/esbuild-android-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.43.tgz",
+      "integrity": "sha512-bKS2BBFh+7XZY9rpjiHGRNA7LvWYbZWP87pLehggTG7tTaCDvj8qQGOU/OZSjCSKDYbgY7Q+oDw8RlYQ2Jt2BA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-      "dev": true
-    },
-    "node_modules/@types/eventsource": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@types/eventsource/-/eventsource-1.1.8.tgz",
-      "integrity": "sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==",
-      "dev": true
-    },
-    "node_modules/@types/express": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
-      "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
-      "dev": true,
-      "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
+    "node_modules/esbuild-darwin-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.43.tgz",
+      "integrity": "sha512-/3PSilx011ttoieRGkSZ0XV8zjBf2C9enV4ScMMbCT4dpx0mFhMOpFnCHkOK0pWGB8LklykFyHrWk2z6DENVUg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.22",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.22.tgz",
-      "integrity": "sha512-WdqmrUsRS4ootGha6tVwk/IVHM1iorU8tGehftQD2NWiPniw/sm7xdJOIlXLwqdInL9wBw/p7oO8vaYEF3NDmA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*"
+    "node_modules/esbuild-darwin-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.43.tgz",
+      "integrity": "sha512-1HyFUKs8DMCBOvw1Qxpr5Vv/ThNcVIFb5xgXWK3pyT40WPvgYIiRTwJCvNs4l8i5qWF8/CK5bQxJVDjQvtv0Yw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
+    "node_modules/esbuild-freebsd-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.43.tgz",
+      "integrity": "sha512-FNWc05TPHYgaXjbPZO5/rJKSBslfG6BeMSs8GhwnqAKP56eEhvmzwnIz1QcC9cRVyO+IKqWNfmHFkCa1WJTULA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/history": {
-      "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
-      "dev": true
-    },
-    "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
-      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
-      "dependencies": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
+    "node_modules/esbuild-freebsd-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.43.tgz",
+      "integrity": "sha512-amrYopclz3VohqisOPR6hA3GOWA3LZC1WDLnp21RhNmoERmJ/vLnOpnrG2P/Zao+/erKTCUqmrCIPVtj58DRoA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true
-    },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.8",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz",
-      "integrity": "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
+    "node_modules/esbuild-linux-32": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.43.tgz",
+      "integrity": "sha512-KoxoEra+9O3AKVvgDFvDkiuddCds6q71owSQEYwjtqRV7RwbPzKxJa6+uyzUulHcyGVq0g15K0oKG5CFBcvYDw==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
-      "dev": true
-    },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
+    "node_modules/esbuild-linux-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.43.tgz",
+      "integrity": "sha512-EwINwGMyiJMgBby5/SbMqKcUhS5AYAZ2CpEBzSowsJPNBJEdhkCTtEjk757TN/wxgbu3QklqDM6KghY660QCUw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-report": "*"
+    "node_modules/esbuild-linux-arm": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.43.tgz",
+      "integrity": "sha512-e6YzQUoDxxtyamuF12eVzzRC7bbEFSZohJ6igQB9tBqnNmIQY3fI6Cns3z2wxtbZ3f2o6idkD2fQnlvs2902Dg==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.1.tgz",
-      "integrity": "sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==",
-      "dev": true,
-      "dependencies": {
-        "jest-matcher-utils": "^27.0.0",
-        "pretty-format": "^27.0.0"
+    "node_modules/esbuild-linux-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.43.tgz",
+      "integrity": "sha512-UlSpjMWllAc70zYbHxWuDS3FJytyuR/gHJYBr8BICcTNb/TSOYVBg6U7b3jZ3mILTrgzwJUHwhEwK18FZDouUQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
-    },
-    "node_modules/@types/lodash": {
-      "version": "4.14.177",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
-      "dev": true
-    },
-    "node_modules/@types/mime": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "16.11.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==",
-      "dev": true
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/prettier": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
-      "integrity": "sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==",
-      "dev": true
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-    },
-    "node_modules/@types/q": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
-      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
-      "dev": true
-    },
-    "node_modules/@types/qs": {
-      "version": "6.9.6",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz",
-      "integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==",
-      "dev": true
-    },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
-      "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
-      "dev": true
-    },
-    "node_modules/@types/react": {
-      "version": "18.0.9",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz",
-      "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==",
-      "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
+    "node_modules/esbuild-linux-mips64le": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.43.tgz",
+      "integrity": "sha512-f+v8cInPEL1/SDP//CfSYzcDNgE4CY3xgDV81DWm3KAPWzhvxARrKxB1Pstf5mB56yAslJDxu7ryBUPX207EZA==",
+      "cpu": [
+        "mips64el"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/react-datepicker": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.3.4.tgz",
-      "integrity": "sha512-5nTTz37KdTUgMZ1AAxztMWNtEnIMVRo8oCAEhIv0a6uUqDjvSKaMyPRpBV+8chi6f/A8wlTKJIpojpXca2dx3A==",
-      "dev": true,
-      "dependencies": {
-        "@popperjs/core": "^2.9.2",
-        "@types/react": "*",
-        "date-fns": "^2.0.1",
-        "react-popper": "^2.2.5"
+    "node_modules/esbuild-linux-ppc64le": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.43.tgz",
+      "integrity": "sha512-5wZYMDGAL/K2pqkdIsW+I4IR41kyfHr/QshJcNpUfK3RjB3VQcPWOaZmc+74rm4ZjVirYrtz+jWw0SgxtxRanA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/react-dom": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
-      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
-      "dependencies": {
-        "@types/react": "*"
+    "node_modules/esbuild-linux-riscv64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.43.tgz",
+      "integrity": "sha512-lYcAOUxp85hC7lSjycJUVSmj4/9oEfSyXjb/ua9bNl8afonaduuqtw7hvKMoKuYnVwOCDw4RSfKpcnIRDWq+Bw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/react-redux": {
-      "version": "7.1.22",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
-      "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
+    "node_modules/esbuild-linux-s390x": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.43.tgz",
+      "integrity": "sha512-27e43ZhHvhFE4nM7HqtUbMRu37I/4eNSUbb8FGZWszV+uLzMIsHDwLoBiJmw7G9N+hrehNPeQ4F5Ujad0DrUKQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/react-router": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
-      "integrity": "sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==",
-      "dev": true,
-      "dependencies": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*"
+    "node_modules/esbuild-netbsd-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.43.tgz",
+      "integrity": "sha512-2mH4QF6hHBn5zzAfxEI/2eBC0mspVsZ6UVo821LpAJKMvLJPBk3XJO5xwg7paDqSqpl7p6IRrAenW999AEfJhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/react-router-dom": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
-      "dev": true,
-      "dependencies": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*",
-        "@types/react-router": "*"
+    "node_modules/esbuild-openbsd-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.43.tgz",
+      "integrity": "sha512-ZhQpiZjvqCqO8jKdGp9+8k9E/EHSA+zIWOg+grwZasI9RoblqJ1QiZqqi7jfd6ZrrG1UFBNGe4m0NFxCFbMVbg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/redux-mock-store": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/redux-mock-store/-/redux-mock-store-1.0.3.tgz",
-      "integrity": "sha512-Wqe3tJa6x9MxMN4DJnMfZoBRBRak1XTPklqj4qkVm5VBpZnC8PSADf4kLuFQ9NAdHaowfWoEeUMz7NWc2GMtnA==",
-      "dev": true,
-      "dependencies": {
-        "redux": "^4.0.5"
+    "node_modules/esbuild-sunos-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.43.tgz",
+      "integrity": "sha512-DgxSi9DaHReL9gYuul2rrQCAapgnCJkh3LSHPKsY26zytYppG0HgkgVF80zjIlvEsUbGBP/GHQzBtrezj/Zq1Q==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/resolve": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
-      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
+    "node_modules/esbuild-windows-32": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.43.tgz",
+      "integrity": "sha512-Ih3+2O5oExiqm0mY6YYE5dR0o8+AspccQ3vIAtRodwFvhuyGLjb0Hbmzun/F3Lw19nuhPMu3sW2fqIJ5xBxByw==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
-      "dev": true
+    "node_modules/esbuild-windows-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.43.tgz",
+      "integrity": "sha512-8NsuNfI8xwFuJbrCuI+aBqNTYkrWErejFO5aYM+yHqyHuL8mmepLS9EPzAzk8rvfaJrhN0+RvKWAcymViHOKEw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+    "node_modules/esbuild-windows-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.43.tgz",
+      "integrity": "sha512-7ZlD7bo++kVRblJEoG+cepljkfP8bfuTPz5fIXzptwnPaFwGS6ahvfoYzY7WCf5v/1nX2X02HDraVItTgbHnKw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-      "dev": true,
-      "dependencies": {
-        "@types/express": "*"
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/@types/serve-static": {
-      "version": "1.13.10",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
-      "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/mime": "^1",
-        "@types/node": "*"
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-      "dev": true,
+    "node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
       "dependencies": {
-        "@types/node": "*"
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
       }
     },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
-      "dev": true
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "engines": {
+        "node": ">=4.0"
+      }
     },
-    "node_modules/@types/styled-components": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.18.tgz",
-      "integrity": "sha512-xPTYmWP7Mxk5TAD3pYsqjwA9G5fAI8e/S51QUJEl7EQD1siKCdiYXIWiH2lzoHRl+QqbQCJMcGv3YTF3OmyPdQ==",
-      "dev": true,
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
       "dependencies": {
-        "@types/hoist-non-react-statics": "*",
-        "@types/react": "*",
-        "csstype": "^3.0.2"
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/@types/testing-library__jest-dom": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz",
-      "integrity": "sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw==",
-      "dev": true,
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
       "dependencies": {
-        "@types/jest": "*"
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/@types/trusted-types": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
-      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==",
-      "dev": true
-    },
-    "node_modules/@types/uuid": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
-      "dev": true
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
     },
-    "node_modules/@types/yargs": {
-      "version": "17.0.10",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
-      "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
-      "dev": true,
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
-      "dev": true
-    },
-    "node_modules/@types/yup": {
-      "version": "0.29.13",
-      "resolved": "https://registry.npmjs.org/@types/yup/-/yup-0.29.13.tgz",
-      "integrity": "sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g=="
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz",
-      "integrity": "sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ==",
+    "node_modules/eslint": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
+      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.10.0",
-        "@typescript-eslint/type-utils": "5.10.0",
-        "@typescript-eslint/utils": "5.10.0",
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.9.2",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.2",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.1.8",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
         "regexpp": "^3.2.0",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+    "node_modules/eslint-config-airbnb": {
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "eslint-plugin-react-hooks": "^4.3.0"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.23.0.tgz",
-      "integrity": "sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q==",
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/utils": "5.23.0"
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": "^10.12.0 || >=12.0.0"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
-      "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
+    "node_modules/eslint-config-airbnb-base/node_modules/es-abstract": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/visitor-keys": "5.23.0"
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/types": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
-      "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
+    "node_modules/eslint-config-airbnb-base/node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
-      "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
+    "node_modules/eslint-config-airbnb-base/node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/visitor-keys": "5.23.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/utils": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
-      "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
+    "node_modules/eslint-config-airbnb-base/node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.23.0",
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/typescript-estree": "5.23.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
-      "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
+    "node_modules/eslint-config-airbnb-base/node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "eslint-visitor-keys": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/eslint-config-airbnb-base/node_modules/object.entries": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz",
-      "integrity": "sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==",
+    "node_modules/eslint-config-airbnb-typescript": {
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz",
+      "integrity": "sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.27.0",
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/typescript-estree": "5.27.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "eslint-config-airbnb-base": "^15.0.0"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@typescript-eslint/eslint-plugin": "^5.13.0",
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.3"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz",
-      "integrity": "sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==",
+    "node_modules/eslint-config-airbnb/node_modules/es-abstract": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/visitor-keys": "5.27.0"
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz",
-      "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==",
+    "node_modules/eslint-config-airbnb/node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz",
-      "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==",
+    "node_modules/eslint-config-airbnb/node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/visitor-keys": "5.27.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz",
-      "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==",
+    "node_modules/eslint-config-airbnb/node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.27.0",
-        "eslint-visitor-keys": "^3.3.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/eslint-config-airbnb/node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
       "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+    "node_modules/eslint-config-airbnb/node_modules/object.entries": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+    "node_modules/eslint-config-prettier": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
+      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
-        "semver": "bin/semver.js"
+        "eslint-config-prettier": "bin/cli.js"
       },
-      "engines": {
-        "node": ">=10"
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz",
-      "integrity": "sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg==",
+    "node_modules/eslint-config-react-app": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
+      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/visitor-keys": "5.10.0"
+        "@babel/core": "^7.16.0",
+        "@babel/eslint-parser": "^7.16.3",
+        "@rushstack/eslint-patch": "^1.1.0",
+        "@typescript-eslint/eslint-plugin": "^5.5.0",
+        "@typescript-eslint/parser": "^5.5.0",
+        "babel-preset-react-app": "^10.0.1",
+        "confusing-browser-globals": "^1.0.11",
+        "eslint-plugin-flowtype": "^8.0.3",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jest": "^25.3.0",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.27.1",
+        "eslint-plugin-react-hooks": "^4.3.0",
+        "eslint-plugin-testing-library": "^5.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=14.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "peerDependencies": {
+        "eslint": "^8.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz",
-      "integrity": "sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ==",
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/utils": "5.10.0",
-        "debug": "^4.3.2",
-        "tsutils": "^3.21.0"
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-typescript": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz",
+      "integrity": "sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "glob": "^7.2.0",
+        "is-glob": "^4.0.3",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "*",
+        "eslint-plugin-import": "*"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+    "node_modules/eslint-import-resolver-typescript/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -8205,481 +7717,600 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.0.tgz",
-      "integrity": "sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==",
+    "node_modules/eslint-import-resolver-typescript/node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "*"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz",
-      "integrity": "sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA==",
+    "node_modules/eslint-import-resolver-typescript/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint-import-resolver-typescript/node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/visitor-keys": "5.10.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "node": ">=4"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-flowtype": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
+      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "string-natural-compare": "^3.0.1"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">=12.0.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "@babel/plugin-syntax-flow": "^7.14.5",
+        "@babel/plugin-transform-react-jsx": "^7.14.9",
+        "eslint": "^8.1.0"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+    "node_modules/eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
       "dev": true,
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
       },
       "engines": {
-        "node": ">=8.6.0"
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+    "node_modules/eslint-plugin-import/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=10"
+        "node": "*"
       }
     },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.0.tgz",
-      "integrity": "sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg==",
+    "node_modules/eslint-plugin-jest": {
+      "version": "25.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
+      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
       "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.10.0",
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/typescript-estree": "5.10.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
+        "@typescript-eslint/experimental-utils": "^5.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       },
       "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
         "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/eslint-plugin": {
+          "optional": true
+        },
+        "jest": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz",
-      "integrity": "sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ==",
+    "node_modules/eslint-plugin-jest-dom": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-4.0.2.tgz",
+      "integrity": "sha512-Jo51Atwyo2TdcUncjmU+UQeSTKh3sc2LF/M5i/R3nTU0Djw9V65KGJisdm/RtuKhy2KH/r7eQ1n6kwYFPNdHlA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.10.0",
-        "eslint-visitor-keys": "^3.0.0"
+        "@babel/runtime": "^7.16.3",
+        "@testing-library/dom": "^8.11.1",
+        "requireindex": "^1.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
+        "npm": ">=6",
+        "yarn": ">=1"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "peerDependencies": {
+        "eslint": "^6.8.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
-      "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+    "node_modules/eslint-plugin-jest-dom/node_modules/@babel/runtime": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
       "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+        "@babel/runtime": "^7.16.3",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.4",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.3.5",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.7",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.2.1",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/@babel/runtime": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@xtuc/long": "4.2.2"
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/array-includes": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
+      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dev": true,
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
     },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/es-abstract": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
       "dev": true,
       "dependencies": {
-        "@xtuc/long": "4.2.2"
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.1",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/jsx-ast-utils": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz",
+      "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "array-includes": "^3.1.3",
+        "object.assign": "^4.1.2"
+      },
+      "engines": {
+        "node": ">=4.0"
       }
     },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
       "dev": true,
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@xtuc/long": "4.2.2"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+    "node_modules/eslint-plugin-prettier": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
+      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
       "dev": true,
       "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
+        "prettier-linter-helpers": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/ace-builds": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
-      "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
-    },
-    "node_modules/acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-      "bin": {
-        "acorn": "bin/acorn"
+        "node": ">=6.0.0"
       },
-      "engines": {
-        "node": ">=0.4.0"
+      "peerDependencies": {
+        "eslint": ">=7.28.0",
+        "prettier": ">=2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint-config-prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+    "node_modules/eslint-plugin-react": {
+      "version": "7.29.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz",
+      "integrity": "sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==",
       "dev": true,
       "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
+        "array-includes": "^3.1.4",
+        "array.prototype.flatmap": "^1.2.5",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.0",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.3",
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.6"
       },
       "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true,
+        "node": ">=4"
+      },
       "peerDependencies": {
-        "acorn": "^8"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
+      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
       "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
       }
     },
-    "node_modules/acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "dependencies": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/acorn-node/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/address": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.2.0.tgz",
-      "integrity": "sha512-tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig==",
+    "node_modules/eslint-plugin-react/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/adjust-sourcemap-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
+    "node_modules/eslint-plugin-react/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
-        "loader-utils": "^2.0.0",
-        "regex-parser": "^2.2.11"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=8.9"
+        "node": "*"
       }
     },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+    "node_modules/eslint-plugin-react/node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "dev": true,
       "dependencies": {
-        "debug": "4"
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.3",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
+      "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-plugin-react/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.5.0.tgz",
+      "integrity": "sha512-eWQ19l6uWL7LW8oeMyQVSGjVYFnBqk7DMHjadm0yOHBvX3Xi9OBrsNuxoAMdX4r7wlQ5WWpW46d+CB6FWFL/PQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/utils": "^5.13.0"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
+        "npm": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": "^7.5.0 || ^8.0.0"
       }
     },
-    "node_modules/agent-base/node_modules/debug": {
+    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
+      "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.23.0",
+        "@typescript-eslint/visitor-keys": "5.23.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/types": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
+      "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
+      "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.23.0",
+        "@typescript-eslint/visitor-keys": "5.23.0",
+        "debug": "^4.3.2",
+        "globby": "^11.0.4",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/utils": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
+      "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "@typescript-eslint/scope-manager": "5.23.0",
+        "@typescript-eslint/types": "5.23.0",
+        "@typescript-eslint/typescript-estree": "5.23.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
+      "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.23.0",
+        "eslint-visitor-keys": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
@@ -8696,33 +8327,70 @@
         }
       }
     },
-    "node_modules/agent-base/node_modules/ms": {
+    "node_modules/eslint-plugin-testing-library/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-testing-library/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/ajv": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
-      "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
       },
       "funding": {
@@ -8730,406 +8398,596 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+    "node_modules/eslint/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
-        "ajv": "^8.0.0"
+        "ms": "2.1.2"
       },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
+      "engines": {
+        "node": ">=6.0"
       },
       "peerDependenciesMeta": {
-        "ajv": {
+        "supports-color": {
           "optional": true
         }
       }
     },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.21.3"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
       "dev": true,
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+    "node_modules/eslint/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "engines": {
-        "node": ">=8"
+        "node": ">=4.0"
       }
     },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/ansi-styles/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/eslint/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/ansi-styles/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
-    "node_modules/anymatch": {
+    "node_modules/eslint/node_modules/minimatch": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
       "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "*"
       }
     },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+    "node_modules/eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+    "node_modules/espree": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
+      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
       "dev": true,
       "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
+        "acorn": "^8.7.1",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/array-includes/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/array-includes/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
+        "estraverse": "^5.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10"
       }
     },
-    "node_modules/array-includes/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
       }
     },
-    "node_modules/array-includes/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4.0"
       }
     },
-    "node_modules/array-includes/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4.0"
       }
     },
-    "node_modules/array-includes/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4.0"
       }
     },
-    "node_modules/array-includes/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/array-includes/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "@jest/types": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/array-includes/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+    "node_modules/expect/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/expect/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/expect/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/array-includes/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/array-includes/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "dev": true
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/array-includes/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "dev": true
+    },
+    "node_modules/fastq": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
+      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fetch-mock": {
+      "version": "9.11.0",
+      "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.11.0.tgz",
+      "integrity": "sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==",
+      "dependencies": {
+        "@babel/core": "^7.0.0",
+        "@babel/runtime": "^7.0.0",
+        "core-js": "^3.0.0",
+        "debug": "^4.1.1",
+        "glob-to-regexp": "^0.4.0",
+        "is-subset": "^0.1.1",
+        "lodash.isequal": "^4.5.0",
+        "path-to-regexp": "^2.2.1",
+        "querystring": "^0.2.0",
+        "whatwg-url": "^6.5.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=4.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "charity",
+        "url": "https://www.justgiving.com/refugee-support-europe"
+      },
+      "peerDependencies": {
+        "node-fetch": "*"
+      },
+      "peerDependenciesMeta": {
+        "node-fetch": {
+          "optional": true
+        }
       }
     },
-    "node_modules/array-includes/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+    "node_modules/fetch-mock-jest": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/fetch-mock-jest/-/fetch-mock-jest-1.5.1.tgz",
+      "integrity": "sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "fetch-mock": "^9.11.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "charity",
+        "url": "https://www.justgiving.com/refugee-support-europe"
+      },
+      "peerDependencies": {
+        "node-fetch": "*"
+      },
+      "peerDependenciesMeta": {
+        "node-fetch": {
+          "optional": true
+        }
       }
     },
-    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+    "node_modules/fetch-mock/node_modules/debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "ms": "2.1.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/array-includes/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+    "node_modules/fetch-mock/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/fetch-mock/node_modules/path-to-regexp": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz",
+      "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w=="
+    },
+    "node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+    "node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
+      "dev": true
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/format-util": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz",
+      "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9138,10 +8996,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/es-abstract": {
+    "node_modules/function.prototype.name/node_modules/es-abstract": {
       "version": "1.20.0",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
       "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
@@ -9174,18 +9033,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/has-bigints": {
+    "node_modules/function.prototype.name/node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
       "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/has-symbols": {
+    "node_modules/function.prototype.name/node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -9193,10 +9054,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/is-callable": {
+    "node_modules/function.prototype.name/node_modules/is-callable": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
       "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -9204,10 +9066,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/is-negative-zero": {
+    "node_modules/function.prototype.name/node_modules/is-negative-zero": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
       "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -9215,10 +9078,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/is-regex": {
+    "node_modules/function.prototype.name/node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
       "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -9230,10 +9094,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/is-shared-array-buffer": {
+    "node_modules/function.prototype.name/node_modules/is-shared-array-buffer": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
       "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2"
       },
@@ -9241,10 +9106,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/is-string": {
+    "node_modules/function.prototype.name/node_modules/is-string": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
       "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -9255,10 +9121,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/is-weakref": {
+    "node_modules/function.prototype.name/node_modules/is-weakref": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
       "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2"
       },
@@ -9266,18 +9133,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/object-inspect": {
+    "node_modules/function.prototype.name/node_modules/object-inspect": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
       "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/regexp.prototype.flags": {
+    "node_modules/function.prototype.name/node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
       "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
@@ -9290,10 +9159,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimend": {
+    "node_modules/function.prototype.name/node_modules/string.prototype.trimend": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
       "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -9303,10 +9173,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimend/node_modules/define-properties": {
+    "node_modules/function.prototype.name/node_modules/string.prototype.trimend/node_modules/define-properties": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
       "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
       "dependencies": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -9318,10 +9189,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimstart": {
+    "node_modules/function.prototype.name/node_modules/string.prototype.trimstart": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
       "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -9331,10 +9203,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimstart/node_modules/define-properties": {
+    "node_modules/function.prototype.name/node_modules/string.prototype.trimstart/node_modules/define-properties": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
       "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
       "dependencies": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -9346,10 +9219,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/unbox-primitive": {
+    "node_modules/function.prototype.name/node_modules/unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
       "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-bigints": "^1.0.2",
@@ -9360,87 +9234,79 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "has-symbols": "^1.0.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "engines": {
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -9448,121 +9314,150 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
+    "node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": "*"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "is-glob": "^4.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 6"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+    "node_modules/glob-regex": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/glob-regex/-/glob-regex-0.3.2.tgz",
+      "integrity": "sha512-m5blUd3/OqDTWwzBBtWBPrGlAzatRywHameHeekAZyZrskYouOGdNB8T/q6JucucvJXtOuyHIn0/Yia7iDasDw=="
+    },
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+    },
+    "node_modules/globals": {
+      "version": "13.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
+      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
+    "node_modules/globrex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
+      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "function-bind": "^1.1.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.4.0"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "get-intrinsic": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+    "node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
       "dev": true,
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "has-symbols": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9571,2451 +9466,2272 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
+    "node_modules/history": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
+      "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@babel/runtime": "^7.7.6"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=10"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
+    "node_modules/http-proxy-agent/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true
+    "node_modules/http-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 6"
       }
     },
-    "node_modules/async": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-      "dev": true
+    "node_modules/https-proxy-agent/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
+    "node_modules/https-proxy-agent/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "node_modules/at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true,
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">=10.17.0"
       }
     },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+    "node_modules/husky": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz",
+      "integrity": "sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==",
       "dev": true,
       "bin": {
-        "atob": "bin/atob.js"
+        "husky": "lib/bin.js"
       },
       "engines": {
-        "node": ">= 4.5.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
       }
     },
-    "node_modules/autoprefixer": {
-      "version": "10.4.7",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
-      "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        }
-      ],
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dependencies": {
-        "browserslist": "^4.20.3",
-        "caniuse-lite": "^1.0.30001335",
-        "fraction.js": "^4.2.0",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
+        "safer-buffer": ">= 2.1.2 < 3"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/autoprefixer/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true,
       "funding": [
         {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
         },
         {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
         }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/autoprefixer/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/autoprefixer/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/autoprefixer/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
+      ]
     },
-    "node_modules/axe-core": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz",
-      "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==",
+    "node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">= 4"
       }
     },
-    "node_modules/axios": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
-      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
-      "dev": true,
-      "dependencies": {
-        "follow-redirects": "^1.14.8"
+    "node_modules/immer": {
+      "version": "9.0.12",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz",
+      "integrity": "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
       }
     },
-    "node_modules/axobject-query": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true
+    "node_modules/immutable": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
     },
-    "node_modules/babel-jest": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.0.tgz",
-      "integrity": "sha512-zNKk0yhDZ6QUwfxh9k07GII6siNGMJWVUU49gmFj5gfdqDKLqa2RArXOF2CODp4Dr7dLxN2cvAV+667dGJ4b4w==",
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@jest/transform": "^28.1.0",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^28.0.2",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=6"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-loader": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
-      "dev": true,
+    "node_modules/import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
       "dependencies": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
       },
-      "engines": {
-        "node": ">= 8.9"
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "webpack": ">=2"
-      }
-    },
-    "node_modules/babel-loader/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-loader/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "engines": {
+        "node": ">=0.8.19"
+      }
     },
-    "node_modules/babel-loader/node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
       "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dependencies": {
-        "object.assign": "^4.1.0"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/inquirer": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.2.tgz",
+      "integrity": "sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.1",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.21",
+        "mute-stream": "0.0.8",
+        "ora": "^5.4.1",
+        "run-async": "^2.4.0",
+        "rxjs": "^7.5.5",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.0.2.tgz",
-      "integrity": "sha512-Kizhn/ZL+68ZQHxSnHyuvJv8IchXD62KQxV77TBDV/xoBFBOfgRAk97GNs6hXdTTCiVES9nB2I6+7MXXrk5llQ==",
+    "node_modules/inquirer/node_modules/rxjs": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "tslib": "^2.1.0"
       }
     },
-    "node_modules/babel-plugin-macros": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+    "node_modules/inquirer/node_modules/tslib": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+      "dev": true
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
       "dev": true,
       "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "cosmiconfig": "^7.0.0",
-        "resolve": "^1.19.0"
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
       },
       "engines": {
-        "node": ">=10",
-        "npm": ">=6"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/babel-plugin-named-asset-import": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz",
-      "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==",
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
+      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
       "dev": true,
-      "peerDependencies": {
-        "@babel/core": "^7.1.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
-      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
-      "dev": true,
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dependencies": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "semver": "^6.1.1"
+        "binary-extensions": "^2.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
-      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+    "node_modules/is-boolean-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
+      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.21.0"
+        "call-bind": "^1.0.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+    "node_modules/is-callable": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
+      "engines": {
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-plugin-styled-components": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz",
-      "integrity": "sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==",
+    "node_modules/is-core-module": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-module-imports": "^7.0.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "lodash": "^4.17.11"
+        "has": "^1.0.3"
       },
-      "peerDependencies": {
-        "styled-components": ">= 2"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
-    },
-    "node_modules/babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==",
-      "dev": true
-    },
-    "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+    "node_modules/is-date-object": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
+      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
       "dev": true,
-      "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      "engines": {
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-preset-jest": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.0.2.tgz",
-      "integrity": "sha512-sYzXIdgIXXroJTFeB3S6sNDWtlJ2dllCdTEsnZ65ACrMojj3hVNFRmnJ1HZtomGi+Be7aqpY/HJ92fr8OhKVkQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^28.0.2",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/babel-preset-react-app": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
-      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-proposal-class-properties": "^7.16.0",
-        "@babel/plugin-proposal-decorators": "^7.16.4",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-private-methods": "^7.16.0",
-        "@babel/plugin-transform-flow-strip-types": "^7.16.0",
-        "@babel/plugin-transform-react-display-name": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.4",
-        "@babel/preset-env": "^7.16.4",
-        "@babel/preset-react": "^7.16.0",
-        "@babel/preset-typescript": "^7.16.0",
-        "@babel/runtime": "^7.16.3",
-        "babel-plugin-macros": "^3.1.0",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dev": true,
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/compat-data": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
       "dev": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/core": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.10.tgz",
-      "integrity": "sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA==",
+    "node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
       "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-compilation-targets": "^7.17.10",
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helpers": "^7.17.9",
-        "@babel/parser": "^7.17.10",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
-      },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=0.12.0"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helper-compilation-targets": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-      "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
+    "node_modules/is-number-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
+      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
       "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.20.2",
-        "semver": "^6.3.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
       "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+    "node_modules/is-string": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
+      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
+    "node_modules/is-subset": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
+      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY="
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
+        "has-symbols": "^1.0.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helper-simple-access": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+    "node_modules/is-weakref": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
+      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
+        "call-bind": "^1.0.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-      "dev": true,
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/helpers": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
-      "dev": true,
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
+      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.9",
-        "@babel/types": "^7.17.0"
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/runtime": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
-      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-      "dev": true,
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=10"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
+    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/babel-preset-react-app/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "node": ">=6.0"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
+    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
+      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/iterare": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/iterare/-/iterare-1.2.1.tgz",
+      "integrity": "sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
+    "node_modules/jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
+      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
+        "@jest/core": "^27.5.1",
+        "import-local": "^3.0.2",
+        "jest-cli": "^27.5.1"
       },
       "bin": {
-        "browserslist": "cli.js"
+        "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+    "node_modules/jest-changed-files": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
+      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@jest/types": "^27.5.1",
+        "execa": "^5.0.0",
+        "throat": "^6.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
+    "node_modules/jest-changed-files/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "ms": "2.1.2"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/babel-preset-react-app/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/jest-changed-files/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
+    "node_modules/jest-circus": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
+      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3",
+        "throat": "^6.0.1"
+      },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
+    "node_modules/jest-circus/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/babel-preset-react-app/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/babel-preset-react-app/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/babel-preset-react-app/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/babel-preset-react-app/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+    "node_modules/jest-circus/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
-    },
-    "node_modules/bfj": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz",
-      "integrity": "sha512-+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw==",
-      "dev": true,
+    "node_modules/jest-circus/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "bluebird": "^3.5.5",
-        "check-types": "^11.1.1",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
-      "engines": {
-        "node": ">=0.6"
+    "node_modules/jest-circus/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true,
+    "node_modules/jest-circus/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
       "engines": {
-        "node": "*"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+    "node_modules/jest-circus/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
+    "node_modules/jest-cli": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
+      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
       "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
+        "@jest/core": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "prompts": "^2.0.1",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
-      "dev": true,
+    "node_modules/jest-cli/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
       "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.10.3",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
+    "node_modules/jest-cli/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/bonjour-service": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.12.tgz",
-      "integrity": "sha512-pMmguXYCu63Ug37DluMKEHdxc+aaIf/ay4YbF8Gxtba+9d3u+rmEWy61VK3Z3hp8Rskok3BunHYnG0dUHAsblw==",
-      "dev": true,
+    "node_modules/jest-cli/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.4"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+    "node_modules/jest-cli/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+    "node_modules/jest-cli/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/broadcast-channel": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
-      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
-      "dependencies": {
-        "@babel/runtime": "^7.7.2",
-        "detect-node": "^2.1.0",
-        "js-sha3": "0.8.0",
-        "microseconds": "0.2.0",
-        "nano-time": "1.0.0",
-        "oblivious-set": "1.0.0",
-        "rimraf": "3.0.2",
-        "unload": "2.2.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
-    },
-    "node_modules/browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+    "node_modules/jest-cli/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      },
-      "bin": {
-        "browserslist": "cli.js"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/browserslist"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-      "dev": true,
+    "node_modules/jest-config": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
+      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
       "dependencies": {
-        "fast-json-stable-stringify": "2.x"
+        "@babel/core": "^7.8.0",
+        "@jest/test-sequencer": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "babel-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-jasmine2": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">= 6"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
+    "node_modules/jest-config/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "node-int64": "^0.4.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
+    "node_modules/jest-config/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "node_modules/builtin-modules": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+    "node_modules/jest-config/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/bulma": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.3.tgz",
-      "integrity": "sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g=="
-    },
-    "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "dev": true,
       "engines": {
-        "node": ">= 0.8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+    "node_modules/jest-diff": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "engines": {
-        "node": ">=6"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
+    "node_modules/jest-docblock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
+      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
       "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/camel-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
-    "node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
+    "node_modules/jest-each": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
+      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/camelcase-css": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-      "dev": true,
+    "node_modules/jest-each/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 6"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/camelize": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
-    },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dev": true,
+    "node_modules/jest-each/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001344",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz",
-      "integrity": "sha512-0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        }
-      ]
-    },
-    "node_modules/case-sensitive-paths-webpack-plugin": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
-      "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
-      "dev": true,
+    "node_modules/jest-each/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+    "node_modules/jest-environment-jsdom": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
+      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jsdom": "^16.6.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "dev": true,
+    "node_modules/jest-environment-jsdom/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/charcodes": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
-      "integrity": "sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+    "node_modules/jest-environment-jsdom/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "node_modules/check-types": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
-      "integrity": "sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ==",
-      "dev": true
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+    "node_modules/jest-environment-jsdom/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true,
+    "node_modules/jest-environment-node": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
+      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
+      },
       "engines": {
-        "node": ">=6.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/ci-info": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.1.tgz",
-      "integrity": "sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==",
-      "dev": true
-    },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
-      "dev": true
-    },
-    "node_modules/classnames": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
-    },
-    "node_modules/clean-css": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
-      "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==",
-      "dev": true,
+    "node_modules/jest-environment-node/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "source-map": "~0.6.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">= 10.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+    "node_modules/jest-environment-node/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
+    "node_modules/jest-environment-node/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "restore-cursor": "^3.1.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
-      "dev": true,
+    "node_modules/jest-get-type": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/cli-truncate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
-      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
-      "dev": true,
+    "node_modules/jest-haste-map": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
+      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
       "dependencies": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
+        "@jest/types": "^27.5.1",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^27.5.1",
+        "jest-serializer": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.7"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "node_modules/cli-truncate/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
+    "node_modules/jest-haste-map/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/cli-truncate/node_modules/ansi-styles": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
-      "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
-      "dev": true,
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/cli-truncate/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/cli-truncate/node_modules/is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "node_modules/jest-haste-map/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/cli-truncate/node_modules/slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
-      "dev": true,
+    "node_modules/jest-haste-map/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/cli-truncate/node_modules/string-width": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.0.1.tgz",
-      "integrity": "sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==",
-      "dev": true,
+    "node_modules/jest-jasmine2": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
+      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
       "dependencies": {
-        "emoji-regex": "^9.2.2",
-        "is-fullwidth-code-point": "^4.0.0",
-        "strip-ansi": "^7.0.1"
+        "@jest/environment": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "throat": "^6.0.1"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/cli-truncate/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dev": true,
+    "node_modules/jest-jasmine2/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-jasmine2/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+      "dependencies": {
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
+    "node_modules/jest-jasmine2/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
+    "node_modules/jest-jasmine2/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true,
+    "node_modules/jest-jasmine2/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
       "engines": {
-        "node": ">=0.8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "dev": true,
+    "node_modules/jest-jasmine2/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
       "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
+    "node_modules/jest-leak-detector": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
+      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
       "dependencies": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">= 4.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/coa/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+    "node_modules/jest-matcher-utils": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "chalk": "^4.0.0",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/coa/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+    "node_modules/jest-message-util": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.0.tgz",
+      "integrity": "sha512-RpA8mpaJ/B2HphDMiDlrAZdDytkmwFqgjDZovM21F35lHGeUeCvYmm6W+sbQ0ydaLpg5bFAUuWG1cjqOl8vqrw==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^28.1.0",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^28.1.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/coa/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/coa/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
+    "node_modules/jest-message-util/node_modules/pretty-format": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
+      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-      "dev": true
+    "node_modules/jest-message-util/node_modules/react-is": {
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
+      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg=="
     },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "node_modules/jest-mock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
       "dependencies": {
-        "color-name": "1.1.3"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/colord": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
-      "dev": true
-    },
-    "node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
+    "node_modules/jest-mock/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "delayed-stream": "~1.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12"
+    "node_modules/jest-mock/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/common-path-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-      "dev": true
-    },
-    "node_modules/common-tags": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
-      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
-      "dev": true,
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "node_modules/compare-versions": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-4.1.3.tgz",
-      "integrity": "sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==",
-      "dev": true
+    "node_modules/jest-regex-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
     },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
+    "node_modules/jest-resolve": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
+      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
       "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
+    "node_modules/jest-resolve-dependencies": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
+      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
+        "@jest/types": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-snapshot": "^27.5.1"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "node_modules/concurrently": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.5.1.tgz",
-      "integrity": "sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==",
-      "dev": true,
+    "node_modules/jest-resolve-dependencies/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "chalk": "^4.1.0",
-        "date-fns": "^2.16.1",
-        "lodash": "^4.17.21",
-        "rxjs": "^6.6.3",
-        "spawn-command": "^0.0.2-1",
-        "supports-color": "^8.1.0",
-        "tree-kill": "^1.2.2",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "concurrently": "bin/concurrently.js"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/concurrently/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
+    "node_modules/jest-resolve-dependencies/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/concurrently/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
+    "node_modules/jest-resolve/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "node_modules/connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
+    "node_modules/jest-resolve/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/consola": {
-      "version": "2.15.3",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
-      "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
-      "dev": true
-    },
-    "node_modules/console.table": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/console.table/-/console.table-0.10.0.tgz",
-      "integrity": "sha1-CRcCVYiHW+/XDPLv9L7yxuLXXQQ=",
-      "dev": true,
+    "node_modules/jest-resolve/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "easy-table": "1.1.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "> 0.10"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
+    "node_modules/jest-runner": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
+      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
       "dependencies": {
-        "safe-buffer": "5.2.1"
+        "@jest/console": "^27.5.1",
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-leak-detector": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "source-map-support": "^0.5.6",
+        "throat": "^6.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true,
+    "node_modules/jest-runner/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+    "node_modules/jest-runner/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
       "dependencies": {
-        "safe-buffer": "~5.1.1"
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/convert-source-map/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-      "dev": true,
+    "node_modules/jest-runner/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
-    },
-    "node_modules/core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
-      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+    "node_modules/jest-runner/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/core-js-compat": {
-      "version": "3.22.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.5.tgz",
-      "integrity": "sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.20.3",
-        "semver": "7.0.0"
+    "node_modules/jest-runner/node_modules/emittery": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/core-js-compat/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
+    "node_modules/jest-runner/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/core-js-compat/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/core-js-compat/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/jest-runner/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/core-js-pure": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
-      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+    "node_modules/jest-runtime": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
+      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+      "dependencies": {
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/globals": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dev": true,
+    "node_modules/jest-runtime/node_modules/@jest/console": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
       "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+    "node_modules/jest-runtime/node_modules/@jest/test-result": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "@jest/console": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true,
+    "node_modules/jest-runtime/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
+    "node_modules/jest-runtime/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/css-blank-pseudo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
-      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
-      "dev": true,
+    "node_modules/jest-runtime/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "bin": {
-        "css-blank-pseudo": "dist/cli.cjs"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/css-color-keywords": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=",
+    "node_modules/jest-runtime/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
       "engines": {
-        "node": ">=4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/css-declaration-sorter": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz",
-      "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==",
-      "dev": true,
+    "node_modules/jest-runtime/node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
+        "node": ">=8"
       }
     },
-    "node_modules/css-has-pseudo": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
-      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
-      "dev": true,
+    "node_modules/jest-serializer": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
+      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "bin": {
-        "css-has-pseudo": "dist/cli.cjs"
+        "@types/node": "*",
+        "graceful-fs": "^4.2.9"
       },
       "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/css-loader": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-      "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
-      "dev": true,
+    "node_modules/jest-snapshot": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
       "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.7",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.5"
+        "@babel/core": "^7.7.2",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.0.0",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^27.5.1",
+        "semver": "^7.3.2"
       },
       "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
       },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/css-loader/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
+    "node_modules/jest-snapshot/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
     },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
+    "node_modules/jest-snapshot/node_modules/jest-message-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
       "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.5.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
-      "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
-      "dev": true,
+    "node_modules/jest-snapshot/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
       "dependencies": {
-        "cssnano": "^5.0.6",
-        "jest-worker": "^27.0.2",
-        "postcss": "^8.3.5",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@parcel/css": {
-          "optional": true
-        },
-        "clean-css": {
-          "optional": true
-        },
-        "csso": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        }
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+    "node_modules/jest-sonar-reporter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jest-sonar-reporter/-/jest-sonar-reporter-2.0.0.tgz",
+      "integrity": "sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.3"
+        "xml": "^1.0.1"
       },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
+      "engines": {
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+    "node_modules/jest-styled-components": {
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/jest-styled-components/-/jest-styled-components-7.0.8.tgz",
+      "integrity": "sha512-0KE54d0yIzKcvtOv8eikyjG3rFRtKYUyQovaoha3nondtZzXYGB3bhsvYgEegU08Iry0ndWx2+g9f5ZzD4I+0Q==",
       "dev": true,
       "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "css": "^3.0.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 12"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+      "peerDependencies": {
+        "styled-components": ">= 5"
       }
     },
-    "node_modules/css-prefers-color-scheme": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
-      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true,
-      "bin": {
-        "css-prefers-color-scheme": "dist/cli.cjs"
+    "node_modules/jest-util": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.0.tgz",
+      "integrity": "sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA==",
+      "dependencies": {
+        "@jest/types": "^28.1.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dev": true,
+    "node_modules/jest-validate": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
+      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
       "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
+        "@jest/types": "^27.5.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "leven": "^3.1.0",
+        "pretty-format": "^27.5.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true
+    "node_modules/jest-validate/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
     },
-    "node_modules/css-to-react-native": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz",
-      "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==",
+    "node_modules/jest-validate/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
       "dependencies": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dev": true,
+    "node_modules/jest-watch-typeahead": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
+      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
       "dependencies": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
+        "ansi-escapes": "^4.3.1",
+        "chalk": "^4.0.0",
+        "jest-regex-util": "^28.0.0",
+        "jest-watcher": "^28.0.0",
+        "slash": "^4.0.0",
+        "string-length": "^5.0.1",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "jest": "^27.0.0 || ^28.0.0"
       }
     },
-    "node_modules/css-what": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-      "dev": true,
+    "node_modules/jest-watch-typeahead/node_modules/jest-regex-util": {
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
+      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
       "engines": {
-        "node": ">= 6"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "engines": {
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/fb55"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/css.escape": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
-      "dev": true
-    },
-    "node_modules/cssdb": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.6.1.tgz",
-      "integrity": "sha512-0/nZEYfp8SFEzJkMud8NxZJsGfD7RHDJti6GRBLZptIwAzco6RTx1KgwFl4mGWsYS0ZNbCrsY9QryhQ4ldF3Mg==",
-      "dev": true,
+    "node_modules/jest-watch-typeahead/node_modules/string-length": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
+      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+      "dependencies": {
+        "char-regex": "^2.0.0",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
+    "node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
+      "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
       "engines": {
-        "node": ">=4"
+        "node": ">=12.20"
       }
     },
-    "node_modules/cssnano": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.7.tgz",
-      "integrity": "sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==",
-      "dev": true,
+    "node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
       "dependencies": {
-        "cssnano-preset-default": "^5.2.7",
-        "lilconfig": "^2.0.3",
-        "yaml": "^1.10.2"
+        "ansi-regex": "^6.0.1"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=12"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/cssnano"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/cssnano-preset-default": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz",
-      "integrity": "sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==",
-      "dev": true,
-      "dependencies": {
-        "css-declaration-sorter": "^6.2.2",
-        "cssnano-utils": "^3.1.0",
-        "postcss-calc": "^8.2.3",
-        "postcss-colormin": "^5.3.0",
-        "postcss-convert-values": "^5.1.0",
-        "postcss-discard-comments": "^5.1.1",
-        "postcss-discard-duplicates": "^5.1.0",
-        "postcss-discard-empty": "^5.1.1",
-        "postcss-discard-overridden": "^5.1.0",
-        "postcss-merge-longhand": "^5.1.4",
-        "postcss-merge-rules": "^5.1.1",
-        "postcss-minify-font-values": "^5.1.0",
-        "postcss-minify-gradients": "^5.1.1",
-        "postcss-minify-params": "^5.1.2",
-        "postcss-minify-selectors": "^5.2.0",
-        "postcss-normalize-charset": "^5.1.0",
-        "postcss-normalize-display-values": "^5.1.0",
-        "postcss-normalize-positions": "^5.1.0",
-        "postcss-normalize-repeat-style": "^5.1.0",
-        "postcss-normalize-string": "^5.1.0",
-        "postcss-normalize-timing-functions": "^5.1.0",
-        "postcss-normalize-unicode": "^5.1.0",
-        "postcss-normalize-url": "^5.1.0",
-        "postcss-normalize-whitespace": "^5.1.1",
-        "postcss-ordered-values": "^5.1.1",
-        "postcss-reduce-initial": "^5.1.0",
-        "postcss-reduce-transforms": "^5.1.0",
-        "postcss-svgo": "^5.1.0",
-        "postcss-unique-selectors": "^5.1.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/cssnano-utils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-      "dev": true,
+    "node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=12"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
+    "node_modules/jest-watcher": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.0.tgz",
+      "integrity": "sha512-tNHMtfLE8Njcr2IRS+5rXYA4BhU90gAOwI9frTGOqd+jX0P/Au/JfRSNqsf5nUTcWdbVYuLxS1KjnzILSoR5hA==",
       "dependencies": {
-        "css-tree": "^1.1.2"
+        "@jest/test-result": "^28.1.0",
+        "@jest/types": "^28.1.0",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.10.2",
+        "jest-util": "^28.1.0",
+        "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dev": true,
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true
-    },
-    "node_modules/cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-      "dev": true
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dependencies": {
-        "cssom": "~0.3.6"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
+    "node_modules/js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
     },
-    "node_modules/csstype": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
-      "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
-    "node_modules/damerau-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-      "dev": true
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
     },
-    "node_modules/data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-      "dev": true,
+    "node_modules/jsdom": {
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
       "dependencies": {
-        "abab": "^2.0.3",
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
       },
       "engines": {
         "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
-    "node_modules/data-urls/node_modules/tr46": {
+    "node_modules/jsdom/node_modules/tr46": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
       "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-      "dev": true,
       "dependencies": {
         "punycode": "^2.1.1"
       },
@@ -12023,20 +11739,18 @@
         "node": ">=8"
       }
     },
-    "node_modules/data-urls/node_modules/webidl-conversions": {
+    "node_modules/jsdom/node_modules/webidl-conversions": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-      "dev": true,
       "engines": {
         "node": ">=10.4"
       }
     },
-    "node_modules/data-urls/node_modules/whatwg-url": {
+    "node_modules/jsdom/node_modules/whatwg-url": {
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
       "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-      "dev": true,
       "dependencies": {
         "lodash": "^4.7.0",
         "tr46": "^2.1.0",
@@ -12046,809 +11760,779 @@
         "node": ">=10"
       }
     },
-    "node_modules/date-fns": {
-      "version": "2.23.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
-      "integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.11"
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/dayjs": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz",
-      "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw=="
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/json-schema-faker": {
+      "version": "0.5.0-rcv.40",
+      "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.5.0-rcv.40.tgz",
+      "integrity": "sha512-BczZvu03jKrGh3ovCWrHusiX6MwiaKK2WZeyomKBNA8Nm/n7aBYz0mub1CnONB6cgxOZTNxx4afNmLblbUmZbA==",
       "dependencies": {
-        "ms": "2.0.0"
+        "json-schema-ref-parser": "^6.1.0",
+        "jsonpath-plus": "^5.1.0"
+      },
+      "bin": {
+        "jsf": "bin/gen.js"
       }
     },
-    "node_modules/decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-      "dev": true
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
+    "node_modules/json-schema-ref-parser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz",
+      "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==",
+      "dependencies": {
+        "call-me-maybe": "^1.0.1",
+        "js-yaml": "^3.12.1",
+        "ono": "^4.0.11"
       }
     },
-    "node_modules/dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
-      "dev": true
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
     },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+    "node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "dependencies": {
-        "execa": "^5.0.0"
+        "minimist": "^1.2.0"
       },
-      "engines": {
-        "node": ">= 10"
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
       "dependencies": {
-        "clone": "^1.0.2"
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true,
+    "node_modules/jsonpath-plus": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-5.1.0.tgz",
+      "integrity": "sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ==",
       "engines": {
-        "node": ">=8"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
+      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
+      "dev": true,
       "dependencies": {
-        "object-keys": "^1.0.12"
+        "array-includes": "^3.1.4",
+        "object.assign": "^4.1.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=4.0"
       }
     },
-    "node_modules/defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/language-subtag-registry": {
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
+      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
       "dev": true
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+    "node_modules/language-tags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
+      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
       "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
+      "dependencies": {
+        "language-subtag-registry": "~0.3.2"
       }
     },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true,
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=6"
       }
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
       "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+    "node_modules/lilconfig": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
+      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
-    "node_modules/detect-port-alt": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
+    "node_modules/lint-staged": {
+      "version": "12.1.2",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.1.2.tgz",
+      "integrity": "sha512-bSMcQVqMW98HLLLR2c2tZ+vnDCnx4fd+0QJBQgN/4XkdspGRPc8DGp7UuOEBe1ApCfJ+wXXumYnJmU+wDo7j9A==",
       "dev": true,
       "dependencies": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
+        "cli-truncate": "^3.1.0",
+        "colorette": "^2.0.16",
+        "commander": "^8.3.0",
+        "debug": "^4.3.2",
+        "enquirer": "^2.3.6",
+        "execa": "^5.1.1",
+        "lilconfig": "2.0.4",
+        "listr2": "^3.13.3",
+        "micromatch": "^4.0.4",
+        "normalize-path": "^3.0.0",
+        "object-inspect": "^1.11.0",
+        "string-argv": "^0.3.1",
+        "supports-color": "^9.0.2",
+        "yaml": "^1.10.2"
       },
       "bin": {
-        "detect": "bin/detect-port",
-        "detect-port": "bin/detect-port"
+        "lint-staged": "bin/lint-staged.js"
       },
       "engines": {
-        "node": ">= 4.2.1"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/lint-staged"
       }
     },
-    "node_modules/detective": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
-      "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
+    "node_modules/lint-staged/node_modules/colorette": {
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
+      "dev": true
+    },
+    "node_modules/lint-staged/node_modules/debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
       "dev": true,
       "dependencies": {
-        "acorn-node": "^1.6.1",
-        "defined": "^1.0.0",
-        "minimist": "^1.1.1"
-      },
-      "bin": {
-        "detective": "bin/detective.js"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/didyoumean": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+    "node_modules/lint-staged/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+    "node_modules/lint-staged/node_modules/object-inspect": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
       "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/diff-match-patch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
-      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
-    },
-    "node_modules/diff-sequences": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.0.2.tgz",
-      "integrity": "sha512-YtEoNynLDFCRznv/XDalsKGSZDoj0U5kLnXvY0JSq3nBboRrZXjD81+eSiwi+nzcZDwedMmcowcxNwwgFW23mQ==",
+    "node_modules/lint-staged/node_modules/supports-color": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.1.tgz",
+      "integrity": "sha512-Obv7ycoCTG51N7y175StI9BlAXrmgZrFhZOb0/PyjHBher/NmsdBgbbQ1Inhq+gIhz6+7Gb+jWF2Vqi7Mf1xnQ==",
       "dev": true,
-      "peer": true,
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "node_modules/listr2": {
+      "version": "3.13.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.5.tgz",
+      "integrity": "sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA==",
       "dev": true,
       "dependencies": {
-        "path-type": "^4.0.0"
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.4.0",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "enquirer": ">= 2.3.0 < 3"
+      },
+      "peerDependenciesMeta": {
+        "enquirer": {
+          "optional": true
+        }
       }
     },
-    "node_modules/dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-      "dev": true
-    },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-      "dev": true
-    },
-    "node_modules/dns-packet": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.3.1.tgz",
-      "integrity": "sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw==",
+    "node_modules/listr2/node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
       "dependencies": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dependencies": {
-        "esutils": "^2.0.2"
+        "node": ">=8"
       },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dom-accessibility-api": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz",
-      "integrity": "sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==",
-      "dev": true
-    },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "dependencies": {
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/dom-serializer/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+    "node_modules/listr2/node_modules/colorette": {
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
       "dev": true
     },
-    "node_modules/domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+    "node_modules/listr2/node_modules/slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "dev": true,
       "dependencies": {
-        "webidl-conversions": "^5.0.0"
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+    "node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "dependencies": {
-        "domelementtype": "^2.2.0"
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
       },
       "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "node": ">=4"
       }
     },
-    "node_modules/domhandler/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
-    "node_modules/dot-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
       "dev": true
     },
-    "node_modules/dotenv": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",
-      "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
-    "node_modules/dotenv-expand": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
-      "dev": true
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
     },
-    "node_modules/duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
       "dev": true
     },
-    "node_modules/easy-table": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz",
-      "integrity": "sha1-hvmrTBAvA3G3KXuSplHVgkvIy3M=",
-      "dev": true,
-      "optionalDependencies": {
-        "wcwidth": ">=1.0.1"
-      }
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
     },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/ejs": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz",
-      "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==",
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "dependencies": {
-        "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/electron-to-chromium": {
-      "version": "1.3.752",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz",
-      "integrity": "sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A=="
-    },
-    "node_modules/emittery": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
-      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
+    "node_modules/log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
       "engines": {
-        "node": ">= 4"
+        "node": ">=8"
       }
     },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
-      "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
-      "dev": true,
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=10"
       }
     },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
+    "node_modules/lz-string": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
+      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=",
+      "bin": {
+        "lz-string": "bin/bin.js"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dependencies": {
-        "ansi-colors": "^4.1.1"
+        "semver": "^6.0.0"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "devOptional": true
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
       "dependencies": {
-        "is-arrayish": "^0.2.1"
+        "tmpl": "1.0.x"
       }
     },
-    "node_modules/error-stack-parser": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz",
-      "integrity": "sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA==",
-      "dev": true,
+    "node_modules/match-sorter": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
+      "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
       "dependencies": {
-        "stackframe": "^1.1.1"
+        "@babel/runtime": "^7.12.5",
+        "remove-accents": "0.4.2"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.10.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "braces": "^3.0.1",
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8.6"
       }
     },
-    "node_modules/es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
+    "node_modules/microseconds": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
+      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
     },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dependencies": {
-        "has": "^1.0.3"
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "mime-db": "1.52.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": "*"
       }
     },
-    "node_modules/escodegen": {
+    "node_modules/minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+    },
+    "node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
+    "node_modules/nano-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
+      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
       "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
+        "big-integer": "^1.6.16"
+      }
+    },
+    "node_modules/nanoclone": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
+      "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
       "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
+        "nanoid": "bin/nanoid.cjs"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
-    "node_modules/escodegen/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-      "dev": true,
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "whatwg-url": "^5.0.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
-    "node_modules/escodegen/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
       "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
       }
     },
-    "node_modules/escodegen/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true,
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
+      "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/escodegen/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dependencies": {
-        "prelude-ls": "~1.1.2"
+        "path-key": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
-      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
-      "dependencies": {
-        "@eslint/eslintrc": "^1.3.0",
-        "@humanwhocodes/config-array": "^0.9.2",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.2",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
+    "node_modules/nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-config-airbnb": {
-      "version": "19.0.4",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
-      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
+    "node_modules/object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
       "dev": true,
-      "dependencies": {
-        "eslint-config-airbnb-base": "^15.0.0",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5"
-      },
       "engines": {
-        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.28.0",
-        "eslint-plugin-react-hooks": "^4.3.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
+    "node_modules/object-inspect": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
       "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+    "node_modules/object.entries": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.entries/node_modules/es-abstract": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
         "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
+        "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "regexp.prototype.flags": "^1.4.1",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -12857,7 +12541,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/is-callable": {
+    "node_modules/object.entries/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-callable": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
       "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
@@ -12869,7 +12574,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/is-regex": {
+    "node_modules/object.entries/node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
       "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
@@ -12885,7 +12602,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/is-string": {
+    "node_modules/object.entries/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/is-string": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
       "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
@@ -12900,7 +12629,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/object-inspect": {
+    "node_modules/object.entries/node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/object-inspect": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
       "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
@@ -12909,70 +12650,144 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+    "node_modules/object.entries/node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+    "node_modules/object.entries/node_modules/string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-typescript": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz",
-      "integrity": "sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==",
+    "node_modules/object.entries/node_modules/string.prototype.trimend/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "eslint-config-airbnb-base": "^15.0.0"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.13.0",
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.3"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb/node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+    "node_modules/object.entries/node_modules/string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/string.prototype.trimstart/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
+      "dependencies": {
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries/node_modules/es-abstract": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
         "internal-slot": "^1.0.3",
         "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
+        "is-negative-zero": "^2.0.2",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
+        "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "regexp.prototype.flags": "^1.4.1",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -12981,7 +12796,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb/node_modules/is-callable": {
+    "node_modules/object.fromentries/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries/node_modules/is-callable": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
       "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
@@ -12993,7 +12829,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb/node_modules/is-regex": {
+    "node_modules/object.fromentries/node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries/node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
       "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
@@ -13009,7 +12857,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb/node_modules/is-string": {
+    "node_modules/object.fromentries/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries/node_modules/is-string": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
       "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
@@ -13024,7 +12884,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb/node_modules/object-inspect": {
+    "node_modules/object.fromentries/node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.fromentries/node_modules/object-inspect": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
       "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
@@ -13033,1293 +12905,997 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb/node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+    "node_modules/object.fromentries/node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-prettier": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
-      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
+    "node_modules/object.fromentries/node_modules/string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dev": true,
-      "bin": {
-        "eslint-config-prettier": "bin/cli.js"
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
-      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
+    "node_modules/object.fromentries/node_modules/string.prototype.trimend/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.16.0",
-        "@babel/eslint-parser": "^7.16.3",
-        "@rushstack/eslint-patch": "^1.1.0",
-        "@typescript-eslint/eslint-plugin": "^5.5.0",
-        "@typescript-eslint/parser": "^5.5.0",
-        "babel-preset-react-app": "^10.0.1",
-        "confusing-browser-globals": "^1.0.11",
-        "eslint-plugin-flowtype": "^8.0.3",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jest": "^25.3.0",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.27.1",
-        "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-testing-library": "^5.0.1"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "eslint": "^8.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+    "node_modules/object.fromentries/node_modules/string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/eslint-config-react-app/node_modules/@babel/compat-data": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/core": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.10.tgz",
-      "integrity": "sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA==",
+    "node_modules/object.fromentries/node_modules/string.prototype.trimstart/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-compilation-targets": "^7.17.10",
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helpers": "^7.17.9",
-        "@babel/parser": "^7.17.10",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
+    "node_modules/object.fromentries/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helper-compilation-targets": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-      "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
+    "node_modules/object.hasown": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
+      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.20.2",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+    "node_modules/object.hasown/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+    "node_modules/object.hasown/node_modules/es-abstract": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.4.1",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
+    "node_modules/object.hasown/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helper-simple-access": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
+    "node_modules/object.hasown/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+    "node_modules/object.hasown/node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+    "node_modules/object.hasown/node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "dev": true,
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+    "node_modules/object.hasown/node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/helpers": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
+    "node_modules/object.hasown/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.9",
-        "@babel/types": "^7.17.0"
+        "call-bind": "^1.0.2"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
+    "node_modules/object.hasown/node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+    "node_modules/object.hasown/node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "call-bind": "^1.0.2"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
+    "node_modules/object.hasown/node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.hasown/node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+    "node_modules/object.hasown/node_modules/string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/object.hasown/node_modules/string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
+    "node_modules/object.hasown/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
       },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "node_modules/object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/object.values/node_modules/es-abstract": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
       "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.4.1",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">= 0.4"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/eslint-config-react-app/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+    "node_modules/object.values/node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+    "node_modules/object.values/node_modules/has-symbols": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+    "node_modules/object.values/node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/eslint-config-react-app/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/eslint-config-react-app/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+    "node_modules/object.values/node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-react-app/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/object.values/node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/object.values/node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/eslint-import-resolver-typescript": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz",
-      "integrity": "sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==",
+    "node_modules/object.values/node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
       "dependencies": {
-        "debug": "^4.3.4",
-        "glob": "^7.2.0",
-        "is-glob": "^4.0.3",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "eslint": "*",
-        "eslint-plugin-import": "*"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/object.values/node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
+        "call-bind": "^1.0.2"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+    "node_modules/object.values/node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.values/node_modules/regexp.prototype.flags": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+      "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
-        "node": "*"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+    "node_modules/object.values/node_modules/string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/eslint-import-resolver-typescript/node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+    "node_modules/object.values/node_modules/string.prototype.trimend/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
       "dependencies": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
-      "bin": {
-        "resolve": "bin/resolve"
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-import-resolver-typescript/node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/eslint-plugin-flowtype": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
-      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
+    "node_modules/object.values/node_modules/string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
       "dev": true,
       "dependencies": {
-        "lodash": "^4.17.21",
-        "string-natural-compare": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
       },
-      "peerDependencies": {
-        "@babel/plugin-syntax-flow": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.9",
-        "eslint": "^8.1.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+    "node_modules/object.values/node_modules/string.prototype.trimstart/node_modules/define-properties": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dependencies": {
-        "esutils": "^2.0.2"
+        "node": ">= 0.4"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+    "node_modules/object.values/node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
       "dependencies": {
-        "has": "^1.0.3"
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/oblivious-set": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
+      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
+        "wrappy": "1"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dependencies": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
+        "mimic-fn": "^2.1.0"
       },
-      "bin": {
-        "resolve": "bin/resolve"
+      "engines": {
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-jest": {
-      "version": "25.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
-      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
-      "dev": true,
+    "node_modules/ono": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz",
+      "integrity": "sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==",
       "dependencies": {
-        "@typescript-eslint/experimental-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@typescript-eslint/eslint-plugin": {
-          "optional": true
-        },
-        "jest": {
-          "optional": true
-        }
+        "format-util": "^1.0.3"
       }
     },
-    "node_modules/eslint-plugin-jest-dom": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-4.0.2.tgz",
-      "integrity": "sha512-Jo51Atwyo2TdcUncjmU+UQeSTKh3sc2LF/M5i/R3nTU0Djw9V65KGJisdm/RtuKhy2KH/r7eQ1n6kwYFPNdHlA==",
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
       "dev": true,
       "dependencies": {
-        "@babel/runtime": "^7.16.3",
-        "@testing-library/dom": "^8.11.1",
-        "requireindex": "^1.2.0"
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
-        "npm": ">=6",
-        "yarn": ">=1"
-      },
-      "peerDependencies": {
-        "eslint": "^6.8.0 || ^7.0.0 || ^8.0.0"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint-plugin-jest-dom/node_modules/@babel/runtime": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+    "node_modules/ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
       "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
-      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.16.3",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.4",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.3.5",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.7",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.2.1",
-        "language-tags": "^1.0.5",
-        "minimatch": "^3.0.4"
-      },
       "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/@babel/runtime": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+    "node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "p-try": "^1.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=4"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
+    "node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
+        "p-limit": "^1.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
+        "aggregate-error": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
       "dev": true,
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "callsites": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=6"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/jsx-ast-utils": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz",
-      "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.3",
-        "object.assign": "^4.1.2"
-      },
+    "node_modules/parse-ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
+      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
       "engines": {
-        "node": ">=4.0"
+        "node": ">=6"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+    },
+    "node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/eslint-plugin-prettier": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
-      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
-      "dev": true,
-      "dependencies": {
-        "prettier-linter-helpers": "^1.0.0"
-      },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.28.0",
-        "prettier": ">=2.0.0"
-      },
-      "peerDependenciesMeta": {
-        "eslint-config-prettier": {
-          "optional": true
-        }
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.29.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz",
-      "integrity": "sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flatmap": "^1.2.5",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.1.0",
-        "object.values": "^1.1.5",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.3",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.6"
-      },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
-      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
       "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
+    "node_modules/pirates": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
       "engines": {
-        "node": ">=4.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "find-up": "^4.0.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
-      "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
-      "dev": true,
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-plugin-testing-library": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.5.0.tgz",
-      "integrity": "sha512-eWQ19l6uWL7LW8oeMyQVSGjVYFnBqk7DMHjadm0yOHBvX3Xi9OBrsNuxoAMdX4r7wlQ5WWpW46d+CB6FWFL/PQ==",
-      "dev": true,
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dependencies": {
-        "@typescript-eslint/utils": "^5.13.0"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
-        "npm": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": "^7.5.0 || ^8.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
-      "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
-      "dev": true,
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/visitor-keys": "5.23.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "p-try": "^2.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/types": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
-      "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
-      "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=6"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
-      "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
-      "dev": true,
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/visitor-keys": "5.23.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/utils": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
-      "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.23.0",
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/typescript-estree": "5.23.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
-      },
+    "node_modules/pkg-dir/node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
-      "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "eslint-visitor-keys": "^3.0.0"
-      },
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
+    "node_modules/postcss": {
+      "version": "8.4.13",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
+      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
       "dependencies": {
-        "ms": "2.1.2"
+        "nanoid": "^3.3.3",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+    "node_modules/postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+    "node_modules/prettier": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
+      "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
-        "semver": "bin/semver.js"
+        "prettier": "bin-prettier.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
       "dev": true,
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "fast-diff": "^1.1.2"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+    "node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
         "node": ">=10"
-      }
-    },
-    "node_modules/eslint-webpack-plugin": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz",
-      "integrity": "sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "^7.28.2",
-        "jest-worker": "^27.3.1",
-        "micromatch": "^4.0.4",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/eslint/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+    "node_modules/pretty-format/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
-    "node_modules/eslint/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/pretty-ms": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
+      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
+        "parse-ms": "^2.1.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "engines": {
         "node": ">=10"
       },
@@ -14327,813 +13903,743 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+    "node_modules/prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
       }
     },
-    "node_modules/eslint/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+    "node_modules/property-expr": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.4.tgz",
+      "integrity": "sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg=="
+    },
+    "node_modules/psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "engines": {
-        "node": ">=4.0"
+        "node": ">=6"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
+    "node_modules/querystring": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
+      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=0.4.x"
       }
     },
-    "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/react": {
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.1.0.tgz",
+      "integrity": "sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "loose-envify": "^1.1.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/eslint/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/react-ace": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.5.0.tgz",
+      "integrity": "sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "ace-builds": "^1.4.13",
+        "diff-match-patch": "^1.0.5",
+        "lodash.get": "^4.4.2",
+        "lodash.isequal": "^4.5.0",
+        "prop-types": "^15.7.2"
       },
-      "engines": {
-        "node": "*"
+      "peerDependencies": {
+        "react": "^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0",
+        "react-dom": "^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0"
       }
     },
-    "node_modules/eslint/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    "node_modules/react-ace/node_modules/ace-builds": {
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
+      "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
     },
-    "node_modules/espree": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+    "node_modules/react-datepicker": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.5.0.tgz",
+      "integrity": "sha512-mFP/SbtFSXx21Wx3Nfv+RREwd/x0q14x7QL79ZCi/PVkHSFLwLWhXyOtj3OIzi1AcVYb/fMMcvi8e5b12n8/sg==",
       "dependencies": {
-        "acorn": "^8.7.1",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
+        "@popperjs/core": "^2.9.2",
+        "classnames": "^2.2.6",
+        "date-fns": "^2.24.0",
+        "prop-types": "^15.7.2",
+        "react-onclickoutside": "^6.12.0",
+        "react-popper": "^2.2.5"
       },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      "peerDependencies": {
+        "react": "^16.9.0 || ^17",
+        "react-dom": "^16.9.0 || ^17"
       }
     },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+    "node_modules/react-datepicker/node_modules/date-fns": {
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz",
+      "integrity": "sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q==",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
+        "node": ">=0.11"
       },
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+    "node_modules/react-dom": {
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.1.0.tgz",
+      "integrity": "sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==",
       "dependencies": {
-        "estraverse": "^5.1.0"
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.22.0"
       },
-      "engines": {
-        "node": ">=0.10"
+      "peerDependencies": {
+        "react": "^18.1.0"
       }
     },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
+    "node_modules/react-fast-compare": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
+      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
+    },
+    "node_modules/react-hook-form": {
+      "version": "7.6.9",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.6.9.tgz",
+      "integrity": "sha512-nz+btC4WFIm3zPBjw22K3t9nnJtlMMwj8slcbPYoTKlkSVA5l+q3Ai+VF0YzeRi7vbyyeGQvpyibov1xd/TV7A==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/react-hook-form"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17"
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "engines": {
-        "node": ">=4.0"
+    "node_modules/react-multi-select-component": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/react-multi-select-component/-/react-multi-select-component-4.0.6.tgz",
+      "integrity": "sha512-cNpDv8vh1kWkJiMsa097tTUqWLVTQn+La4aXlgoGOQVpOSH9u1fbj1+MsvnLQjTBySuDx+pzm/DpbIoma/i1Fw==",
+      "peerDependencies": {
+        "react": ">=17"
       }
     },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
+    "node_modules/react-onclickoutside": {
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.1.tgz",
+      "integrity": "sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==",
+      "funding": {
+        "type": "individual",
+        "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md"
+      },
+      "peerDependencies": {
+        "react": "^15.5.x || ^16.x || ^17.x",
+        "react-dom": "^15.5.x || ^16.x || ^17.x"
       }
     },
-    "node_modules/estree-walker": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-      "dev": true
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/react-popper": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
+      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
+      "dependencies": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      },
+      "peerDependencies": {
+        "@popperjs/core": "^2.0.0",
+        "react": "^16.8.0 || ^17"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
+    "node_modules/react-query": {
+      "version": "3.39.1",
+      "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",
+      "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",
+      "dependencies": {
+        "@babel/runtime": "^7.5.5",
+        "broadcast-channel": "^3.4.1",
+        "match-sorter": "^6.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
       }
     },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.x"
+    "node_modules/react-redux": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz",
+      "integrity": "sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.15.4",
+        "@types/react-redux": "^7.1.20",
+        "hoist-non-react-statics": "^3.3.2",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.7.2",
+        "react-is": "^17.0.2"
+      },
+      "peerDependencies": {
+        "react": "^16.8.3 || ^17"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
       }
     },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
+    "node_modules/react-redux/node_modules/@babel/runtime": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
       "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
+        "regenerator-runtime": "^0.13.4"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
+    "node_modules/react-redux/node_modules/@types/react-redux": {
+      "version": "7.1.22",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
+      "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
+      "dependencies": {
+        "@types/hoist-non-react-statics": "^3.3.0",
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0",
+        "redux": "^4.0.0"
       }
     },
-    "node_modules/expect": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.0.tgz",
-      "integrity": "sha512-qFXKl8Pmxk8TBGfaFKRtcQjfXEnKAs+dmlxdwvukJZorwrAabT7M3h8oLOG01I2utEhkmUTi17CHaPBovZsKdw==",
-      "dev": true,
-      "peer": true,
+    "node_modules/react-redux/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+    },
+    "node_modules/react-router-dom": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
+      "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
       "dependencies": {
-        "@jest/expect-utils": "^28.1.0",
-        "jest-get-type": "^28.0.2",
-        "jest-matcher-utils": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-util": "^28.1.0"
+        "history": "^5.2.0",
+        "react-router": "6.3.0"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "peerDependencies": {
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
       }
     },
-    "node_modules/expect/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
+    "node_modules/react-router-dom/node_modules/react-router": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
+      "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
+      "dependencies": {
+        "history": "^5.2.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "react": ">=16.8"
       }
     },
-    "node_modules/expect/node_modules/jest-matcher-utils": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.0.tgz",
-      "integrity": "sha512-onnax0n2uTLRQFKAjC7TuaxibrPSvZgKTcSCnNUz/tOjJ9UhxNm7ZmPpoQavmTDUjXvUQ8KesWk2/VdrxIFzTQ==",
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^28.1.0",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.0"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/expect/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-      "dev": true,
-      "peer": true,
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "picomatch": "^2.2.1"
       },
       "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": ">=8.10.0"
       }
     },
-    "node_modules/expect/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/express": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.0",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.10.3",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/express/node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-      "dev": true
-    },
-    "node_modules/express/node_modules/path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-      "dev": true
+    "node_modules/recrawl-sync": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/recrawl-sync/-/recrawl-sync-2.2.2.tgz",
+      "integrity": "sha512-E2sI4F25Fu2nrfV+KsnC7/qfk/spQIYXlonfQoS4rwxeNK5BjxnLPbWiRXHVXPwYBOTWtPX5765kTm/zJiL+LQ==",
+      "dependencies": {
+        "@cush/relative": "^1.0.0",
+        "glob-regex": "^0.3.0",
+        "slash": "^3.0.0",
+        "tslib": "^1.9.3"
+      }
     },
-    "node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
       "dev": true,
       "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "dev": true
+    "node_modules/redux": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz",
+      "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==",
+      "dependencies": {
+        "@babel/runtime": "^7.9.2"
+      }
     },
-    "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+    "node_modules/redux-mock-store": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/redux-mock-store/-/redux-mock-store-1.5.4.tgz",
+      "integrity": "sha512-xmcA0O/tjCLXhh9Fuiq6pMrJCwFRaouA8436zcikdIpYWWCjU76CRk+i2bHx8EeiSiMGnB85/lZdU3wIJVXHTA==",
       "dev": true,
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
+        "lodash.isplainobject": "^4.0.6"
       }
     },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    "node_modules/redux-thunk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
+      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
+      "peerDependencies": {
+        "redux": "^4"
+      }
     },
-    "node_modules/fast-safe-stringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+    "node_modules/reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
       "dev": true
     },
-    "node_modules/fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
     },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+    "node_modules/regenerate-unicode-properties": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
       "dev": true,
       "dependencies": {
-        "websocket-driver": ">=0.5.1"
+        "regenerate": "^1.4.2"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=4"
       }
     },
-    "node_modules/fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-      "dev": true,
-      "dependencies": {
-        "bser": "2.1.1"
-      }
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.7",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
     },
-    "node_modules/fetch-mock": {
-      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.11.0.tgz",
-      "integrity": "sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==",
+    "node_modules/regenerator-transform": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "dev": true,
       "dependencies": {
-        "@babel/core": "^7.0.0",
-        "@babel/runtime": "^7.0.0",
-        "core-js": "^3.0.0",
-        "debug": "^4.1.1",
-        "glob-to-regexp": "^0.4.0",
-        "is-subset": "^0.1.1",
-        "lodash.isequal": "^4.5.0",
-        "path-to-regexp": "^2.2.1",
-        "querystring": "^0.2.0",
-        "whatwg-url": "^6.5.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      },
-      "funding": {
-        "type": "charity",
-        "url": "https://www.justgiving.com/refugee-support-europe"
-      },
-      "peerDependencies": {
-        "node-fetch": "*"
-      },
-      "peerDependenciesMeta": {
-        "node-fetch": {
-          "optional": true
-        }
+        "@babel/runtime": "^7.8.4"
       }
     },
-    "node_modules/fetch-mock-jest": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/fetch-mock-jest/-/fetch-mock-jest-1.5.1.tgz",
-      "integrity": "sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ==",
+    "node_modules/regexp.prototype.flags": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
       "dev": true,
       "dependencies": {
-        "fetch-mock": "^9.11.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "charity",
-        "url": "https://www.justgiving.com/refugee-support-europe"
-      },
-      "peerDependencies": {
-        "node-fetch": "*"
-      },
-      "peerDependenciesMeta": {
-        "node-fetch": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fetch-mock/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fetch-mock/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/fetch-mock/node_modules/path-to-regexp": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz",
-      "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w=="
-    },
-    "node_modules/figures": {
+    "node_modules/regexpp": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/mysticatea"
       }
     },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+    "node_modules/regexpu-core": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
+      "dev": true,
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+    "node_modules/regjsgen": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
+      "dev": true
+    },
+    "node_modules/regjsparser": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
       "dev": true,
       "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "jsesc": "~0.5.0"
       },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+      "bin": {
+        "regjsparser": "bin/parser"
       }
     },
-    "node_modules/filelist": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.3.tgz",
-      "integrity": "sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==",
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
       "dev": true,
-      "dependencies": {
-        "minimatch": "^5.0.1"
+      "bin": {
+        "jsesc": "bin/jsesc"
       }
     },
-    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
+    "node_modules/remove-accents": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
+      "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/filesize": {
-      "version": "8.0.7",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
-      "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==",
+    "node_modules/requireindex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
+      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
       "dev": true,
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">=0.10.5"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
+    "node_modules/reselect": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.5.tgz",
+      "integrity": "sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ=="
+    },
+    "node_modules/resolve": {
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+      "dependencies": {
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
+        "resolve-from": "^5.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=8"
       }
     },
-    "node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": true,
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+    "node_modules/resolve.exports": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "dev": true,
       "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
       "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz",
-      "integrity": "sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==",
-      "dev": true,
+    "node_modules/rfdc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@types/json-schema": "^7.0.5",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.2",
-        "cosmiconfig": "^6.0.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^9.0.0",
-        "glob": "^7.1.6",
-        "memfs": "^3.1.2",
-        "minimatch": "^3.0.4",
-        "schema-utils": "2.7.0",
-        "semver": "^7.3.2",
-        "tapable": "^1.0.0"
+        "glob": "^7.1.3"
       },
-      "engines": {
-        "node": ">=10",
-        "yarn": ">=1.0.0"
+      "bin": {
+        "rimraf": "bin.js"
       },
-      "peerDependencies": {
-        "eslint": ">= 6",
-        "typescript": ">= 2.7",
-        "vue-template-compiler": "*",
-        "webpack": ">= 4"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "2.72.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.72.1.tgz",
+      "integrity": "sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==",
+      "bin": {
+        "rollup": "dist/bin/rollup"
       },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
         },
-        "vue-template-compiler": {
-          "optional": true
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
         }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/rxjs": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
+      "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "tslib": "~2.1.0"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+    "node_modules/rxjs/node_modules/tslib": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
+      "dev": true
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "node_modules/sass": {
+      "version": "1.52.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz",
+      "integrity": "sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==",
       "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
       "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "xmlchars": "^2.2.0"
       },
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-      "dev": true,
+    "node_modules/scheduler": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.22.0.tgz",
+      "integrity": "sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==",
       "dependencies": {
-        "@types/json-schema": "^7.0.4",
-        "ajv": "^6.12.2",
-        "ajv-keywords": "^3.4.1"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "loose-envify": "^1.1.0"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
+    "node_modules/semver": {
       "version": "7.3.7",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
       "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -15144,153 +14650,239 @@
         "node": ">=10"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "dev": true,
+    "node_modules/shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
       },
-      "engines": {
-        "node": ">= 6"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/format-util": {
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+    },
+    "node_modules/sisteransi": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz",
-      "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
     },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true,
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=10"
       },
       "funding": {
-        "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true,
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+    "node_modules/source-map-resolve": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
       "dev": true,
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/spawn-command": {
+      "version": "0.0.2-1",
+      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
+      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
+      "dev": true
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
+      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-      "dev": true
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+    "node_modules/string-argv": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+      "dev": true,
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": ">=0.6.19"
       }
     },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+    "node_modules/string-natural-compare": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
+      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
+      "dev": true
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.matchall": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz",
+      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1",
+        "get-intrinsic": "^1.1.1",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "regexp.prototype.flags": "^1.3.1",
+        "side-channel": "^1.0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
+    "node_modules/string.prototype.matchall/node_modules/es-abstract": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.1.1",
         "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
+        "has-symbols": "^1.0.2",
         "internal-slot": "^1.0.3",
         "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
+        "is-negative-zero": "^2.0.1",
         "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
+        "is-shared-array-buffer": "^1.0.1",
         "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
+        "is-weakref": "^1.0.1",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -15299,51 +14891,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+    "node_modules/string.prototype.matchall/node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-regex": {
+    "node_modules/string.prototype.matchall/node_modules/is-regex": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
       "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -15355,21 +14919,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-string": {
+    "node_modules/string.prototype.matchall/node_modules/is-string": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
       "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -15380,730 +14934,687 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/object-inspect": {
+    "node_modules/string.prototype.matchall/node_modules/object-inspect": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
       "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "define-properties": "^1.1.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "define-properties": "^1.1.3"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "ansi-regex": "^5.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/function.prototype.name/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6"
       }
     },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
       "dev": true,
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
+        "min-indent": "^1.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-own-enumerable-property-symbols": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
-      "dev": true
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true,
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+    "node_modules/styled-components": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.1.tgz",
+      "integrity": "sha512-JThv2JRzyH0NOIURrk9iskdxMSAAtCfj/b2Sf1WJaCUsloQkblepy1jaCLX/bYE+mhYo3unmwVSI9I5d9ncSiQ==",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/traverse": "^7.4.5",
+        "@emotion/is-prop-valid": "^0.8.8",
+        "@emotion/stylis": "^0.8.4",
+        "@emotion/unitless": "^0.7.4",
+        "babel-plugin-styled-components": ">= 1.12.0",
+        "css-to-react-native": "^3.0.0",
+        "hoist-non-react-statics": "^3.0.0",
+        "shallowequal": "^1.1.0",
+        "supports-color": "^5.5.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
+        "type": "opencollective",
+        "url": "https://opencollective.com/styled-components"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependencies": {
+        "react": ">= 16.8.0",
+        "react-dom": ">= 16.8.0",
+        "react-is": ">= 16.8.0"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
+    "node_modules/styled-components/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "engines": {
-        "node": ">= 6"
+        "node": ">=4"
       }
     },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-    },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
+    "node_modules/styled-components/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "global-prefix": "^3.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=4"
       }
     },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
+    "node_modules/supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
       },
-      "bin": {
-        "which": "bin/which"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/globals": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+    },
+    "node_modules/terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
       "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
-    },
-    "node_modules/gzip-size": {
+    "node_modules/test-exclude": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dependencies": {
-        "duplexer": "^0.1.2"
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "node_modules/harmony-reflect": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
-      "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==",
+    "node_modules/throat": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
+      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1"
+        "os-tmpdir": "~1.0.2"
       },
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">=0.6.0"
       }
     },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
     },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
+        "is-number": "^7.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8.0"
       }
     },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+    "node_modules/toposort": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
+      "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA="
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/history": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
-      "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.7.6"
-      }
-    },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "dependencies": {
-        "react-is": "^16.7.0"
+        "node": ">=6"
       }
     },
-    "node_modules/hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-      "dev": true,
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "engines": {
-        "node": ">= 6.0.0"
+        "node": ">= 4.0.0"
       }
     },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "dev": true,
+    "node_modules/tr46": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
+        "punycode": "^2.1.0"
       }
     },
-    "node_modules/hpack.js/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+      "bin": {
+        "tree-kill": "cli.js"
       }
     },
-    "node_modules/hpack.js/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "node_modules/hpack.js/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+    "node_modules/ts-jest": {
+      "version": "28.0.3",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.3.tgz",
+      "integrity": "sha512-HzgbEDQ2KgVtDmpXToqAcKTyGHdHsG23i/iUjfxji92G5eT09S1m9UHZd7csF0Bfgh9txM4JzwHnv7r1waFPlw==",
       "dev": true,
       "dependencies": {
-        "safe-buffer": "~5.1.0"
+        "bs-logger": "0.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "^28.0.0",
+        "json5": "^2.2.1",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "^20.x"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.0.0-beta.0 <8",
+        "@types/jest": "^27.0.0",
+        "babel-jest": "^28.0.0",
+        "jest": "^28.0.0",
+        "typescript": ">=4.3"
+      },
+      "peerDependenciesMeta": {
+        "@babel/core": {
+          "optional": true
+        },
+        "@types/jest": {
+          "optional": true
+        },
+        "babel-jest": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        }
       }
     },
-    "node_modules/html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+    "node_modules/ts-jest/node_modules/json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
       "dev": true,
-      "dependencies": {
-        "whatwg-encoding": "^1.0.5"
+      "bin": {
+        "json5": "lib/cli.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       }
     },
-    "node_modules/html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
-      "dev": true
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "node_modules/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dev": true,
+    "node_modules/ts-node": {
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.0.tgz",
+      "integrity": "sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==",
+      "devOptional": true,
       "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
       },
       "bin": {
-        "html-minifier-terser": "cli.js"
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
       },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ts-node/node_modules/acorn-walk": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "devOptional": true,
       "engines": {
-        "node": ">=12"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
       "dev": true,
       "dependencies": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
+    },
+    "node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
       },
       "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
+        "node": ">= 6"
       },
       "peerDependencies": {
-        "webpack": "^5.20.0"
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
       }
     },
-    "node_modules/htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/htmlparser2/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/htmlparser2/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+      "devOptional": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
     },
-    "node_modules/htmlparser2/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
       "dev": true,
       "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
       },
       "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-      "dev": true
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "node_modules/http-errors": {
+    "node_modules/unicode-match-property-ecmascript": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
       "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=4"
       }
     },
-    "node_modules/http-parser-js": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz",
-      "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==",
-      "dev": true
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
       "dev": true,
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
       "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
       "engines": {
-        "node": ">= 6"
+        "node": ">=4"
       }
     },
-    "node_modules/http-proxy-agent/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unload": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
+      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
       "dependencies": {
-        "ms": "2.1.2"
-      },
+        "@babel/runtime": "^7.6.2",
+        "detect-node": "^2.0.4"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/use-debounce": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-8.0.1.tgz",
+      "integrity": "sha512-6tGAFJKJ0qCalecaV7/gm/M6n238nmitNppvR89ff1yfwSFjwFKR7IQZzIZf1KZRQhqNireBzytzU6jgb29oVg==",
       "engines": {
-        "node": ">=6.0"
+        "node": ">= 10.0.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "react": ">=16.8.0"
       }
     },
-    "node_modules/http-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-      "dev": true,
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "devOptional": true
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
+      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
       "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=10.12.0"
+      }
+    },
+    "node_modules/v8-to-istanbul/node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/vite": {
+      "version": "2.9.11",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.11.tgz",
+      "integrity": "sha512-h1n8bAN5Psv/V+RAY3P6OtYyGSFQdusgYWiLRAk41qY7rSyH4K5Jq+RUXztzyPVB0oHbnXPUuS2Aj44jucViUA==",
+      "dependencies": {
+        "esbuild": "^0.14.27",
+        "postcss": "^8.4.13",
+        "resolve": "^1.22.0",
+        "rollup": "^2.59.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": ">=12.2.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       },
       "peerDependencies": {
-        "@types/express": "^4.17.13"
+        "less": "*",
+        "sass": "*",
+        "stylus": "*"
       },
       "peerDependenciesMeta": {
-        "@types/express": {
+        "less": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
           "optional": true
         }
       }
     },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
+    "node_modules/vite-tsconfig-paths": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-3.5.0.tgz",
+      "integrity": "sha512-NKIubr7gXgh/3uniQaOytSg+aKWPrjquP6anAy+zCWEn6h9fB8z2/qdlfQrTgZWaXJ2pHVlllrSdRZltHn9P4g==",
       "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
+        "debug": "^4.1.1",
+        "globrex": "^0.1.2",
+        "recrawl-sync": "^2.0.3",
+        "tsconfig-paths": "^4.0.0"
       },
-      "engines": {
-        "node": ">= 6"
+      "peerDependencies": {
+        "vite": ">2.0.0-0"
       }
     },
-    "node_modules/https-proxy-agent/node_modules/debug": {
+    "node_modules/vite-tsconfig-paths/node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -16116,26819 +15627,4302 @@
         }
       }
     },
-    "node_modules/https-proxy-agent/node_modules/ms": {
+    "node_modules/vite-tsconfig-paths/node_modules/json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/vite-tsconfig-paths/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
+    "node_modules/vite-tsconfig-paths/node_modules/tsconfig-paths": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz",
+      "integrity": "sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==",
+      "dependencies": {
+        "json5": "^2.2.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
       }
     },
-    "node_modules/husky": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz",
-      "integrity": "sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==",
-      "dev": true,
-      "bin": {
-        "husky": "lib/bin.js"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/typicode"
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
       }
     },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "xml-name-validator": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+    "node_modules/walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dependencies": {
+        "makeerror": "1.0.x"
       }
     },
-    "node_modules/idb": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz",
-      "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw==",
-      "dev": true
+    "node_modules/warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
     },
-    "node_modules/identity-obj-proxy": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
-      "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
+    "node_modules/wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
       "dev": true,
       "dependencies": {
-        "harmony-reflect": "^1.4.6"
-      },
-      "engines": {
-        "node": ">=4"
+        "defaults": "^1.0.3"
       }
     },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+    "node_modules/webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
-    "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "engines": {
-        "node": ">= 4"
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dependencies": {
+        "iconv-lite": "0.4.24"
       }
     },
-    "node_modules/immer": {
-      "version": "9.0.12",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz",
-      "integrity": "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
-      }
+    "node_modules/whatwg-fetch": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
     },
-    "node_modules/immutable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
-      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+    "node_modules/whatwg-url": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
       "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dev": true,
+        "lodash.sortby": "^4.7.0",
+        "tr46": "^1.0.1",
+        "webidl-conversions": "^4.0.2"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
+        "isexe": "^2.0.0"
       },
       "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
+        "node-which": "bin/node-which"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+        "node": ">= 8"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/inquirer": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.2.tgz",
-      "integrity": "sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==",
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
       "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
       },
-      "engines": {
-        "node": ">=12.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/inquirer/node_modules/rxjs": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/inquirer/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "node_modules/is-bigint": {
+    "node_modules/wrappy": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+    "node_modules/write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
       }
     },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
+    "node_modules/ws": {
+      "version": "7.5.8",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz",
+      "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8.3.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
-      "engines": {
-        "node": ">= 0.4"
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/xml": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
+      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
+      "dev": true
     },
-    "node_modules/is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+    "node_modules/xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=10"
       }
     },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
-      },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 6"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+    "node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
+    "node_modules/yargs-parser": {
+      "version": "20.2.7",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true,
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "devOptional": true,
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "node_modules/yup": {
+      "version": "0.32.11",
+      "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz",
+      "integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==",
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "@babel/runtime": "^7.15.4",
+        "@types/lodash": "^4.14.175",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "nanoclone": "^0.2.1",
+        "property-expr": "^2.0.4",
+        "toposort": "^2.0.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
       }
     },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
+    "node_modules/yup/node_modules/@babel/runtime": {
+      "version": "7.16.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
+      "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/is-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-      "dev": true
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/yup/node_modules/@types/lodash": {
+      "version": "4.14.177",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
+      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw=="
+    }
+  },
+  "dependencies": {
+    "@ampproject/remapping": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
+    "@babel/code-frame": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
+      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+      "requires": {
+        "@babel/highlight": "^7.16.7"
       }
     },
-    "node_modules/is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
-      "engines": {
-        "node": ">= 0.4"
+    "@babel/compat-data": {
+      "version": "7.17.10",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
+      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="
+    },
+    "@babel/core": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz",
+      "integrity": "sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==",
+      "requires": {
+        "@ampproject/remapping": "^2.1.0",
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.18.2",
+        "@babel/helper-compilation-targets": "^7.18.2",
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helpers": "^7.18.2",
+        "@babel/parser": "^7.18.0",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.18.2",
+        "@babel/types": "^7.18.2",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.1",
+        "semver": "^6.3.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "json5": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        }
       }
     },
-    "node_modules/is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+    "@babel/eslint-parser": {
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
+      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "eslint-scope": "^5.1.1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
+    "@babel/generator": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
+      "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
+      "requires": {
+        "@babel/types": "^7.18.2",
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "jsesc": "^2.5.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "@jridgewell/gen-mapping": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
+          "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+          "requires": {
+            "@jridgewell/set-array": "^1.0.0",
+            "@jridgewell/sourcemap-codec": "^1.4.10",
+            "@jridgewell/trace-mapping": "^0.3.9"
+          }
+        }
       }
     },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "requires": {
+        "@babel/types": "^7.16.7"
       }
     },
-    "node_modules/is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
       "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
-    "node_modules/is-root": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+    "@babel/helper-compilation-targets": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz",
+      "integrity": "sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==",
+      "requires": {
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.20.2",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        }
       }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz",
+      "integrity": "sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==",
       "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-member-expression-to-functions": "^7.17.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
       }
     },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz",
+      "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
       }
     },
-    "node_modules/is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
-      "engines": {
-        "node": ">= 0.4"
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/is-subset": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY="
+    "@babel/helper-environment-visitor": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz",
+      "integrity": "sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="
     },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.16.7"
       }
     },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
+    "@babel/helper-function-name": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+      "requires": {
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.17.0"
+      }
     },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "@babel/helper-hoist-variables": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
+      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+      "requires": {
+        "@babel/types": "^7.16.7"
       }
     },
-    "node_modules/is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
+      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "requires": {
+        "@babel/types": "^7.17.0"
       }
     },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+    "@babel/helper-module-imports": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
+      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+      "requires": {
+        "@babel/types": "^7.16.7"
       }
     },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    "@babel/helper-module-transforms": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz",
+      "integrity": "sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.17.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.18.0",
+        "@babel/types": "^7.18.0"
+      }
     },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@babel/types": "^7.16.7"
       }
     },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+    "@babel/helper-plugin-utils": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
+      "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
       "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
       }
     },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+    "@babel/helper-replace-supers": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz",
+      "integrity": "sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==",
       "dev": true,
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.18.2",
+        "@babel/helper-member-expression-to-functions": "^7.17.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.18.2",
+        "@babel/types": "^7.18.2"
       }
     },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+    "@babel/helper-simple-access": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz",
+      "integrity": "sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==",
+      "requires": {
+        "@babel/types": "^7.18.2"
+      }
+    },
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
       "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "@babel/types": "^7.16.0"
       }
     },
-    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+    "@babel/helper-split-export-declaration": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
+      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+      "requires": {
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
+      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
+      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
       "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
+      "requires": {
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz",
+      "integrity": "sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==",
+      "requires": {
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.18.2",
+        "@babel/types": "^7.18.2"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
       },
-      "peerDependenciesMeta": {
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+        },
         "supports-color": {
-          "optional": true
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
-    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+    "@babel/parser": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz",
+      "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="
     },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
+      "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
       "dev": true,
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/iterare": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/iterare/-/iterare-1.2.1.tgz",
-      "integrity": "sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==",
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==",
       "dev": true,
-      "engines": {
-        "node": ">=6"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.17.12"
       }
     },
-    "node_modules/jake": {
-      "version": "10.8.5",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz",
+      "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==",
       "dev": true,
-      "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
-    "node_modules/jest": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.0.tgz",
-      "integrity": "sha512-TZR+tHxopPhzw3c3560IJXZWLNHgpcz1Zh0w5A65vynLGNcg/5pZ+VildAd7+XGOu6jd58XMY/HNn0IkZIXVXg==",
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz",
+      "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/core": "^28.1.0",
-        "import-local": "^3.0.2",
-        "jest-cli": "^28.1.0"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-changed-files": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.0.2.tgz",
-      "integrity": "sha512-QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA==",
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz",
+      "integrity": "sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "execa": "^5.0.0",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
-    "node_modules/jest-circus": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.0.tgz",
-      "integrity": "sha512-rNYfqfLC0L0zQKRKsg4n4J+W1A2fbyGH7Ss/kDIocp9KXD9iaL111glsLu7+Z7FHuZxwzInMDXq+N1ZIBkI/TQ==",
+    "@babel/plugin-proposal-decorators": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz",
+      "integrity": "sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/environment": "^28.1.0",
-        "@jest/expect": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^28.1.0",
-        "jest-matcher-utils": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-runtime": "^28.1.0",
-        "jest-snapshot": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "pretty-format": "^28.1.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.17.9",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/plugin-syntax-decorators": "^7.17.0",
+        "charcodes": "^0.2.0"
       }
     },
-    "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
-    "node_modules/jest-circus/node_modules/jest-matcher-utils": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.0.tgz",
-      "integrity": "sha512-onnax0n2uTLRQFKAjC7TuaxibrPSvZgKTcSCnNUz/tOjJ9UhxNm7ZmPpoQavmTDUjXvUQ8KesWk2/VdrxIFzTQ==",
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz",
+      "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^28.1.0",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
-    "node_modules/jest-circus/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz",
+      "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
-    "node_modules/jest-circus/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz",
+      "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==",
       "dev": true,
-      "peer": true
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      }
     },
-    "node_modules/jest-cli": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.0.tgz",
-      "integrity": "sha512-fDJRt6WPRriHrBsvvgb93OxgajHHsJbk4jZxiPqmZbMDRcHskfJBBfTyjFko0jjfprP544hOktdSi9HVgl4VUQ==",
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz",
+      "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/core": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "prompts": "^2.0.1",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
-    "node_modules/jest-cli/node_modules/jest-validate": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-      "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz",
+      "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/types": "^28.1.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "leven": "^3.1.0",
-        "pretty-format": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-compilation-targets": "^7.17.10",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.17.12"
       }
     },
-    "node_modules/jest-cli/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
-    "node_modules/jest-cli/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==",
       "dev": true,
-      "peer": true
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
     },
-    "node_modules/jest-cli/node_modules/yargs": {
-      "version": "17.5.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz",
+      "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-cli/node_modules/yargs-parser": {
-      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz",
+      "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=12"
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
-    "node_modules/jest-config": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.0.tgz",
-      "integrity": "sha512-aOV80E9LeWrmflp7hfZNn/zGA4QKv/xsn2w8QCBP0t0+YqObuCWTSgNbHJ0j9YsTuCO08ZR/wsvlxqqHX20iUA==",
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz",
+      "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "babel-jest": "^28.1.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^28.1.0",
-        "jest-environment-node": "^28.1.0",
-        "jest-get-type": "^28.0.2",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.0",
-        "jest-runner": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^28.1.0",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@types/node": "*",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "node_modules/jest-config/node_modules/jest-haste-map": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-      "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+    "@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "node_modules/jest-config/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
-    "node_modules/jest-config/node_modules/jest-resolve": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.0.tgz",
-      "integrity": "sha512-vvfN7+tPNnnhDvISuzD1P+CRVP8cK0FHXRwPAcdDaQv4zgvwvag2n55/h5VjYcM5UJG7L4TwE5tZlzcI0X2Lhw==",
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "node_modules/jest-config/node_modules/jest-validate": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-      "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
+    "@babel/plugin-syntax-decorators": {
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz",
+      "integrity": "sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/types": "^28.1.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "leven": "^3.1.0",
-        "pretty-format": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-config/node_modules/jest-worker": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-      "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "node_modules/jest-config/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
-    "node_modules/jest-config/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
+    "@babel/plugin-syntax-flow": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.7.tgz",
+      "integrity": "sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==",
       "dev": true,
-      "peer": true
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
     },
-    "node_modules/jest-config/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "@babel/plugin-syntax-import-assertions": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz",
+      "integrity": "sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.0.tgz",
-      "integrity": "sha512-8eFd3U3OkIKRtlasXfiAQfbovgFgRDb0Ngcs2E+FMeBZ4rUezqIaGjuyggJBp+llosQXNEWofk/Sz4Hr5gMUhA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^28.0.2",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "node_modules/jest-diff/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+    "@babel/plugin-syntax-jsx": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz",
+      "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-diff/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-      "dev": true,
-      "peer": true
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
     },
-    "node_modules/jest-docblock": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.0.2.tgz",
-      "integrity": "sha512-FH10WWw5NxLoeSdQlJwu+MTiv60aXV/t8KEwIRGEv74WARE1cXIqh1vGdy2CraHuWOOrnzTWj/azQKqW4fO7xg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
-    "node_modules/jest-each": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.0.tgz",
-      "integrity": "sha512-a/XX02xF5NTspceMpHujmOexvJ4GftpYXqr6HhhmKmExtMXsyIN/fvanQlt/BcgFoRKN4OCXxLQKth9/n6OPFg==",
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/types": "^28.1.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "pretty-format": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-typescript": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz",
+      "integrity": "sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz",
+      "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-each/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz",
+      "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
       }
     },
-    "node_modules/jest-each/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
       "dev": true,
-      "peer": true
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
+      }
     },
-    "node_modules/jest-environment-jsdom": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
-      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz",
+      "integrity": "sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==",
       "dev": true,
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jsdom": "^16.6.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@jest/environment": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+    "@babel/plugin-transform-classes": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz",
+      "integrity": "sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==",
       "dev": true,
-      "dependencies": {
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1"
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.18.2",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-replace-supers": "^7.18.2",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "globals": "^11.1.0"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "dependencies": {
+        "globals": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+          "dev": true
+        }
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@jest/fake-timers": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz",
+      "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@sinonjs/fake-timers": "^8.0.1",
-        "@types/node": "*",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz",
+      "integrity": "sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==",
       "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
       "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz",
+      "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==",
       "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
       "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/jest-mock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+    "@babel/plugin-transform-flow-strip-types": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.7.tgz",
+      "integrity": "sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-flow": "^7.16.7"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+    "@babel/plugin-transform-for-of": {
+      "version": "7.18.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz",
+      "integrity": "sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-environment-node": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.0.tgz",
-      "integrity": "sha512-gBLZNiyrPw9CSMlTXF1yJhaBgWDPVvH0Pq6bOEwGMXaYNzhzhw2kA/OijNF8egbCgDS0/veRv97249x2CX+udQ==",
+    "@babel/plugin-transform-function-name": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/environment": "^28.1.0",
-        "@jest/fake-timers": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "jest-mock": "^28.1.0",
-        "jest-util": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-get-type": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
-      "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==",
+    "@babel/plugin-transform-literals": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz",
+      "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-haste-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
-      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/graceful-fs": "^4.1.2",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^27.5.1",
-        "jest-serializer": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-haste-map/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz",
+      "integrity": "sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==",
       "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
-    "node_modules/jest-haste-map/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz",
+      "integrity": "sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==",
       "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+      "requires": {
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-simple-access": "^7.18.2",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
-    "node_modules/jest-haste-map/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz",
+      "integrity": "sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
-    "node_modules/jest-jasmine2": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
-      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz",
+      "integrity": "sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==",
       "dev": true,
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^27.5.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz",
+      "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@jest/environment": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+    "@babel/plugin-transform-new-target": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz",
+      "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==",
       "dev": true,
-      "dependencies": {
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@jest/fake-timers": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+    "@babel/plugin-transform-object-super": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@sinonjs/fake-timers": "^8.0.1",
-        "@types/node": "*",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@jest/globals": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+    "@babel/plugin-transform-parameters": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz",
+      "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==",
       "dev": true,
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "expect": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@jest/source-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
       "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9",
-        "source-map": "^0.6.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+    "@babel/plugin-transform-react-display-name": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
+      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
       "dev": true,
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@jest/transform": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^27.5.1",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+    "@babel/plugin-transform-react-jsx": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz",
+      "integrity": "sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-jsx": "^7.17.12",
+        "@babel/types": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+    "@babel/plugin-transform-react-jsx-development": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
+      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
+      "requires": {
+        "@babel/plugin-transform-react-jsx": "^7.16.7"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
+    "@babel/plugin-transform-react-jsx-self": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.17.12.tgz",
+      "integrity": "sha512-7S9G2B44EnYOx74mue02t1uD8ckWZ/ee6Uz/qfdzc35uWHX5NgRy9i+iJSb2LFRgMd+QV9zNcStQaazzzZ3n3Q==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+    "@babel/plugin-transform-react-jsx-source": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.16.7.tgz",
+      "integrity": "sha512-rONFiQz9vgbsnaMtQlZCjIRwhJvlrPET8TabIUK2hzlXw9B9s2Ieaxte1SCOOXMbWRHodbKixNf3BLcWVOQ8Bw==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+    "@babel/plugin-transform-react-pure-annotations": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz",
+      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
       "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz",
+      "integrity": "sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "regenerator-transform": "^0.15.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz",
+      "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==",
       "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/jest-each": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+    "@babel/plugin-transform-runtime": {
+      "version": "7.17.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz",
+      "integrity": "sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1"
+      "requires": {
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "semver": "^6.3.0"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/jest-jasmine2/node_modules/jest-mock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/jest-runtime": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+    "@babel/plugin-transform-spread": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz",
+      "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==",
       "dev": true,
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/globals": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/jest-snapshot": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
       "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.7.2",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^27.5.1",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^27.5.1",
-        "semver": "^7.3.2"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz",
+      "integrity": "sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz",
+      "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+    "@babel/plugin-transform-typescript": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz",
+      "integrity": "sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-typescript": "^7.17.12"
       }
     },
-    "node_modules/jest-jasmine2/node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
       "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-leak-detector": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.0.tgz",
-      "integrity": "sha512-uIJDQbxwEL2AMMs2xjhZl2hw8s77c3wrPaQ9v6tXJLGaaQ+4QrNJH5vuw7hA7w/uGT/iJ42a83opAqxGHeyRIA==",
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
-    "node_modules/jest-leak-detector/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+    "@babel/preset-env": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz",
+      "integrity": "sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==",
       "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-leak-detector/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+      "requires": {
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-compilation-targets": "^7.18.2",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12",
+        "@babel/plugin-proposal-async-generator-functions": "^7.17.12",
+        "@babel/plugin-proposal-class-properties": "^7.17.12",
+        "@babel/plugin-proposal-class-static-block": "^7.18.0",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
+        "@babel/plugin-proposal-json-strings": "^7.17.12",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.18.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.17.12",
+        "@babel/plugin-proposal-private-methods": "^7.17.12",
+        "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.17.12",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-import-assertions": "^7.17.12",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.17.12",
+        "@babel/plugin-transform-async-to-generator": "^7.17.12",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.17.12",
+        "@babel/plugin-transform-classes": "^7.17.12",
+        "@babel/plugin-transform-computed-properties": "^7.17.12",
+        "@babel/plugin-transform-destructuring": "^7.18.0",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.17.12",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.18.1",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.17.12",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.18.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.18.2",
+        "@babel/plugin-transform-modules-systemjs": "^7.18.0",
+        "@babel/plugin-transform-modules-umd": "^7.18.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12",
+        "@babel/plugin-transform-new-target": "^7.17.12",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.17.12",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.18.0",
+        "@babel/plugin-transform-reserved-words": "^7.17.12",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.17.12",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.18.2",
+        "@babel/plugin-transform-typeof-symbol": "^7.17.12",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.18.2",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.22.1",
+        "semver": "^6.3.0"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/jest-leak-detector/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+    "@babel/preset-modules": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+    "@babel/preset-react": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.17.12.tgz",
+      "integrity": "sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==",
       "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-react-display-name": "^7.16.7",
+        "@babel/plugin-transform-react-jsx": "^7.17.12",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+    "@babel/preset-typescript": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz",
+      "integrity": "sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==",
       "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-transform-typescript": "^7.17.12"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+    "@babel/runtime": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
+      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
       }
     },
-    "node_modules/jest-message-util": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.0.tgz",
-      "integrity": "sha512-RpA8mpaJ/B2HphDMiDlrAZdDytkmwFqgjDZovM21F35lHGeUeCvYmm6W+sbQ0ydaLpg5bFAUuWG1cjqOl8vqrw==",
+    "@babel/runtime-corejs3": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.6.tgz",
+      "integrity": "sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==",
       "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.0",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "core-js-pure": "^3.14.0",
+        "regenerator-runtime": "^0.13.4"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+    "@babel/template": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
+      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
       }
     },
-    "node_modules/jest-message-util/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+    "@babel/traverse": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz",
+      "integrity": "sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==",
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.18.2",
+        "@babel/helper-environment-visitor": "^7.18.2",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.18.0",
+        "@babel/types": "^7.18.2",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "dependencies": {
+        "debug": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "globals": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
       }
     },
-    "node_modules/jest-message-util/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-      "dev": true
-    },
-    "node_modules/jest-mock": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.0.tgz",
-      "integrity": "sha512-H7BrhggNn77WhdL7O1apG0Q/iwl0Bdd5E1ydhCJzL3oBLh/UYxAwR3EJLsBZ9XA3ZU4PA3UNw4tQjduBTCTmLw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+    "@babel/types": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz",
+      "integrity": "sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==",
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
+    "@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
+    },
+    "@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "devOptional": true,
+      "requires": {
+        "@jridgewell/trace-mapping": "0.3.9"
       },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
+      "dependencies": {
+        "@jridgewell/trace-mapping": {
+          "version": "0.3.9",
+          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+          "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+          "devOptional": true,
+          "requires": {
+            "@jridgewell/resolve-uri": "^3.0.3",
+            "@jridgewell/sourcemap-codec": "^1.4.10"
+          }
         }
       }
     },
-    "node_modules/jest-regex-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
-      "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
+    "@cush/relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@cush/relative/-/relative-1.0.0.tgz",
+      "integrity": "sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA=="
     },
-    "node_modules/jest-resolve": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
-      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+    "@emotion/is-prop-valid": {
+      "version": "0.8.8",
+      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+      "requires": {
+        "@emotion/memoize": "0.7.4"
       }
     },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.0.tgz",
-      "integrity": "sha512-Ue1VYoSZquPwEvng7Uefw8RmZR+me/1kr30H2jMINjGeHgeO/JgrR6wxj2ofkJ7KSAA11W3cOrhNCbj5Dqqd9g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "jest-regex-util": "^28.0.2",
-        "jest-snapshot": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
+    "@emotion/memoize": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
     },
-    "node_modules/jest-resolve-dependencies/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
+    "@emotion/stylis": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
+      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
     },
-    "node_modules/jest-resolve/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
+    "@emotion/unitless": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
+      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
     },
-    "node_modules/jest-resolve/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "@eslint/eslintrc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
       "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.2",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/jest-resolve/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
+    "@fortawesome/fontawesome-free": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz",
+      "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg=="
     },
-    "node_modules/jest-runner": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.0.tgz",
-      "integrity": "sha512-FBpmuh1HB2dsLklAlRdOxNTTHKFR6G1Qmd80pVDvwbZXTriqjWqjei5DKFC1UlM732KjYcE6yuCdiF0WUCOS2w==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/console": "^28.1.0",
-        "@jest/environment": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/transform": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^28.0.2",
-        "jest-environment-node": "^28.1.0",
-        "jest-haste-map": "^28.1.0",
-        "jest-leak-detector": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-resolve": "^28.1.0",
-        "jest-runtime": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "jest-watcher": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "source-map-support": "0.5.13",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
+    "@hookform/error-message": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@hookform/error-message/-/error-message-2.0.0.tgz",
+      "integrity": "sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==",
+      "requires": {}
     },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
+    "@hookform/resolvers": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.8.9.tgz",
+      "integrity": "sha512-IXwGpjewxScF4N2kuyYDip6ABqH4lCg9n1f1mp0vbmKik+u+nestpbtdEs6U1WQZxwaoK/2APv1+MEr4czX7XA==",
+      "requires": {}
     },
-    "node_modules/jest-runner/node_modules/jest-haste-map": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-      "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
+    "@humanwhocodes/config-array": {
+      "version": "0.9.5",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
       "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
       },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/jest-runner/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
     },
-    "node_modules/jest-runner/node_modules/jest-resolve": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.0.tgz",
-      "integrity": "sha512-vvfN7+tPNnnhDvISuzD1P+CRVP8cK0FHXRwPAcdDaQv4zgvwvag2n55/h5VjYcM5UJG7L4TwE5tZlzcI0X2Lhw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/jest-validate": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-      "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/types": "^28.1.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "leven": "^3.1.0",
-        "pretty-format": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/jest-worker": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-      "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/jest-runner/node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+        },
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
+        }
       }
     },
-    "node_modules/jest-runner/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
     },
-    "node_modules/jest-runtime": {
+    "@jest/console": {
       "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.0.tgz",
-      "integrity": "sha512-wNYDiwhdH/TV3agaIyVF0lsJ33MhyujOe+lNTUiolqKt8pchy1Hq4+tDMGbtD5P/oNLA3zYrpx73T9dMTOCAcg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/environment": "^28.1.0",
-        "@jest/fake-timers": "^28.1.0",
-        "@jest/globals": "^28.1.0",
-        "@jest/source-map": "^28.0.2",
-        "@jest/test-result": "^28.1.0",
-        "@jest/transform": "^28.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.0.tgz",
+      "integrity": "sha512-tscn3dlJFGay47kb4qVruQg/XWlmvU0xp3EJOjzzY+sBaI+YgwKcvAmTcyYU7xEiLLIY5HCdWRooAL8dqkFlDA==",
+      "requires": {
         "@jest/types": "^28.1.0",
+        "@types/node": "*",
         "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
         "jest-message-util": "^28.1.0",
-        "jest-mock": "^28.1.0",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.0",
-        "jest-snapshot": "^28.1.0",
         "jest-util": "^28.1.0",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "slash": "^3.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/jest-haste-map": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-      "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/graceful-fs": "^4.1.3",
+    "@jest/core": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
+      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+      "requires": {
+        "@jest/console": "^27.5.1",
+        "@jest/reporters": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
         "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/jest-resolve": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.0.tgz",
-      "integrity": "sha512-vvfN7+tPNnnhDvISuzD1P+CRVP8cK0FHXRwPAcdDaQv4zgvwvag2n55/h5VjYcM5UJG7L4TwE5tZlzcI0X2Lhw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
+        "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
+        "jest-changed-files": "^27.5.1",
+        "jest-config": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-resolve-dependencies": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "jest-watcher": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/jest-validate": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-      "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
-        "@jest/types": "^28.1.0",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "leven": "^3.1.0",
-        "pretty-format": "^28.1.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "emittery": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+          "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "jest-watcher": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
+          "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+          "requires": {
+            "@jest/test-result": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^4.0.0",
+            "jest-util": "^27.5.1",
+            "string-length": "^4.0.1"
+          }
+        }
       }
     },
-    "node_modules/jest-runtime/node_modules/jest-worker": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-      "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
+    "@jest/environment": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
+      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+      "requires": {
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
         "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "jest-mock": "^27.5.1"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/jest-runtime/node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        }
       }
     },
-    "node_modules/jest-serializer": {
+    "@jest/fake-timers": {
       "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-      "dev": true,
-      "dependencies": {
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "requires": {
+        "@jest/types": "^27.5.1",
+        "@sinonjs/fake-timers": "^8.0.1",
         "@types/node": "*",
-        "graceful-fs": "^4.2.9"
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.0.tgz",
-      "integrity": "sha512-ex49M2ZrZsUyQLpLGxQtDbahvgBjlLPgklkqGM0hq/F7W/f8DyqZxVHjdy19QKBm4O93eDp+H5S23EiTbbUmHw==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^28.1.0",
-        "@jest/transform": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/babel__traverse": "^7.0.6",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^28.1.0",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^28.1.0",
-        "jest-get-type": "^28.0.2",
-        "jest-haste-map": "^28.1.0",
-        "jest-matcher-utils": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^28.1.0",
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
+    "@jest/globals": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
+      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+      "requires": {
+        "@jest/environment": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "expect": "^27.5.1"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/jest-haste-map": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-      "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-      "dev": true,
-      "peer": true,
       "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        }
       }
     },
-    "node_modules/jest-snapshot/node_modules/jest-matcher-utils": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.0.tgz",
-      "integrity": "sha512-onnax0n2uTLRQFKAjC7TuaxibrPSvZgKTcSCnNUz/tOjJ9UhxNm7ZmPpoQavmTDUjXvUQ8KesWk2/VdrxIFzTQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
+    "@jest/reporters": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
+      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+      "requires": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-diff": "^28.1.0",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.0"
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.9",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.1.3",
+        "jest-haste-map": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^8.1.0"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "dependencies": {
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
-    "node_modules/jest-snapshot/node_modules/jest-regex-util": {
+    "@jest/schemas": {
       "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "dev": true,
-      "peer": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
+      "integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
+      "requires": {
+        "@sinclair/typebox": "^0.23.3"
       }
     },
-    "node_modules/jest-snapshot/node_modules/jest-worker": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-      "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+    "@jest/source-map": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
+      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+      "requires": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.9",
+        "source-map": "^0.6.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/pretty-format": {
+    "@jest/test-result": {
       "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/jest-sonar-reporter": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jest-sonar-reporter/-/jest-sonar-reporter-2.0.0.tgz",
-      "integrity": "sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==",
-      "dev": true,
-      "dependencies": {
-        "xml": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/jest-styled-components": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/jest-styled-components/-/jest-styled-components-7.0.8.tgz",
-      "integrity": "sha512-0KE54d0yIzKcvtOv8eikyjG3rFRtKYUyQovaoha3nondtZzXYGB3bhsvYgEegU08Iry0ndWx2+g9f5ZzD4I+0Q==",
-      "dev": true,
-      "dependencies": {
-        "css": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 12"
-      },
-      "peerDependencies": {
-        "styled-components": ">= 5"
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.0.tgz",
+      "integrity": "sha512-sBBFIyoPzrZho3N+80P35A5oAkSKlGfsEFfXFWuPGBsW40UAjCkGakZhn4UQK4iQlW2vgCDMRDOob9FGKV8YoQ==",
+      "requires": {
+        "@jest/console": "^28.1.0",
+        "@jest/types": "^28.1.0",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
       }
     },
-    "node_modules/jest-util": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.0.tgz",
-      "integrity": "sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
+    "@jest/test-sequencer": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
+      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+      "requires": {
+        "@jest/test-result": "^27.5.1",
         "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "jest-haste-map": "^27.5.1",
+        "jest-runtime": "^27.5.1"
       },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "dependencies": {
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
-    "node_modules/jest-validate": {
+    "@jest/transform": {
       "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
-      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
-      "dev": true,
-      "dependencies": {
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
+      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+      "requires": {
+        "@babel/core": "^7.1.0",
         "@jest/types": "^27.5.1",
-        "camelcase": "^6.2.0",
+        "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "leven": "^3.1.0",
-        "pretty-format": "^27.5.1"
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "dependencies": {
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
-    "node_modules/jest-validate/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dev": true,
-      "dependencies": {
+    "@jest/types": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.0.tgz",
+      "integrity": "sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==",
+      "requires": {
+        "@jest/schemas": "^28.0.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
+    "@jridgewell/gen-mapping": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+      "requires": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
-    "node_modules/jest-validate/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
+    "@jridgewell/resolve-uri": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
+      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="
     },
-    "node_modules/jest-watch-typeahead": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
-      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.3.1",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^28.0.0",
-        "jest-watcher": "^28.0.0",
-        "slash": "^4.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "jest": "^27.0.0 || ^28.0.0"
-      }
+    "@jridgewell/set-array": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
+      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="
     },
-    "node_modules/jest-watch-typeahead/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
+      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.11.tgz",
+      "integrity": "sha512-RllI476aSMsxzeI9TtlSMoNTgHDxEmnl6GkkHwhr0vdL8W+0WuesyI8Vd3rBOfrwtPXbPxdT9ADJdiOKgzxPQA==",
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+    "@nestjs/common": {
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-8.4.4.tgz",
+      "integrity": "sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==",
       "dev": true,
-      "engines": {
-        "node": ">=12"
+      "requires": {
+        "axios": "0.26.1",
+        "iterare": "1.2.1",
+        "tslib": "2.3.1",
+        "uuid": "8.3.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/string-length": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+    "@nestjs/core": {
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-8.4.4.tgz",
+      "integrity": "sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==",
       "dev": true,
-      "dependencies": {
-        "char-regex": "^2.0.0",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12.20"
+      "requires": {
+        "@nuxtjs/opencollective": "0.3.2",
+        "fast-safe-stringify": "2.1.1",
+        "iterare": "1.2.1",
+        "object-hash": "3.0.0",
+        "path-to-regexp": "3.2.0",
+        "tslib": "2.3.1",
+        "uuid": "8.3.2"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "path-to-regexp": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",
+          "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==",
+          "dev": true
+        },
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+          "dev": true
+        }
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
-      "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
-      "engines": {
-        "node": ">=12.20"
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
     },
-    "node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+    "@nodelib/fs.walk": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
+      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
       "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
       }
     },
-    "node_modules/jest-watcher": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.0.tgz",
-      "integrity": "sha512-tNHMtfLE8Njcr2IRS+5rXYA4BhU90gAOwI9frTGOqd+jX0P/Au/JfRSNqsf5nUTcWdbVYuLxS1KjnzILSoR5hA==",
+    "@nuxtjs/opencollective": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz",
+      "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==",
       "dev": true,
-      "dependencies": {
-        "@jest/test-result": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "jest-util": "^28.1.0",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      "requires": {
+        "chalk": "^4.1.0",
+        "consola": "^2.15.0",
+        "node-fetch": "^2.6.1"
       }
     },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+    "@openapitools/openapi-generator-cli": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.5.1.tgz",
+      "integrity": "sha512-WSRQBU0dCSVD+0Qv8iCsv0C4iMaZe/NpJ/CT4SmrEYLH3txoKTE8wEfbdj/kqShS8Or0YEGDPUzhSIKY151L0w==",
       "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+      "requires": {
+        "@nestjs/common": "8.4.4",
+        "@nestjs/core": "8.4.4",
+        "@nuxtjs/opencollective": "0.3.2",
+        "chalk": "4.1.2",
+        "commander": "8.3.0",
+        "compare-versions": "4.1.3",
+        "concurrently": "6.5.1",
+        "console.table": "0.10.0",
+        "fs-extra": "10.0.1",
+        "glob": "7.1.6",
+        "inquirer": "8.2.2",
+        "lodash": "4.17.21",
+        "reflect-metadata": "0.1.13",
+        "rxjs": "7.5.5",
+        "tslib": "2.0.3"
       },
-      "engines": {
-        "node": ">= 10.13.0"
+      "dependencies": {
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "fs-extra": {
+          "version": "10.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
+          "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rxjs": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.1.0"
+          },
+          "dependencies": {
+            "tslib": {
+              "version": "2.4.0",
+              "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+              "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+              "dev": true
+            }
+          }
+        },
+        "tslib": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+    "@popperjs/core": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
+      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
+    },
+    "@reduxjs/toolkit": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.2.tgz",
+      "integrity": "sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==",
+      "requires": {
+        "immer": "^9.0.7",
+        "redux": "^4.1.2",
+        "redux-thunk": "^2.4.1",
+        "reselect": "^4.1.5"
       }
     },
-    "node_modules/js-sha3": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
+    "@rooks/use-outside-click-ref": {
+      "version": "4.11.2",
+      "resolved": "https://registry.npmjs.org/@rooks/use-outside-click-ref/-/use-outside-click-ref-4.11.2.tgz",
+      "integrity": "sha512-w2bCW69zcpLh0KmN/odAuBsQ3sps+73KEu7zMOi0o4YMfDo+tXcqwlTJiLYysd0BEoQC9pNIklzZmI9zZep69g==",
+      "requires": {}
     },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    "@rushstack/eslint-patch": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
+      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
+      "dev": true
     },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+    "@sinclair/typebox": {
+      "version": "0.23.5",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
+      "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg=="
+    },
+    "@sinonjs/commons": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "requires": {
+        "type-detect": "4.0.8"
       }
     },
-    "node_modules/jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
+    "@sinonjs/fake-timers": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "requires": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "@testing-library/dom": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
+      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
+      "requires": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^4.2.0",
+        "aria-query": "^5.0.0",
+        "chalk": "^4.1.0",
+        "dom-accessibility-api": "^0.5.9",
+        "lz-string": "^1.4.4",
+        "pretty-format": "^27.0.2"
       },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
+      "dependencies": {
+        "aria-query": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
+          "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg=="
+        },
+        "dom-accessibility-api": {
+          "version": "0.5.10",
+          "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz",
+          "integrity": "sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g=="
         }
       }
     },
-    "node_modules/jsdom/node_modules/tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+    "@testing-library/jest-dom": {
+      "version": "5.16.4",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz",
+      "integrity": "sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==",
       "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
+      "requires": {
+        "@babel/runtime": "^7.9.2",
+        "@types/testing-library__jest-dom": "^5.9.1",
+        "aria-query": "^5.0.0",
+        "chalk": "^3.0.0",
+        "css": "^3.0.0",
+        "css.escape": "^1.5.1",
+        "dom-accessibility-api": "^0.5.6",
+        "lodash": "^4.17.15",
+        "redent": "^3.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "aria-query": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
+          "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        }
       }
     },
-    "node_modules/jsdom/node_modules/webidl-conversions": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.4"
+    "@testing-library/react": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.2.0.tgz",
+      "integrity": "sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g==",
+      "requires": {
+        "@babel/runtime": "^7.12.5",
+        "@testing-library/dom": "^8.5.0",
+        "@types/react-dom": "^18.0.0"
       }
     },
-    "node_modules/jsdom/node_modules/whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+    "@testing-library/user-event": {
+      "version": "13.5.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
+      "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
       "dev": true,
-      "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
+      "requires": {
+        "@babel/runtime": "^7.12.5"
       }
     },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+    "@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
     },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
+    "@tsconfig/node10": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
+      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+      "devOptional": true
     },
-    "node_modules/json-schema-faker": {
-      "version": "0.5.0-rcv.40",
-      "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.5.0-rcv.40.tgz",
-      "integrity": "sha512-BczZvu03jKrGh3ovCWrHusiX6MwiaKK2WZeyomKBNA8Nm/n7aBYz0mub1CnONB6cgxOZTNxx4afNmLblbUmZbA==",
-      "dependencies": {
-        "json-schema-ref-parser": "^6.1.0",
-        "jsonpath-plus": "^5.1.0"
-      },
-      "bin": {
-        "jsf": "bin/gen.js"
-      }
+    "@tsconfig/node12": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
+      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+      "devOptional": true
     },
-    "node_modules/json-schema-ref-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz",
-      "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==",
-      "dependencies": {
-        "call-me-maybe": "^1.0.1",
-        "js-yaml": "^3.12.1",
-        "ono": "^4.0.11"
-      }
+    "@tsconfig/node14": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
+      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+      "devOptional": true
     },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    "@tsconfig/node16": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
+      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+      "devOptional": true
     },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    "@types/aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="
     },
-    "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
+    "@types/babel__core": {
+      "version": "7.1.19",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
+      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+    "@types/babel__generator": {
+      "version": "7.6.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+      "requires": {
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/jsonpath-plus": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-5.1.0.tgz",
-      "integrity": "sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ==",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/jsonpointer": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz",
-      "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
-      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "object.assign": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=4.0"
+    "@types/babel__template": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "requires": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+    "@types/babel__traverse": {
+      "version": "7.17.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
+      "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
+      "requires": {
+        "@babel/types": "^7.3.0"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
+    "@types/eventsource": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@types/eventsource/-/eventsource-1.1.8.tgz",
+      "integrity": "sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==",
+      "dev": true
     },
-    "node_modules/klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
+    "@types/graceful-fs": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "requires": {
+        "@types/node": "*"
       }
     },
-    "node_modules/language-subtag-registry": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
+    "@types/history": {
+      "version": "4.7.11",
+      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
+      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
       "dev": true
     },
-    "node_modules/language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
-      "dev": true,
-      "dependencies": {
-        "language-subtag-registry": "~0.3.2"
+    "@types/hoist-non-react-statics": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
+      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
+      "requires": {
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
       }
     },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
+    "@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="
+    },
+    "@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "requires": {
+        "@types/istanbul-lib-coverage": "*"
       }
     },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+    "@types/istanbul-reports": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "requires": {
+        "@types/istanbul-lib-report": "*"
       }
     },
-    "node_modules/lilconfig": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
-      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==",
+    "@types/jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.1.tgz",
+      "integrity": "sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "jest-matcher-utils": "^27.0.0",
+        "pretty-format": "^27.0.0"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+    "@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
       "dev": true
     },
-    "node_modules/lint-staged": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.1.2.tgz",
-      "integrity": "sha512-bSMcQVqMW98HLLLR2c2tZ+vnDCnx4fd+0QJBQgN/4XkdspGRPc8DGp7UuOEBe1ApCfJ+wXXumYnJmU+wDo7j9A==",
-      "dev": true,
-      "dependencies": {
-        "cli-truncate": "^3.1.0",
-        "colorette": "^2.0.16",
-        "commander": "^8.3.0",
-        "debug": "^4.3.2",
-        "enquirer": "^2.3.6",
-        "execa": "^5.1.1",
-        "lilconfig": "2.0.4",
-        "listr2": "^3.13.3",
-        "micromatch": "^4.0.4",
-        "normalize-path": "^3.0.0",
-        "object-inspect": "^1.11.0",
-        "string-argv": "^0.3.1",
-        "supports-color": "^9.0.2",
-        "yaml": "^1.10.2"
-      },
-      "bin": {
-        "lint-staged": "bin/lint-staged.js"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/lint-staged"
-      }
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
     },
-    "node_modules/lint-staged/node_modules/colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
+    "@types/lodash": {
+      "version": "4.14.177",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
+      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
       "dev": true
     },
-    "node_modules/lint-staged/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
+    "@types/node": {
+      "version": "16.11.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
+      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
     },
-    "node_modules/lint-staged/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+    "@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
-    "node_modules/lint-staged/node_modules/object-inspect": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "@types/prettier": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
+      "integrity": "sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg=="
     },
-    "node_modules/lint-staged/node_modules/supports-color": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.1.tgz",
-      "integrity": "sha512-Obv7ycoCTG51N7y175StI9BlAXrmgZrFhZOb0/PyjHBher/NmsdBgbbQ1Inhq+gIhz6+7Gb+jWF2Vqi7Mf1xnQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
+    "@types/prop-types": {
+      "version": "15.7.5",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
     },
-    "node_modules/listr2": {
-      "version": "3.13.5",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.5.tgz",
-      "integrity": "sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA==",
-      "dev": true,
-      "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.4.0",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
-      },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
-        }
+    "@types/react": {
+      "version": "18.0.9",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz",
+      "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==",
+      "requires": {
+        "@types/prop-types": "*",
+        "@types/scheduler": "*",
+        "csstype": "^3.0.2"
       }
     },
-    "node_modules/listr2/node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+    "@types/react-datepicker": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.3.4.tgz",
+      "integrity": "sha512-5nTTz37KdTUgMZ1AAxztMWNtEnIMVRo8oCAEhIv0a6uUqDjvSKaMyPRpBV+8chi6f/A8wlTKJIpojpXca2dx3A==",
       "dev": true,
-      "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "@popperjs/core": "^2.9.2",
+        "@types/react": "*",
+        "date-fns": "^2.0.1",
+        "react-popper": "^2.2.5"
       }
     },
-    "node_modules/listr2/node_modules/colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-      "dev": true
-    },
-    "node_modules/listr2/node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+    "@types/react-dom": {
+      "version": "18.0.5",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
+      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
+      "requires": {
+        "@types/react": "*"
       }
     },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+    "@types/react-redux": {
+      "version": "7.1.22",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
+      "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
       "dev": true,
-      "engines": {
-        "node": ">=6.11.5"
+      "requires": {
+        "@types/hoist-non-react-statics": "^3.3.0",
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0",
+        "redux": "^4.0.0"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+    "@types/react-router": {
+      "version": "5.1.18",
+      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
+      "integrity": "sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==",
       "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
+      "requires": {
+        "@types/history": "^4.7.11",
+        "@types/react": "*"
       }
     },
-    "node_modules/loader-utils/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+    "@types/react-router-dom": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
+      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
       "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
+      "requires": {
+        "@types/history": "^4.7.11",
+        "@types/react": "*",
+        "@types/react-router": "*"
       }
     },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+    "@types/redux-mock-store": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@types/redux-mock-store/-/redux-mock-store-1.0.3.tgz",
+      "integrity": "sha512-Wqe3tJa6x9MxMN4DJnMfZoBRBRak1XTPklqj4qkVm5VBpZnC8PSADf4kLuFQ9NAdHaowfWoEeUMz7NWc2GMtnA==",
+      "dev": true,
+      "requires": {
+        "redux": "^4.0.5"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
+    "@types/scheduler": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
     },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    "@types/stack-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
     },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+    "@types/styled-components": {
+      "version": "5.1.18",
+      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.18.tgz",
+      "integrity": "sha512-xPTYmWP7Mxk5TAD3pYsqjwA9G5fAI8e/S51QUJEl7EQD1siKCdiYXIWiH2lzoHRl+QqbQCJMcGv3YTF3OmyPdQ==",
+      "dev": true,
+      "requires": {
+        "@types/hoist-non-react-statics": "*",
+        "@types/react": "*",
+        "csstype": "^3.0.2"
+      }
     },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
+    "@types/testing-library__jest-dom": {
+      "version": "5.14.1",
+      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz",
+      "integrity": "sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw==",
+      "dev": true,
+      "requires": {
+        "@types/jest": "*"
+      }
     },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+    "@types/uuid": {
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
+      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
       "dev": true
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    "@types/yargs": {
+      "version": "17.0.10",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
+      "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
+      "requires": {
+        "@types/yargs-parser": "*"
+      }
     },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    "@types/yargs-parser": {
+      "version": "20.2.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA=="
     },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
+    "@types/yup": {
+      "version": "0.29.13",
+      "resolved": "https://registry.npmjs.org/@types/yup/-/yup-0.29.13.tgz",
+      "integrity": "sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g=="
     },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+    "@typescript-eslint/eslint-plugin": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz",
+      "integrity": "sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ==",
       "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+      "requires": {
+        "@typescript-eslint/scope-manager": "5.10.0",
+        "@typescript-eslint/type-utils": "5.10.0",
+        "@typescript-eslint/utils": "5.10.0",
+        "debug": "^4.3.2",
+        "functional-red-black-tree": "^1.0.1",
+        "ignore": "^5.1.8",
+        "regexpp": "^3.2.0",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-      "dev": true,
       "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "debug": {
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/log-update/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+    "@typescript-eslint/experimental-utils": {
+      "version": "5.23.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.23.0.tgz",
+      "integrity": "sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q==",
       "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+      "requires": {
+        "@typescript-eslint/utils": "5.23.0"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
+        "@typescript-eslint/scope-manager": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
+          "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.23.0",
+            "@typescript-eslint/visitor-keys": "5.23.0"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
+          "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
+          "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.23.0",
+            "@typescript-eslint/visitor-keys": "5.23.0",
+            "debug": "^4.3.2",
+            "globby": "^11.0.4",
+            "is-glob": "^4.0.3",
+            "semver": "^7.3.5",
+            "tsutils": "^3.21.0"
+          }
+        },
+        "@typescript-eslint/utils": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
+          "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.9",
+            "@typescript-eslint/scope-manager": "5.23.0",
+            "@typescript-eslint/types": "5.23.0",
+            "@typescript-eslint/typescript-estree": "5.23.0",
+            "eslint-scope": "^5.1.1",
+            "eslint-utils": "^3.0.0"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
+          "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.23.0",
+            "eslint-visitor-keys": "^3.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+    "@typescript-eslint/parser": {
+      "version": "5.27.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz",
+      "integrity": "sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==",
       "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "5.27.0",
+        "@typescript-eslint/types": "5.27.0",
+        "@typescript-eslint/typescript-estree": "5.27.0",
+        "debug": "^4.3.4"
+      },
       "dependencies": {
-        "tslib": "^2.0.3"
+        "@typescript-eslint/scope-manager": {
+          "version": "5.27.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz",
+          "integrity": "sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.27.0",
+            "@typescript-eslint/visitor-keys": "5.27.0"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "5.27.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz",
+          "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "5.27.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz",
+          "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.27.0",
+            "@typescript-eslint/visitor-keys": "5.27.0",
+            "debug": "^4.3.4",
+            "globby": "^11.1.0",
+            "is-glob": "^4.0.3",
+            "semver": "^7.3.7",
+            "tsutils": "^3.21.0"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "5.27.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz",
+          "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.27.0",
+            "eslint-visitor-keys": "^3.3.0"
+          }
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/lower-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "@typescript-eslint/scope-manager": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz",
+      "integrity": "sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg==",
       "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=",
-      "bin": {
-        "lz-string": "bin/bin.js"
+      "requires": {
+        "@typescript-eslint/types": "5.10.0",
+        "@typescript-eslint/visitor-keys": "5.10.0"
       }
     },
-    "node_modules/magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+    "@typescript-eslint/type-utils": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz",
+      "integrity": "sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ==",
       "dev": true,
+      "requires": {
+        "@typescript-eslint/utils": "5.10.0",
+        "debug": "^4.3.2",
+        "tsutils": "^3.21.0"
+      },
       "dependencies": {
-        "sourcemap-codec": "^1.4.8"
+        "debug": {
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+    "@typescript-eslint/types": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.0.tgz",
+      "integrity": "sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==",
+      "dev": true
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz",
+      "integrity": "sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA==",
       "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+      "requires": {
+        "@typescript-eslint/types": "5.10.0",
+        "@typescript-eslint/visitor-keys": "5.10.0",
+        "debug": "^4.3.2",
+        "globby": "^11.0.4",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "debug": {
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "fast-glob": {
+          "version": "3.2.11",
+          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+          "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+          "dev": true,
+          "requires": {
+            "@nodelib/fs.stat": "^2.0.2",
+            "@nodelib/fs.walk": "^1.2.3",
+            "glob-parent": "^5.1.2",
+            "merge2": "^1.3.0",
+            "micromatch": "^4.0.4"
+          }
+        },
+        "globby": {
+          "version": "11.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+          "dev": true,
+          "requires": {
+            "array-union": "^2.1.0",
+            "dir-glob": "^3.0.1",
+            "fast-glob": "^3.2.9",
+            "ignore": "^5.2.0",
+            "merge2": "^1.4.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+    "@typescript-eslint/utils": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.0.tgz",
+      "integrity": "sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg==",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "requires": {
+        "@types/json-schema": "^7.0.9",
+        "@typescript-eslint/scope-manager": "5.10.0",
+        "@typescript-eslint/types": "5.10.0",
+        "@typescript-eslint/typescript-estree": "5.10.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
+      },
+      "dependencies": {
+        "@types/json-schema": {
+          "version": "7.0.9",
+          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+          "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
-    },
-    "node_modules/makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+    "@typescript-eslint/visitor-keys": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz",
+      "integrity": "sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ==",
       "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "5.10.0",
+        "eslint-visitor-keys": "^3.0.0"
+      },
       "dependencies": {
-        "tmpl": "1.0.x"
+        "eslint-visitor-keys": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
+          "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+          "dev": true
+        }
       }
     },
-    "node_modules/match-sorter": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
-      "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
+    "@vitejs/plugin-react": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-1.3.2.tgz",
+      "integrity": "sha512-aurBNmMo0kz1O4qRoY+FM4epSA39y3ShWGuqfLRA/3z0oEJAdtoSfgA3aO98/PCCHAqMaduLxIxErWrVKIFzXA==",
+      "requires": {
+        "@babel/core": "^7.17.10",
+        "@babel/plugin-transform-react-jsx": "^7.17.3",
+        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
+        "@babel/plugin-transform-react-jsx-self": "^7.16.7",
+        "@babel/plugin-transform-react-jsx-source": "^7.16.7",
+        "@rollup/pluginutils": "^4.2.1",
+        "react-refresh": "^0.13.0",
+        "resolve": "^1.22.0"
+      },
       "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "remove-accents": "0.4.2"
+        "@rollup/pluginutils": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
+          "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
+          "requires": {
+            "estree-walker": "^2.0.1",
+            "picomatch": "^2.2.2"
+          }
+        },
+        "estree-walker": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+          "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+        },
+        "react-refresh": {
+          "version": "0.13.0",
+          "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.13.0.tgz",
+          "integrity": "sha512-XP8A9BT0CpRBD+NYLLeIhld/RqG9+gktUjW1FkE+Vm7OCinbG1SshcK5tb9ls4kzvjZr9mOQc7HYgBngEyPAXg=="
+        }
       }
     },
-    "node_modules/mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-      "dev": true
+    "abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
     },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "ace-builds": {
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
+      "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
     },
-    "node_modules/memfs": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz",
-      "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==",
-      "dev": true,
-      "dependencies": {
-        "fs-monkey": "1.0.3"
+    "acorn": {
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+    },
+    "acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "requires": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
       },
-      "engines": {
-        "node": ">= 4.0.0"
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+        }
       }
     },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
+      "requires": {}
     },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
     },
-    "node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+    "agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "requires": {
+        "debug": "4"
       },
-      "engines": {
-        "node": ">=8.6"
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
       }
     },
-    "node_modules/microseconds": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
-      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
+      "requires": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
+    "ajv": {
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
+      "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       }
     },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
+    "ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "requires": {
+        "type-fest": "^0.21.3"
       },
-      "engines": {
-        "node": ">= 0.6"
+      "dependencies": {
+        "type-fest": {
+          "version": "0.21.3",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
+        }
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz",
-      "integrity": "sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w==",
-      "dev": true,
-      "dependencies": {
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/multicast-dns": {
-      "version": "7.2.4",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.4.tgz",
-      "integrity": "sha512-XkCYOU+rr2Ft3LI6w4ye51M3VK31qJXFIxu0XLw169PtKG0Zx47OrXeVW/GCYOfpC9s1yyyf1S+L8/4LY0J9Zw==",
-      "dev": true,
-      "dependencies": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
-      },
-      "bin": {
-        "multicast-dns": "cli.js"
-      }
-    },
-    "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
-    "node_modules/nano-time": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
-      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
-      "dependencies": {
-        "big-integer": "^1.6.16"
-      }
-    },
-    "node_modules/nanoclone": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
-      "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
-    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
+    "ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "requires": {
+        "color-convert": "^2.0.1"
       },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
-    },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/no-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         }
       }
     },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6.13.0"
+    "anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       }
     },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "devOptional": true
     },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+    "aria-query": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
+      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "requires": {
+        "@babel/runtime": "^7.10.2",
+        "@babel/runtime-corejs3": "^7.10.2"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+    "array-includes": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
       "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
       },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dev": true,
       "dependencies": {
-        "boolbase": "~1.0.0"
+        "define-properties": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+          "dev": true,
+          "requires": {
+            "has-property-descriptors": "^1.0.0",
+            "object-keys": "^1.1.1"
+          }
+        },
+        "es-abstract": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "function.prototype.name": "^1.1.5",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-property-descriptors": "^1.0.0",
+            "has-symbols": "^1.0.3",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.2",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.2",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.2",
+            "object-inspect": "^1.12.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "regexp.prototype.flags": "^1.4.1",
+            "string.prototype.trimend": "^1.0.5",
+            "string.prototype.trimstart": "^1.0.5",
+            "unbox-primitive": "^1.0.2"
+          }
+        },
+        "has-bigints": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+          "dev": true
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+          "dev": true
+        },
+        "is-negative-zero": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "is-shared-array-buffer": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2"
+          }
+        },
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+          "dev": true,
+          "requires": {
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "is-weakref": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2"
+          }
+        },
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+          "dev": true
+        },
+        "regexp.prototype.flags": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "functions-have-names": "^1.2.2"
+          }
+        },
+        "string.prototype.trimend": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
+          }
+        },
+        "string.prototype.trimstart": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
+          }
+        },
+        "unbox-primitive": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-bigints": "^1.0.2",
+            "has-symbols": "^1.0.3",
+            "which-boxed-primitive": "^1.0.2"
+          }
+        }
       }
     },
-    "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+    "array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
       "dev": true,
-      "dependencies": {
+      "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.entries/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
-      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/oblivious-set": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
-      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
-    },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ono": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz",
-      "integrity": "sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==",
-      "dependencies": {
-        "format-util": "^1.0.3"
-      }
-    },
-    "node_modules/open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-      "dev": true,
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-retry": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/retry": "0.12.0",
-        "retry": "^0.13.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/param-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse-ms": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
-      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/pascal-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-up/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.13",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
-      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.3",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz",
-      "integrity": "sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.2"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.2"
-      }
-    },
-    "node_modules/postcss-browser-comments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz",
-      "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "peerDependencies": {
-        "browserslist": ">=4",
-        "postcss": ">=8"
-      }
-    },
-    "node_modules/postcss-calc": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.2"
-      }
-    },
-    "node_modules/postcss-calc/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-clamp": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
-      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=7.6.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.6"
-      }
-    },
-    "node_modules/postcss-clamp/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-color-functional-notation": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz",
-      "integrity": "sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-color-functional-notation/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-color-hex-alpha": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.3.tgz",
-      "integrity": "sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-color-rebeccapurple": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.2.tgz",
-      "integrity": "sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-colormin": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz",
-      "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.9.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-colormin/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-convert-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz",
-      "integrity": "sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-convert-values/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-custom-media": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz",
-      "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-custom-properties": {
-      "version": "12.1.7",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.7.tgz",
-      "integrity": "sha512-N/hYP5gSoFhaqxi2DPCmvto/ZcRDVjE3T1LiAMzc/bg53hvhcHOLpXOHb526LzBBp5ZlAUhkuot/bfpmpgStJg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-custom-properties/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-custom-selectors": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz",
-      "integrity": "sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.2"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz",
-      "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-discard-comments": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz",
-      "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-empty": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-overridden": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-double-position-gradients": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz",
-      "integrity": "sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-double-position-gradients/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-env-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
-      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-env-function/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-flexbugs-fixes": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz",
-      "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.1.4"
-      }
-    },
-    "node_modules/postcss-focus-visible": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
-      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-focus-within": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
-      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-font-variant": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
-      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-gap-properties": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz",
-      "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-image-set-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz",
-      "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-image-set-function/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-initial": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
-      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.0.0"
-      }
-    },
-    "node_modules/postcss-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
-      "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase-css": "^2.0.1"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >= 16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3"
-      }
-    },
-    "node_modules/postcss-lab-function": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.0.tgz",
-      "integrity": "sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-lab-function/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-load-config": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-      "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
-      "dev": true,
-      "dependencies": {
-        "lilconfig": "^2.0.5",
-        "yaml": "^1.10.2"
-      },
-      "engines": {
-        "node": ">= 10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": ">=8.0.9",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/postcss-load-config/node_modules/lilconfig": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
-      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
-      "dev": true,
-      "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.5",
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-logical": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
-      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-media-minmax": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
-      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-merge-longhand": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz",
-      "integrity": "sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^5.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-merge-longhand/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-merge-rules": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz",
-      "integrity": "sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^3.1.0",
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-font-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
-      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-font-values/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-minify-gradients": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
-      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
-      "dev": true,
-      "dependencies": {
-        "colord": "^2.9.1",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-gradients/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-minify-params": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz",
-      "integrity": "sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.6",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-params/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-minify-selectors": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz",
-      "integrity": "sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-nested": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz",
-      "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.6"
-      },
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.14"
-      }
-    },
-    "node_modules/postcss-nesting": {
-      "version": "10.1.5",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.5.tgz",
-      "integrity": "sha512-+NyBBE/wUcJ+NJgVd2FyKIZ414lul6ExqkOt1qXXw7oRzpQ0iT68cVpx+QfHh42QUMHXNoVLlN9InFY9XXK8ng==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/selector-specificity": "1.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-normalize": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz",
-      "integrity": "sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/normalize.css": "*",
-        "postcss-browser-comments": "^4",
-        "sanitize.css": "*"
-      },
-      "engines": {
-        "node": ">= 12"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4",
-        "postcss": ">= 8"
-      }
-    },
-    "node_modules/postcss-normalize-charset": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-      "dev": true,
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-display-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
-      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-display-values/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-positions": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz",
-      "integrity": "sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-positions/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-repeat-style": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz",
-      "integrity": "sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-repeat-style/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-string": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
-      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-string/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
-      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-timing-functions/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz",
-      "integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.6",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-unicode/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
-      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
-      "dev": true,
-      "dependencies": {
-        "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-url/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
-      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-whitespace/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-opacity-percentage": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz",
-      "integrity": "sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "kofi",
-          "url": "https://ko-fi.com/mrcgrtz"
-        },
-        {
-          "type": "liberapay",
-          "url": "https://liberapay.com/mrcgrtz"
-        }
-      ],
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      }
-    },
-    "node_modules/postcss-ordered-values": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz",
-      "integrity": "sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==",
-      "dev": true,
-      "dependencies": {
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-ordered-values/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-overflow-shorthand": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz",
-      "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
-      "dev": true,
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-page-break": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
-      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8"
-      }
-    },
-    "node_modules/postcss-place": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.4.tgz",
-      "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-place/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-preset-env": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.5.0.tgz",
-      "integrity": "sha512-0BJzWEfCdTtK2R3EiKKSdkE51/DI/BwnhlnicSW482Ym6/DGHud8K0wGLcdjip1epVX0HKo4c8zzTeV/SkiejQ==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/postcss-color-function": "^1.1.0",
-        "@csstools/postcss-font-format-keywords": "^1.0.0",
-        "@csstools/postcss-hwb-function": "^1.0.0",
-        "@csstools/postcss-ic-unit": "^1.0.0",
-        "@csstools/postcss-is-pseudo-class": "^2.0.2",
-        "@csstools/postcss-normalize-display-values": "^1.0.0",
-        "@csstools/postcss-oklab-function": "^1.1.0",
-        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
-        "@csstools/postcss-stepped-value-functions": "^1.0.0",
-        "@csstools/postcss-unset-value": "^1.0.0",
-        "autoprefixer": "^10.4.6",
-        "browserslist": "^4.20.3",
-        "css-blank-pseudo": "^3.0.3",
-        "css-has-pseudo": "^3.0.4",
-        "css-prefers-color-scheme": "^6.0.3",
-        "cssdb": "^6.6.1",
-        "postcss-attribute-case-insensitive": "^5.0.0",
-        "postcss-clamp": "^4.1.0",
-        "postcss-color-functional-notation": "^4.2.2",
-        "postcss-color-hex-alpha": "^8.0.3",
-        "postcss-color-rebeccapurple": "^7.0.2",
-        "postcss-custom-media": "^8.0.0",
-        "postcss-custom-properties": "^12.1.7",
-        "postcss-custom-selectors": "^6.0.0",
-        "postcss-dir-pseudo-class": "^6.0.4",
-        "postcss-double-position-gradients": "^3.1.1",
-        "postcss-env-function": "^4.0.6",
-        "postcss-focus-visible": "^6.0.4",
-        "postcss-focus-within": "^5.0.4",
-        "postcss-font-variant": "^5.0.0",
-        "postcss-gap-properties": "^3.0.3",
-        "postcss-image-set-function": "^4.0.6",
-        "postcss-initial": "^4.0.1",
-        "postcss-lab-function": "^4.2.0",
-        "postcss-logical": "^5.0.4",
-        "postcss-media-minmax": "^5.0.0",
-        "postcss-nesting": "^10.1.4",
-        "postcss-opacity-percentage": "^1.1.2",
-        "postcss-overflow-shorthand": "^3.0.3",
-        "postcss-page-break": "^3.0.4",
-        "postcss-place": "^7.0.4",
-        "postcss-pseudo-class-any-link": "^7.1.2",
-        "postcss-replace-overflow-wrap": "^4.0.0",
-        "postcss-selector-not": "^5.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-preset-env/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/postcss-preset-env/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/postcss-preset-env/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/postcss-preset-env/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-pseudo-class-any-link": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.3.tgz",
-      "integrity": "sha512-I9Yp1VV2r8xFwg/JrnAlPCcKmutv6f6Ig6/CHFPqGJiDgYXM9C+0kgLfK4KOXbKNw+63QYl4agRUB0Wi9ftUIg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-reduce-initial": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz",
-      "integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
-      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-reduce-transforms/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-replace-overflow-wrap": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
-      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.0.3"
-      }
-    },
-    "node_modules/postcss-selector-not": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz",
-      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-svgo": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
-      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "svgo": "^2.7.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/postcss-svgo/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-      "dev": true
-    },
-    "node_modules/postcss-svgo/node_modules/nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/postcss-svgo/node_modules/svgo": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-      "dev": true,
-      "dependencies": {
-        "@trysound/sax": "0.2.0",
-        "commander": "^7.2.0",
-        "css-select": "^4.1.3",
-        "css-tree": "^1.1.3",
-        "csso": "^4.2.0",
-        "picocolors": "^1.0.0",
-        "stable": "^0.1.8"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/postcss-unique-selectors": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
-      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
-      "dev": true,
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-      "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/prettier-linter-helpers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-      "dev": true,
-      "dependencies": {
-        "fast-diff": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/pretty-bytes": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
-    },
-    "node_modules/pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-    },
-    "node_modules/pretty-ms": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
-      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
-      "dependencies": {
-        "parse-ms": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "node_modules/promise": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
-      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
-      "dev": true,
-      "dependencies": {
-        "asap": "~2.0.6"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dev": true,
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "node_modules/property-expr": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.4.tgz",
-      "integrity": "sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg=="
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dev": true,
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/proxy-addr/node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "dev": true
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
-      "dev": true,
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
-      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/raf": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-      "dev": true,
-      "dependencies": {
-        "performance-now": "^2.1.0"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dev": true,
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/react": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.1.0.tgz",
-      "integrity": "sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-ace": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.5.0.tgz",
-      "integrity": "sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==",
-      "dependencies": {
-        "ace-builds": "^1.4.13",
-        "diff-match-patch": "^1.0.5",
-        "lodash.get": "^4.4.2",
-        "lodash.isequal": "^4.5.0",
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "react": "^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0",
-        "react-dom": "^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0"
-      }
-    },
-    "node_modules/react-ace/node_modules/ace-builds": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
-      "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
-    },
-    "node_modules/react-app-polyfill": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz",
-      "integrity": "sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==",
-      "dev": true,
-      "dependencies": {
-        "core-js": "^3.19.2",
-        "object-assign": "^4.1.1",
-        "promise": "^8.1.0",
-        "raf": "^3.4.1",
-        "regenerator-runtime": "^0.13.9",
-        "whatwg-fetch": "^3.6.2"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/react-app-polyfill/node_modules/core-js": {
-      "version": "3.22.5",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz",
-      "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/react-app-polyfill/node_modules/regenerator-runtime": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-      "dev": true
-    },
-    "node_modules/react-datepicker": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.5.0.tgz",
-      "integrity": "sha512-mFP/SbtFSXx21Wx3Nfv+RREwd/x0q14x7QL79ZCi/PVkHSFLwLWhXyOtj3OIzi1AcVYb/fMMcvi8e5b12n8/sg==",
-      "dependencies": {
-        "@popperjs/core": "^2.9.2",
-        "classnames": "^2.2.6",
-        "date-fns": "^2.24.0",
-        "prop-types": "^15.7.2",
-        "react-onclickoutside": "^6.12.0",
-        "react-popper": "^2.2.5"
-      },
-      "peerDependencies": {
-        "react": "^16.9.0 || ^17",
-        "react-dom": "^16.9.0 || ^17"
-      }
-    },
-    "node_modules/react-datepicker/node_modules/date-fns": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz",
-      "integrity": "sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q==",
-      "engines": {
-        "node": ">=0.11"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
-      }
-    },
-    "node_modules/react-dev-utils": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
-      "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.0",
-        "address": "^1.1.2",
-        "browserslist": "^4.18.1",
-        "chalk": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "detect-port-alt": "^1.1.6",
-        "escape-string-regexp": "^4.0.0",
-        "filesize": "^8.0.6",
-        "find-up": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^6.5.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.0.4",
-        "gzip-size": "^6.0.0",
-        "immer": "^9.0.7",
-        "is-root": "^2.1.0",
-        "loader-utils": "^3.2.0",
-        "open": "^8.4.0",
-        "pkg-up": "^3.1.0",
-        "prompts": "^2.4.2",
-        "react-error-overlay": "^6.0.11",
-        "recursive-readdir": "^2.2.2",
-        "shell-quote": "^1.7.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/chalk/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/chalk/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/chalk/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/react-dev-utils/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/react-dev-utils/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/loader-utils": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz",
-      "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12.13.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/react-dev-utils/node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.1.0.tgz",
-      "integrity": "sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.22.0"
-      },
-      "peerDependencies": {
-        "react": "^18.1.0"
-      }
-    },
-    "node_modules/react-error-overlay": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
-      "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==",
-      "dev": true
-    },
-    "node_modules/react-fast-compare": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
-      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
-    },
-    "node_modules/react-hook-form": {
-      "version": "7.6.9",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.6.9.tgz",
-      "integrity": "sha512-nz+btC4WFIm3zPBjw22K3t9nnJtlMMwj8slcbPYoTKlkSVA5l+q3Ai+VF0YzeRi7vbyyeGQvpyibov1xd/TV7A==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/react-hook-form"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/react-multi-select-component": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/react-multi-select-component/-/react-multi-select-component-4.0.6.tgz",
-      "integrity": "sha512-cNpDv8vh1kWkJiMsa097tTUqWLVTQn+La4aXlgoGOQVpOSH9u1fbj1+MsvnLQjTBySuDx+pzm/DpbIoma/i1Fw==",
-      "peerDependencies": {
-        "react": ">=17"
-      }
-    },
-    "node_modules/react-onclickoutside": {
-      "version": "6.12.1",
-      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.1.tgz",
-      "integrity": "sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==",
-      "funding": {
-        "type": "individual",
-        "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md"
-      },
-      "peerDependencies": {
-        "react": "^15.5.x || ^16.x || ^17.x",
-        "react-dom": "^15.5.x || ^16.x || ^17.x"
-      }
-    },
-    "node_modules/react-popper": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
-      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
-      "dependencies": {
-        "react-fast-compare": "^3.0.1",
-        "warning": "^4.0.2"
-      },
-      "peerDependencies": {
-        "@popperjs/core": "^2.0.0",
-        "react": "^16.8.0 || ^17"
-      }
-    },
-    "node_modules/react-query": {
-      "version": "3.39.1",
-      "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",
-      "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "broadcast-channel": "^3.4.1",
-        "match-sorter": "^6.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-redux": {
-      "version": "7.2.6",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz",
-      "integrity": "sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.15.4",
-        "@types/react-redux": "^7.1.20",
-        "hoist-non-react-statics": "^3.3.2",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2"
-      },
-      "peerDependencies": {
-        "react": "^16.8.3 || ^17"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-redux/node_modules/@babel/runtime": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-redux/node_modules/@types/react-redux": {
-      "version": "7.1.22",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
-      "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
-      "dependencies": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
-    "node_modules/react-redux/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-    },
-    "node_modules/react-refresh": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
-      "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-router-dom": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
-      "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
-      "dependencies": {
-        "history": "^5.2.0",
-        "react-router": "6.3.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
-      }
-    },
-    "node_modules/react-router-dom/node_modules/react-router": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
-      "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
-      "dependencies": {
-        "history": "^5.2.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8"
-      }
-    },
-    "node_modules/react-scripts": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
-      "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.16.0",
-        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
-        "@svgr/webpack": "^5.5.0",
-        "babel-jest": "^27.4.2",
-        "babel-loader": "^8.2.3",
-        "babel-plugin-named-asset-import": "^0.3.8",
-        "babel-preset-react-app": "^10.0.1",
-        "bfj": "^7.0.2",
-        "browserslist": "^4.18.1",
-        "camelcase": "^6.2.1",
-        "case-sensitive-paths-webpack-plugin": "^2.4.0",
-        "css-loader": "^6.5.1",
-        "css-minimizer-webpack-plugin": "^3.2.0",
-        "dotenv": "^10.0.0",
-        "dotenv-expand": "^5.1.0",
-        "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.1",
-        "eslint-webpack-plugin": "^3.1.1",
-        "file-loader": "^6.2.0",
-        "fs-extra": "^10.0.0",
-        "html-webpack-plugin": "^5.5.0",
-        "identity-obj-proxy": "^3.0.0",
-        "jest": "^27.4.3",
-        "jest-resolve": "^27.4.2",
-        "jest-watch-typeahead": "^1.0.0",
-        "mini-css-extract-plugin": "^2.4.5",
-        "postcss": "^8.4.4",
-        "postcss-flexbugs-fixes": "^5.0.2",
-        "postcss-loader": "^6.2.1",
-        "postcss-normalize": "^10.0.1",
-        "postcss-preset-env": "^7.0.1",
-        "prompts": "^2.4.2",
-        "react-app-polyfill": "^3.0.0",
-        "react-dev-utils": "^12.0.1",
-        "react-refresh": "^0.11.0",
-        "resolve": "^1.20.0",
-        "resolve-url-loader": "^4.0.0",
-        "sass-loader": "^12.3.0",
-        "semver": "^7.3.5",
-        "source-map-loader": "^3.0.0",
-        "style-loader": "^3.3.1",
-        "tailwindcss": "^3.0.2",
-        "terser-webpack-plugin": "^5.2.5",
-        "webpack": "^5.64.4",
-        "webpack-dev-server": "^4.6.0",
-        "webpack-manifest-plugin": "^4.0.2",
-        "workbox-webpack-plugin": "^6.4.1"
-      },
-      "bin": {
-        "react-scripts": "bin/react-scripts.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      },
-      "peerDependencies": {
-        "react": ">= 16",
-        "typescript": "^3.2.1 || ^4"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/compat-data": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/core": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.10.tgz",
-      "integrity": "sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA==",
-      "dev": true,
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-compilation-targets": "^7.17.10",
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helpers": "^7.17.9",
-        "@babel/parser": "^7.17.10",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/generator": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-      "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.10",
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-compilation-targets": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-      "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.20.2",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-module-transforms": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-      "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.3",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-simple-access": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-      "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/helpers": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-      "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.17.9",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/highlight": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-      "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/traverse": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-      "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.17.10",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.17.10",
-        "@babel/types": "^7.17.10",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@babel/types": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-      "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/console/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/console/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/console/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/console/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/core": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
-      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/reporters": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^27.5.1",
-        "jest-config": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-resolve-dependencies": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "jest-watcher": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/core/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/core/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/core/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/environment": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/fake-timers": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@sinonjs/fake-timers": "^8.0.1",
-        "@types/node": "*",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/globals": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "expect": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/reporters": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
-      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
-      "dev": true,
-      "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-haste-map": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.0",
-        "string-length": "^4.0.1",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.1.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/reporters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/reporters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/reporters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/reporters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/source-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9",
-        "source-map": "^0.6.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/test-sequencer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
-      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/test-result": "^27.5.1",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-runtime": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/transform": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^27.5.1",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/transform/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/transform/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/transform/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/transform/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/types/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/types/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/types/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@jest/types/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-      "dev": true,
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dev": true,
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/react-scripts/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/react-scripts/node_modules/babel-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^27.5.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/babel-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/babel-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/babel-jest/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/babel-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/babel-plugin-jest-hoist": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/babel-preset-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
-      "dev": true,
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^27.5.1",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/browserslist": {
-      "version": "4.20.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-      "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001332",
-        "electron-to-chromium": "^1.4.118",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.3",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/react-scripts/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/react-scripts/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/react-scripts/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-scripts/node_modules/diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
-      "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/dotenv": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
-      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/react-scripts/node_modules/electron-to-chromium": {
-      "version": "1.4.137",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-      "dev": true
-    },
-    "node_modules/react-scripts/node_modules/emittery": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/react-scripts/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
-      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^27.5.1",
-        "import-local": "^3.0.2",
-        "jest-cli": "^27.5.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-changed-files": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
-      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "execa": "^5.0.0",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-circus": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
-      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "expect": "^27.5.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-circus/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-circus/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-circus/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-circus/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-cli": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
-      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/core": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "prompts": "^2.0.1",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-config": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
-      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.8.0",
-        "@jest/test-sequencer": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "babel-jest": "^27.5.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-jasmine2": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-config/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-config/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-config/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-docblock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
-      "dev": true,
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-each": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-each/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-environment-node": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
-      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "dev": true,
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-leak-detector": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
-      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
-      "dev": true,
-      "dependencies": {
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-message-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-message-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-message-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-mock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-resolve-dependencies": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
-      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-snapshot": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runner": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
-      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-leak-detector": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "source-map-support": "^0.5.6",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runner/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runner/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runtime": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/globals": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runtime/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runtime/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runtime/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-snapshot": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.7.2",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^27.5.1",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^27.5.1",
-        "semver": "^7.3.2"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-snapshot/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-watcher": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
-      "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "jest-util": "^27.5.1",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-watcher/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-watcher/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-watcher/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/jest-watcher/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/react-scripts/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/react-scripts/node_modules/node-releases": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-      "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-      "dev": true
-    },
-    "node_modules/react-scripts/node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/react-scripts/node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/react-scripts/node_modules/v8-to-istanbul": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
-      "dev": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/react-scripts/node_modules/v8-to-istanbul/node_modules/source-map": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/react-scripts/node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/recursive-readdir": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "dev": true,
-      "dependencies": {
-        "minimatch": "3.0.4"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/redux": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz",
-      "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
-    "node_modules/redux-mock-store": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/redux-mock-store/-/redux-mock-store-1.5.4.tgz",
-      "integrity": "sha512-xmcA0O/tjCLXhh9Fuiq6pMrJCwFRaouA8436zcikdIpYWWCjU76CRk+i2bHx8EeiSiMGnB85/lZdU3wIJVXHTA==",
-      "dev": true,
-      "dependencies": {
-        "lodash.isplainobject": "^4.0.6"
-      }
-    },
-    "node_modules/redux-thunk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
-      "peerDependencies": {
-        "redux": "^4"
-      }
-    },
-    "node_modules/reflect-metadata": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-      "dev": true
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
-      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regex-parser": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
-      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
-      "dev": true
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
-      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.0.1",
-        "regjsgen": "^0.6.0",
-        "regjsparser": "^0.8.2",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regjsgen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
-      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
-      "dev": true
-    },
-    "node_modules/regjsparser": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
-      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/remove-accents": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
-      "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
-    },
-    "node_modules/renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dev": true,
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "node_modules/renderkid/node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/renderkid/node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/renderkid/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/renderkid/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/nth-check": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-      "dev": true,
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/requireindex": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
-      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.5"
-      }
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "node_modules/reselect": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.5.tgz",
-      "integrity": "sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ=="
-    },
-    "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
-      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
-      "dev": true,
-      "dependencies": {
-        "adjust-sourcemap-loader": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.35",
-        "source-map": "0.6.1"
-      },
-      "engines": {
-        "node": ">=8.9"
-      },
-      "peerDependencies": {
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rework": {
-          "optional": true
-        },
-        "rework-visit": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-      "dev": true
-    },
-    "node_modules/resolve-url-loader/node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dev": true,
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "2.72.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.72.1.tgz",
-      "integrity": "sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==",
-      "dev": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/rollup-plugin-terser": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
-      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "jest-worker": "^26.2.1",
-        "serialize-javascript": "^4.0.0",
-        "terser": "^5.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^2.0.0"
-      }
-    },
-    "node_modules/rollup-plugin-terser/node_modules/jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/rollup-plugin-terser/node_modules/serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
-      "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "~2.1.0"
-      }
-    },
-    "node_modules/rxjs/node_modules/tslib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
-      "dev": true
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/sanitize.css": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz",
-      "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==",
-      "dev": true
-    },
-    "node_modules/sass": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.44.0.tgz",
-      "integrity": "sha512-0hLREbHFXGQqls/K8X+koeP+ogFRPF4ZqetVB19b7Cst9Er8cOR0rc6RU7MaI4W1JmUShd1BPgPoeqmmgMMYFw==",
-      "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/sass-loader": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
-      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
-      "dev": true,
-      "dependencies": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
-        "sass": "^1.3.0",
-        "sass-embedded": "*",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dev": true,
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/scheduler": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.22.0.tgz",
-      "integrity": "sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/schema-utils/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/schema-utils/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-      "dev": true
-    },
-    "node_modules/selfsigned": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz",
-      "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==",
-      "dev": true,
-      "dependencies": {
-        "node-forge": "^1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "dev": true,
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "node_modules/serve-index/node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dev": true,
-      "dependencies": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
-    "node_modules/shallowequal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shell-quote": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
-      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
-      "dev": true
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dev": true,
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz",
-      "integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.5",
-        "iconv-lite": "^0.6.3",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/source-map-loader/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "dev": true
-    },
-    "node_modules/spawn-command": {
-      "version": "0.0.2-1",
-      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
-      "dev": true
-    },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "node_modules/spdy-transport/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/spdy-transport/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/spdy/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/spdy/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/stack-utils/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stackframe": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.1.tgz",
-      "integrity": "sha512-h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg==",
-      "dev": true
-    },
-    "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-argv": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
-      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6.19"
-      }
-    },
-    "node_modules/string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dev": true,
-      "dependencies": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/string-natural-compare": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
-      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
-      "dev": true
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz",
-      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.3.1",
-        "side-channel": "^1.0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.matchall/node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.matchall/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.matchall/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.matchall/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.matchall/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/stringify-object": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-      "dev": true,
-      "dependencies": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
-      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/style-loader": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/styled-components": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.1.tgz",
-      "integrity": "sha512-JThv2JRzyH0NOIURrk9iskdxMSAAtCfj/b2Sf1WJaCUsloQkblepy1jaCLX/bYE+mhYo3unmwVSI9I5d9ncSiQ==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/traverse": "^7.4.5",
-        "@emotion/is-prop-valid": "^0.8.8",
-        "@emotion/stylis": "^0.8.4",
-        "@emotion/unitless": "^0.7.4",
-        "babel-plugin-styled-components": ">= 1.12.0",
-        "css-to-react-native": "^3.0.0",
-        "hoist-non-react-statics": "^3.0.0",
-        "shallowequal": "^1.1.0",
-        "supports-color": "^5.5.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/styled-components"
-      },
-      "peerDependencies": {
-        "react": ">= 16.8.0",
-        "react-dom": ">= 16.8.0",
-        "react-is": ">= 16.8.0"
-      }
-    },
-    "node_modules/styled-components/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/styled-components/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/stylehacks": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz",
-      "integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.16.6",
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/svg-parser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
-      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
-      "dev": true
-    },
-    "node_modules/svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/svgo/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/svgo/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/svgo/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/svgo/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "node_modules/tailwindcss": {
-      "version": "3.0.24",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz",
-      "integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==",
-      "dev": true,
-      "dependencies": {
-        "arg": "^5.0.1",
-        "chokidar": "^3.5.3",
-        "color-name": "^1.1.4",
-        "detective": "^5.2.0",
-        "didyoumean": "^1.2.2",
-        "dlv": "^1.1.3",
-        "fast-glob": "^3.2.11",
-        "glob-parent": "^6.0.2",
-        "is-glob": "^4.0.3",
-        "lilconfig": "^2.0.5",
-        "normalize-path": "^3.0.0",
-        "object-hash": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.12",
-        "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.4",
-        "postcss-nested": "5.0.6",
-        "postcss-selector-parser": "^6.0.10",
-        "postcss-value-parser": "^4.2.0",
-        "quick-lru": "^5.1.1",
-        "resolve": "^1.22.0"
-      },
-      "bin": {
-        "tailwind": "lib/cli.js",
-        "tailwindcss": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=12.13.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/arg": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz",
-      "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==",
-      "dev": true
-    },
-    "node_modules/tailwindcss/node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/chokidar/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/tailwindcss/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/lilconfig": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/tailwindcss/node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/temp-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
-      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tempy": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz",
-      "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
-      "dev": true,
-      "dependencies": {
-        "is-stream": "^2.0.0",
-        "temp-dir": "^2.0.0",
-        "type-fest": "^0.16.0",
-        "unique-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/tempy/node_modules/type-fest": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.13.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.13.1.tgz",
-      "integrity": "sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.5.0",
-        "commander": "^2.20.0",
-        "source-map": "~0.8.0-beta.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
-      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
-      "dev": true,
-      "dependencies": {
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
-    },
-    "node_modules/terser/node_modules/source-map": {
-      "version": "0.8.0-beta.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
-      "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-url": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/terser/node_modules/whatwg-url": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-      "dev": true,
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
-    },
-    "node_modules/throat": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
-      "dev": true
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/toposort": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
-      "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA="
-    },
-    "node_modules/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/tree-kill": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true,
-      "bin": {
-        "tree-kill": "cli.js"
-      }
-    },
-    "node_modules/tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-      "dev": true
-    },
-    "node_modules/ts-jest": {
-      "version": "28.0.3",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.3.tgz",
-      "integrity": "sha512-HzgbEDQ2KgVtDmpXToqAcKTyGHdHsG23i/iUjfxji92G5eT09S1m9UHZd7csF0Bfgh9txM4JzwHnv7r1waFPlw==",
-      "dev": true,
-      "dependencies": {
-        "bs-logger": "0.x",
-        "fast-json-stable-stringify": "2.x",
-        "jest-util": "^28.0.0",
-        "json5": "^2.2.1",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "7.x",
-        "yargs-parser": "^20.x"
-      },
-      "bin": {
-        "ts-jest": "cli.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.0.0-beta.0 <8",
-        "@types/jest": "^27.0.0",
-        "babel-jest": "^28.0.0",
-        "jest": "^28.0.0",
-        "typescript": ">=4.3"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "@types/jest": {
-          "optional": true
-        },
-        "babel-jest": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-jest/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ts-jest/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ts-node": {
-      "version": "10.8.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.0.tgz",
-      "integrity": "sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==",
-      "dev": true,
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-node/node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-      "dev": true
-    },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unload": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
-      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
-      "dependencies": {
-        "@babel/runtime": "^7.6.2",
-        "detect-node": "^2.0.4"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/use-debounce": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-8.0.1.tgz",
-      "integrity": "sha512-6tGAFJKJ0qCalecaV7/gm/M6n238nmitNppvR89ff1yfwSFjwFKR7IQZzIZf1KZRQhqNireBzytzU6jgb29oVg==",
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
-    },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
-    },
-    "node_modules/v8-to-istanbul": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.0.tgz",
-      "integrity": "sha512-HcvgY/xaRm7isYmyx+lFKA4uQmfUbN0J4M0nNItvzTvH/iQ9kW5j/t4YSR+Ge323/lrgDAWJoF46tzGQHwBHFw==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "dev": true,
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-      "dev": true,
-      "dependencies": {
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-      "dev": true,
-      "dependencies": {
-        "makeerror": "1.0.x"
-      }
-    },
-    "node_modules/warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "node_modules/webpack": {
-      "version": "5.72.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz",
-      "integrity": "sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.4.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.9.3",
-        "es-module-lexer": "^0.9.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
-        "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-middleware": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz",
-      "integrity": "sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==",
-      "dev": true,
-      "dependencies": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.1",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-      "dev": true
-    },
-    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack-dev-server": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz",
-      "integrity": "sha512-+Nlb39iQSOSsFv0lWUuUTim3jDQO8nhK3E68f//J2r5rIcp4lULHXz2oZ0UVdEeWXEh5lSzYUlzarZhDAeAVQw==",
-      "dev": true,
-      "dependencies": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.0.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.4.2"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-      "dev": true
-    },
-    "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.6.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
-      "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-manifest-plugin": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
-      "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==",
-      "dev": true,
-      "dependencies": {
-        "tapable": "^2.0.0",
-        "webpack-sources": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12.22.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.44.2 || ^5.47.0"
-      }
-    },
-    "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
-      "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.4.24"
-      }
-    },
-    "node_modules/whatwg-fetch": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
-      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==",
-      "dev": true
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
-    },
-    "node_modules/whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/workbox-background-sync": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.3.tgz",
-      "integrity": "sha512-0DD/V05FAcek6tWv9XYj2w5T/plxhDSpclIcAGjA/b7t/6PdaRkQ7ZgtAX6Q/L7kV7wZ8uYRJUoH11VjNipMZw==",
-      "dev": true,
-      "dependencies": {
-        "idb": "^6.1.4",
-        "workbox-core": "6.5.3"
-      }
-    },
-    "node_modules/workbox-broadcast-update": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.3.tgz",
-      "integrity": "sha512-4AwCIA5DiDrYhlN+Miv/fp5T3/whNmSL+KqhTwRBTZIL6pvTgE4lVuRzAt1JltmqyMcQ3SEfCdfxczuI4kwFQg==",
-      "dev": true,
-      "dependencies": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "node_modules/workbox-build": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.3.tgz",
-      "integrity": "sha512-8JNHHS7u13nhwIYCDea9MNXBNPHXCs5KDZPKI/ZNTr3f4sMGoD7hgFGecbyjX1gw4z6e9bMpMsOEJNyH5htA/w==",
-      "dev": true,
-      "dependencies": {
-        "@apideck/better-ajv-errors": "^0.3.1",
-        "@babel/core": "^7.11.1",
-        "@babel/preset-env": "^7.11.0",
-        "@babel/runtime": "^7.11.2",
-        "@rollup/plugin-babel": "^5.2.0",
-        "@rollup/plugin-node-resolve": "^11.2.1",
-        "@rollup/plugin-replace": "^2.4.1",
-        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
-        "ajv": "^8.6.0",
-        "common-tags": "^1.8.0",
-        "fast-json-stable-stringify": "^2.1.0",
-        "fs-extra": "^9.0.1",
-        "glob": "^7.1.6",
-        "lodash": "^4.17.20",
-        "pretty-bytes": "^5.3.0",
-        "rollup": "^2.43.1",
-        "rollup-plugin-terser": "^7.0.0",
-        "source-map": "^0.8.0-beta.0",
-        "stringify-object": "^3.3.0",
-        "strip-comments": "^2.0.1",
-        "tempy": "^0.6.0",
-        "upath": "^1.2.0",
-        "workbox-background-sync": "6.5.3",
-        "workbox-broadcast-update": "6.5.3",
-        "workbox-cacheable-response": "6.5.3",
-        "workbox-core": "6.5.3",
-        "workbox-expiration": "6.5.3",
-        "workbox-google-analytics": "6.5.3",
-        "workbox-navigation-preload": "6.5.3",
-        "workbox-precaching": "6.5.3",
-        "workbox-range-requests": "6.5.3",
-        "workbox-recipes": "6.5.3",
-        "workbox-routing": "6.5.3",
-        "workbox-strategies": "6.5.3",
-        "workbox-streams": "6.5.3",
-        "workbox-sw": "6.5.3",
-        "workbox-window": "6.5.3"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/workbox-build/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/workbox-build/node_modules/source-map": {
-      "version": "0.8.0-beta.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
-      "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-url": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/workbox-build/node_modules/whatwg-url": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-      "dev": true,
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/workbox-cacheable-response": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.3.tgz",
-      "integrity": "sha512-6JE/Zm05hNasHzzAGKDkqqgYtZZL2H06ic2GxuRLStA4S/rHUfm2mnLFFXuHAaGR1XuuYyVCEey1M6H3PdZ7SQ==",
-      "dev": true,
-      "dependencies": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "node_modules/workbox-core": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.3.tgz",
-      "integrity": "sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q==",
-      "dev": true
-    },
-    "node_modules/workbox-expiration": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.3.tgz",
-      "integrity": "sha512-jzYopYR1zD04ZMdlbn/R2Ik6ixiXbi15c9iX5H8CTi6RPDz7uhvMLZPKEndZTpfgmUk8mdmT9Vx/AhbuCl5Sqw==",
-      "dev": true,
-      "dependencies": {
-        "idb": "^6.1.4",
-        "workbox-core": "6.5.3"
-      }
-    },
-    "node_modules/workbox-google-analytics": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.3.tgz",
-      "integrity": "sha512-3GLCHotz5umoRSb4aNQeTbILETcrTVEozSfLhHSBaegHs1PnqCmN0zbIy2TjTpph2AGXiNwDrWGF0AN+UgDNTw==",
-      "dev": true,
-      "dependencies": {
-        "workbox-background-sync": "6.5.3",
-        "workbox-core": "6.5.3",
-        "workbox-routing": "6.5.3",
-        "workbox-strategies": "6.5.3"
-      }
-    },
-    "node_modules/workbox-navigation-preload": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.3.tgz",
-      "integrity": "sha512-bK1gDFTc5iu6lH3UQ07QVo+0ovErhRNGvJJO/1ngknT0UQ702nmOUhoN9qE5mhuQSrnK+cqu7O7xeaJ+Rd9Tmg==",
-      "dev": true,
-      "dependencies": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "node_modules/workbox-precaching": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.3.tgz",
-      "integrity": "sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ==",
-      "dev": true,
-      "dependencies": {
-        "workbox-core": "6.5.3",
-        "workbox-routing": "6.5.3",
-        "workbox-strategies": "6.5.3"
-      }
-    },
-    "node_modules/workbox-range-requests": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz",
-      "integrity": "sha512-pGCP80Bpn/0Q0MQsfETSfmtXsQcu3M2QCJwSFuJ6cDp8s2XmbUXkzbuQhCUzKR86ZH2Vex/VUjb2UaZBGamijA==",
-      "dev": true,
-      "dependencies": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "node_modules/workbox-recipes": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.3.tgz",
-      "integrity": "sha512-IcgiKYmbGiDvvf3PMSEtmwqxwfQ5zwI7OZPio3GWu4PfehA8jI8JHI3KZj+PCfRiUPZhjQHJ3v1HbNs+SiSkig==",
-      "dev": true,
-      "dependencies": {
-        "workbox-cacheable-response": "6.5.3",
-        "workbox-core": "6.5.3",
-        "workbox-expiration": "6.5.3",
-        "workbox-precaching": "6.5.3",
-        "workbox-routing": "6.5.3",
-        "workbox-strategies": "6.5.3"
-      }
-    },
-    "node_modules/workbox-routing": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.3.tgz",
-      "integrity": "sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg==",
-      "dev": true,
-      "dependencies": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "node_modules/workbox-strategies": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.3.tgz",
-      "integrity": "sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w==",
-      "dev": true,
-      "dependencies": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "node_modules/workbox-streams": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.3.tgz",
-      "integrity": "sha512-vN4Qi8o+b7zj1FDVNZ+PlmAcy1sBoV7SC956uhqYvZ9Sg1fViSbOpydULOssVJ4tOyKRifH/eoi6h99d+sJ33w==",
-      "dev": true,
-      "dependencies": {
-        "workbox-core": "6.5.3",
-        "workbox-routing": "6.5.3"
-      }
-    },
-    "node_modules/workbox-sw": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.3.tgz",
-      "integrity": "sha512-BQBzm092w+NqdIEF2yhl32dERt9j9MDGUTa2Eaa+o3YKL4Qqw55W9yQC6f44FdAHdAJrJvp0t+HVrfh8AiGj8A==",
-      "dev": true
-    },
-    "node_modules/workbox-webpack-plugin": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.3.tgz",
-      "integrity": "sha512-Es8Xr02Gi6Kc3zaUwR691ZLy61hz3vhhs5GztcklQ7kl5k2qAusPh0s6LF3wEtlpfs9ZDErnmy5SErwoll7jBA==",
-      "dev": true,
-      "dependencies": {
-        "fast-json-stable-stringify": "^2.1.0",
-        "pretty-bytes": "^5.4.1",
-        "upath": "^1.2.0",
-        "webpack-sources": "^1.4.3",
-        "workbox-build": "6.5.3"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.4.0 || ^5.9.0"
-      }
-    },
-    "node_modules/workbox-webpack-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/workbox-window": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.3.tgz",
-      "integrity": "sha512-GnJbx1kcKXDtoJBVZs/P7ddP0Yt52NNy4nocjBpYPiRhMqTpJCNrSL+fGHZ/i/oP6p/vhE8II0sA6AZGKGnssw==",
-      "dev": true,
-      "dependencies": {
-        "@types/trusted-types": "^2.0.2",
-        "workbox-core": "6.5.3"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16"
-      }
-    },
-    "node_modules/ws": {
-      "version": "7.5.8",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz",
-      "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
-      "dev": true
-    },
-    "node_modules/xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-      "dev": true
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.7",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yup": {
-      "version": "0.32.11",
-      "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz",
-      "integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==",
-      "dependencies": {
-        "@babel/runtime": "^7.15.4",
-        "@types/lodash": "^4.14.175",
-        "lodash": "^4.17.21",
-        "lodash-es": "^4.17.21",
-        "nanoclone": "^0.2.1",
-        "property-expr": "^2.0.4",
-        "toposort": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yup/node_modules/@babel/runtime": {
-      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
-      "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/yup/node_modules/@types/lodash": {
-      "version": "4.14.177",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw=="
-    }
-  },
-  "dependencies": {
-    "@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@apideck/better-ajv-errors": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.3.tgz",
-      "integrity": "sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg==",
-      "dev": true,
-      "requires": {
-        "json-schema": "^0.4.0",
-        "jsonpointer": "^5.0.0",
-        "leven": "^3.1.0"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
-      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
-      "requires": {
-        "@babel/highlight": "^7.14.5"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.5.tgz",
-      "integrity": "sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w=="
-    },
-    "@babel/core": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz",
-      "integrity": "sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==",
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.5",
-        "@babel/helper-compilation-targets": "^7.14.5",
-        "@babel/helper-module-transforms": "^7.14.5",
-        "@babel/helpers": "^7.14.6",
-        "@babel/parser": "^7.14.6",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "json5": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        }
-      }
-    },
-    "@babel/eslint-parser": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
-      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
-      "dev": true,
-      "requires": {
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz",
-      "integrity": "sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==",
-      "requires": {
-        "@babel/types": "^7.14.5",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
-        }
-      }
-    },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz",
-      "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==",
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz",
-      "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==",
-      "requires": {
-        "@babel/compat-data": "^7.14.5",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.16.6",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz",
-      "integrity": "sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-member-expression-to-functions": "^7.17.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-          "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-          "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-          "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-member-expression-to-functions": "^7.16.7",
-            "@babel/helper-optimise-call-expression": "^7.16.7",
-            "@babel/traverse": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz",
-      "integrity": "sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^5.0.1"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-environment-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-      "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz",
-      "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==",
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz",
-      "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==",
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz",
-      "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz",
-      "integrity": "sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz",
-      "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==",
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz",
-      "integrity": "sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.14.5",
-        "@babel/helper-replace-supers": "^7.14.5",
-        "@babel/helper-simple-access": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz",
-      "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==",
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz",
-      "integrity": "sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==",
-      "dev": true
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz",
-      "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==",
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.14.5",
-        "@babel/helper-optimise-call-expression": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz",
-      "integrity": "sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==",
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
-      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.16.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz",
-      "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==",
-      "requires": {
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz",
-      "integrity": "sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz",
-      "integrity": "sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==",
-      "requires": {
-        "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
-      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/parser": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz",
-      "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="
-    },
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz",
-      "integrity": "sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
-      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz",
-      "integrity": "sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
-      "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.17.6",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-decorators": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz",
-      "integrity": "sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.17.9",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/plugin-syntax-decorators": "^7.17.0",
-        "charcodes": "^0.2.0"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-          "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-          "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-          "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-member-expression-to-functions": "^7.16.7",
-            "@babel/helper-optimise-call-expression": "^7.16.7",
-            "@babel/traverse": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz",
-      "integrity": "sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz",
-      "integrity": "sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz",
-      "integrity": "sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz",
-      "integrity": "sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz",
-      "integrity": "sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.17.0",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/compat-data": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-          "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
-          "dev": true
-        },
-        "@babel/helper-compilation-targets": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-          "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/compat-data": "^7.17.10",
-            "@babel/helper-validator-option": "^7.16.7",
-            "browserslist": "^4.20.2",
-            "semver": "^6.3.0"
-          }
-        },
-        "@babel/helper-validator-option": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-          "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-          "dev": true
-        },
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz",
-      "integrity": "sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
-      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.10",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz",
-      "integrity": "sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz",
-      "integrity": "sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
-    "@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-decorators": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz",
-      "integrity": "sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-syntax-flow": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.7.tgz",
-      "integrity": "sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.7.tgz",
-      "integrity": "sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-typescript": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz",
-      "integrity": "sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz",
-      "integrity": "sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
-      },
-      "dependencies": {
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz",
-      "integrity": "sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-classes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz",
-      "integrity": "sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-          "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-          "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-          "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-member-expression-to-functions": "^7.16.7",
-            "@babel/helper-optimise-call-expression": "^7.16.7",
-            "@babel/traverse": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz",
-      "integrity": "sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz",
-      "integrity": "sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz",
-      "integrity": "sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-flow-strip-types": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.7.tgz",
-      "integrity": "sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-flow": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz",
-      "integrity": "sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/compat-data": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-          "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
-          "dev": true
-        },
-        "@babel/helper-compilation-targets": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-          "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/compat-data": "^7.17.10",
-            "@babel/helper-validator-option": "^7.16.7",
-            "browserslist": "^4.20.2",
-            "semver": "^6.3.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/helper-validator-option": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-          "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz",
-      "integrity": "sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz",
-      "integrity": "sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-transforms": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-          "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-module-imports": "^7.16.7",
-            "@babel/helper-simple-access": "^7.17.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.3",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-simple-access": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-          "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz",
-      "integrity": "sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-transforms": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-          "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-module-imports": "^7.16.7",
-            "@babel/helper-simple-access": "^7.17.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.3",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-simple-access": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-          "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.17.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz",
-      "integrity": "sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-transforms": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-          "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-module-imports": "^7.16.7",
-            "@babel/helper-simple-access": "^7.17.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.3",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-simple-access": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-          "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz",
-      "integrity": "sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-transforms": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-          "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-module-imports": "^7.16.7",
-            "@babel/helper-simple-access": "^7.17.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.3",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-simple-access": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-          "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz",
-      "integrity": "sha512-v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.17.0"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz",
-      "integrity": "sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-member-expression-to-functions": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-          "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-optimise-call-expression": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-          "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-replace-supers": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz",
-          "integrity": "sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-member-expression-to-functions": "^7.16.7",
-            "@babel/helper-optimise-call-expression": "^7.16.7",
-            "@babel/traverse": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz",
-      "integrity": "sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-react-constant-elements": {
-      "version": "7.17.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.6.tgz",
-      "integrity": "sha512-OBv9VkyyKtsHZiHLoSfCn+h6yU7YKX8nrs32xUmOa1SRSk+t03FosB6fBZ0Yz4BpD1WV7l73Nsad+2Tz7APpqw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-react-display-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
-      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-react-jsx": {
-      "version": "7.17.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz",
-      "integrity": "sha512-9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-jsx": "^7.16.7",
-        "@babel/types": "^7.17.0"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
-      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-transform-react-jsx": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz",
-      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz",
-      "integrity": "sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==",
-      "dev": true,
-      "requires": {
-        "regenerator-transform": "^0.15.0"
-      }
-    },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz",
-      "integrity": "sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz",
-      "integrity": "sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-spread": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz",
-      "integrity": "sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
-      }
-    },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz",
-      "integrity": "sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz",
-      "integrity": "sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-typescript": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz",
-      "integrity": "sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-typescript": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/preset-env": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.17.10.tgz",
-      "integrity": "sha512-YNgyBHZQpeoBSRBg0xixsZzfT58Ze1iZrajvv0lJc70qDDGuGfonEnMGfWeSY0mQ3JTuCWFbMkzFRVafOyJx4g==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-compilation-targets": "^7.17.10",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-class-static-block": "^7.17.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-        "@babel/plugin-proposal-json-strings": "^7.16.7",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.17.3",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.11",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.7",
-        "@babel/plugin-transform-async-to-generator": "^7.16.8",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.16.7",
-        "@babel/plugin-transform-classes": "^7.16.7",
-        "@babel/plugin-transform-computed-properties": "^7.16.7",
-        "@babel/plugin-transform-destructuring": "^7.17.7",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.16.7",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.16.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.16.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.17.9",
-        "@babel/plugin-transform-modules-systemjs": "^7.17.8",
-        "@babel/plugin-transform-modules-umd": "^7.16.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.10",
-        "@babel/plugin-transform-new-target": "^7.16.7",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.16.7",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.17.9",
-        "@babel/plugin-transform-reserved-words": "^7.16.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.16.7",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.16.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.17.10",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.22.1",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "@babel/compat-data": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-          "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
-          "dev": true
-        },
-        "@babel/helper-compilation-targets": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-          "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/compat-data": "^7.17.10",
-            "@babel/helper-validator-option": "^7.16.7",
-            "browserslist": "^4.20.2",
-            "semver": "^6.3.0"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/helper-validator-option": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-          "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      }
-    },
-    "@babel/preset-react": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.16.7.tgz",
-      "integrity": "sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-react-display-name": "^7.16.7",
-        "@babel/plugin-transform-react-jsx": "^7.16.7",
-        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/helper-validator-option": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-          "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/preset-typescript": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz",
-      "integrity": "sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-typescript": "^7.16.7"
-      },
-      "dependencies": {
-        "@babel/helper-validator-option": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-          "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
-      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/runtime-corejs3": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.6.tgz",
-      "integrity": "sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==",
-      "dev": true,
-      "requires": {
-        "core-js-pure": "^3.14.0",
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/template": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz",
-      "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==",
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.5.tgz",
-      "integrity": "sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg==",
-      "requires": {
-        "@babel/code-frame": "^7.14.5",
-        "@babel/generator": "^7.14.5",
-        "@babel/helper-function-name": "^7.14.5",
-        "@babel/helper-hoist-variables": "^7.14.5",
-        "@babel/helper-split-export-declaration": "^7.14.5",
-        "@babel/parser": "^7.14.5",
-        "@babel/types": "^7.14.5",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
-    "@babel/types": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz",
-      "integrity": "sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.14.5",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
-    },
-    "@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "dependencies": {
-        "@jridgewell/trace-mapping": {
-          "version": "0.3.9",
-          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-          "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/resolve-uri": "^3.0.3",
-            "@jridgewell/sourcemap-codec": "^1.4.10"
-          }
-        }
-      }
-    },
-    "@csstools/normalize.css": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz",
-      "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==",
-      "dev": true
-    },
-    "@csstools/postcss-color-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.0.tgz",
-      "integrity": "sha512-5D5ND/mZWcQoSfYnSPsXtuiFxhzmhxt6pcjrFLJyldj+p0ZN2vvRpYNX+lahFTtMhAYOa2WmkdGINr0yP0CvGA==",
-      "dev": true,
-      "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "@csstools/postcss-font-format-keywords": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.0.tgz",
-      "integrity": "sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "@csstools/postcss-hwb-function": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.0.tgz",
-      "integrity": "sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "@csstools/postcss-ic-unit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.0.tgz",
-      "integrity": "sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==",
-      "dev": true,
-      "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "@csstools/postcss-is-pseudo-class": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.3.tgz",
-      "integrity": "sha512-wMQ3GMWrJyRQfvBJsD38ndF/nwHT32xevSn8w2X+iCoWqmhhoj0K7HgdGW8XQhah6sdENBa8yS9gRosdezaQZw==",
-      "dev": true,
-      "requires": {
-        "@csstools/selector-specificity": "^1.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "@csstools/postcss-normalize-display-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.0.tgz",
-      "integrity": "sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "@csstools/postcss-oklab-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.0.tgz",
-      "integrity": "sha512-e/Q5HopQzmnQgqimG9v3w2IG4VRABsBq3itOcn4bnm+j4enTgQZ0nWsaH/m9GV2otWGQ0nwccYL5vmLKyvP1ww==",
-      "dev": true,
-      "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "@csstools/postcss-progressive-custom-properties": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
-      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "@csstools/postcss-stepped-value-functions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.0.tgz",
-      "integrity": "sha512-q8c4bs1GumAiRenmFjASBcWSLKrbzHzWl6C2HcaAxAXIiL2rUlUWbqQZUjwVG5tied0rld19j/Mm90K3qI26vw==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "@csstools/postcss-unset-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.1.tgz",
-      "integrity": "sha512-f1G1WGDXEU/RN1TWAxBPQgQudtLnLQPyiWdtypkPC+mVYNKFKH/HYXSxH4MVNqwF8M0eDsoiU7HumJHCg/L/jg==",
-      "dev": true,
-      "requires": {}
-    },
-    "@csstools/selector-specificity": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-1.0.0.tgz",
-      "integrity": "sha512-RkYG5KiGNX0fJ5YoI0f4Wfq2Yo74D25Hru4fxTOioYdQvHBxcrrtTTyT5Ozzh2ejcNrhFy7IEts2WyEY7yi5yw==",
-      "dev": true,
-      "requires": {}
-    },
-    "@emotion/is-prop-valid": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
-      "requires": {
-        "@emotion/memoize": "0.7.4"
-      }
-    },
-    "@emotion/memoize": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
-    },
-    "@emotion/stylis": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
-    },
-    "@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
-    },
-    "@eslint/eslintrc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.3.2",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
-    "@fortawesome/fontawesome-free": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz",
-      "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg=="
-    },
-    "@hookform/error-message": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@hookform/error-message/-/error-message-2.0.0.tgz",
-      "integrity": "sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==",
-      "requires": {}
-    },
-    "@hookform/resolvers": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.8.9.tgz",
-      "integrity": "sha512-IXwGpjewxScF4N2kuyYDip6ABqH4lCg9n1f1mp0vbmKik+u+nestpbtdEs6U1WQZxwaoK/2APv1+MEr4czX7XA==",
-      "requires": {}
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
-    },
-    "@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-          "dev": true
-        }
-      }
-    },
-    "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true
-    },
-    "@jest/console": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.0.tgz",
-      "integrity": "sha512-tscn3dlJFGay47kb4qVruQg/XWlmvU0xp3EJOjzzY+sBaI+YgwKcvAmTcyYU7xEiLLIY5HCdWRooAL8dqkFlDA==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "slash": "^3.0.0"
-      }
-    },
-    "@jest/core": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.0.tgz",
-      "integrity": "sha512-/2PTt0ywhjZ4NwNO4bUqD9IVJfmFVhVKGlhvSpmEfUCuxYf/3NHcKmRFI+I71lYzbTT3wMuYpETDCTHo81gC/g==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/console": "^28.1.0",
-        "@jest/reporters": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/transform": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^28.0.2",
-        "jest-config": "^28.1.0",
-        "jest-haste-map": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.0",
-        "jest-resolve-dependencies": "^28.1.0",
-        "jest-runner": "^28.1.0",
-        "jest-runtime": "^28.1.0",
-        "jest-snapshot": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "jest-watcher": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.0",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-haste-map": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-          "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/types": "^28.1.0",
-            "@types/graceful-fs": "^4.1.3",
-            "@types/node": "*",
-            "anymatch": "^3.0.3",
-            "fb-watchman": "^2.0.0",
-            "fsevents": "^2.3.2",
-            "graceful-fs": "^4.2.9",
-            "jest-regex-util": "^28.0.2",
-            "jest-util": "^28.1.0",
-            "jest-worker": "^28.1.0",
-            "micromatch": "^4.0.4",
-            "walker": "^1.0.7"
-          }
-        },
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-resolve": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.0.tgz",
-          "integrity": "sha512-vvfN7+tPNnnhDvISuzD1P+CRVP8cK0FHXRwPAcdDaQv4zgvwvag2n55/h5VjYcM5UJG7L4TwE5tZlzcI0X2Lhw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^28.1.0",
-            "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^28.1.0",
-            "jest-validate": "^28.1.0",
-            "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
-            "slash": "^3.0.0"
-          }
-        },
-        "jest-validate": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-          "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/types": "^28.1.0",
-            "camelcase": "^6.2.0",
-            "chalk": "^4.0.0",
-            "jest-get-type": "^28.0.2",
-            "leven": "^3.1.0",
-            "pretty-format": "^28.1.0"
-          }
-        },
-        "jest-worker": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-          "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
-          }
-        },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/environment": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.0.tgz",
-      "integrity": "sha512-S44WGSxkRngzHslhV6RoAExekfF7Qhwa6R5+IYFa81mpcj0YgdBnRSmvHe3SNwOt64yXaE5GG8Y2xM28ii5ssA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/fake-timers": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "jest-mock": "^28.1.0"
-      }
-    },
-    "@jest/expect": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.0.tgz",
-      "integrity": "sha512-be9ETznPLaHOmeJqzYNIXv1ADEzENuQonIoobzThOYPuK/6GhrWNIJDVTgBLCrz3Am73PyEU2urQClZp0hLTtA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "expect": "^28.1.0",
-        "jest-snapshot": "^28.1.0"
-      }
-    },
-    "@jest/expect-utils": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.0.tgz",
-      "integrity": "sha512-5BrG48dpC0sB80wpeIX5FU6kolDJI4K0n5BM9a5V38MGx0pyRvUBSS0u2aNTdDzmOrCjhOg8pGs6a20ivYkdmw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "jest-get-type": "^28.0.2"
-      }
-    },
-    "@jest/fake-timers": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.0.tgz",
-      "integrity": "sha512-Xqsf/6VLeAAq78+GNPzI7FZQRf5cCHj1qgQxCjws9n8rKw8r1UYoeaALwBvyuzOkpU3c1I6emeMySPa96rxtIg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/types": "^28.1.0",
-        "@sinonjs/fake-timers": "^9.1.1",
-        "@types/node": "*",
-        "jest-message-util": "^28.1.0",
-        "jest-mock": "^28.1.0",
-        "jest-util": "^28.1.0"
-      }
-    },
-    "@jest/globals": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.0.tgz",
-      "integrity": "sha512-3m7sTg52OTQR6dPhsEQSxAvU+LOBbMivZBwOvKEZ+Rb+GyxVnXi9HKgOTYkx/S99T8yvh17U4tNNJPIEQmtwYw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/environment": "^28.1.0",
-        "@jest/expect": "^28.1.0",
-        "@jest/types": "^28.1.0"
-      }
-    },
-    "@jest/reporters": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.0.tgz",
-      "integrity": "sha512-qxbFfqap/5QlSpIizH9c/bFCDKsQlM4uAKSOvZrP+nIdrjqre3FmKzpTtYyhsaVcOSNK7TTt2kjm+4BJIjysFA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/transform": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-util": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^9.0.0"
-      },
-      "dependencies": {
-        "jest-worker": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-          "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/schemas": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
-      "integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
-      "dev": true,
-      "requires": {
-        "@sinclair/typebox": "^0.23.3"
-      }
-    },
-    "@jest/source-map": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.0.2.tgz",
-      "integrity": "sha512-Y9dxC8ZpN3kImkk0LkK5XCEneYMAXlZ8m5bflmSL5vrwyeUpJfentacCUg6fOb8NOpOO7hz2+l37MV77T6BFPw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
-      }
-    },
-    "@jest/test-result": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.0.tgz",
-      "integrity": "sha512-sBBFIyoPzrZho3N+80P35A5oAkSKlGfsEFfXFWuPGBsW40UAjCkGakZhn4UQK4iQlW2vgCDMRDOob9FGKV8YoQ==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      }
-    },
-    "@jest/test-sequencer": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.0.tgz",
-      "integrity": "sha512-tZCEiVWlWNTs/2iK9yi6o3AlMfbbYgV4uuZInSVdzZ7ftpHZhCMuhvk2HLYhCZzLgPFQ9MnM1YaxMnh3TILFiQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/test-result": "^28.1.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
-        "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "jest-haste-map": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-          "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/types": "^28.1.0",
-            "@types/graceful-fs": "^4.1.3",
-            "@types/node": "*",
-            "anymatch": "^3.0.3",
-            "fb-watchman": "^2.0.0",
-            "fsevents": "^2.3.2",
-            "graceful-fs": "^4.2.9",
-            "jest-regex-util": "^28.0.2",
-            "jest-util": "^28.1.0",
-            "jest-worker": "^28.1.0",
-            "micromatch": "^4.0.4",
-            "walker": "^1.0.7"
-          }
-        },
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-worker": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-          "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/transform": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.0.tgz",
-      "integrity": "sha512-omy2xe5WxlAfqmsTjTPxw+iXRTRnf+NtX0ToG+4S0tABeb4KsKmPUHq5UBuwunHg3tJRwgEQhEp0M/8oiatLEA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^28.1.0",
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.1"
-      },
-      "dependencies": {
-        "jest-haste-map": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-          "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/types": "^28.1.0",
-            "@types/graceful-fs": "^4.1.3",
-            "@types/node": "*",
-            "anymatch": "^3.0.3",
-            "fb-watchman": "^2.0.0",
-            "fsevents": "^2.3.2",
-            "graceful-fs": "^4.2.9",
-            "jest-regex-util": "^28.0.2",
-            "jest-util": "^28.1.0",
-            "jest-worker": "^28.1.0",
-            "micromatch": "^4.0.4",
-            "walker": "^1.0.7"
-          }
-        },
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-worker": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-          "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/types": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.0.tgz",
-      "integrity": "sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==",
-      "dev": true,
-      "requires": {
-        "@jest/schemas": "^28.0.2",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      }
-    },
-    "@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
-      "dev": true
-    },
-    "@jridgewell/set-array": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
-      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
-      "dev": true
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
-      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
-      "dev": true
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.11.tgz",
-      "integrity": "sha512-RllI476aSMsxzeI9TtlSMoNTgHDxEmnl6GkkHwhr0vdL8W+0WuesyI8Vd3rBOfrwtPXbPxdT9ADJdiOKgzxPQA==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-      "dev": true
-    },
-    "@nestjs/common": {
-      "version": "8.4.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-8.4.4.tgz",
-      "integrity": "sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==",
-      "dev": true,
-      "requires": {
-        "axios": "0.26.1",
-        "iterare": "1.2.1",
-        "tslib": "2.3.1",
-        "uuid": "8.3.2"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-          "dev": true
-        }
-      }
-    },
-    "@nestjs/core": {
-      "version": "8.4.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-8.4.4.tgz",
-      "integrity": "sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==",
-      "dev": true,
-      "requires": {
-        "@nuxtjs/opencollective": "0.3.2",
-        "fast-safe-stringify": "2.1.1",
-        "iterare": "1.2.1",
-        "object-hash": "3.0.0",
-        "path-to-regexp": "3.2.0",
-        "tslib": "2.3.1",
-        "uuid": "8.3.2"
-      },
-      "dependencies": {
-        "path-to-regexp": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",
-          "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==",
-          "dev": true
-        },
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-          "dev": true
-        }
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@nuxtjs/opencollective": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz",
-      "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "consola": "^2.15.0",
-        "node-fetch": "^2.6.1"
-      }
-    },
-    "@openapitools/openapi-generator-cli": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.5.1.tgz",
-      "integrity": "sha512-WSRQBU0dCSVD+0Qv8iCsv0C4iMaZe/NpJ/CT4SmrEYLH3txoKTE8wEfbdj/kqShS8Or0YEGDPUzhSIKY151L0w==",
-      "dev": true,
-      "requires": {
-        "@nestjs/common": "8.4.4",
-        "@nestjs/core": "8.4.4",
-        "@nuxtjs/opencollective": "0.3.2",
-        "chalk": "4.1.2",
-        "commander": "8.3.0",
-        "compare-versions": "4.1.3",
-        "concurrently": "6.5.1",
-        "console.table": "0.10.0",
-        "fs-extra": "10.0.1",
-        "glob": "7.1.6",
-        "inquirer": "8.2.2",
-        "lodash": "4.17.21",
-        "reflect-metadata": "0.1.13",
-        "rxjs": "7.5.5",
-        "tslib": "2.0.3"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "fs-extra": {
-          "version": "10.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-          "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "rxjs": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.1.0"
-          },
-          "dependencies": {
-            "tslib": {
-              "version": "2.4.0",
-              "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-              "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-              "dev": true
-            }
-          }
-        },
-        "tslib": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==",
-          "dev": true
-        }
-      }
-    },
-    "@pmmmwh/react-refresh-webpack-plugin": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.6.tgz",
-      "integrity": "sha512-IIWxofIYt/AbMwoeBgj+O2aAXLrlCQVg+A4a2zfpXFNHgP8o8rvi3v+oe5t787Lj+KXlKOh8BAiUp9bhuELXhg==",
-      "dev": true,
-      "requires": {
-        "ansi-html-community": "^0.0.8",
-        "common-path-prefix": "^3.0.0",
-        "core-js-pure": "^3.8.1",
-        "error-stack-parser": "^2.0.6",
-        "find-up": "^5.0.0",
-        "html-entities": "^2.1.0",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^5.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^3.0.2"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
-    },
-    "@reduxjs/toolkit": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.2.tgz",
-      "integrity": "sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==",
-      "requires": {
-        "immer": "^9.0.7",
-        "redux": "^4.1.2",
-        "redux-thunk": "^2.4.1",
-        "reselect": "^4.1.5"
-      }
-    },
-    "@rollup/plugin-babel": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
-      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@rollup/pluginutils": "^3.1.0"
-      }
-    },
-    "@rollup/plugin-node-resolve": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
-      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
-      "dev": true,
-      "requires": {
-        "@rollup/pluginutils": "^3.1.0",
-        "@types/resolve": "1.17.1",
-        "builtin-modules": "^3.1.0",
-        "deepmerge": "^4.2.2",
-        "is-module": "^1.0.0",
-        "resolve": "^1.19.0"
-      }
-    },
-    "@rollup/plugin-replace": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
-      "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
-      "dev": true,
-      "requires": {
-        "@rollup/pluginutils": "^3.1.0",
-        "magic-string": "^0.25.7"
-      }
-    },
-    "@rollup/pluginutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "0.0.39",
-        "estree-walker": "^1.0.1",
-        "picomatch": "^2.2.2"
-      },
-      "dependencies": {
-        "@types/estree": {
-          "version": "0.0.39",
-          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-          "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-          "dev": true
-        }
-      }
-    },
-    "@rooks/use-outside-click-ref": {
-      "version": "4.11.2",
-      "resolved": "https://registry.npmjs.org/@rooks/use-outside-click-ref/-/use-outside-click-ref-4.11.2.tgz",
-      "integrity": "sha512-w2bCW69zcpLh0KmN/odAuBsQ3sps+73KEu7zMOi0o4YMfDo+tXcqwlTJiLYysd0BEoQC9pNIklzZmI9zZep69g==",
-      "requires": {}
-    },
-    "@rushstack/eslint-patch": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
-      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
-      "dev": true
-    },
-    "@sinclair/typebox": {
-      "version": "0.23.5",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
-      "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==",
-      "dev": true
-    },
-    "@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-      "dev": true,
-      "requires": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "@sinonjs/fake-timers": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "@surma/rollup-plugin-off-main-thread": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
-      "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
-      "dev": true,
-      "requires": {
-        "ejs": "^3.1.6",
-        "json5": "^2.2.0",
-        "magic-string": "^0.25.0",
-        "string.prototype.matchall": "^4.0.6"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-          "dev": true
-        }
-      }
-    },
-    "@svgr/babel-plugin-add-jsx-attribute": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
-      "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg==",
-      "dev": true
-    },
-    "@svgr/babel-plugin-remove-jsx-attribute": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz",
-      "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg==",
-      "dev": true
-    },
-    "@svgr/babel-plugin-remove-jsx-empty-expression": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz",
-      "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA==",
-      "dev": true
-    },
-    "@svgr/babel-plugin-replace-jsx-attribute-value": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz",
-      "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ==",
-      "dev": true
-    },
-    "@svgr/babel-plugin-svg-dynamic-title": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz",
-      "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg==",
-      "dev": true
-    },
-    "@svgr/babel-plugin-svg-em-dimensions": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
-      "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw==",
-      "dev": true
-    },
-    "@svgr/babel-plugin-transform-react-native-svg": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz",
-      "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q==",
-      "dev": true
-    },
-    "@svgr/babel-plugin-transform-svg-component": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
-      "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==",
-      "dev": true
-    },
-    "@svgr/babel-preset": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
-      "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
-      "dev": true,
-      "requires": {
-        "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
-        "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
-        "@svgr/babel-plugin-remove-jsx-empty-expression": "^5.0.1",
-        "@svgr/babel-plugin-replace-jsx-attribute-value": "^5.0.1",
-        "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
-        "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
-        "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
-        "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
-      }
-    },
-    "@svgr/core": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
-      "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
-      "dev": true,
-      "requires": {
-        "@svgr/plugin-jsx": "^5.5.0",
-        "camelcase": "^6.2.0",
-        "cosmiconfig": "^7.0.0"
-      }
-    },
-    "@svgr/hast-util-to-babel-ast": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
-      "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.12.6"
-      }
-    },
-    "@svgr/plugin-jsx": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
-      "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.12.3",
-        "@svgr/babel-preset": "^5.5.0",
-        "@svgr/hast-util-to-babel-ast": "^5.5.0",
-        "svg-parser": "^2.0.2"
-      }
-    },
-    "@svgr/plugin-svgo": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
-      "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^7.0.0",
-        "deepmerge": "^4.2.2",
-        "svgo": "^1.2.2"
-      }
-    },
-    "@svgr/webpack": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
-      "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.12.3",
-        "@babel/plugin-transform-react-constant-elements": "^7.12.1",
-        "@babel/preset-env": "^7.12.1",
-        "@babel/preset-react": "^7.12.5",
-        "@svgr/core": "^5.5.0",
-        "@svgr/plugin-jsx": "^5.5.0",
-        "@svgr/plugin-svgo": "^5.5.0",
-        "loader-utils": "^2.0.0"
-      }
-    },
-    "@testing-library/dom": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
-      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
-      "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
-        "pretty-format": "^27.0.2"
-      },
-      "dependencies": {
-        "aria-query": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-          "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg=="
-        },
-        "dom-accessibility-api": {
-          "version": "0.5.10",
-          "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz",
-          "integrity": "sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g=="
-        }
-      }
-    },
-    "@testing-library/jest-dom": {
-      "version": "5.16.4",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz",
-      "integrity": "sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
-        "aria-query": "^5.0.0",
-        "chalk": "^3.0.0",
-        "css": "^3.0.0",
-        "css.escape": "^1.5.1",
-        "dom-accessibility-api": "^0.5.6",
-        "lodash": "^4.17.15",
-        "redent": "^3.0.0"
-      },
-      "dependencies": {
-        "aria-query": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-          "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        }
-      }
-    },
-    "@testing-library/react": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.2.0.tgz",
-      "integrity": "sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^8.5.0",
-        "@types/react-dom": "^18.0.0"
-      }
-    },
-    "@testing-library/user-event": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
-      "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5"
-      }
-    },
-    "@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-      "dev": true
-    },
-    "@trysound/sax": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-      "dev": true
-    },
-    "@tsconfig/node10": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
-      "dev": true
-    },
-    "@tsconfig/node12": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
-      "dev": true
-    },
-    "@tsconfig/node14": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
-      "dev": true
-    },
-    "@tsconfig/node16": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
-      "dev": true
-    },
-    "@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="
-    },
-    "@types/babel__core": {
-      "version": "7.1.19",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__traverse": {
-      "version": "7.17.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
-      "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-      "dev": true,
-      "requires": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/connect": {
-      "version": "3.4.34",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz",
-      "integrity": "sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
-      "dev": true,
-      "requires": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/eslint": {
-      "version": "7.29.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.29.0.tgz",
-      "integrity": "sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "@types/eslint-scope": {
-      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
-      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
-      "dev": true,
-      "requires": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
-      "dev": true
-    },
-    "@types/eventsource": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@types/eventsource/-/eventsource-1.1.8.tgz",
-      "integrity": "sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==",
-      "dev": true
-    },
-    "@types/express": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
-      "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
-      "dev": true,
-      "requires": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "@types/express-serve-static-core": {
-      "version": "4.17.22",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.22.tgz",
-      "integrity": "sha512-WdqmrUsRS4ootGha6tVwk/IVHM1iorU8tGehftQD2NWiPniw/sm7xdJOIlXLwqdInL9wBw/p7oO8vaYEF3NDmA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*"
-      }
-    },
-    "@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/history": {
-      "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
-      "dev": true
-    },
-    "@types/hoist-non-react-statics": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
-      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
-      "requires": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
-      }
-    },
-    "@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
-      "dev": true
-    },
-    "@types/http-proxy": {
-      "version": "1.17.8",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz",
-      "integrity": "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
-      "dev": true
-    },
-    "@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "dev": true,
-      "requires": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "dev": true,
-      "requires": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "@types/jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.1.tgz",
-      "integrity": "sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==",
-      "dev": true,
-      "requires": {
-        "jest-matcher-utils": "^27.0.0",
-        "pretty-format": "^27.0.0"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
-    },
-    "@types/lodash": {
-      "version": "4.14.177",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
-      "dev": true
-    },
-    "@types/mime": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "16.11.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==",
-      "dev": true
-    },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "@types/prettier": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
-      "integrity": "sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==",
-      "dev": true
-    },
-    "@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-    },
-    "@types/q": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
-      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
-      "dev": true
-    },
-    "@types/qs": {
-      "version": "6.9.6",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz",
-      "integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==",
-      "dev": true
-    },
-    "@types/range-parser": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
-      "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
-      "dev": true
-    },
-    "@types/react": {
-      "version": "18.0.9",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz",
-      "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==",
-      "requires": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "@types/react-datepicker": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.3.4.tgz",
-      "integrity": "sha512-5nTTz37KdTUgMZ1AAxztMWNtEnIMVRo8oCAEhIv0a6uUqDjvSKaMyPRpBV+8chi6f/A8wlTKJIpojpXca2dx3A==",
-      "dev": true,
-      "requires": {
-        "@popperjs/core": "^2.9.2",
-        "@types/react": "*",
-        "date-fns": "^2.0.1",
-        "react-popper": "^2.2.5"
-      }
-    },
-    "@types/react-dom": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
-      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-redux": {
-      "version": "7.1.22",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
-      "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
-      "dev": true,
-      "requires": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
-    "@types/react-router": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
-      "integrity": "sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==",
-      "dev": true,
-      "requires": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*"
-      }
-    },
-    "@types/react-router-dom": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
-      "dev": true,
-      "requires": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*",
-        "@types/react-router": "*"
-      }
-    },
-    "@types/redux-mock-store": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/redux-mock-store/-/redux-mock-store-1.0.3.tgz",
-      "integrity": "sha512-Wqe3tJa6x9MxMN4DJnMfZoBRBRak1XTPklqj4qkVm5VBpZnC8PSADf4kLuFQ9NAdHaowfWoEeUMz7NWc2GMtnA==",
-      "dev": true,
-      "requires": {
-        "redux": "^4.0.5"
-      }
-    },
-    "@types/resolve": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
-      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
-      "dev": true
-    },
-    "@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
-    },
-    "@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-      "dev": true,
-      "requires": {
-        "@types/express": "*"
-      }
-    },
-    "@types/serve-static": {
-      "version": "1.13.10",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
-      "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
-      "dev": true,
-      "requires": {
-        "@types/mime": "^1",
-        "@types/node": "*"
-      }
-    },
-    "@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
-      "dev": true
-    },
-    "@types/styled-components": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.18.tgz",
-      "integrity": "sha512-xPTYmWP7Mxk5TAD3pYsqjwA9G5fAI8e/S51QUJEl7EQD1siKCdiYXIWiH2lzoHRl+QqbQCJMcGv3YTF3OmyPdQ==",
-      "dev": true,
-      "requires": {
-        "@types/hoist-non-react-statics": "*",
-        "@types/react": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "@types/testing-library__jest-dom": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz",
-      "integrity": "sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw==",
-      "dev": true,
-      "requires": {
-        "@types/jest": "*"
-      }
-    },
-    "@types/trusted-types": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
-      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==",
-      "dev": true
-    },
-    "@types/uuid": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
-      "dev": true
-    },
-    "@types/yargs": {
-      "version": "17.0.10",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
-      "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
-      "dev": true,
-      "requires": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
-      "dev": true
-    },
-    "@types/yup": {
-      "version": "0.29.13",
-      "resolved": "https://registry.npmjs.org/@types/yup/-/yup-0.29.13.tgz",
-      "integrity": "sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g=="
-    },
-    "@typescript-eslint/eslint-plugin": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz",
-      "integrity": "sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.10.0",
-        "@typescript-eslint/type-utils": "5.10.0",
-        "@typescript-eslint/utils": "5.10.0",
-        "debug": "^4.3.2",
-        "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.1.8",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/experimental-utils": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.23.0.tgz",
-      "integrity": "sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/utils": "5.23.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
-          "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/visitor-keys": "5.23.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
-          "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
-          "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/visitor-keys": "5.23.0",
-            "debug": "^4.3.2",
-            "globby": "^11.0.4",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.5",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/utils": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
-          "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "@typescript-eslint/scope-manager": "5.23.0",
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/typescript-estree": "5.23.0",
-            "eslint-scope": "^5.1.1",
-            "eslint-utils": "^3.0.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
-          "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "eslint-visitor-keys": "^3.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/parser": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz",
-      "integrity": "sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.27.0",
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/typescript-estree": "5.27.0",
-        "debug": "^4.3.4"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz",
-          "integrity": "sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "@typescript-eslint/visitor-keys": "5.27.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz",
-          "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz",
-          "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "@typescript-eslint/visitor-keys": "5.27.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz",
-          "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/scope-manager": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz",
-      "integrity": "sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/visitor-keys": "5.10.0"
-      }
-    },
-    "@typescript-eslint/type-utils": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz",
-      "integrity": "sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/utils": "5.10.0",
-        "debug": "^4.3.2",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/types": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.0.tgz",
-      "integrity": "sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==",
-      "dev": true
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz",
-      "integrity": "sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/visitor-keys": "5.10.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "fast-glob": {
-          "version": "3.2.11",
-          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-          "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.stat": "^2.0.2",
-            "@nodelib/fs.walk": "^1.2.3",
-            "glob-parent": "^5.1.2",
-            "merge2": "^1.3.0",
-            "micromatch": "^4.0.4"
-          }
-        },
-        "globby": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-          "dev": true,
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.9",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/utils": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.0.tgz",
-      "integrity": "sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.10.0",
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/typescript-estree": "5.10.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "@types/json-schema": {
-          "version": "7.0.9",
-          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-          "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/visitor-keys": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz",
-      "integrity": "sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.10.0",
-        "eslint-visitor-keys": "^3.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
-          "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
-          "dev": true
-        }
-      }
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      }
-    },
-    "ace-builds": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
-      "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
-    },
-    "acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
-    },
-    "acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        }
-      }
-    },
-    "acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true,
-      "requires": {}
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "requires": {}
-    },
-    "acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        }
-      }
-    },
-    "acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true
-    },
-    "address": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.2.0.tgz",
-      "integrity": "sha512-tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig==",
-      "dev": true
-    },
-    "adjust-sourcemap-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "regex-parser": "^2.2.11"
-      }
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "requires": {
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "ajv": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
-      "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dev": true,
-      "requires": {
-        "ajv": "^8.0.0"
-      }
-    },
-    "ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.21.3"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.21.3",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-          "dev": true
-        }
-      }
-    },
-    "ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      },
-      "dependencies": {
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        }
-      }
-    },
-    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      }
-    },
-    "array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "dependencies": {
-        "define-properties": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-          "requires": {
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
-    "array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
-    },
-    "ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true
-    },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
-    },
-    "async": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "autoprefixer": {
-      "version": "10.4.7",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
-      "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.20.3",
-        "caniuse-lite": "^1.0.30001335",
-        "fraction.js": "^4.2.0",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
-        },
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "axe-core": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz",
-      "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==",
-      "dev": true
-    },
-    "axios": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
-      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
-      "dev": true,
-      "requires": {
-        "follow-redirects": "^1.14.8"
-      }
-    },
-    "axobject-query": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true
-    },
-    "babel-jest": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.0.tgz",
-      "integrity": "sha512-zNKk0yhDZ6QUwfxh9k07GII6siNGMJWVUU49gmFj5gfdqDKLqa2RArXOF2CODp4Dr7dLxN2cvAV+667dGJ4b4w==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/transform": "^28.1.0",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^28.0.2",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      }
-    },
-    "babel-loader": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
-      "dev": true,
-      "requires": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.5",
-            "ajv": "^6.12.4",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
-    "babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "requires": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      }
-    },
-    "babel-plugin-jest-hoist": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.0.2.tgz",
-      "integrity": "sha512-Kizhn/ZL+68ZQHxSnHyuvJv8IchXD62KQxV77TBDV/xoBFBOfgRAk97GNs6hXdTTCiVES9nB2I6+7MXXrk5llQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
-      }
-    },
-    "babel-plugin-macros": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "cosmiconfig": "^7.0.0",
-        "resolve": "^1.19.0"
-      }
-    },
-    "babel-plugin-named-asset-import": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz",
-      "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==",
-      "dev": true,
-      "requires": {}
-    },
-    "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
-      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "semver": "^6.1.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "babel-plugin-polyfill-corejs3": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
-      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.21.0"
-      }
-    },
-    "babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
-      }
-    },
-    "babel-plugin-styled-components": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz",
-      "integrity": "sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-module-imports": "^7.0.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "lodash": "^4.17.11"
-      }
-    },
-    "babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
-    },
-    "babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==",
-      "dev": true
-    },
-    "babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      }
-    },
-    "babel-preset-jest": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.0.2.tgz",
-      "integrity": "sha512-sYzXIdgIXXroJTFeB3S6sNDWtlJ2dllCdTEsnZ65ACrMojj3hVNFRmnJ1HZtomGi+Be7aqpY/HJ92fr8OhKVkQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "babel-plugin-jest-hoist": "^28.0.2",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      }
-    },
-    "babel-preset-react-app": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
-      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-proposal-class-properties": "^7.16.0",
-        "@babel/plugin-proposal-decorators": "^7.16.4",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-private-methods": "^7.16.0",
-        "@babel/plugin-transform-flow-strip-types": "^7.16.0",
-        "@babel/plugin-transform-react-display-name": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.4",
-        "@babel/preset-env": "^7.16.4",
-        "@babel/preset-react": "^7.16.0",
-        "@babel/preset-typescript": "^7.16.0",
-        "@babel/runtime": "^7.16.3",
-        "babel-plugin-macros": "^3.1.0",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/compat-data": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-          "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
-          "dev": true
-        },
-        "@babel/core": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.10.tgz",
-          "integrity": "sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA==",
-          "dev": true,
-          "requires": {
-            "@ampproject/remapping": "^2.1.0",
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-compilation-targets": "^7.17.10",
-            "@babel/helper-module-transforms": "^7.17.7",
-            "@babel/helpers": "^7.17.9",
-            "@babel/parser": "^7.17.10",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "convert-source-map": "^1.7.0",
-            "debug": "^4.1.0",
-            "gensync": "^1.0.0-beta.2",
-            "json5": "^2.2.1",
-            "semver": "^6.3.0"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-compilation-targets": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-          "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/compat-data": "^7.17.10",
-            "@babel/helper-validator-option": "^7.16.7",
-            "browserslist": "^4.20.2",
-            "semver": "^6.3.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-transforms": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-          "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-module-imports": "^7.16.7",
-            "@babel/helper-simple-access": "^7.17.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.3",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-simple-access": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-          "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/helper-validator-option": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-          "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-          "dev": true
-        },
-        "@babel/helpers": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-          "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.9",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/runtime": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
-          "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-          "dev": true,
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-          "dev": true
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
-    },
-    "bfj": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz",
-      "integrity": "sha512-+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.5",
-        "check-types": "^11.1.1",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      }
-    },
-    "big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
-    },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-      "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.10.3",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-          "dev": true
-        }
-      }
-    },
-    "bonjour-service": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.12.tgz",
-      "integrity": "sha512-pMmguXYCu63Ug37DluMKEHdxc+aaIf/ay4YbF8Gxtba+9d3u+rmEWy61VK3Z3hp8Rskok3BunHYnG0dUHAsblw==",
-      "dev": true,
-      "requires": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.4"
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
-    "broadcast-channel": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
-      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
-      "requires": {
-        "@babel/runtime": "^7.7.2",
-        "detect-node": "^2.1.0",
-        "js-sha3": "0.8.0",
-        "microseconds": "0.2.0",
-        "nano-time": "1.0.0",
-        "oblivious-set": "1.0.0",
-        "rimraf": "3.0.2",
-        "unload": "2.2.0"
-      }
-    },
-    "browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
-    },
-    "browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
-      "requires": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      }
-    },
-    "bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-      "dev": true,
-      "requires": {
-        "fast-json-stable-stringify": "2.x"
-      }
-    },
-    "bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
-      "requires": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "builtin-modules": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
-      "dev": true
-    },
-    "bulma": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.3.tgz",
-      "integrity": "sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g=="
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "dev": true
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-    },
-    "camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dev": true,
-      "requires": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
-      }
-    },
-    "camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true
-    },
-    "camelcase-css": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-      "dev": true
-    },
-    "camelize": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
-    },
-    "caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001344",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz",
-      "integrity": "sha512-0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g=="
-    },
-    "case-sensitive-paths-webpack-plugin": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
-      "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
-      "dev": true
-    },
-    "chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "dev": true
-    },
-    "charcodes": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
-      "integrity": "sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==",
-      "dev": true
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "check-types": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
-      "integrity": "sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ==",
-      "dev": true
-    },
-    "chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-      "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      }
-    },
-    "chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "dev": true
-    },
-    "ci-info": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.1.tgz",
-      "integrity": "sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==",
-      "dev": true
-    },
-    "cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
-      "dev": true
-    },
-    "classnames": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
-    },
-    "clean-css": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
-      "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.6.0"
-      }
-    },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
-      "dev": true
-    },
-    "cli-truncate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
-      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
-      "dev": true,
-      "requires": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
-          "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "9.2.2",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-          "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-          "dev": true
-        },
-        "slice-ansi": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-          "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^6.0.0",
-            "is-fullwidth-code-point": "^4.0.0"
-          }
-        },
-        "string-width": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.0.1.tgz",
-          "integrity": "sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^9.2.2",
-            "is-fullwidth-code-point": "^4.0.0",
-            "strip-ansi": "^7.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^6.0.1"
-          }
-        }
-      }
-    },
-    "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true
-    },
-    "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "dev": true
-    },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-      "dev": true
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "colord": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
-      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
-      "dev": true
-    },
-    "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true
-    },
-    "common-path-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-      "dev": true
-    },
-    "common-tags": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
-      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
-      "dev": true
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "compare-versions": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-4.1.3.tgz",
-      "integrity": "sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==",
-      "dev": true
-    },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dev": true,
-      "requires": {
-        "mime-db": ">= 1.43.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        }
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concurrently": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.5.1.tgz",
-      "integrity": "sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "date-fns": "^2.16.1",
-        "lodash": "^4.17.21",
-        "rxjs": "^6.6.3",
-        "spawn-command": "^0.0.2-1",
-        "supports-color": "^8.1.0",
-        "tree-kill": "^1.2.2",
-        "yargs": "^16.2.0"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-      "dev": true
-    },
-    "consola": {
-      "version": "2.15.3",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
-      "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
-      "dev": true
-    },
-    "console.table": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/console.table/-/console.table-0.10.0.tgz",
-      "integrity": "sha1-CRcCVYiHW+/XDPLv9L7yxuLXXQQ=",
-      "dev": true,
-      "requires": {
-        "easy-table": "1.1.0"
-      }
-    },
-    "content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.2.1"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        }
-      }
-    },
-    "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-      "dev": true
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
-    },
-    "core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
-      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA=="
-    },
-    "core-js-compat": {
-      "version": "3.22.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.5.tgz",
-      "integrity": "sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.20.3",
-        "semver": "7.0.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
-        }
-      }
-    },
-    "core-js-pure": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
-      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-      "dev": true
-    },
-    "cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dev": true,
-      "requires": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      }
-    },
-    "create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true
-    },
-    "css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      }
-    },
-    "css-blank-pseudo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
-      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      }
-    },
-    "css-color-keywords": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
-    },
-    "css-declaration-sorter": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz",
-      "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==",
-      "dev": true,
-      "requires": {}
-    },
-    "css-has-pseudo": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
-      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      }
-    },
-    "css-loader": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-      "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.7",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "css-minimizer-webpack-plugin": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
-      "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
-      "dev": true,
-      "requires": {
-        "cssnano": "^5.0.6",
-        "jest-worker": "^27.0.2",
-        "postcss": "^8.3.5",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        }
-      }
-    },
-    "css-prefers-color-scheme": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
-      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true,
-      "requires": {}
-    },
-    "css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true
-    },
-    "css-to-react-native": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz",
-      "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==",
-      "requires": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dev": true,
-      "requires": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      }
-    },
-    "css-what": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-      "dev": true
-    },
-    "css.escape": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
-      "dev": true
-    },
-    "cssdb": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.6.1.tgz",
-      "integrity": "sha512-0/nZEYfp8SFEzJkMud8NxZJsGfD7RHDJti6GRBLZptIwAzco6RTx1KgwFl4mGWsYS0ZNbCrsY9QryhQ4ldF3Mg==",
-      "dev": true
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true
-    },
-    "cssnano": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.7.tgz",
-      "integrity": "sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==",
-      "dev": true,
-      "requires": {
-        "cssnano-preset-default": "^5.2.7",
-        "lilconfig": "^2.0.3",
-        "yaml": "^1.10.2"
-      }
-    },
-    "cssnano-preset-default": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz",
-      "integrity": "sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==",
-      "dev": true,
-      "requires": {
-        "css-declaration-sorter": "^6.2.2",
-        "cssnano-utils": "^3.1.0",
-        "postcss-calc": "^8.2.3",
-        "postcss-colormin": "^5.3.0",
-        "postcss-convert-values": "^5.1.0",
-        "postcss-discard-comments": "^5.1.1",
-        "postcss-discard-duplicates": "^5.1.0",
-        "postcss-discard-empty": "^5.1.1",
-        "postcss-discard-overridden": "^5.1.0",
-        "postcss-merge-longhand": "^5.1.4",
-        "postcss-merge-rules": "^5.1.1",
-        "postcss-minify-font-values": "^5.1.0",
-        "postcss-minify-gradients": "^5.1.1",
-        "postcss-minify-params": "^5.1.2",
-        "postcss-minify-selectors": "^5.2.0",
-        "postcss-normalize-charset": "^5.1.0",
-        "postcss-normalize-display-values": "^5.1.0",
-        "postcss-normalize-positions": "^5.1.0",
-        "postcss-normalize-repeat-style": "^5.1.0",
-        "postcss-normalize-string": "^5.1.0",
-        "postcss-normalize-timing-functions": "^5.1.0",
-        "postcss-normalize-unicode": "^5.1.0",
-        "postcss-normalize-url": "^5.1.0",
-        "postcss-normalize-whitespace": "^5.1.1",
-        "postcss-ordered-values": "^5.1.1",
-        "postcss-reduce-initial": "^5.1.0",
-        "postcss-reduce-transforms": "^5.1.0",
-        "postcss-svgo": "^5.1.0",
-        "postcss-unique-selectors": "^5.1.1"
-      }
-    },
-    "cssnano-utils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-      "dev": true,
-      "requires": {}
-    },
-    "csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "requires": {
-        "css-tree": "^1.1.2"
-      },
-      "dependencies": {
-        "css-tree": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-          "dev": true,
-          "requires": {
-            "mdn-data": "2.0.14",
-            "source-map": "^0.6.1"
-          }
-        },
-        "mdn-data": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-          "dev": true
-        }
-      }
-    },
-    "cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-      "dev": true
-    },
-    "cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "requires": {
-        "cssom": "~0.3.6"
-      },
-      "dependencies": {
-        "cssom": {
-          "version": "0.3.8",
-          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-          "dev": true
-        }
-      }
-    },
-    "csstype": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
-      "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
-    },
-    "damerau-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-      "dev": true
-    },
-    "data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
-      },
-      "dependencies": {
-        "tr46": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-          "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-          "dev": true,
-          "requires": {
-            "punycode": "^2.1.1"
-          }
-        },
-        "webidl-conversions": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-          "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-          "dev": true
-        },
-        "whatwg-url": {
-          "version": "8.7.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-          "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.7.0",
-            "tr46": "^2.1.0",
-            "webidl-conversions": "^6.1.0"
-          }
-        }
-      }
-    },
-    "date-fns": {
-      "version": "2.23.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
-      "integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==",
-      "dev": true
-    },
-    "dayjs": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz",
-      "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
-      "dev": true
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
-    },
-    "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true
-    },
-    "default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dev": true,
-      "requires": {
-        "execa": "^5.0.0"
-      }
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
-    "define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "defined": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
-      "dev": true
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true
-    },
-    "depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "dev": true
-    },
-    "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "dev": true
-    },
-    "detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true
-    },
-    "detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
-    "detect-port-alt": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
-      "dev": true,
-      "requires": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
-      }
-    },
-    "detective": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
-      "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
-      "dev": true,
-      "requires": {
-        "acorn-node": "^1.6.1",
-        "defined": "^1.0.0",
-        "minimist": "^1.1.1"
-      }
-    },
-    "didyoumean": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-      "dev": true
-    },
-    "diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true
-    },
-    "diff-match-patch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
-      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
-    },
-    "diff-sequences": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.0.2.tgz",
-      "integrity": "sha512-YtEoNynLDFCRznv/XDalsKGSZDoj0U5kLnXvY0JSq3nBboRrZXjD81+eSiwi+nzcZDwedMmcowcxNwwgFW23mQ==",
-      "dev": true,
-      "peer": true
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-      "dev": true
-    },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-      "dev": true
-    },
-    "dns-packet": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.3.1.tgz",
-      "integrity": "sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw==",
-      "dev": true,
-      "requires": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "dom-accessibility-api": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz",
-      "integrity": "sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==",
-      "dev": true
-    },
-    "dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dev": true,
-      "requires": {
-        "utila": "~0.4"
-      }
-    },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-      "dev": true,
-      "requires": {
-        "webidl-conversions": "^5.0.0"
-      },
-      "dependencies": {
-        "webidl-conversions": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-          "dev": true
-        }
-      }
-    },
-    "domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.2.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true
-        }
-      }
-    },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
-      }
-    },
-    "dotenv": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",
-      "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==",
-      "dev": true
-    },
-    "dotenv-expand": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
-      "dev": true
-    },
-    "duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-      "dev": true
-    },
-    "easy-table": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz",
-      "integrity": "sha1-hvmrTBAvA3G3KXuSplHVgkvIy3M=",
-      "dev": true,
-      "requires": {
-        "wcwidth": ">=1.0.1"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "ejs": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.7.tgz",
-      "integrity": "sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==",
-      "dev": true,
-      "requires": {
-        "jake": "^10.8.5"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.3.752",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz",
-      "integrity": "sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A=="
-    },
-    "emittery": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
-      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
-      "dev": true
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "enhanced-resolve": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
-      "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      }
-    },
-    "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^4.1.1"
-      }
-    },
-    "entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "error-stack-parser": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz",
-      "integrity": "sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA==",
-      "dev": true,
-      "requires": {
-        "stackframe": "^1.1.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.3.tgz",
-      "integrity": "sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.3",
-        "is-string": "^1.0.6",
-        "object-inspect": "^1.10.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      }
-    },
-    "es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-      "dev": true
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "requires": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        },
-        "levn": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2"
-          }
-        },
-        "optionator": {
-          "version": "0.8.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-          "dev": true,
-          "requires": {
-            "deep-is": "~0.1.3",
-            "fast-levenshtein": "~2.0.6",
-            "levn": "~0.3.0",
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2",
-            "word-wrap": "~1.2.3"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-          "dev": true
-        },
-        "type-check": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.2"
-          }
-        }
-      }
-    },
-    "eslint": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
-      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
-      "requires": {
-        "@eslint/eslintrc": "^1.3.0",
-        "@humanwhocodes/config-array": "^0.9.2",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.2",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-        },
-        "eslint-scope": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^5.2.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
-        },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        },
-        "glob-parent": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-          "requires": {
-            "is-glob": "^4.0.3"
-          }
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-        },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
-    "eslint-config-airbnb": {
-      "version": "19.0.4",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
-      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
-      "dev": true,
-      "requires": {
-        "eslint-config-airbnb-base": "^15.0.0",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.19.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.1",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.1",
-            "object-inspect": "^1.11.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
-        "object.entries": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-          "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.19.1"
-          }
-        }
-      }
-    },
-    "eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "requires": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.19.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.1",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.1",
-            "object-inspect": "^1.11.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
-        "object.entries": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-          "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.19.1"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-config-airbnb-typescript": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz",
-      "integrity": "sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==",
-      "dev": true,
-      "requires": {
-        "eslint-config-airbnb-base": "^15.0.0"
-      }
-    },
-    "eslint-config-prettier": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
-      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-config-react-app": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
-      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.16.0",
-        "@babel/eslint-parser": "^7.16.3",
-        "@rushstack/eslint-patch": "^1.1.0",
-        "@typescript-eslint/eslint-plugin": "^5.5.0",
-        "@typescript-eslint/parser": "^5.5.0",
-        "babel-preset-react-app": "^10.0.1",
-        "confusing-browser-globals": "^1.0.11",
-        "eslint-plugin-flowtype": "^8.0.3",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jest": "^25.3.0",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.27.1",
-        "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-testing-library": "^5.0.1"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/compat-data": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-          "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
-          "dev": true
-        },
-        "@babel/core": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.10.tgz",
-          "integrity": "sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA==",
-          "dev": true,
-          "requires": {
-            "@ampproject/remapping": "^2.1.0",
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-compilation-targets": "^7.17.10",
-            "@babel/helper-module-transforms": "^7.17.7",
-            "@babel/helpers": "^7.17.9",
-            "@babel/parser": "^7.17.10",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "convert-source-map": "^1.7.0",
-            "debug": "^4.1.0",
-            "gensync": "^1.0.0-beta.2",
-            "json5": "^2.2.1",
-            "semver": "^6.3.0"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-compilation-targets": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-          "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/compat-data": "^7.17.10",
-            "@babel/helper-validator-option": "^7.16.7",
-            "browserslist": "^4.20.2",
-            "semver": "^6.3.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-module-transforms": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-          "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-module-imports": "^7.16.7",
-            "@babel/helper-simple-access": "^7.17.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.3",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-simple-access": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-          "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/helper-validator-option": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-          "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-          "dev": true
-        },
-        "@babel/helpers": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-          "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.9",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-          "dev": true
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "requires": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        }
-      }
-    },
-    "eslint-import-resolver-typescript": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz",
-      "integrity": "sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==",
-      "requires": {
-        "debug": "^4.3.4",
-        "glob": "^7.2.0",
-        "is-glob": "^4.0.3",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "glob": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "is-core-module": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-          "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-          "requires": {
-            "has": "^1.0.3"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "resolve": {
-          "version": "1.22.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-          "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-          "requires": {
-            "is-core-module": "^2.8.1",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        },
-        "tsconfig-paths": {
-          "version": "3.14.1",
-          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-          "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-          "requires": {
-            "@types/json5": "^0.0.29",
-            "json5": "^1.0.1",
-            "minimist": "^1.2.6",
-            "strip-bom": "^3.0.0"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "requires": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        }
-      }
-    },
-    "eslint-plugin-flowtype": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
-      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.21",
-        "string-natural-compare": "^3.0.1"
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "is-core-module": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-          "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-          "requires": {
-            "has": "^1.0.3"
-          }
-        },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "resolve": {
-          "version": "1.22.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-          "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-          "requires": {
-            "is-core-module": "^2.8.1",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-jest": {
-      "version": "25.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
-      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/experimental-utils": "^5.0.0"
-      }
-    },
-    "eslint-plugin-jest-dom": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-4.0.2.tgz",
-      "integrity": "sha512-Jo51Atwyo2TdcUncjmU+UQeSTKh3sc2LF/M5i/R3nTU0Djw9V65KGJisdm/RtuKhy2KH/r7eQ1n6kwYFPNdHlA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.16.3",
-        "@testing-library/dom": "^8.11.1",
-        "requireindex": "^1.2.0"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-          "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-          "dev": true,
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        }
-      }
-    },
-    "eslint-plugin-jsx-a11y": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
-      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.16.3",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.4",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.3.5",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.7",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.2.1",
-        "language-tags": "^1.0.5",
-        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-          "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-          "dev": true,
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        },
-        "array-includes": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-          "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.19.1",
-            "get-intrinsic": "^1.1.1",
-            "is-string": "^1.0.7"
-          }
-        },
-        "emoji-regex": {
-          "version": "9.2.2",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-          "dev": true
-        },
-        "es-abstract": {
-          "version": "1.19.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.1",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.1",
-            "object-inspect": "^1.11.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "jsx-ast-utils": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz",
-          "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
-          "dev": true,
-          "requires": {
-            "array-includes": "^3.1.3",
-            "object.assign": "^4.1.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-prettier": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
-      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
-      "dev": true,
-      "requires": {
-        "prettier-linter-helpers": "^1.0.0"
-      }
-    },
-    "eslint-plugin-react": {
-      "version": "7.29.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz",
-      "integrity": "sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flatmap": "^1.2.5",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.1.0",
-        "object.values": "^1.1.5",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.3",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.6"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "prop-types": {
-          "version": "15.8.1",
-          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-          "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-          "dev": true,
-          "requires": {
-            "loose-envify": "^1.4.0",
-            "object-assign": "^4.1.1",
-            "react-is": "^16.13.1"
-          }
-        },
-        "resolve": {
-          "version": "2.0.0-next.3",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
-          "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.2.0",
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "eslint-plugin-react-hooks": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
-      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-plugin-testing-library": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.5.0.tgz",
-      "integrity": "sha512-eWQ19l6uWL7LW8oeMyQVSGjVYFnBqk7DMHjadm0yOHBvX3Xi9OBrsNuxoAMdX4r7wlQ5WWpW46d+CB6FWFL/PQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/utils": "^5.13.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
-          "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/visitor-keys": "5.23.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
-          "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
-          "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/visitor-keys": "5.23.0",
-            "debug": "^4.3.2",
-            "globby": "^11.0.4",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.5",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/utils": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
-          "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "@typescript-eslint/scope-manager": "5.23.0",
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/typescript-estree": "5.23.0",
-            "eslint-scope": "^5.1.1",
-            "eslint-utils": "^3.0.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
-          "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "eslint-visitor-keys": "^3.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
-    },
-    "eslint-webpack-plugin": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.1.1.tgz",
-      "integrity": "sha512-xSucskTN9tOkfW7so4EaiFIkulWLXwCB/15H917lR6pTv0Zot6/fetFucmENRb7J5whVSFKIvwnrnsa78SG2yg==",
-      "dev": true,
-      "requires": {
-        "@types/eslint": "^7.28.2",
-        "jest-worker": "^27.3.1",
-        "micromatch": "^4.0.4",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^3.1.1"
-      }
-    },
-    "espree": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
-      "requires": {
-        "acorn": "^8.7.1",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
-        }
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-    },
-    "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "estree-walker": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "dev": true
-    },
-    "execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      }
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "dev": true
-    },
-    "expect": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.0.tgz",
-      "integrity": "sha512-qFXKl8Pmxk8TBGfaFKRtcQjfXEnKAs+dmlxdwvukJZorwrAabT7M3h8oLOG01I2utEhkmUTi17CHaPBovZsKdw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/expect-utils": "^28.1.0",
-        "jest-get-type": "^28.0.2",
-        "jest-matcher-utils": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-util": "^28.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-matcher-utils": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.0.tgz",
-          "integrity": "sha512-onnax0n2uTLRQFKAjC7TuaxibrPSvZgKTcSCnNUz/tOjJ9UhxNm7ZmPpoQavmTDUjXvUQ8KesWk2/VdrxIFzTQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "jest-diff": "^28.1.0",
-            "jest-get-type": "^28.0.2",
-            "pretty-format": "^28.1.0"
-          }
-        },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
-    "express": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.0",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.10.3",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-          "dev": true
-        },
-        "path-to-regexp": {
-          "version": "0.1.7",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-          "dev": true
-        }
-      }
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
-    },
-    "fast-safe-stringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dev": true,
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
-    "fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-      "dev": true,
-      "requires": {
-        "bser": "2.1.1"
-      }
-    },
-    "fetch-mock": {
-      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.11.0.tgz",
-      "integrity": "sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==",
-      "requires": {
-        "@babel/core": "^7.0.0",
-        "@babel/runtime": "^7.0.0",
-        "core-js": "^3.0.0",
-        "debug": "^4.1.1",
-        "glob-to-regexp": "^0.4.0",
-        "is-subset": "^0.1.1",
-        "lodash.isequal": "^4.5.0",
-        "path-to-regexp": "^2.2.1",
-        "querystring": "^0.2.0",
-        "whatwg-url": "^6.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "path-to-regexp": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz",
-          "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w=="
-        }
-      }
-    },
-    "fetch-mock-jest": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/fetch-mock-jest/-/fetch-mock-jest-1.5.1.tgz",
-      "integrity": "sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ==",
-      "dev": true,
-      "requires": {
-        "fetch-mock": "^9.11.0"
-      }
-    },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      }
-    },
-    "filelist": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.3.tgz",
-      "integrity": "sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==",
-      "dev": true,
-      "requires": {
-        "minimatch": "^5.0.1"
-      },
-      "dependencies": {
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "minimatch": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        }
-      }
-    },
-    "filesize": {
-      "version": "8.0.7",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
-      "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==",
-      "dev": true
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "finalhandler": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      }
-    },
-    "find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      }
-    },
-    "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "requires": {
-        "locate-path": "^2.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
-    },
-    "follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
-      "dev": true
-    },
-    "fork-ts-checker-webpack-plugin": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz",
-      "integrity": "sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@types/json-schema": "^7.0.5",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.2",
-        "cosmiconfig": "^6.0.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^9.0.0",
-        "glob": "^7.1.6",
-        "memfs": "^3.1.2",
-        "minimatch": "^3.0.4",
-        "schema-utils": "2.7.0",
-        "semver": "^7.3.2",
-        "tapable": "^1.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "cosmiconfig": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-          "dev": true,
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.1.0",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.7.2"
-          }
-        },
-        "fs-extra": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-          "dev": true,
-          "requires": {
-            "at-least-node": "^1.0.0",
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
-          }
-        },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "tapable": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-          "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-          "dev": true
-        }
-      }
-    },
-    "form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "format-util": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz",
-      "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="
-    },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "dev": true
-    },
-    "fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-      "dev": true
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
-    },
-    "fs-extra": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
-      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      }
-    },
-    "fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-      "dev": true
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "get-own-enumerable-property-symbols": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
-      "dev": true
-    },
-    "get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-    },
-    "global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "^3.0.0"
-      }
-    },
-    "global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "requires": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "dependencies": {
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "globals": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
-      "requires": {
-        "type-fest": "^0.20.2"
-      }
-    },
-    "globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-      "dev": true
-    },
-    "gzip-size": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
-      "dev": true,
-      "requires": {
-        "duplexer": "^0.1.2"
-      }
-    },
-    "handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-      "dev": true
-    },
-    "harmony-reflect": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
-      "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "requires": {
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
-    },
-    "history": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
-      "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
-      "requires": {
-        "@babel/runtime": "^7.7.6"
-      }
-    },
-    "hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "requires": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-      "dev": true
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-      "dev": true,
-      "requires": {
-        "whatwg-encoding": "^1.0.5"
-      }
-    },
-    "html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
-      "dev": true
-    },
-    "html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dev": true,
-      "requires": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      }
-    },
-    "html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
-      "dev": true,
-      "requires": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      }
-    },
-    "htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "dom-serializer": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-          "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "domhandler": "^4.2.0",
-            "entities": "^2.0.0"
-          }
-        },
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true
-        },
-        "domutils": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "^1.0.1",
-            "domelementtype": "^2.2.0",
-            "domhandler": "^4.2.0"
-          }
-        }
-      }
-    },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-      "dev": true
-    },
-    "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dev": true,
-      "requires": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      }
-    },
-    "http-parser-js": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz",
-      "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==",
-      "dev": true
-    },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "dev": true,
-      "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-      "dev": true,
-      "requires": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      }
-    },
-    "https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true
-    },
-    "husky": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz",
-      "integrity": "sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
-    },
-    "idb": {
-      "version": "6.1.5",
-      "resolved": "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz",
-      "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw==",
-      "dev": true
-    },
-    "identity-obj-proxy": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
-      "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
-      "dev": true,
-      "requires": {
-        "harmony-reflect": "^1.4.6"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
-    },
-    "immer": {
-      "version": "9.0.12",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz",
-      "integrity": "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA=="
-    },
-    "immutable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
-      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "inquirer": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.2.tgz",
-      "integrity": "sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.1.0"
-          }
-        },
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
-      }
-    },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-      "dev": true
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA=="
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="
-    },
-    "is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="
-    },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
-    "is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true
-    },
-    "is-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-      "dev": true
-    },
-    "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-    },
-    "is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw=="
-    },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "dev": true
-    },
-    "is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true
-    },
-    "is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
-      "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
-      "dev": true
-    },
-    "is-root": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
-      "dev": true
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true
-    },
-    "is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w=="
-    },
-    "is-subset": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY="
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
-    },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true
-    },
-    "is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0"
-      }
-    },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-      "dev": true
-    },
-    "istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
-      "dev": true,
-      "requires": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      }
-    },
-    "iterare": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/iterare/-/iterare-1.2.1.tgz",
-      "integrity": "sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==",
-      "dev": true
-    },
-    "jake": {
-      "version": "10.8.5",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
-      "dev": true,
-      "requires": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "jest": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.0.tgz",
-      "integrity": "sha512-TZR+tHxopPhzw3c3560IJXZWLNHgpcz1Zh0w5A65vynLGNcg/5pZ+VildAd7+XGOu6jd58XMY/HNn0IkZIXVXg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/core": "^28.1.0",
-        "import-local": "^3.0.2",
-        "jest-cli": "^28.1.0"
-      }
-    },
-    "jest-changed-files": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.0.2.tgz",
-      "integrity": "sha512-QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "execa": "^5.0.0",
-        "throat": "^6.0.1"
-      }
-    },
-    "jest-circus": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.0.tgz",
-      "integrity": "sha512-rNYfqfLC0L0zQKRKsg4n4J+W1A2fbyGH7Ss/kDIocp9KXD9iaL111glsLu7+Z7FHuZxwzInMDXq+N1ZIBkI/TQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/environment": "^28.1.0",
-        "@jest/expect": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^28.1.0",
-        "jest-matcher-utils": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-runtime": "^28.1.0",
-        "jest-snapshot": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "pretty-format": "^28.1.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-matcher-utils": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.0.tgz",
-          "integrity": "sha512-onnax0n2uTLRQFKAjC7TuaxibrPSvZgKTcSCnNUz/tOjJ9UhxNm7ZmPpoQavmTDUjXvUQ8KesWk2/VdrxIFzTQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "jest-diff": "^28.1.0",
-            "jest-get-type": "^28.0.2",
-            "pretty-format": "^28.1.0"
-          }
-        },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
-    "jest-cli": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.0.tgz",
-      "integrity": "sha512-fDJRt6WPRriHrBsvvgb93OxgajHHsJbk4jZxiPqmZbMDRcHskfJBBfTyjFko0jjfprP544hOktdSi9HVgl4VUQ==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@jest/core": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "prompts": "^2.0.1",
-        "yargs": "^17.3.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-validate": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-          "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
+        "es-abstract": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@jest/types": "^28.1.0",
-            "camelcase": "^6.2.0",
-            "chalk": "^4.0.0",
-            "jest-get-type": "^28.0.2",
-            "leven": "^3.1.0",
-            "pretty-format": "^28.1.0"
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "function.prototype.name": "^1.1.5",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-property-descriptors": "^1.0.0",
+            "has-symbols": "^1.0.3",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.2",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.2",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.2",
+            "object-inspect": "^1.12.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "regexp.prototype.flags": "^1.4.1",
+            "string.prototype.trimend": "^1.0.5",
+            "string.prototype.trimstart": "^1.0.5",
+            "unbox-primitive": "^1.0.2"
           }
         },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
+        "has-bigints": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+          "dev": true
         },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+          "dev": true
         },
-        "yargs": {
-          "version": "17.5.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-          "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.3",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^21.0.0"
-          }
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+          "dev": true
         },
-        "yargs-parser": {
-          "version": "21.0.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-          "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
-    "jest-config": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.0.tgz",
-      "integrity": "sha512-aOV80E9LeWrmflp7hfZNn/zGA4QKv/xsn2w8QCBP0t0+YqObuCWTSgNbHJ0j9YsTuCO08ZR/wsvlxqqHX20iUA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "babel-jest": "^28.1.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^28.1.0",
-        "jest-environment-node": "^28.1.0",
-        "jest-get-type": "^28.0.2",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.0",
-        "jest-runner": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "jest-validate": "^28.1.0",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^28.1.0",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
+        "is-negative-zero": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+          "dev": true
         },
-        "jest-haste-map": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-          "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@jest/types": "^28.1.0",
-            "@types/graceful-fs": "^4.1.3",
-            "@types/node": "*",
-            "anymatch": "^3.0.3",
-            "fb-watchman": "^2.0.0",
-            "fsevents": "^2.3.2",
-            "graceful-fs": "^4.2.9",
-            "jest-regex-util": "^28.0.2",
-            "jest-util": "^28.1.0",
-            "jest-worker": "^28.1.0",
-            "micromatch": "^4.0.4",
-            "walker": "^1.0.7"
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-resolve": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.0.tgz",
-          "integrity": "sha512-vvfN7+tPNnnhDvISuzD1P+CRVP8cK0FHXRwPAcdDaQv4zgvwvag2n55/h5VjYcM5UJG7L4TwE5tZlzcI0X2Lhw==",
+        "is-shared-array-buffer": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^28.1.0",
-            "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^28.1.0",
-            "jest-validate": "^28.1.0",
-            "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
-            "slash": "^3.0.0"
+            "call-bind": "^1.0.2"
           }
         },
-        "jest-validate": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-          "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@jest/types": "^28.1.0",
-            "camelcase": "^6.2.0",
-            "chalk": "^4.0.0",
-            "jest-get-type": "^28.0.2",
-            "leven": "^3.1.0",
-            "pretty-format": "^28.1.0"
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "jest-worker": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-          "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
+        "is-weakref": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
+            "call-bind": "^1.0.2"
           }
         },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+          "dev": true
+        },
+        "regexp.prototype.flags": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "functions-have-names": "^1.2.2"
           }
         },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+        "string.prototype.trimend": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
+          },
+          "dependencies": {
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+              "dev": true,
+              "requires": {
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
+              }
+            }
           }
-        }
-      }
-    },
-    "jest-diff": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.0.tgz",
-      "integrity": "sha512-8eFd3U3OkIKRtlasXfiAQfbovgFgRDb0Ngcs2E+FMeBZ4rUezqIaGjuyggJBp+llosQXNEWofk/Sz4Hr5gMUhA==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^28.0.2",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
         },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+        "string.prototype.trimstart": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
+          },
+          "dependencies": {
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+              "dev": true,
+              "requires": {
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
+              }
+            }
           }
         },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
+        "unbox-primitive": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
           "dev": true,
-          "peer": true
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-bigints": "^1.0.2",
+            "has-symbols": "^1.0.3",
+            "which-boxed-primitive": "^1.0.2"
+          }
         }
       }
     },
-    "jest-docblock": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.0.2.tgz",
-      "integrity": "sha512-FH10WWw5NxLoeSdQlJwu+MTiv60aXV/t8KEwIRGEv74WARE1cXIqh1vGdy2CraHuWOOrnzTWj/azQKqW4fO7xg==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "detect-newline": "^3.0.0"
-      }
-    },
-    "jest-each": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.0.tgz",
-      "integrity": "sha512-a/XX02xF5NTspceMpHujmOexvJ4GftpYXqr6HhhmKmExtMXsyIN/fvanQlt/BcgFoRKN4OCXxLQKth9/n6OPFg==",
+    "array.prototype.flatmap": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
+      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "@jest/types": "^28.1.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "jest-util": "^28.1.0",
-        "pretty-format": "^28.1.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
-        },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+        "es-abstract": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "function.prototype.name": "^1.1.5",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-property-descriptors": "^1.0.0",
+            "has-symbols": "^1.0.3",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.2",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.2",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.2",
+            "object-inspect": "^1.12.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "regexp.prototype.flags": "^1.4.1",
+            "string.prototype.trimend": "^1.0.5",
+            "string.prototype.trimstart": "^1.0.5",
+            "unbox-primitive": "^1.0.2"
           }
         },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
-        }
-      }
-    },
-    "jest-environment-jsdom": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
-      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jsdom": "^16.6.0"
-      },
-      "dependencies": {
-        "@jest/environment": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+        "has-bigints": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+          "dev": true
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+          "dev": true
+        },
+        "is-negative-zero": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
           "dev": true,
           "requires": {
-            "@jest/fake-timers": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "jest-mock": "^27.5.1"
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "@jest/fake-timers": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+        "is-shared-array-buffer": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "@sinonjs/fake-timers": "^8.0.1",
-            "@types/node": "*",
-            "jest-message-util": "^27.5.1",
-            "jest-mock": "^27.5.1",
-            "jest-util": "^27.5.1"
+            "call-bind": "^1.0.2"
           }
         },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "@sinonjs/fake-timers": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+        "is-weakref": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
           "dev": true,
           "requires": {
-            "@sinonjs/commons": "^1.7.0"
+            "call-bind": "^1.0.2"
           }
         },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+          "dev": true
+        },
+        "regexp.prototype.flags": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "functions-have-names": "^1.2.2"
           }
         },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+        "string.prototype.trimend": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
+          },
+          "dependencies": {
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+              "dev": true,
+              "requires": {
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
+              }
+            }
           }
         },
-        "jest-mock": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+        "string.prototype.trimstart": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
+          },
+          "dependencies": {
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+              "dev": true,
+              "requires": {
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
+              }
+            }
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+        "unbox-primitive": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
+            "call-bind": "^1.0.2",
+            "has-bigints": "^1.0.2",
+            "has-symbols": "^1.0.3",
+            "which-boxed-primitive": "^1.0.2"
           }
         }
       }
     },
-    "jest-environment-node": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.0.tgz",
-      "integrity": "sha512-gBLZNiyrPw9CSMlTXF1yJhaBgWDPVvH0Pq6bOEwGMXaYNzhzhw2kA/OijNF8egbCgDS0/veRv97249x2CX+udQ==",
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+      "dev": true
+    },
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "axe-core": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz",
+      "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==",
+      "dev": true
+    },
+    "axios": {
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "@jest/environment": "^28.1.0",
-        "@jest/fake-timers": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "jest-mock": "^28.1.0",
-        "jest-util": "^28.1.0"
+        "follow-redirects": "^1.14.8"
       }
     },
-    "jest-get-type": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
-      "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==",
-      "dev": true,
-      "peer": true
+    "axobject-query": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
+      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+      "dev": true
     },
-    "jest-haste-map": {
+    "babel-jest": {
       "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
-      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
+      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
       "requires": {
+        "@jest/transform": "^27.5.1",
         "@jest/types": "^27.5.1",
-        "@types/graceful-fs": "^4.1.2",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^2.3.2",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^27.5.1",
-        "jest-serializer": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
       },
       "dependencies": {
         "@jest/types": {
           "version": "27.5.1",
           "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
           "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
@@ -42941,2102 +19935,2399 @@
           "version": "16.0.4",
           "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
           "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
           }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
         }
       }
     },
-    "jest-jasmine2": {
+    "babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "requires": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      }
+    },
+    "babel-plugin-jest-hoist": {
       "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
-      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+      "requires": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      }
+    },
+    "babel-plugin-macros": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^27.5.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
-        "throat": "^6.0.1"
+        "@babel/runtime": "^7.12.5",
+        "cosmiconfig": "^7.0.0",
+        "resolve": "^1.19.0"
+      }
+    },
+    "babel-plugin-polyfill-corejs2": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "semver": "^6.1.1"
       },
       "dependencies": {
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "@jest/environment": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
-          "dev": true,
-          "requires": {
-            "@jest/fake-timers": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "jest-mock": "^27.5.1"
-          }
-        },
-        "@jest/fake-timers": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@sinonjs/fake-timers": "^8.0.1",
-            "@types/node": "*",
-            "jest-message-util": "^27.5.1",
-            "jest-mock": "^27.5.1",
-            "jest-util": "^27.5.1"
-          }
-        },
-        "@jest/globals": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-          "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
-          "dev": true,
-          "requires": {
-            "@jest/environment": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "expect": "^27.5.1"
-          }
-        },
-        "@jest/source-map": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-          "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
-          "dev": true,
-          "requires": {
-            "callsites": "^3.0.0",
-            "graceful-fs": "^4.2.9",
-            "source-map": "^0.6.0"
-          }
-        },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-          "dev": true,
-          "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/transform": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-          "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
-          "dev": true,
-          "requires": {
-            "@babel/core": "^7.1.0",
-            "@jest/types": "^27.5.1",
-            "babel-plugin-istanbul": "^6.1.1",
-            "chalk": "^4.0.0",
-            "convert-source-map": "^1.4.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^27.5.1",
-            "jest-regex-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "micromatch": "^4.0.4",
-            "pirates": "^4.0.4",
-            "slash": "^3.0.0",
-            "source-map": "^0.6.1",
-            "write-file-atomic": "^3.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@sinonjs/fake-timers": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-          "dev": true,
-          "requires": {
-            "@sinonjs/commons": "^1.7.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
+      }
+    },
+    "babel-plugin-styled-components": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz",
+      "integrity": "sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==",
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-module-imports": "^7.0.0",
+        "babel-plugin-syntax-jsx": "^6.18.0",
+        "lodash": "^4.17.11"
+      }
+    },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
+    },
+    "babel-plugin-transform-react-remove-prop-types": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
+      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==",
+      "dev": true
+    },
+    "babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "requires": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      }
+    },
+    "babel-preset-jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+      "requires": {
+        "babel-plugin-jest-hoist": "^27.5.1",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      }
+    },
+    "babel-preset-react-app": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
+      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.16.0",
+        "@babel/plugin-proposal-class-properties": "^7.16.0",
+        "@babel/plugin-proposal-decorators": "^7.16.4",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
+        "@babel/plugin-proposal-private-methods": "^7.16.0",
+        "@babel/plugin-transform-flow-strip-types": "^7.16.0",
+        "@babel/plugin-transform-react-display-name": "^7.16.0",
+        "@babel/plugin-transform-runtime": "^7.16.4",
+        "@babel/preset-env": "^7.16.4",
+        "@babel/preset-react": "^7.16.0",
+        "@babel/preset-typescript": "^7.16.0",
+        "@babel/runtime": "^7.16.3",
+        "babel-plugin-macros": "^3.1.0",
+        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.17.9",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
+          "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "regenerator-runtime": "^0.13.4"
           }
-        },
-        "diff-sequences": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+        }
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
+    "big-integer": {
+      "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
+    },
+    "binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
+    },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
+    "broadcast-channel": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
+      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
+      "requires": {
+        "@babel/runtime": "^7.7.2",
+        "detect-node": "^2.1.0",
+        "js-sha3": "0.8.0",
+        "microseconds": "0.2.0",
+        "nano-time": "1.0.0",
+        "oblivious-set": "1.0.0",
+        "rimraf": "3.0.2",
+        "unload": "2.2.0"
+      }
+    },
+    "browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+    },
+    "browserslist": {
+      "version": "4.20.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz",
+      "integrity": "sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==",
+      "requires": {
+        "caniuse-lite": "^1.0.30001349",
+        "electron-to-chromium": "^1.4.147",
+        "escalade": "^3.1.1",
+        "node-releases": "^2.0.5",
+        "picocolors": "^1.0.0"
+      }
+    },
+    "bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "requires": {
+        "fast-json-stable-stringify": "2.x"
+      }
+    },
+    "bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "requires": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "bulma": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.3.tgz",
+      "integrity": "sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g=="
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "call-me-maybe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
+    },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+    },
+    "camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
+    },
+    "camelize": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
+      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001352",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz",
+      "integrity": "sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA=="
+    },
+    "chalk": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+      "requires": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
+    },
+    "charcodes": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
+      "integrity": "sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==",
+      "dev": true
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "requires": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      }
+    },
+    "ci-info": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.1.tgz",
+      "integrity": "sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg=="
+    },
+    "cjs-module-lexer": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
+      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
+    },
+    "classnames": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
+      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
+    },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
+    "cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^3.1.0"
+      }
+    },
+    "cli-spinners": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
+      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+      "dev": true
+    },
+    "cli-truncate": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
+      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
+      "dev": true,
+      "requires": {
+        "slice-ansi": "^5.0.0",
+        "string-width": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
           "dev": true
         },
-        "expect": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "jest-matcher-utils": "^27.5.1",
-            "jest-message-util": "^27.5.1"
-          }
-        },
-        "jest-diff": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-          "dev": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "diff-sequences": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-each": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-          "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "chalk": "^4.0.0",
-            "jest-get-type": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+        "ansi-styles": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
+          "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
           "dev": true
         },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
         },
-        "jest-mock": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*"
-          }
+        "is-fullwidth-code-point": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+          "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+          "dev": true
         },
-        "jest-runtime": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-          "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+        "slice-ansi": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+          "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^27.5.1",
-            "@jest/fake-timers": "^27.5.1",
-            "@jest/globals": "^27.5.1",
-            "@jest/source-map": "^27.5.1",
-            "@jest/test-result": "^27.5.1",
-            "@jest/transform": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "chalk": "^4.0.0",
-            "cjs-module-lexer": "^1.0.0",
-            "collect-v8-coverage": "^1.0.0",
-            "execa": "^5.0.0",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^27.5.1",
-            "jest-message-util": "^27.5.1",
-            "jest-mock": "^27.5.1",
-            "jest-regex-util": "^27.5.1",
-            "jest-resolve": "^27.5.1",
-            "jest-snapshot": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0",
-            "strip-bom": "^4.0.0"
+            "ansi-styles": "^6.0.0",
+            "is-fullwidth-code-point": "^4.0.0"
           }
         },
-        "jest-snapshot": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-          "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+        "string-width": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.0.1.tgz",
+          "integrity": "sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==",
           "dev": true,
           "requires": {
-            "@babel/core": "^7.7.2",
-            "@babel/generator": "^7.7.2",
-            "@babel/plugin-syntax-typescript": "^7.7.2",
-            "@babel/traverse": "^7.7.2",
-            "@babel/types": "^7.0.0",
-            "@jest/transform": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/babel__traverse": "^7.0.4",
-            "@types/prettier": "^2.1.5",
-            "babel-preset-current-node-syntax": "^1.0.0",
-            "chalk": "^4.0.0",
-            "expect": "^27.5.1",
-            "graceful-fs": "^4.2.9",
-            "jest-diff": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "jest-haste-map": "^27.5.1",
-            "jest-matcher-utils": "^27.5.1",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "natural-compare": "^1.4.0",
-            "pretty-format": "^27.5.1",
-            "semver": "^7.3.2"
+            "emoji-regex": "^9.2.2",
+            "is-fullwidth-code-point": "^4.0.0",
+            "strip-ansi": "^7.0.1"
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+        "strip-ansi": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
+            "ansi-regex": "^6.0.1"
           }
-        },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+        }
+      }
+    },
+    "cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "dev": true
+    },
+    "cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
+    },
+    "collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true
+    },
+    "compare-versions": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-4.1.3.tgz",
+      "integrity": "sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concurrently": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.5.1.tgz",
+      "integrity": "sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "date-fns": "^2.16.1",
+        "lodash": "^4.17.21",
+        "rxjs": "^6.6.3",
+        "spawn-command": "^0.0.2-1",
+        "supports-color": "^8.1.0",
+        "tree-kill": "^1.2.2",
+        "yargs": "^16.2.0"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "dev": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "tslib": "^1.9.0"
           }
         },
-        "strip-bom": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-          "dev": true
-        },
-        "write-file-atomic": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-          "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
           "dev": true,
           "requires": {
-            "imurmurhash": "^0.1.4",
-            "is-typedarray": "^1.0.0",
-            "signal-exit": "^3.0.2",
-            "typedarray-to-buffer": "^3.1.5"
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "jest-leak-detector": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.0.tgz",
-      "integrity": "sha512-uIJDQbxwEL2AMMs2xjhZl2hw8s77c3wrPaQ9v6tXJLGaaQ+4QrNJH5vuw7hA7w/uGT/iJ42a83opAqxGHeyRIA==",
+    "confusing-browser-globals": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
+      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
+      "dev": true
+    },
+    "consola": {
+      "version": "2.15.3",
+      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
+      "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
+      "dev": true
+    },
+    "console.table": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/console.table/-/console.table-0.10.0.tgz",
+      "integrity": "sha1-CRcCVYiHW+/XDPLv9L7yxuLXXQQ=",
       "dev": true,
-      "peer": true,
       "requires": {
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.0"
+        "easy-table": "1.1.0"
+      }
+    },
+    "convert-source-map": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "requires": {
+        "safe-buffer": "~5.1.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
-        },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
+        "safe-buffer": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         }
       }
     },
-    "jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+    "core-js": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
+      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA=="
+    },
+    "core-js-compat": {
+      "version": "3.22.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.5.tgz",
+      "integrity": "sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==",
       "dev": true,
       "requires": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
+        "browserslist": "^4.20.3",
+        "semver": "7.0.0"
       },
       "dependencies": {
-        "diff-sequences": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
           "dev": true
-        },
-        "jest-diff": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-          "dev": true,
+        }
+      }
+    },
+    "core-js-pure": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
+      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "dev": true,
+      "requires": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      }
+    },
+    "create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "devOptional": true
+    },
+    "cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "requires": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      }
+    },
+    "css": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
+      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.4",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.6.0"
+      }
+    },
+    "css-color-keywords": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
+    },
+    "css-to-react-native": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz",
+      "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==",
+      "requires": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "css.escape": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
+      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
+      "dev": true
+    },
+    "cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+    },
+    "cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "requires": {
+        "cssom": "~0.3.6"
+      },
+      "dependencies": {
+        "cssom": {
+          "version": "0.3.8",
+          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+        }
+      }
+    },
+    "csstype": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
+      "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
+    },
+    "damerau-levenshtein": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
+      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
+      "dev": true
+    },
+    "data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "requires": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "dependencies": {
+        "tr46": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+          "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
           "requires": {
-            "chalk": "^4.0.0",
-            "diff-sequences": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
+            "punycode": "^2.1.1"
           }
         },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-          "dev": true
+        "webidl-conversions": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+          "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
+        },
+        "whatwg-url": {
+          "version": "8.7.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+          "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+          "requires": {
+            "lodash": "^4.7.0",
+            "tr46": "^2.1.0",
+            "webidl-conversions": "^6.1.0"
+          }
         }
       }
     },
-    "jest-message-util": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.0.tgz",
-      "integrity": "sha512-RpA8mpaJ/B2HphDMiDlrAZdDytkmwFqgjDZovM21F35lHGeUeCvYmm6W+sbQ0ydaLpg5bFAUuWG1cjqOl8vqrw==",
+    "date-fns": {
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
+      "integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==",
+      "dev": true
+    },
+    "dayjs": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz",
+      "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw=="
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decimal.js": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+    },
+    "defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "dev": true,
+      "requires": {
+        "clone": "^1.0.2"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+    },
+    "detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
+    },
+    "detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+    },
+    "diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "devOptional": true
+    },
+    "diff-match-patch": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
+      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
+    },
+    "diff-sequences": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
+      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
+    },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.0",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "esutils": "^2.0.2"
+      }
+    },
+    "dom-accessibility-api": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz",
+      "integrity": "sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==",
+      "dev": true
+    },
+    "domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "requires": {
+        "webidl-conversions": "^5.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true
+        "webidl-conversions": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="
         }
       }
     },
-    "jest-mock": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.0.tgz",
-      "integrity": "sha512-H7BrhggNn77WhdL7O1apG0Q/iwl0Bdd5E1ydhCJzL3oBLh/UYxAwR3EJLsBZ9XA3ZU4PA3UNw4tQjduBTCTmLw==",
+    "dotenv": {
+      "version": "16.0.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",
+      "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==",
+      "dev": true
+    },
+    "easy-table": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz",
+      "integrity": "sha1-hvmrTBAvA3G3KXuSplHVgkvIy3M=",
       "dev": true,
-      "peer": true,
       "requires": {
-        "@jest/types": "^28.1.0",
-        "@types/node": "*"
+        "wcwidth": ">=1.0.1"
       }
     },
-    "jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true,
-      "requires": {}
+    "electron-to-chromium": {
+      "version": "1.4.151",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.151.tgz",
+      "integrity": "sha512-XaG2LpZi9fdiWYOqJh0dJy4SlVywCvpgYXhzOlZTp4JqSKqxn5URqOjbm9OMYB3aInA2GuHQiem1QUOc1yT0Pw=="
     },
-    "jest-regex-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
-      "dev": true
+    "emittery": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
+      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw=="
     },
-    "jest-resolve": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
-      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "dev": true,
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        }
+        "ansi-colors": "^4.1.1"
       }
     },
-    "jest-resolve-dependencies": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.0.tgz",
-      "integrity": "sha512-Ue1VYoSZquPwEvng7Uefw8RmZR+me/1kr30H2jMINjGeHgeO/JgrR6wxj2ofkJ7KSAA11W3cOrhNCbj5Dqqd9g==",
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "jest-regex-util": "^28.0.2",
-        "jest-snapshot": "^28.1.0"
-      },
-      "dependencies": {
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-          "dev": true,
-          "peer": true
-        }
+        "has": "^1.0.3"
       }
     },
-    "jest-runner": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.0.tgz",
-      "integrity": "sha512-FBpmuh1HB2dsLklAlRdOxNTTHKFR6G1Qmd80pVDvwbZXTriqjWqjei5DKFC1UlM732KjYcE6yuCdiF0WUCOS2w==",
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "@jest/console": "^28.1.0",
-        "@jest/environment": "^28.1.0",
-        "@jest/test-result": "^28.1.0",
-        "@jest/transform": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^28.0.2",
-        "jest-environment-node": "^28.1.0",
-        "jest-haste-map": "^28.1.0",
-        "jest-leak-detector": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-resolve": "^28.1.0",
-        "jest-runtime": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "jest-watcher": "^28.1.0",
-        "jest-worker": "^28.1.0",
-        "source-map-support": "0.5.13",
-        "throat": "^6.0.1"
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "esbuild": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.43.tgz",
+      "integrity": "sha512-Uf94+kQmy/5jsFwKWiQB4hfo/RkM9Dh7b79p8yqd1tshULdr25G2szLz631NoH3s2ujnKEKVD16RmOxvCNKRFA==",
+      "requires": {
+        "esbuild-android-64": "0.14.43",
+        "esbuild-android-arm64": "0.14.43",
+        "esbuild-darwin-64": "0.14.43",
+        "esbuild-darwin-arm64": "0.14.43",
+        "esbuild-freebsd-64": "0.14.43",
+        "esbuild-freebsd-arm64": "0.14.43",
+        "esbuild-linux-32": "0.14.43",
+        "esbuild-linux-64": "0.14.43",
+        "esbuild-linux-arm": "0.14.43",
+        "esbuild-linux-arm64": "0.14.43",
+        "esbuild-linux-mips64le": "0.14.43",
+        "esbuild-linux-ppc64le": "0.14.43",
+        "esbuild-linux-riscv64": "0.14.43",
+        "esbuild-linux-s390x": "0.14.43",
+        "esbuild-netbsd-64": "0.14.43",
+        "esbuild-openbsd-64": "0.14.43",
+        "esbuild-sunos-64": "0.14.43",
+        "esbuild-windows-32": "0.14.43",
+        "esbuild-windows-64": "0.14.43",
+        "esbuild-windows-arm64": "0.14.43"
+      }
+    },
+    "esbuild-android-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.43.tgz",
+      "integrity": "sha512-kqFXAS72K6cNrB6RiM7YJ5lNvmWRDSlpi7ZuRZ1hu1S3w0zlwcoCxWAyM23LQUyZSs1PbjHgdbbfYAN8IGh6xg==",
+      "optional": true
+    },
+    "esbuild-android-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.43.tgz",
+      "integrity": "sha512-bKS2BBFh+7XZY9rpjiHGRNA7LvWYbZWP87pLehggTG7tTaCDvj8qQGOU/OZSjCSKDYbgY7Q+oDw8RlYQ2Jt2BA==",
+      "optional": true
+    },
+    "esbuild-darwin-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.43.tgz",
+      "integrity": "sha512-/3PSilx011ttoieRGkSZ0XV8zjBf2C9enV4ScMMbCT4dpx0mFhMOpFnCHkOK0pWGB8LklykFyHrWk2z6DENVUg==",
+      "optional": true
+    },
+    "esbuild-darwin-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.43.tgz",
+      "integrity": "sha512-1HyFUKs8DMCBOvw1Qxpr5Vv/ThNcVIFb5xgXWK3pyT40WPvgYIiRTwJCvNs4l8i5qWF8/CK5bQxJVDjQvtv0Yw==",
+      "optional": true
+    },
+    "esbuild-freebsd-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.43.tgz",
+      "integrity": "sha512-FNWc05TPHYgaXjbPZO5/rJKSBslfG6BeMSs8GhwnqAKP56eEhvmzwnIz1QcC9cRVyO+IKqWNfmHFkCa1WJTULA==",
+      "optional": true
+    },
+    "esbuild-freebsd-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.43.tgz",
+      "integrity": "sha512-amrYopclz3VohqisOPR6hA3GOWA3LZC1WDLnp21RhNmoERmJ/vLnOpnrG2P/Zao+/erKTCUqmrCIPVtj58DRoA==",
+      "optional": true
+    },
+    "esbuild-linux-32": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.43.tgz",
+      "integrity": "sha512-KoxoEra+9O3AKVvgDFvDkiuddCds6q71owSQEYwjtqRV7RwbPzKxJa6+uyzUulHcyGVq0g15K0oKG5CFBcvYDw==",
+      "optional": true
+    },
+    "esbuild-linux-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.43.tgz",
+      "integrity": "sha512-EwINwGMyiJMgBby5/SbMqKcUhS5AYAZ2CpEBzSowsJPNBJEdhkCTtEjk757TN/wxgbu3QklqDM6KghY660QCUw==",
+      "optional": true
+    },
+    "esbuild-linux-arm": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.43.tgz",
+      "integrity": "sha512-e6YzQUoDxxtyamuF12eVzzRC7bbEFSZohJ6igQB9tBqnNmIQY3fI6Cns3z2wxtbZ3f2o6idkD2fQnlvs2902Dg==",
+      "optional": true
+    },
+    "esbuild-linux-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.43.tgz",
+      "integrity": "sha512-UlSpjMWllAc70zYbHxWuDS3FJytyuR/gHJYBr8BICcTNb/TSOYVBg6U7b3jZ3mILTrgzwJUHwhEwK18FZDouUQ==",
+      "optional": true
+    },
+    "esbuild-linux-mips64le": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.43.tgz",
+      "integrity": "sha512-f+v8cInPEL1/SDP//CfSYzcDNgE4CY3xgDV81DWm3KAPWzhvxARrKxB1Pstf5mB56yAslJDxu7ryBUPX207EZA==",
+      "optional": true
+    },
+    "esbuild-linux-ppc64le": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.43.tgz",
+      "integrity": "sha512-5wZYMDGAL/K2pqkdIsW+I4IR41kyfHr/QshJcNpUfK3RjB3VQcPWOaZmc+74rm4ZjVirYrtz+jWw0SgxtxRanA==",
+      "optional": true
+    },
+    "esbuild-linux-riscv64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.43.tgz",
+      "integrity": "sha512-lYcAOUxp85hC7lSjycJUVSmj4/9oEfSyXjb/ua9bNl8afonaduuqtw7hvKMoKuYnVwOCDw4RSfKpcnIRDWq+Bw==",
+      "optional": true
+    },
+    "esbuild-linux-s390x": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.43.tgz",
+      "integrity": "sha512-27e43ZhHvhFE4nM7HqtUbMRu37I/4eNSUbb8FGZWszV+uLzMIsHDwLoBiJmw7G9N+hrehNPeQ4F5Ujad0DrUKQ==",
+      "optional": true
+    },
+    "esbuild-netbsd-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.43.tgz",
+      "integrity": "sha512-2mH4QF6hHBn5zzAfxEI/2eBC0mspVsZ6UVo821LpAJKMvLJPBk3XJO5xwg7paDqSqpl7p6IRrAenW999AEfJhQ==",
+      "optional": true
+    },
+    "esbuild-openbsd-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.43.tgz",
+      "integrity": "sha512-ZhQpiZjvqCqO8jKdGp9+8k9E/EHSA+zIWOg+grwZasI9RoblqJ1QiZqqi7jfd6ZrrG1UFBNGe4m0NFxCFbMVbg==",
+      "optional": true
+    },
+    "esbuild-sunos-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.43.tgz",
+      "integrity": "sha512-DgxSi9DaHReL9gYuul2rrQCAapgnCJkh3LSHPKsY26zytYppG0HgkgVF80zjIlvEsUbGBP/GHQzBtrezj/Zq1Q==",
+      "optional": true
+    },
+    "esbuild-windows-32": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.43.tgz",
+      "integrity": "sha512-Ih3+2O5oExiqm0mY6YYE5dR0o8+AspccQ3vIAtRodwFvhuyGLjb0Hbmzun/F3Lw19nuhPMu3sW2fqIJ5xBxByw==",
+      "optional": true
+    },
+    "esbuild-windows-64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.43.tgz",
+      "integrity": "sha512-8NsuNfI8xwFuJbrCuI+aBqNTYkrWErejFO5aYM+yHqyHuL8mmepLS9EPzAzk8rvfaJrhN0+RvKWAcymViHOKEw==",
+      "optional": true
+    },
+    "esbuild-windows-arm64": {
+      "version": "0.14.43",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.43.tgz",
+      "integrity": "sha512-7ZlD7bo++kVRblJEoG+cepljkfP8bfuTPz5fIXzptwnPaFwGS6ahvfoYzY7WCf5v/1nX2X02HDraVItTgbHnKw==",
+      "optional": true
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-haste-map": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-          "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/types": "^28.1.0",
-            "@types/graceful-fs": "^4.1.3",
-            "@types/node": "*",
-            "anymatch": "^3.0.3",
-            "fb-watchman": "^2.0.0",
-            "fsevents": "^2.3.2",
-            "graceful-fs": "^4.2.9",
-            "jest-regex-util": "^28.0.2",
-            "jest-util": "^28.1.0",
-            "jest-worker": "^28.1.0",
-            "micromatch": "^4.0.4",
-            "walker": "^1.0.7"
-          }
-        },
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-resolve": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.0.tgz",
-          "integrity": "sha512-vvfN7+tPNnnhDvISuzD1P+CRVP8cK0FHXRwPAcdDaQv4zgvwvag2n55/h5VjYcM5UJG7L4TwE5tZlzcI0X2Lhw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^28.1.0",
-            "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^28.1.0",
-            "jest-validate": "^28.1.0",
-            "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
-            "slash": "^3.0.0"
-          }
-        },
-        "jest-validate": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-          "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/types": "^28.1.0",
-            "camelcase": "^6.2.0",
-            "chalk": "^4.0.0",
-            "jest-get-type": "^28.0.2",
-            "leven": "^3.1.0",
-            "pretty-format": "^28.1.0"
-          }
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         },
-        "jest-worker": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-          "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-          "dev": true,
-          "peer": true,
+        "levn": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+          "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
           "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2"
           }
         },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-          "dev": true,
-          "peer": true,
+        "optionator": {
+          "version": "0.8.3",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
           "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
+            "deep-is": "~0.1.3",
+            "fast-levenshtein": "~2.0.6",
+            "levn": "~0.3.0",
+            "prelude-ls": "~1.1.2",
+            "type-check": "~0.3.2",
+            "word-wrap": "~1.2.3"
           }
         },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
-        },
-        "source-map-support": {
-          "version": "0.5.13",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-          "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-          }
+        "prelude-ls": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
         },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "peer": true,
+        "type-check": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
           "requires": {
-            "has-flag": "^4.0.0"
+            "prelude-ls": "~1.1.2"
           }
         }
       }
     },
-    "jest-runtime": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.0.tgz",
-      "integrity": "sha512-wNYDiwhdH/TV3agaIyVF0lsJ33MhyujOe+lNTUiolqKt8pchy1Hq4+tDMGbtD5P/oNLA3zYrpx73T9dMTOCAcg==",
+    "eslint": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
+      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
       "dev": true,
-      "peer": true,
       "requires": {
-        "@jest/environment": "^28.1.0",
-        "@jest/fake-timers": "^28.1.0",
-        "@jest/globals": "^28.1.0",
-        "@jest/source-map": "^28.0.2",
-        "@jest/test-result": "^28.1.0",
-        "@jest/transform": "^28.1.0",
-        "@jest/types": "^28.1.0",
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.9.2",
+        "ajv": "^6.10.0",
         "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-mock": "^28.1.0",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.0",
-        "jest-snapshot": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.2",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-haste-map": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-          "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/types": "^28.1.0",
-            "@types/graceful-fs": "^4.1.3",
-            "@types/node": "*",
-            "anymatch": "^3.0.3",
-            "fb-watchman": "^2.0.0",
-            "fsevents": "^2.3.2",
-            "graceful-fs": "^4.2.9",
-            "jest-regex-util": "^28.0.2",
-            "jest-util": "^28.1.0",
-            "jest-worker": "^28.1.0",
-            "micromatch": "^4.0.4",
-            "walker": "^1.0.7"
-          }
-        },
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-resolve": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.0.tgz",
-          "integrity": "sha512-vvfN7+tPNnnhDvISuzD1P+CRVP8cK0FHXRwPAcdDaQv4zgvwvag2n55/h5VjYcM5UJG7L4TwE5tZlzcI0X2Lhw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^28.1.0",
-            "jest-pnp-resolver": "^1.2.2",
-            "jest-util": "^28.1.0",
-            "jest-validate": "^28.1.0",
-            "resolve": "^1.20.0",
-            "resolve.exports": "^1.1.0",
-            "slash": "^3.0.0"
-          }
-        },
-        "jest-validate": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.0.tgz",
-          "integrity": "sha512-Lly7CJYih3vQBfjLeANGgBSBJ7pEa18cxpQfQEq2go2xyEzehnHfQTjoUia8xUv4x4J80XKFIDwJJThXtRFQXQ==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@jest/types": "^28.1.0",
-            "camelcase": "^6.2.0",
-            "chalk": "^4.0.0",
-            "jest-get-type": "^28.0.2",
-            "leven": "^3.1.0",
-            "pretty-format": "^28.1.0"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "jest-worker": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-          "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
-          }
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
         },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
+            "ms": "2.1.2"
           }
         },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
-        },
-        "strip-bom": {
+        "escape-string-regexp": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-          "dev": true,
-          "peer": true
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-serializer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "graceful-fs": "^4.2.9"
-      }
-    },
-    "jest-snapshot": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.0.tgz",
-      "integrity": "sha512-ex49M2ZrZsUyQLpLGxQtDbahvgBjlLPgklkqGM0hq/F7W/f8DyqZxVHjdy19QKBm4O93eDp+H5S23EiTbbUmHw==",
-      "dev": true,
-      "peer": true,
-      "requires": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^28.1.0",
-        "@jest/transform": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/babel__traverse": "^7.0.6",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^28.1.0",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^28.1.0",
-        "jest-get-type": "^28.0.2",
-        "jest-haste-map": "^28.1.0",
-        "jest-matcher-utils": "^28.1.0",
-        "jest-message-util": "^28.1.0",
-        "jest-util": "^28.1.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^28.1.0",
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true,
-          "peer": true
-        },
-        "jest-haste-map": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.0.tgz",
-          "integrity": "sha512-xyZ9sXV8PtKi6NCrJlmq53PyNVHzxmcfXNVvIRHpHmh1j/HChC4pwKgyjj7Z9us19JMw8PpQTJsFWOsIfT93Dw==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "@jest/types": "^28.1.0",
-            "@types/graceful-fs": "^4.1.3",
-            "@types/node": "*",
-            "anymatch": "^3.0.3",
-            "fb-watchman": "^2.0.0",
-            "fsevents": "^2.3.2",
-            "graceful-fs": "^4.2.9",
-            "jest-regex-util": "^28.0.2",
-            "jest-util": "^28.1.0",
-            "jest-worker": "^28.1.0",
-            "micromatch": "^4.0.4",
-            "walker": "^1.0.7"
-          }
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
         },
-        "jest-matcher-utils": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.0.tgz",
-          "integrity": "sha512-onnax0n2uTLRQFKAjC7TuaxibrPSvZgKTcSCnNUz/tOjJ9UhxNm7ZmPpoQavmTDUjXvUQ8KesWk2/VdrxIFzTQ==",
+        "eslint-scope": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "chalk": "^4.0.0",
-            "jest-diff": "^28.1.0",
-            "jest-get-type": "^28.0.2",
-            "pretty-format": "^28.1.0"
+            "esrecurse": "^4.3.0",
+            "estraverse": "^5.2.0"
           }
         },
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-          "dev": true,
-          "peer": true
+        "eslint-visitor-keys": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+          "dev": true
         },
-        "jest-worker": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.0.tgz",
-          "integrity": "sha512-ZHwM6mNwaWBR52Snff8ZvsCTqQsvhCxP/bT1I6T6DAnb6ygkshsyLQIMxFwHpYxht0HOoqt23JlC01viI7T03A==",
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        },
+        "glob-parent": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
+            "is-glob": "^4.0.3"
           }
         },
-        "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
+            "argparse": "^2.0.1"
           }
         },
-        "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg==",
-          "dev": true,
-          "peer": true
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
         },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
           "dev": true,
-          "peer": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "brace-expansion": "^1.1.7"
           }
         },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "peer": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
-    "jest-sonar-reporter": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jest-sonar-reporter/-/jest-sonar-reporter-2.0.0.tgz",
-      "integrity": "sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==",
-      "dev": true,
-      "requires": {
-        "xml": "^1.0.1"
-      }
-    },
-    "jest-styled-components": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/jest-styled-components/-/jest-styled-components-7.0.8.tgz",
-      "integrity": "sha512-0KE54d0yIzKcvtOv8eikyjG3rFRtKYUyQovaoha3nondtZzXYGB3bhsvYgEegU08Iry0ndWx2+g9f5ZzD4I+0Q==",
-      "dev": true,
-      "requires": {
-        "css": "^3.0.0"
-      }
-    },
-    "jest-util": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.0.tgz",
-      "integrity": "sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      }
-    },
-    "jest-validate": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
-      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+    "eslint-config-airbnb": {
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
+      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
       "dev": true,
       "requires": {
-        "@jest/types": "^27.5.1",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "leven": "^3.1.0",
-        "pretty-format": "^27.5.1"
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+        "es-abstract": {
+          "version": "1.19.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.1",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.1",
+            "object-inspect": "^1.11.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.1"
           }
         },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
           "dev": true,
           "requires": {
-            "@types/yargs-parser": "*"
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-          "dev": true
-        }
-      }
-    },
-    "jest-watch-typeahead": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
-      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.3.1",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^28.0.0",
-        "jest-watcher": "^28.0.0",
-        "slash": "^4.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "dependencies": {
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-          "dev": true
-        },
-        "slash": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-          "dev": true
-        },
-        "string-length": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-          "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
           "dev": true,
           "requires": {
-            "char-regex": "^2.0.0",
-            "strip-ansi": "^7.0.1"
-          },
-          "dependencies": {
-            "char-regex": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
-              "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
-              "dev": true
-            }
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+          "dev": true
+        },
+        "object.entries": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+          "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^6.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "6.0.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-              "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-              "dev": true
-            }
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.19.1"
           }
         }
       }
     },
-    "jest-watcher": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.0.tgz",
-      "integrity": "sha512-tNHMtfLE8Njcr2IRS+5rXYA4BhU90gAOwI9frTGOqd+jX0P/Au/JfRSNqsf5nUTcWdbVYuLxS1KjnzILSoR5hA==",
-      "dev": true,
-      "requires": {
-        "@jest/test-result": "^28.1.0",
-        "@jest/types": "^28.1.0",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "jest-util": "^28.1.0",
-        "string-length": "^4.0.1"
-      }
-    },
-    "jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+    "eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
+      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
       "dev": true,
       "requires": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+        "es-abstract": {
+          "version": "1.19.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.1",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.1",
+            "object-inspect": "^1.11.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.1"
           }
-        }
-      }
-    },
-    "js-sha3": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
-        "xml-name-validator": "^3.0.0"
-      },
-      "dependencies": {
-        "tr46": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-          "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+        },
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
           "dev": true,
           "requires": {
-            "punycode": "^2.1.1"
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "webidl-conversions": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-          "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+          "dev": true,
+          "requires": {
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
           "dev": true
         },
-        "whatwg-url": {
-          "version": "8.7.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-          "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+        "object.entries": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+          "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
           "dev": true,
           "requires": {
-            "lodash": "^4.7.0",
-            "tr46": "^2.1.0",
-            "webidl-conversions": "^6.1.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.19.1"
           }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         }
       }
     },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
-    },
-    "json-schema-faker": {
-      "version": "0.5.0-rcv.40",
-      "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.5.0-rcv.40.tgz",
-      "integrity": "sha512-BczZvu03jKrGh3ovCWrHusiX6MwiaKK2WZeyomKBNA8Nm/n7aBYz0mub1CnONB6cgxOZTNxx4afNmLblbUmZbA==",
-      "requires": {
-        "json-schema-ref-parser": "^6.1.0",
-        "jsonpath-plus": "^5.1.0"
-      }
-    },
-    "json-schema-ref-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz",
-      "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==",
-      "requires": {
-        "call-me-maybe": "^1.0.1",
-        "js-yaml": "^3.12.1",
-        "ono": "^4.0.11"
-      }
-    },
-    "json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
-    },
-    "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "jsonpath-plus": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-5.1.0.tgz",
-      "integrity": "sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ=="
-    },
-    "jsonpointer": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz",
-      "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==",
-      "dev": true
-    },
-    "jsx-ast-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
-      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
+    "eslint-config-airbnb-typescript": {
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz",
+      "integrity": "sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==",
       "dev": true,
       "requires": {
-        "array-includes": "^3.1.4",
-        "object.assign": "^4.1.2"
+        "eslint-config-airbnb-base": "^15.0.0"
       }
     },
-    "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
-    },
-    "kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true
-    },
-    "klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-      "dev": true
-    },
-    "language-subtag-registry": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-      "dev": true
+    "eslint-config-prettier": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
+      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
+      "dev": true,
+      "requires": {}
     },
-    "language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
+    "eslint-config-react-app": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
+      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
       "dev": true,
       "requires": {
-        "language-subtag-registry": "~0.3.2"
+        "@babel/core": "^7.16.0",
+        "@babel/eslint-parser": "^7.16.3",
+        "@rushstack/eslint-patch": "^1.1.0",
+        "@typescript-eslint/eslint-plugin": "^5.5.0",
+        "@typescript-eslint/parser": "^5.5.0",
+        "babel-preset-react-app": "^10.0.1",
+        "confusing-browser-globals": "^1.0.11",
+        "eslint-plugin-flowtype": "^8.0.3",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jest": "^25.3.0",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.27.1",
+        "eslint-plugin-react-hooks": "^4.3.0",
+        "eslint-plugin-testing-library": "^5.0.1"
       }
     },
-    "leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+    "eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
       "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        }
       }
     },
-    "lilconfig": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
-      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==",
-      "dev": true
-    },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "lint-staged": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.1.2.tgz",
-      "integrity": "sha512-bSMcQVqMW98HLLLR2c2tZ+vnDCnx4fd+0QJBQgN/4XkdspGRPc8DGp7UuOEBe1ApCfJ+wXXumYnJmU+wDo7j9A==",
+    "eslint-import-resolver-typescript": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz",
+      "integrity": "sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==",
       "dev": true,
       "requires": {
-        "cli-truncate": "^3.1.0",
-        "colorette": "^2.0.16",
-        "commander": "^8.3.0",
-        "debug": "^4.3.2",
-        "enquirer": "^2.3.6",
-        "execa": "^5.1.1",
-        "lilconfig": "2.0.4",
-        "listr2": "^3.13.3",
-        "micromatch": "^4.0.4",
-        "normalize-path": "^3.0.0",
-        "object-inspect": "^1.11.0",
-        "string-argv": "^0.3.1",
-        "supports-color": "^9.0.2",
-        "yaml": "^1.10.2"
+        "debug": "^4.3.4",
+        "glob": "^7.2.0",
+        "is-glob": "^4.0.3",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
       },
       "dependencies": {
-        "colorette": {
-          "version": "2.0.16",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-          "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-          "dev": true
-        },
         "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
         },
+        "glob": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "object-inspect": {
-          "version": "1.11.1",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-          "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
-          "dev": true
+        "tsconfig-paths": {
+          "version": "3.14.1",
+          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+          "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+          "dev": true,
+          "requires": {
+            "@types/json5": "^0.0.29",
+            "json5": "^1.0.1",
+            "minimist": "^1.2.6",
+            "strip-bom": "^3.0.0"
+          }
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
         },
-        "supports-color": {
-          "version": "9.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.1.tgz",
-          "integrity": "sha512-Obv7ycoCTG51N7y175StI9BlAXrmgZrFhZOb0/PyjHBher/NmsdBgbbQ1Inhq+gIhz6+7Gb+jWF2Vqi7Mf1xnQ==",
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         }
       }
     },
-    "listr2": {
-      "version": "3.13.5",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.5.tgz",
-      "integrity": "sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA==",
+    "eslint-plugin-flowtype": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
+      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
       "dev": true,
       "requires": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.4.0",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
+        "lodash": "^4.17.21",
+        "string-natural-compare": "^3.0.1"
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
       },
       "dependencies": {
-        "cli-truncate": {
+        "doctrine": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-          "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
           "dev": true,
           "requires": {
-            "slice-ansi": "^3.0.0",
-            "string-width": "^4.2.0"
+            "esutils": "^2.0.2"
           }
         },
-        "colorette": {
-          "version": "2.0.16",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-          "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-          "dev": true
-        },
-        "slice-ansi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-          "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
+            "brace-expansion": "^1.1.7"
           }
         }
       }
     },
-    "loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true
+    "eslint-plugin-jest": {
+      "version": "25.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
+      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/experimental-utils": "^5.0.0"
+      }
     },
-    "loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+    "eslint-plugin-jest-dom": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-4.0.2.tgz",
+      "integrity": "sha512-Jo51Atwyo2TdcUncjmU+UQeSTKh3sc2LF/M5i/R3nTU0Djw9V65KGJisdm/RtuKhy2KH/r7eQ1n6kwYFPNdHlA==",
       "dev": true,
       "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
+        "@babel/runtime": "^7.16.3",
+        "@testing-library/dom": "^8.11.1",
+        "requireindex": "^1.2.0"
       },
       "dependencies": {
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-          "dev": true
+        "@babel/runtime": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+          "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
         }
       }
     },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+    "eslint-plugin-jsx-a11y": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
+      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
+      "dev": true,
       "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
+        "@babel/runtime": "^7.16.3",
+        "aria-query": "^4.2.2",
+        "array-includes": "^3.1.4",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.3.5",
+        "axobject-query": "^2.2.0",
+        "damerau-levenshtein": "^1.0.7",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.2.1",
+        "language-tags": "^1.0.5",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+          "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+          "dev": true,
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "array-includes": {
+          "version": "3.1.4",
+          "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
+          "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.19.1",
+            "get-intrinsic": "^1.1.1",
+            "is-string": "^1.0.7"
+          }
+        },
+        "emoji-regex": {
+          "version": "9.2.2",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+          "dev": true
+        },
+        "es-abstract": {
+          "version": "1.19.1",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.2",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.1",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.1",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.1",
+            "object-inspect": "^1.11.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "string.prototype.trimend": "^1.0.4",
+            "string.prototype.trimstart": "^1.0.4",
+            "unbox-primitive": "^1.0.1"
+          }
+        },
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+          "dev": true,
+          "requires": {
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+          "dev": true,
+          "requires": {
+            "has-tostringtag": "^1.0.0"
+          }
+        },
+        "jsx-ast-utils": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz",
+          "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
+          "dev": true,
+          "requires": {
+            "array-includes": "^3.1.3",
+            "object.assign": "^4.1.2"
+          }
+        },
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+          "dev": true
+        }
       }
     },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+    "eslint-plugin-prettier": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
+      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
       "dev": true,
       "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "prettier-linter-helpers": "^1.0.0"
       }
     },
-    "log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+    "eslint-plugin-react": {
+      "version": "7.29.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz",
+      "integrity": "sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
+        "array-includes": "^3.1.4",
+        "array.prototype.flatmap": "^1.2.5",
+        "doctrine": "^2.1.0",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.5",
+        "object.fromentries": "^2.0.5",
+        "object.hasown": "^1.1.0",
+        "object.values": "^1.1.5",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.3",
+        "semver": "^6.3.0",
+        "string.prototype.matchall": "^4.0.6"
       },
       "dependencies": {
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        },
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "prop-types": {
+          "version": "15.8.1",
+          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+          "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.4.0",
+            "object-assign": "^4.1.1",
+            "react-is": "^16.13.1"
+          }
+        },
+        "resolve": {
+          "version": "2.0.0-next.3",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
+          "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
+            "is-core-module": "^2.2.0",
+            "path-parse": "^1.0.6"
           }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         }
       }
     },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
+    "eslint-plugin-react-hooks": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
+      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
+      "dev": true,
+      "requires": {}
     },
-    "lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+    "eslint-plugin-testing-library": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.5.0.tgz",
+      "integrity": "sha512-eWQ19l6uWL7LW8oeMyQVSGjVYFnBqk7DMHjadm0yOHBvX3Xi9OBrsNuxoAMdX4r7wlQ5WWpW46d+CB6FWFL/PQ==",
       "dev": true,
       "requires": {
-        "tslib": "^2.0.3"
+        "@typescript-eslint/utils": "^5.13.0"
       },
       "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+        "@typescript-eslint/scope-manager": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
+          "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.23.0",
+            "@typescript-eslint/visitor-keys": "5.23.0"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
+          "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
+          "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.23.0",
+            "@typescript-eslint/visitor-keys": "5.23.0",
+            "debug": "^4.3.2",
+            "globby": "^11.0.4",
+            "is-glob": "^4.0.3",
+            "semver": "^7.3.5",
+            "tsutils": "^3.21.0"
+          }
+        },
+        "@typescript-eslint/utils": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
+          "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.9",
+            "@typescript-eslint/scope-manager": "5.23.0",
+            "@typescript-eslint/types": "5.23.0",
+            "@typescript-eslint/typescript-estree": "5.23.0",
+            "eslint-scope": "^5.1.1",
+            "eslint-utils": "^3.0.0"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "5.23.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
+          "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "5.23.0",
+            "eslint-visitor-keys": "^3.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
     },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "requires": {
-        "yallist": "^4.0.0"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
       }
     },
-    "lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY="
-    },
-    "magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "dev": true,
       "requires": {
-        "sourcemap-codec": "^1.4.8"
+        "eslint-visitor-keys": "^2.0.0"
       }
     },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+    "eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
+      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
       "dev": true,
       "requires": {
-        "semver": "^6.0.0"
+        "acorn": "^8.7.1",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+        "eslint-visitor-keys": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
           "dev": true
         }
       }
     },
-    "make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
-    },
-    "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-      "dev": true,
-      "requires": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "match-sorter": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
-      "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "remove-accents": "0.4.2"
-      }
-    },
-    "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-      "dev": true
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
-    "memfs": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz",
-      "integrity": "sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==",
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
       "dev": true,
       "requires": {
-        "fs-monkey": "1.0.3"
+        "estraverse": "^5.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        }
       }
     },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
       "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
       }
     },
-    "microseconds": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
-      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true
     },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
+    "execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "requires": {
-        "mime-db": "1.52.0"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       }
     },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
-    },
-    "min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
     },
-    "mini-css-extract-plugin": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz",
-      "integrity": "sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w==",
-      "dev": true,
+    "expect": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
+      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
       "requires": {
-        "schema-utils": "^4.0.0"
+        "@jest/types": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1"
       },
       "dependencies": {
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
           "requires": {
-            "fast-deep-equal": "^3.1.3"
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
           }
         },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "dev": true,
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
           "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
           }
         }
       }
     },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
-    "mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.6"
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
       }
     },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "multicast-dns": {
-      "version": "7.2.4",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.4.tgz",
-      "integrity": "sha512-XkCYOU+rr2Ft3LI6w4ye51M3VK31qJXFIxu0XLw169PtKG0Zx47OrXeVW/GCYOfpC9s1yyyf1S+L8/4LY0J9Zw==",
-      "dev": true,
-      "requires": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
-      }
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+    "fast-diff": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
       "dev": true
     },
-    "nano-time": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
-      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
+    "fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "dev": true,
       "requires": {
-        "big-integer": "^1.6.16"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
       }
     },
-    "nanoclone": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
-      "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="
-    },
-    "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "dev": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
-    "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "dev": true
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
-    "neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+    "fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "dev": true
     },
-    "no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+    "fastq": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
+      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
       "dev": true,
       "requires": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
+        "reusify": "^1.0.4"
       }
     },
-    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+    "fb-watchman": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
       "requires": {
-        "whatwg-url": "^5.0.0"
+        "bser": "2.1.1"
+      }
+    },
+    "fetch-mock": {
+      "version": "9.11.0",
+      "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.11.0.tgz",
+      "integrity": "sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==",
+      "requires": {
+        "@babel/core": "^7.0.0",
+        "@babel/runtime": "^7.0.0",
+        "core-js": "^3.0.0",
+        "debug": "^4.1.1",
+        "glob-to-regexp": "^0.4.0",
+        "is-subset": "^0.1.1",
+        "lodash.isequal": "^4.5.0",
+        "path-to-regexp": "^2.2.1",
+        "querystring": "^0.2.0",
+        "whatwg-url": "^6.5.0"
       },
       "dependencies": {
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+        "debug": {
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
+            "ms": "2.1.2"
           }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "path-to-regexp": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz",
+          "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w=="
         }
       }
     },
-    "node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-      "dev": true
-    },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "dev": true
-    },
-    "node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg=="
+    "fetch-mock-jest": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/fetch-mock-jest/-/fetch-mock-jest-1.5.1.tgz",
+      "integrity": "sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ==",
+      "dev": true,
+      "requires": {
+        "fetch-mock": "^9.11.0"
+      }
     },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+    "figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
     },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-      "dev": true
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
     },
-    "normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "dev": true
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
     },
-    "npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
       "requires": {
-        "path-key": "^3.0.0"
+        "locate-path": "^2.0.0"
       }
     },
-    "nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0"
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
       }
     },
-    "nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+    "flatted": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
       "dev": true
     },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+    "follow-redirects": {
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "dev": true
     },
-    "object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+    "form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
       }
     },
-    "object.entries": {
+    "format-util": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz",
+      "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "function.prototype.name": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
       },
       "dependencies": {
         "es-abstract": {
@@ -45208,4514 +22499,3721 @@
         }
       }
     },
-    "object.fromentries": {
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
+    },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
+    },
+    "get-caller-file": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+    },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="
+    },
+    "get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "glob-regex": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/glob-regex/-/glob-regex-0.3.2.tgz",
+      "integrity": "sha512-m5blUd3/OqDTWwzBBtWBPrGlAzatRywHameHeekAZyZrskYouOGdNB8T/q6JucucvJXtOuyHIn0/Yia7iDasDw=="
+    },
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+    },
+    "globals": {
+      "version": "13.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
+      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.20.2"
+      }
+    },
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      }
+    },
+    "globrex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
+      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
+    },
+    "graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+    },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "history": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
+      "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
+      "requires": {
+        "@babel/runtime": "^7.7.6"
+      }
+    },
+    "hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "requires": {
+        "react-is": "^16.7.0"
+      }
+    },
+    "html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "requires": {
+        "whatwg-encoding": "^1.0.5"
+      }
+    },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+    },
+    "http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "requires": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
       },
       "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
-            "call-bind": "^1.0.2"
+            "ms": "2.1.2"
           }
         },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "requires": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
-            "has-tostringtag": "^1.0.0"
+            "ms": "2.1.2"
           }
         },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
+    },
+    "husky": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz",
+      "integrity": "sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true
+    },
+    "immer": {
+      "version": "9.0.12",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz",
+      "integrity": "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA=="
+    },
+    "immutable": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
+    "import-local": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "requires": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "inquirer": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.2.tgz",
+      "integrity": "sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.1",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.21",
+        "mute-stream": "0.0.8",
+        "ora": "^5.4.1",
+        "run-async": "^2.4.0",
+        "rxjs": "^7.5.5",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
           "dev": true,
           "requires": {
-            "call-bind": "^1.0.2"
+            "tslib": "^2.1.0"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
           "dev": true
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
         }
       }
     },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
-      "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-bigint": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
+      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
+      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
+    "is-callable": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "dev": true
+    },
+    "is-core-module": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
+      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+    },
+    "is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true
+    },
+    "is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+    },
+    "is-number-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
+      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
+      "dev": true
+    },
+    "is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+    },
+    "is-shared-array-buffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
+      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
+    },
+    "is-string": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
+      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
+      "dev": true
+    },
+    "is-subset": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
+      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY="
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+    },
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true
+    },
+    "is-weakref": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
+      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
+    },
+    "istanbul-lib-instrument": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
+      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+      "requires": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        }
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "requires": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
+            "ms": "2.1.2"
           }
         },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
+      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+      "requires": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      }
+    },
+    "iterare": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/iterare/-/iterare-1.2.1.tgz",
+      "integrity": "sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==",
+      "dev": true
+    },
+    "jest": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
+      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+      "requires": {
+        "@jest/core": "^27.5.1",
+        "import-local": "^3.0.2",
+        "jest-cli": "^27.5.1"
+      }
+    },
+    "jest-changed-files": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
+      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+      "requires": {
+        "@jest/types": "^27.5.1",
+        "execa": "^5.0.0",
+        "throat": "^6.0.1"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
           }
         },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
+            "@types/yargs-parser": "*"
           }
         }
       }
     },
-    "object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "dev": true,
+    "jest-circus": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
+      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
       "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3",
+        "throat": "^6.0.1"
       },
       "dependencies": {
-        "define-properties": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-          "dev": true,
-          "requires": {
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
           "requires": {
-            "has-tostringtag": "^1.0.0"
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
           }
         },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
           "requires": {
-            "call-bind": "^1.0.2"
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
           }
         },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
+            "@types/yargs-parser": "*"
           }
         },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
           }
         },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
           }
         }
       }
     },
-    "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+    "jest-cli": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
+      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
       "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
+        "@jest/core": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "prompts": "^2.0.1",
+        "yargs": "^16.2.0"
       },
       "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
           "requires": {
-            "call-bind": "^1.0.2"
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
           }
         },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
           }
         },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
+            "@types/yargs-parser": "*"
           }
         },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
           "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "oblivious-set": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
-      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "ono": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz",
-      "integrity": "sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==",
-      "requires": {
-        "format-util": "^1.0.3"
-      }
-    },
-    "open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-      "dev": true,
-      "requires": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      }
-    },
-    "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "requires": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "requires": {
-        "p-try": "^1.0.0"
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+    "jest-config": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
+      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
       "requires": {
-        "p-limit": "^1.1.0"
+        "@babel/core": "^7.8.0",
+        "@jest/test-sequencer": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "babel-jest": "^27.5.1",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-jasmine2": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runner": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        }
       }
     },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
+    "jest-diff": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
+      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
       "requires": {
-        "aggregate-error": "^3.0.0"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       }
     },
-    "p-retry": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-      "dev": true,
+    "jest-docblock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
+      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
       "requires": {
-        "@types/retry": "0.12.0",
-        "retry": "^0.13.1"
+        "detect-newline": "^3.0.0"
       }
     },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-    },
-    "param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dev": true,
+    "jest-each": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
+      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
       "requires": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1"
       },
       "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
         }
       }
     },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "parse-ms": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
-      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA=="
-    },
-    "parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dev": true,
+    "jest-environment-jsdom": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
+      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
       "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jsdom": "^16.6.0"
       },
       "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
         }
       }
     },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
-    },
-    "pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
-      "dev": true
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
+    "jest-environment-node": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
+      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
       "requires": {
-        "find-up": "^4.0.0"
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "jest-mock": "^27.5.1",
+        "jest-util": "^27.5.1"
       },
       "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
           "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
           }
         },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
           "requires": {
-            "p-locate": "^4.1.0"
+            "@types/yargs-parser": "*"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
           "requires": {
-            "p-try": "^2.0.0"
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
           }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
+        }
+      }
+    },
+    "jest-get-type": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
+      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
+    },
+    "jest-haste-map": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
+      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+      "requires": {
+        "@jest/types": "^27.5.1",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "fsevents": "^2.3.2",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^27.5.1",
+        "jest-serializer": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.7"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
           "requires": {
-            "p-limit": "^2.2.0"
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
         },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
         }
       }
     },
-    "pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "dev": true,
+    "jest-jasmine2": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
+      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
       "requires": {
-        "find-up": "^3.0.0"
+        "@jest/environment": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^27.5.1",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "pretty-format": "^27.5.1",
+        "throat": "^6.0.1"
       },
       "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
           "requires": {
-            "locate-path": "^3.0.0"
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
           }
         },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
           }
         },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
           "requires": {
-            "p-try": "^2.0.0"
+            "@types/yargs-parser": "*"
           }
         },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
           "requires": {
-            "p-limit": "^2.0.0"
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
           }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss": {
-      "version": "8.4.13",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
-      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
-      "dev": true,
-      "requires": {
-        "nanoid": "^3.3.3",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      }
-    },
-    "postcss-attribute-case-insensitive": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz",
-      "integrity": "sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.2"
-      }
-    },
-    "postcss-browser-comments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz",
-      "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-calc": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.9",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-clamp": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
-      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-color-functional-notation": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz",
-      "integrity": "sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-color-hex-alpha": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.3.tgz",
-      "integrity": "sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
         }
       }
     },
-    "postcss-color-rebeccapurple": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.2.tgz",
-      "integrity": "sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==",
-      "dev": true,
+    "jest-leak-detector": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
+      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
       "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       }
     },
-    "postcss-colormin": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz",
-      "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==",
-      "dev": true,
+    "jest-matcher-utils": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
       "requires": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.9.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "chalk": "^4.0.0",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "pretty-format": "^27.5.1"
       }
     },
-    "postcss-convert-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz",
-      "integrity": "sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==",
-      "dev": true,
+    "jest-message-util": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.0.tgz",
+      "integrity": "sha512-RpA8mpaJ/B2HphDMiDlrAZdDytkmwFqgjDZovM21F35lHGeUeCvYmm6W+sbQ0ydaLpg5bFAUuWG1cjqOl8vqrw==",
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^28.1.0",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^28.1.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+        },
+        "pretty-format": {
+          "version": "28.1.0",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
+          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+          "requires": {
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        },
+        "react-is": {
+          "version": "18.1.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
+          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg=="
         }
       }
     },
-    "postcss-custom-media": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz",
-      "integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-custom-properties": {
-      "version": "12.1.7",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.7.tgz",
-      "integrity": "sha512-N/hYP5gSoFhaqxi2DPCmvto/ZcRDVjE3T1LiAMzc/bg53hvhcHOLpXOHb526LzBBp5ZlAUhkuot/bfpmpgStJg==",
-      "dev": true,
+    "jest-mock": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
+      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "@jest/types": "^27.5.1",
+        "@types/node": "*"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
         }
       }
     },
-    "postcss-custom-selectors": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz",
-      "integrity": "sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
-    "postcss-dir-pseudo-class": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz",
-      "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz",
-      "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-discard-duplicates": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-discard-empty": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-      "dev": true,
+    "jest-pnp-resolver": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
       "requires": {}
     },
-    "postcss-discard-overridden": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-      "dev": true,
-      "requires": {}
+    "jest-regex-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="
     },
-    "postcss-double-position-gradients": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz",
-      "integrity": "sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==",
-      "dev": true,
+    "jest-resolve": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
+      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
       "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^27.5.1",
+        "jest-validate": "^27.5.1",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
+        "slash": "^3.0.0"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
         }
       }
     },
-    "postcss-env-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
-      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
-      "dev": true,
+    "jest-resolve-dependencies": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
+      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "@jest/types": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-snapshot": "^27.5.1"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
         }
       }
     },
-    "postcss-flexbugs-fixes": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz",
-      "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-focus-visible": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
-      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      }
-    },
-    "postcss-focus-within": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
-      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      }
-    },
-    "postcss-font-variant": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
-      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-gap-properties": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz",
-      "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-image-set-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz",
-      "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
-      "dev": true,
+    "jest-runner": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
+      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "@jest/console": "^27.5.1",
+        "@jest/environment": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.8.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^27.5.1",
+        "jest-environment-jsdom": "^27.5.1",
+        "jest-environment-node": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-leak-detector": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-runtime": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "jest-worker": "^27.5.1",
+        "source-map-support": "^0.5.6",
+        "throat": "^6.0.1"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "emittery": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
+          "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
         }
       }
     },
-    "postcss-initial": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
-      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
-      "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
-      "dev": true,
-      "requires": {
-        "camelcase-css": "^2.0.1"
-      }
-    },
-    "postcss-lab-function": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.0.tgz",
-      "integrity": "sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w==",
-      "dev": true,
+    "jest-runtime": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
+      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
       "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "@jest/environment": "^27.5.1",
+        "@jest/fake-timers": "^27.5.1",
+        "@jest/globals": "^27.5.1",
+        "@jest/source-map": "^27.5.1",
+        "@jest/test-result": "^27.5.1",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-mock": "^27.5.1",
+        "jest-regex-util": "^27.5.1",
+        "jest-resolve": "^27.5.1",
+        "jest-snapshot": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
+        "@jest/console": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
+          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "jest-message-util": "^27.5.1",
+            "jest-util": "^27.5.1",
+            "slash": "^3.0.0"
+          }
+        },
+        "@jest/test-result": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
+          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+          "requires": {
+            "@jest/console": "^27.5.1",
+            "@jest/types": "^27.5.1",
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "collect-v8-coverage": "^1.0.0"
+          }
+        },
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "strip-bom": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="
         }
       }
     },
-    "postcss-load-config": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-      "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
-      "dev": true,
+    "jest-serializer": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
+      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
       "requires": {
-        "lilconfig": "^2.0.5",
-        "yaml": "^1.10.2"
-      },
-      "dependencies": {
-        "lilconfig": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-          "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
-          "dev": true
-        }
+        "@types/node": "*",
+        "graceful-fs": "^4.2.9"
       }
     },
-    "postcss-loader": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
-      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
-      "dev": true,
+    "jest-snapshot": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
       "requires": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.5",
-        "semver": "^7.3.5"
+        "@babel/core": "^7.7.2",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/traverse": "^7.7.2",
+        "@babel/types": "^7.0.0",
+        "@jest/transform": "^27.5.1",
+        "@jest/types": "^27.5.1",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.1.5",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^27.5.1",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^27.5.1",
+        "jest-get-type": "^27.5.1",
+        "jest-haste-map": "^27.5.1",
+        "jest-matcher-utils": "^27.5.1",
+        "jest-message-util": "^27.5.1",
+        "jest-util": "^27.5.1",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^27.5.1",
+        "semver": "^7.3.2"
       },
       "dependencies": {
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
+          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.5.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.9",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.5.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
           "requires": {
-            "lru-cache": "^6.0.0"
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
           }
         }
       }
     },
-    "postcss-logical": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
-      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-media-minmax": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
-      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-merge-longhand": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz",
-      "integrity": "sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==",
+    "jest-sonar-reporter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jest-sonar-reporter/-/jest-sonar-reporter-2.0.0.tgz",
+      "integrity": "sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^5.1.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "xml": "^1.0.1"
       }
     },
-    "postcss-merge-rules": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz",
-      "integrity": "sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==",
+    "jest-styled-components": {
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/jest-styled-components/-/jest-styled-components-7.0.8.tgz",
+      "integrity": "sha512-0KE54d0yIzKcvtOv8eikyjG3rFRtKYUyQovaoha3nondtZzXYGB3bhsvYgEegU08Iry0ndWx2+g9f5ZzD4I+0Q==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^3.1.0",
-        "postcss-selector-parser": "^6.0.5"
+        "css": "^3.0.0"
       }
     },
-    "postcss-minify-font-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
-      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-      "dev": true,
+    "jest-util": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.0.tgz",
+      "integrity": "sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA==",
       "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "@jest/types": "^28.1.0",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
       }
     },
-    "postcss-minify-gradients": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
-      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
-      "dev": true,
+    "jest-validate": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
+      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
       "requires": {
-        "colord": "^2.9.1",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "@jest/types": "^27.5.1",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^27.5.1",
+        "leven": "^3.1.0",
+        "pretty-format": "^27.5.1"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
         }
       }
     },
-    "postcss-minify-params": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz",
-      "integrity": "sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==",
-      "dev": true,
+    "jest-watch-typeahead": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
+      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
       "requires": {
-        "browserslist": "^4.16.6",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "ansi-escapes": "^4.3.1",
+        "chalk": "^4.0.0",
+        "jest-regex-util": "^28.0.0",
+        "jest-watcher": "^28.0.0",
+        "slash": "^4.0.0",
+        "string-length": "^5.0.1",
+        "strip-ansi": "^7.0.1"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
+        "jest-regex-util": {
+          "version": "28.0.2",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
+          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="
+        },
+        "slash": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="
+        },
+        "string-length": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
+          "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+          "requires": {
+            "char-regex": "^2.0.0",
+            "strip-ansi": "^7.0.1"
+          },
+          "dependencies": {
+            "char-regex": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
+              "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+          "requires": {
+            "ansi-regex": "^6.0.1"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "6.0.1",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+              "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
+            }
+          }
         }
       }
     },
-    "postcss-minify-selectors": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz",
-      "integrity": "sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==",
-      "dev": true,
+    "jest-watcher": {
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.0.tgz",
+      "integrity": "sha512-tNHMtfLE8Njcr2IRS+5rXYA4BhU90gAOwI9frTGOqd+jX0P/Au/JfRSNqsf5nUTcWdbVYuLxS1KjnzILSoR5hA==",
       "requires": {
-        "postcss-selector-parser": "^6.0.5"
+        "@jest/test-result": "^28.1.0",
+        "@jest/types": "^28.1.0",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.10.2",
+        "jest-util": "^28.1.0",
+        "string-length": "^4.0.1"
       }
     },
-    "postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-      "dev": true,
+    "jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "requires": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
-    "postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.4"
-      }
+    "js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
     },
-    "postcss-modules-values": {
+    "js-tokens": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dev": true,
-      "requires": {
-        "icss-utils": "^5.0.0"
-      }
-    },
-    "postcss-nested": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz",
-      "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.6"
-      }
-    },
-    "postcss-nesting": {
-      "version": "10.1.5",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.5.tgz",
-      "integrity": "sha512-+NyBBE/wUcJ+NJgVd2FyKIZ414lul6ExqkOt1qXXw7oRzpQ0iT68cVpx+QfHh42QUMHXNoVLlN9InFY9XXK8ng==",
-      "dev": true,
-      "requires": {
-        "@csstools/selector-specificity": "1.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      }
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
-    "postcss-normalize": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz",
-      "integrity": "sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==",
-      "dev": true,
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "requires": {
-        "@csstools/normalize.css": "*",
-        "postcss-browser-comments": "^4",
-        "sanitize.css": "*"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       }
     },
-    "postcss-normalize-charset": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-normalize-display-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
-      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-      "dev": true,
+    "jsdom": {
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
+        "tr46": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+          "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+          "requires": {
+            "punycode": "^2.1.1"
+          }
+        },
+        "webidl-conversions": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+          "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
+        },
+        "whatwg-url": {
+          "version": "8.7.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+          "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+          "requires": {
+            "lodash": "^4.7.0",
+            "tr46": "^2.1.0",
+            "webidl-conversions": "^6.1.0"
+          }
         }
       }
     },
-    "postcss-normalize-positions": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz",
-      "integrity": "sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
-    "postcss-normalize-repeat-style": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz",
-      "integrity": "sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
-    "postcss-normalize-string": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
-      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-      "dev": true,
+    "json-schema-faker": {
+      "version": "0.5.0-rcv.40",
+      "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.5.0-rcv.40.tgz",
+      "integrity": "sha512-BczZvu03jKrGh3ovCWrHusiX6MwiaKK2WZeyomKBNA8Nm/n7aBYz0mub1CnONB6cgxOZTNxx4afNmLblbUmZbA==",
       "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "json-schema-ref-parser": "^6.1.0",
+        "jsonpath-plus": "^5.1.0"
       }
     },
-    "postcss-normalize-timing-functions": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
-      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-      "dev": true,
+    "json-schema-ref-parser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz",
+      "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==",
       "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "call-me-maybe": "^1.0.1",
+        "js-yaml": "^3.12.1",
+        "ono": "^4.0.11"
       }
     },
-    "postcss-normalize-unicode": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz",
-      "integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.16.6",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
+    "json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "postcss-normalize-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
-      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dev": true,
       "requires": {
-        "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "minimist": "^1.2.0"
       }
     },
-    "postcss-normalize-whitespace": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
-      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
       }
     },
-    "postcss-opacity-percentage": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz",
-      "integrity": "sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==",
-      "dev": true
+    "jsonpath-plus": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-5.1.0.tgz",
+      "integrity": "sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ=="
     },
-    "postcss-ordered-values": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz",
-      "integrity": "sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==",
+    "jsx-ast-utils": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
+      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
       "dev": true,
       "requires": {
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "array-includes": "^3.1.4",
+        "object.assign": "^4.1.2"
       }
     },
-    "postcss-overflow-shorthand": {
+    "kleur": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz",
-      "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-page-break": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
-      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-place": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.4.tgz",
-      "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
     },
-    "postcss-preset-env": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.5.0.tgz",
-      "integrity": "sha512-0BJzWEfCdTtK2R3EiKKSdkE51/DI/BwnhlnicSW482Ym6/DGHud8K0wGLcdjip1epVX0HKo4c8zzTeV/SkiejQ==",
-      "dev": true,
-      "requires": {
-        "@csstools/postcss-color-function": "^1.1.0",
-        "@csstools/postcss-font-format-keywords": "^1.0.0",
-        "@csstools/postcss-hwb-function": "^1.0.0",
-        "@csstools/postcss-ic-unit": "^1.0.0",
-        "@csstools/postcss-is-pseudo-class": "^2.0.2",
-        "@csstools/postcss-normalize-display-values": "^1.0.0",
-        "@csstools/postcss-oklab-function": "^1.1.0",
-        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
-        "@csstools/postcss-stepped-value-functions": "^1.0.0",
-        "@csstools/postcss-unset-value": "^1.0.0",
-        "autoprefixer": "^10.4.6",
-        "browserslist": "^4.20.3",
-        "css-blank-pseudo": "^3.0.3",
-        "css-has-pseudo": "^3.0.4",
-        "css-prefers-color-scheme": "^6.0.3",
-        "cssdb": "^6.6.1",
-        "postcss-attribute-case-insensitive": "^5.0.0",
-        "postcss-clamp": "^4.1.0",
-        "postcss-color-functional-notation": "^4.2.2",
-        "postcss-color-hex-alpha": "^8.0.3",
-        "postcss-color-rebeccapurple": "^7.0.2",
-        "postcss-custom-media": "^8.0.0",
-        "postcss-custom-properties": "^12.1.7",
-        "postcss-custom-selectors": "^6.0.0",
-        "postcss-dir-pseudo-class": "^6.0.4",
-        "postcss-double-position-gradients": "^3.1.1",
-        "postcss-env-function": "^4.0.6",
-        "postcss-focus-visible": "^6.0.4",
-        "postcss-focus-within": "^5.0.4",
-        "postcss-font-variant": "^5.0.0",
-        "postcss-gap-properties": "^3.0.3",
-        "postcss-image-set-function": "^4.0.6",
-        "postcss-initial": "^4.0.1",
-        "postcss-lab-function": "^4.2.0",
-        "postcss-logical": "^5.0.4",
-        "postcss-media-minmax": "^5.0.0",
-        "postcss-nesting": "^10.1.4",
-        "postcss-opacity-percentage": "^1.1.2",
-        "postcss-overflow-shorthand": "^3.0.3",
-        "postcss-page-break": "^3.0.4",
-        "postcss-place": "^7.0.4",
-        "postcss-pseudo-class-any-link": "^7.1.2",
-        "postcss-replace-overflow-wrap": "^4.0.0",
-        "postcss-selector-not": "^5.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-          "dev": true
-        },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
-        },
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
+    "language-subtag-registry": {
+      "version": "0.3.21",
+      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
+      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
+      "dev": true
     },
-    "postcss-pseudo-class-any-link": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.3.tgz",
-      "integrity": "sha512-I9Yp1VV2r8xFwg/JrnAlPCcKmutv6f6Ig6/CHFPqGJiDgYXM9C+0kgLfK4KOXbKNw+63QYl4agRUB0Wi9ftUIg==",
+    "language-tags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
+      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.10"
+        "language-subtag-registry": "~0.3.2"
       }
     },
-    "postcss-reduce-initial": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz",
-      "integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0"
-      }
+    "leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
     },
-    "postcss-reduce-transforms": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
-      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       }
     },
-    "postcss-replace-overflow-wrap": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
-      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true,
-      "requires": {}
-    },
-    "postcss-selector-not": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz",
-      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0"
-      }
+    "lilconfig": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
+      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==",
+      "dev": true
     },
-    "postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
-    "postcss-svgo": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
-      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
+    "lint-staged": {
+      "version": "12.1.2",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.1.2.tgz",
+      "integrity": "sha512-bSMcQVqMW98HLLLR2c2tZ+vnDCnx4fd+0QJBQgN/4XkdspGRPc8DGp7UuOEBe1ApCfJ+wXXumYnJmU+wDo7j9A==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0",
-        "svgo": "^2.7.0"
+        "cli-truncate": "^3.1.0",
+        "colorette": "^2.0.16",
+        "commander": "^8.3.0",
+        "debug": "^4.3.2",
+        "enquirer": "^2.3.6",
+        "execa": "^5.1.1",
+        "lilconfig": "2.0.4",
+        "listr2": "^3.13.3",
+        "micromatch": "^4.0.4",
+        "normalize-path": "^3.0.0",
+        "object-inspect": "^1.11.0",
+        "string-argv": "^0.3.1",
+        "supports-color": "^9.0.2",
+        "yaml": "^1.10.2"
       },
       "dependencies": {
-        "commander": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+        "colorette": {
+          "version": "2.0.16",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+          "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
           "dev": true
         },
-        "css-select": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-          "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-          "dev": true,
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-what": "^6.0.1",
-            "domhandler": "^4.3.1",
-            "domutils": "^2.8.0",
-            "nth-check": "^2.0.1"
-          }
-        },
-        "css-tree": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+        "debug": {
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "dev": true,
           "requires": {
-            "mdn-data": "2.0.14",
-            "source-map": "^0.6.1"
+            "ms": "2.1.2"
           }
         },
-        "css-what": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-          "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "dom-serializer": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-          "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "domhandler": "^4.2.0",
-            "entities": "^2.0.0"
-          }
-        },
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+        "object-inspect": {
+          "version": "1.11.1",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
+          "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
           "dev": true
         },
-        "domutils": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "^1.0.1",
-            "domelementtype": "^2.2.0",
-            "domhandler": "^4.2.0"
-          }
-        },
-        "mdn-data": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+        "supports-color": {
+          "version": "9.2.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.1.tgz",
+          "integrity": "sha512-Obv7ycoCTG51N7y175StI9BlAXrmgZrFhZOb0/PyjHBher/NmsdBgbbQ1Inhq+gIhz6+7Gb+jWF2Vqi7Mf1xnQ==",
           "dev": true
-        },
-        "nth-check": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-          "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+        }
+      }
+    },
+    "listr2": {
+      "version": "3.13.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.5.tgz",
+      "integrity": "sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA==",
+      "dev": true,
+      "requires": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.4.0",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "dependencies": {
+        "cli-truncate": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+          "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
           "dev": true,
           "requires": {
-            "boolbase": "^1.0.0"
+            "slice-ansi": "^3.0.0",
+            "string-width": "^4.2.0"
           }
         },
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+        "colorette": {
+          "version": "2.0.16",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+          "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
           "dev": true
         },
-        "svgo": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-          "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+        "slice-ansi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+          "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
           "dev": true,
           "requires": {
-            "@trysound/sax": "0.2.0",
-            "commander": "^7.2.0",
-            "css-select": "^4.1.3",
-            "css-tree": "^1.1.3",
-            "csso": "^4.2.0",
-            "picocolors": "^1.0.0",
-            "stable": "^0.1.8"
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
           }
         }
       }
     },
-    "postcss-unique-selectors": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
-      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.5"
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
       }
     },
-    "postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
-    "prettier": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-      "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
       "dev": true
     },
-    "prettier-linter-helpers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-      "dev": true,
-      "requires": {
-        "fast-diff": "^1.1.2"
-      }
-    },
-    "pretty-bytes": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-      "dev": true
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
-    "pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
     },
-    "pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-      "requires": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "react-is": {
-          "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-        }
-      }
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
+      "dev": true
     },
-    "pretty-ms": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
-      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
-      "requires": {
-        "parse-ms": "^2.1.0"
-      }
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
     },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "promise": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
-      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
-      "dev": true,
-      "requires": {
-        "asap": "~2.0.6"
-      }
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
-    "prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+    "log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "requires": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      }
-    },
-    "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       }
     },
-    "property-expr": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.4.tgz",
-      "integrity": "sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg=="
-    },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+    "log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "dev": true,
       "requires": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
       },
       "dependencies": {
-        "ipaddr.js": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-          "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-          "dev": true
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
         }
       }
     },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "dev": true
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-      "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
-      "dev": true,
-      "requires": {
-        "side-channel": "^1.0.4"
-      }
-    },
-    "querystring": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
-      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true
-    },
-    "raf": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-      "dev": true,
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "requires": {
-        "performance-now": "^2.1.0"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "requires": {
-        "safe-buffer": "^5.1.0"
+        "yallist": "^4.0.0"
       }
     },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
+    "lz-string": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
+      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY="
     },
-    "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dev": true,
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
+        "semver": "^6.0.0"
       },
       "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-          "dev": true
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
         }
       }
     },
-    "react": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.1.0.tgz",
-      "integrity": "sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==",
-      "requires": {
-        "loose-envify": "^1.1.0"
-      }
+    "make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "devOptional": true
     },
-    "react-ace": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.5.0.tgz",
-      "integrity": "sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==",
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
       "requires": {
-        "ace-builds": "^1.4.13",
-        "diff-match-patch": "^1.0.5",
-        "lodash.get": "^4.4.2",
-        "lodash.isequal": "^4.5.0",
-        "prop-types": "^15.7.2"
-      },
-      "dependencies": {
-        "ace-builds": {
-          "version": "1.4.13",
-          "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
-          "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
-        }
+        "tmpl": "1.0.x"
       }
     },
-    "react-app-polyfill": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz",
-      "integrity": "sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==",
-      "dev": true,
+    "match-sorter": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
+      "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
       "requires": {
-        "core-js": "^3.19.2",
-        "object-assign": "^4.1.1",
-        "promise": "^8.1.0",
-        "raf": "^3.4.1",
-        "regenerator-runtime": "^0.13.9",
-        "whatwg-fetch": "^3.6.2"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "3.22.5",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.22.5.tgz",
-          "integrity": "sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==",
-          "dev": true
-        },
-        "regenerator-runtime": {
-          "version": "0.13.9",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-          "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
-          "dev": true
-        }
+        "@babel/runtime": "^7.12.5",
+        "remove-accents": "0.4.2"
       }
     },
-    "react-datepicker": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.5.0.tgz",
-      "integrity": "sha512-mFP/SbtFSXx21Wx3Nfv+RREwd/x0q14x7QL79ZCi/PVkHSFLwLWhXyOtj3OIzi1AcVYb/fMMcvi8e5b12n8/sg==",
-      "requires": {
-        "@popperjs/core": "^2.9.2",
-        "classnames": "^2.2.6",
-        "date-fns": "^2.24.0",
-        "prop-types": "^15.7.2",
-        "react-onclickoutside": "^6.12.0",
-        "react-popper": "^2.2.5"
-      },
-      "dependencies": {
-        "date-fns": {
-          "version": "2.27.0",
-          "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz",
-          "integrity": "sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q=="
-        }
-      }
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
-    "react-dev-utils": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
-      "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
-      "dev": true,
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
       "requires": {
-        "@babel/code-frame": "^7.16.0",
-        "address": "^1.1.2",
-        "browserslist": "^4.18.1",
-        "chalk": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "detect-port-alt": "^1.1.6",
-        "escape-string-regexp": "^4.0.0",
-        "filesize": "^8.0.6",
-        "find-up": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^6.5.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.0.4",
-        "gzip-size": "^6.0.0",
-        "immer": "^9.0.7",
-        "is-root": "^2.1.0",
-        "loader-utils": "^3.2.0",
-        "open": "^8.4.0",
-        "pkg-up": "^3.1.0",
-        "prompts": "^2.4.2",
-        "react-error-overlay": "^6.0.11",
-        "recursive-readdir": "^2.2.2",
-        "shell-quote": "^1.7.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.16.7"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "2.4.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            },
-            "escape-string-regexp": {
-              "version": "1.0.5",
-              "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-              "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-              "dev": true
-            }
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz",
-          "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^5.0.0"
-          }
-        },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^3.0.2"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
+        "braces": "^3.0.1",
+        "picomatch": "^2.2.3"
       }
     },
-    "react-dom": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.1.0.tgz",
-      "integrity": "sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==",
+    "microseconds": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
+      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.22.0"
+        "mime-db": "1.52.0"
       }
     },
-    "react-error-overlay": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
-      "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==",
-      "dev": true
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
     },
-    "react-fast-compare": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
-      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
+    "min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true
     },
-    "react-hook-form": {
-      "version": "7.6.9",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.6.9.tgz",
-      "integrity": "sha512-nz+btC4WFIm3zPBjw22K3t9nnJtlMMwj8slcbPYoTKlkSVA5l+q3Ai+VF0YzeRi7vbyyeGQvpyibov1xd/TV7A==",
-      "requires": {}
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
     },
-    "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    "minimist": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
-    "react-multi-select-component": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/react-multi-select-component/-/react-multi-select-component-4.0.6.tgz",
-      "integrity": "sha512-cNpDv8vh1kWkJiMsa097tTUqWLVTQn+La4aXlgoGOQVpOSH9u1fbj1+MsvnLQjTBySuDx+pzm/DpbIoma/i1Fw==",
-      "requires": {}
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
     },
-    "react-onclickoutside": {
-      "version": "6.12.1",
-      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.1.tgz",
-      "integrity": "sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==",
-      "requires": {}
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
     },
-    "react-popper": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
-      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
+    "nano-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
+      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
       "requires": {
-        "react-fast-compare": "^3.0.1",
-        "warning": "^4.0.2"
+        "big-integer": "^1.6.16"
       }
     },
-    "react-query": {
-      "version": "3.39.1",
-      "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",
-      "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "broadcast-channel": "^3.4.1",
-        "match-sorter": "^6.0.2"
-      }
+    "nanoclone": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
+      "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="
     },
-    "react-redux": {
-      "version": "7.2.6",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz",
-      "integrity": "sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==",
+    "nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "requires": {
-        "@babel/runtime": "^7.15.4",
-        "@types/react-redux": "^7.1.20",
-        "hoist-non-react-statics": "^3.3.2",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2"
+        "whatwg-url": "^5.0.0"
       },
       "dependencies": {
-        "@babel/runtime": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-          "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
         },
-        "@types/react-redux": {
-          "version": "7.1.22",
-          "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
-          "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
           "requires": {
-            "@types/hoist-non-react-statics": "^3.3.0",
-            "@types/react": "*",
-            "hoist-non-react-statics": "^3.3.0",
-            "redux": "^4.0.0"
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
           }
-        },
-        "react-is": {
-          "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
         }
       }
     },
-    "react-refresh": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
-      "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+    },
+    "node-releases": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
+      "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+    },
+    "npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "requires": {
+        "path-key": "^3.0.0"
+      }
+    },
+    "nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
       "dev": true
     },
-    "react-router-dom": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
-      "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
       "requires": {
-        "history": "^5.2.0",
-        "react-router": "6.3.0"
-      },
-      "dependencies": {
-        "react-router": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
-          "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
-          "requires": {
-            "history": "^5.2.0"
-          }
-        }
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
       }
     },
-    "react-scripts": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
-      "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
+    "object.entries": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
+      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.16.0",
-        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
-        "@svgr/webpack": "^5.5.0",
-        "babel-jest": "^27.4.2",
-        "babel-loader": "^8.2.3",
-        "babel-plugin-named-asset-import": "^0.3.8",
-        "babel-preset-react-app": "^10.0.1",
-        "bfj": "^7.0.2",
-        "browserslist": "^4.18.1",
-        "camelcase": "^6.2.1",
-        "case-sensitive-paths-webpack-plugin": "^2.4.0",
-        "css-loader": "^6.5.1",
-        "css-minimizer-webpack-plugin": "^3.2.0",
-        "dotenv": "^10.0.0",
-        "dotenv-expand": "^5.1.0",
-        "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.1",
-        "eslint-webpack-plugin": "^3.1.1",
-        "file-loader": "^6.2.0",
-        "fs-extra": "^10.0.0",
-        "fsevents": "^2.3.2",
-        "html-webpack-plugin": "^5.5.0",
-        "identity-obj-proxy": "^3.0.0",
-        "jest": "^27.4.3",
-        "jest-resolve": "^27.4.2",
-        "jest-watch-typeahead": "^1.0.0",
-        "mini-css-extract-plugin": "^2.4.5",
-        "postcss": "^8.4.4",
-        "postcss-flexbugs-fixes": "^5.0.2",
-        "postcss-loader": "^6.2.1",
-        "postcss-normalize": "^10.0.1",
-        "postcss-preset-env": "^7.0.1",
-        "prompts": "^2.4.2",
-        "react-app-polyfill": "^3.0.0",
-        "react-dev-utils": "^12.0.1",
-        "react-refresh": "^0.11.0",
-        "resolve": "^1.20.0",
-        "resolve-url-loader": "^4.0.0",
-        "sass-loader": "^12.3.0",
-        "semver": "^7.3.5",
-        "source-map-loader": "^3.0.0",
-        "style-loader": "^3.3.1",
-        "tailwindcss": "^3.0.2",
-        "terser-webpack-plugin": "^5.2.5",
-        "webpack": "^5.64.4",
-        "webpack-dev-server": "^4.6.0",
-        "webpack-manifest-plugin": "^4.0.2",
-        "workbox-webpack-plugin": "^6.4.1"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-          "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+        "es-abstract": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
           "dev": true,
           "requires": {
-            "@babel/highlight": "^7.16.7"
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "function.prototype.name": "^1.1.5",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-property-descriptors": "^1.0.0",
+            "has-symbols": "^1.0.3",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.2",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.2",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.2",
+            "object-inspect": "^1.12.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "regexp.prototype.flags": "^1.4.1",
+            "string.prototype.trimend": "^1.0.5",
+            "string.prototype.trimstart": "^1.0.5",
+            "unbox-primitive": "^1.0.2"
           }
         },
-        "@babel/compat-data": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-          "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
+        "has-bigints": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
           "dev": true
         },
-        "@babel/core": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.10.tgz",
-          "integrity": "sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA==",
-          "dev": true,
-          "requires": {
-            "@ampproject/remapping": "^2.1.0",
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-compilation-targets": "^7.17.10",
-            "@babel/helper-module-transforms": "^7.17.7",
-            "@babel/helpers": "^7.17.9",
-            "@babel/parser": "^7.17.10",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "convert-source-map": "^1.7.0",
-            "debug": "^4.1.0",
-            "gensync": "^1.0.0-beta.2",
-            "json5": "^2.2.1",
-            "semver": "^6.3.0"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "6.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-              "dev": true
-            }
-          }
-        },
-        "@babel/generator": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz",
-          "integrity": "sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.17.10",
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-compilation-targets": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz",
-          "integrity": "sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==",
-          "dev": true,
-          "requires": {
-            "@babel/compat-data": "^7.17.10",
-            "@babel/helper-validator-option": "^7.16.7",
-            "browserslist": "^4.20.2",
-            "semver": "^6.3.0"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "6.3.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-              "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-              "dev": true
-            }
-          }
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+          "dev": true
         },
-        "@babel/helper-function-name": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-          "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/types": "^7.17.0"
-          }
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+          "dev": true
         },
-        "@babel/helper-hoist-variables": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-          "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.16.7"
-          }
+        "is-negative-zero": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+          "dev": true
         },
-        "@babel/helper-module-imports": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-          "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.16.7"
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "@babel/helper-module-transforms": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-          "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
+        "is-shared-array-buffer": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
           "dev": true,
           "requires": {
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-module-imports": "^7.16.7",
-            "@babel/helper-simple-access": "^7.17.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.3",
-            "@babel/types": "^7.17.0"
+            "call-bind": "^1.0.2"
           }
         },
-        "@babel/helper-simple-access": {
-          "version": "7.17.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-          "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.17.0"
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-          "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+        "is-weakref": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.16.7"
+            "call-bind": "^1.0.2"
           }
         },
-        "@babel/helper-validator-identifier": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-          "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-          "dev": true
-        },
-        "@babel/helper-validator-option": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-          "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
           "dev": true
         },
-        "@babel/helpers": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz",
-          "integrity": "sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.17.9",
-            "@babel/types": "^7.17.0"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz",
-          "integrity": "sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/template": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-          "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/parser": "^7.16.7",
-            "@babel/types": "^7.16.7"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz",
-          "integrity": "sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.17.10",
-            "@babel/helper-environment-visitor": "^7.16.7",
-            "@babel/helper-function-name": "^7.17.9",
-            "@babel/helper-hoist-variables": "^7.16.7",
-            "@babel/helper-split-export-declaration": "^7.16.7",
-            "@babel/parser": "^7.17.10",
-            "@babel/types": "^7.17.10",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.17.10",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz",
-          "integrity": "sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==",
+        "regexp.prototype.flags": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "to-fast-properties": "^2.0.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "functions-have-names": "^1.2.2"
           }
         },
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+        "string.prototype.trimend": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
           },
           "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
               "dev": true,
               "requires": {
-                "has-flag": "^4.0.0"
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
               }
             }
           }
         },
-        "@jest/core": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
-          "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+        "string.prototype.trimstart": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
           "dev": true,
           "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/reporters": "^27.5.1",
-            "@jest/test-result": "^27.5.1",
-            "@jest/transform": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "ansi-escapes": "^4.2.1",
-            "chalk": "^4.0.0",
-            "emittery": "^0.8.1",
-            "exit": "^0.1.2",
-            "graceful-fs": "^4.2.9",
-            "jest-changed-files": "^27.5.1",
-            "jest-config": "^27.5.1",
-            "jest-haste-map": "^27.5.1",
-            "jest-message-util": "^27.5.1",
-            "jest-regex-util": "^27.5.1",
-            "jest-resolve": "^27.5.1",
-            "jest-resolve-dependencies": "^27.5.1",
-            "jest-runner": "^27.5.1",
-            "jest-runtime": "^27.5.1",
-            "jest-snapshot": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "jest-validate": "^27.5.1",
-            "jest-watcher": "^27.5.1",
-            "micromatch": "^4.0.4",
-            "rimraf": "^3.0.0",
-            "slash": "^3.0.0",
-            "strip-ansi": "^6.0.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
           },
           "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
               "dev": true,
               "requires": {
-                "has-flag": "^4.0.0"
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
               }
             }
           }
         },
-        "@jest/environment": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-          "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+        "unbox-primitive": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
           "dev": true,
           "requires": {
-            "@jest/fake-timers": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "jest-mock": "^27.5.1"
+            "call-bind": "^1.0.2",
+            "has-bigints": "^1.0.2",
+            "has-symbols": "^1.0.3",
+            "which-boxed-primitive": "^1.0.2"
           }
-        },
-        "@jest/fake-timers": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-          "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+        }
+      }
+    },
+    "object.fromentries": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
+      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "@sinonjs/fake-timers": "^8.0.1",
-            "@types/node": "*",
-            "jest-message-util": "^27.5.1",
-            "jest-mock": "^27.5.1",
-            "jest-util": "^27.5.1"
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "function.prototype.name": "^1.1.5",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-property-descriptors": "^1.0.0",
+            "has-symbols": "^1.0.3",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.2",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.2",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.2",
+            "object-inspect": "^1.12.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "regexp.prototype.flags": "^1.4.1",
+            "string.prototype.trimend": "^1.0.5",
+            "string.prototype.trimstart": "^1.0.5",
+            "unbox-primitive": "^1.0.2"
           }
         },
-        "@jest/globals": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-          "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+        "has-bigints": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+          "dev": true
+        },
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+          "dev": true
+        },
+        "is-negative-zero": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "expect": "^27.5.1"
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "@jest/reporters": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
-          "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+        "is-shared-array-buffer": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
           "dev": true,
           "requires": {
-            "@bcoe/v8-coverage": "^0.2.3",
-            "@jest/console": "^27.5.1",
-            "@jest/test-result": "^27.5.1",
-            "@jest/transform": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "collect-v8-coverage": "^1.0.0",
-            "exit": "^0.1.2",
-            "glob": "^7.1.2",
-            "graceful-fs": "^4.2.9",
-            "istanbul-lib-coverage": "^3.0.0",
-            "istanbul-lib-instrument": "^5.1.0",
-            "istanbul-lib-report": "^3.0.0",
-            "istanbul-lib-source-maps": "^4.0.0",
-            "istanbul-reports": "^3.1.3",
-            "jest-haste-map": "^27.5.1",
-            "jest-resolve": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "jest-worker": "^27.5.1",
-            "slash": "^3.0.0",
-            "source-map": "^0.6.0",
-            "string-length": "^4.0.1",
-            "terminal-link": "^2.0.0",
-            "v8-to-istanbul": "^8.1.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2"
           }
         },
-        "@jest/source-map": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-          "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
           "dev": true,
           "requires": {
-            "callsites": "^3.0.0",
-            "graceful-fs": "^4.2.9",
-            "source-map": "^0.6.0"
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+        "is-weakref": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
           "dev": true,
           "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
+            "call-bind": "^1.0.2"
           }
         },
-        "@jest/test-sequencer": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
-          "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
-          "dev": true,
-          "requires": {
-            "@jest/test-result": "^27.5.1",
-            "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^27.5.1",
-            "jest-runtime": "^27.5.1"
-          }
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+          "dev": true
         },
-        "@jest/transform": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-          "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+        "regexp.prototype.flags": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
           "dev": true,
           "requires": {
-            "@babel/core": "^7.1.0",
-            "@jest/types": "^27.5.1",
-            "babel-plugin-istanbul": "^6.1.1",
-            "chalk": "^4.0.0",
-            "convert-source-map": "^1.4.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^27.5.1",
-            "jest-regex-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "micromatch": "^4.0.4",
-            "pirates": "^4.0.4",
-            "slash": "^3.0.0",
-            "source-map": "^0.6.1",
-            "write-file-atomic": "^3.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "functions-have-names": "^1.2.2"
           }
         },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+        "string.prototype.trimend": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
           "dev": true,
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
           },
           "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
               "dev": true,
               "requires": {
-                "has-flag": "^4.0.0"
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
               }
             }
           }
         },
-        "@sinonjs/fake-timers": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-          "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-          "dev": true,
-          "requires": {
-            "@sinonjs/commons": "^1.7.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "dev": true,
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "babel-jest": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-          "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+        "string.prototype.trimstart": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
           "dev": true,
           "requires": {
-            "@jest/transform": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/babel__core": "^7.1.14",
-            "babel-plugin-istanbul": "^6.1.1",
-            "babel-preset-jest": "^27.5.1",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "slash": "^3.0.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
           },
           "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
               "dev": true,
               "requires": {
-                "has-flag": "^4.0.0"
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
               }
             }
           }
         },
-        "babel-plugin-jest-hoist": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-          "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.3.3",
-            "@babel/types": "^7.3.3",
-            "@types/babel__core": "^7.0.0",
-            "@types/babel__traverse": "^7.0.6"
-          }
-        },
-        "babel-preset-jest": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-          "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
-          "dev": true,
-          "requires": {
-            "babel-plugin-jest-hoist": "^27.5.1",
-            "babel-preset-current-node-syntax": "^1.0.0"
-          }
-        },
-        "browserslist": {
-          "version": "4.20.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz",
-          "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==",
+        "unbox-primitive": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001332",
-            "electron-to-chromium": "^1.4.118",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.3",
-            "picocolors": "^1.0.0"
+            "call-bind": "^1.0.2",
+            "has-bigints": "^1.0.2",
+            "has-symbols": "^1.0.3",
+            "which-boxed-primitive": "^1.0.2"
           }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+        }
+      }
+    },
+    "object.hasown": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
+      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      },
+      "dependencies": {
+        "define-properties": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "has-property-descriptors": "^1.0.0",
+            "object-keys": "^1.1.1"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+        "es-abstract": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "function.prototype.name": "^1.1.5",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-property-descriptors": "^1.0.0",
+            "has-symbols": "^1.0.3",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.2",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.2",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.2",
+            "object-inspect": "^1.12.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "regexp.prototype.flags": "^1.4.1",
+            "string.prototype.trimend": "^1.0.5",
+            "string.prototype.trimstart": "^1.0.5",
+            "unbox-primitive": "^1.0.2"
           }
         },
-        "diff-sequences": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+        "has-bigints": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
           "dev": true
         },
-        "dotenv": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
-          "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
           "dev": true
         },
-        "electron-to-chromium": {
-          "version": "1.4.137",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz",
-          "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
           "dev": true
         },
-        "emittery": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-          "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+        "is-negative-zero": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
           "dev": true
         },
-        "expect": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "jest-matcher-utils": "^27.5.1",
-            "jest-message-util": "^27.5.1"
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "jest": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
-          "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+        "is-shared-array-buffer": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
           "dev": true,
           "requires": {
-            "@jest/core": "^27.5.1",
-            "import-local": "^3.0.2",
-            "jest-cli": "^27.5.1"
+            "call-bind": "^1.0.2"
           }
         },
-        "jest-changed-files": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
-          "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "execa": "^5.0.0",
-            "throat": "^6.0.1"
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "jest-circus": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
-          "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+        "is-weakref": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^27.5.1",
-            "@jest/test-result": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "co": "^4.6.0",
-            "dedent": "^0.7.0",
-            "expect": "^27.5.1",
-            "is-generator-fn": "^2.0.0",
-            "jest-each": "^27.5.1",
-            "jest-matcher-utils": "^27.5.1",
-            "jest-message-util": "^27.5.1",
-            "jest-runtime": "^27.5.1",
-            "jest-snapshot": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3",
-            "throat": "^6.0.1"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2"
           }
         },
-        "jest-cli": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
-          "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+          "dev": true
+        },
+        "regexp.prototype.flags": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
           "dev": true,
           "requires": {
-            "@jest/core": "^27.5.1",
-            "@jest/test-result": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "chalk": "^4.0.0",
-            "exit": "^0.1.2",
-            "graceful-fs": "^4.2.9",
-            "import-local": "^3.0.2",
-            "jest-config": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "jest-validate": "^27.5.1",
-            "prompts": "^2.0.1",
-            "yargs": "^16.2.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "functions-have-names": "^1.2.2"
           }
         },
-        "jest-config": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
-          "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+        "string.prototype.trimend": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
           "dev": true,
           "requires": {
-            "@babel/core": "^7.8.0",
-            "@jest/test-sequencer": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "babel-jest": "^27.5.1",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "deepmerge": "^4.2.2",
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.2.9",
-            "jest-circus": "^27.5.1",
-            "jest-environment-jsdom": "^27.5.1",
-            "jest-environment-node": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "jest-jasmine2": "^27.5.1",
-            "jest-regex-util": "^27.5.1",
-            "jest-resolve": "^27.5.1",
-            "jest-runner": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "jest-validate": "^27.5.1",
-            "micromatch": "^4.0.4",
-            "parse-json": "^5.2.0",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "strip-json-comments": "^3.1.1"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
           }
         },
-        "jest-diff": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+        "string.prototype.trimstart": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
           "dev": true,
           "requires": {
-            "chalk": "^4.0.0",
-            "diff-sequences": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
           }
         },
-        "jest-docblock": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-          "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+        "unbox-primitive": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
           "dev": true,
           "requires": {
-            "detect-newline": "^3.0.0"
+            "call-bind": "^1.0.2",
+            "has-bigints": "^1.0.2",
+            "has-symbols": "^1.0.3",
+            "which-boxed-primitive": "^1.0.2"
           }
-        },
-        "jest-each": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-          "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+        }
+      }
+    },
+    "object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "chalk": "^4.0.0",
-            "jest-get-type": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2",
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "function.prototype.name": "^1.1.5",
+            "get-intrinsic": "^1.1.1",
+            "get-symbol-description": "^1.0.0",
+            "has": "^1.0.3",
+            "has-property-descriptors": "^1.0.0",
+            "has-symbols": "^1.0.3",
+            "internal-slot": "^1.0.3",
+            "is-callable": "^1.2.4",
+            "is-negative-zero": "^2.0.2",
+            "is-regex": "^1.1.4",
+            "is-shared-array-buffer": "^1.0.2",
+            "is-string": "^1.0.7",
+            "is-weakref": "^1.0.2",
+            "object-inspect": "^1.12.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.2",
+            "regexp.prototype.flags": "^1.4.1",
+            "string.prototype.trimend": "^1.0.5",
+            "string.prototype.trimstart": "^1.0.5",
+            "unbox-primitive": "^1.0.2"
           }
         },
-        "jest-environment-node": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
-          "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
-          "dev": true,
-          "requires": {
-            "@jest/environment": "^27.5.1",
-            "@jest/fake-timers": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "jest-mock": "^27.5.1",
-            "jest-util": "^27.5.1"
-          }
+        "has-bigints": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+          "dev": true
         },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
           "dev": true
         },
-        "jest-leak-detector": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
-          "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+        "is-callable": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+          "dev": true
+        },
+        "is-negative-zero": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
           "dev": true,
           "requires": {
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
+            "call-bind": "^1.0.2",
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+        "is-shared-array-buffer": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2"
           }
         },
-        "jest-mock": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-          "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+        "is-string": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*"
+            "has-tostringtag": "^1.0.0"
           }
         },
-        "jest-resolve-dependencies": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
-          "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+        "is-weakref": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "jest-regex-util": "^27.5.1",
-            "jest-snapshot": "^27.5.1"
+            "call-bind": "^1.0.2"
           }
         },
-        "jest-runner": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
-          "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+        "object-inspect": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+          "dev": true
+        },
+        "regexp.prototype.flags": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
           "dev": true,
           "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/environment": "^27.5.1",
-            "@jest/test-result": "^27.5.1",
-            "@jest/transform": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "emittery": "^0.8.1",
-            "graceful-fs": "^4.2.9",
-            "jest-docblock": "^27.5.1",
-            "jest-environment-jsdom": "^27.5.1",
-            "jest-environment-node": "^27.5.1",
-            "jest-haste-map": "^27.5.1",
-            "jest-leak-detector": "^27.5.1",
-            "jest-message-util": "^27.5.1",
-            "jest-resolve": "^27.5.1",
-            "jest-runtime": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "jest-worker": "^27.5.1",
-            "source-map-support": "^0.5.6",
-            "throat": "^6.0.1"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.3",
+            "functions-have-names": "^1.2.2"
           }
         },
-        "jest-runtime": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-          "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+        "string.prototype.trimend": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
           "dev": true,
           "requires": {
-            "@jest/environment": "^27.5.1",
-            "@jest/fake-timers": "^27.5.1",
-            "@jest/globals": "^27.5.1",
-            "@jest/source-map": "^27.5.1",
-            "@jest/test-result": "^27.5.1",
-            "@jest/transform": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "chalk": "^4.0.0",
-            "cjs-module-lexer": "^1.0.0",
-            "collect-v8-coverage": "^1.0.0",
-            "execa": "^5.0.0",
-            "glob": "^7.1.3",
-            "graceful-fs": "^4.2.9",
-            "jest-haste-map": "^27.5.1",
-            "jest-message-util": "^27.5.1",
-            "jest-mock": "^27.5.1",
-            "jest-regex-util": "^27.5.1",
-            "jest-resolve": "^27.5.1",
-            "jest-snapshot": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0",
-            "strip-bom": "^4.0.0"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
           },
           "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
               "dev": true,
               "requires": {
-                "has-flag": "^4.0.0"
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
               }
             }
           }
         },
-        "jest-snapshot": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-          "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+        "string.prototype.trimstart": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
           "dev": true,
           "requires": {
-            "@babel/core": "^7.7.2",
-            "@babel/generator": "^7.7.2",
-            "@babel/plugin-syntax-typescript": "^7.7.2",
-            "@babel/traverse": "^7.7.2",
-            "@babel/types": "^7.0.0",
-            "@jest/transform": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/babel__traverse": "^7.0.4",
-            "@types/prettier": "^2.1.5",
-            "babel-preset-current-node-syntax": "^1.0.0",
-            "chalk": "^4.0.0",
-            "expect": "^27.5.1",
-            "graceful-fs": "^4.2.9",
-            "jest-diff": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "jest-haste-map": "^27.5.1",
-            "jest-matcher-utils": "^27.5.1",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "natural-compare": "^1.4.0",
-            "pretty-format": "^27.5.1",
-            "semver": "^7.3.2"
+            "call-bind": "^1.0.2",
+            "define-properties": "^1.1.4",
+            "es-abstract": "^1.19.5"
           },
           "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "define-properties": {
+              "version": "1.1.4",
+              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
               "dev": true,
               "requires": {
-                "has-flag": "^4.0.0"
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
               }
             }
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+        "unbox-primitive": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
           "dev": true,
           "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "call-bind": "^1.0.2",
+            "has-bigints": "^1.0.2",
+            "has-symbols": "^1.0.3",
+            "which-boxed-primitive": "^1.0.2"
           }
-        },
-        "jest-watcher": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
-          "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
-          "dev": true,
+        }
+      }
+    },
+    "oblivious-set": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
+      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "requires": {
+        "mimic-fn": "^2.1.0"
+      }
+    },
+    "ono": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz",
+      "integrity": "sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==",
+      "requires": {
+        "format-util": "^1.0.3"
+      }
+    },
+    "optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "requires": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      }
+    },
+    "ora": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+      "dev": true,
+      "requires": {
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
+    "parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      }
+    },
+    "parse-ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
+      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA=="
+    },
+    "parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
+    },
+    "pirates": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
+      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "requires": {
+        "find-up": "^4.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
           "requires": {
-            "@jest/test-result": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "ansi-escapes": "^4.2.1",
-            "chalk": "^4.0.0",
-            "jest-util": "^27.5.1",
-            "string-length": "^4.0.1"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "chalk": {
-              "version": "4.1.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-              }
-            },
-            "color-convert": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-              "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-              "dev": true,
-              "requires": {
-                "color-name": "~1.1.4"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
           }
         },
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
         },
-        "node-releases": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz",
-          "integrity": "sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==",
-          "dev": true
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
         },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
           "requires": {
-            "lru-cache": "^6.0.0"
+            "p-limit": "^2.2.0"
           }
         },
-        "strip-bom": {
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "path-exists": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+        }
+      }
+    },
+    "postcss": {
+      "version": "8.4.13",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
+      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
+      "requires": {
+        "nanoid": "^3.3.3",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+    },
+    "prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
+    },
+    "prettier": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
+      "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
+      "dev": true
+    },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
+    "pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "requires": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
+        "react-is": {
+          "version": "17.0.2",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+        }
+      }
+    },
+    "pretty-ms": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
+      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
+      "requires": {
+        "parse-ms": "^2.1.0"
+      }
+    },
+    "prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "requires": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      }
+    },
+    "prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
+      }
+    },
+    "property-expr": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.4.tgz",
+      "integrity": "sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg=="
+    },
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "querystring": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
+      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="
+    },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
+    "react": {
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.1.0.tgz",
+      "integrity": "sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==",
+      "requires": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "react-ace": {
+      "version": "9.5.0",
+      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.5.0.tgz",
+      "integrity": "sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==",
+      "requires": {
+        "ace-builds": "^1.4.13",
+        "diff-match-patch": "^1.0.5",
+        "lodash.get": "^4.4.2",
+        "lodash.isequal": "^4.5.0",
+        "prop-types": "^15.7.2"
+      },
+      "dependencies": {
+        "ace-builds": {
+          "version": "1.4.13",
+          "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
+          "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
+        }
+      }
+    },
+    "react-datepicker": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.5.0.tgz",
+      "integrity": "sha512-mFP/SbtFSXx21Wx3Nfv+RREwd/x0q14x7QL79ZCi/PVkHSFLwLWhXyOtj3OIzi1AcVYb/fMMcvi8e5b12n8/sg==",
+      "requires": {
+        "@popperjs/core": "^2.9.2",
+        "classnames": "^2.2.6",
+        "date-fns": "^2.24.0",
+        "prop-types": "^15.7.2",
+        "react-onclickoutside": "^6.12.0",
+        "react-popper": "^2.2.5"
+      },
+      "dependencies": {
+        "date-fns": {
+          "version": "2.27.0",
+          "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz",
+          "integrity": "sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q=="
+        }
+      }
+    },
+    "react-dom": {
+      "version": "18.1.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.1.0.tgz",
+      "integrity": "sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==",
+      "requires": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.22.0"
+      }
+    },
+    "react-fast-compare": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
+      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
+    },
+    "react-hook-form": {
+      "version": "7.6.9",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.6.9.tgz",
+      "integrity": "sha512-nz+btC4WFIm3zPBjw22K3t9nnJtlMMwj8slcbPYoTKlkSVA5l+q3Ai+VF0YzeRi7vbyyeGQvpyibov1xd/TV7A==",
+      "requires": {}
+    },
+    "react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+    },
+    "react-multi-select-component": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/react-multi-select-component/-/react-multi-select-component-4.0.6.tgz",
+      "integrity": "sha512-cNpDv8vh1kWkJiMsa097tTUqWLVTQn+La4aXlgoGOQVpOSH9u1fbj1+MsvnLQjTBySuDx+pzm/DpbIoma/i1Fw==",
+      "requires": {}
+    },
+    "react-onclickoutside": {
+      "version": "6.12.1",
+      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.1.tgz",
+      "integrity": "sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==",
+      "requires": {}
+    },
+    "react-popper": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
+      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
+      "requires": {
+        "react-fast-compare": "^3.0.1",
+        "warning": "^4.0.2"
+      }
+    },
+    "react-query": {
+      "version": "3.39.1",
+      "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",
+      "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",
+      "requires": {
+        "@babel/runtime": "^7.5.5",
+        "broadcast-channel": "^3.4.1",
+        "match-sorter": "^6.0.2"
+      }
+    },
+    "react-redux": {
+      "version": "7.2.6",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz",
+      "integrity": "sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==",
+      "requires": {
+        "@babel/runtime": "^7.15.4",
+        "@types/react-redux": "^7.1.20",
+        "hoist-non-react-statics": "^3.3.2",
+        "loose-envify": "^1.4.0",
+        "prop-types": "^15.7.2",
+        "react-is": "^17.0.2"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+          "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
           "requires": {
-            "has-flag": "^3.0.0"
+            "regenerator-runtime": "^0.13.4"
           }
         },
-        "v8-to-istanbul": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-          "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
-          "dev": true,
+        "@types/react-redux": {
+          "version": "7.1.22",
+          "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
+          "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
           "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.1",
-            "convert-source-map": "^1.6.0",
-            "source-map": "^0.7.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.7.3",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-              "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-              "dev": true
-            }
+            "@types/hoist-non-react-statics": "^3.3.0",
+            "@types/react": "*",
+            "hoist-non-react-statics": "^3.3.0",
+            "redux": "^4.0.0"
           }
         },
-        "write-file-atomic": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-          "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-          "dev": true,
+        "react-is": {
+          "version": "17.0.2",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+        }
+      }
+    },
+    "react-router-dom": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
+      "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
+      "requires": {
+        "history": "^5.2.0",
+        "react-router": "6.3.0"
+      },
+      "dependencies": {
+        "react-router": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
+          "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
           "requires": {
-            "imurmurhash": "^0.1.4",
-            "is-typedarray": "^1.0.0",
-            "signal-exit": "^3.0.2",
-            "typedarray-to-buffer": "^3.1.5"
+            "history": "^5.2.0"
           }
         }
       }
@@ -49739,13 +26237,15 @@
         "picomatch": "^2.2.1"
       }
     },
-    "recursive-readdir": {
+    "recrawl-sync": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
-      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/recrawl-sync/-/recrawl-sync-2.2.2.tgz",
+      "integrity": "sha512-E2sI4F25Fu2nrfV+KsnC7/qfk/spQIYXlonfQoS4rwxeNK5BjxnLPbWiRXHVXPwYBOTWtPX5765kTm/zJiL+LQ==",
       "requires": {
-        "minimatch": "3.0.4"
+        "@cush/relative": "^1.0.0",
+        "glob-regex": "^0.3.0",
+        "slash": "^3.0.0",
+        "tslib": "^1.9.3"
       }
     },
     "redent": {
@@ -49816,12 +26316,6 @@
         "@babel/runtime": "^7.8.4"
       }
     },
-    "regex-parser": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
-      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
-      "dev": true
-    },
     "regexp.prototype.flags": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
@@ -49835,7 +26329,8 @@
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
     },
     "regexpu-core": {
       "version": "5.0.1",
@@ -49874,93 +26369,15 @@
         }
       }
     },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true
-    },
     "remove-accents": {
       "version": "0.4.2",
       "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
       "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
     },
-    "renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dev": true,
-      "requires": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      },
-      "dependencies": {
-        "css-select": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-          "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-          "dev": true,
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-what": "^6.0.1",
-            "domhandler": "^4.3.1",
-            "domutils": "^2.8.0",
-            "nth-check": "^2.0.1"
-          }
-        },
-        "css-what": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-          "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-          "dev": true
-        },
-        "dom-serializer": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-          "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-          "dev": true,
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "domhandler": "^4.2.0",
-            "entities": "^2.0.0"
-          }
-        },
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-          "dev": true
-        },
-        "domutils": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-          "dev": true,
-          "requires": {
-            "dom-serializer": "^1.0.1",
-            "domelementtype": "^2.2.0",
-            "domhandler": "^4.2.0"
-          }
-        },
-        "nth-check": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-          "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-          "dev": true,
-          "requires": {
-            "boolbase": "^1.0.0"
-          }
-        }
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -49973,31 +26390,25 @@
       "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
       "dev": true
     },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
     "reselect": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.5.tgz",
       "integrity": "sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ=="
     },
     "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
     "resolve-cwd": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dev": true,
       "requires": {
         "resolve-from": "^5.0.0"
       },
@@ -50005,52 +26416,20 @@
         "resolve-from": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-          "dev": true
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
         }
       }
     },
     "resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-    },
-    "resolve-url-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
-      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
-      "dev": true,
-      "requires": {
-        "adjust-sourcemap-loader": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.35",
-        "source-map": "0.6.1"
-      },
-      "dependencies": {
-        "picocolors": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-          "dev": true
-        },
-        "postcss": {
-          "version": "7.0.39",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-          "dev": true,
-          "requires": {
-            "picocolors": "^0.2.1",
-            "source-map": "^0.6.1"
-          }
-        }
-      }
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
     },
     "resolve.exports": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-      "dev": true
+      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
     },
     "restore-cursor": {
       "version": "3.1.0",
@@ -50062,12 +26441,6 @@
         "signal-exit": "^3.0.2"
       }
     },
-    "retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "dev": true
-    },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -50092,45 +26465,10 @@
       "version": "2.72.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.72.1.tgz",
       "integrity": "sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==",
-      "dev": true,
       "requires": {
         "fsevents": "~2.3.2"
       }
     },
-    "rollup-plugin-terser": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
-      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "jest-worker": "^26.2.1",
-        "serialize-javascript": "^4.0.0",
-        "terser": "^5.0.0"
-      },
-      "dependencies": {
-        "jest-worker": {
-          "version": "26.6.2",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
-          "dev": true,
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^7.0.0"
-          }
-        },
-        "serialize-javascript": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-          "dev": true,
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        }
-      }
-    },
     "run-async": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
@@ -50172,45 +26510,22 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "sanitize.css": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz",
-      "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==",
-      "dev": true
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.44.0.tgz",
-      "integrity": "sha512-0hLREbHFXGQqls/K8X+koeP+ogFRPF4ZqetVB19b7Cst9Er8cOR0rc6RU7MaI4W1JmUShd1BPgPoeqmmgMMYFw==",
+      "version": "1.52.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz",
+      "integrity": "sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==",
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0"
-      }
-    },
-    "sass-loader": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
-      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
-      "dev": true,
-      "requires": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
       }
     },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
     "saxes": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
       "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dev": true,
       "requires": {
         "xmlchars": "^2.2.0"
       }
@@ -50223,167 +26538,14 @@
         "loose-envify": "^1.1.0"
       }
     },
-    "schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        }
-      }
-    },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-      "dev": true
-    },
-    "selfsigned": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz",
-      "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==",
-      "dev": true,
-      "requires": {
-        "node-forge": "^1"
-      }
-    },
     "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true
-    },
-    "send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        }
-      }
-    },
-    "serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "depd": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-          "dev": true
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-          "dev": true,
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-          "dev": true
-        },
-        "statuses": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-          "dev": true
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-      "dev": true,
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
       "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "lru-cache": "^6.0.0"
       }
     },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-      "dev": true
-    },
     "shallowequal": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
@@ -50402,16 +26564,11 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
-    "shell-quote": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
-      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
-      "dev": true
-    },
     "side-channel": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -50421,20 +26578,17 @@
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
     },
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
     "slice-ansi": {
       "version": "4.0.0",
@@ -50447,56 +26601,15 @@
         "is-fullwidth-code-point": "^3.0.0"
       }
     },
-    "sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dev": true,
-      "requires": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-js": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true
-    },
-    "source-map-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz",
-      "integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.5",
-        "iconv-lite": "^0.6.3",
-        "source-map-js": "^1.0.1"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        }
-      }
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
     },
     "source-map-resolve": {
       "version": "0.6.0",
@@ -50510,103 +26623,28 @@
     },
     "source-map-support": {
       "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
-      "dev": true
-    },
-    "spawn-command": {
-      "version": "0.0.2-1",
-      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
-      "dev": true
-    },
-    "spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
       }
     },
+    "spawn-command": {
+      "version": "0.0.2-1",
+      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
+      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
+      "dev": true
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
     "stack-utils": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
       "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-      "dev": true,
       "requires": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -50614,23 +26652,10 @@
         "escape-string-regexp": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-          "dev": true
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
         }
       }
     },
-    "stackframe": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.1.tgz",
-      "integrity": "sha512-h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg==",
-      "dev": true
-    },
-    "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "dev": true
-    },
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -50650,7 +26675,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dev": true,
       "requires": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -50666,7 +26690,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -50770,17 +26793,6 @@
         "define-properties": "^1.1.3"
       }
     },
-    "stringify-object": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-      "dev": true,
-      "requires": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -50794,17 +26806,10 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
       "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
     },
-    "strip-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
-      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
-      "dev": true
-    },
     "strip-final-newline": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
     },
     "strip-indent": {
       "version": "3.0.0",
@@ -50820,13 +26825,6 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
-    "style-loader": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "dev": true,
-      "requires": {}
-    },
     "styled-components": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.1.tgz",
@@ -50859,16 +26857,6 @@
         }
       }
     },
-    "stylehacks": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz",
-      "integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.16.6",
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
     "supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -50881,7 +26869,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
       "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-      "dev": true,
       "requires": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
@@ -50892,293 +26879,24 @@
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
     },
-    "svg-parser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
-      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
-      "dev": true
-    },
-    "svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
     "symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "tailwindcss": {
-      "version": "3.0.24",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.24.tgz",
-      "integrity": "sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==",
-      "dev": true,
-      "requires": {
-        "arg": "^5.0.1",
-        "chokidar": "^3.5.3",
-        "color-name": "^1.1.4",
-        "detective": "^5.2.0",
-        "didyoumean": "^1.2.2",
-        "dlv": "^1.1.3",
-        "fast-glob": "^3.2.11",
-        "glob-parent": "^6.0.2",
-        "is-glob": "^4.0.3",
-        "lilconfig": "^2.0.5",
-        "normalize-path": "^3.0.0",
-        "object-hash": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.12",
-        "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.4",
-        "postcss-nested": "5.0.6",
-        "postcss-selector-parser": "^6.0.10",
-        "postcss-value-parser": "^4.2.0",
-        "quick-lru": "^5.1.1",
-        "resolve": "^1.22.0"
-      },
-      "dependencies": {
-        "arg": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz",
-          "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==",
-          "dev": true
-        },
-        "chokidar": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-          "dev": true,
-          "requires": {
-            "anymatch": "~3.1.2",
-            "braces": "~3.0.2",
-            "fsevents": "~2.3.2",
-            "glob-parent": "~5.1.2",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.6.0"
-          },
-          "dependencies": {
-            "glob-parent": {
-              "version": "5.1.2",
-              "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-              "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-              "dev": true,
-              "requires": {
-                "is-glob": "^4.0.1"
-              }
-            }
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "glob-parent": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.3"
-          }
-        },
-        "is-core-module": {
-          "version": "2.9.0",
-          "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-          "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-          "dev": true,
-          "requires": {
-            "has": "^1.0.3"
-          }
-        },
-        "lilconfig": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-          "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
-          "dev": true
-        },
-        "object-hash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-          "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-          "dev": true
-        },
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        },
-        "resolve": {
-          "version": "1.22.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-          "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.8.1",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "dev": true
-    },
-    "temp-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
-      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
-      "dev": true
-    },
-    "tempy": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz",
-      "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
-      "dev": true,
-      "requires": {
-        "is-stream": "^2.0.0",
-        "temp-dir": "^2.0.0",
-        "type-fest": "^0.16.0",
-        "unique-string": "^2.0.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.16.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-          "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
-          "dev": true
-        }
-      }
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "terminal-link": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
       "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dev": true,
       "requires": {
         "ansi-escapes": "^4.2.1",
         "supports-hyperlinks": "^2.0.0"
       }
     },
-    "terser": {
-      "version": "5.13.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.13.1.tgz",
-      "integrity": "sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.5.0",
-        "commander": "^2.20.0",
-        "source-map": "~0.8.0-beta.0",
-        "source-map-support": "~0.5.20"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.8.0-beta.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
-          "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
-          "dev": true,
-          "requires": {
-            "whatwg-url": "^7.0.0"
-          }
-        },
-        "whatwg-url": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-          "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-          "dev": true,
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz",
-      "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==",
-      "dev": true,
-      "requires": {
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1",
-        "terser": "^5.7.2"
-      }
-    },
     "test-exclude": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
       "requires": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -51188,13 +26906,13 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
     },
     "throat": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
-      "dev": true
+      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
     },
     "through": {
       "version": "2.3.8",
@@ -51202,12 +26920,6 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -51220,8 +26932,7 @@
     "tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
     },
     "to-fast-properties": {
       "version": "2.0.0",
@@ -51236,12 +26947,6 @@
         "is-number": "^7.0.0"
       }
     },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "dev": true
-    },
     "toposort": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
@@ -51251,7 +26956,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
       "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-      "dev": true,
       "requires": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -51261,8 +26965,7 @@
         "universalify": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-          "dev": true
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
         }
       }
     },
@@ -51280,12 +26983,6 @@
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true
     },
-    "tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
-      "dev": true
-    },
     "ts-jest": {
       "version": "28.0.3",
       "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.3.tgz",
@@ -51307,15 +27004,6 @@
           "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
           "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
           "dev": true
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
         }
       }
     },
@@ -51323,7 +27011,7 @@
       "version": "10.8.0",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.0.tgz",
       "integrity": "sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -51344,7 +27032,7 @@
           "version": "8.2.0",
           "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
           "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-          "dev": true
+          "devOptional": true
         }
       }
     },
@@ -51352,6 +27040,7 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
       "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
       "requires": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.1",
@@ -51362,8 +27051,7 @@
     "tslib": {
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
-      "dev": true
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
     },
     "tsutils": {
       "version": "3.21.0",
@@ -51378,6 +27066,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
       "requires": {
         "prelude-ls": "^1.2.1"
       }
@@ -51385,29 +27074,18 @@
     "type-detect": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
     },
     "type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true
     },
     "typedarray-to-buffer": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
       "requires": {
         "is-typedarray": "^1.0.0"
       }
@@ -51416,7 +27094,7 @@
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
       "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
-      "dev": true
+      "devOptional": true
     },
     "unbox-primitive": {
       "version": "1.0.1",
@@ -51458,15 +27136,6 @@
       "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
       "dev": true
     },
-    "unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "requires": {
-        "crypto-random-string": "^2.0.0"
-      }
-    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -51482,24 +27151,6 @@
         "detect-node": "^2.0.4"
       }
     },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
-    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -51520,30 +27171,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      }
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
     "uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -51552,37 +27179,89 @@
     "v8-compile-cache": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
     },
     "v8-compile-cache-lib": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
+      "devOptional": true
     },
     "v8-to-istanbul": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.0.tgz",
-      "integrity": "sha512-HcvgY/xaRm7isYmyx+lFKA4uQmfUbN0J4M0nNItvzTvH/iQ9kW5j/t4YSR+Ge323/lrgDAWJoF46tzGQHwBHFw==",
-      "dev": true,
-      "peer": true,
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
+      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
       "requires": {
-        "@jridgewell/trace-mapping": "^0.3.7",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0"
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.7.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+          "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
+        }
       }
     },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true
+    "vite": {
+      "version": "2.9.11",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.11.tgz",
+      "integrity": "sha512-h1n8bAN5Psv/V+RAY3P6OtYyGSFQdusgYWiLRAk41qY7rSyH4K5Jq+RUXztzyPVB0oHbnXPUuS2Aj44jucViUA==",
+      "requires": {
+        "esbuild": "^0.14.27",
+        "fsevents": "~2.3.2",
+        "postcss": "^8.4.13",
+        "resolve": "^1.22.0",
+        "rollup": "^2.59.0"
+      }
+    },
+    "vite-tsconfig-paths": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-3.5.0.tgz",
+      "integrity": "sha512-NKIubr7gXgh/3uniQaOytSg+aKWPrjquP6anAy+zCWEn6h9fB8z2/qdlfQrTgZWaXJ2pHVlllrSdRZltHn9P4g==",
+      "requires": {
+        "debug": "^4.1.1",
+        "globrex": "^0.1.2",
+        "recrawl-sync": "^2.0.3",
+        "tsconfig-paths": "^4.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "json5": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "tsconfig-paths": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz",
+          "integrity": "sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==",
+          "requires": {
+            "json5": "^2.2.1",
+            "minimist": "^1.2.6",
+            "strip-bom": "^3.0.0"
+          }
+        }
+      }
     },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "dev": true,
       "requires": {
         "browser-process-hrtime": "^1.0.0"
       }
@@ -51591,7 +27270,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
       "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-      "dev": true,
       "requires": {
         "xml-name-validator": "^3.0.0"
       }
@@ -51600,7 +27278,6 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
       "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-      "dev": true,
       "requires": {
         "makeerror": "1.0.x"
       }
@@ -51613,25 +27290,6 @@
         "loose-envify": "^1.0.0"
       }
     },
-    "watchpack": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-      "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
-      "dev": true,
-      "requires": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
     "wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
@@ -51646,227 +27304,10 @@
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
-    "webpack": {
-      "version": "5.72.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz",
-      "integrity": "sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "acorn": "^8.4.1",
-        "acorn-import-assertions": "^1.7.6",
-        "browserslist": "^4.14.5",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.9.3",
-        "es-module-lexer": "^0.9.0",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
-        "webpack-sources": "^3.2.3"
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz",
-      "integrity": "sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==",
-      "dev": true,
-      "requires": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.1",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "dependencies": {
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "colorette": {
-          "version": "2.0.16",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-          "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        }
-      }
-    },
-    "webpack-dev-server": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz",
-      "integrity": "sha512-+Nlb39iQSOSsFv0lWUuUTim3jDQO8nhK3E68f//J2r5rIcp4lULHXz2oZ0UVdEeWXEh5lSzYUlzarZhDAeAVQw==",
-      "dev": true,
-      "requires": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.0.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.4.2"
-      },
-      "dependencies": {
-        "@types/ws": {
-          "version": "8.5.3",
-          "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-          "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
-          "dev": true,
-          "requires": {
-            "@types/node": "*"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "chokidar": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-          "dev": true,
-          "requires": {
-            "anymatch": "~3.1.2",
-            "braces": "~3.0.2",
-            "fsevents": "~2.3.2",
-            "glob-parent": "~5.1.2",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.6.0"
-          }
-        },
-        "colorette": {
-          "version": "2.0.16",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-          "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        },
-        "ws": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
-          "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
-    "webpack-manifest-plugin": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
-      "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==",
-      "dev": true,
-      "requires": {
-        "tapable": "^2.0.0",
-        "webpack-sources": "^2.2.0"
-      },
-      "dependencies": {
-        "webpack-sources": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-          "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.1",
-            "source-map": "^0.6.1"
-          }
-        }
-      }
-    },
-    "webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "dev": true
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "dev": true
-    },
     "whatwg-encoding": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
       "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dev": true,
       "requires": {
         "iconv-lite": "0.4.24"
       }
@@ -51874,14 +27315,12 @@
     "whatwg-fetch": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
-      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==",
-      "dev": true
+      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
     },
     "whatwg-mimetype": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
     },
     "whatwg-url": {
       "version": "6.5.0",
@@ -51905,6 +27344,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
       "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
       "requires": {
         "is-bigint": "^1.0.1",
         "is-boolean-object": "^1.1.0",
@@ -51918,258 +27358,10 @@
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
     },
-    "workbox-background-sync": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.3.tgz",
-      "integrity": "sha512-0DD/V05FAcek6tWv9XYj2w5T/plxhDSpclIcAGjA/b7t/6PdaRkQ7ZgtAX6Q/L7kV7wZ8uYRJUoH11VjNipMZw==",
-      "dev": true,
-      "requires": {
-        "idb": "^6.1.4",
-        "workbox-core": "6.5.3"
-      }
-    },
-    "workbox-broadcast-update": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.3.tgz",
-      "integrity": "sha512-4AwCIA5DiDrYhlN+Miv/fp5T3/whNmSL+KqhTwRBTZIL6pvTgE4lVuRzAt1JltmqyMcQ3SEfCdfxczuI4kwFQg==",
-      "dev": true,
-      "requires": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "workbox-build": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.3.tgz",
-      "integrity": "sha512-8JNHHS7u13nhwIYCDea9MNXBNPHXCs5KDZPKI/ZNTr3f4sMGoD7hgFGecbyjX1gw4z6e9bMpMsOEJNyH5htA/w==",
-      "dev": true,
-      "requires": {
-        "@apideck/better-ajv-errors": "^0.3.1",
-        "@babel/core": "^7.11.1",
-        "@babel/preset-env": "^7.11.0",
-        "@babel/runtime": "^7.11.2",
-        "@rollup/plugin-babel": "^5.2.0",
-        "@rollup/plugin-node-resolve": "^11.2.1",
-        "@rollup/plugin-replace": "^2.4.1",
-        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
-        "ajv": "^8.6.0",
-        "common-tags": "^1.8.0",
-        "fast-json-stable-stringify": "^2.1.0",
-        "fs-extra": "^9.0.1",
-        "glob": "^7.1.6",
-        "lodash": "^4.17.20",
-        "pretty-bytes": "^5.3.0",
-        "rollup": "^2.43.1",
-        "rollup-plugin-terser": "^7.0.0",
-        "source-map": "^0.8.0-beta.0",
-        "stringify-object": "^3.3.0",
-        "strip-comments": "^2.0.1",
-        "tempy": "^0.6.0",
-        "upath": "^1.2.0",
-        "workbox-background-sync": "6.5.3",
-        "workbox-broadcast-update": "6.5.3",
-        "workbox-cacheable-response": "6.5.3",
-        "workbox-core": "6.5.3",
-        "workbox-expiration": "6.5.3",
-        "workbox-google-analytics": "6.5.3",
-        "workbox-navigation-preload": "6.5.3",
-        "workbox-precaching": "6.5.3",
-        "workbox-range-requests": "6.5.3",
-        "workbox-recipes": "6.5.3",
-        "workbox-routing": "6.5.3",
-        "workbox-strategies": "6.5.3",
-        "workbox-streams": "6.5.3",
-        "workbox-sw": "6.5.3",
-        "workbox-window": "6.5.3"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-          "dev": true,
-          "requires": {
-            "at-least-node": "^1.0.0",
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "source-map": {
-          "version": "0.8.0-beta.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
-          "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
-          "dev": true,
-          "requires": {
-            "whatwg-url": "^7.0.0"
-          }
-        },
-        "whatwg-url": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-          "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-          "dev": true,
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        }
-      }
-    },
-    "workbox-cacheable-response": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.3.tgz",
-      "integrity": "sha512-6JE/Zm05hNasHzzAGKDkqqgYtZZL2H06ic2GxuRLStA4S/rHUfm2mnLFFXuHAaGR1XuuYyVCEey1M6H3PdZ7SQ==",
-      "dev": true,
-      "requires": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "workbox-core": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.3.tgz",
-      "integrity": "sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q==",
-      "dev": true
-    },
-    "workbox-expiration": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.3.tgz",
-      "integrity": "sha512-jzYopYR1zD04ZMdlbn/R2Ik6ixiXbi15c9iX5H8CTi6RPDz7uhvMLZPKEndZTpfgmUk8mdmT9Vx/AhbuCl5Sqw==",
-      "dev": true,
-      "requires": {
-        "idb": "^6.1.4",
-        "workbox-core": "6.5.3"
-      }
-    },
-    "workbox-google-analytics": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.3.tgz",
-      "integrity": "sha512-3GLCHotz5umoRSb4aNQeTbILETcrTVEozSfLhHSBaegHs1PnqCmN0zbIy2TjTpph2AGXiNwDrWGF0AN+UgDNTw==",
-      "dev": true,
-      "requires": {
-        "workbox-background-sync": "6.5.3",
-        "workbox-core": "6.5.3",
-        "workbox-routing": "6.5.3",
-        "workbox-strategies": "6.5.3"
-      }
-    },
-    "workbox-navigation-preload": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.3.tgz",
-      "integrity": "sha512-bK1gDFTc5iu6lH3UQ07QVo+0ovErhRNGvJJO/1ngknT0UQ702nmOUhoN9qE5mhuQSrnK+cqu7O7xeaJ+Rd9Tmg==",
-      "dev": true,
-      "requires": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "workbox-precaching": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.3.tgz",
-      "integrity": "sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ==",
-      "dev": true,
-      "requires": {
-        "workbox-core": "6.5.3",
-        "workbox-routing": "6.5.3",
-        "workbox-strategies": "6.5.3"
-      }
-    },
-    "workbox-range-requests": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz",
-      "integrity": "sha512-pGCP80Bpn/0Q0MQsfETSfmtXsQcu3M2QCJwSFuJ6cDp8s2XmbUXkzbuQhCUzKR86ZH2Vex/VUjb2UaZBGamijA==",
-      "dev": true,
-      "requires": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "workbox-recipes": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.3.tgz",
-      "integrity": "sha512-IcgiKYmbGiDvvf3PMSEtmwqxwfQ5zwI7OZPio3GWu4PfehA8jI8JHI3KZj+PCfRiUPZhjQHJ3v1HbNs+SiSkig==",
-      "dev": true,
-      "requires": {
-        "workbox-cacheable-response": "6.5.3",
-        "workbox-core": "6.5.3",
-        "workbox-expiration": "6.5.3",
-        "workbox-precaching": "6.5.3",
-        "workbox-routing": "6.5.3",
-        "workbox-strategies": "6.5.3"
-      }
-    },
-    "workbox-routing": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.3.tgz",
-      "integrity": "sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg==",
-      "dev": true,
-      "requires": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "workbox-strategies": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.3.tgz",
-      "integrity": "sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w==",
-      "dev": true,
-      "requires": {
-        "workbox-core": "6.5.3"
-      }
-    },
-    "workbox-streams": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.3.tgz",
-      "integrity": "sha512-vN4Qi8o+b7zj1FDVNZ+PlmAcy1sBoV7SC956uhqYvZ9Sg1fViSbOpydULOssVJ4tOyKRifH/eoi6h99d+sJ33w==",
-      "dev": true,
-      "requires": {
-        "workbox-core": "6.5.3",
-        "workbox-routing": "6.5.3"
-      }
-    },
-    "workbox-sw": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.3.tgz",
-      "integrity": "sha512-BQBzm092w+NqdIEF2yhl32dERt9j9MDGUTa2Eaa+o3YKL4Qqw55W9yQC6f44FdAHdAJrJvp0t+HVrfh8AiGj8A==",
-      "dev": true
-    },
-    "workbox-webpack-plugin": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.3.tgz",
-      "integrity": "sha512-Es8Xr02Gi6Kc3zaUwR691ZLy61hz3vhhs5GztcklQ7kl5k2qAusPh0s6LF3wEtlpfs9ZDErnmy5SErwoll7jBA==",
-      "dev": true,
-      "requires": {
-        "fast-json-stable-stringify": "^2.1.0",
-        "pretty-bytes": "^5.4.1",
-        "upath": "^1.2.0",
-        "webpack-sources": "^1.4.3",
-        "workbox-build": "6.5.3"
-      },
-      "dependencies": {
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
-      }
-    },
-    "workbox-window": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.3.tgz",
-      "integrity": "sha512-GnJbx1kcKXDtoJBVZs/P7ddP0Yt52NNy4nocjBpYPiRhMqTpJCNrSL+fGHZ/i/oP6p/vhE8II0sA6AZGKGnssw==",
-      "dev": true,
-      "requires": {
-        "@types/trusted-types": "^2.0.2",
-        "workbox-core": "6.5.3"
-      }
-    },
     "wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -52182,21 +27374,20 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
-      "dev": true,
-      "peer": true,
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "requires": {
         "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
       }
     },
     "ws": {
       "version": "7.5.8",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz",
       "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==",
-      "dev": true,
       "requires": {}
     },
     "xml": {
@@ -52208,32 +27399,22 @@
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-      "dev": true
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
     },
     "xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
     "y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "yaml": {
       "version": "1.10.2",
@@ -52245,7 +27426,6 @@
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
       "requires": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -52259,20 +27439,13 @@
     "yargs-parser": {
       "version": "20.2.7",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-      "dev": true
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="
     },
     "yn": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
+      "devOptional": true
     },
     "yup": {
       "version": "0.32.11",
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index c997b4de036..6f2e54f4c58 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -4,6 +4,7 @@
   "homepage": "./",
   "private": true,
   "dependencies": {
+    "@babel/core": "^7.16.0",
     "@fortawesome/fontawesome-free": "^6.1.1",
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
@@ -11,14 +12,16 @@
     "@rooks/use-outside-click-ref": "^4.10.1",
     "@testing-library/react": "^13.2.0",
     "@types/yup": "^0.29.13",
+    "@vitejs/plugin-react": "^1.3.2",
     "ace-builds": "^1.4.12",
     "ajv": "^8.6.3",
+    "babel-jest": "^27.4.2",
     "bulma": "^0.9.3",
     "classnames": "^2.2.6",
     "dayjs": "^1.11.2",
-    "eslint-import-resolver-node": "^0.3.6",
-    "eslint-import-resolver-typescript": "^2.7.1",
     "fetch-mock": "^9.11.0",
+    "jest": "^27.4.3",
+    "jest-watch-typeahead": "^1.0.0",
     "json-schema-faker": "^0.5.0-rcv.39",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.1",
@@ -34,28 +37,31 @@
     "react-router-dom": "^6.3.0",
     "redux": "^4.1.1",
     "redux-thunk": "^2.3.0",
-    "sass": "^1.43.4",
+    "sass": "^1.52.3",
     "styled-components": "^5.3.1",
     "use-debounce": "^8.0.1",
     "uuid": "^8.3.1",
+    "vite": "^2.9.11",
+    "vite-tsconfig-paths": "^3.5.0",
+    "whatwg-fetch": "^3.6.2",
     "yup": "^0.32.9"
   },
   "lint-staged": {
     "*.{js,ts,jsx,tsx}": [
-      "eslint -c .eslintrc.json --fix",
+      "eslint --fix",
       "npm test -- --bail --findRelatedTests --watchAll=false"
     ]
   },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "vite",
     "gen:sources": "rimraf src/generated-sources && openapi-generator-cli generate",
-    "build": "react-scripts build",
+    "build": "vite build",
     "lint": "eslint --ext .tsx,.ts src/",
     "lint:fix": "eslint --ext .tsx,.ts src/ --fix",
     "lint:CI": "eslint --ext .tsx,.ts src/ --max-warnings=0",
-    "test": "react-scripts test",
-    "test:CI": "CI=true npm test  -- --coverage --ci --testResultsProcessor=\"jest-sonar-reporter\" --watchAll=false",
-    "eject": "react-scripts eject",
+    "test": "jest --watch",
+    "test:coverage": "jest --watchAll --coverage",
+    "test:CI": "CI=true npm run test:coverage -- --ci --testResultsProcessor=\"jest-sonar-reporter\" --watchAll=false",
     "tsc": "tsc",
     "prepare": "cd .. && husky install kafka-ui-react-app/.husky",
     "pre-commit": "npm run tsc --noEmit && lint-staged"
@@ -63,19 +69,10 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
   "devDependencies": {
+    "@babel/preset-env": "^7.18.2",
+    "@babel/preset-react": "^7.17.12",
+    "@babel/preset-typescript": "^7.17.12",
     "@jest/types": "^28.1.0",
     "@openapitools/openapi-generator-cli": "^2.5.1",
     "@testing-library/dom": "^8.11.1",
@@ -96,10 +93,13 @@
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.27.0",
     "dotenv": "^16.0.1",
-    "eslint": "^8.15.0",
+    "eslint": "^8.3.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.0",
+    "eslint-config-react-app": "^7.0.1",
+    "eslint-import-resolver-node": "^0.3.6",
+    "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest-dom": "^4.0.2",
     "eslint-plugin-jsx-a11y": "^6.5.1",
@@ -107,13 +107,11 @@
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.5.0",
     "fetch-mock-jest": "^1.5.1",
-    "http-proxy-middleware": "^2.0.6",
     "husky": "^7.0.1",
     "jest-sonar-reporter": "^2.0.0",
     "jest-styled-components": "^7.0.8",
     "lint-staged": "^12.1.2",
     "prettier": "^2.3.1",
-    "react-scripts": "5.0.1",
     "redux-mock-store": "^1.5.4",
     "rimraf": "^3.0.2",
     "ts-jest": "^28.0.3",
diff --git a/kafka-ui-react-app/sonar-project.properties b/kafka-ui-react-app/sonar-project.properties
index cea009d27a0..5a35045817f 100644
--- a/kafka-ui-react-app/sonar-project.properties
+++ b/kafka-ui-react-app/sonar-project.properties
@@ -2,7 +2,7 @@ sonar.projectKey=com.provectus:kafka-ui_frontend
 sonar.organization=provectus
 
 sonar.sources=.
-sonar.exclusions=**/__tests__/**,**/__test__/**,src/serviceWorker.ts,src/setupTests.ts,src/setupProxy.js,**/fixtures.ts,src/lib/testHelpers.tsx,src/index.tsx
+sonar.exclusions=**/__tests__/**,**/__test__/**,src/serviceWorker.ts,src/setupTests.ts,src/setupProxy.js,**/fixtures.ts,src/lib/testHelpers.tsx,src/index.tsx,vite.config.ts,config/**
 
 sonar.typescript.lcov.reportPaths=./coverage/lcov.info
 sonar.testExecutionReportPaths=./test-report.xml
diff --git a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
index f4da3e984a2..1f13a5b2eb7 100644
--- a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
@@ -18,18 +18,21 @@ import {
   clusterTopicsRelativePath,
   getNonExactPath,
 } from 'lib/paths';
-import Brokers from 'components/Brokers/Brokers';
-import Topics from 'components/Topics/Topics';
-import Schemas from 'components/Schemas/Schemas';
-import Connect from 'components/Connect/Connect';
 import ClusterContext from 'components/contexts/ClusterContext';
-import ConsumersGroups from 'components/ConsumerGroups/ConsumerGroups';
-import KsqlDb from 'components/KsqlDb/KsqlDb';
 import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb';
 import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 import { BreadcrumbProvider } from 'components/common/Breadcrumb/Breadcrumb.provider';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 
+const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
+const Topics = React.lazy(() => import('components/Topics/Topics'));
+const Schemas = React.lazy(() => import('components/Schemas/Schemas'));
+const Connect = React.lazy(() => import('components/Connect/Connect'));
+const KsqlDb = React.lazy(() => import('components/KsqlDb/KsqlDb'));
+const ConsumerGroups = React.lazy(
+  () => import('components/ConsumerGroups/ConsumerGroups')
+);
+
 const Cluster: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const isReadOnly = useSelector(getClustersReadonlyStatus(clusterName));
@@ -87,7 +90,7 @@ const Cluster: React.FC = () => {
               path={getNonExactPath(clusterConsumerGroupsRelativePath)}
               element={
                 <BreadcrumbRoute>
-                  <ConsumersGroups />
+                  <ConsumerGroups />
                 </BreadcrumbRoute>
               }
             />
diff --git a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
index b41f17b369b..24d0b6a73be 100644
--- a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
@@ -59,19 +59,19 @@ describe('Cluster', () => {
     await act(() => renderComponent(clusterBrokersPath('second')));
     expect(screen.getByText(CLusterCompText.Brokers)).toBeInTheDocument();
   });
-  it('renders Topics', () => {
-    renderComponent(clusterTopicsPath('second'));
+  it('renders Topics', async () => {
+    await act(() => renderComponent(clusterTopicsPath('second')));
     expect(screen.getByText(CLusterCompText.Topics)).toBeInTheDocument();
   });
-  it('renders ConsumerGroups', () => {
-    renderComponent(clusterConsumerGroupsPath('second'));
+  it('renders ConsumerGroups', async () => {
+    await act(() => renderComponent(clusterConsumerGroupsPath('second')));
     expect(
       screen.getByText(CLusterCompText.ConsumerGroups)
     ).toBeInTheDocument();
   });
 
   describe('configured features', () => {
-    it('does not render Schemas if SCHEMA_REGISTRY is not configured', () => {
+    it('does not render Schemas if SCHEMA_REGISTRY is not configured', async () => {
       store.dispatch(
         fetchClusters.fulfilled(
           [
@@ -83,7 +83,7 @@ describe('Cluster', () => {
           '123'
         )
       );
-      renderComponent(clusterSchemasPath('second'));
+      await act(() => renderComponent(clusterSchemasPath('second')));
       expect(
         screen.queryByText(CLusterCompText.Schemas)
       ).not.toBeInTheDocument();
@@ -100,7 +100,9 @@ describe('Cluster', () => {
           '123'
         )
       );
-      renderComponent(clusterSchemasPath(onlineClusterPayload.name));
+      await act(() =>
+        renderComponent(clusterSchemasPath(onlineClusterPayload.name))
+      );
       expect(screen.getByText(CLusterCompText.Schemas)).toBeInTheDocument();
     });
     it('renders Connect if KAFKA_CONNECT is configured', async () => {
@@ -115,7 +117,9 @@ describe('Cluster', () => {
           'requestId'
         )
       );
-      renderComponent(clusterConnectsPath(onlineClusterPayload.name));
+      await act(() =>
+        renderComponent(clusterConnectsPath(onlineClusterPayload.name))
+      );
       expect(screen.getByText(CLusterCompText.Connect)).toBeInTheDocument();
     });
     it('renders KSQL if KSQL_DB is configured', async () => {
@@ -130,7 +134,9 @@ describe('Cluster', () => {
           'requestId'
         )
       );
-      renderComponent(clusterKsqlDbPath(onlineClusterPayload.name));
+      await act(() =>
+        renderComponent(clusterKsqlDbPath(onlineClusterPayload.name))
+      );
       expect(screen.getByText(CLusterCompText.KsqlDb)).toBeInTheDocument();
     });
   });
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
index e921609c1a4..883384b806c 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { chunk } from 'lodash';
-import { v4 } from 'uuid';
 import * as Metrics from 'components/common/Metrics';
 import { Cluster } from 'generated-sources';
 import { Tag } from 'components/common/Tag/Tag.styled';
@@ -19,11 +18,6 @@ interface Props {
   offlineClusters: Cluster[];
 }
 
-interface ChunkItem {
-  id: string;
-  data: Cluster[];
-}
-
 const ClustersWidget: React.FC<Props> = ({
   clusters,
   onlineClusters,
@@ -31,17 +25,11 @@ const ClustersWidget: React.FC<Props> = ({
 }) => {
   const [showOfflineOnly, setShowOfflineOnly] = React.useState<boolean>(false);
 
-  const clusterList: ChunkItem[] = React.useMemo(() => {
-    let list = clusters;
-
+  const clusterList = React.useMemo(() => {
     if (showOfflineOnly) {
-      list = offlineClusters;
+      return chunk(offlineClusters, 2);
     }
-
-    return chunk(list, 2).map((data) => ({
-      id: v4(),
-      data,
-    }));
+    return chunk(clusters, 2);
   }, [clusters, offlineClusters, showOfflineOnly]);
 
   const handleSwitch = () => setShowOfflineOnly(!showOfflineOnly);
@@ -69,7 +57,7 @@ const ClustersWidget: React.FC<Props> = ({
         <label>Only offline clusters</label>
       </S.SwitchWrapper>
       {clusterList.map((chunkItem) => (
-        <Table key={chunkItem.id} isFullwidth>
+        <Table key={chunkItem.map(({ name }) => name).join('-')} isFullwidth>
           <thead>
             <tr>
               <TableHeaderCell title="Cluster name" />
@@ -82,7 +70,7 @@ const ClustersWidget: React.FC<Props> = ({
             </tr>
           </thead>
           <tbody>
-            {chunkItem.data.map((cluster) => (
+            {chunkItem.map((cluster) => (
               <tr key={cluster.name}>
                 <S.TableCell maxWidth="99px" width="350">
                   {cluster.readOnly && <Tag color="blue">readonly</Tag>}{' '}
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.tsx
rename to kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx
diff --git a/kafka-ui-react-app/src/index.tsx b/kafka-ui-react-app/src/index.tsx
index 054cb901e96..e312a5d0827 100644
--- a/kafka-ui-react-app/src/index.tsx
+++ b/kafka-ui-react-app/src/index.tsx
@@ -3,7 +3,6 @@ import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import * as serviceWorker from 'serviceWorker';
 import App from 'components/App';
 import { store } from 'redux/store';
 import 'theme/index.scss';
@@ -24,8 +23,3 @@ root.render(
     </BrowserRouter>
   </Provider>
 );
-
-// If you want your app to work offline and load faster, you can change
-// unregister() to register() below. Note this comes with some pitfalls.
-// Learn more about service workers: https://bit.ly/CRA-PWA
-serviceWorker.unregister();
diff --git a/kafka-ui-react-app/src/lib/constants.ts b/kafka-ui-react-app/src/lib/constants.ts
index 37aea99b518..0be9810babe 100644
--- a/kafka-ui-react-app/src/lib/constants.ts
+++ b/kafka-ui-react-app/src/lib/constants.ts
@@ -56,8 +56,8 @@ export const PER_PAGE = 25;
 export const GIT_REPO_LINK = 'https://github.com/provectus/kafka-ui';
 export const GIT_REPO_LATEST_RELEASE_LINK =
   'https://api.github.com/repos/provectus/kafka-ui/releases/latest';
-export const GIT_TAG = process.env.REACT_APP_TAG;
-export const GIT_COMMIT = process.env.REACT_APP_COMMIT;
+export const GIT_TAG = process.env.VITE_TAG;
+export const GIT_COMMIT = process.env.VITE_COMMIT;
 
 export const BREADCRUMB_DEFINITIONS: BreadcrumbDefinitions = {
   Ksqldb: 'ksqlDB',
diff --git a/kafka-ui-react-app/src/react-app-env.d.ts b/kafka-ui-react-app/src/react-app-env.d.ts
index 30da8962982..1f42c255ef2 100644
--- a/kafka-ui-react-app/src/react-app-env.d.ts
+++ b/kafka-ui-react-app/src/react-app-env.d.ts
@@ -1 +1,3 @@
-// / <reference types="react-scripts" />
+/// <reference types="node" />
+/// <reference types="react" />
+/// <reference types="react-dom" />
diff --git a/kafka-ui-react-app/src/serviceWorker.ts b/kafka-ui-react-app/src/serviceWorker.ts
deleted file mode 100644
index f2566365332..00000000000
--- a/kafka-ui-react-app/src/serviceWorker.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-// This optional code is used to register a service worker.
-// register() is not called by default.
-
-// This lets the app load faster on subsequent visits in production, and gives
-// it offline capabilities. However, it also means that developers (and users)
-// will only see deployed updates on subsequent visits to a page, after all the
-// existing tabs open on the page have been closed, since previously cached
-// resources are updated in the background.
-
-// To learn more about the benefits of this model and instructions on how to
-// opt-in, read https://bit.ly/CRA-PWA
-/* eslint-disable no-console */
-
-const isLocalhost = Boolean(
-  window.location.hostname === 'localhost' ||
-    // [::1] is the IPv6 localhost address.
-    window.location.hostname === '[::1]' ||
-    // 127.0.0.0/8 are considered localhost for IPv4.
-    window.location.hostname.match(
-      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
-    )
-);
-
-type Config = {
-  onSuccess?: (registration: ServiceWorkerRegistration) => void;
-  onUpdate?: (registration: ServiceWorkerRegistration) => void;
-};
-
-function registerValidSW(swUrl: string, config?: Config) {
-  navigator.serviceWorker
-    .register(swUrl)
-    .then((registration) => {
-      // eslint-disable-next-line no-param-reassign
-      registration.onupdatefound = () => {
-        const installingWorker = registration.installing;
-        if (installingWorker == null) {
-          return;
-        }
-        installingWorker.onstatechange = () => {
-          if (installingWorker.state === 'installed') {
-            if (navigator.serviceWorker.controller) {
-              // At this point, the updated precached content has been fetched,
-              // but the previous service worker will still serve the older
-              // content until all client tabs are closed.
-              console.log(
-                'New content is available and will be used when all ' +
-                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
-              );
-
-              // Execute callback
-              if (config && config.onUpdate) {
-                config.onUpdate(registration);
-              }
-            } else {
-              // At this point, everything has been precached.
-              // It's the perfect time to display a
-              // "Content is cached for offline use." message.
-              console.log('Content is cached for offline use.');
-
-              // Execute callback
-              if (config && config.onSuccess) {
-                config.onSuccess(registration);
-              }
-            }
-          }
-        };
-      };
-    })
-    .catch((error) => {
-      console.error('Error during service worker registration:', error);
-    });
-}
-
-function checkValidServiceWorker(swUrl: string, config?: Config) {
-  // Check if the service worker can be found. If it can't reload the page.
-  fetch(swUrl, {
-    headers: { 'Service-Worker': 'script' },
-  })
-    .then((response) => {
-      // Ensure service worker exists, and that we really are getting a JS file.
-      const contentType = response.headers.get('content-type');
-      if (
-        response.status === 404 ||
-        (contentType != null && contentType.indexOf('javascript') === -1)
-      ) {
-        // No service worker found. Probably a different app. Reload the page.
-        navigator.serviceWorker.ready.then((registration) => {
-          registration.unregister().then(() => {
-            window.location.reload();
-          });
-        });
-      } else {
-        // Service worker found. Proceed as normal.
-        registerValidSW(swUrl, config);
-      }
-    })
-    .catch(() => {
-      console.log(
-        'No internet connection found. App is running in offline mode.'
-      );
-    });
-}
-
-export function register(config?: Config) {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
-    const url = process.env.PUBLIC_URL || 'localhost';
-    // The URL constructor is available in all browsers that support SW.
-    const publicUrl = new URL(url, window.location.href);
-    if (publicUrl.origin !== window.location.origin) {
-      // Our service worker won't work if PUBLIC_URL is on a different origin
-      // from what our page is served on. This might happen if a CDN is used to
-      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
-      return;
-    }
-
-    window.addEventListener('load', () => {
-      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
-
-      if (isLocalhost) {
-        // This is running on localhost. Let's check if a service worker still exists or not.
-        checkValidServiceWorker(swUrl, config);
-
-        // Add some additional logging to localhost, pointing developers to the
-        // service worker/PWA documentation.
-        navigator.serviceWorker.ready.then(() => {
-          console.log(
-            'This web app is being served cache-first by a service ' +
-              'worker. To learn more, visit https://bit.ly/CRA-PWA'
-          );
-        });
-      } else {
-        // Is not localhost. Just register service worker
-        registerValidSW(swUrl, config);
-      }
-    });
-  }
-}
-
-export function unregister() {
-  if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.ready.then((registration) => {
-      registration.unregister();
-    });
-  }
-}
diff --git a/kafka-ui-react-app/src/setupProxy.js b/kafka-ui-react-app/src/setupProxy.js
deleted file mode 100644
index d6f12e7798a..00000000000
--- a/kafka-ui-react-app/src/setupProxy.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { createProxyMiddleware } = require('http-proxy-middleware');
-
-module.exports = (app) => {
-  if (process.env.DEV_PROXY) {
-    app.use(
-      '/api',
-      createProxyMiddleware({
-        target: process.env.DEV_PROXY,
-        changeOrigin: true,
-        secure: false,
-      })
-    );
-  }
-};
diff --git a/kafka-ui-react-app/src/setupTests.ts b/kafka-ui-react-app/src/setupTests.ts
index ddf707598a1..50c0339dab1 100644
--- a/kafka-ui-react-app/src/setupTests.ts
+++ b/kafka-ui-react-app/src/setupTests.ts
@@ -1,3 +1,4 @@
+import 'whatwg-fetch';
 import 'jest-styled-components';
 import '@testing-library/jest-dom/extend-expect';
 import '@testing-library/jest-dom';
diff --git a/kafka-ui-react-app/tsconfig.json b/kafka-ui-react-app/tsconfig.json
index 71b9322edb2..8af0e99764a 100644
--- a/kafka-ui-react-app/tsconfig.json
+++ b/kafka-ui-react-app/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "esnext",
     "lib": [
       "dom",
       "dom.iterable",
@@ -19,9 +19,12 @@
     "noEmit": true,
     "jsx": "react-jsx",
     "baseUrl": "src",
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "types": ["vite/client"]
   },
   "include": [
     "src",
+    "vite.config.ts",
+    "jest.config.ts",
   ]
 }
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
new file mode 100644
index 00000000000..0d6ff362c6f
--- /dev/null
+++ b/kafka-ui-react-app/vite.config.ts
@@ -0,0 +1,55 @@
+import { defineConfig, loadEnv, UserConfigExport } from 'vite';
+import react from '@vitejs/plugin-react';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig(({ mode }) => {
+  process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
+
+  const defaultConfig: UserConfigExport = {
+    plugins: [react(), tsconfigPaths()],
+    build: {
+      outDir: 'build',
+      rollupOptions: {
+        output: {
+          manualChunks: {
+            venod: [
+              'react',
+              'react-router-dom',
+              'react-dom',
+              'redux',
+              'redux-thunk',
+              'react-redux',
+              'styled-components',
+              'react-ace',
+            ],
+            lodash: ['lodash'],
+          },
+        },
+      },
+    },
+    define: {
+      'process.env.NODE_ENV': `"${mode}"`,
+      'process.env.VITE_TAG': `"${process.env.VITE_TAG}"`,
+      'process.env.GIT_COMMIT': `"${process.env.VITE_COMMIT}"`,
+    },
+  };
+  const proxy = process.env.VITE_DEV_PROXY;
+
+  if (mode === 'development' && proxy) {
+    return {
+      ...defaultConfig,
+      server: {
+        open: true,
+        proxy: {
+          '/api': {
+            target: proxy,
+            changeOrigin: true,
+            secure: false,
+          },
+        },
+      },
+    };
+  }
+
+  return defaultConfig;
+});

From 41fd765d8305a3595f684b5bd0da229fafc7c8dd Mon Sep 17 00:00:00 2001
From: Tom Lai <tom87416@gmail.com>
Date: Thu, 16 Jun 2022 08:19:09 +0100
Subject: [PATCH 030/734] Fixed width of messages meta info block (#2171)

Co-authored-by: Yiu ming Lai <ymlai87416@gmail.com>
---
 .../Details/Messages/MessageContent/MessageContent.styled.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
index de0967b4ab8..2f3efd7b537 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
@@ -56,7 +56,7 @@ export const Metadata = styled.span`
 export const MetadataLabel = styled.p`
   color: ${({ theme }) => theme.topicMetaData.color.label};
   font-size: 14px;
-  width: 50px;
+  width: 80px;
 `;
 
 export const MetadataValue = styled.p`

From 0528c3a28fce8616a5c080ee7e21175c6e3d7d49 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Thu, 16 Jun 2022 13:57:27 +0400
Subject: [PATCH 031/734] Separating ksqlDb tables and streams by tabs (#2145)

* separating ksqlDb tables and streams by tabs

* adding tests
---
 .../src/components/KsqlDb/KsqlDb.tsx          |   2 +-
 .../KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx     |  74 ++++++++++++
 .../KsqlDbItem/__test__/KsqlDbItem.spec.tsx   |  66 +++++++++++
 .../List/KsqlDbItem/utils/ksqlRowData.ts      |  12 ++
 .../src/components/KsqlDb/List/List.tsx       | 111 +++++++++---------
 .../src/components/KsqlDb/List/ListItem.tsx   |  20 ----
 .../KsqlDb/List/__test__/List.spec.tsx        |  30 ++---
 .../KsqlDb/List/__test__/ListItem.spec.tsx    |  34 ------
 kafka-ui-react-app/src/lib/paths.ts           |   9 ++
 .../src/redux/interfaces/ksqlDb.ts            |   1 -
 .../ksqlDb/__test__/selectors.spec.ts         |  13 +-
 .../src/redux/reducers/ksqlDb/selectors.ts    |   2 +-
 12 files changed, 239 insertions(+), 135 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
 create mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData.ts
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/__test__/ListItem.spec.tsx

diff --git a/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx b/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx
index cb64314c690..8fc6f735e6d 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx
@@ -9,7 +9,7 @@ const KsqlDb: React.FC = () => {
   return (
     <Routes>
       <Route
-        index
+        path="/*"
         element={
           <BreadcrumbRoute>
             <List />
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
new file mode 100644
index 00000000000..88dcf128c6e
--- /dev/null
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+import { KsqlStreamDescription, KsqlTableDescription } from 'generated-sources';
+import { useTableState } from 'lib/hooks/useTableState';
+import { SmartTable } from 'components/common/SmartTable/SmartTable';
+import { TableColumn } from 'components/common/SmartTable/TableColumn';
+import { KsqlDescription } from 'redux/interfaces/ksqlDb';
+import { ksqlRowData } from 'components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData';
+
+export enum KsqlDbItemType {
+  Tables = 'tables',
+  Streams = 'streams',
+}
+
+export interface RowsType {
+  tables: KsqlTableDescription[];
+  streams: KsqlStreamDescription[];
+}
+export interface KsqlDbItemProps {
+  type: KsqlDbItemType;
+  fetching: boolean;
+  rows: RowsType;
+}
+
+export type KsqlDescriptionAccessor = keyof KsqlDescription;
+
+export interface HeadersType {
+  Header: string;
+  accessor: KsqlDescriptionAccessor;
+}
+
+export interface KsqlTableState {
+  name: string;
+  topic: string;
+  keyFormat: string;
+  valueFormat: string;
+  isWindowed: string;
+}
+
+export const headers: HeadersType[] = [
+  { Header: 'Name', accessor: 'name' },
+  { Header: 'Topic', accessor: 'topic' },
+  { Header: 'Key Format', accessor: 'keyFormat' },
+  { Header: 'Value Format', accessor: 'valueFormat' },
+  { Header: 'Is Windowed', accessor: 'isWindowed' },
+];
+
+const KsqlDbItem: React.FC<KsqlDbItemProps> = ({ type, fetching, rows }) => {
+  const preparedRows = rows[type]?.map(ksqlRowData) || [];
+  const tableState = useTableState<KsqlTableState, string>(preparedRows, {
+    idSelector: ({ name }) => name,
+    totalPages: 0,
+  });
+
+  if (fetching) {
+    return <PageLoader />;
+  }
+  return (
+    <SmartTable
+      tableState={tableState}
+      isFullwidth
+      placeholder="No tables or streams found"
+      hoverable
+    >
+      <TableColumn title="Name" field="name" />
+      <TableColumn title="Topic" field="topic" />
+      <TableColumn title="Key Format" field="keyFormat" />
+      <TableColumn title="Value Format" field="valueFormat" />
+      <TableColumn title="Is Windowed" field="isWindowed" />
+    </SmartTable>
+  );
+};
+
+export default KsqlDbItem;
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
new file mode 100644
index 00000000000..e1be151503d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import { clusterKsqlDbTablesPath } from 'lib/paths';
+import KsqlDbItem, {
+  KsqlDbItemProps,
+  KsqlDbItemType,
+} from 'components/KsqlDb/List/KsqlDbItem/KsqlDbItem';
+import { screen } from '@testing-library/dom';
+import { fetchKsqlDbTablesPayload } from 'redux/reducers/ksqlDb/__test__/fixtures';
+
+describe('KsqlDbItem', () => {
+  const tablesPathname = clusterKsqlDbTablesPath();
+
+  const component = (props: Partial<KsqlDbItemProps> = {}) => (
+    <WithRoute path={tablesPathname}>
+      <KsqlDbItem
+        type={KsqlDbItemType.Tables}
+        fetching={false}
+        rows={{ tables: [], streams: [] }}
+        {...props}
+      />
+    </WithRoute>
+  );
+
+  it('renders progressbar when fetching tables and streams', () => {
+    render(component({ fetching: true }), {
+      initialEntries: [clusterKsqlDbTablesPath()],
+    });
+    expect(screen.getByRole('progressbar')).toBeInTheDocument();
+  });
+  it('show no text if no data found', () => {
+    render(component({}), {
+      initialEntries: [clusterKsqlDbTablesPath()],
+    });
+    expect(screen.getByText('No tables or streams found')).toBeInTheDocument();
+  });
+  it('renders with tables', () => {
+    render(
+      component({
+        rows: {
+          tables: fetchKsqlDbTablesPayload.tables,
+          streams: [],
+        },
+      }),
+      {
+        initialEntries: [clusterKsqlDbTablesPath()],
+      }
+    );
+    expect(screen.getByRole('table').querySelectorAll('td')).toHaveLength(10);
+  });
+  it('renders with streams', () => {
+    render(
+      component({
+        type: KsqlDbItemType.Streams,
+        rows: {
+          tables: [],
+          streams: fetchKsqlDbTablesPayload.streams,
+        },
+      }),
+      {
+        initialEntries: [clusterKsqlDbTablesPath()],
+      }
+    );
+    expect(screen.getByRole('table').querySelectorAll('td')).toHaveLength(10);
+  });
+});
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData.ts b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData.ts
new file mode 100644
index 00000000000..a2c9e658918
--- /dev/null
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData.ts
@@ -0,0 +1,12 @@
+import { KsqlDescription } from 'redux/interfaces/ksqlDb';
+import { KsqlTableState } from 'components/KsqlDb/List/KsqlDbItem/KsqlDbItem';
+
+export const ksqlRowData = (data: KsqlDescription): KsqlTableState => {
+  return {
+    name: data.name || '',
+    topic: data.topic || '',
+    keyFormat: data.keyFormat || '',
+    valueFormat: data.valueFormat || '',
+    isWindowed: 'isWindowed' in data ? String(data.isWindowed) : '-',
+  };
+};
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
index 543aaa43f55..7c9ab90a96c 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
@@ -1,44 +1,32 @@
-import React, { FC, useEffect } from 'react';
+import React, { FC } from 'react';
 import useAppParams from 'lib/hooks/useAppParams';
 import * as Metrics from 'components/common/Metrics';
-import PageLoader from 'components/common/PageLoader/PageLoader';
-import ListItem from 'components/KsqlDb/List/ListItem';
-import { useDispatch, useSelector } from 'react-redux';
-import { fetchKsqlDbTables } from 'redux/reducers/ksqlDb/ksqlDbSlice';
+import { useSelector, useDispatch } from 'react-redux';
 import { getKsqlDbTables } from 'redux/reducers/ksqlDb/selectors';
-import { clusterKsqlDbQueryRelativePath, ClusterNameRoute } from 'lib/paths';
+import {
+  clusterKsqlDbQueryRelativePath,
+  ClusterNameRoute,
+  clusterKsqlDbStreamsPath,
+  clusterKsqlDbTablesPath,
+  clusterKsqlDbStreamsRelativePath,
+  clusterKsqlDbTablesRelativePath,
+} from 'lib/paths';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { Button } from 'components/common/Button/Button';
-import { KsqlDescription } from 'redux/interfaces/ksqlDb';
-
-export type KsqlDescriptionAccessor = keyof KsqlDescription;
-
-interface HeadersType {
-  Header: string;
-  accessor: KsqlDescriptionAccessor;
-}
-const headers: HeadersType[] = [
-  { Header: 'Type', accessor: 'type' },
-  { Header: 'Name', accessor: 'name' },
-  { Header: 'Topic', accessor: 'topic' },
-  { Header: 'Key Format', accessor: 'keyFormat' },
-  { Header: 'Value Format', accessor: 'valueFormat' },
-  { Header: 'Is Windowed', accessor: 'isWindowed' },
-];
+import Navbar from 'components/common/Navigation/Navbar.styled';
+import { NavLink, Route, Routes, Navigate } from 'react-router-dom';
+import { fetchKsqlDbTables } from 'redux/reducers/ksqlDb/ksqlDbSlice';
 
-const accessors = headers.map((header) => header.accessor);
+import KsqlDbItem, { KsqlDbItemType } from './KsqlDbItem/KsqlDbItem';
 
 const List: FC = () => {
-  const dispatch = useDispatch();
-
   const { clusterName } = useAppParams<ClusterNameRoute>();
+  const dispatch = useDispatch();
 
   const { rows, fetching, tablesCount, streamsCount } =
     useSelector(getKsqlDbTables);
 
-  useEffect(() => {
+  React.useEffect(() => {
     dispatch(fetchKsqlDbTables(clusterName));
   }, [clusterName, dispatch]);
 
@@ -68,31 +56,48 @@ const List: FC = () => {
         </Metrics.Section>
       </Metrics.Wrapper>
       <div>
-        {fetching ? (
-          <PageLoader />
-        ) : (
-          <Table isFullwidth>
-            <thead>
-              <tr>
-                {headers.map(({ Header, accessor }) => (
-                  <TableHeaderCell title={Header} key={accessor} />
-                ))}
-              </tr>
-            </thead>
-            <tbody>
-              {rows.map((row) => (
-                <ListItem key={row.name} accessors={accessors} data={row} />
-              ))}
-              {rows.length === 0 && (
-                <tr>
-                  <td colSpan={headers.length + 1}>
-                    No tables or streams found
-                  </td>
-                </tr>
-              )}
-            </tbody>
-          </Table>
-        )}
+        <Navbar role="navigation">
+          <NavLink
+            to={clusterKsqlDbTablesPath(clusterName)}
+            className={({ isActive }) => (isActive ? 'is-active' : '')}
+            end
+          >
+            Tables
+          </NavLink>
+          <NavLink
+            to={clusterKsqlDbStreamsPath(clusterName)}
+            className={({ isActive }) => (isActive ? 'is-active' : '')}
+            end
+          >
+            Streams
+          </NavLink>
+        </Navbar>
+        <Routes>
+          <Route
+            index
+            element={<Navigate to={clusterKsqlDbTablesRelativePath} />}
+          />
+          <Route
+            path={clusterKsqlDbTablesRelativePath}
+            element={
+              <KsqlDbItem
+                type={KsqlDbItemType.Tables}
+                fetching={fetching}
+                rows={rows}
+              />
+            }
+          />
+          <Route
+            path={clusterKsqlDbStreamsRelativePath}
+            element={
+              <KsqlDbItem
+                type={KsqlDbItemType.Streams}
+                fetching={fetching}
+                rows={rows}
+              />
+            }
+          />
+        </Routes>
       </div>
     </>
   );
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx
deleted file mode 100644
index e9d073bb5d5..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/List/ListItem.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import { KsqlDescription } from 'redux/interfaces/ksqlDb';
-import { KsqlDescriptionAccessor } from 'components/KsqlDb/List/List';
-
-interface Props {
-  accessors: KsqlDescriptionAccessor[];
-  data: KsqlDescription;
-}
-
-const ListItem: React.FC<Props> = ({ accessors, data }) => {
-  return (
-    <tr>
-      {accessors.map((accessor) => (
-        <td key={accessor}>{data[accessor]?.toString()}</td>
-      ))}
-    </tr>
-  );
-};
-
-export default ListItem;
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
index b367a6117ce..15be8055ab3 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
@@ -1,32 +1,22 @@
 import React from 'react';
 import List from 'components/KsqlDb/List/List';
-import { clusterKsqlDbPath } from 'lib/paths';
-import { render, WithRoute } from 'lib/testHelpers';
+import { render } from 'lib/testHelpers';
 import fetchMock from 'fetch-mock';
-import { screen, waitForElementToBeRemoved } from '@testing-library/dom';
-
-const clusterName = 'local';
+import { screen } from '@testing-library/dom';
 
 const renderComponent = () => {
-  render(
-    <WithRoute path={clusterKsqlDbPath()}>
-      <List />
-    </WithRoute>,
-    { initialEntries: [clusterKsqlDbPath(clusterName)] }
-  );
+  render(<List />);
 };
 
 describe('KsqlDb List', () => {
   afterEach(() => fetchMock.reset());
-  it('renders placeholder on empty data', async () => {
-    fetchMock.post(
-      {
-        url: `/api/clusters/${clusterName}/ksql`,
-      },
-      { data: [] }
-    );
+  it('renders List component with Tables and Streams tabs', async () => {
     renderComponent();
-    await waitForElementToBeRemoved(() => screen.getByRole('progressbar'));
-    expect(screen.getByText('No tables or streams found')).toBeInTheDocument();
+
+    const Tables = screen.getByTitle('Tables');
+    const Streams = screen.getByTitle('Streams');
+
+    expect(Tables).toBeInTheDocument();
+    expect(Streams).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/ListItem.spec.tsx
deleted file mode 100644
index 9014d06d4f2..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/ListItem.spec.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { clusterKsqlDbPath } from 'lib/paths';
-import { render, WithRoute } from 'lib/testHelpers';
-import { screen } from '@testing-library/dom';
-import ListItem from 'components/KsqlDb/List/ListItem';
-import { KsqlDescription } from 'redux/interfaces/ksqlDb';
-
-const clusterName = 'local';
-
-const renderComponent = ({
-  accessors,
-  data,
-}: {
-  accessors: (keyof KsqlDescription)[];
-  data: Record<string, string>;
-}) => {
-  render(
-    <WithRoute path={clusterKsqlDbPath()}>
-      <ListItem accessors={accessors} data={data} />
-    </WithRoute>,
-    { initialEntries: [clusterKsqlDbPath(clusterName)] }
-  );
-};
-
-describe('KsqlDb List Item', () => {
-  it('renders placeholder on one data', async () => {
-    renderComponent({
-      accessors: ['accessors' as keyof KsqlDescription],
-      data: { accessors: 'accessors text' },
-    });
-
-    expect(screen.getByText('accessors text')).toBeInTheDocument();
-  });
-});
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 1c4caef0904..2e15a856a86 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -233,9 +233,18 @@ export type RouterParamsClusterConnectConnector = {
 // KsqlDb
 export const clusterKsqlDbRelativePath = 'ksqldb';
 export const clusterKsqlDbQueryRelativePath = 'query';
+export const clusterKsqlDbTablesRelativePath = 'tables';
+export const clusterKsqlDbStreamsRelativePath = 'streams';
+
 export const clusterKsqlDbPath = (
   clusterName: ClusterName = RouteParams.clusterName
 ) => `${clusterPath(clusterName)}/${clusterKsqlDbRelativePath}`;
 export const clusterKsqlDbQueryPath = (
   clusterName: ClusterName = RouteParams.clusterName
 ) => `${clusterKsqlDbPath(clusterName)}/${clusterKsqlDbQueryRelativePath}`;
+export const clusterKsqlDbTablesPath = (
+  clusterName: ClusterName = RouteParams.clusterName
+) => `${clusterKsqlDbPath(clusterName)}/${clusterKsqlDbTablesRelativePath}`;
+export const clusterKsqlDbStreamsPath = (
+  clusterName: ClusterName = RouteParams.clusterName
+) => `${clusterKsqlDbPath(clusterName)}/${clusterKsqlDbStreamsRelativePath}`;
diff --git a/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts b/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
index 93c53733681..9bad9beb269 100644
--- a/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
@@ -18,7 +18,6 @@ export interface KsqlState {
 }
 
 export interface KsqlDescription {
-  type?: string;
   name?: string;
   topic?: string;
   keyFormat?: string;
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/selectors.spec.ts
index 44213996d3d..5e60caa74cc 100644
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/selectors.spec.ts
+++ b/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/selectors.spec.ts
@@ -15,7 +15,10 @@ describe('TopicMessages selectors', () => {
 
     it('Returns empty state', () => {
       expect(selectors.getKsqlDbTables(store.getState())).toEqual({
-        rows: [],
+        rows: {
+          streams: [],
+          tables: [],
+        },
         fetched: false,
         fetching: true,
         tablesCount: 0,
@@ -34,10 +37,10 @@ describe('TopicMessages selectors', () => {
 
     it('Returns tables and streams', () => {
       expect(selectors.getKsqlDbTables(store.getState())).toEqual({
-        rows: [
-          ...fetchKsqlDbTablesPayload.streams,
-          ...fetchKsqlDbTablesPayload.tables,
-        ],
+        rows: {
+          streams: [...fetchKsqlDbTablesPayload.streams],
+          tables: [...fetchKsqlDbTablesPayload.tables],
+        },
         fetched: true,
         fetching: false,
         tablesCount: 2,
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/selectors.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/selectors.ts
index 6f8bbcd61b4..0e61995ea56 100644
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/selectors.ts
+++ b/kafka-ui-react-app/src/redux/reducers/ksqlDb/selectors.ts
@@ -15,7 +15,7 @@ const getKsqlExecutionStatus = createFetchingSelector('ksqlDb/executeKsql');
 export const getKsqlDbTables = createSelector(
   [ksqlDbState, getKsqlDbFetchTablesAndStreamsFetchingStatus],
   (state, status) => ({
-    rows: [...state.streams, ...state.tables],
+    rows: { streams: [...state.streams], tables: [...state.tables] },
     fetched: status === AsyncRequestStatus.fulfilled,
     fetching: status === AsyncRequestStatus.pending,
     tablesCount: state.tables.length,

From d565ad4e380210767b85ce83a7cb014e551af826 Mon Sep 17 00:00:00 2001
From: azatsafin <azat.safin@gmail.com>
Date: Thu, 16 Jun 2022 13:11:09 +0300
Subject: [PATCH 032/734] fix to remove deployment when pr closed with existing
 tag (#2174)

Co-authored-by: Azat Safin <azsafin@provectus.com>
---
 .github/workflows/branch-remove.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/branch-remove.yml b/.github/workflows/branch-remove.yml
index 37b24239d52..ccbacea3c99 100644
--- a/.github/workflows/branch-remove.yml
+++ b/.github/workflows/branch-remove.yml
@@ -5,7 +5,7 @@ on:
     types: ['unlabeled', 'closed']
 jobs:
   remove:
-    if: ${{ github.event.label.name == 'status/feature_testing' || github.event.label.name == 'status/feature_testing_public' }}
+    if: ${{ github.event.label.name == 'status/feature_testing' || github.event.label.name == 'status/feature_testing_public' || github.event.action == 'closed'}}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

From d0e1e2bf6a5e7172bd1f23ed9aacbc1e90831e0d Mon Sep 17 00:00:00 2001
From: azatsafin <azat.safin@gmail.com>
Date: Fri, 17 Jun 2022 15:20:41 +0300
Subject: [PATCH 033/734] start use pr number instead of branch name for custom
 deployments (#2179)

Co-authored-by: Azat Safin <azsafin@provectus.com>
---
 .github/workflows/branch-deploy.yml | 6 +-----
 .github/workflows/branch-remove.yml | 8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 7d93385c307..63935f6b88f 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -13,11 +13,7 @@ jobs:
       - name: get branch name
         id: extract_branch
         run: |
-          hub pr checkout ${{ github.event.pull_request.number }}
-          branch_name=$(hub branch | grep "*" | sed -e 's/^\*//')
-          echo $branch_name
-          echo ::set-output name=branch::${branch_name}
-          tag=$(echo $branch_name |  sed 's/\//-/g' | sed 's/\./-/g' | sed 's/\_/-/g' |  sed -e 's/\(.*\)/\L\1/' | cut -c1-32 | sed -E 's/(^[^a-z0-9])*([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)([^a-z0-9]*)/\2/')
+          tag='pr${{ github.event.pull_request.number }}'
           echo ::set-output name=tag::${tag}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/branch-remove.yml b/.github/workflows/branch-remove.yml
index ccbacea3c99..8582b6feb7b 100644
--- a/.github/workflows/branch-remove.yml
+++ b/.github/workflows/branch-remove.yml
@@ -12,11 +12,7 @@ jobs:
       - name: get branch name
         id: extract_branch
         run: |
-          hub pr checkout ${{ github.event.pull_request.number }}
-          branch_name=$(hub branch | grep "*" | sed -e 's/^\*//')
-          echo $branch_name
-          echo ::set-output name=branch::${branch_name}
-          tag=$(echo $branch_name |  sed 's/\//-/g' | sed 's/\./-/g' | sed 's/\_/-/g' |  cut -c1-32)
+          tag='pr${{ github.event.pull_request.number }}'
           echo ::set-output name=tag::${tag}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -27,7 +23,7 @@ jobs:
         run: |
           cd kafka-ui-infra/aws-infrastructure4eks/argocd/scripts
           echo "Branch:${{ steps.extract_branch.outputs.tag }}"
-          ./delete-env.sh ${{ steps.extract_branch.outputs.tag }}
+          ./delete-env.sh ${{ steps.extract_branch.outputs.tag }} || true
           git config --global user.email "kafka-ui-infra@provectus.com"
           git config --global user.name "kafka-ui-infra"
           git add ../kafka-ui-from-branch/

From fac348bb38a517fc2ad856fa161edb36fa727637 Mon Sep 17 00:00:00 2001
From: Kirill Morozov <grifx.design@gmail.com>
Date: Tue, 21 Jun 2022 15:23:28 +0300
Subject: [PATCH 034/734] Added Social icons (#2137)

* Added Social icons

* Removed unused import

* Icon name fixed

* package-lock.json reverted

* Delete package-lock.json

* Added colors to theme

* Social icons refactored

* Discord icon size fixed

* Discord icon color fixed

* Discord icon replaced with the new one

* Icons colors changed

* Social Network Links

Co-authored-by: Oleg Shuralev <workshur@gmail.com>
---
 .../src/components/App.styled.ts              | 47 +++++++++++++++++--
 kafka-ui-react-app/src/components/App.tsx     | 18 ++++++-
 .../components/common/Icons/DiscordIcon.tsx   | 20 ++++++++
 .../src/components/common/Icons/GitIcon.tsx   | 21 +++++++++
 kafka-ui-react-app/src/theme/theme.ts         | 14 ++++++
 5 files changed, 114 insertions(+), 6 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/DiscordIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/GitIcon.tsx

diff --git a/kafka-ui-react-app/src/components/App.styled.ts b/kafka-ui-react-app/src/components/App.styled.ts
index 94400cea879..d854f1f2412 100644
--- a/kafka-ui-react-app/src/components/App.styled.ts
+++ b/kafka-ui-react-app/src/components/App.styled.ts
@@ -2,6 +2,8 @@ import styled, { css } from 'styled-components';
 import { Link } from 'react-router-dom';
 
 import { Button } from './common/Button/Button';
+import GitIcon from './common/Icons/GitIcon';
+import DiscordIcon from './common/Icons/DiscordIcon';
 
 export const Layout = styled.div`
   min-width: 1200px;
@@ -75,7 +77,7 @@ export const Overlay = styled.div<{ $visible: boolean }>(
   ({ theme, $visible }) => css`
     height: calc(100vh - ${theme.layout.navBarHeight});
     z-index: 99;
-    visibility: 'hidden';
+    visibility: hidden;
     opacity: 0;
     -webkit-transition: all 0.5s ease;
     transition: all 0.5s ease;
@@ -87,7 +89,7 @@ export const Overlay = styled.div<{ $visible: boolean }>(
       @media screen and (max-width: 1023px) {
         bottom: 0;
         right: 0;
-        visibility: 'visible';
+        visibility: visible;
         opacity: 0.7;
         background-color: ${theme.layout.overlay.backgroundColor};
       }
@@ -97,6 +99,9 @@ export const Overlay = styled.div<{ $visible: boolean }>(
 
 export const Navbar = styled.nav(
   ({ theme }) => css`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
     border-bottom: 1px solid ${theme.layout.stuffBorderColor};
     position: fixed;
     top: 0;
@@ -110,13 +115,45 @@ export const Navbar = styled.nav(
 
 export const NavbarBrand = styled.div`
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-end;
   align-items: center !important;
   flex-shrink: 0;
-  align-items: stretch;
   min-height: 3.25rem;
 `;
 
+export const SocialLink = styled.a(
+  ({ theme: { layout, icons } }) => css`
+    display: block;
+    margin-top: 5px;
+    cursor: pointer;
+    fill: ${layout.socialLink.color};
+
+    &:hover {
+      ${DiscordIcon} {
+        fill: ${icons.discord.hover};
+      }
+      ${GitIcon} {
+        fill: ${icons.git.hover};
+      }
+    }
+    &:active {
+      ${DiscordIcon} {
+        fill: ${icons.discord.active};
+      }
+      ${GitIcon} {
+        fill: ${icons.git.active};
+      }
+    }
+  `
+);
+
+export const NavbarSocial = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin: 10px;
+`;
+
 export const NavbarItem = styled.div`
   display: flex;
   position: relative;
@@ -220,6 +257,6 @@ export const LogoutButton = styled(Button)(
 
 export const LogoutLink = styled(Link)(
   () => css`
-    margin-right: 16px;
+    margin-right: 2px;
   `
 );
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 91b74145e44..c26f5514838 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -19,6 +19,8 @@ import {
 
 import * as S from './App.styled';
 import Logo from './common/Logo/Logo';
+import GitIcon from './common/Icons/GitIcon';
+import DiscordIcon from './common/Icons/DiscordIcon';
 
 const App: React.FC = () => {
   const dispatch = useAppDispatch();
@@ -64,12 +66,26 @@ const App: React.FC = () => {
                 {GIT_TAG && <Version tag={GIT_TAG} commit={GIT_COMMIT} />}
               </S.NavbarItem>
             </S.NavbarBrand>
+          </S.NavbarBrand>
+          <S.NavbarSocial>
             <S.LogoutLink to="/logout">
               <S.LogoutButton buttonType="primary" buttonSize="M">
                 Log out
               </S.LogoutButton>
             </S.LogoutLink>
-          </S.NavbarBrand>
+            <S.SocialLink
+              href="https://github.com/provectus/kafka-ui"
+              target="_blank"
+            >
+              <GitIcon />
+            </S.SocialLink>
+            <S.SocialLink
+              href="https://discord.com/invite/4DWzD7pGE5"
+              target="_blank"
+            >
+              <DiscordIcon />
+            </S.SocialLink>
+          </S.NavbarSocial>
         </S.Navbar>
 
         <S.Container>
diff --git a/kafka-ui-react-app/src/components/common/Icons/DiscordIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/DiscordIcon.tsx
new file mode 100644
index 00000000000..0df8701b93e
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/DiscordIcon.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import styled from 'styled-components';
+
+const DiscordIcon: React.FC<{ className?: string }> = ({ className }) => (
+  <svg
+    width="22"
+    height="18"
+    className={className}
+    viewBox="0 0 22 18"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M18.6239 1.60293C17.2217 0.92338 15.7181 0.422718 14.1459 0.135969C14.1173 0.130434 14.0887 0.144265 14.0739 0.171926C13.8805 0.535202 13.6663 1.00913 13.5163 1.38163C11.8254 1.11425 10.1431 1.11425 8.48679 1.38163C8.33676 1.00085 8.11478 0.535202 7.92053 0.171926C7.90578 0.145187 7.87718 0.131357 7.84855 0.135969C6.27725 0.421802 4.7736 0.922464 3.37052 1.60293C3.35838 1.60846 3.34797 1.61769 3.34106 1.62967C0.488942 6.13013 -0.292371 10.52 0.0909151 14.8554C0.0926494 14.8766 0.103922 14.8969 0.119532 14.9098C2.00127 16.3693 3.82406 17.2554 5.61301 17.8428C5.64164 17.852 5.67197 17.8409 5.69019 17.816C6.11337 17.2057 6.49059 16.5621 6.81402 15.8853C6.83311 15.8456 6.81489 15.7986 6.77588 15.7829C6.17754 15.5432 5.6078 15.2509 5.05975 14.919C5.0164 14.8923 5.01293 14.8268 5.05281 14.7954C5.16814 14.7041 5.2835 14.6092 5.39363 14.5133C5.41355 14.4958 5.44131 14.4921 5.46474 14.5031C9.06518 16.2394 12.9631 16.2394 16.521 14.5031C16.5445 14.4912 16.5722 14.4949 16.593 14.5124C16.7032 14.6083 16.8185 14.7041 16.9347 14.7954C16.9746 14.8268 16.972 14.8923 16.9286 14.919C16.3806 15.2574 15.8108 15.5432 15.2116 15.782C15.1726 15.7977 15.1553 15.8456 15.1744 15.8853C15.5047 16.5611 15.882 17.2047 16.2973 17.8151C16.3147 17.8409 16.3459 17.852 16.3745 17.8428C18.1721 17.2554 19.9949 16.3693 21.8766 14.9098C21.8931 14.8969 21.9035 14.8775 21.9053 14.8563C22.364 9.84408 21.1369 5.49024 18.6525 1.63058C18.6465 1.61769 18.6361 1.60846 18.6239 1.60293ZM7.35169 12.2156C6.26771 12.2156 5.37454 11.1645 5.37454 9.8736C5.37454 8.58274 6.25039 7.53164 7.35169 7.53164C8.46163 7.53164 9.34616 8.59197 9.32881 9.8736C9.32881 11.1645 8.45296 12.2156 7.35169 12.2156ZM14.6619 12.2156C13.5779 12.2156 12.6847 11.1645 12.6847 9.8736C12.6847 8.58274 13.5606 7.53164 14.6619 7.53164C15.7718 7.53164 16.6563 8.59197 16.639 9.8736C16.639 11.1645 15.7718 12.2156 14.6619 12.2156Z"
+      fillRule="evenodd"
+      clipRule="evenodd"
+    />
+  </svg>
+);
+
+export default styled(DiscordIcon)``;
diff --git a/kafka-ui-react-app/src/components/common/Icons/GitIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/GitIcon.tsx
new file mode 100644
index 00000000000..daecb611ff2
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/GitIcon.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import styled from 'styled-components';
+
+const GitIcon: React.FC<{ className?: string }> = ({ className }) => (
+  <svg
+    width="20"
+    height="20"
+    className={className}
+    viewBox="0 0 1024 1024"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z"
+      transform="scale(64)"
+    />
+  </svg>
+);
+
+export default styled(GitIcon)``;
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index c9fd10566a6..478f0ede49f 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -33,6 +33,7 @@ export const Colors = {
   brand: {
     '5': '#E8E8FC',
     '10': '#D1D1FA',
+    '15': '#B8BEF9',
     '20': '#A3A3F5',
     '50': '#4C4CFF',
     '60': '#1717CF',
@@ -54,6 +55,8 @@ export const Colors = {
     '20': '#bbdefb',
     '30': '#90caf9',
     '40': '#64b5f6',
+    '45': '#5865F2',
+    '50': '#5B67E3',
   },
 };
 
@@ -67,6 +70,9 @@ const theme = {
     overlay: {
       backgroundColor: Colors.neutral[50],
     },
+    socialLink: {
+      color: Colors.neutral[20],
+    },
   },
   panelColor: Colors.neutral[0],
   breadcrumb: Colors.neutral[30],
@@ -493,6 +499,14 @@ const theme = {
     closeModalIcon: Colors.neutral[25],
     savedIcon: Colors.brand[50],
     dropdownArrowIcon: Colors.neutral[30],
+    git: {
+      hover: Colors.neutral[70],
+      active: Colors.neutral[90],
+    },
+    discord: {
+      hover: Colors.brand[15],
+      active: Colors.blue[45],
+    },
   },
   viewer: {
     wrapper: Colors.neutral[3],

From 3c922bc4706e44f0a6aaa33210b76530e841f56c Mon Sep 17 00:00:00 2001
From: Kirill Morozov <grifx.design@gmail.com>
Date: Tue, 21 Jun 2022 18:53:11 +0300
Subject: [PATCH 035/734] Make broker table row clickable (#2151)

* Added click functionality to the row

* Clickablerow moved to separate file

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../Brokers/BrokersList/BrokersList.style.ts  |  5 ++++
 .../Brokers/BrokersList/BrokersList.tsx       | 14 ++++++++---
 .../BrokersList/__test__/BrokersList.spec.tsx | 25 +++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.style.ts

diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.style.ts b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.style.ts
new file mode 100644
index 00000000000..f5f83733331
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.style.ts
@@ -0,0 +1,5 @@
+import styled from 'styled-components';
+
+export const ClickableRow = styled.tr`
+  cursor: pointer;
+`;
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index 36e36368c3a..6423891f421 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { ClusterName } from 'redux/interfaces';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { NavLink } from 'react-router-dom';
+import { NavLink, useNavigate } from 'react-router-dom';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { Table } from 'components/common/table/Table/Table.styled';
 import PageHeading from 'components/common/PageHeading/PageHeading';
@@ -10,7 +10,10 @@ import useAppParams from 'lib/hooks/useAppParams';
 import useBrokers from 'lib/hooks/useBrokers';
 import useClusterStats from 'lib/hooks/useClusterStats';
 
+import { ClickableRow } from './BrokersList.style';
+
 const BrokersList: React.FC = () => {
+  const navigate = useNavigate();
   const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
   const { data: clusterStats } = useClusterStats(clusterName);
   const { data: brokers } = useBrokers(clusterName);
@@ -58,7 +61,6 @@ const BrokersList: React.FC = () => {
               onlinePartitionCount
             )}
             <Metrics.LightText>
-              {' '}
               of {(onlinePartitionCount || 0) + (offlinePartitionCount || 0)}
             </Metrics.LightText>
           </Metrics.Indicator>
@@ -114,8 +116,12 @@ const BrokersList: React.FC = () => {
             diskUsage.length !== 0 &&
             diskUsage.map(({ brokerId, segmentSize, segmentCount }) => {
               const brokerItem = brokers?.find(({ id }) => id === brokerId);
+
               return (
-                <tr key={brokerId}>
+                <ClickableRow
+                  key={brokerId}
+                  onClick={() => navigate(`${brokerId}`)}
+                >
                   <td>
                     <NavLink to={`${brokerId}`} role="link">
                       {brokerId}
@@ -127,7 +133,7 @@ const BrokersList: React.FC = () => {
                   <td>{segmentCount}</td>
                   <td>{brokerItem?.port}</td>
                   <td>{brokerItem?.host}</td>
-                </tr>
+                </ClickableRow>
               );
             })}
         </tbody>
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
index 437cc44cd4c..94ffa0b77af 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
@@ -9,6 +9,14 @@ import {
   brokersPayload,
   clusterStatsPayload,
 } from 'components/Brokers/__test__/fixtures';
+import userEvent from '@testing-library/user-event';
+
+const mockedUsedNavigate = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockedUsedNavigate,
+}));
 
 describe('BrokersList Component', () => {
   afterEach(() => fetchMock.reset());
@@ -53,6 +61,22 @@ describe('BrokersList Component', () => {
       expect(rows.length).toEqual(3);
     });
 
+    it('opens broker when row clicked', async () => {
+      const fetchStatsMock = fetchMock.get(fetchStatsUrl, clusterStatsPayload);
+      await act(() => {
+        renderComponent();
+      });
+      await waitFor(() => expect(fetchStatsMock.called()).toBeTruthy());
+      await act(() => {
+        userEvent.click(screen.getByRole('cell', { name: '0' }));
+      });
+
+      await waitFor(() => {
+        expect(mockedUsedNavigate).toBeCalled();
+        expect(mockedUsedNavigate).toBeCalledWith('0');
+      });
+    });
+
     it('shows warning when offlinePartitionCount > 0', async () => {
       const fetchStatsMock = fetchMock.getOnce(fetchStatsUrl, {
         ...clusterStatsPayload,
@@ -93,6 +117,7 @@ describe('BrokersList Component', () => {
       expect(onlineWidgetDef).toBeInTheDocument();
       expect(onlineWidget).toBeInTheDocument();
     });
+
     it('shows right count when inSyncReplicasCount: undefined outOfSyncReplicasCount: 1', async () => {
       const fetchStatsMock = fetchMock.getOnce(fetchStatsUrl, {
         ...clusterStatsPayload,

From aa839b4d69106e50500d4a80ac4e65a26c9c8bc7 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Wed, 22 Jun 2022 11:48:03 +0400
Subject: [PATCH 036/734] add asterix for custom params (#2192)

---
 .../Topics/shared/Form/CustomParams/CustomParamField.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
index 72f28c5c461..2b85b5276c7 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
@@ -67,7 +67,7 @@ const CustomParamField: React.FC<Props> = ({
   return (
     <C.Column>
       <div>
-        <InputLabel>Custom Parameter</InputLabel>
+        <InputLabel>Custom Parameter *</InputLabel>
         <Controller
           control={control}
           rules={{ required: 'Custom Parameter is required.' }}

From 9c7f078dedf40e1d87a21a4434aeff9466f12f53 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Thu, 23 Jun 2022 17:59:30 +0400
Subject: [PATCH 037/734] fixing logout redirect issue (#2170)

* fixing logout redirect issue

* fixing logout problem
---
 kafka-ui-react-app/src/components/App.styled.ts | 2 +-
 kafka-ui-react-app/src/components/App.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/App.styled.ts b/kafka-ui-react-app/src/components/App.styled.ts
index d854f1f2412..cd79fe62497 100644
--- a/kafka-ui-react-app/src/components/App.styled.ts
+++ b/kafka-ui-react-app/src/components/App.styled.ts
@@ -255,7 +255,7 @@ export const LogoutButton = styled(Button)(
   `
 );
 
-export const LogoutLink = styled(Link)(
+export const LogoutLink = styled.a(
   () => css`
     margin-right: 2px;
   `
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index c26f5514838..1035edb05d6 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -68,7 +68,7 @@ const App: React.FC = () => {
             </S.NavbarBrand>
           </S.NavbarBrand>
           <S.NavbarSocial>
-            <S.LogoutLink to="/logout">
+            <S.LogoutLink href="/logout">
               <S.LogoutButton buttonType="primary" buttonSize="M">
                 Log out
               </S.LogoutButton>

From 5cb1a7e0ce53b673a0e5b5133b18818f13088568 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Sat, 25 Jun 2022 01:47:05 +0400
Subject: [PATCH 038/734] Fix incorrect order of requests for changing SR
 compatibility lvl (#2201)

---
 .../src/components/Schemas/Edit/Edit.tsx      | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
index 550496d7451..1b960675ec6 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
@@ -62,18 +62,6 @@ const Edit: React.FC = () => {
     if (!schema) return;
 
     try {
-      if (dirtyFields.newSchema || dirtyFields.schemaType) {
-        const resp = await schemasApiClient.createNewSchema({
-          clusterName,
-          newSchemaSubject: {
-            ...schema,
-            schema: props.newSchema || schema.schema,
-            schemaType: props.schemaType || schema.schemaType,
-          },
-        });
-        dispatch(schemaAdded(resp));
-      }
-
       if (dirtyFields.compatibilityLevel) {
         await schemasApiClient.updateSchemaCompatibilityLevel({
           clusterName,
@@ -89,6 +77,17 @@ const Edit: React.FC = () => {
           })
         );
       }
+      if (dirtyFields.newSchema || dirtyFields.schemaType) {
+        const resp = await schemasApiClient.createNewSchema({
+          clusterName,
+          newSchemaSubject: {
+            ...schema,
+            schema: props.newSchema || schema.schema,
+            schemaType: props.schemaType || schema.schemaType,
+          },
+        });
+        dispatch(schemaAdded(resp));
+      }
 
       navigate(clusterSchemaPath(clusterName, subject));
     } catch (e) {

From 8acbcbacb9c04e6f4f2bcc95c1a9f9480804cccf Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 27 Jun 2022 13:07:47 +0300
Subject: [PATCH 039/734] Upgrade deps (#2206)

* hook

* Upgrade Jest to v28

* Upgrade Typescript
---
 kafka-ui-react-app/.husky/.gitignore          |    1 -
 kafka-ui-react-app/.husky/pre-commit          |    3 +-
 .../{config/jest => .jest}/cssTransform.js    |    4 +-
 kafka-ui-react-app/.jest/resolver.js          |   22 +
 kafka-ui-react-app/jest.config.ts             |    3 +-
 kafka-ui-react-app/package-lock.json          | 7180 ++++++-----------
 kafka-ui-react-app/package.json               |   35 +-
 .../components/ConsumerGroups/List/List.tsx   |   12 +-
 .../ConsumerGroupsTableCells.spec.tsx         |    2 +-
 .../src/components/Topics/List/List.tsx       |   12 +-
 .../List/__tests__/TopicsTableCells.spec.tsx  |    2 +-
 .../Topics/Topic/SendMessage/SendMessage.tsx  |    4 +-
 .../Topic/SendMessage/validateMessage.ts      |    5 +-
 .../common/SmartTable/SmartTable.tsx          |   18 +-
 .../common/SmartTable/TableColumn.tsx         |   36 +-
 .../components/common/SmartTable/TableRow.tsx |   10 +-
 .../table/TableHeaderCell/TableHeaderCell.tsx |    8 +-
 .../lib/hooks/__tests__/useDataSaver.spec.tsx |    2 +-
 .../src/lib/hooks/useTableState.ts            |   12 +-
 .../src/redux/interfaces/topic.ts             |    1 -
 .../consumerGroups/consumerGroupsSlice.ts     |    3 +-
 .../reducers/topics/__test__/reducer.spec.ts  |    2 -
 .../src/redux/reducers/topics/topicsSlice.ts  |    2 -
 23 files changed, 2532 insertions(+), 4847 deletions(-)
 delete mode 100644 kafka-ui-react-app/.husky/.gitignore
 rename kafka-ui-react-app/{config/jest => .jest}/cssTransform.js (83%)
 create mode 100644 kafka-ui-react-app/.jest/resolver.js

diff --git a/kafka-ui-react-app/.husky/.gitignore b/kafka-ui-react-app/.husky/.gitignore
deleted file mode 100644
index 31354ec1389..00000000000
--- a/kafka-ui-react-app/.husky/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_
diff --git a/kafka-ui-react-app/.husky/pre-commit b/kafka-ui-react-app/.husky/pre-commit
index b10cf37b9c2..9435e204339 100755
--- a/kafka-ui-react-app/.husky/pre-commit
+++ b/kafka-ui-react-app/.husky/pre-commit
@@ -1,11 +1,10 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-
 if git diff --cached --name-only | grep --quiet "kafka-ui-react-app"
 then
   cd kafka-ui-react-app && npm run pre-commit
-else 
+else
   echo "Skipping frontend tests"
   exit 0
 fi
diff --git a/kafka-ui-react-app/config/jest/cssTransform.js b/kafka-ui-react-app/.jest/cssTransform.js
similarity index 83%
rename from kafka-ui-react-app/config/jest/cssTransform.js
rename to kafka-ui-react-app/.jest/cssTransform.js
index 8f65114812a..a8b6e023e8d 100644
--- a/kafka-ui-react-app/config/jest/cssTransform.js
+++ b/kafka-ui-react-app/.jest/cssTransform.js
@@ -5,7 +5,9 @@
 
 module.exports = {
   process() {
-    return 'module.exports = {};';
+    return {
+      code: 'module.exports = {};',
+    };
   },
   getCacheKey() {
     // The output is always the same.
diff --git a/kafka-ui-react-app/.jest/resolver.js b/kafka-ui-react-app/.jest/resolver.js
new file mode 100644
index 00000000000..a1165c6e27d
--- /dev/null
+++ b/kafka-ui-react-app/.jest/resolver.js
@@ -0,0 +1,22 @@
+module.exports = (path, options) => {
+  // Call the defaultResolver, so we leverage its cache, error handling, etc.
+  return options.defaultResolver(path, {
+    ...options,
+    // Use packageFilter to process parsed `package.json` before
+    // the resolution (see https://www.npmjs.com/package/resolve#resolveid-opts-cb)
+    packageFilter: (pkg) => {
+      // jest-environment-jsdom 28+ tries to use browser exports instead of default exports,
+      // but @hookform/resolvers only offers an ESM browser export and not a CommonJS one. Jest does not yet
+      // support ESM modules natively, so this causes a Jest error related to trying to parse
+      // "export" syntax.
+      //
+      // This workaround prevents Jest from considering @hookform/resolvers module-based exports at all;
+      // it falls back to CommonJS+node "main" property.
+      if (pkg.name === '@hookform/resolvers') {
+        delete pkg['exports'];
+        delete pkg['module'];
+      }
+      return pkg;
+    },
+  });
+};
diff --git a/kafka-ui-react-app/jest.config.ts b/kafka-ui-react-app/jest.config.ts
index ef667cdf864..569e91e6145 100644
--- a/kafka-ui-react-app/jest.config.ts
+++ b/kafka-ui-react-app/jest.config.ts
@@ -10,6 +10,7 @@ export default {
     '<rootDir>/src/index.tsx',
     '<rootDir>/src/serviceWorker.ts',
   ],
+  resolver: '<rootDir>/.jest/resolver.js',
   setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
   testMatch: [
     '<rootDir>/src/**/__{test,tests}__/**/*.{spec,test}.{js,jsx,ts,tsx}',
@@ -17,7 +18,7 @@ export default {
   testEnvironment: 'jsdom',
   transform: {
     '\\.[jt]sx?$': 'babel-jest',
-    '^.+\\.css$': '<rootDir>/config/jest/cssTransform.js',
+    '^.+\\.css$': '<rootDir>/.jest/cssTransform.js',
   },
   transformIgnorePatterns: [
     '[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|cjs|ts|tsx)$',
diff --git a/kafka-ui-react-app/package-lock.json b/kafka-ui-react-app/package-lock.json
index dbb41a66744..ff16ec3dd13 100644
--- a/kafka-ui-react-app/package-lock.json
+++ b/kafka-ui-react-app/package-lock.json
@@ -12,20 +12,20 @@
         "@fortawesome/fontawesome-free": "^6.1.1",
         "@hookform/error-message": "^2.0.0",
         "@hookform/resolvers": "^2.7.1",
-        "@reduxjs/toolkit": "^1.8.1",
+        "@reduxjs/toolkit": "^1.8.2",
         "@rooks/use-outside-click-ref": "^4.10.1",
         "@testing-library/react": "^13.2.0",
         "@types/yup": "^0.29.13",
         "@vitejs/plugin-react": "^1.3.2",
         "ace-builds": "^1.4.12",
         "ajv": "^8.6.3",
-        "babel-jest": "^27.4.2",
+        "babel-jest": "^28.1.1",
         "bulma": "^0.9.3",
         "classnames": "^2.2.6",
         "dayjs": "^1.11.2",
         "fetch-mock": "^9.11.0",
-        "jest": "^27.4.3",
-        "jest-watch-typeahead": "^1.0.0",
+        "jest": "^28.1.1",
+        "jest-watch-typeahead": "^1.1.0",
         "json-schema-faker": "^0.5.0-rcv.39",
         "lodash": "^4.17.21",
         "node-fetch": "^2.6.1",
@@ -44,7 +44,6 @@
         "sass": "^1.52.3",
         "styled-components": "^5.3.1",
         "use-debounce": "^8.0.1",
-        "uuid": "^8.3.1",
         "vite": "^2.9.11",
         "vite-tsconfig-paths": "^3.5.0",
         "whatwg-fetch": "^3.6.2",
@@ -54,13 +53,13 @@
         "@babel/preset-env": "^7.18.2",
         "@babel/preset-react": "^7.17.12",
         "@babel/preset-typescript": "^7.17.12",
-        "@jest/types": "^28.1.0",
+        "@jest/types": "^28.1.1",
         "@openapitools/openapi-generator-cli": "^2.5.1",
         "@testing-library/dom": "^8.11.1",
         "@testing-library/jest-dom": "^5.16.4",
         "@testing-library/user-event": "^13.5.0",
         "@types/eventsource": "^1.1.8",
-        "@types/jest": "^27.5.1",
+        "@types/jest": "^28.1.3",
         "@types/lodash": "^4.14.172",
         "@types/node": "^16.4.13",
         "@types/react": "^18.0.9",
@@ -70,9 +69,8 @@
         "@types/react-router-dom": "^5.3.3",
         "@types/redux-mock-store": "^1.0.3",
         "@types/styled-components": "^5.1.13",
-        "@types/uuid": "^8.3.1",
-        "@typescript-eslint/eslint-plugin": "^5.10.0",
-        "@typescript-eslint/parser": "^5.27.0",
+        "@typescript-eslint/eslint-plugin": "^5.29.0",
+        "@typescript-eslint/parser": "^5.29.0",
         "dotenv": "^16.0.1",
         "eslint": "^8.3.0",
         "eslint-config-airbnb": "^19.0.4",
@@ -88,16 +86,17 @@
         "eslint-plugin-react": "^7.29.4",
         "eslint-plugin-react-hooks": "^4.5.0",
         "fetch-mock-jest": "^1.5.1",
-        "husky": "^7.0.1",
+        "husky": "^8.0.1",
+        "jest-environment-jsdom": "^28.1.1",
         "jest-sonar-reporter": "^2.0.0",
         "jest-styled-components": "^7.0.8",
-        "lint-staged": "^12.1.2",
+        "lint-staged": "^13.0.2",
         "prettier": "^2.3.1",
         "redux-mock-store": "^1.5.4",
         "rimraf": "^3.0.2",
-        "ts-jest": "^28.0.3",
-        "ts-node": "^10.8.0",
-        "typescript": "^4.3.5"
+        "ts-jest": "^28.0.5",
+        "ts-node": "^10.8.1",
+        "typescript": "^4.7.4"
       },
       "engines": {
         "node": "v16.15.0",
@@ -2478,15 +2477,15 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.0.tgz",
-      "integrity": "sha512-tscn3dlJFGay47kb4qVruQg/XWlmvU0xp3EJOjzzY+sBaI+YgwKcvAmTcyYU7xEiLLIY5HCdWRooAL8dqkFlDA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.1.tgz",
+      "integrity": "sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA==",
       "dependencies": {
-        "@jest/types": "^28.1.0",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^28.1.0",
-        "jest-util": "^28.1.0",
+        "jest-message-util": "^28.1.1",
+        "jest-util": "^28.1.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -2494,41 +2493,42 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
-      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/reporters": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.1.tgz",
+      "integrity": "sha512-3pYsBoZZ42tXMdlcFeCc/0j9kOlK7MYuXs2B1QbvDgMoW1K9NJ4G/VYvIbMb26iqlkTfPHo7SC2JgjDOk/mxXw==",
+      "dependencies": {
+        "@jest/console": "^28.1.1",
+        "@jest/reporters": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
+        "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^27.5.1",
-        "jest-config": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-resolve-dependencies": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "jest-watcher": "^27.5.1",
+        "jest-changed-files": "^28.0.2",
+        "jest-config": "^28.1.1",
+        "jest-haste-map": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-regex-util": "^28.0.2",
+        "jest-resolve": "^28.1.1",
+        "jest-resolve-dependencies": "^28.1.1",
+        "jest-runner": "^28.1.1",
+        "jest-runtime": "^28.1.1",
+        "jest-snapshot": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-validate": "^28.1.1",
+        "jest-watcher": "^28.1.1",
         "micromatch": "^4.0.4",
+        "pretty-format": "^28.1.1",
         "rimraf": "^3.0.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -2539,302 +2539,135 @@
         }
       }
     },
-    "node_modules/@jest/core/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/core/node_modules/emittery": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+    "node_modules/@jest/core/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@jest/core/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+    "node_modules/@jest/core/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@jest/core/node_modules/jest-watcher": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
-      "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
-      "dependencies": {
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "jest-util": "^27.5.1",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
+    "node_modules/@jest/core/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/@jest/environment": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
-      "dependencies": {
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/fake-timers": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.1.tgz",
+      "integrity": "sha512-9auVQ2GzQ7nrU+lAr8KyY838YahElTX9HVjbQPPS2XjlxQ+na18G113OoBhyBGBtD6ZnO/SrUy5WR8EzOj1/Uw==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@sinonjs/fake-timers": "^8.0.1",
+        "@jest/fake-timers": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
+        "jest-mock": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+    "node_modules/@jest/expect": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.1.tgz",
+      "integrity": "sha512-/+tQprrFoT6lfkMj4mW/mUIfAmmk/+iQPmg7mLDIFOf2lyf7EBHaS+x3RbeR0VZVMe55IvX7QRoT/2aK3AuUXg==",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "expect": "^28.1.1",
+        "jest-snapshot": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+    "node_modules/@jest/expect-utils": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.1.tgz",
+      "integrity": "sha512-n/ghlvdhCdMI/hTcnn4qV57kQuV9OTsZzH1TTCVARANKhl6hXJqLKUkwX69ftMGpsbpt96SsDD8n8LD2d9+FRw==",
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "jest-get-type": "^28.0.2"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+    "node_modules/@jest/fake-timers": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.1.tgz",
+      "integrity": "sha512-BY/3+TyLs5+q87rGWrGUY5f8e8uC3LsVHS9Diz8+FV3ARXL4sNnkLlIB8dvDvRrp+LUCGM+DLqlsYubizGUjIA==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
+        "@jest/types": "^28.1.1",
+        "@sinonjs/fake-timers": "^9.1.1",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "jest-message-util": "^28.1.1",
+        "jest-mock": "^28.1.1",
+        "jest-util": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/@jest/globals": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "expect": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.1.tgz",
+      "integrity": "sha512-dEgl/6v7ToB4vXItdvcltJBgny0xBE6xy6IYQrPJAJggdEinGxCDMivNv7sFzPcTITGquXD6UJwYxfJ/5ZwDSg==",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "@jest/environment": "^28.1.1",
+        "@jest/expect": "^28.1.1",
+        "@jest/types": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
-      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.1.tgz",
+      "integrity": "sha512-597Zj4D4d88sZrzM4atEGLuO7SdA/YrOv9SRXHXRNC+/FwPCWxZhBAEzhXoiJzfRwn8zes/EjS8Lo6DouGN5Gg==",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/console": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
+        "@jridgewell/trace-mapping": "^0.3.7",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
-        "glob": "^7.1.2",
+        "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-instrument": "^5.1.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-haste-map": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
+        "jest-message-util": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-worker": "^28.1.1",
         "slash": "^3.0.0",
-        "source-map": "^0.6.0",
         "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.1.0"
+        "v8-to-istanbul": "^9.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -2845,94 +2678,6 @@
         }
       }
     },
-    "node_modules/@jest/reporters/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
     "node_modules/@jest/schemas": {
       "version": "28.0.2",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
@@ -2945,25 +2690,25 @@
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.0.2.tgz",
+      "integrity": "sha512-Y9dxC8ZpN3kImkk0LkK5XCEneYMAXlZ8m5bflmSL5vrwyeUpJfentacCUg6fOb8NOpOO7hz2+l37MV77T6BFPw==",
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.7",
         "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9",
-        "source-map": "^0.6.0"
+        "graceful-fs": "^4.2.9"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.0.tgz",
-      "integrity": "sha512-sBBFIyoPzrZho3N+80P35A5oAkSKlGfsEFfXFWuPGBsW40UAjCkGakZhn4UQK4iQlW2vgCDMRDOob9FGKV8YoQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.1.tgz",
+      "integrity": "sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ==",
       "dependencies": {
-        "@jest/console": "^28.1.0",
-        "@jest/types": "^28.1.0",
+        "@jest/console": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
@@ -2972,181 +2717,54 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
-      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.1.tgz",
+      "integrity": "sha512-nuL+dNSVMcWB7OOtgb0EGH5AjO4UBCt68SLP08rwmC+iRhyuJWS9MtZ/MpipxFwKAlHFftbMsydXqWre8B0+XA==",
       "dependencies": {
-        "@jest/test-result": "^27.5.1",
+        "@jest/test-result": "^28.1.1",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-runtime": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/test-sequencer/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
+        "jest-haste-map": "^28.1.1",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@jest/test-sequencer/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+    "node_modules/@jest/transform": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.1.tgz",
+      "integrity": "sha512-PkfaTUuvjUarl1EDr5ZQcCA++oXkFCP9QFUkG0yVKVmNObjhrqDy0kbMpMebfHWm3CCDHjYNem9eUSH8suVNHQ==",
       "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^28.1.1",
+        "@jridgewell/trace-mapping": "^0.3.7",
+        "babel-plugin-istanbul": "^6.1.1",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^28.1.1",
+        "jest-regex-util": "^28.0.2",
+        "jest-util": "^28.1.1",
+        "micromatch": "^4.0.4",
+        "pirates": "^4.0.4",
+        "slash": "^3.0.0",
+        "write-file-atomic": "^4.0.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/@jest/test-sequencer/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+    "node_modules/@jest/types": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.1.tgz",
+      "integrity": "sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==",
       "dependencies": {
+        "@jest/schemas": "^28.0.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/test-sequencer/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/test-sequencer/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/test-sequencer/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/transform": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
-      "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^27.5.1",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/types": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.0.tgz",
-      "integrity": "sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
+        "@types/yargs": "^17.0.8",
         "chalk": "^4.0.0"
       },
       "engines": {
@@ -3187,9 +2805,9 @@
       "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.11.tgz",
-      "integrity": "sha512-RllI476aSMsxzeI9TtlSMoNTgHDxEmnl6GkkHwhr0vdL8W+0WuesyI8Vd3rBOfrwtPXbPxdT9ADJdiOKgzxPQA==",
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
+      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -3423,21 +3041,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/rxjs": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/rxjs/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/@openapitools/openapi-generator-cli/node_modules/tslib": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
@@ -3504,9 +3107,9 @@
       }
     },
     "node_modules/@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
+      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
       "dependencies": {
         "@sinonjs/commons": "^1.7.0"
       }
@@ -3620,35 +3223,36 @@
       }
     },
     "node_modules/@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true,
       "engines": {
-        "node": ">= 6"
+        "node": ">= 10"
       }
     },
     "node_modules/@tsconfig/node10": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
       "devOptional": true
     },
     "node_modules/@tsconfig/node12": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
       "devOptional": true
     },
     "node_modules/@tsconfig/node14": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
       "devOptional": true
     },
     "node_modules/@tsconfig/node16": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
+      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
       "devOptional": true
     },
     "node_modules/@types/aria-query": {
@@ -3744,13 +3348,57 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.1.tgz",
-      "integrity": "sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==",
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.3.tgz",
+      "integrity": "sha512-Tsbjk8Y2hkBaY/gJsataeb4q9Mubw9EOz7+4RjPkzD5KjTvHHs7cpws22InaoXxAVAhF5HfFbzJjo6oKWqSZLw==",
+      "dev": true,
+      "dependencies": {
+        "jest-matcher-utils": "^28.0.0",
+        "pretty-format": "^28.0.0"
+      }
+    },
+    "node_modules/@types/jest/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@types/jest/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/@types/jest/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "dev": true
+    },
+    "node_modules/@types/jsdom": {
+      "version": "16.2.14",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.14.tgz",
+      "integrity": "sha512-6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w==",
       "dev": true,
       "dependencies": {
-        "jest-matcher-utils": "^27.0.0",
-        "pretty-format": "^27.0.0"
+        "@types/node": "*",
+        "@types/parse5": "*",
+        "@types/tough-cookie": "*"
       }
     },
     "node_modules/@types/json-schema": {
@@ -3782,6 +3430,12 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
+    "node_modules/@types/parse5": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz",
+      "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==",
+      "dev": true
+    },
     "node_modules/@types/prettier": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
@@ -3823,10 +3477,9 @@
       }
     },
     "node_modules/@types/react-redux": {
-      "version": "7.1.22",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
-      "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
-      "dev": true,
+      "version": "7.1.24",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz",
+      "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==",
       "dependencies": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -3894,10 +3547,10 @@
         "@types/jest": "*"
       }
     },
-    "node_modules/@types/uuid": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
+    "node_modules/@types/tough-cookie": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
+      "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
       "dev": true
     },
     "node_modules/@types/yargs": {
@@ -3919,19 +3572,19 @@
       "integrity": "sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g=="
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz",
-      "integrity": "sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
+      "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.10.0",
-        "@typescript-eslint/type-utils": "5.10.0",
-        "@typescript-eslint/utils": "5.10.0",
-        "debug": "^4.3.2",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/type-utils": "5.29.0",
+        "@typescript-eslint/utils": "5.29.0",
+        "debug": "^4.3.4",
         "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.1.8",
+        "ignore": "^5.2.0",
         "regexpp": "^3.2.0",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "engines": {
@@ -3952,9 +3605,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -4124,14 +3777,14 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz",
-      "integrity": "sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
+      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "5.27.0",
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/typescript-estree": "5.27.0",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.29.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -4150,80 +3803,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz",
-      "integrity": "sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/visitor-keys": "5.27.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz",
-      "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz",
-      "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/visitor-keys": "5.27.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz",
-      "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.27.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@typescript-eslint/parser/node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -4241,15 +3820,6 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/parser/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -4257,13 +3827,13 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz",
-      "integrity": "sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
+      "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/visitor-keys": "5.10.0"
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/visitor-keys": "5.29.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4274,13 +3844,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz",
-      "integrity": "sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz",
+      "integrity": "sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/utils": "5.10.0",
-        "debug": "^4.3.2",
+        "@typescript-eslint/utils": "5.29.0",
+        "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
       "engines": {
@@ -4300,9 +3870,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -4323,9 +3893,9 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.0.tgz",
-      "integrity": "sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
+      "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4336,17 +3906,17 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz",
-      "integrity": "sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
+      "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/visitor-keys": "5.10.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/visitor-keys": "5.29.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "engines": {
@@ -4363,9 +3933,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -4379,60 +3949,24 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
+      "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
       "dev": true,
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.0.tgz",
-      "integrity": "sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.10.0",
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/typescript-estree": "5.10.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
+        "@types/json-schema": "^7.0.9",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.29.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4445,20 +3979,14 @@
         "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@types/json-schema": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz",
-      "integrity": "sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
+      "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.10.0",
-        "eslint-visitor-keys": "^3.0.0"
+        "@typescript-eslint/types": "5.29.0",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4469,9 +3997,9 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
-      "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4523,7 +4051,8 @@
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "dev": true
     },
     "node_modules/ace-builds": {
       "version": "1.4.13",
@@ -4534,6 +4063,7 @@
       "version": "8.7.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
       "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "devOptional": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4545,6 +4075,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
       "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
       "dependencies": {
         "acorn": "^7.1.1",
         "acorn-walk": "^7.1.1"
@@ -4554,6 +4085,7 @@
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
       "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4561,6 +4093,15 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/acorn-globals/node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -4571,9 +4112,10 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "devOptional": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -4582,6 +4124,7 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
       "dependencies": {
         "debug": "4"
       },
@@ -4593,6 +4136,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -4608,7 +4152,8 @@
     "node_modules/agent-base/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
@@ -4638,15 +4183,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -4921,15 +4457,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-includes/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/array-includes/node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -5154,15 +4681,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flat/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/array.prototype.flat/node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -5410,15 +4928,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.flatmap/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/array.prototype.flatmap/node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -5529,7 +5038,8 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
     },
     "node_modules/atob": {
       "version": "2.1.2",
@@ -5568,49 +5078,25 @@
       "dev": true
     },
     "node_modules/babel-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.1.tgz",
+      "integrity": "sha512-MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw==",
       "dependencies": {
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/transform": "^28.1.1",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^27.5.1",
+        "babel-preset-jest": "^28.1.1",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/babel-jest/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
     "node_modules/babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
@@ -5636,17 +5122,17 @@
       }
     },
     "node_modules/babel-plugin-jest-hoist": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.1.tgz",
+      "integrity": "sha512-NovGCy5Hn25uMJSAU8FaHqzs13cFoOI4lhIujiepssjCKRsAo3TA734RDWSGxuFTsUJXerYOqQQodlxgmtqbzw==",
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
+        "@types/babel__core": "^7.1.14",
         "@types/babel__traverse": "^7.0.6"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/babel-plugin-macros": {
@@ -5760,15 +5246,15 @@
       }
     },
     "node_modules/babel-preset-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.1.tgz",
+      "integrity": "sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g==",
       "dependencies": {
-        "babel-plugin-jest-hoist": "^27.5.1",
+        "babel-plugin-jest-hoist": "^28.1.1",
         "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
@@ -5900,7 +5386,8 @@
     "node_modules/browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
     },
     "node_modules/browserslist": {
       "version": "4.20.4",
@@ -5975,9 +5462,9 @@
       }
     },
     "node_modules/buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
     "node_modules/bulma": {
       "version": "0.9.3",
@@ -6175,60 +5662,20 @@
         "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/cli-truncate/node_modules/ansi-styles": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
-      "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/cli-truncate/node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
-    "node_modules/cli-truncate/node_modules/is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-truncate/node_modules/slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
     "node_modules/cli-truncate/node_modules/string-width": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.0.1.tgz",
-      "integrity": "sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
       "dependencies": {
+        "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
-        "is-fullwidth-code-point": "^4.0.0",
         "strip-ansi": "^7.0.1"
       },
       "engines": {
@@ -6308,10 +5755,17 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
+    "node_modules/colorette": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "dev": true
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -6540,14 +5994,16 @@
       "dev": true
     },
     "node_modules/cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "dev": true
     },
     "node_modules/cssstyle": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
       "dependencies": {
         "cssom": "~0.3.6"
       },
@@ -6558,7 +6014,8 @@
     "node_modules/cssstyle/node_modules/cssom": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
     },
     "node_modules/csstype": {
       "version": "3.0.8",
@@ -6572,48 +6029,51 @@
       "dev": true
     },
     "node_modules/data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "dev": true,
       "dependencies": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/data-urls/node_modules/tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
       "dependencies": {
         "punycode": "^2.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/data-urls/node_modules/webidl-conversions": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
       "engines": {
-        "node": ">=10.4"
+        "node": ">=12"
       }
     },
     "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dev": true,
       "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/date-fns": {
@@ -6646,7 +6106,8 @@
     "node_modules/decimal.js": {
       "version": "10.3.1",
       "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+      "dev": true
     },
     "node_modules/decode-uri-component": {
       "version": "0.2.0",
@@ -6665,7 +6126,8 @@
     "node_modules/deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
     },
     "node_modules/deepmerge": {
       "version": "4.2.2",
@@ -6700,6 +6162,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -6732,11 +6195,11 @@
       "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
     },
     "node_modules/diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz",
+      "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/dir-glob": {
@@ -6770,22 +6233,24 @@
       "dev": true
     },
     "node_modules/domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "dev": true,
       "dependencies": {
-        "webidl-conversions": "^5.0.0"
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/dotenv": {
@@ -6797,6 +6262,12 @@
         "node": ">=12"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "node_modules/easy-table": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz",
@@ -6827,18 +6298,6 @@
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -7227,6 +6686,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
       "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
       "dependencies": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
@@ -7248,6 +6708,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
       "engines": {
         "node": ">=4.0"
       }
@@ -7256,6 +6717,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "dev": true,
       "dependencies": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -7268,6 +6730,7 @@
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
       "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
       "dependencies": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.6",
@@ -7284,6 +6747,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -7291,7 +6755,8 @@
     "node_modules/escodegen/node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "dev": true,
       "dependencies": {
         "prelude-ls": "~1.1.2"
       },
@@ -7468,15 +6933,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-config-airbnb-base/node_modules/object.entries": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
@@ -7592,15 +7048,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-config-airbnb/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-config-airbnb/node_modules/object.entries": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
@@ -8060,15 +7507,6 @@
         "node": ">=4.0"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/eslint-plugin-prettier": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
@@ -8212,159 +7650,29 @@
         "eslint": "^7.5.0 || ^8.0.0"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
-      "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/visitor-keys": "5.23.0"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/types": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
-      "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
       "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
-      "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/visitor-keys": "5.23.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/utils": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
-      "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.23.0",
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/typescript-estree": "5.23.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
-      "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "eslint-visitor-keys": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/mysticatea"
@@ -8602,6 +7910,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8637,59 +7946,18 @@
       }
     },
     "node_modules/expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/expect/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/expect/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/expect/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.1.tgz",
+      "integrity": "sha512-/AANEwGL0tWBwzLNOvO0yUdy2D52jVdNXppOqswC49sxMN2cPWsGCQdzuIf9tj6hHoBQzNvx75JUYuQAckPo3w==",
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "@jest/expect-utils": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "jest-matcher-utils": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-util": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/external-editor": {
@@ -8741,7 +8009,8 @@
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
     },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
@@ -8938,9 +8207,10 @@
       }
     },
     "node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -9133,15 +8403,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/function.prototype.name/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/function.prototype.name/node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -9483,14 +8744,15 @@
       }
     },
     "node_modules/html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
       "dependencies": {
-        "whatwg-encoding": "^1.0.5"
+        "whatwg-encoding": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/html-escaper": {
@@ -9499,11 +8761,12 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
     },
     "node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
       "dependencies": {
-        "@tootallnate/once": "1",
+        "@tootallnate/once": "2",
         "agent-base": "6",
         "debug": "4"
       },
@@ -9515,6 +8778,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -9530,12 +8794,14 @@
     "node_modules/http-proxy-agent/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -9548,6 +8814,7 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -9563,7 +8830,8 @@
     "node_modules/https-proxy-agent/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/human-signals": {
       "version": "2.1.0",
@@ -9574,15 +8842,15 @@
       }
     },
     "node_modules/husky": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz",
-      "integrity": "sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
+      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
       "dev": true,
       "bin": {
         "husky": "lib/bin.js"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/sponsors/typicode"
@@ -9592,6 +8860,7 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -9732,21 +9001,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/inquirer/node_modules/rxjs": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/internal-slot": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
@@ -9915,7 +9169,8 @@
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
     },
     "node_modules/is-shared-array-buffer": {
       "version": "1.0.1",
@@ -9969,11 +9224,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
-    },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
@@ -10103,19 +9353,20 @@
       }
     },
     "node_modules/jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
-      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.1.tgz",
+      "integrity": "sha512-qw9YHBnjt6TCbIDMPMpJZqf9E12rh6869iZaN08/vpOGgHJSAaLLUn6H8W3IAEuy34Ls3rct064mZLETkxJ2XA==",
       "dependencies": {
-        "@jest/core": "^27.5.1",
+        "@jest/core": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.5.1"
+        "jest-cli": "^28.1.1"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -10127,181 +9378,99 @@
       }
     },
     "node_modules/jest-changed-files": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
-      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.0.2.tgz",
+      "integrity": "sha512-QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
         "execa": "^5.0.0",
         "throat": "^6.0.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/jest-circus": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
-      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.1.tgz",
+      "integrity": "sha512-75+BBVTsL4+p2w198DQpCeyh1RdaS2lhEG87HkaFX/UG0gJExVq2skG2pT7XZEGBubNj2CytcWSPan4QEPNosw==",
+      "dependencies": {
+        "@jest/environment": "^28.1.1",
+        "@jest/expect": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
-        "expect": "^27.5.1",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
+        "jest-each": "^28.1.1",
+        "jest-matcher-utils": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-runtime": "^28.1.1",
+        "jest-snapshot": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "pretty-format": "^28.1.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3",
         "throat": "^6.0.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-circus/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
+    "node_modules/jest-circus/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-circus/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+    "node_modules/jest-circus/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
       "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-circus/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+    "node_modules/jest-circus/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
+    "node_modules/jest-cli": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.1.tgz",
+      "integrity": "sha512-+sUfVbJqb1OjBZ0OdBbI6OWfYM1i7bSfzYy6gze1F1w3OKWq8ZTEKkZ8a7ZQPq6G/G1qMh/uKqpdWhgl11NFQQ==",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-circus/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-cli": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
-      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
-      "dependencies": {
-        "@jest/core": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/core": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
+        "jest-config": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-validate": "^28.1.1",
         "prompts": "^2.0.1",
-        "yargs": "^16.2.0"
+        "yargs": "^17.3.1"
       },
       "bin": {
         "jest": "bin/jest.js"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       },
       "peerDependencies": {
         "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
@@ -10312,598 +9481,285 @@
         }
       }
     },
-    "node_modules/jest-cli/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-cli/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+    "node_modules/jest-cli/node_modules/yargs": {
+      "version": "17.5.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/jest-cli/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
+    "node_modules/jest-cli/node_modules/yargs-parser": {
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=12"
       }
     },
     "node_modules/jest-config": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
-      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
-      "dependencies": {
-        "@babel/core": "^7.8.0",
-        "@jest/test-sequencer": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "babel-jest": "^27.5.1",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.1.tgz",
+      "integrity": "sha512-tASynMhS+jVV85zKvjfbJ8nUyJS/jUSYZ5KQxLUN2ZCvcQc/OmhQl2j6VEL3ezQkNofxn5pQ3SPYWPHb0unTZA==",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^28.1.1",
+        "@jest/types": "^28.1.1",
+        "babel-jest": "^28.1.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
+        "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-jasmine2": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
+        "jest-circus": "^28.1.1",
+        "jest-environment-node": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "jest-regex-util": "^28.0.2",
+        "jest-resolve": "^28.1.1",
+        "jest-runner": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-validate": "^28.1.1",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^27.5.1",
+        "pretty-format": "^28.1.1",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       },
       "peerDependencies": {
+        "@types/node": "*",
         "ts-node": ">=9.0.0"
       },
       "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
         "ts-node": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-config/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
+    "node_modules/jest-config/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-config/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-config/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+    "node_modules/jest-config/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
+    "node_modules/jest-diff": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.1.tgz",
+      "integrity": "sha512-/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
         "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "diff-sequences": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "pretty-format": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+    "node_modules/jest-diff/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
+    "node_modules/jest-diff/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
     "node_modules/jest-docblock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz",
+      "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==",
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/jest-each": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.1.tgz",
+      "integrity": "sha512-A042rqh17ZvEhRceDMi784ppoXR7MWGDEKTXEZXb4svt0eShMZvijGxzKsx+yIjeE8QYmHPrnHiTSQVhN4nqaw==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
+        "@jest/types": "^28.1.1",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1"
+        "jest-get-type": "^28.0.2",
+        "jest-util": "^28.1.1",
+        "pretty-format": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-each/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
+    "node_modules/jest-each/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-each/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+    "node_modules/jest-each/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
+    "node_modules/jest-each/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
     "node_modules/jest-environment-jsdom": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
-      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.1.tgz",
+      "integrity": "sha512-41ZvgSoPNcKG5q3LuuOcAczdBxRq9DbZkPe24okN6ZCmiZdAfFtPg3z+lOtsT1fM6OAERApKT+3m0MRDQH2zIA==",
+      "dev": true,
       "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/environment": "^28.1.1",
+        "@jest/fake-timers": "^28.1.1",
+        "@jest/types": "^28.1.1",
+        "@types/jsdom": "^16.2.4",
         "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jsdom": "^16.6.0"
+        "jest-mock": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jsdom": "^19.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+    "node_modules/jest-environment-node": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.1.tgz",
+      "integrity": "sha512-2aV/eeY/WNgUUJrrkDJ3cFEigjC5fqT1+fCclrY6paqJ5zVPoM//sHmfgUUp7WLYxIdbPwMiVIzejpN56MxnNA==",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
+        "@jest/environment": "^28.1.1",
+        "@jest/fake-timers": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "jest-mock": "^28.1.1",
+        "jest-util": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+    "node_modules/jest-get-type": {
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
+      "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==",
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+    "node_modules/jest-haste-map": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.1.tgz",
+      "integrity": "sha512-ZrRSE2o3Ezh7sb1KmeLEZRZ4mgufbrMwolcFHNRSjKZhpLa8TdooXOOFlSwoUzlbVs1t0l7upVRW2K7RWGHzbQ==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
+        "@jest/types": "^28.1.1",
+        "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
         "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "jest-regex-util": "^28.0.2",
+        "jest-util": "^28.1.1",
+        "jest-worker": "^28.1.1",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-environment-node": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
-      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "node_modules/jest-environment-node/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+    "node_modules/jest-leak-detector": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.1.tgz",
+      "integrity": "sha512-4jvs8V8kLbAaotE+wFR7vfUGf603cwYtFf1/PYEsyX2BAjSzj8hQSVTP6OWzseTl0xL6dyHuKs2JAks7Pfubmw==",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "jest-get-type": "^28.0.2",
+        "pretty-format": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-environment-node/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
-      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/graceful-fs": "^4.1.2",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^27.5.1",
-        "jest-serializer": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
-      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^27.5.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-leak-detector": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
-      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
-      "dependencies": {
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-message-util": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.0.tgz",
-      "integrity": "sha512-RpA8mpaJ/B2HphDMiDlrAZdDytkmwFqgjDZovM21F35lHGeUeCvYmm6W+sbQ0ydaLpg5bFAUuWG1cjqOl8vqrw==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.0",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
+    "node_modules/jest-leak-detector/node_modules/ansi-styles": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
@@ -10911,430 +9767,249 @@
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/pretty-format": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-      "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg=="
-    },
-    "node_modules/jest-mock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-mock/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-mock/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
-      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
-      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-snapshot": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
-      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-leak-detector": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "source-map-support": "^0.5.6",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+    "node_modules/jest-leak-detector/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
       "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+    "node_modules/jest-leak-detector/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.1.tgz",
+      "integrity": "sha512-NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw==",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "chalk": "^4.0.0",
+        "jest-diff": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "pretty-format": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/emittery": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runner/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+    "node_modules/jest-matcher-utils/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
+      "dependencies": {
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
+    "node_modules/jest-message-util": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.1.tgz",
+      "integrity": "sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ==",
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
+        "@jest/types": "^28.1.1",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
+        "pretty-format": "^28.1.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runtime": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/globals": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
+    "node_modules/jest-message-util/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
+      "dependencies": {
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+    "node_modules/jest-message-util/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
+    "node_modules/jest-mock": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.1.tgz",
+      "integrity": "sha512-bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
+        "@jest/types": "^28.1.1",
+        "@types/node": "*"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "engines": {
+        "node": ">=6"
       },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
+      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+    "node_modules/jest-resolve": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.1.tgz",
+      "integrity": "sha512-/d1UbyUkf9nvsgdBildLe6LAD4DalgkgZcKd0nZ8XUGPyA/7fsnaQIlKVnDiuUXv/IeZhPEDrRJubVSulxrShA==",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^28.1.1",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^28.1.1",
+        "jest-validate": "^28.1.1",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^1.1.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-resolve-dependencies": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.1.tgz",
+      "integrity": "sha512-p8Y150xYJth4EXhOuB8FzmS9r8IGLEioiaetgdNGb9VHka4fl0zqWlVe4v7mSkYOuEUg2uB61iE+zySDgrOmgQ==",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "jest-regex-util": "^28.0.2",
+        "jest-snapshot": "^28.1.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
+    "node_modules/jest-runner": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.1.tgz",
+      "integrity": "sha512-W5oFUiDBgTsCloTAj6q95wEvYDB0pxIhY6bc5F26OucnwBN+K58xGTGbliSMI4ChQal5eANDF+xvELaYkJxTmA==",
+      "dependencies": {
+        "@jest/console": "^28.1.1",
+        "@jest/environment": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
+        "@types/node": "*",
         "chalk": "^4.0.0",
+        "emittery": "^0.10.2",
         "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "jest-docblock": "^28.1.1",
+        "jest-environment-node": "^28.1.1",
+        "jest-haste-map": "^28.1.1",
+        "jest-leak-detector": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-resolve": "^28.1.1",
+        "jest-runtime": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-watcher": "^28.1.1",
+        "jest-worker": "^28.1.1",
+        "source-map-support": "0.5.13",
+        "throat": "^6.0.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
+    "node_modules/jest-runtime": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.1.tgz",
+      "integrity": "sha512-J89qEJWW0leOsqyi0D9zHpFEYHwwafFdS9xgvhFHtIdRghbadodI0eA+DrthK/1PebBv3Px8mFSMGKrtaVnleg==",
+      "dependencies": {
+        "@jest/environment": "^28.1.1",
+        "@jest/fake-timers": "^28.1.1",
+        "@jest/globals": "^28.1.1",
+        "@jest/source-map": "^28.0.2",
+        "@jest/test-result": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "execa": "^5.0.0",
+        "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "jest-haste-map": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-mock": "^28.1.1",
+        "jest-regex-util": "^28.0.2",
+        "jest-resolve": "^28.1.1",
+        "jest-snapshot": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/jest-runtime/node_modules/strip-bom": {
@@ -11345,108 +10020,69 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-serializer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-      "dependencies": {
-        "@types/node": "*",
-        "graceful-fs": "^4.2.9"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
     "node_modules/jest-snapshot": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.1.tgz",
+      "integrity": "sha512-1KjqHJ98adRcbIdMizjF5DipwZFbvxym/kFO4g4fVZCZRxH/dqV8TiBFCa6rqic3p0karsy8RWS1y4E07b7P0A==",
       "dependencies": {
-        "@babel/core": "^7.7.2",
+        "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/babel__traverse": "^7.0.4",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
+        "@types/babel__traverse": "^7.0.6",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.5.1",
+        "expect": "^28.1.1",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
+        "jest-diff": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "jest-haste-map": "^28.1.1",
+        "jest-matcher-utils": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-util": "^28.1.1",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.5.1",
-        "semver": "^7.3.2"
+        "pretty-format": "^28.1.1",
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
+    "node_modules/jest-snapshot/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "node": ">=10"
       },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-snapshot/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+    "node_modules/jest-snapshot/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
+    "node_modules/jest-snapshot/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
     "node_modules/jest-sonar-reporter": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/jest-sonar-reporter/-/jest-sonar-reporter-2.0.0.tgz",
@@ -11475,11 +10111,11 @@
       }
     },
     "node_modules/jest-util": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.0.tgz",
-      "integrity": "sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.1.tgz",
+      "integrity": "sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw==",
       "dependencies": {
-        "@jest/types": "^28.1.0",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -11491,44 +10127,51 @@
       }
     },
     "node_modules/jest-validate": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
-      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.1.tgz",
+      "integrity": "sha512-Kpf6gcClqFCIZ4ti5++XemYJWUPCFUW+N2gknn+KgnDf549iLul3cBuKVe1YcWRlaF8tZV8eJCap0eECOEE3Ug==",
       "dependencies": {
-        "@jest/types": "^27.5.1",
+        "@jest/types": "^28.1.1",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
+        "jest-get-type": "^28.0.2",
         "leven": "^3.1.0",
-        "pretty-format": "^27.5.1"
+        "pretty-format": "^28.1.1"
       },
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
+    "node_modules/jest-validate/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-validate/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+    "node_modules/jest-validate/node_modules/pretty-format": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "@jest/schemas": "^28.0.2",
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
+    "node_modules/jest-validate/node_modules/react-is": {
+      "version": "18.2.0",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+    },
     "node_modules/jest-watch-typeahead": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
@@ -11543,18 +10186,10 @@
         "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "jest": "^27.0.0 || ^28.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "jest": "^27.0.0 || ^28.0.0"
       }
     },
     "node_modules/jest-watch-typeahead/node_modules/slash": {
@@ -11617,17 +10252,17 @@
       }
     },
     "node_modules/jest-watcher": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.0.tgz",
-      "integrity": "sha512-tNHMtfLE8Njcr2IRS+5rXYA4BhU90gAOwI9frTGOqd+jX0P/Au/JfRSNqsf5nUTcWdbVYuLxS1KjnzILSoR5hA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.1.tgz",
+      "integrity": "sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug==",
       "dependencies": {
-        "@jest/test-result": "^28.1.0",
-        "@jest/types": "^28.1.0",
+        "@jest/test-result": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.10.2",
-        "jest-util": "^28.1.0",
+        "jest-util": "^28.1.1",
         "string-length": "^4.0.1"
       },
       "engines": {
@@ -11635,16 +10270,16 @@
       }
     },
     "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.1.tgz",
+      "integrity": "sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ==",
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
       }
     },
     "node_modules/jest-worker/node_modules/supports-color": {
@@ -11684,22 +10319,23 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
+      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
+      "dev": true,
       "dependencies": {
         "abab": "^2.0.5",
-        "acorn": "^8.2.4",
+        "acorn": "^8.5.0",
         "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
+        "cssom": "^0.5.0",
         "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
+        "data-urls": "^3.0.1",
+        "decimal.js": "^10.3.1",
+        "domexception": "^4.0.0",
         "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "is-potential-custom-element-name": "^1.0.1",
         "nwsapi": "^2.2.0",
@@ -11708,16 +10344,16 @@
         "symbol-tree": "^3.2.4",
         "tough-cookie": "^4.0.0",
         "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
-        "xml-name-validator": "^3.0.0"
+        "w3c-xmlserializer": "^3.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0",
+        "ws": "^8.2.3",
+        "xml-name-validator": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "peerDependencies": {
         "canvas": "^2.5.0"
@@ -11729,35 +10365,37 @@
       }
     },
     "node_modules/jsdom/node_modules/tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dev": true,
       "dependencies": {
         "punycode": "^2.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
     "node_modules/jsdom/node_modules/webidl-conversions": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
       "engines": {
-        "node": ">=10.4"
+        "node": ">=12"
       }
     },
     "node_modules/jsdom/node_modules/whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
+      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
+      "dev": true,
       "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/jsesc": {
@@ -11899,9 +10537,9 @@
       }
     },
     "node_modules/lilconfig": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
-      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
+      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -11913,46 +10551,48 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "node_modules/lint-staged": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.1.2.tgz",
-      "integrity": "sha512-bSMcQVqMW98HLLLR2c2tZ+vnDCnx4fd+0QJBQgN/4XkdspGRPc8DGp7UuOEBe1ApCfJ+wXXumYnJmU+wDo7j9A==",
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.2.tgz",
+      "integrity": "sha512-qQLfLTh9z34eMzfEHENC+QBskZfxjomrf+snF3xJ4BzilORbD989NLqQ00ughsF/A+PT41e87+WsMFabf9++pQ==",
       "dev": true,
       "dependencies": {
         "cli-truncate": "^3.1.0",
-        "colorette": "^2.0.16",
-        "commander": "^8.3.0",
-        "debug": "^4.3.2",
-        "enquirer": "^2.3.6",
-        "execa": "^5.1.1",
-        "lilconfig": "2.0.4",
-        "listr2": "^3.13.3",
-        "micromatch": "^4.0.4",
+        "colorette": "^2.0.17",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4",
+        "execa": "^6.1.0",
+        "lilconfig": "2.0.5",
+        "listr2": "^4.0.5",
+        "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
-        "object-inspect": "^1.11.0",
+        "object-inspect": "^1.12.2",
+        "pidtree": "^0.6.0",
         "string-argv": "^0.3.1",
-        "supports-color": "^9.0.2",
-        "yaml": "^1.10.2"
+        "yaml": "^2.1.1"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": "^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/lint-staged"
       }
     },
-    "node_modules/lint-staged/node_modules/colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-      "dev": true
+    "node_modules/lint-staged/node_modules/commander": {
+      "version": "9.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz",
+      "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
+      }
     },
     "node_modules/lint-staged/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -11966,37 +10606,135 @@
         }
       }
     },
+    "node_modules/lint-staged/node_modules/execa": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
+      "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.1",
+        "human-signals": "^3.0.1",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^3.0.7",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/lint-staged/node_modules/human-signals": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
+      "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.20.0"
+      }
+    },
+    "node_modules/lint-staged/node_modules/is-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/lint-staged/node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/lint-staged/node_modules/object-inspect": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-      "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+    "node_modules/lint-staged/node_modules/npm-run-path": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
       "dev": true,
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lint-staged/node_modules/supports-color": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.1.tgz",
-      "integrity": "sha512-Obv7ycoCTG51N7y175StI9BlAXrmgZrFhZOb0/PyjHBher/NmsdBgbbQ1Inhq+gIhz6+7Gb+jWF2Vqi7Mf1xnQ==",
+    "node_modules/lint-staged/node_modules/onetime": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
       "dev": true,
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
       "engines": {
         "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lint-staged/node_modules/yaml": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
+      "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14"
       }
     },
     "node_modules/listr2": {
-      "version": "3.13.5",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.5.tgz",
-      "integrity": "sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
+      "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==",
       "dev": true,
       "dependencies": {
         "cli-truncate": "^2.1.0",
@@ -12004,12 +10742,12 @@
         "log-update": "^4.0.0",
         "p-map": "^4.0.0",
         "rfdc": "^1.3.0",
-        "rxjs": "^7.4.0",
+        "rxjs": "^7.5.5",
         "through": "^2.3.8",
         "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=12"
       },
       "peerDependencies": {
         "enquirer": ">= 2.3.0 < 3"
@@ -12036,12 +10774,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/listr2/node_modules/colorette": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-      "dev": true
-    },
     "node_modules/listr2/node_modules/slice-ansi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -12152,6 +10884,23 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/log-update/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
     "node_modules/log-update/node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -12225,11 +10974,11 @@
       "devOptional": true
     },
     "node_modules/makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dependencies": {
-        "tmpl": "1.0.x"
+        "tmpl": "1.0.5"
       }
     },
     "node_modules/match-sorter": {
@@ -12256,12 +11005,12 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "engines": {
         "node": ">=8.6"
@@ -12276,6 +11025,7 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -12284,6 +11034,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -12406,7 +11157,7 @@
     "node_modules/node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
     },
     "node_modules/node-releases": {
       "version": "2.0.5",
@@ -12435,7 +11186,8 @@
     "node_modules/nwsapi": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
@@ -12455,9 +11207,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -12641,15 +11393,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.entries/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.entries/node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -12896,15 +11639,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.fromentries/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.fromentries/node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -13163,15 +11897,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.hasown/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.hasown/node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -13386,15 +12111,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.values/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.values/node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -13659,7 +12375,8 @@
     "node_modules/parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
     },
     "node_modules/path-exists": {
       "version": "3.0.0",
@@ -13706,9 +12423,9 @@
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
     "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "engines": {
         "node": ">=8.6"
       },
@@ -13716,6 +12433,18 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
+      "dev": true,
+      "bin": {
+        "pidtree": "bin/pidtree.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/pirates": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
@@ -13933,7 +12662,8 @@
     "node_modules/psl": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
     },
     "node_modules/punycode": {
       "version": "2.1.1",
@@ -14161,17 +12891,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/react-redux/node_modules/@types/react-redux": {
-      "version": "7.1.22",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
-      "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
-      "dependencies": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
     "node_modules/react-redux/node_modules/react-is": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -14562,12 +13281,12 @@
       }
     },
     "node_modules/rxjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
-      "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
       "dev": true,
       "dependencies": {
-        "tslib": "~2.1.0"
+        "tslib": "^2.1.0"
       }
     },
     "node_modules/rxjs/node_modules/tslib": {
@@ -14599,7 +13318,8 @@
     "node_modules/safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
     },
     "node_modules/sass": {
       "version": "1.52.3",
@@ -14621,6 +13341,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
       "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
@@ -14707,22 +13428,45 @@
       }
     },
     "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
+      "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -14751,9 +13495,9 @@
       }
     },
     "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -14934,15 +13678,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/string.prototype.matchall/node_modules/object-inspect": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
@@ -15104,7 +13839,8 @@
     "node_modules/symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
     },
     "node_modules/terminal-link": {
       "version": "2.1.1",
@@ -15196,6 +13932,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
       "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dev": true,
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -15209,6 +13946,7 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
       "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -15231,9 +13969,9 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "28.0.3",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.3.tgz",
-      "integrity": "sha512-HzgbEDQ2KgVtDmpXToqAcKTyGHdHsG23i/iUjfxji92G5eT09S1m9UHZd7csF0Bfgh9txM4JzwHnv7r1waFPlw==",
+      "version": "28.0.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.5.tgz",
+      "integrity": "sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==",
       "dev": true,
       "dependencies": {
         "bs-logger": "0.x",
@@ -15243,7 +13981,7 @@
         "lodash.memoize": "4.x",
         "make-error": "1.x",
         "semver": "7.x",
-        "yargs-parser": "^20.x"
+        "yargs-parser": "^21.0.1"
       },
       "bin": {
         "ts-jest": "cli.js"
@@ -15253,7 +13991,6 @@
       },
       "peerDependencies": {
         "@babel/core": ">=7.0.0-beta.0 <8",
-        "@types/jest": "^27.0.0",
         "babel-jest": "^28.0.0",
         "jest": "^28.0.0",
         "typescript": ">=4.3"
@@ -15262,9 +13999,6 @@
         "@babel/core": {
           "optional": true
         },
-        "@types/jest": {
-          "optional": true
-        },
         "babel-jest": {
           "optional": true
         },
@@ -15285,10 +14019,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/ts-jest/node_modules/yargs-parser": {
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/ts-node": {
-      "version": "10.8.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.0.tgz",
-      "integrity": "sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==",
+      "version": "10.8.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz",
+      "integrity": "sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==",
       "devOptional": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
@@ -15328,15 +14071,6 @@
         }
       }
     },
-    "node_modules/ts-node/node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "devOptional": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/tsconfig-paths": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
@@ -15401,18 +14135,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "node_modules/typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
+      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
       "devOptional": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -15524,6 +14250,7 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -15541,24 +14268,16 @@
       "devOptional": true
     },
     "node_modules/v8-to-istanbul": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz",
+      "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==",
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/v8-to-istanbul/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+        "convert-source-map": "^1.6.0"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10.12.0"
       }
     },
     "node_modules/vite": {
@@ -15657,27 +14376,29 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
       "dependencies": {
         "browser-process-hrtime": "^1.0.0"
       }
     },
     "node_modules/w3c-xmlserializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
+      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
+      "dev": true,
       "dependencies": {
-        "xml-name-validator": "^3.0.0"
+        "xml-name-validator": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dependencies": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "node_modules/warning": {
@@ -15703,11 +14424,27 @@
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
     "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
       "dependencies": {
-        "iconv-lite": "0.4.24"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
     "node_modules/whatwg-fetch": {
@@ -15716,9 +14453,13 @@
       "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
     },
     "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/whatwg-url": {
       "version": "6.5.0",
@@ -15764,6 +14505,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -15790,22 +14532,24 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
       "dependencies": {
         "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16"
       }
     },
     "node_modules/ws": {
-      "version": "7.5.8",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz",
-      "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
+      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+      "dev": true,
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
@@ -15827,14 +14571,19 @@
       "dev": true
     },
     "node_modules/xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
     },
     "node_modules/y18n": {
       "version": "5.0.8",
@@ -15862,6 +14611,7 @@
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -15879,6 +14629,7 @@
       "version": "20.2.7",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
       "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -17589,381 +16340,158 @@
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
     },
     "@jest/console": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.0.tgz",
-      "integrity": "sha512-tscn3dlJFGay47kb4qVruQg/XWlmvU0xp3EJOjzzY+sBaI+YgwKcvAmTcyYU7xEiLLIY5HCdWRooAL8dqkFlDA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.1.tgz",
+      "integrity": "sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA==",
       "requires": {
-        "@jest/types": "^28.1.0",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^28.1.0",
-        "jest-util": "^28.1.0",
+        "jest-message-util": "^28.1.1",
+        "jest-util": "^28.1.1",
         "slash": "^3.0.0"
       }
     },
     "@jest/core": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
-      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
-      "requires": {
-        "@jest/console": "^27.5.1",
-        "@jest/reporters": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.1.tgz",
+      "integrity": "sha512-3pYsBoZZ42tXMdlcFeCc/0j9kOlK7MYuXs2B1QbvDgMoW1K9NJ4G/VYvIbMb26iqlkTfPHo7SC2JgjDOk/mxXw==",
+      "requires": {
+        "@jest/console": "^28.1.1",
+        "@jest/reporters": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
+        "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^27.5.1",
-        "jest-config": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-resolve-dependencies": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "jest-watcher": "^27.5.1",
+        "jest-changed-files": "^28.0.2",
+        "jest-config": "^28.1.1",
+        "jest-haste-map": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-regex-util": "^28.0.2",
+        "jest-resolve": "^28.1.1",
+        "jest-resolve-dependencies": "^28.1.1",
+        "jest-runner": "^28.1.1",
+        "jest-runtime": "^28.1.1",
+        "jest-snapshot": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-validate": "^28.1.1",
+        "jest-watcher": "^28.1.1",
         "micromatch": "^4.0.4",
+        "pretty-format": "^28.1.1",
         "rimraf": "^3.0.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-          "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "emittery": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-          "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
           "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
           }
         },
-        "jest-watcher": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
-          "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
-          "requires": {
-            "@jest/test-result": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "ansi-escapes": "^4.2.1",
-            "chalk": "^4.0.0",
-            "jest-util": "^27.5.1",
-            "string-length": "^4.0.1"
-          }
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
         }
       }
     },
     "@jest/environment": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.1.tgz",
+      "integrity": "sha512-9auVQ2GzQ7nrU+lAr8KyY838YahElTX9HVjbQPPS2XjlxQ+na18G113OoBhyBGBtD6ZnO/SrUy5WR8EzOj1/Uw==",
       "requires": {
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/fake-timers": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
-        "jest-mock": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        }
+        "jest-mock": "^28.1.1"
+      }
+    },
+    "@jest/expect": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.1.tgz",
+      "integrity": "sha512-/+tQprrFoT6lfkMj4mW/mUIfAmmk/+iQPmg7mLDIFOf2lyf7EBHaS+x3RbeR0VZVMe55IvX7QRoT/2aK3AuUXg==",
+      "requires": {
+        "expect": "^28.1.1",
+        "jest-snapshot": "^28.1.1"
+      }
+    },
+    "@jest/expect-utils": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.1.tgz",
+      "integrity": "sha512-n/ghlvdhCdMI/hTcnn4qV57kQuV9OTsZzH1TTCVARANKhl6hXJqLKUkwX69ftMGpsbpt96SsDD8n8LD2d9+FRw==",
+      "requires": {
+        "jest-get-type": "^28.0.2"
       }
     },
     "@jest/fake-timers": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.1.tgz",
+      "integrity": "sha512-BY/3+TyLs5+q87rGWrGUY5f8e8uC3LsVHS9Diz8+FV3ARXL4sNnkLlIB8dvDvRrp+LUCGM+DLqlsYubizGUjIA==",
       "requires": {
-        "@jest/types": "^27.5.1",
-        "@sinonjs/fake-timers": "^8.0.1",
+        "@jest/types": "^28.1.1",
+        "@sinonjs/fake-timers": "^9.1.1",
         "@types/node": "*",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        }
+        "jest-message-util": "^28.1.1",
+        "jest-mock": "^28.1.1",
+        "jest-util": "^28.1.1"
       }
     },
     "@jest/globals": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.1.tgz",
+      "integrity": "sha512-dEgl/6v7ToB4vXItdvcltJBgny0xBE6xy6IYQrPJAJggdEinGxCDMivNv7sFzPcTITGquXD6UJwYxfJ/5ZwDSg==",
       "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "expect": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        }
+        "@jest/environment": "^28.1.1",
+        "@jest/expect": "^28.1.1",
+        "@jest/types": "^28.1.1"
       }
     },
     "@jest/reporters": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
-      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.1.tgz",
+      "integrity": "sha512-597Zj4D4d88sZrzM4atEGLuO7SdA/YrOv9SRXHXRNC+/FwPCWxZhBAEzhXoiJzfRwn8zes/EjS8Lo6DouGN5Gg==",
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/console": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
+        "@jridgewell/trace-mapping": "^0.3.7",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
-        "glob": "^7.1.2",
+        "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
         "istanbul-lib-coverage": "^3.0.0",
         "istanbul-lib-instrument": "^5.1.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-haste-map": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
+        "jest-message-util": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-worker": "^28.1.1",
         "slash": "^3.0.0",
-        "source-map": "^0.6.0",
         "string-length": "^4.0.1",
+        "strip-ansi": "^6.0.0",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.1.0"
-      },
-      "dependencies": {
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-          "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        }
+        "v8-to-istanbul": "^9.0.0"
       }
     },
     "@jest/schemas": {
@@ -17975,173 +16503,63 @@
       }
     },
     "@jest/source-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.0.2.tgz",
+      "integrity": "sha512-Y9dxC8ZpN3kImkk0LkK5XCEneYMAXlZ8m5bflmSL5vrwyeUpJfentacCUg6fOb8NOpOO7hz2+l37MV77T6BFPw==",
       "requires": {
+        "@jridgewell/trace-mapping": "^0.3.7",
         "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9",
-        "source-map": "^0.6.0"
+        "graceful-fs": "^4.2.9"
       }
     },
     "@jest/test-result": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.0.tgz",
-      "integrity": "sha512-sBBFIyoPzrZho3N+80P35A5oAkSKlGfsEFfXFWuPGBsW40UAjCkGakZhn4UQK4iQlW2vgCDMRDOob9FGKV8YoQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.1.tgz",
+      "integrity": "sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ==",
       "requires": {
-        "@jest/console": "^28.1.0",
-        "@jest/types": "^28.1.0",
+        "@jest/console": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       }
     },
     "@jest/test-sequencer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
-      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.1.tgz",
+      "integrity": "sha512-nuL+dNSVMcWB7OOtgb0EGH5AjO4UBCt68SLP08rwmC+iRhyuJWS9MtZ/MpipxFwKAlHFftbMsydXqWre8B0+XA==",
       "requires": {
-        "@jest/test-result": "^27.5.1",
+        "@jest/test-result": "^28.1.1",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-runtime": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-          "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        }
+        "jest-haste-map": "^28.1.1",
+        "slash": "^3.0.0"
       }
     },
     "@jest/transform": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.1.tgz",
+      "integrity": "sha512-PkfaTUuvjUarl1EDr5ZQcCA++oXkFCP9QFUkG0yVKVmNObjhrqDy0kbMpMebfHWm3CCDHjYNem9eUSH8suVNHQ==",
       "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^27.5.1",
+        "@babel/core": "^7.11.6",
+        "@jest/types": "^28.1.1",
+        "@jridgewell/trace-mapping": "^0.3.7",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-util": "^27.5.1",
+        "jest-haste-map": "^28.1.1",
+        "jest-regex-util": "^28.0.2",
+        "jest-util": "^28.1.1",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        }
+        "write-file-atomic": "^4.0.1"
       }
     },
     "@jest/types": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.0.tgz",
-      "integrity": "sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.1.tgz",
+      "integrity": "sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==",
       "requires": {
         "@jest/schemas": "^28.0.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -18176,9 +16594,9 @@
       "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.11.tgz",
-      "integrity": "sha512-RllI476aSMsxzeI9TtlSMoNTgHDxEmnl6GkkHwhr0vdL8W+0WuesyI8Vd3rBOfrwtPXbPxdT9ADJdiOKgzxPQA==",
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
+      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
       "requires": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -18328,23 +16746,6 @@
             "path-is-absolute": "^1.0.0"
           }
         },
-        "rxjs": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.1.0"
-          },
-          "dependencies": {
-            "tslib": {
-              "version": "2.4.0",
-              "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-              "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-              "dev": true
-            }
-          }
-        },
         "tslib": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
@@ -18395,9 +16796,9 @@
       }
     },
     "@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
+      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
       "requires": {
         "@sinonjs/commons": "^1.7.0"
       }
@@ -18484,32 +16885,33 @@
       }
     },
     "@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "dev": true
     },
     "@tsconfig/node10": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-      "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
       "devOptional": true
     },
     "@tsconfig/node12": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-      "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
       "devOptional": true
     },
     "@tsconfig/node14": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-      "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
       "devOptional": true
     },
     "@tsconfig/node16": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-      "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
+      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
       "devOptional": true
     },
     "@types/aria-query": {
@@ -18605,13 +17007,50 @@
       }
     },
     "@types/jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.1.tgz",
-      "integrity": "sha512-fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ==",
+      "version": "28.1.3",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.3.tgz",
+      "integrity": "sha512-Tsbjk8Y2hkBaY/gJsataeb4q9Mubw9EOz7+4RjPkzD5KjTvHHs7cpws22InaoXxAVAhF5HfFbzJjo6oKWqSZLw==",
+      "dev": true,
+      "requires": {
+        "jest-matcher-utils": "^28.0.0",
+        "pretty-format": "^28.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+          "dev": true
+        },
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
+          "dev": true,
+          "requires": {
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        },
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+          "dev": true
+        }
+      }
+    },
+    "@types/jsdom": {
+      "version": "16.2.14",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.14.tgz",
+      "integrity": "sha512-6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w==",
       "dev": true,
       "requires": {
-        "jest-matcher-utils": "^27.0.0",
-        "pretty-format": "^27.0.0"
+        "@types/node": "*",
+        "@types/parse5": "*",
+        "@types/tough-cookie": "*"
       }
     },
     "@types/json-schema": {
@@ -18643,6 +17082,12 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
+    "@types/parse5": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz",
+      "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==",
+      "dev": true
+    },
     "@types/prettier": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
@@ -18684,10 +17129,9 @@
       }
     },
     "@types/react-redux": {
-      "version": "7.1.22",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
-      "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
-      "dev": true,
+      "version": "7.1.24",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz",
+      "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==",
       "requires": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -18755,10 +17199,10 @@
         "@types/jest": "*"
       }
     },
-    "@types/uuid": {
-      "version": "8.3.4",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-      "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
+    "@types/tough-cookie": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
+      "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
       "dev": true
     },
     "@types/yargs": {
@@ -18780,26 +17224,26 @@
       "integrity": "sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g=="
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz",
-      "integrity": "sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
+      "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.10.0",
-        "@typescript-eslint/type-utils": "5.10.0",
-        "@typescript-eslint/utils": "5.10.0",
-        "debug": "^4.3.2",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/type-utils": "5.29.0",
+        "@typescript-eslint/utils": "5.29.0",
+        "debug": "^4.3.4",
         "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.1.8",
+        "ignore": "^5.2.0",
         "regexpp": "^3.2.0",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -18901,58 +17345,17 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz",
-      "integrity": "sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
+      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.27.0",
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/typescript-estree": "5.27.0",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.29.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz",
-          "integrity": "sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "@typescript-eslint/visitor-keys": "5.27.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz",
-          "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz",
-          "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "@typescript-eslint/visitor-keys": "5.27.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz",
-          "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
         "debug": {
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -18962,12 +17365,6 @@
             "ms": "2.1.2"
           }
         },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -18977,30 +17374,30 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz",
-      "integrity": "sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
+      "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/visitor-keys": "5.10.0"
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/visitor-keys": "5.29.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz",
-      "integrity": "sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz",
+      "integrity": "sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/utils": "5.10.0",
-        "debug": "^4.3.2",
+        "@typescript-eslint/utils": "5.29.0",
+        "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -19015,62 +17412,35 @@
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.0.tgz",
-      "integrity": "sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
+      "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz",
-      "integrity": "sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
+      "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/visitor-keys": "5.10.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/visitor-keys": "5.29.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
         "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
         },
-        "fast-glob": {
-          "version": "3.2.11",
-          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-          "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.stat": "^2.0.2",
-            "@nodelib/fs.walk": "^1.2.3",
-            "glob-parent": "^5.1.2",
-            "merge2": "^1.3.0",
-            "micromatch": "^4.0.4"
-          }
-        },
-        "globby": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-          "dev": true,
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.9",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^3.0.0"
-          }
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -19080,41 +17450,33 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.0.tgz",
-      "integrity": "sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
+      "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.10.0",
-        "@typescript-eslint/types": "5.10.0",
-        "@typescript-eslint/typescript-estree": "5.10.0",
+        "@typescript-eslint/scope-manager": "5.29.0",
+        "@typescript-eslint/types": "5.29.0",
+        "@typescript-eslint/typescript-estree": "5.29.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "@types/json-schema": {
-          "version": "7.0.9",
-          "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
-          "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
-          "dev": true
-        }
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz",
-      "integrity": "sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ==",
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
+      "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.10.0",
-        "eslint-visitor-keys": "^3.0.0"
+        "@typescript-eslint/types": "5.29.0",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
         "eslint-visitor-keys": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz",
-          "integrity": "sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
           "dev": true
         }
       }
@@ -19158,7 +17520,8 @@
     "abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "dev": true
     },
     "ace-builds": {
       "version": "1.4.13",
@@ -19168,12 +17531,14 @@
     "acorn": {
       "version": "8.7.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "devOptional": true
     },
     "acorn-globals": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
       "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
       "requires": {
         "acorn": "^7.1.1",
         "acorn-walk": "^7.1.1"
@@ -19182,7 +17547,14 @@
         "acorn": {
           "version": "7.4.1",
           "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        },
+        "acorn-walk": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+          "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+          "dev": true
         }
       }
     },
@@ -19194,14 +17566,16 @@
       "requires": {}
     },
     "acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+      "devOptional": true
     },
     "agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
       "requires": {
         "debug": "4"
       },
@@ -19210,6 +17584,7 @@
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
           "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
@@ -19217,7 +17592,8 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -19242,12 +17618,6 @@
         "uri-js": "^4.2.2"
       }
     },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
     "ansi-escapes": {
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
@@ -19439,12 +17809,6 @@
             "call-bind": "^1.0.2"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "regexp.prototype.flags": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -19602,12 +17966,6 @@
             "call-bind": "^1.0.2"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "regexp.prototype.flags": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -19783,12 +18141,6 @@
             "call-bind": "^1.0.2"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "regexp.prototype.flags": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -19875,7 +18227,8 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true
     },
     "atob": {
       "version": "2.1.2",
@@ -19905,40 +18258,17 @@
       "dev": true
     },
     "babel-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.1.tgz",
+      "integrity": "sha512-MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw==",
       "requires": {
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/transform": "^28.1.1",
         "@types/babel__core": "^7.1.14",
         "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^27.5.1",
+        "babel-preset-jest": "^28.1.1",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        }
       }
     },
     "babel-plugin-dynamic-import-node": {
@@ -19963,13 +18293,13 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.1.tgz",
+      "integrity": "sha512-NovGCy5Hn25uMJSAU8FaHqzs13cFoOI4lhIujiepssjCKRsAo3TA734RDWSGxuFTsUJXerYOqQQodlxgmtqbzw==",
       "requires": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
+        "@types/babel__core": "^7.1.14",
         "@types/babel__traverse": "^7.0.6"
       }
     },
@@ -20064,11 +18394,11 @@
       }
     },
     "babel-preset-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.1.tgz",
+      "integrity": "sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g==",
       "requires": {
-        "babel-plugin-jest-hoist": "^27.5.1",
+        "babel-plugin-jest-hoist": "^28.1.1",
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
@@ -20174,7 +18504,8 @@
     "browser-process-hrtime": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
     },
     "browserslist": {
       "version": "4.20.4",
@@ -20216,9 +18547,9 @@
       }
     },
     "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
     "bulma": {
       "version": "0.9.3",
@@ -20353,42 +18684,20 @@
           "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
           "dev": true
         },
-        "ansi-styles": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
-          "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
-          "dev": true
-        },
         "emoji-regex": {
           "version": "9.2.2",
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
           "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-          "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-          "dev": true
-        },
-        "slice-ansi": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-          "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^6.0.0",
-            "is-fullwidth-code-point": "^4.0.0"
-          }
-        },
         "string-width": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.0.1.tgz",
-          "integrity": "sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g==",
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
           "dev": true,
           "requires": {
+            "eastasianwidth": "^0.2.0",
             "emoji-regex": "^9.2.2",
-            "is-fullwidth-code-point": "^4.0.0",
             "strip-ansi": "^7.0.1"
           }
         },
@@ -20448,10 +18757,17 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
+    "colorette": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "dev": true
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -20636,14 +18952,16 @@
       "dev": true
     },
     "cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+      "dev": true
     },
     "cssstyle": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
       "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
       "requires": {
         "cssom": "~0.3.6"
       },
@@ -20651,7 +18969,8 @@
         "cssom": {
           "version": "0.3.8",
           "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+          "dev": true
         }
       }
     },
@@ -20667,36 +18986,39 @@
       "dev": true
     },
     "data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+      "dev": true,
       "requires": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
       },
       "dependencies": {
         "tr46": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-          "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+          "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+          "dev": true,
           "requires": {
             "punycode": "^2.1.1"
           }
         },
         "webidl-conversions": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-          "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+          "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+          "dev": true
         },
         "whatwg-url": {
-          "version": "8.7.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-          "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+          "version": "11.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+          "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+          "dev": true,
           "requires": {
-            "lodash": "^4.7.0",
-            "tr46": "^2.1.0",
-            "webidl-conversions": "^6.1.0"
+            "tr46": "^3.0.0",
+            "webidl-conversions": "^7.0.0"
           }
         }
       }
@@ -20724,7 +19046,8 @@
     "decimal.js": {
       "version": "10.3.1",
       "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+      "dev": true
     },
     "decode-uri-component": {
       "version": "0.2.0",
@@ -20740,7 +19063,8 @@
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
     },
     "deepmerge": {
       "version": "4.2.2",
@@ -20768,7 +19092,8 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true
     },
     "detect-newline": {
       "version": "3.1.0",
@@ -20792,9 +19117,9 @@
       "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
     },
     "diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz",
+      "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw=="
     },
     "dir-glob": {
       "version": "3.0.1",
@@ -20821,17 +19146,19 @@
       "dev": true
     },
     "domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "dev": true,
       "requires": {
-        "webidl-conversions": "^5.0.0"
+        "webidl-conversions": "^7.0.0"
       },
       "dependencies": {
         "webidl-conversions": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+          "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+          "dev": true
         }
       }
     },
@@ -20841,6 +19168,12 @@
       "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==",
       "dev": true
     },
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "easy-table": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz",
@@ -20865,15 +19198,6 @@
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
-    "enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^4.1.1"
-      }
-    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -21063,6 +19387,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
       "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
       "requires": {
         "esprima": "^4.0.1",
         "estraverse": "^5.2.0",
@@ -21074,12 +19399,14 @@
         "estraverse": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
         },
         "levn": {
           "version": "0.3.0",
           "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
           "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+          "dev": true,
           "requires": {
             "prelude-ls": "~1.1.2",
             "type-check": "~0.3.2"
@@ -21089,6 +19416,7 @@
           "version": "0.8.3",
           "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
           "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+          "dev": true,
           "requires": {
             "deep-is": "~0.1.3",
             "fast-levenshtein": "~2.0.6",
@@ -21101,12 +19429,14 @@
         "prelude-ls": {
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
+          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+          "dev": true
         },
         "type-check": {
           "version": "0.3.2",
           "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+          "dev": true,
           "requires": {
             "prelude-ls": "~1.1.2"
           }
@@ -21316,12 +19646,6 @@
             "has-tostringtag": "^1.0.0"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "object.entries": {
           "version": "1.1.5",
           "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
@@ -21400,12 +19724,6 @@
             "has-tostringtag": "^1.0.0"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "object.entries": {
           "version": "1.1.5",
           "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
@@ -21765,12 +20083,6 @@
             "array-includes": "^3.1.3",
             "object.assign": "^4.1.2"
           }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
         }
       }
     },
@@ -21872,84 +20184,6 @@
       "dev": true,
       "requires": {
         "@typescript-eslint/utils": "^5.13.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
-          "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/visitor-keys": "5.23.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
-          "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
-          "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/visitor-keys": "5.23.0",
-            "debug": "^4.3.2",
-            "globby": "^11.0.4",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.5",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/utils": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
-          "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "@typescript-eslint/scope-manager": "5.23.0",
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/typescript-estree": "5.23.0",
-            "eslint-scope": "^5.1.1",
-            "eslint-utils": "^3.0.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
-          "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "eslint-visitor-keys": "^3.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "eslint-scope": {
@@ -22044,7 +20278,8 @@
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
     },
     "execa": {
       "version": "5.1.1",
@@ -22068,52 +20303,15 @@
       "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
     },
     "expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.1.tgz",
+      "integrity": "sha512-/AANEwGL0tWBwzLNOvO0yUdy2D52jVdNXppOqswC49sxMN2cPWsGCQdzuIf9tj6hHoBQzNvx75JUYuQAckPo3w==",
       "requires": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        }
+        "@jest/expect-utils": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "jest-matcher-utils": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-util": "^28.1.1"
       }
     },
     "external-editor": {
@@ -22159,7 +20357,8 @@
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
     },
     "fast-safe-stringify": {
       "version": "2.1.1",
@@ -22288,9 +20487,10 @@
       "dev": true
     },
     "form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -22422,12 +20622,6 @@
             "call-bind": "^1.0.2"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "regexp.prototype.flags": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -22676,11 +20870,12 @@
       }
     },
     "html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dev": true,
       "requires": {
-        "whatwg-encoding": "^1.0.5"
+        "whatwg-encoding": "^2.0.0"
       }
     },
     "html-escaper": {
@@ -22689,11 +20884,12 @@
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
     },
     "http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dev": true,
       "requires": {
-        "@tootallnate/once": "1",
+        "@tootallnate/once": "2",
         "agent-base": "6",
         "debug": "4"
       },
@@ -22702,6 +20898,7 @@
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
           "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
@@ -22709,7 +20906,8 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -22717,6 +20915,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
       "requires": {
         "agent-base": "6",
         "debug": "4"
@@ -22726,6 +20925,7 @@
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
           "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
@@ -22733,7 +20933,8 @@
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -22743,15 +20944,16 @@
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
     },
     "husky": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz",
-      "integrity": "sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
+      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
       "dev": true
     },
     "iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -22842,23 +21044,6 @@
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0",
         "through": "^2.3.6"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.1.0"
-          }
-        },
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
       }
     },
     "internal-slot": {
@@ -22969,7 +21154,8 @@
     "is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
     },
     "is-shared-array-buffer": {
       "version": "1.0.1",
@@ -23002,11 +21188,6 @@
         "has-symbols": "^1.0.2"
       }
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
-    },
     "is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
@@ -23102,662 +21283,374 @@
       "dev": true
     },
     "jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
-      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.1.tgz",
+      "integrity": "sha512-qw9YHBnjt6TCbIDMPMpJZqf9E12rh6869iZaN08/vpOGgHJSAaLLUn6H8W3IAEuy34Ls3rct064mZLETkxJ2XA==",
       "requires": {
-        "@jest/core": "^27.5.1",
+        "@jest/core": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.5.1"
+        "jest-cli": "^28.1.1"
       }
     },
     "jest-changed-files": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
-      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.0.2.tgz",
+      "integrity": "sha512-QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA==",
       "requires": {
-        "@jest/types": "^27.5.1",
         "execa": "^5.0.0",
         "throat": "^6.0.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        }
       }
     },
     "jest-circus": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
-      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
-      "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.1.tgz",
+      "integrity": "sha512-75+BBVTsL4+p2w198DQpCeyh1RdaS2lhEG87HkaFX/UG0gJExVq2skG2pT7XZEGBubNj2CytcWSPan4QEPNosw==",
+      "requires": {
+        "@jest/environment": "^28.1.1",
+        "@jest/expect": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
         "dedent": "^0.7.0",
-        "expect": "^27.5.1",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
+        "jest-each": "^28.1.1",
+        "jest-matcher-utils": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-runtime": "^28.1.1",
+        "jest-snapshot": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "pretty-format": "^28.1.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3",
         "throat": "^6.0.1"
       },
       "dependencies": {
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-          "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
           "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
         }
       }
     },
     "jest-cli": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
-      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.1.tgz",
+      "integrity": "sha512-+sUfVbJqb1OjBZ0OdBbI6OWfYM1i7bSfzYy6gze1F1w3OKWq8ZTEKkZ8a7ZQPq6G/G1qMh/uKqpdWhgl11NFQQ==",
       "requires": {
-        "@jest/core": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/core": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
         "import-local": "^3.0.2",
-        "jest-config": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
+        "jest-config": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-validate": "^28.1.1",
         "prompts": "^2.0.1",
-        "yargs": "^16.2.0"
+        "yargs": "^17.3.1"
       },
       "dependencies": {
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-          "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+        "yargs": {
+          "version": "17.5.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+          "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
           "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
+            "cliui": "^7.0.2",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.0.0"
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
+        "yargs-parser": {
+          "version": "21.0.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+          "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
         }
       }
     },
     "jest-config": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
-      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
-      "requires": {
-        "@babel/core": "^7.8.0",
-        "@jest/test-sequencer": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "babel-jest": "^27.5.1",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.1.tgz",
+      "integrity": "sha512-tASynMhS+jVV85zKvjfbJ8nUyJS/jUSYZ5KQxLUN2ZCvcQc/OmhQl2j6VEL3ezQkNofxn5pQ3SPYWPHb0unTZA==",
+      "requires": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^28.1.1",
+        "@jest/types": "^28.1.1",
+        "babel-jest": "^28.1.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
+        "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-circus": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-jasmine2": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
+        "jest-circus": "^28.1.1",
+        "jest-environment-node": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "jest-regex-util": "^28.0.2",
+        "jest-resolve": "^28.1.1",
+        "jest-runner": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-validate": "^28.1.1",
         "micromatch": "^4.0.4",
         "parse-json": "^5.2.0",
-        "pretty-format": "^27.5.1",
+        "pretty-format": "^28.1.1",
         "slash": "^3.0.0",
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
           "requires": {
-            "@types/yargs-parser": "*"
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
         }
       }
     },
     "jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.1.tgz",
+      "integrity": "sha512-/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg==",
       "requires": {
         "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
+        "diff-sequences": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "pretty-format": "^28.1.1"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+        },
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
+          "requires": {
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
+          }
+        },
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
+        }
       }
     },
     "jest-docblock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz",
+      "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==",
       "requires": {
         "detect-newline": "^3.0.0"
       }
     },
     "jest-each": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.1.tgz",
+      "integrity": "sha512-A042rqh17ZvEhRceDMi784ppoXR7MWGDEKTXEZXb4svt0eShMZvijGxzKsx+yIjeE8QYmHPrnHiTSQVhN4nqaw==",
       "requires": {
-        "@jest/types": "^27.5.1",
+        "@jest/types": "^28.1.1",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1"
+        "jest-get-type": "^28.0.2",
+        "jest-util": "^28.1.1",
+        "pretty-format": "^28.1.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
           "requires": {
-            "@types/yargs-parser": "*"
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
         }
       }
     },
     "jest-environment-jsdom": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
-      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.1.tgz",
+      "integrity": "sha512-41ZvgSoPNcKG5q3LuuOcAczdBxRq9DbZkPe24okN6ZCmiZdAfFtPg3z+lOtsT1fM6OAERApKT+3m0MRDQH2zIA==",
+      "dev": true,
       "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/environment": "^28.1.1",
+        "@jest/fake-timers": "^28.1.1",
+        "@jest/types": "^28.1.1",
+        "@types/jsdom": "^16.2.4",
         "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jsdom": "^16.6.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        }
+        "jest-mock": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jsdom": "^19.0.0"
       }
     },
     "jest-environment-node": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
-      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.1.tgz",
+      "integrity": "sha512-2aV/eeY/WNgUUJrrkDJ3cFEigjC5fqT1+fCclrY6paqJ5zVPoM//sHmfgUUp7WLYxIdbPwMiVIzejpN56MxnNA==",
       "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
+        "@jest/environment": "^28.1.1",
+        "@jest/fake-timers": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        }
+        "jest-mock": "^28.1.1",
+        "jest-util": "^28.1.1"
       }
     },
     "jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
+      "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA=="
     },
     "jest-haste-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
-      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.1.tgz",
+      "integrity": "sha512-ZrRSE2o3Ezh7sb1KmeLEZRZ4mgufbrMwolcFHNRSjKZhpLa8TdooXOOFlSwoUzlbVs1t0l7upVRW2K7RWGHzbQ==",
       "requires": {
-        "@jest/types": "^27.5.1",
-        "@types/graceful-fs": "^4.1.2",
+        "@jest/types": "^28.1.1",
+        "@types/graceful-fs": "^4.1.3",
         "@types/node": "*",
         "anymatch": "^3.0.3",
         "fb-watchman": "^2.0.0",
         "fsevents": "^2.3.2",
         "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^27.5.1",
-        "jest-serializer": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
+        "jest-regex-util": "^28.0.2",
+        "jest-util": "^28.1.1",
+        "jest-worker": "^28.1.1",
         "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
+        "walker": "^1.0.8"
+      }
+    },
+    "jest-leak-detector": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.1.tgz",
+      "integrity": "sha512-4jvs8V8kLbAaotE+wFR7vfUGf603cwYtFf1/PYEsyX2BAjSzj8hQSVTP6OWzseTl0xL6dyHuKs2JAks7Pfubmw==",
+      "requires": {
+        "jest-get-type": "^28.0.2",
+        "pretty-format": "^28.1.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
           "requires": {
-            "@types/yargs-parser": "*"
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
         }
       }
     },
-    "jest-jasmine2": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
-      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+    "jest-matcher-utils": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.1.tgz",
+      "integrity": "sha512-NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw==",
       "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
         "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^27.5.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
-        "throat": "^6.0.1"
+        "jest-diff": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "pretty-format": "^28.1.1"
       },
       "dependencies": {
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-          "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
           "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
         }
       }
     },
-    "jest-leak-detector": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
-      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
-      "requires": {
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      }
-    },
-    "jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-      "requires": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      }
-    },
     "jest-message-util": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.0.tgz",
-      "integrity": "sha512-RpA8mpaJ/B2HphDMiDlrAZdDytkmwFqgjDZovM21F35lHGeUeCvYmm6W+sbQ0ydaLpg5bFAUuWG1cjqOl8vqrw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.1.tgz",
+      "integrity": "sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ==",
       "requires": {
         "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.0",
+        "@jest/types": "^28.1.1",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
         "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.0",
+        "pretty-format": "^28.1.1",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.3"
       },
@@ -23768,9 +21661,9 @@
           "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
         "pretty-format": {
-          "version": "28.1.0",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.0.tgz",
-          "integrity": "sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q==",
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
           "requires": {
             "@jest/schemas": "^28.0.2",
             "ansi-regex": "^5.0.1",
@@ -23779,41 +21672,19 @@
           }
         },
         "react-is": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-          "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg=="
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
         }
       }
     },
     "jest-mock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.1.tgz",
+      "integrity": "sha512-bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw==",
       "requires": {
-        "@jest/types": "^27.5.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        }
       }
     },
     "jest-pnp-resolver": {
@@ -23823,304 +21694,92 @@
       "requires": {}
     },
     "jest-regex-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="
+      "version": "28.0.2",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
+      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="
     },
     "jest-resolve": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
-      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.1.tgz",
+      "integrity": "sha512-/d1UbyUkf9nvsgdBildLe6LAD4DalgkgZcKd0nZ8XUGPyA/7fsnaQIlKVnDiuUXv/IeZhPEDrRJubVSulxrShA==",
       "requires": {
-        "@jest/types": "^27.5.1",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
+        "jest-haste-map": "^28.1.1",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
+        "jest-util": "^28.1.1",
+        "jest-validate": "^28.1.1",
         "resolve": "^1.20.0",
         "resolve.exports": "^1.1.0",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        }
       }
-    },
-    "jest-resolve-dependencies": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
-      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-snapshot": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        }
+    },
+    "jest-resolve-dependencies": {
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.1.tgz",
+      "integrity": "sha512-p8Y150xYJth4EXhOuB8FzmS9r8IGLEioiaetgdNGb9VHka4fl0zqWlVe4v7mSkYOuEUg2uB61iE+zySDgrOmgQ==",
+      "requires": {
+        "jest-regex-util": "^28.0.2",
+        "jest-snapshot": "^28.1.1"
       }
     },
     "jest-runner": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
-      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
-      "requires": {
-        "@jest/console": "^27.5.1",
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.1.tgz",
+      "integrity": "sha512-W5oFUiDBgTsCloTAj6q95wEvYDB0pxIhY6bc5F26OucnwBN+K58xGTGbliSMI4ChQal5eANDF+xvELaYkJxTmA==",
+      "requires": {
+        "@jest/console": "^28.1.1",
+        "@jest/environment": "^28.1.1",
+        "@jest/test-result": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
+        "emittery": "^0.10.2",
         "graceful-fs": "^4.2.9",
-        "jest-docblock": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-leak-detector": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "source-map-support": "^0.5.6",
+        "jest-docblock": "^28.1.1",
+        "jest-environment-node": "^28.1.1",
+        "jest-haste-map": "^28.1.1",
+        "jest-leak-detector": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-resolve": "^28.1.1",
+        "jest-runtime": "^28.1.1",
+        "jest-util": "^28.1.1",
+        "jest-watcher": "^28.1.1",
+        "jest-worker": "^28.1.1",
+        "source-map-support": "0.5.13",
         "throat": "^6.0.1"
-      },
-      "dependencies": {
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-          "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "emittery": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-          "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        }
       }
     },
     "jest-runtime": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
-      "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/globals": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.1.tgz",
+      "integrity": "sha512-J89qEJWW0leOsqyi0D9zHpFEYHwwafFdS9xgvhFHtIdRghbadodI0eA+DrthK/1PebBv3Px8mFSMGKrtaVnleg==",
+      "requires": {
+        "@jest/environment": "^28.1.1",
+        "@jest/fake-timers": "^28.1.1",
+        "@jest/globals": "^28.1.1",
+        "@jest/source-map": "^28.0.2",
+        "@jest/test-result": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "chalk": "^4.0.0",
         "cjs-module-lexer": "^1.0.0",
         "collect-v8-coverage": "^1.0.0",
         "execa": "^5.0.0",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
+        "jest-haste-map": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-mock": "^28.1.1",
+        "jest-regex-util": "^28.0.2",
+        "jest-resolve": "^28.1.1",
+        "jest-snapshot": "^28.1.1",
+        "jest-util": "^28.1.1",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0"
       },
       "dependencies": {
-        "@jest/console": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-          "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^27.5.1",
-            "jest-util": "^27.5.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "@jest/test-result": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-          "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-          "requires": {
-            "@jest/console": "^27.5.1",
-            "@jest/types": "^27.5.1",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
         "strip-bom": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
@@ -24128,92 +21787,56 @@
         }
       }
     },
-    "jest-serializer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-      "requires": {
-        "@types/node": "*",
-        "graceful-fs": "^4.2.9"
-      }
-    },
     "jest-snapshot": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.1.tgz",
+      "integrity": "sha512-1KjqHJ98adRcbIdMizjF5DipwZFbvxym/kFO4g4fVZCZRxH/dqV8TiBFCa6rqic3p0karsy8RWS1y4E07b7P0A==",
       "requires": {
-        "@babel/core": "^7.7.2",
+        "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
         "@babel/plugin-syntax-typescript": "^7.7.2",
         "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/babel__traverse": "^7.0.4",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^28.1.1",
+        "@jest/transform": "^28.1.1",
+        "@jest/types": "^28.1.1",
+        "@types/babel__traverse": "^7.0.6",
         "@types/prettier": "^2.1.5",
         "babel-preset-current-node-syntax": "^1.0.0",
         "chalk": "^4.0.0",
-        "expect": "^27.5.1",
+        "expect": "^28.1.1",
         "graceful-fs": "^4.2.9",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
+        "jest-diff": "^28.1.1",
+        "jest-get-type": "^28.0.2",
+        "jest-haste-map": "^28.1.1",
+        "jest-matcher-utils": "^28.1.1",
+        "jest-message-util": "^28.1.1",
+        "jest-util": "^28.1.1",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^27.5.1",
-        "semver": "^7.3.2"
+        "pretty-format": "^28.1.1",
+        "semver": "^7.3.5"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
           "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
           }
         },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
         }
       }
     },
@@ -24236,11 +21859,11 @@
       }
     },
     "jest-util": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.0.tgz",
-      "integrity": "sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.1.tgz",
+      "integrity": "sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw==",
       "requires": {
-        "@jest/types": "^28.1.0",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
@@ -24249,37 +21872,38 @@
       }
     },
     "jest-validate": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
-      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.1.tgz",
+      "integrity": "sha512-Kpf6gcClqFCIZ4ti5++XemYJWUPCFUW+N2gknn+KgnDf549iLul3cBuKVe1YcWRlaF8tZV8eJCap0eECOEE3Ug==",
       "requires": {
-        "@jest/types": "^27.5.1",
+        "@jest/types": "^28.1.1",
         "camelcase": "^6.2.0",
         "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
+        "jest-get-type": "^28.0.2",
         "leven": "^3.1.0",
-        "pretty-format": "^27.5.1"
+        "pretty-format": "^28.1.1"
       },
       "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
         },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+        "pretty-format": {
+          "version": "28.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
+          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
           "requires": {
-            "@types/yargs-parser": "*"
+            "@jest/schemas": "^28.0.2",
+            "ansi-regex": "^5.0.1",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^18.0.0"
           }
+        },
+        "react-is": {
+          "version": "18.2.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
         }
       }
     },
@@ -24297,11 +21921,6 @@
         "strip-ansi": "^7.0.1"
       },
       "dependencies": {
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="
-        },
         "slash": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
@@ -24341,24 +21960,24 @@
       }
     },
     "jest-watcher": {
-      "version": "28.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.0.tgz",
-      "integrity": "sha512-tNHMtfLE8Njcr2IRS+5rXYA4BhU90gAOwI9frTGOqd+jX0P/Au/JfRSNqsf5nUTcWdbVYuLxS1KjnzILSoR5hA==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.1.tgz",
+      "integrity": "sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug==",
       "requires": {
-        "@jest/test-result": "^28.1.0",
-        "@jest/types": "^28.1.0",
+        "@jest/test-result": "^28.1.1",
+        "@jest/types": "^28.1.1",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "emittery": "^0.10.2",
-        "jest-util": "^28.1.0",
+        "jest-util": "^28.1.1",
         "string-length": "^4.0.1"
       }
     },
     "jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "version": "28.1.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.1.tgz",
+      "integrity": "sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ==",
       "requires": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -24395,22 +22014,23 @@
       }
     },
     "jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
+      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
+      "dev": true,
       "requires": {
         "abab": "^2.0.5",
-        "acorn": "^8.2.4",
+        "acorn": "^8.5.0",
         "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
+        "cssom": "^0.5.0",
         "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
+        "data-urls": "^3.0.1",
+        "decimal.js": "^10.3.1",
+        "domexception": "^4.0.0",
         "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "is-potential-custom-element-name": "^1.0.1",
         "nwsapi": "^2.2.0",
@@ -24419,36 +22039,38 @@
         "symbol-tree": "^3.2.4",
         "tough-cookie": "^4.0.0",
         "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
-        "xml-name-validator": "^3.0.0"
+        "w3c-xmlserializer": "^3.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^10.0.0",
+        "ws": "^8.2.3",
+        "xml-name-validator": "^4.0.0"
       },
       "dependencies": {
         "tr46": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-          "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+          "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+          "dev": true,
           "requires": {
             "punycode": "^2.1.1"
           }
         },
         "webidl-conversions": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-          "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+          "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+          "dev": true
         },
         "whatwg-url": {
-          "version": "8.7.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-          "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+          "version": "10.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
+          "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
+          "dev": true,
           "requires": {
-            "lodash": "^4.7.0",
-            "tr46": "^2.1.0",
-            "webidl-conversions": "^6.1.0"
+            "tr46": "^3.0.0",
+            "webidl-conversions": "^7.0.0"
           }
         }
       }
@@ -24563,9 +22185,9 @@
       }
     },
     "lilconfig": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
-      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
+      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
       "dev": true
     },
     "lines-and-columns": {
@@ -24574,66 +22196,124 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "lint-staged": {
-      "version": "12.1.2",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.1.2.tgz",
-      "integrity": "sha512-bSMcQVqMW98HLLLR2c2tZ+vnDCnx4fd+0QJBQgN/4XkdspGRPc8DGp7UuOEBe1ApCfJ+wXXumYnJmU+wDo7j9A==",
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.2.tgz",
+      "integrity": "sha512-qQLfLTh9z34eMzfEHENC+QBskZfxjomrf+snF3xJ4BzilORbD989NLqQ00ughsF/A+PT41e87+WsMFabf9++pQ==",
       "dev": true,
       "requires": {
         "cli-truncate": "^3.1.0",
-        "colorette": "^2.0.16",
-        "commander": "^8.3.0",
-        "debug": "^4.3.2",
-        "enquirer": "^2.3.6",
-        "execa": "^5.1.1",
-        "lilconfig": "2.0.4",
-        "listr2": "^3.13.3",
-        "micromatch": "^4.0.4",
+        "colorette": "^2.0.17",
+        "commander": "^9.3.0",
+        "debug": "^4.3.4",
+        "execa": "^6.1.0",
+        "lilconfig": "2.0.5",
+        "listr2": "^4.0.5",
+        "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
-        "object-inspect": "^1.11.0",
+        "object-inspect": "^1.12.2",
+        "pidtree": "^0.6.0",
         "string-argv": "^0.3.1",
-        "supports-color": "^9.0.2",
-        "yaml": "^1.10.2"
+        "yaml": "^2.1.1"
       },
       "dependencies": {
-        "colorette": {
-          "version": "2.0.16",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-          "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
+        "commander": {
+          "version": "9.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz",
+          "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==",
           "dev": true
         },
         "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
           }
         },
+        "execa": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
+          "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^7.0.3",
+            "get-stream": "^6.0.1",
+            "human-signals": "^3.0.1",
+            "is-stream": "^3.0.0",
+            "merge-stream": "^2.0.0",
+            "npm-run-path": "^5.1.0",
+            "onetime": "^6.0.0",
+            "signal-exit": "^3.0.7",
+            "strip-final-newline": "^3.0.0"
+          }
+        },
+        "human-signals": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
+          "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==",
+          "dev": true
+        },
+        "is-stream": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+          "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+          "dev": true
+        },
+        "mimic-fn": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+          "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+          "dev": true
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "object-inspect": {
-          "version": "1.11.1",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz",
-          "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==",
+        "npm-run-path": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+          "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+          "dev": true,
+          "requires": {
+            "path-key": "^4.0.0"
+          }
+        },
+        "onetime": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+          "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^4.0.0"
+          }
+        },
+        "path-key": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+          "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+          "dev": true
+        },
+        "strip-final-newline": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+          "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
           "dev": true
         },
-        "supports-color": {
-          "version": "9.2.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.1.tgz",
-          "integrity": "sha512-Obv7ycoCTG51N7y175StI9BlAXrmgZrFhZOb0/PyjHBher/NmsdBgbbQ1Inhq+gIhz6+7Gb+jWF2Vqi7Mf1xnQ==",
+        "yaml": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
+          "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
           "dev": true
         }
       }
     },
     "listr2": {
-      "version": "3.13.5",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.13.5.tgz",
-      "integrity": "sha512-3n8heFQDSk+NcwBn3CgxEibZGaRzx+pC64n3YjpMD1qguV4nWus3Al+Oo3KooqFKTQEJ1v7MmnbnyyNspgx3NA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
+      "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==",
       "dev": true,
       "requires": {
         "cli-truncate": "^2.1.0",
@@ -24641,7 +22321,7 @@
         "log-update": "^4.0.0",
         "p-map": "^4.0.0",
         "rfdc": "^1.3.0",
-        "rxjs": "^7.4.0",
+        "rxjs": "^7.5.5",
         "through": "^2.3.8",
         "wrap-ansi": "^7.0.0"
       },
@@ -24656,12 +22336,6 @@
             "string-width": "^4.2.0"
           }
         },
-        "colorette": {
-          "version": "2.0.16",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-          "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-          "dev": true
-        },
         "slice-ansi": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -24756,6 +22430,17 @@
         "wrap-ansi": "^6.2.0"
       },
       "dependencies": {
+        "slice-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "astral-regex": "^2.0.0",
+            "is-fullwidth-code-point": "^3.0.0"
+          }
+        },
         "wrap-ansi": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -24812,11 +22497,11 @@
       "devOptional": true
     },
     "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "requires": {
-        "tmpl": "1.0.x"
+        "tmpl": "1.0.5"
       }
     },
     "match-sorter": {
@@ -24840,12 +22525,12 @@
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       }
     },
     "microseconds": {
@@ -24856,12 +22541,14 @@
     "mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true
     },
     "mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
       "requires": {
         "mime-db": "1.52.0"
       }
@@ -24957,7 +22644,7 @@
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
     },
     "node-releases": {
       "version": "2.0.5",
@@ -24980,7 +22667,8 @@
     "nwsapi": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
     },
     "object-assign": {
       "version": "4.1.1",
@@ -24994,9 +22682,9 @@
       "dev": true
     },
     "object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
       "dev": true
     },
     "object-keys": {
@@ -25120,12 +22808,6 @@
             "call-bind": "^1.0.2"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "regexp.prototype.flags": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -25300,12 +22982,6 @@
             "call-bind": "^1.0.2"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "regexp.prototype.flags": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -25489,12 +23165,6 @@
             "call-bind": "^1.0.2"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "regexp.prototype.flags": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -25645,12 +23315,6 @@
             "call-bind": "^1.0.2"
           }
         },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
-        },
         "regexp.prototype.flags": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -25849,7 +23513,8 @@
     "parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
     },
     "path-exists": {
       "version": "3.0.0",
@@ -25884,9 +23549,15 @@
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
     "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+    },
+    "pidtree": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
+      "dev": true
     },
     "pirates": {
       "version": "4.0.5",
@@ -26039,7 +23710,8 @@
     "psl": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
     },
     "punycode": {
       "version": "2.1.1",
@@ -26181,17 +23853,6 @@
             "regenerator-runtime": "^0.13.4"
           }
         },
-        "@types/react-redux": {
-          "version": "7.1.22",
-          "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.22.tgz",
-          "integrity": "sha512-GxIA1kM7ClU73I6wg9IRTVwSO9GS+SAKZKe0Enj+82HMU6aoESFU2HNAdNi3+J53IaOHPiUfT3kSG4L828joDQ==",
-          "requires": {
-            "@types/hoist-non-react-statics": "^3.3.0",
-            "@types/react": "*",
-            "hoist-non-react-statics": "^3.3.0",
-            "redux": "^4.0.0"
-          }
-        },
         "react-is": {
           "version": "17.0.2",
           "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -26485,12 +24146,12 @@
       }
     },
     "rxjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
-      "integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
       "dev": true,
       "requires": {
-        "tslib": "~2.1.0"
+        "tslib": "^2.1.0"
       },
       "dependencies": {
         "tslib": {
@@ -26510,7 +24171,8 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
     },
     "sass": {
       "version": "1.52.3",
@@ -26526,6 +24188,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
       "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
       "requires": {
         "xmlchars": "^2.2.0"
       }
@@ -26591,14 +24254,27 @@
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
     "slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
+          "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+          "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+          "dev": true
+        }
       }
     },
     "source-map": {
@@ -26622,9 +24298,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -26764,12 +24440,6 @@
           "requires": {
             "has-tostringtag": "^1.0.0"
           }
-        },
-        "object-inspect": {
-          "version": "1.12.0",
-          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
-          "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
-          "dev": true
         }
       }
     },
@@ -26882,7 +24552,8 @@
     "symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
     },
     "terminal-link": {
       "version": "2.1.1",
@@ -26956,6 +24627,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
       "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dev": true,
       "requires": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -26965,7 +24637,8 @@
         "universalify": {
           "version": "0.1.2",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+          "dev": true
         }
       }
     },
@@ -26984,9 +24657,9 @@
       "dev": true
     },
     "ts-jest": {
-      "version": "28.0.3",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.3.tgz",
-      "integrity": "sha512-HzgbEDQ2KgVtDmpXToqAcKTyGHdHsG23i/iUjfxji92G5eT09S1m9UHZd7csF0Bfgh9txM4JzwHnv7r1waFPlw==",
+      "version": "28.0.5",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.5.tgz",
+      "integrity": "sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==",
       "dev": true,
       "requires": {
         "bs-logger": "0.x",
@@ -26996,7 +24669,7 @@
         "lodash.memoize": "4.x",
         "make-error": "1.x",
         "semver": "7.x",
-        "yargs-parser": "^20.x"
+        "yargs-parser": "^21.0.1"
       },
       "dependencies": {
         "json5": {
@@ -27004,13 +24677,19 @@
           "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
           "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
           "dev": true
+        },
+        "yargs-parser": {
+          "version": "21.0.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+          "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+          "dev": true
         }
       }
     },
     "ts-node": {
-      "version": "10.8.0",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.0.tgz",
-      "integrity": "sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==",
+      "version": "10.8.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz",
+      "integrity": "sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==",
       "devOptional": true,
       "requires": {
         "@cspotcode/source-map-support": "^0.8.0",
@@ -27026,14 +24705,6 @@
         "make-error": "^1.1.1",
         "v8-compile-cache-lib": "^3.0.1",
         "yn": "3.1.1"
-      },
-      "dependencies": {
-        "acorn-walk": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-          "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-          "devOptional": true
-        }
       }
     },
     "tsconfig-paths": {
@@ -27082,18 +24753,10 @@
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true
     },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
+      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
       "devOptional": true
     },
     "unbox-primitive": {
@@ -27174,7 +24837,8 @@
     "uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true
     },
     "v8-compile-cache": {
       "version": "2.3.0",
@@ -27189,20 +24853,13 @@
       "devOptional": true
     },
     "v8-to-istanbul": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz",
+      "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==",
       "requires": {
+        "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-          "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
-        }
+        "convert-source-map": "^1.6.0"
       }
     },
     "vite": {
@@ -27262,24 +24919,26 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
       "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
       "requires": {
         "browser-process-hrtime": "^1.0.0"
       }
     },
     "w3c-xmlserializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
+      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
+      "dev": true,
       "requires": {
-        "xml-name-validator": "^3.0.0"
+        "xml-name-validator": "^4.0.0"
       }
     },
     "walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "requires": {
-        "makeerror": "1.0.x"
+        "makeerror": "1.0.12"
       }
     },
     "warning": {
@@ -27305,11 +24964,23 @@
       "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
     },
     "whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
+      "dev": true,
       "requires": {
-        "iconv-lite": "0.4.24"
+        "iconv-lite": "0.6.3"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
       }
     },
     "whatwg-fetch": {
@@ -27318,9 +24989,10 @@
       "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
     },
     "whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+      "dev": true
     },
     "whatwg-url": {
       "version": "6.5.0",
@@ -27356,7 +25028,8 @@
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
     },
     "wrap-ansi": {
       "version": "7.0.0",
@@ -27374,20 +25047,19 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
       "requires": {
         "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
+        "signal-exit": "^3.0.7"
       }
     },
     "ws": {
-      "version": "7.5.8",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz",
-      "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
+      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+      "dev": true,
       "requires": {}
     },
     "xml": {
@@ -27397,14 +25069,16 @@
       "dev": true
     },
     "xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+      "dev": true
     },
     "xmlchars": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
     },
     "y18n": {
       "version": "5.0.8",
@@ -27426,6 +25100,7 @@
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
       "requires": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -27439,7 +25114,8 @@
     "yargs-parser": {
       "version": "20.2.7",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+      "dev": true
     },
     "yn": {
       "version": "3.1.1",
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 6f2e54f4c58..1dae15d8f3f 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -8,20 +8,20 @@
     "@fortawesome/fontawesome-free": "^6.1.1",
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
-    "@reduxjs/toolkit": "^1.8.1",
+    "@reduxjs/toolkit": "^1.8.2",
     "@rooks/use-outside-click-ref": "^4.10.1",
     "@testing-library/react": "^13.2.0",
     "@types/yup": "^0.29.13",
     "@vitejs/plugin-react": "^1.3.2",
     "ace-builds": "^1.4.12",
     "ajv": "^8.6.3",
-    "babel-jest": "^27.4.2",
+    "babel-jest": "^28.1.1",
     "bulma": "^0.9.3",
     "classnames": "^2.2.6",
     "dayjs": "^1.11.2",
     "fetch-mock": "^9.11.0",
-    "jest": "^27.4.3",
-    "jest-watch-typeahead": "^1.0.0",
+    "jest": "^28.1.1",
+    "jest-watch-typeahead": "^1.1.0",
     "json-schema-faker": "^0.5.0-rcv.39",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.1",
@@ -40,14 +40,13 @@
     "sass": "^1.52.3",
     "styled-components": "^5.3.1",
     "use-debounce": "^8.0.1",
-    "uuid": "^8.3.1",
     "vite": "^2.9.11",
     "vite-tsconfig-paths": "^3.5.0",
     "whatwg-fetch": "^3.6.2",
     "yup": "^0.32.9"
   },
   "lint-staged": {
-    "*.{js,ts,jsx,tsx}": [
+    "*.{ts,tsx}": [
       "eslint --fix",
       "npm test -- --bail --findRelatedTests --watchAll=false"
     ]
@@ -62,9 +61,9 @@
     "test": "jest --watch",
     "test:coverage": "jest --watchAll --coverage",
     "test:CI": "CI=true npm run test:coverage -- --ci --testResultsProcessor=\"jest-sonar-reporter\" --watchAll=false",
-    "tsc": "tsc",
+    "tsc": "tsc --pretty --noEmit",
     "prepare": "cd .. && husky install kafka-ui-react-app/.husky",
-    "pre-commit": "npm run tsc --noEmit && lint-staged"
+    "pre-commit": "npm run tsc && lint-staged"
   },
   "eslintConfig": {
     "extends": "react-app"
@@ -73,13 +72,13 @@
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-react": "^7.17.12",
     "@babel/preset-typescript": "^7.17.12",
-    "@jest/types": "^28.1.0",
+    "@jest/types": "^28.1.1",
     "@openapitools/openapi-generator-cli": "^2.5.1",
     "@testing-library/dom": "^8.11.1",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/user-event": "^13.5.0",
     "@types/eventsource": "^1.1.8",
-    "@types/jest": "^27.5.1",
+    "@types/jest": "^28.1.3",
     "@types/lodash": "^4.14.172",
     "@types/node": "^16.4.13",
     "@types/react": "^18.0.9",
@@ -89,9 +88,8 @@
     "@types/react-router-dom": "^5.3.3",
     "@types/redux-mock-store": "^1.0.3",
     "@types/styled-components": "^5.1.13",
-    "@types/uuid": "^8.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.10.0",
-    "@typescript-eslint/parser": "^5.27.0",
+    "@typescript-eslint/eslint-plugin": "^5.29.0",
+    "@typescript-eslint/parser": "^5.29.0",
     "dotenv": "^16.0.1",
     "eslint": "^8.3.0",
     "eslint-config-airbnb": "^19.0.4",
@@ -107,16 +105,17 @@
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.5.0",
     "fetch-mock-jest": "^1.5.1",
-    "husky": "^7.0.1",
+    "husky": "^8.0.1",
+    "jest-environment-jsdom": "^28.1.1",
     "jest-sonar-reporter": "^2.0.0",
     "jest-styled-components": "^7.0.8",
-    "lint-staged": "^12.1.2",
+    "lint-staged": "^13.0.2",
     "prettier": "^2.3.1",
     "redux-mock-store": "^1.5.4",
     "rimraf": "^3.0.2",
-    "ts-jest": "^28.0.3",
-    "ts-node": "^10.8.0",
-    "typescript": "^4.3.5"
+    "ts-jest": "^28.0.5",
+    "ts-node": "^10.8.1",
+    "typescript": "^4.7.4"
   },
   "engines": {
     "node": "v16.15.0",
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
index 18c9142f5d1..a73afc20414 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
@@ -24,11 +24,11 @@ import PageLoader from 'components/common/PageLoader/PageLoader';
 
 export interface Props {
   consumerGroups: ConsumerGroupDetails[];
-  orderBy: ConsumerGroupOrdering | null;
+  orderBy: string | null;
   sortOrder: SortOrder;
   totalPages: number;
   isFetched: boolean;
-  setConsumerGroupsSortOrderBy(orderBy: ConsumerGroupOrdering | null): void;
+  setConsumerGroupsSortOrderBy(orderBy: string | null): void;
 }
 
 const List: React.FC<Props> = ({
@@ -48,7 +48,7 @@ const List: React.FC<Props> = ({
     dispatch(
       fetchConsumerGroupsPaged({
         clusterName,
-        orderBy: orderBy || undefined,
+        orderBy: (orderBy as ConsumerGroupOrdering) || undefined,
         sortOrder,
         page,
         perPage,
@@ -57,11 +57,7 @@ const List: React.FC<Props> = ({
     );
   }, [clusterName, orderBy, searchText, sortOrder, page, perPage, dispatch]);
 
-  const tableState = useTableState<
-    ConsumerGroupDetails,
-    string,
-    ConsumerGroupOrdering
-  >(
+  const tableState = useTableState<ConsumerGroupDetails, string>(
     consumerGroups,
     {
       totalPages,
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ConsumerGroupsTableCells.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ConsumerGroupsTableCells.spec.tsx
index 7aff424cb81..9effdd5b5e2 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ConsumerGroupsTableCells.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ConsumerGroupsTableCells.spec.tsx
@@ -19,7 +19,7 @@ describe('Consumer Groups Table Cells', () => {
       id: 6598,
     },
   };
-  const mockTableState: TableState<ConsumerGroup, string, never> = {
+  const mockTableState: TableState<ConsumerGroup, string> = {
     data: [consumerGroup],
     selectedIds: new Set([]),
     idSelector: jest.fn(),
diff --git a/kafka-ui-react-app/src/components/Topics/List/List.tsx b/kafka-ui-react-app/src/components/Topics/List/List.tsx
index be8609cae0e..b958b4f6b83 100644
--- a/kafka-ui-react-app/src/components/Topics/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/List.tsx
@@ -69,10 +69,10 @@ export interface TopicsListProps {
     partitions?: number[];
   }): void;
   search: string;
-  orderBy: TopicColumnsToSort | null;
+  orderBy: string | null;
   sortOrder: SortOrder;
   setTopicsSearch(search: string): void;
-  setTopicsOrderBy(orderBy: TopicColumnsToSort | null): void;
+  setTopicsOrderBy(orderBy: string | null): void;
 }
 
 const List: React.FC<TopicsListProps> = ({
@@ -108,7 +108,7 @@ const List: React.FC<TopicsListProps> = ({
       clusterName,
       page,
       perPage,
-      orderBy: orderBy || undefined,
+      orderBy: (orderBy as TopicColumnsToSort) || undefined,
       sortOrder,
       search,
       showInternal,
@@ -120,11 +120,7 @@ const List: React.FC<TopicsListProps> = ({
     fetchTopicsList(topicsListParams);
   }, [fetchTopicsList, topicsListParams]);
 
-  const tableState = useTableState<
-    TopicWithDetailedInfo,
-    string,
-    TopicColumnsToSort
-  >(
+  const tableState = useTableState<TopicWithDetailedInfo, string>(
     topics,
     {
       idSelector: (topic) => topic.name,
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx
index c30d57f76d4..e3e684609ed 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx
@@ -11,7 +11,7 @@ import { Topic } from 'generated-sources';
 import { topicsPayload } from 'redux/reducers/topics/__test__/fixtures';
 
 describe('TopicsTableCells Components', () => {
-  const mockTableState: TableState<Topic, string, never> = {
+  const mockTableState: TableState<Topic, string> = {
     data: topicsPayload,
     selectedIds: new Set([]),
     idSelector: jest.fn(),
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 11fa6c08e3e..9b8e4435c3a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -25,6 +25,7 @@ import Select, { SelectOption } from 'components/common/Select/Select';
 import useAppParams from 'lib/hooks/useAppParams';
 import Heading from 'components/common/heading/Heading.styled';
 import { messagesApiClient } from 'lib/api';
+import { getResponse } from 'lib/errorHandling';
 
 import validateMessage from './validateMessage';
 import * as S from './SendMessage.styled';
@@ -147,12 +148,13 @@ const SendMessage: React.FC = () => {
         });
         dispatch(fetchTopicDetails({ clusterName, topicName }));
       } catch (e) {
+        const err = await getResponse(e as Response);
         dispatch(
           alertAdded({
             id: `${clusterName}-${topicName}-sendTopicMessagesError`,
             type: 'error',
             title: `Error in sending a message to ${topicName}`,
-            message: e?.message,
+            message: err?.message || '',
             createdAt: now(),
           })
         );
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts
index b4f2d88bea6..8a4f173d7a7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts
@@ -1,5 +1,5 @@
 import { TopicMessageSchema } from 'generated-sources';
-import Ajv from 'ajv/dist/2020';
+import Ajv, { DefinedError } from 'ajv/dist/2020';
 import { upperFirst } from 'lodash';
 
 const validateBySchema = (
@@ -39,7 +39,8 @@ const validateBySchema = (
       );
     }
   } catch (e) {
-    return [`${upperFirst(type)} ${e.message}`];
+    const err = e as DefinedError;
+    return [`${upperFirst(type)} ${err.message}`];
   }
 
   return errors;
diff --git a/kafka-ui-react-app/src/components/common/SmartTable/SmartTable.tsx b/kafka-ui-react-app/src/components/common/SmartTable/SmartTable.tsx
index 2521dddad27..2d1dfdda13e 100644
--- a/kafka-ui-react-app/src/components/common/SmartTable/SmartTable.tsx
+++ b/kafka-ui-react-app/src/components/common/SmartTable/SmartTable.tsx
@@ -12,8 +12,8 @@ import {
 } from './TableColumn';
 import { TableRow } from './TableRow';
 
-interface SmartTableProps<T, TId extends IdType, OT = never> {
-  tableState: TableState<T, TId, OT>;
+interface SmartTableProps<T, TId extends IdType> {
+  tableState: TableState<T, TId>;
   allSelectable?: boolean;
   selectable?: boolean;
   className?: string;
@@ -23,7 +23,7 @@ interface SmartTableProps<T, TId extends IdType, OT = never> {
   hoverable?: boolean;
 }
 
-export const SmartTable = <T, TId extends IdType, OT = never>({
+export const SmartTable = <T, TId extends IdType>({
   children,
   tableState,
   selectable = false,
@@ -32,22 +32,20 @@ export const SmartTable = <T, TId extends IdType, OT = never>({
   isFullwidth = false,
   paginated = false,
   hoverable = false,
-}: React.PropsWithChildren<SmartTableProps<T, TId, OT>>) => {
+}: React.PropsWithChildren<SmartTableProps<T, TId>>) => {
   const handleRowSelection = (row: T, checked: boolean) => {
     tableState.setRowsSelection([row], checked);
   };
 
   const headerRow = React.useMemo(() => {
     const headerCells = React.Children.map(children, (child) => {
-      if (!isColumnElement<T, TId, OT>(child)) {
+      if (!isColumnElement<T, TId>(child)) {
         return child;
       }
 
       const { headerCell, title, orderValue } = child.props;
 
-      const HeaderCell = headerCell as React.FC<
-        TableHeaderCellProps<T, TId, OT>
-      >;
+      const HeaderCell = headerCell as React.FC<TableHeaderCellProps<T, TId>>;
       return HeaderCell ? (
         <S.TableHeaderCell>
           <HeaderCell
@@ -59,8 +57,8 @@ export const SmartTable = <T, TId extends IdType, OT = never>({
       ) : (
         // TODO types will be changed after fixing TableHeaderCell
         <TableHeaderCell
-          {...(tableState.orderable as never)}
-          orderValue={orderValue as never}
+          {...tableState.orderable}
+          orderValue={orderValue}
           title={title}
         />
       );
diff --git a/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx b/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
index 27f03398607..8044999ee22 100644
--- a/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
+++ b/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
@@ -4,51 +4,51 @@ import { SortOrder } from 'generated-sources';
 import * as S from 'components/common/table/TableHeaderCell/TableHeaderCell.styled';
 import { DefaultTheme, StyledComponent } from 'styled-components';
 
-export interface OrderableProps<OT> {
-  orderBy: OT | null;
+export interface OrderableProps {
+  orderBy: string | null;
   sortOrder: SortOrder;
-  handleOrderBy: (orderBy: OT | null) => void;
+  handleOrderBy: (orderBy: string | null) => void;
 }
 
-interface TableCellPropsBase<T, TId extends IdType, OT = never> {
-  tableState: TableState<T, TId, OT>;
+interface TableCellPropsBase<T, TId extends IdType> {
+  tableState: TableState<T, TId>;
 }
 
-export interface TableHeaderCellProps<T, TId extends IdType, OT = never>
-  extends TableCellPropsBase<T, TId, OT> {
-  orderable?: OrderableProps<OT>;
-  orderValue?: OT;
+export interface TableHeaderCellProps<T, TId extends IdType>
+  extends TableCellPropsBase<T, TId> {
+  orderable?: OrderableProps;
+  orderValue?: string;
 }
 
-export interface TableCellProps<T, TId extends IdType, OT = never>
-  extends TableCellPropsBase<T, TId, OT> {
+export interface TableCellProps<T, TId extends IdType>
+  extends TableCellPropsBase<T, TId> {
   rowIndex: number;
   dataItem: T;
   hovered?: boolean;
 }
 
-interface TableColumnProps<T, TId extends IdType, OT = never> {
+interface TableColumnProps<T, TId extends IdType> {
   cell?: React.FC<TableCellProps<T, TId>>;
   children?: React.ReactElement;
-  headerCell?: React.FC<TableHeaderCellProps<T, TId, OT>>;
+  headerCell?: React.FC<TableHeaderCellProps<T, TId>>;
   field?: string;
   title?: string;
   maxWidth?: string;
   className?: string;
-  orderValue?: OT;
+  orderValue?: string;
   customTd?: typeof S.Td;
 }
 
-export const TableColumn = <T, TId extends IdType, OT = never>(
+export const TableColumn = <T, TId extends IdType>(
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _props: React.PropsWithChildren<TableColumnProps<T, TId, OT>>
+  _props: React.PropsWithChildren<TableColumnProps<T, TId>>
 ): React.ReactElement => {
   return <td />;
 };
 
-export function isColumnElement<T, TId extends IdType, OT = never>(
+export function isColumnElement<T, TId extends IdType>(
   element: React.ReactNode
-): element is React.ReactElement<TableColumnProps<T, TId, OT>> {
+): element is React.ReactElement<TableColumnProps<T, TId>> {
   if (!React.isValidElement(element)) {
     return false;
   }
diff --git a/kafka-ui-react-app/src/components/common/SmartTable/TableRow.tsx b/kafka-ui-react-app/src/components/common/SmartTable/TableRow.tsx
index 92ab8804f5d..3adb30ce33d 100644
--- a/kafka-ui-react-app/src/components/common/SmartTable/TableRow.tsx
+++ b/kafka-ui-react-app/src/components/common/SmartTable/TableRow.tsx
@@ -5,17 +5,17 @@ import { Td } from 'components/common/table/TableHeaderCell/TableHeaderCell.styl
 
 import { isColumnElement, SelectCell, TableCellProps } from './TableColumn';
 
-interface TableRowProps<T, TId extends IdType = never, OT = never> {
+interface TableRowProps<T, TId extends IdType = never> {
   index: number;
   id?: TId;
   hoverable?: boolean;
-  tableState: TableState<T, TId, OT>;
+  tableState: TableState<T, TId>;
   dataItem: T;
   selectable: boolean;
   onSelectChange?: (row: T, checked: boolean) => void;
 }
 
-export const TableRow = <T, TId extends IdType, OT = never>({
+export const TableRow = <T, TId extends IdType>({
   children,
   hoverable = false,
   id,
@@ -24,7 +24,7 @@ export const TableRow = <T, TId extends IdType, OT = never>({
   selectable,
   tableState,
   onSelectChange,
-}: React.PropsWithChildren<TableRowProps<T, TId, OT>>): React.ReactElement => {
+}: React.PropsWithChildren<TableRowProps<T, TId>>): React.ReactElement => {
   const [hovered, setHovered] = React.useState(false);
 
   const handleMouseEnter = () => {
@@ -61,7 +61,7 @@ export const TableRow = <T, TId extends IdType, OT = never>({
         }
         const { cell, field, maxWidth, customTd } = child.props;
 
-        const Cell = cell as React.FC<TableCellProps<T, TId, OT>> | undefined;
+        const Cell = cell as React.FC<TableCellProps<T, TId>> | undefined;
         const TdComponent = customTd || Td;
 
         const content = Cell ? (
diff --git a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.tsx b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.tsx
index 98eb36b56e5..341ab6c8814 100644
--- a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.tsx
+++ b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.tsx
@@ -1,15 +1,15 @@
 import React, { PropsWithChildren } from 'react';
-import { SortOrder, TopicColumnsToSort } from 'generated-sources';
+import { SortOrder } from 'generated-sources';
 import * as S from 'components/common/table/TableHeaderCell/TableHeaderCell.styled';
 
 export interface TableHeaderCellProps {
   title?: string;
   previewText?: string;
   onPreview?: () => void;
-  orderBy?: TopicColumnsToSort | null;
+  orderBy?: string | null;
   sortOrder?: SortOrder;
-  orderValue?: TopicColumnsToSort | null;
-  handleOrderBy?: (orderBy: TopicColumnsToSort | null) => void;
+  orderValue?: string;
+  handleOrderBy?: (orderBy: string | null) => void;
 }
 
 const TableHeaderCell: React.FC<PropsWithChildren<TableHeaderCellProps>> = (
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
index fb53b95cf31..7280f9a6e48 100644
--- a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
@@ -9,7 +9,7 @@ describe('useDataSaver hook', () => {
 
   describe('Save as file', () => {
     beforeAll(() => {
-      jest.useFakeTimers('modern');
+      jest.useFakeTimers();
       jest.setSystemTime(new Date('Wed Mar 24 2021 03:19:56 GMT-0700'));
     });
 
diff --git a/kafka-ui-react-app/src/lib/hooks/useTableState.ts b/kafka-ui-react-app/src/lib/hooks/useTableState.ts
index b5fa6ed79c1..a9a6eb850aa 100644
--- a/kafka-ui-react-app/src/lib/hooks/useTableState.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useTableState.ts
@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { OrderableProps } from 'components/common/SmartTable/TableColumn';
 
-export interface TableState<T, TId extends IdType, OT = never> {
+export interface TableState<T, TId extends IdType> {
   data: T[];
   selectedIds: Set<TId>;
   totalPages?: number;
@@ -10,18 +10,18 @@ export interface TableState<T, TId extends IdType, OT = never> {
   selectedCount: number;
   setRowsSelection: (rows: T[], selected: boolean) => void;
   toggleSelection: (selected: boolean) => void;
-  orderable?: OrderableProps<OT>;
+  orderable?: OrderableProps;
 }
 
-export const useTableState = <T, TId extends IdType, OT = never>(
+export const useTableState = <T, TId extends IdType>(
   data: T[],
   options: {
     totalPages: number;
     isRowSelectable?: (row: T) => boolean;
     idSelector: (row: T) => TId;
   },
-  orderable?: OrderableProps<OT>
-): TableState<T, TId, OT> => {
+  orderable?: OrderableProps
+): TableState<T, TId> => {
   const [selectedIds, setSelectedIds] = React.useState(new Set<TId>());
 
   const { idSelector, totalPages, isRowSelectable = () => true } = options;
@@ -52,7 +52,7 @@ export const useTableState = <T, TId extends IdType, OT = never>(
     [data, idSelector]
   );
 
-  return React.useMemo<TableState<T, TId, OT>>(() => {
+  return React.useMemo<TableState<T, TId>>(() => {
     return {
       data,
       totalPages,
diff --git a/kafka-ui-react-app/src/redux/interfaces/topic.ts b/kafka-ui-react-app/src/redux/interfaces/topic.ts
index def2c2184a8..647b0e69f9c 100644
--- a/kafka-ui-react-app/src/redux/interfaces/topic.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/topic.ts
@@ -43,7 +43,6 @@ export interface TopicFormCustomParams {
 }
 
 export interface TopicWithDetailedInfo extends Topic, TopicDetails {
-  id?: string;
   config?: TopicConfig[];
   consumerGroups?: ConsumerGroup[];
   messageSchema?: TopicMessageSchema;
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
index 7cf4482b2a1..5aa91f9077a 100644
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
@@ -40,7 +40,7 @@ export const fetchConsumerGroupsPaged = createAsyncThunk<
     { rejectWithValue }
   ) => {
     try {
-      const response = await consumerGroupsApiClient.getConsumerGroupsPageRaw({
+      return await consumerGroupsApiClient.getConsumerGroupsPage({
         clusterName,
         orderBy,
         sortOrder,
@@ -48,7 +48,6 @@ export const fetchConsumerGroupsPaged = createAsyncThunk<
         perPage,
         search,
       });
-      return await response.value();
     } catch (error) {
       return rejectWithValue(await getResponse(error as Response));
     }
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
index 9a3bc5c8db2..9d6ccc8e596 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
@@ -36,7 +36,6 @@ import {
 
 const topic = {
   name: 'topic',
-  id: 'id',
 };
 
 const messageSchema = {
@@ -213,7 +212,6 @@ describe('topics Slice', () => {
       it('updateTopic/fulfilled', () => {
         const updatedTopic = {
           name: 'topic',
-          id: 'id',
           partitions: 1,
         };
         expect(
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
index 120060dba6d..2a13822b764 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
@@ -1,4 +1,3 @@
-import { v4 } from 'uuid';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import {
   TopicsResponse,
@@ -381,7 +380,6 @@ const topicsSlice = createSlice({
           state.byName[topic.name] = {
             ...state.byName[topic.name],
             ...topic,
-            id: v4(),
           };
         });
       }

From cc0a98262b1116e1bc4d4eed00fa43614eac1ddf Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 27 Jun 2022 16:24:47 +0400
Subject: [PATCH 040/734] fixing alert close icon position (#2193)

---
 kafka-ui-react-app/src/components/Alerts/Alert.styled.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Alerts/Alert.styled.ts b/kafka-ui-react-app/src/components/Alerts/Alert.styled.ts
index 131fc922437..298f8749032 100644
--- a/kafka-ui-react-app/src/components/Alerts/Alert.styled.ts
+++ b/kafka-ui-react-app/src/components/Alerts/Alert.styled.ts
@@ -9,7 +9,7 @@ export const Alert = styled.div<{ $type: AlertType }>`
   padding: 12px;
   display: flex;
   justify-content: space-between;
-  align-items: center;
+  align-items: baseline;
   filter: drop-shadow(0px 4px 16px ${({ theme }) => theme.alert.shadow});
   margin-top: 10px;
   line-height: 20px;

From d7a3629470606a644c3bcc82f093aa609c6ac29c Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 27 Jun 2022 16:59:00 +0400
Subject: [PATCH 041/734] Change the name of path for Schema Compare versions
 (#2194)

---
 .../src/components/Schemas/Details/Details.tsx            | 4 ++--
 kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx   | 6 +++---
 .../src/components/Schemas/Diff/__test__/Diff.spec.tsx    | 6 +++---
 kafka-ui-react-app/src/lib/paths.ts                       | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index 386fc505903..299b0984b13 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -3,7 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import {
   ClusterSubjectParam,
   clusterSchemaEditPageRelativePath,
-  clusterSchemaSchemaDiffPageRelativePath,
+  clusterSchemaSchemaComparePageRelativePath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
@@ -90,7 +90,7 @@ const Details: React.FC = () => {
               buttonSize="M"
               buttonType="primary"
               to={{
-                pathname: clusterSchemaSchemaDiffPageRelativePath,
+                pathname: clusterSchemaSchemaComparePageRelativePath,
                 search: `leftVersion=${versions[0]?.version}&rightVersion=${versions[0]?.version}`,
               }}
             >
diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
index 4c12bc66fa4..94636fa4b8f 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { SchemaSubject } from 'generated-sources';
-import { clusterSchemaSchemaDiffPath, ClusterSubjectParam } from 'lib/paths';
+import { clusterSchemaSchemaComparePath, ClusterSubjectParam } from 'lib/paths';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import DiffViewer from 'components/common/DiffViewer/DiffViewer';
 import { useNavigate, useLocation } from 'react-router-dom';
@@ -86,7 +86,7 @@ const Diff: React.FC<DiffProps> = ({ versions, areVersionsFetched }) => {
                       }
                       onChange={(event) => {
                         navigate(
-                          clusterSchemaSchemaDiffPath(clusterName, subject)
+                          clusterSchemaSchemaComparePath(clusterName, subject)
                         );
                         searchParams.set('leftVersion', event.toString());
                         searchParams.set(
@@ -127,7 +127,7 @@ const Diff: React.FC<DiffProps> = ({ versions, areVersionsFetched }) => {
                       }
                       onChange={(event) => {
                         navigate(
-                          clusterSchemaSchemaDiffPath(clusterName, subject)
+                          clusterSchemaSchemaComparePath(clusterName, subject)
                         );
                         searchParams.set(
                           'leftVersion',
diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx
index 418393bb503..029e589b9ad 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx
@@ -2,13 +2,13 @@ import React from 'react';
 import Diff, { DiffProps } from 'components/Schemas/Diff/Diff';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
-import { clusterSchemaSchemaDiffPath } from 'lib/paths';
+import { clusterSchemaSchemaComparePath } from 'lib/paths';
 
 import { versions } from './fixtures';
 
 const defaultClusterName = 'defaultClusterName';
 const defaultSubject = 'defaultSubject';
-const defaultPathName = clusterSchemaSchemaDiffPath(
+const defaultPathName = clusterSchemaSchemaComparePath(
   defaultClusterName,
   defaultSubject
 );
@@ -30,7 +30,7 @@ describe('Diff', () => {
     pathname = `${pathname}?${searchParams.toString()}`;
 
     return render(
-      <WithRoute path={clusterSchemaSchemaDiffPath()}>
+      <WithRoute path={clusterSchemaSchemaComparePath()}>
         <Diff
           versions={props.versions}
           areVersionsFetched={props.areVersionsFetched}
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 2e15a856a86..4f80d07c14c 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -72,9 +72,9 @@ export type ClusterGroupParam = {
 export const clusterSchemasRelativePath = 'schemas';
 export const clusterSchemaNewRelativePath = 'create-new';
 export const clusterSchemaEditPageRelativePath = `edit`;
-export const clusterSchemaSchemaDiffPageRelativePath = `diff`;
+export const clusterSchemaSchemaComparePageRelativePath = `compare`;
 export const clusterSchemaEditRelativePath = `${RouteParams.subject}/${clusterSchemaEditPageRelativePath}`;
-export const clusterSchemaSchemaDiffRelativePath = `${RouteParams.subject}/${clusterSchemaSchemaDiffPageRelativePath}`;
+export const clusterSchemaSchemaDiffRelativePath = `${RouteParams.subject}/${clusterSchemaSchemaComparePageRelativePath}`;
 export const clusterSchemasPath = (
   clusterName: ClusterName = RouteParams.clusterName
 ) => `${clusterPath(clusterName)}/schemas`;
@@ -89,10 +89,10 @@ export const clusterSchemaEditPath = (
   clusterName: ClusterName = RouteParams.clusterName,
   subject: SchemaName = RouteParams.subject
 ) => `${clusterSchemasPath(clusterName)}/${subject}/edit`;
-export const clusterSchemaSchemaDiffPath = (
+export const clusterSchemaSchemaComparePath = (
   clusterName: ClusterName = RouteParams.clusterName,
   subject: SchemaName = RouteParams.subject
-) => `${clusterSchemaPath(clusterName, subject)}/diff`;
+) => `${clusterSchemaPath(clusterName, subject)}/compare`;
 
 export type ClusterSubjectParam = {
   subject: string;

From 101ebc55efcba9544f30342accce44db3cd82fcb Mon Sep 17 00:00:00 2001
From: azatsafin <azat.safin@gmail.com>
Date: Mon, 27 Jun 2022 18:57:49 +0300
Subject: [PATCH 042/734] Helm Chart Quick Start (#2176)

* add quickstart readme for helm chart

* add link to root README.md

* fix configurationfile example stored in configmap

* change order of possible deployment configuration

Co-authored-by: Azat Safin <azsafin@provectus.com>
---
 README.md                                     |  4 ++
 .../templates/configmap_fromValues.yaml       |  2 +-
 helm_chart.md                                 | 65 +++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 helm_chart.md

diff --git a/README.md b/README.md
index 765239512ac..e86c4b476c9 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,10 @@ Further configuration with environment variables - [see environment variables](#
 
 If you prefer to use `docker-compose` please refer to the [documentation](docker-compose.md).
 
+### Helm chart
+Helm chart could be found under [charts/kafka-ui](https://github.com/provectus/kafka-ui/tree/master/charts/kafka-ui) directory
+
+Quick-start instruction [here](helm_chart.md)
 
 ## Building With Docker
 
diff --git a/charts/kafka-ui/templates/configmap_fromValues.yaml b/charts/kafka-ui/templates/configmap_fromValues.yaml
index 55a4e3b328d..ae8b7695c2d 100644
--- a/charts/kafka-ui/templates/configmap_fromValues.yaml
+++ b/charts/kafka-ui/templates/configmap_fromValues.yaml
@@ -6,6 +6,6 @@ metadata:
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 data:
-  config.yml: 
+  config.yml: |-
     {{- toYaml .Values.yamlApplicationConfig | nindent 4}}
 {{ end }}
\ No newline at end of file
diff --git a/helm_chart.md b/helm_chart.md
new file mode 100644
index 00000000000..9a521724b5b
--- /dev/null
+++ b/helm_chart.md
@@ -0,0 +1,65 @@
+# Quick Start with Helm Chart
+
+### General
+1. Clone/Copy Chart to your working directory
+2. Execute command ```helm install helm-release-name charts/kafka-ui```
+
+### Passing Kafka-UI configuration as Dict
+Create values.yml file
+```
+yamlApplicationConfig:
+  kafka:
+    clusters:
+      - name: yaml
+        bootstrapServers:  kafka-cluster-broker-endpoints:9092
+  auth:
+    type: disabled
+  management:
+    health:
+      ldap:
+        enabled: false
+```
+Install by executing command
+> helm install helm-release-name charts/kafka-ui -f values.yml
+
+
+### Passing configuration file as ConfigMap 
+Create config map
+```
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kafka-ui-existing-configmap-as-a-configfile
+data:
+  config.yml: |-
+    kafka:
+      clusters:
+        - name: yaml
+          bootstrapServers: kafka-cluster-broker-endpoints:9092
+    auth:
+      type: disabled
+    management:
+      health:
+        ldap:
+          enabled: false
+```
+This ConfigMap will be mounted to the Pod
+
+Install by executing command
+> helm install helm-release-name charts/kafka-ui --set yamlApplicationConfigConfigMap.name="kafka-ui-config",yamlApplicationConfigConfigMap.keyName="config.yml"
+
+### Passing environment variables as ConfigMap
+Create config map
+```
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kafka-ui-helm-values
+data:
+  KAFKA_CLUSTERS_0_NAME: "kafka-cluster-name"
+  KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: "kafka-cluster-broker-endpoints:9092"
+  AUTH_TYPE: "DISABLED"
+  MANAGEMENT_HEALTH_LDAP_ENABLED: "FALSE" 
+```
+Install by executing command
+> helm install helm-release-name charts/kafka-ui --set existingConfigMap="kafka-ui-helm-values"  

From 6e67255053ddc246dcb5df5b407a1d8de765fda4 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 27 Jun 2022 20:05:27 +0400
Subject: [PATCH 043/734] Update readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e86c4b476c9..5a0f51cf07e 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,8 @@
 [![Chat with us](https://img.shields.io/discord/897805035122077716)](https://discord.gg/4DWzD7pGE5)
 
 ### DISCLAIMER
-<em>UI for Apache Kafka is a free, open-source tool that is curated by Provectus, and is built and supported by the open-source community. The tool will remain free and open-source in the future. Provectus does not plan to add any paid features or subscription plans so that everyone can have a better experience observing their data. UI for Apache Kafka is a part of the [Provectus NextGen Data Platform](https://provectus.com/nextgen-data-platform/). Check it out for more details! </em> 
+<em>UI for Apache Kafka is a free, open-source tool that is curated by Provectus, and is built and supported by the open-source community. It will remain free and open-source in the future. Provectus does not plan to add any paid features or subscription plans so that everyone can have a better experience observing their data. UI for Apache Kafka is a part of the [Provectus NextGen Data Platform](https://provectus.com/nextgen-data-platform/) — Check it out! Also, learn more about [Professional Services for Apache Kafka](https://provectus.com/professional-services-apache-kafka/), to start handling your Kafka clusters and streaming apps with the help of Provectus Kafka experts. </em> 
+
 
 #### UI for Apache Kafka is a free, open-source web UI to monitor and manage Apache Kafka clusters. 
 

From 0efbd130b978793f0d42a8ab871f09d6fe3b75e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 13:00:12 +0300
Subject: [PATCH 044/734] Bump dayjs from 1.11.2 to 1.11.3 in
 /kafka-ui-react-app (#2210)

Bumps [dayjs](https://github.com/iamkun/dayjs) from 1.11.2 to 1.11.3.
- [Release notes](https://github.com/iamkun/dayjs/releases)
- [Changelog](https://github.com/iamkun/dayjs/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/iamkun/dayjs/compare/v1.11.2...v1.11.3)

---
updated-dependencies:
- dependency-name: dayjs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-react-app/package-lock.json b/kafka-ui-react-app/package-lock.json
index ff16ec3dd13..37fe53727d0 100644
--- a/kafka-ui-react-app/package-lock.json
+++ b/kafka-ui-react-app/package-lock.json
@@ -6090,9 +6090,9 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz",
-      "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw=="
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
+      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
     },
     "node_modules/debug": {
       "version": "2.6.9",
@@ -19030,9 +19030,9 @@
       "dev": true
     },
     "dayjs": {
-      "version": "1.11.2",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz",
-      "integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw=="
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
+      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
     },
     "debug": {
       "version": "2.6.9",

From a4046d46ef44d51626c7f655ef89c3f3429b7b80 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Tue, 28 Jun 2022 15:15:12 +0300
Subject: [PATCH 045/734] chore: migrate clusters from toolkit to react-query
 (#2214)

---
 kafka-ui-react-app/src/components/App.tsx     |  48 ++----
 .../src/components/Cluster/Cluster.tsx        |  59 +++----
 .../Cluster/__tests__/Cluster.spec.tsx        | 150 ++++++++----------
 .../Cluster/__tests__}/fixtures.ts            |   2 +
 .../ConsumerGroups/Details/Details.tsx        |   2 +-
 .../Details/ResetOffsets/ResetOffsets.tsx     |   2 +-
 .../ClustersWidget/ClustersWidget.tsx         | 117 +++++++-------
 .../ClustersWidget/ClustersWidgetContainer.ts |  17 --
 .../__test__/ClustersWidget.spec.tsx          |  24 +--
 .../__test__/ClustersWidgetContainer.spec.tsx |  12 --
 .../ClustersWidget/__test__/fixtures.ts       |  27 ----
 .../src/components/Dashboard/Dashboard.tsx    |   9 +-
 .../Dashboard/__test__/Dashboard.spec.tsx     |  11 +-
 .../src/components/KsqlDb/Query/Query.tsx     |   2 +-
 kafka-ui-react-app/src/components/Nav/Nav.tsx |  31 ++--
 .../Nav/__tests__/ClusterMenu.spec.tsx        |   2 +-
 .../src/components/Nav/__tests__/Nav.spec.tsx |  35 ++--
 .../Details/Messages/Filters/Filters.tsx      |   2 +-
 .../Topic/Details/Messages/Filters/utils.ts   |   2 +-
 .../Topics/Topic/SendMessage/SendMessage.tsx  |   2 +-
 .../Topic/SendMessage/validateMessage.ts      |   2 +-
 .../src/components/__tests__/App.spec.tsx     |  91 ++++-------
 .../common/Pagination/Pagination.tsx          |   2 +-
 .../src/lib/hooks/api/useClusters.ts          |   8 +
 .../src/lib/hooks/useDataSaver.ts             |   2 +-
 .../src/redux/reducers/alerts/alertsSlice.ts  |   2 +-
 .../clusters/__test__/reducer.spec.ts         |  55 -------
 .../clusters/__test__/selectors.spec.ts       |  60 -------
 .../redux/reducers/clusters/clustersSlice.ts  |  61 -------
 .../src/redux/reducers/connect/selectors.ts   |   2 +-
 .../src/redux/reducers/index.ts               |   2 -
 kafka-ui-react-app/vite.config.ts             |   1 -
 32 files changed, 273 insertions(+), 571 deletions(-)
 rename kafka-ui-react-app/src/{redux/reducers/clusters/__test__ => components/Cluster/__tests__}/fixtures.ts (94%)
 delete mode 100644 kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidgetContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidgetContainer.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/fixtures.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/useClusters.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/clusters/__test__/reducer.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/clusters/__test__/selectors.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/clusters/clustersSlice.ts

diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 1035edb05d6..db7acf4df7c 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { Suspense, useCallback } from 'react';
 import { Routes, Route, useLocation } from 'react-router-dom';
 import { GIT_TAG, GIT_COMMIT } from 'lib/constants';
 import { clusterPath, getNonExactPath } from 'lib/paths';
@@ -10,12 +10,6 @@ import Version from 'components/Version/Version';
 import Alerts from 'components/Alerts/Alerts';
 import { ThemeProvider } from 'styled-components';
 import theme from 'theme/theme';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
-import {
-  fetchClusters,
-  getClusterList,
-  getAreClustersFulfilled,
-} from 'redux/reducers/clusters/clustersSlice';
 
 import * as S from './App.styled';
 import Logo from './common/Logo/Logo';
@@ -23,9 +17,6 @@ import GitIcon from './common/Icons/GitIcon';
 import DiscordIcon from './common/Icons/DiscordIcon';
 
 const App: React.FC = () => {
-  const dispatch = useAppDispatch();
-  const areClustersFulfilled = useAppSelector(getAreClustersFulfilled);
-  const clusters = useAppSelector(getClusterList);
   const [isSidebarVisible, setIsSidebarVisible] = React.useState(false);
   const onBurgerClick = () => setIsSidebarVisible(!isSidebarVisible);
   const closeSidebar = useCallback(() => setIsSidebarVisible(false), []);
@@ -35,10 +26,6 @@ const App: React.FC = () => {
     closeSidebar();
   }, [location, closeSidebar]);
 
-  React.useEffect(() => {
-    dispatch(fetchClusters());
-  }, [dispatch]);
-
   return (
     <ThemeProvider theme={theme}>
       <S.Layout>
@@ -90,10 +77,9 @@ const App: React.FC = () => {
 
         <S.Container>
           <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
-            <Nav
-              clusters={clusters}
-              areClustersFulfilled={areClustersFulfilled}
-            />
+            <Suspense fallback={<PageLoader />}>
+              <Nav />
+            </Suspense>
           </S.Sidebar>
           <S.Overlay
             $visible={isSidebarVisible}
@@ -103,23 +89,19 @@ const App: React.FC = () => {
             aria-hidden="true"
             aria-label="Overlay"
           />
-          {areClustersFulfilled ? (
-            <Routes>
-              {['/', '/ui', '/ui/clusters'].map((path) => (
-                <Route
-                  key="Home" // optional: avoid full re-renders on route changes
-                  path={path}
-                  element={<Dashboard />}
-                />
-              ))}
+          <Routes>
+            {['/', '/ui', '/ui/clusters'].map((path) => (
               <Route
-                path={getNonExactPath(clusterPath())}
-                element={<ClusterPage />}
+                key="Home" // optional: avoid full re-renders on route changes
+                path={path}
+                element={<Dashboard />}
               />
-            </Routes>
-          ) : (
-            <PageLoader />
-          )}
+            ))}
+            <Route
+              path={getNonExactPath(clusterPath())}
+              element={<ClusterPage />}
+            />
+          </Routes>
         </S.Container>
         <S.AlertsContainer role="toolbar">
           <Alerts />
diff --git a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
index 1f13a5b2eb7..27261ac3084 100644
--- a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
@@ -1,12 +1,7 @@
 import React, { Suspense } from 'react';
-import { useSelector } from 'react-redux';
 import { Routes, Navigate, Route, Outlet } from 'react-router-dom';
 import useAppParams from 'lib/hooks/useAppParams';
 import { ClusterFeaturesEnum } from 'generated-sources';
-import {
-  getClustersFeatures,
-  getClustersReadonlyStatus,
-} from 'redux/reducers/clusters/clustersSlice';
 import {
   clusterBrokerRelativePath,
   clusterConnectorsRelativePath,
@@ -23,6 +18,7 @@ import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb';
 import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 import { BreadcrumbProvider } from 'components/common/Breadcrumb/Breadcrumb.provider';
 import PageLoader from 'components/common/PageLoader/PageLoader';
+import useClusters from 'lib/hooks/api/useClusters';
 
 const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
 const Topics = React.lazy(() => import('components/Topics/Topics'));
@@ -35,34 +31,25 @@ const ConsumerGroups = React.lazy(
 
 const Cluster: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
-  const isReadOnly = useSelector(getClustersReadonlyStatus(clusterName));
-  const features = useSelector(getClustersFeatures(clusterName));
-
-  const hasKafkaConnectConfigured = features.includes(
-    ClusterFeaturesEnum.KAFKA_CONNECT
-  );
-  const hasSchemaRegistryConfigured = features.includes(
-    ClusterFeaturesEnum.SCHEMA_REGISTRY
-  );
-  const isTopicDeletionAllowed = features.includes(
-    ClusterFeaturesEnum.TOPIC_DELETION
-  );
-  const hasKsqlDbConfigured = features.includes(ClusterFeaturesEnum.KSQL_DB);
+  const { data } = useClusters();
+  const contextValue = React.useMemo(() => {
+    const cluster = data?.find(({ name }) => name === clusterName);
+    const features = cluster?.features || [];
 
-  const contextValue = React.useMemo(
-    () => ({
-      isReadOnly,
-      hasKafkaConnectConfigured,
-      hasSchemaRegistryConfigured,
-      isTopicDeletionAllowed,
-    }),
-    [
-      hasKafkaConnectConfigured,
-      hasSchemaRegistryConfigured,
-      isReadOnly,
-      isTopicDeletionAllowed,
-    ]
-  );
+    return {
+      isReadOnly: cluster?.readOnly || false,
+      hasKafkaConnectConfigured: features.includes(
+        ClusterFeaturesEnum.KAFKA_CONNECT
+      ),
+      hasSchemaRegistryConfigured: features.includes(
+        ClusterFeaturesEnum.SCHEMA_REGISTRY
+      ),
+      isTopicDeletionAllowed: features.includes(
+        ClusterFeaturesEnum.TOPIC_DELETION
+      ),
+      hasKsqlDbConfigured: features.includes(ClusterFeaturesEnum.KSQL_DB),
+    };
+  }, [clusterName, data]);
 
   return (
     <BreadcrumbProvider>
@@ -94,7 +81,7 @@ const Cluster: React.FC = () => {
                 </BreadcrumbRoute>
               }
             />
-            {hasSchemaRegistryConfigured && (
+            {contextValue.hasSchemaRegistryConfigured && (
               <Route
                 path={getNonExactPath(clusterSchemasRelativePath)}
                 element={
@@ -104,7 +91,7 @@ const Cluster: React.FC = () => {
                 }
               />
             )}
-            {hasKafkaConnectConfigured && (
+            {contextValue.hasKafkaConnectConfigured && (
               <Route
                 path={getNonExactPath(clusterConnectsRelativePath)}
                 element={
@@ -114,7 +101,7 @@ const Cluster: React.FC = () => {
                 }
               />
             )}
-            {hasKafkaConnectConfigured && (
+            {contextValue.hasKafkaConnectConfigured && (
               <Route
                 path={getNonExactPath(clusterConnectorsRelativePath)}
                 element={
@@ -124,7 +111,7 @@ const Cluster: React.FC = () => {
                 }
               />
             )}
-            {hasKsqlDbConfigured && (
+            {contextValue.hasKsqlDbConfigured && (
               <Route
                 path={getNonExactPath(clusterKsqlDbRelativePath)}
                 element={
diff --git a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
index 24d0b6a73be..f41d75840d0 100644
--- a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
@@ -1,13 +1,11 @@
 import React from 'react';
-import { ClusterFeaturesEnum } from 'generated-sources';
-import { store } from 'redux/store';
-import { onlineClusterPayload } from 'redux/reducers/clusters/__test__/fixtures';
-import Cluster from 'components/Cluster/Cluster';
-import { fetchClusters } from 'redux/reducers/clusters/clustersSlice';
-import { screen } from '@testing-library/react';
+import { Cluster, ClusterFeaturesEnum } from 'generated-sources';
+import ClusterComponent from 'components/Cluster/Cluster';
+import { screen, waitFor } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
 import {
   clusterBrokersPath,
+  clusterConnectorsPath,
   clusterConnectsPath,
   clusterConsumerGroupsPath,
   clusterKsqlDbPath,
@@ -16,6 +14,9 @@ import {
   clusterTopicsPath,
 } from 'lib/paths';
 import { act } from 'react-dom/test-utils';
+import fetchMock from 'fetch-mock';
+
+import { onlineClusterPayload } from './fixtures';
 
 const CLusterCompText = {
   Topics: 'Topics',
@@ -46,98 +47,79 @@ jest.mock('components/KsqlDb/KsqlDb', () => () => (
 ));
 
 describe('Cluster', () => {
-  const renderComponent = (pathname: string) => {
-    render(
-      <WithRoute path={`${clusterPath()}/*`}>
-        <Cluster />
-      </WithRoute>,
-      { initialEntries: [pathname], store }
-    );
+  afterEach(() => fetchMock.restore());
+
+  const renderComponent = async (pathname: string, payload: Cluster[] = []) => {
+    const mock = fetchMock.get('/api/clusters', payload);
+    await act(() => {
+      render(
+        <WithRoute path={`${clusterPath()}/*`}>
+          <ClusterComponent />
+        </WithRoute>,
+        { initialEntries: [pathname] }
+      );
+    });
+    return waitFor(() => expect(mock.called()).toBeTruthy());
   };
 
   it('renders Brokers', async () => {
-    await act(() => renderComponent(clusterBrokersPath('second')));
+    await renderComponent(clusterBrokersPath('second'));
     expect(screen.getByText(CLusterCompText.Brokers)).toBeInTheDocument();
   });
   it('renders Topics', async () => {
-    await act(() => renderComponent(clusterTopicsPath('second')));
+    await renderComponent(clusterTopicsPath('second'));
     expect(screen.getByText(CLusterCompText.Topics)).toBeInTheDocument();
   });
   it('renders ConsumerGroups', async () => {
-    await act(() => renderComponent(clusterConsumerGroupsPath('second')));
+    await renderComponent(clusterConsumerGroupsPath('second'));
     expect(
       screen.getByText(CLusterCompText.ConsumerGroups)
     ).toBeInTheDocument();
   });
 
   describe('configured features', () => {
-    it('does not render Schemas if SCHEMA_REGISTRY is not configured', async () => {
-      store.dispatch(
-        fetchClusters.fulfilled(
-          [
-            {
-              ...onlineClusterPayload,
-              features: [],
-            },
-          ],
-          '123'
-        )
-      );
-      await act(() => renderComponent(clusterSchemasPath('second')));
-      expect(
-        screen.queryByText(CLusterCompText.Schemas)
-      ).not.toBeInTheDocument();
-    });
-    it('renders Schemas if SCHEMA_REGISTRY is configured', async () => {
-      store.dispatch(
-        fetchClusters.fulfilled(
-          [
-            {
-              ...onlineClusterPayload,
-              features: [ClusterFeaturesEnum.SCHEMA_REGISTRY],
-            },
-          ],
-          '123'
-        )
-      );
-      await act(() =>
-        renderComponent(clusterSchemasPath(onlineClusterPayload.name))
-      );
-      expect(screen.getByText(CLusterCompText.Schemas)).toBeInTheDocument();
-    });
-    it('renders Connect if KAFKA_CONNECT is configured', async () => {
-      store.dispatch(
-        fetchClusters.fulfilled(
-          [
-            {
-              ...onlineClusterPayload,
-              features: [ClusterFeaturesEnum.KAFKA_CONNECT],
-            },
-          ],
-          'requestId'
-        )
-      );
-      await act(() =>
-        renderComponent(clusterConnectsPath(onlineClusterPayload.name))
-      );
-      expect(screen.getByText(CLusterCompText.Connect)).toBeInTheDocument();
-    });
-    it('renders KSQL if KSQL_DB is configured', async () => {
-      store.dispatch(
-        fetchClusters.fulfilled(
-          [
-            {
-              ...onlineClusterPayload,
-              features: [ClusterFeaturesEnum.KSQL_DB],
-            },
-          ],
-          'requestId'
-        )
-      );
-      await act(() =>
-        renderComponent(clusterKsqlDbPath(onlineClusterPayload.name))
-      );
-      expect(screen.getByText(CLusterCompText.KsqlDb)).toBeInTheDocument();
-    });
+    const itCorrectlyHandlesConfiguredSchema = (
+      feature: ClusterFeaturesEnum,
+      text: string,
+      path: string
+    ) => {
+      it(`renders Schemas if ${feature} is configured`, async () => {
+        await renderComponent(path, [
+          {
+            ...onlineClusterPayload,
+            features: [feature],
+          },
+        ]);
+        expect(screen.getByText(text)).toBeInTheDocument();
+      });
+
+      it(`does not render Schemas if ${feature} is not configured`, async () => {
+        await renderComponent(path, [
+          { ...onlineClusterPayload, features: [] },
+        ]);
+        expect(screen.queryByText(text)).not.toBeInTheDocument();
+      });
+    };
+
+    itCorrectlyHandlesConfiguredSchema(
+      ClusterFeaturesEnum.SCHEMA_REGISTRY,
+      CLusterCompText.Schemas,
+      clusterSchemasPath(onlineClusterPayload.name)
+    );
+    itCorrectlyHandlesConfiguredSchema(
+      ClusterFeaturesEnum.KAFKA_CONNECT,
+      CLusterCompText.Connect,
+      clusterConnectsPath(onlineClusterPayload.name)
+    );
+    itCorrectlyHandlesConfiguredSchema(
+      ClusterFeaturesEnum.KAFKA_CONNECT,
+      CLusterCompText.Connect,
+      clusterConnectorsPath(onlineClusterPayload.name)
+    );
+    itCorrectlyHandlesConfiguredSchema(
+      ClusterFeaturesEnum.KSQL_DB,
+      CLusterCompText.KsqlDb,
+      clusterKsqlDbPath(onlineClusterPayload.name)
+    );
   });
 });
diff --git a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Cluster/__tests__/fixtures.ts
similarity index 94%
rename from kafka-ui-react-app/src/redux/reducers/clusters/__test__/fixtures.ts
rename to kafka-ui-react-app/src/components/Cluster/__tests__/fixtures.ts
index c1d048658fc..deb1585982b 100644
--- a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Cluster/__tests__/fixtures.ts
@@ -9,6 +9,7 @@ export const onlineClusterPayload: Cluster = {
   topicCount: 3,
   bytesInPerSec: 1.55,
   bytesOutPerSec: 9.314,
+  readOnly: false,
   features: [],
 };
 export const offlineClusterPayload: Cluster = {
@@ -21,6 +22,7 @@ export const offlineClusterPayload: Cluster = {
   bytesInPerSec: 3.42,
   bytesOutPerSec: 4.14,
   features: [],
+  readOnly: true,
 };
 
 export const clustersPayload: Cluster[] = [
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index f76e2267eb0..c8cca9fc8d9 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -14,7 +14,7 @@ import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import Dropdown from 'components/common/Dropdown/Dropdown';
 import DropdownItem from 'components/common/Dropdown/DropdownItem';
-import { groupBy } from 'lodash';
+import groupBy from 'lodash/groupBy';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
index b0d716f1bcf..838afa446e7 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
@@ -12,7 +12,7 @@ import MultiSelect from 'react-multi-select-component';
 import { Option } from 'react-multi-select-component/dist/lib/interfaces';
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
-import { groupBy } from 'lodash';
+import groupBy from 'lodash/groupBy';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { ErrorMessage } from '@hookform/error-message';
 import Select from 'components/common/Select/Select';
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
index 883384b806c..4c05bdbb474 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
@@ -1,7 +1,5 @@
 import React from 'react';
-import { chunk } from 'lodash';
 import * as Metrics from 'components/common/Metrics';
-import { Cluster } from 'generated-sources';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
@@ -9,41 +7,38 @@ import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { NavLink } from 'react-router-dom';
 import { clusterTopicsPath } from 'lib/paths';
 import Switch from 'components/common/Switch/Switch';
+import useClusters from 'lib/hooks/api/useClusters';
+import { ServerStatus } from 'generated-sources';
 
 import * as S from './ClustersWidget.styled';
 
-interface Props {
-  clusters: Cluster[];
-  onlineClusters: Cluster[];
-  offlineClusters: Cluster[];
-}
-
-const ClustersWidget: React.FC<Props> = ({
-  clusters,
-  onlineClusters,
-  offlineClusters,
-}) => {
+const ClustersWidget: React.FC = () => {
+  const { data } = useClusters();
   const [showOfflineOnly, setShowOfflineOnly] = React.useState<boolean>(false);
 
-  const clusterList = React.useMemo(() => {
-    if (showOfflineOnly) {
-      return chunk(offlineClusters, 2);
-    }
-    return chunk(clusters, 2);
-  }, [clusters, offlineClusters, showOfflineOnly]);
+  const config = React.useMemo(() => {
+    const clusters = data || [];
+    const offlineClusters = clusters.filter(
+      ({ status }) => status === ServerStatus.OFFLINE
+    );
+    return {
+      list: showOfflineOnly ? offlineClusters : clusters,
+      online: clusters.length - offlineClusters.length,
+      offline: offlineClusters.length,
+    };
+  }, [data, showOfflineOnly]);
 
   const handleSwitch = () => setShowOfflineOnly(!showOfflineOnly);
-
   return (
     <>
       <Metrics.Wrapper>
         <Metrics.Section>
           <Metrics.Indicator label={<Tag color="green">Online</Tag>}>
-            <span>{onlineClusters.length}</span>{' '}
+            <span>{config.online}</span>{' '}
             <Metrics.LightText>clusters</Metrics.LightText>
           </Metrics.Indicator>
           <Metrics.Indicator label={<Tag color="gray">Offline</Tag>}>
-            <span>{offlineClusters.length}</span>{' '}
+            <span>{config.offline}</span>{' '}
             <Metrics.LightText>clusters</Metrics.LightText>
           </Metrics.Indicator>
         </Metrics.Section>
@@ -56,47 +51,45 @@ const ClustersWidget: React.FC<Props> = ({
         />
         <label>Only offline clusters</label>
       </S.SwitchWrapper>
-      {clusterList.map((chunkItem) => (
-        <Table key={chunkItem.map(({ name }) => name).join('-')} isFullwidth>
-          <thead>
-            <tr>
-              <TableHeaderCell title="Cluster name" />
-              <TableHeaderCell title="Version" />
-              <TableHeaderCell title="Brokers count" />
-              <TableHeaderCell title="Partitions" />
-              <TableHeaderCell title="Topics" />
-              <TableHeaderCell title="Production" />
-              <TableHeaderCell title="Consumption" />
+      <Table isFullwidth>
+        <thead>
+          <tr>
+            <TableHeaderCell title="Cluster name" />
+            <TableHeaderCell title="Version" />
+            <TableHeaderCell title="Brokers count" />
+            <TableHeaderCell title="Partitions" />
+            <TableHeaderCell title="Topics" />
+            <TableHeaderCell title="Production" />
+            <TableHeaderCell title="Consumption" />
+          </tr>
+        </thead>
+        <tbody>
+          {config.list.map((cluster) => (
+            <tr key={cluster.name}>
+              <S.TableCell maxWidth="99px" width="350">
+                {cluster.readOnly && <Tag color="blue">readonly</Tag>}{' '}
+                {cluster.name}
+              </S.TableCell>
+              <S.TableCell maxWidth="99px">{cluster.version}</S.TableCell>
+              <S.TableCell maxWidth="99px">{cluster.brokerCount}</S.TableCell>
+              <S.TableCell maxWidth="78px">
+                {cluster.onlinePartitionCount}
+              </S.TableCell>
+              <S.TableCell maxWidth="60px">
+                <NavLink to={clusterTopicsPath(cluster.name)}>
+                  {cluster.topicCount}
+                </NavLink>
+              </S.TableCell>
+              <S.TableCell maxWidth="85px">
+                <BytesFormatted value={cluster.bytesInPerSec} />
+              </S.TableCell>
+              <S.TableCell maxWidth="85px">
+                <BytesFormatted value={cluster.bytesOutPerSec} />
+              </S.TableCell>
             </tr>
-          </thead>
-          <tbody>
-            {chunkItem.map((cluster) => (
-              <tr key={cluster.name}>
-                <S.TableCell maxWidth="99px" width="350">
-                  {cluster.readOnly && <Tag color="blue">readonly</Tag>}{' '}
-                  {cluster.name}
-                </S.TableCell>
-                <S.TableCell maxWidth="99px">{cluster.version}</S.TableCell>
-                <S.TableCell maxWidth="99px">{cluster.brokerCount}</S.TableCell>
-                <S.TableCell maxWidth="78px">
-                  {cluster.onlinePartitionCount}
-                </S.TableCell>
-                <S.TableCell maxWidth="60px">
-                  <NavLink to={clusterTopicsPath(cluster.name)}>
-                    {cluster.topicCount}
-                  </NavLink>
-                </S.TableCell>
-                <S.TableCell maxWidth="85px">
-                  <BytesFormatted value={cluster.bytesInPerSec} />
-                </S.TableCell>
-                <S.TableCell maxWidth="85px">
-                  <BytesFormatted value={cluster.bytesOutPerSec} />
-                </S.TableCell>
-              </tr>
-            ))}
-          </tbody>
-        </Table>
-      ))}
+          ))}
+        </tbody>
+      </Table>
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidgetContainer.ts b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidgetContainer.ts
deleted file mode 100644
index 7533e5947a2..00000000000
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidgetContainer.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { connect } from 'react-redux';
-import {
-  getClusterList,
-  getOnlineClusters,
-  getOfflineClusters,
-} from 'redux/reducers/clusters/clustersSlice';
-import { RootState } from 'redux/interfaces';
-
-import ClustersWidget from './ClustersWidget';
-
-const mapStateToProps = (state: RootState) => ({
-  clusters: getClusterList(state),
-  onlineClusters: getOnlineClusters(state),
-  offlineClusters: getOfflineClusters(state),
-});
-
-export default connect(mapStateToProps)(ClustersWidget);
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
index a79c567070b..9c199ecbc7a 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
@@ -1,22 +1,22 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { act, screen, waitFor } from '@testing-library/react';
 import ClustersWidget from 'components/Dashboard/ClustersWidget/ClustersWidget';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
+import fetchMock from 'fetch-mock';
+import { clustersPayload } from 'components/Cluster/__tests__/fixtures';
 
-import { offlineCluster, onlineCluster, clusters } from './fixtures';
+describe('ClustersWidget', () => {
+  afterEach(() => fetchMock.restore());
 
-const setupComponent = () =>
-  render(
-    <ClustersWidget
-      clusters={clusters}
-      onlineClusters={[onlineCluster]}
-      offlineClusters={[offlineCluster]}
-    />
-  );
+  beforeEach(async () => {
+    const mock = fetchMock.get('/api/clusters', clustersPayload);
 
-describe('ClustersWidget', () => {
-  beforeEach(() => setupComponent());
+    await act(() => {
+      render(<ClustersWidget />);
+    });
+    await waitFor(() => expect(mock.called()).toBeTruthy());
+  });
 
   it('renders clusterWidget list', () => {
     expect(screen.getAllByRole('row').length).toBe(3);
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidgetContainer.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidgetContainer.spec.tsx
deleted file mode 100644
index 666211288b4..00000000000
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidgetContainer.spec.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import React from 'react';
-import ClustersWidget from 'components/Dashboard/ClustersWidget/ClustersWidget';
-import { getByTextContent, render } from 'lib/testHelpers';
-
-describe('ClustersWidgetContainer', () => {
-  it('renders ClustersWidget', () => {
-    render(
-      <ClustersWidget clusters={[]} onlineClusters={[]} offlineClusters={[]} />
-    );
-    expect(getByTextContent('Online 0 clusters')).toBeInTheDocument();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/fixtures.ts
deleted file mode 100644
index c60027ac2c2..00000000000
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/fixtures.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Cluster, ServerStatus } from 'generated-sources';
-
-export const onlineCluster: Cluster = {
-  name: 'secondLocal',
-  defaultCluster: false,
-  status: ServerStatus.ONLINE,
-  brokerCount: 1,
-  onlinePartitionCount: 6,
-  topicCount: 3,
-  bytesInPerSec: 0.00003061819685376471,
-  bytesOutPerSec: 5.737800890036267,
-  readOnly: false,
-};
-
-export const offlineCluster: Cluster = {
-  name: 'local',
-  defaultCluster: true,
-  status: ServerStatus.OFFLINE,
-  brokerCount: 1,
-  onlinePartitionCount: 2,
-  topicCount: 2,
-  bytesInPerSec: 8000.00000673768,
-  bytesOutPerSec: 0.8153063567297119,
-  readOnly: true,
-};
-
-export const clusters: Cluster[] = [onlineCluster, offlineCluster];
diff --git a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
index 87d54a5eb32..518c9e44331 100644
--- a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
@@ -1,12 +1,13 @@
-import React from 'react';
+import React, { Suspense } from 'react';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-
-import ClustersWidgetContainer from './ClustersWidget/ClustersWidgetContainer';
+import ClustersWidget from 'components/Dashboard/ClustersWidget/ClustersWidget';
 
 const Dashboard: React.FC = () => (
   <>
     <PageHeading text="Dashboard" />
-    <ClustersWidgetContainer />
+    <Suspense>
+      <ClustersWidget />
+    </Suspense>
   </>
 );
 
diff --git a/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
index e6454cce11f..2e5d00cd2df 100644
--- a/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
@@ -3,17 +3,14 @@ import Dashboard from 'components/Dashboard/Dashboard';
 import { render } from 'lib/testHelpers';
 import { screen } from '@testing-library/dom';
 
-jest.mock(
-  'components/Dashboard/ClustersWidget/ClustersWidgetContainer.ts',
-  () => () => <div>mock-ClustersWidgetContainer</div>
-);
+jest.mock('components/Dashboard/ClustersWidget/ClustersWidget', () => () => (
+  <div>mock-ClustersWidget</div>
+));
 
 describe('Dashboard', () => {
   it('renders ClustersWidget', () => {
     render(<Dashboard />);
     expect(screen.getByText('Dashboard')).toBeInTheDocument();
-    expect(
-      screen.getByText('mock-ClustersWidgetContainer')
-    ).toBeInTheDocument();
+    expect(screen.getByText('mock-ClustersWidget')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
index 9e60d101286..4982807ac24 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
@@ -10,7 +10,7 @@ import { getKsqlExecution } from 'redux/reducers/ksqlDb/selectors';
 import { BASE_PARAMS } from 'lib/constants';
 import { KsqlResponse, KsqlTableResponse } from 'generated-sources';
 import { alertAdded, alertDissmissed } from 'redux/reducers/alerts/alertsSlice';
-import { now } from 'lodash';
+import now from 'lodash/now';
 import { ClusterNameRoute } from 'lib/paths';
 
 import type { FormValues } from './QueryForm/QueryForm';
diff --git a/kafka-ui-react-app/src/components/Nav/Nav.tsx b/kafka-ui-react-app/src/components/Nav/Nav.tsx
index a21a104ae8d..2142139514b 100644
--- a/kafka-ui-react-app/src/components/Nav/Nav.tsx
+++ b/kafka-ui-react-app/src/components/Nav/Nav.tsx
@@ -1,30 +1,31 @@
+import useClusters from 'lib/hooks/api/useClusters';
 import React from 'react';
-import { Cluster } from 'generated-sources';
 
 import ClusterMenu from './ClusterMenu';
 import ClusterMenuItem from './ClusterMenuItem';
 import * as S from './Nav.styled';
 
-interface Props {
-  areClustersFulfilled?: boolean;
-  clusters: Cluster[];
-}
+const Nav: React.FC = () => {
+  const query = useClusters();
 
-const Nav: React.FC<Props> = ({ areClustersFulfilled, clusters }) => (
-  <aside aria-label="Sidebar Menu">
-    <S.List>
-      <ClusterMenuItem to="/" title="Dashboard" isTopLevel />
-    </S.List>
+  if (!query.isSuccess) {
+    return null;
+  }
 
-    {areClustersFulfilled &&
-      clusters.map((cluster) => (
+  return (
+    <aside aria-label="Sidebar Menu">
+      <S.List>
+        <ClusterMenuItem to="/" title="Dashboard" isTopLevel />
+      </S.List>
+      {query.data.map((cluster) => (
         <ClusterMenu
           cluster={cluster}
           key={cluster.name}
-          singleMode={clusters.length === 1}
+          singleMode={query.data.length === 1}
         />
       ))}
-  </aside>
-);
+    </aside>
+  );
+};
 
 export default Nav;
diff --git a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx
index f817a0c6d29..0dbd0bf2650 100644
--- a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx
+++ b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
 import { Cluster, ClusterFeaturesEnum } from 'generated-sources';
-import { onlineClusterPayload } from 'redux/reducers/clusters/__test__/fixtures';
 import ClusterMenu from 'components/Nav/ClusterMenu';
 import userEvent from '@testing-library/user-event';
 import { clusterConnectorsPath } from 'lib/paths';
 import { render } from 'lib/testHelpers';
+import { onlineClusterPayload } from 'components/Cluster/__tests__/fixtures';
 
 describe('ClusterMenu', () => {
   const setupComponent = (cluster: Cluster, singleMode?: boolean) => (
diff --git a/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx b/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx
index 1ef18720e32..299463af5f9 100644
--- a/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx
+++ b/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx
@@ -1,29 +1,38 @@
 import React from 'react';
+import Nav from 'components/Nav/Nav';
+import { screen, waitFor } from '@testing-library/react';
+import { render } from 'lib/testHelpers';
 import {
   offlineClusterPayload,
   onlineClusterPayload,
-} from 'redux/reducers/clusters/__test__/fixtures';
-import Nav from 'components/Nav/Nav';
-import { screen } from '@testing-library/react';
-import { render } from 'lib/testHelpers';
+} from 'components/Cluster/__tests__/fixtures';
+import fetchMock from 'fetch-mock';
+import { act } from 'react-dom/test-utils';
+import { Cluster } from 'generated-sources';
 
 describe('Nav', () => {
+  afterEach(() => fetchMock.restore());
+
+  const renderComponent = async (payload: Cluster[] = []) => {
+    const mock = fetchMock.get('/api/clusters', payload);
+    await act(() => {
+      render(<Nav />);
+    });
+    return waitFor(() => expect(mock.called()).toBeTruthy());
+  };
+
   const getDashboard = () => screen.getByText('Dashboard');
 
   const getMenuItemsCount = () => screen.getAllByRole('menuitem').length;
-  it('renders loader', () => {
-    render(<Nav clusters={[]} />);
+  it('renders loader', async () => {
+    await renderComponent();
+
     expect(getMenuItemsCount()).toEqual(1);
     expect(getDashboard()).toBeInTheDocument();
   });
 
-  it('renders ClusterMenu', () => {
-    render(
-      <Nav
-        clusters={[onlineClusterPayload, offlineClusterPayload]}
-        areClustersFulfilled
-      />
-    );
+  it('renders ClusterMenu', async () => {
+    await renderComponent([onlineClusterPayload, offlineClusterPayload]);
     expect(screen.getAllByRole('menu').length).toEqual(3);
     expect(getMenuItemsCount()).toEqual(3);
     expect(getDashboard()).toBeInTheDocument();
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
index 0d1cb96a47e..5787f6f3c13 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
@@ -11,7 +11,7 @@ import {
   TopicMessageEventTypeEnum,
 } from 'generated-sources';
 import React, { useContext } from 'react';
-import { omitBy } from 'lodash';
+import omitBy from 'lodash/omitBy';
 import { useNavigate, useLocation } from 'react-router-dom';
 import MultiSelect from 'components/common/MultiSelect/MultiSelect.styled';
 import { Option } from 'react-multi-select-component/dist/lib/interfaces';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/utils.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/utils.ts
index 16dbc7db693..97907a2c224 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/utils.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/utils.ts
@@ -1,5 +1,5 @@
 import { Partition, SeekType } from 'generated-sources';
-import { compact } from 'lodash';
+import compact from 'lodash/compact';
 import { Option } from 'react-multi-select-component/dist/lib/interfaces';
 
 export const filterOptions = (options: Option[], filter: string) => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 9b8e4435c3a..5889b7cb3bc 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -12,7 +12,7 @@ import {
 } from 'redux/reducers/topics/topicsSlice';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import { alertAdded } from 'redux/reducers/alerts/alertsSlice';
-import { now } from 'lodash';
+import now from 'lodash/now';
 import { Button } from 'components/common/Button/Button';
 import Editor from 'components/common/Editor/Editor';
 import PageLoader from 'components/common/PageLoader/PageLoader';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts
index 8a4f173d7a7..2d3aa23740e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts
@@ -1,6 +1,6 @@
 import { TopicMessageSchema } from 'generated-sources';
 import Ajv, { DefinedError } from 'ajv/dist/2020';
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash/upperFirst';
 
 const validateBySchema = (
   value: string,
diff --git a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
index 9f48fb25ada..04716482619 100644
--- a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
+++ b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
@@ -1,74 +1,49 @@
 import React from 'react';
-import { screen, within, act } from '@testing-library/react';
+import { screen, within } from '@testing-library/react';
 import App from 'components/App';
 import { render } from 'lib/testHelpers';
-import { clustersPayload } from 'redux/reducers/clusters/__test__/fixtures';
 import userEvent from '@testing-library/user-event';
-import fetchMock from 'fetch-mock';
 
 const burgerButtonOptions = { name: 'burger' };
 const logoutButtonOptions = { name: 'Log out' };
 
+jest.mock('components/Nav/Nav', () => () => <div>Navigation</div>);
+
 describe('App', () => {
-  describe('initial state', () => {
-    beforeEach(() => {
-      render(<App />, {
-        initialEntries: ['/'],
-      });
-    });
-    it('shows PageLoader until clusters are fulfilled', () => {
-      expect(screen.getByText('Dashboard')).toBeInTheDocument();
-      expect(screen.getByRole('progressbar')).toBeInTheDocument();
-    });
-    it('correctly renders header', () => {
-      const header = screen.getByLabelText('Page Header');
-      expect(header).toBeInTheDocument();
-      expect(
-        within(header).getByText('UI for Apache Kafka')
-      ).toBeInTheDocument();
-      expect(within(header).getAllByRole('separator').length).toEqual(3);
-      expect(
-        within(header).getByRole('button', burgerButtonOptions)
-      ).toBeInTheDocument();
-      expect(
-        within(header).getByRole('button', logoutButtonOptions)
-      ).toBeInTheDocument();
-    });
-    it('handle burger click correctly', () => {
-      const header = screen.getByLabelText('Page Header');
-      const burger = within(header).getByRole('button', burgerButtonOptions);
-      const sidebar = screen.getByLabelText('Sidebar');
-      const overlay = screen.getByLabelText('Overlay');
-      expect(sidebar).toBeInTheDocument();
-      expect(overlay).toBeInTheDocument();
-      expect(overlay).toHaveStyleRule('visibility: hidden');
-      expect(burger).toHaveStyleRule('display: none');
-      userEvent.click(burger);
-      expect(overlay).toHaveStyleRule('visibility: visible');
+  beforeEach(() => {
+    render(<App />, {
+      initialEntries: ['/'],
     });
   });
 
-  describe('with clusters list fetched', () => {
-    it('shows Cluster list', async () => {
-      const mock = fetchMock.getOnce('/api/clusters', clustersPayload);
-      await act(() => {
-        render(<App />, {
-          initialEntries: ['/'],
-        });
-      });
+  it('correctly renders header', () => {
+    const header = screen.getByLabelText('Page Header');
+    expect(header).toBeInTheDocument();
+    expect(within(header).getByText('UI for Apache Kafka')).toBeInTheDocument();
+    expect(within(header).getAllByRole('separator').length).toEqual(3);
+    expect(
+      within(header).getByRole('button', burgerButtonOptions)
+    ).toBeInTheDocument();
+    expect(
+      within(header).getByRole('button', logoutButtonOptions)
+    ).toBeInTheDocument();
+  });
 
-      expect(mock.called()).toBeTruthy();
+  it('handle burger click correctly', () => {
+    const burger = within(screen.getByLabelText('Page Header')).getByRole(
+      'button',
+      burgerButtonOptions
+    );
+    const overlay = screen.getByLabelText('Overlay');
+    expect(screen.getByLabelText('Sidebar')).toBeInTheDocument();
+    expect(overlay).toBeInTheDocument();
+    expect(overlay).toHaveStyleRule('visibility: hidden');
+    expect(burger).toHaveStyleRule('display: none');
+    userEvent.click(burger);
+    expect(overlay).toHaveStyleRule('visibility: visible');
+  });
 
-      const menuContainer = screen.getByLabelText('Sidebar Menu');
-      expect(menuContainer).toBeInTheDocument();
-      expect(within(menuContainer).getByText('Dashboard')).toBeInTheDocument();
-      expect(
-        within(menuContainer).getByText(clustersPayload[0].name)
-      ).toBeInTheDocument();
-      expect(
-        within(menuContainer).getByText(clustersPayload[1].name)
-      ).toBeInTheDocument();
-      expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
-    });
+  it('Renders navigation', async () => {
+    expect(screen.getByText('Navigation')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx b/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
index 67a11f95866..9b5c6c562fc 100644
--- a/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
+++ b/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
@@ -1,6 +1,6 @@
 import { PER_PAGE } from 'lib/constants';
 import usePagination from 'lib/hooks/usePagination';
-import { range } from 'lodash';
+import range from 'lodash/range';
 import React from 'react';
 import PageControl from 'components/common/Pagination/PageControl';
 import useSearch from 'lib/hooks/useSearch';
diff --git a/kafka-ui-react-app/src/lib/hooks/api/useClusters.ts b/kafka-ui-react-app/src/lib/hooks/api/useClusters.ts
new file mode 100644
index 00000000000..d22f58981a2
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/useClusters.ts
@@ -0,0 +1,8 @@
+import { clustersApiClient } from 'lib/api';
+import { useQuery } from 'react-query';
+
+export default function useClusters() {
+  return useQuery(['clusters'], () => clustersApiClient.getClusters(), {
+    suspense: true,
+  });
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
index f39bac32058..91708659582 100644
--- a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
@@ -1,4 +1,4 @@
-import { isObject } from 'lodash';
+import isObject from 'lodash/isObject';
 import { alertAdded, alertDissmissed } from 'redux/reducers/alerts/alertsSlice';
 import { useAppDispatch } from 'lib/hooks/redux';
 
diff --git a/kafka-ui-react-app/src/redux/reducers/alerts/alertsSlice.ts b/kafka-ui-react-app/src/redux/reducers/alerts/alertsSlice.ts
index c68b24e002a..1890ceb0257 100644
--- a/kafka-ui-react-app/src/redux/reducers/alerts/alertsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/alerts/alertsSlice.ts
@@ -6,7 +6,7 @@ import {
   PayloadAction,
 } from '@reduxjs/toolkit';
 import { UnknownAsyncThunkRejectedWithValueAction } from '@reduxjs/toolkit/dist/matchers';
-import { now } from 'lodash';
+import now from 'lodash/now';
 import { Alert, RootState, ServerResponse } from 'redux/interfaces';
 
 const alertsAdapter = createEntityAdapter<Alert>({
diff --git a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/clusters/__test__/reducer.spec.ts
deleted file mode 100644
index d10be934481..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/reducer.spec.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import fetchMock from 'fetch-mock-jest';
-import reducer, { fetchClusters } from 'redux/reducers/clusters/clustersSlice';
-import mockStoreCreator from 'redux/store/configureStore/mockStoreCreator';
-
-import { clustersPayload } from './fixtures';
-
-const store = mockStoreCreator;
-
-describe('Clusters Slice', () => {
-  describe('Reducer', () => {
-    it('returns the initial state', () => {
-      expect(reducer(undefined, { type: fetchClusters.pending })).toEqual([]);
-    });
-
-    it('reacts on fetchClusters.fulfilled and returns payload', () => {
-      expect(
-        reducer([], {
-          type: fetchClusters.fulfilled,
-          payload: clustersPayload,
-        })
-      ).toEqual(clustersPayload);
-    });
-  });
-
-  describe('thunks', () => {
-    afterEach(() => {
-      fetchMock.restore();
-      store.clearActions();
-    });
-
-    describe('fetchClusters', () => {
-      it('creates fetchClusters.fulfilled when fetched clusters', async () => {
-        fetchMock.getOnce('/api/clusters', clustersPayload);
-        await store.dispatch(fetchClusters());
-        expect(
-          store.getActions().map(({ type, payload }) => ({ type, payload }))
-        ).toEqual([
-          { type: fetchClusters.pending.type },
-          { type: fetchClusters.fulfilled.type, payload: clustersPayload },
-        ]);
-      });
-
-      it('creates fetchClusters.rejected when fetched clusters', async () => {
-        fetchMock.getOnce('/api/clusters', 422);
-        await store.dispatch(fetchClusters());
-        expect(
-          store.getActions().map(({ type, payload }) => ({ type, payload }))
-        ).toEqual([
-          { type: fetchClusters.pending.type },
-          { type: fetchClusters.rejected.type },
-        ]);
-      });
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/clusters/__test__/selectors.spec.ts
deleted file mode 100644
index c9b51067e5a..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/selectors.spec.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { store } from 'redux/store';
-import {
-  fetchClusters,
-  getAreClustersFulfilled,
-  getClusterList,
-  getOnlineClusters,
-  getOfflineClusters,
-} from 'redux/reducers/clusters/clustersSlice';
-
-import {
-  clustersPayload,
-  offlineClusterPayload,
-  onlineClusterPayload,
-} from './fixtures';
-
-describe('Clusters selectors', () => {
-  describe('Initial State', () => {
-    it('returns fetch status', () => {
-      expect(getAreClustersFulfilled(store.getState())).toBeFalsy();
-    });
-
-    it('returns cluster list', () => {
-      expect(getClusterList(store.getState())).toEqual([]);
-    });
-
-    it('returns online cluster list', () => {
-      expect(getOnlineClusters(store.getState())).toEqual([]);
-    });
-
-    it('returns offline cluster list', () => {
-      expect(getOfflineClusters(store.getState())).toEqual([]);
-    });
-  });
-
-  describe('state', () => {
-    beforeAll(() => {
-      store.dispatch(fetchClusters.fulfilled(clustersPayload, '1234'));
-    });
-
-    it('returns fetch status', () => {
-      expect(getAreClustersFulfilled(store.getState())).toBeTruthy();
-    });
-
-    it('returns cluster list', () => {
-      expect(getClusterList(store.getState())).toEqual(clustersPayload);
-    });
-
-    it('returns online cluster list', () => {
-      expect(getOnlineClusters(store.getState())).toEqual([
-        onlineClusterPayload,
-      ]);
-    });
-
-    it('returns offline cluster list', () => {
-      expect(getOfflineClusters(store.getState())).toEqual([
-        offlineClusterPayload,
-      ]);
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/reducers/clusters/clustersSlice.ts b/kafka-ui-react-app/src/redux/reducers/clusters/clustersSlice.ts
deleted file mode 100644
index 9b750b2d2db..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/clusters/clustersSlice.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import {
-  createAsyncThunk,
-  createSlice,
-  createSelector,
-} from '@reduxjs/toolkit';
-import { Cluster, ServerStatus, ClusterFeaturesEnum } from 'generated-sources';
-import { clustersApiClient } from 'lib/api';
-import { AsyncRequestStatus } from 'lib/constants';
-import { RootState } from 'redux/interfaces';
-import { createFetchingSelector } from 'redux/reducers/loader/selectors';
-
-export const fetchClusters = createAsyncThunk(
-  'clusters/fetchClusters',
-  async () => {
-    const clusters: Cluster[] = await clustersApiClient.getClusters();
-    return clusters;
-  }
-);
-
-export const initialState: Cluster[] = [];
-export const clustersSlice = createSlice({
-  name: 'clusters',
-  initialState,
-  reducers: {},
-  extraReducers: (builder) => {
-    builder.addCase(fetchClusters.fulfilled, (_, { payload }) => payload);
-  },
-});
-
-const clustersState = ({ clusters }: RootState): Cluster[] => clusters;
-const getClusterListFetchingStatus = createFetchingSelector(
-  'clusters/fetchClusters'
-);
-export const getAreClustersFulfilled = createSelector(
-  getClusterListFetchingStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-export const getClusterList = createSelector(
-  clustersState,
-  (clusters) => clusters
-);
-export const getOnlineClusters = createSelector(getClusterList, (clusters) =>
-  clusters.filter(({ status }) => status === ServerStatus.ONLINE)
-);
-export const getOfflineClusters = createSelector(getClusterList, (clusters) =>
-  clusters.filter(({ status }) => status === ServerStatus.OFFLINE)
-);
-export const getClustersReadonlyStatus = (clusterName: string) =>
-  createSelector(
-    getClusterList,
-    (clusters): boolean =>
-      clusters.find(({ name }) => name === clusterName)?.readOnly || false
-  );
-export const getClustersFeatures = (clusterName: string) =>
-  createSelector(
-    getClusterList,
-    (clusters): ClusterFeaturesEnum[] =>
-      clusters.find(({ name }) => name === clusterName)?.features || []
-  );
-
-export default clustersSlice.reducer;
diff --git a/kafka-ui-react-app/src/redux/reducers/connect/selectors.ts b/kafka-ui-react-app/src/redux/reducers/connect/selectors.ts
index 32f654ec79d..6dbb8e8402f 100644
--- a/kafka-ui-react-app/src/redux/reducers/connect/selectors.ts
+++ b/kafka-ui-react-app/src/redux/reducers/connect/selectors.ts
@@ -6,7 +6,7 @@ import {
   ConnectorState,
   FullConnectorInfo,
 } from 'generated-sources';
-import { sortBy } from 'lodash';
+import sortBy from 'lodash/sortBy';
 import { AsyncRequestStatus } from 'lib/constants';
 
 import {
diff --git a/kafka-ui-react-app/src/redux/reducers/index.ts b/kafka-ui-react-app/src/redux/reducers/index.ts
index 801490912f4..c7c01d487d0 100644
--- a/kafka-ui-react-app/src/redux/reducers/index.ts
+++ b/kafka-ui-react-app/src/redux/reducers/index.ts
@@ -1,5 +1,4 @@
 import { combineReducers } from '@reduxjs/toolkit';
-import clusters from 'redux/reducers/clusters/clustersSlice';
 import loader from 'redux/reducers/loader/loaderSlice';
 import alerts from 'redux/reducers/alerts/alertsSlice';
 import schemas from 'redux/reducers/schemas/schemasSlice';
@@ -14,7 +13,6 @@ export default combineReducers({
   alerts,
   topics,
   topicMessages,
-  clusters,
   consumerGroups,
   schemas,
   connect,
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
index 0d6ff362c6f..c4a4afe1e0e 100644
--- a/kafka-ui-react-app/vite.config.ts
+++ b/kafka-ui-react-app/vite.config.ts
@@ -22,7 +22,6 @@ export default defineConfig(({ mode }) => {
               'styled-components',
               'react-ace',
             ],
-            lodash: ['lodash'],
           },
         },
       },

From 3e5093d101a0850a620d417027449c7410889da2 Mon Sep 17 00:00:00 2001
From: Artem Kazlanzhy <87637857+akazlanzhy@users.noreply.github.com>
Date: Tue, 28 Jun 2022 22:58:50 +0300
Subject: [PATCH 046/734] Make max-in-memory configurable for webclients
 (#2139)

* Fix max-in-memory configuration for KsqlApiClient

* Fix tests, resolve mr comments

* Fix max-in-memory configuration for RetryingKafkaConnectClient

* Refactor KafkaConnectClients class

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/client/KafkaConnectClients.java  | 19 -------
 .../ui/client/KafkaConnectClientsFactory.java | 22 ++++++++
 .../ui/client/RetryingKafkaConnectClient.java | 55 +++++++++++++++++--
 .../kafka/ui/service/KafkaConnectService.java |  6 +-
 .../kafka/ui/service/ksql/KsqlApiClient.java  |  6 +-
 .../kafka/ui/service/ksql/KsqlServiceV2.java  | 17 ++++--
 .../ui/service/ksql/KsqlApiClientTest.java    |  7 ++-
 .../ui/service/ksql/KsqlServiceV2Test.java    | 13 +++--
 8 files changed, 106 insertions(+), 39 deletions(-)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClients.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClientsFactory.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClients.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClients.java
deleted file mode 100644
index de0c9054ae2..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClients.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.provectus.kafka.ui.client;
-
-import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
-import com.provectus.kafka.ui.model.KafkaConnectCluster;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-public final class KafkaConnectClients {
-
-  private KafkaConnectClients() {
-
-  }
-
-  private static final Map<String, KafkaConnectClientApi> CACHE = new ConcurrentHashMap<>();
-
-  public static KafkaConnectClientApi withKafkaConnectConfig(KafkaConnectCluster config) {
-    return CACHE.computeIfAbsent(config.getAddress(), s -> new RetryingKafkaConnectClient(config));
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClientsFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClientsFactory.java
new file mode 100644
index 00000000000..3a5195f5cf0
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClientsFactory.java
@@ -0,0 +1,22 @@
+package com.provectus.kafka.ui.client;
+
+import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
+import com.provectus.kafka.ui.model.KafkaConnectCluster;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.unit.DataSize;
+
+@Service
+public class KafkaConnectClientsFactory {
+
+  @Value("${webclient.max-in-memory-buffer-size:20MB}")
+  private DataSize maxBuffSize;
+
+  private final Map<String, KafkaConnectClientApi> cache = new ConcurrentHashMap<>();
+
+  public KafkaConnectClientApi withKafkaConnectConfig(KafkaConnectCluster config) {
+    return cache.computeIfAbsent(config.getAddress(), s -> new RetryingKafkaConnectClient(config, maxBuffSize));
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
index 70716613730..b1115d0eef1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
@@ -1,22 +1,34 @@
 package com.provectus.kafka.ui.client;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.provectus.kafka.ui.connect.ApiClient;
+import com.provectus.kafka.ui.connect.RFC3339DateFormat;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
 import com.provectus.kafka.ui.connect.model.Connector;
 import com.provectus.kafka.ui.connect.model.NewConnector;
 import com.provectus.kafka.ui.exception.KafkaConnectConflictReponseException;
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.model.KafkaConnectCluster;
+import java.text.DateFormat;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 import lombok.extern.slf4j.Slf4j;
+import org.openapitools.jackson.nullable.JsonNullableModule;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
+import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.json.Jackson2JsonEncoder;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.unit.DataSize;
 import org.springframework.web.client.RestClientException;
+import org.springframework.web.reactive.function.client.ExchangeStrategies;
+import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -27,8 +39,8 @@ public class RetryingKafkaConnectClient extends KafkaConnectClientApi {
   private static final int MAX_RETRIES = 5;
   private static final Duration RETRIES_DELAY = Duration.ofMillis(200);
 
-  public RetryingKafkaConnectClient(KafkaConnectCluster config) {
-    super(new RetryingApiClient(config));
+  public RetryingKafkaConnectClient(KafkaConnectCluster config, DataSize maxBuffSize) {
+    super(new RetryingApiClient(config, maxBuffSize));
   }
 
   private static Retry conflictCodeRetry() {
@@ -73,13 +85,48 @@ public Mono<Connector> setConnectorConfig(String connectorName, Map<String, Obje
 
   private static class RetryingApiClient extends ApiClient {
 
-    public RetryingApiClient(KafkaConnectCluster config) {
-      super();
+    private static final DateFormat dateFormat = getDefaultDateFormat();
+    private static final ObjectMapper mapper = buildObjectMapper(dateFormat);
+
+    public RetryingApiClient(KafkaConnectCluster config, DataSize maxBuffSize) {
+      super(buildWebClient(mapper, maxBuffSize), mapper, dateFormat);
       setBasePath(config.getAddress());
       setUsername(config.getUserName());
       setPassword(config.getPassword());
     }
 
+    public static DateFormat getDefaultDateFormat() {
+      DateFormat dateFormat = new RFC3339DateFormat();
+      dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+      return dateFormat;
+    }
+
+    public static WebClient buildWebClient(ObjectMapper mapper, DataSize maxBuffSize) {
+      ExchangeStrategies strategies = ExchangeStrategies
+              .builder()
+              .codecs(clientDefaultCodecsConfigurer -> {
+                clientDefaultCodecsConfigurer.defaultCodecs()
+                        .jackson2JsonEncoder(new Jackson2JsonEncoder(mapper, MediaType.APPLICATION_JSON));
+                clientDefaultCodecsConfigurer.defaultCodecs()
+                        .jackson2JsonDecoder(new Jackson2JsonDecoder(mapper, MediaType.APPLICATION_JSON));
+                clientDefaultCodecsConfigurer.defaultCodecs()
+                        .maxInMemorySize((int) maxBuffSize.toBytes());
+              })
+              .build();
+      WebClient.Builder webClient = WebClient.builder().exchangeStrategies(strategies);
+      return webClient.build();
+    }
+
+    public static ObjectMapper buildObjectMapper(DateFormat dateFormat) {
+      ObjectMapper mapper = new ObjectMapper();
+      mapper.setDateFormat(dateFormat);
+      mapper.registerModule(new JavaTimeModule());
+      mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+      JsonNullableModule jnm = new JsonNullableModule();
+      mapper.registerModule(jnm);
+      return mapper;
+    }
+
     @Override
     public <T> Mono<T> invokeAPI(String path, HttpMethod method, Map<String, Object> pathParams,
                                  MultiValueMap<String, String> queryParams, Object body,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
index 21680d3dd91..69fd7a26276 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.client.KafkaConnectClients;
+import com.provectus.kafka.ui.client.KafkaConnectClientsFactory;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
 import com.provectus.kafka.ui.connect.model.ConnectorStatus;
 import com.provectus.kafka.ui.connect.model.ConnectorStatusConnector;
@@ -21,7 +21,6 @@
 import com.provectus.kafka.ui.model.ConnectorTaskStatusDTO;
 import com.provectus.kafka.ui.model.FullConnectorInfoDTO;
 import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.KafkaConnectCluster;
 import com.provectus.kafka.ui.model.NewConnectorDTO;
 import com.provectus.kafka.ui.model.TaskDTO;
 import com.provectus.kafka.ui.model.connect.InternalConnectInfo;
@@ -51,6 +50,7 @@ public class KafkaConnectService {
   private final KafkaConnectMapper kafkaConnectMapper;
   private final ObjectMapper objectMapper;
   private final KafkaConfigSanitizer kafkaConfigSanitizer;
+  private final KafkaConnectClientsFactory kafkaConnectClientsFactory;
 
   public Mono<Flux<ConnectDTO>> getConnects(KafkaCluster cluster) {
     return Mono.just(
@@ -328,6 +328,6 @@ private Mono<KafkaConnectClientApi> withConnectClient(KafkaCluster cluster, Stri
             .filter(connect -> connect.getName().equals(connectName))
             .findFirst())
         .switchIfEmpty(Mono.error(ConnectNotFoundException::new))
-        .map(KafkaConnectClients::withKafkaConnectConfig);
+        .map(kafkaConnectClientsFactory::withKafkaConnectConfig);
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
index 9341dd30d3b..161c284c972 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
@@ -21,6 +21,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.util.MimeTypeUtils;
+import org.springframework.util.unit.DataSize;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -57,9 +58,11 @@ private static class KsqlRequest {
   //--------------------------------------------------------------------------------------------
 
   private final KafkaCluster cluster;
+  private final DataSize maxBuffSize;
 
-  public KsqlApiClient(KafkaCluster cluster) {
+  public KsqlApiClient(KafkaCluster cluster, DataSize maxBuffSize) {
     this.cluster = cluster;
+    this.maxBuffSize = maxBuffSize;
   }
 
   private WebClient webClient() {
@@ -75,6 +78,7 @@ private WebClient webClient() {
         })
         .build();
     return WebClient.builder()
+        .codecs(c -> c.defaultCodecs().maxInMemorySize((int) maxBuffSize.toBytes()))
         .exchangeStrategies(exchangeStrategies)
         .build();
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java
index 12a2e7d0b24..63fcede3611 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java
@@ -13,16 +13,23 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.unit.DataSize;
 import reactor.core.publisher.Flux;
 
 @Slf4j
 @Service
 public class KsqlServiceV2 {
 
-  @Value
+  private final DataSize maxBuffSize;
+
+  public KsqlServiceV2(@Value("${webclient.max-in-memory-buffer-size:20MB}") DataSize maxBuffSize) {
+    this.maxBuffSize = maxBuffSize;
+  }
+
+  @lombok.Value
   private static class KsqlExecuteCommand {
     KafkaCluster cluster;
     String ksql;
@@ -48,12 +55,12 @@ public Flux<KsqlResponseTable> execute(String commandId) {
       throw new ValidationException("No command registered with id " + commandId);
     }
     registeredCommands.invalidate(commandId);
-    return new KsqlApiClient(cmd.cluster)
+    return new KsqlApiClient(cmd.cluster, maxBuffSize)
         .execute(cmd.ksql, cmd.streamProperties);
   }
 
   public Flux<KsqlTableDescriptionDTO> listTables(KafkaCluster cluster) {
-    return new KsqlApiClient(cluster)
+    return new KsqlApiClient(cluster, maxBuffSize)
         .execute("LIST TABLES;", Map.of())
         .flatMap(resp -> {
           if (!resp.getHeader().equals("Tables")) {
@@ -75,7 +82,7 @@ public Flux<KsqlTableDescriptionDTO> listTables(KafkaCluster cluster) {
   }
 
   public Flux<KsqlStreamDescriptionDTO> listStreams(KafkaCluster cluster) {
-    return new KsqlApiClient(cluster)
+    return new KsqlApiClient(cluster, maxBuffSize)
         .execute("LIST STREAMS;", Map.of())
         .flatMap(resp -> {
           if (!resp.getHeader().equals("Streams")) {
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
index d09e32f948c..5956d730829 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
@@ -16,6 +16,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.springframework.util.unit.DataSize;
 import org.testcontainers.shaded.org.awaitility.Awaitility;
 import org.testcontainers.utility.DockerImageName;
 import reactor.test.StepVerifier;
@@ -26,6 +27,8 @@ class KsqlApiClientTest extends AbstractIntegrationTest {
       DockerImageName.parse("confluentinc/ksqldb-server").withTag("0.24.0"))
       .withKafka(kafka);
 
+  private static final DataSize maxBuffSize = DataSize.ofMegabytes(20);
+
   @BeforeAll
   static void startContainer() {
     KSQL_DB.start();
@@ -39,7 +42,7 @@ static void stopContainer() {
   // Tutorial is here: https://ksqldb.io/quickstart.html
   @Test
   void ksqTutorialQueriesWork() {
-    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(KSQL_DB.url()).build());
+    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(KSQL_DB.url()).build(), maxBuffSize);
     execCommandSync(client,
         "CREATE STREAM riderLocations (profileId VARCHAR, latitude DOUBLE, longitude DOUBLE) "
             + "WITH (kafka_topic='locations', value_format='json', partitions=1);",
@@ -126,4 +129,4 @@ private void execCommandSync(KsqlApiClient client, String... ksqls) {
   }
 
 
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
index 22c87c9aecc..d670680ea21 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.springframework.util.unit.DataSize;
 import org.testcontainers.utility.DockerImageName;
 
 class KsqlServiceV2Test extends AbstractIntegrationTest {
@@ -24,6 +25,8 @@ class KsqlServiceV2Test extends AbstractIntegrationTest {
   private static final Set<String> STREAMS_TO_DELETE = new CopyOnWriteArraySet<>();
   private static final Set<String> TABLES_TO_DELETE = new CopyOnWriteArraySet<>();
 
+  private static final DataSize maxBuffSize = DataSize.ofMegabytes(20);
+
   @BeforeAll
   static void init() {
     KSQL_DB.start();
@@ -31,7 +34,7 @@ static void init() {
 
   @AfterAll
   static void cleanup() {
-    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(KSQL_DB.url()).build());
+    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(KSQL_DB.url()).build(), maxBuffSize);
 
     TABLES_TO_DELETE.forEach(t ->
         client.execute(String.format("DROP TABLE IF EXISTS %s DELETE TOPIC;", t), Map.of())
@@ -44,7 +47,7 @@ static void cleanup() {
     KSQL_DB.stop();
   }
 
-  private final KsqlServiceV2 ksqlService = new KsqlServiceV2();
+  private final KsqlServiceV2 ksqlService = new KsqlServiceV2(maxBuffSize);
 
   @Test
   void listStreamsReturnsAllKsqlStreams() {
@@ -52,7 +55,7 @@ void listStreamsReturnsAllKsqlStreams() {
     var streamName = "stream_" + System.currentTimeMillis();
     STREAMS_TO_DELETE.add(streamName);
 
-    new KsqlApiClient(cluster)
+    new KsqlApiClient(cluster, maxBuffSize)
         .execute(
             String.format("CREATE STREAM %s ( "
                 + "  c1 BIGINT KEY, "
@@ -81,7 +84,7 @@ void listTablesReturnsAllKsqlTables() {
     var tableName = "table_" + System.currentTimeMillis();
     TABLES_TO_DELETE.add(tableName);
 
-    new KsqlApiClient(cluster)
+    new KsqlApiClient(cluster, maxBuffSize)
         .execute(
             String.format("CREATE TABLE %s ( "
                 + "   c1 BIGINT PRIMARY KEY, "
@@ -105,4 +108,4 @@ void listTablesReturnsAllKsqlTables() {
     );
   }
 
-}
\ No newline at end of file
+}

From 46bcbb3436caf7357ff11eebbd1b49fe4f2cd167 Mon Sep 17 00:00:00 2001
From: azatsafin <azat.safin@gmail.com>
Date: Wed, 29 Jun 2022 12:40:50 +0300
Subject: [PATCH 047/734] Get rid of feature-testing useless comments (#2219)

Co-authored-by: Azat Safin <azsafin@provectus.com>
---
 .github/workflows/branch-remove.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/branch-remove.yml b/.github/workflows/branch-remove.yml
index 8582b6feb7b..59024af6cbd 100644
--- a/.github/workflows/branch-remove.yml
+++ b/.github/workflows/branch-remove.yml
@@ -5,25 +5,17 @@ on:
     types: ['unlabeled', 'closed']
 jobs:
   remove:
-    if: ${{ github.event.label.name == 'status/feature_testing' || github.event.label.name == 'status/feature_testing_public' || github.event.action == 'closed'}}
     runs-on: ubuntu-latest
+    if: ${{ (github.event.label.name == 'status/feature_testing' || github.event.label.name == 'status/feature_testing_public') || (github.event.action == 'closed' && (contains(github.event.pull_request.labels.*.name, 'status/feature_testing') || contains(github.event.pull_request.labels.*.name, 'status/feature_testing_public'))) }}
     steps:
       - uses: actions/checkout@v3
-      - name: get branch name
-        id: extract_branch
-        run: |
-          tag='pr${{ github.event.pull_request.number }}'
-          echo ::set-output name=tag::${tag}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: clone
         run: |
           git clone https://kafka-ui-infra:${{ secrets.KAFKA_UI_INFRA_TOKEN }}@gitlab.provectus.com/provectus-internals/kafka-ui-infra.git
       - name: remove env
         run: |
           cd kafka-ui-infra/aws-infrastructure4eks/argocd/scripts
-          echo "Branch:${{ steps.extract_branch.outputs.tag }}"
-          ./delete-env.sh ${{ steps.extract_branch.outputs.tag }} || true
+          ./delete-env.sh pr${{ github.event.pull_request.number }} || true
           git config --global user.email "kafka-ui-infra@provectus.com"
           git config --global user.name "kafka-ui-infra"
           git add ../kafka-ui-from-branch/

From a77869783b1aa27de5d5a71e5614079fc48c95d9 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Wed, 29 Jun 2022 16:10:55 +0400
Subject: [PATCH 048/734] fixing connectors path redirection issue no to
 navigate dashboard (#2187)

---
 .../src/components/Connect/Connect.tsx        | 94 ++++++++++---------
 1 file changed, 50 insertions(+), 44 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Connect/Connect.tsx b/kafka-ui-react-app/src/components/Connect/Connect.tsx
index f1bb7ef4066..c4c94227e6e 100644
--- a/kafka-ui-react-app/src/components/Connect/Connect.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Connect.tsx
@@ -7,57 +7,63 @@ import {
   clusterConnectConnectorsRelativePath,
   clusterConnectorNewRelativePath,
   getNonExactPath,
+  clusterConnectorsPath,
 } from 'lib/paths';
 import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
+import useAppParams from 'lib/hooks/useAppParams';
 
 import ListContainer from './List/ListContainer';
 import NewContainer from './New/NewContainer';
 import DetailsContainer from './Details/DetailsContainer';
 import EditContainer from './Edit/EditContainer';
 
-const Connect: React.FC = () => (
-  <Routes>
-    <Route
-      index
-      element={
-        <BreadcrumbRoute>
-          <ListContainer />
-        </BreadcrumbRoute>
-      }
-    />
-    <Route
-      path={clusterConnectorNewRelativePath}
-      element={
-        <BreadcrumbRoute>
-          <NewContainer />
-        </BreadcrumbRoute>
-      }
-    />
-    <Route
-      path={clusterConnectConnectorEditRelativePath}
-      element={
-        <BreadcrumbRoute>
-          <EditContainer />
-        </BreadcrumbRoute>
-      }
-    />
-    <Route
-      path={getNonExactPath(clusterConnectConnectorRelativePath)}
-      element={
-        <BreadcrumbRoute>
-          <DetailsContainer />
-        </BreadcrumbRoute>
-      }
-    />
-    <Route
-      path={clusterConnectConnectorsRelativePath}
-      element={<Navigate to="/" replace />}
-    />
-    <Route
-      path={RouteParams.connectName}
-      element={<Navigate to="/" replace />}
-    />
-  </Routes>
-);
+const Connect: React.FC = () => {
+  const { clusterName } = useAppParams();
+
+  return (
+    <Routes>
+      <Route
+        index
+        element={
+          <BreadcrumbRoute>
+            <ListContainer />
+          </BreadcrumbRoute>
+        }
+      />
+      <Route
+        path={clusterConnectorNewRelativePath}
+        element={
+          <BreadcrumbRoute>
+            <NewContainer />
+          </BreadcrumbRoute>
+        }
+      />
+      <Route
+        path={clusterConnectConnectorEditRelativePath}
+        element={
+          <BreadcrumbRoute>
+            <EditContainer />
+          </BreadcrumbRoute>
+        }
+      />
+      <Route
+        path={getNonExactPath(clusterConnectConnectorRelativePath)}
+        element={
+          <BreadcrumbRoute>
+            <DetailsContainer />
+          </BreadcrumbRoute>
+        }
+      />
+      <Route
+        path={clusterConnectConnectorsRelativePath}
+        element={<Navigate to={clusterConnectorsPath(clusterName)} replace />}
+      />
+      <Route
+        path={RouteParams.connectName}
+        element={<Navigate to="/" replace />}
+      />
+    </Routes>
+  );
+};
 
 export default Connect;

From 9f2310472dd63eb8c49ab11fc0258f617a8a6b33 Mon Sep 17 00:00:00 2001
From: Smbat Siradeghyan <104761619+ssiradeghyan@users.noreply.github.com>
Date: Thu, 30 Jun 2022 13:22:52 +0400
Subject: [PATCH 049/734] [ BROKER ] Add broker metrics page (#2157)

* add metrics page

* add test for broker

* add test for paths

* remove unused-vars

* add editor view for broker metrics

* add not available message

* try to fix BrokerLogdir tests

* add tests for translateLogdir and translateLogdirs

* add tests for translateLogdir and translateLogdirs

* add tests for metrics page

* fix review comments

* fix unused var

* remove describe duplicate

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../src/components/Brokers/Broker/Broker.tsx  |  57 +++---
 .../Broker/BrokerLogdir/BrokerLogdir.tsx      |  42 ++++
 .../__test__/BrokerLogdir.spec.tsx            |  67 ++++++
 .../Broker/BrokerMetrics/BrokerMetrics.tsx    |  18 ++
 .../__test__/BrokerMetrics.spec.tsx           |  37 ++++
 .../Brokers/Broker/__test__/Broker.spec.tsx   |  94 ++++++---
 .../components/Brokers/__test__/fixtures.ts   |  36 +---
 .../Brokers/utils/__test__/fixtures.ts        | 190 ++++++++++++++++++
 .../utils/__test__/getEditorText.spec.tsx     |  17 ++
 .../utils/__test__/translateLogdirs.spec.tsx  |  35 ++++
 .../components/Brokers/utils/getEditorText.ts |   4 +
 ...translateLogdir.ts => translateLogdirs.ts} |   6 +
 .../src/lib/__test__/paths.spec.ts            |  18 ++
 .../src/lib/hooks/useBrokersMetrics.tsx       |  18 ++
 kafka-ui-react-app/src/lib/paths.ts           |  14 +-
 15 files changed, 569 insertions(+), 84 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/BrokerMetrics.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/__test__/BrokerMetrics.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts
 create mode 100644 kafka-ui-react-app/src/components/Brokers/utils/__test__/getEditorText.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/utils/getEditorText.ts
 rename kafka-ui-react-app/src/components/Brokers/utils/{translateLogdir.ts => translateLogdirs.ts} (77%)
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useBrokersMetrics.tsx

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index bef308d891f..e6ce8678dc1 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -3,14 +3,18 @@ import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import useAppParams from 'lib/hooks/useAppParams';
-import { translateLogdir } from 'components/Brokers/utils/translateLogdir';
-import { SmartTable } from 'components/common/SmartTable/SmartTable';
-import { TableColumn } from 'components/common/SmartTable/TableColumn';
-import { useTableState } from 'lib/hooks/useTableState';
-import { ClusterBrokerParam } from 'lib/paths';
+import {
+  clusterBrokerMetricsPath,
+  clusterBrokerMetricsRelativePath,
+  ClusterBrokerParam,
+  clusterBrokerPath,
+} from 'lib/paths';
 import useClusterStats from 'lib/hooks/useClusterStats';
 import useBrokers from 'lib/hooks/useBrokers';
-import useBrokersLogDirs from 'lib/hooks/useBrokersLogDirs';
+import { NavLink, Route, Routes } from 'react-router-dom';
+import BrokerLogdir from 'components/Brokers/Broker/BrokerLogdir/BrokerLogdir';
+import BrokerMetrics from 'components/Brokers/Broker/BrokerMetrics/BrokerMetrics';
+import Navbar from 'components/common/Navigation/Navbar.styled';
 
 export interface BrokerLogdirState {
   name: string;
@@ -24,13 +28,6 @@ const Broker: React.FC = () => {
 
   const { data: clusterStats } = useClusterStats(clusterName);
   const { data: brokers } = useBrokers(clusterName);
-  const { data: logDirs } = useBrokersLogDirs(clusterName, Number(brokerId));
-
-  const preparedRows = logDirs?.map(translateLogdir) || [];
-  const tableState = useTableState<BrokerLogdirState, string>(preparedRows, {
-    idSelector: ({ name }) => name,
-    totalPages: 0,
-  });
 
   if (!clusterStats) return null;
 
@@ -53,16 +50,30 @@ const Broker: React.FC = () => {
           <Metrics.Indicator label="Host">{brokerItem?.host}</Metrics.Indicator>
         </Metrics.Section>
       </Metrics.Wrapper>
-      <SmartTable
-        tableState={tableState}
-        placeholder="Log dir data not available"
-        isFullwidth
-      >
-        <TableColumn title="Name" field="name" />
-        <TableColumn title="Error" field="error" />
-        <TableColumn title="Topics" field="topics" />
-        <TableColumn title="Partitions" field="partitions" />
-      </SmartTable>
+
+      <Navbar role="navigation">
+        <NavLink
+          to={clusterBrokerPath(clusterName, brokerId)}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+          end
+        >
+          Logdir
+        </NavLink>
+        <NavLink
+          to={clusterBrokerMetricsPath(clusterName, brokerId)}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+        >
+          Metrics
+        </NavLink>
+      </Navbar>
+
+      <Routes>
+        <Route index element={<BrokerLogdir />} />
+        <Route
+          path={clusterBrokerMetricsRelativePath}
+          element={<BrokerMetrics />}
+        />
+      </Routes>
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
new file mode 100644
index 00000000000..14b99363d20
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import useAppParams from 'lib/hooks/useAppParams';
+import { translateLogdirs } from 'components/Brokers/utils/translateLogdirs';
+import { SmartTable } from 'components/common/SmartTable/SmartTable';
+import { TableColumn } from 'components/common/SmartTable/TableColumn';
+import { useTableState } from 'lib/hooks/useTableState';
+import { ClusterBrokerParam } from 'lib/paths';
+import useBrokersLogDirs from 'lib/hooks/useBrokersLogDirs';
+
+export interface BrokerLogdirState {
+  name: string;
+  error: string;
+  topics: number;
+  partitions: number;
+}
+
+const BrokerLogdir: React.FC = () => {
+  const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
+
+  const { data: logDirs } = useBrokersLogDirs(clusterName, Number(brokerId));
+
+  const preparedRows = translateLogdirs(logDirs);
+  const tableState = useTableState<BrokerLogdirState, string>(preparedRows, {
+    idSelector: ({ name }) => name,
+    totalPages: 0,
+  });
+
+  return (
+    <SmartTable
+      tableState={tableState}
+      placeholder="Log dir data not available"
+      isFullwidth
+    >
+      <TableColumn title="Name" field="name" />
+      <TableColumn title="Error" field="error" />
+      <TableColumn title="Topics" field="topics" />
+      <TableColumn title="Partitions" field="partitions" />
+    </SmartTable>
+  );
+};
+
+export default BrokerLogdir;
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
new file mode 100644
index 00000000000..ad4fbec25cc
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import { screen, waitFor } from '@testing-library/dom';
+import { clusterBrokerPath } from 'lib/paths';
+import fetchMock from 'fetch-mock';
+import { act } from '@testing-library/react';
+import Broker from 'components/Brokers/Broker/Broker';
+import {
+  clusterStatsPayload,
+  brokerLogDirsPayload,
+  brokersPayload,
+} from 'components/Brokers/__test__/fixtures';
+
+const clusterName = 'local';
+const brokerId = 1;
+const fetchStatsUrl = `/api/clusters/${clusterName}/stats`;
+const fetchBrokersUrl = `/api/clusters/${clusterName}/brokers`;
+const fetchLogDirsUrl = `/api/clusters/${clusterName}/brokers/logdirs`;
+
+describe('BrokerLogdir Component', () => {
+  afterEach(() => {
+    fetchMock.reset();
+  });
+
+  const renderComponent = async () => {
+    const fetchStatsMock = fetchMock.get(fetchStatsUrl, clusterStatsPayload);
+    const fetchBrokersMock = fetchMock.get(fetchBrokersUrl, brokersPayload);
+    await act(() => {
+      render(
+        <WithRoute path={clusterBrokerPath()}>
+          <Broker />
+        </WithRoute>,
+        {
+          initialEntries: [clusterBrokerPath(clusterName, brokerId)],
+        }
+      );
+    });
+    await waitFor(() => expect(fetchStatsMock.called()).toBeTruthy());
+    expect(fetchBrokersMock.called()).toBeTruthy();
+  };
+
+  it('shows warning when server returns empty logDirs response', async () => {
+    const fetchLogDirsMock = fetchMock.getOnce(fetchLogDirsUrl, [], {
+      query: { broker: brokerId },
+    });
+    await renderComponent();
+    await waitFor(() => expect(fetchLogDirsMock.called()).toBeTruthy());
+    expect(screen.getByText('Log dir data not available')).toBeInTheDocument();
+  });
+
+  it('shows broker', async () => {
+    const fetchLogDirsMock = fetchMock.getOnce(
+      fetchLogDirsUrl,
+      brokerLogDirsPayload,
+      {
+        query: { broker: brokerId },
+      }
+    );
+
+    await renderComponent();
+    await waitFor(() => expect(fetchLogDirsMock.called()).toBeTruthy());
+    const topicCount = screen.getByText(3);
+    const partitionsCount = screen.getByText(4);
+    expect(topicCount).toBeInTheDocument();
+    expect(partitionsCount).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/BrokerMetrics.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/BrokerMetrics.tsx
new file mode 100644
index 00000000000..2798f1c9ac3
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/BrokerMetrics.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import useAppParams from 'lib/hooks/useAppParams';
+import { ClusterBrokerParam } from 'lib/paths';
+import useBrokersMetrics from 'lib/hooks/useBrokersMetrics';
+import { SchemaType } from 'generated-sources';
+import EditorViewer from 'components/common/EditorViewer/EditorViewer';
+import { getEditorText } from 'components/Brokers/utils/getEditorText';
+
+const BrokerMetrics: React.FC = () => {
+  const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
+  const { data: metrics } = useBrokersMetrics(clusterName, Number(brokerId));
+
+  return (
+    <EditorViewer schemaType={SchemaType.JSON} data={getEditorText(metrics)} />
+  );
+};
+
+export default BrokerMetrics;
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/__test__/BrokerMetrics.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/__test__/BrokerMetrics.spec.tsx
new file mode 100644
index 00000000000..7bed4e1aa86
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/__test__/BrokerMetrics.spec.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import { screen, waitFor } from '@testing-library/dom';
+import { clusterBrokerMetricsPath } from 'lib/paths';
+import fetchMock from 'fetch-mock';
+import { act } from '@testing-library/react';
+import BrokerMetrics from 'components/Brokers/Broker/BrokerMetrics/BrokerMetrics';
+
+const clusterName = 'local';
+const brokerId = 1;
+const fetchMetricsUrl = `/api/clusters/${clusterName}/brokers/${brokerId}/metrics`;
+
+describe('BrokerMetrics Component', () => {
+  afterEach(() => {
+    fetchMock.reset();
+  });
+
+  const renderComponent = async () => {
+    const fetchMetricsMock = fetchMock.getOnce(fetchMetricsUrl, {});
+    await act(() => {
+      render(
+        <WithRoute path={clusterBrokerMetricsPath()}>
+          <BrokerMetrics />
+        </WithRoute>,
+        {
+          initialEntries: [clusterBrokerMetricsPath(clusterName, brokerId)],
+        }
+      );
+    });
+    await waitFor(() => expect(fetchMetricsMock.called()).toBeTruthy());
+  };
+
+  it("shows warning when server doesn't return metrics response", async () => {
+    await renderComponent();
+    expect(screen.getAllByRole('textbox').length).toEqual(1);
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
index 728a4b251d8..07e6db34bc5 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
@@ -1,37 +1,57 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen, waitFor } from '@testing-library/dom';
-import { clusterBrokerPath } from 'lib/paths';
+import {
+  clusterBrokerMetricsPath,
+  clusterBrokerPath,
+  getNonExactPath,
+} from 'lib/paths';
 import fetchMock from 'fetch-mock';
 import { act } from '@testing-library/react';
 import Broker from 'components/Brokers/Broker/Broker';
 import {
   clusterStatsPayload,
-  brokerLogDirsPayload,
   brokersPayload,
 } from 'components/Brokers/__test__/fixtures';
 
 const clusterName = 'local';
 const brokerId = 1;
+const activeClassName = 'is-active';
 const fetchStatsUrl = `/api/clusters/${clusterName}/stats`;
 const fetchBrokersUrl = `/api/clusters/${clusterName}/brokers`;
-const fetchLogDirsUrl = `/api/clusters/${clusterName}/brokers/logdirs`;
+const brokerLogdir = {
+  pageText: 'brokerLogdir',
+  navigationName: 'Logdir',
+};
+const brokerMetrics = {
+  pageText: 'brokerMetrics',
+  navigationName: 'Metrics',
+};
+
+jest.mock('components/Brokers/Broker/BrokerLogdir/BrokerLogdir', () => () => (
+  <div>{brokerLogdir.pageText}</div>
+));
+jest.mock('components/Brokers/Broker/BrokerMetrics/BrokerMetrics', () => () => (
+  <div>{brokerMetrics.pageText}</div>
+));
 
 describe('Broker Component', () => {
   afterEach(() => {
     fetchMock.reset();
   });
 
-  const renderComponent = async () => {
+  const renderComponent = async (
+    path = clusterBrokerPath(clusterName, brokerId)
+  ) => {
     const fetchStatsMock = fetchMock.get(fetchStatsUrl, clusterStatsPayload);
     const fetchBrokersMock = fetchMock.get(fetchBrokersUrl, brokersPayload);
     await act(() => {
       render(
-        <WithRoute path={clusterBrokerPath()}>
+        <WithRoute path={getNonExactPath(clusterBrokerPath())}>
           <Broker />
         </WithRoute>,
         {
-          initialEntries: [clusterBrokerPath(clusterName, brokerId)],
+          initialEntries: [path],
         }
       );
     });
@@ -39,29 +59,51 @@ describe('Broker Component', () => {
     expect(fetchBrokersMock.called()).toBeTruthy();
   };
 
-  it('shows warning when server returns empty logDirs response', async () => {
-    const fetchLogDirsMock = fetchMock.getOnce(fetchLogDirsUrl, [], {
-      query: { broker: brokerId },
-    });
-    await renderComponent();
-    await waitFor(() => expect(fetchLogDirsMock.called()).toBeTruthy());
-    expect(screen.getByText('Log dir data not available')).toBeInTheDocument();
-  });
-
   it('shows broker found', async () => {
-    const fetchLogDirsMock = fetchMock.getOnce(
-      fetchLogDirsUrl,
-      brokerLogDirsPayload,
-      {
-        query: { broker: brokerId },
-      }
+    await renderComponent();
+    const brokerInfo = brokersPayload.find((broker) => broker.id === brokerId);
+    const brokerDiskUsage = clusterStatsPayload.diskUsage.find(
+      (disk) => disk.brokerId === brokerId
     );
 
+    expect(
+      screen.getByText(brokerDiskUsage?.segmentCount || '')
+    ).toBeInTheDocument();
+    expect(screen.getByText('12MB')).toBeInTheDocument();
+
+    expect(screen.getByText('Segment Count')).toBeInTheDocument();
+    expect(
+      screen.getByText(brokerDiskUsage?.segmentCount || '')
+    ).toBeInTheDocument();
+
+    expect(screen.getByText('Port')).toBeInTheDocument();
+    expect(screen.getByText(brokerInfo?.port || '')).toBeInTheDocument();
+
+    expect(screen.getByText('Host')).toBeInTheDocument();
+    expect(screen.getByText(brokerInfo?.host || '')).toBeInTheDocument();
+  });
+
+  it('renders Broker Logdir', async () => {
     await renderComponent();
-    await waitFor(() => expect(fetchLogDirsMock.called()).toBeTruthy());
-    const topicCount = screen.getByText(3);
-    const partitionsCount = screen.getByText(4);
-    expect(topicCount).toBeInTheDocument();
-    expect(partitionsCount).toBeInTheDocument();
+
+    const logdirLink = screen.getByRole('link', {
+      name: brokerLogdir.navigationName,
+    });
+    expect(logdirLink).toBeInTheDocument();
+    expect(logdirLink).toHaveClass(activeClassName);
+
+    expect(screen.getByText(brokerLogdir.pageText)).toBeInTheDocument();
+  });
+
+  it('renders Broker Metrics', async () => {
+    await renderComponent(clusterBrokerMetricsPath(clusterName, brokerId));
+
+    const metricsLink = screen.getByRole('link', {
+      name: brokerMetrics.navigationName,
+    });
+    expect(metricsLink).toBeInTheDocument();
+    expect(metricsLink).toHaveClass(activeClassName);
+
+    expect(screen.getByText(brokerMetrics.pageText)).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts
index 372257a263a..54601db00e4 100644
--- a/kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts
@@ -1,8 +1,8 @@
 import { BrokersLogdirs } from 'generated-sources';
 
 export const brokersPayload = [
-  { id: 1, host: 'b-1.test.kafka.amazonaws.com' },
-  { id: 2, host: 'b-2.test.kafka.amazonaws.com' },
+  { id: 1, host: 'b-1.test.kafka.amazonaws.com', port: 9092 },
+  { id: 2, host: 'b-2.test.kafka.amazonaws.com', port: 9092 },
 ];
 
 export const clusterStatsPayload = {
@@ -20,38 +20,6 @@ export const clusterStatsPayload = {
   version: '2.2.1',
 };
 
-export const initialBrokersReducerState = {
-  items: brokersPayload,
-  brokerCount: 2,
-  activeControllers: 1,
-  onlinePartitionCount: 138,
-  offlinePartitionCount: 0,
-  inSyncReplicasCount: 239,
-  outOfSyncReplicasCount: 0,
-  underReplicatedPartitionCount: 0,
-  diskUsage: [
-    { brokerId: 0, segmentSize: 1111, segmentCount: 333 },
-    { brokerId: 1, segmentSize: 2222, segmentCount: 444 },
-  ],
-  version: '2.2.1',
-};
-
-export const updatedBrokersReducerState = {
-  items: brokersPayload,
-  brokerCount: 2,
-  activeControllers: 1,
-  onlinePartitionCount: 138,
-  offlinePartitionCount: 0,
-  inSyncReplicasCount: 239,
-  outOfSyncReplicasCount: 0,
-  underReplicatedPartitionCount: 0,
-  diskUsage: [
-    { brokerId: 0, segmentSize: 334567, segmentCount: 245 },
-    { brokerId: 1, segmentSize: 12345678, segmentCount: 121 },
-  ],
-  version: '2.2.1',
-};
-
 const partition = {
   broker: 2,
   offsetLag: 0,
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts
new file mode 100644
index 00000000000..076fb06a4e2
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts
@@ -0,0 +1,190 @@
+import { BrokerLogdirState } from 'components/Brokers/Broker/Broker';
+import { BrokerMetrics } from 'generated-sources';
+
+export const transformedBrokerLogDirsPayload: BrokerLogdirState[] = [
+  {
+    error: 'NONE',
+    name: '/opt/kafka/data-0/logs',
+    topics: 3,
+    partitions: 4,
+  },
+];
+export const defaultTransformedBrokerLogDirsPayload: BrokerLogdirState = {
+  error: '-',
+  name: '-',
+  topics: 0,
+  partitions: 0,
+};
+
+export const brokerMetricsPayload: BrokerMetrics = {
+  segmentSize: 23,
+  segmentCount: 23,
+  metrics: [
+    {
+      name: 'TotalFetchRequestsPerSec',
+      canonicalName:
+        'kafka.server:name=TotalFetchRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics',
+      params: {
+        topic: '_connect_status',
+        name: 'TotalFetchRequestsPerSec',
+        type: 'BrokerTopicMetrics',
+      },
+      value: {
+        OneMinuteRate: 19.408369293127542,
+        FifteenMinuteRate: 19.44631556589501,
+        Count: 191615,
+        FiveMinuteRate: 19.464393718807774,
+        MeanRate: 19.4233855043407,
+      },
+    },
+    {
+      name: 'ZooKeeperRequestLatencyMs',
+      canonicalName:
+        'kafka.server:name=ZooKeeperRequestLatencyMs,type=ZooKeeperClientMetrics',
+      params: {
+        name: 'ZooKeeperRequestLatencyMs',
+        type: 'ZooKeeperClientMetrics',
+      },
+      value: {
+        Mean: 4.907351022183558,
+        StdDev: 10.589608223906348,
+        '75thPercentile': 2,
+        '98thPercentile': 10,
+        Min: 0,
+        '95thPercentile': 5,
+        '99thPercentile': 15,
+        Max: 151,
+        '999thPercentile': 92.79700000000003,
+        Count: 2301,
+        '50thPercentile': 1,
+      },
+    },
+    {
+      name: 'RequestHandlerAvgIdlePercent',
+      canonicalName:
+        'kafka.server:name=RequestHandlerAvgIdlePercent,type=KafkaRequestHandlerPool',
+      params: {
+        name: 'RequestHandlerAvgIdlePercent',
+        type: 'KafkaRequestHandlerPool',
+      },
+      value: {
+        OneMinuteRate: 0.9999008788765713,
+        FifteenMinuteRate: 0.9983845959639047,
+        Count: 9937344680371,
+        FiveMinuteRate: 0.9986337207880311,
+        MeanRate: 0.9971616923696525,
+      },
+    },
+    {
+      name: 'BytesInPerSec',
+      canonicalName:
+        'kafka.server:name=BytesInPerSec,topic=_connect_status,type=BrokerTopicMetrics',
+      params: {
+        topic: '_connect_status',
+        name: 'BytesInPerSec',
+        type: 'BrokerTopicMetrics',
+      },
+      value: {
+        OneMinuteRate: 0,
+        FifteenMinuteRate: 0,
+        Count: 0,
+        FiveMinuteRate: 0,
+        MeanRate: 0,
+      },
+    },
+    {
+      name: 'FetchMessageConversionsPerSec',
+      canonicalName:
+        'kafka.server:name=FetchMessageConversionsPerSec,topic=__consumer_offsets,type=BrokerTopicMetrics',
+      params: {
+        topic: '__consumer_offsets',
+        name: 'FetchMessageConversionsPerSec',
+        type: 'BrokerTopicMetrics',
+      },
+      value: {
+        OneMinuteRate: 0,
+        FifteenMinuteRate: 0,
+        Count: 0,
+        FiveMinuteRate: 0,
+        MeanRate: 0,
+      },
+    },
+    {
+      name: 'TotalProduceRequestsPerSec',
+      canonicalName:
+        'kafka.server:name=TotalProduceRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics',
+      params: {
+        topic: '_connect_status',
+        name: 'TotalProduceRequestsPerSec',
+        type: 'BrokerTopicMetrics',
+      },
+      value: {
+        OneMinuteRate: 0,
+        FifteenMinuteRate: 0,
+        Count: 0,
+        FiveMinuteRate: 0,
+        MeanRate: 0,
+      },
+    },
+    {
+      name: 'MaxLag',
+      canonicalName:
+        'kafka.server:clientId=Replica,name=MaxLag,type=ReplicaFetcherManager',
+      params: {
+        clientId: 'Replica',
+        name: 'MaxLag',
+        type: 'ReplicaFetcherManager',
+      },
+      value: {
+        Value: 0,
+      },
+    },
+    {
+      name: 'UnderMinIsrPartitionCount',
+      canonicalName:
+        'kafka.server:name=UnderMinIsrPartitionCount,type=ReplicaManager',
+      params: {
+        name: 'UnderMinIsrPartitionCount',
+        type: 'ReplicaManager',
+      },
+      value: {
+        Value: 0,
+      },
+    },
+    {
+      name: 'ZooKeeperDisconnectsPerSec',
+      canonicalName:
+        'kafka.server:name=ZooKeeperDisconnectsPerSec,type=SessionExpireListener',
+      params: {
+        name: 'ZooKeeperDisconnectsPerSec',
+        type: 'SessionExpireListener',
+      },
+      value: {
+        OneMinuteRate: 0,
+        FifteenMinuteRate: 0,
+        Count: 0,
+        FiveMinuteRate: 0,
+        MeanRate: 0,
+      },
+    },
+    {
+      name: 'BytesInPerSec',
+      canonicalName:
+        'kafka.server:name=BytesInPerSec,topic=__confluent.support.metrics,type=BrokerTopicMetrics',
+      params: {
+        topic: '__confluent.support.metrics',
+        name: 'BytesInPerSec',
+        type: 'BrokerTopicMetrics',
+      },
+      value: {
+        OneMinuteRate: 3.093893673470914e-70,
+        FifteenMinuteRate: 0.004057932469784932,
+        Count: 1263,
+        FiveMinuteRate: 1.047243693828501e-12,
+        MeanRate: 0.12704831069266603,
+      },
+    },
+  ],
+};
+export const transformedBrokerMetricsPayload =
+  '{"segmentSize":23,"segmentCount":23,"metrics":[{"name":"TotalFetchRequestsPerSec","canonicalName":"kafka.server:name=TotalFetchRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics","params":{"topic":"_connect_status","name":"TotalFetchRequestsPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":19.408369293127542,"FifteenMinuteRate":19.44631556589501,"Count":191615,"FiveMinuteRate":19.464393718807774,"MeanRate":19.4233855043407}},{"name":"ZooKeeperRequestLatencyMs","canonicalName":"kafka.server:name=ZooKeeperRequestLatencyMs,type=ZooKeeperClientMetrics","params":{"name":"ZooKeeperRequestLatencyMs","type":"ZooKeeperClientMetrics"},"value":{"Mean":4.907351022183558,"StdDev":10.589608223906348,"75thPercentile":2,"98thPercentile":10,"Min":0,"95thPercentile":5,"99thPercentile":15,"Max":151,"999thPercentile":92.79700000000003,"Count":2301,"50thPercentile":1}},{"name":"RequestHandlerAvgIdlePercent","canonicalName":"kafka.server:name=RequestHandlerAvgIdlePercent,type=KafkaRequestHandlerPool","params":{"name":"RequestHandlerAvgIdlePercent","type":"KafkaRequestHandlerPool"},"value":{"OneMinuteRate":0.9999008788765713,"FifteenMinuteRate":0.9983845959639047,"Count":9937344680371,"FiveMinuteRate":0.9986337207880311,"MeanRate":0.9971616923696525}},{"name":"BytesInPerSec","canonicalName":"kafka.server:name=BytesInPerSec,topic=_connect_status,type=BrokerTopicMetrics","params":{"topic":"_connect_status","name":"BytesInPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":0,"FifteenMinuteRate":0,"Count":0,"FiveMinuteRate":0,"MeanRate":0}},{"name":"FetchMessageConversionsPerSec","canonicalName":"kafka.server:name=FetchMessageConversionsPerSec,topic=__consumer_offsets,type=BrokerTopicMetrics","params":{"topic":"__consumer_offsets","name":"FetchMessageConversionsPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":0,"FifteenMinuteRate":0,"Count":0,"FiveMinuteRate":0,"MeanRate":0}},{"name":"TotalProduceRequestsPerSec","canonicalName":"kafka.server:name=TotalProduceRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics","params":{"topic":"_connect_status","name":"TotalProduceRequestsPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":0,"FifteenMinuteRate":0,"Count":0,"FiveMinuteRate":0,"MeanRate":0}},{"name":"MaxLag","canonicalName":"kafka.server:clientId=Replica,name=MaxLag,type=ReplicaFetcherManager","params":{"clientId":"Replica","name":"MaxLag","type":"ReplicaFetcherManager"},"value":{"Value":0}},{"name":"UnderMinIsrPartitionCount","canonicalName":"kafka.server:name=UnderMinIsrPartitionCount,type=ReplicaManager","params":{"name":"UnderMinIsrPartitionCount","type":"ReplicaManager"},"value":{"Value":0}},{"name":"ZooKeeperDisconnectsPerSec","canonicalName":"kafka.server:name=ZooKeeperDisconnectsPerSec,type=SessionExpireListener","params":{"name":"ZooKeeperDisconnectsPerSec","type":"SessionExpireListener"},"value":{"OneMinuteRate":0,"FifteenMinuteRate":0,"Count":0,"FiveMinuteRate":0,"MeanRate":0}},{"name":"BytesInPerSec","canonicalName":"kafka.server:name=BytesInPerSec,topic=__confluent.support.metrics,type=BrokerTopicMetrics","params":{"topic":"__confluent.support.metrics","name":"BytesInPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":3.093893673470914e-70,"FifteenMinuteRate":0.004057932469784932,"Count":1263,"FiveMinuteRate":1.047243693828501e-12,"MeanRate":0.12704831069266603}}]}';
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/__test__/getEditorText.spec.tsx b/kafka-ui-react-app/src/components/Brokers/utils/__test__/getEditorText.spec.tsx
new file mode 100644
index 00000000000..0ff11f8e20d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/utils/__test__/getEditorText.spec.tsx
@@ -0,0 +1,17 @@
+import { getEditorText } from 'components/Brokers/utils/getEditorText';
+
+import {
+  brokerMetricsPayload,
+  transformedBrokerMetricsPayload,
+} from './fixtures';
+
+describe('Get editor text', () => {
+  it('returns error message when broker metrics is not defined', () => {
+    expect(getEditorText(undefined)).toEqual('Metrics data not available');
+  });
+  it('returns transformed metrics text when broker logdirs metrics', () => {
+    expect(getEditorText(brokerMetricsPayload)).toEqual(
+      transformedBrokerMetricsPayload
+    );
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx b/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx
new file mode 100644
index 00000000000..e41717fe9da
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx
@@ -0,0 +1,35 @@
+import {
+  translateLogdir,
+  translateLogdirs,
+} from 'components/Brokers/utils/translateLogdirs';
+import { brokerLogDirsPayload } from 'components/Brokers/__test__/fixtures';
+
+import {
+  defaultTransformedBrokerLogDirsPayload,
+  transformedBrokerLogDirsPayload,
+} from './fixtures';
+
+describe('translateLogdir and translateLogdirs', () => {
+  describe('translateLogdirs', () => {
+    it('returns empty array when broker logdirs is not defined', () => {
+      expect(translateLogdirs(undefined)).toEqual([]);
+    });
+    it('returns transformed LogDirs array when broker logdirs defined', () => {
+      expect(translateLogdirs(brokerLogDirsPayload)).toEqual(
+        transformedBrokerLogDirsPayload
+      );
+    });
+  });
+  describe('translateLogdir', () => {
+    it('returns default data when broker logdir is empty', () => {
+      expect(translateLogdir({})).toEqual(
+        defaultTransformedBrokerLogDirsPayload
+      );
+    });
+    it('returns transformed LogDir when broker logdir defined', () => {
+      expect(translateLogdir(brokerLogDirsPayload[0])).toEqual(
+        transformedBrokerLogDirsPayload[0]
+      );
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/getEditorText.ts b/kafka-ui-react-app/src/components/Brokers/utils/getEditorText.ts
new file mode 100644
index 00000000000..85c5d6fdb4f
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/utils/getEditorText.ts
@@ -0,0 +1,4 @@
+import { BrokerMetrics } from 'generated-sources';
+
+export const getEditorText = (metrics: BrokerMetrics | undefined): string =>
+  metrics ? JSON.stringify(metrics) : 'Metrics data not available';
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/translateLogdir.ts b/kafka-ui-react-app/src/components/Brokers/utils/translateLogdirs.ts
similarity index 77%
rename from kafka-ui-react-app/src/components/Brokers/utils/translateLogdir.ts
rename to kafka-ui-react-app/src/components/Brokers/utils/translateLogdirs.ts
index afdfbfa6633..6dd619cddba 100644
--- a/kafka-ui-react-app/src/components/Brokers/utils/translateLogdir.ts
+++ b/kafka-ui-react-app/src/components/Brokers/utils/translateLogdirs.ts
@@ -15,3 +15,9 @@ export const translateLogdir = (data: BrokersLogdirs): BrokerLogdirState => {
     partitions: partitionsCount,
   };
 };
+
+export const translateLogdirs = (
+  data: BrokersLogdirs[] | undefined
+): BrokerLogdirState[] => {
+  return data?.map(translateLogdir) || [];
+};
diff --git a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
index 1bebb66f562..c94973a314d 100644
--- a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
+++ b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
@@ -6,6 +6,7 @@ const clusterName = 'test-cluster-name';
 const groupId = 'test-group-id';
 const schemaId = 'test-schema-id';
 const topicId = 'test-topic-id';
+const brokerId = 'test-Broker-id';
 const connectName = 'test-connect-name';
 const connectorName = 'test-connector-name';
 
@@ -30,6 +31,23 @@ describe('Paths', () => {
     expect(paths.clusterBrokersPath()).toEqual(
       paths.clusterBrokersPath(RouteParams.clusterName)
     );
+
+    expect(paths.clusterBrokerPath(clusterName, brokerId)).toEqual(
+      `${paths.clusterPath(clusterName)}/brokers/${brokerId}`
+    );
+    expect(paths.clusterBrokerPath()).toEqual(
+      paths.clusterBrokerPath(RouteParams.clusterName, RouteParams.brokerId)
+    );
+
+    expect(paths.clusterBrokerMetricsPath(clusterName, brokerId)).toEqual(
+      `${paths.clusterPath(clusterName)}/brokers/${brokerId}/metrics`
+    );
+    expect(paths.clusterBrokerMetricsPath()).toEqual(
+      paths.clusterBrokerMetricsPath(
+        RouteParams.clusterName,
+        RouteParams.brokerId
+      )
+    );
   });
   it('clusterConsumerGroupsPath', () => {
     expect(paths.clusterConsumerGroupsPath(clusterName)).toEqual(
diff --git a/kafka-ui-react-app/src/lib/hooks/useBrokersMetrics.tsx b/kafka-ui-react-app/src/lib/hooks/useBrokersMetrics.tsx
new file mode 100644
index 00000000000..29fb3c91928
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useBrokersMetrics.tsx
@@ -0,0 +1,18 @@
+import { brokersApiClient } from 'lib/api';
+import { useQuery } from 'react-query';
+import { ClusterName } from 'redux/interfaces';
+
+export default function useBrokersMetrics(
+  clusterName: ClusterName,
+  brokerId: number
+) {
+  return useQuery(
+    ['metrics', clusterName, brokerId],
+    () =>
+      brokersApiClient.getBrokersMetrics({
+        clusterName,
+        id: brokerId,
+      }),
+    { suspense: true, refetchInterval: 5000 }
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 4f80d07c14c..86b7e807a18 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -33,6 +33,7 @@ export type ClusterNameRoute = { clusterName: ClusterName };
 
 // Brokers
 export const clusterBrokerRelativePath = 'brokers';
+export const clusterBrokerMetricsRelativePath = 'metrics';
 export const clusterBrokersPath = (
   clusterName: ClusterName = RouteParams.clusterName
 ) => `${clusterPath(clusterName)}/${clusterBrokerRelativePath}`;
@@ -41,8 +42,19 @@ export const clusterBrokerPath = (
   clusterName: ClusterName = RouteParams.clusterName,
   brokerId: BrokerId | string = RouteParams.brokerId
 ) => `${clusterBrokersPath(clusterName)}/${brokerId}`;
+export const clusterBrokerMetricsPath = (
+  clusterName: ClusterName = RouteParams.clusterName,
+  brokerId: BrokerId | string = RouteParams.brokerId
+) =>
+  `${clusterBrokerPath(
+    clusterName,
+    brokerId
+  )}/${clusterBrokerMetricsRelativePath}`;
 
-export type ClusterBrokerParam = { clusterName: ClusterName; brokerId: string };
+export type ClusterBrokerParam = {
+  clusterName: ClusterName;
+  brokerId: string;
+};
 
 // Consumer Groups
 export const clusterConsumerGroupsRelativePath = 'consumer-groups';

From 5296d42e888694b0ea953475f4883f4d7c02d3f7 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Fri, 1 Jul 2022 12:02:18 +0300
Subject: [PATCH 050/734] Use pnpm (#2081)

* Migrate FE app to pnpm

* Fix node install cache

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/frontend.yaml      |    24 +-
 kafka-ui-api/pom.xml                 |    15 +-
 kafka-ui-contract/pom.xml            |    15 +-
 kafka-ui-react-app/.gitignore        |     3 +
 kafka-ui-react-app/README.md         |    13 +-
 kafka-ui-react-app/package-lock.json | 25156 -------------------------
 kafka-ui-react-app/package.json      |    12 +-
 kafka-ui-react-app/pnpm-lock.yaml    |  7460 ++++++++
 pom.xml                              |     1 +
 9 files changed, 7505 insertions(+), 25194 deletions(-)
 delete mode 100644 kafka-ui-react-app/package-lock.json
 create mode 100644 kafka-ui-react-app/pnpm-lock.yaml

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index ee13432afa9..6686441133f 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -20,33 +20,31 @@ jobs:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: Use Node.js
-        uses: actions/setup-node@v3.1.1
+      - uses: pnpm/action-setup@v2.0.1
         with:
-          node-version: "14"
-      - name: Cache node dependency
-        uses: actions/cache@v3
+          version: 7.4.0
+      - name: Install node
+        uses: actions/setup-node@v3.1.1
         with:
-          path: kafka-ui-react-app/node_modules
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
+          node-version: "16.15.0"
+          cache: "pnpm"
+          cache-dependency-path: "./kafka-ui-react-app/pnpm-lock.yaml"
       - name: Install Node dependencies
         run: |
           cd kafka-ui-react-app/
-          npm install
+          pnpm install --frozen-lockfile
       - name: Generate sources
         run: |
           cd kafka-ui-react-app/
-          npm run gen:sources
+          pnpm gen:sources
       - name: Linter
         run: |
           cd kafka-ui-react-app/
-          npm run lint:CI
+          pnpm lint:CI
       - name: Tests
         run: |
           cd kafka-ui-react-app/
-          npm run test:CI
+          pnpm test:CI
       - name: SonarCloud Scan
         uses: workshur/sonarcloud-github-action@improved_basedir
         with:
diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index a034f0d8500..a6ff458c6c5 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -407,30 +407,31 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>install node and npm</id>
+                                <id>install node and pnpm</id>
                                 <goals>
-                                    <goal>install-node-and-npm</goal>
+                                    <goal>install-node-and-pnpm</goal>
                                 </goals>
                                 <configuration>
                                     <nodeVersion>${node.version}</nodeVersion>
+                                    <pnpmVersion>${pnpm.version}</pnpmVersion>
                                 </configuration>
                             </execution>
                             <execution>
-                                <id>npm install</id>
+                                <id>pnpm install</id>
                                 <goals>
-                                    <goal>npm</goal>
+                                    <goal>pnpm</goal>
                                 </goals>
                                 <configuration>
                                     <arguments>install</arguments>
                                 </configuration>
                             </execution>
                             <execution>
-                                <id>npm run build</id>
+                                <id>pnpm build</id>
                                 <goals>
-                                    <goal>npm</goal>
+                                    <goal>pnpm</goal>
                                 </goals>
                                 <configuration>
-                                    <arguments>run build</arguments>
+                                    <arguments>build</arguments>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index 7750803affb..d9139a14f45 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -143,30 +143,31 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>install node and npm</id>
+                                <id>install node and pnpm</id>
                                 <goals>
-                                    <goal>install-node-and-npm</goal>
+                                    <goal>install-node-and-pnpm</goal>
                                 </goals>
                                 <configuration>
                                     <nodeVersion>${node.version}</nodeVersion>
+                                    <pnpmVersion>${pnpm.version}</pnpmVersion>
                                 </configuration>
                             </execution>
                             <execution>
-                                <id>npm install</id>
+                                <id>pnpm install</id>
                                 <goals>
-                                    <goal>npm</goal>
+                                    <goal>pnpm</goal>
                                 </goals>
                                 <configuration>
                                     <arguments>install</arguments>
                                 </configuration>
                             </execution>
                             <execution>
-                                <id>npm run gen:sources</id>
+                                <id>pnpm gen:sources</id>
                                 <goals>
-                                    <goal>npm</goal>
+                                    <goal>pnpm</goal>
                                 </goals>
                                 <configuration>
-                                    <arguments>run gen:sources</arguments>
+                                    <arguments>gen:sources</arguments>
                                 </configuration>
                             </execution>
                         </executions>
diff --git a/kafka-ui-react-app/.gitignore b/kafka-ui-react-app/.gitignore
index c9cfc78ef77..e712ee71d08 100644
--- a/kafka-ui-react-app/.gitignore
+++ b/kafka-ui-react-app/.gitignore
@@ -6,6 +6,8 @@ node_modules
 .pnp.js
 node
 
+package-lock.json
+
 # testing
 coverage
 
@@ -19,6 +21,7 @@ build
 .env.test.local
 .env.production.local
 
+pnpm-debug.log*
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
diff --git a/kafka-ui-react-app/README.md b/kafka-ui-react-app/README.md
index 8ca57b92d91..8e5ea6ebf3b 100644
--- a/kafka-ui-react-app/README.md
+++ b/kafka-ui-react-app/README.md
@@ -21,19 +21,19 @@ Go to react app folder
 cd ./kafka-ui-react-app
 ```
 
-Install Husky
+Install [pnpm](https://pnpm.io/installation)
 ```
-npm install -g husky
+npm install -g pnpm
 ```
 
 Install dependencies
 ```
-npm install
+pnpm install
 ```
 
 Generate API clients from OpenAPI document
 ```sh
-npm run gen:sources
+pnpm gen:sources
 ```
 
 ## Start application
@@ -46,7 +46,7 @@ VITE_DEV_PROXY= https://api.server # your API server
 
 Run the application
 ```sh
-npm start
+pnpm start
 ```
 
 ### Docker way
@@ -62,9 +62,8 @@ Make sure that none of the `.env*` files contain `DEV_PROXY` variable
 
 Run the application
 ```sh
-npm start
+pnpm start
 ```
 ## Links
 
-* [Bulma](https://bulma.io/documentation/) - free, open source CSS framework based on Flexbox
 * [Create React App](https://github.com/facebook/create-react-app)
diff --git a/kafka-ui-react-app/package-lock.json b/kafka-ui-react-app/package-lock.json
deleted file mode 100644
index 37fe53727d0..00000000000
--- a/kafka-ui-react-app/package-lock.json
+++ /dev/null
@@ -1,25156 +0,0 @@
-{
-  "name": "kafka-ui",
-  "version": "0.4.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "kafka-ui",
-      "version": "0.4.0",
-      "dependencies": {
-        "@babel/core": "^7.16.0",
-        "@fortawesome/fontawesome-free": "^6.1.1",
-        "@hookform/error-message": "^2.0.0",
-        "@hookform/resolvers": "^2.7.1",
-        "@reduxjs/toolkit": "^1.8.2",
-        "@rooks/use-outside-click-ref": "^4.10.1",
-        "@testing-library/react": "^13.2.0",
-        "@types/yup": "^0.29.13",
-        "@vitejs/plugin-react": "^1.3.2",
-        "ace-builds": "^1.4.12",
-        "ajv": "^8.6.3",
-        "babel-jest": "^28.1.1",
-        "bulma": "^0.9.3",
-        "classnames": "^2.2.6",
-        "dayjs": "^1.11.2",
-        "fetch-mock": "^9.11.0",
-        "jest": "^28.1.1",
-        "jest-watch-typeahead": "^1.1.0",
-        "json-schema-faker": "^0.5.0-rcv.39",
-        "lodash": "^4.17.21",
-        "node-fetch": "^2.6.1",
-        "pretty-ms": "^7.0.1",
-        "react": "^18.1.0",
-        "react-ace": "^9.4.3",
-        "react-datepicker": "^4.2.0",
-        "react-dom": "^18.1.0",
-        "react-hook-form": "7.6.9",
-        "react-multi-select-component": "^4.0.6",
-        "react-query": "^3.39.1",
-        "react-redux": "^7.2.6",
-        "react-router-dom": "^6.3.0",
-        "redux": "^4.1.1",
-        "redux-thunk": "^2.3.0",
-        "sass": "^1.52.3",
-        "styled-components": "^5.3.1",
-        "use-debounce": "^8.0.1",
-        "vite": "^2.9.11",
-        "vite-tsconfig-paths": "^3.5.0",
-        "whatwg-fetch": "^3.6.2",
-        "yup": "^0.32.9"
-      },
-      "devDependencies": {
-        "@babel/preset-env": "^7.18.2",
-        "@babel/preset-react": "^7.17.12",
-        "@babel/preset-typescript": "^7.17.12",
-        "@jest/types": "^28.1.1",
-        "@openapitools/openapi-generator-cli": "^2.5.1",
-        "@testing-library/dom": "^8.11.1",
-        "@testing-library/jest-dom": "^5.16.4",
-        "@testing-library/user-event": "^13.5.0",
-        "@types/eventsource": "^1.1.8",
-        "@types/jest": "^28.1.3",
-        "@types/lodash": "^4.14.172",
-        "@types/node": "^16.4.13",
-        "@types/react": "^18.0.9",
-        "@types/react-datepicker": "^4.1.4",
-        "@types/react-dom": "^18.0.3",
-        "@types/react-redux": "^7.1.18",
-        "@types/react-router-dom": "^5.3.3",
-        "@types/redux-mock-store": "^1.0.3",
-        "@types/styled-components": "^5.1.13",
-        "@typescript-eslint/eslint-plugin": "^5.29.0",
-        "@typescript-eslint/parser": "^5.29.0",
-        "dotenv": "^16.0.1",
-        "eslint": "^8.3.0",
-        "eslint-config-airbnb": "^19.0.4",
-        "eslint-config-airbnb-typescript": "^17.0.0",
-        "eslint-config-prettier": "^8.5.0",
-        "eslint-config-react-app": "^7.0.1",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-import-resolver-typescript": "^2.7.1",
-        "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-jest-dom": "^4.0.2",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-prettier": "^4.0.0",
-        "eslint-plugin-react": "^7.29.4",
-        "eslint-plugin-react-hooks": "^4.5.0",
-        "fetch-mock-jest": "^1.5.1",
-        "husky": "^8.0.1",
-        "jest-environment-jsdom": "^28.1.1",
-        "jest-sonar-reporter": "^2.0.0",
-        "jest-styled-components": "^7.0.8",
-        "lint-staged": "^13.0.2",
-        "prettier": "^2.3.1",
-        "redux-mock-store": "^1.5.4",
-        "rimraf": "^3.0.2",
-        "ts-jest": "^28.0.5",
-        "ts-node": "^10.8.1",
-        "typescript": "^4.7.4"
-      },
-      "engines": {
-        "node": "v16.15.0",
-        "npm": "8.5.5"
-      }
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "dependencies": {
-        "@babel/highlight": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz",
-      "integrity": "sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==",
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.18.2",
-        "@babel/helper-compilation-targets": "^7.18.2",
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helpers": "^7.18.2",
-        "@babel/parser": "^7.18.0",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.18.2",
-        "@babel/types": "^7.18.2",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/core/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/core/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@babel/core/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/eslint-parser": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
-      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@babel/eslint-parser/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
-      "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
-      "dependencies": {
-        "@babel/types": "^7.18.2",
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
-      "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz",
-      "integrity": "sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==",
-      "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.20.2",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz",
-      "integrity": "sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-member-expression-to-functions": "^7.17.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz",
-      "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz",
-      "integrity": "sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.17.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz",
-      "integrity": "sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==",
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.18.0",
-        "@babel/types": "^7.18.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
-      "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz",
-      "integrity": "sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.2",
-        "@babel/helper-member-expression-to-functions": "^7.17.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.18.2",
-        "@babel/types": "^7.18.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz",
-      "integrity": "sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==",
-      "dependencies": {
-        "@babel/types": "^7.18.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
-      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.16.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "dependencies": {
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz",
-      "integrity": "sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==",
-      "dependencies": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.18.2",
-        "@babel/types": "^7.18.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
-      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz",
-      "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==",
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
-      "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
-      "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz",
-      "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz",
-      "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz",
-      "integrity": "sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz",
-      "integrity": "sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.17.9",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/plugin-syntax-decorators": "^7.17.0",
-        "charcodes": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz",
-      "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz",
-      "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz",
-      "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz",
-      "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz",
-      "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-compilation-targets": "^7.17.10",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz",
-      "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz",
-      "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz",
-      "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz",
-      "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz",
-      "integrity": "sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-flow": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.7.tgz",
-      "integrity": "sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz",
-      "integrity": "sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz",
-      "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz",
-      "integrity": "sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz",
-      "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz",
-      "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz",
-      "integrity": "sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz",
-      "integrity": "sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.18.2",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-replace-supers": "^7.18.2",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz",
-      "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz",
-      "integrity": "sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz",
-      "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-flow-strip-types": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.7.tgz",
-      "integrity": "sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-flow": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.18.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz",
-      "integrity": "sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz",
-      "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz",
-      "integrity": "sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz",
-      "integrity": "sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-simple-access": "^7.18.2",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz",
-      "integrity": "sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz",
-      "integrity": "sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz",
-      "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz",
-      "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz",
-      "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
-      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz",
-      "integrity": "sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-jsx": "^7.17.12",
-        "@babel/types": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
-      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
-      "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.17.12.tgz",
-      "integrity": "sha512-7S9G2B44EnYOx74mue02t1uD8ckWZ/ee6Uz/qfdzc35uWHX5NgRy9i+iJSb2LFRgMd+QV9zNcStQaazzzZ3n3Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.16.7.tgz",
-      "integrity": "sha512-rONFiQz9vgbsnaMtQlZCjIRwhJvlrPET8TabIUK2hzlXw9B9s2Ieaxte1SCOOXMbWRHodbKixNf3BLcWVOQ8Bw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz",
-      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz",
-      "integrity": "sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "regenerator-transform": "^0.15.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz",
-      "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz",
-      "integrity": "sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz",
-      "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz",
-      "integrity": "sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz",
-      "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz",
-      "integrity": "sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-typescript": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz",
-      "integrity": "sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-compilation-targets": "^7.18.2",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12",
-        "@babel/plugin-proposal-async-generator-functions": "^7.17.12",
-        "@babel/plugin-proposal-class-properties": "^7.17.12",
-        "@babel/plugin-proposal-class-static-block": "^7.18.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
-        "@babel/plugin-proposal-json-strings": "^7.17.12",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.18.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.17.12",
-        "@babel/plugin-proposal-private-methods": "^7.17.12",
-        "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.17.12",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.17.12",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.17.12",
-        "@babel/plugin-transform-async-to-generator": "^7.17.12",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.17.12",
-        "@babel/plugin-transform-classes": "^7.17.12",
-        "@babel/plugin-transform-computed-properties": "^7.17.12",
-        "@babel/plugin-transform-destructuring": "^7.18.0",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.17.12",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.18.1",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.17.12",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.18.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.18.2",
-        "@babel/plugin-transform-modules-systemjs": "^7.18.0",
-        "@babel/plugin-transform-modules-umd": "^7.18.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12",
-        "@babel/plugin-transform-new-target": "^7.17.12",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.17.12",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.18.0",
-        "@babel/plugin-transform-reserved-words": "^7.17.12",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.17.12",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.18.2",
-        "@babel/plugin-transform-typeof-symbol": "^7.17.12",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.18.2",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.22.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-react": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.17.12.tgz",
-      "integrity": "sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-react-display-name": "^7.16.7",
-        "@babel/plugin-transform-react-jsx": "^7.17.12",
-        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-typescript": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz",
-      "integrity": "sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-typescript": "^7.17.12"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
-      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.6.tgz",
-      "integrity": "sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==",
-      "dev": true,
-      "dependencies": {
-        "core-js-pure": "^3.14.0",
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz",
-      "integrity": "sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==",
-      "dependencies": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.18.2",
-        "@babel/helper-environment-visitor": "^7.18.2",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.18.0",
-        "@babel/types": "^7.18.2",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/traverse/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/@babel/types": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz",
-      "integrity": "sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
-    },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "devOptional": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "devOptional": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "node_modules/@cush/relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@cush/relative/-/relative-1.0.0.tgz",
-      "integrity": "sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA=="
-    },
-    "node_modules/@emotion/is-prop-valid": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
-      "dependencies": {
-        "@emotion/memoize": "0.7.4"
-      }
-    },
-    "node_modules/@emotion/memoize": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
-    },
-    "node_modules/@emotion/stylis": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
-    },
-    "node_modules/@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.3.2",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz",
-      "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg==",
-      "hasInstallScript": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@hookform/error-message": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@hookform/error-message/-/error-message-2.0.0.tgz",
-      "integrity": "sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==",
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0",
-        "react-hook-form": "^7.0.0"
-      }
-    },
-    "node_modules/@hookform/resolvers": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.8.9.tgz",
-      "integrity": "sha512-IXwGpjewxScF4N2kuyYDip6ABqH4lCg9n1f1mp0vbmKik+u+nestpbtdEs6U1WQZxwaoK/2APv1+MEr4czX7XA==",
-      "peerDependencies": {
-        "react-hook-form": "^7.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@humanwhocodes/config-array/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.1.tgz",
-      "integrity": "sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA==",
-      "dependencies": {
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/core": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.1.tgz",
-      "integrity": "sha512-3pYsBoZZ42tXMdlcFeCc/0j9kOlK7MYuXs2B1QbvDgMoW1K9NJ4G/VYvIbMb26iqlkTfPHo7SC2JgjDOk/mxXw==",
-      "dependencies": {
-        "@jest/console": "^28.1.1",
-        "@jest/reporters": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^28.0.2",
-        "jest-config": "^28.1.1",
-        "jest-haste-map": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.1",
-        "jest-resolve-dependencies": "^28.1.1",
-        "jest-runner": "^28.1.1",
-        "jest-runtime": "^28.1.1",
-        "jest-snapshot": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-validate": "^28.1.1",
-        "jest-watcher": "^28.1.1",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.1",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/@jest/environment": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.1.tgz",
-      "integrity": "sha512-9auVQ2GzQ7nrU+lAr8KyY838YahElTX9HVjbQPPS2XjlxQ+na18G113OoBhyBGBtD6ZnO/SrUy5WR8EzOj1/Uw==",
-      "dependencies": {
-        "@jest/fake-timers": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "jest-mock": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/expect": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.1.tgz",
-      "integrity": "sha512-/+tQprrFoT6lfkMj4mW/mUIfAmmk/+iQPmg7mLDIFOf2lyf7EBHaS+x3RbeR0VZVMe55IvX7QRoT/2aK3AuUXg==",
-      "dependencies": {
-        "expect": "^28.1.1",
-        "jest-snapshot": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/expect-utils": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.1.tgz",
-      "integrity": "sha512-n/ghlvdhCdMI/hTcnn4qV57kQuV9OTsZzH1TTCVARANKhl6hXJqLKUkwX69ftMGpsbpt96SsDD8n8LD2d9+FRw==",
-      "dependencies": {
-        "jest-get-type": "^28.0.2"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.1.tgz",
-      "integrity": "sha512-BY/3+TyLs5+q87rGWrGUY5f8e8uC3LsVHS9Diz8+FV3ARXL4sNnkLlIB8dvDvRrp+LUCGM+DLqlsYubizGUjIA==",
-      "dependencies": {
-        "@jest/types": "^28.1.1",
-        "@sinonjs/fake-timers": "^9.1.1",
-        "@types/node": "*",
-        "jest-message-util": "^28.1.1",
-        "jest-mock": "^28.1.1",
-        "jest-util": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/globals": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.1.tgz",
-      "integrity": "sha512-dEgl/6v7ToB4vXItdvcltJBgny0xBE6xy6IYQrPJAJggdEinGxCDMivNv7sFzPcTITGquXD6UJwYxfJ/5ZwDSg==",
-      "dependencies": {
-        "@jest/environment": "^28.1.1",
-        "@jest/expect": "^28.1.1",
-        "@jest/types": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/reporters": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.1.tgz",
-      "integrity": "sha512-597Zj4D4d88sZrzM4atEGLuO7SdA/YrOv9SRXHXRNC+/FwPCWxZhBAEzhXoiJzfRwn8zes/EjS8Lo6DouGN5Gg==",
-      "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-worker": "^28.1.1",
-        "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^9.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/schemas": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
-      "integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
-      "dependencies": {
-        "@sinclair/typebox": "^0.23.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/source-map": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.0.2.tgz",
-      "integrity": "sha512-Y9dxC8ZpN3kImkk0LkK5XCEneYMAXlZ8m5bflmSL5vrwyeUpJfentacCUg6fOb8NOpOO7hz2+l37MV77T6BFPw==",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/test-result": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.1.tgz",
-      "integrity": "sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ==",
-      "dependencies": {
-        "@jest/console": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/test-sequencer": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.1.tgz",
-      "integrity": "sha512-nuL+dNSVMcWB7OOtgb0EGH5AjO4UBCt68SLP08rwmC+iRhyuJWS9MtZ/MpipxFwKAlHFftbMsydXqWre8B0+XA==",
-      "dependencies": {
-        "@jest/test-result": "^28.1.1",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/transform": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.1.tgz",
-      "integrity": "sha512-PkfaTUuvjUarl1EDr5ZQcCA++oXkFCP9QFUkG0yVKVmNObjhrqDy0kbMpMebfHWm3CCDHjYNem9eUSH8suVNHQ==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^28.1.1",
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.1",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.1",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jest/types": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.1.tgz",
-      "integrity": "sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
-      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
-      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
-      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "node_modules/@nestjs/common": {
-      "version": "8.4.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-8.4.4.tgz",
-      "integrity": "sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==",
-      "dev": true,
-      "dependencies": {
-        "axios": "0.26.1",
-        "iterare": "1.2.1",
-        "tslib": "2.3.1",
-        "uuid": "8.3.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/nest"
-      },
-      "peerDependencies": {
-        "cache-manager": "*",
-        "class-transformer": "*",
-        "class-validator": "*",
-        "reflect-metadata": "^0.1.12",
-        "rxjs": "^7.1.0"
-      },
-      "peerDependenciesMeta": {
-        "cache-manager": {
-          "optional": true
-        },
-        "class-transformer": {
-          "optional": true
-        },
-        "class-validator": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@nestjs/common/node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
-    "node_modules/@nestjs/core": {
-      "version": "8.4.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-8.4.4.tgz",
-      "integrity": "sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "@nuxtjs/opencollective": "0.3.2",
-        "fast-safe-stringify": "2.1.1",
-        "iterare": "1.2.1",
-        "object-hash": "3.0.0",
-        "path-to-regexp": "3.2.0",
-        "tslib": "2.3.1",
-        "uuid": "8.3.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/nest"
-      },
-      "peerDependencies": {
-        "@nestjs/common": "^8.0.0",
-        "@nestjs/microservices": "^8.0.0",
-        "@nestjs/platform-express": "^8.0.0",
-        "@nestjs/websockets": "^8.0.0",
-        "reflect-metadata": "^0.1.12",
-        "rxjs": "^7.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@nestjs/microservices": {
-          "optional": true
-        },
-        "@nestjs/platform-express": {
-          "optional": true
-        },
-        "@nestjs/websockets": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@nestjs/core/node_modules/path-to-regexp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",
-      "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==",
-      "dev": true
-    },
-    "node_modules/@nestjs/core/node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-      "dev": true
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nuxtjs/opencollective": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz",
-      "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "consola": "^2.15.0",
-        "node-fetch": "^2.6.1"
-      },
-      "bin": {
-        "opencollective": "bin/opencollective.js"
-      },
-      "engines": {
-        "node": ">=8.0.0",
-        "npm": ">=5.0.0"
-      }
-    },
-    "node_modules/@openapitools/openapi-generator-cli": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.5.1.tgz",
-      "integrity": "sha512-WSRQBU0dCSVD+0Qv8iCsv0C4iMaZe/NpJ/CT4SmrEYLH3txoKTE8wEfbdj/kqShS8Or0YEGDPUzhSIKY151L0w==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "@nestjs/common": "8.4.4",
-        "@nestjs/core": "8.4.4",
-        "@nuxtjs/opencollective": "0.3.2",
-        "chalk": "4.1.2",
-        "commander": "8.3.0",
-        "compare-versions": "4.1.3",
-        "concurrently": "6.5.1",
-        "console.table": "0.10.0",
-        "fs-extra": "10.0.1",
-        "glob": "7.1.6",
-        "inquirer": "8.2.2",
-        "lodash": "4.17.21",
-        "reflect-metadata": "0.1.13",
-        "rxjs": "7.5.5",
-        "tslib": "2.0.3"
-      },
-      "bin": {
-        "openapi-generator-cli": "main.js"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/openapi_generator"
-      }
-    },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/fs-extra": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-      "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@openapitools/openapi-generator-cli/node_modules/tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==",
-      "dev": true
-    },
-    "node_modules/@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/@reduxjs/toolkit": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.2.tgz",
-      "integrity": "sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==",
-      "dependencies": {
-        "immer": "^9.0.7",
-        "redux": "^4.1.2",
-        "redux-thunk": "^2.4.1",
-        "reselect": "^4.1.5"
-      },
-      "peerDependencies": {
-        "react": "^16.9.0 || ^17.0.0 || ^18",
-        "react-redux": "^7.2.1 || ^8.0.0-beta"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-redux": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@rooks/use-outside-click-ref": {
-      "version": "4.11.2",
-      "resolved": "https://registry.npmjs.org/@rooks/use-outside-click-ref/-/use-outside-click-ref-4.11.2.tgz",
-      "integrity": "sha512-w2bCW69zcpLh0KmN/odAuBsQ3sps+73KEu7zMOi0o4YMfDo+tXcqwlTJiLYysd0BEoQC9pNIklzZmI9zZep69g==",
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/@rushstack/eslint-patch": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
-      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
-      "dev": true
-    },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.23.5",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
-      "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg=="
-    },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-      "dependencies": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "node_modules/@testing-library/dom": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
-      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
-        "pretty-format": "^27.0.2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/dom-accessibility-api": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz",
-      "integrity": "sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g=="
-    },
-    "node_modules/@testing-library/jest-dom": {
-      "version": "5.16.4",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz",
-      "integrity": "sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
-        "aria-query": "^5.0.0",
-        "chalk": "^3.0.0",
-        "css": "^3.0.0",
-        "css.escape": "^1.5.1",
-        "dom-accessibility-api": "^0.5.6",
-        "lodash": "^4.17.15",
-        "redent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8",
-        "npm": ">=6",
-        "yarn": ">=1"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/aria-query": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-      "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/react": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.2.0.tgz",
-      "integrity": "sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g==",
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^8.5.0",
-        "@types/react-dom": "^18.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0"
-      }
-    },
-    "node_modules/@testing-library/user-event": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
-      "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5"
-      },
-      "engines": {
-        "node": ">=10",
-        "npm": ">=6"
-      },
-      "peerDependencies": {
-        "@testing-library/dom": ">=7.21.4"
-      }
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "devOptional": true
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "devOptional": true
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "devOptional": true
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
-      "devOptional": true
-    },
-    "node_modules/@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.1.19",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.17.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
-      "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
-      "dependencies": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "node_modules/@types/eventsource": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@types/eventsource/-/eventsource-1.1.8.tgz",
-      "integrity": "sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==",
-      "dev": true
-    },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/history": {
-      "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
-      "dev": true
-    },
-    "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
-      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
-      "dependencies": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
-      }
-    },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="
-    },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "dependencies": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/jest": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.3.tgz",
-      "integrity": "sha512-Tsbjk8Y2hkBaY/gJsataeb4q9Mubw9EOz7+4RjPkzD5KjTvHHs7cpws22InaoXxAVAhF5HfFbzJjo6oKWqSZLw==",
-      "dev": true,
-      "dependencies": {
-        "jest-matcher-utils": "^28.0.0",
-        "pretty-format": "^28.0.0"
-      }
-    },
-    "node_modules/@types/jest/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@types/jest/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@types/jest/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
-    "node_modules/@types/jsdom": {
-      "version": "16.2.14",
-      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.14.tgz",
-      "integrity": "sha512-6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "@types/parse5": "*",
-        "@types/tough-cookie": "*"
-      }
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "node_modules/@types/lodash": {
-      "version": "4.14.177",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "16.11.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "node_modules/@types/parse5": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz",
-      "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==",
-      "dev": true
-    },
-    "node_modules/@types/prettier": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
-      "integrity": "sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg=="
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-    },
-    "node_modules/@types/react": {
-      "version": "18.0.9",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz",
-      "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==",
-      "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/react-datepicker": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.3.4.tgz",
-      "integrity": "sha512-5nTTz37KdTUgMZ1AAxztMWNtEnIMVRo8oCAEhIv0a6uUqDjvSKaMyPRpBV+8chi6f/A8wlTKJIpojpXca2dx3A==",
-      "dev": true,
-      "dependencies": {
-        "@popperjs/core": "^2.9.2",
-        "@types/react": "*",
-        "date-fns": "^2.0.1",
-        "react-popper": "^2.2.5"
-      }
-    },
-    "node_modules/@types/react-dom": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
-      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react-redux": {
-      "version": "7.1.24",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz",
-      "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==",
-      "dependencies": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
-    "node_modules/@types/react-router": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
-      "integrity": "sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==",
-      "dev": true,
-      "dependencies": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react-router-dom": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
-      "dev": true,
-      "dependencies": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*",
-        "@types/react-router": "*"
-      }
-    },
-    "node_modules/@types/redux-mock-store": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/redux-mock-store/-/redux-mock-store-1.0.3.tgz",
-      "integrity": "sha512-Wqe3tJa6x9MxMN4DJnMfZoBRBRak1XTPklqj4qkVm5VBpZnC8PSADf4kLuFQ9NAdHaowfWoEeUMz7NWc2GMtnA==",
-      "dev": true,
-      "dependencies": {
-        "redux": "^4.0.5"
-      }
-    },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
-    },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
-    },
-    "node_modules/@types/styled-components": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.18.tgz",
-      "integrity": "sha512-xPTYmWP7Mxk5TAD3pYsqjwA9G5fAI8e/S51QUJEl7EQD1siKCdiYXIWiH2lzoHRl+QqbQCJMcGv3YTF3OmyPdQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/hoist-non-react-statics": "*",
-        "@types/react": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/testing-library__jest-dom": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz",
-      "integrity": "sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw==",
-      "dev": true,
-      "dependencies": {
-        "@types/jest": "*"
-      }
-    },
-    "node_modules/@types/tough-cookie": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
-      "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
-      "dev": true
-    },
-    "node_modules/@types/yargs": {
-      "version": "17.0.10",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
-      "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA=="
-    },
-    "node_modules/@types/yup": {
-      "version": "0.29.13",
-      "resolved": "https://registry.npmjs.org/@types/yup/-/yup-0.29.13.tgz",
-      "integrity": "sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g=="
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
-      "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/type-utils": "5.29.0",
-        "@typescript-eslint/utils": "5.29.0",
-        "debug": "^4.3.4",
-        "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.2.0",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.23.0.tgz",
-      "integrity": "sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/utils": "5.23.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
-      "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/visitor-keys": "5.23.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/types": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
-      "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
-      "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/visitor-keys": "5.23.0",
-        "debug": "^4.3.2",
-        "globby": "^11.0.4",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/utils": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
-      "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.23.0",
-        "@typescript-eslint/types": "5.23.0",
-        "@typescript-eslint/typescript-estree": "5.23.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
-      "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.23.0",
-        "eslint-visitor-keys": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
-      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/typescript-estree": "5.29.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
-      "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/visitor-keys": "5.29.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz",
-      "integrity": "sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/utils": "5.29.0",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
-      "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
-      "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/visitor-keys": "5.29.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
-      "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/typescript-estree": "5.29.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
-      "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.29.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@vitejs/plugin-react": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-1.3.2.tgz",
-      "integrity": "sha512-aurBNmMo0kz1O4qRoY+FM4epSA39y3ShWGuqfLRA/3z0oEJAdtoSfgA3aO98/PCCHAqMaduLxIxErWrVKIFzXA==",
-      "dependencies": {
-        "@babel/core": "^7.17.10",
-        "@babel/plugin-transform-react-jsx": "^7.17.3",
-        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-        "@babel/plugin-transform-react-jsx-self": "^7.16.7",
-        "@babel/plugin-transform-react-jsx-source": "^7.16.7",
-        "@rollup/pluginutils": "^4.2.1",
-        "react-refresh": "^0.13.0",
-        "resolve": "^1.22.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/@vitejs/plugin-react/node_modules/@rollup/pluginutils": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
-      "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
-      "dependencies": {
-        "estree-walker": "^2.0.1",
-        "picomatch": "^2.2.2"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/@vitejs/plugin-react/node_modules/estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-    },
-    "node_modules/@vitejs/plugin-react/node_modules/react-refresh": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.13.0.tgz",
-      "integrity": "sha512-XP8A9BT0CpRBD+NYLLeIhld/RqG9+gktUjW1FkE+Vm7OCinbG1SshcK5tb9ls4kzvjZr9mOQc7HYgBngEyPAXg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "node_modules/ace-builds": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
-      "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
-    },
-    "node_modules/acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-      "devOptional": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "devOptional": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/agent-base/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/agent-base/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
-      "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ansi-styles/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ansi-styles/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "devOptional": true
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flat/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true,
-      "bin": {
-        "atob": "bin/atob.js"
-      },
-      "engines": {
-        "node": ">= 4.5.0"
-      }
-    },
-    "node_modules/axe-core": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz",
-      "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/axios": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
-      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
-      "dev": true,
-      "dependencies": {
-        "follow-redirects": "^1.14.8"
-      }
-    },
-    "node_modules/axobject-query": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true
-    },
-    "node_modules/babel-jest": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.1.tgz",
-      "integrity": "sha512-MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw==",
-      "dependencies": {
-        "@jest/transform": "^28.1.1",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^28.1.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
-      }
-    },
-    "node_modules/babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "dependencies": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.1.tgz",
-      "integrity": "sha512-NovGCy5Hn25uMJSAU8FaHqzs13cFoOI4lhIujiepssjCKRsAo3TA734RDWSGxuFTsUJXerYOqQQodlxgmtqbzw==",
-      "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/babel-plugin-macros": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "cosmiconfig": "^7.0.0",
-        "resolve": "^1.19.0"
-      },
-      "engines": {
-        "node": ">=10",
-        "npm": ">=6"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
-      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "semver": "^6.1.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
-      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.21.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-styled-components": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz",
-      "integrity": "sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-module-imports": "^7.0.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "lodash": "^4.17.11"
-      },
-      "peerDependencies": {
-        "styled-components": ">= 2"
-      }
-    },
-    "node_modules/babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
-    },
-    "node_modules/babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==",
-      "dev": true
-    },
-    "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-preset-jest": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.1.tgz",
-      "integrity": "sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g==",
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^28.1.1",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-preset-react-app": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
-      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-proposal-class-properties": "^7.16.0",
-        "@babel/plugin-proposal-decorators": "^7.16.4",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-private-methods": "^7.16.0",
-        "@babel/plugin-transform-flow-strip-types": "^7.16.0",
-        "@babel/plugin-transform-react-display-name": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.4",
-        "@babel/preset-env": "^7.16.4",
-        "@babel/preset-react": "^7.16.0",
-        "@babel/preset-typescript": "^7.16.0",
-        "@babel/runtime": "^7.16.3",
-        "babel-plugin-macros": "^3.1.0",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
-      }
-    },
-    "node_modules/babel-preset-react-app/node_modules/@babel/runtime": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
-      "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/broadcast-channel": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
-      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
-      "dependencies": {
-        "@babel/runtime": "^7.7.2",
-        "detect-node": "^2.1.0",
-        "js-sha3": "0.8.0",
-        "microseconds": "0.2.0",
-        "nano-time": "1.0.0",
-        "oblivious-set": "1.0.0",
-        "rimraf": "3.0.2",
-        "unload": "2.2.0"
-      }
-    },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
-    },
-    "node_modules/browserslist": {
-      "version": "4.20.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz",
-      "integrity": "sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001349",
-        "electron-to-chromium": "^1.4.147",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.5",
-        "picocolors": "^1.0.0"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-      "dev": true,
-      "dependencies": {
-        "fast-json-stable-stringify": "2.x"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dependencies": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "node_modules/bulma": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.3.tgz",
-      "integrity": "sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g=="
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/camelize": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001352",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz",
-      "integrity": "sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        }
-      ]
-    },
-    "node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/charcodes": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
-      "integrity": "sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/ci-info": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.1.tgz",
-      "integrity": "sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg=="
-    },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
-    },
-    "node_modules/classnames": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-truncate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
-      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
-      "dev": true,
-      "dependencies": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-truncate/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/cli-truncate/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/cli-truncate/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-truncate/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "node_modules/colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-      "dev": true
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/compare-versions": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-4.1.3.tgz",
-      "integrity": "sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "node_modules/concurrently": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.5.1.tgz",
-      "integrity": "sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "date-fns": "^2.16.1",
-        "lodash": "^4.17.21",
-        "rxjs": "^6.6.3",
-        "spawn-command": "^0.0.2-1",
-        "supports-color": "^8.1.0",
-        "tree-kill": "^1.2.2",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "concurrently": "bin/concurrently.js"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/concurrently/node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
-    "node_modules/concurrently/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "node_modules/consola": {
-      "version": "2.15.3",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
-      "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
-      "dev": true
-    },
-    "node_modules/console.table": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/console.table/-/console.table-0.10.0.tgz",
-      "integrity": "sha1-CRcCVYiHW+/XDPLv9L7yxuLXXQQ=",
-      "dev": true,
-      "dependencies": {
-        "easy-table": "1.1.0"
-      },
-      "engines": {
-        "node": "> 0.10"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dependencies": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "node_modules/convert-source-map/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
-      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.22.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.5.tgz",
-      "integrity": "sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==",
-      "dev": true,
-      "dependencies": {
-        "browserslist": "^4.20.3",
-        "semver": "7.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/core-js-pure": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
-      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "devOptional": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      }
-    },
-    "node_modules/css-color-keywords": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/css-to-react-native": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz",
-      "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==",
-      "dependencies": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "node_modules/css.escape": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
-      "dev": true
-    },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "node_modules/csstype": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
-      "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
-    },
-    "node_modules/damerau-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-      "dev": true
-    },
-    "node_modules/data-urls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/data-urls/node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/data-urls/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/date-fns": {
-      "version": "2.23.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
-      "integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.11"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
-      }
-    },
-    "node_modules/dayjs": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
-      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
-    },
-    "node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-      "dev": true
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "dependencies": {
-        "clone": "^1.0.2"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "dependencies": {
-        "object-keys": "^1.0.12"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "devOptional": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/diff-match-patch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
-      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
-    },
-    "node_modules/diff-sequences": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz",
-      "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dom-accessibility-api": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz",
-      "integrity": "sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==",
-      "dev": true
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "dev": true,
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/dotenv": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",
-      "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
-    },
-    "node_modules/easy-table": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz",
-      "integrity": "sha1-hvmrTBAvA3G3KXuSplHVgkvIy3M=",
-      "dev": true,
-      "optionalDependencies": {
-        "wcwidth": ">=1.0.1"
-      }
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.151",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.151.tgz",
-      "integrity": "sha512-XaG2LpZi9fdiWYOqJh0dJy4SlVywCvpgYXhzOlZTp4JqSKqxn5URqOjbm9OMYB3aInA2GuHQiem1QUOc1yT0Pw=="
-    },
-    "node_modules/emittery": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
-      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.43.tgz",
-      "integrity": "sha512-Uf94+kQmy/5jsFwKWiQB4hfo/RkM9Dh7b79p8yqd1tshULdr25G2szLz631NoH3s2ujnKEKVD16RmOxvCNKRFA==",
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "esbuild-android-64": "0.14.43",
-        "esbuild-android-arm64": "0.14.43",
-        "esbuild-darwin-64": "0.14.43",
-        "esbuild-darwin-arm64": "0.14.43",
-        "esbuild-freebsd-64": "0.14.43",
-        "esbuild-freebsd-arm64": "0.14.43",
-        "esbuild-linux-32": "0.14.43",
-        "esbuild-linux-64": "0.14.43",
-        "esbuild-linux-arm": "0.14.43",
-        "esbuild-linux-arm64": "0.14.43",
-        "esbuild-linux-mips64le": "0.14.43",
-        "esbuild-linux-ppc64le": "0.14.43",
-        "esbuild-linux-riscv64": "0.14.43",
-        "esbuild-linux-s390x": "0.14.43",
-        "esbuild-netbsd-64": "0.14.43",
-        "esbuild-openbsd-64": "0.14.43",
-        "esbuild-sunos-64": "0.14.43",
-        "esbuild-windows-32": "0.14.43",
-        "esbuild-windows-64": "0.14.43",
-        "esbuild-windows-arm64": "0.14.43"
-      }
-    },
-    "node_modules/esbuild-android-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.43.tgz",
-      "integrity": "sha512-kqFXAS72K6cNrB6RiM7YJ5lNvmWRDSlpi7ZuRZ1hu1S3w0zlwcoCxWAyM23LQUyZSs1PbjHgdbbfYAN8IGh6xg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-android-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.43.tgz",
-      "integrity": "sha512-bKS2BBFh+7XZY9rpjiHGRNA7LvWYbZWP87pLehggTG7tTaCDvj8qQGOU/OZSjCSKDYbgY7Q+oDw8RlYQ2Jt2BA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.43.tgz",
-      "integrity": "sha512-/3PSilx011ttoieRGkSZ0XV8zjBf2C9enV4ScMMbCT4dpx0mFhMOpFnCHkOK0pWGB8LklykFyHrWk2z6DENVUg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.43.tgz",
-      "integrity": "sha512-1HyFUKs8DMCBOvw1Qxpr5Vv/ThNcVIFb5xgXWK3pyT40WPvgYIiRTwJCvNs4l8i5qWF8/CK5bQxJVDjQvtv0Yw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.43.tgz",
-      "integrity": "sha512-FNWc05TPHYgaXjbPZO5/rJKSBslfG6BeMSs8GhwnqAKP56eEhvmzwnIz1QcC9cRVyO+IKqWNfmHFkCa1WJTULA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.43.tgz",
-      "integrity": "sha512-amrYopclz3VohqisOPR6hA3GOWA3LZC1WDLnp21RhNmoERmJ/vLnOpnrG2P/Zao+/erKTCUqmrCIPVtj58DRoA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-32": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.43.tgz",
-      "integrity": "sha512-KoxoEra+9O3AKVvgDFvDkiuddCds6q71owSQEYwjtqRV7RwbPzKxJa6+uyzUulHcyGVq0g15K0oKG5CFBcvYDw==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.43.tgz",
-      "integrity": "sha512-EwINwGMyiJMgBby5/SbMqKcUhS5AYAZ2CpEBzSowsJPNBJEdhkCTtEjk757TN/wxgbu3QklqDM6KghY660QCUw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.43.tgz",
-      "integrity": "sha512-e6YzQUoDxxtyamuF12eVzzRC7bbEFSZohJ6igQB9tBqnNmIQY3fI6Cns3z2wxtbZ3f2o6idkD2fQnlvs2902Dg==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.43.tgz",
-      "integrity": "sha512-UlSpjMWllAc70zYbHxWuDS3FJytyuR/gHJYBr8BICcTNb/TSOYVBg6U7b3jZ3mILTrgzwJUHwhEwK18FZDouUQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.43.tgz",
-      "integrity": "sha512-f+v8cInPEL1/SDP//CfSYzcDNgE4CY3xgDV81DWm3KAPWzhvxARrKxB1Pstf5mB56yAslJDxu7ryBUPX207EZA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.43.tgz",
-      "integrity": "sha512-5wZYMDGAL/K2pqkdIsW+I4IR41kyfHr/QshJcNpUfK3RjB3VQcPWOaZmc+74rm4ZjVirYrtz+jWw0SgxtxRanA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-riscv64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.43.tgz",
-      "integrity": "sha512-lYcAOUxp85hC7lSjycJUVSmj4/9oEfSyXjb/ua9bNl8afonaduuqtw7hvKMoKuYnVwOCDw4RSfKpcnIRDWq+Bw==",
-      "cpu": [
-        "riscv64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-linux-s390x": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.43.tgz",
-      "integrity": "sha512-27e43ZhHvhFE4nM7HqtUbMRu37I/4eNSUbb8FGZWszV+uLzMIsHDwLoBiJmw7G9N+hrehNPeQ4F5Ujad0DrUKQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-netbsd-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.43.tgz",
-      "integrity": "sha512-2mH4QF6hHBn5zzAfxEI/2eBC0mspVsZ6UVo821LpAJKMvLJPBk3XJO5xwg7paDqSqpl7p6IRrAenW999AEfJhQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-openbsd-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.43.tgz",
-      "integrity": "sha512-ZhQpiZjvqCqO8jKdGp9+8k9E/EHSA+zIWOg+grwZasI9RoblqJ1QiZqqi7jfd6ZrrG1UFBNGe4m0NFxCFbMVbg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-sunos-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.43.tgz",
-      "integrity": "sha512-DgxSi9DaHReL9gYuul2rrQCAapgnCJkh3LSHPKsY26zytYppG0HgkgVF80zjIlvEsUbGBP/GHQzBtrezj/Zq1Q==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-32": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.43.tgz",
-      "integrity": "sha512-Ih3+2O5oExiqm0mY6YYE5dR0o8+AspccQ3vIAtRodwFvhuyGLjb0Hbmzun/F3Lw19nuhPMu3sW2fqIJ5xBxByw==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.43.tgz",
-      "integrity": "sha512-8NsuNfI8xwFuJbrCuI+aBqNTYkrWErejFO5aYM+yHqyHuL8mmepLS9EPzAzk8rvfaJrhN0+RvKWAcymViHOKEw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/esbuild-windows-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.43.tgz",
-      "integrity": "sha512-7ZlD7bo++kVRblJEoG+cepljkfP8bfuTPz5fIXzptwnPaFwGS6ahvfoYzY7WCf5v/1nX2X02HDraVItTgbHnKw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
-      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint/eslintrc": "^1.3.0",
-        "@humanwhocodes/config-array": "^0.9.2",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.2",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-airbnb": {
-      "version": "19.0.4",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
-      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
-      "dev": true,
-      "dependencies": {
-        "eslint-config-airbnb-base": "^15.0.0",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5"
-      },
-      "engines": {
-        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.28.0",
-        "eslint-plugin-react-hooks": "^4.3.0"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint-config-airbnb-typescript": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz",
-      "integrity": "sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==",
-      "dev": true,
-      "dependencies": {
-        "eslint-config-airbnb-base": "^15.0.0"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.13.0",
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.3"
-      }
-    },
-    "node_modules/eslint-config-airbnb/node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-config-airbnb/node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/eslint-config-prettier": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
-      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
-      "dev": true,
-      "bin": {
-        "eslint-config-prettier": "bin/cli.js"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint-config-react-app": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
-      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.16.0",
-        "@babel/eslint-parser": "^7.16.3",
-        "@rushstack/eslint-patch": "^1.1.0",
-        "@typescript-eslint/eslint-plugin": "^5.5.0",
-        "@typescript-eslint/parser": "^5.5.0",
-        "babel-preset-react-app": "^10.0.1",
-        "confusing-browser-globals": "^1.0.11",
-        "eslint-plugin-flowtype": "^8.0.3",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jest": "^25.3.0",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.27.1",
-        "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-testing-library": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^8.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-typescript": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz",
-      "integrity": "sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4",
-        "glob": "^7.2.0",
-        "is-glob": "^4.0.3",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "*",
-        "eslint-plugin-import": "*"
-      }
-    },
-    "node_modules/eslint-import-resolver-typescript/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-import-resolver-typescript/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/eslint-import-resolver-typescript/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/eslint-import-resolver-typescript/node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-flowtype": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
-      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "string-natural-compare": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@babel/plugin-syntax-flow": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.9",
-        "eslint": "^8.1.0"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint-plugin-jest": {
-      "version": "25.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
-      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@typescript-eslint/eslint-plugin": {
-          "optional": true
-        },
-        "jest": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-jest-dom": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-4.0.2.tgz",
-      "integrity": "sha512-Jo51Atwyo2TdcUncjmU+UQeSTKh3sc2LF/M5i/R3nTU0Djw9V65KGJisdm/RtuKhy2KH/r7eQ1n6kwYFPNdHlA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.16.3",
-        "@testing-library/dom": "^8.11.1",
-        "requireindex": "^1.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
-        "npm": ">=6",
-        "yarn": ">=1"
-      },
-      "peerDependencies": {
-        "eslint": "^6.8.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-jest-dom/node_modules/@babel/runtime": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
-      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.16.3",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.4",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.3.5",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.7",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.2.1",
-        "language-tags": "^1.0.5",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/@babel/runtime": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-      "dev": true,
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/array-includes": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-      "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/jsx-ast-utils": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz",
-      "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.3",
-        "object.assign": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-plugin-prettier": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
-      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
-      "dev": true,
-      "dependencies": {
-        "prettier-linter-helpers": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.28.0",
-        "prettier": ">=2.0.0"
-      },
-      "peerDependenciesMeta": {
-        "eslint-config-prettier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.29.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz",
-      "integrity": "sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flatmap": "^1.2.5",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.1.0",
-        "object.values": "^1.1.5",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.3",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.6"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
-      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.3",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
-      "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.5.0.tgz",
-      "integrity": "sha512-eWQ19l6uWL7LW8oeMyQVSGjVYFnBqk7DMHjadm0yOHBvX3Xi9OBrsNuxoAMdX4r7wlQ5WWpW46d+CB6FWFL/PQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/utils": "^5.13.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
-        "npm": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": "^7.5.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/eslint/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/eslint/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/espree": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.7.1",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/expect": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.1.tgz",
-      "integrity": "sha512-/AANEwGL0tWBwzLNOvO0yUdy2D52jVdNXppOqswC49sxMN2cPWsGCQdzuIf9tj6hHoBQzNvx75JUYuQAckPo3w==",
-      "dependencies": {
-        "@jest/expect-utils": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "jest-matcher-utils": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-util": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "node_modules/fast-safe-stringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-      "dependencies": {
-        "bser": "2.1.1"
-      }
-    },
-    "node_modules/fetch-mock": {
-      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.11.0.tgz",
-      "integrity": "sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==",
-      "dependencies": {
-        "@babel/core": "^7.0.0",
-        "@babel/runtime": "^7.0.0",
-        "core-js": "^3.0.0",
-        "debug": "^4.1.1",
-        "glob-to-regexp": "^0.4.0",
-        "is-subset": "^0.1.1",
-        "lodash.isequal": "^4.5.0",
-        "path-to-regexp": "^2.2.1",
-        "querystring": "^0.2.0",
-        "whatwg-url": "^6.5.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      },
-      "funding": {
-        "type": "charity",
-        "url": "https://www.justgiving.com/refugee-support-europe"
-      },
-      "peerDependencies": {
-        "node-fetch": "*"
-      },
-      "peerDependenciesMeta": {
-        "node-fetch": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fetch-mock-jest": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/fetch-mock-jest/-/fetch-mock-jest-1.5.1.tgz",
-      "integrity": "sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ==",
-      "dev": true,
-      "dependencies": {
-        "fetch-mock": "^9.11.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      },
-      "funding": {
-        "type": "charity",
-        "url": "https://www.justgiving.com/refugee-support-europe"
-      },
-      "peerDependencies": {
-        "node-fetch": "*"
-      },
-      "peerDependenciesMeta": {
-        "node-fetch": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fetch-mock/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fetch-mock/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/fetch-mock/node_modules/path-to-regexp": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz",
-      "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w=="
-    },
-    "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-      "dev": true
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/format-util": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz",
-      "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-regex": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/glob-regex/-/glob-regex-0.3.2.tgz",
-      "integrity": "sha512-m5blUd3/OqDTWwzBBtWBPrGlAzatRywHameHeekAZyZrskYouOGdNB8T/q6JucucvJXtOuyHIn0/Yia7iDasDw=="
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-    },
-    "node_modules/globals": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globrex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/history": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
-      "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.7.6"
-      }
-    },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "dependencies": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
-      "dependencies": {
-        "whatwg-encoding": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/http-proxy-agent/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/http-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/https-proxy-agent/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/https-proxy-agent/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/husky": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
-      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
-      "dev": true,
-      "bin": {
-        "husky": "lib/bin.js"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/typicode"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/immer": {
-      "version": "9.0.12",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz",
-      "integrity": "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
-      }
-    },
-    "node_modules/immutable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
-      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/inquirer": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.2.tgz",
-      "integrity": "sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-subset": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY="
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/istanbul-lib-source-maps/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/iterare": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/iterare/-/iterare-1.2.1.tgz",
-      "integrity": "sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jest": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.1.tgz",
-      "integrity": "sha512-qw9YHBnjt6TCbIDMPMpJZqf9E12rh6869iZaN08/vpOGgHJSAaLLUn6H8W3IAEuy34Ls3rct064mZLETkxJ2XA==",
-      "dependencies": {
-        "@jest/core": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "import-local": "^3.0.2",
-        "jest-cli": "^28.1.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.0.2.tgz",
-      "integrity": "sha512-QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA==",
-      "dependencies": {
-        "execa": "^5.0.0",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-circus": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.1.tgz",
-      "integrity": "sha512-75+BBVTsL4+p2w198DQpCeyh1RdaS2lhEG87HkaFX/UG0gJExVq2skG2pT7XZEGBubNj2CytcWSPan4QEPNosw==",
-      "dependencies": {
-        "@jest/environment": "^28.1.1",
-        "@jest/expect": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^28.1.1",
-        "jest-matcher-utils": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-runtime": "^28.1.1",
-        "jest-snapshot": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "pretty-format": "^28.1.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-cli": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.1.tgz",
-      "integrity": "sha512-+sUfVbJqb1OjBZ0OdBbI6OWfYM1i7bSfzYy6gze1F1w3OKWq8ZTEKkZ8a7ZQPq6G/G1qMh/uKqpdWhgl11NFQQ==",
-      "dependencies": {
-        "@jest/core": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-validate": "^28.1.1",
-        "prompts": "^2.0.1",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-cli/node_modules/yargs": {
-      "version": "17.5.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jest-cli/node_modules/yargs-parser": {
-      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jest-config": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.1.tgz",
-      "integrity": "sha512-tASynMhS+jVV85zKvjfbJ8nUyJS/jUSYZ5KQxLUN2ZCvcQc/OmhQl2j6VEL3ezQkNofxn5pQ3SPYWPHb0unTZA==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "babel-jest": "^28.1.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^28.1.1",
-        "jest-environment-node": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.1",
-        "jest-runner": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-validate": "^28.1.1",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^28.1.1",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@types/node": "*",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-config/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-diff": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.1.tgz",
-      "integrity": "sha512-/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-docblock": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz",
-      "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==",
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-each": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.1.tgz",
-      "integrity": "sha512-A042rqh17ZvEhRceDMi784ppoXR7MWGDEKTXEZXb4svt0eShMZvijGxzKsx+yIjeE8QYmHPrnHiTSQVhN4nqaw==",
-      "dependencies": {
-        "@jest/types": "^28.1.1",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "jest-util": "^28.1.1",
-        "pretty-format": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-environment-jsdom": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.1.tgz",
-      "integrity": "sha512-41ZvgSoPNcKG5q3LuuOcAczdBxRq9DbZkPe24okN6ZCmiZdAfFtPg3z+lOtsT1fM6OAERApKT+3m0MRDQH2zIA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^28.1.1",
-        "@jest/fake-timers": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/jsdom": "^16.2.4",
-        "@types/node": "*",
-        "jest-mock": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jsdom": "^19.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-environment-node": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.1.tgz",
-      "integrity": "sha512-2aV/eeY/WNgUUJrrkDJ3cFEigjC5fqT1+fCclrY6paqJ5zVPoM//sHmfgUUp7WLYxIdbPwMiVIzejpN56MxnNA==",
-      "dependencies": {
-        "@jest/environment": "^28.1.1",
-        "@jest/fake-timers": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "jest-mock": "^28.1.1",
-        "jest-util": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
-      "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.1.tgz",
-      "integrity": "sha512-ZrRSE2o3Ezh7sb1KmeLEZRZ4mgufbrMwolcFHNRSjKZhpLa8TdooXOOFlSwoUzlbVs1t0l7upVRW2K7RWGHzbQ==",
-      "dependencies": {
-        "@jest/types": "^28.1.1",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.1",
-        "jest-worker": "^28.1.1",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      }
-    },
-    "node_modules/jest-leak-detector": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.1.tgz",
-      "integrity": "sha512-4jvs8V8kLbAaotE+wFR7vfUGf603cwYtFf1/PYEsyX2BAjSzj8hQSVTP6OWzseTl0xL6dyHuKs2JAks7Pfubmw==",
-      "dependencies": {
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-leak-detector/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-leak-detector/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-leak-detector/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.1.tgz",
-      "integrity": "sha512-NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-message-util": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.1.tgz",
-      "integrity": "sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-mock": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.1.tgz",
-      "integrity": "sha512-bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw==",
-      "dependencies": {
-        "@jest/types": "^28.1.1",
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.1.tgz",
-      "integrity": "sha512-/d1UbyUkf9nvsgdBildLe6LAD4DalgkgZcKd0nZ8XUGPyA/7fsnaQIlKVnDiuUXv/IeZhPEDrRJubVSulxrShA==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.1",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^28.1.1",
-        "jest-validate": "^28.1.1",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.1.tgz",
-      "integrity": "sha512-p8Y150xYJth4EXhOuB8FzmS9r8IGLEioiaetgdNGb9VHka4fl0zqWlVe4v7mSkYOuEUg2uB61iE+zySDgrOmgQ==",
-      "dependencies": {
-        "jest-regex-util": "^28.0.2",
-        "jest-snapshot": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.1.tgz",
-      "integrity": "sha512-W5oFUiDBgTsCloTAj6q95wEvYDB0pxIhY6bc5F26OucnwBN+K58xGTGbliSMI4ChQal5eANDF+xvELaYkJxTmA==",
-      "dependencies": {
-        "@jest/console": "^28.1.1",
-        "@jest/environment": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^28.1.1",
-        "jest-environment-node": "^28.1.1",
-        "jest-haste-map": "^28.1.1",
-        "jest-leak-detector": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-resolve": "^28.1.1",
-        "jest-runtime": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-watcher": "^28.1.1",
-        "jest-worker": "^28.1.1",
-        "source-map-support": "0.5.13",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runtime": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.1.tgz",
-      "integrity": "sha512-J89qEJWW0leOsqyi0D9zHpFEYHwwafFdS9xgvhFHtIdRghbadodI0eA+DrthK/1PebBv3Px8mFSMGKrtaVnleg==",
-      "dependencies": {
-        "@jest/environment": "^28.1.1",
-        "@jest/fake-timers": "^28.1.1",
-        "@jest/globals": "^28.1.1",
-        "@jest/source-map": "^28.0.2",
-        "@jest/test-result": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-mock": "^28.1.1",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.1",
-        "jest-snapshot": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.1.tgz",
-      "integrity": "sha512-1KjqHJ98adRcbIdMizjF5DipwZFbvxym/kFO4g4fVZCZRxH/dqV8TiBFCa6rqic3p0karsy8RWS1y4E07b7P0A==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/babel__traverse": "^7.0.6",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^28.1.1",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "jest-haste-map": "^28.1.1",
-        "jest-matcher-utils": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^28.1.1",
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-sonar-reporter": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jest-sonar-reporter/-/jest-sonar-reporter-2.0.0.tgz",
-      "integrity": "sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==",
-      "dev": true,
-      "dependencies": {
-        "xml": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/jest-styled-components": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/jest-styled-components/-/jest-styled-components-7.0.8.tgz",
-      "integrity": "sha512-0KE54d0yIzKcvtOv8eikyjG3rFRtKYUyQovaoha3nondtZzXYGB3bhsvYgEegU08Iry0ndWx2+g9f5ZzD4I+0Q==",
-      "dev": true,
-      "dependencies": {
-        "css": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 12"
-      },
-      "peerDependencies": {
-        "styled-components": ">= 5"
-      }
-    },
-    "node_modules/jest-util": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.1.tgz",
-      "integrity": "sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw==",
-      "dependencies": {
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-validate": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.1.tgz",
-      "integrity": "sha512-Kpf6gcClqFCIZ4ti5++XemYJWUPCFUW+N2gknn+KgnDf549iLul3cBuKVe1YcWRlaF8tZV8eJCap0eECOEE3Ug==",
-      "dependencies": {
-        "@jest/types": "^28.1.1",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "leven": "^3.1.0",
-        "pretty-format": "^28.1.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate/node_modules/pretty-format": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-      "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-      "dependencies": {
-        "@jest/schemas": "^28.0.2",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/jest-watch-typeahead": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
-      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
-      "dependencies": {
-        "ansi-escapes": "^4.3.1",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^28.0.0",
-        "jest-watcher": "^28.0.0",
-        "slash": "^4.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "jest": "^27.0.0 || ^28.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/string-length": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-      "dependencies": {
-        "char-regex": "^2.0.0",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
-      "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
-      "engines": {
-        "node": ">=12.20"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.1.tgz",
-      "integrity": "sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug==",
-      "dependencies": {
-        "@jest/test-result": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "jest-util": "^28.1.1",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.1.tgz",
-      "integrity": "sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ==",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/js-sha3": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
-      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
-      "dev": true,
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.5.0",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.1",
-        "decimal.js": "^10.3.1",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^3.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^10.0.0",
-        "ws": "^8.2.3",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsdom/node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jsdom/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jsdom/node_modules/whatwg-url": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
-      "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
-      "dev": true,
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json-schema-faker": {
-      "version": "0.5.0-rcv.40",
-      "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.5.0-rcv.40.tgz",
-      "integrity": "sha512-BczZvu03jKrGh3ovCWrHusiX6MwiaKK2WZeyomKBNA8Nm/n7aBYz0mub1CnONB6cgxOZTNxx4afNmLblbUmZbA==",
-      "dependencies": {
-        "json-schema-ref-parser": "^6.1.0",
-        "jsonpath-plus": "^5.1.0"
-      },
-      "bin": {
-        "jsf": "bin/gen.js"
-      }
-    },
-    "node_modules/json-schema-ref-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz",
-      "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==",
-      "dependencies": {
-        "call-me-maybe": "^1.0.1",
-        "js-yaml": "^3.12.1",
-        "ono": "^4.0.11"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsonpath-plus": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-5.1.0.tgz",
-      "integrity": "sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ==",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
-      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "object.assign": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/language-subtag-registry": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-      "dev": true
-    },
-    "node_modules/language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
-      "dev": true,
-      "dependencies": {
-        "language-subtag-registry": "~0.3.2"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lilconfig": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "node_modules/lint-staged": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.2.tgz",
-      "integrity": "sha512-qQLfLTh9z34eMzfEHENC+QBskZfxjomrf+snF3xJ4BzilORbD989NLqQ00ughsF/A+PT41e87+WsMFabf9++pQ==",
-      "dev": true,
-      "dependencies": {
-        "cli-truncate": "^3.1.0",
-        "colorette": "^2.0.17",
-        "commander": "^9.3.0",
-        "debug": "^4.3.4",
-        "execa": "^6.1.0",
-        "lilconfig": "2.0.5",
-        "listr2": "^4.0.5",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "object-inspect": "^1.12.2",
-        "pidtree": "^0.6.0",
-        "string-argv": "^0.3.1",
-        "yaml": "^2.1.1"
-      },
-      "bin": {
-        "lint-staged": "bin/lint-staged.js"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/lint-staged"
-      }
-    },
-    "node_modules/lint-staged/node_modules/commander": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz",
-      "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || >=14"
-      }
-    },
-    "node_modules/lint-staged/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/lint-staged/node_modules/execa": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
-      "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.1",
-        "human-signals": "^3.0.1",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^3.0.7",
-        "strip-final-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/lint-staged/node_modules/human-signals": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
-      "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.20.0"
-      }
-    },
-    "node_modules/lint-staged/node_modules/is-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lint-staged/node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lint-staged/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/lint-staged/node_modules/npm-run-path": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lint-staged/node_modules/onetime": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-      "dev": true,
-      "dependencies": {
-        "mimic-fn": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lint-staged/node_modules/path-key": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lint-staged/node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lint-staged/node_modules/yaml": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
-      "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/listr2": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
-      "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==",
-      "dev": true,
-      "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.5.5",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
-      },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/listr2/node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-      "dev": true,
-      "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/listr2/node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
-    "node_modules/lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
-    },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-update/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/log-update/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY=",
-      "bin": {
-        "lz-string": "bin/bin.js"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "devOptional": true
-    },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dependencies": {
-        "tmpl": "1.0.5"
-      }
-    },
-    "node_modules/match-sorter": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
-      "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "remove-accents": "0.4.2"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/microseconds": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
-      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
-    "node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
-    "node_modules/nano-time": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
-      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
-      "dependencies": {
-        "big-integer": "^1.6.16"
-      }
-    },
-    "node_modules/nanoclone": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
-      "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
-    },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
-      "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.entries/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.fromentries/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/es-abstract": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.4.1",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/string.prototype.trimend/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/string.prototype.trimstart/node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dev": true,
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values/node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/oblivious-set": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
-      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ono": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz",
-      "integrity": "sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==",
-      "dependencies": {
-        "format-util": "^1.0.3"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse-ms": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
-      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pidtree": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
-      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
-      "dev": true,
-      "bin": {
-        "pidtree": "bin/pidtree.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.13",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
-      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.3",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prettier": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-      "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
-      "dev": true,
-      "bin": {
-        "prettier": "bin-prettier.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/prettier-linter-helpers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-      "dev": true,
-      "dependencies": {
-        "fast-diff": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-    },
-    "node_modules/pretty-ms": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
-      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
-      "dependencies": {
-        "parse-ms": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "node_modules/property-expr": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.4.tgz",
-      "integrity": "sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg=="
-    },
-    "node_modules/psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "dev": true
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/querystring": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
-      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/react": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.1.0.tgz",
-      "integrity": "sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-ace": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.5.0.tgz",
-      "integrity": "sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==",
-      "dependencies": {
-        "ace-builds": "^1.4.13",
-        "diff-match-patch": "^1.0.5",
-        "lodash.get": "^4.4.2",
-        "lodash.isequal": "^4.5.0",
-        "prop-types": "^15.7.2"
-      },
-      "peerDependencies": {
-        "react": "^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0",
-        "react-dom": "^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0"
-      }
-    },
-    "node_modules/react-ace/node_modules/ace-builds": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
-      "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
-    },
-    "node_modules/react-datepicker": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.5.0.tgz",
-      "integrity": "sha512-mFP/SbtFSXx21Wx3Nfv+RREwd/x0q14x7QL79ZCi/PVkHSFLwLWhXyOtj3OIzi1AcVYb/fMMcvi8e5b12n8/sg==",
-      "dependencies": {
-        "@popperjs/core": "^2.9.2",
-        "classnames": "^2.2.6",
-        "date-fns": "^2.24.0",
-        "prop-types": "^15.7.2",
-        "react-onclickoutside": "^6.12.0",
-        "react-popper": "^2.2.5"
-      },
-      "peerDependencies": {
-        "react": "^16.9.0 || ^17",
-        "react-dom": "^16.9.0 || ^17"
-      }
-    },
-    "node_modules/react-datepicker/node_modules/date-fns": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz",
-      "integrity": "sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q==",
-      "engines": {
-        "node": ">=0.11"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.1.0.tgz",
-      "integrity": "sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.22.0"
-      },
-      "peerDependencies": {
-        "react": "^18.1.0"
-      }
-    },
-    "node_modules/react-fast-compare": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
-      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
-    },
-    "node_modules/react-hook-form": {
-      "version": "7.6.9",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.6.9.tgz",
-      "integrity": "sha512-nz+btC4WFIm3zPBjw22K3t9nnJtlMMwj8slcbPYoTKlkSVA5l+q3Ai+VF0YzeRi7vbyyeGQvpyibov1xd/TV7A==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/react-hook-form"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/react-multi-select-component": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/react-multi-select-component/-/react-multi-select-component-4.0.6.tgz",
-      "integrity": "sha512-cNpDv8vh1kWkJiMsa097tTUqWLVTQn+La4aXlgoGOQVpOSH9u1fbj1+MsvnLQjTBySuDx+pzm/DpbIoma/i1Fw==",
-      "peerDependencies": {
-        "react": ">=17"
-      }
-    },
-    "node_modules/react-onclickoutside": {
-      "version": "6.12.1",
-      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.1.tgz",
-      "integrity": "sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==",
-      "funding": {
-        "type": "individual",
-        "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md"
-      },
-      "peerDependencies": {
-        "react": "^15.5.x || ^16.x || ^17.x",
-        "react-dom": "^15.5.x || ^16.x || ^17.x"
-      }
-    },
-    "node_modules/react-popper": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
-      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
-      "dependencies": {
-        "react-fast-compare": "^3.0.1",
-        "warning": "^4.0.2"
-      },
-      "peerDependencies": {
-        "@popperjs/core": "^2.0.0",
-        "react": "^16.8.0 || ^17"
-      }
-    },
-    "node_modules/react-query": {
-      "version": "3.39.1",
-      "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",
-      "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "broadcast-channel": "^3.4.1",
-        "match-sorter": "^6.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-redux": {
-      "version": "7.2.6",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz",
-      "integrity": "sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.15.4",
-        "@types/react-redux": "^7.1.20",
-        "hoist-non-react-statics": "^3.3.2",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2"
-      },
-      "peerDependencies": {
-        "react": "^16.8.3 || ^17"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-redux/node_modules/@babel/runtime": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/react-redux/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-    },
-    "node_modules/react-router-dom": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
-      "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
-      "dependencies": {
-        "history": "^5.2.0",
-        "react-router": "6.3.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
-      }
-    },
-    "node_modules/react-router-dom/node_modules/react-router": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
-      "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
-      "dependencies": {
-        "history": "^5.2.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/recrawl-sync": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recrawl-sync/-/recrawl-sync-2.2.2.tgz",
-      "integrity": "sha512-E2sI4F25Fu2nrfV+KsnC7/qfk/spQIYXlonfQoS4rwxeNK5BjxnLPbWiRXHVXPwYBOTWtPX5765kTm/zJiL+LQ==",
-      "dependencies": {
-        "@cush/relative": "^1.0.0",
-        "glob-regex": "^0.3.0",
-        "slash": "^3.0.0",
-        "tslib": "^1.9.3"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/redux": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz",
-      "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
-    "node_modules/redux-mock-store": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/redux-mock-store/-/redux-mock-store-1.5.4.tgz",
-      "integrity": "sha512-xmcA0O/tjCLXhh9Fuiq6pMrJCwFRaouA8436zcikdIpYWWCjU76CRk+i2bHx8EeiSiMGnB85/lZdU3wIJVXHTA==",
-      "dev": true,
-      "dependencies": {
-        "lodash.isplainobject": "^4.0.6"
-      }
-    },
-    "node_modules/redux-thunk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
-      "peerDependencies": {
-        "redux": "^4"
-      }
-    },
-    "node_modules/reflect-metadata": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-      "dev": true
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
-      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
-      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
-      "dev": true,
-      "dependencies": {
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.0.1",
-        "regjsgen": "^0.6.0",
-        "regjsparser": "^0.8.2",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regjsgen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
-      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
-      "dev": true
-    },
-    "node_modules/regjsparser": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
-      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
-      "dev": true,
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/remove-accents": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
-      "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/requireindex": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
-      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.5"
-      }
-    },
-    "node_modules/reselect": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.5.tgz",
-      "integrity": "sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ=="
-    },
-    "node_modules/resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-      "dependencies": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "2.72.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.72.1.tgz",
-      "integrity": "sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==",
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/rxjs/node_modules/tslib": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-      "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
-      "dev": true
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "node_modules/sass": {
-      "version": "1.52.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz",
-      "integrity": "sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==",
-      "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
-        "source-map-js": ">=0.6.2 <2.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dev": true,
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/scheduler": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.22.0.tgz",
-      "integrity": "sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/shallowequal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
-      "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
-      "dev": true,
-      "dependencies": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/spawn-command": {
-      "version": "0.0.2-1",
-      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
-      "dev": true
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/stack-utils/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-argv": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
-      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6.19"
-      }
-    },
-    "node_modules/string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dependencies": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/string-natural-compare": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
-      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
-      "dev": true
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz",
-      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.3.1",
-        "side-channel": "^1.0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.matchall/node_modules/es-abstract": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-      "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.1.1",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.4",
-        "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.1",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.1",
-        "object-inspect": "^1.11.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "string.prototype.trimend": "^1.0.4",
-        "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.matchall/node_modules/is-callable": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.matchall/node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.matchall/node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/styled-components": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.1.tgz",
-      "integrity": "sha512-JThv2JRzyH0NOIURrk9iskdxMSAAtCfj/b2Sf1WJaCUsloQkblepy1jaCLX/bYE+mhYo3unmwVSI9I5d9ncSiQ==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/traverse": "^7.4.5",
-        "@emotion/is-prop-valid": "^0.8.8",
-        "@emotion/stylis": "^0.8.4",
-        "@emotion/unitless": "^0.7.4",
-        "babel-plugin-styled-components": ">= 1.12.0",
-        "css-to-react-native": "^3.0.0",
-        "hoist-non-react-statics": "^3.0.0",
-        "shallowequal": "^1.1.0",
-        "supports-color": "^5.5.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/styled-components"
-      },
-      "peerDependencies": {
-        "react": ">= 16.8.0",
-        "react-dom": ">= 16.8.0",
-        "react-is": ">= 16.8.0"
-      }
-    },
-    "node_modules/styled-components/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/styled-components/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "node_modules/terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "node_modules/throat": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
-    },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/toposort": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
-      "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA="
-    },
-    "node_modules/tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/tree-kill": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true,
-      "bin": {
-        "tree-kill": "cli.js"
-      }
-    },
-    "node_modules/ts-jest": {
-      "version": "28.0.5",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.5.tgz",
-      "integrity": "sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==",
-      "dev": true,
-      "dependencies": {
-        "bs-logger": "0.x",
-        "fast-json-stable-stringify": "2.x",
-        "jest-util": "^28.0.0",
-        "json5": "^2.2.1",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "7.x",
-        "yargs-parser": "^21.0.1"
-      },
-      "bin": {
-        "ts-jest": "cli.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.0.0-beta.0 <8",
-        "babel-jest": "^28.0.0",
-        "jest": "^28.0.0",
-        "typescript": ">=4.3"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "babel-jest": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ts-jest/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ts-jest/node_modules/yargs-parser": {
-      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/ts-node": {
-      "version": "10.8.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz",
-      "integrity": "sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==",
-      "devOptional": true,
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
-    },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
-      "devOptional": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unload": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
-      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
-      "dependencies": {
-        "@babel/runtime": "^7.6.2",
-        "detect-node": "^2.0.4"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/use-debounce": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-8.0.1.tgz",
-      "integrity": "sha512-6tGAFJKJ0qCalecaV7/gm/M6n238nmitNppvR89ff1yfwSFjwFKR7IQZzIZf1KZRQhqNireBzytzU6jgb29oVg==",
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "devOptional": true
-    },
-    "node_modules/v8-to-istanbul": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz",
-      "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.12",
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/vite": {
-      "version": "2.9.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.11.tgz",
-      "integrity": "sha512-h1n8bAN5Psv/V+RAY3P6OtYyGSFQdusgYWiLRAk41qY7rSyH4K5Jq+RUXztzyPVB0oHbnXPUuS2Aj44jucViUA==",
-      "dependencies": {
-        "esbuild": "^0.14.27",
-        "postcss": "^8.4.13",
-        "resolve": "^1.22.0",
-        "rollup": "^2.59.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": ">=12.2.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      },
-      "peerDependencies": {
-        "less": "*",
-        "sass": "*",
-        "stylus": "*"
-      },
-      "peerDependenciesMeta": {
-        "less": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vite-tsconfig-paths": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-3.5.0.tgz",
-      "integrity": "sha512-NKIubr7gXgh/3uniQaOytSg+aKWPrjquP6anAy+zCWEn6h9fB8z2/qdlfQrTgZWaXJ2pHVlllrSdRZltHn9P4g==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "globrex": "^0.1.2",
-        "recrawl-sync": "^2.0.3",
-        "tsconfig-paths": "^4.0.0"
-      },
-      "peerDependencies": {
-        "vite": ">2.0.0-0"
-      }
-    },
-    "node_modules/vite-tsconfig-paths/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vite-tsconfig-paths/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/vite-tsconfig-paths/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/vite-tsconfig-paths/node_modules/tsconfig-paths": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz",
-      "integrity": "sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==",
-      "dependencies": {
-        "json5": "^2.2.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "dev": true,
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
-      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
-      "dev": true,
-      "dependencies": {
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dependencies": {
-        "makeerror": "1.0.12"
-      }
-    },
-    "node_modules/warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/whatwg-fetch": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
-      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "node_modules/write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16"
-      }
-    },
-    "node_modules/ws": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
-      "dev": true
-    },
-    "node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.7",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "devOptional": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/yup": {
-      "version": "0.32.11",
-      "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz",
-      "integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==",
-      "dependencies": {
-        "@babel/runtime": "^7.15.4",
-        "@types/lodash": "^4.14.175",
-        "lodash": "^4.17.21",
-        "lodash-es": "^4.17.21",
-        "nanoclone": "^0.2.1",
-        "property-expr": "^2.0.4",
-        "toposort": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yup/node_modules/@babel/runtime": {
-      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
-      "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/yup/node_modules/@types/lodash": {
-      "version": "4.14.177",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw=="
-    }
-  },
-  "dependencies": {
-    "@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-      "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-      "requires": {
-        "@babel/highlight": "^7.16.7"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz",
-      "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="
-    },
-    "@babel/core": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz",
-      "integrity": "sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==",
-      "requires": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.18.2",
-        "@babel/helper-compilation-targets": "^7.18.2",
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helpers": "^7.18.2",
-        "@babel/parser": "^7.18.0",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.18.2",
-        "@babel/types": "^7.18.2",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
-    "@babel/eslint-parser": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz",
-      "integrity": "sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==",
-      "dev": true,
-      "requires": {
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
-      "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
-      "requires": {
-        "@babel/types": "^7.18.2",
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "jsesc": "^2.5.1"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
-          "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
-          "requires": {
-            "@jridgewell/set-array": "^1.0.0",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
-          }
-        }
-      }
-    },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
-      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz",
-      "integrity": "sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==",
-      "requires": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-validator-option": "^7.16.7",
-        "browserslist": "^4.20.2",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz",
-      "integrity": "sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-member-expression-to-functions": "^7.17.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7"
-      }
-    },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz",
-      "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "regexpu-core": "^5.0.1"
-      }
-    },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-environment-visitor": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz",
-      "integrity": "sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
-      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
-      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
-      "requires": {
-        "@babel/template": "^7.16.7",
-        "@babel/types": "^7.17.0"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-      "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.17.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
-      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.17.0"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-      "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz",
-      "integrity": "sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-simple-access": "^7.17.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.18.0",
-        "@babel/types": "^7.18.0"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
-      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
-      "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-wrap-function": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz",
-      "integrity": "sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.2",
-        "@babel/helper-member-expression-to-functions": "^7.17.7",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/traverse": "^7.18.2",
-        "@babel/types": "^7.18.2"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz",
-      "integrity": "sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==",
-      "requires": {
-        "@babel/types": "^7.18.2"
-      }
-    },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
-      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.16.0"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-      "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-      "requires": {
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-      "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-      "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
-      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.8",
-        "@babel/types": "^7.16.8"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz",
-      "integrity": "sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==",
-      "requires": {
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.18.2",
-        "@babel/types": "^7.18.2"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
-      "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/parser": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz",
-      "integrity": "sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="
-    },
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
-      "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
-      "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.17.12"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz",
-      "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz",
-      "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz",
-      "integrity": "sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-decorators": {
-      "version": "7.17.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz",
-      "integrity": "sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.17.9",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/plugin-syntax-decorators": "^7.17.0",
-        "charcodes": "^0.2.0"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
-      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz",
-      "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz",
-      "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz",
-      "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz",
-      "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
-      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz",
-      "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-compilation-targets": "^7.17.10",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.17.12"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
-      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz",
-      "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz",
-      "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz",
-      "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-create-class-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz",
-      "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
-    "@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-decorators": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz",
-      "integrity": "sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-syntax-flow": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.7.tgz",
-      "integrity": "sha512-UDo3YGQO0jH6ytzVwgSLv9i/CzMcUjbKenL67dTrAZPPv6GFAtDhe6jqnvmoKzC/7htNTohhos+onPtDMqJwaQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-syntax-import-assertions": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz",
-      "integrity": "sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz",
-      "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-typescript": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz",
-      "integrity": "sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz",
-      "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz",
-      "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
-      }
-    },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
-      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz",
-      "integrity": "sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-classes": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz",
-      "integrity": "sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-environment-visitor": "^7.18.2",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-optimise-call-expression": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-replace-supers": "^7.18.2",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz",
-      "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz",
-      "integrity": "sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
-      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz",
-      "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
-      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-flow-strip-types": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.7.tgz",
-      "integrity": "sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/plugin-syntax-flow": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.18.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz",
-      "integrity": "sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
-      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-function-name": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-literals": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz",
-      "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
-      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz",
-      "integrity": "sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz",
-      "integrity": "sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-simple-access": "^7.18.2",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz",
-      "integrity": "sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "babel-plugin-dynamic-import-node": "^2.3.3"
-      }
-    },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz",
-      "integrity": "sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-transforms": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz",
-      "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz",
-      "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
-      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-replace-supers": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz",
-      "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
-      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-react-display-name": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
-      "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-react-jsx": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz",
-      "integrity": "sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-jsx": "^7.17.12",
-        "@babel/types": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
-      "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
-      "requires": {
-        "@babel/plugin-transform-react-jsx": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-react-jsx-self": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.17.12.tgz",
-      "integrity": "sha512-7S9G2B44EnYOx74mue02t1uD8ckWZ/ee6Uz/qfdzc35uWHX5NgRy9i+iJSb2LFRgMd+QV9zNcStQaazzzZ3n3Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-react-jsx-source": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.16.7.tgz",
-      "integrity": "sha512-rONFiQz9vgbsnaMtQlZCjIRwhJvlrPET8TabIUK2hzlXw9B9s2Ieaxte1SCOOXMbWRHodbKixNf3BLcWVOQ8Bw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz",
-      "integrity": "sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz",
-      "integrity": "sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "regenerator-transform": "^0.15.0"
-      }
-    },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz",
-      "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.17.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz",
-      "integrity": "sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
-      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-spread": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz",
-      "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
-      }
-    },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
-      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz",
-      "integrity": "sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz",
-      "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-typescript": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz",
-      "integrity": "sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.0",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/plugin-syntax-typescript": "^7.17.12"
-      }
-    },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
-      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
-      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7"
-      }
-    },
-    "@babel/preset-env": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz",
-      "integrity": "sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.17.10",
-        "@babel/helper-compilation-targets": "^7.18.2",
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12",
-        "@babel/plugin-proposal-async-generator-functions": "^7.17.12",
-        "@babel/plugin-proposal-class-properties": "^7.17.12",
-        "@babel/plugin-proposal-class-static-block": "^7.18.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
-        "@babel/plugin-proposal-json-strings": "^7.17.12",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.18.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.17.12",
-        "@babel/plugin-proposal-private-methods": "^7.17.12",
-        "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.17.12",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.17.12",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.17.12",
-        "@babel/plugin-transform-async-to-generator": "^7.17.12",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.17.12",
-        "@babel/plugin-transform-classes": "^7.17.12",
-        "@babel/plugin-transform-computed-properties": "^7.17.12",
-        "@babel/plugin-transform-destructuring": "^7.18.0",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.17.12",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.18.1",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.17.12",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.18.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.18.2",
-        "@babel/plugin-transform-modules-systemjs": "^7.18.0",
-        "@babel/plugin-transform-modules-umd": "^7.18.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12",
-        "@babel/plugin-transform-new-target": "^7.17.12",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.17.12",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.18.0",
-        "@babel/plugin-transform-reserved-words": "^7.17.12",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.17.12",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.18.2",
-        "@babel/plugin-transform-typeof-symbol": "^7.17.12",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.18.2",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.22.1",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      }
-    },
-    "@babel/preset-react": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.17.12.tgz",
-      "integrity": "sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-react-display-name": "^7.16.7",
-        "@babel/plugin-transform-react-jsx": "^7.17.12",
-        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-        "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
-      }
-    },
-    "@babel/preset-typescript": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz",
-      "integrity": "sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-transform-typescript": "^7.17.12"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz",
-      "integrity": "sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==",
-      "requires": {
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/runtime-corejs3": {
-      "version": "7.14.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.6.tgz",
-      "integrity": "sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==",
-      "dev": true,
-      "requires": {
-        "core-js-pure": "^3.14.0",
-        "regenerator-runtime": "^0.13.4"
-      }
-    },
-    "@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-      "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz",
-      "integrity": "sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==",
-      "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.18.2",
-        "@babel/helper-environment-visitor": "^7.18.2",
-        "@babel/helper-function-name": "^7.17.9",
-        "@babel/helper-hoist-variables": "^7.16.7",
-        "@babel/helper-split-export-declaration": "^7.16.7",
-        "@babel/parser": "^7.18.0",
-        "@babel/types": "^7.18.2",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
-    "@babel/types": {
-      "version": "7.18.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz",
-      "integrity": "sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
-    },
-    "@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "devOptional": true,
-      "requires": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "dependencies": {
-        "@jridgewell/trace-mapping": {
-          "version": "0.3.9",
-          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-          "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-          "devOptional": true,
-          "requires": {
-            "@jridgewell/resolve-uri": "^3.0.3",
-            "@jridgewell/sourcemap-codec": "^1.4.10"
-          }
-        }
-      }
-    },
-    "@cush/relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@cush/relative/-/relative-1.0.0.tgz",
-      "integrity": "sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA=="
-    },
-    "@emotion/is-prop-valid": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-      "integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
-      "requires": {
-        "@emotion/memoize": "0.7.4"
-      }
-    },
-    "@emotion/memoize": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-      "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
-    },
-    "@emotion/stylis": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-      "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
-    },
-    "@emotion/unitless": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
-      "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
-    },
-    "@eslint/eslintrc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.3.2",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@fortawesome/fontawesome-free": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz",
-      "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg=="
-    },
-    "@hookform/error-message": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@hookform/error-message/-/error-message-2.0.0.tgz",
-      "integrity": "sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==",
-      "requires": {}
-    },
-    "@hookform/resolvers": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-2.8.9.tgz",
-      "integrity": "sha512-IXwGpjewxScF4N2kuyYDip6ABqH4lCg9n1f1mp0vbmKik+u+nestpbtdEs6U1WQZxwaoK/2APv1+MEr4czX7XA==",
-      "requires": {}
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "requires": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-        },
-        "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
-        }
-      }
-    },
-    "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
-    },
-    "@jest/console": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.1.tgz",
-      "integrity": "sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA==",
-      "requires": {
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "slash": "^3.0.0"
-      }
-    },
-    "@jest/core": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.1.tgz",
-      "integrity": "sha512-3pYsBoZZ42tXMdlcFeCc/0j9kOlK7MYuXs2B1QbvDgMoW1K9NJ4G/VYvIbMb26iqlkTfPHo7SC2JgjDOk/mxXw==",
-      "requires": {
-        "@jest/console": "^28.1.1",
-        "@jest/reporters": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^28.0.2",
-        "jest-config": "^28.1.1",
-        "jest-haste-map": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.1",
-        "jest-resolve-dependencies": "^28.1.1",
-        "jest-runner": "^28.1.1",
-        "jest-runtime": "^28.1.1",
-        "jest-snapshot": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-validate": "^28.1.1",
-        "jest-watcher": "^28.1.1",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.1",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "@jest/environment": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.1.tgz",
-      "integrity": "sha512-9auVQ2GzQ7nrU+lAr8KyY838YahElTX9HVjbQPPS2XjlxQ+na18G113OoBhyBGBtD6ZnO/SrUy5WR8EzOj1/Uw==",
-      "requires": {
-        "@jest/fake-timers": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "jest-mock": "^28.1.1"
-      }
-    },
-    "@jest/expect": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.1.tgz",
-      "integrity": "sha512-/+tQprrFoT6lfkMj4mW/mUIfAmmk/+iQPmg7mLDIFOf2lyf7EBHaS+x3RbeR0VZVMe55IvX7QRoT/2aK3AuUXg==",
-      "requires": {
-        "expect": "^28.1.1",
-        "jest-snapshot": "^28.1.1"
-      }
-    },
-    "@jest/expect-utils": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.1.tgz",
-      "integrity": "sha512-n/ghlvdhCdMI/hTcnn4qV57kQuV9OTsZzH1TTCVARANKhl6hXJqLKUkwX69ftMGpsbpt96SsDD8n8LD2d9+FRw==",
-      "requires": {
-        "jest-get-type": "^28.0.2"
-      }
-    },
-    "@jest/fake-timers": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.1.tgz",
-      "integrity": "sha512-BY/3+TyLs5+q87rGWrGUY5f8e8uC3LsVHS9Diz8+FV3ARXL4sNnkLlIB8dvDvRrp+LUCGM+DLqlsYubizGUjIA==",
-      "requires": {
-        "@jest/types": "^28.1.1",
-        "@sinonjs/fake-timers": "^9.1.1",
-        "@types/node": "*",
-        "jest-message-util": "^28.1.1",
-        "jest-mock": "^28.1.1",
-        "jest-util": "^28.1.1"
-      }
-    },
-    "@jest/globals": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.1.tgz",
-      "integrity": "sha512-dEgl/6v7ToB4vXItdvcltJBgny0xBE6xy6IYQrPJAJggdEinGxCDMivNv7sFzPcTITGquXD6UJwYxfJ/5ZwDSg==",
-      "requires": {
-        "@jest/environment": "^28.1.1",
-        "@jest/expect": "^28.1.1",
-        "@jest/types": "^28.1.1"
-      }
-    },
-    "@jest/reporters": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.1.tgz",
-      "integrity": "sha512-597Zj4D4d88sZrzM4atEGLuO7SdA/YrOv9SRXHXRNC+/FwPCWxZhBAEzhXoiJzfRwn8zes/EjS8Lo6DouGN5Gg==",
-      "requires": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-worker": "^28.1.1",
-        "slash": "^3.0.0",
-        "string-length": "^4.0.1",
-        "strip-ansi": "^6.0.0",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^9.0.0"
-      }
-    },
-    "@jest/schemas": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
-      "integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
-      "requires": {
-        "@sinclair/typebox": "^0.23.3"
-      }
-    },
-    "@jest/source-map": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.0.2.tgz",
-      "integrity": "sha512-Y9dxC8ZpN3kImkk0LkK5XCEneYMAXlZ8m5bflmSL5vrwyeUpJfentacCUg6fOb8NOpOO7hz2+l37MV77T6BFPw==",
-      "requires": {
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9"
-      }
-    },
-    "@jest/test-result": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.1.tgz",
-      "integrity": "sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ==",
-      "requires": {
-        "@jest/console": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      }
-    },
-    "@jest/test-sequencer": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.1.tgz",
-      "integrity": "sha512-nuL+dNSVMcWB7OOtgb0EGH5AjO4UBCt68SLP08rwmC+iRhyuJWS9MtZ/MpipxFwKAlHFftbMsydXqWre8B0+XA==",
-      "requires": {
-        "@jest/test-result": "^28.1.1",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.1",
-        "slash": "^3.0.0"
-      }
-    },
-    "@jest/transform": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.1.tgz",
-      "integrity": "sha512-PkfaTUuvjUarl1EDr5ZQcCA++oXkFCP9QFUkG0yVKVmNObjhrqDy0kbMpMebfHWm3CCDHjYNem9eUSH8suVNHQ==",
-      "requires": {
-        "@babel/core": "^7.11.6",
-        "@jest/types": "^28.1.1",
-        "@jridgewell/trace-mapping": "^0.3.7",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.1",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.1",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "write-file-atomic": "^4.0.1"
-      }
-    },
-    "@jest/types": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.1.tgz",
-      "integrity": "sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==",
-      "requires": {
-        "@jest/schemas": "^28.0.2",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      }
-    },
-    "@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "requires": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="
-    },
-    "@jridgewell/set-array": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
-      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
-      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
-      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
-      "requires": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "@nestjs/common": {
-      "version": "8.4.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-8.4.4.tgz",
-      "integrity": "sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==",
-      "dev": true,
-      "requires": {
-        "axios": "0.26.1",
-        "iterare": "1.2.1",
-        "tslib": "2.3.1",
-        "uuid": "8.3.2"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-          "dev": true
-        }
-      }
-    },
-    "@nestjs/core": {
-      "version": "8.4.4",
-      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-8.4.4.tgz",
-      "integrity": "sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==",
-      "dev": true,
-      "requires": {
-        "@nuxtjs/opencollective": "0.3.2",
-        "fast-safe-stringify": "2.1.1",
-        "iterare": "1.2.1",
-        "object-hash": "3.0.0",
-        "path-to-regexp": "3.2.0",
-        "tslib": "2.3.1",
-        "uuid": "8.3.2"
-      },
-      "dependencies": {
-        "path-to-regexp": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",
-          "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==",
-          "dev": true
-        },
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
-          "dev": true
-        }
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz",
-      "integrity": "sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@nuxtjs/opencollective": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz",
-      "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "consola": "^2.15.0",
-        "node-fetch": "^2.6.1"
-      }
-    },
-    "@openapitools/openapi-generator-cli": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.5.1.tgz",
-      "integrity": "sha512-WSRQBU0dCSVD+0Qv8iCsv0C4iMaZe/NpJ/CT4SmrEYLH3txoKTE8wEfbdj/kqShS8Or0YEGDPUzhSIKY151L0w==",
-      "dev": true,
-      "requires": {
-        "@nestjs/common": "8.4.4",
-        "@nestjs/core": "8.4.4",
-        "@nuxtjs/opencollective": "0.3.2",
-        "chalk": "4.1.2",
-        "commander": "8.3.0",
-        "compare-versions": "4.1.3",
-        "concurrently": "6.5.1",
-        "console.table": "0.10.0",
-        "fs-extra": "10.0.1",
-        "glob": "7.1.6",
-        "inquirer": "8.2.2",
-        "lodash": "4.17.21",
-        "reflect-metadata": "0.1.13",
-        "rxjs": "7.5.5",
-        "tslib": "2.0.3"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "fs-extra": {
-          "version": "10.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
-          "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "tslib": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==",
-          "dev": true
-        }
-      }
-    },
-    "@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
-      "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
-    },
-    "@reduxjs/toolkit": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.8.2.tgz",
-      "integrity": "sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==",
-      "requires": {
-        "immer": "^9.0.7",
-        "redux": "^4.1.2",
-        "redux-thunk": "^2.4.1",
-        "reselect": "^4.1.5"
-      }
-    },
-    "@rooks/use-outside-click-ref": {
-      "version": "4.11.2",
-      "resolved": "https://registry.npmjs.org/@rooks/use-outside-click-ref/-/use-outside-click-ref-4.11.2.tgz",
-      "integrity": "sha512-w2bCW69zcpLh0KmN/odAuBsQ3sps+73KEu7zMOi0o4YMfDo+tXcqwlTJiLYysd0BEoQC9pNIklzZmI9zZep69g==",
-      "requires": {}
-    },
-    "@rushstack/eslint-patch": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
-      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
-      "dev": true
-    },
-    "@sinclair/typebox": {
-      "version": "0.23.5",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
-      "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg=="
-    },
-    "@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-      "requires": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "@sinonjs/fake-timers": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-      "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
-      "requires": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "@testing-library/dom": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.13.0.tgz",
-      "integrity": "sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==",
-      "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
-        "pretty-format": "^27.0.2"
-      },
-      "dependencies": {
-        "aria-query": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-          "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg=="
-        },
-        "dom-accessibility-api": {
-          "version": "0.5.10",
-          "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz",
-          "integrity": "sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g=="
-        }
-      }
-    },
-    "@testing-library/jest-dom": {
-      "version": "5.16.4",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz",
-      "integrity": "sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
-        "aria-query": "^5.0.0",
-        "chalk": "^3.0.0",
-        "css": "^3.0.0",
-        "css.escape": "^1.5.1",
-        "dom-accessibility-api": "^0.5.6",
-        "lodash": "^4.17.15",
-        "redent": "^3.0.0"
-      },
-      "dependencies": {
-        "aria-query": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz",
-          "integrity": "sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        }
-      }
-    },
-    "@testing-library/react": {
-      "version": "13.2.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.2.0.tgz",
-      "integrity": "sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^8.5.0",
-        "@types/react-dom": "^18.0.0"
-      }
-    },
-    "@testing-library/user-event": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
-      "integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5"
-      }
-    },
-    "@tootallnate/once": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-      "dev": true
-    },
-    "@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "devOptional": true
-    },
-    "@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "devOptional": true
-    },
-    "@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "devOptional": true
-    },
-    "@tsconfig/node16": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
-      "devOptional": true
-    },
-    "@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="
-    },
-    "@types/babel__core": {
-      "version": "7.1.19",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__traverse": {
-      "version": "7.17.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
-      "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
-      "requires": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "@types/eventsource": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@types/eventsource/-/eventsource-1.1.8.tgz",
-      "integrity": "sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==",
-      "dev": true
-    },
-    "@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/history": {
-      "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
-      "dev": true
-    },
-    "@types/hoist-non-react-statics": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
-      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
-      "requires": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
-      }
-    },
-    "@types/istanbul-lib-coverage": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="
-    },
-    "@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "requires": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "requires": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "@types/jest": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-28.1.3.tgz",
-      "integrity": "sha512-Tsbjk8Y2hkBaY/gJsataeb4q9Mubw9EOz7+4RjPkzD5KjTvHHs7cpws22InaoXxAVAhF5HfFbzJjo6oKWqSZLw==",
-      "dev": true,
-      "requires": {
-        "jest-matcher-utils": "^28.0.0",
-        "pretty-format": "^28.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-          "dev": true
-        }
-      }
-    },
-    "@types/jsdom": {
-      "version": "16.2.14",
-      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.14.tgz",
-      "integrity": "sha512-6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/parse5": "*",
-        "@types/tough-cookie": "*"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "@types/lodash": {
-      "version": "4.14.177",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-      "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "16.11.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
-      "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
-    },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
-    },
-    "@types/parse5": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz",
-      "integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==",
-      "dev": true
-    },
-    "@types/prettier": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
-      "integrity": "sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg=="
-    },
-    "@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-    },
-    "@types/react": {
-      "version": "18.0.9",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz",
-      "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==",
-      "requires": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "@types/react-datepicker": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.3.4.tgz",
-      "integrity": "sha512-5nTTz37KdTUgMZ1AAxztMWNtEnIMVRo8oCAEhIv0a6uUqDjvSKaMyPRpBV+8chi6f/A8wlTKJIpojpXca2dx3A==",
-      "dev": true,
-      "requires": {
-        "@popperjs/core": "^2.9.2",
-        "@types/react": "*",
-        "date-fns": "^2.0.1",
-        "react-popper": "^2.2.5"
-      }
-    },
-    "@types/react-dom": {
-      "version": "18.0.5",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz",
-      "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-redux": {
-      "version": "7.1.24",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz",
-      "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==",
-      "requires": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
-    "@types/react-router": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.18.tgz",
-      "integrity": "sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==",
-      "dev": true,
-      "requires": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*"
-      }
-    },
-    "@types/react-router-dom": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
-      "dev": true,
-      "requires": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*",
-        "@types/react-router": "*"
-      }
-    },
-    "@types/redux-mock-store": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/redux-mock-store/-/redux-mock-store-1.0.3.tgz",
-      "integrity": "sha512-Wqe3tJa6x9MxMN4DJnMfZoBRBRak1XTPklqj4qkVm5VBpZnC8PSADf4kLuFQ9NAdHaowfWoEeUMz7NWc2GMtnA==",
-      "dev": true,
-      "requires": {
-        "redux": "^4.0.5"
-      }
-    },
-    "@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
-    },
-    "@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
-    },
-    "@types/styled-components": {
-      "version": "5.1.18",
-      "resolved": "https://registry.npmjs.org/@types/styled-components/-/styled-components-5.1.18.tgz",
-      "integrity": "sha512-xPTYmWP7Mxk5TAD3pYsqjwA9G5fAI8e/S51QUJEl7EQD1siKCdiYXIWiH2lzoHRl+QqbQCJMcGv3YTF3OmyPdQ==",
-      "dev": true,
-      "requires": {
-        "@types/hoist-non-react-statics": "*",
-        "@types/react": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "@types/testing-library__jest-dom": {
-      "version": "5.14.1",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz",
-      "integrity": "sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw==",
-      "dev": true,
-      "requires": {
-        "@types/jest": "*"
-      }
-    },
-    "@types/tough-cookie": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
-      "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
-      "dev": true
-    },
-    "@types/yargs": {
-      "version": "17.0.10",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
-      "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
-      "requires": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA=="
-    },
-    "@types/yup": {
-      "version": "0.29.13",
-      "resolved": "https://registry.npmjs.org/@types/yup/-/yup-0.29.13.tgz",
-      "integrity": "sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g=="
-    },
-    "@typescript-eslint/eslint-plugin": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
-      "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/type-utils": "5.29.0",
-        "@typescript-eslint/utils": "5.29.0",
-        "debug": "^4.3.4",
-        "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.2.0",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/experimental-utils": {
-      "version": "5.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.23.0.tgz",
-      "integrity": "sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/utils": "5.23.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/scope-manager": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz",
-          "integrity": "sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/visitor-keys": "5.23.0"
-          }
-        },
-        "@typescript-eslint/types": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.23.0.tgz",
-          "integrity": "sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz",
-          "integrity": "sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/visitor-keys": "5.23.0",
-            "debug": "^4.3.2",
-            "globby": "^11.0.4",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.5",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/utils": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.23.0.tgz",
-          "integrity": "sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "@typescript-eslint/scope-manager": "5.23.0",
-            "@typescript-eslint/types": "5.23.0",
-            "@typescript-eslint/typescript-estree": "5.23.0",
-            "eslint-scope": "^5.1.1",
-            "eslint-utils": "^3.0.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.23.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz",
-          "integrity": "sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.23.0",
-            "eslint-visitor-keys": "^3.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/parser": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
-      "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/typescript-estree": "5.29.0",
-        "debug": "^4.3.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/scope-manager": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
-      "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/visitor-keys": "5.29.0"
-      }
-    },
-    "@typescript-eslint/type-utils": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz",
-      "integrity": "sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/utils": "5.29.0",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/types": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
-      "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
-      "dev": true
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
-      "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/visitor-keys": "5.29.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/utils": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
-      "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.29.0",
-        "@typescript-eslint/types": "5.29.0",
-        "@typescript-eslint/typescript-estree": "5.29.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
-      }
-    },
-    "@typescript-eslint/visitor-keys": {
-      "version": "5.29.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
-      "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.29.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        }
-      }
-    },
-    "@vitejs/plugin-react": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-1.3.2.tgz",
-      "integrity": "sha512-aurBNmMo0kz1O4qRoY+FM4epSA39y3ShWGuqfLRA/3z0oEJAdtoSfgA3aO98/PCCHAqMaduLxIxErWrVKIFzXA==",
-      "requires": {
-        "@babel/core": "^7.17.10",
-        "@babel/plugin-transform-react-jsx": "^7.17.3",
-        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-        "@babel/plugin-transform-react-jsx-self": "^7.16.7",
-        "@babel/plugin-transform-react-jsx-source": "^7.16.7",
-        "@rollup/pluginutils": "^4.2.1",
-        "react-refresh": "^0.13.0",
-        "resolve": "^1.22.0"
-      },
-      "dependencies": {
-        "@rollup/pluginutils": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
-          "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
-          "requires": {
-            "estree-walker": "^2.0.1",
-            "picomatch": "^2.2.2"
-          }
-        },
-        "estree-walker": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-          "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-        },
-        "react-refresh": {
-          "version": "0.13.0",
-          "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.13.0.tgz",
-          "integrity": "sha512-XP8A9BT0CpRBD+NYLLeIhld/RqG9+gktUjW1FkE+Vm7OCinbG1SshcK5tb9ls4kzvjZr9mOQc7HYgBngEyPAXg=="
-        }
-      }
-    },
-    "abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-      "dev": true
-    },
-    "ace-builds": {
-      "version": "1.4.13",
-      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
-      "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
-    },
-    "acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-      "devOptional": true
-    },
-    "acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-          "dev": true
-        },
-        "acorn-walk": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-          "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-          "dev": true
-        }
-      }
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "devOptional": true
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dev": true,
-      "requires": {
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "ajv": {
-      "version": "8.8.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
-      "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "requires": {
-        "type-fest": "^0.21.3"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.21.3",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-          "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
-        }
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      },
-      "dependencies": {
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        }
-      }
-    },
-    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "devOptional": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      }
-    },
-    "array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "dependencies": {
-        "define-properties": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-          "dev": true,
-          "requires": {
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
-    "array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
-      "dev": true
-    },
-    "astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "axe-core": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.5.tgz",
-      "integrity": "sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==",
-      "dev": true
-    },
-    "axios": {
-      "version": "0.26.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
-      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
-      "dev": true,
-      "requires": {
-        "follow-redirects": "^1.14.8"
-      }
-    },
-    "axobject-query": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-      "dev": true
-    },
-    "babel-jest": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.1.tgz",
-      "integrity": "sha512-MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw==",
-      "requires": {
-        "@jest/transform": "^28.1.1",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^28.1.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      }
-    },
-    "babel-plugin-dynamic-import-node": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-      "dev": true,
-      "requires": {
-        "object.assign": "^4.1.0"
-      }
-    },
-    "babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      }
-    },
-    "babel-plugin-jest-hoist": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.1.tgz",
-      "integrity": "sha512-NovGCy5Hn25uMJSAU8FaHqzs13cFoOI4lhIujiepssjCKRsAo3TA734RDWSGxuFTsUJXerYOqQQodlxgmtqbzw==",
-      "requires": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
-      }
-    },
-    "babel-plugin-macros": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "cosmiconfig": "^7.0.0",
-        "resolve": "^1.19.0"
-      }
-    },
-    "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
-      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "semver": "^6.1.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "babel-plugin-polyfill-corejs3": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
-      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.21.0"
-      }
-    },
-    "babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
-      }
-    },
-    "babel-plugin-styled-components": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz",
-      "integrity": "sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-module-imports": "^7.0.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "lodash": "^4.17.11"
-      }
-    },
-    "babel-plugin-syntax-jsx": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
-      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
-    },
-    "babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==",
-      "dev": true
-    },
-    "babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "requires": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      }
-    },
-    "babel-preset-jest": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.1.tgz",
-      "integrity": "sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g==",
-      "requires": {
-        "babel-plugin-jest-hoist": "^28.1.1",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      }
-    },
-    "babel-preset-react-app": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
-      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-proposal-class-properties": "^7.16.0",
-        "@babel/plugin-proposal-decorators": "^7.16.4",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-private-methods": "^7.16.0",
-        "@babel/plugin-transform-flow-strip-types": "^7.16.0",
-        "@babel/plugin-transform-react-display-name": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.4",
-        "@babel/preset-env": "^7.16.4",
-        "@babel/preset-react": "^7.16.0",
-        "@babel/preset-typescript": "^7.16.0",
-        "@babel/runtime": "^7.16.3",
-        "babel-plugin-macros": "^3.1.0",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.17.9",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz",
-          "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
-          "dev": true,
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        }
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "big-integer": {
-      "version": "1.6.51",
-      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
-    },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
-    },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
-    "broadcast-channel": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz",
-      "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==",
-      "requires": {
-        "@babel/runtime": "^7.7.2",
-        "detect-node": "^2.1.0",
-        "js-sha3": "0.8.0",
-        "microseconds": "0.2.0",
-        "nano-time": "1.0.0",
-        "oblivious-set": "1.0.0",
-        "rimraf": "3.0.2",
-        "unload": "2.2.0"
-      }
-    },
-    "browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-      "dev": true
-    },
-    "browserslist": {
-      "version": "4.20.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz",
-      "integrity": "sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==",
-      "requires": {
-        "caniuse-lite": "^1.0.30001349",
-        "electron-to-chromium": "^1.4.147",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.5",
-        "picocolors": "^1.0.0"
-      }
-    },
-    "bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-      "dev": true,
-      "requires": {
-        "fast-json-stable-stringify": "2.x"
-      }
-    },
-    "bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "requires": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "bulma": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.3.tgz",
-      "integrity": "sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g=="
-    },
-    "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      }
-    },
-    "call-me-maybe": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-      "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms="
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-    },
-    "camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
-    },
-    "camelize": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz",
-      "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001352",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001352.tgz",
-      "integrity": "sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA=="
-    },
-    "chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
-    },
-    "charcodes": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
-      "integrity": "sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==",
-      "dev": true
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "chokidar": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
-      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
-      "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      }
-    },
-    "ci-info": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.1.tgz",
-      "integrity": "sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg=="
-    },
-    "cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
-    },
-    "classnames": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
-      "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
-    },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
-      "dev": true
-    },
-    "cli-truncate": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz",
-      "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==",
-      "dev": true,
-      "requires": {
-        "slice-ansi": "^5.0.0",
-        "string-width": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "9.2.2",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-          "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-          "dev": true,
-          "requires": {
-            "eastasianwidth": "^0.2.0",
-            "emoji-regex": "^9.2.2",
-            "strip-ansi": "^7.0.1"
-          }
-        },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^6.0.1"
-          }
-        }
-      }
-    },
-    "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true
-    },
-    "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
-    },
-    "collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "dev": true
-    },
-    "compare-versions": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-4.1.3.tgz",
-      "integrity": "sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concurrently": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.5.1.tgz",
-      "integrity": "sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "date-fns": "^2.16.1",
-        "lodash": "^4.17.21",
-        "rxjs": "^6.6.3",
-        "spawn-command": "^0.0.2-1",
-        "supports-color": "^8.1.0",
-        "tree-kill": "^1.2.2",
-        "yargs": "^16.2.0"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "6.6.7",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
-          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.9.0"
-          }
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
-      "dev": true
-    },
-    "consola": {
-      "version": "2.15.3",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
-      "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
-      "dev": true
-    },
-    "console.table": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/console.table/-/console.table-0.10.0.tgz",
-      "integrity": "sha1-CRcCVYiHW+/XDPLv9L7yxuLXXQQ=",
-      "dev": true,
-      "requires": {
-        "easy-table": "1.1.0"
-      }
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        }
-      }
-    },
-    "core-js": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.14.0.tgz",
-      "integrity": "sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA=="
-    },
-    "core-js-compat": {
-      "version": "3.22.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.5.tgz",
-      "integrity": "sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.20.3",
-        "semver": "7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
-        }
-      }
-    },
-    "core-js-pure": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.14.0.tgz",
-      "integrity": "sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==",
-      "dev": true
-    },
-    "cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dev": true,
-      "requires": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      }
-    },
-    "create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "devOptional": true
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "css": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
-      "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.4",
-        "source-map": "^0.6.1",
-        "source-map-resolve": "^0.6.0"
-      }
-    },
-    "css-color-keywords": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU="
-    },
-    "css-to-react-native": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz",
-      "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==",
-      "requires": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "css.escape": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=",
-      "dev": true
-    },
-    "cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
-      "dev": true
-    },
-    "cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dev": true,
-      "requires": {
-        "cssom": "~0.3.6"
-      },
-      "dependencies": {
-        "cssom": {
-          "version": "0.3.8",
-          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-          "dev": true
-        }
-      }
-    },
-    "csstype": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
-      "integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
-    },
-    "damerau-levenshtein": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
-      "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==",
-      "dev": true
-    },
-    "data-urls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
-      },
-      "dependencies": {
-        "tr46": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-          "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-          "dev": true,
-          "requires": {
-            "punycode": "^2.1.1"
-          }
-        },
-        "webidl-conversions": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-          "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-          "dev": true
-        },
-        "whatwg-url": {
-          "version": "11.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-          "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
-          "dev": true,
-          "requires": {
-            "tr46": "^3.0.0",
-            "webidl-conversions": "^7.0.0"
-          }
-        }
-      }
-    },
-    "date-fns": {
-      "version": "2.23.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
-      "integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==",
-      "dev": true
-    },
-    "dayjs": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz",
-      "integrity": "sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "decimal.js": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true
-    },
-    "detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
-    },
-    "detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
-    "diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "devOptional": true
-    },
-    "diff-match-patch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz",
-      "integrity": "sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="
-    },
-    "diff-sequences": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz",
-      "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw=="
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "dom-accessibility-api": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.6.tgz",
-      "integrity": "sha512-DplGLZd8L1lN64jlT27N9TVSESFR5STaEJvX+thCby7fuCHonfPpAlodYc3vuUYbDuDec5w8AMP7oCM5TWFsqw==",
-      "dev": true
-    },
-    "domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "dev": true,
-      "requires": {
-        "webidl-conversions": "^7.0.0"
-      },
-      "dependencies": {
-        "webidl-conversions": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-          "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-          "dev": true
-        }
-      }
-    },
-    "dotenv": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",
-      "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==",
-      "dev": true
-    },
-    "eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true
-    },
-    "easy-table": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz",
-      "integrity": "sha1-hvmrTBAvA3G3KXuSplHVgkvIy3M=",
-      "dev": true,
-      "requires": {
-        "wcwidth": ">=1.0.1"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.4.151",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.151.tgz",
-      "integrity": "sha512-XaG2LpZi9fdiWYOqJh0dJy4SlVywCvpgYXhzOlZTp4JqSKqxn5URqOjbm9OMYB3aInA2GuHQiem1QUOc1yT0Pw=="
-    },
-    "emittery": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
-      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw=="
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "esbuild": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.43.tgz",
-      "integrity": "sha512-Uf94+kQmy/5jsFwKWiQB4hfo/RkM9Dh7b79p8yqd1tshULdr25G2szLz631NoH3s2ujnKEKVD16RmOxvCNKRFA==",
-      "requires": {
-        "esbuild-android-64": "0.14.43",
-        "esbuild-android-arm64": "0.14.43",
-        "esbuild-darwin-64": "0.14.43",
-        "esbuild-darwin-arm64": "0.14.43",
-        "esbuild-freebsd-64": "0.14.43",
-        "esbuild-freebsd-arm64": "0.14.43",
-        "esbuild-linux-32": "0.14.43",
-        "esbuild-linux-64": "0.14.43",
-        "esbuild-linux-arm": "0.14.43",
-        "esbuild-linux-arm64": "0.14.43",
-        "esbuild-linux-mips64le": "0.14.43",
-        "esbuild-linux-ppc64le": "0.14.43",
-        "esbuild-linux-riscv64": "0.14.43",
-        "esbuild-linux-s390x": "0.14.43",
-        "esbuild-netbsd-64": "0.14.43",
-        "esbuild-openbsd-64": "0.14.43",
-        "esbuild-sunos-64": "0.14.43",
-        "esbuild-windows-32": "0.14.43",
-        "esbuild-windows-64": "0.14.43",
-        "esbuild-windows-arm64": "0.14.43"
-      }
-    },
-    "esbuild-android-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.43.tgz",
-      "integrity": "sha512-kqFXAS72K6cNrB6RiM7YJ5lNvmWRDSlpi7ZuRZ1hu1S3w0zlwcoCxWAyM23LQUyZSs1PbjHgdbbfYAN8IGh6xg==",
-      "optional": true
-    },
-    "esbuild-android-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.43.tgz",
-      "integrity": "sha512-bKS2BBFh+7XZY9rpjiHGRNA7LvWYbZWP87pLehggTG7tTaCDvj8qQGOU/OZSjCSKDYbgY7Q+oDw8RlYQ2Jt2BA==",
-      "optional": true
-    },
-    "esbuild-darwin-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.43.tgz",
-      "integrity": "sha512-/3PSilx011ttoieRGkSZ0XV8zjBf2C9enV4ScMMbCT4dpx0mFhMOpFnCHkOK0pWGB8LklykFyHrWk2z6DENVUg==",
-      "optional": true
-    },
-    "esbuild-darwin-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.43.tgz",
-      "integrity": "sha512-1HyFUKs8DMCBOvw1Qxpr5Vv/ThNcVIFb5xgXWK3pyT40WPvgYIiRTwJCvNs4l8i5qWF8/CK5bQxJVDjQvtv0Yw==",
-      "optional": true
-    },
-    "esbuild-freebsd-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.43.tgz",
-      "integrity": "sha512-FNWc05TPHYgaXjbPZO5/rJKSBslfG6BeMSs8GhwnqAKP56eEhvmzwnIz1QcC9cRVyO+IKqWNfmHFkCa1WJTULA==",
-      "optional": true
-    },
-    "esbuild-freebsd-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.43.tgz",
-      "integrity": "sha512-amrYopclz3VohqisOPR6hA3GOWA3LZC1WDLnp21RhNmoERmJ/vLnOpnrG2P/Zao+/erKTCUqmrCIPVtj58DRoA==",
-      "optional": true
-    },
-    "esbuild-linux-32": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.43.tgz",
-      "integrity": "sha512-KoxoEra+9O3AKVvgDFvDkiuddCds6q71owSQEYwjtqRV7RwbPzKxJa6+uyzUulHcyGVq0g15K0oKG5CFBcvYDw==",
-      "optional": true
-    },
-    "esbuild-linux-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.43.tgz",
-      "integrity": "sha512-EwINwGMyiJMgBby5/SbMqKcUhS5AYAZ2CpEBzSowsJPNBJEdhkCTtEjk757TN/wxgbu3QklqDM6KghY660QCUw==",
-      "optional": true
-    },
-    "esbuild-linux-arm": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.43.tgz",
-      "integrity": "sha512-e6YzQUoDxxtyamuF12eVzzRC7bbEFSZohJ6igQB9tBqnNmIQY3fI6Cns3z2wxtbZ3f2o6idkD2fQnlvs2902Dg==",
-      "optional": true
-    },
-    "esbuild-linux-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.43.tgz",
-      "integrity": "sha512-UlSpjMWllAc70zYbHxWuDS3FJytyuR/gHJYBr8BICcTNb/TSOYVBg6U7b3jZ3mILTrgzwJUHwhEwK18FZDouUQ==",
-      "optional": true
-    },
-    "esbuild-linux-mips64le": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.43.tgz",
-      "integrity": "sha512-f+v8cInPEL1/SDP//CfSYzcDNgE4CY3xgDV81DWm3KAPWzhvxARrKxB1Pstf5mB56yAslJDxu7ryBUPX207EZA==",
-      "optional": true
-    },
-    "esbuild-linux-ppc64le": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.43.tgz",
-      "integrity": "sha512-5wZYMDGAL/K2pqkdIsW+I4IR41kyfHr/QshJcNpUfK3RjB3VQcPWOaZmc+74rm4ZjVirYrtz+jWw0SgxtxRanA==",
-      "optional": true
-    },
-    "esbuild-linux-riscv64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.43.tgz",
-      "integrity": "sha512-lYcAOUxp85hC7lSjycJUVSmj4/9oEfSyXjb/ua9bNl8afonaduuqtw7hvKMoKuYnVwOCDw4RSfKpcnIRDWq+Bw==",
-      "optional": true
-    },
-    "esbuild-linux-s390x": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.43.tgz",
-      "integrity": "sha512-27e43ZhHvhFE4nM7HqtUbMRu37I/4eNSUbb8FGZWszV+uLzMIsHDwLoBiJmw7G9N+hrehNPeQ4F5Ujad0DrUKQ==",
-      "optional": true
-    },
-    "esbuild-netbsd-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.43.tgz",
-      "integrity": "sha512-2mH4QF6hHBn5zzAfxEI/2eBC0mspVsZ6UVo821LpAJKMvLJPBk3XJO5xwg7paDqSqpl7p6IRrAenW999AEfJhQ==",
-      "optional": true
-    },
-    "esbuild-openbsd-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.43.tgz",
-      "integrity": "sha512-ZhQpiZjvqCqO8jKdGp9+8k9E/EHSA+zIWOg+grwZasI9RoblqJ1QiZqqi7jfd6ZrrG1UFBNGe4m0NFxCFbMVbg==",
-      "optional": true
-    },
-    "esbuild-sunos-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.43.tgz",
-      "integrity": "sha512-DgxSi9DaHReL9gYuul2rrQCAapgnCJkh3LSHPKsY26zytYppG0HgkgVF80zjIlvEsUbGBP/GHQzBtrezj/Zq1Q==",
-      "optional": true
-    },
-    "esbuild-windows-32": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.43.tgz",
-      "integrity": "sha512-Ih3+2O5oExiqm0mY6YYE5dR0o8+AspccQ3vIAtRodwFvhuyGLjb0Hbmzun/F3Lw19nuhPMu3sW2fqIJ5xBxByw==",
-      "optional": true
-    },
-    "esbuild-windows-64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.43.tgz",
-      "integrity": "sha512-8NsuNfI8xwFuJbrCuI+aBqNTYkrWErejFO5aYM+yHqyHuL8mmepLS9EPzAzk8rvfaJrhN0+RvKWAcymViHOKEw==",
-      "optional": true
-    },
-    "esbuild-windows-arm64": {
-      "version": "0.14.43",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.43.tgz",
-      "integrity": "sha512-7ZlD7bo++kVRblJEoG+cepljkfP8bfuTPz5fIXzptwnPaFwGS6ahvfoYzY7WCf5v/1nX2X02HDraVItTgbHnKw==",
-      "optional": true
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "requires": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        },
-        "levn": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2"
-          }
-        },
-        "optionator": {
-          "version": "0.8.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-          "dev": true,
-          "requires": {
-            "deep-is": "~0.1.3",
-            "fast-levenshtein": "~2.0.6",
-            "levn": "~0.3.0",
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2",
-            "word-wrap": "~1.2.3"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-          "dev": true
-        },
-        "type-check": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.2"
-          }
-        }
-      }
-    },
-    "eslint": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
-      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
-      "dev": true,
-      "requires": {
-        "@eslint/eslintrc": "^1.3.0",
-        "@humanwhocodes/config-array": "^0.9.2",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.2",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "eslint-scope": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^5.2.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        },
-        "glob-parent": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.3"
-          }
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-config-airbnb": {
-      "version": "19.0.4",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz",
-      "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==",
-      "dev": true,
-      "requires": {
-        "eslint-config-airbnb-base": "^15.0.0",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.19.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.1",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.1",
-            "object-inspect": "^1.11.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "object.entries": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-          "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.19.1"
-          }
-        }
-      }
-    },
-    "eslint-config-airbnb-base": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz",
-      "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==",
-      "dev": true,
-      "requires": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.19.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.1",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.1",
-            "object-inspect": "^1.11.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "object.entries": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-          "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.19.1"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-config-airbnb-typescript": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-17.0.0.tgz",
-      "integrity": "sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==",
-      "dev": true,
-      "requires": {
-        "eslint-config-airbnb-base": "^15.0.0"
-      }
-    },
-    "eslint-config-prettier": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
-      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-config-react-app": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
-      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.16.0",
-        "@babel/eslint-parser": "^7.16.3",
-        "@rushstack/eslint-patch": "^1.1.0",
-        "@typescript-eslint/eslint-plugin": "^5.5.0",
-        "@typescript-eslint/parser": "^5.5.0",
-        "babel-preset-react-app": "^10.0.1",
-        "confusing-browser-globals": "^1.0.11",
-        "eslint-plugin-flowtype": "^8.0.3",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jest": "^25.3.0",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.27.1",
-        "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-testing-library": "^5.0.1"
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-import-resolver-typescript": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.1.tgz",
-      "integrity": "sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.3.4",
-        "glob": "^7.2.0",
-        "is-glob": "^4.0.3",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "glob": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "tsconfig-paths": {
-          "version": "3.14.1",
-          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-          "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-          "dev": true,
-          "requires": {
-            "@types/json5": "^0.0.29",
-            "json5": "^1.0.1",
-            "minimist": "^1.2.6",
-            "strip-bom": "^3.0.0"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
-      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "find-up": "^2.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-flowtype": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
-      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.21",
-        "string-natural-compare": "^3.0.1"
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        }
-      }
-    },
-    "eslint-plugin-jest": {
-      "version": "25.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
-      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/experimental-utils": "^5.0.0"
-      }
-    },
-    "eslint-plugin-jest-dom": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-4.0.2.tgz",
-      "integrity": "sha512-Jo51Atwyo2TdcUncjmU+UQeSTKh3sc2LF/M5i/R3nTU0Djw9V65KGJisdm/RtuKhy2KH/r7eQ1n6kwYFPNdHlA==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.16.3",
-        "@testing-library/dom": "^8.11.1",
-        "requireindex": "^1.2.0"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-          "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-          "dev": true,
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        }
-      }
-    },
-    "eslint-plugin-jsx-a11y": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
-      "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.16.3",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.4",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.3.5",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.7",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.2.1",
-        "language-tags": "^1.0.5",
-        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-          "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-          "dev": true,
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        },
-        "array-includes": {
-          "version": "3.1.4",
-          "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.4.tgz",
-          "integrity": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "es-abstract": "^1.19.1",
-            "get-intrinsic": "^1.1.1",
-            "is-string": "^1.0.7"
-          }
-        },
-        "emoji-regex": {
-          "version": "9.2.2",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-          "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-          "dev": true
-        },
-        "es-abstract": {
-          "version": "1.19.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.1",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.1",
-            "object-inspect": "^1.11.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "jsx-ast-utils": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz",
-          "integrity": "sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA==",
-          "dev": true,
-          "requires": {
-            "array-includes": "^3.1.3",
-            "object.assign": "^4.1.2"
-          }
-        }
-      }
-    },
-    "eslint-plugin-prettier": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz",
-      "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==",
-      "dev": true,
-      "requires": {
-        "prettier-linter-helpers": "^1.0.0"
-      }
-    },
-    "eslint-plugin-react": {
-      "version": "7.29.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz",
-      "integrity": "sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flatmap": "^1.2.5",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.1.0",
-        "object.values": "^1.1.5",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.3",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.6"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "prop-types": {
-          "version": "15.8.1",
-          "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-          "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-          "dev": true,
-          "requires": {
-            "loose-envify": "^1.4.0",
-            "object-assign": "^4.1.1",
-            "react-is": "^16.13.1"
-          }
-        },
-        "resolve": {
-          "version": "2.0.0-next.3",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz",
-          "integrity": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.2.0",
-            "path-parse": "^1.0.6"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-react-hooks": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.5.0.tgz",
-      "integrity": "sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==",
-      "dev": true,
-      "requires": {}
-    },
-    "eslint-plugin-testing-library": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.5.0.tgz",
-      "integrity": "sha512-eWQ19l6uWL7LW8oeMyQVSGjVYFnBqk7DMHjadm0yOHBvX3Xi9OBrsNuxoAMdX4r7wlQ5WWpW46d+CB6FWFL/PQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/utils": "^5.13.0"
-      }
-    },
-    "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true
-    },
-    "espree": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.7.1",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        }
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-    },
-    "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-          "dev": true
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "requires": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      }
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
-    },
-    "expect": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.1.tgz",
-      "integrity": "sha512-/AANEwGL0tWBwzLNOvO0yUdy2D52jVdNXppOqswC49sxMN2cPWsGCQdzuIf9tj6hHoBQzNvx75JUYuQAckPo3w==",
-      "requires": {
-        "@jest/expect-utils": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "jest-matcher-utils": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-util": "^28.1.1"
-      }
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "3.2.11",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "fast-safe-stringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
-      "dev": true,
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-      "requires": {
-        "bser": "2.1.1"
-      }
-    },
-    "fetch-mock": {
-      "version": "9.11.0",
-      "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-9.11.0.tgz",
-      "integrity": "sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==",
-      "requires": {
-        "@babel/core": "^7.0.0",
-        "@babel/runtime": "^7.0.0",
-        "core-js": "^3.0.0",
-        "debug": "^4.1.1",
-        "glob-to-regexp": "^0.4.0",
-        "is-subset": "^0.1.1",
-        "lodash.isequal": "^4.5.0",
-        "path-to-regexp": "^2.2.1",
-        "querystring": "^0.2.0",
-        "whatwg-url": "^6.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "path-to-regexp": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz",
-          "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w=="
-        }
-      }
-    },
-    "fetch-mock-jest": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/fetch-mock-jest/-/fetch-mock-jest-1.5.1.tgz",
-      "integrity": "sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ==",
-      "dev": true,
-      "requires": {
-        "fetch-mock": "^9.11.0"
-      }
-    },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-      "dev": true,
-      "requires": {
-        "locate-path": "^2.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
-      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
-      "dev": true
-    },
-    "follow-redirects": {
-      "version": "1.14.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
-      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
-      "dev": true
-    },
-    "form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "format-util": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz",
-      "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-intrinsic": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
-      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="
-    },
-    "get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.1.7",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
-      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "glob-regex": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/glob-regex/-/glob-regex-0.3.2.tgz",
-      "integrity": "sha512-m5blUd3/OqDTWwzBBtWBPrGlAzatRywHameHeekAZyZrskYouOGdNB8T/q6JucucvJXtOuyHIn0/Yia7iDasDw=="
-    },
-    "glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-    },
-    "globals": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.20.2"
-      }
-    },
-    "globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      }
-    },
-    "globrex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-      "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
-    },
-    "graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-      "dev": true
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "history": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
-      "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
-      "requires": {
-        "@babel/runtime": "^7.7.6"
-      }
-    },
-    "hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "requires": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dev": true,
-      "requires": {
-        "whatwg-encoding": "^2.0.0"
-      }
-    },
-    "html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
-    },
-    "http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dev": true,
-      "requires": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dev": true,
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
-    },
-    "husky": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
-      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true
-    },
-    "immer": {
-      "version": "9.0.12",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz",
-      "integrity": "sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA=="
-    },
-    "immutable": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
-      "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "requires": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "inquirer": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.2.tgz",
-      "integrity": "sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      }
-    },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
-    },
-    "is-bigint": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz",
-      "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==",
-      "dev": true
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz",
-      "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
-      "dev": true
-    },
-    "is-core-module": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true
-    },
-    "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-      "dev": true
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-    },
-    "is-number-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz",
-      "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==",
-      "dev": true
-    },
-    "is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-      "dev": true
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
-      "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
-      "dev": true
-    },
-    "is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
-    },
-    "is-string": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz",
-      "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==",
-      "dev": true
-    },
-    "is-subset": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY="
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true
-    },
-    "is-weakref": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
-      "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-    },
-    "istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
-    },
-    "istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
-      "requires": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "requires": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-      "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
-      "requires": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      }
-    },
-    "iterare": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/iterare/-/iterare-1.2.1.tgz",
-      "integrity": "sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==",
-      "dev": true
-    },
-    "jest": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.1.tgz",
-      "integrity": "sha512-qw9YHBnjt6TCbIDMPMpJZqf9E12rh6869iZaN08/vpOGgHJSAaLLUn6H8W3IAEuy34Ls3rct064mZLETkxJ2XA==",
-      "requires": {
-        "@jest/core": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "import-local": "^3.0.2",
-        "jest-cli": "^28.1.1"
-      }
-    },
-    "jest-changed-files": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.0.2.tgz",
-      "integrity": "sha512-QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA==",
-      "requires": {
-        "execa": "^5.0.0",
-        "throat": "^6.0.1"
-      }
-    },
-    "jest-circus": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.1.tgz",
-      "integrity": "sha512-75+BBVTsL4+p2w198DQpCeyh1RdaS2lhEG87HkaFX/UG0gJExVq2skG2pT7XZEGBubNj2CytcWSPan4QEPNosw==",
-      "requires": {
-        "@jest/environment": "^28.1.1",
-        "@jest/expect": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^28.1.1",
-        "jest-matcher-utils": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-runtime": "^28.1.1",
-        "jest-snapshot": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "pretty-format": "^28.1.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-cli": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.1.tgz",
-      "integrity": "sha512-+sUfVbJqb1OjBZ0OdBbI6OWfYM1i7bSfzYy6gze1F1w3OKWq8ZTEKkZ8a7ZQPq6G/G1qMh/uKqpdWhgl11NFQQ==",
-      "requires": {
-        "@jest/core": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-validate": "^28.1.1",
-        "prompts": "^2.0.1",
-        "yargs": "^17.3.1"
-      },
-      "dependencies": {
-        "yargs": {
-          "version": "17.5.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-          "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.3",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^21.0.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "21.0.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-          "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
-        }
-      }
-    },
-    "jest-config": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.1.tgz",
-      "integrity": "sha512-tASynMhS+jVV85zKvjfbJ8nUyJS/jUSYZ5KQxLUN2ZCvcQc/OmhQl2j6VEL3ezQkNofxn5pQ3SPYWPHb0unTZA==",
-      "requires": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "babel-jest": "^28.1.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^28.1.1",
-        "jest-environment-node": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.1",
-        "jest-runner": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-validate": "^28.1.1",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^28.1.1",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-diff": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.1.tgz",
-      "integrity": "sha512-/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg==",
-      "requires": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-docblock": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz",
-      "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==",
-      "requires": {
-        "detect-newline": "^3.0.0"
-      }
-    },
-    "jest-each": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.1.tgz",
-      "integrity": "sha512-A042rqh17ZvEhRceDMi784ppoXR7MWGDEKTXEZXb4svt0eShMZvijGxzKsx+yIjeE8QYmHPrnHiTSQVhN4nqaw==",
-      "requires": {
-        "@jest/types": "^28.1.1",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "jest-util": "^28.1.1",
-        "pretty-format": "^28.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-environment-jsdom": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-28.1.1.tgz",
-      "integrity": "sha512-41ZvgSoPNcKG5q3LuuOcAczdBxRq9DbZkPe24okN6ZCmiZdAfFtPg3z+lOtsT1fM6OAERApKT+3m0MRDQH2zIA==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^28.1.1",
-        "@jest/fake-timers": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/jsdom": "^16.2.4",
-        "@types/node": "*",
-        "jest-mock": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jsdom": "^19.0.0"
-      }
-    },
-    "jest-environment-node": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.1.tgz",
-      "integrity": "sha512-2aV/eeY/WNgUUJrrkDJ3cFEigjC5fqT1+fCclrY6paqJ5zVPoM//sHmfgUUp7WLYxIdbPwMiVIzejpN56MxnNA==",
-      "requires": {
-        "@jest/environment": "^28.1.1",
-        "@jest/fake-timers": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "jest-mock": "^28.1.1",
-        "jest-util": "^28.1.1"
-      }
-    },
-    "jest-get-type": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz",
-      "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA=="
-    },
-    "jest-haste-map": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.1.tgz",
-      "integrity": "sha512-ZrRSE2o3Ezh7sb1KmeLEZRZ4mgufbrMwolcFHNRSjKZhpLa8TdooXOOFlSwoUzlbVs1t0l7upVRW2K7RWGHzbQ==",
-      "requires": {
-        "@jest/types": "^28.1.1",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^2.3.2",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^28.0.2",
-        "jest-util": "^28.1.1",
-        "jest-worker": "^28.1.1",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
-      }
-    },
-    "jest-leak-detector": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.1.tgz",
-      "integrity": "sha512-4jvs8V8kLbAaotE+wFR7vfUGf603cwYtFf1/PYEsyX2BAjSzj8hQSVTP6OWzseTl0xL6dyHuKs2JAks7Pfubmw==",
-      "requires": {
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-matcher-utils": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.1.tgz",
-      "integrity": "sha512-NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw==",
-      "requires": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "pretty-format": "^28.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-message-util": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.1.tgz",
-      "integrity": "sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ==",
-      "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-mock": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.1.tgz",
-      "integrity": "sha512-bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw==",
-      "requires": {
-        "@jest/types": "^28.1.1",
-        "@types/node": "*"
-      }
-    },
-    "jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "requires": {}
-    },
-    "jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="
-    },
-    "jest-resolve": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.1.tgz",
-      "integrity": "sha512-/d1UbyUkf9nvsgdBildLe6LAD4DalgkgZcKd0nZ8XUGPyA/7fsnaQIlKVnDiuUXv/IeZhPEDrRJubVSulxrShA==",
-      "requires": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.1",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^28.1.1",
-        "jest-validate": "^28.1.1",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      }
-    },
-    "jest-resolve-dependencies": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.1.tgz",
-      "integrity": "sha512-p8Y150xYJth4EXhOuB8FzmS9r8IGLEioiaetgdNGb9VHka4fl0zqWlVe4v7mSkYOuEUg2uB61iE+zySDgrOmgQ==",
-      "requires": {
-        "jest-regex-util": "^28.0.2",
-        "jest-snapshot": "^28.1.1"
-      }
-    },
-    "jest-runner": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.1.tgz",
-      "integrity": "sha512-W5oFUiDBgTsCloTAj6q95wEvYDB0pxIhY6bc5F26OucnwBN+K58xGTGbliSMI4ChQal5eANDF+xvELaYkJxTmA==",
-      "requires": {
-        "@jest/console": "^28.1.1",
-        "@jest/environment": "^28.1.1",
-        "@jest/test-result": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^28.1.1",
-        "jest-environment-node": "^28.1.1",
-        "jest-haste-map": "^28.1.1",
-        "jest-leak-detector": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-resolve": "^28.1.1",
-        "jest-runtime": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "jest-watcher": "^28.1.1",
-        "jest-worker": "^28.1.1",
-        "source-map-support": "0.5.13",
-        "throat": "^6.0.1"
-      }
-    },
-    "jest-runtime": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.1.tgz",
-      "integrity": "sha512-J89qEJWW0leOsqyi0D9zHpFEYHwwafFdS9xgvhFHtIdRghbadodI0eA+DrthK/1PebBv3Px8mFSMGKrtaVnleg==",
-      "requires": {
-        "@jest/environment": "^28.1.1",
-        "@jest/fake-timers": "^28.1.1",
-        "@jest/globals": "^28.1.1",
-        "@jest/source-map": "^28.0.2",
-        "@jest/test-result": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-mock": "^28.1.1",
-        "jest-regex-util": "^28.0.2",
-        "jest-resolve": "^28.1.1",
-        "jest-snapshot": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "dependencies": {
-        "strip-bom": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="
-        }
-      }
-    },
-    "jest-snapshot": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.1.tgz",
-      "integrity": "sha512-1KjqHJ98adRcbIdMizjF5DipwZFbvxym/kFO4g4fVZCZRxH/dqV8TiBFCa6rqic3p0karsy8RWS1y4E07b7P0A==",
-      "requires": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^28.1.1",
-        "@jest/transform": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/babel__traverse": "^7.0.6",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^28.1.1",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^28.1.1",
-        "jest-get-type": "^28.0.2",
-        "jest-haste-map": "^28.1.1",
-        "jest-matcher-utils": "^28.1.1",
-        "jest-message-util": "^28.1.1",
-        "jest-util": "^28.1.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^28.1.1",
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-sonar-reporter": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jest-sonar-reporter/-/jest-sonar-reporter-2.0.0.tgz",
-      "integrity": "sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==",
-      "dev": true,
-      "requires": {
-        "xml": "^1.0.1"
-      }
-    },
-    "jest-styled-components": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/jest-styled-components/-/jest-styled-components-7.0.8.tgz",
-      "integrity": "sha512-0KE54d0yIzKcvtOv8eikyjG3rFRtKYUyQovaoha3nondtZzXYGB3bhsvYgEegU08Iry0ndWx2+g9f5ZzD4I+0Q==",
-      "dev": true,
-      "requires": {
-        "css": "^3.0.0"
-      }
-    },
-    "jest-util": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.1.tgz",
-      "integrity": "sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw==",
-      "requires": {
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      }
-    },
-    "jest-validate": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.1.tgz",
-      "integrity": "sha512-Kpf6gcClqFCIZ4ti5++XemYJWUPCFUW+N2gknn+KgnDf549iLul3cBuKVe1YcWRlaF8tZV8eJCap0eECOEE3Ug==",
-      "requires": {
-        "@jest/types": "^28.1.1",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^28.0.2",
-        "leven": "^3.1.0",
-        "pretty-format": "^28.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "pretty-format": {
-          "version": "28.1.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
-          "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
-          "requires": {
-            "@jest/schemas": "^28.0.2",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        },
-        "react-is": {
-          "version": "18.2.0",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-          "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-        }
-      }
-    },
-    "jest-watch-typeahead": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
-      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
-      "requires": {
-        "ansi-escapes": "^4.3.1",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^28.0.0",
-        "jest-watcher": "^28.0.0",
-        "slash": "^4.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "dependencies": {
-        "slash": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="
-        },
-        "string-length": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-          "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-          "requires": {
-            "char-regex": "^2.0.0",
-            "strip-ansi": "^7.0.1"
-          },
-          "dependencies": {
-            "char-regex": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
-              "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="
-            }
-          }
-        },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-          "requires": {
-            "ansi-regex": "^6.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "6.0.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-              "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
-            }
-          }
-        }
-      }
-    },
-    "jest-watcher": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.1.tgz",
-      "integrity": "sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug==",
-      "requires": {
-        "@jest/test-result": "^28.1.1",
-        "@jest/types": "^28.1.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "jest-util": "^28.1.1",
-        "string-length": "^4.0.1"
-      }
-    },
-    "jest-worker": {
-      "version": "28.1.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.1.tgz",
-      "integrity": "sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ==",
-      "requires": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "js-sha3": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-      "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsdom": {
-      "version": "19.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz",
-      "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.5",
-        "acorn": "^8.5.0",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.1",
-        "decimal.js": "^10.3.1",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^3.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^10.0.0",
-        "ws": "^8.2.3",
-        "xml-name-validator": "^4.0.0"
-      },
-      "dependencies": {
-        "tr46": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-          "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-          "dev": true,
-          "requires": {
-            "punycode": "^2.1.1"
-          }
-        },
-        "webidl-conversions": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-          "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-          "dev": true
-        },
-        "whatwg-url": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz",
-          "integrity": "sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==",
-          "dev": true,
-          "requires": {
-            "tr46": "^3.0.0",
-            "webidl-conversions": "^7.0.0"
-          }
-        }
-      }
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "json-schema-faker": {
-      "version": "0.5.0-rcv.40",
-      "resolved": "https://registry.npmjs.org/json-schema-faker/-/json-schema-faker-0.5.0-rcv.40.tgz",
-      "integrity": "sha512-BczZvu03jKrGh3ovCWrHusiX6MwiaKK2WZeyomKBNA8Nm/n7aBYz0mub1CnONB6cgxOZTNxx4afNmLblbUmZbA==",
-      "requires": {
-        "json-schema-ref-parser": "^6.1.0",
-        "jsonpath-plus": "^5.1.0"
-      }
-    },
-    "json-schema-ref-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.1.0.tgz",
-      "integrity": "sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==",
-      "requires": {
-        "call-me-maybe": "^1.0.1",
-        "js-yaml": "^3.12.1",
-        "ono": "^4.0.11"
-      }
-    },
-    "json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "jsonpath-plus": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-5.1.0.tgz",
-      "integrity": "sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ=="
-    },
-    "jsx-ast-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz",
-      "integrity": "sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.4",
-        "object.assign": "^4.1.2"
-      }
-    },
-    "kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
-    },
-    "language-subtag-registry": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
-      "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==",
-      "dev": true
-    },
-    "language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=",
-      "dev": true,
-      "requires": {
-        "language-subtag-registry": "~0.3.2"
-      }
-    },
-    "leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "lilconfig": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
-      "dev": true
-    },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "lint-staged": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.2.tgz",
-      "integrity": "sha512-qQLfLTh9z34eMzfEHENC+QBskZfxjomrf+snF3xJ4BzilORbD989NLqQ00ughsF/A+PT41e87+WsMFabf9++pQ==",
-      "dev": true,
-      "requires": {
-        "cli-truncate": "^3.1.0",
-        "colorette": "^2.0.17",
-        "commander": "^9.3.0",
-        "debug": "^4.3.4",
-        "execa": "^6.1.0",
-        "lilconfig": "2.0.5",
-        "listr2": "^4.0.5",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "object-inspect": "^1.12.2",
-        "pidtree": "^0.6.0",
-        "string-argv": "^0.3.1",
-        "yaml": "^2.1.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "9.3.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz",
-          "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "execa": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
-          "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.3",
-            "get-stream": "^6.0.1",
-            "human-signals": "^3.0.1",
-            "is-stream": "^3.0.0",
-            "merge-stream": "^2.0.0",
-            "npm-run-path": "^5.1.0",
-            "onetime": "^6.0.0",
-            "signal-exit": "^3.0.7",
-            "strip-final-newline": "^3.0.0"
-          }
-        },
-        "human-signals": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
-          "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==",
-          "dev": true
-        },
-        "is-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-          "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
-          "dev": true
-        },
-        "mimic-fn": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-          "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "npm-run-path": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-          "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
-          "dev": true,
-          "requires": {
-            "path-key": "^4.0.0"
-          }
-        },
-        "onetime": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-          "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "^4.0.0"
-          }
-        },
-        "path-key": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-          "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
-          "dev": true
-        },
-        "strip-final-newline": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-          "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
-          "dev": true
-        },
-        "yaml": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
-          "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
-          "dev": true
-        }
-      }
-    },
-    "listr2": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
-      "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==",
-      "dev": true,
-      "requires": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.5.5",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
-      },
-      "dependencies": {
-        "cli-truncate": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-          "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-          "dev": true,
-          "requires": {
-            "slice-ansi": "^3.0.0",
-            "string-width": "^4.2.0"
-          }
-        },
-        "slice-ansi": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-          "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
-          }
-        }
-      }
-    },
-    "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-      "dev": true,
-      "requires": {
-        "p-locate": "^2.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-      "dev": true
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
-    },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      }
-    },
-    "log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "dependencies": {
-        "slice-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-          "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "astral-regex": "^2.0.0",
-            "is-fullwidth-code-point": "^3.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY="
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "requires": {
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
-    "make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "devOptional": true
-    },
-    "makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "requires": {
-        "tmpl": "1.0.5"
-      }
-    },
-    "match-sorter": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
-      "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "remove-accents": "0.4.2"
-      }
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "requires": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      }
-    },
-    "microseconds": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz",
-      "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA=="
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-    },
-    "min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
-    "nano-time": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz",
-      "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==",
-      "requires": {
-        "big-integer": "^1.6.16"
-      }
-    },
-    "nanoclone": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz",
-      "integrity": "sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="
-    },
-    "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
-    },
-    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
-      "requires": {
-        "whatwg-url": "^5.0.0"
-      },
-      "dependencies": {
-        "tr46": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
-        },
-        "webidl-conversions": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
-        },
-        "whatwg-url": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
-          "requires": {
-            "tr46": "~0.0.3",
-            "webidl-conversions": "^3.0.0"
-          }
-        }
-      }
-    },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-    },
-    "node-releases": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
-      "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-    },
-    "npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "requires": {
-        "path-key": "^3.0.0"
-      }
-    },
-    "nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "dev": true
-    },
-    "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object.assign": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "has-symbols": "^1.0.1",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "dependencies": {
-        "define-properties": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-          "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-          "dev": true,
-          "requires": {
-            "has-property-descriptors": "^1.0.0",
-            "object-keys": "^1.1.1"
-          }
-        },
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.20.0",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
-          "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "function.prototype.name": "^1.1.5",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-property-descriptors": "^1.0.0",
-            "has-symbols": "^1.0.3",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.2",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.2",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.2",
-            "object-inspect": "^1.12.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "regexp.prototype.flags": "^1.4.1",
-            "string.prototype.trimend": "^1.0.5",
-            "string.prototype.trimstart": "^1.0.5",
-            "unbox-primitive": "^1.0.2"
-          }
-        },
-        "has-bigints": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-          "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-          "dev": true
-        },
-        "has-symbols": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-          "dev": true
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-negative-zero": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-          "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-shared-array-buffer": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-          "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-weakref": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-          "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2"
-          }
-        },
-        "regexp.prototype.flags": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-          "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.3",
-            "functions-have-names": "^1.2.2"
-          }
-        },
-        "string.prototype.trimend": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-          "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "string.prototype.trimstart": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-          "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "define-properties": "^1.1.4",
-            "es-abstract": "^1.19.5"
-          },
-          "dependencies": {
-            "define-properties": {
-              "version": "1.1.4",
-              "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-              "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-              "dev": true,
-              "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-              }
-            }
-          }
-        },
-        "unbox-primitive": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-          "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-bigints": "^1.0.2",
-            "has-symbols": "^1.0.3",
-            "which-boxed-primitive": "^1.0.2"
-          }
-        }
-      }
-    },
-    "oblivious-set": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz",
-      "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "ono": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz",
-      "integrity": "sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==",
-      "requires": {
-        "format-util": "^1.0.3"
-      }
-    },
-    "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dev": true,
-      "requires": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "dev": true,
-      "requires": {
-        "p-try": "^1.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true,
-      "requires": {
-        "p-limit": "^1.1.0"
-      }
-    },
-    "p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-      "dev": true
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "parse-ms": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
-      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA=="
-    },
-    "parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
-    },
-    "pidtree": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
-      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
-      "dev": true
-    },
-    "pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "requires": {
-        "find-up": "^4.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-        }
-      }
-    },
-    "postcss": {
-      "version": "8.4.13",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
-      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
-      "requires": {
-        "nanoid": "^3.3.3",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
-    },
-    "prettier": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
-      "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
-      "dev": true
-    },
-    "prettier-linter-helpers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-      "dev": true,
-      "requires": {
-        "fast-diff": "^1.1.2"
-      }
-    },
-    "pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-      "requires": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "react-is": {
-          "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-        }
-      }
-    },
-    "pretty-ms": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
-      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
-      "requires": {
-        "parse-ms": "^2.1.0"
-      }
-    },
-    "prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "requires": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      }
-    },
-    "prop-types": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
-      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.8.1"
-      }
-    },
-    "property-expr": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.4.tgz",
-      "integrity": "sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg=="
-    },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "dev": true
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
-    "querystring": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
-      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg=="
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
-    },
-    "react": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.1.0.tgz",
-      "integrity": "sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==",
-      "requires": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "react-ace": {
-      "version": "9.5.0",
-      "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-9.5.0.tgz",
-      "integrity": "sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==",
-      "requires": {
-        "ace-builds": "^1.4.13",
-        "diff-match-patch": "^1.0.5",
-        "lodash.get": "^4.4.2",
-        "lodash.isequal": "^4.5.0",
-        "prop-types": "^15.7.2"
-      },
-      "dependencies": {
-        "ace-builds": {
-          "version": "1.4.13",
-          "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.13.tgz",
-          "integrity": "sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ=="
-        }
-      }
-    },
-    "react-datepicker": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.5.0.tgz",
-      "integrity": "sha512-mFP/SbtFSXx21Wx3Nfv+RREwd/x0q14x7QL79ZCi/PVkHSFLwLWhXyOtj3OIzi1AcVYb/fMMcvi8e5b12n8/sg==",
-      "requires": {
-        "@popperjs/core": "^2.9.2",
-        "classnames": "^2.2.6",
-        "date-fns": "^2.24.0",
-        "prop-types": "^15.7.2",
-        "react-onclickoutside": "^6.12.0",
-        "react-popper": "^2.2.5"
-      },
-      "dependencies": {
-        "date-fns": {
-          "version": "2.27.0",
-          "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz",
-          "integrity": "sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q=="
-        }
-      }
-    },
-    "react-dom": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.1.0.tgz",
-      "integrity": "sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.22.0"
-      }
-    },
-    "react-fast-compare": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
-      "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
-    },
-    "react-hook-form": {
-      "version": "7.6.9",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.6.9.tgz",
-      "integrity": "sha512-nz+btC4WFIm3zPBjw22K3t9nnJtlMMwj8slcbPYoTKlkSVA5l+q3Ai+VF0YzeRi7vbyyeGQvpyibov1xd/TV7A==",
-      "requires": {}
-    },
-    "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "react-multi-select-component": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/react-multi-select-component/-/react-multi-select-component-4.0.6.tgz",
-      "integrity": "sha512-cNpDv8vh1kWkJiMsa097tTUqWLVTQn+La4aXlgoGOQVpOSH9u1fbj1+MsvnLQjTBySuDx+pzm/DpbIoma/i1Fw==",
-      "requires": {}
-    },
-    "react-onclickoutside": {
-      "version": "6.12.1",
-      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.1.tgz",
-      "integrity": "sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==",
-      "requires": {}
-    },
-    "react-popper": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
-      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
-      "requires": {
-        "react-fast-compare": "^3.0.1",
-        "warning": "^4.0.2"
-      }
-    },
-    "react-query": {
-      "version": "3.39.1",
-      "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.39.1.tgz",
-      "integrity": "sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==",
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "broadcast-channel": "^3.4.1",
-        "match-sorter": "^6.0.2"
-      }
-    },
-    "react-redux": {
-      "version": "7.2.6",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.6.tgz",
-      "integrity": "sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==",
-      "requires": {
-        "@babel/runtime": "^7.15.4",
-        "@types/react-redux": "^7.1.20",
-        "hoist-non-react-statics": "^3.3.2",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.16.7",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-          "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        },
-        "react-is": {
-          "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-        }
-      }
-    },
-    "react-router-dom": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
-      "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
-      "requires": {
-        "history": "^5.2.0",
-        "react-router": "6.3.0"
-      },
-      "dependencies": {
-        "react-router": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
-          "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
-          "requires": {
-            "history": "^5.2.0"
-          }
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
-    "recrawl-sync": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/recrawl-sync/-/recrawl-sync-2.2.2.tgz",
-      "integrity": "sha512-E2sI4F25Fu2nrfV+KsnC7/qfk/spQIYXlonfQoS4rwxeNK5BjxnLPbWiRXHVXPwYBOTWtPX5765kTm/zJiL+LQ==",
-      "requires": {
-        "@cush/relative": "^1.0.0",
-        "glob-regex": "^0.3.0",
-        "slash": "^3.0.0",
-        "tslib": "^1.9.3"
-      }
-    },
-    "redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "requires": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      }
-    },
-    "redux": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz",
-      "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==",
-      "requires": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
-    "redux-mock-store": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/redux-mock-store/-/redux-mock-store-1.5.4.tgz",
-      "integrity": "sha512-xmcA0O/tjCLXhh9Fuiq6pMrJCwFRaouA8436zcikdIpYWWCjU76CRk+i2bHx8EeiSiMGnB85/lZdU3wIJVXHTA==",
-      "dev": true,
-      "requires": {
-        "lodash.isplainobject": "^4.0.6"
-      }
-    },
-    "redux-thunk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
-      "requires": {}
-    },
-    "reflect-metadata": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-      "dev": true
-    },
-    "regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
-      "dev": true
-    },
-    "regenerate-unicode-properties": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
-      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.4.2"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
-    },
-    "regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true
-    },
-    "regexpu-core": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
-      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
-      "dev": true,
-      "requires": {
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.0.1",
-        "regjsgen": "^0.6.0",
-        "regjsparser": "^0.8.2",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
-      }
-    },
-    "regjsgen": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
-      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
-      "dev": true
-    },
-    "regjsparser": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
-      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
-      "dev": true,
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        }
-      }
-    },
-    "remove-accents": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
-      "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
-    },
-    "requireindex": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
-      "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
-      "dev": true
-    },
-    "reselect": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.5.tgz",
-      "integrity": "sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ=="
-    },
-    "resolve": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-      "requires": {
-        "is-core-module": "^2.8.1",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "requires": {
-        "resolve-from": "^5.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
-        }
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
-    },
-    "rfdc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "rollup": {
-      "version": "2.72.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.72.1.tgz",
-      "integrity": "sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==",
-      "requires": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "rxjs": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-      "dev": true,
-      "requires": {
-        "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
-          "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
-          "dev": true
-        }
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "sass": {
-      "version": "1.52.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz",
-      "integrity": "sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==",
-      "requires": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
-        "source-map-js": ">=0.6.2 <2.0.0"
-      }
-    },
-    "saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dev": true,
-      "requires": {
-        "xmlchars": "^2.2.0"
-      }
-    },
-    "scheduler": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.22.0.tgz",
-      "integrity": "sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==",
-      "requires": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "semver": {
-      "version": "7.3.7",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-      "requires": {
-        "lru-cache": "^6.0.0"
-      }
-    },
-    "shallowequal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-    },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
-    },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
-    },
-    "slice-ansi": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^6.0.0",
-        "is-fullwidth-code-point": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
-          "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-          "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
-          "dev": true
-        }
-      }
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
-    },
-    "source-map-resolve": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
-      "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.2",
-        "decode-uri-component": "^0.2.0"
-      }
-    },
-    "source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "spawn-command": {
-      "version": "0.0.2-1",
-      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=",
-      "dev": true
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-    },
-    "stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-      "requires": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
-        }
-      }
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "string-argv": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
-      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
-      "dev": true
-    },
-    "string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "requires": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "string-natural-compare": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
-      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
-      "dev": true
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "string.prototype.matchall": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz",
-      "integrity": "sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "has-symbols": "^1.0.2",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.3.1",
-        "side-channel": "^1.0.4"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.19.1",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
-          "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.1.1",
-            "get-symbol-description": "^1.0.0",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.2",
-            "internal-slot": "^1.0.3",
-            "is-callable": "^1.2.4",
-            "is-negative-zero": "^2.0.1",
-            "is-regex": "^1.1.4",
-            "is-shared-array-buffer": "^1.0.1",
-            "is-string": "^1.0.7",
-            "is-weakref": "^1.0.1",
-            "object-inspect": "^1.11.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.2",
-            "string.prototype.trimend": "^1.0.4",
-            "string.prototype.trimstart": "^1.0.4",
-            "unbox-primitive": "^1.0.1"
-          }
-        },
-        "is-callable": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-          "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-          "dev": true
-        },
-        "is-regex": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-          "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-          "dev": true,
-          "requires": {
-            "call-bind": "^1.0.2",
-            "has-tostringtag": "^1.0.0"
-          }
-        },
-        "is-string": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-          "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-          "dev": true,
-          "requires": {
-            "has-tostringtag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
-      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
-      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
-    },
-    "strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "requires": {
-        "min-indent": "^1.0.0"
-      }
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
-    },
-    "styled-components": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.1.tgz",
-      "integrity": "sha512-JThv2JRzyH0NOIURrk9iskdxMSAAtCfj/b2Sf1WJaCUsloQkblepy1jaCLX/bYE+mhYo3unmwVSI9I5d9ncSiQ==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/traverse": "^7.4.5",
-        "@emotion/is-prop-valid": "^0.8.8",
-        "@emotion/stylis": "^0.8.4",
-        "@emotion/unitless": "^0.7.4",
-        "babel-plugin-styled-components": ">= 1.12.0",
-        "css-to-react-native": "^3.0.0",
-        "hoist-non-react-statics": "^3.0.0",
-        "shallowequal": "^1.1.0",
-        "supports-color": "^5.5.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-      "requires": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
-    },
-    "symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      }
-    },
-    "test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "requires": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "throat": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "toposort": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
-      "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA="
-    },
-    "tough-cookie": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
-      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.1.2"
-      },
-      "dependencies": {
-        "universalify": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-          "dev": true
-        }
-      }
-    },
-    "tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "tree-kill": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
-      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-      "dev": true
-    },
-    "ts-jest": {
-      "version": "28.0.5",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.5.tgz",
-      "integrity": "sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==",
-      "dev": true,
-      "requires": {
-        "bs-logger": "0.x",
-        "fast-json-stable-stringify": "2.x",
-        "jest-util": "^28.0.0",
-        "json5": "^2.2.1",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "semver": "7.x",
-        "yargs-parser": "^21.0.1"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-          "dev": true
-        },
-        "yargs-parser": {
-          "version": "21.0.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-          "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
-          "dev": true
-        }
-      }
-    },
-    "ts-node": {
-      "version": "10.8.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz",
-      "integrity": "sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==",
-      "devOptional": true,
-      "requires": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      }
-    },
-    "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
-    },
-    "tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
-    },
-    "type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true
-    },
-    "typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
-      "devOptional": true
-    },
-    "unbox-primitive": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
-      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1",
-        "has-bigints": "^1.0.1",
-        "has-symbols": "^1.0.2",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "dev": true
-    },
-    "unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dev": true,
-      "requires": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      }
-    },
-    "unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-      "dev": true
-    },
-    "unicode-property-aliases-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
-      "dev": true
-    },
-    "universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true
-    },
-    "unload": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz",
-      "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==",
-      "requires": {
-        "@babel/runtime": "^7.6.2",
-        "detect-node": "^2.0.4"
-      }
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "use-debounce": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-8.0.1.tgz",
-      "integrity": "sha512-6tGAFJKJ0qCalecaV7/gm/M6n238nmitNppvR89ff1yfwSFjwFKR7IQZzIZf1KZRQhqNireBzytzU6jgb29oVg==",
-      "requires": {}
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true
-    },
-    "v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "devOptional": true
-    },
-    "v8-to-istanbul": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz",
-      "integrity": "sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==",
-      "requires": {
-        "@jridgewell/trace-mapping": "^0.3.12",
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0"
-      }
-    },
-    "vite": {
-      "version": "2.9.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.11.tgz",
-      "integrity": "sha512-h1n8bAN5Psv/V+RAY3P6OtYyGSFQdusgYWiLRAk41qY7rSyH4K5Jq+RUXztzyPVB0oHbnXPUuS2Aj44jucViUA==",
-      "requires": {
-        "esbuild": "^0.14.27",
-        "fsevents": "~2.3.2",
-        "postcss": "^8.4.13",
-        "resolve": "^1.22.0",
-        "rollup": "^2.59.0"
-      }
-    },
-    "vite-tsconfig-paths": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-3.5.0.tgz",
-      "integrity": "sha512-NKIubr7gXgh/3uniQaOytSg+aKWPrjquP6anAy+zCWEn6h9fB8z2/qdlfQrTgZWaXJ2pHVlllrSdRZltHn9P4g==",
-      "requires": {
-        "debug": "^4.1.1",
-        "globrex": "^0.1.2",
-        "recrawl-sync": "^2.0.3",
-        "tsconfig-paths": "^4.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "tsconfig-paths": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz",
-          "integrity": "sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==",
-          "requires": {
-            "json5": "^2.2.1",
-            "minimist": "^1.2.6",
-            "strip-bom": "^3.0.0"
-          }
-        }
-      }
-    },
-    "w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "dev": true,
-      "requires": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "w3c-xmlserializer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz",
-      "integrity": "sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==",
-      "dev": true,
-      "requires": {
-        "xml-name-validator": "^4.0.0"
-      }
-    },
-    "walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "requires": {
-        "makeerror": "1.0.12"
-      }
-    },
-    "warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "whatwg-encoding": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
-      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "0.6.3"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-          "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-          "dev": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        }
-      }
-    },
-    "whatwg-fetch": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
-      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
-    },
-    "whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true
-    },
-    "whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
-      "requires": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "write-file-atomic": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
-      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.7"
-      }
-    },
-    "ws": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "xml": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-      "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
-      "dev": true
-    },
-    "xml-name-validator": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
-      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
-      "dev": true
-    },
-    "xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-      "dev": true
-    },
-    "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dev": true,
-      "requires": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      }
-    },
-    "yargs-parser": {
-      "version": "20.2.7",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-      "dev": true
-    },
-    "yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "devOptional": true
-    },
-    "yup": {
-      "version": "0.32.11",
-      "resolved": "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz",
-      "integrity": "sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==",
-      "requires": {
-        "@babel/runtime": "^7.15.4",
-        "@types/lodash": "^4.14.175",
-        "lodash": "^4.17.21",
-        "lodash-es": "^4.17.21",
-        "nanoclone": "^0.2.1",
-        "property-expr": "^2.0.4",
-        "toposort": "^2.0.2"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.16.3",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
-          "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        },
-        "@types/lodash": {
-          "version": "4.14.177",
-          "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
-          "integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw=="
-        }
-      }
-    }
-  }
-}
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 1dae15d8f3f..a009f27a383 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -5,12 +5,15 @@
   "private": true,
   "dependencies": {
     "@babel/core": "^7.16.0",
+    "@babel/plugin-syntax-flow": "^7.18.6",
+    "@babel/plugin-transform-react-jsx": "^7.18.6",
     "@fortawesome/fontawesome-free": "^6.1.1",
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
     "@reduxjs/toolkit": "^1.8.2",
     "@rooks/use-outside-click-ref": "^4.10.1",
     "@testing-library/react": "^13.2.0",
+    "@types/testing-library__jest-dom": "^5.14.5",
     "@types/yup": "^0.29.13",
     "@vitejs/plugin-react": "^1.3.2",
     "ace-builds": "^1.4.12",
@@ -31,6 +34,7 @@
     "react-datepicker": "^4.2.0",
     "react-dom": "^18.1.0",
     "react-hook-form": "7.6.9",
+    "react-is": "^18.2.0",
     "react-multi-select-component": "^4.0.6",
     "react-query": "^3.39.1",
     "react-redux": "^7.2.6",
@@ -48,7 +52,7 @@
   "lint-staged": {
     "*.{ts,tsx}": [
       "eslint --fix",
-      "npm test -- --bail --findRelatedTests --watchAll=false"
+      "pnpm test -- --bail --findRelatedTests --watchAll=false"
     ]
   },
   "scripts": {
@@ -60,10 +64,10 @@
     "lint:CI": "eslint --ext .tsx,.ts src/ --max-warnings=0",
     "test": "jest --watch",
     "test:coverage": "jest --watchAll --coverage",
-    "test:CI": "CI=true npm run test:coverage -- --ci --testResultsProcessor=\"jest-sonar-reporter\" --watchAll=false",
+    "test:CI": "CI=true pnpm test:coverage --ci --testResultsProcessor=\"jest-sonar-reporter\" --watchAll=false",
     "tsc": "tsc --pretty --noEmit",
     "prepare": "cd .. && husky install kafka-ui-react-app/.husky",
-    "pre-commit": "npm run tsc && lint-staged"
+    "pre-commit": "pnpm tsc && lint-staged"
   },
   "eslintConfig": {
     "extends": "react-app"
@@ -119,6 +123,6 @@
   },
   "engines": {
     "node": "v16.15.0",
-    "npm": "8.5.5"
+    "pnpm": "^7.4.0"
   }
 }
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
new file mode 100644
index 00000000000..ac8d5c416c4
--- /dev/null
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -0,0 +1,7460 @@
+lockfileVersion: 5.4
+
+specifiers:
+  '@babel/core': ^7.16.0
+  '@babel/plugin-syntax-flow': ^7.18.6
+  '@babel/plugin-transform-react-jsx': ^7.18.6
+  '@babel/preset-env': ^7.18.2
+  '@babel/preset-react': ^7.17.12
+  '@babel/preset-typescript': ^7.17.12
+  '@fortawesome/fontawesome-free': ^6.1.1
+  '@hookform/error-message': ^2.0.0
+  '@hookform/resolvers': ^2.7.1
+  '@jest/types': ^28.1.1
+  '@openapitools/openapi-generator-cli': ^2.5.1
+  '@reduxjs/toolkit': ^1.8.2
+  '@rooks/use-outside-click-ref': ^4.10.1
+  '@testing-library/dom': ^8.11.1
+  '@testing-library/jest-dom': ^5.16.4
+  '@testing-library/react': ^13.2.0
+  '@testing-library/user-event': ^13.5.0
+  '@types/eventsource': ^1.1.8
+  '@types/jest': ^28.1.3
+  '@types/lodash': ^4.14.172
+  '@types/node': ^16.4.13
+  '@types/react': ^18.0.9
+  '@types/react-datepicker': ^4.1.4
+  '@types/react-dom': ^18.0.3
+  '@types/react-redux': ^7.1.18
+  '@types/react-router-dom': ^5.3.3
+  '@types/redux-mock-store': ^1.0.3
+  '@types/styled-components': ^5.1.13
+  '@types/testing-library__jest-dom': ^5.14.5
+  '@types/yup': ^0.29.13
+  '@typescript-eslint/eslint-plugin': ^5.29.0
+  '@typescript-eslint/parser': ^5.29.0
+  '@vitejs/plugin-react': ^1.3.2
+  ace-builds: ^1.4.12
+  ajv: ^8.6.3
+  babel-jest: ^28.1.1
+  bulma: ^0.9.3
+  classnames: ^2.2.6
+  dayjs: ^1.11.2
+  dotenv: ^16.0.1
+  eslint: ^8.3.0
+  eslint-config-airbnb: ^19.0.4
+  eslint-config-airbnb-typescript: ^17.0.0
+  eslint-config-prettier: ^8.5.0
+  eslint-config-react-app: ^7.0.1
+  eslint-import-resolver-node: ^0.3.6
+  eslint-import-resolver-typescript: ^2.7.1
+  eslint-plugin-import: ^2.26.0
+  eslint-plugin-jest-dom: ^4.0.2
+  eslint-plugin-jsx-a11y: ^6.5.1
+  eslint-plugin-prettier: ^4.0.0
+  eslint-plugin-react: ^7.29.4
+  eslint-plugin-react-hooks: ^4.5.0
+  fetch-mock: ^9.11.0
+  fetch-mock-jest: ^1.5.1
+  husky: ^8.0.1
+  jest: ^28.1.1
+  jest-environment-jsdom: ^28.1.1
+  jest-sonar-reporter: ^2.0.0
+  jest-styled-components: ^7.0.8
+  jest-watch-typeahead: ^1.1.0
+  json-schema-faker: ^0.5.0-rcv.39
+  lint-staged: ^13.0.2
+  lodash: ^4.17.21
+  node-fetch: ^2.6.1
+  prettier: ^2.3.1
+  pretty-ms: ^7.0.1
+  react: ^18.1.0
+  react-ace: ^9.4.3
+  react-datepicker: ^4.2.0
+  react-dom: ^18.1.0
+  react-hook-form: 7.6.9
+  react-is: ^18.2.0
+  react-multi-select-component: ^4.0.6
+  react-query: ^3.39.1
+  react-redux: ^7.2.6
+  react-router-dom: ^6.3.0
+  redux: ^4.1.1
+  redux-mock-store: ^1.5.4
+  redux-thunk: ^2.3.0
+  rimraf: ^3.0.2
+  sass: ^1.52.3
+  styled-components: ^5.3.1
+  ts-jest: ^28.0.5
+  ts-node: ^10.8.1
+  typescript: ^4.7.4
+  use-debounce: ^8.0.1
+  vite: ^2.9.11
+  vite-tsconfig-paths: ^3.5.0
+  whatwg-fetch: ^3.6.2
+  yup: ^0.32.9
+
+dependencies:
+  '@babel/core': 7.18.2
+  '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.2
+  '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
+  '@fortawesome/fontawesome-free': 6.1.1
+  '@hookform/error-message': 2.0.0_l2dcsysovzdujulgxvsen7vbsm
+  '@hookform/resolvers': 2.8.9_react-hook-form@7.6.9
+  '@reduxjs/toolkit': 1.8.2_ydj23m2apjohmawqetv7uxfa2i
+  '@rooks/use-outside-click-ref': 4.11.2_react@18.1.0
+  '@testing-library/react': 13.2.0_ef5jwxihqo6n7gxfmzogljlgcm
+  '@types/testing-library__jest-dom': 5.14.5
+  '@types/yup': 0.29.13
+  '@vitejs/plugin-react': 1.3.2
+  ace-builds: 1.4.13
+  ajv: 8.8.2
+  babel-jest: 28.1.1_@babel+core@7.18.2
+  bulma: 0.9.3
+  classnames: 2.3.1
+  dayjs: 1.11.3
+  fetch-mock: 9.11.0_node-fetch@2.6.7
+  jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+  jest-watch-typeahead: 1.1.0_jest@28.1.1
+  json-schema-faker: 0.5.0-rcv.40
+  lodash: 4.17.21
+  node-fetch: 2.6.7
+  pretty-ms: 7.0.1
+  react: 18.1.0
+  react-ace: 9.5.0_ef5jwxihqo6n7gxfmzogljlgcm
+  react-datepicker: 4.5.0_ef5jwxihqo6n7gxfmzogljlgcm
+  react-dom: 18.1.0_react@18.1.0
+  react-hook-form: 7.6.9_react@18.1.0
+  react-is: 18.2.0
+  react-multi-select-component: 4.0.6_react@18.1.0
+  react-query: 3.39.1_ef5jwxihqo6n7gxfmzogljlgcm
+  react-redux: 7.2.6_ef5jwxihqo6n7gxfmzogljlgcm
+  react-router-dom: 6.3.0_ef5jwxihqo6n7gxfmzogljlgcm
+  redux: 4.1.2
+  redux-thunk: 2.4.1_redux@4.1.2
+  sass: 1.52.3
+  styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
+  use-debounce: 8.0.1_react@18.1.0
+  vite: 2.9.11_sass@1.52.3
+  vite-tsconfig-paths: 3.5.0_vite@2.9.11
+  whatwg-fetch: 3.6.2
+  yup: 0.32.11
+
+devDependencies:
+  '@babel/preset-env': 7.18.2_@babel+core@7.18.2
+  '@babel/preset-react': 7.17.12_@babel+core@7.18.2
+  '@babel/preset-typescript': 7.17.12_@babel+core@7.18.2
+  '@jest/types': 28.1.1
+  '@openapitools/openapi-generator-cli': 2.5.1
+  '@testing-library/dom': 8.13.0
+  '@testing-library/jest-dom': 5.16.4
+  '@testing-library/user-event': 13.5.0_tlwynutqiyp5mns3woioasuxnq
+  '@types/eventsource': 1.1.8
+  '@types/jest': 28.1.3
+  '@types/lodash': 4.14.177
+  '@types/node': 16.11.7
+  '@types/react': 18.0.9
+  '@types/react-datepicker': 4.3.4_react@18.1.0
+  '@types/react-dom': 18.0.5
+  '@types/react-redux': 7.1.24
+  '@types/react-router-dom': 5.3.3
+  '@types/redux-mock-store': 1.0.3
+  '@types/styled-components': 5.1.18
+  '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
+  '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+  dotenv: 16.0.1
+  eslint: 8.16.0
+  eslint-config-airbnb: 19.0.4_pamhosqcenlxoxj4ke2dmvzava
+  eslint-config-airbnb-typescript: 17.0.0_l6wia5brkiej5f4nhesunbzj5y
+  eslint-config-prettier: 8.5.0_eslint@8.16.0
+  eslint-config-react-app: 7.0.1_widwqlnidgep55t2naywdlxcqa
+  eslint-import-resolver-node: 0.3.6
+  eslint-import-resolver-typescript: 2.7.1_btspkuwbqkl4adpiufzbathtpi
+  eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+  eslint-plugin-jest-dom: 4.0.2_eslint@8.16.0
+  eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
+  eslint-plugin-prettier: 4.0.0_q7a4ir2sdihdzpzdlnbgmzjlpq
+  eslint-plugin-react: 7.29.4_eslint@8.16.0
+  eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
+  fetch-mock-jest: 1.5.1_node-fetch@2.6.7
+  husky: 8.0.1
+  jest-environment-jsdom: 28.1.1
+  jest-sonar-reporter: 2.0.0
+  jest-styled-components: 7.0.8_styled-components@5.3.1
+  lint-staged: 13.0.2
+  prettier: 2.5.1
+  redux-mock-store: 1.5.4
+  rimraf: 3.0.2
+  ts-jest: 28.0.5_c4h4g76dcvkfgjwf6rprlfxfli
+  ts-node: 10.8.1_t4lrjbt3sxauai4t5o275zsepa
+  typescript: 4.7.4
+
+packages:
+
+  /@ampproject/remapping/2.2.0:
+    resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      '@jridgewell/gen-mapping': 0.1.1
+      '@jridgewell/trace-mapping': 0.3.13
+
+  /@babel/code-frame/7.16.7:
+    resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/highlight': 7.17.12
+
+  /@babel/compat-data/7.17.10:
+    resolution: {integrity: sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/core/7.18.2:
+    resolution: {integrity: sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.2.0
+      '@babel/code-frame': 7.16.7
+      '@babel/generator': 7.18.2
+      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
+      '@babel/helper-module-transforms': 7.18.0
+      '@babel/helpers': 7.18.2
+      '@babel/parser': 7.18.4
+      '@babel/template': 7.16.7
+      '@babel/traverse': 7.18.2
+      '@babel/types': 7.18.4
+      convert-source-map: 1.7.0
+      debug: 4.3.4
+      gensync: 1.0.0-beta.2
+      json5: 2.2.1
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+
+  /@babel/eslint-parser/7.17.0_j4uj5cgi2mksbox6kqvi7jrs6u:
+    resolution: {integrity: sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
+    peerDependencies:
+      '@babel/core': '>=7.11.0'
+      eslint: ^7.5.0 || ^8.0.0
+    dependencies:
+      '@babel/core': 7.18.2
+      eslint: 8.16.0
+      eslint-scope: 5.1.1
+      eslint-visitor-keys: 2.1.0
+      semver: 6.3.0
+    dev: true
+
+  /@babel/generator/7.18.2:
+    resolution: {integrity: sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+      '@jridgewell/gen-mapping': 0.3.1
+      jsesc: 2.5.2
+
+  /@babel/helper-annotate-as-pure/7.16.7:
+    resolution: {integrity: sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+    dev: true
+
+  /@babel/helper-annotate-as-pure/7.18.6:
+    resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+
+  /@babel/helper-builder-binary-assignment-operator-visitor/7.16.7:
+    resolution: {integrity: sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-explode-assignable-expression': 7.16.7
+      '@babel/types': 7.18.7
+    dev: true
+
+  /@babel/helper-compilation-targets/7.18.2_@babel+core@7.18.2:
+    resolution: {integrity: sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.17.10
+      '@babel/core': 7.18.2
+      '@babel/helper-validator-option': 7.16.7
+      browserslist: 4.20.4
+      semver: 6.3.0
+
+  /@babel/helper-create-class-features-plugin/7.18.0_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-annotate-as-pure': 7.18.6
+      '@babel/helper-environment-visitor': 7.18.2
+      '@babel/helper-function-name': 7.17.9
+      '@babel/helper-member-expression-to-functions': 7.17.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-replace-supers': 7.18.2
+      '@babel/helper-split-export-declaration': 7.16.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-create-regexp-features-plugin/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-annotate-as-pure': 7.18.6
+      regexpu-core: 5.0.1
+    dev: true
+
+  /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.18.2:
+    resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/traverse': 7.18.2
+      debug: 4.3.4
+      lodash.debounce: 4.0.8
+      resolve: 1.22.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-environment-visitor/7.18.2:
+    resolution: {integrity: sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-explode-assignable-expression/7.16.7:
+    resolution: {integrity: sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+    dev: true
+
+  /@babel/helper-function-name/7.17.9:
+    resolution: {integrity: sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.16.7
+      '@babel/types': 7.18.7
+
+  /@babel/helper-hoist-variables/7.16.7:
+    resolution: {integrity: sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+
+  /@babel/helper-member-expression-to-functions/7.17.7:
+    resolution: {integrity: sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+    dev: true
+
+  /@babel/helper-module-imports/7.16.7:
+    resolution: {integrity: sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+
+  /@babel/helper-module-imports/7.18.6:
+    resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+
+  /@babel/helper-module-transforms/7.18.0:
+    resolution: {integrity: sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.18.2
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-simple-access': 7.18.2
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/helper-validator-identifier': 7.18.6
+      '@babel/template': 7.16.7
+      '@babel/traverse': 7.18.2
+      '@babel/types': 7.18.7
+    transitivePeerDependencies:
+      - supports-color
+
+  /@babel/helper-optimise-call-expression/7.16.7:
+    resolution: {integrity: sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+    dev: true
+
+  /@babel/helper-plugin-utils/7.17.12:
+    resolution: {integrity: sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-plugin-utils/7.18.6:
+    resolution: {integrity: sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-remap-async-to-generator/7.16.8:
+    resolution: {integrity: sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-annotate-as-pure': 7.18.6
+      '@babel/helper-wrap-function': 7.16.8
+      '@babel/types': 7.18.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-replace-supers/7.18.2:
+    resolution: {integrity: sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.18.2
+      '@babel/helper-member-expression-to-functions': 7.17.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/traverse': 7.18.2
+      '@babel/types': 7.18.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-simple-access/7.18.2:
+    resolution: {integrity: sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+
+  /@babel/helper-skip-transparent-expression-wrappers/7.16.0:
+    resolution: {integrity: sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+    dev: true
+
+  /@babel/helper-split-export-declaration/7.16.7:
+    resolution: {integrity: sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.7
+
+  /@babel/helper-validator-identifier/7.16.7:
+    resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-validator-identifier/7.18.6:
+    resolution: {integrity: sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-validator-option/7.16.7:
+    resolution: {integrity: sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==}
+    engines: {node: '>=6.9.0'}
+
+  /@babel/helper-wrap-function/7.16.8:
+    resolution: {integrity: sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-function-name': 7.17.9
+      '@babel/template': 7.16.7
+      '@babel/traverse': 7.18.2
+      '@babel/types': 7.18.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helpers/7.18.2:
+    resolution: {integrity: sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.16.7
+      '@babel/traverse': 7.18.2
+      '@babel/types': 7.18.7
+    transitivePeerDependencies:
+      - supports-color
+
+  /@babel/highlight/7.17.12:
+    resolution: {integrity: sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.18.6
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+
+  /@babel/parser/7.18.4:
+    resolution: {integrity: sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.18.7
+
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-async-generator-functions/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-remap-async-to-generator': 7.16.8
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-class-properties/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-class-static-block/7.18.0_@babel+core@7.18.2:
+    resolution: {integrity: sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-decorators/7.17.9_@babel+core@7.18.2:
+    resolution: {integrity: sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-replace-supers': 7.18.2
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/plugin-syntax-decorators': 7.17.0_@babel+core@7.18.2
+      charcodes: 0.2.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-export-namespace-from/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-json-strings/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-logical-assignment-operators/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-nullish-coalescing-operator/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-object-rest-spread/7.18.0_@babel+core@7.18.2:
+    resolution: {integrity: sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.17.10
+      '@babel/core': 7.18.2
+      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-transform-parameters': 7.17.12_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-optional-chaining/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-private-methods/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-private-property-in-object/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-unicode-property-regex/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.2:
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+
+  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.2:
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.18.2:
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-syntax-decorators/7.17.0_@babel+core@7.18.2:
+    resolution: {integrity: sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-syntax-flow/7.18.6_@babel+core@7.18.2:
+    resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+
+  /@babel/plugin-syntax-import-assertions/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+
+  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.18.2:
+    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+
+  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.2:
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.2:
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.18.2:
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.2:
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+
+  /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+
+  /@babel/plugin-transform-arrow-functions/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-async-to-generator/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-remap-async-to-generator': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-block-scoping/7.18.4_@babel+core@7.18.2:
+    resolution: {integrity: sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-classes/7.18.4_@babel+core@7.18.2:
+    resolution: {integrity: sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.18.2
+      '@babel/helper-function-name': 7.17.9
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-replace-supers': 7.18.2
+      '@babel/helper-split-export-declaration': 7.16.7
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-computed-properties/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-destructuring/7.18.0_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-duplicate-keys/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-flow-strip-types/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-transform-for-of/7.18.1_@babel+core@7.18.2:
+    resolution: {integrity: sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
+      '@babel/helper-function-name': 7.17.9
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-literals/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-modules-amd/7.18.0_@babel+core@7.18.2:
+    resolution: {integrity: sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-module-transforms': 7.18.0
+      '@babel/helper-plugin-utils': 7.17.12
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-commonjs/7.18.2_@babel+core@7.18.2:
+    resolution: {integrity: sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-module-transforms': 7.18.0
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-simple-access': 7.18.2
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-systemjs/7.18.4_@babel+core@7.18.2:
+    resolution: {integrity: sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-module-transforms': 7.18.0
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-validator-identifier': 7.16.7
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-umd/7.18.0_@babel+core@7.18.2:
+    resolution: {integrity: sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-module-transforms': 7.18.0
+      '@babel/helper-plugin-utils': 7.17.12
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-named-capturing-groups-regex/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-new-target/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-replace-supers': 7.18.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-parameters/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-react-display-name/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
+
+  /@babel/plugin-transform-react-jsx-self/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-7S9G2B44EnYOx74mue02t1uD8ckWZ/ee6Uz/qfdzc35uWHX5NgRy9i+iJSb2LFRgMd+QV9zNcStQaazzzZ3n3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
+
+  /@babel/plugin-transform-react-jsx-source/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-rONFiQz9vgbsnaMtQlZCjIRwhJvlrPET8TabIUK2hzlXw9B9s2Ieaxte1SCOOXMbWRHodbKixNf3BLcWVOQ8Bw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
+
+  /@babel/plugin-transform-react-jsx/7.18.6_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-annotate-as-pure': 7.18.6
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.2
+      '@babel/types': 7.18.7
+
+  /@babel/plugin-transform-react-pure-annotations/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-regenerator/7.18.0_@babel+core@7.18.2:
+    resolution: {integrity: sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      regenerator-transform: 0.15.0
+    dev: true
+
+  /@babel/plugin-transform-reserved-words/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-runtime/7.17.10_@babel+core@7.18.2:
+    resolution: {integrity: sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-plugin-utils': 7.18.6
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.18.2
+      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.18.2
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.18.2
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-shorthand-properties/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-spread/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+    dev: true
+
+  /@babel/plugin-transform-sticky-regex/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-template-literals/7.18.2_@babel+core@7.18.2:
+    resolution: {integrity: sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-typeof-symbol/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-typescript/7.18.4_@babel+core@7.18.2:
+    resolution: {integrity: sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+    dev: true
+
+  /@babel/preset-env/7.18.2_@babel+core@7.18.2:
+    resolution: {integrity: sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.17.10
+      '@babel/core': 7.18.2
+      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-async-generator-functions': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-class-properties': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-class-static-block': 7.18.0_@babel+core@7.18.2
+      '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-proposal-export-namespace-from': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-json-strings': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-logical-assignment-operators': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-proposal-object-rest-spread': 7.18.0_@babel+core@7.18.2
+      '@babel/plugin-proposal-optional-catch-binding': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-private-methods': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-private-property-in-object': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-unicode-property-regex': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.2
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.2
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-import-assertions': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.2
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.2
+      '@babel/plugin-transform-arrow-functions': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-async-to-generator': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-block-scoped-functions': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-block-scoping': 7.18.4_@babel+core@7.18.2
+      '@babel/plugin-transform-classes': 7.18.4_@babel+core@7.18.2
+      '@babel/plugin-transform-computed-properties': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-destructuring': 7.18.0_@babel+core@7.18.2
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-duplicate-keys': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-exponentiation-operator': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-for-of': 7.18.1_@babel+core@7.18.2
+      '@babel/plugin-transform-function-name': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-literals': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-member-expression-literals': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-modules-amd': 7.18.0_@babel+core@7.18.2
+      '@babel/plugin-transform-modules-commonjs': 7.18.2_@babel+core@7.18.2
+      '@babel/plugin-transform-modules-systemjs': 7.18.4_@babel+core@7.18.2
+      '@babel/plugin-transform-modules-umd': 7.18.0_@babel+core@7.18.2
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-new-target': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-object-super': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-parameters': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-property-literals': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-regenerator': 7.18.0_@babel+core@7.18.2
+      '@babel/plugin-transform-reserved-words': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-spread': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-sticky-regex': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-template-literals': 7.18.2_@babel+core@7.18.2
+      '@babel/plugin-transform-typeof-symbol': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-unicode-escapes': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-unicode-regex': 7.16.7_@babel+core@7.18.2
+      '@babel/preset-modules': 0.1.5_@babel+core@7.18.2
+      '@babel/types': 7.18.4
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.18.2
+      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.18.2
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.18.2
+      core-js-compat: 3.22.5
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/preset-modules/0.1.5_@babel+core@7.18.2:
+    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/plugin-proposal-unicode-property-regex': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.18.2
+      '@babel/types': 7.18.4
+      esutils: 2.0.3
+    dev: true
+
+  /@babel/preset-react/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-transform-react-display-name': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
+      '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-react-pure-annotations': 7.16.7_@babel+core@7.18.2
+    dev: true
+
+  /@babel/preset-typescript/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-transform-typescript': 7.18.4_@babel+core@7.18.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/runtime-corejs3/7.14.6:
+    resolution: {integrity: sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      core-js-pure: 3.14.0
+      regenerator-runtime: 0.13.7
+    dev: true
+
+  /@babel/runtime/7.17.9:
+    resolution: {integrity: sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.7
+
+  /@babel/template/7.16.7:
+    resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/parser': 7.18.4
+      '@babel/types': 7.18.7
+
+  /@babel/traverse/7.18.2:
+    resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/generator': 7.18.2
+      '@babel/helper-environment-visitor': 7.18.2
+      '@babel/helper-function-name': 7.17.9
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/parser': 7.18.4
+      '@babel/types': 7.18.7
+      debug: 4.3.4
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  /@babel/traverse/7.18.2_supports-color@5.5.0:
+    resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/generator': 7.18.2
+      '@babel/helper-environment-visitor': 7.18.2
+      '@babel/helper-function-name': 7.17.9
+      '@babel/helper-hoist-variables': 7.16.7
+      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/parser': 7.18.4
+      '@babel/types': 7.18.7
+      debug: 4.3.4_supports-color@5.5.0
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  /@babel/types/7.18.4:
+    resolution: {integrity: sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.16.7
+      to-fast-properties: 2.0.0
+
+  /@babel/types/7.18.7:
+    resolution: {integrity: sha512-QG3yxTcTIBoAcQmkCs+wAPYZhu7Dk9rXKacINfNbdJDNERTbLQbHGyVG8q/YGMPeCJRIhSY0+fTc5+xuh6WPSQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.18.6
+      to-fast-properties: 2.0.0
+
+  /@bcoe/v8-coverage/0.2.3:
+    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
+
+  /@cspotcode/source-map-support/0.8.1:
+    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.9
+
+  /@cush/relative/1.0.0:
+    resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
+    dev: false
+
+  /@emotion/is-prop-valid/0.8.8:
+    resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==}
+    dependencies:
+      '@emotion/memoize': 0.7.4
+
+  /@emotion/memoize/0.7.4:
+    resolution: {integrity: sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==}
+
+  /@emotion/stylis/0.8.5:
+    resolution: {integrity: sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==}
+
+  /@emotion/unitless/0.7.5:
+    resolution: {integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==}
+
+  /@eslint/eslintrc/1.3.0:
+    resolution: {integrity: sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      ajv: 6.12.6
+      debug: 4.3.4
+      espree: 9.3.2
+      globals: 13.15.0
+      ignore: 5.2.0
+      import-fresh: 3.3.0
+      js-yaml: 4.1.0
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@fortawesome/fontawesome-free/6.1.1:
+    resolution: {integrity: sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg==}
+    engines: {node: '>=6'}
+    requiresBuild: true
+    dev: false
+
+  /@hookform/error-message/2.0.0_l2dcsysovzdujulgxvsen7vbsm:
+    resolution: {integrity: sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+      react-hook-form: ^7.0.0
+    dependencies:
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-hook-form: 7.6.9_react@18.1.0
+    dev: false
+
+  /@hookform/resolvers/2.8.9_react-hook-form@7.6.9:
+    resolution: {integrity: sha512-IXwGpjewxScF4N2kuyYDip6ABqH4lCg9n1f1mp0vbmKik+u+nestpbtdEs6U1WQZxwaoK/2APv1+MEr4czX7XA==}
+    peerDependencies:
+      react-hook-form: ^7.0.0
+    dependencies:
+      react-hook-form: 7.6.9_react@18.1.0
+    dev: false
+
+  /@humanwhocodes/config-array/0.9.5:
+    resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==}
+    engines: {node: '>=10.10.0'}
+    dependencies:
+      '@humanwhocodes/object-schema': 1.2.1
+      debug: 4.3.4
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@humanwhocodes/object-schema/1.2.1:
+    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
+    dev: true
+
+  /@istanbuljs/load-nyc-config/1.1.0:
+    resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      camelcase: 5.3.1
+      find-up: 4.1.0
+      get-package-type: 0.1.0
+      js-yaml: 3.14.1
+      resolve-from: 5.0.0
+
+  /@istanbuljs/schema/0.1.3:
+    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
+    engines: {node: '>=8'}
+
+  /@jest/console/28.1.1:
+    resolution: {integrity: sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+      chalk: 4.1.2
+      jest-message-util: 28.1.1
+      jest-util: 28.1.1
+      slash: 3.0.0
+
+  /@jest/core/28.1.1_ts-node@10.8.1:
+    resolution: {integrity: sha512-3pYsBoZZ42tXMdlcFeCc/0j9kOlK7MYuXs2B1QbvDgMoW1K9NJ4G/VYvIbMb26iqlkTfPHo7SC2JgjDOk/mxXw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/console': 28.1.1
+      '@jest/reporters': 28.1.1
+      '@jest/test-result': 28.1.1
+      '@jest/transform': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      ci-info: 3.3.1
+      exit: 0.1.2
+      graceful-fs: 4.2.10
+      jest-changed-files: 28.0.2
+      jest-config: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+      jest-haste-map: 28.1.1
+      jest-message-util: 28.1.1
+      jest-regex-util: 28.0.2
+      jest-resolve: 28.1.1
+      jest-resolve-dependencies: 28.1.1
+      jest-runner: 28.1.1
+      jest-runtime: 28.1.1
+      jest-snapshot: 28.1.1
+      jest-util: 28.1.1
+      jest-validate: 28.1.1
+      jest-watcher: 28.1.1
+      micromatch: 4.0.5
+      pretty-format: 28.1.1
+      rimraf: 3.0.2
+      slash: 3.0.0
+      strip-ansi: 6.0.1
+    transitivePeerDependencies:
+      - supports-color
+      - ts-node
+
+  /@jest/environment/28.1.1:
+    resolution: {integrity: sha512-9auVQ2GzQ7nrU+lAr8KyY838YahElTX9HVjbQPPS2XjlxQ+na18G113OoBhyBGBtD6ZnO/SrUy5WR8EzOj1/Uw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/fake-timers': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+      jest-mock: 28.1.1
+
+  /@jest/expect-utils/28.1.1:
+    resolution: {integrity: sha512-n/ghlvdhCdMI/hTcnn4qV57kQuV9OTsZzH1TTCVARANKhl6hXJqLKUkwX69ftMGpsbpt96SsDD8n8LD2d9+FRw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      jest-get-type: 28.0.2
+
+  /@jest/expect/28.1.1:
+    resolution: {integrity: sha512-/+tQprrFoT6lfkMj4mW/mUIfAmmk/+iQPmg7mLDIFOf2lyf7EBHaS+x3RbeR0VZVMe55IvX7QRoT/2aK3AuUXg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      expect: 28.1.1
+      jest-snapshot: 28.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /@jest/fake-timers/28.1.1:
+    resolution: {integrity: sha512-BY/3+TyLs5+q87rGWrGUY5f8e8uC3LsVHS9Diz8+FV3ARXL4sNnkLlIB8dvDvRrp+LUCGM+DLqlsYubizGUjIA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/types': 28.1.1
+      '@sinonjs/fake-timers': 9.1.2
+      '@types/node': 16.11.7
+      jest-message-util: 28.1.1
+      jest-mock: 28.1.1
+      jest-util: 28.1.1
+
+  /@jest/globals/28.1.1:
+    resolution: {integrity: sha512-dEgl/6v7ToB4vXItdvcltJBgny0xBE6xy6IYQrPJAJggdEinGxCDMivNv7sFzPcTITGquXD6UJwYxfJ/5ZwDSg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/environment': 28.1.1
+      '@jest/expect': 28.1.1
+      '@jest/types': 28.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /@jest/reporters/28.1.1:
+    resolution: {integrity: sha512-597Zj4D4d88sZrzM4atEGLuO7SdA/YrOv9SRXHXRNC+/FwPCWxZhBAEzhXoiJzfRwn8zes/EjS8Lo6DouGN5Gg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@bcoe/v8-coverage': 0.2.3
+      '@jest/console': 28.1.1
+      '@jest/test-result': 28.1.1
+      '@jest/transform': 28.1.1
+      '@jest/types': 28.1.1
+      '@jridgewell/trace-mapping': 0.3.13
+      '@types/node': 16.11.7
+      chalk: 4.1.2
+      collect-v8-coverage: 1.0.1
+      exit: 0.1.2
+      glob: 7.2.0
+      graceful-fs: 4.2.10
+      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-instrument: 5.2.0
+      istanbul-lib-report: 3.0.0
+      istanbul-lib-source-maps: 4.0.1
+      istanbul-reports: 3.1.4
+      jest-message-util: 28.1.1
+      jest-util: 28.1.1
+      jest-worker: 28.1.1
+      slash: 3.0.0
+      string-length: 4.0.2
+      strip-ansi: 6.0.1
+      terminal-link: 2.1.1
+      v8-to-istanbul: 9.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /@jest/schemas/28.0.2:
+    resolution: {integrity: sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@sinclair/typebox': 0.23.5
+
+  /@jest/source-map/28.0.2:
+    resolution: {integrity: sha512-Y9dxC8ZpN3kImkk0LkK5XCEneYMAXlZ8m5bflmSL5vrwyeUpJfentacCUg6fOb8NOpOO7hz2+l37MV77T6BFPw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.13
+      callsites: 3.1.0
+      graceful-fs: 4.2.10
+
+  /@jest/test-result/28.1.1:
+    resolution: {integrity: sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/console': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/istanbul-lib-coverage': 2.0.3
+      collect-v8-coverage: 1.0.1
+
+  /@jest/test-sequencer/28.1.1:
+    resolution: {integrity: sha512-nuL+dNSVMcWB7OOtgb0EGH5AjO4UBCt68SLP08rwmC+iRhyuJWS9MtZ/MpipxFwKAlHFftbMsydXqWre8B0+XA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/test-result': 28.1.1
+      graceful-fs: 4.2.10
+      jest-haste-map: 28.1.1
+      slash: 3.0.0
+
+  /@jest/transform/28.1.1:
+    resolution: {integrity: sha512-PkfaTUuvjUarl1EDr5ZQcCA++oXkFCP9QFUkG0yVKVmNObjhrqDy0kbMpMebfHWm3CCDHjYNem9eUSH8suVNHQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@babel/core': 7.18.2
+      '@jest/types': 28.1.1
+      '@jridgewell/trace-mapping': 0.3.13
+      babel-plugin-istanbul: 6.1.1
+      chalk: 4.1.2
+      convert-source-map: 1.7.0
+      fast-json-stable-stringify: 2.1.0
+      graceful-fs: 4.2.10
+      jest-haste-map: 28.1.1
+      jest-regex-util: 28.0.2
+      jest-util: 28.1.1
+      micromatch: 4.0.5
+      pirates: 4.0.5
+      slash: 3.0.0
+      write-file-atomic: 4.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /@jest/types/28.1.1:
+    resolution: {integrity: sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/schemas': 28.0.2
+      '@types/istanbul-lib-coverage': 2.0.3
+      '@types/istanbul-reports': 3.0.1
+      '@types/node': 16.11.7
+      '@types/yargs': 17.0.10
+      chalk: 4.1.2
+
+  /@jridgewell/gen-mapping/0.1.1:
+    resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      '@jridgewell/set-array': 1.1.1
+      '@jridgewell/sourcemap-codec': 1.4.13
+
+  /@jridgewell/gen-mapping/0.3.1:
+    resolution: {integrity: sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      '@jridgewell/set-array': 1.1.1
+      '@jridgewell/sourcemap-codec': 1.4.13
+      '@jridgewell/trace-mapping': 0.3.13
+
+  /@jridgewell/resolve-uri/3.0.7:
+    resolution: {integrity: sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==}
+    engines: {node: '>=6.0.0'}
+
+  /@jridgewell/set-array/1.1.1:
+    resolution: {integrity: sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==}
+    engines: {node: '>=6.0.0'}
+
+  /@jridgewell/sourcemap-codec/1.4.13:
+    resolution: {integrity: sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==}
+
+  /@jridgewell/trace-mapping/0.3.13:
+    resolution: {integrity: sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==}
+    dependencies:
+      '@jridgewell/resolve-uri': 3.0.7
+      '@jridgewell/sourcemap-codec': 1.4.13
+
+  /@jridgewell/trace-mapping/0.3.9:
+    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+    dependencies:
+      '@jridgewell/resolve-uri': 3.0.7
+      '@jridgewell/sourcemap-codec': 1.4.13
+
+  /@nestjs/common/8.4.4_47vcjb2de6lyibr6g4enoa5lyu:
+    resolution: {integrity: sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==}
+    peerDependencies:
+      cache-manager: '*'
+      class-transformer: '*'
+      class-validator: '*'
+      reflect-metadata: ^0.1.12
+      rxjs: ^7.1.0
+    peerDependenciesMeta:
+      cache-manager:
+        optional: true
+      class-transformer:
+        optional: true
+      class-validator:
+        optional: true
+    dependencies:
+      axios: 0.26.1
+      iterare: 1.2.1
+      reflect-metadata: 0.1.13
+      rxjs: 7.5.5
+      tslib: 2.3.1
+      uuid: 8.3.2
+    transitivePeerDependencies:
+      - debug
+    dev: true
+
+  /@nestjs/core/8.4.4_ozyn6uy6pikqhtn6hfkzt5a5w4:
+    resolution: {integrity: sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==}
+    requiresBuild: true
+    peerDependencies:
+      '@nestjs/common': ^8.0.0
+      '@nestjs/microservices': ^8.0.0
+      '@nestjs/platform-express': ^8.0.0
+      '@nestjs/websockets': ^8.0.0
+      reflect-metadata: ^0.1.12
+      rxjs: ^7.1.0
+    peerDependenciesMeta:
+      '@nestjs/microservices':
+        optional: true
+      '@nestjs/platform-express':
+        optional: true
+      '@nestjs/websockets':
+        optional: true
+    dependencies:
+      '@nestjs/common': 8.4.4_47vcjb2de6lyibr6g4enoa5lyu
+      '@nuxtjs/opencollective': 0.3.2
+      fast-safe-stringify: 2.1.1
+      iterare: 1.2.1
+      object-hash: 3.0.0
+      path-to-regexp: 3.2.0
+      reflect-metadata: 0.1.13
+      rxjs: 7.5.5
+      tslib: 2.3.1
+      uuid: 8.3.2
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
+  /@nodelib/fs.scandir/2.1.5:
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      run-parallel: 1.2.0
+    dev: true
+
+  /@nodelib/fs.stat/2.0.5:
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
+    dev: true
+
+  /@nodelib/fs.walk/1.2.7:
+    resolution: {integrity: sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==}
+    engines: {node: '>= 8'}
+    dependencies:
+      '@nodelib/fs.scandir': 2.1.5
+      fastq: 1.11.0
+    dev: true
+
+  /@nuxtjs/opencollective/0.3.2:
+    resolution: {integrity: sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==}
+    engines: {node: '>=8.0.0', npm: '>=5.0.0'}
+    hasBin: true
+    dependencies:
+      chalk: 4.1.2
+      consola: 2.15.3
+      node-fetch: 2.6.7
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
+  /@openapitools/openapi-generator-cli/2.5.1:
+    resolution: {integrity: sha512-WSRQBU0dCSVD+0Qv8iCsv0C4iMaZe/NpJ/CT4SmrEYLH3txoKTE8wEfbdj/kqShS8Or0YEGDPUzhSIKY151L0w==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+    requiresBuild: true
+    dependencies:
+      '@nestjs/common': 8.4.4_47vcjb2de6lyibr6g4enoa5lyu
+      '@nestjs/core': 8.4.4_ozyn6uy6pikqhtn6hfkzt5a5w4
+      '@nuxtjs/opencollective': 0.3.2
+      chalk: 4.1.2
+      commander: 8.3.0
+      compare-versions: 4.1.3
+      concurrently: 6.5.1
+      console.table: 0.10.0
+      fs-extra: 10.0.1
+      glob: 7.1.6
+      inquirer: 8.2.2
+      lodash: 4.17.21
+      reflect-metadata: 0.1.13
+      rxjs: 7.5.5
+      tslib: 2.0.3
+    transitivePeerDependencies:
+      - '@nestjs/microservices'
+      - '@nestjs/platform-express'
+      - '@nestjs/websockets'
+      - cache-manager
+      - class-transformer
+      - class-validator
+      - debug
+      - encoding
+    dev: true
+
+  /@popperjs/core/2.9.2:
+    resolution: {integrity: sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==}
+
+  /@reduxjs/toolkit/1.8.2_ydj23m2apjohmawqetv7uxfa2i:
+    resolution: {integrity: sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==}
+    peerDependencies:
+      react: ^16.9.0 || ^17.0.0 || ^18
+      react-redux: ^7.2.1 || ^8.0.0-beta
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-redux:
+        optional: true
+    dependencies:
+      immer: 9.0.12
+      react: 18.1.0
+      react-redux: 7.2.6_ef5jwxihqo6n7gxfmzogljlgcm
+      redux: 4.1.2
+      redux-thunk: 2.4.1_redux@4.1.2
+      reselect: 4.1.5
+    dev: false
+
+  /@rollup/pluginutils/4.2.1:
+    resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
+    engines: {node: '>= 8.0.0'}
+    dependencies:
+      estree-walker: 2.0.2
+      picomatch: 2.3.1
+    dev: false
+
+  /@rooks/use-outside-click-ref/4.11.2_react@18.1.0:
+    resolution: {integrity: sha512-w2bCW69zcpLh0KmN/odAuBsQ3sps+73KEu7zMOi0o4YMfDo+tXcqwlTJiLYysd0BEoQC9pNIklzZmI9zZep69g==}
+    peerDependencies:
+      react: '>=16.8.0'
+    dependencies:
+      react: 18.1.0
+    dev: false
+
+  /@rushstack/eslint-patch/1.1.3:
+    resolution: {integrity: sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==}
+    dev: true
+
+  /@sinclair/typebox/0.23.5:
+    resolution: {integrity: sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==}
+
+  /@sinonjs/commons/1.8.3:
+    resolution: {integrity: sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==}
+    dependencies:
+      type-detect: 4.0.8
+
+  /@sinonjs/fake-timers/9.1.2:
+    resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
+    dependencies:
+      '@sinonjs/commons': 1.8.3
+
+  /@testing-library/dom/8.13.0:
+    resolution: {integrity: sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@babel/runtime': 7.17.9
+      '@types/aria-query': 4.2.2
+      aria-query: 5.0.0
+      chalk: 4.1.2
+      dom-accessibility-api: 0.5.10
+      lz-string: 1.4.4
+      pretty-format: 27.5.1
+
+  /@testing-library/jest-dom/5.16.4:
+    resolution: {integrity: sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==}
+    engines: {node: '>=8', npm: '>=6', yarn: '>=1'}
+    dependencies:
+      '@babel/runtime': 7.17.9
+      '@types/testing-library__jest-dom': 5.14.5
+      aria-query: 5.0.0
+      chalk: 3.0.0
+      css: 3.0.0
+      css.escape: 1.5.1
+      dom-accessibility-api: 0.5.10
+      lodash: 4.17.21
+      redent: 3.0.0
+    dev: true
+
+  /@testing-library/react/13.2.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      react: ^18.0.0
+      react-dom: ^18.0.0
+    dependencies:
+      '@babel/runtime': 7.17.9
+      '@testing-library/dom': 8.13.0
+      '@types/react-dom': 18.0.5
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+    dev: false
+
+  /@testing-library/user-event/13.5.0_tlwynutqiyp5mns3woioasuxnq:
+    resolution: {integrity: sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==}
+    engines: {node: '>=10', npm: '>=6'}
+    peerDependencies:
+      '@testing-library/dom': '>=7.21.4'
+    dependencies:
+      '@babel/runtime': 7.17.9
+      '@testing-library/dom': 8.13.0
+    dev: true
+
+  /@tootallnate/once/2.0.0:
+    resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
+    engines: {node: '>= 10'}
+    dev: true
+
+  /@tsconfig/node10/1.0.9:
+    resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
+
+  /@tsconfig/node12/1.0.11:
+    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
+
+  /@tsconfig/node14/1.0.3:
+    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
+
+  /@tsconfig/node16/1.0.3:
+    resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==}
+
+  /@types/aria-query/4.2.2:
+    resolution: {integrity: sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==}
+
+  /@types/babel__core/7.1.19:
+    resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
+    dependencies:
+      '@babel/parser': 7.18.4
+      '@babel/types': 7.18.7
+      '@types/babel__generator': 7.6.4
+      '@types/babel__template': 7.4.1
+      '@types/babel__traverse': 7.17.1
+
+  /@types/babel__generator/7.6.4:
+    resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
+    dependencies:
+      '@babel/types': 7.18.7
+
+  /@types/babel__template/7.4.1:
+    resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
+    dependencies:
+      '@babel/parser': 7.18.4
+      '@babel/types': 7.18.7
+
+  /@types/babel__traverse/7.17.1:
+    resolution: {integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==}
+    dependencies:
+      '@babel/types': 7.18.7
+
+  /@types/eventsource/1.1.8:
+    resolution: {integrity: sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==}
+    dev: true
+
+  /@types/graceful-fs/4.1.5:
+    resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
+    dependencies:
+      '@types/node': 16.11.7
+
+  /@types/history/4.7.11:
+    resolution: {integrity: sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==}
+    dev: true
+
+  /@types/hoist-non-react-statics/3.3.1:
+    resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==}
+    dependencies:
+      '@types/react': 18.0.9
+      hoist-non-react-statics: 3.3.2
+
+  /@types/istanbul-lib-coverage/2.0.3:
+    resolution: {integrity: sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==}
+
+  /@types/istanbul-lib-report/3.0.0:
+    resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==}
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.3
+
+  /@types/istanbul-reports/3.0.1:
+    resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==}
+    dependencies:
+      '@types/istanbul-lib-report': 3.0.0
+
+  /@types/jest/28.1.3:
+    resolution: {integrity: sha512-Tsbjk8Y2hkBaY/gJsataeb4q9Mubw9EOz7+4RjPkzD5KjTvHHs7cpws22InaoXxAVAhF5HfFbzJjo6oKWqSZLw==}
+    dependencies:
+      jest-matcher-utils: 28.1.1
+      pretty-format: 28.1.1
+
+  /@types/jsdom/16.2.14:
+    resolution: {integrity: sha512-6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w==}
+    dependencies:
+      '@types/node': 16.11.7
+      '@types/parse5': 6.0.3
+      '@types/tough-cookie': 4.0.2
+    dev: true
+
+  /@types/json-schema/7.0.11:
+    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
+    dev: true
+
+  /@types/json5/0.0.29:
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+    dev: true
+
+  /@types/lodash/4.14.177:
+    resolution: {integrity: sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==}
+
+  /@types/node/16.11.7:
+    resolution: {integrity: sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==}
+
+  /@types/parse-json/4.0.0:
+    resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
+    dev: true
+
+  /@types/parse5/6.0.3:
+    resolution: {integrity: sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==}
+    dev: true
+
+  /@types/prettier/2.6.3:
+    resolution: {integrity: sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==}
+
+  /@types/prop-types/15.7.5:
+    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
+
+  /@types/react-datepicker/4.3.4_react@18.1.0:
+    resolution: {integrity: sha512-5nTTz37KdTUgMZ1AAxztMWNtEnIMVRo8oCAEhIv0a6uUqDjvSKaMyPRpBV+8chi6f/A8wlTKJIpojpXca2dx3A==}
+    dependencies:
+      '@popperjs/core': 2.9.2
+      '@types/react': 18.0.9
+      date-fns: 2.27.0
+      react-popper: 2.2.5_kse2oiarfsejvukvxwgibirnca
+    transitivePeerDependencies:
+      - react
+    dev: true
+
+  /@types/react-dom/18.0.5:
+    resolution: {integrity: sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==}
+    dependencies:
+      '@types/react': 18.0.9
+
+  /@types/react-redux/7.1.24:
+    resolution: {integrity: sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==}
+    dependencies:
+      '@types/hoist-non-react-statics': 3.3.1
+      '@types/react': 18.0.9
+      hoist-non-react-statics: 3.3.2
+      redux: 4.1.2
+
+  /@types/react-router-dom/5.3.3:
+    resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==}
+    dependencies:
+      '@types/history': 4.7.11
+      '@types/react': 18.0.9
+      '@types/react-router': 5.1.18
+    dev: true
+
+  /@types/react-router/5.1.18:
+    resolution: {integrity: sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==}
+    dependencies:
+      '@types/history': 4.7.11
+      '@types/react': 18.0.9
+    dev: true
+
+  /@types/react/18.0.9:
+    resolution: {integrity: sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==}
+    dependencies:
+      '@types/prop-types': 15.7.5
+      '@types/scheduler': 0.16.2
+      csstype: 3.0.8
+
+  /@types/redux-mock-store/1.0.3:
+    resolution: {integrity: sha512-Wqe3tJa6x9MxMN4DJnMfZoBRBRak1XTPklqj4qkVm5VBpZnC8PSADf4kLuFQ9NAdHaowfWoEeUMz7NWc2GMtnA==}
+    dependencies:
+      redux: 4.1.2
+    dev: true
+
+  /@types/scheduler/0.16.2:
+    resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
+
+  /@types/stack-utils/2.0.1:
+    resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
+
+  /@types/styled-components/5.1.18:
+    resolution: {integrity: sha512-xPTYmWP7Mxk5TAD3pYsqjwA9G5fAI8e/S51QUJEl7EQD1siKCdiYXIWiH2lzoHRl+QqbQCJMcGv3YTF3OmyPdQ==}
+    dependencies:
+      '@types/hoist-non-react-statics': 3.3.1
+      '@types/react': 18.0.9
+      csstype: 3.0.8
+    dev: true
+
+  /@types/testing-library__jest-dom/5.14.5:
+    resolution: {integrity: sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==}
+    dependencies:
+      '@types/jest': 28.1.3
+
+  /@types/tough-cookie/4.0.2:
+    resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
+    dev: true
+
+  /@types/yargs-parser/20.2.0:
+    resolution: {integrity: sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==}
+
+  /@types/yargs/17.0.10:
+    resolution: {integrity: sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==}
+    dependencies:
+      '@types/yargs-parser': 20.2.0
+
+  /@types/yup/0.29.13:
+    resolution: {integrity: sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g==}
+    dev: false
+
+  /@typescript-eslint/eslint-plugin/5.29.0_uaxwak76nssfibsnotx5epygnu:
+    resolution: {integrity: sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      '@typescript-eslint/scope-manager': 5.29.0
+      '@typescript-eslint/type-utils': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      '@typescript-eslint/utils': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      debug: 4.3.4
+      eslint: 8.16.0
+      functional-red-black-tree: 1.0.1
+      ignore: 5.2.0
+      regexpp: 3.2.0
+      semver: 7.3.7
+      tsutils: 3.21.0_typescript@4.7.4
+      typescript: 4.7.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/experimental-utils/5.23.0_vjep2yp2sits3sqnodefgcbnfi:
+    resolution: {integrity: sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@typescript-eslint/utils': 5.23.0_vjep2yp2sits3sqnodefgcbnfi
+      eslint: 8.16.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/parser/5.29.0_vjep2yp2sits3sqnodefgcbnfi:
+    resolution: {integrity: sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/scope-manager': 5.29.0
+      '@typescript-eslint/types': 5.29.0
+      '@typescript-eslint/typescript-estree': 5.29.0_typescript@4.7.4
+      debug: 4.3.4
+      eslint: 8.16.0
+      typescript: 4.7.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/scope-manager/5.23.0:
+    resolution: {integrity: sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.23.0
+      '@typescript-eslint/visitor-keys': 5.23.0
+    dev: true
+
+  /@typescript-eslint/scope-manager/5.29.0:
+    resolution: {integrity: sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.29.0
+      '@typescript-eslint/visitor-keys': 5.29.0
+    dev: true
+
+  /@typescript-eslint/type-utils/5.29.0_vjep2yp2sits3sqnodefgcbnfi:
+    resolution: {integrity: sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/utils': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      debug: 4.3.4
+      eslint: 8.16.0
+      tsutils: 3.21.0_typescript@4.7.4
+      typescript: 4.7.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/types/5.23.0:
+    resolution: {integrity: sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /@typescript-eslint/types/5.29.0:
+    resolution: {integrity: sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /@typescript-eslint/typescript-estree/5.23.0_typescript@4.7.4:
+    resolution: {integrity: sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 5.23.0
+      '@typescript-eslint/visitor-keys': 5.23.0
+      debug: 4.3.4
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.3.7
+      tsutils: 3.21.0_typescript@4.7.4
+      typescript: 4.7.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/typescript-estree/5.29.0_typescript@4.7.4:
+    resolution: {integrity: sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 5.29.0
+      '@typescript-eslint/visitor-keys': 5.29.0
+      debug: 4.3.4
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.3.7
+      tsutils: 3.21.0_typescript@4.7.4
+      typescript: 4.7.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@typescript-eslint/utils/5.23.0_vjep2yp2sits3sqnodefgcbnfi:
+    resolution: {integrity: sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@types/json-schema': 7.0.11
+      '@typescript-eslint/scope-manager': 5.23.0
+      '@typescript-eslint/types': 5.23.0
+      '@typescript-eslint/typescript-estree': 5.23.0_typescript@4.7.4
+      eslint: 8.16.0
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0_eslint@8.16.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/utils/5.29.0_vjep2yp2sits3sqnodefgcbnfi:
+    resolution: {integrity: sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@types/json-schema': 7.0.11
+      '@typescript-eslint/scope-manager': 5.29.0
+      '@typescript-eslint/types': 5.29.0
+      '@typescript-eslint/typescript-estree': 5.29.0_typescript@4.7.4
+      eslint: 8.16.0
+      eslint-scope: 5.1.1
+      eslint-utils: 3.0.0_eslint@8.16.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /@typescript-eslint/visitor-keys/5.23.0:
+    resolution: {integrity: sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.23.0
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
+  /@typescript-eslint/visitor-keys/5.29.0:
+    resolution: {integrity: sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.29.0
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
+  /@vitejs/plugin-react/1.3.2:
+    resolution: {integrity: sha512-aurBNmMo0kz1O4qRoY+FM4epSA39y3ShWGuqfLRA/3z0oEJAdtoSfgA3aO98/PCCHAqMaduLxIxErWrVKIFzXA==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
+      '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-react-jsx-self': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-react-jsx-source': 7.16.7_@babel+core@7.18.2
+      '@rollup/pluginutils': 4.2.1
+      react-refresh: 0.13.0
+      resolve: 1.22.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /abab/2.0.6:
+    resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
+    dev: true
+
+  /ace-builds/1.4.13:
+    resolution: {integrity: sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ==}
+    dev: false
+
+  /acorn-globals/6.0.0:
+    resolution: {integrity: sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==}
+    dependencies:
+      acorn: 7.4.1
+      acorn-walk: 7.2.0
+    dev: true
+
+  /acorn-jsx/5.3.2_acorn@8.7.1:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      acorn: 8.7.1
+    dev: true
+
+  /acorn-walk/7.2.0:
+    resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
+    engines: {node: '>=0.4.0'}
+    dev: true
+
+  /acorn-walk/8.2.0:
+    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
+    engines: {node: '>=0.4.0'}
+
+  /acorn/7.4.1:
+    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+    dev: true
+
+  /acorn/8.7.1:
+    resolution: {integrity: sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  /agent-base/6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
+    engines: {node: '>= 6.0.0'}
+    dependencies:
+      debug: 4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /aggregate-error/3.1.0:
+    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
+    engines: {node: '>=8'}
+    dependencies:
+      clean-stack: 2.2.0
+      indent-string: 4.0.0
+    dev: true
+
+  /ajv/6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-json-stable-stringify: 2.1.0
+      json-schema-traverse: 0.4.1
+      uri-js: 4.4.1
+    dev: true
+
+  /ajv/8.8.2:
+    resolution: {integrity: sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==}
+    dependencies:
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
+    dev: false
+
+  /ansi-escapes/4.3.2:
+    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      type-fest: 0.21.3
+
+  /ansi-regex/5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  /ansi-regex/6.0.1:
+    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
+    engines: {node: '>=12'}
+
+  /ansi-styles/3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
+    dependencies:
+      color-convert: 1.9.3
+
+  /ansi-styles/4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+    dependencies:
+      color-convert: 2.0.1
+
+  /ansi-styles/5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
+  /ansi-styles/6.1.0:
+    resolution: {integrity: sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /anymatch/3.1.2:
+    resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==}
+    engines: {node: '>= 8'}
+    dependencies:
+      normalize-path: 3.0.0
+      picomatch: 2.3.1
+
+  /arg/4.1.3:
+    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+
+  /argparse/1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+    dependencies:
+      sprintf-js: 1.0.3
+
+  /argparse/2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+    dev: true
+
+  /aria-query/4.2.2:
+    resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
+    engines: {node: '>=6.0'}
+    dependencies:
+      '@babel/runtime': 7.17.9
+      '@babel/runtime-corejs3': 7.14.6
+    dev: true
+
+  /aria-query/5.0.0:
+    resolution: {integrity: sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==}
+    engines: {node: '>=6.0'}
+
+  /array-includes/3.1.5:
+    resolution: {integrity: sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+      get-intrinsic: 1.1.1
+      is-string: 1.0.7
+    dev: true
+
+  /array-union/2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /array.prototype.flat/1.3.0:
+    resolution: {integrity: sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+      es-shim-unscopables: 1.0.0
+    dev: true
+
+  /array.prototype.flatmap/1.3.0:
+    resolution: {integrity: sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+      es-shim-unscopables: 1.0.0
+    dev: true
+
+  /ast-types-flow/0.0.7:
+    resolution: {integrity: sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==}
+    dev: true
+
+  /astral-regex/2.0.0:
+    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /asynckit/0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+    dev: true
+
+  /atob/2.1.2:
+    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
+    engines: {node: '>= 4.5.0'}
+    hasBin: true
+    dev: true
+
+  /axe-core/4.3.5:
+    resolution: {integrity: sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /axios/0.26.1:
+    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
+    dependencies:
+      follow-redirects: 1.14.8
+    transitivePeerDependencies:
+      - debug
+    dev: true
+
+  /axobject-query/2.2.0:
+    resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
+    dev: true
+
+  /babel-jest/28.1.1_@babel+core@7.18.2:
+    resolution: {integrity: sha512-MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    peerDependencies:
+      '@babel/core': ^7.8.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@jest/transform': 28.1.1
+      '@types/babel__core': 7.1.19
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 28.1.1_@babel+core@7.18.2
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  /babel-plugin-dynamic-import-node/2.3.3:
+    resolution: {integrity: sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==}
+    dependencies:
+      object.assign: 4.1.2
+    dev: true
+
+  /babel-plugin-istanbul/6.1.1:
+    resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/helper-plugin-utils': 7.18.6
+      '@istanbuljs/load-nyc-config': 1.1.0
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-instrument: 5.2.0
+      test-exclude: 6.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  /babel-plugin-jest-hoist/28.1.1:
+    resolution: {integrity: sha512-NovGCy5Hn25uMJSAU8FaHqzs13cFoOI4lhIujiepssjCKRsAo3TA734RDWSGxuFTsUJXerYOqQQodlxgmtqbzw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@babel/template': 7.16.7
+      '@babel/types': 7.18.7
+      '@types/babel__core': 7.1.19
+      '@types/babel__traverse': 7.17.1
+
+  /babel-plugin-macros/3.1.0:
+    resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
+    engines: {node: '>=10', npm: '>=6'}
+    dependencies:
+      '@babel/runtime': 7.17.9
+      cosmiconfig: 7.0.1
+      resolve: 1.22.0
+    dev: true
+
+  /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.18.2:
+    resolution: {integrity: sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.17.10
+      '@babel/core': 7.18.2
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.2
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-polyfill-corejs3/0.5.2_@babel+core@7.18.2:
+    resolution: {integrity: sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.2
+      core-js-compat: 3.22.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /babel-plugin-styled-components/1.13.2_styled-components@5.3.1:
+    resolution: {integrity: sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==}
+    peerDependencies:
+      styled-components: '>= 2'
+    dependencies:
+      '@babel/helper-annotate-as-pure': 7.18.6
+      '@babel/helper-module-imports': 7.18.6
+      babel-plugin-syntax-jsx: 6.18.0
+      lodash: 4.17.21
+      styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
+
+  /babel-plugin-syntax-jsx/6.18.0:
+    resolution: {integrity: sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==}
+
+  /babel-plugin-transform-react-remove-prop-types/0.4.24:
+    resolution: {integrity: sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==}
+    dev: true
+
+  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.2:
+    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.2
+      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.2
+
+  /babel-preset-jest/28.1.1_@babel+core@7.18.2:
+    resolution: {integrity: sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.2
+      babel-plugin-jest-hoist: 28.1.1
+      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2
+
+  /babel-preset-react-app/10.0.1:
+    resolution: {integrity: sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==}
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/plugin-proposal-class-properties': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-decorators': 7.17.9_@babel+core@7.18.2
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-private-methods': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-proposal-private-property-in-object': 7.17.12_@babel+core@7.18.2
+      '@babel/plugin-transform-flow-strip-types': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-react-display-name': 7.16.7_@babel+core@7.18.2
+      '@babel/plugin-transform-runtime': 7.17.10_@babel+core@7.18.2
+      '@babel/preset-env': 7.18.2_@babel+core@7.18.2
+      '@babel/preset-react': 7.17.12_@babel+core@7.18.2
+      '@babel/preset-typescript': 7.17.12_@babel+core@7.18.2
+      '@babel/runtime': 7.17.9
+      babel-plugin-macros: 3.1.0
+      babel-plugin-transform-react-remove-prop-types: 0.4.24
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /balanced-match/1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  /base64-js/1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+    dev: true
+
+  /big-integer/1.6.51:
+    resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
+    engines: {node: '>=0.6'}
+    dev: false
+
+  /binary-extensions/2.2.0:
+    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
+    engines: {node: '>=8'}
+    dev: false
+
+  /bl/4.1.0:
+    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+    dependencies:
+      buffer: 5.7.1
+      inherits: 2.0.4
+      readable-stream: 3.6.0
+    dev: true
+
+  /brace-expansion/1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  /braces/3.0.2:
+    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
+    engines: {node: '>=8'}
+    dependencies:
+      fill-range: 7.0.1
+
+  /broadcast-channel/3.7.0:
+    resolution: {integrity: sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==}
+    dependencies:
+      '@babel/runtime': 7.17.9
+      detect-node: 2.1.0
+      js-sha3: 0.8.0
+      microseconds: 0.2.0
+      nano-time: 1.0.0
+      oblivious-set: 1.0.0
+      rimraf: 3.0.2
+      unload: 2.2.0
+    dev: false
+
+  /browser-process-hrtime/1.0.0:
+    resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==}
+    dev: true
+
+  /browserslist/4.20.4:
+    resolution: {integrity: sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+    dependencies:
+      caniuse-lite: 1.0.30001352
+      electron-to-chromium: 1.4.151
+      escalade: 3.1.1
+      node-releases: 2.0.5
+      picocolors: 1.0.0
+
+  /bs-logger/0.2.6:
+    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
+    engines: {node: '>= 6'}
+    dependencies:
+      fast-json-stable-stringify: 2.1.0
+    dev: true
+
+  /bser/2.1.1:
+    resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
+    dependencies:
+      node-int64: 0.4.0
+
+  /buffer-from/1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
+  /buffer/5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+    dev: true
+
+  /bulma/0.9.3:
+    resolution: {integrity: sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g==}
+    dev: false
+
+  /call-bind/1.0.2:
+    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
+    dependencies:
+      function-bind: 1.1.1
+      get-intrinsic: 1.1.1
+    dev: true
+
+  /call-me-maybe/1.0.1:
+    resolution: {integrity: sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==}
+    dev: false
+
+  /callsites/3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  /camelcase/5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
+  /camelcase/6.3.0:
+    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
+    engines: {node: '>=10'}
+
+  /camelize/1.0.0:
+    resolution: {integrity: sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==}
+
+  /caniuse-lite/1.0.30001352:
+    resolution: {integrity: sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==}
+
+  /chalk/2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      ansi-styles: 3.2.1
+      escape-string-regexp: 1.0.5
+      supports-color: 5.5.0
+
+  /chalk/3.0.0:
+    resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+    dev: true
+
+  /chalk/4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+
+  /char-regex/1.0.2:
+    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
+    engines: {node: '>=10'}
+
+  /char-regex/2.0.1:
+    resolution: {integrity: sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==}
+    engines: {node: '>=12.20'}
+    dev: false
+
+  /charcodes/0.2.0:
+    resolution: {integrity: sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==}
+    engines: {node: '>=6'}
+    dev: true
+
+  /chardet/0.7.0:
+    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
+    dev: true
+
+  /chokidar/3.5.2:
+    resolution: {integrity: sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==}
+    engines: {node: '>= 8.10.0'}
+    dependencies:
+      anymatch: 3.1.2
+      braces: 3.0.2
+      glob-parent: 5.1.2
+      is-binary-path: 2.1.0
+      is-glob: 4.0.3
+      normalize-path: 3.0.0
+      readdirp: 3.6.0
+    optionalDependencies:
+      fsevents: 2.3.2
+    dev: false
+
+  /ci-info/3.3.1:
+    resolution: {integrity: sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==}
+
+  /cjs-module-lexer/1.2.2:
+    resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
+
+  /classnames/2.3.1:
+    resolution: {integrity: sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==}
+    dev: false
+
+  /clean-stack/2.2.0:
+    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
+    engines: {node: '>=6'}
+    dev: true
+
+  /cli-cursor/3.1.0:
+    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
+    engines: {node: '>=8'}
+    dependencies:
+      restore-cursor: 3.1.0
+    dev: true
+
+  /cli-spinners/2.6.1:
+    resolution: {integrity: sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==}
+    engines: {node: '>=6'}
+    dev: true
+
+  /cli-truncate/2.1.0:
+    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
+    engines: {node: '>=8'}
+    dependencies:
+      slice-ansi: 3.0.0
+      string-width: 4.2.3
+    dev: true
+
+  /cli-truncate/3.1.0:
+    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      slice-ansi: 5.0.0
+      string-width: 5.1.2
+    dev: true
+
+  /cli-width/3.0.0:
+    resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
+    engines: {node: '>= 10'}
+    dev: true
+
+  /cliui/7.0.4:
+    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 7.0.0
+
+  /clone/1.0.4:
+    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
+    engines: {node: '>=0.8'}
+    dev: true
+
+  /co/4.6.0:
+    resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
+    engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
+
+  /collect-v8-coverage/1.0.1:
+    resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
+
+  /color-convert/1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+    dependencies:
+      color-name: 1.1.3
+
+  /color-convert/2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+    dependencies:
+      color-name: 1.1.4
+
+  /color-name/1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+
+  /color-name/1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  /colorette/2.0.19:
+    resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
+    dev: true
+
+  /combined-stream/1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
+    dependencies:
+      delayed-stream: 1.0.0
+    dev: true
+
+  /commander/8.3.0:
+    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
+    engines: {node: '>= 12'}
+    dev: true
+
+  /commander/9.3.0:
+    resolution: {integrity: sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==}
+    engines: {node: ^12.20.0 || >=14}
+    dev: true
+
+  /compare-versions/4.1.3:
+    resolution: {integrity: sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==}
+    dev: true
+
+  /concat-map/0.0.1:
+    resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
+
+  /concurrently/6.5.1:
+    resolution: {integrity: sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+    dependencies:
+      chalk: 4.1.2
+      date-fns: 2.27.0
+      lodash: 4.17.21
+      rxjs: 6.6.7
+      spawn-command: 0.0.2-1
+      supports-color: 8.1.1
+      tree-kill: 1.2.2
+      yargs: 16.2.0
+    dev: true
+
+  /confusing-browser-globals/1.0.11:
+    resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
+    dev: true
+
+  /consola/2.15.3:
+    resolution: {integrity: sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==}
+    dev: true
+
+  /console.table/0.10.0:
+    resolution: {integrity: sha1-CRcCVYiHW+/XDPLv9L7yxuLXXQQ=}
+    engines: {node: '> 0.10'}
+    dependencies:
+      easy-table: 1.1.0
+    dev: true
+
+  /convert-source-map/1.7.0:
+    resolution: {integrity: sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==}
+    dependencies:
+      safe-buffer: 5.1.2
+
+  /core-js-compat/3.22.5:
+    resolution: {integrity: sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==}
+    dependencies:
+      browserslist: 4.20.4
+      semver: 7.0.0
+    dev: true
+
+  /core-js-pure/3.14.0:
+    resolution: {integrity: sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==}
+    deprecated: core-js-pure@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
+    requiresBuild: true
+    dev: true
+
+  /core-js/3.14.0:
+    resolution: {integrity: sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==}
+    deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
+    requiresBuild: true
+
+  /cosmiconfig/7.0.1:
+    resolution: {integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@types/parse-json': 4.0.0
+      import-fresh: 3.3.0
+      parse-json: 5.2.0
+      path-type: 4.0.0
+      yaml: 1.10.2
+    dev: true
+
+  /create-require/1.1.1:
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+
+  /cross-spawn/7.0.3:
+    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+    engines: {node: '>= 8'}
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
+  /css-color-keywords/1.0.0:
+    resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==}
+    engines: {node: '>=4'}
+
+  /css-to-react-native/3.0.0:
+    resolution: {integrity: sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==}
+    dependencies:
+      camelize: 1.0.0
+      css-color-keywords: 1.0.0
+      postcss-value-parser: 4.1.0
+
+  /css.escape/1.5.1:
+    resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
+    dev: true
+
+  /css/3.0.0:
+    resolution: {integrity: sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==}
+    dependencies:
+      inherits: 2.0.4
+      source-map: 0.6.1
+      source-map-resolve: 0.6.0
+    dev: true
+
+  /cssom/0.3.8:
+    resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
+    dev: true
+
+  /cssom/0.5.0:
+    resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==}
+    dev: true
+
+  /cssstyle/2.3.0:
+    resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==}
+    engines: {node: '>=8'}
+    dependencies:
+      cssom: 0.3.8
+    dev: true
+
+  /csstype/3.0.8:
+    resolution: {integrity: sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==}
+
+  /damerau-levenshtein/1.0.7:
+    resolution: {integrity: sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==}
+    dev: true
+
+  /data-urls/3.0.2:
+    resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      abab: 2.0.6
+      whatwg-mimetype: 3.0.0
+      whatwg-url: 11.0.0
+    dev: true
+
+  /date-fns/2.27.0:
+    resolution: {integrity: sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q==}
+    engines: {node: '>=0.11'}
+
+  /dayjs/1.11.3:
+    resolution: {integrity: sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A==}
+    dev: false
+
+  /debug/2.6.9:
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.0.0
+    dev: true
+
+  /debug/3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.3
+    dev: true
+
+  /debug/4.3.4:
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.2
+
+  /debug/4.3.4_supports-color@5.5.0:
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.2
+      supports-color: 5.5.0
+
+  /decimal.js/10.3.1:
+    resolution: {integrity: sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==}
+    dev: true
+
+  /decode-uri-component/0.2.0:
+    resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==}
+    engines: {node: '>=0.10'}
+    dev: true
+
+  /dedent/0.7.0:
+    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
+
+  /deep-is/0.1.3:
+    resolution: {integrity: sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw==}
+    dev: true
+
+  /deepmerge/4.2.2:
+    resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
+    engines: {node: '>=0.10.0'}
+
+  /defaults/1.0.3:
+    resolution: {integrity: sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==}
+    dependencies:
+      clone: 1.0.4
+    dev: true
+
+  /define-properties/1.1.4:
+    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-property-descriptors: 1.0.0
+      object-keys: 1.1.1
+    dev: true
+
+  /delayed-stream/1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+    dev: true
+
+  /detect-newline/3.1.0:
+    resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
+    engines: {node: '>=8'}
+
+  /detect-node/2.1.0:
+    resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
+    dev: false
+
+  /diff-match-patch/1.0.5:
+    resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
+    dev: false
+
+  /diff-sequences/28.1.1:
+    resolution: {integrity: sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+
+  /diff/4.0.2:
+    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
+    engines: {node: '>=0.3.1'}
+
+  /dir-glob/3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+    engines: {node: '>=8'}
+    dependencies:
+      path-type: 4.0.0
+    dev: true
+
+  /doctrine/2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      esutils: 2.0.3
+    dev: true
+
+  /doctrine/3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      esutils: 2.0.3
+    dev: true
+
+  /dom-accessibility-api/0.5.10:
+    resolution: {integrity: sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g==}
+
+  /domexception/4.0.0:
+    resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
+    engines: {node: '>=12'}
+    dependencies:
+      webidl-conversions: 7.0.0
+    dev: true
+
+  /dotenv/16.0.1:
+    resolution: {integrity: sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /eastasianwidth/0.2.0:
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+    dev: true
+
+  /easy-table/1.1.0:
+    resolution: {integrity: sha1-hvmrTBAvA3G3KXuSplHVgkvIy3M=}
+    optionalDependencies:
+      wcwidth: 1.0.1
+    dev: true
+
+  /electron-to-chromium/1.4.151:
+    resolution: {integrity: sha512-XaG2LpZi9fdiWYOqJh0dJy4SlVywCvpgYXhzOlZTp4JqSKqxn5URqOjbm9OMYB3aInA2GuHQiem1QUOc1yT0Pw==}
+
+  /emittery/0.10.2:
+    resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==}
+    engines: {node: '>=12'}
+
+  /emoji-regex/8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  /emoji-regex/9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+    dev: true
+
+  /error-ex/1.3.2:
+    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+    dependencies:
+      is-arrayish: 0.2.1
+
+  /es-abstract/1.20.0:
+    resolution: {integrity: sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      es-to-primitive: 1.2.1
+      function-bind: 1.1.1
+      function.prototype.name: 1.1.5
+      get-intrinsic: 1.1.1
+      get-symbol-description: 1.0.0
+      has: 1.0.3
+      has-property-descriptors: 1.0.0
+      has-symbols: 1.0.3
+      internal-slot: 1.0.3
+      is-callable: 1.2.4
+      is-negative-zero: 2.0.2
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.2
+      is-string: 1.0.7
+      is-weakref: 1.0.2
+      object-inspect: 1.12.2
+      object-keys: 1.1.1
+      object.assign: 4.1.2
+      regexp.prototype.flags: 1.4.3
+      string.prototype.trimend: 1.0.5
+      string.prototype.trimstart: 1.0.5
+      unbox-primitive: 1.0.2
+    dev: true
+
+  /es-shim-unscopables/1.0.0:
+    resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
+    dependencies:
+      has: 1.0.3
+    dev: true
+
+  /es-to-primitive/1.2.1:
+    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      is-callable: 1.2.4
+      is-date-object: 1.0.4
+      is-symbol: 1.0.4
+    dev: true
+
+  /esbuild-android-64/0.14.43:
+    resolution: {integrity: sha512-kqFXAS72K6cNrB6RiM7YJ5lNvmWRDSlpi7ZuRZ1hu1S3w0zlwcoCxWAyM23LQUyZSs1PbjHgdbbfYAN8IGh6xg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-android-arm64/0.14.43:
+    resolution: {integrity: sha512-bKS2BBFh+7XZY9rpjiHGRNA7LvWYbZWP87pLehggTG7tTaCDvj8qQGOU/OZSjCSKDYbgY7Q+oDw8RlYQ2Jt2BA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-darwin-64/0.14.43:
+    resolution: {integrity: sha512-/3PSilx011ttoieRGkSZ0XV8zjBf2C9enV4ScMMbCT4dpx0mFhMOpFnCHkOK0pWGB8LklykFyHrWk2z6DENVUg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-darwin-arm64/0.14.43:
+    resolution: {integrity: sha512-1HyFUKs8DMCBOvw1Qxpr5Vv/ThNcVIFb5xgXWK3pyT40WPvgYIiRTwJCvNs4l8i5qWF8/CK5bQxJVDjQvtv0Yw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-freebsd-64/0.14.43:
+    resolution: {integrity: sha512-FNWc05TPHYgaXjbPZO5/rJKSBslfG6BeMSs8GhwnqAKP56eEhvmzwnIz1QcC9cRVyO+IKqWNfmHFkCa1WJTULA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-freebsd-arm64/0.14.43:
+    resolution: {integrity: sha512-amrYopclz3VohqisOPR6hA3GOWA3LZC1WDLnp21RhNmoERmJ/vLnOpnrG2P/Zao+/erKTCUqmrCIPVtj58DRoA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-32/0.14.43:
+    resolution: {integrity: sha512-KoxoEra+9O3AKVvgDFvDkiuddCds6q71owSQEYwjtqRV7RwbPzKxJa6+uyzUulHcyGVq0g15K0oKG5CFBcvYDw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-64/0.14.43:
+    resolution: {integrity: sha512-EwINwGMyiJMgBby5/SbMqKcUhS5AYAZ2CpEBzSowsJPNBJEdhkCTtEjk757TN/wxgbu3QklqDM6KghY660QCUw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-arm/0.14.43:
+    resolution: {integrity: sha512-e6YzQUoDxxtyamuF12eVzzRC7bbEFSZohJ6igQB9tBqnNmIQY3fI6Cns3z2wxtbZ3f2o6idkD2fQnlvs2902Dg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-arm64/0.14.43:
+    resolution: {integrity: sha512-UlSpjMWllAc70zYbHxWuDS3FJytyuR/gHJYBr8BICcTNb/TSOYVBg6U7b3jZ3mILTrgzwJUHwhEwK18FZDouUQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-mips64le/0.14.43:
+    resolution: {integrity: sha512-f+v8cInPEL1/SDP//CfSYzcDNgE4CY3xgDV81DWm3KAPWzhvxARrKxB1Pstf5mB56yAslJDxu7ryBUPX207EZA==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-ppc64le/0.14.43:
+    resolution: {integrity: sha512-5wZYMDGAL/K2pqkdIsW+I4IR41kyfHr/QshJcNpUfK3RjB3VQcPWOaZmc+74rm4ZjVirYrtz+jWw0SgxtxRanA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-riscv64/0.14.43:
+    resolution: {integrity: sha512-lYcAOUxp85hC7lSjycJUVSmj4/9oEfSyXjb/ua9bNl8afonaduuqtw7hvKMoKuYnVwOCDw4RSfKpcnIRDWq+Bw==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-linux-s390x/0.14.43:
+    resolution: {integrity: sha512-27e43ZhHvhFE4nM7HqtUbMRu37I/4eNSUbb8FGZWszV+uLzMIsHDwLoBiJmw7G9N+hrehNPeQ4F5Ujad0DrUKQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-netbsd-64/0.14.43:
+    resolution: {integrity: sha512-2mH4QF6hHBn5zzAfxEI/2eBC0mspVsZ6UVo821LpAJKMvLJPBk3XJO5xwg7paDqSqpl7p6IRrAenW999AEfJhQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-openbsd-64/0.14.43:
+    resolution: {integrity: sha512-ZhQpiZjvqCqO8jKdGp9+8k9E/EHSA+zIWOg+grwZasI9RoblqJ1QiZqqi7jfd6ZrrG1UFBNGe4m0NFxCFbMVbg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-sunos-64/0.14.43:
+    resolution: {integrity: sha512-DgxSi9DaHReL9gYuul2rrQCAapgnCJkh3LSHPKsY26zytYppG0HgkgVF80zjIlvEsUbGBP/GHQzBtrezj/Zq1Q==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-windows-32/0.14.43:
+    resolution: {integrity: sha512-Ih3+2O5oExiqm0mY6YYE5dR0o8+AspccQ3vIAtRodwFvhuyGLjb0Hbmzun/F3Lw19nuhPMu3sW2fqIJ5xBxByw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-windows-64/0.14.43:
+    resolution: {integrity: sha512-8NsuNfI8xwFuJbrCuI+aBqNTYkrWErejFO5aYM+yHqyHuL8mmepLS9EPzAzk8rvfaJrhN0+RvKWAcymViHOKEw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild-windows-arm64/0.14.43:
+    resolution: {integrity: sha512-7ZlD7bo++kVRblJEoG+cepljkfP8bfuTPz5fIXzptwnPaFwGS6ahvfoYzY7WCf5v/1nX2X02HDraVItTgbHnKw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /esbuild/0.14.43:
+    resolution: {integrity: sha512-Uf94+kQmy/5jsFwKWiQB4hfo/RkM9Dh7b79p8yqd1tshULdr25G2szLz631NoH3s2ujnKEKVD16RmOxvCNKRFA==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      esbuild-android-64: 0.14.43
+      esbuild-android-arm64: 0.14.43
+      esbuild-darwin-64: 0.14.43
+      esbuild-darwin-arm64: 0.14.43
+      esbuild-freebsd-64: 0.14.43
+      esbuild-freebsd-arm64: 0.14.43
+      esbuild-linux-32: 0.14.43
+      esbuild-linux-64: 0.14.43
+      esbuild-linux-arm: 0.14.43
+      esbuild-linux-arm64: 0.14.43
+      esbuild-linux-mips64le: 0.14.43
+      esbuild-linux-ppc64le: 0.14.43
+      esbuild-linux-riscv64: 0.14.43
+      esbuild-linux-s390x: 0.14.43
+      esbuild-netbsd-64: 0.14.43
+      esbuild-openbsd-64: 0.14.43
+      esbuild-sunos-64: 0.14.43
+      esbuild-windows-32: 0.14.43
+      esbuild-windows-64: 0.14.43
+      esbuild-windows-arm64: 0.14.43
+    dev: false
+
+  /escalade/3.1.1:
+    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
+    engines: {node: '>=6'}
+
+  /escape-string-regexp/1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
+
+  /escape-string-regexp/2.0.0:
+    resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
+    engines: {node: '>=8'}
+
+  /escape-string-regexp/4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /escodegen/2.0.0:
+    resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==}
+    engines: {node: '>=6.0'}
+    hasBin: true
+    dependencies:
+      esprima: 4.0.1
+      estraverse: 5.3.0
+      esutils: 2.0.3
+      optionator: 0.8.3
+    optionalDependencies:
+      source-map: 0.6.1
+    dev: true
+
+  /eslint-config-airbnb-base/15.0.0_btspkuwbqkl4adpiufzbathtpi:
+    resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+    peerDependencies:
+      eslint: ^7.32.0 || ^8.2.0
+      eslint-plugin-import: ^2.25.2
+    dependencies:
+      confusing-browser-globals: 1.0.11
+      eslint: 8.16.0
+      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+      object.assign: 4.1.2
+      object.entries: 1.1.5
+      semver: 6.3.0
+    dev: true
+
+  /eslint-config-airbnb-typescript/17.0.0_l6wia5brkiej5f4nhesunbzj5y:
+    resolution: {integrity: sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': ^5.13.0
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^7.32.0 || ^8.2.0
+      eslint-plugin-import: ^2.25.3
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
+      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      eslint: 8.16.0
+      eslint-config-airbnb-base: 15.0.0_btspkuwbqkl4adpiufzbathtpi
+      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+    dev: true
+
+  /eslint-config-airbnb/19.0.4_pamhosqcenlxoxj4ke2dmvzava:
+    resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==}
+    engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^7.32.0 || ^8.2.0
+      eslint-plugin-import: ^2.25.3
+      eslint-plugin-jsx-a11y: ^6.5.1
+      eslint-plugin-react: ^7.28.0
+      eslint-plugin-react-hooks: ^4.3.0
+    dependencies:
+      eslint: 8.16.0
+      eslint-config-airbnb-base: 15.0.0_btspkuwbqkl4adpiufzbathtpi
+      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
+      eslint-plugin-react: 7.29.4_eslint@8.16.0
+      eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
+      object.assign: 4.1.2
+      object.entries: 1.1.5
+    dev: true
+
+  /eslint-config-prettier/8.5.0_eslint@8.16.0:
+    resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+    dependencies:
+      eslint: 8.16.0
+    dev: true
+
+  /eslint-config-react-app/7.0.1_widwqlnidgep55t2naywdlxcqa:
+    resolution: {integrity: sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      eslint: ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/eslint-parser': 7.17.0_j4uj5cgi2mksbox6kqvi7jrs6u
+      '@rushstack/eslint-patch': 1.1.3
+      '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
+      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      babel-preset-react-app: 10.0.1
+      confusing-browser-globals: 1.0.11
+      eslint: 8.16.0
+      eslint-plugin-flowtype: 8.0.3_lkudaqqzr27bp3dduyr3eevxq4
+      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+      eslint-plugin-jest: 25.7.0_lemdnf4suuyhpl5s2mhp2xyjqi
+      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
+      eslint-plugin-react: 7.29.4_eslint@8.16.0
+      eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
+      eslint-plugin-testing-library: 5.5.0_vjep2yp2sits3sqnodefgcbnfi
+      typescript: 4.7.4
+    transitivePeerDependencies:
+      - '@babel/plugin-syntax-flow'
+      - '@babel/plugin-transform-react-jsx'
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - jest
+      - supports-color
+    dev: true
+
+  /eslint-import-resolver-node/0.3.6:
+    resolution: {integrity: sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==}
+    dependencies:
+      debug: 3.2.7
+      resolve: 1.22.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /eslint-import-resolver-typescript/2.7.1_btspkuwbqkl4adpiufzbathtpi:
+    resolution: {integrity: sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      eslint: '*'
+      eslint-plugin-import: '*'
+    dependencies:
+      debug: 4.3.4
+      eslint: 8.16.0
+      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+      glob: 7.2.0
+      is-glob: 4.0.3
+      resolve: 1.22.0
+      tsconfig-paths: 3.14.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /eslint-module-utils/2.7.3_qqdd6sztsqjscz2z77otnj6nm4:
+    resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      debug: 3.2.7
+      eslint-import-resolver-node: 0.3.6
+      eslint-import-resolver-typescript: 2.7.1_btspkuwbqkl4adpiufzbathtpi
+      find-up: 2.1.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /eslint-plugin-flowtype/8.0.3_lkudaqqzr27bp3dduyr3eevxq4:
+    resolution: {integrity: sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      '@babel/plugin-syntax-flow': ^7.14.5
+      '@babel/plugin-transform-react-jsx': ^7.14.9
+      eslint: ^8.1.0
+    dependencies:
+      '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.2
+      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
+      eslint: 8.16.0
+      lodash: 4.17.21
+      string-natural-compare: 3.0.1
+    dev: true
+
+  /eslint-plugin-import/2.26.0_nw7vw77csnm53tfhadjrrkb4nu:
+    resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+    dependencies:
+      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      array-includes: 3.1.5
+      array.prototype.flat: 1.3.0
+      debug: 2.6.9
+      doctrine: 2.1.0
+      eslint: 8.16.0
+      eslint-import-resolver-node: 0.3.6
+      eslint-module-utils: 2.7.3_qqdd6sztsqjscz2z77otnj6nm4
+      has: 1.0.3
+      is-core-module: 2.9.0
+      is-glob: 4.0.3
+      minimatch: 3.1.2
+      object.values: 1.1.5
+      resolve: 1.22.0
+      tsconfig-paths: 3.14.1
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+    dev: true
+
+  /eslint-plugin-jest-dom/4.0.2_eslint@8.16.0:
+    resolution: {integrity: sha512-Jo51Atwyo2TdcUncjmU+UQeSTKh3sc2LF/M5i/R3nTU0Djw9V65KGJisdm/RtuKhy2KH/r7eQ1n6kwYFPNdHlA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'}
+    peerDependencies:
+      eslint: ^6.8.0 || ^7.0.0 || ^8.0.0
+    dependencies:
+      '@babel/runtime': 7.17.9
+      '@testing-library/dom': 8.13.0
+      eslint: 8.16.0
+      requireindex: 1.2.0
+    dev: true
+
+  /eslint-plugin-jest/25.7.0_lemdnf4suuyhpl5s2mhp2xyjqi:
+    resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': ^4.0.0 || ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      jest: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/eslint-plugin':
+        optional: true
+      jest:
+        optional: true
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
+      '@typescript-eslint/experimental-utils': 5.23.0_vjep2yp2sits3sqnodefgcbnfi
+      eslint: 8.16.0
+      jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /eslint-plugin-jsx-a11y/6.5.1_eslint@8.16.0:
+    resolution: {integrity: sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+    dependencies:
+      '@babel/runtime': 7.17.9
+      aria-query: 4.2.2
+      array-includes: 3.1.5
+      ast-types-flow: 0.0.7
+      axe-core: 4.3.5
+      axobject-query: 2.2.0
+      damerau-levenshtein: 1.0.7
+      emoji-regex: 9.2.2
+      eslint: 8.16.0
+      has: 1.0.3
+      jsx-ast-utils: 3.3.0
+      language-tags: 1.0.5
+      minimatch: 3.1.2
+    dev: true
+
+  /eslint-plugin-prettier/4.0.0_q7a4ir2sdihdzpzdlnbgmzjlpq:
+    resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==}
+    engines: {node: '>=6.0.0'}
+    peerDependencies:
+      eslint: '>=7.28.0'
+      eslint-config-prettier: '*'
+      prettier: '>=2.0.0'
+    peerDependenciesMeta:
+      eslint-config-prettier:
+        optional: true
+    dependencies:
+      eslint: 8.16.0
+      eslint-config-prettier: 8.5.0_eslint@8.16.0
+      prettier: 2.5.1
+      prettier-linter-helpers: 1.0.0
+    dev: true
+
+  /eslint-plugin-react-hooks/4.5.0_eslint@8.16.0:
+    resolution: {integrity: sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+    dependencies:
+      eslint: 8.16.0
+    dev: true
+
+  /eslint-plugin-react/7.29.4_eslint@8.16.0:
+    resolution: {integrity: sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+    dependencies:
+      array-includes: 3.1.5
+      array.prototype.flatmap: 1.3.0
+      doctrine: 2.1.0
+      eslint: 8.16.0
+      estraverse: 5.3.0
+      jsx-ast-utils: 3.3.0
+      minimatch: 3.1.2
+      object.entries: 1.1.5
+      object.fromentries: 2.0.5
+      object.hasown: 1.1.1
+      object.values: 1.1.5
+      prop-types: 15.8.1
+      resolve: 2.0.0-next.3
+      semver: 6.3.0
+      string.prototype.matchall: 4.0.6
+    dev: true
+
+  /eslint-plugin-testing-library/5.5.0_vjep2yp2sits3sqnodefgcbnfi:
+    resolution: {integrity: sha512-eWQ19l6uWL7LW8oeMyQVSGjVYFnBqk7DMHjadm0yOHBvX3Xi9OBrsNuxoAMdX4r7wlQ5WWpW46d+CB6FWFL/PQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6'}
+    peerDependencies:
+      eslint: ^7.5.0 || ^8.0.0
+    dependencies:
+      '@typescript-eslint/utils': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      eslint: 8.16.0
+    transitivePeerDependencies:
+      - supports-color
+      - typescript
+    dev: true
+
+  /eslint-scope/5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 4.3.0
+    dev: true
+
+  /eslint-scope/7.1.1:
+    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+    dev: true
+
+  /eslint-utils/3.0.0_eslint@8.16.0:
+    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
+    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
+    peerDependencies:
+      eslint: '>=5'
+    dependencies:
+      eslint: 8.16.0
+      eslint-visitor-keys: 2.1.0
+    dev: true
+
+  /eslint-visitor-keys/2.1.0:
+    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /eslint-visitor-keys/3.3.0:
+    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
+  /eslint/8.16.0:
+    resolution: {integrity: sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      '@eslint/eslintrc': 1.3.0
+      '@humanwhocodes/config-array': 0.9.5
+      ajv: 6.12.6
+      chalk: 4.1.2
+      cross-spawn: 7.0.3
+      debug: 4.3.4
+      doctrine: 3.0.0
+      escape-string-regexp: 4.0.0
+      eslint-scope: 7.1.1
+      eslint-utils: 3.0.0_eslint@8.16.0
+      eslint-visitor-keys: 3.3.0
+      espree: 9.3.2
+      esquery: 1.4.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 6.0.1
+      functional-red-black-tree: 1.0.1
+      glob-parent: 6.0.2
+      globals: 13.15.0
+      ignore: 5.2.0
+      import-fresh: 3.3.0
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      js-yaml: 4.1.0
+      json-stable-stringify-without-jsonify: 1.0.1
+      levn: 0.4.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.2
+      natural-compare: 1.4.0
+      optionator: 0.9.1
+      regexpp: 3.2.0
+      strip-ansi: 6.0.1
+      strip-json-comments: 3.1.1
+      text-table: 0.2.0
+      v8-compile-cache: 2.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /espree/9.3.2:
+    resolution: {integrity: sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      acorn: 8.7.1
+      acorn-jsx: 5.3.2_acorn@8.7.1
+      eslint-visitor-keys: 3.3.0
+    dev: true
+
+  /esprima/4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  /esquery/1.4.0:
+    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
+    engines: {node: '>=0.10'}
+    dependencies:
+      estraverse: 5.3.0
+    dev: true
+
+  /esrecurse/4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+    dependencies:
+      estraverse: 5.3.0
+    dev: true
+
+  /estraverse/4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
+    dev: true
+
+  /estraverse/5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+    dev: true
+
+  /estree-walker/2.0.2:
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+    dev: false
+
+  /esutils/2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /execa/5.1.1:
+    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
+    engines: {node: '>=10'}
+    dependencies:
+      cross-spawn: 7.0.3
+      get-stream: 6.0.1
+      human-signals: 2.1.0
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
+
+  /execa/6.1.0:
+    resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      cross-spawn: 7.0.3
+      get-stream: 6.0.1
+      human-signals: 3.0.1
+      is-stream: 3.0.0
+      merge-stream: 2.0.0
+      npm-run-path: 5.1.0
+      onetime: 6.0.0
+      signal-exit: 3.0.7
+      strip-final-newline: 3.0.0
+    dev: true
+
+  /exit/0.1.2:
+    resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
+    engines: {node: '>= 0.8.0'}
+
+  /expect/28.1.1:
+    resolution: {integrity: sha512-/AANEwGL0tWBwzLNOvO0yUdy2D52jVdNXppOqswC49sxMN2cPWsGCQdzuIf9tj6hHoBQzNvx75JUYuQAckPo3w==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/expect-utils': 28.1.1
+      jest-get-type: 28.0.2
+      jest-matcher-utils: 28.1.1
+      jest-message-util: 28.1.1
+      jest-util: 28.1.1
+
+  /external-editor/3.1.0:
+    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
+    engines: {node: '>=4'}
+    dependencies:
+      chardet: 0.7.0
+      iconv-lite: 0.4.24
+      tmp: 0.0.33
+    dev: true
+
+  /fast-deep-equal/3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  /fast-diff/1.2.0:
+    resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==}
+    dev: true
+
+  /fast-glob/3.2.11:
+    resolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==}
+    engines: {node: '>=8.6.0'}
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.7
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.5
+    dev: true
+
+  /fast-json-stable-stringify/2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  /fast-levenshtein/2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+    dev: true
+
+  /fast-safe-stringify/2.1.1:
+    resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
+    dev: true
+
+  /fastq/1.11.0:
+    resolution: {integrity: sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==}
+    dependencies:
+      reusify: 1.0.4
+    dev: true
+
+  /fb-watchman/2.0.1:
+    resolution: {integrity: sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==}
+    dependencies:
+      bser: 2.1.1
+
+  /fetch-mock-jest/1.5.1_node-fetch@2.6.7:
+    resolution: {integrity: sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ==}
+    engines: {node: '>=8.0.0'}
+    peerDependencies:
+      node-fetch: '*'
+    peerDependenciesMeta:
+      node-fetch:
+        optional: true
+    dependencies:
+      fetch-mock: 9.11.0_node-fetch@2.6.7
+      node-fetch: 2.6.7
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /fetch-mock/9.11.0_node-fetch@2.6.7:
+    resolution: {integrity: sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==}
+    engines: {node: '>=4.0.0'}
+    peerDependencies:
+      node-fetch: '*'
+    peerDependenciesMeta:
+      node-fetch:
+        optional: true
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/runtime': 7.17.9
+      core-js: 3.14.0
+      debug: 4.3.4
+      glob-to-regexp: 0.4.1
+      is-subset: 0.1.1
+      lodash.isequal: 4.5.0
+      node-fetch: 2.6.7
+      path-to-regexp: 2.4.0
+      querystring: 0.2.1
+      whatwg-url: 6.5.0
+    transitivePeerDependencies:
+      - supports-color
+
+  /figures/3.2.0:
+    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
+    engines: {node: '>=8'}
+    dependencies:
+      escape-string-regexp: 1.0.5
+    dev: true
+
+  /file-entry-cache/6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+    dependencies:
+      flat-cache: 3.0.4
+    dev: true
+
+  /fill-range/7.0.1:
+    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      to-regex-range: 5.0.1
+
+  /find-up/2.1.0:
+    resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      locate-path: 2.0.0
+    dev: true
+
+  /find-up/4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+    dependencies:
+      locate-path: 5.0.0
+      path-exists: 4.0.0
+
+  /flat-cache/3.0.4:
+    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+    dependencies:
+      flatted: 3.2.5
+      rimraf: 3.0.2
+    dev: true
+
+  /flatted/3.2.5:
+    resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==}
+    dev: true
+
+  /follow-redirects/1.14.8:
+    resolution: {integrity: sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dev: true
+
+  /form-data/4.0.0:
+    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
+    engines: {node: '>= 6'}
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+    dev: true
+
+  /format-util/1.0.5:
+    resolution: {integrity: sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==}
+    dev: false
+
+  /fs-extra/10.0.1:
+    resolution: {integrity: sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==}
+    engines: {node: '>=12'}
+    dependencies:
+      graceful-fs: 4.2.10
+      jsonfile: 6.1.0
+      universalify: 2.0.0
+    dev: true
+
+  /fs.realpath/1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  /fsevents/2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
+  /function-bind/1.1.1:
+    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
+
+  /function.prototype.name/1.1.5:
+    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+      functions-have-names: 1.2.3
+    dev: true
+
+  /functional-red-black-tree/1.0.1:
+    resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}
+    dev: true
+
+  /functions-have-names/1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+    dev: true
+
+  /gensync/1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
+  /get-caller-file/2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  /get-intrinsic/1.1.1:
+    resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==}
+    dependencies:
+      function-bind: 1.1.1
+      has: 1.0.3
+      has-symbols: 1.0.3
+    dev: true
+
+  /get-package-type/0.1.0:
+    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
+    engines: {node: '>=8.0.0'}
+
+  /get-stream/6.0.1:
+    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
+    engines: {node: '>=10'}
+
+  /get-symbol-description/1.0.0:
+    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.1.1
+    dev: true
+
+  /glob-parent/5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+    dependencies:
+      is-glob: 4.0.3
+
+  /glob-parent/6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      is-glob: 4.0.3
+    dev: true
+
+  /glob-regex/0.3.2:
+    resolution: {integrity: sha512-m5blUd3/OqDTWwzBBtWBPrGlAzatRywHameHeekAZyZrskYouOGdNB8T/q6JucucvJXtOuyHIn0/Yia7iDasDw==}
+    dev: false
+
+  /glob-to-regexp/0.4.1:
+    resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
+
+  /glob/7.1.6:
+    resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==}
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+    dev: true
+
+  /glob/7.2.0:
+    resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==}
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+
+  /globals/11.12.0:
+    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
+    engines: {node: '>=4'}
+
+  /globals/13.15.0:
+    resolution: {integrity: sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==}
+    engines: {node: '>=8'}
+    dependencies:
+      type-fest: 0.20.2
+    dev: true
+
+  /globby/11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
+    dependencies:
+      array-union: 2.1.0
+      dir-glob: 3.0.1
+      fast-glob: 3.2.11
+      ignore: 5.2.0
+      merge2: 1.4.1
+      slash: 3.0.0
+    dev: true
+
+  /globrex/0.1.2:
+    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
+    dev: false
+
+  /graceful-fs/4.2.10:
+    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
+
+  /has-bigints/1.0.2:
+    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+    dev: true
+
+  /has-flag/3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
+
+  /has-flag/4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  /has-property-descriptors/1.0.0:
+    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
+    dependencies:
+      get-intrinsic: 1.1.1
+    dev: true
+
+  /has-symbols/1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /has-tostringtag/1.0.0:
+    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-symbols: 1.0.3
+    dev: true
+
+  /has/1.0.3:
+    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
+    engines: {node: '>= 0.4.0'}
+    dependencies:
+      function-bind: 1.1.1
+
+  /history/5.3.0:
+    resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==}
+    dependencies:
+      '@babel/runtime': 7.17.9
+    dev: false
+
+  /hoist-non-react-statics/3.3.2:
+    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
+    dependencies:
+      react-is: 16.13.1
+
+  /html-encoding-sniffer/3.0.0:
+    resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
+    engines: {node: '>=12'}
+    dependencies:
+      whatwg-encoding: 2.0.0
+    dev: true
+
+  /html-escaper/2.0.2:
+    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+
+  /http-proxy-agent/5.0.0:
+    resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
+    engines: {node: '>= 6'}
+    dependencies:
+      '@tootallnate/once': 2.0.0
+      agent-base: 6.0.2
+      debug: 4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /https-proxy-agent/5.0.1:
+    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
+    engines: {node: '>= 6'}
+    dependencies:
+      agent-base: 6.0.2
+      debug: 4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /human-signals/2.1.0:
+    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
+    engines: {node: '>=10.17.0'}
+
+  /human-signals/3.0.1:
+    resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==}
+    engines: {node: '>=12.20.0'}
+    dev: true
+
+  /husky/8.0.1:
+    resolution: {integrity: sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==}
+    engines: {node: '>=14'}
+    hasBin: true
+    dev: true
+
+  /iconv-lite/0.4.24:
+    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      safer-buffer: 2.1.2
+    dev: true
+
+  /iconv-lite/0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      safer-buffer: 2.1.2
+    dev: true
+
+  /ieee754/1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+    dev: true
+
+  /ignore/5.2.0:
+    resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
+    engines: {node: '>= 4'}
+    dev: true
+
+  /immer/9.0.12:
+    resolution: {integrity: sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==}
+    dev: false
+
+  /immutable/4.0.0:
+    resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==}
+    dev: false
+
+  /import-fresh/3.3.0:
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
+    engines: {node: '>=6'}
+    dependencies:
+      parent-module: 1.0.1
+      resolve-from: 4.0.0
+    dev: true
+
+  /import-local/3.1.0:
+    resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
+    engines: {node: '>=8'}
+    hasBin: true
+    dependencies:
+      pkg-dir: 4.2.0
+      resolve-cwd: 3.0.0
+
+  /imurmurhash/0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  /indent-string/4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /inflight/1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+
+  /inherits/2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  /inquirer/8.2.2:
+    resolution: {integrity: sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==}
+    engines: {node: '>=12.0.0'}
+    dependencies:
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      cli-cursor: 3.1.0
+      cli-width: 3.0.0
+      external-editor: 3.1.0
+      figures: 3.2.0
+      lodash: 4.17.21
+      mute-stream: 0.0.8
+      ora: 5.4.1
+      run-async: 2.4.1
+      rxjs: 7.5.5
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      through: 2.3.8
+    dev: true
+
+  /internal-slot/1.0.3:
+    resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.1.1
+      has: 1.0.3
+      side-channel: 1.0.4
+    dev: true
+
+  /is-arrayish/0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+
+  /is-bigint/1.0.2:
+    resolution: {integrity: sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==}
+    dev: true
+
+  /is-binary-path/2.1.0:
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
+    dependencies:
+      binary-extensions: 2.2.0
+    dev: false
+
+  /is-boolean-object/1.1.1:
+    resolution: {integrity: sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+    dev: true
+
+  /is-callable/1.2.4:
+    resolution: {integrity: sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /is-core-module/2.9.0:
+    resolution: {integrity: sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==}
+    dependencies:
+      has: 1.0.3
+
+  /is-date-object/1.0.4:
+    resolution: {integrity: sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /is-extglob/2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  /is-fullwidth-code-point/3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  /is-fullwidth-code-point/4.0.0:
+    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /is-generator-fn/2.1.0:
+    resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
+    engines: {node: '>=6'}
+
+  /is-glob/4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-extglob: 2.1.1
+
+  /is-interactive/1.0.0:
+    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /is-negative-zero/2.0.2:
+    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /is-number-object/1.0.5:
+    resolution: {integrity: sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /is-number/7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  /is-potential-custom-element-name/1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+    dev: true
+
+  /is-regex/1.1.4:
+    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      has-tostringtag: 1.0.0
+    dev: true
+
+  /is-shared-array-buffer/1.0.2:
+    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
+    dependencies:
+      call-bind: 1.0.2
+    dev: true
+
+  /is-stream/2.0.1:
+    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
+    engines: {node: '>=8'}
+
+  /is-stream/3.0.0:
+    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: true
+
+  /is-string/1.0.7:
+    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.0
+    dev: true
+
+  /is-subset/0.1.1:
+    resolution: {integrity: sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==}
+
+  /is-symbol/1.0.4:
+    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-symbols: 1.0.3
+    dev: true
+
+  /is-unicode-supported/0.1.0:
+    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /is-weakref/1.0.2:
+    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+    dependencies:
+      call-bind: 1.0.2
+    dev: true
+
+  /isexe/2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  /istanbul-lib-coverage/3.2.0:
+    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
+    engines: {node: '>=8'}
+
+  /istanbul-lib-instrument/5.2.0:
+    resolution: {integrity: sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/parser': 7.18.4
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.0
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+
+  /istanbul-lib-report/3.0.0:
+    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
+    engines: {node: '>=8'}
+    dependencies:
+      istanbul-lib-coverage: 3.2.0
+      make-dir: 3.1.0
+      supports-color: 7.2.0
+
+  /istanbul-lib-source-maps/4.0.1:
+    resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
+    engines: {node: '>=10'}
+    dependencies:
+      debug: 4.3.4
+      istanbul-lib-coverage: 3.2.0
+      source-map: 0.6.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /istanbul-reports/3.1.4:
+    resolution: {integrity: sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==}
+    engines: {node: '>=8'}
+    dependencies:
+      html-escaper: 2.0.2
+      istanbul-lib-report: 3.0.0
+
+  /iterare/1.2.1:
+    resolution: {integrity: sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==}
+    engines: {node: '>=6'}
+    dev: true
+
+  /jest-changed-files/28.0.2:
+    resolution: {integrity: sha512-QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      execa: 5.1.1
+      throat: 6.0.1
+
+  /jest-circus/28.1.1:
+    resolution: {integrity: sha512-75+BBVTsL4+p2w198DQpCeyh1RdaS2lhEG87HkaFX/UG0gJExVq2skG2pT7XZEGBubNj2CytcWSPan4QEPNosw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/environment': 28.1.1
+      '@jest/expect': 28.1.1
+      '@jest/test-result': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+      chalk: 4.1.2
+      co: 4.6.0
+      dedent: 0.7.0
+      is-generator-fn: 2.1.0
+      jest-each: 28.1.1
+      jest-matcher-utils: 28.1.1
+      jest-message-util: 28.1.1
+      jest-runtime: 28.1.1
+      jest-snapshot: 28.1.1
+      jest-util: 28.1.1
+      pretty-format: 28.1.1
+      slash: 3.0.0
+      stack-utils: 2.0.5
+      throat: 6.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /jest-cli/28.1.1_yqiaopbgmqcuvx27p5xxvum6wm:
+    resolution: {integrity: sha512-+sUfVbJqb1OjBZ0OdBbI6OWfYM1i7bSfzYy6gze1F1w3OKWq8ZTEKkZ8a7ZQPq6G/G1qMh/uKqpdWhgl11NFQQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/core': 28.1.1_ts-node@10.8.1
+      '@jest/test-result': 28.1.1
+      '@jest/types': 28.1.1
+      chalk: 4.1.2
+      exit: 0.1.2
+      graceful-fs: 4.2.10
+      import-local: 3.1.0
+      jest-config: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+      jest-util: 28.1.1
+      jest-validate: 28.1.1
+      prompts: 2.4.2
+      yargs: 17.5.1
+    transitivePeerDependencies:
+      - '@types/node'
+      - supports-color
+      - ts-node
+
+  /jest-config/28.1.1_yqiaopbgmqcuvx27p5xxvum6wm:
+    resolution: {integrity: sha512-tASynMhS+jVV85zKvjfbJ8nUyJS/jUSYZ5KQxLUN2ZCvcQc/OmhQl2j6VEL3ezQkNofxn5pQ3SPYWPHb0unTZA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    peerDependencies:
+      '@types/node': '*'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      ts-node:
+        optional: true
+    dependencies:
+      '@babel/core': 7.18.2
+      '@jest/test-sequencer': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+      babel-jest: 28.1.1_@babel+core@7.18.2
+      chalk: 4.1.2
+      ci-info: 3.3.1
+      deepmerge: 4.2.2
+      glob: 7.2.0
+      graceful-fs: 4.2.10
+      jest-circus: 28.1.1
+      jest-environment-node: 28.1.1
+      jest-get-type: 28.0.2
+      jest-regex-util: 28.0.2
+      jest-resolve: 28.1.1
+      jest-runner: 28.1.1
+      jest-util: 28.1.1
+      jest-validate: 28.1.1
+      micromatch: 4.0.5
+      parse-json: 5.2.0
+      pretty-format: 28.1.1
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+      ts-node: 10.8.1_t4lrjbt3sxauai4t5o275zsepa
+    transitivePeerDependencies:
+      - supports-color
+
+  /jest-diff/28.1.1:
+    resolution: {integrity: sha512-/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      chalk: 4.1.2
+      diff-sequences: 28.1.1
+      jest-get-type: 28.0.2
+      pretty-format: 28.1.1
+
+  /jest-docblock/28.1.1:
+    resolution: {integrity: sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      detect-newline: 3.1.0
+
+  /jest-each/28.1.1:
+    resolution: {integrity: sha512-A042rqh17ZvEhRceDMi784ppoXR7MWGDEKTXEZXb4svt0eShMZvijGxzKsx+yIjeE8QYmHPrnHiTSQVhN4nqaw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/types': 28.1.1
+      chalk: 4.1.2
+      jest-get-type: 28.0.2
+      jest-util: 28.1.1
+      pretty-format: 28.1.1
+
+  /jest-environment-jsdom/28.1.1:
+    resolution: {integrity: sha512-41ZvgSoPNcKG5q3LuuOcAczdBxRq9DbZkPe24okN6ZCmiZdAfFtPg3z+lOtsT1fM6OAERApKT+3m0MRDQH2zIA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/environment': 28.1.1
+      '@jest/fake-timers': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/jsdom': 16.2.14
+      '@types/node': 16.11.7
+      jest-mock: 28.1.1
+      jest-util: 28.1.1
+      jsdom: 19.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - canvas
+      - supports-color
+      - utf-8-validate
+    dev: true
+
+  /jest-environment-node/28.1.1:
+    resolution: {integrity: sha512-2aV/eeY/WNgUUJrrkDJ3cFEigjC5fqT1+fCclrY6paqJ5zVPoM//sHmfgUUp7WLYxIdbPwMiVIzejpN56MxnNA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/environment': 28.1.1
+      '@jest/fake-timers': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+      jest-mock: 28.1.1
+      jest-util: 28.1.1
+
+  /jest-get-type/28.0.2:
+    resolution: {integrity: sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+
+  /jest-haste-map/28.1.1:
+    resolution: {integrity: sha512-ZrRSE2o3Ezh7sb1KmeLEZRZ4mgufbrMwolcFHNRSjKZhpLa8TdooXOOFlSwoUzlbVs1t0l7upVRW2K7RWGHzbQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/types': 28.1.1
+      '@types/graceful-fs': 4.1.5
+      '@types/node': 16.11.7
+      anymatch: 3.1.2
+      fb-watchman: 2.0.1
+      graceful-fs: 4.2.10
+      jest-regex-util: 28.0.2
+      jest-util: 28.1.1
+      jest-worker: 28.1.1
+      micromatch: 4.0.5
+      walker: 1.0.8
+    optionalDependencies:
+      fsevents: 2.3.2
+
+  /jest-leak-detector/28.1.1:
+    resolution: {integrity: sha512-4jvs8V8kLbAaotE+wFR7vfUGf603cwYtFf1/PYEsyX2BAjSzj8hQSVTP6OWzseTl0xL6dyHuKs2JAks7Pfubmw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      jest-get-type: 28.0.2
+      pretty-format: 28.1.1
+
+  /jest-matcher-utils/28.1.1:
+    resolution: {integrity: sha512-NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 28.1.1
+      jest-get-type: 28.0.2
+      pretty-format: 28.1.1
+
+  /jest-message-util/28.1.1:
+    resolution: {integrity: sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      '@jest/types': 28.1.1
+      '@types/stack-utils': 2.0.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      micromatch: 4.0.5
+      pretty-format: 28.1.1
+      slash: 3.0.0
+      stack-utils: 2.0.5
+
+  /jest-mock/28.1.1:
+    resolution: {integrity: sha512-bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+
+  /jest-pnp-resolver/1.2.2_jest-resolve@28.1.1:
+    resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
+    engines: {node: '>=6'}
+    peerDependencies:
+      jest-resolve: '*'
+    peerDependenciesMeta:
+      jest-resolve:
+        optional: true
+    dependencies:
+      jest-resolve: 28.1.1
+
+  /jest-regex-util/28.0.2:
+    resolution: {integrity: sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+
+  /jest-resolve-dependencies/28.1.1:
+    resolution: {integrity: sha512-p8Y150xYJth4EXhOuB8FzmS9r8IGLEioiaetgdNGb9VHka4fl0zqWlVe4v7mSkYOuEUg2uB61iE+zySDgrOmgQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      jest-regex-util: 28.0.2
+      jest-snapshot: 28.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /jest-resolve/28.1.1:
+    resolution: {integrity: sha512-/d1UbyUkf9nvsgdBildLe6LAD4DalgkgZcKd0nZ8XUGPyA/7fsnaQIlKVnDiuUXv/IeZhPEDrRJubVSulxrShA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      jest-haste-map: 28.1.1
+      jest-pnp-resolver: 1.2.2_jest-resolve@28.1.1
+      jest-util: 28.1.1
+      jest-validate: 28.1.1
+      resolve: 1.22.0
+      resolve.exports: 1.1.0
+      slash: 3.0.0
+
+  /jest-runner/28.1.1:
+    resolution: {integrity: sha512-W5oFUiDBgTsCloTAj6q95wEvYDB0pxIhY6bc5F26OucnwBN+K58xGTGbliSMI4ChQal5eANDF+xvELaYkJxTmA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/console': 28.1.1
+      '@jest/environment': 28.1.1
+      '@jest/test-result': 28.1.1
+      '@jest/transform': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+      chalk: 4.1.2
+      emittery: 0.10.2
+      graceful-fs: 4.2.10
+      jest-docblock: 28.1.1
+      jest-environment-node: 28.1.1
+      jest-haste-map: 28.1.1
+      jest-leak-detector: 28.1.1
+      jest-message-util: 28.1.1
+      jest-resolve: 28.1.1
+      jest-runtime: 28.1.1
+      jest-util: 28.1.1
+      jest-watcher: 28.1.1
+      jest-worker: 28.1.1
+      source-map-support: 0.5.13
+      throat: 6.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /jest-runtime/28.1.1:
+    resolution: {integrity: sha512-J89qEJWW0leOsqyi0D9zHpFEYHwwafFdS9xgvhFHtIdRghbadodI0eA+DrthK/1PebBv3Px8mFSMGKrtaVnleg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/environment': 28.1.1
+      '@jest/fake-timers': 28.1.1
+      '@jest/globals': 28.1.1
+      '@jest/source-map': 28.0.2
+      '@jest/test-result': 28.1.1
+      '@jest/transform': 28.1.1
+      '@jest/types': 28.1.1
+      chalk: 4.1.2
+      cjs-module-lexer: 1.2.2
+      collect-v8-coverage: 1.0.1
+      execa: 5.1.1
+      glob: 7.2.0
+      graceful-fs: 4.2.10
+      jest-haste-map: 28.1.1
+      jest-message-util: 28.1.1
+      jest-mock: 28.1.1
+      jest-regex-util: 28.0.2
+      jest-resolve: 28.1.1
+      jest-snapshot: 28.1.1
+      jest-util: 28.1.1
+      slash: 3.0.0
+      strip-bom: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  /jest-snapshot/28.1.1:
+    resolution: {integrity: sha512-1KjqHJ98adRcbIdMizjF5DipwZFbvxym/kFO4g4fVZCZRxH/dqV8TiBFCa6rqic3p0karsy8RWS1y4E07b7P0A==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/generator': 7.18.2
+      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.2
+      '@babel/traverse': 7.18.2
+      '@babel/types': 7.18.7
+      '@jest/expect-utils': 28.1.1
+      '@jest/transform': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/babel__traverse': 7.17.1
+      '@types/prettier': 2.6.3
+      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2
+      chalk: 4.1.2
+      expect: 28.1.1
+      graceful-fs: 4.2.10
+      jest-diff: 28.1.1
+      jest-get-type: 28.0.2
+      jest-haste-map: 28.1.1
+      jest-matcher-utils: 28.1.1
+      jest-message-util: 28.1.1
+      jest-util: 28.1.1
+      natural-compare: 1.4.0
+      pretty-format: 28.1.1
+      semver: 7.3.7
+    transitivePeerDependencies:
+      - supports-color
+
+  /jest-sonar-reporter/2.0.0:
+    resolution: {integrity: sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==}
+    engines: {node: '>=8.0.0'}
+    dependencies:
+      xml: 1.0.1
+    dev: true
+
+  /jest-styled-components/7.0.8_styled-components@5.3.1:
+    resolution: {integrity: sha512-0KE54d0yIzKcvtOv8eikyjG3rFRtKYUyQovaoha3nondtZzXYGB3bhsvYgEegU08Iry0ndWx2+g9f5ZzD4I+0Q==}
+    engines: {node: '>= 12'}
+    peerDependencies:
+      styled-components: '>= 5'
+    dependencies:
+      css: 3.0.0
+      styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
+    dev: true
+
+  /jest-util/28.1.1:
+    resolution: {integrity: sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+      chalk: 4.1.2
+      ci-info: 3.3.1
+      graceful-fs: 4.2.10
+      picomatch: 2.3.1
+
+  /jest-validate/28.1.1:
+    resolution: {integrity: sha512-Kpf6gcClqFCIZ4ti5++XemYJWUPCFUW+N2gknn+KgnDf549iLul3cBuKVe1YcWRlaF8tZV8eJCap0eECOEE3Ug==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/types': 28.1.1
+      camelcase: 6.3.0
+      chalk: 4.1.2
+      jest-get-type: 28.0.2
+      leven: 3.1.0
+      pretty-format: 28.1.1
+
+  /jest-watch-typeahead/1.1.0_jest@28.1.1:
+    resolution: {integrity: sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      jest: ^27.0.0 || ^28.0.0
+    dependencies:
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+      jest-regex-util: 28.0.2
+      jest-watcher: 28.1.1
+      slash: 4.0.0
+      string-length: 5.0.1
+      strip-ansi: 7.0.1
+    dev: false
+
+  /jest-watcher/28.1.1:
+    resolution: {integrity: sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/test-result': 28.1.1
+      '@jest/types': 28.1.1
+      '@types/node': 16.11.7
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      emittery: 0.10.2
+      jest-util: 28.1.1
+      string-length: 4.0.2
+
+  /jest-worker/28.1.1:
+    resolution: {integrity: sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@types/node': 16.11.7
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
+
+  /jest/28.1.1_yqiaopbgmqcuvx27p5xxvum6wm:
+    resolution: {integrity: sha512-qw9YHBnjt6TCbIDMPMpJZqf9E12rh6869iZaN08/vpOGgHJSAaLLUn6H8W3IAEuy34Ls3rct064mZLETkxJ2XA==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    hasBin: true
+    peerDependencies:
+      node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
+    peerDependenciesMeta:
+      node-notifier:
+        optional: true
+    dependencies:
+      '@jest/core': 28.1.1_ts-node@10.8.1
+      '@jest/types': 28.1.1
+      import-local: 3.1.0
+      jest-cli: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+    transitivePeerDependencies:
+      - '@types/node'
+      - supports-color
+      - ts-node
+
+  /js-sha3/0.8.0:
+    resolution: {integrity: sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==}
+    dev: false
+
+  /js-tokens/4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  /js-yaml/3.14.1:
+    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
+    hasBin: true
+    dependencies:
+      argparse: 1.0.10
+      esprima: 4.0.1
+
+  /js-yaml/4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
+    dependencies:
+      argparse: 2.0.1
+    dev: true
+
+  /jsdom/19.0.0:
+    resolution: {integrity: sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+    dependencies:
+      abab: 2.0.6
+      acorn: 8.7.1
+      acorn-globals: 6.0.0
+      cssom: 0.5.0
+      cssstyle: 2.3.0
+      data-urls: 3.0.2
+      decimal.js: 10.3.1
+      domexception: 4.0.0
+      escodegen: 2.0.0
+      form-data: 4.0.0
+      html-encoding-sniffer: 3.0.0
+      http-proxy-agent: 5.0.0
+      https-proxy-agent: 5.0.1
+      is-potential-custom-element-name: 1.0.1
+      nwsapi: 2.2.0
+      parse5: 6.0.1
+      saxes: 5.0.1
+      symbol-tree: 3.2.4
+      tough-cookie: 4.0.0
+      w3c-hr-time: 1.0.2
+      w3c-xmlserializer: 3.0.0
+      webidl-conversions: 7.0.0
+      whatwg-encoding: 2.0.0
+      whatwg-mimetype: 3.0.0
+      whatwg-url: 10.0.0
+      ws: 8.8.0
+      xml-name-validator: 4.0.0
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+    dev: true
+
+  /jsesc/0.5.0:
+    resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
+    hasBin: true
+    dev: true
+
+  /jsesc/2.5.2:
+    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  /json-parse-even-better-errors/2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+
+  /json-schema-faker/0.5.0-rcv.40:
+    resolution: {integrity: sha512-BczZvu03jKrGh3ovCWrHusiX6MwiaKK2WZeyomKBNA8Nm/n7aBYz0mub1CnONB6cgxOZTNxx4afNmLblbUmZbA==}
+    hasBin: true
+    dependencies:
+      json-schema-ref-parser: 6.1.0
+      jsonpath-plus: 5.1.0
+    dev: false
+
+  /json-schema-ref-parser/6.1.0:
+    resolution: {integrity: sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==}
+    dependencies:
+      call-me-maybe: 1.0.1
+      js-yaml: 3.14.1
+      ono: 4.0.11
+    dev: false
+
+  /json-schema-traverse/0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+    dev: true
+
+  /json-schema-traverse/1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+    dev: false
+
+  /json-stable-stringify-without-jsonify/1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+    dev: true
+
+  /json5/1.0.1:
+    resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==}
+    hasBin: true
+    dependencies:
+      minimist: 1.2.6
+    dev: true
+
+  /json5/2.2.1:
+    resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  /jsonfile/6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+    dependencies:
+      universalify: 2.0.0
+    optionalDependencies:
+      graceful-fs: 4.2.10
+    dev: true
+
+  /jsonpath-plus/5.1.0:
+    resolution: {integrity: sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ==}
+    engines: {node: '>=10.0.0'}
+    dev: false
+
+  /jsx-ast-utils/3.3.0:
+    resolution: {integrity: sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==}
+    engines: {node: '>=4.0'}
+    dependencies:
+      array-includes: 3.1.5
+      object.assign: 4.1.2
+    dev: true
+
+  /kleur/3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
+
+  /language-subtag-registry/0.3.21:
+    resolution: {integrity: sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==}
+    dev: true
+
+  /language-tags/1.0.5:
+    resolution: {integrity: sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==}
+    dependencies:
+      language-subtag-registry: 0.3.21
+    dev: true
+
+  /leven/3.1.0:
+    resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
+    engines: {node: '>=6'}
+
+  /levn/0.3.0:
+    resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      prelude-ls: 1.1.2
+      type-check: 0.3.2
+    dev: true
+
+  /levn/0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+    dev: true
+
+  /lilconfig/2.0.5:
+    resolution: {integrity: sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /lines-and-columns/1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+  /lint-staged/13.0.2:
+    resolution: {integrity: sha512-qQLfLTh9z34eMzfEHENC+QBskZfxjomrf+snF3xJ4BzilORbD989NLqQ00ughsF/A+PT41e87+WsMFabf9++pQ==}
+    engines: {node: ^14.13.1 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      cli-truncate: 3.1.0
+      colorette: 2.0.19
+      commander: 9.3.0
+      debug: 4.3.4
+      execa: 6.1.0
+      lilconfig: 2.0.5
+      listr2: 4.0.5
+      micromatch: 4.0.5
+      normalize-path: 3.0.0
+      object-inspect: 1.12.2
+      pidtree: 0.6.0
+      string-argv: 0.3.1
+      yaml: 2.1.1
+    transitivePeerDependencies:
+      - enquirer
+      - supports-color
+    dev: true
+
+  /listr2/4.0.5:
+    resolution: {integrity: sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      enquirer: '>= 2.3.0 < 3'
+    peerDependenciesMeta:
+      enquirer:
+        optional: true
+    dependencies:
+      cli-truncate: 2.1.0
+      colorette: 2.0.19
+      log-update: 4.0.0
+      p-map: 4.0.0
+      rfdc: 1.3.0
+      rxjs: 7.5.5
+      through: 2.3.8
+      wrap-ansi: 7.0.0
+    dev: true
+
+  /locate-path/2.0.0:
+    resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==}
+    engines: {node: '>=4'}
+    dependencies:
+      p-locate: 2.0.0
+      path-exists: 3.0.0
+    dev: true
+
+  /locate-path/5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
+    dependencies:
+      p-locate: 4.1.0
+
+  /lodash-es/4.17.21:
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+    dev: false
+
+  /lodash.debounce/4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: true
+
+  /lodash.get/4.4.2:
+    resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
+    dev: false
+
+  /lodash.isequal/4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+
+  /lodash.isplainobject/4.0.6:
+    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
+    dev: true
+
+  /lodash.memoize/4.1.2:
+    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
+    dev: true
+
+  /lodash.merge/4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+    dev: true
+
+  /lodash.sortby/4.7.0:
+    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
+
+  /lodash/4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+
+  /log-symbols/4.1.0:
+    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+    engines: {node: '>=10'}
+    dependencies:
+      chalk: 4.1.2
+      is-unicode-supported: 0.1.0
+    dev: true
+
+  /log-update/4.0.0:
+    resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
+    engines: {node: '>=10'}
+    dependencies:
+      ansi-escapes: 4.3.2
+      cli-cursor: 3.1.0
+      slice-ansi: 4.0.0
+      wrap-ansi: 6.2.0
+    dev: true
+
+  /loose-envify/1.4.0:
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+    hasBin: true
+    dependencies:
+      js-tokens: 4.0.0
+
+  /lru-cache/6.0.0:
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+    engines: {node: '>=10'}
+    dependencies:
+      yallist: 4.0.0
+
+  /lz-string/1.4.4:
+    resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
+    hasBin: true
+
+  /make-dir/3.1.0:
+    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
+    engines: {node: '>=8'}
+    dependencies:
+      semver: 6.3.0
+
+  /make-error/1.3.6:
+    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
+
+  /makeerror/1.0.12:
+    resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
+    dependencies:
+      tmpl: 1.0.5
+
+  /match-sorter/6.3.1:
+    resolution: {integrity: sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==}
+    dependencies:
+      '@babel/runtime': 7.17.9
+      remove-accents: 0.4.2
+    dev: false
+
+  /merge-stream/2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+
+  /merge2/1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
+    dev: true
+
+  /micromatch/4.0.5:
+    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
+    engines: {node: '>=8.6'}
+    dependencies:
+      braces: 3.0.2
+      picomatch: 2.3.1
+
+  /microseconds/0.2.0:
+    resolution: {integrity: sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==}
+    dev: false
+
+  /mime-db/1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+    dev: true
+
+  /mime-types/2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+    dependencies:
+      mime-db: 1.52.0
+    dev: true
+
+  /mimic-fn/2.1.0:
+    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
+    engines: {node: '>=6'}
+
+  /mimic-fn/4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /min-indent/1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /minimatch/3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+    dependencies:
+      brace-expansion: 1.1.11
+
+  /minimist/1.2.6:
+    resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==}
+
+  /ms/2.0.0:
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
+    dev: true
+
+  /ms/2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+
+  /ms/2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+    dev: true
+
+  /mute-stream/0.0.8:
+    resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
+    dev: true
+
+  /nano-time/1.0.0:
+    resolution: {integrity: sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==}
+    dependencies:
+      big-integer: 1.6.51
+    dev: false
+
+  /nanoclone/0.2.1:
+    resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==}
+    dev: false
+
+  /nanoid/3.3.4:
+    resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+    dev: false
+
+  /natural-compare/1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  /node-fetch/2.6.7:
+    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+    dependencies:
+      whatwg-url: 5.0.0
+
+  /node-int64/0.4.0:
+    resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
+
+  /node-releases/2.0.5:
+    resolution: {integrity: sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==}
+
+  /normalize-path/3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
+  /npm-run-path/4.0.1:
+    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
+    engines: {node: '>=8'}
+    dependencies:
+      path-key: 3.1.1
+
+  /npm-run-path/5.1.0:
+    resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      path-key: 4.0.0
+    dev: true
+
+  /nwsapi/2.2.0:
+    resolution: {integrity: sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==}
+    dev: true
+
+  /object-assign/4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  /object-hash/3.0.0:
+    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
+    engines: {node: '>= 6'}
+    dev: true
+
+  /object-inspect/1.12.2:
+    resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
+    dev: true
+
+  /object-keys/1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /object.assign/4.1.2:
+    resolution: {integrity: sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      has-symbols: 1.0.3
+      object-keys: 1.1.1
+    dev: true
+
+  /object.entries/1.1.5:
+    resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+    dev: true
+
+  /object.fromentries/2.0.5:
+    resolution: {integrity: sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+    dev: true
+
+  /object.hasown/1.1.1:
+    resolution: {integrity: sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==}
+    dependencies:
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+    dev: true
+
+  /object.values/1.1.5:
+    resolution: {integrity: sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+    dev: true
+
+  /oblivious-set/1.0.0:
+    resolution: {integrity: sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==}
+    dev: false
+
+  /once/1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+    dependencies:
+      wrappy: 1.0.2
+
+  /onetime/5.1.2:
+    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
+    engines: {node: '>=6'}
+    dependencies:
+      mimic-fn: 2.1.0
+
+  /onetime/6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      mimic-fn: 4.0.0
+    dev: true
+
+  /ono/4.0.11:
+    resolution: {integrity: sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==}
+    dependencies:
+      format-util: 1.0.5
+    dev: false
+
+  /optionator/0.8.3:
+    resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      deep-is: 0.1.3
+      fast-levenshtein: 2.0.6
+      levn: 0.3.0
+      prelude-ls: 1.1.2
+      type-check: 0.3.2
+      word-wrap: 1.2.3
+    dev: true
+
+  /optionator/0.9.1:
+    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      deep-is: 0.1.3
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+      word-wrap: 1.2.3
+    dev: true
+
+  /ora/5.4.1:
+    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      bl: 4.1.0
+      chalk: 4.1.2
+      cli-cursor: 3.1.0
+      cli-spinners: 2.6.1
+      is-interactive: 1.0.0
+      is-unicode-supported: 0.1.0
+      log-symbols: 4.1.0
+      strip-ansi: 6.0.1
+      wcwidth: 1.0.1
+    dev: true
+
+  /os-tmpdir/1.0.2:
+    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /p-limit/1.3.0:
+    resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==}
+    engines: {node: '>=4'}
+    dependencies:
+      p-try: 1.0.0
+    dev: true
+
+  /p-limit/2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+    dependencies:
+      p-try: 2.2.0
+
+  /p-locate/2.0.0:
+    resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==}
+    engines: {node: '>=4'}
+    dependencies:
+      p-limit: 1.3.0
+    dev: true
+
+  /p-locate/4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
+    dependencies:
+      p-limit: 2.3.0
+
+  /p-map/4.0.0:
+    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      aggregate-error: 3.1.0
+    dev: true
+
+  /p-try/1.0.0:
+    resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /p-try/2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+
+  /parent-module/1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+    dependencies:
+      callsites: 3.1.0
+    dev: true
+
+  /parse-json/5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@babel/code-frame': 7.16.7
+      error-ex: 1.3.2
+      json-parse-even-better-errors: 2.3.1
+      lines-and-columns: 1.2.4
+
+  /parse-ms/2.1.0:
+    resolution: {integrity: sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==}
+    engines: {node: '>=6'}
+    dev: false
+
+  /parse5/6.0.1:
+    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
+    dev: true
+
+  /path-exists/3.0.0:
+    resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /path-exists/4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  /path-is-absolute/1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
+  /path-key/3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  /path-key/4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /path-parse/1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+
+  /path-to-regexp/2.4.0:
+    resolution: {integrity: sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==}
+
+  /path-to-regexp/3.2.0:
+    resolution: {integrity: sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==}
+    dev: true
+
+  /path-type/4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /picocolors/1.0.0:
+    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
+
+  /picomatch/2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  /pidtree/0.6.0:
+    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+    dev: true
+
+  /pirates/4.0.5:
+    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
+    engines: {node: '>= 6'}
+
+  /pkg-dir/4.2.0:
+    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      find-up: 4.1.0
+
+  /postcss-value-parser/4.1.0:
+    resolution: {integrity: sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==}
+
+  /postcss/8.4.13:
+    resolution: {integrity: sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.4
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+    dev: false
+
+  /prelude-ls/1.1.2:
+    resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
+    engines: {node: '>= 0.8.0'}
+    dev: true
+
+  /prelude-ls/1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+    dev: true
+
+  /prettier-linter-helpers/1.0.0:
+    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      fast-diff: 1.2.0
+    dev: true
+
+  /prettier/2.5.1:
+    resolution: {integrity: sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    dev: true
+
+  /pretty-format/27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 17.0.2
+
+  /pretty-format/28.1.1:
+    resolution: {integrity: sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dependencies:
+      '@jest/schemas': 28.0.2
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 18.2.0
+
+  /pretty-ms/7.0.1:
+    resolution: {integrity: sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==}
+    engines: {node: '>=10'}
+    dependencies:
+      parse-ms: 2.1.0
+    dev: false
+
+  /prompts/2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+
+  /prop-types/15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
+  /property-expr/2.0.4:
+    resolution: {integrity: sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg==}
+    dev: false
+
+  /psl/1.8.0:
+    resolution: {integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==}
+    dev: true
+
+  /punycode/2.1.1:
+    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
+    engines: {node: '>=6'}
+
+  /querystring/0.2.1:
+    resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==}
+    engines: {node: '>=0.4.x'}
+    deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
+
+  /queue-microtask/1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+    dev: true
+
+  /react-ace/9.5.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==}
+    peerDependencies:
+      react: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0
+      react-dom: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0
+    dependencies:
+      ace-builds: 1.4.13
+      diff-match-patch: 1.0.5
+      lodash.get: 4.4.2
+      lodash.isequal: 4.5.0
+      prop-types: 15.8.1
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+    dev: false
+
+  /react-datepicker/4.5.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-mFP/SbtFSXx21Wx3Nfv+RREwd/x0q14x7QL79ZCi/PVkHSFLwLWhXyOtj3OIzi1AcVYb/fMMcvi8e5b12n8/sg==}
+    peerDependencies:
+      react: ^16.9.0 || ^17
+      react-dom: ^16.9.0 || ^17
+    dependencies:
+      '@popperjs/core': 2.9.2
+      classnames: 2.3.1
+      date-fns: 2.27.0
+      prop-types: 15.8.1
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-onclickoutside: 6.12.1_ef5jwxihqo6n7gxfmzogljlgcm
+      react-popper: 2.2.5_kse2oiarfsejvukvxwgibirnca
+    dev: false
+
+  /react-dom/18.1.0_react@18.1.0:
+    resolution: {integrity: sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==}
+    peerDependencies:
+      react: ^18.1.0
+    dependencies:
+      loose-envify: 1.4.0
+      react: 18.1.0
+      scheduler: 0.22.0
+
+  /react-fast-compare/3.2.0:
+    resolution: {integrity: sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==}
+
+  /react-hook-form/7.6.9_react@18.1.0:
+    resolution: {integrity: sha512-nz+btC4WFIm3zPBjw22K3t9nnJtlMMwj8slcbPYoTKlkSVA5l+q3Ai+VF0YzeRi7vbyyeGQvpyibov1xd/TV7A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17
+    dependencies:
+      react: 18.1.0
+    dev: false
+
+  /react-is/16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+
+  /react-is/17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
+  /react-is/18.2.0:
+    resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
+
+  /react-multi-select-component/4.0.6_react@18.1.0:
+    resolution: {integrity: sha512-cNpDv8vh1kWkJiMsa097tTUqWLVTQn+La4aXlgoGOQVpOSH9u1fbj1+MsvnLQjTBySuDx+pzm/DpbIoma/i1Fw==}
+    peerDependencies:
+      react: '>=17'
+    dependencies:
+      react: 18.1.0
+    dev: false
+
+  /react-onclickoutside/6.12.1_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==}
+    peerDependencies:
+      react: ^15.5.x || ^16.x || ^17.x
+      react-dom: ^15.5.x || ^16.x || ^17.x
+    dependencies:
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+    dev: false
+
+  /react-popper/2.2.5_kse2oiarfsejvukvxwgibirnca:
+    resolution: {integrity: sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==}
+    peerDependencies:
+      '@popperjs/core': ^2.0.0
+      react: ^16.8.0 || ^17
+    dependencies:
+      '@popperjs/core': 2.9.2
+      react: 18.1.0
+      react-fast-compare: 3.2.0
+      warning: 4.0.3
+
+  /react-query/3.39.1_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: '*'
+      react-native: '*'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+      react-native:
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.17.9
+      broadcast-channel: 3.7.0
+      match-sorter: 6.3.1
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+    dev: false
+
+  /react-redux/7.2.6_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==}
+    peerDependencies:
+      react: ^16.8.3 || ^17
+      react-dom: '*'
+      react-native: '*'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+      react-native:
+        optional: true
+    dependencies:
+      '@babel/runtime': 7.17.9
+      '@types/react-redux': 7.1.24
+      hoist-non-react-statics: 3.3.2
+      loose-envify: 1.4.0
+      prop-types: 15.8.1
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-is: 17.0.2
+    dev: false
+
+  /react-refresh/0.13.0:
+    resolution: {integrity: sha512-XP8A9BT0CpRBD+NYLLeIhld/RqG9+gktUjW1FkE+Vm7OCinbG1SshcK5tb9ls4kzvjZr9mOQc7HYgBngEyPAXg==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /react-router-dom/6.3.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==}
+    peerDependencies:
+      react: '>=16.8'
+      react-dom: '>=16.8'
+    dependencies:
+      history: 5.3.0
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-router: 6.3.0_react@18.1.0
+    dev: false
+
+  /react-router/6.3.0_react@18.1.0:
+    resolution: {integrity: sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==}
+    peerDependencies:
+      react: '>=16.8'
+    dependencies:
+      history: 5.3.0
+      react: 18.1.0
+    dev: false
+
+  /react/18.1.0:
+    resolution: {integrity: sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      loose-envify: 1.4.0
+
+  /readable-stream/3.6.0:
+    resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
+    engines: {node: '>= 6'}
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.3.0
+      util-deprecate: 1.0.2
+    dev: true
+
+  /readdirp/3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
+    dependencies:
+      picomatch: 2.3.1
+    dev: false
+
+  /recrawl-sync/2.2.2:
+    resolution: {integrity: sha512-E2sI4F25Fu2nrfV+KsnC7/qfk/spQIYXlonfQoS4rwxeNK5BjxnLPbWiRXHVXPwYBOTWtPX5765kTm/zJiL+LQ==}
+    dependencies:
+      '@cush/relative': 1.0.0
+      glob-regex: 0.3.2
+      slash: 3.0.0
+      tslib: 1.13.0
+    dev: false
+
+  /redent/3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+    engines: {node: '>=8'}
+    dependencies:
+      indent-string: 4.0.0
+      strip-indent: 3.0.0
+    dev: true
+
+  /redux-mock-store/1.5.4:
+    resolution: {integrity: sha512-xmcA0O/tjCLXhh9Fuiq6pMrJCwFRaouA8436zcikdIpYWWCjU76CRk+i2bHx8EeiSiMGnB85/lZdU3wIJVXHTA==}
+    dependencies:
+      lodash.isplainobject: 4.0.6
+    dev: true
+
+  /redux-thunk/2.4.1_redux@4.1.2:
+    resolution: {integrity: sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==}
+    peerDependencies:
+      redux: ^4
+    dependencies:
+      redux: 4.1.2
+    dev: false
+
+  /redux/4.1.2:
+    resolution: {integrity: sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==}
+    dependencies:
+      '@babel/runtime': 7.17.9
+
+  /reflect-metadata/0.1.13:
+    resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==}
+    dev: true
+
+  /regenerate-unicode-properties/10.0.1:
+    resolution: {integrity: sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==}
+    engines: {node: '>=4'}
+    dependencies:
+      regenerate: 1.4.2
+    dev: true
+
+  /regenerate/1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+    dev: true
+
+  /regenerator-runtime/0.13.7:
+    resolution: {integrity: sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==}
+
+  /regenerator-transform/0.15.0:
+    resolution: {integrity: sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==}
+    dependencies:
+      '@babel/runtime': 7.17.9
+    dev: true
+
+  /regexp.prototype.flags/1.4.3:
+    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      functions-have-names: 1.2.3
+    dev: true
+
+  /regexpp/3.2.0:
+    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /regexpu-core/5.0.1:
+    resolution: {integrity: sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==}
+    engines: {node: '>=4'}
+    dependencies:
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 10.0.1
+      regjsgen: 0.6.0
+      regjsparser: 0.8.4
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.0.0
+    dev: true
+
+  /regjsgen/0.6.0:
+    resolution: {integrity: sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==}
+    dev: true
+
+  /regjsparser/0.8.4:
+    resolution: {integrity: sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==}
+    hasBin: true
+    dependencies:
+      jsesc: 0.5.0
+    dev: true
+
+  /remove-accents/0.4.2:
+    resolution: {integrity: sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA==}
+    dev: false
+
+  /require-directory/2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
+  /require-from-string/2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /requireindex/1.2.0:
+    resolution: {integrity: sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==}
+    engines: {node: '>=0.10.5'}
+    dev: true
+
+  /reselect/4.1.5:
+    resolution: {integrity: sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==}
+    dev: false
+
+  /resolve-cwd/3.0.0:
+    resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
+    engines: {node: '>=8'}
+    dependencies:
+      resolve-from: 5.0.0
+
+  /resolve-from/4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /resolve-from/5.0.0:
+    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+    engines: {node: '>=8'}
+
+  /resolve.exports/1.1.0:
+    resolution: {integrity: sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==}
+    engines: {node: '>=10'}
+
+  /resolve/1.22.0:
+    resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==}
+    hasBin: true
+    dependencies:
+      is-core-module: 2.9.0
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  /resolve/2.0.0-next.3:
+    resolution: {integrity: sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==}
+    dependencies:
+      is-core-module: 2.9.0
+      path-parse: 1.0.7
+    dev: true
+
+  /restore-cursor/3.1.0:
+    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
+    engines: {node: '>=8'}
+    dependencies:
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+    dev: true
+
+  /reusify/1.0.4:
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+    dev: true
+
+  /rfdc/1.3.0:
+    resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
+    dev: true
+
+  /rimraf/3.0.2:
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    hasBin: true
+    dependencies:
+      glob: 7.2.0
+
+  /rollup/2.72.1:
+    resolution: {integrity: sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+    optionalDependencies:
+      fsevents: 2.3.2
+    dev: false
+
+  /run-async/2.4.1:
+    resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
+    engines: {node: '>=0.12.0'}
+    dev: true
+
+  /run-parallel/1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+    dependencies:
+      queue-microtask: 1.2.3
+    dev: true
+
+  /rxjs/6.6.7:
+    resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==}
+    engines: {npm: '>=2.0.0'}
+    dependencies:
+      tslib: 1.13.0
+    dev: true
+
+  /rxjs/7.5.5:
+    resolution: {integrity: sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==}
+    dependencies:
+      tslib: 2.3.1
+    dev: true
+
+  /safe-buffer/5.1.2:
+    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+
+  /safe-buffer/5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+    dev: true
+
+  /safer-buffer/2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+    dev: true
+
+  /sass/1.52.3:
+    resolution: {integrity: sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==}
+    engines: {node: '>=12.0.0'}
+    hasBin: true
+    dependencies:
+      chokidar: 3.5.2
+      immutable: 4.0.0
+      source-map-js: 1.0.2
+    dev: false
+
+  /saxes/5.0.1:
+    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
+    engines: {node: '>=10'}
+    dependencies:
+      xmlchars: 2.2.0
+    dev: true
+
+  /scheduler/0.22.0:
+    resolution: {integrity: sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==}
+    dependencies:
+      loose-envify: 1.4.0
+
+  /semver/6.3.0:
+    resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
+    hasBin: true
+
+  /semver/7.0.0:
+    resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
+    hasBin: true
+    dev: true
+
+  /semver/7.3.7:
+    resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+
+  /shallowequal/1.1.0:
+    resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
+
+  /shebang-command/2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+    dependencies:
+      shebang-regex: 3.0.0
+
+  /shebang-regex/3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  /side-channel/1.0.4:
+    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.1.1
+      object-inspect: 1.12.2
+    dev: true
+
+  /signal-exit/3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+
+  /sisteransi/1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+
+  /slash/3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
+    engines: {node: '>=8'}
+
+  /slash/4.0.0:
+    resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
+    engines: {node: '>=12'}
+    dev: false
+
+  /slice-ansi/3.0.0:
+    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-styles: 4.3.0
+      astral-regex: 2.0.0
+      is-fullwidth-code-point: 3.0.0
+    dev: true
+
+  /slice-ansi/4.0.0:
+    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      ansi-styles: 4.3.0
+      astral-regex: 2.0.0
+      is-fullwidth-code-point: 3.0.0
+    dev: true
+
+  /slice-ansi/5.0.0:
+    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-styles: 6.1.0
+      is-fullwidth-code-point: 4.0.0
+    dev: true
+
+  /source-map-js/1.0.2:
+    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /source-map-resolve/0.6.0:
+    resolution: {integrity: sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==}
+    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
+    dependencies:
+      atob: 2.1.2
+      decode-uri-component: 0.2.0
+    dev: true
+
+  /source-map-support/0.5.13:
+    resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
+
+  /source-map/0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
+  /spawn-command/0.0.2-1:
+    resolution: {integrity: sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==}
+    dev: true
+
+  /sprintf-js/1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+
+  /stack-utils/2.0.5:
+    resolution: {integrity: sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==}
+    engines: {node: '>=10'}
+    dependencies:
+      escape-string-regexp: 2.0.0
+
+  /string-argv/0.3.1:
+    resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
+    engines: {node: '>=0.6.19'}
+    dev: true
+
+  /string-length/4.0.2:
+    resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      char-regex: 1.0.2
+      strip-ansi: 6.0.1
+
+  /string-length/5.0.1:
+    resolution: {integrity: sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==}
+    engines: {node: '>=12.20'}
+    dependencies:
+      char-regex: 2.0.1
+      strip-ansi: 7.0.1
+    dev: false
+
+  /string-natural-compare/3.0.1:
+    resolution: {integrity: sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==}
+    dev: true
+
+  /string-width/4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+    dependencies:
+      emoji-regex: 8.0.0
+      is-fullwidth-code-point: 3.0.0
+      strip-ansi: 6.0.1
+
+  /string-width/5.1.2:
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
+    dependencies:
+      eastasianwidth: 0.2.0
+      emoji-regex: 9.2.2
+      strip-ansi: 7.0.1
+    dev: true
+
+  /string.prototype.matchall/4.0.6:
+    resolution: {integrity: sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+      get-intrinsic: 1.1.1
+      has-symbols: 1.0.3
+      internal-slot: 1.0.3
+      regexp.prototype.flags: 1.4.3
+      side-channel: 1.0.4
+    dev: true
+
+  /string.prototype.trimend/1.0.5:
+    resolution: {integrity: sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+    dev: true
+
+  /string.prototype.trimstart/1.0.5:
+    resolution: {integrity: sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.0
+    dev: true
+
+  /string_decoder/1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+    dependencies:
+      safe-buffer: 5.2.1
+    dev: true
+
+  /strip-ansi/6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-regex: 5.0.1
+
+  /strip-ansi/7.0.1:
+    resolution: {integrity: sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-regex: 6.0.1
+
+  /strip-bom/3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
+
+  /strip-bom/4.0.0:
+    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
+    engines: {node: '>=8'}
+
+  /strip-final-newline/2.0.0:
+    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
+    engines: {node: '>=6'}
+
+  /strip-final-newline/3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /strip-indent/3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      min-indent: 1.0.1
+    dev: true
+
+  /strip-json-comments/3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  /styled-components/5.3.1_uuaz5p7xzfmtjacf6iqf7idnby:
+    resolution: {integrity: sha512-JThv2JRzyH0NOIURrk9iskdxMSAAtCfj/b2Sf1WJaCUsloQkblepy1jaCLX/bYE+mhYo3unmwVSI9I5d9ncSiQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      react: '>= 16.8.0'
+      react-dom: '>= 16.8.0'
+      react-is: '>= 16.8.0'
+    dependencies:
+      '@babel/helper-module-imports': 7.16.7
+      '@babel/traverse': 7.18.2_supports-color@5.5.0
+      '@emotion/is-prop-valid': 0.8.8
+      '@emotion/stylis': 0.8.5
+      '@emotion/unitless': 0.7.5
+      babel-plugin-styled-components: 1.13.2_styled-components@5.3.1
+      css-to-react-native: 3.0.0
+      hoist-non-react-statics: 3.3.2
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-is: 18.2.0
+      shallowequal: 1.1.0
+      supports-color: 5.5.0
+
+  /supports-color/5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
+    dependencies:
+      has-flag: 3.0.0
+
+  /supports-color/7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+    dependencies:
+      has-flag: 4.0.0
+
+  /supports-color/8.1.1:
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
+    dependencies:
+      has-flag: 4.0.0
+
+  /supports-hyperlinks/2.2.0:
+    resolution: {integrity: sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      has-flag: 4.0.0
+      supports-color: 7.2.0
+
+  /supports-preserve-symlinks-flag/1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
+  /symbol-tree/3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+    dev: true
+
+  /terminal-link/2.1.1:
+    resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-escapes: 4.3.2
+      supports-hyperlinks: 2.2.0
+
+  /test-exclude/6.0.0:
+    resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@istanbuljs/schema': 0.1.3
+      glob: 7.2.0
+      minimatch: 3.1.2
+
+  /text-table/0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+    dev: true
+
+  /throat/6.0.1:
+    resolution: {integrity: sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==}
+
+  /through/2.3.8:
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
+    dev: true
+
+  /tmp/0.0.33:
+    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
+    engines: {node: '>=0.6.0'}
+    dependencies:
+      os-tmpdir: 1.0.2
+    dev: true
+
+  /tmpl/1.0.5:
+    resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+
+  /to-fast-properties/2.0.0:
+    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
+    engines: {node: '>=4'}
+
+  /to-regex-range/5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+    dependencies:
+      is-number: 7.0.0
+
+  /toposort/2.0.2:
+    resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
+    dev: false
+
+  /tough-cookie/4.0.0:
+    resolution: {integrity: sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==}
+    engines: {node: '>=6'}
+    dependencies:
+      psl: 1.8.0
+      punycode: 2.1.1
+      universalify: 0.1.2
+    dev: true
+
+  /tr46/0.0.3:
+    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+
+  /tr46/1.0.1:
+    resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
+    dependencies:
+      punycode: 2.1.1
+
+  /tr46/3.0.0:
+    resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
+    engines: {node: '>=12'}
+    dependencies:
+      punycode: 2.1.1
+    dev: true
+
+  /tree-kill/1.2.2:
+    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
+    hasBin: true
+    dev: true
+
+  /ts-jest/28.0.5_c4h4g76dcvkfgjwf6rprlfxfli:
+    resolution: {integrity: sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    hasBin: true
+    peerDependencies:
+      '@babel/core': '>=7.0.0-beta.0 <8'
+      babel-jest: ^28.0.0
+      esbuild: '*'
+      jest: ^28.0.0
+      typescript: '>=4.3'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      babel-jest:
+        optional: true
+      esbuild:
+        optional: true
+    dependencies:
+      '@babel/core': 7.18.2
+      babel-jest: 28.1.1_@babel+core@7.18.2
+      bs-logger: 0.2.6
+      fast-json-stable-stringify: 2.1.0
+      jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+      jest-util: 28.1.1
+      json5: 2.2.1
+      lodash.memoize: 4.1.2
+      make-error: 1.3.6
+      semver: 7.3.7
+      typescript: 4.7.4
+      yargs-parser: 21.0.1
+    dev: true
+
+  /ts-node/10.8.1_t4lrjbt3sxauai4t5o275zsepa:
+    resolution: {integrity: sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==}
+    hasBin: true
+    peerDependencies:
+      '@swc/core': '>=1.2.50'
+      '@swc/wasm': '>=1.2.50'
+      '@types/node': '*'
+      typescript: '>=2.7'
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      '@swc/wasm':
+        optional: true
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      '@tsconfig/node10': 1.0.9
+      '@tsconfig/node12': 1.0.11
+      '@tsconfig/node14': 1.0.3
+      '@tsconfig/node16': 1.0.3
+      '@types/node': 16.11.7
+      acorn: 8.7.1
+      acorn-walk: 8.2.0
+      arg: 4.1.3
+      create-require: 1.1.1
+      diff: 4.0.2
+      make-error: 1.3.6
+      typescript: 4.7.4
+      v8-compile-cache-lib: 3.0.1
+      yn: 3.1.1
+
+  /tsconfig-paths/3.14.1:
+    resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
+    dependencies:
+      '@types/json5': 0.0.29
+      json5: 1.0.1
+      minimist: 1.2.6
+      strip-bom: 3.0.0
+    dev: true
+
+  /tsconfig-paths/4.0.0:
+    resolution: {integrity: sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==}
+    dependencies:
+      json5: 2.2.1
+      minimist: 1.2.6
+      strip-bom: 3.0.0
+    dev: false
+
+  /tslib/1.13.0:
+    resolution: {integrity: sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==}
+
+  /tslib/2.0.3:
+    resolution: {integrity: sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==}
+    dev: true
+
+  /tslib/2.3.1:
+    resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==}
+    dev: true
+
+  /tsutils/3.21.0_typescript@4.7.4:
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
+    engines: {node: '>= 6'}
+    peerDependencies:
+      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+    dependencies:
+      tslib: 1.13.0
+      typescript: 4.7.4
+    dev: true
+
+  /type-check/0.3.2:
+    resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      prelude-ls: 1.1.2
+    dev: true
+
+  /type-check/0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+    dependencies:
+      prelude-ls: 1.2.1
+    dev: true
+
+  /type-detect/4.0.8:
+    resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
+    engines: {node: '>=4'}
+
+  /type-fest/0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /type-fest/0.21.3:
+    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
+    engines: {node: '>=10'}
+
+  /typescript/4.7.4:
+    resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==}
+    engines: {node: '>=4.2.0'}
+    hasBin: true
+
+  /unbox-primitive/1.0.2:
+    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+    dependencies:
+      call-bind: 1.0.2
+      has-bigints: 1.0.2
+      has-symbols: 1.0.3
+      which-boxed-primitive: 1.0.2
+    dev: true
+
+  /unicode-canonical-property-names-ecmascript/2.0.0:
+    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /unicode-match-property-ecmascript/2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.0
+      unicode-property-aliases-ecmascript: 2.0.0
+    dev: true
+
+  /unicode-match-property-value-ecmascript/2.0.0:
+    resolution: {integrity: sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /unicode-property-aliases-ecmascript/2.0.0:
+    resolution: {integrity: sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /universalify/0.1.2:
+    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
+    engines: {node: '>= 4.0.0'}
+    dev: true
+
+  /universalify/2.0.0:
+    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
+    engines: {node: '>= 10.0.0'}
+    dev: true
+
+  /unload/2.2.0:
+    resolution: {integrity: sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==}
+    dependencies:
+      '@babel/runtime': 7.17.9
+      detect-node: 2.1.0
+    dev: false
+
+  /uri-js/4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+    dependencies:
+      punycode: 2.1.1
+
+  /use-debounce/8.0.1_react@18.1.0:
+    resolution: {integrity: sha512-6tGAFJKJ0qCalecaV7/gm/M6n238nmitNppvR89ff1yfwSFjwFKR7IQZzIZf1KZRQhqNireBzytzU6jgb29oVg==}
+    engines: {node: '>= 10.0.0'}
+    peerDependencies:
+      react: '>=16.8.0'
+    dependencies:
+      react: 18.1.0
+    dev: false
+
+  /util-deprecate/1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+    dev: true
+
+  /uuid/8.3.2:
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    hasBin: true
+    dev: true
+
+  /v8-compile-cache-lib/3.0.1:
+    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
+
+  /v8-compile-cache/2.3.0:
+    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
+    dev: true
+
+  /v8-to-istanbul/9.0.1:
+    resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
+    engines: {node: '>=10.12.0'}
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.13
+      '@types/istanbul-lib-coverage': 2.0.3
+      convert-source-map: 1.7.0
+
+  /vite-tsconfig-paths/3.5.0_vite@2.9.11:
+    resolution: {integrity: sha512-NKIubr7gXgh/3uniQaOytSg+aKWPrjquP6anAy+zCWEn6h9fB8z2/qdlfQrTgZWaXJ2pHVlllrSdRZltHn9P4g==}
+    peerDependencies:
+      vite: '>2.0.0-0'
+    dependencies:
+      debug: 4.3.4
+      globrex: 0.1.2
+      recrawl-sync: 2.2.2
+      tsconfig-paths: 4.0.0
+      vite: 2.9.11_sass@1.52.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /vite/2.9.11_sass@1.52.3:
+    resolution: {integrity: sha512-h1n8bAN5Psv/V+RAY3P6OtYyGSFQdusgYWiLRAk41qY7rSyH4K5Jq+RUXztzyPVB0oHbnXPUuS2Aj44jucViUA==}
+    engines: {node: '>=12.2.0'}
+    hasBin: true
+    peerDependencies:
+      less: '*'
+      sass: '*'
+      stylus: '*'
+    peerDependenciesMeta:
+      less:
+        optional: true
+      sass:
+        optional: true
+      stylus:
+        optional: true
+    dependencies:
+      esbuild: 0.14.43
+      postcss: 8.4.13
+      resolve: 1.22.0
+      rollup: 2.72.1
+      sass: 1.52.3
+    optionalDependencies:
+      fsevents: 2.3.2
+    dev: false
+
+  /w3c-hr-time/1.0.2:
+    resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
+    dependencies:
+      browser-process-hrtime: 1.0.0
+    dev: true
+
+  /w3c-xmlserializer/3.0.0:
+    resolution: {integrity: sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==}
+    engines: {node: '>=12'}
+    dependencies:
+      xml-name-validator: 4.0.0
+    dev: true
+
+  /walker/1.0.8:
+    resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
+    dependencies:
+      makeerror: 1.0.12
+
+  /warning/4.0.3:
+    resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
+    dependencies:
+      loose-envify: 1.4.0
+
+  /wcwidth/1.0.1:
+    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+    dependencies:
+      defaults: 1.0.3
+    dev: true
+
+  /webidl-conversions/3.0.1:
+    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+
+  /webidl-conversions/4.0.2:
+    resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
+
+  /webidl-conversions/7.0.0:
+    resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /whatwg-encoding/2.0.0:
+    resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
+    engines: {node: '>=12'}
+    dependencies:
+      iconv-lite: 0.6.3
+    dev: true
+
+  /whatwg-fetch/3.6.2:
+    resolution: {integrity: sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==}
+    dev: false
+
+  /whatwg-mimetype/3.0.0:
+    resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /whatwg-url/10.0.0:
+    resolution: {integrity: sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==}
+    engines: {node: '>=12'}
+    dependencies:
+      tr46: 3.0.0
+      webidl-conversions: 7.0.0
+    dev: true
+
+  /whatwg-url/11.0.0:
+    resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      tr46: 3.0.0
+      webidl-conversions: 7.0.0
+    dev: true
+
+  /whatwg-url/5.0.0:
+    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
+    dependencies:
+      tr46: 0.0.3
+      webidl-conversions: 3.0.1
+
+  /whatwg-url/6.5.0:
+    resolution: {integrity: sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==}
+    dependencies:
+      lodash.sortby: 4.7.0
+      tr46: 1.0.1
+      webidl-conversions: 4.0.2
+
+  /which-boxed-primitive/1.0.2:
+    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+    dependencies:
+      is-bigint: 1.0.2
+      is-boolean-object: 1.1.1
+      is-number-object: 1.0.5
+      is-string: 1.0.7
+      is-symbol: 1.0.4
+    dev: true
+
+  /which/2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+    dependencies:
+      isexe: 2.0.0
+
+  /word-wrap/1.2.3:
+    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /wrap-ansi/6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+    dev: true
+
+  /wrap-ansi/7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  /write-file-atomic/4.0.1:
+    resolution: {integrity: sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16}
+    dependencies:
+      imurmurhash: 0.1.4
+      signal-exit: 3.0.7
+
+  /ws/8.8.0:
+    resolution: {integrity: sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: ^5.0.2
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+    dev: true
+
+  /xml-name-validator/4.0.0:
+    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
+    engines: {node: '>=12'}
+    dev: true
+
+  /xml/1.0.1:
+    resolution: {integrity: sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==}
+    dev: true
+
+  /xmlchars/2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+    dev: true
+
+  /y18n/5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
+
+  /yallist/4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+
+  /yaml/1.10.2:
+    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
+    engines: {node: '>= 6'}
+    dev: true
+
+  /yaml/2.1.1:
+    resolution: {integrity: sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==}
+    engines: {node: '>= 14'}
+    dev: true
+
+  /yargs-parser/20.2.7:
+    resolution: {integrity: sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /yargs-parser/21.0.1:
+    resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==}
+    engines: {node: '>=12'}
+
+  /yargs/16.2.0:
+    resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
+    engines: {node: '>=10'}
+    dependencies:
+      cliui: 7.0.4
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 20.2.7
+    dev: true
+
+  /yargs/17.5.1:
+    resolution: {integrity: sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==}
+    engines: {node: '>=12'}
+    dependencies:
+      cliui: 7.0.4
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.0.1
+
+  /yn/3.1.1:
+    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
+    engines: {node: '>=6'}
+
+  /yup/0.32.11:
+    resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@babel/runtime': 7.17.9
+      '@types/lodash': 4.14.177
+      lodash: 4.17.21
+      lodash-es: 4.17.21
+      nanoclone: 0.2.1
+      property-expr: 2.0.4
+      toposort: 2.0.2
+    dev: false
diff --git a/pom.xml b/pom.xml
index 924108bd762..e229c4959e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
         <git.revision>latest</git.revision>
         <kafka-clients.version>2.8.0</kafka-clients.version>
         <node.version>v16.15.0</node.version>
+        <pnpm.version>v7.4.0</pnpm.version>
         <dockerfile-maven-plugin.version>1.4.10</dockerfile-maven-plugin.version>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>

From b9170956fffeb7f60cc1943226f47846e586ff9c Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 4 Jul 2022 13:36:56 +0400
Subject: [PATCH 051/734] Update logdirs label (#2234)

Signed-off-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx     | 2 +-
 .../src/components/Brokers/Broker/__test__/Broker.spec.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index e6ce8678dc1..9cf9b357064 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -57,7 +57,7 @@ const Broker: React.FC = () => {
           className={({ isActive }) => (isActive ? 'is-active' : '')}
           end
         >
-          Logdir
+          Log directories
         </NavLink>
         <NavLink
           to={clusterBrokerMetricsPath(clusterName, brokerId)}
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
index 07e6db34bc5..c030988fe69 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
@@ -21,7 +21,7 @@ const fetchStatsUrl = `/api/clusters/${clusterName}/stats`;
 const fetchBrokersUrl = `/api/clusters/${clusterName}/brokers`;
 const brokerLogdir = {
   pageText: 'brokerLogdir',
-  navigationName: 'Logdir',
+  navigationName: 'Log directories',
 };
 const brokerMetrics = {
   pageText: 'brokerMetrics',

From f8713cf3ef6cd581f76e08cb05769dd8728afdad Mon Sep 17 00:00:00 2001
From: azatsafin <azat.safin@gmail.com>
Date: Mon, 4 Jul 2022 23:34:56 +0300
Subject: [PATCH 052/734] Flow to update product version on AWS Marketplace
 (#1951)

* add publish step

* test path

* set workdir for packer

* update workflow

Co-authored-by: Azat Safin <azsafin@provectus.com>
Co-authored-by: Oleksii Troian <otroian@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/aws_publisher.yaml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/aws_publisher.yaml b/.github/workflows/aws_publisher.yaml
index 39468d4dde3..495f104c602 100644
--- a/.github/workflows/aws_publisher.yaml
+++ b/.github/workflows/aws_publisher.yaml
@@ -10,6 +10,10 @@ on:
         description: 'Version of KafkaUI'
         required: true
         default: '0.3.2'
+      PublishOnMarketplace:
+        description: 'If set to true, the request to update AWS Server product version will be raised'
+        required: true
+        default: false
 
 jobs:
   build-ami:
@@ -46,6 +50,27 @@ jobs:
         with:
           command: build
           arguments: "-color=false -on-error=abort -var=kafka_ui_release_version=${{ github.event.inputs.KafkaUIReleaseVersion }}"
-          target: kafka-ui-infra/ami/kafka-ui.pkr.hcl
+          target: kafka-ui.pkr.hcl
+          working_directory: ${{ env.WORK_DIR }}
         env:
           PACKER_LOG: 1
+
+      # add fresh AMI to AWS Marketplace
+      - name: Publish Artifact at Marketplace
+        if: ${{ github.event.inputs.PublishOnMarketplace == true }}
+        env:
+          PRODUCT_ID: ${{ secrets.AWS_SERVER_PRODUCT_ID }}
+          RELEASE_VERSION: "${{ github.event.inputs.KafkaUIReleaseVersion }}"
+          RELEASE_NOTES: "https://github.com/provectus/kafka-ui/releases/tag/v${{ github.event.inputs.KafkaUIReleaseVersion }}"
+          MP_ROLE_ARN: ${{ secrets.AWS_MARKETPLACE_AMI_ACCESS_ROLE }} # https://docs.aws.amazon.com/marketplace/latest/userguide/ami-single-ami-products.html#single-ami-marketplace-ami-access
+          AMI_OS_VERSION: "amzn2-ami-kernel-5.10-hvm-*-x86_64-gp2"
+        run: |
+          set -x
+          pwd
+          ls -la kafka-ui-infra/ami
+          echo $WORK_DIR/manifest.json
+          export AMI_ID=$(jq -r '.builds[-1].artifact_id' kafka-ui-infra/ami/manifest.json | cut -d ":" -f2)
+          /bin/bash kafka-ui-infra/aws-marketplace/prepare_changeset.sh > changeset.json
+          aws marketplace-catalog start-change-set \
+            --catalog "AWSMarketplace" \
+            --change-set "$(cat changeset.json)"

From 8b0515c027f02172684f28cdd4a2d00cfbe48a38 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 5 Jul 2022 12:40:15 +0400
Subject: [PATCH 053/734] Update issues templates

* Update helm issue template

* Update feature issue template

* Update bug issue template

* Add a question template

* Add a reminder to check for existing issues
---
 .github/ISSUE_TEMPLATE/bug_report.md           | 18 ++++++++++++++++--
 .github/ISSUE_TEMPLATE/feature_request.md      | 11 +++++++++++
 .../ISSUE_TEMPLATE/{k8s_whine.md => k8s.md}    | 18 +++++++++++++++---
 .github/ISSUE_TEMPLATE/question.md             | 16 ++++++++++++++++
 4 files changed, 58 insertions(+), 5 deletions(-)
 rename .github/ISSUE_TEMPLATE/{k8s_whine.md => k8s.md} (51%)
 create mode 100644 .github/ISSUE_TEMPLATE/question.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 6a2b8abec37..aee341a0feb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,18 +7,32 @@ assignees: ''
 
 ---
 
+<!--
+
+Don't forget to check for existing issues/discussions regarding your proposal. We might already have it.
+https://github.com/provectus/kafka-ui/issues
+https://github.com/provectus/kafka-ui/discussions
+
+-->
+
 **Describe the bug**
 <!--(A clear and concise description of what the bug is.)-->
 
 
 **Set up**
 <!--
-(How do you run the app? 
-Which version of the app are you running? Provide either docker image version or check commit hash at the top left corner. We won't be able to help you without this information.)
+How do you run the app? Please provide as much info as possible:
+1. App version (docker image version or check commit hash in the top left corner in UI)
+2. Helm chart version, if you use one
+3. Any IAAC configs
+
+We might close the issue without further explanation if you don't provide such information.
 -->
 
 
 **Steps to Reproduce**
+<!-- We'd like you to provide an example setup (via docker-compose, helm, etc.) 
+to reproduce the problem, especially with a complex setups. -->
 Steps to reproduce the behavior:
 
 1. 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 68bcf80782f..49a07ae9782 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,6 +7,17 @@ assignees: ''
 
 ---
 
+<!--
+
+Don't forget to check for existing issues/discussions regarding your proposal. We might already have it.
+https://github.com/provectus/kafka-ui/issues
+https://github.com/provectus/kafka-ui/discussions
+
+-->
+
+### Which version of the app are you running?
+<!-- Please provide docker image version or check commit hash in the top left corner in UI) -->
+
 ### Is your proposal related to a problem?
 
 <!--
diff --git a/.github/ISSUE_TEMPLATE/k8s_whine.md b/.github/ISSUE_TEMPLATE/k8s.md
similarity index 51%
rename from .github/ISSUE_TEMPLATE/k8s_whine.md
rename to .github/ISSUE_TEMPLATE/k8s.md
index 1d767005eb0..5f4eb8ca755 100644
--- a/.github/ISSUE_TEMPLATE/k8s_whine.md
+++ b/.github/ISSUE_TEMPLATE/k8s.md
@@ -3,18 +3,30 @@ name: "⎈ K8s/Helm problem report"
 about: Report a problem with k8s/helm charts/etc
 title: ''
 labels: scope/k8s, status/triage
-assignees: azatsafin, 5hin0bi
+assignees: azatsafin
 
 ---
 
+<!--
+
+Don't forget to check for existing issues/discussions regarding your proposal. We might already have it.
+https://github.com/provectus/kafka-ui/issues
+https://github.com/provectus/kafka-ui/discussions
+
+-->
+
 **Describe the bug**
 <!--(A clear and concise description of what the bug is.)-->
 
 
 **Set up**
 <!--
-(How do you run the app? 
-Which version of the app are you running? Provide either docker image version or check commit hash at the top left corner. We won't be able to help you without this information.)
+How do you run the app? Please provide as much info as possible:
+1. App version (docker image version or check commit hash in the top left corner in UI)
+2. Helm chart version, if you use one
+3. Any IAAC configs
+
+We might close the issue without further explanation if you don't provide such information.
 -->
 
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000000..166f56e6601
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,16 @@
+---
+name: "❓ Question"
+about: Ask a question
+title: ''
+
+---
+
+<!--
+
+To ask a question, please either:
+1. Open up a discussion (https://github.com/provectus/kafka-ui/discussions)
+2. Join us on discord (https://discord.gg/4DWzD7pGE5) and ask there.
+
+Don't forget to check/search for existing issues/discussions.
+
+-->

From 83222edc62ef2ab370ace84df506edb225515115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=85=85=E3=85=85=E3=85=87?=
 <108485258+puzzlewell@users.noreply.github.com>
Date: Wed, 6 Jul 2022 05:10:40 +0000
Subject: [PATCH 054/734] Update running.md (#2248)

Fix broken url link
---
 documentation/project/contributing/running.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/project/contributing/running.md b/documentation/project/contributing/running.md
index a74f198f0c1..6df67370f6f 100644
--- a/documentation/project/contributing/running.md
+++ b/documentation/project/contributing/running.md
@@ -22,4 +22,4 @@ Once you built the app, run the following in `kafka-ui-api/`:
 helm repo add kafka-ui https://provectus.github.io/kafka-ui
 helm install kafka-ui kafka-ui/kafka-ui
 ```
-To read more please follow to [chart documentation](charts/kafka-ui/README.md)
\ No newline at end of file
+To read more please follow to [chart documentation](../../../charts/kafka-ui/README.md)

From cbd4e4a52adf8ca7b15c84a5c18331d6359eb51e Mon Sep 17 00:00:00 2001
From: Artem Kazlanzhy <87637857+akazlanzhy@users.noreply.github.com>
Date: Thu, 7 Jul 2022 18:50:26 +0300
Subject: [PATCH 055/734] KSQLDB: Support Basic Auth (#2247)

* Support basic authentication for KSQL server

* Resolve mr issues

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 README.md                                     |  2 ++
 .../provectus/kafka/ui/client/KsqlClient.java |  5 ++++-
 .../kafka/ui/config/ClustersProperties.java   |  9 +++++++++
 .../kafka/ui/mapper/ClusterMapper.java        | 20 +++++++++++++++++++
 .../kafka/ui/model/InternalKsqlServer.java    | 14 +++++++++++++
 .../kafka/ui/model/KafkaCluster.java          |  2 +-
 .../kafka/ui/service/KsqlService.java         |  6 +++---
 .../kafka/ui/service/ksql/KsqlApiClient.java  | 17 +++++++++++++++-
 .../kafka/ui/service/KsqlServiceTest.java     | 14 +++++++------
 .../ui/service/ksql/KsqlApiClientTest.java    |  4 +++-
 .../ui/service/ksql/KsqlServiceV2Test.java    |  8 +++++---
 11 files changed, 85 insertions(+), 16 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java

diff --git a/README.md b/README.md
index 5a0f51cf07e..494909e6730 100644
--- a/README.md
+++ b/README.md
@@ -163,6 +163,8 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_NAME` | Cluster name
 |`KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS` 	|Address where to connect 
 |`KAFKA_CLUSTERS_0_KSQLDBSERVER` 	| KSQL DB server address 
+|`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_USERNAME` 	| KSQL DB server's basic authentication username 
+|`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_PASSWORD` 	| KSQL DB server's basic authentication password 
 |`KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL` 	|Security protocol to connect to the brokers. For SSL connection use "SSL", for plaintext connection don't set this environment variable
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRY`   	|SchemaRegistry's address
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME`   	|SchemaRegistry's basic authentication username
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java
index 2e8026648d7..8d051234abb 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java
@@ -3,7 +3,9 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.provectus.kafka.ui.exception.UnprocessableEntityException;
+import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
+import com.provectus.kafka.ui.service.ksql.KsqlApiClient;
 import com.provectus.kafka.ui.strategy.ksql.statement.BaseStrategy;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -23,9 +25,10 @@ public class KsqlClient {
   private final WebClient webClient;
   private final ObjectMapper mapper;
 
-  public Mono<KsqlCommandResponseDTO> execute(BaseStrategy ksqlStatement) {
+  public Mono<KsqlCommandResponseDTO> execute(BaseStrategy ksqlStatement, KafkaCluster cluster) {
     return webClient.post()
         .uri(ksqlStatement.getUri())
+        .headers(httpHeaders -> KsqlApiClient.setBasicAuthIfEnabled(httpHeaders, cluster))
         .accept(new MediaType("application", "vnd.ksql.v1+json"))
         .body(BodyInserters.fromValue(ksqlStatement.getKsqlCommand()))
         .retrieve()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 0d83e143c5d..de4c8bc3477 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -8,6 +8,7 @@
 import java.util.Set;
 import javax.annotation.PostConstruct;
 import lombok.Data;
+import lombok.ToString;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.StringUtils;
@@ -26,6 +27,7 @@ public static class Cluster {
     String schemaRegistry;
     SchemaRegistryAuth schemaRegistryAuth;
     String ksqldbServer;
+    KsqldbServerAuth ksqldbServerAuth;
     String schemaNameTemplate = "%s-value";
     String keySchemaNameTemplate = "%s-key";
     String protobufFile;
@@ -57,6 +59,13 @@ public static class SchemaRegistryAuth {
     String password;
   }
 
+  @Data
+  @ToString(exclude = "password")
+  public static class KsqldbServerAuth {
+    String username;
+    String password;
+  }
+
   @PostConstruct
   public void validateAndSetDefaults() {
     validateClusterNames();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index 1eb6199f96c..5709709e9b4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -17,6 +17,7 @@
 import com.provectus.kafka.ui.model.InternalBrokerConfig;
 import com.provectus.kafka.ui.model.InternalBrokerDiskUsage;
 import com.provectus.kafka.ui.model.InternalClusterState;
+import com.provectus.kafka.ui.model.InternalKsqlServer;
 import com.provectus.kafka.ui.model.InternalPartition;
 import com.provectus.kafka.ui.model.InternalReplica;
 import com.provectus.kafka.ui.model.InternalSchemaRegistry;
@@ -53,6 +54,7 @@ public interface ClusterMapper {
   @Mapping(target = "protobufFile", source = "protobufFile", qualifiedByName = "resolvePath")
   @Mapping(target = "properties", source = "properties", qualifiedByName = "setProperties")
   @Mapping(target = "schemaRegistry", source = ".", qualifiedByName = "setSchemaRegistry")
+  @Mapping(target = "ksqldbServer", source = ".", qualifiedByName = "setKsqldbServer")
   KafkaCluster toKafkaCluster(ClustersProperties.Cluster clusterProperties);
 
   ClusterStatsDTO toClusterStats(InternalClusterState clusterState);
@@ -110,6 +112,24 @@ default InternalSchemaRegistry setSchemaRegistry(ClustersProperties.Cluster clus
     return internalSchemaRegistry.build();
   }
 
+  @Named("setKsqldbServer")
+  default InternalKsqlServer setKsqldbServer(ClustersProperties.Cluster clusterProperties) {
+    if (clusterProperties == null
+            || clusterProperties.getKsqldbServer() == null) {
+      return null;
+    }
+
+    InternalKsqlServer.InternalKsqlServerBuilder internalKsqlServerBuilder =
+            InternalKsqlServer.builder().url(clusterProperties.getKsqldbServer());
+
+    if (clusterProperties.getKsqldbServerAuth() != null) {
+      internalKsqlServerBuilder.username(clusterProperties.getKsqldbServerAuth().getUsername());
+      internalKsqlServerBuilder.password(clusterProperties.getKsqldbServerAuth().getPassword());
+    }
+
+    return internalKsqlServerBuilder.build();
+  }
+
   TopicDetailsDTO toTopicDetails(InternalTopic topic);
 
   @Mapping(target = "isReadOnly", source = "readOnly")
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java
new file mode 100644
index 00000000000..a1c715bb586
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java
@@ -0,0 +1,14 @@
+package com.provectus.kafka.ui.model;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString(exclude = "password")
+@Builder(toBuilder = true)
+public class InternalKsqlServer {
+  private final String url;
+  private final String username;
+  private final String password;
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
index b9f1ea96768..eab02e789f0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
@@ -21,7 +21,7 @@ public class KafkaCluster {
   private final String jmxPassword;
   private final String bootstrapServers;
   private final InternalSchemaRegistry schemaRegistry;
-  private final String ksqldbServer;
+  private final InternalKsqlServer ksqldbServer;
   private final List<KafkaConnectCluster> kafkaConnect;
   private final String schemaNameTemplate;
   private final String keySchemaNameTemplate;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java
index 4e970dc0c8c..6f74ede75ec 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java
@@ -28,10 +28,10 @@ public Mono<KsqlCommandResponseDTO> executeKsqlCommand(KafkaCluster cluster,
               e instanceof ClusterNotFoundException ? e : new KsqlDbNotFoundException();
           return Mono.error(throwable);
         })
-        .flatMap(host -> getStatementStrategyForKsqlCommand(ksqlCommand)
-            .map(statement -> statement.host(host))
+        .flatMap(ksqlServer -> getStatementStrategyForKsqlCommand(ksqlCommand)
+            .map(statement -> statement.host(ksqlServer.getUrl()))
         )
-        .flatMap(ksqlClient::execute);
+        .flatMap(baseStrategy -> ksqlClient.execute(baseStrategy, cluster));
   }
 
   private Mono<BaseStrategy> getStatementStrategyForKsqlCommand(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
index 161c284c972..b83da666aaf 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.TextNode;
+import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.service.ksql.response.ResponseParser;
 import java.util.List;
@@ -18,6 +19,7 @@
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.codec.DecodingException;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.util.MimeTypeUtils;
@@ -79,12 +81,25 @@ private WebClient webClient() {
         .build();
     return WebClient.builder()
         .codecs(c -> c.defaultCodecs().maxInMemorySize((int) maxBuffSize.toBytes()))
+        .defaultHeaders(httpHeaders -> setBasicAuthIfEnabled(httpHeaders, cluster))
         .exchangeStrategies(exchangeStrategies)
         .build();
   }
 
+  public static void setBasicAuthIfEnabled(HttpHeaders headers, KafkaCluster cluster) {
+    String username = cluster.getKsqldbServer().getUsername();
+    String password = cluster.getKsqldbServer().getPassword();
+    if (username != null && password != null) {
+      headers.setBasicAuth(username, password);
+    } else if (username != null) {
+      throw new ValidationException("You specified username but did not specify password");
+    } else if (password != null) {
+      throw new ValidationException("You specified password but did not specify username");
+    }
+  }
+
   private String baseKsqlDbUri() {
-    return cluster.getKsqldbServer();
+    return cluster.getKsqldbServer().getUrl();
   }
 
   private KsqlRequest ksqlRequest(String ksql, Map<String, String> streamProperties) {
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java
index f41b595e791..ed434efba44 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -9,6 +10,7 @@
 import com.provectus.kafka.ui.client.KsqlClient;
 import com.provectus.kafka.ui.exception.KsqlDbNotFoundException;
 import com.provectus.kafka.ui.exception.UnprocessableEntityException;
+import com.provectus.kafka.ui.model.InternalKsqlServer;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.KsqlCommandDTO;
 import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
@@ -62,7 +64,7 @@ void shouldThrowUnprocessableEntityExceptionOnExecuteKsqlCommand() {
     KsqlCommandDTO command =
         (new KsqlCommandDTO()).ksql("CREATE STREAM users WITH (KAFKA_TOPIC='users');");
     KafkaCluster kafkaCluster = Mockito.mock(KafkaCluster.class);
-    when(kafkaCluster.getKsqldbServer()).thenReturn("localhost:8088");
+    when(kafkaCluster.getKsqldbServer()).thenReturn(InternalKsqlServer.builder().url("localhost:8088").build());
 
     StepVerifier.create(ksqlService.executeKsqlCommand(kafkaCluster, Mono.just(command)))
         .verifyError(UnprocessableEntityException.class);
@@ -77,8 +79,8 @@ void shouldSetHostToStrategy() {
     KsqlCommandDTO command = (new KsqlCommandDTO()).ksql("describe streams;");
     KafkaCluster kafkaCluster = Mockito.mock(KafkaCluster.class);
 
-    when(kafkaCluster.getKsqldbServer()).thenReturn(host);
-    when(ksqlClient.execute(any())).thenReturn(Mono.just(new KsqlCommandResponseDTO()));
+    when(kafkaCluster.getKsqldbServer()).thenReturn(InternalKsqlServer.builder().url(host).build());
+    when(ksqlClient.execute(any(), any())).thenReturn(Mono.just(new KsqlCommandResponseDTO()));
 
     ksqlService.executeKsqlCommand(kafkaCluster, Mono.just(command)).block();
     assertThat(alternativeStrategy.getUri()).isEqualTo(host + "/ksql");
@@ -90,12 +92,12 @@ void shouldCallClientAndReturnResponse() {
     KafkaCluster kafkaCluster = Mockito.mock(KafkaCluster.class);
     KsqlCommandResponseDTO response = new KsqlCommandResponseDTO().message("success");
 
-    when(kafkaCluster.getKsqldbServer()).thenReturn("host");
-    when(ksqlClient.execute(any())).thenReturn(Mono.just(response));
+    when(kafkaCluster.getKsqldbServer()).thenReturn(InternalKsqlServer.builder().url("host").build());
+    when(ksqlClient.execute(any(), any())).thenReturn(Mono.just(response));
 
     KsqlCommandResponseDTO receivedResponse =
         ksqlService.executeKsqlCommand(kafkaCluster, Mono.just(command)).block();
-    verify(ksqlClient, times(1)).execute(alternativeStrategy);
+    verify(ksqlClient, times(1)).execute(eq(alternativeStrategy), any());
     assertThat(receivedResponse).isEqualTo(response);
 
   }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
index 5956d730829..a797175091f 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.container.KsqlDbContainer;
+import com.provectus.kafka.ui.model.InternalKsqlServer;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import java.time.Duration;
 import java.util.List;
@@ -42,7 +43,8 @@ static void stopContainer() {
   // Tutorial is here: https://ksqldb.io/quickstart.html
   @Test
   void ksqTutorialQueriesWork() {
-    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(KSQL_DB.url()).build(), maxBuffSize);
+    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(
+            InternalKsqlServer.builder().url(KSQL_DB.url()).build()).build(), maxBuffSize);
     execCommandSync(client,
         "CREATE STREAM riderLocations (profileId VARCHAR, latitude DOUBLE, longitude DOUBLE) "
             + "WITH (kafka_topic='locations', value_format='json', partitions=1);",
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
index d670680ea21..89823d643ea 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
@@ -4,6 +4,7 @@
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.container.KsqlDbContainer;
+import com.provectus.kafka.ui.model.InternalKsqlServer;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.KsqlStreamDescriptionDTO;
 import com.provectus.kafka.ui.model.KsqlTableDescriptionDTO;
@@ -34,7 +35,8 @@ static void init() {
 
   @AfterAll
   static void cleanup() {
-    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(KSQL_DB.url()).build(), maxBuffSize);
+    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(
+        InternalKsqlServer.builder().url(KSQL_DB.url()).build()).build(), maxBuffSize);
 
     TABLES_TO_DELETE.forEach(t ->
         client.execute(String.format("DROP TABLE IF EXISTS %s DELETE TOPIC;", t), Map.of())
@@ -51,7 +53,7 @@ static void cleanup() {
 
   @Test
   void listStreamsReturnsAllKsqlStreams() {
-    var cluster = KafkaCluster.builder().ksqldbServer(KSQL_DB.url()).build();
+    var cluster = KafkaCluster.builder().ksqldbServer(InternalKsqlServer.builder().url(KSQL_DB.url()).build()).build();
     var streamName = "stream_" + System.currentTimeMillis();
     STREAMS_TO_DELETE.add(streamName);
 
@@ -80,7 +82,7 @@ void listStreamsReturnsAllKsqlStreams() {
 
   @Test
   void listTablesReturnsAllKsqlTables() {
-    var cluster = KafkaCluster.builder().ksqldbServer(KSQL_DB.url()).build();
+    var cluster = KafkaCluster.builder().ksqldbServer(InternalKsqlServer.builder().url(KSQL_DB.url()).build()).build();
     var tableName = "table_" + System.currentTimeMillis();
     TABLES_TO_DELETE.add(tableName);
 

From 0b76b1251859f7acc4daf4afd746b81945b7c720 Mon Sep 17 00:00:00 2001
From: Kirill Morozov <grifx.design@gmail.com>
Date: Tue, 12 Jul 2022 11:40:52 +0300
Subject: [PATCH 056/734] Added key-value form for stream parameters (#2191)

* Added key-value form for stream parameters

* Removed unused variable

* fixing some test cases and fixing width of stream props

* adding key value validation and tests

* fixing placeholder padding and font size

* remove unnecessary code

Co-authored-by: rAzizbekyan <razizbekyan@provectus.com>
Co-authored-by: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
---
 .../src/components/KsqlDb/Query/Query.tsx     |  14 +-
 .../Query/QueryForm/QueryForm.styled.ts       |  41 ++++-
 .../KsqlDb/Query/QueryForm/QueryForm.tsx      | 135 +++++++++------
 .../QueryForm/__test__/QueryForm.spec.tsx     | 156 +++---------------
 .../KsqlDb/Query/__test__/Query.spec.tsx      |  58 ++-----
 5 files changed, 170 insertions(+), 234 deletions(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
index 4982807ac24..c5757e2cae6 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
@@ -198,15 +198,23 @@ const Query: FC = () => {
 
   const submitHandler = useCallback(
     (values: FormValues) => {
+      const streamsProperties = values.streamsProperties.reduce(
+        (acc, current) => ({
+          ...acc,
+          [current.key as keyof string]: current.value,
+        }),
+        {} as { [key: string]: string }
+      );
       setFetching(true);
       dispatch(
         executeKsql({
           clusterName,
           ksqlCommandV2: {
             ...values,
-            streamsProperties: values.streamsProperties
-              ? JSON.parse(values.streamsProperties)
-              : undefined,
+            streamsProperties:
+              values.streamsProperties[0].key !== ''
+                ? JSON.parse(JSON.stringify(streamsProperties))
+                : undefined,
           },
         })
       );
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
index 980fa0c2165..202e5862907 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
@@ -27,8 +27,47 @@ export const KSQLButtons = styled.div`
   gap: 16px;
 `;
 
+export const StreamPropertiesContainer = styled.label`
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  width: 50%;
+`;
+
+export const InputsContainer = styled.div`
+  display: flex;
+  justify-content: center;
+  gap: 10px;
+`;
+
+export const StreamPropertiesInputWrapper = styled.div`
+  & > input {
+    height: 40px;
+    border: 1px solid grey;
+    border-radius: 4px;
+    min-width: 300px;
+    font-size: 16px;
+    padding-left: 15px;
+  }
+`;
+
+export const DeleteButtonWrapper = styled.div`
+  min-height: 32px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-self: flex-start;
+  margin-top: 10px;
+`;
+
+export const LabelContainer = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+`;
+
 export const Fieldset = styled.fieldset`
-  width: 100%;
+  width: 50%;
 `;
 
 export const Editor = styled(BaseEditor)(
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
index f824dd256a7..a4d2a275bea 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
 import { FormError } from 'components/common/Input/Input.styled';
 import { ErrorMessage } from '@hookform/error-message';
+import { useForm, Controller, useFieldArray } from 'react-hook-form';
+import { Button } from 'components/common/Button/Button';
+import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
+import CloseIcon from 'components/common/Icons/CloseIcon';
 import { yupResolver } from '@hookform/resolvers/yup';
 import yup from 'lib/yupExtended';
-import { useForm, Controller } from 'react-hook-form';
-import { Button } from 'components/common/Button/Button';
-import { SchemaType } from 'generated-sources';
 
 import * as S from './QueryForm.styled';
 
@@ -17,16 +18,22 @@ export interface Props {
   submitHandler: (values: FormValues) => void;
 }
 
+export type StreamsPropertiesType = {
+  key: string;
+  value: string;
+};
 export type FormValues = {
   ksql: string;
-  streamsProperties: string;
+  streamsProperties: StreamsPropertiesType[];
 };
 
+const streamsPropertiesSchema = yup.object().shape({
+  key: yup.string().trim(),
+  value: yup.string().trim(),
+});
 const validationSchema = yup.object({
   ksql: yup.string().trim().required(),
-  streamsProperties: yup.lazy((value) =>
-    value === '' ? yup.string().trim() : yup.string().trim().isJsonObject()
-  ),
+  streamsProperties: yup.array().of(streamsPropertiesSchema),
 });
 
 const QueryForm: React.FC<Props> = ({
@@ -46,9 +53,16 @@ const QueryForm: React.FC<Props> = ({
     resolver: yupResolver(validationSchema),
     defaultValues: {
       ksql: '',
-      streamsProperties: '',
+      streamsProperties: [{ key: '', value: '' }],
     },
   });
+  const { fields, append, remove } = useFieldArray<
+    FormValues,
+    'streamsProperties'
+  >({
+    control,
+    name: 'streamsProperties',
+  });
 
   return (
     <S.QueryWrapper>
@@ -93,48 +107,69 @@ const QueryForm: React.FC<Props> = ({
               <ErrorMessage errors={errors} name="ksql" />
             </FormError>
           </S.Fieldset>
-          <S.Fieldset aria-labelledby="streamsPropertiesLabel">
-            <S.KSQLInputHeader>
-              <label id="streamsPropertiesLabel">
-                Stream properties (JSON format)
-              </label>
-              <Button
-                onClick={() => setValue('streamsProperties', '')}
-                buttonType="primary"
-                buttonSize="S"
-                isInverted
-              >
-                Clear
-              </Button>
-            </S.KSQLInputHeader>
-            <Controller
-              control={control}
-              name="streamsProperties"
-              render={({ field }) => (
-                <S.Editor
-                  {...field}
-                  commands={[
-                    {
-                      // commands is array of key bindings.
-                      // name for the key binding.
-                      name: 'commandName',
-                      // key combination used for the command.
-                      bindKey: { win: 'Ctrl-Enter', mac: 'Command-Enter' },
-                      // function to execute when keys are pressed.
-                      exec: () => {
-                        handleSubmit(submitHandler)();
-                      },
-                    },
-                  ]}
-                  schemaType={SchemaType.JSON}
-                  readOnly={fetching}
-                />
-              )}
-            />
-            <FormError>
-              <ErrorMessage errors={errors} name="streamsProperties" />
-            </FormError>
-          </S.Fieldset>
+
+          <S.StreamPropertiesContainer>
+            Stream properties:
+            {fields.map((item, index) => (
+              <S.InputsContainer key={item.id}>
+                <S.StreamPropertiesInputWrapper>
+                  <Controller
+                    control={control}
+                    name={`streamsProperties.${index}.key`}
+                    render={({ field }) => (
+                      <input
+                        {...field}
+                        placeholder="Key"
+                        aria-label="key"
+                        type="text"
+                      />
+                    )}
+                  />
+                  <FormError>
+                    <ErrorMessage
+                      errors={errors}
+                      name={`streamsProperties.${index}.key`}
+                    />
+                  </FormError>
+                </S.StreamPropertiesInputWrapper>
+                <S.StreamPropertiesInputWrapper>
+                  <Controller
+                    control={control}
+                    name={`streamsProperties.${index}.value`}
+                    render={({ field }) => (
+                      <input
+                        {...field}
+                        placeholder="Value"
+                        aria-label="value"
+                        type="text"
+                      />
+                    )}
+                  />
+                  <FormError>
+                    <ErrorMessage
+                      errors={errors}
+                      name={`streamsProperties.${index}.value`}
+                    />
+                  </FormError>
+                </S.StreamPropertiesInputWrapper>
+
+                <S.DeleteButtonWrapper onClick={() => remove(index)}>
+                  <IconButtonWrapper aria-label="deleteProperty">
+                    <CloseIcon aria-hidden />
+                  </IconButtonWrapper>
+                </S.DeleteButtonWrapper>
+              </S.InputsContainer>
+            ))}
+            <Button
+              type="button"
+              buttonSize="M"
+              buttonType="secondary"
+              onClick={() => append({ key: '', value: '' })}
+            >
+              <i className="fas fa-plus" />
+              Add Stream Property
+            </Button>
+          </S.StreamPropertiesContainer>
         </S.KSQLInputsWrapper>
         <S.KSQLButtons>
           <Button
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
index 09f61cccb4a..12a61a5fa5f 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
@@ -1,7 +1,7 @@
 import { render } from 'lib/testHelpers';
 import React from 'react';
 import QueryForm, { Props } from 'components/KsqlDb/Query/QueryForm/QueryForm';
-import { screen, within } from '@testing-library/dom';
+import { screen, waitFor, within } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
 import { act } from '@testing-library/react';
 
@@ -26,20 +26,11 @@ describe('QueryForm', () => {
     // Represents SQL editor
     expect(within(KSQLBlock).getByRole('textbox')).toBeInTheDocument();
 
-    const streamPropertiesBlock = screen.getByLabelText(
-      'Stream properties (JSON format)'
-    );
+    const streamPropertiesBlock = screen.getByRole('textbox', { name: 'key' });
     expect(streamPropertiesBlock).toBeInTheDocument();
-    expect(
-      within(streamPropertiesBlock).getByText('Stream properties (JSON format)')
-    ).toBeInTheDocument();
-    expect(
-      within(streamPropertiesBlock).getByRole('button', { name: 'Clear' })
-    ).toBeInTheDocument();
-    // Represents JSON editor
-    expect(
-      within(streamPropertiesBlock).getByRole('textbox')
-    ).toBeInTheDocument();
+    expect(screen.getByText('Stream properties:')).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Clear' })).toBeInTheDocument();
+    expect(screen.queryAllByRole('textbox')[0]).toBeInTheDocument();
 
     // Form controls
     expect(screen.getByRole('button', { name: 'Execute' })).toBeInTheDocument();
@@ -69,58 +60,10 @@ describe('QueryForm', () => {
     await act(() =>
       userEvent.click(screen.getByRole('button', { name: 'Execute' }))
     );
-    expect(screen.getByText('ksql is a required field')).toBeInTheDocument();
-    expect(submitFn).not.toBeCalled();
-  });
-
-  it('renders error with non-JSON streamProperties', async () => {
-    renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: jest.fn(),
-    });
-
-    await act(() => {
-      // the use of `paste` is a hack that i found somewhere,
-      // `type` won't work
-      userEvent.paste(
-        within(
-          screen.getByLabelText('Stream properties (JSON format)')
-        ).getByRole('textbox'),
-        'not-a-JSON-string'
-      );
-
-      userEvent.click(screen.getByRole('button', { name: 'Execute' }));
+    waitFor(() => {
+      expect(screen.getByText('ksql is a required field')).toBeInTheDocument();
+      expect(submitFn).not.toBeCalled();
     });
-
-    expect(
-      screen.getByText('streamsProperties is not JSON object')
-    ).toBeInTheDocument();
-  });
-
-  it('renders without error with correct JSON', async () => {
-    renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: jest.fn(),
-    });
-
-    await act(() => {
-      userEvent.paste(
-        within(
-          screen.getByLabelText('Stream properties (JSON format)')
-        ).getByRole('textbox'),
-        '{"totallyJSON": "string"}'
-      );
-      userEvent.click(screen.getByRole('button', { name: 'Execute' }));
-    });
-    expect(
-      screen.queryByText('streamsProperties is not JSON object')
-    ).not.toBeInTheDocument();
   });
 
   it('submits with correct inputs', async () => {
@@ -134,18 +77,9 @@ describe('QueryForm', () => {
     });
 
     await act(() => {
-      userEvent.paste(
-        within(screen.getByLabelText('KSQL')).getByRole('textbox'),
-        'show tables;'
-      );
-
-      userEvent.paste(
-        within(
-          screen.getByLabelText('Stream properties (JSON format)')
-        ).getByRole('textbox'),
-        '{"totallyJSON": "string"}'
-      );
-
+      userEvent.paste(screen.getAllByRole('textbox')[0], 'show tables;');
+      userEvent.paste(screen.getByRole('textbox', { name: 'key' }), 'test');
+      userEvent.paste(screen.getByRole('textbox', { name: 'value' }), 'test');
       userEvent.click(screen.getByRole('button', { name: 'Execute' }));
     });
 
@@ -223,41 +157,7 @@ describe('QueryForm', () => {
     expect(submitFn.mock.calls.length).toBe(1);
   });
 
-  it('submits form with ctrl+enter on streamProperties editor', async () => {
-    const submitFn = jest.fn();
-    renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: submitFn,
-    });
-
-    await act(() => {
-      userEvent.paste(
-        within(screen.getByLabelText('KSQL')).getByRole('textbox'),
-        'show tables;'
-      );
-
-      userEvent.paste(
-        within(
-          screen.getByLabelText('Stream properties (JSON format)')
-        ).getByRole('textbox'),
-        '{"some":"json"}'
-      );
-
-      userEvent.type(
-        within(
-          screen.getByLabelText('Stream properties (JSON format)')
-        ).getByRole('textbox'),
-        '{ctrl}{enter}'
-      );
-    });
-
-    expect(submitFn.mock.calls.length).toBe(1);
-  });
-
-  it('clears KSQL with Clear button', async () => {
+  it('add new property', async () => {
     renderComponent({
       fetching: false,
       hasResults: false,
@@ -267,22 +167,15 @@ describe('QueryForm', () => {
     });
 
     await act(() => {
-      userEvent.paste(
-        within(screen.getByLabelText('KSQL')).getByRole('textbox'),
-        'show tables;'
-      );
       userEvent.click(
-        within(screen.getByLabelText('KSQL')).getByRole('button', {
-          name: 'Clear',
-        })
+        screen.getByRole('button', { name: 'Add Stream Property' })
       );
     });
-
-    expect(screen.queryByText('show tables;')).not.toBeInTheDocument();
+    expect(screen.getAllByRole('textbox', { name: 'key' }).length).toEqual(2);
   });
 
-  it('clears streamProperties with Clear button', async () => {
-    renderComponent({
+  it('delete stream property', async () => {
+    await renderComponent({
       fetching: false,
       hasResults: false,
       handleClearResults: jest.fn(),
@@ -291,20 +184,13 @@ describe('QueryForm', () => {
     });
 
     await act(() => {
-      userEvent.paste(
-        within(
-          screen.getByLabelText('Stream properties (JSON format)')
-        ).getByRole('textbox'),
-        '{"some":"json"}'
-      );
       userEvent.click(
-        within(
-          screen.getByLabelText('Stream properties (JSON format)')
-        ).getByRole('button', {
-          name: 'Clear',
-        })
+        screen.getByRole('button', { name: 'Add Stream Property' })
       );
     });
-    expect(screen.queryByText('{"some":"json"}')).not.toBeInTheDocument();
+    await act(() => {
+      userEvent.click(screen.getAllByLabelText('deleteProperty')[0]);
+    });
+    expect(screen.getAllByRole('textbox', { name: 'key' }).length).toEqual(1);
   });
 });
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx
index fd2cacfd7f1..985ebde5e5b 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx
@@ -3,11 +3,11 @@ import React from 'react';
 import Query, {
   getFormattedErrorFromTableData,
 } from 'components/KsqlDb/Query/Query';
-import { screen, within } from '@testing-library/dom';
+import { screen } from '@testing-library/dom';
 import fetchMock from 'fetch-mock';
-import userEvent from '@testing-library/user-event';
 import { clusterKsqlDbQueryPath } from 'lib/paths';
 import { act } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 const clusterName = 'testLocal';
 const renderComponent = () =>
@@ -25,9 +25,7 @@ describe('Query', () => {
     renderComponent();
 
     expect(screen.getByLabelText('KSQL')).toBeInTheDocument();
-    expect(
-      screen.getByLabelText('Stream properties (JSON format)')
-    ).toBeInTheDocument();
+    expect(screen.getByLabelText('Stream properties:')).toBeInTheDocument();
   });
 
   afterEach(() => fetchMock.reset());
@@ -41,12 +39,10 @@ describe('Query', () => {
     Object.defineProperty(window, 'EventSource', {
       value: EventSourceMock,
     });
-
+    const inputs = screen.getAllByRole('textbox');
+    const textAreaElement = inputs[0] as HTMLTextAreaElement;
     await act(() => {
-      userEvent.paste(
-        within(screen.getByLabelText('KSQL')).getByRole('textbox'),
-        'show tables;'
-      );
+      userEvent.paste(textAreaElement, 'show tables;');
       userEvent.click(screen.getByRole('button', { name: 'Execute' }));
     });
 
@@ -63,47 +59,19 @@ describe('Query', () => {
     Object.defineProperty(window, 'EventSource', {
       value: EventSourceMock,
     });
-
     await act(() => {
-      userEvent.paste(
-        within(screen.getByLabelText('KSQL')).getByRole('textbox'),
-        'show tables;'
-      );
-      userEvent.paste(
-        within(
-          screen.getByLabelText('Stream properties (JSON format)')
-        ).getByRole('textbox'),
-        '{"some":"json"}'
-      );
-      userEvent.click(screen.getByRole('button', { name: 'Execute' }));
+      const inputs = screen.getAllByRole('textbox');
+      const textAreaElement = inputs[0] as HTMLTextAreaElement;
+      userEvent.paste(textAreaElement, 'show tables;');
     });
-    expect(mock.calls().length).toBe(1);
-  });
-
-  it('fetch on execute with streamParams', async () => {
-    renderComponent();
-
-    const mock = fetchMock.postOnce(`/api/clusters/${clusterName}/ksql/v2`, {
-      pipeId: 'testPipeID',
-    });
-
-    Object.defineProperty(window, 'EventSource', {
-      value: EventSourceMock,
+    await act(() => {
+      userEvent.paste(screen.getByLabelText('key'), 'key');
+      userEvent.paste(screen.getByLabelText('value'), 'value');
     });
-
     await act(() => {
-      userEvent.paste(
-        within(screen.getByLabelText('KSQL')).getByRole('textbox'),
-        'show tables;'
-      );
-      userEvent.paste(
-        within(
-          screen.getByLabelText('Stream properties (JSON format)')
-        ).getByRole('textbox'),
-        '{"some":"json"}'
-      );
       userEvent.click(screen.getByRole('button', { name: 'Execute' }));
     });
+
     expect(mock.calls().length).toBe(1);
   });
 });

From 3ab44233edc663ffdc03c08e315834cfd14ff1d0 Mon Sep 17 00:00:00 2001
From: Azat Safin <azat.safin@gmail.com>
Date: Wed, 13 Jul 2022 16:13:37 +0300
Subject: [PATCH 057/734] Publish and delete docker image in public ecr (#2259)

* publish and delete docker image into public ecr

* small fix

Co-authored-by: Azat Safin <azsafin@provectus.com>
---
 .github/workflows/build-public-image.yml  | 78 +++++++++++++++++++++++
 .github/workflows/delete-public-image.yml | 40 ++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 .github/workflows/build-public-image.yml
 create mode 100644 .github/workflows/delete-public-image.yml

diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
new file mode 100644
index 00000000000..32984dadad7
--- /dev/null
+++ b/.github/workflows/build-public-image.yml
@@ -0,0 +1,78 @@
+name: Build Docker image and push
+on:
+  workflow_dispatch:
+  pull_request:
+    types: ['labeled']
+jobs:
+  build:
+    if: ${{ github.event.label.name == 'status/image_testing' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: get branch name
+        id: extract_branch
+        run: |
+          tag='${{ github.event.pull_request.number }}'
+          echo ::set-output name=tag::${tag}
+      - name: Cache local Maven repository
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up JDK 1.13
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.13
+      - name: Build
+        id: build
+        run: |
+          mvn versions:set -DnewVersion=$GITHUB_SHA
+          mvn clean package -Pprod -DskipTests
+          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          echo "::set-output name=version::${VERSION}"
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      - name: Configure AWS credentials for Kafka-UI account
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+        with:
+          registry-type: 'public'
+      - name: Build and push
+        id: docker_build_and_push
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: kafka-ui-api
+          push: true
+          tags: public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }}
+          build-args: |
+            JAR_FILE=kafka-ui-api-${{ steps.build.outputs.version }}.jar
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+      - name: make comment with private deployment link
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            Image published at public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }}
+
+    outputs:
+      tag: ${{ steps.extract_branch.outputs.tag }}
\ No newline at end of file
diff --git a/.github/workflows/delete-public-image.yml b/.github/workflows/delete-public-image.yml
new file mode 100644
index 00000000000..ea185917410
--- /dev/null
+++ b/.github/workflows/delete-public-image.yml
@@ -0,0 +1,40 @@
+name: Delete Public ECR Image
+on:
+  workflow_dispatch:
+  pull_request:
+    types: ['unlabeled', 'closed']
+jobs:
+  remove:
+    if: ${{ github.event.label.name == 'status/image_testing' || ( github.event.action == 'closed' && (contains(github.event.pull_request.labels, 'status/image_testing'))) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: get branch name
+        id: extract_branch
+        run: |
+          echo
+          tag='${{ github.event.pull_request.number }}'
+          echo ::set-output name=tag::${tag}
+      - name: Configure AWS credentials for Kafka-UI account
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+        with:
+          registry-type: 'public'
+      - name: Remove from ECR
+        id: remove_from_ecr
+        run: |
+          aws ecr-public batch-delete-image \
+                --repository-name kafka-ui-custom-build \
+                --image-ids imageTag=${{ steps.extract_branch.outputs.tag }} \
+                --region us-east-1
+      - name: make comment with private deployment link
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            Image tag public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }} has been removed
\ No newline at end of file

From 2d9bab7714d22b0ca4294f51164c9993a97aae93 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 13 Jul 2022 21:20:41 +0400
Subject: [PATCH 058/734] Fix workflows to satisfy workflow linter

* Update build-public-image.yml

* Update delete-public-image.yml
---
 .github/workflows/build-public-image.yml  | 2 +-
 .github/workflows/delete-public-image.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index 32984dadad7..119b4d51899 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -75,4 +75,4 @@ jobs:
             Image published at public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }}
 
     outputs:
-      tag: ${{ steps.extract_branch.outputs.tag }}
\ No newline at end of file
+      tag: ${{ steps.extract_branch.outputs.tag }}
diff --git a/.github/workflows/delete-public-image.yml b/.github/workflows/delete-public-image.yml
index ea185917410..425c397ae50 100644
--- a/.github/workflows/delete-public-image.yml
+++ b/.github/workflows/delete-public-image.yml
@@ -37,4 +37,4 @@ jobs:
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
-            Image tag public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }} has been removed
\ No newline at end of file
+            Image tag public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }} has been removed

From eb21e7f974fe32f9077f02c140db6855e14c1661 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 12:02:55 +0400
Subject: [PATCH 059/734] Bump docker/setup-qemu-action from 1 to 2 (#1956)

Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/branch-deploy.yml      | 2 +-
 .github/workflows/build-public-image.yml | 2 +-
 .github/workflows/cve.yaml               | 2 +-
 .github/workflows/master.yaml            | 2 +-
 .github/workflows/release.yaml           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 63935f6b88f..491648d8063 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -36,7 +36,7 @@ jobs:
           export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo "::set-output name=version::${VERSION}"
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index 119b4d51899..d094a2b530e 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -33,7 +33,7 @@ jobs:
           export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo "::set-output name=version::${VERSION}"
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index ab6df3a049d..9d226239f53 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -32,7 +32,7 @@ jobs:
           echo "::set-output name=version::${VERSION}"
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 1d1aa1f130b..a811afdadbc 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -36,7 +36,7 @@ jobs:
 #               #
 #################
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7a21d3e804d..118c5789481 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -56,7 +56,7 @@ jobs:
 #               #
 #################
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1

From f94952dabccfa6f7a39f98bac7f55c6260e4f84b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 12:06:47 +0400
Subject: [PATCH 060/734] Bump mheap/github-action-required-labels from 1 to 2
 (#2267)

Bumps [mheap/github-action-required-labels](https://github.com/mheap/github-action-required-labels) from 1 to 2.
- [Release notes](https://github.com/mheap/github-action-required-labels/releases)
- [Commits](https://github.com/mheap/github-action-required-labels/compare/v1...v2)

---
updated-dependencies:
- dependency-name: mheap/github-action-required-labels
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/block_merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/block_merge.yml b/.github/workflows/block_merge.yml
index ce98cc7e3a2..28f5cde3f45 100644
--- a/.github/workflows/block_merge.yml
+++ b/.github/workflows/block_merge.yml
@@ -6,7 +6,7 @@ jobs:
   block_merge:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v1
+      - uses: mheap/github-action-required-labels@v2
         with:
           mode: exactly
           count: 0

From 88cff603d57a86783b35ba3e1bceb8b672ead944 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 12:08:56 +0400
Subject: [PATCH 061/734] Bump pnpm/action-setup from 2.0.1 to 2.2.2 (#2268)

Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup) from 2.0.1 to 2.2.2.
- [Release notes](https://github.com/pnpm/action-setup/releases)
- [Commits](https://github.com/pnpm/action-setup/compare/v2.0.1...v2.2.2)

---
updated-dependencies:
- dependency-name: pnpm/action-setup
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 6686441133f..4c37e632976 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -20,7 +20,7 @@ jobs:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: pnpm/action-setup@v2.0.1
+      - uses: pnpm/action-setup@v2.2.2
         with:
           version: 7.4.0
       - name: Install node

From 2b27195cbfcf72dec23c67e744b32a6846ff23a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 12:10:43 +0400
Subject: [PATCH 062/734] Bump github/codeql-action from 1 to 2 (#2269)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8eae96d5fb6..429f78c3391 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

From cb8e8b2dc2b9a7ee850a44ff1485c34e6f8cd7b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 13:03:11 +0400
Subject: [PATCH 063/734] Bump actions/setup-node from 3.1.1 to 3.4.0 (#2270)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.1.1 to 3.4.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.1.1...v3.4.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 4c37e632976..620e8e8c24c 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           version: 7.4.0
       - name: Install node
-        uses: actions/setup-node@v3.1.1
+        uses: actions/setup-node@v3.4.0
         with:
           node-version: "16.15.0"
           cache: "pnpm"

From 199c4ea2e859d71e4a95b8e1fddfae09a402682a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 13:05:17 +0400
Subject: [PATCH 064/734] Bump aquasecurity/trivy-action from 0.3.0 to 0.5.1
 (#2271)

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.3.0 to 0.5.1.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.3.0...0.5.1)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index 9d226239f53..e1a06fe9a7d 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -61,7 +61,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.3.0
+        uses: aquasecurity/trivy-action@0.5.1
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From 163a6cf2c66c2fc31c95fd4b6131aa8131975c60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 13:06:57 +0400
Subject: [PATCH 065/734] Bump svenstaro/upload-release-action from 2.2.1 to
 2.3.0 (#2272)

Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/svenstaro/upload-release-action/releases)
- [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenstaro/upload-release-action/compare/2.2.1...2.3.0)

---
updated-dependencies:
- dependency-name: svenstaro/upload-release-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 118c5789481..d902fd80765 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -39,7 +39,7 @@ jobs:
           echo ::set-output name=version::${VERSION}
 
       - name: Upload files to a GitHub release
-        uses: svenstaro/upload-release-action@2.2.1
+        uses: svenstaro/upload-release-action@2.3.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: kafka-ui-api/target/kafka-ui-api-${{ steps.build.outputs.version }}.jar

From 9e661b4aa604963a30c79364a723cea459f748ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 13:34:12 +0400
Subject: [PATCH 066/734] Bump docker/login-action from 1 to 2 (#2273)

Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/master.yaml  | 2 +-
 .github/workflows/release.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index a811afdadbc..d72be5f1f71 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -50,7 +50,7 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d902fd80765..f5ff4e7a683 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -70,7 +70,7 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

From b3c7637a51cef809468a8e40c60a29115fb1b990 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 13:37:11 +0400
Subject: [PATCH 067/734] Bump hashicorp/setup-terraform from 1 to 2 (#1894)

Bumps [hashicorp/setup-terraform](https://github.com/hashicorp/setup-terraform) from 1 to 2.
- [Release notes](https://github.com/hashicorp/setup-terraform/releases)
- [Changelog](https://github.com/hashicorp/setup-terraform/blob/main/CHANGELOG.md)
- [Commits](https://github.com/hashicorp/setup-terraform/compare/v1...v2)

---
updated-dependencies:
- dependency-name: hashicorp/setup-terraform
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/terraform-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/terraform-deploy.yml b/.github/workflows/terraform-deploy.yml
index db2f651e038..d7ac8b9a306 100644
--- a/.github/workflows/terraform-deploy.yml
+++ b/.github/workflows/terraform-deploy.yml
@@ -33,7 +33,7 @@ jobs:
           aws-region: eu-central-1
 
       - name: Terraform Install
-        uses: hashicorp/setup-terraform@v1
+        uses: hashicorp/setup-terraform@v2
 
       - name: Terraform format
         id: fmt

From 33eb50a397416ccd87ef23abefb6fdc5aeed95a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 13:38:23 +0400
Subject: [PATCH 068/734] Bump docker/build-push-action from 2 to 3 (#1943)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/branch-deploy.yml      | 2 +-
 .github/workflows/build-public-image.yml | 2 +-
 .github/workflows/cve.yaml               | 2 +-
 .github/workflows/master.yaml            | 2 +-
 .github/workflows/release.yaml           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 491648d8063..570161f70f1 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -58,7 +58,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index d094a2b530e..81a91e3559b 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -57,7 +57,7 @@ jobs:
           registry-type: 'public'
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index e1a06fe9a7d..f5769a92b03 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -46,7 +46,7 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Build docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index d72be5f1f71..3fd5686d23b 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index f5ff4e7a683..70e527af739 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -77,7 +77,7 @@ jobs:
 
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api

From 119c7d0107e02e735dcef9f15ba911a272dc592f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 13:38:55 +0400
Subject: [PATCH 069/734] Bump docker/setup-buildx-action from 1 to 2 (#1945)

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/branch-deploy.yml      | 2 +-
 .github/workflows/build-public-image.yml | 2 +-
 .github/workflows/cve.yaml               | 2 +-
 .github/workflows/master.yaml            | 2 +-
 .github/workflows/release.yaml           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 570161f70f1..dd94c5c869e 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -39,7 +39,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Cache Docker layers
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index 81a91e3559b..c9d3bff1af7 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -36,7 +36,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Cache Docker layers
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index f5769a92b03..67ebf3504b3 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -35,7 +35,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
         uses: actions/cache@v3
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 3fd5686d23b..32642207961 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -39,7 +39,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
         uses: actions/cache@v3
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 70e527af739..82a7087cff0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -59,7 +59,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
         uses: actions/cache@v3

From 541e4018ec251ea371fd64b198b916b9fd198d99 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 15 Jul 2022 18:06:49 +0400
Subject: [PATCH 070/734] Active Directory support for LDAP (#2056)

* AD support for LDAP

* Review suggestions, documentation update
---
 documentation/compose/auth-ldap.yaml          |  7 ++++++-
 .../ui/config/auth/LdapSecurityConfig.java    | 20 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/documentation/compose/auth-ldap.yaml b/documentation/compose/auth-ldap.yaml
index 7c25adce5dd..12069639f24 100644
--- a/documentation/compose/auth-ldap.yaml
+++ b/documentation/compose/auth-ldap.yaml
@@ -29,14 +29,19 @@ services:
       AUTH_TYPE: "LDAP"
       SPRING_LDAP_URLS: "ldap://ldap:10389"
       SPRING_LDAP_DN_PATTERN: "cn={0},ou=people,dc=planetexpress,dc=com"
-#     USER SEARCH FILTER INSTEAD OF DN
+
+#     ===== USER SEARCH FILTER INSTEAD OF DN =====
+
 #     SPRING_LDAP_USERFILTER_SEARCHBASE: "dc=planetexpress,dc=com"
 #     SPRING_LDAP_USERFILTER_SEARCHFILTER: "(&(uid={0})(objectClass=inetOrgPerson))"
 #     LDAP ADMIN USER
 #     SPRING_LDAP_ADMINUSER: "cn=admin,dc=planetexpress,dc=com"
 #     SPRING_LDAP_ADMINPASSWORD: "GoodNewsEveryone"
 
+#     ===== ACTIVE DIRECTORY =====
 
+#      OAUTH2.LDAP.ACTIVEDIRECTORY: true
+#      OAUTH2.LDAP.AСTIVEDIRECTORY.DOMAIN: "memelord.lol"
 
   ldap:
     image: rroemhild/test-openldap:latest
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
index 0d629a88360..9681c36bc9f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
@@ -14,8 +14,10 @@
 import org.springframework.security.authentication.ReactiveAuthenticationManagerAdapter;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.ldap.authentication.AbstractLdapAuthenticationProvider;
 import org.springframework.security.ldap.authentication.BindAuthenticator;
 import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
+import org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.ldap.search.LdapUserSearch;
 import org.springframework.security.web.server.SecurityWebFilterChain;
@@ -39,6 +41,11 @@ public class LdapSecurityConfig extends AbstractAuthSecurityConfig {
   @Value("${spring.ldap.userFilter.searchFilter:#{null}}")
   private String userFilterSearchFilter;
 
+  @Value("${oauth2.ldap.activeDirectory:false}")
+  private boolean isActiveDirectory;
+  @Value("${oauth2.ldap.aсtiveDirectory.domain:#{null}}")
+  private String activeDirectoryDomain;
+
   @Bean
   public ReactiveAuthenticationManager authenticationManager(BaseLdapPathContextSource contextSource) {
     BindAuthenticator ba = new BindAuthenticator(contextSource);
@@ -51,9 +58,15 @@ public ReactiveAuthenticationManager authenticationManager(BaseLdapPathContextSo
       ba.setUserSearch(userSearch);
     }
 
-    LdapAuthenticationProvider lap = new LdapAuthenticationProvider(ba);
+    AbstractLdapAuthenticationProvider authenticationProvider;
+    if (!isActiveDirectory) {
+      authenticationProvider = new LdapAuthenticationProvider(ba);
+    } else {
+      authenticationProvider = new ActiveDirectoryLdapAuthenticationProvider(activeDirectoryDomain, ldapUrls);
+      authenticationProvider.setUseAuthenticationRequestCredentials(true);
+    }
 
-    AuthenticationManager am = new ProviderManager(List.of(lap));
+    AuthenticationManager am = new ProviderManager(List.of(authenticationProvider));
 
     return new ReactiveAuthenticationManagerAdapter(am);
   }
@@ -71,6 +84,9 @@ public BaseLdapPathContextSource contextSource() {
   @Bean
   public SecurityWebFilterChain configureLdap(ServerHttpSecurity http) {
     log.info("Configuring LDAP authentication.");
+    if (isActiveDirectory) {
+      log.info("Active Directory support for LDAP has been enabled.");
+    }
 
     http
         .authorizeExchange()

From 5e04f3e880ed08b10010c3852a21ae360e0199fd Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 15 Jul 2022 19:30:19 +0400
Subject: [PATCH 071/734] Pass qase.io token into e2e workflow

---
 .github/workflows/e2e-checks.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 9117dffb245..3d17ce28c77 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -47,7 +47,7 @@ jobs:
       - name: e2e run
         run: |
           mvn versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          mvn -pl '!kafka-ui-api' test -Pprod
+          mvn -DQASEIO_API_TOKEN=${{ secrets.QASEIO_API_TOKEN }} -pl '!kafka-ui-api' test -Pprod
       - name: Generate allure report
         uses: simple-elf/allure-report-action@master
         if: always()

From 9af6b0032beaf43b4334f910bbf2c4be1ef15970 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 18 Jul 2022 13:06:55 +0300
Subject: [PATCH 072/734] Kafka Connect with React-Query (#2258)

* Kafka Connect hooks

* Migrate connectors list page to RQ

* Migrate connector details page overview to RQ

* Migrate connector config page to RQ

* Migrate connector tasks page to RQ

* Get rid of some deadcode

* Migrate connector Actions page to RQ

* Get rid of some deadcode

* Migrate connector create page to RQ

* Migrate connector Edit page to RQ

* move fixtures to lib folder

* refactoring
---
 kafka-ui-react-app/.prettierrc                |   8 +-
 kafka-ui-react-app/jest.config.ts             |   1 +
 kafka-ui-react-app/package.json               |   4 +-
 kafka-ui-react-app/pnpm-lock.yaml             |  54 ++
 kafka-ui-react-app/sonar-project.properties   |   2 +-
 .../src/components/Alerts/Alert.tsx           |   2 +-
 kafka-ui-react-app/src/components/App.tsx     | 159 ++--
 .../src/components/Brokers/Broker/Broker.tsx  |   4 +-
 .../Broker/BrokerLogdir/BrokerLogdir.tsx      |   4 +-
 .../Broker/BrokerMetrics/BrokerMetrics.tsx    |   4 +-
 .../__test__/BrokerMetrics.spec.tsx           |  42 +-
 .../Brokers/Broker/__test__/Broker.spec.tsx   |  51 +-
 .../Brokers/BrokersList/BrokersList.tsx       |   4 +-
 .../BrokersList/__test__/BrokersList.spec.tsx | 124 ++-
 .../src/components/Cluster/Cluster.tsx        |   2 +-
 .../src/components/Connect/Connect.tsx        |  16 +-
 .../Connect/Details/Actions/Actions.tsx       | 149 ++--
 .../Details/Actions/ActionsContainer.ts       |  32 -
 .../Actions/__tests__/Actions.spec.tsx        | 313 +++----
 .../Connect/Details/Config/Config.tsx         |  57 +-
 .../Connect/Details/Config/ConfigContainer.ts |  20 -
 .../Details/Config/__test__/Config.spec.tsx   |  89 +-
 .../components/Connect/Details/Details.tsx    | 117 ---
 .../Connect/Details/DetailsContainer.ts       |  28 -
 .../Connect/Details/DetailsPage.tsx           |  80 ++
 .../Connect/Details/Overview/Overview.tsx     |  35 +-
 .../Details/Overview/OverviewContainer.ts     |  17 -
 .../Overview/__tests__/Overview.spec.tsx      |  73 +-
 .../Overview/__tests__/getTaskMetrics.spec.ts |  19 +
 .../Details/Overview/getTaskMetrics.ts        |  23 +
 .../Details/Tasks/ListItem/ListItem.tsx       |  56 --
 .../Tasks/ListItem/ListItemContainer.ts       |  20 -
 .../ListItem/__tests__/ListItem.spec.tsx      |  70 --
 .../Connect/Details/Tasks/Tasks.tsx           |  56 +-
 .../Connect/Details/Tasks/TasksContainer.ts   |  20 -
 .../Details/Tasks/__tests__/Tasks.spec.tsx    |  75 +-
 .../Details/__tests__/Details.spec.tsx        | 136 ----
 .../Details/__tests__/DetailsPage.spec.tsx    |  84 ++
 .../src/components/Connect/Edit/Edit.tsx      |  61 +-
 .../components/Connect/Edit/EditContainer.ts  |  24 -
 .../Connect/Edit/__tests__/Edit.spec.tsx      |  78 +-
 .../src/components/Connect/List/List.tsx      | 159 +---
 .../components/Connect/List/ListContainer.ts  |  37 -
 .../src/components/Connect/List/ListItem.tsx  |  38 +-
 .../src/components/Connect/List/ListPage.tsx  |  86 ++
 .../Connect/List/__tests__/List.spec.tsx      | 135 +--
 .../Connect/List/__tests__/ListItem.spec.tsx  |   9 +-
 .../Connect/List/__tests__/ListPage.spec.tsx  | 182 +++++
 .../src/components/Connect/New/New.tsx        |  56 +-
 .../components/Connect/New/NewContainer.ts    |  20 -
 .../Connect/New/__tests__/New.spec.tsx        |  82 +-
 .../Connect/__tests__/Connect.spec.tsx        |  22 +-
 .../ClustersWidget/ClustersWidget.tsx         |   2 +-
 kafka-ui-react-app/src/components/Nav/Nav.tsx |   2 +-
 .../Topics/New/__test__/New.spec.tsx          |   5 -
 .../components/common/Metrics/Indicator.tsx   |  10 +-
 .../src/components/common/Metrics/Section.tsx |   2 +-
 kafka-ui-react-app/src/index.tsx              |   7 +-
 .../fixtures/kafkaConnect.ts}                 | 117 +--
 .../hooks/api/__tests__/kafkaConnect.spec.ts  | 168 ++++
 .../src/lib/hooks/api/brokers.ts              |  35 +
 .../src/lib/hooks/api/clusters.ts             |  14 +
 .../src/lib/hooks/api/kafkaConnect.ts         | 128 +++
 .../src/lib/hooks/api/useClusters.ts          |   8 -
 .../src/lib/hooks/useBrokers.tsx              |  11 -
 .../src/lib/hooks/useBrokersLogDirs.tsx       |  18 -
 .../src/lib/hooks/useBrokersMetrics.tsx       |  18 -
 .../src/lib/hooks/useClusterStats.tsx         |  11 -
 kafka-ui-react-app/src/lib/paths.ts           |  26 +-
 kafka-ui-react-app/src/lib/testHelpers.tsx    |  69 +-
 .../src/redux/actions/__test__/fixtures.ts    |  47 --
 .../src/redux/interfaces/connect.ts           |  23 -
 .../src/redux/interfaces/index.ts             |   2 -
 .../reducers/connect/__test__/reducer.spec.ts | 766 ------------------
 .../connect/__test__/selectors.spec.ts        | 132 ---
 .../redux/reducers/connect/connectSlice.ts    | 478 -----------
 .../src/redux/reducers/connect/selectors.ts   | 177 ----
 .../src/redux/reducers/index.ts               |   2 -
 kafka-ui-react-app/src/theme/theme.ts         |   3 +-
 79 files changed, 1686 insertions(+), 3634 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/Actions/ActionsContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/Config/ConfigContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/Details.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/DetailsContainer.ts
 create mode 100644 kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/Overview/OverviewContainer.ts
 create mode 100644 kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/getTaskMetrics.spec.ts
 create mode 100644 kafka-ui-react-app/src/components/Connect/Details/Overview/getTaskMetrics.ts
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/ListItem.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/ListItemContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/__tests__/ListItem.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/Tasks/TasksContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/__tests__/Details.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Connect/Details/__tests__/DetailsPage.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Edit/EditContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Connect/List/ListContainer.ts
 create mode 100644 kafka-ui-react-app/src/components/Connect/List/ListPage.tsx
 create mode 100644 kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Connect/New/NewContainer.ts
 rename kafka-ui-react-app/src/{redux/reducers/connect/__test__/fixtures.ts => lib/fixtures/kafkaConnect.ts} (50%)
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/brokers.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/clusters.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/api/useClusters.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/useBrokers.tsx
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/useBrokersLogDirs.tsx
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/useBrokersMetrics.tsx
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/useClusterStats.tsx
 delete mode 100644 kafka-ui-react-app/src/redux/actions/__test__/fixtures.ts
 delete mode 100644 kafka-ui-react-app/src/redux/interfaces/connect.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/connect/__test__/reducer.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/connect/__test__/selectors.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/connect/selectors.ts

diff --git a/kafka-ui-react-app/.prettierrc b/kafka-ui-react-app/.prettierrc
index c1a6f667131..e88e08a44ea 100644
--- a/kafka-ui-react-app/.prettierrc
+++ b/kafka-ui-react-app/.prettierrc
@@ -1,4 +1,10 @@
 {
+  "trailingComma": "es5",
+  "semi": true,
   "singleQuote": true,
-  "trailingComma": "es5"
+  "quoteProps": "as-needed",
+  "jsxSingleQuote": false,
+  "bracketSpacing": true,
+  "bracketSameLine": false,
+  "arrowParens": "always"
 }
diff --git a/kafka-ui-react-app/jest.config.ts b/kafka-ui-react-app/jest.config.ts
index 569e91e6145..1190472aa0d 100644
--- a/kafka-ui-react-app/jest.config.ts
+++ b/kafka-ui-react-app/jest.config.ts
@@ -6,6 +6,7 @@ export default {
   coveragePathIgnorePatterns: [
     '/node_modules/',
     '<rootDir>/src/generated-sources/',
+    '<rootDir>/src/lib/fixtures/',
     '<rootDir>/vite.config.ts',
     '<rootDir>/src/index.tsx',
     '<rootDir>/src/serviceWorker.ts',
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index a009f27a383..d7c8beb69ca 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -67,7 +67,8 @@
     "test:CI": "CI=true pnpm test:coverage --ci --testResultsProcessor=\"jest-sonar-reporter\" --watchAll=false",
     "tsc": "tsc --pretty --noEmit",
     "prepare": "cd .. && husky install kafka-ui-react-app/.husky",
-    "pre-commit": "pnpm tsc && lint-staged"
+    "pre-commit": "pnpm tsc && lint-staged",
+    "deadcode": "ts-prune -i src/generated-sources"
   },
   "eslintConfig": {
     "extends": "react-app"
@@ -119,6 +120,7 @@
     "rimraf": "^3.0.2",
     "ts-jest": "^28.0.5",
     "ts-node": "^10.8.1",
+    "ts-prune": "^0.10.3",
     "typescript": "^4.7.4"
   },
   "engines": {
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index ac8d5c416c4..efabbb6c9c7 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -86,6 +86,7 @@ specifiers:
   styled-components: ^5.3.1
   ts-jest: ^28.0.5
   ts-node: ^10.8.1
+  ts-prune: ^0.10.3
   typescript: ^4.7.4
   use-debounce: ^8.0.1
   vite: ^2.9.11
@@ -186,6 +187,7 @@ devDependencies:
   rimraf: 3.0.2
   ts-jest: 28.0.5_c4h4g76dcvkfgjwf6rprlfxfli
   ts-node: 10.8.1_t4lrjbt3sxauai4t5o275zsepa
+  ts-prune: 0.10.3
   typescript: 4.7.4
 
 packages:
@@ -2137,6 +2139,15 @@ packages:
     engines: {node: '>= 10'}
     dev: true
 
+  /@ts-morph/common/0.12.3:
+    resolution: {integrity: sha512-4tUmeLyXJnJWvTFOKtcNJ1yh0a3SsTLi2MUoyj8iUNznFRN1ZquaNe7Oukqrnki2FzZkm0J9adCNLDZxUzvj+w==}
+    dependencies:
+      fast-glob: 3.2.11
+      minimatch: 3.1.2
+      mkdirp: 1.0.4
+      path-browserify: 1.0.1
+    dev: true
+
   /@tsconfig/node10/1.0.9:
     resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
 
@@ -3169,6 +3180,10 @@ packages:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
 
+  /code-block-writer/11.0.1:
+    resolution: {integrity: sha512-0ch9DeCY8v/BWA9n1/Qu1ALG3lpesel4PYL2eNlGLgvGl+J7k74i+dSXSF3wLvF5SYII8/GUT/Ic+fycBR/DUQ==}
+    dev: true
+
   /collect-v8-coverage/1.0.1:
     resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
 
@@ -3200,6 +3215,11 @@ packages:
       delayed-stream: 1.0.0
     dev: true
 
+  /commander/6.2.1:
+    resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
+    engines: {node: '>= 6'}
+    dev: true
+
   /commander/8.3.0:
     resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
     engines: {node: '>= 12'}
@@ -5763,6 +5783,12 @@ packages:
   /minimist/1.2.6:
     resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==}
 
+  /mkdirp/1.0.4:
+    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dev: true
+
   /ms/2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
     dev: true
@@ -6036,6 +6062,10 @@ packages:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
     dev: true
 
+  /path-browserify/1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+    dev: true
+
   /path-exists/3.0.0:
     resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
     engines: {node: '>=4'}
@@ -6973,6 +7003,11 @@ packages:
     hasBin: true
     dev: true
 
+  /true-myth/4.1.1:
+    resolution: {integrity: sha512-rqy30BSpxPznbbTcAcci90oZ1YR4DqvKcNXNerG5gQBU2v4jk0cygheiul5J6ExIMrgDVuanv/MkGfqZbKrNNg==}
+    engines: {node: 10.* || >= 12.*}
+    dev: true
+
   /ts-jest/28.0.5_c4h4g76dcvkfgjwf6rprlfxfli:
     resolution: {integrity: sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
@@ -7005,6 +7040,13 @@ packages:
       yargs-parser: 21.0.1
     dev: true
 
+  /ts-morph/13.0.3:
+    resolution: {integrity: sha512-pSOfUMx8Ld/WUreoSzvMFQG5i9uEiWIsBYjpU9+TTASOeUa89j5HykomeqVULm1oqWtBdleI3KEFRLrlA3zGIw==}
+    dependencies:
+      '@ts-morph/common': 0.12.3
+      code-block-writer: 11.0.1
+    dev: true
+
   /ts-node/10.8.1_t4lrjbt3sxauai4t5o275zsepa:
     resolution: {integrity: sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==}
     hasBin: true
@@ -7035,6 +7077,18 @@ packages:
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
+  /ts-prune/0.10.3:
+    resolution: {integrity: sha512-iS47YTbdIcvN8Nh/1BFyziyUqmjXz7GVzWu02RaZXqb+e/3Qe1B7IQ4860krOeCGUeJmterAlaM2FRH0Ue0hjw==}
+    hasBin: true
+    dependencies:
+      commander: 6.2.1
+      cosmiconfig: 7.0.1
+      json5: 2.2.1
+      lodash: 4.17.21
+      true-myth: 4.1.1
+      ts-morph: 13.0.3
+    dev: true
+
   /tsconfig-paths/3.14.1:
     resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
     dependencies:
diff --git a/kafka-ui-react-app/sonar-project.properties b/kafka-ui-react-app/sonar-project.properties
index 5a35045817f..d19822fabc6 100644
--- a/kafka-ui-react-app/sonar-project.properties
+++ b/kafka-ui-react-app/sonar-project.properties
@@ -2,7 +2,7 @@ sonar.projectKey=com.provectus:kafka-ui_frontend
 sonar.organization=provectus
 
 sonar.sources=.
-sonar.exclusions=**/__tests__/**,**/__test__/**,src/serviceWorker.ts,src/setupTests.ts,src/setupProxy.js,**/fixtures.ts,src/lib/testHelpers.tsx,src/index.tsx,vite.config.ts,config/**
+sonar.exclusions=**/__tests__/**,**/__test__/**,src/serviceWorker.ts,src/setupTests.ts,src/setupProxy.js,**/fixtures.ts,src/lib/fixtures/**,src/lib/testHelpers.tsx,src/index.tsx,vite.config.ts,config/**
 
 sonar.typescript.lcov.reportPaths=./coverage/lcov.info
 sonar.testExecutionReportPaths=./test-report.xml
diff --git a/kafka-ui-react-app/src/components/Alerts/Alert.tsx b/kafka-ui-react-app/src/components/Alerts/Alert.tsx
index bca0d3b2f89..af564b23962 100644
--- a/kafka-ui-react-app/src/components/Alerts/Alert.tsx
+++ b/kafka-ui-react-app/src/components/Alerts/Alert.tsx
@@ -5,7 +5,7 @@ import { Alert as AlertType } from 'redux/interfaces';
 
 import * as S from './Alert.styled';
 
-export interface AlertProps {
+interface AlertProps {
   title: AlertType['title'];
   type: AlertType['type'];
   message: AlertType['message'];
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index db7acf4df7c..8fd2d3fe0c9 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -10,12 +10,21 @@ import Version from 'components/Version/Version';
 import Alerts from 'components/Alerts/Alerts';
 import { ThemeProvider } from 'styled-components';
 import theme from 'theme/theme';
+import { QueryClient, QueryClientProvider } from 'react-query';
 
 import * as S from './App.styled';
 import Logo from './common/Logo/Logo';
 import GitIcon from './common/Icons/GitIcon';
 import DiscordIcon from './common/Icons/DiscordIcon';
 
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      suspense: true,
+    },
+  },
+});
+
 const App: React.FC = () => {
   const [isSidebarVisible, setIsSidebarVisible] = React.useState(false);
   const onBurgerClick = () => setIsSidebarVisible(!isSidebarVisible);
@@ -27,87 +36,89 @@ const App: React.FC = () => {
   }, [location, closeSidebar]);
 
   return (
-    <ThemeProvider theme={theme}>
-      <S.Layout>
-        <S.Navbar role="navigation" aria-label="Page Header">
-          <S.NavbarBrand>
+    <QueryClientProvider client={queryClient}>
+      <ThemeProvider theme={theme}>
+        <S.Layout>
+          <S.Navbar role="navigation" aria-label="Page Header">
             <S.NavbarBrand>
-              <S.NavbarBurger
-                onClick={onBurgerClick}
-                onKeyDown={onBurgerClick}
-                role="button"
-                tabIndex={0}
-                aria-label="burger"
-              >
-                <S.Span role="separator" />
-                <S.Span role="separator" />
-                <S.Span role="separator" />
-              </S.NavbarBurger>
+              <S.NavbarBrand>
+                <S.NavbarBurger
+                  onClick={onBurgerClick}
+                  onKeyDown={onBurgerClick}
+                  role="button"
+                  tabIndex={0}
+                  aria-label="burger"
+                >
+                  <S.Span role="separator" />
+                  <S.Span role="separator" />
+                  <S.Span role="separator" />
+                </S.NavbarBurger>
 
-              <S.Hyperlink to="/">
-                <Logo />
-                UI for Apache Kafka
-              </S.Hyperlink>
+                <S.Hyperlink to="/">
+                  <Logo />
+                  UI for Apache Kafka
+                </S.Hyperlink>
 
-              <S.NavbarItem>
-                {GIT_TAG && <Version tag={GIT_TAG} commit={GIT_COMMIT} />}
-              </S.NavbarItem>
+                <S.NavbarItem>
+                  {GIT_TAG && <Version tag={GIT_TAG} commit={GIT_COMMIT} />}
+                </S.NavbarItem>
+              </S.NavbarBrand>
             </S.NavbarBrand>
-          </S.NavbarBrand>
-          <S.NavbarSocial>
-            <S.LogoutLink href="/logout">
-              <S.LogoutButton buttonType="primary" buttonSize="M">
-                Log out
-              </S.LogoutButton>
-            </S.LogoutLink>
-            <S.SocialLink
-              href="https://github.com/provectus/kafka-ui"
-              target="_blank"
-            >
-              <GitIcon />
-            </S.SocialLink>
-            <S.SocialLink
-              href="https://discord.com/invite/4DWzD7pGE5"
-              target="_blank"
-            >
-              <DiscordIcon />
-            </S.SocialLink>
-          </S.NavbarSocial>
-        </S.Navbar>
+            <S.NavbarSocial>
+              <S.LogoutLink href="/logout">
+                <S.LogoutButton buttonType="primary" buttonSize="M">
+                  Log out
+                </S.LogoutButton>
+              </S.LogoutLink>
+              <S.SocialLink
+                href="https://github.com/provectus/kafka-ui"
+                target="_blank"
+              >
+                <GitIcon />
+              </S.SocialLink>
+              <S.SocialLink
+                href="https://discord.com/invite/4DWzD7pGE5"
+                target="_blank"
+              >
+                <DiscordIcon />
+              </S.SocialLink>
+            </S.NavbarSocial>
+          </S.Navbar>
 
-        <S.Container>
-          <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
-            <Suspense fallback={<PageLoader />}>
-              <Nav />
-            </Suspense>
-          </S.Sidebar>
-          <S.Overlay
-            $visible={isSidebarVisible}
-            onClick={closeSidebar}
-            onKeyDown={closeSidebar}
-            tabIndex={-1}
-            aria-hidden="true"
-            aria-label="Overlay"
-          />
-          <Routes>
-            {['/', '/ui', '/ui/clusters'].map((path) => (
+          <S.Container>
+            <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
+              <Suspense fallback={<PageLoader />}>
+                <Nav />
+              </Suspense>
+            </S.Sidebar>
+            <S.Overlay
+              $visible={isSidebarVisible}
+              onClick={closeSidebar}
+              onKeyDown={closeSidebar}
+              tabIndex={-1}
+              aria-hidden="true"
+              aria-label="Overlay"
+            />
+            <Routes>
+              {['/', '/ui', '/ui/clusters'].map((path) => (
+                <Route
+                  key="Home" // optional: avoid full re-renders on route changes
+                  path={path}
+                  element={<Dashboard />}
+                />
+              ))}
               <Route
-                key="Home" // optional: avoid full re-renders on route changes
-                path={path}
-                element={<Dashboard />}
+                path={getNonExactPath(clusterPath())}
+                element={<ClusterPage />}
               />
-            ))}
-            <Route
-              path={getNonExactPath(clusterPath())}
-              element={<ClusterPage />}
-            />
-          </Routes>
-        </S.Container>
-        <S.AlertsContainer role="toolbar">
-          <Alerts />
-        </S.AlertsContainer>
-      </S.Layout>
-    </ThemeProvider>
+            </Routes>
+          </S.Container>
+          <S.AlertsContainer role="toolbar">
+            <Alerts />
+          </S.AlertsContainer>
+        </S.Layout>
+      </ThemeProvider>
+    </QueryClientProvider>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index 9cf9b357064..bd49da7c8ec 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -9,8 +9,8 @@ import {
   ClusterBrokerParam,
   clusterBrokerPath,
 } from 'lib/paths';
-import useClusterStats from 'lib/hooks/useClusterStats';
-import useBrokers from 'lib/hooks/useBrokers';
+import { useClusterStats } from 'lib/hooks/api/clusters';
+import { useBrokers } from 'lib/hooks/api/brokers';
 import { NavLink, Route, Routes } from 'react-router-dom';
 import BrokerLogdir from 'components/Brokers/Broker/BrokerLogdir/BrokerLogdir';
 import BrokerMetrics from 'components/Brokers/Broker/BrokerMetrics/BrokerMetrics';
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
index 14b99363d20..f14fbb02943 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
@@ -5,7 +5,7 @@ import { SmartTable } from 'components/common/SmartTable/SmartTable';
 import { TableColumn } from 'components/common/SmartTable/TableColumn';
 import { useTableState } from 'lib/hooks/useTableState';
 import { ClusterBrokerParam } from 'lib/paths';
-import useBrokersLogDirs from 'lib/hooks/useBrokersLogDirs';
+import { useBrokerLogDirs } from 'lib/hooks/api/brokers';
 
 export interface BrokerLogdirState {
   name: string;
@@ -17,7 +17,7 @@ export interface BrokerLogdirState {
 const BrokerLogdir: React.FC = () => {
   const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
 
-  const { data: logDirs } = useBrokersLogDirs(clusterName, Number(brokerId));
+  const { data: logDirs } = useBrokerLogDirs(clusterName, Number(brokerId));
 
   const preparedRows = translateLogdirs(logDirs);
   const tableState = useTableState<BrokerLogdirState, string>(preparedRows, {
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/BrokerMetrics.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/BrokerMetrics.tsx
index 2798f1c9ac3..40fe42fe711 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/BrokerMetrics.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/BrokerMetrics.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
 import useAppParams from 'lib/hooks/useAppParams';
 import { ClusterBrokerParam } from 'lib/paths';
-import useBrokersMetrics from 'lib/hooks/useBrokersMetrics';
+import { useBrokerMetrics } from 'lib/hooks/api/brokers';
 import { SchemaType } from 'generated-sources';
 import EditorViewer from 'components/common/EditorViewer/EditorViewer';
 import { getEditorText } from 'components/Brokers/utils/getEditorText';
 
 const BrokerMetrics: React.FC = () => {
   const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
-  const { data: metrics } = useBrokersMetrics(clusterName, Number(brokerId));
+  const { data: metrics } = useBrokerMetrics(clusterName, Number(brokerId));
 
   return (
     <EditorViewer schemaType={SchemaType.JSON} data={getEditorText(metrics)} />
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/__test__/BrokerMetrics.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/__test__/BrokerMetrics.spec.tsx
index 7bed4e1aa86..4000ec7c76e 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/__test__/BrokerMetrics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerMetrics/__test__/BrokerMetrics.spec.tsx
@@ -1,37 +1,31 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
-import { screen, waitFor } from '@testing-library/dom';
+import { screen } from '@testing-library/dom';
 import { clusterBrokerMetricsPath } from 'lib/paths';
-import fetchMock from 'fetch-mock';
-import { act } from '@testing-library/react';
 import BrokerMetrics from 'components/Brokers/Broker/BrokerMetrics/BrokerMetrics';
+import { useBrokerMetrics } from 'lib/hooks/api/brokers';
+
+jest.mock('lib/hooks/api/brokers', () => ({
+  useBrokerMetrics: jest.fn(),
+}));
 
 const clusterName = 'local';
 const brokerId = 1;
-const fetchMetricsUrl = `/api/clusters/${clusterName}/brokers/${brokerId}/metrics`;
 
 describe('BrokerMetrics Component', () => {
-  afterEach(() => {
-    fetchMock.reset();
-  });
-
-  const renderComponent = async () => {
-    const fetchMetricsMock = fetchMock.getOnce(fetchMetricsUrl, {});
-    await act(() => {
-      render(
-        <WithRoute path={clusterBrokerMetricsPath()}>
-          <BrokerMetrics />
-        </WithRoute>,
-        {
-          initialEntries: [clusterBrokerMetricsPath(clusterName, brokerId)],
-        }
-      );
-    });
-    await waitFor(() => expect(fetchMetricsMock.called()).toBeTruthy());
-  };
-
   it("shows warning when server doesn't return metrics response", async () => {
-    await renderComponent();
+    (useBrokerMetrics as jest.Mock).mockImplementation(() => ({
+      data: {},
+    }));
+
+    render(
+      <WithRoute path={clusterBrokerMetricsPath()}>
+        <BrokerMetrics />
+      </WithRoute>,
+      {
+        initialEntries: [clusterBrokerMetricsPath(clusterName, brokerId)],
+      }
+    );
     expect(screen.getAllByRole('textbox').length).toEqual(1);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
index c030988fe69..0af9d1df4f0 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
@@ -1,24 +1,22 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
-import { screen, waitFor } from '@testing-library/dom';
+import { screen } from '@testing-library/dom';
 import {
   clusterBrokerMetricsPath,
   clusterBrokerPath,
   getNonExactPath,
 } from 'lib/paths';
-import fetchMock from 'fetch-mock';
-import { act } from '@testing-library/react';
 import Broker from 'components/Brokers/Broker/Broker';
 import {
   clusterStatsPayload,
   brokersPayload,
 } from 'components/Brokers/__test__/fixtures';
+import { useBrokers } from 'lib/hooks/api/brokers';
+import { useClusterStats } from 'lib/hooks/api/clusters';
 
 const clusterName = 'local';
 const brokerId = 1;
 const activeClassName = 'is-active';
-const fetchStatsUrl = `/api/clusters/${clusterName}/stats`;
-const fetchBrokersUrl = `/api/clusters/${clusterName}/brokers`;
 const brokerLogdir = {
   pageText: 'brokerLogdir',
   navigationName: 'Log directories',
@@ -34,30 +32,31 @@ jest.mock('components/Brokers/Broker/BrokerLogdir/BrokerLogdir', () => () => (
 jest.mock('components/Brokers/Broker/BrokerMetrics/BrokerMetrics', () => () => (
   <div>{brokerMetrics.pageText}</div>
 ));
+jest.mock('lib/hooks/api/brokers', () => ({
+  useBrokers: jest.fn(),
+}));
+jest.mock('lib/hooks/api/clusters', () => ({
+  useClusterStats: jest.fn(),
+}));
 
 describe('Broker Component', () => {
-  afterEach(() => {
-    fetchMock.reset();
+  beforeEach(() => {
+    (useBrokers as jest.Mock).mockImplementation(() => ({
+      data: brokersPayload,
+    }));
+    (useClusterStats as jest.Mock).mockImplementation(() => ({
+      data: clusterStatsPayload,
+    }));
   });
-
-  const renderComponent = async (
-    path = clusterBrokerPath(clusterName, brokerId)
-  ) => {
-    const fetchStatsMock = fetchMock.get(fetchStatsUrl, clusterStatsPayload);
-    const fetchBrokersMock = fetchMock.get(fetchBrokersUrl, brokersPayload);
-    await act(() => {
-      render(
-        <WithRoute path={getNonExactPath(clusterBrokerPath())}>
-          <Broker />
-        </WithRoute>,
-        {
-          initialEntries: [path],
-        }
-      );
-    });
-    await waitFor(() => expect(fetchStatsMock.called()).toBeTruthy());
-    expect(fetchBrokersMock.called()).toBeTruthy();
-  };
+  const renderComponent = (path = clusterBrokerPath(clusterName, brokerId)) =>
+    render(
+      <WithRoute path={getNonExactPath(clusterBrokerPath())}>
+        <Broker />
+      </WithRoute>,
+      {
+        initialEntries: [path],
+      }
+    );
 
   it('shows broker found', async () => {
     await renderComponent();
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index 6423891f421..ae1a26899b7 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -7,8 +7,8 @@ import { Table } from 'components/common/table/Table/Table.styled';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
 import useAppParams from 'lib/hooks/useAppParams';
-import useBrokers from 'lib/hooks/useBrokers';
-import useClusterStats from 'lib/hooks/useClusterStats';
+import { useBrokers } from 'lib/hooks/api/brokers';
+import { useClusterStats } from 'lib/hooks/api/clusters';
 
 import { ClickableRow } from './BrokersList.style';
 
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
index 94ffa0b77af..f67dfd91745 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
@@ -10,6 +10,8 @@ import {
   clusterStatsPayload,
 } from 'components/Brokers/__test__/fixtures';
 import userEvent from '@testing-library/user-event';
+import { useBrokers } from 'lib/hooks/api/brokers';
+import { useClusterStats } from 'lib/hooks/api/clusters';
 
 const mockedUsedNavigate = jest.fn();
 
@@ -18,6 +20,13 @@ jest.mock('react-router-dom', () => ({
   useNavigate: () => mockedUsedNavigate,
 }));
 
+jest.mock('lib/hooks/api/brokers', () => ({
+  useBrokers: jest.fn(),
+}));
+jest.mock('lib/hooks/api/clusters', () => ({
+  useClusterStats: jest.fn(),
+}));
+
 describe('BrokersList Component', () => {
   afterEach(() => fetchMock.reset());
 
@@ -37,60 +46,36 @@ describe('BrokersList Component', () => {
     );
 
   describe('BrokersList', () => {
-    let fetchBrokersMock: fetchMock.FetchMockStatic;
-    const fetchStatsUrl = `/api/clusters/${clusterName}/stats`;
-
     beforeEach(() => {
-      fetchBrokersMock = fetchMock.get(
-        `/api/clusters/${clusterName}/brokers`,
-        brokersPayload
-      );
+      (useBrokers as jest.Mock).mockImplementation(() => ({
+        data: brokersPayload,
+      }));
+      (useClusterStats as jest.Mock).mockImplementation(() => ({
+        data: clusterStatsPayload,
+      }));
     });
 
     it('renders', async () => {
-      const fetchStatsMock = fetchMock.get(fetchStatsUrl, clusterStatsPayload);
-      await act(() => {
-        renderComponent();
-      });
-
-      await waitFor(() => expect(fetchStatsMock.called()).toBeTruthy());
-      await waitFor(() => expect(fetchBrokersMock.called()).toBeTruthy());
-
+      renderComponent();
       expect(screen.getByRole('table')).toBeInTheDocument();
       const rows = screen.getAllByRole('row');
       expect(rows.length).toEqual(3);
     });
-
     it('opens broker when row clicked', async () => {
-      const fetchStatsMock = fetchMock.get(fetchStatsUrl, clusterStatsPayload);
-      await act(() => {
-        renderComponent();
-      });
-      await waitFor(() => expect(fetchStatsMock.called()).toBeTruthy());
+      renderComponent();
       await act(() => {
         userEvent.click(screen.getByRole('cell', { name: '0' }));
       });
-
-      await waitFor(() => {
-        expect(mockedUsedNavigate).toBeCalled();
-        expect(mockedUsedNavigate).toBeCalledWith('0');
-      });
+      await waitFor(() => expect(mockedUsedNavigate).toBeCalledWith('0'));
     });
-
     it('shows warning when offlinePartitionCount > 0', async () => {
-      const fetchStatsMock = fetchMock.getOnce(fetchStatsUrl, {
-        ...clusterStatsPayload,
-        offlinePartitionCount: 1345,
-      });
-      await act(() => {
-        renderComponent();
-      });
-      await waitFor(() => {
-        expect(fetchStatsMock.called()).toBeTruthy();
-      });
-      await waitFor(() => {
-        expect(fetchBrokersMock.called()).toBeTruthy();
-      });
+      (useClusterStats as jest.Mock).mockImplementation(() => ({
+        data: {
+          ...clusterStatsPayload,
+          offlinePartitionCount: 1345,
+        },
+      }));
+      renderComponent();
       const onlineWidget = screen.getByText(
         clusterStatsPayload.onlinePartitionCount
       );
@@ -98,18 +83,14 @@ describe('BrokersList Component', () => {
       expect(onlineWidget).toHaveStyle({ color: '#E51A1A' });
     });
     it('shows right count when offlinePartitionCount > 0', async () => {
-      const fetchStatsMock = fetchMock.getOnce(fetchStatsUrl, {
-        ...clusterStatsPayload,
-        inSyncReplicasCount: testInSyncReplicasCount,
-        outOfSyncReplicasCount: testOutOfSyncReplicasCount,
-      });
-      await act(() => {
-        renderComponent();
-      });
-      await waitFor(() => {
-        expect(fetchStatsMock.called()).toBeTruthy();
-      });
-
+      (useClusterStats as jest.Mock).mockImplementation(() => ({
+        data: {
+          ...clusterStatsPayload,
+          inSyncReplicasCount: testInSyncReplicasCount,
+          outOfSyncReplicasCount: testOutOfSyncReplicasCount,
+        },
+      }));
+      renderComponent();
       const onlineWidgetDef = screen.getByText(testInSyncReplicasCount);
       const onlineWidget = screen.getByText(
         `of ${testInSyncReplicasCount + testOutOfSyncReplicasCount}`
@@ -119,33 +100,26 @@ describe('BrokersList Component', () => {
     });
 
     it('shows right count when inSyncReplicasCount: undefined outOfSyncReplicasCount: 1', async () => {
-      const fetchStatsMock = fetchMock.getOnce(fetchStatsUrl, {
-        ...clusterStatsPayload,
-        inSyncReplicasCount: undefined,
-        outOfSyncReplicasCount: testOutOfSyncReplicasCount,
-      });
-      await act(() => {
-        renderComponent();
-      });
-      await waitFor(() => {
-        expect(fetchStatsMock.called()).toBeTruthy();
-      });
-
+      (useClusterStats as jest.Mock).mockImplementation(() => ({
+        data: {
+          ...clusterStatsPayload,
+          inSyncReplicasCount: undefined,
+          outOfSyncReplicasCount: testOutOfSyncReplicasCount,
+        },
+      }));
+      renderComponent();
       const onlineWidget = screen.getByText(`of ${testOutOfSyncReplicasCount}`);
       expect(onlineWidget).toBeInTheDocument();
     });
     it(`shows right count when inSyncReplicasCount: ${testInSyncReplicasCount} outOfSyncReplicasCount: undefined`, async () => {
-      const fetchStatsMock = fetchMock.getOnce(fetchStatsUrl, {
-        ...clusterStatsPayload,
-        inSyncReplicasCount: testInSyncReplicasCount,
-        outOfSyncReplicasCount: undefined,
-      });
-      await act(() => {
-        renderComponent();
-      });
-      await waitFor(() => {
-        expect(fetchStatsMock.called()).toBeTruthy();
-      });
+      (useClusterStats as jest.Mock).mockImplementation(() => ({
+        data: {
+          ...clusterStatsPayload,
+          inSyncReplicasCount: testInSyncReplicasCount,
+          outOfSyncReplicasCount: undefined,
+        },
+      }));
+      renderComponent();
       const onlineWidgetDef = screen.getByText(testInSyncReplicasCount);
       const onlineWidget = screen.getByText(`of ${testInSyncReplicasCount}`);
       expect(onlineWidgetDef).toBeInTheDocument();
diff --git a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
index 27261ac3084..4ca9fa44cdc 100644
--- a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
@@ -18,7 +18,7 @@ import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb';
 import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 import { BreadcrumbProvider } from 'components/common/Breadcrumb/Breadcrumb.provider';
 import PageLoader from 'components/common/PageLoader/PageLoader';
-import useClusters from 'lib/hooks/api/useClusters';
+import { useClusters } from 'lib/hooks/api/clusters';
 
 const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
 const Topics = React.lazy(() => import('components/Topics/Topics'));
diff --git a/kafka-ui-react-app/src/components/Connect/Connect.tsx b/kafka-ui-react-app/src/components/Connect/Connect.tsx
index c4c94227e6e..8f9453a2bbc 100644
--- a/kafka-ui-react-app/src/components/Connect/Connect.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Connect.tsx
@@ -12,10 +12,10 @@ import {
 import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 import useAppParams from 'lib/hooks/useAppParams';
 
-import ListContainer from './List/ListContainer';
-import NewContainer from './New/NewContainer';
-import DetailsContainer from './Details/DetailsContainer';
-import EditContainer from './Edit/EditContainer';
+import ListPage from './List/ListPage';
+import New from './New/New';
+import Edit from './Edit/Edit';
+import DetailsPage from './Details/DetailsPage';
 
 const Connect: React.FC = () => {
   const { clusterName } = useAppParams();
@@ -26,7 +26,7 @@ const Connect: React.FC = () => {
         index
         element={
           <BreadcrumbRoute>
-            <ListContainer />
+            <ListPage />
           </BreadcrumbRoute>
         }
       />
@@ -34,7 +34,7 @@ const Connect: React.FC = () => {
         path={clusterConnectorNewRelativePath}
         element={
           <BreadcrumbRoute>
-            <NewContainer />
+            <New />
           </BreadcrumbRoute>
         }
       />
@@ -42,7 +42,7 @@ const Connect: React.FC = () => {
         path={clusterConnectConnectorEditRelativePath}
         element={
           <BreadcrumbRoute>
-            <EditContainer />
+            <Edit />
           </BreadcrumbRoute>
         }
       />
@@ -50,7 +50,7 @@ const Connect: React.FC = () => {
         path={getNonExactPath(clusterConnectConnectorRelativePath)}
         element={
           <BreadcrumbRoute>
-            <DetailsContainer />
+            <DetailsPage />
           </BreadcrumbRoute>
         }
       />
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index 4c855859594..64cef62a375 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -1,15 +1,21 @@
 import React from 'react';
+import styled from 'styled-components';
 import { useNavigate } from 'react-router-dom';
-import useAppParams from 'lib/hooks/useAppParams';
+import { useIsMutating } from 'react-query';
 import { ConnectorState, ConnectorAction } from 'generated-sources';
-import { ClusterName, ConnectName, ConnectorName } from 'redux/interfaces';
+import useAppParams from 'lib/hooks/useAppParams';
+import useModal from 'lib/hooks/useModal';
+import {
+  useConnector,
+  useDeleteConnector,
+  useUpdateConnectorState,
+} from 'lib/hooks/api/kafkaConnect';
 import {
   clusterConnectConnectorEditPath,
   clusterConnectorsPath,
   RouterParamsClusterConnectConnector,
 } from 'lib/paths';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
-import styled from 'styled-components';
 import { Button } from 'components/common/Button/Button';
 
 const ConnectorActionsWrapperStyled = styled.div`
@@ -19,97 +25,51 @@ const ConnectorActionsWrapperStyled = styled.div`
   gap: 8px;
 `;
 
-export interface ActionsProps {
-  deleteConnector(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }): Promise<unknown>;
-  isConnectorDeleting: boolean;
-  connectorStatus?: ConnectorState;
-  restartConnector(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }): void;
-  restartTasks(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-    action: ConnectorAction;
-  }): void;
-  pauseConnector(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }): void;
-  resumeConnector(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }): void;
-  isConnectorActionRunning: boolean;
-}
-
-const Actions: React.FC<ActionsProps> = ({
-  deleteConnector,
-  isConnectorDeleting,
-  connectorStatus,
-  restartConnector,
-  restartTasks,
-  pauseConnector,
-  resumeConnector,
-  isConnectorActionRunning,
-}) => {
-  const { clusterName, connectName, connectorName } =
-    useAppParams<RouterParamsClusterConnectConnector>();
-
+const Actions: React.FC = () => {
   const navigate = useNavigate();
+  const routerProps = useAppParams<RouterParamsClusterConnectConnector>();
+  const mutationsNumber = useIsMutating();
+  const isMutating = mutationsNumber > 0;
+
+  const { data: connector } = useConnector(routerProps);
 
-  const [
-    isDeleteConnectorConfirmationVisible,
-    setIsDeleteConnectorConfirmationVisible,
-  ] = React.useState(false);
+  const {
+    isOpen: isDeleteConnectorConfirmationOpen,
+    setClose: setDeleteConnectorConfirmationClose,
+    setOpen: setDeleteConnectorConfirmationOpen,
+  } = useModal();
 
+  const deleteConnectorMutation = useDeleteConnector(routerProps);
   const deleteConnectorHandler = async () => {
     try {
-      await deleteConnector({ clusterName, connectName, connectorName });
-      navigate(clusterConnectorsPath(clusterName));
+      await deleteConnectorMutation.mutateAsync();
+      navigate(clusterConnectorsPath(routerProps.clusterName));
     } catch {
       // do not redirect
     }
   };
 
-  const restartConnectorHandler = () => {
-    restartConnector({ clusterName, connectName, connectorName });
-  };
-
-  const restartTasksHandler = (actionType: ConnectorAction) => {
-    restartTasks({
-      clusterName,
-      connectName,
-      connectorName,
-      action: actionType,
-    });
-  };
-
-  const pauseConnectorHandler = () => {
-    pauseConnector({ clusterName, connectName, connectorName });
-  };
-
-  const resumeConnectorHandler = () => {
-    resumeConnector({ clusterName, connectName, connectorName });
-  };
+  const stateMutation = useUpdateConnectorState(routerProps);
+  const restartConnectorHandler = () =>
+    stateMutation.mutateAsync(ConnectorAction.RESTART);
+  const restartAllTasksHandler = () =>
+    stateMutation.mutateAsync(ConnectorAction.RESTART_ALL_TASKS);
+  const restartFailedTasksHandler = () =>
+    stateMutation.mutateAsync(ConnectorAction.RESTART_FAILED_TASKS);
+  const pauseConnectorHandler = () =>
+    stateMutation.mutateAsync(ConnectorAction.PAUSE);
+  const resumeConnectorHandler = () =>
+    stateMutation.mutateAsync(ConnectorAction.RESUME);
 
   return (
     <ConnectorActionsWrapperStyled>
-      {connectorStatus === ConnectorState.RUNNING && (
+      {connector?.status.state === ConnectorState.RUNNING && (
         <Button
           buttonSize="M"
           buttonType="primary"
           type="button"
           onClick={pauseConnectorHandler}
-          disabled={isConnectorActionRunning}
+          disabled={isMutating}
         >
           <span>
             <i className="fas fa-pause" />
@@ -118,13 +78,13 @@ const Actions: React.FC<ActionsProps> = ({
         </Button>
       )}
 
-      {connectorStatus === ConnectorState.PAUSED && (
+      {connector?.status.state === ConnectorState.PAUSED && (
         <Button
           buttonSize="M"
           buttonType="primary"
           type="button"
           onClick={resumeConnectorHandler}
-          disabled={isConnectorActionRunning}
+          disabled={isMutating}
         >
           <span>
             <i className="fas fa-play" />
@@ -138,7 +98,7 @@ const Actions: React.FC<ActionsProps> = ({
         buttonType="primary"
         type="button"
         onClick={restartConnectorHandler}
-        disabled={isConnectorActionRunning}
+        disabled={isMutating}
       >
         <span>
           <i className="fas fa-sync-alt" />
@@ -149,8 +109,8 @@ const Actions: React.FC<ActionsProps> = ({
         buttonSize="M"
         buttonType="primary"
         type="button"
-        onClick={() => restartTasksHandler(ConnectorAction.RESTART_ALL_TASKS)}
-        disabled={isConnectorActionRunning}
+        onClick={restartAllTasksHandler}
+        disabled={isMutating}
       >
         <span>
           <i className="fas fa-sync-alt" />
@@ -161,10 +121,8 @@ const Actions: React.FC<ActionsProps> = ({
         buttonSize="M"
         buttonType="primary"
         type="button"
-        onClick={() =>
-          restartTasksHandler(ConnectorAction.RESTART_FAILED_TASKS)
-        }
-        disabled={isConnectorActionRunning}
+        onClick={restartFailedTasksHandler}
+        disabled={isMutating}
       >
         <span>
           <i className="fas fa-sync-alt" />
@@ -175,11 +133,11 @@ const Actions: React.FC<ActionsProps> = ({
         buttonSize="M"
         buttonType="primary"
         type="button"
-        disabled={isConnectorActionRunning}
+        disabled={isMutating}
         to={clusterConnectConnectorEditPath(
-          clusterName,
-          connectName,
-          connectorName
+          routerProps.clusterName,
+          routerProps.connectName,
+          routerProps.connectorName
         )}
       >
         <span>
@@ -192,8 +150,8 @@ const Actions: React.FC<ActionsProps> = ({
         buttonSize="M"
         buttonType="secondary"
         type="button"
-        onClick={() => setIsDeleteConnectorConfirmationVisible(true)}
-        disabled={isConnectorActionRunning}
+        onClick={setDeleteConnectorConfirmationOpen}
+        disabled={isMutating}
       >
         <span>
           <i className="far fa-trash-alt" />
@@ -201,12 +159,13 @@ const Actions: React.FC<ActionsProps> = ({
         <span>Delete</span>
       </Button>
       <ConfirmationModal
-        isOpen={isDeleteConnectorConfirmationVisible}
-        onCancel={() => setIsDeleteConnectorConfirmationVisible(false)}
+        isOpen={isDeleteConnectorConfirmationOpen}
+        onCancel={setDeleteConnectorConfirmationClose}
         onConfirm={deleteConnectorHandler}
-        isConfirming={isConnectorDeleting}
+        isConfirming={isMutating}
       >
-        Are you sure you want to remove <b>{connectorName}</b> connector?
+        Are you sure you want to remove <b>{routerProps.connectorName}</b>{' '}
+        connector?
       </ConfirmationModal>
     </ConnectorActionsWrapperStyled>
   );
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/ActionsContainer.ts b/kafka-ui-react-app/src/components/Connect/Details/Actions/ActionsContainer.ts
deleted file mode 100644
index e0a78343ea3..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/ActionsContainer.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import {
-  deleteConnector,
-  restartConnector,
-  restartTasks,
-  pauseConnector,
-  resumeConnector,
-} from 'redux/reducers/connect/connectSlice';
-import {
-  getIsConnectorDeleting,
-  getConnectorStatus,
-  getIsConnectorActionRunning,
-} from 'redux/reducers/connect/selectors';
-
-import Actions from './Actions';
-
-const mapStateToProps = (state: RootState) => ({
-  isConnectorDeleting: getIsConnectorDeleting(state),
-  connectorStatus: getConnectorStatus(state),
-  isConnectorActionRunning: getIsConnectorActionRunning(state),
-});
-
-const mapDispatchToProps = {
-  deleteConnector,
-  restartConnector,
-  restartTasks,
-  pauseConnector,
-  resumeConnector,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Actions);
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
index d11cabb40ac..f8eea7c47ec 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
@@ -1,16 +1,16 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
-import { clusterConnectConnectorPath, clusterConnectorsPath } from 'lib/paths';
-import ActionsContainer from 'components/Connect/Details/Actions/ActionsContainer';
-import Actions, {
-  ActionsProps,
-} from 'components/Connect/Details/Actions/Actions';
-import { ConnectorState } from 'generated-sources';
+import { clusterConnectConnectorPath } from 'lib/paths';
+import Actions from 'components/Connect/Details/Actions/Actions';
+import { ConnectorAction, ConnectorState } from 'generated-sources';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import ConfirmationModal, {
-  ConfirmationModalProps,
-} from 'components/common/ConfirmationModal/ConfirmationModal';
+import {
+  useConnector,
+  useUpdateConnectorState,
+} from 'lib/hooks/api/kafkaConnect';
+import { connector } from 'lib/fixtures/kafkaConnect';
+import set from 'lodash/set';
 
 const mockHistoryPush = jest.fn();
 const deleteConnector = jest.fn();
@@ -21,6 +21,12 @@ jest.mock('react-router-dom', () => ({
   useNavigate: () => mockHistoryPush,
 }));
 
+jest.mock('lib/hooks/api/kafkaConnect', () => ({
+  useConnector: jest.fn(),
+  useDeleteConnector: jest.fn(),
+  useUpdateConnectorState: jest.fn(),
+}));
+
 jest.mock(
   'components/common/ConfirmationModal/ConfirmationModal',
   () => 'mock-ConfirmationModal'
@@ -41,107 +47,49 @@ describe('Actions', () => {
     cancelMock.mockClear();
   });
 
-  const actionsContainer = (props: Partial<ActionsProps> = {}) => (
-    <ActionsContainer>
-      <Actions
-        deleteConnector={jest.fn()}
-        isConnectorDeleting={false}
-        connectorStatus={ConnectorState.RUNNING}
-        restartConnector={jest.fn()}
-        restartTasks={jest.fn()}
-        pauseConnector={jest.fn()}
-        resumeConnector={jest.fn()}
-        isConnectorActionRunning={false}
-        {...props}
-      />
-    </ActionsContainer>
-  );
-
-  it('container renders view', () => {
-    const { container } = render(actionsContainer());
-    expect(container).toBeInTheDocument();
-  });
-
   describe('view', () => {
-    const pathname = clusterConnectConnectorPath();
-    const clusterName = 'my-cluster';
-    const connectName = 'my-connect';
-    const connectorName = 'my-connector';
-
-    const confirmationModal = (props: Partial<ConfirmationModalProps> = {}) => (
-      <WithRoute path={pathname}>
-        <ConfirmationModal
-          onCancel={cancelMock}
-          onConfirm={() =>
-            deleteConnector(clusterName, connectName, connectorName)
-          }
-          {...props}
-        >
-          <button type="button" onClick={cancelMock}>
-            Cancel
-          </button>
-          <button
-            type="button"
-            onClick={() => {
-              deleteConnector(clusterName, connectName, connectorName);
-              mockHistoryPush(clusterConnectorsPath(clusterName));
-            }}
-          >
-            Confirm
-          </button>
-        </ConfirmationModal>
-      </WithRoute>
+    const route = clusterConnectConnectorPath();
+    const path = clusterConnectConnectorPath(
+      'myCluster',
+      'myConnect',
+      'myConnector'
     );
 
-    const component = (props: Partial<ActionsProps> = {}) => (
-      <WithRoute path={pathname}>
-        <Actions
-          deleteConnector={jest.fn()}
-          isConnectorDeleting={false}
-          connectorStatus={ConnectorState.RUNNING}
-          restartConnector={jest.fn()}
-          restartTasks={jest.fn()}
-          pauseConnector={jest.fn()}
-          resumeConnector={jest.fn()}
-          isConnectorActionRunning={false}
-          {...props}
-        />
-      </WithRoute>
-    );
+    const renderComponent = () =>
+      render(
+        <WithRoute path={route}>
+          <Actions />
+        </WithRoute>,
+        { initialEntries: [path] }
+      );
 
     it('renders buttons when paused', () => {
-      render(component({ connectorStatus: ConnectorState.PAUSED }), {
-        initialEntries: [
-          clusterConnectConnectorPath(clusterName, connectName, connectorName),
-        ],
-      });
+      (useConnector as jest.Mock).mockImplementation(() => ({
+        data: set({ ...connector }, 'status.state', ConnectorState.PAUSED),
+      }));
+      renderComponent();
       expect(screen.getAllByRole('button').length).toEqual(6);
       expect(screen.getByText('Resume')).toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
-
       expectActionButtonsExists();
     });
 
     it('renders buttons when failed', () => {
-      render(component({ connectorStatus: ConnectorState.FAILED }), {
-        initialEntries: [
-          clusterConnectConnectorPath(clusterName, connectName, connectorName),
-        ],
-      });
+      (useConnector as jest.Mock).mockImplementation(() => ({
+        data: set({ ...connector }, 'status.state', ConnectorState.FAILED),
+      }));
+      renderComponent();
       expect(screen.getAllByRole('button').length).toEqual(5);
-
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
-
       expectActionButtonsExists();
     });
 
     it('renders buttons when unassigned', () => {
-      render(component({ connectorStatus: ConnectorState.UNASSIGNED }), {
-        initialEntries: [
-          clusterConnectConnectorPath(clusterName, connectName, connectorName),
-        ],
-      });
+      (useConnector as jest.Mock).mockImplementation(() => ({
+        data: set({ ...connector }, 'status.state', ConnectorState.UNASSIGNED),
+      }));
+      renderComponent();
       expect(screen.getAllByRole('button').length).toEqual(5);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
@@ -149,139 +97,92 @@ describe('Actions', () => {
     });
 
     it('renders buttons when running connector action', () => {
-      render(component({ connectorStatus: ConnectorState.RUNNING }), {
-        initialEntries: [
-          clusterConnectConnectorPath(clusterName, connectName, connectorName),
-        ],
-      });
+      (useConnector as jest.Mock).mockImplementation(() => ({
+        data: set({ ...connector }, 'status.state', ConnectorState.RUNNING),
+      }));
+      renderComponent();
       expect(screen.getAllByRole('button').length).toEqual(6);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.getByText('Pause')).toBeInTheDocument();
-
       expectActionButtonsExists();
     });
 
-    it('opens confirmation modal when delete button clicked', () => {
-      render(component({ deleteConnector }), {
-        initialEntries: [
-          clusterConnectConnectorPath(clusterName, connectName, connectorName),
-        ],
+    describe('mutations', () => {
+      beforeEach(() => {
+        (useConnector as jest.Mock).mockImplementation(() => ({
+          data: set({ ...connector }, 'status.state', ConnectorState.RUNNING),
+        }));
       });
-      userEvent.click(screen.getByRole('button', { name: 'Delete' }));
-
-      expect(
-        screen.getByText(/Are you sure you want to remove/i)
-      ).toHaveAttribute('isopen', 'true');
-    });
 
-    it('closes when cancel button clicked', () => {
-      render(confirmationModal({ isOpen: true }), {
-        initialEntries: [
-          clusterConnectConnectorPath(clusterName, connectName, connectorName),
-        ],
+      it('opens confirmation modal when delete button clicked', async () => {
+        renderComponent();
+        userEvent.click(screen.getByRole('button', { name: 'Delete' }));
+        expect(
+          screen.getByText(/Are you sure you want to remove/i)
+        ).toHaveAttribute('isopen', 'true');
       });
-      const cancelBtn = screen.getByRole('button', { name: 'Cancel' });
-      userEvent.click(cancelBtn);
-      expect(cancelMock).toHaveBeenCalledTimes(1);
-    });
 
-    it('calls deleteConnector when confirm button clicked', () => {
-      render(confirmationModal({ isOpen: true }), {
-        initialEntries: [
-          clusterConnectConnectorPath(clusterName, connectName, connectorName),
-        ],
+      it('calls restartConnector when restart button clicked', () => {
+        const restartConnector = jest.fn();
+        (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
+          mutateAsync: restartConnector,
+        }));
+        renderComponent();
+        userEvent.click(
+          screen.getByRole('button', { name: 'Restart Connector' })
+        );
+        expect(restartConnector).toHaveBeenCalledWith(ConnectorAction.RESTART);
       });
-      const confirmBtn = screen.getByRole('button', { name: 'Confirm' });
-      userEvent.click(confirmBtn);
-      expect(deleteConnector).toHaveBeenCalledTimes(1);
-      expect(deleteConnector).toHaveBeenCalledWith(
-        clusterName,
-        connectName,
-        connectorName
-      );
-    });
 
-    it('redirects after delete', async () => {
-      render(confirmationModal({ isOpen: true }), {
-        initialEntries: [
-          clusterConnectConnectorPath(clusterName, connectName, connectorName),
-        ],
+      it('calls restartAllTasks', () => {
+        const restartAllTasks = jest.fn();
+        (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
+          mutateAsync: restartAllTasks,
+        }));
+        renderComponent();
+        userEvent.click(
+          screen.getByRole('button', { name: 'Restart All Tasks' })
+        );
+        expect(restartAllTasks).toHaveBeenCalledWith(
+          ConnectorAction.RESTART_ALL_TASKS
+        );
       });
-      const confirmBtn = screen.getByRole('button', { name: 'Confirm' });
-      userEvent.click(confirmBtn);
-      expect(mockHistoryPush).toHaveBeenCalledTimes(1);
-      expect(mockHistoryPush).toHaveBeenCalledWith(
-        clusterConnectorsPath(clusterName)
-      );
-    });
 
-    it('calls restartConnector when restart button clicked', () => {
-      const restartConnector = jest.fn();
-      render(component({ restartConnector }), {
-        initialEntries: [
-          clusterConnectConnectorPath(clusterName, connectName, connectorName),
-        ],
+      it('calls restartFailedTasks', () => {
+        const restartFailedTasks = jest.fn();
+        (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
+          mutateAsync: restartFailedTasks,
+        }));
+        renderComponent();
+        userEvent.click(
+          screen.getByRole('button', { name: 'Restart Failed Tasks' })
+        );
+        expect(restartFailedTasks).toHaveBeenCalledWith(
+          ConnectorAction.RESTART_FAILED_TASKS
+        );
       });
-      userEvent.click(
-        screen.getByRole('button', { name: 'Restart Connector' })
-      );
-      expect(restartConnector).toHaveBeenCalledTimes(1);
-      expect(restartConnector).toHaveBeenCalledWith({
-        clusterName,
-        connectName,
-        connectorName,
-      });
-    });
 
-    it('calls pauseConnector when pause button clicked', () => {
-      const pauseConnector = jest.fn();
-      render(
-        component({
-          connectorStatus: ConnectorState.RUNNING,
-          pauseConnector,
-        }),
-        {
-          initialEntries: [
-            clusterConnectConnectorPath(
-              clusterName,
-              connectName,
-              connectorName
-            ),
-          ],
-        }
-      );
-      userEvent.click(screen.getByRole('button', { name: 'Pause' }));
-      expect(pauseConnector).toHaveBeenCalledTimes(1);
-      expect(pauseConnector).toHaveBeenCalledWith({
-        clusterName,
-        connectName,
-        connectorName,
+      it('calls pauseConnector when pause button clicked', () => {
+        const pauseConnector = jest.fn();
+        (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
+          mutateAsync: pauseConnector,
+        }));
+        renderComponent();
+        userEvent.click(screen.getByRole('button', { name: 'Pause' }));
+        expect(pauseConnector).toHaveBeenCalledWith(ConnectorAction.PAUSE);
       });
-    });
 
-    it('calls resumeConnector when resume button clicked', () => {
-      const resumeConnector = jest.fn();
-      render(
-        component({
-          connectorStatus: ConnectorState.PAUSED,
-          resumeConnector,
-        }),
-        {
-          initialEntries: [
-            clusterConnectConnectorPath(
-              clusterName,
-              connectName,
-              connectorName
-            ),
-          ],
-        }
-      );
-      userEvent.click(screen.getByRole('button', { name: 'Resume' }));
-      expect(resumeConnector).toHaveBeenCalledTimes(1);
-      expect(resumeConnector).toHaveBeenCalledWith({
-        clusterName,
-        connectName,
-        connectorName,
+      it('calls resumeConnector when resume button clicked', () => {
+        const resumeConnector = jest.fn();
+        (useConnector as jest.Mock).mockImplementation(() => ({
+          data: set({ ...connector }, 'status.state', ConnectorState.PAUSED),
+        }));
+        (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
+          mutateAsync: resumeConnector,
+        }));
+        renderComponent();
+        userEvent.click(screen.getByRole('button', { name: 'Resume' }));
+        expect(resumeConnector).toHaveBeenCalledWith(ConnectorAction.RESUME);
       });
     });
   });
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx b/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
index 7c7d4a086e3..0d599d090ba 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
@@ -1,56 +1,23 @@
 import React from 'react';
 import useAppParams from 'lib/hooks/useAppParams';
-import {
-  ClusterName,
-  ConnectName,
-  ConnectorConfig,
-  ConnectorName,
-} from 'redux/interfaces';
-import PageLoader from 'components/common/PageLoader/PageLoader';
 import Editor from 'components/common/Editor/Editor';
-import styled from 'styled-components';
 import { RouterParamsClusterConnectConnector } from 'lib/paths';
+import { useConnectorConfig } from 'lib/hooks/api/kafkaConnect';
 
-export interface ConfigProps {
-  fetchConfig(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }): void;
-  isConfigFetching: boolean;
-  config: ConnectorConfig | null;
-}
-
-const ConnectConfigWrapper = styled.div`
-  margin: 16px;
-`;
-
-const Config: React.FC<ConfigProps> = ({
-  fetchConfig,
-  isConfigFetching,
-  config,
-}) => {
-  const { clusterName, connectName, connectorName } =
-    useAppParams<RouterParamsClusterConnectConnector>();
-
-  React.useEffect(() => {
-    fetchConfig({ clusterName, connectName, connectorName });
-  }, [fetchConfig, clusterName, connectName, connectorName]);
-
-  if (isConfigFetching) {
-    return <PageLoader />;
-  }
+const Config: React.FC = () => {
+  const routerProps = useAppParams<RouterParamsClusterConnectConnector>();
+  const { data: config } = useConnectorConfig(routerProps);
 
   if (!config) return null;
+
   return (
-    <ConnectConfigWrapper>
-      <Editor
-        readOnly
-        value={JSON.stringify(config, null, '\t')}
-        highlightActiveLine={false}
-        isFixedHeight
-      />
-    </ConnectConfigWrapper>
+    <Editor
+      readOnly
+      value={JSON.stringify(config, null, '\t')}
+      highlightActiveLine={false}
+      isFixedHeight
+      style={{ margin: '16px' }}
+    />
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Config/ConfigContainer.ts b/kafka-ui-react-app/src/components/Connect/Details/Config/ConfigContainer.ts
deleted file mode 100644
index 10a28149c76..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/Config/ConfigContainer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import { fetchConnectorConfig } from 'redux/reducers/connect/connectSlice';
-import {
-  getIsConnectorConfigFetching,
-  getConnectorConfig,
-} from 'redux/reducers/connect/selectors';
-
-import Config from './Config';
-
-const mapStateToProps = (state: RootState) => ({
-  isConfigFetching: getIsConnectorConfigFetching(state),
-  config: getConnectorConfig(state),
-});
-
-const mapDispatchToProps = {
-  fetchConfig: fetchConnectorConfig,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Config);
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx
index 6f8fa909513..8e74c6a02b4 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx
@@ -1,71 +1,46 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterConnectConnectorConfigPath } from 'lib/paths';
-import Config, { ConfigProps } from 'components/Connect/Details/Config/Config';
-import { connector } from 'redux/reducers/connect/__test__/fixtures';
+import Config from 'components/Connect/Details/Config/Config';
 import { screen } from '@testing-library/dom';
+import { useConnectorConfig } from 'lib/hooks/api/kafkaConnect';
+import { connector } from 'lib/fixtures/kafkaConnect';
 
-jest.mock('components/common/Editor/Editor', () => 'mock-Editor');
+jest.mock('components/common/Editor/Editor', () => () => (
+  <div>mock-Editor</div>
+));
+jest.mock('lib/hooks/api/kafkaConnect', () => ({
+  useConnectorConfig: jest.fn(),
+}));
 
 describe('Config', () => {
-  const pathname = clusterConnectConnectorConfigPath();
-  const clusterName = 'my-cluster';
-  const connectName = 'my-connect';
-  const connectorName = 'my-connector';
-
-  const component = (props: Partial<ConfigProps> = {}) => (
-    <WithRoute path={pathname}>
-      <Config
-        fetchConfig={jest.fn()}
-        isConfigFetching={false}
-        config={connector.config}
-        {...props}
-      />
-    </WithRoute>
-  );
-
-  it('to be in the document when fetching config', () => {
-    render(component({ isConfigFetching: true }), {
-      initialEntries: [
-        clusterConnectConnectorConfigPath(
-          clusterName,
-          connectName,
-          connectorName
-        ),
-      ],
-    });
-    expect(screen.getByRole('progressbar')).toBeInTheDocument();
-  });
+  const renderComponent = () =>
+    render(
+      <WithRoute path={clusterConnectConnectorConfigPath()}>
+        <Config />
+      </WithRoute>,
+      {
+        initialEntries: [
+          clusterConnectConnectorConfigPath(
+            'my-cluster',
+            'my-connect',
+            'my-connector'
+          ),
+        ],
+      }
+    );
 
   it('is empty when no config', () => {
-    const { container } = render(component({ config: null }), {
-      initialEntries: [
-        clusterConnectConnectorConfigPath(
-          clusterName,
-          connectName,
-          connectorName
-        ),
-      ],
-    });
+    (useConnectorConfig as jest.Mock).mockImplementation(() => ({}));
+    const { container } = renderComponent();
     expect(container).toBeEmptyDOMElement();
   });
 
-  it('fetches config on mount', () => {
-    const fetchConfig = jest.fn();
-    render(component({ fetchConfig }), {
-      initialEntries: [
-        clusterConnectConnectorConfigPath(
-          clusterName,
-          connectName,
-          connectorName
-        ),
-      ],
-    });
-    expect(fetchConfig).toHaveBeenCalledTimes(1);
-    expect(fetchConfig).toHaveBeenCalledWith({
-      clusterName,
-      connectName,
-      connectorName,
-    });
+  it('renders editor', () => {
+    (useConnectorConfig as jest.Mock).mockImplementation(() => ({
+      data: connector.config,
+    }));
+    renderComponent();
+    expect(screen.getByText('mock-Editor')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Details.tsx b/kafka-ui-react-app/src/components/Connect/Details/Details.tsx
deleted file mode 100644
index e96dafbe447..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/Details.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import React from 'react';
-import { NavLink, Route, Routes } from 'react-router-dom';
-import useAppParams from 'lib/hooks/useAppParams';
-import { Connector, Task } from 'generated-sources';
-import { ClusterName, ConnectName, ConnectorName } from 'redux/interfaces';
-import {
-  clusterConnectConnectorConfigPath,
-  clusterConnectConnectorConfigRelativePath,
-  clusterConnectConnectorPath,
-  clusterConnectConnectorTasksPath,
-  clusterConnectConnectorTasksRelativePath,
-  RouterParamsClusterConnectConnector,
-} from 'lib/paths';
-import PageLoader from 'components/common/PageLoader/PageLoader';
-import Navbar from 'components/common/Navigation/Navbar.styled';
-import PageHeading from 'components/common/PageHeading/PageHeading';
-
-import OverviewContainer from './Overview/OverviewContainer';
-import TasksContainer from './Tasks/TasksContainer';
-import ConfigContainer from './Config/ConfigContainer';
-import ActionsContainer from './Actions/ActionsContainer';
-
-export interface DetailsProps {
-  fetchConnector(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }): void;
-  fetchTasks(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }): void;
-  isConnectorFetching: boolean;
-  areTasksFetching: boolean;
-  connector: Connector | null;
-  tasks: Task[];
-}
-
-const Details: React.FC<DetailsProps> = ({
-  fetchConnector,
-  fetchTasks,
-  isConnectorFetching,
-  areTasksFetching,
-  connector,
-}) => {
-  const { clusterName, connectName, connectorName } =
-    useAppParams<RouterParamsClusterConnectConnector>();
-
-  React.useEffect(() => {
-    fetchConnector({ clusterName, connectName, connectorName });
-  }, [fetchConnector, clusterName, connectName, connectorName]);
-
-  React.useEffect(() => {
-    fetchTasks({ clusterName, connectName, connectorName });
-  }, [fetchTasks, clusterName, connectName, connectorName]);
-
-  if (isConnectorFetching || areTasksFetching) {
-    return <PageLoader />;
-  }
-
-  if (!connector) return null;
-
-  return (
-    <div>
-      <PageHeading text={connectorName}>
-        <ActionsContainer />
-      </PageHeading>
-      <Navbar role="navigation">
-        <NavLink
-          to={clusterConnectConnectorPath(
-            clusterName,
-            connectName,
-            connectorName
-          )}
-          className={({ isActive }) => (isActive ? 'is-active' : '')}
-          end
-        >
-          Overview
-        </NavLink>
-        <NavLink
-          to={clusterConnectConnectorTasksPath(
-            clusterName,
-            connectName,
-            connectorName
-          )}
-          className={({ isActive }) => (isActive ? 'is-active' : '')}
-        >
-          Tasks
-        </NavLink>
-        <NavLink
-          to={clusterConnectConnectorConfigPath(
-            clusterName,
-            connectName,
-            connectorName
-          )}
-          className={({ isActive }) => (isActive ? 'is-active' : '')}
-        >
-          Config
-        </NavLink>
-      </Navbar>
-      <Routes>
-        <Route index element={<OverviewContainer />} />
-        <Route
-          path={clusterConnectConnectorTasksRelativePath}
-          element={<TasksContainer />}
-        />
-        <Route
-          path={clusterConnectConnectorConfigRelativePath}
-          element={<ConfigContainer />}
-        />
-      </Routes>
-    </div>
-  );
-};
-
-export default Details;
diff --git a/kafka-ui-react-app/src/components/Connect/Details/DetailsContainer.ts b/kafka-ui-react-app/src/components/Connect/Details/DetailsContainer.ts
deleted file mode 100644
index 9f6d792d760..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/DetailsContainer.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import {
-  fetchConnector,
-  fetchConnectorTasks,
-} from 'redux/reducers/connect/connectSlice';
-import {
-  getIsConnectorFetching,
-  getAreConnectorTasksFetching,
-  getConnector,
-  getConnectorTasks,
-} from 'redux/reducers/connect/selectors';
-
-import Details from './Details';
-
-const mapStateToProps = (state: RootState) => ({
-  isConnectorFetching: getIsConnectorFetching(state),
-  connector: getConnector(state),
-  areTasksFetching: getAreConnectorTasksFetching(state),
-  tasks: getConnectorTasks(state),
-});
-
-const mapDispatchToProps = {
-  fetchConnector,
-  fetchTasks: fetchConnectorTasks,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Details);
diff --git a/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx b/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx
new file mode 100644
index 00000000000..6741c3d4a0f
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx
@@ -0,0 +1,80 @@
+import React, { Suspense } from 'react';
+import { NavLink, Route, Routes } from 'react-router-dom';
+import useAppParams from 'lib/hooks/useAppParams';
+import {
+  clusterConnectConnectorConfigPath,
+  clusterConnectConnectorConfigRelativePath,
+  clusterConnectConnectorPath,
+  clusterConnectConnectorTasksPath,
+  clusterConnectConnectorTasksRelativePath,
+  RouterParamsClusterConnectConnector,
+} from 'lib/paths';
+import Navbar from 'components/common/Navigation/Navbar.styled';
+import PageHeading from 'components/common/PageHeading/PageHeading';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+
+import Overview from './Overview/Overview';
+import Tasks from './Tasks/Tasks';
+import Config from './Config/Config';
+import Actions from './Actions/Actions';
+
+const DetailsPage: React.FC = () => {
+  const { clusterName, connectName, connectorName } =
+    useAppParams<RouterParamsClusterConnectConnector>();
+
+  return (
+    <div>
+      <PageHeading text={connectorName}>
+        <Actions />
+      </PageHeading>
+      <Navbar role="navigation">
+        <NavLink
+          to={clusterConnectConnectorPath(
+            clusterName,
+            connectName,
+            connectorName
+          )}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+          end
+        >
+          Overview
+        </NavLink>
+        <NavLink
+          to={clusterConnectConnectorTasksPath(
+            clusterName,
+            connectName,
+            connectorName
+          )}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+        >
+          Tasks
+        </NavLink>
+        <NavLink
+          to={clusterConnectConnectorConfigPath(
+            clusterName,
+            connectName,
+            connectorName
+          )}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+        >
+          Config
+        </NavLink>
+      </Navbar>
+      <Suspense fallback={<PageLoader />}>
+        <Routes>
+          <Route index element={<Overview />} />
+          <Route
+            path={clusterConnectConnectorTasksRelativePath}
+            element={<Tasks />}
+          />
+          <Route
+            path={clusterConnectConnectorConfigRelativePath}
+            element={<Config />}
+          />
+        </Routes>
+      </Suspense>
+    </div>
+  );
+};
+
+export default DetailsPage;
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Connect/Details/Overview/Overview.tsx
index 32931c3ecc0..c5c004f3061 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Overview/Overview.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Overview/Overview.tsx
@@ -1,21 +1,24 @@
 import React from 'react';
-import { Connector } from 'generated-sources';
 import * as C from 'components/common/Tag/Tag.styled';
 import * as Metrics from 'components/common/Metrics';
 import getTagColor from 'components/common/Tag/getTagColor';
+import { RouterParamsClusterConnectConnector } from 'lib/paths';
+import useAppParams from 'lib/hooks/useAppParams';
+import { useConnector, useConnectorTasks } from 'lib/hooks/api/kafkaConnect';
 
-export interface OverviewProps {
-  connector: Connector | null;
-  runningTasksCount: number;
-  failedTasksCount: number;
-}
+import getTaskMetrics from './getTaskMetrics';
 
-const Overview: React.FC<OverviewProps> = ({
-  connector,
-  runningTasksCount,
-  failedTasksCount,
-}) => {
-  if (!connector) return null;
+const Overview: React.FC = () => {
+  const routerProps = useAppParams<RouterParamsClusterConnectConnector>();
+
+  const { data: connector } = useConnector(routerProps);
+  const { data: tasks } = useConnectorTasks(routerProps);
+
+  if (!connector) {
+    return null;
+  }
+
+  const { running, failed } = getTaskMetrics(tasks);
 
   return (
     <Metrics.Wrapper>
@@ -36,15 +39,13 @@ const Overview: React.FC<OverviewProps> = ({
             {connector.status.state}
           </C.Tag>
         </Metrics.Indicator>
-        <Metrics.Indicator label="Tasks Running">
-          {runningTasksCount}
-        </Metrics.Indicator>
+        <Metrics.Indicator label="Tasks Running">{running}</Metrics.Indicator>
         <Metrics.Indicator
           label="Tasks Failed"
           isAlert
-          alertType={failedTasksCount > 0 ? 'error' : 'success'}
+          alertType={failed > 0 ? 'error' : 'success'}
         >
-          {failedTasksCount}
+          {failed}
         </Metrics.Indicator>
       </Metrics.Section>
     </Metrics.Wrapper>
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Overview/OverviewContainer.ts b/kafka-ui-react-app/src/components/Connect/Details/Overview/OverviewContainer.ts
deleted file mode 100644
index 6bca8b22a6d..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/Overview/OverviewContainer.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import {
-  getConnector,
-  getConnectorRunningTasksCount,
-  getConnectorFailedTasksCount,
-} from 'redux/reducers/connect/selectors';
-
-import Overview from './Overview';
-
-const mapStateToProps = (state: RootState) => ({
-  connector: getConnector(state),
-  runningTasksCount: getConnectorRunningTasksCount(state),
-  failedTasksCount: getConnectorFailedTasksCount(state),
-});
-
-export default connect(mapStateToProps)(Overview);
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/Overview.spec.tsx
index f5b353e681f..876dd1a472b 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/Overview.spec.tsx
@@ -1,40 +1,57 @@
 import React from 'react';
 import Overview from 'components/Connect/Details/Overview/Overview';
-import { connector } from 'redux/reducers/connect/__test__/fixtures';
+import { connector, tasks } from 'lib/fixtures/kafkaConnect';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
+import { useConnector, useConnectorTasks } from 'lib/hooks/api/kafkaConnect';
+
+jest.mock('lib/hooks/api/kafkaConnect', () => ({
+  useConnector: jest.fn(),
+  useConnectorTasks: jest.fn(),
+}));
 
 describe('Overview', () => {
   it('is empty when no connector', () => {
-    const { container } = render(
-      <Overview connector={null} runningTasksCount={10} failedTasksCount={2} />
-    );
+    (useConnector as jest.Mock).mockImplementation(() => ({
+      data: undefined,
+    }));
+    (useConnectorTasks as jest.Mock).mockImplementation(() => ({
+      data: undefined,
+    }));
+
+    const { container } = render(<Overview />);
     expect(container).toBeEmptyDOMElement();
   });
 
-  it('renders metrics', () => {
-    const running = 234789237;
-    const failed = 373737;
-    render(
-      <Overview
-        connector={connector}
-        runningTasksCount={running}
-        failedTasksCount={failed}
-      />
-    );
-    expect(screen.getByText('Worker')).toBeInTheDocument();
-    expect(
-      screen.getByText(connector.status.workerId as string)
-    ).toBeInTheDocument();
-
-    expect(screen.getByText('Type')).toBeInTheDocument();
-    expect(
-      screen.getByText(connector.config['connector.class'] as string)
-    ).toBeInTheDocument();
-
-    expect(screen.getByText('Tasks Running')).toBeInTheDocument();
-    expect(screen.getByText(running)).toBeInTheDocument();
-    expect(screen.getByText('Tasks Failed')).toBeInTheDocument();
-    expect(screen.getByText(failed)).toBeInTheDocument();
+  describe('when connector is loaded', () => {
+    beforeEach(() => {
+      (useConnector as jest.Mock).mockImplementation(() => ({
+        data: connector,
+      }));
+    });
+    beforeEach(() => {
+      (useConnectorTasks as jest.Mock).mockImplementation(() => ({
+        data: tasks,
+      }));
+    });
+
+    it('renders metrics', () => {
+      render(<Overview />);
+
+      expect(screen.getByText('Worker')).toBeInTheDocument();
+      expect(
+        screen.getByText(connector.status.workerId as string)
+      ).toBeInTheDocument();
+
+      expect(screen.getByText('Type')).toBeInTheDocument();
+      expect(
+        screen.getByText(connector.config['connector.class'] as string)
+      ).toBeInTheDocument();
+
+      expect(screen.getByText('Tasks Running')).toBeInTheDocument();
+      expect(screen.getByText(2)).toBeInTheDocument();
+      expect(screen.getByText('Tasks Failed')).toBeInTheDocument();
+      expect(screen.getByText(1)).toBeInTheDocument();
+    });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/getTaskMetrics.spec.ts b/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/getTaskMetrics.spec.ts
new file mode 100644
index 00000000000..4b7984c4a10
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/getTaskMetrics.spec.ts
@@ -0,0 +1,19 @@
+import { tasks } from 'lib/fixtures/kafkaConnect';
+import getTaskMetrics from 'components/Connect/Details/Overview/getTaskMetrics';
+
+describe('getTaskMetrics', () => {
+  it('should return the correct metrics when task list is undefined', () => {
+    const metrics = getTaskMetrics();
+    expect(metrics).toEqual({
+      running: 0,
+      failed: 0,
+    });
+  });
+
+  it('should return the correct metrics', () => {
+    expect(getTaskMetrics(tasks)).toEqual({
+      running: 2,
+      failed: 1,
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Overview/getTaskMetrics.ts b/kafka-ui-react-app/src/components/Connect/Details/Overview/getTaskMetrics.ts
new file mode 100644
index 00000000000..b1607f58c1e
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/Details/Overview/getTaskMetrics.ts
@@ -0,0 +1,23 @@
+import { ConnectorTaskStatus, Task } from 'generated-sources';
+
+export default function getTaskMetrics(tasks?: Task[]) {
+  const initialMetrics = {
+    running: 0,
+    failed: 0,
+  };
+
+  if (!tasks) {
+    return initialMetrics;
+  }
+
+  return tasks.reduce((acc, { status }) => {
+    const state = status?.state;
+    if (state === ConnectorTaskStatus.RUNNING) {
+      return { ...acc, running: acc.running + 1 };
+    }
+    if (state === ConnectorTaskStatus.FAILED) {
+      return { ...acc, failed: acc.failed + 1 };
+    }
+    return acc;
+  }, initialMetrics);
+}
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/ListItem.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/ListItem.tsx
deleted file mode 100644
index 91e2d97c675..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/ListItem.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import useAppParams from 'lib/hooks/useAppParams';
-import { Task, TaskId } from 'generated-sources';
-import { ClusterName, ConnectName, ConnectorName } from 'redux/interfaces';
-import Dropdown from 'components/common/Dropdown/Dropdown';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
-import * as C from 'components/common/Tag/Tag.styled';
-import getTagColor from 'components/common/Tag/getTagColor';
-import { RouterParamsClusterConnectConnector } from 'lib/paths';
-
-export interface ListItemProps {
-  task: Task;
-  restartTask(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-    taskId: TaskId['task'];
-  }): Promise<unknown>;
-}
-
-const ListItem: React.FC<ListItemProps> = ({ task, restartTask }) => {
-  const { clusterName, connectName, connectorName } =
-    useAppParams<RouterParamsClusterConnectConnector>();
-
-  const restartTaskHandler = async () => {
-    await restartTask({
-      clusterName,
-      connectName,
-      connectorName,
-      taskId: task.id?.task,
-    });
-  };
-
-  return (
-    <tr>
-      <td>{task.status?.id}</td>
-      <td>{task.status?.workerId}</td>
-      <td>
-        <C.Tag color={getTagColor(task.status)}>{task.status.state}</C.Tag>
-      </td>
-      <td>{task.status.trace || 'null'}</td>
-      <td style={{ width: '5%' }}>
-        <div>
-          <Dropdown label={<VerticalElipsisIcon />} right>
-            <DropdownItem onClick={restartTaskHandler} danger>
-              <span>Restart task</span>
-            </DropdownItem>
-          </Dropdown>
-        </div>
-      </td>
-    </tr>
-  );
-};
-
-export default ListItem;
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/ListItemContainer.ts b/kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/ListItemContainer.ts
deleted file mode 100644
index 9e170da61c0..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/ListItemContainer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-import { Task } from 'generated-sources';
-import { RootState } from 'redux/interfaces';
-import { restartConnectorTask } from 'redux/reducers/connect/connectSlice';
-
-import ListItem from './ListItem';
-
-interface OwnProps {
-  task: Task;
-}
-
-const mapStateToProps = (_state: RootState, { task }: OwnProps) => ({
-  task,
-});
-
-const mapDispatchToProps = {
-  restartTask: restartConnectorTask,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(ListItem);
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/__tests__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/__tests__/ListItem.spec.tsx
deleted file mode 100644
index 8796281cc6e..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/ListItem/__tests__/ListItem.spec.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import React from 'react';
-import { render, WithRoute } from 'lib/testHelpers';
-import { clusterConnectConnectorTasksPath } from 'lib/paths';
-import ListItem, {
-  ListItemProps,
-} from 'components/Connect/Details/Tasks/ListItem/ListItem';
-import { tasks } from 'redux/reducers/connect/__test__/fixtures';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-const pathname = clusterConnectConnectorTasksPath();
-const clusterName = 'my-cluster';
-const connectName = 'my-connect';
-const connectorName = 'my-connector';
-const restartTask = jest.fn();
-const task = tasks[0];
-
-const renderComponent = (props: ListItemProps = { task, restartTask }) => {
-  return render(
-    <WithRoute path={pathname}>
-      <table>
-        <tbody>
-          <ListItem {...props} />
-        </tbody>
-      </table>
-    </WithRoute>,
-    {
-      initialEntries: [
-        clusterConnectConnectorTasksPath(
-          clusterName,
-          connectName,
-          connectorName
-        ),
-      ],
-    }
-  );
-};
-
-describe('ListItem', () => {
-  it('renders', () => {
-    renderComponent();
-    expect(screen.getByRole('row')).toBeInTheDocument();
-    expect(
-      screen.getByRole('cell', { name: task.status.id.toString() })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('cell', { name: task.status.workerId })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('cell', { name: task.status.state })
-    ).toBeInTheDocument();
-    expect(screen.getByRole('button')).toBeInTheDocument();
-    expect(screen.getByRole('menu')).toBeInTheDocument();
-    expect(screen.getByRole('menuitem')).toBeInTheDocument();
-  });
-  it('calls restartTask on button click', () => {
-    renderComponent();
-
-    expect(restartTask).not.toBeCalled();
-    userEvent.click(screen.getByRole('button'));
-    userEvent.click(screen.getByRole('menuitem'));
-    expect(restartTask).toBeCalledTimes(1);
-    expect(restartTask).toHaveBeenCalledWith({
-      clusterName,
-      connectName,
-      connectorName,
-      taskId: task.id?.task,
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
index 0cd14ecd70b..415a828af2c 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
@@ -1,20 +1,27 @@
 import React from 'react';
-import { Task } from 'generated-sources';
-import PageLoader from 'components/common/PageLoader/PageLoader';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
+import {
+  useConnectorTasks,
+  useRestartConnectorTask,
+} from 'lib/hooks/api/kafkaConnect';
+import useAppParams from 'lib/hooks/useAppParams';
+import { RouterParamsClusterConnectConnector } from 'lib/paths';
+import Dropdown from 'components/common/Dropdown/Dropdown';
+import DropdownItem from 'components/common/Dropdown/DropdownItem';
+import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
+import getTagColor from 'components/common/Tag/getTagColor';
+import { Tag } from 'components/common/Tag/Tag.styled';
 
-import ListItemContainer from './ListItem/ListItemContainer';
+const Tasks: React.FC = () => {
+  const routerProps = useAppParams<RouterParamsClusterConnectConnector>();
+  const { data: tasks } = useConnectorTasks(routerProps);
+  const restartMutation = useRestartConnectorTask(routerProps);
 
-export interface TasksProps {
-  areTasksFetching: boolean;
-  tasks: Task[];
-}
-
-const Tasks: React.FC<TasksProps> = ({ areTasksFetching, tasks }) => {
-  if (areTasksFetching) {
-    return <PageLoader />;
-  }
+  const restartTaskHandler = (taskId?: number) => {
+    if (taskId === undefined) return;
+    restartMutation.mutateAsync(taskId);
+  };
 
   return (
     <Table isFullwidth>
@@ -28,13 +35,32 @@ const Tasks: React.FC<TasksProps> = ({ areTasksFetching, tasks }) => {
         </tr>
       </thead>
       <tbody>
-        {tasks.length === 0 && (
+        {tasks?.length === 0 && (
           <tr>
             <td colSpan={10}>No tasks found</td>
           </tr>
         )}
-        {tasks.map((task) => (
-          <ListItemContainer key={task.status?.id} task={task} />
+        {tasks?.map((task) => (
+          <tr key={task.status?.id}>
+            <td>{task.status?.id}</td>
+            <td>{task.status?.workerId}</td>
+            <td>
+              <Tag color={getTagColor(task.status)}>{task.status.state}</Tag>
+            </td>
+            <td>{task.status.trace || 'null'}</td>
+            <td style={{ width: '5%' }}>
+              <div>
+                <Dropdown label={<VerticalElipsisIcon />} right>
+                  <DropdownItem
+                    onClick={() => restartTaskHandler(task.id?.task)}
+                    danger
+                  >
+                    <span>Restart task</span>
+                  </DropdownItem>
+                </Dropdown>
+              </div>
+            </td>
+          </tr>
         ))}
       </tbody>
     </Table>
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/TasksContainer.ts b/kafka-ui-react-app/src/components/Connect/Details/Tasks/TasksContainer.ts
deleted file mode 100644
index 59162c43888..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/TasksContainer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import { fetchConnectorTasks } from 'redux/reducers/connect/connectSlice';
-import {
-  getAreConnectorTasksFetching,
-  getConnectorTasks,
-} from 'redux/reducers/connect/selectors';
-
-import Tasks from './Tasks';
-
-const mapStateToProps = (state: RootState) => ({
-  areTasksFetching: getAreConnectorTasksFetching(state),
-  tasks: getConnectorTasks(state),
-});
-
-const mapDispatchToProps = {
-  fetchTasks: fetchConnectorTasks,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Tasks);
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx
index b3dfb82d293..efb72d1812c 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx
@@ -1,59 +1,42 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterConnectConnectorTasksPath } from 'lib/paths';
-import TasksContainer from 'components/Connect/Details/Tasks/TasksContainer';
-import Tasks, { TasksProps } from 'components/Connect/Details/Tasks/Tasks';
-import { tasks } from 'redux/reducers/connect/__test__/fixtures';
+import Tasks from 'components/Connect/Details/Tasks/Tasks';
+import { tasks } from 'lib/fixtures/kafkaConnect';
 import { screen } from '@testing-library/dom';
+import { useConnectorTasks } from 'lib/hooks/api/kafkaConnect';
 
-jest.mock(
-  'components/Connect/Details/Tasks/ListItem/ListItemContainer',
-  () => 'tr'
-);
+jest.mock('lib/hooks/api/kafkaConnect', () => ({
+  useConnectorTasks: jest.fn(),
+  useRestartConnectorTask: jest.fn(),
+}));
 
-describe('Tasks', () => {
-  it('container renders view', () => {
-    render(<TasksContainer />);
-    expect(screen.getByRole('table')).toBeInTheDocument();
-  });
-
-  describe('view', () => {
-    const clusterName = 'my-cluster';
-    const connectName = 'my-connect';
-    const connectorName = 'my-connector';
+const path = clusterConnectConnectorTasksPath('local', 'ghp', '1');
 
-    const setupWrapper = (props: Partial<TasksProps> = {}) => (
+describe('Tasks', () => {
+  const renderComponent = () =>
+    render(
       <WithRoute path={clusterConnectConnectorTasksPath()}>
-        <Tasks areTasksFetching={false} tasks={tasks} {...props} />
-      </WithRoute>
+        <Tasks />
+      </WithRoute>,
+      { initialEntries: [path] }
     );
 
-    it('to be in the document when fetching tasks', () => {
-      render(setupWrapper({ areTasksFetching: true }), {
-        initialEntries: [
-          clusterConnectConnectorTasksPath(
-            clusterName,
-            connectName,
-            connectorName
-          ),
-        ],
-      });
-      expect(screen.getByRole('progressbar')).toBeInTheDocument();
-      expect(screen.queryByRole('table')).not.toBeInTheDocument();
-    });
+  it('renders empty table', () => {
+    (useConnectorTasks as jest.Mock).mockImplementation(() => ({
+      data: [],
+    }));
+
+    renderComponent();
+    expect(screen.getByRole('table')).toBeInTheDocument();
+    expect(screen.getByText('No tasks found')).toBeInTheDocument();
+  });
 
-    it('to be in the document when no tasks', () => {
-      render(setupWrapper({ tasks: [] }), {
-        initialEntries: [
-          clusterConnectConnectorTasksPath(
-            clusterName,
-            connectName,
-            connectorName
-          ),
-        ],
-      });
-      expect(screen.getByRole('table')).toBeInTheDocument();
-      expect(screen.getByText('No tasks found')).toBeInTheDocument();
-    });
+  it('renders tasks table', () => {
+    (useConnectorTasks as jest.Mock).mockImplementation(() => ({
+      data: tasks,
+    }));
+    renderComponent();
+    expect(screen.getAllByRole('row').length).toEqual(tasks.length + 1);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Connect/Details/__tests__/Details.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/__tests__/Details.spec.tsx
deleted file mode 100644
index ff4d9618a2f..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/__tests__/Details.spec.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import React from 'react';
-import { render, WithRoute } from 'lib/testHelpers';
-import {
-  clusterConnectConnectorConfigPath,
-  clusterConnectConnectorPath,
-  clusterConnectConnectorTasksPath,
-  getNonExactPath,
-} from 'lib/paths';
-import Details, { DetailsProps } from 'components/Connect/Details/Details';
-import { connector, tasks } from 'redux/reducers/connect/__test__/fixtures';
-import { screen } from '@testing-library/dom';
-
-const DetailsCompText = {
-  overview: 'OverviewContainer',
-  tasks: 'TasksContainer',
-  config: 'ConfigContainer',
-  actions: 'ActionsContainer',
-};
-
-jest.mock('components/Connect/Details/Overview/OverviewContainer', () => () => (
-  <div>{DetailsCompText.overview}</div>
-));
-
-jest.mock('components/Connect/Details/Tasks/TasksContainer', () => () => (
-  <div>{DetailsCompText.tasks}</div>
-));
-
-jest.mock('components/Connect/Details/Config/ConfigContainer', () => () => (
-  <div>{DetailsCompText.config}</div>
-));
-
-jest.mock('components/Connect/Details/Actions/ActionsContainer', () => () => (
-  <div>{DetailsCompText.actions}</div>
-));
-
-describe('Details', () => {
-  const clusterName = 'my-cluster';
-  const connectName = 'my-connect';
-  const connectorName = 'my-connector';
-  const defaultPath = clusterConnectConnectorPath(
-    clusterName,
-    connectName,
-    connectorName
-  );
-
-  const setupWrapper = (
-    props: Partial<DetailsProps> = {},
-    path: string = defaultPath
-  ) =>
-    render(
-      <WithRoute path={getNonExactPath(clusterConnectConnectorPath())}>
-        <Details
-          fetchConnector={jest.fn()}
-          fetchTasks={jest.fn()}
-          isConnectorFetching={false}
-          areTasksFetching={false}
-          connector={connector}
-          tasks={tasks}
-          {...props}
-        />
-      </WithRoute>,
-      { initialEntries: [path] }
-    );
-
-  it('renders progressbar when fetching connector', () => {
-    setupWrapper({ isConnectorFetching: true });
-
-    expect(screen.getByRole('progressbar')).toBeInTheDocument();
-    expect(screen.queryByRole('navigation')).not.toBeInTheDocument();
-  });
-
-  it('renders progressbar when fetching tasks', () => {
-    setupWrapper({ areTasksFetching: true });
-
-    expect(screen.getByRole('progressbar')).toBeInTheDocument();
-    expect(screen.queryByRole('navigation')).not.toBeInTheDocument();
-  });
-
-  it('is empty when no connector', () => {
-    const { container } = setupWrapper({ connector: null });
-    expect(container).toBeEmptyDOMElement();
-  });
-
-  it('fetches connector on mount', () => {
-    const fetchConnector = jest.fn();
-    setupWrapper({ fetchConnector });
-    expect(fetchConnector).toHaveBeenCalledTimes(1);
-    expect(fetchConnector).toHaveBeenCalledWith({
-      clusterName,
-      connectName,
-      connectorName,
-    });
-  });
-
-  it('fetches tasks on mount', () => {
-    const fetchTasks = jest.fn();
-    setupWrapper({ fetchTasks });
-    expect(fetchTasks).toHaveBeenCalledTimes(1);
-    expect(fetchTasks).toHaveBeenCalledWith({
-      clusterName,
-      connectName,
-      connectorName,
-    });
-  });
-
-  describe('Router component tests', () => {
-    it('should test if overview is rendering', () => {
-      setupWrapper({});
-      expect(screen.getByText(DetailsCompText.overview));
-    });
-
-    it('should test if tasks is rendering', () => {
-      setupWrapper(
-        {},
-        clusterConnectConnectorTasksPath(
-          clusterName,
-          connectName,
-          connectorName
-        )
-      );
-      expect(screen.getByText(DetailsCompText.tasks));
-    });
-
-    it('should test if list is rendering', () => {
-      setupWrapper(
-        {},
-        clusterConnectConnectorConfigPath(
-          clusterName,
-          connectName,
-          connectorName
-        )
-      );
-      expect(screen.getByText(DetailsCompText.config));
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Connect/Details/__tests__/DetailsPage.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/__tests__/DetailsPage.spec.tsx
new file mode 100644
index 00000000000..8971111d4ba
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/Details/__tests__/DetailsPage.spec.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import {
+  clusterConnectConnectorConfigPath,
+  clusterConnectConnectorPath,
+  clusterConnectConnectorTasksPath,
+  getNonExactPath,
+} from 'lib/paths';
+import { screen } from '@testing-library/dom';
+import DetailsPage from 'components/Connect/Details/DetailsPage';
+
+const DetailsCompText = {
+  overview: 'Overview Page',
+  tasks: 'Tasks Page',
+  config: 'Config Page',
+  actions: 'Actions',
+};
+
+jest.mock('components/Connect/Details/Overview/Overview', () => () => (
+  <div>{DetailsCompText.overview}</div>
+));
+
+jest.mock('components/Connect/Details/Tasks/Tasks', () => () => (
+  <div>{DetailsCompText.tasks}</div>
+));
+
+jest.mock('components/Connect/Details/Config/Config', () => () => (
+  <div>{DetailsCompText.config}</div>
+));
+
+jest.mock('components/Connect/Details/Actions/Actions', () => () => (
+  <div>{DetailsCompText.actions}</div>
+));
+
+describe('Details Page', () => {
+  const clusterName = 'my-cluster';
+  const connectName = 'my-connect';
+  const connectorName = 'my-connector';
+  const defaultPath = clusterConnectConnectorPath(
+    clusterName,
+    connectName,
+    connectorName
+  );
+
+  const renderComponent = (path: string = defaultPath) =>
+    render(
+      <WithRoute path={getNonExactPath(clusterConnectConnectorPath())}>
+        <DetailsPage />
+      </WithRoute>,
+      { initialEntries: [path] }
+    );
+
+  it('renders actions', () => {
+    renderComponent();
+    expect(screen.getByText(DetailsCompText.actions));
+  });
+
+  describe('Router component tests', () => {
+    it('should test if overview is rendering', () => {
+      renderComponent();
+      expect(screen.getByText(DetailsCompText.overview));
+    });
+
+    it('should test if tasks is rendering', () => {
+      const path = clusterConnectConnectorTasksPath(
+        clusterName,
+        connectName,
+        connectorName
+      );
+      renderComponent(path);
+      expect(screen.getByText(DetailsCompText.tasks));
+    });
+
+    it('should test if list is rendering', () => {
+      const path = clusterConnectConnectorConfigPath(
+        clusterName,
+        connectName,
+        connectorName
+      );
+      renderComponent(path);
+      expect(screen.getByText(DetailsCompText.config));
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Connect/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Connect/Edit/Edit.tsx
index c2b86ed3b22..60c7c1370a9 100644
--- a/kafka-ui-react-app/src/components/Connect/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Edit/Edit.tsx
@@ -4,20 +4,17 @@ import useAppParams from 'lib/hooks/useAppParams';
 import { Controller, useForm } from 'react-hook-form';
 import { ErrorMessage } from '@hookform/error-message';
 import { yupResolver } from '@hookform/resolvers/yup';
-import {
-  ClusterName,
-  ConnectName,
-  ConnectorConfig,
-  ConnectorName,
-} from 'redux/interfaces';
 import {
   clusterConnectConnectorConfigPath,
   RouterParamsClusterConnectConnector,
 } from 'lib/paths';
 import yup from 'lib/yupExtended';
 import Editor from 'components/common/Editor/Editor';
-import PageLoader from 'components/common/PageLoader/PageLoader';
 import { Button } from 'components/common/Button/Button';
+import {
+  useConnectorConfig,
+  useUpdateConnectorConfig,
+} from 'lib/hooks/api/kafkaConnect';
 
 import {
   ConnectEditWarningMessageStyled,
@@ -32,31 +29,12 @@ interface FormValues {
   config: string;
 }
 
-export interface EditProps {
-  fetchConfig(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }): Promise<unknown>;
-  isConfigFetching: boolean;
-  config: ConnectorConfig | null;
-  updateConfig(payload: {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-    connectorConfig: ConnectorConfig;
-  }): Promise<unknown>;
-}
-
-const Edit: React.FC<EditProps> = ({
-  fetchConfig,
-  isConfigFetching,
-  config,
-  updateConfig,
-}) => {
-  const { clusterName, connectName, connectorName } =
-    useAppParams<RouterParamsClusterConnectConnector>();
+const Edit: React.FC = () => {
+  const routerParams = useAppParams<RouterParamsClusterConnectConnector>();
   const navigate = useNavigate();
+  const { data: config } = useConnectorConfig(routerParams);
+  const mutation = useUpdateConnectorConfig(routerParams);
+
   const {
     handleSubmit,
     control,
@@ -70,10 +48,6 @@ const Edit: React.FC<EditProps> = ({
     },
   });
 
-  React.useEffect(() => {
-    fetchConfig({ clusterName, connectName, connectorName });
-  }, [fetchConfig, clusterName, connectName, connectorName]);
-
   React.useEffect(() => {
     if (config) {
       setValue('config', JSON.stringify(config, null, '\t'));
@@ -81,25 +55,20 @@ const Edit: React.FC<EditProps> = ({
   }, [config, setValue]);
 
   const onSubmit = async (values: FormValues) => {
-    const connector = await updateConfig({
-      clusterName,
-      connectName,
-      connectorName,
-      connectorConfig: JSON.parse(values.config.trim()),
-    });
+    const requestBody = JSON.parse(values.config.trim());
+    const connector = await mutation.mutateAsync(requestBody);
+
     if (connector) {
       navigate(
         clusterConnectConnectorConfigPath(
-          clusterName,
-          connectName,
-          connectorName
+          routerParams.clusterName,
+          routerParams.connectName,
+          routerParams.connectorName
         )
       );
     }
   };
 
-  if (isConfigFetching) return <PageLoader />;
-
   const hasCredentials = JSON.stringify(config, null, '\t').includes(
     '"******"'
   );
diff --git a/kafka-ui-react-app/src/components/Connect/Edit/EditContainer.ts b/kafka-ui-react-app/src/components/Connect/Edit/EditContainer.ts
deleted file mode 100644
index 5c3dd2d3232..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Edit/EditContainer.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import {
-  fetchConnectorConfig,
-  updateConnectorConfig,
-} from 'redux/reducers/connect/connectSlice';
-import {
-  getConnectorConfig,
-  getIsConnectorConfigFetching,
-} from 'redux/reducers/connect/selectors';
-
-import Edit from './Edit';
-
-const mapStateToProps = (state: RootState) => ({
-  isConfigFetching: getIsConnectorConfigFetching(state),
-  config: getConnectorConfig(state),
-});
-
-const mapDispatchToProps = {
-  fetchConfig: fetchConnectorConfig,
-  updateConfig: updateConnectorConfig,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Edit);
diff --git a/kafka-ui-react-app/src/components/Connect/Edit/__tests__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Connect/Edit/__tests__/Edit.spec.tsx
index c17637c7920..6adbd223996 100644
--- a/kafka-ui-react-app/src/components/Connect/Edit/__tests__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Edit/__tests__/Edit.spec.tsx
@@ -4,12 +4,14 @@ import {
   clusterConnectConnectorConfigPath,
   clusterConnectConnectorEditPath,
 } from 'lib/paths';
-import Edit, { EditProps } from 'components/Connect/Edit/Edit';
-import { connector } from 'redux/reducers/connect/__test__/fixtures';
+import Edit from 'components/Connect/Edit/Edit';
+import { connector } from 'lib/fixtures/kafkaConnect';
 import { waitFor } from '@testing-library/dom';
 import { act, fireEvent, screen } from '@testing-library/react';
-
-jest.mock('components/common/PageLoader/PageLoader', () => 'mock-PageLoader');
+import {
+  useConnectorConfig,
+  useUpdateConnectorConfig,
+} from 'lib/hooks/api/kafkaConnect';
 
 jest.mock('components/common/Editor/Editor', () => 'mock-Editor');
 
@@ -18,23 +20,23 @@ jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useNavigate: () => mockHistoryPush,
 }));
+jest.mock('lib/hooks/api/kafkaConnect', () => ({
+  useConnectorConfig: jest.fn(),
+  useUpdateConnectorConfig: jest.fn(),
+}));
+
+const [clusterName, connectName, connectorName] = [
+  'my-cluster',
+  'my-connect',
+  'my-connector',
+];
 
 describe('Edit', () => {
   const pathname = clusterConnectConnectorEditPath();
-  const clusterName = 'my-cluster';
-  const connectName = 'my-connect';
-  const connectorName = 'my-connector';
-
-  const renderComponent = (props: Partial<EditProps> = {}) =>
+  const renderComponent = () =>
     render(
       <WithRoute path={pathname}>
-        <Edit
-          fetchConfig={jest.fn()}
-          isConfigFetching={false}
-          config={connector.config}
-          updateConfig={jest.fn()}
-          {...props}
-        />
+        <Edit />
       </WithRoute>,
       {
         initialEntries: [
@@ -47,34 +49,23 @@ describe('Edit', () => {
       }
     );
 
-  it('fetches config on mount', async () => {
-    const fetchConfig = jest.fn();
-    await waitFor(() => renderComponent({ fetchConfig }));
-    expect(fetchConfig).toHaveBeenCalledTimes(1);
-    expect(fetchConfig).toHaveBeenCalledWith({
-      clusterName,
-      connectName,
-      connectorName,
-    });
+  beforeEach(() => {
+    (useConnectorConfig as jest.Mock).mockImplementation(() => ({
+      data: connector.config,
+    }));
   });
 
-  it('calls updateConfig on form submit', async () => {
-    const updateConfig = jest.fn();
-    await waitFor(() => renderComponent({ updateConfig }));
-    fireEvent.submit(screen.getByRole('form'));
-    await waitFor(() => expect(updateConfig).toHaveBeenCalledTimes(1));
-    expect(updateConfig).toHaveBeenCalledWith({
-      clusterName,
-      connectName,
-      connectorName,
-      connectorConfig: connector.config,
+  it('calls updateConfig and redirects to connector config view on successful submit', async () => {
+    const updateConfig = jest.fn(() => {
+      return Promise.resolve(connector);
     });
-  });
+    (useUpdateConnectorConfig as jest.Mock).mockImplementation(() => ({
+      mutateAsync: updateConfig,
+    }));
 
-  it('redirects to connector config view on successful submit', async () => {
-    const updateConfig = jest.fn().mockResolvedValueOnce(connector);
-    await waitFor(() => renderComponent({ updateConfig }));
+    renderComponent();
     fireEvent.submit(screen.getByRole('form'));
+    await waitFor(() => expect(updateConfig).toHaveBeenCalledTimes(1));
 
     await waitFor(() => expect(mockHistoryPush).toHaveBeenCalledTimes(1));
     expect(mockHistoryPush).toHaveBeenCalledWith(
@@ -83,8 +74,13 @@ describe('Edit', () => {
   });
 
   it('does not redirect to connector config view on unsuccessful submit', async () => {
-    const updateConfig = jest.fn().mockResolvedValueOnce(undefined);
-    await waitFor(() => renderComponent({ updateConfig }));
+    const updateConfig = jest.fn(() => {
+      return Promise.resolve();
+    });
+    (useUpdateConnectorConfig as jest.Mock).mockImplementation(() => ({
+      mutateAsync: updateConfig,
+    }));
+    renderComponent();
     await act(() => {
       fireEvent.submit(screen.getByRole('form'));
     });
diff --git a/kafka-ui-react-app/src/components/Connect/List/List.tsx b/kafka-ui-react-app/src/components/Connect/List/List.tsx
index 0ea1f4e6c07..03f212c7f23 100644
--- a/kafka-ui-react-app/src/components/Connect/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/List.tsx
@@ -1,140 +1,47 @@
 import React from 'react';
 import useAppParams from 'lib/hooks/useAppParams';
-import { Connect, FullConnectorInfo } from 'generated-sources';
-import { ClusterName, ConnectorSearch } from 'redux/interfaces';
-import { clusterConnectorNewRelativePath, ClusterNameRoute } from 'lib/paths';
-import ClusterContext from 'components/contexts/ClusterContext';
-import PageLoader from 'components/common/PageLoader/PageLoader';
-import Search from 'components/common/Search/Search';
-import * as Metrics from 'components/common/Metrics';
-import PageHeading from 'components/common/PageHeading/PageHeading';
-import { Button } from 'components/common/Button/Button';
-import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
+import { ClusterNameRoute } from 'lib/paths';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
+import useSearch from 'lib/hooks/useSearch';
+import { useConnectors } from 'lib/hooks/api/kafkaConnect';
 
 import ListItem from './ListItem';
 
-export interface ListProps {
-  areConnectsFetching: boolean;
-  areConnectorsFetching: boolean;
-  connectors: FullConnectorInfo[];
-  connects: Connect[];
-  failedConnectors: FullConnectorInfo[];
-  failedTasks: number | undefined;
-  fetchConnects(clusterName: ClusterName): void;
-  fetchConnectors({ clusterName }: { clusterName: ClusterName }): void;
-  search: string;
-  setConnectorSearch(value: ConnectorSearch): void;
-}
-
-const List: React.FC<ListProps> = ({
-  connectors,
-  areConnectsFetching,
-  areConnectorsFetching,
-  failedConnectors,
-  failedTasks,
-  fetchConnects,
-  fetchConnectors,
-  search,
-  setConnectorSearch,
-}) => {
-  const { isReadOnly } = React.useContext(ClusterContext);
+const List: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
-
-  React.useEffect(() => {
-    fetchConnects(clusterName);
-    fetchConnectors({ clusterName });
-  }, [fetchConnects, fetchConnectors, clusterName]);
-
-  const handleSearch = (value: string) =>
-    setConnectorSearch({
-      clusterName,
-      search: value,
-    });
+  const [search] = useSearch();
+  const { data: connectors } = useConnectors(clusterName, search);
 
   return (
-    <>
-      <PageHeading text="Connectors">
-        {!isReadOnly && (
-          <Button
-            buttonType="primary"
-            buttonSize="M"
-            to={clusterConnectorNewRelativePath}
-          >
-            Create Connector
-          </Button>
+    <Table isFullwidth>
+      <thead>
+        <tr>
+          <TableHeaderCell title="Name" />
+          <TableHeaderCell title="Connect" />
+          <TableHeaderCell title="Type" />
+          <TableHeaderCell title="Plugin" />
+          <TableHeaderCell title="Topics" />
+          <TableHeaderCell title="Status" />
+          <TableHeaderCell title="Running Tasks" />
+          <TableHeaderCell> </TableHeaderCell>
+        </tr>
+      </thead>
+      <tbody>
+        {(!connectors || connectors.length) === 0 && (
+          <tr>
+            <td colSpan={10}>No connectors found</td>
+          </tr>
         )}
-      </PageHeading>
-      <Metrics.Wrapper>
-        <Metrics.Section>
-          <Metrics.Indicator
-            label="Connectors"
-            title="Connectors"
-            fetching={areConnectsFetching}
-          >
-            {connectors.length}
-          </Metrics.Indicator>
-          <Metrics.Indicator
-            label="Failed Connectors"
-            title="Failed Connectors"
-            fetching={areConnectsFetching}
-          >
-            {failedConnectors?.length}
-          </Metrics.Indicator>
-          <Metrics.Indicator
-            label="Failed Tasks"
-            title="Failed Tasks"
-            fetching={areConnectsFetching}
-          >
-            {failedTasks}
-          </Metrics.Indicator>
-        </Metrics.Section>
-      </Metrics.Wrapper>
-      <ControlPanelWrapper hasInput>
-        <Search
-          handleSearch={handleSearch}
-          placeholder="Search by Connect Name, Status or Type"
-          value={search}
-        />
-      </ControlPanelWrapper>
-      {areConnectorsFetching ? (
-        <PageLoader />
-      ) : (
-        <div>
-          <Table isFullwidth>
-            <thead>
-              <tr>
-                <TableHeaderCell title="Name" />
-                <TableHeaderCell title="Connect" />
-                <TableHeaderCell title="Type" />
-                <TableHeaderCell title="Plugin" />
-                <TableHeaderCell title="Topics" />
-                <TableHeaderCell title="Status" />
-                <TableHeaderCell title="Running Tasks" />
-                <TableHeaderCell> </TableHeaderCell>
-              </tr>
-            </thead>
-            <tbody>
-              {connectors.length === 0 && (
-                <tr>
-                  <td colSpan={10}>No connectors found</td>
-                </tr>
-              )}
-              {connectors.map((connector) => (
-                <ListItem
-                  key={[connector.name, connector.connect, clusterName].join(
-                    '-'
-                  )}
-                  connector={connector}
-                  clusterName={clusterName}
-                />
-              ))}
-            </tbody>
-          </Table>
-        </div>
-      )}
-    </>
+        {connectors?.map((connector) => (
+          <ListItem
+            key={connector.name}
+            connector={connector}
+            clusterName={clusterName}
+          />
+        ))}
+      </tbody>
+    </Table>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Connect/List/ListContainer.ts b/kafka-ui-react-app/src/components/Connect/List/ListContainer.ts
deleted file mode 100644
index dbd7a717716..00000000000
--- a/kafka-ui-react-app/src/components/Connect/List/ListContainer.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import {
-  fetchConnects,
-  fetchConnectors,
-  setConnectorSearch,
-} from 'redux/reducers/connect/connectSlice';
-import {
-  getConnects,
-  getConnectors,
-  getAreConnectsFetching,
-  getAreConnectorsFetching,
-  getConnectorSearch,
-  getFailedConnectors,
-  getSortedTopics,
-  getFailedTasks,
-} from 'redux/reducers/connect/selectors';
-import List from 'components/Connect/List/List';
-
-const mapStateToProps = (state: RootState) => ({
-  areConnectsFetching: getAreConnectsFetching(state),
-  areConnectorsFetching: getAreConnectorsFetching(state),
-  connects: getConnects(state),
-  failedConnectors: getFailedConnectors(state),
-  sortedTopics: getSortedTopics(state),
-  failedTasks: getFailedTasks(state),
-  connectors: getConnectors(state),
-  search: getConnectorSearch(state),
-});
-
-const mapDispatchToProps = {
-  fetchConnects,
-  fetchConnectors,
-  setConnectorSearch,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(List);
diff --git a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
index 50f8242e23e..80a8a61523a 100644
--- a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
@@ -3,8 +3,6 @@ import { FullConnectorInfo } from 'generated-sources';
 import { clusterConnectConnectorPath, clusterTopicPath } from 'lib/paths';
 import { ClusterName } from 'redux/interfaces';
 import { Link, NavLink } from 'react-router-dom';
-import { useDispatch } from 'react-redux';
-import { deleteConnector } from 'redux/reducers/connect/connectSlice';
 import Dropdown from 'components/common/Dropdown/Dropdown';
 import DropdownItem from 'components/common/Dropdown/DropdownItem';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
@@ -12,6 +10,8 @@ import { Tag } from 'components/common/Tag/Tag.styled';
 import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
 import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
 import getTagColor from 'components/common/Tag/getTagColor';
+import useModal from 'lib/hooks/useModal';
+import { useDeleteConnector } from 'lib/hooks/api/kafkaConnect';
 
 import * as S from './List.styled';
 
@@ -33,23 +33,16 @@ const ListItem: React.FC<ListItemProps> = ({
     failedTasksCount,
   },
 }) => {
-  const dispatch = useDispatch();
-  const [
-    isDeleteConnectorConfirmationVisible,
-    setDeleteConnectorConfirmationVisible,
-  ] = React.useState(false);
+  const { isOpen, setClose, setOpen } = useModal();
+  const deleteMutation = useDeleteConnector({
+    clusterName,
+    connectName: connect,
+    connectorName: name,
+  });
 
-  const handleDelete = () => {
-    if (clusterName && connect && name) {
-      dispatch(
-        deleteConnector({
-          clusterName,
-          connectName: connect,
-          connectorName: name,
-        })
-      );
-    }
-    setDeleteConnectorConfirmationVisible(false);
+  const handleDelete = async () => {
+    await deleteMutation.mutateAsync();
+    setClose();
   };
 
   const runningTasks = React.useMemo(() => {
@@ -87,17 +80,14 @@ const ListItem: React.FC<ListItemProps> = ({
       <td>
         <div>
           <Dropdown label={<VerticalElipsisIcon />} right up>
-            <DropdownItem
-              onClick={() => setDeleteConnectorConfirmationVisible(true)}
-              danger
-            >
+            <DropdownItem onClick={setOpen} danger>
               Remove Connector
             </DropdownItem>
           </Dropdown>
         </div>
         <ConfirmationModal
-          isOpen={isDeleteConnectorConfirmationVisible}
-          onCancel={() => setDeleteConnectorConfirmationVisible(false)}
+          isOpen={isOpen}
+          onCancel={setClose}
           onConfirm={handleDelete}
         >
           Are you sure want to remove <b>{name}</b> connector?
diff --git a/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx b/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx
new file mode 100644
index 00000000000..4834c85425b
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx
@@ -0,0 +1,86 @@
+import React, { Suspense } from 'react';
+import useAppParams from 'lib/hooks/useAppParams';
+import { clusterConnectorNewRelativePath, ClusterNameRoute } from 'lib/paths';
+import ClusterContext from 'components/contexts/ClusterContext';
+import Search from 'components/common/Search/Search';
+import * as Metrics from 'components/common/Metrics';
+import PageHeading from 'components/common/PageHeading/PageHeading';
+import { Button } from 'components/common/Button/Button';
+import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
+import useSearch from 'lib/hooks/useSearch';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+import { ConnectorState } from 'generated-sources';
+import { useConnectors } from 'lib/hooks/api/kafkaConnect';
+
+import List from './List';
+
+const ListPage: React.FC = () => {
+  const { isReadOnly } = React.useContext(ClusterContext);
+  const { clusterName } = useAppParams<ClusterNameRoute>();
+  const [search, handleSearch] = useSearch();
+
+  // Fetches all connectors from the API, without search criteria. Used to display general metrics.
+  const { data: connectorsMetrics, isLoading } = useConnectors(clusterName);
+
+  const numberOfFailedConnectors = connectorsMetrics?.filter(
+    ({ status: { state } }) => state === ConnectorState.FAILED
+  ).length;
+
+  const numberOfFailedTasks = connectorsMetrics?.reduce(
+    (acc, metric) => acc + (metric.failedTasksCount ?? 0),
+    0
+  );
+
+  return (
+    <>
+      <PageHeading text="Connectors">
+        {!isReadOnly && (
+          <Button
+            buttonType="primary"
+            buttonSize="M"
+            to={clusterConnectorNewRelativePath}
+          >
+            Create Connector
+          </Button>
+        )}
+      </PageHeading>
+      <Metrics.Wrapper>
+        <Metrics.Section>
+          <Metrics.Indicator
+            label="Connectors"
+            title="Total number of connectors"
+            fetching={isLoading}
+          >
+            {connectorsMetrics?.length || '-'}
+          </Metrics.Indicator>
+          <Metrics.Indicator
+            label="Failed Connectors"
+            title="Number of failed connectors"
+            fetching={isLoading}
+          >
+            {numberOfFailedConnectors ?? '-'}
+          </Metrics.Indicator>
+          <Metrics.Indicator
+            label="Failed Tasks"
+            title="Number of failed tasks"
+            fetching={isLoading}
+          >
+            {numberOfFailedTasks ?? '-'}
+          </Metrics.Indicator>
+        </Metrics.Section>
+      </Metrics.Wrapper>
+      <ControlPanelWrapper hasInput>
+        <Search
+          handleSearch={handleSearch}
+          placeholder="Search by Connect Name, Status or Type"
+          value={search}
+        />
+      </ControlPanelWrapper>
+      <Suspense fallback={<PageLoader />}>
+        <List />
+      </Suspense>
+    </>
+  );
+};
+
+export default ListPage;
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
index bb8fb3cfa67..b9d697b8834 100644
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
@@ -1,101 +1,56 @@
 import React from 'react';
-import {
-  connectors,
-  failedConnectors,
-} from 'redux/reducers/connect/__test__/fixtures';
+import { connectors } from 'lib/fixtures/kafkaConnect';
 import ClusterContext, {
   ContextProps,
   initialValue,
 } from 'components/contexts/ClusterContext';
-import ListContainer from 'components/Connect/List/ListContainer';
-import List, { ListProps } from 'components/Connect/List/List';
-import { act, screen } from '@testing-library/react';
-import { render } from 'lib/testHelpers';
+import List from 'components/Connect/List/List';
+import { screen } from '@testing-library/react';
+import { render, WithRoute } from 'lib/testHelpers';
+import fetchMock from 'fetch-mock';
+import { clusterConnectorsPath } from 'lib/paths';
+import { useConnectors } from 'lib/hooks/api/kafkaConnect';
+
+jest.mock('components/Connect/List/ListItem', () => () => (
+  <tr>
+    <td>List Item</td>
+  </tr>
+));
+jest.mock('lib/hooks/api/kafkaConnect', () => ({
+  useConnectors: jest.fn(),
+}));
+
+const clusterName = 'local';
 
 describe('Connectors List', () => {
-  describe('Container', () => {
-    it('renders view with initial state of storage', async () => {
-      await act(() => {
-        render(<ListContainer />);
-      });
-      expect(screen.getByRole('heading')).toHaveTextContent('Connectors');
-    });
+  afterEach(() => fetchMock.restore());
+
+  const renderComponent = (contextValue: ContextProps = initialValue) =>
+    render(
+      <ClusterContext.Provider value={contextValue}>
+        <WithRoute path={clusterConnectorsPath()}>
+          <List />
+        </WithRoute>
+      </ClusterContext.Provider>,
+      { initialEntries: [clusterConnectorsPath(clusterName)] }
+    );
+
+  it('renders empty connectors Table', async () => {
+    (useConnectors as jest.Mock).mockImplementation(() => ({
+      data: [],
+    }));
+
+    await renderComponent();
+    expect(screen.getByRole('table')).toBeInTheDocument();
+    expect(screen.getByText('No connectors found')).toBeInTheDocument();
   });
 
-  describe('View', () => {
-    const fetchConnects = jest.fn();
-    const fetchConnectors = jest.fn();
-    const setConnectorSearch = jest.fn();
-    const renderComponent = (
-      props: Partial<ListProps> = {},
-      contextValue: ContextProps = initialValue
-    ) => {
-      render(
-        <ClusterContext.Provider value={contextValue}>
-          <List
-            areConnectorsFetching
-            areConnectsFetching
-            connectors={[]}
-            failedConnectors={[]}
-            failedTasks={0}
-            connects={[]}
-            fetchConnects={fetchConnects}
-            fetchConnectors={fetchConnectors}
-            search=""
-            setConnectorSearch={setConnectorSearch}
-            {...props}
-          />
-        </ClusterContext.Provider>
-      );
-    };
-
-    it('renders PageLoader', async () => {
-      await act(() => renderComponent({ areConnectorsFetching: true }));
-      expect(screen.getByRole('progressbar')).toBeInTheDocument();
-      expect(screen.queryByRole('row')).not.toBeInTheDocument();
-    });
-
-    it('renders table', () => {
-      renderComponent({ areConnectorsFetching: false });
-      expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
-      expect(screen.getByRole('table')).toBeInTheDocument();
-    });
-
-    it('renders connectors list', () => {
-      renderComponent({
-        areConnectorsFetching: false,
-        connectors,
-      });
-      expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
-      expect(screen.getByRole('table')).toBeInTheDocument();
-      expect(screen.getAllByRole('row').length).toEqual(3);
-    });
-
-    it('renders failed connectors list', () => {
-      renderComponent({
-        areConnectorsFetching: false,
-        failedConnectors,
-      });
-      expect(screen.queryByRole('PageLoader')).not.toBeInTheDocument();
-      expect(screen.getByTitle('Failed Connectors')).toBeInTheDocument();
-    });
-
-    it('handles fetchConnects and fetchConnectors', () => {
-      renderComponent();
-      expect(fetchConnects).toHaveBeenCalledTimes(1);
-      expect(fetchConnectors).toHaveBeenCalledTimes(1);
-    });
-
-    it('renders actions if cluster is not readonly', () => {
-      renderComponent({}, { ...initialValue, isReadOnly: false });
-      expect(screen.getByRole('button')).toBeInTheDocument();
-    });
-
-    describe('readonly cluster', () => {
-      it('does not render actions if cluster is readonly', () => {
-        renderComponent({}, { ...initialValue, isReadOnly: true });
-        expect(screen.queryByRole('button')).not.toBeInTheDocument();
-      });
-    });
+  it('renders connectors Table', async () => {
+    (useConnectors as jest.Mock).mockImplementation(() => ({
+      data: connectors,
+    }));
+    await renderComponent();
+    expect(screen.getByRole('table')).toBeInTheDocument();
+    expect(screen.getAllByText('List Item').length).toEqual(2);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx
index 6ecc8a5f186..bed5d08b8f7 100644
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx
@@ -1,18 +1,11 @@
 import React from 'react';
-import { connectors } from 'redux/reducers/connect/__test__/fixtures';
+import { connectors } from 'lib/fixtures/kafkaConnect';
 import ListItem, { ListItemProps } from 'components/Connect/List/ListItem';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
 
-const mockDeleteConnector = jest.fn(() => ({ type: 'test' }));
-
-jest.mock('redux/reducers/connect/connectSlice', () => ({
-  ...jest.requireActual('redux/reducers/connect/connectSlice'),
-  deleteConnector: () => mockDeleteConnector,
-}));
-
 jest.mock(
   'components/common/ConfirmationModal/ConfirmationModal',
   () => 'mock-ConfirmationModal'
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx
new file mode 100644
index 00000000000..e41e3fd4183
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx
@@ -0,0 +1,182 @@
+import React from 'react';
+import { connectors } from 'lib/fixtures/kafkaConnect';
+import ClusterContext, {
+  ContextProps,
+  initialValue,
+} from 'components/contexts/ClusterContext';
+import ListPage from 'components/Connect/List/ListPage';
+import { screen, within } from '@testing-library/react';
+import { render, WithRoute } from 'lib/testHelpers';
+import fetchMock from 'fetch-mock';
+import { clusterConnectorsPath } from 'lib/paths';
+import { useConnectors } from 'lib/hooks/api/kafkaConnect';
+
+jest.mock('components/Connect/List/List', () => () => (
+  <div>Connectors List</div>
+));
+
+jest.mock('lib/hooks/api/kafkaConnect', () => ({
+  useConnectors: jest.fn(),
+}));
+
+const clusterName = 'local';
+
+describe('Connectors List Page', () => {
+  afterEach(() => fetchMock.restore());
+
+  beforeEach(() => {
+    (useConnectors as jest.Mock).mockImplementation(() => ({
+      isLoading: false,
+      data: [],
+    }));
+  });
+
+  const renderComponent = async (contextValue: ContextProps = initialValue) =>
+    render(
+      <ClusterContext.Provider value={contextValue}>
+        <WithRoute path={clusterConnectorsPath()}>
+          <ListPage />
+        </WithRoute>
+      </ClusterContext.Provider>,
+      { initialEntries: [clusterConnectorsPath(clusterName)] }
+    );
+
+  describe('Heading', () => {
+    it('renders header without create button for readonly cluster', async () => {
+      await renderComponent({ ...initialValue, isReadOnly: true });
+      expect(
+        screen.getByRole('heading', { name: 'Connectors' })
+      ).toBeInTheDocument();
+      expect(
+        screen.queryByRole('link', { name: 'Create Connector' })
+      ).not.toBeInTheDocument();
+    });
+
+    it('renders header with create button for read/write cluster', async () => {
+      await renderComponent();
+      expect(
+        screen.getByRole('heading', { name: 'Connectors' })
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole('link', { name: 'Create Connector' })
+      ).toBeInTheDocument();
+    });
+  });
+
+  it('renders search input', async () => {
+    await renderComponent();
+    expect(
+      screen.getByPlaceholderText('Search by Connect Name, Status or Type')
+    ).toBeInTheDocument();
+  });
+
+  it('renders list', async () => {
+    await renderComponent();
+    expect(screen.getByText('Connectors List')).toBeInTheDocument();
+  });
+
+  describe('Metrics', () => {
+    it('renders indicators in loading state', async () => {
+      (useConnectors as jest.Mock).mockImplementation(() => ({
+        isLoading: true,
+        data: connectors,
+      }));
+
+      await renderComponent();
+      const metrics = screen.getByRole('group');
+      expect(metrics).toBeInTheDocument();
+      expect(within(metrics).getAllByRole('progressbar').length).toEqual(3);
+    });
+
+    it('renders indicators for empty list of connectors', async () => {
+      await renderComponent();
+      const metrics = screen.getByRole('group');
+      expect(metrics).toBeInTheDocument();
+
+      const connectorsIndicator = within(metrics).getByTitle(
+        'Total number of connectors'
+      );
+      expect(connectorsIndicator).toBeInTheDocument();
+      expect(connectorsIndicator).toHaveTextContent('Connectors -');
+
+      const failedConnectorsIndicator = within(metrics).getByTitle(
+        'Number of failed connectors'
+      );
+      expect(failedConnectorsIndicator).toBeInTheDocument();
+      expect(failedConnectorsIndicator).toHaveTextContent(
+        'Failed Connectors 0'
+      );
+
+      const failedTasksIndicator = within(metrics).getByTitle(
+        'Number of failed tasks'
+      );
+      expect(failedTasksIndicator).toBeInTheDocument();
+      expect(failedTasksIndicator).toHaveTextContent('Failed Tasks 0');
+    });
+
+    it('renders indicators when connectors list is undefined', async () => {
+      (useConnectors as jest.Mock).mockImplementation(() => ({
+        isFetching: false,
+        data: undefined,
+      }));
+
+      await renderComponent();
+      const metrics = screen.getByRole('group');
+      expect(metrics).toBeInTheDocument();
+
+      const connectorsIndicator = within(metrics).getByTitle(
+        'Total number of connectors'
+      );
+      expect(connectorsIndicator).toBeInTheDocument();
+      expect(connectorsIndicator).toHaveTextContent('Connectors -');
+
+      const failedConnectorsIndicator = within(metrics).getByTitle(
+        'Number of failed connectors'
+      );
+      expect(failedConnectorsIndicator).toBeInTheDocument();
+      expect(failedConnectorsIndicator).toHaveTextContent(
+        'Failed Connectors -'
+      );
+
+      const failedTasksIndicator = within(metrics).getByTitle(
+        'Number of failed tasks'
+      );
+      expect(failedTasksIndicator).toBeInTheDocument();
+      expect(failedTasksIndicator).toHaveTextContent('Failed Tasks -');
+    });
+
+    it('renders indicators list of connectors', async () => {
+      (useConnectors as jest.Mock).mockImplementation(() => ({
+        isLoading: false,
+        data: connectors,
+      }));
+
+      await renderComponent();
+
+      const metrics = screen.getByRole('group');
+      expect(metrics).toBeInTheDocument();
+
+      const connectorsIndicator = within(metrics).getByTitle(
+        'Total number of connectors'
+      );
+      expect(connectorsIndicator).toBeInTheDocument();
+      expect(connectorsIndicator).toHaveTextContent(
+        `Connectors ${connectors.length}`
+      );
+
+      const failedConnectorsIndicator = within(metrics).getByTitle(
+        'Number of failed connectors'
+      );
+      expect(failedConnectorsIndicator).toBeInTheDocument();
+      expect(failedConnectorsIndicator).toHaveTextContent(
+        'Failed Connectors 1'
+      );
+
+      const failedTasksIndicator = within(metrics).getByTitle(
+        'Number of failed tasks'
+      );
+      expect(failedTasksIndicator).toBeInTheDocument();
+      expect(failedTasksIndicator).toHaveTextContent('Failed Tasks 1');
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Connect/New/New.tsx b/kafka-ui-react-app/src/components/Connect/New/New.tsx
index 6abd51e61f3..a0070493a29 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/New.tsx
@@ -4,20 +4,18 @@ import useAppParams from 'lib/hooks/useAppParams';
 import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { ErrorMessage } from '@hookform/error-message';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { Connect } from 'generated-sources';
-import { ClusterName, ConnectName } from 'redux/interfaces';
 import { clusterConnectConnectorPath, ClusterNameRoute } from 'lib/paths';
 import yup from 'lib/yupExtended';
 import Editor from 'components/common/Editor/Editor';
-import PageLoader from 'components/common/PageLoader/PageLoader';
 import Select from 'components/common/Select/Select';
 import { FormError } from 'components/common/Input/Input.styled';
 import Input from 'components/common/Input/Input';
 import { Button } from 'components/common/Button/Button';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import { createConnector } from 'redux/reducers/connect/connectSlice';
-import { useAppDispatch } from 'lib/hooks/redux';
 import Heading from 'components/common/heading/Heading.styled';
+import { useConnects, useCreateConnector } from 'lib/hooks/api/kafkaConnect';
+import get from 'lodash/get';
+import { Connect } from 'generated-sources';
 
 import * as S from './New.styled';
 
@@ -26,32 +24,24 @@ const validationSchema = yup.object().shape({
   config: yup.string().required().isJsonObject(),
 });
 
-export interface NewProps {
-  fetchConnects(clusterName: ClusterName): unknown;
-  areConnectsFetching: boolean;
-  connects: Connect[];
-}
-
 interface FormValues {
-  connectName: ConnectName;
+  connectName: Connect['name'];
   name: string;
   config: string;
 }
 
-const New: React.FC<NewProps> = ({
-  fetchConnects,
-  areConnectsFetching,
-  connects,
-}) => {
+const New: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
-  const dispatch = useAppDispatch();
   const navigate = useNavigate();
 
+  const { data: connects } = useConnects(clusterName);
+  const mutation = useCreateConnector(clusterName);
+
   const methods = useForm<FormValues>({
     mode: 'onTouched',
     resolver: yupResolver(validationSchema),
     defaultValues: {
-      connectName: connects[0]?.name || '',
+      connectName: get(connects, '0.name', ''),
       name: '',
       config: '',
     },
@@ -64,10 +54,6 @@ const New: React.FC<NewProps> = ({
     setValue,
   } = methods;
 
-  React.useEffect(() => {
-    fetchConnects(clusterName);
-  }, [fetchConnects, clusterName]);
-
   React.useEffect(() => {
     if (connects && connects.length > 0 && !getValues().connectName) {
       setValue('connectName', connects[0].name);
@@ -75,16 +61,14 @@ const New: React.FC<NewProps> = ({
   }, [connects, getValues, setValue]);
 
   const onSubmit = async (values: FormValues) => {
-    const { connector } = await dispatch(
-      createConnector({
-        clusterName,
-        connectName: values.connectName,
-        newConnector: {
-          name: values.name,
-          config: JSON.parse(values.config.trim()),
-        },
-      })
-    ).unwrap();
+    const connector = await mutation.mutateAsync({
+      connectName: values.connectName,
+      newConnector: {
+        name: values.name,
+        config: JSON.parse(values.config.trim()),
+      },
+    });
+
     if (connector) {
       navigate(
         clusterConnectConnectorPath(
@@ -96,11 +80,7 @@ const New: React.FC<NewProps> = ({
     }
   };
 
-  if (areConnectsFetching) {
-    return <PageLoader />;
-  }
-
-  if (connects.length === 0) {
+  if (!connects || connects.length === 0) {
     return null;
   }
 
diff --git a/kafka-ui-react-app/src/components/Connect/New/NewContainer.ts b/kafka-ui-react-app/src/components/Connect/New/NewContainer.ts
deleted file mode 100644
index d691043b54d..00000000000
--- a/kafka-ui-react-app/src/components/Connect/New/NewContainer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { connect } from 'react-redux';
-import { fetchConnects } from 'redux/reducers/connect/connectSlice';
-import { RootState } from 'redux/interfaces';
-import {
-  getAreConnectsFetching,
-  getConnects,
-} from 'redux/reducers/connect/selectors';
-
-import New from './New';
-
-const mapStateToProps = (state: RootState) => ({
-  areConnectsFetching: getAreConnectsFetching(state),
-  connects: getConnects(state),
-});
-
-const mapDispatchToProps = {
-  fetchConnects,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(New);
diff --git a/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx b/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
index d12b7af3d86..bbb710a8af3 100644
--- a/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
@@ -4,14 +4,13 @@ import {
   clusterConnectConnectorPath,
   clusterConnectorNewPath,
 } from 'lib/paths';
-import New, { NewProps } from 'components/Connect/New/New';
-import { connects, connector } from 'redux/reducers/connect/__test__/fixtures';
+import New from 'components/Connect/New/New';
+import { connects, connector } from 'lib/fixtures/kafkaConnect';
 import { fireEvent, screen, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ControllerRenderProps } from 'react-hook-form';
-import * as redux from 'react-redux';
+import { useConnects, useCreateConnector } from 'lib/hooks/api/kafkaConnect';
 
-jest.mock('components/common/PageLoader/PageLoader', () => 'mock-PageLoader');
 jest.mock(
   'components/common/Editor/Editor',
   () => (props: ControllerRenderProps) => {
@@ -24,6 +23,10 @@ jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useNavigate: () => mockHistoryPush,
 }));
+jest.mock('lib/hooks/api/kafkaConnect', () => ({
+  useConnects: jest.fn(),
+  useCreateConnector: jest.fn(),
+}));
 
 describe('New', () => {
   const clusterName = 'my-cluster';
@@ -47,68 +50,43 @@ describe('New', () => {
     });
   };
 
-  const renderComponent = (props: Partial<NewProps> = {}) =>
+  const renderComponent = () =>
     render(
       <WithRoute path={clusterConnectorNewPath()}>
-        <New
-          fetchConnects={jest.fn()}
-          areConnectsFetching={false}
-          connects={connects}
-          {...props}
-        />
+        <New />
       </WithRoute>,
       { initialEntries: [clusterConnectorNewPath(clusterName)] }
     );
 
-  it('fetches connects on mount', async () => {
-    const fetchConnects = jest.fn();
-    await act(() => {
-      renderComponent({ fetchConnects });
-    });
-    expect(fetchConnects).toHaveBeenCalledTimes(1);
-    expect(fetchConnects).toHaveBeenCalledWith(clusterName);
-  });
-
-  it('calls createConnector on form submit', async () => {
-    const useDispatchSpy = jest.spyOn(redux, 'useDispatch');
-    const useDispatchMock = jest.fn(() => ({
-      unwrap: () => ({ connector }),
-    })) as jest.Mock;
-    useDispatchSpy.mockReturnValue(useDispatchMock);
-
-    renderComponent();
-    await simulateFormSubmit();
-
-    expect(useDispatchMock).toHaveBeenCalledTimes(1);
+  beforeEach(() => {
+    (useConnects as jest.Mock).mockImplementation(() => ({
+      data: connects,
+    }));
   });
 
-  it('redirects to connector details view on successful submit', async () => {
-    const route = clusterConnectConnectorPath(
-      clusterName,
-      connects[0].name,
-      connector.name
-    );
-
-    const useDispatchSpy = jest.spyOn(redux, 'useDispatch');
-    const useDispatchMock = jest.fn(() => ({
-      unwrap: () => ({ connector }),
-    })) as jest.Mock;
-    useDispatchSpy.mockReturnValue(useDispatchMock);
-
+  it('calls createConnector on form submit and redirects to the list page on success', async () => {
+    const createConnectorMock = jest.fn(() => {
+      return Promise.resolve(connector);
+    });
+    (useCreateConnector as jest.Mock).mockImplementation(() => ({
+      mutateAsync: createConnectorMock,
+    }));
     renderComponent();
-
     await simulateFormSubmit();
+    expect(createConnectorMock).toHaveBeenCalledTimes(1);
     expect(mockHistoryPush).toHaveBeenCalledTimes(1);
-    expect(mockHistoryPush).toHaveBeenCalledWith(route);
+    expect(mockHistoryPush).toHaveBeenCalledWith(
+      clusterConnectConnectorPath(clusterName, connects[0].name, connector.name)
+    );
   });
 
   it('does not redirect to connector details view on unsuccessful submit', async () => {
-    const useDispatchSpy = jest.spyOn(redux, 'useDispatch');
-    const useDispatchMock = jest.fn(async () => ({
-      unwrap: () => ({}),
-    })) as jest.Mock;
-    useDispatchSpy.mockReturnValue(useDispatchMock);
-
+    const createConnectorMock = jest.fn(() => {
+      return Promise.resolve();
+    });
+    (useCreateConnector as jest.Mock).mockImplementation(() => ({
+      mutateAsync: createConnectorMock,
+    }));
     renderComponent();
     await simulateFormSubmit();
     expect(mockHistoryPush).not.toHaveBeenCalled();
diff --git a/kafka-ui-react-app/src/components/Connect/__tests__/Connect.spec.tsx b/kafka-ui-react-app/src/components/Connect/__tests__/Connect.spec.tsx
index b1f1d2b185b..8d07b0ebb57 100644
--- a/kafka-ui-react-app/src/components/Connect/__tests__/Connect.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/__tests__/Connect.spec.tsx
@@ -13,22 +13,22 @@ import {
 } from 'lib/paths';
 
 const ConnectCompText = {
-  new: 'NewContainer',
-  list: 'ListContainer',
-  details: 'DetailsContainer',
-  edit: 'EditContainer',
+  new: 'New Page',
+  list: 'List Page',
+  details: 'Details Page',
+  edit: 'Edit Page',
 };
 
-jest.mock('components/Connect/New/NewContainer', () => () => (
+jest.mock('components/Connect/New/New', () => () => (
   <div>{ConnectCompText.new}</div>
 ));
-jest.mock('components/Connect/List/ListContainer', () => () => (
+jest.mock('components/Connect/List/ListPage', () => () => (
   <div>{ConnectCompText.list}</div>
 ));
-jest.mock('components/Connect/Details/DetailsContainer', () => () => (
+jest.mock('components/Connect/Details/DetailsPage', () => () => (
   <div>{ConnectCompText.details}</div>
 ));
-jest.mock('components/Connect/Edit/EditContainer', () => () => (
+jest.mock('components/Connect/Edit/Edit', () => () => (
   <div>{ConnectCompText.edit}</div>
 ));
 
@@ -41,7 +41,7 @@ describe('Connect', () => {
       { initialEntries: [pathname], store }
     );
 
-  it('renders ListContainer', () => {
+  it('renders ListPage', () => {
     renderComponent(
       clusterConnectorsPath('my-cluster'),
       clusterConnectorsPath()
@@ -49,7 +49,7 @@ describe('Connect', () => {
     expect(screen.getByText(ConnectCompText.list)).toBeInTheDocument();
   });
 
-  it('renders NewContainer', () => {
+  it('renders New Page', () => {
     renderComponent(
       clusterConnectorNewPath('my-cluster'),
       clusterConnectorsPath()
@@ -57,7 +57,7 @@ describe('Connect', () => {
     expect(screen.getByText(ConnectCompText.new)).toBeInTheDocument();
   });
 
-  it('renders DetailsContainer', () => {
+  it('renders Details Page', () => {
     renderComponent(
       clusterConnectConnectorPath('my-cluster', 'my-connect', 'my-connector'),
       clusterConnectsPath()
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
index 4c05bdbb474..7e303c98763 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
@@ -7,7 +7,7 @@ import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { NavLink } from 'react-router-dom';
 import { clusterTopicsPath } from 'lib/paths';
 import Switch from 'components/common/Switch/Switch';
-import useClusters from 'lib/hooks/api/useClusters';
+import { useClusters } from 'lib/hooks/api/clusters';
 import { ServerStatus } from 'generated-sources';
 
 import * as S from './ClustersWidget.styled';
diff --git a/kafka-ui-react-app/src/components/Nav/Nav.tsx b/kafka-ui-react-app/src/components/Nav/Nav.tsx
index 2142139514b..61fc903c220 100644
--- a/kafka-ui-react-app/src/components/Nav/Nav.tsx
+++ b/kafka-ui-react-app/src/components/Nav/Nav.tsx
@@ -1,4 +1,4 @@
-import useClusters from 'lib/hooks/api/useClusters';
+import { useClusters } from 'lib/hooks/api/clusters';
 import React from 'react';
 
 import ClusterMenu from './ClusterMenu';
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index 37d2a246cda..e7796f727fc 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -5,7 +5,6 @@ import configureStore from 'redux-mock-store';
 import { RootState } from 'redux/interfaces';
 import * as redux from 'react-redux';
 import { act, screen, waitFor } from '@testing-library/react';
-import fetchMock from 'fetch-mock-jest';
 import {
   clusterTopicCopyPath,
   clusterTopicNewPath,
@@ -58,10 +57,6 @@ const renderComponent = (path: string, store = storeMock) => {
 };
 
 describe('New', () => {
-  beforeEach(() => {
-    fetchMock.reset();
-  });
-
   afterEach(() => {
     mockNavigate.mockClear();
   });
diff --git a/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx b/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx
index 7be70696604..2a092fe824c 100644
--- a/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx
+++ b/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx
@@ -30,7 +30,15 @@ const Indicator: React.FC<PropsWithChildren<Props>> = ({
         )}
       </S.IndicatorTitle>
       <span>
-        {fetching ? <i className="fas fa-spinner fa-pulse" /> : children}
+        {fetching ? (
+          <i
+            className="fas fa-spinner fa-pulse"
+            role="progressbar"
+            aria-label="Loading"
+          />
+        ) : (
+          children
+        )}
       </span>
     </div>
   </S.IndicatorWrapper>
diff --git a/kafka-ui-react-app/src/components/common/Metrics/Section.tsx b/kafka-ui-react-app/src/components/common/Metrics/Section.tsx
index 9cc05b8bc06..64d5a2a76bb 100644
--- a/kafka-ui-react-app/src/components/common/Metrics/Section.tsx
+++ b/kafka-ui-react-app/src/components/common/Metrics/Section.tsx
@@ -7,7 +7,7 @@ interface Props {
 }
 
 const Section: React.FC<PropsWithChildren<Props>> = ({ title, children }) => (
-  <div>
+  <div role="group">
     {title && <S.SectionTitle>{title}</S.SectionTitle>}
     <S.IndicatorsWrapper>{children}</S.IndicatorsWrapper>
   </div>
diff --git a/kafka-ui-react-app/src/index.tsx b/kafka-ui-react-app/src/index.tsx
index e312a5d0827..b6a20cba2fb 100644
--- a/kafka-ui-react-app/src/index.tsx
+++ b/kafka-ui-react-app/src/index.tsx
@@ -2,14 +2,11 @@ import React from 'react';
 import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
-import { QueryClient, QueryClientProvider } from 'react-query';
 import App from 'components/App';
 import { store } from 'redux/store';
 import 'theme/index.scss';
 import 'lib/constants';
 
-const queryClient = new QueryClient();
-
 const container =
   document.getElementById('root') || document.createElement('div');
 const root = createRoot(container);
@@ -17,9 +14,7 @@ const root = createRoot(container);
 root.render(
   <Provider store={store}>
     <BrowserRouter basename={window.basePath || '/'}>
-      <QueryClientProvider client={queryClient}>
-        <App />
-      </QueryClientProvider>
+      <App />
     </BrowserRouter>
   </Provider>
 );
diff --git a/kafka-ui-react-app/src/redux/reducers/connect/__test__/fixtures.ts b/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts
similarity index 50%
rename from kafka-ui-react-app/src/redux/reducers/connect/__test__/fixtures.ts
rename to kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts
index 5fc7cad55df..91563a7dcec 100644
--- a/kafka-ui-react-app/src/redux/reducers/connect/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts
@@ -13,35 +13,6 @@ export const connects: Connect[] = [
   { name: 'second', address: 'localhost:8084' },
 ];
 
-export const connectorsServerPayload = [
-  {
-    connect: 'first',
-    name: 'hdfs-source-connector',
-    connector_class: 'FileStreamSource',
-    type: ConnectorType.SOURCE,
-    topics: ['a', 'b', 'c'],
-    status: {
-      state: ConnectorTaskStatus.RUNNING,
-      workerId: 1,
-    },
-    tasks_count: 2,
-    failed_tasks_count: 0,
-  },
-  {
-    connect: 'second',
-    name: 'hdfs2-source-connector',
-    connector_class: 'FileStreamSource',
-    type: ConnectorType.SINK,
-    topics: ['test-topic'],
-    status: {
-      state: ConnectorTaskStatus.FAILED,
-      workerId: 1,
-    },
-    tasks_count: 3,
-    failed_tasks_count: 1,
-  },
-];
-
 export const connectors: FullConnectorInfo[] = [
   {
     connect: 'first',
@@ -69,50 +40,6 @@ export const connectors: FullConnectorInfo[] = [
   },
 ];
 
-export const failedConnectors: FullConnectorInfo[] = [
-  {
-    connect: 'first',
-    name: 'hdfs-source-connector',
-    connectorClass: 'FileStreamSource',
-    type: ConnectorType.SOURCE,
-    topics: ['a', 'b', 'c'],
-    status: {
-      state: ConnectorState.FAILED,
-    },
-    tasksCount: 2,
-    failedTasksCount: 0,
-  },
-  {
-    connect: 'second',
-    name: 'hdfs2-source-connector',
-    connectorClass: 'FileStreamSource',
-    type: ConnectorType.SINK,
-    topics: ['a', 'b', 'c'],
-    status: {
-      state: ConnectorState.FAILED,
-    },
-    tasksCount: 3,
-    failedTasksCount: 1,
-  },
-];
-
-export const connectorServerPayload = {
-  connect: 'first',
-  name: 'hdfs-source-connector',
-  type: ConnectorType.SOURCE,
-  status: {
-    state: ConnectorTaskStatus.RUNNING,
-    worker_id: 'kafka-connect0:8083',
-  },
-  config: {
-    'connector.class': 'FileStreamSource',
-    'tasks.max': '10',
-    topic: 'test-topic',
-    file: '/some/file',
-  },
-  tasks: [{ connector: 'first', task: 1 }],
-};
-
 export const connector: Connector = {
   connect: 'first',
   name: 'hdfs-source-connector',
@@ -130,13 +57,13 @@ export const connector: Connector = {
   tasks: [{ connector: 'first', task: 1 }],
 };
 
-export const tasksServerPayload = [
+export const tasks: Task[] = [
   {
     id: { connector: 'first', task: 1 },
     status: {
       id: 1,
       state: ConnectorTaskStatus.RUNNING,
-      worker_id: 'kafka-connect0:8083',
+      workerId: 'kafka-connect0:8083',
     },
     config: {
       'batch.size': '2000',
@@ -151,7 +78,7 @@ export const tasksServerPayload = [
       id: 2,
       state: ConnectorTaskStatus.FAILED,
       trace: 'Failure 1',
-      worker_id: 'kafka-connect0:8083',
+      workerId: 'kafka-connect0:8083',
     },
     config: {
       'batch.size': '1000',
@@ -165,7 +92,7 @@ export const tasksServerPayload = [
     status: {
       id: 3,
       state: ConnectorTaskStatus.RUNNING,
-      worker_id: 'kafka-connect0:8083',
+      workerId: 'kafka-connect0:8083',
     },
     config: {
       'batch.size': '3000',
@@ -174,43 +101,11 @@ export const tasksServerPayload = [
       topic: 'test-topic',
     },
   },
-];
-
-export const tasks: Task[] = [
   {
-    id: { connector: 'first', task: 1 },
-    status: {
-      id: 1,
-      state: ConnectorTaskStatus.RUNNING,
-      workerId: 'kafka-connect0:8083',
-    },
-    config: {
-      'batch.size': '2000',
-      file: '/some/file',
-      'task.class': 'org.apache.kafka.connect.file.FileStreamSourceTask',
-      topic: 'test-topic',
-    },
-  },
-  {
-    id: { connector: 'first', task: 2 },
-    status: {
-      id: 2,
-      state: ConnectorTaskStatus.FAILED,
-      trace: 'Failure 1',
-      workerId: 'kafka-connect0:8083',
-    },
-    config: {
-      'batch.size': '1000',
-      file: '/some/file2',
-      'task.class': 'org.apache.kafka.connect.file.FileStreamSourceTask',
-      topic: 'test-topic',
-    },
-  },
-  {
-    id: { connector: 'first', task: 3 },
+    id: { connector: 'first', task: 4 },
     status: {
       id: 3,
-      state: ConnectorTaskStatus.RUNNING,
+      state: ConnectorTaskStatus.PAUSED,
       workerId: 'kafka-connect0:8083',
     },
     config: {
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts
new file mode 100644
index 00000000000..bf024f5c68a
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts
@@ -0,0 +1,168 @@
+import { act, renderHook, waitFor } from '@testing-library/react';
+import { renderQueryHook, TestQueryClientProvider } from 'lib/testHelpers';
+import * as hooks from 'lib/hooks/api/kafkaConnect';
+import fetchMock from 'fetch-mock';
+import { connectors, connects, tasks } from 'lib/fixtures/kafkaConnect';
+import { UseQueryResult } from 'react-query';
+import { ConnectorAction } from 'generated-sources';
+
+const clusterName = 'test-cluster';
+const connectName = 'test-connect';
+const connectorName = 'test-connector';
+
+const connectsPath = `/api/clusters/${clusterName}/connects`;
+const connectorsPath = `/api/clusters/${clusterName}/connectors`;
+const connectorPath = `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}`;
+
+const connectorProps = {
+  clusterName,
+  connectName,
+  connectorName,
+};
+
+const expectQueryWorks = async (
+  mock: fetchMock.FetchMockStatic,
+  result: { current: UseQueryResult<unknown, unknown> }
+) => {
+  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
+  expect(mock.calls()).toHaveLength(1);
+  expect(result.current.data).toBeDefined();
+};
+
+describe('kafkaConnect hooks', () => {
+  beforeEach(() => fetchMock.restore());
+  describe('useConnects', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce(connectsPath, connects);
+      const { result } = renderQueryHook(() => hooks.useConnects(clusterName));
+      await expectQueryWorks(mock, result);
+    });
+  });
+  describe('useConnectors', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce(connectorsPath, connectors);
+      const { result } = renderQueryHook(() =>
+        hooks.useConnectors(clusterName)
+      );
+      await expectQueryWorks(mock, result);
+    });
+
+    it('returns the correct data for request with search criteria', async () => {
+      const search = 'test-search';
+      const mock = fetchMock.getOnce(
+        `${connectorsPath}?search=${search}`,
+        connectors
+      );
+      const { result } = renderQueryHook(() =>
+        hooks.useConnectors(clusterName, search)
+      );
+      await expectQueryWorks(mock, result);
+    });
+  });
+  describe('useConnector', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce(connectorPath, connectors[0]);
+      const { result } = renderQueryHook(() =>
+        hooks.useConnector(connectorProps)
+      );
+      await expectQueryWorks(mock, result);
+    });
+  });
+  describe('useConnectorTasks', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce(`${connectorPath}/tasks`, tasks);
+      const { result } = renderQueryHook(() =>
+        hooks.useConnectorTasks(connectorProps)
+      );
+      await expectQueryWorks(mock, result);
+    });
+  });
+  describe('useConnectorConfig', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce(`${connectorPath}/config`, {});
+      const { result } = renderQueryHook(() =>
+        hooks.useConnectorConfig(connectorProps)
+      );
+      await expectQueryWorks(mock, result);
+    });
+  });
+
+  describe('mutatations', () => {
+    describe('useUpdateConnectorState', () => {
+      it('returns the correct data', async () => {
+        const action = ConnectorAction.RESTART;
+        const uri = `${connectorPath}/action/${action}`;
+        const mock = fetchMock.postOnce(uri, connectors[0]);
+        const { result } = renderHook(
+          () => hooks.useUpdateConnectorState(connectorProps),
+          { wrapper: TestQueryClientProvider }
+        );
+        await act(() => result.current.mutateAsync(action));
+        await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+        expect(mock.calls()).toHaveLength(1);
+      });
+    });
+    describe('useRestartConnectorTask', () => {
+      it('returns the correct data', async () => {
+        const taskId = 123456;
+        const uri = `${connectorPath}/tasks/${taskId}/action/restart`;
+        const mock = fetchMock.postOnce(uri, {});
+        const { result } = renderHook(
+          () => hooks.useRestartConnectorTask(connectorProps),
+          { wrapper: TestQueryClientProvider }
+        );
+        await act(() => result.current.mutateAsync(taskId));
+        await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+        expect(mock.calls()).toHaveLength(1);
+      });
+    });
+    describe('useUpdateConnectorConfig', () => {
+      it('returns the correct data', async () => {
+        const mock = fetchMock.putOnce(`${connectorPath}/config`, {});
+        const { result } = renderHook(
+          () => hooks.useUpdateConnectorConfig(connectorProps),
+          { wrapper: TestQueryClientProvider }
+        );
+        await act(async () => {
+          await result.current.mutateAsync({ config: 1 });
+        });
+        await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+        expect(mock.calls()).toHaveLength(1);
+      });
+    });
+    describe('useCreateConnector', () => {
+      it('returns the correct data', async () => {
+        const mock = fetchMock.postOnce(
+          `${connectsPath}/${connectName}/connectors`,
+          {}
+        );
+        const { result } = renderHook(
+          () => hooks.useCreateConnector(clusterName),
+          { wrapper: TestQueryClientProvider }
+        );
+        await act(async () => {
+          await result.current.mutateAsync({
+            connectName,
+            newConnector: { name: connectorName, config: { a: 1 } },
+          });
+        });
+        await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+        expect(mock.calls()).toHaveLength(1);
+      });
+    });
+    describe('useDeleteConnector', () => {
+      it('returns the correct data', async () => {
+        const mock = fetchMock.deleteOnce(connectorPath, {});
+        const { result } = renderHook(
+          () => hooks.useDeleteConnector(connectorProps),
+          { wrapper: TestQueryClientProvider }
+        );
+        await act(async () => {
+          await result.current.mutateAsync();
+        });
+        await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+        expect(mock.calls()).toHaveLength(1);
+      });
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/brokers.ts b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
new file mode 100644
index 00000000000..f9582b859bf
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
@@ -0,0 +1,35 @@
+import { brokersApiClient as api } from 'lib/api';
+import { useQuery } from 'react-query';
+import { ClusterName } from 'redux/interfaces';
+
+export function useBrokers(clusterName: ClusterName) {
+  return useQuery(
+    ['clusters', clusterName, 'brokers'],
+    () => api.getBrokers({ clusterName }),
+    { refetchInterval: 5000 }
+  );
+}
+
+export function useBrokerMetrics(clusterName: ClusterName, brokerId: number) {
+  return useQuery(
+    ['clusters', clusterName, 'brokers', brokerId, 'metrics'],
+    () =>
+      api.getBrokersMetrics({
+        clusterName,
+        id: brokerId,
+      }),
+    { refetchInterval: 5000 }
+  );
+}
+
+export function useBrokerLogDirs(clusterName: ClusterName, brokerId: number) {
+  return useQuery(
+    ['clusters', clusterName, 'brokers', brokerId, 'logDirs'],
+    () =>
+      api.getAllBrokersLogdirs({
+        clusterName,
+        broker: [brokerId],
+      }),
+    { refetchInterval: 5000 }
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/clusters.ts b/kafka-ui-react-app/src/lib/hooks/api/clusters.ts
new file mode 100644
index 00000000000..9ff067d6b1f
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/clusters.ts
@@ -0,0 +1,14 @@
+import { clustersApiClient as api } from 'lib/api';
+import { useQuery } from 'react-query';
+import { ClusterName } from 'redux/interfaces';
+
+export function useClusters() {
+  return useQuery(['clusters'], () => api.getClusters());
+}
+export function useClusterStats(clusterName: ClusterName) {
+  return useQuery(
+    ['clusterStats', clusterName],
+    () => api.getClusterStats({ clusterName }),
+    { refetchInterval: 5000 }
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
new file mode 100644
index 00000000000..364b7618d88
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
@@ -0,0 +1,128 @@
+import {
+  Connect,
+  Connector,
+  ConnectorAction,
+  NewConnector,
+} from 'generated-sources';
+import { kafkaConnectApiClient as api } from 'lib/api';
+import sortBy from 'lodash/sortBy';
+import { useMutation, useQuery, useQueryClient } from 'react-query';
+import { ClusterName } from 'redux/interfaces';
+
+interface UseConnectorProps {
+  clusterName: ClusterName;
+  connectName: Connect['name'];
+  connectorName: Connector['name'];
+}
+interface CreateConnectorProps {
+  connectName: Connect['name'];
+  newConnector: NewConnector;
+}
+
+const connectsKey = (clusterName: ClusterName) => [
+  'clusters',
+  clusterName,
+  'connects',
+];
+const connectorsKey = (clusterName: ClusterName, search?: string) => {
+  const base = ['clusters', clusterName, 'connectors'];
+  if (search) {
+    return [...base, { search }];
+  }
+  return base;
+};
+const connectorKey = (props: UseConnectorProps) => [
+  'clusters',
+  props.clusterName,
+  'connects',
+  props.connectName,
+  'connectors',
+  props.connectorName,
+];
+const connectorTasksKey = (props: UseConnectorProps) => [
+  ...connectorKey(props),
+  'tasks',
+];
+const connectorConfigKey = (props: UseConnectorProps) => [
+  ...connectorKey(props),
+  'config',
+];
+
+export function useConnects(clusterName: ClusterName) {
+  return useQuery(connectsKey(clusterName), () =>
+    api.getConnects({ clusterName })
+  );
+}
+export function useConnectors(clusterName: ClusterName, search?: string) {
+  return useQuery(
+    connectorsKey(clusterName, search),
+    () => api.getAllConnectors({ clusterName, search }),
+    {
+      select: (data) => sortBy(data, 'name'),
+    }
+  );
+}
+export function useConnector(props: UseConnectorProps) {
+  return useQuery(connectorKey(props), () => api.getConnector(props));
+}
+export function useConnectorTasks(props: UseConnectorProps) {
+  return useQuery(
+    connectorTasksKey(props),
+    () => api.getConnectorTasks(props),
+    {
+      select: (data) => sortBy(data, 'status.id'),
+    }
+  );
+}
+export function useUpdateConnectorState(props: UseConnectorProps) {
+  const client = useQueryClient();
+  return useMutation(
+    (action: ConnectorAction) => api.updateConnectorState({ ...props, action }),
+    {
+      onSuccess: () => client.invalidateQueries(connectorKey(props)),
+    }
+  );
+}
+export function useRestartConnectorTask(props: UseConnectorProps) {
+  const client = useQueryClient();
+  return useMutation(
+    (taskId: number) => api.restartConnectorTask({ ...props, taskId }),
+    {
+      onSuccess: () => client.invalidateQueries(connectorTasksKey(props)),
+    }
+  );
+}
+export function useConnectorConfig(props: UseConnectorProps) {
+  return useQuery([...connectorKey(props), 'config'], () =>
+    api.getConnectorConfig(props)
+  );
+}
+export function useUpdateConnectorConfig(props: UseConnectorProps) {
+  const client = useQueryClient();
+  return useMutation(
+    (requestBody: Connector['config']) =>
+      api.setConnectorConfig({ ...props, requestBody }),
+    {
+      onSuccess: () => {
+        client.invalidateQueries(connectorKey(props));
+        client.invalidateQueries(connectorConfigKey(props));
+      },
+    }
+  );
+}
+export function useCreateConnector(clusterName: ClusterName) {
+  const client = useQueryClient();
+  return useMutation(
+    (props: CreateConnectorProps) =>
+      api.createConnector({ ...props, clusterName }),
+    {
+      onSuccess: () => client.invalidateQueries(connectorsKey(clusterName)),
+    }
+  );
+}
+export function useDeleteConnector(props: UseConnectorProps) {
+  const client = useQueryClient();
+  return useMutation(() => api.deleteConnector(props), {
+    onSuccess: () => client.invalidateQueries(connectorsKey(props.clusterName)),
+  });
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/useClusters.ts b/kafka-ui-react-app/src/lib/hooks/api/useClusters.ts
deleted file mode 100644
index d22f58981a2..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/api/useClusters.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { clustersApiClient } from 'lib/api';
-import { useQuery } from 'react-query';
-
-export default function useClusters() {
-  return useQuery(['clusters'], () => clustersApiClient.getClusters(), {
-    suspense: true,
-  });
-}
diff --git a/kafka-ui-react-app/src/lib/hooks/useBrokers.tsx b/kafka-ui-react-app/src/lib/hooks/useBrokers.tsx
deleted file mode 100644
index dc5511ee3ac..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/useBrokers.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { brokersApiClient } from 'lib/api';
-import { useQuery } from 'react-query';
-import { ClusterName } from 'redux/interfaces';
-
-export default function useBrokers(clusterName: ClusterName) {
-  return useQuery(
-    ['brokers', clusterName],
-    () => brokersApiClient.getBrokers({ clusterName }),
-    { suspense: true, refetchInterval: 5000 }
-  );
-}
diff --git a/kafka-ui-react-app/src/lib/hooks/useBrokersLogDirs.tsx b/kafka-ui-react-app/src/lib/hooks/useBrokersLogDirs.tsx
deleted file mode 100644
index e00ed4c966c..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/useBrokersLogDirs.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { brokersApiClient } from 'lib/api';
-import { useQuery } from 'react-query';
-import { ClusterName } from 'redux/interfaces';
-
-export default function useBrokersLogDirs(
-  clusterName: ClusterName,
-  brokerId: number
-) {
-  return useQuery(
-    ['logDirs', clusterName, brokerId],
-    () =>
-      brokersApiClient.getAllBrokersLogdirs({
-        clusterName,
-        broker: [brokerId],
-      }),
-    { suspense: true, refetchInterval: 5000 }
-  );
-}
diff --git a/kafka-ui-react-app/src/lib/hooks/useBrokersMetrics.tsx b/kafka-ui-react-app/src/lib/hooks/useBrokersMetrics.tsx
deleted file mode 100644
index 29fb3c91928..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/useBrokersMetrics.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { brokersApiClient } from 'lib/api';
-import { useQuery } from 'react-query';
-import { ClusterName } from 'redux/interfaces';
-
-export default function useBrokersMetrics(
-  clusterName: ClusterName,
-  brokerId: number
-) {
-  return useQuery(
-    ['metrics', clusterName, brokerId],
-    () =>
-      brokersApiClient.getBrokersMetrics({
-        clusterName,
-        id: brokerId,
-      }),
-    { suspense: true, refetchInterval: 5000 }
-  );
-}
diff --git a/kafka-ui-react-app/src/lib/hooks/useClusterStats.tsx b/kafka-ui-react-app/src/lib/hooks/useClusterStats.tsx
deleted file mode 100644
index 2a8ff5392a4..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/useClusterStats.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { clustersApiClient } from 'lib/api';
-import { useQuery } from 'react-query';
-import { ClusterName } from 'redux/interfaces';
-
-export default function useClusterStats(clusterName: ClusterName) {
-  return useQuery(
-    ['clusterStats', clusterName],
-    () => clustersApiClient.getClusterStats({ clusterName }),
-    { suspense: true, refetchInterval: 5000 }
-  );
-}
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 86b7e807a18..77f2c650b2c 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -1,8 +1,7 @@
+import { Connect, Connector } from 'generated-sources';
 import {
   BrokerId,
   ClusterName,
-  ConnectName,
-  ConnectorName,
   ConsumerGroupID,
   SchemaName,
   TopicName,
@@ -199,18 +198,18 @@ export const clusterConnectorNewPath = (
 ) => `${clusterConnectorsPath(clusterName)}/create-new`;
 export const clusterConnectConnectorsPath = (
   clusterName: ClusterName = RouteParams.clusterName,
-  connectName: ConnectName = RouteParams.connectName
+  connectName: Connect['name'] = RouteParams.connectName
 ) => `${clusterConnectsPath(clusterName)}/${connectName}/connectors`;
 export const clusterConnectConnectorPath = (
   clusterName: ClusterName = RouteParams.clusterName,
-  connectName: ConnectName = RouteParams.connectName,
-  connectorName: ConnectorName = RouteParams.connectorName
+  connectName: Connect['name'] = RouteParams.connectName,
+  connectorName: Connector['name'] = RouteParams.connectorName
 ) =>
   `${clusterConnectConnectorsPath(clusterName, connectName)}/${connectorName}`;
 export const clusterConnectConnectorEditPath = (
   clusterName: ClusterName = RouteParams.clusterName,
-  connectName: ConnectName = RouteParams.connectName,
-  connectorName: ConnectorName = RouteParams.connectorName
+  connectName: Connect['name'] = RouteParams.connectName,
+  connectorName: Connector['name'] = RouteParams.connectorName
 ) =>
   `${clusterConnectConnectorsPath(
     clusterName,
@@ -218,8 +217,8 @@ export const clusterConnectConnectorEditPath = (
   )}/${connectorName}/edit`;
 export const clusterConnectConnectorTasksPath = (
   clusterName: ClusterName = RouteParams.clusterName,
-  connectName: ConnectName = RouteParams.connectName,
-  connectorName: ConnectorName = RouteParams.connectorName
+  connectName: Connect['name'] = RouteParams.connectName,
+  connectorName: Connector['name'] = RouteParams.connectorName
 ) =>
   `${clusterConnectConnectorPath(
     clusterName,
@@ -228,18 +227,19 @@ export const clusterConnectConnectorTasksPath = (
   )}/${clusterConnectConnectorTasksRelativePath}`;
 export const clusterConnectConnectorConfigPath = (
   clusterName: ClusterName = RouteParams.clusterName,
-  connectName: ConnectName = RouteParams.connectName,
-  connectorName: ConnectorName = RouteParams.connectorName
+  connectName: Connect['name'] = RouteParams.connectName,
+  connectorName: Connector['name'] = RouteParams.connectorName
 ) =>
   `${clusterConnectConnectorPath(
     clusterName,
     connectName,
     connectorName
   )}/${clusterConnectConnectorConfigRelativePath}`;
+
 export type RouterParamsClusterConnectConnector = {
   clusterName: ClusterName;
-  connectName: ConnectName;
-  connectorName: ConnectorName;
+  connectName: Connect['name'];
+  connectorName: Connector['name'];
 };
 
 // KsqlDb
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index 18350e26c1c..e9d546bf370 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -8,13 +8,13 @@ import {
 import { Provider } from 'react-redux';
 import { ThemeProvider } from 'styled-components';
 import theme from 'theme/theme';
-import { render, RenderOptions, screen } from '@testing-library/react';
+import { render, renderHook, RenderOptions } from '@testing-library/react';
 import { AnyAction, Store } from 'redux';
 import { RootState } from 'redux/interfaces';
 import { configureStore } from '@reduxjs/toolkit';
 import rootReducer from 'redux/reducers';
 import mockStoreCreator from 'redux/store/configureStore/mockStoreCreator';
-import { QueryClient, QueryClientProvider } from 'react-query';
+import { QueryClient, QueryClientProvider, UseQueryResult } from 'react-query';
 
 interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
   preloadedState?: Partial<RootState>;
@@ -22,23 +22,12 @@ interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
   initialEntries?: MemoryRouterProps['initialEntries'];
 }
 
-export function getByTextContent(textMatch: string | RegExp): HTMLElement {
-  return screen.getByText((content, node) => {
-    const hasText = (nod: Element) => nod.textContent === textMatch;
-    const nodeHasText = hasText(node as Element);
-    const childrenDontHaveText = Array.from(node?.children || []).every(
-      (child) => !hasText(child)
-    );
-    return nodeHasText && childrenDontHaveText;
-  });
-}
-
-interface WithRouterProps {
+interface WithRouteProps {
   children: React.ReactNode;
   path: string;
 }
 
-export const WithRoute: React.FC<WithRouterProps> = ({ children, path }) => {
+export const WithRoute: React.FC<WithRouteProps> = ({ children, path }) => {
   return (
     <Routes>
       <Route path={path} element={children} />
@@ -46,6 +35,18 @@ export const WithRoute: React.FC<WithRouterProps> = ({ children, path }) => {
   );
 };
 
+export const TestQueryClientProvider: React.FC<PropsWithChildren<unknown>> = ({
+  children,
+}) => {
+  // use new QueryClient instance for each test run to avoid issues with cache
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false } },
+  });
+  return (
+    <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+  );
+};
+
 const customRender = (
   ui: ReactElement,
   {
@@ -58,30 +59,27 @@ const customRender = (
     ...renderOptions
   }: CustomRenderOptions = {}
 ) => {
-  // use new QueryClient instance for each test run to avoid issues with cache
-  const queryClient = new QueryClient({
-    defaultOptions: { queries: { retry: false } },
-  });
   // overrides @testing-library/react render.
   const AllTheProviders: React.FC<PropsWithChildren<unknown>> = ({
     children,
-  }) => {
-    return (
-      <ThemeProvider theme={theme}>
-        <Provider store={store}>
-          <QueryClientProvider client={queryClient}>
-            <MemoryRouter initialEntries={initialEntries}>
-              {children}
-            </MemoryRouter>
-          </QueryClientProvider>
-        </Provider>
-      </ThemeProvider>
-    );
-  };
+  }) => (
+    <ThemeProvider theme={theme}>
+      <Provider store={store}>
+        <TestQueryClientProvider>
+          <MemoryRouter initialEntries={initialEntries}>
+            {children}
+          </MemoryRouter>
+        </TestQueryClientProvider>
+      </Provider>
+    </ThemeProvider>
+  );
   return render(ui, { wrapper: AllTheProviders, ...renderOptions });
 };
 
-export { customRender as render };
+const customRenderHook = (hook: () => UseQueryResult<unknown, unknown>) =>
+  renderHook(hook, { wrapper: TestQueryClientProvider });
+
+export { customRender as render, customRenderHook as renderQueryHook };
 
 export class EventSourceMock {
   url: string;
@@ -106,8 +104,3 @@ export class EventSourceMock {
 export const getTypeAndPayload = (store: typeof mockStoreCreator) => {
   return store.getActions().map(({ type, payload }) => ({ type, payload }));
 };
-
-export const getAlertActions = (mockStore: typeof mockStoreCreator) =>
-  getTypeAndPayload(mockStore).filter((currentAction: AnyAction) =>
-    currentAction.type.startsWith('alerts')
-  );
diff --git a/kafka-ui-react-app/src/redux/actions/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/actions/__test__/fixtures.ts
deleted file mode 100644
index c7aaff49682..00000000000
--- a/kafka-ui-react-app/src/redux/actions/__test__/fixtures.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {
-  ClusterStats,
-  CompatibilityLevelCompatibilityEnum,
-  NewSchemaSubject,
-  SchemaSubject,
-  SchemaType,
-  SortOrder,
-} from 'generated-sources';
-
-export const clusterStats: ClusterStats = {
-  brokerCount: 1,
-  activeControllers: 1,
-  onlinePartitionCount: 6,
-  offlinePartitionCount: 0,
-  inSyncReplicasCount: 6,
-  outOfSyncReplicasCount: 0,
-  underReplicatedPartitionCount: 0,
-  diskUsage: [{ brokerId: 1, segmentSize: 6538, segmentCount: 6 }],
-};
-
-export const schemaPayload: NewSchemaSubject = {
-  subject: 'NewSchema',
-  schema:
-    '{"type":"record","name":"MyRecord1","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
-  schemaType: SchemaType.JSON,
-};
-
-export const schema: SchemaSubject = {
-  subject: 'NewSchema',
-  schema:
-    '{"type":"record","name":"MyRecord1","namespace":"com.mycompany","fields":[{"name":"id","type":"long"}]}',
-  schemaType: SchemaType.JSON,
-  version: '1',
-  id: 1,
-  compatibilityLevel: CompatibilityLevelCompatibilityEnum.BACKWARD,
-};
-
-export const mockTopicsState = {
-  byName: {},
-  allNames: [],
-  totalPages: 1,
-  messages: [],
-  search: '',
-  orderBy: null,
-  sortOrder: SortOrder.ASC,
-  consumerGroups: [],
-};
diff --git a/kafka-ui-react-app/src/redux/interfaces/connect.ts b/kafka-ui-react-app/src/redux/interfaces/connect.ts
deleted file mode 100644
index c7ea30f5d2c..00000000000
--- a/kafka-ui-react-app/src/redux/interfaces/connect.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Connect, Connector, FullConnectorInfo, Task } from 'generated-sources';
-
-import { ClusterName } from './cluster';
-
-export type ConnectName = Connect['name'];
-export type ConnectorName = Connector['name'];
-export type ConnectorConfig = Connector['config'];
-
-export interface ConnectState {
-  connects: Connect[];
-  connectors: FullConnectorInfo[];
-  currentConnector: {
-    connector: Connector | null;
-    tasks: Task[];
-    config: ConnectorConfig | null;
-  };
-  search: string;
-}
-
-export interface ConnectorSearch {
-  clusterName: ClusterName;
-  search: string;
-}
diff --git a/kafka-ui-react-app/src/redux/interfaces/index.ts b/kafka-ui-react-app/src/redux/interfaces/index.ts
index 41ec56e235a..6d853cf5a54 100644
--- a/kafka-ui-react-app/src/redux/interfaces/index.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/index.ts
@@ -8,8 +8,6 @@ export * from './consumerGroup';
 export * from './schema';
 export * from './loader';
 export * from './alerts';
-export * from './connect';
 
 export type RootState = ReturnType<typeof rootReducer>;
-export type AppStore = ReturnType<typeof store.getState>;
 export type AppDispatch = typeof store.dispatch;
diff --git a/kafka-ui-react-app/src/redux/reducers/connect/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/connect/__test__/reducer.spec.ts
deleted file mode 100644
index 61e422d8670..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/connect/__test__/reducer.spec.ts
+++ /dev/null
@@ -1,766 +0,0 @@
-import {
-  ConnectorState,
-  ConnectorTaskStatus,
-  ConnectorAction,
-} from 'generated-sources';
-import reducer, {
-  initialState,
-  fetchConnects,
-  fetchConnectors,
-  fetchConnector,
-  createConnector,
-  deleteConnector,
-  setConnectorStatusState,
-  fetchConnectorTasks,
-  fetchConnectorConfig,
-  updateConnectorConfig,
-  restartConnector,
-  pauseConnector,
-  resumeConnector,
-  restartConnectorTask,
-} from 'redux/reducers/connect/connectSlice';
-import fetchMock from 'fetch-mock-jest';
-import mockStoreCreator from 'redux/store/configureStore/mockStoreCreator';
-import { getTypeAndPayload, getAlertActions } from 'lib/testHelpers';
-
-import {
-  connects,
-  connectors,
-  connector,
-  tasks,
-  connectorsServerPayload,
-  connectorServerPayload,
-  tasksServerPayload,
-} from './fixtures';
-
-const runningConnectorState = {
-  ...initialState,
-  currentConnector: {
-    ...initialState.currentConnector,
-    connector: {
-      ...connector,
-      status: {
-        ...connector.status,
-        state: ConnectorState.RUNNING,
-      },
-    },
-    tasks: tasks.map((task) => ({
-      ...task,
-      status: {
-        ...task.status,
-        state: ConnectorTaskStatus.RUNNING,
-      },
-    })),
-  },
-};
-
-const pausedConnectorState = {
-  ...initialState,
-  currentConnector: {
-    ...initialState.currentConnector,
-    connector: {
-      ...connector,
-      status: {
-        ...connector.status,
-        state: ConnectorState.PAUSED,
-      },
-    },
-    tasks: tasks.map((task) => ({
-      ...task,
-      status: {
-        ...task.status,
-        state: ConnectorTaskStatus.PAUSED,
-      },
-    })),
-  },
-};
-
-describe('Connect slice', () => {
-  describe('Reducer', () => {
-    it('reacts on fetchConnects/fulfilled', () => {
-      expect(
-        reducer(initialState, {
-          type: fetchConnects.fulfilled,
-          payload: { connects },
-        })
-      ).toEqual({
-        ...initialState,
-        connects,
-      });
-    });
-
-    it('reacts on fetchConnectors/fulfilled', () => {
-      expect(
-        reducer(initialState, {
-          type: fetchConnectors.fulfilled,
-          payload: { connectors },
-        })
-      ).toEqual({
-        ...initialState,
-        connectors,
-      });
-    });
-
-    it('reacts on fetchConnector/fulfilled', () => {
-      expect(
-        reducer(initialState, {
-          type: fetchConnector.fulfilled,
-          payload: { connector },
-        })
-      ).toEqual({
-        ...initialState,
-        currentConnector: {
-          ...initialState.currentConnector,
-          connector,
-        },
-      });
-    });
-
-    it('reacts on createConnector/fulfilled', () => {
-      expect(
-        reducer(initialState, {
-          type: createConnector.fulfilled,
-          payload: { connector },
-        })
-      ).toEqual({
-        ...initialState,
-        currentConnector: {
-          ...initialState.currentConnector,
-          connector,
-        },
-      });
-    });
-
-    it('reacts on deleteConnector/fulfilled', () => {
-      expect(
-        reducer(
-          { ...initialState, connectors },
-          {
-            type: deleteConnector.fulfilled,
-            payload: { connectorName: connectors[0].name },
-          }
-        )
-      ).toEqual({
-        ...initialState,
-        connectors: connectors.slice(1),
-      });
-    });
-
-    it('reacts on setConnectorStatusState/fulfilled', () => {
-      expect(
-        reducer(runningConnectorState, {
-          type: setConnectorStatusState,
-          payload: {
-            taskState: ConnectorTaskStatus.PAUSED,
-            connectorState: ConnectorState.PAUSED,
-          },
-        })
-      ).toEqual(pausedConnectorState);
-    });
-
-    it('reacts on fetchConnectorTasks/fulfilled', () => {
-      expect(
-        reducer(initialState, {
-          type: fetchConnectorTasks.fulfilled,
-          payload: { tasks },
-        })
-      ).toEqual({
-        ...initialState,
-        currentConnector: {
-          ...initialState.currentConnector,
-          tasks,
-        },
-      });
-    });
-
-    it('reacts on fetchConnectorConfig/fulfilled', () => {
-      expect(
-        reducer(initialState, {
-          type: fetchConnectorConfig.fulfilled,
-          payload: { config: connector.config },
-        })
-      ).toEqual({
-        ...initialState,
-        currentConnector: {
-          ...initialState.currentConnector,
-          config: connector.config,
-        },
-      });
-    });
-
-    it('reacts on updateConnectorConfig/fulfilled', () => {
-      expect(
-        reducer(
-          {
-            ...initialState,
-            currentConnector: {
-              ...initialState.currentConnector,
-              config: {
-                ...connector.config,
-                fieldToRemove: 'Fake',
-              },
-            },
-          },
-          {
-            type: updateConnectorConfig.fulfilled,
-            payload: { connector },
-          }
-        )
-      ).toEqual({
-        ...initialState,
-        currentConnector: {
-          ...initialState.currentConnector,
-          connector,
-          config: connector.config,
-        },
-      });
-    });
-  });
-
-  describe('Thunks', () => {
-    const store = mockStoreCreator;
-    const clusterName = 'local';
-    const connectName = 'first';
-    const connectorName = 'hdfs-source-connector';
-    const taskId = 10;
-
-    describe('Thunks', () => {
-      afterEach(() => {
-        fetchMock.restore();
-        store.clearActions();
-      });
-      describe('fetchConnects', () => {
-        it('creates fetchConnects/fulfilled when fetching connects', async () => {
-          fetchMock.getOnce(`/api/clusters/${clusterName}/connects`, connects);
-          await store.dispatch(fetchConnects(clusterName));
-
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnects.pending.type },
-            {
-              type: fetchConnects.fulfilled.type,
-              payload: { connects },
-            },
-          ]);
-        });
-        it('creates fetchConnects/rejected', async () => {
-          fetchMock.getOnce(`/api/clusters/${clusterName}/connects`, 404);
-          await store.dispatch(fetchConnects(clusterName));
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnects.pending.type },
-            {
-              type: fetchConnects.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects`,
-                message: undefined,
-              },
-            },
-          ]);
-        });
-      });
-      describe('fetchConnectors', () => {
-        it('creates fetchConnectors/fulfilled when fetching connectors', async () => {
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connectors`,
-            connectorsServerPayload,
-            { query: { search: '' } }
-          );
-          await store.dispatch(fetchConnectors({ clusterName }));
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnectors.pending.type },
-            {
-              type: fetchConnectors.fulfilled.type,
-              payload: { connectors },
-            },
-          ]);
-        });
-        it('creates fetchConnectors/rejected', async () => {
-          fetchMock.getOnce(`/api/clusters/${clusterName}/connectors`, 404, {
-            query: { search: '' },
-          });
-          await store.dispatch(fetchConnectors({ clusterName }));
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnectors.pending.type },
-            {
-              type: fetchConnectors.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connectors?search=`,
-                message: undefined,
-              },
-            },
-          ]);
-        });
-      });
-      describe('fetchConnector', () => {
-        it('creates fetchConnector/fulfilled when fetching connector', async () => {
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}`,
-            connectorServerPayload
-          );
-          await store.dispatch(
-            fetchConnector({ clusterName, connectName, connectorName })
-          );
-
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnector.pending.type },
-            {
-              type: fetchConnector.fulfilled.type,
-              payload: { connector },
-            },
-          ]);
-        });
-        it('creates fetchConnector/rejected', async () => {
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}`,
-            404
-          );
-          await store.dispatch(
-            fetchConnector({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnector.pending.type },
-            {
-              type: fetchConnector.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}`,
-                message: undefined,
-              },
-            },
-          ]);
-        });
-      });
-      describe('createConnector', () => {
-        it('creates createConnector/fulfilled when fetching connects', async () => {
-          fetchMock.postOnce(
-            {
-              url: `/api/clusters/${clusterName}/connects/${connectName}/connectors`,
-              body: {
-                name: connectorName,
-                config: connector.config,
-              },
-            },
-            connectorServerPayload
-          );
-          await store.dispatch(
-            createConnector({
-              clusterName,
-              connectName,
-              newConnector: {
-                name: connectorName,
-                config: connector.config,
-              },
-            })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: createConnector.pending.type },
-            {
-              type: createConnector.fulfilled.type,
-              payload: { connector },
-            },
-          ]);
-        });
-        it('creates createConnector/rejected', async () => {
-          fetchMock.postOnce(
-            {
-              url: `/api/clusters/${clusterName}/connects/${connectName}/connectors`,
-              body: {
-                name: connectorName,
-                config: connector.config,
-              },
-            },
-            404
-          );
-          await store.dispatch(
-            createConnector({
-              clusterName,
-              connectName,
-              newConnector: {
-                name: connectorName,
-                config: connector.config,
-              },
-            })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: createConnector.pending.type },
-            {
-              type: createConnector.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects/${connectName}/connectors`,
-                message: undefined,
-              },
-            },
-          ]);
-        });
-      });
-      describe('deleteConnector', () => {
-        it('creates deleteConnector/fulfilled', async () => {
-          fetchMock.deleteOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}`,
-            {}
-          );
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connectors?search=`,
-            connectorsServerPayload
-          );
-          await store.dispatch(
-            deleteConnector({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: deleteConnector.pending.type },
-            { type: fetchConnectors.pending.type },
-            {
-              type: deleteConnector.fulfilled.type,
-              payload: { connectorName },
-            },
-          ]);
-        });
-        it('creates deleteConnector/rejected', async () => {
-          fetchMock.deleteOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}`,
-            404
-          );
-          try {
-            await store.dispatch(
-              deleteConnector({ clusterName, connectName, connectorName })
-            );
-          } catch {
-            expect(getTypeAndPayload(store)).toEqual([
-              { type: deleteConnector.pending.type },
-              {
-                type: deleteConnector.rejected.type,
-                payload: {
-                  alert: {
-                    subject: 'local-first-hdfs-source-connector',
-                    title: 'Kafka Connect Connector Delete',
-                    response: {
-                      status: 404,
-                      statusText: 'Not Found',
-                      url: `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}`,
-                    },
-                  },
-                },
-              },
-            ]);
-          }
-        });
-      });
-      describe('fetchConnectorTasks', () => {
-        it('creates fetchConnectorTasks/fulfilled when fetching connects', async () => {
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/tasks`,
-            tasksServerPayload
-          );
-          await store.dispatch(
-            fetchConnectorTasks({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnectorTasks.pending.type },
-            {
-              type: fetchConnectorTasks.fulfilled.type,
-              payload: { tasks },
-            },
-          ]);
-        });
-        it('creates fetchConnectorTasks/rejected', async () => {
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/tasks`,
-            404
-          );
-          await store.dispatch(
-            fetchConnectorTasks({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnectorTasks.pending.type },
-            {
-              type: fetchConnectorTasks.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/tasks`,
-                message: undefined,
-              },
-            },
-          ]);
-        });
-      });
-      describe('restartConnector', () => {
-        it('creates restartConnector/fulfilled', async () => {
-          fetchMock.postOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/action/${ConnectorAction.RESTART}`,
-            { message: 'success' }
-          );
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/tasks`,
-            tasksServerPayload
-          );
-          await store.dispatch(
-            restartConnector({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: restartConnector.pending.type },
-            { type: fetchConnectorTasks.pending.type },
-            { type: restartConnector.fulfilled.type },
-          ]);
-        });
-        it('creates restartConnector/rejected', async () => {
-          fetchMock.postOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/action/${ConnectorAction.RESTART}`,
-            404
-          );
-          await store.dispatch(
-            restartConnector({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: restartConnector.pending.type },
-            {
-              type: restartConnector.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/action/${ConnectorAction.RESTART}`,
-                message: undefined,
-              },
-            },
-          ]);
-        });
-      });
-      describe('pauseConnector', () => {
-        it('creates pauseConnector/fulfilled when fetching connects', async () => {
-          fetchMock.postOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/action/${ConnectorAction.PAUSE}`,
-            { message: 'success' }
-          );
-          await store.dispatch(
-            pauseConnector({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: pauseConnector.pending.type },
-            {
-              type: setConnectorStatusState.type,
-              payload: {
-                connectorState: ConnectorState.PAUSED,
-                taskState: ConnectorTaskStatus.PAUSED,
-              },
-            },
-            { type: pauseConnector.fulfilled.type },
-          ]);
-        });
-        it('creates pauseConnector/rejected', async () => {
-          fetchMock.postOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/action/${ConnectorAction.PAUSE}`,
-            404
-          );
-          await store.dispatch(
-            pauseConnector({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: pauseConnector.pending.type },
-            {
-              type: pauseConnector.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/action/${ConnectorAction.PAUSE}`,
-              },
-            },
-          ]);
-        });
-      });
-      describe('resumeConnector', () => {
-        it('creates resumeConnector/fulfilled when fetching connects', async () => {
-          fetchMock.postOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/action/${ConnectorAction.RESUME}`,
-            { message: 'success' }
-          );
-          await store.dispatch(
-            resumeConnector({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: resumeConnector.pending.type },
-            {
-              type: setConnectorStatusState.type,
-              payload: {
-                connectorState: ConnectorState.RUNNING,
-                taskState: ConnectorTaskStatus.RUNNING,
-              },
-            },
-            { type: resumeConnector.fulfilled.type },
-          ]);
-        });
-        it('creates resumeConnector/rejected', async () => {
-          fetchMock.postOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/action/${ConnectorAction.RESUME}`,
-            404
-          );
-          await store.dispatch(
-            resumeConnector({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: resumeConnector.pending.type },
-            {
-              type: resumeConnector.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/action/${ConnectorAction.RESUME}`,
-              },
-            },
-          ]);
-        });
-      });
-      describe('restartConnectorTask', () => {
-        it('creates restartConnectorTask/fulfilled when fetching connects', async () => {
-          fetchMock.postOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/tasks/${taskId}/action/restart`,
-            { message: 'success' }
-          );
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/tasks`,
-            tasksServerPayload
-          );
-          await store.dispatch(
-            restartConnectorTask({
-              clusterName,
-              connectName,
-              connectorName,
-              taskId,
-            })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: restartConnectorTask.pending.type },
-            { type: fetchConnectorTasks.pending.type },
-            {
-              type: fetchConnectorTasks.fulfilled.type,
-              payload: { tasks },
-            },
-            ...getAlertActions(store),
-            { type: restartConnectorTask.fulfilled.type },
-          ]);
-        });
-        it('creates restartConnectorTask/rejected', async () => {
-          fetchMock.postOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/tasks/${taskId}/action/restart`,
-            404
-          );
-          await store.dispatch(
-            restartConnectorTask({
-              clusterName,
-              connectName,
-              connectorName,
-              taskId,
-            })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: restartConnectorTask.pending.type },
-            {
-              type: restartConnectorTask.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/tasks/${taskId}/action/restart`,
-              },
-            },
-          ]);
-        });
-      });
-      describe('fetchConnectorConfig', () => {
-        it('creates fetchConnectorConfig/fulfilled when fetching connects', async () => {
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/config`,
-            connector.config
-          );
-          await store.dispatch(
-            fetchConnectorConfig({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnectorConfig.pending.type },
-            {
-              type: fetchConnectorConfig.fulfilled.type,
-              payload: { config: connector.config },
-            },
-          ]);
-        });
-        it('creates fetchConnectorConfig/rejected', async () => {
-          fetchMock.getOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/config`,
-            404
-          );
-          await store.dispatch(
-            fetchConnectorConfig({ clusterName, connectName, connectorName })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: fetchConnectorConfig.pending.type },
-            {
-              type: fetchConnectorConfig.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/config`,
-                message: undefined,
-              },
-            },
-          ]);
-        });
-      });
-      describe('updateConnectorConfig', () => {
-        it('creates updateConnectorConfig/fulfilled when fetching connects', async () => {
-          fetchMock.putOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/config`,
-            connectorServerPayload
-          );
-
-          await store.dispatch(
-            updateConnectorConfig({
-              clusterName,
-              connectName,
-              connectorName,
-              connectorConfig: connector.config,
-            })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: updateConnectorConfig.pending.type, payload: undefined },
-            { type: fetchConnector.pending.type },
-            ...getAlertActions(store),
-            {
-              type: updateConnectorConfig.fulfilled.type,
-              payload: { connector },
-            },
-          ]);
-        });
-        it('creates updateConnectorConfig/rejected', async () => {
-          fetchMock.putOnce(
-            `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/config`,
-            404
-          );
-          await store.dispatch(
-            updateConnectorConfig({
-              clusterName,
-              connectName,
-              connectorName,
-              connectorConfig: connector.config,
-            })
-          );
-          expect(getTypeAndPayload(store)).toEqual([
-            { type: updateConnectorConfig.pending.type },
-            {
-              type: updateConnectorConfig.rejected.type,
-              payload: {
-                status: 404,
-                statusText: 'Not Found',
-                url: `/api/clusters/${clusterName}/connects/${connectName}/connectors/${connectorName}/config`,
-                message: undefined,
-              },
-            },
-          ]);
-        });
-      });
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/reducers/connect/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/connect/__test__/selectors.spec.ts
deleted file mode 100644
index a1f71626856..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/connect/__test__/selectors.spec.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import {
-  fetchConnector,
-  fetchConnectorConfig,
-  fetchConnectors,
-  fetchConnectorTasks,
-  fetchConnects,
-} from 'redux/reducers/connect/connectSlice';
-import { store } from 'redux/store';
-import * as selectors from 'redux/reducers/connect/selectors';
-
-import { connects, connectors, connector, tasks } from './fixtures';
-
-describe('Connect selectors', () => {
-  describe('Initial State', () => {
-    it('returns initial values', () => {
-      expect(selectors.getAreConnectsFetching(store.getState())).toEqual(false);
-      expect(selectors.getConnects(store.getState())).toEqual([]);
-      expect(selectors.getAreConnectorsFetching(store.getState())).toEqual(
-        false
-      );
-      expect(selectors.getConnectors(store.getState())).toEqual([]);
-      expect(selectors.getFailedConnectors(store.getState())).toEqual([]);
-      expect(selectors.getFailedTasks(store.getState())).toEqual(0);
-      expect(selectors.getIsConnectorFetching(store.getState())).toEqual(false);
-      expect(selectors.getConnector(store.getState())).toEqual(null);
-      expect(selectors.getConnectorStatus(store.getState())).toEqual(undefined);
-      expect(selectors.getIsConnectorDeleting(store.getState())).toEqual(false);
-      expect(selectors.getIsConnectorRestarting(store.getState())).toEqual(
-        false
-      );
-      expect(selectors.getIsConnectorPausing(store.getState())).toEqual(false);
-      expect(selectors.getIsConnectorResuming(store.getState())).toEqual(false);
-      expect(selectors.getIsConnectorActionRunning(store.getState())).toEqual(
-        false
-      );
-      expect(selectors.getAreConnectorTasksFetching(store.getState())).toEqual(
-        false
-      );
-      expect(selectors.getConnectorTasks(store.getState())).toEqual([]);
-      expect(selectors.getConnectorRunningTasksCount(store.getState())).toEqual(
-        0
-      );
-      expect(selectors.getConnectorFailedTasksCount(store.getState())).toEqual(
-        0
-      );
-      expect(selectors.getIsConnectorConfigFetching(store.getState())).toEqual(
-        false
-      );
-      expect(selectors.getConnectorConfig(store.getState())).toEqual(null);
-    });
-  });
-
-  describe('state', () => {
-    it('returns connects', () => {
-      store.dispatch({
-        type: fetchConnects.fulfilled.type,
-        payload: { connects },
-      });
-      expect(selectors.getConnects(store.getState())).toEqual(connects);
-    });
-
-    it('returns connectors', () => {
-      store.dispatch({
-        type: fetchConnectors.fulfilled.type,
-        payload: { connectors },
-      });
-      expect(selectors.getConnectors(store.getState())).toEqual(connectors);
-    });
-
-    it('returns failed connectors', () => {
-      store.dispatch({
-        type: fetchConnectors.fulfilled.type,
-        payload: { connectors },
-      });
-      expect(selectors.getFailedConnectors(store.getState()).length).toEqual(1);
-    });
-
-    it('returns failed tasks', () => {
-      store.dispatch({
-        type: fetchConnectors.fulfilled.type,
-        payload: { connectors },
-      });
-      expect(selectors.getFailedTasks(store.getState())).toEqual(1);
-    });
-
-    it('returns sorted topics', () => {
-      store.dispatch({
-        type: fetchConnectors.fulfilled.type,
-        payload: { connectors },
-      });
-      const sortedTopics = selectors.getSortedTopics(store.getState());
-      if (sortedTopics[0] && sortedTopics[0].length > 1) {
-        expect(sortedTopics[0]).toEqual(['a', 'b', 'c']);
-      }
-    });
-
-    it('returns connector', () => {
-      store.dispatch({
-        type: fetchConnector.fulfilled.type,
-        payload: { connector },
-      });
-      expect(selectors.getConnector(store.getState())).toEqual(connector);
-      expect(selectors.getConnectorStatus(store.getState())).toEqual(
-        connector.status.state
-      );
-    });
-
-    it('returns connector tasks', () => {
-      store.dispatch({
-        type: fetchConnectorTasks.fulfilled.type,
-        payload: { tasks },
-      });
-      expect(selectors.getConnectorTasks(store.getState())).toEqual(tasks);
-      expect(selectors.getConnectorRunningTasksCount(store.getState())).toEqual(
-        2
-      );
-      expect(selectors.getConnectorFailedTasksCount(store.getState())).toEqual(
-        1
-      );
-    });
-
-    it('returns connector config', () => {
-      store.dispatch({
-        type: fetchConnectorConfig.fulfilled.type,
-        payload: { config: connector.config },
-      });
-      expect(selectors.getConnectorConfig(store.getState())).toEqual(
-        connector.config
-      );
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts b/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts
deleted file mode 100644
index a3ef930bbab..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/connect/connectSlice.ts
+++ /dev/null
@@ -1,478 +0,0 @@
-import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import {
-  Connect,
-  Connector,
-  ConnectorAction,
-  ConnectorState,
-  ConnectorTaskStatus,
-  FullConnectorInfo,
-  NewConnector,
-  Task,
-  TaskId,
-} from 'generated-sources';
-import { kafkaConnectApiClient } from 'lib/api';
-import { getResponse } from 'lib/errorHandling';
-import {
-  ClusterName,
-  ConnectName,
-  ConnectorConfig,
-  ConnectorName,
-  ConnectorSearch,
-  ConnectState,
-} from 'redux/interfaces';
-import { showSuccessAlert } from 'redux/reducers/alerts/alertsSlice';
-
-export const fetchConnects = createAsyncThunk<
-  { connects: Connect[] },
-  ClusterName
->('connect/fetchConnects', async (clusterName, { rejectWithValue }) => {
-  try {
-    const connects = await kafkaConnectApiClient.getConnects({ clusterName });
-
-    return { connects };
-  } catch (err) {
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-export const fetchConnectors = createAsyncThunk<
-  { connectors: FullConnectorInfo[] },
-  { clusterName: ClusterName; search?: string }
->(
-  'connect/fetchConnectors',
-  async ({ clusterName, search = '' }, { rejectWithValue }) => {
-    try {
-      const connectors = await kafkaConnectApiClient.getAllConnectors({
-        clusterName,
-        search,
-      });
-
-      return { connectors };
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const fetchConnector = createAsyncThunk<
-  { connector: Connector },
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }
->(
-  'connect/fetchConnector',
-  async ({ clusterName, connectName, connectorName }, { rejectWithValue }) => {
-    try {
-      const connector = await kafkaConnectApiClient.getConnector({
-        clusterName,
-        connectName,
-        connectorName,
-      });
-
-      return { connector };
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const createConnector = createAsyncThunk<
-  { connector: Connector },
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    newConnector: NewConnector;
-  }
->(
-  'connect/createConnector',
-  async ({ clusterName, connectName, newConnector }, { rejectWithValue }) => {
-    try {
-      const connector = await kafkaConnectApiClient.createConnector({
-        clusterName,
-        connectName,
-        newConnector,
-      });
-
-      return { connector };
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const deleteConnector = createAsyncThunk<
-  { connectorName: string },
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }
->(
-  'connect/deleteConnector',
-  async (
-    { clusterName, connectName, connectorName },
-    { rejectWithValue, dispatch }
-  ) => {
-    try {
-      await kafkaConnectApiClient.deleteConnector({
-        clusterName,
-        connectName,
-        connectorName,
-      });
-
-      dispatch(fetchConnectors({ clusterName, search: '' }));
-
-      return { connectorName };
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const fetchConnectorTasks = createAsyncThunk<
-  { tasks: Task[] },
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }
->(
-  'connect/fetchConnectorTasks',
-  async ({ clusterName, connectName, connectorName }, { rejectWithValue }) => {
-    try {
-      const tasks = await kafkaConnectApiClient.getConnectorTasks({
-        clusterName,
-        connectName,
-        connectorName,
-      });
-
-      return { tasks };
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const restartConnector = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }
->(
-  'connect/restartConnector',
-  async (
-    { clusterName, connectName, connectorName },
-    { rejectWithValue, dispatch }
-  ) => {
-    try {
-      await kafkaConnectApiClient.updateConnectorState({
-        clusterName,
-        connectName,
-        connectorName,
-        action: ConnectorAction.RESTART,
-      });
-
-      dispatch(
-        fetchConnectorTasks({
-          clusterName,
-          connectName,
-          connectorName,
-        })
-      );
-
-      return undefined;
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const restartTasks = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-    action: ConnectorAction;
-  }
->(
-  'connect/restartTasks',
-  async (
-    { clusterName, connectName, connectorName, action },
-    { rejectWithValue, dispatch }
-  ) => {
-    try {
-      await kafkaConnectApiClient.updateConnectorState({
-        clusterName,
-        connectName,
-        connectorName,
-        action,
-      });
-
-      dispatch(
-        fetchConnectorTasks({
-          clusterName,
-          connectName,
-          connectorName,
-        })
-      );
-
-      return undefined;
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const restartConnectorTask = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-    taskId: TaskId['task'];
-  }
->(
-  'connect/restartConnectorTask',
-  async (
-    { clusterName, connectName, connectorName, taskId },
-    { rejectWithValue, dispatch }
-  ) => {
-    try {
-      await kafkaConnectApiClient.restartConnectorTask({
-        clusterName,
-        connectName,
-        connectorName,
-        taskId: Number(taskId),
-      });
-
-      await dispatch(
-        fetchConnectorTasks({
-          clusterName,
-          connectName,
-          connectorName,
-        })
-      );
-
-      dispatch(
-        showSuccessAlert({
-          id: `connect-${connectName}-${clusterName}`,
-          message: 'Tasks successfully restarted.',
-        })
-      );
-
-      return undefined;
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const fetchConnectorConfig = createAsyncThunk<
-  { config: { [key: string]: unknown } },
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }
->(
-  'connect/fetchConnectorConfig',
-  async ({ clusterName, connectName, connectorName }, { rejectWithValue }) => {
-    try {
-      const config = await kafkaConnectApiClient.getConnectorConfig({
-        clusterName,
-        connectName,
-        connectorName,
-      });
-
-      return { config };
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const updateConnectorConfig = createAsyncThunk<
-  { connector: Connector },
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-    connectorConfig: ConnectorConfig;
-  }
->(
-  'connect/updateConnectorConfig',
-  async (
-    { clusterName, connectName, connectorName, connectorConfig },
-    { rejectWithValue, dispatch }
-  ) => {
-    try {
-      const connector = await kafkaConnectApiClient.setConnectorConfig({
-        clusterName,
-        connectName,
-        connectorName,
-        requestBody: connectorConfig,
-      });
-      dispatch(fetchConnector({ clusterName, connectName, connectorName }));
-      dispatch(
-        showSuccessAlert({
-          id: `connector-${connectorName}-${clusterName}`,
-          message: 'Connector config updated.',
-        })
-      );
-
-      return { connector };
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const initialState: ConnectState = {
-  connects: [],
-  connectors: [],
-  currentConnector: {
-    connector: null,
-    tasks: [],
-    config: null,
-  },
-  search: '',
-};
-
-const connectSlice = createSlice({
-  name: 'connect',
-  initialState,
-  reducers: {
-    setConnectorStatusState: (state, { payload }) => {
-      const { connector, tasks } = state.currentConnector;
-
-      if (connector) {
-        connector.status.state = payload.connectorState;
-      }
-
-      state.currentConnector.tasks = tasks.map((task) => ({
-        ...task,
-        status: {
-          ...task.status,
-          state: payload.taskState,
-        },
-      }));
-    },
-  },
-  extraReducers: (builder) => {
-    builder.addCase(fetchConnects.fulfilled, (state, { payload }) => {
-      state.connects = payload.connects;
-    });
-    builder.addCase(fetchConnectors.fulfilled, (state, { payload }) => {
-      state.connectors = payload.connectors;
-    });
-    builder.addCase(fetchConnector.fulfilled, (state, { payload }) => {
-      state.currentConnector.connector = payload.connector;
-    });
-    builder.addCase(createConnector.fulfilled, (state, { payload }) => {
-      state.currentConnector.connector = payload.connector;
-    });
-    builder.addCase(deleteConnector.fulfilled, (state, { payload }) => {
-      state.connectors = state.connectors.filter(
-        ({ name }) => name !== payload.connectorName
-      );
-    });
-    builder.addCase(fetchConnectorTasks.fulfilled, (state, { payload }) => {
-      state.currentConnector.tasks = payload.tasks;
-    });
-    builder.addCase(fetchConnectorConfig.fulfilled, (state, { payload }) => {
-      state.currentConnector.config = payload.config;
-    });
-    builder.addCase(updateConnectorConfig.fulfilled, (state, { payload }) => {
-      state.currentConnector.connector = payload.connector;
-      state.currentConnector.config = payload.connector.config;
-    });
-  },
-});
-
-export const { setConnectorStatusState } = connectSlice.actions;
-
-export const pauseCurrentConnector = () =>
-  setConnectorStatusState({
-    connectorState: ConnectorState.PAUSED,
-    taskState: ConnectorTaskStatus.PAUSED,
-  });
-
-export const resumeCurrentConnector = () =>
-  setConnectorStatusState({
-    connectorState: ConnectorState.RUNNING,
-    taskState: ConnectorTaskStatus.RUNNING,
-  });
-
-export const pauseConnector = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }
->(
-  'connect/pauseConnector',
-  async (
-    { clusterName, connectName, connectorName },
-    { rejectWithValue, dispatch }
-  ) => {
-    try {
-      await kafkaConnectApiClient.updateConnectorState({
-        clusterName,
-        connectName,
-        connectorName,
-        action: ConnectorAction.PAUSE,
-      });
-
-      dispatch(pauseCurrentConnector());
-
-      return undefined;
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const resumeConnector = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    connectName: ConnectName;
-    connectorName: ConnectorName;
-  }
->(
-  'connect/resumeConnector',
-  async (
-    { clusterName, connectName, connectorName },
-    { rejectWithValue, dispatch }
-  ) => {
-    try {
-      await kafkaConnectApiClient.updateConnectorState({
-        clusterName,
-        connectName,
-        connectorName,
-        action: ConnectorAction.RESUME,
-      });
-
-      dispatch(resumeCurrentConnector());
-
-      return undefined;
-    } catch (err) {
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const setConnectorSearch = (connectorSearch: ConnectorSearch) => {
-  return fetchConnectors({
-    clusterName: connectorSearch.clusterName,
-    search: connectorSearch.search,
-  });
-};
-
-export default connectSlice.reducer;
diff --git a/kafka-ui-react-app/src/redux/reducers/connect/selectors.ts b/kafka-ui-react-app/src/redux/reducers/connect/selectors.ts
deleted file mode 100644
index 6dbb8e8402f..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/connect/selectors.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import { createSelector } from '@reduxjs/toolkit';
-import { ConnectState, RootState } from 'redux/interfaces';
-import { createFetchingSelector } from 'redux/reducers/loader/selectors';
-import {
-  ConnectorTaskStatus,
-  ConnectorState,
-  FullConnectorInfo,
-} from 'generated-sources';
-import sortBy from 'lodash/sortBy';
-import { AsyncRequestStatus } from 'lib/constants';
-
-import {
-  deleteConnector,
-  fetchConnector,
-  fetchConnectorConfig,
-  fetchConnectors,
-  fetchConnectorTasks,
-  fetchConnects,
-  pauseConnector,
-  restartConnector,
-  resumeConnector,
-} from './connectSlice';
-
-const connectState = ({ connect }: RootState): ConnectState => connect;
-
-const getConnectsFetchingStatus = createFetchingSelector(
-  fetchConnects.typePrefix
-);
-export const getAreConnectsFetching = createSelector(
-  getConnectsFetchingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-export const getConnects = createSelector(
-  connectState,
-  ({ connects }) => connects
-);
-
-const getConnectorsFetchingStatus = createFetchingSelector(
-  fetchConnectors.typePrefix
-);
-export const getAreConnectorsFetching = createSelector(
-  getConnectorsFetchingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-export const getConnectors = createSelector(
-  connectState,
-  ({ connectors }) => connectors
-);
-
-export const getFailedConnectors = createSelector(
-  connectState,
-  ({ connectors }) => {
-    return connectors.filter(
-      (connector: FullConnectorInfo) =>
-        connector.status.state === ConnectorState.FAILED
-    );
-  }
-);
-
-export const getFailedTasks = createSelector(connectState, ({ connectors }) => {
-  return connectors
-    .map((connector: FullConnectorInfo) => connector.failedTasksCount || 0)
-    .reduce((acc: number, value: number) => acc + value, 0);
-});
-
-export const getSortedTopics = createSelector(connectState, ({ connectors }) =>
-  connectors.map(({ topics }) => sortBy(topics || []))
-);
-
-const getConnectorFetchingStatus = createFetchingSelector(
-  fetchConnector.typePrefix
-);
-export const getIsConnectorFetching = createSelector(
-  getConnectorFetchingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-const getCurrentConnector = createSelector(
-  connectState,
-  ({ currentConnector }) => currentConnector
-);
-
-export const getConnector = createSelector(
-  getCurrentConnector,
-  ({ connector }) => connector
-);
-
-export const getConnectorStatus = createSelector(
-  getConnector,
-  (connector) => connector?.status?.state
-);
-
-const getConnectorDeletingStatus = createFetchingSelector(
-  deleteConnector.typePrefix
-);
-export const getIsConnectorDeleting = createSelector(
-  getConnectorDeletingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-const getConnectorRestartingStatus = createFetchingSelector(
-  restartConnector.typePrefix
-);
-export const getIsConnectorRestarting = createSelector(
-  getConnectorRestartingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-const getConnectorPausingStatus = createFetchingSelector(
-  pauseConnector.typePrefix
-);
-export const getIsConnectorPausing = createSelector(
-  getConnectorPausingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-const getConnectorResumingStatus = createFetchingSelector(
-  resumeConnector.typePrefix
-);
-export const getIsConnectorResuming = createSelector(
-  getConnectorResumingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-export const getIsConnectorActionRunning = createSelector(
-  getIsConnectorRestarting,
-  getIsConnectorPausing,
-  getIsConnectorResuming,
-  (restarting, pausing, resuming) => restarting || pausing || resuming
-);
-
-const getConnectorTasksFetchingStatus = createFetchingSelector(
-  fetchConnectorTasks.typePrefix
-);
-export const getAreConnectorTasksFetching = createSelector(
-  getConnectorTasksFetchingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-export const getConnectorTasks = createSelector(
-  getCurrentConnector,
-  ({ tasks }) => tasks
-);
-
-export const getConnectorRunningTasksCount = createSelector(
-  getConnectorTasks,
-  (tasks) =>
-    tasks.filter((task) => task.status?.state === ConnectorTaskStatus.RUNNING)
-      .length
-);
-
-export const getConnectorFailedTasksCount = createSelector(
-  getConnectorTasks,
-  (tasks) =>
-    tasks.filter((task) => task.status?.state === ConnectorTaskStatus.FAILED)
-      .length
-);
-
-const getConnectorConfigFetchingStatus = createFetchingSelector(
-  fetchConnectorConfig.typePrefix
-);
-export const getIsConnectorConfigFetching = createSelector(
-  getConnectorConfigFetchingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-export const getConnectorConfig = createSelector(
-  getCurrentConnector,
-  ({ config }) => config
-);
-
-export const getConnectorSearch = createSelector(
-  connectState,
-  (state) => state.search
-);
diff --git a/kafka-ui-react-app/src/redux/reducers/index.ts b/kafka-ui-react-app/src/redux/reducers/index.ts
index c7c01d487d0..ee5421f89ed 100644
--- a/kafka-ui-react-app/src/redux/reducers/index.ts
+++ b/kafka-ui-react-app/src/redux/reducers/index.ts
@@ -2,7 +2,6 @@ import { combineReducers } from '@reduxjs/toolkit';
 import loader from 'redux/reducers/loader/loaderSlice';
 import alerts from 'redux/reducers/alerts/alertsSlice';
 import schemas from 'redux/reducers/schemas/schemasSlice';
-import connect from 'redux/reducers/connect/connectSlice';
 import topicMessages from 'redux/reducers/topicMessages/topicMessagesSlice';
 import topics from 'redux/reducers/topics/topicsSlice';
 import consumerGroups from 'redux/reducers/consumerGroups/consumerGroupsSlice';
@@ -15,6 +14,5 @@ export default combineReducers({
   topicMessages,
   consumerGroups,
   schemas,
-  connect,
   ksqlDb,
 });
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 478f0ede49f..15af77fe52e 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -1,5 +1,4 @@
-/* eslint-disable import/prefer-default-export */
-export const Colors = {
+const Colors = {
   neutral: {
     '0': '#FFFFFF',
     '3': '#f9fafa',

From 620d2955fba08c122df35a5970d0c02a312383ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Jul 2022 14:18:49 +0400
Subject: [PATCH 073/734] Bump actions/setup-node from 3.4.0 to 3.4.1 (#2279)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.4.0...v3.4.1)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 620e8e8c24c..50dc2709f9b 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           version: 7.4.0
       - name: Install node
-        uses: actions/setup-node@v3.4.0
+        uses: actions/setup-node@v3.4.1
         with:
           node-version: "16.15.0"
           cache: "pnpm"

From 002e4db355fdc189ca0f2fe0b90052b07966c809 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 18 Jul 2022 14:57:28 +0400
Subject: [PATCH 074/734] fixing create topic (#2275)

---
 .../Topics/New/__test__/New.spec.tsx          |  8 +++----
 .../Topics/Topic/Edit/__test__/Edit.spec.tsx  |  4 ++--
 .../Topics/shared/Form/TimeToRetainBtns.tsx   | 14 +++++++-----
 .../Topics/shared/Form/TopicForm.styled.ts    | 22 +++++++++++++------
 .../Topics/shared/Form/TopicForm.tsx          | 12 ++++++----
 .../Form/__tests__/TimeToRetainBtn.spec.tsx   | 18 +++++----------
 .../shared/Form/__tests__/TopicForm.spec.tsx  | 12 +++++-----
 .../Form/__tests__/TopicForm.styled.spec.tsx  |  8 +++----
 .../Breadcrumb/__tests__/Breadcrumb.spec.tsx  |  6 ++---
 .../src/components/common/Form/Form.styled.ts |  1 +
 .../src/lib/__test__/paths.spec.ts            |  4 ++--
 kafka-ui-react-app/src/lib/paths.ts           |  4 ++--
 kafka-ui-react-app/src/theme/theme.ts         |  1 +
 13 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index e7796f727fc..aec534ce3e3 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -80,7 +80,7 @@ describe('New', () => {
 
   it('validates form', async () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    userEvent.click(screen.getByText(/submit/i));
+    userEvent.click(screen.getByText('Create topic'));
     await waitFor(() => {
       expect(screen.getByText('name is a required field')).toBeInTheDocument();
     });
@@ -97,7 +97,7 @@ describe('New', () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
 
     userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
-    userEvent.click(screen.getByText(/submit/i));
+    userEvent.click(screen.getByText('Create topic'));
 
     await waitFor(() => expect(mockNavigate).toBeCalledTimes(1));
     expect(mockNavigate).toHaveBeenLastCalledWith(`../${topicName}`);
@@ -115,7 +115,7 @@ describe('New', () => {
     await act(() =>
       userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName)
     );
-    await act(() => userEvent.click(screen.getByText(/submit/i)));
+    await act(() => userEvent.click(screen.getByText('Create topic')));
     expect(mockNavigate).not.toHaveBeenCalled();
   });
 
@@ -127,7 +127,7 @@ describe('New', () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
     await act(() => {
       userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
-      userEvent.click(screen.getByText(/submit/i));
+      userEvent.click(screen.getByText('Create topic'));
     });
 
     expect(useDispatchMock).toHaveBeenCalledTimes(1);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
index b658ac8019e..83214b376c8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
@@ -116,7 +116,7 @@ describe('Edit Component', () => {
 
       renderComponent({ updateTopic: updateTopicMock }, undefined);
 
-      const btn = screen.getAllByText(/submit/i)[0];
+      const btn = screen.getAllByText(/Save/i)[0];
       expect(btn).toBeEnabled();
 
       await act(() => {
@@ -138,7 +138,7 @@ describe('Edit Component', () => {
         undefined
       );
 
-      const btn = screen.getAllByText(/submit/i)[0];
+      const btn = screen.getAllByText(/Save/i)[0];
 
       await act(() => {
         userEvent.type(
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtns.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtns.tsx
index 53376876e4b..80d421b4a41 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtns.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtns.tsx
@@ -18,23 +18,27 @@ const TimeToRetainBtnsWrapper = styled.div`
 const TimeToRetainBtns: React.FC<Props> = ({ name }) => (
   <TimeToRetainBtnsWrapper>
     <TimeToRetainBtn
-      text="12h"
+      text="12 hours"
       inputName={name}
       value={MILLISECONDS_IN_DAY / 2}
     />
-    <TimeToRetainBtn text="1d" inputName={name} value={MILLISECONDS_IN_DAY} />
     <TimeToRetainBtn
-      text="2d"
+      text="1 day"
+      inputName={name}
+      value={MILLISECONDS_IN_DAY}
+    />
+    <TimeToRetainBtn
+      text="2 days"
       inputName={name}
       value={MILLISECONDS_IN_DAY * 2}
     />
     <TimeToRetainBtn
-      text="7d"
+      text="7 days"
       inputName={name}
       value={MILLISECONDS_IN_DAY * 7}
     />
     <TimeToRetainBtn
-      text="4w"
+      text="4 weeks"
       inputName={name}
       value={MILLISECONDS_IN_DAY * 7 * 4}
     />
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts
index fc46d8d9397..24c2d4d9bdd 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts
@@ -29,15 +29,23 @@ export const Label = styled.div`
 export const Button = styled.button<{ isActive: boolean }>`
   background-color: ${({ theme, ...props }) =>
     props.isActive
-      ? theme.button.primary.backgroundColor.active
-      : theme.button.primary.backgroundColor.normal};
-  height: 32px;
-  width: 46px;
-  border: 1px solid
-    ${({ theme, ...props }) =>
-      props.isActive ? theme.button.border.active : theme.button.primary.color};
+      ? theme.button.secondary.invertedColors.normal
+      : theme.button.secondary.backgroundColor.normal};
+  color: ${({ theme, ...props }) =>
+    props.isActive
+      ? theme.button.secondary.isActiveColor
+      : theme.button.primary.color};
+  height: 24px;
+  padding: 0 5px;
+  min-width: 51px;
+  border: none;
   border-radius: 6px;
   &:hover {
     cursor: pointer;
   }
 `;
+
+export const ButtonWrapper = styled.div`
+  display: flex;
+  gap: 10px;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index bd0fb16beb6..d9d6427a25c 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -208,10 +208,14 @@ const TopicForm: React.FC<Props> = ({
 
         <S.CustomParamsHeading>Custom parameters</S.CustomParamsHeading>
         <CustomParams isSubmitting={isSubmitting} />
-
-        <Button type="submit" buttonType="primary" buttonSize="L">
-          Submit
-        </Button>
+        <S.ButtonWrapper>
+          <Button type="submit" buttonType="primary" buttonSize="L">
+            {isEditing ? 'Save' : 'Create topic'}
+          </Button>
+          <Button type="button" buttonType="primary" buttonSize="L">
+            Cancel
+          </Button>
+        </S.ButtonWrapper>
       </fieldset>
     </StyledForm>
   );
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx
index 756fc081c0b..bf93b72d4ed 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx
@@ -42,21 +42,17 @@ describe('TimeToRetainBtn', () => {
     it('should test the non active state of the button and its styling', () => {
       const buttonElement = screen.getByRole('button');
       expect(buttonElement).toHaveStyle(
-        `background-color:${theme.button.primary.backgroundColor.normal}`
-      );
-      expect(buttonElement).toHaveStyle(
-        `border:1px solid ${theme.button.primary.color}`
+        `background-color:${theme.button.secondary.backgroundColor.normal}`
       );
+      expect(buttonElement).toHaveStyle(`border:none`);
     });
     it('should test the non active state with click becoming active', () => {
       const buttonElement = screen.getByRole('button');
       userEvent.click(buttonElement);
       expect(buttonElement).toHaveStyle(
-        `background-color:${theme.button.primary.backgroundColor.active}`
-      );
-      expect(buttonElement).toHaveStyle(
-        `border:1px solid ${theme.button.border.active}`
+        `background-color:${theme.button.secondary.invertedColors.normal}`
       );
+      expect(buttonElement).toHaveStyle(`border:none`);
     });
   });
 
@@ -65,11 +61,9 @@ describe('TimeToRetainBtn', () => {
       SetUpComponent({ value: 604800000 });
       const buttonElement = screen.getByRole('button');
       expect(buttonElement).toHaveStyle(
-        `background-color:${theme.button.primary.backgroundColor.active}`
-      );
-      expect(buttonElement).toHaveStyle(
-        `border:1px solid ${theme.button.border.active}`
+        `background-color:${theme.button.secondary.invertedColors.normal}`
       );
+      expect(buttonElement).toHaveStyle(`border:none`);
     });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
index 3c54c28b0ca..b224c8cd8e1 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
@@ -44,10 +44,10 @@ describe('TopicForm', () => {
       'spinbutton',
       'Time to retain data (in ms)'
     );
-    expectByRoleAndNameToBeInDocument('button', '12h');
-    expectByRoleAndNameToBeInDocument('button', '2d');
-    expectByRoleAndNameToBeInDocument('button', '7d');
-    expectByRoleAndNameToBeInDocument('button', '4w');
+    expectByRoleAndNameToBeInDocument('button', '12 hours');
+    expectByRoleAndNameToBeInDocument('button', '2 days');
+    expectByRoleAndNameToBeInDocument('button', '7 days');
+    expectByRoleAndNameToBeInDocument('button', '4 weeks');
 
     expectByRoleAndNameToBeInDocument('listbox', 'Max size on disk in GB');
     expectByRoleAndNameToBeInDocument(
@@ -57,7 +57,7 @@ describe('TopicForm', () => {
 
     expectByRoleAndNameToBeInDocument('heading', 'Custom parameters');
 
-    expectByRoleAndNameToBeInDocument('button', 'Submit');
+    expectByRoleAndNameToBeInDocument('button', 'Create topic');
   });
 
   it('submits', () => {
@@ -66,7 +66,7 @@ describe('TopicForm', () => {
       onSubmit: onSubmit.mockImplementation((e) => e.preventDefault()),
     });
 
-    userEvent.click(screen.getByRole('button', { name: 'Submit' }));
+    userEvent.click(screen.getByRole('button', { name: 'Create topic' }));
     expect(onSubmit).toBeCalledTimes(1);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx
index c0ff8e50d0e..f67f9557963 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx
@@ -10,8 +10,8 @@ describe('TopicForm styled components', () => {
       render(<S.Button isActive />);
       const button = screen.getByRole('button');
       expect(button).toHaveStyle({
-        border: `1px solid ${theme.button.border.active}`,
-        backgroundColor: theme.button.primary.backgroundColor.active,
+        border: `none`,
+        backgroundColor: theme.button.secondary.invertedColors.normal,
       });
     });
 
@@ -19,8 +19,8 @@ describe('TopicForm styled components', () => {
       render(<S.Button isActive={false} />);
       const button = screen.getByRole('button');
       expect(button).toHaveStyle({
-        border: `1px solid ${theme.button.primary.color}`,
-        backgroundColor: theme.button.primary.backgroundColor.normal,
+        border: `none`,
+        backgroundColor: theme.button.secondary.backgroundColor.normal,
       });
     });
   });
diff --git a/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx b/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx
index 426f20cc17d..d2cd7f6041a 100644
--- a/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx
@@ -29,12 +29,12 @@ describe('Breadcrumb component', () => {
 
   it('renders the list of links', async () => {
     const { getByText } = setupComponent(createTopicPath, createTopicRoutePath);
-    expect(getByText('Topics')).toBeInTheDocument();
-    expect(getByText('Create New')).toBeInTheDocument();
+    expect(getByText('All Topics')).toBeInTheDocument();
+    expect(getByText('Create New Topic')).toBeInTheDocument();
   });
   it('renders the topic overview', async () => {
     const { getByText } = setupComponent(topicPath, topicRoutePath);
-    expect(getByText('Topics')).toBeInTheDocument();
+    expect(getByText('All Topics')).toBeInTheDocument();
     expect(getByText(topicName)).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/Form/Form.styled.ts b/kafka-ui-react-app/src/components/common/Form/Form.styled.ts
index 6316b7b0f78..88038406832 100644
--- a/kafka-ui-react-app/src/components/common/Form/Form.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Form/Form.styled.ts
@@ -3,4 +3,5 @@ import styled from 'styled-components';
 export const StyledForm = styled.form`
   padding: 0 16px;
   max-width: 800px;
+  margin: 0 auto;
 `;
diff --git a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
index c94973a314d..45a1ca87e51 100644
--- a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
+++ b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
@@ -120,7 +120,7 @@ describe('Paths', () => {
 
   it('clusterTopicsPath', () => {
     expect(paths.clusterTopicsPath(clusterName)).toEqual(
-      `${paths.clusterPath(clusterName)}/topics`
+      `${paths.clusterPath(clusterName)}/all-topics`
     );
     expect(paths.clusterTopicsPath()).toEqual(
       paths.clusterTopicsPath(RouteParams.clusterName)
@@ -128,7 +128,7 @@ describe('Paths', () => {
   });
   it('clusterTopicNewPath', () => {
     expect(paths.clusterTopicNewPath(clusterName)).toEqual(
-      `${paths.clusterTopicsPath(clusterName)}/create-new`
+      `${paths.clusterTopicsPath(clusterName)}/create-new-topic`
     );
     expect(paths.clusterTopicNewPath()).toEqual(
       paths.clusterTopicNewPath(RouteParams.clusterName)
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 77f2c650b2c..e9a6326a570 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -111,8 +111,8 @@ export type ClusterSubjectParam = {
 };
 
 // Topics
-export const clusterTopicsRelativePath = 'topics';
-export const clusterTopicNewRelativePath = 'create-new';
+export const clusterTopicsRelativePath = 'all-topics';
+export const clusterTopicNewRelativePath = 'create-new-topic';
 export const clusterTopicCopyRelativePath = 'copy';
 export const clusterTopicsPath = (
   clusterName: ClusterName = RouteParams.clusterName
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 15af77fe52e..c5d54a8b598 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -181,6 +181,7 @@ const theme = {
         active: Colors.neutral[15],
       },
       color: Colors.neutral[90],
+      isActiveColor: Colors.neutral[0],
       invertedColors: {
         normal: Colors.neutral[50],
         hover: Colors.neutral[70],

From 7845476af1245b5113861ff3669fc10cc4678a6d Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 18 Jul 2022 17:08:32 +0400
Subject: [PATCH 075/734] =?UTF-8?q?fixing=20forms=20not=20no=20be=20able?=
 =?UTF-8?q?=20to=20submit=20until=20all=20required=20fields=20are=20f?=
 =?UTF-8?q?=E2=80=A6=20(#2221)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fixing forms not no be able to submit until all required fields are filled

* fixing topic form validation issue
---
 .../src/components/Schemas/New/New.tsx         | 12 ++++++------
 .../Topics/New/__test__/New.spec.tsx           | 18 +++++++++++++++---
 .../src/components/Topics/Topic/Edit/Edit.tsx  |  1 +
 .../Topics/Topic/Edit/__test__/Edit.spec.tsx   |  6 +++++-
 .../Topics/shared/Form/TopicForm.tsx           | 15 ++++++++++-----
 .../shared/Form/__tests__/TopicForm.spec.tsx   | 12 ++++++++++--
 kafka-ui-react-app/src/lib/yupExtended.ts      |  2 +-
 .../src/redux/interfaces/topic.ts              |  4 ++--
 .../reducers/topics/__test__/reducer.spec.ts   |  4 ++--
 .../src/redux/reducers/topics/topicsSlice.ts   |  8 ++++----
 10 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.tsx b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
index 0d9d171b1f2..1aa843d6b59 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
@@ -32,12 +32,12 @@ const New: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
-  const methods = useForm<NewSchemaSubjectRaw>();
+  const methods = useForm<NewSchemaSubjectRaw>({ mode: 'onChange' });
   const {
     register,
     handleSubmit,
     control,
-    formState: { isDirty, isSubmitting, errors },
+    formState: { isDirty, isSubmitting, errors, isValid },
   } = methods;
 
   const onSubmit = async ({
@@ -99,15 +99,15 @@ const New: React.FC = () => {
         <div>
           <InputLabel>Schema Type *</InputLabel>
           <Controller
-            defaultValue={SchemaTypeOptions[0].value as SchemaType}
             control={control}
             rules={{ required: 'Schema Type is required.' }}
             name="schemaType"
-            render={({ field: { name, onChange } }) => (
+            render={({ field: { name, onChange, value } }) => (
               <Select
                 selectSize="M"
                 name={name}
-                value={SchemaTypeOptions[0].value}
+                defaultValue={SchemaTypeOptions[0].value}
+                value={value}
                 onChange={onChange}
                 minWidth="50%"
                 disabled={isSubmitting}
@@ -124,7 +124,7 @@ const New: React.FC = () => {
           buttonSize="M"
           buttonType="primary"
           type="submit"
-          disabled={isSubmitting || !isDirty}
+          disabled={!isValid || isSubmitting || !isDirty}
         >
           Submit
         </Button>
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index aec534ce3e3..e03a2cfa0b1 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -80,7 +80,12 @@ describe('New', () => {
 
   it('validates form', async () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    userEvent.click(screen.getByText('Create topic'));
+    await waitFor(() => {
+      userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
+    });
+    await waitFor(() => {
+      userEvent.clear(screen.getByPlaceholderText('Topic Name'));
+    });
     await waitFor(() => {
       expect(screen.getByText('name is a required field')).toBeInTheDocument();
     });
@@ -96,8 +101,13 @@ describe('New', () => {
 
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
 
-    userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
-    userEvent.click(screen.getByText('Create topic'));
+    await act(() => {
+      userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
+    });
+
+    await act(() => {
+      userEvent.click(screen.getByText('Create topic'));
+    });
 
     await waitFor(() => expect(mockNavigate).toBeCalledTimes(1));
     expect(mockNavigate).toHaveBeenLastCalledWith(`../${topicName}`);
@@ -127,6 +137,8 @@ describe('New', () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
     await act(() => {
       userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
+    });
+    await act(() => {
       userEvent.click(screen.getByText('Create topic'));
     });
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
index 6de0b52545a..807c6e9c7b1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
@@ -92,6 +92,7 @@ const Edit: React.FC<Props> = ({
   const methods = useForm<TopicFormData>({
     defaultValues,
     resolver: yupResolver(topicFormValidationSchema),
+    mode: 'onChange',
   });
 
   const [isSubmitting, setIsSubmitting] = React.useState<boolean>(false);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
index 83214b376c8..02e11b9c4cf 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
@@ -117,13 +117,15 @@ describe('Edit Component', () => {
       renderComponent({ updateTopic: updateTopicMock }, undefined);
 
       const btn = screen.getAllByText(/Save/i)[0];
-      expect(btn).toBeEnabled();
 
       await act(() => {
         userEvent.type(
           screen.getByPlaceholderText('Min In Sync Replicas'),
           '1'
         );
+      });
+
+      await act(() => {
         userEvent.click(btn);
       });
       expect(updateTopicMock).toHaveBeenCalledTimes(1);
@@ -145,6 +147,8 @@ describe('Edit Component', () => {
           screen.getByPlaceholderText('Min In Sync Replicas'),
           '1'
         );
+      });
+      await act(() => {
         userEvent.click(btn);
       });
       expect(updateTopicMock).toHaveBeenCalledTimes(1);
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index d9d6427a25c..d2cb51fae5d 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -51,14 +51,14 @@ const TopicForm: React.FC<Props> = ({
 }) => {
   const {
     control,
-    formState: { errors },
+    formState: { errors, isDirty, isValid },
   } = useFormContext();
   const getCleanUpPolicy =
     CleanupPolicyOptions.find((option: SelectOption) => {
       return option.value === cleanUpPolicy?.toLowerCase();
     })?.value || CleanupPolicyOptions[0].value;
   return (
-    <StyledForm onSubmit={onSubmit}>
+    <StyledForm onSubmit={onSubmit} aria-label="topic form">
       <fieldset disabled={isSubmitting}>
         <fieldset disabled={isEditing}>
           <S.Column>
@@ -125,10 +125,10 @@ const TopicForm: React.FC<Props> = ({
               placeholder="Min In Sync Replicas"
               min="1"
               defaultValue={inSyncReplicas}
-              name="minInsyncReplicas"
+              name="minInSyncReplicas"
             />
             <FormError>
-              <ErrorMessage errors={errors} name="minInsyncReplicas" />
+              <ErrorMessage errors={errors} name="minInSyncReplicas" />
             </FormError>
           </div>
           <div>
@@ -209,7 +209,12 @@ const TopicForm: React.FC<Props> = ({
         <S.CustomParamsHeading>Custom parameters</S.CustomParamsHeading>
         <CustomParams isSubmitting={isSubmitting} />
         <S.ButtonWrapper>
-          <Button type="submit" buttonType="primary" buttonSize="L">
+          <Button
+            type="submit"
+            buttonType="primary"
+            buttonSize="L"
+            disabled={!isValid || isSubmitting || !isDirty}
+          >
             {isEditing ? 'Save' : 'Create topic'}
           </Button>
           <Button type="button" buttonType="primary" buttonSize="L">
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
index b224c8cd8e1..fa12e8728c1 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
@@ -1,9 +1,10 @@
 import React, { PropsWithChildren } from 'react';
 import { render } from 'lib/testHelpers';
-import { screen } from '@testing-library/dom';
+import { fireEvent, screen } from '@testing-library/dom';
 import { FormProvider, useForm } from 'react-hook-form';
 import TopicForm, { Props } from 'components/Topics/shared/Form/TopicForm';
 import userEvent from '@testing-library/user-event';
+import { act } from 'react-dom/test-utils';
 
 const isSubmitting = false;
 const onSubmit = jest.fn();
@@ -60,12 +61,19 @@ describe('TopicForm', () => {
     expectByRoleAndNameToBeInDocument('button', 'Create topic');
   });
 
-  it('submits', () => {
+  it('submits', async () => {
     renderComponent({
       isSubmitting,
       onSubmit: onSubmit.mockImplementation((e) => e.preventDefault()),
     });
 
+    await act(() => {
+      userEvent.type(screen.getByPlaceholderText('Topic Name'), 'topicName');
+    });
+    await act(() => {
+      fireEvent.submit(screen.getByLabelText('topic form'));
+    });
+
     userEvent.click(screen.getByRole('button', { name: 'Create topic' }));
     expect(onSubmit).toBeCalledTimes(1);
   });
diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index db185821095..967bc0bbafe 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -62,7 +62,7 @@ export const topicFormValidationSchema = yup.object().shape({
     .min(1)
     .required()
     .typeError('Replication factor is required and must be a number'),
-  minInsyncReplicas: yup
+  minInSyncReplicas: yup
     .number()
     .min(1)
     .required()
diff --git a/kafka-ui-react-app/src/redux/interfaces/topic.ts b/kafka-ui-react-app/src/redux/interfaces/topic.ts
index 647b0e69f9c..13aa74cf407 100644
--- a/kafka-ui-react-app/src/redux/interfaces/topic.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/topic.ts
@@ -64,7 +64,7 @@ export interface TopicFormDataRaw {
   name: string;
   partitions: number;
   replicationFactor: number;
-  minInsyncReplicas: number;
+  minInSyncReplicas: number;
   cleanupPolicy: string;
   retentionMs: number;
   retentionBytes: number;
@@ -76,7 +76,7 @@ export interface TopicFormData {
   name: string;
   partitions: number;
   replicationFactor: number;
-  minInsyncReplicas: number;
+  minInSyncReplicas: number;
   cleanupPolicy: string;
   retentionMs: number;
   retentionBytes: number;
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
index 9d6ccc8e596..b1bcae7ebc4 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
@@ -806,7 +806,7 @@ describe('topics Slice', () => {
         name: 'newTopic',
         partitions: 0,
         replicationFactor: 0,
-        minInsyncReplicas: 0,
+        minInSyncReplicas: 0,
         cleanupPolicy: 'DELETE',
         retentionMs: 1,
         retentionBytes: 1,
@@ -864,7 +864,7 @@ describe('topics Slice', () => {
         name: topicName,
         partitions: 0,
         replicationFactor: 0,
-        minInsyncReplicas: 0,
+        minInSyncReplicas: 0,
         cleanupPolicy: 'DELETE',
         retentionMs: 0,
         retentionBytes: 0,
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
index 2a13822b764..74362e1012d 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
@@ -92,7 +92,7 @@ export const formatTopicCreation = (form: TopicFormData): TopicCreation => {
     retentionBytes,
     retentionMs,
     maxMessageBytes,
-    minInsyncReplicas,
+    minInSyncReplicas,
     customParams,
   } = form;
 
@@ -105,7 +105,7 @@ export const formatTopicCreation = (form: TopicFormData): TopicCreation => {
       'retention.ms': retentionMs.toString(),
       'retention.bytes': retentionBytes.toString(),
       'max.message.bytes': maxMessageBytes.toString(),
-      'min.insync.replicas': minInsyncReplicas.toString(),
+      'min.insync.replicas': minInSyncReplicas.toString(),
       ...Object.values(customParams || {}).reduce(topicReducer, {}),
     },
   };
@@ -153,7 +153,7 @@ const formatTopicUpdate = (form: TopicFormDataRaw): TopicUpdate => {
     retentionBytes,
     retentionMs,
     maxMessageBytes,
-    minInsyncReplicas,
+    minInSyncReplicas,
     customParams,
   } = form;
 
@@ -163,7 +163,7 @@ const formatTopicUpdate = (form: TopicFormDataRaw): TopicUpdate => {
       'retention.ms': retentionMs,
       'retention.bytes': retentionBytes,
       'max.message.bytes': maxMessageBytes,
-      'min.insync.replicas': minInsyncReplicas,
+      'min.insync.replicas': minInSyncReplicas,
       ...Object.values(customParams || {}).reduce(topicReducer, {}),
     },
   };

From cfcadd122cb0802abb35f956550541ca501e7522 Mon Sep 17 00:00:00 2001
From: kshpilchyna <79516954+kshpilchyna@users.noreply.github.com>
Date: Mon, 18 Jul 2022 17:31:59 +0200
Subject: [PATCH 076/734] [e2e] Implement Qase.io integration (#2233)

* qase.io integration
moved all helpers/util to main/java

* fix for locator (message/content)

* fix for locator (message/content) v2

* refactoring due to review

* refactoring, added verification by @CaseId

* small fix with NullPointer

* TEST FAILED RUN

* TEST FAILED RUN2

* TEST FAILED RUN3

* removed token, set correct @CaseId

* added status SKIPED for manual tests or not automated
changed getting token .getenv

* fix for token

* changed cases limit to 100

* fix for getting token

* refactoring due review

* changed name of variable

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-e2e-checks/pom.xml                   |  31 ++--
 .../kafka/ui/extensions/FileUtils.java        |   0
 .../kafka/ui/extensions/QaseExtension.java    | 148 ++++++++++++++++
 .../kafka/ui/extensions/WaitUtils.java        |   0
 .../provectus/kafka/ui/helpers/ApiHelper.java |   5 +-
 .../provectus/kafka/ui/helpers/Helpers.java   |   0
 .../kafka/ui/helpers}/TestConfiguration.java  |   4 +-
 .../provectus/kafka/ui/pages/MainPage.java    |   4 +-
 .../com/provectus/kafka/ui/pages/Pages.java   |   0
 .../kafka/ui/pages/ProduceMessagePage.java    |   0
 .../pages/connector/ConnectorCreateView.java  |   2 +-
 .../pages/connector/ConnectorUpdateView.java  |   0
 .../ui/pages/connector/ConnectorsList.java    |   8 +-
 .../ui/pages/connector/ConnectorsView.java    |   4 +-
 .../ui/pages/schema/SchemaCreateView.java     |   8 +-
 .../kafka/ui/pages/schema/SchemaEditView.java |   0
 .../ui/pages/schema/SchemaRegistryList.java   |   2 +-
 .../kafka/ui/pages/schema/SchemaView.java     |   0
 .../topic/TopicCreateEditSettingsView.java    |  31 ++--
 .../kafka/ui/pages/topic/TopicView.java       |  10 +-
 .../kafka/ui/pages/topic/TopicsList.java      |   4 +-
 .../NoReferenceScreenshotFoundException.java  |   2 +-
 .../kafka/ui/screenshots/Screenshooter.java   |  29 ++--
 .../kafka/ui/utils/BrowserUtils.java          |   0
 ...CamelCaseToSpacedDisplayNameGenerator.java |   2 +-
 .../ui/utils/qaseIO/MethodNameUtils.java      |  23 +++
 .../kafka/ui/utils/qaseIO/Status.java         |   5 +
 .../ui/utils/qaseIO/TestCaseGenerator.java    | 164 ++++++++++++++++++
 .../qaseIO/annotation/AutomationStatus.java   |  12 ++
 .../ui/utils/qaseIO/annotation/Suite.java     |  10 ++
 ...it.platform.launcher.TestExecutionListener |   1 +
 .../com/provectus/kafka/ui/SmokeTests.java    |   5 +
 .../com/provectus/kafka/ui/base/BaseTest.java |  19 +-
 .../kafka/ui/tests/ConnectorsTests.java       |  21 ++-
 .../kafka/ui/tests/SchemasTests.java          |  32 +++-
 .../provectus/kafka/ui/tests/TopicTests.java  |  27 ++-
 36 files changed, 524 insertions(+), 89 deletions(-)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/extensions/FileUtils.java (100%)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/QaseExtension.java
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/extensions/WaitUtils.java (100%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/helpers/ApiHelper.java (96%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/helpers/Helpers.java (100%)
 rename kafka-ui-e2e-checks/src/{test/java/com/provectus/kafka/ui/base => main/java/com/provectus/kafka/ui/helpers}/TestConfiguration.java (95%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/MainPage.java (96%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/Pages.java (100%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java (100%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java (100%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java (100%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java (88%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java (90%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java (79%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java (100%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java (91%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/schema/SchemaView.java (100%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java (91%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/topic/TopicView.java (90%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/pages/topic/TopicsList.java (92%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java (71%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/screenshots/Screenshooter.java (81%)
 rename kafka-ui-e2e-checks/src/{test => main}/java/com/provectus/kafka/ui/utils/BrowserUtils.java (100%)
 rename kafka-ui-e2e-checks/src/{test/java/com/provectus/kafka/ui/base => main/java/com/provectus/kafka/ui/utils}/CamelCaseToSpacedDisplayNameGenerator.java (96%)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/MethodNameUtils.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/Status.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/TestCaseGenerator.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/AutomationStatus.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/Suite.java
 create mode 100644 kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 4148cf368b6..5f013a2b28d 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -14,25 +14,26 @@
         <kafka-ui-contract>${project.version}</kafka-ui-contract>
         <junit.version>5.8.2</junit.version>
         <aspectj.version>1.9.8</aspectj.version>
-        <allure.version>2.17.2</allure.version>
-        <json-smart.version>1.3.3</json-smart.version>
-        <testcontainers.version>1.16.3</testcontainers.version>
-        <selenide.version>6.3.0</selenide.version>
-        <assertj.version>3.17.1</assertj.version>
-        <google.auto-service.version>1.0-rc7</google.auto-service.version>
+        <allure.version>2.18.1</allure.version>
+        <json-smart.version>2.4.8</json-smart.version>
+        <testcontainers.version>1.17.2</testcontainers.version>
+        <selenide.version>6.6.3</selenide.version>
+        <assertj.version>3.23.1</assertj.version>
+        <google.auto-service.version>1.0.1</google.auto-service.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <slf4j.version>1.7.32</slf4j.version>
-        <testcontainers.junit-jupiter.version>1.16.3</testcontainers.junit-jupiter.version>
-        <allure.java-commons.version>2.17.2</allure.java-commons.version>
-        <dotenv.version>2.2.0</dotenv.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <testcontainers.junit-jupiter.version>1.17.2</testcontainers.junit-jupiter.version>
+        <allure.java-commons.version>2.18.1</allure.java-commons.version>
+        <dotenv.version>2.2.4</dotenv.version>
         <junit.platform-launcher.version>1.8.2</junit.platform-launcher.version>
         <allure.maven-plugin.version>2.6</allure.maven-plugin.version>
         <ashot.version>1.5.4</ashot.version>
-        <allure.screendiff-plugin.version>2.17.2</allure.screendiff-plugin.version>
+        <allure.screendiff-plugin.version>2.18.1</allure.screendiff-plugin.version>
         <maven.surefire-plugin.version>2.22.2</maven.surefire-plugin.version>
         <allure-maven.version>2.10.0</allure-maven.version>
         <kafka.version>3.0.0</kafka.version>
         <netty.version>4.1.77.Final</netty.version>
+        <qase.io.version>2.1.3</qase.io.version>
     </properties>
 
     <dependencies>
@@ -207,7 +208,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>${junit.platform-launcher.version}</version>
+           <version>${junit.platform-launcher.version}</version>
         </dependency>
         <dependency>
             <groupId>ru.yandex.qatools.allure</groupId>
@@ -234,7 +235,6 @@
             <groupId>com.provectus</groupId>
             <artifactId>kafka-ui-contract</artifactId>
             <version>${kafka-ui-contract}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
@@ -242,6 +242,11 @@
             <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.qase</groupId>
+            <artifactId>qase-api</artifactId>
+            <version>${qase.io.version}</version>
+        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/extensions/FileUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/FileUtils.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/extensions/FileUtils.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/FileUtils.java
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/QaseExtension.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/QaseExtension.java
new file mode 100644
index 00000000000..1f87d0d1bbe
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/QaseExtension.java
@@ -0,0 +1,148 @@
+package com.provectus.kafka.ui.extensions;
+
+import com.provectus.kafka.ui.utils.qaseIO.TestCaseGenerator;
+import io.qase.api.QaseClient;
+import io.qase.api.StepStorage;
+import io.qase.api.exceptions.QaseException;
+import io.qase.client.ApiClient;
+import io.qase.client.api.ResultsApi;
+import io.qase.client.model.ResultCreate;
+import io.qase.client.model.ResultCreate.StatusEnum;
+import io.qase.client.model.ResultCreateSteps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.junit.platform.engine.TestExecutionResult;
+import org.junit.platform.engine.TestSource;
+import org.junit.platform.engine.support.descriptor.MethodSource;
+import org.junit.platform.launcher.TestExecutionListener;
+import org.junit.platform.launcher.TestIdentifier;
+
+import javax.annotation.Nullable;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static io.qase.api.QaseClient.getConfig;
+import static io.qase.api.utils.IntegrationUtils.getCaseId;
+import static io.qase.api.utils.IntegrationUtils.getStacktrace;
+import static org.junit.platform.engine.TestExecutionResult.Status.SUCCESSFUL;
+
+@Slf4j
+public class QaseExtension implements TestExecutionListener {
+
+    private final ApiClient apiClient = QaseClient.getApiClient();
+    private final ResultsApi resultsApi = new ResultsApi(apiClient);
+    private final Map<TestIdentifier, Long> testStartTimes = new ConcurrentHashMap<>();
+    private static final String QASE_PROJECT = "KAFKAUI";
+    private static final String QASE_ENABLE = "true";
+
+
+    static {
+        String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
+
+        if (qaseApiToken == null || StringUtils.isEmpty(qaseApiToken)) {
+            throw new RuntimeException("QaseIO API token should be present");
+        }
+
+        if ("true".equalsIgnoreCase(System.getProperty("QASEIO_CREATE_TESTRUN"))) {
+            System.setProperty("QASE_RUN_NAME", "Automation run " +
+                    new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date()));
+        }
+        System.setProperty("QASE_ENABLE", QASE_ENABLE);
+        System.setProperty("QASE_PROJECT_CODE", QASE_PROJECT);
+        System.setProperty("QASE_API_TOKEN", qaseApiToken);
+        System.setProperty("QASE_USE_BULK", "false");
+    }
+
+
+    @Override
+    public void executionStarted(TestIdentifier testIdentifier) {
+        if (QaseClient.isEnabled() && testIdentifier.isTest()) {
+            testStartTimes.put(testIdentifier, System.currentTimeMillis());
+        }
+    }
+
+    @Override
+    public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
+        if (!testIdentifier.isTest() || !QaseClient.isEnabled()
+                || !testStartTimes.containsKey(testIdentifier)) {
+            return;
+        }
+        TestSource testSource = testIdentifier.getSource().orElse(null);
+        Method testMethod = null;
+        if (testSource instanceof MethodSource) {
+            testMethod = getMethod((MethodSource) testSource);
+        }
+        TestCaseGenerator.createTestCaseIfNotExists(testMethod);
+        Duration duration = Duration.ofMillis(System.currentTimeMillis() - this.testStartTimes.remove(testIdentifier));
+        sendResults(testExecutionResult, duration, testMethod);
+    }
+
+    private void sendResults(TestExecutionResult testExecutionResult, Duration timeSpent, Method testMethod) {
+        if (testMethod != null) {
+            ResultCreate resultCreate = getResultItem(testExecutionResult, timeSpent, testMethod);
+            try {
+                resultsApi.createResult(getConfig().projectCode(),
+                        getConfig().runId(),
+                        resultCreate);
+                log.info("Method = " + testMethod.getName() + ": Result added to test run with Id = {}", getConfig().runId());
+            } catch (QaseException e) {
+                log.error("Method = " + testMethod.getName() + ": Result not added to test Run because there is no @CaseId annotation or case not found", e);
+            }
+        }
+    }
+
+    private ResultCreate getResultItem(TestExecutionResult testExecutionResult, Duration timeSpent, Method testMethod) {
+        String testCaseTitle = TestCaseGenerator.generateTestCaseTitle(testMethod);
+        TestCaseGenerator.createTestCaseIfNotExists(testMethod);
+        Long caseId = getCaseId(testMethod);
+        Map<Long, String> cases = TestCaseGenerator.getTestCasesTitleAndId();
+        StatusEnum status = StatusEnum.SKIPPED;
+
+        if (caseId == null || !TestCaseGenerator.isCaseIdPresentInQaseIo(testMethod)) {
+            for (Map.Entry<Long, String> map : cases.entrySet()) {
+                if (map.getValue().matches(testCaseTitle)) {
+                    caseId = map.getKey();
+                    log.info("There is no annotation @CaseId but there is test case with title '" + testCaseTitle + "' and with id = " + caseId
+                            + " that will be added to test Run");
+                }
+            }
+        }
+
+        if (TestCaseGenerator.getAutomationStatus(testMethod) == 2) {
+            status = testExecutionResult.getStatus() == SUCCESSFUL ? StatusEnum.PASSED : StatusEnum.FAILED;
+        }
+
+        String comment = testExecutionResult.getThrowable()
+                .flatMap(throwable -> Optional.of(throwable.toString())).orElse(null);
+        Boolean isDefect = testExecutionResult.getThrowable()
+                .flatMap(throwable -> Optional.of(throwable instanceof AssertionError))
+                .orElse(false);
+        String stacktrace = testExecutionResult.getThrowable()
+                .flatMap(throwable -> Optional.of(getStacktrace(throwable))).orElse(null);
+        LinkedList<ResultCreateSteps> steps = StepStorage.getSteps();
+        return new ResultCreate()
+                .caseId(caseId)
+                .status(status)
+                .timeMs(timeSpent.toMillis())
+                .comment(comment)
+                .stacktrace(stacktrace)
+                .steps(steps.isEmpty() ? null : steps)
+                .defect(isDefect);
+    }
+
+    @Nullable
+    private Method getMethod(MethodSource testSource) {
+        try {
+            Class<?> testClass = Class.forName(testSource.getClassName());
+            return Arrays.stream(testClass.getDeclaredMethods())
+                    .filter(method -> MethodSource.from(method).equals(testSource))
+                    .findFirst().orElse(null);
+        } catch (ClassNotFoundException e) {
+            log.error(e.getMessage());
+            return null;
+        }
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/extensions/WaitUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WaitUtils.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/extensions/WaitUtils.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WaitUtils.java
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
similarity index 96%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
index c1394c8218c..62d8477fc0b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/ApiHelper.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
@@ -7,7 +7,6 @@
 import com.provectus.kafka.ui.api.api.SchemasApi;
 import com.provectus.kafka.ui.api.api.TopicsApi;
 import com.provectus.kafka.ui.api.model.*;
-import com.provectus.kafka.ui.base.TestConfiguration;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -23,7 +22,6 @@ public class ApiHelper {
 
     int partitions = 1;
     int replicationFactor = 1;
-    String newTopic = "new-topic";
     String baseURL = TestConfiguration.BASE_API_URL;
 
 
@@ -53,10 +51,9 @@ public void createTopic(String clusterName, String topicName) {
         topic.setName(topicName);
         topic.setPartitions(partitions);
         topic.setReplicationFactor(replicationFactor);
-        deleteTopic(clusterName, topicName);
-        sleep(2000);
         try {
             topicApi().createTopic(clusterName, topic).block();
+            sleep(2000);
         } catch (WebClientResponseException ex) {
             ex.printStackTrace();
         }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/Helpers.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/Helpers.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/Helpers.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/Helpers.java
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java
similarity index 95%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java
index f28533cfa4f..1134bf4f7e5 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/TestConfiguration.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.base;
+package com.provectus.kafka.ui.helpers;
 
 public class TestConfiguration {
   public static boolean CLEAR_REPORTS_DIR =
@@ -18,6 +18,6 @@ public class TestConfiguration {
   public static String BROWSER_SIZE = System.getProperty("BROWSER_SIZE", "1920x1080");
   public static Boolean ENABLE_VNC = Boolean.parseBoolean(System.getProperty("ENABLE_VNC", "true"));
   public static String IMAGE_NAME = System.getProperty("SELENIUM_DOCKER_IMAGE", "selenium/standalone-chrome");
-  public static String IMAGE_TAG = System.getProperty("SELENIUM_IMAGE_TAG", "102.0");
+  public static String IMAGE_TAG = System.getProperty("SELENIUM_IMAGE_TAG", "103.0");
 
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
similarity index 96%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
index 66a8d37eebd..7e2a6640a82 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
@@ -3,7 +3,7 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.base.TestConfiguration;
+import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
 import com.provectus.kafka.ui.pages.topic.TopicsList;
 import io.qameta.allure.Step;
@@ -48,7 +48,7 @@ public enum SideMenuOptions {
     CONSUMERS("Consumers"),
     SCHEMA_REGISTRY("Schema Registry");
 
-    String value;
+    final String value;
 
     SideMenuOptions(String value) {
       this.value = value;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
index 111d8544630..e87dcfe342f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
@@ -2,8 +2,8 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.extensions.WaitUtils;
 import com.provectus.kafka.ui.utils.BrowserUtils;
+import com.provectus.kafka.ui.extensions.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
similarity index 88%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
index c7fe0927532..13c2ce2b70f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
@@ -2,9 +2,9 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.base.TestConfiguration;
-import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.utils.BrowserUtils;
+import com.provectus.kafka.ui.extensions.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.SneakyThrows;
 import lombok.experimental.ExtensionMethod;
@@ -56,8 +56,8 @@ public ConnectorsList connectorIsVisibleInList(String connectorName, String topi
     }
 
     public ConnectorsList connectorIsUpdatedInList(String connectorName, String topicName) {
-        $(By.xpath("//a[text() = '%s']".formatted(connectorName))).shouldBe(Condition.visible);
-        By.xpath("//a[text() = '%s']".formatted(topicName)).refreshUntil(Condition.visible);
+        $(By.xpath(String.format("//a[text() = '%s']", connectorName))).shouldBe(Condition.visible);
+        By.xpath(String.format("//a[text() = '%s']", topicName)).refreshUntil(Condition.visible);
         return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
similarity index 90%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
index 7fb30466aa2..b180843f8d7 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
@@ -2,7 +2,7 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.base.TestConfiguration;
+import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
@@ -18,7 +18,7 @@ public class ConnectorsView {
 
     @Step
     public ConnectorsView goTo(String cluster, String connector) {
-        Selenide.open(TestConfiguration.BASE_WEB_URL + path.format(cluster, connector));
+        Selenide.open(String.format(TestConfiguration.BASE_WEB_URL + path, cluster, connector));
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
similarity index 79%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
index 641a08e12aa..3b304302d68 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
@@ -9,9 +9,9 @@
 
 public class SchemaCreateView {
 
-    private SelenideElement subjectName = $(By.xpath("//input[@name='subject']"));
-    private SelenideElement schemaField = $(By.xpath("//textarea[@name='schema']"));
-    private SelenideElement submitSchemaButton = $(By.xpath("//button[@type='submit']"));
+    private final SelenideElement subjectName = $(By.xpath("//input[@name='subject']"));
+    private final SelenideElement schemaField = $(By.xpath("//textarea[@name='schema']"));
+    private final SelenideElement submitSchemaButton = $(By.xpath("//button[@type='submit']"));
 
     public SchemaCreateView selectSchemaTypeFromDropdown(SchemaType schemaType) {
         $("ul[role='listbox']").click();
@@ -39,7 +39,7 @@ public enum SchemaType {
         JSON("JSON"),
         PROTOBUF("PROTOBUF");
 
-        String value;
+        final String value;
 
         SchemaType(String value) {
             this.value = value;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
similarity index 91%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index b7fe3f75e34..fac3d1bec62 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -11,7 +11,7 @@
 
 public class SchemaRegistryList {
 
-    private SelenideElement schemaButton = $(By.xpath("//*[contains(text(),'Create Schema')]"));
+    private final SelenideElement schemaButton = $(By.xpath("//*[contains(text(),'Create Schema')]"));
 
     public SchemaCreateView clickCreateSchema() {
         BrowserUtils.javaExecutorClick(schemaButton);
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
similarity index 91%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
index e2d293632ee..bd6bc8fc0de 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
@@ -1,13 +1,14 @@
 package com.provectus.kafka.ui.pages.topic;
 
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$$;
-import static com.codeborne.selenide.Selenide.$x;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.codeborne.selenide.*;
-import com.provectus.kafka.ui.utils.BrowserUtils;
+import com.codeborne.selenide.ClickOptions;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
+import com.codeborne.selenide.SelenideElement;
 import org.openqa.selenium.By;
+import com.provectus.kafka.ui.utils.BrowserUtils;
+
+import static com.codeborne.selenide.Selenide.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class TopicCreateEditSettingsView {
 
@@ -81,7 +82,7 @@ public TopicCreateEditSettingsView selectRetentionBytes(Long optionValue) {
     }
 
     public TopicView sendData() {
-        BrowserUtils.javaExecutorClick($(".ezTgzA.sc-bYEvvW"));
+        BrowserUtils.javaExecutorClick($x("//button[@type='submit']"));
         return new TopicView();
     }
 
@@ -101,8 +102,10 @@ public TopicCreateEditSettingsView addCustomParameter(String customParameterName
             customParametersElements = $$("ul[role=listbox][name^=customParams][name$=name]");
             kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.last());
         }
-        kafkaUISelectElement.selectByVisibleText(customParameterName);
-        $("input[name=\"customParams.%d.value\"]".formatted(customParametersElements.size() - 1))
+        if (kafkaUISelectElement != null) {
+            kafkaUISelectElement.selectByVisibleText(customParameterName);
+        }
+        $(String.format("input[name=\"customParams.%d.value\"]", customParametersElements.size() - 1))
                 .setValue(customParameterValue);
         return this;
     }
@@ -112,8 +115,10 @@ public TopicCreateEditSettingsView updateCustomParameter(String customParameterN
         SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
                 .find(Condition.exactText(customParameterName));
         String name = selenideElement.getAttribute("name");
-        name = name.substring(0, name.lastIndexOf("."));
-        $("input[name^=%s]".formatted(name)).setValue(customParameterValue);
+        if (name != null) {
+            name = name.substring(0, name.lastIndexOf("."));
+        }
+        $(String.format("input[name^=%s]", name)).setValue(customParameterValue);
         return this;
     }
 
@@ -154,7 +159,7 @@ public TopicCreateEditSettingsView maxMessageBytesIs(String bytes) {
 
     private static class KafkaUISelectElement {
 
-        private SelenideElement selectElement;
+        private final SelenideElement selectElement;
 
         public KafkaUISelectElement(String selectElementName) {
             this.selectElement = $("ul[role=listbox][name=" + selectElementName + "]");
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
similarity index 90%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index 25d750387ee..a71d49e0f51 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -3,7 +3,7 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.base.TestConfiguration;
+import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
 import com.provectus.kafka.ui.pages.ProduceMessagePage;
 import com.provectus.kafka.ui.utils.BrowserUtils;
@@ -57,7 +57,7 @@ public TopicsList deleteTopic() {
 
     @SneakyThrows
     public ProduceMessagePage clickOnButton(String buttonName) {
-        BrowserUtils.javaExecutorClick($(By.xpath("//div//button[text()='%s']".formatted(buttonName))));
+        BrowserUtils.javaExecutorClick($(By.xpath(String.format("//div//button[text()='%s']", buttonName))));
         return new ProduceMessagePage();
     }
 
@@ -66,13 +66,13 @@ public boolean isKeyMessageVisible(String keyMessage) {
     }
 
     public boolean isContentMessageVisible(String contentMessage) {
-        return contentMessage.equals($(".bPpPJI.sc-gkdBiK").getText());
+        return contentMessage.matches($x("//html//div[@id='root']/div/main//table//p").getText().trim());
     }
 
     private enum DotMenuHeaderItems {
         EDIT_SETTINGS("Edit settings"), CLEAR_MESSAGES("Clear messages"), REMOVE_TOPIC("Remove topic");
 
-        private String value;
+        private final String value;
 
         DotMenuHeaderItems(String value) {
             this.value = value;
@@ -91,7 +91,7 @@ public String toString() {
     public enum TopicMenu {
         OVERVIEW("Overview"), MESSAGES("Messages"), CONSUMERS("Consumers"), SETTINGS("Settings");
 
-        private String value;
+        private final String value;
 
         TopicMenu(String value) {
             this.value = value;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
similarity index 92%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 2d442391cda..cfd120f3a01 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -3,7 +3,7 @@
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.base.TestConfiguration;
+import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
@@ -33,7 +33,7 @@ public TopicsList isOnPage() {
 
     @Step
     public TopicCreateEditSettingsView pressCreateNewTopic(){
-        BrowserUtils.javaExecutorClick($(".qEXNn.sc-bYEvvW"));
+        BrowserUtils.javaExecutorClick($x("//button[normalize-space(text()) ='Add a Topic']"));
         return new TopicCreateEditSettingsView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java
similarity index 71%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java
index 1c2df03bc30..9818aab0115 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java
@@ -2,6 +2,6 @@
 
 public class NoReferenceScreenshotFoundException extends Throwable {
     public NoReferenceScreenshotFoundException(String name) {
-        super(("no reference screenshot found for %s".formatted(name)));
+        super("no reference screenshot found for " + name);
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/Screenshooter.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
similarity index 81%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
index ff07c84befe..66b016ba85e 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
@@ -20,25 +20,24 @@
 import java.util.List;
 
 import static com.codeborne.selenide.WebDriverRunner.getWebDriver;
-import static org.junit.jupiter.api.Assertions.fail;
 
 public class Screenshooter {
 
   public static  Logger log = LoggerFactory.getLogger(Screenshooter.class);
 
-  private static int PIXELS_THRESHOLD =
+  private static final int PIXELS_THRESHOLD =
       Integer.parseInt(System.getProperty("PIXELS_THRESHOLD", "200"));
-  private static String SCREENSHOTS_FOLDER =
-      System.getProperty("SCREENSHOTS_FOLDER", "screenshots/");
-  private static String DIFF_SCREENSHOTS_FOLDER =
+  private static final String SCREENSHOTS_FOLDER =
+      System.getProperty("SCREENSHOTS_FOLDER", "com/provectus/kafka/ui/screenshots/");
+  private static final String DIFF_SCREENSHOTS_FOLDER =
       System.getProperty("DIFF_SCREENSHOTS_FOLDER", "build/__diff__/");
-  private static String ACTUAL_SCREENSHOTS_FOLDER =
+  private static final String ACTUAL_SCREENSHOTS_FOLDER =
       System.getProperty("ACTUAL_SCREENSHOTS_FOLDER", "build/__actual__/");
-  private static boolean SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST =
+  private static final boolean SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST =
       Boolean.parseBoolean(System.getProperty("SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST", "true"));
-  private static boolean TURN_OFF_SCREENSHOTS =
+  private static final boolean TURN_OFF_SCREENSHOTS =
       Boolean.parseBoolean(System.getProperty("TURN_OFF_SCREENSHOTS", "false"));
-  private static boolean USE_LOCAL_BROWSER =
+  private static final boolean USE_LOCAL_BROWSER =
           Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "false"));
 
   private File newFile(String name) {
@@ -61,8 +60,8 @@ public void compareScreenshots(String name) {
   @SneakyThrows
   public void compareScreenshots(String name, boolean shouldUpdateScreenshotIfDiffer) {
     if (TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER) {
-      log.warn("compareScreenshots turned off due TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER: %b || %b"
-              .formatted(TURN_OFF_SCREENSHOTS,USE_LOCAL_BROWSER));
+      log.warn(String.format("compareScreenshots turned off due TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER: %b || %b"
+              , TURN_OFF_SCREENSHOTS,USE_LOCAL_BROWSER));
       return;
     }
     if (!doesScreenshotExist(name)) {
@@ -82,7 +81,7 @@ private void updateActualScreenshot(String name) {
         new AShot().coordsProvider(new WebDriverCoordsProvider()).takeScreenshot(getWebDriver());
     File  file=  newFile(SCREENSHOTS_FOLDER + name + ".png");
     ImageIO.write(actual.getImage(), "png", file);
-    log.debug("created screenshot: %s \n at $s".formatted(name,file.getAbsolutePath()));
+    log.debug(String.format("created screenshot: %s \n at %s", name, file.getAbsolutePath()));
   }
 
   private static boolean doesScreenshotExist(String name) {
@@ -120,9 +119,9 @@ private void makeImageDiff(String expectedName, boolean shouldUpdateScreenshotIf
     } else {
       Assertions.assertTrue(
           PIXELS_THRESHOLD >= diff.getDiffSize(),
-              ("Amount of differing pixels should be less or equals than %s, actual %s\n"+
-                  "diff file: %s")
-              .formatted(PIXELS_THRESHOLD, diff.getDiffSize(), FileSystems.getDefault().getPath(fullPathNameDiff).normalize().toAbsolutePath().toString()));
+              String.format("Amount of differing pixels should be less or equals than %s, actual %s\n"+
+                  "diff file: %s",
+              PIXELS_THRESHOLD, diff.getDiffSize(), FileSystems.getDefault().getPath(fullPathNameDiff).normalize().toAbsolutePath()));
     }
   }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/utils/BrowserUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/BrowserUtils.java
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/utils/BrowserUtils.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/BrowserUtils.java
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/CamelCaseToSpacedDisplayNameGenerator.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/CamelCaseToSpacedDisplayNameGenerator.java
similarity index 96%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/CamelCaseToSpacedDisplayNameGenerator.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/CamelCaseToSpacedDisplayNameGenerator.java
index 105f15e83a9..f5c0d689afe 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/CamelCaseToSpacedDisplayNameGenerator.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/CamelCaseToSpacedDisplayNameGenerator.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.base;
+package com.provectus.kafka.ui.utils;
 
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.platform.commons.util.ClassUtils;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/MethodNameUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/MethodNameUtils.java
new file mode 100644
index 00000000000..3bd8bf67364
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/MethodNameUtils.java
@@ -0,0 +1,23 @@
+package com.provectus.kafka.ui.utils.qaseIO;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class MethodNameUtils {
+
+    public static String formatTestCaseTitle(String testMethodName) {
+        String[] split = StringUtils.splitByCharacterTypeCamelCase(testMethodName);
+
+        String[] name = Arrays.stream(split).map(String::toLowerCase).toArray(String[]::new);
+
+        String[] subarray = ArrayUtils.subarray(name, 1, name.length);
+
+        ArrayList<String> stringList = new ArrayList<>(Arrays.asList(subarray));
+        stringList.add(0, StringUtils.capitalize(name[0]));
+
+        return StringUtils.join(stringList, " ");
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/Status.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/Status.java
new file mode 100644
index 00000000000..534a153014e
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/Status.java
@@ -0,0 +1,5 @@
+package com.provectus.kafka.ui.utils.qaseIO;
+
+public enum Status {
+    AUTOMATED, TO_BE_AUTOMATED, MANUAL;
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/TestCaseGenerator.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/TestCaseGenerator.java
new file mode 100644
index 00000000000..8f1f57d8aed
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/TestCaseGenerator.java
@@ -0,0 +1,164 @@
+package com.provectus.kafka.ui.utils.qaseIO;
+
+import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
+import io.qase.api.QaseClient;
+import io.qase.api.annotation.CaseId;
+import io.qase.client.ApiClient;
+import io.qase.client.api.CasesApi;
+import io.qase.client.model.*;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.junit.platform.engine.support.descriptor.MethodSource;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import static io.qase.api.QaseClient.getConfig;
+
+@Slf4j
+public class TestCaseGenerator {
+
+    public static boolean FAILED = false;
+    private static final ApiClient apiClient = QaseClient.getApiClient();
+    private static final CasesApi casesApi = new CasesApi(apiClient);
+
+    @SneakyThrows
+    public static void createTestCaseIfNotExists(Method testMethod) {
+        TestCaseCreate caseCreate = new TestCaseCreate();
+        String testCaseTitle = generateTestCaseTitle(testMethod);
+        if (!isMethodAnnotatedWithCaseId(testMethod) || !TestCaseGenerator.isCaseIdPresentInQaseIo(testMethod)) {
+            if (!isCaseTitleExistInQaseIo(testMethod)) {
+                caseCreate.setTitle(testCaseTitle);
+                caseCreate.setAutomation(getAutomationStatus(testMethod));
+                if (isMethodAnnotatedWithSuite(testMethod)) {
+                    long suiteId = testMethod.getAnnotation(Suite.class).suiteId();
+                    caseCreate.suiteId(suiteId);
+                }
+                Long caseId = Objects.requireNonNull(casesApi.createCase(getConfig().projectCode(), caseCreate).getResult()).getId();
+                log.info("New test case = '" + testCaseTitle + "' created with id " + caseId);
+            }
+        }
+    }
+
+    @SneakyThrows
+    public static HashMap<Long, String> getTestCasesTitleAndId() {
+        HashMap<Long, String> map = new HashMap<>();
+        boolean getCases = true;
+        int offSet = 0;
+        while (getCases) {
+            getCases = false;
+            TestCaseListResponse response =
+                    casesApi.getCases(getConfig().projectCode(), new Filters().status(Filters.SERIALIZED_NAME_STATUS), 100, offSet);
+            TestCaseListResponseAllOfResult result = response.getResult();
+            Assert.assertNotNull(result);
+            List<TestCase> entities = result.getEntities();
+            Assert.assertNotNull(entities);
+            if (entities.size() > 0) {
+                for (TestCase test : entities) {
+                    map.put(test.getId(), test.getTitle());
+                }
+                offSet = offSet + 100;
+                getCases = true;
+            }
+        }
+        return map;
+    }
+
+    public static boolean isCaseIdPresentInQaseIo(Method testMethod) {
+        if (!testMethod.isAnnotationPresent(CaseId.class)) {
+            return false;
+        }
+        long caseId = testMethod.getAnnotation(CaseId.class).value();
+        HashMap<Long, String> cases = getTestCasesTitleAndId();
+        String title;
+        if (!cases.containsKey(caseId)) {
+            FAILED = true;
+            log.error("The method " + testMethod.getName() + " has wrong @CaseId =" + caseId + " that does not exist in Qase.io. " +
+                    "Please put correct @CaseId");
+            return false;
+        } else {
+            for (Map.Entry<Long, String> map : cases.entrySet()) {
+                if (map.getKey().equals(caseId)) {
+                    title = map.getValue();
+                    if (!title.matches(generateTestCaseTitle(testMethod))) {
+                        log.error("This CaseId =" + caseId + " belong to test with title = " + title);
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    private static boolean isCaseTitleExistInQaseIo(Method testMethod) {
+        HashMap<Long, String> cases = getTestCasesTitleAndId();
+        String title = generateTestCaseTitle(testMethod);
+        if (cases.containsValue(title)) {
+            for (Map.Entry<Long, String> map : cases.entrySet()) {
+                if (map.getValue().matches(title)) {
+                    long caseId = map.getKey();
+                    log.info("Test case with title '" + title + "' and id " + caseId + " exist in Qase.io. Verify that annotation @CaseId is correct");
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static int getAutomationStatus(Method testMethod) {
+        if (testMethod.isAnnotationPresent(AutomationStatus.class)) {
+            if (testMethod.getAnnotation(AutomationStatus.class).status().equals(Status.TO_BE_AUTOMATED))
+                return 1;
+            else if (testMethod.getAnnotation(AutomationStatus.class).status().equals(Status.MANUAL))
+                return 0;
+        }
+        return 2;
+    }
+
+    private static boolean isMethodAnnotatedWithCaseId(Method testMethod) {
+        if (!testMethod.isAnnotationPresent(CaseId.class)) {
+            FAILED = true;
+            log.error("You must put annotation @CaseId. The method " + testMethod.getName() + " is NOT annotated with @CaseId.");
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean isMethodAnnotatedWithSuite(Method testMethod) {
+        if (!testMethod.isAnnotationPresent(Suite.class)) {
+            log.info("The method " + testMethod.getName() + " is not annotated with @Suite and new test case will be added without suite");
+            return false;
+        }
+        log.trace("The method is annotated with @Suite with id " + testMethod.getAnnotation(Suite.class).suiteId());
+        return true;
+    }
+
+    private static boolean isMethodAnnotatedWithAutomationStatus(Method testMethod) {
+        if (!testMethod.isAnnotationPresent(AutomationStatus.class)) {
+            log.error("The method " + testMethod.getName() + " is NOT annotated with @AutomationStatus.");
+            return false;
+        }
+        return true;
+    }
+
+    public static String generateTestCaseTitle(Method testMethod) {
+        return getClassName(MethodSource.from(testMethod)) + "." + testMethod.getName() + " : " +
+                MethodNameUtils.formatTestCaseTitle(testMethod.getName());
+    }
+
+    private static String getClassName(MethodSource testSource) {
+        Class<?> testClass;
+        try {
+            testClass = Class.forName(testSource.getClassName());
+        } catch (ClassNotFoundException e) {
+            log.error(e.getMessage());
+            return null;
+        }
+        return testClass.getSimpleName();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/AutomationStatus.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/AutomationStatus.java
new file mode 100644
index 00000000000..d6b7734412c
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/AutomationStatus.java
@@ -0,0 +1,12 @@
+package com.provectus.kafka.ui.utils.qaseIO.annotation;
+
+import com.provectus.kafka.ui.utils.qaseIO.Status;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AutomationStatus {
+
+    Status status();
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/Suite.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/Suite.java
new file mode 100644
index 00000000000..c70fe0308b7
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/Suite.java
@@ -0,0 +1,10 @@
+package com.provectus.kafka.ui.utils.qaseIO.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Suite {
+    long suiteId();
+    String title();
+}
diff --git a/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
new file mode 100644
index 00000000000..a63e49fe756
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
@@ -0,0 +1 @@
+com.provectus.kafka.ui.extensions.QaseExtension
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
index 214dd8d6f50..e52d9dc1d87 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
@@ -1,12 +1,17 @@
 package com.provectus.kafka.ui;
 
 import com.provectus.kafka.ui.base.BaseTest;
+import com.provectus.kafka.ui.utils.qaseIO.Status;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
+import io.qase.api.annotation.CaseId;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 public class SmokeTests extends BaseTest {
     @Test
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(198)
     @SneakyThrows
     @DisplayName("main page should load")
     void mainPageLoads() {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 2f41f8a95b3..a188d0fd7fe 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -4,9 +4,11 @@
 import com.codeborne.selenide.WebDriverRunner;
 import com.codeborne.selenide.logevents.SelenideLogger;
 import com.provectus.kafka.ui.helpers.Helpers;
+import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.pages.Pages;
 import com.provectus.kafka.ui.screenshots.Screenshooter;
-import com.provectus.kafka.ui.steps.Steps;
+import com.provectus.kafka.ui.utils.CamelCaseToSpacedDisplayNameGenerator;
+import com.provectus.kafka.ui.utils.qaseIO.TestCaseGenerator;
 import io.github.cdimascio.dotenv.Dotenv;
 import io.qameta.allure.Allure;
 import io.qameta.allure.selenide.AllureSelenide;
@@ -33,7 +35,6 @@
 @DisplayNameGeneration(CamelCaseToSpacedDisplayNameGenerator.class)
 public class BaseTest {
 
-    protected Steps steps = Steps.INSTANCE;
     protected Pages pages = Pages.INSTANCE;
     protected Helpers helpers = Helpers.INSTANCE;
 
@@ -52,7 +53,7 @@ public void compareScreenshots(String name, Boolean shouldUpdateScreenshots) {
     }
 
     @BeforeEach
-    public void setWebDriver(){
+    public void setWebDriver() {
         RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
         WebDriverRunner.setWebDriver(remoteWebDriver);
         remoteWebDriver.manage().window().setSize(new Dimension(1440, 1024));
@@ -72,8 +73,8 @@ public static void start() {
     }
 
     @AfterAll
-    public static void tearDown(){
-        if(webDriverContainer.isRunning()) {
+    public static void tearDown() {
+        if (webDriverContainer.isRunning()) {
             webDriverContainer.close();
             webDriverContainer.stop();
         }
@@ -93,6 +94,12 @@ public static void tearDown(){
             clearReports();
         }
         setup();
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                if (TestCaseGenerator.FAILED) {
+                    log.error("Tests FAILED because some problem with @CaseId annotation. Verify that all tests annotated with @CaseId and Id is correct!");
+                    Runtime.getRuntime().halt(100500);
+                }
+        }));
     }
 
     @AfterEach
@@ -115,7 +122,7 @@ private static void setup() {
     }
 
     public static void clearReports() {
-        log.info("Clearing reports dir [%s]...".formatted(TestConfiguration.REPORTS_FOLDER));
+        log.info(String.format("Clearing reports dir [%s]...", TestConfiguration.REPORTS_FOLDER));
         File allureResults = new File(TestConfiguration.REPORTS_FOLDER);
         if (allureResults.isDirectory()) {
             File[] list = allureResults.listFiles();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index da850acb39d..57002ee5b6b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -4,14 +4,20 @@
 import com.provectus.kafka.ui.extensions.FileUtils;
 import com.provectus.kafka.ui.helpers.ApiHelper;
 import com.provectus.kafka.ui.helpers.Helpers;
+import com.provectus.kafka.ui.utils.qaseIO.Status;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
+import io.qase.api.annotation.CaseId;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
 
 public class ConnectorsTests extends BaseTest {
 
+    private final long suiteId = 10;
+    private final String suiteTitle = "Kafka Connect";
     public static final String LOCAL_CLUSTER = "local";
     public static final String SINK_CONNECTOR = "sink_postgres_activities_e2e_checks";
     public static final String TOPIC_FOR_CONNECTOR = "topic_for_connector";
@@ -58,6 +64,9 @@ public static void afterAll() {
 
     @SneakyThrows
     @DisplayName("should create a connector")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(42)
     @Test
     public void createConnector() {
         pages.openConnectorsList(LOCAL_CLUSTER)
@@ -74,26 +83,32 @@ public void createConnector() {
 
     @SneakyThrows
     @DisplayName("should update a connector")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(196)
     @Test
     public void updateConnector() {
         pages.openConnectorsList(LOCAL_CLUSTER)
                 .isOnPage()
                 .openConnector(CONNECTOR_FOR_UPDATE);
-                pages.connectorsView.connectorIsVisibleOnOverview();
+        pages.connectorsView.connectorIsVisibleOnOverview();
         pages.connectorsView.openEditConfig()
-                        .updConnectorConfig(FileUtils.getResourceAsString("config_for_update_connector.json"));
+                .updConnectorConfig(FileUtils.getResourceAsString("config_for_update_connector.json"));
         pages.openConnectorsList(LOCAL_CLUSTER)
                 .connectorIsVisibleInList(CONNECTOR_FOR_UPDATE, TOPIC_FOR_UPDATE_CONNECTOR);
     }
 
     @SneakyThrows
     @DisplayName("should delete connector")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(195)
     @Test
     public void deleteConnector() {
         pages.openConnectorsList(LOCAL_CLUSTER)
                 .isOnPage()
                 .openConnector(CONNECTOR_FOR_DELETE);
-                pages.connectorsView.clickDeleteButton();
+        pages.connectorsView.clickDeleteButton();
         pages.openConnectorsList(LOCAL_CLUSTER)
                 .isNotVisible(CONNECTOR_FOR_DELETE);
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index c69b83825d0..d7f1bf9c0c6 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -6,14 +6,22 @@
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.pages.MainPage;
 import com.provectus.kafka.ui.pages.schema.SchemaCreateView;
+import com.provectus.kafka.ui.utils.qaseIO.Status;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
+import io.qase.api.annotation.CaseId;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
+
+import java.io.IOException;
 
 import static org.apache.kafka.common.utils.Utils.readFileAsString;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class SchemasTests extends BaseTest {
 
+    private final long suiteId = 11;
+    private final String suiteTitle = "Schema Registry";
     public static final String SECOND_LOCAL = "secondLocal";
     public static final String SCHEMA_AVRO_CREATE = "avro_schema";
     public static final String SCHEMA_JSON_CREATE = "json_schema";
@@ -49,11 +57,13 @@ public static void afterAll() {
 
     }
 
-    @SneakyThrows
     @DisplayName("should create AVRO schema")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(43)
     @Test
     @Order(1)
-    void createSchemaAvro() {
+    void createSchemaAvro() throws IOException {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
@@ -69,6 +79,9 @@ void createSchemaAvro() {
 
     @SneakyThrows
     @DisplayName("should update AVRO schema")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(186)
     @Test
     @Order(2)
     void updateSchemaAvro() {
@@ -86,6 +99,9 @@ void updateSchemaAvro() {
 
     @SneakyThrows
     @DisplayName("should delete AVRO schema")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(187)
     @Test
     @Order(3)
     void deleteSchemaAvro() {
@@ -99,6 +115,9 @@ void deleteSchemaAvro() {
 
     @SneakyThrows
     @DisplayName("should create JSON schema")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(89)
     @Test
     @Order(4)
     void createSchemaJson() {
@@ -117,6 +136,9 @@ void createSchemaJson() {
 
     @SneakyThrows
     @DisplayName("should delete JSON schema")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(189)
     @Test
     @Order(5)
     void deleteSchemaJson() {
@@ -130,6 +152,9 @@ void deleteSchemaJson() {
 
     @SneakyThrows
     @DisplayName("should create PROTOBUF schema")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(91)
     @Test
     @Order(6)
     void createSchemaProtobuf() {
@@ -148,6 +173,9 @@ void createSchemaProtobuf() {
 
     @SneakyThrows
     @DisplayName("should delete PROTOBUF schema")
+    @Suite(suiteId = suiteId, title = suiteTitle)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(223)
     @Test
     @Order(7)
     void deleteSchemaProtobuf() {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index fc2c8ccfaa3..068b9cf1bd2 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -4,13 +4,16 @@
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.pages.MainPage;
 import com.provectus.kafka.ui.pages.topic.TopicView;
+import com.provectus.kafka.ui.utils.qaseIO.Status;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
 import io.qameta.allure.Issue;
+import io.qase.api.annotation.CaseId;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
 
 import static org.apache.kafka.common.utils.Utils.readFileAsString;
 
-
 public class TopicTests extends BaseTest {
 
     public static final String NEW_TOPIC = "new-topic";
@@ -25,8 +28,6 @@ public class TopicTests extends BaseTest {
     private static final String CONTENT_TO_PRODUCE_MESSAGE = System.getProperty("user.dir") + "/src/test/resources/testData.txt";
 
 
-
-
     @BeforeAll
     @SneakyThrows
     public static void beforeAll() {
@@ -44,6 +45,9 @@ public static void afterAll() {
 
     @SneakyThrows
     @DisplayName("should create a topic")
+    @Suite(suiteId = 4, title = "Create new Topic")
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(199)
     @Test
     public void createTopic() {
         pages.open()
@@ -65,6 +69,9 @@ public void createTopic() {
     @SneakyThrows
     @DisplayName("should update a topic")
     @Issue("1500")
+    @Suite(suiteId = 2, title = "Topics")
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(197)
     @Test
     public void updateTopic() {
         pages.openTopicsList(SECOND_LOCAL)
@@ -93,6 +100,9 @@ public void updateTopic() {
 
     @SneakyThrows
     @DisplayName("should delete topic")
+    @Suite(suiteId = 2, title = "Topics")
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(207)
     @Test
     public void deleteTopic() {
         pages.openTopicsList(SECOND_LOCAL)
@@ -104,12 +114,13 @@ public void deleteTopic() {
                 .isTopicNotVisible(TOPIC_TO_DELETE);
     }
 
-    @Disabled("Due to issue https://github.com/provectus/kafka-ui/issues/2140 ignore this test")
-    @Issue("2140")
     @SneakyThrows
     @DisplayName("produce message")
+    @Suite(suiteId = 2, title = "Topics")
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(222)
     @Test
-    void produceMessage(){
+    void produceMessage() {
         pages.openTopicsList(SECOND_LOCAL)
                 .isOnPage()
                 .openTopic(TOPIC_TO_UPDATE)
@@ -119,7 +130,7 @@ void produceMessage(){
                 .setContentFiled(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE))
                 .setKeyField(readFileAsString(KEY_TO_PRODUCE_MESSAGE))
                 .submitProduceMessage();
-                Assertions.assertTrue(pages.topicView.isKeyMessageVisible(readFileAsString(KEY_TO_PRODUCE_MESSAGE)));
-                Assertions.assertTrue(pages.topicView.isContentMessageVisible(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE)));
+        Assertions.assertTrue(pages.topicView.isKeyMessageVisible(readFileAsString(KEY_TO_PRODUCE_MESSAGE)));
+        Assertions.assertTrue(pages.topicView.isContentMessageVisible(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE).trim()));
     }
 }

From 7d4e42c8601e0bba7b8f590964b7e8e1c92fafeb Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 18 Jul 2022 18:33:44 +0300
Subject: [PATCH 077/734] got rid of the dead code (#2286)

---
 .../Broker/BrokerLogdir/BrokerLogdir.tsx      |  2 +-
 .../ResetOffsets/ResetOffsets.styled.ts       | 24 -------------
 .../Details/ResetOffsets/__test__/fixtures.ts | 35 -------------------
 .../KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx     | 18 +---------
 .../Query/QueryForm/QueryForm.styled.ts       | 21 -----------
 .../KsqlDb/Query/QueryForm/QueryForm.tsx      |  3 +-
 .../Details/Messages/Filters/Filters.tsx      |  2 +-
 .../Details/Messages/Filters/InfoModal.tsx    |  2 +-
 .../Topics/Topic/Edit/__test__/fixtures.ts    |  4 +--
 .../common/Dropdown/DropdownItem.tsx          |  2 +-
 .../src/components/common/Switch/Switch.tsx   |  2 +-
 .../common/heading/Heading.styled.tsx         |  4 +--
 kafka-ui-react-app/src/lib/paths.ts           |  7 ++--
 .../src/redux/interfaces/alerts.ts            |  4 ---
 .../src/redux/interfaces/broker.ts            |  7 ----
 .../src/redux/interfaces/cluster.ts           |  2 --
 .../src/redux/interfaces/index.ts             |  1 -
 .../src/redux/interfaces/ksqlDb.ts            |  7 ----
 .../src/redux/interfaces/loader.ts            |  3 --
 .../src/redux/interfaces/schema.ts            |  8 -----
 .../src/redux/interfaces/topic.ts             | 24 +++----------
 .../consumerGroups/__test__/fixtures.ts       |  5 ---
 .../consumerGroups/consumerGroupsSlice.ts     |  2 +-
 .../reducers/ksqlDb/__test__/fixtures.ts      | 23 ------------
 .../src/redux/reducers/ksqlDb/ksqlDbSlice.ts  | 19 ++--------
 .../src/redux/reducers/loader/loaderSlice.ts  |  4 +--
 .../reducers/schemas/__test__/fixtures.ts     | 14 --------
 .../redux/reducers/schemas/schemasSlice.ts    | 12 +++----
 .../topicMessages/topicMessagesSlice.ts       |  2 +-
 .../src/redux/reducers/topics/selectors.ts    | 24 +------------
 .../src/redux/reducers/topics/topicsSlice.ts  |  4 +--
 31 files changed, 33 insertions(+), 258 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/fixtures.ts
 delete mode 100644 kafka-ui-react-app/src/redux/interfaces/broker.ts

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
index f14fbb02943..9bd00458c13 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
@@ -7,7 +7,7 @@ import { useTableState } from 'lib/hooks/useTableState';
 import { ClusterBrokerParam } from 'lib/paths';
 import { useBrokerLogDirs } from 'lib/hooks/api/brokers';
 
-export interface BrokerLogdirState {
+interface BrokerLogdirState {
   name: string;
   error: string;
   topics: number;
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts
index 65c5b8371dd..fc1b22f607a 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts
@@ -1,4 +1,3 @@
-import ReactDatePicker from 'react-datepicker';
 import styled from 'styled-components';
 
 export const Wrapper = styled.div`
@@ -26,29 +25,6 @@ export const Wrapper = styled.div`
   }
 `;
 
-export const DatePickerInput = styled(ReactDatePicker)`
-  height: 32px;
-  border: 1px ${(props) => props.theme.select.borderColor.normal} solid;
-  border-radius: 4px;
-  font-size: 14px;
-  width: 50%;
-  padding-left: 12px;
-  color: ${(props) => props.theme.select.color.normal};
-
-  background-image: url('data:image/svg+xml,%3Csvg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M1 1L5 5L9 1" stroke="%23454F54"/%3E%3C/svg%3E%0A') !important;
-  background-repeat: no-repeat !important;
-  background-position-x: 96% !important;
-  background-position-y: 55% !important;
-  appearance: none !important;
-
-  &:hover {
-    cursor: pointer;
-  }
-  &:focus {
-    outline: none;
-  }
-`;
-
 export const MainSelectors = styled.div`
   display: flex;
   gap: 16px;
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/fixtures.ts b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/fixtures.ts
deleted file mode 100644
index c4833d79070..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/fixtures.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-export const expectedOutputs = {
-  EARLIEST: {
-    partitions: [0],
-    partitionsOffsets: [
-      {
-        offset: undefined,
-        partition: 0,
-      },
-    ],
-    resetType: 'EARLIEST',
-    topic: '__amazon_msk_canary',
-  },
-  LATEST: {
-    partitions: [0],
-    partitionsOffsets: [
-      {
-        offset: undefined,
-        partition: 0,
-      },
-    ],
-    resetType: 'LATEST',
-    topic: '__amazon_msk_canary',
-  },
-  OFFSET: {
-    partitions: [0],
-    partitionsOffsets: [
-      {
-        offset: '10',
-        partition: 0,
-      },
-    ],
-    resetType: 'OFFSET',
-    topic: '__amazon_msk_canary',
-  },
-};
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
index 88dcf128c6e..8ea83b54904 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
@@ -4,7 +4,6 @@ import { KsqlStreamDescription, KsqlTableDescription } from 'generated-sources';
 import { useTableState } from 'lib/hooks/useTableState';
 import { SmartTable } from 'components/common/SmartTable/SmartTable';
 import { TableColumn } from 'components/common/SmartTable/TableColumn';
-import { KsqlDescription } from 'redux/interfaces/ksqlDb';
 import { ksqlRowData } from 'components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData';
 
 export enum KsqlDbItemType {
@@ -12,7 +11,7 @@ export enum KsqlDbItemType {
   Streams = 'streams',
 }
 
-export interface RowsType {
+interface RowsType {
   tables: KsqlTableDescription[];
   streams: KsqlStreamDescription[];
 }
@@ -22,13 +21,6 @@ export interface KsqlDbItemProps {
   rows: RowsType;
 }
 
-export type KsqlDescriptionAccessor = keyof KsqlDescription;
-
-export interface HeadersType {
-  Header: string;
-  accessor: KsqlDescriptionAccessor;
-}
-
 export interface KsqlTableState {
   name: string;
   topic: string;
@@ -37,14 +29,6 @@ export interface KsqlTableState {
   isWindowed: string;
 }
 
-export const headers: HeadersType[] = [
-  { Header: 'Name', accessor: 'name' },
-  { Header: 'Topic', accessor: 'topic' },
-  { Header: 'Key Format', accessor: 'keyFormat' },
-  { Header: 'Value Format', accessor: 'valueFormat' },
-  { Header: 'Is Windowed', accessor: 'isWindowed' },
-];
-
 const KsqlDbItem: React.FC<KsqlDbItemProps> = ({ type, fetching, rows }) => {
   const preparedRows = rows[type]?.map(ksqlRowData) || [];
   const tableState = useTableState<KsqlTableState, string>(preparedRows, {
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
index 202e5862907..1f5dcde061e 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
@@ -1,6 +1,5 @@
 import styled, { css } from 'styled-components';
 import BaseSQLEditor from 'components/common/SQLEditor/SQLEditor';
-import BaseEditor from 'components/common/Editor/Editor';
 
 export const QueryWrapper = styled.div`
   padding: 16px;
@@ -60,30 +59,10 @@ export const DeleteButtonWrapper = styled.div`
   margin-top: 10px;
 `;
 
-export const LabelContainer = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-`;
-
 export const Fieldset = styled.fieldset`
   width: 50%;
 `;
 
-export const Editor = styled(BaseEditor)(
-  ({ readOnly, theme }) =>
-    readOnly &&
-    css`
-      &,
-      &.ace-tomorrow {
-        background: ${theme.ksqlDb.query.editor.readonly.background};
-      }
-      .ace-cursor {
-        ${theme.ksqlDb.query.editor.readonly.cursor}
-      }
-    `
-);
-
 export const SQLEditor = styled(BaseSQLEditor)(
   ({ readOnly, theme }) =>
     readOnly &&
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
index a4d2a275bea..6edd4b428bb 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
@@ -17,8 +17,7 @@ export interface Props {
   handleSSECancel: () => void;
   submitHandler: (values: FormValues) => void;
 }
-
-export type StreamsPropertiesType = {
+type StreamsPropertiesType = {
   key: string;
   value: string;
 };
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
index 5787f6f3c13..d044fefabf9 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
@@ -57,7 +57,7 @@ export interface MessageFilters {
   code: string;
 }
 
-export interface ActiveMessageFilter {
+interface ActiveMessageFilter {
   index: number;
   name: string;
   code: string;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx
index 91a4e5a4637..b879e7bf0d8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import * as S from 'components/Topics/Topic/Details/Messages/Filters/Filters.styled';
 import { Button } from 'components/common/Button/Button';
 
-export interface InfoModalProps {
+interface InfoModalProps {
   toggleIsOpen(): void;
 }
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts
index 4d4d562b4c5..49b7f033751 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts
@@ -4,7 +4,7 @@ import { TopicWithDetailedInfo } from 'redux/interfaces/topic';
 export const clusterName = 'testCluster';
 export const topicName = 'testTopic';
 
-export const config: TopicConfig[] = [
+const config: TopicConfig[] = [
   {
     name: 'compression.type',
     value: 'producer',
@@ -521,7 +521,7 @@ export const config: TopicConfig[] = [
   },
 ];
 
-export const partitions = [
+const partitions = [
   {
     partition: 0,
     leader: 2,
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx b/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
index ccfa5222668..364bc8ed8de 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
+++ b/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
@@ -2,7 +2,7 @@ import React, { PropsWithChildren } from 'react';
 
 import * as S from './Dropdown.styled';
 
-export interface DropdownItemProps {
+interface DropdownItemProps {
   onClick(): void;
   danger?: boolean;
 }
diff --git a/kafka-ui-react-app/src/components/common/Switch/Switch.tsx b/kafka-ui-react-app/src/components/common/Switch/Switch.tsx
index 9252239e848..6471f182494 100644
--- a/kafka-ui-react-app/src/components/common/Switch/Switch.tsx
+++ b/kafka-ui-react-app/src/components/common/Switch/Switch.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import * as S from './Switch.styled';
 
-export interface SwitchProps {
+interface SwitchProps {
   onChange(): void;
   checked: boolean;
   name: string;
diff --git a/kafka-ui-react-app/src/components/common/heading/Heading.styled.tsx b/kafka-ui-react-app/src/components/common/heading/Heading.styled.tsx
index 661f3b31471..90978fed3be 100644
--- a/kafka-ui-react-app/src/components/common/heading/Heading.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/heading/Heading.styled.tsx
@@ -10,10 +10,10 @@ const HeadingBase = styled.h1<HeadingBaseProps>`
   ${({ theme, $level }) => theme.heading?.variants[$level]}
 `;
 
-export interface Props {
+interface HeadingProps {
   level?: HeadingLevel;
 }
-const Heading: React.FC<PropsWithChildren<Props>> = ({
+const Heading: React.FC<PropsWithChildren<HeadingProps>> = ({
   level = 1,
   ...rest
 }) => {
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index e9a6326a570..0be6a514cc0 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -1,6 +1,5 @@
-import { Connect, Connector } from 'generated-sources';
+import { Broker, Connect, Connector } from 'generated-sources';
 import {
-  BrokerId,
   ClusterName,
   ConsumerGroupID,
   SchemaName,
@@ -39,11 +38,11 @@ export const clusterBrokersPath = (
 
 export const clusterBrokerPath = (
   clusterName: ClusterName = RouteParams.clusterName,
-  brokerId: BrokerId | string = RouteParams.brokerId
+  brokerId: Broker['id'] | string = RouteParams.brokerId
 ) => `${clusterBrokersPath(clusterName)}/${brokerId}`;
 export const clusterBrokerMetricsPath = (
   clusterName: ClusterName = RouteParams.clusterName,
-  brokerId: BrokerId | string = RouteParams.brokerId
+  brokerId: Broker['id'] | string = RouteParams.brokerId
 ) =>
   `${clusterBrokerPath(
     clusterName,
diff --git a/kafka-ui-react-app/src/redux/interfaces/alerts.ts b/kafka-ui-react-app/src/redux/interfaces/alerts.ts
index ab423c3d005..7473ec7f000 100644
--- a/kafka-ui-react-app/src/redux/interfaces/alerts.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/alerts.ts
@@ -17,7 +17,3 @@ export interface Alert {
   response?: ServerResponse;
   createdAt: number;
 }
-
-export type Alerts = Alert[];
-
-export type AlertsState = Record<Alert['id'], Alert>;
diff --git a/kafka-ui-react-app/src/redux/interfaces/broker.ts b/kafka-ui-react-app/src/redux/interfaces/broker.ts
deleted file mode 100644
index b9dfa7d30d8..00000000000
--- a/kafka-ui-react-app/src/redux/interfaces/broker.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ClusterStats, Broker } from 'generated-sources';
-
-export type BrokerId = Broker['id'];
-
-export interface BrokersState extends ClusterStats {
-  items: Broker[];
-}
diff --git a/kafka-ui-react-app/src/redux/interfaces/cluster.ts b/kafka-ui-react-app/src/redux/interfaces/cluster.ts
index d51fbaa7e0c..e417f1b194f 100644
--- a/kafka-ui-react-app/src/redux/interfaces/cluster.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/cluster.ts
@@ -1,5 +1,3 @@
 import { Cluster } from 'generated-sources';
 
 export type ClusterName = Cluster['name'];
-
-export type ClusterState = Cluster[];
diff --git a/kafka-ui-react-app/src/redux/interfaces/index.ts b/kafka-ui-react-app/src/redux/interfaces/index.ts
index 6d853cf5a54..c77496e848a 100644
--- a/kafka-ui-react-app/src/redux/interfaces/index.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/index.ts
@@ -3,7 +3,6 @@ import { store } from 'redux/store';
 
 export * from './topic';
 export * from './cluster';
-export * from './broker';
 export * from './consumerGroup';
 export * from './schema';
 export * from './loader';
diff --git a/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts b/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
index 9bad9beb269..007055df632 100644
--- a/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
@@ -4,13 +4,6 @@ import {
   KsqlTableDescription,
 } from 'generated-sources';
 
-export interface KsqlTables {
-  data: {
-    headers: string[];
-    rows: string[][];
-  };
-}
-
 export interface KsqlState {
   tables: KsqlTableDescription[];
   streams: KsqlStreamDescription[];
diff --git a/kafka-ui-react-app/src/redux/interfaces/loader.ts b/kafka-ui-react-app/src/redux/interfaces/loader.ts
index 650d121f860..67066399eae 100644
--- a/kafka-ui-react-app/src/redux/interfaces/loader.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/loader.ts
@@ -1,8 +1,5 @@
 import { AsyncRequestStatus } from 'lib/constants';
 
-export interface LoaderState {
-  [key: string]: 'notFetched' | 'fetching' | 'fetched' | 'errorFetching';
-}
 export interface LoaderSliceState {
   [key: string]: AsyncRequestStatus;
 }
diff --git a/kafka-ui-react-app/src/redux/interfaces/schema.ts b/kafka-ui-react-app/src/redux/interfaces/schema.ts
index fd23eacff0a..c03062e5615 100644
--- a/kafka-ui-react-app/src/redux/interfaces/schema.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/schema.ts
@@ -1,18 +1,10 @@
 import {
   CompatibilityLevelCompatibilityEnum,
   NewSchemaSubject,
-  SchemaSubject,
 } from 'generated-sources';
 
 export type SchemaName = string;
 
-export interface SchemasState {
-  byName: { [subject: string]: SchemaSubject };
-  allNames: SchemaName[];
-  currentSchemaVersions: SchemaSubject[];
-  globalSchemaCompatibilityLevel?: CompatibilityLevelCompatibilityEnum;
-}
-
 export interface NewSchemaSubjectRaw extends NewSchemaSubject {
   subject: string;
   compatibilityLevel: CompatibilityLevelCompatibilityEnum;
diff --git a/kafka-ui-react-app/src/redux/interfaces/topic.ts b/kafka-ui-react-app/src/redux/interfaces/topic.ts
index 13aa74cf407..a55cff4e3cf 100644
--- a/kafka-ui-react-app/src/redux/interfaces/topic.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/topic.ts
@@ -3,7 +3,6 @@ import {
   TopicDetails,
   TopicConfig,
   TopicCreation,
-  GetTopicMessagesRequest,
   ConsumerGroup,
   TopicColumnsToSort,
   TopicMessage,
@@ -14,30 +13,15 @@ import {
 
 export type TopicName = Topic['name'];
 
-export type CleanupPolicy = 'delete' | 'compact';
-
-export interface TopicConfigByName {
-  byName: TopicConfigParams;
-}
-
-export interface TopicConfigParams {
+interface TopicConfigParams {
   [paramName: string]: TopicConfig;
 }
 
-export interface TopicConfigValue {
-  name: TopicConfig['name'];
-  value: TopicConfig['value'];
-}
-
-export interface TopicMessageQueryParams {
-  q: GetTopicMessagesRequest['q'];
-  limit: GetTopicMessagesRequest['limit'];
-  seekType: GetTopicMessagesRequest['seekType'];
-  seekTo: GetTopicMessagesRequest['seekTo'];
-  seekDirection: GetTopicMessagesRequest['seekDirection'];
+export interface TopicConfigByName {
+  byName: TopicConfigParams;
 }
 
-export interface TopicFormCustomParams {
+interface TopicFormCustomParams {
   byIndex: TopicConfigParams;
   allIndexes: TopicName[];
 }
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts
index 21f18177021..88caf4e6716 100644
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts
@@ -30,11 +30,6 @@ export const noConsumerGroupsResponse = {
   consumerGroups: [],
 };
 
-export const consumerGroupsPage = {
-  totalPages: 1,
-  consumerGroups,
-};
-
 export const consumerGroupPayload = {
   groupId: 'amazon.msk.canary.group.broker-1',
   members: 0,
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
index 5aa91f9077a..063ca586099 100644
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
@@ -139,7 +139,7 @@ const initialState: ConsumerGroupState = {
   ...consumerGroupsAdapter.getInitialState(),
 };
 
-export const consumerGroupsSlice = createSlice({
+const consumerGroupsSlice = createSlice({
   name: 'consumerGroups',
   initialState,
   reducers: {
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts
index 73ef6644ade..2be59875c2c 100644
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts
@@ -39,26 +39,3 @@ export const fetchKsqlDbTablesPayload: {
     },
   ],
 };
-
-export const ksqlCommandResponse = {
-  header: 'Test header',
-  columnNames: [
-    'type',
-    'name',
-    'topic',
-    'keyFormat',
-    'valueFormat',
-    'isWindowed',
-  ],
-  rows: [
-    [
-      'STREAM',
-      'KSQL_PROCESSING_LOG',
-      'default_ksql_processing_log',
-      'KAFKA',
-      'JSON',
-      'false',
-    ],
-    ['STREAM', 'PAGEVIEWS', 'pageviews', 'KAFKA', 'AVRO', 'false'],
-  ],
-};
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
index 2d80c1d2244..fed60d5d346 100644
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
@@ -1,22 +1,9 @@
 import { KsqlState } from 'redux/interfaces/ksqlDb';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { ExecuteKsqlRequest, Table as KsqlTable } from 'generated-sources';
+import { ExecuteKsqlRequest } from 'generated-sources';
 import { ClusterName } from 'redux/interfaces';
 import { ksqlDbApiClient } from 'lib/api';
 
-export const transformKsqlResponse = (
-  rawTable: Required<KsqlTable>
-): Dictionary<string>[] =>
-  rawTable.rows.map((row) =>
-    row.reduce(
-      (res, acc, index) => ({
-        ...res,
-        [rawTable.headers[index]]: acc,
-      }),
-      {} as Dictionary<string>
-    )
-  );
-
 const getTables = (clusterName: ClusterName) =>
   ksqlDbApiClient.listTables({
     clusterName,
@@ -56,13 +43,13 @@ export const executeKsql = createAsyncThunk(
   (params: ExecuteKsqlRequest) => ksqlDbApiClient.executeKsql(params)
 );
 
-export const initialState: KsqlState = {
+const initialState: KsqlState = {
   streams: [],
   tables: [],
   executionResult: null,
 };
 
-export const ksqlDbSlice = createSlice({
+const ksqlDbSlice = createSlice({
   name: 'ksqlDb',
   initialState,
   reducers: {
diff --git a/kafka-ui-react-app/src/redux/reducers/loader/loaderSlice.ts b/kafka-ui-react-app/src/redux/reducers/loader/loaderSlice.ts
index ef84ea97bfb..294b359116c 100644
--- a/kafka-ui-react-app/src/redux/reducers/loader/loaderSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/loader/loaderSlice.ts
@@ -7,9 +7,9 @@ import {
 import { AsyncRequestStatus } from 'lib/constants';
 import { LoaderSliceState } from 'redux/interfaces';
 
-export const initialState: LoaderSliceState = {};
+const initialState: LoaderSliceState = {};
 
-export const loaderSlice = createSlice({
+const loaderSlice = createSlice({
   name: 'loader',
   initialState,
   reducers: {
diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts
index 02c8d2278c9..f6b924592e1 100644
--- a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts
@@ -45,17 +45,3 @@ export const schemasFulfilledState = {
     entities: {},
   },
 };
-
-export const versionFulfilledState = {
-  totalPages: 1,
-  ids: [],
-  entities: {},
-  versions: {
-    latest: schemaVersion2,
-    ids: [schemaVersion1.id, schemaVersion2.id],
-    entities: {
-      [schemaVersion2.id]: schemaVersion2,
-      [schemaVersion1.id]: schemaVersion1,
-    },
-  },
-};
diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts b/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
index 9ce44ed58ce..7d52b78741b 100644
--- a/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
@@ -106,15 +106,13 @@ const schemasSlice = createSlice({
   },
 });
 
-export const { selectAll: selectAllSchemas, selectById: selectSchemaById } =
+export const { selectAll: selectAllSchemas } =
   schemasAdapter.getSelectors<RootState>((state) => state.schemas);
 
-export const {
-  selectAll: selectAllSchemaVersions,
-  selectById: selectVersionSchemaByID,
-} = schemaVersionsAdapter.getSelectors<RootState>(
-  (state) => state.schemas.versions
-);
+export const { selectAll: selectAllSchemaVersions } =
+  schemaVersionsAdapter.getSelectors<RootState>(
+    (state) => state.schemas.versions
+  );
 
 const getSchemaVersions = (state: RootState) => state.schemas.versions;
 export const getSchemaLatest = createSelector(
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
index 9861d0025bf..375c99e5332 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
@@ -47,7 +47,7 @@ export const initialState: TopicMessagesState = {
   isFetching: false,
 };
 
-export const topicMessagesSlice = createSlice({
+const topicMessagesSlice = createSlice({
   name: 'topicMessages',
   initialState,
   reducers: {
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts b/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts
index 031d86a0fbe..e58ae96cf61 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts
@@ -1,10 +1,5 @@
 import { createSelector } from '@reduxjs/toolkit';
-import {
-  RootState,
-  TopicName,
-  TopicsState,
-  TopicConfigByName,
-} from 'redux/interfaces';
+import { RootState, TopicName, TopicsState } from 'redux/interfaces';
 import { CleanUpPolicy } from 'generated-sources';
 import { createFetchingSelector } from 'redux/reducers/loader/selectors';
 import {
@@ -157,23 +152,6 @@ export const getTopicConfig = createSelector(
   ({ config }) => config
 );
 
-export const getTopicConfigByParamName = createSelector(
-  getTopicConfig,
-  (config) => {
-    const byParamName: TopicConfigByName = {
-      byName: {},
-    };
-
-    if (config) {
-      config.forEach((param) => {
-        byParamName.byName[param.name] = param;
-      });
-    }
-
-    return byParamName;
-  }
-);
-
 export const getIsTopicDeletePolicy = createSelector(
   getTopicByName,
   (topic) => {
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
index 74362e1012d..629d747110e 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
@@ -83,7 +83,7 @@ const topicReducer = (
   };
 };
 
-export const formatTopicCreation = (form: TopicFormData): TopicCreation => {
+const formatTopicCreation = (form: TopicFormData): TopicCreation => {
   const {
     name,
     partitions,
@@ -344,7 +344,7 @@ export const clearTopicsMessages = createAsyncThunk<
   }
 });
 
-export const initialState: TopicsState = {
+const initialState: TopicsState = {
   byName: {},
   allNames: [],
   totalPages: 1,

From eb2688394932ded91c7108228c60ea247ed07296 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Tue, 19 Jul 2022 12:42:32 +0300
Subject: [PATCH 078/734] Upgrade dependancies (#2290)

* Bump vite

* bump eslint-import-resolver-typescript

* Cleanup

* Bump datepicker
---
 kafka-ui-react-app/jest.config.ts             |   1 +
 kafka-ui-react-app/package.json               |  18 +-
 kafka-ui-react-app/pnpm-lock.yaml             | 832 ++++++++++++++----
 .../src/components/Brokers/Broker/Broker.tsx  |  19 +-
 .../common/EditorViewer/EditorViewer.tsx      |   4 +-
 .../__test__/EditorViewer.spec.tsx            |   4 +-
 .../common/Navigation/Navbar.styled.ts        |   4 +-
 .../src/lib/hooks/api/brokers.ts              |   6 +-
 kafka-ui-react-app/vite.config.ts             |   4 +
 9 files changed, 683 insertions(+), 209 deletions(-)

diff --git a/kafka-ui-react-app/jest.config.ts b/kafka-ui-react-app/jest.config.ts
index 1190472aa0d..32dc0201554 100644
--- a/kafka-ui-react-app/jest.config.ts
+++ b/kafka-ui-react-app/jest.config.ts
@@ -31,4 +31,5 @@ export default {
     'jest-watch-typeahead/testname',
   ],
   resetMocks: true,
+  reporters: ['default', 'github-actions'],
 } as Config.InitialOptions;
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index d7c8beb69ca..407c7c1f49a 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -15,7 +15,7 @@
     "@testing-library/react": "^13.2.0",
     "@types/testing-library__jest-dom": "^5.14.5",
     "@types/yup": "^0.29.13",
-    "@vitejs/plugin-react": "^1.3.2",
+    "@vitejs/plugin-react": "^2.0.0",
     "ace-builds": "^1.4.12",
     "ajv": "^8.6.3",
     "babel-jest": "^28.1.1",
@@ -24,14 +24,14 @@
     "dayjs": "^1.11.2",
     "fetch-mock": "^9.11.0",
     "jest": "^28.1.1",
-    "jest-watch-typeahead": "^1.1.0",
+    "jest-watch-typeahead": "^2.0.0",
     "json-schema-faker": "^0.5.0-rcv.39",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.1",
-    "pretty-ms": "^7.0.1",
+    "pretty-ms": "7.0.1",
     "react": "^18.1.0",
-    "react-ace": "^9.4.3",
-    "react-datepicker": "^4.2.0",
+    "react-ace": "^10.1.0",
+    "react-datepicker": "^4.8.0",
     "react-dom": "^18.1.0",
     "react-hook-form": "7.6.9",
     "react-is": "^18.2.0",
@@ -44,7 +44,7 @@
     "sass": "^1.52.3",
     "styled-components": "^5.3.1",
     "use-debounce": "^8.0.1",
-    "vite": "^2.9.11",
+    "vite": "^3.0.2",
     "vite-tsconfig-paths": "^3.5.0",
     "whatwg-fetch": "^3.6.2",
     "yup": "^0.32.9"
@@ -52,7 +52,7 @@
   "lint-staged": {
     "*.{ts,tsx}": [
       "eslint --fix",
-      "pnpm test -- --bail --findRelatedTests --watchAll=false"
+      "pnpm test -- --bail --findRelatedTests --watchAll=false --passWithNoTests"
     ]
   },
   "scripts": {
@@ -87,7 +87,7 @@
     "@types/lodash": "^4.14.172",
     "@types/node": "^16.4.13",
     "@types/react": "^18.0.9",
-    "@types/react-datepicker": "^4.1.4",
+    "@types/react-datepicker": "^4.4.2",
     "@types/react-dom": "^18.0.3",
     "@types/react-redux": "^7.1.18",
     "@types/react-router-dom": "^5.3.3",
@@ -102,7 +102,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-import-resolver-node": "^0.3.6",
-    "eslint-import-resolver-typescript": "^2.7.1",
+    "eslint-import-resolver-typescript": "^3.2.7",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest-dom": "^4.0.2",
     "eslint-plugin-jsx-a11y": "^6.5.1",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index efabbb6c9c7..ba5acbcee82 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -23,7 +23,7 @@ specifiers:
   '@types/lodash': ^4.14.172
   '@types/node': ^16.4.13
   '@types/react': ^18.0.9
-  '@types/react-datepicker': ^4.1.4
+  '@types/react-datepicker': ^4.4.2
   '@types/react-dom': ^18.0.3
   '@types/react-redux': ^7.1.18
   '@types/react-router-dom': ^5.3.3
@@ -33,7 +33,7 @@ specifiers:
   '@types/yup': ^0.29.13
   '@typescript-eslint/eslint-plugin': ^5.29.0
   '@typescript-eslint/parser': ^5.29.0
-  '@vitejs/plugin-react': ^1.3.2
+  '@vitejs/plugin-react': ^2.0.0
   ace-builds: ^1.4.12
   ajv: ^8.6.3
   babel-jest: ^28.1.1
@@ -47,7 +47,7 @@ specifiers:
   eslint-config-prettier: ^8.5.0
   eslint-config-react-app: ^7.0.1
   eslint-import-resolver-node: ^0.3.6
-  eslint-import-resolver-typescript: ^2.7.1
+  eslint-import-resolver-typescript: ^3.2.7
   eslint-plugin-import: ^2.26.0
   eslint-plugin-jest-dom: ^4.0.2
   eslint-plugin-jsx-a11y: ^6.5.1
@@ -61,16 +61,16 @@ specifiers:
   jest-environment-jsdom: ^28.1.1
   jest-sonar-reporter: ^2.0.0
   jest-styled-components: ^7.0.8
-  jest-watch-typeahead: ^1.1.0
+  jest-watch-typeahead: ^2.0.0
   json-schema-faker: ^0.5.0-rcv.39
   lint-staged: ^13.0.2
   lodash: ^4.17.21
   node-fetch: ^2.6.1
   prettier: ^2.3.1
-  pretty-ms: ^7.0.1
+  pretty-ms: 7.0.1
   react: ^18.1.0
-  react-ace: ^9.4.3
-  react-datepicker: ^4.2.0
+  react-ace: ^10.1.0
+  react-datepicker: ^4.8.0
   react-dom: ^18.1.0
   react-hook-form: 7.6.9
   react-is: ^18.2.0
@@ -89,7 +89,7 @@ specifiers:
   ts-prune: ^0.10.3
   typescript: ^4.7.4
   use-debounce: ^8.0.1
-  vite: ^2.9.11
+  vite: ^3.0.2
   vite-tsconfig-paths: ^3.5.0
   whatwg-fetch: ^3.6.2
   yup: ^0.32.9
@@ -106,7 +106,7 @@ dependencies:
   '@testing-library/react': 13.2.0_ef5jwxihqo6n7gxfmzogljlgcm
   '@types/testing-library__jest-dom': 5.14.5
   '@types/yup': 0.29.13
-  '@vitejs/plugin-react': 1.3.2
+  '@vitejs/plugin-react': 2.0.0_vite@3.0.2
   ace-builds: 1.4.13
   ajv: 8.8.2
   babel-jest: 28.1.1_@babel+core@7.18.2
@@ -115,14 +115,14 @@ dependencies:
   dayjs: 1.11.3
   fetch-mock: 9.11.0_node-fetch@2.6.7
   jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
-  jest-watch-typeahead: 1.1.0_jest@28.1.1
+  jest-watch-typeahead: 2.0.0_jest@28.1.1
   json-schema-faker: 0.5.0-rcv.40
   lodash: 4.17.21
   node-fetch: 2.6.7
   pretty-ms: 7.0.1
   react: 18.1.0
-  react-ace: 9.5.0_ef5jwxihqo6n7gxfmzogljlgcm
-  react-datepicker: 4.5.0_ef5jwxihqo6n7gxfmzogljlgcm
+  react-ace: 10.1.0_ef5jwxihqo6n7gxfmzogljlgcm
+  react-datepicker: 4.8.0_ef5jwxihqo6n7gxfmzogljlgcm
   react-dom: 18.1.0_react@18.1.0
   react-hook-form: 7.6.9_react@18.1.0
   react-is: 18.2.0
@@ -135,8 +135,8 @@ dependencies:
   sass: 1.52.3
   styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
   use-debounce: 8.0.1_react@18.1.0
-  vite: 2.9.11_sass@1.52.3
-  vite-tsconfig-paths: 3.5.0_vite@2.9.11
+  vite: 3.0.2_sass@1.52.3
+  vite-tsconfig-paths: 3.5.0_vite@3.0.2
   whatwg-fetch: 3.6.2
   yup: 0.32.11
 
@@ -154,7 +154,7 @@ devDependencies:
   '@types/lodash': 4.14.177
   '@types/node': 16.11.7
   '@types/react': 18.0.9
-  '@types/react-datepicker': 4.3.4_react@18.1.0
+  '@types/react-datepicker': 4.4.2_react@18.1.0
   '@types/react-dom': 18.0.5
   '@types/react-redux': 7.1.24
   '@types/react-router-dom': 5.3.3
@@ -167,10 +167,10 @@ devDependencies:
   eslint-config-airbnb: 19.0.4_pamhosqcenlxoxj4ke2dmvzava
   eslint-config-airbnb-typescript: 17.0.0_l6wia5brkiej5f4nhesunbzj5y
   eslint-config-prettier: 8.5.0_eslint@8.16.0
-  eslint-config-react-app: 7.0.1_widwqlnidgep55t2naywdlxcqa
+  eslint-config-react-app: 7.0.1_y3w6q4zxtal6gz5auqli3lo3ny
   eslint-import-resolver-node: 0.3.6
-  eslint-import-resolver-typescript: 2.7.1_btspkuwbqkl4adpiufzbathtpi
-  eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+  eslint-import-resolver-typescript: 3.2.7_btspkuwbqkl4adpiufzbathtpi
+  eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
   eslint-plugin-jest-dom: 4.0.2_eslint@8.16.0
   eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
   eslint-plugin-prettier: 4.0.0_q7a4ir2sdihdzpzdlnbgmzjlpq
@@ -205,10 +205,20 @@ packages:
     dependencies:
       '@babel/highlight': 7.17.12
 
+  /@babel/code-frame/7.18.6:
+    resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/highlight': 7.18.6
+
   /@babel/compat-data/7.17.10:
     resolution: {integrity: sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/compat-data/7.18.8:
+    resolution: {integrity: sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==}
+    engines: {node: '>=6.9.0'}
+
   /@babel/core/7.18.2:
     resolution: {integrity: sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==}
     engines: {node: '>=6.9.0'}
@@ -231,6 +241,28 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/core/7.18.9:
+    resolution: {integrity: sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.2.0
+      '@babel/code-frame': 7.18.6
+      '@babel/generator': 7.18.9
+      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.9
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helpers': 7.18.9
+      '@babel/parser': 7.18.9
+      '@babel/template': 7.18.6
+      '@babel/traverse': 7.18.9
+      '@babel/types': 7.18.9
+      convert-source-map: 1.7.0
+      debug: 4.3.4
+      gensync: 1.0.0-beta.2
+      json5: 2.2.1
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+
   /@babel/eslint-parser/7.17.0_j4uj5cgi2mksbox6kqvi7jrs6u:
     resolution: {integrity: sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==}
     engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
@@ -253,6 +285,14 @@ packages:
       '@jridgewell/gen-mapping': 0.3.1
       jsesc: 2.5.2
 
+  /@babel/generator/7.18.9:
+    resolution: {integrity: sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.9
+      '@jridgewell/gen-mapping': 0.3.2
+      jsesc: 2.5.2
+
   /@babel/helper-annotate-as-pure/7.16.7:
     resolution: {integrity: sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==}
     engines: {node: '>=6.9.0'}
@@ -286,6 +326,18 @@ packages:
       browserslist: 4.20.4
       semver: 6.3.0
 
+  /@babel/helper-compilation-targets/7.18.9_@babel+core@7.18.9:
+    resolution: {integrity: sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.18.8
+      '@babel/core': 7.18.9
+      '@babel/helper-validator-option': 7.18.6
+      browserslist: 4.20.4
+      semver: 6.3.0
+
   /@babel/helper-create-class-features-plugin/7.18.0_@babel+core@7.18.2:
     resolution: {integrity: sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==}
     engines: {node: '>=6.9.0'}
@@ -337,11 +389,15 @@ packages:
     resolution: {integrity: sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-environment-visitor/7.18.9:
+    resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
+    engines: {node: '>=6.9.0'}
+
   /@babel/helper-explode-assignable-expression/7.16.7:
     resolution: {integrity: sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
     dev: true
 
   /@babel/helper-function-name/7.17.9:
@@ -351,17 +407,30 @@ packages:
       '@babel/template': 7.16.7
       '@babel/types': 7.18.7
 
+  /@babel/helper-function-name/7.18.9:
+    resolution: {integrity: sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.18.6
+      '@babel/types': 7.18.9
+
   /@babel/helper-hoist-variables/7.16.7:
     resolution: {integrity: sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.7
 
+  /@babel/helper-hoist-variables/7.18.6:
+    resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.9
+
   /@babel/helper-member-expression-to-functions/7.17.7:
     resolution: {integrity: sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
     dev: true
 
   /@babel/helper-module-imports/7.16.7:
@@ -382,7 +451,7 @@ packages:
     dependencies:
       '@babel/helper-environment-visitor': 7.18.2
       '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-simple-access': 7.18.2
+      '@babel/helper-simple-access': 7.18.6
       '@babel/helper-split-export-declaration': 7.16.7
       '@babel/helper-validator-identifier': 7.18.6
       '@babel/template': 7.16.7
@@ -391,6 +460,21 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/helper-module-transforms/7.18.9:
+    resolution: {integrity: sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-simple-access': 7.18.6
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/helper-validator-identifier': 7.18.6
+      '@babel/template': 7.18.6
+      '@babel/traverse': 7.18.9
+      '@babel/types': 7.18.9
+    transitivePeerDependencies:
+      - supports-color
+
   /@babel/helper-optimise-call-expression/7.16.7:
     resolution: {integrity: sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==}
     engines: {node: '>=6.9.0'}
@@ -421,20 +505,20 @@ packages:
     resolution: {integrity: sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-environment-visitor': 7.18.2
+      '@babel/helper-environment-visitor': 7.18.9
       '@babel/helper-member-expression-to-functions': 7.17.7
       '@babel/helper-optimise-call-expression': 7.16.7
-      '@babel/traverse': 7.18.2
-      '@babel/types': 7.18.7
+      '@babel/traverse': 7.18.9
+      '@babel/types': 7.18.9
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/helper-simple-access/7.18.2:
-    resolution: {integrity: sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==}
+  /@babel/helper-simple-access/7.18.6:
+    resolution: {integrity: sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
 
   /@babel/helper-skip-transparent-expression-wrappers/7.16.0:
     resolution: {integrity: sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==}
@@ -449,6 +533,12 @@ packages:
     dependencies:
       '@babel/types': 7.18.7
 
+  /@babel/helper-split-export-declaration/7.18.6:
+    resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.18.9
+
   /@babel/helper-validator-identifier/7.16.7:
     resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==}
     engines: {node: '>=6.9.0'}
@@ -461,14 +551,18 @@ packages:
     resolution: {integrity: sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-validator-option/7.18.6:
+    resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==}
+    engines: {node: '>=6.9.0'}
+
   /@babel/helper-wrap-function/7.16.8:
     resolution: {integrity: sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-function-name': 7.17.9
-      '@babel/template': 7.16.7
-      '@babel/traverse': 7.18.2
-      '@babel/types': 7.18.7
+      '@babel/template': 7.18.6
+      '@babel/traverse': 7.18.9
+      '@babel/types': 7.18.9
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -483,6 +577,16 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/helpers/7.18.9:
+    resolution: {integrity: sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.18.6
+      '@babel/traverse': 7.18.9
+      '@babel/types': 7.18.9
+    transitivePeerDependencies:
+      - supports-color
+
   /@babel/highlight/7.17.12:
     resolution: {integrity: sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==}
     engines: {node: '>=6.9.0'}
@@ -491,6 +595,14 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
+  /@babel/highlight/7.18.6:
+    resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.18.6
+      chalk: 2.4.2
+      js-tokens: 4.0.0
+
   /@babel/parser/7.18.4:
     resolution: {integrity: sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==}
     engines: {node: '>=6.0.0'}
@@ -498,6 +610,13 @@ packages:
     dependencies:
       '@babel/types': 7.18.7
 
+  /@babel/parser/7.18.9:
+    resolution: {integrity: sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.18.9
+
   /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==}
     engines: {node: '>=6.9.0'}
@@ -728,6 +847,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
@@ -736,6 +863,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
 
+  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+
   /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.2:
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
@@ -744,6 +879,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.9:
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.18.2:
     resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
     engines: {node: '>=6.9.0'}
@@ -809,6 +952,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
 
+  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+
   /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
@@ -817,6 +968,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.18.2:
     resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
     engines: {node: '>=6.9.0'}
@@ -826,6 +985,16 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
 
+  /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.18.9:
+    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
+
   /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.2:
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
@@ -834,6 +1003,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
@@ -842,6 +1019,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.2:
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
@@ -850,6 +1035,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
@@ -858,6 +1051,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
@@ -866,6 +1067,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
@@ -874,6 +1083,14 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.18.2:
     resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
     engines: {node: '>=6.9.0'}
@@ -893,6 +1110,15 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.17.12
 
+  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.9:
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+
   /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==}
     engines: {node: '>=6.9.0'}
@@ -901,6 +1127,16 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-transform-arrow-functions/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==}
@@ -1084,16 +1320,16 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-modules-commonjs/7.18.2_@babel+core@7.18.2:
-    resolution: {integrity: sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==}
+  /@babel/plugin-transform-modules-commonjs/7.18.6_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-module-transforms': 7.18.0
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/helper-simple-access': 7.18.2
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-simple-access': 7.18.6
       babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
       - supports-color
@@ -1200,24 +1436,35 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
+    dev: true
 
-  /@babel/plugin-transform-react-jsx-self/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-7S9G2B44EnYOx74mue02t1uD8ckWZ/ee6Uz/qfdzc35uWHX5NgRy9i+iJSb2LFRgMd+QV9zNcStQaazzzZ3n3Q==}
+  /@babel/plugin-transform-react-jsx-development/7.18.6_@babel+core@7.18.9:
+    resolution: {integrity: sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
+      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.9
+    dev: false
+
+  /@babel/plugin-transform-react-jsx-self/7.18.6_@babel+core@7.18.9:
+    resolution: {integrity: sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-transform-react-jsx-source/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-rONFiQz9vgbsnaMtQlZCjIRwhJvlrPET8TabIUK2hzlXw9B9s2Ieaxte1SCOOXMbWRHodbKixNf3BLcWVOQ8Bw==}
+  /@babel/plugin-transform-react-jsx-source/7.18.6_@babel+core@7.18.9:
+    resolution: {integrity: sha512-utZmlASneDfdaMh0m/WausbjUjEdGrQJz0vFK93d7wD3xf5wBtX219+q6IlCNZeguIcxS2f/CvLZrlLSvSHQXw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
@@ -1234,6 +1481,20 @@ packages:
       '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.2
       '@babel/types': 7.18.7
 
+  /@babel/plugin-transform-react-jsx/7.18.6_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-annotate-as-pure': 7.18.6
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.9
+      '@babel/types': 7.18.7
+    dev: false
+
   /@babel/plugin-transform-react-pure-annotations/7.16.7_@babel+core@7.18.2:
     resolution: {integrity: sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==}
     engines: {node: '>=6.9.0'}
@@ -1427,7 +1688,7 @@ packages:
       '@babel/plugin-transform-literals': 7.17.12_@babel+core@7.18.2
       '@babel/plugin-transform-member-expression-literals': 7.16.7_@babel+core@7.18.2
       '@babel/plugin-transform-modules-amd': 7.18.0_@babel+core@7.18.2
-      '@babel/plugin-transform-modules-commonjs': 7.18.2_@babel+core@7.18.2
+      '@babel/plugin-transform-modules-commonjs': 7.18.6_@babel+core@7.18.2
       '@babel/plugin-transform-modules-systemjs': 7.18.4_@babel+core@7.18.2
       '@babel/plugin-transform-modules-umd': 7.18.0_@babel+core@7.18.2
       '@babel/plugin-transform-named-capturing-groups-regex': 7.17.12_@babel+core@7.18.2
@@ -1519,6 +1780,14 @@ packages:
       '@babel/parser': 7.18.4
       '@babel/types': 7.18.7
 
+  /@babel/template/7.18.6:
+    resolution: {integrity: sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.18.6
+      '@babel/parser': 7.18.9
+      '@babel/types': 7.18.9
+
   /@babel/traverse/7.18.2:
     resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==}
     engines: {node: '>=6.9.0'}
@@ -1553,6 +1822,23 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@babel/traverse/7.18.9:
+    resolution: {integrity: sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.18.6
+      '@babel/generator': 7.18.9
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.18.9
+      '@babel/helper-hoist-variables': 7.18.6
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/parser': 7.18.9
+      '@babel/types': 7.18.9
+      debug: 4.3.4
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
   /@babel/types/7.18.4:
     resolution: {integrity: sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==}
     engines: {node: '>=6.9.0'}
@@ -1567,6 +1853,13 @@ packages:
       '@babel/helper-validator-identifier': 7.18.6
       to-fast-properties: 2.0.0
 
+  /@babel/types/7.18.9:
+    resolution: {integrity: sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-validator-identifier': 7.18.6
+      to-fast-properties: 2.0.0
+
   /@bcoe/v8-coverage/0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
@@ -1881,6 +2174,14 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.13
       '@jridgewell/trace-mapping': 0.3.13
 
+  /@jridgewell/gen-mapping/0.3.2:
+    resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      '@jridgewell/set-array': 1.1.1
+      '@jridgewell/sourcemap-codec': 1.4.13
+      '@jridgewell/trace-mapping': 0.3.13
+
   /@jridgewell/resolve-uri/3.0.7:
     resolution: {integrity: sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==}
     engines: {node: '>=6.0.0'}
@@ -2027,6 +2328,18 @@ packages:
       - encoding
     dev: true
 
+  /@pkgr/utils/2.3.0:
+    resolution: {integrity: sha512-7dIJ9CRVzBnqyEl7diUHPUFJf/oty2SeoVzcMocc5PeOUDK9KGzvgIBjGRRzzlRDaOjh3ADwH0WeibQvi3ls2Q==}
+    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
+    dependencies:
+      cross-spawn: 7.0.3
+      is-glob: 4.0.3
+      open: 8.4.0
+      picocolors: 1.0.0
+      tiny-glob: 0.2.9
+      tslib: 2.4.0
+    dev: true
+
   /@popperjs/core/2.9.2:
     resolution: {integrity: sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==}
 
@@ -2049,14 +2362,6 @@ packages:
       reselect: 4.1.5
     dev: false
 
-  /@rollup/pluginutils/4.2.1:
-    resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==}
-    engines: {node: '>= 8.0.0'}
-    dependencies:
-      estree-walker: 2.0.2
-      picomatch: 2.3.1
-    dev: false
-
   /@rooks/use-outside-click-ref/4.11.2_react@18.1.0:
     resolution: {integrity: sha512-w2bCW69zcpLh0KmN/odAuBsQ3sps+73KEu7zMOi0o4YMfDo+tXcqwlTJiLYysd0BEoQC9pNIklzZmI9zZep69g==}
     peerDependencies:
@@ -2262,8 +2567,8 @@ packages:
   /@types/prop-types/15.7.5:
     resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
 
-  /@types/react-datepicker/4.3.4_react@18.1.0:
-    resolution: {integrity: sha512-5nTTz37KdTUgMZ1AAxztMWNtEnIMVRo8oCAEhIv0a6uUqDjvSKaMyPRpBV+8chi6f/A8wlTKJIpojpXca2dx3A==}
+  /@types/react-datepicker/4.4.2_react@18.1.0:
+    resolution: {integrity: sha512-g8DhWvYmaIMLzVrIEVLXncylyImyBaoPsEUr3yR13JDaaHoebhDorqnVv4tLkNGa8SjBB8SAOQvxD5jaPNBX8A==}
     dependencies:
       '@popperjs/core': 2.9.2
       '@types/react': 18.0.9
@@ -2548,18 +2853,20 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-react/1.3.2:
-    resolution: {integrity: sha512-aurBNmMo0kz1O4qRoY+FM4epSA39y3ShWGuqfLRA/3z0oEJAdtoSfgA3aO98/PCCHAqMaduLxIxErWrVKIFzXA==}
-    engines: {node: '>=12.0.0'}
+  /@vitejs/plugin-react/2.0.0_vite@3.0.2:
+    resolution: {integrity: sha512-zHkRR+X4zqEPNBbKV2FvWSxK7Q6crjMBVIAYroSU8Nbb4M3E5x4qOiLoqJBHtXgr27kfednXjkwr3lr8jS6Wrw==}
+    engines: {node: '>=14.18.0'}
+    peerDependencies:
+      vite: ^3.0.0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
-      '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-react-jsx-self': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-react-jsx-source': 7.16.7_@babel+core@7.18.2
-      '@rollup/pluginutils': 4.2.1
-      react-refresh: 0.13.0
-      resolve: 1.22.0
+      '@babel/core': 7.18.9
+      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.9
+      '@babel/plugin-transform-react-jsx-development': 7.18.6_@babel+core@7.18.9
+      '@babel/plugin-transform-react-jsx-self': 7.18.6_@babel+core@7.18.9
+      '@babel/plugin-transform-react-jsx-source': 7.18.6_@babel+core@7.18.9
+      magic-string: 0.26.2
+      react-refresh: 0.14.0
+      vite: 3.0.2_sass@1.52.3
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -2572,6 +2879,10 @@ packages:
     resolution: {integrity: sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ==}
     dev: false
 
+  /ace-builds/1.7.1:
+    resolution: {integrity: sha512-1mcbP5kXvr729sJ9dA/8tul0pjuvKbma0LF/ZMRwPEwjoNWNpe/x0OXpaPJo36aRpZCjRZMl5zsME3hAKTiaNw==}
+    dev: false
+
   /acorn-globals/6.0.0:
     resolution: {integrity: sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==}
     dependencies:
@@ -2648,6 +2959,13 @@ packages:
     dependencies:
       type-fest: 0.21.3
 
+  /ansi-escapes/5.0.0:
+    resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==}
+    engines: {node: '>=12'}
+    dependencies:
+      type-fest: 1.4.0
+    dev: false
+
   /ansi-regex/5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
@@ -2797,6 +3115,23 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /babel-jest/28.1.1_@babel+core@7.18.9:
+    resolution: {integrity: sha512-MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    peerDependencies:
+      '@babel/core': ^7.8.0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@jest/transform': 28.1.1
+      '@types/babel__core': 7.1.19
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 28.1.1_@babel+core@7.18.9
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+
   /babel-plugin-dynamic-import-node/2.3.3:
     resolution: {integrity: sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==}
     dependencies:
@@ -2906,6 +3241,25 @@ packages:
       '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
       '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.2
 
+  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.9:
+    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.9
+      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.9
+      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.9
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.9
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.9
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.9
+
   /babel-preset-jest/28.1.1_@babel+core@7.18.2:
     resolution: {integrity: sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
@@ -2916,6 +3270,16 @@ packages:
       babel-plugin-jest-hoist: 28.1.1
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2
 
+  /babel-preset-jest/28.1.1_@babel+core@7.18.9:
+    resolution: {integrity: sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g==}
+    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.9
+      babel-plugin-jest-hoist: 28.1.1
+      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.9
+
   /babel-preset-react-app/10.0.1:
     resolution: {integrity: sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==}
     dependencies:
@@ -3445,6 +3809,11 @@ packages:
       clone: 1.0.4
     dev: true
 
+  /define-lazy-prop/2.0.0:
+    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
+    engines: {node: '>=8'}
+    dev: true
+
   /define-properties/1.1.4:
     resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
     engines: {node: '>= 0.4'}
@@ -3538,6 +3907,14 @@ packages:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
     dev: true
 
+  /enhanced-resolve/5.10.0:
+    resolution: {integrity: sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==}
+    engines: {node: '>=10.13.0'}
+    dependencies:
+      graceful-fs: 4.2.10
+      tapable: 2.2.1
+    dev: true
+
   /error-ex/1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
@@ -3587,8 +3964,8 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
-  /esbuild-android-64/0.14.43:
-    resolution: {integrity: sha512-kqFXAS72K6cNrB6RiM7YJ5lNvmWRDSlpi7ZuRZ1hu1S3w0zlwcoCxWAyM23LQUyZSs1PbjHgdbbfYAN8IGh6xg==}
+  /esbuild-android-64/0.14.49:
+    resolution: {integrity: sha512-vYsdOTD+yi+kquhBiFWl3tyxnj2qZJsl4tAqwhT90ktUdnyTizgle7TjNx6Ar1bN7wcwWqZ9QInfdk2WVagSww==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -3596,8 +3973,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-android-arm64/0.14.43:
-    resolution: {integrity: sha512-bKS2BBFh+7XZY9rpjiHGRNA7LvWYbZWP87pLehggTG7tTaCDvj8qQGOU/OZSjCSKDYbgY7Q+oDw8RlYQ2Jt2BA==}
+  /esbuild-android-arm64/0.14.49:
+    resolution: {integrity: sha512-g2HGr/hjOXCgSsvQZ1nK4nW/ei8JUx04Li74qub9qWrStlysaVmadRyTVuW32FGIpLQyc5sUjjZopj49eGGM2g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -3605,8 +3982,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-darwin-64/0.14.43:
-    resolution: {integrity: sha512-/3PSilx011ttoieRGkSZ0XV8zjBf2C9enV4ScMMbCT4dpx0mFhMOpFnCHkOK0pWGB8LklykFyHrWk2z6DENVUg==}
+  /esbuild-darwin-64/0.14.49:
+    resolution: {integrity: sha512-3rvqnBCtX9ywso5fCHixt2GBCUsogNp9DjGmvbBohh31Ces34BVzFltMSxJpacNki96+WIcX5s/vum+ckXiLYg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -3614,8 +3991,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-darwin-arm64/0.14.43:
-    resolution: {integrity: sha512-1HyFUKs8DMCBOvw1Qxpr5Vv/ThNcVIFb5xgXWK3pyT40WPvgYIiRTwJCvNs4l8i5qWF8/CK5bQxJVDjQvtv0Yw==}
+  /esbuild-darwin-arm64/0.14.49:
+    resolution: {integrity: sha512-XMaqDxO846srnGlUSJnwbijV29MTKUATmOLyQSfswbK/2X5Uv28M9tTLUJcKKxzoo9lnkYPsx2o8EJcTYwCs/A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -3623,8 +4000,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-freebsd-64/0.14.43:
-    resolution: {integrity: sha512-FNWc05TPHYgaXjbPZO5/rJKSBslfG6BeMSs8GhwnqAKP56eEhvmzwnIz1QcC9cRVyO+IKqWNfmHFkCa1WJTULA==}
+  /esbuild-freebsd-64/0.14.49:
+    resolution: {integrity: sha512-NJ5Q6AjV879mOHFri+5lZLTp5XsO2hQ+KSJYLbfY9DgCu8s6/Zl2prWXVANYTeCDLlrIlNNYw8y34xqyLDKOmQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -3632,8 +4009,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-freebsd-arm64/0.14.43:
-    resolution: {integrity: sha512-amrYopclz3VohqisOPR6hA3GOWA3LZC1WDLnp21RhNmoERmJ/vLnOpnrG2P/Zao+/erKTCUqmrCIPVtj58DRoA==}
+  /esbuild-freebsd-arm64/0.14.49:
+    resolution: {integrity: sha512-lFLtgXnAc3eXYqj5koPlBZvEbBSOSUbWO3gyY/0+4lBdRqELyz4bAuamHvmvHW5swJYL7kngzIZw6kdu25KGOA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -3641,8 +4018,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-32/0.14.43:
-    resolution: {integrity: sha512-KoxoEra+9O3AKVvgDFvDkiuddCds6q71owSQEYwjtqRV7RwbPzKxJa6+uyzUulHcyGVq0g15K0oKG5CFBcvYDw==}
+  /esbuild-linux-32/0.14.49:
+    resolution: {integrity: sha512-zTTH4gr2Kb8u4QcOpTDVn7Z8q7QEIvFl/+vHrI3cF6XOJS7iEI1FWslTo3uofB2+mn6sIJEQD9PrNZKoAAMDiA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -3650,8 +4027,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-64/0.14.43:
-    resolution: {integrity: sha512-EwINwGMyiJMgBby5/SbMqKcUhS5AYAZ2CpEBzSowsJPNBJEdhkCTtEjk757TN/wxgbu3QklqDM6KghY660QCUw==}
+  /esbuild-linux-64/0.14.49:
+    resolution: {integrity: sha512-hYmzRIDzFfLrB5c1SknkxzM8LdEUOusp6M2TnuQZJLRtxTgyPnZZVtyMeCLki0wKgYPXkFsAVhi8vzo2mBNeTg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -3659,8 +4036,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-arm/0.14.43:
-    resolution: {integrity: sha512-e6YzQUoDxxtyamuF12eVzzRC7bbEFSZohJ6igQB9tBqnNmIQY3fI6Cns3z2wxtbZ3f2o6idkD2fQnlvs2902Dg==}
+  /esbuild-linux-arm/0.14.49:
+    resolution: {integrity: sha512-iE3e+ZVv1Qz1Sy0gifIsarJMQ89Rpm9mtLSRtG3AH0FPgAzQ5Z5oU6vYzhc/3gSPi2UxdCOfRhw2onXuFw/0lg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -3668,8 +4045,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-arm64/0.14.43:
-    resolution: {integrity: sha512-UlSpjMWllAc70zYbHxWuDS3FJytyuR/gHJYBr8BICcTNb/TSOYVBg6U7b3jZ3mILTrgzwJUHwhEwK18FZDouUQ==}
+  /esbuild-linux-arm64/0.14.49:
+    resolution: {integrity: sha512-KLQ+WpeuY+7bxukxLz5VgkAAVQxUv67Ft4DmHIPIW+2w3ObBPQhqNoeQUHxopoW/aiOn3m99NSmSV+bs4BSsdA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -3677,8 +4054,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-mips64le/0.14.43:
-    resolution: {integrity: sha512-f+v8cInPEL1/SDP//CfSYzcDNgE4CY3xgDV81DWm3KAPWzhvxARrKxB1Pstf5mB56yAslJDxu7ryBUPX207EZA==}
+  /esbuild-linux-mips64le/0.14.49:
+    resolution: {integrity: sha512-n+rGODfm8RSum5pFIqFQVQpYBw+AztL8s6o9kfx7tjfK0yIGF6tm5HlG6aRjodiiKkH2xAiIM+U4xtQVZYU4rA==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -3686,8 +4063,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-ppc64le/0.14.43:
-    resolution: {integrity: sha512-5wZYMDGAL/K2pqkdIsW+I4IR41kyfHr/QshJcNpUfK3RjB3VQcPWOaZmc+74rm4ZjVirYrtz+jWw0SgxtxRanA==}
+  /esbuild-linux-ppc64le/0.14.49:
+    resolution: {integrity: sha512-WP9zR4HX6iCBmMFH+XHHng2LmdoIeUmBpL4aL2TR8ruzXyT4dWrJ5BSbT8iNo6THN8lod6GOmYDLq/dgZLalGw==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -3695,8 +4072,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-riscv64/0.14.43:
-    resolution: {integrity: sha512-lYcAOUxp85hC7lSjycJUVSmj4/9oEfSyXjb/ua9bNl8afonaduuqtw7hvKMoKuYnVwOCDw4RSfKpcnIRDWq+Bw==}
+  /esbuild-linux-riscv64/0.14.49:
+    resolution: {integrity: sha512-h66ORBz+Dg+1KgLvzTVQEA1LX4XBd1SK0Fgbhhw4akpG/YkN8pS6OzYI/7SGENiN6ao5hETRDSkVcvU9NRtkMQ==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -3704,8 +4081,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-s390x/0.14.43:
-    resolution: {integrity: sha512-27e43ZhHvhFE4nM7HqtUbMRu37I/4eNSUbb8FGZWszV+uLzMIsHDwLoBiJmw7G9N+hrehNPeQ4F5Ujad0DrUKQ==}
+  /esbuild-linux-s390x/0.14.49:
+    resolution: {integrity: sha512-DhrUoFVWD+XmKO1y7e4kNCqQHPs6twz6VV6Uezl/XHYGzM60rBewBF5jlZjG0nCk5W/Xy6y1xWeopkrhFFM0sQ==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -3713,8 +4090,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-netbsd-64/0.14.43:
-    resolution: {integrity: sha512-2mH4QF6hHBn5zzAfxEI/2eBC0mspVsZ6UVo821LpAJKMvLJPBk3XJO5xwg7paDqSqpl7p6IRrAenW999AEfJhQ==}
+  /esbuild-netbsd-64/0.14.49:
+    resolution: {integrity: sha512-BXaUwFOfCy2T+hABtiPUIpWjAeWK9P8O41gR4Pg73hpzoygVGnj0nI3YK4SJhe52ELgtdgWP/ckIkbn2XaTxjQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -3722,8 +4099,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-openbsd-64/0.14.43:
-    resolution: {integrity: sha512-ZhQpiZjvqCqO8jKdGp9+8k9E/EHSA+zIWOg+grwZasI9RoblqJ1QiZqqi7jfd6ZrrG1UFBNGe4m0NFxCFbMVbg==}
+  /esbuild-openbsd-64/0.14.49:
+    resolution: {integrity: sha512-lP06UQeLDGmVPw9Rg437Btu6J9/BmyhdoefnQ4gDEJTtJvKtQaUcOQrhjTq455ouZN4EHFH1h28WOJVANK41kA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -3731,8 +4108,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-sunos-64/0.14.43:
-    resolution: {integrity: sha512-DgxSi9DaHReL9gYuul2rrQCAapgnCJkh3LSHPKsY26zytYppG0HgkgVF80zjIlvEsUbGBP/GHQzBtrezj/Zq1Q==}
+  /esbuild-sunos-64/0.14.49:
+    resolution: {integrity: sha512-4c8Zowp+V3zIWje329BeLbGh6XI9c/rqARNaj5yPHdC61pHI9UNdDxT3rePPJeWcEZVKjkiAS6AP6kiITp7FSw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -3740,8 +4117,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-windows-32/0.14.43:
-    resolution: {integrity: sha512-Ih3+2O5oExiqm0mY6YYE5dR0o8+AspccQ3vIAtRodwFvhuyGLjb0Hbmzun/F3Lw19nuhPMu3sW2fqIJ5xBxByw==}
+  /esbuild-windows-32/0.14.49:
+    resolution: {integrity: sha512-q7Rb+J9yHTeKr9QTPDYkqfkEj8/kcKz9lOabDuvEXpXuIcosWCJgo5Z7h/L4r7rbtTH4a8U2FGKb6s1eeOHmJA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -3749,8 +4126,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-windows-64/0.14.43:
-    resolution: {integrity: sha512-8NsuNfI8xwFuJbrCuI+aBqNTYkrWErejFO5aYM+yHqyHuL8mmepLS9EPzAzk8rvfaJrhN0+RvKWAcymViHOKEw==}
+  /esbuild-windows-64/0.14.49:
+    resolution: {integrity: sha512-+Cme7Ongv0UIUTniPqfTX6mJ8Deo7VXw9xN0yJEN1lQMHDppTNmKwAM3oGbD/Vqff+07K2gN0WfNkMohmG+dVw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -3758,8 +4135,8 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-windows-arm64/0.14.43:
-    resolution: {integrity: sha512-7ZlD7bo++kVRblJEoG+cepljkfP8bfuTPz5fIXzptwnPaFwGS6ahvfoYzY7WCf5v/1nX2X02HDraVItTgbHnKw==}
+  /esbuild-windows-arm64/0.14.49:
+    resolution: {integrity: sha512-v+HYNAXzuANrCbbLFJ5nmO3m5y2PGZWLe3uloAkLt87aXiO2mZr3BTmacZdjwNkNEHuH3bNtN8cak+mzVjVPfA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -3767,32 +4144,32 @@ packages:
     dev: false
     optional: true
 
-  /esbuild/0.14.43:
-    resolution: {integrity: sha512-Uf94+kQmy/5jsFwKWiQB4hfo/RkM9Dh7b79p8yqd1tshULdr25G2szLz631NoH3s2ujnKEKVD16RmOxvCNKRFA==}
+  /esbuild/0.14.49:
+    resolution: {integrity: sha512-/TlVHhOaq7Yz8N1OJrjqM3Auzo5wjvHFLk+T8pIue+fhnhIMpfAzsG6PLVMbFveVxqD2WOp3QHei+52IMUNmCw==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      esbuild-android-64: 0.14.43
-      esbuild-android-arm64: 0.14.43
-      esbuild-darwin-64: 0.14.43
-      esbuild-darwin-arm64: 0.14.43
-      esbuild-freebsd-64: 0.14.43
-      esbuild-freebsd-arm64: 0.14.43
-      esbuild-linux-32: 0.14.43
-      esbuild-linux-64: 0.14.43
-      esbuild-linux-arm: 0.14.43
-      esbuild-linux-arm64: 0.14.43
-      esbuild-linux-mips64le: 0.14.43
-      esbuild-linux-ppc64le: 0.14.43
-      esbuild-linux-riscv64: 0.14.43
-      esbuild-linux-s390x: 0.14.43
-      esbuild-netbsd-64: 0.14.43
-      esbuild-openbsd-64: 0.14.43
-      esbuild-sunos-64: 0.14.43
-      esbuild-windows-32: 0.14.43
-      esbuild-windows-64: 0.14.43
-      esbuild-windows-arm64: 0.14.43
+      esbuild-android-64: 0.14.49
+      esbuild-android-arm64: 0.14.49
+      esbuild-darwin-64: 0.14.49
+      esbuild-darwin-arm64: 0.14.49
+      esbuild-freebsd-64: 0.14.49
+      esbuild-freebsd-arm64: 0.14.49
+      esbuild-linux-32: 0.14.49
+      esbuild-linux-64: 0.14.49
+      esbuild-linux-arm: 0.14.49
+      esbuild-linux-arm64: 0.14.49
+      esbuild-linux-mips64le: 0.14.49
+      esbuild-linux-ppc64le: 0.14.49
+      esbuild-linux-riscv64: 0.14.49
+      esbuild-linux-s390x: 0.14.49
+      esbuild-netbsd-64: 0.14.49
+      esbuild-openbsd-64: 0.14.49
+      esbuild-sunos-64: 0.14.49
+      esbuild-windows-32: 0.14.49
+      esbuild-windows-64: 0.14.49
+      esbuild-windows-arm64: 0.14.49
     dev: false
 
   /escalade/3.1.1:
@@ -3834,7 +4211,7 @@ packages:
     dependencies:
       confusing-browser-globals: 1.0.11
       eslint: 8.16.0
-      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
       object.assign: 4.1.2
       object.entries: 1.1.5
       semver: 6.3.0
@@ -3852,7 +4229,7 @@ packages:
       '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
       eslint: 8.16.0
       eslint-config-airbnb-base: 15.0.0_btspkuwbqkl4adpiufzbathtpi
-      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
     dev: true
 
   /eslint-config-airbnb/19.0.4_pamhosqcenlxoxj4ke2dmvzava:
@@ -3867,7 +4244,7 @@ packages:
     dependencies:
       eslint: 8.16.0
       eslint-config-airbnb-base: 15.0.0_btspkuwbqkl4adpiufzbathtpi
-      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
       eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
       eslint-plugin-react: 7.29.4_eslint@8.16.0
       eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
@@ -3884,7 +4261,7 @@ packages:
       eslint: 8.16.0
     dev: true
 
-  /eslint-config-react-app/7.0.1_widwqlnidgep55t2naywdlxcqa:
+  /eslint-config-react-app/7.0.1_y3w6q4zxtal6gz5auqli3lo3ny:
     resolution: {integrity: sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3903,7 +4280,7 @@ packages:
       confusing-browser-globals: 1.0.11
       eslint: 8.16.0
       eslint-plugin-flowtype: 8.0.3_lkudaqqzr27bp3dduyr3eevxq4
-      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
+      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
       eslint-plugin-jest: 25.7.0_lemdnf4suuyhpl5s2mhp2xyjqi
       eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
       eslint-plugin-react: 7.29.4_eslint@8.16.0
@@ -3928,25 +4305,27 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-import-resolver-typescript/2.7.1_btspkuwbqkl4adpiufzbathtpi:
-    resolution: {integrity: sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==}
-    engines: {node: '>=4'}
+  /eslint-import-resolver-typescript/3.2.7_btspkuwbqkl4adpiufzbathtpi:
+    resolution: {integrity: sha512-WvcsRy3aPmwVsuS/XVliAJWpIdTlaFXXZPZk3TCbvvF8RtaAkjAhcLL5bl5VEoTmE+XnTHjIbWMzNZcOQpK/DA==}
+    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
       eslint-plugin-import: '*'
     dependencies:
       debug: 4.3.4
+      enhanced-resolve: 5.10.0
       eslint: 8.16.0
-      eslint-plugin-import: 2.26.0_nw7vw77csnm53tfhadjrrkb4nu
-      glob: 7.2.0
+      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
+      get-tsconfig: 4.2.0
+      globby: 13.1.2
+      is-core-module: 2.9.0
       is-glob: 4.0.3
-      resolve: 1.22.0
-      tsconfig-paths: 3.14.1
+      synckit: 0.8.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-module-utils/2.7.3_qqdd6sztsqjscz2z77otnj6nm4:
+  /eslint-module-utils/2.7.3_q4nbo54pix2uwk2gpiw7zjvdw4:
     resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3967,7 +4346,7 @@ packages:
       '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
       debug: 3.2.7
       eslint-import-resolver-node: 0.3.6
-      eslint-import-resolver-typescript: 2.7.1_btspkuwbqkl4adpiufzbathtpi
+      eslint-import-resolver-typescript: 3.2.7_btspkuwbqkl4adpiufzbathtpi
       find-up: 2.1.0
     transitivePeerDependencies:
       - supports-color
@@ -3988,7 +4367,7 @@ packages:
       string-natural-compare: 3.0.1
     dev: true
 
-  /eslint-plugin-import/2.26.0_nw7vw77csnm53tfhadjrrkb4nu:
+  /eslint-plugin-import/2.26.0_h5azci6ujakbaa2xblg2jlxooy:
     resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -4005,7 +4384,7 @@ packages:
       doctrine: 2.1.0
       eslint: 8.16.0
       eslint-import-resolver-node: 0.3.6
-      eslint-module-utils: 2.7.3_qqdd6sztsqjscz2z77otnj6nm4
+      eslint-module-utils: 2.7.3_q4nbo54pix2uwk2gpiw7zjvdw4
       has: 1.0.3
       is-core-module: 2.9.0
       is-glob: 4.0.3
@@ -4254,10 +4633,6 @@ packages:
     engines: {node: '>=4.0'}
     dev: true
 
-  /estree-walker/2.0.2:
-    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
-    dev: false
-
   /esutils/2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
@@ -4534,6 +4909,10 @@ packages:
       get-intrinsic: 1.1.1
     dev: true
 
+  /get-tsconfig/4.2.0:
+    resolution: {integrity: sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg==}
+    dev: true
+
   /glob-parent/5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
@@ -4586,6 +4965,10 @@ packages:
       type-fest: 0.20.2
     dev: true
 
+  /globalyzer/0.1.0:
+    resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
+    dev: true
+
   /globby/11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
@@ -4598,9 +4981,19 @@ packages:
       slash: 3.0.0
     dev: true
 
+  /globby/13.1.2:
+    resolution: {integrity: sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      dir-glob: 3.0.1
+      fast-glob: 3.2.11
+      ignore: 5.2.0
+      merge2: 1.4.1
+      slash: 4.0.0
+    dev: true
+
   /globrex/0.1.2:
     resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
-    dev: false
 
   /graceful-fs/4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
@@ -4828,6 +5221,12 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
+  /is-docker/2.2.1:
+    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
+    engines: {node: '>=8'}
+    hasBin: true
+    dev: true
+
   /is-extglob/2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
@@ -4925,6 +5324,13 @@ packages:
       call-bind: 1.0.2
     dev: true
 
+  /is-wsl/2.2.0:
+    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
+    engines: {node: '>=8'}
+    dependencies:
+      is-docker: 2.2.1
+    dev: true
+
   /isexe/2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
@@ -4936,7 +5342,7 @@ packages:
     resolution: {integrity: sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
       '@babel/parser': 7.18.4
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
@@ -5046,11 +5452,11 @@ packages:
       ts-node:
         optional: true
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
       '@jest/test-sequencer': 28.1.1
       '@jest/types': 28.1.1
       '@types/node': 16.11.7
-      babel-jest: 28.1.1_@babel+core@7.18.2
+      babel-jest: 28.1.1_@babel+core@7.18.9
       chalk: 4.1.2
       ci-info: 3.3.1
       deepmerge: 4.2.2
@@ -5286,17 +5692,17 @@ packages:
     resolution: {integrity: sha512-1KjqHJ98adRcbIdMizjF5DipwZFbvxym/kFO4g4fVZCZRxH/dqV8TiBFCa6rqic3p0karsy8RWS1y4E07b7P0A==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
       '@babel/generator': 7.18.2
-      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.2
-      '@babel/traverse': 7.18.2
-      '@babel/types': 7.18.7
+      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.9
+      '@babel/traverse': 7.18.9
+      '@babel/types': 7.18.9
       '@jest/expect-utils': 28.1.1
       '@jest/transform': 28.1.1
       '@jest/types': 28.1.1
       '@types/babel__traverse': 7.17.1
       '@types/prettier': 2.6.3
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2
+      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.9
       chalk: 4.1.2
       expect: 28.1.1
       graceful-fs: 4.2.10
@@ -5351,13 +5757,13 @@ packages:
       leven: 3.1.0
       pretty-format: 28.1.1
 
-  /jest-watch-typeahead/1.1.0_jest@28.1.1:
-    resolution: {integrity: sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  /jest-watch-typeahead/2.0.0_jest@28.1.1:
+    resolution: {integrity: sha512-LX/jrTNkOIZV1n7fnEWlKJ73lhVPKF9B6F0L7pbje3xNPw1NddPLn0n8EFt7YwbCnC0+vlLylp7JehV6M06J6Q==}
+    engines: {node: ^14.17.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       jest: ^27.0.0 || ^28.0.0
     dependencies:
-      ansi-escapes: 4.3.2
+      ansi-escapes: 5.0.0
       chalk: 4.1.2
       jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
       jest-regex-util: 28.0.2
@@ -5709,6 +6115,13 @@ packages:
     resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
     hasBin: true
 
+  /magic-string/0.26.2:
+    resolution: {integrity: sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==}
+    engines: {node: '>=12'}
+    dependencies:
+      sourcemap-codec: 1.4.8
+    dev: false
+
   /make-dir/3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
@@ -5951,6 +6364,15 @@ packages:
       format-util: 1.0.5
     dev: false
 
+  /open/8.4.0:
+    resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
+    engines: {node: '>=12'}
+    dependencies:
+      define-lazy-prop: 2.0.0
+      is-docker: 2.2.1
+      is-wsl: 2.2.0
+    dev: true
+
   /optionator/0.8.3:
     resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
     engines: {node: '>= 0.8.0'}
@@ -6129,8 +6551,8 @@ packages:
   /postcss-value-parser/4.1.0:
     resolution: {integrity: sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==}
 
-  /postcss/8.4.13:
-    resolution: {integrity: sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==}
+  /postcss/8.4.14:
+    resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
       nanoid: 3.3.4
@@ -6220,13 +6642,13 @@ packages:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
 
-  /react-ace/9.5.0_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-4l5FgwGh6K7A0yWVMQlPIXDItM4Q9zzXRqOae8KkCl6MkOob7sC1CzHxZdOGvV+QioKWbX2p5HcdOVUv6cAdSg==}
+  /react-ace/10.1.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-VkvUjZNhdYTuKOKQpMIZi7uzZZVgzCjM7cLYu6F64V0mejY8a2XTyPUIMszC6A4trbeMIHbK5fYFcT/wkP/8VA==}
     peerDependencies:
-      react: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0
-      react-dom: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0
+      react: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      ace-builds: 1.4.13
+      ace-builds: 1.7.1
       diff-match-patch: 1.0.5
       lodash.get: 4.4.2
       lodash.isequal: 4.5.0
@@ -6235,11 +6657,11 @@ packages:
       react-dom: 18.1.0_react@18.1.0
     dev: false
 
-  /react-datepicker/4.5.0_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-mFP/SbtFSXx21Wx3Nfv+RREwd/x0q14x7QL79ZCi/PVkHSFLwLWhXyOtj3OIzi1AcVYb/fMMcvi8e5b12n8/sg==}
+  /react-datepicker/4.8.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-u69zXGHMpxAa4LeYR83vucQoUCJQ6m/WBsSxmUMu/M8ahTSVMMyiyQzauHgZA2NUr9y0FUgOAix71hGYUb6tvg==}
     peerDependencies:
-      react: ^16.9.0 || ^17
-      react-dom: ^16.9.0 || ^17
+      react: ^16.9.0 || ^17 || ^18
+      react-dom: ^16.9.0 || ^17 || ^18
     dependencies:
       '@popperjs/core': 2.9.2
       classnames: 2.3.1
@@ -6350,8 +6772,8 @@ packages:
       react-is: 17.0.2
     dev: false
 
-  /react-refresh/0.13.0:
-    resolution: {integrity: sha512-XP8A9BT0CpRBD+NYLLeIhld/RqG9+gktUjW1FkE+Vm7OCinbG1SshcK5tb9ls4kzvjZr9mOQc7HYgBngEyPAXg==}
+  /react-refresh/0.14.0:
+    resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
     engines: {node: '>=0.10.0'}
     dev: false
 
@@ -6544,6 +6966,15 @@ packages:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
+  /resolve/1.22.1:
+    resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
+    hasBin: true
+    dependencies:
+      is-core-module: 2.9.0
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+    dev: false
+
   /resolve/2.0.0-next.3:
     resolution: {integrity: sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==}
     dependencies:
@@ -6574,8 +7005,8 @@ packages:
     dependencies:
       glob: 7.2.0
 
-  /rollup/2.72.1:
-    resolution: {integrity: sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==}
+  /rollup/2.77.0:
+    resolution: {integrity: sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
@@ -6689,7 +7120,6 @@ packages:
   /slash/4.0.0:
     resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
     engines: {node: '>=12'}
-    dev: false
 
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
@@ -6740,6 +7170,10 @@ packages:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
+  /sourcemap-codec/1.4.8:
+    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
+    dev: false
+
   /spawn-command/0.0.2-1:
     resolution: {integrity: sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==}
     dev: true
@@ -6924,6 +7358,19 @@ packages:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
     dev: true
 
+  /synckit/0.8.1:
+    resolution: {integrity: sha512-rJEeygO5PNmcZICmrgnbOd2usi5zWE1ESc0Gn5tTmJlongoU8zCTwMFQtar2UgMSiR68vK9afPQ+uVs2lURSIA==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    dependencies:
+      '@pkgr/utils': 2.3.0
+      tslib: 2.4.0
+    dev: true
+
+  /tapable/2.2.1:
+    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
+    engines: {node: '>=6'}
+    dev: true
+
   /terminal-link/2.1.1:
     resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
     engines: {node: '>=8'}
@@ -6950,6 +7397,13 @@ packages:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
 
+  /tiny-glob/0.2.9:
+    resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
+    dependencies:
+      globalyzer: 0.1.0
+      globrex: 0.1.2
+    dev: true
+
   /tmp/0.0.33:
     resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
     engines: {node: '>=0.6.0'}
@@ -7117,6 +7571,10 @@ packages:
     resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==}
     dev: true
 
+  /tslib/2.4.0:
+    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
+    dev: true
+
   /tsutils/3.21.0_typescript@4.7.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
@@ -7154,6 +7612,11 @@ packages:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
 
+  /type-fest/1.4.0:
+    resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
+    engines: {node: '>=10'}
+    dev: false
+
   /typescript/4.7.4:
     resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==}
     engines: {node: '>=4.2.0'}
@@ -7246,7 +7709,7 @@ packages:
       '@types/istanbul-lib-coverage': 2.0.3
       convert-source-map: 1.7.0
 
-  /vite-tsconfig-paths/3.5.0_vite@2.9.11:
+  /vite-tsconfig-paths/3.5.0_vite@3.0.2:
     resolution: {integrity: sha512-NKIubr7gXgh/3uniQaOytSg+aKWPrjquP6anAy+zCWEn6h9fB8z2/qdlfQrTgZWaXJ2pHVlllrSdRZltHn9P4g==}
     peerDependencies:
       vite: '>2.0.0-0'
@@ -7255,19 +7718,20 @@ packages:
       globrex: 0.1.2
       recrawl-sync: 2.2.2
       tsconfig-paths: 4.0.0
-      vite: 2.9.11_sass@1.52.3
+      vite: 3.0.2_sass@1.52.3
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /vite/2.9.11_sass@1.52.3:
-    resolution: {integrity: sha512-h1n8bAN5Psv/V+RAY3P6OtYyGSFQdusgYWiLRAk41qY7rSyH4K5Jq+RUXztzyPVB0oHbnXPUuS2Aj44jucViUA==}
-    engines: {node: '>=12.2.0'}
+  /vite/3.0.2_sass@1.52.3:
+    resolution: {integrity: sha512-TAqydxW/w0U5AoL5AsD9DApTvGb2iNbGs3sN4u2VdT1GFkQVUfgUldt+t08TZgi23uIauh1TUOQJALduo9GXqw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
       less: '*'
       sass: '*'
       stylus: '*'
+      terser: ^5.4.0
     peerDependenciesMeta:
       less:
         optional: true
@@ -7275,11 +7739,13 @@ packages:
         optional: true
       stylus:
         optional: true
+      terser:
+        optional: true
     dependencies:
-      esbuild: 0.14.43
-      postcss: 8.4.13
-      resolve: 1.22.0
-      rollup: 2.72.1
+      esbuild: 0.14.49
+      postcss: 8.4.14
+      resolve: 1.22.1
+      rollup: 2.77.0
       sass: 1.52.3
     optionalDependencies:
       fsevents: 2.3.2
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index bd49da7c8ec..780fdc72d1c 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Suspense } from 'react';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
@@ -15,6 +15,7 @@ import { NavLink, Route, Routes } from 'react-router-dom';
 import BrokerLogdir from 'components/Brokers/Broker/BrokerLogdir/BrokerLogdir';
 import BrokerMetrics from 'components/Brokers/Broker/BrokerMetrics/BrokerMetrics';
 import Navbar from 'components/common/Navigation/Navbar.styled';
+import PageLoader from 'components/common/PageLoader/PageLoader';
 
 export interface BrokerLogdirState {
   name: string;
@@ -67,13 +68,15 @@ const Broker: React.FC = () => {
         </NavLink>
       </Navbar>
 
-      <Routes>
-        <Route index element={<BrokerLogdir />} />
-        <Route
-          path={clusterBrokerMetricsRelativePath}
-          element={<BrokerMetrics />}
-        />
-      </Routes>
+      <Suspense fallback={<PageLoader />}>
+        <Routes>
+          <Route index element={<BrokerLogdir />} />
+          <Route
+            path={clusterBrokerMetricsRelativePath}
+            element={<BrokerMetrics />}
+          />
+        </Routes>
+      </Suspense>
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx
index 23456c402e9..e489d58f2cc 100644
--- a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx
+++ b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx
@@ -4,7 +4,7 @@ import { SchemaType } from 'generated-sources';
 
 import * as S from './EditorViewer.styled';
 
-export interface FullMessageProps {
+export interface EditorViewerProps {
   data: string;
   schemaType?: string;
   maxLines?: number;
@@ -16,7 +16,7 @@ const getSchemaValue = (data: string, schemaType?: string) => {
   }
   return data;
 };
-const EditorViewer: React.FC<FullMessageProps> = ({
+const EditorViewer: React.FC<EditorViewerProps> = ({
   data,
   schemaType,
   maxLines,
diff --git a/kafka-ui-react-app/src/components/common/EditorViewer/__test__/EditorViewer.spec.tsx b/kafka-ui-react-app/src/components/common/EditorViewer/__test__/EditorViewer.spec.tsx
index 13989784973..87a1b380ddc 100644
--- a/kafka-ui-react-app/src/components/common/EditorViewer/__test__/EditorViewer.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/EditorViewer/__test__/EditorViewer.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import EditorViewer, {
-  FullMessageProps,
+  EditorViewerProps,
 } from 'components/common/EditorViewer/EditorViewer';
 import { render } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
@@ -10,7 +10,7 @@ const maxLines = 28;
 const schemaType = 'JSON';
 
 describe('EditorViewer component', () => {
-  const setupComponent = (props: FullMessageProps) =>
+  const setupComponent = (props: EditorViewerProps) =>
     render(<EditorViewer {...props} />);
 
   it('renders JSONTree', () => {
diff --git a/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts b/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
index a8a52413b2b..f7fda2b83c7 100644
--- a/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
@@ -5,12 +5,14 @@ const Navbar = styled.nav`
   border-bottom: 1px ${({ theme }) => theme.primaryTab.borderColor.nav} solid;
   & a {
     height: 40px;
-    width: 96px;
+    min-width: 96px;
+    padding: 0 16px;
     display: flex;
     justify-content: center;
     align-items: center;
     font-weight: 500;
     font-size: 14px;
+    white-space: nowrap;
     color: ${(props) => props.theme.primaryTab.color.normal};
     border-bottom: 1px ${(props) => props.theme.primaryTab.borderColor.normal}
       solid;
diff --git a/kafka-ui-react-app/src/lib/hooks/api/brokers.ts b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
index f9582b859bf..f60db12e3a1 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
@@ -17,8 +17,7 @@ export function useBrokerMetrics(clusterName: ClusterName, brokerId: number) {
       api.getBrokersMetrics({
         clusterName,
         id: brokerId,
-      }),
-    { refetchInterval: 5000 }
+      })
   );
 }
 
@@ -29,7 +28,6 @@ export function useBrokerLogDirs(clusterName: ClusterName, brokerId: number) {
       api.getAllBrokersLogdirs({
         clusterName,
         broker: [brokerId],
-      }),
-    { refetchInterval: 5000 }
+      })
   );
 }
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
index c4a4afe1e0e..3a0810782f5 100644
--- a/kafka-ui-react-app/vite.config.ts
+++ b/kafka-ui-react-app/vite.config.ts
@@ -7,6 +7,9 @@ export default defineConfig(({ mode }) => {
 
   const defaultConfig: UserConfigExport = {
     plugins: [react(), tsconfigPaths()],
+    server: {
+      port: 3000,
+    },
     build: {
       outDir: 'build',
       rollupOptions: {
@@ -38,6 +41,7 @@ export default defineConfig(({ mode }) => {
     return {
       ...defaultConfig,
       server: {
+        ...defaultConfig.server,
         open: true,
         proxy: {
           '/api': {

From dfe12807e274c7ed0a462ab5eeb9cad1ddc64439 Mon Sep 17 00:00:00 2001
From: Boris Djurdjevic <boris@djurdjevic.ch>
Date: Tue, 19 Jul 2022 12:43:41 +0200
Subject: [PATCH 079/734] Fix typos in readme (#2296)

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 494909e6730..d3efd90c543 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ kafka:
 * `schemaRegistryAuth.username`: schemaRegistry's basic authentication username
 * `schemaRegistryAuth.password`: schemaRegistry's basic authentication password
 * `schemaNameTemplate`: how keys are saved to schemaRegistry
-* `jmxPort`: open jmxPosrts of a broker
+* `jmxPort`: open JMX port of a broker
 * `readOnly`: enable read only mode
 
 Configure as many clusters as you need by adding their configs below separated with `-`.
@@ -170,7 +170,7 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME`   	|SchemaRegistry's basic authentication username
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_PASSWORD`   	|SchemaRegistry's basic authentication password
 |`KAFKA_CLUSTERS_0_SCHEMANAMETEMPLATE` |How keys are saved to schemaRegistry
-|`KAFKA_CLUSTERS_0_JMXPORT`        	|Open jmxPosrts of a broker
+|`KAFKA_CLUSTERS_0_JMXPORT`        	|Open JMX port of a broker
 |`KAFKA_CLUSTERS_0_READONLY`        	|Enable read-only mode. Default: false
 |`KAFKA_CLUSTERS_0_DISABLELOGDIRSCOLLECTION`        	|Disable collecting segments information. It should be true for confluent cloud. Default: false
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME` |Given name for the Kafka Connect cluster

From 96b00785b5f744ba0378b9d94ec8fc78eda2e2f8 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Tue, 19 Jul 2022 16:18:28 +0300
Subject: [PATCH 080/734] Upgrade redux (#2299)

* got rid of redux-thunk

* Bump redux

* Bump ace. Got rid of node-fetch

* Fix vite config
---
 kafka-ui-react-app/package.json               |  14 +-
 kafka-ui-react-app/pnpm-lock.yaml             | 133 ++-
 .../src/components/KsqlDb/List/List.tsx       |   6 +-
 .../src/components/KsqlDb/Query/Query.tsx     |   6 +-
 .../Topics/New/__test__/New.spec.tsx          |  61 +-
 .../Topics/New/__test__/fixtures.ts           |  36 -
 .../Topics/Topic/Details/Details.tsx          |   5 +-
 .../Topic/Details/Messages/MessagesTable.tsx  |   6 +-
 .../src/lib/fixtures/kafkaConnect.ts          |   2 +-
 kafka-ui-react-app/src/lib/testHelpers.tsx    |   5 -
 .../reducers/topics/__test__/reducer.spec.ts  | 945 ------------------
 .../store/configureStore/mockStoreCreator.ts  |  12 -
 kafka-ui-react-app/vite.config.ts             |   5 +-
 13 files changed, 97 insertions(+), 1139 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/Topics/New/__test__/fixtures.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/store/configureStore/mockStoreCreator.ts

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 407c7c1f49a..defe27f5c68 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -10,13 +10,13 @@
     "@fortawesome/fontawesome-free": "^6.1.1",
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
-    "@reduxjs/toolkit": "^1.8.2",
+    "@reduxjs/toolkit": "^1.8.3",
     "@rooks/use-outside-click-ref": "^4.10.1",
     "@testing-library/react": "^13.2.0",
     "@types/testing-library__jest-dom": "^5.14.5",
     "@types/yup": "^0.29.13",
     "@vitejs/plugin-react": "^2.0.0",
-    "ace-builds": "^1.4.12",
+    "ace-builds": "^1.7.1",
     "ajv": "^8.6.3",
     "babel-jest": "^28.1.1",
     "bulma": "^0.9.3",
@@ -27,7 +27,6 @@
     "jest-watch-typeahead": "^2.0.0",
     "json-schema-faker": "^0.5.0-rcv.39",
     "lodash": "^4.17.21",
-    "node-fetch": "^2.6.1",
     "pretty-ms": "7.0.1",
     "react": "^18.1.0",
     "react-ace": "^10.1.0",
@@ -37,10 +36,9 @@
     "react-is": "^18.2.0",
     "react-multi-select-component": "^4.0.6",
     "react-query": "^3.39.1",
-    "react-redux": "^7.2.6",
+    "react-redux": "^8.0.2",
     "react-router-dom": "^6.3.0",
-    "redux": "^4.1.1",
-    "redux-thunk": "^2.3.0",
+    "redux": "^4.2.0",
     "sass": "^1.52.3",
     "styled-components": "^5.3.1",
     "use-debounce": "^8.0.1",
@@ -59,6 +57,7 @@
     "start": "vite",
     "gen:sources": "rimraf src/generated-sources && openapi-generator-cli generate",
     "build": "vite build",
+    "preview": "vite preview",
     "lint": "eslint --ext .tsx,.ts src/",
     "lint:fix": "eslint --ext .tsx,.ts src/ --fix",
     "lint:CI": "eslint --ext .tsx,.ts src/ --max-warnings=0",
@@ -89,9 +88,7 @@
     "@types/react": "^18.0.9",
     "@types/react-datepicker": "^4.4.2",
     "@types/react-dom": "^18.0.3",
-    "@types/react-redux": "^7.1.18",
     "@types/react-router-dom": "^5.3.3",
-    "@types/redux-mock-store": "^1.0.3",
     "@types/styled-components": "^5.1.13",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "@typescript-eslint/parser": "^5.29.0",
@@ -116,7 +113,6 @@
     "jest-styled-components": "^7.0.8",
     "lint-staged": "^13.0.2",
     "prettier": "^2.3.1",
-    "redux-mock-store": "^1.5.4",
     "rimraf": "^3.0.2",
     "ts-jest": "^28.0.5",
     "ts-node": "^10.8.1",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index ba5acbcee82..014f2caf68b 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -12,7 +12,7 @@ specifiers:
   '@hookform/resolvers': ^2.7.1
   '@jest/types': ^28.1.1
   '@openapitools/openapi-generator-cli': ^2.5.1
-  '@reduxjs/toolkit': ^1.8.2
+  '@reduxjs/toolkit': ^1.8.3
   '@rooks/use-outside-click-ref': ^4.10.1
   '@testing-library/dom': ^8.11.1
   '@testing-library/jest-dom': ^5.16.4
@@ -25,16 +25,14 @@ specifiers:
   '@types/react': ^18.0.9
   '@types/react-datepicker': ^4.4.2
   '@types/react-dom': ^18.0.3
-  '@types/react-redux': ^7.1.18
   '@types/react-router-dom': ^5.3.3
-  '@types/redux-mock-store': ^1.0.3
   '@types/styled-components': ^5.1.13
   '@types/testing-library__jest-dom': ^5.14.5
   '@types/yup': ^0.29.13
   '@typescript-eslint/eslint-plugin': ^5.29.0
   '@typescript-eslint/parser': ^5.29.0
   '@vitejs/plugin-react': ^2.0.0
-  ace-builds: ^1.4.12
+  ace-builds: ^1.7.1
   ajv: ^8.6.3
   babel-jest: ^28.1.1
   bulma: ^0.9.3
@@ -65,7 +63,6 @@ specifiers:
   json-schema-faker: ^0.5.0-rcv.39
   lint-staged: ^13.0.2
   lodash: ^4.17.21
-  node-fetch: ^2.6.1
   prettier: ^2.3.1
   pretty-ms: 7.0.1
   react: ^18.1.0
@@ -76,11 +73,9 @@ specifiers:
   react-is: ^18.2.0
   react-multi-select-component: ^4.0.6
   react-query: ^3.39.1
-  react-redux: ^7.2.6
+  react-redux: ^8.0.2
   react-router-dom: ^6.3.0
-  redux: ^4.1.1
-  redux-mock-store: ^1.5.4
-  redux-thunk: ^2.3.0
+  redux: ^4.2.0
   rimraf: ^3.0.2
   sass: ^1.52.3
   styled-components: ^5.3.1
@@ -101,24 +96,23 @@ dependencies:
   '@fortawesome/fontawesome-free': 6.1.1
   '@hookform/error-message': 2.0.0_l2dcsysovzdujulgxvsen7vbsm
   '@hookform/resolvers': 2.8.9_react-hook-form@7.6.9
-  '@reduxjs/toolkit': 1.8.2_ydj23m2apjohmawqetv7uxfa2i
+  '@reduxjs/toolkit': 1.8.3_ctm756ikdwcjcvyfxxwskzbr6q
   '@rooks/use-outside-click-ref': 4.11.2_react@18.1.0
   '@testing-library/react': 13.2.0_ef5jwxihqo6n7gxfmzogljlgcm
   '@types/testing-library__jest-dom': 5.14.5
   '@types/yup': 0.29.13
   '@vitejs/plugin-react': 2.0.0_vite@3.0.2
-  ace-builds: 1.4.13
+  ace-builds: 1.7.1
   ajv: 8.8.2
   babel-jest: 28.1.1_@babel+core@7.18.2
   bulma: 0.9.3
   classnames: 2.3.1
   dayjs: 1.11.3
-  fetch-mock: 9.11.0_node-fetch@2.6.7
+  fetch-mock: 9.11.0
   jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
   jest-watch-typeahead: 2.0.0_jest@28.1.1
   json-schema-faker: 0.5.0-rcv.40
   lodash: 4.17.21
-  node-fetch: 2.6.7
   pretty-ms: 7.0.1
   react: 18.1.0
   react-ace: 10.1.0_ef5jwxihqo6n7gxfmzogljlgcm
@@ -128,10 +122,9 @@ dependencies:
   react-is: 18.2.0
   react-multi-select-component: 4.0.6_react@18.1.0
   react-query: 3.39.1_ef5jwxihqo6n7gxfmzogljlgcm
-  react-redux: 7.2.6_ef5jwxihqo6n7gxfmzogljlgcm
+  react-redux: 8.0.2_nfqigfgwurfoimtkde74cji6ga
   react-router-dom: 6.3.0_ef5jwxihqo6n7gxfmzogljlgcm
-  redux: 4.1.2
-  redux-thunk: 2.4.1_redux@4.1.2
+  redux: 4.2.0
   sass: 1.52.3
   styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
   use-debounce: 8.0.1_react@18.1.0
@@ -156,9 +149,7 @@ devDependencies:
   '@types/react': 18.0.9
   '@types/react-datepicker': 4.4.2_react@18.1.0
   '@types/react-dom': 18.0.5
-  '@types/react-redux': 7.1.24
   '@types/react-router-dom': 5.3.3
-  '@types/redux-mock-store': 1.0.3
   '@types/styled-components': 5.1.18
   '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
   '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
@@ -176,14 +167,13 @@ devDependencies:
   eslint-plugin-prettier: 4.0.0_q7a4ir2sdihdzpzdlnbgmzjlpq
   eslint-plugin-react: 7.29.4_eslint@8.16.0
   eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
-  fetch-mock-jest: 1.5.1_node-fetch@2.6.7
+  fetch-mock-jest: 1.5.1
   husky: 8.0.1
   jest-environment-jsdom: 28.1.1
   jest-sonar-reporter: 2.0.0
   jest-styled-components: 7.0.8_styled-components@5.3.1
   lint-staged: 13.0.2
   prettier: 2.5.1
-  redux-mock-store: 1.5.4
   rimraf: 3.0.2
   ts-jest: 28.0.5_c4h4g76dcvkfgjwf6rprlfxfli
   ts-node: 10.8.1_t4lrjbt3sxauai4t5o275zsepa
@@ -2343,11 +2333,11 @@ packages:
   /@popperjs/core/2.9.2:
     resolution: {integrity: sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==}
 
-  /@reduxjs/toolkit/1.8.2_ydj23m2apjohmawqetv7uxfa2i:
-    resolution: {integrity: sha512-CtPw5TkN1pHRigMFCOS/0qg3b/yfPV5qGCsltVnIz7bx4PKTJlGHYfIxm97qskLknMzuGfjExaYdXJ77QTL0vg==}
+  /@reduxjs/toolkit/1.8.3_ctm756ikdwcjcvyfxxwskzbr6q:
+    resolution: {integrity: sha512-lU/LDIfORmjBbyDLaqFN2JB9YmAT1BElET9y0ZszwhSBa5Ef3t6o5CrHupw5J1iOXwd+o92QfQZ8OJpwXvsssg==}
     peerDependencies:
       react: ^16.9.0 || ^17.0.0 || ^18
-      react-redux: ^7.2.1 || ^8.0.0-beta
+      react-redux: ^7.2.1 || ^8.0.2
     peerDependenciesMeta:
       react:
         optional: true
@@ -2356,9 +2346,9 @@ packages:
     dependencies:
       immer: 9.0.12
       react: 18.1.0
-      react-redux: 7.2.6_ef5jwxihqo6n7gxfmzogljlgcm
-      redux: 4.1.2
-      redux-thunk: 2.4.1_redux@4.1.2
+      react-redux: 8.0.2_nfqigfgwurfoimtkde74cji6ga
+      redux: 4.2.0
+      redux-thunk: 2.4.1_redux@4.2.0
       reselect: 4.1.5
     dev: false
 
@@ -2583,14 +2573,6 @@ packages:
     dependencies:
       '@types/react': 18.0.9
 
-  /@types/react-redux/7.1.24:
-    resolution: {integrity: sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==}
-    dependencies:
-      '@types/hoist-non-react-statics': 3.3.1
-      '@types/react': 18.0.9
-      hoist-non-react-statics: 3.3.2
-      redux: 4.1.2
-
   /@types/react-router-dom/5.3.3:
     resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==}
     dependencies:
@@ -2613,12 +2595,6 @@ packages:
       '@types/scheduler': 0.16.2
       csstype: 3.0.8
 
-  /@types/redux-mock-store/1.0.3:
-    resolution: {integrity: sha512-Wqe3tJa6x9MxMN4DJnMfZoBRBRak1XTPklqj4qkVm5VBpZnC8PSADf4kLuFQ9NAdHaowfWoEeUMz7NWc2GMtnA==}
-    dependencies:
-      redux: 4.1.2
-    dev: true
-
   /@types/scheduler/0.16.2:
     resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
 
@@ -2642,6 +2618,10 @@ packages:
     resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
     dev: true
 
+  /@types/use-sync-external-store/0.0.3:
+    resolution: {integrity: sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==}
+    dev: false
+
   /@types/yargs-parser/20.2.0:
     resolution: {integrity: sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==}
 
@@ -2875,10 +2855,6 @@ packages:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
     dev: true
 
-  /ace-builds/1.4.13:
-    resolution: {integrity: sha512-SOLzdaQkY6ecPKYRDDg+MY1WoGgXA34cIvYJNNoBMGGUswHmlauU2Hy0UL96vW0Fs/LgFbMUjD+6vqzWTldIYQ==}
-    dev: false
-
   /ace-builds/1.7.1:
     resolution: {integrity: sha512-1mcbP5kXvr729sJ9dA/8tul0pjuvKbma0LF/ZMRwPEwjoNWNpe/x0OXpaPJo36aRpZCjRZMl5zsME3hAKTiaNw==}
     dev: false
@@ -4730,7 +4706,7 @@ packages:
     dependencies:
       bser: 2.1.1
 
-  /fetch-mock-jest/1.5.1_node-fetch@2.6.7:
+  /fetch-mock-jest/1.5.1:
     resolution: {integrity: sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
@@ -4739,13 +4715,12 @@ packages:
       node-fetch:
         optional: true
     dependencies:
-      fetch-mock: 9.11.0_node-fetch@2.6.7
-      node-fetch: 2.6.7
+      fetch-mock: 9.11.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /fetch-mock/9.11.0_node-fetch@2.6.7:
+  /fetch-mock/9.11.0:
     resolution: {integrity: sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==}
     engines: {node: '>=4.0.0'}
     peerDependencies:
@@ -4761,7 +4736,6 @@ packages:
       glob-to-regexp: 0.4.1
       is-subset: 0.1.1
       lodash.isequal: 4.5.0
-      node-fetch: 2.6.7
       path-to-regexp: 2.4.0
       querystring: 0.2.1
       whatwg-url: 6.5.0
@@ -6063,10 +6037,6 @@ packages:
   /lodash.isequal/4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
 
-  /lodash.isplainobject/4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-    dev: true
-
   /lodash.memoize/4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
     dev: true
@@ -6246,6 +6216,7 @@ packages:
         optional: true
     dependencies:
       whatwg-url: 5.0.0
+    dev: true
 
   /node-int64/0.4.0:
     resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
@@ -6750,26 +6721,38 @@ packages:
       react-dom: 18.1.0_react@18.1.0
     dev: false
 
-  /react-redux/7.2.6_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==}
+  /react-redux/8.0.2_nfqigfgwurfoimtkde74cji6ga:
+    resolution: {integrity: sha512-nBwiscMw3NoP59NFCXFf02f8xdo+vSHT/uZ1ldDwF7XaTpzm+Phk97VT4urYBl5TYAPNVaFm12UHAEyzkpNzRA==}
     peerDependencies:
-      react: ^16.8.3 || ^17
-      react-dom: '*'
-      react-native: '*'
+      '@types/react': ^16.8 || ^17.0 || ^18.0
+      '@types/react-dom': ^16.8 || ^17.0 || ^18.0
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+      react-native: '>=0.59'
+      redux: ^4
     peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
       react-dom:
         optional: true
       react-native:
         optional: true
+      redux:
+        optional: true
     dependencies:
       '@babel/runtime': 7.17.9
-      '@types/react-redux': 7.1.24
+      '@types/hoist-non-react-statics': 3.3.1
+      '@types/react': 18.0.9
+      '@types/react-dom': 18.0.5
+      '@types/use-sync-external-store': 0.0.3
       hoist-non-react-statics: 3.3.2
-      loose-envify: 1.4.0
-      prop-types: 15.8.1
       react: 18.1.0
       react-dom: 18.1.0_react@18.1.0
-      react-is: 17.0.2
+      react-is: 18.2.0
+      redux: 4.2.0
+      use-sync-external-store: 1.2.0_react@18.1.0
     dev: false
 
   /react-refresh/0.14.0:
@@ -6837,24 +6820,19 @@ packages:
       strip-indent: 3.0.0
     dev: true
 
-  /redux-mock-store/1.5.4:
-    resolution: {integrity: sha512-xmcA0O/tjCLXhh9Fuiq6pMrJCwFRaouA8436zcikdIpYWWCjU76CRk+i2bHx8EeiSiMGnB85/lZdU3wIJVXHTA==}
-    dependencies:
-      lodash.isplainobject: 4.0.6
-    dev: true
-
-  /redux-thunk/2.4.1_redux@4.1.2:
+  /redux-thunk/2.4.1_redux@4.2.0:
     resolution: {integrity: sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==}
     peerDependencies:
       redux: ^4
     dependencies:
-      redux: 4.1.2
+      redux: 4.2.0
     dev: false
 
-  /redux/4.1.2:
-    resolution: {integrity: sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==}
+  /redux/4.2.0:
+    resolution: {integrity: sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==}
     dependencies:
       '@babel/runtime': 7.17.9
+    dev: false
 
   /reflect-metadata/0.1.13:
     resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==}
@@ -7439,6 +7417,7 @@ packages:
 
   /tr46/0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+    dev: true
 
   /tr46/1.0.1:
     resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
@@ -7685,6 +7664,14 @@ packages:
       react: 18.1.0
     dev: false
 
+  /use-sync-external-store/1.2.0_react@18.1.0:
+    resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      react: 18.1.0
+    dev: false
+
   /util-deprecate/1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: true
@@ -7782,6 +7769,7 @@ packages:
 
   /webidl-conversions/3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+    dev: true
 
   /webidl-conversions/4.0.2:
     resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
@@ -7828,6 +7816,7 @@ packages:
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
+    dev: true
 
   /whatwg-url/6.5.0:
     resolution: {integrity: sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==}
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
index 7c9ab90a96c..f911d2807f3 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
@@ -1,7 +1,6 @@
 import React, { FC } from 'react';
 import useAppParams from 'lib/hooks/useAppParams';
 import * as Metrics from 'components/common/Metrics';
-import { useSelector, useDispatch } from 'react-redux';
 import { getKsqlDbTables } from 'redux/reducers/ksqlDb/selectors';
 import {
   clusterKsqlDbQueryRelativePath,
@@ -16,15 +15,16 @@ import { Button } from 'components/common/Button/Button';
 import Navbar from 'components/common/Navigation/Navbar.styled';
 import { NavLink, Route, Routes, Navigate } from 'react-router-dom';
 import { fetchKsqlDbTables } from 'redux/reducers/ksqlDb/ksqlDbSlice';
+import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 
 import KsqlDbItem, { KsqlDbItemType } from './KsqlDbItem/KsqlDbItem';
 
 const List: FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
 
   const { rows, fetching, tablesCount, streamsCount } =
-    useSelector(getKsqlDbTables);
+    useAppSelector(getKsqlDbTables);
 
   React.useEffect(() => {
     dispatch(fetchKsqlDbTables(clusterName));
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
index c5757e2cae6..6dfee760000 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
@@ -5,13 +5,13 @@ import {
   executeKsql,
   resetExecutionResult,
 } from 'redux/reducers/ksqlDb/ksqlDbSlice';
-import { useDispatch, useSelector } from 'react-redux';
 import { getKsqlExecution } from 'redux/reducers/ksqlDb/selectors';
 import { BASE_PARAMS } from 'lib/constants';
 import { KsqlResponse, KsqlTableResponse } from 'generated-sources';
 import { alertAdded, alertDissmissed } from 'redux/reducers/alerts/alertsSlice';
 import now from 'lodash/now';
 import { ClusterNameRoute } from 'lib/paths';
+import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 
 import type { FormValues } from './QueryForm/QueryForm';
 import * as S from './Query.styled';
@@ -69,9 +69,9 @@ const Query: FC = () => {
     isOpen: false,
   });
   const [fetching, setFetching] = useState(false);
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
 
-  const { executionResult } = useSelector(getKsqlExecution);
+  const { executionResult } = useAppSelector(getKsqlExecution);
   const [KSQLTable, setKSQLTable] = useState<KsqlTableResponse | null>(null);
 
   const reset = useCallback(() => {
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index e03a2cfa0b1..0f76b0e9781 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -1,9 +1,6 @@
 import React from 'react';
 import New from 'components/Topics/New/New';
 import { Route, Routes } from 'react-router-dom';
-import configureStore from 'redux-mock-store';
-import { RootState } from 'redux/interfaces';
-import * as redux from 'react-redux';
 import { act, screen, waitFor } from '@testing-library/react';
 import {
   clusterTopicCopyPath,
@@ -12,44 +9,26 @@ import {
 } from 'lib/paths';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
-
-const { Provider } = redux;
-
-const mockStore = configureStore();
+import { useAppDispatch } from 'lib/hooks/redux';
 
 const clusterName = 'local';
 const topicName = 'test-topic';
 
-const initialState: Partial<RootState> = {};
-const storeMock = mockStore(initialState);
-
 const mockNavigate = jest.fn();
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useNavigate: () => mockNavigate,
 }));
+jest.mock('lib/hooks/redux', () => ({
+  ...jest.requireActual('lib/hooks/redux'),
+  useAppDispatch: jest.fn(),
+}));
 
-const renderComponent = (path: string, store = storeMock) => {
+const renderComponent = (path: string) => {
   render(
     <Routes>
-      <Route
-        path={clusterTopicNewPath()}
-        element={
-          <Provider store={store}>
-            <New />
-          </Provider>
-        }
-      />
-
-      <Route
-        path={clusterTopicCopyPath()}
-        element={
-          <Provider store={store}>
-            <New />
-          </Provider>
-        }
-      />
-
+      <Route path={clusterTopicNewPath()} element={<New />} />
+      <Route path={clusterTopicCopyPath()} element={<New />} />
       <Route path={clusterTopicPath()} element="New topic path" />
     </Routes>,
     { initialEntries: [path] }
@@ -93,34 +72,29 @@ describe('New', () => {
   });
 
   it('submits valid form', async () => {
-    const useDispatchSpy = jest.spyOn(redux, 'useDispatch');
     const useDispatchMock = jest.fn(() => ({
       meta: { requestStatus: 'fulfilled' },
-    })) as jest.Mock;
-    useDispatchSpy.mockReturnValue(useDispatchMock);
+    }));
+    (useAppDispatch as jest.Mock).mockImplementation(() => useDispatchMock);
 
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-
     await act(() => {
       userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
     });
-
     await act(() => {
       userEvent.click(screen.getByText('Create topic'));
     });
-
-    await waitFor(() => expect(mockNavigate).toBeCalledTimes(1));
-    expect(mockNavigate).toHaveBeenLastCalledWith(`../${topicName}`);
-    expect(useDispatchMock).toHaveBeenCalledTimes(1);
+    await waitFor(() => expect(useDispatchMock).toHaveBeenCalledTimes(1));
+    await waitFor(() =>
+      expect(mockNavigate).toHaveBeenLastCalledWith(`../${topicName}`)
+    );
   });
 
   it('does not redirect page when request is not fulfilled', async () => {
-    const useDispatchSpy = jest.spyOn(redux, 'useDispatch');
     const useDispatchMock = jest.fn(() => ({
       meta: { requestStatus: 'pending' },
-    })) as jest.Mock;
-
-    useDispatchSpy.mockReturnValue(useDispatchMock);
+    }));
+    (useAppDispatch as jest.Mock).mockImplementation(() => useDispatchMock);
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
     await act(() =>
       userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName)
@@ -130,9 +104,8 @@ describe('New', () => {
   });
 
   it('submits valid form that result in an error', async () => {
-    const useDispatchSpy = jest.spyOn(redux, 'useDispatch');
     const useDispatchMock = jest.fn();
-    useDispatchSpy.mockReturnValue(useDispatchMock);
+    (useAppDispatch as jest.Mock).mockImplementation(() => useDispatchMock);
 
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
     await act(() => {
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Topics/New/__test__/fixtures.ts
deleted file mode 100644
index a78c9ccb8e6..00000000000
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/fixtures.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { CleanUpPolicy, Topic } from 'generated-sources';
-
-export const createTopicPayload: Record<string, unknown> = {
-  name: 'test-topic',
-  partitions: 1,
-  replicationFactor: 1,
-  configs: {
-    'cleanup.policy': 'delete',
-    'retention.ms': '604800000',
-    'retention.bytes': '-1',
-    'max.message.bytes': '1000012',
-    'min.insync.replicas': '1',
-  },
-};
-
-export const createTopicResponsePayload: Topic = {
-  name: 'local',
-  internal: false,
-  partitionCount: 1,
-  replicationFactor: 1,
-  replicas: 1,
-  inSyncReplicas: 1,
-  segmentSize: 0,
-  segmentCount: 0,
-  underReplicatedPartitions: 0,
-  cleanUpPolicy: CleanUpPolicy.DELETE,
-  partitions: [
-    {
-      partition: 0,
-      leader: 1,
-      replicas: [{ broker: 1, leader: false, inSync: true }],
-      offsetMax: 0,
-      offsetMin: 0,
-    },
-  ],
-};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
index 177d258d922..d7712df78b3 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
@@ -11,7 +11,6 @@ import {
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
-import { useDispatch } from 'react-redux';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { Button } from 'components/common/Button/Button';
 import Dropdown from 'components/common/Dropdown/Dropdown';
@@ -20,7 +19,7 @@ import DropdownItem from 'components/common/Dropdown/DropdownItem';
 import styled from 'styled-components';
 import Navbar from 'components/common/Navigation/Navbar.styled';
 import * as S from 'components/Topics/Topic/Details/Details.styled';
-import { useAppSelector } from 'lib/hooks/redux';
+import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import {
   getIsTopicDeletePolicy,
   getIsTopicInternal,
@@ -72,7 +71,7 @@ const Details: React.FC<Props> = ({
   );
 
   const navigate = useNavigate();
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
   const { isReadOnly, isTopicDeletionAllowed } =
     React.useContext(ClusterContext);
   const [isDeleteTopicConfirmationVisible, setDeleteTopicConfirmationVisible] =
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx
index 83192b3f908..4696b75e036 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx
@@ -3,20 +3,20 @@ import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { TopicMessage } from 'generated-sources';
 import React, { useContext } from 'react';
-import { useSelector } from 'react-redux';
 import {
   getTopicMessges,
   getIsTopicMessagesFetching,
 } from 'redux/reducers/topicMessages/selectors';
 import TopicMessagesContext from 'components/contexts/TopicMessagesContext';
+import { useAppSelector } from 'lib/hooks/redux';
 
 import Message from './Message';
 
 const MessagesTable: React.FC = () => {
   const { isLive } = useContext(TopicMessagesContext);
 
-  const messages = useSelector(getTopicMessges);
-  const isFetching = useSelector(getIsTopicMessagesFetching);
+  const messages = useAppSelector(getTopicMessges);
+  const isFetching = useAppSelector(getIsTopicMessagesFetching);
 
   return (
     <Table isFullwidth>
diff --git a/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts b/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts
index 91563a7dcec..f885ea405df 100644
--- a/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts
@@ -104,7 +104,7 @@ export const tasks: Task[] = [
   {
     id: { connector: 'first', task: 4 },
     status: {
-      id: 3,
+      id: 4,
       state: ConnectorTaskStatus.PAUSED,
       workerId: 'kafka-connect0:8083',
     },
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index e9d546bf370..14db7e87395 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -13,7 +13,6 @@ import { AnyAction, Store } from 'redux';
 import { RootState } from 'redux/interfaces';
 import { configureStore } from '@reduxjs/toolkit';
 import rootReducer from 'redux/reducers';
-import mockStoreCreator from 'redux/store/configureStore/mockStoreCreator';
 import { QueryClient, QueryClientProvider, UseQueryResult } from 'react-query';
 
 interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
@@ -100,7 +99,3 @@ export class EventSourceMock {
     this.close = jest.fn();
   }
 }
-
-export const getTypeAndPayload = (store: typeof mockStoreCreator) => {
-  return store.getActions().map(({ type, payload }) => ({ type, payload }));
-};
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
deleted file mode 100644
index b1bcae7ebc4..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts
+++ /dev/null
@@ -1,945 +0,0 @@
-import {
-  MessageSchemaSourceEnum,
-  SortOrder,
-  TopicColumnsToSort,
-  ConfigSource,
-} from 'generated-sources';
-import reducer, {
-  clearTopicsMessages,
-  setTopicsSearch,
-  setTopicsOrderBy,
-  fetchTopicConsumerGroups,
-  fetchTopicMessageSchema,
-  recreateTopic,
-  createTopic,
-  deleteTopic,
-  fetchTopicsList,
-  fetchTopicDetails,
-  fetchTopicConfig,
-  updateTopic,
-  updateTopicPartitionsCount,
-  updateTopicReplicationFactor,
-  deleteTopics,
-} from 'redux/reducers/topics/topicsSlice';
-import {
-  createTopicPayload,
-  createTopicResponsePayload,
-} from 'components/Topics/New/__test__/fixtures';
-import { consumerGroupPayload } from 'redux/reducers/consumerGroups/__test__/fixtures';
-import fetchMock from 'fetch-mock-jest';
-import mockStoreCreator from 'redux/store/configureStore/mockStoreCreator';
-import { getTypeAndPayload } from 'lib/testHelpers';
-import {
-  alertAdded,
-  showSuccessAlert,
-} from 'redux/reducers/alerts/alertsSlice';
-
-const topic = {
-  name: 'topic',
-};
-
-const messageSchema = {
-  key: {
-    name: 'key',
-    source: MessageSchemaSourceEnum.SCHEMA_REGISTRY,
-    schema: `{
-"$schema": "http://json-schema.org/draft-07/schema#",
-"$id": "http://example.com/myURI.schema.json",
-"title": "TestRecord",
-"type": "object",
-"additionalProperties": false,
-"properties": {
-  "f1": {
-    "type": "integer"
-  },
-  "f2": {
-    "type": "string"
-  },
-  "schema": {
-    "type": "string"
-  }
-}
-}
-`,
-  },
-  value: {
-    name: 'value',
-    source: MessageSchemaSourceEnum.SCHEMA_REGISTRY,
-    schema: `{
-"$schema": "http://json-schema.org/draft-07/schema#",
-"$id": "http://example.com/myURI1.schema.json",
-"title": "TestRecord",
-"type": "object",
-"additionalProperties": false,
-"properties": {
-  "f1": {
-    "type": "integer"
-  },
-  "f2": {
-    "type": "string"
-  },
-  "schema": {
-    "type": "string"
-  }
-}
-}
-`,
-  },
-};
-
-const config = [
-  {
-    name: 'compression.type',
-    value: 'producer',
-    defaultValue: 'producer',
-    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'compression.type',
-        value: 'producer',
-        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-      },
-      {
-        name: 'compression.type',
-        value: 'producer',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-];
-const details = {
-  name: 'local',
-  internal: false,
-  partitionCount: 1,
-  replicationFactor: 1,
-  replicas: 1,
-  inSyncReplicas: 1,
-  segmentSize: 0,
-  segmentCount: 0,
-  cleanUpPolicy: 'DELETE',
-  partitions: [
-    {
-      partition: 0,
-      leader: 1,
-      replicas: [{ broker: 1, leader: false, inSync: true }],
-      offsetMax: 0,
-      offsetMin: 0,
-    },
-  ],
-  bytesInPerSec: 0.1,
-  bytesOutPerSec: 0.1,
-};
-
-let state = {
-  byName: {
-    [topic.name]: topic,
-  },
-  allNames: [topic.name],
-  messages: [],
-  totalPages: 1,
-  search: '',
-  orderBy: null,
-  sortOrder: SortOrder.ASC,
-  consumerGroups: [],
-};
-const clusterName = 'local';
-
-describe('topics Slice', () => {
-  describe('topics reducer', () => {
-    describe('fetch topic details', () => {
-      it('fetchTopicDetails/fulfilled', () => {
-        expect(
-          reducer(state, {
-            type: fetchTopicDetails.fulfilled,
-            payload: {
-              clusterName,
-              topicName: topic.name,
-              topicDetails: details,
-            },
-          })
-        ).toEqual({
-          ...state,
-          byName: {
-            [topic.name]: {
-              ...topic,
-              ...details,
-            },
-          },
-          allNames: [topic.name],
-        });
-      });
-    });
-    describe('fetch topics', () => {
-      it('fetchTopicsList/fulfilled', () => {
-        expect(
-          reducer(state, {
-            type: fetchTopicsList.fulfilled,
-            payload: { clusterName, topicName: topic.name },
-          })
-        ).toEqual({
-          ...state,
-          byName: { topic },
-          allNames: [topic.name],
-        });
-      });
-    });
-    describe('fetch topic config', () => {
-      it('fetchTopicConfig/fulfilled', () => {
-        expect(
-          reducer(state, {
-            type: fetchTopicConfig.fulfilled,
-            payload: {
-              clusterName,
-              topicName: topic.name,
-              topicConfig: config,
-            },
-          })
-        ).toEqual({
-          ...state,
-          byName: {
-            [topic.name]: {
-              ...topic,
-              config: config.map((conf) => ({ ...conf })),
-            },
-          },
-          allNames: [topic.name],
-        });
-      });
-    });
-    describe('update topic', () => {
-      it('updateTopic/fulfilled', () => {
-        const updatedTopic = {
-          name: 'topic',
-          partitions: 1,
-        };
-        expect(
-          reducer(state, {
-            type: updateTopic.fulfilled,
-            payload: {
-              clusterName,
-              topicName: topic.name,
-              topic: updatedTopic,
-            },
-          })
-        ).toEqual({
-          ...state,
-          byName: {
-            [topic.name]: {
-              ...updatedTopic,
-            },
-          },
-        });
-      });
-    });
-    describe('delete topic', () => {
-      it('deleteTopic/fulfilled', () => {
-        expect(
-          reducer(state, {
-            type: deleteTopic.fulfilled,
-            payload: { clusterName, topicName: topic.name },
-          })
-        ).toEqual({
-          ...state,
-          byName: {},
-          allNames: [],
-        });
-      });
-
-      it('clearTopicsMessages/fulfilled', () => {
-        expect(
-          reducer(state, {
-            type: clearTopicsMessages.fulfilled,
-            payload: { clusterName, topicName: topic.name },
-          })
-        ).toEqual({
-          ...state,
-          messages: [],
-        });
-      });
-
-      it('recreateTopic/fulfilled', () => {
-        expect(
-          reducer(state, {
-            type: recreateTopic.fulfilled,
-            payload: { topic, topicName: topic.name },
-          })
-        ).toEqual({
-          ...state,
-          byName: {
-            [topic.name]: topic,
-          },
-        });
-      });
-    });
-
-    describe('create topics', () => {
-      it('createTopic/fulfilled', () => {
-        expect(
-          reducer(state, {
-            type: createTopic.fulfilled,
-            payload: { clusterName, data: createTopicPayload },
-          })
-        ).toEqual({
-          ...state,
-        });
-      });
-    });
-
-    describe('search topics', () => {
-      it('setTopicsSearch', () => {
-        expect(
-          reducer(state, {
-            type: setTopicsSearch,
-            payload: 'test',
-          })
-        ).toEqual({
-          ...state,
-          search: 'test',
-        });
-      });
-    });
-
-    describe('order topics', () => {
-      it('setTopicsOrderBy', () => {
-        expect(
-          reducer(state, {
-            type: setTopicsOrderBy,
-            payload: TopicColumnsToSort.NAME,
-          })
-        ).toEqual({
-          ...state,
-          orderBy: TopicColumnsToSort.NAME,
-        });
-      });
-    });
-
-    describe('topic consumer groups', () => {
-      it('fetchTopicConsumerGroups/fulfilled', () => {
-        expect(
-          reducer(state, {
-            type: fetchTopicConsumerGroups.fulfilled,
-            payload: {
-              clusterName,
-              topicName: topic.name,
-              consumerGroups: consumerGroupPayload,
-            },
-          })
-        ).toEqual({
-          ...state,
-          byName: {
-            [topic.name]: {
-              ...topic,
-              ...consumerGroupPayload,
-            },
-          },
-        });
-      });
-    });
-
-    describe('message sending', () => {
-      it('fetchTopicMessageSchema/fulfilled', () => {
-        state = {
-          byName: {
-            [topic.name]: topic,
-          },
-          allNames: [topic.name],
-          messages: [],
-          totalPages: 1,
-          search: '',
-          orderBy: null,
-          sortOrder: SortOrder.ASC,
-          consumerGroups: [],
-        };
-        expect(
-          reducer(state, {
-            type: fetchTopicMessageSchema.fulfilled,
-            payload: { topicName: topic.name, schema: messageSchema },
-          }).byName
-        ).toEqual({
-          [topic.name]: { ...topic, messageSchema },
-        });
-      });
-    });
-  });
-  describe('Thunks', () => {
-    const store = mockStoreCreator;
-    const topicName = topic.name;
-    const RealDate = Date.now;
-
-    beforeAll(() => {
-      global.Date.now = jest.fn(() =>
-        new Date('2019-04-07T10:20:30Z').getTime()
-      );
-    });
-    afterAll(() => {
-      global.Date.now = RealDate;
-    });
-    afterEach(() => {
-      fetchMock.restore();
-      store.clearActions();
-    });
-    describe('fetchTopicsList', () => {
-      const topicResponse = {
-        pageCount: 1,
-        topics: [createTopicResponsePayload],
-      };
-      it('fetchTopicsList/fulfilled', async () => {
-        fetchMock.getOnce(`/api/clusters/${clusterName}/topics`, topicResponse);
-        await store.dispatch(fetchTopicsList({ clusterName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: fetchTopicsList.pending.type },
-          {
-            type: fetchTopicsList.fulfilled.type,
-            payload: { ...topicResponse },
-          },
-        ]);
-      });
-      it('fetchTopicsList/rejected', async () => {
-        fetchMock.getOnce(`/api/clusters/${clusterName}/topics`, 404);
-        await store.dispatch(fetchTopicsList({ clusterName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: fetchTopicsList.pending.type },
-          {
-            type: fetchTopicsList.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('fetchTopicDetails', () => {
-      it('fetchTopicDetails/fulfilled', async () => {
-        fetchMock.getOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}`,
-          details
-        );
-        await store.dispatch(fetchTopicDetails({ clusterName, topicName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: fetchTopicDetails.pending.type },
-          {
-            type: fetchTopicDetails.fulfilled.type,
-            payload: { topicDetails: { ...details }, topicName },
-          },
-        ]);
-      });
-      it('fetchTopicDetails/rejected', async () => {
-        fetchMock.getOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}`,
-          404
-        );
-        await store.dispatch(fetchTopicDetails({ clusterName, topicName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: fetchTopicDetails.pending.type },
-          {
-            type: fetchTopicDetails.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics/${topicName}`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('fetchTopicConfig', () => {
-      it('fetchTopicConfig/fulfilled', async () => {
-        fetchMock.getOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}/config`,
-          config
-        );
-        await store.dispatch(fetchTopicConfig({ clusterName, topicName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: fetchTopicConfig.pending.type },
-          {
-            type: fetchTopicConfig.fulfilled.type,
-            payload: {
-              topicConfig: config,
-              topicName,
-            },
-          },
-        ]);
-      });
-      it('fetchTopicConfig/rejected', async () => {
-        fetchMock.getOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}/config`,
-          404
-        );
-        await store.dispatch(fetchTopicConfig({ clusterName, topicName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: fetchTopicConfig.pending.type },
-          {
-            type: fetchTopicConfig.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics/${topicName}/config`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('deleteTopic', () => {
-      it('deleteTopic/fulfilled', async () => {
-        fetchMock.deleteOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}`,
-          topicName
-        );
-        await store.dispatch(deleteTopic({ clusterName, topicName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: deleteTopic.pending.type },
-          { type: showSuccessAlert.pending.type },
-          {
-            type: alertAdded.type,
-            payload: {
-              id: 'message-topic-local',
-              title: '',
-              type: 'success',
-              createdAt: global.Date.now(),
-              message: 'Topic successfully deleted!',
-            },
-          },
-          { type: showSuccessAlert.fulfilled.type },
-          {
-            type: deleteTopic.fulfilled.type,
-            payload: { topicName },
-          },
-        ]);
-      });
-      it('deleteTopic/rejected', async () => {
-        fetchMock.deleteOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}`,
-          404
-        );
-        await store.dispatch(deleteTopic({ clusterName, topicName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: deleteTopic.pending.type },
-          {
-            type: deleteTopic.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics/${topicName}`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('deleteTopics', () => {
-      it('deleteTopics/fulfilled', async () => {
-        fetchMock.delete(`/api/clusters/${clusterName}/topics/${topicName}`, [
-          topicName,
-          'topic2',
-        ]);
-        await store.dispatch(
-          deleteTopics({ clusterName, topicNames: [topicName, 'topic2'] })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: deleteTopics.pending.type },
-          { type: deleteTopic.pending.type },
-          { type: deleteTopic.pending.type },
-          { type: fetchTopicsList.pending.type },
-          { type: deleteTopics.fulfilled.type },
-        ]);
-      });
-    });
-    describe('recreateTopic', () => {
-      const recreateResponse = {
-        cleanUpPolicy: 'DELETE',
-        inSyncReplicas: 1,
-        internal: false,
-        name: topicName,
-        partitionCount: 1,
-        partitions: undefined,
-        replicas: 1,
-        replicationFactor: 1,
-        segmentCount: 0,
-        segmentSize: 0,
-        underReplicatedPartitions: undefined,
-      };
-      it('recreateTopic/fulfilled', async () => {
-        fetchMock.postOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}`,
-          recreateResponse
-        );
-        await store.dispatch(recreateTopic({ clusterName, topicName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: recreateTopic.pending.type },
-          { type: showSuccessAlert.pending.type },
-          {
-            type: alertAdded.type,
-            payload: {
-              id: 'message-topic-local',
-              title: '',
-              type: 'success',
-              createdAt: global.Date.now(),
-              message: 'Topic successfully recreated!',
-            },
-          },
-          { type: showSuccessAlert.fulfilled.type },
-          {
-            type: recreateTopic.fulfilled.type,
-            payload: { [topicName]: { ...recreateResponse } },
-          },
-        ]);
-      });
-      it('recreateTopic/rejected', async () => {
-        fetchMock.postOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}`,
-          404
-        );
-        await store.dispatch(recreateTopic({ clusterName, topicName }));
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: recreateTopic.pending.type },
-          {
-            type: recreateTopic.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics/${topicName}`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('fetchTopicConsumerGroups', () => {
-      const consumerGroups = [
-        {
-          groupId: 'groupId1',
-          members: 0,
-          topics: 1,
-          simple: false,
-          partitionAssignor: '',
-          coordinator: {
-            id: 1,
-            port: undefined,
-            host: 'host',
-          },
-          messagesBehind: undefined,
-          state: undefined,
-        },
-        {
-          groupId: 'groupId2',
-          members: 0,
-          topics: 1,
-          simple: false,
-          partitionAssignor: '',
-          coordinator: {
-            id: 1,
-            port: undefined,
-            host: 'host',
-          },
-          messagesBehind: undefined,
-          state: undefined,
-        },
-      ];
-      it('fetchTopicConsumerGroups/fulfilled', async () => {
-        fetchMock.getOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}/consumer-groups`,
-          consumerGroups
-        );
-        await store.dispatch(
-          fetchTopicConsumerGroups({ clusterName, topicName })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: fetchTopicConsumerGroups.pending.type },
-          {
-            type: fetchTopicConsumerGroups.fulfilled.type,
-            payload: { consumerGroups, topicName },
-          },
-        ]);
-      });
-      it('fetchTopicConsumerGroups/rejected', async () => {
-        fetchMock.getOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}/consumer-groups`,
-          404
-        );
-        await store.dispatch(
-          fetchTopicConsumerGroups({ clusterName, topicName })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: fetchTopicConsumerGroups.pending.type },
-          {
-            type: fetchTopicConsumerGroups.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics/${topicName}/consumer-groups`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('updateTopicPartitionsCount', () => {
-      it('updateTopicPartitionsCount/fulfilled', async () => {
-        fetchMock.patchOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}/partitions`,
-          { message: 'success' }
-        );
-        await store.dispatch(
-          updateTopicPartitionsCount({
-            clusterName,
-            topicName,
-            partitions: 1,
-          })
-        );
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: updateTopicPartitionsCount.pending.type },
-          { type: showSuccessAlert.pending.type },
-          {
-            type: alertAdded.type,
-            payload: {
-              id: 'message-topic-local-1',
-              title: '',
-              type: 'success',
-              createdAt: global.Date.now(),
-              message: 'Number of partitions successfully increased!',
-            },
-          },
-          { type: fetchTopicDetails.pending.type },
-          { type: showSuccessAlert.fulfilled.type },
-          {
-            type: updateTopicPartitionsCount.fulfilled.type,
-          },
-        ]);
-      });
-      it('updateTopicPartitionsCount/rejected', async () => {
-        fetchMock.patchOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}/partitions`,
-          404
-        );
-        await store.dispatch(
-          updateTopicPartitionsCount({
-            clusterName,
-            topicName,
-            partitions: 1,
-          })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: updateTopicPartitionsCount.pending.type },
-          {
-            type: updateTopicPartitionsCount.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics/${topicName}/partitions`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('updateTopicReplicationFactor', () => {
-      it('updateTopicReplicationFactor/fulfilled', async () => {
-        fetchMock.patchOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}/replications`,
-          { message: 'success' }
-        );
-        await store.dispatch(
-          updateTopicReplicationFactor({
-            clusterName,
-            topicName,
-            replicationFactor: 1,
-          })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: updateTopicReplicationFactor.pending.type },
-          {
-            type: updateTopicReplicationFactor.fulfilled.type,
-          },
-        ]);
-      });
-      it('updateTopicReplicationFactor/rejected', async () => {
-        fetchMock.patchOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}/replications`,
-          404
-        );
-        await store.dispatch(
-          updateTopicReplicationFactor({
-            clusterName,
-            topicName,
-            replicationFactor: 1,
-          })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: updateTopicReplicationFactor.pending.type },
-          {
-            type: updateTopicReplicationFactor.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics/${topicName}/replications`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('createTopic', () => {
-      const newTopic = {
-        name: 'newTopic',
-        partitions: 0,
-        replicationFactor: 0,
-        minInSyncReplicas: 0,
-        cleanupPolicy: 'DELETE',
-        retentionMs: 1,
-        retentionBytes: 1,
-        maxMessageBytes: 1,
-        customParams: [
-          {
-            name: '',
-            value: '',
-          },
-        ],
-      };
-      it('createTopic/fulfilled', async () => {
-        fetchMock.postOnce(`/api/clusters/${clusterName}/topics`, {
-          message: 'success',
-        });
-        await store.dispatch(
-          createTopic({
-            clusterName,
-            data: newTopic,
-          })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: createTopic.pending.type },
-          {
-            type: createTopic.fulfilled.type,
-          },
-        ]);
-      });
-      it('createTopic/rejected', async () => {
-        fetchMock.postOnce(`/api/clusters/${clusterName}/topics`, 404);
-        await store.dispatch(
-          createTopic({
-            clusterName,
-            data: newTopic,
-          })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: createTopic.pending.type },
-          {
-            type: createTopic.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('updateTopic', () => {
-      const updateTopicResponse = {
-        name: topicName,
-        partitions: 0,
-        replicationFactor: 0,
-        minInSyncReplicas: 0,
-        cleanupPolicy: 'DELETE',
-        retentionMs: 0,
-        retentionBytes: 0,
-        maxMessageBytes: 0,
-        customParams: {
-          byIndex: {},
-          allIndexes: [],
-        },
-      };
-      it('updateTopic/fulfilled', async () => {
-        fetchMock.patchOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}`,
-          createTopicResponsePayload
-        );
-        await store.dispatch(
-          updateTopic({
-            clusterName,
-            topicName,
-            form: updateTopicResponse,
-          })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: updateTopic.pending.type },
-          {
-            type: updateTopic.fulfilled.type,
-            payload: { [topicName]: { ...createTopicResponsePayload } },
-          },
-        ]);
-      });
-      it('updateTopic/rejected', async () => {
-        fetchMock.patchOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}`,
-          404
-        );
-        await store.dispatch(
-          updateTopic({
-            clusterName,
-            topicName,
-            form: updateTopicResponse,
-          })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: updateTopic.pending.type },
-          {
-            type: updateTopic.rejected.type,
-            payload: {
-              status: 404,
-              statusText: 'Not Found',
-              url: `/api/clusters/${clusterName}/topics/${topicName}`,
-              message: undefined,
-            },
-          },
-        ]);
-      });
-    });
-    describe('clearTopicsMessages', () => {
-      it('clearTopicsMessages/fulfilled', async () => {
-        fetchMock.deleteOnce(
-          `/api/clusters/${clusterName}/topics/${topicName}/messages`,
-          [topicName, 'topic2']
-        );
-        await store.dispatch(
-          clearTopicsMessages({
-            clusterName,
-            topicNames: [topicName, 'topic2'],
-          })
-        );
-
-        expect(getTypeAndPayload(store)).toEqual([
-          { type: clearTopicsMessages.pending.type },
-          { type: clearTopicsMessages.fulfilled.type },
-        ]);
-      });
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/store/configureStore/mockStoreCreator.ts b/kafka-ui-react-app/src/redux/store/configureStore/mockStoreCreator.ts
deleted file mode 100644
index 67bab43dd6b..00000000000
--- a/kafka-ui-react-app/src/redux/store/configureStore/mockStoreCreator.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import configureMockStore, { MockStoreCreator } from 'redux-mock-store';
-import thunk, { ThunkDispatch } from 'redux-thunk';
-import { AnyAction, Middleware } from 'redux';
-import { RootState } from 'redux/interfaces';
-
-const middlewares: Array<Middleware> = [thunk];
-type DispatchExts = ThunkDispatch<RootState, undefined, AnyAction>;
-
-const mockStoreCreator: MockStoreCreator<RootState, DispatchExts> =
-  configureMockStore<RootState, DispatchExts>(middlewares);
-
-export default mockStoreCreator();
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
index 3a0810782f5..6570b334a4e 100644
--- a/kafka-ui-react-app/vite.config.ts
+++ b/kafka-ui-react-app/vite.config.ts
@@ -15,12 +15,11 @@ export default defineConfig(({ mode }) => {
       rollupOptions: {
         output: {
           manualChunks: {
-            venod: [
+            vendor: [
               'react',
               'react-router-dom',
               'react-dom',
               'redux',
-              'redux-thunk',
               'react-redux',
               'styled-components',
               'react-ace',
@@ -32,7 +31,7 @@ export default defineConfig(({ mode }) => {
     define: {
       'process.env.NODE_ENV': `"${mode}"`,
       'process.env.VITE_TAG': `"${process.env.VITE_TAG}"`,
-      'process.env.GIT_COMMIT': `"${process.env.VITE_COMMIT}"`,
+      'process.env.VITE_COMMIT': `"${process.env.VITE_COMMIT}"`,
     },
   };
   const proxy = process.env.VITE_DEV_PROXY;

From 30f836645de7635fffe13a4f24ad37965e4fb98c Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Tue, 19 Jul 2022 18:53:07 +0400
Subject: [PATCH 081/734] Dependabot/npm and yarn/kafka UI react app/eslint
 plugin react 7.30.1 (#2232)

* Bump eslint-plugin-react from 7.29.4 to 7.30.1 in /kafka-ui-react-app

Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.29.4 to 7.30.1.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.29.4...v7.30.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* taking ActionsCell out of List

* removing package-lock

* refactoring props

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/package.json               |   2 +-
 kafka-ui-react-app/pnpm-lock.yaml             |  22 +--
 .../Topics/List/ActionsCell/ActionsCell.tsx   | 131 ++++++++++++++++++
 .../src/components/Topics/List/List.tsx       | 104 +-------------
 .../components/Topics/List/ListContainer.ts   |   4 -
 .../Topics/List/__tests__/List.spec.tsx       |  66 ---------
 .../common/SmartTable/TableColumn.tsx         |   3 +-
 7 files changed, 148 insertions(+), 184 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index defe27f5c68..9b8c455948e 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -104,7 +104,7 @@
     "eslint-plugin-jest-dom": "^4.0.2",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.5.0",
     "fetch-mock-jest": "^1.5.1",
     "husky": "^8.0.1",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 014f2caf68b..dd0fc376ea1 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -50,7 +50,7 @@ specifiers:
   eslint-plugin-jest-dom: ^4.0.2
   eslint-plugin-jsx-a11y: ^6.5.1
   eslint-plugin-prettier: ^4.0.0
-  eslint-plugin-react: ^7.29.4
+  eslint-plugin-react: ^7.30.1
   eslint-plugin-react-hooks: ^4.5.0
   fetch-mock: ^9.11.0
   fetch-mock-jest: ^1.5.1
@@ -155,7 +155,7 @@ devDependencies:
   '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
   dotenv: 16.0.1
   eslint: 8.16.0
-  eslint-config-airbnb: 19.0.4_pamhosqcenlxoxj4ke2dmvzava
+  eslint-config-airbnb: 19.0.4_iayhaebzx3saen2ll7sn5gqmdq
   eslint-config-airbnb-typescript: 17.0.0_l6wia5brkiej5f4nhesunbzj5y
   eslint-config-prettier: 8.5.0_eslint@8.16.0
   eslint-config-react-app: 7.0.1_y3w6q4zxtal6gz5auqli3lo3ny
@@ -165,7 +165,7 @@ devDependencies:
   eslint-plugin-jest-dom: 4.0.2_eslint@8.16.0
   eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
   eslint-plugin-prettier: 4.0.0_q7a4ir2sdihdzpzdlnbgmzjlpq
-  eslint-plugin-react: 7.29.4_eslint@8.16.0
+  eslint-plugin-react: 7.30.1_eslint@8.16.0
   eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
   fetch-mock-jest: 1.5.1
   husky: 8.0.1
@@ -4208,7 +4208,7 @@ packages:
       eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
     dev: true
 
-  /eslint-config-airbnb/19.0.4_pamhosqcenlxoxj4ke2dmvzava:
+  /eslint-config-airbnb/19.0.4_iayhaebzx3saen2ll7sn5gqmdq:
     resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==}
     engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -4222,7 +4222,7 @@ packages:
       eslint-config-airbnb-base: 15.0.0_btspkuwbqkl4adpiufzbathtpi
       eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
       eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
-      eslint-plugin-react: 7.29.4_eslint@8.16.0
+      eslint-plugin-react: 7.30.1_eslint@8.16.0
       eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
       object.assign: 4.1.2
       object.entries: 1.1.5
@@ -4259,7 +4259,7 @@ packages:
       eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
       eslint-plugin-jest: 25.7.0_lemdnf4suuyhpl5s2mhp2xyjqi
       eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
-      eslint-plugin-react: 7.29.4_eslint@8.16.0
+      eslint-plugin-react: 7.30.1_eslint@8.16.0
       eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
       eslint-plugin-testing-library: 5.5.0_vjep2yp2sits3sqnodefgcbnfi
       typescript: 4.7.4
@@ -4455,8 +4455,8 @@ packages:
       eslint: 8.16.0
     dev: true
 
-  /eslint-plugin-react/7.29.4_eslint@8.16.0:
-    resolution: {integrity: sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==}
+  /eslint-plugin-react/7.30.1_eslint@8.16.0:
+    resolution: {integrity: sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg==}
     engines: {node: '>=4'}
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
@@ -4475,7 +4475,7 @@ packages:
       prop-types: 15.8.1
       resolve: 2.0.0-next.3
       semver: 6.3.0
-      string.prototype.matchall: 4.0.6
+      string.prototype.matchall: 4.0.7
     dev: true
 
   /eslint-plugin-testing-library/5.5.0_vjep2yp2sits3sqnodefgcbnfi:
@@ -7206,8 +7206,8 @@ packages:
       strip-ansi: 7.0.1
     dev: true
 
-  /string.prototype.matchall/4.0.6:
-    resolution: {integrity: sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg==}
+  /string.prototype.matchall/4.0.7:
+    resolution: {integrity: sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==}
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
new file mode 100644
index 00000000000..617dc8f4928
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
@@ -0,0 +1,131 @@
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import {
+  CleanUpPolicy,
+  SortOrder,
+  TopicColumnsToSort,
+} from 'generated-sources';
+import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
+import DropdownItem from 'components/common/Dropdown/DropdownItem';
+import { TableCellProps } from 'components/common/SmartTable/TableColumn';
+import { TopicWithDetailedInfo } from 'redux/interfaces';
+import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
+import Dropdown from 'components/common/Dropdown/Dropdown';
+import ClusterContext from 'components/contexts/ClusterContext';
+import * as S from 'components/Topics/List/List.styled';
+import { ClusterNameRoute } from 'lib/paths';
+import useModal from 'lib/hooks/useModal';
+import useAppParams from 'lib/hooks/useAppParams';
+import {
+  deleteTopic,
+  fetchTopicsList,
+  recreateTopic,
+} from 'redux/reducers/topics/topicsSlice';
+import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
+
+interface TopicsListParams {
+  clusterName: string;
+  page?: number;
+  perPage?: number;
+  showInternal?: boolean;
+  search?: string;
+  orderBy?: TopicColumnsToSort;
+  sortOrder?: SortOrder;
+}
+export interface ActionsCellProps {
+  topicsListParams: TopicsListParams;
+}
+
+const ActionsCell: React.FC<
+  TableCellProps<TopicWithDetailedInfo, string> & ActionsCellProps
+> = ({
+  hovered,
+  dataItem: { internal, cleanUpPolicy, name },
+  topicsListParams,
+}) => {
+  const { isReadOnly, isTopicDeletionAllowed } =
+    React.useContext(ClusterContext);
+  const dispatch = useDispatch();
+  const { clusterName } = useAppParams<ClusterNameRoute>();
+
+  const {
+    isOpen: isDeleteTopicModalOpen,
+    setClose: closeDeleteTopicModal,
+    setOpen: openDeleteTopicModal,
+  } = useModal(false);
+
+  const {
+    isOpen: isRecreateTopicModalOpen,
+    setClose: closeRecreateTopicModal,
+    setOpen: openRecreateTopicModal,
+  } = useModal(false);
+
+  const {
+    isOpen: isClearMessagesModalOpen,
+    setClose: closeClearMessagesModal,
+    setOpen: openClearMessagesModal,
+  } = useModal(false);
+
+  const isHidden = internal || isReadOnly || !hovered;
+
+  const deleteTopicHandler = () =>
+    dispatch(deleteTopic({ clusterName, topicName: name }));
+
+  const clearTopicMessagesHandler = () => {
+    dispatch(clearTopicMessages({ clusterName, topicName: name }));
+    dispatch(fetchTopicsList(topicsListParams));
+    closeClearMessagesModal();
+  };
+
+  const recreateTopicHandler = () => {
+    dispatch(recreateTopic({ clusterName, topicName: name }));
+    closeRecreateTopicModal();
+  };
+
+  return (
+    <>
+      <S.ActionsContainer>
+        {!isHidden && (
+          <Dropdown label={<VerticalElipsisIcon />} right>
+            {cleanUpPolicy === CleanUpPolicy.DELETE && (
+              <DropdownItem onClick={openClearMessagesModal} danger>
+                Clear Messages
+              </DropdownItem>
+            )}
+            {isTopicDeletionAllowed && (
+              <DropdownItem onClick={openDeleteTopicModal} danger>
+                Remove Topic
+              </DropdownItem>
+            )}
+            <DropdownItem onClick={openRecreateTopicModal} danger>
+              Recreate Topic
+            </DropdownItem>
+          </Dropdown>
+        )}
+      </S.ActionsContainer>
+      <ConfirmationModal
+        isOpen={isClearMessagesModalOpen}
+        onCancel={closeClearMessagesModal}
+        onConfirm={clearTopicMessagesHandler}
+      >
+        Are you sure want to clear topic messages?
+      </ConfirmationModal>
+      <ConfirmationModal
+        isOpen={isDeleteTopicModalOpen}
+        onCancel={closeDeleteTopicModal}
+        onConfirm={deleteTopicHandler}
+      >
+        Are you sure want to remove <b>{name}</b> topic?
+      </ConfirmationModal>
+      <ConfirmationModal
+        isOpen={isRecreateTopicModalOpen}
+        onCancel={closeRecreateTopicModal}
+        onConfirm={recreateTopicHandler}
+      >
+        Are you sure to recreate <b>{name}</b> topic?
+      </ConfirmationModal>
+    </>
+  );
+};
+
+export default React.memo(ActionsCell);
diff --git a/kafka-ui-react-app/src/components/Topics/List/List.tsx b/kafka-ui-react-app/src/components/Topics/List/List.tsx
index b958b4f6b83..b83659d4d71 100644
--- a/kafka-ui-react-app/src/components/Topics/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/List.tsx
@@ -12,15 +12,11 @@ import {
   clusterTopicNewRelativePath,
 } from 'lib/paths';
 import usePagination from 'lib/hooks/usePagination';
-import useModal from 'lib/hooks/useModal';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import {
-  CleanUpPolicy,
-  DeleteTopicRequest,
   GetTopicsRequest,
-  RecreateTopicRequest,
   SortOrder,
   TopicColumnsToSort,
 } from 'generated-sources';
@@ -31,14 +27,8 @@ import PageHeading from 'components/common/PageHeading/PageHeading';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import Switch from 'components/common/Switch/Switch';
 import { SmartTable } from 'components/common/SmartTable/SmartTable';
-import {
-  TableCellProps,
-  TableColumn,
-} from 'components/common/SmartTable/TableColumn';
+import { TableColumn } from 'components/common/SmartTable/TableColumn';
 import { useTableState } from 'lib/hooks/useTableState';
-import Dropdown from 'components/common/Dropdown/Dropdown';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
 
 import {
   MessagesCell,
@@ -47,18 +37,17 @@ import {
   TopicSizeCell,
 } from './TopicsTableCells';
 import * as S from './List.styled';
+import ActionsCell from './ActionsCell/ActionsCell';
 
 export interface TopicsListProps {
   areTopicsFetching: boolean;
   topics: TopicWithDetailedInfo[];
   totalPages: number;
   fetchTopicsList(payload: GetTopicsRequest): void;
-  deleteTopic(payload: DeleteTopicRequest): void;
   deleteTopics(payload: {
     clusterName: ClusterName;
     topicNames: TopicName[];
   }): void;
-  recreateTopic(payload: RecreateTopicRequest): void;
   clearTopicsMessages(payload: {
     clusterName: ClusterName;
     topicNames: TopicName[];
@@ -80,10 +69,7 @@ const List: React.FC<TopicsListProps> = ({
   topics,
   totalPages,
   fetchTopicsList,
-  deleteTopic,
   deleteTopics,
-  recreateTopic,
-  clearTopicMessages,
   clearTopicsMessages,
   search,
   orderBy,
@@ -91,8 +77,7 @@ const List: React.FC<TopicsListProps> = ({
   setTopicsSearch,
   setTopicsOrderBy,
 }) => {
-  const { isReadOnly, isTopicDeletionAllowed } =
-    React.useContext(ClusterContext);
+  const { isReadOnly } = React.useContext(ClusterContext);
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const { page, perPage } = usePagination();
   const [showInternal, setShowInternal] = React.useState<boolean>(
@@ -197,89 +182,6 @@ const List: React.FC<TopicsListProps> = ({
     fetchTopicsList(topicsListParams);
   };
 
-  const ActionsCell = React.memo<TableCellProps<TopicWithDetailedInfo, string>>(
-    ({ hovered, dataItem: { internal, cleanUpPolicy, name } }) => {
-      const {
-        isOpen: isDeleteTopicModalOpen,
-        setClose: closeDeleteTopicModal,
-        setOpen: openDeleteTopicModal,
-      } = useModal(false);
-
-      const {
-        isOpen: isRecreateTopicModalOpen,
-        setClose: closeRecreateTopicModal,
-        setOpen: openRecreateTopicModal,
-      } = useModal(false);
-
-      const {
-        isOpen: isClearMessagesModalOpen,
-        setClose: closeClearMessagesModal,
-        setOpen: openClearMessagesModal,
-      } = useModal(false);
-
-      const isHidden = internal || isReadOnly || !hovered;
-
-      const deleteTopicHandler = () =>
-        deleteTopic({ clusterName, topicName: name });
-
-      const clearTopicMessagesHandler = () => {
-        clearTopicMessages({ clusterName, topicName: name });
-        fetchTopicsList(topicsListParams);
-        closeClearMessagesModal();
-      };
-
-      const recreateTopicHandler = () => {
-        recreateTopic({ clusterName, topicName: name });
-        closeRecreateTopicModal();
-      };
-
-      return (
-        <>
-          <S.ActionsContainer>
-            {!isHidden && (
-              <Dropdown label={<VerticalElipsisIcon />} right>
-                {cleanUpPolicy === CleanUpPolicy.DELETE && (
-                  <DropdownItem onClick={openClearMessagesModal} danger>
-                    Clear Messages
-                  </DropdownItem>
-                )}
-                {isTopicDeletionAllowed && (
-                  <DropdownItem onClick={openDeleteTopicModal} danger>
-                    Remove Topic
-                  </DropdownItem>
-                )}
-                <DropdownItem onClick={openRecreateTopicModal} danger>
-                  Recreate Topic
-                </DropdownItem>
-              </Dropdown>
-            )}
-          </S.ActionsContainer>
-          <ConfirmationModal
-            isOpen={isClearMessagesModalOpen}
-            onCancel={closeClearMessagesModal}
-            onConfirm={clearTopicMessagesHandler}
-          >
-            Are you sure want to clear topic messages?
-          </ConfirmationModal>
-          <ConfirmationModal
-            isOpen={isDeleteTopicModalOpen}
-            onCancel={closeDeleteTopicModal}
-            onConfirm={deleteTopicHandler}
-          >
-            Are you sure want to remove <b>{name}</b> topic?
-          </ConfirmationModal>
-          <ConfirmationModal
-            isOpen={isRecreateTopicModalOpen}
-            onCancel={closeRecreateTopicModal}
-            onConfirm={recreateTopicHandler}
-          >
-            Are you sure to recreate <b>{name}</b> topic?
-          </ConfirmationModal>
-        </>
-      );
-    }
-  );
-
   return (
     <div>
       <div>
diff --git a/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts b/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts
index 7670f4e8682..75b06c2b431 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts
+++ b/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts
@@ -3,8 +3,6 @@ import { RootState } from 'redux/interfaces';
 import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import {
   fetchTopicsList,
-  deleteTopic,
-  recreateTopic,
   setTopicsSearch,
   setTopicsOrderBy,
   deleteTopics,
@@ -32,9 +30,7 @@ const mapStateToProps = (state: RootState) => ({
 
 const mapDispatchToProps = {
   fetchTopicsList,
-  deleteTopic,
   deleteTopics,
-  recreateTopic,
   clearTopicsMessages,
   clearTopicMessages,
   setTopicsSearch,
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx
index d85a55f2094..2d756fc8b76 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx
@@ -27,11 +27,9 @@ describe('List', () => {
       topics={[]}
       totalPages={1}
       fetchTopicsList={jest.fn()}
-      deleteTopic={jest.fn()}
       deleteTopics={jest.fn()}
       clearTopicsMessages={jest.fn()}
       clearTopicMessages={jest.fn()}
-      recreateTopic={jest.fn()}
       search=""
       orderBy={null}
       sortOrder={SortOrder.ASC}
@@ -174,10 +172,8 @@ describe('List', () => {
 
   describe('when some list items are selected', () => {
     const mockDeleteTopics = jest.fn();
-    const mockDeleteTopic = jest.fn();
     const mockClearTopic = jest.fn();
     const mockClearTopicsMessages = jest.fn();
-    const mockRecreate = jest.fn();
     const fetchTopicsList = jest.fn();
 
     jest.useFakeTimers();
@@ -204,8 +200,6 @@ describe('List', () => {
               ],
               deleteTopics: mockDeleteTopics,
               clearTopicsMessages: mockClearTopicsMessages,
-              recreateTopic: mockRecreate,
-              deleteTopic: mockDeleteTopic,
               clearTopicMessages: mockClearTopic,
               fetchTopicsList,
             })}
@@ -218,8 +212,6 @@ describe('List', () => {
     afterEach(() => {
       mockDeleteTopics.mockClear();
       mockClearTopicsMessages.mockClear();
-      mockRecreate.mockClear();
-      mockDeleteTopic.mockClear();
     });
 
     const getCheckboxInput = (at: number) => {
@@ -335,63 +327,5 @@ describe('List', () => {
 
       expect(mockDeleteTopics).not.toHaveBeenCalled();
     });
-
-    const tableRowActionClickAndCheck = async (
-      action: 'deleteTopics' | 'clearTopicsMessages' | 'recreate'
-    ) => {
-      const row = screen.getAllByRole('row')[1];
-      userEvent.hover(row);
-      const actionBtn = within(row).getByRole('menu', { hidden: true });
-
-      userEvent.click(actionBtn);
-
-      let textBtn;
-      let mock: jest.Mock;
-
-      if (action === 'clearTopicsMessages') {
-        textBtn = 'Clear Messages';
-        mock = mockClearTopic;
-      } else if (action === 'deleteTopics') {
-        textBtn = 'Remove Topic';
-        mock = mockDeleteTopic;
-      } else {
-        textBtn = 'Recreate Topic';
-        mock = mockRecreate;
-      }
-
-      const ourAction = screen.getByText(textBtn);
-
-      userEvent.click(ourAction);
-
-      let dialog = screen.getByRole('dialog');
-      expect(dialog).toBeInTheDocument();
-      userEvent.click(within(dialog).getByRole('button', { name: 'Submit' }));
-
-      await waitFor(() => {
-        expect(mock).toHaveBeenCalled();
-        if (action === 'clearTopicsMessages') {
-          expect(fetchTopicsList).toHaveBeenCalled();
-        }
-      });
-
-      userEvent.click(ourAction);
-      dialog = screen.getByRole('dialog');
-      expect(dialog).toBeInTheDocument();
-      userEvent.click(within(dialog).getByRole('button', { name: 'Cancel' }));
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-      expect(mock).toHaveBeenCalledTimes(1);
-    };
-
-    it('should test the actions of the row and their modal and fetching for removing', async () => {
-      await tableRowActionClickAndCheck('deleteTopics');
-    });
-
-    it('should test the actions of the row and their modal and fetching for clear', async () => {
-      await tableRowActionClickAndCheck('clearTopicsMessages');
-    });
-
-    it('should test the actions of the row and their modal and fetching for recreate', async () => {
-      await tableRowActionClickAndCheck('recreate');
-    });
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx b/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
index 8044999ee22..b3fa869582a 100644
--- a/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
+++ b/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
@@ -3,6 +3,7 @@ import { TableState } from 'lib/hooks/useTableState';
 import { SortOrder } from 'generated-sources';
 import * as S from 'components/common/table/TableHeaderCell/TableHeaderCell.styled';
 import { DefaultTheme, StyledComponent } from 'styled-components';
+import { ActionsCellProps } from 'components/Topics/List/ActionsCell/ActionsCell';
 
 export interface OrderableProps {
   orderBy: string | null;
@@ -28,7 +29,7 @@ export interface TableCellProps<T, TId extends IdType>
 }
 
 interface TableColumnProps<T, TId extends IdType> {
-  cell?: React.FC<TableCellProps<T, TId>>;
+  cell?: React.FC<TableCellProps<T, TId> & ActionsCellProps>;
   children?: React.ReactElement;
   headerCell?: React.FC<TableHeaderCellProps<T, TId>>;
   field?: string;

From 66e4eede510014aca116d034b91515f5e8be5ec1 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Thu, 21 Jul 2022 09:08:23 +0300
Subject: [PATCH 082/734] Upgrade RQ to v4 (#2300)

---
 kafka-ui-react-app/package.json               |   3 +-
 kafka-ui-react-app/pnpm-lock.yaml             | 131 +++++-------------
 kafka-ui-react-app/src/components/App.tsx     |   2 +-
 .../Broker/BrokerLogdir/BrokerLogdir.tsx      |   1 -
 .../__test__/BrokerLogdir.spec.tsx            |  55 +++-----
 .../Brokers/Broker/__test__/Broker.spec.tsx   |   6 +-
 .../BrokersList/__test__/BrokersList.spec.tsx |   9 +-
 .../utils/__test__/translateLogdirs.spec.tsx  |   2 +-
 .../Cluster/__tests__/Cluster.spec.tsx        |  18 +--
 .../Connect/Details/Actions/Actions.tsx       |   2 +-
 .../Connect/List/__tests__/List.spec.tsx      |   3 -
 .../Connect/List/__tests__/ListPage.spec.tsx  |   3 -
 .../__test__/ClustersWidget.spec.tsx          |  19 +--
 .../Nav/__tests__/ClusterMenu.spec.tsx        |   2 +-
 .../src/components/Nav/__tests__/Nav.spec.tsx |  22 +--
 .../fixtures.ts => lib/fixtures/brokers.ts}   |  15 --
 .../fixtures.ts => lib/fixtures/clusters.ts}  |  15 ++
 .../hooks/api/__tests__/kafkaConnect.spec.ts  |   2 +-
 .../src/lib/hooks/api/brokers.ts              |   2 +-
 .../src/lib/hooks/api/clusters.ts             |   2 +-
 .../src/lib/hooks/api/kafkaConnect.ts         |   2 +-
 kafka-ui-react-app/src/lib/testHelpers.tsx    |   6 +-
 22 files changed, 119 insertions(+), 203 deletions(-)
 rename kafka-ui-react-app/src/{components/Brokers/__test__/fixtures.ts => lib/fixtures/brokers.ts} (65%)
 rename kafka-ui-react-app/src/{components/Cluster/__tests__/fixtures.ts => lib/fixtures/clusters.ts} (63%)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 9b8c455948e..9b3e523f6c9 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -12,6 +12,7 @@
     "@hookform/resolvers": "^2.7.1",
     "@reduxjs/toolkit": "^1.8.3",
     "@rooks/use-outside-click-ref": "^4.10.1",
+    "@tanstack/react-query": "^4.0.5",
     "@testing-library/react": "^13.2.0",
     "@types/testing-library__jest-dom": "^5.14.5",
     "@types/yup": "^0.29.13",
@@ -35,7 +36,6 @@
     "react-hook-form": "7.6.9",
     "react-is": "^18.2.0",
     "react-multi-select-component": "^4.0.6",
-    "react-query": "^3.39.1",
     "react-redux": "^8.0.2",
     "react-router-dom": "^6.3.0",
     "redux": "^4.2.0",
@@ -106,7 +106,6 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.5.0",
-    "fetch-mock-jest": "^1.5.1",
     "husky": "^8.0.1",
     "jest-environment-jsdom": "^28.1.1",
     "jest-sonar-reporter": "^2.0.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index dd0fc376ea1..d2128a2b5b9 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -14,6 +14,7 @@ specifiers:
   '@openapitools/openapi-generator-cli': ^2.5.1
   '@reduxjs/toolkit': ^1.8.3
   '@rooks/use-outside-click-ref': ^4.10.1
+  '@tanstack/react-query': ^4.0.5
   '@testing-library/dom': ^8.11.1
   '@testing-library/jest-dom': ^5.16.4
   '@testing-library/react': ^13.2.0
@@ -53,7 +54,6 @@ specifiers:
   eslint-plugin-react: ^7.30.1
   eslint-plugin-react-hooks: ^4.5.0
   fetch-mock: ^9.11.0
-  fetch-mock-jest: ^1.5.1
   husky: ^8.0.1
   jest: ^28.1.1
   jest-environment-jsdom: ^28.1.1
@@ -72,7 +72,6 @@ specifiers:
   react-hook-form: 7.6.9
   react-is: ^18.2.0
   react-multi-select-component: ^4.0.6
-  react-query: ^3.39.1
   react-redux: ^8.0.2
   react-router-dom: ^6.3.0
   redux: ^4.2.0
@@ -98,6 +97,7 @@ dependencies:
   '@hookform/resolvers': 2.8.9_react-hook-form@7.6.9
   '@reduxjs/toolkit': 1.8.3_ctm756ikdwcjcvyfxxwskzbr6q
   '@rooks/use-outside-click-ref': 4.11.2_react@18.1.0
+  '@tanstack/react-query': 4.0.5_ef5jwxihqo6n7gxfmzogljlgcm
   '@testing-library/react': 13.2.0_ef5jwxihqo6n7gxfmzogljlgcm
   '@types/testing-library__jest-dom': 5.14.5
   '@types/yup': 0.29.13
@@ -121,7 +121,6 @@ dependencies:
   react-hook-form: 7.6.9_react@18.1.0
   react-is: 18.2.0
   react-multi-select-component: 4.0.6_react@18.1.0
-  react-query: 3.39.1_ef5jwxihqo6n7gxfmzogljlgcm
   react-redux: 8.0.2_nfqigfgwurfoimtkde74cji6ga
   react-router-dom: 6.3.0_ef5jwxihqo6n7gxfmzogljlgcm
   redux: 4.2.0
@@ -167,7 +166,6 @@ devDependencies:
   eslint-plugin-prettier: 4.0.0_q7a4ir2sdihdzpzdlnbgmzjlpq
   eslint-plugin-react: 7.30.1_eslint@8.16.0
   eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
-  fetch-mock-jest: 1.5.1
   husky: 8.0.1
   jest-environment-jsdom: 28.1.1
   jest-sonar-reporter: 2.0.0
@@ -2377,6 +2375,29 @@ packages:
     dependencies:
       '@sinonjs/commons': 1.8.3
 
+  /@tanstack/query-core/4.0.5:
+    resolution: {integrity: sha512-QOJ2gLbwlf8p0487pMey6vv8EF5X2ib1zINayaD7mb9/LibUtXmZ12uJgTqcnjgNY/4tWZn5qJnEk2ePG5AVGA==}
+    dev: false
+
+  /@tanstack/react-query/4.0.5_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-tIggVlhoFevVpY/LkZroPmrERFHN8tw4aZLtgwSArzHmMJ03WQcaNvbbHy6GERidXtaMdUz+IeQryrE7cO7WPQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-native: '*'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+      react-native:
+        optional: true
+    dependencies:
+      '@tanstack/query-core': 4.0.5
+      '@types/use-sync-external-store': 0.0.3
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      use-sync-external-store: 1.2.0_react@18.1.0
+    dev: false
+
   /@testing-library/dom/8.13.0:
     resolution: {integrity: sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==}
     engines: {node: '>=12'}
@@ -3287,11 +3308,6 @@ packages:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
     dev: true
 
-  /big-integer/1.6.51:
-    resolution: {integrity: sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==}
-    engines: {node: '>=0.6'}
-    dev: false
-
   /binary-extensions/2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
@@ -3317,19 +3333,6 @@ packages:
     dependencies:
       fill-range: 7.0.1
 
-  /broadcast-channel/3.7.0:
-    resolution: {integrity: sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==}
-    dependencies:
-      '@babel/runtime': 7.17.9
-      detect-node: 2.1.0
-      js-sha3: 0.8.0
-      microseconds: 0.2.0
-      nano-time: 1.0.0
-      oblivious-set: 1.0.0
-      rimraf: 3.0.2
-      unload: 2.2.0
-    dev: false
-
   /browser-process-hrtime/1.0.0:
     resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==}
     dev: true
@@ -3629,6 +3632,7 @@ packages:
     resolution: {integrity: sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==}
     deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
     requiresBuild: true
+    dev: false
 
   /cosmiconfig/7.0.1:
     resolution: {integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==}
@@ -3807,10 +3811,6 @@ packages:
     resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
     engines: {node: '>=8'}
 
-  /detect-node/2.1.0:
-    resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
-    dev: false
-
   /diff-match-patch/1.0.5:
     resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
     dev: false
@@ -4706,20 +4706,6 @@ packages:
     dependencies:
       bser: 2.1.1
 
-  /fetch-mock-jest/1.5.1:
-    resolution: {integrity: sha512-+utwzP8C+Pax1GSka3nFXILWMY3Er2L+s090FOgqVNrNCPp0fDqgXnAHAJf12PLHi0z4PhcTaZNTz8e7K3fjqQ==}
-    engines: {node: '>=8.0.0'}
-    peerDependencies:
-      node-fetch: '*'
-    peerDependenciesMeta:
-      node-fetch:
-        optional: true
-    dependencies:
-      fetch-mock: 9.11.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /fetch-mock/9.11.0:
     resolution: {integrity: sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==}
     engines: {node: '>=4.0.0'}
@@ -4741,6 +4727,7 @@ packages:
       whatwg-url: 6.5.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /figures/3.2.0:
     resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
@@ -4906,6 +4893,7 @@ packages:
 
   /glob-to-regexp/0.4.1:
     resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
+    dev: false
 
   /glob/7.1.6:
     resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==}
@@ -5279,6 +5267,7 @@ packages:
 
   /is-subset/0.1.1:
     resolution: {integrity: sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==}
+    dev: false
 
   /is-symbol/1.0.4:
     resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
@@ -5787,10 +5776,6 @@ packages:
       - supports-color
       - ts-node
 
-  /js-sha3/0.8.0:
-    resolution: {integrity: sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==}
-    dev: false
-
   /js-tokens/4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
@@ -6036,6 +6021,7 @@ packages:
 
   /lodash.isequal/4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+    dev: false
 
   /lodash.memoize/4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
@@ -6047,6 +6033,7 @@ packages:
 
   /lodash.sortby/4.7.0:
     resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
+    dev: false
 
   /lodash/4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
@@ -6106,13 +6093,6 @@ packages:
     dependencies:
       tmpl: 1.0.5
 
-  /match-sorter/6.3.1:
-    resolution: {integrity: sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==}
-    dependencies:
-      '@babel/runtime': 7.17.9
-      remove-accents: 0.4.2
-    dev: false
-
   /merge-stream/2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
@@ -6128,10 +6108,6 @@ packages:
       braces: 3.0.2
       picomatch: 2.3.1
 
-  /microseconds/0.2.0:
-    resolution: {integrity: sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==}
-    dev: false
-
   /mime-db/1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
@@ -6187,12 +6163,6 @@ packages:
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
-  /nano-time/1.0.0:
-    resolution: {integrity: sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==}
-    dependencies:
-      big-integer: 1.6.51
-    dev: false
-
   /nanoclone/0.2.1:
     resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==}
     dev: false
@@ -6307,10 +6277,6 @@ packages:
       es-abstract: 1.20.0
     dev: true
 
-  /oblivious-set/1.0.0:
-    resolution: {integrity: sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==}
-    dev: false
-
   /once/1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
@@ -6486,6 +6452,7 @@ packages:
 
   /path-to-regexp/2.4.0:
     resolution: {integrity: sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==}
+    dev: false
 
   /path-to-regexp/3.2.0:
     resolution: {integrity: sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==}
@@ -6608,6 +6575,7 @@ packages:
     resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==}
     engines: {node: '>=0.4.x'}
     deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
+    dev: false
 
   /queue-microtask/1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
@@ -6702,25 +6670,6 @@ packages:
       react-fast-compare: 3.2.0
       warning: 4.0.3
 
-  /react-query/3.39.1_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-qYKT1bavdDiQZbngWZyPotlBVzcBjDYEJg5RQLBa++5Ix5jjfbEYJmHSZRZD+USVHUSvl/ey9Hu+QfF1QAK80A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: '*'
-      react-native: '*'
-    peerDependenciesMeta:
-      react-dom:
-        optional: true
-      react-native:
-        optional: true
-    dependencies:
-      '@babel/runtime': 7.17.9
-      broadcast-channel: 3.7.0
-      match-sorter: 6.3.1
-      react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
-    dev: false
-
   /react-redux/8.0.2_nfqigfgwurfoimtkde74cji6ga:
     resolution: {integrity: sha512-nBwiscMw3NoP59NFCXFf02f8xdo+vSHT/uZ1ldDwF7XaTpzm+Phk97VT4urYBl5TYAPNVaFm12UHAEyzkpNzRA==}
     peerDependencies:
@@ -6895,10 +6844,6 @@ packages:
       jsesc: 0.5.0
     dev: true
 
-  /remove-accents/0.4.2:
-    resolution: {integrity: sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA==}
-    dev: false
-
   /require-directory/2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -7423,6 +7368,7 @@ packages:
     resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
     dependencies:
       punycode: 2.1.1
+    dev: false
 
   /tr46/3.0.0:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
@@ -7643,13 +7589,6 @@ packages:
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /unload/2.2.0:
-    resolution: {integrity: sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==}
-    dependencies:
-      '@babel/runtime': 7.17.9
-      detect-node: 2.1.0
-    dev: false
-
   /uri-js/4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
@@ -7773,6 +7712,7 @@ packages:
 
   /webidl-conversions/4.0.2:
     resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
+    dev: false
 
   /webidl-conversions/7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
@@ -7824,6 +7764,7 @@ packages:
       lodash.sortby: 4.7.0
       tr46: 1.0.1
       webidl-conversions: 4.0.2
+    dev: false
 
   /which-boxed-primitive/1.0.2:
     resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 8fd2d3fe0c9..0d23fc70b3f 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -10,7 +10,7 @@ import Version from 'components/Version/Version';
 import Alerts from 'components/Alerts/Alerts';
 import { ThemeProvider } from 'styled-components';
 import theme from 'theme/theme';
-import { QueryClient, QueryClientProvider } from 'react-query';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 
 import * as S from './App.styled';
 import Logo from './common/Logo/Logo';
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
index 9bd00458c13..37e1bce49d7 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
@@ -16,7 +16,6 @@ interface BrokerLogdirState {
 
 const BrokerLogdir: React.FC = () => {
   const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
-
   const { data: logDirs } = useBrokerLogDirs(clusterName, Number(brokerId));
 
   const preparedRows = translateLogdirs(logDirs);
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
index ad4fbec25cc..47209c66ba1 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
@@ -1,67 +1,44 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
-import { screen, waitFor } from '@testing-library/dom';
+import { screen } from '@testing-library/dom';
 import { clusterBrokerPath } from 'lib/paths';
-import fetchMock from 'fetch-mock';
 import { act } from '@testing-library/react';
-import Broker from 'components/Brokers/Broker/Broker';
-import {
-  clusterStatsPayload,
-  brokerLogDirsPayload,
-  brokersPayload,
-} from 'components/Brokers/__test__/fixtures';
+import { brokerLogDirsPayload } from 'lib/fixtures/brokers';
+import { useBrokerLogDirs } from 'lib/hooks/api/brokers';
+import { BrokerLogdirs } from 'generated-sources';
+import BrokerLogdir from 'components/Brokers/Broker/BrokerLogdir/BrokerLogdir';
+
+jest.mock('lib/hooks/api/brokers', () => ({
+  useBrokerLogDirs: jest.fn(),
+}));
 
 const clusterName = 'local';
 const brokerId = 1;
-const fetchStatsUrl = `/api/clusters/${clusterName}/stats`;
-const fetchBrokersUrl = `/api/clusters/${clusterName}/brokers`;
-const fetchLogDirsUrl = `/api/clusters/${clusterName}/brokers/logdirs`;
 
 describe('BrokerLogdir Component', () => {
-  afterEach(() => {
-    fetchMock.reset();
-  });
-
-  const renderComponent = async () => {
-    const fetchStatsMock = fetchMock.get(fetchStatsUrl, clusterStatsPayload);
-    const fetchBrokersMock = fetchMock.get(fetchBrokersUrl, brokersPayload);
+  const renderComponent = async (payload: BrokerLogdirs[] = []) => {
+    (useBrokerLogDirs as jest.Mock).mockImplementation(() => ({
+      data: payload,
+    }));
     await act(() => {
       render(
         <WithRoute path={clusterBrokerPath()}>
-          <Broker />
+          <BrokerLogdir />
         </WithRoute>,
         {
           initialEntries: [clusterBrokerPath(clusterName, brokerId)],
         }
       );
     });
-    await waitFor(() => expect(fetchStatsMock.called()).toBeTruthy());
-    expect(fetchBrokersMock.called()).toBeTruthy();
   };
 
   it('shows warning when server returns empty logDirs response', async () => {
-    const fetchLogDirsMock = fetchMock.getOnce(fetchLogDirsUrl, [], {
-      query: { broker: brokerId },
-    });
     await renderComponent();
-    await waitFor(() => expect(fetchLogDirsMock.called()).toBeTruthy());
     expect(screen.getByText('Log dir data not available')).toBeInTheDocument();
   });
 
   it('shows broker', async () => {
-    const fetchLogDirsMock = fetchMock.getOnce(
-      fetchLogDirsUrl,
-      brokerLogDirsPayload,
-      {
-        query: { broker: brokerId },
-      }
-    );
-
-    await renderComponent();
-    await waitFor(() => expect(fetchLogDirsMock.called()).toBeTruthy());
-    const topicCount = screen.getByText(3);
-    const partitionsCount = screen.getByText(4);
-    expect(topicCount).toBeInTheDocument();
-    expect(partitionsCount).toBeInTheDocument();
+    await renderComponent(brokerLogDirsPayload);
+    expect(screen.getByText('/opt/kafka/data-0/logs')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
index 0af9d1df4f0..9723149828c 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
@@ -7,12 +7,10 @@ import {
   getNonExactPath,
 } from 'lib/paths';
 import Broker from 'components/Brokers/Broker/Broker';
-import {
-  clusterStatsPayload,
-  brokersPayload,
-} from 'components/Brokers/__test__/fixtures';
 import { useBrokers } from 'lib/hooks/api/brokers';
 import { useClusterStats } from 'lib/hooks/api/clusters';
+import { brokersPayload } from 'lib/fixtures/brokers';
+import { clusterStatsPayload } from 'lib/fixtures/clusters';
 
 const clusterName = 'local';
 const brokerId = 1;
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
index f67dfd91745..550e8824d24 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
@@ -2,16 +2,13 @@ import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen, waitFor } from '@testing-library/dom';
 import { clusterBrokersPath } from 'lib/paths';
-import fetchMock from 'fetch-mock';
 import { act } from '@testing-library/react';
 import BrokersList from 'components/Brokers/BrokersList/BrokersList';
-import {
-  brokersPayload,
-  clusterStatsPayload,
-} from 'components/Brokers/__test__/fixtures';
 import userEvent from '@testing-library/user-event';
 import { useBrokers } from 'lib/hooks/api/brokers';
 import { useClusterStats } from 'lib/hooks/api/clusters';
+import { brokersPayload } from 'lib/fixtures/brokers';
+import { clusterStatsPayload } from 'lib/fixtures/clusters';
 
 const mockedUsedNavigate = jest.fn();
 
@@ -28,8 +25,6 @@ jest.mock('lib/hooks/api/clusters', () => ({
 }));
 
 describe('BrokersList Component', () => {
-  afterEach(() => fetchMock.reset());
-
   const clusterName = 'local';
 
   const testInSyncReplicasCount = 798;
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx b/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx
index e41717fe9da..85fe55eb24d 100644
--- a/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx
@@ -2,7 +2,7 @@ import {
   translateLogdir,
   translateLogdirs,
 } from 'components/Brokers/utils/translateLogdirs';
-import { brokerLogDirsPayload } from 'components/Brokers/__test__/fixtures';
+import { brokerLogDirsPayload } from 'lib/fixtures/brokers';
 
 import {
   defaultTransformedBrokerLogDirsPayload,
diff --git a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
index f41d75840d0..b718db8b299 100644
--- a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Cluster, ClusterFeaturesEnum } from 'generated-sources';
 import ClusterComponent from 'components/Cluster/Cluster';
-import { screen, waitFor } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
 import {
   clusterBrokersPath,
@@ -14,9 +14,8 @@ import {
   clusterTopicsPath,
 } from 'lib/paths';
 import { act } from 'react-dom/test-utils';
-import fetchMock from 'fetch-mock';
-
-import { onlineClusterPayload } from './fixtures';
+import { useClusters } from 'lib/hooks/api/clusters';
+import { onlineClusterPayload } from 'lib/fixtures/clusters';
 
 const CLusterCompText = {
   Topics: 'Topics',
@@ -46,11 +45,15 @@ jest.mock('components/KsqlDb/KsqlDb', () => () => (
   <div>{CLusterCompText.KsqlDb}</div>
 ));
 
-describe('Cluster', () => {
-  afterEach(() => fetchMock.restore());
+jest.mock('lib/hooks/api/clusters', () => ({
+  useClusters: jest.fn(),
+}));
 
+describe('Cluster', () => {
   const renderComponent = async (pathname: string, payload: Cluster[] = []) => {
-    const mock = fetchMock.get('/api/clusters', payload);
+    (useClusters as jest.Mock).mockImplementation(() => ({
+      data: payload,
+    }));
     await act(() => {
       render(
         <WithRoute path={`${clusterPath()}/*`}>
@@ -59,7 +62,6 @@ describe('Cluster', () => {
         { initialEntries: [pathname] }
       );
     });
-    return waitFor(() => expect(mock.called()).toBeTruthy());
   };
 
   it('renders Brokers', async () => {
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index 64cef62a375..3d0c788a905 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { useNavigate } from 'react-router-dom';
-import { useIsMutating } from 'react-query';
+import { useIsMutating } from '@tanstack/react-query';
 import { ConnectorState, ConnectorAction } from 'generated-sources';
 import useAppParams from 'lib/hooks/useAppParams';
 import useModal from 'lib/hooks/useModal';
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
index b9d697b8834..a76b8092f25 100644
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
@@ -7,7 +7,6 @@ import ClusterContext, {
 import List from 'components/Connect/List/List';
 import { screen } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
-import fetchMock from 'fetch-mock';
 import { clusterConnectorsPath } from 'lib/paths';
 import { useConnectors } from 'lib/hooks/api/kafkaConnect';
 
@@ -23,8 +22,6 @@ jest.mock('lib/hooks/api/kafkaConnect', () => ({
 const clusterName = 'local';
 
 describe('Connectors List', () => {
-  afterEach(() => fetchMock.restore());
-
   const renderComponent = (contextValue: ContextProps = initialValue) =>
     render(
       <ClusterContext.Provider value={contextValue}>
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx
index e41e3fd4183..18166c4c9e7 100644
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx
@@ -7,7 +7,6 @@ import ClusterContext, {
 import ListPage from 'components/Connect/List/ListPage';
 import { screen, within } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
-import fetchMock from 'fetch-mock';
 import { clusterConnectorsPath } from 'lib/paths';
 import { useConnectors } from 'lib/hooks/api/kafkaConnect';
 
@@ -22,8 +21,6 @@ jest.mock('lib/hooks/api/kafkaConnect', () => ({
 const clusterName = 'local';
 
 describe('Connectors List Page', () => {
-  afterEach(() => fetchMock.restore());
-
   beforeEach(() => {
     (useConnectors as jest.Mock).mockImplementation(() => ({
       isLoading: false,
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
index 9c199ecbc7a..c5fa81342c6 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
@@ -1,21 +1,24 @@
 import React from 'react';
-import { act, screen, waitFor } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import ClustersWidget from 'components/Dashboard/ClustersWidget/ClustersWidget';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
-import fetchMock from 'fetch-mock';
-import { clustersPayload } from 'components/Cluster/__tests__/fixtures';
+import { useClusters } from 'lib/hooks/api/clusters';
+import { clustersPayload } from 'lib/fixtures/clusters';
 
-describe('ClustersWidget', () => {
-  afterEach(() => fetchMock.restore());
+jest.mock('lib/hooks/api/clusters', () => ({
+  useClusters: jest.fn(),
+}));
 
+describe('ClustersWidget', () => {
   beforeEach(async () => {
-    const mock = fetchMock.get('/api/clusters', clustersPayload);
-
+    (useClusters as jest.Mock).mockImplementation(() => ({
+      data: clustersPayload,
+      isSuccess: true,
+    }));
     await act(() => {
       render(<ClustersWidget />);
     });
-    await waitFor(() => expect(mock.called()).toBeTruthy());
   });
 
   it('renders clusterWidget list', () => {
diff --git a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx
index 0dbd0bf2650..11d273c6ece 100644
--- a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx
+++ b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx
@@ -5,7 +5,7 @@ import ClusterMenu from 'components/Nav/ClusterMenu';
 import userEvent from '@testing-library/user-event';
 import { clusterConnectorsPath } from 'lib/paths';
 import { render } from 'lib/testHelpers';
-import { onlineClusterPayload } from 'components/Cluster/__tests__/fixtures';
+import { onlineClusterPayload } from 'lib/fixtures/clusters';
 
 describe('ClusterMenu', () => {
   const setupComponent = (cluster: Cluster, singleMode?: boolean) => (
diff --git a/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx b/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx
index 299463af5f9..023fdfdba7e 100644
--- a/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx
+++ b/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx
@@ -1,24 +1,28 @@
 import React from 'react';
 import Nav from 'components/Nav/Nav';
-import { screen, waitFor } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
+import { act } from 'react-dom/test-utils';
+import { Cluster } from 'generated-sources';
+import { useClusters } from 'lib/hooks/api/clusters';
 import {
   offlineClusterPayload,
   onlineClusterPayload,
-} from 'components/Cluster/__tests__/fixtures';
-import fetchMock from 'fetch-mock';
-import { act } from 'react-dom/test-utils';
-import { Cluster } from 'generated-sources';
+} from 'lib/fixtures/clusters';
 
-describe('Nav', () => {
-  afterEach(() => fetchMock.restore());
+jest.mock('lib/hooks/api/clusters', () => ({
+  useClusters: jest.fn(),
+}));
 
+describe('Nav', () => {
   const renderComponent = async (payload: Cluster[] = []) => {
-    const mock = fetchMock.get('/api/clusters', payload);
+    (useClusters as jest.Mock).mockImplementation(() => ({
+      data: payload,
+      isSuccess: true,
+    }));
     await act(() => {
       render(<Nav />);
     });
-    return waitFor(() => expect(mock.called()).toBeTruthy());
   };
 
   const getDashboard = () => screen.getByText('Dashboard');
diff --git a/kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts b/kafka-ui-react-app/src/lib/fixtures/brokers.ts
similarity index 65%
rename from kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts
rename to kafka-ui-react-app/src/lib/fixtures/brokers.ts
index 54601db00e4..37e3f7ecfb5 100644
--- a/kafka-ui-react-app/src/components/Brokers/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/brokers.ts
@@ -5,21 +5,6 @@ export const brokersPayload = [
   { id: 2, host: 'b-2.test.kafka.amazonaws.com', port: 9092 },
 ];
 
-export const clusterStatsPayload = {
-  brokerCount: 2,
-  activeControllers: 1,
-  onlinePartitionCount: 138,
-  offlinePartitionCount: 0,
-  inSyncReplicasCount: 239,
-  outOfSyncReplicasCount: 0,
-  underReplicatedPartitionCount: 0,
-  diskUsage: [
-    { brokerId: 0, segmentSize: 334567, segmentCount: 245 },
-    { brokerId: 1, segmentSize: 12345678, segmentCount: 121 },
-  ],
-  version: '2.2.1',
-};
-
 const partition = {
   broker: 2,
   offsetLag: 0,
diff --git a/kafka-ui-react-app/src/components/Cluster/__tests__/fixtures.ts b/kafka-ui-react-app/src/lib/fixtures/clusters.ts
similarity index 63%
rename from kafka-ui-react-app/src/components/Cluster/__tests__/fixtures.ts
rename to kafka-ui-react-app/src/lib/fixtures/clusters.ts
index deb1585982b..2b1cc8f8f51 100644
--- a/kafka-ui-react-app/src/components/Cluster/__tests__/fixtures.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/clusters.ts
@@ -29,3 +29,18 @@ export const clustersPayload: Cluster[] = [
   onlineClusterPayload,
   offlineClusterPayload,
 ];
+
+export const clusterStatsPayload = {
+  brokerCount: 2,
+  activeControllers: 1,
+  onlinePartitionCount: 138,
+  offlinePartitionCount: 0,
+  inSyncReplicasCount: 239,
+  outOfSyncReplicasCount: 0,
+  underReplicatedPartitionCount: 0,
+  diskUsage: [
+    { brokerId: 0, segmentSize: 334567, segmentCount: 245 },
+    { brokerId: 1, segmentSize: 12345678, segmentCount: 121 },
+  ],
+  version: '2.2.1',
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts
index bf024f5c68a..b67df5348ee 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts
@@ -3,7 +3,7 @@ import { renderQueryHook, TestQueryClientProvider } from 'lib/testHelpers';
 import * as hooks from 'lib/hooks/api/kafkaConnect';
 import fetchMock from 'fetch-mock';
 import { connectors, connects, tasks } from 'lib/fixtures/kafkaConnect';
-import { UseQueryResult } from 'react-query';
+import { UseQueryResult } from '@tanstack/react-query';
 import { ConnectorAction } from 'generated-sources';
 
 const clusterName = 'test-cluster';
diff --git a/kafka-ui-react-app/src/lib/hooks/api/brokers.ts b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
index f60db12e3a1..3b7af3f7426 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
@@ -1,5 +1,5 @@
 import { brokersApiClient as api } from 'lib/api';
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { ClusterName } from 'redux/interfaces';
 
 export function useBrokers(clusterName: ClusterName) {
diff --git a/kafka-ui-react-app/src/lib/hooks/api/clusters.ts b/kafka-ui-react-app/src/lib/hooks/api/clusters.ts
index 9ff067d6b1f..c56f9bfc322 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/clusters.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/clusters.ts
@@ -1,5 +1,5 @@
 import { clustersApiClient as api } from 'lib/api';
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { ClusterName } from 'redux/interfaces';
 
 export function useClusters() {
diff --git a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
index 364b7618d88..49983da82ae 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
@@ -6,7 +6,7 @@ import {
 } from 'generated-sources';
 import { kafkaConnectApiClient as api } from 'lib/api';
 import sortBy from 'lodash/sortBy';
-import { useMutation, useQuery, useQueryClient } from 'react-query';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { ClusterName } from 'redux/interfaces';
 
 interface UseConnectorProps {
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index 14db7e87395..cc71b1d8ed1 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -13,7 +13,11 @@ import { AnyAction, Store } from 'redux';
 import { RootState } from 'redux/interfaces';
 import { configureStore } from '@reduxjs/toolkit';
 import rootReducer from 'redux/reducers';
-import { QueryClient, QueryClientProvider, UseQueryResult } from 'react-query';
+import {
+  QueryClient,
+  QueryClientProvider,
+  UseQueryResult,
+} from '@tanstack/react-query';
 
 interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
   preloadedState?: Partial<RootState>;

From 6891f71452d2f2cb78daf7e9b21106fc571a4355 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Thu, 21 Jul 2022 14:03:13 +0400
Subject: [PATCH 083/734] fixing create schema page validation issue (#2313)

---
 kafka-ui-react-app/src/components/Schemas/New/New.tsx      | 7 ++++++-
 .../src/components/Topics/List/ActionsCell/ActionsCell.tsx | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.tsx b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
index 1aa843d6b59..e1474c15835 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
@@ -32,7 +32,12 @@ const New: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const navigate = useNavigate();
   const dispatch = useAppDispatch();
-  const methods = useForm<NewSchemaSubjectRaw>({ mode: 'onChange' });
+  const methods = useForm<NewSchemaSubjectRaw>({
+    mode: 'onChange',
+    defaultValues: {
+      schemaType: SchemaType.AVRO,
+    },
+  });
   const {
     register,
     handleSubmit,
diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
index 617dc8f4928..2ab2bb7a6dd 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
-import { useDispatch } from 'react-redux';
 import {
   CleanUpPolicy,
   SortOrder,
   TopicColumnsToSort,
 } from 'generated-sources';
+import { useAppDispatch } from 'lib/hooks/redux';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import DropdownItem from 'components/common/Dropdown/DropdownItem';
 import { TableCellProps } from 'components/common/SmartTable/TableColumn';
@@ -45,7 +45,7 @@ const ActionsCell: React.FC<
 }) => {
   const { isReadOnly, isTopicDeletionAllowed } =
     React.useContext(ClusterContext);
-  const dispatch = useDispatch();
+  const dispatch = useAppDispatch();
   const { clusterName } = useAppParams<ClusterNameRoute>();
 
   const {

From 48325bc5adf446cf14763d298d19202c83d67e01 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Thu, 21 Jul 2022 16:57:49 +0400
Subject: [PATCH 084/734] fixing newest first mode issue and actionscell
 dispatch issue (#2305)

---
 .../Topic/Details/Messages/Filters/Filters.tsx       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
index d044fefabf9..5cf9b2af573 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
@@ -192,7 +192,17 @@ const Filters: React.FC<FiltersProps> = ({
       setAttempt(attempt + 1);
 
       if (isSeekTypeControlVisible) {
-        props.seekType = isLive ? SeekType.LATEST : currentSeekType;
+        switch (seekDirection) {
+          case SeekDirection.FORWARD:
+            props.seekType = SeekType.BEGINNING;
+            break;
+          case SeekDirection.BACKWARD:
+          case SeekDirection.TAILING:
+            props.seekType = SeekType.LATEST;
+            break;
+          default:
+            props.seekType = currentSeekType;
+        }
         props.seekTo = selectedPartitions.map(({ value }) => {
           const offsetProperty =
             seekDirection === SeekDirection.FORWARD ? 'offsetMin' : 'offsetMax';

From bffe316063e6c68b9d48ee18cdb92d2974e7c58c Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 25 Jul 2022 14:16:00 +0300
Subject: [PATCH 085/734] Use react-hot-toaster for alerts (#2312)

* Use react-hot-toaster for alerts

* Fix linting problems
---
 kafka-ui-react-app/package.json               |   1 +
 kafka-ui-react-app/pnpm-lock.yaml             |  22 ++++
 .../src/components/Alerts/Alerts.tsx          |  28 -----
 .../Alerts/__tests__/Alerts.spec.tsx          |  49 ---------
 .../src/components/App.styled.ts              |  17 +--
 kafka-ui-react-app/src/components/App.tsx     |  12 ++-
 .../src/components/KsqlDb/Query/Query.tsx     |  48 ++-------
 .../components/Schemas/Details/Details.tsx    |   6 +-
 .../src/components/Schemas/Edit/Edit.tsx      |   6 +-
 .../GlobalSchemaSelector.tsx                  |   6 +-
 .../src/components/Schemas/New/New.tsx        |   6 +-
 .../Topics/Topic/SendMessage/SendMessage.tsx  |  32 ++----
 .../SendMessage/__test__/SendMessage.spec.tsx |  33 +++---
 .../{Alerts => common/Alert}/Alert.styled.ts  |   4 +-
 .../{Alerts => common/Alert}/Alert.tsx        |  11 +-
 .../Alert}/__tests__/Alert.spec.tsx           |   5 +-
 .../components/common/Metrics/Indicator.tsx   |   3 +-
 .../common/Metrics/Metrics.styled.tsx         |   3 +-
 kafka-ui-react-app/src/lib/errorHandling.ts   |  18 ----
 kafka-ui-react-app/src/lib/errorHandling.tsx  |  76 +++++++++++++
 .../src/lib/hooks/useDataSaver.ts             |  21 ++--
 .../src/redux/interfaces/alerts.ts            |  19 ----
 .../src/redux/interfaces/index.ts             |   1 -
 .../src/redux/reducers/alerts/alertsSlice.ts  | 100 ------------------
 .../consumerGroups/consumerGroupsSlice.ts     |  17 ++-
 .../src/redux/reducers/index.ts               |   2 -
 .../redux/reducers/schemas/schemasSlice.ts    |   5 +-
 .../topicMessages/topicMessagesSlice.ts       |  18 ++--
 .../src/redux/reducers/topics/topicsSlice.ts  |  59 ++++++-----
 kafka-ui-react-app/src/theme/theme.ts         |   3 +
 30 files changed, 237 insertions(+), 394 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/Alerts/Alerts.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Alerts/__tests__/Alerts.spec.tsx
 rename kafka-ui-react-app/src/components/{Alerts => common/Alert}/Alert.styled.ts (86%)
 rename kafka-ui-react-app/src/components/{Alerts => common/Alert}/Alert.tsx (79%)
 rename kafka-ui-react-app/src/components/{Alerts => common/Alert}/__tests__/Alert.spec.tsx (87%)
 delete mode 100644 kafka-ui-react-app/src/lib/errorHandling.ts
 create mode 100644 kafka-ui-react-app/src/lib/errorHandling.tsx
 delete mode 100644 kafka-ui-react-app/src/redux/interfaces/alerts.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/alerts/alertsSlice.ts

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 9b3e523f6c9..8dfb1fcd5d5 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -34,6 +34,7 @@
     "react-datepicker": "^4.8.0",
     "react-dom": "^18.1.0",
     "react-hook-form": "7.6.9",
+    "react-hot-toast": "^2.3.0",
     "react-is": "^18.2.0",
     "react-multi-select-component": "^4.0.6",
     "react-redux": "^8.0.2",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index d2128a2b5b9..32fcce3a9ca 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -70,6 +70,7 @@ specifiers:
   react-datepicker: ^4.8.0
   react-dom: ^18.1.0
   react-hook-form: 7.6.9
+  react-hot-toast: ^2.3.0
   react-is: ^18.2.0
   react-multi-select-component: ^4.0.6
   react-redux: ^8.0.2
@@ -119,6 +120,7 @@ dependencies:
   react-datepicker: 4.8.0_ef5jwxihqo6n7gxfmzogljlgcm
   react-dom: 18.1.0_react@18.1.0
   react-hook-form: 7.6.9_react@18.1.0
+  react-hot-toast: 2.3.0_ef5jwxihqo6n7gxfmzogljlgcm
   react-is: 18.2.0
   react-multi-select-component: 4.0.6_react@18.1.0
   react-redux: 8.0.2_nfqigfgwurfoimtkde74cji6ga
@@ -4957,6 +4959,12 @@ packages:
   /globrex/0.1.2:
     resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
 
+  /goober/2.1.10:
+    resolution: {integrity: sha512-7PpuQMH10jaTWm33sQgBQvz45pHR8N4l3Cu3WMGEWmHShAcTuuP7I+5/DwKo39fwti5A80WAjvqgz6SSlgWmGA==}
+    peerDependencies:
+      csstype: ^3.0.10
+    dev: false
+
   /graceful-fs/4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
@@ -6632,6 +6640,20 @@ packages:
       react: 18.1.0
     dev: false
 
+  /react-hot-toast/2.3.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-/RxV+bfjld7tSJR1SCLzMAXgFuNW7fCpK6+vbYqfmbGSWcqTMz2rizrvfWKvtcPH5HK0NqxmBaC5SrAy1F42zA==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      react: '>=16'
+      react-dom: '>=16'
+    dependencies:
+      goober: 2.1.10
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+    transitivePeerDependencies:
+      - csstype
+    dev: false
+
   /react-is/16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
 
diff --git a/kafka-ui-react-app/src/components/Alerts/Alerts.tsx b/kafka-ui-react-app/src/components/Alerts/Alerts.tsx
deleted file mode 100644
index 11249dceaea..00000000000
--- a/kafka-ui-react-app/src/components/Alerts/Alerts.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from 'react';
-import { alertDissmissed, selectAll } from 'redux/reducers/alerts/alertsSlice';
-import { useAppSelector, useAppDispatch } from 'lib/hooks/redux';
-import Alert from 'components/Alerts/Alert';
-
-const Alerts: React.FC = () => {
-  const alerts = useAppSelector(selectAll);
-  const dispatch = useAppDispatch();
-  const dismiss = (id: string) => () => {
-    dispatch(alertDissmissed(id));
-  };
-
-  return (
-    <>
-      {alerts.map(({ id, type, title, message }) => (
-        <Alert
-          key={id}
-          type={type}
-          title={title}
-          message={message}
-          onDissmiss={dismiss(id)}
-        />
-      ))}
-    </>
-  );
-};
-
-export default Alerts;
diff --git a/kafka-ui-react-app/src/components/Alerts/__tests__/Alerts.spec.tsx b/kafka-ui-react-app/src/components/Alerts/__tests__/Alerts.spec.tsx
deleted file mode 100644
index ee9fd0bacf2..00000000000
--- a/kafka-ui-react-app/src/components/Alerts/__tests__/Alerts.spec.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import { ServerResponse } from 'redux/interfaces';
-import { act, screen } from '@testing-library/react';
-import Alerts from 'components/Alerts/Alerts';
-import { render } from 'lib/testHelpers';
-import { store } from 'redux/store';
-import { UnknownAsyncThunkRejectedWithValueAction } from '@reduxjs/toolkit/dist/matchers';
-import userEvent from '@testing-library/user-event';
-
-const payload: ServerResponse = {
-  status: 422,
-  statusText: 'Unprocessable Entity',
-  message: 'Unprocessable Entity',
-  url: 'https://test.com/clusters',
-};
-const action: UnknownAsyncThunkRejectedWithValueAction = {
-  type: 'any/action/rejected',
-  payload,
-  meta: {
-    arg: 'test',
-    requestId: 'test-request-id',
-    requestStatus: 'rejected',
-    aborted: false,
-    condition: false,
-    rejectedWithValue: true,
-  },
-  error: { message: 'Rejected' },
-};
-
-describe('Alerts', () => {
-  it('renders alerts', async () => {
-    store.dispatch(action);
-
-    await act(() => {
-      render(<Alerts />, { store });
-    });
-
-    expect(screen.getAllByRole('alert').length).toEqual(1);
-
-    const dissmissAlertButtons = screen.getAllByRole('button');
-    expect(dissmissAlertButtons.length).toEqual(1);
-
-    const dissmissButton = dissmissAlertButtons[0];
-
-    userEvent.click(dissmissButton);
-
-    expect(screen.queryAllByRole('alert').length).toEqual(0);
-  });
-});
diff --git a/kafka-ui-react-app/src/components/App.styled.ts b/kafka-ui-react-app/src/components/App.styled.ts
index cd79fe62497..71353f08762 100644
--- a/kafka-ui-react-app/src/components/App.styled.ts
+++ b/kafka-ui-react-app/src/components/App.styled.ts
@@ -44,7 +44,9 @@ export const Sidebar = styled.div<{ $visible: boolean }>(
     background: ${theme.menu.backgroundColor.normal};
     @media screen and (max-width: 1023px) {
       ${$visible &&
-      `transform: translate3d(${theme.layout.navBarWidth}, 0, 0)`};
+      css`
+        transform: translate3d(${theme.layout.navBarWidth}, 0, 0);
+      `};
       left: -${theme.layout.navBarWidth};
       z-index: 100;
     }
@@ -234,19 +236,6 @@ export const Hyperlink = styled(Link)(
   `
 );
 
-export const AlertsContainer = styled.div`
-  max-width: 40%;
-  width: 500px;
-  position: fixed;
-  bottom: 15px;
-  right: 15px;
-  z-index: 1000;
-
-  @media screen and (max-width: 1023px) {
-    max-width: initial;
-  }
-`;
-
 export const LogoutButton = styled(Button)(
   ({ theme }) => css`
     color: ${theme.button.primary.invertedColors.normal};
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 0d23fc70b3f..9de19134eaa 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -7,10 +7,11 @@ import PageLoader from 'components/common/PageLoader/PageLoader';
 import Dashboard from 'components/Dashboard/Dashboard';
 import ClusterPage from 'components/Cluster/Cluster';
 import Version from 'components/Version/Version';
-import Alerts from 'components/Alerts/Alerts';
 import { ThemeProvider } from 'styled-components';
 import theme from 'theme/theme';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { showServerError } from 'lib/errorHandling';
+import { Toaster } from 'react-hot-toast';
 
 import * as S from './App.styled';
 import Logo from './common/Logo/Logo';
@@ -22,6 +23,11 @@ const queryClient = new QueryClient({
     queries: {
       suspense: true,
     },
+    mutations: {
+      onError(error) {
+        showServerError(error as Response);
+      },
+    },
   },
 });
 
@@ -113,9 +119,7 @@ const App: React.FC = () => {
               />
             </Routes>
           </S.Container>
-          <S.AlertsContainer role="toolbar">
-            <Alerts />
-          </S.AlertsContainer>
+          <Toaster position="bottom-right" />
         </S.Layout>
       </ThemeProvider>
     </QueryClientProvider>
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
index 6dfee760000..d7ddd6df17c 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
@@ -8,17 +8,14 @@ import {
 import { getKsqlExecution } from 'redux/reducers/ksqlDb/selectors';
 import { BASE_PARAMS } from 'lib/constants';
 import { KsqlResponse, KsqlTableResponse } from 'generated-sources';
-import { alertAdded, alertDissmissed } from 'redux/reducers/alerts/alertsSlice';
-import now from 'lodash/now';
 import { ClusterNameRoute } from 'lib/paths';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
+import { showAlert, showSuccessAlert } from 'lib/errorHandling';
 
 import type { FormValues } from './QueryForm/QueryForm';
 import * as S from './Query.styled';
 import QueryForm from './QueryForm/QueryForm';
 
-const AUTO_DISMISS_TIME = 8_000;
-
 export const getFormattedErrorFromTableData = (
   responseValues: KsqlTableResponse['values']
 ): { title: string; message: string } => {
@@ -116,15 +113,7 @@ const Query: FC = () => {
                 table.values
               );
               const id = `${url}-executionError`;
-              dispatch(
-                alertAdded({
-                  id,
-                  type: 'error',
-                  title,
-                  message,
-                  createdAt: now(),
-                })
-              );
+              showAlert('error', { id, title, message });
               break;
             }
             case 'Schema': {
@@ -146,19 +135,7 @@ const Query: FC = () => {
             }
             case 'Query Result': {
               const id = `${url}-querySuccess`;
-              dispatch(
-                alertAdded({
-                  id,
-                  type: 'success',
-                  title: 'Query succeed',
-                  message: '',
-                  createdAt: now(),
-                })
-              );
-
-              setTimeout(() => {
-                dispatch(alertDissmissed(id));
-              }, AUTO_DISMISS_TIME);
+              showSuccessAlert({ id, title: 'Query succeed', message: '' });
               break;
             }
             case 'Source Description':
@@ -175,20 +152,11 @@ const Query: FC = () => {
       sse.onerror = () => {
         // if it's open - we know that server responded without opening SSE
         if (!sseRef.current.isOpen) {
-          const id = `${url}-connectionClosedError`;
-          dispatch(
-            alertAdded({
-              id,
-              type: 'error',
-              title: 'SSE connection closed',
-              message: '',
-              createdAt: now(),
-            })
-          );
-
-          setTimeout(() => {
-            dispatch(alertDissmissed(id));
-          }, AUTO_DISMISS_TIME);
+          showAlert('error', {
+            id: `${url}-connectionClosedError`,
+            title: '',
+            message: 'SSE connection closed',
+          });
         }
         destroySSE();
       };
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index 299b0984b13..9424409d761 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -26,8 +26,7 @@ import {
   selectAllSchemaVersions,
   getSchemaLatest,
 } from 'redux/reducers/schemas/schemasSlice';
-import { serverErrorAlertAdded } from 'redux/reducers/alerts/alertsSlice';
-import { getResponse } from 'lib/errorHandling';
+import { showServerError } from 'lib/errorHandling';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 import { TableTitle } from 'components/common/table/TableTitle/TableTitle.styled';
 import useAppParams from 'lib/hooks/useAppParams';
@@ -73,8 +72,7 @@ const Details: React.FC = () => {
       });
       navigate('../');
     } catch (e) {
-      const err = await getResponse(e as Response);
-      dispatch(serverErrorAlertAdded(err));
+      showServerError(e as Response);
     }
   };
 
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
index 1b960675ec6..7f4ea4491b5 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
@@ -22,11 +22,10 @@ import {
   getAreSchemaLatestFulfilled,
   schemaUpdated,
 } from 'redux/reducers/schemas/schemasSlice';
-import { serverErrorAlertAdded } from 'redux/reducers/alerts/alertsSlice';
-import { getResponse } from 'lib/errorHandling';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 import { schemasApiClient } from 'lib/api';
+import { showServerError } from 'lib/errorHandling';
 
 import * as S from './Edit.styled';
 
@@ -91,8 +90,7 @@ const Edit: React.FC = () => {
 
       navigate(clusterSchemaPath(clusterName, subject));
     } catch (e) {
-      const err = await getResponse(e as Response);
-      dispatch(serverErrorAlertAdded(err));
+      showServerError(e as Response);
     }
   };
 
diff --git a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
index dfe84c8f02e..0bdd601a6f9 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
@@ -2,15 +2,14 @@ import React from 'react';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import Select from 'components/common/Select/Select';
 import { CompatibilityLevelCompatibilityEnum } from 'generated-sources';
-import { getResponse } from 'lib/errorHandling';
 import { useAppDispatch } from 'lib/hooks/redux';
 import usePagination from 'lib/hooks/usePagination';
 import useSearch from 'lib/hooks/useSearch';
 import useAppParams from 'lib/hooks/useAppParams';
-import { serverErrorAlertAdded } from 'redux/reducers/alerts/alertsSlice';
 import { fetchSchemas } from 'redux/reducers/schemas/schemasSlice';
 import { ClusterNameRoute } from 'lib/paths';
 import { schemasApiClient } from 'lib/api';
+import { showServerError } from 'lib/errorHandling';
 
 import * as S from './GlobalSchemaSelector.styled';
 
@@ -69,8 +68,7 @@ const GlobalSchemaSelector: React.FC = () => {
           fetchSchemas({ clusterName, page, perPage, search: searchText })
         );
       } catch (e) {
-        const err = await getResponse(e as Response);
-        dispatch(serverErrorAlertAdded(err));
+        showServerError(e as Response);
       }
     }
     setIsUpdating(false);
diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.tsx b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
index e1474c15835..c3d9ba70034 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
@@ -16,8 +16,7 @@ import PageHeading from 'components/common/PageHeading/PageHeading';
 import { schemaAdded } from 'redux/reducers/schemas/schemasSlice';
 import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
-import { serverErrorAlertAdded } from 'redux/reducers/alerts/alertsSlice';
-import { getResponse } from 'lib/errorHandling';
+import { showServerError } from 'lib/errorHandling';
 import { schemasApiClient } from 'lib/api';
 
 import * as S from './New.styled';
@@ -58,8 +57,7 @@ const New: React.FC = () => {
       dispatch(schemaAdded(resp));
       navigate(clusterSchemaPath(clusterName, subject));
     } catch (e) {
-      const err = await getResponse(e as Response);
-      dispatch(serverErrorAlertAdded(err));
+      showServerError(e as Response);
     }
   };
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 5889b7cb3bc..3e7734a1115 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -11,8 +11,6 @@ import {
   fetchTopicDetails,
 } from 'redux/reducers/topics/topicsSlice';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
-import { alertAdded } from 'redux/reducers/alerts/alertsSlice';
-import now from 'lodash/now';
 import { Button } from 'components/common/Button/Button';
 import Editor from 'components/common/Editor/Editor';
 import PageLoader from 'components/common/PageLoader/PageLoader';
@@ -25,7 +23,7 @@ import Select, { SelectOption } from 'components/common/Select/Select';
 import useAppParams from 'lib/hooks/useAppParams';
 import Heading from 'components/common/heading/Heading.styled';
 import { messagesApiClient } from 'lib/api';
-import { getResponse } from 'lib/errorHandling';
+import { showAlert, showServerError } from 'lib/errorHandling';
 
 import validateMessage from './validateMessage';
 import * as S from './SendMessage.styled';
@@ -123,15 +121,11 @@ const SendMessage: React.FC = () => {
       }
       if (errors.length > 0) {
         const errorsHtml = errors.map((e) => `<li>${e}</li>`).join('');
-        dispatch(
-          alertAdded({
-            id: `${clusterName}-${topicName}-createTopicMessageError`,
-            type: 'error',
-            title: 'Validation Error',
-            message: `<ul>${errorsHtml}</ul>`,
-            createdAt: now(),
-          })
-        );
+        showAlert('error', {
+          id: `${clusterName}-${topicName}-createTopicMessageError`,
+          title: 'Validation Error',
+          message: `<ul>${errorsHtml}</ul>`,
+        });
         return;
       }
       const headers = data.headers ? JSON.parse(data.headers) : undefined;
@@ -148,16 +142,10 @@ const SendMessage: React.FC = () => {
         });
         dispatch(fetchTopicDetails({ clusterName, topicName }));
       } catch (e) {
-        const err = await getResponse(e as Response);
-        dispatch(
-          alertAdded({
-            id: `${clusterName}-${topicName}-sendTopicMessagesError`,
-            type: 'error',
-            title: `Error in sending a message to ${topicName}`,
-            message: err?.message || '',
-            createdAt: now(),
-          })
-        );
+        showServerError(e as Response, {
+          id: `${clusterName}-${topicName}-sendTopicMessagesError`,
+          message: `Error in sending a message to ${topicName}`,
+        });
       }
       navigate(`../${clusterTopicMessagesRelativePath}`);
     }
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
index ec37ec33200..76610d820ad 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
@@ -12,8 +12,7 @@ import { store } from 'redux/store';
 import { fetchTopicDetails } from 'redux/reducers/topics/topicsSlice';
 import { externalTopicPayload } from 'redux/reducers/topics/__test__/fixtures';
 import validateMessage from 'components/Topics/Topic/SendMessage/validateMessage';
-import Alerts from 'components/Alerts/Alerts';
-import * as S from 'components/App.styled';
+import { showServerError } from 'lib/errorHandling';
 
 import { testSchema } from './fixtures';
 
@@ -32,6 +31,11 @@ jest.mock('components/Topics/Topic/SendMessage/validateMessage', () =>
   jest.fn()
 );
 
+jest.mock('lib/errorHandling', () => ({
+  ...jest.requireActual('lib/errorHandling'),
+  showServerError: jest.fn(),
+}));
+
 const mockNavigate = jest.fn();
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
@@ -44,14 +48,9 @@ const topicName = externalTopicPayload.name;
 const renderComponent = async () => {
   await act(() => {
     render(
-      <>
-        <WithRoute path={clusterTopicSendMessagePath()}>
-          <SendMessage />
-        </WithRoute>
-        <S.AlertsContainer role="toolbar">
-          <Alerts />
-        </S.AlertsContainer>
-      </>,
+      <WithRoute path={clusterTopicSendMessagePath()}>
+        <SendMessage />
+      </WithRoute>,
       {
         initialEntries: [clusterTopicSendMessagePath(clusterName, topicName)],
         store,
@@ -101,9 +100,7 @@ describe('SendMessage', () => {
       `/api/clusters/${clusterName}/topics/${topicName}/messages/schema`,
       testSchema
     );
-    await act(() => {
-      renderComponent();
-    });
+    await renderComponent();
     expect(fetchTopicMessageSchemaMock.called()).toBeTruthy();
   });
 
@@ -121,7 +118,6 @@ describe('SendMessage', () => {
     it('calls sendTopicMessage on submit', async () => {
       const sendTopicMessageMock = fetchMock.postOnce(messagesUrl, 200);
       const fetchTopicDetailsMock = fetchMock.getOnce(detailsUrl, 200);
-
       await renderAndSubmitData();
       expect(sendTopicMessageMock.called(messagesUrl)).toBeTruthy();
       expect(fetchTopicDetailsMock.called(detailsUrl)).toBeTruthy();
@@ -131,6 +127,8 @@ describe('SendMessage', () => {
     });
 
     it('should make the sendTopicMessage but most find an error within it', async () => {
+      const showServerErrorMock = jest.fn();
+      (showServerError as jest.Mock).mockImplementation(showServerErrorMock);
       const sendTopicMessageMock = fetchMock.postOnce(messagesUrl, {
         throws: 'Error',
       });
@@ -138,7 +136,12 @@ describe('SendMessage', () => {
       await renderAndSubmitData();
       expect(sendTopicMessageMock.called()).toBeTruthy();
       expect(fetchTopicDetailsMock.called(detailsUrl)).toBeFalsy();
-      expect(screen.getByRole('alert')).toBeInTheDocument();
+
+      expect(showServerErrorMock).toHaveBeenCalledWith('Error', {
+        id: 'testCluster-external.topic-sendTopicMessagesError',
+        message: 'Error in sending a message to external.topic',
+      });
+
       expect(mockNavigate).toHaveBeenLastCalledWith(
         `../${clusterTopicMessagesRelativePath}`
       );
diff --git a/kafka-ui-react-app/src/components/Alerts/Alert.styled.ts b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
similarity index 86%
rename from kafka-ui-react-app/src/components/Alerts/Alert.styled.ts
rename to kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
index 298f8749032..179db51ead6 100644
--- a/kafka-ui-react-app/src/components/Alerts/Alert.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
@@ -1,7 +1,7 @@
-import { AlertType } from 'redux/interfaces';
+import { ToastType } from 'react-hot-toast';
 import styled from 'styled-components';
 
-export const Alert = styled.div<{ $type: AlertType }>`
+export const Alert = styled.div<{ $type: ToastType }>`
   background-color: ${({ $type, theme }) => theme.alert.color[$type]};
   min-width: 400px;
   min-height: 64px;
diff --git a/kafka-ui-react-app/src/components/Alerts/Alert.tsx b/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
similarity index 79%
rename from kafka-ui-react-app/src/components/Alerts/Alert.tsx
rename to kafka-ui-react-app/src/components/common/Alert/Alert.tsx
index af564b23962..6a82e6f13ce 100644
--- a/kafka-ui-react-app/src/components/Alerts/Alert.tsx
+++ b/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
 import CloseIcon from 'components/common/Icons/CloseIcon';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
-import { Alert as AlertType } from 'redux/interfaces';
+import { ToastType } from 'react-hot-toast';
 
 import * as S from './Alert.styled';
 
-interface AlertProps {
-  title: AlertType['title'];
-  type: AlertType['type'];
-  message: AlertType['message'];
+export interface AlertProps {
+  title: string;
+  type: ToastType;
+  message: string;
   onDissmiss(): void;
 }
 
@@ -21,7 +21,6 @@ const Alert: React.FC<AlertProps> = ({ title, type, message, onDissmiss }) => (
         dangerouslySetInnerHTML={{ __html: message }}
       />
     </div>
-
     <IconButtonWrapper role="button" onClick={onDissmiss}>
       <CloseIcon />
     </IconButtonWrapper>
diff --git a/kafka-ui-react-app/src/components/Alerts/__tests__/Alert.spec.tsx b/kafka-ui-react-app/src/components/common/Alert/__tests__/Alert.spec.tsx
similarity index 87%
rename from kafka-ui-react-app/src/components/Alerts/__tests__/Alert.spec.tsx
rename to kafka-ui-react-app/src/components/common/Alert/__tests__/Alert.spec.tsx
index 382eff6fe99..a77f451b5e4 100644
--- a/kafka-ui-react-app/src/components/Alerts/__tests__/Alert.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Alert/__tests__/Alert.spec.tsx
@@ -1,11 +1,9 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { Alert as AlertProps } from 'redux/interfaces';
-import Alert from 'components/Alerts/Alert';
 import { render } from 'lib/testHelpers';
+import Alert, { AlertProps } from 'components/common/Alert/Alert';
 
-const id = 'test-id';
 const title = 'My Alert Title';
 const message = 'My Alert Message';
 const dismiss = jest.fn();
@@ -14,7 +12,6 @@ describe('Alert', () => {
   const setupComponent = (props: Partial<AlertProps> = {}) =>
     render(
       <Alert
-        id={id}
         type="error"
         title={title}
         message={message}
diff --git a/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx b/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx
index 2a092fe824c..1ebdeff6c85 100644
--- a/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx
+++ b/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx
@@ -1,5 +1,4 @@
 import React, { PropsWithChildren } from 'react';
-import { AlertType } from 'redux/interfaces';
 
 import * as S from './Metrics.styled';
 
@@ -8,7 +7,7 @@ export interface Props {
   isAlert?: boolean;
   label: React.ReactNode;
   title?: string;
-  alertType?: AlertType;
+  alertType?: 'success' | 'error' | 'warning' | 'info';
 }
 
 const Indicator: React.FC<PropsWithChildren<Props>> = ({
diff --git a/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx b/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx
index 9924c5ba13c..2d66121891c 100644
--- a/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx
@@ -1,5 +1,4 @@
 import styled, { css } from 'styled-components';
-import { AlertType } from 'redux/interfaces';
 
 export const Wrapper = styled.div`
   padding: 1.5rem 1rem;
@@ -75,7 +74,7 @@ export const CircularAlert = styled.circle.attrs({
   cy: 2,
   r: 2,
 })<{
-  $type: AlertType;
+  $type: 'error' | 'success' | 'warning' | 'info';
 }>(
   ({ theme, $type }) => css`
     fill: ${theme.circularAlert.color[$type]};
diff --git a/kafka-ui-react-app/src/lib/errorHandling.ts b/kafka-ui-react-app/src/lib/errorHandling.ts
deleted file mode 100644
index 1240a666c73..00000000000
--- a/kafka-ui-react-app/src/lib/errorHandling.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ServerResponse } from 'redux/interfaces';
-
-export const getResponse = async (
-  response: Response
-): Promise<ServerResponse> => {
-  let body;
-  try {
-    body = await response.json();
-  } catch (e) {
-    // do nothing;
-  }
-  return {
-    status: response.status,
-    statusText: response.statusText,
-    url: response.url,
-    message: body?.message,
-  };
-};
diff --git a/kafka-ui-react-app/src/lib/errorHandling.tsx b/kafka-ui-react-app/src/lib/errorHandling.tsx
new file mode 100644
index 00000000000..b839cfff358
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/errorHandling.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import Alert from 'components/common/Alert/Alert';
+import toast, { ToastType } from 'react-hot-toast';
+import { ErrorResponse } from 'generated-sources';
+
+interface ServerResponse {
+  status: number;
+  statusText: string;
+  url?: string;
+  message?: ErrorResponse['message'];
+}
+
+export const getResponse = async (
+  response: Response
+): Promise<ServerResponse> => {
+  let body;
+  try {
+    body = await response.json();
+  } catch (e) {
+    // do nothing;
+  }
+  return {
+    status: response.status,
+    statusText: response.statusText,
+    url: response.url,
+    message: body?.message,
+  };
+};
+
+interface AlertOptions {
+  id?: string;
+  title?: string;
+  message: string;
+}
+
+export const showAlert = (
+  type: ToastType,
+  { title, message, id }: AlertOptions
+) => {
+  toast.custom(
+    (t) => (
+      <Alert
+        title={title || ''}
+        type={type}
+        message={message}
+        onDissmiss={() => toast.remove(t.id)}
+      />
+    ),
+    { id }
+  );
+};
+
+export const showSuccessAlert = async (options: AlertOptions) => {
+  showAlert('success', {
+    ...options,
+    title: options.title || 'Success',
+  });
+};
+
+export const showServerError = async (
+  response: Response,
+  options?: AlertOptions
+) => {
+  let body: Record<string, string> = {};
+  try {
+    body = await response.json();
+  } catch (e) {
+    // do nothing;
+  }
+  showAlert('error', {
+    id: response.url,
+    title: `${response.status} ${response.statusText}`,
+    message: body?.message || 'An error occurred',
+    ...options,
+  });
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
index 91708659582..20c9cd2ac2b 100644
--- a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
@@ -1,29 +1,20 @@
 import isObject from 'lodash/isObject';
-import { alertAdded, alertDissmissed } from 'redux/reducers/alerts/alertsSlice';
-import { useAppDispatch } from 'lib/hooks/redux';
-
-const AUTO_DISMISS_TIME = 2000;
+import { showSuccessAlert } from 'lib/errorHandling';
 
 const useDataSaver = (
   subject: string,
   data: Record<string, string> | string
 ) => {
-  const dispatch = useAppDispatch();
   const copyToClipboard = () => {
     if (navigator.clipboard) {
       const str =
         typeof data === 'string' ? String(data) : JSON.stringify(data);
       navigator.clipboard.writeText(str);
-      dispatch(
-        alertAdded({
-          id: subject,
-          type: 'success',
-          title: '',
-          message: 'Copied successfully!',
-          createdAt: Date.now(),
-        })
-      );
-      setTimeout(() => dispatch(alertDissmissed(subject)), AUTO_DISMISS_TIME);
+      showSuccessAlert({
+        id: subject,
+        title: '',
+        message: 'Copied successfully!',
+      });
     }
   };
 
diff --git a/kafka-ui-react-app/src/redux/interfaces/alerts.ts b/kafka-ui-react-app/src/redux/interfaces/alerts.ts
deleted file mode 100644
index 7473ec7f000..00000000000
--- a/kafka-ui-react-app/src/redux/interfaces/alerts.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ErrorResponse } from 'generated-sources';
-
-export interface ServerResponse {
-  status: number;
-  statusText: string;
-  url?: string;
-  message?: ErrorResponse['message'];
-}
-
-export type AlertType = 'error' | 'success' | 'warning' | 'info';
-
-export interface Alert {
-  id: string;
-  type: AlertType;
-  title: string;
-  message: string;
-  response?: ServerResponse;
-  createdAt: number;
-}
diff --git a/kafka-ui-react-app/src/redux/interfaces/index.ts b/kafka-ui-react-app/src/redux/interfaces/index.ts
index c77496e848a..0c8ddf234e3 100644
--- a/kafka-ui-react-app/src/redux/interfaces/index.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/index.ts
@@ -6,7 +6,6 @@ export * from './cluster';
 export * from './consumerGroup';
 export * from './schema';
 export * from './loader';
-export * from './alerts';
 
 export type RootState = ReturnType<typeof rootReducer>;
 export type AppDispatch = typeof store.dispatch;
diff --git a/kafka-ui-react-app/src/redux/reducers/alerts/alertsSlice.ts b/kafka-ui-react-app/src/redux/reducers/alerts/alertsSlice.ts
deleted file mode 100644
index 1890ceb0257..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/alerts/alertsSlice.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import {
-  createAsyncThunk,
-  createEntityAdapter,
-  createSlice,
-  nanoid,
-  PayloadAction,
-} from '@reduxjs/toolkit';
-import { UnknownAsyncThunkRejectedWithValueAction } from '@reduxjs/toolkit/dist/matchers';
-import now from 'lodash/now';
-import { Alert, RootState, ServerResponse } from 'redux/interfaces';
-
-const alertsAdapter = createEntityAdapter<Alert>({
-  selectId: (alert) => alert.id,
-});
-
-const isServerResponse = (payload: unknown): payload is ServerResponse => {
-  if ((payload as ServerResponse).status) {
-    return true;
-  }
-  return false;
-};
-
-const transformResponseToAlert = (payload: ServerResponse) => {
-  const { status, statusText, message, url } = payload;
-  const alert: Alert = {
-    id: url || nanoid(),
-    type: 'error',
-    title: `${status} ${statusText}`,
-    message: message || '',
-    response: payload,
-    createdAt: now(),
-  };
-
-  return alert;
-};
-
-const alertsSlice = createSlice({
-  name: 'alerts',
-  initialState: alertsAdapter.getInitialState(),
-  reducers: {
-    alertDissmissed: alertsAdapter.removeOne,
-    alertAdded(state, action: PayloadAction<Alert>) {
-      alertsAdapter.upsertOne(state, action.payload);
-    },
-    serverErrorAlertAdded: (
-      state,
-      { payload }: PayloadAction<ServerResponse>
-    ) => {
-      alertsAdapter.upsertOne(state, transformResponseToAlert(payload));
-    },
-  },
-  extraReducers: (builder) => {
-    builder.addMatcher(
-      (action): action is UnknownAsyncThunkRejectedWithValueAction =>
-        action.type.endsWith('/rejected'),
-      (state, { meta, payload }) => {
-        const { rejectedWithValue } = meta;
-        if (rejectedWithValue && isServerResponse(payload)) {
-          alertsAdapter.upsertOne(state, transformResponseToAlert(payload));
-        }
-      }
-    );
-  },
-});
-
-export const { selectAll } = alertsAdapter.getSelectors<RootState>(
-  (state) => state.alerts
-);
-
-export const { alertDissmissed, alertAdded, serverErrorAlertAdded } =
-  alertsSlice.actions;
-
-export const showSuccessAlert = createAsyncThunk<
-  number,
-  { id: string; message: string },
-  { fulfilledMeta: null }
->(
-  'alerts/showSuccessAlert',
-  async ({ id, message }, { dispatch, fulfillWithValue }) => {
-    const creationDate = Date.now();
-
-    dispatch(
-      alertAdded({
-        id,
-        message,
-        title: '',
-        type: 'success',
-        createdAt: creationDate,
-      })
-    );
-
-    setTimeout(() => {
-      dispatch(alertDissmissed(id));
-    }, 3000);
-
-    return fulfillWithValue(creationDate, null);
-  }
-);
-
-export default alertsSlice.reducer;
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
index 063ca586099..2b7709b0099 100644
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
@@ -12,7 +12,11 @@ import {
   SortOrder,
 } from 'generated-sources';
 import { AsyncRequestStatus } from 'lib/constants';
-import { getResponse } from 'lib/errorHandling';
+import {
+  getResponse,
+  showServerError,
+  showSuccessAlert,
+} from 'lib/errorHandling';
 import {
   ClusterName,
   ConsumerGroupID,
@@ -49,6 +53,7 @@ export const fetchConsumerGroupsPaged = createAsyncThunk<
         search,
       });
     } catch (error) {
+      showServerError(error as Response);
       return rejectWithValue(await getResponse(error as Response));
     }
   }
@@ -66,6 +71,7 @@ export const fetchConsumerGroupDetails = createAsyncThunk<
         id: consumerGroupID,
       });
     } catch (error) {
+      showServerError(error as Response);
       return rejectWithValue(await getResponse(error as Response));
     }
   }
@@ -82,9 +88,12 @@ export const deleteConsumerGroup = createAsyncThunk<
         clusterName,
         id: consumerGroupID,
       });
-
+      showSuccessAlert({
+        message: `Consumer ${consumerGroupID} group deleted`,
+      });
       return consumerGroupID;
     } catch (error) {
+      showServerError(error as Response);
       return rejectWithValue(await getResponse(error as Response));
     }
   }
@@ -114,8 +123,12 @@ export const resetConsumerGroupOffsets = createAsyncThunk<
           resetToTimestamp: requestBody.resetToTimestamp?.getTime(),
         },
       });
+      showSuccessAlert({
+        message: `Consumer ${consumerGroupID} group offsets reset`,
+      });
       return consumerGroupID;
     } catch (error) {
+      showServerError(error as Response);
       return rejectWithValue(await getResponse(error as Response));
     }
   }
diff --git a/kafka-ui-react-app/src/redux/reducers/index.ts b/kafka-ui-react-app/src/redux/reducers/index.ts
index ee5421f89ed..92b9246318d 100644
--- a/kafka-ui-react-app/src/redux/reducers/index.ts
+++ b/kafka-ui-react-app/src/redux/reducers/index.ts
@@ -1,6 +1,5 @@
 import { combineReducers } from '@reduxjs/toolkit';
 import loader from 'redux/reducers/loader/loaderSlice';
-import alerts from 'redux/reducers/alerts/alertsSlice';
 import schemas from 'redux/reducers/schemas/schemasSlice';
 import topicMessages from 'redux/reducers/topicMessages/topicMessagesSlice';
 import topics from 'redux/reducers/topics/topicsSlice';
@@ -9,7 +8,6 @@ import ksqlDb from 'redux/reducers/ksqlDb/ksqlDbSlice';
 
 export default combineReducers({
   loader,
-  alerts,
   topics,
   topicMessages,
   consumerGroups,
diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts b/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
index 7d52b78741b..049e0bedd71 100644
--- a/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
@@ -12,7 +12,7 @@ import {
 } from 'generated-sources';
 import { schemasApiClient } from 'lib/api';
 import { AsyncRequestStatus } from 'lib/constants';
-import { getResponse } from 'lib/errorHandling';
+import { getResponse, showServerError } from 'lib/errorHandling';
 import { ClusterName, RootState } from 'redux/interfaces';
 import { createFetchingSelector } from 'redux/reducers/loader/selectors';
 
@@ -24,6 +24,7 @@ export const fetchLatestSchema = createAsyncThunk<
   try {
     return await schemasApiClient.getLatestSchema(schemaParams);
   } catch (error) {
+    showServerError(error as Response);
     return rejectWithValue(await getResponse(error as Response));
   }
 });
@@ -43,6 +44,7 @@ export const fetchSchemas = createAsyncThunk<
         search: search || undefined,
       });
     } catch (error) {
+      showServerError(error as Response);
       return rejectWithValue(await getResponse(error as Response));
     }
   }
@@ -61,6 +63,7 @@ export const fetchSchemaVersions = createAsyncThunk<
         subject,
       });
     } catch (error) {
+      showServerError(error as Response);
       return rejectWithValue(await getResponse(error as Response));
     }
   }
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
index 375c99e5332..49e12d453ea 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
@@ -1,8 +1,11 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { TopicMessagesState, ClusterName, TopicName } from 'redux/interfaces';
 import { TopicMessage } from 'generated-sources';
-import { getResponse } from 'lib/errorHandling';
-import { showSuccessAlert } from 'redux/reducers/alerts/alertsSlice';
+import {
+  getResponse,
+  showServerError,
+  showSuccessAlert,
+} from 'lib/errorHandling';
 import { fetchTopicDetails } from 'redux/reducers/topics/topicsSlice';
 import { messagesApiClient } from 'lib/api';
 
@@ -22,15 +25,14 @@ export const clearTopicMessages = createAsyncThunk<
         partitions,
       });
       dispatch(fetchTopicDetails({ clusterName, topicName }));
-      dispatch(
-        showSuccessAlert({
-          id: `message-${topicName}-${clusterName}-${partitions}`,
-          message: 'Messages successfully cleared!',
-        })
-      );
+      showSuccessAlert({
+        id: `message-${topicName}-${clusterName}-${partitions}`,
+        message: 'Messages successfully cleared!',
+      });
 
       return undefined;
     } catch (err) {
+      showServerError(err as Response);
       return rejectWithValue(await getResponse(err as Response));
     }
   }
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
index 629d747110e..271cc7798a9 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
@@ -25,9 +25,12 @@ import {
   TopicFormDataRaw,
   ClusterName,
 } from 'redux/interfaces';
-import { getResponse } from 'lib/errorHandling';
+import {
+  getResponse,
+  showServerError,
+  showSuccessAlert,
+} from 'lib/errorHandling';
 import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import { showSuccessAlert } from 'redux/reducers/alerts/alertsSlice';
 import {
   consumerGroupsApiClient,
   messagesApiClient,
@@ -41,6 +44,7 @@ export const fetchTopicsList = createAsyncThunk<
   try {
     return await topicsApiClient.getTopics(payload);
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
@@ -55,6 +59,7 @@ export const fetchTopicDetails = createAsyncThunk<
 
     return { topicDetails, topicName };
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
@@ -69,6 +74,7 @@ export const fetchTopicConfig = createAsyncThunk<
 
     return { topicConfig, topicName };
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
@@ -124,9 +130,12 @@ export const createTopic = createAsyncThunk<
       clusterName,
       topicCreation: formatTopicCreation(data),
     });
-
+    showSuccessAlert({
+      message: `Topic ${data.name} created successfully`,
+    });
     return undefined;
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
@@ -143,6 +152,7 @@ export const fetchTopicConsumerGroups = createAsyncThunk<
 
     return { consumerGroups, topicName };
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
@@ -188,6 +198,7 @@ export const updateTopic = createAsyncThunk<
 
       return { topic };
     } catch (err) {
+      showServerError(err as Response);
       return rejectWithValue(await getResponse(err as Response));
     }
   }
@@ -196,18 +207,17 @@ export const updateTopic = createAsyncThunk<
 export const deleteTopic = createAsyncThunk<
   { topicName: TopicName },
   DeleteTopicRequest
->('topic/deleteTopic', async (payload, { rejectWithValue, dispatch }) => {
+>('topic/deleteTopic', async (payload, { rejectWithValue }) => {
   try {
     const { topicName, clusterName } = payload;
     await topicsApiClient.deleteTopic(payload);
-    dispatch(
-      showSuccessAlert({
-        id: `message-${topicName}-${clusterName}`,
-        message: 'Topic successfully deleted!',
-      })
-    );
+    showSuccessAlert({
+      id: `message-${topicName}-${clusterName}`,
+      message: 'Topic successfully deleted!',
+    });
     return { topicName };
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
@@ -215,19 +225,17 @@ export const deleteTopic = createAsyncThunk<
 export const recreateTopic = createAsyncThunk<
   { topic: Topic },
   RecreateTopicRequest
->('topic/recreateTopic', async (payload, { rejectWithValue, dispatch }) => {
+>('topic/recreateTopic', async (payload, { rejectWithValue }) => {
   try {
     const { topicName, clusterName } = payload;
     const topic = await topicsApiClient.recreateTopic(payload);
-    dispatch(
-      showSuccessAlert({
-        id: `message-${topicName}-${clusterName}`,
-        message: 'Topic successfully recreated!',
-      })
-    );
-
+    showSuccessAlert({
+      id: `message-${topicName}-${clusterName}`,
+      message: 'Topic successfully recreated!',
+    });
     return { topic };
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
@@ -241,6 +249,7 @@ export const fetchTopicMessageSchema = createAsyncThunk<
     const schema = await messagesApiClient.getTopicSchema(payload);
     return { schema, topicName };
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
@@ -263,15 +272,14 @@ export const updateTopicPartitionsCount = createAsyncThunk<
         topicName,
         partitionsIncrease: { totalPartitionsCount: partitions },
       });
-      dispatch(
-        showSuccessAlert({
-          id: `message-${topicName}-${clusterName}-${partitions}`,
-          message: 'Number of partitions successfully increased!',
-        })
-      );
+      showSuccessAlert({
+        id: `message-${topicName}-${clusterName}-${partitions}`,
+        message: 'Number of partitions successfully increased!',
+      });
       dispatch(fetchTopicDetails({ clusterName, topicName }));
       return undefined;
     } catch (err) {
+      showServerError(err as Response);
       return rejectWithValue(await getResponse(err as Response));
     }
   }
@@ -298,6 +306,7 @@ export const updateTopicReplicationFactor = createAsyncThunk<
 
       return undefined;
     } catch (err) {
+      showServerError(err as Response);
       return rejectWithValue(await getResponse(err as Response));
     }
   }
@@ -320,6 +329,7 @@ export const deleteTopics = createAsyncThunk<
 
     return undefined;
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
@@ -340,6 +350,7 @@ export const clearTopicsMessages = createAsyncThunk<
 
     return undefined;
   } catch (err) {
+    showServerError(err as Response);
     return rejectWithValue(await getResponse(err as Response));
   }
 });
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index c5d54a8b598..bf79a8148f0 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -148,6 +148,9 @@ const theme = {
       success: Colors.green[10],
       warning: Colors.yellow[10],
       info: Colors.neutral[10],
+      loading: Colors.neutral[10],
+      blank: Colors.neutral[10],
+      custom: Colors.neutral[10],
     },
     shadow: Colors.transparency[20],
   },

From d92fe63e8aaa146c2b6279d60898544bc1e6ed39 Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Wed, 27 Jul 2022 16:20:40 +0400
Subject: [PATCH 086/734] Make Submit button inactive when required fields
 aren't filled (#2315)

* fixing create schema page validation issue

* fixing schema create form schemaType select issue

* adding test cases for schema creation
---
 .../src/components/Schemas/New/New.tsx        |  2 +-
 .../Schemas/New/__test__/New.spec.tsx         | 27 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.tsx b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
index c3d9ba70034..38bef9bc9b6 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
@@ -105,11 +105,11 @@ const New: React.FC = () => {
             control={control}
             rules={{ required: 'Schema Type is required.' }}
             name="schemaType"
+            defaultValue={SchemaTypeOptions[0].value as SchemaType}
             render={({ field: { name, onChange, value } }) => (
               <Select
                 selectSize="M"
                 name={name}
-                defaultValue={SchemaTypeOptions[0].value}
                 value={value}
                 onChange={onChange}
                 minWidth="50%"
diff --git a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
index c4bcf77abc5..01b9b1cd8b9 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
@@ -2,9 +2,12 @@ import React from 'react';
 import New from 'components/Schemas/New/New';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterSchemaNewPath } from 'lib/paths';
-import { screen } from '@testing-library/dom';
+import { act, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 const clusterName = 'local';
+const subjectValue = 'subject';
+const schemaValue = 'schema';
 
 describe('New Component', () => {
   beforeEach(() => {
@@ -21,4 +24,26 @@ describe('New Component', () => {
   it('renders component', () => {
     expect(screen.getByText('Create new schema')).toBeInTheDocument();
   });
+  it('submit button will be disabled while form fields are not filled', () => {
+    const submitBtn = screen.getByRole('button', { name: /submit/i });
+    expect(submitBtn).toBeDisabled();
+  });
+  it('submit button will be enabled when form fields are filled', async () => {
+    const subject = screen.getByPlaceholderText('Schema Name');
+    const schema = screen.getAllByRole('textbox')[1];
+    const schemaTypeSelect = screen.getByRole('listbox');
+
+    await act(() => {
+      userEvent.type(subject, subjectValue);
+    });
+    await act(() => {
+      userEvent.type(schema, schemaValue);
+    });
+    await act(() => {
+      userEvent.selectOptions(schemaTypeSelect, ['AVRO']);
+    });
+
+    const submitBtn = screen.getByRole('button', { name: /Submit/i });
+    expect(submitBtn).toBeEnabled();
+  });
 });

From bff27f1b5bfc7ab1af339e829f0905df57f206df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Cort=C3=A9s=20L=C3=B3pez?=
 <joseacl@gmail.com>
Date: Wed, 27 Jul 2022 15:39:56 +0200
Subject: [PATCH 087/734] Fixed ingress template for k8s version older than
 1.19 (#2318)

* Fixed ingress template for k8s version older than 1.19

* Added manifest tests with version lower than 1.19, and ingress enabled
---
 .github/workflows/helm.yaml            | 4 ++--
 charts/kafka-ui/templates/ingress.yaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
index 664a15e8a73..0da4bdc51e4 100644
--- a/.github/workflows/helm.yaml
+++ b/.github/workflows/helm.yaml
@@ -22,11 +22,11 @@ jobs:
         shell: bash
         run: |
           sed -i "s@enabled: false@enabled: true@g" charts/kafka-ui/values.yaml
-          K8S_VERSIONS=$(git ls-remote --refs --tags https://github.com/kubernetes/kubernetes.git | cut -d/ -f3 | grep -e '^v1\.[0-9]\{2\}\.[0]\{1,2\}$' | grep -v -e  '^v1\.1[0-8]\{1\}' | cut -c2-)
+          K8S_VERSIONS=$(git ls-remote --refs --tags https://github.com/kubernetes/kubernetes.git | cut -d/ -f3 | grep -e '^v1\.[0-9]\{2\}\.[0]\{1,2\}$' | grep -v -e  '^v1\.1[0-7]\{1\}' | cut -c2-)
           echo "NEXT K8S VERSIONS ARE GOING TO BE TESTED: $K8S_VERSIONS"
           echo ""
           for version in $K8S_VERSIONS
             do
               echo $version;
-              helm template charts/kafka-ui -f charts/kafka-ui/values.yaml | kubeval --additional-schema-locations https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master --strict -v $version;
+              helm template --kube-version $version --set ingress.enabled=true charts/kafka-ui -f charts/kafka-ui/values.yaml | kubeval --additional-schema-locations https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master --strict -v $version;
             done
diff --git a/charts/kafka-ui/templates/ingress.yaml b/charts/kafka-ui/templates/ingress.yaml
index 8631ea0130c..7659867b31a 100644
--- a/charts/kafka-ui/templates/ingress.yaml
+++ b/charts/kafka-ui/templates/ingress.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "kafka-ui.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") (trimPrefix "v" .Capabilities.KubeVersion.Version | semverCompare ">= 1.19" ) -}}
 apiVersion: networking.k8s.io/v1
 {{- else if $.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 apiVersion: networking.k8s.io/v1beta1
@@ -30,7 +30,7 @@ spec:
   rules:
     - http:
         paths:
-{{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
+{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") (trimPrefix "v" .Capabilities.KubeVersion.Version | semverCompare ">= 1.19" ) -}}
           {{- range .Values.ingress.precedingPaths }}
           - path: {{ .path }}
             pathType: Prefix

From 70414d227943e6ca81fefb04a5848689e59eb473 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Sun, 31 Jul 2022 15:38:44 +0300
Subject: [PATCH 088/734] New Dropdown component (#2355)

* New Dropdown component

* Cleanup

* Styling

* Minireset
---
 kafka-ui-react-app/package.json               |  2 +-
 kafka-ui-react-app/pnpm-lock.yaml             | 34 +++++---
 .../Connect/Details/Tasks/Tasks.tsx           |  6 +-
 .../src/components/Connect/List/ListItem.tsx  |  6 +-
 .../ConsumerGroups/Details/Details.tsx        |  6 +-
 .../components/Schemas/Details/Details.tsx    |  6 +-
 .../Topics/List/ActionsCell/ActionsCell.tsx   | 16 ++--
 .../Topics/Topic/Details/Details.styled.ts    |  7 --
 .../Topics/Topic/Details/Details.tsx          | 67 +++++++-------
 .../Topics/Topic/Details/Messages/Message.tsx |  6 +-
 .../Topic/Details/Overview/Overview.tsx       |  6 +-
 .../Overview/__test__/Overview.spec.tsx       |  4 +-
 .../Topic/Details/__test__/Details.spec.tsx   | 13 +--
 .../Topics/Topic/SendMessage/SendMessage.tsx  |  2 +-
 .../common/Dropdown/Dropdown.styled.ts        | 87 ++++++++++++++-----
 .../components/common/Dropdown/Dropdown.tsx   | 68 +++++++--------
 .../common/Dropdown/DropdownDivider.tsx       |  5 --
 .../common/Dropdown/DropdownItem.tsx          | 27 +++---
 .../Dropdown/__tests__/Dropdown.spec.tsx      | 81 -----------------
 .../Dropdown/__tests__/DropdownItem.spec.tsx  | 20 -----
 .../src/components/common/Dropdown/index.ts   |  5 ++
 kafka-ui-react-app/src/theme/index.scss       |  5 +-
 kafka-ui-react-app/src/theme/minireset.css    |  1 +
 kafka-ui-react-app/src/theme/theme.ts         | 13 ++-
 24 files changed, 217 insertions(+), 276 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/common/Dropdown/DropdownDivider.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Dropdown/__tests__/Dropdown.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Dropdown/__tests__/DropdownItem.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Dropdown/index.ts
 create mode 100644 kafka-ui-react-app/src/theme/minireset.css

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 8dfb1fcd5d5..57a10a966d4 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -11,7 +11,7 @@
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
     "@reduxjs/toolkit": "^1.8.3",
-    "@rooks/use-outside-click-ref": "^4.10.1",
+    "@szhsin/react-menu": "^3.1.1",
     "@tanstack/react-query": "^4.0.5",
     "@testing-library/react": "^13.2.0",
     "@types/testing-library__jest-dom": "^5.14.5",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 32fcce3a9ca..3e6471154db 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -13,7 +13,7 @@ specifiers:
   '@jest/types': ^28.1.1
   '@openapitools/openapi-generator-cli': ^2.5.1
   '@reduxjs/toolkit': ^1.8.3
-  '@rooks/use-outside-click-ref': ^4.10.1
+  '@szhsin/react-menu': ^3.1.1
   '@tanstack/react-query': ^4.0.5
   '@testing-library/dom': ^8.11.1
   '@testing-library/jest-dom': ^5.16.4
@@ -97,7 +97,7 @@ dependencies:
   '@hookform/error-message': 2.0.0_l2dcsysovzdujulgxvsen7vbsm
   '@hookform/resolvers': 2.8.9_react-hook-form@7.6.9
   '@reduxjs/toolkit': 1.8.3_ctm756ikdwcjcvyfxxwskzbr6q
-  '@rooks/use-outside-click-ref': 4.11.2_react@18.1.0
+  '@szhsin/react-menu': 3.1.1_ef5jwxihqo6n7gxfmzogljlgcm
   '@tanstack/react-query': 4.0.5_ef5jwxihqo6n7gxfmzogljlgcm
   '@testing-library/react': 13.2.0_ef5jwxihqo6n7gxfmzogljlgcm
   '@types/testing-library__jest-dom': 5.14.5
@@ -2352,14 +2352,6 @@ packages:
       reselect: 4.1.5
     dev: false
 
-  /@rooks/use-outside-click-ref/4.11.2_react@18.1.0:
-    resolution: {integrity: sha512-w2bCW69zcpLh0KmN/odAuBsQ3sps+73KEu7zMOi0o4YMfDo+tXcqwlTJiLYysd0BEoQC9pNIklzZmI9zZep69g==}
-    peerDependencies:
-      react: '>=16.8.0'
-    dependencies:
-      react: 18.1.0
-    dev: false
-
   /@rushstack/eslint-patch/1.1.3:
     resolution: {integrity: sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==}
     dev: true
@@ -2377,6 +2369,18 @@ packages:
     dependencies:
       '@sinonjs/commons': 1.8.3
 
+  /@szhsin/react-menu/3.1.1_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-IdHLyH61M+KqjTrvqglKo7JnbC0GIkg4OCtlXBxQPEjx/ecR5g0Iycqm+SG3rObEoniLZEz32iJkefve/LAHMA==}
+    peerDependencies:
+      react: '>=16.14.0'
+      react-dom: '>=16.14.0'
+    dependencies:
+      prop-types: 15.8.1
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-transition-state: 1.1.4_ef5jwxihqo6n7gxfmzogljlgcm
+    dev: false
+
   /@tanstack/query-core/4.0.5:
     resolution: {integrity: sha512-QOJ2gLbwlf8p0487pMey6vv8EF5X2ib1zINayaD7mb9/LibUtXmZ12uJgTqcnjgNY/4tWZn5qJnEk2ePG5AVGA==}
     dev: false
@@ -6752,6 +6756,16 @@ packages:
       react: 18.1.0
     dev: false
 
+  /react-transition-state/1.1.4_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-6nQLWWx95gYazCm6OdtD1zGbRiirvVXPrDtHAGsYb4xs9spMM7bA8Vx77KCpjL8PJ8qz1lXFGz2PTboCSvt7iw==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+    dependencies:
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+    dev: false
+
   /react/18.1.0:
     resolution: {integrity: sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==}
     engines: {node: '>=0.10.0'}
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
index 415a828af2c..8fbe687e119 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
@@ -7,11 +7,9 @@ import {
 } from 'lib/hooks/api/kafkaConnect';
 import useAppParams from 'lib/hooks/useAppParams';
 import { RouterParamsClusterConnectConnector } from 'lib/paths';
-import Dropdown from 'components/common/Dropdown/Dropdown';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
 import getTagColor from 'components/common/Tag/getTagColor';
 import { Tag } from 'components/common/Tag/Tag.styled';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 
 const Tasks: React.FC = () => {
   const routerProps = useAppParams<RouterParamsClusterConnectConnector>();
@@ -50,7 +48,7 @@ const Tasks: React.FC = () => {
             <td>{task.status.trace || 'null'}</td>
             <td style={{ width: '5%' }}>
               <div>
-                <Dropdown label={<VerticalElipsisIcon />} right>
+                <Dropdown>
                   <DropdownItem
                     onClick={() => restartTaskHandler(task.id?.task)}
                     danger
diff --git a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
index 80a8a61523a..d17c239ec73 100644
--- a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
@@ -3,15 +3,13 @@ import { FullConnectorInfo } from 'generated-sources';
 import { clusterConnectConnectorPath, clusterTopicPath } from 'lib/paths';
 import { ClusterName } from 'redux/interfaces';
 import { Link, NavLink } from 'react-router-dom';
-import Dropdown from 'components/common/Dropdown/Dropdown';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
 import getTagColor from 'components/common/Tag/getTagColor';
 import useModal from 'lib/hooks/useModal';
 import { useDeleteConnector } from 'lib/hooks/api/kafkaConnect';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 
 import * as S from './List.styled';
 
@@ -79,7 +77,7 @@ const ListItem: React.FC<ListItemProps> = ({
       </td>
       <td>
         <div>
-          <Dropdown label={<VerticalElipsisIcon />} right up>
+          <Dropdown>
             <DropdownItem onClick={setOpen} danger>
               Remove Connector
             </DropdownItem>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index c8cca9fc8d9..3882b5ab2f9 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -9,11 +9,8 @@ import PageLoader from 'components/common/PageLoader/PageLoader';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
 import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
-import Dropdown from 'components/common/Dropdown/Dropdown';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
 import groupBy from 'lodash/groupBy';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
@@ -26,6 +23,7 @@ import {
   getAreConsumerGroupDetailsFulfilled,
 } from 'redux/reducers/consumerGroups/consumerGroupsSlice';
 import getTagColor from 'components/common/Tag/getTagColor';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 
 import ListItem from './ListItem';
 
@@ -72,7 +70,7 @@ const Details: React.FC = () => {
       <div>
         <PageHeading text={consumerGroupID}>
           {!isReadOnly && (
-            <Dropdown label={<VerticalElipsisIcon />} right>
+            <Dropdown>
               <DropdownItem onClick={onResetOffsets}>Reset offset</DropdownItem>
               <DropdownItem
                 onClick={() => setIsConfirmationModalVisible(true)}
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index 9424409d761..535b2577519 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -10,9 +10,6 @@ import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationM
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { Button } from 'components/common/Button/Button';
-import Dropdown from 'components/common/Dropdown/Dropdown';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
@@ -31,6 +28,7 @@ import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 import { TableTitle } from 'components/common/table/TableTitle/TableTitle.styled';
 import useAppParams from 'lib/hooks/useAppParams';
 import { schemasApiClient } from 'lib/api';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 
 import LatestVersionItem from './LatestVersion/LatestVersionItem';
 import SchemaVersion from './SchemaVersion/SchemaVersion';
@@ -101,7 +99,7 @@ const Details: React.FC = () => {
             >
               Edit Schema
             </Button>
-            <Dropdown label={<VerticalElipsisIcon />} right>
+            <Dropdown>
               <DropdownItem
                 onClick={() => setDeleteSchemaConfirmationVisible(true)}
                 danger
diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
index 2ab2bb7a6dd..9849888ba46 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
@@ -6,11 +6,8 @@ import {
 } from 'generated-sources';
 import { useAppDispatch } from 'lib/hooks/redux';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
 import { TableCellProps } from 'components/common/SmartTable/TableColumn';
 import { TopicWithDetailedInfo } from 'redux/interfaces';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
-import Dropdown from 'components/common/Dropdown/Dropdown';
 import ClusterContext from 'components/contexts/ClusterContext';
 import * as S from 'components/Topics/List/List.styled';
 import { ClusterNameRoute } from 'lib/paths';
@@ -22,6 +19,7 @@ import {
   recreateTopic,
 } from 'redux/reducers/topics/topicsSlice';
 import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 
 interface TopicsListParams {
   clusterName: string;
@@ -68,8 +66,10 @@ const ActionsCell: React.FC<
 
   const isHidden = internal || isReadOnly || !hovered;
 
-  const deleteTopicHandler = () =>
+  const deleteTopicHandler = () => {
     dispatch(deleteTopic({ clusterName, topicName: name }));
+    closeDeleteTopicModal();
+  };
 
   const clearTopicMessagesHandler = () => {
     dispatch(clearTopicMessages({ clusterName, topicName: name }));
@@ -86,20 +86,20 @@ const ActionsCell: React.FC<
     <>
       <S.ActionsContainer>
         {!isHidden && (
-          <Dropdown label={<VerticalElipsisIcon />} right>
+          <Dropdown>
             {cleanUpPolicy === CleanUpPolicy.DELETE && (
               <DropdownItem onClick={openClearMessagesModal} danger>
                 Clear Messages
               </DropdownItem>
             )}
+            <DropdownItem onClick={openRecreateTopicModal} danger>
+              Recreate Topic
+            </DropdownItem>
             {isTopicDeletionAllowed && (
               <DropdownItem onClick={openDeleteTopicModal} danger>
                 Remove Topic
               </DropdownItem>
             )}
-            <DropdownItem onClick={openRecreateTopicModal} danger>
-              Recreate Topic
-            </DropdownItem>
           </Dropdown>
         )}
       </S.ActionsContainer>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.styled.ts
index 7581c33deab..5579f1c7cba 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.styled.ts
@@ -1,12 +1,5 @@
 import styled from 'styled-components';
 
-export const DropdownExtraMessage = styled.div`
-  color: ${({ theme }) => theme.topicMetaData.color.label};
-  font-size: 14px;
-  width: 100%;
-  margin-top: 10px;
-`;
-
 export const ReplicaCell = styled.span.attrs({ 'aria-label': 'replica-info' })<{
   leader?: boolean;
 }>`
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
index d7712df78b3..9468f524b8d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
@@ -13,18 +13,19 @@ import ClusterContext from 'components/contexts/ClusterContext';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { Button } from 'components/common/Button/Button';
-import Dropdown from 'components/common/Dropdown/Dropdown';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
 import styled from 'styled-components';
 import Navbar from 'components/common/Navigation/Navbar.styled';
-import * as S from 'components/Topics/Topic/Details/Details.styled';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
+import { useAppSelector } from 'lib/hooks/redux';
 import {
   getIsTopicDeletePolicy,
   getIsTopicInternal,
 } from 'redux/reducers/topics/selectors';
 import useAppParams from 'lib/hooks/useAppParams';
+import {
+  Dropdown,
+  DropdownItem,
+  DropdownItemHint,
+} from 'components/common/Dropdown';
 
 import OverviewContainer from './Overview/OverviewContainer';
 import TopicConsumerGroupsContainer from './ConsumerGroups/TopicConsumerGroupsContainer';
@@ -32,7 +33,6 @@ import SettingsContainer from './Settings/SettingsContainer';
 import Messages from './Messages/Messages';
 
 interface Props {
-  isDeleted: boolean;
   deleteTopic: (payload: {
     clusterName: ClusterName;
     topicName: TopicName;
@@ -55,7 +55,6 @@ const HeaderControlsWrapper = styled.div`
 `;
 
 const Details: React.FC<Props> = ({
-  isDeleted,
   deleteTopic,
   recreateTopic,
   clearTopicMessages,
@@ -65,15 +64,14 @@ const Details: React.FC<Props> = ({
   const isInternal = useAppSelector((state) =>
     getIsTopicInternal(state, topicName)
   );
-
   const isDeletePolicy = useAppSelector((state) =>
     getIsTopicDeletePolicy(state, topicName)
   );
 
   const navigate = useNavigate();
-  const dispatch = useAppDispatch();
   const { isReadOnly, isTopicDeletionAllowed } =
     React.useContext(ClusterContext);
+
   const [isDeleteTopicConfirmationVisible, setDeleteTopicConfirmationVisible] =
     React.useState(false);
   const [isClearTopicConfirmationVisible, setClearTopicConfirmationVisible] =
@@ -82,13 +80,11 @@ const Details: React.FC<Props> = ({
     isRecreateTopicConfirmationVisible,
     setRecreateTopicConfirmationVisible,
   ] = React.useState(false);
-  const deleteTopicHandler = () => deleteTopic({ clusterName, topicName });
-
-  React.useEffect(() => {
-    if (isDeleted) {
-      navigate('../..');
-    }
-  }, [isDeleted, clusterName, dispatch, navigate]);
+  const deleteTopicHandler = () => {
+    deleteTopic({ clusterName, topicName });
+    setDeleteTopicConfirmationVisible(false);
+    navigate('../..');
+  };
 
   const clearTopicMessagesHandler = () => {
     clearTopicMessages({ clusterName, topicName });
@@ -124,39 +120,37 @@ const Details: React.FC<Props> = ({
               <Route
                 index
                 element={
-                  <Dropdown label={<VerticalElipsisIcon />} right>
+                  <Dropdown>
                     <DropdownItem
                       onClick={() => navigate(clusterTopicEditRelativePath)}
                     >
                       Edit settings
-                      <S.DropdownExtraMessage>
+                      <DropdownItemHint>
                         Pay attention! This operation has
                         <br />
                         especially important consequences.
-                      </S.DropdownExtraMessage>
+                      </DropdownItemHint>
+                    </DropdownItem>
+                    <DropdownItem
+                      disabled={!isDeletePolicy}
+                      onClick={() => setClearTopicConfirmationVisible(true)}
+                      danger
+                    >
+                      Clear messages
                     </DropdownItem>
-                    {isDeletePolicy && (
-                      <DropdownItem
-                        onClick={() => setClearTopicConfirmationVisible(true)}
-                        danger
-                      >
-                        Clear messages
-                      </DropdownItem>
-                    )}
                     <DropdownItem
                       onClick={() => setRecreateTopicConfirmationVisible(true)}
                       danger
                     >
                       Recreate Topic
                     </DropdownItem>
-                    {isTopicDeletionAllowed && (
-                      <DropdownItem
-                        onClick={() => setDeleteTopicConfirmationVisible(true)}
-                        danger
-                      >
-                        Remove topic
-                      </DropdownItem>
-                    )}
+                    <DropdownItem
+                      disabled={!isTopicDeletionAllowed}
+                      onClick={() => setDeleteTopicConfirmationVisible(true)}
+                      danger
+                    >
+                      Remove Topic
+                    </DropdownItem>
                   </Dropdown>
                 }
               />
@@ -214,14 +208,11 @@ const Details: React.FC<Props> = ({
       </Navbar>
       <Routes>
         <Route index element={<OverviewContainer />} />
-
         <Route path={clusterTopicMessagesRelativePath} element={<Messages />} />
-
         <Route
           path={clusterTopicSettingsRelativePath}
           element={<SettingsContainer />}
         />
-
         <Route
           path={clusterTopicConsumerGroupsRelativePath}
           element={<TopicConsumerGroupsContainer />}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx
index a111ed14524..8c86fd1558e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx
@@ -1,13 +1,11 @@
 import React from 'react';
 import dayjs from 'dayjs';
 import { TopicMessage } from 'generated-sources';
-import Dropdown from 'components/common/Dropdown/Dropdown';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
 import useDataSaver from 'lib/hooks/useDataSaver';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
 import MessageToggleIcon from 'components/common/Icons/MessageToggleIcon';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import styled from 'styled-components';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 
 import MessageContent from './MessageContent/MessageContent';
 import * as S from './MessageContent/MessageContent.styled';
@@ -76,7 +74,7 @@ const Message: React.FC<Props> = ({
         </StyledDataCell>
         <td style={{ width: '5%' }}>
           {vEllipsisOpen && (
-            <Dropdown label={<VerticalElipsisIcon />} right>
+            <Dropdown>
               <DropdownItem onClick={copyToClipboard}>
                 Copy to clipboard
               </DropdownItem>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
index 3f155d97910..e1753b15f65 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
@@ -1,13 +1,10 @@
 import React from 'react';
 import { Partition, Replica } from 'generated-sources';
 import { ClusterName, TopicName } from 'redux/interfaces';
-import Dropdown from 'components/common/Dropdown/Dropdown';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
 import ClusterContext from 'components/contexts/ClusterContext';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
 import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import { useAppSelector } from 'lib/hooks/redux';
@@ -15,6 +12,7 @@ import { getTopicByName } from 'redux/reducers/topics/selectors';
 import { ReplicaCell } from 'components/Topics/Topic/Details/Details.styled';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 
 export interface Props {
   clearTopicMessages(params: {
@@ -135,7 +133,7 @@ const Overview: React.FC<Props> = ({ clearTopicMessages }) => {
                 <td>{partition.offsetMax - partition.offsetMin}</td>
                 <td style={{ width: '5%' }}>
                   {!internal && !isReadOnly && cleanUpPolicy === 'DELETE' ? (
-                    <Dropdown label={<VerticalElipsisIcon />} right>
+                    <Dropdown>
                       <DropdownItem
                         onClick={() =>
                           clearTopicMessages({
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
index bb134d912ba..7cc2d954cb0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
@@ -80,7 +80,7 @@ describe('Overview', () => {
   });
 
   describe('when it has internal flag', () => {
-    it('does not render the Action button a Topic', () => {
+    it('renders the Action button for Topic', () => {
       setupComponent(
         {},
         {
@@ -90,7 +90,7 @@ describe('Overview', () => {
           cleanUpPolicy: CleanUpPolicy.DELETE,
         }
       );
-      expect(screen.getAllByRole('menu')[0]).toBeInTheDocument();
+      expect(screen.getAllByLabelText('Dropdown Toggle').length).toEqual(1);
     });
 
     it('does not render Partitions', () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
index fb81c426a65..c03f5b511a4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
@@ -46,7 +46,6 @@ describe('Details', () => {
             deleteTopic={mockDelete}
             recreateTopic={mockRecreateTopic}
             clearTopicMessages={mockClearTopicMessages}
-            isDeleted={false}
             {...props}
           />
         </WithRoute>
@@ -83,7 +82,6 @@ describe('Details', () => {
             deleteTopic={mockDelete}
             recreateTopic={mockRecreateTopic}
             clearTopicMessages={mockClearTopicMessages}
-            isDeleted={false}
           />
         </ClusterContext.Provider>
       );
@@ -95,8 +93,7 @@ describe('Details', () => {
   describe('when remove topic modal is open', () => {
     beforeEach(() => {
       setupComponent();
-
-      const openModalButton = screen.getAllByText('Remove topic')[0];
+      const openModalButton = screen.getAllByText('Remove Topic')[0];
       userEvent.click(openModalButton);
     });
 
@@ -156,7 +153,13 @@ describe('Details', () => {
   });
 
   it('redirects to the correct route if topic is deleted', () => {
-    setupComponent({ isDeleted: true });
+    setupComponent();
+
+    const deleteTopicButton = screen.getByText(/Remove topic/i);
+    userEvent.click(deleteTopicButton);
+
+    const submitDeleteButton = screen.getByText(/Submit/i);
+    userEvent.click(submitDeleteButton);
 
     expect(mockNavigate).toHaveBeenCalledWith('../..');
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 3e7734a1115..6e7f367f62c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -170,7 +170,7 @@ const SendMessage: React.FC = () => {
                   aria-labelledby="selectPartitionOptions"
                   name={name}
                   onChange={onChange}
-                  minWidth="100%"
+                  minWidth="100px"
                   options={selectPartitionOptions}
                   value={selectPartitionOptions[0].value}
                 />
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
index 26aef95bcea..bae6938b711 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
@@ -1,30 +1,73 @@
-import styled from 'styled-components';
+import styled, { css, keyframes } from 'styled-components';
+import { ControlledMenu } from '@szhsin/react-menu';
+import { menuSelector, menuItemSelector } from '@szhsin/react-menu/style-utils';
 
-export const TriggerWrapper = styled.div`
-  display: flex;
-  align-self: center;
+import '@szhsin/react-menu/dist/core.css';
+
+const menuShow = keyframes`
+  from {
+    opacity: 0;
+  }
 `;
+const menuHide = keyframes`
+  to {
+    opacity: 0;
+  }
+`;
+
+export const Dropdown = styled(ControlledMenu)(
+  ({ theme: { dropdown } }) => css`
+    // container for the menu items
+    ${menuSelector.name} {
+      border: 1px solid ${dropdown.borderColor};
+      box-shadow: 0px 4px 16px ${dropdown.shadow};
+      padding: 8px 0;
+      border-radius: 4px;
+      font-size: 14px;
+      background-color: ${dropdown.backgroundColor};
+      text-align: left;
+    }
+
+    ${menuSelector.stateOpening} {
+      animation: ${menuShow} 0.15s ease-out;
+    }
 
-export const Trigger = styled.button.attrs({
-  type: 'button',
-  ariaHaspopup: 'true',
-  ariaControls: 'dropdown-menu',
-})`
-  background: transparent;
+    // NOTE: animation-fill-mode: forwards is required to
+    // prevent flickering with React 18 createRoot()
+    ${menuSelector.stateClosing} {
+      animation: ${menuHide} 0.2s ease-out forwards;
+    }
+
+    ${menuItemSelector.name} {
+      padding: 6px 16px;
+      min-width: 150px;
+      background-color: ${dropdown.item.backgroundColor.default};
+      white-space: nowrap;
+    }
+
+    ${menuItemSelector.hover} {
+      background-color: ${dropdown.item.backgroundColor.hover};
+    }
+
+    ${menuItemSelector.disabled} {
+      cursor: not-allowed;
+    }
+  `
+);
+
+export const DropdownButton = styled.button`
+  background-color: transparent;
   border: none;
   display: flex;
-  align-items: 'center';
-  justify-content: 'center';
-  &:hover {
-    cursor: pointer;
-  }
+  cursor: pointer;
+`;
+
+export const DangerItem = styled.div`
+  color: ${({ theme: { dropdown } }) => dropdown.item.color.danger};
 `;
 
-export const Item = styled.a.attrs({
-  href: '#end',
-  role: 'menuitem',
-  type: 'button',
-})<{ $isDanger: boolean }>`
-  color: ${({ $isDanger, theme }) =>
-    $isDanger ? theme.dropdown.color : 'initial'};
+export const DropdownItemHint = styled.div`
+  color: ${({ theme }) => theme.topicMetaData.color.label};
+  font-size: 12px;
+  margin-top: 5px;
 `;
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
index 073f79ddfe8..0a7da0e956c 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
@@ -1,46 +1,46 @@
-import useOutsideClickRef from '@rooks/use-outside-click-ref';
-import cx from 'classnames';
-import React, { PropsWithChildren, useMemo, useState } from 'react';
+import { MenuProps } from '@szhsin/react-menu';
+import React, { PropsWithChildren, useRef } from 'react';
+import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
+import useModal from 'lib/hooks/useModal';
 
 import * as S from './Dropdown.styled';
 
-export interface DropdownProps {
-  label: React.ReactNode;
-  right?: boolean;
-  up?: boolean;
+interface DropdownProps extends PropsWithChildren<Partial<MenuProps>> {
+  label?: React.ReactNode;
 }
 
-const Dropdown: React.FC<PropsWithChildren<DropdownProps>> = ({
-  label,
-  right,
-  up,
-  children,
-}) => {
-  const [active, setActive] = useState<boolean>(false);
-  const [wrapperRef] = useOutsideClickRef(() => setActive(false));
-  const onClick = (e: React.MouseEvent) => {
+const Dropdown: React.FC<DropdownProps> = ({ label, children }) => {
+  const ref = useRef(null);
+  const { isOpen, setClose, setOpen } = useModal(false);
+
+  const handleClick: React.MouseEventHandler<HTMLButtonElement> = (e) => {
+    e.preventDefault();
     e.stopPropagation();
-    setActive(!active);
+    setOpen();
   };
 
-  const classNames = useMemo(
-    () =>
-      cx('dropdown', {
-        'is-active': active,
-        'is-right': right,
-        'is-up': up,
-      }),
-    [active, right, up]
-  );
   return (
-    <div className={classNames} ref={wrapperRef}>
-      <S.TriggerWrapper>
-        <S.Trigger onClick={onClick}>{label}</S.Trigger>
-      </S.TriggerWrapper>
-      <div className="dropdown-menu" id="dropdown-menu" role="menu">
-        <div className="dropdown-content has-text-left">{children}</div>
-      </div>
-    </div>
+    <>
+      <S.DropdownButton
+        onClick={handleClick}
+        ref={ref}
+        aria-label="Dropdown Toggle"
+      >
+        {label || <VerticalElipsisIcon />}
+      </S.DropdownButton>
+      <S.Dropdown
+        anchorRef={ref}
+        state={isOpen ? 'open' : 'closed'}
+        onMouseLeave={setClose}
+        onClose={setClose}
+        align="end"
+        direction="bottom"
+        offsetY={10}
+        viewScroll="auto"
+      >
+        {children}
+      </S.Dropdown>
+    </>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/DropdownDivider.tsx b/kafka-ui-react-app/src/components/common/Dropdown/DropdownDivider.tsx
deleted file mode 100644
index d9a8dc1ecdf..00000000000
--- a/kafka-ui-react-app/src/components/common/Dropdown/DropdownDivider.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react';
-
-const DropdownDivider: React.FC = () => <hr className="dropdown-divider" />;
-
-export default DropdownDivider;
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx b/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
index 364bc8ed8de..055ab9d53be 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
+++ b/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
@@ -1,31 +1,32 @@
 import React, { PropsWithChildren } from 'react';
+import { ClickEvent, MenuItem, MenuItemProps } from '@szhsin/react-menu';
 
 import * as S from './Dropdown.styled';
 
-interface DropdownItemProps {
-  onClick(): void;
+interface DropdownItemProps extends PropsWithChildren<MenuItemProps> {
   danger?: boolean;
+  onClick?(): void;
 }
 
-const DropdownItem: React.FC<PropsWithChildren<DropdownItemProps>> = ({
+const DropdownItem: React.FC<DropdownItemProps> = ({
   onClick,
   danger,
   children,
+  ...rest
 }) => {
-  const onClickHandler = (e: React.MouseEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
+  const handleClick = (e: ClickEvent) => {
+    if (!onClick) return;
+
+    // eslint-disable-next-line no-param-reassign
+    e.stopPropagation = true;
+    e.syntheticEvent.stopPropagation();
     onClick();
   };
 
   return (
-    <S.Item
-      $isDanger={!!danger}
-      onClick={onClickHandler}
-      className="dropdown-item is-link"
-    >
-      {children}
-    </S.Item>
+    <MenuItem onClick={handleClick} {...rest}>
+      {danger ? <S.DangerItem>{children}</S.DangerItem> : children}
+    </MenuItem>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/__tests__/Dropdown.spec.tsx b/kafka-ui-react-app/src/components/common/Dropdown/__tests__/Dropdown.spec.tsx
deleted file mode 100644
index 3df18aa511b..00000000000
--- a/kafka-ui-react-app/src/components/common/Dropdown/__tests__/Dropdown.spec.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React from 'react';
-import Dropdown, { DropdownProps } from 'components/common/Dropdown/Dropdown';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
-import DropdownDivider from 'components/common/Dropdown/DropdownDivider';
-import userEvent from '@testing-library/user-event';
-import { render } from 'lib/testHelpers';
-import { screen } from '@testing-library/react';
-
-const dummyLable = 'My Test Label';
-const dummyChildren = (
-  <>
-    <DropdownItem onClick={jest.fn()}>Child 1</DropdownItem>
-    <DropdownItem onClick={jest.fn()}>Child 2</DropdownItem>
-    <DropdownDivider />
-    <DropdownItem onClick={jest.fn()}>Child 3</DropdownItem>
-  </>
-);
-
-describe('Dropdown', () => {
-  const setupWrapper = (
-    props: Partial<DropdownProps> = {},
-    children: React.ReactNode = undefined
-  ) => (
-    <Dropdown label={dummyLable} {...props}>
-      {children}
-    </Dropdown>
-  );
-
-  it('renders Dropdown with initial props', () => {
-    const wrapper = render(setupWrapper()).baseElement;
-    expect(wrapper.querySelector('.dropdown')).toBeTruthy();
-
-    expect(wrapper.querySelector('.dropdown.is-active')).toBeFalsy();
-    expect(wrapper.querySelector('.dropdown.is-right')).toBeFalsy();
-    expect(wrapper.querySelector('.dropdown.is-up')).toBeFalsy();
-
-    expect(wrapper.querySelector('.dropdown-content')).toBeTruthy();
-    expect(wrapper.querySelector('.dropdown-content')).toHaveTextContent('');
-  });
-
-  it('renders custom children', () => {
-    const wrapper = render(setupWrapper({}, dummyChildren)).baseElement;
-    expect(wrapper.querySelector('.dropdown-content')).toBeTruthy();
-    expect(wrapper.querySelectorAll('.dropdown-item').length).toEqual(3);
-    expect(wrapper.querySelectorAll('.dropdown-divider').length).toEqual(1);
-  });
-
-  it('renders dropdown with a right-aligned menu', () => {
-    const wrapper = render(setupWrapper({ right: true })).baseElement;
-    expect(wrapper.querySelector('.dropdown.is-right')).toBeTruthy();
-  });
-
-  it('renders dropdown with a popup menu', () => {
-    const wrapper = render(setupWrapper({ up: true })).baseElement;
-    expect(wrapper.querySelector('.dropdown.is-up')).toBeTruthy();
-  });
-
-  it('handles click', () => {
-    const wrapper = render(setupWrapper()).baseElement;
-    const button = screen.getByText('My Test Label');
-
-    expect(button).toBeInTheDocument();
-    expect(wrapper.querySelector('.dropdown.is-active')).toBeFalsy();
-
-    userEvent.click(button);
-    expect(wrapper.querySelector('.dropdown.is-active')).toBeTruthy();
-  });
-
-  it('to be in the document', () => {
-    render(
-      setupWrapper(
-        {
-          right: true,
-          up: true,
-        },
-        dummyChildren
-      )
-    );
-    expect(screen.getByRole('menu')).toBeInTheDocument();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/__tests__/DropdownItem.spec.tsx b/kafka-ui-react-app/src/components/common/Dropdown/__tests__/DropdownItem.spec.tsx
deleted file mode 100644
index 7efe0bcbb2c..00000000000
--- a/kafka-ui-react-app/src/components/common/Dropdown/__tests__/DropdownItem.spec.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import DropdownItem from 'components/common/Dropdown/DropdownItem';
-import { render } from 'lib/testHelpers';
-import userEvent from '@testing-library/user-event';
-import { screen } from '@testing-library/react';
-
-const onClick = jest.fn();
-
-describe('DropdownItem', () => {
-  it('to be in the document', () => {
-    render(<DropdownItem onClick={jest.fn()}>Item 1</DropdownItem>);
-    expect(screen.getByText('Item 1')).toBeInTheDocument();
-  });
-
-  it('handles Click', () => {
-    render(<DropdownItem onClick={onClick}>Item 1</DropdownItem>);
-    userEvent.click(screen.getByText('Item 1'));
-    expect(onClick).toHaveBeenCalled();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/index.ts b/kafka-ui-react-app/src/components/common/Dropdown/index.ts
new file mode 100644
index 00000000000..c11d5f30402
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Dropdown/index.ts
@@ -0,0 +1,5 @@
+import { DropdownItemHint } from './Dropdown.styled';
+import Dropdown from './Dropdown';
+import DropdownItem from './DropdownItem';
+
+export { Dropdown, DropdownItem, DropdownItemHint };
diff --git a/kafka-ui-react-app/src/theme/index.scss b/kafka-ui-react-app/src/theme/index.scss
index 6e13e349e21..84d54b9bdd2 100644
--- a/kafka-ui-react-app/src/theme/index.scss
+++ b/kafka-ui-react-app/src/theme/index.scss
@@ -1,12 +1,9 @@
 @import '@fortawesome/fontawesome-free/css/all.min.css';
 
 // Base
-@import "bulma/sass/base/minireset";
+@import "./minireset";
 @import "bulma/sass/base/generic";
 
-// Components
-@import "bulma/sass/components/dropdown";
-
 @import url('https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@400;500&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap');
 
diff --git a/kafka-ui-react-app/src/theme/minireset.css b/kafka-ui-react-app/src/theme/minireset.css
new file mode 100644
index 00000000000..896003eb17c
--- /dev/null
+++ b/kafka-ui-react-app/src/theme/minireset.css
@@ -0,0 +1 @@
+/*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */html,body,p,ol,ul,li,dl,dt,dd,blockquote,figure,fieldset,legend,textarea,pre,iframe,hr,h1,h2,h3,h4,h5,h6{margin:0;padding:0}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}ul{list-style:none}button,input,select{margin:0}html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}img,video{height:auto;max-width:100%}iframe{border:0}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index bf79a8148f0..363bafa9228 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -77,7 +77,18 @@ const theme = {
   breadcrumb: Colors.neutral[30],
   connectEditWarning: Colors.yellow[10],
   dropdown: {
-    color: Colors.red[50],
+    backgroundColor: Colors.neutral[0],
+    borderColor: Colors.neutral[5],
+    shadow: Colors.transparency[20],
+    item: {
+      color: {
+        danger: Colors.red[60],
+      },
+      backgroundColor: {
+        default: Colors.neutral[0],
+        hover: Colors.neutral[5],
+      },
+    },
   },
   ksqlDb: {
     query: {

From 13d168c8a55df8e5cb5f3b5359f6893a1461bc3c Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 1 Aug 2022 20:18:24 +0400
Subject: [PATCH 089/734] Fix e2e run on m1/arm (#2371)

* Fix e2e run on m1

* Update README.md
---
 kafka-ui-e2e-checks/README.md                 |   2 +-
 kafka-ui-e2e-checks/pom.xml                   |   8 +-
 .../kafka/ui/helpers/TestConfiguration.java   |   4 +-
 .../com/provectus/kafka/ui/base/BaseTest.java | 201 ++++++++++--------
 4 files changed, 120 insertions(+), 95 deletions(-)

diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index a970ef38dd2..25dc51d658b 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -18,7 +18,7 @@ This repository is for E2E UI automation.
 
 ### Prerequisites
 - Docker & Docker-compose
-- Java
+- Java (install aarch64 jdk if you have M1/arm chip)
 - Maven
   
 ### How to install
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 5f013a2b28d..d7f4f3ea285 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -126,6 +126,12 @@
             <artifactId>netty-transport-native-unix-common</artifactId>
             <version>${netty.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <version>${netty.version}</version>
+            <classifier>osx-aarch_64</classifier>
+        </dependency>
 
         <dependency>
             <groupId>org.testcontainers</groupId>
@@ -208,7 +214,7 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-           <version>${junit.platform-launcher.version}</version>
+            <version>${junit.platform-launcher.version}</version>
         </dependency>
         <dependency>
             <groupId>ru.yandex.qatools.allure</groupId>
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java
index 1134bf4f7e5..f8cf3111677 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java
@@ -14,10 +14,8 @@ public class TestConfiguration {
       Boolean.parseBoolean(System.getProperty("SAVE_PAGE_SOURCE", "false"));
   public static Boolean REOPEN_BROWSER_ON_FAIL =
       Boolean.parseBoolean(System.getProperty("REOPEN_BROWSER_ON_FAIL", "true"));
-  public static String BROWSER = System.getProperty("BROWSER", "chrome");
+  public static String BROWSER = System.getProperty("BROWSER", "chromium");
   public static String BROWSER_SIZE = System.getProperty("BROWSER_SIZE", "1920x1080");
   public static Boolean ENABLE_VNC = Boolean.parseBoolean(System.getProperty("ENABLE_VNC", "true"));
-  public static String IMAGE_NAME = System.getProperty("SELENIUM_DOCKER_IMAGE", "selenium/standalone-chrome");
-  public static String IMAGE_TAG = System.getProperty("SELENIUM_IMAGE_TAG", "103.0");
 
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index a188d0fd7fe..9ccd401b319 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -12,10 +12,18 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import io.qameta.allure.Allure;
 import io.qameta.allure.selenide.AllureSelenide;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.TakesScreenshot;
@@ -26,112 +34,125 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
 @Slf4j
 @DisplayNameGeneration(CamelCaseToSpacedDisplayNameGenerator.class)
 public class BaseTest {
 
-    protected Pages pages = Pages.INSTANCE;
-    protected Helpers helpers = Helpers.INSTANCE;
+  public static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome";
+  public static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium";
+  protected Pages pages = Pages.INSTANCE;
+  protected Helpers helpers = Helpers.INSTANCE;
 
-    private Screenshooter screenshooter = new Screenshooter();
+  private Screenshooter screenshooter = new Screenshooter();
 
-    private static final String IMAGE_NAME = TestConfiguration.IMAGE_NAME;
-    private static final String IMAGE_TAG = TestConfiguration.IMAGE_TAG;
-    protected static BrowserWebDriverContainer<?> webDriverContainer = null;
+  protected static BrowserWebDriverContainer<?> webDriverContainer = null;
 
-    public void compareScreenshots(String name) {
-        screenshooter.compareScreenshots(name);
-    }
+  public void compareScreenshots(String name) {
+    screenshooter.compareScreenshots(name);
+  }
 
-    public void compareScreenshots(String name, Boolean shouldUpdateScreenshots) {
-        screenshooter.compareScreenshots(name, shouldUpdateScreenshots);
-    }
+  public void compareScreenshots(String name, Boolean shouldUpdateScreenshots) {
+    screenshooter.compareScreenshots(name, shouldUpdateScreenshots);
+  }
 
-    @BeforeEach
-    public void setWebDriver() {
-        RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
-        WebDriverRunner.setWebDriver(remoteWebDriver);
-        remoteWebDriver.manage().window().setSize(new Dimension(1440, 1024));
-    }
+  @BeforeEach
+  public void setWebDriver() {
+    RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
+    WebDriverRunner.setWebDriver(remoteWebDriver);
+    remoteWebDriver.manage().window().setSize(new Dimension(1440, 1024));
+  }
 
-    @BeforeAll
-    public static void start() {
-        DockerImageName image = DockerImageName.parse(IMAGE_NAME).withTag(IMAGE_TAG);
-        webDriverContainer = new BrowserWebDriverContainer<>(image)
-                .withCapabilities(new ChromeOptions().addArguments("--disable-dev-shm-usage"))
-                .waitingFor(Wait.forHttp("/"))
-                .waitingFor(Wait.forLogMessage(".*Started Selenium Standalone.*", 1));
-        Testcontainers.exposeHostPorts(8080);
-        webDriverContainer.start();
-        webDriverContainer.isRunning();
-        webDriverContainer.isHostAccessible();
-    }
+  @BeforeAll
+  public static void start() {
 
-    @AfterAll
-    public static void tearDown() {
-        if (webDriverContainer.isRunning()) {
-            webDriverContainer.close();
-            webDriverContainer.stop();
-        }
-    }
+    DockerImageName image = isARM64()
+        ? DockerImageName.parse(SELENIARM_STANDALONE_CHROMIUM).asCompatibleSubstituteFor(SELENIUM_IMAGE_NAME)
+        : DockerImageName.parse(SELENIUM_IMAGE_NAME);
+    log.info("Using [{}] as image name for chrome", image.getUnversionedPart());
 
-    static {
-        if (!new File("./.env").exists()) {
-            try {
-                FileUtils.copyFile(new File(".env.example"), new File(".env"));
-            } catch (IOException e) {
-                log.error("couldn't copy .env.example to .env. Please add .env");
-                e.printStackTrace();
-            }
-        }
-        Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue()));
-        if (TestConfiguration.CLEAR_REPORTS_DIR) {
-            clearReports();
-        }
-        setup();
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-                if (TestCaseGenerator.FAILED) {
-                    log.error("Tests FAILED because some problem with @CaseId annotation. Verify that all tests annotated with @CaseId and Id is correct!");
-                    Runtime.getRuntime().halt(100500);
-                }
-        }));
+    webDriverContainer = new BrowserWebDriverContainer<>(image)
+        .withEnv("JAVA_OPTS", "-Dwebdriver.chrome.whitelistedIps=")
+        .withCapabilities(new ChromeOptions()
+            .addArguments("--disable-dev-shm-usage")
+            .addArguments("--verbose")
+        )
+        .waitingFor(Wait.forHttp("/"))
+        //.withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: ")) // uncomment for debugging
+        .waitingFor(Wait.forLogMessage(".*Started Selenium Standalone.*", 1));
+    try {
+      Testcontainers.exposeHostPorts(8080);
+      webDriverContainer.start();
+    } catch (Throwable e) {
+      log.error("Couldn't start a container", e);
     }
+  }
 
-    @AfterEach
-    public void afterMethod() {
-        Allure.addAttachment("Screenshot",
-                new ByteArrayInputStream(((TakesScreenshot) webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
+  @AfterAll
+  public static void tearDown() {
+    if (webDriverContainer.isRunning()) {
+      webDriverContainer.close();
+      webDriverContainer.stop();
     }
+  }
 
-    @SneakyThrows
-    private static void setup() {
-        Configuration.reportsFolder = TestConfiguration.REPORTS_FOLDER;
-        Configuration.screenshots = TestConfiguration.SCREENSHOTS;
-        Configuration.savePageSource = TestConfiguration.SAVE_PAGE_SOURCE;
-        Configuration.reopenBrowserOnFail = TestConfiguration.REOPEN_BROWSER_ON_FAIL;
-        Configuration.browser = TestConfiguration.BROWSER;
-        Configuration.baseUrl = TestConfiguration.BASE_WEB_URL;
-        Configuration.timeout = 10000;
-        Configuration.browserSize = TestConfiguration.BROWSER_SIZE;
-        SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
+  static {
+    if (!new File("./.env").exists()) {
+      try {
+        FileUtils.copyFile(new File(".env.example"), new File(".env"));
+      } catch (IOException e) {
+        log.error("couldn't copy .env.example to .env. Please add .env");
+        e.printStackTrace();
+      }
     }
+    Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue()));
+    if (TestConfiguration.CLEAR_REPORTS_DIR) {
+      clearReports();
+    }
+    setup();
+    Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+      if (TestCaseGenerator.FAILED) {
+        log.error(
+            "Tests FAILED because some problem with @CaseId annotation. Verify that all tests annotated with @CaseId and Id is correct!");
+        Runtime.getRuntime().halt(100500);
+      }
+    }));
+  }
+
+  @AfterEach
+  public void afterMethod() {
+    Allure.addAttachment("Screenshot",
+        new ByteArrayInputStream(
+            ((TakesScreenshot) webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
+  }
 
-    public static void clearReports() {
-        log.info(String.format("Clearing reports dir [%s]...", TestConfiguration.REPORTS_FOLDER));
-        File allureResults = new File(TestConfiguration.REPORTS_FOLDER);
-        if (allureResults.isDirectory()) {
-            File[] list = allureResults.listFiles();
-            if (list != null) {
-                Arrays.stream(list)
-                        .sequential()
-                        .filter(e -> !e.getName().equals("categories.json"))
-                        .forEach(File::delete);
-            }
-        }
+  @SneakyThrows
+  private static void setup() {
+    Configuration.reportsFolder = TestConfiguration.REPORTS_FOLDER;
+    Configuration.screenshots = TestConfiguration.SCREENSHOTS;
+    Configuration.savePageSource = TestConfiguration.SAVE_PAGE_SOURCE;
+    Configuration.reopenBrowserOnFail = TestConfiguration.REOPEN_BROWSER_ON_FAIL;
+    Configuration.browser = TestConfiguration.BROWSER;
+    Configuration.baseUrl = TestConfiguration.BASE_WEB_URL;
+    Configuration.timeout = 10000;
+    Configuration.browserSize = TestConfiguration.BROWSER_SIZE;
+    SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
+  }
+
+  public static void clearReports() {
+    log.info(String.format("Clearing reports dir [%s]...", TestConfiguration.REPORTS_FOLDER));
+    File allureResults = new File(TestConfiguration.REPORTS_FOLDER);
+    if (allureResults.isDirectory()) {
+      File[] list = allureResults.listFiles();
+      if (list != null) {
+        Arrays.stream(list)
+            .sequential()
+            .filter(e -> !e.getName().equals("categories.json"))
+            .forEach(File::delete);
+      }
     }
+  }
+
+  private static boolean isARM64() {
+    return System.getProperty("os.arch").equals("aarch64");
+  }
 }

From c4f97327c039d5d3cd6c5e845faa8b6a4337587d Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 1 Aug 2022 19:47:49 +0300
Subject: [PATCH 090/734] Make frontend work properly with custom context url
 (#2363)

* Add an ability to run app from subfolder

* linting

* Fix all the static resources URLs and manifest.json

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/controller/StaticController.java |  33 +++--
 kafka-ui-react-app/.jest/resolver.js          |   4 +
 kafka-ui-react-app/index.html                 |  21 +++-
 kafka-ui-react-app/package.json               |   4 +-
 kafka-ui-react-app/pnpm-lock.yaml             |  22 +---
 .../public/{ => favicon}/favicon.ico          | Bin
 kafka-ui-react-app/public/manifest.json       |   8 +-
 kafka-ui-react-app/src/components/App.tsx     |  11 +-
 .../src/components/Cluster/Cluster.tsx        |  24 ++--
 .../Connect/Details/Actions/Actions.tsx       |  21 ----
 .../Connect/List/__tests__/ListPage.spec.tsx  |   4 +-
 .../KsqlDb/Query/QueryForm/QueryForm.tsx      |   3 +-
 .../src/components/Nav/ClusterMenu.tsx        |   2 +-
 .../src/components/Nav/Nav.styled.ts          |   5 -
 .../src/components/Schemas/List/List.tsx      |   3 +-
 .../src/components/Topics/List/List.tsx       |   3 +-
 .../Topics/Topic/Details/Details.styled.ts    |  11 --
 .../Messages/Filters/Filters.styled.ts        |  16 +--
 .../Details/Messages/Filters/Filters.tsx      |  18 +--
 .../Details/Messages/Filters/InfoModal.tsx    |  14 +--
 .../Details/Messages/Filters/SavedFilters.tsx |   3 +-
 .../Filters/__tests__/Filters.spec.tsx        |   6 +-
 .../Filters/__tests__/SavedFilters.spec.tsx   |  14 ++-
 .../Topic/Details/Overview/Overview.styled.ts |  16 +++
 .../Topic/Details/Overview/Overview.tsx       |  16 +--
 .../Overview/__test__/Overview.spec.tsx       |   9 +-
 .../shared/Form/CustomParams/CustomParams.tsx |   3 +-
 .../components/common/Button/Button.styled.ts |   2 +-
 .../components/common/Icons/ArrowDownIcon.tsx |  15 +++
 .../src/components/common/Icons/ClockIcon.tsx |  15 +++
 .../components/common/Icons/DeleteIcon.tsx    |  20 +++
 .../src/components/common/Icons/FileIcon.tsx  |  15 +++
 .../src/components/common/Icons/PlusIcon.tsx  |  17 +++
 .../components/common/Icons/SearchIcon.tsx    |  10 ++
 .../components/common/Icons/SpinnerIcon.tsx   |  85 +++++++++++++
 .../components/common/Input/Input.styled.ts   |  30 ++---
 .../src/components/common/Input/Input.tsx     |  26 +---
 .../components/common/Metrics/Indicator.tsx   |  13 +-
 .../src/components/common/Search/Search.tsx   |   2 +-
 .../TableHeaderCell/TableHeaderCell.styled.ts |   1 +
 .../src/components/global.css.ts              | 115 ++++++++++++++++++
 kafka-ui-react-app/src/index.tsx              |   2 +-
 kafka-ui-react-app/src/theme/index.scss       |  38 +-----
 kafka-ui-react-app/src/theme/theme.ts         |  18 ++-
 kafka-ui-react-app/vite.config.ts             |  24 ++--
 45 files changed, 487 insertions(+), 255 deletions(-)
 rename kafka-ui-react-app/public/{ => favicon}/favicon.ico (100%)
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Details.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/ArrowDownIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/ClockIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/FileIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/PlusIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/SearchIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/SpinnerIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/global.css.ts

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java
index c2d6a10b366..696f47073b7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java
@@ -20,21 +20,30 @@ public class StaticController {
 
   @Value("classpath:static/index.html")
   private Resource indexFile;
+  @Value("classpath:static/manifest.json")
+  private Resource manifestFile;
+
   private final AtomicReference<String> renderedIndexFile = new AtomicReference<>();
+  private final AtomicReference<String> renderedManifestFile = new AtomicReference<>();
 
   @GetMapping(value = "/index.html", produces = {"text/html"})
   public Mono<ResponseEntity<String>> getIndex(ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity.ok(getRenderedIndexFile(exchange)));
+    return Mono.just(ResponseEntity.ok(getRenderedFile(exchange, renderedIndexFile, indexFile)));
+  }
+
+  @GetMapping(value = "/manifest.json", produces = {"application/json"})
+  public Mono<ResponseEntity<String>> getManifest(ServerWebExchange exchange) {
+    return Mono.just(ResponseEntity.ok(getRenderedFile(exchange, renderedManifestFile, manifestFile)));
   }
 
-  public String getRenderedIndexFile(ServerWebExchange exchange) {
-    String rendered = renderedIndexFile.get();
+  public String getRenderedFile(ServerWebExchange exchange, AtomicReference<String> renderedFile, Resource file) {
+    String rendered = renderedFile.get();
     if (rendered == null) {
-      rendered = buildIndexFile(exchange.getRequest().getPath().contextPath().value());
-      if (renderedIndexFile.compareAndSet(null, rendered)) {
+      rendered = buildFile(file, exchange.getRequest().getPath().contextPath().value());
+      if (renderedFile.compareAndSet(null, rendered)) {
         return rendered;
       } else {
-        return renderedIndexFile.get();
+        return renderedFile.get();
       }
     } else {
       return rendered;
@@ -42,11 +51,11 @@ public String getRenderedIndexFile(ServerWebExchange exchange) {
   }
 
   @SneakyThrows
-  private String buildIndexFile(String contextPath) {
-    final String staticPath = contextPath + "/static";
-    return ResourceUtil.readAsString(indexFile)
-        .replace("href=\"./static", "href=\"" + staticPath)
-        .replace("src=\"./static", "src=\"" + staticPath)
-        .replace("window.basePath=\"\"", "window.basePath=\"" + contextPath + "\"");
+  private String buildFile(Resource file, String contextPath) {
+    return ResourceUtil.readAsString(file)
+        .replace("\"/assets/", "\"" + contextPath + "/assets/")
+        .replace("\"/favicon/", "\"" + contextPath + "/favicon/")
+        .replace("/manifest.json", contextPath + "/manifest.json")
+        .replace("window.basePath = ''", "window.basePath=\"" + contextPath + "\"");
   }
 }
diff --git a/kafka-ui-react-app/.jest/resolver.js b/kafka-ui-react-app/.jest/resolver.js
index a1165c6e27d..24504e48883 100644
--- a/kafka-ui-react-app/.jest/resolver.js
+++ b/kafka-ui-react-app/.jest/resolver.js
@@ -16,6 +16,10 @@ module.exports = (path, options) => {
         delete pkg['exports'];
         delete pkg['module'];
       }
+      if (pkg.name === 'jsonpath-plus') {
+        delete pkg['exports'];
+        delete pkg['module'];
+      }
       return pkg;
     },
   });
diff --git a/kafka-ui-react-app/index.html b/kafka-ui-react-app/index.html
index 4fe0d8df0a5..7b4ed2772aa 100644
--- a/kafka-ui-react-app/index.html
+++ b/kafka-ui-react-app/index.html
@@ -2,17 +2,28 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="/favicon.ico" sizes="any"><!-- 32×32 -->
-    <link rel="icon" href="/favicon/icon.svg" type="image/svg+xml">
-    <link rel="apple-touch-icon" href="/favicon/apple-touch-icon.png"><!-- 180×180 -->
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+    <!-- Google fonts -->
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500&family=Roboto+Mono:wght@400;500&display=swap"
+      rel="stylesheet"
+    />
+
+    <!-- Favicons -->
+    <link rel="icon" href="/favicon/favicon.ico" sizes="any" />
+    <link rel="icon" href="/favicon/icon.svg" type="image/svg+xml" />
+    <link rel="apple-touch-icon" href="/favicon/apple-touch-icon.png" />
     <link rel="manifest" href="/manifest.json" />
 
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>UI for Apache Kafka</title>
     <script type="text/javascript">
-      window.basePath = "";
+      window.basePath = '';
     </script>
   </head>
+
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 57a10a966d4..1110162a4f0 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -7,7 +7,6 @@
     "@babel/core": "^7.16.0",
     "@babel/plugin-syntax-flow": "^7.18.6",
     "@babel/plugin-transform-react-jsx": "^7.18.6",
-    "@fortawesome/fontawesome-free": "^6.1.1",
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
     "@reduxjs/toolkit": "^1.8.3",
@@ -20,13 +19,12 @@
     "ace-builds": "^1.7.1",
     "ajv": "^8.6.3",
     "babel-jest": "^28.1.1",
-    "bulma": "^0.9.3",
     "classnames": "^2.2.6",
     "dayjs": "^1.11.2",
     "fetch-mock": "^9.11.0",
     "jest": "^28.1.1",
     "jest-watch-typeahead": "^2.0.0",
-    "json-schema-faker": "^0.5.0-rcv.39",
+    "json-schema-faker": "^0.5.0-rcv.44",
     "lodash": "^4.17.21",
     "pretty-ms": "7.0.1",
     "react": "^18.1.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 3e6471154db..f86fe5f75a1 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -7,7 +7,6 @@ specifiers:
   '@babel/preset-env': ^7.18.2
   '@babel/preset-react': ^7.17.12
   '@babel/preset-typescript': ^7.17.12
-  '@fortawesome/fontawesome-free': ^6.1.1
   '@hookform/error-message': ^2.0.0
   '@hookform/resolvers': ^2.7.1
   '@jest/types': ^28.1.1
@@ -36,7 +35,6 @@ specifiers:
   ace-builds: ^1.7.1
   ajv: ^8.6.3
   babel-jest: ^28.1.1
-  bulma: ^0.9.3
   classnames: ^2.2.6
   dayjs: ^1.11.2
   dotenv: ^16.0.1
@@ -60,7 +58,7 @@ specifiers:
   jest-sonar-reporter: ^2.0.0
   jest-styled-components: ^7.0.8
   jest-watch-typeahead: ^2.0.0
-  json-schema-faker: ^0.5.0-rcv.39
+  json-schema-faker: ^0.5.0-rcv.44
   lint-staged: ^13.0.2
   lodash: ^4.17.21
   prettier: ^2.3.1
@@ -93,7 +91,6 @@ dependencies:
   '@babel/core': 7.18.2
   '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.2
   '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
-  '@fortawesome/fontawesome-free': 6.1.1
   '@hookform/error-message': 2.0.0_l2dcsysovzdujulgxvsen7vbsm
   '@hookform/resolvers': 2.8.9_react-hook-form@7.6.9
   '@reduxjs/toolkit': 1.8.3_ctm756ikdwcjcvyfxxwskzbr6q
@@ -106,13 +103,12 @@ dependencies:
   ace-builds: 1.7.1
   ajv: 8.8.2
   babel-jest: 28.1.1_@babel+core@7.18.2
-  bulma: 0.9.3
   classnames: 2.3.1
   dayjs: 1.11.3
   fetch-mock: 9.11.0
   jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
   jest-watch-typeahead: 2.0.0_jest@28.1.1
-  json-schema-faker: 0.5.0-rcv.40
+  json-schema-faker: 0.5.0-rcv.44
   lodash: 4.17.21
   pretty-ms: 7.0.1
   react: 18.1.0
@@ -1894,12 +1890,6 @@ packages:
       - supports-color
     dev: true
 
-  /@fortawesome/fontawesome-free/6.1.1:
-    resolution: {integrity: sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg==}
-    engines: {node: '>=6'}
-    requiresBuild: true
-    dev: false
-
   /@hookform/error-message/2.0.0_l2dcsysovzdujulgxvsen7vbsm:
     resolution: {integrity: sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==}
     peerDependencies:
@@ -3376,10 +3366,6 @@ packages:
       ieee754: 1.2.1
     dev: true
 
-  /bulma/0.9.3:
-    resolution: {integrity: sha512-0d7GNW1PY4ud8TWxdNcP6Cc8Bu7MxcntD/RRLGWuiw/s0a9P+XlH/6QoOIrmbj6o8WWJzJYhytiu9nFjTszk1g==}
-    dev: false
-
   /call-bind/1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
@@ -5860,8 +5846,8 @@ packages:
   /json-parse-even-better-errors/2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
-  /json-schema-faker/0.5.0-rcv.40:
-    resolution: {integrity: sha512-BczZvu03jKrGh3ovCWrHusiX6MwiaKK2WZeyomKBNA8Nm/n7aBYz0mub1CnONB6cgxOZTNxx4afNmLblbUmZbA==}
+  /json-schema-faker/0.5.0-rcv.44:
+    resolution: {integrity: sha512-MbDxYFsPXTVMawW1Y6zEU7QhfwsT+ZJ2d+LI8n57Y8+Xw1Cdx1hITgsFTLNOJ1lDMHZqWeXGGgMbc1hW0BGisg==}
     hasBin: true
     dependencies:
       json-schema-ref-parser: 6.1.0
diff --git a/kafka-ui-react-app/public/favicon.ico b/kafka-ui-react-app/public/favicon/favicon.ico
similarity index 100%
rename from kafka-ui-react-app/public/favicon.ico
rename to kafka-ui-react-app/public/favicon/favicon.ico
diff --git a/kafka-ui-react-app/public/manifest.json b/kafka-ui-react-app/public/manifest.json
index 1f6e4871af1..fd521d3d839 100644
--- a/kafka-ui-react-app/public/manifest.json
+++ b/kafka-ui-react-app/public/manifest.json
@@ -11,9 +11,5 @@
       "type": "image/png",
       "sizes": "512x512"
     }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
\ No newline at end of file
+  ]
+}
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 9de19134eaa..7d28a7bcc3c 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -12,11 +12,11 @@ import theme from 'theme/theme';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { showServerError } from 'lib/errorHandling';
 import { Toaster } from 'react-hot-toast';
-
-import * as S from './App.styled';
-import Logo from './common/Logo/Logo';
-import GitIcon from './common/Icons/GitIcon';
-import DiscordIcon from './common/Icons/DiscordIcon';
+import GlobalCSS from 'components/global.css';
+import * as S from 'components/App.styled';
+import Logo from 'components/common/Logo/Logo';
+import GitIcon from 'components/common/Icons/GitIcon';
+import DiscordIcon from 'components/common/Icons/DiscordIcon';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -44,6 +44,7 @@ const App: React.FC = () => {
   return (
     <QueryClientProvider client={queryClient}>
       <ThemeProvider theme={theme}>
+        <GlobalCSS />
         <S.Layout>
           <S.Navbar role="navigation" aria-label="Page Header">
             <S.NavbarBrand>
diff --git a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
index 4ca9fa44cdc..e9758c96b63 100644
--- a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
@@ -19,15 +19,23 @@ import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 import { BreadcrumbProvider } from 'components/common/Breadcrumb/Breadcrumb.provider';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { useClusters } from 'lib/hooks/api/clusters';
+import Brokers from 'components/Brokers/Brokers';
+import Topics from 'components/Topics/Topics';
+import Schemas from 'components/Schemas/Schemas';
+import Connect from 'components/Connect/Connect';
+import KsqlDb from 'components/KsqlDb/KsqlDb';
+import ConsumerGroups from 'components/ConsumerGroups/ConsumerGroups';
 
-const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
-const Topics = React.lazy(() => import('components/Topics/Topics'));
-const Schemas = React.lazy(() => import('components/Schemas/Schemas'));
-const Connect = React.lazy(() => import('components/Connect/Connect'));
-const KsqlDb = React.lazy(() => import('components/KsqlDb/KsqlDb'));
-const ConsumerGroups = React.lazy(
-  () => import('components/ConsumerGroups/ConsumerGroups')
-);
+// We can't use Lazy loading till we have a better way to update publicPath in runtime
+// Now java app replaces paths in builded index.html file.
+// const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
+// const Topics = React.lazy(() => import('components/Topics/Topics'));
+// const Schemas = React.lazy(() => import('components/Schemas/Schemas'));
+// const Connect = React.lazy(() => import('components/Connect/Connect'));
+// const KsqlDb = React.lazy(() => import('components/KsqlDb/KsqlDb'));
+// const ConsumerGroups = React.lazy(
+//   () => import('components/ConsumerGroups/ConsumerGroups')
+// );
 
 const Cluster: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index 3d0c788a905..d672f7985f5 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -71,9 +71,6 @@ const Actions: React.FC = () => {
           onClick={pauseConnectorHandler}
           disabled={isMutating}
         >
-          <span>
-            <i className="fas fa-pause" />
-          </span>
           <span>Pause</span>
         </Button>
       )}
@@ -86,9 +83,6 @@ const Actions: React.FC = () => {
           onClick={resumeConnectorHandler}
           disabled={isMutating}
         >
-          <span>
-            <i className="fas fa-play" />
-          </span>
           <span>Resume</span>
         </Button>
       )}
@@ -100,9 +94,6 @@ const Actions: React.FC = () => {
         onClick={restartConnectorHandler}
         disabled={isMutating}
       >
-        <span>
-          <i className="fas fa-sync-alt" />
-        </span>
         <span>Restart Connector</span>
       </Button>
       <Button
@@ -112,9 +103,6 @@ const Actions: React.FC = () => {
         onClick={restartAllTasksHandler}
         disabled={isMutating}
       >
-        <span>
-          <i className="fas fa-sync-alt" />
-        </span>
         <span>Restart All Tasks</span>
       </Button>
       <Button
@@ -124,9 +112,6 @@ const Actions: React.FC = () => {
         onClick={restartFailedTasksHandler}
         disabled={isMutating}
       >
-        <span>
-          <i className="fas fa-sync-alt" />
-        </span>
         <span>Restart Failed Tasks</span>
       </Button>
       <Button
@@ -140,9 +125,6 @@ const Actions: React.FC = () => {
           routerProps.connectorName
         )}
       >
-        <span>
-          <i className="fas fa-pencil-alt" />
-        </span>
         <span>Edit Config</span>
       </Button>
 
@@ -153,9 +135,6 @@ const Actions: React.FC = () => {
         onClick={setDeleteConnectorConfirmationOpen}
         disabled={isMutating}
       >
-        <span>
-          <i className="far fa-trash-alt" />
-        </span>
         <span>Delete</span>
       </Button>
       <ConfirmationModal
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx
index 18166c4c9e7..7da8e47e82a 100644
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListPage.spec.tsx
@@ -18,6 +18,8 @@ jest.mock('lib/hooks/api/kafkaConnect', () => ({
   useConnectors: jest.fn(),
 }));
 
+jest.mock('components/common/Icons/SpinnerIcon', () => () => 'progressbar');
+
 const clusterName = 'local';
 
 describe('Connectors List Page', () => {
@@ -82,7 +84,7 @@ describe('Connectors List Page', () => {
       await renderComponent();
       const metrics = screen.getByRole('group');
       expect(metrics).toBeInTheDocument();
-      expect(within(metrics).getAllByRole('progressbar').length).toEqual(3);
+      expect(within(metrics).getAllByText('progressbar').length).toEqual(3);
     });
 
     it('renders indicators for empty list of connectors', async () => {
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
index 6edd4b428bb..ee78877d225 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
@@ -7,6 +7,7 @@ import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import CloseIcon from 'components/common/Icons/CloseIcon';
 import { yupResolver } from '@hookform/resolvers/yup';
 import yup from 'lib/yupExtended';
+import PlusIcon from 'components/common/Icons/PlusIcon';
 
 import * as S from './QueryForm.styled';
 
@@ -165,7 +166,7 @@ const QueryForm: React.FC<Props> = ({
               buttonType="secondary"
               onClick={() => append({ key: '', value: '' })}
             >
-              <i className="fas fa-plus" />
+              <PlusIcon />
               Add Stream Property
             </Button>
           </S.StreamPropertiesContainer>
diff --git a/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx b/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx
index 95043b99641..dff0e7f3ae9 100644
--- a/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx
+++ b/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx
@@ -27,7 +27,7 @@ const ClusterMenu: React.FC<Props> = ({
   const [isOpen, setIsOpen] = React.useState(!!singleMode);
   return (
     <S.List>
-      <S.Divider />
+      <hr />
       <ClusterTab
         title={name}
         status={status}
diff --git a/kafka-ui-react-app/src/components/Nav/Nav.styled.ts b/kafka-ui-react-app/src/components/Nav/Nav.styled.ts
index 6cce7c43654..36e9f6454bb 100644
--- a/kafka-ui-react-app/src/components/Nav/Nav.styled.ts
+++ b/kafka-ui-react-app/src/components/Nav/Nav.styled.ts
@@ -9,11 +9,6 @@ export const List = styled.ul.attrs({ role: 'menu' })`
   }
 `;
 
-export const Divider = styled.hr`
-  margin: 0;
-  height: 1px;
-`;
-
 export const Link = styled(NavLink)(
   ({ theme }) => css`
     width: 100%;
diff --git a/kafka-ui-react-app/src/components/Schemas/List/List.tsx b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
index fa2e601838e..f40171a1d48 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
@@ -20,6 +20,7 @@ import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import Search from 'components/common/Search/Search';
 import useSearch from 'lib/hooks/useSearch';
+import PlusIcon from 'components/common/Icons/PlusIcon';
 
 import ListItem from './ListItem';
 import GlobalSchemaSelector from './GlobalSchemaSelector/GlobalSchemaSelector';
@@ -54,7 +55,7 @@ const List: React.FC = () => {
               buttonType="primary"
               to={clusterSchemaNewRelativePath}
             >
-              <i className="fas fa-plus" /> Create Schema
+              <PlusIcon /> Create Schema
             </Button>
           </>
         )}
diff --git a/kafka-ui-react-app/src/components/Topics/List/List.tsx b/kafka-ui-react-app/src/components/Topics/List/List.tsx
index b83659d4d71..9caeced9283 100644
--- a/kafka-ui-react-app/src/components/Topics/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/List.tsx
@@ -29,6 +29,7 @@ import Switch from 'components/common/Switch/Switch';
 import { SmartTable } from 'components/common/SmartTable/SmartTable';
 import { TableColumn } from 'components/common/SmartTable/TableColumn';
 import { useTableState } from 'lib/hooks/useTableState';
+import PlusIcon from 'components/common/Icons/PlusIcon';
 
 import {
   MessagesCell,
@@ -192,7 +193,7 @@ const List: React.FC<TopicsListProps> = ({
               buttonSize="M"
               to={clusterTopicNewRelativePath}
             >
-              <i className="fas fa-plus" /> Add a Topic
+              <PlusIcon /> Add a Topic
             </Button>
           )}
         </PageHeading>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.styled.ts
deleted file mode 100644
index 5579f1c7cba..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.styled.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import styled from 'styled-components';
-
-export const ReplicaCell = styled.span.attrs({ 'aria-label': 'replica-info' })<{
-  leader?: boolean;
-}>`
-  ${this} ~ ${this}::before {
-    color: black;
-    content: ', ';
-  }
-  color: ${(props) => (props.leader ? 'orange' : null)};
-`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
index 296c27b4ecb..2885a32d3a2 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
@@ -114,7 +114,7 @@ export const ButtonContainer = styled.div`
 export const ListItem = styled.li`
   font-size: 12px;
   font-weight: 400;
-  margin-left: 20px;
+  margin: 4px 0;
   line-height: 1.5;
   color: ${({ theme }) => theme.table.td.color.normal};
 `;
@@ -127,16 +127,6 @@ export const InfoParagraph = styled.div`
   color: ${({ theme }) => theme.table.td.color.normal};
 `;
 
-export const InfoCodeSample = styled.pre`
-  background: #f5f5f5;
-  padding: 5px;
-  border: 1px solid #e1e1e1;
-  border-radius: 5px;
-  width: fit-content;
-  margin: 5px 20px;
-  color: #cc0f35;
-`;
-
 export const MessageFilterModal = styled.div`
   height: auto;
   width: 560px;
@@ -240,8 +230,9 @@ export const ActiveSmartFilterWrapper = styled.div`
 `;
 
 export const DeleteSavedFilter = styled.div.attrs({ role: 'deleteIcon' })`
-  color: ${({ theme }) => theme.breadcrumb};
+  margin-top: 2px;
   cursor: pointer;
+  color: ${({ theme }) => theme.icons.deleteIcon};
 `;
 
 export const FilterEdit = styled.div`
@@ -299,7 +290,6 @@ export const ActiveSmartFilter = styled.div`
 
 export const DeleteSavedFilterIcon = styled.div`
   color: ${({ theme }) => theme.icons.closeIcon};
-  border-left: 1px solid ${({ theme }) => theme.savedFilterDivider.color};
   display: flex;
   align-items: center;
   padding-left: 6px;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
index 5cf9b2af573..c4512078bb0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
@@ -30,6 +30,11 @@ import { getPartitionsByTopicName } from 'redux/reducers/topics/selectors';
 import { useAppSelector } from 'lib/hooks/redux';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
+import PlusIcon from 'components/common/Icons/PlusIcon';
+import CloseIcon from 'components/common/Icons/CloseIcon';
+import ClockIcon from 'components/common/Icons/ClockIcon';
+import ArrowDownIcon from 'components/common/Icons/ArrowDownIcon';
+import FileIcon from 'components/common/Icons/FileIcon';
 
 import * as S from './Filters.styled';
 import {
@@ -474,17 +479,14 @@ const Filters: React.FC<FiltersProps> = ({
       </div>
       <S.ActiveSmartFilterWrapper>
         <Button buttonType="primary" buttonSize="M" onClick={toggle}>
-          <i className="fas fa-plus fa-sm" />
+          <PlusIcon />
           Add Filters
         </Button>
         {activeFilter.name && (
           <S.ActiveSmartFilter data-testid="activeSmartFilter">
             {activeFilter.name}
             <S.DeleteSavedFilterIcon onClick={deleteActiveFilter}>
-              <i
-                className="fas fa-times"
-                data-testid="activeSmartFilterCloseIcon"
-              />
+              <CloseIcon />
             </S.DeleteSavedFilterIcon>
           </S.ActiveSmartFilter>
         )}
@@ -519,19 +521,19 @@ const Filters: React.FC<FiltersProps> = ({
         </S.MessageLoading>
         <S.Metric title="Elapsed Time">
           <S.MetricsIcon>
-            <i className="far fa-clock" />
+            <ClockIcon />
           </S.MetricsIcon>
           <span>{Math.max(elapsedMs || 0, 0)} ms</span>
         </S.Metric>
         <S.Metric title="Bytes Consumed">
           <S.MetricsIcon>
-            <i className="fas fa-arrow-down" />
+            <ArrowDownIcon />
           </S.MetricsIcon>
           <BytesFormatted value={bytesConsumed} />
         </S.Metric>
         <S.Metric title="Messages Consumed">
           <S.MetricsIcon>
-            <i className="far fa-file-alt" />
+            <FileIcon />
           </S.MetricsIcon>
           <span>{messagesConsumed} messages consumed</span>
         </S.Metric>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx
index b879e7bf0d8..6a505cab634 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx
@@ -45,19 +45,19 @@ const InfoModal: React.FC<InfoModalProps> = ({ toggleIsOpen }) => {
             headers[&quot;sentAt&quot;] == &quot;2020-01-01&quot;
           </code>
         </S.ListItem>
-        <S.ListItem>multiline filters are also allowed:</S.ListItem>
-        <S.InfoParagraph>
-          <S.InfoCodeSample>
-            <code>
+        <S.ListItem>
+          multiline filters are also allowed:
+          <S.InfoParagraph>
+            <pre>
               def name = value.name
               <br />
               def age = value.age
               <br />
               name == &quot;iliax&quot; && age == 30
               <br />
-            </code>
-          </S.InfoCodeSample>
-        </S.InfoParagraph>
+            </pre>
+          </S.InfoParagraph>
+        </S.ListItem>
       </ol>
       <S.ButtonContainer>
         <Button
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx
index 12d383a089c..1bfb5f096c6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx
@@ -2,6 +2,7 @@ import React, { FC } from 'react';
 import { Button } from 'components/common/Button/Button';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import useModal from 'lib/hooks/useModal';
+import DeleteIcon from 'components/common/Icons/DeleteIcon';
 
 import * as S from './Filters.styled';
 import { MessageFilters } from './Filters';
@@ -73,7 +74,7 @@ const SavedFilters: FC<Props> = ({
                 Edit
               </S.FilterEdit>
               <S.DeleteSavedFilter onClick={() => deleteFilterHandler(index)}>
-                <i className="fas fa-times" />
+                <DeleteIcon />
               </S.DeleteSavedFilter>
             </S.FilterOptions>
           </S.SavedFilter>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx
index d6030b05542..a633e1c52ce 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx
@@ -19,6 +19,8 @@ const defaultContextValue: ContextProps = {
   changeSeekDirection: jest.fn(),
 };
 
+jest.mock('components/common/Icons/CloseIcon', () => () => 'mock-CloseIcon');
+
 const renderComponent = (
   props: Partial<FiltersProps> = {},
   ctx: ContextProps = defaultContextValue
@@ -195,9 +197,7 @@ describe('Filters component', () => {
 
     it('delete the active smart Filter', async () => {
       const smartFilterElement = screen.getByTestId('activeSmartFilter');
-      const deleteIcon = within(smartFilterElement).getByTestId(
-        'activeSmartFilterCloseIcon'
-      );
+      const deleteIcon = within(smartFilterElement).getByText('mock-CloseIcon');
       await act(() => userEvent.click(deleteIcon));
 
       const anotherSmartFilterElement =
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx
index 61b92dc1b4f..1fa21b6e6c7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx
@@ -7,6 +7,8 @@ import { screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
 
+jest.mock('components/common/Icons/DeleteIcon', () => () => 'mock-DeleteIcon');
+
 describe('SavedFilter Component', () => {
   const mockFilters: MessageFilters[] = [
     { name: 'name', code: 'code' },
@@ -115,9 +117,9 @@ describe('SavedFilter Component', () => {
     });
 
     it('Open Confirmation for the deletion modal', () => {
-      const { container } = setUpComponent({ deleteFilter: deleteMock });
+      setUpComponent({ deleteFilter: deleteMock });
       const savedFilters = getSavedFilters();
-      const deleteIcons = container.getElementsByTagName('i');
+      const deleteIcons = screen.getAllByText('mock-DeleteIcon');
       userEvent.hover(savedFilters[0]);
       userEvent.click(deleteIcons[0]);
       const modelDialog = screen.getByRole('dialog');
@@ -128,9 +130,9 @@ describe('SavedFilter Component', () => {
     });
 
     it('Close Confirmations deletion modal with button', () => {
-      const { container } = setUpComponent({ deleteFilter: deleteMock });
+      setUpComponent({ deleteFilter: deleteMock });
       const savedFilters = getSavedFilters();
-      const deleteIcons = container.getElementsByTagName('i');
+      const deleteIcons = screen.getAllByText('mock-DeleteIcon');
 
       userEvent.hover(savedFilters[0]);
       userEvent.click(deleteIcons[0]);
@@ -145,9 +147,9 @@ describe('SavedFilter Component', () => {
     });
 
     it('Delete the saved filter', () => {
-      const { container } = setUpComponent({ deleteFilter: deleteMock });
+      setUpComponent({ deleteFilter: deleteMock });
       const savedFilters = getSavedFilters();
-      const deleteIcons = container.getElementsByTagName('i');
+      const deleteIcons = screen.getAllByText('mock-DeleteIcon');
 
       userEvent.hover(savedFilters[0]);
       userEvent.click(deleteIcons[0]);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.styled.ts
new file mode 100644
index 00000000000..a64db26117e
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.styled.ts
@@ -0,0 +1,16 @@
+import styled from 'styled-components';
+
+export const Replica = styled.span.attrs({ 'aria-label': 'replica-info' })<{
+  leader?: boolean;
+}>`
+  color: ${({ leader, theme }) =>
+    leader ? theme.topicMetaData.liderReplica.color : null};
+
+  &:after {
+    content: ', ';
+  }
+
+  &:last-child::after {
+    content: '';
+  }
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
index e1753b15f65..caee12e232c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
@@ -9,11 +9,12 @@ import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import { useAppSelector } from 'lib/hooks/redux';
 import { getTopicByName } from 'redux/reducers/topics/selectors';
-import { ReplicaCell } from 'components/Topics/Topic/Details/Details.styled';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 
+import * as S from './Overview.styled';
+
 export interface Props {
   clearTopicMessages(params: {
     clusterName: ClusterName;
@@ -119,13 +120,14 @@ const Overview: React.FC<Props> = ({ clearTopicMessages }) => {
               <tr key={`partition-list-item-key-${partition.partition}`}>
                 <td>{partition.partition}</td>
                 <td>
-                  {partition.replicas?.map((replica: Replica) => (
-                    <ReplicaCell
-                      leader={replica.leader}
-                      key={`replica-list-item-key-${replica.broker}`}
+                  {partition.replicas?.map(({ broker, leader }: Replica) => (
+                    <S.Replica
+                      leader={leader}
+                      key={broker}
+                      title={leader ? 'Leader' : ''}
                     >
-                      {replica.broker}
-                    </ReplicaCell>
+                      {broker}
+                    </S.Replica>
                   ))}
                 </td>
                 <td>{partition.offsetMin}</td>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
index 7cc2d954cb0..e851f2cb268 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
@@ -10,7 +10,7 @@ import ClusterContext from 'components/contexts/ClusterContext';
 import userEvent from '@testing-library/user-event';
 import { getTopicStateFixtures } from 'redux/reducers/topics/__test__/fixtures';
 import { clusterTopicPath } from 'lib/paths';
-import { ReplicaCell } from 'components/Topics/Topic/Details/Details.styled';
+import { Replica } from 'components/Topics/Topic/Details/Overview/Overview.styled';
 
 describe('Overview', () => {
   const mockClusterName = 'local';
@@ -73,10 +73,13 @@ describe('Overview', () => {
   });
 
   it('renders replica cell with props', () => {
-    render(<ReplicaCell leader />);
+    render(<Replica leader />);
     const element = screen.getByLabelText('replica-info');
     expect(element).toBeInTheDocument();
-    expect(element).toHaveStyleRule('color', 'orange');
+    expect(element).toHaveStyleRule(
+      'color',
+      theme.topicMetaData.liderReplica.color
+    );
   });
 
   describe('when it has internal flag', () => {
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx
index f3ac7666b2b..38d95f56c8b 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx
@@ -3,6 +3,7 @@ import { TopicFormData } from 'redux/interfaces';
 import { useFieldArray, useFormContext, useWatch } from 'react-hook-form';
 import { Button } from 'components/common/Button/Button';
 import { TOPIC_CUSTOM_PARAMS_PREFIX } from 'lib/constants';
+import PlusIcon from 'components/common/Icons/PlusIcon';
 
 import CustomParamField from './CustomParamField';
 import * as S from './CustomParams.styled';
@@ -58,7 +59,7 @@ const CustomParams: React.FC<CustomParamsProps> = ({ isSubmitting }) => {
           buttonType="secondary"
           onClick={() => append({ name: '', value: '' })}
         >
-          <i className="fas fa-plus" />
+          <PlusIcon />
           Add Custom Parameter
         </Button>
       </div>
diff --git a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
index e21fd744c28..49c1bd303e5 100644
--- a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
@@ -58,7 +58,7 @@ const StyledButton = styled.button<ButtonProps>`
     color: ${(props) => props.theme.button.primary.color};
   }
 
-  & i {
+  & svg {
     margin-right: 7px;
   }
 `;
diff --git a/kafka-ui-react-app/src/components/common/Icons/ArrowDownIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/ArrowDownIcon.tsx
new file mode 100644
index 00000000000..a026dd301b8
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/ArrowDownIcon.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+const ArrowDownIcon: React.FC = () => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 384 512"
+    width="10"
+    height="10"
+  >
+    {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
+    <path d="M374.6 310.6l-160 160C208.4 476.9 200.2 480 192 480s-16.38-3.125-22.62-9.375l-160-160c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L160 370.8V64c0-17.69 14.33-31.1 31.1-31.1S224 46.31 224 64v306.8l105.4-105.4c12.5-12.5 32.75-12.5 45.25 0S387.1 298.1 374.6 310.6z" />
+  </svg>
+);
+
+export default ArrowDownIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/ClockIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/ClockIcon.tsx
new file mode 100644
index 00000000000..ee477e8d826
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/ClockIcon.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+const ClockIcon: React.FC = () => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 512 512"
+    width={10}
+    height={10}
+  >
+    {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
+    <path d="M232 120C232 106.7 242.7 96 256 96C269.3 96 280 106.7 280 120V243.2L365.3 300C376.3 307.4 379.3 322.3 371.1 333.3C364.6 344.3 349.7 347.3 338.7 339.1L242.7 275.1C236 271.5 232 264 232 255.1L232 120zM256 0C397.4 0 512 114.6 512 256C512 397.4 397.4 512 256 512C114.6 512 0 397.4 0 256C0 114.6 114.6 0 256 0zM48 256C48 370.9 141.1 464 256 464C370.9 464 464 370.9 464 256C464 141.1 370.9 48 256 48C141.1 48 48 141.1 48 256z" />
+  </svg>
+);
+
+export default ClockIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx
new file mode 100644
index 00000000000..73d62b9f6b6
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { useTheme } from 'styled-components';
+
+const DeleteIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 448 512"
+      fill={theme.icons.deleteIcon}
+      width="14"
+      height="14"
+    >
+      {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
+      <path d="M135.2 17.69C140.6 6.848 151.7 0 163.8 0H284.2C296.3 0 307.4 6.848 312.8 17.69L320 32H416C433.7 32 448 46.33 448 64C448 81.67 433.7 96 416 96H32C14.33 96 0 81.67 0 64C0 46.33 14.33 32 32 32H128L135.2 17.69zM31.1 128H416V448C416 483.3 387.3 512 352 512H95.1C60.65 512 31.1 483.3 31.1 448V128zM111.1 208V432C111.1 440.8 119.2 448 127.1 448C136.8 448 143.1 440.8 143.1 432V208C143.1 199.2 136.8 192 127.1 192C119.2 192 111.1 199.2 111.1 208zM207.1 208V432C207.1 440.8 215.2 448 223.1 448C232.8 448 240 440.8 240 432V208C240 199.2 232.8 192 223.1 192C215.2 192 207.1 199.2 207.1 208zM304 208V432C304 440.8 311.2 448 320 448C328.8 448 336 440.8 336 432V208C336 199.2 328.8 192 320 192C311.2 192 304 199.2 304 208z" />
+    </svg>
+  );
+};
+
+export default DeleteIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/FileIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/FileIcon.tsx
new file mode 100644
index 00000000000..c50e1002e63
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/FileIcon.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+const FileIcon: React.FC = () => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 384 512"
+    width="10"
+    height="10"
+  >
+    {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
+    <path d="M365.3 93.38l-74.63-74.64C278.6 6.742 262.3 0 245.4 0L64-.0001c-35.35 0-64 28.65-64 64l.0065 384c0 35.34 28.65 64 64 64H320c35.2 0 64-28.8 64-64V138.6C384 121.7 377.3 105.4 365.3 93.38zM336 448c0 8.836-7.164 16-16 16H64.02c-8.838 0-16-7.164-16-16L48 64.13c0-8.836 7.164-16 16-16h160L224 128c0 17.67 14.33 32 32 32h79.1V448zM96 280C96 293.3 106.8 304 120 304h144C277.3 304 288 293.3 288 280S277.3 256 264 256h-144C106.8 256 96 266.8 96 280zM264 352h-144C106.8 352 96 362.8 96 376s10.75 24 24 24h144c13.25 0 24-10.75 24-24S277.3 352 264 352z" />
+  </svg>
+);
+
+export default FileIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/PlusIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/PlusIcon.tsx
new file mode 100644
index 00000000000..8c7f33a2002
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/PlusIcon.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+const PlusIcon: React.FC = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 448 512"
+      width="14"
+      height="14"
+    >
+      {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
+      <path d="M432 256c0 17.69-14.33 32.01-32 32.01H256v144c0 17.69-14.33 31.99-32 31.99s-32-14.3-32-31.99v-144H48c-17.67 0-32-14.32-32-32.01s14.33-31.99 32-31.99H192v-144c0-17.69 14.33-32.01 32-32.01s32 14.32 32 32.01v144h144C417.7 224 432 238.3 432 256z" />
+    </svg>
+  );
+};
+
+export default PlusIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/SearchIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/SearchIcon.tsx
new file mode 100644
index 00000000000..d7bc4ba2855
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/SearchIcon.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+
+const SearchIcon: React.FC = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+    {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
+    <path d="M500.3 443.7l-119.7-119.7c27.22-40.41 40.65-90.9 33.46-144.7C401.8 87.79 326.8 13.32 235.2 1.723C99.01-15.51-15.51 99.01 1.724 235.2c11.6 91.64 86.08 166.7 177.6 178.9c53.8 7.189 104.3-6.236 144.7-33.46l119.7 119.7c15.62 15.62 40.95 15.62 56.57 0C515.9 484.7 515.9 459.3 500.3 443.7zM79.1 208c0-70.58 57.42-128 128-128s128 57.42 128 128c0 70.58-57.42 128-128 128S79.1 278.6 79.1 208z" />
+  </svg>
+);
+
+export default SearchIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/SpinnerIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/SpinnerIcon.tsx
new file mode 100644
index 00000000000..38ab1daa0c2
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/SpinnerIcon.tsx
@@ -0,0 +1,85 @@
+import React from 'react';
+import { useTheme } from 'styled-components';
+
+const SpinnerIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      width="30"
+      height="30"
+      viewBox="0 0 120 30"
+      xmlns="http://www.w3.org/2000/svg"
+      fill={theme.pageLoader.borderColor}
+    >
+      {/* By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL */}
+      <circle cx="15" cy="15" r="15">
+        <animate
+          attributeName="r"
+          from="15"
+          to="15"
+          begin="0s"
+          dur="0.8s"
+          values="15;9;15"
+          calcMode="linear"
+          repeatCount="indefinite"
+        />
+        <animate
+          attributeName="fill-opacity"
+          from="1"
+          to="1"
+          begin="0s"
+          dur="0.8s"
+          values="1;.5;1"
+          calcMode="linear"
+          repeatCount="indefinite"
+        />
+      </circle>
+      <circle cx="60" cy="15" r="9" fillOpacity="0.3">
+        <animate
+          attributeName="r"
+          from="9"
+          to="9"
+          begin="0s"
+          dur="0.8s"
+          values="9;15;9"
+          calcMode="linear"
+          repeatCount="indefinite"
+        />
+        <animate
+          attributeName="fill-opacity"
+          from="0.5"
+          to="0.5"
+          begin="0s"
+          dur="0.8s"
+          values=".5;1;.5"
+          calcMode="linear"
+          repeatCount="indefinite"
+        />
+      </circle>
+      <circle cx="105" cy="15" r="15">
+        <animate
+          attributeName="r"
+          from="15"
+          to="15"
+          begin="0s"
+          dur="0.8s"
+          values="15;9;15"
+          calcMode="linear"
+          repeatCount="indefinite"
+        />
+        <animate
+          attributeName="fill-opacity"
+          from="1"
+          to="1"
+          begin="0s"
+          dur="0.8s"
+          values="1;.5;1"
+          calcMode="linear"
+          repeatCount="indefinite"
+        />
+      </circle>
+    </svg>
+  );
+};
+
+export default SpinnerIcon;
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
index 6d75e55a9ed..b0abef0d797 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
@@ -7,6 +7,18 @@ export interface InputProps {
 
 export const Wrapper = styled.div`
   position: relative;
+
+  svg {
+    position: absolute;
+    top: 8px;
+    line-height: 0;
+    z-index: 1;
+    left: 12px;
+    right: unset;
+    height: 16px;
+    width: 16px;
+    fill: ${({ theme }) => theme.input.icon.color};
+  }
 `;
 
 export const Input = styled.input<InputProps>(
@@ -55,21 +67,3 @@ export const FormError = styled.p`
   color: ${({ theme }) => theme.input.error};
   font-size: 12px;
 `;
-
-interface InputIconProps {
-  className: string;
-  position: 'left' | 'right';
-  inputSize: 'M' | 'L';
-}
-
-export const InputIcon = styled.i<InputIconProps>`
-  position: absolute;
-  top: 50%;
-  line-height: 0;
-  z-index: 1;
-  left: ${({ position }) => (position === 'left' ? '12px' : 'unset')};
-  right: ${({ position }) => (position === 'right' ? '15px' : 'unset')};
-  height: 11px;
-  width: 11px;
-  color: ${({ theme }) => theme.input.icon.color};
-`;
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.tsx b/kafka-ui-react-app/src/components/common/Input/Input.tsx
index fd7951332f0..58a3bb92c85 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/Input.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { RegisterOptions, useFormContext } from 'react-hook-form';
+import SearchIcon from 'components/common/Icons/SearchIcon';
 
 import * as S from './Input.styled';
 
@@ -8,44 +9,29 @@ export interface InputProps
     Omit<S.InputProps, 'hasLeftIcon'> {
   name?: string;
   hookFormOptions?: RegisterOptions;
-  leftIcon?: string;
-  rightIcon?: string;
+  search?: boolean;
 }
 
 const Input: React.FC<InputProps> = ({
   name,
   hookFormOptions,
-  leftIcon,
-  rightIcon,
+  search,
   inputSize = 'L',
   ...rest
 }) => {
   const methods = useFormContext();
   return (
     <S.Wrapper>
-      {leftIcon && (
-        <S.InputIcon
-          className={leftIcon}
-          position="left"
-          inputSize={inputSize}
-        />
-      )}
+      {search && <SearchIcon />}
       {name ? (
         <S.Input
           inputSize={inputSize}
           {...methods.register(name, { ...hookFormOptions })}
-          hasLeftIcon={!!leftIcon}
+          hasLeftIcon={!!search}
           {...rest}
         />
       ) : (
-        <S.Input inputSize={inputSize} hasLeftIcon={!!leftIcon} {...rest} />
-      )}
-      {rightIcon && (
-        <S.InputIcon
-          className={rightIcon}
-          position="right"
-          inputSize={inputSize}
-        />
+        <S.Input inputSize={inputSize} hasLeftIcon={!!search} {...rest} />
       )}
     </S.Wrapper>
   );
diff --git a/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx b/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx
index 1ebdeff6c85..be691322d6c 100644
--- a/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx
+++ b/kafka-ui-react-app/src/components/common/Metrics/Indicator.tsx
@@ -1,4 +1,5 @@
 import React, { PropsWithChildren } from 'react';
+import SpinnerIcon from 'components/common/Icons/SpinnerIcon';
 
 import * as S from './Metrics.styled';
 
@@ -28,17 +29,7 @@ const Indicator: React.FC<PropsWithChildren<Props>> = ({
           </S.CircularAlertWrapper>
         )}
       </S.IndicatorTitle>
-      <span>
-        {fetching ? (
-          <i
-            className="fas fa-spinner fa-pulse"
-            role="progressbar"
-            aria-label="Loading"
-          />
-        ) : (
-          children
-        )}
-      </span>
+      <span>{fetching ? <SpinnerIcon /> : children}</span>
     </div>
   </S.IndicatorWrapper>
 );
diff --git a/kafka-ui-react-app/src/components/common/Search/Search.tsx b/kafka-ui-react-app/src/components/common/Search/Search.tsx
index 81f513950d8..78dd758f998 100644
--- a/kafka-ui-react-app/src/components/common/Search/Search.tsx
+++ b/kafka-ui-react-app/src/components/common/Search/Search.tsx
@@ -26,9 +26,9 @@ const Search: React.FC<SearchProps> = ({
       placeholder={placeholder}
       onChange={onChange}
       defaultValue={value}
-      leftIcon="fas fa-search"
       inputSize="M"
       disabled={disabled}
+      search
     />
   );
 };
diff --git a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts
index 1e35e7d1a57..549da1d067b 100644
--- a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts
+++ b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts
@@ -115,4 +115,5 @@ export const TableHeaderCell = styled.th`
   padding: 4px 0 4px 24px;
   border-bottom-width: 1px;
   vertical-align: middle;
+  text-align: left;
 `;
diff --git a/kafka-ui-react-app/src/components/global.css.ts b/kafka-ui-react-app/src/components/global.css.ts
new file mode 100644
index 00000000000..260f4f8a5f2
--- /dev/null
+++ b/kafka-ui-react-app/src/components/global.css.ts
@@ -0,0 +1,115 @@
+import { createGlobalStyle, css } from 'styled-components';
+
+export default createGlobalStyle(
+  ({ theme }) => css`
+    html {
+      font-family: 'Inter', sans-serif;
+      font-size: 14px;
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale;
+      background-color: ${theme.layout.backgroundColor};
+      overflow-x: hidden;
+      overflow-y: scroll;
+      text-rendering: optimizeLegibility;
+      text-size-adjust: 100%;
+      min-width: 300px;
+    }
+
+    #root,
+    body {
+      width: 100%;
+      position: relative;
+      margin: 0;
+      font-family: 'Inter', sans-serif;
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+    }
+
+    article,
+    aside,
+    figure,
+    footer,
+    header,
+    hgroup,
+    section {
+      display: block;
+    }
+
+    body,
+    button,
+    input,
+    optgroup,
+    select,
+    textarea {
+      font-family: inherit;
+    }
+
+    code,
+    pre {
+      font-family: 'Roboto Mono', sans-serif;
+      -moz-osx-font-smoothing: auto;
+      -webkit-font-smoothing: auto;
+      background-color: ${theme.code.backgroundColor};
+      color: ${theme.code.color};
+      font-size: 12px;
+      font-weight: 400;
+      padding: 2px 8px;
+      border-radius: 5px;
+      width: fit-content;
+    }
+
+    pre {
+      overflow-x: auto;
+      white-space: pre
+      word-wrap: normal
+
+      code {
+        background-color: transparent;
+        color: currentColor
+        padding: 0
+      }
+    }
+
+    a {
+      color: ${theme.link.color};
+      cursor: pointer;
+      text-decoration: none;
+      &:hover {
+        color: ${theme.link.hoverColor};
+      }
+    }
+
+    img {
+      height: auto;
+      max-width: 100%;
+    }
+
+    input[type='checkbox'],
+    input[type='radio'] {
+      vertical-align: baseline;
+    }
+
+    hr {
+      background-color: ${theme.hr.backgroundColor};
+      border: none;
+      display: block;
+      height: 1px;
+      margin: 0;
+    }
+
+    fieldset {
+      border: none;
+    }
+
+
+    @keyframes fadein {
+      from {
+        opacity: 0;
+      }
+      to {
+        opacity: 1;
+      }
+    }
+  `
+);
diff --git a/kafka-ui-react-app/src/index.tsx b/kafka-ui-react-app/src/index.tsx
index b6a20cba2fb..d15e0528ca5 100644
--- a/kafka-ui-react-app/src/index.tsx
+++ b/kafka-ui-react-app/src/index.tsx
@@ -4,8 +4,8 @@ import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import App from 'components/App';
 import { store } from 'redux/store';
-import 'theme/index.scss';
 import 'lib/constants';
+import 'theme/index.scss';
 
 const container =
   document.getElementById('root') || document.createElement('div');
diff --git a/kafka-ui-react-app/src/theme/index.scss b/kafka-ui-react-app/src/theme/index.scss
index 84d54b9bdd2..d57d3a4d12e 100644
--- a/kafka-ui-react-app/src/theme/index.scss
+++ b/kafka-ui-react-app/src/theme/index.scss
@@ -1,37 +1 @@
-@import '@fortawesome/fontawesome-free/css/all.min.css';
-
-// Base
-@import "./minireset";
-@import "bulma/sass/base/generic";
-
-@import url('https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@400;500&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap');
-
-#root,
-body,
-html {
-  width: 100%;
-  position: relative;
-  margin: 0;
-  font-family: 'Inter', sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  background-color: #fff;
-}
-
-input, select, textarea, button {
-  font-family: inherit;
-}
-
-code {
-  font-family: 'Roboto Mono', sans-serif;
-}
-
-@keyframes fadein {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
+@import "./minireset.css";
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 363bafa9228..9be09d77be9 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -60,10 +60,22 @@ const Colors = {
 };
 
 const theme = {
+  link: {
+    color: Colors.brand[50],
+    hoverColor: Colors.brand[60],
+  },
+  hr: {
+    backgroundColor: Colors.neutral[5],
+  },
+  code: {
+    backgroundColor: Colors.neutral[5],
+    color: Colors.red[55],
+  },
   layout: {
+    backgroundColor: Colors.neutral[0],
     minWidth: '1200px',
     navBarWidth: '201px',
-    navBarHeight: '3.25rem',
+    navBarHeight: '53px',
     stuffColor: Colors.neutral[5],
     stuffBorderColor: Colors.neutral[10],
     overlay: {
@@ -477,6 +489,9 @@ const theme = {
       value: Colors.neutral[80],
       meta: Colors.neutral[30],
     },
+    liderReplica: {
+      color: Colors.green[60],
+    },
   },
   dangerZone: {
     borderColor: Colors.neutral[10],
@@ -498,6 +513,7 @@ const theme = {
   },
   icons: {
     closeIcon: Colors.neutral[30],
+    deleteIcon: Colors.red[20],
     warningIcon: Colors.yellow[20],
     messageToggleIcon: {
       normal: Colors.brand[50],
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
index 6570b334a4e..e8d3ac6d4e6 100644
--- a/kafka-ui-react-app/vite.config.ts
+++ b/kafka-ui-react-app/vite.config.ts
@@ -1,4 +1,9 @@
-import { defineConfig, loadEnv, UserConfigExport } from 'vite';
+import {
+  defineConfig,
+  loadEnv,
+  UserConfigExport,
+  splitVendorChunkPlugin,
+} from 'vite';
 import react from '@vitejs/plugin-react';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
@@ -6,27 +11,12 @@ export default defineConfig(({ mode }) => {
   process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
 
   const defaultConfig: UserConfigExport = {
-    plugins: [react(), tsconfigPaths()],
+    plugins: [react(), tsconfigPaths(), splitVendorChunkPlugin()],
     server: {
       port: 3000,
     },
     build: {
       outDir: 'build',
-      rollupOptions: {
-        output: {
-          manualChunks: {
-            vendor: [
-              'react',
-              'react-router-dom',
-              'react-dom',
-              'redux',
-              'react-redux',
-              'styled-components',
-              'react-ace',
-            ],
-          },
-        },
-      },
     },
     define: {
       'process.env.NODE_ENV': `"${mode}"`,

From 9827e01047ef7f0db2acc460d170fc1f284229ec Mon Sep 17 00:00:00 2001
From: Robert Azizbekyan <103438454+rAzizbekyan@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:09:26 +0400
Subject: [PATCH 091/734] Remove ksql editor unnecessary line (#2339)

---
 .../components/KsqlDb/Query/QueryForm/QueryForm.styled.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
index 1f5dcde061e..a8fa1cf7afa 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
@@ -65,11 +65,13 @@ export const Fieldset = styled.fieldset`
 
 export const SQLEditor = styled(BaseSQLEditor)(
   ({ readOnly, theme }) =>
-    readOnly &&
     css`
-      background: ${theme.ksqlDb.query.editor.readonly.background};
+      background: ${readOnly && theme.ksqlDb.query.editor.readonly.background};
       .ace-cursor {
-        ${theme.ksqlDb.query.editor.readonly.cursor}
+        ${readOnly && theme.ksqlDb.query.editor.readonly.cursor}
+      }
+      .ace_print-margin {
+        display: none;
       }
     `
 );

From 819ae60e6b3b9d598552c3db1e40f8c9cbb8c125 Mon Sep 17 00:00:00 2001
From: Smbat Siradeghyan <104761619+ssiradeghyan@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:17:08 +0400
Subject: [PATCH 092/734] Fix default properties' values propagation upon topic
 edit (#2205)

* fix topic  edit form

* remove unused import

* add test for topicParamsTransformer

* add tests for topicParamsTransformer

* try to fix tests topicParamsTransformer

* try to fix tests topicParamsTransformer

* try to fix tests topicParamsTransformer

* fix tests for topicParamsTransformer

* try to fix tests topicParamsTransformer

* try to fix tests topicParamsTransformer

* try to fix tests topicParamsTransformer

* try to fix tests topicParamsTransformer

* fix review comments

* fix tests name

* fix tests name

* remove default value from getValue function

* fix tests names

* fix topic create page

* remove unused import

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/Topics/New/New.tsx         |   2 +-
 .../src/components/Topics/Topic/Edit/Edit.tsx |  42 +++-----
 .../Topics/Topic/Edit/__test__/fixtures.ts    |  64 +++++++++++
 .../__test__/topicParamsTransformer.spec.ts   | 101 ++++++++++++++++++
 .../Topic/Edit/topicParamsTransformer.ts      |  43 ++++++++
 .../Topics/shared/Form/TopicForm.tsx          |  15 ++-
 .../src/redux/reducers/topics/topicsSlice.ts  |   4 +-
 7 files changed, 239 insertions(+), 32 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/topicParamsTransformer.spec.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts

diff --git a/kafka-ui-react-app/src/components/Topics/New/New.tsx b/kafka-ui-react-app/src/components/Topics/New/New.tsx
index 7346820afce..7faefb36c9d 100644
--- a/kafka-ui-react-app/src/components/Topics/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/New.tsx
@@ -57,7 +57,7 @@ const New: React.FC = () => {
           partitionCount={Number(partitionCount)}
           replicationFactor={Number(replicationFactor)}
           inSyncReplicas={Number(inSyncReplicas)}
-          isSubmitting={methods.formState.isSubmitting}
+          isSubmitting={false}
           onSubmit={methods.handleSubmit(onSubmit)}
         />
       </FormProvider>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
index 807c6e9c7b1..76309dc182d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
@@ -1,10 +1,9 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import {
   ClusterName,
   TopicFormDataRaw,
   TopicName,
   TopicConfigByName,
-  TopicWithDetailedInfo,
   TopicFormData,
 } from 'redux/interfaces';
 import { useForm, FormProvider } from 'react-hook-form';
@@ -13,12 +12,13 @@ import { RouteParamsClusterTopic } from 'lib/paths';
 import { useNavigate } from 'react-router-dom';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { topicFormValidationSchema } from 'lib/yupExtended';
-import { TOPIC_CUSTOM_PARAMS_PREFIX, TOPIC_CUSTOM_PARAMS } from 'lib/constants';
 import styled from 'styled-components';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { useAppSelector } from 'lib/hooks/redux';
 import { getFullTopic } from 'redux/reducers/topics/selectors';
 import useAppParams from 'lib/hooks/useAppParams';
+import topicParamsTransformer from 'components/Topics/Topic/Edit/topicParamsTransformer';
+import { MILLISECONDS_IN_WEEK } from 'lib/constants';
 
 import DangerZoneContainer from './DangerZone/DangerZoneContainer';
 
@@ -39,6 +39,7 @@ export interface Props {
 const EditWrapperStyled = styled.div`
   display: flex;
   justify-content: center;
+
   & > * {
     width: 800px;
   }
@@ -50,29 +51,9 @@ export const DEFAULTS = {
   minInSyncReplicas: 1,
   cleanupPolicy: 'delete',
   retentionBytes: -1,
+  retentionMs: MILLISECONDS_IN_WEEK,
   maxMessageBytes: 1000012,
-};
-
-const topicParams = (topic: TopicWithDetailedInfo | undefined) => {
-  if (!topic) {
-    return DEFAULTS;
-  }
-
-  const { name, replicationFactor } = topic;
-
-  return {
-    ...DEFAULTS,
-    name,
-    partitions: topic.partitionCount || DEFAULTS.partitions,
-    replicationFactor,
-    [TOPIC_CUSTOM_PARAMS_PREFIX]: topic.config
-      ?.filter(
-        (el) =>
-          el.value !== el.defaultValue &&
-          Object.keys(TOPIC_CUSTOM_PARAMS).includes(el.name)
-      )
-      .map((el) => ({ name: el.name, value: el.value })),
-  };
+  customParams: [],
 };
 
 let formInit = false;
@@ -87,7 +68,7 @@ const Edit: React.FC<Props> = ({
 
   const topic = useAppSelector((state) => getFullTopic(state, topicName));
 
-  const defaultValues = React.useMemo(() => topicParams(topic), [topic]);
+  const defaultValues = topicParamsTransformer(topic);
 
   const methods = useForm<TopicFormData>({
     defaultValues,
@@ -95,12 +76,16 @@ const Edit: React.FC<Props> = ({
     mode: 'onChange',
   });
 
+  useEffect(() => {
+    methods.reset(defaultValues);
+  }, [!topic]);
+
   const [isSubmitting, setIsSubmitting] = React.useState<boolean>(false);
   const navigate = useNavigate();
 
   React.useEffect(() => {
     fetchTopicConfig({ clusterName, topicName });
-  }, [fetchTopicConfig, clusterName, topicName]);
+  }, [fetchTopicConfig, clusterName, topicName, isTopicUpdated]);
 
   React.useEffect(() => {
     if (isSubmitting && isTopicUpdated) {
@@ -138,7 +123,10 @@ const Edit: React.FC<Props> = ({
           <FormProvider {...methods}>
             <TopicForm
               topicName={topicName}
+              retentionBytes={defaultValues.retentionBytes}
+              inSyncReplicas={Number(defaultValues.minInSyncReplicas)}
               isSubmitting={isSubmitting}
+              cleanUpPolicy={topic.cleanUpPolicy}
               isEditing
               onSubmit={methods.handleSubmit(onSubmit)}
             />
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts
index 49b7f033751..5cbdebd97aa 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts
@@ -551,3 +551,67 @@ export const topicWithInfo: TopicWithDetailedInfo = {
   partitions,
   config,
 };
+export const customConfigs = [
+  {
+    name: 'segment.bytes',
+    value: '1',
+    defaultValue: '1073741824',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [
+      {
+        name: 'log.segment.bytes',
+        value: '1073741824',
+        source: ConfigSource.DEFAULT_CONFIG,
+      },
+    ],
+  },
+  {
+    name: 'retention.ms',
+    value: '604',
+    defaultValue: '604800000',
+    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [
+      {
+        name: 'retention.ms',
+        value: '604800000',
+        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
+      },
+    ],
+  },
+  {
+    name: 'flush.messages',
+    value: '92233',
+    defaultValue: '9223372036854775807',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [
+      {
+        name: 'log.flush.interval.messages',
+        value: '9223372036854775807',
+        source: ConfigSource.DEFAULT_CONFIG,
+      },
+    ],
+  },
+];
+
+export const transformedParams = {
+  partitions: 1,
+  replicationFactor: 1,
+  cleanupPolicy: 'delete',
+  retentionBytes: -1,
+  maxMessageBytes: 1000012,
+  name: topicName,
+  minInSyncReplicas: 1,
+  retentionMs: 604800000,
+  customParams: [
+    {
+      name: 'delete.retention.ms',
+      value: '86400001',
+    },
+  ],
+};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/topicParamsTransformer.spec.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/topicParamsTransformer.spec.ts
new file mode 100644
index 00000000000..5077dc3b29e
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/topicParamsTransformer.spec.ts
@@ -0,0 +1,101 @@
+import topicParamsTransformer, {
+  getValue,
+} from 'components/Topics/Topic/Edit/topicParamsTransformer';
+import { DEFAULTS } from 'components/Topics/Topic/Edit/Edit';
+
+import { transformedParams, customConfigs, topicWithInfo } from './fixtures';
+
+describe('topicParamsTransformer', () => {
+  const testField = (name: keyof typeof DEFAULTS, fieldName: string) => {
+    it('returns transformed value', () => {
+      expect(topicParamsTransformer(topicWithInfo)[name]).toEqual(
+        transformedParams[name]
+      );
+    });
+    it(`returns default value when ${name} not defined`, () => {
+      expect(
+        topicParamsTransformer({
+          ...topicWithInfo,
+          config: topicWithInfo.config?.filter(
+            (config) => config.name !== fieldName
+          ),
+        })[name]
+      ).toEqual(DEFAULTS[name]);
+    });
+
+    it('returns number value', () => {
+      expect(
+        typeof topicParamsTransformer(topicWithInfo).retentionBytes
+      ).toEqual('number');
+    });
+  };
+
+  describe('getValue', () => {
+    it('returns value when field exists', () => {
+      expect(
+        getValue(topicWithInfo, 'confluent.tier.segment.hotset.roll.min.bytes')
+      ).toEqual(104857600);
+    });
+    it('returns undefined when filed name does not exist', () => {
+      expect(getValue(topicWithInfo, 'some.unsupported.fieldName')).toEqual(
+        undefined
+      );
+    });
+    it('returns default value when field does not exist', () => {
+      expect(
+        getValue(topicWithInfo, 'some.unsupported.fieldName', 100)
+      ).toEqual(100);
+    });
+  });
+  describe('Topic', () => {
+    it('returns default values when topic not defined found', () => {
+      expect(topicParamsTransformer(undefined)).toEqual(DEFAULTS);
+    });
+
+    it('returns transformed values', () => {
+      expect(topicParamsTransformer(topicWithInfo)).toEqual(transformedParams);
+    });
+  });
+
+  describe('Topic partitions', () => {
+    it('returns transformed value', () => {
+      expect(topicParamsTransformer(topicWithInfo).partitions).toEqual(
+        transformedParams.partitions
+      );
+    });
+    it('returns default value when partitionCount not defined', () => {
+      expect(
+        topicParamsTransformer({ ...topicWithInfo, partitionCount: undefined })
+          .partitions
+      ).toEqual(DEFAULTS.partitions);
+    });
+  });
+
+  describe('maxMessageBytes', () =>
+    testField('maxMessageBytes', 'max.message.bytes'));
+
+  describe('minInSyncReplicas', () =>
+    testField('minInSyncReplicas', 'min.insync.replicas'));
+
+  describe('retentionBytes', () =>
+    testField('retentionBytes', 'retention.bytes'));
+
+  describe('retentionMs', () => testField('retentionMs', 'retention.ms'));
+
+  describe('customParams', () => {
+    it('returns value when configs is empty', () => {
+      expect(
+        topicParamsTransformer({ ...topicWithInfo, config: [] }).customParams
+      ).toEqual([]);
+    });
+
+    it('returns value when had a 2 custom configs', () => {
+      expect(
+        topicParamsTransformer({
+          ...topicWithInfo,
+          config: customConfigs,
+        }).customParams?.length
+      ).toEqual(2);
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
new file mode 100644
index 00000000000..1c5b8491c69
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
@@ -0,0 +1,43 @@
+import { TopicWithDetailedInfo } from 'redux/interfaces';
+import {
+  MILLISECONDS_IN_WEEK,
+  TOPIC_CUSTOM_PARAMS,
+  TOPIC_CUSTOM_PARAMS_PREFIX,
+} from 'lib/constants';
+import { DEFAULTS } from 'components/Topics/Topic/Edit/Edit';
+
+export const getValue = (
+  topic: TopicWithDetailedInfo,
+  fieldName: string,
+  defaultValue?: number
+) =>
+  Number(topic?.config?.find((config) => config.name === fieldName)?.value) ||
+  defaultValue;
+
+const topicParamsTransformer = (topic?: TopicWithDetailedInfo) => {
+  if (!topic) {
+    return DEFAULTS;
+  }
+
+  const { name, replicationFactor } = topic;
+
+  return {
+    ...DEFAULTS,
+    name,
+    replicationFactor,
+    partitions: topic.partitionCount || DEFAULTS.partitions,
+    maxMessageBytes: getValue(topic, 'max.message.bytes', 1000012),
+    minInSyncReplicas: getValue(topic, 'min.insync.replicas', 1),
+    retentionBytes: getValue(topic, 'retention.bytes', -1),
+    retentionMs: getValue(topic, 'retention.ms', MILLISECONDS_IN_WEEK),
+
+    [TOPIC_CUSTOM_PARAMS_PREFIX]: topic.config
+      ?.filter(
+        (el) =>
+          el.value !== el.defaultValue &&
+          Object.keys(TOPIC_CUSTOM_PARAMS).includes(el.name)
+      )
+      .map((el) => ({ name: el.name, value: el.value })),
+  };
+};
+export default topicParamsTransformer;
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index d2cb51fae5d..13afbe12335 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -19,6 +19,7 @@ export interface Props {
   partitionCount?: number;
   replicationFactor?: number;
   inSyncReplicas?: number;
+  retentionBytes?: number;
   cleanUpPolicy?: string;
   isEditing?: boolean;
   isSubmitting: boolean;
@@ -40,6 +41,7 @@ const RetentionBytesOptions: Array<SelectOption> = [
 ];
 
 const TopicForm: React.FC<Props> = ({
+  retentionBytes,
   topicName,
   isEditing,
   isSubmitting,
@@ -55,8 +57,17 @@ const TopicForm: React.FC<Props> = ({
   } = useFormContext();
   const getCleanUpPolicy =
     CleanupPolicyOptions.find((option: SelectOption) => {
-      return option.value === cleanUpPolicy?.toLowerCase();
+      return (
+        option.value.toString().replace(/,/g, '_') ===
+        cleanUpPolicy?.toLowerCase()
+      );
     })?.value || CleanupPolicyOptions[0].value;
+
+  const getRetentionBytes =
+    RetentionBytesOptions.find((option: SelectOption) => {
+      return option.value === retentionBytes;
+    })?.value || RetentionBytesOptions[0].value;
+
   return (
     <StyledForm onSubmit={onSubmit} aria-label="topic form">
       <fieldset disabled={isSubmitting}>
@@ -180,7 +191,7 @@ const TopicForm: React.FC<Props> = ({
                   id="topicFormRetentionBytes"
                   aria-labelledby="topicFormRetentionBytesLabel"
                   name={name}
-                  value={RetentionBytesOptions[0].value}
+                  value={getRetentionBytes}
                   onChange={onChange}
                   minWidth="100%"
                   options={RetentionBytesOptions}
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
index 271cc7798a9..4a661240197 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
@@ -169,12 +169,12 @@ const formatTopicUpdate = (form: TopicFormDataRaw): TopicUpdate => {
 
   return {
     configs: {
+      ...Object.values(customParams || {}).reduce(topicReducer, {}),
       'cleanup.policy': cleanupPolicy,
       'retention.ms': retentionMs,
       'retention.bytes': retentionBytes,
       'max.message.bytes': maxMessageBytes,
       'min.insync.replicas': minInSyncReplicas,
-      ...Object.values(customParams || {}).reduce(topicReducer, {}),
     },
   };
 };
@@ -355,7 +355,7 @@ export const clearTopicsMessages = createAsyncThunk<
   }
 });
 
-const initialState: TopicsState = {
+export const initialState: TopicsState = {
   byName: {},
   allNames: [],
   totalPages: 1,

From ba983657e663da01c19fc037a865a6babe357e2c Mon Sep 17 00:00:00 2001
From: MichaelGonzalezMurillo
 <110129349+MichaelGonzalezMurillo@users.noreply.github.com>
Date: Mon, 1 Aug 2022 11:24:27 -0600
Subject: [PATCH 093/734] Update kafka-clients dependency

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e229c4959e2..2f307fdb5ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
         <org.projectlombok.version>1.18.20</org.projectlombok.version>
         <org.projectlombok.e2e-checks.version>1.18.20</org.projectlombok.e2e-checks.version>
         <git.revision>latest</git.revision>
-        <kafka-clients.version>2.8.0</kafka-clients.version>
+        <kafka-clients.version>3.2.0</kafka-clients.version>
         <node.version>v16.15.0</node.version>
         <pnpm.version>v7.4.0</pnpm.version>
         <dockerfile-maven-plugin.version>1.4.10</dockerfile-maven-plugin.version>

From 3e5e8e9ba5994e8ab3c10279eb89fe04b7648040 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:27:38 +0400
Subject: [PATCH 094/734] Bump aquasecurity/trivy-action from 0.5.1 to 0.6.1
 (#2352)

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.5.1 to 0.6.1.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.5.1...0.6.1)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index 67ebf3504b3..abae180e7ca 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -61,7 +61,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.5.1
+        uses: aquasecurity/trivy-action@0.6.1
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From 1c0b297a595a8f6e38a813cbdffd46b879220465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Cort=C3=A9s=20L=C3=B3pez?=
 <joseacl@gmail.com>
Date: Tue, 2 Aug 2022 15:18:01 +0200
Subject: [PATCH 095/734] Add the possibility to not specify the image.registry
 value (#2368)

* Allow not specify image.registry in the values of the helm chart

* Allow not specify image.registry in the values of the helm chart

* Allow not specify image.registry in the values of the helm chart
---
 charts/kafka-ui/templates/_helpers.tpl    | 16 ++++++++++++++++
 charts/kafka-ui/templates/deployment.yaml |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/charts/kafka-ui/templates/_helpers.tpl b/charts/kafka-ui/templates/_helpers.tpl
index 076c4886f80..510452d4cf3 100644
--- a/charts/kafka-ui/templates/_helpers.tpl
+++ b/charts/kafka-ui/templates/_helpers.tpl
@@ -61,3 +61,19 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+
+{{/*
+This allows us to check if the registry of the image is specified or not.
+*/}}
+{{- define "kafka-ui.imageName" -}}
+{{- $registryName := .Values.image.registry -}}
+{{- $repository := .Values.image.repository -}}
+{{- $tag := .Values.image.tag | default .Chart.AppVersion -}}
+{{- if $registryName }}
+{{- printf "%s/%s:%s" $registryName $repository $tag -}}
+{{- else }}
+{{- printf "%s:%s" $repository $tag -}}
+{{- end }}
+{{- end -}}
+
diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index 22149bb7513..1f7f6c92ad4 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: {{ include "kafka-ui.imageName" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- if or .Values.env  .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
           env:

From b6e9e4386887035c0d0326cadbc03e3e48d935eb Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 2 Aug 2022 18:32:13 +0400
Subject: [PATCH 096/734] [e2e] Fix kafka-connect healthcheck (#1921)

---
 documentation/compose/kafka-ui-connectors-auth.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/compose/kafka-ui-connectors-auth.yaml b/documentation/compose/kafka-ui-connectors-auth.yaml
index a7367911206..a3034351421 100644
--- a/documentation/compose/kafka-ui-connectors-auth.yaml
+++ b/documentation/compose/kafka-ui-connectors-auth.yaml
@@ -100,6 +100,7 @@ services:
       CONNECT_INTERNAL_KEY_CONVERTER: org.apache.kafka.connect.json.JsonConverter
       CONNECT_INTERNAL_VALUE_CONVERTER: org.apache.kafka.connect.json.JsonConverter
       CONNECT_REST_ADVERTISED_HOST_NAME: kafka-connect0
+      CONNECT_REST_PORT: 8083
       CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
       CONNECT_REST_EXTENSION_CLASSES: "org.apache.kafka.connect.rest.basic.auth.extension.BasicAuthSecurityRestExtension"
       KAFKA_OPTS: "-Djava.security.auth.login.config=/conf/kafka_connect.jaas"

From 2d82b9c0a9a91604c630680e60e9a67f4d46f970 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Wed, 3 Aug 2022 11:37:35 +0300
Subject: [PATCH 097/734] New Confirmation Messages modal (#2376)

* New Confirmation Messages

* Fix #2348

* Fix codesmels

* fix #2242

* fix #2347
---
 kafka-ui-react-app/src/components/App.tsx     | 148 +++++++++---------
 .../Connect/Details/Actions/Actions.tsx       |  58 +++----
 .../Actions/__tests__/Actions.spec.tsx        |  15 +-
 .../Details/Config/__test__/Config.spec.tsx   |   4 +-
 .../Overview/__tests__/Overview.spec.tsx      |   4 +-
 .../src/components/Connect/List/ListItem.tsx  |  26 ++-
 .../Connect/List/__tests__/ListItem.spec.tsx  |  44 ------
 .../ConsumerGroups/Details/Details.tsx        |  16 +-
 .../Details/__tests__/Details.spec.tsx        |   9 +-
 .../components/Schemas/Details/Details.tsx    |  21 +--
 .../GlobalSchemaSelector.tsx                  |  66 +++-----
 .../__test__/GlobalSchemaSelector.spec.tsx    |   7 +-
 .../Topics/List/ActionsCell/ActionsCell.tsx   | 102 +++++-------
 .../src/components/Topics/List/List.tsx       | 100 +++++-------
 .../Topics/List/__tests__/List.spec.tsx       |   4 +-
 .../Topics/Topic/Details/Details.tsx          |  92 ++++-------
 .../Messages/Filters/Filters.styled.ts        |   7 -
 .../Details/Messages/Filters/SavedFilters.tsx |  27 +---
 .../Filters/__tests__/SavedFilters.spec.tsx   |  25 +--
 .../Topic/Details/__test__/Details.spec.tsx   |  41 ++---
 .../Topic/Edit/DangerZone/DangerZone.tsx      |  85 ++++------
 .../Edit/DangerZone/DangerZoneContainer.ts    |   8 +-
 .../DangerZone/__test__/DangerZone.spec.tsx   |  73 +--------
 .../Topics/Topic/Edit/__test__/Edit.spec.tsx  |  43 +++--
 .../Topics/shared/Form/TopicForm.tsx          |  20 ++-
 .../components/common/Alert/Alert.styled.ts   |   1 +
 .../ConfirmationModal.styled.tsx              |  99 ++++++------
 .../ConfirmationModal/ConfirmationModal.tsx   |  64 +++-----
 .../__test__/ConfirmationModal.spec.tsx       | 101 ------------
 .../common/Dropdown/Dropdown.styled.ts        |   1 +
 .../common/Dropdown/DropdownItem.tsx          |  12 +-
 .../__test__/MultiSelect.styled.spec.tsx      |  61 --------
 .../components/contexts/ConfirmContext.tsx    |  39 +++++
 .../lib/hooks/__tests__/useDataSaver.spec.tsx |   2 +-
 .../src/lib/hooks/useConfirm.ts               |  14 ++
 kafka-ui-react-app/src/lib/testHelpers.tsx    |  21 ++-
 .../topicMessages/topicMessagesSlice.ts       |   2 +-
 .../topics/__test__/selectors.spec.ts         |   6 -
 .../src/redux/reducers/topics/selectors.ts    |  20 ---
 .../src/redux/reducers/topics/topicsSlice.ts  |  38 +++--
 40 files changed, 579 insertions(+), 947 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/common/ConfirmationModal/__test__/ConfirmationModal.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/MultiSelect/__test__/MultiSelect.styled.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useConfirm.ts

diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 7d28a7bcc3c..2686e6fad3d 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -18,6 +18,9 @@ import Logo from 'components/common/Logo/Logo';
 import GitIcon from 'components/common/Icons/GitIcon';
 import DiscordIcon from 'components/common/Icons/DiscordIcon';
 
+import { ConfirmContextProvider } from './contexts/ConfirmContext';
+import ConfirmationModal from './common/ConfirmationModal/ConfirmationModal';
+
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
@@ -44,84 +47,87 @@ const App: React.FC = () => {
   return (
     <QueryClientProvider client={queryClient}>
       <ThemeProvider theme={theme}>
-        <GlobalCSS />
-        <S.Layout>
-          <S.Navbar role="navigation" aria-label="Page Header">
-            <S.NavbarBrand>
+        <ConfirmContextProvider>
+          <GlobalCSS />
+          <S.Layout>
+            <S.Navbar role="navigation" aria-label="Page Header">
               <S.NavbarBrand>
-                <S.NavbarBurger
-                  onClick={onBurgerClick}
-                  onKeyDown={onBurgerClick}
-                  role="button"
-                  tabIndex={0}
-                  aria-label="burger"
-                >
-                  <S.Span role="separator" />
-                  <S.Span role="separator" />
-                  <S.Span role="separator" />
-                </S.NavbarBurger>
+                <S.NavbarBrand>
+                  <S.NavbarBurger
+                    onClick={onBurgerClick}
+                    onKeyDown={onBurgerClick}
+                    role="button"
+                    tabIndex={0}
+                    aria-label="burger"
+                  >
+                    <S.Span role="separator" />
+                    <S.Span role="separator" />
+                    <S.Span role="separator" />
+                  </S.NavbarBurger>
 
-                <S.Hyperlink to="/">
-                  <Logo />
-                  UI for Apache Kafka
-                </S.Hyperlink>
+                  <S.Hyperlink to="/">
+                    <Logo />
+                    UI for Apache Kafka
+                  </S.Hyperlink>
 
-                <S.NavbarItem>
-                  {GIT_TAG && <Version tag={GIT_TAG} commit={GIT_COMMIT} />}
-                </S.NavbarItem>
+                  <S.NavbarItem>
+                    {GIT_TAG && <Version tag={GIT_TAG} commit={GIT_COMMIT} />}
+                  </S.NavbarItem>
+                </S.NavbarBrand>
               </S.NavbarBrand>
-            </S.NavbarBrand>
-            <S.NavbarSocial>
-              <S.LogoutLink href="/logout">
-                <S.LogoutButton buttonType="primary" buttonSize="M">
-                  Log out
-                </S.LogoutButton>
-              </S.LogoutLink>
-              <S.SocialLink
-                href="https://github.com/provectus/kafka-ui"
-                target="_blank"
-              >
-                <GitIcon />
-              </S.SocialLink>
-              <S.SocialLink
-                href="https://discord.com/invite/4DWzD7pGE5"
-                target="_blank"
-              >
-                <DiscordIcon />
-              </S.SocialLink>
-            </S.NavbarSocial>
-          </S.Navbar>
+              <S.NavbarSocial>
+                <S.LogoutLink href="/logout">
+                  <S.LogoutButton buttonType="primary" buttonSize="M">
+                    Log out
+                  </S.LogoutButton>
+                </S.LogoutLink>
+                <S.SocialLink
+                  href="https://github.com/provectus/kafka-ui"
+                  target="_blank"
+                >
+                  <GitIcon />
+                </S.SocialLink>
+                <S.SocialLink
+                  href="https://discord.com/invite/4DWzD7pGE5"
+                  target="_blank"
+                >
+                  <DiscordIcon />
+                </S.SocialLink>
+              </S.NavbarSocial>
+            </S.Navbar>
 
-          <S.Container>
-            <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
-              <Suspense fallback={<PageLoader />}>
-                <Nav />
-              </Suspense>
-            </S.Sidebar>
-            <S.Overlay
-              $visible={isSidebarVisible}
-              onClick={closeSidebar}
-              onKeyDown={closeSidebar}
-              tabIndex={-1}
-              aria-hidden="true"
-              aria-label="Overlay"
-            />
-            <Routes>
-              {['/', '/ui', '/ui/clusters'].map((path) => (
+            <S.Container>
+              <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
+                <Suspense fallback={<PageLoader />}>
+                  <Nav />
+                </Suspense>
+              </S.Sidebar>
+              <S.Overlay
+                $visible={isSidebarVisible}
+                onClick={closeSidebar}
+                onKeyDown={closeSidebar}
+                tabIndex={-1}
+                aria-hidden="true"
+                aria-label="Overlay"
+              />
+              <Routes>
+                {['/', '/ui', '/ui/clusters'].map((path) => (
+                  <Route
+                    key="Home" // optional: avoid full re-renders on route changes
+                    path={path}
+                    element={<Dashboard />}
+                  />
+                ))}
                 <Route
-                  key="Home" // optional: avoid full re-renders on route changes
-                  path={path}
-                  element={<Dashboard />}
+                  path={getNonExactPath(clusterPath())}
+                  element={<ClusterPage />}
                 />
-              ))}
-              <Route
-                path={getNonExactPath(clusterPath())}
-                element={<ClusterPage />}
-              />
-            </Routes>
-          </S.Container>
-          <Toaster position="bottom-right" />
-        </S.Layout>
+              </Routes>
+            </S.Container>
+            <Toaster position="bottom-right" />
+          </S.Layout>
+          <ConfirmationModal />
+        </ConfirmContextProvider>
       </ThemeProvider>
     </QueryClientProvider>
   );
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index d672f7985f5..776afe8e8db 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -4,7 +4,6 @@ import { useNavigate } from 'react-router-dom';
 import { useIsMutating } from '@tanstack/react-query';
 import { ConnectorState, ConnectorAction } from 'generated-sources';
 import useAppParams from 'lib/hooks/useAppParams';
-import useModal from 'lib/hooks/useModal';
 import {
   useConnector,
   useDeleteConnector,
@@ -15,8 +14,8 @@ import {
   clusterConnectorsPath,
   RouterParamsClusterConnectConnector,
 } from 'lib/paths';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import { Button } from 'components/common/Button/Button';
+import { useConfirm } from 'lib/hooks/useConfirm';
 
 const ConnectorActionsWrapperStyled = styled.div`
   display: flex;
@@ -32,22 +31,24 @@ const Actions: React.FC = () => {
   const isMutating = mutationsNumber > 0;
 
   const { data: connector } = useConnector(routerProps);
-
-  const {
-    isOpen: isDeleteConnectorConfirmationOpen,
-    setClose: setDeleteConnectorConfirmationClose,
-    setOpen: setDeleteConnectorConfirmationOpen,
-  } = useModal();
+  const confirm = useConfirm();
 
   const deleteConnectorMutation = useDeleteConnector(routerProps);
-  const deleteConnectorHandler = async () => {
-    try {
-      await deleteConnectorMutation.mutateAsync();
-      navigate(clusterConnectorsPath(routerProps.clusterName));
-    } catch {
-      // do not redirect
-    }
-  };
+  const deleteConnectorHandler = () =>
+    confirm(
+      <>
+        Are you sure you want to remove <b>{routerProps.connectorName}</b>{' '}
+        connector?
+      </>,
+      async () => {
+        try {
+          await deleteConnectorMutation.mutateAsync();
+          navigate(clusterConnectorsPath(routerProps.clusterName));
+        } catch {
+          // do not redirect
+        }
+      }
+    );
 
   const stateMutation = useUpdateConnectorState(routerProps);
   const restartConnectorHandler = () =>
@@ -71,7 +72,7 @@ const Actions: React.FC = () => {
           onClick={pauseConnectorHandler}
           disabled={isMutating}
         >
-          <span>Pause</span>
+          Pause
         </Button>
       )}
 
@@ -83,7 +84,7 @@ const Actions: React.FC = () => {
           onClick={resumeConnectorHandler}
           disabled={isMutating}
         >
-          <span>Resume</span>
+          Resume
         </Button>
       )}
 
@@ -94,7 +95,7 @@ const Actions: React.FC = () => {
         onClick={restartConnectorHandler}
         disabled={isMutating}
       >
-        <span>Restart Connector</span>
+        Restart Connector
       </Button>
       <Button
         buttonSize="M"
@@ -103,7 +104,7 @@ const Actions: React.FC = () => {
         onClick={restartAllTasksHandler}
         disabled={isMutating}
       >
-        <span>Restart All Tasks</span>
+        Restart All Tasks
       </Button>
       <Button
         buttonSize="M"
@@ -112,7 +113,7 @@ const Actions: React.FC = () => {
         onClick={restartFailedTasksHandler}
         disabled={isMutating}
       >
-        <span>Restart Failed Tasks</span>
+        Restart Failed Tasks
       </Button>
       <Button
         buttonSize="M"
@@ -125,27 +126,18 @@ const Actions: React.FC = () => {
           routerProps.connectorName
         )}
       >
-        <span>Edit Config</span>
+        Edit Config
       </Button>
 
       <Button
         buttonSize="M"
         buttonType="secondary"
         type="button"
-        onClick={setDeleteConnectorConfirmationOpen}
+        onClick={deleteConnectorHandler}
         disabled={isMutating}
       >
-        <span>Delete</span>
+        Delete
       </Button>
-      <ConfirmationModal
-        isOpen={isDeleteConnectorConfirmationOpen}
-        onCancel={setDeleteConnectorConfirmationClose}
-        onConfirm={deleteConnectorHandler}
-        isConfirming={isMutating}
-      >
-        Are you sure you want to remove <b>{routerProps.connectorName}</b>{' '}
-        connector?
-      </ConfirmationModal>
     </ConnectorActionsWrapperStyled>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
index f8eea7c47ec..89b1bfb69f0 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
@@ -3,7 +3,7 @@ import { render, WithRoute } from 'lib/testHelpers';
 import { clusterConnectConnectorPath } from 'lib/paths';
 import Actions from 'components/Connect/Details/Actions/Actions';
 import { ConnectorAction, ConnectorState } from 'generated-sources';
-import { screen } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import {
   useConnector,
@@ -27,11 +27,6 @@ jest.mock('lib/hooks/api/kafkaConnect', () => ({
   useUpdateConnectorState: jest.fn(),
 }));
 
-jest.mock(
-  'components/common/ConfirmationModal/ConfirmationModal',
-  () => 'mock-ConfirmationModal'
-);
-
 const expectActionButtonsExists = () => {
   expect(screen.getByText('Restart Connector')).toBeInTheDocument();
   expect(screen.getByText('Restart All Tasks')).toBeInTheDocument();
@@ -116,10 +111,10 @@ describe('Actions', () => {
 
       it('opens confirmation modal when delete button clicked', async () => {
         renderComponent();
-        userEvent.click(screen.getByRole('button', { name: 'Delete' }));
-        expect(
-          screen.getByText(/Are you sure you want to remove/i)
-        ).toHaveAttribute('isopen', 'true');
+        await waitFor(() =>
+          userEvent.click(screen.getByRole('button', { name: 'Delete' }))
+        );
+        expect(screen.getByRole('dialog')).toBeInTheDocument();
       });
 
       it('calls restartConnector when restart button clicked', () => {
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx
index 8e74c6a02b4..8cf11c0989a 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx
@@ -32,8 +32,8 @@ describe('Config', () => {
 
   it('is empty when no config', () => {
     (useConnectorConfig as jest.Mock).mockImplementation(() => ({}));
-    const { container } = renderComponent();
-    expect(container).toBeEmptyDOMElement();
+    renderComponent();
+    expect(screen.queryByText('mock-Editor')).not.toBeInTheDocument();
   });
 
   it('renders editor', () => {
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/Overview.spec.tsx
index 876dd1a472b..2d4a01d14f1 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Overview/__tests__/Overview.spec.tsx
@@ -19,8 +19,8 @@ describe('Overview', () => {
       data: undefined,
     }));
 
-    const { container } = render(<Overview />);
-    expect(container).toBeEmptyDOMElement();
+    render(<Overview />);
+    expect(screen.queryByText('Worker')).not.toBeInTheDocument();
   });
 
   describe('when connector is loaded', () => {
diff --git a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
index d17c239ec73..7260969ba13 100644
--- a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
@@ -3,13 +3,12 @@ import { FullConnectorInfo } from 'generated-sources';
 import { clusterConnectConnectorPath, clusterTopicPath } from 'lib/paths';
 import { ClusterName } from 'redux/interfaces';
 import { Link, NavLink } from 'react-router-dom';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
 import getTagColor from 'components/common/Tag/getTagColor';
-import useModal from 'lib/hooks/useModal';
 import { useDeleteConnector } from 'lib/hooks/api/kafkaConnect';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { useConfirm } from 'lib/hooks/useConfirm';
 
 import * as S from './List.styled';
 
@@ -31,16 +30,22 @@ const ListItem: React.FC<ListItemProps> = ({
     failedTasksCount,
   },
 }) => {
-  const { isOpen, setClose, setOpen } = useModal();
+  const confirm = useConfirm();
   const deleteMutation = useDeleteConnector({
     clusterName,
     connectName: connect,
     connectorName: name,
   });
 
-  const handleDelete = async () => {
-    await deleteMutation.mutateAsync();
-    setClose();
+  const handleDelete = () => {
+    confirm(
+      <>
+        Are you sure want to remove <b>{name}</b> connector?
+      </>,
+      async () => {
+        await deleteMutation.mutateAsync();
+      }
+    );
   };
 
   const runningTasks = React.useMemo(() => {
@@ -78,18 +83,11 @@ const ListItem: React.FC<ListItemProps> = ({
       <td>
         <div>
           <Dropdown>
-            <DropdownItem onClick={setOpen} danger>
+            <DropdownItem onClick={handleDelete} danger>
               Remove Connector
             </DropdownItem>
           </Dropdown>
         </div>
-        <ConfirmationModal
-          isOpen={isOpen}
-          onCancel={setClose}
-          onConfirm={handleDelete}
-        >
-          Are you sure want to remove <b>{name}</b> connector?
-        </ConfirmationModal>
       </td>
     </tr>
   );
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx
index bed5d08b8f7..715d0aeb4d3 100644
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx
@@ -1,16 +1,9 @@
 import React from 'react';
 import { connectors } from 'lib/fixtures/kafkaConnect';
 import ListItem, { ListItemProps } from 'components/Connect/List/ListItem';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
 
-jest.mock(
-  'components/common/ConfirmationModal/ConfirmationModal',
-  () => 'mock-ConfirmationModal'
-);
-
 describe('Connectors ListItem', () => {
   const connector = connectors[0];
   const setupWrapper = (props: Partial<ListItemProps> = {}) => (
@@ -21,25 +14,6 @@ describe('Connectors ListItem', () => {
     </table>
   );
 
-  const onCancel = jest.fn();
-  const onConfirm = jest.fn();
-  const confirmationModal = (props: Partial<ListItemProps> = {}) => (
-    <ConfirmationModal onCancel={onCancel} onConfirm={onConfirm}>
-      <button type="button" id="cancel" onClick={onCancel}>
-        Cancel
-      </button>
-      {props.clusterName ? (
-        <button type="button" id="delete" onClick={onConfirm}>
-          Confirm
-        </button>
-      ) : (
-        <button type="button" id="delete">
-          Confirm
-        </button>
-      )}
-    </ConfirmationModal>
-  );
-
   it('renders item', () => {
     render(setupWrapper());
     expect(screen.getAllByRole('cell')[6]).toHaveTextContent('2 of 2');
@@ -76,22 +50,4 @@ describe('Connectors ListItem', () => {
     );
     expect(screen.getAllByRole('cell')[6]).toHaveTextContent('');
   });
-
-  it('handles cancel', async () => {
-    render(confirmationModal());
-    userEvent.click(screen.getByText('Cancel'));
-    expect(onCancel).toHaveBeenCalled();
-  });
-
-  it('handles delete', () => {
-    render(confirmationModal({ clusterName: 'test' }));
-    userEvent.click(screen.getByText('Confirm'));
-    expect(onConfirm).toHaveBeenCalled();
-  });
-
-  it('handles delete when clusterName is not present', () => {
-    render(confirmationModal({ clusterName: undefined }));
-    userEvent.click(screen.getByText('Confirm'));
-    expect(onConfirm).toHaveBeenCalledTimes(0);
-  });
 });
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index 3882b5ab2f9..b87035ae7de 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -6,7 +6,6 @@ import {
   ClusterGroupParam,
 } from 'lib/paths';
 import PageLoader from 'components/common/PageLoader/PageLoader';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
@@ -38,17 +37,14 @@ const Details: React.FC = () => {
   const isDeleted = useAppSelector(getIsConsumerGroupDeleted);
   const isFetched = useAppSelector(getAreConsumerGroupDetailsFulfilled);
 
-  const [isConfirmationModalVisible, setIsConfirmationModalVisible] =
-    React.useState<boolean>(false);
-
   React.useEffect(() => {
     dispatch(fetchConsumerGroupDetails({ clusterName, consumerGroupID }));
   }, [clusterName, consumerGroupID, dispatch]);
 
   const onDelete = () => {
-    setIsConfirmationModalVisible(false);
     dispatch(deleteConsumerGroup({ clusterName, consumerGroupID }));
   };
+
   React.useEffect(() => {
     if (isDeleted) {
       navigate('../');
@@ -73,7 +69,8 @@ const Details: React.FC = () => {
             <Dropdown>
               <DropdownItem onClick={onResetOffsets}>Reset offset</DropdownItem>
               <DropdownItem
-                onClick={() => setIsConfirmationModalVisible(true)}
+                confirm="Are you sure you want to delete this consumer group?"
+                onClick={onDelete}
                 danger
               >
                 Delete consumer group
@@ -119,13 +116,6 @@ const Details: React.FC = () => {
           ))}
         </tbody>
       </Table>
-      <ConfirmationModal
-        isOpen={isConfirmationModalVisible}
-        onCancel={() => setIsConfirmationModalVisible(false)}
-        onConfirm={onDelete}
-      >
-        Are you sure you want to delete this consumer group?
-      </ConfirmationModal>
     </div>
   );
 };
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
index 315cc4b7680..7a99ee07138 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
@@ -97,12 +97,13 @@ describe('Details component', () => {
         `/api/clusters/${clusterName}/consumer-groups/${groupId}`,
         200
       );
-      await act(() => {
-        userEvent.click(screen.getByText('Submit'));
+      await waitFor(() => {
+        userEvent.click(screen.getByRole('button', { name: 'Confirm' }));
       });
       expect(deleteConsumerGroupMock.called()).toBeTruthy();
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-      expect(mockNavigate).toHaveBeenLastCalledWith('../');
+
+      await waitForElementToBeRemoved(() => screen.queryByRole('dialog'));
+      await waitFor(() => expect(mockNavigate).toHaveBeenLastCalledWith('../'));
     });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index 535b2577519..4a9e0fa173a 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -6,7 +6,6 @@ import {
   clusterSchemaSchemaComparePageRelativePath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { Button } from 'components/common/Button/Button';
@@ -38,10 +37,6 @@ const Details: React.FC = () => {
   const dispatch = useAppDispatch();
   const { isReadOnly } = React.useContext(ClusterContext);
   const { clusterName, subject } = useAppParams<ClusterSubjectParam>();
-  const [
-    isDeleteSchemaConfirmationVisible,
-    setDeleteSchemaConfirmationVisible,
-  ] = React.useState(false);
 
   React.useEffect(() => {
     dispatch(fetchLatestSchema({ clusterName, subject }));
@@ -62,7 +57,7 @@ const Details: React.FC = () => {
   const isFetched = useAppSelector(getAreSchemaLatestFulfilled);
   const areVersionsFetched = useAppSelector(getAreSchemaVersionsFulfilled);
 
-  const onDelete = async () => {
+  const deleteHandler = async () => {
     try {
       await schemasApiClient.deleteSchema({
         clusterName,
@@ -101,19 +96,17 @@ const Details: React.FC = () => {
             </Button>
             <Dropdown>
               <DropdownItem
-                onClick={() => setDeleteSchemaConfirmationVisible(true)}
+                confirm={
+                  <>
+                    Are you sure want to remove <b>{subject}</b> schema?
+                  </>
+                }
+                onClick={deleteHandler}
                 danger
               >
                 Remove schema
               </DropdownItem>
             </Dropdown>
-            <ConfirmationModal
-              isOpen={isDeleteSchemaConfirmationVisible}
-              onCancel={() => setDeleteSchemaConfirmationVisible(false)}
-              onConfirm={onDelete}
-            >
-              Are you sure want to remove <b>{subject}</b> schema?
-            </ConfirmationModal>
           </>
         )}
       </PageHeading>
diff --git a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
index 0bdd601a6f9..30540573823 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import Select from 'components/common/Select/Select';
 import { CompatibilityLevelCompatibilityEnum } from 'generated-sources';
 import { useAppDispatch } from 'lib/hooks/redux';
@@ -10,6 +9,7 @@ import { fetchSchemas } from 'redux/reducers/schemas/schemasSlice';
 import { ClusterNameRoute } from 'lib/paths';
 import { schemasApiClient } from 'lib/api';
 import { showServerError } from 'lib/errorHandling';
+import { useConfirm } from 'lib/hooks/useConfirm';
 
 import * as S from './GlobalSchemaSelector.styled';
 
@@ -18,17 +18,12 @@ const GlobalSchemaSelector: React.FC = () => {
   const dispatch = useAppDispatch();
   const [searchText] = useSearch();
   const { page, perPage } = usePagination();
+  const confirm = useConfirm();
 
   const [currentCompatibilityLevel, setCurrentCompatibilityLevel] =
     React.useState<CompatibilityLevelCompatibilityEnum | undefined>();
-  const [nextCompatibilityLevel, setNextCompatibilityLevel] = React.useState<
-    CompatibilityLevelCompatibilityEnum | undefined
-  >();
 
   const [isFetching, setIsFetching] = React.useState(false);
-  const [isUpdating, setIsUpdating] = React.useState(false);
-  const [isConfirmationVisible, setIsConfirmationVisible] =
-    React.useState(false);
 
   React.useEffect(() => {
     const fetchData = async () => {
@@ -49,29 +44,30 @@ const GlobalSchemaSelector: React.FC = () => {
   }, [clusterName]);
 
   const handleChangeCompatibilityLevel = (level: string | number) => {
-    setNextCompatibilityLevel(level as CompatibilityLevelCompatibilityEnum);
-    setIsConfirmationVisible(true);
-  };
-
-  const handleUpdateCompatibilityLevel = async () => {
-    setIsUpdating(true);
-    if (nextCompatibilityLevel) {
-      try {
-        await schemasApiClient.updateGlobalSchemaCompatibilityLevel({
-          clusterName,
-          compatibilityLevel: { compatibility: nextCompatibilityLevel },
-        });
-        setCurrentCompatibilityLevel(nextCompatibilityLevel);
-        setNextCompatibilityLevel(undefined);
-        setIsConfirmationVisible(false);
-        dispatch(
-          fetchSchemas({ clusterName, page, perPage, search: searchText })
-        );
-      } catch (e) {
-        showServerError(e as Response);
+    const nextLevel = level as CompatibilityLevelCompatibilityEnum;
+    confirm(
+      <>
+        Are you sure you want to update the global compatibility level and set
+        it to <b>{nextLevel}</b>? This may affect the compatibility levels of
+        the schemas.
+      </>,
+      async () => {
+        try {
+          await schemasApiClient.updateGlobalSchemaCompatibilityLevel({
+            clusterName,
+            compatibilityLevel: {
+              compatibility: nextLevel,
+            },
+          });
+          setCurrentCompatibilityLevel(nextLevel);
+          dispatch(
+            fetchSchemas({ clusterName, page, perPage, search: searchText })
+          );
+        } catch (e) {
+          showServerError(e as Response);
+        }
       }
-    }
-    setIsUpdating(false);
+    );
   };
 
   if (!currentCompatibilityLevel) return null;
@@ -84,21 +80,11 @@ const GlobalSchemaSelector: React.FC = () => {
         defaultValue={currentCompatibilityLevel}
         minWidth="200px"
         onChange={handleChangeCompatibilityLevel}
-        disabled={isFetching || isUpdating || isConfirmationVisible}
+        disabled={isFetching}
         options={Object.keys(CompatibilityLevelCompatibilityEnum).map(
           (level) => ({ value: level, label: level })
         )}
       />
-      <ConfirmationModal
-        isOpen={isConfirmationVisible}
-        onCancel={() => setIsConfirmationVisible(false)}
-        onConfirm={handleUpdateCompatibilityLevel}
-        isConfirming={isUpdating}
-      >
-        Are you sure you want to update the global compatibility level and set
-        it to <b>{nextCompatibilityLevel}</b>? This may affect the compatibility
-        levels of the schemas.
-      </ConfirmationModal>
     </S.Wrapper>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx
index df49cc1f5e0..34da3886d7c 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx
@@ -86,7 +86,7 @@ describe('GlobalSchemaSelector', () => {
       200
     );
     await waitFor(() => {
-      userEvent.click(screen.getByText('Submit'));
+      userEvent.click(screen.getByRole('button', { name: 'Confirm' }));
     });
     await waitFor(() => expect(putNewCompatibilityMock.called()).toBeTruthy());
     await waitFor(() => expect(getSchemasMock.called()).toBeTruthy());
@@ -94,6 +94,9 @@ describe('GlobalSchemaSelector', () => {
     await waitFor(() =>
       expect(screen.queryByText('Confirm the action')).not.toBeInTheDocument()
     );
-    expectOptionIsSelected(CompatibilityLevelCompatibilityEnum.FORWARD);
+
+    await waitFor(() =>
+      expectOptionIsSelected(CompatibilityLevelCompatibilityEnum.FORWARD)
+    );
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
index 9849888ba46..62558086fd8 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
@@ -5,13 +5,11 @@ import {
   TopicColumnsToSort,
 } from 'generated-sources';
 import { useAppDispatch } from 'lib/hooks/redux';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import { TableCellProps } from 'components/common/SmartTable/TableColumn';
 import { TopicWithDetailedInfo } from 'redux/interfaces';
 import ClusterContext from 'components/contexts/ClusterContext';
 import * as S from 'components/Topics/List/List.styled';
 import { ClusterNameRoute } from 'lib/paths';
-import useModal from 'lib/hooks/useModal';
 import useAppParams from 'lib/hooks/useAppParams';
 import {
   deleteTopic,
@@ -46,85 +44,61 @@ const ActionsCell: React.FC<
   const dispatch = useAppDispatch();
   const { clusterName } = useAppParams<ClusterNameRoute>();
 
-  const {
-    isOpen: isDeleteTopicModalOpen,
-    setClose: closeDeleteTopicModal,
-    setOpen: openDeleteTopicModal,
-  } = useModal(false);
-
-  const {
-    isOpen: isRecreateTopicModalOpen,
-    setClose: closeRecreateTopicModal,
-    setOpen: openRecreateTopicModal,
-  } = useModal(false);
-
-  const {
-    isOpen: isClearMessagesModalOpen,
-    setClose: closeClearMessagesModal,
-    setOpen: openClearMessagesModal,
-  } = useModal(false);
-
   const isHidden = internal || isReadOnly || !hovered;
 
   const deleteTopicHandler = () => {
     dispatch(deleteTopic({ clusterName, topicName: name }));
-    closeDeleteTopicModal();
   };
 
   const clearTopicMessagesHandler = () => {
     dispatch(clearTopicMessages({ clusterName, topicName: name }));
     dispatch(fetchTopicsList(topicsListParams));
-    closeClearMessagesModal();
   };
 
   const recreateTopicHandler = () => {
     dispatch(recreateTopic({ clusterName, topicName: name }));
-    closeRecreateTopicModal();
   };
 
   return (
-    <>
-      <S.ActionsContainer>
-        {!isHidden && (
-          <Dropdown>
-            {cleanUpPolicy === CleanUpPolicy.DELETE && (
-              <DropdownItem onClick={openClearMessagesModal} danger>
-                Clear Messages
-              </DropdownItem>
-            )}
-            <DropdownItem onClick={openRecreateTopicModal} danger>
-              Recreate Topic
+    <S.ActionsContainer>
+      {!isHidden && (
+        <Dropdown>
+          {cleanUpPolicy === CleanUpPolicy.DELETE && (
+            <DropdownItem
+              onClick={clearTopicMessagesHandler}
+              confirm="Are you sure want to clear topic messages?"
+              danger
+            >
+              Clear Messages
+            </DropdownItem>
+          )}
+          <DropdownItem
+            onClick={recreateTopicHandler}
+            confirm={
+              <>
+                Are you sure to recreate <b>{name}</b> topic?
+              </>
+            }
+            danger
+          >
+            Recreate Topic
+          </DropdownItem>
+          {isTopicDeletionAllowed && (
+            <DropdownItem
+              onClick={deleteTopicHandler}
+              confirm={
+                <>
+                  Are you sure want to remove <b>{name}</b> topic?
+                </>
+              }
+              danger
+            >
+              Remove Topic
             </DropdownItem>
-            {isTopicDeletionAllowed && (
-              <DropdownItem onClick={openDeleteTopicModal} danger>
-                Remove Topic
-              </DropdownItem>
-            )}
-          </Dropdown>
-        )}
-      </S.ActionsContainer>
-      <ConfirmationModal
-        isOpen={isClearMessagesModalOpen}
-        onCancel={closeClearMessagesModal}
-        onConfirm={clearTopicMessagesHandler}
-      >
-        Are you sure want to clear topic messages?
-      </ConfirmationModal>
-      <ConfirmationModal
-        isOpen={isDeleteTopicModalOpen}
-        onCancel={closeDeleteTopicModal}
-        onConfirm={deleteTopicHandler}
-      >
-        Are you sure want to remove <b>{name}</b> topic?
-      </ConfirmationModal>
-      <ConfirmationModal
-        isOpen={isRecreateTopicModalOpen}
-        onCancel={closeRecreateTopicModal}
-        onConfirm={recreateTopicHandler}
-      >
-        Are you sure to recreate <b>{name}</b> topic?
-      </ConfirmationModal>
-    </>
+          )}
+        </Dropdown>
+      )}
+    </S.ActionsContainer>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Topics/List/List.tsx b/kafka-ui-react-app/src/components/Topics/List/List.tsx
index 9caeced9283..aef6f95d170 100644
--- a/kafka-ui-react-app/src/components/Topics/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/List.tsx
@@ -14,7 +14,6 @@ import {
 import usePagination from 'lib/hooks/usePagination';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageLoader from 'components/common/PageLoader/PageLoader';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import {
   GetTopicsRequest,
   SortOrder,
@@ -30,6 +29,7 @@ import { SmartTable } from 'components/common/SmartTable/SmartTable';
 import { TableColumn } from 'components/common/SmartTable/TableColumn';
 import { useTableState } from 'lib/hooks/useTableState';
 import PlusIcon from 'components/common/Icons/PlusIcon';
+import { useConfirm } from 'lib/hooks/useConfirm';
 
 import {
   MessagesCell,
@@ -88,6 +88,7 @@ const List: React.FC<TopicsListProps> = ({
     page || null
   );
   const navigate = useNavigate();
+  const confirm = useConfirm();
 
   const topicsListParams = React.useMemo(
     () => ({
@@ -148,16 +149,6 @@ const List: React.FC<TopicsListProps> = ({
     });
   };
 
-  const [confirmationModal, setConfirmationModal] = React.useState<
-    '' | 'deleteTopics' | 'purgeMessages'
-  >('');
-
-  const [confirmationModalText, setConfirmationModalText] =
-    React.useState<string>('');
-  const closeConfirmationModal = () => {
-    setConfirmationModal('');
-  };
-
   const clearSelectedTopics = () => tableState.toggleSelection(false);
 
   const searchHandler = (searchString: string) => {
@@ -171,16 +162,26 @@ const List: React.FC<TopicsListProps> = ({
       search: `?page=${newPageQuery}&perPage=${perPage || PER_PAGE}`,
     });
   };
-  const deleteOrPurgeConfirmationHandler = () => {
+
+  const deleteTopicsHandler = () => {
     const selectedIds = Array.from(tableState.selectedIds);
-    if (confirmationModal === 'deleteTopics') {
+    confirm('Are you sure you want to remove selected topics?', () => {
       deleteTopics({ clusterName, topicNames: selectedIds });
-    } else {
-      clearTopicsMessages({ clusterName, topicNames: selectedIds });
-    }
-    closeConfirmationModal();
-    clearSelectedTopics();
-    fetchTopicsList(topicsListParams);
+      clearSelectedTopics();
+      fetchTopicsList(topicsListParams);
+    });
+  };
+
+  const purgeTopicsHandler = () => {
+    const selectedIds = Array.from(tableState.selectedIds);
+    confirm(
+      'Are you sure you want to purge messages of selected topics?',
+      () => {
+        clearTopicsMessages({ clusterName, topicNames: selectedIds });
+        clearSelectedTopics();
+        fetchTopicsList(topicsListParams);
+      }
+    );
   };
 
   return (
@@ -220,54 +221,35 @@ const List: React.FC<TopicsListProps> = ({
       ) : (
         <div>
           {tableState.selectedCount > 0 && (
-            <>
-              <ControlPanelWrapper data-testid="delete-buttons">
+            <ControlPanelWrapper data-testid="delete-buttons">
+              <Button
+                buttonSize="M"
+                buttonType="secondary"
+                onClick={deleteTopicsHandler}
+              >
+                Delete selected topics
+              </Button>
+              {tableState.selectedCount === 1 && (
                 <Button
                   buttonSize="M"
                   buttonType="secondary"
-                  onClick={() => {
-                    setConfirmationModal('deleteTopics');
-                    setConfirmationModalText(
-                      'Are you sure you want to remove selected topics?'
-                    );
+                  to={{
+                    pathname: clusterTopicCopyRelativePath,
+                    search: `?${getSelectedTopic()}`,
                   }}
                 >
-                  Delete selected topics
+                  Copy selected topic
                 </Button>
-                {tableState.selectedCount === 1 && (
-                  <Button
-                    buttonSize="M"
-                    buttonType="secondary"
-                    to={{
-                      pathname: clusterTopicCopyRelativePath,
-                      search: `?${getSelectedTopic()}`,
-                    }}
-                  >
-                    Copy selected topic
-                  </Button>
-                )}
+              )}
 
-                <Button
-                  buttonSize="M"
-                  buttonType="secondary"
-                  onClick={() => {
-                    setConfirmationModal('purgeMessages');
-                    setConfirmationModalText(
-                      'Are you sure you want to purge messages of selected topics?'
-                    );
-                  }}
-                >
-                  Purge messages of selected topics
-                </Button>
-              </ControlPanelWrapper>
-              <ConfirmationModal
-                isOpen={confirmationModal !== ''}
-                onCancel={closeConfirmationModal}
-                onConfirm={deleteOrPurgeConfirmationHandler}
+              <Button
+                buttonSize="M"
+                buttonType="secondary"
+                onClick={purgeTopicsHandler}
               >
-                {confirmationModalText}
-              </ConfirmationModal>
-            </>
+                Purge messages of selected topics
+              </Button>
+            </ControlPanelWrapper>
           )}
           <SmartTable
             selectable={!isReadOnly}
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx
index 2d756fc8b76..a9f666c57a6 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx
@@ -280,9 +280,9 @@ describe('List', () => {
       )[buttonIndex];
       userEvent.click(buttonClickedElement);
 
-      const modal = screen.getByRole('dialog');
+      const modal = await screen.findByRole('dialog');
       expect(within(modal).getByText(confirmationText)).toBeInTheDocument();
-      userEvent.click(within(modal).getByRole('button', { name: 'Submit' }));
+      userEvent.click(within(modal).getByRole('button', { name: 'Confirm' }));
 
       await waitFor(() => {
         expect(screen.queryByTestId('delete-buttons')).not.toBeInTheDocument();
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
index 9468f524b8d..2fb13af8d1d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
@@ -10,7 +10,6 @@ import {
   clusterTopicSendMessageRelativePath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { Button } from 'components/common/Button/Button';
 import styled from 'styled-components';
@@ -60,42 +59,22 @@ const Details: React.FC<Props> = ({
   clearTopicMessages,
 }) => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
-
   const isInternal = useAppSelector((state) =>
     getIsTopicInternal(state, topicName)
   );
   const isDeletePolicy = useAppSelector((state) =>
     getIsTopicDeletePolicy(state, topicName)
   );
-
   const navigate = useNavigate();
+
   const { isReadOnly, isTopicDeletionAllowed } =
     React.useContext(ClusterContext);
 
-  const [isDeleteTopicConfirmationVisible, setDeleteTopicConfirmationVisible] =
-    React.useState(false);
-  const [isClearTopicConfirmationVisible, setClearTopicConfirmationVisible] =
-    React.useState(false);
-  const [
-    isRecreateTopicConfirmationVisible,
-    setRecreateTopicConfirmationVisible,
-  ] = React.useState(false);
   const deleteTopicHandler = () => {
     deleteTopic({ clusterName, topicName });
-    setDeleteTopicConfirmationVisible(false);
     navigate('../..');
   };
 
-  const clearTopicMessagesHandler = () => {
-    clearTopicMessages({ clusterName, topicName });
-    setClearTopicConfirmationVisible(false);
-  };
-
-  const recreateTopicHandler = () => {
-    recreateTopic({ clusterName, topicName });
-    setRecreateTopicConfirmationVisible(false);
-  };
-
   return (
     <div>
       <PageHeading text={topicName}>
@@ -131,26 +110,44 @@ const Details: React.FC<Props> = ({
                         especially important consequences.
                       </DropdownItemHint>
                     </DropdownItem>
+                    {isDeletePolicy && (
+                      <DropdownItem
+                        disabled={!isDeletePolicy}
+                        onClick={() =>
+                          clearTopicMessages({ clusterName, topicName })
+                        }
+                        confirm="Are you sure want to clear topic messages?"
+                        danger
+                      >
+                        Clear messages
+                      </DropdownItem>
+                    )}
                     <DropdownItem
-                      disabled={!isDeletePolicy}
-                      onClick={() => setClearTopicConfirmationVisible(true)}
-                      danger
-                    >
-                      Clear messages
-                    </DropdownItem>
-                    <DropdownItem
-                      onClick={() => setRecreateTopicConfirmationVisible(true)}
+                      onClick={() => recreateTopic({ clusterName, topicName })}
+                      confirm={
+                        <>
+                          Are you sure want to recreate <b>{topicName}</b>{' '}
+                          topic?
+                        </>
+                      }
                       danger
                     >
                       Recreate Topic
                     </DropdownItem>
-                    <DropdownItem
-                      disabled={!isTopicDeletionAllowed}
-                      onClick={() => setDeleteTopicConfirmationVisible(true)}
-                      danger
-                    >
-                      Remove Topic
-                    </DropdownItem>
+                    {isTopicDeletionAllowed && (
+                      <DropdownItem
+                        onClick={deleteTopicHandler}
+                        confirm={
+                          <>
+                            Are you sure want to remove <b>{topicName}</b>{' '}
+                            topic?
+                          </>
+                        }
+                        danger
+                      >
+                        Remove Topic
+                      </DropdownItem>
+                    )}
                   </Dropdown>
                 }
               />
@@ -158,27 +155,6 @@ const Details: React.FC<Props> = ({
           )}
         </HeaderControlsWrapper>
       </PageHeading>
-      <ConfirmationModal
-        isOpen={isDeleteTopicConfirmationVisible}
-        onCancel={() => setDeleteTopicConfirmationVisible(false)}
-        onConfirm={deleteTopicHandler}
-      >
-        Are you sure want to remove <b>{topicName}</b> topic?
-      </ConfirmationModal>
-      <ConfirmationModal
-        isOpen={isClearTopicConfirmationVisible}
-        onCancel={() => setClearTopicConfirmationVisible(false)}
-        onConfirm={clearTopicMessagesHandler}
-      >
-        Are you sure want to clear topic messages?
-      </ConfirmationModal>
-      <ConfirmationModal
-        isOpen={isRecreateTopicConfirmationVisible}
-        onCancel={() => setRecreateTopicConfirmationVisible(false)}
-        onConfirm={recreateTopicHandler}
-      >
-        Are you sure want to recreate <b>{topicName}</b> topic?
-      </ConfirmationModal>
       <Navbar role="navigation">
         <NavLink
           to="."
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
index 2885a32d3a2..74d45402c1a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
@@ -298,13 +298,6 @@ export const DeleteSavedFilterIcon = styled.div`
   margin-left: 4px;
 `;
 
-export const ConfirmDeletionText = styled.h3`
-  color: ${({ theme }) => theme.modal.deletionTextColor};
-  font-size: 14px;
-  line-height: 20px;
-  padding: 16px 0;
-`;
-
 export const MessageLoading = styled.div.attrs({
   role: 'contentLoader',
 })<MessageLoadingProps>`
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx
index 1bfb5f096c6..279ad24b3e5 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx
@@ -1,8 +1,7 @@
 import React, { FC } from 'react';
 import { Button } from 'components/common/Button/Button';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
-import useModal from 'lib/hooks/useModal';
 import DeleteIcon from 'components/common/Icons/DeleteIcon';
+import { useConfirm } from 'lib/hooks/useConfirm';
 
 import * as S from './Filters.styled';
 import { MessageFilters } from './Filters';
@@ -24,9 +23,8 @@ const SavedFilters: FC<Props> = ({
   closeModal,
   onGoBack,
 }) => {
-  const { isOpen, setOpen, setClose } = useModal();
-  const [deleteIndex, setDeleteIndex] = React.useState<number>(-1);
   const [selectedFilter, setSelectedFilter] = React.useState(-1);
+  const confirm = useConfirm();
 
   const activeFilter = () => {
     if (selectedFilter > -1) {
@@ -36,26 +34,13 @@ const SavedFilters: FC<Props> = ({
   };
 
   const deleteFilterHandler = (index: number) => {
-    setOpen();
-    setDeleteIndex(index);
+    confirm(<>Are you sure want to remove {filters[index]?.name}?</>, () => {
+      deleteFilter(index);
+    });
   };
 
   return (
     <>
-      <ConfirmationModal
-        isOpen={isOpen}
-        title="Confirm deletion"
-        onConfirm={() => {
-          deleteFilter(deleteIndex);
-          setClose();
-        }}
-        onCancel={setClose}
-        submitBtnText="Delete"
-      >
-        <S.ConfirmDeletionText>
-          Are you sure want to remove {filters[deleteIndex]?.name}?
-        </S.ConfirmDeletionText>
-      </ConfirmationModal>
       <S.BackToCustomText onClick={onGoBack}>
         Back To custom filters
       </S.BackToCustomText>
@@ -86,7 +71,6 @@ const SavedFilters: FC<Props> = ({
           buttonType="secondary"
           type="button"
           onClick={closeModal}
-          disabled={isOpen}
         >
           Cancel
         </Button>
@@ -95,7 +79,6 @@ const SavedFilters: FC<Props> = ({
           buttonType="primary"
           type="button"
           onClick={activeFilter}
-          disabled={isOpen}
         >
           Select filter
         </Button>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx
index 1fa21b6e6c7..862101f751f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx
@@ -3,7 +3,12 @@ import SavedFilters, {
   Props,
 } from 'components/Topics/Topic/Details/Messages/Filters/SavedFilters';
 import { MessageFilters } from 'components/Topics/Topic/Details/Messages/Filters/Filters';
-import { screen, within } from '@testing-library/react';
+import {
+  screen,
+  waitFor,
+  waitForElementToBeRemoved,
+  within,
+} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
 
@@ -11,8 +16,8 @@ jest.mock('components/common/Icons/DeleteIcon', () => () => 'mock-DeleteIcon');
 
 describe('SavedFilter Component', () => {
   const mockFilters: MessageFilters[] = [
-    { name: 'name', code: 'code' },
-    { name: 'name1', code: 'code1' },
+    { name: 'My Filter', code: 'code' },
+    { name: 'One More Filter', code: 'code1' },
   ];
 
   const setUpComponent = (props: Partial<Props> = {}) => {
@@ -125,11 +130,11 @@ describe('SavedFilter Component', () => {
       const modelDialog = screen.getByRole('dialog');
       expect(modelDialog).toBeInTheDocument();
       expect(
-        within(modelDialog).getByText(/Confirm deletion/i)
+        within(modelDialog).getByText('Are you sure want to remove My Filter?')
       ).toBeInTheDocument();
     });
 
-    it('Close Confirmations deletion modal with button', () => {
+    it('Close Confirmations deletion modal with button', async () => {
       setUpComponent({ deleteFilter: deleteMock });
       const savedFilters = getSavedFilters();
       const deleteIcons = screen.getAllByText('mock-DeleteIcon');
@@ -142,11 +147,11 @@ describe('SavedFilter Component', () => {
       const cancelButton = within(modelDialog).getByRole('button', {
         name: /Cancel/i,
       });
-      userEvent.click(cancelButton);
+      await waitFor(() => userEvent.click(cancelButton));
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
 
-    it('Delete the saved filter', () => {
+    it('Delete the saved filter', async () => {
       setUpComponent({ deleteFilter: deleteMock });
       const savedFilters = getSavedFilters();
       const deleteIcons = screen.getAllByText('mock-DeleteIcon');
@@ -154,9 +159,11 @@ describe('SavedFilter Component', () => {
       userEvent.hover(savedFilters[0]);
       userEvent.click(deleteIcons[0]);
 
-      userEvent.click(screen.getByRole('button', { name: /Delete/i }));
+      await waitFor(() =>
+        userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+      );
       expect(deleteMock).toHaveBeenCalledTimes(1);
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+      await waitForElementToBeRemoved(() => screen.queryByRole('dialog'));
     });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
index c03f5b511a4..5c1df4edf31 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import ClusterContext from 'components/contexts/ClusterContext';
 import Details from 'components/Topics/Topic/Details/Details';
@@ -97,9 +97,12 @@ describe('Details', () => {
       userEvent.click(openModalButton);
     });
 
-    it('calls deleteTopic on confirm', () => {
-      const submitButton = screen.getAllByText('Submit')[0];
-      userEvent.click(submitButton);
+    it('calls deleteTopic on confirm', async () => {
+      const submitButton = screen.getAllByRole('button', {
+        name: 'Confirm',
+      })[0];
+
+      await waitFor(() => userEvent.click(submitButton));
 
       expect(mockDelete).toHaveBeenCalledWith({
         clusterName: mockClusterName,
@@ -107,10 +110,9 @@ describe('Details', () => {
       });
     });
 
-    it('closes the modal when cancel button is clicked', () => {
+    it('closes the modal when cancel button is clicked', async () => {
       const cancelButton = screen.getAllByText('Cancel')[0];
-      userEvent.click(cancelButton);
-
+      await waitFor(() => userEvent.click(cancelButton));
       expect(cancelButton).not.toBeInTheDocument();
     });
   });
@@ -123,9 +125,11 @@ describe('Details', () => {
       userEvent.click(confirmButton);
     });
 
-    it('it calls clearTopicMessages on confirm', () => {
-      const submitButton = screen.getAllByText('Submit')[0];
-      userEvent.click(submitButton);
+    it('it calls clearTopicMessages on confirm', async () => {
+      const submitButton = screen.getAllByRole('button', {
+        name: 'Confirm',
+      })[0];
+      await waitFor(() => userEvent.click(submitButton));
 
       expect(mockClearTopicMessages).toHaveBeenCalledWith({
         clusterName: mockClusterName,
@@ -133,9 +137,9 @@ describe('Details', () => {
       });
     });
 
-    it('closes the modal when cancel button is clicked', () => {
+    it('closes the modal when cancel button is clicked', async () => {
       const cancelButton = screen.getAllByText('Cancel')[0];
-      userEvent.click(cancelButton);
+      await waitFor(() => userEvent.click(cancelButton));
 
       expect(cancelButton).not.toBeInTheDocument();
     });
@@ -152,14 +156,14 @@ describe('Details', () => {
     });
   });
 
-  it('redirects to the correct route if topic is deleted', () => {
+  it('redirects to the correct route if topic is deleted', async () => {
     setupComponent();
 
     const deleteTopicButton = screen.getByText(/Remove topic/i);
     userEvent.click(deleteTopicButton);
 
-    const submitDeleteButton = screen.getByText(/Submit/i);
-    userEvent.click(submitDeleteButton);
+    const submitDeleteButton = screen.getByRole('button', { name: 'Confirm' });
+    await waitFor(() => userEvent.click(submitDeleteButton));
 
     expect(mockNavigate).toHaveBeenCalledWith('../..');
   });
@@ -184,12 +188,13 @@ describe('Details', () => {
     ).toBeInTheDocument();
   });
 
-  it('calling recreation function after click on Submit button', () => {
+  it('calling recreation function after click on Submit button', async () => {
     setupComponent();
     const recreateTopicButton = screen.getByText(/Recreate topic/i);
     userEvent.click(recreateTopicButton);
-    const confirmBtn = screen.getByRole('button', { name: /submit/i });
-    userEvent.click(confirmBtn);
+    const confirmBtn = screen.getByRole('button', { name: /Confirm/i });
+
+    await waitFor(() => userEvent.click(confirmBtn));
     expect(mockRecreateTopic).toBeCalledTimes(1);
   });
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
index 3f7576d9f6c..c84f43677c8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
@@ -1,6 +1,5 @@
 import { ErrorMessage } from '@hookform/error-message';
 import { Button } from 'components/common/Button/Button';
-import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 import Input from 'components/common/Input/Input';
 import { FormError } from 'components/common/Input/Input.styled';
 import { InputLabel } from 'components/common/Input/InputLabel.styled';
@@ -9,14 +8,13 @@ import { FormProvider, useForm } from 'react-hook-form';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import { ClusterName, TopicName } from 'redux/interfaces';
 import useAppParams from 'lib/hooks/useAppParams';
+import { useConfirm } from 'lib/hooks/useConfirm';
 
 import * as S from './DangerZone.styled';
 
 export interface Props {
   defaultPartitions: number;
   defaultReplicationFactor: number;
-  partitionsCountIncreased: boolean;
-  replicationFactorUpdated: boolean;
   updateTopicPartitionsCount: (payload: {
     clusterName: ClusterName;
     topicName: TopicName;
@@ -32,19 +30,10 @@ export interface Props {
 const DangerZone: React.FC<Props> = ({
   defaultPartitions,
   defaultReplicationFactor,
-  partitionsCountIncreased,
-  replicationFactorUpdated,
   updateTopicPartitionsCount,
   updateTopicReplicationFactor,
 }) => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
-
-  const [isPartitionsConfirmationVisible, setIsPartitionsConfirmationVisible] =
-    React.useState<boolean>(false);
-  const [
-    isReplicationFactorConfirmationVisible,
-    setIsReplicationFactorConfirmationVisible,
-  ] = React.useState<boolean>(false);
   const [partitions, setPartitions] = React.useState<number>(defaultPartitions);
   const [replicationFactor, setReplicationFactor] = React.useState<number>(
     defaultReplicationFactor
@@ -62,6 +51,29 @@ const DangerZone: React.FC<Props> = ({
     },
   });
 
+  const confirm = useConfirm();
+
+  const confirmPartitionsChange = () =>
+    confirm(
+      `Are you sure you want to increase the number of partitions?
+        Do it only if you 100% know what you are doing!`,
+      () =>
+        updateTopicPartitionsCount({
+          clusterName,
+          topicName,
+          partitions: partitionsMethods.getValues('partitions'),
+        })
+    );
+  const confirmReplicationFactorChange = () =>
+    confirm('Are you sure you want to update the replication factor?', () =>
+      updateTopicReplicationFactor({
+        clusterName,
+        topicName,
+        replicationFactor:
+          replicationFactorMethods.getValues('replicationFactor'),
+      })
+    );
+
   const validatePartitions = (data: { partitions: number }) => {
     if (data.partitions < defaultPartitions) {
       partitionsMethods.setError('partitions', {
@@ -70,42 +82,15 @@ const DangerZone: React.FC<Props> = ({
       });
     } else {
       setPartitions(data.partitions);
-      setIsPartitionsConfirmationVisible(true);
+      confirmPartitionsChange();
     }
   };
 
   const validateReplicationFactor = (data: { replicationFactor: number }) => {
     setReplicationFactor(data.replicationFactor);
-    setIsReplicationFactorConfirmationVisible(true);
+    confirmReplicationFactorChange();
   };
 
-  React.useEffect(() => {
-    if (partitionsCountIncreased) {
-      setIsPartitionsConfirmationVisible(false);
-    }
-  }, [partitionsCountIncreased]);
-
-  React.useEffect(() => {
-    if (replicationFactorUpdated) {
-      setIsReplicationFactorConfirmationVisible(false);
-    }
-  }, [replicationFactorUpdated]);
-
-  const partitionsSubmit = () => {
-    updateTopicPartitionsCount({
-      clusterName,
-      topicName,
-      partitions: partitionsMethods.getValues('partitions'),
-    });
-  };
-  const replicationFactorSubmit = () => {
-    updateTopicReplicationFactor({
-      clusterName,
-      topicName,
-      replicationFactor:
-        replicationFactorMethods.getValues('replicationFactor'),
-    });
-  };
   return (
     <S.Wrapper>
       <S.Title>Danger Zone</S.Title>
@@ -148,15 +133,6 @@ const DangerZone: React.FC<Props> = ({
             name="partitions"
           />
         </FormError>
-        <ConfirmationModal
-          isOpen={isPartitionsConfirmationVisible}
-          onCancel={() => setIsPartitionsConfirmationVisible(false)}
-          onConfirm={partitionsSubmit}
-        >
-          Are you sure you want to increase the number of partitions? Do it only
-          if you 100% know what you are doing!
-        </ConfirmationModal>
-
         <FormProvider {...replicationFactorMethods}>
           <S.Form
             onSubmit={replicationFactorMethods.handleSubmit(
@@ -170,6 +146,7 @@ const DangerZone: React.FC<Props> = ({
               </InputLabel>
               <Input
                 id="replicationFactor"
+                inputSize="M"
                 type="number"
                 placeholder="Replication Factor"
                 name="replicationFactor"
@@ -190,20 +167,12 @@ const DangerZone: React.FC<Props> = ({
             </div>
           </S.Form>
         </FormProvider>
-
         <FormError>
           <ErrorMessage
             errors={replicationFactorMethods.formState.errors}
             name="replicationFactor"
           />
         </FormError>
-        <ConfirmationModal
-          isOpen={isReplicationFactorConfirmationVisible}
-          onCancel={() => setIsReplicationFactorConfirmationVisible(false)}
-          onConfirm={replicationFactorSubmit}
-        >
-          Are you sure you want to update the replication factor?
-        </ConfirmationModal>
       </div>
     </S.Wrapper>
   );
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZoneContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZoneContainer.ts
index 722f5144dbb..f87ea036694 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZoneContainer.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZoneContainer.ts
@@ -4,10 +4,6 @@ import {
   updateTopicPartitionsCount,
   updateTopicReplicationFactor,
 } from 'redux/reducers/topics/topicsSlice';
-import {
-  getTopicPartitionsCountIncreased,
-  getTopicReplicationFactorUpdated,
-} from 'redux/reducers/topics/selectors';
 
 import DangerZone from './DangerZone';
 
@@ -17,13 +13,11 @@ type OwnProps = {
 };
 
 const mapStateToProps = (
-  state: RootState,
+  _: RootState,
   { defaultPartitions, defaultReplicationFactor }: OwnProps
 ) => ({
   defaultPartitions,
   defaultReplicationFactor,
-  partitionsCountIncreased: getTopicPartitionsCountIncreased(state),
-  replicationFactorUpdated: getTopicReplicationFactorUpdated(state),
 });
 
 const mapDispatchToProps = {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
index 2099f63305b..32458bf5652 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
@@ -20,8 +20,6 @@ const renderComponent = (props?: Partial<Props>) =>
       <DangerZone
         defaultPartitions={defaultPartitions}
         defaultReplicationFactor={defaultReplicationFactor}
-        partitionsCountIncreased={false}
-        replicationFactorUpdated={false}
         updateTopicPartitionsCount={jest.fn()}
         updateTopicReplicationFactor={jest.fn()}
         {...props}
@@ -33,7 +31,7 @@ const renderComponent = (props?: Partial<Props>) =>
 const clickOnDialogSubmitButton = () => {
   userEvent.click(
     within(screen.getByRole('dialog')).getByRole('button', {
-      name: 'Submit',
+      name: 'Confirm',
     })
   );
 };
@@ -41,7 +39,7 @@ const clickOnDialogSubmitButton = () => {
 const checkDialogThenPressCancel = async () => {
   const dialog = screen.getByRole('dialog');
   expect(screen.getByRole('dialog')).toBeInTheDocument();
-  userEvent.click(within(dialog).getByText(/cancel/i));
+  userEvent.click(within(dialog).getByRole('button', { name: 'Cancel' }));
   await waitFor(() =>
     expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
   );
@@ -174,73 +172,6 @@ describe('DangerZone', () => {
     );
   });
 
-  it('should close any popup if the partitionsCount is Increased ', async () => {
-    renderComponent({ partitionsCountIncreased: true });
-    await waitFor(() =>
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    );
-  });
-
-  it('should close any popup if the replicationFactor is Updated', async () => {
-    renderComponent({ replicationFactorUpdated: true });
-    await waitFor(() =>
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    );
-  });
-
-  it('should already opened Confirmation popup if partitionsCount is Increased', async () => {
-    const { rerender } = renderComponent();
-    const partitionInput = screen.getByPlaceholderText('Number of partitions');
-    const partitionInputSubmitBtn = screen.getAllByText(/submit/i)[0];
-
-    await waitFor(() => {
-      userEvent.type(partitionInput, '5');
-    });
-
-    userEvent.click(partitionInputSubmitBtn);
-    await waitFor(() => expect(screen.getByRole('dialog')).toBeInTheDocument());
-    rerender(
-      <DangerZone
-        defaultPartitions={defaultPartitions}
-        defaultReplicationFactor={defaultReplicationFactor}
-        partitionsCountIncreased
-        replicationFactorUpdated={false}
-        updateTopicPartitionsCount={jest.fn()}
-        updateTopicReplicationFactor={jest.fn()}
-      />
-    );
-    await waitFor(() =>
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    );
-  });
-
-  it('should already opened Confirmation popup if replicationFactor is Increased', async () => {
-    const { rerender } = renderComponent();
-    const replicatorFactorInput =
-      screen.getByPlaceholderText('Replication Factor');
-    const replicatorFactorInputSubmitBtn = screen.getAllByText(/submit/i)[1];
-
-    await waitFor(() => {
-      userEvent.type(replicatorFactorInput, '5');
-    });
-
-    userEvent.click(replicatorFactorInputSubmitBtn);
-    await waitFor(() => expect(screen.getByRole('dialog')).toBeInTheDocument());
-    rerender(
-      <DangerZone
-        defaultPartitions={defaultPartitions}
-        defaultReplicationFactor={defaultReplicationFactor}
-        partitionsCountIncreased={false}
-        replicationFactorUpdated
-        updateTopicPartitionsCount={jest.fn()}
-        updateTopicReplicationFactor={jest.fn()}
-      />
-    );
-    await waitFor(() =>
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    );
-  });
-
   it('should close the partitions dialog if he cancel button is pressed', async () => {
     renderComponent();
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
index 02e11b9c4cf..9330a33a50c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
@@ -15,7 +15,7 @@ jest.mock('react-router-dom', () => ({
   useNavigate: () => mockNavigate,
 }));
 
-const renderComponent = (
+const renderComponent = async (
   props: Partial<Props> = {},
   topic: TopicWithDetailedInfo | null = topicWithInfo
 ) => {
@@ -27,7 +27,7 @@ const renderComponent = (
     topics = getTopicStateFixtures([topic]);
   }
 
-  return render(
+  render(
     <WithRoute path={clusterTopicEditPath()}>
       <Edit
         isFetched
@@ -47,8 +47,8 @@ const renderComponent = (
 describe('Edit Component', () => {
   afterEach(() => {});
 
-  it('renders the Edit Component', () => {
-    renderComponent();
+  it('renders the Edit Component', async () => {
+    await act(() => renderComponent());
 
     expect(
       screen.getByRole('heading', { name: `Edit ${topicName}` })
@@ -58,8 +58,10 @@ describe('Edit Component', () => {
     ).toBeInTheDocument();
   });
 
-  it('should check Edit component renders null is not rendered when topic is not passed', () => {
-    renderComponent({}, { ...topicWithInfo, config: undefined });
+  it('should check Edit component renders null is not rendered when topic is not passed', async () => {
+    await act(() =>
+      renderComponent({}, { ...topicWithInfo, config: undefined })
+    );
     expect(
       screen.queryByRole('heading', { name: `Edit ${topicName}` })
     ).not.toBeInTheDocument();
@@ -68,8 +70,8 @@ describe('Edit Component', () => {
     ).not.toBeInTheDocument();
   });
 
-  it('should check Edit component renders null is not isFetched is false', () => {
-    renderComponent({ isFetched: false });
+  it('should check Edit component renders null is not isFetched is false', async () => {
+    await act(() => renderComponent({ isFetched: false }));
     expect(
       screen.queryByRole('heading', { name: `Edit ${topicName}` })
     ).not.toBeInTheDocument();
@@ -78,10 +80,10 @@ describe('Edit Component', () => {
     ).not.toBeInTheDocument();
   });
 
-  it('should check Edit component renders null is not topic config is not passed is false', () => {
+  it('should check Edit component renders null is not topic config is not passed is false', async () => {
     const modifiedTopic = { ...topicWithInfo };
     modifiedTopic.config = undefined;
-    renderComponent({}, modifiedTopic);
+    await act(() => renderComponent({}, modifiedTopic));
     expect(
       screen.queryByRole('heading', { name: `Edit ${topicName}` })
     ).not.toBeInTheDocument();
@@ -92,7 +94,9 @@ describe('Edit Component', () => {
 
   describe('Edit Component with its topic default and modified values', () => {
     it('should check the default partitions value in the DangerZone', async () => {
-      renderComponent({}, { ...topicWithInfo, partitionCount: 0 });
+      await act(() =>
+        renderComponent({}, { ...topicWithInfo, partitionCount: 0 })
+      );
       // cause topic selector will return falsy
       expect(
         screen.queryByRole('heading', { name: `Edit ${topicName}` })
@@ -103,7 +107,9 @@ describe('Edit Component', () => {
     });
 
     it('should check the default partitions value in the DangerZone', async () => {
-      renderComponent({}, { ...topicWithInfo, replicationFactor: undefined });
+      await act(() =>
+        renderComponent({}, { ...topicWithInfo, replicationFactor: undefined })
+      );
       expect(screen.getByPlaceholderText('Replication Factor')).toHaveValue(
         DEFAULTS.replicationFactor
       );
@@ -114,7 +120,9 @@ describe('Edit Component', () => {
     it('should check the submit functionality when topic updated is false', async () => {
       const updateTopicMock = jest.fn();
 
-      renderComponent({ updateTopic: updateTopicMock }, undefined);
+      await act(() =>
+        renderComponent({ updateTopic: updateTopicMock }, undefined)
+      );
 
       const btn = screen.getAllByText(/Save/i)[0];
 
@@ -134,10 +142,11 @@ describe('Edit Component', () => {
 
     it('should check the submit functionality when topic updated is true', async () => {
       const updateTopicMock = jest.fn();
-
-      renderComponent(
-        { updateTopic: updateTopicMock, isTopicUpdated: true },
-        undefined
+      await act(() =>
+        renderComponent(
+          { updateTopic: updateTopicMock, isTopicUpdated: true },
+          undefined
+        )
       );
 
       const btn = screen.getAllByText(/Save/i)[0];
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index 13afbe12335..1f4a669577d 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
 import { NOT_SET, BYTES_IN_GB } from 'lib/constants';
-import { TopicName } from 'redux/interfaces';
+import { ClusterName, TopicName } from 'redux/interfaces';
 import { ErrorMessage } from '@hookform/error-message';
 import Select, { SelectOption } from 'components/common/Select/Select';
 import Input from 'components/common/Input/Input';
@@ -9,6 +9,9 @@ import { Button } from 'components/common/Button/Button';
 import { InputLabel } from 'components/common/Input/InputLabel.styled';
 import { FormError } from 'components/common/Input/Input.styled';
 import { StyledForm } from 'components/common/Form/Form.styled';
+import { clusterTopicsPath } from 'lib/paths';
+import { useNavigate } from 'react-router-dom';
+import useAppParams from 'lib/hooks/useAppParams';
 
 import CustomParams from './CustomParams/CustomParams';
 import TimeToRetain from './TimeToRetain';
@@ -54,7 +57,10 @@ const TopicForm: React.FC<Props> = ({
   const {
     control,
     formState: { errors, isDirty, isValid },
+    reset,
   } = useFormContext();
+  const navigate = useNavigate();
+  const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
   const getCleanUpPolicy =
     CleanupPolicyOptions.find((option: SelectOption) => {
       return (
@@ -68,6 +74,11 @@ const TopicForm: React.FC<Props> = ({
       return option.value === retentionBytes;
     })?.value || RetentionBytesOptions[0].value;
 
+  const onCancel = () => {
+    reset();
+    navigate(clusterTopicsPath(clusterName));
+  };
+
   return (
     <StyledForm onSubmit={onSubmit} aria-label="topic form">
       <fieldset disabled={isSubmitting}>
@@ -228,7 +239,12 @@ const TopicForm: React.FC<Props> = ({
           >
             {isEditing ? 'Save' : 'Create topic'}
           </Button>
-          <Button type="button" buttonType="primary" buttonSize="L">
+          <Button
+            type="button"
+            buttonType="primary"
+            buttonSize="L"
+            onClick={onCancel}
+          >
             Cancel
           </Button>
         </S.ButtonWrapper>
diff --git a/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
index 179db51ead6..55cfd678869 100644
--- a/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
@@ -4,6 +4,7 @@ import styled from 'styled-components';
 export const Alert = styled.div<{ $type: ToastType }>`
   background-color: ${({ $type, theme }) => theme.alert.color[$type]};
   min-width: 400px;
+  max-width: 600px;
   min-height: 64px;
   border-radius: 8px;
   padding: 12px;
diff --git a/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.styled.tsx b/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.styled.tsx
index 1b02d37e36b..c5d2ae8bd8a 100644
--- a/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.styled.tsx
@@ -1,59 +1,64 @@
 import styled, { css } from 'styled-components';
 
-export const ConfirmationModalWrapper = styled.div.attrs({ role: 'dialog' })(
-  ({ theme }) => css`
-    display: flex;
-    align-items: center;
-    flex-direction: column;
-    justify-content: center;
-    overflow: hidden;
-    position: fixed;
-    z-index: 40;
+export const Wrapper = styled.div.attrs({ role: 'dialog' })`
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
+  overflow: hidden;
+  position: fixed;
+  z-index: 40;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  top: 0;
+`;
+
+export const Overlay = styled.div(
+  ({ theme: { modal } }) => css`
+    background-color: ${modal.overlay};
     bottom: 0;
     left: 0;
+    position: absolute;
     right: 0;
     top: 0;
-    & div:first-child {
-      background-color: ${theme.modal.overlay};
-      bottom: 0;
-      left: 0;
-      position: absolute;
-      right: 0;
-      top: 0;
-    }
-
-    & div:last-child {
-      position: absolute;
-      display: flex;
-      flex-direction: column;
-      width: 560px;
-      border-radius: 8px;
-
-      background-color: ${theme.modal.backgroundColor};
-      filter: drop-shadow(0px 4px 16px ${theme.modal.shadow});
+  `
+);
 
-      & > * {
-        padding: 16px;
-        width: 100%;
-      }
+export const Modal = styled.div(
+  ({ theme: { modal } }) => css`
+    position: absolute;
+    display: flex;
+    flex-direction: column;
+    width: 560px;
+    border-radius: 8px;
 
-      & > header {
-        height: 64px;
-        font-size: 20px;
-        text-align: start;
-      }
+    background-color: ${modal.backgroundColor};
+    filter: drop-shadow(0px 4px 16px ${modal.shadow});
+  `
+);
 
-      & > section {
-        border-top: 1px solid ${theme.modal.border.top};
-        border-bottom: 1px solid ${theme.modal.border.bottom};
-      }
+export const Header = styled.div`
+  font-size: 20px;
+  text-align: start;
+  padding: 16px;
+  width: 100%;
+`;
 
-      & > footer {
-        height: 64px;
-        display: flex;
-        justify-content: flex-end;
-        gap: 10px;
-      }
-    }
+export const Content = styled.div(
+  ({ theme: { modal } }) => css`
+    padding: 16px;
+    width: 100%;
+    border-top: 1px solid ${modal.border.top};
+    border-bottom: 1px solid ${modal.border.bottom};
   `
 );
+
+export const Footer = styled.div`
+  height: 64px;
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+  padding: 16px;
+  width: 100%;
+`;
diff --git a/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.tsx b/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.tsx
index 346d61e8ac2..86833cc7ba4 100644
--- a/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.tsx
+++ b/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.tsx
@@ -1,64 +1,42 @@
-import React, { PropsWithChildren } from 'react';
+import React from 'react';
 import { Button } from 'components/common/Button/Button';
+import { ConfirmContext } from 'components/contexts/ConfirmContext';
 
-import { ConfirmationModalWrapper } from './ConfirmationModal.styled';
+import * as S from './ConfirmationModal.styled';
 
-export interface ConfirmationModalProps {
-  isOpen?: boolean;
-  title?: React.ReactNode;
-  onConfirm(): void;
-  onCancel(): void;
-  isConfirming?: boolean;
-  submitBtnText?: string;
-}
+const ConfirmationModal: React.FC = () => {
+  const context = React.useContext(ConfirmContext);
+  const isOpen = context?.content && context?.confirm;
 
-const ConfirmationModal: React.FC<
-  PropsWithChildren<ConfirmationModalProps>
-> = ({
-  isOpen,
-  children,
-  title = 'Confirm the action',
-  onCancel,
-  onConfirm,
-  isConfirming = false,
-  submitBtnText = 'Submit',
-}) => {
-  const cancelHandler = () => {
-    if (!isConfirming) onCancel();
-  };
+  if (!isOpen) return null;
 
-  return isOpen ? (
-    <ConfirmationModalWrapper>
-      <div onClick={cancelHandler} aria-hidden="true" role="button" />
-      <div>
-        <header>
-          <p>{title}</p>
-        </header>
-        <section>{children}</section>
-        <footer>
+  return (
+    <S.Wrapper role="dialog" aria-label="Confirmation Dialog">
+      <S.Overlay onClick={context.cancel} aria-hidden="true" role="button" />
+      <S.Modal>
+        <S.Header>Confirm the action</S.Header>
+        <S.Content>{context.content}</S.Content>
+        <S.Footer>
           <Button
             buttonType="secondary"
             buttonSize="M"
-            onClick={cancelHandler}
+            onClick={context.cancel}
             type="button"
-            disabled={isConfirming}
           >
             Cancel
           </Button>
-
           <Button
             buttonType="primary"
             buttonSize="M"
-            onClick={onConfirm}
+            onClick={context.confirm}
             type="button"
-            disabled={isConfirming}
           >
-            {submitBtnText}
+            Confirm
           </Button>
-        </footer>
-      </div>
-    </ConfirmationModalWrapper>
-  ) : null;
+        </S.Footer>
+      </S.Modal>
+    </S.Wrapper>
+  );
 };
 
 export default ConfirmationModal;
diff --git a/kafka-ui-react-app/src/components/common/ConfirmationModal/__test__/ConfirmationModal.spec.tsx b/kafka-ui-react-app/src/components/common/ConfirmationModal/__test__/ConfirmationModal.spec.tsx
deleted file mode 100644
index b2627d5bc9b..00000000000
--- a/kafka-ui-react-app/src/components/common/ConfirmationModal/__test__/ConfirmationModal.spec.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import React from 'react';
-import ConfirmationModal, {
-  ConfirmationModalProps,
-} from 'components/common/ConfirmationModal/ConfirmationModal';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { render } from 'lib/testHelpers';
-
-const confirmMock = jest.fn();
-const cancelMock = jest.fn();
-const body = 'Please Confirm the action!';
-
-describe('ConfirmationModal', () => {
-  const setupWrapper = (props: Partial<ConfirmationModalProps> = {}) => (
-    <ConfirmationModal onCancel={cancelMock} onConfirm={confirmMock} {...props}>
-      {body}
-    </ConfirmationModal>
-  );
-
-  it('renders nothing', () => {
-    render(setupWrapper({ isOpen: false }));
-    expect(screen.queryByText(body)).not.toBeInTheDocument();
-  });
-
-  it('renders modal', () => {
-    render(setupWrapper({ isOpen: true }));
-    expect(screen.getByRole('dialog')).toHaveTextContent(body);
-    expect(screen.getAllByRole('button').length).toEqual(2);
-  });
-  it('renders modal with default header', () => {
-    render(setupWrapper({ isOpen: true }));
-    expect(screen.getByText('Confirm the action')).toBeInTheDocument();
-  });
-  it('renders modal with custom header', () => {
-    const title = 'My Custom Header';
-    render(setupWrapper({ isOpen: true, title }));
-    expect(screen.getByText(title)).toBeInTheDocument();
-  });
-
-  it('Check the text on the submit button default behavior', () => {
-    render(setupWrapper({ isOpen: true }));
-    expect(screen.getByRole('button', { name: 'Submit' })).toBeInTheDocument();
-  });
-
-  it('handles onConfirm when user clicks confirm button', () => {
-    render(setupWrapper({ isOpen: true }));
-    const confirmBtn = screen.getByRole('button', { name: 'Submit' });
-    userEvent.click(confirmBtn);
-    expect(cancelMock).toHaveBeenCalledTimes(0);
-    expect(confirmMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('Check the text on the submit button', () => {
-    const submitBtnText = 'Submit btn Text';
-    render(setupWrapper({ isOpen: true, submitBtnText }));
-    expect(
-      screen.getByRole('button', { name: submitBtnText })
-    ).toBeInTheDocument();
-  });
-
-  describe('cancellation', () => {
-    describe('when not confirming', () => {
-      beforeEach(() => {
-        render(setupWrapper({ isOpen: true }));
-      });
-
-      it('handles onCancel when user clicks on modal-background', () => {
-        const { container } = render(setupWrapper({ isOpen: true }));
-        userEvent.click(container.children[0].children[0]);
-
-        expect(cancelMock).toHaveBeenCalledTimes(1);
-        expect(confirmMock).toHaveBeenCalledTimes(0);
-      });
-      it('handles onCancel when user clicks on Cancel button', () => {
-        const cancelBtn = screen.getByRole('button', { name: 'Cancel' });
-
-        userEvent.click(cancelBtn);
-        expect(cancelMock).toHaveBeenCalledTimes(1);
-        expect(confirmMock).toHaveBeenCalledTimes(0);
-      });
-    });
-
-    describe('when confirming', () => {
-      beforeEach(() => {
-        render(setupWrapper({ isOpen: true, isConfirming: true }));
-      });
-      it('does not call onCancel when user clicks on modal-background', () => {
-        userEvent.click(screen.getByRole('dialog'));
-        expect(cancelMock).toHaveBeenCalledTimes(0);
-        expect(confirmMock).toHaveBeenCalledTimes(0);
-      });
-
-      it('does not call onCancel when user clicks on Cancel button', () => {
-        const cancelBtn = screen.getByRole('button', { name: 'Cancel' });
-        userEvent.click(cancelBtn);
-        expect(cancelMock).toHaveBeenCalledTimes(0);
-        expect(confirmMock).toHaveBeenCalledTimes(0);
-      });
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
index bae6938b711..ee3aa494baa 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
@@ -60,6 +60,7 @@ export const DropdownButton = styled.button`
   border: none;
   display: flex;
   cursor: pointer;
+  align-self: center;
 `;
 
 export const DangerItem = styled.div`
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx b/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
index 055ab9d53be..fc4df14fedb 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
+++ b/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
@@ -1,26 +1,36 @@
 import React, { PropsWithChildren } from 'react';
 import { ClickEvent, MenuItem, MenuItemProps } from '@szhsin/react-menu';
+import { useConfirm } from 'lib/hooks/useConfirm';
 
 import * as S from './Dropdown.styled';
 
 interface DropdownItemProps extends PropsWithChildren<MenuItemProps> {
   danger?: boolean;
   onClick?(): void;
+  confirm?: React.ReactNode;
 }
 
 const DropdownItem: React.FC<DropdownItemProps> = ({
   onClick,
   danger,
   children,
+  confirm,
   ...rest
 }) => {
+  const confirmation = useConfirm();
+
   const handleClick = (e: ClickEvent) => {
     if (!onClick) return;
 
     // eslint-disable-next-line no-param-reassign
     e.stopPropagation = true;
     e.syntheticEvent.stopPropagation();
-    onClick();
+
+    if (confirm) {
+      confirmation(confirm, onClick);
+    } else {
+      onClick();
+    }
   };
 
   return (
diff --git a/kafka-ui-react-app/src/components/common/MultiSelect/__test__/MultiSelect.styled.spec.tsx b/kafka-ui-react-app/src/components/common/MultiSelect/__test__/MultiSelect.styled.spec.tsx
deleted file mode 100644
index 16b30e042d3..00000000000
--- a/kafka-ui-react-app/src/components/common/MultiSelect/__test__/MultiSelect.styled.spec.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import { render } from 'lib/testHelpers';
-import MultiSelect from 'components/common/MultiSelect/MultiSelect.styled';
-import { ISelectProps } from 'react-multi-select-component/dist/lib/interfaces';
-
-const Option1 = { value: 1, label: 'option 1' };
-const Option2 = { value: 2, label: 'option 2' };
-
-interface IMultiSelectProps extends ISelectProps {
-  minWidth?: string;
-}
-
-const DefaultProps: IMultiSelectProps = {
-  options: [Option1, Option2],
-  labelledBy: 'multi-select',
-  value: [Option1, Option2],
-};
-
-describe('MultiSelect.Styled', () => {
-  const setUpComponent = (props: IMultiSelectProps = DefaultProps) => {
-    const { container } = render(<MultiSelect {...props} />);
-    const multiSelect = container.firstChild;
-    const dropdownContainer = multiSelect?.firstChild?.firstChild;
-
-    return { container, multiSelect, dropdownContainer };
-  };
-
-  it('should have 200px minWidth by default', () => {
-    const { container } = setUpComponent();
-    const multiSelect = container.firstChild;
-
-    expect(multiSelect).toHaveStyle('min-width: 200px');
-  });
-
-  it('should have the provided minWidth in styles', () => {
-    const minWidth = '400px';
-    const { container } = setUpComponent({ ...DefaultProps, minWidth });
-    const multiSelect = container.firstChild;
-
-    expect(multiSelect).toHaveStyle(`min-width: ${minWidth}`);
-  });
-
-  describe('when not disabled', () => {
-    it('should have cursor pointer', () => {
-      const { dropdownContainer } = setUpComponent();
-
-      expect(dropdownContainer).toHaveStyle(`cursor: pointer`);
-    });
-  });
-
-  describe('when disabled', () => {
-    it('should have cursor not-allowed', () => {
-      const { dropdownContainer } = setUpComponent({
-        ...DefaultProps,
-        disabled: true,
-      });
-
-      expect(dropdownContainer).toHaveStyle(`cursor: not-allowed`);
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx b/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx
new file mode 100644
index 00000000000..8d1f0afaca3
--- /dev/null
+++ b/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx
@@ -0,0 +1,39 @@
+import React, { useState } from 'react';
+
+type ConfirmContextType = {
+  content: React.ReactNode;
+  confirm?: () => void;
+  setContent: React.Dispatch<React.SetStateAction<React.ReactNode>>;
+  setConfirm: React.Dispatch<React.SetStateAction<(() => void) | undefined>>;
+  cancel: () => void;
+};
+
+export const ConfirmContext = React.createContext<ConfirmContextType | null>(
+  null
+);
+
+export const ConfirmContextProvider: React.FC<
+  React.PropsWithChildren<unknown>
+> = ({ children }) => {
+  const [content, setContent] = useState<React.ReactNode>(null);
+  const [confirm, setConfirm] = useState<(() => void) | undefined>(undefined);
+
+  const cancel = () => {
+    setContent(null);
+    setConfirm(undefined);
+  };
+
+  return (
+    <ConfirmContext.Provider
+      value={{
+        content,
+        setContent,
+        confirm,
+        setConfirm,
+        cancel,
+      }}
+    >
+      {children}
+    </ConfirmContext.Provider>
+  );
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
index 7280f9a6e48..81ef81a96af 100644
--- a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect } from 'react';
-import { render } from 'lib/testHelpers';
 import useDataSaver from 'lib/hooks/useDataSaver';
+import { render } from '@testing-library/react';
 
 describe('useDataSaver hook', () => {
   const content = {
diff --git a/kafka-ui-react-app/src/lib/hooks/useConfirm.ts b/kafka-ui-react-app/src/lib/hooks/useConfirm.ts
new file mode 100644
index 00000000000..d2ea9441889
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useConfirm.ts
@@ -0,0 +1,14 @@
+import { ConfirmContext } from 'components/contexts/ConfirmContext';
+import React, { useContext } from 'react';
+
+export const useConfirm = () => {
+  const context = useContext(ConfirmContext);
+
+  return (message: React.ReactNode, callback: () => void | Promise<void>) => {
+    context?.setContent(message);
+    context?.setConfirm(() => async () => {
+      await callback();
+      context?.cancel();
+    });
+  };
+};
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index cc71b1d8ed1..f5eff421e5e 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -18,6 +18,8 @@ import {
   QueryClientProvider,
   UseQueryResult,
 } from '@tanstack/react-query';
+import { ConfirmContextProvider } from 'components/contexts/ConfirmContext';
+import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
 
 interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
   preloadedState?: Partial<RootState>;
@@ -67,13 +69,18 @@ const customRender = (
     children,
   }) => (
     <ThemeProvider theme={theme}>
-      <Provider store={store}>
-        <TestQueryClientProvider>
-          <MemoryRouter initialEntries={initialEntries}>
-            {children}
-          </MemoryRouter>
-        </TestQueryClientProvider>
-      </Provider>
+      <ConfirmContextProvider>
+        <Provider store={store}>
+          <TestQueryClientProvider>
+            <MemoryRouter initialEntries={initialEntries}>
+              <div>
+                {children}
+                <ConfirmationModal />
+              </div>
+            </MemoryRouter>
+          </TestQueryClientProvider>
+        </Provider>
+      </ConfirmContextProvider>
     </ThemeProvider>
   );
   return render(ui, { wrapper: AllTheProviders, ...renderOptions });
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
index 49e12d453ea..7f127341e19 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
@@ -27,7 +27,7 @@ export const clearTopicMessages = createAsyncThunk<
       dispatch(fetchTopicDetails({ clusterName, topicName }));
       showSuccessAlert({
         id: `message-${topicName}-${clusterName}-${partitions}`,
-        message: 'Messages successfully cleared!',
+        message: `${topicName} messages have been successfully cleared!`,
       });
 
       return undefined;
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/topics/__test__/selectors.spec.ts
index 1fc223b48f8..b1c6ddc2042 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/__test__/selectors.spec.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/__test__/selectors.spec.ts
@@ -20,12 +20,6 @@ describe('Topics selectors', () => {
       expect(selectors.getTopicMessageSchemaFetched(store.getState())).toEqual(
         false
       );
-      expect(
-        selectors.getTopicPartitionsCountIncreased(store.getState())
-      ).toEqual(false);
-      expect(
-        selectors.getTopicReplicationFactorUpdated(store.getState())
-      ).toEqual(false);
       expect(
         selectors.getTopicsConsumerGroupsFetched(store.getState())
       ).toEqual(false);
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts b/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts
index e58ae96cf61..e9af5894ab1 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts
@@ -11,8 +11,6 @@ import {
   fetchTopicConsumerGroups,
   createTopic,
   deleteTopic,
-  updateTopicPartitionsCount,
-  updateTopicReplicationFactor,
 } from 'redux/reducers/topics/topicsSlice';
 import { AsyncRequestStatus } from 'lib/constants';
 
@@ -90,24 +88,6 @@ export const getTopicMessageSchemaFetched = createSelector(
   (status) => status === AsyncRequestStatus.fulfilled
 );
 
-const getPartitionsCountIncreaseStatus = createFetchingSelector(
-  updateTopicPartitionsCount.typePrefix
-);
-
-export const getTopicPartitionsCountIncreased = createSelector(
-  getPartitionsCountIncreaseStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-const getReplicationFactorUpdateStatus = createFetchingSelector(
-  updateTopicReplicationFactor.typePrefix
-);
-
-export const getTopicReplicationFactorUpdated = createSelector(
-  getReplicationFactorUpdateStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
 const getTopicConsumerGroupsStatus = createFetchingSelector(
   fetchTopicConsumerGroups.typePrefix
 );
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
index 4a661240197..3990c2dc3bc 100644
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
@@ -274,7 +274,7 @@ export const updateTopicPartitionsCount = createAsyncThunk<
       });
       showSuccessAlert({
         id: `message-${topicName}-${clusterName}-${partitions}`,
-        message: 'Number of partitions successfully increased!',
+        message: 'Number of partitions successfully increased',
       });
       dispatch(fetchTopicDetails({ clusterName, topicName }));
       return undefined;
@@ -294,7 +294,7 @@ export const updateTopicReplicationFactor = createAsyncThunk<
   }
 >(
   'topic/updateTopicReplicationFactor',
-  async (payload, { rejectWithValue }) => {
+  async (payload, { rejectWithValue, dispatch }) => {
     try {
       const { clusterName, topicName, replicationFactor } = payload;
 
@@ -303,7 +303,11 @@ export const updateTopicReplicationFactor = createAsyncThunk<
         topicName,
         replicationFactorChange: { totalReplicationFactor: replicationFactor },
       });
-
+      showSuccessAlert({
+        id: `message-${topicName}-${clusterName}-replicationFactor`,
+        message: 'Replication Factor successfully updated',
+      });
+      dispatch(fetchTopicDetails({ clusterName, topicName }));
       return undefined;
     } catch (err) {
       showServerError(err as Response);
@@ -340,22 +344,24 @@ export const clearTopicsMessages = createAsyncThunk<
     clusterName: ClusterName;
     topicNames: TopicName[];
   }
->('topic/clearTopicsMessages', async (payload, { rejectWithValue }) => {
-  try {
-    const { clusterName, topicNames } = payload;
-
-    topicNames.forEach((topicName) => {
-      clearTopicMessages({ clusterName, topicName });
-    });
+>(
+  'topic/clearTopicsMessages',
+  async (payload, { rejectWithValue, dispatch }) => {
+    try {
+      const { clusterName, topicNames } = payload;
+      topicNames.forEach((topicName) => {
+        dispatch(clearTopicMessages({ clusterName, topicName }));
+      });
 
-    return undefined;
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
+      return undefined;
+    } catch (err) {
+      showServerError(err as Response);
+      return rejectWithValue(await getResponse(err as Response));
+    }
   }
-});
+);
 
-export const initialState: TopicsState = {
+const initialState: TopicsState = {
   byName: {},
   allNames: [],
   totalPages: 1,

From 27252393a290f32289aebd10c2d5b12e9d9d8500 Mon Sep 17 00:00:00 2001
From: MichaelGonzalezMurillo
 <110129349+MichaelGonzalezMurillo@users.noreply.github.com>
Date: Wed, 3 Aug 2022 05:50:53 -0600
Subject: [PATCH 098/734] CVE fixes Q2.22 (#2357)

* upgrading alpine to fix CVE-2022-28391 vulnerabilities

* bumping spring-boot-version which includes vulnerabilities fixes

* Bumping one more version to clean high vulnerabilities up u

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-api/Dockerfile | 2 +-
 pom.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/Dockerfile b/kafka-ui-api/Dockerfile
index 5488a771810..3990d488315 100644
--- a/kafka-ui-api/Dockerfile
+++ b/kafka-ui-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.15.0
+FROM alpine:3.16.1
 
 RUN apk add --no-cache openjdk13-jre libc6-compat gcompat \
 && addgroup -S kafkaui && adduser -S kafkaui -G kafkaui
diff --git a/pom.xml b/pom.xml
index 2f307fdb5ad..c06d556132d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
         <maven.compiler.target>13</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-boot.version>2.6.7</spring-boot.version>
+        <spring-boot.version>2.6.8</spring-boot.version>
         <jackson-databind-nullable.version>0.2.2</jackson-databind-nullable.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <org.projectlombok.version>1.18.20</org.projectlombok.version>

From 38d795d5a0d57c3bb5de9ead6cd762671d06817b Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 3 Aug 2022 16:54:20 +0400
Subject: [PATCH 099/734] Drop unnecessary maven scripts (#1857)

* Drop unnecessary maven scripts

* Get rid of unnecessary files
---
 .../.mvn/wrapper/MavenWrapperDownloader.java  | 117 -------
 kafka-ui-api/.mvn/wrapper/maven-wrapper.jar   | Bin 50710 -> 0 bytes
 .../.mvn/wrapper/maven-wrapper.properties     |   2 -
 kafka-ui-api/mvnw                             | 310 ------------------
 kafka-ui-api/mvnw.cmd                         | 182 ----------
 kafka-ui-react-app/LICENSE                    | 201 ------------
 kafka-ui-react-app/docker-compose.yaml        |  57 ----
 7 files changed, 869 deletions(-)
 delete mode 100644 kafka-ui-api/.mvn/wrapper/MavenWrapperDownloader.java
 delete mode 100644 kafka-ui-api/.mvn/wrapper/maven-wrapper.jar
 delete mode 100644 kafka-ui-api/.mvn/wrapper/maven-wrapper.properties
 delete mode 100755 kafka-ui-api/mvnw
 delete mode 100644 kafka-ui-api/mvnw.cmd
 delete mode 100644 kafka-ui-react-app/LICENSE
 delete mode 100644 kafka-ui-react-app/docker-compose.yaml

diff --git a/kafka-ui-api/.mvn/wrapper/MavenWrapperDownloader.java b/kafka-ui-api/.mvn/wrapper/MavenWrapperDownloader.java
deleted file mode 100644
index e76d1f3241d..00000000000
--- a/kafka-ui-api/.mvn/wrapper/MavenWrapperDownloader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}
diff --git a/kafka-ui-api/.mvn/wrapper/maven-wrapper.jar b/kafka-ui-api/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50710
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
EfAhh=DF6Tf

diff --git a/kafka-ui-api/.mvn/wrapper/maven-wrapper.properties b/kafka-ui-api/.mvn/wrapper/maven-wrapper.properties
deleted file mode 100644
index 642d572ce90..00000000000
--- a/kafka-ui-api/.mvn/wrapper/maven-wrapper.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/kafka-ui-api/mvnw b/kafka-ui-api/mvnw
deleted file mode 100755
index a16b5431b4c..00000000000
--- a/kafka-ui-api/mvnw
+++ /dev/null
@@ -1,310 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   M2_HOME - location of maven2's installed home dir
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        export JAVA_HOME="`/usr/libexec/java_home`"
-      else
-        export JAVA_HOME="/Library/Java/Home"
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
-  ## resolve links - $0 may be a link to maven's home
-  PRG="$0"
-
-  # need this for relative symlinks
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-      PRG="$link"
-    else
-      PRG="`dirname "$PRG"`/$link"
-    fi
-  done
-
-  saveddir=`pwd`
-
-  M2_HOME=`dirname "$PRG"`/..
-
-  # make it fully qualified
-  M2_HOME=`cd "$M2_HOME" && pwd`
-
-  cd "$saveddir"
-  # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --unix "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME="`(cd "$M2_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="`which javac`"
-  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=`which readlink`
-    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
-      if $darwin ; then
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
-      else
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
-      fi
-      javaHome="`dirname \"$javaExecutable\"`"
-      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="`which java`"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=`cd "$wdir/.."; pwd`
-    fi
-    # end of workaround
-  done
-  echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    echo "$(tr -s '\n' ' ' < "$1")"
-  fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Found .mvn/wrapper/maven-wrapper.jar"
-    fi
-else
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-    fi
-    if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    fi
-    while IFS="=" read key value; do
-      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
-      esac
-    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
-    if [ "$MVNW_VERBOSE" = true ]; then
-      echo "Downloading from: $jarUrl"
-    fi
-    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
-    if $cygwin; then
-      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
-    fi
-
-    if command -v wget > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found wget ... using wget"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
-        else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Found curl ... using curl"
-        fi
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl -o "$wrapperJarPath" "$jarUrl" -f
-        else
-            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
-        fi
-
-    else
-        if [ "$MVNW_VERBOSE" = true ]; then
-          echo "Falling back to using Java to download"
-        fi
-        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaClass=`cygpath --path --windows "$javaClass"`
-        fi
-        if [ -e "$javaClass" ]; then
-            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Compiling MavenWrapperDownloader.java ..."
-                fi
-                # Compiling the Java class
-                ("$JAVA_HOME/bin/javac" "$javaClass")
-            fi
-            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
-                # Running the downloader
-                if [ "$MVNW_VERBOSE" = true ]; then
-                  echo " - Running MavenWrapperDownloader.java ..."
-                fi
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
-  echo $MAVEN_PROJECTBASEDIR
-fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
-
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/kafka-ui-api/mvnw.cmd b/kafka-ui-api/mvnw.cmd
deleted file mode 100644
index c8d43372c98..00000000000
--- a/kafka-ui-api/mvnw.cmd
+++ /dev/null
@@ -1,182 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License.  You may obtain a copy of the License at
-@REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %DOWNLOAD_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%
diff --git a/kafka-ui-react-app/LICENSE b/kafka-ui-react-app/LICENSE
deleted file mode 100644
index 261eeb9e9f8..00000000000
--- a/kafka-ui-react-app/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/kafka-ui-react-app/docker-compose.yaml b/kafka-ui-react-app/docker-compose.yaml
deleted file mode 100644
index 8dacb5cb201..00000000000
--- a/kafka-ui-react-app/docker-compose.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-version: '3'
-
-services:
-  zookeeper:
-    image: zookeeper:3.4.13
-    ports:
-      - 2181:2181
-    restart: always
-
-  kafka:
-    image: confluentinc/cp-kafka:5.3.1
-    ports:
-      - 9093:9093
-    environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENERS: INTERNAL://0.0.0.0:9092,PLAINTEXT://0.0.0.0:9093
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT
-      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:9092,PLAINTEXT://localhost:9093
-      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
-      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
-    depends_on:
-      - zookeeper
-    restart: always
-
-  schema-registry:
-    image: confluentinc/cp-schema-registry:5.5.0
-    hostname: schema-registry
-    ports:
-      - "8081:8081"
-    environment:
-      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka:9092
-      SCHEMA_REGISTRY_HOST_NAME: schema-registry
-      SCHEMA_REGISTRY_LISTENERS: http://0.0.0.0:8081
-    depends_on:
-      - zookeeper
-      - kafka
-
-  rest:
-    image: confluentinc/cp-kafka-rest:5.3.1
-    hostname: rest-proxy
-    ports:
-      - "8082:8082"
-    environment:
-      KAFKA_REST_LISTENERS: http://0.0.0.0:8082/
-      KAFKA_REST_SCHEMA_REGISTRY_URL: http://schema-registry:8081/
-      KAFKA_REST_HOST_NAME: rest-proxy
-      KAFKA_REST_BOOTSTRAP_SERVERS: PLAINTEXT://kafka:9092
-      KAFKA_REST_ACCESS_CONTROL_ALLOW_ORIGIN: "*"
-      KAFKA_REST_ACCESS_CONTROL_ALLOW_METHODS: "GET,POST,PUT,DELETE,OPTIONS,HEAD"
-    depends_on:
-      - zookeeper
-      - kafka
-      - schema-registry

From 8bcb13a4c5781360d093d9d27a413f418314e412 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Aug 2022 19:44:55 +0400
Subject: [PATCH 100/734] Bump urlstechie/urlchecker-action from 0.0.27 to
 0.0.31 (#2334)

Bumps [urlstechie/urlchecker-action](https://github.com/urlstechie/urlchecker-action) from 0.0.27 to 0.0.31.
- [Release notes](https://github.com/urlstechie/urlchecker-action/releases)
- [Commits](https://github.com/urlstechie/urlchecker-action/compare/0.0.27...0.0.31)

---
updated-dependencies:
- dependency-name: urlstechie/urlchecker-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/documentation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
index 60e51d900b2..04dd90c67c7 100644
--- a/.github/workflows/documentation.yaml
+++ b/.github/workflows/documentation.yaml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Check URLs in files
-        uses: urlstechie/urlchecker-action@0.0.27
+        uses: urlstechie/urlchecker-action@0.0.31
         with:
           exclude_patterns: localhost,127.0.,192.168.
           exclude_urls: https://api.server,https://graph.microsoft.com/User.Read,https://dev-a63ggcut.auth0.com/

From edb7da6fce83e149b9e9c34182708f17f1c1240c Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 4 Aug 2022 17:38:27 +0400
Subject: [PATCH 101/734] Disable unstable test (#2395)

---
 .../src/test/java/com/provectus/kafka/ui/tests/TopicTests.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 068b9cf1bd2..a962b8ceabb 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -104,6 +104,7 @@ public void updateTopic() {
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(207)
     @Test
+    @Disabled // TODO: https://github.com/provectus/kafka-ui/issues/2373
     public void deleteTopic() {
         pages.openTopicsList(SECOND_LOCAL)
                 .isOnPage()

From 8f0ffe665c53429f4d9618adafd31663b50ddd3f Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Fri, 5 Aug 2022 00:25:50 +0300
Subject: [PATCH 102/734] Refactor topics (#2386)

---
 .../List/{ActionsCell => }/ActionsCell.tsx    |  60 +-
 .../src/components/Topics/List/List.tsx       | 297 ---------
 .../components/Topics/List/ListContainer.ts   |  40 --
 .../src/components/Topics/List/ListPage.tsx   |  87 +++
 .../components/Topics/List/TopicsTable.tsx    | 201 ++++++
 .../Topics/List/TopicsTableCells.tsx          |  26 +-
 .../Topics/List/__tests__/ActionCell.spec.tsx | 179 +++++
 .../Topics/List/__tests__/List.spec.tsx       | 331 ----------
 .../Topics/List/__tests__/ListPage.spec.tsx   |  52 ++
 .../List/__tests__/TopicsTable.spec.tsx       | 168 +++++
 .../List/__tests__/TopicsTableCells.spec.tsx  |  86 ++-
 .../src/components/Topics/New/New.tsx         |  14 +-
 .../Topics/New/__test__/New.spec.tsx          |  52 +-
 .../ConsumerGroups/TopicConsumerGroups.tsx    | 118 ++--
 .../TopicConsumerGroupsContainer.ts           |  18 -
 .../__test__/TopicConsumerGroups.spec.tsx     | 107 +--
 .../Topics/Topic/Details/Details.tsx          |  98 ++-
 .../Topics/Topic/Details/DetailsContainer.ts  |  19 -
 .../Details/Messages/Filters/Filters.tsx      |   9 +-
 .../Filters/__tests__/Filters.spec.tsx        |  45 +-
 .../Messages/__test__/Messages.spec.tsx       |  23 +-
 .../Topic/Details/Overview/Overview.tsx       |  99 ++-
 .../Details/Overview/OverviewContainer.ts     |   9 -
 .../Overview/__test__/Overview.spec.tsx       | 184 ++----
 .../Topic/Details/Settings/Settings.tsx       |  63 +-
 .../Details/Settings/SettingsContainer.ts     |  16 -
 .../Settings/__test__/Settings.spec.tsx       | 109 +---
 .../Topic/Details/__test__/Details.spec.tsx   | 140 ++--
 .../Edit/DangerZone/DangerZone.styled.tsx     |   5 +-
 .../Topic/Edit/DangerZone/DangerZone.tsx      |  43 +-
 .../Edit/DangerZone/DangerZoneContainer.ts    |  28 -
 .../DangerZone/__test__/DangerZone.spec.tsx   |  46 +-
 .../src/components/Topics/Topic/Edit/Edit.tsx | 129 +---
 .../Topics/Topic/Edit/EditContainer.tsx       |  24 -
 .../Topics/Topic/Edit/__test__/Edit.spec.tsx  | 187 ++----
 .../Topics/Topic/Edit/__test__/fixtures.ts    | 617 ------------------
 .../__test__/topicParamsTransformer.spec.ts   | 136 ++--
 .../Topic/Edit/topicParamsTransformer.ts      |  46 +-
 .../Topics/Topic/SendMessage/SendMessage.tsx  |  72 +-
 .../SendMessage/__test__/SendMessage.spec.tsx | 114 ++--
 .../Topic/SendMessage/__test__/fixtures.ts    |  50 --
 .../__test__/validateMessage.spec.ts          |  27 +-
 .../src/components/Topics/Topic/Topic.tsx     |  59 +-
 .../Topics/Topic/TopicContainer.tsx           |  18 -
 .../Topics/Topic/__tests__/Topic.spec.tsx     |  59 +-
 .../src/components/Topics/Topics.tsx          |   8 +-
 .../Topics/__tests__/Topics.spec.tsx          |  10 +-
 .../components/common/Alert/Alert.styled.ts   |   3 +-
 .../common/Pagination/Pagination.tsx          |  15 +-
 .../common/SmartTable/TableColumn.tsx         |   3 +-
 kafka-ui-react-app/src/lib/fixtures/topics.ts | 210 ++++++
 .../lib/hooks/api/__tests__/brokers.spec.ts   |  48 ++
 .../lib/hooks/api/__tests__/clusters.spec.ts  |  40 ++
 .../lib/hooks/api/__tests__/topics.spec.ts    | 177 +++++
 .../src/lib/hooks/api/topics.ts               | 238 +++++++
 .../src/lib/hooks/useConfirm.ts               |   6 +-
 .../src/redux/interfaces/topic.ts             |  21 -
 .../src/redux/reducers/index.ts               |   2 -
 .../topicMessages/topicMessagesSlice.ts       |   8 +-
 .../reducers/topics/__test__/fixtures.ts      |  73 ---
 .../topics/__test__/selectors.spec.ts         |  29 -
 .../src/redux/reducers/topics/selectors.ts    | 170 -----
 .../src/redux/reducers/topics/topicsSlice.ts  | 454 -------------
 63 files changed, 2249 insertions(+), 3576 deletions(-)
 rename kafka-ui-react-app/src/components/Topics/List/{ActionsCell => }/ActionsCell.tsx (63%)
 delete mode 100644 kafka-ui-react-app/src/components/Topics/List/List.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/List/ListContainer.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/TopicsTable.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/__tests__/ActionCell.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTable.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroupsContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/DetailsContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/OverviewContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/SettingsContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZoneContainer.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Edit/EditContainer.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/fixtures.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/TopicContainer.tsx
 create mode 100644 kafka-ui-react-app/src/lib/fixtures/topics.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/brokers.spec.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/clusters.spec.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/topics.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/topics/__test__/fixtures.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/topics/__test__/selectors.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/topics/selectors.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts

diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
similarity index 63%
rename from kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
rename to kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
index 62558086fd8..9aa14276d25 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
@@ -1,62 +1,40 @@
 import React from 'react';
-import {
-  CleanUpPolicy,
-  SortOrder,
-  TopicColumnsToSort,
-} from 'generated-sources';
+import { CleanUpPolicy, Topic } from 'generated-sources';
 import { useAppDispatch } from 'lib/hooks/redux';
 import { TableCellProps } from 'components/common/SmartTable/TableColumn';
-import { TopicWithDetailedInfo } from 'redux/interfaces';
 import ClusterContext from 'components/contexts/ClusterContext';
 import * as S from 'components/Topics/List/List.styled';
 import { ClusterNameRoute } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
-import {
-  deleteTopic,
-  fetchTopicsList,
-  recreateTopic,
-} from 'redux/reducers/topics/topicsSlice';
 import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { useQueryClient } from '@tanstack/react-query';
+import {
+  topicKeys,
+  useDeleteTopic,
+  useRecreateTopic,
+} from 'lib/hooks/api/topics';
 
-interface TopicsListParams {
-  clusterName: string;
-  page?: number;
-  perPage?: number;
-  showInternal?: boolean;
-  search?: string;
-  orderBy?: TopicColumnsToSort;
-  sortOrder?: SortOrder;
-}
-export interface ActionsCellProps {
-  topicsListParams: TopicsListParams;
-}
-
-const ActionsCell: React.FC<
-  TableCellProps<TopicWithDetailedInfo, string> & ActionsCellProps
-> = ({
+const ActionsCell: React.FC<TableCellProps<Topic, string>> = ({
   hovered,
   dataItem: { internal, cleanUpPolicy, name },
-  topicsListParams,
 }) => {
   const { isReadOnly, isTopicDeletionAllowed } =
     React.useContext(ClusterContext);
   const dispatch = useAppDispatch();
   const { clusterName } = useAppParams<ClusterNameRoute>();
+  const queryClient = useQueryClient();
 
-  const isHidden = internal || isReadOnly || !hovered;
+  const deleteTopic = useDeleteTopic(clusterName);
+  const recreateTopic = useRecreateTopic({ clusterName, topicName: name });
 
-  const deleteTopicHandler = () => {
-    dispatch(deleteTopic({ clusterName, topicName: name }));
-  };
-
-  const clearTopicMessagesHandler = () => {
-    dispatch(clearTopicMessages({ clusterName, topicName: name }));
-    dispatch(fetchTopicsList(topicsListParams));
-  };
+  const isHidden = internal || isReadOnly || !hovered;
 
-  const recreateTopicHandler = () => {
-    dispatch(recreateTopic({ clusterName, topicName: name }));
+  const clearTopicMessagesHandler = async () => {
+    await dispatch(
+      clearTopicMessages({ clusterName, topicName: name })
+    ).unwrap();
+    queryClient.invalidateQueries(topicKeys.all(clusterName));
   };
 
   return (
@@ -73,7 +51,7 @@ const ActionsCell: React.FC<
             </DropdownItem>
           )}
           <DropdownItem
-            onClick={recreateTopicHandler}
+            onClick={recreateTopic.mutateAsync}
             confirm={
               <>
                 Are you sure to recreate <b>{name}</b> topic?
@@ -85,7 +63,7 @@ const ActionsCell: React.FC<
           </DropdownItem>
           {isTopicDeletionAllowed && (
             <DropdownItem
-              onClick={deleteTopicHandler}
+              onClick={() => deleteTopic.mutateAsync(name)}
               confirm={
                 <>
                   Are you sure want to remove <b>{name}</b> topic?
diff --git a/kafka-ui-react-app/src/components/Topics/List/List.tsx b/kafka-ui-react-app/src/components/Topics/List/List.tsx
deleted file mode 100644
index aef6f95d170..00000000000
--- a/kafka-ui-react-app/src/components/Topics/List/List.tsx
+++ /dev/null
@@ -1,297 +0,0 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
-import useAppParams from 'lib/hooks/useAppParams';
-import {
-  TopicWithDetailedInfo,
-  ClusterName,
-  TopicName,
-} from 'redux/interfaces';
-import {
-  ClusterNameRoute,
-  clusterTopicCopyRelativePath,
-  clusterTopicNewRelativePath,
-} from 'lib/paths';
-import usePagination from 'lib/hooks/usePagination';
-import ClusterContext from 'components/contexts/ClusterContext';
-import PageLoader from 'components/common/PageLoader/PageLoader';
-import {
-  GetTopicsRequest,
-  SortOrder,
-  TopicColumnsToSort,
-} from 'generated-sources';
-import Search from 'components/common/Search/Search';
-import { PER_PAGE } from 'lib/constants';
-import { Button } from 'components/common/Button/Button';
-import PageHeading from 'components/common/PageHeading/PageHeading';
-import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
-import Switch from 'components/common/Switch/Switch';
-import { SmartTable } from 'components/common/SmartTable/SmartTable';
-import { TableColumn } from 'components/common/SmartTable/TableColumn';
-import { useTableState } from 'lib/hooks/useTableState';
-import PlusIcon from 'components/common/Icons/PlusIcon';
-import { useConfirm } from 'lib/hooks/useConfirm';
-
-import {
-  MessagesCell,
-  OutOfSyncReplicasCell,
-  TitleCell,
-  TopicSizeCell,
-} from './TopicsTableCells';
-import * as S from './List.styled';
-import ActionsCell from './ActionsCell/ActionsCell';
-
-export interface TopicsListProps {
-  areTopicsFetching: boolean;
-  topics: TopicWithDetailedInfo[];
-  totalPages: number;
-  fetchTopicsList(payload: GetTopicsRequest): void;
-  deleteTopics(payload: {
-    clusterName: ClusterName;
-    topicNames: TopicName[];
-  }): void;
-  clearTopicsMessages(payload: {
-    clusterName: ClusterName;
-    topicNames: TopicName[];
-  }): void;
-  clearTopicMessages(payload: {
-    topicName: TopicName;
-    clusterName: ClusterName;
-    partitions?: number[];
-  }): void;
-  search: string;
-  orderBy: string | null;
-  sortOrder: SortOrder;
-  setTopicsSearch(search: string): void;
-  setTopicsOrderBy(orderBy: string | null): void;
-}
-
-const List: React.FC<TopicsListProps> = ({
-  areTopicsFetching,
-  topics,
-  totalPages,
-  fetchTopicsList,
-  deleteTopics,
-  clearTopicsMessages,
-  search,
-  orderBy,
-  sortOrder,
-  setTopicsSearch,
-  setTopicsOrderBy,
-}) => {
-  const { isReadOnly } = React.useContext(ClusterContext);
-  const { clusterName } = useAppParams<ClusterNameRoute>();
-  const { page, perPage } = usePagination();
-  const [showInternal, setShowInternal] = React.useState<boolean>(
-    !localStorage.getItem('hideInternalTopics') && true
-  );
-  const [cachedPage, setCachedPage] = React.useState<number | null>(
-    page || null
-  );
-  const navigate = useNavigate();
-  const confirm = useConfirm();
-
-  const topicsListParams = React.useMemo(
-    () => ({
-      clusterName,
-      page,
-      perPage,
-      orderBy: (orderBy as TopicColumnsToSort) || undefined,
-      sortOrder,
-      search,
-      showInternal,
-    }),
-    [clusterName, page, perPage, orderBy, sortOrder, search, showInternal]
-  );
-
-  React.useEffect(() => {
-    fetchTopicsList(topicsListParams);
-  }, [fetchTopicsList, topicsListParams]);
-
-  const tableState = useTableState<TopicWithDetailedInfo, string>(
-    topics,
-    {
-      idSelector: (topic) => topic.name,
-      totalPages,
-      isRowSelectable: (topic) => !topic.internal,
-    },
-    {
-      handleOrderBy: setTopicsOrderBy,
-      orderBy,
-      sortOrder,
-    }
-  );
-
-  const getSelectedTopic = (): string => {
-    const name = Array.from(tableState.selectedIds)[0];
-    const selectedTopic =
-      tableState.data.find(
-        (topic: TopicWithDetailedInfo) => topic.name === name
-      ) || {};
-
-    return Object.keys(selectedTopic)
-      .map((x: string) => {
-        const value = selectedTopic[x as keyof typeof selectedTopic];
-        return value && x !== 'partitions' ? `${x}=${value}` : null;
-      })
-      .join('&');
-  };
-
-  const handleSwitch = () => {
-    if (showInternal) {
-      localStorage.setItem('hideInternalTopics', 'true');
-    } else {
-      localStorage.removeItem('hideInternalTopics');
-    }
-
-    setShowInternal(!showInternal);
-    navigate({
-      search: `?page=1&perPage=${perPage || PER_PAGE}`,
-    });
-  };
-
-  const clearSelectedTopics = () => tableState.toggleSelection(false);
-
-  const searchHandler = (searchString: string) => {
-    setTopicsSearch(searchString);
-
-    setCachedPage(page || null);
-
-    const newPageQuery = !searchString && cachedPage ? cachedPage : 1;
-
-    navigate({
-      search: `?page=${newPageQuery}&perPage=${perPage || PER_PAGE}`,
-    });
-  };
-
-  const deleteTopicsHandler = () => {
-    const selectedIds = Array.from(tableState.selectedIds);
-    confirm('Are you sure you want to remove selected topics?', () => {
-      deleteTopics({ clusterName, topicNames: selectedIds });
-      clearSelectedTopics();
-      fetchTopicsList(topicsListParams);
-    });
-  };
-
-  const purgeTopicsHandler = () => {
-    const selectedIds = Array.from(tableState.selectedIds);
-    confirm(
-      'Are you sure you want to purge messages of selected topics?',
-      () => {
-        clearTopicsMessages({ clusterName, topicNames: selectedIds });
-        clearSelectedTopics();
-        fetchTopicsList(topicsListParams);
-      }
-    );
-  };
-
-  return (
-    <div>
-      <div>
-        <PageHeading text="All Topics">
-          {!isReadOnly && (
-            <Button
-              buttonType="primary"
-              buttonSize="M"
-              to={clusterTopicNewRelativePath}
-            >
-              <PlusIcon /> Add a Topic
-            </Button>
-          )}
-        </PageHeading>
-        <ControlPanelWrapper hasInput>
-          <div>
-            <Search
-              handleSearch={searchHandler}
-              placeholder="Search by Topic Name"
-              value={search}
-            />
-          </div>
-          <div>
-            <Switch
-              name="ShowInternalTopics"
-              checked={showInternal}
-              onChange={handleSwitch}
-            />
-            <label>Show Internal Topics</label>
-          </div>
-        </ControlPanelWrapper>
-      </div>
-      {areTopicsFetching ? (
-        <PageLoader />
-      ) : (
-        <div>
-          {tableState.selectedCount > 0 && (
-            <ControlPanelWrapper data-testid="delete-buttons">
-              <Button
-                buttonSize="M"
-                buttonType="secondary"
-                onClick={deleteTopicsHandler}
-              >
-                Delete selected topics
-              </Button>
-              {tableState.selectedCount === 1 && (
-                <Button
-                  buttonSize="M"
-                  buttonType="secondary"
-                  to={{
-                    pathname: clusterTopicCopyRelativePath,
-                    search: `?${getSelectedTopic()}`,
-                  }}
-                >
-                  Copy selected topic
-                </Button>
-              )}
-
-              <Button
-                buttonSize="M"
-                buttonType="secondary"
-                onClick={purgeTopicsHandler}
-              >
-                Purge messages of selected topics
-              </Button>
-            </ControlPanelWrapper>
-          )}
-          <SmartTable
-            selectable={!isReadOnly}
-            tableState={tableState}
-            placeholder="No topics found"
-            isFullwidth
-            paginated
-            hoverable
-          >
-            <TableColumn
-              maxWidth="350px"
-              title="Topic Name"
-              cell={TitleCell}
-              orderValue={TopicColumnsToSort.NAME}
-            />
-            <TableColumn
-              title="Total Partitions"
-              field="partitions.length"
-              orderValue={TopicColumnsToSort.TOTAL_PARTITIONS}
-            />
-            <TableColumn
-              title="Out of sync replicas"
-              cell={OutOfSyncReplicasCell}
-              orderValue={TopicColumnsToSort.OUT_OF_SYNC_REPLICAS}
-            />
-            <TableColumn title="Replication Factor" field="replicationFactor" />
-            <TableColumn title="Number of messages" cell={MessagesCell} />
-            <TableColumn
-              title="Size"
-              cell={TopicSizeCell}
-              orderValue={TopicColumnsToSort.SIZE}
-            />
-            <TableColumn
-              maxWidth="4%"
-              cell={ActionsCell}
-              customTd={S.ActionsTd}
-            />
-          </SmartTable>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default List;
diff --git a/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts b/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts
deleted file mode 100644
index 75b06c2b431..00000000000
--- a/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import {
-  fetchTopicsList,
-  setTopicsSearch,
-  setTopicsOrderBy,
-  deleteTopics,
-  clearTopicsMessages,
-} from 'redux/reducers/topics/topicsSlice';
-import {
-  getTopicList,
-  getAreTopicsFetching,
-  getTopicListTotalPages,
-  getTopicsSearch,
-  getTopicsOrderBy,
-  getTopicsSortOrder,
-} from 'redux/reducers/topics/selectors';
-
-import List from './List';
-
-const mapStateToProps = (state: RootState) => ({
-  areTopicsFetching: getAreTopicsFetching(state),
-  topics: getTopicList(state),
-  totalPages: getTopicListTotalPages(state),
-  search: getTopicsSearch(state),
-  orderBy: getTopicsOrderBy(state),
-  sortOrder: getTopicsSortOrder(state),
-});
-
-const mapDispatchToProps = {
-  fetchTopicsList,
-  deleteTopics,
-  clearTopicsMessages,
-  clearTopicMessages,
-  setTopicsSearch,
-  setTopicsOrderBy,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(List);
diff --git a/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
new file mode 100644
index 00000000000..bdd44a60a5e
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
@@ -0,0 +1,87 @@
+import React, { Suspense } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { clusterTopicNewRelativePath } from 'lib/paths';
+import { PER_PAGE } from 'lib/constants';
+import ClusterContext from 'components/contexts/ClusterContext';
+import Search from 'components/common/Search/Search';
+import { Button } from 'components/common/Button/Button';
+import PageHeading from 'components/common/PageHeading/PageHeading';
+import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
+import Switch from 'components/common/Switch/Switch';
+import PlusIcon from 'components/common/Icons/PlusIcon';
+import useSearch from 'lib/hooks/useSearch';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+import TopicsTable from 'components/Topics/List/TopicsTable';
+
+const ListPage: React.FC = () => {
+  const { isReadOnly } = React.useContext(ClusterContext);
+  const [searchQuery, handleSearchQuery] = useSearch();
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  // Set the search params to the url based on the localStorage value
+  React.useEffect(() => {
+    if (!searchParams.has('perPage')) {
+      searchParams.set('perPage', String(PER_PAGE));
+    }
+    if (
+      !!localStorage.getItem('hideInternalTopics') &&
+      !searchParams.has('hideInternal')
+    ) {
+      searchParams.set('hideInternal', 'true');
+    }
+    setSearchParams(searchParams, { replace: true });
+  }, []);
+
+  const handleSwitch = () => {
+    if (searchParams.has('hideInternal')) {
+      localStorage.removeItem('hideInternalTopics');
+      searchParams.delete('hideInternal');
+    } else {
+      localStorage.setItem('hideInternalTopics', 'true');
+      searchParams.set('hideInternal', 'true');
+    }
+    // Page must be reset when the switch is toggled
+    searchParams.delete('page');
+    setSearchParams(searchParams.toString(), { replace: true });
+  };
+
+  return (
+    <>
+      <PageHeading text="All Topics">
+        {!isReadOnly && (
+          <Button
+            buttonType="primary"
+            buttonSize="M"
+            to={clusterTopicNewRelativePath}
+          >
+            <PlusIcon /> Add a Topic
+          </Button>
+        )}
+      </PageHeading>
+      <ControlPanelWrapper hasInput>
+        <div>
+          <Search
+            handleSearch={handleSearchQuery}
+            placeholder="Search by Topic Name"
+            value={searchQuery}
+          />
+        </div>
+        <div>
+          <label>
+            <Switch
+              name="ShowInternalTopics"
+              checked={!searchParams.has('hideInternal')}
+              onChange={handleSwitch}
+            />
+            Show Internal Topics
+          </label>
+        </div>
+      </ControlPanelWrapper>
+      <Suspense fallback={<PageLoader />}>
+        <TopicsTable />
+      </Suspense>
+    </>
+  );
+};
+
+export default ListPage;
diff --git a/kafka-ui-react-app/src/components/Topics/List/TopicsTable.tsx b/kafka-ui-react-app/src/components/Topics/List/TopicsTable.tsx
new file mode 100644
index 00000000000..6250d0c4da0
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/TopicsTable.tsx
@@ -0,0 +1,201 @@
+import React from 'react';
+import { SortOrder, Topic, TopicColumnsToSort } from 'generated-sources';
+import { useSearchParams } from 'react-router-dom';
+import { useDeleteTopic, useTopics } from 'lib/hooks/api/topics';
+import useAppParams from 'lib/hooks/useAppParams';
+import { ClusterName } from 'redux/interfaces';
+import { PER_PAGE } from 'lib/constants';
+import { useTableState } from 'lib/hooks/useTableState';
+import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
+import { Button } from 'components/common/Button/Button';
+import { clusterTopicCopyRelativePath } from 'lib/paths';
+import { useConfirm } from 'lib/hooks/useConfirm';
+import { SmartTable } from 'components/common/SmartTable/SmartTable';
+import { TableColumn } from 'components/common/SmartTable/TableColumn';
+import ClusterContext from 'components/contexts/ClusterContext';
+import { useAppDispatch } from 'lib/hooks/redux';
+import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
+
+import {
+  MessagesCell,
+  OutOfSyncReplicasCell,
+  TitleCell,
+  TopicSizeCell,
+} from './TopicsTableCells';
+import ActionsCell from './ActionsCell';
+import { ActionsTd } from './List.styled';
+
+const TopicsTable: React.FC = () => {
+  const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const { isReadOnly } = React.useContext(ClusterContext);
+  const dispatch = useAppDispatch();
+  const confirm = useConfirm();
+  const deleteTopic = useDeleteTopic(clusterName);
+  const { data, refetch } = useTopics({
+    clusterName,
+    page: Number(searchParams.get('page') || 1),
+    perPage: Number(searchParams.get('perPage') || PER_PAGE),
+    search: searchParams.get('q') || undefined,
+    showInternal: !searchParams.has('hideInternal'),
+    orderBy: (searchParams.get('orderBy') as TopicColumnsToSort) || undefined,
+    sortOrder: (searchParams.get('sortOrder') as SortOrder) || undefined,
+  });
+
+  const handleOrderBy = (orderBy: string | null) => {
+    const currentOrderBy = searchParams.get('orderBy');
+    const currentSortOrder = searchParams.get('sortOrder');
+
+    if (orderBy) {
+      if (orderBy === currentOrderBy) {
+        searchParams.set(
+          'sortOrder',
+          currentSortOrder === SortOrder.DESC ? SortOrder.ASC : SortOrder.DESC
+        );
+      }
+
+      searchParams.set('orderBy', orderBy);
+    } else {
+      searchParams.delete('orderBy');
+      searchParams.delete('sortOrder');
+    }
+    setSearchParams(searchParams, { replace: true });
+  };
+
+  const tableState = useTableState<Topic, string>(
+    data?.topics || [],
+    {
+      idSelector: (topic) => topic.name,
+      totalPages: data?.pageCount || 0,
+      isRowSelectable: (topic) => !topic.internal,
+    },
+    {
+      handleOrderBy,
+      orderBy: searchParams.get('orderBy'),
+      sortOrder: (searchParams.get('sortOrder') as SortOrder) || SortOrder.ASC,
+    }
+  );
+
+  const getSelectedTopic = (): string => {
+    const name = Array.from(tableState.selectedIds)[0];
+    const selectedTopic =
+      tableState.data.find((topic: Topic) => topic.name === name) || {};
+
+    return Object.keys(selectedTopic)
+      .map((x: string) => {
+        const value = selectedTopic[x as keyof typeof selectedTopic];
+        return value && x !== 'partitions' ? `${x}=${value}` : null;
+      })
+      .join('&');
+  };
+
+  const clearSelectedTopics = () => tableState.toggleSelection(false);
+
+  const deleteTopicsHandler = () => {
+    const selectedTopics = Array.from(tableState.selectedIds);
+    confirm('Are you sure you want to remove selected topics?', async () => {
+      try {
+        await Promise.all(
+          selectedTopics.map((topicName) => deleteTopic.mutateAsync(topicName))
+        );
+        clearSelectedTopics();
+      } catch (e) {
+        // do nothing;
+      } finally {
+        refetch();
+      }
+    });
+  };
+
+  const purgeTopicsHandler = () => {
+    const selectedTopics = Array.from(tableState.selectedIds);
+    confirm(
+      'Are you sure you want to purge messages of selected topics?',
+      async () => {
+        try {
+          await Promise.all(
+            selectedTopics.map((topicName) =>
+              dispatch(clearTopicMessages({ clusterName, topicName })).unwrap()
+            )
+          );
+          clearSelectedTopics();
+        } catch (e) {
+          // do nothing;
+        } finally {
+          refetch();
+        }
+      }
+    );
+  };
+
+  return (
+    <>
+      {tableState.selectedCount > 0 && (
+        <ControlPanelWrapper>
+          <Button
+            buttonSize="M"
+            buttonType="secondary"
+            onClick={deleteTopicsHandler}
+          >
+            Delete selected topics
+          </Button>
+          {tableState.selectedCount === 1 && (
+            <Button
+              buttonSize="M"
+              buttonType="secondary"
+              to={{
+                pathname: clusterTopicCopyRelativePath,
+                search: `?${getSelectedTopic()}`,
+              }}
+            >
+              Copy selected topic
+            </Button>
+          )}
+
+          <Button
+            buttonSize="M"
+            buttonType="secondary"
+            onClick={purgeTopicsHandler}
+          >
+            Purge messages of selected topics
+          </Button>
+        </ControlPanelWrapper>
+      )}
+      <SmartTable
+        selectable={!isReadOnly}
+        tableState={tableState}
+        placeholder="No topics found"
+        isFullwidth
+        paginated
+        hoverable
+      >
+        <TableColumn
+          maxWidth="350px"
+          title="Topic Name"
+          cell={TitleCell}
+          orderValue={TopicColumnsToSort.NAME}
+        />
+        <TableColumn
+          title="Total Partitions"
+          field="partitions.length"
+          orderValue={TopicColumnsToSort.TOTAL_PARTITIONS}
+        />
+        <TableColumn
+          title="Out of sync replicas"
+          cell={OutOfSyncReplicasCell}
+          orderValue={TopicColumnsToSort.OUT_OF_SYNC_REPLICAS}
+        />
+        <TableColumn title="Replication Factor" field="replicationFactor" />
+        <TableColumn title="Number of messages" cell={MessagesCell} />
+        <TableColumn
+          title="Size"
+          cell={TopicSizeCell}
+          orderValue={TopicColumnsToSort.SIZE}
+        />
+        <TableColumn maxWidth="4%" cell={ActionsCell} customTd={ActionsTd} />
+      </SmartTable>
+    </>
+  );
+};
+
+export default TopicsTable;
diff --git a/kafka-ui-react-app/src/components/Topics/List/TopicsTableCells.tsx b/kafka-ui-react-app/src/components/Topics/List/TopicsTableCells.tsx
index d9a55d46e90..d79dd2eb676 100644
--- a/kafka-ui-react-app/src/components/Topics/List/TopicsTableCells.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/TopicsTableCells.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
-import { TopicWithDetailedInfo } from 'redux/interfaces';
 import { TableCellProps } from 'components/common/SmartTable/TableColumn';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
+import { Topic } from 'generated-sources';
 
 import * as S from './List.styled';
 
-export const TitleCell: React.FC<
-  TableCellProps<TopicWithDetailedInfo, string>
-> = ({ dataItem: { internal, name } }) => {
+export const TitleCell: React.FC<TableCellProps<Topic, string>> = ({
+  dataItem: { internal, name },
+}) => {
   return (
     <>
       {internal && <Tag color="gray">IN</Tag>}
@@ -19,15 +19,15 @@ export const TitleCell: React.FC<
   );
 };
 
-export const TopicSizeCell: React.FC<
-  TableCellProps<TopicWithDetailedInfo, string>
-> = ({ dataItem: { segmentSize } }) => {
+export const TopicSizeCell: React.FC<TableCellProps<Topic, string>> = ({
+  dataItem: { segmentSize },
+}) => {
   return <BytesFormatted value={segmentSize} />;
 };
 
-export const OutOfSyncReplicasCell: React.FC<
-  TableCellProps<TopicWithDetailedInfo, string>
-> = ({ dataItem: { partitions } }) => {
+export const OutOfSyncReplicasCell: React.FC<TableCellProps<Topic, string>> = ({
+  dataItem: { partitions },
+}) => {
   const data = React.useMemo(() => {
     if (partitions === undefined || partitions.length === 0) {
       return 0;
@@ -42,9 +42,9 @@ export const OutOfSyncReplicasCell: React.FC<
   return <span>{data}</span>;
 };
 
-export const MessagesCell: React.FC<
-  TableCellProps<TopicWithDetailedInfo, string>
-> = ({ dataItem: { partitions } }) => {
+export const MessagesCell: React.FC<TableCellProps<Topic, string>> = ({
+  dataItem: { partitions },
+}) => {
   const data = React.useMemo(() => {
     if (partitions === undefined || partitions.length === 0) {
       return 0;
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/ActionCell.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/ActionCell.spec.tsx
new file mode 100644
index 00000000000..80f45efc548
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/ActionCell.spec.tsx
@@ -0,0 +1,179 @@
+import React from 'react';
+import { render } from 'lib/testHelpers';
+import { TableState } from 'lib/hooks/useTableState';
+import { act, screen, waitFor } from '@testing-library/react';
+import { CleanUpPolicy, Topic } from 'generated-sources';
+import { topicsPayload } from 'lib/fixtures/topics';
+import ActionsCell from 'components/Topics/List/ActionsCell';
+import ClusterContext from 'components/contexts/ClusterContext';
+import userEvent from '@testing-library/user-event';
+import { useDeleteTopic, useRecreateTopic } from 'lib/hooks/api/topics';
+
+const mockUnwrap = jest.fn();
+const useDispatchMock = () => jest.fn(() => ({ unwrap: mockUnwrap }));
+
+jest.mock('lib/hooks/redux', () => ({
+  ...jest.requireActual('lib/hooks/redux'),
+  useAppDispatch: useDispatchMock,
+}));
+
+jest.mock('lib/hooks/api/topics', () => ({
+  ...jest.requireActual('lib/hooks/api/topics'),
+  useDeleteTopic: jest.fn(),
+  useRecreateTopic: jest.fn(),
+}));
+
+const deleteTopicMock = jest.fn();
+const recreateTopicMock = jest.fn();
+
+describe('ActionCell Components', () => {
+  beforeEach(() => {
+    (useDeleteTopic as jest.Mock).mockImplementation(() => ({
+      mutateAsync: deleteTopicMock,
+    }));
+    (useRecreateTopic as jest.Mock).mockImplementation(() => ({
+      mutateAsync: recreateTopicMock,
+    }));
+  });
+
+  const mockTableState: TableState<Topic, string> = {
+    data: topicsPayload,
+    selectedIds: new Set([]),
+    idSelector: jest.fn(),
+    isRowSelectable: jest.fn(),
+    selectedCount: 0,
+    setRowsSelection: jest.fn(),
+    toggleSelection: jest.fn(),
+  };
+
+  const renderComponent = (
+    currentData: Topic,
+    isReadOnly = false,
+    hovered = true,
+    isTopicDeletionAllowed = true
+  ) => {
+    return render(
+      <ClusterContext.Provider
+        value={{
+          isReadOnly,
+          hasKafkaConnectConfigured: true,
+          hasSchemaRegistryConfigured: true,
+          isTopicDeletionAllowed,
+        }}
+      >
+        <ActionsCell
+          rowIndex={1}
+          dataItem={currentData}
+          tableState={mockTableState}
+          hovered={hovered}
+        />
+      </ClusterContext.Provider>
+    );
+  };
+
+  const expectCellIsEmpty = () => {
+    expect(
+      screen.queryByRole('button', { name: 'Dropdown Toggle' })
+    ).not.toBeInTheDocument();
+  };
+
+  const expectDropdownExists = () => {
+    const btn = screen.getByRole('button', { name: 'Dropdown Toggle' });
+    expect(btn).toBeInTheDocument();
+    userEvent.click(btn);
+    expect(screen.getByRole('menu')).toBeInTheDocument();
+  };
+
+  describe('is empty', () => {
+    it('for internal topic', () => {
+      renderComponent(topicsPayload[0]);
+      expectCellIsEmpty();
+    });
+    it('for readonly cluster', () => {
+      renderComponent(topicsPayload[1], true);
+      expectCellIsEmpty();
+    });
+    it('for non-hovered row', () => {
+      renderComponent(topicsPayload[1], false, false);
+      expectCellIsEmpty();
+    });
+  });
+
+  describe('is not empty', () => {
+    it('for external topic', async () => {
+      renderComponent(topicsPayload[1]);
+      expectDropdownExists();
+    });
+    describe('and clear messages action', () => {
+      it('is visible for topic with CleanUpPolicy.DELETE', async () => {
+        renderComponent({
+          ...topicsPayload[1],
+          cleanUpPolicy: CleanUpPolicy.DELETE,
+        });
+        expectDropdownExists();
+        expect(screen.getByText('Clear Messages')).toBeInTheDocument();
+      });
+      it('is hidden for topic without CleanUpPolicy.DELETE', async () => {
+        renderComponent({
+          ...topicsPayload[1],
+          cleanUpPolicy: CleanUpPolicy.COMPACT,
+        });
+        expectDropdownExists();
+        expect(screen.queryByText('Clear Messages')).not.toBeInTheDocument();
+      });
+      it('works as expected', async () => {
+        renderComponent({
+          ...topicsPayload[1],
+          cleanUpPolicy: CleanUpPolicy.DELETE,
+        });
+        expectDropdownExists();
+        userEvent.click(screen.getByText('Clear Messages'));
+        expect(
+          screen.getByText('Are you sure want to clear topic messages?')
+        ).toBeInTheDocument();
+        await act(() =>
+          userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+        );
+        expect(mockUnwrap).toHaveBeenCalled();
+      });
+    });
+
+    describe('and remove topic action', () => {
+      it('is visible only when topic deletion allowed for cluster', async () => {
+        renderComponent(topicsPayload[1]);
+        expectDropdownExists();
+        expect(screen.getByText('Remove Topic')).toBeInTheDocument();
+      });
+      it('is hidden when topic deletion is not allowed for cluster', async () => {
+        renderComponent(topicsPayload[1], false, true, false);
+        expectDropdownExists();
+        expect(screen.queryByText('Remove Topic')).not.toBeInTheDocument();
+      });
+      it('works as expected', async () => {
+        renderComponent(topicsPayload[1]);
+        expectDropdownExists();
+        userEvent.click(screen.getByText('Remove Topic'));
+        expect(screen.getByText('Confirm the action')).toBeInTheDocument();
+        expect(screen.getByText('external.topic')).toBeInTheDocument();
+        await waitFor(() =>
+          userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+        );
+        await waitFor(() => expect(deleteTopicMock).toHaveBeenCalled());
+      });
+    });
+
+    describe('and recreate topic action', () => {
+      it('works as expected', async () => {
+        renderComponent(topicsPayload[1]);
+        expectDropdownExists();
+        userEvent.click(screen.getByText('Recreate Topic'));
+        expect(screen.getByText('Confirm the action')).toBeInTheDocument();
+        expect(screen.getByText('external.topic')).toBeInTheDocument();
+        await waitFor(() =>
+          userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+        );
+        await waitFor(() => expect(recreateTopicMock).toHaveBeenCalled());
+      });
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx
deleted file mode 100644
index a9f666c57a6..00000000000
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx
+++ /dev/null
@@ -1,331 +0,0 @@
-import React from 'react';
-import { render, WithRoute } from 'lib/testHelpers';
-import { act, screen, waitFor, within } from '@testing-library/react';
-import ClusterContext, {
-  ContextProps,
-} from 'components/contexts/ClusterContext';
-import List, { TopicsListProps } from 'components/Topics/List/List';
-import { externalTopicPayload } from 'redux/reducers/topics/__test__/fixtures';
-import { CleanUpPolicy, SortOrder } from 'generated-sources';
-import userEvent from '@testing-library/user-event';
-import { clusterTopicsPath } from 'lib/paths';
-
-const mockNavigate = jest.fn();
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useNavigate: () => mockNavigate,
-}));
-
-describe('List', () => {
-  afterEach(() => {
-    mockNavigate.mockClear();
-  });
-
-  const setupComponent = (props: Partial<TopicsListProps> = {}) => (
-    <List
-      areTopicsFetching={false}
-      topics={[]}
-      totalPages={1}
-      fetchTopicsList={jest.fn()}
-      deleteTopics={jest.fn()}
-      clearTopicsMessages={jest.fn()}
-      clearTopicMessages={jest.fn()}
-      search=""
-      orderBy={null}
-      sortOrder={SortOrder.ASC}
-      setTopicsSearch={jest.fn()}
-      setTopicsOrderBy={jest.fn()}
-      {...props}
-    />
-  );
-
-  const renderComponentWithProviders = (
-    contextProps: Partial<ContextProps> = {},
-    props: Partial<TopicsListProps> = {},
-    queryParams = ''
-  ) =>
-    render(
-      <WithRoute path={clusterTopicsPath()}>
-        <ClusterContext.Provider
-          value={{
-            isReadOnly: true,
-            hasKafkaConnectConfigured: true,
-            hasSchemaRegistryConfigured: true,
-            isTopicDeletionAllowed: true,
-            ...contextProps,
-          }}
-        >
-          {setupComponent(props)}
-        </ClusterContext.Provider>
-      </WithRoute>,
-      { initialEntries: [`${clusterTopicsPath('test')}${queryParams}`] }
-    );
-
-  describe('when it has readonly flag', () => {
-    it('does not render the Add a Topic button', () => {
-      renderComponentWithProviders();
-      expect(screen.queryByText(/add a topic/)).not.toBeInTheDocument();
-    });
-  });
-
-  describe('when it does not have readonly flag', () => {
-    const fetchTopicsList = jest.fn();
-
-    jest.useFakeTimers();
-
-    afterEach(() => {
-      fetchTopicsList.mockClear();
-    });
-
-    it('renders the Add a Topic button', () => {
-      renderComponentWithProviders({ isReadOnly: false }, { fetchTopicsList });
-      expect(screen.getByText(/add a topic/i)).toBeInTheDocument();
-    });
-
-    it('calls setTopicsSearch on input', async () => {
-      const setTopicsSearch = jest.fn();
-      renderComponentWithProviders({}, { setTopicsSearch });
-      const query = 'topic';
-      const searchElement = screen.getByPlaceholderText('Search by Topic Name');
-      userEvent.type(searchElement, query);
-      await waitFor(() => {
-        expect(setTopicsSearch).toHaveBeenCalledWith(query);
-      });
-    });
-
-    it('show internal toggle state should be true if user has not used it yet', () => {
-      renderComponentWithProviders({ isReadOnly: false }, { fetchTopicsList });
-      const internalCheckBox = screen.getByRole('checkbox');
-
-      expect(internalCheckBox).toBeChecked();
-    });
-
-    it('show internal toggle state should match user preference', () => {
-      localStorage.setItem('hideInternalTopics', 'true');
-      renderComponentWithProviders({ isReadOnly: false }, { fetchTopicsList });
-
-      const internalCheckBox = screen.getByRole('checkbox');
-
-      expect(internalCheckBox).not.toBeChecked();
-    });
-
-    it('should re-fetch topics on show internal toggle change', async () => {
-      renderComponentWithProviders({ isReadOnly: false }, { fetchTopicsList });
-      const internalCheckBox: HTMLInputElement = screen.getByRole('checkbox');
-
-      userEvent.click(internalCheckBox);
-      const { value } = internalCheckBox;
-
-      await waitFor(() => {
-        expect(fetchTopicsList).toHaveBeenLastCalledWith({
-          clusterName: 'test',
-          orderBy: undefined,
-          page: undefined,
-          perPage: undefined,
-          search: '',
-          showInternal: value === 'on',
-          sortOrder: SortOrder.ASC,
-        });
-      });
-    });
-
-    it('should reset page query param on show internal toggle change', async () => {
-      renderComponentWithProviders({ isReadOnly: false }, { fetchTopicsList });
-
-      const internalCheckBox: HTMLInputElement = screen.getByRole('checkbox');
-      userEvent.click(internalCheckBox);
-
-      expect(mockNavigate).toHaveBeenCalledWith({
-        search: '?page=1&perPage=25',
-      });
-    });
-
-    it('should set cached page query param on show internal toggle change', async () => {
-      const cachedPage = 5;
-
-      renderComponentWithProviders(
-        { isReadOnly: false },
-        { fetchTopicsList, totalPages: 10 },
-        `?page=${cachedPage}&perPage=25`
-      );
-
-      const searchInput = screen.getByPlaceholderText('Search by Topic Name');
-      userEvent.type(searchInput, 'nonEmptyString');
-
-      await waitFor(() => {
-        expect(mockNavigate).toHaveBeenCalledWith({
-          search: '?page=1&perPage=25',
-        });
-      });
-
-      await act(() => {
-        userEvent.clear(searchInput);
-      });
-
-      await waitFor(() => {
-        expect(mockNavigate).toHaveBeenLastCalledWith({
-          search: `?page=${cachedPage}&perPage=25`,
-        });
-      });
-    });
-  });
-
-  describe('when some list items are selected', () => {
-    const mockDeleteTopics = jest.fn();
-    const mockClearTopic = jest.fn();
-    const mockClearTopicsMessages = jest.fn();
-    const fetchTopicsList = jest.fn();
-
-    jest.useFakeTimers();
-    const pathname = clusterTopicsPath('local');
-
-    beforeEach(() => {
-      render(
-        <WithRoute path={clusterTopicsPath()}>
-          <ClusterContext.Provider
-            value={{
-              isReadOnly: false,
-              hasKafkaConnectConfigured: true,
-              hasSchemaRegistryConfigured: true,
-              isTopicDeletionAllowed: true,
-            }}
-          >
-            {setupComponent({
-              topics: [
-                {
-                  ...externalTopicPayload,
-                  cleanUpPolicy: CleanUpPolicy.DELETE,
-                },
-                { ...externalTopicPayload, name: 'external.topic2' },
-              ],
-              deleteTopics: mockDeleteTopics,
-              clearTopicsMessages: mockClearTopicsMessages,
-              clearTopicMessages: mockClearTopic,
-              fetchTopicsList,
-            })}
-          </ClusterContext.Provider>
-        </WithRoute>,
-        { initialEntries: [pathname] }
-      );
-    });
-
-    afterEach(() => {
-      mockDeleteTopics.mockClear();
-      mockClearTopicsMessages.mockClear();
-    });
-
-    const getCheckboxInput = (at: number) => {
-      const rows = screen.getAllByRole('row');
-      return within(rows[at + 1]).getByRole('checkbox');
-    };
-
-    it('renders delete/purge buttons', () => {
-      const firstCheckbox = getCheckboxInput(0);
-      const secondCheckbox = getCheckboxInput(1);
-      expect(firstCheckbox).not.toBeChecked();
-      expect(secondCheckbox).not.toBeChecked();
-      // expect(component.find('.buttons').length).toEqual(0);
-
-      // check first item
-      userEvent.click(firstCheckbox);
-      expect(firstCheckbox).toBeChecked();
-      expect(secondCheckbox).not.toBeChecked();
-
-      expect(screen.getByTestId('delete-buttons')).toBeInTheDocument();
-
-      // check second item
-      userEvent.click(secondCheckbox);
-      expect(firstCheckbox).toBeChecked();
-      expect(secondCheckbox).toBeChecked();
-
-      expect(screen.getByTestId('delete-buttons')).toBeInTheDocument();
-
-      // uncheck second item
-      userEvent.click(secondCheckbox);
-      expect(firstCheckbox).toBeChecked();
-      expect(secondCheckbox).not.toBeChecked();
-
-      expect(screen.getByTestId('delete-buttons')).toBeInTheDocument();
-
-      // uncheck first item
-      userEvent.click(firstCheckbox);
-      expect(firstCheckbox).not.toBeChecked();
-      expect(secondCheckbox).not.toBeChecked();
-
-      expect(screen.queryByTestId('delete-buttons')).not.toBeInTheDocument();
-    });
-
-    const checkActionButtonClick = async (
-      action: 'deleteTopics' | 'clearTopicsMessages'
-    ) => {
-      const buttonIndex = action === 'deleteTopics' ? 0 : 1;
-
-      const confirmationText =
-        action === 'deleteTopics'
-          ? 'Are you sure you want to remove selected topics?'
-          : 'Are you sure you want to purge messages of selected topics?';
-      const mockFn =
-        action === 'deleteTopics' ? mockDeleteTopics : mockClearTopicsMessages;
-
-      const firstCheckbox = getCheckboxInput(0);
-      const secondCheckbox = getCheckboxInput(1);
-      userEvent.click(firstCheckbox);
-      userEvent.click(secondCheckbox);
-
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-
-      const deleteButtonContainer = screen.getByTestId('delete-buttons');
-      const buttonClickedElement = within(deleteButtonContainer).getAllByRole(
-        'button'
-      )[buttonIndex];
-      userEvent.click(buttonClickedElement);
-
-      const modal = await screen.findByRole('dialog');
-      expect(within(modal).getByText(confirmationText)).toBeInTheDocument();
-      userEvent.click(within(modal).getByRole('button', { name: 'Confirm' }));
-
-      await waitFor(() => {
-        expect(screen.queryByTestId('delete-buttons')).not.toBeInTheDocument();
-      });
-
-      expect(mockFn).toBeCalledTimes(1);
-      expect(mockFn).toBeCalledWith({
-        clusterName: 'local',
-        topicNames: [externalTopicPayload.name, 'external.topic2'],
-      });
-    };
-
-    it('triggers the deleteTopics when clicked on the delete button', async () => {
-      await checkActionButtonClick('deleteTopics');
-      expect(mockDeleteTopics).toBeCalledTimes(1);
-    });
-
-    it('triggers the clearTopicsMessages when clicked on the clear button', async () => {
-      await checkActionButtonClick('clearTopicsMessages');
-      expect(mockClearTopicsMessages).toBeCalledTimes(1);
-    });
-
-    it('closes ConfirmationModal when clicked on the cancel button', async () => {
-      const firstCheckbox = getCheckboxInput(0);
-      const secondCheckbox = getCheckboxInput(1);
-
-      userEvent.click(firstCheckbox);
-      userEvent.click(secondCheckbox);
-
-      const deleteButton = screen.getByText('Delete selected topics');
-
-      userEvent.click(deleteButton);
-
-      const modal = screen.getByRole('dialog');
-      userEvent.click(within(modal).getByText('Cancel'));
-
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-      expect(firstCheckbox).toBeChecked();
-      expect(secondCheckbox).toBeChecked();
-
-      expect(screen.getByTestId('delete-buttons')).toBeInTheDocument();
-
-      expect(mockDeleteTopics).not.toHaveBeenCalled();
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
new file mode 100644
index 00000000000..301001d3821
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import { screen } from '@testing-library/react';
+import ClusterContext from 'components/contexts/ClusterContext';
+import userEvent from '@testing-library/user-event';
+import { clusterTopicsPath } from 'lib/paths';
+import ListPage from 'components/Topics/List/ListPage';
+
+const clusterName = 'test-cluster';
+
+jest.mock('components/Topics/List/TopicsTable', () => () => (
+  <>TopicsTableMock</>
+));
+
+describe('ListPage Component', () => {
+  const renderComponent = () => {
+    return render(
+      <ClusterContext.Provider
+        value={{
+          isReadOnly: false,
+          hasKafkaConnectConfigured: true,
+          hasSchemaRegistryConfigured: true,
+          isTopicDeletionAllowed: true,
+        }}
+      >
+        <WithRoute path={clusterTopicsPath()}>
+          <ListPage />
+        </WithRoute>
+      </ClusterContext.Provider>,
+      { initialEntries: [clusterTopicsPath(clusterName)] }
+    );
+  };
+
+  beforeEach(() => {
+    renderComponent();
+  });
+
+  it('handles switch of Internal Topics visibility', () => {
+    const switchInput = screen.getByLabelText('Show Internal Topics');
+    expect(switchInput).toBeInTheDocument();
+
+    expect(global.localStorage.getItem('hideInternalTopics')).toBeNull();
+    userEvent.click(switchInput);
+    expect(global.localStorage.getItem('hideInternalTopics')).toBeTruthy();
+    userEvent.click(switchInput);
+    expect(global.localStorage.getItem('hideInternalTopics')).toBeNull();
+  });
+
+  it('renders the TopicsTable', () => {
+    expect(screen.getByText('TopicsTableMock')).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTable.spec.tsx
new file mode 100644
index 00000000000..6116cc98190
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTable.spec.tsx
@@ -0,0 +1,168 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import { act, screen, within } from '@testing-library/react';
+import { externalTopicPayload } from 'lib/fixtures/topics';
+import ClusterContext from 'components/contexts/ClusterContext';
+import userEvent from '@testing-library/user-event';
+import { useDeleteTopic, useTopics } from 'lib/hooks/api/topics';
+import TopicsTable from 'components/Topics/List/TopicsTable';
+import { clusterTopicsPath } from 'lib/paths';
+
+const mockUnwrap = jest.fn();
+const useDispatchMock = () => jest.fn(() => ({ unwrap: mockUnwrap }));
+
+jest.mock('lib/hooks/redux', () => ({
+  ...jest.requireActual('lib/hooks/redux'),
+  useAppDispatch: useDispatchMock,
+}));
+
+jest.mock('lib/hooks/api/topics', () => ({
+  ...jest.requireActual('lib/hooks/api/topics'),
+  useDeleteTopic: jest.fn(),
+  useTopics: jest.fn(),
+}));
+
+const deleteTopicMock = jest.fn();
+const refetchMock = jest.fn();
+
+const clusterName = 'test-cluster';
+
+const getCheckboxInput = (at: number) => {
+  const rows = screen.getAllByRole('row');
+  return within(rows[at + 1]).getByRole('checkbox');
+};
+
+describe('TopicsTable Component', () => {
+  beforeEach(() => {
+    (useDeleteTopic as jest.Mock).mockImplementation(() => ({
+      mutateAsync: deleteTopicMock,
+    }));
+    (useTopics as jest.Mock).mockImplementation(() => ({
+      data: {
+        topics: [
+          externalTopicPayload,
+          { ...externalTopicPayload, name: 'test-topic' },
+        ],
+        totalPages: 1,
+      },
+      refetch: refetchMock,
+    }));
+  });
+
+  const renderComponent = () => {
+    return render(
+      <ClusterContext.Provider
+        value={{
+          isReadOnly: false,
+          hasKafkaConnectConfigured: true,
+          hasSchemaRegistryConfigured: true,
+          isTopicDeletionAllowed: true,
+        }}
+      >
+        <WithRoute path={clusterTopicsPath()}>
+          <TopicsTable />
+        </WithRoute>
+      </ClusterContext.Provider>,
+      { initialEntries: [clusterTopicsPath(clusterName)] }
+    );
+  };
+
+  beforeEach(() => {
+    renderComponent();
+  });
+
+  const getButtonByName = (name: string) =>
+    screen.getByRole('button', { name });
+
+  const queryButtonByName = (name: string) =>
+    screen.queryByRole('button', { name });
+
+  it('renders the table', () => {
+    expect(screen.getByRole('table')).toBeInTheDocument();
+  });
+
+  it('renders batch actions bar', () => {
+    expect(screen.getByRole('table')).toBeInTheDocument();
+
+    // check batch actions bar is hidden
+    const firstCheckbox = getCheckboxInput(0);
+    expect(firstCheckbox).not.toBeChecked();
+    expect(queryButtonByName('Delete selected topics')).not.toBeInTheDocument();
+
+    // select firsr row
+    userEvent.click(firstCheckbox);
+    expect(firstCheckbox).toBeChecked();
+
+    // check batch actions bar is shown
+    expect(getButtonByName('Delete selected topics')).toBeInTheDocument();
+    expect(getButtonByName('Copy selected topic')).toBeInTheDocument();
+    expect(
+      getButtonByName('Purge messages of selected topics')
+    ).toBeInTheDocument();
+
+    // select second row
+    const secondCheckbox = getCheckboxInput(1);
+    expect(secondCheckbox).not.toBeChecked();
+    userEvent.click(secondCheckbox);
+    expect(secondCheckbox).toBeChecked();
+
+    // check batch actions bar is still shown
+    expect(getButtonByName('Delete selected topics')).toBeInTheDocument();
+    expect(
+      getButtonByName('Purge messages of selected topics')
+    ).toBeInTheDocument();
+
+    // check Copy button is hidden
+    expect(queryButtonByName('Copy selected topic')).not.toBeInTheDocument();
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      userEvent.click(getCheckboxInput(0));
+      userEvent.click(getCheckboxInput(1));
+    });
+
+    it('handels delete button click', async () => {
+      const button = getButtonByName('Delete selected topics');
+      expect(button).toBeInTheDocument();
+
+      await act(() => userEvent.click(button));
+
+      expect(
+        screen.getByText('Are you sure you want to remove selected topics?')
+      ).toBeInTheDocument();
+
+      const confirmBtn = getButtonByName('Confirm');
+      expect(confirmBtn).toBeInTheDocument();
+      expect(deleteTopicMock).not.toHaveBeenCalled();
+      await act(() => userEvent.click(confirmBtn));
+
+      expect(deleteTopicMock).toHaveBeenCalledTimes(2);
+
+      expect(getCheckboxInput(0)).not.toBeChecked();
+      expect(getCheckboxInput(1)).not.toBeChecked();
+    });
+
+    it('handels purge messages button click', async () => {
+      const button = getButtonByName('Purge messages of selected topics');
+      expect(button).toBeInTheDocument();
+
+      await act(() => userEvent.click(button));
+
+      expect(
+        screen.getByText(
+          'Are you sure you want to purge messages of selected topics?'
+        )
+      ).toBeInTheDocument();
+
+      const confirmBtn = getButtonByName('Confirm');
+      expect(confirmBtn).toBeInTheDocument();
+      expect(mockUnwrap).not.toHaveBeenCalled();
+      await act(() => userEvent.click(confirmBtn));
+      expect(mockUnwrap).toHaveBeenCalledTimes(2);
+
+      expect(getCheckboxInput(0)).not.toBeChecked();
+      expect(getCheckboxInput(1)).not.toBeChecked();
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx
index e3e684609ed..008159acd5b 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx
@@ -4,11 +4,12 @@ import {
   MessagesCell,
   OutOfSyncReplicasCell,
   TitleCell,
+  TopicSizeCell,
 } from 'components/Topics/List/TopicsTableCells';
 import { TableState } from 'lib/hooks/useTableState';
 import { screen } from '@testing-library/react';
 import { Topic } from 'generated-sources';
-import { topicsPayload } from 'redux/reducers/topics/__test__/fixtures';
+import { topicsPayload } from 'lib/fixtures/topics';
 
 describe('TopicsTableCells Components', () => {
   const mockTableState: TableState<Topic, string> = {
@@ -49,8 +50,22 @@ describe('TopicsTableCells Components', () => {
     });
   });
 
+  describe('TopicSizeCell Component', () => {
+    const currentData = topicsPayload[1];
+    it('should check the TopicSizeCell component Render', () => {
+      render(
+        <TopicSizeCell
+          rowIndex={1}
+          dataItem={currentData}
+          tableState={mockTableState}
+        />
+      );
+      expect(screen.getByText('1KB')).toBeInTheDocument();
+    });
+  });
+
   describe('OutOfSyncReplicasCell Component', () => {
-    it('should check the content of the OutOfSyncReplicasCell to return 0 if no partition is empty array', () => {
+    it('returns 0 if no partition is empty array', () => {
       const currentData = topicsPayload[0];
       currentData.partitions = [];
       render(
@@ -63,7 +78,7 @@ describe('TopicsTableCells Components', () => {
       expect(screen.getByText('0')).toBeInTheDocument();
     });
 
-    it('should check the content of the OutOfSyncReplicasCell to return 0 if no partition is found', () => {
+    it('returns 0 if no partition is found', () => {
       const currentData = topicsPayload[1];
       currentData.partitions = undefined;
       render(
@@ -76,6 +91,29 @@ describe('TopicsTableCells Components', () => {
       expect(screen.getByText('0')).toBeInTheDocument();
     });
 
+    it('returns number of out of sync partitions', () => {
+      const currentData = {
+        ...topicsPayload[1],
+        partitions: [
+          {
+            partition: 0,
+            leader: 1,
+            replicas: [{ broker: 1, leader: false, inSync: false }],
+            offsetMax: 0,
+            offsetMin: 0,
+          },
+        ],
+      };
+      render(
+        <OutOfSyncReplicasCell
+          rowIndex={1}
+          dataItem={currentData}
+          tableState={mockTableState}
+        />
+      );
+      expect(screen.getByText('1')).toBeInTheDocument();
+    });
+
     it('should check the content of the OutOfSyncReplicasCell with the correct partition number', () => {
       const currentData = topicsPayload[0];
       const partitionNumber = currentData.partitions?.reduce(
@@ -100,50 +138,52 @@ describe('TopicsTableCells Components', () => {
   });
 
   describe('MessagesCell Component', () => {
-    it('should check the content of the MessagesCell to return 0 if no partition is empty array ', () => {
-      const currentData = topicsPayload[0];
-      currentData.partitions = [];
+    it('returns 0 if partition is empty array ', () => {
       render(
         <MessagesCell
           rowIndex={1}
-          dataItem={topicsPayload[0]}
+          dataItem={{ ...topicsPayload[0], partitions: [] }}
           tableState={mockTableState}
         />
       );
       expect(screen.getByText('0')).toBeInTheDocument();
     });
 
-    it('should check the content of the MessagesCell to return 0 if no partition is found', () => {
-      const currentData = topicsPayload[0];
-      currentData.partitions = undefined;
+    it('returns 0 if no partition is found', () => {
       render(
         <MessagesCell
           rowIndex={1}
-          dataItem={topicsPayload[0]}
+          dataItem={{ ...topicsPayload[0], partitions: undefined }}
           tableState={mockTableState}
         />
       );
       expect(screen.getByText('0')).toBeInTheDocument();
     });
 
-    it('should check the content of the MessagesCell with the correct partition number', () => {
-      const currentData = topicsPayload[0];
-      const partitionNumber = currentData.partitions?.reduce(
-        (memo, { offsetMax, offsetMin }) => {
-          return memo + (offsetMax - offsetMin);
-        },
-        0
-      );
+    it('returns the correct messages number', () => {
+      const offsetMax = 10034;
+      const offsetMin = 345;
+      const currentData = {
+        ...topicsPayload[0],
+        partitions: [
+          {
+            partition: 0,
+            leader: 1,
+            replicas: [{ broker: 1, leader: false, inSync: false }],
+            offsetMax,
+            offsetMin,
+          },
+        ],
+      };
       render(
         <MessagesCell
           rowIndex={1}
-          dataItem={topicsPayload[0]}
+          dataItem={currentData}
           tableState={mockTableState}
         />
       );
-      expect(
-        screen.getByText(partitionNumber ? partitionNumber.toString() : '0')
-      ).toBeInTheDocument();
+      expect(offsetMax - offsetMin).toEqual(9689);
+      expect(screen.getByText(offsetMax - offsetMin)).toBeInTheDocument();
     });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/New/New.tsx b/kafka-ui-react-app/src/components/Topics/New/New.tsx
index 7faefb36c9d..d2975929db6 100644
--- a/kafka-ui-react-app/src/components/Topics/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/New.tsx
@@ -4,13 +4,11 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { ClusterNameRoute } from 'lib/paths';
 import TopicForm from 'components/Topics/shared/Form/TopicForm';
 import { useNavigate, useLocation } from 'react-router-dom';
-import { createTopic } from 'redux/reducers/topics/topicsSlice';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { topicFormValidationSchema } from 'lib/yupExtended';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
-import { AsyncRequestStatus } from 'lib/constants';
+import { useCreateTopic } from 'lib/hooks/api/topics';
 
 enum Filters {
   NAME = 'name',
@@ -27,10 +25,11 @@ const New: React.FC = () => {
   });
 
   const { clusterName } = useAppParams<ClusterNameRoute>();
+  const createTopic = useCreateTopic(clusterName);
+
   const navigate = useNavigate();
 
   const { search } = useLocation();
-  const dispatch = useAppDispatch();
   const params = new URLSearchParams(search);
 
   const name = params.get(Filters.NAME) || '';
@@ -40,11 +39,8 @@ const New: React.FC = () => {
   const cleanUpPolicy = params.get(Filters.CLEANUP_POLICY) || 'Delete';
 
   const onSubmit = async (data: TopicFormData) => {
-    const { meta } = await dispatch(createTopic({ clusterName, data }));
-
-    if (meta.requestStatus === AsyncRequestStatus.fulfilled) {
-      navigate(`../${data.name}`);
-    }
+    await createTopic.mutateAsync(data);
+    navigate(`../${data.name}`);
   };
 
   return (
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index 0f76b0e9781..a15ef31f680 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -9,7 +9,7 @@ import {
 } from 'lib/paths';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
-import { useAppDispatch } from 'lib/hooks/redux';
+import { useCreateTopic } from 'lib/hooks/api/topics';
 
 const clusterName = 'local';
 const topicName = 'test-topic';
@@ -19,9 +19,9 @@ jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useNavigate: () => mockNavigate,
 }));
-jest.mock('lib/hooks/redux', () => ({
-  ...jest.requireActual('lib/hooks/redux'),
-  useAppDispatch: jest.fn(),
+
+jest.mock('lib/hooks/api/topics', () => ({
+  useCreateTopic: jest.fn(),
 }));
 
 const renderComponent = (path: string) => {
@@ -34,15 +34,20 @@ const renderComponent = (path: string) => {
     { initialEntries: [path] }
   );
 };
+const createTopicMock = jest.fn();
 
 describe('New', () => {
+  beforeEach(() => {
+    (useCreateTopic as jest.Mock).mockImplementation(() => ({
+      mutateAsync: createTopicMock,
+    }));
+  });
   afterEach(() => {
     mockNavigate.mockClear();
   });
 
   it('checks header for create new', async () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-
     expect(
       screen.getByRole('heading', { name: 'Create new Topic' })
     ).toHaveTextContent('Create new Topic');
@@ -68,15 +73,11 @@ describe('New', () => {
     await waitFor(() => {
       expect(screen.getByText('name is a required field')).toBeInTheDocument();
     });
+    expect(createTopicMock).not.toHaveBeenCalled();
     expect(mockNavigate).not.toHaveBeenCalled();
   });
 
   it('submits valid form', async () => {
-    const useDispatchMock = jest.fn(() => ({
-      meta: { requestStatus: 'fulfilled' },
-    }));
-    (useAppDispatch as jest.Mock).mockImplementation(() => useDispatchMock);
-
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
     await act(() => {
       userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
@@ -84,38 +85,9 @@ describe('New', () => {
     await act(() => {
       userEvent.click(screen.getByText('Create topic'));
     });
-    await waitFor(() => expect(useDispatchMock).toHaveBeenCalledTimes(1));
+    await waitFor(() => expect(createTopicMock).toHaveBeenCalledTimes(1));
     await waitFor(() =>
       expect(mockNavigate).toHaveBeenLastCalledWith(`../${topicName}`)
     );
   });
-
-  it('does not redirect page when request is not fulfilled', async () => {
-    const useDispatchMock = jest.fn(() => ({
-      meta: { requestStatus: 'pending' },
-    }));
-    (useAppDispatch as jest.Mock).mockImplementation(() => useDispatchMock);
-    await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    await act(() =>
-      userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName)
-    );
-    await act(() => userEvent.click(screen.getByText('Create topic')));
-    expect(mockNavigate).not.toHaveBeenCalled();
-  });
-
-  it('submits valid form that result in an error', async () => {
-    const useDispatchMock = jest.fn();
-    (useAppDispatch as jest.Mock).mockImplementation(() => useDispatchMock);
-
-    await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    await act(() => {
-      userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
-    });
-    await act(() => {
-      userEvent.click(screen.getByText('Create topic'));
-    });
-
-    expect(useDispatchMock).toHaveBeenCalledTimes(1);
-    expect(mockNavigate).not.toHaveBeenCalled();
-  });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx
index ec3cb5c4931..a5153806c55 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx
@@ -1,89 +1,65 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { ClusterName, TopicName } from 'redux/interfaces';
 import { clusterConsumerGroupsPath, RouteParamsClusterTopic } from 'lib/paths';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
-import PageLoader from 'components/common/PageLoader/PageLoader';
 import getTagColor from 'components/common/Tag/getTagColor';
-import { useAppSelector } from 'lib/hooks/redux';
-import { getTopicConsumerGroups } from 'redux/reducers/topics/selectors';
 import useAppParams from 'lib/hooks/useAppParams';
+import { useTopicConsumerGroups } from 'lib/hooks/api/topics';
 
-export interface Props {
-  isFetched: boolean;
-  fetchTopicConsumerGroups(payload: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-  }): void;
-}
-
-const TopicConsumerGroups: React.FC<Props> = ({
-  fetchTopicConsumerGroups,
-  isFetched,
-}) => {
+const TopicConsumerGroups: React.FC = () => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
 
-  const consumerGroups = useAppSelector((state) =>
-    getTopicConsumerGroups(state, topicName)
-  );
-
-  React.useEffect(() => {
-    fetchTopicConsumerGroups({ clusterName, topicName });
-  }, [clusterName, fetchTopicConsumerGroups, topicName]);
-
-  if (!isFetched) {
-    return <PageLoader />;
-  }
-
+  const { data: consumerGroups } = useTopicConsumerGroups({
+    clusterName,
+    topicName,
+  });
   return (
-    <div>
-      <Table isFullwidth>
-        <thead>
+    <Table isFullwidth>
+      <thead>
+        <tr>
+          <TableHeaderCell title="Consumer Group ID" />
+          <TableHeaderCell title="Num Of Members" />
+          <TableHeaderCell title="Messages Behind" />
+          <TableHeaderCell title="Coordinator" />
+          <TableHeaderCell title="State" />
+        </tr>
+      </thead>
+      <tbody>
+        {consumerGroups?.map((consumer) => (
+          <tr key={consumer.groupId}>
+            <TableKeyLink>
+              <Link
+                to={`${clusterConsumerGroupsPath(clusterName)}/${
+                  consumer.groupId
+                }`}
+              >
+                {consumer.groupId}
+              </Link>
+            </TableKeyLink>
+            <td>{consumer.members}</td>
+            <td>{consumer.messagesBehind}</td>
+            <td>{consumer.coordinator?.id}</td>
+            <td>
+              {consumer.state && (
+                <Tag color={getTagColor(consumer)}>{`${consumer.state
+                  .charAt(0)
+                  .toUpperCase()}${consumer.state
+                  .slice(1)
+                  .toLowerCase()}`}</Tag>
+              )}
+            </td>
+          </tr>
+        ))}
+        {(!consumerGroups || consumerGroups.length === 0) && (
           <tr>
-            <TableHeaderCell title="Consumer Group ID" />
-            <TableHeaderCell title="Num Of Members" />
-            <TableHeaderCell title="Messages Behind" />
-            <TableHeaderCell title="Coordinator" />
-            <TableHeaderCell title="State" />
+            <td colSpan={10}>No active consumer groups</td>
           </tr>
-        </thead>
-        <tbody>
-          {consumerGroups.map((consumer) => (
-            <tr key={consumer.groupId}>
-              <TableKeyLink>
-                <Link
-                  to={`${clusterConsumerGroupsPath(clusterName)}/${
-                    consumer.groupId
-                  }`}
-                >
-                  {consumer.groupId}
-                </Link>
-              </TableKeyLink>
-              <td>{consumer.members}</td>
-              <td>{consumer.messagesBehind}</td>
-              <td>{consumer.coordinator?.id}</td>
-              <td>
-                {consumer.state && (
-                  <Tag color={getTagColor(consumer)}>{`${consumer.state
-                    .charAt(0)
-                    .toUpperCase()}${consumer.state
-                    .slice(1)
-                    .toLowerCase()}`}</Tag>
-                )}
-              </td>
-            </tr>
-          ))}
-          {consumerGroups.length === 0 && (
-            <tr>
-              <td colSpan={10}>No active consumer groups</td>
-            </tr>
-          )}
-        </tbody>
-      </Table>
-    </div>
+        )}
+      </tbody>
+    </Table>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroupsContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroupsContainer.ts
deleted file mode 100644
index e60e0293df9..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroupsContainer.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import { fetchTopicConsumerGroups } from 'redux/reducers/topics/topicsSlice';
-import TopicConsumerGroups from 'components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups';
-import { getTopicsConsumerGroupsFetched } from 'redux/reducers/topics/selectors';
-
-const mapStateToProps = (state: RootState) => ({
-  isFetched: getTopicsConsumerGroupsFetched(state),
-});
-
-const mapDispatchToProps = {
-  fetchTopicConsumerGroups,
-};
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(TopicConsumerGroups);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx
index b631dbe2061..b3cec0f4bab 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx
@@ -1,96 +1,49 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
-import TopicConsumerGroups, {
-  Props,
-} from 'components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups';
-import { ConsumerGroup, ConsumerGroupState } from 'generated-sources';
-import { getTopicStateFixtures } from 'redux/reducers/topics/__test__/fixtures';
-import { TopicWithDetailedInfo } from 'redux/interfaces';
+import TopicConsumerGroups from 'components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups';
 import { clusterTopicConsumerGroupsPath } from 'lib/paths';
+import { useTopicConsumerGroups } from 'lib/hooks/api/topics';
+import { ConsumerGroup } from 'generated-sources';
+import { topicConsumerGroups } from 'lib/fixtures/topics';
 
-describe('TopicConsumerGroups', () => {
-  const mockClusterName = 'localClusterName';
-  const mockTopicName = 'localTopicName';
-  const mockWithConsumerGroup = [
-    {
-      groupId: 'amazon.msk.canary.group.broker-7',
-      topics: 0,
-      members: 0,
-      simple: false,
-      partitionAssignor: '',
-      state: ConsumerGroupState.UNKNOWN,
-      coordinator: { id: 1 },
-      messagesBehind: 9,
-    },
-    {
-      groupId: 'amazon.msk.canary.group.broker-4',
-      topics: 0,
-      members: 0,
-      simple: false,
-      partitionAssignor: '',
-      state: ConsumerGroupState.COMPLETING_REBALANCE,
-      coordinator: { id: 1 },
-      messagesBehind: 9,
-    },
-  ];
+const clusterName = 'local';
+const topicName = 'my-topicName';
+const path = clusterTopicConsumerGroupsPath(clusterName, topicName);
+
+jest.mock('lib/hooks/api/topics', () => ({
+  useTopicConsumerGroups: jest.fn(),
+}));
 
-  const setUpComponent = (
-    props: Partial<Props> = {},
-    consumerGroups?: ConsumerGroup[]
-  ) => {
-    const topic: TopicWithDetailedInfo = {
-      name: mockTopicName,
-      consumerGroups,
-    };
-    const topicsState = getTopicStateFixtures([topic]);
+describe('TopicConsumerGroups', () => {
+  const renderComponent = async (payload?: ConsumerGroup[]) => {
+    (useTopicConsumerGroups as jest.Mock).mockImplementation(() => ({
+      data: payload,
+    }));
 
-    return render(
+    render(
       <WithRoute path={clusterTopicConsumerGroupsPath()}>
-        <TopicConsumerGroups
-          fetchTopicConsumerGroups={jest.fn()}
-          isFetched={false}
-          {...props}
-        />
+        <TopicConsumerGroups />
       </WithRoute>,
-      {
-        initialEntries: [
-          clusterTopicConsumerGroupsPath(mockClusterName, mockTopicName),
-        ],
-        preloadedState: {
-          topics: topicsState,
-        },
-      }
+      { initialEntries: [path] }
     );
   };
 
-  describe('Default Setup', () => {
-    beforeEach(() => {
-      setUpComponent();
-    });
-    it('should view the Page loader when it is fetching state', () => {
-      expect(screen.getByRole('progressbar')).toBeInTheDocument();
-    });
+  it('renders empty table if consumer groups payload is empty', async () => {
+    await renderComponent([]);
+    expect(screen.getByText('No active consumer groups')).toBeInTheDocument();
   });
 
-  it("don't render ConsumerGroups in Topic", () => {
-    setUpComponent({ isFetched: true });
-    expect(screen.getByText(/No active consumer groups/i)).toBeInTheDocument();
+  it('renders empty table if consumer groups payload is undefined', async () => {
+    await renderComponent();
+    expect(screen.getByText('No active consumer groups')).toBeInTheDocument();
   });
 
-  it('render ConsumerGroups in Topic', () => {
-    setUpComponent(
-      {
-        isFetched: true,
-      },
-      mockWithConsumerGroup
+  it('renders table of consumer groups', async () => {
+    await renderComponent(topicConsumerGroups);
+    const groupIds = topicConsumerGroups.map(({ groupId }) => groupId);
+    groupIds.forEach((groupId) =>
+      expect(screen.getByText(groupId)).toBeInTheDocument()
     );
-    expect(screen.getAllByRole('rowgroup')).toHaveLength(2);
-    expect(
-      screen.getByText(mockWithConsumerGroup[0].groupId)
-    ).toBeInTheDocument();
-    expect(
-      screen.getByText(mockWithConsumerGroup[1].groupId)
-    ).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
index 2fb13af8d1d..39aca5f46be 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
@@ -1,5 +1,4 @@
-import React from 'react';
-import { ClusterName, TopicName } from 'redux/interfaces';
+import React, { Suspense } from 'react';
 import { NavLink, Route, Routes, useNavigate } from 'react-router-dom';
 import {
   RouteParamsClusterTopic,
@@ -14,37 +13,26 @@ import PageHeading from 'components/common/PageHeading/PageHeading';
 import { Button } from 'components/common/Button/Button';
 import styled from 'styled-components';
 import Navbar from 'components/common/Navigation/Navbar.styled';
-import { useAppSelector } from 'lib/hooks/redux';
-import {
-  getIsTopicDeletePolicy,
-  getIsTopicInternal,
-} from 'redux/reducers/topics/selectors';
+import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import {
   Dropdown,
   DropdownItem,
   DropdownItemHint,
 } from 'components/common/Dropdown';
+import {
+  useDeleteTopic,
+  useRecreateTopic,
+  useTopicDetails,
+} from 'lib/hooks/api/topics';
+import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
+import { CleanUpPolicy } from 'generated-sources';
+import PageLoader from 'components/common/PageLoader/PageLoader';
 
-import OverviewContainer from './Overview/OverviewContainer';
-import TopicConsumerGroupsContainer from './ConsumerGroups/TopicConsumerGroupsContainer';
-import SettingsContainer from './Settings/SettingsContainer';
 import Messages from './Messages/Messages';
-
-interface Props {
-  deleteTopic: (payload: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-  }) => void;
-  recreateTopic: (payload: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-  }) => void;
-  clearTopicMessages(params: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-  }): void;
-}
+import Overview from './Overview/Overview';
+import Settings from './Settings/Settings';
+import TopicConsumerGroups from './ConsumerGroups/TopicConsumerGroups';
 
 const HeaderControlsWrapper = styled.div`
   display: flex;
@@ -53,25 +41,19 @@ const HeaderControlsWrapper = styled.div`
   gap: 26px;
 `;
 
-const Details: React.FC<Props> = ({
-  deleteTopic,
-  recreateTopic,
-  clearTopicMessages,
-}) => {
+const Details: React.FC = () => {
+  const dispatch = useAppDispatch();
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
-  const isInternal = useAppSelector((state) =>
-    getIsTopicInternal(state, topicName)
-  );
-  const isDeletePolicy = useAppSelector((state) =>
-    getIsTopicDeletePolicy(state, topicName)
-  );
   const navigate = useNavigate();
+  const deleteTopic = useDeleteTopic(clusterName);
+  const recreateTopic = useRecreateTopic({ clusterName, topicName });
+  const { data } = useTopicDetails({ clusterName, topicName });
 
   const { isReadOnly, isTopicDeletionAllowed } =
     React.useContext(ClusterContext);
 
-  const deleteTopicHandler = () => {
-    deleteTopic({ clusterName, topicName });
+  const deleteTopicHandler = async () => {
+    await deleteTopic.mutateAsync(topicName);
     navigate('../..');
   };
 
@@ -94,7 +76,7 @@ const Details: React.FC<Props> = ({
               }
             />
           </Routes>
-          {!isReadOnly && !isInternal && (
+          {!isReadOnly && !data?.internal && (
             <Routes>
               <Route
                 index
@@ -110,11 +92,12 @@ const Details: React.FC<Props> = ({
                         especially important consequences.
                       </DropdownItemHint>
                     </DropdownItem>
-                    {isDeletePolicy && (
+                    {data?.cleanUpPolicy === CleanUpPolicy.DELETE && (
                       <DropdownItem
-                        disabled={!isDeletePolicy}
                         onClick={() =>
-                          clearTopicMessages({ clusterName, topicName })
+                          dispatch(
+                            clearTopicMessages({ clusterName, topicName })
+                          ).unwrap()
                         }
                         confirm="Are you sure want to clear topic messages?"
                         danger
@@ -123,7 +106,7 @@ const Details: React.FC<Props> = ({
                       </DropdownItem>
                     )}
                     <DropdownItem
-                      onClick={() => recreateTopic({ clusterName, topicName })}
+                      onClick={recreateTopic.mutateAsync}
                       confirm={
                         <>
                           Are you sure want to recreate <b>{topicName}</b>{' '}
@@ -182,18 +165,23 @@ const Details: React.FC<Props> = ({
           Settings
         </NavLink>
       </Navbar>
-      <Routes>
-        <Route index element={<OverviewContainer />} />
-        <Route path={clusterTopicMessagesRelativePath} element={<Messages />} />
-        <Route
-          path={clusterTopicSettingsRelativePath}
-          element={<SettingsContainer />}
-        />
-        <Route
-          path={clusterTopicConsumerGroupsRelativePath}
-          element={<TopicConsumerGroupsContainer />}
-        />
-      </Routes>
+      <Suspense fallback={<PageLoader />}>
+        <Routes>
+          <Route index element={<Overview />} />
+          <Route
+            path={clusterTopicMessagesRelativePath}
+            element={<Messages />}
+          />
+          <Route
+            path={clusterTopicSettingsRelativePath}
+            element={<Settings />}
+          />
+          <Route
+            path={clusterTopicConsumerGroupsRelativePath}
+            element={<TopicConsumerGroups />}
+          />
+        </Routes>
+      </Suspense>
     </div>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/DetailsContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/DetailsContainer.ts
deleted file mode 100644
index 325d4d84e2b..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/DetailsContainer.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import { deleteTopic, recreateTopic } from 'redux/reducers/topics/topicsSlice';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import { getIsTopicDeleted } from 'redux/reducers/topics/selectors';
-
-import Details from './Details';
-
-const mapStateToProps = (state: RootState) => ({
-  isDeleted: getIsTopicDeleted(state),
-});
-
-const mapDispatchToProps = {
-  recreateTopic,
-  deleteTopic,
-  clearTopicMessages,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Details);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
index c4512078bb0..3c9dd8af295 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
@@ -26,8 +26,6 @@ import FilterModal, {
 import { SeekDirectionOptions } from 'components/Topics/Topic/Details/Messages/Messages';
 import TopicMessagesContext from 'components/contexts/TopicMessagesContext';
 import useModal from 'lib/hooks/useModal';
-import { getPartitionsByTopicName } from 'redux/reducers/topics/selectors';
-import { useAppSelector } from 'lib/hooks/redux';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import PlusIcon from 'components/common/Icons/PlusIcon';
@@ -35,6 +33,7 @@ import CloseIcon from 'components/common/Icons/CloseIcon';
 import ClockIcon from 'components/common/Icons/ClockIcon';
 import ArrowDownIcon from 'components/common/Icons/ArrowDownIcon';
 import FileIcon from 'components/common/Icons/FileIcon';
+import { useTopicDetails } from 'lib/hooks/api/topics';
 
 import * as S from './Filters.styled';
 import {
@@ -89,9 +88,9 @@ const Filters: React.FC<FiltersProps> = ({
   const location = useLocation();
   const navigate = useNavigate();
 
-  const partitions = useAppSelector((state) =>
-    getPartitionsByTopicName(state, topicName)
-  );
+  const { data: topic } = useTopicDetails({ clusterName, topicName });
+
+  const partitions = topic?.partitions || [];
 
   const { searchParams, seekDirection, isLive, changeSeekDirection } =
     useContext(TopicMessagesContext);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx
index a633e1c52ce..e4cf911ad77 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx
@@ -4,13 +4,20 @@ import Filters, {
   FiltersProps,
   SeekTypeOptions,
 } from 'components/Topics/Topic/Details/Messages/Filters/Filters';
-import { EventSourceMock, render } from 'lib/testHelpers';
+import { EventSourceMock, render, WithRoute } from 'lib/testHelpers';
 import { act, screen, within, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import TopicMessagesContext, {
   ContextProps,
 } from 'components/contexts/TopicMessagesContext';
 import { SeekDirection } from 'generated-sources';
+import { clusterTopicPath } from 'lib/paths';
+import { useTopicDetails } from 'lib/hooks/api/topics';
+import { externalTopicPayload } from 'lib/fixtures/topics';
+
+jest.mock('lib/hooks/api/topics', () => ({
+  useTopicDetails: jest.fn(),
+}));
 
 const defaultContextValue: ContextProps = {
   isLive: false,
@@ -21,26 +28,38 @@ const defaultContextValue: ContextProps = {
 
 jest.mock('components/common/Icons/CloseIcon', () => () => 'mock-CloseIcon');
 
+const clusterName = 'cluster-name';
+const topicName = 'topic-name';
+
 const renderComponent = (
   props: Partial<FiltersProps> = {},
   ctx: ContextProps = defaultContextValue
 ) => {
   render(
-    <TopicMessagesContext.Provider value={ctx}>
-      <Filters
-        meta={{}}
-        isFetching={false}
-        addMessage={jest.fn()}
-        resetMessages={jest.fn()}
-        updatePhase={jest.fn()}
-        updateMeta={jest.fn()}
-        setIsFetching={jest.fn()}
-        {...props}
-      />
-    </TopicMessagesContext.Provider>
+    <WithRoute path={clusterTopicPath()}>
+      <TopicMessagesContext.Provider value={ctx}>
+        <Filters
+          meta={{}}
+          isFetching={false}
+          addMessage={jest.fn()}
+          resetMessages={jest.fn()}
+          updatePhase={jest.fn()}
+          updateMeta={jest.fn()}
+          setIsFetching={jest.fn()}
+          {...props}
+        />
+      </TopicMessagesContext.Provider>
+    </WithRoute>,
+    { initialEntries: [clusterTopicPath(clusterName, topicName)] }
   );
 };
 
+beforeEach(async () => {
+  (useTopicDetails as jest.Mock).mockImplementation(() => ({
+    data: externalTopicPayload,
+  }));
+});
+
 describe('Filters component', () => {
   Object.defineProperty(window, 'EventSource', {
     value: EventSourceMock,
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Messages.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Messages.spec.tsx
index cca37c518f5..ca18669235d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Messages.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Messages.spec.tsx
@@ -1,20 +1,27 @@
 import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
-import { render, EventSourceMock } from 'lib/testHelpers';
+import { render, EventSourceMock, WithRoute } from 'lib/testHelpers';
 import Messages, {
   SeekDirectionOptions,
   SeekDirectionOptionsObj,
 } from 'components/Topics/Topic/Details/Messages/Messages';
 import { SeekDirection, SeekType } from 'generated-sources';
 import userEvent from '@testing-library/user-event';
+import { clusterTopicMessagesPath } from 'lib/paths';
 
 describe('Messages', () => {
   const searchParams = `?filterQueryType=STRING_CONTAINS&attempt=0&limit=100&seekDirection=${SeekDirection.FORWARD}&seekType=${SeekType.OFFSET}&seekTo=0::9`;
-
-  const setUpComponent = (param: string = searchParams) => {
-    return render(<Messages />, {
-      initialEntries: [`/?${new URLSearchParams(param).toString()}`],
-    });
+  const renderComponent = (param: string = searchParams) => {
+    const query = new URLSearchParams(param).toString();
+    const path = `${clusterTopicMessagesPath()}?${query}`;
+    return render(
+      <WithRoute path={clusterTopicMessagesPath()}>
+        <Messages />
+      </WithRoute>,
+      {
+        initialEntries: [path],
+      }
+    );
   };
 
   beforeEach(() => {
@@ -24,7 +31,7 @@ describe('Messages', () => {
   });
   describe('component rendering default behavior with the search params', () => {
     beforeEach(() => {
-      setUpComponent();
+      renderComponent();
     });
     it('should check default seekDirection if it actually take the value from the url', () => {
       expect(screen.getAllByRole('listbox')[1]).toHaveTextContent(
@@ -69,7 +76,7 @@ describe('Messages', () => {
 
   describe('Component rendering with custom Url search params', () => {
     it('reacts to a change of seekDirection in the url which make the select pick up different value', () => {
-      setUpComponent(
+      renderComponent(
         searchParams.replace(SeekDirection.FORWARD, SeekDirection.BACKWARD)
       );
       expect(screen.getAllByRole('listbox')[1]).toHaveTextContent(
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
index caee12e232c..d69c0057743 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
@@ -1,55 +1,32 @@
 import React from 'react';
 import { Partition, Replica } from 'generated-sources';
-import { ClusterName, TopicName } from 'redux/interfaces';
 import ClusterContext from 'components/contexts/ClusterContext';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
-import { useAppSelector } from 'lib/hooks/redux';
-import { getTopicByName } from 'redux/reducers/topics/selectors';
+import { useAppDispatch } from 'lib/hooks/redux';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
+import { useTopicDetails } from 'lib/hooks/api/topics';
 
 import * as S from './Overview.styled';
 
-export interface Props {
-  clearTopicMessages(params: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-    partitions?: number[];
-  }): void;
-}
-
-const Overview: React.FC<Props> = ({ clearTopicMessages }) => {
+const Overview: React.FC = () => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
-
-  const {
-    partitions,
-    underReplicatedPartitions,
-    inSyncReplicas,
-    replicas,
-    partitionCount,
-    internal,
-    replicationFactor,
-    segmentSize,
-    segmentCount,
-    cleanUpPolicy,
-  } = useAppSelector((state) => {
-    const res = getTopicByName(state, topicName);
-    return res || {};
-  });
-
+  const dispatch = useAppDispatch();
+  const { data } = useTopicDetails({ clusterName, topicName });
   const { isReadOnly } = React.useContext(ClusterContext);
 
   const messageCount = React.useMemo(
     () =>
-      (partitions || []).reduce((memo, partition) => {
+      (data?.partitions || []).reduce((memo, partition) => {
         return memo + partition.offsetMax - partition.offsetMin;
       }, 0),
-    [partitions]
+    [data]
   );
 
   return (
@@ -57,46 +34,56 @@ const Overview: React.FC<Props> = ({ clearTopicMessages }) => {
       <Metrics.Wrapper>
         <Metrics.Section>
           <Metrics.Indicator label="Partitions">
-            {partitionCount}
+            {data?.partitionCount}
           </Metrics.Indicator>
           <Metrics.Indicator label="Replication Factor">
-            {replicationFactor}
+            {data?.replicationFactor}
           </Metrics.Indicator>
           <Metrics.Indicator
             label="URP"
             title="Under replicated partitions"
             isAlert
-            alertType={underReplicatedPartitions === 0 ? 'success' : 'error'}
+            alertType={
+              data?.underReplicatedPartitions === 0 ? 'success' : 'error'
+            }
           >
-            {underReplicatedPartitions === 0 ? (
-              <Metrics.LightText>{underReplicatedPartitions}</Metrics.LightText>
+            {data?.underReplicatedPartitions === 0 ? (
+              <Metrics.LightText>
+                {data?.underReplicatedPartitions}
+              </Metrics.LightText>
             ) : (
-              <Metrics.RedText>{underReplicatedPartitions}</Metrics.RedText>
+              <Metrics.RedText>
+                {data?.underReplicatedPartitions}
+              </Metrics.RedText>
             )}
           </Metrics.Indicator>
           <Metrics.Indicator
             label="In Sync Replicas"
             isAlert
-            alertType={inSyncReplicas === replicas ? 'success' : 'error'}
+            alertType={
+              data?.inSyncReplicas === data?.replicas ? 'success' : 'error'
+            }
           >
-            {inSyncReplicas && replicas && inSyncReplicas < replicas ? (
-              <Metrics.RedText>{inSyncReplicas}</Metrics.RedText>
+            {data?.inSyncReplicas &&
+            data?.replicas &&
+            data?.inSyncReplicas < data?.replicas ? (
+              <Metrics.RedText>{data?.inSyncReplicas}</Metrics.RedText>
             ) : (
-              inSyncReplicas
+              data?.inSyncReplicas
             )}
-            <Metrics.LightText> of {replicas}</Metrics.LightText>
+            <Metrics.LightText> of {data?.replicas}</Metrics.LightText>
           </Metrics.Indicator>
           <Metrics.Indicator label="Type">
-            <Tag color="gray">{internal ? 'Internal' : 'External'}</Tag>
+            <Tag color="gray">{data?.internal ? 'Internal' : 'External'}</Tag>
           </Metrics.Indicator>
           <Metrics.Indicator label="Segment Size" title="">
-            <BytesFormatted value={segmentSize} />
+            <BytesFormatted value={data?.segmentSize} />
           </Metrics.Indicator>
           <Metrics.Indicator label="Segment Count">
-            {segmentCount}
+            {data?.segmentCount}
           </Metrics.Indicator>
           <Metrics.Indicator label="Clean Up Policy">
-            <Tag color="gray">{cleanUpPolicy || 'Unknown'}</Tag>
+            <Tag color="gray">{data?.cleanUpPolicy || 'Unknown'}</Tag>
           </Metrics.Indicator>
           <Metrics.Indicator label="Message Count">
             {messageCount}
@@ -116,7 +103,7 @@ const Overview: React.FC<Props> = ({ clearTopicMessages }) => {
             </tr>
           </thead>
           <tbody>
-            {partitions?.map((partition: Partition) => (
+            {data?.partitions?.map((partition: Partition) => (
               <tr key={`partition-list-item-key-${partition.partition}`}>
                 <td>{partition.partition}</td>
                 <td>
@@ -134,15 +121,19 @@ const Overview: React.FC<Props> = ({ clearTopicMessages }) => {
                 <td>{partition.offsetMax}</td>
                 <td>{partition.offsetMax - partition.offsetMin}</td>
                 <td style={{ width: '5%' }}>
-                  {!internal && !isReadOnly && cleanUpPolicy === 'DELETE' ? (
+                  {!data?.internal &&
+                  !isReadOnly &&
+                  data?.cleanUpPolicy === 'DELETE' ? (
                     <Dropdown>
                       <DropdownItem
                         onClick={() =>
-                          clearTopicMessages({
-                            clusterName,
-                            topicName,
-                            partitions: [partition.partition],
-                          })
+                          dispatch(
+                            clearTopicMessages({
+                              clusterName,
+                              topicName,
+                              partitions: [partition.partition],
+                            })
+                          ).unwrap()
                         }
                         danger
                       >
@@ -153,7 +144,7 @@ const Overview: React.FC<Props> = ({ clearTopicMessages }) => {
                 </td>
               </tr>
             ))}
-            {partitions?.length === 0 && (
+            {data?.partitions?.length === 0 && (
               <tr>
                 <td colSpan={10}>No Partitions found</td>
               </tr>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/OverviewContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/OverviewContainer.ts
deleted file mode 100644
index f32a6028040..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/OverviewContainer.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { connect } from 'react-redux';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import Overview from 'components/Topics/Topic/Details/Overview/Overview';
-
-const mapDispatchToProps = {
-  clearTopicMessages,
-};
-
-export default connect(null, mapDispatchToProps)(Overview);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
index e851f2cb268..945f95f3705 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
@@ -1,74 +1,61 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
-import Overview, {
-  Props as OverviewProps,
-} from 'components/Topics/Topic/Details/Overview/Overview';
+import Overview from 'components/Topics/Topic/Details/Overview/Overview';
 import theme from 'theme/theme';
 import { CleanUpPolicy, Topic } from 'generated-sources';
 import ClusterContext from 'components/contexts/ClusterContext';
 import userEvent from '@testing-library/user-event';
-import { getTopicStateFixtures } from 'redux/reducers/topics/__test__/fixtures';
 import { clusterTopicPath } from 'lib/paths';
 import { Replica } from 'components/Topics/Topic/Details/Overview/Overview.styled';
+import { useTopicDetails } from 'lib/hooks/api/topics';
+import {
+  externalTopicPayload,
+  internalTopicPayload,
+} from 'lib/fixtures/topics';
+
+const clusterName = 'local';
+const topicName = 'topic';
+const defaultContextValues = {
+  isReadOnly: false,
+  hasKafkaConnectConfigured: true,
+  hasSchemaRegistryConfigured: true,
+  isTopicDeletionAllowed: true,
+};
+
+jest.mock('lib/hooks/api/topics', () => ({
+  useTopicDetails: jest.fn(),
+}));
+
+const uwrapMock = jest.fn();
+const useDispatchMock = () => jest.fn(() => ({ unwrap: uwrapMock }));
+
+jest.mock('lib/hooks/redux', () => ({
+  ...jest.requireActual('lib/hooks/redux'),
+  useAppDispatch: useDispatchMock,
+}));
 
 describe('Overview', () => {
-  const mockClusterName = 'local';
-  const mockTopicName = 'topic';
-  const mockTopic = { name: mockTopicName };
-
-  const mockPartitions = [
-    {
-      partition: 1,
-      leader: 1,
-      replicas: [
-        {
-          broker: 1,
-          leader: true,
-          inSync: true,
-        },
-      ],
-      offsetMax: 0,
-      offsetMin: 0,
-    },
-  ];
-  const defaultContextValues = {
-    isReadOnly: false,
-    hasKafkaConnectConfigured: true,
-    hasSchemaRegistryConfigured: true,
-    isTopicDeletionAllowed: true,
-  };
-
-  const setupComponent = (
-    props: Partial<OverviewProps> = {},
-    topicState: Topic = mockTopic,
-    contextValues = defaultContextValues
+  const renderComponent = (
+    topic: Topic = externalTopicPayload,
+    context = defaultContextValues
   ) => {
-    const topics = getTopicStateFixtures([topicState]);
-
+    (useTopicDetails as jest.Mock).mockImplementation(() => ({
+      data: topic,
+    }));
+    const path = clusterTopicPath(clusterName, topicName);
     return render(
       <WithRoute path={clusterTopicPath()}>
-        <ClusterContext.Provider value={contextValues}>
-          <Overview clearTopicMessages={jest.fn()} {...props} />
+        <ClusterContext.Provider value={context}>
+          <Overview />
         </ClusterContext.Provider>
       </WithRoute>,
-      {
-        initialEntries: [clusterTopicPath(mockClusterName, mockTopicName)],
-        preloadedState: { topics },
-      }
+      { initialEntries: [path] }
     );
   };
 
   it('at least one replica was rendered', () => {
-    setupComponent(
-      {},
-      {
-        ...mockTopic,
-        partitions: mockPartitions,
-        internal: false,
-        cleanUpPolicy: CleanUpPolicy.DELETE,
-      }
-    );
+    renderComponent();
     expect(screen.getByLabelText('replica-info')).toBeInTheDocument();
   });
 
@@ -84,42 +71,33 @@ describe('Overview', () => {
 
   describe('when it has internal flag', () => {
     it('renders the Action button for Topic', () => {
-      setupComponent(
-        {},
-        {
-          ...mockTopic,
-          partitions: mockPartitions,
-          internal: false,
-          cleanUpPolicy: CleanUpPolicy.DELETE,
-        }
-      );
+      renderComponent({
+        ...externalTopicPayload,
+        cleanUpPolicy: CleanUpPolicy.DELETE,
+      });
       expect(screen.getAllByLabelText('Dropdown Toggle').length).toEqual(1);
     });
 
     it('does not render Partitions', () => {
-      setupComponent({}, { ...mockTopic, partitions: [] });
-
+      renderComponent({ ...externalTopicPayload, partitions: [] });
       expect(screen.getByText('No Partitions found')).toBeInTheDocument();
     });
   });
 
   describe('should render circular alert', () => {
     it('should be in document', () => {
-      setupComponent();
+      renderComponent();
       const circles = screen.getAllByRole('circle');
       expect(circles.length).toEqual(2);
     });
 
     it('should be the appropriate color', () => {
-      setupComponent(
-        {},
-        {
-          ...mockTopic,
-          underReplicatedPartitions: 0,
-          inSyncReplicas: 1,
-          replicas: 2,
-        }
-      );
+      renderComponent({
+        ...externalTopicPayload,
+        underReplicatedPartitions: 0,
+        inSyncReplicas: 1,
+        replicas: 2,
+      });
       const circles = screen.getAllByRole('circle');
       expect(circles[0]).toHaveStyle(
         `fill: ${theme.circularAlert.color.success}`
@@ -132,31 +110,22 @@ describe('Overview', () => {
 
   describe('when Clear Messages is clicked', () => {
     it('should when Clear Messages is clicked', () => {
-      const mockClearTopicMessages = jest.fn();
-      setupComponent(
-        { clearTopicMessages: mockClearTopicMessages },
-        {
-          ...mockTopic,
-          partitions: mockPartitions,
-          internal: false,
-          cleanUpPolicy: CleanUpPolicy.DELETE,
-        }
-      );
+      renderComponent({
+        ...externalTopicPayload,
+        cleanUpPolicy: CleanUpPolicy.DELETE,
+      });
 
       const clearMessagesButton = screen.getByText('Clear Messages');
       userEvent.click(clearMessagesButton);
-      expect(mockClearTopicMessages).toHaveBeenCalledTimes(1);
+      expect(uwrapMock).toHaveBeenCalledTimes(1);
     });
   });
 
   describe('when the table partition dropdown appearance', () => {
     it('should check if the dropdown is not present when it is readOnly', () => {
-      setupComponent(
-        {},
+      renderComponent(
         {
-          ...mockTopic,
-          partitions: mockPartitions,
-          internal: true,
+          ...internalTopicPayload,
           cleanUpPolicy: CleanUpPolicy.DELETE,
         },
         { ...defaultContextValues, isReadOnly: true }
@@ -165,41 +134,26 @@ describe('Overview', () => {
     });
 
     it('should check if the dropdown is not present when it is internal', () => {
-      setupComponent(
-        {},
-        {
-          ...mockTopic,
-          partitions: mockPartitions,
-          internal: true,
-          cleanUpPolicy: CleanUpPolicy.DELETE,
-        }
-      );
+      renderComponent({
+        ...internalTopicPayload,
+        cleanUpPolicy: CleanUpPolicy.DELETE,
+      });
       expect(screen.queryByText('Clear Messages')).not.toBeInTheDocument();
     });
 
     it('should check if the dropdown is not present when cleanUpPolicy is not DELETE', () => {
-      setupComponent(
-        {},
-        {
-          ...mockTopic,
-          partitions: mockPartitions,
-          internal: false,
-          cleanUpPolicy: CleanUpPolicy.COMPACT,
-        }
-      );
+      renderComponent({
+        ...externalTopicPayload,
+        cleanUpPolicy: CleanUpPolicy.COMPACT,
+      });
       expect(screen.queryByText('Clear Messages')).not.toBeInTheDocument();
     });
 
     it('should check if the dropdown action to be in visible', () => {
-      setupComponent(
-        {},
-        {
-          ...mockTopic,
-          partitions: mockPartitions,
-          internal: false,
-          cleanUpPolicy: CleanUpPolicy.DELETE,
-        }
-      );
+      renderComponent({
+        ...externalTopicPayload,
+        cleanUpPolicy: CleanUpPolicy.DELETE,
+      });
       expect(screen.getByText('Clear Messages')).toBeInTheDocument();
     });
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.tsx
index 880097fb550..d7b553af9d5 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.tsx
@@ -1,57 +1,30 @@
 import React from 'react';
-import PageLoader from 'components/common/PageLoader/PageLoader';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import { ClusterName, TopicName } from 'redux/interfaces';
-import { useAppSelector } from 'lib/hooks/redux';
-import { getTopicConfig } from 'redux/reducers/topics/selectors';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
+import { useTopicConfig } from 'lib/hooks/api/topics';
 
 import ConfigListItem from './ConfigListItem';
 
-export interface Props {
-  isFetched: boolean;
-  fetchTopicConfig: (payload: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-  }) => void;
-}
-
-const Settings: React.FC<Props> = ({ isFetched, fetchTopicConfig }) => {
-  const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
-
-  const config = useAppSelector((state) => getTopicConfig(state, topicName));
-
-  React.useEffect(() => {
-    fetchTopicConfig({ clusterName, topicName });
-  }, [fetchTopicConfig, clusterName, topicName]);
-
-  if (!isFetched) {
-    return <PageLoader />;
-  }
-
-  if (!config) {
-    return null;
-  }
-
+const Settings: React.FC = () => {
+  const props = useAppParams<RouteParamsClusterTopic>();
+  const { data } = useTopicConfig(props);
   return (
-    <div>
-      <Table isFullwidth>
-        <thead>
-          <tr>
-            <TableHeaderCell title="Key" />
-            <TableHeaderCell title="Value" />
-            <TableHeaderCell title="Default Value" />
-          </tr>
-        </thead>
-        <tbody>
-          {config.map((item) => (
-            <ConfigListItem key={item.name} config={item} />
-          ))}
-        </tbody>
-      </Table>
-    </div>
+    <Table isFullwidth>
+      <thead>
+        <tr>
+          <TableHeaderCell title="Key" />
+          <TableHeaderCell title="Value" />
+          <TableHeaderCell title="Default Value" />
+        </tr>
+      </thead>
+      <tbody>
+        {data?.map((item) => (
+          <ConfigListItem key={item.name} config={item} />
+        ))}
+      </tbody>
+    </Table>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/SettingsContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/SettingsContainer.ts
deleted file mode 100644
index c24895c080c..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/SettingsContainer.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import { fetchTopicConfig } from 'redux/reducers/topics/topicsSlice';
-import { getTopicConfigFetched } from 'redux/reducers/topics/selectors';
-
-import Settings from './Settings';
-
-const mapStateToProps = (state: RootState) => ({
-  isFetched: getTopicConfigFetched(state),
-});
-
-const mapDispatchToProps = {
-  fetchTopicConfig,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Settings);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.spec.tsx
index c2d31a0a795..6d36cc82849 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.spec.tsx
@@ -1,94 +1,49 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
-import Settings, {
-  Props,
-} from 'components/Topics/Topic/Details/Settings/Settings';
-import { TopicConfig } from 'generated-sources';
+import Settings from 'components/Topics/Topic/Details/Settings/Settings';
 import { clusterTopicSettingsPath } from 'lib/paths';
-import { getTopicStateFixtures } from 'redux/reducers/topics/__test__/fixtures';
+import { topicConfigPayload } from 'lib/fixtures/topics';
+import { useTopicConfig } from 'lib/hooks/api/topics';
+
+const clusterName = 'Cluster_Name';
+const topicName = 'Topic_Name';
+
+jest.mock('lib/hooks/api/topics', () => ({
+  useTopicConfig: jest.fn(),
+}));
+
+jest.mock(
+  'components/Topics/Topic/Details/Settings/ConfigListItem',
+  () => () =>
+    (
+      <tr>
+        <td>ConfigListItemMock</td>
+      </tr>
+    )
+);
 
 describe('Settings', () => {
-  const mockClusterName = 'Cluster_Name';
-  const mockTopicName = 'Topic_Name';
-
-  let expectedResult: number;
-  const mockFn = jest.fn();
-
-  const mockConfig: TopicConfig[] = [
-    {
-      name: 'first',
-      value: 'first-value-name',
-    },
-    {
-      name: 'second',
-      value: 'second-value-name',
-    },
-  ];
-
-  const setUpComponent = (
-    props: Partial<Props> = {},
-    config?: TopicConfig[]
-  ) => {
-    const topic = {
-      name: mockTopicName,
-      config,
-    };
-    const topics = getTopicStateFixtures([topic]);
-
+  const renderComponent = () => {
+    const path = clusterTopicSettingsPath(clusterName, topicName);
     return render(
       <WithRoute path={clusterTopicSettingsPath()}>
-        <Settings isFetched fetchTopicConfig={mockFn} {...props} />
+        <Settings />
       </WithRoute>,
-      {
-        initialEntries: [
-          clusterTopicSettingsPath(mockClusterName, mockTopicName),
-        ],
-        preloadedState: {
-          topics,
-        },
-      }
+      { initialEntries: [path] }
     );
   };
 
-  afterEach(() => {
-    mockFn.mockClear();
+  beforeEach(() => {
+    (useTopicConfig as jest.Mock).mockImplementation(() => ({
+      data: topicConfigPayload,
+    }));
+    renderComponent();
   });
 
   it('should check it returns null if no config is passed', () => {
-    setUpComponent();
-
-    expect(screen.queryByRole('table')).not.toBeInTheDocument();
-  });
-
-  it('should show Page loader when it is in fetching state and config is given', () => {
-    setUpComponent({ isFetched: false }, mockConfig);
-
-    expect(screen.queryByRole('table')).not.toBeInTheDocument();
-    expect(screen.getByRole('progressbar')).toBeInTheDocument();
-  });
-
-  it('should check and return null if it is not fetched and config is not given', () => {
-    setUpComponent({ isFetched: false });
-
-    expect(screen.queryByRole('table')).not.toBeInTheDocument();
-  });
-
-  describe('Settings Component with Data', () => {
-    beforeEach(() => {
-      expectedResult = mockConfig.length + 1; // include the header table row as well
-      setUpComponent({ isFetched: true }, mockConfig);
-    });
-
-    it('should view the correct number of table row with header included elements after config fetching', () => {
-      expect(screen.getAllByRole('row')).toHaveLength(expectedResult);
-    });
-
-    it('should view the correct number of table row in tbody included elements after config fetching', () => {
-      expectedResult = mockConfig.length;
-      const tbodyElement = screen.getAllByRole('rowgroup')[1]; // pick tbody
-      const tbodyTableRowsElements = tbodyElement.children;
-      expect(tbodyTableRowsElements).toHaveLength(expectedResult);
-    });
+    expect(screen.getByRole('table')).toBeInTheDocument();
+    const items = screen.getAllByText('ConfigListItemMock');
+    expect(items.length).toEqual(topicConfigPayload.length);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
index 5c1df4edf31..8ed9fb0f6be 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
@@ -1,98 +1,89 @@
 import React from 'react';
-import { screen, waitFor } from '@testing-library/react';
+import { act, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import ClusterContext from 'components/contexts/ClusterContext';
 import Details from 'components/Topics/Topic/Details/Details';
-import {
-  getTopicStateFixtures,
-  internalTopicPayload,
-} from 'redux/reducers/topics/__test__/fixtures';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterTopicEditRelativePath, clusterTopicPath } from 'lib/paths';
 import { CleanUpPolicy, Topic } from 'generated-sources';
+import { externalTopicPayload } from 'lib/fixtures/topics';
+import {
+  useDeleteTopic,
+  useRecreateTopic,
+  useTopicDetails,
+} from 'lib/hooks/api/topics';
 
 const mockNavigate = jest.fn();
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useNavigate: () => mockNavigate,
 }));
+jest.mock('lib/hooks/api/topics', () => ({
+  useTopicDetails: jest.fn(),
+  useDeleteTopic: jest.fn(),
+  useRecreateTopic: jest.fn(),
+}));
+
+const mockUnwrap = jest.fn();
+const useDispatchMock = () => jest.fn(() => ({ unwrap: mockUnwrap }));
+
+jest.mock('lib/hooks/redux', () => ({
+  ...jest.requireActual('lib/hooks/redux'),
+  useAppDispatch: useDispatchMock,
+}));
+
+const mockDelete = jest.fn();
+const mockRecreate = jest.fn();
 
 describe('Details', () => {
-  const mockDelete = jest.fn();
   const mockClusterName = 'local';
-  const mockClearTopicMessages = jest.fn();
-  const mockRecreateTopic = jest.fn();
 
   const topic: Topic = {
-    ...internalTopicPayload,
+    ...externalTopicPayload,
     cleanUpPolicy: CleanUpPolicy.DELETE,
-    internal: false,
   };
 
-  const mockTopicsState = getTopicStateFixtures([topic]);
-
-  const setupComponent = (props = {}) =>
+  const renderComponent = (isReadOnly = false) => {
+    const path = clusterTopicPath(mockClusterName, topic.name);
     render(
       <ClusterContext.Provider
         value={{
-          isReadOnly: false,
+          isReadOnly,
           hasKafkaConnectConfigured: true,
           hasSchemaRegistryConfigured: true,
           isTopicDeletionAllowed: true,
         }}
       >
         <WithRoute path={clusterTopicPath()}>
-          <Details
-            deleteTopic={mockDelete}
-            recreateTopic={mockRecreateTopic}
-            clearTopicMessages={mockClearTopicMessages}
-            {...props}
-          />
+          <Details />
         </WithRoute>
       </ClusterContext.Provider>,
-      {
-        initialEntries: [
-          clusterTopicPath(mockClusterName, internalTopicPayload.name),
-        ],
-        preloadedState: {
-          topics: mockTopicsState,
-        },
-      }
+      { initialEntries: [path] }
     );
+  };
 
-  afterEach(() => {
-    mockNavigate.mockClear();
-    mockDelete.mockClear();
-    mockClearTopicMessages.mockClear();
-    mockRecreateTopic.mockClear();
+  beforeEach(async () => {
+    (useTopicDetails as jest.Mock).mockImplementation(() => ({
+      data: topic,
+    }));
+    (useDeleteTopic as jest.Mock).mockImplementation(() => ({
+      mutateAsync: mockDelete,
+    }));
+    (useRecreateTopic as jest.Mock).mockImplementation(() => ({
+      mutateAsync: mockRecreate,
+    }));
   });
 
   describe('when it has readonly flag', () => {
     it('does not render the Action button a Topic', () => {
-      render(
-        <ClusterContext.Provider
-          value={{
-            isReadOnly: true,
-            hasKafkaConnectConfigured: true,
-            hasSchemaRegistryConfigured: true,
-            isTopicDeletionAllowed: true,
-          }}
-        >
-          <Details
-            deleteTopic={mockDelete}
-            recreateTopic={mockRecreateTopic}
-            clearTopicMessages={mockClearTopicMessages}
-          />
-        </ClusterContext.Provider>
-      );
-
+      renderComponent(true);
       expect(screen.queryByText('Produce Message')).not.toBeInTheDocument();
     });
   });
 
   describe('when remove topic modal is open', () => {
     beforeEach(() => {
-      setupComponent();
+      renderComponent();
       const openModalButton = screen.getAllByText('Remove Topic')[0];
       userEvent.click(openModalButton);
     });
@@ -101,15 +92,9 @@ describe('Details', () => {
       const submitButton = screen.getAllByRole('button', {
         name: 'Confirm',
       })[0];
-
-      await waitFor(() => userEvent.click(submitButton));
-
-      expect(mockDelete).toHaveBeenCalledWith({
-        clusterName: mockClusterName,
-        topicName: internalTopicPayload.name,
-      });
+      await act(() => userEvent.click(submitButton));
+      expect(mockDelete).toHaveBeenCalledWith(topic.name);
     });
-
     it('closes the modal when cancel button is clicked', async () => {
       const cancelButton = screen.getAllByText('Cancel')[0];
       await waitFor(() => userEvent.click(cancelButton));
@@ -118,11 +103,10 @@ describe('Details', () => {
   });
 
   describe('when clear messages modal is open', () => {
-    beforeEach(() => {
-      setupComponent();
-
+    beforeEach(async () => {
+      await renderComponent();
       const confirmButton = screen.getAllByText('Clear messages')[0];
-      userEvent.click(confirmButton);
+      await act(() => userEvent.click(confirmButton));
     });
 
     it('it calls clearTopicMessages on confirm', async () => {
@@ -130,11 +114,7 @@ describe('Details', () => {
         name: 'Confirm',
       })[0];
       await waitFor(() => userEvent.click(submitButton));
-
-      expect(mockClearTopicMessages).toHaveBeenCalledWith({
-        clusterName: mockClusterName,
-        topicName: internalTopicPayload.name,
-      });
+      expect(mockUnwrap).toHaveBeenCalledTimes(1);
     });
 
     it('closes the modal when cancel button is clicked', async () => {
@@ -147,29 +127,24 @@ describe('Details', () => {
 
   describe('when edit settings is clicked', () => {
     it('redirects to the edit page', () => {
-      setupComponent();
-
+      renderComponent();
       const button = screen.getAllByText('Edit settings')[0];
       userEvent.click(button);
-
       expect(mockNavigate).toHaveBeenCalledWith(clusterTopicEditRelativePath);
     });
   });
 
   it('redirects to the correct route if topic is deleted', async () => {
-    setupComponent();
-
+    renderComponent();
     const deleteTopicButton = screen.getByText(/Remove topic/i);
-    userEvent.click(deleteTopicButton);
-
+    await waitFor(() => userEvent.click(deleteTopicButton));
     const submitDeleteButton = screen.getByRole('button', { name: 'Confirm' });
-    await waitFor(() => userEvent.click(submitDeleteButton));
-
+    await act(() => userEvent.click(submitDeleteButton));
     expect(mockNavigate).toHaveBeenCalledWith('../..');
   });
 
   it('shows a confirmation popup on deleting topic messages', () => {
-    setupComponent();
+    renderComponent();
     const clearMessagesButton = screen.getAllByText(/Clear messages/i)[0];
     userEvent.click(clearMessagesButton);
 
@@ -179,27 +154,26 @@ describe('Details', () => {
   });
 
   it('shows a confirmation popup on recreating topic', () => {
-    setupComponent();
+    renderComponent();
     const recreateTopicButton = screen.getByText(/Recreate topic/i);
     userEvent.click(recreateTopicButton);
-
     expect(
       screen.getByText(/Are you sure want to recreate topic?/i)
     ).toBeInTheDocument();
   });
 
   it('calling recreation function after click on Submit button', async () => {
-    setupComponent();
+    renderComponent();
     const recreateTopicButton = screen.getByText(/Recreate topic/i);
     userEvent.click(recreateTopicButton);
     const confirmBtn = screen.getByRole('button', { name: /Confirm/i });
 
     await waitFor(() => userEvent.click(confirmBtn));
-    expect(mockRecreateTopic).toBeCalledTimes(1);
+    expect(mockRecreate).toBeCalledTimes(1);
   });
 
   it('close popup confirmation window after click on Cancel button', () => {
-    setupComponent();
+    renderComponent();
     const recreateTopicButton = screen.getByText(/Recreate topic/i);
     userEvent.click(recreateTopicButton);
     const cancelBtn = screen.getByRole('button', { name: /cancel/i });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
index c481c963941..4417d8887dd 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
@@ -1,11 +1,12 @@
 import styled from 'styled-components';
 
 export const Wrapper = styled.div`
-  margin: 16px;
-  padding: 8px 16px;
+  margin: 32px auto;
+  padding: 16px;
   border: 1px solid ${({ theme }) => theme.dangerZone.borderColor};
   box-sizing: border-box;
   border-radius: 8px;
+  width: 768px;
 
   & > div {
     display: flex;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
index c84f43677c8..49f1d3574a4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
@@ -6,38 +6,31 @@ import { InputLabel } from 'components/common/Input/InputLabel.styled';
 import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { RouteParamsClusterTopic } from 'lib/paths';
-import { ClusterName, TopicName } from 'redux/interfaces';
 import useAppParams from 'lib/hooks/useAppParams';
 import { useConfirm } from 'lib/hooks/useConfirm';
+import {
+  useIncreaseTopicPartitionsCount,
+  useUpdateTopicReplicationFactor,
+} from 'lib/hooks/api/topics';
 
 import * as S from './DangerZone.styled';
 
-export interface Props {
+export interface DangerZoneProps {
   defaultPartitions: number;
   defaultReplicationFactor: number;
-  updateTopicPartitionsCount: (payload: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-    partitions: number;
-  }) => void;
-  updateTopicReplicationFactor: (payload: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-    replicationFactor: number;
-  }) => void;
 }
 
-const DangerZone: React.FC<Props> = ({
+const DangerZone: React.FC<DangerZoneProps> = ({
   defaultPartitions,
   defaultReplicationFactor,
-  updateTopicPartitionsCount,
-  updateTopicReplicationFactor,
 }) => {
-  const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
+  const params = useAppParams<RouteParamsClusterTopic>();
   const [partitions, setPartitions] = React.useState<number>(defaultPartitions);
   const [replicationFactor, setReplicationFactor] = React.useState<number>(
     defaultReplicationFactor
   );
+  const increaseTopicPartitionsCount = useIncreaseTopicPartitionsCount(params);
+  const updateTopicReplicationFactor = useUpdateTopicReplicationFactor(params);
 
   const partitionsMethods = useForm({
     defaultValues: {
@@ -52,26 +45,20 @@ const DangerZone: React.FC<Props> = ({
   });
 
   const confirm = useConfirm();
-
   const confirmPartitionsChange = () =>
     confirm(
       `Are you sure you want to increase the number of partitions?
         Do it only if you 100% know what you are doing!`,
       () =>
-        updateTopicPartitionsCount({
-          clusterName,
-          topicName,
-          partitions: partitionsMethods.getValues('partitions'),
-        })
+        increaseTopicPartitionsCount.mutateAsync(
+          partitionsMethods.getValues('partitions')
+        )
     );
   const confirmReplicationFactorChange = () =>
     confirm('Are you sure you want to update the replication factor?', () =>
-      updateTopicReplicationFactor({
-        clusterName,
-        topicName,
-        replicationFactor:
-          replicationFactorMethods.getValues('replicationFactor'),
-      })
+      updateTopicReplicationFactor.mutateAsync(
+        replicationFactorMethods.getValues('replicationFactor')
+      )
     );
 
   const validatePartitions = (data: { partitions: number }) => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZoneContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZoneContainer.ts
deleted file mode 100644
index f87ea036694..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZoneContainer.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import {
-  updateTopicPartitionsCount,
-  updateTopicReplicationFactor,
-} from 'redux/reducers/topics/topicsSlice';
-
-import DangerZone from './DangerZone';
-
-type OwnProps = {
-  defaultPartitions: number;
-  defaultReplicationFactor: number;
-};
-
-const mapStateToProps = (
-  _: RootState,
-  { defaultPartitions, defaultReplicationFactor }: OwnProps
-) => ({
-  defaultPartitions,
-  defaultReplicationFactor,
-});
-
-const mapDispatchToProps = {
-  updateTopicPartitionsCount,
-  updateTopicReplicationFactor,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(DangerZone);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
index 32458bf5652..740cc99dedc 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
@@ -1,27 +1,33 @@
 import React from 'react';
 import DangerZone, {
-  Props,
+  DangerZoneProps,
 } from 'components/Topics/Topic/Edit/DangerZone/DangerZone';
 import { act, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render, WithRoute } from 'lib/testHelpers';
-import {
-  topicName,
-  clusterName,
-} from 'components/Topics/Topic/Edit/__test__/fixtures';
 import { clusterTopicSendMessagePath } from 'lib/paths';
+import {
+  useIncreaseTopicPartitionsCount,
+  useUpdateTopicReplicationFactor,
+} from 'lib/hooks/api/topics';
 
 const defaultPartitions = 3;
 const defaultReplicationFactor = 3;
 
-const renderComponent = (props?: Partial<Props>) =>
+const clusterName = 'testCluster';
+const topicName = 'testTopic';
+
+jest.mock('lib/hooks/api/topics', () => ({
+  useIncreaseTopicPartitionsCount: jest.fn(),
+  useUpdateTopicReplicationFactor: jest.fn(),
+}));
+
+const renderComponent = (props?: Partial<DangerZoneProps>) =>
   render(
     <WithRoute path={clusterTopicSendMessagePath()}>
       <DangerZone
         defaultPartitions={defaultPartitions}
         defaultReplicationFactor={defaultReplicationFactor}
-        updateTopicPartitionsCount={jest.fn()}
-        updateTopicReplicationFactor={jest.fn()}
         {...props}
       />
     </WithRoute>,
@@ -76,33 +82,31 @@ describe('DangerZone', () => {
     ).toBeInTheDocument();
   });
 
-  it('calls updateTopicPartitionsCount', async () => {
-    const mockUpdateTopicPartitionsCount = jest.fn();
-    renderComponent({
-      updateTopicPartitionsCount: mockUpdateTopicPartitionsCount,
-    });
+  it('calls increaseTopicPartitionsCount mutation', async () => {
+    const mockIncreaseTopicPartitionsCount = jest.fn();
+    (useIncreaseTopicPartitionsCount as jest.Mock).mockImplementation(() => ({
+      mutateAsync: mockIncreaseTopicPartitionsCount,
+    }));
+    renderComponent();
     const numberOfPartitionsEditForm = screen.getByRole('form', {
       name: 'Edit number of partitions',
     });
-
     userEvent.type(
       within(numberOfPartitionsEditForm).getByRole('spinbutton'),
       '4'
     );
     userEvent.click(within(numberOfPartitionsEditForm).getByRole('button'));
-
     await waitFor(() => expect(screen.getByRole('dialog')).toBeInTheDocument());
     await waitFor(() => clickOnDialogSubmitButton());
-
-    expect(mockUpdateTopicPartitionsCount).toHaveBeenCalledTimes(1);
+    expect(mockIncreaseTopicPartitionsCount).toHaveBeenCalledTimes(1);
   });
 
   it('calls updateTopicReplicationFactor', async () => {
     const mockUpdateTopicReplicationFactor = jest.fn();
-    renderComponent({
-      updateTopicReplicationFactor: mockUpdateTopicReplicationFactor,
-    });
-
+    (useUpdateTopicReplicationFactor as jest.Mock).mockImplementation(() => ({
+      mutateAsync: mockUpdateTopicReplicationFactor,
+    }));
+    renderComponent();
     const replicationFactorEditForm = screen.getByRole('form', {
       name: 'Edit replication factor',
     });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
index 76309dc182d..93deef80caa 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
@@ -1,8 +1,6 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import {
-  ClusterName,
   TopicFormDataRaw,
-  TopicName,
   TopicConfigByName,
   TopicFormData,
 } from 'redux/interfaces';
@@ -12,40 +10,18 @@ import { RouteParamsClusterTopic } from 'lib/paths';
 import { useNavigate } from 'react-router-dom';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { topicFormValidationSchema } from 'lib/yupExtended';
-import styled from 'styled-components';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import { useAppSelector } from 'lib/hooks/redux';
-import { getFullTopic } from 'redux/reducers/topics/selectors';
 import useAppParams from 'lib/hooks/useAppParams';
 import topicParamsTransformer from 'components/Topics/Topic/Edit/topicParamsTransformer';
 import { MILLISECONDS_IN_WEEK } from 'lib/constants';
+import {
+  useTopicConfig,
+  useTopicDetails,
+  useUpdateTopic,
+} from 'lib/hooks/api/topics';
+import DangerZone from 'components/Topics/Topic/Edit/DangerZone/DangerZone';
 
-import DangerZoneContainer from './DangerZone/DangerZoneContainer';
-
-export interface Props {
-  isFetched: boolean;
-  isTopicUpdated: boolean;
-  fetchTopicConfig: (payload: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-  }) => void;
-  updateTopic: (payload: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-    form: TopicFormDataRaw;
-  }) => void;
-}
-
-const EditWrapperStyled = styled.div`
-  display: flex;
-  justify-content: center;
-
-  & > * {
-    width: 800px;
-  }
-`;
-
-export const DEFAULTS = {
+export const TOPIC_EDIT_FORM_DEFAULT_PROPS = {
   partitions: 1,
   replicationFactor: 1,
   minInSyncReplicas: 1,
@@ -56,19 +32,13 @@ export const DEFAULTS = {
   customParams: [],
 };
 
-let formInit = false;
-
-const Edit: React.FC<Props> = ({
-  isFetched,
-  isTopicUpdated,
-  fetchTopicConfig,
-  updateTopic,
-}) => {
+const Edit: React.FC = () => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
+  const { data: topic } = useTopicDetails({ clusterName, topicName });
+  const { data: topicConfig } = useTopicConfig({ clusterName, topicName });
+  const updateTopic = useUpdateTopic({ clusterName, topicName });
 
-  const topic = useAppSelector((state) => getFullTopic(state, topicName));
-
-  const defaultValues = topicParamsTransformer(topic);
+  const defaultValues = topicParamsTransformer(topic, topicConfig);
 
   const methods = useForm<TopicFormData>({
     defaultValues,
@@ -76,71 +46,44 @@ const Edit: React.FC<Props> = ({
     mode: 'onChange',
   });
 
-  useEffect(() => {
-    methods.reset(defaultValues);
-  }, [!topic]);
-
-  const [isSubmitting, setIsSubmitting] = React.useState<boolean>(false);
   const navigate = useNavigate();
 
-  React.useEffect(() => {
-    fetchTopicConfig({ clusterName, topicName });
-  }, [fetchTopicConfig, clusterName, topicName, isTopicUpdated]);
-
-  React.useEffect(() => {
-    if (isSubmitting && isTopicUpdated) {
-      navigate('../');
-    }
-  }, [isSubmitting, isTopicUpdated, clusterName, navigate]);
-
-  if (!isFetched || !topic || !topic.config) {
-    return null;
-  }
-
-  if (!formInit) {
-    methods.reset(defaultValues);
-    formInit = true;
-  }
-
   const config: TopicConfigByName = {
     byName: {},
   };
 
-  topic.config.forEach((param) => {
+  topicConfig?.forEach((param) => {
     config.byName[param.name] = param;
   });
 
   const onSubmit = async (data: TopicFormDataRaw) => {
-    updateTopic({ clusterName, topicName, form: data });
-    setIsSubmitting(true); // Keep this action after updateTopic to prevent redirect before update.
+    await updateTopic.mutateAsync(data);
+    navigate('../');
   };
 
   return (
     <>
       <PageHeading text={`Edit ${topicName}`} />
-      <EditWrapperStyled>
-        <div>
-          <FormProvider {...methods}>
-            <TopicForm
-              topicName={topicName}
-              retentionBytes={defaultValues.retentionBytes}
-              inSyncReplicas={Number(defaultValues.minInSyncReplicas)}
-              isSubmitting={isSubmitting}
-              cleanUpPolicy={topic.cleanUpPolicy}
-              isEditing
-              onSubmit={methods.handleSubmit(onSubmit)}
-            />
-          </FormProvider>
-          {topic && (
-            <DangerZoneContainer
-              defaultPartitions={defaultValues.partitions}
-              defaultReplicationFactor={
-                defaultValues.replicationFactor || DEFAULTS.replicationFactor
-              }
-            />
-          )}
-        </div>
-      </EditWrapperStyled>
+      <FormProvider {...methods}>
+        <TopicForm
+          topicName={topicName}
+          retentionBytes={defaultValues.retentionBytes}
+          inSyncReplicas={Number(defaultValues.minInSyncReplicas)}
+          isSubmitting={updateTopic.isLoading}
+          cleanUpPolicy={topic?.cleanUpPolicy}
+          isEditing
+          onSubmit={methods.handleSubmit(onSubmit)}
+        />
+      </FormProvider>
+      {topic && (
+        <DangerZone
+          defaultPartitions={defaultValues.partitions}
+          defaultReplicationFactor={
+            defaultValues.replicationFactor ||
+            TOPIC_EDIT_FORM_DEFAULT_PROPS.replicationFactor
+          }
+        />
+      )}
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/EditContainer.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/EditContainer.tsx
deleted file mode 100644
index 5ff9dcc6759..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/EditContainer.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import {
-  updateTopic,
-  fetchTopicConfig,
-} from 'redux/reducers/topics/topicsSlice';
-import {
-  getTopicConfigFetched,
-  getTopicUpdated,
-} from 'redux/reducers/topics/selectors';
-
-import Edit from './Edit';
-
-const mapStateToProps = (state: RootState) => ({
-  isFetched: getTopicConfigFetched(state),
-  isTopicUpdated: getTopicUpdated(state),
-});
-
-const mapDispatchToProps = {
-  fetchTopicConfig,
-  updateTopic,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Edit);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
index 9330a33a50c..6a6d1a4afa6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
@@ -1,13 +1,18 @@
 import React from 'react';
-import Edit, { DEFAULTS, Props } from 'components/Topics/Topic/Edit/Edit';
+import Edit from 'components/Topics/Topic/Edit/Edit';
 import { act, screen } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
 import userEvent from '@testing-library/user-event';
 import { clusterTopicEditPath } from 'lib/paths';
-import { TopicsState, TopicWithDetailedInfo } from 'redux/interfaces';
-import { getTopicStateFixtures } from 'redux/reducers/topics/__test__/fixtures';
+import {
+  useTopicConfig,
+  useTopicDetails,
+  useUpdateTopic,
+} from 'lib/hooks/api/topics';
+import { internalTopicPayload, topicConfigPayload } from 'lib/fixtures/topics';
 
-import { topicName, clusterName, topicWithInfo } from './fixtures';
+const clusterName = 'testCluster';
+const topicName = 'testTopic';
 
 const mockNavigate = jest.fn();
 jest.mock('react-router-dom', () => ({
@@ -15,153 +20,65 @@ jest.mock('react-router-dom', () => ({
   useNavigate: () => mockNavigate,
 }));
 
-const renderComponent = async (
-  props: Partial<Props> = {},
-  topic: TopicWithDetailedInfo | null = topicWithInfo
-) => {
-  let topics: TopicsState | undefined;
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockNavigate,
+}));
+
+jest.mock('components/Topics/Topic/Edit/DangerZone/DangerZone', () => () => (
+  <>DangerZone</>
+));
+
+jest.mock('lib/hooks/api/topics', () => ({
+  useTopicDetails: jest.fn(),
+  useTopicConfig: jest.fn(),
+  useUpdateTopic: jest.fn(),
+}));
 
-  if (topic === null) {
-    topics = undefined;
-  } else {
-    topics = getTopicStateFixtures([topic]);
-  }
+const updateTopicMock = jest.fn();
 
+const renderComponent = () => {
+  const path = clusterTopicEditPath(clusterName, topicName);
   render(
     <WithRoute path={clusterTopicEditPath()}>
-      <Edit
-        isFetched
-        isTopicUpdated={false}
-        fetchTopicConfig={jest.fn()}
-        updateTopic={jest.fn()}
-        {...props}
-      />
+      <Edit />
     </WithRoute>,
-    {
-      initialEntries: [clusterTopicEditPath(clusterName, topicName)],
-      preloadedState: { topics },
-    }
+    { initialEntries: [path] }
   );
 };
 
 describe('Edit Component', () => {
-  afterEach(() => {});
-
-  it('renders the Edit Component', async () => {
+  beforeEach(async () => {
+    (useTopicDetails as jest.Mock).mockImplementation(() => ({
+      data: internalTopicPayload,
+    }));
+    (useTopicConfig as jest.Mock).mockImplementation(() => ({
+      data: topicConfigPayload,
+    }));
+    (useUpdateTopic as jest.Mock).mockImplementation(() => ({
+      isLoading: false,
+      mutateAsync: updateTopicMock,
+    }));
     await act(() => renderComponent());
-
-    expect(
-      screen.getByRole('heading', { name: `Edit ${topicName}` })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('heading', { name: `Danger Zone` })
-    ).toBeInTheDocument();
-  });
-
-  it('should check Edit component renders null is not rendered when topic is not passed', async () => {
-    await act(() =>
-      renderComponent({}, { ...topicWithInfo, config: undefined })
-    );
-    expect(
-      screen.queryByRole('heading', { name: `Edit ${topicName}` })
-    ).not.toBeInTheDocument();
-    expect(
-      screen.queryByRole('heading', { name: `Danger Zone` })
-    ).not.toBeInTheDocument();
   });
 
-  it('should check Edit component renders null is not isFetched is false', async () => {
-    await act(() => renderComponent({ isFetched: false }));
-    expect(
-      screen.queryByRole('heading', { name: `Edit ${topicName}` })
-    ).not.toBeInTheDocument();
-    expect(
-      screen.queryByRole('heading', { name: `Danger Zone` })
-    ).not.toBeInTheDocument();
+  it('renders component', async () => {
+    expect(screen.getByText(`Edit ${topicName}`)).toBeInTheDocument();
   });
 
-  it('should check Edit component renders null is not topic config is not passed is false', async () => {
-    const modifiedTopic = { ...topicWithInfo };
-    modifiedTopic.config = undefined;
-    await act(() => renderComponent({}, modifiedTopic));
-    expect(
-      screen.queryByRole('heading', { name: `Edit ${topicName}` })
-    ).not.toBeInTheDocument();
-    expect(
-      screen.queryByRole('heading', { name: `Danger Zone` })
-    ).not.toBeInTheDocument();
+  it('renders DangerZone component', async () => {
+    expect(screen.getByText(`DangerZone`)).toBeInTheDocument();
   });
 
-  describe('Edit Component with its topic default and modified values', () => {
-    it('should check the default partitions value in the DangerZone', async () => {
-      await act(() =>
-        renderComponent({}, { ...topicWithInfo, partitionCount: 0 })
-      );
-      // cause topic selector will return falsy
-      expect(
-        screen.queryByRole('heading', { name: `Edit ${topicName}` })
-      ).not.toBeInTheDocument();
-      expect(
-        screen.queryByRole('heading', { name: `Danger Zone` })
-      ).not.toBeInTheDocument();
-    });
-
-    it('should check the default partitions value in the DangerZone', async () => {
-      await act(() =>
-        renderComponent({}, { ...topicWithInfo, replicationFactor: undefined })
-      );
-      expect(screen.getByPlaceholderText('Replication Factor')).toHaveValue(
-        DEFAULTS.replicationFactor
-      );
-    });
-  });
-
-  describe('Submit Case of the Edit Component', () => {
-    it('should check the submit functionality when topic updated is false', async () => {
-      const updateTopicMock = jest.fn();
-
-      await act(() =>
-        renderComponent({ updateTopic: updateTopicMock }, undefined)
-      );
-
-      const btn = screen.getAllByText(/Save/i)[0];
-
-      await act(() => {
-        userEvent.type(
-          screen.getByPlaceholderText('Min In Sync Replicas'),
-          '1'
-        );
-      });
-
-      await act(() => {
-        userEvent.click(btn);
-      });
-      expect(updateTopicMock).toHaveBeenCalledTimes(1);
-      expect(mockNavigate).not.toHaveBeenCalled();
-    });
-
-    it('should check the submit functionality when topic updated is true', async () => {
-      const updateTopicMock = jest.fn();
-      await act(() =>
-        renderComponent(
-          { updateTopic: updateTopicMock, isTopicUpdated: true },
-          undefined
-        )
-      );
-
-      const btn = screen.getAllByText(/Save/i)[0];
-
-      await act(() => {
-        userEvent.type(
-          screen.getByPlaceholderText('Min In Sync Replicas'),
-          '1'
-        );
-      });
-      await act(() => {
-        userEvent.click(btn);
-      });
-      expect(updateTopicMock).toHaveBeenCalledTimes(1);
-      expect(mockNavigate).toHaveBeenLastCalledWith('../');
+  it('submits form correctly', async () => {
+    await act(() => renderComponent());
+    const btn = screen.getAllByText(/Save/i)[0];
+    const field = screen.getByRole('spinbutton', {
+      name: 'Min In Sync Replicas * Min In Sync Replicas *',
     });
+    await act(() => userEvent.type(field, '1'));
+    await act(() => userEvent.click(btn));
+    expect(updateTopicMock).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenCalledWith('../');
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts
deleted file mode 100644
index 5cbdebd97aa..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/fixtures.ts
+++ /dev/null
@@ -1,617 +0,0 @@
-import { CleanUpPolicy, ConfigSource, TopicConfig } from 'generated-sources';
-import { TopicWithDetailedInfo } from 'redux/interfaces/topic';
-
-export const clusterName = 'testCluster';
-export const topicName = 'testTopic';
-
-const config: TopicConfig[] = [
-  {
-    name: 'compression.type',
-    value: 'producer',
-    defaultValue: 'producer',
-    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'compression.type',
-        value: 'producer',
-        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-      },
-      {
-        name: 'compression.type',
-        value: 'producer',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'confluent.value.schema.validation',
-    value: 'false',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'leader.replication.throttled.replicas',
-    value: '',
-    defaultValue: '',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'confluent.key.subject.name.strategy',
-    value: 'io.confluent.kafka.serializers.subject.TopicNameStrategy',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'message.downconversion.enable',
-    value: 'true',
-    defaultValue: 'true',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.message.downconversion.enable',
-        value: 'true',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'min.insync.replicas',
-    value: '1',
-    defaultValue: '1',
-    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'min.insync.replicas',
-        value: '1',
-        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-      },
-      {
-        name: 'min.insync.replicas',
-        value: '1',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'segment.jitter.ms',
-    value: '0',
-    defaultValue: '0',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'cleanup.policy',
-    value: 'delete',
-    defaultValue: 'delete',
-    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'cleanup.policy',
-        value: 'delete',
-        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-      },
-      {
-        name: 'log.cleanup.policy',
-        value: 'delete',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'flush.ms',
-    value: '9223372036854775807',
-    defaultValue: '9223372036854775807',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'confluent.tier.local.hotset.ms',
-    value: '86400000',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'confluent.tier.local.hotset.ms',
-        value: '86400000',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'follower.replication.throttled.replicas',
-    value: '',
-    defaultValue: '',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'confluent.tier.local.hotset.bytes',
-    value: '-1',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'confluent.tier.local.hotset.bytes',
-        value: '-1',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'confluent.value.subject.name.strategy',
-    value: 'io.confluent.kafka.serializers.subject.TopicNameStrategy',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'segment.bytes',
-    value: '1073741824',
-    defaultValue: '1073741824',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.segment.bytes',
-        value: '1073741824',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'retention.ms',
-    value: '604800000',
-    defaultValue: '604800000',
-    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'retention.ms',
-        value: '604800000',
-        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'flush.messages',
-    value: '9223372036854775807',
-    defaultValue: '9223372036854775807',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.flush.interval.messages',
-        value: '9223372036854775807',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'confluent.tier.enable',
-    value: 'false',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'confluent.tier.enable',
-        value: 'false',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'confluent.tier.segment.hotset.roll.min.bytes',
-    value: '104857600',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'confluent.tier.segment.hotset.roll.min.bytes',
-        value: '104857600',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'confluent.segment.speculative.prefetch.enable',
-    value: 'false',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'confluent.segment.speculative.prefetch.enable',
-        value: 'false',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'message.format.version',
-    value: '2.7-IV2',
-    defaultValue: '2.7-IV2',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.message.format.version',
-        value: '2.7-IV2',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'max.compaction.lag.ms',
-    value: '9223372036854775807',
-    defaultValue: '9223372036854775807',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.cleaner.max.compaction.lag.ms',
-        value: '9223372036854775807',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'file.delete.delay.ms',
-    value: '60000',
-    defaultValue: '60000',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.segment.delete.delay.ms',
-        value: '60000',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'max.message.bytes',
-    value: '1000012',
-    defaultValue: '1000012',
-    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'max.message.bytes',
-        value: '1000012',
-        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-      },
-      {
-        name: 'message.max.bytes',
-        value: '1048588',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'min.compaction.lag.ms',
-    value: '0',
-    defaultValue: '0',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.cleaner.min.compaction.lag.ms',
-        value: '0',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'message.timestamp.type',
-    value: 'CreateTime',
-    defaultValue: 'CreateTime',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.message.timestamp.type',
-        value: 'CreateTime',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'preallocate',
-    value: 'false',
-    defaultValue: 'false',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.preallocate',
-        value: 'false',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'confluent.placement.constraints',
-    value: '',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'min.cleanable.dirty.ratio',
-    value: '0.5',
-    defaultValue: '0.5',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.cleaner.min.cleanable.ratio',
-        value: '0.5',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'index.interval.bytes',
-    value: '4096',
-    defaultValue: '4096',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.index.interval.bytes',
-        value: '4096',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'unclean.leader.election.enable',
-    value: 'false',
-    defaultValue: 'false',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'unclean.leader.election.enable',
-        value: 'false',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'retention.bytes',
-    value: '-1',
-    defaultValue: '-1',
-    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'retention.bytes',
-        value: '-1',
-        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-      },
-      {
-        name: 'log.retention.bytes',
-        value: '-1',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'delete.retention.ms',
-    value: '86400001',
-    defaultValue: '86400000',
-    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'delete.retention.ms',
-        value: '86400001',
-        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-      },
-      {
-        name: 'log.cleaner.delete.retention.ms',
-        value: '86400000',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'confluent.prefer.tier.fetch.ms',
-    value: '-1',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'confluent.prefer.tier.fetch.ms',
-        value: '-1',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'confluent.key.schema.validation',
-    value: 'false',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'segment.ms',
-    value: '604800000',
-    defaultValue: '604800000',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [],
-  },
-  {
-    name: 'message.timestamp.difference.max.ms',
-    value: '9223372036854775807',
-    defaultValue: '9223372036854775807',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.message.timestamp.difference.max.ms',
-        value: '9223372036854775807',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'segment.index.bytes',
-    value: '10485760',
-    defaultValue: '10485760',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.index.size.max.bytes',
-        value: '10485760',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-];
-
-const partitions = [
-  {
-    partition: 0,
-    leader: 2,
-    replicas: [
-      {
-        broker: 2,
-        leader: false,
-        inSync: true,
-      },
-    ],
-    offsetMax: 0,
-    offsetMin: 0,
-  },
-];
-
-export const topicWithInfo: TopicWithDetailedInfo = {
-  name: topicName,
-  internal: false,
-  partitionCount: 1,
-  replicationFactor: 1,
-  replicas: 1,
-  inSyncReplicas: 1,
-  segmentSize: 0,
-  segmentCount: 1,
-  underReplicatedPartitions: 0,
-  cleanUpPolicy: CleanUpPolicy.DELETE,
-  partitions,
-  config,
-};
-export const customConfigs = [
-  {
-    name: 'segment.bytes',
-    value: '1',
-    defaultValue: '1073741824',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.segment.bytes',
-        value: '1073741824',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'retention.ms',
-    value: '604',
-    defaultValue: '604800000',
-    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'retention.ms',
-        value: '604800000',
-        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
-      },
-    ],
-  },
-  {
-    name: 'flush.messages',
-    value: '92233',
-    defaultValue: '9223372036854775807',
-    source: ConfigSource.DEFAULT_CONFIG,
-    isSensitive: false,
-    isReadOnly: false,
-    synonyms: [
-      {
-        name: 'log.flush.interval.messages',
-        value: '9223372036854775807',
-        source: ConfigSource.DEFAULT_CONFIG,
-      },
-    ],
-  },
-];
-
-export const transformedParams = {
-  partitions: 1,
-  replicationFactor: 1,
-  cleanupPolicy: 'delete',
-  retentionBytes: -1,
-  maxMessageBytes: 1000012,
-  name: topicName,
-  minInSyncReplicas: 1,
-  retentionMs: 604800000,
-  customParams: [
-    {
-      name: 'delete.retention.ms',
-      value: '86400001',
-    },
-  ],
-};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/topicParamsTransformer.spec.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/topicParamsTransformer.spec.ts
index 5077dc3b29e..d1b2d003834 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/topicParamsTransformer.spec.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/topicParamsTransformer.spec.ts
@@ -1,101 +1,59 @@
 import topicParamsTransformer, {
   getValue,
 } from 'components/Topics/Topic/Edit/topicParamsTransformer';
-import { DEFAULTS } from 'components/Topics/Topic/Edit/Edit';
+import { externalTopicPayload, topicConfigPayload } from 'lib/fixtures/topics';
+import { TOPIC_EDIT_FORM_DEFAULT_PROPS } from 'components/Topics/Topic/Edit/Edit';
 
-import { transformedParams, customConfigs, topicWithInfo } from './fixtures';
+const defaultValue = 3232326;
+describe('getValue', () => {
+  it('returns value when field exists', () => {
+    expect(getValue(topicConfigPayload, 'min.insync.replicas')).toEqual(1);
+  });
+  it('returns default value when field does not exists', () => {
+    expect(getValue(topicConfigPayload, 'min.max.mid', defaultValue)).toEqual(
+      defaultValue
+    );
+  });
+});
 
 describe('topicParamsTransformer', () => {
-  const testField = (name: keyof typeof DEFAULTS, fieldName: string) => {
-    it('returns transformed value', () => {
-      expect(topicParamsTransformer(topicWithInfo)[name]).toEqual(
-        transformedParams[name]
-      );
-    });
-    it(`returns default value when ${name} not defined`, () => {
-      expect(
-        topicParamsTransformer({
-          ...topicWithInfo,
-          config: topicWithInfo.config?.filter(
-            (config) => config.name !== fieldName
-          ),
-        })[name]
-      ).toEqual(DEFAULTS[name]);
-    });
-
-    it('returns number value', () => {
-      expect(
-        typeof topicParamsTransformer(topicWithInfo).retentionBytes
-      ).toEqual('number');
-    });
-  };
-
-  describe('getValue', () => {
-    it('returns value when field exists', () => {
-      expect(
-        getValue(topicWithInfo, 'confluent.tier.segment.hotset.roll.min.bytes')
-      ).toEqual(104857600);
-    });
-    it('returns undefined when filed name does not exist', () => {
-      expect(getValue(topicWithInfo, 'some.unsupported.fieldName')).toEqual(
-        undefined
-      );
-    });
-    it('returns default value when field does not exist', () => {
-      expect(
-        getValue(topicWithInfo, 'some.unsupported.fieldName', 100)
-      ).toEqual(100);
-    });
+  it('returns default values when config payload is not defined', () => {
+    expect(topicParamsTransformer(externalTopicPayload)).toEqual(
+      TOPIC_EDIT_FORM_DEFAULT_PROPS
+    );
   });
-  describe('Topic', () => {
-    it('returns default values when topic not defined found', () => {
-      expect(topicParamsTransformer(undefined)).toEqual(DEFAULTS);
-    });
-
-    it('returns transformed values', () => {
-      expect(topicParamsTransformer(topicWithInfo)).toEqual(transformedParams);
-    });
+  it('returns default values when topic payload is not defined', () => {
+    expect(topicParamsTransformer(undefined, topicConfigPayload)).toEqual(
+      TOPIC_EDIT_FORM_DEFAULT_PROPS
+    );
   });
-
-  describe('Topic partitions', () => {
-    it('returns transformed value', () => {
-      expect(topicParamsTransformer(topicWithInfo).partitions).toEqual(
-        transformedParams.partitions
-      );
-    });
-    it('returns default value when partitionCount not defined', () => {
-      expect(
-        topicParamsTransformer({ ...topicWithInfo, partitionCount: undefined })
-          .partitions
-      ).toEqual(DEFAULTS.partitions);
+  it('returns transformed config', () => {
+    expect(
+      topicParamsTransformer(externalTopicPayload, topicConfigPayload)
+    ).toEqual({
+      ...TOPIC_EDIT_FORM_DEFAULT_PROPS,
+      name: externalTopicPayload.name,
     });
   });
-
-  describe('maxMessageBytes', () =>
-    testField('maxMessageBytes', 'max.message.bytes'));
-
-  describe('minInSyncReplicas', () =>
-    testField('minInSyncReplicas', 'min.insync.replicas'));
-
-  describe('retentionBytes', () =>
-    testField('retentionBytes', 'retention.bytes'));
-
-  describe('retentionMs', () => testField('retentionMs', 'retention.ms'));
-
-  describe('customParams', () => {
-    it('returns value when configs is empty', () => {
-      expect(
-        topicParamsTransformer({ ...topicWithInfo, config: [] }).customParams
-      ).toEqual([]);
-    });
-
-    it('returns value when had a 2 custom configs', () => {
-      expect(
-        topicParamsTransformer({
-          ...topicWithInfo,
-          config: customConfigs,
-        }).customParams?.length
-      ).toEqual(2);
-    });
+  it('returns default partitions config', () => {
+    expect(
+      topicParamsTransformer(
+        { ...externalTopicPayload, partitionCount: undefined },
+        topicConfigPayload
+      ).partitions
+    ).toEqual(TOPIC_EDIT_FORM_DEFAULT_PROPS.partitions);
+  });
+  it('returns empty list of custom params', () => {
+    expect(
+      topicParamsTransformer(externalTopicPayload, topicConfigPayload)
+        .customParams
+    ).toEqual([]);
+  });
+  it('returns list of custom params', () => {
+    expect(
+      topicParamsTransformer(externalTopicPayload, [
+        { ...topicConfigPayload[0], value: 'SuperCustom' },
+      ]).customParams
+    ).toEqual([{ name: 'compression.type', value: 'SuperCustom' }]);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
index 1c5b8491c69..6ff3fb77cab 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
@@ -1,43 +1,41 @@
-import { TopicWithDetailedInfo } from 'redux/interfaces';
 import {
   MILLISECONDS_IN_WEEK,
   TOPIC_CUSTOM_PARAMS,
   TOPIC_CUSTOM_PARAMS_PREFIX,
 } from 'lib/constants';
-import { DEFAULTS } from 'components/Topics/Topic/Edit/Edit';
+import { TOPIC_EDIT_FORM_DEFAULT_PROPS } from 'components/Topics/Topic/Edit/Edit';
+import { Topic, TopicConfig } from 'generated-sources';
 
 export const getValue = (
-  topic: TopicWithDetailedInfo,
+  config: TopicConfig[],
   fieldName: string,
   defaultValue?: number
 ) =>
-  Number(topic?.config?.find((config) => config.name === fieldName)?.value) ||
-  defaultValue;
+  Number(config.find(({ name }) => name === fieldName)?.value) || defaultValue;
 
-const topicParamsTransformer = (topic?: TopicWithDetailedInfo) => {
-  if (!topic) {
-    return DEFAULTS;
+const topicParamsTransformer = (topic?: Topic, config?: TopicConfig[]) => {
+  if (!config || !topic) {
+    return TOPIC_EDIT_FORM_DEFAULT_PROPS;
   }
 
-  const { name, replicationFactor } = topic;
+  const customParams = config.reduce((acc, { name, value, defaultValue }) => {
+    if (value === defaultValue) return acc;
+    if (!Object.keys(TOPIC_CUSTOM_PARAMS).includes(name)) return acc;
+    return [...acc, { name, value }];
+  }, [] as { name: string; value?: string }[]);
 
   return {
-    ...DEFAULTS,
-    name,
-    replicationFactor,
-    partitions: topic.partitionCount || DEFAULTS.partitions,
-    maxMessageBytes: getValue(topic, 'max.message.bytes', 1000012),
-    minInSyncReplicas: getValue(topic, 'min.insync.replicas', 1),
-    retentionBytes: getValue(topic, 'retention.bytes', -1),
-    retentionMs: getValue(topic, 'retention.ms', MILLISECONDS_IN_WEEK),
+    ...TOPIC_EDIT_FORM_DEFAULT_PROPS,
+    name: topic.name,
+    replicationFactor: topic.replicationFactor,
+    partitions:
+      topic.partitionCount || TOPIC_EDIT_FORM_DEFAULT_PROPS.partitions,
+    maxMessageBytes: getValue(config, 'max.message.bytes', 1000012),
+    minInSyncReplicas: getValue(config, 'min.insync.replicas', 1),
+    retentionBytes: getValue(config, 'retention.bytes', -1),
+    retentionMs: getValue(config, 'retention.ms', MILLISECONDS_IN_WEEK),
 
-    [TOPIC_CUSTOM_PARAMS_PREFIX]: topic.config
-      ?.filter(
-        (el) =>
-          el.value !== el.defaultValue &&
-          Object.keys(TOPIC_CUSTOM_PARAMS).includes(el.name)
-      )
-      .map((el) => ({ name: el.name, value: el.value })),
+    [TOPIC_CUSTOM_PARAMS_PREFIX]: customParams,
   };
 };
 export default topicParamsTransformer;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 6e7f367f62c..f762bad6474 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -6,24 +6,17 @@ import {
   RouteParamsClusterTopic,
 } from 'lib/paths';
 import jsf from 'json-schema-faker';
-import {
-  fetchTopicMessageSchema,
-  fetchTopicDetails,
-} from 'redux/reducers/topics/topicsSlice';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import { Button } from 'components/common/Button/Button';
 import Editor from 'components/common/Editor/Editor';
-import PageLoader from 'components/common/PageLoader/PageLoader';
-import {
-  getMessageSchemaByTopicName,
-  getPartitionsByTopicName,
-  getTopicMessageSchemaFetched,
-} from 'redux/reducers/topics/selectors';
 import Select, { SelectOption } from 'components/common/Select/Select';
 import useAppParams from 'lib/hooks/useAppParams';
 import Heading from 'components/common/heading/Heading.styled';
-import { messagesApiClient } from 'lib/api';
-import { showAlert, showServerError } from 'lib/errorHandling';
+import { showAlert } from 'lib/errorHandling';
+import {
+  useSendMessage,
+  useTopicDetails,
+  useTopicMessageSchema,
+} from 'lib/hooks/api/topics';
 
 import validateMessage from './validateMessage';
 import * as S from './SendMessage.styled';
@@ -36,31 +29,27 @@ type FieldValues = Partial<{
 }>;
 
 const SendMessage: React.FC = () => {
-  const dispatch = useAppDispatch();
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
   const navigate = useNavigate();
+  const { data: topic } = useTopicDetails({ clusterName, topicName });
+  const { data: messageSchema } = useTopicMessageSchema({
+    clusterName,
+    topicName,
+  });
+  const sendMessage = useSendMessage({ clusterName, topicName });
 
   jsf.option('fillProperties', false);
   jsf.option('alwaysFakeOptionals', true);
 
-  React.useEffect(() => {
-    dispatch(fetchTopicMessageSchema({ clusterName, topicName }));
-  }, [clusterName, dispatch, topicName]);
+  const partitions = topic?.partitions || [];
 
-  const messageSchema = useAppSelector((state) =>
-    getMessageSchemaByTopicName(state, topicName)
-  );
-  const partitions = useAppSelector((state) =>
-    getPartitionsByTopicName(state, topicName)
-  );
-  const schemaIsFetched = useAppSelector(getTopicMessageSchemaFetched);
   const selectPartitionOptions: Array<SelectOption> = partitions.map((p) => {
     const value = String(p.partition);
     return { value, label: value };
   });
 
   const keyDefaultValue = React.useMemo(() => {
-    if (!schemaIsFetched || !messageSchema) {
+    if (!messageSchema) {
       return undefined;
     }
     return JSON.stringify(
@@ -68,10 +57,10 @@ const SendMessage: React.FC = () => {
       null,
       '\t'
     );
-  }, [messageSchema, schemaIsFetched]);
+  }, [messageSchema]);
 
   const contentDefaultValue = React.useMemo(() => {
-    if (!schemaIsFetched || !messageSchema) {
+    if (!messageSchema) {
       return undefined;
     }
     return JSON.stringify(
@@ -79,7 +68,7 @@ const SendMessage: React.FC = () => {
       null,
       '\t'
     );
-  }, [messageSchema, schemaIsFetched]);
+  }, [messageSchema]);
 
   const {
     handleSubmit,
@@ -129,31 +118,16 @@ const SendMessage: React.FC = () => {
         return;
       }
       const headers = data.headers ? JSON.parse(data.headers) : undefined;
-      try {
-        await messagesApiClient.sendTopicMessages({
-          clusterName,
-          topicName,
-          createTopicMessage: {
-            key: !key ? null : key,
-            content: !content ? null : content,
-            headers,
-            partition: !partition ? 0 : partition,
-          },
-        });
-        dispatch(fetchTopicDetails({ clusterName, topicName }));
-      } catch (e) {
-        showServerError(e as Response, {
-          id: `${clusterName}-${topicName}-sendTopicMessagesError`,
-          message: `Error in sending a message to ${topicName}`,
-        });
-      }
+      await sendMessage.mutateAsync({
+        key: !key ? null : key,
+        content: !content ? null : content,
+        headers,
+        partition: !partition ? 0 : partition,
+      });
       navigate(`../${clusterTopicMessagesRelativePath}`);
     }
   };
 
-  if (!schemaIsFetched) {
-    return <PageLoader />;
-  }
   return (
     <S.Wrapper>
       <form onSubmit={handleSubmit(onSubmit)}>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
index 76610d820ad..803ffbd7915 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
@@ -2,19 +2,18 @@ import React from 'react';
 import SendMessage from 'components/Topics/Topic/SendMessage/SendMessage';
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import fetchMock from 'fetch-mock';
 import { render, WithRoute } from 'lib/testHelpers';
 import {
   clusterTopicMessagesRelativePath,
   clusterTopicSendMessagePath,
 } from 'lib/paths';
-import { store } from 'redux/store';
-import { fetchTopicDetails } from 'redux/reducers/topics/topicsSlice';
-import { externalTopicPayload } from 'redux/reducers/topics/__test__/fixtures';
 import validateMessage from 'components/Topics/Topic/SendMessage/validateMessage';
-import { showServerError } from 'lib/errorHandling';
-
-import { testSchema } from './fixtures';
+import { externalTopicPayload, topicMessageSchema } from 'lib/fixtures/topics';
+import {
+  useSendMessage,
+  useTopicDetails,
+  useTopicMessageSchema,
+} from 'lib/hooks/api/topics';
 
 import Mock = jest.Mock;
 
@@ -42,26 +41,29 @@ jest.mock('react-router-dom', () => ({
   useNavigate: () => mockNavigate,
 }));
 
+jest.mock('lib/hooks/api/topics', () => ({
+  useTopicDetails: jest.fn(),
+  useTopicMessageSchema: jest.fn(),
+  useSendMessage: jest.fn(),
+}));
+
 const clusterName = 'testCluster';
 const topicName = externalTopicPayload.name;
 
 const renderComponent = async () => {
+  const path = clusterTopicSendMessagePath(clusterName, topicName);
   await act(() => {
     render(
       <WithRoute path={clusterTopicSendMessagePath()}>
         <SendMessage />
       </WithRoute>,
-      {
-        initialEntries: [clusterTopicSendMessagePath(clusterName, topicName)],
-        store,
-      }
+      { initialEntries: [path] }
     );
   });
 };
 
 const renderAndSubmitData = async (error: string[] = []) => {
   await renderComponent();
-  expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
   await act(() => {
     userEvent.click(screen.getByRole('listbox'));
   });
@@ -75,83 +77,55 @@ const renderAndSubmitData = async (error: string[] = []) => {
 };
 
 describe('SendMessage', () => {
-  beforeAll(() => {
-    store.dispatch(
-      fetchTopicDetails.fulfilled(
-        {
-          topicDetails: externalTopicPayload,
-          topicName,
-        },
-        'topic',
-        {
-          clusterName,
-          topicName,
-        }
-      )
-    );
+  beforeEach(() => {
+    (useTopicDetails as jest.Mock).mockImplementation(() => ({
+      data: externalTopicPayload,
+    }));
   });
+
   afterEach(() => {
-    fetchMock.reset();
     mockNavigate.mockClear();
   });
 
-  it('fetches schema on first render', async () => {
-    const fetchTopicMessageSchemaMock = fetchMock.getOnce(
-      `/api/clusters/${clusterName}/topics/${topicName}/messages/schema`,
-      testSchema
-    );
-    await renderComponent();
-    expect(fetchTopicMessageSchemaMock.called()).toBeTruthy();
-  });
-
   describe('when schema is fetched', () => {
-    const messagesUrl = `/api/clusters/${clusterName}/topics/${topicName}/messages`;
-    const detailsUrl = `/api/clusters/${clusterName}/topics/${topicName}`;
-
     beforeEach(() => {
-      fetchMock.getOnce(
-        `/api/clusters/${clusterName}/topics/${topicName}/messages/schema`,
-        testSchema
-      );
+      (useTopicMessageSchema as jest.Mock).mockImplementation(() => ({
+        data: topicMessageSchema,
+      }));
     });
 
     it('calls sendTopicMessage on submit', async () => {
-      const sendTopicMessageMock = fetchMock.postOnce(messagesUrl, 200);
-      const fetchTopicDetailsMock = fetchMock.getOnce(detailsUrl, 200);
-      await renderAndSubmitData();
-      expect(sendTopicMessageMock.called(messagesUrl)).toBeTruthy();
-      expect(fetchTopicDetailsMock.called(detailsUrl)).toBeTruthy();
-      expect(mockNavigate).toHaveBeenLastCalledWith(
-        `../${clusterTopicMessagesRelativePath}`
-      );
-    });
-
-    it('should make the sendTopicMessage but most find an error within it', async () => {
-      const showServerErrorMock = jest.fn();
-      (showServerError as jest.Mock).mockImplementation(showServerErrorMock);
-      const sendTopicMessageMock = fetchMock.postOnce(messagesUrl, {
-        throws: 'Error',
-      });
-      const fetchTopicDetailsMock = fetchMock.getOnce(detailsUrl, 200);
+      const sendTopicMessageMock = jest.fn();
+      (useSendMessage as jest.Mock).mockImplementation(() => ({
+        mutateAsync: sendTopicMessageMock,
+      }));
       await renderAndSubmitData();
-      expect(sendTopicMessageMock.called()).toBeTruthy();
-      expect(fetchTopicDetailsMock.called(detailsUrl)).toBeFalsy();
-
-      expect(showServerErrorMock).toHaveBeenCalledWith('Error', {
-        id: 'testCluster-external.topic-sendTopicMessagesError',
-        message: 'Error in sending a message to external.topic',
-      });
-
+      expect(sendTopicMessageMock).toHaveBeenCalledTimes(1);
       expect(mockNavigate).toHaveBeenLastCalledWith(
         `../${clusterTopicMessagesRelativePath}`
       );
     });
 
     it('should check and view validation error message when is not valid', async () => {
-      const sendTopicMessageMock = fetchMock.postOnce(messagesUrl, 200);
+      const sendTopicMessageMock = jest.fn();
+      (useSendMessage as jest.Mock).mockImplementation(() => ({
+        mutateAsync: sendTopicMessageMock,
+      }));
       await renderAndSubmitData(['error']);
-      expect(sendTopicMessageMock.called(messagesUrl)).toBeFalsy();
+      expect(sendTopicMessageMock).not.toHaveBeenCalled();
       expect(mockNavigate).not.toHaveBeenCalled();
     });
   });
+
+  describe('when schema is empty', () => {
+    beforeEach(() => {
+      (useTopicMessageSchema as jest.Mock).mockImplementation(() => ({
+        data: undefined,
+      }));
+    });
+    it('renders if schema is not defined', async () => {
+      await renderComponent();
+      expect(screen.getAllByRole('textbox')[0].nodeValue).toBeNull();
+    });
+  });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/fixtures.ts
deleted file mode 100644
index 77a3becc444..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/fixtures.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { MessageSchemaSourceEnum } from 'generated-sources';
-
-export const testSchema = {
-  key: {
-    name: 'key',
-    source: MessageSchemaSourceEnum.SCHEMA_REGISTRY,
-    schema: `{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "http://example.com/myURI.schema.json",
-  "title": "TestRecord",
-  "type": "object",
-  "additionalProperties": false,
-  "properties": {
-    "f1": {
-      "type": "integer"
-    },
-    "f2": {
-      "type": "string"
-    },
-    "schema": {
-      "type": "string"
-    }
-  }
-}
-`,
-  },
-  value: {
-    name: 'value',
-    source: MessageSchemaSourceEnum.SCHEMA_REGISTRY,
-    schema: `{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "http://example.com/myURI1.schema.json",
-  "title": "TestRecord",
-  "type": "object",
-  "additionalProperties": false,
-  "properties": {
-    "f1": {
-      "type": "integer"
-    },
-    "f2": {
-      "type": "string"
-    },
-    "schema": {
-      "type": "string"
-    }
-  }
-}
-`,
-  },
-};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/validateMessage.spec.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/validateMessage.spec.ts
index 520fd035f39..cc4e809bde6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/validateMessage.spec.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/validateMessage.spec.ts
@@ -1,8 +1,7 @@
 import validateMessage from 'components/Topics/Topic/SendMessage/validateMessage';
+import { topicMessageSchema } from 'lib/fixtures/topics';
 import cloneDeep from 'lodash/cloneDeep';
 
-import { testSchema } from './fixtures';
-
 describe('validateMessage', () => {
   const defaultValidKey = `{"f1": 32, "f2": "multi-state", "schema": "Bedfordshire violet SAS"}`;
   const defaultValidContent = `{"f1": 21128, "f2": "Health Berkshire", "schema": "Dynamic"}`;
@@ -10,20 +9,20 @@ describe('validateMessage', () => {
   it('should return empty error data if value is empty', () => {
     const key = ``;
     const content = ``;
-    expect(validateMessage(key, content, testSchema)).toEqual([]);
+    expect(validateMessage(key, content, topicMessageSchema)).toEqual([]);
   });
 
   it('should return empty error data if schema is empty', () => {
     const key = `{"f1": 32, "f2": "multi-state", "schema": "Bedfordshire violet SAS"}`;
     const content = `{"f1": 21128, "f2": "Health Berkshire", "schema": "Dynamic"}`;
-    const schema = cloneDeep(testSchema);
+    const schema = cloneDeep(topicMessageSchema);
     schema.key.schema = '';
     schema.value.schema = '';
     expect(validateMessage(key, content, schema)).toEqual([]);
   });
 
   it('should return parsing error data if schema is not parsed with type of key', () => {
-    const schema = cloneDeep(testSchema);
+    const schema = cloneDeep(topicMessageSchema);
     schema.key.schema = '{invalid';
     expect(
       validateMessage(defaultValidKey, defaultValidContent, schema)
@@ -31,7 +30,7 @@ describe('validateMessage', () => {
   });
 
   it('should return parsing error data if schema is not parsed with type of value', () => {
-    const schema = cloneDeep(testSchema);
+    const schema = cloneDeep(topicMessageSchema);
     schema.value.schema = '{invalid';
     expect(
       validateMessage(defaultValidKey, defaultValidContent, schema)
@@ -39,7 +38,7 @@ describe('validateMessage', () => {
   });
 
   it('should return empty error data if schema type is string', () => {
-    const schema = cloneDeep(testSchema);
+    const schema = cloneDeep(topicMessageSchema);
     schema.key.schema = `{"type": "string"}`;
     schema.value.schema = `{"type": "string"}`;
     expect(
@@ -49,20 +48,24 @@ describe('validateMessage', () => {
 
   it('should return  error data if compile Ajv data throws an error', () => {
     expect(
-      validateMessage(defaultValidKey, defaultValidContent, testSchema)
+      validateMessage(defaultValidKey, defaultValidContent, topicMessageSchema)
     ).toEqual([]);
   });
 
   it('returns no errors on correct input data', () => {
     expect(
-      validateMessage(defaultValidContent, defaultValidContent, testSchema)
+      validateMessage(
+        defaultValidContent,
+        defaultValidContent,
+        topicMessageSchema
+      )
     ).toEqual([]);
   });
 
   it('returns errors on invalid input data', () => {
     const key = `{"f1": "32", "f2": "multi-state", "schema": "Bedfordshire violet SAS"}`;
     const content = `{"f1": "21128", "f2": "Health Berkshire", "schema": "Dynamic"}`;
-    expect(validateMessage(key, content, testSchema)).toEqual([
+    expect(validateMessage(key, content, topicMessageSchema)).toEqual([
       'Key/properties/f1/type - must be integer',
       'Content/properties/f1/type - must be integer',
     ]);
@@ -71,7 +74,7 @@ describe('validateMessage', () => {
   it('returns error on broken key value', () => {
     const key = `{"f1": "32", "f2": "multi-state", "schema": "Bedfordshire violet SAS"`;
     const content = `{"f1": 21128, "f2": "Health Berkshire", "schema": "Dynamic"}`;
-    expect(validateMessage(key, content, testSchema)).toEqual([
+    expect(validateMessage(key, content, topicMessageSchema)).toEqual([
       'Error in parsing the "key" field value',
     ]);
   });
@@ -79,7 +82,7 @@ describe('validateMessage', () => {
   it('returns error on broken content value', () => {
     const key = `{"f1": 32, "f2": "multi-state", "schema": "Bedfordshire violet SAS"}`;
     const content = `{"f1": 21128, "f2": "Health Berkshire", "schema": "Dynamic"`;
-    expect(validateMessage(key, content, testSchema)).toEqual([
+    expect(validateMessage(key, content, topicMessageSchema)).toEqual([
       'Error in parsing the "content" field value',
     ]);
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index 14fb518a752..a96152b4d71 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -1,57 +1,36 @@
-import React from 'react';
+import React, { Suspense } from 'react';
 import { Routes, Route } from 'react-router-dom';
-import { ClusterName, TopicName } from 'redux/interfaces';
-import EditContainer from 'components/Topics/Topic/Edit/EditContainer';
-import DetailsContainer from 'components/Topics/Topic/Details/DetailsContainer';
-import PageLoader from 'components/common/PageLoader/PageLoader';
 import {
   clusterTopicEditRelativePath,
   clusterTopicSendMessageRelativePath,
-  RouteParamsClusterTopic,
 } from 'lib/paths';
-import useAppParams from 'lib/hooks/useAppParams';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+import { resetTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
+import { useAppDispatch } from 'lib/hooks/redux';
 
 import SendMessage from './SendMessage/SendMessage';
+import Details from './Details/Details';
+import Edit from './Edit/Edit';
 
-interface TopicProps {
-  isTopicFetching: boolean;
-  resetTopicMessages: () => void;
-  fetchTopicDetails: (payload: {
-    clusterName: ClusterName;
-    topicName: TopicName;
-  }) => void;
-}
-
-const Topic: React.FC<TopicProps> = ({
-  isTopicFetching,
-  fetchTopicDetails,
-  resetTopicMessages,
-}) => {
-  const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
-
-  React.useEffect(() => {
-    fetchTopicDetails({ clusterName, topicName });
-  }, [fetchTopicDetails, clusterName, topicName]);
-
+const Topic: React.FC = () => {
+  const dispatch = useAppDispatch();
   React.useEffect(() => {
     return () => {
-      resetTopicMessages();
+      dispatch(resetTopicMessages());
     };
   }, []);
 
-  if (isTopicFetching) {
-    return <PageLoader />;
-  }
-
   return (
-    <Routes>
-      <Route path="*" element={<DetailsContainer />} />
-      <Route path={clusterTopicEditRelativePath} element={<EditContainer />} />
-      <Route
-        path={clusterTopicSendMessageRelativePath}
-        element={<SendMessage />}
-      />
-    </Routes>
+    <Suspense fallback={<PageLoader />}>
+      <Routes>
+        <Route path="*" element={<Details />} />
+        <Route path={clusterTopicEditRelativePath} element={<Edit />} />
+        <Route
+          path={clusterTopicSendMessageRelativePath}
+          element={<SendMessage />}
+        />
+      </Routes>
+    </Suspense>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/TopicContainer.tsx b/kafka-ui-react-app/src/components/Topics/Topic/TopicContainer.tsx
deleted file mode 100644
index 58e4522d7c0..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/TopicContainer.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import { fetchTopicDetails } from 'redux/reducers/topics/topicsSlice';
-import { resetTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import { getIsTopicDetailsFetching } from 'redux/reducers/topics/selectors';
-
-import Topic from './Topic';
-
-const mapStateToProps = (state: RootState) => ({
-  isTopicFetching: getIsTopicDetailsFetching(state),
-});
-
-const mapDispatchToProps = {
-  fetchTopicDetails,
-  resetTopicMessages,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(Topic);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/__tests__/Topic.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/__tests__/Topic.spec.tsx
index 84880fe3e0f..a1184fe25bf 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/__tests__/Topic.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/__tests__/Topic.spec.tsx
@@ -8,79 +8,62 @@ import {
   clusterTopicSendMessagePath,
   getNonExactPath,
 } from 'lib/paths';
+import { useAppDispatch } from 'lib/hooks/redux';
 
 const topicText = {
-  edit: 'Edit Container',
+  edit: 'Edit',
   send: 'Send Message',
-  detail: 'Details Container',
+  detail: 'Details',
   loading: 'Loading',
 };
 
-jest.mock('components/Topics/Topic/Edit/EditContainer', () => () => (
+jest.mock('components/Topics/Topic/Edit/Edit', () => () => (
   <div>{topicText.edit}</div>
 ));
 jest.mock('components/Topics/Topic/SendMessage/SendMessage', () => () => (
   <div>{topicText.send}</div>
 ));
-jest.mock('components/Topics/Topic/Details/DetailsContainer', () => () => (
+jest.mock('components/Topics/Topic/Details/Details', () => () => (
   <div>{topicText.detail}</div>
 ));
-jest.mock('components/common/PageLoader/PageLoader', () => () => (
-  <div>{topicText.loading}</div>
-));
+
+jest.mock('lib/hooks/redux', () => ({
+  ...jest.requireActual('lib/hooks/redux'),
+  useAppDispatch: jest.fn(),
+}));
+const useDispatchMock = jest.fn(jest.fn());
 
 describe('Topic Component', () => {
-  const resetTopicMessages = jest.fn();
-  const fetchTopicDetailsMock = jest.fn();
+  beforeEach(() => {
+    (useAppDispatch as jest.Mock).mockImplementation(() => useDispatchMock);
+  });
 
-  const renderComponent = (pathname: string, topicFetching: boolean) =>
+  const renderComponent = (pathname: string) =>
     render(
       <WithRoute path={getNonExactPath(clusterTopicPath())}>
-        <Topic
-          isTopicFetching={topicFetching}
-          resetTopicMessages={resetTopicMessages}
-          fetchTopicDetails={fetchTopicDetailsMock}
-        />
+        <Topic />
       </WithRoute>,
       { initialEntries: [pathname] }
     );
 
-  afterEach(() => {
-    resetTopicMessages.mockClear();
-    fetchTopicDetailsMock.mockClear();
-  });
-
   it('renders Edit page', () => {
-    renderComponent(clusterTopicEditPath('local', 'myTopicName'), false);
+    renderComponent(clusterTopicEditPath('local', 'myTopicName'));
     expect(screen.getByText(topicText.edit)).toBeInTheDocument();
   });
 
   it('renders Send Message page', () => {
-    renderComponent(clusterTopicSendMessagePath('local', 'myTopicName'), false);
+    renderComponent(clusterTopicSendMessagePath('local', 'myTopicName'));
     expect(screen.getByText(topicText.send)).toBeInTheDocument();
   });
 
   it('renders Details Container page', () => {
-    renderComponent(clusterTopicPath('local', 'myTopicName'), false);
+    renderComponent(clusterTopicPath('local', 'myTopicName'));
     expect(screen.getByText(topicText.detail)).toBeInTheDocument();
   });
 
-  it('renders Page loader', () => {
-    renderComponent(clusterTopicPath('local', 'myTopicName'), true);
-    expect(screen.getByText(topicText.loading)).toBeInTheDocument();
-  });
-
-  it('fetches topicDetails', () => {
-    renderComponent(clusterTopicPath('local', 'myTopicName'), false);
-    expect(fetchTopicDetailsMock).toHaveBeenCalledTimes(1);
-  });
-
   it('resets topic messages after unmount', () => {
-    const component = renderComponent(
-      clusterTopicPath('local', 'myTopicName'),
-      false
-    );
+    const component = renderComponent(clusterTopicPath('local', 'myTopicName'));
     component.unmount();
-    expect(resetTopicMessages).toHaveBeenCalledTimes(1);
+    expect(useDispatchMock).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topics.tsx b/kafka-ui-react-app/src/components/Topics/Topics.tsx
index 6e1b7e21043..9b0f21a054a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topics.tsx
@@ -8,9 +8,9 @@ import {
 } from 'lib/paths';
 import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 
-import ListContainer from './List/ListContainer';
-import TopicContainer from './Topic/TopicContainer';
 import New from './New/New';
+import ListPage from './List/ListPage';
+import Topic from './Topic/Topic';
 
 const Topics: React.FC = () => (
   <Routes>
@@ -18,7 +18,7 @@ const Topics: React.FC = () => (
       index
       element={
         <BreadcrumbRoute>
-          <ListContainer />
+          <ListPage />
         </BreadcrumbRoute>
       }
     />
@@ -42,7 +42,7 @@ const Topics: React.FC = () => (
       path={getNonExactPath(RouteParams.topicName)}
       element={
         <BreadcrumbRoute>
-          <TopicContainer />
+          <Topic />
         </BreadcrumbRoute>
       }
     />
diff --git a/kafka-ui-react-app/src/components/Topics/__tests__/Topics.spec.tsx b/kafka-ui-react-app/src/components/Topics/__tests__/Topics.spec.tsx
index b699c5ff093..07254c21412 100644
--- a/kafka-ui-react-app/src/components/Topics/__tests__/Topics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/__tests__/Topics.spec.tsx
@@ -10,14 +10,14 @@ import {
   getNonExactPath,
 } from 'lib/paths';
 
-const listContainer = 'listContainer';
-const topicContainer = 'topicContainer';
-const newCopyContainer = 'newCopyContainer';
+const listContainer = 'My List Page';
+const topicContainer = 'My Topic Details Page';
+const newCopyContainer = 'My New/Copy Page';
 
-jest.mock('components/Topics/List/ListContainer', () => () => (
+jest.mock('components/Topics/List/ListPage', () => () => (
   <div>{listContainer}</div>
 ));
-jest.mock('components/Topics/Topic/TopicContainer', () => () => (
+jest.mock('components/Topics/Topic/Topic', () => () => (
   <div>{topicContainer}</div>
 ));
 jest.mock('components/Topics/New/New', () => () => (
diff --git a/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
index 55cfd678869..03e08877feb 100644
--- a/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
@@ -3,8 +3,7 @@ import styled from 'styled-components';
 
 export const Alert = styled.div<{ $type: ToastType }>`
   background-color: ${({ $type, theme }) => theme.alert.color[$type]};
-  min-width: 400px;
-  max-width: 600px;
+  min-width: 500px;
   min-height: 64px;
   border-radius: 8px;
   padding: 12px;
diff --git a/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx b/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
index 9b5c6c562fc..46322856a26 100644
--- a/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
+++ b/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
@@ -3,7 +3,7 @@ import usePagination from 'lib/hooks/usePagination';
 import range from 'lodash/range';
 import React from 'react';
 import PageControl from 'components/common/Pagination/PageControl';
-import useSearch from 'lib/hooks/useSearch';
+import { useSearchParams } from 'react-router-dom';
 
 import * as S from './Pagination.styled';
 
@@ -15,17 +15,16 @@ const NEIGHBOURS = 2;
 
 const Pagination: React.FC<PaginationProps> = ({ totalPages }) => {
   const { page, perPage, pathname } = usePagination();
-  const [searchText] = useSearch();
+  const [searchParams] = useSearchParams();
 
   const currentPage = page || 1;
   const currentPerPage = perPage || PER_PAGE;
 
-  const searchParam = searchText ? `&q=${searchText}` : '';
-  const getPath = (newPage: number) =>
-    `${pathname}?page=${Math.max(
-      newPage,
-      1
-    )}&perPage=${currentPerPage}${searchParam}`;
+  const getPath = (newPage: number) => {
+    searchParams.set('page', Math.max(newPage, 1).toString());
+    searchParams.set('perPage', currentPerPage.toString());
+    return `${pathname}?${searchParams.toString()}`;
+  };
 
   const pages = React.useMemo(() => {
     // Total visible numbers: neighbours, current, first & last
diff --git a/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx b/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
index b3fa869582a..8044999ee22 100644
--- a/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
+++ b/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
@@ -3,7 +3,6 @@ import { TableState } from 'lib/hooks/useTableState';
 import { SortOrder } from 'generated-sources';
 import * as S from 'components/common/table/TableHeaderCell/TableHeaderCell.styled';
 import { DefaultTheme, StyledComponent } from 'styled-components';
-import { ActionsCellProps } from 'components/Topics/List/ActionsCell/ActionsCell';
 
 export interface OrderableProps {
   orderBy: string | null;
@@ -29,7 +28,7 @@ export interface TableCellProps<T, TId extends IdType>
 }
 
 interface TableColumnProps<T, TId extends IdType> {
-  cell?: React.FC<TableCellProps<T, TId> & ActionsCellProps>;
+  cell?: React.FC<TableCellProps<T, TId>>;
   children?: React.ReactElement;
   headerCell?: React.FC<TableHeaderCellProps<T, TId>>;
   field?: string;
diff --git a/kafka-ui-react-app/src/lib/fixtures/topics.ts b/kafka-ui-react-app/src/lib/fixtures/topics.ts
new file mode 100644
index 00000000000..68cf2f80694
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/fixtures/topics.ts
@@ -0,0 +1,210 @@
+import {
+  ConfigSource,
+  ConsumerGroup,
+  ConsumerGroupState,
+  Topic,
+  TopicConfig,
+  MessageSchemaSourceEnum,
+} from 'generated-sources';
+
+export const internalTopicPayload = {
+  name: '__internal.topic',
+  internal: true,
+  partitionCount: 1,
+  replicationFactor: 1,
+  replicas: 1,
+  inSyncReplicas: 1,
+  segmentSize: 0,
+  segmentCount: 1,
+  underReplicatedPartitions: 0,
+  partitions: [
+    {
+      partition: 0,
+      leader: 1,
+      replicas: [{ broker: 1, leader: false, inSync: true }],
+      offsetMax: 0,
+      offsetMin: 0,
+    },
+  ],
+};
+
+export const externalTopicPayload = {
+  name: 'external.topic',
+  internal: false,
+  partitionCount: 1,
+  replicationFactor: 1,
+  replicas: 1,
+  inSyncReplicas: 1,
+  segmentSize: 1263,
+  segmentCount: 1,
+  underReplicatedPartitions: 0,
+  partitions: [
+    {
+      partition: 0,
+      leader: 1,
+      replicas: [{ broker: 1, leader: false, inSync: true }],
+      offsetMax: 0,
+      offsetMin: 0,
+    },
+  ],
+};
+
+export const topicsPayload: Topic[] = [
+  internalTopicPayload,
+  externalTopicPayload,
+];
+
+export const topicConsumerGroups: ConsumerGroup[] = [
+  {
+    groupId: 'amazon.msk.canary.group.broker-7',
+    topics: 0,
+    members: 0,
+    simple: false,
+    partitionAssignor: '',
+    state: ConsumerGroupState.UNKNOWN,
+    coordinator: { id: 1 },
+    messagesBehind: 9,
+  },
+  {
+    groupId: 'amazon.msk.canary.group.broker-4',
+    topics: 0,
+    members: 0,
+    simple: false,
+    partitionAssignor: '',
+    state: ConsumerGroupState.COMPLETING_REBALANCE,
+    coordinator: { id: 1 },
+    messagesBehind: 9,
+  },
+];
+
+export const topicConfigPayload: TopicConfig[] = [
+  {
+    name: 'compression.type',
+    value: 'producer',
+    defaultValue: 'producer',
+    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [
+      {
+        name: 'compression.type',
+        value: 'producer',
+        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
+      },
+      {
+        name: 'compression.type',
+        value: 'producer',
+        source: ConfigSource.DEFAULT_CONFIG,
+      },
+    ],
+  },
+  {
+    name: 'confluent.value.schema.validation',
+    value: 'false',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [],
+  },
+  {
+    name: 'leader.replication.throttled.replicas',
+    value: '',
+    defaultValue: '',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [],
+  },
+  {
+    name: 'confluent.key.subject.name.strategy',
+    value: 'io.confluent.kafka.serializers.subject.TopicNameStrategy',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [],
+  },
+  {
+    name: 'message.downconversion.enable',
+    value: 'true',
+    defaultValue: 'true',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [
+      {
+        name: 'log.message.downconversion.enable',
+        value: 'true',
+        source: ConfigSource.DEFAULT_CONFIG,
+      },
+    ],
+  },
+  {
+    name: 'min.insync.replicas',
+    value: '1',
+    defaultValue: '1',
+    source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [
+      {
+        name: 'min.insync.replicas',
+        value: '1',
+        source: ConfigSource.DYNAMIC_TOPIC_CONFIG,
+      },
+      {
+        name: 'min.insync.replicas',
+        value: '1',
+        source: ConfigSource.DEFAULT_CONFIG,
+      },
+    ],
+  },
+];
+
+export const topicMessageSchema = {
+  key: {
+    name: 'key',
+    source: MessageSchemaSourceEnum.SCHEMA_REGISTRY,
+    schema: `{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "http://example.com/myURI.schema.json",
+  "title": "TestRecord",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "f1": {
+      "type": "integer"
+    },
+    "f2": {
+      "type": "string"
+    },
+    "schema": {
+      "type": "string"
+    }
+  }
+}
+`,
+  },
+  value: {
+    name: 'value',
+    source: MessageSchemaSourceEnum.SCHEMA_REGISTRY,
+    schema: `{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "http://example.com/myURI1.schema.json",
+  "title": "TestRecord",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "f1": {
+      "type": "integer"
+    },
+    "f2": {
+      "type": "string"
+    },
+    "schema": {
+      "type": "string"
+    }
+  }
+}
+`,
+  },
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/brokers.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/brokers.spec.ts
new file mode 100644
index 00000000000..9a8445989ce
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/brokers.spec.ts
@@ -0,0 +1,48 @@
+import { waitFor } from '@testing-library/react';
+import { renderQueryHook } from 'lib/testHelpers';
+import * as hooks from 'lib/hooks/api/brokers';
+import fetchMock from 'fetch-mock';
+import { UseQueryResult } from '@tanstack/react-query';
+
+const clusterName = 'test-cluster';
+const brokerId = 1;
+const brokersPath = `/api/clusters/${clusterName}/brokers`;
+const brokerPath = `${brokersPath}/${brokerId}`;
+
+const expectQueryWorks = async (
+  mock: fetchMock.FetchMockStatic,
+  result: { current: UseQueryResult<unknown, unknown> }
+) => {
+  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
+  expect(mock.calls()).toHaveLength(1);
+  expect(result.current.data).toBeDefined();
+};
+
+describe('Brokers hooks', () => {
+  beforeEach(() => fetchMock.restore());
+  describe('useBrokers', () => {
+    it('useBrokers', async () => {
+      const mock = fetchMock.getOnce(brokersPath, []);
+      const { result } = renderQueryHook(() => hooks.useBrokers(clusterName));
+      await expectQueryWorks(mock, result);
+    });
+  });
+  describe('useBrokerMetrics', () => {
+    it('useBrokerMetrics', async () => {
+      const mock = fetchMock.getOnce(`${brokerPath}/metrics`, {});
+      const { result } = renderQueryHook(() =>
+        hooks.useBrokerMetrics(clusterName, brokerId)
+      );
+      await expectQueryWorks(mock, result);
+    });
+  });
+  describe('useBrokerLogDirs', () => {
+    it('useBrokerLogDirs', async () => {
+      const mock = fetchMock.getOnce(`${brokersPath}/logdirs?broker=1`, []);
+      const { result } = renderQueryHook(() =>
+        hooks.useBrokerLogDirs(clusterName, brokerId)
+      );
+      await expectQueryWorks(mock, result);
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/clusters.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/clusters.spec.ts
new file mode 100644
index 00000000000..4e79b91d988
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/clusters.spec.ts
@@ -0,0 +1,40 @@
+import { waitFor } from '@testing-library/react';
+import { renderQueryHook } from 'lib/testHelpers';
+import * as hooks from 'lib/hooks/api/clusters';
+import fetchMock from 'fetch-mock';
+import { UseQueryResult } from '@tanstack/react-query';
+import { clustersPayload } from 'lib/fixtures/clusters';
+
+const clusterName = 'test-cluster';
+
+const expectQueryWorks = async (
+  mock: fetchMock.FetchMockStatic,
+  result: { current: UseQueryResult<unknown, unknown> }
+) => {
+  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
+  expect(mock.calls()).toHaveLength(1);
+  expect(result.current.data).toBeDefined();
+};
+
+describe('Clusters hooks', () => {
+  beforeEach(() => fetchMock.restore());
+  describe('useClusters', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce('/api/clusters', clustersPayload);
+      const { result } = renderQueryHook(() => hooks.useClusters());
+      await expectQueryWorks(mock, result);
+    });
+  });
+  describe('useClusterStats', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce(
+        `/api/clusters/${clusterName}/stats`,
+        clustersPayload
+      );
+      const { result } = renderQueryHook(() =>
+        hooks.useClusterStats(clusterName)
+      );
+      await expectQueryWorks(mock, result);
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
new file mode 100644
index 00000000000..6ae7fa87093
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
@@ -0,0 +1,177 @@
+import { act, renderHook, waitFor } from '@testing-library/react';
+import { renderQueryHook, TestQueryClientProvider } from 'lib/testHelpers';
+import * as hooks from 'lib/hooks/api/topics';
+import fetchMock from 'fetch-mock';
+import { UseQueryResult } from '@tanstack/react-query';
+import { externalTopicPayload, topicConfigPayload } from 'lib/fixtures/topics';
+import { TopicFormData, TopicFormDataRaw } from 'redux/interfaces';
+import { CreateTopicMessage } from 'generated-sources';
+
+const clusterName = 'test-cluster';
+const topicName = 'test-topic';
+
+const expectQueryWorks = async (
+  mock: fetchMock.FetchMockStatic,
+  result: { current: UseQueryResult<unknown, unknown> }
+) => {
+  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
+  expect(mock.calls()).toHaveLength(1);
+  expect(result.current.data).toBeDefined();
+};
+
+const topicsPath = `/api/clusters/${clusterName}/topics`;
+const topicPath = `${topicsPath}/${topicName}`;
+
+const topicParams = { clusterName, topicName };
+
+describe('Topics hooks', () => {
+  beforeEach(() => fetchMock.restore());
+  it('handles useTopics', async () => {
+    const mock = fetchMock.getOnce(topicsPath, []);
+    const { result } = renderQueryHook(() => hooks.useTopics({ clusterName }));
+    await expectQueryWorks(mock, result);
+  });
+  it('handles useTopicDetails', async () => {
+    const mock = fetchMock.getOnce(topicPath, externalTopicPayload);
+    const { result } = renderQueryHook(() =>
+      hooks.useTopicDetails(topicParams)
+    );
+    await expectQueryWorks(mock, result);
+  });
+  it('handles useTopicConfig', async () => {
+    const mock = fetchMock.getOnce(`${topicPath}/config`, topicConfigPayload);
+    const { result } = renderQueryHook(() => hooks.useTopicConfig(topicParams));
+    await expectQueryWorks(mock, result);
+  });
+  it('handles useTopicConsumerGroups', async () => {
+    const mock = fetchMock.getOnce(`${topicPath}/consumer-groups`, []);
+    const { result } = renderQueryHook(() =>
+      hooks.useTopicConsumerGroups(topicParams)
+    );
+    await expectQueryWorks(mock, result);
+  });
+  it('handles useTopicMessageSchema', async () => {
+    const mock = fetchMock.getOnce(`${topicPath}/messages/schema`, {});
+    const { result } = renderQueryHook(() =>
+      hooks.useTopicMessageSchema(topicParams)
+    );
+    await expectQueryWorks(mock, result);
+  });
+
+  describe('mutatations', () => {
+    it('useCreateTopic', async () => {
+      const mock = fetchMock.postOnce(topicsPath, {});
+      const { result } = renderHook(() => hooks.useCreateTopic(clusterName), {
+        wrapper: TestQueryClientProvider,
+      });
+      const formData: TopicFormData = {
+        name: 'Topic Name',
+        partitions: 0,
+        replicationFactor: 0,
+        minInSyncReplicas: 0,
+        cleanupPolicy: '',
+        retentionMs: 0,
+        retentionBytes: 0,
+        maxMessageBytes: 0,
+        customParams: [],
+      };
+      await act(() => {
+        result.current.mutateAsync(formData);
+      });
+      await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+      expect(mock.calls()).toHaveLength(1);
+    });
+
+    it('useUpdateTopic', async () => {
+      const mock = fetchMock.patchOnce(topicPath, {});
+      const { result } = renderHook(() => hooks.useUpdateTopic(topicParams), {
+        wrapper: TestQueryClientProvider,
+      });
+      const formData: TopicFormDataRaw = {
+        name: 'Topic Name',
+        partitions: 0,
+        replicationFactor: 0,
+        minInSyncReplicas: 0,
+        cleanupPolicy: '',
+        retentionMs: 0,
+        retentionBytes: 0,
+        maxMessageBytes: 0,
+        customParams: {
+          byIndex: {},
+          allIndexes: [],
+        },
+      };
+      await act(() => {
+        result.current.mutateAsync(formData);
+      });
+      await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+      expect(mock.calls()).toHaveLength(1);
+    });
+
+    it('useIncreaseTopicPartitionsCount', async () => {
+      const mock = fetchMock.patchOnce(`${topicPath}/partitions`, {});
+      const { result } = renderHook(
+        () => hooks.useIncreaseTopicPartitionsCount(topicParams),
+        { wrapper: TestQueryClientProvider }
+      );
+      await act(() => {
+        result.current.mutateAsync(3);
+      });
+      await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+      expect(mock.calls()).toHaveLength(1);
+    });
+
+    it('useUpdateTopicReplicationFactor', async () => {
+      const mock = fetchMock.patchOnce(`${topicPath}/replications`, {});
+      const { result } = renderHook(
+        () => hooks.useUpdateTopicReplicationFactor(topicParams),
+        { wrapper: TestQueryClientProvider }
+      );
+      await act(() => {
+        result.current.mutateAsync(3);
+      });
+      await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+      expect(mock.calls()).toHaveLength(1);
+    });
+
+    it('useDeleteTopic', async () => {
+      const mock = fetchMock.deleteOnce(topicPath, {});
+      const { result } = renderHook(() => hooks.useDeleteTopic(clusterName), {
+        wrapper: TestQueryClientProvider,
+      });
+      await act(() => {
+        result.current.mutateAsync(topicName);
+      });
+      await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+      expect(mock.calls()).toHaveLength(1);
+    });
+
+    it('useRecreateTopic', async () => {
+      const mock = fetchMock.postOnce(topicPath, {});
+      const { result } = renderHook(() => hooks.useRecreateTopic(topicParams), {
+        wrapper: TestQueryClientProvider,
+      });
+      await act(() => {
+        result.current.mutateAsync();
+      });
+      await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+      expect(mock.calls()).toHaveLength(1);
+    });
+
+    it('useSendMessage', async () => {
+      const mock = fetchMock.postOnce(`${topicPath}/messages`, {});
+      const { result } = renderHook(() => hooks.useSendMessage(topicParams), {
+        wrapper: TestQueryClientProvider,
+      });
+      const message: CreateTopicMessage = {
+        partition: 0,
+        content: 'Hello World',
+      };
+      await act(() => {
+        result.current.mutateAsync(message);
+      });
+      await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+      expect(mock.calls()).toHaveLength(1);
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
new file mode 100644
index 00000000000..ccd4a93e4ef
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -0,0 +1,238 @@
+import {
+  topicsApiClient as api,
+  messagesApiClient as messagesApi,
+  consumerGroupsApiClient,
+} from 'lib/api';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import {
+  ClusterName,
+  TopicFormData,
+  TopicFormDataRaw,
+  TopicFormFormattedParams,
+} from 'redux/interfaces';
+import {
+  CreateTopicMessage,
+  GetTopicDetailsRequest,
+  GetTopicsRequest,
+  Topic,
+  TopicConfig,
+  TopicCreation,
+  TopicUpdate,
+} from 'generated-sources';
+import { showServerError, showSuccessAlert } from 'lib/errorHandling';
+
+export const topicKeys = {
+  all: (clusterName: ClusterName) =>
+    ['clusters', clusterName, 'topics'] as const,
+  list: (
+    clusterName: ClusterName,
+    filters: Omit<GetTopicsRequest, 'clusterName'>
+  ) => [...topicKeys.all(clusterName), filters] as const,
+  details: ({ clusterName, topicName }: GetTopicDetailsRequest) =>
+    [...topicKeys.all(clusterName), topicName] as const,
+  config: (props: GetTopicDetailsRequest) =>
+    [...topicKeys.details(props), 'config'] as const,
+  schema: (props: GetTopicDetailsRequest) =>
+    [...topicKeys.details(props), 'schema'] as const,
+  consumerGroups: (props: GetTopicDetailsRequest) =>
+    [...topicKeys.details(props), 'consumerGroups'] as const,
+};
+
+export function useTopics(props: GetTopicsRequest) {
+  const { clusterName, ...filters } = props;
+  return useQuery(topicKeys.list(clusterName, filters), () =>
+    api.getTopics(props)
+  );
+}
+export function useTopicDetails(props: GetTopicDetailsRequest) {
+  return useQuery(topicKeys.details(props), () => api.getTopicDetails(props));
+}
+export function useTopicConfig(props: GetTopicDetailsRequest) {
+  return useQuery(topicKeys.config(props), () => api.getTopicConfigs(props));
+}
+export function useTopicConsumerGroups(props: GetTopicDetailsRequest) {
+  return useQuery(topicKeys.consumerGroups(props), () =>
+    consumerGroupsApiClient.getTopicConsumerGroups(props)
+  );
+}
+
+const topicReducer = (
+  result: TopicFormFormattedParams,
+  customParam: TopicConfig
+) => {
+  return {
+    ...result,
+    [customParam.name]: customParam.value,
+  };
+};
+const formatTopicCreation = (form: TopicFormData): TopicCreation => {
+  const {
+    name,
+    partitions,
+    replicationFactor,
+    cleanupPolicy,
+    retentionBytes,
+    retentionMs,
+    maxMessageBytes,
+    minInSyncReplicas,
+    customParams,
+  } = form;
+
+  return {
+    name,
+    partitions,
+    replicationFactor,
+    configs: {
+      'cleanup.policy': cleanupPolicy,
+      'retention.ms': retentionMs.toString(),
+      'retention.bytes': retentionBytes.toString(),
+      'max.message.bytes': maxMessageBytes.toString(),
+      'min.insync.replicas': minInSyncReplicas.toString(),
+      ...Object.values(customParams || {}).reduce(topicReducer, {}),
+    },
+  };
+};
+
+export function useCreateTopic(clusterName: ClusterName) {
+  const client = useQueryClient();
+  return useMutation(
+    (data: TopicFormData) =>
+      api.createTopic({
+        clusterName,
+        topicCreation: formatTopicCreation(data),
+      }),
+    {
+      onSuccess: () => {
+        showSuccessAlert({
+          message: `Topic successfully created.`,
+        });
+        client.invalidateQueries(topicKeys.all(clusterName));
+      },
+    }
+  );
+}
+
+const formatTopicUpdate = (form: TopicFormDataRaw): TopicUpdate => {
+  const {
+    cleanupPolicy,
+    retentionBytes,
+    retentionMs,
+    maxMessageBytes,
+    minInSyncReplicas,
+    customParams,
+  } = form;
+
+  return {
+    configs: {
+      ...Object.values(customParams || {}).reduce(topicReducer, {}),
+      'cleanup.policy': cleanupPolicy,
+      'retention.ms': retentionMs,
+      'retention.bytes': retentionBytes,
+      'max.message.bytes': maxMessageBytes,
+      'min.insync.replicas': minInSyncReplicas,
+    },
+  };
+};
+
+export function useUpdateTopic(props: GetTopicDetailsRequest) {
+  const client = useQueryClient();
+  return useMutation(
+    (data: TopicFormDataRaw) =>
+      api.updateTopic({ ...props, topicUpdate: formatTopicUpdate(data) }),
+    {
+      onSuccess: () => {
+        showSuccessAlert({
+          message: `Topic successfully updated.`,
+        });
+        client.invalidateQueries(topicKeys.all(props.clusterName));
+      },
+    }
+  );
+}
+export function useIncreaseTopicPartitionsCount(props: GetTopicDetailsRequest) {
+  const client = useQueryClient();
+  return useMutation(
+    (totalPartitionsCount: number) =>
+      api.increaseTopicPartitions({
+        ...props,
+        partitionsIncrease: { totalPartitionsCount },
+      }),
+    {
+      onSuccess: () => {
+        showSuccessAlert({
+          message: `Number of partitions successfully increased`,
+        });
+        client.invalidateQueries(topicKeys.all(props.clusterName));
+      },
+    }
+  );
+}
+export function useUpdateTopicReplicationFactor(props: GetTopicDetailsRequest) {
+  const client = useQueryClient();
+  return useMutation(
+    (totalReplicationFactor: number) =>
+      api.changeReplicationFactor({
+        ...props,
+        replicationFactorChange: { totalReplicationFactor },
+      }),
+    {
+      onSuccess: () => {
+        showSuccessAlert({
+          message: `Replication factor successfully updated`,
+        });
+        client.invalidateQueries(topicKeys.all(props.clusterName));
+      },
+    }
+  );
+}
+export function useDeleteTopic(clusterName: ClusterName) {
+  const client = useQueryClient();
+  return useMutation(
+    (topicName: Topic['name']) => api.deleteTopic({ clusterName, topicName }),
+    {
+      onSuccess: (_, topicName) => {
+        showSuccessAlert({
+          message: `Topic ${topicName} successfully deleted!`,
+        });
+        client.invalidateQueries(topicKeys.all(clusterName));
+      },
+    }
+  );
+}
+export function useRecreateTopic(props: GetTopicDetailsRequest) {
+  const client = useQueryClient();
+  return useMutation(() => api.recreateTopic(props), {
+    onSuccess: () => {
+      showSuccessAlert({
+        message: `Topic ${props.topicName} successfully recreated!`,
+      });
+      client.invalidateQueries(topicKeys.all(props.clusterName));
+    },
+  });
+}
+
+export function useTopicMessageSchema(props: GetTopicDetailsRequest) {
+  return useQuery(topicKeys.schema(props), () =>
+    messagesApi.getTopicSchema(props)
+  );
+}
+export function useSendMessage(props: GetTopicDetailsRequest) {
+  const client = useQueryClient();
+  return useMutation(
+    (message: CreateTopicMessage) =>
+      messagesApi.sendTopicMessages({ ...props, createTopicMessage: message }),
+    {
+      onSuccess: () => {
+        showSuccessAlert({
+          message: `Message successfully sent`,
+        });
+        client.invalidateQueries(topicKeys.all(props.clusterName));
+      },
+      onError: (e) => {
+        showServerError(e as Response, {
+          message: `Error in sending a message to ${props.topicName}`,
+        });
+      },
+    }
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/useConfirm.ts b/kafka-ui-react-app/src/lib/hooks/useConfirm.ts
index d2ea9441889..1387f7666b3 100644
--- a/kafka-ui-react-app/src/lib/hooks/useConfirm.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useConfirm.ts
@@ -3,8 +3,10 @@ import React, { useContext } from 'react';
 
 export const useConfirm = () => {
   const context = useContext(ConfirmContext);
-
-  return (message: React.ReactNode, callback: () => void | Promise<void>) => {
+  return (
+    message: React.ReactNode,
+    callback: () => void | Promise<unknown>
+  ) => {
     context?.setContent(message);
     context?.setConfirm(() => async () => {
       await callback();
diff --git a/kafka-ui-react-app/src/redux/interfaces/topic.ts b/kafka-ui-react-app/src/redux/interfaces/topic.ts
index a55cff4e3cf..4cb4f7c089b 100644
--- a/kafka-ui-react-app/src/redux/interfaces/topic.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/topic.ts
@@ -1,14 +1,9 @@
 import {
   Topic,
-  TopicDetails,
   TopicConfig,
   TopicCreation,
-  ConsumerGroup,
-  TopicColumnsToSort,
   TopicMessage,
   TopicMessageConsuming,
-  TopicMessageSchema,
-  SortOrder,
 } from 'generated-sources';
 
 export type TopicName = Topic['name'];
@@ -26,22 +21,6 @@ interface TopicFormCustomParams {
   allIndexes: TopicName[];
 }
 
-export interface TopicWithDetailedInfo extends Topic, TopicDetails {
-  config?: TopicConfig[];
-  consumerGroups?: ConsumerGroup[];
-  messageSchema?: TopicMessageSchema;
-}
-
-export interface TopicsState {
-  byName: { [topicName: string]: TopicWithDetailedInfo };
-  allNames: TopicName[];
-  totalPages: number;
-  search: string;
-  orderBy: TopicColumnsToSort | null;
-  sortOrder: SortOrder;
-  consumerGroups: ConsumerGroup[];
-}
-
 export type TopicFormFormattedParams = TopicCreation['configs'];
 
 export interface TopicFormDataRaw {
diff --git a/kafka-ui-react-app/src/redux/reducers/index.ts b/kafka-ui-react-app/src/redux/reducers/index.ts
index 92b9246318d..9cb88ad8404 100644
--- a/kafka-ui-react-app/src/redux/reducers/index.ts
+++ b/kafka-ui-react-app/src/redux/reducers/index.ts
@@ -2,13 +2,11 @@ import { combineReducers } from '@reduxjs/toolkit';
 import loader from 'redux/reducers/loader/loaderSlice';
 import schemas from 'redux/reducers/schemas/schemasSlice';
 import topicMessages from 'redux/reducers/topicMessages/topicMessagesSlice';
-import topics from 'redux/reducers/topics/topicsSlice';
 import consumerGroups from 'redux/reducers/consumerGroups/consumerGroupsSlice';
 import ksqlDb from 'redux/reducers/ksqlDb/ksqlDbSlice';
 
 export default combineReducers({
   loader,
-  topics,
   topicMessages,
   consumerGroups,
   schemas,
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
index 7f127341e19..5de97980f31 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
@@ -6,7 +6,6 @@ import {
   showServerError,
   showSuccessAlert,
 } from 'lib/errorHandling';
-import { fetchTopicDetails } from 'redux/reducers/topics/topicsSlice';
 import { messagesApiClient } from 'lib/api';
 
 export const clearTopicMessages = createAsyncThunk<
@@ -14,22 +13,17 @@ export const clearTopicMessages = createAsyncThunk<
   { clusterName: ClusterName; topicName: TopicName; partitions?: number[] }
 >(
   'topicMessages/clearTopicMessages',
-  async (
-    { clusterName, topicName, partitions },
-    { rejectWithValue, dispatch }
-  ) => {
+  async ({ clusterName, topicName, partitions }, { rejectWithValue }) => {
     try {
       await messagesApiClient.deleteTopicMessages({
         clusterName,
         topicName,
         partitions,
       });
-      dispatch(fetchTopicDetails({ clusterName, topicName }));
       showSuccessAlert({
         id: `message-${topicName}-${clusterName}-${partitions}`,
         message: `${topicName} messages have been successfully cleared!`,
       });
-
       return undefined;
     } catch (err) {
       showServerError(err as Response);
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/topics/__test__/fixtures.ts
deleted file mode 100644
index d7296d4b396..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/topics/__test__/fixtures.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { SortOrder, Topic, ConsumerGroup } from 'generated-sources';
-import { TopicsState, TopicWithDetailedInfo } from 'redux/interfaces';
-
-export const internalTopicPayload = {
-  name: '__internal.topic',
-  internal: true,
-  partitionCount: 1,
-  replicationFactor: 1,
-  replicas: 1,
-  inSyncReplicas: 1,
-  segmentSize: 0,
-  segmentCount: 1,
-  underReplicatedPartitions: 0,
-  partitions: [
-    {
-      partition: 0,
-      leader: 1,
-      replicas: [{ broker: 1, leader: false, inSync: true }],
-      offsetMax: 0,
-      offsetMin: 0,
-    },
-  ],
-};
-
-export const externalTopicPayload = {
-  name: 'external.topic',
-  internal: false,
-  partitionCount: 1,
-  replicationFactor: 1,
-  replicas: 1,
-  inSyncReplicas: 1,
-  segmentSize: 1263,
-  segmentCount: 1,
-  underReplicatedPartitions: 0,
-  partitions: [
-    {
-      partition: 0,
-      leader: 1,
-      replicas: [{ broker: 1, leader: false, inSync: true }],
-      offsetMax: 0,
-      offsetMin: 0,
-    },
-  ],
-};
-
-export const topicsPayload: Topic[] = [
-  internalTopicPayload,
-  externalTopicPayload,
-];
-
-export const getTopicStateFixtures = (
-  topics: TopicWithDetailedInfo[],
-  consumerGroups?: ConsumerGroup[]
-): TopicsState => {
-  const byName = topics.reduce((acc: { [i in string]: Topic }, curr) => {
-    const obj = { ...acc };
-    obj[curr.name] = curr;
-    return obj;
-  }, {} as { [i in string]: Topic });
-
-  const allNames = Object.keys(byName);
-
-  return {
-    byName,
-    allNames,
-    totalPages: 1,
-    search: '',
-    orderBy: null,
-    sortOrder: SortOrder.ASC,
-    consumerGroups:
-      consumerGroups && consumerGroups.length ? consumerGroups : [],
-  };
-};
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/topics/__test__/selectors.spec.ts
deleted file mode 100644
index b1c6ddc2042..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/topics/__test__/selectors.spec.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { store } from 'redux/store';
-import * as selectors from 'redux/reducers/topics/selectors';
-
-describe('Topics selectors', () => {
-  describe('Initial State', () => {
-    it('returns initial values', () => {
-      expect(selectors.getTopicListTotalPages(store.getState())).toEqual(1);
-      expect(selectors.getIsTopicDeleted(store.getState())).toBeFalsy();
-      expect(selectors.getAreTopicsFetching(store.getState())).toEqual(false);
-      expect(selectors.getAreTopicsFetched(store.getState())).toEqual(false);
-      expect(selectors.getIsTopicDetailsFetching(store.getState())).toEqual(
-        false
-      );
-      expect(selectors.getIsTopicDetailsFetched(store.getState())).toEqual(
-        false
-      );
-      expect(selectors.getTopicConfigFetched(store.getState())).toEqual(false);
-      expect(selectors.getTopicCreated(store.getState())).toEqual(false);
-      expect(selectors.getTopicUpdated(store.getState())).toEqual(false);
-      expect(selectors.getTopicMessageSchemaFetched(store.getState())).toEqual(
-        false
-      );
-      expect(
-        selectors.getTopicsConsumerGroupsFetched(store.getState())
-      ).toEqual(false);
-      expect(selectors.getTopicList(store.getState())).toEqual([]);
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts b/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts
deleted file mode 100644
index e9af5894ab1..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/topics/selectors.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-import { createSelector } from '@reduxjs/toolkit';
-import { RootState, TopicName, TopicsState } from 'redux/interfaces';
-import { CleanUpPolicy } from 'generated-sources';
-import { createFetchingSelector } from 'redux/reducers/loader/selectors';
-import {
-  fetchTopicsList,
-  fetchTopicDetails,
-  fetchTopicConfig,
-  updateTopic,
-  fetchTopicMessageSchema,
-  fetchTopicConsumerGroups,
-  createTopic,
-  deleteTopic,
-} from 'redux/reducers/topics/topicsSlice';
-import { AsyncRequestStatus } from 'lib/constants';
-
-const topicsState = ({ topics }: RootState): TopicsState => topics;
-
-const getAllNames = (state: RootState) => topicsState(state).allNames;
-const getTopicMap = (state: RootState) => topicsState(state).byName;
-
-export const getTopicListTotalPages = (state: RootState) =>
-  topicsState(state).totalPages;
-
-const getTopicDeletingStatus = createFetchingSelector(deleteTopic.typePrefix);
-
-export const getIsTopicDeleted = createSelector(
-  getTopicDeletingStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-const getAreTopicsFetchingStatus = createFetchingSelector(
-  fetchTopicsList.typePrefix
-);
-
-export const getAreTopicsFetching = createSelector(
-  getAreTopicsFetchingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-export const getAreTopicsFetched = createSelector(
-  getAreTopicsFetchingStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-const getTopicDetailsFetchingStatus = createFetchingSelector(
-  fetchTopicDetails.typePrefix
-);
-
-export const getIsTopicDetailsFetching = createSelector(
-  getTopicDetailsFetchingStatus,
-  (status) => status === AsyncRequestStatus.pending
-);
-
-export const getIsTopicDetailsFetched = createSelector(
-  getTopicDetailsFetchingStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-const getTopicConfigFetchingStatus = createFetchingSelector(
-  fetchTopicConfig.typePrefix
-);
-
-export const getTopicConfigFetched = createSelector(
-  getTopicConfigFetchingStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-const getTopicCreationStatus = createFetchingSelector(createTopic.typePrefix);
-
-export const getTopicCreated = createSelector(
-  getTopicCreationStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-const getTopicUpdateStatus = createFetchingSelector(updateTopic.typePrefix);
-
-export const getTopicUpdated = createSelector(
-  getTopicUpdateStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-const getTopicMessageSchemaFetchingStatus = createFetchingSelector(
-  fetchTopicMessageSchema.typePrefix
-);
-
-export const getTopicMessageSchemaFetched = createSelector(
-  getTopicMessageSchemaFetchingStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-const getTopicConsumerGroupsStatus = createFetchingSelector(
-  fetchTopicConsumerGroups.typePrefix
-);
-
-export const getTopicsConsumerGroupsFetched = createSelector(
-  getTopicConsumerGroupsStatus,
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-export const getTopicList = createSelector(
-  getAreTopicsFetched,
-  getAllNames,
-  getTopicMap,
-  (isFetched, allNames, byName) => {
-    if (!isFetched) {
-      return [];
-    }
-    return allNames.map((name) => byName[name]);
-  }
-);
-
-const getTopicName = (_: RootState, topicName: TopicName) => topicName;
-
-export const getTopicByName = createSelector(
-  getTopicMap,
-  getTopicName,
-  (topics, topicName) => topics[topicName] || {}
-);
-
-export const getPartitionsByTopicName = createSelector(
-  getTopicMap,
-  getTopicName,
-  (topics, topicName) => topics[topicName]?.partitions || []
-);
-
-export const getFullTopic = createSelector(getTopicByName, (topic) =>
-  topic && topic.config && !!topic.partitionCount ? topic : undefined
-);
-
-export const getTopicConfig = createSelector(
-  getTopicByName,
-  ({ config }) => config
-);
-
-export const getIsTopicDeletePolicy = createSelector(
-  getTopicByName,
-  (topic) => {
-    return topic?.cleanUpPolicy === CleanUpPolicy.DELETE;
-  }
-);
-
-export const getTopicsSearch = createSelector(
-  topicsState,
-  (state) => state.search
-);
-
-export const getTopicsOrderBy = createSelector(
-  topicsState,
-  (state) => state.orderBy
-);
-
-export const getTopicsSortOrder = createSelector(
-  topicsState,
-  (state) => state.sortOrder
-);
-
-export const getIsTopicInternal = createSelector(
-  getTopicByName,
-  (topic) => !!topic?.internal
-);
-
-export const getTopicConsumerGroups = createSelector(
-  getTopicByName,
-  ({ consumerGroups }) => consumerGroups || []
-);
-
-export const getMessageSchemaByTopicName = createSelector(
-  getTopicByName,
-  (topic) => topic?.messageSchema
-);
diff --git a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts b/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
deleted file mode 100644
index 3990c2dc3bc..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/topics/topicsSlice.ts
+++ /dev/null
@@ -1,454 +0,0 @@
-import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import {
-  TopicsResponse,
-  TopicDetails,
-  GetTopicsRequest,
-  GetTopicDetailsRequest,
-  GetTopicConfigsRequest,
-  TopicConfig,
-  TopicCreation,
-  ConsumerGroup,
-  Topic,
-  TopicUpdate,
-  DeleteTopicRequest,
-  RecreateTopicRequest,
-  SortOrder,
-  TopicColumnsToSort,
-  GetTopicSchemaRequest,
-  TopicMessageSchema,
-} from 'generated-sources';
-import {
-  TopicsState,
-  TopicName,
-  TopicFormData,
-  TopicFormFormattedParams,
-  TopicFormDataRaw,
-  ClusterName,
-} from 'redux/interfaces';
-import {
-  getResponse,
-  showServerError,
-  showSuccessAlert,
-} from 'lib/errorHandling';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import {
-  consumerGroupsApiClient,
-  messagesApiClient,
-  topicsApiClient,
-} from 'lib/api';
-
-export const fetchTopicsList = createAsyncThunk<
-  TopicsResponse,
-  GetTopicsRequest
->('topic/fetchTopicsList', async (payload, { rejectWithValue }) => {
-  try {
-    return await topicsApiClient.getTopics(payload);
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-export const fetchTopicDetails = createAsyncThunk<
-  { topicDetails: TopicDetails; topicName: TopicName },
-  GetTopicDetailsRequest
->('topic/fetchTopicDetails', async (payload, { rejectWithValue }) => {
-  try {
-    const { topicName } = payload;
-    const topicDetails = await topicsApiClient.getTopicDetails(payload);
-
-    return { topicDetails, topicName };
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-export const fetchTopicConfig = createAsyncThunk<
-  { topicConfig: TopicConfig[]; topicName: TopicName },
-  GetTopicConfigsRequest
->('topic/fetchTopicConfig', async (payload, { rejectWithValue }) => {
-  try {
-    const { topicName } = payload;
-    const topicConfig = await topicsApiClient.getTopicConfigs(payload);
-
-    return { topicConfig, topicName };
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-const topicReducer = (
-  result: TopicFormFormattedParams,
-  customParam: TopicConfig
-) => {
-  return {
-    ...result,
-    [customParam.name]: customParam.value,
-  };
-};
-
-const formatTopicCreation = (form: TopicFormData): TopicCreation => {
-  const {
-    name,
-    partitions,
-    replicationFactor,
-    cleanupPolicy,
-    retentionBytes,
-    retentionMs,
-    maxMessageBytes,
-    minInSyncReplicas,
-    customParams,
-  } = form;
-
-  return {
-    name,
-    partitions,
-    replicationFactor,
-    configs: {
-      'cleanup.policy': cleanupPolicy,
-      'retention.ms': retentionMs.toString(),
-      'retention.bytes': retentionBytes.toString(),
-      'max.message.bytes': maxMessageBytes.toString(),
-      'min.insync.replicas': minInSyncReplicas.toString(),
-      ...Object.values(customParams || {}).reduce(topicReducer, {}),
-    },
-  };
-};
-
-export const createTopic = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    data: TopicFormData;
-  }
->('topic/createTopic', async (payload, { rejectWithValue }) => {
-  try {
-    const { data, clusterName } = payload;
-    await topicsApiClient.createTopic({
-      clusterName,
-      topicCreation: formatTopicCreation(data),
-    });
-    showSuccessAlert({
-      message: `Topic ${data.name} created successfully`,
-    });
-    return undefined;
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-export const fetchTopicConsumerGroups = createAsyncThunk<
-  { consumerGroups: ConsumerGroup[]; topicName: TopicName },
-  GetTopicConfigsRequest
->('topic/fetchTopicConsumerGroups', async (payload, { rejectWithValue }) => {
-  try {
-    const { topicName } = payload;
-    const consumerGroups = await consumerGroupsApiClient.getTopicConsumerGroups(
-      payload
-    );
-
-    return { consumerGroups, topicName };
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-const formatTopicUpdate = (form: TopicFormDataRaw): TopicUpdate => {
-  const {
-    cleanupPolicy,
-    retentionBytes,
-    retentionMs,
-    maxMessageBytes,
-    minInSyncReplicas,
-    customParams,
-  } = form;
-
-  return {
-    configs: {
-      ...Object.values(customParams || {}).reduce(topicReducer, {}),
-      'cleanup.policy': cleanupPolicy,
-      'retention.ms': retentionMs,
-      'retention.bytes': retentionBytes,
-      'max.message.bytes': maxMessageBytes,
-      'min.insync.replicas': minInSyncReplicas,
-    },
-  };
-};
-
-export const updateTopic = createAsyncThunk<
-  { topic: Topic },
-  {
-    clusterName: ClusterName;
-    topicName: TopicName;
-    form: TopicFormDataRaw;
-  }
->(
-  'topic/updateTopic',
-  async ({ clusterName, topicName, form }, { rejectWithValue }) => {
-    try {
-      const topic = await topicsApiClient.updateTopic({
-        clusterName,
-        topicName,
-        topicUpdate: formatTopicUpdate(form),
-      });
-
-      return { topic };
-    } catch (err) {
-      showServerError(err as Response);
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const deleteTopic = createAsyncThunk<
-  { topicName: TopicName },
-  DeleteTopicRequest
->('topic/deleteTopic', async (payload, { rejectWithValue }) => {
-  try {
-    const { topicName, clusterName } = payload;
-    await topicsApiClient.deleteTopic(payload);
-    showSuccessAlert({
-      id: `message-${topicName}-${clusterName}`,
-      message: 'Topic successfully deleted!',
-    });
-    return { topicName };
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-export const recreateTopic = createAsyncThunk<
-  { topic: Topic },
-  RecreateTopicRequest
->('topic/recreateTopic', async (payload, { rejectWithValue }) => {
-  try {
-    const { topicName, clusterName } = payload;
-    const topic = await topicsApiClient.recreateTopic(payload);
-    showSuccessAlert({
-      id: `message-${topicName}-${clusterName}`,
-      message: 'Topic successfully recreated!',
-    });
-    return { topic };
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-export const fetchTopicMessageSchema = createAsyncThunk<
-  { schema: TopicMessageSchema; topicName: TopicName },
-  GetTopicSchemaRequest
->('topic/fetchTopicMessageSchema', async (payload, { rejectWithValue }) => {
-  try {
-    const { topicName } = payload;
-    const schema = await messagesApiClient.getTopicSchema(payload);
-    return { schema, topicName };
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-export const updateTopicPartitionsCount = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    topicName: TopicName;
-    partitions: number;
-  }
->(
-  'topic/updateTopicPartitionsCount',
-  async (payload, { rejectWithValue, dispatch }) => {
-    try {
-      const { clusterName, topicName, partitions } = payload;
-
-      await topicsApiClient.increaseTopicPartitions({
-        clusterName,
-        topicName,
-        partitionsIncrease: { totalPartitionsCount: partitions },
-      });
-      showSuccessAlert({
-        id: `message-${topicName}-${clusterName}-${partitions}`,
-        message: 'Number of partitions successfully increased',
-      });
-      dispatch(fetchTopicDetails({ clusterName, topicName }));
-      return undefined;
-    } catch (err) {
-      showServerError(err as Response);
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const updateTopicReplicationFactor = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    topicName: TopicName;
-    replicationFactor: number;
-  }
->(
-  'topic/updateTopicReplicationFactor',
-  async (payload, { rejectWithValue, dispatch }) => {
-    try {
-      const { clusterName, topicName, replicationFactor } = payload;
-
-      await topicsApiClient.changeReplicationFactor({
-        clusterName,
-        topicName,
-        replicationFactorChange: { totalReplicationFactor: replicationFactor },
-      });
-      showSuccessAlert({
-        id: `message-${topicName}-${clusterName}-replicationFactor`,
-        message: 'Replication Factor successfully updated',
-      });
-      dispatch(fetchTopicDetails({ clusterName, topicName }));
-      return undefined;
-    } catch (err) {
-      showServerError(err as Response);
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-export const deleteTopics = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    topicNames: TopicName[];
-  }
->('topic/deleteTopics', async (payload, { rejectWithValue, dispatch }) => {
-  try {
-    const { clusterName, topicNames } = payload;
-
-    topicNames.forEach((topicName) => {
-      dispatch(deleteTopic({ clusterName, topicName }));
-    });
-    dispatch(fetchTopicsList({ clusterName }));
-
-    return undefined;
-  } catch (err) {
-    showServerError(err as Response);
-    return rejectWithValue(await getResponse(err as Response));
-  }
-});
-
-export const clearTopicsMessages = createAsyncThunk<
-  undefined,
-  {
-    clusterName: ClusterName;
-    topicNames: TopicName[];
-  }
->(
-  'topic/clearTopicsMessages',
-  async (payload, { rejectWithValue, dispatch }) => {
-    try {
-      const { clusterName, topicNames } = payload;
-      topicNames.forEach((topicName) => {
-        dispatch(clearTopicMessages({ clusterName, topicName }));
-      });
-
-      return undefined;
-    } catch (err) {
-      showServerError(err as Response);
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
-
-const initialState: TopicsState = {
-  byName: {},
-  allNames: [],
-  totalPages: 1,
-  search: '',
-  orderBy: TopicColumnsToSort.NAME,
-  sortOrder: SortOrder.ASC,
-  consumerGroups: [],
-};
-
-const topicsSlice = createSlice({
-  name: 'topics',
-  initialState,
-  reducers: {
-    setTopicsSearch: (state, action) => {
-      state.search = action.payload;
-    },
-    setTopicsOrderBy: (state, action) => {
-      state.sortOrder =
-        state.orderBy === action.payload && state.sortOrder === SortOrder.ASC
-          ? SortOrder.DESC
-          : SortOrder.ASC;
-      state.orderBy = action.payload;
-    },
-  },
-  extraReducers: (builder) => {
-    builder.addCase(fetchTopicsList.fulfilled, (state, { payload }) => {
-      if (payload.topics) {
-        state.allNames = [];
-        state.totalPages = payload.pageCount || 1;
-
-        payload.topics.forEach((topic) => {
-          state.allNames.push(topic.name);
-          state.byName[topic.name] = {
-            ...state.byName[topic.name],
-            ...topic,
-          };
-        });
-      }
-    });
-    builder.addCase(fetchTopicDetails.fulfilled, (state, { payload }) => {
-      state.byName[payload.topicName] = {
-        ...state.byName[payload.topicName],
-        ...payload.topicDetails,
-      };
-    });
-    builder.addCase(fetchTopicConfig.fulfilled, (state, { payload }) => {
-      state.byName[payload.topicName] = {
-        ...state.byName[payload.topicName],
-        config: payload.topicConfig,
-      };
-    });
-    builder.addCase(
-      fetchTopicConsumerGroups.fulfilled,
-      (state, { payload }) => {
-        state.byName[payload.topicName] = {
-          ...state.byName[payload.topicName],
-          ...payload.consumerGroups,
-        };
-      }
-    );
-    builder.addCase(updateTopic.fulfilled, (state, { payload }) => {
-      state.byName[payload.topic.name] = {
-        ...state.byName[payload.topic.name],
-        ...payload.topic,
-      };
-    });
-    builder.addCase(deleteTopic.fulfilled, (state, { payload }) => {
-      delete state.byName[payload.topicName];
-      state.allNames = state.allNames.filter(
-        (name) => name !== payload.topicName
-      );
-    });
-    builder.addCase(recreateTopic.fulfilled, (state, { payload }) => {
-      state.byName = {
-        ...state.byName,
-        [payload.topic.name]: { ...payload.topic },
-      };
-    });
-    builder.addCase(fetchTopicMessageSchema.fulfilled, (state, { payload }) => {
-      state.byName[payload.topicName] = {
-        ...state.byName[payload.topicName],
-        messageSchema: payload.schema,
-      };
-    });
-  },
-});
-
-export const { setTopicsSearch, setTopicsOrderBy } = topicsSlice.actions;
-
-export default topicsSlice.reducer;

From 98257b2b5fd77a0141f23bebb2b903d90d0a3113 Mon Sep 17 00:00:00 2001
From: Daniel Ching <110129035+daching-provectus@users.noreply.github.com>
Date: Fri, 5 Aug 2022 09:13:28 -0600
Subject: [PATCH 103/734] Resolve issue #2262 validate topic creation (#2390)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/lib/yupExtended.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index 967bc0bbafe..ca51e662f15 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -55,16 +55,19 @@ export const topicFormValidationSchema = yup.object().shape({
   partitions: yup
     .number()
     .min(1)
+    .max(2147483647)
     .required()
     .typeError('Number of partitions is required and must be a number'),
   replicationFactor: yup
     .number()
     .min(1)
+    .max(2147483647)
     .required()
     .typeError('Replication factor is required and must be a number'),
   minInSyncReplicas: yup
     .number()
     .min(1)
+    .max(2147483647)
     .required()
     .typeError('Min in sync replicas is required and must be a number'),
   cleanupPolicy: yup.string().required(),

From 122f90fbb25c3b20e461246c0a50aeb08ef51459 Mon Sep 17 00:00:00 2001
From: MichaelGonzalezMurillo
 <110129349+MichaelGonzalezMurillo@users.noreply.github.com>
Date: Fri, 5 Aug 2022 12:27:44 -0600
Subject: [PATCH 104/734] fixes #1622 (#2398)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-api/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index a6ff458c6c5..53eb24731d7 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -217,6 +217,11 @@
             <artifactId>datasketches-java</artifactId>
             <version>${datasketches-java.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
 
     </dependencies>
 

From 32b550f6710f109225d27c1d68ed6d65ce191eae Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 5 Aug 2022 23:15:48 +0400
Subject: [PATCH 105/734] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c01826ba493..582280de661 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -78,6 +78,7 @@ When creating a PR please do the following:
 4. If the PR does not close any of the issues, the PR itself might need to have a milestone set. Reach out to the maintainers to consult.
 5. Assign the PR to yourself. A PR assignee is someone whose goal is to get the PR merged.
 6. Add reviewers. As a rule, reviewers' suggestions are pretty good; please use them.
+7. Upon merging the PR, please use a meaningful commit message, task name should be fine in this case.
 
 ### Pull Request checklist
 

From 8efd8905402db793fb8d4393415926ad0d70bf95 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 8 Aug 2022 13:00:43 +0300
Subject: [PATCH 106/734] Update Alerts to use ReactNode as a message content
 (#2399)

---
 .../Topics/Topic/SendMessage/SendMessage.tsx     |  9 +++++++--
 .../src/components/common/Alert/Alert.styled.ts  |  2 +-
 .../src/components/common/Alert/Alert.tsx        |  7 ++-----
 kafka-ui-react-app/src/lib/errorHandling.tsx     | 16 +++++++++-------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index f762bad6474..7813a2b579c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -109,11 +109,16 @@ const SendMessage: React.FC = () => {
         }
       }
       if (errors.length > 0) {
-        const errorsHtml = errors.map((e) => `<li>${e}</li>`).join('');
         showAlert('error', {
           id: `${clusterName}-${topicName}-createTopicMessageError`,
           title: 'Validation Error',
-          message: `<ul>${errorsHtml}</ul>`,
+          message: (
+            <ul>
+              {errors.map((e) => (
+                <li>{e}</li>
+              ))}
+            </ul>
+          ),
         });
         return;
       }
diff --git a/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
index 03e08877feb..58ae2ed09df 100644
--- a/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 
 export const Alert = styled.div<{ $type: ToastType }>`
   background-color: ${({ $type, theme }) => theme.alert.color[$type]};
-  min-width: 500px;
+  width: 500px;
   min-height: 64px;
   border-radius: 8px;
   padding: 12px;
diff --git a/kafka-ui-react-app/src/components/common/Alert/Alert.tsx b/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
index 6a82e6f13ce..8f9d167d1e8 100644
--- a/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
+++ b/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
@@ -8,7 +8,7 @@ import * as S from './Alert.styled';
 export interface AlertProps {
   title: string;
   type: ToastType;
-  message: string;
+  message: React.ReactNode;
   onDissmiss(): void;
 }
 
@@ -16,10 +16,7 @@ const Alert: React.FC<AlertProps> = ({ title, type, message, onDissmiss }) => (
   <S.Alert $type={type} role="alert">
     <div>
       <S.Title role="heading">{title}</S.Title>
-      <S.Message
-        role="contentinfo"
-        dangerouslySetInnerHTML={{ __html: message }}
-      />
+      <S.Message role="contentinfo">{message}</S.Message>
     </div>
     <IconButtonWrapper role="button" onClick={onDissmiss}>
       <CloseIcon />
diff --git a/kafka-ui-react-app/src/lib/errorHandling.tsx b/kafka-ui-react-app/src/lib/errorHandling.tsx
index b839cfff358..a3033b87a06 100644
--- a/kafka-ui-react-app/src/lib/errorHandling.tsx
+++ b/kafka-ui-react-app/src/lib/errorHandling.tsx
@@ -30,7 +30,7 @@ export const getResponse = async (
 interface AlertOptions {
   id?: string;
   title?: string;
-  message: string;
+  message: React.ReactNode;
 }
 
 export const showAlert = (
@@ -67,10 +67,12 @@ export const showServerError = async (
   } catch (e) {
     // do nothing;
   }
-  showAlert('error', {
-    id: response.url,
-    title: `${response.status} ${response.statusText}`,
-    message: body?.message || 'An error occurred',
-    ...options,
-  });
+  if (response.status) {
+    showAlert('error', {
+      id: response.url,
+      title: `${response.status} ${response.statusText}`,
+      message: body?.message || 'An error occurred',
+      ...options,
+    });
+  }
 };

From 125aa970ef74baa509eb382335c2cf233d66cddb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Aug 2022 17:01:14 +0400
Subject: [PATCH 107/734] Bump aquasecurity/trivy-action from 0.6.1 to 0.6.2
 (#2414)

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.6.1 to 0.6.2.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.6.1...0.6.2)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index abae180e7ca..1f9796f1559 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -61,7 +61,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.6.1
+        uses: aquasecurity/trivy-action@0.6.2
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From 5beb6168b9d009e268374907c1e9bf0818c6ba1d Mon Sep 17 00:00:00 2001
From: Sungjun Lee <occidere@naver.com>
Date: Mon, 8 Aug 2022 22:03:09 +0900
Subject: [PATCH 108/734] Fixed SECURE_BROKER link (#2412)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d3efd90c543..38e885c1640 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ We have plenty of [docker-compose files](documentation/compose/DOCKER_COMPOSE.md
 - [SSO configuration](documentation/guides/SSO.md)
 - [AWS IAM configuration](documentation/guides/AWS_IAM.md)
 - [Docker-compose files](documentation/compose/DOCKER_COMPOSE.md)
-- [Connection to a secure broker](documentation/compose/SECURE_BROKER.md)
+- [Connection to a secure broker](documentation/guides/SECURE_BROKER.md)
 
 ### Configuration File
 Example of how to configure clusters in the [application-local.yml](https://github.com/provectus/kafka-ui/blob/master/kafka-ui-api/src/main/resources/application-local.yml) configuration file:

From b1a13e442b1a729aa3ba157c681deda59cd335dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Aug 2022 17:04:29 +0400
Subject: [PATCH 109/734] Bump urlstechie/urlchecker-action from 0.0.31 to
 0.0.32 (#2415)

Bumps [urlstechie/urlchecker-action](https://github.com/urlstechie/urlchecker-action) from 0.0.31 to 0.0.32.
- [Release notes](https://github.com/urlstechie/urlchecker-action/releases)
- [Commits](https://github.com/urlstechie/urlchecker-action/compare/0.0.31...0.0.32)

---
updated-dependencies:
- dependency-name: urlstechie/urlchecker-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/documentation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
index 04dd90c67c7..21550b3ebe0 100644
--- a/.github/workflows/documentation.yaml
+++ b/.github/workflows/documentation.yaml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Check URLs in files
-        uses: urlstechie/urlchecker-action@0.0.31
+        uses: urlstechie/urlchecker-action@0.0.32
         with:
           exclude_patterns: localhost,127.0.,192.168.
           exclude_urls: https://api.server,https://graph.microsoft.com/User.Read,https://dev-a63ggcut.auth0.com/

From 7f74bf312a0e51ed1c4ba530a84e07e6d4dcae72 Mon Sep 17 00:00:00 2001
From: MichaelGonzalezMurillo
 <110129349+MichaelGonzalezMurillo@users.noreply.github.com>
Date: Mon, 8 Aug 2022 11:20:34 -0600
Subject: [PATCH 110/734] fix #2322 (#2410)

Do not display broker error as "none"
---
 .../com/provectus/kafka/ui/mapper/DescribeLogDirsMapper.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/DescribeLogDirsMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/DescribeLogDirsMapper.java
index c7e66d0f455..3d84aa3ad90 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/DescribeLogDirsMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/DescribeLogDirsMapper.java
@@ -8,6 +8,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.protocol.Errors;
 import org.apache.kafka.common.requests.DescribeLogDirsResponse;
 import org.springframework.stereotype.Component;
 
@@ -28,7 +29,7 @@ private BrokersLogdirsDTO toBrokerLogDirs(Integer broker, String dirName,
                                             DescribeLogDirsResponse.LogDirInfo logDirInfo) {
     BrokersLogdirsDTO result = new BrokersLogdirsDTO();
     result.setName(dirName);
-    if (logDirInfo.error != null) {
+    if (logDirInfo.error != null && logDirInfo.error != Errors.NONE) {
       result.setError(logDirInfo.error.message());
     }
     var topics = logDirInfo.replicaInfos.entrySet().stream()

From 757bf9526efa1d66308ca26bc5cae2ef2f3bf343 Mon Sep 17 00:00:00 2001
From: Daniel Ching <110129035+daching-provectus@users.noreply.github.com>
Date: Mon, 8 Aug 2022 14:36:12 -0600
Subject: [PATCH 111/734] Fixing bug 2243 - Replication Factor validation
 (#2370)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../java/com/provectus/kafka/ui/service/TopicsService.java   | 5 +++++
 .../src/main/resources/swagger/kafka-ui-api.yaml             | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 75c32984617..46ecedd0b3d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -259,6 +259,11 @@ public Mono<ReplicationFactorChangeResponseDTO> changeReplicationFactor(
                 new ValidationException(
                     String.format("Topic already has replicationFactor %s.", actual)));
           }
+          if (requested <= 0) {
+            return Mono.error(
+                new ValidationException(
+                    String.format("Requested replication factor (%s) should be greater or equal to 1.", requested)));
+          }
           if (requested > brokersCount) {
             return Mono.error(
                 new ValidationException(
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 63f313e2ac1..77817f0edb9 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -592,6 +592,8 @@ paths:
                 $ref: '#/components/schemas/ReplicationFactorChangeResponse'
         404:
           description: Not found
+        400:
+          description: Bad Request
 
   /api/clusters/{clusterName}/topics/{topicName}/messages:
     get:
@@ -3052,7 +3054,6 @@ components:
       properties:
         totalReplicationFactor:
           type: integer
-          minimum: 1
       required:
         - totalReplicationFactor
 

From 7765a268af412e0045f6815cc024aaa7567519a8 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Tue, 9 Aug 2022 16:13:03 +0300
Subject: [PATCH 112/734] Topic statistics (#2413)

* Topic statistics

* Typo

* Code smell

* Specs

* Specs

* Use timestamp helper

* Improve coverage

* styling
---
 kafka-ui-react-app/package.json               |   2 +
 kafka-ui-react-app/pnpm-lock.yaml             |  31 ++
 .../src/components/Schemas/Diff/Diff.tsx      |   6 +-
 .../Schemas/Diff/__test__/Diff.spec.tsx       |   6 +-
 .../Topics/Topic/Details/Details.tsx          |  12 +
 .../Topics/Topic/Details/Messages/Message.tsx |   4 +-
 .../MessageContent/MessageContent.tsx         |   6 +-
 .../Messages/__test__/Message.spec.tsx        |   6 +-
 .../Statistics/Indicators/SizeStats.tsx       |  44 +++
 .../Details/Statistics/Indicators/Total.tsx   |  42 +++
 .../Topic/Details/Statistics/Metrics.tsx      | 106 +++++++
 .../Details/Statistics/PartitionInfoRow.tsx   | 100 +++++++
 .../Details/Statistics/PartitionTable.tsx     |  40 +++
 .../Details/Statistics/Statistics.styles.ts   |  44 +++
 .../Topic/Details/Statistics/Statistics.tsx   |  44 +++
 .../Statistics/__test__/Metrics.spec.tsx      | 121 ++++++++
 .../Statistics/__test__/Statistics.spec.tsx   |  35 +++
 .../Topic/Details/__test__/Details.spec.tsx   | 266 +++++++++++-------
 .../Topics/Topic/SendMessage/SendMessage.tsx  |   2 +-
 .../common/Metrics/Metrics.styled.tsx         |   2 +-
 .../common/NewTable/ExpanderCell.tsx          |  33 +++
 .../common/NewTable/Table.styled.ts           | 174 ++++++++++++
 .../src/components/common/NewTable/Table.tsx  | 253 +++++++++++++++++
 .../common/NewTable/TimestampCell.tsx         |  12 +
 .../common/NewTable/__test__/Table.spec.tsx   | 181 ++++++++++++
 .../src/components/common/NewTable/index.ts   |   7 +
 .../utils/__test__/updateSortingState.spec.ts |  34 +++
 .../NewTable/utils/updatePaginationState.ts   |  27 ++
 .../NewTable/utils/updateSortingState.ts      |  26 ++
 .../common/ProgressBar/ProgressBar.styled.ts  |  22 ++
 .../common/ProgressBar/ProgressBar.tsx        |  18 ++
 .../ProgressBar/__test__/ProgressBar.spec.tsx |  23 ++
 .../PropertiesList/PropertiesList.styled.tsx  |  17 ++
 .../src/lib/__test__/paths.spec.ts            |  50 ++++
 kafka-ui-react-app/src/lib/dateTimeHelpers.ts |  12 +
 kafka-ui-react-app/src/lib/fixtures/topics.ts |  75 +++++
 .../lib/hooks/api/__tests__/topics.spec.ts    |  49 +++-
 .../src/lib/hooks/api/topics.ts               |  48 +++-
 kafka-ui-react-app/src/lib/paths.ts           |  11 +-
 kafka-ui-react-app/src/theme/theme.ts         |  19 ++
 40 files changed, 1886 insertions(+), 124 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/SizeStats.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Metrics.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionInfoRow.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.styles.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Metrics.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Statistics.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/Table.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/TimestampCell.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/index.ts
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/utils/__test__/updateSortingState.spec.ts
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/utils/updatePaginationState.ts
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/utils/updateSortingState.ts
 create mode 100644 kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ProgressBar/__test__/ProgressBar.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx
 create mode 100644 kafka-ui-react-app/src/lib/dateTimeHelpers.ts

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 1110162a4f0..a74a664d81a 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -12,6 +12,7 @@
     "@reduxjs/toolkit": "^1.8.3",
     "@szhsin/react-menu": "^3.1.1",
     "@tanstack/react-query": "^4.0.5",
+    "@tanstack/react-table": "^8.5.10",
     "@testing-library/react": "^13.2.0",
     "@types/testing-library__jest-dom": "^5.14.5",
     "@types/yup": "^0.29.13",
@@ -31,6 +32,7 @@
     "react-ace": "^10.1.0",
     "react-datepicker": "^4.8.0",
     "react-dom": "^18.1.0",
+    "react-error-boundary": "^3.1.4",
     "react-hook-form": "7.6.9",
     "react-hot-toast": "^2.3.0",
     "react-is": "^18.2.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index f86fe5f75a1..1163b3a30e5 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -14,6 +14,7 @@ specifiers:
   '@reduxjs/toolkit': ^1.8.3
   '@szhsin/react-menu': ^3.1.1
   '@tanstack/react-query': ^4.0.5
+  '@tanstack/react-table': ^8.5.10
   '@testing-library/dom': ^8.11.1
   '@testing-library/jest-dom': ^5.16.4
   '@testing-library/react': ^13.2.0
@@ -67,6 +68,7 @@ specifiers:
   react-ace: ^10.1.0
   react-datepicker: ^4.8.0
   react-dom: ^18.1.0
+  react-error-boundary: ^3.1.4
   react-hook-form: 7.6.9
   react-hot-toast: ^2.3.0
   react-is: ^18.2.0
@@ -96,6 +98,7 @@ dependencies:
   '@reduxjs/toolkit': 1.8.3_ctm756ikdwcjcvyfxxwskzbr6q
   '@szhsin/react-menu': 3.1.1_ef5jwxihqo6n7gxfmzogljlgcm
   '@tanstack/react-query': 4.0.5_ef5jwxihqo6n7gxfmzogljlgcm
+  '@tanstack/react-table': 8.5.10_ef5jwxihqo6n7gxfmzogljlgcm
   '@testing-library/react': 13.2.0_ef5jwxihqo6n7gxfmzogljlgcm
   '@types/testing-library__jest-dom': 5.14.5
   '@types/yup': 0.29.13
@@ -115,6 +118,7 @@ dependencies:
   react-ace: 10.1.0_ef5jwxihqo6n7gxfmzogljlgcm
   react-datepicker: 4.8.0_ef5jwxihqo6n7gxfmzogljlgcm
   react-dom: 18.1.0_react@18.1.0
+  react-error-boundary: 3.1.4_react@18.1.0
   react-hook-form: 7.6.9_react@18.1.0
   react-hot-toast: 2.3.0_ef5jwxihqo6n7gxfmzogljlgcm
   react-is: 18.2.0
@@ -2394,6 +2398,23 @@ packages:
       use-sync-external-store: 1.2.0_react@18.1.0
     dev: false
 
+  /@tanstack/react-table/8.5.10_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-TG+iyqtZD5/N7gCDNM8HJc+ZWbUAkSjv8JaVqk2eYs4xaTUfPnTTsG0vJYqGkoxp8i2GFY78dRx1FDCsctYPGA==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      react: '>=16'
+      react-dom: '>=16'
+    dependencies:
+      '@tanstack/table-core': 8.5.10
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+    dev: false
+
+  /@tanstack/table-core/8.5.10:
+    resolution: {integrity: sha512-L1GU/BAF7k50vfk1qDvHkRLhEKSjE46EtCuWRrbdu2UKP4mKClTEeL4/zMr6iefMo8QgWa+Gc0CTVVfYcFLlLA==}
+    engines: {node: '>=12'}
+    dev: false
+
   /@testing-library/dom/8.13.0:
     resolution: {integrity: sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==}
     engines: {node: '>=12'}
@@ -6619,6 +6640,16 @@ packages:
       react: 18.1.0
       scheduler: 0.22.0
 
+  /react-error-boundary/3.1.4_react@18.1.0:
+    resolution: {integrity: sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==}
+    engines: {node: '>=10', npm: '>=6'}
+    peerDependencies:
+      react: '>=16.13.1'
+    dependencies:
+      '@babel/runtime': 7.17.9
+      react: 18.1.0
+    dev: false
+
   /react-fast-compare/3.2.0:
     resolution: {integrity: sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==}
 
diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
index 94636fa4b8f..9747171c08e 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { SchemaSubject } from 'generated-sources';
-import { clusterSchemaSchemaComparePath, ClusterSubjectParam } from 'lib/paths';
+import { clusterSchemaComparePath, ClusterSubjectParam } from 'lib/paths';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import DiffViewer from 'components/common/DiffViewer/DiffViewer';
 import { useNavigate, useLocation } from 'react-router-dom';
@@ -86,7 +86,7 @@ const Diff: React.FC<DiffProps> = ({ versions, areVersionsFetched }) => {
                       }
                       onChange={(event) => {
                         navigate(
-                          clusterSchemaSchemaComparePath(clusterName, subject)
+                          clusterSchemaComparePath(clusterName, subject)
                         );
                         searchParams.set('leftVersion', event.toString());
                         searchParams.set(
@@ -127,7 +127,7 @@ const Diff: React.FC<DiffProps> = ({ versions, areVersionsFetched }) => {
                       }
                       onChange={(event) => {
                         navigate(
-                          clusterSchemaSchemaComparePath(clusterName, subject)
+                          clusterSchemaComparePath(clusterName, subject)
                         );
                         searchParams.set(
                           'leftVersion',
diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx
index 029e589b9ad..0c614cf6617 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx
@@ -2,13 +2,13 @@ import React from 'react';
 import Diff, { DiffProps } from 'components/Schemas/Diff/Diff';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
-import { clusterSchemaSchemaComparePath } from 'lib/paths';
+import { clusterSchemaComparePath } from 'lib/paths';
 
 import { versions } from './fixtures';
 
 const defaultClusterName = 'defaultClusterName';
 const defaultSubject = 'defaultSubject';
-const defaultPathName = clusterSchemaSchemaComparePath(
+const defaultPathName = clusterSchemaComparePath(
   defaultClusterName,
   defaultSubject
 );
@@ -30,7 +30,7 @@ describe('Diff', () => {
     pathname = `${pathname}?${searchParams.toString()}`;
 
     return render(
-      <WithRoute path={clusterSchemaSchemaComparePath()}>
+      <WithRoute path={clusterSchemaComparePath()}>
         <Diff
           versions={props.versions}
           areVersionsFetched={props.areVersionsFetched}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
index 39aca5f46be..15b80957a2a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
@@ -7,6 +7,7 @@ import {
   clusterTopicConsumerGroupsRelativePath,
   clusterTopicEditRelativePath,
   clusterTopicSendMessageRelativePath,
+  clusterTopicStatisticsRelativePath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageHeading from 'components/common/PageHeading/PageHeading';
@@ -33,6 +34,7 @@ import Messages from './Messages/Messages';
 import Overview from './Overview/Overview';
 import Settings from './Settings/Settings';
 import TopicConsumerGroups from './ConsumerGroups/TopicConsumerGroups';
+import Statistics from './Statistics/Statistics';
 
 const HeaderControlsWrapper = styled.div`
   display: flex;
@@ -164,6 +166,12 @@ const Details: React.FC = () => {
         >
           Settings
         </NavLink>
+        <NavLink
+          to={clusterTopicStatisticsRelativePath}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+        >
+          Statistics
+        </NavLink>
       </Navbar>
       <Suspense fallback={<PageLoader />}>
         <Routes>
@@ -180,6 +188,10 @@ const Details: React.FC = () => {
             path={clusterTopicConsumerGroupsRelativePath}
             element={<TopicConsumerGroups />}
           />
+          <Route
+            path={clusterTopicStatisticsRelativePath}
+            element={<Statistics />}
+          />
         </Routes>
       </Suspense>
     </div>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx
index 8c86fd1558e..3cba8d058ec 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import dayjs from 'dayjs';
 import { TopicMessage } from 'generated-sources';
 import useDataSaver from 'lib/hooks/useDataSaver';
 import MessageToggleIcon from 'components/common/Icons/MessageToggleIcon';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import styled from 'styled-components';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 import MessageContent from './MessageContent/MessageContent';
 import * as S from './MessageContent/MessageContent.styled';
@@ -64,7 +64,7 @@ const Message: React.FC<Props> = ({
         <td>{offset}</td>
         <td>{partition}</td>
         <td>
-          <div>{dayjs(timestamp).format('MM.DD.YYYY HH:mm:ss')}</div>
+          <div>{formatTimestamp(timestamp)}</div>
         </td>
         <StyledDataCell title={key}>{key}</StyledDataCell>
         <StyledDataCell>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx
index 0b8d47a5bf7..3a1bc9a500f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx
@@ -2,7 +2,7 @@ import { TopicMessageTimestampTypeEnum, SchemaType } from 'generated-sources';
 import React from 'react';
 import EditorViewer from 'components/common/EditorViewer/EditorViewer';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import dayjs from 'dayjs';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 import * as S from './MessageContent.styled';
 
@@ -94,9 +94,7 @@ const MessageContent: React.FC<MessageContentProps> = ({
             <S.Metadata>
               <S.MetadataLabel>Timestamp</S.MetadataLabel>
               <span>
-                <S.MetadataValue>
-                  {dayjs(timestamp).format('MM.DD.YYYY HH:mm:ss')}
-                </S.MetadataValue>
+                <S.MetadataValue>{formatTimestamp(timestamp)}</S.MetadataValue>
                 <S.MetadataMeta>Timestamp type: {timestampType}</S.MetadataMeta>
               </span>
             </S.Metadata>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Message.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Message.spec.tsx
index fd52935d7f1..a50341816fb 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Message.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Message.spec.tsx
@@ -5,8 +5,8 @@ import Message, {
 } from 'components/Topics/Topic/Details/Messages/Message';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
-import dayjs from 'dayjs';
 import userEvent from '@testing-library/user-event';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 const messageContentText = 'messageContentText';
 
@@ -50,9 +50,7 @@ describe('Message component', () => {
     expect(screen.getByText(mockMessage.content as string)).toBeInTheDocument();
     expect(screen.getByText(mockMessage.key as string)).toBeInTheDocument();
     expect(
-      screen.getByText(
-        dayjs(mockMessage.timestamp).format('MM.DD.YYYY HH:mm:ss')
-      )
+      screen.getByText(formatTimestamp(mockMessage.timestamp))
     ).toBeInTheDocument();
     expect(screen.getByText(mockMessage.offset.toString())).toBeInTheDocument();
     expect(
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/SizeStats.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/SizeStats.tsx
new file mode 100644
index 00000000000..a74a0bd24ed
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/SizeStats.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import * as Metrics from 'components/common/Metrics';
+import { TopicAnalysisSizeStats } from 'generated-sources';
+import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
+
+const SizeStats: React.FC<{
+  stats: TopicAnalysisSizeStats;
+  title: string;
+}> = ({
+  stats: { sum, min, max, avg, prctl50, prctl75, prctl95, prctl99, prctl999 },
+  title,
+}) => (
+  <Metrics.Section title={title}>
+    <Metrics.Indicator label="Total size">
+      <BytesFormatted value={sum} />
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Min size">
+      <BytesFormatted value={min} />
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Max size">
+      <BytesFormatted value={max} />
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Avg key">
+      <BytesFormatted value={avg} />
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Percentile 50">
+      <BytesFormatted value={prctl50} />
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Percentile 75">
+      <BytesFormatted value={prctl75} />
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Percentile 95">
+      <BytesFormatted value={prctl95} />
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Percentile 99">
+      <BytesFormatted value={prctl99} />
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Percentile 999">
+      <BytesFormatted value={prctl999} />
+    </Metrics.Indicator>
+  </Metrics.Section>
+);
+
+export default SizeStats;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx
new file mode 100644
index 00000000000..dec863c0005
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import * as Metrics from 'components/common/Metrics';
+import { TopicAnalysisStats } from 'generated-sources';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
+
+const Total: React.FC<TopicAnalysisStats> = ({
+  totalMsgs,
+  minOffset,
+  maxOffset,
+  minTimestamp,
+  maxTimestamp,
+  nullKeys,
+  nullValues,
+  approxUniqKeys,
+  approxUniqValues,
+}) => (
+  <Metrics.Section title="Messages">
+    <Metrics.Indicator label="Total number">{totalMsgs}</Metrics.Indicator>
+    <Metrics.Indicator label="Offsets min-max">
+      {`${minOffset} - ${maxOffset}`}
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Timestamp min-max">
+      {`${formatTimestamp(minTimestamp)} - ${formatTimestamp(maxTimestamp)}`}
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Null keys">{nullKeys}</Metrics.Indicator>
+    <Metrics.Indicator
+      label="Uniq keys"
+      title="Approximate number of unique keys"
+    >
+      {approxUniqKeys}
+    </Metrics.Indicator>
+    <Metrics.Indicator label="Null values">{nullValues}</Metrics.Indicator>
+    <Metrics.Indicator
+      label="Uniq values"
+      title="Approximate number of unique values"
+    >
+      {approxUniqValues}
+    </Metrics.Indicator>
+  </Metrics.Section>
+);
+
+export default Total;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Metrics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Metrics.tsx
new file mode 100644
index 00000000000..be10efa5c3e
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Metrics.tsx
@@ -0,0 +1,106 @@
+import React from 'react';
+import {
+  useAnalyzeTopic,
+  useCancelTopicAnalysis,
+  useTopicAnalysis,
+} from 'lib/hooks/api/topics';
+import useAppParams from 'lib/hooks/useAppParams';
+import { RouteParamsClusterTopic } from 'lib/paths';
+import { Button } from 'components/common/Button/Button';
+import * as Informers from 'components/common/Metrics';
+import ProgressBar from 'components/common/ProgressBar/ProgressBar';
+import {
+  List,
+  Label,
+} from 'components/common/PropertiesList/PropertiesList.styled';
+import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
+
+import * as S from './Statistics.styles';
+import Total from './Indicators/Total';
+import SizeStats from './Indicators/SizeStats';
+import PartitionTable from './PartitionTable';
+
+const Metrics: React.FC = () => {
+  const params = useAppParams<RouteParamsClusterTopic>();
+  const [isAnalyzing, setIsAnalyzing] = React.useState(true);
+  const analyzeTopic = useAnalyzeTopic(params);
+  const cancelTopicAnalysis = useCancelTopicAnalysis(params);
+
+  const { data } = useTopicAnalysis(params, isAnalyzing);
+
+  React.useEffect(() => {
+    if (data && !data.progress) {
+      setIsAnalyzing(false);
+    }
+  }, [data]);
+
+  if (!data) {
+    return null;
+  }
+
+  if (data.progress) {
+    return (
+      <S.ProgressContainer>
+        <ProgressBar completed={data.progress.completenessPercent || 0} />
+        <Button
+          onClick={async () => {
+            await cancelTopicAnalysis.mutateAsync();
+            setIsAnalyzing(true);
+          }}
+          buttonType="primary"
+          buttonSize="M"
+        >
+          Stop Analysis
+        </Button>
+        <List>
+          <Label>Started at</Label>
+          <span>{formatTimestamp(data.progress.startedAt, 'hh:mm:ss a')}</span>
+          <Label>Scanned messages</Label>
+          <span>
+            {data.progress.msgsScanned} /{' '}
+            <BytesFormatted value={data.progress.bytesScanned} />
+          </span>
+        </List>
+      </S.ProgressContainer>
+    );
+  }
+
+  if (!data.result) {
+    return null;
+  }
+
+  const totalStats = data.result.totalStats || {};
+  const partitionStats = data.result.partitionStats || [];
+
+  return (
+    <>
+      <S.ActionsBar>
+        <S.CreatedAt>{formatTimestamp(data.result.finishedAt)}</S.CreatedAt>
+        <Button
+          onClick={async () => {
+            await analyzeTopic.mutateAsync();
+            setIsAnalyzing(true);
+          }}
+          buttonType="primary"
+          buttonSize="S"
+        >
+          Restart Analysis
+        </Button>
+      </S.ActionsBar>
+
+      <Informers.Wrapper>
+        <Total {...totalStats} />
+        {totalStats.keySize && (
+          <SizeStats stats={totalStats.keySize} title="Key size" />
+        )}
+        {totalStats.valueSize && (
+          <SizeStats stats={totalStats.valueSize} title="Value size" />
+        )}
+      </Informers.Wrapper>
+      <PartitionTable data={partitionStats} />
+    </>
+  );
+};
+
+export default Metrics;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionInfoRow.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionInfoRow.tsx
new file mode 100644
index 00000000000..1ee8ace97a7
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionInfoRow.tsx
@@ -0,0 +1,100 @@
+import { Row } from '@tanstack/react-table';
+import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
+import Heading from 'components/common/heading/Heading.styled';
+import {
+  List,
+  Label,
+} from 'components/common/PropertiesList/PropertiesList.styled';
+import { TopicAnalysisStats } from 'generated-sources';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
+import React from 'react';
+
+import * as S from './Statistics.styles';
+
+const PartitionInfoRow: React.FC<{ row: Row<TopicAnalysisStats> }> = ({
+  row,
+}) => {
+  const {
+    totalMsgs,
+    minTimestamp,
+    maxTimestamp,
+    nullKeys,
+    nullValues,
+    approxUniqKeys,
+    approxUniqValues,
+    keySize,
+    valueSize,
+  } = row.original;
+
+  return (
+    <S.PartitionInfo>
+      <div>
+        <Heading level={4}>Partition stats</Heading>
+        <List>
+          <Label>Total message</Label>
+          <span>{totalMsgs}</span>
+          <Label>Min. timestamp</Label>
+          <span>{formatTimestamp(minTimestamp)}</span>
+          <Label>Max. timestamp</Label>
+          <span>{formatTimestamp(maxTimestamp)}</span>
+          <Label>Null keys amount</Label>
+          <span>{nullKeys}</span>
+          <Label>Null values amount</Label>
+          <span>{nullValues}</span>
+          <Label>Approx. unique keys amount</Label>
+          <span>{approxUniqKeys}</span>
+          <Label>Approx. unique values amount</Label>
+          <span>{approxUniqValues}</span>
+        </List>
+      </div>
+      <div>
+        <Heading level={4}>Keys sizes</Heading>
+        <List>
+          <Label>Total keys size</Label>
+          <BytesFormatted value={keySize?.sum} />
+          <Label>Min key size</Label>
+          <BytesFormatted value={keySize?.min} />
+          <Label>Max key size</Label>
+          <BytesFormatted value={keySize?.max} />
+          <Label>Avg key size</Label>
+          <BytesFormatted value={keySize?.avg} />
+          <Label>Percentile 50</Label>
+          <BytesFormatted value={keySize?.prctl50} />
+          <Label>Percentile 75</Label>
+          <BytesFormatted value={keySize?.prctl75} />
+          <Label>Percentile 95</Label>
+          <BytesFormatted value={keySize?.prctl95} />
+          <Label>Percentile 99</Label>
+          <BytesFormatted value={keySize?.prctl99} />
+          <Label>Percentile 999</Label>
+          <BytesFormatted value={keySize?.prctl999} />
+        </List>
+      </div>
+      <div>
+        <Heading level={4}>Values sizes</Heading>
+        <List>
+          <Label>Total keys size</Label>
+          <BytesFormatted value={valueSize?.sum} />
+          <Label>Min key size</Label>
+          <BytesFormatted value={valueSize?.min} />
+          <Label>Max key size</Label>
+          <BytesFormatted value={valueSize?.max} />
+          <Label>Avg key size</Label>
+          <BytesFormatted value={valueSize?.avg} />
+          <Label>Percentile 50</Label>
+          <BytesFormatted value={valueSize?.prctl50} />
+          <Label>Percentile 75</Label>
+          <BytesFormatted value={valueSize?.prctl75} />
+          <Label>Percentile 95</Label>
+          <BytesFormatted value={valueSize?.prctl95} />
+          <Label>Percentile 99</Label>
+          <BytesFormatted value={valueSize?.prctl99} />
+          <Label>Percentile 999</Label>
+          <BytesFormatted value={valueSize?.prctl999} />
+        </List>
+      </div>
+    </S.PartitionInfo>
+  );
+};
+
+export default PartitionInfoRow;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx
new file mode 100644
index 00000000000..9db1e5a35bd
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx
@@ -0,0 +1,40 @@
+/* eslint-disable react/no-unstable-nested-components */
+import React from 'react';
+import { TopicAnalysisStats } from 'generated-sources';
+import { ColumnDef } from '@tanstack/react-table';
+import Table from 'components/common/NewTable';
+
+import PartitionInfoRow from './PartitionInfoRow';
+
+const PartitionTable: React.FC<{ data: TopicAnalysisStats[] }> = ({ data }) => {
+  const columns = React.useMemo<ColumnDef<TopicAnalysisStats>[]>(
+    () => [
+      {
+        header: 'Partition ID',
+        accessorKey: 'partition',
+      },
+      {
+        header: 'Total Messages',
+        accessorKey: 'totalMsgs',
+      },
+      {
+        header: 'Min Offset',
+        accessorKey: 'minOffset',
+      },
+      { header: 'Max Offset', accessorKey: 'maxOffset' },
+    ],
+    []
+  );
+
+  return (
+    <Table
+      data={data}
+      columns={columns}
+      getRowCanExpand={() => true}
+      renderSubComponent={PartitionInfoRow}
+      enableSorting
+    />
+  );
+};
+
+export default PartitionTable;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.styles.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.styles.ts
new file mode 100644
index 00000000000..472562eef9d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.styles.ts
@@ -0,0 +1,44 @@
+import {
+  Label,
+  List,
+} from 'components/common/PropertiesList/PropertiesList.styled';
+import styled from 'styled-components';
+
+export const ProgressContainer = styled.div`
+  padding: 1.5rem 1rem;
+  background: ${({ theme }) => theme.code.backgroundColor};
+  justify-content: center;
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  height: 300px;
+  text-align: center;
+
+  ${List} {
+    opacity: 0.5;
+
+    ${Label} {
+      text-align: right;
+    }
+  }
+`;
+
+export const ActionsBar = styled.div`
+  display: flex;
+  justify-content: end;
+  gap: 8px;
+  padding: 10px 20px;
+  align-items: center;
+`;
+
+export const CreatedAt = styled.div`
+  font-size: 12px;
+  line-height: 1.5;
+  color: ${({ theme }) => theme.statictics.createdAtColor};
+`;
+
+export const PartitionInfo = styled.div`
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+  column-gap: 24px;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.tsx
new file mode 100644
index 00000000000..66ea07ba7aa
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.tsx
@@ -0,0 +1,44 @@
+/* eslint-disable react/no-unstable-nested-components */
+import React from 'react';
+import { useAnalyzeTopic } from 'lib/hooks/api/topics';
+import useAppParams from 'lib/hooks/useAppParams';
+import { RouteParamsClusterTopic } from 'lib/paths';
+import { QueryErrorResetBoundary } from '@tanstack/react-query';
+import { ErrorBoundary } from 'react-error-boundary';
+import { Button } from 'components/common/Button/Button';
+
+import * as S from './Statistics.styles';
+import Metrics from './Metrics';
+
+const Statistics: React.FC = () => {
+  const params = useAppParams<RouteParamsClusterTopic>();
+  const analyzeTopic = useAnalyzeTopic(params);
+
+  return (
+    <QueryErrorResetBoundary>
+      {({ reset }) => (
+        <ErrorBoundary
+          onReset={reset}
+          fallbackRender={({ resetErrorBoundary }) => (
+            <S.ProgressContainer>
+              <Button
+                onClick={async () => {
+                  await analyzeTopic.mutateAsync();
+                  resetErrorBoundary();
+                }}
+                buttonType="primary"
+                buttonSize="M"
+              >
+                Start Analysis
+              </Button>
+            </S.ProgressContainer>
+          )}
+        >
+          <Metrics />
+        </ErrorBoundary>
+      )}
+    </QueryErrorResetBoundary>
+  );
+};
+
+export default Statistics;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Metrics.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Metrics.spec.tsx
new file mode 100644
index 00000000000..621b6b25c02
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Metrics.spec.tsx
@@ -0,0 +1,121 @@
+import React from 'react';
+import { screen, waitFor } from '@testing-library/react';
+import { render, WithRoute } from 'lib/testHelpers';
+import Statistics from 'components/Topics/Topic/Details/Statistics/Statistics';
+import { clusterTopicStatisticsPath } from 'lib/paths';
+import {
+  useTopicAnalysis,
+  useCancelTopicAnalysis,
+  useAnalyzeTopic,
+} from 'lib/hooks/api/topics';
+import { topicStatsPayload } from 'lib/fixtures/topics';
+import userEvent from '@testing-library/user-event';
+
+const clusterName = 'local';
+const topicName = 'topic';
+
+jest.mock('lib/hooks/api/topics', () => ({
+  ...jest.requireActual('lib/hooks/api/topics'),
+  useTopicAnalysis: jest.fn(),
+  useCancelTopicAnalysis: jest.fn(),
+  useAnalyzeTopic: jest.fn(),
+}));
+
+describe('Metrics', () => {
+  const renderComponent = () => {
+    const path = clusterTopicStatisticsPath(clusterName, topicName);
+    return render(
+      <WithRoute path={clusterTopicStatisticsPath()}>
+        <Statistics />
+      </WithRoute>,
+      { initialEntries: [path] }
+    );
+  };
+
+  describe('when analysis is in progress', () => {
+    const cancelMock = jest.fn();
+    beforeEach(() => {
+      (useCancelTopicAnalysis as jest.Mock).mockImplementation(() => ({
+        mutateAsync: cancelMock,
+      }));
+      (useTopicAnalysis as jest.Mock).mockImplementation(() => ({
+        data: {
+          progress: {
+            ...topicStatsPayload.progress,
+            completenessPercent: undefined,
+          },
+          result: undefined,
+        },
+      }));
+      renderComponent();
+    });
+
+    it('renders Stop Analysis button', () => {
+      const btn = screen.getByRole('button', { name: 'Stop Analysis' });
+      expect(btn).toBeInTheDocument();
+      userEvent.click(btn);
+      expect(cancelMock).toHaveBeenCalled();
+    });
+
+    it('renders Progress bar', () => {
+      const progressbar = screen.getByRole('progressbar');
+      expect(progressbar).toBeInTheDocument();
+      expect(progressbar).toHaveStyleRule('width', '0%');
+    });
+  });
+
+  describe('when analysis is completed', () => {
+    const restartMock = jest.fn();
+    beforeEach(() => {
+      (useTopicAnalysis as jest.Mock).mockImplementation(() => ({
+        data: { ...topicStatsPayload, progress: undefined },
+      }));
+      (useAnalyzeTopic as jest.Mock).mockImplementation(() => ({
+        mutateAsync: restartMock,
+      }));
+      renderComponent();
+    });
+    it('renders metrics', async () => {
+      const btn = screen.getByRole('button', { name: 'Restart Analysis' });
+      expect(btn).toBeInTheDocument();
+      expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
+      expect(screen.getAllByRole('group').length).toEqual(3);
+      expect(screen.getByRole('table')).toBeInTheDocument();
+    });
+    it('renders restarts analisis', async () => {
+      const btn = screen.getByRole('button', { name: 'Restart Analysis' });
+      await waitFor(() => userEvent.click(btn));
+      expect(restartMock).toHaveBeenCalled();
+    });
+    it('renders expandable table', async () => {
+      expect(screen.getByRole('table')).toBeInTheDocument();
+      const rows = screen.getAllByRole('row');
+      expect(rows.length).toEqual(3);
+      const btns = screen.getAllByRole('button', { name: 'Expand row' });
+      expect(btns.length).toEqual(2);
+      expect(screen.queryByText('Partition stats')).not.toBeInTheDocument();
+
+      userEvent.click(btns[0]);
+      expect(screen.getAllByText('Partition stats').length).toEqual(1);
+      userEvent.click(btns[1]);
+      expect(screen.getAllByText('Partition stats').length).toEqual(2);
+    });
+  });
+
+  it('returns empty container', () => {
+    (useTopicAnalysis as jest.Mock).mockImplementation(() => ({
+      data: undefined,
+    }));
+    renderComponent();
+    expect(screen.queryByRole('table')).not.toBeInTheDocument();
+    expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
+  });
+  it('returns empty container', () => {
+    (useTopicAnalysis as jest.Mock).mockImplementation(() => ({
+      data: {},
+    }));
+    renderComponent();
+    expect(screen.queryByRole('table')).not.toBeInTheDocument();
+    expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Statistics.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Statistics.spec.tsx
new file mode 100644
index 00000000000..90f39faa0ed
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Statistics.spec.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { render, WithRoute } from 'lib/testHelpers';
+import Statistics from 'components/Topics/Topic/Details/Statistics/Statistics';
+import { clusterTopicStatisticsPath } from 'lib/paths';
+import { useTopicAnalysis } from 'lib/hooks/api/topics';
+
+const clusterName = 'local';
+const topicName = 'topic';
+
+jest.mock('lib/hooks/api/topics', () => ({
+  ...jest.requireActual('lib/hooks/api/topics'),
+  useTopicAnalysis: jest.fn(),
+}));
+
+describe('Statistics', () => {
+  const renderComponent = () => {
+    const path = clusterTopicStatisticsPath(clusterName, topicName);
+    return render(
+      <WithRoute path={clusterTopicStatisticsPath()}>
+        <Statistics />
+      </WithRoute>,
+      { initialEntries: [path] }
+    );
+  };
+
+  it('renders Metricks component', () => {
+    (useTopicAnalysis as jest.Mock).mockImplementation(() => ({
+      data: { result: 1 },
+    }));
+
+    renderComponent();
+    expect(screen.getByText('Restart Analysis')).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
index 8ed9fb0f6be..12ce5097b78 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
@@ -4,7 +4,15 @@ import userEvent from '@testing-library/user-event';
 import ClusterContext from 'components/contexts/ClusterContext';
 import Details from 'components/Topics/Topic/Details/Details';
 import { render, WithRoute } from 'lib/testHelpers';
-import { clusterTopicEditRelativePath, clusterTopicPath } from 'lib/paths';
+import {
+  clusterTopicConsumerGroupsPath,
+  clusterTopicEditRelativePath,
+  clusterTopicMessagesPath,
+  clusterTopicPath,
+  clusterTopicSettingsPath,
+  clusterTopicStatisticsPath,
+  getNonExactPath,
+} from 'lib/paths';
 import { CleanUpPolicy, Topic } from 'generated-sources';
 import { externalTopicPayload } from 'lib/fixtures/topics';
 import {
@@ -32,19 +40,34 @@ jest.mock('lib/hooks/redux', () => ({
   useAppDispatch: useDispatchMock,
 }));
 
+jest.mock('components/Topics/Topic/Details/Overview/Overview', () => () => (
+  <>OverviewMock</>
+));
+jest.mock('components/Topics/Topic/Details/Messages/Messages', () => () => (
+  <>MessagesMock</>
+));
+jest.mock('components/Topics/Topic/Details/Settings/Settings', () => () => (
+  <>SettingsMock</>
+));
+jest.mock(
+  'components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups',
+  () => () => <>ConsumerGroupsMock</>
+);
+jest.mock('components/Topics/Topic/Details/Statistics/Statistics', () => () => (
+  <>StatisticsMock</>
+));
+
 const mockDelete = jest.fn();
 const mockRecreate = jest.fn();
+const mockClusterName = 'local';
+const topic: Topic = {
+  ...externalTopicPayload,
+  cleanUpPolicy: CleanUpPolicy.DELETE,
+};
+const defaultPath = clusterTopicPath(mockClusterName, topic.name);
 
 describe('Details', () => {
-  const mockClusterName = 'local';
-
-  const topic: Topic = {
-    ...externalTopicPayload,
-    cleanUpPolicy: CleanUpPolicy.DELETE,
-  };
-
-  const renderComponent = (isReadOnly = false) => {
-    const path = clusterTopicPath(mockClusterName, topic.name);
+  const renderComponent = (isReadOnly = false, path = defaultPath) => {
     render(
       <ClusterContext.Provider
         value={{
@@ -54,7 +77,7 @@ describe('Details', () => {
           isTopicDeletionAllowed: true,
         }}
       >
-        <WithRoute path={clusterTopicPath()}>
+        <WithRoute path={getNonExactPath(clusterTopicPath())}>
           <Details />
         </WithRoute>
       </ClusterContext.Provider>,
@@ -73,113 +96,160 @@ describe('Details', () => {
       mutateAsync: mockRecreate,
     }));
   });
-
-  describe('when it has readonly flag', () => {
-    it('does not render the Action button a Topic', () => {
-      renderComponent(true);
-      expect(screen.queryByText('Produce Message')).not.toBeInTheDocument();
+  describe('Action Bar', () => {
+    describe('when it has readonly flag', () => {
+      it('does not render the Action button a Topic', () => {
+        renderComponent(true);
+        expect(screen.queryByText('Produce Message')).not.toBeInTheDocument();
+      });
     });
-  });
 
-  describe('when remove topic modal is open', () => {
-    beforeEach(() => {
-      renderComponent();
-      const openModalButton = screen.getAllByText('Remove Topic')[0];
-      userEvent.click(openModalButton);
+    describe('when remove topic modal is open', () => {
+      beforeEach(() => {
+        renderComponent();
+        const openModalButton = screen.getAllByText('Remove Topic')[0];
+        userEvent.click(openModalButton);
+      });
+
+      it('calls deleteTopic on confirm', async () => {
+        const submitButton = screen.getAllByRole('button', {
+          name: 'Confirm',
+        })[0];
+        await act(() => userEvent.click(submitButton));
+        expect(mockDelete).toHaveBeenCalledWith(topic.name);
+      });
+      it('closes the modal when cancel button is clicked', async () => {
+        const cancelButton = screen.getAllByText('Cancel')[0];
+        await waitFor(() => userEvent.click(cancelButton));
+        expect(cancelButton).not.toBeInTheDocument();
+      });
     });
 
-    it('calls deleteTopic on confirm', async () => {
-      const submitButton = screen.getAllByRole('button', {
-        name: 'Confirm',
-      })[0];
-      await act(() => userEvent.click(submitButton));
-      expect(mockDelete).toHaveBeenCalledWith(topic.name);
-    });
-    it('closes the modal when cancel button is clicked', async () => {
-      const cancelButton = screen.getAllByText('Cancel')[0];
-      await waitFor(() => userEvent.click(cancelButton));
-      expect(cancelButton).not.toBeInTheDocument();
+    describe('when clear messages modal is open', () => {
+      beforeEach(async () => {
+        await renderComponent();
+        const confirmButton = screen.getAllByText('Clear messages')[0];
+        await act(() => userEvent.click(confirmButton));
+      });
+
+      it('it calls clearTopicMessages on confirm', async () => {
+        const submitButton = screen.getAllByRole('button', {
+          name: 'Confirm',
+        })[0];
+        await waitFor(() => userEvent.click(submitButton));
+        expect(mockUnwrap).toHaveBeenCalledTimes(1);
+      });
+
+      it('closes the modal when cancel button is clicked', async () => {
+        const cancelButton = screen.getAllByText('Cancel')[0];
+        await waitFor(() => userEvent.click(cancelButton));
+
+        expect(cancelButton).not.toBeInTheDocument();
+      });
     });
-  });
 
-  describe('when clear messages modal is open', () => {
-    beforeEach(async () => {
-      await renderComponent();
-      const confirmButton = screen.getAllByText('Clear messages')[0];
-      await act(() => userEvent.click(confirmButton));
+    describe('when edit settings is clicked', () => {
+      it('redirects to the edit page', () => {
+        renderComponent();
+        const button = screen.getAllByText('Edit settings')[0];
+        userEvent.click(button);
+        expect(mockNavigate).toHaveBeenCalledWith(clusterTopicEditRelativePath);
+      });
     });
 
-    it('it calls clearTopicMessages on confirm', async () => {
-      const submitButton = screen.getAllByRole('button', {
+    it('redirects to the correct route if topic is deleted', async () => {
+      renderComponent();
+      const deleteTopicButton = screen.getByText(/Remove topic/i);
+      await waitFor(() => userEvent.click(deleteTopicButton));
+      const submitDeleteButton = screen.getByRole('button', {
         name: 'Confirm',
-      })[0];
-      await waitFor(() => userEvent.click(submitButton));
-      expect(mockUnwrap).toHaveBeenCalledTimes(1);
+      });
+      await act(() => userEvent.click(submitDeleteButton));
+      expect(mockNavigate).toHaveBeenCalledWith('../..');
     });
 
-    it('closes the modal when cancel button is clicked', async () => {
-      const cancelButton = screen.getAllByText('Cancel')[0];
-      await waitFor(() => userEvent.click(cancelButton));
+    it('shows a confirmation popup on deleting topic messages', () => {
+      renderComponent();
+      const clearMessagesButton = screen.getAllByText(/Clear messages/i)[0];
+      userEvent.click(clearMessagesButton);
 
-      expect(cancelButton).not.toBeInTheDocument();
+      expect(
+        screen.getByText(/Are you sure want to clear topic messages?/i)
+      ).toBeInTheDocument();
     });
-  });
 
-  describe('when edit settings is clicked', () => {
-    it('redirects to the edit page', () => {
+    it('shows a confirmation popup on recreating topic', () => {
       renderComponent();
-      const button = screen.getAllByText('Edit settings')[0];
-      userEvent.click(button);
-      expect(mockNavigate).toHaveBeenCalledWith(clusterTopicEditRelativePath);
+      const recreateTopicButton = screen.getByText(/Recreate topic/i);
+      userEvent.click(recreateTopicButton);
+      expect(
+        screen.getByText(/Are you sure want to recreate topic?/i)
+      ).toBeInTheDocument();
     });
-  });
 
-  it('redirects to the correct route if topic is deleted', async () => {
-    renderComponent();
-    const deleteTopicButton = screen.getByText(/Remove topic/i);
-    await waitFor(() => userEvent.click(deleteTopicButton));
-    const submitDeleteButton = screen.getByRole('button', { name: 'Confirm' });
-    await act(() => userEvent.click(submitDeleteButton));
-    expect(mockNavigate).toHaveBeenCalledWith('../..');
-  });
-
-  it('shows a confirmation popup on deleting topic messages', () => {
-    renderComponent();
-    const clearMessagesButton = screen.getAllByText(/Clear messages/i)[0];
-    userEvent.click(clearMessagesButton);
-
-    expect(
-      screen.getByText(/Are you sure want to clear topic messages?/i)
-    ).toBeInTheDocument();
-  });
-
-  it('shows a confirmation popup on recreating topic', () => {
-    renderComponent();
-    const recreateTopicButton = screen.getByText(/Recreate topic/i);
-    userEvent.click(recreateTopicButton);
-    expect(
-      screen.getByText(/Are you sure want to recreate topic?/i)
-    ).toBeInTheDocument();
-  });
+    it('is calling recreation function after click on Submit button', async () => {
+      renderComponent();
+      const recreateTopicButton = screen.getByText(/Recreate topic/i);
+      userEvent.click(recreateTopicButton);
+      const confirmBtn = screen.getByRole('button', { name: /Confirm/i });
 
-  it('calling recreation function after click on Submit button', async () => {
-    renderComponent();
-    const recreateTopicButton = screen.getByText(/Recreate topic/i);
-    userEvent.click(recreateTopicButton);
-    const confirmBtn = screen.getByRole('button', { name: /Confirm/i });
+      await waitFor(() => userEvent.click(confirmBtn));
+      expect(mockRecreate).toBeCalledTimes(1);
+    });
 
-    await waitFor(() => userEvent.click(confirmBtn));
-    expect(mockRecreate).toBeCalledTimes(1);
+    it('closes popup confirmation window after click on Cancel button', () => {
+      renderComponent();
+      const recreateTopicButton = screen.getByText(/Recreate topic/i);
+      userEvent.click(recreateTopicButton);
+      const cancelBtn = screen.getByRole('button', { name: /cancel/i });
+      userEvent.click(cancelBtn);
+      expect(
+        screen.queryByText(/Are you sure want to recreate topic?/i)
+      ).not.toBeInTheDocument();
+    });
   });
 
-  it('close popup confirmation window after click on Cancel button', () => {
-    renderComponent();
-    const recreateTopicButton = screen.getByText(/Recreate topic/i);
-    userEvent.click(recreateTopicButton);
-    const cancelBtn = screen.getByRole('button', { name: /cancel/i });
-    userEvent.click(cancelBtn);
-    expect(
-      screen.queryByText(/Are you sure want to recreate topic?/i)
-    ).not.toBeInTheDocument();
+  describe('Internal routing', () => {
+    const itExpectsCorrectPageRendered = (
+      path: string,
+      tab: string,
+      selector: string
+    ) => {
+      renderComponent(false, path);
+      expect(screen.getByText(tab)).toHaveClass('is-active');
+      expect(screen.getByText(selector)).toBeInTheDocument();
+    };
+
+    it('renders Overview tab by default', () => {
+      itExpectsCorrectPageRendered(defaultPath, 'Overview', 'OverviewMock');
+    });
+    it('renders Messages tabs', () => {
+      itExpectsCorrectPageRendered(
+        clusterTopicMessagesPath(),
+        'Messages',
+        'MessagesMock'
+      );
+    });
+    it('renders Consumers tab', () => {
+      itExpectsCorrectPageRendered(
+        clusterTopicConsumerGroupsPath(),
+        'Consumers',
+        'ConsumerGroupsMock'
+      );
+    });
+    it('renders Settings tab', () => {
+      itExpectsCorrectPageRendered(
+        clusterTopicSettingsPath(),
+        'Settings',
+        'SettingsMock'
+      );
+    });
+    it('renders Statistics tab', () => {
+      itExpectsCorrectPageRendered(
+        clusterTopicStatisticsPath(),
+        'Statistics',
+        'StatisticsMock'
+      );
+    });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 7813a2b579c..781a33aed69 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -115,7 +115,7 @@ const SendMessage: React.FC = () => {
           message: (
             <ul>
               {errors.map((e) => (
-                <li>{e}</li>
+                <li key={e}>{e}</li>
               ))}
             </ul>
           ),
diff --git a/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx b/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx
index 2d66121891c..48fb0d723a4 100644
--- a/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx
@@ -43,7 +43,7 @@ export const IndicatorsWrapper = styled.div`
 
 export const SectionTitle = styled.h5`
   font-weight: 500;
-  margin: 0 0 0.5rem 0;
+  margin: 0 0 0.5rem 16px;
   font-size: 100%;
 `;
 
diff --git a/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
new file mode 100644
index 00000000000..e1975abb6a5
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
@@ -0,0 +1,33 @@
+import { CellContext } from '@tanstack/react-table';
+import React from 'react';
+
+import * as S from './Table.styled';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const ExpanderCell: React.FC<CellContext<any, unknown>> = ({ row }) => (
+  <S.ExpaderButton
+    width="16"
+    height="20"
+    viewBox="0 -2 16 16"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    role="button"
+    aria-label="Expand row"
+  >
+    {row.getIsExpanded() ? (
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M14 16C15.1046 16 16 15.1046 16 14L16 2C16 0.895431 15.1046 -7.8281e-08 14 -1.74846e-07L2 -1.22392e-06C0.895432 -1.32048e-06 1.32048e-06 0.895429 1.22392e-06 2L1.74846e-07 14C7.8281e-08 15.1046 0.895431 16 2 16L14 16ZM5 7C4.44772 7 4 7.44771 4 8C4 8.55228 4.44772 9 5 9L11 9C11.5523 9 12 8.55228 12 8C12 7.44772 11.5523 7 11 7L5 7Z"
+      />
+    ) : (
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M0 2C0 0.895431 0.895431 0 2 0H14C15.1046 0 16 0.895431 16 2V14C16 15.1046 15.1046 16 14 16H2C0.895431 16 0 15.1046 0 14V2ZM8 4C8.55229 4 9 4.44772 9 5V7H11C11.5523 7 12 7.44772 12 8C12 8.55229 11.5523 9 11 9H9V11C9 11.5523 8.55229 12 8 12C7.44772 12 7 11.5523 7 11V9H5C4.44772 9 4 8.55228 4 8C4 7.44771 4.44772 7 5 7H7V5C7 4.44772 7.44772 4 8 4Z"
+      />
+    )}
+  </S.ExpaderButton>
+);
+
+export default ExpanderCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
new file mode 100644
index 00000000000..f80d62ce5fb
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
@@ -0,0 +1,174 @@
+import styled from 'styled-components';
+
+export const ExpaderButton = styled.svg(
+  ({ theme: { table } }) => `
+  & > path {
+    fill: ${table.expander.normal};
+    &:hover {
+      fill: ${table.expander.hover};
+    }
+  }
+`
+);
+
+interface ThProps {
+  sortable?: boolean;
+  sortOrder?: 'desc' | 'asc' | false;
+  expander?: boolean;
+}
+
+const sortableMixin = (normalColor: string, hoverColor: string) => `
+  cursor: pointer;
+  padding-right: 18px;
+  position: relative;
+
+  &::before,
+  &::after {
+    border: 4px solid transparent;
+    content: '';
+    display: block;
+    height: 0;
+    right: 5px;
+    top: 50%;
+    position: absolute;
+  }
+  &::before {
+    border-bottom-color: ${normalColor};
+    margin-top: -9px;
+  }
+  &::after {
+    border-top-color: ${normalColor};
+    margin-top: 1px;
+  }
+  &:hover {
+    color: ${hoverColor};
+  }
+`;
+
+const ASCMixin = (color: string) => `
+  color: ${color};
+  &:before {
+    border-bottom-color: ${color};
+  }
+  &:after {
+    border-top-color: rgba(0, 0, 0, 0.2);
+  }
+`;
+const DESCMixin = (color: string) => `
+  color: ${color};
+  &:before {
+    border-bottom-color: rgba(0, 0, 0, 0.2);
+  }
+  &:after {
+    border-top-color: ${color};
+  }
+`;
+
+export const Th = styled.th<ThProps>(
+  ({ theme: { table }, sortable, sortOrder, expander }) => `
+  padding: 4px 0 4px 24px;
+  border-bottom-width: 1px;
+  vertical-align: middle;
+  text-align: left;
+  font-family: Inter, sans-serif;
+  font-size: 12px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 16px;
+  letter-spacing: 0em;
+  text-align: left;
+  background: ${table.th.backgroundColor.normal};
+  width: ${expander ? '5px' : 'auto'};
+
+  & > div {
+    cursor: default;
+    color: ${table.th.color.normal};
+    ${
+      sortable ? sortableMixin(table.th.color.normal, table.th.color.hover) : ''
+    }
+    ${sortable && sortOrder === 'asc' && ASCMixin(table.th.color.active)}
+    ${sortable && sortOrder === 'desc' && DESCMixin(table.th.color.active)}
+  }
+`
+);
+
+interface RowProps {
+  expandable?: boolean;
+  expanded?: boolean;
+}
+
+export const Row = styled.tr<RowProps>(
+  ({ theme: { table }, expanded, expandable }) => `
+  cursor: ${expandable ? 'pointer' : 'default'};
+  background-color: ${table.tr.backgroundColor[expanded ? 'hover' : 'normal']};
+  &:hover {
+    background-color: ${table.tr.backgroundColor.hover};
+  }
+`
+);
+
+export const ExpandedRowInfo = styled.div`
+  background-color: ${({ theme }) => theme.table.tr.backgroundColor.normal};
+  padding: 24px;
+  border-radius: 8px;
+  margin: 0 8px 8px 0;
+`;
+
+export const Nowrap = styled.div`
+  white-space: nowrap;
+`;
+
+export const Table = styled.table(
+  ({ theme: { table } }) => `
+  width: 100%;
+
+  td {
+    border-top: 1px #f1f2f3 solid;
+    font-size: 14px;
+    font-weight: 400;
+    padding: 8px 8px 8px 24px;
+    color: ${table.td.color.normal};
+    vertical-align: middle;
+    max-width: 350px;
+    word-wrap: break-word;
+
+    & > a {
+      color: ${table.link.color};
+      font-weight: 500;
+      text-overflow: ellipsis;
+    }
+  }
+`
+);
+
+export const Pagination = styled.div`
+  display: flex;
+  justify-content: space-between;
+  padding: 16px;
+  line-height: 32px;
+`;
+
+export const Pages = styled.div`
+  display: flex;
+  justify-content: left;
+  white-space: nowrap;
+  flex-wrap: nowrap;
+  gap: 8px;
+`;
+
+export const GoToPage = styled.label`
+  display: flex;
+  flex-wrap: nowrap;
+  gap: 8px;
+  margin-left: 8px;
+`;
+
+export const PageInfo = styled.div`
+  display: flex;
+  justify-content: right;
+  gap: 8px;
+  font-size: 14px;
+  flex-wrap: nowrap;
+  white-space: nowrap;
+  margin-left: 16px;
+`;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
new file mode 100644
index 00000000000..244caeb03f1
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -0,0 +1,253 @@
+import React from 'react';
+import {
+  flexRender,
+  getCoreRowModel,
+  getExpandedRowModel,
+  getSortedRowModel,
+  useReactTable,
+  ColumnDef,
+  Row,
+  SortingState,
+  OnChangeFn,
+  PaginationState,
+  getPaginationRowModel,
+} from '@tanstack/react-table';
+import { useSearchParams } from 'react-router-dom';
+import { PER_PAGE } from 'lib/constants';
+import { Button } from 'components/common/Button/Button';
+import Input from 'components/common/Input/Input';
+
+import * as S from './Table.styled';
+import updateSortingState from './utils/updateSortingState';
+import updatePaginationState from './utils/updatePaginationState';
+import ExpanderCell from './ExpanderCell';
+
+interface TableProps<TData> {
+  data: TData[];
+  pageCount?: number;
+  columns: ColumnDef<TData>[];
+  renderSubComponent?: React.FC<{ row: Row<TData> }>;
+  getRowCanExpand?: (row: Row<TData>) => boolean;
+  serverSideProcessing?: boolean;
+  enableSorting?: boolean;
+}
+
+type UpdaterFn<T> = (previousState: T) => T;
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const Table: React.FC<TableProps<any>> = ({
+  data,
+  pageCount,
+  columns,
+  getRowCanExpand,
+  renderSubComponent,
+  serverSideProcessing = false,
+  enableSorting = false,
+}) => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const [sorting, setSorting] = React.useState<SortingState>([]);
+  const [{ pageIndex, pageSize }, setPagination] =
+    React.useState<PaginationState>({
+      pageIndex: 0,
+      pageSize: PER_PAGE,
+    });
+
+  const onSortingChange = React.useCallback(
+    (updater: UpdaterFn<SortingState>) => {
+      const newState = updateSortingState(updater, searchParams);
+      setSearchParams(searchParams);
+      setSorting(newState);
+      return newState;
+    },
+    [searchParams]
+  );
+
+  const onPaginationChange = React.useCallback(
+    (updater: UpdaterFn<PaginationState>) => {
+      const newState = updatePaginationState(updater, searchParams);
+      setSearchParams(searchParams);
+      setPagination(newState);
+      return newState;
+    },
+    [searchParams]
+  );
+
+  React.useEffect(() => {
+    const sortBy = searchParams.get('sortBy');
+    const sortDirection = searchParams.get('sortDirection');
+    const page = searchParams.get('page');
+    const perPage = searchParams.get('perPage');
+
+    if (sortBy) {
+      setSorting([
+        {
+          id: sortBy,
+          desc: sortDirection === 'desc',
+        },
+      ]);
+    } else {
+      setSorting([]);
+    }
+    if (page || perPage) {
+      setPagination({
+        pageIndex: Number(page || 0),
+        pageSize: Number(perPage || PER_PAGE),
+      });
+    }
+  }, []);
+
+  const pagination = React.useMemo(
+    () => ({
+      pageIndex,
+      pageSize,
+    }),
+    [pageIndex, pageSize]
+  );
+
+  const table = useReactTable({
+    data,
+    pageCount,
+    columns,
+    state: {
+      sorting,
+      pagination,
+    },
+    onSortingChange: onSortingChange as OnChangeFn<SortingState>,
+    onPaginationChange: onPaginationChange as OnChangeFn<PaginationState>,
+    getRowCanExpand,
+    getCoreRowModel: getCoreRowModel(),
+    getExpandedRowModel: getExpandedRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+    getPaginationRowModel: getPaginationRowModel(),
+    manualSorting: serverSideProcessing,
+    manualPagination: serverSideProcessing,
+    enableSorting,
+  });
+
+  return (
+    <>
+      <S.Table>
+        <thead>
+          {table.getHeaderGroups().map((headerGroup) => (
+            <tr key={headerGroup.id}>
+              {table.getCanSomeRowsExpand() && (
+                <S.Th expander key={`${headerGroup.id}-expander`} />
+              )}
+              {headerGroup.headers.map((header) => (
+                <S.Th
+                  key={header.id}
+                  colSpan={header.colSpan}
+                  sortable={header.column.getCanSort()}
+                  sortOrder={header.column.getIsSorted()}
+                  onClick={header.column.getToggleSortingHandler()}
+                >
+                  <div>
+                    {flexRender(
+                      header.column.columnDef.header,
+                      header.getContext()
+                    )}
+                  </div>
+                </S.Th>
+              ))}
+            </tr>
+          ))}
+        </thead>
+        <tbody>
+          {table.getRowModel().rows.map((row) => (
+            <React.Fragment key={row.id}>
+              <S.Row
+                expandable={row.getCanExpand()}
+                expanded={row.getIsExpanded()}
+                onClick={() => row.getCanExpand() && row.toggleExpanded()}
+              >
+                {row.getCanExpand() && (
+                  <td key={`${row.id}-expander`}>
+                    {flexRender(
+                      ExpanderCell,
+                      row.getVisibleCells()[0].getContext()
+                    )}
+                  </td>
+                )}
+                {row.getVisibleCells().map((cell) => (
+                  <td key={cell.id}>
+                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                  </td>
+                ))}
+              </S.Row>
+              {row.getIsExpanded() && renderSubComponent && (
+                <S.Row expanded>
+                  <td colSpan={row.getVisibleCells().length + 1}>
+                    <S.ExpandedRowInfo>
+                      {renderSubComponent({ row })}
+                    </S.ExpandedRowInfo>
+                  </td>
+                </S.Row>
+              )}
+            </React.Fragment>
+          ))}
+        </tbody>
+      </S.Table>
+      {table.getPageCount() > 1 && (
+        <S.Pagination>
+          <S.Pages>
+            <Button
+              buttonType="secondary"
+              buttonSize="M"
+              onClick={() => table.setPageIndex(0)}
+              disabled={!table.getCanPreviousPage()}
+            >
+              ⇤
+            </Button>
+            <Button
+              buttonType="secondary"
+              buttonSize="M"
+              onClick={() => table.previousPage()}
+              disabled={!table.getCanPreviousPage()}
+            >
+              ← Previous
+            </Button>
+            <Button
+              buttonType="secondary"
+              buttonSize="M"
+              onClick={() => table.nextPage()}
+              disabled={!table.getCanNextPage()}
+            >
+              Next →
+            </Button>
+            <Button
+              buttonType="secondary"
+              buttonSize="M"
+              onClick={() => table.setPageIndex(table.getPageCount() - 1)}
+              disabled={!table.getCanNextPage()}
+            >
+              ⇥
+            </Button>
+
+            <S.GoToPage>
+              <span>Go to page:</span>
+              <Input
+                type="number"
+                defaultValue={table.getState().pagination.pageIndex + 1}
+                inputSize="M"
+                max={table.getPageCount()}
+                min={1}
+                onChange={(e) => {
+                  const page = e.target.value ? Number(e.target.value) - 1 : 0;
+                  table.setPageIndex(page);
+                }}
+              />
+            </S.GoToPage>
+          </S.Pages>
+          <S.PageInfo>
+            <span>
+              Page {table.getState().pagination.pageIndex + 1} of{' '}
+              {table.getPageCount()}{' '}
+            </span>
+          </S.PageInfo>
+        </S.Pagination>
+      )}
+    </>
+  );
+};
+
+export default Table;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/TimestampCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/TimestampCell.tsx
new file mode 100644
index 00000000000..9c7475274cd
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/TimestampCell.tsx
@@ -0,0 +1,12 @@
+import { CellContext } from '@tanstack/react-table';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
+import React from 'react';
+
+import * as S from './Table.styled';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const TimestampCell: React.FC<CellContext<any, any>> = ({ getValue }) => (
+  <S.Nowrap>{formatTimestamp(getValue())}</S.Nowrap>
+);
+
+export default TimestampCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
new file mode 100644
index 00000000000..e9b21c3e032
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -0,0 +1,181 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import Table, { TimestampCell } from 'components/common/NewTable';
+import { screen, waitFor } from '@testing-library/dom';
+import { ColumnDef } from '@tanstack/react-table';
+import userEvent from '@testing-library/user-event';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
+import { act } from '@testing-library/react';
+
+const data = [
+  { timestamp: 1660034383725, text: 'lorem' },
+  { timestamp: 1660034399999, text: 'ipsum' },
+  { timestamp: 1660034399922, text: 'dolor' },
+  { timestamp: 1660034199922, text: 'sit' },
+];
+type Datum = typeof data[0];
+
+const columns: ColumnDef<Datum>[] = [
+  {
+    header: 'DateTime',
+    accessorKey: 'timestamp',
+    cell: TimestampCell,
+  },
+  {
+    header: 'Text',
+    accessorKey: 'text',
+  },
+];
+
+const ExpandedRow: React.FC = () => <div>I am expanded row</div>;
+
+interface Props {
+  path?: string;
+  canExpand?: boolean;
+}
+
+const renderComponent = ({ path, canExpand }: Props = {}) => {
+  render(
+    <WithRoute path="/">
+      <Table
+        columns={columns}
+        data={data}
+        renderSubComponent={ExpandedRow}
+        getRowCanExpand={() => !!canExpand}
+        enableSorting
+      />
+    </WithRoute>,
+    { initialEntries: [path || ''] }
+  );
+};
+
+describe('Table', () => {
+  it('renders table', () => {
+    renderComponent();
+    expect(screen.getByRole('table')).toBeInTheDocument();
+  });
+
+  it('renders TimestampCell', () => {
+    renderComponent();
+    expect(
+      screen.getByText(formatTimestamp(data[0].timestamp))
+    ).toBeInTheDocument();
+  });
+
+  describe('ExpanderCell', () => {
+    it('renders button', () => {
+      renderComponent({ canExpand: true });
+      const btns = screen.getAllByRole('button', { name: 'Expand row' });
+      expect(btns.length).toEqual(data.length);
+
+      expect(screen.queryByText('I am expanded row')).not.toBeInTheDocument();
+      userEvent.click(btns[2]);
+      expect(screen.getByText('I am expanded row')).toBeInTheDocument();
+      userEvent.click(btns[0]);
+      expect(screen.getAllByText('I am expanded row').length).toEqual(2);
+    });
+
+    it('does not render button', () => {
+      renderComponent({ canExpand: false });
+      expect(
+        screen.queryByRole('button', { name: 'Expand row' })
+      ).not.toBeInTheDocument();
+      expect(screen.queryByText('I am expanded row')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('Pagination', () => {
+    it('does not render page buttons', () => {
+      renderComponent();
+      expect(
+        screen.queryByRole('button', { name: 'Next' })
+      ).not.toBeInTheDocument();
+    });
+
+    it('renders page buttons', async () => {
+      renderComponent({ path: '?perPage=1' });
+      // Check it renders header row and only one data row
+      expect(screen.getAllByRole('row').length).toEqual(2);
+      expect(screen.getByText('lorem')).toBeInTheDocument();
+
+      // Check it renders page buttons
+      const firstBtn = screen.getByRole('button', { name: '⇤' });
+      const prevBtn = screen.getByRole('button', { name: '← Previous' });
+      const nextBtn = screen.getByRole('button', { name: 'Next →' });
+      const lastBtn = screen.getByRole('button', { name: '⇥' });
+
+      expect(firstBtn).toBeInTheDocument();
+      expect(firstBtn).toBeDisabled();
+      expect(prevBtn).toBeInTheDocument();
+      expect(prevBtn).toBeDisabled();
+      expect(nextBtn).toBeInTheDocument();
+      expect(nextBtn).toBeEnabled();
+      expect(lastBtn).toBeInTheDocument();
+      expect(lastBtn).toBeEnabled();
+
+      userEvent.click(nextBtn);
+      expect(screen.getByText('ipsum')).toBeInTheDocument();
+      expect(prevBtn).toBeEnabled();
+      expect(firstBtn).toBeEnabled();
+
+      userEvent.click(lastBtn);
+      expect(screen.getByText('sit')).toBeInTheDocument();
+      expect(lastBtn).toBeDisabled();
+      expect(nextBtn).toBeDisabled();
+
+      userEvent.click(prevBtn);
+      expect(screen.getByText('dolor')).toBeInTheDocument();
+
+      userEvent.click(firstBtn);
+      expect(screen.getByText('lorem')).toBeInTheDocument();
+    });
+
+    it('renders go to page input', async () => {
+      renderComponent({ path: '?perPage=1' });
+      // Check it renders header row and only one data row
+      expect(screen.getAllByRole('row').length).toEqual(2);
+      expect(screen.getByText('lorem')).toBeInTheDocument();
+      const input = screen.getByRole('spinbutton', { name: 'Go to page:' });
+      expect(input).toBeInTheDocument();
+
+      userEvent.clear(input);
+      userEvent.type(input, '2');
+      expect(screen.getByText('ipsum')).toBeInTheDocument();
+    });
+  });
+
+  describe('Sorting', () => {
+    it('sort rows', async () => {
+      await act(() =>
+        renderComponent({ path: '/?sortBy=text&&sortDirection=desc' })
+      );
+      expect(screen.getAllByRole('row').length).toEqual(data.length + 1);
+      const th = screen.getByRole('columnheader', { name: 'Text' });
+      expect(th).toBeInTheDocument();
+
+      let rows = [];
+      // Check initial sort order by text column is descending
+      rows = screen.getAllByRole('row');
+      expect(rows[4].textContent?.indexOf('dolor')).toBeGreaterThan(-1);
+      expect(rows[3].textContent?.indexOf('ipsum')).toBeGreaterThan(-1);
+      expect(rows[2].textContent?.indexOf('lorem')).toBeGreaterThan(-1);
+      expect(rows[1].textContent?.indexOf('sit')).toBeGreaterThan(-1);
+
+      // Disable sorting by text column
+      await waitFor(() => userEvent.click(th));
+      rows = screen.getAllByRole('row');
+      expect(rows[1].textContent?.indexOf('lorem')).toBeGreaterThan(-1);
+      expect(rows[2].textContent?.indexOf('ipsum')).toBeGreaterThan(-1);
+      expect(rows[3].textContent?.indexOf('dolor')).toBeGreaterThan(-1);
+      expect(rows[4].textContent?.indexOf('sit')).toBeGreaterThan(-1);
+
+      // Sort by text column ascending
+      await waitFor(() => userEvent.click(th));
+      rows = screen.getAllByRole('row');
+      expect(rows[1].textContent?.indexOf('dolor')).toBeGreaterThan(-1);
+      expect(rows[2].textContent?.indexOf('ipsum')).toBeGreaterThan(-1);
+      expect(rows[3].textContent?.indexOf('lorem')).toBeGreaterThan(-1);
+      expect(rows[4].textContent?.indexOf('sit')).toBeGreaterThan(-1);
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/common/NewTable/index.ts b/kafka-ui-react-app/src/components/common/NewTable/index.ts
new file mode 100644
index 00000000000..b2c25771e51
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/index.ts
@@ -0,0 +1,7 @@
+import Table from './Table';
+import TimestampCell from './TimestampCell';
+import ExpanderCell from './ExpanderCell';
+
+export { TimestampCell, ExpanderCell };
+
+export default Table;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/utils/__test__/updateSortingState.spec.ts b/kafka-ui-react-app/src/components/common/NewTable/utils/__test__/updateSortingState.spec.ts
new file mode 100644
index 00000000000..07bd60991bc
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/utils/__test__/updateSortingState.spec.ts
@@ -0,0 +1,34 @@
+import updateSortingState from 'components/common/NewTable/utils/updateSortingState';
+import { SortingState } from '@tanstack/react-table';
+import compact from 'lodash/compact';
+
+const updater = (previousState: SortingState): SortingState => {
+  return compact(
+    previousState.map(({ id, desc }) => {
+      if (!id) return null;
+      return { id, desc: !desc };
+    })
+  );
+};
+
+describe('updateSortingState', () => {
+  it('should update the sorting state', () => {
+    const searchParams = new URLSearchParams();
+    searchParams.set('sortBy', 'date');
+    searchParams.set('sortDirection', 'desc');
+    const newState = updateSortingState(updater, searchParams);
+    expect(searchParams.get('sortBy')).toBe('date');
+    expect(searchParams.get('sortDirection')).toBe('asc');
+    expect(newState.length).toBe(1);
+    expect(newState[0].id).toBe('date');
+    expect(newState[0].desc).toBe(false);
+  });
+
+  it('should update the sorting state', () => {
+    const searchParams = new URLSearchParams();
+    const newState = updateSortingState(updater, searchParams);
+    expect(searchParams.get('sortBy')).toBeNull();
+    expect(searchParams.get('sortDirection')).toBeNull();
+    expect(newState.length).toBe(0);
+  });
+});
diff --git a/kafka-ui-react-app/src/components/common/NewTable/utils/updatePaginationState.ts b/kafka-ui-react-app/src/components/common/NewTable/utils/updatePaginationState.ts
new file mode 100644
index 00000000000..85dfd580bc2
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/utils/updatePaginationState.ts
@@ -0,0 +1,27 @@
+import { PaginationState } from '@tanstack/react-table';
+import { PER_PAGE } from 'lib/constants';
+
+type UpdaterFn<T> = (previousState: T) => T;
+
+export default (
+  updater: UpdaterFn<PaginationState>,
+  searchParams: URLSearchParams
+) => {
+  const previousState: PaginationState = {
+    pageIndex: Number(searchParams.get('page') || 0),
+    pageSize: Number(searchParams.get('perPage') || PER_PAGE),
+  };
+  const newState = updater(previousState);
+  if (newState.pageIndex !== 0) {
+    searchParams.set('page', newState.pageIndex.toString());
+  } else {
+    searchParams.delete('page');
+  }
+
+  if (newState.pageSize !== PER_PAGE) {
+    searchParams.set('perPage', newState.pageSize.toString());
+  } else {
+    searchParams.delete('perPage');
+  }
+  return newState;
+};
diff --git a/kafka-ui-react-app/src/components/common/NewTable/utils/updateSortingState.ts b/kafka-ui-react-app/src/components/common/NewTable/utils/updateSortingState.ts
new file mode 100644
index 00000000000..d2aaa3598d8
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/utils/updateSortingState.ts
@@ -0,0 +1,26 @@
+import { SortingState } from '@tanstack/react-table';
+
+type UpdaterFn<T> = (previousState: T) => T;
+
+export default (
+  updater: UpdaterFn<SortingState>,
+  searchParams: URLSearchParams
+) => {
+  const previousState: SortingState = [
+    {
+      id: searchParams.get('sortBy') || '',
+      desc: searchParams.get('sortDirection') === 'desc',
+    },
+  ];
+  const newState = updater(previousState);
+
+  if (newState.length > 0) {
+    const { id, desc } = newState[0];
+    searchParams.set('sortBy', id);
+    searchParams.set('sortDirection', desc ? 'desc' : 'asc');
+  } else {
+    searchParams.delete('sortBy');
+    searchParams.delete('sortDirection');
+  }
+  return newState;
+};
diff --git a/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.styled.ts b/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.styled.ts
new file mode 100644
index 00000000000..2d9d0ab6bc7
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.styled.ts
@@ -0,0 +1,22 @@
+import styled, { css } from 'styled-components';
+
+export const Wrapper = styled.div`
+  height: 10px;
+  width: '100%';
+  min-width: 200px;
+  background-color: ${({ theme }) => theme.progressBar.backgroundColor};
+  border-radius: 5px;
+  margin: 16px;
+  border: 1px solid ${({ theme }) => theme.progressBar.borderColor};
+`;
+
+export const Filler = styled.div<{ completed: number }>(
+  ({ theme: { progressBar }, completed }) => css`
+    height: 100%;
+    width: ${completed}%;
+    background-color: ${progressBar.compleatedColor};
+    border-radius: 5px;
+    text-align: 'right';
+    transition: width 1.2s linear;
+  `
+);
diff --git a/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.tsx b/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.tsx
new file mode 100644
index 00000000000..17d492cbc64
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+
+import * as S from './ProgressBar.styled';
+
+interface ProgressBarProps {
+  completed: number;
+}
+
+const ProgressBar: React.FC<ProgressBarProps> = ({ completed }) => {
+  const p = Math.max(Math.min(completed, 100), 0);
+  return (
+    <S.Wrapper>
+      <S.Filler role="progressbar" completed={p} />
+    </S.Wrapper>
+  );
+};
+
+export default ProgressBar;
diff --git a/kafka-ui-react-app/src/components/common/ProgressBar/__test__/ProgressBar.spec.tsx b/kafka-ui-react-app/src/components/common/ProgressBar/__test__/ProgressBar.spec.tsx
new file mode 100644
index 00000000000..86e6922ee49
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ProgressBar/__test__/ProgressBar.spec.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { render } from 'lib/testHelpers';
+import ProgressBar from 'components/common/ProgressBar/ProgressBar';
+import { screen } from '@testing-library/dom';
+
+describe('Progressbar', () => {
+  const itRendersCorrectPercentage = (completed: number, expected: number) => {
+    it('renders correct percentage', () => {
+      render(<ProgressBar completed={completed} />);
+      const bar = screen.getByRole('progressbar');
+      expect(bar).toHaveStyleRule('width', `${expected}%`);
+    });
+  };
+
+  [
+    [-143, 0],
+    [0, 0],
+    [67, 67],
+    [143, 100],
+  ].forEach(([completed, expected]) =>
+    itRendersCorrectPercentage(completed, expected)
+  );
+});
diff --git a/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx b/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx
new file mode 100644
index 00000000000..d3f986bb2c8
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx
@@ -0,0 +1,17 @@
+import styled from 'styled-components';
+
+export const List = styled.div`
+  display: grid;
+  grid-template-columns: repeat(2, max-content);
+  gap: 8px;
+  column-gap: 24px;
+  margin-top: 16px;
+  text-align: left;
+`;
+
+export const Label = styled.div`
+  font-size: 14px;
+  font-weight: 500;
+  color: ${({ theme }) => theme.list.label.color};
+  white-space: nowrap;
+`;
diff --git a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
index 45a1ca87e51..3bfbcef7a52 100644
--- a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
+++ b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
@@ -16,6 +16,10 @@ describe('Paths', () => {
       `${GIT_REPO_LINK}/commit/1234567gh`
     );
   });
+  it('getNonExactPath', () => {
+    expect(paths.getNonExactPath('')).toEqual('/*');
+    expect(paths.getNonExactPath('/clusters')).toEqual('/clusters/*');
+  });
   it('clusterPath', () => {
     expect(paths.clusterPath(clusterName)).toEqual(
       `/ui/clusters/${clusterName}`
@@ -117,6 +121,17 @@ describe('Paths', () => {
       paths.clusterSchemaEditPath(RouteParams.clusterName, RouteParams.subject)
     );
   });
+  it('clusterSchemaComparePath', () => {
+    expect(paths.clusterSchemaComparePath(clusterName, schemaId)).toEqual(
+      `${paths.clusterSchemaPath(clusterName, schemaId)}/compare`
+    );
+    expect(paths.clusterSchemaComparePath()).toEqual(
+      paths.clusterSchemaComparePath(
+        RouteParams.clusterName,
+        RouteParams.subject
+      )
+    );
+  });
 
   it('clusterTopicsPath', () => {
     expect(paths.clusterTopicsPath(clusterName)).toEqual(
@@ -194,6 +209,25 @@ describe('Paths', () => {
       paths.clusterTopicEditPath(RouteParams.clusterName, RouteParams.topicName)
     );
   });
+  it('clusterTopicCopyPath', () => {
+    expect(paths.clusterTopicCopyPath(clusterName)).toEqual(
+      `${paths.clusterTopicsPath(clusterName)}/copy`
+    );
+    expect(paths.clusterTopicCopyPath()).toEqual(
+      paths.clusterTopicCopyPath(RouteParams.clusterName)
+    );
+  });
+  it('clusterTopicStatisticsPath', () => {
+    expect(paths.clusterTopicStatisticsPath(clusterName, topicId)).toEqual(
+      `${paths.clusterTopicPath(clusterName, topicId)}/statistics`
+    );
+    expect(paths.clusterTopicStatisticsPath()).toEqual(
+      paths.clusterTopicStatisticsPath(
+        RouteParams.clusterName,
+        RouteParams.topicName
+      )
+    );
+  });
 
   it('clusterConnectsPath', () => {
     expect(paths.clusterConnectsPath(clusterName)).toEqual(
@@ -331,4 +365,20 @@ describe('Paths', () => {
       paths.clusterKsqlDbQueryPath(RouteParams.clusterName)
     );
   });
+  it('clusterKsqlDbTablesPath', () => {
+    expect(paths.clusterKsqlDbTablesPath(clusterName)).toEqual(
+      `${paths.clusterKsqlDbPath(clusterName)}/tables`
+    );
+    expect(paths.clusterKsqlDbTablesPath()).toEqual(
+      paths.clusterKsqlDbTablesPath(RouteParams.clusterName)
+    );
+  });
+  it('clusterKsqlDbStreamsPath', () => {
+    expect(paths.clusterKsqlDbStreamsPath(clusterName)).toEqual(
+      `${paths.clusterKsqlDbPath(clusterName)}/streams`
+    );
+    expect(paths.clusterKsqlDbStreamsPath()).toEqual(
+      paths.clusterKsqlDbStreamsPath(RouteParams.clusterName)
+    );
+  });
 });
diff --git a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
new file mode 100644
index 00000000000..b32a3c27998
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
@@ -0,0 +1,12 @@
+import dayjs from 'dayjs';
+
+export const formatTimestamp = (
+  timestamp: number | string | Date | undefined,
+  format = 'MM.DD.YY hh:mm:ss a'
+): string => {
+  if (!timestamp) {
+    return '';
+  }
+
+  return dayjs(timestamp).format(format);
+};
diff --git a/kafka-ui-react-app/src/lib/fixtures/topics.ts b/kafka-ui-react-app/src/lib/fixtures/topics.ts
index 68cf2f80694..aa7f3cf058c 100644
--- a/kafka-ui-react-app/src/lib/fixtures/topics.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/topics.ts
@@ -5,6 +5,7 @@ import {
   Topic,
   TopicConfig,
   MessageSchemaSourceEnum,
+  TopicAnalysis,
 } from 'generated-sources';
 
 export const internalTopicPayload = {
@@ -208,3 +209,77 @@ export const topicMessageSchema = {
 `,
   },
 };
+
+const topicStatsSize = {
+  sum: 0,
+  avg: 0,
+  prctl50: 0,
+  prctl75: 0,
+  prctl95: 0,
+  prctl99: 0,
+  prctl999: 0,
+};
+export const topicStatsPayload: TopicAnalysis = {
+  progress: {
+    startedAt: 1659984559167,
+    completenessPercent: 43,
+    msgsScanned: 18077002,
+    bytesScanned: 6750901718,
+  },
+  result: {
+    startedAt: 1659984559095,
+    finishedAt: 1659984617816,
+    totalStats: {
+      totalMsgs: 18194715,
+      minOffset: 98869591,
+      maxOffset: 100576010,
+      minTimestamp: 1659719759485,
+      maxTimestamp: 1659984603419,
+      nullKeys: 18194715,
+      nullValues: 0,
+      approxUniqKeys: 0,
+      approxUniqValues: 17817283,
+      keySize: topicStatsSize,
+      valueSize: topicStatsSize,
+      hourlyMsgCounts: [
+        { hourStart: 1659718800000, count: 16157 },
+        { hourStart: 1659722400000, count: 225790 },
+      ],
+    },
+    partitionStats: [
+      {
+        partition: 0,
+        totalMsgs: 1515285,
+        minOffset: 99060726,
+        maxOffset: 100576010,
+        minTimestamp: 1659722684090,
+        maxTimestamp: 1659984603419,
+        nullKeys: 1515285,
+        nullValues: 0,
+        approxUniqKeys: 0,
+        approxUniqValues: 1515285,
+        keySize: topicStatsSize,
+        valueSize: topicStatsSize,
+        hourlyMsgCounts: [
+          { hourStart: 1659722400000, count: 18040 },
+          { hourStart: 1659726000000, count: 20070 },
+        ],
+      },
+      {
+        partition: 1,
+        totalMsgs: 1534422,
+        minOffset: 98897827,
+        maxOffset: 100432248,
+        minTimestamp: 1659722803993,
+        maxTimestamp: 1659984603416,
+        nullKeys: 1534422,
+        nullValues: 0,
+        approxUniqKeys: 0,
+        approxUniqValues: 1516431,
+        keySize: topicStatsSize,
+        valueSize: topicStatsSize,
+        hourlyMsgCounts: [{ hourStart: 1659722400000, count: 19058 }],
+      },
+    ],
+  },
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
index 6ae7fa87093..6909989e340 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
@@ -24,6 +24,11 @@ const topicPath = `${topicsPath}/${topicName}`;
 
 const topicParams = { clusterName, topicName };
 
+jest.mock('lib/errorHandling', () => ({
+  ...jest.requireActual('lib/errorHandling'),
+  showServerError: jest.fn(),
+}));
+
 describe('Topics hooks', () => {
   beforeEach(() => fetchMock.restore());
   it('handles useTopics', async () => {
@@ -57,6 +62,20 @@ describe('Topics hooks', () => {
     );
     await expectQueryWorks(mock, result);
   });
+  describe('useTopicAnalysis', () => {
+    it('handles useTopicAnalysis', async () => {
+      const mock = fetchMock.getOnce(`${topicPath}/analysis`, {});
+      const { result } = renderQueryHook(() =>
+        hooks.useTopicAnalysis(topicParams)
+      );
+      await expectQueryWorks(mock, result);
+    });
+    it('disables useTopicAnalysis', async () => {
+      const mock = fetchMock.getOnce(`${topicPath}/analysis`, {});
+      renderQueryHook(() => hooks.useTopicAnalysis(topicParams, false));
+      expect(mock.calls()).toHaveLength(0);
+    });
+  });
 
   describe('mutatations', () => {
     it('useCreateTopic', async () => {
@@ -107,7 +126,6 @@ describe('Topics hooks', () => {
       await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
       expect(mock.calls()).toHaveLength(1);
     });
-
     it('useIncreaseTopicPartitionsCount', async () => {
       const mock = fetchMock.patchOnce(`${topicPath}/partitions`, {});
       const { result } = renderHook(
@@ -120,7 +138,6 @@ describe('Topics hooks', () => {
       await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
       expect(mock.calls()).toHaveLength(1);
     });
-
     it('useUpdateTopicReplicationFactor', async () => {
       const mock = fetchMock.patchOnce(`${topicPath}/replications`, {});
       const { result } = renderHook(
@@ -133,7 +150,6 @@ describe('Topics hooks', () => {
       await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
       expect(mock.calls()).toHaveLength(1);
     });
-
     it('useDeleteTopic', async () => {
       const mock = fetchMock.deleteOnce(topicPath, {});
       const { result } = renderHook(() => hooks.useDeleteTopic(clusterName), {
@@ -145,7 +161,6 @@ describe('Topics hooks', () => {
       await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
       expect(mock.calls()).toHaveLength(1);
     });
-
     it('useRecreateTopic', async () => {
       const mock = fetchMock.postOnce(topicPath, {});
       const { result } = renderHook(() => hooks.useRecreateTopic(topicParams), {
@@ -157,7 +172,6 @@ describe('Topics hooks', () => {
       await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
       expect(mock.calls()).toHaveLength(1);
     });
-
     it('useSendMessage', async () => {
       const mock = fetchMock.postOnce(`${topicPath}/messages`, {});
       const { result } = renderHook(() => hooks.useSendMessage(topicParams), {
@@ -173,5 +187,30 @@ describe('Topics hooks', () => {
       await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
       expect(mock.calls()).toHaveLength(1);
     });
+    it('useAnalyzeTopic', async () => {
+      const mock = fetchMock.postOnce(`${topicPath}/analysis`, {});
+      const { result } = renderHook(() => hooks.useAnalyzeTopic(topicParams), {
+        wrapper: TestQueryClientProvider,
+      });
+      await act(() => {
+        result.current.mutateAsync();
+      });
+      await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+      expect(mock.calls()).toHaveLength(1);
+    });
+    it('useCancelTopicAnalysis', async () => {
+      const mock = fetchMock.deleteOnce(`${topicPath}/analysis`, {});
+      const { result } = renderHook(
+        () => hooks.useCancelTopicAnalysis(topicParams),
+        {
+          wrapper: TestQueryClientProvider,
+        }
+      );
+      await act(() => {
+        result.current.mutateAsync();
+      });
+      await waitFor(() => expect(result.current.isSuccess).toBeTruthy());
+      expect(mock.calls()).toHaveLength(1);
+    });
   });
 });
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
index ccd4a93e4ef..cbc2e9c54cf 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topics.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -36,12 +36,16 @@ export const topicKeys = {
     [...topicKeys.details(props), 'schema'] as const,
   consumerGroups: (props: GetTopicDetailsRequest) =>
     [...topicKeys.details(props), 'consumerGroups'] as const,
+  statistics: (props: GetTopicDetailsRequest) =>
+    [...topicKeys.details(props), 'statistics'] as const,
 };
 
 export function useTopics(props: GetTopicsRequest) {
   const { clusterName, ...filters } = props;
-  return useQuery(topicKeys.list(clusterName, filters), () =>
-    api.getTopics(props)
+  return useQuery(
+    topicKeys.list(clusterName, filters),
+    () => api.getTopics(props),
+    { keepPreviousData: true }
   );
 }
 export function useTopicDetails(props: GetTopicDetailsRequest) {
@@ -236,3 +240,43 @@ export function useSendMessage(props: GetTopicDetailsRequest) {
     }
   );
 }
+
+// Statistics
+export function useTopicAnalysis(
+  props: GetTopicDetailsRequest,
+  enabled = true
+) {
+  return useQuery(
+    topicKeys.statistics(props),
+    () => api.getTopicAnalysis(props),
+    {
+      enabled,
+      refetchInterval: 1000,
+      useErrorBoundary: true,
+      retry: false,
+      suspense: false,
+    }
+  );
+}
+export function useAnalyzeTopic(props: GetTopicDetailsRequest) {
+  const client = useQueryClient();
+  return useMutation(() => api.analyzeTopic(props), {
+    onSuccess: () => {
+      showSuccessAlert({
+        message: `Topic analysis successfully started`,
+      });
+      client.invalidateQueries(topicKeys.statistics(props));
+    },
+  });
+}
+export function useCancelTopicAnalysis(props: GetTopicDetailsRequest) {
+  const client = useQueryClient();
+  return useMutation(() => api.cancelTopicAnalysis(props), {
+    onSuccess: () => {
+      showSuccessAlert({
+        message: `Topic analysis canceled`,
+      });
+      client.invalidateQueries(topicKeys.statistics(props));
+    },
+  });
+}
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 0be6a514cc0..3392b88795f 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -99,7 +99,7 @@ export const clusterSchemaEditPath = (
   clusterName: ClusterName = RouteParams.clusterName,
   subject: SchemaName = RouteParams.subject
 ) => `${clusterSchemasPath(clusterName)}/${subject}/edit`;
-export const clusterSchemaSchemaComparePath = (
+export const clusterSchemaComparePath = (
   clusterName: ClusterName = RouteParams.clusterName,
   subject: SchemaName = RouteParams.subject
 ) => `${clusterSchemaPath(clusterName, subject)}/compare`;
@@ -127,6 +127,7 @@ export const clusterTopicCopyPath = (
 export const clusterTopicSettingsRelativePath = 'settings';
 export const clusterTopicMessagesRelativePath = 'messages';
 export const clusterTopicConsumerGroupsRelativePath = 'consumer-groups';
+export const clusterTopicStatisticsRelativePath = 'statistics';
 export const clusterTopicEditRelativePath = 'edit';
 export const clusterTopicSendMessageRelativePath = 'message';
 export const clusterTopicPath = (
@@ -162,6 +163,14 @@ export const clusterTopicConsumerGroupsPath = (
     clusterName,
     topicName
   )}/${clusterTopicConsumerGroupsRelativePath}`;
+export const clusterTopicStatisticsPath = (
+  clusterName: ClusterName = RouteParams.clusterName,
+  topicName: TopicName = RouteParams.topicName
+) =>
+  `${clusterTopicPath(
+    clusterName,
+    topicName
+  )}/${clusterTopicStatisticsRelativePath}`;
 export const clusterTopicSendMessagePath = (
   clusterName: ClusterName = RouteParams.clusterName,
   topicName: TopicName = RouteParams.topicName
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 9be09d77be9..799aaa5e5f0 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -71,6 +71,16 @@ const theme = {
     backgroundColor: Colors.neutral[5],
     color: Colors.red[55],
   },
+  list: {
+    label: {
+      color: Colors.neutral[50],
+    },
+  },
+  progressBar: {
+    backgroundColor: Colors.neutral[3],
+    compleatedColor: Colors.green[40],
+    borderColor: Colors.neutral[10],
+  },
   layout: {
     backgroundColor: Colors.neutral[0],
     minWidth: '1200px',
@@ -149,6 +159,7 @@ const theme = {
       4: {
         fontSize: '14px',
         lineHeight: '20px',
+        fontWeight: 500,
       },
       5: {
         fontSize: '12px',
@@ -308,6 +319,7 @@ const theme = {
     },
     tr: {
       backgroundColor: {
+        normal: Colors.neutral[0],
         hover: Colors.neutral[5],
       },
     },
@@ -316,6 +328,10 @@ const theme = {
         normal: Colors.neutral[90],
       },
     },
+    expander: {
+      normal: Colors.brand[50],
+      hover: Colors.brand[20],
+    },
   },
   primaryTab: {
     color: {
@@ -547,6 +563,9 @@ const theme = {
   editFilterText: {
     color: Colors.brand[50],
   },
+  statictics: {
+    createdAtColor: Colors.neutral[50],
+  },
 };
 
 export type ThemeType = typeof theme;

From ffb62d3eabf2484cc90a036f3a1782bfcc1cddf1 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Tue, 9 Aug 2022 16:53:31 +0300
Subject: [PATCH 113/734] Fix unstable e2e test (#2416)

* Fix unstable e2e test #2373

* Fix unstable e2e test #2373

* Prepare steps for Schema Registry and Connector fixed #2288

* Fix unstable e2e test #2373

* Revert "Prepare steps for Schema Registry and Connector fixed #2288"

This reverts commit cfeb224e99f859d7278444555b1fee3028dcf7ee.

* Adding @Disabled annotation #2373

Co-authored-by: anezboretskiy <anezboretskiy@modeln.com>
Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../java/com/provectus/kafka/ui/pages/topic/TopicsList.java     | 2 +-
 .../src/test/java/com/provectus/kafka/ui/tests/TopicTests.java  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index cfd120f3a01..5b816d05f5c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -55,7 +55,7 @@ public TopicView openTopic(String topicName) {
     @SneakyThrows
     public TopicsList isTopicNotVisible(String topicName) {
         $$x("//table/tbody/tr/td[2]")
-                .shouldBe(CollectionCondition.sizeGreaterThanOrEqual(4))
+                .shouldBe(CollectionCondition.sizeGreaterThan(0))
                 .find(Condition.exactText(topicName))
                 .shouldBe(Condition.not(Condition.visible));
         return this;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index a962b8ceabb..75e5cfa7224 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -64,7 +64,6 @@ public void createTopic() {
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
                 .topicIsNotVisible(NEW_TOPIC);
     }
-
     @Disabled("Due to issue https://github.com/provectus/kafka-ui/issues/1500 ignore this test")
     @SneakyThrows
     @DisplayName("should update a topic")
@@ -104,7 +103,6 @@ public void updateTopic() {
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(207)
     @Test
-    @Disabled // TODO: https://github.com/provectus/kafka-ui/issues/2373
     public void deleteTopic() {
         pages.openTopicsList(SECOND_LOCAL)
                 .isOnPage()

From d781ac45da47afcd2c2d782f8d1ca06a696468c7 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Tue, 9 Aug 2022 17:28:58 +0300
Subject: [PATCH 114/734] Get rid of asserts in helper classes #2295 (#2418)

* Get rid of asserts in helper classes #2295

* Fixed step description

* Deleted description of ConnectorCreateView

Co-authored-by: anezboretskiy <anezboretskiy@modeln.com>
Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../provectus/kafka/ui/pages/MainPage.java    |  2 +-
 .../pages/connector/ConnectorCreateView.java  |  4 ++--
 .../ui/pages/connector/ConnectorsList.java    |  2 +-
 .../kafka/ui/pages/schema/SchemaView.java     |  2 +-
 .../kafka/ui/pages/topic/TopicView.java       |  2 +-
 .../kafka/ui/pages/topic/TopicsList.java      |  2 +-
 .../com/provectus/kafka/ui/SmokeTests.java    |  2 +-
 .../kafka/ui/tests/ConnectorsTests.java       | 10 +++++-----
 .../kafka/ui/tests/SchemasTests.java          | 16 +++++++--------
 .../provectus/kafka/ui/tests/TopicTests.java  | 20 +++++++++----------
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
index 7e2a6640a82..797d0277b9d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
@@ -26,7 +26,7 @@ public MainPage goTo() {
     }
 
     @Step
-    public MainPage isOnPage() {
+    public MainPage waitUntilScreenReady() {
         $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
         $("input[name=switchRoundedDefault]").parent().$("span").shouldBe(Condition.visible);
         return this;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
index e87dcfe342f..69f67a9a4af 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
@@ -34,8 +34,8 @@ public ConnectorsView setConnectorConfig(String connectName, String configJson)
         return new ConnectorsView();
     }
 
-    @Step("Verify that page 'Create Connector' opened")
-    public ConnectorCreateView isOnConnectorCreatePage() {
+    @Step
+    public ConnectorCreateView waitUntilScreenReady() {
         nameField.shouldBe(Condition.visible);
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
index 13c2ce2b70f..ed4b045caef 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
@@ -24,7 +24,7 @@ public ConnectorsList goTo(String cluster) {
     }
 
     @Step
-    public ConnectorsList isOnPage() {
+    public ConnectorsList waitUntilScreenReady() {
         $(By.xpath("//h1[text()='Connectors']")).shouldBe(Condition.visible);
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
index cce7ecefc4c..a2b715f4f18 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
@@ -12,7 +12,7 @@
 public class SchemaView {
 
     @Step
-    public SchemaView isOnSchemaViewPage() {
+    public SchemaView waitUntilScreenReady() {
         $("div#schema").shouldBe(Condition.visible);
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index a71d49e0f51..9e667df7197 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -29,7 +29,7 @@ public TopicView goTo(String cluster, String topic) {
     }
 
     @Step
-    public TopicView isOnTopicViewPage() {
+    public TopicView waitUntilScreenReady() {
         $(By.linkText("Overview")).shouldBe(Condition.visible);
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 5b816d05f5c..ccdf4b7a110 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -25,7 +25,7 @@ public TopicsList goTo(String cluster) {
     }
 
     @Step
-    public TopicsList isOnPage() {
+    public TopicsList waitUntilScreenReady() {
         $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
         $(By.xpath("//h1[text()='All Topics']")).shouldBe(Condition.visible);
         return this;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
index e52d9dc1d87..149acf4aa56 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
@@ -16,7 +16,7 @@ public class SmokeTests extends BaseTest {
     @DisplayName("main page should load")
     void mainPageLoads() {
         pages.open()
-                .isOnPage();
+                .waitUntilScreenReady();
         compareScreenshots("main");
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 57002ee5b6b..fe0e468e45f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -70,14 +70,14 @@ public static void afterAll() {
     @Test
     public void createConnector() {
         pages.openConnectorsList(LOCAL_CLUSTER)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .clickCreateConnectorButton()
-                .isOnConnectorCreatePage()
+                .waitUntilScreenReady()
                 .setConnectorConfig(
                         SINK_CONNECTOR,
                         FileUtils.getResourceAsString("config_for_create_connector.json"));
         pages.openConnectorsList(LOCAL_CLUSTER)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR);
     }
 
@@ -89,7 +89,7 @@ public void createConnector() {
     @Test
     public void updateConnector() {
         pages.openConnectorsList(LOCAL_CLUSTER)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_UPDATE);
         pages.connectorsView.connectorIsVisibleOnOverview();
         pages.connectorsView.openEditConfig()
@@ -106,7 +106,7 @@ public void updateConnector() {
     @Test
     public void deleteConnector() {
         pages.openConnectorsList(LOCAL_CLUSTER)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_DELETE);
         pages.connectorsView.clickDeleteButton();
         pages.openConnectorsList(LOCAL_CLUSTER)
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index d7f1bf9c0c6..af14f108198 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -71,7 +71,7 @@ void createSchemaAvro() throws IOException {
                 .setSchemaField(readFileAsString(PATH_AVRO_VALUE))
                 .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.AVRO)
                 .clickSubmit()
-                .isOnSchemaViewPage();
+                .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.isSchemaVisible(SCHEMA_AVRO_CREATE);
@@ -88,12 +88,12 @@ void updateSchemaAvro() {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_AVRO_API_UPDATE)
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .openEditSchema()
                 .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(readFileAsString(PATH_AVRO_FOR_UPDATE))
                 .clickSubmit()
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .isCompatibility(CompatibilityLevel.CompatibilityEnum.NONE);
     }
 
@@ -108,7 +108,7 @@ void deleteSchemaAvro() {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_AVRO_API)
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .removeSchema()
                 .isNotVisible(SCHEMA_AVRO_API);
     }
@@ -128,7 +128,7 @@ void createSchemaJson() {
                 .setSchemaField(readFileAsString(PATH_JSON_VALUE))
                 .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.JSON)
                 .clickSubmit()
-                .isOnSchemaViewPage();
+                .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.isSchemaVisible(SCHEMA_JSON_CREATE);
@@ -145,7 +145,7 @@ void deleteSchemaJson() {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_JSON_API)
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .removeSchema()
                 .isNotVisible(SCHEMA_JSON_API);
     }
@@ -165,7 +165,7 @@ void createSchemaProtobuf() {
                 .setSchemaField(readFileAsString(PATH_PROTOBUF_VALUE))
                 .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.PROTOBUF)
                 .clickSubmit()
-                .isOnSchemaViewPage();
+                .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.isSchemaVisible(SCHEMA_PROTOBUF_CREATE);
@@ -182,7 +182,7 @@ void deleteSchemaProtobuf() {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_PROTOBUF_API)
-                .isOnSchemaViewPage()
+                .waitUntilScreenReady()
                 .removeSchema()
                 .isNotVisible(SCHEMA_PROTOBUF_API);
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 75e5cfa7224..0d6026e1edb 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -55,7 +55,7 @@ public void createTopic() {
         pages.topicsList.pressCreateNewTopic()
                 .setTopicName(NEW_TOPIC)
                 .sendData()
-                .isOnTopicViewPage();
+                .waitUntilScreenReady();
         pages.open()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
                 .topicIsVisible(NEW_TOPIC);
@@ -74,9 +74,9 @@ public void createTopic() {
     @Test
     public void updateTopic() {
         pages.openTopicsList(SECOND_LOCAL)
-                .isOnPage();
+                .waitUntilScreenReady();
         pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
-                .isOnTopicViewPage()
+                .waitUntilScreenReady()
                 .openEditSettings()
                 .selectCleanupPolicy(COMPACT_POLICY_VALUE)
                 .setMinInsyncReplicas(10)
@@ -84,10 +84,10 @@ public void updateTopic() {
                 .setMaxSizeOnDiskInGB(UPDATED_MAX_SIZE_ON_DISK)
                 .setMaxMessageBytes(UPDATED_MAX_MESSAGE_BYTES)
                 .sendData()
-                .isOnTopicViewPage();
+                .waitUntilScreenReady();
 
         pages.openTopicsList(SECOND_LOCAL)
-                .isOnPage();
+                .waitUntilScreenReady();
         pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
                 .openEditSettings()
                 // Assertions
@@ -105,11 +105,11 @@ public void updateTopic() {
     @Test
     public void deleteTopic() {
         pages.openTopicsList(SECOND_LOCAL)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .openTopic(TOPIC_TO_DELETE)
-                .isOnTopicViewPage()
+                .waitUntilScreenReady()
                 .deleteTopic()
-                .isOnPage()
+                .waitUntilScreenReady()
                 .isTopicNotVisible(TOPIC_TO_DELETE);
     }
 
@@ -121,9 +121,9 @@ public void deleteTopic() {
     @Test
     void produceMessage() {
         pages.openTopicsList(SECOND_LOCAL)
-                .isOnPage()
+                .waitUntilScreenReady()
                 .openTopic(TOPIC_TO_UPDATE)
-                .isOnTopicViewPage()
+                .waitUntilScreenReady()
                 .openTopicMenu(TopicView.TopicMenu.MESSAGES)
                 .clickOnButton("Produce Message")
                 .setContentFiled(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE))

From 9b3495a2e9e2c92b8a073bc4ed835a0c30b66b27 Mon Sep 17 00:00:00 2001
From: Azat Safin <azat.safin@gmail.com>
Date: Wed, 10 Aug 2022 12:58:41 +0300
Subject: [PATCH 115/734] use semver object for compare (#2387)

Co-authored-by: Azat Safin <azsafin@provectus.com>
---
 charts/kafka-ui/Chart.yaml             | 2 +-
 charts/kafka-ui/templates/ingress.yaml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 1177e74887c..7eaff3c59aa 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.0.4
+version: 0.4.2
 appVersion: latest
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/ingress.yaml b/charts/kafka-ui/templates/ingress.yaml
index 7659867b31a..e4b33439c42 100644
--- a/charts/kafka-ui/templates/ingress.yaml
+++ b/charts/kafka-ui/templates/ingress.yaml
@@ -1,7 +1,9 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "kafka-ui.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") (trimPrefix "v" .Capabilities.KubeVersion.Version | semverCompare ">= 1.19" ) -}}
+{{- $kubeCapabilityVersion := semver .Capabilities.KubeVersion.Version -}}
+{{- $isHigher1p19 := ge (semver "1.19" | $kubeCapabilityVersion.Compare) 0 -}}
+{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") $isHigher1p19 -}}
 apiVersion: networking.k8s.io/v1
 {{- else if $.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 apiVersion: networking.k8s.io/v1beta1
@@ -30,7 +32,7 @@ spec:
   rules:
     - http:
         paths:
-{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") (trimPrefix "v" .Capabilities.KubeVersion.Version | semverCompare ">= 1.19" ) -}}
+{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") $isHigher1p19 -}}
           {{- range .Values.ingress.precedingPaths }}
           - path: {{ .path }}
             pathType: Prefix

From 24243e36acd288123c15b1c9b83172b6f04f9d32 Mon Sep 17 00:00:00 2001
From: MichaelGonzalezMurillo
 <110129349+MichaelGonzalezMurillo@users.noreply.github.com>
Date: Fri, 12 Aug 2022 05:21:15 -0600
Subject: [PATCH 116/734] Fix validation message for Topic name field (#2425)

* Fixes #2203

* Fixes #2203 adding unit tests
---
 .../src/components/Topics/New/__test__/New.spec.tsx  | 12 ++++++++++++
 kafka-ui-react-app/src/lib/constants.ts              |  2 +-
 kafka-ui-react-app/src/lib/yupExtended.ts            |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index a15ef31f680..0e01da66cb6 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -77,6 +77,18 @@ describe('New', () => {
     expect(mockNavigate).not.toHaveBeenCalled();
   });
 
+  it('validates form invalid name', async () => {
+    await act(() => renderComponent(clusterTopicNewPath(clusterName)));
+    await waitFor(() => {
+      userEvent.type(screen.getByPlaceholderText('Topic Name'), 'Invalid,Name');
+    });
+    await waitFor(() => {
+      expect(
+        screen.getByText('Only alphanumeric, _, -, and . allowed')
+      ).toBeInTheDocument();
+    });
+  });
+
   it('submits valid form', async () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
     await act(() => {
diff --git a/kafka-ui-react-app/src/lib/constants.ts b/kafka-ui-react-app/src/lib/constants.ts
index 0be9810babe..5626c06ee34 100644
--- a/kafka-ui-react-app/src/lib/constants.ts
+++ b/kafka-ui-react-app/src/lib/constants.ts
@@ -15,7 +15,7 @@ export const BASE_PARAMS: ConfigurationParameters = {
   },
 };
 
-export const TOPIC_NAME_VALIDATION_PATTERN = /^[.,A-Za-z0-9_-]+$/;
+export const TOPIC_NAME_VALIDATION_PATTERN = /^[a-zA-Z0-9._-]+$/;
 export const SCHEMA_NAME_VALIDATION_PATTERN = /^[.,A-Za-z0-9_/-]+$/;
 
 export const TOPIC_CUSTOM_PARAMS_PREFIX = 'customParams';
diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index ca51e662f15..d9c476aa76a 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -47,6 +47,7 @@ export default yup;
 export const topicFormValidationSchema = yup.object().shape({
   name: yup
     .string()
+    .max(249)
     .required()
     .matches(
       TOPIC_NAME_VALIDATION_PATTERN,

From 5fdcd2124cce0cec8eaf7e09416fff55259eace4 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 12 Aug 2022 14:22:27 +0300
Subject: [PATCH 117/734] Fix a typo within topic's statistics (#2422)

---
 .../Topics/Topic/Details/Statistics/Indicators/Total.tsx      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx
index dec863c0005..f2aa53141e8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx
@@ -24,14 +24,14 @@ const Total: React.FC<TopicAnalysisStats> = ({
     </Metrics.Indicator>
     <Metrics.Indicator label="Null keys">{nullKeys}</Metrics.Indicator>
     <Metrics.Indicator
-      label="Uniq keys"
+      label="Unique keys"
       title="Approximate number of unique keys"
     >
       {approxUniqKeys}
     </Metrics.Indicator>
     <Metrics.Indicator label="Null values">{nullValues}</Metrics.Indicator>
     <Metrics.Indicator
-      label="Uniq values"
+      label="Unique values"
       title="Approximate number of unique values"
     >
       {approxUniqValues}

From 21f17ad39e33d09319b75f5c15c834523d707777 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Fri, 12 Aug 2022 15:36:07 +0300
Subject: [PATCH 118/734] Use new table component for topics list (#2426)

* Use new table component for topics list

* Fix styling

* Migrate BrokerLogdir to new tables

* Improve test coverage
---
 .../src/components/Brokers/Broker/Broker.tsx  |   7 -
 .../Broker/BrokerLogdir/BrokerLogdir.tsx      |  67 ++--
 .../__test__/BrokerLogdir.spec.tsx            |  32 +-
 .../Brokers/utils/__test__/fixtures.ts        |  16 -
 .../utils/__test__/translateLogdirs.spec.tsx  |  35 --
 .../Brokers/utils/translateLogdirs.ts         |  23 --
 .../components/Topics/List/ActionsCell.tsx    |  94 ++---
 .../Topics/List/BatchActionsBar.tsx           | 111 ++++++
 .../src/components/Topics/List/List.styled.ts |  32 --
 .../src/components/Topics/List/ListPage.tsx   |  38 +-
 .../src/components/Topics/List/TopicTable.tsx | 113 ++++++
 .../components/Topics/List/TopicTitleCell.tsx |  22 ++
 .../components/Topics/List/TopicsTable.tsx    | 201 -----------
 .../Topics/List/TopicsTableCells.tsx          |  59 ----
 .../Topics/List/__tests__/ActionCell.spec.tsx | 179 ----------
 .../Topics/List/__tests__/ListPage.spec.tsx   |   6 +-
 .../Topics/List/__tests__/TopicTable.spec.tsx | 324 ++++++++++++++++++
 .../List/__tests__/TopicsTable.spec.tsx       | 168 ---------
 .../List/__tests__/TopicsTableCells.spec.tsx  | 189 ----------
 .../Topic/Details/Overview/Overview.tsx       | 118 ++++---
 .../Details/Statistics/PartitionTable.tsx     |   1 -
 .../common/Dropdown/Dropdown.styled.ts        |   7 +
 .../components/common/Dropdown/Dropdown.tsx   |   4 +-
 .../IndeterminateCheckbox.tsx                 |  24 ++
 .../common/NewTable/SelectRowCell.tsx         |  15 +
 .../common/NewTable/SelectRowHeader.tsx       |  14 +
 .../components/common/NewTable/SizeCell.tsx   |  10 +
 .../common/NewTable/Table.styled.ts           |  62 +++-
 .../src/components/common/NewTable/Table.tsx  | 168 ++++++---
 .../common/NewTable/__test__/Table.spec.tsx   |  94 ++++-
 .../src/components/common/NewTable/index.ts   |   8 +-
 .../NewTable/utils/updatePaginationState.ts   |  19 +-
 .../common/table/Table/TableKeyLink.styled.ts |  10 +-
 .../src/lib/fixtures/brokers.ts               |   4 +
 kafka-ui-react-app/src/theme/theme.ts         |   8 +-
 35 files changed, 1105 insertions(+), 1177 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Brokers/utils/translateLogdirs.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/List/List.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/TopicTable.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/TopicTitleCell.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/List/TopicsTable.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/List/TopicsTableCells.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/List/__tests__/ActionCell.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTable.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/IndeterminateCheckbox/IndeterminateCheckbox.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/SelectRowCell.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index 780fdc72d1c..ba3d3fcb4c9 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -17,13 +17,6 @@ import BrokerMetrics from 'components/Brokers/Broker/BrokerMetrics/BrokerMetrics
 import Navbar from 'components/common/Navigation/Navbar.styled';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 
-export interface BrokerLogdirState {
-  name: string;
-  error: string;
-  topics: number;
-  partitions: number;
-}
-
 const Broker: React.FC = () => {
   const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
 
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
index 37e1bce49d7..b38f2b190ab 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/BrokerLogdir.tsx
@@ -1,40 +1,53 @@
 import React from 'react';
 import useAppParams from 'lib/hooks/useAppParams';
-import { translateLogdirs } from 'components/Brokers/utils/translateLogdirs';
-import { SmartTable } from 'components/common/SmartTable/SmartTable';
-import { TableColumn } from 'components/common/SmartTable/TableColumn';
-import { useTableState } from 'lib/hooks/useTableState';
 import { ClusterBrokerParam } from 'lib/paths';
 import { useBrokerLogDirs } from 'lib/hooks/api/brokers';
-
-interface BrokerLogdirState {
-  name: string;
-  error: string;
-  topics: number;
-  partitions: number;
-}
+import Table from 'components/common/NewTable';
+import { ColumnDef } from '@tanstack/react-table';
+import { BrokersLogdirs } from 'generated-sources';
 
 const BrokerLogdir: React.FC = () => {
   const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
-  const { data: logDirs } = useBrokerLogDirs(clusterName, Number(brokerId));
+  const { data } = useBrokerLogDirs(clusterName, Number(brokerId));
 
-  const preparedRows = translateLogdirs(logDirs);
-  const tableState = useTableState<BrokerLogdirState, string>(preparedRows, {
-    idSelector: ({ name }) => name,
-    totalPages: 0,
-  });
+  const columns = React.useMemo<ColumnDef<BrokersLogdirs>[]>(
+    () => [
+      { header: 'Name', accessorKey: 'name' },
+      { header: 'Error', accessorKey: 'error' },
+      {
+        header: 'Topics',
+        accessorKey: 'topics',
+        cell: ({ getValue }) =>
+          getValue<BrokersLogdirs['topics']>()?.length || 0,
+        enableSorting: false,
+      },
+      {
+        id: 'partitions',
+        header: 'Partitions',
+        accessorKey: 'topics',
+        cell: ({ getValue }) => {
+          const topics = getValue<BrokersLogdirs['topics']>();
+          if (!topics) {
+            return 0;
+          }
+          return topics.reduce(
+            (acc, topic) => acc + (topic.partitions?.length || 0),
+            0
+          );
+        },
+        enableSorting: false,
+      },
+    ],
+    []
+  );
 
   return (
-    <SmartTable
-      tableState={tableState}
-      placeholder="Log dir data not available"
-      isFullwidth
-    >
-      <TableColumn title="Name" field="name" />
-      <TableColumn title="Error" field="error" />
-      <TableColumn title="Topics" field="topics" />
-      <TableColumn title="Partitions" field="partitions" />
-    </SmartTable>
+    <Table
+      data={data || []}
+      columns={columns}
+      emptyMessage="Log dir data not available"
+      enableSorting
+    />
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
index 47209c66ba1..bb48fde32a0 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
@@ -16,7 +16,7 @@ const clusterName = 'local';
 const brokerId = 1;
 
 describe('BrokerLogdir Component', () => {
-  const renderComponent = async (payload: BrokerLogdirs[] = []) => {
+  const renderComponent = async (payload?: BrokerLogdirs[]) => {
     (useBrokerLogDirs as jest.Mock).mockImplementation(() => ({
       data: payload,
     }));
@@ -32,13 +32,35 @@ describe('BrokerLogdir Component', () => {
     });
   };
 
-  it('shows warning when server returns empty logDirs response', async () => {
+  it('shows warning when server returns undefined logDirs response', async () => {
     await renderComponent();
-    expect(screen.getByText('Log dir data not available')).toBeInTheDocument();
+    expect(
+      screen.getByRole('row', { name: 'Log dir data not available' })
+    ).toBeInTheDocument();
   });
 
-  it('shows broker', async () => {
+  it('shows warning when server returns empty logDirs response', async () => {
+    await renderComponent([]);
+    expect(
+      screen.getByRole('row', { name: 'Log dir data not available' })
+    ).toBeInTheDocument();
+  });
+
+  it('shows brokers', async () => {
     await renderComponent(brokerLogDirsPayload);
-    expect(screen.getByText('/opt/kafka/data-0/logs')).toBeInTheDocument();
+    expect(
+      screen.queryByRole('row', { name: 'Log dir data not available' })
+    ).not.toBeInTheDocument();
+
+    expect(
+      screen.getByRole('row', {
+        name: '/opt/kafka/data-0/logs NONE 3 4',
+      })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole('row', {
+        name: '/opt/kafka/data-1/logs NONE 0 0',
+      })
+    ).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts
index 076fb06a4e2..9ab3e4b662d 100644
--- a/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts
@@ -1,21 +1,5 @@
-import { BrokerLogdirState } from 'components/Brokers/Broker/Broker';
 import { BrokerMetrics } from 'generated-sources';
 
-export const transformedBrokerLogDirsPayload: BrokerLogdirState[] = [
-  {
-    error: 'NONE',
-    name: '/opt/kafka/data-0/logs',
-    topics: 3,
-    partitions: 4,
-  },
-];
-export const defaultTransformedBrokerLogDirsPayload: BrokerLogdirState = {
-  error: '-',
-  name: '-',
-  topics: 0,
-  partitions: 0,
-};
-
 export const brokerMetricsPayload: BrokerMetrics = {
   segmentSize: 23,
   segmentCount: 23,
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx b/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx
deleted file mode 100644
index 85fe55eb24d..00000000000
--- a/kafka-ui-react-app/src/components/Brokers/utils/__test__/translateLogdirs.spec.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import {
-  translateLogdir,
-  translateLogdirs,
-} from 'components/Brokers/utils/translateLogdirs';
-import { brokerLogDirsPayload } from 'lib/fixtures/brokers';
-
-import {
-  defaultTransformedBrokerLogDirsPayload,
-  transformedBrokerLogDirsPayload,
-} from './fixtures';
-
-describe('translateLogdir and translateLogdirs', () => {
-  describe('translateLogdirs', () => {
-    it('returns empty array when broker logdirs is not defined', () => {
-      expect(translateLogdirs(undefined)).toEqual([]);
-    });
-    it('returns transformed LogDirs array when broker logdirs defined', () => {
-      expect(translateLogdirs(brokerLogDirsPayload)).toEqual(
-        transformedBrokerLogDirsPayload
-      );
-    });
-  });
-  describe('translateLogdir', () => {
-    it('returns default data when broker logdir is empty', () => {
-      expect(translateLogdir({})).toEqual(
-        defaultTransformedBrokerLogDirsPayload
-      );
-    });
-    it('returns transformed LogDir when broker logdir defined', () => {
-      expect(translateLogdir(brokerLogDirsPayload[0])).toEqual(
-        transformedBrokerLogDirsPayload[0]
-      );
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Brokers/utils/translateLogdirs.ts b/kafka-ui-react-app/src/components/Brokers/utils/translateLogdirs.ts
deleted file mode 100644
index 6dd619cddba..00000000000
--- a/kafka-ui-react-app/src/components/Brokers/utils/translateLogdirs.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { BrokersLogdirs } from 'generated-sources';
-import { BrokerLogdirState } from 'components/Brokers/Broker/Broker';
-
-export const translateLogdir = (data: BrokersLogdirs): BrokerLogdirState => {
-  const partitionsCount =
-    data.topics?.reduce(
-      (prevValue, value) => prevValue + (value.partitions?.length || 0),
-      0
-    ) || 0;
-
-  return {
-    name: data.name || '-',
-    error: data.error || '-',
-    topics: data.topics?.length || 0,
-    partitions: partitionsCount,
-  };
-};
-
-export const translateLogdirs = (
-  data: BrokersLogdirs[] | undefined
-): BrokerLogdirState[] => {
-  return data?.map(translateLogdir) || [];
-};
diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
index 9aa14276d25..3ab51be3105 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
@@ -1,9 +1,8 @@
 import React from 'react';
 import { CleanUpPolicy, Topic } from 'generated-sources';
+import { CellContext } from '@tanstack/react-table';
 import { useAppDispatch } from 'lib/hooks/redux';
-import { TableCellProps } from 'components/common/SmartTable/TableColumn';
 import ClusterContext from 'components/contexts/ClusterContext';
-import * as S from 'components/Topics/List/List.styled';
 import { ClusterNameRoute } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
@@ -15,10 +14,9 @@ import {
   useRecreateTopic,
 } from 'lib/hooks/api/topics';
 
-const ActionsCell: React.FC<TableCellProps<Topic, string>> = ({
-  hovered,
-  dataItem: { internal, cleanUpPolicy, name },
-}) => {
+const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
+  const { name, internal, cleanUpPolicy } = row.original;
+
   const { isReadOnly, isTopicDeletionAllowed } =
     React.useContext(ClusterContext);
   const dispatch = useAppDispatch();
@@ -28,7 +26,7 @@ const ActionsCell: React.FC<TableCellProps<Topic, string>> = ({
   const deleteTopic = useDeleteTopic(clusterName);
   const recreateTopic = useRecreateTopic({ clusterName, topicName: name });
 
-  const isHidden = internal || isReadOnly || !hovered;
+  const isHidden = internal || isReadOnly;
 
   const clearTopicMessagesHandler = async () => {
     await dispatch(
@@ -37,47 +35,49 @@ const ActionsCell: React.FC<TableCellProps<Topic, string>> = ({
     queryClient.invalidateQueries(topicKeys.all(clusterName));
   };
 
+  const isCleanupDisabled = cleanUpPolicy !== CleanUpPolicy.DELETE;
+
   return (
-    <S.ActionsContainer>
-      {!isHidden && (
-        <Dropdown>
-          {cleanUpPolicy === CleanUpPolicy.DELETE && (
-            <DropdownItem
-              onClick={clearTopicMessagesHandler}
-              confirm="Are you sure want to clear topic messages?"
-              danger
-            >
-              Clear Messages
-            </DropdownItem>
-          )}
-          <DropdownItem
-            onClick={recreateTopic.mutateAsync}
-            confirm={
-              <>
-                Are you sure to recreate <b>{name}</b> topic?
-              </>
-            }
-            danger
-          >
-            Recreate Topic
-          </DropdownItem>
-          {isTopicDeletionAllowed && (
-            <DropdownItem
-              onClick={() => deleteTopic.mutateAsync(name)}
-              confirm={
-                <>
-                  Are you sure want to remove <b>{name}</b> topic?
-                </>
-              }
-              danger
-            >
-              Remove Topic
-            </DropdownItem>
-          )}
-        </Dropdown>
-      )}
-    </S.ActionsContainer>
+    <Dropdown disabled={isHidden}>
+      <DropdownItem
+        disabled={isCleanupDisabled}
+        onClick={clearTopicMessagesHandler}
+        confirm="Are you sure want to clear topic messages?"
+        danger
+        title="Cleanup is alowed only for topics with DELETE policy"
+      >
+        Clear Messages
+      </DropdownItem>
+      <DropdownItem
+        onClick={recreateTopic.mutateAsync}
+        confirm={
+          <>
+            Are you sure to recreate <b>{name}</b> topic?
+          </>
+        }
+        danger
+      >
+        Recreate Topic
+      </DropdownItem>
+      <DropdownItem
+        disabled={!isTopicDeletionAllowed}
+        onClick={() => deleteTopic.mutateAsync(name)}
+        confirm={
+          <>
+            Are you sure want to remove <b>{name}</b> topic?
+          </>
+        }
+        title={
+          isTopicDeletionAllowed
+            ? 'The topic deletion is restricted by app configuration'
+            : ''
+        }
+        danger
+      >
+        Remove Topic
+      </DropdownItem>
+    </Dropdown>
   );
 };
 
-export default React.memo(ActionsCell);
+export default ActionsCell;
diff --git a/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
new file mode 100644
index 00000000000..a5acec28f5b
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
@@ -0,0 +1,111 @@
+import React from 'react';
+import { Row } from '@tanstack/react-table';
+import { Topic } from 'generated-sources';
+import useAppParams from 'lib/hooks/useAppParams';
+import { ClusterName } from 'redux/interfaces';
+import { topicKeys, useDeleteTopic } from 'lib/hooks/api/topics';
+import { useConfirm } from 'lib/hooks/useConfirm';
+import { Button } from 'components/common/Button/Button';
+import { useAppDispatch } from 'lib/hooks/redux';
+import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
+import { clusterTopicCopyRelativePath } from 'lib/paths';
+import { useQueryClient } from '@tanstack/react-query';
+
+interface BatchActionsbarProps {
+  rows: Row<Topic>[];
+  resetRowSelection(): void;
+}
+
+const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
+  rows,
+  resetRowSelection,
+}) => {
+  const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
+  const confirm = useConfirm();
+  const dispatch = useAppDispatch();
+  const deleteTopic = useDeleteTopic(clusterName);
+  const selectedTopics = rows.map(({ original }) => original.name);
+  const client = useQueryClient();
+
+  const deleteTopicsHandler = () => {
+    confirm('Are you sure you want to remove selected topics?', async () => {
+      try {
+        await Promise.all(
+          selectedTopics.map((topicName) => deleteTopic.mutateAsync(topicName))
+        );
+        resetRowSelection();
+      } catch (e) {
+        // do nothing;
+      }
+    });
+  };
+
+  const purgeTopicsHandler = () => {
+    confirm(
+      'Are you sure you want to purge messages of selected topics?',
+      async () => {
+        try {
+          await Promise.all(
+            selectedTopics.map((topicName) =>
+              dispatch(clearTopicMessages({ clusterName, topicName })).unwrap()
+            )
+          );
+          resetRowSelection();
+        } catch (e) {
+          // do nothing;
+        } finally {
+          client.invalidateQueries(topicKeys.all(clusterName));
+        }
+      }
+    );
+  };
+
+  type Tuple = [string, string];
+
+  const getCopyTopicPath = () => {
+    const topic = rows[0].original;
+
+    const search = Object.keys(topic).reduce((acc: Tuple[], key) => {
+      const value = topic[key as keyof typeof topic];
+      if (!value || key === 'partitions' || key === 'internal') {
+        return acc;
+      }
+      const tuple: Tuple = [key, value.toString()];
+      return [...acc, tuple];
+    }, []);
+
+    return {
+      pathname: clusterTopicCopyRelativePath,
+      search: new URLSearchParams(search).toString(),
+    };
+  };
+
+  return (
+    <>
+      <Button
+        buttonSize="M"
+        buttonType="secondary"
+        onClick={deleteTopicsHandler}
+      >
+        Delete selected topics
+      </Button>
+      <Button
+        buttonSize="M"
+        buttonType="secondary"
+        disabled={selectedTopics.length > 1}
+        to={getCopyTopicPath()}
+      >
+        Copy selected topic
+      </Button>
+      <Button
+        buttonSize="M"
+        buttonType="secondary"
+        onClick={purgeTopicsHandler}
+      >
+        Purge messages of selected topics
+      </Button>
+    </>
+  );
+};
+
+export default BatchActionsbar;
diff --git a/kafka-ui-react-app/src/components/Topics/List/List.styled.ts b/kafka-ui-react-app/src/components/Topics/List/List.styled.ts
deleted file mode 100644
index c1324deb7d2..00000000000
--- a/kafka-ui-react-app/src/components/Topics/List/List.styled.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Td } from 'components/common/table/TableHeaderCell/TableHeaderCell.styled';
-import { NavLink } from 'react-router-dom';
-import styled, { css } from 'styled-components';
-
-export const Link = styled(NavLink)<{
-  $isInternal?: boolean;
-}>(
-  ({ theme, $isInternal }) => css`
-    color: ${theme.topicsList.color.normal};
-    font-weight: 500;
-    padding-left: ${$isInternal ? '5px' : 0};
-
-    &:hover {
-      background-color: ${theme.topicsList.backgroundColor.hover};
-      color: ${theme.topicsList.color.hover};
-    }
-
-    &.active {
-      background-color: ${theme.topicsList.backgroundColor.active};
-      color: ${theme.topicsList.color.active};
-    }
-  `
-);
-
-export const ActionsTd = styled(Td)`
-  overflow: visible;
-  width: 50px;
-`;
-
-export const ActionsContainer = styled.div`
-  text-align: right !important;
-`;
diff --git a/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
index bdd44a60a5e..d8031c92a90 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
@@ -11,7 +11,7 @@ import Switch from 'components/common/Switch/Switch';
 import PlusIcon from 'components/common/Icons/PlusIcon';
 import useSearch from 'lib/hooks/useSearch';
 import PageLoader from 'components/common/PageLoader/PageLoader';
-import TopicsTable from 'components/Topics/List/TopicsTable';
+import TopicTable from 'components/Topics/List/TopicTable';
 
 const ListPage: React.FC = () => {
   const { isReadOnly } = React.useContext(ClusterContext);
@@ -29,7 +29,7 @@ const ListPage: React.FC = () => {
     ) {
       searchParams.set('hideInternal', 'true');
     }
-    setSearchParams(searchParams, { replace: true });
+    setSearchParams(searchParams);
   }, []);
 
   const handleSwitch = () => {
@@ -41,8 +41,8 @@ const ListPage: React.FC = () => {
       searchParams.set('hideInternal', 'true');
     }
     // Page must be reset when the switch is toggled
-    searchParams.delete('page');
-    setSearchParams(searchParams.toString(), { replace: true });
+    searchParams.set('page', '1');
+    setSearchParams(searchParams);
   };
 
   return (
@@ -59,26 +59,22 @@ const ListPage: React.FC = () => {
         )}
       </PageHeading>
       <ControlPanelWrapper hasInput>
-        <div>
-          <Search
-            handleSearch={handleSearchQuery}
-            placeholder="Search by Topic Name"
-            value={searchQuery}
+        <Search
+          handleSearch={handleSearchQuery}
+          placeholder="Search by Topic Name"
+          value={searchQuery}
+        />
+        <label>
+          <Switch
+            name="ShowInternalTopics"
+            checked={!searchParams.has('hideInternal')}
+            onChange={handleSwitch}
           />
-        </div>
-        <div>
-          <label>
-            <Switch
-              name="ShowInternalTopics"
-              checked={!searchParams.has('hideInternal')}
-              onChange={handleSwitch}
-            />
-            Show Internal Topics
-          </label>
-        </div>
+          Show Internal Topics
+        </label>
       </ControlPanelWrapper>
       <Suspense fallback={<PageLoader />}>
-        <TopicsTable />
+        <TopicTable />
       </Suspense>
     </>
   );
diff --git a/kafka-ui-react-app/src/components/Topics/List/TopicTable.tsx b/kafka-ui-react-app/src/components/Topics/List/TopicTable.tsx
new file mode 100644
index 00000000000..a855435c876
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/TopicTable.tsx
@@ -0,0 +1,113 @@
+import React from 'react';
+import { SortOrder, Topic, TopicColumnsToSort } from 'generated-sources';
+import { ColumnDef } from '@tanstack/react-table';
+import Table, { SizeCell } from 'components/common/NewTable';
+import useAppParams from 'lib/hooks/useAppParams';
+import { ClusterName } from 'redux/interfaces';
+import { useSearchParams } from 'react-router-dom';
+import ClusterContext from 'components/contexts/ClusterContext';
+import { useTopics } from 'lib/hooks/api/topics';
+import { PER_PAGE } from 'lib/constants';
+
+import { TopicTitleCell } from './TopicTitleCell';
+import ActionsCell from './ActionsCell';
+import BatchActionsbar from './BatchActionsBar';
+
+const TopicTable: React.FC = () => {
+  const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
+  const [searchParams] = useSearchParams();
+  const { isReadOnly } = React.useContext(ClusterContext);
+  const { data } = useTopics({
+    clusterName,
+    page: Number(searchParams.get('page') || 1),
+    perPage: Number(searchParams.get('perPage') || PER_PAGE),
+    search: searchParams.get('q') || undefined,
+    showInternal: !searchParams.has('hideInternal'),
+    orderBy: (searchParams.get('sortBy') as TopicColumnsToSort) || undefined,
+    sortOrder:
+      (searchParams.get('sortDirection')?.toUpperCase() as SortOrder) ||
+      undefined,
+  });
+
+  const topics = data?.topics || [];
+  const pageCount = data?.pageCount || 0;
+
+  const columns = React.useMemo<ColumnDef<Topic>[]>(
+    () => [
+      {
+        id: TopicColumnsToSort.NAME,
+        header: 'Topic Name',
+        accessorKey: 'name',
+        cell: TopicTitleCell,
+      },
+      {
+        id: TopicColumnsToSort.TOTAL_PARTITIONS,
+        header: 'Total Partitions',
+        accessorKey: 'partitionCount',
+      },
+      {
+        id: TopicColumnsToSort.OUT_OF_SYNC_REPLICAS,
+        header: 'Out of sync replicas',
+        accessorKey: 'partitions',
+        cell: ({ getValue }) => {
+          const partitions = getValue<Topic['partitions']>();
+          if (partitions === undefined || partitions.length === 0) {
+            return 0;
+          }
+          return partitions.reduce((memo, { replicas }) => {
+            const outOfSync = replicas?.filter(({ inSync }) => !inSync);
+            return memo + (outOfSync?.length || 0);
+          }, 0);
+        },
+      },
+      {
+        header: 'Replication Factor',
+        accessorKey: 'replicationFactor',
+        enableSorting: false,
+      },
+      {
+        header: 'Number of messages',
+        accessorKey: 'partitions',
+        enableSorting: false,
+        cell: ({ getValue }) => {
+          const partitions = getValue<Topic['partitions']>();
+          if (partitions === undefined || partitions.length === 0) {
+            return 0;
+          }
+          return partitions.reduce((memo, { offsetMax, offsetMin }) => {
+            return memo + (offsetMax - offsetMin);
+          }, 0);
+        },
+      },
+      {
+        id: TopicColumnsToSort.SIZE,
+        header: 'Size',
+        accessorKey: 'segmentSize',
+        cell: SizeCell,
+      },
+      {
+        id: 'actions',
+        header: '',
+        cell: ActionsCell,
+      },
+    ],
+    []
+  );
+
+  return (
+    <Table
+      data={topics}
+      pageCount={pageCount}
+      columns={columns}
+      enableSorting
+      serverSideProcessing
+      batchActionsBar={BatchActionsbar}
+      enableRowSelection={
+        !isReadOnly ? (row) => !row.original.internal : undefined
+      }
+      emptyMessage="No topics found"
+    />
+  );
+};
+
+export default TopicTable;
diff --git a/kafka-ui-react-app/src/components/Topics/List/TopicTitleCell.tsx b/kafka-ui-react-app/src/components/Topics/List/TopicTitleCell.tsx
new file mode 100644
index 00000000000..fd32304beed
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/TopicTitleCell.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { CellContext } from '@tanstack/react-table';
+import { Tag } from 'components/common/Tag/Tag.styled';
+import { Topic } from 'generated-sources';
+import { NavLink } from 'react-router-dom';
+
+export const TopicTitleCell: React.FC<CellContext<Topic, unknown>> = ({
+  row: { original },
+}) => {
+  const { internal, name } = original;
+  return (
+    <NavLink to={name} title={name}>
+      {internal && (
+        <>
+          <Tag color="gray">IN</Tag>
+          &nbsp;
+        </>
+      )}
+      {name}
+    </NavLink>
+  );
+};
diff --git a/kafka-ui-react-app/src/components/Topics/List/TopicsTable.tsx b/kafka-ui-react-app/src/components/Topics/List/TopicsTable.tsx
deleted file mode 100644
index 6250d0c4da0..00000000000
--- a/kafka-ui-react-app/src/components/Topics/List/TopicsTable.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-import React from 'react';
-import { SortOrder, Topic, TopicColumnsToSort } from 'generated-sources';
-import { useSearchParams } from 'react-router-dom';
-import { useDeleteTopic, useTopics } from 'lib/hooks/api/topics';
-import useAppParams from 'lib/hooks/useAppParams';
-import { ClusterName } from 'redux/interfaces';
-import { PER_PAGE } from 'lib/constants';
-import { useTableState } from 'lib/hooks/useTableState';
-import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
-import { Button } from 'components/common/Button/Button';
-import { clusterTopicCopyRelativePath } from 'lib/paths';
-import { useConfirm } from 'lib/hooks/useConfirm';
-import { SmartTable } from 'components/common/SmartTable/SmartTable';
-import { TableColumn } from 'components/common/SmartTable/TableColumn';
-import ClusterContext from 'components/contexts/ClusterContext';
-import { useAppDispatch } from 'lib/hooks/redux';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-
-import {
-  MessagesCell,
-  OutOfSyncReplicasCell,
-  TitleCell,
-  TopicSizeCell,
-} from './TopicsTableCells';
-import ActionsCell from './ActionsCell';
-import { ActionsTd } from './List.styled';
-
-const TopicsTable: React.FC = () => {
-  const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
-  const [searchParams, setSearchParams] = useSearchParams();
-  const { isReadOnly } = React.useContext(ClusterContext);
-  const dispatch = useAppDispatch();
-  const confirm = useConfirm();
-  const deleteTopic = useDeleteTopic(clusterName);
-  const { data, refetch } = useTopics({
-    clusterName,
-    page: Number(searchParams.get('page') || 1),
-    perPage: Number(searchParams.get('perPage') || PER_PAGE),
-    search: searchParams.get('q') || undefined,
-    showInternal: !searchParams.has('hideInternal'),
-    orderBy: (searchParams.get('orderBy') as TopicColumnsToSort) || undefined,
-    sortOrder: (searchParams.get('sortOrder') as SortOrder) || undefined,
-  });
-
-  const handleOrderBy = (orderBy: string | null) => {
-    const currentOrderBy = searchParams.get('orderBy');
-    const currentSortOrder = searchParams.get('sortOrder');
-
-    if (orderBy) {
-      if (orderBy === currentOrderBy) {
-        searchParams.set(
-          'sortOrder',
-          currentSortOrder === SortOrder.DESC ? SortOrder.ASC : SortOrder.DESC
-        );
-      }
-
-      searchParams.set('orderBy', orderBy);
-    } else {
-      searchParams.delete('orderBy');
-      searchParams.delete('sortOrder');
-    }
-    setSearchParams(searchParams, { replace: true });
-  };
-
-  const tableState = useTableState<Topic, string>(
-    data?.topics || [],
-    {
-      idSelector: (topic) => topic.name,
-      totalPages: data?.pageCount || 0,
-      isRowSelectable: (topic) => !topic.internal,
-    },
-    {
-      handleOrderBy,
-      orderBy: searchParams.get('orderBy'),
-      sortOrder: (searchParams.get('sortOrder') as SortOrder) || SortOrder.ASC,
-    }
-  );
-
-  const getSelectedTopic = (): string => {
-    const name = Array.from(tableState.selectedIds)[0];
-    const selectedTopic =
-      tableState.data.find((topic: Topic) => topic.name === name) || {};
-
-    return Object.keys(selectedTopic)
-      .map((x: string) => {
-        const value = selectedTopic[x as keyof typeof selectedTopic];
-        return value && x !== 'partitions' ? `${x}=${value}` : null;
-      })
-      .join('&');
-  };
-
-  const clearSelectedTopics = () => tableState.toggleSelection(false);
-
-  const deleteTopicsHandler = () => {
-    const selectedTopics = Array.from(tableState.selectedIds);
-    confirm('Are you sure you want to remove selected topics?', async () => {
-      try {
-        await Promise.all(
-          selectedTopics.map((topicName) => deleteTopic.mutateAsync(topicName))
-        );
-        clearSelectedTopics();
-      } catch (e) {
-        // do nothing;
-      } finally {
-        refetch();
-      }
-    });
-  };
-
-  const purgeTopicsHandler = () => {
-    const selectedTopics = Array.from(tableState.selectedIds);
-    confirm(
-      'Are you sure you want to purge messages of selected topics?',
-      async () => {
-        try {
-          await Promise.all(
-            selectedTopics.map((topicName) =>
-              dispatch(clearTopicMessages({ clusterName, topicName })).unwrap()
-            )
-          );
-          clearSelectedTopics();
-        } catch (e) {
-          // do nothing;
-        } finally {
-          refetch();
-        }
-      }
-    );
-  };
-
-  return (
-    <>
-      {tableState.selectedCount > 0 && (
-        <ControlPanelWrapper>
-          <Button
-            buttonSize="M"
-            buttonType="secondary"
-            onClick={deleteTopicsHandler}
-          >
-            Delete selected topics
-          </Button>
-          {tableState.selectedCount === 1 && (
-            <Button
-              buttonSize="M"
-              buttonType="secondary"
-              to={{
-                pathname: clusterTopicCopyRelativePath,
-                search: `?${getSelectedTopic()}`,
-              }}
-            >
-              Copy selected topic
-            </Button>
-          )}
-
-          <Button
-            buttonSize="M"
-            buttonType="secondary"
-            onClick={purgeTopicsHandler}
-          >
-            Purge messages of selected topics
-          </Button>
-        </ControlPanelWrapper>
-      )}
-      <SmartTable
-        selectable={!isReadOnly}
-        tableState={tableState}
-        placeholder="No topics found"
-        isFullwidth
-        paginated
-        hoverable
-      >
-        <TableColumn
-          maxWidth="350px"
-          title="Topic Name"
-          cell={TitleCell}
-          orderValue={TopicColumnsToSort.NAME}
-        />
-        <TableColumn
-          title="Total Partitions"
-          field="partitions.length"
-          orderValue={TopicColumnsToSort.TOTAL_PARTITIONS}
-        />
-        <TableColumn
-          title="Out of sync replicas"
-          cell={OutOfSyncReplicasCell}
-          orderValue={TopicColumnsToSort.OUT_OF_SYNC_REPLICAS}
-        />
-        <TableColumn title="Replication Factor" field="replicationFactor" />
-        <TableColumn title="Number of messages" cell={MessagesCell} />
-        <TableColumn
-          title="Size"
-          cell={TopicSizeCell}
-          orderValue={TopicColumnsToSort.SIZE}
-        />
-        <TableColumn maxWidth="4%" cell={ActionsCell} customTd={ActionsTd} />
-      </SmartTable>
-    </>
-  );
-};
-
-export default TopicsTable;
diff --git a/kafka-ui-react-app/src/components/Topics/List/TopicsTableCells.tsx b/kafka-ui-react-app/src/components/Topics/List/TopicsTableCells.tsx
deleted file mode 100644
index d79dd2eb676..00000000000
--- a/kafka-ui-react-app/src/components/Topics/List/TopicsTableCells.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import { TableCellProps } from 'components/common/SmartTable/TableColumn';
-import { Tag } from 'components/common/Tag/Tag.styled';
-import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { Topic } from 'generated-sources';
-
-import * as S from './List.styled';
-
-export const TitleCell: React.FC<TableCellProps<Topic, string>> = ({
-  dataItem: { internal, name },
-}) => {
-  return (
-    <>
-      {internal && <Tag color="gray">IN</Tag>}
-      <S.Link to={name} $isInternal={internal}>
-        {name}
-      </S.Link>
-    </>
-  );
-};
-
-export const TopicSizeCell: React.FC<TableCellProps<Topic, string>> = ({
-  dataItem: { segmentSize },
-}) => {
-  return <BytesFormatted value={segmentSize} />;
-};
-
-export const OutOfSyncReplicasCell: React.FC<TableCellProps<Topic, string>> = ({
-  dataItem: { partitions },
-}) => {
-  const data = React.useMemo(() => {
-    if (partitions === undefined || partitions.length === 0) {
-      return 0;
-    }
-
-    return partitions.reduce((memo, { replicas }) => {
-      const outOfSync = replicas?.filter(({ inSync }) => !inSync);
-      return memo + (outOfSync?.length || 0);
-    }, 0);
-  }, [partitions]);
-
-  return <span>{data}</span>;
-};
-
-export const MessagesCell: React.FC<TableCellProps<Topic, string>> = ({
-  dataItem: { partitions },
-}) => {
-  const data = React.useMemo(() => {
-    if (partitions === undefined || partitions.length === 0) {
-      return 0;
-    }
-
-    return partitions.reduce((memo, { offsetMax, offsetMin }) => {
-      return memo + (offsetMax - offsetMin);
-    }, 0);
-  }, [partitions]);
-
-  return <span>{data}</span>;
-};
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/ActionCell.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/ActionCell.spec.tsx
deleted file mode 100644
index 80f45efc548..00000000000
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/ActionCell.spec.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import React from 'react';
-import { render } from 'lib/testHelpers';
-import { TableState } from 'lib/hooks/useTableState';
-import { act, screen, waitFor } from '@testing-library/react';
-import { CleanUpPolicy, Topic } from 'generated-sources';
-import { topicsPayload } from 'lib/fixtures/topics';
-import ActionsCell from 'components/Topics/List/ActionsCell';
-import ClusterContext from 'components/contexts/ClusterContext';
-import userEvent from '@testing-library/user-event';
-import { useDeleteTopic, useRecreateTopic } from 'lib/hooks/api/topics';
-
-const mockUnwrap = jest.fn();
-const useDispatchMock = () => jest.fn(() => ({ unwrap: mockUnwrap }));
-
-jest.mock('lib/hooks/redux', () => ({
-  ...jest.requireActual('lib/hooks/redux'),
-  useAppDispatch: useDispatchMock,
-}));
-
-jest.mock('lib/hooks/api/topics', () => ({
-  ...jest.requireActual('lib/hooks/api/topics'),
-  useDeleteTopic: jest.fn(),
-  useRecreateTopic: jest.fn(),
-}));
-
-const deleteTopicMock = jest.fn();
-const recreateTopicMock = jest.fn();
-
-describe('ActionCell Components', () => {
-  beforeEach(() => {
-    (useDeleteTopic as jest.Mock).mockImplementation(() => ({
-      mutateAsync: deleteTopicMock,
-    }));
-    (useRecreateTopic as jest.Mock).mockImplementation(() => ({
-      mutateAsync: recreateTopicMock,
-    }));
-  });
-
-  const mockTableState: TableState<Topic, string> = {
-    data: topicsPayload,
-    selectedIds: new Set([]),
-    idSelector: jest.fn(),
-    isRowSelectable: jest.fn(),
-    selectedCount: 0,
-    setRowsSelection: jest.fn(),
-    toggleSelection: jest.fn(),
-  };
-
-  const renderComponent = (
-    currentData: Topic,
-    isReadOnly = false,
-    hovered = true,
-    isTopicDeletionAllowed = true
-  ) => {
-    return render(
-      <ClusterContext.Provider
-        value={{
-          isReadOnly,
-          hasKafkaConnectConfigured: true,
-          hasSchemaRegistryConfigured: true,
-          isTopicDeletionAllowed,
-        }}
-      >
-        <ActionsCell
-          rowIndex={1}
-          dataItem={currentData}
-          tableState={mockTableState}
-          hovered={hovered}
-        />
-      </ClusterContext.Provider>
-    );
-  };
-
-  const expectCellIsEmpty = () => {
-    expect(
-      screen.queryByRole('button', { name: 'Dropdown Toggle' })
-    ).not.toBeInTheDocument();
-  };
-
-  const expectDropdownExists = () => {
-    const btn = screen.getByRole('button', { name: 'Dropdown Toggle' });
-    expect(btn).toBeInTheDocument();
-    userEvent.click(btn);
-    expect(screen.getByRole('menu')).toBeInTheDocument();
-  };
-
-  describe('is empty', () => {
-    it('for internal topic', () => {
-      renderComponent(topicsPayload[0]);
-      expectCellIsEmpty();
-    });
-    it('for readonly cluster', () => {
-      renderComponent(topicsPayload[1], true);
-      expectCellIsEmpty();
-    });
-    it('for non-hovered row', () => {
-      renderComponent(topicsPayload[1], false, false);
-      expectCellIsEmpty();
-    });
-  });
-
-  describe('is not empty', () => {
-    it('for external topic', async () => {
-      renderComponent(topicsPayload[1]);
-      expectDropdownExists();
-    });
-    describe('and clear messages action', () => {
-      it('is visible for topic with CleanUpPolicy.DELETE', async () => {
-        renderComponent({
-          ...topicsPayload[1],
-          cleanUpPolicy: CleanUpPolicy.DELETE,
-        });
-        expectDropdownExists();
-        expect(screen.getByText('Clear Messages')).toBeInTheDocument();
-      });
-      it('is hidden for topic without CleanUpPolicy.DELETE', async () => {
-        renderComponent({
-          ...topicsPayload[1],
-          cleanUpPolicy: CleanUpPolicy.COMPACT,
-        });
-        expectDropdownExists();
-        expect(screen.queryByText('Clear Messages')).not.toBeInTheDocument();
-      });
-      it('works as expected', async () => {
-        renderComponent({
-          ...topicsPayload[1],
-          cleanUpPolicy: CleanUpPolicy.DELETE,
-        });
-        expectDropdownExists();
-        userEvent.click(screen.getByText('Clear Messages'));
-        expect(
-          screen.getByText('Are you sure want to clear topic messages?')
-        ).toBeInTheDocument();
-        await act(() =>
-          userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
-        );
-        expect(mockUnwrap).toHaveBeenCalled();
-      });
-    });
-
-    describe('and remove topic action', () => {
-      it('is visible only when topic deletion allowed for cluster', async () => {
-        renderComponent(topicsPayload[1]);
-        expectDropdownExists();
-        expect(screen.getByText('Remove Topic')).toBeInTheDocument();
-      });
-      it('is hidden when topic deletion is not allowed for cluster', async () => {
-        renderComponent(topicsPayload[1], false, true, false);
-        expectDropdownExists();
-        expect(screen.queryByText('Remove Topic')).not.toBeInTheDocument();
-      });
-      it('works as expected', async () => {
-        renderComponent(topicsPayload[1]);
-        expectDropdownExists();
-        userEvent.click(screen.getByText('Remove Topic'));
-        expect(screen.getByText('Confirm the action')).toBeInTheDocument();
-        expect(screen.getByText('external.topic')).toBeInTheDocument();
-        await waitFor(() =>
-          userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
-        );
-        await waitFor(() => expect(deleteTopicMock).toHaveBeenCalled());
-      });
-    });
-
-    describe('and recreate topic action', () => {
-      it('works as expected', async () => {
-        renderComponent(topicsPayload[1]);
-        expectDropdownExists();
-        userEvent.click(screen.getByText('Recreate Topic'));
-        expect(screen.getByText('Confirm the action')).toBeInTheDocument();
-        expect(screen.getByText('external.topic')).toBeInTheDocument();
-        await waitFor(() =>
-          userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
-        );
-        await waitFor(() => expect(recreateTopicMock).toHaveBeenCalled());
-      });
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
index 301001d3821..5c5c3da778a 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
@@ -8,9 +8,7 @@ import ListPage from 'components/Topics/List/ListPage';
 
 const clusterName = 'test-cluster';
 
-jest.mock('components/Topics/List/TopicsTable', () => () => (
-  <>TopicsTableMock</>
-));
+jest.mock('components/Topics/List/TopicTable', () => () => <>TopicTableMock</>);
 
 describe('ListPage Component', () => {
   const renderComponent = () => {
@@ -47,6 +45,6 @@ describe('ListPage Component', () => {
   });
 
   it('renders the TopicsTable', () => {
-    expect(screen.getByText('TopicsTableMock')).toBeInTheDocument();
+    expect(screen.getByText('TopicTableMock')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
new file mode 100644
index 00000000000..6031428895d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
@@ -0,0 +1,324 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import { act, screen, waitFor, within } from '@testing-library/react';
+import { CleanUpPolicy, TopicsResponse } from 'generated-sources';
+import { externalTopicPayload, topicsPayload } from 'lib/fixtures/topics';
+import ClusterContext from 'components/contexts/ClusterContext';
+import userEvent from '@testing-library/user-event';
+import {
+  useDeleteTopic,
+  useRecreateTopic,
+  useTopics,
+} from 'lib/hooks/api/topics';
+import TopicTable from 'components/Topics/List/TopicTable';
+import { clusterTopicsPath } from 'lib/paths';
+
+const clusterName = 'test-cluster';
+const mockUnwrap = jest.fn();
+const useDispatchMock = () => jest.fn(() => ({ unwrap: mockUnwrap }));
+
+const getButtonByName = (name: string) => screen.getByRole('button', { name });
+
+jest.mock('lib/hooks/redux', () => ({
+  ...jest.requireActual('lib/hooks/redux'),
+  useAppDispatch: useDispatchMock,
+}));
+
+jest.mock('lib/hooks/api/topics', () => ({
+  ...jest.requireActual('lib/hooks/api/topics'),
+  useDeleteTopic: jest.fn(),
+  useRecreateTopic: jest.fn(),
+  useTopics: jest.fn(),
+}));
+
+const deleteTopicMock = jest.fn();
+const recreateTopicMock = jest.fn();
+
+describe('TopicTable Components', () => {
+  beforeEach(() => {
+    (useDeleteTopic as jest.Mock).mockImplementation(() => ({
+      mutateAsync: deleteTopicMock,
+    }));
+    (useRecreateTopic as jest.Mock).mockImplementation(() => ({
+      mutateAsync: recreateTopicMock,
+    }));
+  });
+
+  const renderComponent = (
+    currentData: TopicsResponse | undefined = undefined,
+    isReadOnly = false,
+    isTopicDeletionAllowed = true
+  ) => {
+    (useTopics as jest.Mock).mockImplementation(() => ({
+      data: currentData,
+    }));
+
+    return render(
+      <ClusterContext.Provider
+        value={{
+          isReadOnly,
+          hasKafkaConnectConfigured: true,
+          hasSchemaRegistryConfigured: true,
+          isTopicDeletionAllowed,
+        }}
+      >
+        <WithRoute path={clusterTopicsPath()}>
+          <TopicTable />
+        </WithRoute>
+      </ClusterContext.Provider>,
+      { initialEntries: [clusterTopicsPath(clusterName)] }
+    );
+  };
+
+  describe('without data', () => {
+    it('renders empty table when payload is undefined', () => {
+      renderComponent();
+      expect(
+        screen.getByRole('row', { name: 'No topics found' })
+      ).toBeInTheDocument();
+    });
+
+    it('renders empty table when payload is empty', () => {
+      renderComponent({ topics: [] });
+      expect(
+        screen.getByRole('row', { name: 'No topics found' })
+      ).toBeInTheDocument();
+    });
+  });
+  describe('with topics', () => {
+    it('renders correct rows', () => {
+      renderComponent({ topics: topicsPayload, pageCount: 1 });
+      expect(
+        screen.getByRole('link', { name: '__internal.topic' })
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole('row', { name: '__internal.topic 1 0 1 0 0Bytes' })
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole('link', { name: 'external.topic' })
+      ).toBeInTheDocument();
+      expect(
+        screen.getByRole('row', { name: 'external.topic 1 0 1 0 1KB' })
+      ).toBeInTheDocument();
+
+      expect(screen.getAllByRole('checkbox').length).toEqual(3);
+    });
+    describe('Selectable rows', () => {
+      it('renders selectable rows', () => {
+        renderComponent({ topics: topicsPayload, pageCount: 1 });
+        expect(screen.getAllByRole('checkbox').length).toEqual(3);
+        // Disable checkbox for internal topic
+        expect(screen.getAllByRole('checkbox')[1]).toBeDisabled();
+        // Disable checkbox for external topic
+        expect(screen.getAllByRole('checkbox')[2]).toBeEnabled();
+      });
+      it('does not render selectable rows for read-only cluster', () => {
+        renderComponent({ topics: topicsPayload, pageCount: 1 }, true);
+        expect(screen.queryByRole('checkbox')).not.toBeInTheDocument();
+      });
+      describe('Batch actions bar', () => {
+        beforeEach(() => {
+          const payload = {
+            topics: [
+              externalTopicPayload,
+              { ...externalTopicPayload, name: 'test-topic' },
+            ],
+            totalPages: 1,
+          };
+          renderComponent(payload);
+          expect(screen.getAllByRole('checkbox').length).toEqual(3);
+          expect(screen.getAllByRole('checkbox')[1]).toBeEnabled();
+          expect(screen.getAllByRole('checkbox')[2]).toBeEnabled();
+        });
+        describe('when only one topic is selected', () => {
+          beforeEach(() => {
+            userEvent.click(screen.getAllByRole('checkbox')[1]);
+          });
+          it('renders batch actions bar', () => {
+            expect(getButtonByName('Delete selected topics')).toBeEnabled();
+            expect(getButtonByName('Copy selected topic')).toBeEnabled();
+            expect(
+              getButtonByName('Purge messages of selected topics')
+            ).toBeEnabled();
+          });
+        });
+        describe('when more then one topics are selected', () => {
+          beforeEach(() => {
+            userEvent.click(screen.getAllByRole('checkbox')[1]);
+            userEvent.click(screen.getAllByRole('checkbox')[2]);
+          });
+          it('renders batch actions bar', () => {
+            expect(getButtonByName('Delete selected topics')).toBeEnabled();
+            expect(getButtonByName('Copy selected topic')).toBeDisabled();
+            expect(
+              getButtonByName('Purge messages of selected topics')
+            ).toBeEnabled();
+          });
+          it('handels delete button click', async () => {
+            const button = getButtonByName('Delete selected topics');
+            await act(() => userEvent.click(button));
+            expect(
+              screen.getByText(
+                'Are you sure you want to remove selected topics?'
+              )
+            ).toBeInTheDocument();
+            const confirmBtn = getButtonByName('Confirm');
+            expect(confirmBtn).toBeInTheDocument();
+            expect(deleteTopicMock).not.toHaveBeenCalled();
+            await act(() => userEvent.click(confirmBtn));
+            expect(deleteTopicMock).toHaveBeenCalledTimes(2);
+            expect(screen.getAllByRole('checkbox')[1]).not.toBeChecked();
+            expect(screen.getAllByRole('checkbox')[2]).not.toBeChecked();
+          });
+          it('handels purge messages button click', async () => {
+            const button = getButtonByName('Purge messages of selected topics');
+            await act(() => userEvent.click(button));
+            expect(
+              screen.getByText(
+                'Are you sure you want to purge messages of selected topics?'
+              )
+            ).toBeInTheDocument();
+            const confirmBtn = getButtonByName('Confirm');
+            expect(confirmBtn).toBeInTheDocument();
+            expect(mockUnwrap).not.toHaveBeenCalled();
+            await act(() => userEvent.click(confirmBtn));
+            expect(mockUnwrap).toHaveBeenCalledTimes(2);
+            expect(screen.getAllByRole('checkbox')[1]).not.toBeChecked();
+            expect(screen.getAllByRole('checkbox')[2]).not.toBeChecked();
+          });
+        });
+      });
+    });
+    describe('Action buttons', () => {
+      const expectDropdownExists = () => {
+        const btn = screen.getByRole('button', {
+          name: 'Dropdown Toggle',
+        });
+        expect(btn).toBeEnabled();
+        userEvent.click(btn);
+        expect(screen.getByRole('menu')).toBeInTheDocument();
+      };
+      it('renders disable action buttons for read-only cluster', () => {
+        renderComponent({ topics: topicsPayload, pageCount: 1 }, true);
+        const btns = screen.getAllByRole('button', { name: 'Dropdown Toggle' });
+        expect(btns[0]).toBeDisabled();
+        expect(btns[1]).toBeDisabled();
+      });
+      it('renders action buttons', () => {
+        renderComponent({ topics: topicsPayload, pageCount: 1 });
+        expect(
+          screen.getAllByRole('button', { name: 'Dropdown Toggle' }).length
+        ).toEqual(2);
+        // Internal topic action buttons are disabled
+        const internalTopicRow = screen.getByRole('row', {
+          name: '__internal.topic 1 0 1 0 0Bytes',
+        });
+        expect(internalTopicRow).toBeInTheDocument();
+        expect(
+          within(internalTopicRow).getByRole('button', {
+            name: 'Dropdown Toggle',
+          })
+        ).toBeDisabled();
+        // External topic action buttons are enabled
+        const externalTopicRow = screen.getByRole('row', {
+          name: 'external.topic 1 0 1 0 1KB',
+        });
+        expect(externalTopicRow).toBeInTheDocument();
+        const extBtn = within(externalTopicRow).getByRole('button', {
+          name: 'Dropdown Toggle',
+        });
+        expect(extBtn).toBeEnabled();
+        userEvent.click(extBtn);
+        expect(screen.getByRole('menu')).toBeInTheDocument();
+      });
+      describe('and clear messages action', () => {
+        it('is visible for topic with CleanUpPolicy.DELETE', async () => {
+          renderComponent({
+            topics: [
+              {
+                ...topicsPayload[1],
+                cleanUpPolicy: CleanUpPolicy.DELETE,
+              },
+            ],
+          });
+          expectDropdownExists();
+          const actionBtn = screen.getAllByRole('menuitem');
+          expect(actionBtn[0]).toHaveTextContent('Clear Messages');
+          expect(actionBtn[0]).not.toHaveAttribute('aria-disabled');
+        });
+        it('is disabled for topic without CleanUpPolicy.DELETE', async () => {
+          renderComponent({
+            topics: [
+              {
+                ...topicsPayload[1],
+                cleanUpPolicy: CleanUpPolicy.COMPACT,
+              },
+            ],
+          });
+          expectDropdownExists();
+          const actionBtn = screen.getAllByRole('menuitem');
+          expect(actionBtn[0]).toHaveTextContent('Clear Messages');
+          expect(actionBtn[0]).toHaveAttribute('aria-disabled');
+        });
+        it('works as expected', async () => {
+          renderComponent({
+            topics: [
+              {
+                ...topicsPayload[1],
+                cleanUpPolicy: CleanUpPolicy.DELETE,
+              },
+            ],
+          });
+          expectDropdownExists();
+          userEvent.click(screen.getByText('Clear Messages'));
+          expect(
+            screen.getByText('Are you sure want to clear topic messages?')
+          ).toBeInTheDocument();
+          await act(() =>
+            userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+          );
+          expect(mockUnwrap).toHaveBeenCalled();
+        });
+      });
+
+      describe('and remove topic action', () => {
+        it('is visible only when topic deletion allowed for cluster', async () => {
+          renderComponent({ topics: [topicsPayload[1]] });
+          expectDropdownExists();
+          const actionBtn = screen.getAllByRole('menuitem');
+          expect(actionBtn[2]).toHaveTextContent('Remove Topic');
+          expect(actionBtn[2]).not.toHaveAttribute('aria-disabled');
+        });
+        it('is disabled when topic deletion is not allowed for cluster', async () => {
+          renderComponent({ topics: [topicsPayload[1]] }, false, false);
+          expectDropdownExists();
+          const actionBtn = screen.getAllByRole('menuitem');
+          expect(actionBtn[2]).toHaveTextContent('Remove Topic');
+          expect(actionBtn[2]).toHaveAttribute('aria-disabled');
+        });
+        it('works as expected', async () => {
+          renderComponent({ topics: [topicsPayload[1]] });
+          expectDropdownExists();
+          userEvent.click(screen.getByText('Remove Topic'));
+          expect(screen.getByText('Confirm the action')).toBeInTheDocument();
+          await waitFor(() =>
+            userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+          );
+          await waitFor(() => expect(deleteTopicMock).toHaveBeenCalled());
+        });
+      });
+      describe('and recreate topic action', () => {
+        it('works as expected', async () => {
+          renderComponent({ topics: [topicsPayload[1]] });
+          expectDropdownExists();
+          userEvent.click(screen.getByText('Recreate Topic'));
+          expect(screen.getByText('Confirm the action')).toBeInTheDocument();
+          await waitFor(() =>
+            userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+          );
+          await waitFor(() => expect(recreateTopicMock).toHaveBeenCalled());
+        });
+      });
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTable.spec.tsx
deleted file mode 100644
index 6116cc98190..00000000000
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTable.spec.tsx
+++ /dev/null
@@ -1,168 +0,0 @@
-import React from 'react';
-import { render, WithRoute } from 'lib/testHelpers';
-import { act, screen, within } from '@testing-library/react';
-import { externalTopicPayload } from 'lib/fixtures/topics';
-import ClusterContext from 'components/contexts/ClusterContext';
-import userEvent from '@testing-library/user-event';
-import { useDeleteTopic, useTopics } from 'lib/hooks/api/topics';
-import TopicsTable from 'components/Topics/List/TopicsTable';
-import { clusterTopicsPath } from 'lib/paths';
-
-const mockUnwrap = jest.fn();
-const useDispatchMock = () => jest.fn(() => ({ unwrap: mockUnwrap }));
-
-jest.mock('lib/hooks/redux', () => ({
-  ...jest.requireActual('lib/hooks/redux'),
-  useAppDispatch: useDispatchMock,
-}));
-
-jest.mock('lib/hooks/api/topics', () => ({
-  ...jest.requireActual('lib/hooks/api/topics'),
-  useDeleteTopic: jest.fn(),
-  useTopics: jest.fn(),
-}));
-
-const deleteTopicMock = jest.fn();
-const refetchMock = jest.fn();
-
-const clusterName = 'test-cluster';
-
-const getCheckboxInput = (at: number) => {
-  const rows = screen.getAllByRole('row');
-  return within(rows[at + 1]).getByRole('checkbox');
-};
-
-describe('TopicsTable Component', () => {
-  beforeEach(() => {
-    (useDeleteTopic as jest.Mock).mockImplementation(() => ({
-      mutateAsync: deleteTopicMock,
-    }));
-    (useTopics as jest.Mock).mockImplementation(() => ({
-      data: {
-        topics: [
-          externalTopicPayload,
-          { ...externalTopicPayload, name: 'test-topic' },
-        ],
-        totalPages: 1,
-      },
-      refetch: refetchMock,
-    }));
-  });
-
-  const renderComponent = () => {
-    return render(
-      <ClusterContext.Provider
-        value={{
-          isReadOnly: false,
-          hasKafkaConnectConfigured: true,
-          hasSchemaRegistryConfigured: true,
-          isTopicDeletionAllowed: true,
-        }}
-      >
-        <WithRoute path={clusterTopicsPath()}>
-          <TopicsTable />
-        </WithRoute>
-      </ClusterContext.Provider>,
-      { initialEntries: [clusterTopicsPath(clusterName)] }
-    );
-  };
-
-  beforeEach(() => {
-    renderComponent();
-  });
-
-  const getButtonByName = (name: string) =>
-    screen.getByRole('button', { name });
-
-  const queryButtonByName = (name: string) =>
-    screen.queryByRole('button', { name });
-
-  it('renders the table', () => {
-    expect(screen.getByRole('table')).toBeInTheDocument();
-  });
-
-  it('renders batch actions bar', () => {
-    expect(screen.getByRole('table')).toBeInTheDocument();
-
-    // check batch actions bar is hidden
-    const firstCheckbox = getCheckboxInput(0);
-    expect(firstCheckbox).not.toBeChecked();
-    expect(queryButtonByName('Delete selected topics')).not.toBeInTheDocument();
-
-    // select firsr row
-    userEvent.click(firstCheckbox);
-    expect(firstCheckbox).toBeChecked();
-
-    // check batch actions bar is shown
-    expect(getButtonByName('Delete selected topics')).toBeInTheDocument();
-    expect(getButtonByName('Copy selected topic')).toBeInTheDocument();
-    expect(
-      getButtonByName('Purge messages of selected topics')
-    ).toBeInTheDocument();
-
-    // select second row
-    const secondCheckbox = getCheckboxInput(1);
-    expect(secondCheckbox).not.toBeChecked();
-    userEvent.click(secondCheckbox);
-    expect(secondCheckbox).toBeChecked();
-
-    // check batch actions bar is still shown
-    expect(getButtonByName('Delete selected topics')).toBeInTheDocument();
-    expect(
-      getButtonByName('Purge messages of selected topics')
-    ).toBeInTheDocument();
-
-    // check Copy button is hidden
-    expect(queryButtonByName('Copy selected topic')).not.toBeInTheDocument();
-  });
-
-  describe('', () => {
-    beforeEach(() => {
-      userEvent.click(getCheckboxInput(0));
-      userEvent.click(getCheckboxInput(1));
-    });
-
-    it('handels delete button click', async () => {
-      const button = getButtonByName('Delete selected topics');
-      expect(button).toBeInTheDocument();
-
-      await act(() => userEvent.click(button));
-
-      expect(
-        screen.getByText('Are you sure you want to remove selected topics?')
-      ).toBeInTheDocument();
-
-      const confirmBtn = getButtonByName('Confirm');
-      expect(confirmBtn).toBeInTheDocument();
-      expect(deleteTopicMock).not.toHaveBeenCalled();
-      await act(() => userEvent.click(confirmBtn));
-
-      expect(deleteTopicMock).toHaveBeenCalledTimes(2);
-
-      expect(getCheckboxInput(0)).not.toBeChecked();
-      expect(getCheckboxInput(1)).not.toBeChecked();
-    });
-
-    it('handels purge messages button click', async () => {
-      const button = getButtonByName('Purge messages of selected topics');
-      expect(button).toBeInTheDocument();
-
-      await act(() => userEvent.click(button));
-
-      expect(
-        screen.getByText(
-          'Are you sure you want to purge messages of selected topics?'
-        )
-      ).toBeInTheDocument();
-
-      const confirmBtn = getButtonByName('Confirm');
-      expect(confirmBtn).toBeInTheDocument();
-      expect(mockUnwrap).not.toHaveBeenCalled();
-      await act(() => userEvent.click(confirmBtn));
-      expect(mockUnwrap).toHaveBeenCalledTimes(2);
-
-      expect(getCheckboxInput(0)).not.toBeChecked();
-      expect(getCheckboxInput(1)).not.toBeChecked();
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx
deleted file mode 100644
index 008159acd5b..00000000000
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicsTableCells.spec.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import React from 'react';
-import { render } from 'lib/testHelpers';
-import {
-  MessagesCell,
-  OutOfSyncReplicasCell,
-  TitleCell,
-  TopicSizeCell,
-} from 'components/Topics/List/TopicsTableCells';
-import { TableState } from 'lib/hooks/useTableState';
-import { screen } from '@testing-library/react';
-import { Topic } from 'generated-sources';
-import { topicsPayload } from 'lib/fixtures/topics';
-
-describe('TopicsTableCells Components', () => {
-  const mockTableState: TableState<Topic, string> = {
-    data: topicsPayload,
-    selectedIds: new Set([]),
-    idSelector: jest.fn(),
-    isRowSelectable: jest.fn(),
-    selectedCount: 0,
-    setRowsSelection: jest.fn(),
-    toggleSelection: jest.fn(),
-  };
-
-  describe('TitleCell Component', () => {
-    it('should check the TitleCell component Render without the internal option', () => {
-      const currentData = topicsPayload[1];
-      render(
-        <TitleCell
-          rowIndex={1}
-          dataItem={currentData}
-          tableState={mockTableState}
-        />
-      );
-      expect(screen.queryByText('IN')).not.toBeInTheDocument();
-      expect(screen.getByText(currentData.name)).toBeInTheDocument();
-    });
-
-    it('should check the TitleCell component Render without the internal option', () => {
-      const currentData = topicsPayload[0];
-      render(
-        <TitleCell
-          rowIndex={1}
-          dataItem={currentData}
-          tableState={mockTableState}
-        />
-      );
-      expect(screen.getByText('IN')).toBeInTheDocument();
-      expect(screen.getByText(currentData.name)).toBeInTheDocument();
-    });
-  });
-
-  describe('TopicSizeCell Component', () => {
-    const currentData = topicsPayload[1];
-    it('should check the TopicSizeCell component Render', () => {
-      render(
-        <TopicSizeCell
-          rowIndex={1}
-          dataItem={currentData}
-          tableState={mockTableState}
-        />
-      );
-      expect(screen.getByText('1KB')).toBeInTheDocument();
-    });
-  });
-
-  describe('OutOfSyncReplicasCell Component', () => {
-    it('returns 0 if no partition is empty array', () => {
-      const currentData = topicsPayload[0];
-      currentData.partitions = [];
-      render(
-        <OutOfSyncReplicasCell
-          rowIndex={1}
-          dataItem={currentData}
-          tableState={mockTableState}
-        />
-      );
-      expect(screen.getByText('0')).toBeInTheDocument();
-    });
-
-    it('returns 0 if no partition is found', () => {
-      const currentData = topicsPayload[1];
-      currentData.partitions = undefined;
-      render(
-        <OutOfSyncReplicasCell
-          rowIndex={1}
-          dataItem={currentData}
-          tableState={mockTableState}
-        />
-      );
-      expect(screen.getByText('0')).toBeInTheDocument();
-    });
-
-    it('returns number of out of sync partitions', () => {
-      const currentData = {
-        ...topicsPayload[1],
-        partitions: [
-          {
-            partition: 0,
-            leader: 1,
-            replicas: [{ broker: 1, leader: false, inSync: false }],
-            offsetMax: 0,
-            offsetMin: 0,
-          },
-        ],
-      };
-      render(
-        <OutOfSyncReplicasCell
-          rowIndex={1}
-          dataItem={currentData}
-          tableState={mockTableState}
-        />
-      );
-      expect(screen.getByText('1')).toBeInTheDocument();
-    });
-
-    it('should check the content of the OutOfSyncReplicasCell with the correct partition number', () => {
-      const currentData = topicsPayload[0];
-      const partitionNumber = currentData.partitions?.reduce(
-        (memo, { replicas }) => {
-          const outOfSync = replicas?.filter(({ inSync }) => !inSync);
-          return memo + (outOfSync?.length || 0);
-        },
-        0
-      );
-
-      render(
-        <OutOfSyncReplicasCell
-          rowIndex={1}
-          dataItem={currentData}
-          tableState={mockTableState}
-        />
-      );
-      expect(
-        screen.getByText(partitionNumber ? partitionNumber.toString() : '0')
-      ).toBeInTheDocument();
-    });
-  });
-
-  describe('MessagesCell Component', () => {
-    it('returns 0 if partition is empty array ', () => {
-      render(
-        <MessagesCell
-          rowIndex={1}
-          dataItem={{ ...topicsPayload[0], partitions: [] }}
-          tableState={mockTableState}
-        />
-      );
-      expect(screen.getByText('0')).toBeInTheDocument();
-    });
-
-    it('returns 0 if no partition is found', () => {
-      render(
-        <MessagesCell
-          rowIndex={1}
-          dataItem={{ ...topicsPayload[0], partitions: undefined }}
-          tableState={mockTableState}
-        />
-      );
-      expect(screen.getByText('0')).toBeInTheDocument();
-    });
-
-    it('returns the correct messages number', () => {
-      const offsetMax = 10034;
-      const offsetMin = 345;
-      const currentData = {
-        ...topicsPayload[0],
-        partitions: [
-          {
-            partition: 0,
-            leader: 1,
-            replicas: [{ broker: 1, leader: false, inSync: false }],
-            offsetMax,
-            offsetMin,
-          },
-        ],
-      };
-      render(
-        <MessagesCell
-          rowIndex={1}
-          dataItem={currentData}
-          tableState={mockTableState}
-        />
-      );
-      expect(offsetMax - offsetMin).toEqual(9689);
-      expect(screen.getByText(offsetMax - offsetMin)).toBeInTheDocument();
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
index d69c0057743..2bd1c4a78a6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
@@ -90,68 +90,66 @@ const Overview: React.FC = () => {
           </Metrics.Indicator>
         </Metrics.Section>
       </Metrics.Wrapper>
-      <div>
-        <Table isFullwidth>
-          <thead>
+      <Table isFullwidth>
+        <thead>
+          <tr>
+            <TableHeaderCell title="Partition ID" />
+            <TableHeaderCell title="Replicas" />
+            <TableHeaderCell title="First Offset" />
+            <TableHeaderCell title="Next Offset" />
+            <TableHeaderCell title="Message Count" />
+            <TableHeaderCell title=" " />
+          </tr>
+        </thead>
+        <tbody>
+          {data?.partitions?.map((partition: Partition) => (
+            <tr key={`partition-list-item-key-${partition.partition}`}>
+              <td>{partition.partition}</td>
+              <td>
+                {partition.replicas?.map(({ broker, leader }: Replica) => (
+                  <S.Replica
+                    leader={leader}
+                    key={broker}
+                    title={leader ? 'Leader' : ''}
+                  >
+                    {broker}
+                  </S.Replica>
+                ))}
+              </td>
+              <td>{partition.offsetMin}</td>
+              <td>{partition.offsetMax}</td>
+              <td>{partition.offsetMax - partition.offsetMin}</td>
+              <td style={{ width: '5%' }}>
+                {!data?.internal &&
+                !isReadOnly &&
+                data?.cleanUpPolicy === 'DELETE' ? (
+                  <Dropdown>
+                    <DropdownItem
+                      onClick={() =>
+                        dispatch(
+                          clearTopicMessages({
+                            clusterName,
+                            topicName,
+                            partitions: [partition.partition],
+                          })
+                        ).unwrap()
+                      }
+                      danger
+                    >
+                      Clear Messages
+                    </DropdownItem>
+                  </Dropdown>
+                ) : null}
+              </td>
+            </tr>
+          ))}
+          {data?.partitions?.length === 0 && (
             <tr>
-              <TableHeaderCell title="Partition ID" />
-              <TableHeaderCell title="Replicas" />
-              <TableHeaderCell title="First Offset" />
-              <TableHeaderCell title="Next Offset" />
-              <TableHeaderCell title="Message Count" />
-              <TableHeaderCell title=" " />
+              <td colSpan={10}>No Partitions found</td>
             </tr>
-          </thead>
-          <tbody>
-            {data?.partitions?.map((partition: Partition) => (
-              <tr key={`partition-list-item-key-${partition.partition}`}>
-                <td>{partition.partition}</td>
-                <td>
-                  {partition.replicas?.map(({ broker, leader }: Replica) => (
-                    <S.Replica
-                      leader={leader}
-                      key={broker}
-                      title={leader ? 'Leader' : ''}
-                    >
-                      {broker}
-                    </S.Replica>
-                  ))}
-                </td>
-                <td>{partition.offsetMin}</td>
-                <td>{partition.offsetMax}</td>
-                <td>{partition.offsetMax - partition.offsetMin}</td>
-                <td style={{ width: '5%' }}>
-                  {!data?.internal &&
-                  !isReadOnly &&
-                  data?.cleanUpPolicy === 'DELETE' ? (
-                    <Dropdown>
-                      <DropdownItem
-                        onClick={() =>
-                          dispatch(
-                            clearTopicMessages({
-                              clusterName,
-                              topicName,
-                              partitions: [partition.partition],
-                            })
-                          ).unwrap()
-                        }
-                        danger
-                      >
-                        Clear Messages
-                      </DropdownItem>
-                    </Dropdown>
-                  ) : null}
-                </td>
-              </tr>
-            ))}
-            {data?.partitions?.length === 0 && (
-              <tr>
-                <td colSpan={10}>No Partitions found</td>
-              </tr>
-            )}
-          </tbody>
-        </Table>
-      </div>
+          )}
+        </tbody>
+      </Table>
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx
index 9db1e5a35bd..b019f0bc422 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/no-unstable-nested-components */
 import React from 'react';
 import { TopicAnalysisStats } from 'generated-sources';
 import { ColumnDef } from '@tanstack/react-table';
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
index ee3aa494baa..cb22cdb37b2 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
@@ -51,6 +51,7 @@ export const Dropdown = styled(ControlledMenu)(
 
     ${menuItemSelector.disabled} {
       cursor: not-allowed;
+      opacity: 0.5;
     }
   `
 );
@@ -61,6 +62,12 @@ export const DropdownButton = styled.button`
   display: flex;
   cursor: pointer;
   align-self: center;
+  float: right;
+
+  &:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
 `;
 
 export const DangerItem = styled.div`
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
index 0a7da0e956c..4d82d7b015e 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
@@ -7,9 +7,10 @@ import * as S from './Dropdown.styled';
 
 interface DropdownProps extends PropsWithChildren<Partial<MenuProps>> {
   label?: React.ReactNode;
+  disabled?: boolean;
 }
 
-const Dropdown: React.FC<DropdownProps> = ({ label, children }) => {
+const Dropdown: React.FC<DropdownProps> = ({ label, disabled, children }) => {
   const ref = useRef(null);
   const { isOpen, setClose, setOpen } = useModal(false);
 
@@ -25,6 +26,7 @@ const Dropdown: React.FC<DropdownProps> = ({ label, children }) => {
         onClick={handleClick}
         ref={ref}
         aria-label="Dropdown Toggle"
+        disabled={disabled}
       >
         {label || <VerticalElipsisIcon />}
       </S.DropdownButton>
diff --git a/kafka-ui-react-app/src/components/common/IndeterminateCheckbox/IndeterminateCheckbox.tsx b/kafka-ui-react-app/src/components/common/IndeterminateCheckbox/IndeterminateCheckbox.tsx
new file mode 100644
index 00000000000..58afff859c8
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/IndeterminateCheckbox/IndeterminateCheckbox.tsx
@@ -0,0 +1,24 @@
+import React, { HTMLProps } from 'react';
+import styled from 'styled-components';
+
+interface IndeterminateCheckboxProps extends HTMLProps<HTMLInputElement> {
+  indeterminate?: boolean;
+}
+
+const IndeterminateCheckbox: React.FC<IndeterminateCheckboxProps> = ({
+  indeterminate,
+  ...rest
+}) => {
+  const ref = React.useRef<HTMLInputElement>(null);
+  React.useEffect(() => {
+    if (typeof indeterminate === 'boolean' && ref.current) {
+      ref.current.indeterminate = !rest.checked && indeterminate;
+    }
+  }, [ref, indeterminate]);
+
+  return <input type="checkbox" ref={ref} {...rest} />;
+};
+
+export default styled(IndeterminateCheckbox)`
+  cursor: pointer;
+`;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/SelectRowCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/SelectRowCell.tsx
new file mode 100644
index 00000000000..3f12583f014
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/SelectRowCell.tsx
@@ -0,0 +1,15 @@
+import { CellContext } from '@tanstack/react-table';
+import React from 'react';
+import IndeterminateCheckbox from 'components/common/IndeterminateCheckbox/IndeterminateCheckbox';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const SelectRowCell: React.FC<CellContext<any, unknown>> = ({ row }) => (
+  <IndeterminateCheckbox
+    checked={row.getIsSelected()}
+    disabled={!row.getCanSelect()}
+    indeterminate={row.getIsSomeSelected()}
+    onChange={row.getToggleSelectedHandler()}
+  />
+);
+
+export default SelectRowCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx b/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx
new file mode 100644
index 00000000000..48d78bf81b4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx
@@ -0,0 +1,14 @@
+import { HeaderContext } from '@tanstack/react-table';
+import React from 'react';
+import IndeterminateCheckbox from 'components/common/IndeterminateCheckbox/IndeterminateCheckbox';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const SelectRowHeader: React.FC<HeaderContext<any, unknown>> = ({ table }) => (
+  <IndeterminateCheckbox
+    checked={table.getIsAllPageRowsSelected()}
+    indeterminate={table.getIsSomePageRowsSelected()}
+    onChange={table.getToggleAllPageRowsSelectedHandler()}
+  />
+);
+
+export default SelectRowHeader;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
new file mode 100644
index 00000000000..53b3577998a
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import { CellContext } from '@tanstack/react-table';
+import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const SizeCell: React.FC<CellContext<any, any>> = ({ getValue }) => (
+  <BytesFormatted value={getValue()} />
+);
+
+export default SizeCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
index f80d62ce5fb..83f4fdda5ce 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
@@ -19,7 +19,7 @@ interface ThProps {
 
 const sortableMixin = (normalColor: string, hoverColor: string) => `
   cursor: pointer;
-  padding-right: 18px;
+  padding-left: 14px;
   position: relative;
 
   &::before,
@@ -28,7 +28,7 @@ const sortableMixin = (normalColor: string, hoverColor: string) => `
     content: '';
     display: block;
     height: 0;
-    right: 5px;
+    left: 0px;
     top: 50%;
     position: absolute;
   }
@@ -51,13 +51,13 @@ const ASCMixin = (color: string) => `
     border-bottom-color: ${color};
   }
   &:after {
-    border-top-color: rgba(0, 0, 0, 0.2);
+    border-top-color: rgba(0, 0, 0, 0.1);
   }
 `;
 const DESCMixin = (color: string) => `
   color: ${color};
   &:before {
-    border-bottom-color: rgba(0, 0, 0, 0.2);
+    border-bottom-color: rgba(0, 0, 0, 0.1);
   }
   &:after {
     border-top-color: ${color};
@@ -65,8 +65,15 @@ const DESCMixin = (color: string) => `
 `;
 
 export const Th = styled.th<ThProps>(
-  ({ theme: { table }, sortable, sortOrder, expander }) => `
-  padding: 4px 0 4px 24px;
+  ({
+    theme: {
+      table: { th },
+    },
+    sortable,
+    sortOrder,
+    expander,
+  }) => `
+  padding: 8px 0 8px 24px;
   border-bottom-width: 1px;
   vertical-align: middle;
   text-align: left;
@@ -77,17 +84,16 @@ export const Th = styled.th<ThProps>(
   line-height: 16px;
   letter-spacing: 0em;
   text-align: left;
-  background: ${table.th.backgroundColor.normal};
+  background: ${th.backgroundColor.normal};
   width: ${expander ? '5px' : 'auto'};
+  white-space: nowrap;
 
   & > div {
     cursor: default;
-    color: ${table.th.color.normal};
-    ${
-      sortable ? sortableMixin(table.th.color.normal, table.th.color.hover) : ''
-    }
-    ${sortable && sortOrder === 'asc' && ASCMixin(table.th.color.active)}
-    ${sortable && sortOrder === 'desc' && DESCMixin(table.th.color.active)}
+    color: ${th.color.normal};
+    ${sortable ? sortableMixin(th.color.sortable, th.color.hover) : ''}
+    ${sortable && sortOrder === 'asc' && ASCMixin(th.color.active)}
+    ${sortable && sortOrder === 'desc' && DESCMixin(th.color.active)}
   }
 `
 );
@@ -118,6 +124,14 @@ export const Nowrap = styled.div`
   white-space: nowrap;
 `;
 
+export const TableActionsBar = styled.div`
+  padding: 8px;
+  background-color: ${({ theme }) => theme.table.actionBar.backgroundColor};
+  margin: 16px 0;
+  display: flex;
+  gap: 8px;
+`;
+
 export const Table = styled.table(
   ({ theme: { table } }) => `
   width: 100%;
@@ -129,18 +143,34 @@ export const Table = styled.table(
     padding: 8px 8px 8px 24px;
     color: ${table.td.color.normal};
     vertical-align: middle;
-    max-width: 350px;
     word-wrap: break-word;
 
-    & > a {
-      color: ${table.link.color};
+    & a {
+      color: ${table.link.color.normal};
       font-weight: 500;
+      max-width: 450px;
+      white-space: nowrap;
+      overflow: hidden;
       text-overflow: ellipsis;
+      display: block;
+
+      &:hover {
+        color: ${table.link.color.hover};
+      }
+
+      &:active {
+        color: ${table.link.color.active};
+      }
     }
   }
 `
 );
 
+export const EmptyTableMessageCell = styled.td`
+  padding: 16px;
+  text-align: center;
+`;
+
 export const Pagination = styled.div`
   display: flex;
   justify-content: space-between;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 244caeb03f1..80f5477fd1c 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -21,8 +21,10 @@ import * as S from './Table.styled';
 import updateSortingState from './utils/updateSortingState';
 import updatePaginationState from './utils/updatePaginationState';
 import ExpanderCell from './ExpanderCell';
+import SelectRowCell from './SelectRowCell';
+import SelectRowHeader from './SelectRowHeader';
 
-interface TableProps<TData> {
+export interface TableProps<TData> {
   data: TData[];
   pageCount?: number;
   columns: ColumnDef<TData>[];
@@ -30,10 +32,69 @@ interface TableProps<TData> {
   getRowCanExpand?: (row: Row<TData>) => boolean;
   serverSideProcessing?: boolean;
   enableSorting?: boolean;
+  enableRowSelection?: boolean | ((row: Row<TData>) => boolean);
+  batchActionsBar?: React.FC<{ rows: Row<TData>[]; resetRowSelection(): void }>;
+  emptyMessage?: string;
 }
 
 type UpdaterFn<T> = (previousState: T) => T;
 
+const getPaginationFromSearchParams = (searchParams: URLSearchParams) => {
+  const page = searchParams.get('page');
+  const perPage = searchParams.get('perPage');
+  const pageIndex = page ? Number(page) - 1 : 0;
+  return {
+    pageIndex,
+    pageSize: Number(perPage || PER_PAGE),
+  };
+};
+
+const getSortingFromSearchParams = (searchParams: URLSearchParams) => {
+  const sortBy = searchParams.get('sortBy');
+  const sortDirection = searchParams.get('sortDirection');
+  if (!sortBy) return [];
+  return [{ id: sortBy, desc: sortDirection === 'desc' }];
+};
+
+/**
+ * Table component that uses the react-table library to render a table.
+ * https://tanstack.com/table/v8
+ *
+ * The most important props are:
+ *  - `data`: the data to render in the table
+ *  - `columns`: ColumnsDef. You can finde more info about it on https://tanstack.com/table/v8/docs/guide/column-defs
+ *  - `emptyMessage`: the message to show when there is no data to render
+ *
+ * Usecases:
+ * 1. Sortable table
+ *    - set `enableSorting` property of component to true. It will enable sorting for all columns.
+ *      If you want to disable sorting for some particular columns you can pass
+ *     `enableSorting = false` to the column def.
+ *    - table component stores the sorting state in URLSearchParams. Use `sortBy` and `sortDirection`
+ *      search param to set default sortings.
+ *
+ * 2. Pagination
+ *    - pagination enabled by default.
+ *    - use `perPage` search param to manage default page size.
+ *    - use `page` search param to manage default page index.
+ *    - use `pageCount` prop to set the total number of pages only in case of server side processing.
+ *
+ * 3. Expandable rows
+ *    - use `getRowCanExpand` prop to set a function that returns true if the row can be expanded.
+ *    - use `renderSubComponent` prop to provide a sub component for each expanded row.
+ *
+ * 4. Row selection
+ *    - use `enableRowSelection` prop to enable row selection. This prop can be a boolean or
+ *      a function that returns true if the particular row can be selected.
+ *    - use `batchActionsBar` prop to provide a component that will be rendered at the top of the table
+ *      when row selection is enabled and there are selected rows.
+ *
+ * 5. Server side processing:
+ *    - set `serverSideProcessing` to true
+ *    - set `pageCount` to the total number of pages
+ *    - use URLSearchParams to get the pagination and sorting state from the url for your server side processing.
+ */
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const Table: React.FC<TableProps<any>> = ({
   data,
@@ -43,77 +104,45 @@ const Table: React.FC<TableProps<any>> = ({
   renderSubComponent,
   serverSideProcessing = false,
   enableSorting = false,
+  enableRowSelection = false,
+  batchActionsBar,
+  emptyMessage,
 }) => {
   const [searchParams, setSearchParams] = useSearchParams();
-  const [sorting, setSorting] = React.useState<SortingState>([]);
-  const [{ pageIndex, pageSize }, setPagination] =
-    React.useState<PaginationState>({
-      pageIndex: 0,
-      pageSize: PER_PAGE,
-    });
-
+  const [rowSelection, setRowSelection] = React.useState({});
   const onSortingChange = React.useCallback(
     (updater: UpdaterFn<SortingState>) => {
       const newState = updateSortingState(updater, searchParams);
       setSearchParams(searchParams);
-      setSorting(newState);
       return newState;
     },
     [searchParams]
   );
-
   const onPaginationChange = React.useCallback(
     (updater: UpdaterFn<PaginationState>) => {
       const newState = updatePaginationState(updater, searchParams);
       setSearchParams(searchParams);
-      setPagination(newState);
       return newState;
     },
     [searchParams]
   );
 
   React.useEffect(() => {
-    const sortBy = searchParams.get('sortBy');
-    const sortDirection = searchParams.get('sortDirection');
-    const page = searchParams.get('page');
-    const perPage = searchParams.get('perPage');
-
-    if (sortBy) {
-      setSorting([
-        {
-          id: sortBy,
-          desc: sortDirection === 'desc',
-        },
-      ]);
-    } else {
-      setSorting([]);
-    }
-    if (page || perPage) {
-      setPagination({
-        pageIndex: Number(page || 0),
-        pageSize: Number(perPage || PER_PAGE),
-      });
-    }
-  }, []);
-
-  const pagination = React.useMemo(
-    () => ({
-      pageIndex,
-      pageSize,
-    }),
-    [pageIndex, pageSize]
-  );
+    setRowSelection({});
+  }, [searchParams]);
 
   const table = useReactTable({
     data,
     pageCount,
     columns,
     state: {
-      sorting,
-      pagination,
+      sorting: getSortingFromSearchParams(searchParams),
+      pagination: getPaginationFromSearchParams(searchParams),
+      rowSelection,
     },
     onSortingChange: onSortingChange as OnChangeFn<SortingState>,
     onPaginationChange: onPaginationChange as OnChangeFn<PaginationState>,
+    onRowSelectionChange: setRowSelection,
     getRowCanExpand,
     getCoreRowModel: getCoreRowModel(),
     getExpandedRowModel: getExpandedRowModel(),
@@ -122,14 +151,34 @@ const Table: React.FC<TableProps<any>> = ({
     manualSorting: serverSideProcessing,
     manualPagination: serverSideProcessing,
     enableSorting,
+    autoResetPageIndex: false,
+    enableRowSelection,
   });
 
+  const Bar = batchActionsBar;
+
   return (
     <>
+      {table.getSelectedRowModel().flatRows.length > 0 && Bar && (
+        <S.TableActionsBar>
+          <Bar
+            rows={table.getSelectedRowModel().flatRows}
+            resetRowSelection={table.resetRowSelection}
+          />
+        </S.TableActionsBar>
+      )}
       <S.Table>
         <thead>
           {table.getHeaderGroups().map((headerGroup) => (
             <tr key={headerGroup.id}>
+              {!!enableRowSelection && (
+                <S.Th key={`${headerGroup.id}-select`}>
+                  {flexRender(
+                    SelectRowHeader,
+                    headerGroup.headers[0].getContext()
+                  )}
+                </S.Th>
+              )}
               {table.getCanSomeRowsExpand() && (
                 <S.Th expander key={`${headerGroup.id}-expander`} />
               )}
@@ -160,6 +209,14 @@ const Table: React.FC<TableProps<any>> = ({
                 expanded={row.getIsExpanded()}
                 onClick={() => row.getCanExpand() && row.toggleExpanded()}
               >
+                {!!enableRowSelection && (
+                  <td key={`${row.id}-select`}>
+                    {flexRender(
+                      SelectRowCell,
+                      row.getVisibleCells()[0].getContext()
+                    )}
+                  </td>
+                )}
                 {row.getCanExpand() && (
                   <td key={`${row.id}-expander`}>
                     {flexRender(
@@ -168,15 +225,15 @@ const Table: React.FC<TableProps<any>> = ({
                     )}
                   </td>
                 )}
-                {row.getVisibleCells().map((cell) => (
-                  <td key={cell.id}>
-                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                  </td>
-                ))}
+                {row
+                  .getVisibleCells()
+                  .map(({ id, getContext, column: { columnDef } }) => (
+                    <td key={id}>{flexRender(columnDef.cell, getContext())}</td>
+                  ))}
               </S.Row>
               {row.getIsExpanded() && renderSubComponent && (
                 <S.Row expanded>
-                  <td colSpan={row.getVisibleCells().length + 1}>
+                  <td colSpan={row.getVisibleCells().length + 2}>
                     <S.ExpandedRowInfo>
                       {renderSubComponent({ row })}
                     </S.ExpandedRowInfo>
@@ -185,6 +242,13 @@ const Table: React.FC<TableProps<any>> = ({
               )}
             </React.Fragment>
           ))}
+          {table.getRowModel().rows.length === 0 && (
+            <S.Row>
+              <S.EmptyTableMessageCell colSpan={100}>
+                {emptyMessage || 'No rows found'}
+              </S.EmptyTableMessageCell>
+            </S.Row>
+          )}
         </tbody>
       </S.Table>
       {table.getPageCount() > 1 && (
@@ -231,9 +295,9 @@ const Table: React.FC<TableProps<any>> = ({
                 inputSize="M"
                 max={table.getPageCount()}
                 min={1}
-                onChange={(e) => {
-                  const page = e.target.value ? Number(e.target.value) - 1 : 0;
-                  table.setPageIndex(page);
+                onChange={({ target: { value } }) => {
+                  const index = value ? Number(value) - 1 : 0;
+                  table.setPageIndex(index);
                 }}
               />
             </S.GoToPage>
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index e9b21c3e032..3e4dddc4109 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -1,19 +1,24 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
-import Table, { TimestampCell } from 'components/common/NewTable';
+import Table, {
+  TableProps,
+  TimestampCell,
+  SizeCell,
+} from 'components/common/NewTable';
 import { screen, waitFor } from '@testing-library/dom';
-import { ColumnDef } from '@tanstack/react-table';
+import { ColumnDef, Row } from '@tanstack/react-table';
 import userEvent from '@testing-library/user-event';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
 import { act } from '@testing-library/react';
 
+type Datum = typeof data[0];
+
 const data = [
-  { timestamp: 1660034383725, text: 'lorem' },
-  { timestamp: 1660034399999, text: 'ipsum' },
-  { timestamp: 1660034399922, text: 'dolor' },
-  { timestamp: 1660034199922, text: 'sit' },
+  { timestamp: 1660034383725, text: 'lorem', selectable: false, size: 1234 },
+  { timestamp: 1660034399999, text: 'ipsum', selectable: true, size: 3 },
+  { timestamp: 1660034399922, text: 'dolor', selectable: true, size: 50000 },
+  { timestamp: 1660034199922, text: 'sit', selectable: false, size: 1_312_323 },
 ];
-type Datum = typeof data[0];
 
 const columns: ColumnDef<Datum>[] = [
   {
@@ -25,27 +30,30 @@ const columns: ColumnDef<Datum>[] = [
     header: 'Text',
     accessorKey: 'text',
   },
+  {
+    header: 'Size',
+    accessorKey: 'size',
+    cell: SizeCell,
+  },
 ];
 
 const ExpandedRow: React.FC = () => <div>I am expanded row</div>;
 
-interface Props {
+interface Props extends TableProps<Datum> {
   path?: string;
-  canExpand?: boolean;
 }
 
-const renderComponent = ({ path, canExpand }: Props = {}) => {
+const renderComponent = (props: Partial<Props> = {}) => {
   render(
     <WithRoute path="/">
       <Table
         columns={columns}
         data={data}
         renderSubComponent={ExpandedRow}
-        getRowCanExpand={() => !!canExpand}
-        enableSorting
+        {...props}
       />
     </WithRoute>,
-    { initialEntries: [path || ''] }
+    { initialEntries: [props.path || ''] }
   );
 };
 
@@ -53,6 +61,30 @@ describe('Table', () => {
   it('renders table', () => {
     renderComponent();
     expect(screen.getByRole('table')).toBeInTheDocument();
+    expect(screen.getAllByRole('row').length).toEqual(data.length + 1);
+  });
+
+  it('renders empty table', () => {
+    renderComponent({ data: [] });
+    expect(screen.getByRole('table')).toBeInTheDocument();
+    expect(screen.getAllByRole('row').length).toEqual(2);
+    expect(screen.getByText('No rows found')).toBeInTheDocument();
+  });
+
+  it('renders empty table with custom message', () => {
+    const emptyMessage = 'Super custom message';
+    renderComponent({ data: [], emptyMessage });
+    expect(screen.getByRole('table')).toBeInTheDocument();
+    expect(screen.getAllByRole('row').length).toEqual(2);
+    expect(screen.getByText(emptyMessage)).toBeInTheDocument();
+  });
+
+  it('renders SizeCell', () => {
+    renderComponent();
+    expect(screen.getByText('1KB')).toBeInTheDocument();
+    expect(screen.getByText('3Bytes')).toBeInTheDocument();
+    expect(screen.getByText('49KB')).toBeInTheDocument();
+    expect(screen.getByText('1MB')).toBeInTheDocument();
   });
 
   it('renders TimestampCell', () => {
@@ -64,7 +96,7 @@ describe('Table', () => {
 
   describe('ExpanderCell', () => {
     it('renders button', () => {
-      renderComponent({ canExpand: true });
+      renderComponent({ getRowCanExpand: () => true });
       const btns = screen.getAllByRole('button', { name: 'Expand row' });
       expect(btns.length).toEqual(data.length);
 
@@ -76,7 +108,7 @@ describe('Table', () => {
     });
 
     it('does not render button', () => {
-      renderComponent({ canExpand: false });
+      renderComponent({ getRowCanExpand: () => false });
       expect(
         screen.queryByRole('button', { name: 'Expand row' })
       ).not.toBeInTheDocument();
@@ -147,7 +179,10 @@ describe('Table', () => {
   describe('Sorting', () => {
     it('sort rows', async () => {
       await act(() =>
-        renderComponent({ path: '/?sortBy=text&&sortDirection=desc' })
+        renderComponent({
+          path: '/?sortBy=text&&sortDirection=desc',
+          enableSorting: true,
+        })
       );
       expect(screen.getAllByRole('row').length).toEqual(data.length + 1);
       const th = screen.getByRole('columnheader', { name: 'Text' });
@@ -178,4 +213,31 @@ describe('Table', () => {
       expect(rows[4].textContent?.indexOf('sit')).toBeGreaterThan(-1);
     });
   });
+
+  describe('Row Selecting', () => {
+    beforeEach(() => {
+      renderComponent({
+        enableRowSelection: (row: Row<Datum>) => row.original.selectable,
+        batchActionsBar: () => <div>I am Action Bar</div>,
+      });
+    });
+    it('renders selectable rows', () => {
+      expect(screen.getAllByRole('row').length).toEqual(data.length + 1);
+      const checkboxes = screen.getAllByRole('checkbox');
+      expect(checkboxes.length).toEqual(data.length + 1);
+      expect(checkboxes[1]).toBeDisabled();
+      expect(checkboxes[2]).toBeEnabled();
+      expect(checkboxes[3]).toBeEnabled();
+      expect(checkboxes[4]).toBeDisabled();
+    });
+
+    it('renders action bar', () => {
+      expect(screen.getAllByRole('row').length).toEqual(data.length + 1);
+      expect(screen.queryByText('I am Action Bar')).not.toBeInTheDocument();
+      const checkboxes = screen.getAllByRole('checkbox');
+      expect(checkboxes.length).toEqual(data.length + 1);
+      userEvent.click(checkboxes[2]);
+      expect(screen.getByText('I am Action Bar')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/kafka-ui-react-app/src/components/common/NewTable/index.ts b/kafka-ui-react-app/src/components/common/NewTable/index.ts
index b2c25771e51..08a5f85ad17 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/index.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/index.ts
@@ -1,7 +1,9 @@
-import Table from './Table';
+import Table, { TableProps } from './Table';
 import TimestampCell from './TimestampCell';
-import ExpanderCell from './ExpanderCell';
+import SizeCell from './SizeCell';
 
-export { TimestampCell, ExpanderCell };
+export type { TableProps };
+
+export { TimestampCell, SizeCell };
 
 export default Table;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/utils/updatePaginationState.ts b/kafka-ui-react-app/src/components/common/NewTable/utils/updatePaginationState.ts
index 85dfd580bc2..8b6bc3dc825 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/utils/updatePaginationState.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/utils/updatePaginationState.ts
@@ -7,21 +7,14 @@ export default (
   updater: UpdaterFn<PaginationState>,
   searchParams: URLSearchParams
 ) => {
+  const page = searchParams.get('page');
   const previousState: PaginationState = {
-    pageIndex: Number(searchParams.get('page') || 0),
+    // Page number starts at 1, but the pageIndex starts at 0
+    pageIndex: page ? Number(page) - 1 : 0,
     pageSize: Number(searchParams.get('perPage') || PER_PAGE),
   };
   const newState = updater(previousState);
-  if (newState.pageIndex !== 0) {
-    searchParams.set('page', newState.pageIndex.toString());
-  } else {
-    searchParams.delete('page');
-  }
-
-  if (newState.pageSize !== PER_PAGE) {
-    searchParams.set('perPage', newState.pageSize.toString());
-  } else {
-    searchParams.delete('perPage');
-  }
-  return newState;
+  searchParams.set('page', String(newState.pageIndex + 1));
+  searchParams.set('perPage', newState.pageSize.toString());
+  return previousState;
 };
diff --git a/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts b/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
index 3b5fdf59532..493c525b2d0 100644
--- a/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
+++ b/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
@@ -3,9 +3,17 @@ import styled, { css } from 'styled-components';
 const tableLinkMixin = css(
   ({ theme }) => `
  & > a {
-    color: ${theme.table.link.color};
+    color: ${theme.table.link.color.normal};
     font-weight: 500;
     text-overflow: ellipsis;
+
+    &:hover {
+      color: ${theme.table.link.color.hover};
+    }
+
+    &:active {
+      color: ${theme.table.link.color.active};
+    }
   }
 `
 );
diff --git a/kafka-ui-react-app/src/lib/fixtures/brokers.ts b/kafka-ui-react-app/src/lib/fixtures/brokers.ts
index 37e3f7ecfb5..fb718e560d5 100644
--- a/kafka-ui-react-app/src/lib/fixtures/brokers.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/brokers.ts
@@ -32,4 +32,8 @@ export const brokerLogDirsPayload: BrokersLogdirs[] = [
       },
     ],
   },
+  {
+    error: 'NONE',
+    name: '/opt/kafka/data-1/logs',
+  },
 ];
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 799aaa5e5f0..44e3be86411 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -299,12 +299,16 @@ const theme = {
     deletionTextColor: Colors.neutral[70],
   },
   table: {
+    actionBar: {
+      backgroundColor: Colors.neutral[0],
+    },
     th: {
       backgroundColor: {
         normal: Colors.neutral[0],
       },
       color: {
-        normal: Colors.neutral[50],
+        sortable: Colors.neutral[30],
+        normal: Colors.neutral[60],
         hover: Colors.brand[50],
         active: Colors.brand[50],
       },
@@ -326,6 +330,8 @@ const theme = {
     link: {
       color: {
         normal: Colors.neutral[90],
+        hover: Colors.neutral[50],
+        active: Colors.neutral[90],
       },
     },
     expander: {

From e1fb6bacc331feec10018fc770ea3343e30c1161 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 15 Aug 2022 13:46:13 +0300
Subject: [PATCH 119/734] Get rid of SmartTable component (#2444)

* Get rid of SmartTable component

* Clickable rows

* Improve test coverage
---
 .../Brokers/BrokersList/BrokersList.style.ts  |   5 -
 .../Brokers/BrokersList/BrokersList.tsx       |  92 ++++-----
 .../BrokersList/__test__/BrokersList.spec.tsx | 174 ++++++++++--------
 .../Connect/Details/Overview/Overview.tsx     |   2 +-
 .../Connect/Details/Tasks/Tasks.tsx           |   4 +-
 .../src/components/Connect/List/ListItem.tsx  |   4 +-
 .../ConsumerGroups/Details/Details.tsx        |   4 +-
 .../List/ConsumerGroupsTableCells.tsx         |  23 ---
 .../components/ConsumerGroups/List/List.tsx   | 138 +++++++-------
 .../ConsumerGroups/List/ListContainer.tsx     |  11 +-
 .../ConsumerGroups/List/ListItem.tsx          |  29 ---
 .../ConsumerGroupsTableCells.spec.tsx         |  61 ------
 .../List/__test__/List.spec.tsx               |  78 +++-----
 .../List/__test__/ListItem.spec.tsx           |  86 ---------
 .../__test__/ConsumerGroups.spec.tsx          | 137 +++-----------
 .../KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx     |  38 ++--
 .../KsqlDbItem/__test__/KsqlDbItem.spec.tsx   |  63 +++----
 .../KsqlDb/List/__test__/List.spec.tsx        |   9 +-
 .../GlobalSchemaSelector.tsx                  |  14 +-
 .../__test__/GlobalSchemaSelector.spec.tsx    |   2 +-
 .../src/components/Schemas/List/List.tsx      |  76 ++++----
 .../src/components/Schemas/List/ListItem.tsx  |  26 ---
 .../Schemas/List/__test__/List.spec.tsx       |  26 ++-
 .../Schemas/List/__test__/ListItem.spec.tsx   |  23 ---
 .../Schemas/List/__test__/fixtures.ts         |   2 +-
 .../ConsumerGroups/TopicConsumerGroups.tsx    |   2 +-
 .../MessageContent/MessageContent.styled.ts   |  16 --
 .../__tests__/MessageContent.styled.spec.tsx  |  20 --
 .../common/NewTable/ExpanderCell.tsx          |   3 +-
 .../components/common/NewTable/LinkCell.tsx   |  16 ++
 .../common/NewTable/SelectRowCell.tsx         |   3 +-
 .../common/NewTable/SelectRowHeader.tsx       |   5 +-
 .../components/common/NewTable/SizeCell.tsx   |   4 +-
 .../common/NewTable/Table.styled.ts           |   6 +-
 .../src/components/common/NewTable/Table.tsx  |  50 ++++-
 .../components/common/NewTable/TagCell.tsx    |  12 ++
 .../common/NewTable/TimestampCell.tsx         |   4 +-
 .../common/NewTable/__test__/Table.spec.tsx   | 103 ++++++++++-
 .../src/components/common/NewTable/index.ts   |   4 +-
 .../common/Pagination/PageControl.tsx         |  26 ---
 .../common/Pagination/Pagination.styled.ts    |  87 ---------
 .../common/Pagination/Pagination.tsx          | 128 -------------
 .../Pagination/__tests__/PageControl.spec.tsx |  35 ----
 .../Pagination/__tests__/Pagination.spec.tsx  |  91 ---------
 .../common/SmartTable/SmartTable.tsx          | 134 --------------
 .../common/SmartTable/TableColumn.tsx         | 102 ----------
 .../components/common/SmartTable/TableRow.tsx |  86 ---------
 .../src/components/common/Tag/Tag.styled.tsx  |   3 +-
 .../src/components/common/Tag/getTagColor.ts  |  12 +-
 .../common/table/Table/TableKeyLink.styled.ts |   4 -
 .../TableHeaderCell/TableHeaderCell.styled.ts |   6 -
 .../src/lib/__test__/propertyLookup.spec.ts   |  18 --
 .../src/lib/hooks/usePagination.ts            |  17 --
 .../src/lib/hooks/useTableState.ts            |  78 --------
 kafka-ui-react-app/src/lib/propertyLookup.ts  |   9 -
 .../consumerGroups/__test__/fixtures.ts       |   5 -
 kafka-ui-react-app/src/theme/theme.ts         |  16 --
 57 files changed, 591 insertions(+), 1641 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.style.ts
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/List/ConsumerGroupsTableCells.tsx
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/List/ListItem.tsx
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ConsumerGroupsTableCells.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ListItem.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Schemas/List/ListItem.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Schemas/List/__test__/ListItem.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.styled.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/TagCell.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Pagination/PageControl.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Pagination/Pagination.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Pagination/__tests__/PageControl.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/SmartTable/SmartTable.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/SmartTable/TableRow.tsx
 delete mode 100644 kafka-ui-react-app/src/lib/__test__/propertyLookup.spec.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/usePagination.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/useTableState.ts
 delete mode 100644 kafka-ui-react-app/src/lib/propertyLookup.ts

diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.style.ts b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.style.ts
deleted file mode 100644
index f5f83733331..00000000000
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.style.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import styled from 'styled-components';
-
-export const ClickableRow = styled.tr`
-  cursor: pointer;
-`;
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index ae1a26899b7..bbe00458e6a 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -1,25 +1,21 @@
 import React from 'react';
 import { ClusterName } from 'redux/interfaces';
-import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { NavLink, useNavigate } from 'react-router-dom';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import { Table } from 'components/common/table/Table/Table.styled';
+import { useNavigate } from 'react-router-dom';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
 import useAppParams from 'lib/hooks/useAppParams';
 import { useBrokers } from 'lib/hooks/api/brokers';
 import { useClusterStats } from 'lib/hooks/api/clusters';
-
-import { ClickableRow } from './BrokersList.style';
+import Table, { LinkCell, SizeCell } from 'components/common/NewTable';
+import { ColumnDef } from '@tanstack/react-table';
+import { clusterBrokerPath } from 'lib/paths';
 
 const BrokersList: React.FC = () => {
   const navigate = useNavigate();
   const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
-  const { data: clusterStats } = useClusterStats(clusterName);
+  const { data: clusterStats = {} } = useClusterStats(clusterName);
   const { data: brokers } = useBrokers(clusterName);
 
-  if (!clusterStats) return null;
-
   const {
     brokerCount,
     activeControllers,
@@ -32,6 +28,32 @@ const BrokersList: React.FC = () => {
     version,
   } = clusterStats;
 
+  const rows = React.useMemo(() => {
+    if (!diskUsage) return [];
+
+    return diskUsage.map(({ brokerId, segmentSize, segmentCount }) => {
+      const broker = brokers?.find(({ id }) => id === brokerId);
+      return {
+        brokerId,
+        size: segmentSize,
+        count: segmentCount,
+        port: broker?.port,
+        host: broker?.host,
+      };
+    });
+  }, [diskUsage, brokers]);
+
+  const columns = React.useMemo<ColumnDef<typeof rows>[]>(
+    () => [
+      { header: 'Broker ID', accessorKey: 'brokerId', cell: LinkCell },
+      { header: 'Segment Size', accessorKey: 'size', cell: SizeCell },
+      { header: 'Segment Count', accessorKey: 'count' },
+      { header: 'Port', accessorKey: 'port' },
+      { header: 'Host', accessorKey: 'host' },
+    ],
+    []
+  );
+
   const replicas = (inSyncReplicasCount ?? 0) + (outOfSyncReplicasCount ?? 0);
   const areAllInSync = inSyncReplicasCount && replicas === inSyncReplicasCount;
   const partitionIsOffline = offlinePartitionCount && offlinePartitionCount > 0;
@@ -95,49 +117,15 @@ const BrokersList: React.FC = () => {
           </Metrics.Indicator>
         </Metrics.Section>
       </Metrics.Wrapper>
-      <Table isFullwidth>
-        <thead>
-          <tr>
-            <TableHeaderCell title="Broker" />
-            <TableHeaderCell title="Segment Size" />
-            <TableHeaderCell title="Segment Count" />
-            <TableHeaderCell title="Port" />
-            <TableHeaderCell title="Host" />
-          </tr>
-        </thead>
-        <tbody>
-          {(!diskUsage || diskUsage.length === 0) && (
-            <tr>
-              <td colSpan={10}>Disk usage data not available</td>
-            </tr>
-          )}
-
-          {diskUsage &&
-            diskUsage.length !== 0 &&
-            diskUsage.map(({ brokerId, segmentSize, segmentCount }) => {
-              const brokerItem = brokers?.find(({ id }) => id === brokerId);
-
-              return (
-                <ClickableRow
-                  key={brokerId}
-                  onClick={() => navigate(`${brokerId}`)}
-                >
-                  <td>
-                    <NavLink to={`${brokerId}`} role="link">
-                      {brokerId}
-                    </NavLink>
-                  </td>
-                  <td>
-                    <BytesFormatted value={segmentSize} />
-                  </td>
-                  <td>{segmentCount}</td>
-                  <td>{brokerItem?.port}</td>
-                  <td>{brokerItem?.host}</td>
-                </ClickableRow>
-              );
-            })}
-        </tbody>
-      </Table>
+      <Table
+        columns={columns}
+        data={rows}
+        enableSorting
+        onRowClick={({ original: { brokerId } }) =>
+          navigate(clusterBrokerPath(clusterName, brokerId))
+        }
+        emptyMessage="Disk usage data not available"
+      />
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
index 550e8824d24..b90cef0a433 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen, waitFor } from '@testing-library/dom';
-import { clusterBrokersPath } from 'lib/paths';
+import { clusterBrokerPath, clusterBrokersPath } from 'lib/paths';
 import { act } from '@testing-library/react';
 import BrokersList from 'components/Brokers/BrokersList/BrokersList';
 import userEvent from '@testing-library/user-event';
@@ -41,84 +41,108 @@ describe('BrokersList Component', () => {
     );
 
   describe('BrokersList', () => {
-    beforeEach(() => {
-      (useBrokers as jest.Mock).mockImplementation(() => ({
-        data: brokersPayload,
-      }));
-      (useClusterStats as jest.Mock).mockImplementation(() => ({
-        data: clusterStatsPayload,
-      }));
+    describe('when the brokers are loaded', () => {
+      beforeEach(() => {
+        (useBrokers as jest.Mock).mockImplementation(() => ({
+          data: brokersPayload,
+        }));
+        (useClusterStats as jest.Mock).mockImplementation(() => ({
+          data: clusterStatsPayload,
+        }));
+      });
+      it('renders', async () => {
+        renderComponent();
+        expect(screen.getByRole('table')).toBeInTheDocument();
+        expect(screen.getAllByRole('row').length).toEqual(3);
+      });
+      it('opens broker when row clicked', async () => {
+        renderComponent();
+        await act(() => {
+          userEvent.click(screen.getByRole('cell', { name: '0' }));
+        });
+        await waitFor(() =>
+          expect(mockedUsedNavigate).toBeCalledWith(
+            clusterBrokerPath(clusterName, '0')
+          )
+        );
+      });
+      it('shows warning when offlinePartitionCount > 0', async () => {
+        (useClusterStats as jest.Mock).mockImplementation(() => ({
+          data: {
+            ...clusterStatsPayload,
+            offlinePartitionCount: 1345,
+          },
+        }));
+        renderComponent();
+        const onlineWidget = screen.getByText(
+          clusterStatsPayload.onlinePartitionCount
+        );
+        expect(onlineWidget).toBeInTheDocument();
+        expect(onlineWidget).toHaveStyle({ color: '#E51A1A' });
+      });
+      it('shows right count when offlinePartitionCount > 0', async () => {
+        (useClusterStats as jest.Mock).mockImplementation(() => ({
+          data: {
+            ...clusterStatsPayload,
+            inSyncReplicasCount: testInSyncReplicasCount,
+            outOfSyncReplicasCount: testOutOfSyncReplicasCount,
+          },
+        }));
+        renderComponent();
+        const onlineWidgetDef = screen.getByText(testInSyncReplicasCount);
+        const onlineWidget = screen.getByText(
+          `of ${testInSyncReplicasCount + testOutOfSyncReplicasCount}`
+        );
+        expect(onlineWidgetDef).toBeInTheDocument();
+        expect(onlineWidget).toBeInTheDocument();
+      });
+      it('shows right count when inSyncReplicasCount: undefined && outOfSyncReplicasCount: 1', async () => {
+        (useClusterStats as jest.Mock).mockImplementation(() => ({
+          data: {
+            ...clusterStatsPayload,
+            inSyncReplicasCount: undefined,
+            outOfSyncReplicasCount: testOutOfSyncReplicasCount,
+          },
+        }));
+        renderComponent();
+        const onlineWidget = screen.getByText(
+          `of ${testOutOfSyncReplicasCount}`
+        );
+        expect(onlineWidget).toBeInTheDocument();
+      });
+      it(`shows right count when inSyncReplicasCount: ${testInSyncReplicasCount} outOfSyncReplicasCount: undefined`, async () => {
+        (useClusterStats as jest.Mock).mockImplementation(() => ({
+          data: {
+            ...clusterStatsPayload,
+            inSyncReplicasCount: testInSyncReplicasCount,
+            outOfSyncReplicasCount: undefined,
+          },
+        }));
+        renderComponent();
+        const onlineWidgetDef = screen.getByText(testInSyncReplicasCount);
+        const onlineWidget = screen.getByText(`of ${testInSyncReplicasCount}`);
+        expect(onlineWidgetDef).toBeInTheDocument();
+        expect(onlineWidget).toBeInTheDocument();
+      });
     });
 
-    it('renders', async () => {
-      renderComponent();
-      expect(screen.getByRole('table')).toBeInTheDocument();
-      const rows = screen.getAllByRole('row');
-      expect(rows.length).toEqual(3);
-    });
-    it('opens broker when row clicked', async () => {
-      renderComponent();
-      await act(() => {
-        userEvent.click(screen.getByRole('cell', { name: '0' }));
+    describe('when diskUsage is empty', () => {
+      beforeEach(() => {
+        (useBrokers as jest.Mock).mockImplementation(() => ({
+          data: brokersPayload,
+        }));
+        (useClusterStats as jest.Mock).mockImplementation(() => ({
+          data: { ...clusterStatsPayload, diskUsage: undefined },
+        }));
       });
-      await waitFor(() => expect(mockedUsedNavigate).toBeCalledWith('0'));
-    });
-    it('shows warning when offlinePartitionCount > 0', async () => {
-      (useClusterStats as jest.Mock).mockImplementation(() => ({
-        data: {
-          ...clusterStatsPayload,
-          offlinePartitionCount: 1345,
-        },
-      }));
-      renderComponent();
-      const onlineWidget = screen.getByText(
-        clusterStatsPayload.onlinePartitionCount
-      );
-      expect(onlineWidget).toBeInTheDocument();
-      expect(onlineWidget).toHaveStyle({ color: '#E51A1A' });
-    });
-    it('shows right count when offlinePartitionCount > 0', async () => {
-      (useClusterStats as jest.Mock).mockImplementation(() => ({
-        data: {
-          ...clusterStatsPayload,
-          inSyncReplicasCount: testInSyncReplicasCount,
-          outOfSyncReplicasCount: testOutOfSyncReplicasCount,
-        },
-      }));
-      renderComponent();
-      const onlineWidgetDef = screen.getByText(testInSyncReplicasCount);
-      const onlineWidget = screen.getByText(
-        `of ${testInSyncReplicasCount + testOutOfSyncReplicasCount}`
-      );
-      expect(onlineWidgetDef).toBeInTheDocument();
-      expect(onlineWidget).toBeInTheDocument();
-    });
 
-    it('shows right count when inSyncReplicasCount: undefined outOfSyncReplicasCount: 1', async () => {
-      (useClusterStats as jest.Mock).mockImplementation(() => ({
-        data: {
-          ...clusterStatsPayload,
-          inSyncReplicasCount: undefined,
-          outOfSyncReplicasCount: testOutOfSyncReplicasCount,
-        },
-      }));
-      renderComponent();
-      const onlineWidget = screen.getByText(`of ${testOutOfSyncReplicasCount}`);
-      expect(onlineWidget).toBeInTheDocument();
-    });
-    it(`shows right count when inSyncReplicasCount: ${testInSyncReplicasCount} outOfSyncReplicasCount: undefined`, async () => {
-      (useClusterStats as jest.Mock).mockImplementation(() => ({
-        data: {
-          ...clusterStatsPayload,
-          inSyncReplicasCount: testInSyncReplicasCount,
-          outOfSyncReplicasCount: undefined,
-        },
-      }));
-      renderComponent();
-      const onlineWidgetDef = screen.getByText(testInSyncReplicasCount);
-      const onlineWidget = screen.getByText(`of ${testInSyncReplicasCount}`);
-      expect(onlineWidgetDef).toBeInTheDocument();
-      expect(onlineWidget).toBeInTheDocument();
+      it('renders empty table', async () => {
+        renderComponent();
+        expect(screen.getByRole('table')).toBeInTheDocument();
+        expect(
+          screen.getByRole('row', { name: 'Disk usage data not available' })
+        ).toBeInTheDocument();
+      });
     });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Connect/Details/Overview/Overview.tsx
index c5c004f3061..d1fdc56fb95 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Overview/Overview.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Overview/Overview.tsx
@@ -35,7 +35,7 @@ const Overview: React.FC = () => {
           </Metrics.Indicator>
         )}
         <Metrics.Indicator label="State">
-          <C.Tag color={getTagColor(connector.status)}>
+          <C.Tag color={getTagColor(connector.status.state)}>
             {connector.status.state}
           </C.Tag>
         </Metrics.Indicator>
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
index 8fbe687e119..74dd89ab873 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
@@ -43,7 +43,9 @@ const Tasks: React.FC = () => {
             <td>{task.status?.id}</td>
             <td>{task.status?.workerId}</td>
             <td>
-              <Tag color={getTagColor(task.status)}>{task.status.state}</Tag>
+              <Tag color={getTagColor(task.status.state)}>
+                {task.status.state}
+              </Tag>
             </td>
             <td>{task.status.trace || 'null'}</td>
             <td style={{ width: '5%' }}>
diff --git a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
index 7260969ba13..4d10001947b 100644
--- a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
@@ -72,7 +72,9 @@ const ListItem: React.FC<ListItemProps> = ({
           ))}
         </S.TagsWrapper>
       </td>
-      <td>{status && <Tag color={getTagColor(status)}>{status.state}</Tag>}</td>
+      <td>
+        {status && <Tag color={getTagColor(status.state)}>{status.state}</Tag>}
+      </td>
       <td>
         {runningTasks && (
           <span>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index b87035ae7de..74da5c0b093 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -82,7 +82,9 @@ const Details: React.FC = () => {
       <Metrics.Wrapper>
         <Metrics.Section>
           <Metrics.Indicator label="State">
-            <Tag color={getTagColor(consumerGroup)}>{consumerGroup.state}</Tag>
+            <Tag color={getTagColor(consumerGroup.state)}>
+              {consumerGroup.state}
+            </Tag>
           </Metrics.Indicator>
           <Metrics.Indicator label="Members">
             {consumerGroup.members}
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/ConsumerGroupsTableCells.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/ConsumerGroupsTableCells.tsx
deleted file mode 100644
index f4295600c14..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/ConsumerGroupsTableCells.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import { Tag } from 'components/common/Tag/Tag.styled';
-import { TableCellProps } from 'components/common/SmartTable/TableColumn';
-import { ConsumerGroup } from 'generated-sources';
-import { SmartTableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
-import getTagColor from 'components/common/Tag/getTagColor';
-
-export const StatusCell: React.FC<TableCellProps<ConsumerGroup, string>> = ({
-  dataItem,
-}) => {
-  return <Tag color={getTagColor(dataItem)}>{dataItem.state}</Tag>;
-};
-
-export const GroupIDCell: React.FC<TableCellProps<ConsumerGroup, string>> = ({
-  dataItem: { groupId },
-}) => {
-  return (
-    <SmartTableKeyLink>
-      <Link to={groupId}>{groupId}</Link>
-    </SmartTableKeyLink>
-  );
-};
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
index a73afc20414..3939f111ff4 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
@@ -7,75 +7,84 @@ import {
   ConsumerGroupOrdering,
   SortOrder,
 } from 'generated-sources';
-import { useTableState } from 'lib/hooks/useTableState';
-import { SmartTable } from 'components/common/SmartTable/SmartTable';
-import { TableColumn } from 'components/common/SmartTable/TableColumn';
-import {
-  GroupIDCell,
-  StatusCell,
-} from 'components/ConsumerGroups/List/ConsumerGroupsTableCells';
-import usePagination from 'lib/hooks/usePagination';
 import useSearch from 'lib/hooks/useSearch';
 import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
-import { ClusterNameRoute } from 'lib/paths';
+import { clusterConsumerGroupDetailsPath, ClusterNameRoute } from 'lib/paths';
 import { fetchConsumerGroupsPaged } from 'redux/reducers/consumerGroups/consumerGroupsSlice';
-import PageLoader from 'components/common/PageLoader/PageLoader';
+import { ColumnDef } from '@tanstack/react-table';
+import Table, { TagCell, LinkCell } from 'components/common/NewTable';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import { PER_PAGE } from 'lib/constants';
 
 export interface Props {
   consumerGroups: ConsumerGroupDetails[];
-  orderBy: string | null;
-  sortOrder: SortOrder;
   totalPages: number;
-  isFetched: boolean;
-  setConsumerGroupsSortOrderBy(orderBy: string | null): void;
 }
 
-const List: React.FC<Props> = ({
-  consumerGroups,
-  sortOrder,
-  orderBy,
-  totalPages,
-  isFetched,
-  setConsumerGroupsSortOrderBy,
-}) => {
-  const { page, perPage } = usePagination();
+const List: React.FC<Props> = ({ consumerGroups, totalPages }) => {
   const [searchText, handleSearchText] = useSearch();
   const dispatch = useAppDispatch();
   const { clusterName } = useAppParams<ClusterNameRoute>();
+  const [searchParams] = useSearchParams();
+  const navigate = useNavigate();
 
   React.useEffect(() => {
     dispatch(
       fetchConsumerGroupsPaged({
         clusterName,
-        orderBy: (orderBy as ConsumerGroupOrdering) || undefined,
-        sortOrder,
-        page,
-        perPage,
+        orderBy:
+          (searchParams.get('sortBy') as ConsumerGroupOrdering) || undefined,
+        sortOrder:
+          (searchParams.get('sortDirection')?.toUpperCase() as SortOrder) ||
+          undefined,
+        page: Number(searchParams.get('page') || 1),
+        perPage: Number(searchParams.get('perPage') || PER_PAGE),
         search: searchText,
       })
     );
-  }, [clusterName, orderBy, searchText, sortOrder, page, perPage, dispatch]);
+  }, [clusterName, searchText, dispatch, searchParams]);
 
-  const tableState = useTableState<ConsumerGroupDetails, string>(
-    consumerGroups,
-    {
-      totalPages,
-      idSelector: (consumerGroup) => consumerGroup.groupId,
-    },
-    {
-      handleOrderBy: setConsumerGroupsSortOrderBy,
-      orderBy,
-      sortOrder,
-    }
+  const columns = React.useMemo<ColumnDef<ConsumerGroupDetails>[]>(
+    () => [
+      {
+        id: ConsumerGroupOrdering.NAME,
+        header: 'Group ID',
+        accessorKey: 'groupId',
+        cell: LinkCell,
+      },
+      {
+        id: ConsumerGroupOrdering.MEMBERS,
+        header: 'Num Of Members',
+        accessorKey: 'members',
+      },
+      {
+        header: 'Num Of Topics',
+        accessorKey: 'topics',
+        enableSorting: false,
+      },
+      {
+        header: 'Messages Behind',
+        accessorKey: 'messagesBehind',
+        enableSorting: false,
+      },
+      {
+        header: 'Coordinator',
+        accessorKey: 'coordinator.id',
+        enableSorting: false,
+      },
+      {
+        id: ConsumerGroupOrdering.STATE,
+        header: 'State',
+        accessorKey: 'state',
+        cell: TagCell,
+      },
+    ],
+    []
   );
 
-  if (!isFetched) {
-    return <PageLoader />;
-  }
-
   return (
-    <div>
+    <>
       <PageHeading text="Consumers" />
       <ControlPanelWrapper hasInput>
         <Search
@@ -84,33 +93,20 @@ const List: React.FC<Props> = ({
           handleSearch={handleSearchText}
         />
       </ControlPanelWrapper>
-      <SmartTable
-        tableState={tableState}
-        isFullwidth
-        placeholder="No active consumer groups"
-        hoverable
-        paginated
-      >
-        <TableColumn
-          title="Consumer Group ID"
-          cell={GroupIDCell}
-          orderValue={ConsumerGroupOrdering.NAME}
-        />
-        <TableColumn
-          title="Num Of Members"
-          field="members"
-          orderValue={ConsumerGroupOrdering.MEMBERS}
-        />
-        <TableColumn title="Num Of Topics" field="topics" />
-        <TableColumn title="Messages Behind" field="messagesBehind" />
-        <TableColumn title="Coordinator" field="coordinator.id" />
-        <TableColumn
-          title="State"
-          cell={StatusCell}
-          orderValue={ConsumerGroupOrdering.STATE}
-        />
-      </SmartTable>
-    </div>
+      <Table
+        columns={columns}
+        pageCount={totalPages}
+        data={consumerGroups}
+        emptyMessage="No active consumer groups found"
+        serverSideProcessing
+        enableSorting
+        onRowClick={({ original }) =>
+          navigate(
+            clusterConsumerGroupDetailsPath(clusterName, original.groupId)
+          )
+        }
+      />
+    </>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.tsx
index f72ae2c16d2..6c819eff4a1 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.tsx
@@ -2,24 +2,15 @@ import { connect } from 'react-redux';
 import { RootState } from 'redux/interfaces';
 import {
   getConsumerGroupsOrderBy,
-  getConsumerGroupsSortOrder,
   getConsumerGroupsTotalPages,
-  sortBy,
   selectAll,
-  getAreConsumerGroupsPagedFulfilled,
 } from 'redux/reducers/consumerGroups/consumerGroupsSlice';
 import List from 'components/ConsumerGroups/List/List';
 
 const mapStateToProps = (state: RootState) => ({
   consumerGroups: selectAll(state),
   orderBy: getConsumerGroupsOrderBy(state),
-  sortOrder: getConsumerGroupsSortOrder(state),
   totalPages: getConsumerGroupsTotalPages(state),
-  isFetched: getAreConsumerGroupsPagedFulfilled(state),
 });
 
-const mapDispatchToProps = {
-  setConsumerGroupsSortOrderBy: sortBy,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(List);
+export default connect(mapStateToProps)(List);
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/ListItem.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/ListItem.tsx
deleted file mode 100644
index 9078487cefc..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/ListItem.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import { ConsumerGroup } from 'generated-sources';
-import { Tag } from 'components/common/Tag/Tag.styled';
-import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
-import getTagColor from 'components/common/Tag/getTagColor';
-
-const ListItem: React.FC<{ consumerGroup: ConsumerGroup }> = ({
-  consumerGroup,
-}) => {
-  return (
-    <tr>
-      <TableKeyLink>
-        <Link to={`consumer-groups/${consumerGroup.groupId}`}>
-          {consumerGroup.groupId}
-        </Link>
-      </TableKeyLink>
-      <td>{consumerGroup.members}</td>
-      <td>{consumerGroup.topics}</td>
-      <td>{consumerGroup.messagesBehind}</td>
-      <td>{consumerGroup.coordinator?.id}</td>
-      <td>
-        <Tag color={getTagColor(consumerGroup)}>{consumerGroup.state}</Tag>
-      </td>
-    </tr>
-  );
-};
-
-export default ListItem;
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ConsumerGroupsTableCells.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ConsumerGroupsTableCells.spec.tsx
deleted file mode 100644
index 9effdd5b5e2..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ConsumerGroupsTableCells.spec.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import { render } from 'lib/testHelpers';
-import {
-  GroupIDCell,
-  StatusCell,
-} from 'components/ConsumerGroups/List/ConsumerGroupsTableCells';
-import { TableState } from 'lib/hooks/useTableState';
-import { ConsumerGroup, ConsumerGroupState } from 'generated-sources';
-import { screen } from '@testing-library/react';
-
-describe('Consumer Groups Table Cells', () => {
-  const consumerGroup: ConsumerGroup = {
-    groupId: 'groupId',
-    members: 1,
-    topics: 1,
-    simple: true,
-    state: ConsumerGroupState.STABLE,
-    coordinator: {
-      id: 6598,
-    },
-  };
-  const mockTableState: TableState<ConsumerGroup, string> = {
-    data: [consumerGroup],
-    selectedIds: new Set([]),
-    idSelector: jest.fn(),
-    isRowSelectable: jest.fn(),
-    selectedCount: 0,
-    setRowsSelection: jest.fn(),
-    toggleSelection: jest.fn(),
-  };
-
-  describe('StatusCell', () => {
-    it('should Tag props render normally', () => {
-      render(
-        <GroupIDCell
-          rowIndex={1}
-          dataItem={consumerGroup}
-          tableState={mockTableState}
-        />
-      );
-      const linkElement = screen.getByRole('link');
-      expect(linkElement).toBeInTheDocument();
-      expect(linkElement).toHaveAttribute('href', `/${consumerGroup.groupId}`);
-    });
-  });
-
-  describe('GroupIdCell', () => {
-    it('should GroupIdCell props render normally', () => {
-      render(
-        <StatusCell
-          rowIndex={1}
-          dataItem={consumerGroup}
-          tableState={mockTableState}
-        />
-      );
-      expect(
-        screen.getByText(consumerGroup.state as string)
-      ).toBeInTheDocument();
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx
index 04b78a983be..500549c0aa1 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx
@@ -1,77 +1,59 @@
 import React from 'react';
 import List, { Props } from 'components/ConsumerGroups/List/List';
 import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
 import { consumerGroups as consumerGroupMock } from 'redux/reducers/consumerGroups/__test__/fixtures';
-import { ConsumerGroupOrdering, SortOrder } from 'generated-sources';
-import theme from 'theme/theme';
+import { clusterConsumerGroupDetailsPath } from 'lib/paths';
+import userEvent from '@testing-library/user-event';
+import ListContainer from 'components/ConsumerGroups/List/ListContainer';
+
+const mockedUsedNavigate = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockedUsedNavigate,
+}));
+
+describe('ListContainer', () => {
+  it('renders correctly', () => {
+    render(<ListContainer />);
+    expect(screen.getByRole('table')).toBeInTheDocument();
+  });
+});
 
 describe('List', () => {
-  const setUpComponent = (props: Partial<Props> = {}) => {
-    const {
-      consumerGroups,
-      orderBy,
-      sortOrder,
-      totalPages,
-      setConsumerGroupsSortOrderBy,
-    } = props;
+  const renderComponent = (props: Partial<Props> = {}) => {
+    const { consumerGroups, totalPages } = props;
     return render(
       <List
         consumerGroups={consumerGroups || []}
-        orderBy={orderBy || ConsumerGroupOrdering.NAME}
-        sortOrder={sortOrder || SortOrder.ASC}
-        setConsumerGroupsSortOrderBy={setConsumerGroupsSortOrderBy || jest.fn()}
         totalPages={totalPages || 1}
-        isFetched={'isFetched' in props ? !!props.isFetched : true}
       />
     );
   };
 
   it('renders empty table', () => {
-    setUpComponent();
+    renderComponent();
     expect(screen.getByRole('table')).toBeInTheDocument();
-    expect(screen.getByText('No active consumer groups')).toBeInTheDocument();
+    expect(
+      screen.getByText('No active consumer groups found')
+    ).toBeInTheDocument();
   });
 
   describe('consumerGroups are fetched', () => {
-    beforeEach(() => setUpComponent({ consumerGroups: consumerGroupMock }));
+    beforeEach(() => renderComponent({ consumerGroups: consumerGroupMock }));
 
     it('renders all rows with consumers', () => {
       expect(screen.getByText('groupId1')).toBeInTheDocument();
       expect(screen.getByText('groupId2')).toBeInTheDocument();
     });
 
-    describe('Testing the Ordering', () => {
-      it('should test the sort order functionality', async () => {
-        const thElement = screen.getByText(/consumer group id/i);
-        expect(thElement).toBeInTheDocument();
-        expect(thElement).toHaveStyle(`color:${theme.table.th.color.active}`);
-      });
-    });
-  });
-
-  describe('consumerGroups are fetched with custom parameters', () => {
-    it('should test the order by functionality of another element', async () => {
-      const sortOrder = jest.fn();
-      setUpComponent({
-        consumerGroups: consumerGroupMock,
-        setConsumerGroupsSortOrderBy: sortOrder,
-      });
-      const thElement = screen.getByText(/num of members/i);
-      expect(thElement).toBeInTheDocument();
-
-      userEvent.click(thElement);
-      expect(sortOrder).toBeCalled();
-    });
-
-    it('should view the ordered list with the right prop', () => {
-      setUpComponent({
-        consumerGroups: consumerGroupMock,
-        orderBy: ConsumerGroupOrdering.MEMBERS,
-      });
-      expect(screen.getByText(/num of members/i)).toHaveStyle(
-        `color:${theme.table.th.color.active}`
+    it('handles onRowClick', () => {
+      const row = screen.getByRole('row', { name: 'groupId1 0 1 1' });
+      expect(row).toBeInTheDocument();
+      userEvent.click(row);
+      expect(mockedUsedNavigate).toHaveBeenCalledWith(
+        clusterConsumerGroupDetailsPath(':clusterName', 'groupId1')
       );
     });
   });
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ListItem.spec.tsx
deleted file mode 100644
index 856271f5740..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/ListItem.spec.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import ListItem from 'components/ConsumerGroups/List/ListItem';
-import { ConsumerGroupState, ConsumerGroup } from 'generated-sources';
-import { screen } from '@testing-library/react';
-import { render } from 'lib/testHelpers';
-
-describe('List', () => {
-  const mockConsumerGroup = {
-    groupId: 'groupId',
-    members: 0,
-    topics: 1,
-    simple: false,
-    partitionAssignor: '',
-    coordinator: {
-      id: 1,
-      host: 'host',
-    },
-    partitions: [
-      {
-        consumerId: null,
-        currentOffset: 0,
-        endOffset: 0,
-        host: null,
-        messagesBehind: 0,
-        partition: 1,
-        topic: 'topic',
-      },
-    ],
-  };
-  const setupWrapper = (consumerGroup: ConsumerGroup) => (
-    <table>
-      <tbody>
-        <ListItem consumerGroup={consumerGroup} />
-      </tbody>
-    </table>
-  );
-
-  const getCell = () => screen.getAllByRole('cell')[5];
-
-  it('render empty ListItem', () => {
-    render(setupWrapper(mockConsumerGroup));
-    expect(screen.getByRole('row')).toBeInTheDocument();
-  });
-
-  it('renders item with stable status', () => {
-    render(
-      setupWrapper({
-        ...mockConsumerGroup,
-        state: ConsumerGroupState.STABLE,
-      })
-    );
-    expect(screen.getByRole('row')).toHaveTextContent(
-      ConsumerGroupState.STABLE
-    );
-  });
-
-  it('renders item with dead status', () => {
-    render(
-      setupWrapper({
-        ...mockConsumerGroup,
-        state: ConsumerGroupState.DEAD,
-      })
-    );
-    expect(getCell()).toHaveTextContent(ConsumerGroupState.DEAD);
-  });
-
-  it('renders item with empty status', () => {
-    render(
-      setupWrapper({
-        ...mockConsumerGroup,
-        state: ConsumerGroupState.EMPTY,
-      })
-    );
-    expect(getCell()).toHaveTextContent(ConsumerGroupState.EMPTY);
-  });
-
-  it('renders item with empty-string status', () => {
-    render(
-      setupWrapper({
-        ...mockConsumerGroup,
-        state: ConsumerGroupState.UNKNOWN,
-      })
-    );
-    expect(getCell()).toHaveTextContent(ConsumerGroupState.UNKNOWN);
-  });
-});
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/__test__/ConsumerGroups.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/__test__/ConsumerGroups.spec.tsx
index 7aedbd038c7..0e319e5bd39 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/__test__/ConsumerGroups.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/__test__/ConsumerGroups.spec.tsx
@@ -1,22 +1,27 @@
 import React from 'react';
-import { clusterConsumerGroupsPath, getNonExactPath } from 'lib/paths';
 import {
-  act,
-  screen,
-  waitFor,
-  waitForElementToBeRemoved,
-} from '@testing-library/react';
+  clusterConsumerGroupDetailsPath,
+  clusterConsumerGroupResetOffsetsPath,
+  clusterConsumerGroupsPath,
+  getNonExactPath,
+} from 'lib/paths';
+import { screen } from '@testing-library/react';
 import ConsumerGroups from 'components/ConsumerGroups/ConsumerGroups';
-import {
-  consumerGroups,
-  noConsumerGroupsResponse,
-} from 'redux/reducers/consumerGroups/__test__/fixtures';
 import { render, WithRoute } from 'lib/testHelpers';
-import fetchMock from 'fetch-mock';
-import { ConsumerGroupOrdering, SortOrder } from 'generated-sources';
 
 const clusterName = 'cluster1';
 
+jest.mock('components/ConsumerGroups/List/ListContainer', () => () => (
+  <div>ListContainerMock</div>
+));
+jest.mock('components/ConsumerGroups/Details/Details', () => () => (
+  <div>DetailsMock</div>
+));
+jest.mock(
+  'components/ConsumerGroups/Details/ResetOffsets/ResetOffsets',
+  () => () => <div>ResetOffsetsMock</div>
+);
+
 const renderComponent = (path?: string) =>
   render(
     <WithRoute path={getNonExactPath(clusterConsumerGroupsPath())}>
@@ -28,104 +33,18 @@ const renderComponent = (path?: string) =>
   );
 
 describe('ConsumerGroups', () => {
-  it('renders with initial state', async () => {
+  it('renders ListContainer', async () => {
     renderComponent();
-    expect(screen.getByRole('progressbar')).toBeInTheDocument();
+    expect(screen.getByText('ListContainerMock')).toBeInTheDocument();
   });
-
-  describe('Default Route and Fetching Consumer Groups', () => {
-    const url = `/api/clusters/${clusterName}/consumer-groups/paged`;
-    afterEach(() => {
-      fetchMock.reset();
-    });
-
-    it('renders empty table on no consumer group response', async () => {
-      fetchMock.getOnce(url, noConsumerGroupsResponse, {
-        query: {
-          orderBy: ConsumerGroupOrdering.NAME,
-          sortOrder: SortOrder.ASC,
-        },
-      });
-      await act(() => {
-        renderComponent();
-      });
-      expect(fetchMock.calls().length).toBe(1);
-      expect(screen.getByRole('table')).toBeInTheDocument();
-      expect(screen.getByText('No active consumer groups')).toBeInTheDocument();
-    });
-
-    it('renders with 404 from consumer groups', async () => {
-      const consumerGroupsMock = fetchMock.getOnce(url, 404, {
-        query: {
-          orderBy: ConsumerGroupOrdering.NAME,
-          sortOrder: SortOrder.ASC,
-        },
-      });
-
-      renderComponent();
-
-      await waitFor(() => expect(consumerGroupsMock.called()).toBeTruthy());
-
-      expect(screen.queryByText('Consumers')).not.toBeInTheDocument();
-      expect(screen.queryByRole('table')).not.toBeInTheDocument();
-    });
-
-    it('renders with 200 from consumer groups', async () => {
-      const consumerGroupsMock = fetchMock.getOnce(
-        url,
-        {
-          pagedCount: 1,
-          consumerGroups,
-        },
-        {
-          query: {
-            orderBy: ConsumerGroupOrdering.NAME,
-            sortOrder: SortOrder.ASC,
-          },
-        }
-      );
-
-      renderComponent();
-
-      await waitForElementToBeRemoved(() => screen.getByRole('progressbar'));
-      await waitFor(() => expect(consumerGroupsMock.called()).toBeTruthy());
-
-      expect(screen.getByText('Consumers')).toBeInTheDocument();
-      expect(screen.getByRole('table')).toBeInTheDocument();
-      expect(screen.getByText(consumerGroups[0].groupId)).toBeInTheDocument();
-      expect(screen.getByText(consumerGroups[1].groupId)).toBeInTheDocument();
-    });
-
-    it('renders with 200 from consumer groups with Searched Query ', async () => {
-      const searchResult = consumerGroups[0];
-      const searchText = searchResult.groupId;
-
-      const consumerGroupsMock = fetchMock.getOnce(
-        url,
-        {
-          pagedCount: 1,
-          consumerGroups: [searchResult],
-        },
-        {
-          query: {
-            orderBy: ConsumerGroupOrdering.NAME,
-            sortOrder: SortOrder.ASC,
-            search: searchText,
-          },
-        }
-      );
-
-      renderComponent(
-        `${clusterConsumerGroupsPath(clusterName)}?q=${searchText}`
-      );
-
-      await waitForElementToBeRemoved(() => screen.getByRole('progressbar'));
-      await waitFor(() => expect(consumerGroupsMock.called()).toBeTruthy());
-
-      expect(screen.getByText(searchText)).toBeInTheDocument();
-      expect(
-        screen.queryByText(consumerGroups[1].groupId)
-      ).not.toBeInTheDocument();
-    });
+  it('renders ResetOffsets', async () => {
+    renderComponent(
+      clusterConsumerGroupResetOffsetsPath(clusterName, 'groupId1')
+    );
+    expect(screen.getByText('ResetOffsetsMock')).toBeInTheDocument();
+  });
+  it('renders Details', async () => {
+    renderComponent(clusterConsumerGroupDetailsPath(clusterName, 'groupId1'));
+    expect(screen.getByText('DetailsMock')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
index 8ea83b54904..bbb0844d68a 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
@@ -1,10 +1,9 @@
 import React from 'react';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { KsqlStreamDescription, KsqlTableDescription } from 'generated-sources';
-import { useTableState } from 'lib/hooks/useTableState';
-import { SmartTable } from 'components/common/SmartTable/SmartTable';
-import { TableColumn } from 'components/common/SmartTable/TableColumn';
 import { ksqlRowData } from 'components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData';
+import Table from 'components/common/NewTable';
+import { ColumnDef } from '@tanstack/react-table';
 
 export enum KsqlDbItemType {
   Tables = 'tables',
@@ -31,27 +30,28 @@ export interface KsqlTableState {
 
 const KsqlDbItem: React.FC<KsqlDbItemProps> = ({ type, fetching, rows }) => {
   const preparedRows = rows[type]?.map(ksqlRowData) || [];
-  const tableState = useTableState<KsqlTableState, string>(preparedRows, {
-    idSelector: ({ name }) => name,
-    totalPages: 0,
-  });
+
+  const columns = React.useMemo<ColumnDef<KsqlTableState>[]>(
+    () => [
+      { header: 'Name', accessorKey: 'name' },
+      { header: 'Topic', accessorKey: 'topic' },
+      { header: 'Key Format', accessorKey: 'keyFormat' },
+      { header: 'Value Format', accessorKey: 'valueFormat' },
+      { header: 'Is Windowed', accessorKey: 'isWindowed' },
+    ],
+    []
+  );
 
   if (fetching) {
     return <PageLoader />;
   }
   return (
-    <SmartTable
-      tableState={tableState}
-      isFullwidth
-      placeholder="No tables or streams found"
-      hoverable
-    >
-      <TableColumn title="Name" field="name" />
-      <TableColumn title="Topic" field="topic" />
-      <TableColumn title="Key Format" field="keyFormat" />
-      <TableColumn title="Value Format" field="valueFormat" />
-      <TableColumn title="Is Windowed" field="isWindowed" />
-    </SmartTable>
+    <Table
+      data={preparedRows}
+      columns={columns}
+      emptyMessage="No tables or streams found"
+      enableSorting={false}
+    />
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
index e1be151503d..366f01c020d 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
@@ -7,59 +7,56 @@ import KsqlDbItem, {
 } from 'components/KsqlDb/List/KsqlDbItem/KsqlDbItem';
 import { screen } from '@testing-library/dom';
 import { fetchKsqlDbTablesPayload } from 'redux/reducers/ksqlDb/__test__/fixtures';
+import { act } from '@testing-library/react';
 
 describe('KsqlDbItem', () => {
   const tablesPathname = clusterKsqlDbTablesPath();
+  const renderComponent = (props: Partial<KsqlDbItemProps> = {}) => {
+    render(
+      <WithRoute path={tablesPathname}>
+        <KsqlDbItem
+          type={KsqlDbItemType.Tables}
+          fetching={false}
+          rows={{ tables: [], streams: [] }}
+          {...props}
+        />
+      </WithRoute>,
+      {
+        initialEntries: [clusterKsqlDbTablesPath()],
+      }
+    );
+  };
 
-  const component = (props: Partial<KsqlDbItemProps> = {}) => (
-    <WithRoute path={tablesPathname}>
-      <KsqlDbItem
-        type={KsqlDbItemType.Tables}
-        fetching={false}
-        rows={{ tables: [], streams: [] }}
-        {...props}
-      />
-    </WithRoute>
-  );
-
-  it('renders progressbar when fetching tables and streams', () => {
-    render(component({ fetching: true }), {
-      initialEntries: [clusterKsqlDbTablesPath()],
-    });
+  it('renders progressbar when fetching tables and streams', async () => {
+    await act(() => renderComponent({ fetching: true }));
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
   });
-  it('show no text if no data found', () => {
-    render(component({}), {
-      initialEntries: [clusterKsqlDbTablesPath()],
-    });
+
+  it('show no text if no data found', async () => {
+    await act(() => renderComponent({}));
     expect(screen.getByText('No tables or streams found')).toBeInTheDocument();
   });
-  it('renders with tables', () => {
-    render(
-      component({
+
+  it('renders with tables', async () => {
+    await act(() =>
+      renderComponent({
         rows: {
           tables: fetchKsqlDbTablesPayload.tables,
           streams: [],
         },
-      }),
-      {
-        initialEntries: [clusterKsqlDbTablesPath()],
-      }
+      })
     );
     expect(screen.getByRole('table').querySelectorAll('td')).toHaveLength(10);
   });
-  it('renders with streams', () => {
-    render(
-      component({
+  it('renders with streams', async () => {
+    await act(() =>
+      renderComponent({
         type: KsqlDbItemType.Streams,
         rows: {
           tables: [],
           streams: fetchKsqlDbTablesPayload.streams,
         },
-      }),
-      {
-        initialEntries: [clusterKsqlDbTablesPath()],
-      }
+      })
     );
     expect(screen.getByRole('table').querySelectorAll('td')).toHaveLength(10);
   });
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
index 15be8055ab3..b685485b551 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
@@ -3,15 +3,14 @@ import List from 'components/KsqlDb/List/List';
 import { render } from 'lib/testHelpers';
 import fetchMock from 'fetch-mock';
 import { screen } from '@testing-library/dom';
-
-const renderComponent = () => {
-  render(<List />);
-};
+import { act } from '@testing-library/react';
 
 describe('KsqlDb List', () => {
   afterEach(() => fetchMock.reset());
   it('renders List component with Tables and Streams tabs', async () => {
-    renderComponent();
+    await act(() => {
+      render(<List />);
+    });
 
     const Tables = screen.getByTitle('Tables');
     const Streams = screen.getByTitle('Streams');
diff --git a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
index 30540573823..c68380d3737 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
@@ -2,22 +2,21 @@ import React from 'react';
 import Select from 'components/common/Select/Select';
 import { CompatibilityLevelCompatibilityEnum } from 'generated-sources';
 import { useAppDispatch } from 'lib/hooks/redux';
-import usePagination from 'lib/hooks/usePagination';
-import useSearch from 'lib/hooks/useSearch';
 import useAppParams from 'lib/hooks/useAppParams';
 import { fetchSchemas } from 'redux/reducers/schemas/schemasSlice';
 import { ClusterNameRoute } from 'lib/paths';
 import { schemasApiClient } from 'lib/api';
 import { showServerError } from 'lib/errorHandling';
 import { useConfirm } from 'lib/hooks/useConfirm';
+import { useSearchParams } from 'react-router-dom';
+import { PER_PAGE } from 'lib/constants';
 
 import * as S from './GlobalSchemaSelector.styled';
 
 const GlobalSchemaSelector: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const dispatch = useAppDispatch();
-  const [searchText] = useSearch();
-  const { page, perPage } = usePagination();
+  const [searchParams] = useSearchParams();
   const confirm = useConfirm();
 
   const [currentCompatibilityLevel, setCurrentCompatibilityLevel] =
@@ -61,7 +60,12 @@ const GlobalSchemaSelector: React.FC = () => {
           });
           setCurrentCompatibilityLevel(nextLevel);
           dispatch(
-            fetchSchemas({ clusterName, page, perPage, search: searchText })
+            fetchSchemas({
+              clusterName,
+              page: Number(searchParams.get('page') || 1),
+              perPage: Number(searchParams.get('perPage') || PER_PAGE),
+              search: searchParams.get('q') || '',
+            })
           );
         } catch (e) {
           showServerError(e as Response);
diff --git a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx
index 34da3886d7c..e8e8bcc453f 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx
@@ -82,7 +82,7 @@ describe('GlobalSchemaSelector', () => {
       }
     );
     const getSchemasMock = fetchMock.getOnce(
-      `api/clusters/${clusterName}/schemas`,
+      `api/clusters/${clusterName}/schemas?page=1&perPage=25`,
       200
     );
     await waitFor(() => {
diff --git a/kafka-ui-react-app/src/components/Schemas/List/List.tsx b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
index f40171a1d48..8a1344f55e6 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
-import { ClusterNameRoute, clusterSchemaNewRelativePath } from 'lib/paths';
+import {
+  ClusterNameRoute,
+  clusterSchemaNewRelativePath,
+  clusterSchemaPath,
+} from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
-import * as C from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { Button } from 'components/common/Button/Button';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
@@ -13,36 +15,53 @@ import {
   getAreSchemasFulfilled,
   SCHEMAS_FETCH_ACTION,
 } from 'redux/reducers/schemas/schemasSlice';
-import usePagination from 'lib/hooks/usePagination';
 import PageLoader from 'components/common/PageLoader/PageLoader';
-import Pagination from 'components/common/Pagination/Pagination';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import Search from 'components/common/Search/Search';
 import useSearch from 'lib/hooks/useSearch';
 import PlusIcon from 'components/common/Icons/PlusIcon';
+import Table, { LinkCell } from 'components/common/NewTable';
+import { ColumnDef } from '@tanstack/react-table';
+import { SchemaSubject } from 'generated-sources';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import { PER_PAGE } from 'lib/constants';
 
-import ListItem from './ListItem';
 import GlobalSchemaSelector from './GlobalSchemaSelector/GlobalSchemaSelector';
 
 const List: React.FC = () => {
   const dispatch = useAppDispatch();
   const { isReadOnly } = React.useContext(ClusterContext);
   const { clusterName } = useAppParams<ClusterNameRoute>();
-
+  const navigate = useNavigate();
   const schemas = useAppSelector(selectAllSchemas);
   const isFetched = useAppSelector(getAreSchemasFulfilled);
   const totalPages = useAppSelector((state) => state.schemas.totalPages);
-
+  const [searchParams] = useSearchParams();
   const [searchText, handleSearchText] = useSearch();
-  const { page, perPage } = usePagination();
 
   React.useEffect(() => {
-    dispatch(fetchSchemas({ clusterName, page, perPage, search: searchText }));
+    dispatch(
+      fetchSchemas({
+        clusterName,
+        page: Number(searchParams.get('page') || 1),
+        perPage: Number(searchParams.get('perPage') || PER_PAGE),
+        search: searchParams.get('q') || '',
+      })
+    );
     return () => {
       dispatch(resetLoaderById(SCHEMAS_FETCH_ACTION));
     };
-  }, [clusterName, dispatch, page, perPage, searchText]);
+  }, [clusterName, dispatch, searchParams]);
+
+  const columns = React.useMemo<ColumnDef<SchemaSubject>[]>(
+    () => [
+      { header: 'Subject', accessorKey: 'subject', cell: LinkCell },
+      { header: 'Version', accessorKey: 'version' },
+      { header: 'Compatibility', accessorKey: 'compatibilityLevel' },
+    ],
+    []
+  );
 
   return (
     <>
@@ -68,31 +87,16 @@ const List: React.FC = () => {
         />
       </ControlPanelWrapper>
       {isFetched ? (
-        <>
-          <C.Table isFullwidth>
-            <thead>
-              <tr>
-                <TableHeaderCell title="Schema Name" />
-                <TableHeaderCell title="Version" />
-                <TableHeaderCell title="Compatibility" />
-              </tr>
-            </thead>
-            <tbody>
-              {schemas.length === 0 && (
-                <tr>
-                  <td colSpan={10}>No schemas found</td>
-                </tr>
-              )}
-              {schemas.map((subject) => (
-                <ListItem
-                  key={[subject.id, subject.subject].join('-')}
-                  subject={subject}
-                />
-              ))}
-            </tbody>
-          </C.Table>
-          <Pagination totalPages={totalPages} />
-        </>
+        <Table
+          columns={columns}
+          data={schemas}
+          pageCount={totalPages}
+          emptyMessage="No schemas found"
+          onRowClick={(row) =>
+            navigate(clusterSchemaPath(clusterName, row.original.subject))
+          }
+          serverSideProcessing
+        />
       ) : (
         <PageLoader />
       )}
diff --git a/kafka-ui-react-app/src/components/Schemas/List/ListItem.tsx b/kafka-ui-react-app/src/components/Schemas/List/ListItem.tsx
deleted file mode 100644
index be642fd6f1d..00000000000
--- a/kafka-ui-react-app/src/components/Schemas/List/ListItem.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import { SchemaSubject } from 'generated-sources';
-import { NavLink } from 'react-router-dom';
-import * as S from 'components/common/table/Table/TableKeyLink.styled';
-
-export interface ListItemProps {
-  subject: SchemaSubject;
-}
-
-const ListItem: React.FC<ListItemProps> = ({
-  subject: { subject, version, compatibilityLevel },
-}) => {
-  return (
-    <tr>
-      <S.TableKeyLink>
-        <NavLink to={subject} role="link">
-          {subject}
-        </NavLink>
-      </S.TableKeyLink>
-      <td role="cell">{version}</td>
-      <td role="cell">{compatibilityLevel}</td>
-    </tr>
-  );
-};
-
-export default ListItem;
diff --git a/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx
index 2f660472296..cefb32819ac 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import List from 'components/Schemas/List/List';
 import { render, WithRoute } from 'lib/testHelpers';
-import { clusterSchemasPath } from 'lib/paths';
+import { clusterSchemaPath, clusterSchemasPath } from 'lib/paths';
 import { act, screen } from '@testing-library/react';
 import {
   schemasFulfilledState,
@@ -15,12 +15,20 @@ import ClusterContext, {
 } from 'components/contexts/ClusterContext';
 import { RootState } from 'redux/interfaces';
 import fetchMock from 'fetch-mock';
+import userEvent from '@testing-library/user-event';
 
 import { schemasPayload, schemasEmptyPayload } from './fixtures';
 
+const mockedUsedNavigate = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockedUsedNavigate,
+}));
+
 const clusterName = 'testClusterName';
-const schemasAPIUrl = `/api/clusters/${clusterName}/schemas`;
-const schemasAPICompabilityUrl = `${schemasAPIUrl}/compatibility`;
+const schemasAPIUrl = `/api/clusters/${clusterName}/schemas?page=1&perPage=25`;
+const schemasAPICompabilityUrl = `/api/clusters/${clusterName}/schemas/compatibility`;
 const renderComponent = (
   initialState: RootState['schemas'] = schemasInitialState,
   context: ContextProps = contextInitialValue
@@ -101,6 +109,17 @@ describe('List', () => {
         expect(screen.getByText(schemaVersion1.subject)).toBeInTheDocument();
         expect(screen.getByText(schemaVersion2.subject)).toBeInTheDocument();
       });
+      it('handles onRowClick', () => {
+        const { subject, version, compatibilityLevel } = schemaVersion2;
+        const row = screen.getByRole('row', {
+          name: `${subject} ${version} ${compatibilityLevel}`,
+        });
+        expect(row).toBeInTheDocument();
+        userEvent.click(row);
+        expect(mockedUsedNavigate).toHaveBeenCalledWith(
+          clusterSchemaPath(clusterName, subject)
+        );
+      });
     });
 
     describe('responded with readonly cluster schemas', () => {
@@ -109,6 +128,7 @@ describe('List', () => {
           schemasAPIUrl,
           schemasPayload
         );
+        fetchMock.getOnce(schemasAPICompabilityUrl, 200);
         await act(() => {
           renderComponent(schemasFulfilledState, {
             ...contextInitialValue,
diff --git a/kafka-ui-react-app/src/components/Schemas/List/__test__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/Schemas/List/__test__/ListItem.spec.tsx
deleted file mode 100644
index 3f3213faaea..00000000000
--- a/kafka-ui-react-app/src/components/Schemas/List/__test__/ListItem.spec.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-import ListItem, { ListItemProps } from 'components/Schemas/List/ListItem';
-import { screen } from '@testing-library/react';
-import { render } from 'lib/testHelpers';
-
-import { schemas } from './fixtures';
-
-describe('ListItem', () => {
-  const setupComponent = (props: ListItemProps = { subject: schemas[0] }) =>
-    render(
-      <table>
-        <tbody>
-          <ListItem {...props} />
-        </tbody>
-      </table>
-    );
-
-  it('renders schemas', () => {
-    setupComponent();
-    expect(screen.getAllByRole('link').length).toEqual(1);
-    expect(screen.getAllByRole('cell').length).toEqual(3);
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Schemas/List/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Schemas/List/__test__/fixtures.ts
index 61cb7383e83..65bdd997410 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Schemas/List/__test__/fixtures.ts
@@ -3,7 +3,7 @@ import {
   schemaVersion2,
 } from 'redux/reducers/schemas/__test__/fixtures';
 
-export const schemas = [schemaVersion1, schemaVersion2];
+const schemas = [schemaVersion1, schemaVersion2];
 
 export const schemasPayload = {
   pageCount: 1,
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx
index a5153806c55..82551ac2502 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx
@@ -44,7 +44,7 @@ const TopicConsumerGroups: React.FC = () => {
             <td>{consumer.coordinator?.id}</td>
             <td>
               {consumer.state && (
-                <Tag color={getTagColor(consumer)}>{`${consumer.state
+                <Tag color={getTagColor(consumer.state)}>{`${consumer.state
                   .charAt(0)
                   .toUpperCase()}${consumer.state
                   .slice(1)
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
index 2f3efd7b537..8b238ab66d1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
@@ -69,22 +69,6 @@ export const MetadataMeta = styled.p`
   font-size: 12px;
 `;
 
-export const PaginationButton = styled.button`
-  display: flex;
-  align-items: center;
-  padding: 6px 12px;
-  height: 32px;
-  border: 1px solid ${({ theme }) => theme.pagination.borderColor.normal};
-  box-sizing: border-box;
-  border-radius: 4px;
-  color: ${({ theme }) => theme.pagination.color.normal};
-  background: none;
-  font-family: Inter;
-  margin-right: 13px;
-  cursor: pointer;
-  font-size: 14px;
-`;
-
 export const Tab = styled.button<{ $active?: boolean }>(
   ({ theme, $active }) => css`
     background-color: ${theme.secondaryTab.backgroundColor[
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.styled.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.styled.spec.tsx
deleted file mode 100644
index 526f7c90323..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.styled.spec.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import * as S from 'components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled';
-import { render } from 'lib/testHelpers';
-import { screen } from '@testing-library/react';
-import theme from 'theme/theme';
-
-describe('MessageContent Styled Components', () => {
-  describe('PaginationComponent', () => {
-    beforeEach(() => {
-      render(<S.PaginationButton />);
-    });
-    it('should test the Pagination Button theme related Props', () => {
-      const button = screen.getByRole('button');
-      expect(button).toHaveStyle(`color: ${theme.pagination.color.normal}`);
-      expect(button).toHaveStyle(
-        `border: 1px solid ${theme.pagination.borderColor.normal}`
-      );
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
index e1975abb6a5..d53c3d79028 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
@@ -3,8 +3,7 @@ import React from 'react';
 
 import * as S from './Table.styled';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const ExpanderCell: React.FC<CellContext<any, unknown>> = ({ row }) => (
+const ExpanderCell: React.FC<CellContext<unknown, unknown>> = ({ row }) => (
   <S.ExpaderButton
     width="16"
     height="20"
diff --git a/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx
new file mode 100644
index 00000000000..aa6b2e826ce
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { CellContext } from '@tanstack/react-table';
+import { NavLink } from 'react-router-dom';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const LinkCell: React.FC<CellContext<any, unknown>> = ({ getValue }) => {
+  const value = `${getValue<string | number>()}`;
+  const handleClick: React.MouseEventHandler = (e) => e.stopPropagation();
+  return (
+    <NavLink to={value} title={value} onClick={handleClick}>
+      {value}
+    </NavLink>
+  );
+};
+
+export default LinkCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/SelectRowCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/SelectRowCell.tsx
index 3f12583f014..5c212e1d561 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/SelectRowCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/SelectRowCell.tsx
@@ -2,8 +2,7 @@ import { CellContext } from '@tanstack/react-table';
 import React from 'react';
 import IndeterminateCheckbox from 'components/common/IndeterminateCheckbox/IndeterminateCheckbox';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const SelectRowCell: React.FC<CellContext<any, unknown>> = ({ row }) => (
+const SelectRowCell: React.FC<CellContext<unknown, unknown>> = ({ row }) => (
   <IndeterminateCheckbox
     checked={row.getIsSelected()}
     disabled={!row.getCanSelect()}
diff --git a/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx b/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx
index 48d78bf81b4..8121f3cd446 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx
@@ -2,8 +2,9 @@ import { HeaderContext } from '@tanstack/react-table';
 import React from 'react';
 import IndeterminateCheckbox from 'components/common/IndeterminateCheckbox/IndeterminateCheckbox';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const SelectRowHeader: React.FC<HeaderContext<any, unknown>> = ({ table }) => (
+const SelectRowHeader: React.FC<HeaderContext<unknown, unknown>> = ({
+  table,
+}) => (
   <IndeterminateCheckbox
     checked={table.getIsAllPageRowsSelected()}
     indeterminate={table.getIsSomePageRowsSelected()}
diff --git a/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
index 53b3577998a..00a60086d9d 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
@@ -3,8 +3,8 @@ import { CellContext } from '@tanstack/react-table';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const SizeCell: React.FC<CellContext<any, any>> = ({ getValue }) => (
-  <BytesFormatted value={getValue()} />
+const SizeCell: React.FC<CellContext<any, unknown>> = ({ getValue }) => (
+  <BytesFormatted value={getValue<string | number>()} />
 );
 
 export default SizeCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
index 83f4fdda5ce..5fc02176ee5 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
@@ -99,13 +99,13 @@ export const Th = styled.th<ThProps>(
 );
 
 interface RowProps {
-  expandable?: boolean;
+  clickable?: boolean;
   expanded?: boolean;
 }
 
 export const Row = styled.tr<RowProps>(
-  ({ theme: { table }, expanded, expandable }) => `
-  cursor: ${expandable ? 'pointer' : 'default'};
+  ({ theme: { table }, expanded, clickable }) => `
+  cursor: ${clickable ? 'pointer' : 'default'};
   background-color: ${table.tr.backgroundColor[expanded ? 'hover' : 'normal']};
   &:hover {
     background-color: ${table.tr.backgroundColor.hover};
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 80f5477fd1c..aaf02ea4082 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -28,13 +28,26 @@ export interface TableProps<TData> {
   data: TData[];
   pageCount?: number;
   columns: ColumnDef<TData>[];
-  renderSubComponent?: React.FC<{ row: Row<TData> }>;
-  getRowCanExpand?: (row: Row<TData>) => boolean;
+
+  // Server-side processing: sorting, pagination
   serverSideProcessing?: boolean;
-  enableSorting?: boolean;
-  enableRowSelection?: boolean | ((row: Row<TData>) => boolean);
-  batchActionsBar?: React.FC<{ rows: Row<TData>[]; resetRowSelection(): void }>;
+
+  // Expandeble rows
+  getRowCanExpand?: (row: Row<TData>) => boolean; // Enables the ability to expand row. Use `() => true` when want to expand all rows.
+  renderSubComponent?: React.FC<{ row: Row<TData> }>; // Component to render expanded row.
+
+  // Selectable rows
+  enableRowSelection?: boolean | ((row: Row<TData>) => boolean); // Enables the ability to select row.
+  batchActionsBar?: React.FC<{ rows: Row<TData>[]; resetRowSelection(): void }>; // Component to render batch actions bar for slected rows
+
+  // Sorting.
+  enableSorting?: boolean; // Enables sorting for table.
+
+  // Placeholder for empty table
   emptyMessage?: string;
+
+  // Handles row click. Can not be combined with `enableRowSelection` && expandable rows.
+  onRowClick?: (row: Row<TData>) => void;
 }
 
 type UpdaterFn<T> = (previousState: T) => T;
@@ -72,6 +85,7 @@ const getSortingFromSearchParams = (searchParams: URLSearchParams) => {
  *     `enableSorting = false` to the column def.
  *    - table component stores the sorting state in URLSearchParams. Use `sortBy` and `sortDirection`
  *      search param to set default sortings.
+ *    - use `id` property of the column def to set the sortBy for server side sorting.
  *
  * 2. Pagination
  *    - pagination enabled by default.
@@ -107,6 +121,7 @@ const Table: React.FC<TableProps<any>> = ({
   enableRowSelection = false,
   batchActionsBar,
   emptyMessage,
+  onRowClick,
 }) => {
   const [searchParams, setSearchParams] = useSearchParams();
   const [rowSelection, setRowSelection] = React.useState({});
@@ -157,6 +172,24 @@ const Table: React.FC<TableProps<any>> = ({
 
   const Bar = batchActionsBar;
 
+  const handleRowClick = (row: Row<typeof data>) => (e: React.MouseEvent) => {
+    // If row selection is enabled do not handle row click.
+    if (enableRowSelection) return undefined;
+
+    // If row can be expanded do not handle row click.
+    if (row.getCanExpand()) {
+      e.stopPropagation();
+      return row.toggleExpanded();
+    }
+
+    if (onRowClick) {
+      e.stopPropagation();
+      return onRowClick(row);
+    }
+
+    return undefined;
+  };
+
   return (
     <>
       {table.getSelectedRowModel().flatRows.length > 0 && Bar && (
@@ -205,9 +238,12 @@ const Table: React.FC<TableProps<any>> = ({
           {table.getRowModel().rows.map((row) => (
             <React.Fragment key={row.id}>
               <S.Row
-                expandable={row.getCanExpand()}
                 expanded={row.getIsExpanded()}
-                onClick={() => row.getCanExpand() && row.toggleExpanded()}
+                onClick={handleRowClick(row)}
+                clickable={
+                  !enableRowSelection &&
+                  (row.getCanExpand() || onRowClick !== undefined)
+                }
               >
                 {!!enableRowSelection && (
                   <td key={`${row.id}-select`}>
diff --git a/kafka-ui-react-app/src/components/common/NewTable/TagCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/TagCell.tsx
new file mode 100644
index 00000000000..c78d64a2dea
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/TagCell.tsx
@@ -0,0 +1,12 @@
+import { CellContext } from '@tanstack/react-table';
+import React from 'react';
+import getTagColor from 'components/common/Tag/getTagColor';
+import { Tag } from 'components/common/Tag/Tag.styled';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const TagCell: React.FC<CellContext<any, unknown>> = ({ getValue }) => {
+  const value = getValue<string>();
+  return <Tag color={getTagColor(value)}>{value}</Tag>;
+};
+
+export default TagCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/TimestampCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/TimestampCell.tsx
index 9c7475274cd..f0ff3d5f65f 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/TimestampCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/TimestampCell.tsx
@@ -5,8 +5,8 @@ import React from 'react';
 import * as S from './Table.styled';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const TimestampCell: React.FC<CellContext<any, any>> = ({ getValue }) => (
-  <S.Nowrap>{formatTimestamp(getValue())}</S.Nowrap>
+const TimestampCell: React.FC<CellContext<any, unknown>> = ({ getValue }) => (
+  <S.Nowrap>{formatTimestamp(getValue<string | number>())}</S.Nowrap>
 );
 
 export default TimestampCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index 3e4dddc4109..b6ca9811414 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -4,20 +4,54 @@ import Table, {
   TableProps,
   TimestampCell,
   SizeCell,
+  LinkCell,
+  TagCell,
 } from 'components/common/NewTable';
 import { screen, waitFor } from '@testing-library/dom';
 import { ColumnDef, Row } from '@tanstack/react-table';
 import userEvent from '@testing-library/user-event';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
 import { act } from '@testing-library/react';
+import { ConnectorState, ConsumerGroupState } from 'generated-sources';
+
+const mockedUsedNavigate = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockedUsedNavigate,
+}));
 
 type Datum = typeof data[0];
 
 const data = [
-  { timestamp: 1660034383725, text: 'lorem', selectable: false, size: 1234 },
-  { timestamp: 1660034399999, text: 'ipsum', selectable: true, size: 3 },
-  { timestamp: 1660034399922, text: 'dolor', selectable: true, size: 50000 },
-  { timestamp: 1660034199922, text: 'sit', selectable: false, size: 1_312_323 },
+  {
+    timestamp: 1660034383725,
+    text: 'lorem',
+    selectable: false,
+    size: 1234,
+    tag: ConnectorState.RUNNING,
+  },
+  {
+    timestamp: 1660034399999,
+    text: 'ipsum',
+    selectable: true,
+    size: 3,
+    tag: ConnectorState.FAILED,
+  },
+  {
+    timestamp: 1660034399922,
+    text: 'dolor',
+    selectable: true,
+    size: 50000,
+    tag: ConsumerGroupState.EMPTY,
+  },
+  {
+    timestamp: 1660034199922,
+    text: 'sit',
+    selectable: false,
+    size: 1_312_323,
+    tag: 'some_string',
+  },
 ];
 
 const columns: ColumnDef<Datum>[] = [
@@ -29,12 +63,18 @@ const columns: ColumnDef<Datum>[] = [
   {
     header: 'Text',
     accessorKey: 'text',
+    cell: LinkCell,
   },
   {
     header: 'Size',
     accessorKey: 'size',
     cell: SizeCell,
   },
+  {
+    header: 'Tag',
+    accessorKey: 'tag',
+    cell: TagCell,
+  },
 ];
 
 const ExpandedRow: React.FC = () => <div>I am expanded row</div>;
@@ -45,7 +85,7 @@ interface Props extends TableProps<Datum> {
 
 const renderComponent = (props: Partial<Props> = {}) => {
   render(
-    <WithRoute path="/">
+    <WithRoute path="/*">
       <Table
         columns={columns}
         data={data}
@@ -94,6 +134,21 @@ describe('Table', () => {
     ).toBeInTheDocument();
   });
 
+  describe('LinkCell', () => {
+    it('renders link', () => {
+      renderComponent();
+      expect(screen.getByRole('link', { name: 'lorem' })).toBeInTheDocument();
+    });
+
+    it('link click stops propagation', () => {
+      const onRowClick = jest.fn();
+      renderComponent({ onRowClick });
+      const link = screen.getByRole('link', { name: 'lorem' });
+      userEvent.click(link);
+      expect(onRowClick).not.toHaveBeenCalled();
+    });
+  });
+
   describe('ExpanderCell', () => {
     it('renders button', () => {
       renderComponent({ getRowCanExpand: () => true });
@@ -116,6 +171,14 @@ describe('Table', () => {
     });
   });
 
+  it('renders TagCell', () => {
+    renderComponent();
+    expect(screen.getByText(data[0].tag)).toBeInTheDocument();
+    expect(screen.getByText(data[1].tag)).toBeInTheDocument();
+    expect(screen.getByText(data[2].tag)).toBeInTheDocument();
+    expect(screen.getByText(data[3].tag)).toBeInTheDocument();
+  });
+
   describe('Pagination', () => {
     it('does not render page buttons', () => {
       renderComponent();
@@ -240,4 +303,34 @@ describe('Table', () => {
       expect(screen.getByText('I am Action Bar')).toBeInTheDocument();
     });
   });
+  describe('Clickable Row', () => {
+    const onRowClick = jest.fn();
+    it('handles onRowClick', () => {
+      renderComponent({ onRowClick });
+      const rows = screen.getAllByRole('row');
+      expect(rows.length).toEqual(data.length + 1);
+      userEvent.click(rows[1]);
+      expect(onRowClick).toHaveBeenCalledTimes(1);
+    });
+    it('does nothing unless onRowClick is provided', () => {
+      renderComponent();
+      const rows = screen.getAllByRole('row');
+      expect(rows.length).toEqual(data.length + 1);
+      userEvent.click(rows[1]);
+    });
+    it('does not handle onRowClick if enableRowSelection', () => {
+      renderComponent({ onRowClick, enableRowSelection: true });
+      const rows = screen.getAllByRole('row');
+      expect(rows.length).toEqual(data.length + 1);
+      userEvent.click(rows[1]);
+      expect(onRowClick).not.toHaveBeenCalled();
+    });
+    it('does not handle onRowClick if expandable rows', () => {
+      renderComponent({ onRowClick, getRowCanExpand: () => true });
+      const rows = screen.getAllByRole('row');
+      expect(rows.length).toEqual(data.length + 1);
+      userEvent.click(rows[1]);
+      expect(onRowClick).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/kafka-ui-react-app/src/components/common/NewTable/index.ts b/kafka-ui-react-app/src/components/common/NewTable/index.ts
index 08a5f85ad17..4584db2a564 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/index.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/index.ts
@@ -1,9 +1,11 @@
 import Table, { TableProps } from './Table';
 import TimestampCell from './TimestampCell';
 import SizeCell from './SizeCell';
+import LinkCell from './LinkCell';
+import TagCell from './TagCell';
 
 export type { TableProps };
 
-export { TimestampCell, SizeCell };
+export { TimestampCell, SizeCell, LinkCell, TagCell };
 
 export default Table;
diff --git a/kafka-ui-react-app/src/components/common/Pagination/PageControl.tsx b/kafka-ui-react-app/src/components/common/Pagination/PageControl.tsx
deleted file mode 100644
index 87254a72221..00000000000
--- a/kafka-ui-react-app/src/components/common/Pagination/PageControl.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-
-import { PaginationLink } from './Pagination.styled';
-
-export interface PageControlProps {
-  current: boolean;
-  url: string;
-  page: number;
-}
-
-const PageControl: React.FC<PageControlProps> = ({ current, url, page }) => {
-  return (
-    <li>
-      <PaginationLink
-        to={url}
-        aria-label={`Goto page ${page}`}
-        $isCurrent={current}
-        role="button"
-      >
-        {page}
-      </PaginationLink>
-    </li>
-  );
-};
-
-export default PageControl;
diff --git a/kafka-ui-react-app/src/components/common/Pagination/Pagination.styled.ts b/kafka-ui-react-app/src/components/common/Pagination/Pagination.styled.ts
deleted file mode 100644
index 5551e311a24..00000000000
--- a/kafka-ui-react-app/src/components/common/Pagination/Pagination.styled.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import styled from 'styled-components';
-import { Link } from 'react-router-dom';
-import theme from 'theme/theme';
-
-export const Wrapper = styled.nav`
-  display: flex;
-  align-items: flex-end;
-  padding: 25px 16px;
-  gap: 15px;
-
-  & > ul {
-    display: flex;
-    align-items: flex-end;
-
-    & > li:not(:last-child) {
-      margin-right: 12px;
-    }
-  }
-`;
-
-export const PaginationLink = styled(Link)<{ $isCurrent: boolean }>`
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  height: 32px;
-  width: 33px;
-
-  border-radius: 4px;
-  border: 1px solid
-    ${({ $isCurrent }) =>
-      $isCurrent
-        ? theme.pagination.currentPage
-        : theme.pagination.borderColor.normal};
-  background-color: ${({ $isCurrent }) =>
-    $isCurrent
-      ? theme.pagination.currentPage
-      : theme.pagination.backgroundColor};
-  color: ${theme.pagination.color.normal};
-
-  &:hover {
-    border: 1px solid
-      ${({ $isCurrent }) =>
-        $isCurrent
-          ? theme.pagination.currentPage
-          : theme.pagination.borderColor.hover};
-    color: ${(props) => props.theme.pagination.color.hover};
-    cursor: ${({ $isCurrent }) => ($isCurrent ? 'default' : 'pointer')};
-  }
-`;
-
-export const PaginationButton = styled(Link)`
-  display: flex;
-  align-items: center;
-  padding: 6px 12px;
-  height: 32px;
-  border: 1px solid ${theme.pagination.borderColor.normal};
-  border-radius: 4px;
-  color: ${theme.pagination.color.normal};
-
-  &:hover {
-    border: 1px solid ${theme.pagination.borderColor.hover};
-    color: ${theme.pagination.color.hover};
-    cursor: pointer;
-  }
-  &:active {
-    border: 1px solid ${theme.pagination.borderColor.active};
-    color: ${theme.pagination.color.active};
-  }
-  &:disabled {
-    border: 1px solid ${theme.pagination.borderColor.disabled};
-    color: ${theme.pagination.color.disabled};
-    cursor: not-allowed;
-  }
-`;
-
-export const DisabledButton = styled.button`
-  display: flex;
-  align-items: center;
-  padding: 6px 12px;
-  height: 32px;
-  border: 1px solid ${theme.pagination.borderColor.disabled};
-  background-color: ${theme.pagination.backgroundColor};
-  border-radius: 4px;
-  font-size: 16px;
-  color: ${theme.pagination.color.disabled};
-`;
diff --git a/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx b/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
deleted file mode 100644
index 46322856a26..00000000000
--- a/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { PER_PAGE } from 'lib/constants';
-import usePagination from 'lib/hooks/usePagination';
-import range from 'lodash/range';
-import React from 'react';
-import PageControl from 'components/common/Pagination/PageControl';
-import { useSearchParams } from 'react-router-dom';
-
-import * as S from './Pagination.styled';
-
-export interface PaginationProps {
-  totalPages: number;
-}
-
-const NEIGHBOURS = 2;
-
-const Pagination: React.FC<PaginationProps> = ({ totalPages }) => {
-  const { page, perPage, pathname } = usePagination();
-  const [searchParams] = useSearchParams();
-
-  const currentPage = page || 1;
-  const currentPerPage = perPage || PER_PAGE;
-
-  const getPath = (newPage: number) => {
-    searchParams.set('page', Math.max(newPage, 1).toString());
-    searchParams.set('perPage', currentPerPage.toString());
-    return `${pathname}?${searchParams.toString()}`;
-  };
-
-  const pages = React.useMemo(() => {
-    // Total visible numbers: neighbours, current, first & last
-    const totalNumbers = NEIGHBOURS * 2 + 3;
-    // totalNumbers + `...`*2
-    const totalBlocks = totalNumbers + 2;
-
-    if (totalPages <= totalBlocks) {
-      return range(1, totalPages + 1);
-    }
-
-    const startPage = Math.max(
-      2,
-      Math.min(currentPage - NEIGHBOURS, totalPages)
-    );
-    const endPage = Math.min(
-      totalPages - 1,
-      Math.min(currentPage + NEIGHBOURS, totalPages)
-    );
-
-    let p = range(startPage, endPage + 1);
-
-    const hasLeftSpill = startPage > 2;
-    const hasRightSpill = totalPages - endPage > 1;
-    const spillOffset = totalNumbers - (p.length + 1);
-
-    switch (true) {
-      case hasLeftSpill && !hasRightSpill: {
-        p = [...range(startPage - spillOffset - 1, startPage - 1), ...p];
-        break;
-      }
-
-      case !hasLeftSpill && hasRightSpill: {
-        p = [...p, ...range(endPage + 1, endPage + spillOffset + 1)];
-        break;
-      }
-
-      default:
-        break;
-    }
-
-    return p;
-  }, [currentPage, totalPages]);
-
-  return (
-    <S.Wrapper role="navigation" aria-label="pagination">
-      {currentPage > 1 ? (
-        <S.PaginationButton to={getPath(currentPage - 1)}>
-          Previous
-        </S.PaginationButton>
-      ) : (
-        <S.DisabledButton disabled>Previous</S.DisabledButton>
-      )}
-      {totalPages > 1 && (
-        <ul>
-          {!pages.includes(1) && (
-            <PageControl
-              page={1}
-              current={currentPage === 1}
-              url={getPath(1)}
-            />
-          )}
-          {!pages.includes(2) && (
-            <li>
-              <span>&hellip;</span>
-            </li>
-          )}
-          {pages.map((p) => (
-            <PageControl
-              key={`page-${p}`}
-              page={p}
-              current={p === currentPage}
-              url={getPath(p)}
-            />
-          ))}
-          {!pages.includes(totalPages - 1) && (
-            <li>
-              <span>&hellip;</span>
-            </li>
-          )}
-          {!pages.includes(totalPages) && (
-            <PageControl
-              page={totalPages}
-              current={currentPage === totalPages}
-              url={getPath(totalPages)}
-            />
-          )}
-        </ul>
-      )}
-      {currentPage < totalPages ? (
-        <S.PaginationButton to={getPath(currentPage + 1)}>
-          Next
-        </S.PaginationButton>
-      ) : (
-        <S.DisabledButton disabled>Next</S.DisabledButton>
-      )}
-    </S.Wrapper>
-  );
-};
-
-export default Pagination;
diff --git a/kafka-ui-react-app/src/components/common/Pagination/__tests__/PageControl.spec.tsx b/kafka-ui-react-app/src/components/common/Pagination/__tests__/PageControl.spec.tsx
deleted file mode 100644
index 5e2c37471c5..00000000000
--- a/kafka-ui-react-app/src/components/common/Pagination/__tests__/PageControl.spec.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import PageControl, {
-  PageControlProps,
-} from 'components/common/Pagination/PageControl';
-import { screen } from '@testing-library/react';
-import { render } from 'lib/testHelpers';
-import theme from 'theme/theme';
-
-const page = 138;
-
-describe('PageControl', () => {
-  const setupComponent = (props: Partial<PageControlProps> = {}) =>
-    render(<PageControl url="/test" page={page} current {...props} />);
-
-  const getButton = () => screen.getByRole('button');
-
-  it('renders current page', () => {
-    setupComponent({ current: true });
-    expect(getButton()).toHaveStyle(
-      `background-color: ${theme.pagination.currentPage}`
-    );
-  });
-
-  it('renders non-current page', () => {
-    setupComponent({ current: false });
-    expect(getButton()).toHaveStyle(
-      `background-color: ${theme.pagination.backgroundColor}`
-    );
-  });
-
-  it('renders page number', () => {
-    setupComponent({ current: false });
-    expect(getButton()).toHaveTextContent(String(page));
-  });
-});
diff --git a/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx b/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx
deleted file mode 100644
index 52fbd355bf4..00000000000
--- a/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import React from 'react';
-import Pagination, {
-  PaginationProps,
-} from 'components/common/Pagination/Pagination';
-import theme from 'theme/theme';
-import { render } from 'lib/testHelpers';
-import { screen } from '@testing-library/react';
-
-describe('Pagination', () => {
-  const setupComponent = (
-    search = '',
-    props: Partial<PaginationProps> = {}
-  ) => {
-    const defaultPath = '/my/test/path/23';
-    const pathName = search ? `${defaultPath}${search}` : defaultPath;
-    return render(<Pagination totalPages={11} {...props} />, {
-      initialEntries: [pathName],
-    });
-  };
-
-  describe('next & prev buttons', () => {
-    it('renders disable prev button and enabled next link', () => {
-      setupComponent('?page=1');
-      expect(screen.getByText('Previous')).toBeDisabled();
-      expect(screen.getByText('Next')).toBeInTheDocument();
-    });
-
-    it('renders disable next button and enabled prev link', () => {
-      setupComponent('?page=11');
-      expect(screen.getByText('Previous')).toBeInTheDocument();
-      expect(screen.getByText('Next')).toBeDisabled();
-    });
-
-    it('renders next & prev links with correct path', () => {
-      setupComponent('?page=5&perPage=20');
-      expect(screen.getByText('Previous')).toBeInTheDocument();
-      expect(screen.getByText('Next')).toBeInTheDocument();
-      expect(screen.getByText('Previous')).toHaveAttribute(
-        'href',
-        '/my/test/path/23?page=4&perPage=20'
-      );
-      expect(screen.getByText('Next')).toHaveAttribute(
-        'href',
-        '/my/test/path/23?page=6&perPage=20'
-      );
-    });
-  });
-
-  describe('spread', () => {
-    it('renders 1 spread element after first page control', () => {
-      setupComponent('?page=8');
-      expect(screen.getAllByRole('listitem')[1]).toHaveTextContent('…');
-    });
-
-    it('renders 1 spread element before last spread control', () => {
-      setupComponent('?page=2');
-      expect(screen.getAllByRole('listitem')[7]).toHaveTextContent('…');
-    });
-
-    it('renders 2 spread elements', () => {
-      setupComponent('?page=6');
-      expect(screen.getAllByText('…').length).toEqual(2);
-      expect(screen.getAllByRole('listitem')[0]).toHaveTextContent('1');
-      expect(screen.getAllByRole('listitem')[1]).toHaveTextContent('…');
-      expect(screen.getAllByRole('listitem')[7]).toHaveTextContent('…');
-      expect(screen.getAllByRole('listitem')[8]).toHaveTextContent('11');
-    });
-
-    it('renders 0 spread elements', () => {
-      setupComponent('?page=2', { totalPages: 8 });
-      expect(screen.queryAllByText('…').length).toEqual(0);
-      expect(screen.getAllByRole('listitem').length).toEqual(8);
-    });
-  });
-
-  describe('current page', () => {
-    it('check if it sets page 8 as current when page param is set', () => {
-      setupComponent('?page=8');
-      expect(screen.getByText('8')).toHaveStyle(
-        `background-color: ${theme.pagination.currentPage}`
-      );
-    });
-
-    it('check if it sets first page as current when page param not set', () => {
-      setupComponent('', { totalPages: 8 });
-      expect(screen.getByText('1')).toHaveStyle(
-        `background-color: ${theme.pagination.currentPage}`
-      );
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/common/SmartTable/SmartTable.tsx b/kafka-ui-react-app/src/components/common/SmartTable/SmartTable.tsx
deleted file mode 100644
index 2d1dfdda13e..00000000000
--- a/kafka-ui-react-app/src/components/common/SmartTable/SmartTable.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import React from 'react';
-import Pagination from 'components/common/Pagination/Pagination';
-import { Table } from 'components/common/table/Table/Table.styled';
-import * as S from 'components/common/table/TableHeaderCell/TableHeaderCell.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import { TableState } from 'lib/hooks/useTableState';
-
-import {
-  isColumnElement,
-  SelectCell,
-  TableHeaderCellProps,
-} from './TableColumn';
-import { TableRow } from './TableRow';
-
-interface SmartTableProps<T, TId extends IdType> {
-  tableState: TableState<T, TId>;
-  allSelectable?: boolean;
-  selectable?: boolean;
-  className?: string;
-  placeholder?: string;
-  isFullwidth?: boolean;
-  paginated?: boolean;
-  hoverable?: boolean;
-}
-
-export const SmartTable = <T, TId extends IdType>({
-  children,
-  tableState,
-  selectable = false,
-  allSelectable = false,
-  placeholder = 'No Data Found',
-  isFullwidth = false,
-  paginated = false,
-  hoverable = false,
-}: React.PropsWithChildren<SmartTableProps<T, TId>>) => {
-  const handleRowSelection = (row: T, checked: boolean) => {
-    tableState.setRowsSelection([row], checked);
-  };
-
-  const headerRow = React.useMemo(() => {
-    const headerCells = React.Children.map(children, (child) => {
-      if (!isColumnElement<T, TId>(child)) {
-        return child;
-      }
-
-      const { headerCell, title, orderValue } = child.props;
-
-      const HeaderCell = headerCell as React.FC<TableHeaderCellProps<T, TId>>;
-      return HeaderCell ? (
-        <S.TableHeaderCell>
-          <HeaderCell
-            orderValue={orderValue}
-            orderable={tableState.orderable}
-            tableState={tableState}
-          />
-        </S.TableHeaderCell>
-      ) : (
-        // TODO types will be changed after fixing TableHeaderCell
-        <TableHeaderCell
-          {...tableState.orderable}
-          orderValue={orderValue}
-          title={title}
-        />
-      );
-    });
-    let checkboxElement = null;
-
-    if (selectable) {
-      checkboxElement = allSelectable ? (
-        <SelectCell
-          rowIndex={-1}
-          el="th"
-          selectable
-          selected={tableState.selectedCount === tableState.data.length}
-          onChange={tableState.toggleSelection}
-        />
-      ) : (
-        <S.TableHeaderCell />
-      );
-    }
-
-    return (
-      <tr>
-        {checkboxElement}
-        {headerCells}
-      </tr>
-    );
-  }, [children, allSelectable, tableState]);
-
-  const bodyRows = React.useMemo(() => {
-    if (tableState.data.length === 0) {
-      const colspan = React.Children.count(children) + +selectable;
-      return (
-        <tr>
-          <td colSpan={colspan}>{placeholder}</td>
-        </tr>
-      );
-    }
-    return tableState.data.map((dataItem, index) => {
-      return (
-        <TableRow
-          key={tableState.idSelector(dataItem)}
-          index={index}
-          hoverable={hoverable}
-          dataItem={dataItem}
-          tableState={tableState}
-          selectable={selectable}
-          onSelectChange={handleRowSelection}
-        >
-          {children}
-        </TableRow>
-      );
-    });
-  }, [
-    children,
-    handleRowSelection,
-    hoverable,
-    placeholder,
-    selectable,
-    tableState,
-  ]);
-
-  return (
-    <>
-      <Table isFullwidth={isFullwidth}>
-        <thead>{headerRow}</thead>
-        <tbody>{bodyRows}</tbody>
-      </Table>
-      {paginated && tableState.totalPages !== undefined && (
-        <Pagination totalPages={tableState.totalPages} />
-      )}
-    </>
-  );
-};
diff --git a/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx b/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
deleted file mode 100644
index 8044999ee22..00000000000
--- a/kafka-ui-react-app/src/components/common/SmartTable/TableColumn.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React from 'react';
-import { TableState } from 'lib/hooks/useTableState';
-import { SortOrder } from 'generated-sources';
-import * as S from 'components/common/table/TableHeaderCell/TableHeaderCell.styled';
-import { DefaultTheme, StyledComponent } from 'styled-components';
-
-export interface OrderableProps {
-  orderBy: string | null;
-  sortOrder: SortOrder;
-  handleOrderBy: (orderBy: string | null) => void;
-}
-
-interface TableCellPropsBase<T, TId extends IdType> {
-  tableState: TableState<T, TId>;
-}
-
-export interface TableHeaderCellProps<T, TId extends IdType>
-  extends TableCellPropsBase<T, TId> {
-  orderable?: OrderableProps;
-  orderValue?: string;
-}
-
-export interface TableCellProps<T, TId extends IdType>
-  extends TableCellPropsBase<T, TId> {
-  rowIndex: number;
-  dataItem: T;
-  hovered?: boolean;
-}
-
-interface TableColumnProps<T, TId extends IdType> {
-  cell?: React.FC<TableCellProps<T, TId>>;
-  children?: React.ReactElement;
-  headerCell?: React.FC<TableHeaderCellProps<T, TId>>;
-  field?: string;
-  title?: string;
-  maxWidth?: string;
-  className?: string;
-  orderValue?: string;
-  customTd?: typeof S.Td;
-}
-
-export const TableColumn = <T, TId extends IdType>(
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _props: React.PropsWithChildren<TableColumnProps<T, TId>>
-): React.ReactElement => {
-  return <td />;
-};
-
-export function isColumnElement<T, TId extends IdType>(
-  element: React.ReactNode
-): element is React.ReactElement<TableColumnProps<T, TId>> {
-  if (!React.isValidElement(element)) {
-    return false;
-  }
-
-  const elementType = (element as React.ReactElement).type;
-  return (
-    elementType === TableColumn ||
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (elementType as any).originalType === TableColumn
-  );
-}
-
-interface SelectCellProps {
-  selected: boolean;
-  selectable: boolean;
-  el: 'td' | 'th';
-  rowIndex: number;
-  onChange: (checked: boolean) => void;
-}
-
-export const SelectCell: React.FC<SelectCellProps> = ({
-  selected,
-  selectable,
-  rowIndex,
-  onChange,
-  el,
-}) => {
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    onChange(e.target.checked);
-  };
-
-  let El: 'td' | StyledComponent<'th', DefaultTheme>;
-  if (el === 'th') {
-    El = S.TableHeaderCell;
-  } else {
-    El = el;
-  }
-
-  return (
-    <El>
-      {selectable && (
-        <input
-          data-row={rowIndex}
-          onChange={handleChange}
-          type="checkbox"
-          checked={selected}
-        />
-      )}
-    </El>
-  );
-};
diff --git a/kafka-ui-react-app/src/components/common/SmartTable/TableRow.tsx b/kafka-ui-react-app/src/components/common/SmartTable/TableRow.tsx
deleted file mode 100644
index 3adb30ce33d..00000000000
--- a/kafka-ui-react-app/src/components/common/SmartTable/TableRow.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import { propertyLookup } from 'lib/propertyLookup';
-import { TableState } from 'lib/hooks/useTableState';
-import { Td } from 'components/common/table/TableHeaderCell/TableHeaderCell.styled';
-
-import { isColumnElement, SelectCell, TableCellProps } from './TableColumn';
-
-interface TableRowProps<T, TId extends IdType = never> {
-  index: number;
-  id?: TId;
-  hoverable?: boolean;
-  tableState: TableState<T, TId>;
-  dataItem: T;
-  selectable: boolean;
-  onSelectChange?: (row: T, checked: boolean) => void;
-}
-
-export const TableRow = <T, TId extends IdType>({
-  children,
-  hoverable = false,
-  id,
-  index,
-  dataItem,
-  selectable,
-  tableState,
-  onSelectChange,
-}: React.PropsWithChildren<TableRowProps<T, TId>>): React.ReactElement => {
-  const [hovered, setHovered] = React.useState(false);
-
-  const handleMouseEnter = () => {
-    setHovered(true);
-  };
-
-  const handleMouseLeave = () => {
-    setHovered(false);
-  };
-
-  const handleSelectChange = (checked: boolean) => {
-    onSelectChange?.(dataItem, checked);
-  };
-
-  return (
-    <tr
-      tabIndex={index}
-      id={id as string}
-      onMouseEnter={hoverable ? handleMouseEnter : undefined}
-      onMouseLeave={hoverable ? handleMouseLeave : undefined}
-    >
-      {selectable && (
-        <SelectCell
-          rowIndex={index}
-          el="td"
-          selectable={tableState.isRowSelectable(dataItem)}
-          selected={tableState.selectedIds.has(tableState.idSelector(dataItem))}
-          onChange={handleSelectChange}
-        />
-      )}
-      {React.Children.map(children, (child) => {
-        if (!isColumnElement<T, TId>(child)) {
-          return child;
-        }
-        const { cell, field, maxWidth, customTd } = child.props;
-
-        const Cell = cell as React.FC<TableCellProps<T, TId>> | undefined;
-        const TdComponent = customTd || Td;
-
-        const content = Cell ? (
-          <Cell
-            tableState={tableState}
-            hovered={hovered}
-            rowIndex={index}
-            dataItem={dataItem}
-          />
-        ) : (
-          field && propertyLookup(field, dataItem)
-        );
-
-        return (
-          <TdComponent maxWidth={maxWidth}>
-            {content as React.ReactNode}
-          </TdComponent>
-        );
-      })}
-    </tr>
-  );
-};
diff --git a/kafka-ui-react-app/src/components/common/Tag/Tag.styled.tsx b/kafka-ui-react-app/src/components/common/Tag/Tag.styled.tsx
index 7884dc24089..32a5784be33 100644
--- a/kafka-ui-react-app/src/components/common/Tag/Tag.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/Tag/Tag.styled.tsx
@@ -4,7 +4,7 @@ interface Props {
   color: 'green' | 'gray' | 'yellow' | 'red' | 'white' | 'blue';
 }
 
-export const Tag = styled.p<Props>`
+export const Tag = styled.span.attrs({ role: 'widget' })<Props>`
   border: none;
   border-radius: 16px;
   height: 20px;
@@ -17,4 +17,5 @@ export const Tag = styled.p<Props>`
   padding-right: 0.75em;
   text-align: center;
   width: max-content;
+  margin: 2px 0;
 `;
diff --git a/kafka-ui-react-app/src/components/common/Tag/getTagColor.ts b/kafka-ui-react-app/src/components/common/Tag/getTagColor.ts
index a91b7b0d45c..d52c6676266 100644
--- a/kafka-ui-react-app/src/components/common/Tag/getTagColor.ts
+++ b/kafka-ui-react-app/src/components/common/Tag/getTagColor.ts
@@ -1,14 +1,6 @@
-import {
-  ConnectorState,
-  ConnectorStatus,
-  ConsumerGroup,
-  ConsumerGroupState,
-  TaskStatus,
-} from 'generated-sources';
+import { ConnectorState, ConsumerGroupState } from 'generated-sources';
 
-const getTagColor = ({
-  state,
-}: ConnectorStatus | TaskStatus | ConsumerGroup) => {
+const getTagColor = (state?: string) => {
   switch (state) {
     case ConnectorState.RUNNING:
     case ConsumerGroupState.STABLE:
diff --git a/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts b/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
index 493c525b2d0..77301021557 100644
--- a/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
+++ b/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
@@ -21,7 +21,3 @@ const tableLinkMixin = css(
 export const TableKeyLink = styled.td`
   ${tableLinkMixin}
 `;
-
-export const SmartTableKeyLink = styled.div`
-  ${tableLinkMixin}
-`;
diff --git a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts
index 549da1d067b..bb486ea248a 100644
--- a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts
+++ b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts
@@ -67,12 +67,6 @@ const DESCMixin = css(
   `
 );
 
-export const Td = styled.td<{ maxWidth?: string }>`
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: ${(props) => props.maxWidth};
-`;
-
 export const Title = styled.span<TitleProps>(
   ({ isOrderable, isOrdered, sortOrder, theme: { table } }) => css`
     font-family: Inter, sans-serif;
diff --git a/kafka-ui-react-app/src/lib/__test__/propertyLookup.spec.ts b/kafka-ui-react-app/src/lib/__test__/propertyLookup.spec.ts
deleted file mode 100644
index 45f89b0a08f..00000000000
--- a/kafka-ui-react-app/src/lib/__test__/propertyLookup.spec.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { propertyLookup } from 'lib/propertyLookup';
-
-describe('Property Lookup', () => {
-  const entityObject = {
-    prop: {
-      nestedProp: 1,
-    },
-  };
-  it('returns undefined if property not found', () => {
-    expect(
-      propertyLookup('prop.nonExistingProp', entityObject)
-    ).toBeUndefined();
-  });
-
-  it('returns value of nested property if it exists', () => {
-    expect(propertyLookup('prop.nestedProp', entityObject)).toBe(1);
-  });
-});
diff --git a/kafka-ui-react-app/src/lib/hooks/usePagination.ts b/kafka-ui-react-app/src/lib/hooks/usePagination.ts
deleted file mode 100644
index 6ce01340535..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/usePagination.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useLocation } from 'react-router-dom';
-
-const usePagination = () => {
-  const { search, pathname } = useLocation();
-  const params = new URLSearchParams(search);
-
-  const page = params.get('page');
-  const perPage = params.get('perPage');
-
-  return {
-    page: page ? Number(page) : undefined,
-    perPage: perPage ? Number(perPage) : undefined,
-    pathname,
-  };
-};
-
-export default usePagination;
diff --git a/kafka-ui-react-app/src/lib/hooks/useTableState.ts b/kafka-ui-react-app/src/lib/hooks/useTableState.ts
deleted file mode 100644
index a9a6eb850aa..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/useTableState.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import React, { useCallback } from 'react';
-import { OrderableProps } from 'components/common/SmartTable/TableColumn';
-
-export interface TableState<T, TId extends IdType> {
-  data: T[];
-  selectedIds: Set<TId>;
-  totalPages?: number;
-  idSelector: (row: T) => TId;
-  isRowSelectable: (row: T) => boolean;
-  selectedCount: number;
-  setRowsSelection: (rows: T[], selected: boolean) => void;
-  toggleSelection: (selected: boolean) => void;
-  orderable?: OrderableProps;
-}
-
-export const useTableState = <T, TId extends IdType>(
-  data: T[],
-  options: {
-    totalPages: number;
-    isRowSelectable?: (row: T) => boolean;
-    idSelector: (row: T) => TId;
-  },
-  orderable?: OrderableProps
-): TableState<T, TId> => {
-  const [selectedIds, setSelectedIds] = React.useState(new Set<TId>());
-
-  const { idSelector, totalPages, isRowSelectable = () => true } = options;
-
-  const selectedCount = selectedIds.size;
-
-  const setRowsSelection = useCallback(
-    (rows: T[], selected: boolean) => {
-      rows.forEach((row) => {
-        const id = idSelector(row);
-        const newSet = new Set(selectedIds);
-        if (selected) {
-          newSet.add(id);
-        } else {
-          newSet.delete(id);
-        }
-        setSelectedIds(newSet);
-      });
-    },
-    [idSelector, selectedIds]
-  );
-
-  const toggleSelection = useCallback(
-    (selected: boolean) => {
-      const newSet = new Set(selected ? data.map((r) => idSelector(r)) : []);
-      setSelectedIds(newSet);
-    },
-    [data, idSelector]
-  );
-
-  return React.useMemo<TableState<T, TId>>(() => {
-    return {
-      data,
-      totalPages,
-      selectedIds,
-      orderable,
-      selectedCount,
-      idSelector,
-      isRowSelectable,
-      setRowsSelection,
-      toggleSelection,
-    };
-  }, [
-    data,
-    orderable,
-    selectedIds,
-    totalPages,
-    selectedCount,
-    idSelector,
-    isRowSelectable,
-    setRowsSelection,
-    toggleSelection,
-  ]);
-};
diff --git a/kafka-ui-react-app/src/lib/propertyLookup.ts b/kafka-ui-react-app/src/lib/propertyLookup.ts
deleted file mode 100644
index 6a563ca623d..00000000000
--- a/kafka-ui-react-app/src/lib/propertyLookup.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function propertyLookup<T extends { [key: string]: any }>(
-  path: string,
-  obj: T
-) {
-  return path.split('.').reduce((prev, curr) => {
-    return prev ? prev[curr] : null;
-  }, obj);
-}
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts
index 88caf4e6716..7c130ef472f 100644
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts
@@ -25,11 +25,6 @@ export const consumerGroups = [
   },
 ];
 
-export const noConsumerGroupsResponse = {
-  pageCount: 1,
-  consumerGroups: [],
-};
-
 export const consumerGroupPayload = {
   groupId: 'amazon.msk.canary.group.broker-1',
   members: 0,
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 44e3be86411..b890115d9b8 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -447,22 +447,6 @@ const theme = {
     },
     color: Colors.neutral[90],
   },
-  pagination: {
-    backgroundColor: Colors.neutral[0],
-    currentPage: Colors.neutral[10],
-    borderColor: {
-      normal: Colors.neutral[30],
-      hover: Colors.neutral[50],
-      active: Colors.neutral[70],
-      disabled: Colors.neutral[20],
-    },
-    color: {
-      normal: Colors.neutral[90],
-      hover: Colors.neutral[90],
-      active: Colors.neutral[90],
-      disabled: Colors.neutral[20],
-    },
-  },
   switch: {
     unchecked: Colors.brand[20],
     checked: Colors.brand[50],

From 8d3f098385c507471945ce77cc1d0001f2fc901a Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 15 Aug 2022 14:08:10 +0300
Subject: [PATCH 120/734] Use back link instead of breadcrumbs (#2430)

* Use back link instead of breadcrumbs

* Unify topic pages

* Unify topic page actions

* fix

* Remove unused test
---
 .../src/components/Brokers/Broker/Broker.tsx  |   7 +-
 .../src/components/Brokers/Brokers.tsx        |  19 +-
 .../Brokers/BrokersList/BrokersList.tsx       |   2 +-
 .../src/components/Cluster/Cluster.tsx        | 112 ++++-----
 .../src/components/Connect/Connect.tsx        |  31 +--
 .../Connect/Details/DetailsPage.tsx           |   7 +-
 .../src/components/Connect/New/New.tsx        |  12 +-
 .../ConsumerGroups/ConsumerGroups.tsx         |  25 +-
 .../ConsumerGroups/Details/Details.tsx        |   7 +-
 .../Details/ResetOffsets/ResetOffsets.tsx     |   8 +-
 .../src/components/KsqlDb/KsqlDb.tsx          |  19 +-
 .../src/components/KsqlDb/Query/Query.tsx     |   8 +-
 .../components/Schemas/Details/Details.tsx    |   7 +-
 .../src/components/Schemas/Diff/Diff.tsx      | 218 ++++++++++--------
 .../src/components/Schemas/Edit/Edit.tsx      |  12 +-
 .../src/components/Schemas/New/New.tsx        |  12 +-
 .../Schemas/New/__test__/New.spec.tsx         |   2 +-
 .../src/components/Schemas/Schemas.tsx        |  43 +---
 .../components/Topics/List/ActionsCell.tsx    |  28 ++-
 .../src/components/Topics/List/ListPage.tsx   |   2 +-
 .../src/components/Topics/New/New.tsx         |   8 +-
 .../Topics/New/__test__/New.spec.tsx          |   8 +-
 .../ConsumerGroups/TopicConsumerGroups.tsx    |   0
 .../__test__/TopicConsumerGroups.spec.tsx     |   2 +-
 .../Topics/Topic/Details/Details.tsx          | 201 ----------------
 .../Edit/DangerZone/DangerZone.styled.tsx     |   5 +-
 .../src/components/Topics/Topic/Edit/Edit.tsx |   2 -
 .../Topics/Topic/Edit/__test__/Edit.spec.tsx  |   6 +-
 .../Filters/AddEditFilterContainer.tsx        |   4 +-
 .../Messages/Filters/AddFilter.tsx            |   8 +-
 .../Messages/Filters/EditFilter.tsx           |   4 +-
 .../Messages/Filters/FilterModal.tsx          |   8 +-
 .../Messages/Filters/Filters.styled.ts        |   8 +-
 .../Messages/Filters/Filters.tsx              |   4 +-
 .../Messages/Filters/FiltersContainer.ts      |   0
 .../Messages/Filters/InfoModal.tsx            |   2 +-
 .../Messages/Filters/SavedFilters.tsx         |   0
 .../__tests__/AddEditFilterContainer.spec.tsx |   4 +-
 .../Filters/__tests__/AddFilter.spec.tsx      |   4 +-
 .../Filters/__tests__/EditFilter.spec.tsx     |   4 +-
 .../Filters/__tests__/FilterModal.spec.tsx    |   4 +-
 .../Filters/__tests__/Filters.spec.tsx        |   4 +-
 .../Filters/__tests__/Filters.styled.spec.tsx |   2 +-
 .../Filters/__tests__/InfoModal.spec.tsx      |   2 +-
 .../Filters/__tests__/SavedFilters.spec.tsx   |   4 +-
 .../{Details => }/Messages/Filters/utils.ts   |   0
 .../Topic/{Details => }/Messages/Message.tsx  |   0
 .../MessageContent/MessageContent.styled.ts   |   0
 .../MessageContent/MessageContent.tsx         |   0
 .../__tests__/MessageContent.spec.tsx         |   2 +-
 .../Topic/{Details => }/Messages/Messages.tsx |   0
 .../{Details => }/Messages/MessagesTable.tsx  |   0
 .../__test__/FiltersContainer.spec.tsx        |   9 +-
 .../Messages/__test__/Message.spec.tsx        |   6 +-
 .../Messages/__test__/Messages.spec.tsx       |   2 +-
 .../Messages/__test__/MessagesTable.spec.tsx  |   2 +-
 .../Messages/__test__/utils.spec.ts           |   2 +-
 .../{Details => }/Overview/Overview.styled.ts |   0
 .../Topic/{Details => }/Overview/Overview.tsx |   0
 .../Overview/__test__/Overview.spec.tsx       |   4 +-
 .../{Details => }/Settings/ConfigListItem.tsx |   0
 .../{Details => }/Settings/Settings.styled.ts |   0
 .../Topic/{Details => }/Settings/Settings.tsx |   0
 .../Settings/__test__/ConfigListItem.spec.tsx |   2 +-
 .../Settings/__test__/Settings.spec.tsx       |  16 +-
 .../Statistics/Indicators/SizeStats.tsx       |   0
 .../Statistics/Indicators/Total.tsx           |   0
 .../{Details => }/Statistics/Metrics.tsx      |   0
 .../Statistics/PartitionInfoRow.tsx           |   0
 .../Statistics/PartitionTable.tsx             |   0
 .../Statistics/Statistics.styles.ts           |   0
 .../{Details => }/Statistics/Statistics.tsx   |   0
 .../Statistics/__test__/Metrics.spec.tsx      |   2 +-
 .../Statistics/__test__/Statistics.spec.tsx   |   2 +-
 .../src/components/Topics/Topic/Topic.tsx     | 198 ++++++++++++++--
 .../Topic.spec.tsx}                           |  16 +-
 .../Topics/Topic/__tests__/Topic.spec.tsx     |  69 ------
 .../src/components/Topics/Topics.tsx          |  37 +--
 .../Topics/shared/Form/TopicForm.tsx          |  12 +-
 .../common/Breadcrumb/Breadcrumb.context.ts   |  16 --
 .../common/Breadcrumb/Breadcrumb.provider.tsx |  53 -----
 .../common/Breadcrumb/Breadcrumb.route.tsx    |  52 -----
 .../common/Breadcrumb/Breadcrumb.styled.ts    |  15 --
 .../common/Breadcrumb/Breadcrumb.tsx          |  49 ----
 .../Breadcrumb/__tests__/Breadcrumb.spec.tsx  |  40 ----
 .../ControlPanel/ControlPanel.styled.ts       |   2 +-
 .../common/Dropdown/Dropdown.styled.ts        |   8 +-
 .../components/common/Dropdown/Dropdown.tsx   |   4 +-
 .../src/components/common/Form/Form.styled.ts |   3 +-
 .../common/PageHeading/PageHeading.styled.ts  |  42 ++++
 .../common/PageHeading/PageHeading.tsx        |  36 ++-
 kafka-ui-react-app/src/lib/constants.ts       |   5 -
 kafka-ui-react-app/src/theme/theme.ts         |  13 +-
 93 files changed, 607 insertions(+), 991 deletions(-)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/ConsumerGroups/TopicConsumerGroups.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx (94%)
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/AddEditFilterContainer.tsx (95%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/AddFilter.tsx (88%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/EditFilter.tsx (83%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/FilterModal.tsx (82%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/Filters.styled.ts (97%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/Filters.tsx (99%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/FiltersContainer.ts (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/InfoModal.tsx (96%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/SavedFilters.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx (96%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/__tests__/AddFilter.spec.tsx (98%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/__tests__/EditFilter.spec.tsx (93%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/__tests__/FilterModal.spec.tsx (87%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/__tests__/Filters.spec.tsx (97%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/__tests__/Filters.styled.spec.tsx (90%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/__tests__/InfoModal.spec.tsx (84%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/__tests__/SavedFilters.spec.tsx (97%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Filters/utils.ts (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Message.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/MessageContent/MessageContent.styled.ts (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/MessageContent/MessageContent.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/MessageContent/__tests__/MessageContent.spec.tsx (97%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/Messages.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/MessagesTable.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/__test__/FiltersContainer.spec.tsx (59%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/__test__/Message.spec.tsx (94%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/__test__/Messages.spec.tsx (98%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/__test__/MessagesTable.spec.tsx (97%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Messages/__test__/utils.spec.ts (98%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Overview/Overview.styled.ts (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Overview/Overview.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Overview/__test__/Overview.spec.tsx (96%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Settings/ConfigListItem.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Settings/Settings.styled.ts (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Settings/Settings.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Settings/__test__/ConfigListItem.spec.tsx (95%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Settings/__test__/Settings.spec.tsx (83%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Statistics/Indicators/SizeStats.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Statistics/Indicators/Total.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Statistics/Metrics.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Statistics/PartitionInfoRow.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Statistics/PartitionTable.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Statistics/Statistics.styles.ts (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Statistics/Statistics.tsx (100%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Statistics/__test__/Metrics.spec.tsx (98%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details => }/Statistics/__test__/Statistics.spec.tsx (92%)
 rename kafka-ui-react-app/src/components/Topics/Topic/{Details/__test__/Details.spec.tsx => __test__/Topic.spec.tsx} (92%)
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/__tests__/Topic.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.context.ts
 delete mode 100644 kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.provider.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.route.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/PageHeading/PageHeading.styled.ts

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index ba3d3fcb4c9..fbe5fc432d6 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -8,6 +8,7 @@ import {
   clusterBrokerMetricsRelativePath,
   ClusterBrokerParam,
   clusterBrokerPath,
+  clusterBrokersPath,
 } from 'lib/paths';
 import { useClusterStats } from 'lib/hooks/api/clusters';
 import { useBrokers } from 'lib/hooks/api/brokers';
@@ -31,7 +32,11 @@ const Broker: React.FC = () => {
   );
   return (
     <>
-      <PageHeading text={`Broker ${brokerId}`} />
+      <PageHeading
+        text={`Broker ${brokerId}`}
+        backTo={clusterBrokersPath(clusterName)}
+        backText="Brokers"
+      />
       <Metrics.Wrapper>
         <Metrics.Section>
           <Metrics.Indicator label="Segment Size">
diff --git a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
index 76a5e4cad88..36f6a9d36d0 100644
--- a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
@@ -3,26 +3,11 @@ import { Route, Routes } from 'react-router-dom';
 import { getNonExactPath, RouteParams } from 'lib/paths';
 import BrokersList from 'components/Brokers/BrokersList/BrokersList';
 import Broker from 'components/Brokers/Broker/Broker';
-import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 
 const Brokers: React.FC = () => (
   <Routes>
-    <Route
-      index
-      element={
-        <BreadcrumbRoute>
-          <BrokersList />
-        </BreadcrumbRoute>
-      }
-    />
-    <Route
-      path={getNonExactPath(RouteParams.brokerId)}
-      element={
-        <BreadcrumbRoute>
-          <Broker />
-        </BreadcrumbRoute>
-      }
-    />
+    <Route index element={<BrokersList />} />
+    <Route path={getNonExactPath(RouteParams.brokerId)} element={<Broker />} />
   </Routes>
 );
 
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index bbe00458e6a..0cefb30fb04 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -60,7 +60,7 @@ const BrokersList: React.FC = () => {
 
   return (
     <>
-      <PageHeading text="Broker" />
+      <PageHeading text="Brokers" />
       <Metrics.Wrapper>
         <Metrics.Section title="Uptime">
           <Metrics.Indicator label="Total Broker">
diff --git a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
index e9758c96b63..11cc975b4ff 100644
--- a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
@@ -14,9 +14,6 @@ import {
   getNonExactPath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
-import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb';
-import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
-import { BreadcrumbProvider } from 'components/common/Breadcrumb/Breadcrumb.provider';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { useClusters } from 'lib/hooks/api/clusters';
 import Brokers from 'components/Brokers/Brokers';
@@ -60,84 +57,53 @@ const Cluster: React.FC = () => {
   }, [clusterName, data]);
 
   return (
-    <BreadcrumbProvider>
-      <Breadcrumb />
-      <Suspense fallback={<PageLoader />}>
-        <ClusterContext.Provider value={contextValue}>
-          <Routes>
+    <Suspense fallback={<PageLoader />}>
+      <ClusterContext.Provider value={contextValue}>
+        <Routes>
+          <Route
+            path={getNonExactPath(clusterBrokerRelativePath)}
+            element={<Brokers />}
+          />
+          <Route
+            path={getNonExactPath(clusterTopicsRelativePath)}
+            element={<Topics />}
+          />
+          <Route
+            path={getNonExactPath(clusterConsumerGroupsRelativePath)}
+            element={<ConsumerGroups />}
+          />
+          {contextValue.hasSchemaRegistryConfigured && (
             <Route
-              path={getNonExactPath(clusterBrokerRelativePath)}
-              element={
-                <BreadcrumbRoute>
-                  <Brokers />
-                </BreadcrumbRoute>
-              }
+              path={getNonExactPath(clusterSchemasRelativePath)}
+              element={<Schemas />}
             />
+          )}
+          {contextValue.hasKafkaConnectConfigured && (
             <Route
-              path={getNonExactPath(clusterTopicsRelativePath)}
-              element={
-                <BreadcrumbRoute>
-                  <Topics />
-                </BreadcrumbRoute>
-              }
+              path={getNonExactPath(clusterConnectsRelativePath)}
+              element={<Connect />}
             />
+          )}
+          {contextValue.hasKafkaConnectConfigured && (
             <Route
-              path={getNonExactPath(clusterConsumerGroupsRelativePath)}
-              element={
-                <BreadcrumbRoute>
-                  <ConsumerGroups />
-                </BreadcrumbRoute>
-              }
+              path={getNonExactPath(clusterConnectorsRelativePath)}
+              element={<Connect />}
             />
-            {contextValue.hasSchemaRegistryConfigured && (
-              <Route
-                path={getNonExactPath(clusterSchemasRelativePath)}
-                element={
-                  <BreadcrumbRoute>
-                    <Schemas />
-                  </BreadcrumbRoute>
-                }
-              />
-            )}
-            {contextValue.hasKafkaConnectConfigured && (
-              <Route
-                path={getNonExactPath(clusterConnectsRelativePath)}
-                element={
-                  <BreadcrumbRoute>
-                    <Connect />
-                  </BreadcrumbRoute>
-                }
-              />
-            )}
-            {contextValue.hasKafkaConnectConfigured && (
-              <Route
-                path={getNonExactPath(clusterConnectorsRelativePath)}
-                element={
-                  <BreadcrumbRoute>
-                    <Connect />
-                  </BreadcrumbRoute>
-                }
-              />
-            )}
-            {contextValue.hasKsqlDbConfigured && (
-              <Route
-                path={getNonExactPath(clusterKsqlDbRelativePath)}
-                element={
-                  <BreadcrumbRoute>
-                    <KsqlDb />
-                  </BreadcrumbRoute>
-                }
-              />
-            )}
+          )}
+          {contextValue.hasKsqlDbConfigured && (
             <Route
-              path="/"
-              element={<Navigate to={clusterBrokerRelativePath} replace />}
+              path={getNonExactPath(clusterKsqlDbRelativePath)}
+              element={<KsqlDb />}
             />
-          </Routes>
-          <Outlet />
-        </ClusterContext.Provider>
-      </Suspense>
-    </BreadcrumbProvider>
+          )}
+          <Route
+            path="/"
+            element={<Navigate to={clusterBrokerRelativePath} replace />}
+          />
+        </Routes>
+        <Outlet />
+      </ClusterContext.Provider>
+    </Suspense>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Connect/Connect.tsx b/kafka-ui-react-app/src/components/Connect/Connect.tsx
index 8f9453a2bbc..6689d249b44 100644
--- a/kafka-ui-react-app/src/components/Connect/Connect.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Connect.tsx
@@ -9,7 +9,6 @@ import {
   getNonExactPath,
   clusterConnectorsPath,
 } from 'lib/paths';
-import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 import useAppParams from 'lib/hooks/useAppParams';
 
 import ListPage from './List/ListPage';
@@ -22,37 +21,15 @@ const Connect: React.FC = () => {
 
   return (
     <Routes>
-      <Route
-        index
-        element={
-          <BreadcrumbRoute>
-            <ListPage />
-          </BreadcrumbRoute>
-        }
-      />
-      <Route
-        path={clusterConnectorNewRelativePath}
-        element={
-          <BreadcrumbRoute>
-            <New />
-          </BreadcrumbRoute>
-        }
-      />
+      <Route index element={<ListPage />} />
+      <Route path={clusterConnectorNewRelativePath} element={<New />} />
       <Route
         path={clusterConnectConnectorEditRelativePath}
-        element={
-          <BreadcrumbRoute>
-            <Edit />
-          </BreadcrumbRoute>
-        }
+        element={<Edit />}
       />
       <Route
         path={getNonExactPath(clusterConnectConnectorRelativePath)}
-        element={
-          <BreadcrumbRoute>
-            <DetailsPage />
-          </BreadcrumbRoute>
-        }
+        element={<DetailsPage />}
       />
       <Route
         path={clusterConnectConnectorsRelativePath}
diff --git a/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx b/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx
index 6741c3d4a0f..2ec9632b5e0 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx
@@ -7,6 +7,7 @@ import {
   clusterConnectConnectorPath,
   clusterConnectConnectorTasksPath,
   clusterConnectConnectorTasksRelativePath,
+  clusterConnectorsPath,
   RouterParamsClusterConnectConnector,
 } from 'lib/paths';
 import Navbar from 'components/common/Navigation/Navbar.styled';
@@ -24,7 +25,11 @@ const DetailsPage: React.FC = () => {
 
   return (
     <div>
-      <PageHeading text={connectorName}>
+      <PageHeading
+        text={connectorName}
+        backTo={clusterConnectorsPath(clusterName)}
+        backText="Connectors"
+      >
         <Actions />
       </PageHeading>
       <Navbar role="navigation">
diff --git a/kafka-ui-react-app/src/components/Connect/New/New.tsx b/kafka-ui-react-app/src/components/Connect/New/New.tsx
index a0070493a29..2040f238bd2 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/New.tsx
@@ -4,7 +4,11 @@ import useAppParams from 'lib/hooks/useAppParams';
 import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { ErrorMessage } from '@hookform/error-message';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { clusterConnectConnectorPath, ClusterNameRoute } from 'lib/paths';
+import {
+  clusterConnectConnectorPath,
+  clusterConnectorsPath,
+  ClusterNameRoute,
+} from 'lib/paths';
 import yup from 'lib/yupExtended';
 import Editor from 'components/common/Editor/Editor';
 import Select from 'components/common/Select/Select';
@@ -91,7 +95,11 @@ const New: React.FC = () => {
 
   return (
     <FormProvider {...methods}>
-      <PageHeading text="Create new connector" />
+      <PageHeading
+        text="Create new connector"
+        backTo={clusterConnectorsPath(clusterName)}
+        backText="Connectors"
+      />
       <S.NewConnectFormStyled
         onSubmit={handleSubmit(onSubmit)}
         aria-label="Create connect form"
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/ConsumerGroups.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/ConsumerGroups.tsx
index 8e7dfc4c305..b3f5ab4e027 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/ConsumerGroups.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/ConsumerGroups.tsx
@@ -3,7 +3,6 @@ import { Route, Routes } from 'react-router-dom';
 import Details from 'components/ConsumerGroups/Details/Details';
 import ListContainer from 'components/ConsumerGroups/List/ListContainer';
 import ResetOffsets from 'components/ConsumerGroups/Details/ResetOffsets/ResetOffsets';
-import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 import {
   clusterConsumerGroupResetOffsetsRelativePath,
   RouteParams,
@@ -12,29 +11,11 @@ import {
 const ConsumerGroups: React.FC = () => {
   return (
     <Routes>
-      <Route
-        index
-        element={
-          <BreadcrumbRoute>
-            <ListContainer />
-          </BreadcrumbRoute>
-        }
-      />
-      <Route
-        path={RouteParams.consumerGroupID}
-        element={
-          <BreadcrumbRoute>
-            <Details />
-          </BreadcrumbRoute>
-        }
-      />
+      <Route index element={<ListContainer />} />
+      <Route path={RouteParams.consumerGroupID} element={<Details />} />
       <Route
         path={clusterConsumerGroupResetOffsetsRelativePath}
-        element={
-          <BreadcrumbRoute>
-            <ResetOffsets />
-          </BreadcrumbRoute>
-        }
+        element={<ResetOffsets />}
       />
     </Routes>
   );
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index 74da5c0b093..912b88a8a38 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import useAppParams from 'lib/hooks/useAppParams';
 import {
   clusterConsumerGroupResetRelativePath,
+  clusterConsumerGroupsPath,
   ClusterGroupParam,
 } from 'lib/paths';
 import PageLoader from 'components/common/PageLoader/PageLoader';
@@ -64,7 +65,11 @@ const Details: React.FC = () => {
   return (
     <div>
       <div>
-        <PageHeading text={consumerGroupID}>
+        <PageHeading
+          text={consumerGroupID}
+          backTo={clusterConsumerGroupsPath(clusterName)}
+          backText="Consumers"
+        >
           {!isReadOnly && (
             <Dropdown>
               <DropdownItem onClick={onResetOffsets}>Reset offset</DropdownItem>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
index 838afa446e7..b8df3b56b83 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 import { ConsumerGroupOffsetsResetType } from 'generated-sources';
-import { ClusterGroupParam } from 'lib/paths';
+import { clusterConsumerGroupsPath, ClusterGroupParam } from 'lib/paths';
 import {
   Controller,
   FormProvider,
@@ -170,7 +170,11 @@ const ResetOffsets: React.FC = () => {
 
   return (
     <FormProvider {...methods}>
-      <PageHeading text="Reset offsets" />
+      <PageHeading
+        text="Reset offsets"
+        backTo={clusterConsumerGroupsPath(clusterName)}
+        backText="Consumers"
+      />
       <S.Wrapper>
         <form onSubmit={handleSubmit(onSubmit)}>
           <S.MainSelectors>
diff --git a/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx b/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx
index 8fc6f735e6d..12a3f8cbfa2 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx
@@ -3,27 +3,12 @@ import { Route, Routes } from 'react-router-dom';
 import { clusterKsqlDbQueryRelativePath } from 'lib/paths';
 import List from 'components/KsqlDb/List/List';
 import Query from 'components/KsqlDb/Query/Query';
-import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 
 const KsqlDb: React.FC = () => {
   return (
     <Routes>
-      <Route
-        path="/*"
-        element={
-          <BreadcrumbRoute>
-            <List />
-          </BreadcrumbRoute>
-        }
-      />
-      <Route
-        path={clusterKsqlDbQueryRelativePath}
-        element={
-          <BreadcrumbRoute>
-            <Query />
-          </BreadcrumbRoute>
-        }
-      />
+      <Route path="/*" element={<List />} />
+      <Route path={clusterKsqlDbQueryRelativePath} element={<Query />} />
     </Routes>
   );
 };
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
index d7ddd6df17c..efda3932175 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
@@ -8,9 +8,10 @@ import {
 import { getKsqlExecution } from 'redux/reducers/ksqlDb/selectors';
 import { BASE_PARAMS } from 'lib/constants';
 import { KsqlResponse, KsqlTableResponse } from 'generated-sources';
-import { ClusterNameRoute } from 'lib/paths';
+import { clusterKsqlDbPath, ClusterNameRoute } from 'lib/paths';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import { showAlert, showSuccessAlert } from 'lib/errorHandling';
+import PageHeading from 'components/common/PageHeading/PageHeading';
 
 import type { FormValues } from './QueryForm/QueryForm';
 import * as S from './Query.styled';
@@ -200,6 +201,11 @@ const Query: FC = () => {
 
   return (
     <>
+      <PageHeading
+        text="Query"
+        backText="KSQL DB"
+        backTo={clusterKsqlDbPath(clusterName)}
+      />
       <QueryForm
         fetching={fetching}
         hasResults={!!KSQLTable}
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index 4a9e0fa173a..847079f3da7 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -4,6 +4,7 @@ import {
   ClusterSubjectParam,
   clusterSchemaEditPageRelativePath,
   clusterSchemaSchemaComparePageRelativePath,
+  clusterSchemasPath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageLoader from 'components/common/PageLoader/PageLoader';
@@ -74,7 +75,11 @@ const Details: React.FC = () => {
   }
   return (
     <>
-      <PageHeading text={schema.subject}>
+      <PageHeading
+        text={schema.subject}
+        backText="Schema Registry"
+        backTo={clusterSchemasPath(clusterName)}
+      >
         {!isReadOnly && (
           <>
             <Button
diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
index 9747171c08e..d0016b46b44 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
@@ -1,6 +1,10 @@
 import React from 'react';
 import { SchemaSubject } from 'generated-sources';
-import { clusterSchemaComparePath, ClusterSubjectParam } from 'lib/paths';
+import {
+  clusterSchemaComparePath,
+  clusterSchemasPath,
+  ClusterSubjectParam,
+} from 'lib/paths';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import DiffViewer from 'components/common/DiffViewer/DiffViewer';
 import { useNavigate, useLocation } from 'react-router-dom';
@@ -13,6 +17,7 @@ import Select from 'components/common/Select/Select';
 import { useAppDispatch } from 'lib/hooks/redux';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 import useAppParams from 'lib/hooks/useAppParams';
+import PageHeading from 'components/common/PageHeading/PageHeading';
 
 import * as S from './Diff.styled';
 
@@ -66,109 +71,120 @@ const Diff: React.FC<DiffProps> = ({ versions, areVersionsFetched }) => {
   } = methods;
 
   return (
-    <S.Section>
-      {areVersionsFetched ? (
-        <S.DiffBox>
-          <S.DiffTilesWrapper>
-            <S.DiffTile>
-              <S.DiffVersionsSelect>
-                <Controller
-                  defaultValue={leftVersion}
-                  control={control}
-                  rules={{ required: true }}
-                  name="schemaType"
-                  render={({ field: { name } }) => (
-                    <Select
-                      id="left-select"
-                      name={name}
-                      value={
-                        leftVersion === '' ? versions[0].version : leftVersion
-                      }
-                      onChange={(event) => {
-                        navigate(
-                          clusterSchemaComparePath(clusterName, subject)
-                        );
-                        searchParams.set('leftVersion', event.toString());
-                        searchParams.set(
-                          'rightVersion',
+    <>
+      <PageHeading
+        text={`${subject} compare versions`}
+        backText="Schema Registry"
+        backTo={clusterSchemasPath(clusterName)}
+      />
+      <S.Section>
+        {areVersionsFetched ? (
+          <S.DiffBox>
+            <S.DiffTilesWrapper>
+              <S.DiffTile>
+                <S.DiffVersionsSelect>
+                  <Controller
+                    defaultValue={leftVersion}
+                    control={control}
+                    rules={{ required: true }}
+                    name="schemaType"
+                    render={({ field: { name } }) => (
+                      <Select
+                        id="left-select"
+                        name={name}
+                        value={
+                          leftVersion === '' ? versions[0].version : leftVersion
+                        }
+                        onChange={(event) => {
+                          navigate(
+                            clusterSchemaComparePath(clusterName, subject)
+                          );
+                          searchParams.set('leftVersion', event.toString());
+                          searchParams.set(
+                            'rightVersion',
+                            rightVersion === ''
+                              ? versions[0].version
+                              : rightVersion
+                          );
+                          navigate({
+                            search: `?${searchParams.toString()}`,
+                          });
+                          setLeftVersion(event.toString());
+                        }}
+                        minWidth="100%"
+                        disabled={isSubmitting}
+                        options={versions.map((type) => ({
+                          value: type.version,
+                          label: `Version ${type.version}`,
+                        }))}
+                      />
+                    )}
+                  />
+                </S.DiffVersionsSelect>
+              </S.DiffTile>
+              <S.DiffTile>
+                <S.DiffVersionsSelect>
+                  <Controller
+                    defaultValue={rightVersion}
+                    control={control}
+                    rules={{ required: true }}
+                    name="schemaType"
+                    render={({ field: { name } }) => (
+                      <Select
+                        id="right-select"
+                        name={name}
+                        value={
                           rightVersion === ''
                             ? versions[0].version
                             : rightVersion
-                        );
-                        navigate({
-                          search: `?${searchParams.toString()}`,
-                        });
-                        setLeftVersion(event.toString());
-                      }}
-                      minWidth="100%"
-                      disabled={isSubmitting}
-                      options={versions.map((type) => ({
-                        value: type.version,
-                        label: `Version ${type.version}`,
-                      }))}
-                    />
-                  )}
-                />
-              </S.DiffVersionsSelect>
-            </S.DiffTile>
-            <S.DiffTile>
-              <S.DiffVersionsSelect>
-                <Controller
-                  defaultValue={rightVersion}
-                  control={control}
-                  rules={{ required: true }}
-                  name="schemaType"
-                  render={({ field: { name } }) => (
-                    <Select
-                      id="right-select"
-                      name={name}
-                      value={
-                        rightVersion === '' ? versions[0].version : rightVersion
-                      }
-                      onChange={(event) => {
-                        navigate(
-                          clusterSchemaComparePath(clusterName, subject)
-                        );
-                        searchParams.set(
-                          'leftVersion',
-                          leftVersion === '' ? versions[0].version : leftVersion
-                        );
-                        searchParams.set('rightVersion', event.toString());
-                        navigate({
-                          search: `?${searchParams.toString()}`,
-                        });
-                        setRightVersion(event.toString());
-                      }}
-                      minWidth="100%"
-                      disabled={isSubmitting}
-                      options={versions.map((type) => ({
-                        value: type.version,
-                        label: `Version ${type.version}`,
-                      }))}
-                    />
-                  )}
-                />
-              </S.DiffVersionsSelect>
-            </S.DiffTile>
-          </S.DiffTilesWrapper>
-          <S.DiffWrapper>
-            <DiffViewer
-              value={[
-                getSchemaContent(versions, leftVersion),
-                getSchemaContent(versions, rightVersion),
-              ]}
-              setOptions={{
-                autoScrollEditorIntoView: true,
-              }}
-              isFixedHeight={false}
-              schemaType={getSchemaType(versions)}
-            />
-          </S.DiffWrapper>
-        </S.DiffBox>
-      ) : (
-        <PageLoader />
-      )}
-    </S.Section>
+                        }
+                        onChange={(event) => {
+                          navigate(
+                            clusterSchemaComparePath(clusterName, subject)
+                          );
+                          searchParams.set(
+                            'leftVersion',
+                            leftVersion === ''
+                              ? versions[0].version
+                              : leftVersion
+                          );
+                          searchParams.set('rightVersion', event.toString());
+                          navigate({
+                            search: `?${searchParams.toString()}`,
+                          });
+                          setRightVersion(event.toString());
+                        }}
+                        minWidth="100%"
+                        disabled={isSubmitting}
+                        options={versions.map((type) => ({
+                          value: type.version,
+                          label: `Version ${type.version}`,
+                        }))}
+                      />
+                    )}
+                  />
+                </S.DiffVersionsSelect>
+              </S.DiffTile>
+            </S.DiffTilesWrapper>
+            <S.DiffWrapper>
+              <DiffViewer
+                value={[
+                  getSchemaContent(versions, leftVersion),
+                  getSchemaContent(versions, rightVersion),
+                ]}
+                setOptions={{
+                  autoScrollEditorIntoView: true,
+                }}
+                isFixedHeight={false}
+                schemaType={getSchemaType(versions)}
+              />
+            </S.DiffWrapper>
+          </S.DiffBox>
+        ) : (
+          <PageLoader />
+        )}
+      </S.Section>
+    </>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
index 7f4ea4491b5..01ab9802faf 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
@@ -5,7 +5,11 @@ import {
   CompatibilityLevelCompatibilityEnum,
   SchemaType,
 } from 'generated-sources';
-import { clusterSchemaPath, ClusterSubjectParam } from 'lib/paths';
+import {
+  clusterSchemaPath,
+  clusterSchemasPath,
+  ClusterSubjectParam,
+} from 'lib/paths';
 import { NewSchemaSubjectRaw } from 'redux/interfaces';
 import Editor from 'components/common/Editor/Editor';
 import Select from 'components/common/Select/Select';
@@ -99,7 +103,11 @@ const Edit: React.FC = () => {
   }
   return (
     <FormProvider {...methods}>
-      <PageHeading text="Edit schema" />
+      <PageHeading
+        text="Edit"
+        backText="Schema Registry"
+        backTo={clusterSchemasPath(clusterName)}
+      />
       <S.EditWrapper>
         <form onSubmit={handleSubmit(onSubmit)}>
           <div>
diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.tsx b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
index 38bef9bc9b6..21afda96e0d 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
@@ -2,7 +2,11 @@ import React from 'react';
 import { NewSchemaSubjectRaw } from 'redux/interfaces';
 import { FormProvider, useForm, Controller } from 'react-hook-form';
 import { ErrorMessage } from '@hookform/error-message';
-import { ClusterNameRoute, clusterSchemaPath } from 'lib/paths';
+import {
+  ClusterNameRoute,
+  clusterSchemaPath,
+  clusterSchemasPath,
+} from 'lib/paths';
 import { SchemaType } from 'generated-sources';
 import { SCHEMA_NAME_VALIDATION_PATTERN } from 'lib/constants';
 import { useNavigate } from 'react-router-dom';
@@ -63,7 +67,11 @@ const New: React.FC = () => {
 
   return (
     <FormProvider {...methods}>
-      <PageHeading text="Create new schema" />
+      <PageHeading
+        text="Create"
+        backText="Schema Registry"
+        backTo={clusterSchemasPath(clusterName)}
+      />
       <S.Form onSubmit={handleSubmit(onSubmit)}>
         <div>
           <InputLabel>Subject *</InputLabel>
diff --git a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
index 01b9b1cd8b9..6c4972f78f0 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
@@ -22,7 +22,7 @@ describe('New Component', () => {
   });
 
   it('renders component', () => {
-    expect(screen.getByText('Create new schema')).toBeInTheDocument();
+    expect(screen.getByText('Create')).toBeInTheDocument();
   });
   it('submit button will be disabled while form fields are not filled', () => {
     const submitBtn = screen.getByRole('button', { name: /submit/i });
diff --git a/kafka-ui-react-app/src/components/Schemas/Schemas.tsx b/kafka-ui-react-app/src/components/Schemas/Schemas.tsx
index 45facd46a9e..36b18773fb0 100644
--- a/kafka-ui-react-app/src/components/Schemas/Schemas.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Schemas.tsx
@@ -11,50 +11,17 @@ import Details from 'components/Schemas/Details/Details';
 import New from 'components/Schemas/New/New';
 import Edit from 'components/Schemas/Edit/Edit';
 import DiffContainer from 'components/Schemas/Diff/DiffContainer';
-import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 
 const Schemas: React.FC = () => {
   return (
     <Routes>
-      <Route
-        index
-        element={
-          <BreadcrumbRoute>
-            <List />
-          </BreadcrumbRoute>
-        }
-      />
-      <Route
-        path={clusterSchemaNewRelativePath}
-        element={
-          <BreadcrumbRoute>
-            <New />
-          </BreadcrumbRoute>
-        }
-      />
-      <Route
-        path={RouteParams.subject}
-        element={
-          <BreadcrumbRoute>
-            <Details />
-          </BreadcrumbRoute>
-        }
-      />
-      <Route
-        path={clusterSchemaEditRelativePath}
-        element={
-          <BreadcrumbRoute>
-            <Edit />
-          </BreadcrumbRoute>
-        }
-      />
+      <Route index element={<List />} />
+      <Route path={clusterSchemaNewRelativePath} element={<New />} />
+      <Route path={RouteParams.subject} element={<Details />} />
+      <Route path={clusterSchemaEditRelativePath} element={<Edit />} />
       <Route
         path={clusterSchemaSchemaDiffRelativePath}
-        element={
-          <BreadcrumbRoute>
-            <DiffContainer />
-          </BreadcrumbRoute>
-        }
+        element={<DiffContainer />}
       />
     </Routes>
   );
diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
index 3ab51be3105..fbd0ea6d68c 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
@@ -6,7 +6,11 @@ import ClusterContext from 'components/contexts/ClusterContext';
 import { ClusterNameRoute } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import {
+  Dropdown,
+  DropdownItem,
+  DropdownItemHint,
+} from 'components/common/Dropdown';
 import { useQueryClient } from '@tanstack/react-query';
 import {
   topicKeys,
@@ -26,7 +30,7 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
   const deleteTopic = useDeleteTopic(clusterName);
   const recreateTopic = useRecreateTopic({ clusterName, topicName: name });
 
-  const isHidden = internal || isReadOnly;
+  const disabled = internal || isReadOnly;
 
   const clearTopicMessagesHandler = async () => {
     await dispatch(
@@ -38,15 +42,19 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
   const isCleanupDisabled = cleanUpPolicy !== CleanUpPolicy.DELETE;
 
   return (
-    <Dropdown disabled={isHidden}>
+    <Dropdown disabled={disabled}>
       <DropdownItem
         disabled={isCleanupDisabled}
         onClick={clearTopicMessagesHandler}
         confirm="Are you sure want to clear topic messages?"
         danger
-        title="Cleanup is alowed only for topics with DELETE policy"
       >
         Clear Messages
+        <DropdownItemHint>
+          Clearing messages is only allowed for topics
+          <br />
+          with DELETE policy
+        </DropdownItemHint>
       </DropdownItem>
       <DropdownItem
         onClick={recreateTopic.mutateAsync}
@@ -67,14 +75,16 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
             Are you sure want to remove <b>{name}</b> topic?
           </>
         }
-        title={
-          isTopicDeletionAllowed
-            ? 'The topic deletion is restricted by app configuration'
-            : ''
-        }
         danger
       >
         Remove Topic
+        {!isTopicDeletionAllowed && (
+          <DropdownItemHint>
+            The topic deletion is restricted at the application
+            <br />
+            configuration level
+          </DropdownItemHint>
+        )}
       </DropdownItem>
     </Dropdown>
   );
diff --git a/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
index d8031c92a90..5aa74eb6ab9 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
@@ -47,7 +47,7 @@ const ListPage: React.FC = () => {
 
   return (
     <>
-      <PageHeading text="All Topics">
+      <PageHeading text="Topics">
         {!isReadOnly && (
           <Button
             buttonType="primary"
diff --git a/kafka-ui-react-app/src/components/Topics/New/New.tsx b/kafka-ui-react-app/src/components/Topics/New/New.tsx
index d2975929db6..cf992789362 100644
--- a/kafka-ui-react-app/src/components/Topics/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/New.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { TopicFormData } from 'redux/interfaces';
 import { useForm, FormProvider } from 'react-hook-form';
-import { ClusterNameRoute } from 'lib/paths';
+import { ClusterNameRoute, clusterTopicsPath } from 'lib/paths';
 import TopicForm from 'components/Topics/shared/Form/TopicForm';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { yupResolver } from '@hookform/resolvers/yup';
@@ -45,7 +45,11 @@ const New: React.FC = () => {
 
   return (
     <>
-      <PageHeading text={search ? 'Copy Topic' : 'Create new Topic'} />
+      <PageHeading
+        text={search ? 'Copy' : 'Create'}
+        backText="Topics"
+        backTo={clusterTopicsPath(clusterName)}
+      />
       <FormProvider {...methods}>
         <TopicForm
           topicName={name}
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index 0e01da66cb6..5cbbbbd2b98 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -48,18 +48,14 @@ describe('New', () => {
 
   it('checks header for create new', async () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    expect(
-      screen.getByRole('heading', { name: 'Create new Topic' })
-    ).toHaveTextContent('Create new Topic');
+    expect(screen.getByRole('heading', { name: 'Create' })).toBeInTheDocument();
   });
 
   it('checks header for copy', async () => {
     await act(() =>
       renderComponent(`${clusterTopicCopyPath(clusterName)}?name=test`)
     );
-    expect(
-      screen.getByRole('heading', { name: 'Copy Topic' })
-    ).toHaveTextContent('Copy Topic');
+    expect(screen.getByRole('heading', { name: 'Copy' })).toBeInTheDocument();
   });
 
   it('validates form', async () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx
similarity index 94%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx
index b3cec0f4bab..9980b34de28 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/__test__/TopicConsumerGroups.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
-import TopicConsumerGroups from 'components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups';
+import TopicConsumerGroups from 'components/Topics/Topic/ConsumerGroups/TopicConsumerGroups';
 import { clusterTopicConsumerGroupsPath } from 'lib/paths';
 import { useTopicConsumerGroups } from 'lib/hooks/api/topics';
 import { ConsumerGroup } from 'generated-sources';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
deleted file mode 100644
index 15b80957a2a..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-import React, { Suspense } from 'react';
-import { NavLink, Route, Routes, useNavigate } from 'react-router-dom';
-import {
-  RouteParamsClusterTopic,
-  clusterTopicMessagesRelativePath,
-  clusterTopicSettingsRelativePath,
-  clusterTopicConsumerGroupsRelativePath,
-  clusterTopicEditRelativePath,
-  clusterTopicSendMessageRelativePath,
-  clusterTopicStatisticsRelativePath,
-} from 'lib/paths';
-import ClusterContext from 'components/contexts/ClusterContext';
-import PageHeading from 'components/common/PageHeading/PageHeading';
-import { Button } from 'components/common/Button/Button';
-import styled from 'styled-components';
-import Navbar from 'components/common/Navigation/Navbar.styled';
-import { useAppDispatch } from 'lib/hooks/redux';
-import useAppParams from 'lib/hooks/useAppParams';
-import {
-  Dropdown,
-  DropdownItem,
-  DropdownItemHint,
-} from 'components/common/Dropdown';
-import {
-  useDeleteTopic,
-  useRecreateTopic,
-  useTopicDetails,
-} from 'lib/hooks/api/topics';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import { CleanUpPolicy } from 'generated-sources';
-import PageLoader from 'components/common/PageLoader/PageLoader';
-
-import Messages from './Messages/Messages';
-import Overview from './Overview/Overview';
-import Settings from './Settings/Settings';
-import TopicConsumerGroups from './ConsumerGroups/TopicConsumerGroups';
-import Statistics from './Statistics/Statistics';
-
-const HeaderControlsWrapper = styled.div`
-  display: flex;
-  justify-content: flex-end;
-  align-self: center;
-  gap: 26px;
-`;
-
-const Details: React.FC = () => {
-  const dispatch = useAppDispatch();
-  const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
-  const navigate = useNavigate();
-  const deleteTopic = useDeleteTopic(clusterName);
-  const recreateTopic = useRecreateTopic({ clusterName, topicName });
-  const { data } = useTopicDetails({ clusterName, topicName });
-
-  const { isReadOnly, isTopicDeletionAllowed } =
-    React.useContext(ClusterContext);
-
-  const deleteTopicHandler = async () => {
-    await deleteTopic.mutateAsync(topicName);
-    navigate('../..');
-  };
-
-  return (
-    <div>
-      <PageHeading text={topicName}>
-        <HeaderControlsWrapper>
-          <Routes>
-            <Route
-              path={clusterTopicMessagesRelativePath}
-              element={
-                <Button
-                  buttonSize="M"
-                  buttonType="primary"
-                  to={`../${clusterTopicSendMessageRelativePath}`}
-                  disabled={isReadOnly}
-                >
-                  Produce Message
-                </Button>
-              }
-            />
-          </Routes>
-          {!isReadOnly && !data?.internal && (
-            <Routes>
-              <Route
-                index
-                element={
-                  <Dropdown>
-                    <DropdownItem
-                      onClick={() => navigate(clusterTopicEditRelativePath)}
-                    >
-                      Edit settings
-                      <DropdownItemHint>
-                        Pay attention! This operation has
-                        <br />
-                        especially important consequences.
-                      </DropdownItemHint>
-                    </DropdownItem>
-                    {data?.cleanUpPolicy === CleanUpPolicy.DELETE && (
-                      <DropdownItem
-                        onClick={() =>
-                          dispatch(
-                            clearTopicMessages({ clusterName, topicName })
-                          ).unwrap()
-                        }
-                        confirm="Are you sure want to clear topic messages?"
-                        danger
-                      >
-                        Clear messages
-                      </DropdownItem>
-                    )}
-                    <DropdownItem
-                      onClick={recreateTopic.mutateAsync}
-                      confirm={
-                        <>
-                          Are you sure want to recreate <b>{topicName}</b>{' '}
-                          topic?
-                        </>
-                      }
-                      danger
-                    >
-                      Recreate Topic
-                    </DropdownItem>
-                    {isTopicDeletionAllowed && (
-                      <DropdownItem
-                        onClick={deleteTopicHandler}
-                        confirm={
-                          <>
-                            Are you sure want to remove <b>{topicName}</b>{' '}
-                            topic?
-                          </>
-                        }
-                        danger
-                      >
-                        Remove Topic
-                      </DropdownItem>
-                    )}
-                  </Dropdown>
-                }
-              />
-            </Routes>
-          )}
-        </HeaderControlsWrapper>
-      </PageHeading>
-      <Navbar role="navigation">
-        <NavLink
-          to="."
-          className={({ isActive }) => (isActive ? 'is-active' : '')}
-          end
-        >
-          Overview
-        </NavLink>
-        <NavLink
-          to={clusterTopicMessagesRelativePath}
-          className={({ isActive }) => (isActive ? 'is-active' : '')}
-        >
-          Messages
-        </NavLink>
-        <NavLink
-          to={clusterTopicConsumerGroupsRelativePath}
-          className={({ isActive }) => (isActive ? 'is-active' : '')}
-        >
-          Consumers
-        </NavLink>
-        <NavLink
-          to={clusterTopicSettingsRelativePath}
-          className={({ isActive }) => (isActive ? 'is-active' : '')}
-        >
-          Settings
-        </NavLink>
-        <NavLink
-          to={clusterTopicStatisticsRelativePath}
-          className={({ isActive }) => (isActive ? 'is-active' : '')}
-        >
-          Statistics
-        </NavLink>
-      </Navbar>
-      <Suspense fallback={<PageLoader />}>
-        <Routes>
-          <Route index element={<Overview />} />
-          <Route
-            path={clusterTopicMessagesRelativePath}
-            element={<Messages />}
-          />
-          <Route
-            path={clusterTopicSettingsRelativePath}
-            element={<Settings />}
-          />
-          <Route
-            path={clusterTopicConsumerGroupsRelativePath}
-            element={<TopicConsumerGroups />}
-          />
-          <Route
-            path={clusterTopicStatisticsRelativePath}
-            element={<Statistics />}
-          />
-        </Routes>
-      </Suspense>
-    </div>
-  );
-};
-
-export default Details;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
index 4417d8887dd..b9ad51a669e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
@@ -1,11 +1,10 @@
 import styled from 'styled-components';
 
 export const Wrapper = styled.div`
-  margin: 32px auto;
+  margin-top: 16px;
   padding: 16px;
-  border: 1px solid ${({ theme }) => theme.dangerZone.borderColor};
+  border-top: 1px solid ${({ theme }) => theme.dangerZone.borderColor};
   box-sizing: border-box;
-  border-radius: 8px;
   width: 768px;
 
   & > div {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
index 93deef80caa..f2421b5379a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
@@ -10,7 +10,6 @@ import { RouteParamsClusterTopic } from 'lib/paths';
 import { useNavigate } from 'react-router-dom';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { topicFormValidationSchema } from 'lib/yupExtended';
-import PageHeading from 'components/common/PageHeading/PageHeading';
 import useAppParams from 'lib/hooks/useAppParams';
 import topicParamsTransformer from 'components/Topics/Topic/Edit/topicParamsTransformer';
 import { MILLISECONDS_IN_WEEK } from 'lib/constants';
@@ -63,7 +62,6 @@ const Edit: React.FC = () => {
 
   return (
     <>
-      <PageHeading text={`Edit ${topicName}`} />
       <FormProvider {...methods}>
         <TopicForm
           topicName={topicName}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
index 6a6d1a4afa6..592cd9419d0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
@@ -62,17 +62,13 @@ describe('Edit Component', () => {
     await act(() => renderComponent());
   });
 
-  it('renders component', async () => {
-    expect(screen.getByText(`Edit ${topicName}`)).toBeInTheDocument();
-  });
-
   it('renders DangerZone component', async () => {
     expect(screen.getByText(`DangerZone`)).toBeInTheDocument();
   });
 
   it('submits form correctly', async () => {
     await act(() => renderComponent());
-    const btn = screen.getAllByText(/Save/i)[0];
+    const btn = screen.getAllByText(/Update topic/i)[0];
     const field = screen.getByRole('spinbutton', {
       name: 'Min In Sync Replicas * Min In Sync Replicas *',
     });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/AddEditFilterContainer.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
similarity index 95%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/AddEditFilterContainer.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
index fcb0da429d1..e15568e2594 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/AddEditFilterContainer.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
-import * as S from 'components/Topics/Topic/Details/Messages/Filters/Filters.styled';
+import * as S from 'components/Topics/Topic/Messages/Filters/Filters.styled';
 import { InputLabel } from 'components/common/Input/InputLabel.styled';
 import Input from 'components/common/Input/Input';
 import { FormProvider, Controller, useForm } from 'react-hook-form';
 import { ErrorMessage } from '@hookform/error-message';
 import { Button } from 'components/common/Button/Button';
 import { FormError } from 'components/common/Input/Input.styled';
-import { AddMessageFilters } from 'components/Topics/Topic/Details/Messages/Filters/AddFilter';
+import { AddMessageFilters } from 'components/Topics/Topic/Messages/Filters/AddFilter';
 import Editor from 'components/common/Editor/Editor';
 import { yupResolver } from '@hookform/resolvers/yup';
 import yup from 'lib/yupExtended';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/AddFilter.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
similarity index 88%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/AddFilter.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
index d877654e591..e9ff5366cd8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/AddFilter.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import * as S from 'components/Topics/Topic/Details/Messages/Filters/Filters.styled';
-import { MessageFilters } from 'components/Topics/Topic/Details/Messages/Filters/Filters';
-import { FilterEdit } from 'components/Topics/Topic/Details/Messages/Filters/FilterModal';
-import SavedFilters from 'components/Topics/Topic/Details/Messages/Filters/SavedFilters';
+import * as S from 'components/Topics/Topic/Messages/Filters/Filters.styled';
+import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
+import { FilterEdit } from 'components/Topics/Topic/Messages/Filters/FilterModal';
+import SavedFilters from 'components/Topics/Topic/Messages/Filters/SavedFilters';
 import SavedIcon from 'components/common/Icons/SavedIcon';
 import QuestionIcon from 'components/common/Icons/QuestionIcon';
 import useModal from 'lib/hooks/useModal';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/EditFilter.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/EditFilter.tsx
similarity index 83%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/EditFilter.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/EditFilter.tsx
index 15c9fdfd7af..e566870900e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/EditFilter.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/EditFilter.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { MessageFilters } from 'components/Topics/Topic/Details/Messages/Filters/Filters';
-import { FilterEdit } from 'components/Topics/Topic/Details/Messages/Filters/FilterModal';
+import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
+import { FilterEdit } from 'components/Topics/Topic/Messages/Filters/FilterModal';
 
 import AddEditFilterContainer from './AddEditFilterContainer';
 import * as S from './Filters.styled';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/FilterModal.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
similarity index 82%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/FilterModal.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
index 616f6695e1c..dc8b8e6a334 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/FilterModal.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import * as S from 'components/Topics/Topic/Details/Messages/Filters/Filters.styled';
-import { MessageFilters } from 'components/Topics/Topic/Details/Messages/Filters/Filters';
-import AddFilter from 'components/Topics/Topic/Details/Messages/Filters/AddFilter';
-import EditFilter from 'components/Topics/Topic/Details/Messages/Filters/EditFilter';
+import * as S from 'components/Topics/Topic/Messages/Filters/Filters.styled';
+import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
+import AddFilter from 'components/Topics/Topic/Messages/Filters/AddFilter';
+import EditFilter from 'components/Topics/Topic/Messages/Filters/EditFilter';
 
 export interface FilterModalProps {
   toggleIsOpen(): void;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
similarity index 97%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
index 74d45402c1a..776fbfd342a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
@@ -134,7 +134,7 @@ export const MessageFilterModal = styled.div`
   background: ${({ theme }) => theme.modal.backgroundColor};
   position: absolute;
   left: 25%;
-  border: 1px solid ${({ theme }) => theme.breadcrumb};
+  border: 1px solid ${({ theme }) => theme.modal.border.contrast};
   box-shadow: ${({ theme }) => theme.modal.shadow};
   padding: 16px;
   z-index: 1;
@@ -147,7 +147,7 @@ export const InfoModal = styled.div`
   background: ${({ theme }) => theme.modal.backgroundColor};
   position: absolute;
   left: 25%;
-  border: 1px solid ${({ theme }) => theme.breadcrumb};
+  border: 1px solid ${({ theme }) => theme.modal.border.contrast};
   box-shadow: ${({ theme }) => theme.modal.shadow};
   padding: 32px;
   z-index: 1;
@@ -182,7 +182,6 @@ export const FilterTitle = styled.h3`
 
 export const CreatedFilter = styled.p`
   margin: 25px 0 10px;
-  color: ${({ theme }) => theme.breadcrumb};
   font-size: 14px;
   line-height: 20px;
 `;
@@ -190,11 +189,8 @@ export const CreatedFilter = styled.p`
 export const SavedFiltersContainer = styled.div`
   overflow-y: auto;
   height: 195px;
-  // display: flex;
-  // flex-direction: column;
   justify-content: space-around;
   padding-left: 10px;
-  // gap: 10px;
 `;
 
 export const SavedFilterName = styled.div`
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
similarity index 99%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 3c9dd8af295..7acf873d6d9 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -22,8 +22,8 @@ import { Button } from 'components/common/Button/Button';
 import Search from 'components/common/Search/Search';
 import FilterModal, {
   FilterEdit,
-} from 'components/Topics/Topic/Details/Messages/Filters/FilterModal';
-import { SeekDirectionOptions } from 'components/Topics/Topic/Details/Messages/Messages';
+} from 'components/Topics/Topic/Messages/Filters/FilterModal';
+import { SeekDirectionOptions } from 'components/Topics/Topic/Messages/Messages';
 import TopicMessagesContext from 'components/contexts/TopicMessagesContext';
 import useModal from 'lib/hooks/useModal';
 import { RouteParamsClusterTopic } from 'lib/paths';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/FiltersContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FiltersContainer.ts
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/FiltersContainer.ts
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FiltersContainer.ts
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/InfoModal.tsx
similarity index 96%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/InfoModal.tsx
index 6a505cab634..7bfcc129a9e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/InfoModal.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/InfoModal.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import * as S from 'components/Topics/Topic/Details/Messages/Filters/Filters.styled';
+import * as S from 'components/Topics/Topic/Messages/Filters/Filters.styled';
 import { Button } from 'components/common/Button/Button';
 
 interface InfoModalProps {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/SavedFilters.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
similarity index 96%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
index b5aa3f9083f..38c3b01fabe 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import AddEditFilterContainer, {
   AddEditFilterContainerProps,
-} from 'components/Topics/Topic/Details/Messages/Filters/AddEditFilterContainer';
+} from 'components/Topics/Topic/Messages/Filters/AddEditFilterContainer';
 import { render } from 'lib/testHelpers';
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MessageFilters } from 'components/Topics/Topic/Details/Messages/Filters/Filters';
+import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
 
 describe('AddEditFilterContainer component', () => {
   const defaultSubmitBtn = 'Submit Button';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/AddFilter.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
similarity index 98%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/AddFilter.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
index 890d835c5ea..f9c8fe3f1e1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/AddFilter.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import AddFilter, {
   FilterModalProps,
-} from 'components/Topics/Topic/Details/Messages/Filters/AddFilter';
+} from 'components/Topics/Topic/Messages/Filters/AddFilter';
 import { render } from 'lib/testHelpers';
-import { MessageFilters } from 'components/Topics/Topic/Details/Messages/Filters/Filters';
+import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/EditFilter.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
similarity index 93%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/EditFilter.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
index 4073d2c0ccc..347c4eab207 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/EditFilter.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import EditFilter, {
   EditFilterProps,
-} from 'components/Topics/Topic/Details/Messages/Filters/EditFilter';
+} from 'components/Topics/Topic/Messages/Filters/EditFilter';
 import { render } from 'lib/testHelpers';
 import { screen, fireEvent, within, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { FilterEdit } from 'components/Topics/Topic/Details/Messages/Filters/FilterModal';
+import { FilterEdit } from 'components/Topics/Topic/Messages/Filters/FilterModal';
 
 const editFilter: FilterEdit = {
   index: 0,
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/FilterModal.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
similarity index 87%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/FilterModal.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
index d2a226a3874..d2c4ed7f527 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/FilterModal.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import FilterModal, {
   FilterModalProps,
-} from 'components/Topics/Topic/Details/Messages/Filters/FilterModal';
+} from 'components/Topics/Topic/Messages/Filters/FilterModal';
 import { render } from 'lib/testHelpers';
-import { MessageFilters } from 'components/Topics/Topic/Details/Messages/Filters/Filters';
+import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
 import { screen, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
similarity index 97%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
index e4cf911ad77..7b06c2599a6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
-import { SeekDirectionOptions } from 'components/Topics/Topic/Details/Messages/Messages';
+import { SeekDirectionOptions } from 'components/Topics/Topic/Messages/Messages';
 import Filters, {
   FiltersProps,
   SeekTypeOptions,
-} from 'components/Topics/Topic/Details/Messages/Filters/Filters';
+} from 'components/Topics/Topic/Messages/Filters/Filters';
 import { EventSourceMock, render, WithRoute } from 'lib/testHelpers';
 import { act, screen, within, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.styled.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.styled.spec.tsx
similarity index 90%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.styled.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.styled.spec.tsx
index 3a1ddb4d8f2..009892ff047 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/Filters.styled.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.styled.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from 'lib/testHelpers';
-import * as S from 'components/Topics/Topic/Details/Messages/Filters/Filters.styled';
+import * as S from 'components/Topics/Topic/Messages/Filters/Filters.styled';
 import { screen } from '@testing-library/react';
 import theme from 'theme/theme';
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/InfoModal.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/InfoModal.spec.tsx
similarity index 84%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/InfoModal.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/InfoModal.spec.tsx
index 1721c489151..76d50b054d4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/InfoModal.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/InfoModal.spec.tsx
@@ -2,7 +2,7 @@ import userEvent from '@testing-library/user-event';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
 import React from 'react';
-import InfoModal from 'components/Topics/Topic/Details/Messages/Filters/InfoModal';
+import InfoModal from 'components/Topics/Topic/Messages/Filters/InfoModal';
 
 describe('InfoModal component', () => {
   it('closes InfoModal', () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
similarity index 97%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
index 862101f751f..e8b9178e54a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/__tests__/SavedFilters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import SavedFilters, {
   Props,
-} from 'components/Topics/Topic/Details/Messages/Filters/SavedFilters';
-import { MessageFilters } from 'components/Topics/Topic/Details/Messages/Filters/Filters';
+} from 'components/Topics/Topic/Messages/Filters/SavedFilters';
+import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
 import {
   screen,
   waitFor,
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/utils.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/utils.ts
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Filters/utils.ts
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/utils.ts
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Message.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.styled.ts
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/MessageContent.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
similarity index 97%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
index ea9589341d0..8159a8f7279 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessageContent/__tests__/MessageContent.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import { screen } from '@testing-library/react';
 import MessageContent, {
   MessageContentProps,
-} from 'components/Topics/Topic/Details/Messages/MessageContent/MessageContent';
+} from 'components/Topics/Topic/Messages/MessageContent/MessageContent';
 import { TopicMessageTimestampTypeEnum } from 'generated-sources';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Messages.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Messages.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/FiltersContainer.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/FiltersContainer.spec.tsx
similarity index 59%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/FiltersContainer.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/FiltersContainer.spec.tsx
index e4348fdf14b..127a602f85e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/FiltersContainer.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/FiltersContainer.spec.tsx
@@ -1,12 +1,11 @@
 import React from 'react';
-import FiltersContainer from 'components/Topics/Topic/Details/Messages/Filters/FiltersContainer';
+import FiltersContainer from 'components/Topics/Topic/Messages/Filters/FiltersContainer';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
 
-jest.mock(
-  'components/Topics/Topic/Details/Messages/Filters/Filters',
-  () => () => <div>mock-Filters</div>
-);
+jest.mock('components/Topics/Topic/Messages/Filters/Filters', () => () => (
+  <div>mock-Filters</div>
+));
 
 describe('FiltersContainer', () => {
   it('renders Filters component', () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Message.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
similarity index 94%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Message.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
index a50341816fb..f92354ba184 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Message.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
@@ -1,8 +1,6 @@
 import React from 'react';
 import { TopicMessage, TopicMessageTimestampTypeEnum } from 'generated-sources';
-import Message, {
-  Props,
-} from 'components/Topics/Topic/Details/Messages/Message';
+import Message, { Props } from 'components/Topics/Topic/Messages/Message';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
 import userEvent from '@testing-library/user-event';
@@ -11,7 +9,7 @@ import { formatTimestamp } from 'lib/dateTimeHelpers';
 const messageContentText = 'messageContentText';
 
 jest.mock(
-  'components/Topics/Topic/Details/Messages/MessageContent/MessageContent',
+  'components/Topics/Topic/Messages/MessageContent/MessageContent',
   () => () =>
     (
       <tr>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Messages.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
similarity index 98%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Messages.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
index ca18669235d..78209ef7bb7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/Messages.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
@@ -4,7 +4,7 @@ import { render, EventSourceMock, WithRoute } from 'lib/testHelpers';
 import Messages, {
   SeekDirectionOptions,
   SeekDirectionOptionsObj,
-} from 'components/Topics/Topic/Details/Messages/Messages';
+} from 'components/Topics/Topic/Messages/Messages';
 import { SeekDirection, SeekType } from 'generated-sources';
 import userEvent from '@testing-library/user-event';
 import { clusterTopicMessagesPath } from 'lib/paths';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessagesTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
similarity index 97%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessagesTable.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
index 992e15d8f45..1d065f78076 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessagesTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
-import MessagesTable from 'components/Topics/Topic/Details/Messages/MessagesTable';
+import MessagesTable from 'components/Topics/Topic/Messages/MessagesTable';
 import { SeekDirection, SeekType, TopicMessage } from 'generated-sources';
 import TopicMessagesContext, {
   ContextProps,
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/utils.spec.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/utils.spec.ts
similarity index 98%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/utils.spec.ts
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/utils.spec.ts
index 06a13d641b1..1db3f3e9bc5 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/utils.spec.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/utils.spec.ts
@@ -4,7 +4,7 @@ import {
   getOffsetFromSeekToParam,
   getTimestampFromSeekToParam,
   getSelectedPartitionsFromSeekToParam,
-} from 'components/Topics/Topic/Details/Messages/Filters/utils';
+} from 'components/Topics/Topic/Messages/Filters/utils';
 import { SeekType, Partition } from 'generated-sources';
 
 const options: Option[] = [
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.styled.ts
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.styled.ts
rename to kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.styled.ts
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/Overview.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
similarity index 96%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
index 945f95f3705..f49606747e4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
-import Overview from 'components/Topics/Topic/Details/Overview/Overview';
+import Overview from 'components/Topics/Topic/Overview/Overview';
 import theme from 'theme/theme';
 import { CleanUpPolicy, Topic } from 'generated-sources';
 import ClusterContext from 'components/contexts/ClusterContext';
 import userEvent from '@testing-library/user-event';
 import { clusterTopicPath } from 'lib/paths';
-import { Replica } from 'components/Topics/Topic/Details/Overview/Overview.styled';
+import { Replica } from 'components/Topics/Topic/Overview/Overview.styled';
 import { useTopicDetails } from 'lib/hooks/api/topics';
 import {
   externalTopicPayload,
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/ConfigListItem.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Settings/ConfigListItem.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/ConfigListItem.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Settings/ConfigListItem.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.styled.ts
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.styled.ts
rename to kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.styled.ts
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/Settings.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/ConfigListItem.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/ConfigListItem.spec.tsx
similarity index 95%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/ConfigListItem.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/ConfigListItem.spec.tsx
index 7d70b480c15..b363ff55337 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/ConfigListItem.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/ConfigListItem.spec.tsx
@@ -3,7 +3,7 @@ import { render } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
 import ConfigListItem, {
   ListItemProps,
-} from 'components/Topics/Topic/Details/Settings/ConfigListItem';
+} from 'components/Topics/Topic/Settings/ConfigListItem';
 
 const setupComponent = (props: ListItemProps) => {
   render(
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/Settings.spec.tsx
similarity index 83%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/Settings.spec.tsx
index 6d36cc82849..cf5236ffa15 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/__test__/Settings.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/Settings.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
-import Settings from 'components/Topics/Topic/Details/Settings/Settings';
+import Settings from 'components/Topics/Topic/Settings/Settings';
 import { clusterTopicSettingsPath } from 'lib/paths';
 import { topicConfigPayload } from 'lib/fixtures/topics';
 import { useTopicConfig } from 'lib/hooks/api/topics';
@@ -13,15 +13,11 @@ jest.mock('lib/hooks/api/topics', () => ({
   useTopicConfig: jest.fn(),
 }));
 
-jest.mock(
-  'components/Topics/Topic/Details/Settings/ConfigListItem',
-  () => () =>
-    (
-      <tr>
-        <td>ConfigListItemMock</td>
-      </tr>
-    )
-);
+jest.mock('components/Topics/Topic/Settings/ConfigListItem', () => () => (
+  <tr>
+    <td>ConfigListItemMock</td>
+  </tr>
+));
 
 describe('Settings', () => {
   const renderComponent = () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/SizeStats.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/SizeStats.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/SizeStats.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/SizeStats.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Indicators/Total.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Metrics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Metrics.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionInfoRow.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionInfoRow.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionTable.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/PartitionTable.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionTable.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.styles.ts b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.styles.ts
rename to kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.tsx
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/Statistics.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.tsx
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Metrics.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx
similarity index 98%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Metrics.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx
index 621b6b25c02..2f27802a002 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Metrics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
-import Statistics from 'components/Topics/Topic/Details/Statistics/Statistics';
+import Statistics from 'components/Topics/Topic/Statistics/Statistics';
 import { clusterTopicStatisticsPath } from 'lib/paths';
 import {
   useTopicAnalysis,
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Statistics.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
similarity index 92%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Statistics.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
index 90f39faa0ed..d69c68b8edb 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Statistics/__test__/Statistics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
-import Statistics from 'components/Topics/Topic/Details/Statistics/Statistics';
+import Statistics from 'components/Topics/Topic/Statistics/Statistics';
 import { clusterTopicStatisticsPath } from 'lib/paths';
 import { useTopicAnalysis } from 'lib/hooks/api/topics';
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index a96152b4d71..723a6e7aef8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -1,36 +1,204 @@
 import React, { Suspense } from 'react';
-import { Routes, Route } from 'react-router-dom';
+import { NavLink, Route, Routes, useNavigate } from 'react-router-dom';
 import {
+  RouteParamsClusterTopic,
+  clusterTopicMessagesRelativePath,
+  clusterTopicSettingsRelativePath,
+  clusterTopicConsumerGroupsRelativePath,
   clusterTopicEditRelativePath,
   clusterTopicSendMessageRelativePath,
+  clusterTopicStatisticsRelativePath,
+  clusterTopicsPath,
+  clusterTopicSendMessagePath,
 } from 'lib/paths';
-import PageLoader from 'components/common/PageLoader/PageLoader';
-import { resetTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
+import ClusterContext from 'components/contexts/ClusterContext';
+import PageHeading from 'components/common/PageHeading/PageHeading';
+import { Button } from 'components/common/Button/Button';
+import Navbar from 'components/common/Navigation/Navbar.styled';
 import { useAppDispatch } from 'lib/hooks/redux';
+import useAppParams from 'lib/hooks/useAppParams';
+import {
+  Dropdown,
+  DropdownItem,
+  DropdownItemHint,
+} from 'components/common/Dropdown';
+import {
+  useDeleteTopic,
+  useRecreateTopic,
+  useTopicDetails,
+} from 'lib/hooks/api/topics';
+import {
+  clearTopicMessages,
+  resetTopicMessages,
+} from 'redux/reducers/topicMessages/topicMessagesSlice';
+import { CleanUpPolicy } from 'generated-sources';
+import PageLoader from 'components/common/PageLoader/PageLoader';
 
-import SendMessage from './SendMessage/SendMessage';
-import Details from './Details/Details';
+import Messages from './Messages/Messages';
+import Overview from './Overview/Overview';
+import Settings from './Settings/Settings';
+import TopicConsumerGroups from './ConsumerGroups/TopicConsumerGroups';
+import Statistics from './Statistics/Statistics';
 import Edit from './Edit/Edit';
+import SendMessage from './SendMessage/SendMessage';
 
 const Topic: React.FC = () => {
   const dispatch = useAppDispatch();
+  const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
+  const navigate = useNavigate();
+  const deleteTopic = useDeleteTopic(clusterName);
+  const recreateTopic = useRecreateTopic({ clusterName, topicName });
+  const { data } = useTopicDetails({ clusterName, topicName });
+
+  const { isReadOnly, isTopicDeletionAllowed } =
+    React.useContext(ClusterContext);
+
+  const deleteTopicHandler = async () => {
+    await deleteTopic.mutateAsync(topicName);
+    navigate('../..');
+  };
+
   React.useEffect(() => {
     return () => {
       dispatch(resetTopicMessages());
     };
   }, []);
 
+  const canCleanup = data?.cleanUpPolicy === CleanUpPolicy.DELETE;
+
   return (
-    <Suspense fallback={<PageLoader />}>
-      <Routes>
-        <Route path="*" element={<Details />} />
-        <Route path={clusterTopicEditRelativePath} element={<Edit />} />
-        <Route
-          path={clusterTopicSendMessageRelativePath}
-          element={<SendMessage />}
-        />
-      </Routes>
-    </Suspense>
+    <>
+      <PageHeading
+        text={topicName}
+        backText="Topics"
+        backTo={clusterTopicsPath(clusterName)}
+      >
+        <Button
+          buttonSize="M"
+          buttonType="primary"
+          to={clusterTopicSendMessagePath(clusterName, topicName)}
+          disabled={isReadOnly}
+        >
+          Produce Message
+        </Button>
+        <Dropdown disabled={isReadOnly || data?.internal}>
+          <DropdownItem onClick={() => navigate(clusterTopicEditRelativePath)}>
+            Edit settings
+            <DropdownItemHint>
+              Pay attention! This operation has
+              <br />
+              especially important consequences.
+            </DropdownItemHint>
+          </DropdownItem>
+
+          <DropdownItem
+            onClick={() =>
+              dispatch(clearTopicMessages({ clusterName, topicName })).unwrap()
+            }
+            confirm="Are you sure want to clear topic messages?"
+            disabled={!canCleanup}
+            danger
+          >
+            Clear messages
+            <DropdownItemHint>
+              Clearing messages is only allowed for topics
+              <br />
+              with DELETE policy
+            </DropdownItemHint>
+          </DropdownItem>
+
+          <DropdownItem
+            onClick={recreateTopic.mutateAsync}
+            confirm={
+              <>
+                Are you sure want to recreate <b>{topicName}</b> topic?
+              </>
+            }
+            danger
+          >
+            Recreate Topic
+          </DropdownItem>
+          <DropdownItem
+            onClick={deleteTopicHandler}
+            confirm={
+              <>
+                Are you sure want to remove <b>{topicName}</b> topic?
+              </>
+            }
+            disabled={!isTopicDeletionAllowed}
+            danger
+          >
+            Remove Topic
+            {!isTopicDeletionAllowed && (
+              <DropdownItemHint>
+                The topic deletion is restricted at the application
+                <br />
+                configuration level
+              </DropdownItemHint>
+            )}
+          </DropdownItem>
+        </Dropdown>
+      </PageHeading>
+      <Navbar role="navigation">
+        <NavLink
+          to="."
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+          end
+        >
+          Overview
+        </NavLink>
+        <NavLink
+          to={clusterTopicMessagesRelativePath}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+        >
+          Messages
+        </NavLink>
+        <NavLink
+          to={clusterTopicConsumerGroupsRelativePath}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+        >
+          Consumers
+        </NavLink>
+        <NavLink
+          to={clusterTopicSettingsRelativePath}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+        >
+          Settings
+        </NavLink>
+        <NavLink
+          to={clusterTopicStatisticsRelativePath}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+        >
+          Statistics
+        </NavLink>
+      </Navbar>
+      <Suspense fallback={<PageLoader />}>
+        <Routes>
+          <Route index element={<Overview />} />
+          <Route
+            path={clusterTopicMessagesRelativePath}
+            element={<Messages />}
+          />
+          <Route
+            path={clusterTopicSettingsRelativePath}
+            element={<Settings />}
+          />
+          <Route
+            path={clusterTopicConsumerGroupsRelativePath}
+            element={<TopicConsumerGroups />}
+          />
+          <Route
+            path={clusterTopicStatisticsRelativePath}
+            element={<Statistics />}
+          />
+          <Route path={clusterTopicEditRelativePath} element={<Edit />} />
+          <Route
+            path={clusterTopicSendMessageRelativePath}
+            element={<SendMessage />}
+          />
+        </Routes>
+      </Suspense>
+    </>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
similarity index 92%
rename from kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
rename to kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
index 12ce5097b78..00a70630cb0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Details/__test__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { act, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import ClusterContext from 'components/contexts/ClusterContext';
-import Details from 'components/Topics/Topic/Details/Details';
+import Details from 'components/Topics/Topic/Topic';
 import { render, WithRoute } from 'lib/testHelpers';
 import {
   clusterTopicConsumerGroupsPath,
@@ -40,20 +40,20 @@ jest.mock('lib/hooks/redux', () => ({
   useAppDispatch: useDispatchMock,
 }));
 
-jest.mock('components/Topics/Topic/Details/Overview/Overview', () => () => (
+jest.mock('components/Topics/Topic/Overview/Overview', () => () => (
   <>OverviewMock</>
 ));
-jest.mock('components/Topics/Topic/Details/Messages/Messages', () => () => (
+jest.mock('components/Topics/Topic/Messages/Messages', () => () => (
   <>MessagesMock</>
 ));
-jest.mock('components/Topics/Topic/Details/Settings/Settings', () => () => (
+jest.mock('components/Topics/Topic/Settings/Settings', () => () => (
   <>SettingsMock</>
 ));
 jest.mock(
-  'components/Topics/Topic/Details/ConsumerGroups/TopicConsumerGroups',
+  'components/Topics/Topic/ConsumerGroups/TopicConsumerGroups',
   () => () => <>ConsumerGroupsMock</>
 );
-jest.mock('components/Topics/Topic/Details/Statistics/Statistics', () => () => (
+jest.mock('components/Topics/Topic/Statistics/Statistics', () => () => (
   <>StatisticsMock</>
 ));
 
@@ -98,9 +98,9 @@ describe('Details', () => {
   });
   describe('Action Bar', () => {
     describe('when it has readonly flag', () => {
-      it('does not render the Action button a Topic', () => {
+      it('renders disabled the Action button a Topic', () => {
         renderComponent(true);
-        expect(screen.queryByText('Produce Message')).not.toBeInTheDocument();
+        expect(screen.getByText('Produce Message')).toBeDisabled();
       });
     });
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/__tests__/Topic.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/__tests__/Topic.spec.tsx
deleted file mode 100644
index a1184fe25bf..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/__tests__/Topic.spec.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React from 'react';
-import { render, WithRoute } from 'lib/testHelpers';
-import { screen } from '@testing-library/react';
-import Topic from 'components/Topics/Topic/Topic';
-import {
-  clusterTopicPath,
-  clusterTopicEditPath,
-  clusterTopicSendMessagePath,
-  getNonExactPath,
-} from 'lib/paths';
-import { useAppDispatch } from 'lib/hooks/redux';
-
-const topicText = {
-  edit: 'Edit',
-  send: 'Send Message',
-  detail: 'Details',
-  loading: 'Loading',
-};
-
-jest.mock('components/Topics/Topic/Edit/Edit', () => () => (
-  <div>{topicText.edit}</div>
-));
-jest.mock('components/Topics/Topic/SendMessage/SendMessage', () => () => (
-  <div>{topicText.send}</div>
-));
-jest.mock('components/Topics/Topic/Details/Details', () => () => (
-  <div>{topicText.detail}</div>
-));
-
-jest.mock('lib/hooks/redux', () => ({
-  ...jest.requireActual('lib/hooks/redux'),
-  useAppDispatch: jest.fn(),
-}));
-const useDispatchMock = jest.fn(jest.fn());
-
-describe('Topic Component', () => {
-  beforeEach(() => {
-    (useAppDispatch as jest.Mock).mockImplementation(() => useDispatchMock);
-  });
-
-  const renderComponent = (pathname: string) =>
-    render(
-      <WithRoute path={getNonExactPath(clusterTopicPath())}>
-        <Topic />
-      </WithRoute>,
-      { initialEntries: [pathname] }
-    );
-
-  it('renders Edit page', () => {
-    renderComponent(clusterTopicEditPath('local', 'myTopicName'));
-    expect(screen.getByText(topicText.edit)).toBeInTheDocument();
-  });
-
-  it('renders Send Message page', () => {
-    renderComponent(clusterTopicSendMessagePath('local', 'myTopicName'));
-    expect(screen.getByText(topicText.send)).toBeInTheDocument();
-  });
-
-  it('renders Details Container page', () => {
-    renderComponent(clusterTopicPath('local', 'myTopicName'));
-    expect(screen.getByText(topicText.detail)).toBeInTheDocument();
-  });
-
-  it('resets topic messages after unmount', () => {
-    const component = renderComponent(clusterTopicPath('local', 'myTopicName'));
-    component.unmount();
-    expect(useDispatchMock).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Topics/Topics.tsx b/kafka-ui-react-app/src/components/Topics/Topics.tsx
index 9b0f21a054a..73f6dfc7e12 100644
--- a/kafka-ui-react-app/src/components/Topics/Topics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topics.tsx
@@ -6,7 +6,6 @@ import {
   getNonExactPath,
   RouteParams,
 } from 'lib/paths';
-import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
 
 import New from './New/New';
 import ListPage from './List/ListPage';
@@ -14,38 +13,10 @@ import Topic from './Topic/Topic';
 
 const Topics: React.FC = () => (
   <Routes>
-    <Route
-      index
-      element={
-        <BreadcrumbRoute>
-          <ListPage />
-        </BreadcrumbRoute>
-      }
-    />
-    <Route
-      path={clusterTopicNewRelativePath}
-      element={
-        <BreadcrumbRoute>
-          <New />
-        </BreadcrumbRoute>
-      }
-    />
-    <Route
-      path={clusterTopicCopyRelativePath}
-      element={
-        <BreadcrumbRoute>
-          <New />
-        </BreadcrumbRoute>
-      }
-    />
-    <Route
-      path={getNonExactPath(RouteParams.topicName)}
-      element={
-        <BreadcrumbRoute>
-          <Topic />
-        </BreadcrumbRoute>
-      }
-    />
+    <Route index element={<ListPage />} />
+    <Route path={clusterTopicNewRelativePath} element={<New />} />
+    <Route path={clusterTopicCopyRelativePath} element={<New />} />
+    <Route path={getNonExactPath(RouteParams.topicName)} element={<Topic />} />
   </Routes>
 );
 
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index 1f4a669577d..1838e209ba8 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -232,20 +232,20 @@ const TopicForm: React.FC<Props> = ({
         <CustomParams isSubmitting={isSubmitting} />
         <S.ButtonWrapper>
           <Button
-            type="submit"
+            type="button"
             buttonType="primary"
             buttonSize="L"
-            disabled={!isValid || isSubmitting || !isDirty}
+            onClick={onCancel}
           >
-            {isEditing ? 'Save' : 'Create topic'}
+            Cancel
           </Button>
           <Button
-            type="button"
+            type="submit"
             buttonType="primary"
             buttonSize="L"
-            onClick={onCancel}
+            disabled={!isValid || isSubmitting || !isDirty}
           >
-            Cancel
+            {isEditing ? 'Update topic' : 'Create topic'}
           </Button>
         </S.ButtonWrapper>
       </fieldset>
diff --git a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.context.ts b/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.context.ts
deleted file mode 100644
index 9187d74bb71..00000000000
--- a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.context.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { createContext } from 'react';
-
-export interface BreadcrumbEntry {
-  link: string;
-  path: string[];
-}
-
-interface BreadcrumbContextInterface extends BreadcrumbEntry {
-  handleRouteChange: (match: { url: string; path: string }) => void;
-}
-
-export const BreadcrumbContext = createContext<BreadcrumbContextInterface>({
-  link: '',
-  path: [],
-  handleRouteChange: () => {},
-});
diff --git a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.provider.tsx b/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.provider.tsx
deleted file mode 100644
index d2bbd9e2e29..00000000000
--- a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.provider.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { PropsWithChildren, useState } from 'react';
-import capitalize from 'lodash/capitalize';
-
-import { BreadcrumbContext, BreadcrumbEntry } from './Breadcrumb.context';
-
-const mapLocationToPath = (
-  splittedLocation: string[],
-  splittedRoutePath: string[]
-) =>
-  splittedLocation.map((item, index) =>
-    splittedRoutePath[index]?.charAt(0) !== ':'
-      ? item.split('-').map(capitalize).join(' ')
-      : item
-  );
-
-export const BreadcrumbProvider: React.FC<PropsWithChildren<unknown>> = ({
-  children,
-}) => {
-  const [state, setState] = useState<BreadcrumbEntry>({
-    link: '',
-    path: [],
-  });
-
-  const handleRouteChange = (params: { url: string; path: string }) => {
-    setState((prevState) => {
-      const newState = { ...prevState };
-      const splittedRoutePath = params.path.split('/');
-      const splittedLocation = params.url.split('/');
-
-      if (prevState.link !== params.url) {
-        newState.link = params.url;
-        newState.path = mapLocationToPath(splittedLocation, splittedRoutePath);
-      }
-
-      if (prevState.path.length < params.path.split('/').length) {
-        newState.path = mapLocationToPath(splittedLocation, splittedRoutePath);
-      }
-
-      return newState;
-    });
-  };
-
-  return (
-    <BreadcrumbContext.Provider
-      value={{
-        ...state,
-        handleRouteChange,
-      }}
-    >
-      {children}
-    </BreadcrumbContext.Provider>
-  );
-};
diff --git a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.route.tsx b/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.route.tsx
deleted file mode 100644
index 919df4740aa..00000000000
--- a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.route.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { useContext, useEffect } from 'react';
-import { Params, Location, useLocation, useParams } from 'react-router-dom';
-
-import { BreadcrumbContext } from './Breadcrumb.context';
-
-const getRoutePath = (location: Location, params: Params): string => {
-  const { pathname } = location;
-
-  if (!Object.keys(params).length) {
-    return pathname; // we don't need to replace anything
-  }
-
-  let path = pathname;
-  Object.entries(params).forEach(([paramName, paramValue]) => {
-    if (paramValue) {
-      path = path.replace(paramValue, `:${paramName}`);
-    }
-  });
-  return path;
-};
-
-const BreadcrumbRouteInternal: React.FC = () => {
-  const location = useLocation();
-  const params = useParams();
-  const path = getRoutePath(location, params);
-  const context = useContext(BreadcrumbContext);
-
-  useEffect(() => {
-    context.handleRouteChange({
-      url: location.pathname,
-      path,
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [location.pathname]);
-
-  return null;
-};
-
-interface BreadcrumbRoutProps {
-  children: React.ReactNode;
-}
-
-export const BreadcrumbRoute: React.FC<BreadcrumbRoutProps> = ({
-  children,
-}) => {
-  return (
-    <>
-      {children}
-      <BreadcrumbRouteInternal />
-    </>
-  );
-};
diff --git a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.styled.ts b/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.styled.ts
deleted file mode 100644
index 5b4ed64c5bb..00000000000
--- a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.styled.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import styled from 'styled-components';
-
-export const BreadcrumbWrapper = styled.ul`
-  display: flex;
-  padding-left: 16px;
-  padding-top: 1em;
-
-  font-size: 12px;
-
-  & li:not(:last-child)::after {
-    content: '/';
-    color: ${({ theme }) => theme.breadcrumb};
-    margin: 0 8px;
-  }
-`;
diff --git a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.tsx b/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.tsx
deleted file mode 100644
index 9dd09943a2c..00000000000
--- a/kafka-ui-react-app/src/components/common/Breadcrumb/Breadcrumb.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React, { useContext } from 'react';
-import { Link } from 'react-router-dom';
-import { clusterPath } from 'lib/paths';
-import { BREADCRUMB_DEFINITIONS } from 'lib/constants';
-
-import { BreadcrumbWrapper } from './Breadcrumb.styled';
-import { BreadcrumbContext } from './Breadcrumb.context';
-
-const basePathEntriesLength = clusterPath().split('/').length;
-
-export interface BreadcrumbDefinitions {
-  [key: string]: string;
-}
-
-const Breadcrumb: React.FC = () => {
-  const breadcrumbContext = useContext(BreadcrumbContext);
-
-  const links = React.useMemo(
-    () => breadcrumbContext.path.slice(basePathEntriesLength),
-    [breadcrumbContext.path]
-  );
-
-  const getPathPredicate = (index: number) =>
-    `${breadcrumbContext.link
-      .split('/')
-      .slice(0, basePathEntriesLength + index + 1)
-      .join('/')}`;
-
-  if (links.length < 2) {
-    return null;
-  }
-
-  return (
-    <BreadcrumbWrapper role="list">
-      {links.slice(0, links.length - 1).map((link, index) => (
-        <li key={link}>
-          <Link to={getPathPredicate(index)}>
-            {BREADCRUMB_DEFINITIONS[link] || link}
-          </Link>
-        </li>
-      ))}
-      <li>
-        <span>{links[links.length - 1]}</span>
-      </li>
-    </BreadcrumbWrapper>
-  );
-};
-
-export default Breadcrumb;
diff --git a/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx b/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx
deleted file mode 100644
index d2cd7f6041a..00000000000
--- a/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb';
-import { BreadcrumbProvider } from 'components/common/Breadcrumb/Breadcrumb.provider';
-import { BreadcrumbRoute } from 'components/common/Breadcrumb/Breadcrumb.route';
-import { render, WithRoute } from 'lib/testHelpers';
-import { clusterTopicNewPath, clusterTopicPath } from 'lib/paths';
-
-const createTopicPath = clusterTopicNewPath('local');
-const createTopicRoutePath = clusterTopicNewPath();
-
-const topicName = 'topic-name';
-
-const topicPath = clusterTopicPath('secondLocal', topicName);
-const topicRoutePath = clusterTopicPath();
-
-describe('Breadcrumb component', () => {
-  const setupComponent = (pathname: string, routePath: string) =>
-    render(
-      <BreadcrumbProvider>
-        <Breadcrumb />
-        <WithRoute path={routePath}>
-          <BreadcrumbRoute>
-            <div />
-          </BreadcrumbRoute>
-        </WithRoute>
-      </BreadcrumbProvider>,
-      { initialEntries: [pathname] }
-    );
-
-  it('renders the list of links', async () => {
-    const { getByText } = setupComponent(createTopicPath, createTopicRoutePath);
-    expect(getByText('All Topics')).toBeInTheDocument();
-    expect(getByText('Create New Topic')).toBeInTheDocument();
-  });
-  it('renders the topic overview', async () => {
-    const { getByText } = setupComponent(topicPath, topicRoutePath);
-    expect(getByText('All Topics')).toBeInTheDocument();
-    expect(getByText(topicName)).toBeInTheDocument();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/common/ControlPanel/ControlPanel.styled.ts b/kafka-ui-react-app/src/components/common/ControlPanel/ControlPanel.styled.ts
index a1453183c29..e06c49992ed 100644
--- a/kafka-ui-react-app/src/components/common/ControlPanel/ControlPanel.styled.ts
+++ b/kafka-ui-react-app/src/components/common/ControlPanel/ControlPanel.styled.ts
@@ -8,7 +8,7 @@ export const ControlPanelWrapper = styled.div<Props>`
   display: flex;
   align-items: center;
   padding: 0px 16px;
-  margin: 16px 0px;
+  margin: 0px 0px 16px;
   width: 100%;
   gap: 16px;
   & > *:first-child {
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
index cb22cdb37b2..2daf062d852 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
@@ -62,7 +62,6 @@ export const DropdownButton = styled.button`
   display: flex;
   cursor: pointer;
   align-self: center;
-  float: right;
 
   &:disabled {
     opacity: 0.5;
@@ -77,5 +76,12 @@ export const DangerItem = styled.div`
 export const DropdownItemHint = styled.div`
   color: ${({ theme }) => theme.topicMetaData.color.label};
   font-size: 12px;
+  line-height: 1.4;
   margin-top: 5px;
 `;
+
+export const Wrapper = styled.div`
+  display: inline-flex;
+  align-items: center;
+  justify-content: end;
+`;
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
index 4d82d7b015e..584f041328f 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
@@ -21,7 +21,7 @@ const Dropdown: React.FC<DropdownProps> = ({ label, disabled, children }) => {
   };
 
   return (
-    <>
+    <S.Wrapper>
       <S.DropdownButton
         onClick={handleClick}
         ref={ref}
@@ -42,7 +42,7 @@ const Dropdown: React.FC<DropdownProps> = ({ label, disabled, children }) => {
       >
         {children}
       </S.Dropdown>
-    </>
+    </S.Wrapper>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/common/Form/Form.styled.ts b/kafka-ui-react-app/src/components/common/Form/Form.styled.ts
index 88038406832..c72df5eb547 100644
--- a/kafka-ui-react-app/src/components/common/Form/Form.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Form/Form.styled.ts
@@ -1,7 +1,6 @@
 import styled from 'styled-components';
 
 export const StyledForm = styled.form`
-  padding: 0 16px;
+  padding: 16px;
   max-width: 800px;
-  margin: 0 auto;
 `;
diff --git a/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.styled.ts b/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.styled.ts
new file mode 100644
index 00000000000..7010429ecb3
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.styled.ts
@@ -0,0 +1,42 @@
+import styled from 'styled-components';
+import { NavLink } from 'react-router-dom';
+
+export const Breadcrumbs = styled.div`
+  display: flex;
+  align-items: baseline;
+`;
+
+export const BackLink = styled(NavLink)`
+  color: ${({ theme }) => theme.pageHeading.backLink.color.normal};
+  position: relative;
+
+  &:hover {
+    ${({ theme }) => theme.pageHeading.backLink.color.hover};
+  }
+
+  &::after {
+    content: '';
+    position: absolute;
+    right: -11px;
+    bottom: 2px;
+    border-left: 1px solid ${({ theme }) => theme.pageHeading.dividerColor};
+    height: 20px;
+    transform: rotate(14deg);
+  }
+`;
+
+export const Wrapper = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 16px;
+
+  & > div {
+    display: flex;
+    gap: 16px;
+  }
+
+  & > ${Breadcrumbs} {
+    gap: 20px;
+  }
+`;
diff --git a/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.tsx b/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.tsx
index da9903067fb..ffbdc1a2797 100644
--- a/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.tsx
+++ b/kafka-ui-react-app/src/components/common/PageHeading/PageHeading.tsx
@@ -1,33 +1,31 @@
-import styled from 'styled-components';
 import React, { PropsWithChildren } from 'react';
 import Heading from 'components/common/heading/Heading.styled';
 
-interface Props {
+import * as S from './PageHeading.styled';
+
+interface PageHeadingProps {
   text: string;
-  className?: string;
+  backTo?: string;
+  backText?: string;
 }
 
-const PageHeading: React.FC<PropsWithChildren<Props>> = ({
+const PageHeading: React.FC<PropsWithChildren<PageHeadingProps>> = ({
   text,
-  className,
+  backTo,
+  backText,
   children,
 }) => {
+  const isBackButtonVisible = backTo && backText;
+
   return (
-    <div className={className}>
-      <Heading>{text}</Heading>
+    <S.Wrapper>
+      <S.Breadcrumbs>
+        {isBackButtonVisible && <S.BackLink to={backTo}>{backText}</S.BackLink>}
+        <Heading>{text}</Heading>
+      </S.Breadcrumbs>
       <div>{children}</div>
-    </div>
+    </S.Wrapper>
   );
 };
 
-export default styled(PageHeading)`
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16px;
-
-  & > div {
-    display: flex;
-    gap: 16px;
-  }
-`;
+export default PageHeading;
diff --git a/kafka-ui-react-app/src/lib/constants.ts b/kafka-ui-react-app/src/lib/constants.ts
index 5626c06ee34..49ca968ba44 100644
--- a/kafka-ui-react-app/src/lib/constants.ts
+++ b/kafka-ui-react-app/src/lib/constants.ts
@@ -1,5 +1,4 @@
 import { ConfigurationParameters } from 'generated-sources';
-import { BreadcrumbDefinitions } from 'components/common/Breadcrumb/Breadcrumb';
 
 declare global {
   interface Window {
@@ -59,10 +58,6 @@ export const GIT_REPO_LATEST_RELEASE_LINK =
 export const GIT_TAG = process.env.VITE_TAG;
 export const GIT_COMMIT = process.env.VITE_COMMIT;
 
-export const BREADCRUMB_DEFINITIONS: BreadcrumbDefinitions = {
-  Ksqldb: 'ksqlDB',
-};
-
 export enum AsyncRequestStatus {
   initial = 'initial',
   pending = 'pending',
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index b890115d9b8..4c057645ef1 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -95,8 +95,16 @@ const theme = {
       color: Colors.neutral[20],
     },
   },
+  pageHeading: {
+    dividerColor: Colors.neutral[30],
+    backLink: {
+      color: {
+        normal: Colors.brand[70],
+        hover: Colors.brand[60],
+      },
+    },
+  },
   panelColor: Colors.neutral[0],
-  breadcrumb: Colors.neutral[30],
   connectEditWarning: Colors.yellow[10],
   dropdown: {
     backgroundColor: Colors.neutral[0],
@@ -143,7 +151,7 @@ const theme = {
     },
     variants: {
       1: {
-        fontSize: '24px',
+        fontSize: '20px',
         lineHeight: '32px',
       },
       2: {
@@ -293,6 +301,7 @@ const theme = {
     border: {
       top: Colors.neutral[5],
       bottom: Colors.neutral[5],
+      contrast: Colors.neutral[30],
     },
     overlay: Colors.transparency[10],
     shadow: Colors.transparency[20],

From fd62f7653413e1446e93af63962e1b51f6979ec1 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 17 Aug 2022 18:54:24 +0400
Subject: [PATCH 121/734] Update readme

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 38e885c1640..6dcb20cd772 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,8 @@
 [![Chat with us](https://img.shields.io/discord/897805035122077716)](https://discord.gg/4DWzD7pGE5)
 
 ### DISCLAIMER
-<em>UI for Apache Kafka is a free, open-source tool that is curated by Provectus, and is built and supported by the open-source community. It will remain free and open-source in the future. Provectus does not plan to add any paid features or subscription plans so that everyone can have a better experience observing their data. UI for Apache Kafka is a part of the [Provectus NextGen Data Platform](https://provectus.com/nextgen-data-platform/) — Check it out! Also, learn more about [Professional Services for Apache Kafka](https://provectus.com/professional-services-apache-kafka/), to start handling your Kafka clusters and streaming apps with the help of Provectus Kafka experts. </em> 
+<em>UI for Apache Kafka is a free tool built and supported by the open-source community. Curated by Provectus, it will remain free and open-source, without any paid features or subscription plans to be added in the future.
+Looking for the help of Kafka experts? Provectus can help you design, build, deploy, and manage Apache Kafka clusters and streaming applications. Discover [Professional Services for Apache Kafka](https://provectus.com/professional-services-apache-kafka/), to unlock the full potential of Kafka in your enteprise! </em>
 
 
 #### UI for Apache Kafka is a free, open-source web UI to monitor and manage Apache Kafka clusters. 

From a665fb4d83041857995a5b47eb307c70a3ae289b Mon Sep 17 00:00:00 2001
From: MichaelGonzalezMurillo
 <110129349+MichaelGonzalezMurillo@users.noreply.github.com>
Date: Wed, 17 Aug 2022 09:17:37 -0600
Subject: [PATCH 122/734] Add an ability to build api without frontend based on
 a property (#2424)

---
 documentation/project/contributing/building.md | 7 +++++++
 kafka-ui-api/pom.xml                           | 1 +
 2 files changed, 8 insertions(+)

diff --git a/documentation/project/contributing/building.md b/documentation/project/contributing/building.md
index 21562426e5e..7b530829b92 100644
--- a/documentation/project/contributing/building.md
+++ b/documentation/project/contributing/building.md
@@ -19,6 +19,13 @@ docker-compose -f ./documentation/compose/kafka-clusters-only.yaml up -d
 
 Then, start the app.
 
+### Building only the API
+
+To build only the kafka-ui-api you can use this command:
+```sh
+./mvnw -f kafka-ui-api/pom.xml clean install -Pprod -DskipUIBuild=true
+```
+
 ## Where to go next
 
 In the next section, you'll [learn how to run the application](running.md).
\ No newline at end of file
diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 53eb24731d7..5c00dc0f6d9 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -404,6 +404,7 @@
                         <artifactId>frontend-maven-plugin</artifactId>
                         <version>${frontend-maven-plugin.version}</version>
                         <configuration>
+                            <skip>${skipUIBuild}</skip>
                             <workingDirectory>../kafka-ui-react-app</workingDirectory>
                             <environmentVariables>
                                 <VITE_TAG>${project.version}</VITE_TAG>

From a5f539c62aff5f97d244927d63f185475397636c Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Thu, 18 Aug 2022 11:16:00 +0300
Subject: [PATCH 123/734] verify Step annotation cross page methods #2434
 (#2448)

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../provectus/kafka/ui/pages/MainPage.java    |  3 +-
 .../com/provectus/kafka/ui/pages/Pages.java   |  7 ++++
 .../kafka/ui/pages/ProduceMessagePage.java    |  9 ++--
 .../ui/pages/connector/ConnectorsList.java    |  4 +-
 .../ui/pages/schema/SchemaCreateView.java     |  9 ++--
 .../kafka/ui/pages/schema/SchemaEditView.java |  8 ++--
 .../ui/pages/schema/SchemaRegistryList.java   |  5 ++-
 .../kafka/ui/pages/schema/SchemaView.java     |  2 +-
 .../topic/TopicCreateEditSettingsView.java    | 41 ++++++++++---------
 .../kafka/ui/pages/topic/TopicView.java       |  5 +++
 .../kafka/ui/pages/topic/TopicsList.java      |  2 +
 11 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
index 797d0277b9d..515ab60ffee 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
@@ -33,10 +33,11 @@ public MainPage waitUntilScreenReady() {
     }
 
     @SneakyThrows
+    @Step
     public void topicIsVisible(String topicName) {
         new TopicsList().isTopicVisible(topicName);
     }
-
+    @Step
     public void topicIsNotVisible(String topicName){
         new TopicsList().isTopicNotVisible(topicName);
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
index 298bc22d8cf..aced5fe89cf 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
@@ -5,6 +5,7 @@
 import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
 import com.provectus.kafka.ui.pages.topic.TopicView;
 import com.provectus.kafka.ui.pages.topic.TopicsList;
+import io.qameta.allure.Step;
 
 public class Pages {
 
@@ -18,26 +19,32 @@ public class Pages {
     public ConnectorsView connectorsView = new ConnectorsView();
     public SchemaRegistryList schemaRegistry = new SchemaRegistryList();
 
+    @Step
     public MainPage open() {
         return openMainPage();
     }
 
+    @Step
     public MainPage openMainPage() {
         return mainPage.goTo();
     }
 
+    @Step
     public TopicsList openTopicsList(String clusterName) {
         return topicsList.goTo(clusterName);
     }
 
+    @Step
     public TopicView openTopicView(String clusterName, String topicName) {
         return topicView.goTo(clusterName, topicName);
     }
 
+    @Step
     public ConnectorsList openConnectorsList(String clusterName) {
         return connectorsList.goTo(clusterName);
     }
 
+    @Step
     public ConnectorsView openConnectorsView(String clusterName, String connectorName) {
         return connectorsView.goTo(clusterName, connectorName);
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
index 3d430bb76e5..369cf56ea8d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
@@ -3,6 +3,7 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.topic.TopicView;
+import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.support.ui.ExpectedConditions;
@@ -16,26 +17,26 @@ public class ProduceMessagePage{
     private final SelenideElement contentField = $(By.xpath("//div[@id = 'content']/textarea"));
     private final SelenideElement headersField = $(By.xpath("//div[@id = 'headers']/textarea"));
     private final SelenideElement sendBtn = $(By.xpath("//button[@type = 'submit']"));
-
+    @Step
     public ProduceMessagePage setKeyField(String value) {
         Wait().until(ExpectedConditions.urlContains("message"));
         keyField.sendKeys(Keys.chord(Keys.DELETE));
         keyField.setValue(value);
         return this;
     }
-
+    @Step
     public ProduceMessagePage setContentFiled(String value) {
         Wait().until(ExpectedConditions.urlContains("message"));
         contentField.sendKeys(Keys.DELETE);
         contentField.setValue(value);
         return this;
     }
-
+    @Step
     public ProduceMessagePage setHeaderFiled(String value) {
         headersField.setValue(value);
         return new ProduceMessagePage();
     }
-
+    @Step
     public TopicView submitProduceMessage() {
         sendBtn.shouldBe(Condition.visible).click();
         return new TopicView();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
index ed4b045caef..659a87da2c8 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
@@ -36,12 +36,14 @@ public ConnectorCreateView clickCreateConnectorButton() {
     }
 
     @SneakyThrows
+    @Step
     public ConnectorsList openConnector(String connectorName) {
         $(By.linkText(connectorName)).click();
         return this;
     }
 
     @SneakyThrows
+    @Step
     public ConnectorsList isNotVisible(String connectorName) {
         $(By.xpath("//table")).shouldBe(Condition.visible);
         $x("//tbody//td[1]//a[text()='" + connectorName + "']").shouldBe(Condition.not(Condition.visible));
@@ -54,7 +56,7 @@ public ConnectorsList connectorIsVisibleInList(String connectorName, String topi
        $$(By.linkText(topicName));
         return this;
     }
-
+    @Step
     public ConnectorsList connectorIsUpdatedInList(String connectorName, String topicName) {
         $(By.xpath(String.format("//a[text() = '%s']", connectorName))).shouldBe(Condition.visible);
         By.xpath(String.format("//a[text() = '%s']", topicName)).refreshUntil(Condition.visible);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
index 3b304302d68..11940326f42 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
@@ -2,6 +2,7 @@
 
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.utils.BrowserUtils;
+import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.$;
@@ -12,23 +13,23 @@ public class SchemaCreateView {
     private final SelenideElement subjectName = $(By.xpath("//input[@name='subject']"));
     private final SelenideElement schemaField = $(By.xpath("//textarea[@name='schema']"));
     private final SelenideElement submitSchemaButton = $(By.xpath("//button[@type='submit']"));
-
+    @Step
     public SchemaCreateView selectSchemaTypeFromDropdown(SchemaType schemaType) {
         $("ul[role='listbox']").click();
         $x("//li[text()='" + schemaType.getValue() + "']").click();
         return this;
     }
-
+    @Step
     public SchemaView clickSubmit() {
         BrowserUtils.javaExecutorClick(submitSchemaButton);
         return new SchemaView();
     }
-
+    @Step
     public SchemaCreateView setSubjectName(String name) {
         subjectName.setValue(name);
         return this;
     }
-
+    @Step
     public SchemaCreateView setSchemaField(String text) {
         schemaField.setValue(text);
         return this;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
index 87f52d5bbf8..b4e2ca419e6 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
@@ -16,19 +16,19 @@ public class SchemaEditView {
 
     SelenideElement newSchemaTextArea = $("#newSchema [wrap]");
 
-
+    @Step
     public SchemaEditView selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType schemaType) {
         $x("//ul[@name='schemaType']").click();
         $x("//li[text()='" + schemaType.getValue() + "']").click();
         return this;
     }
-
+    @Step
     public SchemaEditView selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum level) {
         $x("//ul[@name='compatibilityLevel']").click();
         $x("//li[text()='" + level.getValue() + "']").click();
         return this;
     }
-
+    @Step
     public SchemaView clickSubmit() {
         BrowserUtils.javaExecutorClick($(By.xpath("//button[@type='submit']")));
         return new SchemaView();
@@ -43,7 +43,7 @@ public SchemaEditView setNewSchemaValue(String configJson) {
         return this;
     }
 
-
+    @Step
     public SchemaRegistryList removeSchema() {
         $(By.xpath("//*[contains(text(),'Remove')]")).click();
         $(By.xpath("//*[text()='Confirm']")).shouldBe(Condition.visible).click();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index fac3d1bec62..34ee71c7ffc 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -12,18 +12,19 @@
 public class SchemaRegistryList {
 
     private final SelenideElement schemaButton = $(By.xpath("//*[contains(text(),'Create Schema')]"));
-
+    @Step
     public SchemaCreateView clickCreateSchema() {
         BrowserUtils.javaExecutorClick(schemaButton);
         return new SchemaCreateView();
     }
-
+    @Step
     public SchemaView openSchema(String schemaName) {
         $(By.xpath("//*[contains(text(),'" + schemaName + "')]")).click();
         return new SchemaView();
     }
 
     @SneakyThrows
+    @Step
     public SchemaRegistryList isNotVisible(String schemaName) {
         $x(String.format("//*[contains(text(),'%s')]",schemaName)).shouldNotBe(Condition.visible);
         return this;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
index a2b715f4f18..320ba0546f4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
@@ -28,7 +28,7 @@ public SchemaEditView openEditSchema(){
         $x("//button[text()= 'Edit Schema']").click();
         return new SchemaEditView();
     }
-
+    @Step
     public SchemaRegistryList removeSchema() {
         BrowserUtils.javaExecutorClick($(".dropdown.is-right button"));
         $(By.xpath("//*[contains(text(),'Remove')]")).click();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
index bd6bc8fc0de..330c457ddaa 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
@@ -4,6 +4,7 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
+import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 
@@ -14,43 +15,43 @@ public class TopicCreateEditSettingsView {
 
     private final SelenideElement timeToRetain = $(By.cssSelector("input#timeToRetain"));
     private final SelenideElement maxMessageBytes = $(By.name("maxMessageBytes"));
-
+    @Step
     public TopicCreateEditSettingsView setTopicName(String topicName) {
         $("input#topicFormName").setValue(topicName);
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView setMinInsyncReplicas(Integer minInsyncReplicas) {
-        $("input[name=minInsyncReplicas]").setValue(minInsyncReplicas.toString());
+        $("input[name=minInSyncReplicas]").setValue(minInsyncReplicas.toString());
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView setTimeToRetainDataInMs(Long ms) {
         timeToRetain.setValue(ms.toString());
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView setTimeToRetainDataInMs(String ms) {
         timeToRetain.setValue(ms);
         return this;
     }
 
-
+    @Step
     public TopicCreateEditSettingsView setMaxSizeOnDiskInGB(String value) {
         KafkaUISelectElement kafkaUISelectElement = new KafkaUISelectElement("retentionBytes");
         kafkaUISelectElement.selectByVisibleText(value);
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView setMaxMessageBytes(Long bytes) {
         maxMessageBytes.setValue(bytes.toString());
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView setMaxMessageBytes(String bytes) {
         return setMaxMessageBytes(Long.parseLong(bytes));
     }
-
+    @Step
     public TopicCreateEditSettingsView setTimeToRetainDataInMsUsingButtons(String value) {
         timeToRetain
                 .parent()
@@ -61,31 +62,31 @@ public TopicCreateEditSettingsView setTimeToRetainDataInMsUsingButtons(String va
         return this;
     }
 
-
+    @Step
     public TopicCreateEditSettingsView selectCleanupPolicy(CleanupPolicyValue cleanupPolicyValue) {
         return selectFromDropDownByOptionValue("cleanupPolicy",
                 cleanupPolicyValue.getOptionValue());
     }
-
+    @Step
     public TopicCreateEditSettingsView selectCleanupPolicy(String cleanupPolicyOptionValue) {
         $("ul#topicFormCleanupPolicy").click();
         $x("//li[text()='" + cleanupPolicyOptionValue + "']").click();
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView selectRetentionBytes(String visibleValue) {
         return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
     }
-
+    @Step
     public TopicCreateEditSettingsView selectRetentionBytes(Long optionValue) {
         return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
     }
-
+    @Step
     public TopicView sendData() {
         BrowserUtils.javaExecutorClick($x("//button[@type='submit']"));
         return new TopicView();
     }
-
+    @Step
     public TopicCreateEditSettingsView addCustomParameter(String customParameterName,
                                                           String customParameterValue) {
         ElementsCollection customParametersElements =
@@ -109,7 +110,7 @@ public TopicCreateEditSettingsView addCustomParameter(String customParameterName
                 .setValue(customParameterValue);
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView updateCustomParameter(String customParameterName,
                                                              String customParameterValue) {
         SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
@@ -121,7 +122,7 @@ public TopicCreateEditSettingsView updateCustomParameter(String customParameterN
         $(String.format("input[name^=%s]", name)).setValue(customParameterValue);
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView cleanupPolicyIs(String value) {
         String cleanupPolicy = new KafkaUISelectElement("cleanupPolicy")
                 .getCurrentValue();
@@ -130,7 +131,7 @@ public TopicCreateEditSettingsView cleanupPolicyIs(String value) {
                 .isEqualToIgnoringCase(value);
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView timeToRetainIs(String time) {
         String value = timeToRetain.getValue();
         assertThat(value)
@@ -138,7 +139,7 @@ public TopicCreateEditSettingsView timeToRetainIs(String time) {
                 .isEqualTo(time);
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView maxSizeOnDiskIs(String size) {
         String retentionBytes = new KafkaUISelectElement("retentionBytes")
                 .getCurrentValue();
@@ -147,7 +148,7 @@ public TopicCreateEditSettingsView maxSizeOnDiskIs(String size) {
                 .isEqualTo(size);
         return this;
     }
-
+    @Step
     public TopicCreateEditSettingsView maxMessageBytesIs(String bytes) {
         String value = maxMessageBytes.getValue();
         assertThat(value)
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index 9e667df7197..c3607fceab4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -35,6 +35,7 @@ public TopicView waitUntilScreenReady() {
     }
 
     @SneakyThrows
+    @Step
     public TopicCreateEditSettingsView openEditSettings() {
         BrowserUtils.javaExecutorClick(dotMenuHeader);
         $x("//a[text()= '" + DotMenuHeaderItems.EDIT_SETTINGS.getValue() + "']").click();
@@ -48,6 +49,7 @@ public TopicView openTopicMenu(TopicMenu menu) {
     }
 
     @SneakyThrows
+    @Step
     public TopicsList deleteTopic() {
         BrowserUtils.javaExecutorClick(dotMenuHeader);
         $("#dropdown-menu").$(byLinkText(DotMenuHeaderItems.REMOVE_TOPIC.getValue())).click();
@@ -56,15 +58,18 @@ public TopicsList deleteTopic() {
     }
 
     @SneakyThrows
+    @Step
     public ProduceMessagePage clickOnButton(String buttonName) {
         BrowserUtils.javaExecutorClick($(By.xpath(String.format("//div//button[text()='%s']", buttonName))));
         return new ProduceMessagePage();
     }
 
+    @Step
     public boolean isKeyMessageVisible(String keyMessage) {
         return keyMessage.equals($("td[title]").getText());
     }
 
+    @Step
     public boolean isContentMessageVisible(String contentMessage) {
         return contentMessage.matches($x("//html//div[@id='root']/div/main//table//p").getText().trim());
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index ccdf4b7a110..c39a3ca1b96 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -47,12 +47,14 @@ public TopicsList isTopicVisible(String topicName) {
     }
 
     @SneakyThrows
+    @Step
     public TopicView openTopic(String topicName) {
         $(By.linkText(topicName)).click();
         return new TopicView();
     }
 
     @SneakyThrows
+    @Step
     public TopicsList isTopicNotVisible(String topicName) {
         $$x("//table/tbody/tr/td[2]")
                 .shouldBe(CollectionCondition.sizeGreaterThan(0))

From 95a030614337529ff3dd578bb03fe1de18e5da7e Mon Sep 17 00:00:00 2001
From: KriKiparoidze <92114648+KriKiparoidze@users.noreply.github.com>
Date: Thu, 18 Aug 2022 05:28:51 -0500
Subject: [PATCH 124/734] Bugfix/2320 move tasks to a new table (#2455)

* #2320 #2321 move tasks to a new table

* #2320 #2321 test coverage

* #2320 #2321 code review fix

* Fix Expandable rows

Co-authored-by: Oleg Shuralev <workshur@gmail.com>
---
 .../Details/Tasks/ActionsCellTasks.tsx        |  32 ++++++
 .../Connect/Details/Tasks/Tasks.tsx           | 103 ++++++++---------
 .../Details/Tasks/__tests__/Tasks.spec.tsx    | 106 ++++++++++++++++--
 .../common/NewTable/ExpanderCell.tsx          |   1 +
 .../common/NewTable/Table.styled.ts           |  19 ++--
 .../src/components/common/NewTable/Table.tsx  |  10 +-
 .../src/lib/fixtures/kafkaConnect.ts          |   2 +
 kafka-ui-react-app/src/theme/theme.ts         |   1 +
 8 files changed, 193 insertions(+), 81 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Connect/Details/Tasks/ActionsCellTasks.tsx

diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/ActionsCellTasks.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/ActionsCellTasks.tsx
new file mode 100644
index 00000000000..6d2cf845e1b
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/Details/Tasks/ActionsCellTasks.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { Task } from 'generated-sources';
+import { CellContext } from '@tanstack/react-table';
+import useAppParams from 'lib/hooks/useAppParams';
+import { useRestartConnectorTask } from 'lib/hooks/api/kafkaConnect';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { RouterParamsClusterConnectConnector } from 'lib/paths';
+
+const ActionsCellTasks: React.FC<CellContext<Task, unknown>> = ({ row }) => {
+  const { id } = row.original;
+  const routerProps = useAppParams<RouterParamsClusterConnectConnector>();
+  const restartMutation = useRestartConnectorTask(routerProps);
+
+  const restartTaskHandler = (taskId?: number) => {
+    if (taskId === undefined) return;
+    restartMutation.mutateAsync(taskId);
+  };
+
+  return (
+    <Dropdown>
+      <DropdownItem
+        onClick={() => restartTaskHandler(id?.task)}
+        danger
+        confirm="Are you sure you want to restart the task?"
+      >
+        <span>Restart task</span>
+      </DropdownItem>
+    </Dropdown>
+  );
+};
+
+export default ActionsCellTasks;
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
index 74dd89ab873..bb21e895380 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Tasks/Tasks.tsx
@@ -1,69 +1,58 @@
 import React from 'react';
-import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import {
-  useConnectorTasks,
-  useRestartConnectorTask,
-} from 'lib/hooks/api/kafkaConnect';
+import { useConnectorTasks } from 'lib/hooks/api/kafkaConnect';
 import useAppParams from 'lib/hooks/useAppParams';
 import { RouterParamsClusterConnectConnector } from 'lib/paths';
-import getTagColor from 'components/common/Tag/getTagColor';
-import { Tag } from 'components/common/Tag/Tag.styled';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { ColumnDef, Row } from '@tanstack/react-table';
+import { Task } from 'generated-sources';
+import Table, { TagCell } from 'components/common/NewTable';
+
+import ActionsCellTasks from './ActionsCellTasks';
+
+const ExpandedTaskRow: React.FC<{ row: Row<Task> }> = ({ row }) => {
+  return <div>{row.original.status.trace}</div>;
+};
+
+const MAX_LENGTH = 100;
 
 const Tasks: React.FC = () => {
   const routerProps = useAppParams<RouterParamsClusterConnectConnector>();
-  const { data: tasks } = useConnectorTasks(routerProps);
-  const restartMutation = useRestartConnectorTask(routerProps);
+  const { data = [] } = useConnectorTasks(routerProps);
 
-  const restartTaskHandler = (taskId?: number) => {
-    if (taskId === undefined) return;
-    restartMutation.mutateAsync(taskId);
-  };
+  const columns = React.useMemo<ColumnDef<Task>[]>(
+    () => [
+      { header: 'ID', accessorKey: 'status.id' },
+      { header: 'Worker', accessorKey: 'status.workerId' },
+      { header: 'State', accessorKey: 'status.state', cell: TagCell },
+      {
+        header: 'Trace',
+        accessorKey: 'status.trace',
+        enableSorting: false,
+        cell: ({ getValue }) => {
+          const trace = getValue<string>() || '';
+          return trace.toString().length > MAX_LENGTH
+            ? `${trace.toString().substring(0, MAX_LENGTH - 3)}...`
+            : trace;
+        },
+        meta: { width: '70%' },
+      },
+      {
+        id: 'actions',
+        header: '',
+        cell: ActionsCellTasks,
+      },
+    ],
+    []
+  );
 
   return (
-    <Table isFullwidth>
-      <thead>
-        <tr>
-          <TableHeaderCell title="ID" />
-          <TableHeaderCell title="Worker" />
-          <TableHeaderCell title="State" />
-          <TableHeaderCell title="Trace" />
-          <TableHeaderCell />
-        </tr>
-      </thead>
-      <tbody>
-        {tasks?.length === 0 && (
-          <tr>
-            <td colSpan={10}>No tasks found</td>
-          </tr>
-        )}
-        {tasks?.map((task) => (
-          <tr key={task.status?.id}>
-            <td>{task.status?.id}</td>
-            <td>{task.status?.workerId}</td>
-            <td>
-              <Tag color={getTagColor(task.status.state)}>
-                {task.status.state}
-              </Tag>
-            </td>
-            <td>{task.status.trace || 'null'}</td>
-            <td style={{ width: '5%' }}>
-              <div>
-                <Dropdown>
-                  <DropdownItem
-                    onClick={() => restartTaskHandler(task.id?.task)}
-                    danger
-                  >
-                    <span>Restart task</span>
-                  </DropdownItem>
-                </Dropdown>
-              </div>
-            </td>
-          </tr>
-        ))}
-      </tbody>
-    </Table>
+    <Table
+      columns={columns}
+      data={data}
+      emptyMessage="No tasks found"
+      enableSorting
+      getRowCanExpand={(row) => row.original.status.trace?.length > 0}
+      renderSubComponent={ExpandedTaskRow}
+    />
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx
index efb72d1812c..da38068a203 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx
@@ -3,8 +3,13 @@ import { render, WithRoute } from 'lib/testHelpers';
 import { clusterConnectConnectorTasksPath } from 'lib/paths';
 import Tasks from 'components/Connect/Details/Tasks/Tasks';
 import { tasks } from 'lib/fixtures/kafkaConnect';
-import { screen } from '@testing-library/dom';
-import { useConnectorTasks } from 'lib/hooks/api/kafkaConnect';
+import { screen, within, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import {
+  useConnectorTasks,
+  useRestartConnectorTask,
+} from 'lib/hooks/api/kafkaConnect';
+import { Task } from 'generated-sources';
 
 jest.mock('lib/hooks/api/kafkaConnect', () => ({
   useConnectorTasks: jest.fn(),
@@ -13,30 +18,109 @@ jest.mock('lib/hooks/api/kafkaConnect', () => ({
 
 const path = clusterConnectConnectorTasksPath('local', 'ghp', '1');
 
+const restartConnectorMock = jest.fn();
+
 describe('Tasks', () => {
-  const renderComponent = () =>
+  beforeEach(() => {
+    (useRestartConnectorTask as jest.Mock).mockImplementation(() => ({
+      mutateAsync: restartConnectorMock,
+    }));
+  });
+
+  const renderComponent = (currentData: Task[] | undefined = undefined) => {
+    (useConnectorTasks as jest.Mock).mockImplementation(() => ({
+      data: currentData,
+    }));
+
     render(
       <WithRoute path={clusterConnectConnectorTasksPath()}>
         <Tasks />
       </WithRoute>,
       { initialEntries: [path] }
     );
+  };
 
   it('renders empty table', () => {
-    (useConnectorTasks as jest.Mock).mockImplementation(() => ({
-      data: [],
-    }));
-
     renderComponent();
     expect(screen.getByRole('table')).toBeInTheDocument();
     expect(screen.getByText('No tasks found')).toBeInTheDocument();
   });
 
   it('renders tasks table', () => {
-    (useConnectorTasks as jest.Mock).mockImplementation(() => ({
-      data: tasks,
-    }));
-    renderComponent();
+    renderComponent(tasks);
     expect(screen.getAllByRole('row').length).toEqual(tasks.length + 1);
+
+    expect(
+      screen.getByRole('row', {
+        name: '1 kafka-connect0:8083 RUNNING',
+      })
+    ).toBeInTheDocument();
+  });
+
+  it('renders truncates long trace and expands', () => {
+    renderComponent(tasks);
+
+    const trace = tasks[2]?.status?.trace || '';
+    const truncatedTrace = trace.toString().substring(0, 100 - 3);
+
+    const thirdRow = screen.getByRole('row', {
+      name: `3 kafka-connect0:8083 RUNNING ${truncatedTrace}...`,
+    });
+    expect(thirdRow).toBeInTheDocument();
+
+    const expandedDetails = screen.queryByText(trace);
+    //  Full trace is not visible
+    expect(expandedDetails).not.toBeInTheDocument();
+
+    userEvent.click(thirdRow);
+
+    expect(
+      screen.getByRole('row', {
+        name: trace,
+      })
+    ).toBeInTheDocument();
+  });
+
+  describe('Action button', () => {
+    const expectDropdownExists = () => {
+      const firstTaskRow = screen.getByRole('row', {
+        name: '1 kafka-connect0:8083 RUNNING',
+      });
+      expect(firstTaskRow).toBeInTheDocument();
+      const extBtn = within(firstTaskRow).getByRole('button', {
+        name: 'Dropdown Toggle',
+      });
+      expect(extBtn).toBeEnabled();
+      userEvent.click(extBtn);
+      expect(screen.getByRole('menu')).toBeInTheDocument();
+    };
+
+    it('renders action button', () => {
+      renderComponent(tasks);
+      expectDropdownExists();
+      expect(
+        screen.getAllByRole('button', { name: 'Dropdown Toggle' }).length
+      ).toEqual(tasks.length);
+      // Action buttons are enabled
+      const actionBtn = screen.getAllByRole('menuitem');
+      expect(actionBtn[0]).toHaveTextContent('Restart task');
+    });
+
+    it('works as expected', async () => {
+      renderComponent(tasks);
+      expectDropdownExists();
+      const actionBtn = screen.getAllByRole('menuitem');
+      expect(actionBtn[0]).toHaveTextContent('Restart task');
+
+      userEvent.click(actionBtn[0]);
+      expect(
+        screen.getByText('Are you sure you want to restart the task?')
+      ).toBeInTheDocument();
+
+      expect(screen.getByText('Confirm the action')).toBeInTheDocument();
+      userEvent.click(screen.getByRole('button', { name: 'Confirm' }));
+
+      await waitFor(() => expect(restartConnectorMock).toHaveBeenCalled());
+    });
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
index d53c3d79028..ff5e501d527 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
@@ -12,6 +12,7 @@ const ExpanderCell: React.FC<CellContext<unknown, unknown>> = ({ row }) => (
     xmlns="http://www.w3.org/2000/svg"
     role="button"
     aria-label="Expand row"
+    $disabled={!row.getCanExpand()}
   >
     {row.getIsExpanded() ? (
       <path
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
index 5fc02176ee5..75671beca90 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
@@ -1,14 +1,15 @@
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
 
-export const ExpaderButton = styled.svg(
-  ({ theme: { table } }) => `
-  & > path {
-    fill: ${table.expander.normal};
-    &:hover {
-      fill: ${table.expander.hover};
+export const ExpaderButton = styled.svg<{ $disabled: boolean }>(
+  ({ theme: { table }, $disabled }) => css`
+    & > path {
+      fill: ${table.expander[$disabled ? 'disabled' : 'normal']};
     }
-  }
-`
+
+    &:hover > path {
+      fill: ${table.expander[$disabled ? 'disabled' : 'hover']};
+    }
+  `
 );
 
 interface ThProps {
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index aaf02ea4082..3b3a780674c 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -246,15 +246,15 @@ const Table: React.FC<TableProps<any>> = ({
                 }
               >
                 {!!enableRowSelection && (
-                  <td key={`${row.id}-select`}>
+                  <td key={`${row.id}-select`} style={{ width: '1px' }}>
                     {flexRender(
                       SelectRowCell,
                       row.getVisibleCells()[0].getContext()
                     )}
                   </td>
                 )}
-                {row.getCanExpand() && (
-                  <td key={`${row.id}-expander`}>
+                {table.getCanSomeRowsExpand() && (
+                  <td key={`${row.id}-expander`} style={{ width: '1px' }}>
                     {flexRender(
                       ExpanderCell,
                       row.getVisibleCells()[0].getContext()
@@ -264,7 +264,9 @@ const Table: React.FC<TableProps<any>> = ({
                 {row
                   .getVisibleCells()
                   .map(({ id, getContext, column: { columnDef } }) => (
-                    <td key={id}>{flexRender(columnDef.cell, getContext())}</td>
+                    <td key={id} style={columnDef.meta}>
+                      {flexRender(columnDef.cell, getContext())}
+                    </td>
                   ))}
               </S.Row>
               {row.getIsExpanded() && renderSubComponent && (
diff --git a/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts b/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts
index f885ea405df..8a79760e661 100644
--- a/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/kafkaConnect.ts
@@ -93,6 +93,8 @@ export const tasks: Task[] = [
       id: 3,
       state: ConnectorTaskStatus.RUNNING,
       workerId: 'kafka-connect0:8083',
+      trace:
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
     },
     config: {
       'batch.size': '3000',
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 4c057645ef1..a962b2a5356 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -346,6 +346,7 @@ const theme = {
     expander: {
       normal: Colors.brand[50],
       hover: Colors.brand[20],
+      disabled: Colors.neutral[10],
     },
   },
   primaryTab: {

From 26d800f997ab32b408d0e307370985ebe2b9cf5c Mon Sep 17 00:00:00 2001
From: KriKiparoidze <92114648+KriKiparoidze@users.noreply.github.com>
Date: Thu, 18 Aug 2022 07:51:51 -0500
Subject: [PATCH 125/734] Fix smart filters multiple conditions (#2400)

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../src/components/Topics/Topic/Messages/Filters/Filters.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 7acf873d6d9..018a8ef1fff 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -223,7 +223,7 @@ const Filters: React.FC<FiltersProps> = ({
 
       const newProps = omitBy(props, (v) => v === undefined || v === '');
       const qs = Object.keys(newProps)
-        .map((key) => `${key}=${newProps[key]}`)
+        .map((key) => `${key}=${encodeURIComponent(newProps[key] as string)}`)
         .join('&');
 
       navigate({

From 6f00ee0273ae2c1a5665c3e40a2c35b0e6d7c83e Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Fri, 19 Aug 2022 15:24:55 +0300
Subject: [PATCH 126/734] [e2e] Add pageLoadTimeout (#2472)

---
 .../src/test/java/com/provectus/kafka/ui/base/BaseTest.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 9ccd401b319..a03047f2684 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -134,6 +134,7 @@ private static void setup() {
     Configuration.browser = TestConfiguration.BROWSER;
     Configuration.baseUrl = TestConfiguration.BASE_WEB_URL;
     Configuration.timeout = 10000;
+    Configuration.pageLoadTimeout = 180000;
     Configuration.browserSize = TestConfiguration.BROWSER_SIZE;
     SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
   }

From 862456921f32c6428311232bd14d73d8ee668dd2 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 19 Aug 2022 20:08:40 +0400
Subject: [PATCH 127/734] Fix e2e tests stability (#2461)

---
 .../java/com/provectus/kafka/ui/base/BaseTest.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index a03047f2684..6a1e6029bc3 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -31,15 +31,15 @@
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.BrowserWebDriverContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
 @Slf4j
 @DisplayNameGeneration(CamelCaseToSpacedDisplayNameGenerator.class)
 public class BaseTest {
 
-  public static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome";
-  public static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium";
+  public static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
+  public static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
   protected Pages pages = Pages.INSTANCE;
   protected Helpers helpers = Helpers.INSTANCE;
 
@@ -64,7 +64,6 @@ public void setWebDriver() {
 
   @BeforeAll
   public static void start() {
-
     DockerImageName image = isARM64()
         ? DockerImageName.parse(SELENIARM_STANDALONE_CHROMIUM).asCompatibleSubstituteFor(SELENIUM_IMAGE_NAME)
         : DockerImageName.parse(SELENIUM_IMAGE_NAME);
@@ -74,13 +73,14 @@ public static void start() {
         .withEnv("JAVA_OPTS", "-Dwebdriver.chrome.whitelistedIps=")
         .withCapabilities(new ChromeOptions()
             .addArguments("--disable-dev-shm-usage")
+            .addArguments("--disable-gpu")
+            .addArguments("--no-sandbox")
             .addArguments("--verbose")
         )
-        .waitingFor(Wait.forHttp("/"))
-        //.withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: ")) // uncomment for debugging
-        .waitingFor(Wait.forLogMessage(".*Started Selenium Standalone.*", 1));
+        .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
     try {
       Testcontainers.exposeHostPorts(8080);
+      log.info("Starting browser container");
       webDriverContainer.start();
     } catch (Throwable e) {
       log.error("Couldn't start a container", e);

From d63c25e3173de78b34426af19416d72035fdcdf7 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Fri, 19 Aug 2022 19:38:35 +0300
Subject: [PATCH 128/734] Delete of Steps package #2433 (#2466)

Co-authored-by: anezboretskiy <anezboretskiy@modeln.com>
Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../com/provectus/kafka/ui/steps/Steps.java   | 12 ----
 .../kafka/ui/steps/kafka/KafkaSteps.java      | 62 -------------------
 2 files changed, 74 deletions(-)
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/steps/Steps.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/steps/kafka/KafkaSteps.java

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/steps/Steps.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/steps/Steps.java
deleted file mode 100644
index 2f3fae81a90..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/steps/Steps.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.provectus.kafka.ui.steps;
-
-import com.provectus.kafka.ui.steps.kafka.KafkaSteps;
-
-public class Steps {
-
-    public static final Steps INSTANCE = new Steps();
-
-    private Steps(){}
-
-    public KafkaSteps kafka = new KafkaSteps();
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/steps/kafka/KafkaSteps.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/steps/kafka/KafkaSteps.java
deleted file mode 100644
index ccaaa19b806..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/steps/kafka/KafkaSteps.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.provectus.kafka.ui.steps.kafka;
-
-import lombok.SneakyThrows;
-import org.apache.kafka.clients.admin.*;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class KafkaSteps {
-
-  int partitions = 2;
-  short replicationFactor = 1;
-  public enum Cluster{
-    SECOND_LOCAL("secondLocal","localhost:9093"),LOCAL("local","localhost:9092");
-    private String name;
-    private String server;
-    private  Map<String, Object> config = new HashMap<>();
-    Cluster(String name,String server) {
-      this.name = name;
-      this.server = server;
-      this.config.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, server);
-      this.config.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, "5000");
-    }
-
-    public String getName() {
-      return name;
-    }
-  }
-
-
-  @SneakyThrows
-  public void createTopic(Cluster cluster,String topicName) {
-    try (AdminClient client = AdminClient.create(cluster.config)) {
-      client
-          .createTopics(
-              Collections.singleton(new NewTopic(topicName, partitions, replicationFactor)),
-              new CreateTopicsOptions().timeoutMs(1000))
-          .all()
-          .get();
-
-      assertTrue(client
-              .listTopics()
-              .names().get().contains(topicName));
-
-    }
-  }
-
-  @SneakyThrows
-  public void deleteTopic(Cluster cluster,String topicName) {
-    try (AdminClient client = AdminClient.create(cluster.config)) {
-      assertTrue(client.listTopics().names().get().contains(topicName));
-      client
-          .deleteTopics(
-              Collections.singleton(topicName), new DeleteTopicsOptions().timeoutMs(1000))
-          .all()
-          .get();
-    }
-  }
-}

From c0d64d7c566abfdd3ceeaa9c09cd895f0fae3f60 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Mon, 22 Aug 2022 18:38:57 +0300
Subject: [PATCH 129/734] get rid of SheakyThrows annotation (#2470)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix unstable e2e test #2373

* Fix unstable e2e test #2373

* Prepare steps for Schema Registry and Connector fixed #2288

* Fix unstable e2e test #2373

* Revert "Prepare steps for Schema Registry and Connector fixed #2288"

This reverts commit cfeb224e99f859d7278444555b1fee3028dcf7ee.

* fix FileUtils

* Update FileUtils #2431

* Resolved MConflicts #2431Сopy

* Resolved MConflicts part2 #2431Сopy

* Updated ApiHelper and added annotations #2431Сopy

* Revert Objects.requireNonNull #2431Сopy

* Last update #2431Сopy

* Delete KaffkaSteps

* Update ApiHelper

Co-authored-by: anezboretskiy <anezboretskiy@modeln.com>
---
 .../kafka/ui/extensions/FileUtils.java        |  16 +-
 .../provectus/kafka/ui/pages/MainPage.java    |  22 +-
 .../pages/connector/ConnectorCreateView.java  |   6 +-
 .../ui/pages/connector/ConnectorsList.java    |  11 +-
 .../ui/pages/schema/SchemaRegistryList.java   |   4 +-
 .../kafka/ui/pages/topic/TopicView.java       |   6 +-
 .../kafka/ui/pages/topic/TopicsList.java      |   7 +-
 .../kafka/ui/screenshots/Screenshooter.java   | 255 +++++++++---------
 .../com/provectus/kafka/ui/SmokeTests.java    |   2 -
 .../kafka/ui/tests/ConnectorsTests.java       |  21 +-
 .../kafka/ui/tests/SchemasTests.java          |  33 +--
 .../provectus/kafka/ui/tests/TopicTests.java  |  17 +-
 12 files changed, 192 insertions(+), 208 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/FileUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/FileUtils.java
index 22926226403..bbe4dbf0b4d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/FileUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/FileUtils.java
@@ -5,11 +5,23 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
+import static org.apache.kafka.common.utils.Utils.readFileAsString;
 
 public class FileUtils {
 
-    public static String getResourceAsString(String resourceFileName) throws IOException {
-        return IOUtils.resourceToString("/" + resourceFileName, StandardCharsets.UTF_8);
+    public static String getResourceAsString(String resourceFileName) {
+        try {
+            return IOUtils.resourceToString("/" + resourceFileName, StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
+    public static String fileToString(String path) {
+        try {
+            return readFileAsString(path);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
index 515ab60ffee..cfc15f105ec 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
@@ -3,11 +3,10 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.pages.topic.TopicsList;
 import io.qameta.allure.Step;
-import lombok.SneakyThrows;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
@@ -32,7 +31,6 @@ public MainPage waitUntilScreenReady() {
         return this;
     }
 
-    @SneakyThrows
     @Step
     public void topicIsVisible(String topicName) {
         new TopicsList().isTopicVisible(topicName);
@@ -43,18 +41,18 @@ public void topicIsNotVisible(String topicName){
     }
 
 
-  public enum SideMenuOptions {
-    BROKERS("Brokers"),
-    TOPICS("Topics"),
-    CONSUMERS("Consumers"),
-    SCHEMA_REGISTRY("Schema Registry");
+    public enum SideMenuOptions {
+        BROKERS("Brokers"),
+        TOPICS("Topics"),
+        CONSUMERS("Consumers"),
+        SCHEMA_REGISTRY("Schema Registry");
 
-    final String value;
+        final String value;
 
-    SideMenuOptions(String value) {
-      this.value = value;
+        SideMenuOptions(String value) {
+            this.value = value;
+        }
     }
-  }
 
 
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
index 69f67a9a4af..a12aca59170 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
@@ -2,15 +2,15 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.utils.BrowserUtils;
 import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.sleep;
 import static com.provectus.kafka.ui.screenshots.Screenshooter.log;
-import static java.lang.Thread.sleep;
 
 @ExtensionMethod(WaitUtils.class)
 public class ConnectorCreateView {
@@ -22,7 +22,7 @@ public class ConnectorCreateView {
     private static final String path = "/ui/clusters/secondLocal/connectors/create_new";
 
     @Step("Set connector config JSON")
-    public ConnectorsView setConnectorConfig(String connectName, String configJson) throws InterruptedException {
+    public ConnectorsView setConnectorConfig(String connectName, String configJson) {
         nameField.setValue(connectName);
         $("#config").click();
         contentTextArea.setValue("");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
index 659a87da2c8..f79f2327765 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
@@ -2,11 +2,10 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
+import com.provectus.kafka.ui.extensions.WaitUtils;
 import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.utils.BrowserUtils;
-import com.provectus.kafka.ui.extensions.WaitUtils;
 import io.qameta.allure.Step;
-import lombok.SneakyThrows;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
@@ -35,14 +34,14 @@ public ConnectorCreateView clickCreateConnectorButton() {
         return new ConnectorCreateView();
     }
 
-    @SneakyThrows
+
     @Step
     public ConnectorsList openConnector(String connectorName) {
         $(By.linkText(connectorName)).click();
         return this;
     }
 
-    @SneakyThrows
+
     @Step
     public ConnectorsList isNotVisible(String connectorName) {
         $(By.xpath("//table")).shouldBe(Condition.visible);
@@ -52,8 +51,8 @@ public ConnectorsList isNotVisible(String connectorName) {
 
     @Step("Verify that connector {connectorName} is visible in the list")
     public ConnectorsList connectorIsVisibleInList(String connectorName, String topicName) {
-        $x("//table//a[@href='/ui/clusters/local/connects/first/connectors/" + connectorName +"']").shouldBe(Condition.visible);
-       $$(By.linkText(topicName));
+        $x("//table//a[@href='/ui/clusters/local/connects/first/connectors/" + connectorName + "']").shouldBe(Condition.visible);
+        $$(By.linkText(topicName));
         return this;
     }
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index 34ee71c7ffc..a9cc45d92c9 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -4,7 +4,6 @@
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
-import lombok.SneakyThrows;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
@@ -23,10 +22,9 @@ public SchemaView openSchema(String schemaName) {
         return new SchemaView();
     }
 
-    @SneakyThrows
     @Step
     public SchemaRegistryList isNotVisible(String schemaName) {
-        $x(String.format("//*[contains(text(),'%s')]",schemaName)).shouldNotBe(Condition.visible);
+        $x(String.format("//*[contains(text(),'%s')]", schemaName)).shouldNotBe(Condition.visible);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index c3607fceab4..7eccf23fe21 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -3,12 +3,11 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.pages.ProduceMessagePage;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
-import lombok.SneakyThrows;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
@@ -34,7 +33,6 @@ public TopicView waitUntilScreenReady() {
         return this;
     }
 
-    @SneakyThrows
     @Step
     public TopicCreateEditSettingsView openEditSettings() {
         BrowserUtils.javaExecutorClick(dotMenuHeader);
@@ -48,7 +46,6 @@ public TopicView openTopicMenu(TopicMenu menu) {
         return this;
     }
 
-    @SneakyThrows
     @Step
     public TopicsList deleteTopic() {
         BrowserUtils.javaExecutorClick(dotMenuHeader);
@@ -57,7 +54,6 @@ public TopicsList deleteTopic() {
         return new TopicsList();
     }
 
-    @SneakyThrows
     @Step
     public ProduceMessagePage clickOnButton(String buttonName) {
         BrowserUtils.javaExecutorClick($(By.xpath(String.format("//div//button[text()='%s']", buttonName))));
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index c39a3ca1b96..bbcb67effb0 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -3,11 +3,10 @@
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
+import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
-import lombok.SneakyThrows;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
@@ -32,7 +31,7 @@ public TopicsList waitUntilScreenReady() {
     }
 
     @Step
-    public TopicCreateEditSettingsView pressCreateNewTopic(){
+    public TopicCreateEditSettingsView pressCreateNewTopic() {
         BrowserUtils.javaExecutorClick($x("//button[normalize-space(text()) ='Add a Topic']"));
         return new TopicCreateEditSettingsView();
     }
@@ -46,14 +45,12 @@ public TopicsList isTopicVisible(String topicName) {
         return this;
     }
 
-    @SneakyThrows
     @Step
     public TopicView openTopic(String topicName) {
         $(By.linkText(topicName)).click();
         return new TopicView();
     }
 
-    @SneakyThrows
     @Step
     public TopicsList isTopicNotVisible(String topicName) {
         $$x("//table/tbody/tr/td[2]")
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
index 66b016ba85e..d412050b299 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
@@ -16,6 +16,7 @@
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.FileSystems;
 import java.util.List;
 
@@ -23,131 +24,139 @@
 
 public class Screenshooter {
 
-  public static  Logger log = LoggerFactory.getLogger(Screenshooter.class);
-
-  private static final int PIXELS_THRESHOLD =
-      Integer.parseInt(System.getProperty("PIXELS_THRESHOLD", "200"));
-  private static final String SCREENSHOTS_FOLDER =
-      System.getProperty("SCREENSHOTS_FOLDER", "com/provectus/kafka/ui/screenshots/");
-  private static final String DIFF_SCREENSHOTS_FOLDER =
-      System.getProperty("DIFF_SCREENSHOTS_FOLDER", "build/__diff__/");
-  private static final String ACTUAL_SCREENSHOTS_FOLDER =
-      System.getProperty("ACTUAL_SCREENSHOTS_FOLDER", "build/__actual__/");
-  private static final boolean SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST =
-      Boolean.parseBoolean(System.getProperty("SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST", "true"));
-  private static final boolean TURN_OFF_SCREENSHOTS =
-      Boolean.parseBoolean(System.getProperty("TURN_OFF_SCREENSHOTS", "false"));
-  private static final boolean USE_LOCAL_BROWSER =
-          Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "false"));
-
-  private File newFile(String name) {
-    var file = new File(name);
-    if (!file.exists()) {
-      file.mkdirs();
+    public static Logger log = LoggerFactory.getLogger(Screenshooter.class);
+
+    private static final int PIXELS_THRESHOLD =
+            Integer.parseInt(System.getProperty("PIXELS_THRESHOLD", "200"));
+    private static final String SCREENSHOTS_FOLDER =
+            System.getProperty("SCREENSHOTS_FOLDER", "com/provectus/kafka/ui/screenshots/");
+    private static final String DIFF_SCREENSHOTS_FOLDER =
+            System.getProperty("DIFF_SCREENSHOTS_FOLDER", "build/__diff__/");
+    private static final String ACTUAL_SCREENSHOTS_FOLDER =
+            System.getProperty("ACTUAL_SCREENSHOTS_FOLDER", "build/__actual__/");
+    private static final boolean SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST =
+            Boolean.parseBoolean(System.getProperty("SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST", "true"));
+    private static final boolean TURN_OFF_SCREENSHOTS =
+            Boolean.parseBoolean(System.getProperty("TURN_OFF_SCREENSHOTS", "false"));
+    private static final boolean USE_LOCAL_BROWSER =
+            Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "false"));
+
+    private File newFile(String name) {
+        var file = new File(name);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        return file;
     }
-    return file;
-  }
-
-  public Screenshooter() {
-    List.of(SCREENSHOTS_FOLDER, DIFF_SCREENSHOTS_FOLDER, ACTUAL_SCREENSHOTS_FOLDER)
-        .forEach(this::newFile);
-  }
-
-  public void compareScreenshots(String name) {
-    compareScreenshots(name, false);
-  }
-
-  @SneakyThrows
-  public void compareScreenshots(String name, boolean shouldUpdateScreenshotIfDiffer) {
-    if (TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER) {
-      log.warn(String.format("compareScreenshots turned off due TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER: %b || %b"
-              , TURN_OFF_SCREENSHOTS,USE_LOCAL_BROWSER));
-      return;
+
+    public Screenshooter() {
+        List.of(SCREENSHOTS_FOLDER, DIFF_SCREENSHOTS_FOLDER, ACTUAL_SCREENSHOTS_FOLDER)
+                .forEach(this::newFile);
+    }
+
+    public void compareScreenshots(String name) {
+        compareScreenshots(name, false);
+    }
+
+
+    public void compareScreenshots(String name, boolean shouldUpdateScreenshotIfDiffer) {
+        if (TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER) {
+            log.warn(String.format("compareScreenshots turned off due TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER: %b || %b"
+                    , TURN_OFF_SCREENSHOTS, USE_LOCAL_BROWSER));
+            return;
+        }
+        if (!doesScreenshotExist(name)) {
+            if (SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST) {
+                updateActualScreenshot(name);
+            } else {
+                try {
+                    throw new NoReferenceScreenshotFoundException(name);
+                } catch (NoReferenceScreenshotFoundException e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            makeImageDiff(name, shouldUpdateScreenshotIfDiffer);
+        }
+    }
+
+
+    private void updateActualScreenshot(String name) {
+        Screenshot actual =
+                new AShot().coordsProvider(new WebDriverCoordsProvider()).takeScreenshot(getWebDriver());
+        File file = newFile(SCREENSHOTS_FOLDER + name + ".png");
+        try {
+            ImageIO.write(actual.getImage(), "png", file);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        log.debug(String.format("created screenshot: %s \n at %s", name, file.getAbsolutePath()));
+    }
+
+    private static boolean doesScreenshotExist(String name) {
+        return new File(SCREENSHOTS_FOLDER + name + ".png").exists();
     }
-    if (!doesScreenshotExist(name)) {
-      if (SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST) {
-        updateActualScreenshot(name);
-      } else {
-        throw new NoReferenceScreenshotFoundException(name);
-      }
-    } else {
-      makeImageDiff(name, shouldUpdateScreenshotIfDiffer);
+
+    @SneakyThrows
+    private void makeImageDiff(String expectedName, boolean shouldUpdateScreenshotIfDiffer) {
+        String fullPathNameExpected = SCREENSHOTS_FOLDER + expectedName + ".png";
+        String fullPathNameActual = ACTUAL_SCREENSHOTS_FOLDER + expectedName + ".png";
+        String fullPathNameDiff = DIFF_SCREENSHOTS_FOLDER + expectedName + ".png";
+
+        //  activating allure plugin for showing diffs in report
+        Allure.label("testType", "screenshotDiff");
+
+        Screenshot actual =
+                new AShot().coordsProvider(new WebDriverCoordsProvider()).takeScreenshot(getWebDriver());
+        ImageIO.write(actual.getImage(), "png", newFile(fullPathNameActual));
+
+        Screenshot expected = new Screenshot(ImageIO.read(newFile(fullPathNameExpected)));
+        ImageDiff diff = new ImageDiffer().makeDiff(actual, expected);
+        BufferedImage diffImage = diff.getMarkedImage();
+        ImageIO.write(diffImage, "png", newFile(fullPathNameDiff));
+        // adding to report
+        diff(fullPathNameDiff);
+        // adding to report
+        actual(fullPathNameActual);
+        // adding to report
+        expected(fullPathNameExpected);
+
+        if (shouldUpdateScreenshotIfDiffer) {
+            if (diff.getDiffSize() > PIXELS_THRESHOLD) {
+                updateActualScreenshot(expectedName);
+            }
+        } else {
+            Assertions.assertTrue(
+                    PIXELS_THRESHOLD >= diff.getDiffSize(),
+                    String.format("Amount of differing pixels should be less or equals than %s, actual %s\n" +
+                                    "diff file: %s",
+                            PIXELS_THRESHOLD, diff.getDiffSize(), FileSystems.getDefault().getPath(fullPathNameDiff).normalize().toAbsolutePath()));
+        }
+    }
+
+    @SneakyThrows
+    private byte[] imgToBytes(String filename) {
+        BufferedImage bImage2 = ImageIO.read(new File(filename));
+        var bos2 = new ByteArrayOutputStream();
+        ImageIO.write(bImage2, "png", bos2);
+        return bos2.toByteArray();
+    }
+
+
+    @Attachment
+    private byte[] actual(String actualFileName) {
+        return imgToBytes(actualFileName);
     }
-  }
-
-  @SneakyThrows
-  private void updateActualScreenshot(String name) {
-    Screenshot actual =
-        new AShot().coordsProvider(new WebDriverCoordsProvider()).takeScreenshot(getWebDriver());
-    File  file=  newFile(SCREENSHOTS_FOLDER + name + ".png");
-    ImageIO.write(actual.getImage(), "png", file);
-    log.debug(String.format("created screenshot: %s \n at %s", name, file.getAbsolutePath()));
-  }
-
-  private static boolean doesScreenshotExist(String name) {
-    return new File(SCREENSHOTS_FOLDER + name + ".png").exists();
-  }
-
-  @SneakyThrows
-  private void makeImageDiff(String expectedName, boolean shouldUpdateScreenshotIfDiffer) {
-    String fullPathNameExpected = SCREENSHOTS_FOLDER + expectedName + ".png";
-    String fullPathNameActual = ACTUAL_SCREENSHOTS_FOLDER + expectedName + ".png";
-    String fullPathNameDiff = DIFF_SCREENSHOTS_FOLDER + expectedName + ".png";
-
-    //  activating allure plugin for showing diffs in report
-    Allure.label("testType", "screenshotDiff");
-
-    Screenshot actual =
-        new AShot().coordsProvider(new WebDriverCoordsProvider()).takeScreenshot(getWebDriver());
-    ImageIO.write(actual.getImage(), "png", newFile(fullPathNameActual));
-
-    Screenshot expected = new Screenshot(ImageIO.read(newFile(fullPathNameExpected)));
-    ImageDiff diff = new ImageDiffer().makeDiff(actual, expected);
-    BufferedImage diffImage = diff.getMarkedImage();
-    ImageIO.write(diffImage, "png", newFile(fullPathNameDiff));
-    // adding to report
-    diff(fullPathNameDiff);
-    // adding to report
-    actual(fullPathNameActual);
-    // adding to report
-    expected(fullPathNameExpected);
-
-    if (shouldUpdateScreenshotIfDiffer) {
-      if (diff.getDiffSize() > PIXELS_THRESHOLD) {
-        updateActualScreenshot(expectedName);
-      }
-    } else {
-      Assertions.assertTrue(
-          PIXELS_THRESHOLD >= diff.getDiffSize(),
-              String.format("Amount of differing pixels should be less or equals than %s, actual %s\n"+
-                  "diff file: %s",
-              PIXELS_THRESHOLD, diff.getDiffSize(), FileSystems.getDefault().getPath(fullPathNameDiff).normalize().toAbsolutePath()));
+
+
+    @Attachment
+    private byte[] expected(String expectedFileName) {
+        return imgToBytes(expectedFileName);
+    }
+
+
+    @Attachment
+    private byte[] diff(String diffFileName) {
+        return imgToBytes(diffFileName);
     }
-  }
-
-  @SneakyThrows
-  private byte[] imgToBytes(String filename) {
-    BufferedImage bImage2 = ImageIO.read(new File(filename));
-    var bos2 = new ByteArrayOutputStream();
-    ImageIO.write(bImage2, "png", bos2);
-    return bos2.toByteArray();
-  }
-
-  @SneakyThrows
-  @Attachment
-  private byte[] actual(String actualFileName) {
-    return imgToBytes(actualFileName);
-  }
-
-  @SneakyThrows
-  @Attachment
-  private byte[] expected(String expectedFileName) {
-    return imgToBytes(expectedFileName);
-  }
-
-  @SneakyThrows
-  @Attachment
-  private byte[] diff(String diffFileName) {
-    return imgToBytes(diffFileName);
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
index 149acf4aa56..fbfb0990eb9 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
@@ -4,7 +4,6 @@
 import com.provectus.kafka.ui.utils.qaseIO.Status;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
 import io.qase.api.annotation.CaseId;
-import lombok.SneakyThrows;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -12,7 +11,6 @@ public class SmokeTests extends BaseTest {
     @Test
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(198)
-    @SneakyThrows
     @DisplayName("main page should load")
     void mainPageLoads() {
         pages.open()
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index fe0e468e45f..379114fdd84 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -1,18 +1,18 @@
 package com.provectus.kafka.ui.tests;
 
 import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.extensions.FileUtils;
 import com.provectus.kafka.ui.helpers.ApiHelper;
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.utils.qaseIO.Status;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
 import io.qase.api.annotation.CaseId;
-import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
+
+import static com.provectus.kafka.ui.extensions.FileUtils.getResourceAsString;
 
 public class ConnectorsTests extends BaseTest {
 
@@ -28,13 +28,12 @@ public class ConnectorsTests extends BaseTest {
     public static final String CONNECTOR_FOR_UPDATE = "sink_postgres_activities_e2e_checks_for_update";
 
     @BeforeAll
-    @SneakyThrows
     public static void beforeAll() {
         ApiHelper apiHelper = Helpers.INSTANCE.apiHelper;
 
-        String connectorToDelete = FileUtils.getResourceAsString("delete_connector_config.json");
-        String connectorToUpdate = FileUtils.getResourceAsString("config_for_create_connector_via_api.json");
-        String message = FileUtils.getResourceAsString("message_content_create_topic.json");
+        String connectorToDelete = getResourceAsString("delete_connector_config.json");
+        String connectorToUpdate = getResourceAsString("config_for_create_connector_via_api.json");
+        String message = getResourceAsString("message_content_create_topic.json");
 
         apiHelper.deleteTopic(LOCAL_CLUSTER, CONNECTOR_FOR_DELETE);
 
@@ -52,7 +51,6 @@ public static void beforeAll() {
     }
 
     @AfterAll
-    @SneakyThrows
     public static void afterAll() {
         ApiHelper apiHelper = Helpers.INSTANCE.apiHelper;
         apiHelper.deleteConnector(LOCAL_CLUSTER, FIRST_CONNECTOR, SINK_CONNECTOR);
@@ -62,7 +60,6 @@ public static void afterAll() {
         apiHelper.deleteTopic(LOCAL_CLUSTER, TOPIC_FOR_UPDATE_CONNECTOR);
     }
 
-    @SneakyThrows
     @DisplayName("should create a connector")
     @Suite(suiteId = suiteId, title = suiteTitle)
     @AutomationStatus(status = Status.AUTOMATED)
@@ -75,13 +72,12 @@ public void createConnector() {
                 .waitUntilScreenReady()
                 .setConnectorConfig(
                         SINK_CONNECTOR,
-                        FileUtils.getResourceAsString("config_for_create_connector.json"));
+                        getResourceAsString("config_for_create_connector.json"));
         pages.openConnectorsList(LOCAL_CLUSTER)
                 .waitUntilScreenReady()
                 .connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR);
     }
 
-    @SneakyThrows
     @DisplayName("should update a connector")
     @Suite(suiteId = suiteId, title = suiteTitle)
     @AutomationStatus(status = Status.AUTOMATED)
@@ -93,12 +89,11 @@ public void updateConnector() {
                 .openConnector(CONNECTOR_FOR_UPDATE);
         pages.connectorsView.connectorIsVisibleOnOverview();
         pages.connectorsView.openEditConfig()
-                .updConnectorConfig(FileUtils.getResourceAsString("config_for_update_connector.json"));
+                .updConnectorConfig(getResourceAsString("config_for_update_connector.json"));
         pages.openConnectorsList(LOCAL_CLUSTER)
                 .connectorIsVisibleInList(CONNECTOR_FOR_UPDATE, TOPIC_FOR_UPDATE_CONNECTOR);
     }
 
-    @SneakyThrows
     @DisplayName("should delete connector")
     @Suite(suiteId = suiteId, title = suiteTitle)
     @AutomationStatus(status = Status.AUTOMATED)
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index af14f108198..239f66f5cf5 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -8,14 +8,11 @@
 import com.provectus.kafka.ui.pages.schema.SchemaCreateView;
 import com.provectus.kafka.ui.utils.qaseIO.Status;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
+import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
 import io.qase.api.annotation.CaseId;
-import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
-
-import java.io.IOException;
 
-import static org.apache.kafka.common.utils.Utils.readFileAsString;
+import static com.provectus.kafka.ui.extensions.FileUtils.fileToString;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class SchemasTests extends BaseTest {
@@ -36,16 +33,14 @@ public class SchemasTests extends BaseTest {
     private static final String PATH_JSON_VALUE = System.getProperty("user.dir") + "/src/test/resources/schema_Json_Value.json";
 
     @BeforeAll
-    @SneakyThrows
     public static void beforeAll() {
-        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_AVRO_API_UPDATE, SchemaType.AVRO, readFileAsString(PATH_AVRO_VALUE));
-        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_AVRO_API, SchemaType.AVRO, readFileAsString(PATH_AVRO_VALUE));
-        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_JSON_API, SchemaType.JSON, readFileAsString(PATH_JSON_VALUE));
-        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_PROTOBUF_API, SchemaType.PROTOBUF, readFileAsString(PATH_PROTOBUF_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_AVRO_API_UPDATE, SchemaType.AVRO, fileToString(PATH_AVRO_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_AVRO_API, SchemaType.AVRO, fileToString(PATH_AVRO_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_JSON_API, SchemaType.JSON, fileToString(PATH_JSON_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_PROTOBUF_API, SchemaType.PROTOBUF, fileToString(PATH_PROTOBUF_VALUE));
     }
 
     @AfterAll
-    @SneakyThrows
     public static void afterAll() {
         Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_AVRO_CREATE);
         Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_JSON_CREATE);
@@ -63,12 +58,12 @@ public static void afterAll() {
     @CaseId(43)
     @Test
     @Order(1)
-    void createSchemaAvro() throws IOException {
+    void createSchemaAvro() {
         pages.openMainPage()
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
                 .setSubjectName(SCHEMA_AVRO_CREATE)
-                .setSchemaField(readFileAsString(PATH_AVRO_VALUE))
+                .setSchemaField(fileToString(PATH_AVRO_VALUE))
                 .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.AVRO)
                 .clickSubmit()
                 .waitUntilScreenReady();
@@ -77,7 +72,6 @@ void createSchemaAvro() throws IOException {
         pages.schemaRegistry.isSchemaVisible(SCHEMA_AVRO_CREATE);
     }
 
-    @SneakyThrows
     @DisplayName("should update AVRO schema")
     @Suite(suiteId = suiteId, title = suiteTitle)
     @AutomationStatus(status = Status.AUTOMATED)
@@ -91,13 +85,12 @@ void updateSchemaAvro() {
                 .waitUntilScreenReady()
                 .openEditSchema()
                 .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
-                .setNewSchemaValue(readFileAsString(PATH_AVRO_FOR_UPDATE))
+                .setNewSchemaValue(fileToString(PATH_AVRO_FOR_UPDATE))
                 .clickSubmit()
                 .waitUntilScreenReady()
                 .isCompatibility(CompatibilityLevel.CompatibilityEnum.NONE);
     }
 
-    @SneakyThrows
     @DisplayName("should delete AVRO schema")
     @Suite(suiteId = suiteId, title = suiteTitle)
     @AutomationStatus(status = Status.AUTOMATED)
@@ -113,7 +106,6 @@ void deleteSchemaAvro() {
                 .isNotVisible(SCHEMA_AVRO_API);
     }
 
-    @SneakyThrows
     @DisplayName("should create JSON schema")
     @Suite(suiteId = suiteId, title = suiteTitle)
     @AutomationStatus(status = Status.AUTOMATED)
@@ -125,7 +117,7 @@ void createSchemaJson() {
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
                 .setSubjectName(SCHEMA_JSON_CREATE)
-                .setSchemaField(readFileAsString(PATH_JSON_VALUE))
+                .setSchemaField(fileToString(PATH_JSON_VALUE))
                 .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.JSON)
                 .clickSubmit()
                 .waitUntilScreenReady();
@@ -134,7 +126,6 @@ void createSchemaJson() {
         pages.schemaRegistry.isSchemaVisible(SCHEMA_JSON_CREATE);
     }
 
-    @SneakyThrows
     @DisplayName("should delete JSON schema")
     @Suite(suiteId = suiteId, title = suiteTitle)
     @AutomationStatus(status = Status.AUTOMATED)
@@ -150,7 +141,6 @@ void deleteSchemaJson() {
                 .isNotVisible(SCHEMA_JSON_API);
     }
 
-    @SneakyThrows
     @DisplayName("should create PROTOBUF schema")
     @Suite(suiteId = suiteId, title = suiteTitle)
     @AutomationStatus(status = Status.AUTOMATED)
@@ -162,7 +152,7 @@ void createSchemaProtobuf() {
                 .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
                 .setSubjectName(SCHEMA_PROTOBUF_CREATE)
-                .setSchemaField(readFileAsString(PATH_PROTOBUF_VALUE))
+                .setSchemaField(fileToString(PATH_PROTOBUF_VALUE))
                 .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.PROTOBUF)
                 .clickSubmit()
                 .waitUntilScreenReady();
@@ -171,7 +161,6 @@ void createSchemaProtobuf() {
         pages.schemaRegistry.isSchemaVisible(SCHEMA_PROTOBUF_CREATE);
     }
 
-    @SneakyThrows
     @DisplayName("should delete PROTOBUF schema")
     @Suite(suiteId = suiteId, title = suiteTitle)
     @AutomationStatus(status = Status.AUTOMATED)
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 0d6026e1edb..b799e6580bc 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -9,10 +9,9 @@
 import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
 import io.qameta.allure.Issue;
 import io.qase.api.annotation.CaseId;
-import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
 
-import static org.apache.kafka.common.utils.Utils.readFileAsString;
+import static com.provectus.kafka.ui.extensions.FileUtils.fileToString;
 
 public class TopicTests extends BaseTest {
 
@@ -29,21 +28,18 @@ public class TopicTests extends BaseTest {
 
 
     @BeforeAll
-    @SneakyThrows
     public static void beforeAll() {
         Helpers.INSTANCE.apiHelper.createTopic(SECOND_LOCAL, TOPIC_TO_UPDATE);
         Helpers.INSTANCE.apiHelper.createTopic(SECOND_LOCAL, TOPIC_TO_DELETE);
     }
 
     @AfterAll
-    @SneakyThrows
     public static void afterAll() {
         Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, TOPIC_TO_UPDATE);
         Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, TOPIC_TO_DELETE);
         Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, NEW_TOPIC);
     }
 
-    @SneakyThrows
     @DisplayName("should create a topic")
     @Suite(suiteId = 4, title = "Create new Topic")
     @AutomationStatus(status = Status.AUTOMATED)
@@ -65,7 +61,6 @@ public void createTopic() {
                 .topicIsNotVisible(NEW_TOPIC);
     }
     @Disabled("Due to issue https://github.com/provectus/kafka-ui/issues/1500 ignore this test")
-    @SneakyThrows
     @DisplayName("should update a topic")
     @Issue("1500")
     @Suite(suiteId = 2, title = "Topics")
@@ -97,7 +92,6 @@ public void updateTopic() {
                 .maxMessageBytesIs(UPDATED_MAX_MESSAGE_BYTES);
     }
 
-    @SneakyThrows
     @DisplayName("should delete topic")
     @Suite(suiteId = 2, title = "Topics")
     @AutomationStatus(status = Status.AUTOMATED)
@@ -113,7 +107,6 @@ public void deleteTopic() {
                 .isTopicNotVisible(TOPIC_TO_DELETE);
     }
 
-    @SneakyThrows
     @DisplayName("produce message")
     @Suite(suiteId = 2, title = "Topics")
     @AutomationStatus(status = Status.AUTOMATED)
@@ -126,10 +119,10 @@ void produceMessage() {
                 .waitUntilScreenReady()
                 .openTopicMenu(TopicView.TopicMenu.MESSAGES)
                 .clickOnButton("Produce Message")
-                .setContentFiled(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE))
-                .setKeyField(readFileAsString(KEY_TO_PRODUCE_MESSAGE))
+                .setContentFiled(fileToString(CONTENT_TO_PRODUCE_MESSAGE))
+                .setKeyField(fileToString(KEY_TO_PRODUCE_MESSAGE))
                 .submitProduceMessage();
-        Assertions.assertTrue(pages.topicView.isKeyMessageVisible(readFileAsString(KEY_TO_PRODUCE_MESSAGE)));
-        Assertions.assertTrue(pages.topicView.isContentMessageVisible(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE).trim()));
+        Assertions.assertTrue(pages.topicView.isKeyMessageVisible(fileToString(KEY_TO_PRODUCE_MESSAGE)));
+        Assertions.assertTrue(pages.topicView.isContentMessageVisible(fileToString(CONTENT_TO_PRODUCE_MESSAGE).trim()));
     }
 }

From 61e56f2a1ebf7df80acb61339303a2f58adb17f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Aug 2022 20:35:09 +0400
Subject: [PATCH 130/734] Bump aquasecurity/trivy-action from 0.6.2 to 0.7.1
 (#2476)

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.6.2 to 0.7.1.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.6.2...0.7.1)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index 1f9796f1559..5e5d6f79822 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -61,7 +61,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.6.2
+        uses: aquasecurity/trivy-action@0.7.1
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From 5ac52efb7a2ec64a38110893ef0c35152a6b501b Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 22 Aug 2022 21:04:22 +0400
Subject: [PATCH 131/734] Fix transient jre CVEs (#2480)

---
 kafka-ui-api/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-api/Dockerfile b/kafka-ui-api/Dockerfile
index 3990d488315..2cd5fe08e55 100644
--- a/kafka-ui-api/Dockerfile
+++ b/kafka-ui-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16.1
+FROM alpine:3.16.2
 
 RUN apk add --no-cache openjdk13-jre libc6-compat gcompat \
 && addgroup -S kafkaui && adduser -S kafkaui -G kafkaui

From 6de2eaeab1f80ac71d63896856c93193ef5cd54e Mon Sep 17 00:00:00 2001
From: KriKiparoidze <92114648+KriKiparoidze@users.noreply.github.com>
Date: Mon, 22 Aug 2022 15:11:53 -0500
Subject: [PATCH 132/734] #2261 "Value" field is focused with adding the Custom
 Parameter in a Topic (#2469)

---
 .../Topics/shared/Form/CustomParams/CustomParams.tsx          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx
index 38d95f56c8b..a85b4a2fc4d 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx
@@ -57,7 +57,9 @@ const CustomParams: React.FC<CustomParamsProps> = ({ isSubmitting }) => {
           type="button"
           buttonSize="M"
           buttonType="secondary"
-          onClick={() => append({ name: '', value: '' })}
+          onClick={() =>
+            append({ name: '', value: '' }, { shouldFocus: false })
+          }
         >
           <PlusIcon />
           Add Custom Parameter

From 0aafd49de0064854525e4171a75c28c2dae6fbaa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 13:35:04 +0400
Subject: [PATCH 133/734] Bump urlstechie/urlchecker-action from 0.0.32 to
 0.0.33 (#2478)

Bumps [urlstechie/urlchecker-action](https://github.com/urlstechie/urlchecker-action) from 0.0.32 to 0.0.33.
- [Release notes](https://github.com/urlstechie/urlchecker-action/releases)
- [Commits](https://github.com/urlstechie/urlchecker-action/compare/0.0.32...0.0.33)

---
updated-dependencies:
- dependency-name: urlstechie/urlchecker-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/documentation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
index 21550b3ebe0..fb79e3f53ff 100644
--- a/.github/workflows/documentation.yaml
+++ b/.github/workflows/documentation.yaml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Check URLs in files
-        uses: urlstechie/urlchecker-action@0.0.32
+        uses: urlstechie/urlchecker-action@0.0.33
         with:
           exclude_patterns: localhost,127.0.,192.168.
           exclude_urls: https://api.server,https://graph.microsoft.com/User.Read,https://dev-a63ggcut.auth0.com/

From a9c31e6a32c222da2d28896ec2acbccdf7b308c5 Mon Sep 17 00:00:00 2001
From: Shubham Jain <shubhrjain7@gmail.com>
Date: Thu, 25 Aug 2022 02:11:22 +0530
Subject: [PATCH 134/734] Fix topic edit redirect (#2485)

---
 .../src/components/Topics/shared/Form/TopicForm.tsx           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index 1838e209ba8..20898e8de6d 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -9,7 +9,7 @@ import { Button } from 'components/common/Button/Button';
 import { InputLabel } from 'components/common/Input/InputLabel.styled';
 import { FormError } from 'components/common/Input/Input.styled';
 import { StyledForm } from 'components/common/Form/Form.styled';
-import { clusterTopicsPath } from 'lib/paths';
+import { clusterTopicPath } from 'lib/paths';
 import { useNavigate } from 'react-router-dom';
 import useAppParams from 'lib/hooks/useAppParams';
 
@@ -76,7 +76,7 @@ const TopicForm: React.FC<Props> = ({
 
   const onCancel = () => {
     reset();
-    navigate(clusterTopicsPath(clusterName));
+    navigate(clusterTopicPath(clusterName, topicName));
   };
 
   return (

From 01127d8f10e193475895bf5a17c2e53d17d6ea0e Mon Sep 17 00:00:00 2001
From: Shubham Jain <shubhrjain7@gmail.com>
Date: Fri, 26 Aug 2022 22:21:00 +0530
Subject: [PATCH 135/734] Fix SR subject encoding (#2483) (#2471) (#1995)

* Fix subject encoding frontend (#1995)

* Add tests for schemas with non ascii chars #1995

* Backend: Fix URL encoding while getting schemas (#2471)

Add Test for subject name with non ascii chars
Closes #1995

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../ui/service/SchemaRegistryService.java     |  2 +-
 .../kafka/ui/SchemaRegistryServiceTests.java  | 15 +++++++++
 .../Schemas/Details/__test__/Details.spec.tsx | 31 +++++++++++++++++++
 .../Schemas/Details/__test__/fixtures.ts      | 13 ++++++--
 .../Schemas/Edit/__tests__/Edit.spec.tsx      | 18 +++++++++++
 .../Schemas/List/__test__/fixtures.ts         |  7 ++++-
 .../src/lib/__test__/paths.spec.ts            | 14 +++++++++
 kafka-ui-react-app/src/lib/paths.ts           | 12 +++++--
 .../reducers/schemas/__test__/fixtures.ts     |  8 +++++
 9 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
index f4c9355804e..92603ba979e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
@@ -381,7 +381,7 @@ private URI buildUri(InternalSchemaRegistry schemaRegistry, String path, List<St
     final var builder = UriComponentsBuilder
         .fromHttpUrl(schemaRegistry.getUri() + path);
     builder.queryParams(queryParams);
-    return builder.buildAndExpand(uriVariables.toArray()).toUri();
+    return builder.build(uriVariables.toArray());
   }
 
   private Function<ClientResponse, Mono<? extends Throwable>> errorOnSchemaDeleteFailure(String schemaName) {
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java
index 190831da98b..60959be0492 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java
@@ -274,6 +274,21 @@ public void shouldOkWhenCreateNewSchemaThenGetAndUpdateItsCompatibilityLevel() {
         });
   }
 
+  @Test
+  void shouldCreateNewSchemaWhenSubjectIncludesNonAsciiCharacters() {
+    String schema =
+        "{\"subject\":\"test/test\",\"schemaType\":\"JSON\",\"schema\":"
+        + "\"{\\\"type\\\": \\\"string\\\"}\"}";
+
+    webTestClient
+        .post()
+        .uri("/api/clusters/{clusterName}/schemas", LOCAL)
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(BodyInserters.fromValue(schema))
+        .exchange()
+        .expectStatus().isOk();
+  }
+
   private void createNewSubjectAndAssert(String subject) {
     webTestClient
         .post()
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
index fefcf99801f..a09788b162e 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
@@ -6,6 +6,7 @@ import { screen, waitFor } from '@testing-library/dom';
 import {
   schemasInitialState,
   schemaVersion,
+  schemaVersionWithNonAsciiChars,
 } from 'redux/reducers/schemas/__test__/fixtures';
 import fetchMock from 'fetch-mock';
 import ClusterContext, {
@@ -98,6 +99,36 @@ describe('Details', () => {
       });
     });
 
+    describe('fetch success schema with non ascii characters', () => {
+      describe('has schema versions', () => {
+        beforeEach(async () => {
+          const schemasAPILatestMock = fetchMock.getOnce(
+            schemasAPILatestUrl,
+            schemaVersionWithNonAsciiChars
+          );
+          const schemasAPIVersionsMock = fetchMock.getOnce(
+            schemasAPIVersionsUrl,
+            versionPayload
+          );
+          await act(() => {
+            renderComponent();
+          });
+          await waitFor(() => {
+            expect(schemasAPILatestMock.called()).toBeTruthy();
+          });
+          await waitFor(() => {
+            expect(schemasAPIVersionsMock.called()).toBeTruthy();
+          });
+        });
+
+        it('renders component with schema info', () => {
+          expect(screen.getByText('Edit Schema')).toBeInTheDocument();
+          expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
+          expect(screen.getByRole('table')).toBeInTheDocument();
+        });
+      });
+    });
+
     describe('empty schema versions', () => {
       beforeEach(async () => {
         const schemasAPILatestMock = fetchMock.getOnce(
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Schemas/Details/__test__/fixtures.ts
index 6443dfd541b..174cfd830f9 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/fixtures.ts
@@ -2,12 +2,21 @@ import { SchemaSubject, SchemaType } from 'generated-sources';
 import {
   schemaVersion1,
   schemaVersion2,
+  schemaVersionWithNonAsciiChars,
 } from 'redux/reducers/schemas/__test__/fixtures';
 
-export const versionPayload = [schemaVersion1, schemaVersion2];
+export const versionPayload = [
+  schemaVersion1,
+  schemaVersion2,
+  schemaVersionWithNonAsciiChars,
+];
 export const versionEmptyPayload = [];
 
-export const versions = [schemaVersion1, schemaVersion2];
+export const versions = [
+  schemaVersion1,
+  schemaVersion2,
+  schemaVersionWithNonAsciiChars,
+];
 
 export const jsonSchema: SchemaSubject = {
   subject: 'test',
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx
index ae4e74d7a9e..b5dcb283873 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx
@@ -5,6 +5,7 @@ import { clusterSchemaEditPath } from 'lib/paths';
 import {
   schemasInitialState,
   schemaVersion,
+  schemaVersionWithNonAsciiChars,
 } from 'redux/reducers/schemas/__test__/fixtures';
 import { screen, waitFor } from '@testing-library/dom';
 import ClusterContext, {
@@ -70,4 +71,21 @@ describe('Edit', () => {
       });
     });
   });
+
+  describe('fetch success schema with non ascii characters', () => {
+    describe('has schema versions', () => {
+      it('renders component with schema info', async () => {
+        const schemasAPILatestMock = fetchMock.getOnce(
+          schemasAPILatestUrl,
+          schemaVersionWithNonAsciiChars
+        );
+        await act(() => {
+          renderComponent();
+        });
+        await waitFor(() => expect(schemasAPILatestMock.called()).toBeTruthy());
+        expect(screen.getByText('Submit')).toBeInTheDocument();
+        expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
+      });
+    });
+  });
 });
diff --git a/kafka-ui-react-app/src/components/Schemas/List/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Schemas/List/__test__/fixtures.ts
index 65bdd997410..992882d3325 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Schemas/List/__test__/fixtures.ts
@@ -1,9 +1,14 @@
 import {
   schemaVersion1,
   schemaVersion2,
+  schemaVersionWithNonAsciiChars,
 } from 'redux/reducers/schemas/__test__/fixtures';
 
-const schemas = [schemaVersion1, schemaVersion2];
+const schemas = [
+  schemaVersion1,
+  schemaVersion2,
+  schemaVersionWithNonAsciiChars,
+];
 
 export const schemasPayload = {
   pageCount: 1,
diff --git a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
index 3bfbcef7a52..4fb4a3360ce 100644
--- a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
+++ b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
@@ -5,6 +5,8 @@ import { RouteParams } from 'lib/paths';
 const clusterName = 'test-cluster-name';
 const groupId = 'test-group-id';
 const schemaId = 'test-schema-id';
+const schemaIdWithNonAsciiChars = 'test/test';
+const schemaIdWithNonAsciiCharsEncoded = 'test%2Ftest';
 const topicId = 'test-topic-id';
 const brokerId = 'test-Broker-id';
 const connectName = 'test-connect-name';
@@ -112,6 +114,13 @@ describe('Paths', () => {
     expect(paths.clusterSchemaPath()).toEqual(
       paths.clusterSchemaPath(RouteParams.clusterName, RouteParams.subject)
     );
+    expect(
+      paths.clusterSchemaPath(clusterName, schemaIdWithNonAsciiChars)
+    ).toEqual(
+      `${paths.clusterSchemasPath(
+        clusterName
+      )}/${schemaIdWithNonAsciiCharsEncoded}`
+    );
   });
   it('clusterSchemaEditPath', () => {
     expect(paths.clusterSchemaEditPath(clusterName, schemaId)).toEqual(
@@ -120,6 +129,11 @@ describe('Paths', () => {
     expect(paths.clusterSchemaEditPath()).toEqual(
       paths.clusterSchemaEditPath(RouteParams.clusterName, RouteParams.subject)
     );
+    expect(
+      paths.clusterSchemaEditPath(clusterName, schemaIdWithNonAsciiChars)
+    ).toEqual(
+      `${paths.clusterSchemaPath(clusterName, schemaIdWithNonAsciiChars)}/edit`
+    );
   });
   it('clusterSchemaComparePath', () => {
     expect(paths.clusterSchemaComparePath(clusterName, schemaId)).toEqual(
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 3392b88795f..67dea375800 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -94,11 +94,19 @@ export const clusterSchemaNewPath = (
 export const clusterSchemaPath = (
   clusterName: ClusterName = RouteParams.clusterName,
   subject: SchemaName = RouteParams.subject
-) => `${clusterSchemasPath(clusterName)}/${subject}`;
+) => {
+  let subjectName = subject;
+  if (subject !== ':subject') subjectName = encodeURIComponent(subject);
+  return `${clusterSchemasPath(clusterName)}/${subjectName}`;
+};
 export const clusterSchemaEditPath = (
   clusterName: ClusterName = RouteParams.clusterName,
   subject: SchemaName = RouteParams.subject
-) => `${clusterSchemasPath(clusterName)}/${subject}/edit`;
+) => {
+  let subjectName = subject;
+  if (subject !== ':subject') subjectName = encodeURIComponent(subject);
+  return `${clusterSchemasPath(clusterName)}/${subjectName}/edit`;
+};
 export const clusterSchemaComparePath = (
   clusterName: ClusterName = RouteParams.clusterName,
   subject: SchemaName = RouteParams.subject
diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts
index f6b924592e1..5cab12584b7 100644
--- a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/fixtures.ts
@@ -29,6 +29,14 @@ export const schemaVersion2: SchemaSubject = {
   compatibilityLevel: 'FORWARD_TRANSITIVE',
   schemaType: SchemaType.JSON,
 };
+export const schemaVersionWithNonAsciiChars: SchemaSubject = {
+  subject: 'test/test',
+  version: '1',
+  id: 29,
+  schema: '13',
+  compatibilityLevel: 'FORWARD_TRANSITIVE',
+  schemaType: SchemaType.JSON,
+};
 
 export { schemaVersion1 as schemaVersion };
 

From 63a451452250eb20e2230afaac6516604f639d69 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 29 Aug 2022 14:04:27 +0400
Subject: [PATCH 136/734] Update ssl compose example with

Add a property to disable CN verification
---
 documentation/compose/kafka-ssl.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/compose/kafka-ssl.yml b/documentation/compose/kafka-ssl.yml
index 367874fc5c7..d257f738cce 100644
--- a/documentation/compose/kafka-ssl.yml
+++ b/documentation/compose/kafka-ssl.yml
@@ -17,6 +17,7 @@ services:
       KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_LOCATION: /kafka.truststore.jks
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_PASSWORD: secret
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: "" # DISABLE COMMON NAME VERIFICATION
     volumes:
       - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
 

From 56e4cbf60f8a004ca44872d336cf547789ac9100 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Tue, 30 Aug 2022 01:02:41 +0300
Subject: [PATCH 137/734] Update readme for e2e (#2496)

---
 kafka-ui-e2e-checks/README.md | 50 +++++------------------------------
 1 file changed, 6 insertions(+), 44 deletions(-)

diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index 25dc51d658b..4cd986dc475 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -45,58 +45,20 @@ docker pull selenoid/vnc:chrome_86.0
 
 ### How to run checks
 
-1. Run `kafka-ui` 
+1. Run `kafka-ui`: 
 ```
-cd docker
-docker-compose -f kafka-ui.yaml up -d
+cd kafka-ui
+docker-compose -f documentation/compose/kafka-ui-connectors.yaml up -d
 ```
-2. Run `selenoid-ui` 
+2. Run tests using your QaseIO API token as environment variable (put instead $s into command below)
 ```
-cd kafka-ui-e2e-checks/docker
-docker-compose -f selenoid.yaml up -d
+mvn -DQASEIO_API_TOKEN=‘%s’ -pl ‘!kafka-ui-api’ test -Pprod
 ```
-3. Compile `kafka-ui-contract` project
-```
-cd <projectRoot>/kafka-ui-contract
-mvn clean compile
-```
-4. Run checks 
-```
-cd kafka-ui-e2e-checks
-mvn test
-```
-
-* There are several ways to run checks
-
-1. If you don't have  selenoid run on your machine
-```
- mvn test -DSHOULD_START_SELENOID=true
-```
-⚠️ If you want to run checks in IDE with this approach, you'd need to set up
-environment variable(`SHOULD_START_SELENOID=true`) in `Run/Edit Configurations..`
-
-2. For development purposes it is better to just start separate selenoid in docker-compose
-Do it in separate window
-```
-cd docker
-docker-compose -f selenoid.yaml up
-```
-Then you can just `mvn test`. By default, `SELENOID_URL` will resolve to `http://localhost:4444/wd/hub`
-
-It's preferred way to run. 
-
-* If you have remote selenoid instance, set 
-
-`SELENOID_URL` environment variable
-
-Example:
-`mvn test -DSELENOID_URL=http://localhost:4444/wd/hub`
-That's the way to run tests in CI with selenoid set up somewhere in cloud
 
 ### Reporting
 
 Reports are in `allure-results` folder.
-If you have installed allure commandline(e.g. like [here](https://docs.qameta.io/allure/#_installing_a_commandline) or [here](https://www.npmjs.com/package/allure-commandline))
+If you have installed allure commandline [here](https://www.npmjs.com/package/allure-commandline))
 You can see allure report with command:
 ```
 allure serve

From 9e1f8d773f6f492eba422074bf5097bb91c58b9d Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 30 Aug 2022 12:06:05 +0400
Subject: [PATCH 138/734] Add a failover recovery for empty cluster versions
 (#2473)

* Add a failover recovery for empty cluster versions

* Review suggestions
---
 .../kafka/ui/service/ReactiveAdminClient.java       | 13 +++++++++----
 .../com/provectus/kafka/ui/util/NumberUtil.java     |  5 +++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 731824cdf08..85f0d17fb1e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -90,10 +90,15 @@ public static Mono<ReactiveAdminClient> create(AdminClient adminClient) {
   }
 
   private static SupportedFeature getSupportedUpdateFeatureForVersion(String versionStr) {
-    float version = NumberUtil.parserClusterVersion(versionStr);
-    return version <= 2.3f
-        ? SupportedFeature.ALTER_CONFIGS
-        : SupportedFeature.INCREMENTAL_ALTER_CONFIGS;
+    try {
+      float version = NumberUtil.parserClusterVersion(versionStr);
+      return version <= 2.3f
+          ? SupportedFeature.ALTER_CONFIGS
+          : SupportedFeature.INCREMENTAL_ALTER_CONFIGS;
+    } catch (NumberFormatException e) {
+      log.info("Assuming non-incremental alter configs due to version parsing error");
+      return SupportedFeature.ALTER_CONFIGS;
+    }
   }
 
   //TODO: discuss - maybe we should map kafka-library's exceptions to our exceptions here
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java
index cb1f08b3ab1..9ea8c037cce 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java
@@ -13,7 +13,8 @@ public static boolean isNumeric(Object value) {
     return value != null && NumberUtils.isCreatable(value.toString());
   }
 
-  public static float parserClusterVersion(String version) {
+  public static float parserClusterVersion(String version) throws NumberFormatException {
+    log.trace("Parsing cluster version [{}]", version);
     try {
       final String[] parts = version.split("\\.");
       if (parts.length > 2) {
@@ -21,7 +22,7 @@ public static float parserClusterVersion(String version) {
       }
       return Float.parseFloat(version.split("-")[0]);
     } catch (Exception e) {
-      log.error("Conversion clusterVersion {} to float value failed", version);
+      log.error("Conversion clusterVersion [{}] to float value failed", version, e);
       throw e;
     }
   }

From b135594e3f141ee2d339ee999674997f53437a0a Mon Sep 17 00:00:00 2001
From: Shubham Jain <shubhrjain7@gmail.com>
Date: Tue, 30 Aug 2022 17:41:50 +0530
Subject: [PATCH 139/734] Add a compose file for arm64 (#2503)

Update documentation
Create scripts folder
Closes #2502
---
 documentation/compose/DOCKER_COMPOSE.md     |  19 ++--
 documentation/compose/kafka-ui-arm64.yaml   | 105 ++++++++++++++++++++
 documentation/compose/scripts/update_run.sh |  11 ++
 3 files changed, 126 insertions(+), 9 deletions(-)
 create mode 100644 documentation/compose/kafka-ui-arm64.yaml
 create mode 100755 documentation/compose/scripts/update_run.sh

diff --git a/documentation/compose/DOCKER_COMPOSE.md b/documentation/compose/DOCKER_COMPOSE.md
index 2ea3f09c990..354a22c7853 100644
--- a/documentation/compose/DOCKER_COMPOSE.md
+++ b/documentation/compose/DOCKER_COMPOSE.md
@@ -1,12 +1,13 @@
 # Descriptions of docker-compose configurations (*.yaml)
 
 1. [kafka-ui.yaml](./kafka-ui.yaml) - Default configuration with 2 kafka clusters with two nodes of Schema Registry, one kafka-connect and a few dummy topics.
-2. [kafka-clusters-only.yaml](./kafka-clusters-only.yaml) - A configuration for development purposes, everything besides `kafka-ui` itself (to be run locally).
-3. [kafka-ui-ssl.yml](./kafka-ssl.yml) - Connect to Kafka via TLS/SSL
-4. [kafka-cluster-sr-auth.yaml](./kafka-cluster-sr-auth.yaml) - Schema registry with authentication.
-5. [kafka-ui-auth-context.yaml](./kafka-ui-auth-context.yaml) - Basic (username/password) authentication with custom path (URL) (issue 861).
-6. [kafka-ui-connectors.yaml](./kafka-ui-connectors.yaml) - Configuration with different connectors (github-source, s3, sink-activities, source-activities) and Ksql functionality.
-7. [kafka-ui-jmx-secured.yml](./kafka-ui-jmx-secured.yml) - Kafka’s JMX with SSL and authentication.
-8. [kafka-ui-reverse-proxy.yaml](./kafka-ui-reverse-proxy.yaml) - An example for using the app behind a proxy (like nginx).
-9. [kafka-ui-sasl.yaml](./kafka-ui-sasl.yaml) - SASL auth for Kafka.
-10. [kafka-ui-traefik-proxy.yaml](./kafka-ui-traefik-proxy.yaml) - Traefik specific proxy configuration.
+2. [kafka-ui-arm64.yaml](./kafka-ui-arm64.yaml) - Default configuration for ARM64(Mac M1) architecture with 1 kafka cluster without zookeeper with one node of Schema Registry, one kafka-connect and a few dummy topics.
+3. [kafka-clusters-only.yaml](./kafka-clusters-only.yaml) - A configuration for development purposes, everything besides `kafka-ui` itself (to be run locally).
+4. [kafka-ui-ssl.yml](./kafka-ssl.yml) - Connect to Kafka via TLS/SSL
+5. [kafka-cluster-sr-auth.yaml](./kafka-cluster-sr-auth.yaml) - Schema registry with authentication.
+6. [kafka-ui-auth-context.yaml](./kafka-ui-auth-context.yaml) - Basic (username/password) authentication with custom path (URL) (issue 861).
+7. [kafka-ui-connectors.yaml](./kafka-ui-connectors.yaml) - Configuration with different connectors (github-source, s3, sink-activities, source-activities) and Ksql functionality.
+8. [kafka-ui-jmx-secured.yml](./kafka-ui-jmx-secured.yml) - Kafka’s JMX with SSL and authentication.
+9. [kafka-ui-reverse-proxy.yaml](./kafka-ui-reverse-proxy.yaml) - An example for using the app behind a proxy (like nginx).
+10. [kafka-ui-sasl.yaml](./kafka-ui-sasl.yaml) - SASL auth for Kafka.
+11. [kafka-ui-traefik-proxy.yaml](./kafka-ui-traefik-proxy.yaml) - Traefik specific proxy configuration.
diff --git a/documentation/compose/kafka-ui-arm64.yaml b/documentation/compose/kafka-ui-arm64.yaml
new file mode 100644
index 00000000000..70134c6b52a
--- /dev/null
+++ b/documentation/compose/kafka-ui-arm64.yaml
@@ -0,0 +1,105 @@
+# This compose file uses kafka cluster without zookeeper
+# Kafka without zookeeper is supported after image tag 6.2.0
+# ARM64 supported images for kafka can be found here
+# https://hub.docker.com/r/confluentinc/cp-kafka/tags?page=1&name=arm64
+---
+version: '2'
+services:
+  kafka-ui:
+    container_name: kafka-ui
+    image: provectuslabs/kafka-ui:latest
+    ports:
+      - 8080:8080
+    depends_on:
+      - kafka0
+      - schemaregistry0
+      - kafka-connect0
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
+      KAFKA_CLUSTERS_0_JMXPORT: 9997
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
+
+  kafka0:
+    image: confluentinc/cp-kafka:7.0.5.arm64
+    hostname: kafka0
+    container_name: kafka0
+    ports:
+      - 9092:9092
+      - 9997:9997
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+      JMX_PORT: 9997
+      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
+    volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
+
+  schemaregistry0:
+    image: confluentinc/cp-schema-registry:7.0.5.arm64
+    ports:
+      - 8085:8085
+    depends_on:
+      - kafka0
+    environment:
+      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
+      SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
+      SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
+      SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
+
+      SCHEMA_REGISTRY_SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: "http"
+      SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
+      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
+
+  kafka-connect0:
+    image: confluentinc/cp-kafka-connect:7.0.5.arm64
+    ports:
+      - 8083:8083
+    depends_on:
+      - kafka0
+      - schemaregistry0
+    environment:
+      CONNECT_BOOTSTRAP_SERVERS: kafka0:29092
+      CONNECT_GROUP_ID: compose-connect-group
+      CONNECT_CONFIG_STORAGE_TOPIC: _connect_configs
+      CONNECT_CONFIG_STORAGE_REPLICATION_FACTOR: 1
+      CONNECT_OFFSET_STORAGE_TOPIC: _connect_offset
+      CONNECT_OFFSET_STORAGE_REPLICATION_FACTOR: 1
+      CONNECT_STATUS_STORAGE_TOPIC: _connect_status
+      CONNECT_STATUS_STORAGE_REPLICATION_FACTOR: 1
+      CONNECT_KEY_CONVERTER: org.apache.kafka.connect.storage.StringConverter
+      CONNECT_KEY_CONVERTER_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
+      CONNECT_VALUE_CONVERTER: org.apache.kafka.connect.storage.StringConverter
+      CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
+      CONNECT_INTERNAL_KEY_CONVERTER: org.apache.kafka.connect.json.JsonConverter
+      CONNECT_INTERNAL_VALUE_CONVERTER: org.apache.kafka.connect.json.JsonConverter
+      CONNECT_REST_ADVERTISED_HOST_NAME: kafka-connect0
+      CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
+
+  kafka-init-topics:
+    image: confluentinc/cp-kafka:7.0.5.arm64
+    volumes:
+       - ./message.json:/data/message.json
+    depends_on:
+      - kafka0
+    command: "bash -c 'echo Waiting for Kafka to be ready... && \
+               cub kafka-ready -b kafka0:29092 1 30 && \
+               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+               kafka-topics --create --topic second.messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+               kafka-console-producer --broker-list kafka0:29092 -topic second.users < /data/message.json'"
diff --git a/documentation/compose/scripts/update_run.sh b/documentation/compose/scripts/update_run.sh
new file mode 100755
index 00000000000..023c832b4e1
--- /dev/null
+++ b/documentation/compose/scripts/update_run.sh
@@ -0,0 +1,11 @@
+# This script is required to run kafka cluster (without zookeeper)
+#!/bin/sh
+
+# Docker workaround: Remove check for KAFKA_ZOOKEEPER_CONNECT parameter
+sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure
+
+# Docker workaround: Ignore cub zk-ready
+sed -i 's/cub zk-ready/echo ignore zk-ready/' /etc/confluent/docker/ensure
+
+# KRaft required step: Format the storage directory with a new cluster ID
+echo "kafka-storage format --ignore-formatted -t $(kafka-storage random-uuid) -c /etc/kafka/kafka.properties" >> /etc/confluent/docker/ensure
\ No newline at end of file

From 89a2c8d9204aa7f7daf3e726e19070c4166a67dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Estrela?=
 <6763969+Evilong@users.noreply.github.com>
Date: Tue, 30 Aug 2022 13:17:08 +0100
Subject: [PATCH 140/734] [Helm] base64 encode secrets (#2492)

* Fix #2393

* Bump chart version

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 charts/kafka-ui/Chart.yaml            | 2 +-
 charts/kafka-ui/templates/secret.yaml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 7eaff3c59aa..e0d9b0b1611 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.4.2
+version: 0.4.3
 appVersion: latest
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/secret.yaml b/charts/kafka-ui/templates/secret.yaml
index a2ebf0fdba8..a2d1f25fa2f 100644
--- a/charts/kafka-ui/templates/secret.yaml
+++ b/charts/kafka-ui/templates/secret.yaml
@@ -6,4 +6,6 @@ metadata:
     {{- include "kafka-ui.labels" . | nindent 4 }}
 type: Opaque
 data:
-  {{- toYaml .Values.envs.secret | nindent 2 }}
\ No newline at end of file
+  {{- range $key, $val := .Values.envs.secret }}
+  {{ $key }}: {{ $val | b64enc | quote }}
+  {{- end -}}

From 085dfec389296597d8ca595f837809b3b130ee63 Mon Sep 17 00:00:00 2001
From: Sergiy-provectus <85497366+Sergiy-provectus@users.noreply.github.com>
Date: Tue, 30 Aug 2022 15:28:59 +0300
Subject: [PATCH 141/734] Make message timestamp format configurable (backend)
 (#2277)

* [2163] Make message timestamp format configurable

* [2163] Make message timestamp format configurable - PR comments update

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/controller/InfoController.java   | 25 +++++++++++++++++++
 .../main/resources/swagger/kafka-ui-api.yaml  | 20 ++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java
new file mode 100644
index 00000000000..66e5d70bd33
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java
@@ -0,0 +1,25 @@
+package com.provectus.kafka.ui.controller;
+
+import com.provectus.kafka.ui.api.TimeStampFormatApi;
+import com.provectus.kafka.ui.model.TimeStampFormatDTO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+public class InfoController extends AbstractController implements TimeStampFormatApi {
+
+  @Value("${timestamp.format:dd.MM.YYYY HH:mm:ss}")
+  private String timeStampFormat;
+
+  @Override
+  public Mono<ResponseEntity<TimeStampFormatDTO>> getTimeStampFormat(ServerWebExchange exchange) {
+    return Mono.just(ResponseEntity.ok(new TimeStampFormatDTO().timeStampFormat(timeStampFormat)));
+  }
+}
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 77817f0edb9..c603b9dcc90 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1750,7 +1750,19 @@ paths:
                 $ref: '#/components/schemas/PartitionsIncreaseResponse'
         404:
           description: Not found
-
+  /api/info/timestampformat:
+    get:
+      tags:
+        - TimeStampFormat
+      summary: getTimeStampFormat
+      operationId: getTimeStampFormat
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TimeStampFormat'
 components:
   schemas:
     ErrorResponse:
@@ -2353,6 +2365,12 @@ components:
         name:
           type: string
 
+    TimeStampFormat:
+      type: object
+      properties:
+        timeStampFormat:
+          type: string
+
     TopicMessageConsuming:
       type: object
       properties:

From 5ff65e447215b7beb033945df0f95b719294998e Mon Sep 17 00:00:00 2001
From: Shubham Jain <shubhrjain7@gmail.com>
Date: Tue, 30 Aug 2022 19:27:54 +0530
Subject: [PATCH 142/734] Add full message details to export (#2493)

---
 .../src/components/Topics/Topic/Messages/Message.tsx | 11 ++++++++++-
 .../src/lib/hooks/__tests__/useDataSaver.spec.tsx    | 12 ++----------
 kafka-ui-react-app/src/lib/hooks/useDataSaver.ts     |  4 +---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index 3cba8d058ec..3584aee7973 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -40,9 +40,18 @@ const Message: React.FC<Props> = ({
   },
 }) => {
   const [isOpen, setIsOpen] = React.useState(false);
+  const savedMessageJson = {
+    Content: content,
+    Offset: offset,
+    Key: key,
+    Partition: partition,
+    Headers: headers,
+    Timestamp: timestamp,
+  };
+  const savedMessage = JSON.stringify(savedMessageJson, null, '\t');
   const { copyToClipboard, saveFile } = useDataSaver(
     'topic-message',
-    content || ''
+    savedMessage || ''
   );
 
   const toggleIsOpen = () => setIsOpen(!isOpen);
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
index 81ef81a96af..510fb955455 100644
--- a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
@@ -32,11 +32,7 @@ describe('useDataSaver hook', () => {
       render(<HookWrapper />);
       expect(mockCreate).toHaveBeenCalledTimes(2);
       expect(link.download).toEqual('message_1616581196000.json');
-      expect(link.href).toEqual(
-        `data:text/json;charset=utf-8,${encodeURIComponent(
-          JSON.stringify(content)
-        )}`
-      );
+      expect(link.href).toEqual(`data:text/json;charset=utf-8,${content}`);
       expect(link.click).toHaveBeenCalledTimes(1);
 
       mockCreate.mockRestore();
@@ -59,11 +55,7 @@ describe('useDataSaver hook', () => {
       render(<HookWrapper />);
       expect(mockCreate).toHaveBeenCalledTimes(2);
       expect(link.download).toEqual('message_1616581196000.txt');
-      expect(link.href).toEqual(
-        `data:text/json;charset=utf-8,${encodeURIComponent(
-          JSON.stringify('content')
-        )}`
-      );
+      expect(link.href).toEqual(`data:text/json;charset=utf-8,content`);
       expect(link.click).toHaveBeenCalledTimes(1);
 
       mockCreate.mockRestore();
diff --git a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
index 20c9cd2ac2b..6dba2700be8 100644
--- a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
@@ -20,9 +20,7 @@ const useDataSaver = (
 
   const saveFile = () => {
     const extension = isObject(data) ? 'json' : 'txt';
-    const dataStr = `data:text/json;charset=utf-8,${encodeURIComponent(
-      JSON.stringify(data)
-    )}`;
+    const dataStr = `data:text/json;charset=utf-8,${data}`;
     const downloadAnchorNode = document.createElement('a');
     downloadAnchorNode.setAttribute('href', dataStr);
     downloadAnchorNode.setAttribute(

From 0ca69fb142013c1ec73033af15de47e040f218a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mau=20Rodr=C3=ADguez=20Morales?=
 <3047213+yvaeltercero@users.noreply.github.com>
Date: Thu, 1 Sep 2022 03:43:46 -0600
Subject: [PATCH 143/734] Add a warning upon deleting saved filter which is in
 use (#2484)

Co-authored-by: Mau Rodriguez Morales <mrodriguezmorales@provectus.com>
---
 .../Topic/Messages/Filters/AddFilter.tsx      |  3 +++
 .../Topic/Messages/Filters/FilterModal.tsx    |  3 +++
 .../Topics/Topic/Messages/Filters/Filters.tsx |  1 +
 .../Topic/Messages/Filters/SavedFilters.tsx   | 26 +++++++++++++++----
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
index e9ff5366cd8..510fcd03590 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
@@ -18,6 +18,7 @@ export interface FilterModalProps {
   activeFilterHandler(activeFilter: MessageFilters, index: number): void;
   toggleEditModal(): void;
   editFilter(value: FilterEdit): void;
+  activeFilter?: MessageFilters;
 }
 
 export interface AddMessageFilters extends MessageFilters {
@@ -32,6 +33,7 @@ const AddFilter: React.FC<FilterModalProps> = ({
   activeFilterHandler,
   toggleEditModal,
   editFilter,
+  activeFilter,
 }) => {
   const [savedFilterState, setSavedFilterState] =
     React.useState<boolean>(false);
@@ -80,6 +82,7 @@ const AddFilter: React.FC<FilterModalProps> = ({
             toggleEditModal();
             editFilter({ index, filter });
           }}
+          activeFilter={activeFilter}
         />
       ) : (
         <>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
index dc8b8e6a334..18c4624e93d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
@@ -11,6 +11,7 @@ export interface FilterModalProps {
   deleteFilter(index: number): void;
   activeFilterHandler(activeFilter: MessageFilters, index: number): void;
   editSavedFilter(filter: FilterEdit): void;
+  activeFilter?: MessageFilters;
 }
 
 export interface FilterEdit {
@@ -25,6 +26,7 @@ const FilterModal: React.FC<FilterModalProps> = ({
   deleteFilter,
   activeFilterHandler,
   editSavedFilter,
+  activeFilter,
 }) => {
   const [addFilterModal, setAddFilterModal] = React.useState<boolean>(true);
   const toggleEditModal = () => {
@@ -49,6 +51,7 @@ const FilterModal: React.FC<FilterModalProps> = ({
           activeFilterHandler={activeFilterHandler}
           toggleEditModal={toggleEditModal}
           editFilter={editFilterHandler}
+          activeFilter={activeFilter}
         />
       ) : (
         <EditFilter
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 018a8ef1fff..957bc640279 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -498,6 +498,7 @@ const Filters: React.FC<FiltersProps> = ({
           deleteFilter={deleteFilter}
           activeFilterHandler={activeFilterHandler}
           editSavedFilter={editSavedFilter}
+          activeFilter={activeFilter}
         />
       )}
       <S.FiltersMetrics>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
index 279ad24b3e5..26036ae9aea 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
@@ -13,6 +13,7 @@ export interface Props {
   activeFilterHandler(activeFilter: MessageFilters, index: number): void;
   closeModal(): void;
   onGoBack(): void;
+  activeFilter?: MessageFilters;
 }
 
 const SavedFilters: FC<Props> = ({
@@ -22,11 +23,12 @@ const SavedFilters: FC<Props> = ({
   activeFilterHandler,
   closeModal,
   onGoBack,
+  activeFilter,
 }) => {
   const [selectedFilter, setSelectedFilter] = React.useState(-1);
   const confirm = useConfirm();
 
-  const activeFilter = () => {
+  const activateFilter = () => {
     if (selectedFilter > -1) {
       activeFilterHandler(filters[selectedFilter], selectedFilter);
     }
@@ -34,9 +36,23 @@ const SavedFilters: FC<Props> = ({
   };
 
   const deleteFilterHandler = (index: number) => {
-    confirm(<>Are you sure want to remove {filters[index]?.name}?</>, () => {
-      deleteFilter(index);
-    });
+    const filterName = filters[index]?.name;
+    const isFilterSelected = activeFilter && activeFilter.name === filterName;
+
+    confirm(
+      <>
+        <p>Are you sure want to remove {filterName}?</p>
+        {isFilterSelected && (
+          <>
+            <br />
+            <p>Warning: this filter is currently selected.</p>
+          </>
+        )}
+      </>,
+      () => {
+        deleteFilter(index);
+      }
+    );
   };
 
   return (
@@ -78,7 +94,7 @@ const SavedFilters: FC<Props> = ({
           buttonSize="M"
           buttonType="primary"
           type="button"
-          onClick={activeFilter}
+          onClick={activateFilter}
         >
           Select filter
         </Button>

From 9440c5e7af79bd191bd4dc94bc90f488147125a6 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Thu, 1 Sep 2022 13:12:18 +0300
Subject: [PATCH 144/734] [e2e] Get rid of 2nd cluster (#2509)

* add pageLoadTimeout

* upd readme

* upd readme

* upd readme

* upd readme

* rmv second cluster

* rmv second cluster

* rmv second cluster

* More renames

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/e2e-checks.yaml             |  2 +-
 documentation/compose/DOCKER_COMPOSE.md       |  2 +-
 ...afka-ui-connectors.yaml => kafka-e2e.yaml} | 52 +------------------
 kafka-ui-e2e-checks/README.md                 |  4 +-
 .../com/provectus/kafka/ui/base/BaseTest.java | 16 +++---
 .../kafka/ui/tests/ConnectorsTests.java       | 41 +++++++--------
 .../kafka/ui/tests/SchemasTests.java          | 43 ++++++++-------
 .../provectus/kafka/ui/tests/TopicTests.java  | 31 ++++++-----
 8 files changed, 68 insertions(+), 123 deletions(-)
 rename documentation/compose/{kafka-ui-connectors.yaml => kafka-e2e.yaml} (74%)

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 3d17ce28c77..749c10f49ed 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -43,7 +43,7 @@ jobs:
         id: compose_app
         # use the following command until #819 will be fixed
         run: |
-          docker-compose -f ./documentation/compose/kafka-ui-connectors.yaml up -d
+          docker-compose -f ./documentation/compose/kafka-ui-e2e.yaml up -d
       - name: e2e run
         run: |
           mvn versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
diff --git a/documentation/compose/DOCKER_COMPOSE.md b/documentation/compose/DOCKER_COMPOSE.md
index 354a22c7853..22ce3896f7f 100644
--- a/documentation/compose/DOCKER_COMPOSE.md
+++ b/documentation/compose/DOCKER_COMPOSE.md
@@ -6,7 +6,7 @@
 4. [kafka-ui-ssl.yml](./kafka-ssl.yml) - Connect to Kafka via TLS/SSL
 5. [kafka-cluster-sr-auth.yaml](./kafka-cluster-sr-auth.yaml) - Schema registry with authentication.
 6. [kafka-ui-auth-context.yaml](./kafka-ui-auth-context.yaml) - Basic (username/password) authentication with custom path (URL) (issue 861).
-7. [kafka-ui-connectors.yaml](./kafka-ui-connectors.yaml) - Configuration with different connectors (github-source, s3, sink-activities, source-activities) and Ksql functionality.
+7. [kafka-e2e.yaml](./kafka-e2e.yaml) - Configuration with different connectors (github-source, s3, sink-activities, source-activities) and Ksql functionality.
 8. [kafka-ui-jmx-secured.yml](./kafka-ui-jmx-secured.yml) - Kafka’s JMX with SSL and authentication.
 9. [kafka-ui-reverse-proxy.yaml](./kafka-ui-reverse-proxy.yaml) - An example for using the app behind a proxy (like nginx).
 10. [kafka-ui-sasl.yaml](./kafka-ui-sasl.yaml) - SASL auth for Kafka.
diff --git a/documentation/compose/kafka-ui-connectors.yaml b/documentation/compose/kafka-e2e.yaml
similarity index 74%
rename from documentation/compose/kafka-ui-connectors.yaml
rename to documentation/compose/kafka-e2e.yaml
index c8e48860a97..bc0efffa909 100644
--- a/documentation/compose/kafka-ui-connectors.yaml
+++ b/documentation/compose/kafka-e2e.yaml
@@ -9,9 +9,7 @@ services:
       - 8080:8080
     depends_on:
       - zookeeper0
-      - zookeeper1
       - kafka0
-      - kafka1
       - schemaregistry0
       - kafka-connect0
     environment:
@@ -23,11 +21,6 @@ services:
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       KAFKA_CLUSTERS_0_KSQLDBSERVER: http://ksqldb:8088
-      KAFKA_CLUSTERS_1_NAME: secondLocal
-      KAFKA_CLUSTERS_1_BOOTSTRAPSERVERS: kafka1:29092
-      KAFKA_CLUSTERS_1_ZOOKEEPER: zookeeper1:2181
-      KAFKA_CLUSTERS_1_JMXPORT: 9998
-      KAFKA_CLUSTERS_1_SCHEMAREGISTRY: http://schemaregistry1:8085
 
   zookeeper0:
     image: confluentinc/cp-zookeeper:5.2.4
@@ -56,31 +49,6 @@ services:
       JMX_PORT: 9997
       KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
 
-  zookeeper1:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-
-  kafka1:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper1
-    ports:
-      - 9093:9093
-      - 9998:9998
-    environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper1:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka1:29092,PLAINTEXT_HOST://localhost:9093
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
-      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
-      JMX_PORT: 9998
-      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka1 -Dcom.sun.management.jmxremote.rmi.port=9998
-
   schemaregistry0:
     image: confluentinc/cp-schema-registry:5.5.0
     ports:
@@ -99,24 +67,6 @@ services:
       SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
-  schemaregistry1:
-    image: confluentinc/cp-schema-registry:5.5.0
-    ports:
-      - 18085:8085
-    depends_on:
-      - zookeeper1
-      - kafka1
-    environment:
-      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka1:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper1:2181
-      SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
-      SCHEMA_REGISTRY_HOST_NAME: schemaregistry1
-      SCHEMA_REGISTRY_LISTENERS: http://schemaregistry1:8085
-
-      SCHEMA_REGISTRY_SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: "http"
-      SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
-      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
-
   kafka-connect0:
     build:
       context: ./kafka-connect
@@ -152,7 +102,7 @@ services:
     volumes:
       - ./message.json:/data/message.json
     depends_on:
-      - kafka1
+      - kafka0
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
                cub kafka-ready -b kafka1:29092 1 30 && \
                kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index 4cd986dc475..ab1af3e5ad1 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -48,9 +48,9 @@ docker pull selenoid/vnc:chrome_86.0
 1. Run `kafka-ui`: 
 ```
 cd kafka-ui
-docker-compose -f documentation/compose/kafka-ui-connectors.yaml up -d
+docker-compose -f documentation/compose/kafka-e2e.yaml up -d
 ```
-2. Run tests using your QaseIO API token as environment variable (put instead $s into command below)
+2. Run tests using your QaseIO API token as environment variable (put instead %s into command below)
 ```
 mvn -DQASEIO_API_TOKEN=‘%s’ -pl ‘!kafka-ui-api’ test -Pprod
 ```
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 6a1e6029bc3..2698fbf6cc1 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -12,18 +12,10 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import io.qameta.allure.Allure;
 import io.qameta.allure.selenide.AllureSelenide;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.*;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.TakesScreenshot;
@@ -34,12 +26,18 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
 @Slf4j
 @DisplayNameGeneration(CamelCaseToSpacedDisplayNameGenerator.class)
 public class BaseTest {
 
   public static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
   public static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
+  public static final String CLUSTER_NAME = "local";
   protected Pages pages = Pages.INSTANCE;
   protected Helpers helpers = Helpers.INSTANCE;
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 379114fdd84..5f11151c8b0 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -18,7 +18,6 @@ public class ConnectorsTests extends BaseTest {
 
     private final long suiteId = 10;
     private final String suiteTitle = "Kafka Connect";
-    public static final String LOCAL_CLUSTER = "local";
     public static final String SINK_CONNECTOR = "sink_postgres_activities_e2e_checks";
     public static final String TOPIC_FOR_CONNECTOR = "topic_for_connector";
     public static final String TOPIC_FOR_DELETE_CONNECTOR = "topic_for_delete_connector";
@@ -35,29 +34,29 @@ public static void beforeAll() {
         String connectorToUpdate = getResourceAsString("config_for_create_connector_via_api.json");
         String message = getResourceAsString("message_content_create_topic.json");
 
-        apiHelper.deleteTopic(LOCAL_CLUSTER, CONNECTOR_FOR_DELETE);
+        apiHelper.deleteTopic(CLUSTER_NAME, CONNECTOR_FOR_DELETE);
 
-        apiHelper.createTopic(LOCAL_CLUSTER, TOPIC_FOR_CONNECTOR);
-        apiHelper.sendMessage(LOCAL_CLUSTER, TOPIC_FOR_CONNECTOR, message, " ");
+        apiHelper.createTopic(CLUSTER_NAME, TOPIC_FOR_CONNECTOR);
+        apiHelper.sendMessage(CLUSTER_NAME, TOPIC_FOR_CONNECTOR, message, " ");
 
-        apiHelper.createTopic(LOCAL_CLUSTER, TOPIC_FOR_DELETE_CONNECTOR);
-        apiHelper.sendMessage(LOCAL_CLUSTER, TOPIC_FOR_DELETE_CONNECTOR, message, " ");
+        apiHelper.createTopic(CLUSTER_NAME, TOPIC_FOR_DELETE_CONNECTOR);
+        apiHelper.sendMessage(CLUSTER_NAME, TOPIC_FOR_DELETE_CONNECTOR, message, " ");
 
-        apiHelper.createTopic(LOCAL_CLUSTER, TOPIC_FOR_UPDATE_CONNECTOR);
-        apiHelper.sendMessage(LOCAL_CLUSTER, TOPIC_FOR_UPDATE_CONNECTOR, message, " ");
+        apiHelper.createTopic(CLUSTER_NAME, TOPIC_FOR_UPDATE_CONNECTOR);
+        apiHelper.sendMessage(CLUSTER_NAME, TOPIC_FOR_UPDATE_CONNECTOR, message, " ");
 
-        apiHelper.createConnector(LOCAL_CLUSTER, FIRST_CONNECTOR, CONNECTOR_FOR_DELETE, connectorToDelete);
-        apiHelper.createConnector(LOCAL_CLUSTER, FIRST_CONNECTOR, CONNECTOR_FOR_UPDATE, connectorToUpdate);
+        apiHelper.createConnector(CLUSTER_NAME, FIRST_CONNECTOR, CONNECTOR_FOR_DELETE, connectorToDelete);
+        apiHelper.createConnector(CLUSTER_NAME, FIRST_CONNECTOR, CONNECTOR_FOR_UPDATE, connectorToUpdate);
     }
 
     @AfterAll
     public static void afterAll() {
         ApiHelper apiHelper = Helpers.INSTANCE.apiHelper;
-        apiHelper.deleteConnector(LOCAL_CLUSTER, FIRST_CONNECTOR, SINK_CONNECTOR);
-        apiHelper.deleteConnector(LOCAL_CLUSTER, FIRST_CONNECTOR, CONNECTOR_FOR_UPDATE);
-        apiHelper.deleteTopic(LOCAL_CLUSTER, TOPIC_FOR_CONNECTOR);
-        apiHelper.deleteTopic(LOCAL_CLUSTER, TOPIC_FOR_DELETE_CONNECTOR);
-        apiHelper.deleteTopic(LOCAL_CLUSTER, TOPIC_FOR_UPDATE_CONNECTOR);
+        apiHelper.deleteConnector(CLUSTER_NAME, FIRST_CONNECTOR, SINK_CONNECTOR);
+        apiHelper.deleteConnector(CLUSTER_NAME, FIRST_CONNECTOR, CONNECTOR_FOR_UPDATE);
+        apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_FOR_CONNECTOR);
+        apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_FOR_DELETE_CONNECTOR);
+        apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_FOR_UPDATE_CONNECTOR);
     }
 
     @DisplayName("should create a connector")
@@ -66,14 +65,14 @@ public static void afterAll() {
     @CaseId(42)
     @Test
     public void createConnector() {
-        pages.openConnectorsList(LOCAL_CLUSTER)
+        pages.openConnectorsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .clickCreateConnectorButton()
                 .waitUntilScreenReady()
                 .setConnectorConfig(
                         SINK_CONNECTOR,
                         getResourceAsString("config_for_create_connector.json"));
-        pages.openConnectorsList(LOCAL_CLUSTER)
+        pages.openConnectorsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR);
     }
@@ -84,13 +83,13 @@ public void createConnector() {
     @CaseId(196)
     @Test
     public void updateConnector() {
-        pages.openConnectorsList(LOCAL_CLUSTER)
+        pages.openConnectorsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_UPDATE);
         pages.connectorsView.connectorIsVisibleOnOverview();
         pages.connectorsView.openEditConfig()
                 .updConnectorConfig(getResourceAsString("config_for_update_connector.json"));
-        pages.openConnectorsList(LOCAL_CLUSTER)
+        pages.openConnectorsList(CLUSTER_NAME)
                 .connectorIsVisibleInList(CONNECTOR_FOR_UPDATE, TOPIC_FOR_UPDATE_CONNECTOR);
     }
 
@@ -100,11 +99,11 @@ public void updateConnector() {
     @CaseId(195)
     @Test
     public void deleteConnector() {
-        pages.openConnectorsList(LOCAL_CLUSTER)
+        pages.openConnectorsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_DELETE);
         pages.connectorsView.clickDeleteButton();
-        pages.openConnectorsList(LOCAL_CLUSTER)
+        pages.openConnectorsList(CLUSTER_NAME)
                 .isNotVisible(CONNECTOR_FOR_DELETE);
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index 239f66f5cf5..da14264ec39 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -19,7 +19,6 @@ public class SchemasTests extends BaseTest {
 
     private final long suiteId = 11;
     private final String suiteTitle = "Schema Registry";
-    public static final String SECOND_LOCAL = "secondLocal";
     public static final String SCHEMA_AVRO_CREATE = "avro_schema";
     public static final String SCHEMA_JSON_CREATE = "json_schema";
     public static final String SCHEMA_PROTOBUF_CREATE = "protobuf_schema";
@@ -34,21 +33,21 @@ public class SchemasTests extends BaseTest {
 
     @BeforeAll
     public static void beforeAll() {
-        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_AVRO_API_UPDATE, SchemaType.AVRO, fileToString(PATH_AVRO_VALUE));
-        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_AVRO_API, SchemaType.AVRO, fileToString(PATH_AVRO_VALUE));
-        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_JSON_API, SchemaType.JSON, fileToString(PATH_JSON_VALUE));
-        Helpers.INSTANCE.apiHelper.createSchema(SECOND_LOCAL, SCHEMA_PROTOBUF_API, SchemaType.PROTOBUF, fileToString(PATH_PROTOBUF_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, SCHEMA_AVRO_API_UPDATE, SchemaType.AVRO, fileToString(PATH_AVRO_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, SCHEMA_AVRO_API, SchemaType.AVRO, fileToString(PATH_AVRO_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, SCHEMA_JSON_API, SchemaType.JSON, fileToString(PATH_JSON_VALUE));
+        Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, SCHEMA_PROTOBUF_API, SchemaType.PROTOBUF, fileToString(PATH_PROTOBUF_VALUE));
     }
 
     @AfterAll
     public static void afterAll() {
-        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_AVRO_CREATE);
-        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_JSON_CREATE);
-        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_PROTOBUF_CREATE);
-        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_AVRO_API_UPDATE);
-        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_AVRO_API);
-        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_JSON_API);
-        Helpers.INSTANCE.apiHelper.deleteSchema(SECOND_LOCAL, SCHEMA_PROTOBUF_API);
+        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_AVRO_CREATE);
+        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_JSON_CREATE);
+        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_PROTOBUF_CREATE);
+        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_AVRO_API_UPDATE);
+        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_AVRO_API);
+        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_JSON_API);
+        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_PROTOBUF_API);
 
     }
 
@@ -60,7 +59,7 @@ public static void afterAll() {
     @Order(1)
     void createSchemaAvro() {
         pages.openMainPage()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
                 .setSubjectName(SCHEMA_AVRO_CREATE)
                 .setSchemaField(fileToString(PATH_AVRO_VALUE))
@@ -68,7 +67,7 @@ void createSchemaAvro() {
                 .clickSubmit()
                 .waitUntilScreenReady();
         pages.mainPage
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.isSchemaVisible(SCHEMA_AVRO_CREATE);
     }
 
@@ -80,7 +79,7 @@ void createSchemaAvro() {
     @Order(2)
     void updateSchemaAvro() {
         pages.openMainPage()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_AVRO_API_UPDATE)
                 .waitUntilScreenReady()
                 .openEditSchema()
@@ -99,7 +98,7 @@ void updateSchemaAvro() {
     @Order(3)
     void deleteSchemaAvro() {
         pages.openMainPage()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_AVRO_API)
                 .waitUntilScreenReady()
                 .removeSchema()
@@ -114,7 +113,7 @@ void deleteSchemaAvro() {
     @Order(4)
     void createSchemaJson() {
         pages.openMainPage()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
                 .setSubjectName(SCHEMA_JSON_CREATE)
                 .setSchemaField(fileToString(PATH_JSON_VALUE))
@@ -122,7 +121,7 @@ void createSchemaJson() {
                 .clickSubmit()
                 .waitUntilScreenReady();
         pages.mainPage
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.isSchemaVisible(SCHEMA_JSON_CREATE);
     }
 
@@ -134,7 +133,7 @@ void createSchemaJson() {
     @Order(5)
     void deleteSchemaJson() {
         pages.openMainPage()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_JSON_API)
                 .waitUntilScreenReady()
                 .removeSchema()
@@ -149,7 +148,7 @@ void deleteSchemaJson() {
     @Order(6)
     void createSchemaProtobuf() {
         pages.openMainPage()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
                 .setSubjectName(SCHEMA_PROTOBUF_CREATE)
                 .setSchemaField(fileToString(PATH_PROTOBUF_VALUE))
@@ -157,7 +156,7 @@ void createSchemaProtobuf() {
                 .clickSubmit()
                 .waitUntilScreenReady();
         pages.mainPage
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.isSchemaVisible(SCHEMA_PROTOBUF_CREATE);
     }
 
@@ -169,7 +168,7 @@ void createSchemaProtobuf() {
     @Order(7)
     void deleteSchemaProtobuf() {
         pages.openMainPage()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_PROTOBUF_API)
                 .waitUntilScreenReady()
                 .removeSchema()
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index b799e6580bc..68ff8d84e19 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -18,7 +18,6 @@ public class TopicTests extends BaseTest {
     public static final String NEW_TOPIC = "new-topic";
     public static final String TOPIC_TO_UPDATE = "topic-to-update";
     public static final String TOPIC_TO_DELETE = "topic-to-delete";
-    public static final String SECOND_LOCAL = "secondLocal";
     public static final String COMPACT_POLICY_VALUE = "Compact";
     public static final String UPDATED_TIME_TO_RETAIN_VALUE = "604800001";
     public static final String UPDATED_MAX_SIZE_ON_DISK = "20 GB";
@@ -29,15 +28,15 @@ public class TopicTests extends BaseTest {
 
     @BeforeAll
     public static void beforeAll() {
-        Helpers.INSTANCE.apiHelper.createTopic(SECOND_LOCAL, TOPIC_TO_UPDATE);
-        Helpers.INSTANCE.apiHelper.createTopic(SECOND_LOCAL, TOPIC_TO_DELETE);
+        Helpers.INSTANCE.apiHelper.createTopic(CLUSTER_NAME, TOPIC_TO_UPDATE);
+        Helpers.INSTANCE.apiHelper.createTopic(CLUSTER_NAME, TOPIC_TO_DELETE);
     }
 
     @AfterAll
     public static void afterAll() {
-        Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, TOPIC_TO_UPDATE);
-        Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, TOPIC_TO_DELETE);
-        Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, NEW_TOPIC);
+        Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_TO_UPDATE);
+        Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_TO_DELETE);
+        Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, NEW_TOPIC);
     }
 
     @DisplayName("should create a topic")
@@ -47,17 +46,17 @@ public static void afterAll() {
     @Test
     public void createTopic() {
         pages.open()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS);
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS);
         pages.topicsList.pressCreateNewTopic()
                 .setTopicName(NEW_TOPIC)
                 .sendData()
                 .waitUntilScreenReady();
         pages.open()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS)
                 .topicIsVisible(NEW_TOPIC);
-        helpers.apiHelper.deleteTopic(SECOND_LOCAL, NEW_TOPIC);
+        helpers.apiHelper.deleteTopic(CLUSTER_NAME, NEW_TOPIC);
         pages.open()
-                .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS)
                 .topicIsNotVisible(NEW_TOPIC);
     }
     @Disabled("Due to issue https://github.com/provectus/kafka-ui/issues/1500 ignore this test")
@@ -68,9 +67,9 @@ public void createTopic() {
     @CaseId(197)
     @Test
     public void updateTopic() {
-        pages.openTopicsList(SECOND_LOCAL)
+        pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
+        pages.openTopicView(CLUSTER_NAME, TOPIC_TO_UPDATE)
                 .waitUntilScreenReady()
                 .openEditSettings()
                 .selectCleanupPolicy(COMPACT_POLICY_VALUE)
@@ -81,9 +80,9 @@ public void updateTopic() {
                 .sendData()
                 .waitUntilScreenReady();
 
-        pages.openTopicsList(SECOND_LOCAL)
+        pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
+        pages.openTopicView(CLUSTER_NAME, TOPIC_TO_UPDATE)
                 .openEditSettings()
                 // Assertions
                 .cleanupPolicyIs(COMPACT_POLICY_VALUE)
@@ -98,7 +97,7 @@ public void updateTopic() {
     @CaseId(207)
     @Test
     public void deleteTopic() {
-        pages.openTopicsList(SECOND_LOCAL)
+        pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openTopic(TOPIC_TO_DELETE)
                 .waitUntilScreenReady()
@@ -113,7 +112,7 @@ public void deleteTopic() {
     @CaseId(222)
     @Test
     void produceMessage() {
-        pages.openTopicsList(SECOND_LOCAL)
+        pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openTopic(TOPIC_TO_UPDATE)
                 .waitUntilScreenReady()

From ecb28f4dd538b7e325f14904555067a3b6fb7fd3 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 1 Sep 2022 17:23:37 +0400
Subject: [PATCH 145/734] Fix e2e compose paths

& update docs
---
 .github/workflows/e2e-checks.yaml                        | 2 +-
 documentation/compose/DOCKER_COMPOSE.md                  | 2 +-
 documentation/compose/{kafka-e2e.yaml => e2e-tests.yaml} | 0
 documentation/project/contributing/building.md           | 2 +-
 kafka-ui-e2e-checks/README.md                            | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename documentation/compose/{kafka-e2e.yaml => e2e-tests.yaml} (100%)

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 749c10f49ed..354853a4c3f 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -43,7 +43,7 @@ jobs:
         id: compose_app
         # use the following command until #819 will be fixed
         run: |
-          docker-compose -f ./documentation/compose/kafka-ui-e2e.yaml up -d
+          docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
       - name: e2e run
         run: |
           mvn versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
diff --git a/documentation/compose/DOCKER_COMPOSE.md b/documentation/compose/DOCKER_COMPOSE.md
index 22ce3896f7f..c5fc1f1476c 100644
--- a/documentation/compose/DOCKER_COMPOSE.md
+++ b/documentation/compose/DOCKER_COMPOSE.md
@@ -6,7 +6,7 @@
 4. [kafka-ui-ssl.yml](./kafka-ssl.yml) - Connect to Kafka via TLS/SSL
 5. [kafka-cluster-sr-auth.yaml](./kafka-cluster-sr-auth.yaml) - Schema registry with authentication.
 6. [kafka-ui-auth-context.yaml](./kafka-ui-auth-context.yaml) - Basic (username/password) authentication with custom path (URL) (issue 861).
-7. [kafka-e2e.yaml](./kafka-e2e.yaml) - Configuration with different connectors (github-source, s3, sink-activities, source-activities) and Ksql functionality.
+7. [e2e-tests.yaml](./e2e-tests.yaml) - Configuration with different connectors (github-source, s3, sink-activities, source-activities) and Ksql functionality.
 8. [kafka-ui-jmx-secured.yml](./kafka-ui-jmx-secured.yml) - Kafka’s JMX with SSL and authentication.
 9. [kafka-ui-reverse-proxy.yaml](./kafka-ui-reverse-proxy.yaml) - An example for using the app behind a proxy (like nginx).
 10. [kafka-ui-sasl.yaml](./kafka-ui-sasl.yaml) - SASL auth for Kafka.
diff --git a/documentation/compose/kafka-e2e.yaml b/documentation/compose/e2e-tests.yaml
similarity index 100%
rename from documentation/compose/kafka-e2e.yaml
rename to documentation/compose/e2e-tests.yaml
diff --git a/documentation/project/contributing/building.md b/documentation/project/contributing/building.md
index 7b530829b92..bb8d7bc2241 100644
--- a/documentation/project/contributing/building.md
+++ b/documentation/project/contributing/building.md
@@ -4,7 +4,7 @@ Once you installed the prerequisites and cloned the repository, run the followin
 
 Build a docker container with the app:
 ```sh
-./mvnw clean install -Pprod
+./mvnw clean install -Dmaven.test.skip=true -Pprod
 ``` 
 Start the app with Kafka clusters:
 ```sh
diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index ab1af3e5ad1..307fcc1b191 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -48,7 +48,7 @@ docker pull selenoid/vnc:chrome_86.0
 1. Run `kafka-ui`: 
 ```
 cd kafka-ui
-docker-compose -f documentation/compose/kafka-e2e.yaml up -d
+docker-compose -f documentation/compose/e2e-tests.yaml up -d
 ```
 2. Run tests using your QaseIO API token as environment variable (put instead %s into command below)
 ```

From 77dca1594c7bf07176b6a82f6b5153b456d78dc0 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Thu, 1 Sep 2022 16:31:58 +0300
Subject: [PATCH 146/734] Fix documentation

---
 kafka-ui-e2e-checks/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index 307fcc1b191..e652759e0c2 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -52,7 +52,7 @@ docker-compose -f documentation/compose/e2e-tests.yaml up -d
 ```
 2. Run tests using your QaseIO API token as environment variable (put instead %s into command below)
 ```
-mvn -DQASEIO_API_TOKEN=‘%s’ -pl ‘!kafka-ui-api’ test -Pprod
+mvn -DQASEIO_API_TOKEN='%s' -pl '!kafka-ui-api' test -Pprod
 ```
 
 ### Reporting

From 91b86b5b780eb6c090c89eebd405f3487147e6da Mon Sep 17 00:00:00 2001
From: Kris-K-Dev <92114648+Kris-K-Dev@users.noreply.github.com>
Date: Thu, 1 Sep 2022 08:57:36 -0600
Subject: [PATCH 147/734] #2180 The e letter allowed to paste into number
 fields (#2508)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../src/components/common/Input/Input.tsx     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/common/Input/Input.tsx b/kafka-ui-react-app/src/components/common/Input/Input.tsx
index 58a3bb92c85..d6c6416bfe7 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/Input.tsx
@@ -17,6 +17,7 @@ const Input: React.FC<InputProps> = ({
   hookFormOptions,
   search,
   inputSize = 'L',
+  type,
   ...rest
 }) => {
   const methods = useFormContext();
@@ -28,10 +29,30 @@ const Input: React.FC<InputProps> = ({
           inputSize={inputSize}
           {...methods.register(name, { ...hookFormOptions })}
           hasLeftIcon={!!search}
+          type={type}
           {...rest}
+          onKeyDown={(e) => {
+            if (type === 'number') {
+              if (e.key === 'e') {
+                e.preventDefault();
+              }
+            }
+          }}
+          onPaste={(e) => {
+            if (type === 'number') {
+              e.preventDefault();
+              const value = e.clipboardData.getData('Text');
+              methods.setValue(name, value.replace(/[^\d.]/g, ''));
+            }
+          }}
         />
       ) : (
-        <S.Input inputSize={inputSize} hasLeftIcon={!!search} {...rest} />
+        <S.Input
+          inputSize={inputSize}
+          hasLeftIcon={!!search}
+          type={type}
+          {...rest}
+        />
       )}
     </S.Wrapper>
   );

From c8306f59700f574d6e68f31a121f626440b47a20 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 2 Sep 2022 16:27:33 +0400
Subject: [PATCH 148/734] Fix consumers sorting (#2447)

* Fix consumers sorting

* Fix tests

* Review fix

* Review suggestions
---
 .../kafka/ui/service/ConsumerGroupService.java |  2 +-
 .../kafka/ui/KafkaConsumerGroupTests.java      | 18 +++++++++++++++++-
 .../ui/container/KafkaConnectContainer.java    |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index beb9f849798..d17f5249781 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -161,7 +161,7 @@ private Comparator<ConsumerGroupDescription> getPaginationComparator(ConsumerGro
         };
         return Comparator.comparingInt(statesPriorities);
       case MEMBERS:
-        return Comparator.comparingInt(cg -> -cg.members().size());
+        return Comparator.comparingInt(cg -> cg.members().size());
       default:
         throw new IllegalStateException("Unsupported order by: " + orderBy);
     }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerGroupTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerGroupTests.java
index 17e7a19ee7f..98f8394060f 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerGroupTests.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerGroupTests.java
@@ -14,6 +14,7 @@
 import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
@@ -126,6 +127,21 @@ void shouldReturnConsumerGroupsWithPagination() throws Exception {
               assertThat(page.getConsumerGroups())
                   .isSortedAccordingTo(Comparator.comparing(ConsumerGroupDTO::getGroupId).reversed());
             });
+
+      webTestClient
+          .get()
+          .uri("/api/clusters/{clusterName}/consumer-groups/paged?perPage=10&&search"
+              + "=cgPageTest&orderBy=MEMBERS&sortOrder=DESC", LOCAL)
+          .exchange()
+          .expectStatus()
+          .isOk()
+          .expectBody(ConsumerGroupsPageResponseDTO.class)
+          .value(page -> {
+            assertThat(page.getPageCount()).isEqualTo(1);
+            assertThat(page.getConsumerGroups().size()).isEqualTo(5);
+            assertThat(page.getConsumerGroups())
+                .isSortedAccordingTo(Comparator.comparing(ConsumerGroupDTO::getMembers).reversed());
+          });
     }
   }
 
@@ -133,7 +149,7 @@ private Closeable startConsumerGroups(int count, String consumerGroupPrefix) {
     String topicName = createTopicWithRandomName();
     var consumers =
         Stream.generate(() -> {
-          String groupId = consumerGroupPrefix + UUID.randomUUID();
+          String groupId = consumerGroupPrefix + RandomStringUtils.randomAlphabetic(5);
           val consumer = createTestConsumerWithGroupId(groupId);
           consumer.subscribe(List.of(topicName));
           consumer.poll(Duration.ofMillis(100));
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/container/KafkaConnectContainer.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/container/KafkaConnectContainer.java
index dd8d5d03c41..b0098b307f5 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/container/KafkaConnectContainer.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/container/KafkaConnectContainer.java
@@ -12,6 +12,7 @@ public class KafkaConnectContainer extends GenericContainer<KafkaConnectContaine
   public KafkaConnectContainer(String version) {
     super("confluentinc/cp-kafka-connect:" + version);
     addExposedPort(CONNECT_PORT);
+
     waitStrategy = Wait.forHttp("/")
         .withStartupTimeout(Duration.ofMinutes(5));
   }
@@ -37,6 +38,7 @@ public KafkaConnectContainer withKafka(Network network, String bootstrapServers)
     withEnv("CONNECT_INTERNAL_KEY_CONVERTER", "org.apache.kafka.connect.json.JsonConverter");
     withEnv("CONNECT_INTERNAL_VALUE_CONVERTER", "org.apache.kafka.connect.json.JsonConverter");
     withEnv("CONNECT_REST_ADVERTISED_HOST_NAME", "kafka-connect");
+    withEnv("CONNECT_REST_PORT", String.valueOf(CONNECT_PORT));
     withEnv("CONNECT_PLUGIN_PATH", "/usr/share/java,/usr/share/confluent-hub-components");
     return self();
   }

From 79c5f1975802a69b6dc2ef364c593c720a0d44cd Mon Sep 17 00:00:00 2001
From: Shubham Jain <shubhrjain7@gmail.com>
Date: Fri, 9 Sep 2022 04:06:55 +0530
Subject: [PATCH 149/734] Enhance documentation regarding arm/m1 (#2453)

* Update docs to help Apple Mac M1 Users
 * Update missing information about
 * building react app
 * Update prerequisites docs

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 README.md                                     |  6 +-
 documentation/project/contributing/README.md  |  3 +-
 .../project/contributing/building.md          | 71 ++++++++++++++-----
 .../project/contributing/prerequisites.md     | 39 ++++++++++
 documentation/project/contributing/running.md | 25 -------
 .../project/contributing/software-required.md | 31 --------
 6 files changed, 96 insertions(+), 79 deletions(-)
 create mode 100644 documentation/project/contributing/prerequisites.md
 delete mode 100644 documentation/project/contributing/running.md
 delete mode 100644 documentation/project/contributing/software-required.md

diff --git a/README.md b/README.md
index 6dcb20cd772..332eb1f38e2 100644
--- a/README.md
+++ b/README.md
@@ -137,14 +137,10 @@ Quick-start instruction [here](helm_chart.md)
 
 Check [software-required.md](documentation/project/contributing/software-required.md)
 
-### Building
+### Building and Running
 
 Check [building.md](documentation/project/contributing/building.md)
 
-### Running
-
-Check [running.md](documentation/project/contributing/running.md)
-
 ## Liveliness and readiness probes
 Liveliness and readiness endpoint is at `/actuator/health`.
 Info endpoint (build info) is located at `/actuator/info`.
diff --git a/documentation/project/contributing/README.md b/documentation/project/contributing/README.md
index f30100ecf61..4c88e40c348 100644
--- a/documentation/project/contributing/README.md
+++ b/documentation/project/contributing/README.md
@@ -2,8 +2,7 @@
 
 ### Set up the local environment for development
 
-* [Prerequisites](software-required.md)
+* [Prerequisites](prerequisites.md)
 <!--* [Setting up git](set-up-git.md)-->
 * [Building the app](building.md)
-* [Running the app](running.md)
 * [Writing tests](testing.md)
\ No newline at end of file
diff --git a/documentation/project/contributing/building.md b/documentation/project/contributing/building.md
index bb8d7bc2241..25462100e9a 100644
--- a/documentation/project/contributing/building.md
+++ b/documentation/project/contributing/building.md
@@ -1,31 +1,70 @@
-### Building the application locally
+# Build & Run
 
-Once you installed the prerequisites and cloned the repository, run the following commands in your project directory:
+Once you installed the prerequisites and cloned the repository, run the following steps in your project directory:
 
-Build a docker container with the app:
+## Step 1 : Build
+> **_NOTE:_**  If you are an macOS M1 User then please keep in mind below things
+
+> Make sure you have ARM supported java installed
+
+> Skip the maven tests as they might not be successful
+
+> Comment out `com.spotify` plugin in `kafka-ui-api` pom file
+
+> Once your build is successful you need to create docker image manually as you'd commented `com.spotify` plugin
+
+> ```docker build --platform linux/arm64 -t provectuslabs/kafka-ui:latest --build-arg JAR_FILE=kafka-ui-api-0.0.1-SNAPSHOT.jar .```
+
+
+- if you need to build the frontend `kafka-ui-react-app`, go here
+     - [kafka-ui-react-app-build-documentation](../../../kafka-ui-react-app/README.md)
+
+- Build a docker image with the app
+```sh
+./mvnw clean install -Pprod
+```
+
+- In case you want to build `kafka-ui-api` by skipping the tests
 ```sh
 ./mvnw clean install -Dmaven.test.skip=true -Pprod
 ``` 
-Start the app with Kafka clusters:
+
+- To build only the `kafka-ui-api` you can use this command:
+```sh
+./mvnw -f kafka-ui-api/pom.xml clean install -Pprod -DskipUIBuild=true
+```
+
+If this step is successful, it should create a docker image named `provectuslabs/kafka-ui` with `latest` tag on your local machine except macOS M1.
+
+## Step 2 : Run
+#### Using Docker Compose
+> **_NOTE:_**  If you are an macOS M1 User then you can use arm64 supported docker compose script `./documentation/compose/kafka-ui-arm64.yaml`
+ - Start the `kafka-ui` app using docker image built in step 1 along with Kafka clusters:
 ```sh
 docker-compose -f ./documentation/compose/kafka-ui.yaml up -d
-``` 
-To see the app, navigate to http://localhost:8080.
+```
 
-If you want to start only kafka clusters (to run the app via `spring-boot:run`):
+#### Using Spring Boot Run
+ - If you want to start only kafka clusters (to run the `kafka-ui` app via `spring-boot:run`):
 ```sh
 docker-compose -f ./documentation/compose/kafka-clusters-only.yaml up -d
 ``` 
+- Then start the app.
+```sh
+./mvnw spring-boot:run -Pprod
 
-Then, start the app.
-
-### Building only the API
+# or
 
-To build only the kafka-ui-api you can use this command:
-```sh
-./mvnw -f kafka-ui-api/pom.xml clean install -Pprod -DskipUIBuild=true
+./mvnw spring-boot:run -Pprod -Dspring.config.location=file:///path/to/conf.yaml
 ```
 
-## Where to go next
-
-In the next section, you'll [learn how to run the application](running.md).
\ No newline at end of file
+#### Running in kubernetes
+- Using Helm Charts
+```sh bash
+helm repo add kafka-ui https://provectus.github.io/kafka-ui
+helm install kafka-ui kafka-ui/kafka-ui
+```
+To read more please follow to [chart documentation](../../../charts/kafka-ui/README.md).
+ 
+## Step 4 : Access Kafka-UI
+ - To see the `kafka-ui` app running, navigate to http://localhost:8080.
\ No newline at end of file
diff --git a/documentation/project/contributing/prerequisites.md b/documentation/project/contributing/prerequisites.md
new file mode 100644
index 00000000000..24f032dbab6
--- /dev/null
+++ b/documentation/project/contributing/prerequisites.md
@@ -0,0 +1,39 @@
+### Prerequisites
+
+This page explains how to get the software you need to use a Linux or macOS
+machine for local development. 
+
+Before you begin contributing you must have:
+
+* A GitHub account
+* `Java` 13 or newer
+* `Git`
+* `Docker`
+
+### Installing prerequisites on macOS
+1. Install [brew](https://brew.sh/).
+2. Install brew cask:
+```sh
+brew cask
+``` 
+3. Install JDK 13 via Homebrew cask:
+```sh
+brew tap adoptopenjdk/openjdk
+brew install adoptopenjdk13
+```
+4. Verify Installation
+```sh
+java -version
+```
+Note : In case JAVA13 is not set as your default Java then you can consider to include JAVA13 in your PATH after installation
+```sh
+export PATH="/Library/Java/JavaVirtualMachines/adoptopenjdk-13.jdk/Contents/Home/bin:$PATH
+```
+## Tips
+
+Consider allocating not less than 4GB of memory for your docker. 
+Otherwise, some apps within a stack (e.g. `kafka-ui.yaml`) might crash.
+
+## Where to go next
+
+In the next section, you'll [learn how to Build and Run kafka-ui](building.md).
diff --git a/documentation/project/contributing/running.md b/documentation/project/contributing/running.md
deleted file mode 100644
index 6df67370f6f..00000000000
--- a/documentation/project/contributing/running.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Running the app
-
-### Running locally via docker
-If you have built a container locally or wish to run a public one you could bring everything up like this:
-```shell
-docker-compose -f documentation/compose/kafka-ui.yaml up -d
-```
-
-### Running locally without docker
-Once you built the app, run the following in `kafka-ui-api/`:
-
-```sh
-./mvnw spring-boot:run -Pprod
-
-# or
-
-./mvnw spring-boot:run -Pprod -Dspring.config.location=file:///path/to/conf.yaml
-```
-
-### Running in kubernetes
-``` bash
-helm repo add kafka-ui https://provectus.github.io/kafka-ui
-helm install kafka-ui kafka-ui/kafka-ui
-```
-To read more please follow to [chart documentation](../../../charts/kafka-ui/README.md)
diff --git a/documentation/project/contributing/software-required.md b/documentation/project/contributing/software-required.md
deleted file mode 100644
index 8d3b86c7311..00000000000
--- a/documentation/project/contributing/software-required.md
+++ /dev/null
@@ -1,31 +0,0 @@
-### Get the required software for Linux or macOS
-
-This page explains how to get the software you need to use a Linux or macOS
-machine for local development. Before you begin contributing you must have:
-
-* a GitHub account
-* Java 13 or newer
-* `git`
-* `docker`
-
-### Installing prerequisites on macOS
-1. Install [brew](https://brew.sh/).
-
-2. Install brew cask:
-```sh
-> brew cask
-``` 
-3Install JDK 13 via Homebrew cask:
-```sh
-> brew tap adoptopenjdk/openjdk
-> brew install adoptopenjdk13
-```
-
-## Tips
-
-Consider allocating not less than 4GB of memory for your docker. 
-Otherwise, some apps within a stack (e.g. `kafka-ui.yaml`) might crash.
-
-## Where to go next
-
-In the next section, you'll [learn how to build the application](building.md).

From 1134ec5d13342c276be146fb6ad8f49087dff5df Mon Sep 17 00:00:00 2001
From: "Patryk D. Cichy" <patryk.d.cichy@gmail.com>
Date: Fri, 9 Sep 2022 15:43:34 +0200
Subject: [PATCH 150/734] Add helm labels required by istio (#2548)

---
 charts/kafka-ui/templates/deployment.yaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index 1f7f6c92ad4..69e42dcd63d 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -20,6 +20,8 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
       labels:
+        app: {{ include "kafka-ui.name" . }}
+        version: {{ .Values.image.tag | default .Chart.AppVersion }}
         {{- include "kafka-ui.selectorLabels" . | nindent 8 }}
         {{- if .Values.podLabels }}
         {{- toYaml .Values.podLabels | nindent 8 }}
@@ -72,7 +74,7 @@ spec:
             {{- if .Values.envs.secret}}
             - secretRef:
                 name: {{ include "kafka-ui.fullname" . }}
-            {{- end}}    
+            {{- end}}
           ports:
             - name: http
               containerPort: 8080
@@ -97,7 +99,7 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap}}
           volumeMounts:
-            {{- with .Values.volumeMounts }} 
+            {{- with .Values.volumeMounts }}
               {{- toYaml . | nindent 12 }}
             {{- end }}
             {{- if .Values.yamlApplicationConfig }}
@@ -116,12 +118,12 @@ spec:
         {{- end }}
         {{- if .Values.yamlApplicationConfig }}
         - name: kafka-ui-yaml-conf
-          configMap: 
+          configMap:
             name: {{ include "kafka-ui.fullname" . }}-fromvalues
         {{- end }}
         {{- if .Values.yamlApplicationConfigConfigMap}}
         - name: kafka-ui-yaml-conf-configmap
-          configMap: 
+          configMap:
             name: {{ .Values.yamlApplicationConfigConfigMap.name }}
         {{- end }}
       {{- end }}
@@ -136,4 +138,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
\ No newline at end of file
+      {{- end }}

From 43485f7343dc1442fc50fca1acd74b2de74ce9a7 Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Tue, 13 Sep 2022 05:37:38 +0400
Subject: [PATCH 151/734] Upgrade jest and dependent packages (#2565)

---
 kafka-ui-react-app/package.json   |   12 +-
 kafka-ui-react-app/pnpm-lock.yaml | 2199 +++++++++++++++++++++--------
 2 files changed, 1592 insertions(+), 619 deletions(-)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index a74a664d81a..80e620c452c 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -19,11 +19,11 @@
     "@vitejs/plugin-react": "^2.0.0",
     "ace-builds": "^1.7.1",
     "ajv": "^8.6.3",
-    "babel-jest": "^28.1.1",
+    "babel-jest": "^29.0.3",
     "classnames": "^2.2.6",
     "dayjs": "^1.11.2",
     "fetch-mock": "^9.11.0",
-    "jest": "^28.1.1",
+    "jest": "^29.0.3",
     "jest-watch-typeahead": "^2.0.0",
     "json-schema-faker": "^0.5.0-rcv.44",
     "lodash": "^4.17.21",
@@ -77,13 +77,13 @@
     "@babel/preset-env": "^7.18.2",
     "@babel/preset-react": "^7.17.12",
     "@babel/preset-typescript": "^7.17.12",
-    "@jest/types": "^28.1.1",
+    "@jest/types": "^29.0.3",
     "@openapitools/openapi-generator-cli": "^2.5.1",
     "@testing-library/dom": "^8.11.1",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/user-event": "^13.5.0",
     "@types/eventsource": "^1.1.8",
-    "@types/jest": "^28.1.3",
+    "@types/jest": "^29.0.1",
     "@types/lodash": "^4.14.172",
     "@types/node": "^16.4.13",
     "@types/react": "^18.0.9",
@@ -108,13 +108,13 @@
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.5.0",
     "husky": "^8.0.1",
-    "jest-environment-jsdom": "^28.1.1",
+    "jest-environment-jsdom": "^29.0.3",
     "jest-sonar-reporter": "^2.0.0",
     "jest-styled-components": "^7.0.8",
     "lint-staged": "^13.0.2",
     "prettier": "^2.3.1",
     "rimraf": "^3.0.2",
-    "ts-jest": "^28.0.5",
+    "ts-jest": "^29.0.0",
     "ts-node": "^10.8.1",
     "ts-prune": "^0.10.3",
     "typescript": "^4.7.4"
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 1163b3a30e5..d5a7161b18e 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -9,7 +9,7 @@ specifiers:
   '@babel/preset-typescript': ^7.17.12
   '@hookform/error-message': ^2.0.0
   '@hookform/resolvers': ^2.7.1
-  '@jest/types': ^28.1.1
+  '@jest/types': ^29.0.3
   '@openapitools/openapi-generator-cli': ^2.5.1
   '@reduxjs/toolkit': ^1.8.3
   '@szhsin/react-menu': ^3.1.1
@@ -20,7 +20,7 @@ specifiers:
   '@testing-library/react': ^13.2.0
   '@testing-library/user-event': ^13.5.0
   '@types/eventsource': ^1.1.8
-  '@types/jest': ^28.1.3
+  '@types/jest': ^29.0.1
   '@types/lodash': ^4.14.172
   '@types/node': ^16.4.13
   '@types/react': ^18.0.9
@@ -35,7 +35,7 @@ specifiers:
   '@vitejs/plugin-react': ^2.0.0
   ace-builds: ^1.7.1
   ajv: ^8.6.3
-  babel-jest: ^28.1.1
+  babel-jest: ^29.0.3
   classnames: ^2.2.6
   dayjs: ^1.11.2
   dotenv: ^16.0.1
@@ -54,8 +54,8 @@ specifiers:
   eslint-plugin-react-hooks: ^4.5.0
   fetch-mock: ^9.11.0
   husky: ^8.0.1
-  jest: ^28.1.1
-  jest-environment-jsdom: ^28.1.1
+  jest: ^29.0.3
+  jest-environment-jsdom: ^29.0.3
   jest-sonar-reporter: ^2.0.0
   jest-styled-components: ^7.0.8
   jest-watch-typeahead: ^2.0.0
@@ -79,7 +79,7 @@ specifiers:
   rimraf: ^3.0.2
   sass: ^1.52.3
   styled-components: ^5.3.1
-  ts-jest: ^28.0.5
+  ts-jest: ^29.0.0
   ts-node: ^10.8.1
   ts-prune: ^0.10.3
   typescript: ^4.7.4
@@ -105,12 +105,12 @@ dependencies:
   '@vitejs/plugin-react': 2.0.0_vite@3.0.2
   ace-builds: 1.7.1
   ajv: 8.8.2
-  babel-jest: 28.1.1_@babel+core@7.18.2
+  babel-jest: 29.0.3_@babel+core@7.18.2
   classnames: 2.3.1
   dayjs: 1.11.3
   fetch-mock: 9.11.0
-  jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
-  jest-watch-typeahead: 2.0.0_jest@28.1.1
+  jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
+  jest-watch-typeahead: 2.0.0_jest@29.0.3
   json-schema-faker: 0.5.0-rcv.44
   lodash: 4.17.21
   pretty-ms: 7.0.1
@@ -138,13 +138,13 @@ devDependencies:
   '@babel/preset-env': 7.18.2_@babel+core@7.18.2
   '@babel/preset-react': 7.17.12_@babel+core@7.18.2
   '@babel/preset-typescript': 7.17.12_@babel+core@7.18.2
-  '@jest/types': 28.1.1
+  '@jest/types': 29.0.3
   '@openapitools/openapi-generator-cli': 2.5.1
   '@testing-library/dom': 8.13.0
   '@testing-library/jest-dom': 5.16.4
   '@testing-library/user-event': 13.5.0_tlwynutqiyp5mns3woioasuxnq
   '@types/eventsource': 1.1.8
-  '@types/jest': 28.1.3
+  '@types/jest': 29.0.1
   '@types/lodash': 4.14.177
   '@types/node': 16.11.7
   '@types/react': 18.0.9
@@ -159,7 +159,7 @@ devDependencies:
   eslint-config-airbnb: 19.0.4_iayhaebzx3saen2ll7sn5gqmdq
   eslint-config-airbnb-typescript: 17.0.0_l6wia5brkiej5f4nhesunbzj5y
   eslint-config-prettier: 8.5.0_eslint@8.16.0
-  eslint-config-react-app: 7.0.1_y3w6q4zxtal6gz5auqli3lo3ny
+  eslint-config-react-app: 7.0.1_qmzb7mn5nafzn657qxusdnr23a
   eslint-import-resolver-node: 0.3.6
   eslint-import-resolver-typescript: 3.2.7_btspkuwbqkl4adpiufzbathtpi
   eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
@@ -169,13 +169,13 @@ devDependencies:
   eslint-plugin-react: 7.30.1_eslint@8.16.0
   eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
   husky: 8.0.1
-  jest-environment-jsdom: 28.1.1
+  jest-environment-jsdom: 29.0.3
   jest-sonar-reporter: 2.0.0
   jest-styled-components: 7.0.8_styled-components@5.3.1
   lint-staged: 13.0.2
   prettier: 2.5.1
   rimraf: 3.0.2
-  ts-jest: 28.0.5_c4h4g76dcvkfgjwf6rprlfxfli
+  ts-jest: 29.0.0_2zqe2lz5fp2msj34ct3vkutym4
   ts-node: 10.8.1_t4lrjbt3sxauai4t5o275zsepa
   ts-prune: 0.10.3
   typescript: 4.7.4
@@ -187,13 +187,13 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/gen-mapping': 0.1.1
-      '@jridgewell/trace-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.15
 
   /@babel/code-frame/7.16.7:
     resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/highlight': 7.17.12
+      '@babel/highlight': 7.18.6
 
   /@babel/code-frame/7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
@@ -204,6 +204,7 @@ packages:
   /@babel/compat-data/7.17.10:
     resolution: {integrity: sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/compat-data/7.18.8:
     resolution: {integrity: sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==}
@@ -271,8 +272,8 @@ packages:
     resolution: {integrity: sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
-      '@jridgewell/gen-mapping': 0.3.1
+      '@babel/types': 7.18.9
+      '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
 
   /@babel/generator/7.18.9:
@@ -287,21 +288,21 @@ packages:
     resolution: {integrity: sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
     dev: true
 
   /@babel/helper-annotate-as-pure/7.18.6:
     resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
 
   /@babel/helper-builder-binary-assignment-operator-visitor/7.16.7:
     resolution: {integrity: sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-explode-assignable-expression': 7.16.7
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
     dev: true
 
   /@babel/helper-compilation-targets/7.18.2_@babel+core@7.18.2:
@@ -310,11 +311,37 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/compat-data': 7.17.10
+      '@babel/compat-data': 7.18.8
       '@babel/core': 7.18.2
-      '@babel/helper-validator-option': 7.16.7
+      '@babel/helper-validator-option': 7.18.6
+      browserslist: 4.20.4
+      semver: 6.3.0
+
+  /@babel/helper-compilation-targets/7.18.2_@babel+core@7.18.9:
+    resolution: {integrity: sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.18.8
+      '@babel/core': 7.18.9
+      '@babel/helper-validator-option': 7.18.6
+      browserslist: 4.20.4
+      semver: 6.3.0
+    dev: true
+
+  /@babel/helper-compilation-targets/7.18.9_@babel+core@7.18.2:
+    resolution: {integrity: sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.18.8
+      '@babel/core': 7.18.2
+      '@babel/helper-validator-option': 7.18.6
       browserslist: 4.20.4
       semver: 6.3.0
+    dev: true
 
   /@babel/helper-compilation-targets/7.18.9_@babel+core@7.18.9:
     resolution: {integrity: sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==}
@@ -336,12 +363,30 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.18.2
-      '@babel/helper-function-name': 7.17.9
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.18.9
+      '@babel/helper-member-expression-to-functions': 7.17.7
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-replace-supers': 7.18.2
+      '@babel/helper-split-export-declaration': 7.18.6
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/helper-create-class-features-plugin/7.18.0_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-annotate-as-pure': 7.18.6
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.18.9
       '@babel/helper-member-expression-to-functions': 7.17.7
       '@babel/helper-optimise-call-expression': 7.16.7
       '@babel/helper-replace-supers': 7.18.2
-      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/helper-split-export-declaration': 7.18.6
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -357,27 +402,52 @@ packages:
       regexpu-core: 5.0.1
     dev: true
 
+  /@babel/helper-create-regexp-features-plugin/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-annotate-as-pure': 7.18.6
+      regexpu-core: 5.0.1
+    dev: true
+
   /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.18.2:
     resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==}
     peerDependencies:
       '@babel/core': ^7.4.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
+      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.2
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.18.6
-      '@babel/traverse': 7.18.2
+      '@babel/traverse': 7.18.9
       debug: 4.3.4
       lodash.debounce: 4.0.8
-      resolve: 1.22.0
+      resolve: 1.22.1
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/helper-environment-visitor/7.18.2:
-    resolution: {integrity: sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==}
-    engines: {node: '>=6.9.0'}
+  /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.18.9:
+    resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.9
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/traverse': 7.18.9
+      debug: 4.3.4
+      lodash.debounce: 4.0.8
+      resolve: 1.22.1
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
 
   /@babel/helper-environment-visitor/7.18.9:
     resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
@@ -390,13 +460,6 @@ packages:
       '@babel/types': 7.18.9
     dev: true
 
-  /@babel/helper-function-name/7.17.9:
-    resolution: {integrity: sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.16.7
-      '@babel/types': 7.18.7
-
   /@babel/helper-function-name/7.18.9:
     resolution: {integrity: sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==}
     engines: {node: '>=6.9.0'}
@@ -404,12 +467,6 @@ packages:
       '@babel/template': 7.18.6
       '@babel/types': 7.18.9
 
-  /@babel/helper-hoist-variables/7.16.7:
-    resolution: {integrity: sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.18.7
-
   /@babel/helper-hoist-variables/7.18.6:
     resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
     engines: {node: '>=6.9.0'}
@@ -427,26 +484,26 @@ packages:
     resolution: {integrity: sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
 
   /@babel/helper-module-imports/7.18.6:
     resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
 
   /@babel/helper-module-transforms/7.18.0:
     resolution: {integrity: sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-environment-visitor': 7.18.2
+      '@babel/helper-environment-visitor': 7.18.9
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-simple-access': 7.18.6
-      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/helper-split-export-declaration': 7.18.6
       '@babel/helper-validator-identifier': 7.18.6
-      '@babel/template': 7.16.7
-      '@babel/traverse': 7.18.2
-      '@babel/types': 7.18.7
+      '@babel/template': 7.18.6
+      '@babel/traverse': 7.18.9
+      '@babel/types': 7.18.9
     transitivePeerDependencies:
       - supports-color
 
@@ -469,12 +526,13 @@ packages:
     resolution: {integrity: sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
     dev: true
 
   /@babel/helper-plugin-utils/7.17.12:
     resolution: {integrity: sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helper-plugin-utils/7.18.6:
     resolution: {integrity: sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==}
@@ -486,7 +544,7 @@ packages:
     dependencies:
       '@babel/helper-annotate-as-pure': 7.18.6
       '@babel/helper-wrap-function': 7.16.8
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -514,25 +572,15 @@ packages:
     resolution: {integrity: sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
     dev: true
 
-  /@babel/helper-split-export-declaration/7.16.7:
-    resolution: {integrity: sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.18.7
-
   /@babel/helper-split-export-declaration/7.18.6:
     resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-validator-identifier/7.16.7:
-    resolution: {integrity: sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==}
-    engines: {node: '>=6.9.0'}
-
   /@babel/helper-validator-identifier/7.18.6:
     resolution: {integrity: sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==}
     engines: {node: '>=6.9.0'}
@@ -540,6 +588,7 @@ packages:
   /@babel/helper-validator-option/7.16.7:
     resolution: {integrity: sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==}
     engines: {node: '>=6.9.0'}
+    dev: true
 
   /@babel/helper-validator-option/7.18.6:
     resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==}
@@ -549,7 +598,7 @@ packages:
     resolution: {integrity: sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-function-name': 7.17.9
+      '@babel/helper-function-name': 7.18.9
       '@babel/template': 7.18.6
       '@babel/traverse': 7.18.9
       '@babel/types': 7.18.9
@@ -561,9 +610,9 @@ packages:
     resolution: {integrity: sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/template': 7.16.7
-      '@babel/traverse': 7.18.2
-      '@babel/types': 7.18.7
+      '@babel/template': 7.18.6
+      '@babel/traverse': 7.18.9
+      '@babel/types': 7.18.9
     transitivePeerDependencies:
       - supports-color
 
@@ -577,14 +626,6 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/highlight/7.17.12:
-    resolution: {integrity: sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.18.6
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-
   /@babel/highlight/7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
     engines: {node: '>=6.9.0'}
@@ -598,7 +639,7 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
 
   /@babel/parser/7.18.9:
     resolution: {integrity: sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==}
@@ -614,7 +655,17 @@ packages:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.17.12_@babel+core@7.18.2:
@@ -624,11 +675,23 @@ packages:
       '@babel/core': ^7.13.0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
       '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.2
     dev: true
 
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.9
+    dev: true
+
   /@babel/plugin-proposal-async-generator-functions/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==}
     engines: {node: '>=6.9.0'}
@@ -636,13 +699,27 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/helper-remap-async-to-generator': 7.16.8
       '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@babel/plugin-proposal-async-generator-functions/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-remap-async-to-generator': 7.16.8
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.9
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-class-properties/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==}
     engines: {node: '>=6.9.0'}
@@ -651,7 +728,20 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-class-properties/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -664,24 +754,38 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-decorators/7.17.9_@babel+core@7.18.2:
+  /@babel/plugin-proposal-class-static-block/7.18.0_@babel+core@7.18.9:
+    resolution: {integrity: sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.9
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-decorators/7.17.9_@babel+core@7.18.9:
     resolution: {integrity: sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
+      '@babel/core': 7.18.9
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
       '@babel/helper-plugin-utils': 7.18.6
       '@babel/helper-replace-supers': 7.18.2
-      '@babel/helper-split-export-declaration': 7.16.7
-      '@babel/plugin-syntax-decorators': 7.17.0_@babel+core@7.18.2
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/plugin-syntax-decorators': 7.17.0_@babel+core@7.18.9
       charcodes: 0.2.0
     transitivePeerDependencies:
       - supports-color
@@ -694,10 +798,21 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.2
     dev: true
 
+  /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.9
+    dev: true
+
   /@babel/plugin-proposal-export-namespace-from/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==}
     engines: {node: '>=6.9.0'}
@@ -705,10 +820,21 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.18.2
     dev: true
 
+  /@babel/plugin-proposal-export-namespace-from/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.18.9
+    dev: true
+
   /@babel/plugin-proposal-json-strings/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==}
     engines: {node: '>=6.9.0'}
@@ -716,41 +842,85 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.2
     dev: true
 
-  /@babel/plugin-proposal-logical-assignment-operators/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==}
+  /@babel/plugin-proposal-json-strings/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.9
     dev: true
 
-  /@babel/plugin-proposal-nullish-coalescing-operator/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==}
+  /@babel/plugin-proposal-logical-assignment-operators/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
     dev: true
 
-  /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
+  /@babel/plugin-proposal-logical-assignment-operators/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.9
+    dev: true
+
+  /@babel/plugin-proposal-nullish-coalescing-operator/7.17.12_@babel+core@7.18.2:
+    resolution: {integrity: sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-nullish-coalescing-operator/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.9
+    dev: true
+
+  /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
+    dev: true
+
+  /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.9
     dev: true
 
   /@babel/plugin-proposal-object-rest-spread/7.18.0_@babel+core@7.18.2:
@@ -759,14 +929,28 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/compat-data': 7.17.10
+      '@babel/compat-data': 7.18.8
       '@babel/core': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.2
       '@babel/plugin-transform-parameters': 7.17.12_@babel+core@7.18.2
     dev: true
 
+  /@babel/plugin-proposal-object-rest-spread/7.18.0_@babel+core@7.18.9:
+    resolution: {integrity: sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.18.8
+      '@babel/core': 7.18.9
+      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-transform-parameters': 7.17.12_@babel+core@7.18.9
+    dev: true
+
   /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.18.2:
     resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
     engines: {node: '>=6.9.0'}
@@ -774,10 +958,21 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.2
     dev: true
 
+  /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.9
+    dev: true
+
   /@babel/plugin-proposal-optional-chaining/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==}
     engines: {node: '>=6.9.0'}
@@ -785,11 +980,23 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
       '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
     dev: true
 
+  /@babel/plugin-proposal-optional-chaining/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
+    dev: true
+
   /@babel/plugin-proposal-private-methods/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==}
     engines: {node: '>=6.9.0'}
@@ -798,7 +1005,20 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-proposal-private-methods/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -812,12 +1032,27 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-annotate-as-pure': 7.16.7
       '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@babel/plugin-proposal-private-property-in-object/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.9
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-proposal-unicode-property-regex/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==}
     engines: {node: '>=4'}
@@ -826,7 +1061,18 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-proposal-unicode-property-regex/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.2:
@@ -835,7 +1081,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
@@ -843,7 +1089,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
@@ -867,7 +1113,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.9:
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
@@ -875,7 +1121,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.18.2:
     resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
@@ -884,16 +1130,26 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.18.9:
+    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
-  /@babel/plugin-syntax-decorators/7.17.0_@babel+core@7.18.2:
+  /@babel/plugin-syntax-decorators/7.17.0_@babel+core@7.18.9:
     resolution: {integrity: sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
@@ -903,7 +1159,16 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.18.2:
@@ -912,7 +1177,16 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-syntax-flow/7.18.6_@babel+core@7.18.2:
@@ -924,6 +1198,16 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
 
+  /@babel/plugin-syntax-flow/7.18.6_@babel+core@7.18.9:
+    resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
   /@babel/plugin-syntax-import-assertions/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==}
     engines: {node: '>=6.9.0'}
@@ -931,7 +1215,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-syntax-import-assertions/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.2:
@@ -956,7 +1250,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
@@ -964,7 +1258,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.18.2:
     resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
@@ -983,7 +1277,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-    dev: false
 
   /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.2:
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
@@ -991,7 +1284,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
@@ -999,7 +1292,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
@@ -1007,7 +1300,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
@@ -1015,7 +1308,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.2:
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
@@ -1023,7 +1316,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
@@ -1031,7 +1324,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
@@ -1039,7 +1332,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
@@ -1047,7 +1340,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
@@ -1055,7 +1348,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
@@ -1063,7 +1356,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.2:
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
@@ -1071,7 +1364,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
@@ -1079,7 +1372,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.18.2:
     resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
@@ -1088,7 +1381,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.18.9:
+    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.2:
@@ -1098,7 +1401,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.9:
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
@@ -1107,7 +1410,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
 
   /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==}
@@ -1135,7 +1438,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-arrow-functions/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-async-to-generator/7.17.12_@babel+core@7.18.2:
@@ -1145,21 +1458,45 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-module-imports': 7.16.7
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/helper-remap-async-to-generator': 7.16.8
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
+  /@babel/plugin-transform-async-to-generator/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/core': 7.18.9
+      '@babel/helper-module-imports': 7.18.6
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-remap-async-to-generator': 7.16.8
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.18.2:
+    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-block-scoping/7.18.4_@babel+core@7.18.2:
@@ -1169,7 +1506,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-block-scoping/7.18.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-classes/7.18.4_@babel+core@7.18.2:
@@ -1180,12 +1527,31 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-annotate-as-pure': 7.16.7
-      '@babel/helper-environment-visitor': 7.18.2
-      '@babel/helper-function-name': 7.17.9
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.18.9
       '@babel/helper-optimise-call-expression': 7.16.7
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/helper-replace-supers': 7.18.2
-      '@babel/helper-split-export-declaration': 7.16.7
+      '@babel/helper-split-export-declaration': 7.18.6
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-classes/7.18.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.18.9
+      '@babel/helper-optimise-call-expression': 7.16.7
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-replace-supers': 7.18.2
+      '@babel/helper-split-export-declaration': 7.18.6
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -1198,7 +1564,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-computed-properties/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-destructuring/7.18.0_@babel+core@7.18.2:
@@ -1208,7 +1584,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-destructuring/7.18.0_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.18.2:
@@ -1219,7 +1605,18 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-duplicate-keys/7.17.12_@babel+core@7.18.2:
@@ -1229,7 +1626,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-duplicate-keys/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.18.2:
@@ -1240,18 +1647,29 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
-  /@babel/plugin-transform-flow-strip-types/7.16.7_@babel+core@7.18.2:
+  /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-flow-strip-types/7.16.7_@babel+core@7.18.9:
     resolution: {integrity: sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.2
+      '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.9
     dev: true
 
   /@babel/plugin-transform-for-of/7.18.1_@babel+core@7.18.2:
@@ -1261,7 +1679,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-for-of/7.18.1_@babel+core@7.18.9:
+    resolution: {integrity: sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.18.2:
@@ -1271,9 +1699,21 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
-      '@babel/helper-function-name': 7.17.9
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.2
+      '@babel/helper-function-name': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.9
+      '@babel/helper-function-name': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-literals/7.17.12_@babel+core@7.18.2:
@@ -1283,7 +1723,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-literals/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.18.2:
@@ -1293,7 +1743,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-modules-amd/7.18.0_@babel+core@7.18.2:
@@ -1303,8 +1763,22 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-module-transforms': 7.18.0
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-amd/7.18.0_@babel+core@7.18.9:
+    resolution: {integrity: sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
       babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
       - supports-color
@@ -1325,6 +1799,21 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/plugin-transform-modules-commonjs/7.18.6_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-simple-access': 7.18.6
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-transform-modules-systemjs/7.18.4_@babel+core@7.18.2:
     resolution: {integrity: sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==}
     engines: {node: '>=6.9.0'}
@@ -1332,10 +1821,26 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-hoist-variables': 7.16.7
-      '@babel/helper-module-transforms': 7.18.0
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/helper-validator-identifier': 7.16.7
+      '@babel/helper-hoist-variables': 7.18.6
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-validator-identifier': 7.18.6
+      babel-plugin-dynamic-import-node: 2.3.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-systemjs/7.18.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-hoist-variables': 7.18.6
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-validator-identifier': 7.18.6
       babel-plugin-dynamic-import-node: 2.3.3
     transitivePeerDependencies:
       - supports-color
@@ -1348,8 +1853,21 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-module-transforms': 7.18.0
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-modules-umd/7.18.0_@babel+core@7.18.9:
+    resolution: {integrity: sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1362,7 +1880,18 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-named-capturing-groups-regex/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-new-target/7.17.12_@babel+core@7.18.2:
@@ -1372,7 +1901,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-new-target/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.18.2:
@@ -1382,7 +1921,20 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-replace-supers': 7.18.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/helper-replace-supers': 7.18.2
     transitivePeerDependencies:
       - supports-color
@@ -1395,7 +1947,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-parameters/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.18.2:
@@ -1405,7 +1967,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-react-display-name/7.16.7_@babel+core@7.18.2:
@@ -1415,7 +1987,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-react-display-name/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.18.2:
@@ -1428,6 +2010,16 @@ packages:
       '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
     dev: true
 
+  /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.9
+    dev: true
+
   /@babel/plugin-transform-react-jsx-development/7.18.6_@babel+core@7.18.9:
     resolution: {integrity: sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==}
     engines: {node: '>=6.9.0'}
@@ -1483,7 +2075,6 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.9
       '@babel/types': 7.18.7
-    dev: false
 
   /@babel/plugin-transform-react-pure-annotations/7.16.7_@babel+core@7.18.2:
     resolution: {integrity: sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==}
@@ -1493,7 +2084,18 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-annotate-as-pure': 7.16.7
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-react-pure-annotations/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-annotate-as-pure': 7.16.7
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-regenerator/7.18.0_@babel+core@7.18.2:
@@ -1503,7 +2105,18 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+      regenerator-transform: 0.15.0
+    dev: true
+
+  /@babel/plugin-transform-regenerator/7.18.0_@babel+core@7.18.9:
+    resolution: {integrity: sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
       regenerator-transform: 0.15.0
     dev: true
 
@@ -1514,21 +2127,31 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-reserved-words/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
-  /@babel/plugin-transform-runtime/7.17.10_@babel+core@7.18.2:
+  /@babel/plugin-transform-runtime/7.17.10_@babel+core@7.18.9:
     resolution: {integrity: sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
       '@babel/helper-module-imports': 7.18.6
       '@babel/helper-plugin-utils': 7.18.6
-      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.18.2
-      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.18.2
-      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.18.2
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.18.9
+      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.18.9
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.18.9
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
@@ -1541,7 +2164,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-shorthand-properties/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-spread/7.17.12_@babel+core@7.18.2:
@@ -1551,7 +2184,18 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
+    dev: true
+
+  /@babel/plugin-transform-spread/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
     dev: true
 
@@ -1562,7 +2206,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-sticky-regex/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-template-literals/7.18.2_@babel+core@7.18.2:
@@ -1572,7 +2226,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-template-literals/7.18.2_@babel+core@7.18.9:
+    resolution: {integrity: sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-typeof-symbol/7.17.12_@babel+core@7.18.2:
@@ -1582,7 +2246,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-typeof-symbol/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-typescript/7.18.4_@babel+core@7.18.2:
@@ -1593,12 +2267,26 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@babel/plugin-transform-typescript/7.18.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.9
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.18.2:
     resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
     engines: {node: '>=6.9.0'}
@@ -1606,7 +2294,17 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.18.2:
@@ -1617,7 +2315,18 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: true
+
+  /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.18.9:
+    resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
   /@babel/preset-env/7.18.2_@babel+core@7.18.2:
@@ -1706,16 +2415,115 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/preset-env/7.18.2_@babel+core@7.18.9:
+    resolution: {integrity: sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.17.10
+      '@babel/core': 7.18.9
+      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-async-generator-functions': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-class-properties': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-class-static-block': 7.18.0_@babel+core@7.18.9
+      '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-proposal-export-namespace-from': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-json-strings': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-logical-assignment-operators': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-proposal-object-rest-spread': 7.18.0_@babel+core@7.18.9
+      '@babel/plugin-proposal-optional-catch-binding': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-private-methods': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-private-property-in-object': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-unicode-property-regex': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.9
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.9
+      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.9
+      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-import-assertions': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.9
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.9
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.9
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.9
+      '@babel/plugin-transform-arrow-functions': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-async-to-generator': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-block-scoped-functions': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-block-scoping': 7.18.4_@babel+core@7.18.9
+      '@babel/plugin-transform-classes': 7.18.4_@babel+core@7.18.9
+      '@babel/plugin-transform-computed-properties': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-destructuring': 7.18.0_@babel+core@7.18.9
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-duplicate-keys': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-exponentiation-operator': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-for-of': 7.18.1_@babel+core@7.18.9
+      '@babel/plugin-transform-function-name': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-literals': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-member-expression-literals': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-modules-amd': 7.18.0_@babel+core@7.18.9
+      '@babel/plugin-transform-modules-commonjs': 7.18.6_@babel+core@7.18.9
+      '@babel/plugin-transform-modules-systemjs': 7.18.4_@babel+core@7.18.9
+      '@babel/plugin-transform-modules-umd': 7.18.0_@babel+core@7.18.9
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-new-target': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-object-super': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-parameters': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-property-literals': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-regenerator': 7.18.0_@babel+core@7.18.9
+      '@babel/plugin-transform-reserved-words': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-spread': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-sticky-regex': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-template-literals': 7.18.2_@babel+core@7.18.9
+      '@babel/plugin-transform-typeof-symbol': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-unicode-escapes': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-unicode-regex': 7.16.7_@babel+core@7.18.9
+      '@babel/preset-modules': 0.1.5_@babel+core@7.18.9
+      '@babel/types': 7.18.4
+      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.18.9
+      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.18.9
+      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.18.9
+      core-js-compat: 3.22.5
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/preset-modules/0.1.5_@babel+core@7.18.2:
     resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-proposal-unicode-property-regex': 7.17.12_@babel+core@7.18.2
       '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.18.2
-      '@babel/types': 7.18.4
+      '@babel/types': 7.18.9
+      esutils: 2.0.3
+    dev: true
+
+  /@babel/preset-modules/0.1.5_@babel+core@7.18.9:
+    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+      '@babel/plugin-proposal-unicode-property-regex': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.18.9
+      '@babel/types': 7.18.9
       esutils: 2.0.3
     dev: true
 
@@ -1734,6 +2542,21 @@ packages:
       '@babel/plugin-transform-react-pure-annotations': 7.16.7_@babel+core@7.18.2
     dev: true
 
+  /@babel/preset-react/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-transform-react-display-name': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.9
+      '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-react-pure-annotations': 7.16.7_@babel+core@7.18.9
+    dev: true
+
   /@babel/preset-typescript/7.17.12_@babel+core@7.18.2:
     resolution: {integrity: sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==}
     engines: {node: '>=6.9.0'}
@@ -1748,6 +2571,20 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/preset-typescript/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.17.12
+      '@babel/helper-validator-option': 7.16.7
+      '@babel/plugin-transform-typescript': 7.18.4_@babel+core@7.18.9
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@babel/runtime-corejs3/7.14.6:
     resolution: {integrity: sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==}
     engines: {node: '>=6.9.0'}
@@ -1766,9 +2603,9 @@ packages:
     resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.16.7
-      '@babel/parser': 7.18.4
-      '@babel/types': 7.18.7
+      '@babel/code-frame': 7.18.6
+      '@babel/parser': 7.18.9
+      '@babel/types': 7.18.9
 
   /@babel/template/7.18.6:
     resolution: {integrity: sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==}
@@ -1782,14 +2619,14 @@ packages:
     resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.16.7
-      '@babel/generator': 7.18.2
-      '@babel/helper-environment-visitor': 7.18.2
-      '@babel/helper-function-name': 7.17.9
-      '@babel/helper-hoist-variables': 7.16.7
-      '@babel/helper-split-export-declaration': 7.16.7
-      '@babel/parser': 7.18.4
-      '@babel/types': 7.18.7
+      '@babel/code-frame': 7.18.6
+      '@babel/generator': 7.18.9
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.18.9
+      '@babel/helper-hoist-variables': 7.18.6
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/parser': 7.18.9
+      '@babel/types': 7.18.9
       debug: 4.3.4
       globals: 11.12.0
     transitivePeerDependencies:
@@ -1799,14 +2636,14 @@ packages:
     resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/code-frame': 7.16.7
-      '@babel/generator': 7.18.2
-      '@babel/helper-environment-visitor': 7.18.2
-      '@babel/helper-function-name': 7.17.9
-      '@babel/helper-hoist-variables': 7.16.7
-      '@babel/helper-split-export-declaration': 7.16.7
-      '@babel/parser': 7.18.4
-      '@babel/types': 7.18.7
+      '@babel/code-frame': 7.18.6
+      '@babel/generator': 7.18.9
+      '@babel/helper-environment-visitor': 7.18.9
+      '@babel/helper-function-name': 7.18.9
+      '@babel/helper-hoist-variables': 7.18.6
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/parser': 7.18.9
+      '@babel/types': 7.18.9
       debug: 4.3.4_supports-color@5.5.0
       globals: 11.12.0
     transitivePeerDependencies:
@@ -1833,7 +2670,7 @@ packages:
     resolution: {integrity: sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-validator-identifier': 7.16.7
+      '@babel/helper-validator-identifier': 7.18.6
       to-fast-properties: 2.0.0
 
   /@babel/types/7.18.7:
@@ -1953,97 +2790,109 @@ packages:
       jest-message-util: 28.1.1
       jest-util: 28.1.1
       slash: 3.0.0
+    dev: false
 
-  /@jest/core/28.1.1_ts-node@10.8.1:
-    resolution: {integrity: sha512-3pYsBoZZ42tXMdlcFeCc/0j9kOlK7MYuXs2B1QbvDgMoW1K9NJ4G/VYvIbMb26iqlkTfPHo7SC2JgjDOk/mxXw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/console/29.0.3:
+    resolution: {integrity: sha512-cGg0r+klVHSYnfE977S9wmpuQ9L+iYuYgL+5bPXiUlUynLLYunRxswEmhBzvrSKGof5AKiHuTTmUKAqRcDY9dg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/types': 29.0.3
+      '@types/node': 16.11.7
+      chalk: 4.1.2
+      jest-message-util: 29.0.3
+      jest-util: 29.0.3
+      slash: 3.0.0
+
+  /@jest/core/29.0.3_ts-node@10.8.1:
+    resolution: {integrity: sha512-1d0hLbOrM1qQE3eP3DtakeMbKTcXiXP3afWxqz103xPyddS2NhnNghS7MaXx1dcDt4/6p4nlhmeILo2ofgi8cQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
     peerDependenciesMeta:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/console': 28.1.1
-      '@jest/reporters': 28.1.1
-      '@jest/test-result': 28.1.1
-      '@jest/transform': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/console': 29.0.3
+      '@jest/reporters': 29.0.3
+      '@jest/test-result': 29.0.3
+      '@jest/transform': 29.0.3
+      '@jest/types': 29.0.3
       '@types/node': 16.11.7
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 3.3.1
       exit: 0.1.2
       graceful-fs: 4.2.10
-      jest-changed-files: 28.0.2
-      jest-config: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
-      jest-haste-map: 28.1.1
-      jest-message-util: 28.1.1
-      jest-regex-util: 28.0.2
-      jest-resolve: 28.1.1
-      jest-resolve-dependencies: 28.1.1
-      jest-runner: 28.1.1
-      jest-runtime: 28.1.1
-      jest-snapshot: 28.1.1
-      jest-util: 28.1.1
-      jest-validate: 28.1.1
-      jest-watcher: 28.1.1
+      jest-changed-files: 29.0.0
+      jest-config: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
+      jest-haste-map: 29.0.3
+      jest-message-util: 29.0.3
+      jest-regex-util: 29.0.0
+      jest-resolve: 29.0.3
+      jest-resolve-dependencies: 29.0.3
+      jest-runner: 29.0.3
+      jest-runtime: 29.0.3
+      jest-snapshot: 29.0.3
+      jest-util: 29.0.3
+      jest-validate: 29.0.3
+      jest-watcher: 29.0.3
       micromatch: 4.0.5
-      pretty-format: 28.1.1
-      rimraf: 3.0.2
+      pretty-format: 29.0.3
       slash: 3.0.0
       strip-ansi: 6.0.1
     transitivePeerDependencies:
       - supports-color
       - ts-node
 
-  /@jest/environment/28.1.1:
-    resolution: {integrity: sha512-9auVQ2GzQ7nrU+lAr8KyY838YahElTX9HVjbQPPS2XjlxQ+na18G113OoBhyBGBtD6ZnO/SrUy5WR8EzOj1/Uw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/environment/29.0.3:
+    resolution: {integrity: sha512-iKl272NKxYNQNqXMQandAIwjhQaGw5uJfGXduu8dS9llHi8jV2ChWrtOAVPnMbaaoDhnI3wgUGNDvZgHeEJQCA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/fake-timers': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/fake-timers': 29.0.3
+      '@jest/types': 29.0.3
       '@types/node': 16.11.7
-      jest-mock: 28.1.1
+      jest-mock: 29.0.3
 
-  /@jest/expect-utils/28.1.1:
-    resolution: {integrity: sha512-n/ghlvdhCdMI/hTcnn4qV57kQuV9OTsZzH1TTCVARANKhl6hXJqLKUkwX69ftMGpsbpt96SsDD8n8LD2d9+FRw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/expect-utils/29.0.3:
+    resolution: {integrity: sha512-i1xUkau7K/63MpdwiRqaxgZOjxYs4f0WMTGJnYwUKubsNRZSeQbLorS7+I4uXVF9KQ5r61BUPAUMZ7Lf66l64Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-get-type: 28.0.2
+      jest-get-type: 29.0.0
 
-  /@jest/expect/28.1.1:
-    resolution: {integrity: sha512-/+tQprrFoT6lfkMj4mW/mUIfAmmk/+iQPmg7mLDIFOf2lyf7EBHaS+x3RbeR0VZVMe55IvX7QRoT/2aK3AuUXg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/expect/29.0.3:
+    resolution: {integrity: sha512-6W7K+fsI23FQ01H/BWccPyDZFrnU9QlzDcKOjrNVU5L8yUORFAJJIpmyxWPW70+X624KUNqzZwPThPMX28aXEQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      expect: 28.1.1
-      jest-snapshot: 28.1.1
+      expect: 29.0.3
+      jest-snapshot: 29.0.3
     transitivePeerDependencies:
-      - supports-color
-
-  /@jest/fake-timers/28.1.1:
-    resolution: {integrity: sha512-BY/3+TyLs5+q87rGWrGUY5f8e8uC3LsVHS9Diz8+FV3ARXL4sNnkLlIB8dvDvRrp+LUCGM+DLqlsYubizGUjIA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/types': 28.1.1
-      '@sinonjs/fake-timers': 9.1.2
-      '@types/node': 16.11.7
-      jest-message-util: 28.1.1
-      jest-mock: 28.1.1
-      jest-util: 28.1.1
+      - supports-color
 
-  /@jest/globals/28.1.1:
-    resolution: {integrity: sha512-dEgl/6v7ToB4vXItdvcltJBgny0xBE6xy6IYQrPJAJggdEinGxCDMivNv7sFzPcTITGquXD6UJwYxfJ/5ZwDSg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/fake-timers/29.0.3:
+    resolution: {integrity: sha512-tmbUIo03x0TdtcZCESQ0oQSakPCpo7+s6+9mU19dd71MptkP4zCwoeZqna23//pgbhtT1Wq02VmA9Z9cNtvtCQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 28.1.1
-      '@jest/expect': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/types': 29.0.3
+      '@sinonjs/fake-timers': 9.1.2
+      '@types/node': 16.11.7
+      jest-message-util: 29.0.3
+      jest-mock: 29.0.3
+      jest-util: 29.0.3
+
+  /@jest/globals/29.0.3:
+    resolution: {integrity: sha512-YqGHT65rFY2siPIHHFjuCGUsbzRjdqkwbat+Of6DmYRg5shIXXrLdZoVE/+TJ9O1dsKsFmYhU58JvIbZRU1Z9w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/environment': 29.0.3
+      '@jest/expect': 29.0.3
+      '@jest/types': 29.0.3
+      jest-mock: 29.0.3
     transitivePeerDependencies:
       - supports-color
 
-  /@jest/reporters/28.1.1:
-    resolution: {integrity: sha512-597Zj4D4d88sZrzM4atEGLuO7SdA/YrOv9SRXHXRNC+/FwPCWxZhBAEzhXoiJzfRwn8zes/EjS8Lo6DouGN5Gg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/reporters/29.0.3:
+    resolution: {integrity: sha512-3+QU3d4aiyOWfmk1obDerie4XNCaD5Xo1IlKNde2yGEi02WQD+ZQD0i5Hgqm1e73sMV7kw6pMlCnprtEwEVwxw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
     peerDependenciesMeta:
@@ -2051,11 +2900,11 @@ packages:
         optional: true
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 28.1.1
-      '@jest/test-result': 28.1.1
-      '@jest/transform': 28.1.1
-      '@jest/types': 28.1.1
-      '@jridgewell/trace-mapping': 0.3.13
+      '@jest/console': 29.0.3
+      '@jest/test-result': 29.0.3
+      '@jest/transform': 29.0.3
+      '@jest/types': 29.0.3
+      '@jridgewell/trace-mapping': 0.3.15
       '@types/node': 16.11.7
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
@@ -2067,9 +2916,9 @@ packages:
       istanbul-lib-report: 3.0.0
       istanbul-lib-source-maps: 4.0.1
       istanbul-reports: 3.1.4
-      jest-message-util: 28.1.1
-      jest-util: 28.1.1
-      jest-worker: 28.1.1
+      jest-message-util: 29.0.3
+      jest-util: 29.0.3
+      jest-worker: 29.0.3
       slash: 3.0.0
       string-length: 4.0.2
       strip-ansi: 6.0.1
@@ -2083,12 +2932,19 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
       '@sinclair/typebox': 0.23.5
+    dev: false
 
-  /@jest/source-map/28.0.2:
-    resolution: {integrity: sha512-Y9dxC8ZpN3kImkk0LkK5XCEneYMAXlZ8m5bflmSL5vrwyeUpJfentacCUg6fOb8NOpOO7hz2+l37MV77T6BFPw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/schemas/29.0.0:
+    resolution: {integrity: sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@sinclair/typebox': 0.24.40
+
+  /@jest/source-map/29.0.0:
+    resolution: {integrity: sha512-nOr+0EM8GiHf34mq2GcJyz/gYFyLQ2INDhAylrZJ9mMWoW21mLBfZa0BUVPPMxVYrLjeiRe2Z7kWXOGnS0TFhQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.15
       callsites: 3.1.0
       graceful-fs: 4.2.10
 
@@ -2100,31 +2956,41 @@ packages:
       '@jest/types': 28.1.1
       '@types/istanbul-lib-coverage': 2.0.3
       collect-v8-coverage: 1.0.1
+    dev: false
+
+  /@jest/test-result/29.0.3:
+    resolution: {integrity: sha512-vViVnQjCgTmbhDKEonKJPtcFe9G/CJO4/Np4XwYJah+lF2oI7KKeRp8t1dFvv44wN2NdbDb/qC6pi++Vpp0Dlg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/console': 29.0.3
+      '@jest/types': 29.0.3
+      '@types/istanbul-lib-coverage': 2.0.3
+      collect-v8-coverage: 1.0.1
 
-  /@jest/test-sequencer/28.1.1:
-    resolution: {integrity: sha512-nuL+dNSVMcWB7OOtgb0EGH5AjO4UBCt68SLP08rwmC+iRhyuJWS9MtZ/MpipxFwKAlHFftbMsydXqWre8B0+XA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/test-sequencer/29.0.3:
+    resolution: {integrity: sha512-Hf4+xYSWZdxTNnhDykr8JBs0yBN/nxOXyUQWfotBUqqy0LF9vzcFB0jm/EDNZCx587znLWTIgxcokW7WeZMobQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 28.1.1
+      '@jest/test-result': 29.0.3
       graceful-fs: 4.2.10
-      jest-haste-map: 28.1.1
+      jest-haste-map: 29.0.3
       slash: 3.0.0
 
-  /@jest/transform/28.1.1:
-    resolution: {integrity: sha512-PkfaTUuvjUarl1EDr5ZQcCA++oXkFCP9QFUkG0yVKVmNObjhrqDy0kbMpMebfHWm3CCDHjYNem9eUSH8suVNHQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/transform/29.0.3:
+    resolution: {integrity: sha512-C5ihFTRYaGDbi/xbRQRdbo5ddGtI4VSpmL6AIcZxdhwLbXMa7PcXxxqyI91vGOFHnn5aVM3WYnYKCHEqmLVGzg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.18.2
-      '@jest/types': 28.1.1
-      '@jridgewell/trace-mapping': 0.3.13
+      '@babel/core': 7.18.9
+      '@jest/types': 29.0.3
+      '@jridgewell/trace-mapping': 0.3.15
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
       convert-source-map: 1.7.0
       fast-json-stable-stringify: 2.1.0
       graceful-fs: 4.2.10
-      jest-haste-map: 28.1.1
-      jest-regex-util: 28.0.2
-      jest-util: 28.1.1
+      jest-haste-map: 29.0.3
+      jest-regex-util: 29.0.0
+      jest-util: 29.0.3
       micromatch: 4.0.5
       pirates: 4.0.5
       slash: 3.0.0
@@ -2142,21 +3008,25 @@ packages:
       '@types/node': 16.11.7
       '@types/yargs': 17.0.10
       chalk: 4.1.2
+    dev: false
 
-  /@jridgewell/gen-mapping/0.1.1:
-    resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
-    engines: {node: '>=6.0.0'}
+  /@jest/types/29.0.3:
+    resolution: {integrity: sha512-coBJmOQvurXjN1Hh5PzF7cmsod0zLIOXpP8KD161mqNlroMhLcwpODiEzi7ZsRl5Z/AIuxpeNm8DCl43F4kz8A==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jridgewell/set-array': 1.1.1
-      '@jridgewell/sourcemap-codec': 1.4.13
+      '@jest/schemas': 29.0.0
+      '@types/istanbul-lib-coverage': 2.0.3
+      '@types/istanbul-reports': 3.0.1
+      '@types/node': 16.11.7
+      '@types/yargs': 17.0.10
+      chalk: 4.1.2
 
-  /@jridgewell/gen-mapping/0.3.1:
-    resolution: {integrity: sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==}
+  /@jridgewell/gen-mapping/0.1.1:
+    resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/set-array': 1.1.1
       '@jridgewell/sourcemap-codec': 1.4.13
-      '@jridgewell/trace-mapping': 0.3.13
 
   /@jridgewell/gen-mapping/0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
@@ -2164,7 +3034,7 @@ packages:
     dependencies:
       '@jridgewell/set-array': 1.1.1
       '@jridgewell/sourcemap-codec': 1.4.13
-      '@jridgewell/trace-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.15
 
   /@jridgewell/resolve-uri/3.0.7:
     resolution: {integrity: sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==}
@@ -2177,8 +3047,8 @@ packages:
   /@jridgewell/sourcemap-codec/1.4.13:
     resolution: {integrity: sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==}
 
-  /@jridgewell/trace-mapping/0.3.13:
-    resolution: {integrity: sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==}
+  /@jridgewell/trace-mapping/0.3.15:
+    resolution: {integrity: sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==}
     dependencies:
       '@jridgewell/resolve-uri': 3.0.7
       '@jridgewell/sourcemap-codec': 1.4.13
@@ -2352,6 +3222,10 @@ packages:
 
   /@sinclair/typebox/0.23.5:
     resolution: {integrity: sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==}
+    dev: false
+
+  /@sinclair/typebox/0.24.40:
+    resolution: {integrity: sha512-Xint60L8rF0+nRy+6fCjW9jQMmu7fTpbwTBrXZiK6eq/RHDJS7LvWX/0oXC8O7fCePmrY/XdfaTv2HiUDeCq4g==}
 
   /@sinonjs/commons/1.8.3:
     resolution: {integrity: sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==}
@@ -2499,8 +3373,8 @@ packages:
   /@types/babel__core/7.1.19:
     resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
     dependencies:
-      '@babel/parser': 7.18.4
-      '@babel/types': 7.18.7
+      '@babel/parser': 7.18.9
+      '@babel/types': 7.18.9
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.17.1
@@ -2508,18 +3382,18 @@ packages:
   /@types/babel__generator/7.6.4:
     resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
 
   /@types/babel__template/7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.18.4
-      '@babel/types': 7.18.7
+      '@babel/parser': 7.18.9
+      '@babel/types': 7.18.9
 
   /@types/babel__traverse/7.17.1:
     resolution: {integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==}
     dependencies:
-      '@babel/types': 7.18.7
+      '@babel/types': 7.18.9
 
   /@types/eventsource/1.1.8:
     resolution: {integrity: sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==}
@@ -2553,18 +3427,18 @@ packages:
     dependencies:
       '@types/istanbul-lib-report': 3.0.0
 
-  /@types/jest/28.1.3:
-    resolution: {integrity: sha512-Tsbjk8Y2hkBaY/gJsataeb4q9Mubw9EOz7+4RjPkzD5KjTvHHs7cpws22InaoXxAVAhF5HfFbzJjo6oKWqSZLw==}
+  /@types/jest/29.0.1:
+    resolution: {integrity: sha512-CAZrjLRZs4xEdIrfrdV74xK1Vo/BKQZwUcjJv3gp6gMeV3BsVxMnXTcgtYOKyphT4DPPo7jxVEVhuwJTQn3oPQ==}
     dependencies:
-      jest-matcher-utils: 28.1.1
-      pretty-format: 28.1.1
+      expect: 29.0.3
+      pretty-format: 29.0.3
 
-  /@types/jsdom/16.2.14:
-    resolution: {integrity: sha512-6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w==}
+  /@types/jsdom/20.0.0:
+    resolution: {integrity: sha512-YfAchFs0yM1QPDrLm2VHe+WHGtqms3NXnXAMolrgrVP6fgBHHXy1ozAbo/dFtPNtZC/m66bPiCTWYmqp1F14gA==}
     dependencies:
       '@types/node': 16.11.7
-      '@types/parse5': 6.0.3
       '@types/tough-cookie': 4.0.2
+      parse5: 7.1.1
     dev: true
 
   /@types/json-schema/7.0.11:
@@ -2585,10 +3459,6 @@ packages:
     resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
     dev: true
 
-  /@types/parse5/6.0.3:
-    resolution: {integrity: sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==}
-    dev: true
-
   /@types/prettier/2.6.3:
     resolution: {integrity: sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==}
 
@@ -2650,7 +3520,7 @@ packages:
   /@types/testing-library__jest-dom/5.14.5:
     resolution: {integrity: sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==}
     dependencies:
-      '@types/jest': 28.1.3
+      '@types/jest': 29.0.1
 
   /@types/tough-cookie/4.0.2:
     resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
@@ -3112,34 +3982,34 @@ packages:
     resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
     dev: true
 
-  /babel-jest/28.1.1_@babel+core@7.18.2:
-    resolution: {integrity: sha512-MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /babel-jest/29.0.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-ApPyHSOhS/sVzwUOQIWJmdvDhBsMG01HX9z7ogtkp1TToHGGUWFlnXJUIzCgKPSfiYLn3ibipCYzsKSURHEwLg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
     dependencies:
       '@babel/core': 7.18.2
-      '@jest/transform': 28.1.1
+      '@jest/transform': 29.0.3
       '@types/babel__core': 7.1.19
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 28.1.1_@babel+core@7.18.2
+      babel-preset-jest: 29.0.2_@babel+core@7.18.2
       chalk: 4.1.2
       graceful-fs: 4.2.10
       slash: 3.0.0
     transitivePeerDependencies:
       - supports-color
 
-  /babel-jest/28.1.1_@babel+core@7.18.9:
-    resolution: {integrity: sha512-MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /babel-jest/29.0.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-ApPyHSOhS/sVzwUOQIWJmdvDhBsMG01HX9z7ogtkp1TToHGGUWFlnXJUIzCgKPSfiYLn3ibipCYzsKSURHEwLg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
     dependencies:
       '@babel/core': 7.18.9
-      '@jest/transform': 28.1.1
+      '@jest/transform': 29.0.3
       '@types/babel__core': 7.1.19
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 28.1.1_@babel+core@7.18.9
+      babel-preset-jest: 29.0.2_@babel+core@7.18.9
       chalk: 4.1.2
       graceful-fs: 4.2.10
       slash: 3.0.0
@@ -3164,12 +4034,12 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /babel-plugin-jest-hoist/28.1.1:
-    resolution: {integrity: sha512-NovGCy5Hn25uMJSAU8FaHqzs13cFoOI4lhIujiepssjCKRsAo3TA734RDWSGxuFTsUJXerYOqQQodlxgmtqbzw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /babel-plugin-jest-hoist/29.0.2:
+    resolution: {integrity: sha512-eBr2ynAEFjcebVvu8Ktx580BD1QKCrBG1XwEUTXJe285p9HA/4hOhfWCFRQhTKSyBV0VzjhG7H91Eifz9s29hg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/template': 7.16.7
-      '@babel/types': 7.18.7
+      '@babel/template': 7.18.6
+      '@babel/types': 7.18.9
       '@types/babel__core': 7.1.19
       '@types/babel__traverse': 7.17.1
 
@@ -3179,7 +4049,7 @@ packages:
     dependencies:
       '@babel/runtime': 7.17.9
       cosmiconfig: 7.0.1
-      resolve: 1.22.0
+      resolve: 1.22.1
     dev: true
 
   /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.18.2:
@@ -3187,7 +4057,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/compat-data': 7.17.10
+      '@babel/compat-data': 7.18.8
       '@babel/core': 7.18.2
       '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.2
       semver: 6.3.0
@@ -3195,6 +4065,19 @@ packages:
       - supports-color
     dev: true
 
+  /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.18.9:
+    resolution: {integrity: sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/compat-data': 7.18.8
+      '@babel/core': 7.18.9
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.9
+      semver: 6.3.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /babel-plugin-polyfill-corejs3/0.5.2_@babel+core@7.18.2:
     resolution: {integrity: sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==}
     peerDependencies:
@@ -3207,6 +4090,18 @@ packages:
       - supports-color
     dev: true
 
+  /babel-plugin-polyfill-corejs3/0.5.2_@babel+core@7.18.9:
+    resolution: {integrity: sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.9
+      core-js-compat: 3.22.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.18.2:
     resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==}
     peerDependencies:
@@ -3218,6 +4113,17 @@ packages:
       - supports-color
     dev: true
 
+  /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.9
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /babel-plugin-styled-components/1.13.2_styled-components@5.3.1:
     resolution: {integrity: sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==}
     peerDependencies:
@@ -3274,43 +4180,43 @@ packages:
       '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
       '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.9
 
-  /babel-preset-jest/28.1.1_@babel+core@7.18.2:
-    resolution: {integrity: sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /babel-preset-jest/29.0.2_@babel+core@7.18.2:
+    resolution: {integrity: sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.18.2
-      babel-plugin-jest-hoist: 28.1.1
+      babel-plugin-jest-hoist: 29.0.2
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2
 
-  /babel-preset-jest/28.1.1_@babel+core@7.18.9:
-    resolution: {integrity: sha512-FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /babel-preset-jest/29.0.2_@babel+core@7.18.9:
+    resolution: {integrity: sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.18.9
-      babel-plugin-jest-hoist: 28.1.1
+      babel-plugin-jest-hoist: 29.0.2
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.9
 
   /babel-preset-react-app/10.0.1:
     resolution: {integrity: sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==}
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/plugin-proposal-class-properties': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-decorators': 7.17.9_@babel+core@7.18.2
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-private-methods': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-private-property-in-object': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-flow-strip-types': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-react-display-name': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-runtime': 7.17.10_@babel+core@7.18.2
-      '@babel/preset-env': 7.18.2_@babel+core@7.18.2
-      '@babel/preset-react': 7.17.12_@babel+core@7.18.2
-      '@babel/preset-typescript': 7.17.12_@babel+core@7.18.2
+      '@babel/core': 7.18.9
+      '@babel/plugin-proposal-class-properties': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-decorators': 7.17.9_@babel+core@7.18.9
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-private-methods': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-proposal-private-property-in-object': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-transform-flow-strip-types': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-react-display-name': 7.16.7_@babel+core@7.18.9
+      '@babel/plugin-transform-runtime': 7.17.10_@babel+core@7.18.9
+      '@babel/preset-env': 7.18.2_@babel+core@7.18.9
+      '@babel/preset-react': 7.17.12_@babel+core@7.18.9
+      '@babel/preset-typescript': 7.17.12_@babel+core@7.18.9
       '@babel/runtime': 7.17.9
       babel-plugin-macros: 3.1.0
       babel-plugin-transform-react-remove-prop-types: 0.4.24
@@ -3591,7 +4497,7 @@ packages:
     dev: true
 
   /concat-map/0.0.1:
-    resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
   /concurrently/6.5.1:
     resolution: {integrity: sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==}
@@ -3828,9 +4734,9 @@ packages:
     resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
     dev: false
 
-  /diff-sequences/28.1.1:
-    resolution: {integrity: sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /diff-sequences/29.0.0:
+    resolution: {integrity: sha512-7Qe/zd1wxSDL4D/X/FPjOMB+ZMDt71W94KYaq05I2l0oQqgXgs7s4ftYYmV38gBSrPz2vcygxfs1xn0FT+rKNA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
   /diff/4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
@@ -3904,6 +4810,11 @@ packages:
       tapable: 2.2.1
     dev: true
 
+  /entities/4.4.0:
+    resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==}
+    engines: {node: '>=0.12'}
+    dev: true
+
   /error-ex/1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
@@ -4250,7 +5161,7 @@ packages:
       eslint: 8.16.0
     dev: true
 
-  /eslint-config-react-app/7.0.1_y3w6q4zxtal6gz5auqli3lo3ny:
+  /eslint-config-react-app/7.0.1_qmzb7mn5nafzn657qxusdnr23a:
     resolution: {integrity: sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -4270,7 +5181,7 @@ packages:
       eslint: 8.16.0
       eslint-plugin-flowtype: 8.0.3_lkudaqqzr27bp3dduyr3eevxq4
       eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
-      eslint-plugin-jest: 25.7.0_lemdnf4suuyhpl5s2mhp2xyjqi
+      eslint-plugin-jest: 25.7.0_76upbxnyphyptf6rdjdsihqkzi
       eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
       eslint-plugin-react: 7.30.1_eslint@8.16.0
       eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
@@ -4399,7 +5310,7 @@ packages:
       requireindex: 1.2.0
     dev: true
 
-  /eslint-plugin-jest/25.7.0_lemdnf4suuyhpl5s2mhp2xyjqi:
+  /eslint-plugin-jest/25.7.0_76upbxnyphyptf6rdjdsihqkzi:
     resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     peerDependencies:
@@ -4415,7 +5326,7 @@ packages:
       '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
       '@typescript-eslint/experimental-utils': 5.23.0_vjep2yp2sits3sqnodefgcbnfi
       eslint: 8.16.0
-      jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+      jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -4660,15 +5571,15 @@ packages:
     resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
     engines: {node: '>= 0.8.0'}
 
-  /expect/28.1.1:
-    resolution: {integrity: sha512-/AANEwGL0tWBwzLNOvO0yUdy2D52jVdNXppOqswC49sxMN2cPWsGCQdzuIf9tj6hHoBQzNvx75JUYuQAckPo3w==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /expect/29.0.3:
+    resolution: {integrity: sha512-t8l5DTws3212VbmPL+tBFXhjRHLmctHB0oQbL8eUc6S7NzZtYUhycrFO9mkxA0ZUC6FAWdNi7JchJSkODtcu1Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/expect-utils': 28.1.1
-      jest-get-type: 28.0.2
-      jest-matcher-utils: 28.1.1
-      jest-message-util: 28.1.1
-      jest-util: 28.1.1
+      '@jest/expect-utils': 29.0.3
+      jest-get-type: 29.0.0
+      jest-matcher-utils: 29.0.3
+      jest-message-util: 29.0.3
+      jest-util: 29.0.3
 
   /external-editor/3.1.0:
     resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
@@ -5325,7 +6236,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/parser': 7.18.4
+      '@babel/parser': 7.18.9
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
       semver: 6.3.0
@@ -5362,42 +6273,42 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /jest-changed-files/28.0.2:
-    resolution: {integrity: sha512-QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-changed-files/29.0.0:
+    resolution: {integrity: sha512-28/iDMDrUpGoCitTURuDqUzWQoWmOmOKOFST1mi2lwh62X4BFf6khgH3uSuo1e49X/UDjuApAj3w0wLOex4VPQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       execa: 5.1.1
-      throat: 6.0.1
+      p-limit: 3.1.0
 
-  /jest-circus/28.1.1:
-    resolution: {integrity: sha512-75+BBVTsL4+p2w198DQpCeyh1RdaS2lhEG87HkaFX/UG0gJExVq2skG2pT7XZEGBubNj2CytcWSPan4QEPNosw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-circus/29.0.3:
+    resolution: {integrity: sha512-QeGzagC6Hw5pP+df1+aoF8+FBSgkPmraC1UdkeunWh0jmrp7wC0Hr6umdUAOELBQmxtKAOMNC3KAdjmCds92Zg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 28.1.1
-      '@jest/expect': 28.1.1
-      '@jest/test-result': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/environment': 29.0.3
+      '@jest/expect': 29.0.3
+      '@jest/test-result': 29.0.3
+      '@jest/types': 29.0.3
       '@types/node': 16.11.7
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
       is-generator-fn: 2.1.0
-      jest-each: 28.1.1
-      jest-matcher-utils: 28.1.1
-      jest-message-util: 28.1.1
-      jest-runtime: 28.1.1
-      jest-snapshot: 28.1.1
-      jest-util: 28.1.1
-      pretty-format: 28.1.1
+      jest-each: 29.0.3
+      jest-matcher-utils: 29.0.3
+      jest-message-util: 29.0.3
+      jest-runtime: 29.0.3
+      jest-snapshot: 29.0.3
+      jest-util: 29.0.3
+      p-limit: 3.1.0
+      pretty-format: 29.0.3
       slash: 3.0.0
       stack-utils: 2.0.5
-      throat: 6.0.1
     transitivePeerDependencies:
       - supports-color
 
-  /jest-cli/28.1.1_yqiaopbgmqcuvx27p5xxvum6wm:
-    resolution: {integrity: sha512-+sUfVbJqb1OjBZ0OdBbI6OWfYM1i7bSfzYy6gze1F1w3OKWq8ZTEKkZ8a7ZQPq6G/G1qMh/uKqpdWhgl11NFQQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-cli/29.0.3_yqiaopbgmqcuvx27p5xxvum6wm:
+    resolution: {integrity: sha512-aUy9Gd/Kut1z80eBzG10jAn6BgS3BoBbXyv+uXEqBJ8wnnuZ5RpNfARoskSrTIy1GY4a8f32YGuCMwibtkl9CQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -5405,16 +6316,16 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 28.1.1_ts-node@10.8.1
-      '@jest/test-result': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/core': 29.0.3_ts-node@10.8.1
+      '@jest/test-result': 29.0.3
+      '@jest/types': 29.0.3
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.10
       import-local: 3.1.0
-      jest-config: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
-      jest-util: 28.1.1
-      jest-validate: 28.1.1
+      jest-config: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
+      jest-util: 29.0.3
+      jest-validate: 29.0.3
       prompts: 2.4.2
       yargs: 17.5.1
     transitivePeerDependencies:
@@ -5422,9 +6333,9 @@ packages:
       - supports-color
       - ts-node
 
-  /jest-config/28.1.1_yqiaopbgmqcuvx27p5xxvum6wm:
-    resolution: {integrity: sha512-tASynMhS+jVV85zKvjfbJ8nUyJS/jUSYZ5KQxLUN2ZCvcQc/OmhQl2j6VEL3ezQkNofxn5pQ3SPYWPHb0unTZA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-config/29.0.3_yqiaopbgmqcuvx27p5xxvum6wm:
+    resolution: {integrity: sha512-U5qkc82HHVYe3fNu2CRXLN4g761Na26rWKf7CjM8LlZB3In1jadEkZdMwsE37rd9RSPV0NfYaCjHdk/gu3v+Ew==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@types/node': '*'
       ts-node: '>=9.0.0'
@@ -5435,69 +6346,69 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.18.9
-      '@jest/test-sequencer': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/test-sequencer': 29.0.3
+      '@jest/types': 29.0.3
       '@types/node': 16.11.7
-      babel-jest: 28.1.1_@babel+core@7.18.9
+      babel-jest: 29.0.3_@babel+core@7.18.9
       chalk: 4.1.2
       ci-info: 3.3.1
       deepmerge: 4.2.2
       glob: 7.2.0
       graceful-fs: 4.2.10
-      jest-circus: 28.1.1
-      jest-environment-node: 28.1.1
-      jest-get-type: 28.0.2
-      jest-regex-util: 28.0.2
-      jest-resolve: 28.1.1
-      jest-runner: 28.1.1
-      jest-util: 28.1.1
-      jest-validate: 28.1.1
+      jest-circus: 29.0.3
+      jest-environment-node: 29.0.3
+      jest-get-type: 29.0.0
+      jest-regex-util: 29.0.0
+      jest-resolve: 29.0.3
+      jest-runner: 29.0.3
+      jest-util: 29.0.3
+      jest-validate: 29.0.3
       micromatch: 4.0.5
       parse-json: 5.2.0
-      pretty-format: 28.1.1
+      pretty-format: 29.0.3
       slash: 3.0.0
       strip-json-comments: 3.1.1
       ts-node: 10.8.1_t4lrjbt3sxauai4t5o275zsepa
     transitivePeerDependencies:
       - supports-color
 
-  /jest-diff/28.1.1:
-    resolution: {integrity: sha512-/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-diff/29.0.3:
+    resolution: {integrity: sha512-+X/AIF5G/vX9fWK+Db9bi9BQas7M9oBME7egU7psbn4jlszLFCu0dW63UgeE6cs/GANq4fLaT+8sGHQQ0eCUfg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
-      diff-sequences: 28.1.1
-      jest-get-type: 28.0.2
-      pretty-format: 28.1.1
+      diff-sequences: 29.0.0
+      jest-get-type: 29.0.0
+      pretty-format: 29.0.3
 
-  /jest-docblock/28.1.1:
-    resolution: {integrity: sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-docblock/29.0.0:
+    resolution: {integrity: sha512-s5Kpra/kLzbqu9dEjov30kj1n4tfu3e7Pl8v+f8jOkeWNqM6Ds8jRaJfZow3ducoQUrf2Z4rs2N5S3zXnb83gw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       detect-newline: 3.1.0
 
-  /jest-each/28.1.1:
-    resolution: {integrity: sha512-A042rqh17ZvEhRceDMi784ppoXR7MWGDEKTXEZXb4svt0eShMZvijGxzKsx+yIjeE8QYmHPrnHiTSQVhN4nqaw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-each/29.0.3:
+    resolution: {integrity: sha512-wILhZfESURHHBNvPMJ0lZlYZrvOQJxAo3wNHi+ycr90V7M+uGR9Gh4+4a/BmaZF0XTyZsk4OiYEf3GJN7Ltqzg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 28.1.1
+      '@jest/types': 29.0.3
       chalk: 4.1.2
-      jest-get-type: 28.0.2
-      jest-util: 28.1.1
-      pretty-format: 28.1.1
-
-  /jest-environment-jsdom/28.1.1:
-    resolution: {integrity: sha512-41ZvgSoPNcKG5q3LuuOcAczdBxRq9DbZkPe24okN6ZCmiZdAfFtPg3z+lOtsT1fM6OAERApKT+3m0MRDQH2zIA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/environment': 28.1.1
-      '@jest/fake-timers': 28.1.1
-      '@jest/types': 28.1.1
-      '@types/jsdom': 16.2.14
+      jest-get-type: 29.0.0
+      jest-util: 29.0.3
+      pretty-format: 29.0.3
+
+  /jest-environment-jsdom/29.0.3:
+    resolution: {integrity: sha512-KIGvpm12c71hoYTjL4wC2c8K6KfhOHJqJtaHc1IApu5rG047YWZoEP13BlbucWfzGISBrmli8KFqdhdQEa8Wnw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/environment': 29.0.3
+      '@jest/fake-timers': 29.0.3
+      '@jest/types': 29.0.3
+      '@types/jsdom': 20.0.0
       '@types/node': 16.11.7
-      jest-mock: 28.1.1
-      jest-util: 28.1.1
-      jsdom: 19.0.0
+      jest-mock: 29.0.3
+      jest-util: 29.0.3
+      jsdom: 20.0.0
     transitivePeerDependencies:
       - bufferutil
       - canvas
@@ -5505,60 +6416,60 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jest-environment-node/28.1.1:
-    resolution: {integrity: sha512-2aV/eeY/WNgUUJrrkDJ3cFEigjC5fqT1+fCclrY6paqJ5zVPoM//sHmfgUUp7WLYxIdbPwMiVIzejpN56MxnNA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-environment-node/29.0.3:
+    resolution: {integrity: sha512-cdZqRCnmIlTXC+9vtvmfiY/40Cj6s2T0czXuq1whvQdmpzAnj4sbqVYuZ4zFHk766xTTJ+Ij3uUqkk8KCfXoyg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 28.1.1
-      '@jest/fake-timers': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/environment': 29.0.3
+      '@jest/fake-timers': 29.0.3
+      '@jest/types': 29.0.3
       '@types/node': 16.11.7
-      jest-mock: 28.1.1
-      jest-util: 28.1.1
+      jest-mock: 29.0.3
+      jest-util: 29.0.3
 
-  /jest-get-type/28.0.2:
-    resolution: {integrity: sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-get-type/29.0.0:
+    resolution: {integrity: sha512-83X19z/HuLKYXYHskZlBAShO7UfLFXu/vWajw9ZNJASN32li8yHMaVGAQqxFW1RCFOkB7cubaL6FaJVQqqJLSw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /jest-haste-map/28.1.1:
-    resolution: {integrity: sha512-ZrRSE2o3Ezh7sb1KmeLEZRZ4mgufbrMwolcFHNRSjKZhpLa8TdooXOOFlSwoUzlbVs1t0l7upVRW2K7RWGHzbQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-haste-map/29.0.3:
+    resolution: {integrity: sha512-uMqR99+GuBHo0RjRhOE4iA6LmsxEwRdgiIAQgMU/wdT2XebsLDz5obIwLZm/Psj+GwSEQhw9AfAVKGYbh2G55A==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 28.1.1
+      '@jest/types': 29.0.3
       '@types/graceful-fs': 4.1.5
       '@types/node': 16.11.7
       anymatch: 3.1.2
       fb-watchman: 2.0.1
       graceful-fs: 4.2.10
-      jest-regex-util: 28.0.2
-      jest-util: 28.1.1
-      jest-worker: 28.1.1
+      jest-regex-util: 29.0.0
+      jest-util: 29.0.3
+      jest-worker: 29.0.3
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
       fsevents: 2.3.2
 
-  /jest-leak-detector/28.1.1:
-    resolution: {integrity: sha512-4jvs8V8kLbAaotE+wFR7vfUGf603cwYtFf1/PYEsyX2BAjSzj8hQSVTP6OWzseTl0xL6dyHuKs2JAks7Pfubmw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-leak-detector/29.0.3:
+    resolution: {integrity: sha512-YfW/G63dAuiuQ3QmQlh8hnqLDe25WFY3eQhuc/Ev1AGmkw5zREblTh7TCSKLoheyggu6G9gxO2hY8p9o6xbaRQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-get-type: 28.0.2
-      pretty-format: 28.1.1
+      jest-get-type: 29.0.0
+      pretty-format: 29.0.3
 
-  /jest-matcher-utils/28.1.1:
-    resolution: {integrity: sha512-NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-matcher-utils/29.0.3:
+    resolution: {integrity: sha512-RsR1+cZ6p1hDV4GSCQTg+9qjeotQCgkaleIKLK7dm+U4V/H2bWedU3RAtLm8+mANzZ7eDV33dMar4pejd7047w==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
-      jest-diff: 28.1.1
-      jest-get-type: 28.0.2
-      pretty-format: 28.1.1
+      jest-diff: 29.0.3
+      jest-get-type: 29.0.0
+      pretty-format: 29.0.3
 
   /jest-message-util/28.1.1:
     resolution: {integrity: sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      '@babel/code-frame': 7.16.7
+      '@babel/code-frame': 7.18.6
       '@jest/types': 28.1.1
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
@@ -5567,15 +6478,30 @@ packages:
       pretty-format: 28.1.1
       slash: 3.0.0
       stack-utils: 2.0.5
+    dev: false
 
-  /jest-mock/28.1.1:
-    resolution: {integrity: sha512-bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-message-util/29.0.3:
+    resolution: {integrity: sha512-7T8JiUTtDfppojosORAflABfLsLKMLkBHSWkjNQrjIltGoDzNGn7wEPOSfjqYAGTYME65esQzMJxGDjuLBKdOg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 28.1.1
+      '@babel/code-frame': 7.18.6
+      '@jest/types': 29.0.3
+      '@types/stack-utils': 2.0.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      micromatch: 4.0.5
+      pretty-format: 29.0.3
+      slash: 3.0.0
+      stack-utils: 2.0.5
+
+  /jest-mock/29.0.3:
+    resolution: {integrity: sha512-ort9pYowltbcrCVR43wdlqfAiFJXBx8l4uJDsD8U72LgBcetvEp+Qxj1W9ZYgMRoeAo+ov5cnAGF2B6+Oth+ww==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/types': 29.0.3
       '@types/node': 16.11.7
 
-  /jest-pnp-resolver/1.2.2_jest-resolve@28.1.1:
+  /jest-pnp-resolver/1.2.2_jest-resolve@29.0.3:
     resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
     engines: {node: '>=6'}
     peerDependencies:
@@ -5584,118 +6510,124 @@ packages:
       jest-resolve:
         optional: true
     dependencies:
-      jest-resolve: 28.1.1
+      jest-resolve: 29.0.3
 
   /jest-regex-util/28.0.2:
     resolution: {integrity: sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+    dev: false
 
-  /jest-resolve-dependencies/28.1.1:
-    resolution: {integrity: sha512-p8Y150xYJth4EXhOuB8FzmS9r8IGLEioiaetgdNGb9VHka4fl0zqWlVe4v7mSkYOuEUg2uB61iE+zySDgrOmgQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-regex-util/29.0.0:
+    resolution: {integrity: sha512-BV7VW7Sy0fInHWN93MMPtlClweYv2qrSCwfeFWmpribGZtQPWNvRSq9XOVgOEjU1iBGRKXUZil0o2AH7Iy9Lug==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  /jest-resolve-dependencies/29.0.3:
+    resolution: {integrity: sha512-KzuBnXqNvbuCdoJpv8EanbIGObk7vUBNt/PwQPPx2aMhlv/jaXpUJsqWYRpP/0a50faMBY7WFFP8S3/CCzwfDw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-regex-util: 28.0.2
-      jest-snapshot: 28.1.1
+      jest-regex-util: 29.0.0
+      jest-snapshot: 29.0.3
     transitivePeerDependencies:
       - supports-color
 
-  /jest-resolve/28.1.1:
-    resolution: {integrity: sha512-/d1UbyUkf9nvsgdBildLe6LAD4DalgkgZcKd0nZ8XUGPyA/7fsnaQIlKVnDiuUXv/IeZhPEDrRJubVSulxrShA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-resolve/29.0.3:
+    resolution: {integrity: sha512-toVkia85Y/BPAjJasTC9zIPY6MmVXQPtrCk8SmiheC4MwVFE/CMFlOtMN6jrwPMC6TtNh8+sTMllasFeu1wMPg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
       graceful-fs: 4.2.10
-      jest-haste-map: 28.1.1
-      jest-pnp-resolver: 1.2.2_jest-resolve@28.1.1
-      jest-util: 28.1.1
-      jest-validate: 28.1.1
-      resolve: 1.22.0
+      jest-haste-map: 29.0.3
+      jest-pnp-resolver: 1.2.2_jest-resolve@29.0.3
+      jest-util: 29.0.3
+      jest-validate: 29.0.3
+      resolve: 1.22.1
       resolve.exports: 1.1.0
       slash: 3.0.0
 
-  /jest-runner/28.1.1:
-    resolution: {integrity: sha512-W5oFUiDBgTsCloTAj6q95wEvYDB0pxIhY6bc5F26OucnwBN+K58xGTGbliSMI4ChQal5eANDF+xvELaYkJxTmA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-runner/29.0.3:
+    resolution: {integrity: sha512-Usu6VlTOZlCZoNuh3b2Tv/yzDpKqtiNAetG9t3kJuHfUyVMNW7ipCCJOUojzKkjPoaN7Bl1f7Buu6PE0sGpQxw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 28.1.1
-      '@jest/environment': 28.1.1
-      '@jest/test-result': 28.1.1
-      '@jest/transform': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/console': 29.0.3
+      '@jest/environment': 29.0.3
+      '@jest/test-result': 29.0.3
+      '@jest/transform': 29.0.3
+      '@jest/types': 29.0.3
       '@types/node': 16.11.7
       chalk: 4.1.2
       emittery: 0.10.2
       graceful-fs: 4.2.10
-      jest-docblock: 28.1.1
-      jest-environment-node: 28.1.1
-      jest-haste-map: 28.1.1
-      jest-leak-detector: 28.1.1
-      jest-message-util: 28.1.1
-      jest-resolve: 28.1.1
-      jest-runtime: 28.1.1
-      jest-util: 28.1.1
-      jest-watcher: 28.1.1
-      jest-worker: 28.1.1
+      jest-docblock: 29.0.0
+      jest-environment-node: 29.0.3
+      jest-haste-map: 29.0.3
+      jest-leak-detector: 29.0.3
+      jest-message-util: 29.0.3
+      jest-resolve: 29.0.3
+      jest-runtime: 29.0.3
+      jest-util: 29.0.3
+      jest-watcher: 29.0.3
+      jest-worker: 29.0.3
+      p-limit: 3.1.0
       source-map-support: 0.5.13
-      throat: 6.0.1
     transitivePeerDependencies:
       - supports-color
 
-  /jest-runtime/28.1.1:
-    resolution: {integrity: sha512-J89qEJWW0leOsqyi0D9zHpFEYHwwafFdS9xgvhFHtIdRghbadodI0eA+DrthK/1PebBv3Px8mFSMGKrtaVnleg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/environment': 28.1.1
-      '@jest/fake-timers': 28.1.1
-      '@jest/globals': 28.1.1
-      '@jest/source-map': 28.0.2
-      '@jest/test-result': 28.1.1
-      '@jest/transform': 28.1.1
-      '@jest/types': 28.1.1
+  /jest-runtime/29.0.3:
+    resolution: {integrity: sha512-12gZXRQ7ozEeEHKTY45a+YLqzNDR/x4c//X6AqwKwKJPpWM8FY4vwn4VQJOcLRS3Nd1fWwgP7LU4SoynhuUMHQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/environment': 29.0.3
+      '@jest/fake-timers': 29.0.3
+      '@jest/globals': 29.0.3
+      '@jest/source-map': 29.0.0
+      '@jest/test-result': 29.0.3
+      '@jest/transform': 29.0.3
+      '@jest/types': 29.0.3
+      '@types/node': 16.11.7
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
-      execa: 5.1.1
       glob: 7.2.0
       graceful-fs: 4.2.10
-      jest-haste-map: 28.1.1
-      jest-message-util: 28.1.1
-      jest-mock: 28.1.1
-      jest-regex-util: 28.0.2
-      jest-resolve: 28.1.1
-      jest-snapshot: 28.1.1
-      jest-util: 28.1.1
+      jest-haste-map: 29.0.3
+      jest-message-util: 29.0.3
+      jest-mock: 29.0.3
+      jest-regex-util: 29.0.0
+      jest-resolve: 29.0.3
+      jest-snapshot: 29.0.3
+      jest-util: 29.0.3
       slash: 3.0.0
       strip-bom: 4.0.0
     transitivePeerDependencies:
       - supports-color
 
-  /jest-snapshot/28.1.1:
-    resolution: {integrity: sha512-1KjqHJ98adRcbIdMizjF5DipwZFbvxym/kFO4g4fVZCZRxH/dqV8TiBFCa6rqic3p0karsy8RWS1y4E07b7P0A==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-snapshot/29.0.3:
+    resolution: {integrity: sha512-52q6JChm04U3deq+mkQ7R/7uy7YyfVIrebMi6ZkBoDJ85yEjm/sJwdr1P0LOIEHmpyLlXrxy3QP0Zf5J2kj0ew==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/generator': 7.18.2
+      '@babel/generator': 7.18.9
+      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.9
       '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.9
       '@babel/traverse': 7.18.9
       '@babel/types': 7.18.9
-      '@jest/expect-utils': 28.1.1
-      '@jest/transform': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/expect-utils': 29.0.3
+      '@jest/transform': 29.0.3
+      '@jest/types': 29.0.3
       '@types/babel__traverse': 7.17.1
       '@types/prettier': 2.6.3
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.9
       chalk: 4.1.2
-      expect: 28.1.1
+      expect: 29.0.3
       graceful-fs: 4.2.10
-      jest-diff: 28.1.1
-      jest-get-type: 28.0.2
-      jest-haste-map: 28.1.1
-      jest-matcher-utils: 28.1.1
-      jest-message-util: 28.1.1
-      jest-util: 28.1.1
+      jest-diff: 29.0.3
+      jest-get-type: 29.0.0
+      jest-haste-map: 29.0.3
+      jest-matcher-utils: 29.0.3
+      jest-message-util: 29.0.3
+      jest-util: 29.0.3
       natural-compare: 1.4.0
-      pretty-format: 28.1.1
+      pretty-format: 29.0.3
       semver: 7.3.7
     transitivePeerDependencies:
       - supports-color
@@ -5727,19 +6659,31 @@ packages:
       ci-info: 3.3.1
       graceful-fs: 4.2.10
       picomatch: 2.3.1
+    dev: false
 
-  /jest-validate/28.1.1:
-    resolution: {integrity: sha512-Kpf6gcClqFCIZ4ti5++XemYJWUPCFUW+N2gknn+KgnDf549iLul3cBuKVe1YcWRlaF8tZV8eJCap0eECOEE3Ug==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-util/29.0.3:
+    resolution: {integrity: sha512-Q0xaG3YRG8QiTC4R6fHjHQPaPpz9pJBEi0AeOE4mQh/FuWOijFjGXMMOfQEaU9i3z76cNR7FobZZUQnL6IyfdQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 28.1.1
+      '@jest/types': 29.0.3
+      '@types/node': 16.11.7
+      chalk: 4.1.2
+      ci-info: 3.3.1
+      graceful-fs: 4.2.10
+      picomatch: 2.3.1
+
+  /jest-validate/29.0.3:
+    resolution: {integrity: sha512-OebiqqT6lK8cbMPtrSoS3aZP4juID762lZvpf1u+smZnwTEBCBInan0GAIIhv36MxGaJvmq5uJm7dl5gVt+Zrw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/types': 29.0.3
       camelcase: 6.3.0
       chalk: 4.1.2
-      jest-get-type: 28.0.2
+      jest-get-type: 29.0.0
       leven: 3.1.0
-      pretty-format: 28.1.1
+      pretty-format: 29.0.3
 
-  /jest-watch-typeahead/2.0.0_jest@28.1.1:
+  /jest-watch-typeahead/2.0.0_jest@29.0.3:
     resolution: {integrity: sha512-LX/jrTNkOIZV1n7fnEWlKJ73lhVPKF9B6F0L7pbje3xNPw1NddPLn0n8EFt7YwbCnC0+vlLylp7JehV6M06J6Q==}
     engines: {node: ^14.17.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -5747,7 +6691,7 @@ packages:
     dependencies:
       ansi-escapes: 5.0.0
       chalk: 4.1.2
-      jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+      jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
       jest-regex-util: 28.0.2
       jest-watcher: 28.1.1
       slash: 4.0.0
@@ -5767,18 +6711,32 @@ packages:
       emittery: 0.10.2
       jest-util: 28.1.1
       string-length: 4.0.2
+    dev: false
+
+  /jest-watcher/29.0.3:
+    resolution: {integrity: sha512-tQX9lU91A+9tyUQKUMp0Ns8xAcdhC9fo73eqA3LFxP2bSgiF49TNcc+vf3qgGYYK9qRjFpXW9+4RgF/mbxyOOw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/test-result': 29.0.3
+      '@jest/types': 29.0.3
+      '@types/node': 16.11.7
+      ansi-escapes: 4.3.2
+      chalk: 4.1.2
+      emittery: 0.10.2
+      jest-util: 29.0.3
+      string-length: 4.0.2
 
-  /jest-worker/28.1.1:
-    resolution: {integrity: sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-worker/29.0.3:
+    resolution: {integrity: sha512-Tl/YWUugQOjoTYwjKdfJWkSOfhufJHO5LhXTSZC3TRoQKO+fuXnZAdoXXBlpLXKGODBL3OvdUasfDD4PcMe6ng==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@types/node': 16.11.7
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  /jest/28.1.1_yqiaopbgmqcuvx27p5xxvum6wm:
-    resolution: {integrity: sha512-qw9YHBnjt6TCbIDMPMpJZqf9E12rh6869iZaN08/vpOGgHJSAaLLUn6H8W3IAEuy34Ls3rct064mZLETkxJ2XA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest/29.0.3_yqiaopbgmqcuvx27p5xxvum6wm:
+    resolution: {integrity: sha512-ElgUtJBLgXM1E8L6K1RW1T96R897YY/3lRYqq9uVcPWtP2AAl/nQ16IYDh/FzQOOQ12VEuLdcPU83mbhG2C3PQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -5786,10 +6744,10 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 28.1.1_ts-node@10.8.1
-      '@jest/types': 28.1.1
+      '@jest/core': 29.0.3_ts-node@10.8.1
+      '@jest/types': 29.0.3
       import-local: 3.1.0
-      jest-cli: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
+      jest-cli: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
@@ -5812,9 +6770,9 @@ packages:
       argparse: 2.0.1
     dev: true
 
-  /jsdom/19.0.0:
-    resolution: {integrity: sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==}
-    engines: {node: '>=12'}
+  /jsdom/20.0.0:
+    resolution: {integrity: sha512-x4a6CKCgx00uCmP+QakBDFXwjAJ69IkkIWHmtmjd3wvXPcdOS44hfX2vqkOQrVrq8l9DhNNADZRXaCEWvgXtVA==}
+    engines: {node: '>=14'}
     peerDependencies:
       canvas: ^2.5.0
     peerDependenciesMeta:
@@ -5836,8 +6794,8 @@ packages:
       https-proxy-agent: 5.0.1
       is-potential-custom-element-name: 1.0.1
       nwsapi: 2.2.0
-      parse5: 6.0.1
-      saxes: 5.0.1
+      parse5: 7.1.1
+      saxes: 6.0.0
       symbol-tree: 3.2.4
       tough-cookie: 4.0.0
       w3c-hr-time: 1.0.2
@@ -5845,7 +6803,7 @@ packages:
       webidl-conversions: 7.0.0
       whatwg-encoding: 2.0.0
       whatwg-mimetype: 3.0.0
-      whatwg-url: 10.0.0
+      whatwg-url: 11.0.0
       ws: 8.8.0
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
@@ -6386,6 +7344,12 @@ packages:
     dependencies:
       p-try: 2.2.0
 
+  /p-limit/3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      yocto-queue: 0.1.0
+
   /p-locate/2.0.0:
     resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==}
     engines: {node: '>=4'}
@@ -6426,7 +7390,7 @@ packages:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/code-frame': 7.16.7
+      '@babel/code-frame': 7.18.6
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
@@ -6436,8 +7400,10 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
-  /parse5/6.0.1:
-    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
+  /parse5/7.1.1:
+    resolution: {integrity: sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==}
+    dependencies:
+      entities: 4.4.0
     dev: true
 
   /path-browserify/1.0.1:
@@ -6556,6 +7522,15 @@ packages:
       ansi-regex: 5.0.1
       ansi-styles: 5.2.0
       react-is: 18.2.0
+    dev: false
+
+  /pretty-format/29.0.3:
+    resolution: {integrity: sha512-cHudsvQr1K5vNVLbvYF/nv3Qy/F/BcEKxGuIeMiVMRHxPOO1RxXooP8g/ZrwAp7Dx+KdMZoOc7NxLHhMrP2f9Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/schemas': 29.0.0
+      ansi-styles: 5.2.0
+      react-is: 18.2.0
 
   /pretty-ms/7.0.1:
     resolution: {integrity: sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==}
@@ -6941,6 +7916,7 @@ packages:
       is-core-module: 2.9.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
+    dev: true
 
   /resolve/1.22.1:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
@@ -6949,7 +7925,6 @@ packages:
       is-core-module: 2.9.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
-    dev: false
 
   /resolve/2.0.0-next.3:
     resolution: {integrity: sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==}
@@ -6980,6 +7955,7 @@ packages:
     hasBin: true
     dependencies:
       glob: 7.2.0
+    dev: true
 
   /rollup/2.77.0:
     resolution: {integrity: sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==}
@@ -7034,9 +8010,9 @@ packages:
       source-map-js: 1.0.2
     dev: false
 
-  /saxes/5.0.1:
-    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
-    engines: {node: '>=10'}
+  /saxes/6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
     dependencies:
       xmlchars: 2.2.0
     dev: true
@@ -7366,9 +8342,6 @@ packages:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
     dev: true
 
-  /throat/6.0.1:
-    resolution: {integrity: sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==}
-
   /through/2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
@@ -7440,30 +8413,34 @@ packages:
     engines: {node: 10.* || >= 12.*}
     dev: true
 
-  /ts-jest/28.0.5_c4h4g76dcvkfgjwf6rprlfxfli:
-    resolution: {integrity: sha512-Sx9FyP9pCY7pUzQpy4FgRZf2bhHY3za576HMKJFs+OnQ9jS96Du5vNsDKkyedQkik+sEabbKAnCliv9BEsHZgQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /ts-jest/29.0.0_2zqe2lz5fp2msj34ct3vkutym4:
+    resolution: {integrity: sha512-OxUaigbv5Aon3OMLY9HBtwkGMs1upWE/URrmmVQFzzOcGlEPVuWzGmXUIkWGt/95Dj/T6MGuTrHHGL6kT6Yn8g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
       '@babel/core': '>=7.0.0-beta.0 <8'
-      babel-jest: ^28.0.0
+      '@jest/types': ^29.0.0
+      babel-jest: ^29.0.0
       esbuild: '*'
-      jest: ^28.0.0
+      jest: ^29.0.0
       typescript: '>=4.3'
     peerDependenciesMeta:
       '@babel/core':
         optional: true
+      '@jest/types':
+        optional: true
       babel-jest:
         optional: true
       esbuild:
         optional: true
     dependencies:
       '@babel/core': 7.18.2
-      babel-jest: 28.1.1_@babel+core@7.18.2
+      '@jest/types': 29.0.3
+      babel-jest: 29.0.3_@babel+core@7.18.2
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
-      jest: 28.1.1_yqiaopbgmqcuvx27p5xxvum6wm
-      jest-util: 28.1.1
+      jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
+      jest-util: 29.0.3
       json5: 2.2.1
       lodash.memoize: 4.1.2
       make-error: 1.3.6
@@ -7684,7 +8661,7 @@ packages:
     resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
     engines: {node: '>=10.12.0'}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.15
       '@types/istanbul-lib-coverage': 2.0.3
       convert-source-map: 1.7.0
 
@@ -7788,14 +8765,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /whatwg-url/10.0.0:
-    resolution: {integrity: sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==}
-    engines: {node: '>=12'}
-    dependencies:
-      tr46: 3.0.0
-      webidl-conversions: 7.0.0
-    dev: true
-
   /whatwg-url/11.0.0:
     resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
     engines: {node: '>=12'}
@@ -7949,6 +8918,10 @@ packages:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
 
+  /yocto-queue/0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
   /yup/0.32.11:
     resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
     engines: {node: '>=10'}

From 38c8a43bc47e9ceae73fbbeb2ed6476560c384ba Mon Sep 17 00:00:00 2001
From: Kris-K-Dev <92114648+Kris-K-Dev@users.noreply.github.com>
Date: Mon, 12 Sep 2022 21:04:26 -0500
Subject: [PATCH 152/734] Manage broker configs (#2489)

* #712 broker configs page

* #712 add tests

* #712 broker configs page new updates and code review

* #712 fix ui issue

* #712 code review fix

* #712 null as string fix

* #712 eslint warning fix

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/Brokers/Broker/Broker.tsx  | 15 +++-
 .../Brokers/Broker/Configs/Configs.styled.ts  | 26 ++++++
 .../Brokers/Broker/Configs/Configs.tsx        | 81 +++++++++++++++++
 .../Brokers/Broker/Configs/InputCell.tsx      | 86 +++++++++++++++++++
 .../Broker/Configs/__test__/Configs.spec.tsx  | 70 +++++++++++++++
 .../components/common/Icons/CancelIcon.tsx    | 30 +++++++
 .../components/common/Icons/CheckmarkIcon.tsx | 30 +++++++
 .../src/components/common/Icons/EditIcon.tsx  | 40 +++++++++
 .../components/common/Input/Input.styled.ts   | 12 ++-
 .../src/lib/fixtures/brokers.ts               | 81 ++++++++++++++++-
 .../src/lib/hooks/api/brokers.ts              | 45 +++++++++-
 kafka-ui-react-app/src/lib/paths.ts           | 11 +++
 12 files changed, 522 insertions(+), 5 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
 create mode 100644 kafka-ui-react-app/src/components/Brokers/Broker/Configs/__test__/Configs.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/CancelIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/CheckmarkIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index fbe5fc432d6..fcad7423f39 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -6,9 +6,11 @@ import useAppParams from 'lib/hooks/useAppParams';
 import {
   clusterBrokerMetricsPath,
   clusterBrokerMetricsRelativePath,
+  clusterBrokerConfigsPath,
   ClusterBrokerParam,
   clusterBrokerPath,
   clusterBrokersPath,
+  clusterBrokerConfigsRelativePath,
 } from 'lib/paths';
 import { useClusterStats } from 'lib/hooks/api/clusters';
 import { useBrokers } from 'lib/hooks/api/brokers';
@@ -18,6 +20,8 @@ import BrokerMetrics from 'components/Brokers/Broker/BrokerMetrics/BrokerMetrics
 import Navbar from 'components/common/Navigation/Navbar.styled';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 
+import Configs from './Configs/Configs';
+
 const Broker: React.FC = () => {
   const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
 
@@ -58,6 +62,12 @@ const Broker: React.FC = () => {
         >
           Log directories
         </NavLink>
+        <NavLink
+          to={clusterBrokerConfigsPath(clusterName, brokerId)}
+          className={({ isActive }) => (isActive ? 'is-active' : '')}
+        >
+          Configs
+        </NavLink>
         <NavLink
           to={clusterBrokerMetricsPath(clusterName, brokerId)}
           className={({ isActive }) => (isActive ? 'is-active' : '')}
@@ -65,10 +75,13 @@ const Broker: React.FC = () => {
           Metrics
         </NavLink>
       </Navbar>
-
       <Suspense fallback={<PageLoader />}>
         <Routes>
           <Route index element={<BrokerLogdir />} />
+          <Route
+            path={clusterBrokerConfigsRelativePath}
+            element={<Configs />}
+          />
           <Route
             path={clusterBrokerMetricsRelativePath}
             element={<BrokerMetrics />}
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts
new file mode 100644
index 00000000000..a49bcf5d7d9
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts
@@ -0,0 +1,26 @@
+import styled from 'styled-components';
+
+export const ValueWrapper = styled.div`
+  display: flex;
+  justify-content: space-between;
+  button {
+    margin: 0 10px;
+  }
+`;
+
+export const Value = styled.span`
+  line-height: 24px;
+  margin-right: 10px;
+  text-overflow: ellipsis;
+  width: 600px;
+  overflow: hidden;
+  white-space: nowrap;
+`;
+
+export const ButtonsWrapper = styled.div`
+  display: flex;
+`;
+export const SearchWrapper = styled.div`
+  margin: 10px;
+  width: 21%;
+`;
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
new file mode 100644
index 00000000000..9346857a45c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import { CellContext, ColumnDef } from '@tanstack/react-table';
+import { ClusterBrokerParam } from 'lib/paths';
+import useAppParams from 'lib/hooks/useAppParams';
+import {
+  useBrokerConfig,
+  useUpdateBrokerConfigByName,
+} from 'lib/hooks/api/brokers';
+import Table from 'components/common/NewTable';
+import { BrokerConfig, ConfigSource } from 'generated-sources';
+import Search from 'components/common/Search/Search';
+
+import InputCell from './InputCell';
+import * as S from './Configs.styled';
+
+const Configs: React.FC = () => {
+  const [keyword, setKeyword] = React.useState('');
+  const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
+  const { data = [] } = useBrokerConfig(clusterName, Number(brokerId));
+  const stateMutation = useUpdateBrokerConfigByName(
+    clusterName,
+    Number(brokerId)
+  );
+
+  const getData = () => {
+    return data
+      .filter((item) => item.name.toLocaleLowerCase().indexOf(keyword) > -1)
+      .sort((a, b) => {
+        if (a.source === b.source) return 0;
+
+        return a.source === ConfigSource.DYNAMIC_BROKER_CONFIG ? -1 : 1;
+      });
+  };
+
+  const dataSource = React.useMemo(() => getData(), [data, keyword]);
+
+  const renderCell = (props: CellContext<BrokerConfig, unknown>) => (
+    <InputCell
+      {...props}
+      onUpdate={(name: string, value: string | null) => {
+        stateMutation.mutateAsync({
+          name,
+          brokerConfigItem: {
+            value,
+          },
+        });
+      }}
+    />
+  );
+
+  const columns = React.useMemo<ColumnDef<BrokerConfig>[]>(
+    () => [
+      { header: 'Key', accessorKey: 'name' },
+      {
+        header: 'Value',
+        accessorKey: 'value',
+        cell: renderCell,
+      },
+      {
+        header: 'Source',
+        accessorKey: 'source',
+      },
+    ],
+    []
+  );
+
+  return (
+    <>
+      <S.SearchWrapper>
+        <Search
+          handleSearch={setKeyword}
+          placeholder="Search by Key"
+          value={keyword}
+        />
+      </S.SearchWrapper>
+      <Table columns={columns} data={dataSource} />
+    </>
+  );
+};
+
+export default Configs;
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
new file mode 100644
index 00000000000..3a164159e11
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
@@ -0,0 +1,86 @@
+import React, { useEffect } from 'react';
+import { CellContext } from '@tanstack/react-table';
+import CheckmarkIcon from 'components/common/Icons/CheckmarkIcon';
+import EditIcon from 'components/common/Icons/EditIcon';
+import CancelIcon from 'components/common/Icons/CancelIcon';
+import { useConfirm } from 'lib/hooks/useConfirm';
+import { BrokerConfig } from 'generated-sources';
+import { Button } from 'components/common/Button/Button';
+import Input from 'components/common/Input/Input';
+
+import * as S from './Configs.styled';
+
+interface InputCellProps extends CellContext<BrokerConfig, unknown> {
+  onUpdate: (name: string, value: string | null) => void;
+}
+
+const InputCell: React.FC<InputCellProps> = ({ row, getValue, onUpdate }) => {
+  const initialValue = `${getValue<string | number>()}`;
+  const [isEdit, setIsEdit] = React.useState(false);
+  const [value, setValue] = React.useState(initialValue);
+
+  const confirm = useConfirm();
+
+  const onSave = () => {
+    if (value !== initialValue) {
+      confirm('Are you sure you want to change the value?', async () => {
+        onUpdate(row?.original?.name, value || null);
+      });
+    }
+    setIsEdit(false);
+  };
+
+  useEffect(() => {
+    setValue(initialValue);
+  }, [initialValue]);
+
+  return isEdit ? (
+    <S.ValueWrapper>
+      <Input
+        type="text"
+        inputSize="S"
+        value={value}
+        aria-label="inputValue"
+        onChange={({ target }) => setValue(target?.value)}
+      />
+      <S.ButtonsWrapper>
+        <Button
+          buttonType="primary"
+          buttonSize="S"
+          aria-label="confirmAction"
+          onClick={onSave}
+        >
+          <CheckmarkIcon /> Save
+        </Button>
+        <Button
+          buttonType="primary"
+          buttonSize="S"
+          aria-label="cancelAction"
+          onClick={() => setIsEdit(false)}
+        >
+          <CancelIcon /> Cancel
+        </Button>
+      </S.ButtonsWrapper>
+    </S.ValueWrapper>
+  ) : (
+    <S.ValueWrapper
+      style={
+        row?.original?.source === 'DYNAMIC_BROKER_CONFIG'
+          ? { fontWeight: 600 }
+          : { fontWeight: 400 }
+      }
+    >
+      <S.Value>{initialValue}</S.Value>
+      <Button
+        buttonType="primary"
+        buttonSize="S"
+        aria-label="editAction"
+        onClick={() => setIsEdit(true)}
+      >
+        <EditIcon /> Edit
+      </Button>
+    </S.ValueWrapper>
+  );
+};
+
+export default InputCell;
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/__test__/Configs.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/__test__/Configs.spec.tsx
new file mode 100644
index 00000000000..500e65cfdc6
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/__test__/Configs.spec.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { screen } from '@testing-library/dom';
+import { render, WithRoute } from 'lib/testHelpers';
+import { clusterBrokerConfigsPath } from 'lib/paths';
+import { useBrokerConfig } from 'lib/hooks/api/brokers';
+import { brokerConfigPayload } from 'lib/fixtures/brokers';
+import Configs from 'components/Brokers/Broker/Configs/Configs';
+import userEvent from '@testing-library/user-event';
+import { act } from '@testing-library/react';
+
+const clusterName = 'Cluster_Name';
+const brokerId = 'Broker_Id';
+
+jest.mock('lib/hooks/api/brokers', () => ({
+  useBrokerConfig: jest.fn(),
+  useUpdateBrokerConfigByName: jest.fn(),
+}));
+
+describe('Configs', () => {
+  const renderComponent = () => {
+    const path = clusterBrokerConfigsPath(clusterName, brokerId);
+    return render(
+      <WithRoute path={clusterBrokerConfigsPath()}>
+        <Configs />
+      </WithRoute>,
+      { initialEntries: [path] }
+    );
+  };
+
+  beforeEach(() => {
+    (useBrokerConfig as jest.Mock).mockImplementation(() => ({
+      data: brokerConfigPayload,
+    }));
+    renderComponent();
+  });
+
+  it('renders configs table', async () => {
+    expect(screen.getByRole('table')).toBeInTheDocument();
+    expect(screen.getAllByRole('row').length).toEqual(
+      brokerConfigPayload.length + 1
+    );
+  });
+
+  it('updates textbox value', async () => {
+    await act(() => {
+      userEvent.click(screen.getAllByLabelText('editAction')[0]);
+    });
+
+    const textbox = screen.getByLabelText('inputValue');
+    expect(textbox).toBeInTheDocument();
+    expect(textbox).toHaveValue('producer');
+
+    await userEvent.type(textbox, 'new value');
+
+    expect(
+      screen.getByRole('button', { name: 'confirmAction' })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole('button', { name: 'cancelAction' })
+    ).toBeInTheDocument();
+
+    await act(() => {
+      userEvent.click(screen.getByRole('button', { name: 'confirmAction' }));
+    });
+
+    expect(
+      screen.getByText('Are you sure you want to change the value?')
+    ).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/common/Icons/CancelIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/CancelIcon.tsx
new file mode 100644
index 00000000000..2bf87b4b2e1
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/CancelIcon.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+
+const CancelIcon: React.FC = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 64 64"
+      width="12"
+      height="12"
+      aria-labelledby="title"
+      aria-describedby="desc"
+      role="img"
+    >
+      <title>Cancel</title>
+      <desc>A line styled icon from Orion Icon Library.</desc>
+      <path
+        data-name="layer1"
+        d="M53.122 48.88L36.243 32l16.878-16.878a3 3 0 0 0-4.242-4.242L32 27.758l-16.878-16.88a3 3 0 0 0-4.243 4.243l16.878 16.88-16.88 16.88a3 3 0 0 0 4.243 4.241L32 36.243l16.878 16.88a3 3 0 0 0 4.244-4.243z"
+        fill="none"
+        stroke="#202020"
+        strokeMiterlimit="10"
+        strokeWidth="2"
+        strokeLinejoin="round"
+        strokeLinecap="round"
+      />
+    </svg>
+  );
+};
+
+export default CancelIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/CheckmarkIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/CheckmarkIcon.tsx
new file mode 100644
index 00000000000..864334db1a7
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/CheckmarkIcon.tsx
@@ -0,0 +1,30 @@
+import React, { FC } from 'react';
+
+const CheckmarkIcon: FC = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 64 64"
+      width="12"
+      height="12"
+      aria-labelledby="title"
+      aria-describedby="desc"
+      role="img"
+    >
+      <title>Checkmark</title>
+      <desc>A line styled icon from Orion Icon Library.</desc>
+      <path
+        data-name="layer1"
+        fill="none"
+        stroke="#202020"
+        strokeMiterlimit="10"
+        strokeWidth="2"
+        d="M2 30l21 22 39-40"
+        strokeLinejoin="round"
+        strokeLinecap="round"
+      />
+    </svg>
+  );
+};
+
+export default CheckmarkIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx
new file mode 100644
index 00000000000..baac2603593
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx
@@ -0,0 +1,40 @@
+import React, { FC } from 'react';
+
+const EditIcon: FC = () => {
+  return (
+    <svg
+      viewBox="0 0 64 64"
+      width="12"
+      height="12"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-labelledby="title"
+      aria-describedby="desc"
+      role="img"
+    >
+      <title>Edit</title>
+      <desc>A line styled icon from Orion Icon Library.</desc>
+      <path
+        d="M54.368 17.674l6.275-6.267-8.026-8.025-6.274 6.267"
+        strokeWidth="2"
+        strokeMiterlimit="10"
+        stroke="#202020"
+        fill="none"
+        data-name="layer2"
+        strokeLinejoin="round"
+        strokeLinecap="round"
+      />
+      <path
+        d="M17.766 54.236l36.602-36.562-8.025-8.025L9.74 46.211 3.357 60.618l14.409-6.382zM9.74 46.211l8.026 8.025"
+        strokeWidth="2"
+        strokeMiterlimit="10"
+        stroke="#202020"
+        fill="none"
+        data-name="layer1"
+        strokeLinejoin="round"
+        strokeLinecap="round"
+      />
+    </svg>
+  );
+};
+
+export default EditIcon;
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
index b0abef0d797..06a69d7dde8 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
@@ -1,10 +1,16 @@
 import styled, { css } from 'styled-components';
 
 export interface InputProps {
-  inputSize?: 'M' | 'L';
+  inputSize?: 'S' | 'M' | 'L';
   hasLeftIcon: boolean;
 }
 
+const INPUT_SIZES = {
+  S: '24px',
+  M: '32px',
+  L: '40px',
+};
+
 export const Wrapper = styled.div`
   position: relative;
 
@@ -25,7 +31,9 @@ export const Input = styled.input<InputProps>(
   ({ theme: { input }, inputSize, hasLeftIcon }) => css`
     border: 1px ${input.borderColor.normal} solid;
     border-radius: 4px;
-    height: ${inputSize === 'M' ? '32px' : '40px'};
+    height: ${inputSize && INPUT_SIZES[inputSize]
+      ? INPUT_SIZES[inputSize]
+      : '40px'};
     width: 100%;
     padding-left: ${hasLeftIcon ? '36px' : '12px'};
     font-size: 14px;
diff --git a/kafka-ui-react-app/src/lib/fixtures/brokers.ts b/kafka-ui-react-app/src/lib/fixtures/brokers.ts
index fb718e560d5..8999bd2f814 100644
--- a/kafka-ui-react-app/src/lib/fixtures/brokers.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/brokers.ts
@@ -1,4 +1,4 @@
-import { BrokersLogdirs } from 'generated-sources';
+import { BrokerConfig, BrokersLogdirs, ConfigSource } from 'generated-sources';
 
 export const brokersPayload = [
   { id: 1, host: 'b-1.test.kafka.amazonaws.com', port: 9092 },
@@ -37,3 +37,82 @@ export const brokerLogDirsPayload: BrokersLogdirs[] = [
     name: '/opt/kafka/data-1/logs',
   },
 ];
+
+export const brokerConfigPayload: BrokerConfig[] = [
+  {
+    name: 'compression.type',
+    value: 'producer',
+    source: ConfigSource.DYNAMIC_BROKER_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [
+      {
+        name: 'compression.type',
+        value: 'producer',
+        source: ConfigSource.DYNAMIC_BROKER_CONFIG,
+      },
+      {
+        name: 'compression.type',
+        value: 'producer',
+        source: ConfigSource.DEFAULT_CONFIG,
+      },
+    ],
+  },
+  {
+    name: 'confluent.value.schema.validation',
+    value: 'false',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [],
+  },
+  {
+    name: 'leader.replication.throttled.replicas',
+    value: '',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [],
+  },
+  {
+    name: 'confluent.key.subject.name.strategy',
+    value: 'io.confluent.kafka.serializers.subject.TopicNameStrategy',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [],
+  },
+  {
+    name: 'message.downconversion.enable',
+    value: 'true',
+    source: ConfigSource.DEFAULT_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [
+      {
+        name: 'log.message.downconversion.enable',
+        value: 'true',
+        source: ConfigSource.DEFAULT_CONFIG,
+      },
+    ],
+  },
+  {
+    name: 'min.insync.replicas',
+    value: '1',
+    source: ConfigSource.DYNAMIC_BROKER_CONFIG,
+    isSensitive: false,
+    isReadOnly: false,
+    synonyms: [
+      {
+        name: 'min.insync.replicas',
+        value: '1',
+        source: ConfigSource.DYNAMIC_BROKER_CONFIG,
+      },
+      {
+        name: 'min.insync.replicas',
+        value: '1',
+        source: ConfigSource.DEFAULT_CONFIG,
+      },
+    ],
+  },
+];
diff --git a/kafka-ui-react-app/src/lib/hooks/api/brokers.ts b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
index 3b7af3f7426..60a2d26e9b3 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
@@ -1,7 +1,14 @@
 import { brokersApiClient as api } from 'lib/api';
-import { useQuery } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { ClusterName } from 'redux/interfaces';
 
+interface UpdateBrokerConfigProps {
+  name: string;
+  brokerConfigItem: {
+    value: string | null;
+  };
+}
+
 export function useBrokers(clusterName: ClusterName) {
   return useQuery(
     ['clusters', clusterName, 'brokers'],
@@ -31,3 +38,39 @@ export function useBrokerLogDirs(clusterName: ClusterName, brokerId: number) {
       })
   );
 }
+
+export function useBrokerConfig(clusterName: ClusterName, brokerId: number) {
+  return useQuery(
+    ['clusters', clusterName, 'brokers', brokerId, 'settings'],
+    () =>
+      api.getBrokerConfig({
+        clusterName,
+        id: brokerId,
+      })
+  );
+}
+
+export function useUpdateBrokerConfigByName(
+  clusterName: ClusterName,
+  brokerId: number
+) {
+  const client = useQueryClient();
+  return useMutation(
+    (payload: UpdateBrokerConfigProps) =>
+      api.updateBrokerConfigByName({
+        ...payload,
+        clusterName,
+        id: brokerId,
+      }),
+    {
+      onSuccess: () =>
+        client.invalidateQueries([
+          'clusters',
+          clusterName,
+          'brokers',
+          brokerId,
+          'settings',
+        ]),
+    }
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 67dea375800..8fb14ad0881 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -32,6 +32,8 @@ export type ClusterNameRoute = { clusterName: ClusterName };
 // Brokers
 export const clusterBrokerRelativePath = 'brokers';
 export const clusterBrokerMetricsRelativePath = 'metrics';
+export const clusterBrokerConfigsRelativePath = 'configs';
+
 export const clusterBrokersPath = (
   clusterName: ClusterName = RouteParams.clusterName
 ) => `${clusterPath(clusterName)}/${clusterBrokerRelativePath}`;
@@ -49,6 +51,15 @@ export const clusterBrokerMetricsPath = (
     brokerId
   )}/${clusterBrokerMetricsRelativePath}`;
 
+export const clusterBrokerConfigsPath = (
+  clusterName: ClusterName = RouteParams.clusterName,
+  brokerId: Broker['id'] | string = RouteParams.brokerId
+) =>
+  `${clusterBrokerPath(
+    clusterName,
+    brokerId
+  )}/${clusterBrokerConfigsRelativePath}`;
+
 export type ClusterBrokerParam = {
   clusterName: ClusterName;
   brokerId: string;

From ee92ea47cb5153de68c573761b00f158e3349b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mau=20Rodr=C3=ADguez=20Morales?=
 <3047213+yvaeltercero@users.noreply.github.com>
Date: Tue, 13 Sep 2022 10:58:19 -0600
Subject: [PATCH 153/734] Issue 2304: applying fix for saved filters cancel
 navigation issue (#2482)

* Issue 2304: applying fix for saved filters cancel navigation issue

* Addressing unit test warnings

Co-authored-by: Mau Rodriguez Morales <mrodriguezmorales@provectus.com>
Co-authored-by: Kristina Kiparoidze <kkiparoidze@provectus.com>
Co-authored-by: Kris-K-Dev <92114648+Kris-K-Dev@users.noreply.github.com>
---
 .../Topic/Messages/Filters/AddFilter.tsx       | 12 +++++++-----
 .../Topic/Messages/Filters/FilterModal.tsx     |  7 +++++++
 .../Filters/__tests__/AddFilter.spec.tsx       | 18 ++++++++----------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
index 510fcd03590..0ff1fd1d896 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
@@ -18,6 +18,8 @@ export interface FilterModalProps {
   activeFilterHandler(activeFilter: MessageFilters, index: number): void;
   toggleEditModal(): void;
   editFilter(value: FilterEdit): void;
+  isSavedFiltersOpen: boolean;
+  onClickSavedFilters(newValue: boolean): void;
   activeFilter?: MessageFilters;
 }
 
@@ -33,10 +35,10 @@ const AddFilter: React.FC<FilterModalProps> = ({
   activeFilterHandler,
   toggleEditModal,
   editFilter,
+  isSavedFiltersOpen,
+  onClickSavedFilters,
   activeFilter,
 }) => {
-  const [savedFilterState, setSavedFilterState] =
-    React.useState<boolean>(false);
   const { isOpen, toggle } = useModal();
 
   const onSubmit = React.useCallback(
@@ -71,12 +73,12 @@ const AddFilter: React.FC<FilterModalProps> = ({
           {isOpen && <InfoModal toggleIsOpen={toggle} />}
         </div>
       </S.FilterTitle>
-      {savedFilterState ? (
+      {isSavedFiltersOpen ? (
         <SavedFilters
           deleteFilter={deleteFilter}
           activeFilterHandler={activeFilterHandler}
           closeModal={toggleIsOpen}
-          onGoBack={() => setSavedFilterState(false)}
+          onGoBack={() => onClickSavedFilters(!onClickSavedFilters)}
           filters={filters}
           onEdit={(index: number, filter: MessageFilters) => {
             toggleEditModal();
@@ -87,7 +89,7 @@ const AddFilter: React.FC<FilterModalProps> = ({
       ) : (
         <>
           <S.SavedFiltersTextContainer
-            onClick={() => setSavedFilterState(true)}
+            onClick={() => onClickSavedFilters(!isSavedFiltersOpen)}
           >
             <SavedIcon /> <S.SavedFiltersText>Saved Filters</S.SavedFiltersText>
           </S.SavedFiltersTextContainer>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
index 18c4624e93d..88e5adbcae6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
@@ -29,9 +29,13 @@ const FilterModal: React.FC<FilterModalProps> = ({
   activeFilter,
 }) => {
   const [addFilterModal, setAddFilterModal] = React.useState<boolean>(true);
+  const [isSavedFiltersOpen, setIsSavedFiltersOpen] =
+    React.useState<boolean>(false);
+
   const toggleEditModal = () => {
     setAddFilterModal(!addFilterModal);
   };
+
   const [editFilter, setEditFilter] = React.useState<FilterEdit>({
     index: -1,
     filter: { name: '', code: '' },
@@ -40,6 +44,7 @@ const FilterModal: React.FC<FilterModalProps> = ({
     setEditFilter(value);
     setAddFilterModal(!addFilterModal);
   };
+
   return (
     <S.MessageFilterModal data-testid="messageFilterModal">
       {addFilterModal ? (
@@ -51,6 +56,8 @@ const FilterModal: React.FC<FilterModalProps> = ({
           activeFilterHandler={activeFilterHandler}
           toggleEditModal={toggleEditModal}
           editFilter={editFilterHandler}
+          isSavedFiltersOpen={isSavedFiltersOpen}
+          onClickSavedFilters={() => setIsSavedFiltersOpen(!isSavedFiltersOpen)}
           activeFilter={activeFilter}
         />
       ) : (
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
index f9c8fe3f1e1..0c12fd33436 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
@@ -22,8 +22,10 @@ const renderComponent = (props: Partial<FilterModalProps> = {}) =>
       deleteFilter={jest.fn()}
       activeFilterHandler={jest.fn()}
       toggleEditModal={jest.fn()}
+      onClickSavedFilters={jest.fn()}
       editFilter={editFilterMock}
       filters={props.filters || filters}
+      isSavedFiltersOpen={false}
       {...props}
     />
   );
@@ -38,8 +40,8 @@ describe('AddFilter component', () => {
 
     it('should test click on Saved Filters redirects to Saved components', () => {
       userEvent.click(screen.getByRole('savedFilterText'));
-      expect(screen.getByText('Saved filters')).toBeInTheDocument();
-      expect(screen.getAllByRole('savedFilter')).toHaveLength(2);
+      expect(screen.getByText('Saved Filters')).toBeInTheDocument();
+      expect(screen.getByRole('savedFilterText')).toBeInTheDocument();
     });
 
     it('info button to be in the document', () => {
@@ -54,16 +56,9 @@ describe('AddFilter component', () => {
       ).toBeInTheDocument();
     });
 
-    it('should test click on return to custom filter redirects to Add filters', async () => {
+    it('should test click on return to custom filter redirects to Saved Filters', async () => {
       userEvent.click(screen.getByRole('savedFilterText'));
 
-      expect(screen.getByText('Saved filters')).toBeInTheDocument();
-      expect(screen.queryByRole('savedFilterText')).not.toBeInTheDocument();
-      expect(screen.getAllByRole('savedFilter')).toHaveLength(2);
-
-      await act(() =>
-        userEvent.click(screen.getByText(/back to custom filters/i))
-      );
       expect(screen.queryByText('Saved filters')).not.toBeInTheDocument();
       expect(screen.getByRole('savedFilterText')).toBeInTheDocument();
     });
@@ -112,6 +107,9 @@ describe('AddFilter component', () => {
     });
 
     it('calls editFilter when edit button is clicked in saved filters', async () => {
+      await act(() => {
+        renderComponent({ isSavedFiltersOpen: true });
+      });
       userEvent.click(screen.getByText('Saved Filters'));
       const index = 0;
       const editButton = screen.getAllByText('Edit')[index];

From df2b2e01deb1f7896e634c53ef8082c87978e472 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Wed, 14 Sep 2022 13:16:28 +0400
Subject: [PATCH 154/734] fix kubeval (#2505)

* fix kubeval

* fix kubeval

* fix kubeval

* fix issue with hpa

* fix version to 1.24.0

* fix 1.25
---
 charts/kafka-ui/templates/hpa.yaml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/charts/kafka-ui/templates/hpa.yaml b/charts/kafka-ui/templates/hpa.yaml
index 1509ef3f010..1cc131c9e91 100644
--- a/charts/kafka-ui/templates/hpa.yaml
+++ b/charts/kafka-ui/templates/hpa.yaml
@@ -1,5 +1,11 @@
 {{- if .Values.autoscaling.enabled }}
+{{- $kubeCapabilityVersion := semver .Capabilities.KubeVersion.Version -}}
+{{- $isHigher1p25 := ge (semver "1.25" | $kubeCapabilityVersion.Compare) 0 -}}
+{{- if and ($.Capabilities.APIVersions.Has "autoscaling/v2") $isHigher1p25 -}}
+apiVersion: autoscaling/v2
+{{- else  }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "kafka-ui.fullname" . }}
@@ -17,12 +23,24 @@ spec:
     - type: Resource
       resource:
         name: cpu
+  {{- if  $isHigher1p25 }}
+        target:
+         type: Utilization
+         averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- else  }}        
         targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- end }}      
   {{- end }}
   {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
+  {{- if  $isHigher1p25 }}     
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  {{- else  }}   
         targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
   {{- end }}
+  {{- end }}
 {{- end }}

From ed8b84b4148680cc13b5dc3d1bbbfe3ae4acca66 Mon Sep 17 00:00:00 2001
From: Kris-K-Dev <92114648+Kris-K-Dev@users.noreply.github.com>
Date: Wed, 14 Sep 2022 09:20:41 -0500
Subject: [PATCH 155/734] Fix URL encoding upon retrieving schemas (#2567)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx
index aa6b2e826ce..b6ca656d1d1 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx
@@ -7,7 +7,7 @@ const LinkCell: React.FC<CellContext<any, unknown>> = ({ getValue }) => {
   const value = `${getValue<string | number>()}`;
   const handleClick: React.MouseEventHandler = (e) => e.stopPropagation();
   return (
-    <NavLink to={value} title={value} onClick={handleClick}>
+    <NavLink to={encodeURIComponent(value)} title={value} onClick={handleClick}>
       {value}
     </NavLink>
   );

From 9f32abcd09255860ff9c158434be64cade862228 Mon Sep 17 00:00:00 2001
From: Jibin Philipose <philiposejibin@gmail.com>
Date: Thu, 15 Sep 2022 06:08:05 +0530
Subject: [PATCH 156/734] New documentation for building and running without
 docker (#2574)

* New documentation for building and running without docker and some doc fixes and additions.

* Improvements in docs

* spell fix

* improvements in docs

* minor modification

* improvements
---
 README.md                                     | 56 ++++++++++++-------
 documentation/compose/kafka-ssl.yml           |  8 ++-
 .../building-and-running-without-docker.md    | 24 ++++++++
 .../project/contributing/building.md          | 15 +++--
 .../project/contributing/prerequisites.md     |  8 ++-
 .../src/main/resources/application-local.yml  |  2 +
 6 files changed, 78 insertions(+), 35 deletions(-)
 create mode 100644 documentation/project/contributing/building-and-running-without-docker.md

diff --git a/README.md b/README.md
index 332eb1f38e2..c3b1be9a3e7 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@
 Looking for the help of Kafka experts? Provectus can help you design, build, deploy, and manage Apache Kafka clusters and streaming applications. Discover [Professional Services for Apache Kafka](https://provectus.com/professional-services-apache-kafka/), to unlock the full potential of Kafka in your enteprise! </em>
 
 
-#### UI for Apache Kafka is a free, open-source web UI to monitor and manage Apache Kafka clusters. 
+#### UI for Apache Kafka is a free, open-source web UI to monitor and manage Apache Kafka clusters.
 
-UI for Apache Kafka is a simple tool that makes your data flows observable, helps find and troubleshoot issues faster and deliver optimal performance. Its lightweight dashboard makes it easy to track key metrics of your Kafka clusters - Brokers, Topics, Partitions, Production, and Consumption. 
+UI for Apache Kafka is a simple tool that makes your data flows observable, helps find and troubleshoot issues faster and deliver optimal performance. Its lightweight dashboard makes it easy to track key metrics of your Kafka clusters - Brokers, Topics, Partitions, Production, and Consumption.
 
-Set up UI for Apache Kafka with just a couple of easy commands to visualize your Kafka data in a comprehensible way. You can run the tool locally or in 
-the cloud. 
+Set up UI for Apache Kafka with just a couple of easy commands to visualize your Kafka data in a comprehensible way. You can run the tool locally or in
+the cloud.
 
 ![Interface](documentation/images/Interface.gif)
 
@@ -30,20 +30,20 @@ the cloud.
 * **Browse Messages** — browse messages with JSON, plain text, and Avro encoding
 * **Dynamic Topic Configuration** — create and configure new topics with dynamic configuration
 * **Configurable Authentification** — secure your installation with optional Github/Gitlab/Google OAuth 2.0
- 
+
 # The Interface
 UI for Apache Kafka wraps major functions of Apache Kafka with an intuitive user interface.
 
 ![Interface](documentation/images/Interface.gif)
 
 ## Topics
-UI for Apache Kafka makes it easy for you to create topics in your browser by several clicks, 
+UI for Apache Kafka makes it easy for you to create topics in your browser by several clicks,
 pasting your own parameters, and viewing topics in the list.
 
 ![Create Topic](documentation/images/Create_topic_kafka-ui.gif)
 
 It's possible to jump from connectors view to corresponding topics and from a topic to consumers (back and forth) for more convenient navigation.
-connectors, overview topic settings. 
+connectors, overview topic settings.
 
 ![Connector_Topic_Consumer](documentation/images/Connector_Topic_Consumer.gif)
 
@@ -57,14 +57,14 @@ There are 3 supported types of schemas: Avro®, JSON Schema, and Protobuf schema
 
 ![Create Schema Registry](documentation/images/Create_schema.gif)
 
-Before producing avro-encoded messages, you have to add an avro schema for the topic in Schema Registry. Now all these steps are easy to do 
+Before producing avro-encoded messages, you have to add an avro schema for the topic in Schema Registry. Now all these steps are easy to do
 with a few clicks in a user-friendly interface.
 
 ![Avro Schema Topic](documentation/images/Schema_Topic.gif)
 
 # Getting Started
 
-To run UI for Apache Kafka, you can use a pre-built Docker image or build it locally.  
+To run UI for Apache Kafka, you can use a pre-built Docker image or build it locally.
 
 ## Configuration
 
@@ -94,7 +94,7 @@ kafka:
 #     schemaNameTemplate: "%s-value"
       jmxPort: 9997
     -
-```    
+```
 
 * `name`: cluster name
 * `bootstrapServers`: where to connect
@@ -116,12 +116,12 @@ Launch Docker container in the background:
 docker run -p 8080:8080 \
 	-e KAFKA_CLUSTERS_0_NAME=local \
 	-e KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092 \
-	-d provectuslabs/kafka-ui:latest 
+	-d provectuslabs/kafka-ui:latest
 
 ```
-Then access the web UI at [http://localhost:8080](http://localhost:8080).  
-Further configuration with environment variables - [see environment variables](#env_variables)  
- 
+Then access the web UI at [http://localhost:8080](http://localhost:8080).
+Further configuration with environment variables - [see environment variables](#env_variables)
+
 ### Docker Compose
 
 If you prefer to use `docker-compose` please refer to the [documentation](docker-compose.md).
@@ -135,19 +135,33 @@ Quick-start instruction [here](helm_chart.md)
 
 ### Prerequisites
 
-Check [software-required.md](documentation/project/contributing/software-required.md)
+Check [prerequisites.md](documentation/project/contributing/prerequisites.md)
 
 ### Building and Running
 
 Check [building.md](documentation/project/contributing/building.md)
 
+## Building Without Docker
+
+### Prerequisites
+
+[Prerequisites](documentation/project/contributing/prerequisites.md) will mostly remain the same with the exception of docker.
+
+### Running without Building
+
+[How to run quickly without building](documentation/project/contributing/building-and-running-without-docker.md#run_without_docker_quickly)
+
+### Building and Running
+
+[How to build and run](documentation/project/contributing/building-and-running-without-docker.md#build_and_run_without_docker)
+
 ## Liveliness and readiness probes
 Liveliness and readiness endpoint is at `/actuator/health`.
 Info endpoint (build info) is located at `/actuator/info`.
 
 ## <a name="env_variables"></a> Environment Variables
 
-Alternatively, each variable of the .yml file can be set with an environment variable. 
+Alternatively, each variable of the .yml file can be set with an environment variable.
 For example, if you want to use an environment variable to set the `name` parameter, you can write it like this: `KAFKA_CLUSTERS_2_NAME`
 
 |Name               	|Description
@@ -158,10 +172,10 @@ For example, if you want to use an environment variable to set the `name` parame
 |`SERVER_PORT` |Port for the embedded server. Default: `8080`
 |`KAFKA_ADMIN-CLIENT-TIMEOUT` | Kafka API timeout in ms. Default: `30000`
 |`KAFKA_CLUSTERS_0_NAME` | Cluster name
-|`KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS` 	|Address where to connect 
-|`KAFKA_CLUSTERS_0_KSQLDBSERVER` 	| KSQL DB server address 
-|`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_USERNAME` 	| KSQL DB server's basic authentication username 
-|`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_PASSWORD` 	| KSQL DB server's basic authentication password 
+|`KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS` 	|Address where to connect
+|`KAFKA_CLUSTERS_0_KSQLDBSERVER` 	| KSQL DB server address
+|`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_USERNAME` 	| KSQL DB server's basic authentication username
+|`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_PASSWORD` 	| KSQL DB server's basic authentication password
 |`KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL` 	|Security protocol to connect to the brokers. For SSL connection use "SSL", for plaintext connection don't set this environment variable
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRY`   	|SchemaRegistry's address
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME`   	|SchemaRegistry's basic authentication username
@@ -171,7 +185,7 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_READONLY`        	|Enable read-only mode. Default: false
 |`KAFKA_CLUSTERS_0_DISABLELOGDIRSCOLLECTION`        	|Disable collecting segments information. It should be true for confluent cloud. Default: false
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME` |Given name for the Kafka Connect cluster
-|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS` |Address of the Kafka Connect service endpoint 
+|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS` |Address of the Kafka Connect service endpoint
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_USERNAME`| Kafka Connect cluster's basic authentication username
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_PASSWORD`| Kafka Connect cluster's basic authentication password
 |`KAFKA_CLUSTERS_0_JMXSSL` |Enable SSL for JMX? `true` or `false`. For advanced setup, see `kafka-ui-jmx-secured.yml`
diff --git a/documentation/compose/kafka-ssl.yml b/documentation/compose/kafka-ssl.yml
index d257f738cce..2b6dae855ae 100644
--- a/documentation/compose/kafka-ssl.yml
+++ b/documentation/compose/kafka-ssl.yml
@@ -1,7 +1,6 @@
 ---
 version: '3.4'
 services:
-
   kafka-ui:
     container_name: kafka-ui
     image: provectuslabs/kafka-ui:latest
@@ -17,9 +16,12 @@ services:
       KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_LOCATION: /kafka.truststore.jks
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_PASSWORD: secret
-      KAFKA_CLUSTERS_0_PROPERTIES_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: "" # DISABLE COMMON NAME VERIFICATION
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_LOCATION: /kafka.keystore.jks
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_PASSWORD: secret
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # DISABLE COMMON NAME VERIFICATION
     volumes:
       - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
+      - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
 
   zookeeper0:
     image: confluentinc/cp-zookeeper:6.0.1
@@ -51,7 +53,7 @@ services:
       KAFKA_SSL_TRUSTSTORE_FILENAME: kafka.truststore.jks
       KAFKA_SSL_TRUSTSTORE_CREDENTIALS: creds
       #KAFKA_SSL_CLIENT_AUTH: 'required'
-      KAFKA_SSL_CLIENT_AUTH: "requested"
+      KAFKA_SSL_CLIENT_AUTH: 'requested'
       KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # COMMON NAME VERIFICATION IS DISABLED SERVER-SIDE
     volumes:
       - ./ssl/creds:/etc/kafka/secrets/creds
diff --git a/documentation/project/contributing/building-and-running-without-docker.md b/documentation/project/contributing/building-and-running-without-docker.md
new file mode 100644
index 00000000000..1f4d06a684e
--- /dev/null
+++ b/documentation/project/contributing/building-and-running-without-docker.md
@@ -0,0 +1,24 @@
+# Build & Run Without Docker
+
+Once you installed the prerequisites and cloned the repository, run the following steps in your project directory:
+
+## <a name="run_without_docker_quickly"></a> Running Without Docker Quickly
+
+- [Download the latest kafka-ui jar file](https://github.com/provectus/kafka-ui/releases)
+#### <a name="run_kafkaui_jar_file"></a> Execute the jar
+```sh
+java -Dspring.config.additional-location=<path-to-application-local.yml> -jar <path-to-kafka-ui-jar>
+```
+- Example of how to configure clusters in the [application-local.yml](https://github.com/provectus/kafka-ui/blob/master/kafka-ui-api/src/main/resources/application-local.yml) configuration file.
+
+## <a name="build_and_run_without_docker"></a> Building And Running Without Docker
+
+> **_NOTE:_**  If you want to get kafka-ui up and running locally quickly without building the jar file manually, then just follow [Running Without Docker Quickly](#run_without_docker_quickly)
+
+> Comment out `com.spotify` plugin in `kafka-ui-api` pom.xml
+
+- [Command to build the jar](./building.md#cmd_to_build_kafkaui_without_docker)
+
+> Once your build is successful and the jar file named kafka-ui-api-0.0.1-SNAPSHOT.jar is generated inside `kafka-ui-api/target`.
+
+- [Execute the jar](#run_kafkaui_jar_file)
diff --git a/documentation/project/contributing/building.md b/documentation/project/contributing/building.md
index 25462100e9a..67da155b3e2 100644
--- a/documentation/project/contributing/building.md
+++ b/documentation/project/contributing/building.md
@@ -15,19 +15,18 @@ Once you installed the prerequisites and cloned the repository, run the followin
 
 > ```docker build --platform linux/arm64 -t provectuslabs/kafka-ui:latest --build-arg JAR_FILE=kafka-ui-api-0.0.1-SNAPSHOT.jar .```
 
-
-- if you need to build the frontend `kafka-ui-react-app`, go here
-     - [kafka-ui-react-app-build-documentation](../../../kafka-ui-react-app/README.md)
-
 - Build a docker image with the app
 ```sh
 ./mvnw clean install -Pprod
 ```
+- if you need to build the frontend `kafka-ui-react-app`, go here
+     - [kafka-ui-react-app-build-documentation](../../../kafka-ui-react-app/README.md)
 
+<a name="cmd_to_build_kafkaui_without_docker"></a>
 - In case you want to build `kafka-ui-api` by skipping the tests
 ```sh
 ./mvnw clean install -Dmaven.test.skip=true -Pprod
-``` 
+```
 
 - To build only the `kafka-ui-api` you can use this command:
 ```sh
@@ -48,7 +47,7 @@ docker-compose -f ./documentation/compose/kafka-ui.yaml up -d
  - If you want to start only kafka clusters (to run the `kafka-ui` app via `spring-boot:run`):
 ```sh
 docker-compose -f ./documentation/compose/kafka-clusters-only.yaml up -d
-``` 
+```
 - Then start the app.
 ```sh
 ./mvnw spring-boot:run -Pprod
@@ -65,6 +64,6 @@ helm repo add kafka-ui https://provectus.github.io/kafka-ui
 helm install kafka-ui kafka-ui/kafka-ui
 ```
 To read more please follow to [chart documentation](../../../charts/kafka-ui/README.md).
- 
-## Step 4 : Access Kafka-UI
+
+## Step 3 : Access Kafka-UI
  - To see the `kafka-ui` app running, navigate to http://localhost:8080.
\ No newline at end of file
diff --git a/documentation/project/contributing/prerequisites.md b/documentation/project/contributing/prerequisites.md
index 24f032dbab6..fb21b352aa2 100644
--- a/documentation/project/contributing/prerequisites.md
+++ b/documentation/project/contributing/prerequisites.md
@@ -1,7 +1,7 @@
 ### Prerequisites
 
 This page explains how to get the software you need to use a Linux or macOS
-machine for local development. 
+machine for local development.
 
 Before you begin contributing you must have:
 
@@ -11,11 +11,12 @@ Before you begin contributing you must have:
 * `Docker`
 
 ### Installing prerequisites on macOS
+
 1. Install [brew](https://brew.sh/).
 2. Install brew cask:
 ```sh
 brew cask
-``` 
+```
 3. Install JDK 13 via Homebrew cask:
 ```sh
 brew tap adoptopenjdk/openjdk
@@ -29,9 +30,10 @@ Note : In case JAVA13 is not set as your default Java then you can consider to i
 ```sh
 export PATH="/Library/Java/JavaVirtualMachines/adoptopenjdk-13.jdk/Contents/Home/bin:$PATH
 ```
+
 ## Tips
 
-Consider allocating not less than 4GB of memory for your docker. 
+Consider allocating not less than 4GB of memory for your docker.
 Otherwise, some apps within a stack (e.g. `kafka-ui.yaml`) might crash.
 
 ## Where to go next
diff --git a/kafka-ui-api/src/main/resources/application-local.yml b/kafka-ui-api/src/main/resources/application-local.yml
index cef37e15dee..4f55ed49ccf 100644
--- a/kafka-ui-api/src/main/resources/application-local.yml
+++ b/kafka-ui-api/src/main/resources/application-local.yml
@@ -32,3 +32,5 @@ spring:
     enabled: true
 auth:
   type: DISABLED
+#server:
+#  port: 8080 #- Port in which kafka-ui will run.

From fc946a1dd1d34758eb35c7382595faaac1ab5cc1 Mon Sep 17 00:00:00 2001
From: Daniel Ching <110129035+daching-provectus@users.noreply.github.com>
Date: Wed, 14 Sep 2022 19:00:46 -0600
Subject: [PATCH 157/734] Handle error message for schemas (#2520)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../com/provectus/kafka/ui/service/SchemaRegistryService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
index 92603ba979e..2a3039b3fe4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
@@ -66,6 +66,7 @@ public class SchemaRegistryService {
 
   private static final String UNRECOGNIZED_FIELD_SCHEMA_TYPE = "Unrecognized field: schemaType";
   private static final String INCOMPATIBLE_WITH_AN_EARLIER_SCHEMA = "incompatible with an earlier schema";
+  private static final String INVALID_SCHEMA = "Invalid Schema";
 
   private final WebClient webClient;
 
@@ -237,7 +238,8 @@ private Mono<Throwable> getMonoError(ErrorResponse x) {
     } else if (isIncompatibleSchemaMessage(x.getMessage())) {
       return Mono.error(new SchemaCompatibilityException(x.getMessage()));
     } else {
-      return Mono.error(new UnprocessableEntityException(x.getMessage()));
+      log.error(x.getMessage());
+      return Mono.error(new UnprocessableEntityException(INVALID_SCHEMA));
     }
   }
 

From 6df2d0b602f416b5b90d306a8cc7125e37cb08ef Mon Sep 17 00:00:00 2001
From: Shubham Jain <shubhrjain7@gmail.com>
Date: Thu, 15 Sep 2022 06:37:45 +0530
Subject: [PATCH 158/734] Disable schemaType during schema edit (#2495)

* Disable schemaType during schema edit

Update Schema API documentation

closes #2197

* Apply suggestion


Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/main/resources/swagger/kafka-ui-api.yaml             | 5 ++++-
 kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index c603b9dcc90..f64d8ce4da7 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -898,7 +898,7 @@ paths:
     post:
       tags:
         - Schemas
-      summary: create a new subject schema
+      summary: create a new subject schema or update existing subject schema
       operationId: createNewSchema
       parameters:
         - name: clusterName
@@ -2594,6 +2594,7 @@ components:
 
     NewSchemaSubject:
       type: object
+      description: should be set for creating/updating schema subject
       properties:
         subject:
           type: string
@@ -2601,6 +2602,7 @@ components:
           type: string
         schemaType:
           $ref: '#/components/schemas/SchemaType'
+          description: upon updating a schema, the type of an existing schema can't be changed
       required:
         - subject
         - schema
@@ -2624,6 +2626,7 @@ components:
 
     SchemaType:
       type: string
+      description: upon updating a schema, the type of an existing schema can't be changed
       enum:
         - AVRO
         - JSON
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
index 01ab9802faf..a09f45a568c 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
@@ -124,7 +124,7 @@ const Edit: React.FC = () => {
                     value={schema.schemaType}
                     onChange={onChange}
                     minWidth="100%"
-                    disabled={isSubmitting}
+                    disabled
                     options={Object.keys(SchemaType).map((type) => ({
                       value: type,
                       label: type,

From 5db2c17994b4d8835aa6c5b52e9aaebf664b5903 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 15 Sep 2022 05:36:21 +0400
Subject: [PATCH 159/734] Cognito logout + revamp (#1063)

* application yml example

* Update SSO guide

* Add cognito logout handler

* Fix annotations

* impl a separate config file for cognito

* cleanup

* Rollback auth.type change

* Add compose example

* Auth revamp

* Review suggestions

* Use configurationProperties, rename urls to uris
---
 documentation/compose/DOCKER_COMPOSE.md       |  1 +
 documentation/compose/oauth-cognito.yaml      | 22 +++++
 .../CognitoOidcLogoutSuccessHandler.java      | 53 ++++++++++++
 .../config/auth/BasicAuthSecurityConfig.java  |  4 +-
 .../auth/CognitoOAuthSecurityConfig.java      | 80 +++++++++++++++++++
 .../auth/DisabledAuthSecurityConfig.java      |  4 +-
 .../ui/config/auth/LdapSecurityConfig.java    |  4 +-
 .../config/auth/props/CognitoProperties.java  | 44 ++++++++++
 8 files changed, 206 insertions(+), 6 deletions(-)
 create mode 100644 documentation/compose/oauth-cognito.yaml
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CognitoOidcLogoutSuccessHandler.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/CognitoOAuthSecurityConfig.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/props/CognitoProperties.java

diff --git a/documentation/compose/DOCKER_COMPOSE.md b/documentation/compose/DOCKER_COMPOSE.md
index c5fc1f1476c..d019427d747 100644
--- a/documentation/compose/DOCKER_COMPOSE.md
+++ b/documentation/compose/DOCKER_COMPOSE.md
@@ -11,3 +11,4 @@
 9. [kafka-ui-reverse-proxy.yaml](./kafka-ui-reverse-proxy.yaml) - An example for using the app behind a proxy (like nginx).
 10. [kafka-ui-sasl.yaml](./kafka-ui-sasl.yaml) - SASL auth for Kafka.
 11. [kafka-ui-traefik-proxy.yaml](./kafka-ui-traefik-proxy.yaml) - Traefik specific proxy configuration.
+12. [oauth-cognito.yaml](./oauth-cognito.yaml) - OAuth2 with Cognito
diff --git a/documentation/compose/oauth-cognito.yaml b/documentation/compose/oauth-cognito.yaml
new file mode 100644
index 00000000000..a905c9c2ee5
--- /dev/null
+++ b/documentation/compose/oauth-cognito.yaml
@@ -0,0 +1,22 @@
+---
+version: '3.4'
+services:
+
+  kafka-ui:
+    container_name: kafka-ui
+    image: provectuslabs/kafka-ui:local
+    ports:
+      - 8080:8080
+    depends_on:
+      - kafka0 # OMITTED, TAKE UP AN EXAMPLE FROM OTHER COMPOSE FILES
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SSL
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
+      AUTH_TYPE: OAUTH2_COGNITO
+      AUTH_COGNITO_ISSUER_URI: "https://cognito-idp.eu-central-1.amazonaws.com/eu-central-xxxxxx"
+      AUTH_COGNITO_CLIENT_ID: ""
+      AUTH_COGNITO_CLIENT_SECRET: ""
+      AUTH_COGNITO_SCOPE: "openid"
+      AUTH_COGNITO_USER_NAME_ATTRIBUTE: "username"
+      AUTH_COGNITO_LOGOUT_URI: "https://<domain>.auth.eu-central-1.amazoncognito.com/logout"
\ No newline at end of file
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CognitoOidcLogoutSuccessHandler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CognitoOidcLogoutSuccessHandler.java
new file mode 100644
index 00000000000..52e366f3abf
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CognitoOidcLogoutSuccessHandler.java
@@ -0,0 +1,53 @@
+package com.provectus.kafka.ui.config;
+
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.server.WebFilterExchange;
+import org.springframework.security.web.server.authentication.logout.ServerLogoutSuccessHandler;
+import org.springframework.security.web.util.UrlUtils;
+import org.springframework.web.server.WebSession;
+import org.springframework.web.util.UriComponents;
+import org.springframework.web.util.UriComponentsBuilder;
+import reactor.core.publisher.Mono;
+
+@RequiredArgsConstructor
+public class CognitoOidcLogoutSuccessHandler implements ServerLogoutSuccessHandler {
+
+  private final String logoutUrl;
+  private final String clientId;
+
+  @Override
+  public Mono<Void> onLogoutSuccess(final WebFilterExchange exchange, final Authentication authentication) {
+    final ServerHttpResponse response = exchange.getExchange().getResponse();
+    response.setStatusCode(HttpStatus.FOUND);
+
+    final var requestUri = exchange.getExchange().getRequest().getURI();
+
+    final var fullUrl = UrlUtils.buildFullRequestUrl(requestUri.getScheme(),
+        requestUri.getHost(), requestUri.getPort(),
+        requestUri.getPath(), requestUri.getQuery());
+
+    final UriComponents baseUrl = UriComponentsBuilder
+        .fromHttpUrl(fullUrl)
+        .replacePath("/")
+        .replaceQuery(null)
+        .fragment(null)
+        .build();
+
+    final var uri = UriComponentsBuilder
+        .fromUri(URI.create(logoutUrl))
+        .queryParam("client_id", clientId)
+        .queryParam("logout_uri", baseUrl)
+        .encode(StandardCharsets.UTF_8)
+        .build()
+        .toUri();
+
+    response.getHeaders().setLocation(uri);
+    return exchange.getExchange().getSession().flatMap(WebSession::invalidate);
+  }
+}
+
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
index 6bd56a877fe..ae98dfdd7a3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
@@ -2,7 +2,7 @@
 
 import com.provectus.kafka.ui.util.EmptyRedirectStrategy;
 import java.net.URI;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,7 +17,7 @@
 @Configuration
 @EnableWebFluxSecurity
 @ConditionalOnProperty(value = "auth.type", havingValue = "LOGIN_FORM")
-@Log4j2
+@Slf4j
 public class BasicAuthSecurityConfig extends AbstractAuthSecurityConfig {
 
   public static final String LOGIN_URL = "/auth";
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/CognitoOAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/CognitoOAuthSecurityConfig.java
new file mode 100644
index 00000000000..9db66e142d7
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/CognitoOAuthSecurityConfig.java
@@ -0,0 +1,80 @@
+package com.provectus.kafka.ui.config.auth;
+
+import com.provectus.kafka.ui.config.CognitoOidcLogoutSuccessHandler;
+import com.provectus.kafka.ui.config.auth.props.CognitoProperties;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
+import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.ClientRegistrations;
+import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository;
+import org.springframework.security.web.server.SecurityWebFilterChain;
+import org.springframework.security.web.server.authentication.logout.ServerLogoutSuccessHandler;
+
+@Configuration
+@EnableWebFluxSecurity
+@ConditionalOnProperty(value = "auth.type", havingValue = "OAUTH2_COGNITO")
+@RequiredArgsConstructor
+@Slf4j
+public class CognitoOAuthSecurityConfig extends AbstractAuthSecurityConfig {
+
+  private static final String COGNITO = "cognito";
+
+  @Bean
+  public SecurityWebFilterChain configure(ServerHttpSecurity http, CognitoProperties props) {
+    log.info("Configuring Cognito OAUTH2 authentication.");
+
+    String clientId = props.getClientId();
+    String logoutUrl = props.getLogoutUri();
+
+    final ServerLogoutSuccessHandler logoutHandler = new CognitoOidcLogoutSuccessHandler(logoutUrl, clientId);
+
+    return http.authorizeExchange()
+        .pathMatchers(AUTH_WHITELIST)
+        .permitAll()
+        .anyExchange()
+        .authenticated()
+
+        .and()
+        .oauth2Login()
+
+        .and()
+        .oauth2Client()
+
+        .and()
+        .logout()
+        .logoutSuccessHandler(logoutHandler)
+
+        .and()
+        .csrf().disable()
+        .build();
+  }
+
+  @Bean
+  public InMemoryReactiveClientRegistrationRepository clientRegistrationRepository(CognitoProperties props) {
+    ClientRegistration.Builder builder = ClientRegistrations
+        .fromIssuerLocation(props.getIssuerUri())
+        .registrationId(COGNITO);
+
+    builder.clientId(props.getClientId());
+    builder.clientSecret(props.getClientSecret());
+
+    Optional.ofNullable(props.getScope()).ifPresent(builder::scope);
+    Optional.ofNullable(props.getUserNameAttribute()).ifPresent(builder::userNameAttributeName);
+
+    return new InMemoryReactiveClientRegistrationRepository(builder.build());
+  }
+
+  @Bean
+  @ConfigurationProperties("auth.cognito")
+  public CognitoProperties cognitoProperties() {
+    return new CognitoProperties();
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/DisabledAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/DisabledAuthSecurityConfig.java
index d30aa4631bd..4b1cc9a9330 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/DisabledAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/DisabledAuthSecurityConfig.java
@@ -1,6 +1,6 @@
 package com.provectus.kafka.ui.config.auth;
 
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.ApplicationContext;
@@ -14,7 +14,7 @@
 @Configuration
 @EnableWebFluxSecurity
 @ConditionalOnProperty(value = "auth.type", havingValue = "DISABLED")
-@Log4j2
+@Slf4j
 public class DisabledAuthSecurityConfig extends AbstractAuthSecurityConfig {
 
   @Bean
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
index 9681c36bc9f..62fdde4bf02 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.config.auth;
 
 import java.util.List;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -25,7 +25,7 @@
 @Configuration
 @EnableWebFluxSecurity
 @ConditionalOnProperty(value = "auth.type", havingValue = "LDAP")
-@Log4j2
+@Slf4j
 public class LdapSecurityConfig extends AbstractAuthSecurityConfig {
 
   @Value("${spring.ldap.urls}")
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/props/CognitoProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/props/CognitoProperties.java
new file mode 100644
index 00000000000..4eb4508b97e
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/props/CognitoProperties.java
@@ -0,0 +1,44 @@
+package com.provectus.kafka.ui.config.auth.props;
+
+import lombok.Data;
+import lombok.ToString;
+import org.jetbrains.annotations.Nullable;
+
+@Data
+@ToString(exclude = "clientSecret")
+public class CognitoProperties {
+
+  String clientId;
+  String logoutUri;
+  String issuerUri;
+  String clientSecret;
+  @Nullable
+  String scope;
+  @Nullable
+  String userNameAttribute;
+
+  public String getClientId() {
+    return clientId;
+  }
+
+  public String getLogoutUri() {
+    return logoutUri;
+  }
+
+  public String getIssuerUri() {
+    return issuerUri;
+  }
+
+  public String getClientSecret() {
+    return clientSecret;
+  }
+
+  public @Nullable String getScope() {
+    return scope;
+  }
+
+  public @Nullable String getUserNameAttribute() {
+    return userNameAttribute;
+  }
+
+}

From d149d26013a81e22e5d0c8b59db56ac0565b9e55 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 15 Sep 2022 15:25:49 +0400
Subject: [PATCH 160/734] Revert "Add helm labels required by istio (#2548)"
 (#2589)

This reverts commit 1134ec5d13342c276be146fb6ad8f49087dff5df.
---
 charts/kafka-ui/templates/deployment.yaml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index 69e42dcd63d..1f7f6c92ad4 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -20,8 +20,6 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
       labels:
-        app: {{ include "kafka-ui.name" . }}
-        version: {{ .Values.image.tag | default .Chart.AppVersion }}
         {{- include "kafka-ui.selectorLabels" . | nindent 8 }}
         {{- if .Values.podLabels }}
         {{- toYaml .Values.podLabels | nindent 8 }}
@@ -74,7 +72,7 @@ spec:
             {{- if .Values.envs.secret}}
             - secretRef:
                 name: {{ include "kafka-ui.fullname" . }}
-            {{- end}}
+            {{- end}}    
           ports:
             - name: http
               containerPort: 8080
@@ -99,7 +97,7 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap}}
           volumeMounts:
-            {{- with .Values.volumeMounts }}
+            {{- with .Values.volumeMounts }} 
               {{- toYaml . | nindent 12 }}
             {{- end }}
             {{- if .Values.yamlApplicationConfig }}
@@ -118,12 +116,12 @@ spec:
         {{- end }}
         {{- if .Values.yamlApplicationConfig }}
         - name: kafka-ui-yaml-conf
-          configMap:
+          configMap: 
             name: {{ include "kafka-ui.fullname" . }}-fromvalues
         {{- end }}
         {{- if .Values.yamlApplicationConfigConfigMap}}
         - name: kafka-ui-yaml-conf-configmap
-          configMap:
+          configMap: 
             name: {{ .Values.yamlApplicationConfigConfigMap.name }}
         {{- end }}
       {{- end }}
@@ -138,4 +136,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
\ No newline at end of file

From 71aa44a3d38edf8cc3976c3f4f74f68ee2a6f3a9 Mon Sep 17 00:00:00 2001
From: Daniel Ching <110129035+daching-provectus@users.noreply.github.com>
Date: Thu, 15 Sep 2022 19:30:55 -0600
Subject: [PATCH 161/734] Get rid of dockerfile-maven-plugin (#2594)

* Resolve #1932

Replacing spotify maven docker plugin to use fabric8 docker maven plugin instead

* Remove unused arg

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-api/pom.xml | 27 +++++++++++++++------------
 pom.xml              |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 5c00dc0f6d9..14c2067886c 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -443,11 +443,22 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>com.spotify</groupId>
-                        <artifactId>dockerfile-maven-plugin</artifactId>
-                        <version>${dockerfile-maven-plugin.version}</version>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>${fabric8-maven-plugin.version}</version>
                         <configuration>
-                            <skipPush>true</skipPush>
+                            <verbose>true</verbose>
+                            <images>
+                                <image>
+                                    <name>provectuslabs/kafka-ui:${git.revision}</name>
+                                    <build>
+                                        <contextDir>${project.basedir}</contextDir>
+                                        <args>
+                                            <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                                        </args>
+                                    </build>
+                                </image>
+                            </images>
                         </configuration>
                         <executions>
                             <execution>
@@ -456,14 +467,6 @@
                                 <goals>
                                     <goal>build</goal>
                                 </goals>
-                                <configuration>
-                                    <tag>${git.revision}</tag>
-                                    <repository>provectuslabs/kafka-ui</repository>
-                                    <buildArgs>
-                                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
-                                        <JAR_NAME>${project.artifactId}.jar</JAR_NAME>
-                                    </buildArgs>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
diff --git a/pom.xml b/pom.xml
index c06d556132d..513752c85f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
         <kafka-clients.version>3.2.0</kafka-clients.version>
         <node.version>v16.15.0</node.version>
         <pnpm.version>v7.4.0</pnpm.version>
-        <dockerfile-maven-plugin.version>1.4.10</dockerfile-maven-plugin.version>
+        <fabric8-maven-plugin.version>0.40.2</fabric8-maven-plugin.version>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>

From 15d09751a6127af28f7d01576967d486d57e5f01 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 16 Sep 2022 05:37:28 +0400
Subject: [PATCH 162/734] Fix flaky backend test (#2592)

---
 .../com/provectus/kafka/ui/emitter/MessageFiltersTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
index ded921bfcd9..0986a292efe 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
@@ -140,7 +140,7 @@ void canRunMultiStatementScripts() {
 
 
     @Test
-    void filterSpeedIsAtLeast10kPerSec() {
+    void filterSpeedIsAtLeast5kPerSec() {
       var f = groovyScriptFilter("value.name.first == 'user1' && keyAsText.startsWith('a') ");
 
       List<TopicMessageDTO> toFilter = new ArrayList<>();
@@ -159,7 +159,7 @@ void filterSpeedIsAtLeast10kPerSec() {
       long matched = toFilter.stream().filter(f).count();
       long took = System.currentTimeMillis() - before;
 
-      assertThat(took).isLessThan(500);
+      assertThat(took).isLessThan(1000);
       assertThat(matched).isGreaterThan(0);
     }
   }

From 72dd7127f8496f76264e2540faba0798551ca997 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Fri, 16 Sep 2022 11:26:13 +0300
Subject: [PATCH 163/734] =?UTF-8?q?Added=20method=20isSchemaDropDownDisabl?=
 =?UTF-8?q?ed()=20for=20handling=20error=20when=20updat=E2=80=A6=20(#2591)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added method isSchemaDropDownDisabled() for handling error when update schema

* Update
---
 .../kafka/ui/pages/schema/SchemaEditView.java     | 15 ++++++++++++++-
 .../provectus/kafka/ui/tests/SchemasTests.java    |  6 ++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
index b4e2ca419e6..716e7ef80c1 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
@@ -14,7 +14,8 @@
 
 public class SchemaEditView {
 
-    SelenideElement newSchemaTextArea = $("#newSchema [wrap]");
+    protected SelenideElement newSchemaTextArea = $("#newSchema [wrap]");
+    protected SelenideElement schemaTypeDropDown = $x("//ul[@name='schemaType']");
 
     @Step
     public SchemaEditView selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType schemaType) {
@@ -49,4 +50,16 @@ public SchemaRegistryList removeSchema() {
         $(By.xpath("//*[text()='Confirm']")).shouldBe(Condition.visible).click();
         return new SchemaRegistryList();
     }
+
+    @Step
+    public boolean isSchemaDropDownDisabled(){
+        boolean disabled = false;
+        try{
+           String attribute = schemaTypeDropDown.getAttribute("disabled");
+           disabled = true;
+        }
+        catch (Throwable ignored){
+        }
+       return disabled;
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index da14264ec39..22c8db453d9 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -6,6 +6,7 @@
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.pages.MainPage;
 import com.provectus.kafka.ui.pages.schema.SchemaCreateView;
+import com.provectus.kafka.ui.pages.schema.SchemaEditView;
 import com.provectus.kafka.ui.utils.qaseIO.Status;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
@@ -82,8 +83,9 @@ void updateSchemaAvro() {
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(SCHEMA_AVRO_API_UPDATE)
                 .waitUntilScreenReady()
-                .openEditSchema()
-                .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
+                .openEditSchema();
+        Assertions.assertTrue(new SchemaEditView().isSchemaDropDownDisabled(),"isSchemaDropDownDisabled()");
+        new SchemaEditView().selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(fileToString(PATH_AVRO_FOR_UPDATE))
                 .clickSubmit()
                 .waitUntilScreenReady()

From fa8c03a664fea67ee92b0a38db1f0c20992566ad Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Fri, 16 Sep 2022 17:45:02 +0400
Subject: [PATCH 164/734] Rename 'Total Broker' to 'Broker Count' (#2596)

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../src/components/Brokers/BrokersList/BrokersList.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index 0cefb30fb04..9f63be31c29 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -63,7 +63,7 @@ const BrokersList: React.FC = () => {
       <PageHeading text="Brokers" />
       <Metrics.Wrapper>
         <Metrics.Section title="Uptime">
-          <Metrics.Indicator label="Total Broker">
+          <Metrics.Indicator label="Broker Count">
             {brokerCount}
           </Metrics.Indicator>
           <Metrics.Indicator label="Active Controllers">

From e300aa7d197fc7a3698e9f31b24c33ea18f5818d Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 16 Sep 2022 18:34:47 +0400
Subject: [PATCH 165/734] [e2e] Build local image upon e2e + fix tests (#2598)

* Build local image upon e2e

* Pull the appropriate image

* Fix e2e tests on master (#2600)

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .github/workflows/e2e-checks.yaml               |  4 ++--
 .../ui/pages/connector/ConnectorsView.java      |  9 ++++++---
 .../kafka/ui/pages/schema/SchemaView.java       | 12 ++++++++----
 .../kafka/ui/pages/topic/TopicView.java         | 17 +++++++++--------
 .../kafka/ui/pages/topic/TopicsList.java        |  4 ++--
 .../com/provectus/kafka/ui/base/BaseTest.java   |  2 +-
 .../provectus/kafka/ui/tests/TopicTests.java    |  3 ++-
 7 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 354853a4c3f..6f2287e1eac 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -29,7 +29,7 @@ jobs:
       - name: pull docker
         id: pull_chrome
         run: |
-          docker pull selenium/standalone-chrome
+          docker pull selenium/standalone-chrome:103.0
       - name: Set up JDK 1.13
         uses: actions/setup-java@v1
         with:
@@ -38,7 +38,7 @@ jobs:
         id: build_app
         run: |
           mvn versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          mvn clean package -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
+          mvn clean package -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
       - name: compose app
         id: compose_app
         # use the following command until #819 will be fixed
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
index b180843f8d7..205950b778c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
@@ -2,6 +2,7 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
+import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.extensions.WaitUtils;
 import com.provectus.kafka.ui.utils.BrowserUtils;
@@ -24,14 +25,16 @@ public ConnectorsView goTo(String cluster, String connector) {
 
     @Step("Open 'Edit Config' of connector")
     public ConnectorUpdateView openEditConfig() {
-        BrowserUtils.javaExecutorClick($x("//button[@type='button']/span[.='Edit Config']"));
+        BrowserUtils.javaExecutorClick($x("//button[text()='Edit Config']"));
         return new ConnectorUpdateView();
     }
 
     @Step("Click 'Delete' button")
     public void clickDeleteButton() {
-        BrowserUtils.javaExecutorClick($x("//span[text()='Delete']"));
-        $(By.xpath("//button[text()='Submit']")).shouldBe(Condition.visible).click();
+        BrowserUtils.javaExecutorClick($x("//button[text()='Delete']"));
+        SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
+        confirmButton.shouldBe(Condition.enabled).click();
+        confirmButton.shouldBe(Condition.disappear);
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
index 320ba0546f4..9924b148e4f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
@@ -1,16 +1,18 @@
 package com.provectus.kafka.ui.pages.schema;
 
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$x;
+import static com.codeborne.selenide.Selenide.*;
 
 public class SchemaView {
 
+    protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
+
     @Step
     public SchemaView waitUntilScreenReady() {
         $("div#schema").shouldBe(Condition.visible);
@@ -30,9 +32,11 @@ public SchemaEditView openEditSchema(){
     }
     @Step
     public SchemaRegistryList removeSchema() {
-        BrowserUtils.javaExecutorClick($(".dropdown.is-right button"));
+        BrowserUtils.javaExecutorClick(dotMenuBtn);
         $(By.xpath("//*[contains(text(),'Remove')]")).click();
-        $(By.xpath("//*[text()='Submit']")).shouldBe(Condition.visible).click();
+        SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
+        confirmButton.shouldBe(Condition.enabled).click();
+        confirmButton.shouldBe(Condition.disappear);
         return new SchemaRegistryList();
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index 7eccf23fe21..83b08474e46 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -17,13 +17,12 @@
 @ExtensionMethod({WaitUtils.class})
 public class TopicView {
 
-    private static final String path = "/ui/clusters/%s/topics/%s";
-    private final SelenideElement dotMenuHeader = $$(".dropdown.is-right button").first();
-    private final SelenideElement dotMenuFooter = $$(".dropdown.is-right button").get(1);
+    private static final String URL_PATH = "/ui/clusters/%s/topics/%s";
+    protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
 
     @Step
     public TopicView goTo(String cluster, String topic) {
-        Selenide.open(TestConfiguration.BASE_WEB_URL + String.format(path, cluster, topic));
+        Selenide.open(TestConfiguration.BASE_WEB_URL + String.format(URL_PATH, cluster, topic));
         return this;
     }
 
@@ -35,7 +34,7 @@ public TopicView waitUntilScreenReady() {
 
     @Step
     public TopicCreateEditSettingsView openEditSettings() {
-        BrowserUtils.javaExecutorClick(dotMenuHeader);
+        BrowserUtils.javaExecutorClick(dotMenuBtn);
         $x("//a[text()= '" + DotMenuHeaderItems.EDIT_SETTINGS.getValue() + "']").click();
         return new TopicCreateEditSettingsView();
     }
@@ -48,9 +47,11 @@ public TopicView openTopicMenu(TopicMenu menu) {
 
     @Step
     public TopicsList deleteTopic() {
-        BrowserUtils.javaExecutorClick(dotMenuHeader);
-        $("#dropdown-menu").$(byLinkText(DotMenuHeaderItems.REMOVE_TOPIC.getValue())).click();
-        $$("div[role=\"dialog\"] button").find(Condition.exactText("Submit")).click();
+        BrowserUtils.javaExecutorClick(dotMenuBtn);
+        $x("//ul[@role='menu']//div[text()='Remove Topic']").click();
+        SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
+        confirmButton.shouldBe(Condition.enabled).click();
+        confirmButton.shouldBe(Condition.disappear);
         return new TopicsList();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index bbcb67effb0..aafa9bb0ce5 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -15,7 +15,7 @@
 @ExtensionMethod(WaitUtils.class)
 public class TopicsList {
 
-    private static final String path = "/ui/clusters/%s/topics";
+    private static final String path = "/ui/clusters/%s/all-topics";
 
     @Step
     public TopicsList goTo(String cluster) {
@@ -26,7 +26,7 @@ public TopicsList goTo(String cluster) {
     @Step
     public TopicsList waitUntilScreenReady() {
         $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
-        $(By.xpath("//h1[text()='All Topics']")).shouldBe(Condition.visible);
+        $(By.xpath("//h1[text()='Topics']")).shouldBe(Condition.visible);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 2698fbf6cc1..dbb13c3df20 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -41,7 +41,7 @@ public class BaseTest {
   protected Pages pages = Pages.INSTANCE;
   protected Helpers helpers = Helpers.INSTANCE;
 
-  private Screenshooter screenshooter = new Screenshooter();
+  private final Screenshooter screenshooter = new Screenshooter();
 
   protected static BrowserWebDriverContainer<?> webDriverContainer = null;
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 68ff8d84e19..37d3f9b01d0 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -101,7 +101,8 @@ public void deleteTopic() {
                 .waitUntilScreenReady()
                 .openTopic(TOPIC_TO_DELETE)
                 .waitUntilScreenReady()
-                .deleteTopic()
+                .deleteTopic();
+        pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .isTopicNotVisible(TOPIC_TO_DELETE);
     }

From 69c6e9aeebb141f0c73dfb011866b3bc08d5f4e1 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 16 Sep 2022 19:59:49 +0400
Subject: [PATCH 166/734] Update docs considering docker plugin (#2595)

---
 .../contributing/building-and-running-without-docker.md     | 2 +-
 documentation/project/contributing/building.md              | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/documentation/project/contributing/building-and-running-without-docker.md b/documentation/project/contributing/building-and-running-without-docker.md
index 1f4d06a684e..b5221b2dc6e 100644
--- a/documentation/project/contributing/building-and-running-without-docker.md
+++ b/documentation/project/contributing/building-and-running-without-docker.md
@@ -15,7 +15,7 @@ java -Dspring.config.additional-location=<path-to-application-local.yml> -jar <p
 
 > **_NOTE:_**  If you want to get kafka-ui up and running locally quickly without building the jar file manually, then just follow [Running Without Docker Quickly](#run_without_docker_quickly)
 
-> Comment out `com.spotify` plugin in `kafka-ui-api` pom.xml
+> Comment out `docker-maven-plugin` plugin in `kafka-ui-api` pom.xml
 
 - [Command to build the jar](./building.md#cmd_to_build_kafkaui_without_docker)
 
diff --git a/documentation/project/contributing/building.md b/documentation/project/contributing/building.md
index 67da155b3e2..55ea2dc2cc1 100644
--- a/documentation/project/contributing/building.md
+++ b/documentation/project/contributing/building.md
@@ -9,12 +9,6 @@ Once you installed the prerequisites and cloned the repository, run the followin
 
 > Skip the maven tests as they might not be successful
 
-> Comment out `com.spotify` plugin in `kafka-ui-api` pom file
-
-> Once your build is successful you need to create docker image manually as you'd commented `com.spotify` plugin
-
-> ```docker build --platform linux/arm64 -t provectuslabs/kafka-ui:latest --build-arg JAR_FILE=kafka-ui-api-0.0.1-SNAPSHOT.jar .```
-
 - Build a docker image with the app
 ```sh
 ./mvnw clean install -Pprod

From 6d448c032218fbb000b71fdc7855fa5fcde62fd6 Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Sun, 18 Sep 2022 01:42:36 +0800
Subject: [PATCH 167/734] Rename "Relevant" version of a schema to "Actual"
 (#2597)

Co-authored-by: winniechiu <winniechiu@cht.com.tw>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Schemas/Details/LatestVersion/LatestVersionItem.tsx       | 2 +-
 .../Schemas/Details/__test__/LatestVersionItem.spec.tsx       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.tsx b/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.tsx
index 4efa47d7fe7..5cc472d9f0f 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.tsx
@@ -14,7 +14,7 @@ const LatestVersionItem: React.FC<LatestVersionProps> = ({
 }) => (
   <S.Wrapper>
     <div>
-      <Heading level={3}>Relevant version</Heading>
+      <Heading level={3}>Actual version</Heading>
       <EditorViewer data={schema} schemaType={schemaType} maxLines={28} />
     </div>
     <div>
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/LatestVersionItem.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/LatestVersionItem.spec.tsx
index 9962bd2e966..e4d70548cad 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/LatestVersionItem.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/LatestVersionItem.spec.tsx
@@ -8,7 +8,7 @@ import { jsonSchema, protoSchema } from './fixtures';
 describe('LatestVersionItem', () => {
   it('renders latest version of json schema', () => {
     render(<LatestVersionItem schema={jsonSchema} />);
-    expect(screen.getByText('Relevant version')).toBeInTheDocument();
+    expect(screen.getByText('Actual version')).toBeInTheDocument();
     expect(screen.getByText('Latest version')).toBeInTheDocument();
     expect(screen.getByText('ID')).toBeInTheDocument();
     expect(screen.getByText('Subject')).toBeInTheDocument();
@@ -18,7 +18,7 @@ describe('LatestVersionItem', () => {
 
   it('renders latest version of compatibility', () => {
     render(<LatestVersionItem schema={protoSchema} />);
-    expect(screen.getByText('Relevant version')).toBeInTheDocument();
+    expect(screen.getByText('Actual version')).toBeInTheDocument();
     expect(screen.getByText('Latest version')).toBeInTheDocument();
     expect(screen.getByText('ID')).toBeInTheDocument();
     expect(screen.getByText('Subject')).toBeInTheDocument();

From 3bfdc98cc962560df5bb001bb2a63e0222d4bc9f Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Sun, 18 Sep 2022 20:19:22 +0800
Subject: [PATCH 168/734] Rename "back to filters" label (#2604)

---
 .../components/Topics/Topic/Messages/Filters/SavedFilters.tsx   | 2 +-
 .../Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
index 26036ae9aea..6a757d34383 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
@@ -58,7 +58,7 @@ const SavedFilters: FC<Props> = ({
   return (
     <>
       <S.BackToCustomText onClick={onGoBack}>
-        Back To custom filters
+        Back To create filters
       </S.BackToCustomText>
       <S.SavedFiltersContainer>
         <S.CreatedFilter>Saved filters</S.CreatedFilter>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
index e8b9178e54a..cac3bee8ec6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
@@ -45,7 +45,7 @@ describe('SavedFilter Component', () => {
   it('should check on go back button click', () => {
     const onGoBackMock = jest.fn();
     setUpComponent({ onGoBack: onGoBackMock });
-    userEvent.click(screen.getByText(/back to custom filters/i));
+    userEvent.click(screen.getByText(/back to create filters/i));
     expect(onGoBackMock).toHaveBeenCalled();
   });
 

From 3b8cbd1dbf92300e795658c3496378f4abd25263 Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Mon, 19 Sep 2022 20:04:37 +0800
Subject: [PATCH 169/734] Add "Total lag" within Consumer group (#2602)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/ConsumerGroups/Details/Details.tsx          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index 912b88a8a38..f1ce947fdb7 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -103,6 +103,9 @@ const Details: React.FC = () => {
           <Metrics.Indicator label="Coordinator ID">
             {consumerGroup.coordinator?.id}
           </Metrics.Indicator>
+          <Metrics.Indicator label="Total lag">
+            {consumerGroup.messagesBehind}
+          </Metrics.Indicator>
         </Metrics.Section>
       </Metrics.Wrapper>
       <Table isFullwidth>

From 596f4233fcd4f7ace80141f5e3b5e1f3ed640be5 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 19 Sep 2022 16:32:47 +0400
Subject: [PATCH 170/734] Disable ldap beans auto configuration (#2605)

---
 kafka-ui-api/pom.xml                                          | 4 ----
 .../main/java/com/provectus/kafka/ui/KafkaUiApplication.java  | 3 ++-
 .../provectus/kafka/ui/config/auth/LdapSecurityConfig.java    | 3 +++
 kafka-ui-api/src/main/resources/application.yml               | 3 ---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 14c2067886c..a43c087b428 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -192,10 +192,6 @@
             <version>${antlr4-maven-plugin.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-ldap</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-ldap</artifactId>
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/KafkaUiApplication.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/KafkaUiApplication.java
index ded03514fee..a9a523eb850 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/KafkaUiApplication.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/KafkaUiApplication.java
@@ -2,10 +2,11 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = LdapAutoConfiguration.class)
 @EnableScheduling
 @EnableAsync
 public class KafkaUiApplication {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
index 62fdde4bf02..0ba5c231f4b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
@@ -4,8 +4,10 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.ldap.core.support.BaseLdapPathContextSource;
 import org.springframework.ldap.core.support.LdapContextSource;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -25,6 +27,7 @@
 @Configuration
 @EnableWebFluxSecurity
 @ConditionalOnProperty(value = "auth.type", havingValue = "LDAP")
+@Import(LdapAutoConfiguration.class)
 @Slf4j
 public class LdapSecurityConfig extends AbstractAuthSecurityConfig {
 
diff --git a/kafka-ui-api/src/main/resources/application.yml b/kafka-ui-api/src/main/resources/application.yml
index a6a4c8e9716..da070a19a8d 100644
--- a/kafka-ui-api/src/main/resources/application.yml
+++ b/kafka-ui-api/src/main/resources/application.yml
@@ -11,9 +11,6 @@ management:
     web:
       exposure:
         include: "info,health"
-  health:
-    ldap:
-      enabled: false
 
 logging:
   level:

From 5e500636d0d8cf75c267c601ff91fed5788dbd2c Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 19 Sep 2022 20:24:27 +0300
Subject: [PATCH 171/734] Refactor numeric inputs logic. (#2610)

* Prevent negative values

Closes #2451

* Add positiveOnly mode to input field

Co-authored-by: shubhwip <shubhrjain7@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Brokers/Broker/Configs/Configs.tsx        |  2 +-
 .../Brokers/Broker/Configs/InputCell.tsx      |  4 +-
 .../src/components/common/Input/Input.tsx     | 86 ++++++++++++-------
 .../common/Input/__tests__/Input.spec.tsx     | 23 ++++-
 .../src/components/common/NewTable/Table.tsx  |  1 +
 .../common/NewTable/__test__/Table.spec.tsx   | 40 ++++++---
 .../src/lib/hooks/api/brokers.ts              |  5 +-
 7 files changed, 114 insertions(+), 47 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
index 9346857a45c..33ed6c25d66 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
@@ -37,7 +37,7 @@ const Configs: React.FC = () => {
   const renderCell = (props: CellContext<BrokerConfig, unknown>) => (
     <InputCell
       {...props}
-      onUpdate={(name: string, value: string | null) => {
+      onUpdate={(name, value) => {
         stateMutation.mutateAsync({
           name,
           brokerConfigItem: {
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
index 3a164159e11..ceeff2bd59e 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
@@ -11,7 +11,7 @@ import Input from 'components/common/Input/Input';
 import * as S from './Configs.styled';
 
 interface InputCellProps extends CellContext<BrokerConfig, unknown> {
-  onUpdate: (name: string, value: string | null) => void;
+  onUpdate: (name: string, value?: string) => void;
 }
 
 const InputCell: React.FC<InputCellProps> = ({ row, getValue, onUpdate }) => {
@@ -24,7 +24,7 @@ const InputCell: React.FC<InputCellProps> = ({ row, getValue, onUpdate }) => {
   const onSave = () => {
     if (value !== initialValue) {
       confirm('Are you sure you want to change the value?', async () => {
-        onUpdate(row?.original?.name, value || null);
+        onUpdate(row?.original?.name, value);
       });
     }
     setIsEdit(false);
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.tsx b/kafka-ui-react-app/src/components/common/Input/Input.tsx
index d6c6416bfe7..c524b6be2e4 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/Input.tsx
@@ -10,6 +10,7 @@ export interface InputProps
   name?: string;
   hookFormOptions?: RegisterOptions;
   search?: boolean;
+  positiveOnly?: boolean;
 }
 
 const Input: React.FC<InputProps> = ({
@@ -18,42 +19,67 @@ const Input: React.FC<InputProps> = ({
   search,
   inputSize = 'L',
   type,
+  positiveOnly,
   ...rest
 }) => {
   const methods = useFormContext();
+  const keyPressEventHandler = (
+    event: React.KeyboardEvent<HTMLInputElement>
+  ) => {
+    const { key, code } = event;
+    if (type === 'number') {
+      // Manualy prevent input of 'e' character for all number inputs
+      // and prevent input of negative numbers for positiveOnly inputs
+      if (key === 'e' || (positiveOnly && (key === '-' || code === 'Minus'))) {
+        event.preventDefault();
+      }
+    }
+  };
+  const pasteEventHandler = (event: React.ClipboardEvent<HTMLInputElement>) => {
+    if (type === 'number') {
+      const { clipboardData } = event;
+      const text = clipboardData.getData('Text');
+      // replace all non-digit characters with empty string
+      let value = text.replace(/[^\d.]/g, '');
+      if (positiveOnly) {
+        // check if value is negative
+        const parsedData = parseFloat(value);
+        if (parsedData < 0) {
+          // remove minus sign
+          value = String(Math.abs(parsedData));
+        }
+      }
+      // if paste value contains non-numeric characters or
+      // negative for positiveOnly fields then prevent paste
+      if (value !== text) {
+        event.preventDefault();
+
+        // for react-hook-form fields only set transformed value
+        if (name) {
+          methods.setValue(name, value);
+        }
+      }
+    }
+  };
+
+  let inputOptions = { ...rest };
+  if (name) {
+    // extend input options with react-hook-form options
+    // if the field is a part of react-hook-form form
+    inputOptions = { ...rest, ...methods.register(name, hookFormOptions) };
+  }
+
   return (
     <S.Wrapper>
       {search && <SearchIcon />}
-      {name ? (
-        <S.Input
-          inputSize={inputSize}
-          {...methods.register(name, { ...hookFormOptions })}
-          hasLeftIcon={!!search}
-          type={type}
-          {...rest}
-          onKeyDown={(e) => {
-            if (type === 'number') {
-              if (e.key === 'e') {
-                e.preventDefault();
-              }
-            }
-          }}
-          onPaste={(e) => {
-            if (type === 'number') {
-              e.preventDefault();
-              const value = e.clipboardData.getData('Text');
-              methods.setValue(name, value.replace(/[^\d.]/g, ''));
-            }
-          }}
-        />
-      ) : (
-        <S.Input
-          inputSize={inputSize}
-          hasLeftIcon={!!search}
-          type={type}
-          {...rest}
-        />
-      )}
+      <S.Input
+        inputSize={inputSize}
+        hasLeftIcon={!!search}
+        type={type}
+        onKeyPress={keyPressEventHandler}
+        onPaste={pasteEventHandler}
+        {...inputOptions}
+      />
     </S.Wrapper>
   );
 };
diff --git a/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx b/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx
index e831baf19a3..25447ccae0c 100644
--- a/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx
@@ -2,6 +2,7 @@ import Input, { InputProps } from 'components/common/Input/Input';
 import React from 'react';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
+import userEvent from '@testing-library/user-event';
 
 const setupWrapper = (props?: Partial<InputProps>) => (
   <Input name="test" {...props} />
@@ -11,11 +12,31 @@ jest.mock('react-hook-form', () => ({
     register: jest.fn(),
   }),
 }));
+
 describe('Custom Input', () => {
   describe('with no icons', () => {
+    const getInput = () => screen.getByRole('textbox');
+
     it('to be in the document', () => {
       render(setupWrapper());
-      expect(screen.getByRole('textbox')).toBeInTheDocument();
+      expect(getInput()).toBeInTheDocument();
+    });
+  });
+  describe('number', () => {
+    const getInput = () => screen.getByRole('spinbutton');
+
+    it('allows user to type only numbers', () => {
+      render(setupWrapper({ type: 'number' }));
+      const input = getInput();
+      userEvent.type(input, 'abc131');
+      expect(input).toHaveValue(131);
+    });
+
+    it('allows negative values', () => {
+      render(setupWrapper({ type: 'number' }));
+      const input = getInput();
+      userEvent.type(input, '-2');
+      expect(input).toHaveValue(-2);
     });
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 3b3a780674c..863c17ca149 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -329,6 +329,7 @@ const Table: React.FC<TableProps<any>> = ({
               <span>Go to page:</span>
               <Input
                 type="number"
+                positiveOnly
                 defaultValue={table.getState().pagination.pageIndex + 1}
                 inputSize="M"
                 max={table.getPageCount()}
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index b6ca9811414..412fafd484c 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -225,17 +225,37 @@ describe('Table', () => {
       expect(screen.getByText('lorem')).toBeInTheDocument();
     });
 
-    it('renders go to page input', async () => {
-      renderComponent({ path: '?perPage=1' });
-      // Check it renders header row and only one data row
-      expect(screen.getAllByRole('row').length).toEqual(2);
-      expect(screen.getByText('lorem')).toBeInTheDocument();
-      const input = screen.getByRole('spinbutton', { name: 'Go to page:' });
-      expect(input).toBeInTheDocument();
+    describe('Go To page', () => {
+      const getGoToPageInput = () =>
+        screen.getByRole('spinbutton', { name: 'Go to page:' });
 
-      userEvent.clear(input);
-      userEvent.type(input, '2');
-      expect(screen.getByText('ipsum')).toBeInTheDocument();
+      beforeEach(() => {
+        renderComponent({ path: '?perPage=1' });
+      });
+
+      it('renders Go To page', () => {
+        const goToPage = getGoToPageInput();
+        expect(goToPage).toBeInTheDocument();
+        expect(goToPage).toHaveValue(1);
+      });
+      it('updates page on Go To page change', () => {
+        const goToPage = getGoToPageInput();
+        userEvent.clear(goToPage);
+        userEvent.type(goToPage, '2');
+        expect(goToPage).toHaveValue(2);
+        expect(screen.getByText('ipsum')).toBeInTheDocument();
+      });
+      it('does not update page on Go To page change if page is out of range', () => {
+        const goToPage = getGoToPageInput();
+        userEvent.type(goToPage, '5');
+        expect(goToPage).toHaveValue(15);
+        expect(screen.getByText('No rows found')).toBeInTheDocument();
+      });
+      it('does not update page on Go To page change if page is not a number', () => {
+        const goToPage = getGoToPageInput();
+        userEvent.type(goToPage, 'abc');
+        expect(goToPage).toHaveValue(1);
+      });
     });
   });
 
diff --git a/kafka-ui-react-app/src/lib/hooks/api/brokers.ts b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
index 60a2d26e9b3..073e2eb75ac 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/brokers.ts
@@ -1,12 +1,11 @@
 import { brokersApiClient as api } from 'lib/api';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { ClusterName } from 'redux/interfaces';
+import { BrokerConfigItem } from 'generated-sources';
 
 interface UpdateBrokerConfigProps {
   name: string;
-  brokerConfigItem: {
-    value: string | null;
-  };
+  brokerConfigItem: BrokerConfigItem;
 }
 
 export function useBrokers(clusterName: ClusterName) {

From 9962d29926436ffa10d18db02edb839ee28e3951 Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Tue, 20 Sep 2022 07:37:21 +0800
Subject: [PATCH 172/734] Add "Num of Topics" to Topic/Consumer tab (#2607)

Co-authored-by: winniechiu <winniechiu@cht.com.tw>
---
 .../Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
index 82551ac2502..d1d6c4ece2c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
@@ -22,6 +22,7 @@ const TopicConsumerGroups: React.FC = () => {
         <tr>
           <TableHeaderCell title="Consumer Group ID" />
           <TableHeaderCell title="Num Of Members" />
+          <TableHeaderCell title="Num Of Topics" />
           <TableHeaderCell title="Messages Behind" />
           <TableHeaderCell title="Coordinator" />
           <TableHeaderCell title="State" />
@@ -40,6 +41,7 @@ const TopicConsumerGroups: React.FC = () => {
               </Link>
             </TableKeyLink>
             <td>{consumer.members}</td>
+            <td>{consumer.topics}</td>
             <td>{consumer.messagesBehind}</td>
             <td>{consumer.coordinator?.id}</td>
             <td>

From e621a172d5d9a065dd1d6064099bac3aadc32549 Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Tue, 20 Sep 2022 12:24:04 +0400
Subject: [PATCH 173/734] Display additional fields in the table and overview
 (#2608)

* Display additional fields in the table and overview

* fix test errors

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../src/components/Schemas/Details/Details.tsx               | 1 +
 .../Schemas/Details/LatestVersion/LatestVersionItem.tsx      | 4 ++++
 .../Schemas/Details/SchemaVersion/SchemaVersion.tsx          | 3 ++-
 .../Schemas/Details/__test__/SchemaVersion.spec.tsx          | 2 +-
 kafka-ui-react-app/src/components/Schemas/List/List.tsx      | 2 ++
 .../src/components/Schemas/List/__test__/List.spec.tsx       | 5 +++--
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index 847079f3da7..fb27336493a 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -124,6 +124,7 @@ const Details: React.FC = () => {
               <TableHeaderCell />
               <TableHeaderCell title="Version" />
               <TableHeaderCell title="ID" />
+              <TableHeaderCell title="Type" />
             </tr>
           </thead>
           <tbody>
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.tsx b/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.tsx
index 5cc472d9f0f..21d443a68c8 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.tsx
@@ -26,6 +26,10 @@ const LatestVersionItem: React.FC<LatestVersionProps> = ({
         <S.MetaDataLabel>ID</S.MetaDataLabel>
         <p>{id}</p>
       </div>
+      <div>
+        <S.MetaDataLabel>Type</S.MetaDataLabel>
+        <p>{schemaType}</p>
+      </div>
       <div>
         <S.MetaDataLabel>Subject</S.MetaDataLabel>
         <p>{subject}</p>
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx b/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
index 875627d452c..1a729a6eaec 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
@@ -25,7 +25,8 @@ const SchemaVersion: React.FC<SchemaVersionProps> = ({
           </IconButtonWrapper>
         </td>
         <td style={{ width: '6%' }}>{version}</td>
-        <td>{id}</td>
+        <td style={{ width: '6%' }}>{id}</td>
+        <td>{schemaType}</td>
       </tr>
       {isOpen && (
         <S.Wrapper>
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
index 617c8cc4259..ccd50cd957f 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
@@ -17,7 +17,7 @@ const component = (
 describe('SchemaVersion', () => {
   it('renders versions', () => {
     render(component);
-    expect(screen.getAllByRole('cell')).toHaveLength(3);
+    expect(screen.getAllByRole('cell')).toHaveLength(4);
     expect(screen.queryByTestId('json-viewer')).not.toBeInTheDocument();
     userEvent.click(screen.getByRole('button'));
   });
diff --git a/kafka-ui-react-app/src/components/Schemas/List/List.tsx b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
index 8a1344f55e6..1baae27347e 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
@@ -57,6 +57,8 @@ const List: React.FC = () => {
   const columns = React.useMemo<ColumnDef<SchemaSubject>[]>(
     () => [
       { header: 'Subject', accessorKey: 'subject', cell: LinkCell },
+      { header: 'Id', accessorKey: 'id' },
+      { header: 'Type', accessorKey: 'schemaType' },
       { header: 'Version', accessorKey: 'version' },
       { header: 'Compatibility', accessorKey: 'compatibilityLevel' },
     ],
diff --git a/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx
index cefb32819ac..a6636e5d876 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx
@@ -110,9 +110,10 @@ describe('List', () => {
         expect(screen.getByText(schemaVersion2.subject)).toBeInTheDocument();
       });
       it('handles onRowClick', () => {
-        const { subject, version, compatibilityLevel } = schemaVersion2;
+        const { id, schemaType, subject, version, compatibilityLevel } =
+          schemaVersion2;
         const row = screen.getByRole('row', {
-          name: `${subject} ${version} ${compatibilityLevel}`,
+          name: `${subject} ${id} ${schemaType} ${version} ${compatibilityLevel}`,
         });
         expect(row).toBeInTheDocument();
         userEvent.click(row);

From 93852b260043f805f71bc670744b69c0bd407da6 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Tue, 20 Sep 2022 12:11:32 +0300
Subject: [PATCH 174/734] create object models and implement them into tests
 (#2606)

* Update object models

* SchemaLastUpdate

* Added fileToString in ApiHelper

* Added Connector model

* Update ConnectorsTests

* Added Topic model

* Update TopicTests

* Update SchemasTests

* Added Schema model

* Update TopicTests

* refactor of Schema

* Refactored TestClasses

* TopicTests update

* Topic update

* ConnectorsTests update

* Revert changes in QaseExtension

* Refactored steps of ApiHelper with object models

* Resolve conversation in ConnectorsTests

* Resolve conversation in SchemasTests

* Resolve conversation in TopicTests

* Delete unused object message
---
 .../provectus/kafka/ui/helpers/ApiHelper.java |  40 +++---
 .../provectus/kafka/ui/models/Connector.java  |  12 ++
 .../com/provectus/kafka/ui/models/Schema.java |  33 +++++
 .../com/provectus/kafka/ui/models/Topic.java  |  10 ++
 .../ui/pages/schema/SchemaCreateView.java     |  16 +--
 .../kafka/ui/pages/schema/SchemaEditView.java |   3 +-
 .../testData}/schema_Json_Value.json          |   0
 .../testData}/schema_avro_for_update.json     |   0
 .../testData}/schema_avro_value.json          |   0
 .../testData}/schema_protobuf_value.txt       |   0
 .../kafka/ui/tests/ConnectorsTests.java       | 109 ++++++++--------
 .../kafka/ui/tests/SchemasTests.java          | 116 +++++++++---------
 .../provectus/kafka/ui/tests/TopicTests.java  |  96 ++++++++-------
 13 files changed, 244 insertions(+), 191 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
 rename kafka-ui-e2e-checks/src/{test/resources => main/resources/testData}/schema_Json_Value.json (100%)
 rename kafka-ui-e2e-checks/src/{test/resources => main/resources/testData}/schema_avro_for_update.json (100%)
 rename kafka-ui-e2e-checks/src/{test/resources => main/resources/testData}/schema_avro_value.json (100%)
 rename kafka-ui-e2e-checks/src/{test/resources => main/resources/testData}/schema_protobuf_value.txt (100%)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
index 62d8477fc0b..b094a243a8f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
@@ -6,7 +6,13 @@
 import com.provectus.kafka.ui.api.api.MessagesApi;
 import com.provectus.kafka.ui.api.api.SchemasApi;
 import com.provectus.kafka.ui.api.api.TopicsApi;
-import com.provectus.kafka.ui.api.model.*;
+import com.provectus.kafka.ui.api.model.CreateTopicMessage;
+import com.provectus.kafka.ui.api.model.NewConnector;
+import com.provectus.kafka.ui.api.model.NewSchemaSubject;
+import com.provectus.kafka.ui.api.model.TopicCreation;
+import com.provectus.kafka.ui.models.Connector;
+import com.provectus.kafka.ui.models.Schema;
+import com.provectus.kafka.ui.models.Topic;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -15,6 +21,7 @@
 import java.util.Map;
 
 import static com.codeborne.selenide.Selenide.sleep;
+import static com.provectus.kafka.ui.extensions.FileUtils.fileToString;
 
 
 @Slf4j
@@ -67,11 +74,11 @@ public void deleteTopic(String clusterName, String topicName) {
     }
 
     @SneakyThrows
-    public void createSchema(String clusterName, String schemaName, SchemaType type, String schemaValue) {
+    public void createSchema(String clusterName, Schema schema) {
         NewSchemaSubject schemaSubject = new NewSchemaSubject();
-        schemaSubject.setSubject(schemaName);
-        schemaSubject.setSchema(schemaValue);
-        schemaSubject.setSchemaType(type);
+        schemaSubject.setSubject(schema.getName());
+        schemaSubject.setSchema(fileToString(schema.getValuePath()));
+        schemaSubject.setSchemaType(schema.getType());
         try {
             schemaApi().createNewSchema(clusterName, schemaSubject).block();
         } catch (WebClientResponseException ex) {
@@ -96,16 +103,16 @@ public void deleteConnector(String clusterName, String connectName, String conne
     }
 
     @SneakyThrows
-    public void createConnector(String clusterName, String connectName, String connectorName, String configJson) {
-        NewConnector connector = new NewConnector();
-        connector.setName(connectorName);
-        Map<String, Object> configMap = new ObjectMapper().readValue(configJson, HashMap.class);
-        connector.setConfig(configMap);
+    public void createConnector(String clusterName, String connectName, Connector connector) {
+        NewConnector connectorProperties = new NewConnector();
+        connectorProperties.setName(connector.getName());
+        Map<String, Object> configMap = new ObjectMapper().readValue(connector.getConfig(), HashMap.class);
+        connectorProperties.setConfig(configMap);
         try {
-            connectorApi().deleteConnector(clusterName, connectName, connectorName).block();
+            connectorApi().deleteConnector(clusterName, connectName, connector.getName()).block();
         } catch (WebClientResponseException ignored) {
         }
-        connectorApi().createConnector(clusterName, connectName, connector).block();
+        connectorApi().createConnector(clusterName, connectName, connectorProperties).block();
     }
 
     public String getFirstConnectName(String clusterName) {
@@ -113,14 +120,13 @@ public String getFirstConnectName(String clusterName) {
     }
 
     @SneakyThrows
-    public void sendMessage(String clusterName, String topicName, String messageContentJson,
-                            String messageKey) {
+    public void sendMessage(String clusterName, Topic topic) {
         CreateTopicMessage createMessage = new CreateTopicMessage();
         createMessage.partition(0);
-        createMessage.setContent(messageContentJson);
-        createMessage.setKey(messageKey);
+        createMessage.setContent(topic.getMessageContent());
+        createMessage.setKey(topic.getMessageKey());
         try {
-            messageApi().sendTopicMessages(clusterName, topicName, createMessage).block();
+            messageApi().sendTopicMessages(clusterName, topic.getName(), createMessage).block();
         } catch (WebClientResponseException ex) {
             ex.getRawStatusCode();
         }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java
new file mode 100644
index 00000000000..9e30ba9f196
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java
@@ -0,0 +1,12 @@
+package com.provectus.kafka.ui.models;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class Connector {
+
+    private String name, config;
+
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
new file mode 100644
index 00000000000..8097c2e7d72
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
@@ -0,0 +1,33 @@
+package com.provectus.kafka.ui.models;
+
+import com.provectus.kafka.ui.api.model.SchemaType;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+
+@Data
+@Accessors(chain = true)
+public class Schema {
+
+    private String name,valuePath;
+    private SchemaType type;
+
+    public static Schema createSchemaAvro(){
+        return new Schema().setName(randomAlphabetic(10))
+                .setType(SchemaType.AVRO)
+                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_value.json");
+    }
+
+    public static Schema createSchemaJson(){
+        return new Schema().setName(randomAlphabetic(10))
+                .setType(SchemaType.JSON)
+                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_Json_Value.json");
+    }
+
+    public static Schema createSchemaProtobuf(){
+        return new Schema().setName(randomAlphabetic(10))
+                .setType(SchemaType.PROTOBUF)
+                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_protobuf_value.txt");
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
new file mode 100644
index 00000000000..725db0dd8dd
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
@@ -0,0 +1,10 @@
+package com.provectus.kafka.ui.models;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class Topic {
+    private String name, compactPolicyValue, timeToRetainData, maxSizeOnDisk, maxMessageBytes, messageKey, messageContent ;
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
index 11940326f42..c41153bbdb4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.pages.schema;
 
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.api.model.SchemaType;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
@@ -34,19 +35,4 @@ public SchemaCreateView setSchemaField(String text) {
         schemaField.setValue(text);
         return this;
     }
-
-    public enum SchemaType {
-        AVRO("AVRO"),
-        JSON("JSON"),
-        PROTOBUF("PROTOBUF");
-
-        final String value;
-
-        SchemaType(String value) {
-            this.value = value;
-        }
-        public String getValue(){
-            return value;
-        }
-    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
index 716e7ef80c1..9e853908e5f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
@@ -4,6 +4,7 @@
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
+import com.provectus.kafka.ui.api.model.SchemaType;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
@@ -18,7 +19,7 @@ public class SchemaEditView {
     protected SelenideElement schemaTypeDropDown = $x("//ul[@name='schemaType']");
 
     @Step
-    public SchemaEditView selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType schemaType) {
+    public SchemaEditView selectSchemaTypeFromDropdown(SchemaType schemaType) {
         $x("//ul[@name='schemaType']").click();
         $x("//li[text()='" + schemaType.getValue() + "']").click();
         return this;
diff --git a/kafka-ui-e2e-checks/src/test/resources/schema_Json_Value.json b/kafka-ui-e2e-checks/src/main/resources/testData/schema_Json_Value.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/resources/schema_Json_Value.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/schema_Json_Value.json
diff --git a/kafka-ui-e2e-checks/src/test/resources/schema_avro_for_update.json b/kafka-ui-e2e-checks/src/main/resources/testData/schema_avro_for_update.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/resources/schema_avro_for_update.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/schema_avro_for_update.json
diff --git a/kafka-ui-e2e-checks/src/test/resources/schema_avro_value.json b/kafka-ui-e2e-checks/src/main/resources/testData/schema_avro_value.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/resources/schema_avro_value.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/schema_avro_value.json
diff --git a/kafka-ui-e2e-checks/src/test/resources/schema_protobuf_value.txt b/kafka-ui-e2e-checks/src/main/resources/testData/schema_protobuf_value.txt
similarity index 100%
rename from kafka-ui-e2e-checks/src/test/resources/schema_protobuf_value.txt
rename to kafka-ui-e2e-checks/src/main/resources/testData/schema_protobuf_value.txt
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 5f11151c8b0..19682d4be0c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -1,8 +1,9 @@
 package com.provectus.kafka.ui.tests;
 
 import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.helpers.ApiHelper;
 import com.provectus.kafka.ui.helpers.Helpers;
+import com.provectus.kafka.ui.models.Connector;
+import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.utils.qaseIO.Status;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
@@ -12,98 +13,102 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.provectus.kafka.ui.extensions.FileUtils.getResourceAsString;
 
 public class ConnectorsTests extends BaseTest {
-
-    private final long suiteId = 10;
-    private final String suiteTitle = "Kafka Connect";
-    public static final String SINK_CONNECTOR = "sink_postgres_activities_e2e_checks";
-    public static final String TOPIC_FOR_CONNECTOR = "topic_for_connector";
-    public static final String TOPIC_FOR_DELETE_CONNECTOR = "topic_for_delete_connector";
-    public static final String TOPIC_FOR_UPDATE_CONNECTOR = "topic_for_update_connector";
-    public static final String FIRST_CONNECTOR = "first";
-    public static final String CONNECTOR_FOR_DELETE = "sink_postgres_activities_e2e_checks_for_delete";
-    public static final String CONNECTOR_FOR_UPDATE = "sink_postgres_activities_e2e_checks_for_update";
+    private static final long SUITE_ID = 10;
+    private static final String SUITE_TITLE = "Kafka Connect";
+    private static final String CONNECT_NAME = "first";
+    private static final List<Topic> TOPIC_LIST = new ArrayList<>();
+    private static final List<Connector> CONNECTOR_LIST = new ArrayList<>();
+    private static final String MESSAGE_CONTENT = "message_content_create_topic.json";
+    private static final String MESSAGE_KEY = " ";
+    private static final Topic TOPIC_FOR_CREATE = new Topic()
+            .setName("topic_for_create_connector")
+            .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
+    private static final Topic TOPIC_FOR_DELETE = new Topic()
+            .setName("topic_for_delete_connector")
+            .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
+    private static final Topic TOPIC_FOR_UPDATE = new Topic()
+            .setName("topic_for_update_connector")
+            .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
+    private static final Connector CONNECTOR_FOR_DELETE = new Connector()
+            .setName("sink_postgres_activities_e2e_checks_for_delete")
+            .setConfig(getResourceAsString("delete_connector_config.json"));
+    private static final Connector CONNECTOR_FOR_UPDATE = new Connector()
+            .setName("sink_postgres_activities_e2e_checks_for_update")
+            .setConfig(getResourceAsString("config_for_create_connector_via_api.json"));
 
     @BeforeAll
     public static void beforeAll() {
-        ApiHelper apiHelper = Helpers.INSTANCE.apiHelper;
-
-        String connectorToDelete = getResourceAsString("delete_connector_config.json");
-        String connectorToUpdate = getResourceAsString("config_for_create_connector_via_api.json");
-        String message = getResourceAsString("message_content_create_topic.json");
-
-        apiHelper.deleteTopic(CLUSTER_NAME, CONNECTOR_FOR_DELETE);
-
-        apiHelper.createTopic(CLUSTER_NAME, TOPIC_FOR_CONNECTOR);
-        apiHelper.sendMessage(CLUSTER_NAME, TOPIC_FOR_CONNECTOR, message, " ");
-
-        apiHelper.createTopic(CLUSTER_NAME, TOPIC_FOR_DELETE_CONNECTOR);
-        apiHelper.sendMessage(CLUSTER_NAME, TOPIC_FOR_DELETE_CONNECTOR, message, " ");
-
-        apiHelper.createTopic(CLUSTER_NAME, TOPIC_FOR_UPDATE_CONNECTOR);
-        apiHelper.sendMessage(CLUSTER_NAME, TOPIC_FOR_UPDATE_CONNECTOR, message, " ");
-
-        apiHelper.createConnector(CLUSTER_NAME, FIRST_CONNECTOR, CONNECTOR_FOR_DELETE, connectorToDelete);
-        apiHelper.createConnector(CLUSTER_NAME, FIRST_CONNECTOR, CONNECTOR_FOR_UPDATE, connectorToUpdate);
-    }
-
-    @AfterAll
-    public static void afterAll() {
-        ApiHelper apiHelper = Helpers.INSTANCE.apiHelper;
-        apiHelper.deleteConnector(CLUSTER_NAME, FIRST_CONNECTOR, SINK_CONNECTOR);
-        apiHelper.deleteConnector(CLUSTER_NAME, FIRST_CONNECTOR, CONNECTOR_FOR_UPDATE);
-        apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_FOR_CONNECTOR);
-        apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_FOR_DELETE_CONNECTOR);
-        apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_FOR_UPDATE_CONNECTOR);
+        TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
+        TOPIC_LIST.forEach(topic -> {
+            Helpers.INSTANCE.apiHelper.createTopic(CLUSTER_NAME, topic.getName());
+            Helpers.INSTANCE.apiHelper.sendMessage(CLUSTER_NAME, topic);
+        });
+        CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
+        CONNECTOR_LIST.forEach(connector -> Helpers.INSTANCE.apiHelper
+                .createConnector(CLUSTER_NAME, CONNECT_NAME, connector));
     }
 
     @DisplayName("should create a connector")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(42)
     @Test
     public void createConnector() {
+        Connector connectorForCreate = new Connector()
+                .setName("sink_postgres_activities_e2e_checks")
+                .setConfig(getResourceAsString("config_for_create_connector.json"));
         pages.openConnectorsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .clickCreateConnectorButton()
                 .waitUntilScreenReady()
-                .setConnectorConfig(
-                        SINK_CONNECTOR,
-                        getResourceAsString("config_for_create_connector.json"));
+                .setConnectorConfig(connectorForCreate.getName(), connectorForCreate.getConfig());
         pages.openConnectorsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
-                .connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR);
+                .connectorIsVisibleInList(connectorForCreate.getName(), TOPIC_FOR_CREATE.getName());
+        CONNECTOR_LIST.add(connectorForCreate);
     }
 
     @DisplayName("should update a connector")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(196)
     @Test
     public void updateConnector() {
         pages.openConnectorsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
-                .openConnector(CONNECTOR_FOR_UPDATE);
+                .openConnector(CONNECTOR_FOR_UPDATE.getName());
         pages.connectorsView.connectorIsVisibleOnOverview();
         pages.connectorsView.openEditConfig()
-                .updConnectorConfig(getResourceAsString("config_for_update_connector.json"));
+                .updConnectorConfig(CONNECTOR_FOR_UPDATE.getConfig());
         pages.openConnectorsList(CLUSTER_NAME)
-                .connectorIsVisibleInList(CONNECTOR_FOR_UPDATE, TOPIC_FOR_UPDATE_CONNECTOR);
+                .connectorIsVisibleInList(CONNECTOR_FOR_UPDATE.getName(), TOPIC_FOR_UPDATE.getName());
     }
 
     @DisplayName("should delete connector")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(195)
     @Test
     public void deleteConnector() {
         pages.openConnectorsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
-                .openConnector(CONNECTOR_FOR_DELETE);
+                .openConnector(CONNECTOR_FOR_DELETE.getName());
         pages.connectorsView.clickDeleteButton();
         pages.openConnectorsList(CLUSTER_NAME)
-                .isNotVisible(CONNECTOR_FOR_DELETE);
+                .isNotVisible(CONNECTOR_FOR_DELETE.getName());
+        CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
+    }
+
+    @AfterAll
+    public static void afterAll() {
+        CONNECTOR_LIST.forEach(connector ->
+                Helpers.INSTANCE.apiHelper.deleteConnector(CLUSTER_NAME, CONNECT_NAME, connector.getName()));
+        TOPIC_LIST.forEach(topic -> Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index 22c8db453d9..9218548d9de 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -1,99 +1,85 @@
 package com.provectus.kafka.ui.tests;
 
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
-import com.provectus.kafka.ui.api.model.SchemaType;
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.helpers.Helpers;
+import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.pages.MainPage;
-import com.provectus.kafka.ui.pages.schema.SchemaCreateView;
 import com.provectus.kafka.ui.pages.schema.SchemaEditView;
 import com.provectus.kafka.ui.utils.qaseIO.Status;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
 import io.qase.api.annotation.CaseId;
+import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.provectus.kafka.ui.extensions.FileUtils.fileToString;
 
+
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class SchemasTests extends BaseTest {
-
-    private final long suiteId = 11;
-    private final String suiteTitle = "Schema Registry";
-    public static final String SCHEMA_AVRO_CREATE = "avro_schema";
-    public static final String SCHEMA_JSON_CREATE = "json_schema";
-    public static final String SCHEMA_PROTOBUF_CREATE = "protobuf_schema";
-    public static final String SCHEMA_AVRO_API_UPDATE = "avro_schema_for_update_api";
-    public static final String SCHEMA_AVRO_API = "avro_schema_api";
-    public static final String SCHEMA_JSON_API = "json_schema_api";
-    public static final String SCHEMA_PROTOBUF_API = "protobuf_schema_api";
-    private static final String PATH_AVRO_VALUE = System.getProperty("user.dir") + "/src/test/resources/schema_avro_value.json";
-    private static final String PATH_AVRO_FOR_UPDATE = System.getProperty("user.dir") + "/src/test/resources/schema_avro_for_update.json";
-    private static final String PATH_PROTOBUF_VALUE = System.getProperty("user.dir") + "/src/test/resources/schema_protobuf_value.txt";
-    private static final String PATH_JSON_VALUE = System.getProperty("user.dir") + "/src/test/resources/schema_Json_Value.json";
+    private static final long SUITE_ID = 11;
+    private static final String SUITE_TITLE = "Schema Registry";
+    private static final List<Schema> SCHEMA_LIST = new ArrayList<>();
+    private static final Schema AVRO_API = Schema.createSchemaAvro();
+    private static final Schema JSON_API = Schema.createSchemaJson();
+    private static final Schema PROTOBUF_API = Schema.createSchemaProtobuf();
 
     @BeforeAll
+    @SneakyThrows
     public static void beforeAll() {
-        Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, SCHEMA_AVRO_API_UPDATE, SchemaType.AVRO, fileToString(PATH_AVRO_VALUE));
-        Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, SCHEMA_AVRO_API, SchemaType.AVRO, fileToString(PATH_AVRO_VALUE));
-        Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, SCHEMA_JSON_API, SchemaType.JSON, fileToString(PATH_JSON_VALUE));
-        Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, SCHEMA_PROTOBUF_API, SchemaType.PROTOBUF, fileToString(PATH_PROTOBUF_VALUE));
-    }
-
-    @AfterAll
-    public static void afterAll() {
-        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_AVRO_CREATE);
-        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_JSON_CREATE);
-        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_PROTOBUF_CREATE);
-        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_AVRO_API_UPDATE);
-        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_AVRO_API);
-        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_JSON_API);
-        Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, SCHEMA_PROTOBUF_API);
-
+        SCHEMA_LIST.addAll(List.of(AVRO_API, JSON_API, PROTOBUF_API));
+        SCHEMA_LIST.forEach(schema -> Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, schema));
     }
 
     @DisplayName("should create AVRO schema")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(43)
     @Test
     @Order(1)
     void createSchemaAvro() {
+        Schema schemaAvro = Schema.createSchemaAvro();
         pages.openMainPage()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
-                .setSubjectName(SCHEMA_AVRO_CREATE)
-                .setSchemaField(fileToString(PATH_AVRO_VALUE))
-                .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.AVRO)
+                .setSubjectName(schemaAvro.getName())
+                .setSchemaField(fileToString(schemaAvro.getValuePath()))
+                .selectSchemaTypeFromDropdown(schemaAvro.getType())
                 .clickSubmit()
                 .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.isSchemaVisible(SCHEMA_AVRO_CREATE);
+        pages.schemaRegistry.isSchemaVisible(schemaAvro.getName());
+        SCHEMA_LIST.add(schemaAvro);
     }
 
     @DisplayName("should update AVRO schema")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(186)
     @Test
     @Order(2)
     void updateSchemaAvro() {
+        AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_for_update.json");
         pages.openMainPage()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.openSchema(SCHEMA_AVRO_API_UPDATE)
+        pages.schemaRegistry.openSchema(AVRO_API.getName())
                 .waitUntilScreenReady()
                 .openEditSchema();
         Assertions.assertTrue(new SchemaEditView().isSchemaDropDownDisabled(),"isSchemaDropDownDisabled()");
         new SchemaEditView().selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
-                .setNewSchemaValue(fileToString(PATH_AVRO_FOR_UPDATE))
+                .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
                 .clickSubmit()
                 .waitUntilScreenReady()
                 .isCompatibility(CompatibilityLevel.CompatibilityEnum.NONE);
     }
 
     @DisplayName("should delete AVRO schema")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(187)
     @Test
@@ -101,34 +87,37 @@ void updateSchemaAvro() {
     void deleteSchemaAvro() {
         pages.openMainPage()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.openSchema(SCHEMA_AVRO_API)
+        pages.schemaRegistry.openSchema(AVRO_API.getName())
                 .waitUntilScreenReady()
                 .removeSchema()
-                .isNotVisible(SCHEMA_AVRO_API);
+                .isNotVisible(AVRO_API.getName());
+        SCHEMA_LIST.remove(AVRO_API);
     }
 
     @DisplayName("should create JSON schema")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(89)
     @Test
     @Order(4)
     void createSchemaJson() {
+        Schema schemaJson = Schema.createSchemaJson();
         pages.openMainPage()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
-                .setSubjectName(SCHEMA_JSON_CREATE)
-                .setSchemaField(fileToString(PATH_JSON_VALUE))
-                .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.JSON)
+                .setSubjectName(schemaJson.getName())
+                .setSchemaField(fileToString(schemaJson.getValuePath()))
+                .selectSchemaTypeFromDropdown(schemaJson.getType())
                 .clickSubmit()
                 .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.isSchemaVisible(SCHEMA_JSON_CREATE);
+        pages.schemaRegistry.isSchemaVisible(schemaJson.getName());
+        SCHEMA_LIST.add(schemaJson);
     }
 
     @DisplayName("should delete JSON schema")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(189)
     @Test
@@ -136,34 +125,37 @@ void createSchemaJson() {
     void deleteSchemaJson() {
         pages.openMainPage()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.openSchema(SCHEMA_JSON_API)
+        pages.schemaRegistry.openSchema(JSON_API.getName())
                 .waitUntilScreenReady()
                 .removeSchema()
-                .isNotVisible(SCHEMA_JSON_API);
+                .isNotVisible(JSON_API.getName());
+        SCHEMA_LIST.remove(JSON_API);
     }
 
     @DisplayName("should create PROTOBUF schema")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(91)
     @Test
     @Order(6)
     void createSchemaProtobuf() {
+        Schema schemaProtobuf = Schema.createSchemaProtobuf();
         pages.openMainPage()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.clickCreateSchema()
-                .setSubjectName(SCHEMA_PROTOBUF_CREATE)
-                .setSchemaField(fileToString(PATH_PROTOBUF_VALUE))
-                .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.PROTOBUF)
+                .setSubjectName(schemaProtobuf.getName())
+                .setSchemaField(fileToString(schemaProtobuf.getValuePath()))
+                .selectSchemaTypeFromDropdown(schemaProtobuf.getType())
                 .clickSubmit()
                 .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.isSchemaVisible(SCHEMA_PROTOBUF_CREATE);
+        pages.schemaRegistry.isSchemaVisible(schemaProtobuf.getName());
+        SCHEMA_LIST.add(schemaProtobuf);
     }
 
     @DisplayName("should delete PROTOBUF schema")
-    @Suite(suiteId = suiteId, title = suiteTitle)
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(223)
     @Test
@@ -171,9 +163,15 @@ void createSchemaProtobuf() {
     void deleteSchemaProtobuf() {
         pages.openMainPage()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.openSchema(SCHEMA_PROTOBUF_API)
+        pages.schemaRegistry.openSchema(PROTOBUF_API.getName())
                 .waitUntilScreenReady()
                 .removeSchema()
-                .isNotVisible(SCHEMA_PROTOBUF_API);
+                .isNotVisible(PROTOBUF_API.getName());
+        SCHEMA_LIST.remove(PROTOBUF_API);
+    }
+
+    @AfterAll
+    public static void afterAll() {
+        SCHEMA_LIST.forEach(schema -> Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, schema.getName()));
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 37d3f9b01d0..8f74109631d 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.helpers.Helpers;
+import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.MainPage;
 import com.provectus.kafka.ui.pages.topic.TopicView;
 import com.provectus.kafka.ui.utils.qaseIO.Status;
@@ -11,32 +12,29 @@
 import io.qase.api.annotation.CaseId;
 import org.junit.jupiter.api.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.provectus.kafka.ui.extensions.FileUtils.fileToString;
 
 public class TopicTests extends BaseTest {
-
-    public static final String NEW_TOPIC = "new-topic";
-    public static final String TOPIC_TO_UPDATE = "topic-to-update";
-    public static final String TOPIC_TO_DELETE = "topic-to-delete";
-    public static final String COMPACT_POLICY_VALUE = "Compact";
-    public static final String UPDATED_TIME_TO_RETAIN_VALUE = "604800001";
-    public static final String UPDATED_MAX_SIZE_ON_DISK = "20 GB";
-    public static final String UPDATED_MAX_MESSAGE_BYTES = "1000020";
-    private static final String KEY_TO_PRODUCE_MESSAGE = System.getProperty("user.dir") + "/src/test/resources/producedkey.txt";
-    private static final String CONTENT_TO_PRODUCE_MESSAGE = System.getProperty("user.dir") + "/src/test/resources/testData.txt";
-
+    private static final long SUITE_ID = 2;
+    private static final String SUITE_TITLE = "Topics";
+    private static final Topic TOPIC_FOR_UPDATE = new Topic()
+            .setName("topic-to-update")
+            .setCompactPolicyValue("Compact")
+            .setTimeToRetainData("604800001")
+            .setMaxSizeOnDisk("20 GB")
+            .setMaxMessageBytes("1000020")
+            .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
+            .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+    private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete");
+    private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
     @BeforeAll
     public static void beforeAll() {
-        Helpers.INSTANCE.apiHelper.createTopic(CLUSTER_NAME, TOPIC_TO_UPDATE);
-        Helpers.INSTANCE.apiHelper.createTopic(CLUSTER_NAME, TOPIC_TO_DELETE);
-    }
-
-    @AfterAll
-    public static void afterAll() {
-        Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_TO_UPDATE);
-        Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, TOPIC_TO_DELETE);
-        Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, NEW_TOPIC);
+        TOPIC_LIST.addAll(List.of(TOPIC_FOR_UPDATE, TOPIC_FOR_DELETE));
+        TOPIC_LIST.forEach(topic -> Helpers.INSTANCE.apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
     }
 
     @DisplayName("should create a topic")
@@ -45,84 +43,88 @@ public static void afterAll() {
     @CaseId(199)
     @Test
     public void createTopic() {
+        Topic topicToCreate = new Topic().setName("new-topic");
         pages.open()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS);
         pages.topicsList.pressCreateNewTopic()
-                .setTopicName(NEW_TOPIC)
+                .setTopicName(topicToCreate.getName())
                 .sendData()
                 .waitUntilScreenReady();
         pages.open()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS)
-                .topicIsVisible(NEW_TOPIC);
-        helpers.apiHelper.deleteTopic(CLUSTER_NAME, NEW_TOPIC);
-        pages.open()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS)
-                .topicIsNotVisible(NEW_TOPIC);
+                .topicIsVisible(topicToCreate.getName());
+        TOPIC_LIST.add(topicToCreate);
     }
+
     @Disabled("Due to issue https://github.com/provectus/kafka-ui/issues/1500 ignore this test")
     @DisplayName("should update a topic")
     @Issue("1500")
-    @Suite(suiteId = 2, title = "Topics")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(197)
     @Test
     public void updateTopic() {
         pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        pages.openTopicView(CLUSTER_NAME, TOPIC_TO_UPDATE)
+        pages.openTopicView(CLUSTER_NAME, TOPIC_FOR_UPDATE.getName())
                 .waitUntilScreenReady()
                 .openEditSettings()
-                .selectCleanupPolicy(COMPACT_POLICY_VALUE)
+                .selectCleanupPolicy(TOPIC_FOR_UPDATE.getCompactPolicyValue())
                 .setMinInsyncReplicas(10)
-                .setTimeToRetainDataInMs(UPDATED_TIME_TO_RETAIN_VALUE)
-                .setMaxSizeOnDiskInGB(UPDATED_MAX_SIZE_ON_DISK)
-                .setMaxMessageBytes(UPDATED_MAX_MESSAGE_BYTES)
+                .setTimeToRetainDataInMs(TOPIC_FOR_UPDATE.getTimeToRetainData())
+                .setMaxSizeOnDiskInGB(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
+                .setMaxMessageBytes(TOPIC_FOR_UPDATE.getMaxMessageBytes())
                 .sendData()
                 .waitUntilScreenReady();
-
         pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        pages.openTopicView(CLUSTER_NAME, TOPIC_TO_UPDATE)
+        pages.openTopicView(CLUSTER_NAME, TOPIC_FOR_UPDATE.getName())
                 .openEditSettings()
                 // Assertions
-                .cleanupPolicyIs(COMPACT_POLICY_VALUE)
-                .timeToRetainIs(UPDATED_TIME_TO_RETAIN_VALUE)
-                .maxSizeOnDiskIs(UPDATED_MAX_SIZE_ON_DISK)
-                .maxMessageBytesIs(UPDATED_MAX_MESSAGE_BYTES);
+                .cleanupPolicyIs(TOPIC_FOR_UPDATE.getCompactPolicyValue())
+                .timeToRetainIs(TOPIC_FOR_UPDATE.getTimeToRetainData())
+                .maxSizeOnDiskIs(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
+                .maxMessageBytesIs(TOPIC_FOR_UPDATE.getMaxMessageBytes());
     }
 
     @DisplayName("should delete topic")
-    @Suite(suiteId = 2, title = "Topics")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(207)
     @Test
     public void deleteTopic() {
         pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
-                .openTopic(TOPIC_TO_DELETE)
+                .openTopic(TOPIC_FOR_DELETE.getName())
                 .waitUntilScreenReady()
                 .deleteTopic();
         pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
-                .isTopicNotVisible(TOPIC_TO_DELETE);
+                .isTopicNotVisible(TOPIC_FOR_DELETE.getName());
+        TOPIC_LIST.remove(TOPIC_FOR_DELETE);
     }
 
     @DisplayName("produce message")
-    @Suite(suiteId = 2, title = "Topics")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(222)
     @Test
     void produceMessage() {
         pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
-                .openTopic(TOPIC_TO_UPDATE)
+                .openTopic(TOPIC_FOR_UPDATE.getName())
                 .waitUntilScreenReady()
                 .openTopicMenu(TopicView.TopicMenu.MESSAGES)
                 .clickOnButton("Produce Message")
-                .setContentFiled(fileToString(CONTENT_TO_PRODUCE_MESSAGE))
-                .setKeyField(fileToString(KEY_TO_PRODUCE_MESSAGE))
+                .setContentFiled(TOPIC_FOR_UPDATE.getMessageContent())
+                .setKeyField(TOPIC_FOR_UPDATE.getMessageKey())
                 .submitProduceMessage();
-        Assertions.assertTrue(pages.topicView.isKeyMessageVisible(fileToString(KEY_TO_PRODUCE_MESSAGE)));
-        Assertions.assertTrue(pages.topicView.isContentMessageVisible(fileToString(CONTENT_TO_PRODUCE_MESSAGE).trim()));
+        Assertions.assertTrue(pages.topicView.isKeyMessageVisible(TOPIC_FOR_UPDATE.getMessageKey()));
+        Assertions.assertTrue(pages.topicView.isContentMessageVisible(TOPIC_FOR_UPDATE.getMessageContent().trim()));
+    }
+
+    @AfterAll
+    public static void afterAll() {
+        TOPIC_LIST.forEach(topic -> Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
     }
 }

From d9e74deb287e7b81172c6988dd0f99b1a97d9036 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Tue, 20 Sep 2022 13:44:02 +0300
Subject: [PATCH 175/734] [Experimental] New Messages layout (#2462)

---
 kafka-ui-react-app/package.json               |   6 +-
 kafka-ui-react-app/pnpm-lock.yaml             |  36 +++-
 .../Brokers/Broker/Configs/Configs.tsx        |   2 +-
 .../src/components/Connect/List/ListPage.tsx  |   8 +-
 .../Details/ResetOffsets/ResetOffsets.tsx     |   3 +-
 .../components/ConsumerGroups/List/List.tsx   |  12 +-
 .../src/components/Schemas/List/List.tsx      |   8 +-
 .../src/components/Topics/List/ListPage.tsx   |   8 +-
 .../DangerZone/__test__/DangerZone.spec.tsx   |   6 +-
 .../Topic/Messages/Filters/AddFilter.tsx      |   4 +-
 .../Topics/Topic/Messages/Filters/Filters.tsx |  13 +-
 .../Topics/Topic/Messages/Filters/utils.ts    |   2 +-
 .../MessageContent/MessageContent.styled.ts   |   2 -
 .../Topic/Messages/__test__/utils.spec.ts     |   2 +-
 .../Advanced Filter/AdvancedFilter.tsx        |  53 ++++++
 .../Topic/MessagesV2/Advanced Filter/Form.tsx | 118 ++++++++++++
 .../FiltersBar/FiltersBar.styled.ts           |  75 ++++++++
 .../Topic/MessagesV2/FiltersBar/Form.tsx      | 144 ++++++++++++++
 .../Topic/MessagesV2/FiltersBar/Meta.tsx      |  46 +++++
 .../Topic/MessagesV2/FiltersBar/utils.ts      | 112 +++++++++++
 .../Topic/MessagesV2/Messages.styled.ts       |  61 ++++++
 .../Topics/Topic/MessagesV2/Messages.tsx      | 137 ++++++++++++++
 .../MessagesV2/MessagesTable/ActionsCell.tsx  |  25 +++
 .../MessageContent/MessageContent.styled.ts   |  55 ++++++
 .../MessageContent/MessageContent.tsx         | 106 +++++++++++
 .../MessagesTable/MessagesTable.tsx           |  41 ++++
 .../Topics/Topic/MessagesV2/StatusBar.tsx     |  39 ++++
 .../Topic/MessagesV2/utils/consumingModes.ts  |  50 +++++
 .../MessagesV2/utils/handleNextPageClick.ts   |  65 +++++++
 .../Topic/SendMessage/SendMessage.styled.tsx  |   1 -
 .../Topics/Topic/SendMessage/SendMessage.tsx  |  27 ++-
 .../SendMessage/__test__/SendMessage.spec.tsx |  31 +--
 .../src/components/Topics/Topic/Topic.tsx     |  24 ++-
 .../Topics/Topic/__test__/Topic.spec.tsx      |   9 +-
 .../components/common/Dropdown/Dropdown.tsx   |  10 +-
 .../components/common/Input/Input.styled.ts   |   8 +-
 .../src/components/common/Input/Input.tsx     |   4 +-
 .../common/Input/InputLabel.styled.ts         |   6 +
 .../common/MultiSelect/MultiSelect.styled.ts  |   2 +-
 .../common/Navigation/Navbar.styled.ts        |   1 +
 .../common/NewTable/Table.styled.ts           |   8 +
 .../src/components/common/NewTable/Table.tsx  |  14 +-
 .../common/NewTable/TimestampCell copy.tsx    |  11 ++
 .../PropertiesList/PropertiesList.styled.tsx  |   7 +-
 .../src/components/common/Search/Search.tsx   |  26 ++-
 .../common/Search/__tests__/Search.spec.tsx   |  42 ++---
 .../SlidingSidebar/SlidingSidebar.styled.ts   |  36 ++++
 .../common/SlidingSidebar/SlidingSidebar.tsx  |  32 ++++
 .../components/common/SlidingSidebar/index.ts |   3 +
 .../src/lib/__test__/paths.spec.ts            |  11 --
 kafka-ui-react-app/src/lib/constants.ts       |   3 +
 kafka-ui-react-app/src/lib/dateTimeHelpers.ts |  22 +++
 .../lib/hooks/__tests__/useBoolean.spec.ts    |  66 +++++++
 .../src/lib/hooks/__tests__/useModal.spec.ts  |  66 -------
 .../src/lib/hooks/api/topicMessages.tsx       | 177 ++++++++++++++++++
 .../src/lib/hooks/useBoolean.ts               |  21 +++
 .../src/lib/hooks/useLocalStorage.ts          |  20 ++
 .../src/lib/hooks/useMessageFiltersStore.ts   |  41 ++++
 kafka-ui-react-app/src/lib/hooks/useModal.ts  |  32 ----
 kafka-ui-react-app/src/lib/paths.ts           |   9 -
 kafka-ui-react-app/src/theme/theme.ts         |   7 +
 61 files changed, 1740 insertions(+), 276 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/AdvancedFilter.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/Form.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Meta.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/utils.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/ActionsCell.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessagesTable.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/StatusBar.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/consumingModes.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/handleNextPageClick.ts
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/TimestampCell copy.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/SlidingSidebar/index.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/__tests__/useBoolean.spec.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/__tests__/useModal.spec.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useBoolean.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useLocalStorage.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useMessageFiltersStore.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/useModal.ts

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 80e620c452c..22c9047db44 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -9,6 +9,7 @@
     "@babel/plugin-transform-react-jsx": "^7.18.6",
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
+    "@microsoft/fetch-event-source": "^2.0.1",
     "@reduxjs/toolkit": "^1.8.3",
     "@szhsin/react-menu": "^3.1.1",
     "@tanstack/react-query": "^4.0.5",
@@ -36,7 +37,7 @@
     "react-hook-form": "7.6.9",
     "react-hot-toast": "^2.3.0",
     "react-is": "^18.2.0",
-    "react-multi-select-component": "^4.0.6",
+    "react-multi-select-component": "^4.3.3",
     "react-redux": "^8.0.2",
     "react-router-dom": "^6.3.0",
     "redux": "^4.2.0",
@@ -46,7 +47,8 @@
     "vite": "^3.0.2",
     "vite-tsconfig-paths": "^3.5.0",
     "whatwg-fetch": "^3.6.2",
-    "yup": "^0.32.9"
+    "yup": "^0.32.9",
+    "zustand": "^4.1.1"
   },
   "lint-staged": {
     "*.{ts,tsx}": [
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index d5a7161b18e..c789e1b0483 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -10,6 +10,7 @@ specifiers:
   '@hookform/error-message': ^2.0.0
   '@hookform/resolvers': ^2.7.1
   '@jest/types': ^29.0.3
+  '@microsoft/fetch-event-source': ^2.0.1
   '@openapitools/openapi-generator-cli': ^2.5.1
   '@reduxjs/toolkit': ^1.8.3
   '@szhsin/react-menu': ^3.1.1
@@ -72,7 +73,7 @@ specifiers:
   react-hook-form: 7.6.9
   react-hot-toast: ^2.3.0
   react-is: ^18.2.0
-  react-multi-select-component: ^4.0.6
+  react-multi-select-component: ^4.3.3
   react-redux: ^8.0.2
   react-router-dom: ^6.3.0
   redux: ^4.2.0
@@ -88,6 +89,7 @@ specifiers:
   vite-tsconfig-paths: ^3.5.0
   whatwg-fetch: ^3.6.2
   yup: ^0.32.9
+  zustand: ^4.1.1
 
 dependencies:
   '@babel/core': 7.18.2
@@ -95,6 +97,7 @@ dependencies:
   '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
   '@hookform/error-message': 2.0.0_l2dcsysovzdujulgxvsen7vbsm
   '@hookform/resolvers': 2.8.9_react-hook-form@7.6.9
+  '@microsoft/fetch-event-source': 2.0.1
   '@reduxjs/toolkit': 1.8.3_ctm756ikdwcjcvyfxxwskzbr6q
   '@szhsin/react-menu': 3.1.1_ef5jwxihqo6n7gxfmzogljlgcm
   '@tanstack/react-query': 4.0.5_ef5jwxihqo6n7gxfmzogljlgcm
@@ -122,7 +125,7 @@ dependencies:
   react-hook-form: 7.6.9_react@18.1.0
   react-hot-toast: 2.3.0_ef5jwxihqo6n7gxfmzogljlgcm
   react-is: 18.2.0
-  react-multi-select-component: 4.0.6_react@18.1.0
+  react-multi-select-component: 4.3.3_ef5jwxihqo6n7gxfmzogljlgcm
   react-redux: 8.0.2_nfqigfgwurfoimtkde74cji6ga
   react-router-dom: 6.3.0_ef5jwxihqo6n7gxfmzogljlgcm
   redux: 4.2.0
@@ -133,6 +136,7 @@ dependencies:
   vite-tsconfig-paths: 3.5.0_vite@3.0.2
   whatwg-fetch: 3.6.2
   yup: 0.32.11
+  zustand: 4.1.1_react@18.1.0
 
 devDependencies:
   '@babel/preset-env': 7.18.2_@babel+core@7.18.2
@@ -3059,6 +3063,10 @@ packages:
       '@jridgewell/resolve-uri': 3.0.7
       '@jridgewell/sourcemap-codec': 1.4.13
 
+  /@microsoft/fetch-event-source/2.0.1:
+    resolution: {integrity: sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==}
+    dev: false
+
   /@nestjs/common/8.4.4_47vcjb2de6lyibr6g4enoa5lyu:
     resolution: {integrity: sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==}
     peerDependencies:
@@ -7659,12 +7667,14 @@ packages:
   /react-is/18.2.0:
     resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
 
-  /react-multi-select-component/4.0.6_react@18.1.0:
-    resolution: {integrity: sha512-cNpDv8vh1kWkJiMsa097tTUqWLVTQn+La4aXlgoGOQVpOSH9u1fbj1+MsvnLQjTBySuDx+pzm/DpbIoma/i1Fw==}
+  /react-multi-select-component/4.3.3_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-V8cDJC3M7F27PWv1baV8FpJReHa/SbpJGL80CmXwnlMkDK2KMlQSRDmDzBnmCjcbROIgoztdW+gYBpqo9BIF4g==}
     peerDependencies:
-      react: '>=17'
+      react: ^16 || ^17 || ^18
+      react-dom: ^16 || ^17 || ^18
     dependencies:
       react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
     dev: false
 
   /react-onclickoutside/6.12.1_ef5jwxihqo6n7gxfmzogljlgcm:
@@ -8934,3 +8944,19 @@ packages:
       property-expr: 2.0.4
       toposort: 2.0.2
     dev: false
+
+  /zustand/4.1.1_react@18.1.0:
+    resolution: {integrity: sha512-h4F3WMqsZgvvaE0n3lThx4MM81Ls9xebjvrABNzf5+jb3/03YjNTSgZXeyrvXDArMeV9untvWXRw1tY+ntPYbA==}
+    engines: {node: '>=12.7.0'}
+    peerDependencies:
+      immer: '>=9.0'
+      react: '>=16.8'
+    peerDependenciesMeta:
+      immer:
+        optional: true
+      react:
+        optional: true
+    dependencies:
+      react: 18.1.0
+      use-sync-external-store: 1.2.0_react@18.1.0
+    dev: false
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
index 33ed6c25d66..31a42f60df4 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
@@ -68,7 +68,7 @@ const Configs: React.FC = () => {
     <>
       <S.SearchWrapper>
         <Search
-          handleSearch={setKeyword}
+          onChange={setKeyword}
           placeholder="Search by Key"
           value={keyword}
         />
diff --git a/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx b/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx
index 4834c85425b..904be0d7b6c 100644
--- a/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx
@@ -7,7 +7,6 @@ import * as Metrics from 'components/common/Metrics';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { Button } from 'components/common/Button/Button';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
-import useSearch from 'lib/hooks/useSearch';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { ConnectorState } from 'generated-sources';
 import { useConnectors } from 'lib/hooks/api/kafkaConnect';
@@ -17,7 +16,6 @@ import List from './List';
 const ListPage: React.FC = () => {
   const { isReadOnly } = React.useContext(ClusterContext);
   const { clusterName } = useAppParams<ClusterNameRoute>();
-  const [search, handleSearch] = useSearch();
 
   // Fetches all connectors from the API, without search criteria. Used to display general metrics.
   const { data: connectorsMetrics, isLoading } = useConnectors(clusterName);
@@ -70,11 +68,7 @@ const ListPage: React.FC = () => {
         </Metrics.Section>
       </Metrics.Wrapper>
       <ControlPanelWrapper hasInput>
-        <Search
-          handleSearch={handleSearch}
-          placeholder="Search by Connect Name, Status or Type"
-          value={search}
-        />
+        <Search placeholder="Search by Connect Name, Status or Type" />
       </ControlPanelWrapper>
       <Suspense fallback={<PageLoader />}>
         <List />
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
index b8df3b56b83..cb4b602cd80 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
@@ -8,8 +8,7 @@ import {
   useFieldArray,
   useForm,
 } from 'react-hook-form';
-import MultiSelect from 'react-multi-select-component';
-import { Option } from 'react-multi-select-component/dist/lib/interfaces';
+import { MultiSelect, Option } from 'react-multi-select-component';
 import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
 import groupBy from 'lodash/groupBy';
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
index 3939f111ff4..89be57d6392 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
@@ -7,7 +7,6 @@ import {
   ConsumerGroupOrdering,
   SortOrder,
 } from 'generated-sources';
-import useSearch from 'lib/hooks/useSearch';
 import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import { clusterConsumerGroupDetailsPath, ClusterNameRoute } from 'lib/paths';
@@ -23,7 +22,6 @@ export interface Props {
 }
 
 const List: React.FC<Props> = ({ consumerGroups, totalPages }) => {
-  const [searchText, handleSearchText] = useSearch();
   const dispatch = useAppDispatch();
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const [searchParams] = useSearchParams();
@@ -40,10 +38,10 @@ const List: React.FC<Props> = ({ consumerGroups, totalPages }) => {
           undefined,
         page: Number(searchParams.get('page') || 1),
         perPage: Number(searchParams.get('perPage') || PER_PAGE),
-        search: searchText,
+        search: searchParams.get('q') || '',
       })
     );
-  }, [clusterName, searchText, dispatch, searchParams]);
+  }, [clusterName, dispatch, searchParams]);
 
   const columns = React.useMemo<ColumnDef<ConsumerGroupDetails>[]>(
     () => [
@@ -87,11 +85,7 @@ const List: React.FC<Props> = ({ consumerGroups, totalPages }) => {
     <>
       <PageHeading text="Consumers" />
       <ControlPanelWrapper hasInput>
-        <Search
-          placeholder="Search by Consumer Group ID"
-          value={searchText}
-          handleSearch={handleSearchText}
-        />
+        <Search placeholder="Search by Consumer Group ID" />
       </ControlPanelWrapper>
       <Table
         columns={columns}
diff --git a/kafka-ui-react-app/src/components/Schemas/List/List.tsx b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
index 1baae27347e..31c280b92ad 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
@@ -19,7 +19,6 @@ import PageLoader from 'components/common/PageLoader/PageLoader';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import Search from 'components/common/Search/Search';
-import useSearch from 'lib/hooks/useSearch';
 import PlusIcon from 'components/common/Icons/PlusIcon';
 import Table, { LinkCell } from 'components/common/NewTable';
 import { ColumnDef } from '@tanstack/react-table';
@@ -38,7 +37,6 @@ const List: React.FC = () => {
   const isFetched = useAppSelector(getAreSchemasFulfilled);
   const totalPages = useAppSelector((state) => state.schemas.totalPages);
   const [searchParams] = useSearchParams();
-  const [searchText, handleSearchText] = useSearch();
 
   React.useEffect(() => {
     dispatch(
@@ -82,11 +80,7 @@ const List: React.FC = () => {
         )}
       </PageHeading>
       <ControlPanelWrapper hasInput>
-        <Search
-          placeholder="Search by Schema Name"
-          value={searchText}
-          handleSearch={handleSearchText}
-        />
+        <Search placeholder="Search by Schema Name" />
       </ControlPanelWrapper>
       {isFetched ? (
         <Table
diff --git a/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
index 5aa74eb6ab9..94bf4ef14ad 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
@@ -9,13 +9,11 @@ import PageHeading from 'components/common/PageHeading/PageHeading';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import Switch from 'components/common/Switch/Switch';
 import PlusIcon from 'components/common/Icons/PlusIcon';
-import useSearch from 'lib/hooks/useSearch';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import TopicTable from 'components/Topics/List/TopicTable';
 
 const ListPage: React.FC = () => {
   const { isReadOnly } = React.useContext(ClusterContext);
-  const [searchQuery, handleSearchQuery] = useSearch();
   const [searchParams, setSearchParams] = useSearchParams();
 
   // Set the search params to the url based on the localStorage value
@@ -59,11 +57,7 @@ const ListPage: React.FC = () => {
         )}
       </PageHeading>
       <ControlPanelWrapper hasInput>
-        <Search
-          handleSearch={handleSearchQuery}
-          placeholder="Search by Topic Name"
-          value={searchQuery}
-        />
+        <Search placeholder="Search by Topic Name" />
         <label>
           <Switch
             name="ShowInternalTopics"
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
index 740cc99dedc..aa5da64ed64 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
@@ -5,11 +5,11 @@ import DangerZone, {
 import { act, screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render, WithRoute } from 'lib/testHelpers';
-import { clusterTopicSendMessagePath } from 'lib/paths';
 import {
   useIncreaseTopicPartitionsCount,
   useUpdateTopicReplicationFactor,
 } from 'lib/hooks/api/topics';
+import { clusterTopicPath } from 'lib/paths';
 
 const defaultPartitions = 3;
 const defaultReplicationFactor = 3;
@@ -24,14 +24,14 @@ jest.mock('lib/hooks/api/topics', () => ({
 
 const renderComponent = (props?: Partial<DangerZoneProps>) =>
   render(
-    <WithRoute path={clusterTopicSendMessagePath()}>
+    <WithRoute path={clusterTopicPath()}>
       <DangerZone
         defaultPartitions={defaultPartitions}
         defaultReplicationFactor={defaultReplicationFactor}
         {...props}
       />
     </WithRoute>,
-    { initialEntries: [clusterTopicSendMessagePath(clusterName, topicName)] }
+    { initialEntries: [clusterTopicPath(clusterName, topicName)] }
   );
 
 const clickOnDialogSubmitButton = () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
index 0ff1fd1d896..7d3d95ecc76 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
@@ -5,7 +5,7 @@ import { FilterEdit } from 'components/Topics/Topic/Messages/Filters/FilterModal
 import SavedFilters from 'components/Topics/Topic/Messages/Filters/SavedFilters';
 import SavedIcon from 'components/common/Icons/SavedIcon';
 import QuestionIcon from 'components/common/Icons/QuestionIcon';
-import useModal from 'lib/hooks/useModal';
+import useBoolean from 'lib/hooks/useBoolean';
 
 import AddEditFilterContainer from './AddEditFilterContainer';
 import InfoModal from './InfoModal';
@@ -39,7 +39,7 @@ const AddFilter: React.FC<FilterModalProps> = ({
   onClickSavedFilters,
   activeFilter,
 }) => {
-  const { isOpen, toggle } = useModal();
+  const { value: isOpen, toggle } = useBoolean();
 
   const onSubmit = React.useCallback(
     async (values: AddMessageFilters) => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 957bc640279..83b094a539f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -14,7 +14,7 @@ import React, { useContext } from 'react';
 import omitBy from 'lodash/omitBy';
 import { useNavigate, useLocation } from 'react-router-dom';
 import MultiSelect from 'components/common/MultiSelect/MultiSelect.styled';
-import { Option } from 'react-multi-select-component/dist/lib/interfaces';
+import { Option } from 'react-multi-select-component';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { BASE_PARAMS } from 'lib/constants';
 import Select from 'components/common/Select/Select';
@@ -25,7 +25,7 @@ import FilterModal, {
 } from 'components/Topics/Topic/Messages/Filters/FilterModal';
 import { SeekDirectionOptions } from 'components/Topics/Topic/Messages/Messages';
 import TopicMessagesContext from 'components/contexts/TopicMessagesContext';
-import useModal from 'lib/hooks/useModal';
+import useBoolean from 'lib/hooks/useBoolean';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import PlusIcon from 'components/common/Icons/PlusIcon';
@@ -95,7 +95,7 @@ const Filters: React.FC<FiltersProps> = ({
   const { searchParams, seekDirection, isLive, changeSeekDirection } =
     useContext(TopicMessagesContext);
 
-  const { isOpen, toggle } = useModal();
+  const { value: isOpen, toggle } = useBoolean();
 
   const source = React.useRef<EventSource | null>(null);
 
@@ -393,12 +393,7 @@ const Filters: React.FC<FiltersProps> = ({
     <S.FiltersWrapper>
       <div>
         <S.FilterInputs>
-          <Search
-            placeholder="Search"
-            value={query}
-            disabled={isTailing}
-            handleSearch={(value: string) => setQuery(value)}
-          />
+          <Search placeholder="Search" disabled={isTailing} />
           <S.SeekTypeSelectorWrapper>
             <S.SeekTypeSelect
               id="selectSeekType"
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/utils.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/utils.ts
index 97907a2c224..7be8c83781c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/utils.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/utils.ts
@@ -1,6 +1,6 @@
 import { Partition, SeekType } from 'generated-sources';
 import compact from 'lodash/compact';
-import { Option } from 'react-multi-select-component/dist/lib/interfaces';
+import { Option } from 'react-multi-select-component';
 
 export const filterOptions = (options: Option[], filter: string) => {
   if (!filter) {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
index 8b238ab66d1..dd5cb5e24e7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
@@ -31,7 +31,6 @@ export const ContentBox = styled.div`
   & nav {
     padding-bottom: 16px;
   }
-
   ${SEditorViewer.Wrapper} {
     flex-grow: 1;
   }
@@ -94,5 +93,4 @@ export const Tab = styled.button<{ $active?: boolean }>(
     }
   `
 );
-
 export const Tabs = styled.nav``;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/utils.spec.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/utils.spec.ts
index 1db3f3e9bc5..97dd0ec7bdd 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/utils.spec.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/utils.spec.ts
@@ -1,4 +1,4 @@
-import { Option } from 'react-multi-select-component/dist/lib/interfaces';
+import { Option } from 'react-multi-select-component';
 import {
   filterOptions,
   getOffsetFromSeekToParam,
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/AdvancedFilter.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/AdvancedFilter.tsx
new file mode 100644
index 00000000000..a3155ca73f4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/AdvancedFilter.tsx	
@@ -0,0 +1,53 @@
+import React from 'react';
+import { useMessageFiltersStore } from 'lib/hooks/useMessageFiltersStore';
+import * as StyledTable from 'components/common/NewTable/Table.styled';
+import Heading from 'components/common/heading/Heading.styled';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+
+import Form from './Form';
+
+const AdvancedFilter = () => {
+  const { save, apply, filters, remove } = useMessageFiltersStore();
+  return (
+    <div>
+      <Heading level={4}>Add new filter</Heading>
+      <Form save={save} apply={apply} />
+      {filters.length > 0 && (
+        <>
+          <Heading level={4}>Saved Filters</Heading>
+          <StyledTable.Table>
+            <thead>
+              <tr>
+                <StyledTable.Th>Name</StyledTable.Th>
+                <StyledTable.Th>Value</StyledTable.Th>
+                <StyledTable.Th> </StyledTable.Th>
+              </tr>
+            </thead>
+            <tbody>
+              {filters.map((filter) => (
+                <tr key={filter.name}>
+                  <td>{filter.name}</td>
+                  <td>
+                    <pre>{filter.value}</pre>
+                  </td>
+                  <td>
+                    <Dropdown>
+                      <DropdownItem onClick={() => apply(filter)}>
+                        Apply Filter
+                      </DropdownItem>
+                      <DropdownItem onClick={() => remove(filter.name)}>
+                        Delete filter
+                      </DropdownItem>
+                    </Dropdown>
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </StyledTable.Table>
+        </>
+      )}
+    </div>
+  );
+};
+
+export default AdvancedFilter;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/Form.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/Form.tsx
new file mode 100644
index 00000000000..71f11911f16
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/Form.tsx	
@@ -0,0 +1,118 @@
+import React from 'react';
+import * as S from 'components/Topics/Topic/Messages/Filters/Filters.styled';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import Input from 'components/common/Input/Input';
+import { FormProvider, Controller, useForm } from 'react-hook-form';
+import { ErrorMessage } from '@hookform/error-message';
+import { Button } from 'components/common/Button/Button';
+import { FormError } from 'components/common/Input/Input.styled';
+import Editor from 'components/common/Editor/Editor';
+import { yupResolver } from '@hookform/resolvers/yup';
+import yup from 'lib/yupExtended';
+import { AdvancedFilter } from 'lib/hooks/useMessageFiltersStore';
+
+const validationSchema = yup.object().shape({
+  value: yup.string().required(),
+  name: yup.string().required(),
+});
+
+export interface FormProps {
+  name?: string;
+  value?: string;
+  save(filter: AdvancedFilter): void;
+  apply(filter: AdvancedFilter): void;
+}
+
+const Form: React.FC<FormProps> = ({ name, value, save, apply }) => {
+  const methods = useForm<AdvancedFilter>({
+    mode: 'onChange',
+    resolver: yupResolver(validationSchema),
+  });
+  const {
+    handleSubmit,
+    control,
+    formState: { isDirty, isSubmitting, isValid, errors },
+    reset,
+    getValues,
+  } = methods;
+
+  const onSubmit = React.useCallback(
+    (values: AdvancedFilter) => {
+      apply(values);
+      reset({ name: '', value: '' });
+    },
+    [reset, save]
+  );
+
+  const onSave = React.useCallback(() => {
+    save(getValues());
+    handleSubmit(onSubmit);
+  }, []);
+
+  return (
+    <FormProvider {...methods}>
+      <form onSubmit={handleSubmit(onSubmit)} aria-label="Filters submit Form">
+        <div>
+          <InputLabel>Filter code</InputLabel>
+          <Controller
+            control={control}
+            name="value"
+            defaultValue={value}
+            render={({ field }) => (
+              <Editor
+                value={field.value}
+                minLines={5}
+                maxLines={28}
+                onChange={field.onChange}
+                setOptions={{
+                  showLineNumbers: false,
+                }}
+              />
+            )}
+          />
+        </div>
+        <div>
+          <FormError>
+            <ErrorMessage errors={errors} name="value" />
+          </FormError>
+        </div>
+        <div>
+          <InputLabel>Display name</InputLabel>
+          <Input
+            inputSize="M"
+            placeholder="Enter Name"
+            autoComplete="off"
+            name="name"
+            defaultValue={name}
+          />
+        </div>
+        <div>
+          <FormError>
+            <ErrorMessage errors={errors} name="name" />
+          </FormError>
+        </div>
+        <S.FilterButtonWrapper>
+          <Button
+            buttonSize="M"
+            buttonType="secondary"
+            type="submit"
+            disabled={!isValid || isSubmitting || !isDirty}
+            onClick={onSave}
+          >
+            Save & Apply
+          </Button>
+          <Button
+            buttonSize="M"
+            buttonType="primary"
+            type="submit"
+            disabled={isSubmitting || !isDirty}
+          >
+            Apply Filter
+          </Button>
+        </S.FilterButtonWrapper>
+      </form>
+    </FormProvider>
+  );
+};
+
+export default Form;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled.ts
new file mode 100644
index 00000000000..bd36e913e6c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled.ts
@@ -0,0 +1,75 @@
+import styled from 'styled-components';
+import DatePicker from 'react-datepicker';
+
+export const Meta = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding: 6px 16px;
+  border-bottom: 1px solid ${({ theme }) => theme.layout.stuffBorderColor};
+`;
+
+export const MetaRow = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 20px;
+`;
+
+export const Metric = styled.div`
+  color: ${({ theme }) => theme.metrics.filters.color.normal};
+  font-size: 12px;
+  display: flex;
+`;
+
+export const MetricIcon = styled.div`
+  color: ${({ theme }) => theme.metrics.filters.color.icon};
+  padding-right: 6px;
+  height: 12px;
+`;
+
+export const MetaMessage = styled.div.attrs({
+  role: 'contentLoader',
+})`
+  color: ${({ theme }) => theme.heading.h3.color};
+  font-size: 12px;
+  display: flex;
+  gap: 8px;
+`;
+
+export const StopLoading = styled.div`
+  color: ${({ theme }) => theme.pageLoader.borderColor};
+  cursor: pointer;
+`;
+
+export const FilterRow = styled.div`
+  margin: 8px 0 8px;
+`;
+export const FilterFooter = styled.div`
+  display: flex;
+  gap: 8px;
+  justify-content: end;
+  margin: 16px 0;
+`;
+
+export const DatePickerInput = styled(DatePicker)`
+  height: 32px;
+  border: 1px ${(props) => props.theme.select.borderColor.normal} solid;
+  border-radius: 4px;
+  font-size: 14px;
+  width: 100%;
+  padding-left: 12px;
+  color: ${(props) => props.theme.select.color.normal};
+
+  background-image: url('data:image/svg+xml,%3Csvg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M1 1L5 5L9 1" stroke="%23454F54"/%3E%3C/svg%3E%0A') !important;
+  background-repeat: no-repeat !important;
+  background-position-x: 96% !important;
+  background-position-y: 55% !important;
+  appearance: none !important;
+
+  &:hover {
+    cursor: pointer;
+  }
+  &:focus {
+    outline: none;
+  }
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx
new file mode 100644
index 00000000000..0deb6266df4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx
@@ -0,0 +1,144 @@
+import React from 'react';
+import { useForm } from 'react-hook-form';
+import { useSearchParams } from 'react-router-dom';
+import Input from 'components/common/Input/Input';
+import { ConsumingMode } from 'lib/hooks/api/topicMessages';
+import Select from 'components/common/Select/Select';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import { Option } from 'react-multi-select-component';
+import { Button } from 'components/common/Button/Button';
+import { Partition } from 'generated-sources';
+import { getModeOptions } from 'components/Topics/Topic/MessagesV2/utils/consumingModes';
+
+import * as S from './FiltersBar.styled';
+import { setSeekTo } from './utils';
+
+type FormValues = {
+  mode: ConsumingMode;
+  offset: string;
+  time: Date;
+  partitions: Option[];
+};
+
+const Form: React.FC<{ isFetching: boolean; partitions: Partition[] }> = ({
+  isFetching,
+  partitions,
+}) => {
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  const {
+    handleSubmit,
+    setValue,
+    watch,
+    formState: { isDirty },
+    reset,
+  } = useForm<FormValues>({
+    defaultValues: {
+      mode: searchParams.get('m') || 'newest',
+      offset: searchParams.get('o') || '0',
+      time: searchParams.get('t')
+        ? new Date(Number(searchParams.get('t')))
+        : Date.now(),
+    } as FormValues,
+  });
+  const mode = watch('mode');
+  const offset = watch('offset');
+  const time = watch('time');
+
+  const onSubmit = (values: FormValues) => {
+    searchParams.set('m', values.mode);
+    searchParams.delete('o');
+    searchParams.delete('t');
+    searchParams.delete('a');
+    searchParams.delete('page');
+    if (values.mode === 'fromOffset' || values.mode === 'toOffset') {
+      searchParams.set('o', values.offset);
+    } else if (values.mode === 'sinceTime' || values.mode === 'untilTime') {
+      searchParams.set('t', `${values.time.getTime()}`);
+    }
+    setSeekTo(searchParams, partitions);
+    setSearchParams(searchParams);
+    reset(values);
+  };
+
+  const handleTimestampChange = (value: Date | null) => {
+    if (value) {
+      setValue('time', value, { shouldDirty: true });
+    }
+  };
+  const handleOffsetChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setValue('offset', e.target.value, { shouldDirty: true });
+  };
+  const handleRefresh: React.MouseEventHandler<HTMLButtonElement> = (e) => {
+    e.stopPropagation();
+    e.preventDefault();
+    searchParams.set('a', `${Number(searchParams.get('a') || 0) + 1}`);
+    setSearchParams(searchParams);
+  };
+
+  return (
+    <form onSubmit={handleSubmit(onSubmit)}>
+      <S.FilterRow>
+        <InputLabel>Mode</InputLabel>
+        <Select
+          selectSize="M"
+          minWidth="100%"
+          value={mode}
+          options={getModeOptions()}
+          isLive={mode === 'live' && isFetching}
+          onChange={(option: string | number) =>
+            setValue('mode', option as ConsumingMode, { shouldDirty: true })
+          }
+        />
+      </S.FilterRow>
+      {['sinceTime', 'untilTime'].includes(mode) && (
+        <S.FilterRow>
+          <InputLabel>Time</InputLabel>
+          <S.DatePickerInput
+            selected={time}
+            onChange={handleTimestampChange}
+            showTimeInput
+            timeInputLabel="Time:"
+            dateFormat="MMMM d, yyyy HH:mm"
+            placeholderText="Select timestamp"
+          />
+        </S.FilterRow>
+      )}
+      {['fromOffset', 'toOffset'].includes(mode) && (
+        <S.FilterRow>
+          <InputLabel>Offset</InputLabel>
+          <Input
+            type="text"
+            inputSize="M"
+            value={offset}
+            placeholder="Offset"
+            onChange={handleOffsetChange}
+          />
+        </S.FilterRow>
+      )}
+      <S.FilterFooter>
+        <Button
+          buttonType="secondary"
+          disabled={!isDirty}
+          buttonSize="S"
+          onClick={() => reset()}
+        >
+          Clear All
+        </Button>
+        <Button
+          buttonType="secondary"
+          buttonSize="S"
+          disabled={isDirty || isFetching}
+          onClick={handleRefresh}
+        >
+          Refresh
+        </Button>
+        <Button buttonType="primary" disabled={!isDirty} buttonSize="S">
+          Apply Mode
+        </Button>
+      </S.FilterFooter>
+    </form>
+  );
+};
+
+export default Form;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Meta.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Meta.tsx
new file mode 100644
index 00000000000..9057b2514bc
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Meta.tsx
@@ -0,0 +1,46 @@
+import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
+import ArrowDownIcon from 'components/common/Icons/ArrowDownIcon';
+import ClockIcon from 'components/common/Icons/ClockIcon';
+import FileIcon from 'components/common/Icons/FileIcon';
+import { TopicMessageConsuming } from 'generated-sources';
+import { formatMilliseconds } from 'lib/dateTimeHelpers';
+import React from 'react';
+
+import * as S from './FiltersBar.styled';
+
+interface MetaProps {
+  meta?: TopicMessageConsuming;
+  phase?: string;
+  isFetching: boolean;
+}
+
+const Meta: React.FC<MetaProps> = ({ meta = {} }) => {
+  const { bytesConsumed, messagesConsumed, elapsedMs } = meta;
+
+  return (
+    <S.Meta>
+      <S.MetaRow>
+        <S.Metric title="Messages Consumed">
+          <S.MetricIcon>
+            <FileIcon />
+          </S.MetricIcon>
+          <span>{messagesConsumed || 0} msg.</span>
+        </S.Metric>
+        <S.Metric title="Bytes Consumed">
+          <S.MetricIcon>
+            <ArrowDownIcon />
+          </S.MetricIcon>
+          <BytesFormatted value={bytesConsumed || 0} />
+        </S.Metric>
+        <S.Metric title="Elapsed Time">
+          <S.MetricIcon>
+            <ClockIcon />
+          </S.MetricIcon>
+          <span>{formatMilliseconds(elapsedMs)}</span>
+        </S.Metric>
+      </S.MetaRow>
+    </S.Meta>
+  );
+};
+
+export default Meta;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/utils.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/utils.ts
new file mode 100644
index 00000000000..99528b270d3
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/utils.ts
@@ -0,0 +1,112 @@
+import { Partition } from 'generated-sources';
+import { ConsumingMode } from 'lib/hooks/api/topicMessages';
+import { Option } from 'react-multi-select-component';
+
+export const filterOptions = (options: Option[], filter: string) => {
+  if (!filter) {
+    return options;
+  }
+  return options.filter(({ value }) => value && value.toString() === filter);
+};
+
+export const convertPartitionsToOptions = (ids: Array<string>): Option[] =>
+  ids.map((id) => ({
+    label: `Partition #${id}`,
+    value: `${id}`,
+  }));
+
+export const getSelectedPartitions = (
+  allIds: string[],
+  query: string | null
+) => {
+  let selectedIds: string[] = [];
+  switch (query) {
+    case null: // Empty array of partitions in searchParams - means all
+    case 'all':
+      selectedIds = allIds;
+      break;
+    case 'none':
+      selectedIds = [];
+      break;
+    default:
+      selectedIds = query.split('.');
+      break;
+  }
+  return convertPartitionsToOptions(selectedIds);
+};
+
+type PartionOffsetKey = 'offsetMax' | 'offsetMin';
+
+const generateSeekTo = (
+  partitions: Partition[],
+  type: 'property' | 'value',
+  value: PartionOffsetKey | string
+) => {
+  // we iterating over existing partitions to avoid sending wrong partition ids to the backend
+  const seekTo = partitions.map((partition) => {
+    const { partition: id } = partition;
+    switch (type) {
+      case 'property':
+        return `${id}-${partition[value as PartionOffsetKey]}`;
+      case 'value':
+        return `${id}-${value}`;
+      default:
+        return null;
+    }
+  });
+
+  return seekTo.join('.');
+};
+
+export const generateSeekToForSelectedPartitions = (
+  mode: ConsumingMode,
+  partitions: Partition[],
+  offset: string,
+  time: string
+) => {
+  switch (mode) {
+    case 'live':
+    case 'newest':
+      return generateSeekTo(partitions, 'property', 'offsetMax');
+    case 'fromOffset':
+    case 'toOffset':
+      return generateSeekTo(partitions, 'value', offset);
+    case 'sinceTime':
+    case 'untilTime':
+      return generateSeekTo(partitions, 'value', time);
+    default:
+      // case 'oldest';
+      return generateSeekTo(partitions, 'value', '0');
+  }
+};
+
+export const setSeekTo = (
+  searchParams: URLSearchParams,
+  partitions: Partition[]
+) => {
+  const currentSeekTo = searchParams.get('seekTo');
+  const mode = searchParams.get('m') as ConsumingMode;
+  const offset = (searchParams.get('o') as string) || '0';
+  const time =
+    (searchParams.get('t') as string) || new Date().getTime().toString();
+
+  let selectedPartitions: Partition[] = [];
+  // if not `seekTo` property in search params, we set it to all partition
+  if (!currentSeekTo) {
+    selectedPartitions = partitions;
+  } else {
+    const partitionIds = currentSeekTo
+      .split('.')
+      .map((prop) => prop.split('-')[0]);
+
+    selectedPartitions = partitions.filter(({ partition }) =>
+      partitionIds.includes(String(partition))
+    );
+  }
+  searchParams.set(
+    'seekTo',
+    generateSeekToForSelectedPartitions(mode, selectedPartitions, offset, time)
+  );
+
+  return searchParams;
+};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
new file mode 100644
index 00000000000..ca256684c25
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
@@ -0,0 +1,61 @@
+import styled, { css } from 'styled-components';
+
+export const Wrapper = styled.div(
+  ({ theme }) => css`
+    display: grid;
+    grid-template-columns: 300px 1fr;
+    justify-items: center;
+    min-height: calc(
+      100vh - ${theme.layout.navBarHeight} - ${theme.pageHeading.height} -
+        ${theme.primaryTab.height}
+    );
+  `
+);
+
+export const Sidebar = styled.div(
+  ({ theme }) => css`
+    width: 300px;
+    position: sticky;
+    top: ${theme.layout.navBarHeight};
+    align-self: start;
+  `
+);
+
+export const SidebarContent = styled.div`
+  padding: 8px 16px 16px;
+`;
+
+export const TableWrapper = styled.div(
+  ({ theme }) => css`
+    width: 100%;
+    border-left: 1px solid ${theme.layout.stuffBorderColor};
+  `
+);
+
+export const Pagination = styled.div`
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 8px;
+  position: fixed;
+  bottom: 0;
+  padding: 16px;
+  width: 300px;
+`;
+
+export const StatusBarWrapper = styled.div(
+  ({ theme }) => css`
+    padding: 4px 8px;
+    position: sticky;
+    top: ${theme.layout.navBarHeight};
+    background-color: ${theme.layout.backgroundColor};
+    border-bottom: 1px solid ${theme.layout.stuffBorderColor};
+    white-space: nowrap;
+    display: flex;
+    justify-content: space-between;
+  `
+);
+
+export const StatusTags = styled.div`
+  display: flex;
+  gap: 4px;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx
new file mode 100644
index 00000000000..07d65d3c37d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx
@@ -0,0 +1,137 @@
+import React from 'react';
+import { ConsumingMode, useTopicMessages } from 'lib/hooks/api/topicMessages';
+import useAppParams from 'lib/hooks/useAppParams';
+import { RouteParamsClusterTopic } from 'lib/paths';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import { useTopicDetails } from 'lib/hooks/api/topics';
+import { MESSAGES_PER_PAGE } from 'lib/constants';
+import Search from 'components/common/Search/Search';
+import { Button } from 'components/common/Button/Button';
+import PlusIcon from 'components/common/Icons/PlusIcon';
+import SlidingSidebar from 'components/common/SlidingSidebar';
+import useBoolean from 'lib/hooks/useBoolean';
+
+import MessagesTable from './MessagesTable/MessagesTable';
+import * as S from './Messages.styled';
+import Meta from './FiltersBar/Meta';
+import Form from './FiltersBar/Form';
+import { setSeekTo } from './FiltersBar/utils';
+import handleNextPageClick from './utils/handleNextPageClick';
+import StatusBar from './StatusBar';
+import AdvancedFilter from './Advanced Filter/AdvancedFilter';
+
+const Messages = () => {
+  const routerProps = useAppParams<RouteParamsClusterTopic>();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const navigate = useNavigate();
+  const {
+    value: isAdvancedFiltersSidebarVisible,
+    setFalse: closeAdvancedFiltersSidebar,
+    setTrue: openAdvancedFiltersSidebar,
+  } = useBoolean();
+  const { messages, meta, phase, isFetching } = useTopicMessages({
+    ...routerProps,
+    searchParams,
+  });
+  const mode = searchParams.get('m') as ConsumingMode;
+  const isTailing = mode === 'live' && isFetching;
+  const { data: topic = { partitions: [] } } = useTopicDetails(routerProps);
+
+  const partitions = topic.partitions || [];
+
+  /**
+   * Search params:
+   * - `q` - search query
+   * - `m` - way the consumer is going to consume the messages..
+   * - `o` - offset
+   * - `t` - timestamp
+   * - `perPage` - number of messages per page
+   * - `seekTo` - offset or timestamp to seek to.
+   *    Format: `0-101.1-987` - [partition 0, offset 101], [partition 1, offset 987]
+   * - `page` - page number
+   */
+  React.useEffect(() => {
+    if (!mode) {
+      searchParams.set('m', 'newest');
+    }
+    if (!searchParams.get('perPage')) {
+      searchParams.set('perPage', MESSAGES_PER_PAGE);
+    }
+    if (!searchParams.get('seekTo')) {
+      setSeekTo(searchParams, partitions);
+    }
+    setSearchParams(searchParams);
+  }, [topic]);
+
+  // Pagination is disabled in live mode, also we don't want to show the button
+  // if we are fetching the messages or if we are at the end of the topic
+  const isPaginationDisabled =
+    isTailing ||
+    ['newest', 'oldest'].includes(mode) || // TODO: remove after BE is fixed
+    isFetching ||
+    !searchParams.get('seekTo');
+
+  const isNextPageButtonDisabled =
+    isPaginationDisabled ||
+    messages.length < Number(searchParams.get('perPage') || MESSAGES_PER_PAGE);
+  const isPrevPageButtonDisabled =
+    isPaginationDisabled || !searchParams.get('page');
+
+  const handleNextPage = () =>
+    handleNextPageClick(messages, searchParams, setSearchParams);
+
+  return (
+    <>
+      <S.Wrapper>
+        <S.Sidebar>
+          <Meta meta={meta} phase={phase} isFetching={isFetching} />
+          <S.SidebarContent>
+            <Search placeholder="Search" />
+            <Form isFetching={isFetching} partitions={partitions} />
+          </S.SidebarContent>
+          <S.Pagination>
+            <Button
+              buttonType="secondary"
+              buttonSize="L"
+              disabled={isPrevPageButtonDisabled}
+              onClick={() => navigate(-1)}
+            >
+              ← Back
+            </Button>
+            <Button
+              buttonType="secondary"
+              buttonSize="L"
+              disabled={isNextPageButtonDisabled}
+              onClick={handleNextPage}
+            >
+              Next →
+            </Button>
+          </S.Pagination>
+        </S.Sidebar>
+        <S.TableWrapper>
+          <S.StatusBarWrapper>
+            <StatusBar />
+            <Button
+              buttonType="primary"
+              buttonSize="S"
+              onClick={openAdvancedFiltersSidebar}
+            >
+              <PlusIcon />
+              Advanced Filter
+            </Button>
+          </S.StatusBarWrapper>
+          <MessagesTable messages={messages} isLive={isTailing} />
+        </S.TableWrapper>
+      </S.Wrapper>
+      <SlidingSidebar
+        title="Advanced filtering"
+        open={isAdvancedFiltersSidebarVisible}
+        onClose={closeAdvancedFiltersSidebar}
+      >
+        <AdvancedFilter />
+      </SlidingSidebar>
+    </>
+  );
+};
+
+export default Messages;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/ActionsCell.tsx
new file mode 100644
index 00000000000..3769cdf95f6
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/ActionsCell.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { TopicMessage } from 'generated-sources';
+import { CellContext } from '@tanstack/react-table';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import useDataSaver from 'lib/hooks/useDataSaver';
+
+const ActionsCell: React.FC<CellContext<TopicMessage, unknown>> = ({ row }) => {
+  const { content } = row.original;
+
+  const { copyToClipboard, saveFile } = useDataSaver(
+    'topic-message',
+    content || ''
+  );
+
+  return (
+    <Dropdown>
+      <DropdownItem onClick={copyToClipboard}>
+        Copy content to clipboard
+      </DropdownItem>
+      <DropdownItem onClick={saveFile}>Save content as a file</DropdownItem>
+    </Dropdown>
+  );
+};
+
+export default ActionsCell;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.styled.ts
new file mode 100644
index 00000000000..9ca2bfbf4f8
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.styled.ts
@@ -0,0 +1,55 @@
+import styled, { css } from 'styled-components';
+import * as SEditorViewer from 'components/common/EditorViewer/EditorViewer.styled';
+
+export const Section = styled.div`
+  display: grid;
+  grid-template-columns: 1fr 400px;
+  align-items: stretch;
+`;
+
+export const ContentBox = styled.div`
+  background-color: white;
+  border-right: 1px solid ${({ theme }) => theme.layout.stuffBorderColor};
+  display: flex;
+  flex-direction: column;
+  padding-right: 16px;
+  & nav {
+    padding-bottom: 16px;
+  }
+
+  ${SEditorViewer.Wrapper} {
+    flex-grow: 1;
+  }
+`;
+
+export const MetadataWrapper = styled.div`
+  padding-left: 16px;
+`;
+
+export const Tab = styled.button<{ $active?: boolean }>(
+  ({ theme, $active }) => css`
+    background-color: ${theme.secondaryTab.backgroundColor[
+      $active ? 'active' : 'normal'
+    ]};
+    color: ${theme.secondaryTab.color[$active ? 'active' : 'normal']};
+    padding: 6px 16px;
+    height: 32px;
+    border: 1px solid ${theme.layout.stuffBorderColor};
+    cursor: pointer;
+    &:hover {
+      background-color: ${theme.secondaryTab.backgroundColor.hover};
+      color: ${theme.secondaryTab.color.hover};
+    }
+    &:first-child {
+      border-radius: 4px 0 0 4px;
+    }
+    &:last-child {
+      border-radius: 0 4px 4px 0;
+    }
+    &:not(:last-child) {
+      border-right: 0px;
+    }
+  `
+);
+
+export const Tabs = styled.nav``;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.tsx
new file mode 100644
index 00000000000..e0eb83a3726
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.tsx
@@ -0,0 +1,106 @@
+import { SchemaType, TopicMessage } from 'generated-sources';
+import React from 'react';
+import EditorViewer from 'components/common/EditorViewer/EditorViewer';
+import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
+import { Row } from '@tanstack/react-table';
+import {
+  Label,
+  List,
+  SubText,
+} from 'components/common/PropertiesList/PropertiesList.styled';
+
+import * as S from './MessageContent.styled';
+
+type Tab = 'key' | 'content' | 'headers';
+
+const MessageContent: React.FC<{ row: Row<TopicMessage> }> = ({ row }) => {
+  const {
+    content,
+    valueFormat,
+    key,
+    keyFormat,
+    headers,
+    timestamp,
+    timestampType,
+  } = row.original;
+
+  const [activeTab, setActiveTab] = React.useState<Tab>('content');
+  const activeTabContent = () => {
+    switch (activeTab) {
+      case 'content':
+        return content;
+      case 'key':
+        return key;
+      default:
+        return JSON.stringify(headers || {});
+    }
+  };
+
+  const encoder = new TextEncoder();
+  const keySize = encoder.encode(key).length;
+  const contentSize = encoder.encode(content).length;
+  const contentType =
+    content && content.trim().startsWith('{')
+      ? SchemaType.JSON
+      : SchemaType.PROTOBUF;
+  return (
+    <S.Section>
+      <S.ContentBox>
+        <S.Tabs>
+          <S.Tab
+            type="button"
+            $active={activeTab === 'key'}
+            onClick={() => setActiveTab('key')}
+          >
+            Key
+          </S.Tab>
+          <S.Tab
+            $active={activeTab === 'content'}
+            type="button"
+            onClick={() => setActiveTab('content')}
+          >
+            Content
+          </S.Tab>
+          <S.Tab
+            $active={activeTab === 'headers'}
+            type="button"
+            onClick={() => setActiveTab('headers')}
+          >
+            Headers
+          </S.Tab>
+        </S.Tabs>
+        <EditorViewer
+          data={activeTabContent() || ''}
+          maxLines={28}
+          schemaType={contentType}
+        />
+      </S.ContentBox>
+      <S.MetadataWrapper>
+        <List>
+          <Label>Timestamp</Label>
+          <span>
+            {formatTimestamp(timestamp)}
+            <SubText>Timestamp type: {timestampType}</SubText>
+          </span>
+          <Label>Content</Label>
+          <span>
+            {valueFormat}
+            <SubText>
+              Size: <BytesFormatted value={contentSize} />
+            </SubText>
+          </span>
+          <Label>Key</Label>
+          <span>
+            {keyFormat}
+            <SubText>
+              Size: <BytesFormatted value={keySize} />
+            </SubText>
+          </span>
+        </List>
+      </S.MetadataWrapper>
+    </S.Section>
+  );
+};
+
+export default MessageContent;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessagesTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessagesTable.tsx
new file mode 100644
index 00000000000..995594d4c7c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessagesTable.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { ColumnDef } from '@tanstack/react-table';
+import Table, { TimestampCell } from 'components/common/NewTable';
+import { TopicMessage } from 'generated-sources';
+import TruncatedTextCell from 'components/common/NewTable/TimestampCell copy';
+
+import MessageContent from './MessageContent/MessageContent';
+import ActionsCell from './ActionsCell';
+
+const MessagesTable: React.FC<{
+  messages: TopicMessage[];
+  isLive: boolean;
+}> = ({ messages, isLive }) => {
+  const columns = React.useMemo<ColumnDef<TopicMessage>[]>(
+    () => [
+      { header: 'Offset', accessorKey: 'offset' },
+      { header: 'Partition', accessorKey: 'partition' },
+      { header: 'Timestamp', accessorKey: 'timestamp', cell: TimestampCell },
+      { header: 'Key', accessorKey: 'key', cell: TruncatedTextCell },
+      { header: 'Content', accessorKey: 'content', cell: TruncatedTextCell },
+      { header: '', id: 'action', cell: ActionsCell },
+    ],
+    []
+  );
+
+  return (
+    <Table
+      columns={columns}
+      data={messages}
+      serverSideProcessing
+      pageCount={1}
+      emptyMessage={isLive ? 'Consuming messages...' : 'No messages to display'}
+      getRowCanExpand={() => true}
+      enableRowSelection={false}
+      enableSorting={false}
+      renderSubComponent={MessageContent}
+    />
+  );
+};
+
+export default MessagesTable;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/StatusBar.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/StatusBar.tsx
new file mode 100644
index 00000000000..7f707cf481c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/StatusBar.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { Tag } from 'components/common/Tag/Tag.styled';
+import { ConsumingMode } from 'lib/hooks/api/topicMessages';
+
+import { StatusTags } from './Messages.styled';
+import { getModeTitle } from './utils/consumingModes';
+
+const StatusBar = () => {
+  const [searchParams] = useSearchParams();
+
+  const mode = getModeTitle(
+    (searchParams.get('m') as ConsumingMode) || undefined
+  );
+  const offset = searchParams.get('o');
+  const timestamp = searchParams.get('t');
+  const query = searchParams.get('q');
+
+  return (
+    <StatusTags>
+      <Tag color="green">
+        {offset || timestamp ? (
+          <>
+            {mode}: <b>{offset || timestamp}</b>
+          </>
+        ) : (
+          mode
+        )}
+      </Tag>
+      {query && (
+        <Tag color="blue">
+          Search: <b>{query}</b>
+        </Tag>
+      )}
+    </StatusTags>
+  );
+};
+
+export default StatusBar;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/consumingModes.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/consumingModes.ts
new file mode 100644
index 00000000000..1f3671999a6
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/consumingModes.ts
@@ -0,0 +1,50 @@
+import { ConsumingMode } from 'lib/hooks/api/topicMessages';
+import { SelectOption } from 'components/common/Select/Select';
+
+interface Mode {
+  key: ConsumingMode;
+  title: string;
+}
+
+interface ModeOption extends SelectOption {
+  value: ConsumingMode;
+}
+
+const config: Mode[] = [
+  {
+    key: 'live',
+    title: 'Live mode',
+  },
+  {
+    key: 'newest',
+    title: 'Newest first',
+  },
+  {
+    key: 'oldest',
+    title: 'Oldest first',
+  },
+  {
+    key: 'fromOffset',
+    title: 'From offset',
+  },
+  {
+    key: 'toOffset',
+    title: 'To offset',
+  },
+  {
+    key: 'sinceTime',
+    title: 'Since time',
+  },
+  {
+    key: 'untilTime',
+    title: 'Until time',
+  },
+];
+
+export const getModeOptions = (): ModeOption[] =>
+  config.map(({ key, title }) => ({ value: key, label: title }));
+
+export const getModeTitle = (mode: ConsumingMode = 'newest') => {
+  const modeConfig = config.find((item) => item.key === mode) as Mode;
+  return modeConfig.title;
+};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/handleNextPageClick.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/handleNextPageClick.ts
new file mode 100644
index 00000000000..2d92d962bd6
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/handleNextPageClick.ts
@@ -0,0 +1,65 @@
+import { TopicMessage } from 'generated-sources';
+import { ConsumingMode } from 'lib/hooks/api/topicMessages';
+
+export default (
+  messages: TopicMessage[],
+  searchParams: URLSearchParams,
+  setSearchParams: (params: URLSearchParams) => void
+) => {
+  const seekTo = searchParams.get('seekTo');
+  const mode = searchParams.get('m') as ConsumingMode;
+  const page = searchParams.get('page');
+  if (!seekTo || !mode) return;
+
+  // parse current seekTo query param to array of [partition, offset] tuples
+  const configTuple = seekTo?.split('.').map((item) => {
+    const [partition, offset] = item.split('-');
+    return { partition: Number(partition), offset: Number(offset) };
+  });
+
+  // Reverse messages array for faster last displayed message search.
+  const reversedMessages = [...messages].reverse();
+
+  if (!configTuple) return;
+
+  const newConfigTuple = configTuple.map(({ partition, offset }) => {
+    const message = reversedMessages.find((m) => partition === m.partition);
+    if (!message) {
+      return { partition, offset };
+    }
+
+    switch (mode) {
+      case 'fromOffset':
+      case 'oldest':
+        // First message in the reversed array is the message with max offset.
+        // Replace offset in seekTo query param with the max offset for
+        // each partition from displayed messages array.
+        return { partition, offset: Math.max(message.offset, offset) };
+      case 'toOffset':
+      case 'newest':
+        // First message in the reversed array is the message with min offset.
+        return { partition, offset: Math.min(message.offset, offset) };
+      case 'sinceTime':
+        // First message in the reversed array is the message with max timestamp.
+        return {
+          partition,
+          offset: Math.max(new Date(message.timestamp).getTime(), offset),
+        };
+      case 'untilTime':
+        // First message in the reversed array is the message with min timestamp.
+        return {
+          partition,
+          offset: Math.min(new Date(message.timestamp).getTime(), offset),
+        };
+      default:
+        return { partition, offset };
+    }
+  });
+  searchParams.set('page', String(Number(page || 0) + 1));
+  searchParams.set(
+    'seekTo',
+    newConfigTuple.map((t) => `${t.partition}-${t.offset}`).join('.')
+  );
+
+  setSearchParams(searchParams);
+};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx
index 55613b1694c..483c41d0533 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx
@@ -2,7 +2,6 @@ import styled from 'styled-components';
 
 export const Wrapper = styled.div`
   display: block;
-  padding: 1.25rem;
   border-radius: 6px;
 `;
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 781a33aed69..50278a3501d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -1,22 +1,18 @@
 import React, { useEffect } from 'react';
 import { useForm, Controller } from 'react-hook-form';
-import { useNavigate } from 'react-router-dom';
-import {
-  clusterTopicMessagesRelativePath,
-  RouteParamsClusterTopic,
-} from 'lib/paths';
+import { RouteParamsClusterTopic } from 'lib/paths';
 import jsf from 'json-schema-faker';
 import { Button } from 'components/common/Button/Button';
 import Editor from 'components/common/Editor/Editor';
 import Select, { SelectOption } from 'components/common/Select/Select';
 import useAppParams from 'lib/hooks/useAppParams';
-import Heading from 'components/common/heading/Heading.styled';
 import { showAlert } from 'lib/errorHandling';
 import {
   useSendMessage,
   useTopicDetails,
   useTopicMessageSchema,
 } from 'lib/hooks/api/topics';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
 
 import validateMessage from './validateMessage';
 import * as S from './SendMessage.styled';
@@ -28,9 +24,8 @@ type FieldValues = Partial<{
   partition: number | string;
 }>;
 
-const SendMessage: React.FC = () => {
+const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
-  const navigate = useNavigate();
   const { data: topic } = useTopicDetails({ clusterName, topicName });
   const { data: messageSchema } = useTopicMessageSchema({
     clusterName,
@@ -92,7 +87,7 @@ const SendMessage: React.FC = () => {
     });
   }, [keyDefaultValue, contentDefaultValue, reset]);
 
-  const onSubmit = async (data: {
+  const submit = async (data: {
     key: string;
     content: string;
     headers: string;
@@ -129,16 +124,16 @@ const SendMessage: React.FC = () => {
         headers,
         partition: !partition ? 0 : partition,
       });
-      navigate(`../${clusterTopicMessagesRelativePath}`);
+      onSubmit();
     }
   };
 
   return (
     <S.Wrapper>
-      <form onSubmit={handleSubmit(onSubmit)}>
+      <form onSubmit={handleSubmit(submit)}>
         <S.Columns>
           <S.Column>
-            <Heading level={3}>Partition</Heading>
+            <InputLabel>Partition</InputLabel>
             <Controller
               control={control}
               name="partition"
@@ -160,7 +155,7 @@ const SendMessage: React.FC = () => {
 
         <S.Columns>
           <S.Column>
-            <Heading level={3}>Key</Heading>
+            <InputLabel>Key</InputLabel>
             <Controller
               control={control}
               name="key"
@@ -175,7 +170,7 @@ const SendMessage: React.FC = () => {
             />
           </S.Column>
           <S.Column>
-            <Heading level={3}>Content</Heading>
+            <InputLabel>Content</InputLabel>
             <Controller
               control={control}
               name="content"
@@ -192,7 +187,7 @@ const SendMessage: React.FC = () => {
         </S.Columns>
         <S.Columns>
           <S.Column>
-            <Heading level={3}>Headers</Heading>
+            <InputLabel>Headers</InputLabel>
             <Controller
               control={control}
               name="headers"
@@ -214,7 +209,7 @@ const SendMessage: React.FC = () => {
           type="submit"
           disabled={!isDirty || isSubmitting}
         >
-          Send
+          Produce Message
         </Button>
       </form>
     </S.Wrapper>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
index 803ffbd7915..b72e0fe6ca6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
@@ -3,10 +3,7 @@ import SendMessage from 'components/Topics/Topic/SendMessage/SendMessage';
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render, WithRoute } from 'lib/testHelpers';
-import {
-  clusterTopicMessagesRelativePath,
-  clusterTopicSendMessagePath,
-} from 'lib/paths';
+import { clusterTopicPath } from 'lib/paths';
 import validateMessage from 'components/Topics/Topic/SendMessage/validateMessage';
 import { externalTopicPayload, topicMessageSchema } from 'lib/fixtures/topics';
 import {
@@ -35,12 +32,6 @@ jest.mock('lib/errorHandling', () => ({
   showServerError: jest.fn(),
 }));
 
-const mockNavigate = jest.fn();
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useNavigate: () => mockNavigate,
-}));
-
 jest.mock('lib/hooks/api/topics', () => ({
   useTopicDetails: jest.fn(),
   useTopicMessageSchema: jest.fn(),
@@ -50,12 +41,14 @@ jest.mock('lib/hooks/api/topics', () => ({
 const clusterName = 'testCluster';
 const topicName = externalTopicPayload.name;
 
+const mockOnSubmit = jest.fn();
+
 const renderComponent = async () => {
-  const path = clusterTopicSendMessagePath(clusterName, topicName);
+  const path = clusterTopicPath(clusterName, topicName);
   await act(() => {
     render(
-      <WithRoute path={clusterTopicSendMessagePath()}>
-        <SendMessage />
+      <WithRoute path={clusterTopicPath()}>
+        <SendMessage onSubmit={mockOnSubmit} />
       </WithRoute>,
       { initialEntries: [path] }
     );
@@ -72,7 +65,7 @@ const renderAndSubmitData = async (error: string[] = []) => {
   });
   await act(() => {
     (validateMessage as Mock).mockImplementation(() => error);
-    userEvent.click(screen.getByText('Send'));
+    userEvent.click(screen.getByText('Produce Message'));
   });
 };
 
@@ -83,10 +76,6 @@ describe('SendMessage', () => {
     }));
   });
 
-  afterEach(() => {
-    mockNavigate.mockClear();
-  });
-
   describe('when schema is fetched', () => {
     beforeEach(() => {
       (useTopicMessageSchema as jest.Mock).mockImplementation(() => ({
@@ -101,9 +90,7 @@ describe('SendMessage', () => {
       }));
       await renderAndSubmitData();
       expect(sendTopicMessageMock).toHaveBeenCalledTimes(1);
-      expect(mockNavigate).toHaveBeenLastCalledWith(
-        `../${clusterTopicMessagesRelativePath}`
-      );
+      expect(mockOnSubmit).toHaveBeenCalledTimes(1);
     });
 
     it('should check and view validation error message when is not valid', async () => {
@@ -113,7 +100,7 @@ describe('SendMessage', () => {
       }));
       await renderAndSubmitData(['error']);
       expect(sendTopicMessageMock).not.toHaveBeenCalled();
-      expect(mockNavigate).not.toHaveBeenCalled();
+      expect(mockOnSubmit).not.toHaveBeenCalled();
     });
   });
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index 723a6e7aef8..4bb8aa28bc5 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -6,10 +6,8 @@ import {
   clusterTopicSettingsRelativePath,
   clusterTopicConsumerGroupsRelativePath,
   clusterTopicEditRelativePath,
-  clusterTopicSendMessageRelativePath,
   clusterTopicStatisticsRelativePath,
   clusterTopicsPath,
-  clusterTopicSendMessagePath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageHeading from 'components/common/PageHeading/PageHeading';
@@ -33,8 +31,11 @@ import {
 } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import { CleanUpPolicy } from 'generated-sources';
 import PageLoader from 'components/common/PageLoader/PageLoader';
+import SlidingSidebar from 'components/common/SlidingSidebar';
+import useBoolean from 'lib/hooks/useBoolean';
 
 import Messages from './Messages/Messages';
+import MessagesV2 from './MessagesV2/Messages';
 import Overview from './Overview/Overview';
 import Settings from './Settings/Settings';
 import TopicConsumerGroups from './ConsumerGroups/TopicConsumerGroups';
@@ -44,6 +45,11 @@ import SendMessage from './SendMessage/SendMessage';
 
 const Topic: React.FC = () => {
   const dispatch = useAppDispatch();
+  const {
+    value: isSidebarOpen,
+    setFalse: closeSidebar,
+    setTrue: openSidebar,
+  } = useBoolean(false);
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
   const navigate = useNavigate();
   const deleteTopic = useDeleteTopic(clusterName);
@@ -76,7 +82,7 @@ const Topic: React.FC = () => {
         <Button
           buttonSize="M"
           buttonType="primary"
-          to={clusterTopicSendMessagePath(clusterName, topicName)}
+          onClick={openSidebar}
           disabled={isReadOnly}
         >
           Produce Message
@@ -179,6 +185,7 @@ const Topic: React.FC = () => {
             path={clusterTopicMessagesRelativePath}
             element={<Messages />}
           />
+          <Route path="v2" element={<MessagesV2 />} />
           <Route
             path={clusterTopicSettingsRelativePath}
             element={<Settings />}
@@ -192,12 +199,15 @@ const Topic: React.FC = () => {
             element={<Statistics />}
           />
           <Route path={clusterTopicEditRelativePath} element={<Edit />} />
-          <Route
-            path={clusterTopicSendMessageRelativePath}
-            element={<SendMessage />}
-          />
         </Routes>
       </Suspense>
+      <SlidingSidebar
+        open={isSidebarOpen}
+        onClose={closeSidebar}
+        title="Produce Message"
+      >
+        <SendMessage onSubmit={closeSidebar} />
+      </SlidingSidebar>
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
index 00a70630cb0..dd9d0c59c7c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
@@ -46,6 +46,9 @@ jest.mock('components/Topics/Topic/Overview/Overview', () => () => (
 jest.mock('components/Topics/Topic/Messages/Messages', () => () => (
   <>MessagesMock</>
 ));
+jest.mock('components/Topics/Topic/SendMessage/SendMessage', () => () => (
+  <>SendMessageMock</>
+));
 jest.mock('components/Topics/Topic/Settings/Settings', () => () => (
   <>SettingsMock</>
 ));
@@ -98,9 +101,11 @@ describe('Details', () => {
   });
   describe('Action Bar', () => {
     describe('when it has readonly flag', () => {
-      it('renders disabled the Action button a Topic', () => {
+      it('renders disabled the Action button', () => {
         renderComponent(true);
-        expect(screen.getByText('Produce Message')).toBeDisabled();
+        expect(
+          screen.getByRole('button', { name: 'Produce Message' })
+        ).toBeDisabled();
       });
     });
 
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
index 584f041328f..daf26ac1280 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.tsx
@@ -1,7 +1,7 @@
 import { MenuProps } from '@szhsin/react-menu';
 import React, { PropsWithChildren, useRef } from 'react';
 import VerticalElipsisIcon from 'components/common/Icons/VerticalElipsisIcon';
-import useModal from 'lib/hooks/useModal';
+import useBoolean from 'lib/hooks/useBoolean';
 
 import * as S from './Dropdown.styled';
 
@@ -12,12 +12,12 @@ interface DropdownProps extends PropsWithChildren<Partial<MenuProps>> {
 
 const Dropdown: React.FC<DropdownProps> = ({ label, disabled, children }) => {
   const ref = useRef(null);
-  const { isOpen, setClose, setOpen } = useModal(false);
+  const { value: isOpen, setFalse, setTrue } = useBoolean(false);
 
   const handleClick: React.MouseEventHandler<HTMLButtonElement> = (e) => {
     e.preventDefault();
     e.stopPropagation();
-    setOpen();
+    setTrue();
   };
 
   return (
@@ -33,8 +33,8 @@ const Dropdown: React.FC<DropdownProps> = ({ label, disabled, children }) => {
       <S.Dropdown
         anchorRef={ref}
         state={isOpen ? 'open' : 'closed'}
-        onMouseLeave={setClose}
-        onClose={setClose}
+        onMouseLeave={setFalse}
+        onClose={setFalse}
         align="end"
         direction="bottom"
         offsetY={10}
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
index 06a69d7dde8..f1c91e3a530 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
@@ -2,7 +2,7 @@ import styled, { css } from 'styled-components';
 
 export interface InputProps {
   inputSize?: 'S' | 'M' | 'L';
-  hasLeftIcon: boolean;
+  search: boolean;
 }
 
 const INPUT_SIZES = {
@@ -14,7 +14,7 @@ const INPUT_SIZES = {
 export const Wrapper = styled.div`
   position: relative;
 
-  svg {
+  svg:first-child {
     position: absolute;
     top: 8px;
     line-height: 0;
@@ -28,14 +28,14 @@ export const Wrapper = styled.div`
 `;
 
 export const Input = styled.input<InputProps>(
-  ({ theme: { input }, inputSize, hasLeftIcon }) => css`
+  ({ theme: { input }, inputSize, search }) => css`
     border: 1px ${input.borderColor.normal} solid;
     border-radius: 4px;
     height: ${inputSize && INPUT_SIZES[inputSize]
       ? INPUT_SIZES[inputSize]
       : '40px'};
     width: 100%;
-    padding-left: ${hasLeftIcon ? '36px' : '12px'};
+    padding-left: ${search ? '36px' : '12px'};
     font-size: 14px;
 
     &::placeholder {
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.tsx b/kafka-ui-react-app/src/components/common/Input/Input.tsx
index c524b6be2e4..932f954aa5c 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/Input.tsx
@@ -6,7 +6,7 @@ import * as S from './Input.styled';
 
 export interface InputProps
   extends React.InputHTMLAttributes<HTMLInputElement>,
-    Omit<S.InputProps, 'hasLeftIcon'> {
+    Omit<S.InputProps, 'search'> {
   name?: string;
   hookFormOptions?: RegisterOptions;
   search?: boolean;
@@ -74,7 +74,7 @@ const Input: React.FC<InputProps> = ({
       {search && <SearchIcon />}
       <S.Input
         inputSize={inputSize}
-        hasLeftIcon={!!search}
+        search={!!search}
         type={type}
         onKeyPress={keyPressEventHandler}
         onPaste={pasteEventHandler}
diff --git a/kafka-ui-react-app/src/components/common/Input/InputLabel.styled.ts b/kafka-ui-react-app/src/components/common/Input/InputLabel.styled.ts
index 392145f3703..646beabc10d 100644
--- a/kafka-ui-react-app/src/components/common/Input/InputLabel.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Input/InputLabel.styled.ts
@@ -5,4 +5,10 @@ export const InputLabel = styled.label`
   font-size: 12px;
   line-height: 20px;
   color: ${({ theme }) => theme.input.label.color};
+
+  input[type='checkbox'] {
+    display: inline-block;
+    margin-right: 8px;
+    vertical-align: text-top;
+  }
 `;
diff --git a/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts b/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts
index 0052a99411b..d6ea81d5ac4 100644
--- a/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts
+++ b/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import ReactMultiSelect from 'react-multi-select-component';
+import { MultiSelect as ReactMultiSelect } from 'react-multi-select-component';
 
 const MultiSelect = styled(ReactMultiSelect)<{ minWidth?: string }>`
   min-width: ${({ minWidth }) => minWidth || '200px;'};
diff --git a/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts b/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
index f7fda2b83c7..ff4eca6999d 100644
--- a/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
@@ -3,6 +3,7 @@ import styled from 'styled-components';
 const Navbar = styled.nav`
   display: flex;
   border-bottom: 1px ${({ theme }) => theme.primaryTab.borderColor.nav} solid;
+  height: ${({ theme }) => theme.primaryTab.height};
   & a {
     height: 40px;
     min-width: 96px;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
index 75671beca90..483e4e32160 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
@@ -203,3 +203,11 @@ export const PageInfo = styled.div`
   white-space: nowrap;
   margin-left: 16px;
 `;
+
+export const Ellipsis = styled.div`
+  max-width: 300px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: block;
+`;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 863c17ca149..2d1646aa99e 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -115,11 +115,11 @@ const Table: React.FC<TableProps<any>> = ({
   pageCount,
   columns,
   getRowCanExpand,
-  renderSubComponent,
+  renderSubComponent: SubComponent,
   serverSideProcessing = false,
   enableSorting = false,
   enableRowSelection = false,
-  batchActionsBar,
+  batchActionsBar: BatchActionsBar,
   emptyMessage,
   onRowClick,
 }) => {
@@ -170,8 +170,6 @@ const Table: React.FC<TableProps<any>> = ({
     enableRowSelection,
   });
 
-  const Bar = batchActionsBar;
-
   const handleRowClick = (row: Row<typeof data>) => (e: React.MouseEvent) => {
     // If row selection is enabled do not handle row click.
     if (enableRowSelection) return undefined;
@@ -192,9 +190,9 @@ const Table: React.FC<TableProps<any>> = ({
 
   return (
     <>
-      {table.getSelectedRowModel().flatRows.length > 0 && Bar && (
+      {table.getSelectedRowModel().flatRows.length > 0 && BatchActionsBar && (
         <S.TableActionsBar>
-          <Bar
+          <BatchActionsBar
             rows={table.getSelectedRowModel().flatRows}
             resetRowSelection={table.resetRowSelection}
           />
@@ -269,11 +267,11 @@ const Table: React.FC<TableProps<any>> = ({
                     </td>
                   ))}
               </S.Row>
-              {row.getIsExpanded() && renderSubComponent && (
+              {row.getIsExpanded() && SubComponent && (
                 <S.Row expanded>
                   <td colSpan={row.getVisibleCells().length + 2}>
                     <S.ExpandedRowInfo>
-                      {renderSubComponent({ row })}
+                      <SubComponent row={row} />
                     </S.ExpandedRowInfo>
                   </td>
                 </S.Row>
diff --git a/kafka-ui-react-app/src/components/common/NewTable/TimestampCell copy.tsx b/kafka-ui-react-app/src/components/common/NewTable/TimestampCell copy.tsx
new file mode 100644
index 00000000000..c5ad01c7c9d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/TimestampCell copy.tsx	
@@ -0,0 +1,11 @@
+import { CellContext } from '@tanstack/react-table';
+import React from 'react';
+
+import * as S from './Table.styled';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const TruncatedTextCell: React.FC<CellContext<any, unknown>> = ({
+  getValue,
+}) => <S.Ellipsis>{getValue<string>()}</S.Ellipsis>;
+
+export default TruncatedTextCell;
diff --git a/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx b/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx
index d3f986bb2c8..6257040940a 100644
--- a/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx
@@ -5,7 +5,7 @@ export const List = styled.div`
   grid-template-columns: repeat(2, max-content);
   gap: 8px;
   column-gap: 24px;
-  margin-top: 16px;
+  margin: 16px 0;
   text-align: left;
 `;
 
@@ -15,3 +15,8 @@ export const Label = styled.div`
   color: ${({ theme }) => theme.list.label.color};
   white-space: nowrap;
 `;
+
+export const SubText = styled.div`
+  color: ${({ theme }) => theme.list.meta.color};
+  font-size: 12px;
+`;
diff --git a/kafka-ui-react-app/src/components/common/Search/Search.tsx b/kafka-ui-react-app/src/components/common/Search/Search.tsx
index 78dd758f998..9baf1ed3b2e 100644
--- a/kafka-ui-react-app/src/components/common/Search/Search.tsx
+++ b/kafka-ui-react-app/src/components/common/Search/Search.tsx
@@ -1,31 +1,37 @@
 import React from 'react';
 import { useDebouncedCallback } from 'use-debounce';
 import Input from 'components/common/Input/Input';
+import { useSearchParams } from 'react-router-dom';
 
 interface SearchProps {
-  handleSearch: (value: string) => void;
   placeholder?: string;
-  value: string;
   disabled?: boolean;
+  onChange?: (value: string) => void;
+  value?: string;
 }
 
 const Search: React.FC<SearchProps> = ({
-  handleSearch,
   placeholder = 'Search',
-  value,
   disabled = false,
+  value,
+  onChange,
 }) => {
-  const onChange = useDebouncedCallback(
-    (e) => handleSearch(e.target.value),
-    300
-  );
+  const [searchParams, setSearchParams] = useSearchParams();
+  const handleChange = useDebouncedCallback((e) => {
+    if (onChange) {
+      onChange(e.target.value);
+    } else {
+      searchParams.set('q', e.target.value);
+      setSearchParams(searchParams);
+    }
+  }, 500);
 
   return (
     <Input
       type="text"
       placeholder={placeholder}
-      onChange={onChange}
-      defaultValue={value}
+      onChange={handleChange}
+      defaultValue={value || searchParams.get('q') || ''}
       inputSize="M"
       disabled={disabled}
       search
diff --git a/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx b/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx
index 1d9b5deaec8..b9d1aa362b4 100644
--- a/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx
@@ -3,42 +3,42 @@ import React from 'react';
 import { render } from 'lib/testHelpers';
 import userEvent from '@testing-library/user-event';
 import { screen } from '@testing-library/react';
+import { useSearchParams } from 'react-router-dom';
 
 jest.mock('use-debounce', () => ({
   useDebouncedCallback: (fn: (e: Event) => void) => fn,
 }));
 
+const setSearchParamsMock = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...(jest.requireActual('react-router-dom') as object),
+  useSearchParams: jest.fn(),
+}));
+
+const placeholder = 'I am a search placeholder';
+
 describe('Search', () => {
-  const handleSearch = jest.fn();
+  beforeEach(() => {
+    (useSearchParams as jest.Mock).mockImplementation(() => [
+      new URLSearchParams(),
+      setSearchParamsMock,
+    ]);
+  });
   it('calls handleSearch on input', () => {
-    render(
-      <Search
-        handleSearch={handleSearch}
-        value=""
-        placeholder="Search bt the Topic name"
-      />
-    );
-    const input = screen.getByPlaceholderText('Search bt the Topic name');
+    render(<Search placeholder={placeholder} />);
+    const input = screen.getByPlaceholderText(placeholder);
     userEvent.click(input);
     userEvent.keyboard('value');
-    expect(handleSearch).toHaveBeenCalledTimes(5);
+    expect(setSearchParamsMock).toHaveBeenCalledTimes(5);
   });
 
   it('when placeholder is provided', () => {
-    render(
-      <Search
-        handleSearch={handleSearch}
-        value=""
-        placeholder="Search bt the Topic name"
-      />
-    );
-    expect(
-      screen.getByPlaceholderText('Search bt the Topic name')
-    ).toBeInTheDocument();
+    render(<Search placeholder={placeholder} />);
+    expect(screen.getByPlaceholderText(placeholder)).toBeInTheDocument();
   });
 
   it('when placeholder is not provided', () => {
-    render(<Search handleSearch={handleSearch} value="" />);
+    render(<Search />);
     expect(screen.queryByPlaceholderText('Search')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts b/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts
new file mode 100644
index 00000000000..1b1a7ac0d40
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts
@@ -0,0 +1,36 @@
+import styled from 'styled-components';
+
+export const Wrapper = styled.div<{ $open?: boolean }>(
+  ({ theme, $open }) => `
+  background-color: ${theme.layout.backgroundColor};
+  position: fixed;
+  top: ${theme.layout.navBarHeight};
+  bottom: 0;
+  width: 60vw;
+  right: calc(${$open ? '0px' : theme.layout.rightSidebarWidth} * -1);
+  box-shadow: -1px 0px 10px 0px rgba(0, 0, 0, 0.2);
+  transition: right 0.3s linear;
+  z-index: 200;
+
+  h3 {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid ${theme.layout.stuffBorderColor};
+    padding: 16px;
+  }
+`
+);
+
+export const Content = styled.div<{ $open?: boolean }>(
+  ({ theme }) => `
+  background-color: ${theme.layout.backgroundColor};
+  overflow-y: auto;
+  position: absolute;
+  top: 65px;
+  bottom: 16px;
+  left: 0;
+  right: 0;
+  padding: 16px;
+`
+);
diff --git a/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.tsx b/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.tsx
new file mode 100644
index 00000000000..40ef062d51b
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.tsx
@@ -0,0 +1,32 @@
+import React, { PropsWithChildren } from 'react';
+import Heading from 'components/common/heading/Heading.styled';
+import { Button } from 'components/common/Button/Button';
+
+import * as S from './SlidingSidebar.styled';
+
+interface SlidingSidebarProps extends PropsWithChildren<unknown> {
+  open?: boolean;
+  title: string;
+  onClose?: () => void;
+}
+
+const SlidingSidebar: React.FC<SlidingSidebarProps> = ({
+  open,
+  title,
+  children,
+  onClose,
+}) => {
+  return (
+    <S.Wrapper $open={open}>
+      <Heading level={3}>
+        <span>{title}</span>
+        <Button buttonSize="M" buttonType="primary" onClick={onClose}>
+          Close
+        </Button>
+      </Heading>
+      <S.Content>{children}</S.Content>
+    </S.Wrapper>
+  );
+};
+
+export default SlidingSidebar;
diff --git a/kafka-ui-react-app/src/components/common/SlidingSidebar/index.ts b/kafka-ui-react-app/src/components/common/SlidingSidebar/index.ts
new file mode 100644
index 00000000000..9406bfa4179
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/SlidingSidebar/index.ts
@@ -0,0 +1,3 @@
+import SlidingSidebar from './SlidingSidebar';
+
+export default SlidingSidebar;
diff --git a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
index 4fb4a3360ce..c6abb770742 100644
--- a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
+++ b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts
@@ -204,17 +204,6 @@ describe('Paths', () => {
       )
     );
   });
-  it('clusterTopicSendMessagePath', () => {
-    expect(paths.clusterTopicSendMessagePath(clusterName, topicId)).toEqual(
-      `${paths.clusterTopicPath(clusterName, topicId)}/message`
-    );
-    expect(paths.clusterTopicSendMessagePath()).toEqual(
-      paths.clusterTopicSendMessagePath(
-        RouteParams.clusterName,
-        RouteParams.topicName
-      )
-    );
-  });
   it('clusterTopicEditPath', () => {
     expect(paths.clusterTopicEditPath(clusterName, topicId)).toEqual(
       `${paths.clusterTopicPath(clusterName, topicId)}/edit`
diff --git a/kafka-ui-react-app/src/lib/constants.ts b/kafka-ui-react-app/src/lib/constants.ts
index 49ca968ba44..5d4a40e724c 100644
--- a/kafka-ui-react-app/src/lib/constants.ts
+++ b/kafka-ui-react-app/src/lib/constants.ts
@@ -51,6 +51,7 @@ export const NOT_SET = -1;
 export const BYTES_IN_GB = 1_073_741_824;
 
 export const PER_PAGE = 25;
+export const MESSAGES_PER_PAGE = '100';
 
 export const GIT_REPO_LINK = 'https://github.com/provectus/kafka-ui';
 export const GIT_REPO_LATEST_RELEASE_LINK =
@@ -58,6 +59,8 @@ export const GIT_REPO_LATEST_RELEASE_LINK =
 export const GIT_TAG = process.env.VITE_TAG;
 export const GIT_COMMIT = process.env.VITE_COMMIT;
 
+export const LOCAL_STORAGE_KEY_PREFIX = 'kafka-ui';
+
 export enum AsyncRequestStatus {
   initial = 'initial',
   pending = 'pending',
diff --git a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
index b32a3c27998..0a9306464c1 100644
--- a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
+++ b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
@@ -10,3 +10,25 @@ export const formatTimestamp = (
 
   return dayjs(timestamp).format(format);
 };
+
+export const formatMilliseconds = (input = 0) => {
+  const milliseconds = Math.max(input || 0, 0);
+
+  const seconds = Math.floor(milliseconds / 1000);
+  const minutes = Math.floor(seconds / 60);
+  const hours = Math.floor(minutes / 60);
+
+  if (hours > 0) {
+    return `${hours}h ${minutes % 60}m`;
+  }
+
+  if (minutes > 0) {
+    return `${minutes}m ${seconds % 60}s`;
+  }
+
+  if (seconds > 0) {
+    return `${seconds}s`;
+  }
+
+  return `${milliseconds}ms`;
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/useBoolean.spec.ts b/kafka-ui-react-app/src/lib/hooks/__tests__/useBoolean.spec.ts
new file mode 100644
index 00000000000..12ec120752d
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/useBoolean.spec.ts
@@ -0,0 +1,66 @@
+import { renderHook, act } from '@testing-library/react';
+import useBoolean from 'lib/hooks/useBoolean';
+
+describe('useBoolean CustomHook', () => {
+  it('should check true initial values', () => {
+    let initialValue = true;
+    const { result, rerender } = renderHook(() => useBoolean(initialValue));
+    expect(result.current.value).toBe(initialValue);
+    initialValue = false;
+    rerender();
+    // because state is in useState
+    expect(result.current.value).not.toBe(initialValue);
+  });
+
+  it('should check false initial values', () => {
+    let initialValue = false;
+    const { result, rerender } = renderHook(() => useBoolean(initialValue));
+    expect(result.current.value).toBe(initialValue);
+
+    initialValue = true;
+    rerender();
+    // because state is in useState
+    expect(result.current.value).not.toBe(initialValue);
+  });
+
+  it('should check setTrue function', () => {
+    const { result } = renderHook(() => useBoolean());
+    expect(result.current.value).toBeFalsy();
+    act(() => {
+      result.current.setTrue();
+    });
+    expect(result.current.value).toBeTruthy();
+  });
+
+  it('should check setFalse function', () => {
+    const { result } = renderHook(() => useBoolean());
+
+    expect(result.current.value).toBeFalsy();
+    act(() => {
+      result.current.setTrue();
+    });
+
+    expect(result.current.value).toBeTruthy();
+
+    act(() => {
+      result.current.setFalse();
+    });
+    expect(result.current.value).toBeFalsy();
+  });
+
+  it('should check setToggle function', () => {
+    const { result } = renderHook(() => useBoolean());
+
+    expect(result.current.value).toBeFalsy();
+    act(() => {
+      result.current.toggle();
+    });
+
+    expect(result.current.value).toBeTruthy();
+
+    act(() => {
+      result.current.toggle();
+    });
+    expect(result.current.value).toBeFalsy();
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/useModal.spec.ts b/kafka-ui-react-app/src/lib/hooks/__tests__/useModal.spec.ts
deleted file mode 100644
index 85064e4ea83..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/__tests__/useModal.spec.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { renderHook, act } from '@testing-library/react';
-import useModal from 'lib/hooks/useModal';
-
-describe('useModal CustomHook', () => {
-  it('should check true initial values', () => {
-    let initialValue = true;
-    const { result, rerender } = renderHook(() => useModal(initialValue));
-    expect(result.current.isOpen).toBe(initialValue);
-    initialValue = false;
-    rerender();
-    // because state is in useState
-    expect(result.current.isOpen).not.toBe(initialValue);
-  });
-
-  it('should check false initial values', () => {
-    let initialValue = false;
-    const { result, rerender } = renderHook(() => useModal(initialValue));
-    expect(result.current.isOpen).toBe(initialValue);
-
-    initialValue = true;
-    rerender();
-    // because state is in useState
-    expect(result.current.isOpen).not.toBe(initialValue);
-  });
-
-  it('should check setOpen function', () => {
-    const { result } = renderHook(() => useModal());
-    expect(result.current.isOpen).toBeFalsy();
-    act(() => {
-      result.current.setOpen();
-    });
-    expect(result.current.isOpen).toBeTruthy();
-  });
-
-  it('should check setClose function', () => {
-    const { result } = renderHook(() => useModal());
-
-    expect(result.current.isOpen).toBeFalsy();
-    act(() => {
-      result.current.setOpen();
-    });
-
-    expect(result.current.isOpen).toBeTruthy();
-
-    act(() => {
-      result.current.setClose();
-    });
-    expect(result.current.isOpen).toBeFalsy();
-  });
-
-  it('should check setToggle function', () => {
-    const { result } = renderHook(() => useModal());
-
-    expect(result.current.isOpen).toBeFalsy();
-    act(() => {
-      result.current.toggle();
-    });
-
-    expect(result.current.isOpen).toBeTruthy();
-
-    act(() => {
-      result.current.toggle();
-    });
-    expect(result.current.isOpen).toBeFalsy();
-  });
-});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
new file mode 100644
index 00000000000..80c9ea02ab9
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
@@ -0,0 +1,177 @@
+import React from 'react';
+import { fetchEventSource } from '@microsoft/fetch-event-source';
+import { BASE_PARAMS, MESSAGES_PER_PAGE } from 'lib/constants';
+import { ClusterName } from 'redux/interfaces';
+import {
+  SeekDirection,
+  SeekType,
+  TopicMessage,
+  TopicMessageConsuming,
+  TopicMessageEvent,
+  TopicMessageEventTypeEnum,
+} from 'generated-sources';
+import { showServerError } from 'lib/errorHandling';
+import toast from 'react-hot-toast';
+import { StopLoading } from 'components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled';
+
+interface UseTopicMessagesProps {
+  clusterName: ClusterName;
+  topicName: string;
+  searchParams: URLSearchParams;
+}
+
+export type ConsumingMode =
+  | 'live'
+  | 'oldest'
+  | 'newest'
+  | 'fromOffset' // from 900 -> 1000
+  | 'toOffset' // from 900 -> 800
+  | 'sinceTime' // from 10:15 -> 11:15
+  | 'untilTime'; // from 10:15 -> 9:15
+
+export const useTopicMessages = ({
+  clusterName,
+  topicName,
+  searchParams,
+}: UseTopicMessagesProps) => {
+  const [messages, setMessages] = React.useState<TopicMessage[]>([]);
+  const [phase, setPhase] = React.useState<string>();
+  const [meta, setMeta] = React.useState<TopicMessageConsuming>();
+  const [isFetching, setIsFetching] = React.useState<boolean>(false);
+  const abortController = new AbortController();
+
+  // get initial properties
+  const mode = searchParams.get('m') as ConsumingMode;
+  const limit = searchParams.get('perPage') || MESSAGES_PER_PAGE;
+  const seekTo = searchParams.get('seekTo') || '0-0';
+
+  React.useEffect(() => {
+    const fetchData = async () => {
+      setIsFetching(true);
+      const url = `${BASE_PARAMS.basePath}/api/clusters/${clusterName}/topics/${topicName}/messages`;
+      const requestParams = new URLSearchParams({
+        limit,
+        seekTo: seekTo.replaceAll('-', '::').replaceAll('.', ','),
+        q: searchParams.get('q') || '',
+      });
+
+      switch (mode) {
+        case 'live':
+          requestParams.set('seekDirection', SeekDirection.TAILING);
+          requestParams.set('seekType', SeekType.LATEST);
+          break;
+        case 'oldest':
+          requestParams.set('seekType', SeekType.BEGINNING);
+          requestParams.set('seekDirection', SeekDirection.FORWARD);
+          break;
+        case 'newest':
+          requestParams.set('seekType', SeekType.LATEST);
+          requestParams.set('seekDirection', SeekDirection.BACKWARD);
+          break;
+        case 'fromOffset':
+          requestParams.set('seekType', SeekType.OFFSET);
+          requestParams.set('seekDirection', SeekDirection.FORWARD);
+          break;
+        case 'toOffset':
+          requestParams.set('seekType', SeekType.OFFSET);
+          requestParams.set('seekDirection', SeekDirection.BACKWARD);
+          break;
+        case 'sinceTime':
+          requestParams.set('seekType', SeekType.TIMESTAMP);
+          requestParams.set('seekDirection', SeekDirection.FORWARD);
+          break;
+        case 'untilTime':
+          requestParams.set('seekType', SeekType.TIMESTAMP);
+          requestParams.set('seekDirection', SeekDirection.BACKWARD);
+          break;
+        default:
+          break;
+      }
+
+      await fetchEventSource(`${url}?${requestParams.toString()}`, {
+        method: 'GET',
+        signal: abortController.signal,
+        openWhenHidden: true,
+        async onopen(response) {
+          const { ok, status } = response;
+          if (ok && status === 200) {
+            // Reset list of messages.
+            setMessages([]);
+          } else if (status >= 400 && status < 500 && status !== 429) {
+            showServerError(response);
+          }
+        },
+        onmessage(event) {
+          const parsedData: TopicMessageEvent = JSON.parse(event.data);
+          const { message, consuming } = parsedData;
+
+          switch (parsedData.type) {
+            case TopicMessageEventTypeEnum.MESSAGE:
+              if (message) {
+                setMessages((prevMessages) => {
+                  if (mode === 'live') {
+                    return [message, ...prevMessages];
+                  }
+                  return [...prevMessages, message];
+                });
+              }
+              break;
+            case TopicMessageEventTypeEnum.PHASE:
+              if (parsedData.phase?.name) setPhase(parsedData.phase.name);
+              break;
+            case TopicMessageEventTypeEnum.CONSUMING:
+              if (consuming) setMeta(consuming);
+              break;
+            default:
+          }
+        },
+        onclose() {
+          setIsFetching(false);
+        },
+        onerror(err) {
+          setIsFetching(false);
+          showServerError(err);
+        },
+      });
+    };
+    const abortFetchData = () => {
+      setIsFetching(false);
+      abortController.abort();
+    };
+
+    if (mode === 'live') {
+      toast.promise(
+        fetchData(),
+        {
+          loading: (
+            <>
+              <div>Consuming messages...</div>
+              &nbsp;
+              <StopLoading onClick={abortFetchData}>Abort</StopLoading>
+            </>
+          ),
+          success: 'Cancelled',
+          error: 'Something went wrong. Please try again.',
+        },
+        {
+          id: 'messages',
+          position: 'top-center',
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore - missing type for icon
+          success: { duration: 10, icon: false },
+        }
+      );
+    } else {
+      fetchData();
+    }
+
+    return abortFetchData;
+  }, [searchParams]);
+
+  return {
+    phase,
+    messages,
+    meta,
+    isFetching,
+  };
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/useBoolean.ts b/kafka-ui-react-app/src/lib/hooks/useBoolean.ts
new file mode 100644
index 00000000000..ac016ef1a05
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useBoolean.ts
@@ -0,0 +1,21 @@
+import { useCallback, useState } from 'react';
+
+interface ReturnType {
+  value: boolean;
+  setTrue: () => void;
+  setFalse: () => void;
+  toggle: () => void;
+  setValue: React.Dispatch<React.SetStateAction<boolean>>;
+}
+
+function useBoolean(defaultValue?: boolean): ReturnType {
+  const [value, setValue] = useState(!!defaultValue);
+
+  const setTrue = useCallback(() => setValue(true), []);
+  const setFalse = useCallback(() => setValue(false), []);
+  const toggle = useCallback(() => setValue((x) => !x), []);
+
+  return { value, setValue, setTrue, setFalse, toggle };
+}
+
+export default useBoolean;
diff --git a/kafka-ui-react-app/src/lib/hooks/useLocalStorage.ts b/kafka-ui-react-app/src/lib/hooks/useLocalStorage.ts
new file mode 100644
index 00000000000..d8945620db3
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useLocalStorage.ts
@@ -0,0 +1,20 @@
+import { LOCAL_STORAGE_KEY_PREFIX } from 'lib/constants';
+import { useState, useEffect } from 'react';
+
+export const useLocalStorage = (featureKey: string, defaultValue: string) => {
+  const key = `${LOCAL_STORAGE_KEY_PREFIX}-${featureKey}`;
+  const [value, setValue] = useState(() => {
+    const saved = localStorage.getItem(key);
+
+    if (saved !== null) {
+      return JSON.parse(saved);
+    }
+    return defaultValue;
+  });
+
+  useEffect(() => {
+    localStorage.setItem(key, JSON.stringify(value));
+  }, [key, value]);
+
+  return [value, setValue];
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/useMessageFiltersStore.ts b/kafka-ui-react-app/src/lib/hooks/useMessageFiltersStore.ts
new file mode 100644
index 00000000000..9aa59b00e07
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useMessageFiltersStore.ts
@@ -0,0 +1,41 @@
+import { LOCAL_STORAGE_KEY_PREFIX } from 'lib/constants';
+import create from 'zustand';
+import { persist } from 'zustand/middleware';
+
+export interface AdvancedFilter {
+  name: string;
+  value: string;
+}
+
+interface MessageFiltersState {
+  filters: AdvancedFilter[];
+  activeFilter?: AdvancedFilter;
+  save: (filter: AdvancedFilter) => void;
+  apply: (filter: AdvancedFilter) => void;
+  remove: (name: string) => void;
+  update: (name: string, filter: AdvancedFilter) => void;
+}
+
+export const useMessageFiltersStore = create<MessageFiltersState>()(
+  persist(
+    (set) => ({
+      filters: [],
+      save: (filter) =>
+        set((state) => ({
+          filters: [...state.filters, filter],
+        })),
+      apply: (filter) => set(() => ({ activeFilter: filter })),
+      remove: (name) =>
+        set((state) => ({
+          filters: state.filters.filter((f) => f.name !== name),
+        })),
+      update: (name, filter) =>
+        set((state) => ({
+          filters: state.filters.map((f) => (f.name === name ? filter : f)),
+        })),
+    }),
+    {
+      name: `${LOCAL_STORAGE_KEY_PREFIX}-message-filters`,
+    }
+  )
+);
diff --git a/kafka-ui-react-app/src/lib/hooks/useModal.ts b/kafka-ui-react-app/src/lib/hooks/useModal.ts
deleted file mode 100644
index 88a417aab4c..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/useModal.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { useCallback, useState } from 'react';
-
-interface UseModalReturn {
-  isOpen: boolean;
-  setOpen(): void;
-  setClose(): void;
-  toggle(): void;
-}
-const useModal = (initialModalState?: boolean): UseModalReturn => {
-  const [modalOpen, setModalOpen] = useState<boolean>(!!initialModalState);
-
-  const setOpen = useCallback(() => {
-    setModalOpen(true);
-  }, []);
-
-  const setClose = useCallback(() => {
-    setModalOpen(false);
-  }, []);
-
-  const toggle = useCallback(() => {
-    setModalOpen((prev) => !prev);
-  }, []);
-
-  return {
-    isOpen: modalOpen,
-    setOpen,
-    setClose,
-    toggle,
-  };
-};
-
-export default useModal;
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 8fb14ad0881..94609de4911 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -148,7 +148,6 @@ export const clusterTopicMessagesRelativePath = 'messages';
 export const clusterTopicConsumerGroupsRelativePath = 'consumer-groups';
 export const clusterTopicStatisticsRelativePath = 'statistics';
 export const clusterTopicEditRelativePath = 'edit';
-export const clusterTopicSendMessageRelativePath = 'message';
 export const clusterTopicPath = (
   clusterName: ClusterName = RouteParams.clusterName,
   topicName: TopicName = RouteParams.topicName
@@ -190,14 +189,6 @@ export const clusterTopicStatisticsPath = (
     clusterName,
     topicName
   )}/${clusterTopicStatisticsRelativePath}`;
-export const clusterTopicSendMessagePath = (
-  clusterName: ClusterName = RouteParams.clusterName,
-  topicName: TopicName = RouteParams.topicName
-) =>
-  `${clusterTopicPath(
-    clusterName,
-    topicName
-  )}/${clusterTopicSendMessageRelativePath}`;
 
 export type RouteParamsClusterTopic = {
   clusterName: ClusterName;
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index a962b2a5356..d05ad54cb94 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -75,6 +75,9 @@ const theme = {
     label: {
       color: Colors.neutral[50],
     },
+    meta: {
+      color: Colors.neutral[30],
+    },
   },
   progressBar: {
     backgroundColor: Colors.neutral[3],
@@ -86,6 +89,8 @@ const theme = {
     minWidth: '1200px',
     navBarWidth: '201px',
     navBarHeight: '53px',
+    rightSidebarWidth: '70vw',
+
     stuffColor: Colors.neutral[5],
     stuffBorderColor: Colors.neutral[10],
     overlay: {
@@ -96,6 +101,7 @@ const theme = {
     },
   },
   pageHeading: {
+    height: '64px',
     dividerColor: Colors.neutral[30],
     backLink: {
       color: {
@@ -350,6 +356,7 @@ const theme = {
     },
   },
   primaryTab: {
+    height: '41px',
     color: {
       normal: Colors.neutral[50],
       hover: Colors.neutral[90],

From cb0586bd444fd54e47f9ca525550317508db9cff Mon Sep 17 00:00:00 2001
From: BulatKha <112083452+BulatKha@users.noreply.github.com>
Date: Tue, 20 Sep 2022 14:24:36 +0300
Subject: [PATCH 176/734] Fix a typo in readme (#2617)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c3b1be9a3e7..4236f40116f 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 ### DISCLAIMER
 <em>UI for Apache Kafka is a free tool built and supported by the open-source community. Curated by Provectus, it will remain free and open-source, without any paid features or subscription plans to be added in the future.
-Looking for the help of Kafka experts? Provectus can help you design, build, deploy, and manage Apache Kafka clusters and streaming applications. Discover [Professional Services for Apache Kafka](https://provectus.com/professional-services-apache-kafka/), to unlock the full potential of Kafka in your enteprise! </em>
+Looking for the help of Kafka experts? Provectus can help you design, build, deploy, and manage Apache Kafka clusters and streaming applications. Discover [Professional Services for Apache Kafka](https://provectus.com/professional-services-apache-kafka/), to unlock the full potential of Kafka in your enterprise! </em>
 
 
 #### UI for Apache Kafka is a free, open-source web UI to monitor and manage Apache Kafka clusters.

From b4424fc9608b4c8a3b54fba02f5a5395c5a1236e Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Tue, 20 Sep 2022 17:29:46 +0300
Subject: [PATCH 177/734] [e2e] Fix produce message test (#2619)

* fix tests on master

* fix produceMessage()

* fix produceMessage()

* fix produceMessage()
---
 .../com/provectus/kafka/ui/pages/Pages.java   |  3 +-
 .../kafka/ui/pages/ProduceMessagePage.java    | 44 -----------------
 .../ui/pages/topic/ProduceMessagePanel.java   | 48 +++++++++++++++++++
 .../kafka/ui/pages/topic/TopicView.java       |  6 +--
 .../com/provectus/kafka/ui/SmokeTests.java    |  2 +-
 5 files changed, 53 insertions(+), 50 deletions(-)
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
index aced5fe89cf..79a7652dd4d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
@@ -3,6 +3,7 @@
 import com.provectus.kafka.ui.pages.connector.ConnectorsList;
 import com.provectus.kafka.ui.pages.connector.ConnectorsView;
 import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
+import com.provectus.kafka.ui.pages.topic.ProduceMessagePanel;
 import com.provectus.kafka.ui.pages.topic.TopicView;
 import com.provectus.kafka.ui.pages.topic.TopicsList;
 import io.qameta.allure.Step;
@@ -14,7 +15,7 @@ public class Pages {
     public MainPage mainPage = new MainPage();
     public TopicsList topicsList = new TopicsList();
     public TopicView topicView = new TopicView();
-    public ProduceMessagePage produceMessagePage = new ProduceMessagePage();
+    public ProduceMessagePanel produceMessagePanel = new ProduceMessagePanel();
     public ConnectorsList connectorsList = new ConnectorsList();
     public ConnectorsView connectorsView = new ConnectorsView();
     public SchemaRegistryList schemaRegistry = new SchemaRegistryList();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
deleted file mode 100644
index 369cf56ea8d..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ProduceMessagePage.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.provectus.kafka.ui.pages;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.pages.topic.TopicView;
-import io.qameta.allure.Step;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.Wait;
-
-public class ProduceMessagePage{
-
-    private final SelenideElement keyField = $(By.xpath("//div[@id = 'key']/textarea"));
-    private final SelenideElement contentField = $(By.xpath("//div[@id = 'content']/textarea"));
-    private final SelenideElement headersField = $(By.xpath("//div[@id = 'headers']/textarea"));
-    private final SelenideElement sendBtn = $(By.xpath("//button[@type = 'submit']"));
-    @Step
-    public ProduceMessagePage setKeyField(String value) {
-        Wait().until(ExpectedConditions.urlContains("message"));
-        keyField.sendKeys(Keys.chord(Keys.DELETE));
-        keyField.setValue(value);
-        return this;
-    }
-    @Step
-    public ProduceMessagePage setContentFiled(String value) {
-        Wait().until(ExpectedConditions.urlContains("message"));
-        contentField.sendKeys(Keys.DELETE);
-        contentField.setValue(value);
-        return this;
-    }
-    @Step
-    public ProduceMessagePage setHeaderFiled(String value) {
-        headersField.setValue(value);
-        return new ProduceMessagePage();
-    }
-    @Step
-    public TopicView submitProduceMessage() {
-        sendBtn.shouldBe(Condition.visible).click();
-        return new TopicView();
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
new file mode 100644
index 00000000000..6abd045a068
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
@@ -0,0 +1,48 @@
+package com.provectus.kafka.ui.pages.topic;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import io.qameta.allure.Step;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.refresh;
+
+public class ProduceMessagePanel {
+
+    private final SelenideElement keyField = $(By.xpath("//div[@id='key']/textarea"));
+    private final SelenideElement contentField = $(By.xpath("//div[@id='content']/textarea"));
+    private final SelenideElement headersField = $(By.xpath("//div[@id='headers']/textarea"));
+    private final SelenideElement submitBtn = headersField.$(By.xpath("../../../..//button[@type='submit']"));
+
+    @Step
+    public ProduceMessagePanel setKeyField(String value) {
+        keyField.shouldBe(Condition.enabled)
+                .sendKeys(Keys.chord(Keys.DELETE));
+        keyField.setValue(value);
+        return this;
+    }
+
+    @Step
+    public ProduceMessagePanel setContentFiled(String value) {
+        contentField.shouldBe(Condition.enabled)
+                .sendKeys(Keys.DELETE);
+        contentField.setValue(value);
+        return this;
+    }
+
+    @Step
+    public ProduceMessagePanel setHeaderFiled(String value) {
+        headersField.setValue(value);
+        return new ProduceMessagePanel();
+    }
+
+    @Step
+    public TopicView submitProduceMessage() {
+        submitBtn.shouldBe(Condition.enabled).click();
+        submitBtn.shouldBe(Condition.disappear);
+        refresh();
+        return new TopicView().waitUntilScreenReady();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index 83b08474e46..8d055081715 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -5,13 +5,11 @@
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.extensions.WaitUtils;
 import com.provectus.kafka.ui.helpers.TestConfiguration;
-import com.provectus.kafka.ui.pages.ProduceMessagePage;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selectors.byLinkText;
 import static com.codeborne.selenide.Selenide.*;
 
 @ExtensionMethod({WaitUtils.class})
@@ -56,9 +54,9 @@ public TopicsList deleteTopic() {
     }
 
     @Step
-    public ProduceMessagePage clickOnButton(String buttonName) {
+    public ProduceMessagePanel clickOnButton(String buttonName) {
         BrowserUtils.javaExecutorClick($(By.xpath(String.format("//div//button[text()='%s']", buttonName))));
-        return new ProduceMessagePage();
+        return new ProduceMessagePanel();
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
index fbfb0990eb9..3c364bbeed2 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.Test;
 
 public class SmokeTests extends BaseTest {
+
     @Test
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(198)
@@ -17,5 +18,4 @@ void mainPageLoads() {
                 .waitUntilScreenReady();
         compareScreenshots("main");
     }
-
 }

From d673ea63a17799dba60069498cd2c44919b9a148 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 22 Sep 2022 09:19:00 +0400
Subject: [PATCH 178/734] Fixing infinite polls in ForwardRecordEmitter for
 topic where no record found for last offset (compact topic) (#2627)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../com/provectus/kafka/ui/emitter/AbstractEmitter.java    | 7 +++++++
 .../provectus/kafka/ui/emitter/BackwardRecordEmitter.java  | 2 +-
 .../provectus/kafka/ui/emitter/ForwardRecordEmitter.java   | 5 ++++-
 .../kafka/ui/service/analyze/TopicAnalysisService.java     | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
index 84228c41342..9889a689107 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
@@ -16,6 +16,13 @@
 public abstract class AbstractEmitter {
   private static final Duration DEFAULT_POLL_TIMEOUT_MS = Duration.ofMillis(1000L);
 
+  // In some situations it is hard to say whether records range (between two offsets) was fully polled.
+  // This happens when we have holes in records sequences that is usual case for compact topics or
+  // topics with transactional writes. In such cases if you want to poll all records between offsets X and Y
+  // there is no guarantee that you will ever see record with offset Y.
+  // To workaround this we can assume that after N consecutive empty polls all target messages were read.
+  public static final int NO_MORE_DATA_EMPTY_POLLS_COUNT = 3;
+
   private final RecordSerDe recordDeserializer;
   private final ConsumingStats consumingStats = new ConsumingStats();
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
index ff29110c973..b84f4cbf6ff 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
@@ -118,7 +118,7 @@ private List<ConsumerRecord<Bytes, Bytes>> partitionPollIteration(
     var recordsToSend = new ArrayList<ConsumerRecord<Bytes, Bytes>>();
 
     // we use empty polls counting to verify that partition was fully read
-    for (int emptyPolls = 0; recordsToSend.size() < desiredMsgsToPoll && emptyPolls < 3; ) {
+    for (int emptyPolls = 0; recordsToSend.size() < desiredMsgsToPoll && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT;) {
       var polledRecords = poll(sink, consumer, POLL_TIMEOUT);
       log.debug("{} records polled from {}", polledRecords.count(), tp);
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
index 27a6bbec8ca..90561cde944 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
@@ -33,10 +33,13 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
     try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
       sendPhase(sink, "Assigning partitions");
       var waitingOffsets = offsetsSeek.assignAndSeek(consumer);
-      while (!sink.isCancelled() && !waitingOffsets.endReached()) {
+      // we use empty polls counting to verify that topic was fully read
+      int emptyPolls = 0;
+      while (!sink.isCancelled() && !waitingOffsets.endReached() && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT) {
         sendPhase(sink, "Polling");
         ConsumerRecords<Bytes, Bytes> records = poll(sink, consumer);
         log.info("{} records polled", records.count());
+        emptyPolls = records.isEmpty() ? emptyPolls + 1 : 0;
 
         for (ConsumerRecord<Bytes, Bytes> msg : records) {
           if (!sink.isCancelled() && !waitingOffsets.endReached()) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
index 757b469a6b3..3e72e8a07ea 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
@@ -1,5 +1,7 @@
 package com.provectus.kafka.ui.service.analyze;
 
+import static com.provectus.kafka.ui.emitter.AbstractEmitter.NO_MORE_DATA_EMPTY_POLLS_COUNT;
+
 import com.provectus.kafka.ui.exception.TopicAnalysisException;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.TopicAnalysisDTO;
@@ -118,7 +120,7 @@ public void run() {
         consumer.seekToBeginning(topicPartitions);
 
         var waitingOffsets = new WaitingOffsets(topicId.topicName, consumer, topicPartitions);
-        for (int emptyPolls = 0; !waitingOffsets.endReached() && emptyPolls < 3; ) {
+        for (int emptyPolls = 0; !waitingOffsets.endReached() && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT;) {
           var polled = consumer.poll(Duration.ofSeconds(3));
           emptyPolls = polled.isEmpty() ? emptyPolls + 1 : 0;
           polled.forEach(r -> {

From 6e8ce77fd302d0b24e5c01a7959c8592e2abe65c Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Thu, 22 Sep 2022 15:39:01 +0300
Subject: [PATCH 179/734] Issue#2437 (#2626)

* [e2e] refactoring of assertions cross tests #2437

* [e2e] refactoring of assertions cross tests #2437

* [e2e] refactoring of assertions cross tests #2437

* [e2e] refactoring of assertions cross tests #2437

* [e2e] refactoring of assertions cross tests #2437

* [e2e]Fix refactoring of assertions cross tests #2437

* [e2e]Fix refactoring of assertions cross tests #2437

* [e2e]Fix refactoring of assertions cross tests #2437
---
 .../kafka/ui/extensions/WebUtils.java         | 20 ++++++++++
 .../provectus/kafka/ui/pages/MainPage.java    | 13 -------
 .../ui/pages/connector/ConnectorsList.java    | 17 +++------
 .../ui/pages/schema/SchemaRegistryList.java   | 18 ++++-----
 .../kafka/ui/pages/schema/SchemaView.java     |  7 +---
 .../topic/TopicCreateEditSettingsView.java    | 28 +++++++-------
 .../kafka/ui/pages/topic/TopicView.java       |  2 +-
 .../kafka/ui/pages/topic/TopicsList.java      | 10 ++---
 .../kafka/ui/tests/ConnectorsTests.java       | 17 ++++-----
 .../kafka/ui/tests/SchemasTests.java          | 23 +++++------
 .../provectus/kafka/ui/tests/TopicTests.java  | 38 ++++++++++---------
 11 files changed, 94 insertions(+), 99 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WebUtils.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WebUtils.java
new file mode 100644
index 00000000000..2c39fb550d7
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WebUtils.java
@@ -0,0 +1,20 @@
+package com.provectus.kafka.ui.extensions;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class WebUtils {
+
+    public static boolean isVisible(SelenideElement element) {
+        boolean isVisible = false;
+        try {
+            element.shouldBe(Condition.visible);
+            isVisible = true;
+        } catch (Throwable e) {
+            log.debug("Element {} is not visible", element.getSearchCriteria());
+        }
+        return isVisible;
+    }
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
index cfc15f105ec..f6ab04fd94c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
@@ -5,7 +5,6 @@
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.extensions.WaitUtils;
 import com.provectus.kafka.ui.helpers.TestConfiguration;
-import com.provectus.kafka.ui.pages.topic.TopicsList;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
@@ -31,16 +30,6 @@ public MainPage waitUntilScreenReady() {
         return this;
     }
 
-    @Step
-    public void topicIsVisible(String topicName) {
-        new TopicsList().isTopicVisible(topicName);
-    }
-    @Step
-    public void topicIsNotVisible(String topicName){
-        new TopicsList().isTopicNotVisible(topicName);
-    }
-
-
     public enum SideMenuOptions {
         BROKERS("Brokers"),
         TOPICS("Topics"),
@@ -54,8 +43,6 @@ public enum SideMenuOptions {
         }
     }
 
-
-
     @Step
     public MainPage goToSideMenu(String clusterName, SideMenuOptions option) {
         SelenideElement clusterElement = $x(String.format("//aside/ul/li[contains(.,'%s')]", clusterName)).shouldBe(Condition.visible);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
index f79f2327765..d088f9cd3d1 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
@@ -9,7 +9,9 @@
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.*;
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.extensions.WebUtils.isVisible;
 
 @ExtensionMethod(WaitUtils.class)
 public class ConnectorsList {
@@ -34,27 +36,18 @@ public ConnectorCreateView clickCreateConnectorButton() {
         return new ConnectorCreateView();
     }
 
-
     @Step
     public ConnectorsList openConnector(String connectorName) {
         $(By.linkText(connectorName)).click();
         return this;
     }
 
-
     @Step
-    public ConnectorsList isNotVisible(String connectorName) {
+    public boolean isConnectorVisible(String connectorName) {
         $(By.xpath("//table")).shouldBe(Condition.visible);
-        $x("//tbody//td[1]//a[text()='" + connectorName + "']").shouldBe(Condition.not(Condition.visible));
-        return this;
+        return isVisible($x("//tbody//td[1]//a[text()='" + connectorName + "']"));
     }
 
-    @Step("Verify that connector {connectorName} is visible in the list")
-    public ConnectorsList connectorIsVisibleInList(String connectorName, String topicName) {
-        $x("//table//a[@href='/ui/clusters/local/connects/first/connectors/" + connectorName + "']").shouldBe(Condition.visible);
-        $$(By.linkText(topicName));
-        return this;
-    }
     @Step
     public ConnectorsList connectorIsUpdatedInList(String connectorName, String topicName) {
         $(By.xpath(String.format("//a[text() = '%s']", connectorName))).shouldBe(Condition.visible);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index a9cc45d92c9..cdd50de7375 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -7,15 +7,18 @@
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.extensions.WebUtils.isVisible;
 
 public class SchemaRegistryList {
 
     private final SelenideElement schemaButton = $(By.xpath("//*[contains(text(),'Create Schema')]"));
+
     @Step
     public SchemaCreateView clickCreateSchema() {
         BrowserUtils.javaExecutorClick(schemaButton);
         return new SchemaCreateView();
     }
+
     @Step
     public SchemaView openSchema(String schemaName) {
         $(By.xpath("//*[contains(text(),'" + schemaName + "')]")).click();
@@ -23,17 +26,10 @@ public SchemaView openSchema(String schemaName) {
     }
 
     @Step
-    public SchemaRegistryList isNotVisible(String schemaName) {
-        $x(String.format("//*[contains(text(),'%s')]", schemaName)).shouldNotBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public SchemaRegistryList isSchemaVisible(String schemaName) {
-        $$("tbody td>a")
-                .find(Condition.exactText(schemaName))
-                .shouldBe(Condition.visible);
-        return this;
+    public boolean isSchemaVisible(String schemaName) {
+        $(By.xpath("//table")).shouldBe(Condition.visible);
+        return isVisible($x("//tbody//td//a[text()='" + schemaName + "']"));
     }
 }
 
+
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
index 9924b148e4f..e0b90bf3dd0 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
@@ -2,13 +2,11 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
-
 public class SchemaView {
 
     protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
@@ -20,9 +18,8 @@ public SchemaView waitUntilScreenReady() {
     }
 
     @Step
-    public SchemaView isCompatibility(CompatibilityLevel.CompatibilityEnum compatibility){
-        $x("//div//p[.='" + compatibility.getValue() + "']").shouldBe(Condition.visible);
-        return this;
+    public String getCompatibility() {
+        return $x("//h4[contains(text(),'Compatibility')]/../p").getText();
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
index 330c457ddaa..e7c75e3b9e5 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
@@ -140,21 +140,23 @@ public TopicCreateEditSettingsView timeToRetainIs(String time) {
         return this;
     }
     @Step
-    public TopicCreateEditSettingsView maxSizeOnDiskIs(String size) {
-        String retentionBytes = new KafkaUISelectElement("retentionBytes")
-                .getCurrentValue();
-        assertThat(retentionBytes)
-                .as("Max size on disk in GB should be " + size)
-                .isEqualTo(size);
-        return this;
+    public String getCleanupPolicy() {
+        return new KafkaUISelectElement("cleanupPolicy").getCurrentValue();
     }
+
     @Step
-    public TopicCreateEditSettingsView maxMessageBytesIs(String bytes) {
-        String value = maxMessageBytes.getValue();
-        assertThat(value)
-                .as("Maximum message size in bytes should be " + bytes)
-                .isEqualTo(bytes);
-        return this;
+    public String getTimeToRetain() {
+        return timeToRetain.getValue();
+    }
+
+    @Step
+    public String getMaxSizeOnDisk() {
+        return new KafkaUISelectElement("retentionBytes").getCurrentValue();
+    }
+
+    @Step
+    public String getMaxMessageBytes() {
+        return maxMessageBytes.getValue();
     }
 
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index 8d055081715..adcd478828a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -33,7 +33,7 @@ public TopicView waitUntilScreenReady() {
     @Step
     public TopicCreateEditSettingsView openEditSettings() {
         BrowserUtils.javaExecutorClick(dotMenuBtn);
-        $x("//a[text()= '" + DotMenuHeaderItems.EDIT_SETTINGS.getValue() + "']").click();
+        $x("//li[@role][text()='Edit settings']").click();
         return new TopicCreateEditSettingsView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index aafa9bb0ce5..c3c833b89b2 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -11,6 +11,7 @@
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.extensions.WebUtils.isVisible;
 
 @ExtensionMethod(WaitUtils.class)
 public class TopicsList {
@@ -37,12 +38,9 @@ public TopicCreateEditSettingsView pressCreateNewTopic() {
     }
 
     @Step
-    public TopicsList isTopicVisible(String topicName) {
-        $$("tbody td>a")
-                .shouldBe(CollectionCondition.sizeGreaterThan(4))
-                .find(Condition.exactText(topicName))
-                .shouldBe(Condition.visible);
-        return this;
+    public boolean isTopicVisible(String topicName) {
+        $(By.xpath("//table")).shouldBe(Condition.visible);
+        return isVisible($x("//tbody//td//a[text()='" + topicName + "']"));
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 19682d4be0c..3ec1eff890c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -8,10 +8,7 @@
 import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
 import io.qase.api.annotation.CaseId;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -69,8 +66,8 @@ public void createConnector() {
                 .waitUntilScreenReady()
                 .setConnectorConfig(connectorForCreate.getName(), connectorForCreate.getConfig());
         pages.openConnectorsList(CLUSTER_NAME)
-                .waitUntilScreenReady()
-                .connectorIsVisibleInList(connectorForCreate.getName(), TOPIC_FOR_CREATE.getName());
+                .waitUntilScreenReady();
+        Assertions.assertTrue(pages.connectorsList.isConnectorVisible(connectorForCreate.getName()),"isConnectorVisible()");
         CONNECTOR_LIST.add(connectorForCreate);
     }
 
@@ -86,8 +83,8 @@ public void updateConnector() {
         pages.connectorsView.connectorIsVisibleOnOverview();
         pages.connectorsView.openEditConfig()
                 .updConnectorConfig(CONNECTOR_FOR_UPDATE.getConfig());
-        pages.openConnectorsList(CLUSTER_NAME)
-                .connectorIsVisibleInList(CONNECTOR_FOR_UPDATE.getName(), TOPIC_FOR_UPDATE.getName());
+        pages.openConnectorsList(CLUSTER_NAME);
+        Assertions.assertTrue(pages.connectorsList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()),"isConnectorVisible()");
     }
 
     @DisplayName("should delete connector")
@@ -100,8 +97,8 @@ public void deleteConnector() {
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_DELETE.getName());
         pages.connectorsView.clickDeleteButton();
-        pages.openConnectorsList(CLUSTER_NAME)
-                .isNotVisible(CONNECTOR_FOR_DELETE.getName());
+        pages.openConnectorsList(CLUSTER_NAME);
+        Assertions.assertFalse(pages.connectorsList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()),"isConnectorVisible()");
         CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index 9218548d9de..265defb0453 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -6,6 +6,7 @@
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.pages.MainPage;
 import com.provectus.kafka.ui.pages.schema.SchemaEditView;
+import com.provectus.kafka.ui.pages.schema.SchemaView;
 import com.provectus.kafka.ui.utils.qaseIO.Status;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
@@ -53,7 +54,7 @@ void createSchemaAvro() {
                 .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.isSchemaVisible(schemaAvro.getName());
+        Assertions.assertTrue(pages.schemaRegistry.isSchemaVisible(schemaAvro.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaAvro);
     }
 
@@ -74,8 +75,8 @@ void updateSchemaAvro() {
         new SchemaEditView().selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
                 .clickSubmit()
-                .waitUntilScreenReady()
-                .isCompatibility(CompatibilityLevel.CompatibilityEnum.NONE);
+                .waitUntilScreenReady();
+        Assertions.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), new SchemaView().getCompatibility(), "getCompatibility()");
     }
 
     @DisplayName("should delete AVRO schema")
@@ -89,8 +90,8 @@ void deleteSchemaAvro() {
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(AVRO_API.getName())
                 .waitUntilScreenReady()
-                .removeSchema()
-                .isNotVisible(AVRO_API.getName());
+                .removeSchema();
+        Assertions.assertFalse(pages.schemaRegistry.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.remove(AVRO_API);
     }
 
@@ -112,7 +113,7 @@ void createSchemaJson() {
                 .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.isSchemaVisible(schemaJson.getName());
+        Assertions.assertTrue(pages.schemaRegistry.isSchemaVisible(schemaJson.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaJson);
     }
 
@@ -127,8 +128,8 @@ void deleteSchemaJson() {
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(JSON_API.getName())
                 .waitUntilScreenReady()
-                .removeSchema()
-                .isNotVisible(JSON_API.getName());
+                .removeSchema();
+        Assertions.assertFalse(pages.schemaRegistry.isSchemaVisible(JSON_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.remove(JSON_API);
     }
 
@@ -150,7 +151,7 @@ void createSchemaProtobuf() {
                 .waitUntilScreenReady();
         pages.mainPage
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.isSchemaVisible(schemaProtobuf.getName());
+        Assertions.assertTrue(pages.schemaRegistry.isSchemaVisible(schemaProtobuf.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaProtobuf);
     }
 
@@ -165,8 +166,8 @@ void deleteSchemaProtobuf() {
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         pages.schemaRegistry.openSchema(PROTOBUF_API.getName())
                 .waitUntilScreenReady()
-                .removeSchema()
-                .isNotVisible(PROTOBUF_API.getName());
+                .removeSchema();
+        Assertions.assertFalse(pages.schemaRegistry.isSchemaVisible(PROTOBUF_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.remove(PROTOBUF_API);
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 8f74109631d..c284f2217b9 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -4,12 +4,13 @@
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.MainPage;
+import com.provectus.kafka.ui.pages.topic.TopicCreateEditSettingsView;
 import com.provectus.kafka.ui.pages.topic.TopicView;
 import com.provectus.kafka.ui.utils.qaseIO.Status;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
 import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
-import io.qameta.allure.Issue;
 import io.qase.api.annotation.CaseId;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.*;
 
 import java.util.ArrayList;
@@ -51,14 +52,13 @@ public void createTopic() {
                 .sendData()
                 .waitUntilScreenReady();
         pages.open()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS)
-                .topicIsVisible(topicToCreate.getName());
+                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS);
+        Assertions.assertTrue(pages.topicsList.isTopicVisible(topicToCreate.getName()),"isTopicVisible");
         TOPIC_LIST.add(topicToCreate);
     }
 
-    @Disabled("Due to issue https://github.com/provectus/kafka-ui/issues/1500 ignore this test")
+    @Disabled("https://github.com/provectus/kafka-ui/issues/2625")
     @DisplayName("should update a topic")
-    @Issue("1500")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(197)
@@ -66,7 +66,7 @@ public void createTopic() {
     public void updateTopic() {
         pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        pages.openTopicView(CLUSTER_NAME, TOPIC_FOR_UPDATE.getName())
+        pages.topicsList.openTopic(TOPIC_FOR_UPDATE.getName())
                 .waitUntilScreenReady()
                 .openEditSettings()
                 .selectCleanupPolicy(TOPIC_FOR_UPDATE.getCompactPolicyValue())
@@ -78,13 +78,15 @@ public void updateTopic() {
                 .waitUntilScreenReady();
         pages.openTopicsList(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        pages.openTopicView(CLUSTER_NAME, TOPIC_FOR_UPDATE.getName())
-                .openEditSettings()
-                // Assertions
-                .cleanupPolicyIs(TOPIC_FOR_UPDATE.getCompactPolicyValue())
-                .timeToRetainIs(TOPIC_FOR_UPDATE.getTimeToRetainData())
-                .maxSizeOnDiskIs(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
-                .maxMessageBytesIs(TOPIC_FOR_UPDATE.getMaxMessageBytes());
+        pages.topicsList.openTopic(TOPIC_FOR_UPDATE.getName())
+                .waitUntilScreenReady()
+                .openEditSettings();
+        SoftAssertions softly = new SoftAssertions();
+        softly.assertThat(new TopicCreateEditSettingsView().getCleanupPolicy()).as("Cleanup Policy").isEqualTo(TOPIC_FOR_UPDATE.getCompactPolicyValue());
+        softly.assertThat(new TopicCreateEditSettingsView().getTimeToRetain()).as("Time to retain").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
+        softly.assertThat(new TopicCreateEditSettingsView().getMaxSizeOnDisk()).as("Max size on disk").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk());
+        softly.assertThat(new TopicCreateEditSettingsView().getMaxMessageBytes()).as("Max message bytes").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
+        softly.assertAll();
     }
 
     @DisplayName("should delete topic")
@@ -99,8 +101,8 @@ public void deleteTopic() {
                 .waitUntilScreenReady()
                 .deleteTopic();
         pages.openTopicsList(CLUSTER_NAME)
-                .waitUntilScreenReady()
-                .isTopicNotVisible(TOPIC_FOR_DELETE.getName());
+                .waitUntilScreenReady();
+        Assertions.assertFalse(pages.topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()),"isTopicVisible");
         TOPIC_LIST.remove(TOPIC_FOR_DELETE);
     }
 
@@ -119,8 +121,10 @@ void produceMessage() {
                 .setContentFiled(TOPIC_FOR_UPDATE.getMessageContent())
                 .setKeyField(TOPIC_FOR_UPDATE.getMessageKey())
                 .submitProduceMessage();
-        Assertions.assertTrue(pages.topicView.isKeyMessageVisible(TOPIC_FOR_UPDATE.getMessageKey()));
-        Assertions.assertTrue(pages.topicView.isContentMessageVisible(TOPIC_FOR_UPDATE.getMessageContent().trim()));
+        SoftAssertions softly = new SoftAssertions();
+        softly.assertThat(pages.topicView.isKeyMessageVisible((TOPIC_FOR_UPDATE.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
+        softly.assertThat(pages.topicView.isContentMessageVisible((TOPIC_FOR_UPDATE.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
+        softly.assertAll();
     }
 
     @AfterAll

From b940c28b5c4af3ce99d68c48ec46082463f79113 Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Mon, 26 Sep 2022 04:11:47 +0800
Subject: [PATCH 180/734] Schema registry: Previous version's schema preview is
 too narrow (#2615) (#2638)

---
 .../components/Schemas/Details/SchemaVersion/SchemaVersion.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx b/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
index 1a729a6eaec..472a6e544fd 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
@@ -30,7 +30,7 @@ const SchemaVersion: React.FC<SchemaVersionProps> = ({
       </tr>
       {isOpen && (
         <S.Wrapper>
-          <td colSpan={3}>
+          <td colSpan={4}>
             <EditorViewer data={schema} schemaType={schemaType} />
           </td>
         </S.Wrapper>

From bae5c39cf2f4ace9acf314e57ae62cb7b70d1371 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Mon, 26 Sep 2022 12:05:01 +0300
Subject: [PATCH 181/734] KC: Make viewing/editing config a single view (#2613)

* Get rid of KC edit config page

* fix e2e-checks

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../ui/pages/connector/ConnectorsView.java    |   6 +-
 .../kafka/ui/tests/ConnectorsTests.java       |   2 +-
 .../src/components/Connect/Connect.tsx        |   6 -
 .../Connect/Details/Actions/Actions.tsx       |  15 ---
 .../Actions/__tests__/Actions.spec.tsx        |   9 +-
 .../Config/Config.styled.ts}                  |   0
 .../Connect/Details/Config/Config.tsx         |  96 +++++++++++++--
 .../Details/Config/__test__/Config.spec.tsx   |  46 --------
 .../Config/__tests__/Config.spec.tsx}         |  20 +---
 .../src/components/Connect/Edit/Edit.tsx      | 109 ------------------
 .../Connect/__tests__/Connect.spec.tsx        |  20 +---
 .../src/lib/hooks/api/kafkaConnect.ts         |   9 +-
 kafka-ui-react-app/src/lib/paths.ts           |   1 -
 13 files changed, 103 insertions(+), 236 deletions(-)
 rename kafka-ui-react-app/src/components/Connect/{Edit/Edit.styled.ts => Details/Config/Config.styled.ts} (100%)
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx
 rename kafka-ui-react-app/src/components/Connect/{Edit/__tests__/Edit.spec.tsx => Details/Config/__tests__/Config.spec.tsx} (80%)
 delete mode 100644 kafka-ui-react-app/src/components/Connect/Edit/Edit.tsx

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
index 205950b778c..772549c1c38 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
@@ -23,9 +23,9 @@ public ConnectorsView goTo(String cluster, String connector) {
         return this;
     }
 
-    @Step("Open 'Edit Config' of connector")
-    public ConnectorUpdateView openEditConfig() {
-        BrowserUtils.javaExecutorClick($x("//button[text()='Edit Config']"));
+    @Step()
+    public ConnectorUpdateView openConfigTab() {
+        BrowserUtils.javaExecutorClick($(By.xpath("//a[text() ='Config']")));
         return new ConnectorUpdateView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 3ec1eff890c..2b858eec1bc 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -81,7 +81,7 @@ public void updateConnector() {
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_UPDATE.getName());
         pages.connectorsView.connectorIsVisibleOnOverview();
-        pages.connectorsView.openEditConfig()
+        pages.connectorsView.openConfigTab()
                 .updConnectorConfig(CONNECTOR_FOR_UPDATE.getConfig());
         pages.openConnectorsList(CLUSTER_NAME);
         Assertions.assertTrue(pages.connectorsList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()),"isConnectorVisible()");
diff --git a/kafka-ui-react-app/src/components/Connect/Connect.tsx b/kafka-ui-react-app/src/components/Connect/Connect.tsx
index 6689d249b44..efbac701ec4 100644
--- a/kafka-ui-react-app/src/components/Connect/Connect.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Connect.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { Navigate, Routes, Route } from 'react-router-dom';
 import {
   RouteParams,
-  clusterConnectConnectorEditRelativePath,
   clusterConnectConnectorRelativePath,
   clusterConnectConnectorsRelativePath,
   clusterConnectorNewRelativePath,
@@ -13,7 +12,6 @@ import useAppParams from 'lib/hooks/useAppParams';
 
 import ListPage from './List/ListPage';
 import New from './New/New';
-import Edit from './Edit/Edit';
 import DetailsPage from './Details/DetailsPage';
 
 const Connect: React.FC = () => {
@@ -23,10 +21,6 @@ const Connect: React.FC = () => {
     <Routes>
       <Route index element={<ListPage />} />
       <Route path={clusterConnectorNewRelativePath} element={<New />} />
-      <Route
-        path={clusterConnectConnectorEditRelativePath}
-        element={<Edit />}
-      />
       <Route
         path={getNonExactPath(clusterConnectConnectorRelativePath)}
         element={<DetailsPage />}
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index 776afe8e8db..ee0f3063468 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -10,7 +10,6 @@ import {
   useUpdateConnectorState,
 } from 'lib/hooks/api/kafkaConnect';
 import {
-  clusterConnectConnectorEditPath,
   clusterConnectorsPath,
   RouterParamsClusterConnectConnector,
 } from 'lib/paths';
@@ -115,20 +114,6 @@ const Actions: React.FC = () => {
       >
         Restart Failed Tasks
       </Button>
-      <Button
-        buttonSize="M"
-        buttonType="primary"
-        type="button"
-        disabled={isMutating}
-        to={clusterConnectConnectorEditPath(
-          routerProps.clusterName,
-          routerProps.connectName,
-          routerProps.connectorName
-        )}
-      >
-        Edit Config
-      </Button>
-
       <Button
         buttonSize="M"
         buttonType="secondary"
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
index 89b1bfb69f0..3a2f70bf916 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
@@ -31,7 +31,6 @@ const expectActionButtonsExists = () => {
   expect(screen.getByText('Restart Connector')).toBeInTheDocument();
   expect(screen.getByText('Restart All Tasks')).toBeInTheDocument();
   expect(screen.getByText('Restart Failed Tasks')).toBeInTheDocument();
-  expect(screen.getByText('Edit Config')).toBeInTheDocument();
   expect(screen.getByText('Delete')).toBeInTheDocument();
 };
 
@@ -63,7 +62,7 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.PAUSED),
       }));
       renderComponent();
-      expect(screen.getAllByRole('button').length).toEqual(6);
+      expect(screen.getAllByRole('button').length).toEqual(5);
       expect(screen.getByText('Resume')).toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
@@ -74,7 +73,7 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.FAILED),
       }));
       renderComponent();
-      expect(screen.getAllByRole('button').length).toEqual(5);
+      expect(screen.getAllByRole('button').length).toEqual(4);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
@@ -85,7 +84,7 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.UNASSIGNED),
       }));
       renderComponent();
-      expect(screen.getAllByRole('button').length).toEqual(5);
+      expect(screen.getAllByRole('button').length).toEqual(4);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
@@ -96,7 +95,7 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.RUNNING),
       }));
       renderComponent();
-      expect(screen.getAllByRole('button').length).toEqual(6);
+      expect(screen.getAllByRole('button').length).toEqual(5);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.getByText('Pause')).toBeInTheDocument();
       expectActionButtonsExists();
diff --git a/kafka-ui-react-app/src/components/Connect/Edit/Edit.styled.ts b/kafka-ui-react-app/src/components/Connect/Details/Config/Config.styled.ts
similarity index 100%
rename from kafka-ui-react-app/src/components/Connect/Edit/Edit.styled.ts
rename to kafka-ui-react-app/src/components/Connect/Details/Config/Config.styled.ts
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx b/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
index 0d599d090ba..f8a0ada02ff 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
@@ -1,23 +1,95 @@
 import React from 'react';
 import useAppParams from 'lib/hooks/useAppParams';
-import Editor from 'components/common/Editor/Editor';
+import { Controller, useForm } from 'react-hook-form';
+import { ErrorMessage } from '@hookform/error-message';
+import { yupResolver } from '@hookform/resolvers/yup';
 import { RouterParamsClusterConnectConnector } from 'lib/paths';
-import { useConnectorConfig } from 'lib/hooks/api/kafkaConnect';
+import yup from 'lib/yupExtended';
+import Editor from 'components/common/Editor/Editor';
+import { Button } from 'components/common/Button/Button';
+import {
+  useConnectorConfig,
+  useUpdateConnectorConfig,
+} from 'lib/hooks/api/kafkaConnect';
+
+import {
+  ConnectEditWarningMessageStyled,
+  ConnectEditWrapperStyled,
+} from './Config.styled';
+
+const validationSchema = yup.object().shape({
+  config: yup.string().required().isJsonObject(),
+});
+
+interface FormValues {
+  config: string;
+}
 
 const Config: React.FC = () => {
-  const routerProps = useAppParams<RouterParamsClusterConnectConnector>();
-  const { data: config } = useConnectorConfig(routerProps);
+  const routerParams = useAppParams<RouterParamsClusterConnectConnector>();
+  const { data: config } = useConnectorConfig(routerParams);
+  const mutation = useUpdateConnectorConfig(routerParams);
+
+  const {
+    handleSubmit,
+    control,
+    reset,
+    formState: { isDirty, isSubmitting, isValid, errors },
+    setValue,
+  } = useForm<FormValues>({
+    mode: 'onTouched',
+    resolver: yupResolver(validationSchema),
+    defaultValues: {
+      config: JSON.stringify(config, null, '\t'),
+    },
+  });
 
-  if (!config) return null;
+  React.useEffect(() => {
+    if (config) {
+      setValue('config', JSON.stringify(config, null, '\t'));
+    }
+  }, [config, setValue]);
 
+  const onSubmit = async (values: FormValues) => {
+    const requestBody = JSON.parse(values.config.trim());
+    await mutation.mutateAsync(requestBody);
+    reset(values);
+  };
+
+  const hasCredentials = JSON.stringify(config, null, '\t').includes(
+    '"******"'
+  );
   return (
-    <Editor
-      readOnly
-      value={JSON.stringify(config, null, '\t')}
-      highlightActiveLine={false}
-      isFixedHeight
-      style={{ margin: '16px' }}
-    />
+    <ConnectEditWrapperStyled>
+      {hasCredentials && (
+        <ConnectEditWarningMessageStyled>
+          Please replace ****** with the real credential values to avoid
+          accidentally breaking your connector config!
+        </ConnectEditWarningMessageStyled>
+      )}
+      <form onSubmit={handleSubmit(onSubmit)} aria-label="Edit connect form">
+        <div>
+          <Controller
+            control={control}
+            name="config"
+            render={({ field }) => (
+              <Editor {...field} readOnly={isSubmitting} />
+            )}
+          />
+        </div>
+        <div>
+          <ErrorMessage errors={errors} name="config" />
+        </div>
+        <Button
+          buttonSize="M"
+          buttonType="primary"
+          type="submit"
+          disabled={!isValid || isSubmitting || !isDirty}
+        >
+          Submit
+        </Button>
+      </form>
+    </ConnectEditWrapperStyled>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx
deleted file mode 100644
index 8cf11c0989a..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Details/Config/__test__/Config.spec.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import { render, WithRoute } from 'lib/testHelpers';
-import { clusterConnectConnectorConfigPath } from 'lib/paths';
-import Config from 'components/Connect/Details/Config/Config';
-import { screen } from '@testing-library/dom';
-import { useConnectorConfig } from 'lib/hooks/api/kafkaConnect';
-import { connector } from 'lib/fixtures/kafkaConnect';
-
-jest.mock('components/common/Editor/Editor', () => () => (
-  <div>mock-Editor</div>
-));
-jest.mock('lib/hooks/api/kafkaConnect', () => ({
-  useConnectorConfig: jest.fn(),
-}));
-
-describe('Config', () => {
-  const renderComponent = () =>
-    render(
-      <WithRoute path={clusterConnectConnectorConfigPath()}>
-        <Config />
-      </WithRoute>,
-      {
-        initialEntries: [
-          clusterConnectConnectorConfigPath(
-            'my-cluster',
-            'my-connect',
-            'my-connector'
-          ),
-        ],
-      }
-    );
-
-  it('is empty when no config', () => {
-    (useConnectorConfig as jest.Mock).mockImplementation(() => ({}));
-    renderComponent();
-    expect(screen.queryByText('mock-Editor')).not.toBeInTheDocument();
-  });
-
-  it('renders editor', () => {
-    (useConnectorConfig as jest.Mock).mockImplementation(() => ({
-      data: connector.config,
-    }));
-    renderComponent();
-    expect(screen.getByText('mock-Editor')).toBeInTheDocument();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Connect/Edit/__tests__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Config/__tests__/Config.spec.tsx
similarity index 80%
rename from kafka-ui-react-app/src/components/Connect/Edit/__tests__/Edit.spec.tsx
rename to kafka-ui-react-app/src/components/Connect/Details/Config/__tests__/Config.spec.tsx
index 6adbd223996..16611072fca 100644
--- a/kafka-ui-react-app/src/components/Connect/Edit/__tests__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Config/__tests__/Config.spec.tsx
@@ -1,10 +1,7 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
-import {
-  clusterConnectConnectorConfigPath,
-  clusterConnectConnectorEditPath,
-} from 'lib/paths';
-import Edit from 'components/Connect/Edit/Edit';
+import { clusterConnectConnectorConfigPath } from 'lib/paths';
+import Config from 'components/Connect/Details/Config/Config';
 import { connector } from 'lib/fixtures/kafkaConnect';
 import { waitFor } from '@testing-library/dom';
 import { act, fireEvent, screen } from '@testing-library/react';
@@ -31,16 +28,16 @@ const [clusterName, connectName, connectorName] = [
   'my-connector',
 ];
 
-describe('Edit', () => {
-  const pathname = clusterConnectConnectorEditPath();
+describe('Config', () => {
+  const pathname = clusterConnectConnectorConfigPath();
   const renderComponent = () =>
     render(
       <WithRoute path={pathname}>
-        <Edit />
+        <Config />
       </WithRoute>,
       {
         initialEntries: [
-          clusterConnectConnectorEditPath(
+          clusterConnectConnectorConfigPath(
             clusterName,
             connectName,
             connectorName
@@ -66,11 +63,6 @@ describe('Edit', () => {
     renderComponent();
     fireEvent.submit(screen.getByRole('form'));
     await waitFor(() => expect(updateConfig).toHaveBeenCalledTimes(1));
-
-    await waitFor(() => expect(mockHistoryPush).toHaveBeenCalledTimes(1));
-    expect(mockHistoryPush).toHaveBeenCalledWith(
-      clusterConnectConnectorConfigPath(clusterName, connectName, connectorName)
-    );
   });
 
   it('does not redirect to connector config view on unsuccessful submit', async () => {
diff --git a/kafka-ui-react-app/src/components/Connect/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Connect/Edit/Edit.tsx
deleted file mode 100644
index 60c7c1370a9..00000000000
--- a/kafka-ui-react-app/src/components/Connect/Edit/Edit.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
-import useAppParams from 'lib/hooks/useAppParams';
-import { Controller, useForm } from 'react-hook-form';
-import { ErrorMessage } from '@hookform/error-message';
-import { yupResolver } from '@hookform/resolvers/yup';
-import {
-  clusterConnectConnectorConfigPath,
-  RouterParamsClusterConnectConnector,
-} from 'lib/paths';
-import yup from 'lib/yupExtended';
-import Editor from 'components/common/Editor/Editor';
-import { Button } from 'components/common/Button/Button';
-import {
-  useConnectorConfig,
-  useUpdateConnectorConfig,
-} from 'lib/hooks/api/kafkaConnect';
-
-import {
-  ConnectEditWarningMessageStyled,
-  ConnectEditWrapperStyled,
-} from './Edit.styled';
-
-const validationSchema = yup.object().shape({
-  config: yup.string().required().isJsonObject(),
-});
-
-interface FormValues {
-  config: string;
-}
-
-const Edit: React.FC = () => {
-  const routerParams = useAppParams<RouterParamsClusterConnectConnector>();
-  const navigate = useNavigate();
-  const { data: config } = useConnectorConfig(routerParams);
-  const mutation = useUpdateConnectorConfig(routerParams);
-
-  const {
-    handleSubmit,
-    control,
-    formState: { isDirty, isSubmitting, isValid, errors },
-    setValue,
-  } = useForm<FormValues>({
-    mode: 'onTouched',
-    resolver: yupResolver(validationSchema),
-    defaultValues: {
-      config: JSON.stringify(config, null, '\t'),
-    },
-  });
-
-  React.useEffect(() => {
-    if (config) {
-      setValue('config', JSON.stringify(config, null, '\t'));
-    }
-  }, [config, setValue]);
-
-  const onSubmit = async (values: FormValues) => {
-    const requestBody = JSON.parse(values.config.trim());
-    const connector = await mutation.mutateAsync(requestBody);
-
-    if (connector) {
-      navigate(
-        clusterConnectConnectorConfigPath(
-          routerParams.clusterName,
-          routerParams.connectName,
-          routerParams.connectorName
-        )
-      );
-    }
-  };
-
-  const hasCredentials = JSON.stringify(config, null, '\t').includes(
-    '"******"'
-  );
-  return (
-    <ConnectEditWrapperStyled>
-      {hasCredentials && (
-        <ConnectEditWarningMessageStyled>
-          Please replace ****** with the real credential values to avoid
-          accidentally breaking your connector config!
-        </ConnectEditWarningMessageStyled>
-      )}
-      <form onSubmit={handleSubmit(onSubmit)} aria-label="Edit connect form">
-        <div>
-          <Controller
-            control={control}
-            name="config"
-            render={({ field }) => (
-              <Editor {...field} readOnly={isSubmitting} />
-            )}
-          />
-        </div>
-        <div>
-          <ErrorMessage errors={errors} name="config" />
-        </div>
-        <Button
-          buttonSize="M"
-          buttonType="primary"
-          type="submit"
-          disabled={!isValid || isSubmitting || !isDirty}
-        >
-          Submit
-        </Button>
-      </form>
-    </ConnectEditWrapperStyled>
-  );
-};
-
-export default Edit;
diff --git a/kafka-ui-react-app/src/components/Connect/__tests__/Connect.spec.tsx b/kafka-ui-react-app/src/components/Connect/__tests__/Connect.spec.tsx
index 8d07b0ebb57..855e5464581 100644
--- a/kafka-ui-react-app/src/components/Connect/__tests__/Connect.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/__tests__/Connect.spec.tsx
@@ -2,12 +2,10 @@ import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
 import Connect from 'components/Connect/Connect';
-import { store } from 'redux/store';
 import {
   clusterConnectorsPath,
   clusterConnectorNewPath,
   clusterConnectConnectorPath,
-  clusterConnectConnectorEditPath,
   getNonExactPath,
   clusterConnectsPath,
 } from 'lib/paths';
@@ -16,7 +14,6 @@ const ConnectCompText = {
   new: 'New Page',
   list: 'List Page',
   details: 'Details Page',
-  edit: 'Edit Page',
 };
 
 jest.mock('components/Connect/New/New', () => () => (
@@ -28,9 +25,6 @@ jest.mock('components/Connect/List/ListPage', () => () => (
 jest.mock('components/Connect/Details/DetailsPage', () => () => (
   <div>{ConnectCompText.details}</div>
 ));
-jest.mock('components/Connect/Edit/Edit', () => () => (
-  <div>{ConnectCompText.edit}</div>
-));
 
 describe('Connect', () => {
   const renderComponent = (pathname: string, routePath: string) =>
@@ -38,7 +32,7 @@ describe('Connect', () => {
       <WithRoute path={getNonExactPath(routePath)}>
         <Connect />
       </WithRoute>,
-      { initialEntries: [pathname], store }
+      { initialEntries: [pathname] }
     );
 
   it('renders ListPage', () => {
@@ -64,16 +58,4 @@ describe('Connect', () => {
     );
     expect(screen.getByText(ConnectCompText.details)).toBeInTheDocument();
   });
-
-  it('renders EditContainer', () => {
-    renderComponent(
-      clusterConnectConnectorEditPath(
-        'my-cluster',
-        'my-connect',
-        'my-connector'
-      ),
-      clusterConnectsPath()
-    );
-    expect(screen.getByText(ConnectCompText.edit)).toBeInTheDocument();
-  });
 });
diff --git a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
index 49983da82ae..7da7c5f875a 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
@@ -8,6 +8,7 @@ import { kafkaConnectApiClient as api } from 'lib/api';
 import sortBy from 'lodash/sortBy';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { ClusterName } from 'redux/interfaces';
+import { showSuccessAlert } from 'lib/errorHandling';
 
 interface UseConnectorProps {
   clusterName: ClusterName;
@@ -43,10 +44,6 @@ const connectorTasksKey = (props: UseConnectorProps) => [
   ...connectorKey(props),
   'tasks',
 ];
-const connectorConfigKey = (props: UseConnectorProps) => [
-  ...connectorKey(props),
-  'config',
-];
 
 export function useConnects(clusterName: ClusterName) {
   return useQuery(connectsKey(clusterName), () =>
@@ -104,8 +101,10 @@ export function useUpdateConnectorConfig(props: UseConnectorProps) {
       api.setConnectorConfig({ ...props, requestBody }),
     {
       onSuccess: () => {
+        showSuccessAlert({
+          message: `Config successfully updated.`,
+        });
         client.invalidateQueries(connectorKey(props));
-        client.invalidateQueries(connectorConfigKey(props));
       },
     }
   );
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 94609de4911..1b3d4b13019 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -201,7 +201,6 @@ export const clusterConnectorsRelativePath = 'connectors';
 export const clusterConnectorNewRelativePath = 'create-new';
 export const clusterConnectConnectorsRelativePath = `${RouteParams.connectName}/connectors`;
 export const clusterConnectConnectorRelativePath = `${clusterConnectConnectorsRelativePath}/${RouteParams.connectorName}`;
-export const clusterConnectConnectorEditRelativePath = `${clusterConnectConnectorRelativePath}/edit`;
 export const clusterConnectConnectorTasksRelativePath = 'tasks';
 export const clusterConnectConnectorConfigRelativePath = 'config';
 

From eb062359a9eca8665833d610100525c8832a3a01 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 26 Sep 2022 16:02:48 +0300
Subject: [PATCH 182/734] [e2e] Update module structure (#2641)

---
 .../provectus/kafka/ui/helpers/ApiHelper.java |  5 +-
 .../kafka/ui/helpers/TestConfiguration.java   | 21 --------
 .../provectus/kafka/ui/pages/MainPage.java    |  6 +--
 .../pages/connector/ConnectorCreateView.java  |  8 +--
 .../pages/connector/ConnectorUpdateView.java  | 49 -------------------
 .../ui/pages/connector/ConnectorsList.java    | 12 ++---
 .../ui/pages/connector/ConnectorsView.java    | 40 ++++++++++-----
 .../ui/pages/schema/SchemaCreateView.java     |  4 +-
 .../kafka/ui/pages/schema/SchemaEditView.java |  4 +-
 .../ui/pages/schema/SchemaRegistryList.java   |  6 +--
 .../kafka/ui/pages/schema/SchemaView.java     |  5 +-
 .../topic/TopicCreateEditSettingsView.java    |  4 +-
 .../kafka/ui/pages/topic/TopicView.java       | 14 +++---
 .../kafka/ui/pages/topic/TopicsList.java      | 12 ++---
 .../provectus/kafka/ui/settings/Source.java   |  7 +++
 .../{extensions => utilities}/FileUtils.java  |  2 +-
 .../{extensions => utilities}/WaitUtils.java  |  2 +-
 .../{extensions => utilities}/WebUtils.java   |  7 ++-
 .../qaseIoUtils/DisplayNameGenerator.java}    |  5 +-
 .../qaseIoUtils}/QaseExtension.java           |  6 +--
 .../qaseIoUtils}/TestCaseGenerator.java       | 25 +++++++---
 .../annotations}/AutomationStatus.java        |  4 +-
 .../qaseIoUtils/annotations}/Suite.java       |  2 +-
 .../qaseIoUtils/enums}/Status.java            |  2 +-
 .../NoReferenceScreenshotFoundException.java  |  2 +-
 .../screenshots/Screenshooter.java            |  4 +-
 .../kafka/ui/utils/BrowserUtils.java          | 23 ---------
 .../ui/utils/qaseIO/MethodNameUtils.java      | 23 ---------
 ...it.platform.launcher.TestExecutionListener |  2 +-
 .../com/provectus/kafka/ui/SmokeTests.java    |  4 +-
 .../com/provectus/kafka/ui/base/BaseTest.java | 34 ++++++-------
 .../com/provectus/kafka/ui/base/Config.java   | 19 +++++++
 .../kafka/ui/tests/ConnectorsTests.java       | 15 +++---
 .../kafka/ui/tests/SchemasTests.java          |  8 +--
 .../provectus/kafka/ui/tests/TopicTests.java  |  8 +--
 35 files changed, 166 insertions(+), 228 deletions(-)
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{extensions => utilities}/FileUtils.java (94%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{extensions => utilities}/WaitUtils.java (95%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{extensions => utilities}/WebUtils.java (68%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{utils/CamelCaseToSpacedDisplayNameGenerator.java => utilities/qaseIoUtils/DisplayNameGenerator.java} (85%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{extensions => utilities/qaseIoUtils}/QaseExtension.java (98%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{utils/qaseIO => utilities/qaseIoUtils}/TestCaseGenerator.java (86%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{utils/qaseIO/annotation => utilities/qaseIoUtils/annotations}/AutomationStatus.java (58%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{utils/qaseIO/annotation => utilities/qaseIoUtils/annotations}/Suite.java (74%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{utils/qaseIO => utilities/qaseIoUtils/enums}/Status.java (51%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{ => utilities}/screenshots/NoReferenceScreenshotFoundException.java (78%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{ => utilities}/screenshots/Screenshooter.java (98%)
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/BrowserUtils.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/MethodNameUtils.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Config.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
index b094a243a8f..b9f5506e6e4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
@@ -13,6 +13,7 @@
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.settings.Source;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -21,7 +22,7 @@
 import java.util.Map;
 
 import static com.codeborne.selenide.Selenide.sleep;
-import static com.provectus.kafka.ui.extensions.FileUtils.fileToString;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 
 @Slf4j
@@ -29,7 +30,7 @@ public class ApiHelper {
 
     int partitions = 1;
     int replicationFactor = 1;
-    String baseURL = TestConfiguration.BASE_API_URL;
+    String baseURL = Source.BASE_API_URL;
 
 
     @SneakyThrows
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java
deleted file mode 100644
index f8cf3111677..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/TestConfiguration.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.provectus.kafka.ui.helpers;
-
-public class TestConfiguration {
-  public static boolean CLEAR_REPORTS_DIR =
-      Boolean.parseBoolean(System.getProperty("CLEAR_REPORTS_DIR", "true"));
-  public static String BASE_API_URL = System.getProperty("BASE_URL", "http://localhost:8080");
-  public static String BASE_WEB_URL = System.getProperty("BASE_DOCKER_URL", "http://host.testcontainers.internal:8080");
-  public static boolean USE_LOCAL_BROWSER =
-      Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "true"));
-  public static String REPORTS_FOLDER = System.getProperty("REPORTS_FOLDER", "allure-results");
-  public static Boolean SCREENSHOTS =
-      Boolean.parseBoolean(System.getProperty("SCREENSHOTS", "true"));
-  public static Boolean SAVE_PAGE_SOURCE =
-      Boolean.parseBoolean(System.getProperty("SAVE_PAGE_SOURCE", "false"));
-  public static Boolean REOPEN_BROWSER_ON_FAIL =
-      Boolean.parseBoolean(System.getProperty("REOPEN_BROWSER_ON_FAIL", "true"));
-  public static String BROWSER = System.getProperty("BROWSER", "chromium");
-  public static String BROWSER_SIZE = System.getProperty("BROWSER_SIZE", "1920x1080");
-  public static Boolean ENABLE_VNC = Boolean.parseBoolean(System.getProperty("ENABLE_VNC", "true"));
-
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
index f6ab04fd94c..ba93f0535c7 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
@@ -3,8 +3,8 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import com.provectus.kafka.ui.helpers.TestConfiguration;
+import com.provectus.kafka.ui.utilities.WaitUtils;
+import com.provectus.kafka.ui.settings.Source;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
@@ -19,7 +19,7 @@ public class MainPage {
 
     @Step
     public MainPage goTo() {
-        Selenide.open(TestConfiguration.BASE_WEB_URL + path);
+        Selenide.open(Source.BASE_WEB_URL + path);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
index a12aca59170..16faa760581 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
@@ -2,15 +2,15 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import com.provectus.kafka.ui.utils.BrowserUtils;
+import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.sleep;
-import static com.provectus.kafka.ui.screenshots.Screenshooter.log;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
 @ExtensionMethod(WaitUtils.class)
 public class ConnectorCreateView {
@@ -28,7 +28,7 @@ public ConnectorsView setConnectorConfig(String connectName, String configJson)
         contentTextArea.setValue("");
         contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
         nameField.click();
-        BrowserUtils.javaExecutorClick(submitButton);
+        javaExecutorClick(submitButton);
         sleep(4000);
         log.info("Connector config is submitted");
         return new ConnectorsView();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
deleted file mode 100644
index 4e7e7b52202..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorUpdateView.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.provectus.kafka.ui.pages.connector;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.utils.BrowserUtils;
-import io.qameta.allure.Step;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-
-import static com.codeborne.selenide.Selectors.byLinkText;
-import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.screenshots.Screenshooter.log;
-
-public class ConnectorUpdateView {
-    SelenideElement submitButton = $(By.xpath("//button[@type='submit']"));
-    SelenideElement contentTextArea = $("[wrap]");
-
-
-    @Step("Update connector from new JSON")
-    public ConnectorUpdateView updateConnectorConfig(String configJson) {
-        BrowserUtils.javaExecutorClick($("#config"));
-        String str = configJson.replace("\r\n", "");
-        executeJavaScript(
-                "function clearAndNot(){" +
-                        "var editor = ace.edit('config');" +
-                        "editor.setValue(\"\");" +
-                        "editor.setValue('" + str + "');}" +
-                        "clearAndNot();");
-        $("#config").click();
-        submitButton.click();
-        $(byLinkText("Edit Config")).shouldBe(Condition.visible);
-        sleep(3000);
-        return this;
-    }
-
-    @Step("Set connector config JSON")
-    public ConnectorsView updConnectorConfig(String configJson) {
-        $("#config").click();
-        contentTextArea.sendKeys(Keys.LEFT_CONTROL+"a");
-        contentTextArea.setValue("");
-        contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
-        $("#config").click();
-        submitButton.shouldBe(Condition.enabled);
-        BrowserUtils.javaExecutorClick(submitButton);
-        sleep(4000);
-        log.info("Connector config is submitted");
-        return new ConnectorsView();
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
index d088f9cd3d1..2eb8fdb2821 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
@@ -2,16 +2,16 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import com.provectus.kafka.ui.helpers.TestConfiguration;
-import com.provectus.kafka.ui.utils.BrowserUtils;
+import com.provectus.kafka.ui.utilities.WaitUtils;
+import com.provectus.kafka.ui.settings.Source;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.extensions.WebUtils.isVisible;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
 
 @ExtensionMethod(WaitUtils.class)
 public class ConnectorsList {
@@ -20,7 +20,7 @@ public class ConnectorsList {
 
     @Step("Open URL to {cluster}")
     public ConnectorsList goTo(String cluster) {
-        Selenide.open(TestConfiguration.BASE_WEB_URL + String.format(path, cluster));
+        Selenide.open(Source.BASE_WEB_URL + String.format(path, cluster));
         return this;
     }
 
@@ -32,7 +32,7 @@ public ConnectorsList waitUntilScreenReady() {
 
     @Step("Click on button 'Create Connector'")
     public ConnectorCreateView clickCreateConnectorButton() {
-        BrowserUtils.javaExecutorClick($x("//button[text()='Create Connector']"));
+        javaExecutorClick($x("//button[text()='Create Connector']"));
         return new ConnectorCreateView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
index 772549c1c38..48f05529e32 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
@@ -3,44 +3,62 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.helpers.TestConfiguration;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import com.provectus.kafka.ui.utils.BrowserUtils;
+import com.provectus.kafka.ui.settings.Source;
+import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
 
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$x;
+import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
 @ExtensionMethod(WaitUtils.class)
 public class ConnectorsView {
     private static final String path = "/ui/clusters/%s/connects/first/connectors/%s";
+    protected SelenideElement submitButton = $(By.xpath("//button[@type='submit']"));
+    protected SelenideElement contentTextArea = $("[wrap]");
 
     @Step
     public ConnectorsView goTo(String cluster, String connector) {
-        Selenide.open(String.format(TestConfiguration.BASE_WEB_URL + path, cluster, connector));
+        Selenide.open(String.format(Source.BASE_WEB_URL + path, cluster, connector));
         return this;
     }
 
     @Step()
-    public ConnectorUpdateView openConfigTab() {
-        BrowserUtils.javaExecutorClick($(By.xpath("//a[text() ='Config']")));
-        return new ConnectorUpdateView();
+    public ConnectorsView openConfigTab() {
+        javaExecutorClick($(By.xpath("//a[text() ='Config']")));
+        return new ConnectorsView();
+    }
+
+    @Step("Set connector config JSON")
+    public ConnectorsView setConfig(String configJson) {
+        $("#config").click();
+        contentTextArea.sendKeys(Keys.LEFT_CONTROL+"a");
+        contentTextArea.setValue("");
+        contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
+        $("#config").click();
+        submitButton.shouldBe(Condition.enabled);
+        javaExecutorClick(submitButton);
+        sleep(4000);
+        log.info("Connector config is submitted");
+        return new ConnectorsView();
     }
 
     @Step("Click 'Delete' button")
     public void clickDeleteButton() {
-        BrowserUtils.javaExecutorClick($x("//button[text()='Delete']"));
+        javaExecutorClick($x("//button[text()='Delete']"));
         SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
         confirmButton.shouldBe(Condition.enabled).click();
         confirmButton.shouldBe(Condition.disappear);
     }
 
     @Step
-    public void connectorIsVisibleOnOverview() {
+    public ConnectorsView waitUntilScreenReady() {
         $(By.xpath("//a[text() ='Tasks']")).shouldBe(Condition.visible);
         $(By.xpath("//a[text() ='Config']")).shouldBe(Condition.visible);
         $(By.xpath("//a[text() ='Overview']")).shouldBe(Condition.visible);
+        return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
index c41153bbdb4..aca3d0d6fca 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
@@ -2,12 +2,12 @@
 
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.api.model.SchemaType;
-import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
 
 public class SchemaCreateView {
 
@@ -22,7 +22,7 @@ public SchemaCreateView selectSchemaTypeFromDropdown(SchemaType schemaType) {
     }
     @Step
     public SchemaView clickSubmit() {
-        BrowserUtils.javaExecutorClick(submitSchemaButton);
+        javaExecutorClick(submitSchemaButton);
         return new SchemaView();
     }
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
index 9e853908e5f..7dabffcd919 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
@@ -5,13 +5,13 @@
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.api.model.SchemaType;
-import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
 
 public class SchemaEditView {
 
@@ -32,7 +32,7 @@ public SchemaEditView selectCompatibilityLevelFromDropdown(CompatibilityLevel.Co
     }
     @Step
     public SchemaView clickSubmit() {
-        BrowserUtils.javaExecutorClick($(By.xpath("//button[@type='submit']")));
+        javaExecutorClick($(By.xpath("//button[@type='submit']")));
         return new SchemaView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index cdd50de7375..e8a08264ab8 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -2,12 +2,12 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.extensions.WebUtils.isVisible;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
 
 public class SchemaRegistryList {
 
@@ -15,7 +15,7 @@ public class SchemaRegistryList {
 
     @Step
     public SchemaCreateView clickCreateSchema() {
-        BrowserUtils.javaExecutorClick(schemaButton);
+        javaExecutorClick(schemaButton);
         return new SchemaCreateView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
index e0b90bf3dd0..b224bf102ec 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
@@ -2,11 +2,12 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.utils.BrowserUtils;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+
 public class SchemaView {
 
     protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
@@ -29,7 +30,7 @@ public SchemaEditView openEditSchema(){
     }
     @Step
     public SchemaRegistryList removeSchema() {
-        BrowserUtils.javaExecutorClick(dotMenuBtn);
+        javaExecutorClick(dotMenuBtn);
         $(By.xpath("//*[contains(text(),'Remove')]")).click();
         SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
         confirmButton.shouldBe(Condition.enabled).click();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
index e7c75e3b9e5..1ee1cc1edaa 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
@@ -6,9 +6,9 @@
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
-import com.provectus.kafka.ui.utils.BrowserUtils;
 
 import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TopicCreateEditSettingsView {
@@ -83,7 +83,7 @@ public TopicCreateEditSettingsView selectRetentionBytes(Long optionValue) {
     }
     @Step
     public TopicView sendData() {
-        BrowserUtils.javaExecutorClick($x("//button[@type='submit']"));
+        javaExecutorClick($x("//button[@type='submit']"));
         return new TopicView();
     }
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index adcd478828a..4ac303573fa 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -3,14 +3,14 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import com.provectus.kafka.ui.helpers.TestConfiguration;
-import com.provectus.kafka.ui.utils.BrowserUtils;
+import com.provectus.kafka.ui.utilities.WaitUtils;
+import com.provectus.kafka.ui.settings.Source;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
 
 @ExtensionMethod({WaitUtils.class})
 public class TopicView {
@@ -20,7 +20,7 @@ public class TopicView {
 
     @Step
     public TopicView goTo(String cluster, String topic) {
-        Selenide.open(TestConfiguration.BASE_WEB_URL + String.format(URL_PATH, cluster, topic));
+        Selenide.open(Source.BASE_WEB_URL + String.format(URL_PATH, cluster, topic));
         return this;
     }
 
@@ -32,7 +32,7 @@ public TopicView waitUntilScreenReady() {
 
     @Step
     public TopicCreateEditSettingsView openEditSettings() {
-        BrowserUtils.javaExecutorClick(dotMenuBtn);
+        javaExecutorClick(dotMenuBtn);
         $x("//li[@role][text()='Edit settings']").click();
         return new TopicCreateEditSettingsView();
     }
@@ -45,7 +45,7 @@ public TopicView openTopicMenu(TopicMenu menu) {
 
     @Step
     public TopicsList deleteTopic() {
-        BrowserUtils.javaExecutorClick(dotMenuBtn);
+        javaExecutorClick(dotMenuBtn);
         $x("//ul[@role='menu']//div[text()='Remove Topic']").click();
         SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
         confirmButton.shouldBe(Condition.enabled).click();
@@ -55,7 +55,7 @@ public TopicsList deleteTopic() {
 
     @Step
     public ProduceMessagePanel clickOnButton(String buttonName) {
-        BrowserUtils.javaExecutorClick($(By.xpath(String.format("//div//button[text()='%s']", buttonName))));
+        javaExecutorClick($(By.xpath(String.format("//div//button[text()='%s']", buttonName))));
         return new ProduceMessagePanel();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index c3c833b89b2..72fe6cfbf5b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -3,15 +3,15 @@
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.extensions.WaitUtils;
-import com.provectus.kafka.ui.helpers.TestConfiguration;
-import com.provectus.kafka.ui.utils.BrowserUtils;
+import com.provectus.kafka.ui.utilities.WaitUtils;
+import com.provectus.kafka.ui.settings.Source;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.extensions.WebUtils.isVisible;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
+import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
 
 @ExtensionMethod(WaitUtils.class)
 public class TopicsList {
@@ -20,7 +20,7 @@ public class TopicsList {
 
     @Step
     public TopicsList goTo(String cluster) {
-        Selenide.open(TestConfiguration.BASE_WEB_URL + String.format(path, cluster));
+        Selenide.open(Source.BASE_WEB_URL + String.format(path, cluster));
         return this;
     }
 
@@ -33,7 +33,7 @@ public TopicsList waitUntilScreenReady() {
 
     @Step
     public TopicCreateEditSettingsView pressCreateNewTopic() {
-        BrowserUtils.javaExecutorClick($x("//button[normalize-space(text()) ='Add a Topic']"));
+        javaExecutorClick($x("//button[normalize-space(text()) ='Add a Topic']"));
         return new TopicCreateEditSettingsView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java
new file mode 100644
index 00000000000..f1c780214cb
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java
@@ -0,0 +1,7 @@
+package com.provectus.kafka.ui.settings;
+
+public abstract class Source {
+
+  public static String BASE_API_URL = System.getProperty("BASE_URL", "http://localhost:8080");
+  public static String BASE_WEB_URL = System.getProperty("BASE_DOCKER_URL", "http://host.testcontainers.internal:8080");
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/FileUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/FileUtils.java
similarity index 94%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/FileUtils.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/FileUtils.java
index bbe4dbf0b4d..c2489a86c20 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/FileUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/FileUtils.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.extensions;
+package com.provectus.kafka.ui.utilities;
 
 import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WaitUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WaitUtils.java
similarity index 95%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WaitUtils.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WaitUtils.java
index f6f404d4b17..ec4ee223cb8 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WaitUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WaitUtils.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.extensions;
+package com.provectus.kafka.ui.utilities;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
similarity index 68%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WebUtils.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index 2c39fb550d7..f88a98f5baa 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -1,12 +1,17 @@
-package com.provectus.kafka.ui.extensions;
+package com.provectus.kafka.ui.utilities;
 
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class WebUtils {
 
+    public static void javaExecutorClick(SelenideElement element){
+        Selenide.executeJavaScript("arguments[0].click();", element);
+    }
+
     public static boolean isVisible(SelenideElement element) {
         boolean isVisible = false;
         try {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/CamelCaseToSpacedDisplayNameGenerator.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/DisplayNameGenerator.java
similarity index 85%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/CamelCaseToSpacedDisplayNameGenerator.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/DisplayNameGenerator.java
index f5c0d689afe..15d239983cf 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/CamelCaseToSpacedDisplayNameGenerator.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/DisplayNameGenerator.java
@@ -1,12 +1,11 @@
-package com.provectus.kafka.ui.utils;
+package com.provectus.kafka.ui.utilities.qaseIoUtils;
 
-import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.platform.commons.util.ClassUtils;
 import org.junit.platform.commons.util.Preconditions;
 
 import java.lang.reflect.Method;
 
-public class CamelCaseToSpacedDisplayNameGenerator implements DisplayNameGenerator {
+public class DisplayNameGenerator implements org.junit.jupiter.api.DisplayNameGenerator {
   @Override
   public String generateDisplayNameForClass(Class<?> testClass) {
     String name = testClass.getName();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/QaseExtension.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
similarity index 98%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/QaseExtension.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
index 1f87d0d1bbe..fcc19f31e2d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/extensions/QaseExtension.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
@@ -1,6 +1,5 @@
-package com.provectus.kafka.ui.extensions;
+package com.provectus.kafka.ui.utilities.qaseIoUtils;
 
-import com.provectus.kafka.ui.utils.qaseIO.TestCaseGenerator;
 import io.qase.api.QaseClient;
 import io.qase.api.StepStorage;
 import io.qase.api.exceptions.QaseException;
@@ -41,11 +40,9 @@ public class QaseExtension implements TestExecutionListener {
 
     static {
         String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
-
         if (qaseApiToken == null || StringUtils.isEmpty(qaseApiToken)) {
             throw new RuntimeException("QaseIO API token should be present");
         }
-
         if ("true".equalsIgnoreCase(System.getProperty("QASEIO_CREATE_TESTRUN"))) {
             System.setProperty("QASE_RUN_NAME", "Automation run " +
                     new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date()));
@@ -56,7 +53,6 @@ public class QaseExtension implements TestExecutionListener {
         System.setProperty("QASE_USE_BULK", "false");
     }
 
-
     @Override
     public void executionStarted(TestIdentifier testIdentifier) {
         if (QaseClient.isEnabled() && testIdentifier.isTest()) {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/TestCaseGenerator.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java
similarity index 86%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/TestCaseGenerator.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java
index 8f1f57d8aed..05666621c47 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/TestCaseGenerator.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java
@@ -1,7 +1,8 @@
-package com.provectus.kafka.ui.utils.qaseIO;
+package com.provectus.kafka.ui.utilities.qaseIoUtils;
 
-import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.QaseClient;
 import io.qase.api.annotation.CaseId;
 import io.qase.client.ApiClient;
@@ -9,14 +10,13 @@
 import io.qase.client.model.*;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Assert;
 import org.junit.platform.engine.support.descriptor.MethodSource;
 
 import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 import static io.qase.api.QaseClient.getConfig;
 
@@ -146,9 +146,18 @@ private static boolean isMethodAnnotatedWithAutomationStatus(Method testMethod)
         return true;
     }
 
+    private static String formatTestCaseTitle(String testMethodName) {
+        String[] split = StringUtils.splitByCharacterTypeCamelCase(testMethodName);
+        String[] name = Arrays.stream(split).map(String::toLowerCase).toArray(String[]::new);
+        String[] subarray = ArrayUtils.subarray(name, 1, name.length);
+        ArrayList<String> stringList = new ArrayList<>(Arrays.asList(subarray));
+        stringList.add(0, StringUtils.capitalize(name[0]));
+        return StringUtils.join(stringList, " ");
+    }
+
     public static String generateTestCaseTitle(Method testMethod) {
         return getClassName(MethodSource.from(testMethod)) + "." + testMethod.getName() + " : " +
-                MethodNameUtils.formatTestCaseTitle(testMethod.getName());
+                formatTestCaseTitle(testMethod.getName());
     }
 
     private static String getClassName(MethodSource testSource) {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/AutomationStatus.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/AutomationStatus.java
similarity index 58%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/AutomationStatus.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/AutomationStatus.java
index d6b7734412c..abaed2a0eec 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/AutomationStatus.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/AutomationStatus.java
@@ -1,6 +1,6 @@
-package com.provectus.kafka.ui.utils.qaseIO.annotation;
+package com.provectus.kafka.ui.utilities.qaseIoUtils.annotations;
 
-import com.provectus.kafka.ui.utils.qaseIO.Status;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/Suite.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/Suite.java
similarity index 74%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/Suite.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/Suite.java
index c70fe0308b7..3e688cd797c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/annotation/Suite.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/Suite.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.utils.qaseIO.annotation;
+package com.provectus.kafka.ui.utilities.qaseIoUtils.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/Status.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/enums/Status.java
similarity index 51%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/Status.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/enums/Status.java
index 534a153014e..024acbc91a6 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/Status.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/enums/Status.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.utils.qaseIO;
+package com.provectus.kafka.ui.utilities.qaseIoUtils.enums;
 
 public enum Status {
     AUTOMATED, TO_BE_AUTOMATED, MANUAL;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/NoReferenceScreenshotFoundException.java
similarity index 78%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/NoReferenceScreenshotFoundException.java
index 9818aab0115..0011c4f0a13 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/NoReferenceScreenshotFoundException.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/NoReferenceScreenshotFoundException.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.screenshots;
+package com.provectus.kafka.ui.utilities.screenshots;
 
 public class NoReferenceScreenshotFoundException extends Throwable {
     public NoReferenceScreenshotFoundException(String name) {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/Screenshooter.java
similarity index 98%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/Screenshooter.java
index d412050b299..136a9e8bd4b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/screenshots/Screenshooter.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/Screenshooter.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.screenshots;
+package com.provectus.kafka.ui.utilities.screenshots;
 
 import io.qameta.allure.Allure;
 import io.qameta.allure.Attachment;
@@ -29,7 +29,7 @@ public class Screenshooter {
     private static final int PIXELS_THRESHOLD =
             Integer.parseInt(System.getProperty("PIXELS_THRESHOLD", "200"));
     private static final String SCREENSHOTS_FOLDER =
-            System.getProperty("SCREENSHOTS_FOLDER", "com/provectus/kafka/ui/screenshots/");
+            System.getProperty("SCREENSHOTS_FOLDER", "com/provectus/kafka/ui/utilities/screenshots/");
     private static final String DIFF_SCREENSHOTS_FOLDER =
             System.getProperty("DIFF_SCREENSHOTS_FOLDER", "build/__diff__/");
     private static final String ACTUAL_SCREENSHOTS_FOLDER =
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/BrowserUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/BrowserUtils.java
deleted file mode 100644
index 7549c5c1111..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/BrowserUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.provectus.kafka.ui.utils;
-
-import com.codeborne.selenide.Selenide;
-import com.codeborne.selenide.SelenideElement;
-import org.openqa.selenium.NoSuchElementException;
-
-public class BrowserUtils {
-
-    public static void javaExecutorClick(SelenideElement element){
-        Selenide.executeJavaScript("arguments[0].click();", element);
-    }
-
-    public static void waitElementPresentJavaExecutor( SelenideElement element ) {
-        try {
-            Selenide.executeJavaScript("return typeof(arguments[0]) != 'undefined' && arguments[0] != null;",
-                    element);
-        }
-        catch(org.openqa.selenium.StaleElementReferenceException | NoSuchElementException ex){
-            Selenide.executeJavaScript("return typeof(arguments[0]) != 'undefined' && arguments[0] != null;",
-                    element);
-        }
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/MethodNameUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/MethodNameUtils.java
deleted file mode 100644
index 3bd8bf67364..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utils/qaseIO/MethodNameUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.provectus.kafka.ui.utils.qaseIO;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-public class MethodNameUtils {
-
-    public static String formatTestCaseTitle(String testMethodName) {
-        String[] split = StringUtils.splitByCharacterTypeCamelCase(testMethodName);
-
-        String[] name = Arrays.stream(split).map(String::toLowerCase).toArray(String[]::new);
-
-        String[] subarray = ArrayUtils.subarray(name, 1, name.length);
-
-        ArrayList<String> stringList = new ArrayList<>(Arrays.asList(subarray));
-        stringList.add(0, StringUtils.capitalize(name[0]));
-
-        return StringUtils.join(stringList, " ");
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
index a63e49fe756..dd3c3f5e908 100644
--- a/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
+++ b/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
@@ -1 +1 @@
-com.provectus.kafka.ui.extensions.QaseExtension
\ No newline at end of file
+com.provectus.kafka.ui.utilities.qaseIoUtils.QaseExtension
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
index 3c364bbeed2..ee2024d0e7d 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
@@ -1,8 +1,8 @@
 package com.provectus.kafka.ui;
 
 import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.utils.qaseIO.Status;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import io.qase.api.annotation.CaseId;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index dbb13c3df20..990bad8dbaa 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -4,11 +4,10 @@
 import com.codeborne.selenide.WebDriverRunner;
 import com.codeborne.selenide.logevents.SelenideLogger;
 import com.provectus.kafka.ui.helpers.Helpers;
-import com.provectus.kafka.ui.helpers.TestConfiguration;
 import com.provectus.kafka.ui.pages.Pages;
-import com.provectus.kafka.ui.screenshots.Screenshooter;
-import com.provectus.kafka.ui.utils.CamelCaseToSpacedDisplayNameGenerator;
-import com.provectus.kafka.ui.utils.qaseIO.TestCaseGenerator;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.TestCaseGenerator;
+import com.provectus.kafka.ui.utilities.screenshots.Screenshooter;
 import io.github.cdimascio.dotenv.Dotenv;
 import io.qameta.allure.Allure;
 import io.qameta.allure.selenide.AllureSelenide;
@@ -32,7 +31,7 @@
 import java.util.Arrays;
 
 @Slf4j
-@DisplayNameGeneration(CamelCaseToSpacedDisplayNameGenerator.class)
+@DisplayNameGeneration(DisplayNameGenerator.class)
 public class BaseTest {
 
   public static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
@@ -103,7 +102,7 @@ public static void tearDown() {
       }
     }
     Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue()));
-    if (TestConfiguration.CLEAR_REPORTS_DIR) {
+    if (Config.CLEAR_REPORTS_DIR) {
       clearReports();
     }
     setup();
@@ -125,28 +124,27 @@ public void afterMethod() {
 
   @SneakyThrows
   private static void setup() {
-    Configuration.reportsFolder = TestConfiguration.REPORTS_FOLDER;
-    Configuration.screenshots = TestConfiguration.SCREENSHOTS;
-    Configuration.savePageSource = TestConfiguration.SAVE_PAGE_SOURCE;
-    Configuration.reopenBrowserOnFail = TestConfiguration.REOPEN_BROWSER_ON_FAIL;
-    Configuration.browser = TestConfiguration.BROWSER;
-    Configuration.baseUrl = TestConfiguration.BASE_WEB_URL;
+    Configuration.reportsFolder = Config.REPORTS_FOLDER;
+    Configuration.screenshots = Config.SCREENSHOTS;
+    Configuration.savePageSource = Config.SAVE_PAGE_SOURCE;
+    Configuration.reopenBrowserOnFail = Config.REOPEN_BROWSER_ON_FAIL;
+    Configuration.browser = Config.BROWSER;
     Configuration.timeout = 10000;
     Configuration.pageLoadTimeout = 180000;
-    Configuration.browserSize = TestConfiguration.BROWSER_SIZE;
+    Configuration.browserSize = Config.BROWSER_SIZE;
     SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
   }
 
   public static void clearReports() {
-    log.info(String.format("Clearing reports dir [%s]...", TestConfiguration.REPORTS_FOLDER));
-    File allureResults = new File(TestConfiguration.REPORTS_FOLDER);
+    log.info(String.format("Clearing reports dir [%s]...", Config.REPORTS_FOLDER));
+    File allureResults = new File(Config.REPORTS_FOLDER);
     if (allureResults.isDirectory()) {
       File[] list = allureResults.listFiles();
       if (list != null) {
         Arrays.stream(list)
-            .sequential()
-            .filter(e -> !e.getName().equals("categories.json"))
-            .forEach(File::delete);
+                .sequential()
+                .filter(e -> !e.getName().equals("categories.json"))
+                .forEach(File::delete);
       }
     }
   }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Config.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Config.java
new file mode 100644
index 00000000000..900a6c0f902
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Config.java
@@ -0,0 +1,19 @@
+package com.provectus.kafka.ui.base;
+
+public abstract class Config {
+
+  public static boolean CLEAR_REPORTS_DIR =
+          Boolean.parseBoolean(System.getProperty("CLEAR_REPORTS_DIR", "true"));
+  public static boolean USE_LOCAL_BROWSER =
+          Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "true"));
+  public static String REPORTS_FOLDER = System.getProperty("REPORTS_FOLDER", "allure-results");
+  public static Boolean SCREENSHOTS =
+          Boolean.parseBoolean(System.getProperty("SCREENSHOTS", "true"));
+  public static Boolean SAVE_PAGE_SOURCE =
+          Boolean.parseBoolean(System.getProperty("SAVE_PAGE_SOURCE", "false"));
+  public static Boolean REOPEN_BROWSER_ON_FAIL =
+          Boolean.parseBoolean(System.getProperty("REOPEN_BROWSER_ON_FAIL", "true"));
+  public static String BROWSER = System.getProperty("BROWSER", "chromium");
+  public static String BROWSER_SIZE = System.getProperty("BROWSER_SIZE", "1920x1080");
+  public static Boolean ENABLE_VNC = Boolean.parseBoolean(System.getProperty("ENABLE_VNC", "true"));
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 2b858eec1bc..bc643fa5b3a 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -4,16 +4,16 @@
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.utils.qaseIO.Status;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import io.qase.api.annotation.CaseId;
 import org.junit.jupiter.api.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.provectus.kafka.ui.extensions.FileUtils.getResourceAsString;
+import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
 
 public class ConnectorsTests extends BaseTest {
     private static final long SUITE_ID = 10;
@@ -80,9 +80,10 @@ public void updateConnector() {
         pages.openConnectorsList(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_UPDATE.getName());
-        pages.connectorsView.connectorIsVisibleOnOverview();
-        pages.connectorsView.openConfigTab()
-                .updConnectorConfig(CONNECTOR_FOR_UPDATE.getConfig());
+        pages.connectorsView
+                .waitUntilScreenReady()
+                .openConfigTab()
+                .setConfig(CONNECTOR_FOR_UPDATE.getConfig());
         pages.openConnectorsList(CLUSTER_NAME);
         Assertions.assertTrue(pages.connectorsList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()),"isConnectorVisible()");
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index 265defb0453..02588bcc100 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -7,9 +7,9 @@
 import com.provectus.kafka.ui.pages.MainPage;
 import com.provectus.kafka.ui.pages.schema.SchemaEditView;
 import com.provectus.kafka.ui.pages.schema.SchemaView;
-import com.provectus.kafka.ui.utils.qaseIO.Status;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import io.qase.api.annotation.CaseId;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
@@ -17,7 +17,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.provectus.kafka.ui.extensions.FileUtils.fileToString;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index c284f2217b9..5c6b0b86c18 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -6,9 +6,9 @@
 import com.provectus.kafka.ui.pages.MainPage;
 import com.provectus.kafka.ui.pages.topic.TopicCreateEditSettingsView;
 import com.provectus.kafka.ui.pages.topic.TopicView;
-import com.provectus.kafka.ui.utils.qaseIO.Status;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.AutomationStatus;
-import com.provectus.kafka.ui.utils.qaseIO.annotation.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import io.qase.api.annotation.CaseId;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.*;
@@ -16,7 +16,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.provectus.kafka.ui.extensions.FileUtils.fileToString;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 public class TopicTests extends BaseTest {
     private static final long SUITE_ID = 2;

From 3733729a55123781d7e5ca5ea94be582602be93a Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Tue, 27 Sep 2022 13:03:56 +0400
Subject: [PATCH 183/734] Create schema view is too wide (#2618)

* Create schema view is too wide

* renove inputWidth props

* fixed form container width

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/components/Schemas/New/New.styled.ts | 1 +
 kafka-ui-react-app/src/components/Schemas/New/New.tsx       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.styled.ts b/kafka-ui-react-app/src/components/Schemas/New/New.styled.ts
index e7cf70ea276..257c18df1b0 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.styled.ts
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.styled.ts
@@ -6,6 +6,7 @@ export const Form = styled.form`
   display: flex;
   flex-direction: column;
   gap: 16px;
+  width: 50%;
 
   & > button {
     align-self: flex-start;
diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.tsx b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
index 21afda96e0d..39fa49e7416 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
@@ -120,7 +120,7 @@ const New: React.FC = () => {
                 name={name}
                 value={value}
                 onChange={onChange}
-                minWidth="50%"
+                minWidth="100%"
                 disabled={isSubmitting}
                 options={SchemaTypeOptions}
               />

From f31b965d664bdf3d76ac1fb37f59d174b8feb7bb Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Tue, 27 Sep 2022 13:15:59 +0400
Subject: [PATCH 184/734] Implement Search within Consumer group profile
 (#2629)

* Implement Search within Consumer group profile

* use useSearchParams and add search test

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../ConsumerGroups/Details/Details.tsx        | 19 +++++++++++++++++--
 .../Details/__tests__/Details.spec.tsx        |  7 +++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index f1ce947fdb7..d45685d7638 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import useAppParams from 'lib/hooks/useAppParams';
 import {
   clusterConsumerGroupResetRelativePath,
   clusterConsumerGroupsPath,
   ClusterGroupParam,
 } from 'lib/paths';
+import Search from 'components/common/Search/Search';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageHeading from 'components/common/PageHeading/PageHeading';
@@ -24,11 +25,14 @@ import {
 } from 'redux/reducers/consumerGroups/consumerGroupsSlice';
 import getTagColor from 'components/common/Tag/getTagColor';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 
 import ListItem from './ListItem';
 
 const Details: React.FC = () => {
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  const searchValue = searchParams.get('q') || '';
   const { isReadOnly } = React.useContext(ClusterContext);
   const { consumerGroupID, clusterName } = useAppParams<ClusterGroupParam>();
   const dispatch = useAppDispatch();
@@ -62,6 +66,14 @@ const Details: React.FC = () => {
 
   const partitionsByTopic = groupBy(consumerGroup.partitions, 'topic');
 
+  const filteredPartitionsByTopic = Object.keys(partitionsByTopic).filter(
+    (el) => el.includes(searchValue)
+  );
+
+  const currentPartitionsByTopic = searchValue.length
+    ? filteredPartitionsByTopic
+    : Object.keys(partitionsByTopic);
+
   return (
     <div>
       <div>
@@ -108,6 +120,9 @@ const Details: React.FC = () => {
           </Metrics.Indicator>
         </Metrics.Section>
       </Metrics.Wrapper>
+      <ControlPanelWrapper hasInput style={{ margin: '16px 0 20px' }}>
+        <Search placeholder="Search by Topic Name" />
+      </ControlPanelWrapper>
       <Table isFullwidth>
         <thead>
           <tr>
@@ -116,7 +131,7 @@ const Details: React.FC = () => {
           </tr>
         </thead>
         <tbody>
-          {Object.keys(partitionsByTopic).map((key) => (
+          {currentPartitionsByTopic.map((key) => (
             <ListItem
               clusterName={clusterName}
               consumers={partitionsByTopic[key]}
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
index 7a99ee07138..e16eae8669b 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
@@ -77,6 +77,13 @@ describe('Details component', () => {
       );
     });
 
+    it('renders search input', async () => {
+      await renderComponent();
+      expect(
+        screen.getByPlaceholderText('Search by Topic Name')
+      ).toBeInTheDocument();
+    });
+
     it('shows confirmation modal on consumer group delete', async () => {
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
       userEvent.click(screen.getByText('Delete consumer group'));

From 63719d718dab1403bba02ccfef2eaecd391e6b01 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Tue, 27 Sep 2022 13:02:56 +0300
Subject: [PATCH 185/734] Issue_2438 (#2649)

* [e2e] create Setup class and refactoring of BaseTest #2438

* [e2e] create Setup class and refactoring of BaseTest #2438

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../com/provectus/kafka/ui/base/BaseTest.java | 69 ++++++-------------
 .../com/provectus/kafka/ui/base/Setup.java    | 41 +++++++++++
 2 files changed, 61 insertions(+), 49 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 990bad8dbaa..a69f3afc9dd 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -1,8 +1,6 @@
 package com.provectus.kafka.ui.base;
 
-import com.codeborne.selenide.Configuration;
 import com.codeborne.selenide.WebDriverRunner;
-import com.codeborne.selenide.logevents.SelenideLogger;
 import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.pages.Pages;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
@@ -10,8 +8,6 @@
 import com.provectus.kafka.ui.utilities.screenshots.Screenshooter;
 import io.github.cdimascio.dotenv.Dotenv;
 import io.qameta.allure.Allure;
-import io.qameta.allure.selenide.AllureSelenide;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.*;
@@ -28,15 +24,17 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
+
+import static com.provectus.kafka.ui.base.Setup.clearReports;
+import static com.provectus.kafka.ui.base.Setup.setup;
 
 @Slf4j
 @DisplayNameGeneration(DisplayNameGenerator.class)
 public class BaseTest {
 
-  public static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
-  public static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
-  public static final String CLUSTER_NAME = "local";
+  private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
+  private static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
+  protected static final String CLUSTER_NAME = "local";
   protected Pages pages = Pages.INSTANCE;
   protected Helpers helpers = Helpers.INSTANCE;
 
@@ -52,6 +50,10 @@ public void compareScreenshots(String name, Boolean shouldUpdateScreenshots) {
     screenshooter.compareScreenshots(name, shouldUpdateScreenshots);
   }
 
+  private static boolean isARM64() {
+    return System.getProperty("os.arch").equals("aarch64");
+  }
+
   @BeforeEach
   public void setWebDriver() {
     RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
@@ -74,7 +76,7 @@ public static void start() {
             .addArguments("--no-sandbox")
             .addArguments("--verbose")
         )
-        .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
+            .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
     try {
       Testcontainers.exposeHostPorts(8080);
       log.info("Starting browser container");
@@ -84,14 +86,6 @@ public static void start() {
     }
   }
 
-  @AfterAll
-  public static void tearDown() {
-    if (webDriverContainer.isRunning()) {
-      webDriverContainer.close();
-      webDriverContainer.stop();
-    }
-  }
-
   static {
     if (!new File("./.env").exists()) {
       try {
@@ -109,47 +103,24 @@ public static void tearDown() {
     Runtime.getRuntime().addShutdownHook(new Thread(() -> {
       if (TestCaseGenerator.FAILED) {
         log.error(
-            "Tests FAILED because some problem with @CaseId annotation. Verify that all tests annotated with @CaseId and Id is correct!");
+                "Tests FAILED because some problem with @CaseId annotation. Verify that all tests annotated with @CaseId and Id is correct!");
         Runtime.getRuntime().halt(100500);
       }
     }));
   }
 
+  @AfterAll
+  public static void tearDown() {
+    if (webDriverContainer.isRunning()) {
+      webDriverContainer.close();
+      webDriverContainer.stop();
+    }
+  }
+
   @AfterEach
   public void afterMethod() {
     Allure.addAttachment("Screenshot",
         new ByteArrayInputStream(
             ((TakesScreenshot) webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
   }
-
-  @SneakyThrows
-  private static void setup() {
-    Configuration.reportsFolder = Config.REPORTS_FOLDER;
-    Configuration.screenshots = Config.SCREENSHOTS;
-    Configuration.savePageSource = Config.SAVE_PAGE_SOURCE;
-    Configuration.reopenBrowserOnFail = Config.REOPEN_BROWSER_ON_FAIL;
-    Configuration.browser = Config.BROWSER;
-    Configuration.timeout = 10000;
-    Configuration.pageLoadTimeout = 180000;
-    Configuration.browserSize = Config.BROWSER_SIZE;
-    SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
-  }
-
-  public static void clearReports() {
-    log.info(String.format("Clearing reports dir [%s]...", Config.REPORTS_FOLDER));
-    File allureResults = new File(Config.REPORTS_FOLDER);
-    if (allureResults.isDirectory()) {
-      File[] list = allureResults.listFiles();
-      if (list != null) {
-        Arrays.stream(list)
-                .sequential()
-                .filter(e -> !e.getName().equals("categories.json"))
-                .forEach(File::delete);
-      }
-    }
-  }
-
-  private static boolean isARM64() {
-    return System.getProperty("os.arch").equals("aarch64");
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
new file mode 100644
index 00000000000..954acb37ba7
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
@@ -0,0 +1,41 @@
+package com.provectus.kafka.ui.base;
+
+import com.codeborne.selenide.Configuration;
+import com.codeborne.selenide.logevents.SelenideLogger;
+import io.qameta.allure.selenide.AllureSelenide;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.util.Arrays;
+
+@Slf4j
+public abstract class Setup {
+
+    @SneakyThrows
+    static void setup() {
+        Configuration.reportsFolder = Config.REPORTS_FOLDER;
+        Configuration.screenshots = Config.SCREENSHOTS;
+        Configuration.savePageSource = Config.SAVE_PAGE_SOURCE;
+        Configuration.reopenBrowserOnFail = Config.REOPEN_BROWSER_ON_FAIL;
+        Configuration.browser = Config.BROWSER;
+        Configuration.timeout = 10000;
+        Configuration.pageLoadTimeout = 180000;
+        Configuration.browserSize = Config.BROWSER_SIZE;
+        SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
+    }
+
+    public static void clearReports() {
+        log.info(String.format("Clearing reports dir [%s]...", Config.REPORTS_FOLDER));
+        File allureResults = new File(Config.REPORTS_FOLDER);
+        if (allureResults.isDirectory()) {
+            File[] list = allureResults.listFiles();
+            if (list != null) {
+                Arrays.stream(list)
+                        .sequential()
+                        .filter(e -> !e.getName().equals("categories.json"))
+                        .forEach(File::delete);
+            }
+        }
+    }
+}

From 049b35fc99fd09d270fbccb3f0a2bbcc9bf11f56 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 27 Sep 2022 19:52:59 +0400
Subject: [PATCH 186/734] Pluggable serde (#2125)

* checkstyle

* node version reverted

* api comments

* unused properties removed

* serde api fix

* renamings

* PR review fixes

* checkstyle fix

* PR fixes

* UUID serde tests added

* UUID serde tests added

* fixed due to review comments

* 1. kafka-ui-serde-api renamed 2. kafka-clients dependency removed from kafka-ui-serde-api module

* dep fix

* Add serde to send message component (#2620)

* Add serde to send message component

* adds serde selects to messages views

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: Kristina Kiparoidze <kkiparoidze@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 etc/checkstyle/checkstyle.xml                 |   2 +-
 kafka-ui-api/pom.xml                          |   9 +-
 .../kafka/ui/config/ClustersProperties.java   |  21 +-
 .../ui/controller/MessagesController.java     |  48 ++-
 .../kafka/ui/emitter/AbstractEmitter.java     |   9 +-
 .../ui/emitter/BackwardRecordEmitter.java     |   4 +-
 .../ui/emitter/ForwardRecordEmitter.java      |   4 +-
 .../kafka/ui/emitter/TailingEmitter.java      |   4 +-
 .../kafka/ui/mapper/ClusterMapper.java        |  11 -
 .../kafka/ui/model/InternalConsumerGroup.java |  20 --
 .../kafka/ui/model/KafkaCluster.java          |   9 -
 .../ui/serde/DeserializationService.java      |  52 ---
 .../ui/serde/ProtobufFileRecordSerDe.java     | 210 ------------
 .../provectus/kafka/ui/serde/RecordSerDe.java |  39 ---
 .../kafka/ui/serde/SimpleRecordSerDe.java     |  53 ----
 .../schemaregistry/AvroMessageFormatter.java  |  29 --
 .../JsonSchemaMessageFormatter.java           |  25 --
 .../serde/schemaregistry/MessageFormat.java   |  15 -
 .../schemaregistry/MessageFormatter.java      |   9 -
 .../ProtobufMessageFormatter.java             |  28 --
 .../SchemaRegistryAwareRecordSerDe.java       | 298 ------------------
 .../StringMessageFormatter.java               |  11 -
 .../kafka/ui/serdes/BuiltInSerde.java         |  12 +
 .../kafka/ui/serdes/ClassloaderUtil.java      |  12 +
 .../kafka/ui/serdes/ClusterSerdes.java        | 218 +++++++++++++
 .../ui/serdes/ConsumerRecordDeserializer.java | 139 ++++++++
 .../kafka/ui/serdes/CustomSerdeLoader.java    | 173 ++++++++++
 .../ui/serdes/ProducerRecordCreator.java      |  41 +++
 .../kafka/ui/serdes/PropertyResolverImpl.java |  64 ++++
 .../kafka/ui/serdes/RecordHeaderImpl.java     |  23 ++
 .../kafka/ui/serdes/RecordHeadersImpl.java    |  26 ++
 .../kafka/ui/serdes/SerdeInstance.java        |  71 +++++
 .../kafka/ui/serdes/builtin/Base64Serde.java  |  74 +++++
 .../kafka/ui/serdes/builtin/Int32Serde.java   |  70 ++++
 .../kafka/ui/serdes/builtin/Int64Serde.java   |  76 +++++
 .../ui/serdes/builtin/ProtobufFileSerde.java  | 178 +++++++++++
 .../kafka/ui/serdes/builtin/StringSerde.java  |  65 ++++
 .../kafka/ui/serdes/builtin/UInt32Serde.java  |  70 ++++
 .../kafka/ui/serdes/builtin/UInt64Serde.java  |  79 +++++
 .../ui/serdes/builtin/UuidBinarySerde.java    |  91 ++++++
 .../sr/AvroSchemaRegistrySerializer.java}     |  15 +-
 .../JsonSchemaSchemaRegistrySerializer.java}  |  16 +-
 .../serdes/builtin/sr/MessageFormatter.java   |  73 +++++
 .../sr/ProtobufSchemaRegistrySerializer.java} |  15 +-
 .../builtin/sr/SchemaRegistrySerde.java       | 265 ++++++++++++++++
 .../builtin/sr/SchemaRegistrySerializer.java} |  20 +-
 .../ui/serdes/builtin/sr/SchemaType.java      |  14 +
 .../ui/service/ConsumerGroupService.java      |   5 +-
 .../ui/service/DeserializationService.java    | 140 ++++++++
 .../kafka/ui/service/MessagesService.java     |  60 ++--
 .../kafka/ui/service/ReactiveAdminClient.java |   3 +-
 .../kafka/ui/service/TopicsService.java       |  11 -
 .../provectus/kafka/ui/util/ClusterUtil.java  |  80 -----
 .../kafka/ui/util/ConsumerRecordUtil.java     |  37 ---
 .../kafka/ui/emitter/TailingEmitterTest.java  |   4 +-
 .../ui/serde/ProtobufFileRecordSerDeTest.java | 125 --------
 .../kafka/ui/serde/SimpleRecordSerDeTest.java |  40 ---
 .../SchemaRegistryAwareRecordSerDeTest.java   | 203 ------------
 .../ui/serdes/PropertyResolverImplTest.java   | 156 +++++++++
 .../ui/serdes/builtin/Base64SerdeTest.java    |  66 ++++
 .../ui/serdes/builtin/Int32SerdeTest.java     |  46 +++
 .../ui/serdes/builtin/Int64SerdeTest.java     |  47 +++
 .../serdes/builtin/ProtobufFileSerdeTest.java | 152 +++++++++
 .../ui/serdes/builtin/UInt32SerdeTest.java    |  59 ++++
 .../ui/serdes/builtin/UInt64SerdeTest.java    |  58 ++++
 .../serdes/builtin/UuidBinarySerdeTest.java   | 101 ++++++
 .../builtin/sr/SchemaRegistrySerdeTest.java   | 157 +++++++++
 .../kafka/ui/service/MessagesServiceTest.java |   3 +-
 .../kafka/ui/service/RecordEmitterTest.java   |  43 ++-
 .../kafka/ui/service/SendAndReadTests.java    | 171 ++++------
 .../main/resources/swagger/kafka-ui-api.yaml  | 156 +++++----
 kafka-ui-react-app/jest.config.ts             |   1 +
 .../src/components/Connect/List/List.tsx      |   9 +-
 .../Topic/Messages/Filters/Filters.styled.ts  |  25 +-
 .../Topics/Topic/Messages/Filters/Filters.tsx | 279 ++++++++--------
 .../Filters/__tests__/Filters.spec.tsx        |  18 +-
 .../Topics/Topic/Messages/Messages.tsx        |  35 +-
 .../Topic/Messages/__test__/Messages.spec.tsx |  17 +-
 .../Messages/__test__/MessagesTable.spec.tsx  |   1 -
 .../Topic/MessagesV2/FiltersBar/Form.tsx      |  57 +++-
 .../Topic/MessagesV2/Messages.styled.ts       |   1 +
 .../Topics/Topic/MessagesV2/Messages.tsx      |  25 --
 .../Topic/MessagesV2/MessagesContainer.tsx    |  62 ++++
 .../MessagesV2/utils/getDefaultSerdeName.ts   |  13 +
 .../Topics/Topic/SendMessage/SendMessage.tsx  | 218 +++++++------
 .../SendMessage/__test__/SendMessage.spec.tsx |  50 ++-
 .../Topic/SendMessage/__test__/utils.spec.ts  |  85 +++++
 .../__test__/validateMessage.spec.ts          |  89 ------
 .../Topics/Topic/SendMessage/utils.ts         |  97 ++++++
 .../Topic/SendMessage/validateMessage.ts      |  58 ----
 .../src/components/Topics/Topic/Topic.tsx     |   9 +-
 .../table/__tests__/TableHeaderCell.spec.tsx  |   2 +-
 .../contexts/TopicMessagesContext.ts          |   1 -
 .../src/lib/fixtures/topicMessages.ts         |  38 +++
 kafka-ui-react-app/src/lib/fixtures/topics.ts |  50 ---
 .../hooks/api/__tests__/topicMessages.spec.ts |  36 +++
 .../lib/hooks/api/__tests__/topics.spec.ts    |   7 -
 .../src/lib/hooks/api/topicMessages.tsx       |  19 ++
 .../src/lib/hooks/api/topics.ts               |   9 +-
 kafka-ui-react-app/src/lib/hooks/useSearch.ts |  53 ----
 kafka-ui-serde-api/pom.xml                    |  26 ++
 .../kafka/ui/serde/api/DeserializeResult.java |  59 ++++
 .../kafka/ui/serde/api/PropertyResolver.java  |  15 +
 .../kafka/ui/serde/api/RecordHeader.java      |   9 +
 .../kafka/ui/serde/api/RecordHeaders.java     |   5 +
 .../kafka/ui/serde/api/SchemaDescription.java |  23 ++
 .../provectus/kafka/ui/serde/api/Serde.java   |  39 +++
 pom.xml                                       |   1 +
 108 files changed, 4108 insertions(+), 2166 deletions(-)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/DeserializationService.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/ProtobufFileRecordSerDe.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/RecordSerDe.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/SimpleRecordSerDe.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/AvroMessageFormatter.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/JsonSchemaMessageFormatter.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageFormat.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageFormatter.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/ProtobufMessageFormatter.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDe.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/StringMessageFormatter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/BuiltInSerde.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClassloaderUtil.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/CustomSerdeLoader.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ProducerRecordCreator.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/PropertyResolverImpl.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/RecordHeaderImpl.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/RecordHeadersImpl.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/StringSerde.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt32Serde.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/{serde/schemaregistry/AvroMessageReader.java => serdes/builtin/sr/AvroSchemaRegistrySerializer.java} (70%)
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/{serde/schemaregistry/JsonSchemaMessageReader.java => serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java} (82%)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/{serde/schemaregistry/ProtobufMessageReader.java => serdes/builtin/sr/ProtobufSchemaRegistrySerializer.java} (74%)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/{serde/schemaregistry/MessageReader.java => serdes/builtin/sr/SchemaRegistrySerializer.java} (56%)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaType.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordUtil.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/ProtobufFileRecordSerDeTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/SimpleRecordSerDeTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDeTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/PropertyResolverImplTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Base64SerdeTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Int32SerdeTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Int64SerdeTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UInt32SerdeTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UInt64SerdeTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerdeTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesContainer.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/getDefaultSerdeName.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/utils.spec.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/validateMessage.spec.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts
 create mode 100644 kafka-ui-react-app/src/lib/fixtures/topicMessages.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/topicMessages.spec.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/useSearch.ts
 create mode 100644 kafka-ui-serde-api/pom.xml
 create mode 100644 kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/DeserializeResult.java
 create mode 100644 kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java
 create mode 100644 kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/RecordHeader.java
 create mode 100644 kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/RecordHeaders.java
 create mode 100644 kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/SchemaDescription.java
 create mode 100644 kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java

diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml
index c47505c74b0..0348f809b4d 100644
--- a/etc/checkstyle/checkstyle.xml
+++ b/etc/checkstyle/checkstyle.xml
@@ -297,7 +297,7 @@
                       value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
         <module name="JavadocMethod">
-            <property name="scope" value="public"/>
+            <property name="accessModifiers" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>
diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index a43c087b428..f2125787fcd 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -54,6 +54,11 @@
             <artifactId>kafka-ui-contract</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.provectus</groupId>
+            <artifactId>kafka-ui-serde-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
@@ -277,12 +282,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.2</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.32</version>
+                        <version>10.3.1</version>
                     </dependency>
                 </dependencies>
                 <executions>
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index de4c8bc3477..0c7b8fb3d48 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.config;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -28,13 +29,6 @@ public static class Cluster {
     SchemaRegistryAuth schemaRegistryAuth;
     String ksqldbServer;
     KsqldbServerAuth ksqldbServerAuth;
-    String schemaNameTemplate = "%s-value";
-    String keySchemaNameTemplate = "%s-key";
-    String protobufFile;
-    String protobufMessageName;
-    Map<String, String> protobufMessageNameByTopic;
-    String protobufMessageNameForKey;
-    Map<String, String> protobufMessageNameForKeyByTopic;
     List<ConnectCluster> kafkaConnect;
     int jmxPort;
     boolean jmxSsl;
@@ -43,6 +37,9 @@ public static class Cluster {
     Properties properties;
     boolean readOnly = false;
     boolean disableLogDirsCollection = false;
+    List<SerdeConfig> serde = new ArrayList<>();
+    String defaultKeySerde;
+    String defaultValueSerde;
   }
 
   @Data
@@ -59,6 +56,16 @@ public static class SchemaRegistryAuth {
     String password;
   }
 
+  @Data
+  public static class SerdeConfig {
+    String name;
+    String className;
+    String filePath;
+    Map<String, Object> properties = new HashMap<>();
+    String topicKeysPattern;
+    String topicValuesPattern;
+  }
+
   @Data
   @ToString(exclude = "password")
   public static class KsqldbServerAuth {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
index 4a43523e3d6..fab4bcfd5c0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
@@ -1,5 +1,7 @@
 package com.provectus.kafka.ui.controller;
 
+import static com.provectus.kafka.ui.serde.api.Serde.Target.KEY;
+import static com.provectus.kafka.ui.serde.api.Serde.Target.VALUE;
 import static java.util.stream.Collectors.toMap;
 
 import com.provectus.kafka.ui.api.MessagesApi;
@@ -8,10 +10,11 @@
 import com.provectus.kafka.ui.model.MessageFilterTypeDTO;
 import com.provectus.kafka.ui.model.SeekDirectionDTO;
 import com.provectus.kafka.ui.model.SeekTypeDTO;
+import com.provectus.kafka.ui.model.SerdeUsageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.model.TopicMessageSchemaDTO;
+import com.provectus.kafka.ui.model.TopicSerdeSuggestionDTO;
+import com.provectus.kafka.ui.service.DeserializationService;
 import com.provectus.kafka.ui.service.MessagesService;
-import com.provectus.kafka.ui.service.TopicsService;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -35,7 +38,7 @@ public class MessagesController extends AbstractController implements MessagesAp
   private static final int DEFAULT_LOAD_RECORD_LIMIT = 20;
 
   private final MessagesService messagesService;
-  private final TopicsService topicsService;
+  private final DeserializationService deserializationService;
 
   @Override
   public Mono<ResponseEntity<Void>> deleteTopicMessages(
@@ -49,10 +52,17 @@ public Mono<ResponseEntity<Void>> deleteTopicMessages(
   }
 
   @Override
-  public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(
-      String clusterName, String topicName, SeekTypeDTO seekType, List<String> seekTo,
-      Integer limit, String q, MessageFilterTypeDTO filterQueryType,
-      SeekDirectionDTO seekDirection, ServerWebExchange exchange) {
+  public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String clusterName,
+                                                                           String topicName,
+                                                                           SeekTypeDTO seekType,
+                                                                           List<String> seekTo,
+                                                                           Integer limit,
+                                                                           String q,
+                                                                           MessageFilterTypeDTO filterQueryType,
+                                                                           SeekDirectionDTO seekDirection,
+                                                                           String keySerde,
+                                                                           String valueSerde,
+                                                                           ServerWebExchange exchange) {
     var positions = new ConsumerPosition(
         seekType != null ? seekType : SeekTypeDTO.BEGINNING,
         parseSeekTo(topicName, seekTo),
@@ -64,18 +74,11 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(
     return Mono.just(
         ResponseEntity.ok(
             messagesService.loadMessages(
-                getCluster(clusterName), topicName, positions, q, filterQueryType, recordsLimit)
+                getCluster(clusterName), topicName, positions, q, filterQueryType, recordsLimit, keySerde, valueSerde)
         )
     );
   }
 
-  @Override
-  public Mono<ResponseEntity<TopicMessageSchemaDTO>> getTopicSchema(
-      String clusterName, String topicName, ServerWebExchange exchange) {
-    return Mono.just(topicsService.getTopicSchema(getCluster(clusterName), topicName))
-        .map(ResponseEntity::ok);
-  }
-
   @Override
   public Mono<ResponseEntity<Void>> sendTopicMessages(
       String clusterName, String topicName, @Valid Mono<CreateTopicMessageDTO> createTopicMessage,
@@ -109,4 +112,19 @@ private Map<TopicPartition, Long> parseSeekTo(String topic, List<String> seekTo)
         .collect(toMap(Pair::getKey, Pair::getValue));
   }
 
+  @Override
+  public Mono<ResponseEntity<TopicSerdeSuggestionDTO>> getSerdes(String clusterName,
+                                                                 String topicName,
+                                                                 SerdeUsageDTO use,
+                                                                 ServerWebExchange exchange) {
+    return Mono.just(
+        new TopicSerdeSuggestionDTO()
+            .key(use == SerdeUsageDTO.SERIALIZE
+                ? deserializationService.getSerdesForSerialize(getCluster(clusterName), topicName, KEY)
+                : deserializationService.getSerdesForDeserialize(getCluster(clusterName), topicName, KEY))
+            .value(use == SerdeUsageDTO.SERIALIZE
+                ? deserializationService.getSerdesForSerialize(getCluster(clusterName), topicName, VALUE)
+                : deserializationService.getSerdesForDeserialize(getCluster(clusterName), topicName, VALUE))
+    ).map(ResponseEntity::ok);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
index 9889a689107..ddb5dc3666c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
@@ -3,8 +3,7 @@
 import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.model.TopicMessagePhaseDTO;
-import com.provectus.kafka.ui.serde.RecordSerDe;
-import com.provectus.kafka.ui.util.ClusterUtil;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import java.time.Duration;
 import java.time.Instant;
 import org.apache.kafka.clients.consumer.Consumer;
@@ -23,10 +22,10 @@ public abstract class AbstractEmitter {
   // To workaround this we can assume that after N consecutive empty polls all target messages were read.
   public static final int NO_MORE_DATA_EMPTY_POLLS_COUNT = 3;
 
-  private final RecordSerDe recordDeserializer;
+  private final ConsumerRecordDeserializer recordDeserializer;
   private final ConsumingStats consumingStats = new ConsumingStats();
 
-  protected AbstractEmitter(RecordSerDe recordDeserializer) {
+  protected AbstractEmitter(ConsumerRecordDeserializer recordDeserializer) {
     this.recordDeserializer = recordDeserializer;
   }
 
@@ -46,7 +45,7 @@ protected ConsumerRecords<Bytes, Bytes> poll(
 
   protected void sendMessage(FluxSink<TopicMessageEventDTO> sink,
                                                        ConsumerRecord<Bytes, Bytes> msg) {
-    final TopicMessageDTO topicMessage = ClusterUtil.mapToTopicMessage(msg, recordDeserializer);
+    final TopicMessageDTO topicMessage = recordDeserializer.deserialize(msg);
     sink.next(
         new TopicMessageEventDTO()
             .type(TopicMessageEventDTO.TypeEnum.MESSAGE)
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
index b84f4cbf6ff..59db425b333 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.emitter;
 
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.serde.RecordSerDe;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.util.OffsetsSeekBackward;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -35,7 +35,7 @@ public class BackwardRecordEmitter
   public BackwardRecordEmitter(
       Function<Map<String, Object>, KafkaConsumer<Bytes, Bytes>> consumerSupplier,
       OffsetsSeekBackward offsetsSeek,
-      RecordSerDe recordDeserializer) {
+      ConsumerRecordDeserializer recordDeserializer) {
     super(recordDeserializer);
     this.offsetsSeek = offsetsSeek;
     this.consumerSupplier = consumerSupplier;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
index 90561cde944..bc636cab7b2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.emitter;
 
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.serde.RecordSerDe;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.util.OffsetsSeek;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
@@ -22,7 +22,7 @@ public class ForwardRecordEmitter
   public ForwardRecordEmitter(
       Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
       OffsetsSeek offsetsSeek,
-      RecordSerDe recordDeserializer) {
+      ConsumerRecordDeserializer recordDeserializer) {
     super(recordDeserializer);
     this.consumerSupplier = consumerSupplier;
     this.offsetsSeek = offsetsSeek;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
index d033e85e6b9..852c31038f0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.emitter;
 
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.serde.RecordSerDe;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.util.OffsetsSeek;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +17,7 @@ public class TailingEmitter extends AbstractEmitter
   private final Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier;
   private final OffsetsSeek offsetsSeek;
 
-  public TailingEmitter(RecordSerDe recordDeserializer,
+  public TailingEmitter(ConsumerRecordDeserializer recordDeserializer,
                         Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
                         OffsetsSeek offsetsSeek) {
     super(recordDeserializer);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index 5709709e9b4..ac0fc4ea87c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -34,7 +34,6 @@
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityCheck;
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel;
 import com.provectus.kafka.ui.util.JmxClusterUtil;
-import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -51,7 +50,6 @@ public interface ClusterMapper {
 
   ClusterDTO toCluster(InternalClusterState clusterState);
 
-  @Mapping(target = "protobufFile", source = "protobufFile", qualifiedByName = "resolvePath")
   @Mapping(target = "properties", source = "properties", qualifiedByName = "setProperties")
   @Mapping(target = "schemaRegistry", source = ".", qualifiedByName = "setSchemaRegistry")
   @Mapping(target = "ksqldbServer", source = ".", qualifiedByName = "setKsqldbServer")
@@ -160,15 +158,6 @@ default BrokerDiskUsageDTO map(Integer id, InternalBrokerDiskUsage internalBroke
     return brokerDiskUsage;
   }
 
-  @Named("resolvePath")
-  default Path resolvePath(String path) {
-    if (path != null) {
-      return Path.of(path);
-    } else {
-      return null;
-    }
-  }
-
   @Named("setProperties")
   default Properties setProperties(Properties properties) {
     Properties copy = new Properties();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
index df5df2ef1f0..ab5b6eed388 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
@@ -63,26 +63,6 @@ public static InternalConsumerGroup create(
     return builder.build();
   }
 
-  // removes data for all partitions that are not fit filter
-  public InternalConsumerGroup retainDataForPartitions(Predicate<TopicPartition> partitionsFilter) {
-    var offsetsMap = getOffsets().entrySet().stream()
-        .filter(e -> partitionsFilter.test(e.getKey()))
-        .collect(Collectors.toMap(
-            Map.Entry::getKey,
-            Map.Entry::getValue
-        ));
-
-    var nonEmptyMembers = getMembers().stream()
-        .map(m -> filterConsumerMemberTopic(m, partitionsFilter))
-        .filter(m -> !m.getAssignment().isEmpty())
-        .collect(Collectors.toList());
-
-    return toBuilder()
-        .offsets(offsetsMap)
-        .members(nonEmptyMembers)
-        .build();
-  }
-
   private InternalConsumerGroup.InternalMember filterConsumerMemberTopic(
       InternalConsumerGroup.InternalMember member, Predicate<TopicPartition> partitionsFilter) {
     var topicPartitions = member.getAssignment()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
index eab02e789f0..c69a3d3c0d7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
@@ -1,8 +1,6 @@
 package com.provectus.kafka.ui.model;
 
-import java.nio.file.Path;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -23,13 +21,6 @@ public class KafkaCluster {
   private final InternalSchemaRegistry schemaRegistry;
   private final InternalKsqlServer ksqldbServer;
   private final List<KafkaConnectCluster> kafkaConnect;
-  private final String schemaNameTemplate;
-  private final String keySchemaNameTemplate;
-  private final Path protobufFile;
-  private final String protobufMessageName;
-  private final Map<String, String> protobufMessageNameByTopic;
-  private final String protobufMessageNameForKey;
-  private final Map<String, String> protobufMessageNameForKeyByTopic;
   private final Properties properties;
   private final boolean readOnly;
   private final boolean disableLogDirsCollection;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/DeserializationService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/DeserializationService.java
deleted file mode 100644
index b7df25c8e90..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/DeserializationService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.provectus.kafka.ui.serde;
-
-import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.serde.schemaregistry.SchemaRegistryAwareRecordSerDe;
-import com.provectus.kafka.ui.service.ClustersStorage;
-import java.util.Map;
-import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class DeserializationService {
-
-  private final ClustersStorage clustersStorage;
-  private Map<String, RecordSerDe> clusterDeserializers;
-
-  @PostConstruct
-  public void init() {
-    this.clusterDeserializers = clustersStorage.getKafkaClusters().stream()
-        .collect(Collectors.toMap(
-            KafkaCluster::getName,
-            this::createRecordDeserializerForCluster
-        ));
-  }
-
-  private RecordSerDe createRecordDeserializerForCluster(KafkaCluster cluster) {
-    try {
-      if (cluster.getProtobufFile() != null) {
-        log.info("Using ProtobufFileRecordSerDe for cluster '{}'", cluster.getName());
-        return new ProtobufFileRecordSerDe(cluster.getProtobufFile(),
-            cluster.getProtobufMessageNameByTopic(), cluster.getProtobufMessageNameForKeyByTopic(),
-            cluster.getProtobufMessageName(), cluster.getProtobufMessageNameForKey());
-      } else if (cluster.getSchemaRegistry() != null) {
-        log.info("Using SchemaRegistryAwareRecordSerDe for cluster '{}'", cluster.getName());
-        return new SchemaRegistryAwareRecordSerDe(cluster);
-      } else {
-        log.info("Using SimpleRecordSerDe for cluster '{}'", cluster.getName());
-        return new SimpleRecordSerDe();
-      }
-    } catch (Throwable e) {
-      throw new RuntimeException("Can't init deserializer", e);
-    }
-  }
-
-  public RecordSerDe getRecordDeserializerForCluster(KafkaCluster cluster) {
-    return clusterDeserializers.get(cluster.getName());
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/ProtobufFileRecordSerDe.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/ProtobufFileRecordSerDe.java
deleted file mode 100644
index 597461e51bc..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/ProtobufFileRecordSerDe.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.provectus.kafka.ui.serde;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.DynamicMessage;
-import com.google.protobuf.util.JsonFormat;
-import com.provectus.kafka.ui.model.MessageSchemaDTO;
-import com.provectus.kafka.ui.model.TopicMessageSchemaDTO;
-import com.provectus.kafka.ui.serde.schemaregistry.MessageFormat;
-import com.provectus.kafka.ui.serde.schemaregistry.StringMessageFormatter;
-import com.provectus.kafka.ui.util.jsonschema.JsonSchema;
-import com.provectus.kafka.ui.util.jsonschema.ProtobufSchemaConverter;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaUtils;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import javax.annotation.Nullable;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.utils.Bytes;
-
-@Slf4j
-public class ProtobufFileRecordSerDe implements RecordSerDe {
-  private static final StringMessageFormatter FALLBACK_FORMATTER = new StringMessageFormatter();
-
-  private final ProtobufSchema protobufSchema;
-  private final Path protobufSchemaPath;
-  private final ProtobufSchemaConverter schemaConverter = new ProtobufSchemaConverter();
-  private final Map<String, Descriptor> messageDescriptorMap;
-  private final Map<String, Descriptor> keyMessageDescriptorMap;
-  private final Descriptor defaultMessageDescriptor;
-  private final Descriptor defaultKeyMessageDescriptor;
-
-  public ProtobufFileRecordSerDe(Path protobufSchemaPath, Map<String, String> messageNameMap,
-                                 Map<String, String> keyMessageNameMap, String defaultMessageName,
-                                 @Nullable String defaultKeyMessageName)
-      throws IOException {
-    this.protobufSchemaPath = protobufSchemaPath;
-    try (final Stream<String> lines = Files.lines(protobufSchemaPath)) {
-      var schema = new ProtobufSchema(
-          lines.collect(Collectors.joining("\n"))
-      );
-      if (defaultMessageName != null) {
-        this.protobufSchema = schema.copy(defaultMessageName);
-      } else {
-        this.protobufSchema = schema;
-      }
-      this.messageDescriptorMap = new HashMap<>();
-      if (messageNameMap != null) {
-        populateDescriptors(messageNameMap, messageDescriptorMap);
-      }
-      this.keyMessageDescriptorMap = new HashMap<>();
-      if (keyMessageNameMap != null) {
-        populateDescriptors(keyMessageNameMap, keyMessageDescriptorMap);
-      }
-      defaultMessageDescriptor = Objects.requireNonNull(protobufSchema.toDescriptor(),
-          "The given message type is not found in protobuf definition: "
-              + defaultMessageName);
-      if (defaultKeyMessageName != null) {
-        defaultKeyMessageDescriptor = schema.copy(defaultKeyMessageName).toDescriptor();
-      } else {
-        defaultKeyMessageDescriptor = null;
-      }
-    }
-  }
-
-  private void populateDescriptors(Map<String, String> messageNameMap, Map<String, Descriptor> messageDescriptorMap) {
-    for (Map.Entry<String, String> entry : messageNameMap.entrySet()) {
-      var descriptor = Objects.requireNonNull(protobufSchema.toDescriptor(entry.getValue()),
-          "The given message type is not found in protobuf definition: "
-              + entry.getValue());
-      messageDescriptorMap.put(entry.getKey(), descriptor);
-    }
-  }
-
-  @Override
-  public DeserializedKeyValue deserialize(ConsumerRecord<Bytes, Bytes> msg) {
-    var builder = DeserializedKeyValue.builder();
-
-    if (msg.key() != null) {
-      Descriptor descriptor = getKeyDescriptor(msg.topic());
-      if (descriptor == null) {
-        builder.key(FALLBACK_FORMATTER.format(msg.topic(), msg.key().get()));
-        builder.keyFormat(FALLBACK_FORMATTER.getFormat());
-      } else {
-        try {
-          builder.key(parse(msg.key().get(), descriptor));
-          builder.keyFormat(MessageFormat.PROTOBUF);
-        } catch (Throwable e) {
-          log.debug("Failed to deserialize key as protobuf, falling back to string formatter", e);
-          builder.key(FALLBACK_FORMATTER.format(msg.topic(), msg.key().get()));
-          builder.keyFormat(FALLBACK_FORMATTER.getFormat());
-        }
-      }
-    }
-
-    if (msg.value() != null) {
-      try {
-        builder.value(parse(msg.value().get(), getDescriptor(msg.topic())));
-        builder.valueFormat(MessageFormat.PROTOBUF);
-      } catch (Throwable e) {
-        log.debug("Failed to deserialize value as protobuf, falling back to string formatter", e);
-        builder.key(FALLBACK_FORMATTER.format(msg.topic(), msg.value().get()));
-        builder.keyFormat(FALLBACK_FORMATTER.getFormat());
-      }
-    }
-
-    return builder.build();
-  }
-
-  @Nullable
-  private Descriptor getKeyDescriptor(String topic) {
-    return keyMessageDescriptorMap.getOrDefault(topic, defaultKeyMessageDescriptor);
-  }
-
-  private Descriptor getDescriptor(String topic) {
-    return messageDescriptorMap.getOrDefault(topic, defaultMessageDescriptor);
-  }
-
-  @SneakyThrows
-  private String parse(byte[] value, Descriptor descriptor) {
-    DynamicMessage protoMsg = DynamicMessage.parseFrom(
-        descriptor,
-        new ByteArrayInputStream(value)
-    );
-    byte[] jsonFromProto = ProtobufSchemaUtils.toJson(protoMsg);
-    return new String(jsonFromProto);
-  }
-
-  @Override
-  public ProducerRecord<byte[], byte[]> serialize(String topic,
-                                                  @Nullable String key,
-                                                  @Nullable String data,
-                                                  @Nullable Integer partition) {
-    byte[] keyPayload = null;
-    byte[] valuePayload = null;
-
-    if (key != null) {
-      Descriptor keyDescriptor = getKeyDescriptor(topic);
-      if (keyDescriptor == null) {
-        keyPayload = key.getBytes();
-      } else {
-        DynamicMessage.Builder builder = DynamicMessage.newBuilder(keyDescriptor);
-        try {
-          JsonFormat.parser().merge(key, builder);
-          keyPayload = builder.build().toByteArray();
-        } catch (Throwable e) {
-          throw new RuntimeException("Failed to merge record key for topic " + topic, e);
-        }
-      }
-    }
-
-    if (data != null) {
-      DynamicMessage.Builder builder = DynamicMessage.newBuilder(getDescriptor(topic));
-      try {
-        JsonFormat.parser().merge(data, builder);
-        valuePayload = builder.build().toByteArray();
-      } catch (Throwable e) {
-        throw new RuntimeException("Failed to merge record value for topic " + topic, e);
-      }
-    }
-
-    return new ProducerRecord<>(
-        topic,
-        partition,
-        keyPayload,
-        valuePayload);
-  }
-
-  @Override
-  public TopicMessageSchemaDTO getTopicSchema(String topic) {
-    JsonSchema keyJsonSchema;
-
-    Descriptor keyDescriptor = getKeyDescriptor(topic);
-    if (keyDescriptor == null) {
-      keyJsonSchema = JsonSchema.stringSchema();
-    } else {
-      keyJsonSchema = schemaConverter.convert(
-          protobufSchemaPath.toUri(),
-          keyDescriptor);
-    }
-
-    final MessageSchemaDTO keySchema = new MessageSchemaDTO()
-        .name(protobufSchema.fullName())
-        .source(MessageSchemaDTO.SourceEnum.PROTO_FILE)
-        .schema(keyJsonSchema.toJson());
-
-    final JsonSchema valueJsonSchema = schemaConverter.convert(
-        protobufSchemaPath.toUri(),
-        getDescriptor(topic));
-
-    final MessageSchemaDTO valueSchema = new MessageSchemaDTO()
-        .name(protobufSchema.fullName())
-        .source(MessageSchemaDTO.SourceEnum.PROTO_FILE)
-        .schema(valueJsonSchema.toJson());
-
-    return new TopicMessageSchemaDTO()
-        .key(keySchema)
-        .value(valueSchema);
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/RecordSerDe.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/RecordSerDe.java
deleted file mode 100644
index af5a188e3d3..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/RecordSerDe.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.provectus.kafka.ui.serde;
-
-import com.provectus.kafka.ui.model.TopicMessageSchemaDTO;
-import com.provectus.kafka.ui.serde.schemaregistry.MessageFormat;
-import javax.annotation.Nullable;
-import lombok.Builder;
-import lombok.Value;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.utils.Bytes;
-
-public interface RecordSerDe {
-
-  @Value
-  @Builder
-  class DeserializedKeyValue {
-    @Nullable
-    String key;
-    @Nullable
-    String value;
-    @Nullable
-    MessageFormat keyFormat;
-    @Nullable
-    MessageFormat valueFormat;
-    @Nullable
-    String keySchemaId;
-    @Nullable
-    String valueSchemaId;
-  }
-
-  DeserializedKeyValue deserialize(ConsumerRecord<Bytes, Bytes> msg);
-
-  ProducerRecord<byte[], byte[]> serialize(String topic,
-                                           @Nullable String key,
-                                           @Nullable String data,
-                                           @Nullable Integer partition);
-
-  TopicMessageSchemaDTO getTopicSchema(String topic);
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/SimpleRecordSerDe.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/SimpleRecordSerDe.java
deleted file mode 100644
index 0ee06e85688..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/SimpleRecordSerDe.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.provectus.kafka.ui.serde;
-
-import com.provectus.kafka.ui.model.MessageSchemaDTO;
-import com.provectus.kafka.ui.model.TopicMessageSchemaDTO;
-import com.provectus.kafka.ui.serde.schemaregistry.StringMessageFormatter;
-import com.provectus.kafka.ui.util.jsonschema.JsonSchema;
-import javax.annotation.Nullable;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.utils.Bytes;
-
-public class SimpleRecordSerDe implements RecordSerDe {
-
-  private static final StringMessageFormatter FORMATTER = new StringMessageFormatter();
-
-  @Override
-  public DeserializedKeyValue deserialize(ConsumerRecord<Bytes, Bytes> msg) {
-    var builder = DeserializedKeyValue.builder();
-    if (msg.key() != null) {
-      builder.key(FORMATTER.format(msg.topic(), msg.key().get()));
-      builder.keyFormat(FORMATTER.getFormat());
-    }
-    if (msg.value() != null) {
-      builder.value(FORMATTER.format(msg.topic(), msg.value().get()));
-      builder.valueFormat(FORMATTER.getFormat());
-    }
-    return builder.build();
-  }
-
-  @Override
-  public ProducerRecord<byte[], byte[]> serialize(String topic,
-                                                  @Nullable String key,
-                                                  @Nullable String data,
-                                                  @Nullable Integer partition) {
-    return new ProducerRecord<>(
-        topic,
-        partition,
-        key != null ? key.getBytes() : null,
-        data != null ? data.getBytes() : null
-    );
-  }
-
-  @Override
-  public TopicMessageSchemaDTO getTopicSchema(String topic) {
-    final MessageSchemaDTO schema = new MessageSchemaDTO()
-        .name("unknown")
-        .source(MessageSchemaDTO.SourceEnum.UNKNOWN)
-        .schema(JsonSchema.stringSchema().toJson());
-    return new TopicMessageSchemaDTO()
-        .key(schema)
-        .value(schema);
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/AvroMessageFormatter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/AvroMessageFormatter.java
deleted file mode 100644
index e69d522ea03..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/AvroMessageFormatter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
-
-import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.serializers.KafkaAvroDeserializer;
-import lombok.SneakyThrows;
-
-public class AvroMessageFormatter implements MessageFormatter {
-  private final KafkaAvroDeserializer avroDeserializer;
-
-  public AvroMessageFormatter(SchemaRegistryClient client) {
-    this.avroDeserializer = new KafkaAvroDeserializer(client);
-  }
-
-  @Override
-  @SneakyThrows
-  public String format(String topic, byte[] value) {
-    // deserialized will have type, that depends on schema type (record or primitive),
-    // AvroSchemaUtils.toJson(...) method will take it into account
-    Object deserialized = avroDeserializer.deserialize(topic, value);
-    byte[] jsonBytes = AvroSchemaUtils.toJson(deserialized);
-    return new String(jsonBytes);
-  }
-
-  @Override
-  public MessageFormat getFormat() {
-    return MessageFormat.AVRO;
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/JsonSchemaMessageFormatter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/JsonSchemaMessageFormatter.java
deleted file mode 100644
index 5127285e509..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/JsonSchemaMessageFormatter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.serializers.json.KafkaJsonSchemaDeserializer;
-
-public class JsonSchemaMessageFormatter implements MessageFormatter {
-
-  private final KafkaJsonSchemaDeserializer<JsonNode> jsonSchemaDeserializer;
-
-  public JsonSchemaMessageFormatter(SchemaRegistryClient client) {
-    this.jsonSchemaDeserializer = new KafkaJsonSchemaDeserializer<>(client);
-  }
-
-  @Override
-  public String format(String topic, byte[] value) {
-    JsonNode json = jsonSchemaDeserializer.deserialize(topic, value);
-    return json.toString();
-  }
-
-  @Override
-  public MessageFormat getFormat() {
-    return MessageFormat.JSON;
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageFormat.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageFormat.java
deleted file mode 100644
index 9f47350e073..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageFormat.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
-
-import java.util.Optional;
-import org.apache.commons.lang3.EnumUtils;
-
-public enum MessageFormat {
-  AVRO,
-  JSON,
-  PROTOBUF,
-  UNKNOWN;
-
-  public static Optional<MessageFormat> fromString(String typeString) {
-    return Optional.ofNullable(EnumUtils.getEnum(MessageFormat.class, typeString));
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageFormatter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageFormatter.java
deleted file mode 100644
index e7fec895e73..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageFormatter.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
-
-public interface MessageFormatter {
-  String format(String topic, byte[] value);
-
-  default MessageFormat getFormat() {
-    return MessageFormat.UNKNOWN;
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/ProtobufMessageFormatter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/ProtobufMessageFormatter.java
deleted file mode 100644
index adfdaf03113..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/ProtobufMessageFormatter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
-
-import com.google.protobuf.Message;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaUtils;
-import io.confluent.kafka.serializers.protobuf.KafkaProtobufDeserializer;
-import lombok.SneakyThrows;
-
-public class ProtobufMessageFormatter implements MessageFormatter {
-  private final KafkaProtobufDeserializer<?> protobufDeserializer;
-
-  public ProtobufMessageFormatter(SchemaRegistryClient client) {
-    this.protobufDeserializer = new KafkaProtobufDeserializer<>(client);
-  }
-
-  @Override
-  @SneakyThrows
-  public String format(String topic, byte[] value) {
-    final Message message = protobufDeserializer.deserialize(topic, value);
-    byte[] jsonBytes = ProtobufSchemaUtils.toJson(message);
-    return new String(jsonBytes);
-  }
-
-  @Override
-  public MessageFormat getFormat() {
-    return MessageFormat.PROTOBUF;
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDe.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDe.java
deleted file mode 100644
index ad15821607f..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDe.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
-
-
-import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.BASIC_AUTH_CREDENTIALS_SOURCE;
-import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.USER_INFO_CONFIG;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.MessageSchemaDTO;
-import com.provectus.kafka.ui.model.TopicMessageSchemaDTO;
-import com.provectus.kafka.ui.serde.RecordSerDe;
-import com.provectus.kafka.ui.serde.RecordSerDe.DeserializedKeyValue.DeserializedKeyValueBuilder;
-import com.provectus.kafka.ui.util.jsonschema.AvroJsonSchemaConverter;
-import com.provectus.kafka.ui.util.jsonschema.JsonSchema;
-import com.provectus.kafka.ui.util.jsonschema.ProtobufSchemaConverter;
-import io.confluent.kafka.schemaregistry.ParsedSchema;
-import io.confluent.kafka.schemaregistry.SchemaProvider;
-import io.confluent.kafka.schemaregistry.avro.AvroSchema;
-import io.confluent.kafka.schemaregistry.avro.AvroSchemaProvider;
-import io.confluent.kafka.schemaregistry.client.CachedSchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
-import io.confluent.kafka.schemaregistry.json.JsonSchemaProvider;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaProvider;
-import java.net.URI;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.Callable;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.common.utils.Bytes;
-
-@Slf4j
-public class SchemaRegistryAwareRecordSerDe implements RecordSerDe {
-
-  private static final byte SR_RECORD_MAGIC_BYTE = (byte) 0;
-  private static final int SR_RECORD_PREFIX_LENGTH = 5;
-
-  private static final StringMessageFormatter FALLBACK_FORMATTER = new StringMessageFormatter();
-
-  private static final ProtobufSchemaConverter protoSchemaConverter = new ProtobufSchemaConverter();
-  private static final AvroJsonSchemaConverter avroSchemaConverter = new AvroJsonSchemaConverter();
-
-  private final KafkaCluster cluster;
-  private final SchemaRegistryClient schemaRegistryClient;
-
-  private final Map<MessageFormat, MessageFormatter> schemaRegistryFormatters;
-
-  private static SchemaRegistryClient createSchemaRegistryClient(KafkaCluster cluster) {
-    List<SchemaProvider> schemaProviders =
-        List.of(new AvroSchemaProvider(), new ProtobufSchemaProvider(), new JsonSchemaProvider());
-
-    Map<String, String> configs = new HashMap<>();
-    String username = cluster.getSchemaRegistry().getUsername();
-    String password = cluster.getSchemaRegistry().getPassword();
-
-    if (username != null && password != null) {
-      configs.put(BASIC_AUTH_CREDENTIALS_SOURCE, "USER_INFO");
-      configs.put(USER_INFO_CONFIG, username + ":" + password);
-    } else if (username != null) {
-      throw new ValidationException(
-          "You specified username but do not specified password");
-    } else if (password != null) {
-      throw new ValidationException(
-          "You specified password but do not specified username");
-    }
-    return new CachedSchemaRegistryClient(
-        cluster.getSchemaRegistry()
-                .getUrl()
-                .stream()
-                .collect(Collectors.toUnmodifiableList()),
-        1_000,
-        schemaProviders,
-        configs
-    );
-  }
-
-  public SchemaRegistryAwareRecordSerDe(KafkaCluster cluster) {
-    this(cluster, createSchemaRegistryClient(cluster));
-  }
-
-  @VisibleForTesting
-  SchemaRegistryAwareRecordSerDe(KafkaCluster cluster, SchemaRegistryClient schemaRegistryClient) {
-    this.cluster = cluster;
-    this.schemaRegistryClient = schemaRegistryClient;
-    this.schemaRegistryFormatters = Map.of(
-        MessageFormat.AVRO, new AvroMessageFormatter(schemaRegistryClient),
-        MessageFormat.JSON, new JsonSchemaMessageFormatter(schemaRegistryClient),
-        MessageFormat.PROTOBUF, new ProtobufMessageFormatter(schemaRegistryClient)
-    );
-  }
-
-  public DeserializedKeyValue deserialize(ConsumerRecord<Bytes, Bytes> msg) {
-    try {
-      DeserializedKeyValueBuilder builder = DeserializedKeyValue.builder();
-      if (msg.key() != null) {
-        fillDeserializedKvBuilder(msg, true, builder);
-      }
-      if (msg.value() != null) {
-        fillDeserializedKvBuilder(msg, false, builder);
-      }
-      return builder.build();
-    } catch (Throwable e) {
-      throw new RuntimeException("Failed to parse record from topic " + msg.topic(), e);
-    }
-  }
-
-  private void fillDeserializedKvBuilder(ConsumerRecord<Bytes, Bytes> rec,
-                                         boolean isKey,
-                                         DeserializedKeyValueBuilder builder) {
-    Optional<Integer> schemaId = extractSchemaIdFromMsg(rec, isKey);
-    Optional<MessageFormat> format = schemaId.flatMap(this::getMessageFormatBySchemaId);
-    if (schemaId.isPresent() && format.isPresent() && schemaRegistryFormatters.containsKey(format.get())) {
-      var formatter = schemaRegistryFormatters.get(format.get());
-      try {
-        var deserialized = formatter.format(rec.topic(), isKey ? rec.key().get() : rec.value().get());
-        if (isKey) {
-          builder.key(deserialized);
-          builder.keyFormat(formatter.getFormat());
-          builder.keySchemaId(String.valueOf(schemaId.get()));
-        } else {
-          builder.value(deserialized);
-          builder.valueFormat(formatter.getFormat());
-          builder.valueSchemaId(String.valueOf(schemaId.get()));
-        }
-        return;
-      } catch (Exception e) {
-        log.trace("Can't deserialize record {} with formatter {}",
-            rec, formatter.getClass().getSimpleName(), e);
-      }
-    }
-
-    // fallback
-    if (isKey) {
-      builder.key(FALLBACK_FORMATTER.format(rec.topic(), rec.key().get()));
-      builder.keyFormat(FALLBACK_FORMATTER.getFormat());
-    } else {
-      builder.value(FALLBACK_FORMATTER.format(rec.topic(), rec.value().get()));
-      builder.valueFormat(FALLBACK_FORMATTER.getFormat());
-    }
-
-  }
-
-  @Override
-  public ProducerRecord<byte[], byte[]> serialize(String topic,
-                                                  @Nullable String key,
-                                                  @Nullable String data,
-                                                  @Nullable Integer partition) {
-    final Optional<SchemaMetadata> maybeKeySchema = getSchemaBySubject(topic, true);
-    final Optional<SchemaMetadata> maybeValueSchema = getSchemaBySubject(topic, false);
-
-    final byte[] serializedKey = maybeKeySchema.isPresent()
-        ? serialize(maybeKeySchema.get(), topic, key, true)
-        : serialize(key);
-
-    final byte[] serializedValue = maybeValueSchema.isPresent()
-        ? serialize(maybeValueSchema.get(), topic, data, false)
-        : serialize(data);
-
-    return new ProducerRecord<>(topic, partition, serializedKey, serializedValue);
-  }
-
-  @SneakyThrows
-  private byte[] serialize(SchemaMetadata schema, String topic, String value, boolean isKey) {
-    if (value == null) {
-      return null;
-    }
-    MessageReader<?> reader;
-    if (schema.getSchemaType().equals(MessageFormat.PROTOBUF.name())) {
-      reader = new ProtobufMessageReader(topic, isKey, schemaRegistryClient, schema);
-    } else if (schema.getSchemaType().equals(MessageFormat.AVRO.name())) {
-      reader = new AvroMessageReader(topic, isKey, schemaRegistryClient, schema);
-    } else if (schema.getSchemaType().equals(MessageFormat.JSON.name())) {
-      reader = new JsonSchemaMessageReader(topic, isKey, schemaRegistryClient, schema);
-    } else {
-      throw new IllegalStateException("Unsupported schema type: " + schema.getSchemaType());
-    }
-
-    return reader.read(value);
-  }
-
-  private byte[] serialize(String value) {
-    if (value == null) {
-      return null;
-    }
-    // if no schema provided serialize input as raw string
-    return value.getBytes();
-  }
-
-  @Override
-  public TopicMessageSchemaDTO getTopicSchema(String topic) {
-    final Optional<SchemaMetadata> maybeValueSchema = getSchemaBySubject(topic, false);
-    final Optional<SchemaMetadata> maybeKeySchema = getSchemaBySubject(topic, true);
-
-    String sourceValueSchema = maybeValueSchema.map(this::convertSchema)
-        .orElseGet(() -> JsonSchema.stringSchema().toJson());
-
-    String sourceKeySchema = maybeKeySchema.map(this::convertSchema)
-        .orElseGet(() -> JsonSchema.stringSchema().toJson());
-
-    final MessageSchemaDTO keySchema = new MessageSchemaDTO()
-        .name(maybeKeySchema.map(
-            s -> schemaSubject(topic, true)
-        ).orElse("unknown"))
-        .source(MessageSchemaDTO.SourceEnum.SCHEMA_REGISTRY)
-        .schema(sourceKeySchema);
-
-    final MessageSchemaDTO valueSchema = new MessageSchemaDTO()
-        .name(maybeValueSchema.map(
-            s -> schemaSubject(topic, false)
-        ).orElse("unknown"))
-        .source(MessageSchemaDTO.SourceEnum.SCHEMA_REGISTRY)
-        .schema(sourceValueSchema);
-
-    return new TopicMessageSchemaDTO()
-        .key(keySchema)
-        .value(valueSchema);
-  }
-
-  @SneakyThrows
-  private String convertSchema(SchemaMetadata schema) {
-
-    String jsonSchema;
-    URI basePath = new URI(cluster.getSchemaRegistry().getPrimaryNodeUri())
-        .resolve(Integer.toString(schema.getId()));
-    final ParsedSchema schemaById = schemaRegistryClient.getSchemaById(schema.getId());
-
-    if (schema.getSchemaType().equals(MessageFormat.PROTOBUF.name())) {
-      final ProtobufSchema protobufSchema = (ProtobufSchema) schemaById;
-      jsonSchema = protoSchemaConverter
-          .convert(basePath, protobufSchema.toDescriptor())
-          .toJson();
-    } else if (schema.getSchemaType().equals(MessageFormat.AVRO.name())) {
-      final AvroSchema avroSchema = (AvroSchema) schemaById;
-      jsonSchema = avroSchemaConverter
-          .convert(basePath, avroSchema.rawSchema())
-          .toJson();
-    } else if (schema.getSchemaType().equals(MessageFormat.JSON.name())) {
-      jsonSchema = schema.getSchema();
-    } else {
-      jsonSchema = JsonSchema.stringSchema().toJson();
-    }
-
-    return jsonSchema;
-  }
-
-  private Optional<MessageFormat> getMessageFormatBySchemaId(int schemaId) {
-    return wrapClientCall(() -> schemaRegistryClient.getSchemaById(schemaId))
-        .map(ParsedSchema::schemaType)
-        .flatMap(MessageFormat::fromString);
-  }
-
-  private Optional<Integer> extractSchemaIdFromMsg(ConsumerRecord<Bytes, Bytes> msg, boolean isKey) {
-    Bytes bytes = isKey ? msg.key() : msg.value();
-    ByteBuffer buffer = ByteBuffer.wrap(bytes.get());
-    if (buffer.remaining() > SR_RECORD_PREFIX_LENGTH && buffer.get() == SR_RECORD_MAGIC_BYTE) {
-      int id = buffer.getInt();
-      return Optional.of(id);
-    }
-    return Optional.empty();
-  }
-
-  @SneakyThrows
-  private Optional<SchemaMetadata> getSchemaBySubject(String topic, boolean isKey) {
-    return wrapClientCall(() ->
-        schemaRegistryClient.getLatestSchemaMetadata(schemaSubject(topic, isKey)));
-  }
-
-  @SneakyThrows
-  private <T> Optional<T> wrapClientCall(Callable<T> call) {
-    try {
-      return Optional.ofNullable(call.call());
-    } catch (RestClientException restClientException) {
-      if (restClientException.getStatus() == 404) {
-        return Optional.empty();
-      } else {
-        throw new RuntimeException("Error calling SchemaRegistryClient", restClientException);
-      }
-    }
-  }
-
-  private String schemaSubject(String topic, boolean isKey) {
-    return String.format(
-        isKey ? cluster.getKeySchemaNameTemplate()
-            : cluster.getSchemaNameTemplate(), topic
-    );
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/StringMessageFormatter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/StringMessageFormatter.java
deleted file mode 100644
index 00770586904..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/StringMessageFormatter.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
-
-import java.nio.charset.StandardCharsets;
-
-public class StringMessageFormatter implements MessageFormatter {
-
-  @Override
-  public String format(String topic, byte[] value) {
-    return new String(value, StandardCharsets.UTF_8);
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/BuiltInSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/BuiltInSerde.java
new file mode 100644
index 00000000000..be896dca501
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/BuiltInSerde.java
@@ -0,0 +1,12 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.Serde;
+
+public interface BuiltInSerde extends Serde {
+
+  default boolean initOnStartup(PropertyResolver kafkaClusterProperties,
+                                PropertyResolver globalProperties) {
+    return true;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClassloaderUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClassloaderUtil.java
new file mode 100644
index 00000000000..f7c423189e7
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClassloaderUtil.java
@@ -0,0 +1,12 @@
+package com.provectus.kafka.ui.serdes;
+
+class ClassloaderUtil {
+
+  static ClassLoader compareAndSwapLoaders(ClassLoader loader) {
+    ClassLoader current = Thread.currentThread().getContextClassLoader();
+    if (!current.equals(loader)) {
+      Thread.currentThread().setContextClassLoader(loader);
+    }
+    return current;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java
new file mode 100644
index 00000000000..a64fa31167a
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java
@@ -0,0 +1,218 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.google.common.base.Preconditions;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.builtin.Base64Serde;
+import com.provectus.kafka.ui.serdes.builtin.Int32Serde;
+import com.provectus.kafka.ui.serdes.builtin.Int64Serde;
+import com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde;
+import com.provectus.kafka.ui.serdes.builtin.StringSerde;
+import com.provectus.kafka.ui.serdes.builtin.UInt32Serde;
+import com.provectus.kafka.ui.serdes.builtin.UInt64Serde;
+import com.provectus.kafka.ui.serdes.builtin.UuidBinarySerde;
+import com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.env.Environment;
+
+@Slf4j
+public class ClusterSerdes {
+
+  private static final CustomSerdeLoader CUSTOM_SERDE_LOADER = new CustomSerdeLoader();
+
+  private static final Map<String, Class<? extends BuiltInSerde>> BUILT_IN_SERDES =
+      Map.of(
+          StringSerde.name(), StringSerde.class,
+          Int32Serde.name(), Int32Serde.class,
+          Int64Serde.name(), Int64Serde.class,
+          UInt32Serde.name(), UInt32Serde.class,
+          UInt64Serde.name(), UInt64Serde.class,
+          UuidBinarySerde.name(), UuidBinarySerde.class,
+          Base64Serde.name(), Base64Serde.class,
+          SchemaRegistrySerde.name(), SchemaRegistrySerde.class,
+          ProtobufFileSerde.name(), ProtobufFileSerde.class
+      );
+
+  // using linked map to keep order of serdes added to it
+  private final Map<String, SerdeInstance> serdes = new LinkedHashMap<>();
+
+  @Nullable
+  private final SerdeInstance defaultKeySerde;
+
+  @Nullable
+  private final SerdeInstance defaultValueSerde;
+
+  private final SerdeInstance fallbackSerde;
+
+  public ClusterSerdes(Environment env,
+                       ClustersProperties clustersProperties,
+                       int clusterIndex) {
+    var globalPropertiesResolver = new PropertyResolverImpl(env);
+    var clusterPropertiesResolver = new PropertyResolverImpl(env, "kafka.clusters." + clusterIndex);
+
+    // initializing serdes from config
+    ClustersProperties.Cluster clusterProp = clustersProperties.getClusters().get(clusterIndex);
+    for (int i = 0; i < clusterProp.getSerde().size(); i++) {
+      var sendeConf = clusterProp.getSerde().get(i);
+      if (serdes.containsKey(sendeConf.getName())) {
+        throw new ValidationException("Multiple serdes with same name: " + sendeConf.getName());
+      }
+      var instance = initSerdeFromConfig(
+          sendeConf,
+          new PropertyResolverImpl(env, "kafka.clusters." + clusterIndex + ".serde." + i + ".properties"),
+          clusterPropertiesResolver,
+          globalPropertiesResolver
+      );
+      serdes.put(sendeConf.getName(), instance);
+    }
+
+    // initializing built-in serdes if they haven't been already initialized
+    BUILT_IN_SERDES.forEach((name, clazz) -> {
+      if (!serdes.containsKey(name)) { // serde can be already initialized with custom config
+        var serde = createSerdeInstance(clazz);
+        if (serde.initOnStartup(clusterPropertiesResolver, globalPropertiesResolver)) {
+          serde.configure(
+              PropertyResolverImpl.empty(),
+              clusterPropertiesResolver,
+              globalPropertiesResolver
+          );
+          serdes.put(name, new SerdeInstance(name, serde, null, null, null));
+        }
+      }
+    });
+
+    defaultKeySerde = Optional.ofNullable(clusterProp.getDefaultKeySerde())
+        .map(name -> Preconditions.checkNotNull(serdes.get(name), "Default key serde not found"))
+        .or(() -> Optional.ofNullable(serdes.get(SchemaRegistrySerde.name())))
+        .or(() -> Optional.ofNullable(serdes.get(ProtobufFileSerde.name())))
+        .orElse(null);
+
+    defaultValueSerde = Optional.ofNullable(clusterProp.getDefaultValueSerde())
+        .map(name -> Preconditions.checkNotNull(serdes.get(name), "Default value serde not found"))
+        .or(() -> Optional.ofNullable(serdes.get(SchemaRegistrySerde.name())))
+        .or(() -> Optional.ofNullable(serdes.get(ProtobufFileSerde.name())))
+        .orElse(null);
+
+    fallbackSerde = createFallbackSerde();
+  }
+
+  private SerdeInstance createFallbackSerde() {
+    StringSerde serde = new StringSerde();
+    serde.configure(PropertyResolverImpl.empty(), PropertyResolverImpl.empty(), PropertyResolverImpl.empty());
+    return new SerdeInstance("Fallback", serde, null, null, null);
+  }
+
+  @SneakyThrows
+  private SerdeInstance initSerdeFromConfig(ClustersProperties.SerdeConfig serdeConfig,
+                                            PropertyResolver serdeProps,
+                                            PropertyResolver clusterProps,
+                                            PropertyResolver globalProps) {
+    String name = serdeConfig.getName();
+    // configuring one of prebuilt serdes with custom params
+    if (BUILT_IN_SERDES.containsKey(name)) {
+      if (serdeConfig.getClassName() != null) {
+        throw new ValidationException("className can't be set for built-in serde");
+      }
+      if (serdeConfig.getFilePath() != null) {
+        throw new ValidationException("filePath can't be set for built-in serde");
+      }
+      var clazz = BUILT_IN_SERDES.get(name);
+      Serde serde = createSerdeInstance(clazz);
+      serde.configure(serdeProps, clusterProps, globalProps);
+      return new SerdeInstance(
+          name,
+          serde,
+          nullablePattern(serdeConfig.getTopicKeysPattern()),
+          nullablePattern(serdeConfig.getTopicValuesPattern()),
+          null
+      );
+    }
+    log.info("Loading custom serde {}", serdeConfig.getName());
+    return loadCustom(serdeConfig, serdeProps, clusterProps, globalProps);
+  }
+
+  @SneakyThrows
+  private <T extends Serde> T createSerdeInstance(Class<T> clazz) {
+    return clazz.getDeclaredConstructor().newInstance();
+  }
+
+  public SerdeInstance getFallbackSerde() {
+    return fallbackSerde;
+  }
+
+  private SerdeInstance loadCustom(ClustersProperties.SerdeConfig serdeConfig,
+                                   PropertyResolver serdeProps,
+                                   PropertyResolver clusterProps,
+                                   PropertyResolver globalProps) {
+    var loaded = CUSTOM_SERDE_LOADER.loadAndConfigure(
+        serdeConfig.getClassName(), serdeConfig.getFilePath(), serdeProps, clusterProps, globalProps);
+    return new SerdeInstance(
+        serdeConfig.getName(),
+        loaded.getSerde(),
+        nullablePattern(serdeConfig.getTopicKeysPattern()),
+        nullablePattern(serdeConfig.getTopicValuesPattern()),
+        loaded.getClassLoader()
+    );
+  }
+
+  @Nullable
+  private Pattern nullablePattern(@Nullable String pattern) {
+    return pattern == null ? null : Pattern.compile(pattern);
+  }
+
+  private Optional<SerdeInstance> findSerdeByPatternsOrDefault(String topic,
+                                                               Serde.Target type,
+                                                               Predicate<SerdeInstance> additionalCheck) {
+    // iterating over serdes in the same order they were added in config
+    for (SerdeInstance serdeInstance : serdes.values()) {
+      var pattern = type == Serde.Target.KEY
+          ? serdeInstance.topicKeyPattern
+          : serdeInstance.topicValuePattern;
+      if (pattern != null
+          && pattern.matcher(topic).matches()
+          && additionalCheck.test(serdeInstance)) {
+        return Optional.of(serdeInstance);
+      }
+    }
+    if (type == Serde.Target.KEY
+        && defaultKeySerde != null
+        && additionalCheck.test(defaultKeySerde)) {
+      return Optional.of(defaultKeySerde);
+    }
+    if (type == Serde.Target.VALUE
+        && defaultValueSerde != null
+        && additionalCheck.test(defaultValueSerde)) {
+      return Optional.of(defaultValueSerde);
+    }
+    return Optional.empty();
+  }
+
+  public Optional<SerdeInstance> serdeForName(String name) {
+    return Optional.ofNullable(serdes.get(name));
+  }
+
+  public Stream<SerdeInstance> all() {
+    return serdes.values().stream();
+  }
+
+  public SerdeInstance suggestSerdeForSerialize(String topic, Serde.Target type) {
+    return findSerdeByPatternsOrDefault(topic, type, s -> s.canSerialize(topic, type))
+        .orElse(serdes.get(StringSerde.name()));
+  }
+
+  public SerdeInstance suggestSerdeForDeserialize(String topic, Serde.Target type) {
+    return findSerdeByPatternsOrDefault(topic, type, s -> s.canDeserialize(topic, type))
+        .orElse(serdes.get(StringSerde.name()));
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java
new file mode 100644
index 00000000000..8c7a3024edf
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java
@@ -0,0 +1,139 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.provectus.kafka.ui.model.TopicMessageDTO;
+import com.provectus.kafka.ui.serde.api.Serde;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.header.Headers;
+import org.apache.kafka.common.record.TimestampType;
+import org.apache.kafka.common.utils.Bytes;
+
+@Slf4j
+@RequiredArgsConstructor
+public class ConsumerRecordDeserializer {
+
+  private static final ZoneId UTC_ZONE_ID = ZoneId.of("UTC");
+
+  private final String keySerdeName;
+  private final Serde.Deserializer keyDeserializer;
+
+  private final String valueSerdeName;
+  private final Serde.Deserializer valueDeserializer;
+
+  private final String fallbackSerdeName;
+  private final Serde.Deserializer fallbackKeyDeserializer;
+  private final Serde.Deserializer fallbackValueDeserializer;
+
+  public TopicMessageDTO deserialize(ConsumerRecord<Bytes, Bytes> rec) {
+    var message = new TopicMessageDTO();
+    fillKey(message, rec);
+    fillValue(message, rec);
+    fillHeaders(message, rec);
+
+    message.setPartition(rec.partition());
+    message.setOffset(rec.offset());
+    message.setTimestampType(mapToTimestampType(rec.timestampType()));
+    message.setTimestamp(OffsetDateTime.ofInstant(Instant.ofEpochMilli(rec.timestamp()), UTC_ZONE_ID));
+
+    message.setKeySize(getKeySize(rec));
+    message.setValueSize(getValueSize(rec));
+    message.setHeadersSize(getHeadersSize(rec));
+
+    return message;
+  }
+
+  private static TopicMessageDTO.TimestampTypeEnum mapToTimestampType(TimestampType timestampType) {
+    switch (timestampType) {
+      case CREATE_TIME:
+        return TopicMessageDTO.TimestampTypeEnum.CREATE_TIME;
+      case LOG_APPEND_TIME:
+        return TopicMessageDTO.TimestampTypeEnum.LOG_APPEND_TIME;
+      case NO_TIMESTAMP_TYPE:
+        return TopicMessageDTO.TimestampTypeEnum.NO_TIMESTAMP_TYPE;
+      default:
+        throw new IllegalArgumentException("Unknown timestampType: " + timestampType);
+    }
+  }
+
+  private void fillHeaders(TopicMessageDTO message, ConsumerRecord<Bytes, Bytes> rec) {
+    Map<String, String> headers = new HashMap<>();
+    rec.headers().iterator()
+        .forEachRemaining(header ->
+            headers.put(
+                header.key(),
+                header.value() != null ? new String(header.value()) : null
+            ));
+    message.setHeaders(headers);
+  }
+
+  private void fillKey(TopicMessageDTO message, ConsumerRecord<Bytes, Bytes> rec) {
+    if (rec.key() == null) {
+      return;
+    }
+    try {
+      var deserResult = keyDeserializer.deserialize(new RecordHeadersImpl(), rec.key().get());
+      message.setKey(deserResult.getResult());
+      message.setKeySerde(keySerdeName);
+      message.setKeyDeserializeProperties(deserResult.getAdditionalProperties());
+    } catch (Exception e) {
+      log.trace("Error deserializing key for key topic: {}, partition {}, offset {}, with serde {}",
+          rec.topic(), rec.partition(), rec.offset(), keySerdeName, e);
+      var deserResult = fallbackKeyDeserializer.deserialize(new RecordHeadersImpl(), rec.key().get());
+      message.setKey(deserResult.getResult());
+      message.setKeySerde(fallbackSerdeName);
+    }
+  }
+
+  private void fillValue(TopicMessageDTO message, ConsumerRecord<Bytes, Bytes> rec) {
+    if (rec.value() == null) {
+      return;
+    }
+    try {
+      var deserResult = valueDeserializer.deserialize(
+          new RecordHeadersImpl(rec.headers()), rec.value().get());
+      message.setContent(deserResult.getResult());
+      message.setValueSerde(valueSerdeName);
+      message.setValueDeserializeProperties(deserResult.getAdditionalProperties());
+    } catch (Exception e) {
+      log.trace("Error deserializing key for value topic: {}, partition {}, offset {}, with serde {}",
+          rec.topic(), rec.partition(), rec.offset(), valueSerdeName, e);
+      var deserResult = fallbackValueDeserializer.deserialize(
+          new RecordHeadersImpl(rec.headers()), rec.value().get());
+      message.setContent(deserResult.getResult());
+      message.setValueSerde(fallbackSerdeName);
+    }
+  }
+
+  private static Long getHeadersSize(ConsumerRecord<Bytes, Bytes> consumerRecord) {
+    Headers headers = consumerRecord.headers();
+    if (headers != null) {
+      return Arrays.stream(headers.toArray())
+          .mapToLong(ConsumerRecordDeserializer::headerSize)
+          .sum();
+    }
+    return 0L;
+  }
+
+  private static Long getKeySize(ConsumerRecord<Bytes, Bytes> consumerRecord) {
+    return consumerRecord.key() != null ? (long) consumerRecord.key().get().length : null;
+  }
+
+  private static Long getValueSize(ConsumerRecord<Bytes, Bytes> consumerRecord) {
+    return consumerRecord.value() != null ? (long) consumerRecord.value().get().length : null;
+  }
+
+  private static int headerSize(Header header) {
+    int key = header.key() != null ? header.key().getBytes().length : 0;
+    int val = header.value() != null ? header.value().length : 0;
+    return key + val;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/CustomSerdeLoader.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/CustomSerdeLoader.java
new file mode 100644
index 00000000000..e14e7b9756d
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/CustomSerdeLoader.java
@@ -0,0 +1,173 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.Serde;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+import lombok.SneakyThrows;
+import lombok.Value;
+
+
+class CustomSerdeLoader {
+
+  @Value
+  static class CustomSerde {
+    Serde serde;
+    ClassLoader classLoader;
+  }
+
+  // serde location -> classloader
+  private final Map<Path, ClassLoader> classloaders = new ConcurrentHashMap<>();
+
+  @SneakyThrows
+  CustomSerde loadAndConfigure(String className,
+                               String filePath,
+                               PropertyResolver serdeProps,
+                               PropertyResolver clusterProps,
+                               PropertyResolver globalProps) {
+    Path locationPath = Path.of(filePath);
+    var serdeClassloader = createClassloader(locationPath);
+    var origCL = ClassloaderUtil.compareAndSwapLoaders(serdeClassloader);
+    try {
+      var serdeClass = serdeClassloader.loadClass(className);
+      var serde = (Serde) serdeClass.getDeclaredConstructor().newInstance();
+      serde.configure(serdeProps, clusterProps, globalProps);
+      return new CustomSerde(serde, serdeClassloader);
+    } finally {
+      ClassloaderUtil.compareAndSwapLoaders(origCL);
+    }
+  }
+
+  private static boolean isArchive(Path path) {
+    String archivePath = path.toString().toLowerCase();
+    return Files.isReadable(path)
+        && Files.isRegularFile(path)
+        && (archivePath.endsWith(".jar") || archivePath.endsWith(".zip"));
+  }
+
+  @SneakyThrows
+  private static List<URL> findArchiveFiles(Path location) {
+    if (isArchive(location)) {
+      return List.of(location.toUri().toURL());
+    }
+    if (Files.isDirectory(location)) {
+      List<URL> archiveFiles = new ArrayList<>();
+      try (var files = Files.walk(location)) {
+        var paths = files.filter(CustomSerdeLoader::isArchive).collect(Collectors.toList());
+        for (Path path : paths) {
+          archiveFiles.add(path.toUri().toURL());
+        }
+      }
+      return archiveFiles;
+    }
+    return List.of();
+  }
+
+  private ClassLoader createClassloader(Path location) {
+    if (!Files.exists(location)) {
+      throw new IllegalStateException("Location does not exist");
+    }
+    var archives = findArchiveFiles(location);
+    if (archives.isEmpty()) {
+      throw new IllegalStateException("No archive files were found");
+    }
+    // we assume that location's content does not change during serdes creation
+    // so, we can reuse already created classloaders
+    return classloaders.computeIfAbsent(location, l ->
+        AccessController.doPrivileged(
+            (PrivilegedAction<URLClassLoader>) () ->
+                new ChildFirstClassloader(
+                    archives.toArray(URL[]::new),
+                    CustomSerdeLoader.class.getClassLoader())));
+  }
+
+  //---------------------------------------------------------------------------------
+
+  // This Classloader first tries to load classes by itself. If class not fount
+  // search is propagated to parent (this is opposite to how usual classloaders work)
+  private static class ChildFirstClassloader extends URLClassLoader {
+
+    private static final String JAVA_PACKAGE_PREFIX = "java.";
+
+    ChildFirstClassloader(URL[] urls, ClassLoader parent) {
+      super(urls, parent);
+    }
+
+    @Override
+    protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+      // first check whether it's a system class, delegate to the system loader
+      if (name.startsWith(JAVA_PACKAGE_PREFIX)) {
+        return findSystemClass(name);
+      }
+      Class<?> loadedClass = findLoadedClass(name);
+      if (loadedClass == null) {
+        try {
+          // start searching from current classloader
+          loadedClass = findClass(name);
+        } catch (ClassNotFoundException e) {
+          // if not found - going to parent
+          loadedClass = super.loadClass(name, resolve);
+        }
+      }
+      if (resolve) {
+        resolveClass(loadedClass);
+      }
+      return loadedClass;
+    }
+
+    @Override
+    public Enumeration<URL> getResources(String name) throws IOException {
+      List<URL> allRes = new LinkedList<>();
+      Enumeration<URL> thisRes = findResources(name);
+      if (thisRes != null) {
+        while (thisRes.hasMoreElements()) {
+          allRes.add(thisRes.nextElement());
+        }
+      }
+      // then try finding resources from parent classloaders
+      Enumeration<URL> parentRes = super.findResources(name);
+      if (parentRes != null) {
+        while (parentRes.hasMoreElements()) {
+          allRes.add(parentRes.nextElement());
+        }
+      }
+      return new Enumeration<>() {
+        final Iterator<URL> it = allRes.iterator();
+
+        @Override
+        public boolean hasMoreElements() {
+          return it.hasNext();
+        }
+
+        @Override
+        public URL nextElement() {
+          return it.next();
+        }
+      };
+    }
+
+    @Override
+    public URL getResource(String name) {
+      URL res = findResource(name);
+      if (res == null) {
+        res = super.getResource(name);
+      }
+      return res;
+    }
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ProducerRecordCreator.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ProducerRecordCreator.java
new file mode 100644
index 00000000000..85dce9cb76e
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ProducerRecordCreator.java
@@ -0,0 +1,41 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.provectus.kafka.ui.serde.api.Serde;
+import java.util.Map;
+import javax.annotation.Nullable;
+import lombok.RequiredArgsConstructor;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.header.internals.RecordHeader;
+import org.apache.kafka.common.header.internals.RecordHeaders;
+
+@RequiredArgsConstructor
+public class ProducerRecordCreator {
+
+  private final Serde.Serializer keySerializer;
+  private final Serde.Serializer valuesSerializer;
+
+  public ProducerRecord<byte[], byte[]> create(String topic,
+                                               @Nullable Integer partition,
+                                               @Nullable String key,
+                                               @Nullable String value,
+                                               @Nullable Map<String, String> headers) {
+    return new ProducerRecord<>(
+        topic,
+        partition,
+        key == null ? null : keySerializer.serialize(key),
+        value == null ? null : valuesSerializer.serialize(value),
+        createHeaders(headers)
+    );
+  }
+
+  private Iterable<Header> createHeaders(@Nullable Map<String, String> clientHeaders) {
+    if (clientHeaders == null) {
+      return new RecordHeaders();
+    }
+    RecordHeaders headers = new RecordHeaders();
+    clientHeaders.forEach((k, v) -> headers.add(new RecordHeader(k, v.getBytes())));
+    return headers;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/PropertyResolverImpl.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/PropertyResolverImpl.java
new file mode 100644
index 00000000000..4bf88cbac95
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/PropertyResolverImpl.java
@@ -0,0 +1,64 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.google.common.base.Preconditions;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import org.springframework.boot.context.properties.bind.Bindable;
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.StandardEnvironment;
+
+
+public class PropertyResolverImpl implements PropertyResolver {
+
+  private final Binder binder;
+
+  @Nullable
+  private final String prefix;
+
+  public static PropertyResolverImpl empty() {
+    return new PropertyResolverImpl(new StandardEnvironment(), null);
+  }
+
+  public PropertyResolverImpl(Environment env) {
+    this(env, null);
+  }
+
+  public PropertyResolverImpl(Environment env, @Nullable String prefix) {
+    this.binder = Binder.get(env);
+    this.prefix = prefix;
+  }
+
+  private ConfigurationPropertyName targetPropertyName(String key) {
+    Preconditions.checkNotNull(key);
+    Preconditions.checkState(!key.isBlank());
+    String propertyName = prefix == null ? key : prefix + "." + key;
+    return ConfigurationPropertyName.adapt(propertyName, '.');
+  }
+
+  @Override
+  public <T> Optional<T> getProperty(String key, Class<T> targetType) {
+    var targetKey = targetPropertyName(key);
+    var result = binder.bind(targetKey, Bindable.of(targetType));
+    return result.isBound() ? Optional.of(result.get()) : Optional.empty();
+  }
+
+  @Override
+  public <T> Optional<List<T>> getListProperty(String key, Class<T> itemType) {
+    var targetKey = targetPropertyName(key);
+    var listResult = binder.bind(targetKey, Bindable.listOf(itemType));
+    return listResult.isBound() ? Optional.of(listResult.get()) : Optional.empty();
+  }
+
+  @Override
+  public <K, V> Optional<Map<K, V>> getMapProperty(String key, Class<K> keyType, Class<V> valueType) {
+    var targetKey = targetPropertyName(key);
+    var mapResult = binder.bind(targetKey, Bindable.mapOf(keyType, valueType));
+    return mapResult.isBound() ? Optional.of(mapResult.get()) : Optional.empty();
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/RecordHeaderImpl.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/RecordHeaderImpl.java
new file mode 100644
index 00000000000..87cdcb0350b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/RecordHeaderImpl.java
@@ -0,0 +1,23 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.provectus.kafka.ui.serde.api.RecordHeader;
+import org.apache.kafka.common.header.Header;
+
+public class RecordHeaderImpl implements RecordHeader  {
+
+  private final Header header;
+
+  public RecordHeaderImpl(Header header) {
+    this.header = header;
+  }
+
+  @Override
+  public String key() {
+    return header.key();
+  }
+
+  @Override
+  public byte[] value() {
+    return header.value();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/RecordHeadersImpl.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/RecordHeadersImpl.java
new file mode 100644
index 00000000000..6ae81a7614c
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/RecordHeadersImpl.java
@@ -0,0 +1,26 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.google.common.collect.Iterators;
+import com.provectus.kafka.ui.serde.api.RecordHeader;
+import com.provectus.kafka.ui.serde.api.RecordHeaders;
+import java.util.Iterator;
+import org.apache.kafka.common.header.Headers;
+
+
+public class RecordHeadersImpl implements RecordHeaders {
+
+  private final Headers headers;
+
+  public RecordHeadersImpl() {
+    this(new org.apache.kafka.common.header.internals.RecordHeaders());
+  }
+
+  public RecordHeadersImpl(Headers headers) {
+    this.headers = headers;
+  }
+
+  @Override
+  public Iterator<RecordHeader> iterator() {
+    return Iterators.transform(headers.iterator(), RecordHeaderImpl::new);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
new file mode 100644
index 00000000000..0cec2c71834
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
@@ -0,0 +1,71 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serde.api.Serde;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+
+@RequiredArgsConstructor
+public class SerdeInstance {
+
+  @Getter
+  private final String name;
+
+  private final Serde serde;
+
+  @Nullable
+  final Pattern topicKeyPattern;
+
+  @Nullable
+  final Pattern topicValuePattern;
+
+  @Nullable // will be set for custom serdes
+  private final ClassLoader classLoader;
+
+  private <T> T wrapWithClassloader(Supplier<T> call) {
+    if (classLoader == null) {
+      return call.get();
+    }
+    var origCl = ClassloaderUtil.compareAndSwapLoaders(classLoader);
+    try {
+      return call.get();
+    } finally {
+      ClassloaderUtil.compareAndSwapLoaders(origCl);
+    }
+  }
+
+  public Optional<SchemaDescription> getSchema(String topic, Serde.Target type) {
+    return wrapWithClassloader(() -> serde.getSchema(topic, type));
+  }
+
+  public Optional<String> description() {
+    return wrapWithClassloader(serde::getDescription);
+  }
+
+  public boolean canSerialize(String topic, Serde.Target type) {
+    return wrapWithClassloader(() -> serde.canSerialize(topic, type));
+  }
+
+  public boolean canDeserialize(String topic, Serde.Target type) {
+    return wrapWithClassloader(() -> serde.canDeserialize(topic, type));
+  }
+
+  public Serde.Serializer serializer(String topic, Serde.Target type) {
+    return wrapWithClassloader(() -> {
+      var serializer = serde.serializer(topic, type);
+      return input -> wrapWithClassloader(() -> serializer.serialize(input));
+    });
+  }
+
+  public Serde.Deserializer deserializer(String topic, Serde.Target type) {
+    return wrapWithClassloader(() -> {
+      var deserializer = serde.deserializer(topic, type);
+      return (headers, data) -> wrapWithClassloader(() -> deserializer.deserialize(headers, data));
+    });
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java
new file mode 100644
index 00000000000..14861ade6ae
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java
@@ -0,0 +1,74 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.RecordHeaders;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.util.Base64;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.kafka.common.header.Headers;
+
+public class Base64Serde implements BuiltInSerde {
+
+  public static String name() {
+    return "Base64";
+  }
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    return new Serializer() {
+      @Override
+      public byte[] serialize(String input) {
+        input = input.trim();
+        // it is actually a hack to provide ability to sent empty array as a key/value
+        if (input.length() == 0) {
+          return new byte[]{};
+        }
+        return Base64.getDecoder().decode(input);
+      }
+    };
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    var encoder = Base64.getEncoder();
+    return new Deserializer() {
+      @Override
+      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
+        return new DeserializeResult(
+            encoder.encodeToString(data),
+            DeserializeResult.Type.STRING,
+            Map.of()
+        );
+      }
+    };
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java
new file mode 100644
index 00000000000..e28fc8fe5f3
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java
@@ -0,0 +1,70 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.google.common.primitives.Ints;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.util.Map;
+import java.util.Optional;
+
+public class Int32Serde implements BuiltInSerde {
+
+  public static String name() {
+    return "Int32";
+  }
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.of(
+        new SchemaDescription(
+            String.format(
+                "{ "
+                    + "  \"type\" : \"integer\", "
+                    + "  \"minimum\" : %s, "
+                    + "  \"maximum\" : %s "
+                    + "}",
+                Integer.MIN_VALUE,
+                Integer.MAX_VALUE
+            ),
+            Map.of()
+        )
+    );
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    return input -> Ints.toByteArray(Integer.parseInt(input));
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return (headers, data) ->
+        new DeserializeResult(
+            String.valueOf(Ints.fromByteArray(data)),
+            DeserializeResult.Type.JSON,
+            Map.of()
+        );
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java
new file mode 100644
index 00000000000..4e320aa1047
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java
@@ -0,0 +1,76 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.google.common.primitives.Longs;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.RecordHeaders;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.util.Map;
+import java.util.Optional;
+
+public class Int64Serde implements BuiltInSerde {
+
+  public static String name() {
+    return "Int64";
+  }
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.of(
+        new SchemaDescription(
+            String.format(
+                "{ "
+                    + "  \"type\" : \"integer\", "
+                    + "  \"minimum\" : %s, "
+                    + "  \"maximum\" : %s "
+                    + "}",
+                Long.MIN_VALUE,
+                Long.MAX_VALUE
+            ),
+            Map.of()
+        )
+    );
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    return input -> Longs.toByteArray(Long.parseLong(input));
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return new Deserializer() {
+      @Override
+      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
+        return new DeserializeResult(
+            String.valueOf(Longs.fromByteArray(data)),
+            DeserializeResult.Type.JSON,
+            Map.of()
+        );
+      }
+    };
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
new file mode 100644
index 00000000000..6e861cfe56b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
@@ -0,0 +1,178 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.util.JsonFormat;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.RecordHeaders;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import com.provectus.kafka.ui.util.jsonschema.ProtobufSchemaConverter;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaUtils;
+import java.io.ByteArrayInputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
+import lombok.SneakyThrows;
+
+
+public class ProtobufFileSerde implements BuiltInSerde {
+
+  public static String name() {
+    return "ProtobufFile";
+  }
+
+  private static final ProtobufSchemaConverter SCHEMA_CONVERTER = new ProtobufSchemaConverter();
+
+  private Path protobufSchemaPath;
+
+  private Map<String, Descriptor> messageDescriptorMap = new HashMap<>();
+  private Map<String, Descriptor> keyMessageDescriptorMap = new HashMap<>();
+
+  private Descriptor defaultMessageDescriptor;
+
+  @Nullable
+  private Descriptor defaultKeyMessageDescriptor;
+
+  @Override
+  public boolean initOnStartup(PropertyResolver kafkaClusterProperties,
+                               PropertyResolver globalProperties) {
+    return kafkaClusterProperties.getProperty("protobufFile", String.class)
+        .isPresent();
+  }
+
+  @SneakyThrows
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+    protobufSchemaPath = Path.of(
+        kafkaClusterProperties.getProperty("protobufFile", String.class)
+            .orElseThrow());
+    ProtobufSchema protobufSchema;
+    try (Stream<String> lines = Files.lines(protobufSchemaPath)) {
+      protobufSchema = new ProtobufSchema(lines.collect(Collectors.joining("\n")));
+    }
+    configure(
+        protobufSchemaPath,
+        defaultMessageDescriptor = kafkaClusterProperties.getProperty("protobufMessageName", String.class)
+            .map(msgName -> Objects.requireNonNull(protobufSchema.toDescriptor(msgName),
+                "The given message type not found in protobuf definition: " + msgName))
+            // this is strange logic, but we need it to support serde's backward-compatibility
+            .orElseGet(protobufSchema::toDescriptor),
+        defaultKeyMessageDescriptor = kafkaClusterProperties.getProperty("protobufMessageNameForKey", String.class)
+            .map(msgName -> Objects.requireNonNull(protobufSchema.toDescriptor(msgName),
+                "The given message type not found in protobuf definition: " + msgName))
+            .orElse(null),
+        kafkaClusterProperties.getMapProperty("protobufMessageNameByTopic", String.class, String.class)
+            .map(map -> populateDescriptors(protobufSchema, map))
+            .orElse(Map.of()),
+        kafkaClusterProperties.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class)
+            .map(map -> populateDescriptors(protobufSchema, map))
+            .orElse(Map.of())
+    );
+  }
+
+  @VisibleForTesting
+  void configure(
+      Path protobufSchemaPath,
+      Descriptor defaultMessageDescriptor,
+      @Nullable Descriptor defaultKeyMessageDescriptor,
+      Map<String, Descriptor> messageDescriptorMap,
+      Map<String, Descriptor> keyMessageDescriptorMap) {
+    this.protobufSchemaPath = protobufSchemaPath;
+    this.defaultMessageDescriptor = defaultMessageDescriptor;
+    this.defaultKeyMessageDescriptor = defaultKeyMessageDescriptor;
+    this.messageDescriptorMap = messageDescriptorMap;
+    this.keyMessageDescriptorMap = keyMessageDescriptorMap;
+  }
+
+  private Map<String, Descriptor> populateDescriptors(ProtobufSchema protobufSchema,
+                                                      Map<String, String> messageNameMap) {
+    Map<String, Descriptor> descriptors = new HashMap<>();
+    for (Map.Entry<String, String> entry : messageNameMap.entrySet()) {
+      var descriptor = Objects.requireNonNull(protobufSchema.toDescriptor(entry.getValue()),
+          "The given message type is not found in protobuf definition: "
+              + entry.getValue());
+      descriptors.put(entry.getKey(), descriptor);
+    }
+    return descriptors;
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  private Optional<Descriptor> descriptorFor(String topic, Target type) {
+    return type == Target.KEY
+        ?
+        Optional.ofNullable(keyMessageDescriptorMap.get(topic))
+            .or(() -> Optional.ofNullable(defaultKeyMessageDescriptor))
+        :
+        Optional.ofNullable(messageDescriptorMap.get(topic))
+            .or(() -> Optional.ofNullable(defaultMessageDescriptor));
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return descriptorFor(topic, type).isPresent();
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return descriptorFor(topic, type).isPresent();
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    var descriptor = descriptorFor(topic, type).orElseThrow();
+    return new Serializer() {
+      @SneakyThrows
+      @Override
+      public byte[] serialize(String input) {
+        DynamicMessage.Builder builder = DynamicMessage.newBuilder(descriptor);
+        JsonFormat.parser().merge(input, builder);
+        return builder.build().toByteArray();
+      }
+    };
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    var descriptor = descriptorFor(topic, type).orElseThrow();
+    return new Deserializer() {
+      @SneakyThrows
+      @Override
+      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
+        var protoMsg = DynamicMessage.parseFrom(descriptor, new ByteArrayInputStream(data));
+        byte[] jsonFromProto = ProtobufSchemaUtils.toJson(protoMsg);
+        var result = new String(jsonFromProto);
+        return new DeserializeResult(
+            result,
+            DeserializeResult.Type.JSON,
+            Map.of()
+        );
+      }
+    };
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return descriptorFor(topic, type)
+        .map(descriptor ->
+            new SchemaDescription(
+                SCHEMA_CONVERTER.convert(protobufSchemaPath.toUri(), descriptor).toJson(),
+                Map.of("messageName", descriptor.getFullName())
+            ));
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/StringSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/StringSerde.java
new file mode 100644
index 00000000000..6ca20dd22fa
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/StringSerde.java
@@ -0,0 +1,65 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Optional;
+
+public class StringSerde implements BuiltInSerde {
+
+  public static String name() {
+    return "String";
+  }
+
+  private Charset encoding;
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+    encoding = Charset.forName(
+        serdeProperties.getProperty("encoding", String.class)
+            .orElse(StandardCharsets.UTF_8.name())
+    );
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    return input -> input.getBytes(encoding);
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return (headers, data) ->
+        new DeserializeResult(
+            new String(data, encoding),
+            DeserializeResult.Type.STRING,
+            Map.of()
+        );
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt32Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt32Serde.java
new file mode 100644
index 00000000000..be4f5d12716
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt32Serde.java
@@ -0,0 +1,70 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.UnsignedInteger;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.util.Map;
+import java.util.Optional;
+
+public class UInt32Serde implements BuiltInSerde {
+
+  public static String name() {
+    return "UInt32";
+  }
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.of(
+        new SchemaDescription(
+            String.format(
+                "{ "
+                    + "  \"type\" : \"integer\", "
+                    + "  \"minimum\" : 0, "
+                    + "  \"maximum\" : %s"
+                    + "}",
+                UnsignedInteger.MAX_VALUE
+            ),
+            Map.of()
+        )
+    );
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    return input -> Ints.toByteArray(Integer.parseUnsignedInt(input));
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return (headers, data) ->
+        new DeserializeResult(
+            UnsignedInteger.fromIntBits(Ints.fromByteArray(data)).toString(),
+            DeserializeResult.Type.JSON,
+            Map.of()
+        );
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java
new file mode 100644
index 00000000000..14e0806dc1d
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java
@@ -0,0 +1,79 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.google.common.primitives.Longs;
+import com.google.common.primitives.UnsignedInteger;
+import com.google.common.primitives.UnsignedLong;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.RecordHeaders;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.util.Map;
+import java.util.Optional;
+import org.apache.kafka.common.header.Headers;
+
+
+public class UInt64Serde implements BuiltInSerde {
+
+  public static String name() {
+    return "UInt64";
+  }
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.of(
+        new SchemaDescription(
+            String.format(
+                "{ "
+                    + "  \"type\" : \"integer\", "
+                    + "  \"minimum\" : 0, "
+                    + "  \"maximum\" : %s "
+                    + "}",
+                UnsignedInteger.MAX_VALUE
+            ),
+            Map.of()
+        )
+    );
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    return input -> Longs.toByteArray(Long.parseUnsignedLong(input));
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return new Deserializer() {
+      @Override
+      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
+        return new DeserializeResult(
+            UnsignedLong.fromLongBits(Longs.fromByteArray(data)).toString(),
+            DeserializeResult.Type.JSON,
+            Map.of()
+        );
+      }
+    };
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java
new file mode 100644
index 00000000000..673122aca71
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java
@@ -0,0 +1,91 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.RecordHeaders;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import org.apache.kafka.common.header.Headers;
+
+
+public class UuidBinarySerde implements BuiltInSerde {
+
+  public static String name() {
+    return "UUIDBinary";
+  }
+
+  private boolean mostSignificantBitsFirst;
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+    mostSignificantBitsFirst = serdeProperties.getProperty("mostSignificantBitsFirst", Boolean.class)
+        .orElse(true);
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    return new Serializer() {
+      @Override
+      public byte[] serialize(String input) {
+        UUID uuid = UUID.fromString(input);
+        ByteBuffer bb = ByteBuffer.wrap(new byte[16]);
+        if (mostSignificantBitsFirst) {
+          bb.putLong(uuid.getMostSignificantBits());
+          bb.putLong(uuid.getLeastSignificantBits());
+        } else {
+          bb.putLong(uuid.getLeastSignificantBits());
+          bb.putLong(uuid.getMostSignificantBits());
+        }
+        return bb.array();
+      }
+    };
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return new Deserializer() {
+      @Override
+      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
+        if (data.length != 16) {
+          throw new ValidationException("UUID data should be 16 bytes, but it is " + data.length);
+        }
+        ByteBuffer bb = ByteBuffer.wrap(data);
+        long msb = bb.getLong();
+        long lsb = bb.getLong();
+        UUID uuid = mostSignificantBitsFirst ? new UUID(msb, lsb) : new UUID(lsb, msb);
+        return new DeserializeResult(
+            uuid.toString(),
+            DeserializeResult.Type.STRING,
+            Map.of()
+        );
+      }
+    };
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/AvroMessageReader.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java
similarity index 70%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/AvroMessageReader.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java
index 7f2efbbd644..3c4a5008552 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/AvroMessageReader.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java
@@ -1,23 +1,20 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
+package com.provectus.kafka.ui.serdes.builtin.sr;
 
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.avro.AvroSchema;
 import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
 import io.confluent.kafka.serializers.KafkaAvroSerializer;
-import java.io.IOException;
 import java.util.Map;
 import org.apache.kafka.common.serialization.Serializer;
 
-public class AvroMessageReader extends MessageReader<Object> {
+class AvroSchemaRegistrySerializer extends SchemaRegistrySerializer<Object> {
 
-  public AvroMessageReader(String topic, boolean isKey,
-                           SchemaRegistryClient client,
-                           SchemaMetadata schema)
-      throws IOException, RestClientException {
+  AvroSchemaRegistrySerializer(String topic, boolean isKey,
+                               SchemaRegistryClient client,
+                               SchemaMetadata schema) {
     super(topic, isKey, client, schema);
   }
 
@@ -36,7 +33,7 @@ protected Serializer<Object> createSerializer(SchemaRegistryClient client) {
   }
 
   @Override
-  protected Object read(String value, ParsedSchema schema) {
+  protected Object serialize(String value, ParsedSchema schema) {
     try {
       return AvroSchemaUtils.toObject(value, (AvroSchema) schema);
     } catch (Throwable e) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/JsonSchemaMessageReader.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java
similarity index 82%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/JsonSchemaMessageReader.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java
index de56ed462e6..0dd3458abd1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/JsonSchemaMessageReader.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
+package com.provectus.kafka.ui.serdes.builtin.sr;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -8,22 +8,20 @@
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import io.confluent.kafka.schemaregistry.json.JsonSchema;
 import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
 import io.confluent.kafka.serializers.json.KafkaJsonSchemaSerializer;
-import java.io.IOException;
 import java.util.Map;
 import org.apache.kafka.common.serialization.Serializer;
 
-public class JsonSchemaMessageReader extends MessageReader<JsonNode> {
+class JsonSchemaSchemaRegistrySerializer extends SchemaRegistrySerializer<JsonNode> {
 
   private static final ObjectMapper MAPPER = new ObjectMapper();
 
-  public JsonSchemaMessageReader(String topic,
-                                 boolean isKey,
-                                 SchemaRegistryClient client,
-                                 SchemaMetadata schema) throws IOException, RestClientException {
+  JsonSchemaSchemaRegistrySerializer(String topic,
+                                            boolean isKey,
+                                            SchemaRegistryClient client,
+                                            SchemaMetadata schema) {
     super(topic, isKey, client, schema);
   }
 
@@ -42,7 +40,7 @@ protected Serializer<JsonNode> createSerializer(SchemaRegistryClient client) {
   }
 
   @Override
-  protected JsonNode read(String value, ParsedSchema schema) {
+  protected JsonNode serialize(String value, ParsedSchema schema) {
     try {
       JsonNode json = MAPPER.readTree(value);
       ((JsonSchema) schema).validate(json);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java
new file mode 100644
index 00000000000..04e1af091b2
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java
@@ -0,0 +1,73 @@
+package com.provectus.kafka.ui.serdes.builtin.sr;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.google.protobuf.Message;
+import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
+import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaUtils;
+import io.confluent.kafka.serializers.KafkaAvroDeserializer;
+import io.confluent.kafka.serializers.json.KafkaJsonSchemaDeserializer;
+import io.confluent.kafka.serializers.protobuf.KafkaProtobufDeserializer;
+import java.util.Map;
+import lombok.SneakyThrows;
+
+interface MessageFormatter {
+
+  String format(String topic, byte[] value);
+
+  static Map<SchemaType, MessageFormatter> createMap(SchemaRegistryClient schemaRegistryClient) {
+    return Map.of(
+        SchemaType.AVRO, new AvroMessageFormatter(schemaRegistryClient),
+        SchemaType.JSON, new JsonSchemaMessageFormatter(schemaRegistryClient),
+        SchemaType.PROTOBUF, new ProtobufMessageFormatter(schemaRegistryClient)
+    );
+  }
+
+  class AvroMessageFormatter implements MessageFormatter {
+    private final KafkaAvroDeserializer avroDeserializer;
+
+    AvroMessageFormatter(SchemaRegistryClient client) {
+      this.avroDeserializer = new KafkaAvroDeserializer(client);
+    }
+
+    @Override
+    @SneakyThrows
+    public String format(String topic, byte[] value) {
+      // deserialized will have type, that depends on schema type (record or primitive),
+      // AvroSchemaUtils.toJson(...) method will take it into account
+      Object deserialized = avroDeserializer.deserialize(topic, value);
+      byte[] jsonBytes = AvroSchemaUtils.toJson(deserialized);
+      return new String(jsonBytes);
+    }
+  }
+
+  class ProtobufMessageFormatter implements MessageFormatter {
+    private final KafkaProtobufDeserializer<?> protobufDeserializer;
+
+    ProtobufMessageFormatter(SchemaRegistryClient client) {
+      this.protobufDeserializer = new KafkaProtobufDeserializer<>(client);
+    }
+
+    @Override
+    @SneakyThrows
+    public String format(String topic, byte[] value) {
+      final Message message = protobufDeserializer.deserialize(topic, value);
+      byte[] jsonBytes = ProtobufSchemaUtils.toJson(message);
+      return new String(jsonBytes);
+    }
+  }
+
+  class JsonSchemaMessageFormatter implements MessageFormatter {
+    private final KafkaJsonSchemaDeserializer<JsonNode> jsonSchemaDeserializer;
+
+    JsonSchemaMessageFormatter(SchemaRegistryClient client) {
+      this.jsonSchemaDeserializer = new KafkaJsonSchemaDeserializer<>(client);
+    }
+
+    @Override
+    public String format(String topic, byte[] value) {
+      JsonNode json = jsonSchemaDeserializer.deserialize(topic, value);
+      return json.toString();
+    }
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/ProtobufMessageReader.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/ProtobufSchemaRegistrySerializer.java
similarity index 74%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/ProtobufMessageReader.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/ProtobufSchemaRegistrySerializer.java
index faa9cde0494..1af2bb4999c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/ProtobufMessageReader.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/ProtobufSchemaRegistrySerializer.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
+package com.provectus.kafka.ui.serdes.builtin.sr;
 
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.Message;
@@ -6,19 +6,18 @@
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
 import io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializer;
-import java.io.IOException;
 import java.util.Map;
+import lombok.SneakyThrows;
 import org.apache.kafka.common.serialization.Serializer;
 
-public class ProtobufMessageReader extends MessageReader<Message> {
+class ProtobufSchemaRegistrySerializer extends SchemaRegistrySerializer<Message> {
 
-  public ProtobufMessageReader(String topic, boolean isKey,
-                               SchemaRegistryClient client, SchemaMetadata schema)
-      throws IOException, RestClientException {
+  @SneakyThrows
+  public ProtobufSchemaRegistrySerializer(String topic, boolean isKey,
+                                          SchemaRegistryClient client, SchemaMetadata schema) {
     super(topic, isKey, client, schema);
   }
 
@@ -37,7 +36,7 @@ protected Serializer<Message> createSerializer(SchemaRegistryClient client) {
   }
 
   @Override
-  protected Message read(String value, ParsedSchema schema) {
+  protected Message serialize(String value, ParsedSchema schema) {
     ProtobufSchema protobufSchema = (ProtobufSchema) schema;
     DynamicMessage.Builder builder = protobufSchema.newMessageBuilder();
     try {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
new file mode 100644
index 00000000000..eb67ee7643c
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -0,0 +1,265 @@
+package com.provectus.kafka.ui.serdes.builtin.sr;
+
+import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.BASIC_AUTH_CREDENTIALS_SOURCE;
+import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.USER_INFO_CONFIG;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.RecordHeaders;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import com.provectus.kafka.ui.util.jsonschema.AvroJsonSchemaConverter;
+import com.provectus.kafka.ui.util.jsonschema.ProtobufSchemaConverter;
+import io.confluent.kafka.schemaregistry.ParsedSchema;
+import io.confluent.kafka.schemaregistry.avro.AvroSchema;
+import io.confluent.kafka.schemaregistry.avro.AvroSchemaProvider;
+import io.confluent.kafka.schemaregistry.client.CachedSchemaRegistryClient;
+import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
+import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
+import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
+import io.confluent.kafka.schemaregistry.json.JsonSchemaProvider;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaProvider;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.Callable;
+import javax.annotation.Nullable;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+
+public class SchemaRegistrySerde implements BuiltInSerde {
+
+  public static String name() {
+    return "SchemaRegistry";
+  }
+
+  private SchemaRegistryClient schemaRegistryClient;
+  private List<String> schemaRegistryUrls;
+  private String valueSchemaNameTemplate;
+  private String keySchemaNameTemplate;
+
+  private Map<SchemaType, MessageFormatter> schemaRegistryFormatters;
+
+  @Override
+  public boolean initOnStartup(PropertyResolver kafkaClusterProperties,
+                               PropertyResolver globalProperties) {
+    return kafkaClusterProperties.getListProperty("schemaRegistry", String.class)
+        .filter(lst -> !lst.isEmpty())
+        .isPresent();
+  }
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+    var urls = serdeProperties.getListProperty("url", String.class)
+        .or(() -> kafkaClusterProperties.getListProperty("schemaRegistry", String.class))
+        .filter(lst -> !lst.isEmpty())
+        .orElseThrow(() -> new ValidationException("No urls provided for schema registry"));
+    configure(
+        urls,
+        createSchemaRegistryClient(
+            urls,
+            serdeProperties.getProperty("username", String.class)
+                .or(() -> kafkaClusterProperties.getProperty("schemaRegistryAuth.username", String.class))
+                .orElse(null),
+            serdeProperties.getProperty("password", String.class)
+                .or(() -> kafkaClusterProperties.getProperty("schemaRegistryAuth.password", String.class))
+                .orElse(null)
+        ),
+        serdeProperties.getProperty("keySchemaNameTemplate", String.class)
+            .or(() -> kafkaClusterProperties.getProperty("keySchemaNameTemplate", String.class))
+            .orElse("%s-key"),
+        serdeProperties.getProperty("schemaNameTemplate", String.class)
+            .or(() -> kafkaClusterProperties.getProperty("schemaNameTemplate", String.class))
+            .orElse("%s-value")
+    );
+  }
+
+  @VisibleForTesting
+  void configure(
+      List<String> schemaRegistryUrls,
+      SchemaRegistryClient schemaRegistryClient,
+      String keySchemaNameTemplate,
+      String valueSchemaNameTemplate) {
+    this.schemaRegistryUrls = schemaRegistryUrls;
+    this.schemaRegistryClient = schemaRegistryClient;
+    this.keySchemaNameTemplate = keySchemaNameTemplate;
+    this.valueSchemaNameTemplate = valueSchemaNameTemplate;
+    this.schemaRegistryFormatters = MessageFormatter.createMap(schemaRegistryClient);
+  }
+
+  private static SchemaRegistryClient createSchemaRegistryClient(List<String> urls,
+                                                                 @Nullable String username,
+                                                                 @Nullable String password) {
+    Map<String, String> configs = new HashMap<>();
+    if (username != null && password != null) {
+      configs.put(BASIC_AUTH_CREDENTIALS_SOURCE, "USER_INFO");
+      configs.put(USER_INFO_CONFIG, username + ":" + password);
+    } else if (username != null) {
+      throw new ValidationException(
+          "You specified username but do not specified password");
+    } else if (password != null) {
+      throw new ValidationException(
+          "You specified password but do not specified username");
+    }
+    return new CachedSchemaRegistryClient(
+        urls,
+        1_000,
+        List.of(new AvroSchemaProvider(), new ProtobufSchemaProvider(), new JsonSchemaProvider()),
+        configs
+    );
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    String subject = schemaSubject(topic, type);
+    return getSchemaBySubject(subject).isPresent();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    String subject = schemaSubject(topic, type);
+    return getSchemaBySubject(subject)
+        .map(schemaMetadata ->
+            new SchemaDescription(
+                convertSchema(schemaMetadata),
+                Map.of(
+                    "schemaId", schemaMetadata.getId(),
+                    "latestVersion", schemaMetadata.getVersion(),
+                    "type", schemaMetadata.getSchemaType() // AVRO / PROTOBUF / JSON
+                )
+            ));
+  }
+
+  @SneakyThrows
+  private String convertSchema(SchemaMetadata schema) {
+    URI basePath = new URI(schemaRegistryUrls.get(0))
+        .resolve(Integer.toString(schema.getId()));
+    ParsedSchema schemaById = schemaRegistryClient.getSchemaById(schema.getId());
+    SchemaType schemaType = SchemaType.fromString(schema.getSchemaType())
+        .orElseThrow(() -> new IllegalStateException("Unknown schema type: " + schema.getSchemaType()));
+    switch (schemaType) {
+      case PROTOBUF:
+        return new ProtobufSchemaConverter()
+            .convert(basePath, ((ProtobufSchema) schemaById).toDescriptor())
+            .toJson();
+      case AVRO:
+        return new AvroJsonSchemaConverter()
+            .convert(basePath, ((AvroSchema) schemaById).rawSchema())
+            .toJson();
+      case JSON:
+        return schema.getSchema();
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  private Optional<SchemaMetadata> getSchemaBySubject(String subject) {
+    return wrapWith404Handler(() -> schemaRegistryClient.getLatestSchemaMetadata(subject));
+  }
+
+  @SneakyThrows
+  private <T> Optional<T> wrapWith404Handler(Callable<T> call) {
+    try {
+      return Optional.ofNullable(call.call());
+    } catch (RestClientException restClientException) {
+      if (restClientException.getStatus() == 404) {
+        return Optional.empty();
+      } else {
+        throw new RuntimeException("Error calling SchemaRegistryClient", restClientException);
+      }
+    }
+  }
+
+  private String schemaSubject(String topic, Target type) {
+    return String.format(type == Target.KEY ? keySchemaNameTemplate : valueSchemaNameTemplate, topic);
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    String subject = schemaSubject(topic, type);
+    var schema = getSchemaBySubject(subject)
+        .orElseThrow(() -> new ValidationException(String.format("No schema for subject '%s' found", subject)));
+    boolean isKey = type == Target.KEY;
+    SchemaType schemaType = SchemaType.fromString(schema.getSchemaType())
+        .orElseThrow(() -> new IllegalStateException("Unknown schema type: " + schema.getSchemaType()));
+    switch (schemaType) {
+      case PROTOBUF:
+        return new ProtobufSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
+      case AVRO:
+        return new AvroSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
+      case JSON:
+        return new JsonSchemaSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return new SrDeserializer(topic);
+  }
+
+  ///--------------------------------------------------------------
+
+  private static final byte SR_RECORD_MAGIC_BYTE = (byte) 0;
+  private static final int SR_RECORD_PREFIX_LENGTH = 5;
+
+  @RequiredArgsConstructor
+  private class SrDeserializer implements Deserializer {
+
+    private final String topic;
+
+    @Override
+    public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
+      var schemaId = extractSchemaIdFromMsg(data);
+      SchemaType format = getMessageFormatBySchemaId(schemaId);
+      MessageFormatter formatter = schemaRegistryFormatters.get(format);
+      return new DeserializeResult(
+          formatter.format(topic, data),
+          DeserializeResult.Type.JSON,
+          Map.of(
+              "schemaId", schemaId,
+              "type", format.name()
+          )
+      );
+    }
+  }
+
+  private SchemaType getMessageFormatBySchemaId(int schemaId) {
+    return wrapWith404Handler(() -> schemaRegistryClient.getSchemaById(schemaId))
+        .map(ParsedSchema::schemaType)
+        .flatMap(SchemaType::fromString)
+        .orElseThrow(() -> new ValidationException(String.format("Schema for id '%d' not found ", schemaId)));
+  }
+
+  private int extractSchemaIdFromMsg(byte[] data) {
+    ByteBuffer buffer = ByteBuffer.wrap(data);
+    if (buffer.remaining() > SR_RECORD_PREFIX_LENGTH && buffer.get() == SR_RECORD_MAGIC_BYTE) {
+      return buffer.getInt();
+    }
+    throw new ValidationException(
+        String.format(
+            "Data doesn't contain magic byte and schema id prefix, so it can't be deserialized with %s serde",
+            name())
+    );
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageReader.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerializer.java
similarity index 56%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageReader.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerializer.java
index c6cb1e4606d..a7a202c04f2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/MessageReader.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerializer.java
@@ -1,20 +1,21 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
+package com.provectus.kafka.ui.serdes.builtin.sr;
 
+import com.provectus.kafka.ui.serde.api.Serde;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
-import java.io.IOException;
+import lombok.SneakyThrows;
 import org.apache.kafka.common.serialization.Serializer;
 
-public abstract class MessageReader<T> {
+abstract class SchemaRegistrySerializer<T> implements Serde.Serializer {
   protected final Serializer<T> serializer;
   protected final String topic;
   protected final boolean isKey;
   protected final ParsedSchema schema;
 
-  protected MessageReader(String topic, boolean isKey, SchemaRegistryClient client,
-                          SchemaMetadata schema) throws IOException, RestClientException {
+  @SneakyThrows
+  protected SchemaRegistrySerializer(String topic, boolean isKey, SchemaRegistryClient client,
+                                     SchemaMetadata schema) {
     this.topic = topic;
     this.isKey = isKey;
     this.serializer = createSerializer(client);
@@ -23,10 +24,11 @@ protected MessageReader(String topic, boolean isKey, SchemaRegistryClient client
 
   protected abstract Serializer<T> createSerializer(SchemaRegistryClient client);
 
-  public byte[] read(String value) {
-    final T read = this.read(value, schema);
+  @Override
+  public byte[] serialize(String input) {
+    final T read = this.serialize(input, schema);
     return this.serializer.serialize(topic, read);
   }
 
-  protected abstract T read(String value, ParsedSchema schema);
+  protected abstract T serialize(String value, ParsedSchema schema);
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaType.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaType.java
new file mode 100644
index 00000000000..dc38d3ae483
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaType.java
@@ -0,0 +1,14 @@
+package com.provectus.kafka.ui.serdes.builtin.sr;
+
+import java.util.Optional;
+import org.apache.commons.lang3.EnumUtils;
+
+enum SchemaType {
+  AVRO,
+  JSON,
+  PROTOBUF;
+
+  public static Optional<SchemaType> fromString(String typeString) {
+    return Optional.ofNullable(EnumUtils.getEnum(SchemaType.class, typeString));
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index d17f5249781..81e4e763e56 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -91,13 +91,12 @@ public Mono<List<InternalConsumerGroup>> getConsumerGroupsForTopic(KafkaCluster
                   )
                   .flatMap((Map<String, Map<TopicPartition, Long>> groupOffsets) ->
                       // 4. getting description for groups with non-emtpy offsets
-                      ac.describeConsumerGroups(new ArrayList<>(groupOffsets.keySet()))
+                      ac.describeConsumerGroups(groupOffsets.keySet())
                           .map((Map<String, ConsumerGroupDescription> descriptions) ->
                               descriptions.values().stream().map(desc ->
-                                      // 5. gathering and filter non-target-topic data
+                                      // 5. gathering into InternalConsumerGroup
                                       InternalConsumerGroup.create(
                                               desc, groupOffsets.get(desc.groupId()), endOffsets)
-                                          .retainDataForPartitions(p -> p.topic().equals(topic))
                                   )
                                   .collect(Collectors.toList())));
             }));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
new file mode 100644
index 00000000000..94c493c96d8
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
@@ -0,0 +1,140 @@
+package com.provectus.kafka.ui.service;
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.SerdeDescriptionDTO;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.ClusterSerdes;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
+import com.provectus.kafka.ui.serdes.SerdeInstance;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nullable;
+import javax.validation.ValidationException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class DeserializationService {
+
+  private final Map<KafkaCluster, ClusterSerdes> clusterSerdes = new ConcurrentHashMap<>();
+
+  public DeserializationService(Environment env,
+                                ClustersStorage clustersStorage,
+                                ClustersProperties clustersProperties) {
+    for (int i = 0; i < clustersProperties.getClusters().size(); i++) {
+      var clusterProperties = clustersProperties.getClusters().get(i);
+      var cluster = clustersStorage.getClusterByName(clusterProperties.getName()).get();
+      clusterSerdes.put(cluster, new ClusterSerdes(env, clustersProperties, i));
+    }
+  }
+
+  private Serde.Serializer getSerializer(KafkaCluster cluster,
+                                         String topic,
+                                         Serde.Target type,
+                                         String serdeName) {
+    var serdes = this.clusterSerdes.get(cluster);
+    var serde = serdes.serdeForName(serdeName)
+        .orElseThrow(() -> new ValidationException(
+            String.format("Serde %s not found", serdeName)));
+    if (!serde.canSerialize(topic, type)) {
+      throw new ValidationException(
+          String.format("Serde %s can't be applied for '%s' topic's %s serialization", serde, topic, type));
+    }
+    return serde.serializer(topic, type);
+  }
+
+  private SerdeInstance getSerdeForDeserialize(KafkaCluster cluster,
+                                               String topic,
+                                               Serde.Target type,
+                                               @Nullable String serdeName) {
+    var serdes = this.clusterSerdes.get(cluster);
+    if (serdeName != null) {
+      var serde = serdes.serdeForName(serdeName)
+          .orElseThrow(() -> new ValidationException(String.format("Serde '%s' not found", serdeName)));
+      if (!serde.canDeserialize(topic, type)) {
+        throw new ValidationException(
+            String.format("Serde '%s' can't be applied to '%s' topic %s", serdeName, topic, type));
+      }
+      return serde;
+    } else {
+      return serdes.suggestSerdeForDeserialize(topic, type);
+    }
+  }
+
+  public ProducerRecordCreator producerRecordCreator(KafkaCluster cluster,
+                                                     String topic,
+                                                     String keySerdeName,
+                                                     String valueSerdeName) {
+    return new ProducerRecordCreator(
+        getSerializer(cluster, topic, Serde.Target.KEY, keySerdeName),
+        getSerializer(cluster, topic, Serde.Target.VALUE, valueSerdeName)
+    );
+  }
+
+  public ConsumerRecordDeserializer deserializerFor(KafkaCluster cluster,
+                                                    String topic,
+                                                    @Nullable String keySerdeName,
+                                                    @Nullable String valueSerdeName) {
+    var keySerde = getSerdeForDeserialize(cluster, topic, Serde.Target.KEY, keySerdeName);
+    var valueSerde = getSerdeForDeserialize(cluster, topic, Serde.Target.VALUE, valueSerdeName);
+    var fallbackSerde = clusterSerdes.get(cluster).getFallbackSerde();
+    return new ConsumerRecordDeserializer(
+        keySerde.getName(),
+        keySerde.deserializer(topic, Serde.Target.KEY),
+        valueSerde.getName(),
+        valueSerde.deserializer(topic, Serde.Target.VALUE),
+        fallbackSerde.getName(),
+        fallbackSerde.deserializer(topic, Serde.Target.KEY),
+        fallbackSerde.deserializer(topic, Serde.Target.VALUE)
+    );
+  }
+
+  public List<SerdeDescriptionDTO> getSerdesForSerialize(KafkaCluster cluster,
+                                                         String topic,
+                                                         Serde.Target serdeType) {
+    var serdes = clusterSerdes.get(cluster);
+    var preferred = serdes.suggestSerdeForSerialize(topic, serdeType);
+    var result = new ArrayList<SerdeDescriptionDTO>();
+    result.add(toDto(preferred, topic, serdeType, true));
+    serdes.all()
+        .filter(s -> !s.getName().equals(preferred.getName()))
+        .filter(s -> s.canSerialize(topic, serdeType))
+        .forEach(s -> result.add(toDto(s, topic, serdeType, false)));
+    return result;
+  }
+
+  public List<SerdeDescriptionDTO> getSerdesForDeserialize(KafkaCluster cluster,
+                                                           String topic,
+                                                           Serde.Target serdeType) {
+    var serdes = clusterSerdes.get(cluster);
+    var preferred = serdes.suggestSerdeForDeserialize(topic, serdeType);
+    var result = new ArrayList<SerdeDescriptionDTO>();
+    result.add(toDto(preferred, topic, serdeType, true));
+    serdes.all()
+        .filter(s -> !s.getName().equals(preferred.getName()))
+        .filter(s -> s.canDeserialize(topic, serdeType))
+        .forEach(s -> result.add(toDto(s, topic, serdeType, false)));
+    return result;
+  }
+
+  private SerdeDescriptionDTO toDto(SerdeInstance serdeInstance,
+                                    String topic,
+                                    Serde.Target serdeType,
+                                    boolean preferred) {
+    var schemaOpt = serdeInstance.getSchema(topic, serdeType);
+    return new SerdeDescriptionDTO()
+        .name(serdeInstance.getName())
+        .description(serdeInstance.description().orElse(null))
+        .schema(schemaOpt.map(SchemaDescription::getSchema).orElse(null))
+        .additionalProperties(schemaOpt.map(SchemaDescription::getAdditionalProperties).orElse(null))
+        .preferred(preferred);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index f79eaf8ba59..9191a3840e8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -12,8 +12,8 @@
 import com.provectus.kafka.ui.model.MessageFilterTypeDTO;
 import com.provectus.kafka.ui.model.SeekDirectionDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.serde.DeserializationService;
-import com.provectus.kafka.ui.serde.RecordSerDe;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
 import com.provectus.kafka.ui.util.OffsetsSeekBackward;
 import com.provectus.kafka.ui.util.OffsetsSeekForward;
 import com.provectus.kafka.ui.util.ResultSizeLimiter;
@@ -35,9 +35,6 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.clients.producer.RecordMetadata;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.header.Header;
-import org.apache.kafka.common.header.internals.RecordHeader;
-import org.apache.kafka.common.header.internals.RecordHeaders;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
@@ -96,8 +93,13 @@ private Mono<RecordMetadata> sendMessageImpl(KafkaCluster cluster,
         && msg.getPartition() > topicDescription.partitions().size() - 1) {
       return Mono.error(new ValidationException("Invalid partition"));
     }
-    RecordSerDe serde =
-        deserializationService.getRecordDeserializerForCluster(cluster);
+    ProducerRecordCreator producerRecordCreator =
+        deserializationService.producerRecordCreator(
+            cluster,
+            topicDescription.name(),
+            msg.getKeySerde().get(),
+            msg.getValueSerde().get()
+        );
 
     Properties properties = new Properties();
     properties.putAll(cluster.getProperties());
@@ -105,19 +107,13 @@ private Mono<RecordMetadata> sendMessageImpl(KafkaCluster cluster,
     properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
     properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
     try (KafkaProducer<byte[], byte[]> producer = new KafkaProducer<>(properties)) {
-      ProducerRecord<byte[], byte[]> producerRecord = serde.serialize(
+      ProducerRecord<byte[], byte[]> producerRecord = producerRecordCreator.create(
           topicDescription.name(),
+          msg.getPartition(),
           msg.getKey().orElse(null),
           msg.getContent().orElse(null),
-          msg.getPartition()
+          msg.getHeaders()
       );
-      producerRecord = new ProducerRecord<>(
-          producerRecord.topic(),
-          producerRecord.partition(),
-          producerRecord.key(),
-          producerRecord.value(),
-          createHeaders(msg.getHeaders()));
-
       CompletableFuture<RecordMetadata> cf = new CompletableFuture<>();
       producer.send(producerRecord, (metadata, exception) -> {
         if (exception != null) {
@@ -132,32 +128,30 @@ private Mono<RecordMetadata> sendMessageImpl(KafkaCluster cluster,
     }
   }
 
-  private Iterable<Header> createHeaders(@Nullable Map<String, String> clientHeaders) {
-    if (clientHeaders == null) {
-      return new RecordHeaders();
-    }
-    RecordHeaders headers = new RecordHeaders();
-    clientHeaders.forEach((k, v) -> headers.add(new RecordHeader(k, v.getBytes())));
-    return headers;
-  }
-
   public Flux<TopicMessageEventDTO> loadMessages(KafkaCluster cluster, String topic,
                                                  ConsumerPosition consumerPosition, String query,
                                                  MessageFilterTypeDTO filterQueryType,
-                                                 int limit) {
+                                                 int limit,
+                                                 @Nullable String keySerde,
+                                                 @Nullable String valueSerde) {
     return withExistingTopic(cluster, topic)
         .flux()
-        .flatMap(td -> loadMessagesImpl(cluster, topic, consumerPosition, query, filterQueryType, limit));
+        .flatMap(td -> loadMessagesImpl(cluster, topic, consumerPosition, query,
+            filterQueryType, limit, keySerde, valueSerde));
   }
 
-  private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster, String topic,
-                                                 ConsumerPosition consumerPosition, String query,
-                                                 MessageFilterTypeDTO filterQueryType,
-                                                 int limit) {
+  private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
+                                                      String topic,
+                                                      ConsumerPosition consumerPosition,
+                                                      String query,
+                                                      MessageFilterTypeDTO filterQueryType,
+                                                      int limit,
+                                                      @Nullable String keySerde,
+                                                      @Nullable String valueSerde) {
 
     java.util.function.Consumer<? super FluxSink<TopicMessageEventDTO>> emitter;
-    RecordSerDe recordDeserializer =
-        deserializationService.getRecordDeserializerForCluster(cluster);
+    ConsumerRecordDeserializer recordDeserializer =
+        deserializationService.deserializerFor(cluster, topic, keySerde, valueSerde);
     if (consumerPosition.getSeekDirection().equals(SeekDirectionDTO.FORWARD)) {
       emitter = new ForwardRecordEmitter(
           () -> consumerGroupService.createConsumer(cluster),
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 85f0d17fb1e..0556b3a0461 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -334,7 +334,7 @@ public Mono<List<String>> listConsumerGroups() {
         .map(lst -> lst.stream().map(ConsumerGroupListing::groupId).collect(toList()));
   }
 
-  public Mono<Map<String, ConsumerGroupDescription>> describeConsumerGroups(List<String> groupIds) {
+  public Mono<Map<String, ConsumerGroupDescription>> describeConsumerGroups(Collection<String> groupIds) {
     return toMono(client.describeConsumerGroups(groupIds).all());
   }
 
@@ -372,6 +372,7 @@ public Mono<Map<TopicPartition, Long>> listOffsets(String topic,
 
   public Mono<Map<TopicPartition, Long>> listOffsets(Collection<TopicPartition> partitions,
                                                      OffsetSpec offsetSpec) {
+    //TODO: need to split this into multiple calls if number of target partitions is big
     return toMono(
         client.listOffsets(partitions.stream().collect(toMap(tp -> tp, tp -> offsetSpec))).all())
         .map(offsets -> offsets.entrySet()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 46ecedd0b3d..91e5ebd2e65 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -20,9 +20,7 @@
 import com.provectus.kafka.ui.model.ReplicationFactorChangeDTO;
 import com.provectus.kafka.ui.model.ReplicationFactorChangeResponseDTO;
 import com.provectus.kafka.ui.model.TopicCreationDTO;
-import com.provectus.kafka.ui.model.TopicMessageSchemaDTO;
 import com.provectus.kafka.ui.model.TopicUpdateDTO;
-import com.provectus.kafka.ui.serde.DeserializationService;
 import com.provectus.kafka.ui.util.JmxClusterUtil;
 import java.time.Duration;
 import java.util.Collection;
@@ -423,15 +421,6 @@ public Mono<Void> deleteTopic(KafkaCluster cluster, String topicName) {
     }
   }
 
-  public TopicMessageSchemaDTO getTopicSchema(KafkaCluster cluster, String topicName) {
-    if (!metricsCache.get(cluster).getTopicDescriptions().containsKey(topicName)) {
-      throw new TopicNotFoundException();
-    }
-    return deserializationService
-        .getRecordDeserializerForCluster(cluster)
-        .getTopicSchema(topicName);
-  }
-
   public Mono<InternalTopic> cloneTopic(
       KafkaCluster cluster, String topicName, String newTopicName) {
     return loadTopic(cluster, topicName).flatMap(topic ->
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java
deleted file mode 100644
index 2e77366de14..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import com.provectus.kafka.ui.model.MessageFormatDTO;
-import com.provectus.kafka.ui.model.ServerStatusDTO;
-import com.provectus.kafka.ui.model.TopicMessageDTO;
-import com.provectus.kafka.ui.serde.RecordSerDe;
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.util.HashMap;
-import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.record.TimestampType;
-import org.apache.kafka.common.utils.Bytes;
-
-
-@Slf4j
-public class ClusterUtil {
-
-  private ClusterUtil() {
-  }
-
-  private static final ZoneId UTC_ZONE_ID = ZoneId.of("UTC");
-
-  public static TopicMessageDTO mapToTopicMessage(ConsumerRecord<Bytes, Bytes> consumerRecord,
-                                                  RecordSerDe recordDeserializer) {
-
-    Map<String, String> headers = new HashMap<>();
-    consumerRecord.headers().iterator()
-        .forEachRemaining(header ->
-            headers.put(
-                header.key(),
-                header.value() != null ? new String(header.value()) : null
-            )
-    );
-
-    TopicMessageDTO topicMessage = new TopicMessageDTO();
-
-    OffsetDateTime timestamp =
-        OffsetDateTime.ofInstant(Instant.ofEpochMilli(consumerRecord.timestamp()), UTC_ZONE_ID);
-    TopicMessageDTO.TimestampTypeEnum timestampType =
-        mapToTimestampType(consumerRecord.timestampType());
-    topicMessage.setPartition(consumerRecord.partition());
-    topicMessage.setOffset(consumerRecord.offset());
-    topicMessage.setTimestamp(timestamp);
-    topicMessage.setTimestampType(timestampType);
-
-    topicMessage.setHeaders(headers);
-    var parsed = recordDeserializer.deserialize(consumerRecord);
-    topicMessage.setKey(parsed.getKey());
-    topicMessage.setContent(parsed.getValue());
-    topicMessage.setKeyFormat(parsed.getKeyFormat() != null
-        ? MessageFormatDTO.valueOf(parsed.getKeyFormat().name())
-        : null);
-    topicMessage.setValueFormat(parsed.getValueFormat() != null
-        ? MessageFormatDTO.valueOf(parsed.getValueFormat().name())
-        : null);
-    topicMessage.setKeySize(ConsumerRecordUtil.getKeySize(consumerRecord));
-    topicMessage.setValueSize(ConsumerRecordUtil.getValueSize(consumerRecord));
-    topicMessage.setKeySchemaId(parsed.getKeySchemaId());
-    topicMessage.setValueSchemaId(parsed.getValueSchemaId());
-    topicMessage.setHeadersSize(ConsumerRecordUtil.getHeadersSize(consumerRecord));
-
-    return topicMessage;
-  }
-
-  private static TopicMessageDTO.TimestampTypeEnum mapToTimestampType(TimestampType timestampType) {
-    switch (timestampType) {
-      case CREATE_TIME:
-        return TopicMessageDTO.TimestampTypeEnum.CREATE_TIME;
-      case LOG_APPEND_TIME:
-        return TopicMessageDTO.TimestampTypeEnum.LOG_APPEND_TIME;
-      case NO_TIMESTAMP_TYPE:
-        return TopicMessageDTO.TimestampTypeEnum.NO_TIMESTAMP_TYPE;
-      default:
-        throw new IllegalArgumentException("Unknown timestampType: " + timestampType);
-    }
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordUtil.java
deleted file mode 100644
index a6716599891..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordUtil.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import java.util.Arrays;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.header.Header;
-import org.apache.kafka.common.header.Headers;
-import org.apache.kafka.common.utils.Bytes;
-
-public class ConsumerRecordUtil {
-
-  private ConsumerRecordUtil() {
-  }
-
-  public static Long getHeadersSize(ConsumerRecord<Bytes, Bytes> consumerRecord) {
-    Headers headers = consumerRecord.headers();
-    if (headers != null) {
-      return Arrays.stream(consumerRecord.headers().toArray())
-          .mapToLong(ConsumerRecordUtil::headerSize)
-          .sum();
-    }
-    return 0L;
-  }
-
-  public static Long getKeySize(ConsumerRecord<Bytes, Bytes> consumerRecord) {
-    return consumerRecord.key() != null ? (long) consumerRecord.key().get().length : null;
-  }
-
-  public static Long getValueSize(ConsumerRecord<Bytes, Bytes> consumerRecord) {
-    return consumerRecord.value() != null ? (long) consumerRecord.value().get().length : null;
-  }
-
-  private static int headerSize(Header header) {
-    int key = header.key() != null ? header.key().getBytes().length : 0;
-    int val = header.value() != null ? header.value().length : 0;
-    return key + val;
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java
index 9cdf28128a5..27fbda1e9de 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java
@@ -114,7 +114,9 @@ private Flux<TopicMessageEventDTO> createTailingFlux(
             new ConsumerPosition(SeekTypeDTO.LATEST, Map.of(), SeekDirectionDTO.TAILING),
             query,
             MessageFilterTypeDTO.STRING_CONTAINS,
-            0);
+            0,
+            "String",
+            "String");
   }
 
   private List<TopicMessageEventDTO> startTailing(String filterQuery) {
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/ProtobufFileRecordSerDeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/ProtobufFileRecordSerDeTest.java
deleted file mode 100644
index ce74b25c201..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/ProtobufFileRecordSerDeTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.provectus.kafka.ui.serde;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.google.protobuf.DynamicMessage;
-import com.google.protobuf.util.JsonFormat;
-import com.provectus.kafka.ui.serde.schemaregistry.MessageFormat;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.Map;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.utils.Bytes;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-class ProtobufFileRecordSerDeTest {
-
-  // Sample message of type `test.Person`
-  private static byte[] personMessage;
-  // Sample message of type `test.AddressBook`
-  private static byte[] addressBookMessage;
-  private static Path protobufSchemaPath;
-
-  @BeforeAll
-  static void setUp() throws URISyntaxException, IOException {
-    protobufSchemaPath = Paths.get(ProtobufFileRecordSerDeTest.class.getClassLoader()
-        .getResource("address-book.proto").toURI());
-    ProtobufSchema protobufSchema = new ProtobufSchema(Files.readString(protobufSchemaPath));
-
-    DynamicMessage.Builder builder = protobufSchema.newMessageBuilder("test.Person");
-    JsonFormat.parser().merge(
-        "{ \"name\": \"My Name\",\"id\": 101, \"email\": \"user1@example.com\" }", builder);
-    personMessage = builder.build().toByteArray();
-
-    builder = protobufSchema.newMessageBuilder("test.AddressBook");
-    JsonFormat.parser().merge(
-        "{\"version\": 1, \"people\": ["
-            + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"user2@example.com\" }]}", builder);
-    addressBookMessage = builder.build().toByteArray();
-  }
-
-  @Test
-  void testDeserialize() throws IOException {
-    var messageNameMap = Map.of(
-        "topic1", "test.Person",
-        "topic2", "test.AddressBook");
-    var keyMessageNameMap = Map.of(
-        "topic2", "test.Person");
-    var deserializer =
-        new ProtobufFileRecordSerDe(protobufSchemaPath, messageNameMap, keyMessageNameMap, null, null);
-    var msg1 = deserializer
-        .deserialize(new ConsumerRecord<>("topic1", 1, 0, Bytes.wrap("key".getBytes()),
-            Bytes.wrap(personMessage)));
-    assertEquals(MessageFormat.PROTOBUF, msg1.getValueFormat());
-    assertTrue(msg1.getValue().contains("user1@example.com"));
-
-    var msg2 = deserializer
-        .deserialize(new ConsumerRecord<>("topic2", 1, 1, Bytes.wrap(personMessage),
-            Bytes.wrap(addressBookMessage)));
-    assertEquals(MessageFormat.PROTOBUF, msg2.getKeyFormat());
-    assertTrue(msg2.getKey().contains("user1@example.com"));
-    assertTrue(msg2.getValue().contains("user2@example.com"));
-  }
-
-  @Test
-  void testNoDefaultMessageName() throws IOException {
-    // by default the first message type defined in proto definition is used
-    var deserializer =
-        new ProtobufFileRecordSerDe(protobufSchemaPath, Collections.emptyMap(), null, null, null);
-    var msg = deserializer
-        .deserialize(new ConsumerRecord<>("topic", 1, 0, Bytes.wrap("key".getBytes()),
-            Bytes.wrap(personMessage)));
-    assertTrue(msg.getValue().contains("user1@example.com"));
-  }
-
-  @Test
-  void testDefaultMessageName() throws IOException {
-    var messageNameMap = Map.of("topic1", "test.Person");
-    var deserializer =
-        new ProtobufFileRecordSerDe(protobufSchemaPath, messageNameMap, null, "test.AddressBook", null);
-    var msg = deserializer
-        .deserialize(new ConsumerRecord<>("a_random_topic", 1, 0, Bytes.wrap(addressBookMessage),
-            Bytes.wrap(addressBookMessage)));
-    assertTrue(msg.getValue().contains("user2@example.com"));
-  }
-
-  @Test
-  void testDefaultKeyMessageName() throws IOException {
-    var messageNameMap = Map.of("topic1", "test.Person");
-    var deserializer =
-        new ProtobufFileRecordSerDe(protobufSchemaPath, messageNameMap, messageNameMap, "test.AddressBook",
-            "test.AddressBook");
-    var msg = deserializer
-        .deserialize(new ConsumerRecord<>("a_random_topic", 1, 0, Bytes.wrap(addressBookMessage),
-            Bytes.wrap(addressBookMessage)));
-    assertTrue(msg.getKey().contains("user2@example.com"));
-  }
-
-  @Test
-  void testSerialize() throws IOException {
-    var messageNameMap = Map.of("topic1", "test.Person");
-    var serializer =
-        new ProtobufFileRecordSerDe(protobufSchemaPath, messageNameMap, null, "test.AddressBook", null);
-    var serialized = serializer.serialize("topic1", "key1", "{\"name\":\"MyName\"}", 0);
-    assertNotNull(serialized.value());
-  }
-
-  @Test
-  void testSerializeKeyAndValue() throws IOException {
-    var messageNameMap = Map.of("topic1", "test.Person");
-    var serializer =
-        new ProtobufFileRecordSerDe(protobufSchemaPath, messageNameMap, messageNameMap, "test.AddressBook",
-                "test.AddressBook");
-    var serialized = serializer.serialize("topic1", "{\"name\":\"MyName\"}", "{\"name\":\"MyName\"}", 0);
-    assertNotNull(serialized.key());
-    assertNotNull(serialized.value());
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/SimpleRecordSerDeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/SimpleRecordSerDeTest.java
deleted file mode 100644
index 7f9fd66525a..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/SimpleRecordSerDeTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.provectus.kafka.ui.serde;
-
-import static com.provectus.kafka.ui.serde.RecordSerDe.DeserializedKeyValue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.provectus.kafka.ui.serde.schemaregistry.MessageFormat;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.utils.Bytes;
-import org.junit.jupiter.api.Test;
-
-class SimpleRecordSerDeTest {
-
-  private final SimpleRecordSerDe serde = new SimpleRecordSerDe();
-
-  @Test
-  public void shouldDeserializeStringValue() {
-    var value = "test";
-    var deserializedRecord = serde.deserialize(
-        new ConsumerRecord<>("topic", 1, 0, Bytes.wrap("key".getBytes()),
-            Bytes.wrap(value.getBytes())));
-    DeserializedKeyValue expected = DeserializedKeyValue.builder()
-        .key("key")
-        .keyFormat(MessageFormat.UNKNOWN)
-        .value(value)
-        .valueFormat(MessageFormat.UNKNOWN)
-        .build();
-    assertEquals(expected, deserializedRecord);
-  }
-
-  @Test
-  public void shouldDeserializeNullValueRecordToEmptyMap() {
-    var deserializedRecord = serde
-        .deserialize(new ConsumerRecord<>("topic", 1, 0, Bytes.wrap("key".getBytes()), null));
-    DeserializedKeyValue expected = DeserializedKeyValue.builder()
-        .key("key")
-        .keyFormat(MessageFormat.UNKNOWN)
-        .build();
-    assertEquals(expected, deserializedRecord);
-  }
-}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDeTest.java
deleted file mode 100644
index 65929e6be2b..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDeTest.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.provectus.kafka.ui.serde.schemaregistry;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.provectus.kafka.ui.model.KafkaCluster;
-import io.confluent.kafka.schemaregistry.avro.AvroSchema;
-import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import org.apache.avro.generic.GenericDatumWriter;
-import org.apache.avro.io.Encoder;
-import org.apache.avro.io.EncoderFactory;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.utils.Bytes;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-class SchemaRegistryAwareRecordSerDeTest {
-
-  private final SchemaRegistryClient registryClient = mock(SchemaRegistryClient.class);
-
-  private final SchemaRegistryAwareRecordSerDe serde = new SchemaRegistryAwareRecordSerDe(
-      KafkaCluster.builder().build(),
-      registryClient
-  );
-
-  @Nested
-  class Deserialize {
-
-    @Test
-    void callsSchemaFormatterWhenValueHasMagicByteAndValidSchemaId() throws Exception {
-      AvroSchema schema = new AvroSchema(
-          "{"
-              + "  \"type\": \"record\","
-              + "  \"name\": \"TestAvroRecord1\","
-              + "  \"fields\": ["
-              + "    {"
-              + "      \"name\": \"field1\","
-              + "      \"type\": \"string\""
-              + "    },"
-              + "    {"
-              + "      \"name\": \"field2\","
-              + "      \"type\": \"int\""
-              + "    }"
-              + "  ]"
-              + "}"
-      );
-
-      String jsonValueForSchema = "{ \"field1\":\"testStr\", \"field2\": 123 }";
-
-      int schemaId = 1234;
-      when(registryClient.getSchemaById(schemaId)).thenReturn(schema);
-      when(registryClient.getSchemaBySubjectAndId(null, schemaId)).thenReturn(schema);
-
-      var result = serde.deserialize(
-          new ConsumerRecord<>(
-              "test-topic",
-              1,
-              100,
-              Bytes.wrap("key".getBytes()),
-              bytesWithMagicByteAndSchemaId(schemaId, jsonToAvro(jsonValueForSchema, schema))
-          )
-      );
-
-      // called once by serde code
-      verify(registryClient, times(1)).getSchemaById(schemaId);
-      //called once by formatter (will be cached)
-      verify(registryClient, times(1)).getSchemaBySubjectAndId(null, schemaId);
-
-      assertThat(result.getKeySchemaId()).isNull();
-      assertThat(result.getKeyFormat()).isEqualTo(MessageFormat.UNKNOWN);
-      assertThat(result.getKey()).isEqualTo("key");
-
-      assertThat(result.getValueSchemaId()).isEqualTo(schemaId + "");
-      assertThat(result.getValueFormat()).isEqualTo(MessageFormat.AVRO);
-      assertJsonsEqual(jsonValueForSchema, result.getValue());
-    }
-
-    @Test
-    void fallsBackToStringFormatterIfValueContainsMagicByteButSchemaNotFound() throws Exception {
-      int nonExistingSchemaId = 12341234;
-      when(registryClient.getSchemaById(nonExistingSchemaId))
-          .thenThrow(new RestClientException("not fount", 404, 404));
-
-      Bytes value = bytesWithMagicByteAndSchemaId(nonExistingSchemaId, "somedata".getBytes());
-      var result = serde.deserialize(
-          new ConsumerRecord<>(
-              "test-topic",
-              1,
-              100,
-              Bytes.wrap("key".getBytes()),
-              value
-          )
-      );
-
-      // called to get schema by id - will throw not found
-      verify(registryClient, times(1)).getSchemaById(nonExistingSchemaId);
-
-      assertThat(result.getKeySchemaId()).isNull();
-      assertThat(result.getKeyFormat()).isEqualTo(MessageFormat.UNKNOWN);
-      assertThat(result.getKey()).isEqualTo("key");
-
-      assertThat(result.getValueSchemaId()).isNull();
-      assertThat(result.getValueFormat()).isEqualTo(MessageFormat.UNKNOWN);
-      assertThat(result.getValue()).isEqualTo(new String(value.get()));
-    }
-
-    @Test
-    void fallsBackToStringFormatterIfMagicByteAndSchemaIdFoundButFormatterFailed() throws Exception {
-      int schemaId = 1234;
-
-      final var schema = new AvroSchema("{ \"type\": \"string\" }");
-
-      when(registryClient.getSchemaById(schemaId))
-          .thenReturn(schema);
-      when(registryClient.getSchemaBySubjectAndId(null, schemaId)).thenReturn(schema);
-
-      // will cause exception in avro deserializer
-      Bytes nonAvroValue = bytesWithMagicByteAndSchemaId(schemaId, "123".getBytes());
-      var result = serde.deserialize(
-          new ConsumerRecord<>(
-              "test-topic",
-              1,
-              100,
-              Bytes.wrap("key".getBytes()),
-              nonAvroValue
-          )
-      );
-
-      // called once by serde code
-      verify(registryClient, times(1)).getSchemaById(schemaId);
-      //called once by formatter (will be cached)
-      verify(registryClient, times(1)).getSchemaBySubjectAndId(null, schemaId);
-
-      assertThat(result.getKeySchemaId()).isNull();
-      assertThat(result.getKeyFormat()).isEqualTo(MessageFormat.UNKNOWN);
-      assertThat(result.getKey()).isEqualTo("key");
-
-      assertThat(result.getValueSchemaId()).isNull();
-      assertThat(result.getValueFormat()).isEqualTo(MessageFormat.UNKNOWN);
-      assertThat(result.getValue()).isEqualTo(new String(nonAvroValue.get()));
-    }
-
-    @Test
-    void useStringFormatterWithoutRegistryManipulationIfMagicByteNotSet() {
-      var result = serde.deserialize(
-          new ConsumerRecord<>(
-              "test-topic",
-              1,
-              100,
-              Bytes.wrap("key".getBytes()),
-              Bytes.wrap("val".getBytes())
-          )
-      );
-
-      verifyZeroInteractions(registryClient);
-
-      assertThat(result.getKeySchemaId()).isNull();
-      assertThat(result.getKeyFormat()).isEqualTo(MessageFormat.UNKNOWN);
-      assertThat(result.getKey()).isEqualTo("key");
-
-      assertThat(result.getValueSchemaId()).isNull();
-      assertThat(result.getValueFormat()).isEqualTo(MessageFormat.UNKNOWN);
-      assertThat(result.getValue()).isEqualTo("val");
-    }
-
-    private void assertJsonsEqual(String expected, String actual) throws JsonProcessingException {
-      var mapper = new JsonMapper();
-      assertThat(mapper.readTree(actual)).isEqualTo(mapper.readTree(expected));
-    }
-
-    private Bytes bytesWithMagicByteAndSchemaId(int schemaId, byte[] body) {
-      return new Bytes(
-          ByteBuffer.allocate(1 + 4 + body.length)
-              .put((byte) 0)
-              .putInt(schemaId)
-              .put(body)
-              .array()
-      );
-    }
-
-    private byte[] jsonToAvro(String json, AvroSchema schema) throws IOException {
-      GenericDatumWriter<Object> writer = new GenericDatumWriter<>(schema.rawSchema());
-      ByteArrayOutputStream output = new ByteArrayOutputStream();
-      Encoder encoder = EncoderFactory.get().binaryEncoder(output, null);
-      writer.write(AvroSchemaUtils.toObject(json, schema), encoder);
-      encoder.flush();
-      return output.toByteArray();
-    }
-  }
-
-
-}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/PropertyResolverImplTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/PropertyResolverImplTest.java
new file mode 100644
index 00000000000..11f5ea0bb10
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/PropertyResolverImplTest.java
@@ -0,0 +1,156 @@
+package com.provectus.kafka.ui.serdes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+
+import java.util.List;
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.context.properties.bind.BindException;
+import org.springframework.mock.env.MockEnvironment;
+
+class PropertyResolverImplTest {
+
+  private static final String TEST_STRING_VALUE = "testStr";
+  private static final int TEST_INT_VALUE = 123;
+  private static final List<String> TEST_STRING_LIST = List.of("v1", "v2", "v3");
+  private static final List<Integer> TEST_INT_LIST = List.of(1, 2, 3);
+
+  private final MockEnvironment env = new MockEnvironment();
+
+  @Data
+  @AllArgsConstructor
+  public static class CustomPropertiesClass {
+    private String f1;
+    private Integer f2;
+  }
+
+  @Test
+  void returnsEmptyOptionalWhenPropertyNotExist() {
+    var resolver = new PropertyResolverImpl(env);
+    assertThat(resolver.getProperty("nonExistingProp", String.class)).isEmpty();
+    assertThat(resolver.getListProperty("nonExistingProp", String.class)).isEmpty();
+    assertThat(resolver.getMapProperty("nonExistingProp", String.class, String.class)).isEmpty();
+  }
+
+  @Test
+  void throwsExceptionWhenPropertyCantBeResolverToRequstedClass() {
+    env.setProperty("prop.0.strProp", "testStr");
+    env.setProperty("prop.0.strLst", "v1,v2,v3");
+    env.setProperty("prop.0.strMap.k1", "v1");
+
+    var resolver = new PropertyResolverImpl(env);
+    assertThatCode(() -> resolver.getProperty("prop.0.strProp", Integer.class))
+        .isInstanceOf(BindException.class);
+    assertThatCode(() -> resolver.getListProperty("prop.0.strLst", Integer.class))
+        .isInstanceOf(BindException.class);
+    assertThatCode(() -> resolver.getMapProperty("prop.0.strMap", Integer.class, String.class))
+        .isInstanceOf(BindException.class);
+  }
+
+  @Test
+  void resolvedSingleValueProperties() {
+    env.setProperty("prop.0.strProp", "testStr");
+    env.setProperty("prop.0.intProp", "123");
+
+    var resolver = new PropertyResolverImpl(env);
+    assertThat(resolver.getProperty("prop.0.strProp", String.class))
+        .hasValue("testStr");
+    assertThat(resolver.getProperty("prop.0.intProp", Integer.class))
+        .hasValue(123);
+  }
+
+  @Test
+  void resolvesListProperties() {
+    env.setProperty("prop.0.strLst", "v1,v2,v3");
+    env.setProperty("prop.0.intLst", "1,2,3");
+
+    var resolver = new PropertyResolverImpl(env);
+    assertThat(resolver.getListProperty("prop.0.strLst", String.class))
+        .hasValue(List.of("v1", "v2", "v3"));
+    assertThat(resolver.getListProperty("prop.0.intLst", Integer.class))
+        .hasValue(List.of(1, 2, 3));
+  }
+
+  @Test
+  void resolvesCustomConfigClassProperties() {
+    env.setProperty("prop.0.custProps.f1", "f1val");
+    env.setProperty("prop.0.custProps.f2", "1234");
+
+    var resolver = new PropertyResolverImpl(env);
+    assertThat(resolver.getProperty("prop.0.custProps", CustomPropertiesClass.class))
+        .hasValue(new CustomPropertiesClass("f1val", 1234));
+  }
+
+  @Test
+  void resolvesMapProperties() {
+    env.setProperty("prop.0.strMap.k1", "v1");
+    env.setProperty("prop.0.strMap.k2", "v2");
+    env.setProperty("prop.0.intToLongMap.100", "111");
+    env.setProperty("prop.0.intToLongMap.200", "222");
+
+    var resolver = new PropertyResolverImpl(env);
+    assertThat(resolver.getMapProperty("prop.0.strMap", String.class, String.class))
+        .hasValue(Map.of("k1", "v1", "k2", "v2"));
+    assertThat(resolver.getMapProperty("prop.0.intToLongMap", Integer.class, Long.class))
+        .hasValue(Map.of(100, 111L, 200, 222L));
+  }
+
+
+  @Nested
+  class WithPrefix {
+
+    @Test
+    void resolvedSingleValueProperties() {
+      env.setProperty("prop.0.strProp", "testStr");
+      env.setProperty("prop.0.intProp", "123");
+
+      var resolver = new PropertyResolverImpl(env, "prop.0");
+      assertThat(resolver.getProperty("strProp", String.class))
+          .hasValue(TEST_STRING_VALUE);
+
+      assertThat(resolver.getProperty("intProp", Integer.class))
+          .hasValue(TEST_INT_VALUE);
+    }
+
+    @Test
+    void resolvesListProperties() {
+      env.setProperty("prop.0.strLst", "v1,v2,v3");
+      env.setProperty("prop.0.intLst", "1,2,3");
+
+      var resolver = new PropertyResolverImpl(env, "prop.0");
+      assertThat(resolver.getListProperty("strLst", String.class))
+          .hasValue(TEST_STRING_LIST);
+      assertThat(resolver.getListProperty("intLst", Integer.class))
+          .hasValue(TEST_INT_LIST);
+    }
+
+    @Test
+    void resolvesCustomConfigClassProperties() {
+      env.setProperty("prop.0.custProps.f1", "f1val");
+      env.setProperty("prop.0.custProps.f2", "1234");
+
+      var  resolver = new PropertyResolverImpl(env, "prop.0");
+      assertThat(resolver.getProperty("custProps", CustomPropertiesClass.class))
+          .hasValue(new CustomPropertiesClass("f1val", 1234));
+    }
+
+    @Test
+    void resolvesMapProperties() {
+      env.setProperty("prop.0.strMap.k1", "v1");
+      env.setProperty("prop.0.strMap.k2", "v2");
+      env.setProperty("prop.0.intToLongMap.100", "111");
+      env.setProperty("prop.0.intToLongMap.200", "222");
+
+      var resolver = new PropertyResolverImpl(env, "prop.0.");
+      assertThat(resolver.getMapProperty("strMap", String.class, String.class))
+          .hasValue(Map.of("k1", "v1", "k2", "v2"));
+      assertThat(resolver.getMapProperty("intToLongMap", Integer.class, Long.class))
+          .hasValue(Map.of(100, 111L, 200, 222L));
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Base64SerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Base64SerdeTest.java
new file mode 100644
index 00000000000..51816e49802
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Base64SerdeTest.java
@@ -0,0 +1,66 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
+import com.provectus.kafka.ui.serdes.RecordHeadersImpl;
+import java.util.Base64;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+class Base64SerdeTest {
+
+  private static final byte[] TEST_BYTES = "some bytes go here".getBytes();
+  private static final String TEST_BYTES_BASE64_ENCODED = Base64.getEncoder().encodeToString(TEST_BYTES);
+
+  private Serde base64Serde;
+
+  @BeforeEach
+  void init() {
+    base64Serde = new Base64Serde();
+    base64Serde.configure(
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty()
+    );
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void serializesInputAsBase64String(Serde.Target type) {
+    var serializer = base64Serde.serializer("anyTopic", type);
+    byte[] bytes = serializer.serialize(TEST_BYTES_BASE64_ENCODED);
+    assertThat(bytes).isEqualTo(TEST_BYTES);
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void deserializesDataAsBase64Bytes(Serde.Target type) {
+    var deserializer = base64Serde.deserializer("anyTopic", type);
+    var result = deserializer.deserialize(new RecordHeadersImpl(), TEST_BYTES);
+    assertThat(result.getResult()).isEqualTo(TEST_BYTES_BASE64_ENCODED);
+    assertThat(result.getType()).isEqualTo(DeserializeResult.Type.STRING);
+    assertThat(result.getAdditionalProperties()).isEmpty();
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void getSchemaReturnsEmpty(Serde.Target type) {
+    assertThat(base64Serde.getSchema("anyTopic", type)).isEmpty();
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void canDeserializeReturnsTrueForAllInputs(Serde.Target type) {
+    assertThat(base64Serde.canDeserialize("anyTopic", type)).isTrue();
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void canSerializeReturnsTrueForAllInput(Serde.Target type) {
+    assertThat(base64Serde.canSerialize("anyTopic", type)).isTrue();
+  }
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Int32SerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Int32SerdeTest.java
new file mode 100644
index 00000000000..c6384becf8a
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Int32SerdeTest.java
@@ -0,0 +1,46 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.common.primitives.Ints;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
+import com.provectus.kafka.ui.serdes.RecordHeadersImpl;
+import org.apache.kafka.common.header.internals.RecordHeaders;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+class Int32SerdeTest {
+
+  private Int32Serde serde;
+
+  @BeforeEach
+  void init() {
+    serde = new Int32Serde();
+    serde.configure(
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty()
+    );
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void serializeUses4BytesIntRepresentation(Serde.Target type) {
+    var serializer = serde.serializer("anyTopic", type);
+    byte[] bytes = serializer.serialize("1234");
+    assertThat(bytes).isEqualTo(Ints.toByteArray(1234));
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void deserializeUses4BytesIntRepresentation(Serde.Target type) {
+    var deserializer = serde.deserializer("anyTopic", type);
+    var result = deserializer.deserialize(new RecordHeadersImpl(), Ints.toByteArray(1234));
+    assertThat(result.getResult()).isEqualTo("1234");
+    assertThat(result.getType()).isEqualTo(DeserializeResult.Type.JSON);
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Int64SerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Int64SerdeTest.java
new file mode 100644
index 00000000000..16fc211f798
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/Int64SerdeTest.java
@@ -0,0 +1,47 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.common.primitives.Longs;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
+import com.provectus.kafka.ui.serdes.RecordHeadersImpl;
+import org.apache.kafka.common.header.internals.RecordHeaders;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+
+class Int64SerdeTest {
+
+  private Int64Serde serde;
+
+  @BeforeEach
+  void init() {
+    serde = new Int64Serde();
+    serde.configure(
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty()
+    );
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void serializeUses8BytesLongRepresentation(Serde.Target type) {
+    var serializer = serde.serializer("anyTopic", type);
+    byte[] bytes = serializer.serialize("1234");
+    assertThat(bytes).isEqualTo(Longs.toByteArray(1234));
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void deserializeUses8BytesLongRepresentation(Serde.Target type) {
+    var deserializer = serde.deserializer("anyTopic", type);
+    var result = deserializer.deserialize(new RecordHeadersImpl(), Longs.toByteArray(1234));
+    assertThat(result.getResult()).isEqualTo("1234");
+    assertThat(result.getType()).isEqualTo(DeserializeResult.Type.JSON);
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
new file mode 100644
index 00000000000..062839a6c0a
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
@@ -0,0 +1,152 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.util.JsonFormat;
+import com.provectus.kafka.ui.serde.api.Serde;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Map;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+class ProtobufFileSerdeTest {
+
+  private static final String samplePersonMsgJson =
+      "{ \"name\": \"My Name\",\"id\": 101, \"email\": \"user1@example.com\", \"phones\":[] }";
+
+  private static final String sampleBookMsgJson = "{\"version\": 1, \"people\": ["
+      + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"addrBook@example.com\", \"phones\":[]}]}";
+
+  // Sample message of type `test.Person`
+  private static byte[] personMessageBytes;
+  // Sample message of type `test.AddressBook`
+  private static byte[] addressBookMessageBytes;
+  private static Path protobufSchemaPath;
+  private static ProtobufSchema protobufSchema;
+
+  @BeforeAll
+  static void setUp() throws Exception {
+    protobufSchemaPath = Paths.get(ProtobufFileSerdeTest.class.getClassLoader()
+        .getResource("address-book.proto").toURI());
+    protobufSchema = new ProtobufSchema(Files.readString(protobufSchemaPath));
+
+    DynamicMessage.Builder builder = protobufSchema.newMessageBuilder("test.Person");
+    JsonFormat.parser().merge(samplePersonMsgJson, builder);
+    personMessageBytes = builder.build().toByteArray();
+
+    builder = protobufSchema.newMessageBuilder("test.AddressBook");
+    JsonFormat.parser().merge(sampleBookMsgJson, builder);
+    addressBookMessageBytes = builder.build().toByteArray();
+  }
+
+
+  @Test
+  void testDeserialize() {
+    var messageNameMap = Map.of(
+        "persons", protobufSchema.toDescriptor("test.Person"),
+        "books", protobufSchema.toDescriptor("test.AddressBook")
+    );
+    var keyMessageNameMap = Map.of(
+        "books", protobufSchema.toDescriptor("test.AddressBook"));
+
+    var serde = new ProtobufFileSerde();
+    serde.configure(
+        protobufSchemaPath,
+        null,
+        null,
+        messageNameMap,
+        keyMessageNameMap
+    );
+
+    var deserializedPerson = serde.deserializer("persons", Serde.Target.VALUE)
+        .deserialize(null, personMessageBytes);
+    assertJsonEquals(samplePersonMsgJson, deserializedPerson.getResult());
+
+    var deserializedBook = serde.deserializer("books", Serde.Target.KEY)
+        .deserialize(null, addressBookMessageBytes);
+    assertJsonEquals(sampleBookMsgJson, deserializedBook.getResult());
+  }
+
+  @Test
+  void testDefaultMessageName() {
+    var serde = new ProtobufFileSerde();
+    serde.configure(
+        protobufSchemaPath,
+        protobufSchema.toDescriptor("test.Person"),
+        protobufSchema.toDescriptor("test.AddressBook"),
+        Map.of(),
+        Map.of()
+    );
+
+    var deserializedPerson = serde.deserializer("persons", Serde.Target.VALUE)
+        .deserialize(null, personMessageBytes);
+    assertJsonEquals(samplePersonMsgJson, deserializedPerson.getResult());
+
+    var deserializedBook = serde.deserializer("books", Serde.Target.KEY)
+        .deserialize(null, addressBookMessageBytes);
+    assertJsonEquals(sampleBookMsgJson, deserializedBook.getResult());
+  }
+
+
+  @Test
+  void testSerialize() {
+    var messageNameMap = Map.of(
+        "persons", protobufSchema.toDescriptor("test.Person"),
+        "books", protobufSchema.toDescriptor("test.AddressBook")
+    );
+    var keyMessageNameMap = Map.of(
+        "books", protobufSchema.toDescriptor("test.AddressBook"));
+
+    var serde = new ProtobufFileSerde();
+    serde.configure(
+        protobufSchemaPath,
+        null,
+        null,
+        messageNameMap,
+        keyMessageNameMap
+    );
+
+    var personBytes = serde.serializer("persons", Serde.Target.VALUE)
+        .serialize("{ \"name\": \"My Name\",\"id\": 101, \"email\": \"user1@example.com\" }");
+    assertThat(personBytes).isEqualTo(personMessageBytes);
+
+    var booksBytes = serde.serializer("books", Serde.Target.KEY)
+        .serialize("{\"version\": 1, \"people\": ["
+            + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"addrBook@example.com\" }]}");
+    assertThat(booksBytes).isEqualTo(addressBookMessageBytes);
+  }
+
+  @Test
+  void testSerializeDefaults() {
+    var serde = new ProtobufFileSerde();
+    serde.configure(
+        protobufSchemaPath,
+        protobufSchema.toDescriptor("test.Person"),
+        protobufSchema.toDescriptor("test.AddressBook"),
+        Map.of(),
+        Map.of()
+    );
+
+    var personBytes = serde.serializer("persons", Serde.Target.VALUE)
+        .serialize("{ \"name\": \"My Name\",\"id\": 101, \"email\": \"user1@example.com\" }");
+    assertThat(personBytes).isEqualTo(personMessageBytes);
+
+    var booksBytes = serde.serializer("books", Serde.Target.KEY)
+        .serialize("{\"version\": 1, \"people\": ["
+            + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"addrBook@example.com\" }]}");
+    assertThat(booksBytes).isEqualTo(addressBookMessageBytes);
+  }
+
+  @SneakyThrows
+  private void assertJsonEquals(String expectedJson, String actualJson) {
+    var mapper = new JsonMapper();
+    assertThat(mapper.readTree(actualJson)).isEqualTo(mapper.readTree(expectedJson));
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UInt32SerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UInt32SerdeTest.java
new file mode 100644
index 00000000000..13ad3ed5187
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UInt32SerdeTest.java
@@ -0,0 +1,59 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.UnsignedInteger;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
+import com.provectus.kafka.ui.serdes.RecordHeadersImpl;
+import org.apache.kafka.common.header.internals.RecordHeaders;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+class UInt32SerdeTest {
+
+  private UInt32Serde serde;
+
+  @BeforeEach
+  void init() {
+    serde = new UInt32Serde();
+    serde.configure(
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty()
+    );
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void serializeUses4BytesUInt32Representation(Serde.Target type) {
+    var serializer = serde.serializer("anyTopic", type);
+    String uint32String = UnsignedInteger.MAX_VALUE.toString();
+    byte[] bytes = serializer.serialize(uint32String);
+    assertThat(bytes).isEqualTo(Ints.toByteArray(UnsignedInteger.MAX_VALUE.intValue()));
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void serializeThrowsNfeIfNegativeValuePassed(Serde.Target type) {
+    var serializer = serde.serializer("anyTopic", type);
+    String negativeIntString = "-100";
+    assertThatThrownBy(() -> serializer.serialize(negativeIntString))
+        .isInstanceOf(NumberFormatException.class);
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void deserializeUses4BytesUInt32Representation(Serde.Target type) {
+    var deserializer = serde.deserializer("anyTopic", type);
+    byte[] uint32Bytes = Ints.toByteArray(UnsignedInteger.MAX_VALUE.intValue());
+    var result = deserializer.deserialize(new RecordHeadersImpl(), uint32Bytes);
+    assertThat(result.getResult()).isEqualTo(UnsignedInteger.MAX_VALUE.toString());
+    assertThat(result.getType()).isEqualTo(DeserializeResult.Type.JSON);
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UInt64SerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UInt64SerdeTest.java
new file mode 100644
index 00000000000..b155e57de97
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UInt64SerdeTest.java
@@ -0,0 +1,58 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.google.common.primitives.Longs;
+import com.google.common.primitives.UnsignedLong;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
+import com.provectus.kafka.ui.serdes.RecordHeadersImpl;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+class UInt64SerdeTest {
+
+  private UInt64Serde serde;
+
+  @BeforeEach
+  void init() {
+    serde = new UInt64Serde();
+    serde.configure(
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty()
+    );
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void serializeUses8BytesUInt64Representation(Serde.Target type) {
+    var serializer = serde.serializer("anyTopic", type);
+    String uint64String = UnsignedLong.MAX_VALUE.toString();
+    byte[] bytes = serializer.serialize(uint64String);
+    assertThat(bytes).isEqualTo(Longs.toByteArray(UnsignedLong.MAX_VALUE.longValue()));
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void serializeThrowsNfeIfNegativeValuePassed(Serde.Target type) {
+    var serializer = serde.serializer("anyTopic", type);
+    String negativeIntString = "-100";
+    assertThatThrownBy(() -> serializer.serialize(negativeIntString))
+        .isInstanceOf(NumberFormatException.class);
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void deserializeUses8BytesUIn64tRepresentation(Serde.Target type) {
+    var deserializer = serde.deserializer("anyTopic", type);
+    byte[] uint64Bytes = Longs.toByteArray(UnsignedLong.MAX_VALUE.longValue());
+    var result = deserializer.deserialize(new RecordHeadersImpl(), uint64Bytes);
+    assertThat(result.getResult()).isEqualTo(UnsignedLong.MAX_VALUE.toString());
+    assertThat(result.getType()).isEqualTo(DeserializeResult.Type.JSON);
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerdeTest.java
new file mode 100644
index 00000000000..5f387c4942c
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerdeTest.java
@@ -0,0 +1,101 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
+import com.provectus.kafka.ui.serdes.RecordHeadersImpl;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.springframework.mock.env.MockEnvironment;
+
+class UuidBinarySerdeTest {
+
+  @Nested
+  class MsbFirst {
+
+    private UuidBinarySerde serde;
+
+    @BeforeEach
+    void init() {
+      serde = new UuidBinarySerde();
+      serde.configure(
+          PropertyResolverImpl.empty(),
+          PropertyResolverImpl.empty(),
+          PropertyResolverImpl.empty()
+      );
+    }
+
+    @ParameterizedTest
+    @EnumSource
+    void serializerUses16bytesUuidBinaryRepresentation(Serde.Target type) {
+      var serializer = serde.serializer("anyTopic", type);
+      var uuid = UUID.randomUUID();
+      byte[] bytes = serializer.serialize(uuid.toString());
+      var bb = ByteBuffer.wrap(bytes);
+      assertThat(bb.getLong()).isEqualTo(uuid.getMostSignificantBits());
+      assertThat(bb.getLong()).isEqualTo(uuid.getLeastSignificantBits());
+    }
+
+    @ParameterizedTest
+    @EnumSource
+    void deserializerUses16bytesUuidBinaryRepresentation(Serde.Target type) {
+      var uuid = UUID.randomUUID();
+      var bb = ByteBuffer.allocate(16);
+      bb.putLong(uuid.getMostSignificantBits());
+      bb.putLong(uuid.getLeastSignificantBits());
+
+      var result = serde.deserializer("anyTopic", type).deserialize(new RecordHeadersImpl(), bb.array());
+      assertThat(result.getType()).isEqualTo(DeserializeResult.Type.STRING);
+      assertThat(result.getAdditionalProperties()).isEmpty();
+      assertThat(result.getResult()).isEqualTo(uuid.toString());
+    }
+  }
+
+  @Nested
+  class MsbLast {
+
+    private UuidBinarySerde serde;
+
+    @BeforeEach
+    void init() {
+      serde = new UuidBinarySerde();
+      serde.configure(
+          new PropertyResolverImpl(new MockEnvironment().withProperty("mostSignificantBitsFirst", "false")),
+          PropertyResolverImpl.empty(),
+          PropertyResolverImpl.empty()
+      );
+    }
+
+    @ParameterizedTest
+    @EnumSource
+    void serializerUses16bytesUuidBinaryRepresentation(Serde.Target type) {
+      var serializer = serde.serializer("anyTopic", type);
+      var uuid = UUID.randomUUID();
+      byte[] bytes = serializer.serialize(uuid.toString());
+      var bb = ByteBuffer.wrap(bytes);
+      assertThat(bb.getLong()).isEqualTo(uuid.getLeastSignificantBits());
+      assertThat(bb.getLong()).isEqualTo(uuid.getMostSignificantBits());
+    }
+
+    @ParameterizedTest
+    @EnumSource
+    void deserializerUses16bytesUuidBinaryRepresentation(Serde.Target type) {
+      var uuid = UUID.randomUUID();
+      var bb = ByteBuffer.allocate(16);
+      bb.putLong(uuid.getLeastSignificantBits());
+      bb.putLong(uuid.getMostSignificantBits());
+
+      var result = serde.deserializer("anyTopic", type).deserialize(new RecordHeadersImpl(), bb.array());
+      assertThat(result.getType()).isEqualTo(DeserializeResult.Type.STRING);
+      assertThat(result.getAdditionalProperties()).isEmpty();
+      assertThat(result.getResult()).isEqualTo(uuid.toString());
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
new file mode 100644
index 00000000000..7e4e0145e55
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
@@ -0,0 +1,157 @@
+package com.provectus.kafka.ui.serdes.builtin.sr;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serde.api.Serde;
+import io.confluent.kafka.schemaregistry.avro.AvroSchema;
+import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
+import io.confluent.kafka.schemaregistry.client.MockSchemaRegistryClient;
+import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Map;
+import lombok.SneakyThrows;
+import net.bytebuddy.utility.RandomString;
+import org.apache.avro.generic.GenericDatumWriter;
+import org.apache.avro.io.Encoder;
+import org.apache.avro.io.EncoderFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class SchemaRegistrySerdeTest {
+
+  private final MockSchemaRegistryClient registryClient = new MockSchemaRegistryClient();
+
+  private SchemaRegistrySerde serde;
+
+  @BeforeEach
+  void init() {
+    serde = new SchemaRegistrySerde();
+    serde.configure(List.of("wontbeused"), registryClient, "%s-key", "%s-value");
+  }
+
+  @Test
+  void returnsSchemaDescriptionIfSchemaRegisteredInSR() throws RestClientException, IOException {
+    String topic = "test";
+    registryClient.register(topic + "-key", new AvroSchema("{ \"type\": \"int\" }"));
+    registryClient.register(topic + "-value", new AvroSchema("{ \"type\": \"float\" }"));
+
+    var keySchemaOptional = serde.getSchema(topic, Serde.Target.KEY);
+    assertThat(keySchemaOptional)
+        .map(SchemaDescription::getSchema)
+        .contains("{\"$id\":\"int\",\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"type\":\"integer\"}");
+
+    var valueSchemaOptional = serde.getSchema(topic, Serde.Target.VALUE);
+    assertThat(valueSchemaOptional)
+        .map(SchemaDescription::getSchema)
+        .contains("{\"$id\":\"float\",\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"type\":\"number\"}");
+  }
+
+  @Test
+  void returnsEmptyDescriptorIfSchemaNotRegisteredInSR() {
+    String topic = "test";
+    assertThat(serde.getSchema(topic, Serde.Target.KEY)).isEmpty();
+    assertThat(serde.getSchema(topic, Serde.Target.VALUE)).isEmpty();
+  }
+
+  @Test
+  void serializeTreatsInputAsJsonAvroSchemaPayload() throws RestClientException, IOException {
+    AvroSchema schema = new AvroSchema(
+        "{"
+            + "  \"type\": \"record\","
+            + "  \"name\": \"TestAvroRecord1\","
+            + "  \"fields\": ["
+            + "    {"
+            + "      \"name\": \"field1\","
+            + "      \"type\": \"string\""
+            + "    },"
+            + "    {"
+            + "      \"name\": \"field2\","
+            + "      \"type\": \"int\""
+            + "    }"
+            + "  ]"
+            + "}"
+    );
+    String jsonValue = "{ \"field1\":\"testStr\", \"field2\": 123 }";
+    String topic = "test";
+
+    int schemaId = registryClient.register(topic + "-value", schema);
+    byte[] serialized = serde.serializer(topic, Serde.Target.VALUE).serialize(jsonValue);
+    byte[] expected = toBytesWithMagicByteAndSchemaId(schemaId, jsonValue, schema);
+    assertThat(serialized).isEqualTo(expected);
+  }
+
+  @Test
+  void deserializeReturnsJsonAvroMsgJsonRepresentation() throws RestClientException, IOException {
+    AvroSchema schema = new AvroSchema(
+        "{"
+            + "  \"type\": \"record\","
+            + "  \"name\": \"TestAvroRecord1\","
+            + "  \"fields\": ["
+            + "    {"
+            + "      \"name\": \"field1\","
+            + "      \"type\": \"string\""
+            + "    },"
+            + "    {"
+            + "      \"name\": \"field2\","
+            + "      \"type\": \"int\""
+            + "    }"
+            + "  ]"
+            + "}"
+    );
+    String jsonValue = "{ \"field1\":\"testStr\", \"field2\": 123 }";
+
+    String topic = "test";
+    int schemaId = registryClient.register(topic + "-value", schema);
+
+    byte[] data = toBytesWithMagicByteAndSchemaId(schemaId, jsonValue, schema);
+    var result = serde.deserializer(topic, Serde.Target.VALUE).deserialize(null, data);
+
+    assertJsonsEqual(jsonValue, result.getResult());
+    assertThat(result.getType()).isEqualTo(DeserializeResult.Type.JSON);
+    assertThat(result.getAdditionalProperties())
+        .contains(Map.entry("type", "AVRO"))
+        .contains(Map.entry("schemaId", schemaId));
+  }
+
+  @Test
+  void canDeserializeReturnsTrueAlways() {
+    String topic = RandomString.make(10);
+    assertThat(serde.canDeserialize(topic, Serde.Target.KEY)).isTrue();
+    assertThat(serde.canDeserialize(topic, Serde.Target.VALUE)).isTrue();
+  }
+
+  private void assertJsonsEqual(String expected, String actual) throws JsonProcessingException {
+    var mapper = new JsonMapper();
+    assertThat(mapper.readTree(actual)).isEqualTo(mapper.readTree(expected));
+  }
+
+  private byte[] toBytesWithMagicByteAndSchemaId(int schemaId, String json, AvroSchema schema) {
+    return toBytesWithMagicByteAndSchemaId(schemaId, jsonToAvro(json, schema));
+  }
+
+  private byte[] toBytesWithMagicByteAndSchemaId(int schemaId, byte[] body) {
+    return ByteBuffer.allocate(1 + 4 + body.length)
+        .put((byte) 0)
+        .putInt(schemaId)
+        .put(body)
+        .array();
+  }
+
+  @SneakyThrows
+  private byte[] jsonToAvro(String json, AvroSchema schema) {
+    GenericDatumWriter<Object> writer = new GenericDatumWriter<>(schema.rawSchema());
+    ByteArrayOutputStream output = new ByteArrayOutputStream();
+    Encoder encoder = EncoderFactory.get().binaryEncoder(output, null);
+    writer.write(AvroSchemaUtils.toObject(json, schema), encoder);
+    encoder.flush();
+    return output.toByteArray();
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
index e866bb28c2b..9dfbaed0b1d 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
@@ -44,7 +44,8 @@ void sendMessageReturnsExceptionWhenTopicNotFound() {
 
   @Test
   void loadMessagesReturnsExceptionWhenTopicNotFound() {
-    StepVerifier.create(messagesService.loadMessages(cluster, NON_EXISTING_TOPIC, null, null, null, 1))
+    StepVerifier.create(messagesService
+            .loadMessages(cluster, NON_EXISTING_TOPIC, null, null, null, 1, "String", "String"))
         .expectError(TopicNotFoundException.class)
         .verify();
   }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
index 05d8da3786c..e6c9b3c83a2 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
@@ -13,7 +13,10 @@
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.producer.KafkaTestProducer;
-import com.provectus.kafka.ui.serde.SimpleRecordSerDe;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
+import com.provectus.kafka.ui.serdes.builtin.StringSerde;
 import com.provectus.kafka.ui.util.OffsetsSeekBackward;
 import com.provectus.kafka.ui.util.OffsetsSeekForward;
 import java.io.Serializable;
@@ -53,6 +56,7 @@ class RecordEmitterTest extends AbstractIntegrationTest {
   static final String TOPIC = RecordEmitterTest.class.getSimpleName() + "_" + UUID.randomUUID();
   static final String EMPTY_TOPIC = TOPIC + "_empty";
   static final List<Record> SENT_RECORDS = new ArrayList<>();
+  static final ConsumerRecordDeserializer RECORD_DESERIALIZER = createRecordsDeserializer();
 
   @BeforeAll
   static void generateMsgs() throws Exception {
@@ -90,13 +94,27 @@ static void cleanup() {
     deleteTopic(EMPTY_TOPIC);
   }
 
+  private static ConsumerRecordDeserializer createRecordsDeserializer() {
+    Serde s = new StringSerde();
+    s.configure(PropertyResolverImpl.empty(), PropertyResolverImpl.empty(), PropertyResolverImpl.empty());
+    return new ConsumerRecordDeserializer(
+        StringSerde.name(),
+        s.deserializer(null, Serde.Target.KEY),
+        StringSerde.name(),
+        s.deserializer(null, Serde.Target.VALUE),
+        StringSerde.name(),
+        s.deserializer(null, Serde.Target.KEY),
+        s.deserializer(null, Serde.Target.VALUE)
+    );
+  }
+
   @Test
   void pollNothingOnEmptyTopic() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
         new OffsetsSeekForward(EMPTY_TOPIC,
             new ConsumerPosition(BEGINNING, Map.of(), FORWARD)
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
@@ -105,7 +123,7 @@ void pollNothingOnEmptyTopic() {
             EMPTY_TOPIC,
             new ConsumerPosition(BEGINNING, Map.of(), BACKWARD),
             100
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     StepVerifier.create(
@@ -127,7 +145,7 @@ void pollFullTopicFromBeginning() {
         this::createConsumer,
         new OffsetsSeekForward(TOPIC,
             new ConsumerPosition(BEGINNING, Map.of(), FORWARD)
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
@@ -135,7 +153,7 @@ void pollFullTopicFromBeginning() {
         new OffsetsSeekBackward(TOPIC,
             new ConsumerPosition(BEGINNING, Map.of(), BACKWARD),
             PARTITIONS * MSGS_PER_PARTITION
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     List<String> expectedValues = SENT_RECORDS.stream().map(Record::getValue).collect(Collectors.toList());
@@ -156,7 +174,7 @@ void pollWithOffsets() {
         this::createConsumer,
         new OffsetsSeekForward(TOPIC,
             new ConsumerPosition(OFFSET, targetOffsets, FORWARD)
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
@@ -164,7 +182,7 @@ void pollWithOffsets() {
         new OffsetsSeekBackward(TOPIC,
             new ConsumerPosition(OFFSET, targetOffsets, BACKWARD),
             PARTITIONS * MSGS_PER_PARTITION
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -201,7 +219,7 @@ void pollWithTimestamps() {
         this::createConsumer,
         new OffsetsSeekForward(TOPIC,
             new ConsumerPosition(TIMESTAMP, targetTimestamps, FORWARD)
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
@@ -209,7 +227,7 @@ void pollWithTimestamps() {
         new OffsetsSeekBackward(TOPIC,
             new ConsumerPosition(TIMESTAMP, targetTimestamps, BACKWARD),
             PARTITIONS * MSGS_PER_PARTITION
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -240,7 +258,7 @@ void backwardEmitterSeekToEnd() {
         new OffsetsSeekBackward(TOPIC,
             new ConsumerPosition(OFFSET, targetOffsets, BACKWARD),
             numMessages
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -266,7 +284,7 @@ void backwardEmitterSeekToBegin() {
         new OffsetsSeekBackward(TOPIC,
             new ConsumerPosition(OFFSET, offsets, BACKWARD),
             100
-        ), new SimpleRecordSerDe()
+        ), RECORD_DESERIALIZER
     );
 
     expectEmitter(backwardEmitter,
@@ -283,7 +301,8 @@ private void expectEmitter(Consumer<FluxSink<TopicMessageEventDTO>> emitter, Lis
             .expectNextCount(expectedValues.size())
             .expectRecordedMatches(r -> r.containsAll(expectedValues))
             .consumeRecordedWith(r -> log.info("Collected collection: {}", r)),
-        v -> {}
+        v -> {
+        }
     );
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java
index c9be9666d21..1ddfd2d9ecf 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java
@@ -7,11 +7,14 @@
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.CreateTopicMessageDTO;
 import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.MessageFormatDTO;
 import com.provectus.kafka.ui.model.SeekDirectionDTO;
 import com.provectus.kafka.ui.model.SeekTypeDTO;
 import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
+import com.provectus.kafka.ui.serdes.builtin.Int32Serde;
+import com.provectus.kafka.ui.serdes.builtin.Int64Serde;
+import com.provectus.kafka.ui.serdes.builtin.StringSerde;
+import com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.avro.AvroSchema;
 import io.confluent.kafka.schemaregistry.json.JsonSchema;
@@ -140,7 +143,9 @@ void noSchemaStringKeyStringValue() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key("testKey")
+                .keySerde(StringSerde.name())
                 .content("testValue")
+                .valueSerde(StringSerde.name())
         )
         .doAssert(polled -> {
           assertThat(polled.getKey()).isEqualTo("testKey");
@@ -149,40 +154,30 @@ void noSchemaStringKeyStringValue() {
   }
 
   @Test
-  void noSchemaJsonKeyJsonValue() {
-    new SendAndReadSpec()
-        .withMsgToSend(
-            new CreateTopicMessageDTO()
-                .key("{ \"f1\": 111, \"f2\": \"testStr1\" }")
-                .content("{ \"f1\": 222, \"f2\": \"testStr2\" }")
-        )
-        .doAssert(polled -> {
-          assertThat(polled.getKey()).isEqualTo("{ \"f1\": 111, \"f2\": \"testStr1\" }");
-          assertThat(polled.getContent()).isEqualTo("{ \"f1\": 222, \"f2\": \"testStr2\" }");
-        });
-  }
-
-  @Test
-  void keyIsIntValueIsDoubleShouldBeSerializedAsStrings() {
+  void keyIsIntValueIsLong() {
     new SendAndReadSpec()
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key("123")
-                .content("234.56")
+                .keySerde(Int32Serde.name())
+                .content("21474836470")
+                .valueSerde(Int64Serde.name())
         )
         .doAssert(polled -> {
           assertThat(polled.getKey()).isEqualTo("123");
-          assertThat(polled.getContent()).isEqualTo("234.56");
+          assertThat(polled.getContent()).isEqualTo("21474836470");
         });
   }
 
   @Test
-  void noSchemaKeyIsNull() {
+  void keyIsNull() {
     new SendAndReadSpec()
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key(null)
+                .keySerde(StringSerde.name())
                 .content("testValue")
+                .valueSerde(StringSerde.name())
         )
         .doAssert(polled -> {
           assertThat(polled.getKey()).isNull();
@@ -191,12 +186,14 @@ void noSchemaKeyIsNull() {
   }
 
   @Test
-  void noSchemaValueIsNull() {
+  void valueIsNull() {
     new SendAndReadSpec()
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key("testKey")
+                .keySerde(StringSerde.name())
                 .content(null)
+                .valueSerde(StringSerde.name())
         )
         .doAssert(polled -> {
           assertThat(polled.getKey()).isEqualTo("testKey");
@@ -212,7 +209,9 @@ void primitiveAvroSchemas() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key("\"some string\"")
+                .keySerde(SchemaRegistrySerde.name())
                 .content("123")
+                .valueSerde(SchemaRegistrySerde.name())
         )
         .doAssert(polled -> {
           assertThat(polled.getKey()).isEqualTo("\"some string\"");
@@ -221,14 +220,16 @@ void primitiveAvroSchemas() {
   }
 
   @Test
-  void nonNullableKvWithAvroSchema() {
+  void recordAvroSchema() {
     new SendAndReadSpec()
         .withKeySchema(AVRO_SCHEMA_1)
         .withValueSchema(AVRO_SCHEMA_2)
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key(AVRO_SCHEMA_1_JSON_RECORD)
+                .keySerde(SchemaRegistrySerde.name())
                 .content(AVRO_SCHEMA_2_JSON_RECORD)
+                .valueSerde(SchemaRegistrySerde.name())
         )
         .doAssert(polled -> {
           assertJsonEqual(polled.getKey(), AVRO_SCHEMA_1_JSON_RECORD);
@@ -236,36 +237,6 @@ void nonNullableKvWithAvroSchema() {
         });
   }
 
-  @Test
-  void keyWithNoSchemaValueWithAvroSchema() {
-    new SendAndReadSpec()
-        .withValueSchema(AVRO_SCHEMA_1)
-        .withMsgToSend(
-            new CreateTopicMessageDTO()
-                .key("testKey")
-                .content(AVRO_SCHEMA_1_JSON_RECORD)
-        )
-        .doAssert(polled -> {
-          assertThat(polled.getKey()).isEqualTo("testKey");
-          assertJsonEqual(polled.getContent(), AVRO_SCHEMA_1_JSON_RECORD);
-        });
-  }
-
-  @Test
-  void keyWithAvroSchemaValueWithNoSchema() {
-    new SendAndReadSpec()
-        .withKeySchema(AVRO_SCHEMA_1)
-        .withMsgToSend(
-            new CreateTopicMessageDTO()
-                .key(AVRO_SCHEMA_1_JSON_RECORD)
-                .content("testVal")
-        )
-        .doAssert(polled -> {
-          assertJsonEqual(polled.getKey(), AVRO_SCHEMA_1_JSON_RECORD);
-          assertThat(polled.getContent()).isEqualTo("testVal");
-        });
-  }
-
   @Test
   void keyWithNoSchemaValueWithProtoSchema() {
     new SendAndReadSpec()
@@ -273,7 +244,9 @@ void keyWithNoSchemaValueWithProtoSchema() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key("testKey")
+                .keySerde(StringSerde.name())
                 .content(PROTOBUF_SCHEMA_JSON_RECORD)
+                .valueSerde(SchemaRegistrySerde.name())
         )
         .doAssert(polled -> {
           assertThat(polled.getKey()).isEqualTo("testKey");
@@ -289,7 +262,10 @@ void keyWithAvroSchemaValueWithAvroSchemaKeyIsNull() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key(null)
+                .keySerde(SchemaRegistrySerde.name())
                 .content(AVRO_SCHEMA_2_JSON_RECORD)
+                .valueSerde(SchemaRegistrySerde.name())
+
         )
         .doAssert(polled -> {
           assertThat(polled.getKey()).isNull();
@@ -298,33 +274,19 @@ void keyWithAvroSchemaValueWithAvroSchemaKeyIsNull() {
   }
 
   @Test
-  void valueWithAvroSchemaShouldThrowExceptionArgIsNotValidJsonObject() {
+  void valueWithAvroSchemaShouldThrowExceptionIfArgIsNotValidJsonObject() {
     new SendAndReadSpec()
         .withValueSchema(AVRO_SCHEMA_2)
         .withMsgToSend(
             new CreateTopicMessageDTO()
-                // f2 has type object instead of string
-                .content("{ \"f1\": 111, \"f2\": {} }")
+                .keySerde(StringSerde.name())
+                // f2 has type int instead of string
+                .content("{ \"f1\": 111, \"f2\": 123 }")
+                .valueSerde(SchemaRegistrySerde.name())
         )
         .assertSendThrowsException();
   }
 
-  @Test
-  void keyWithAvroSchemaValueWithAvroSchemaValueIsNull() {
-    new SendAndReadSpec()
-        .withKeySchema(AVRO_SCHEMA_1)
-        .withValueSchema(AVRO_SCHEMA_2)
-        .withMsgToSend(
-            new CreateTopicMessageDTO()
-                .key(AVRO_SCHEMA_1_JSON_RECORD)
-                .content(null)
-        )
-        .doAssert(polled -> {
-          assertJsonEqual(polled.getKey(), AVRO_SCHEMA_1_JSON_RECORD);
-          assertThat(polled.getContent()).isNull();
-        });
-  }
-
   @Test
   void keyWithAvroSchemaValueWithProtoSchema() {
     new SendAndReadSpec()
@@ -333,7 +295,9 @@ void keyWithAvroSchemaValueWithProtoSchema() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key(AVRO_SCHEMA_1_JSON_RECORD)
+                .keySerde(SchemaRegistrySerde.name())
                 .content(PROTOBUF_SCHEMA_JSON_RECORD)
+                .valueSerde(SchemaRegistrySerde.name())
         )
         .doAssert(polled -> {
           assertJsonEqual(polled.getKey(), AVRO_SCHEMA_1_JSON_RECORD);
@@ -347,8 +311,12 @@ void valueWithProtoSchemaShouldThrowExceptionArgIsNotValidJsonObject() {
         .withValueSchema(PROTOBUF_SCHEMA)
         .withMsgToSend(
             new CreateTopicMessageDTO()
+                .key(null)
+                .keySerde(StringSerde.name())
                 // f2 field has type object instead of int
-                .content("{ \"f1\" : \"test str\", \"f2\" : {} }"))
+                .content("{ \"f1\" : \"test str\", \"f2\" : {} }")
+                .valueSerde(SchemaRegistrySerde.name())
+        )
         .assertSendThrowsException();
   }
 
@@ -360,7 +328,9 @@ void keyWithProtoSchemaValueWithJsonSchema() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key(PROTOBUF_SCHEMA_JSON_RECORD)
+                .keySerde(SchemaRegistrySerde.name())
                 .content(JSON_SCHEMA_RECORD)
+                .valueSerde(SchemaRegistrySerde.name())
         )
         .doAssert(polled -> {
           assertJsonEqual(polled.getKey(), PROTOBUF_SCHEMA_JSON_RECORD);
@@ -368,29 +338,17 @@ void keyWithProtoSchemaValueWithJsonSchema() {
         });
   }
 
-  @Test
-  void keyWithJsonValueWithJsonSchemaKeyValueIsNull() {
-    new SendAndReadSpec()
-        .withKeySchema(JSON_SCHEMA)
-        .withValueSchema(JSON_SCHEMA)
-        .withMsgToSend(
-            new CreateTopicMessageDTO()
-                .key(JSON_SCHEMA_RECORD)
-        )
-        .doAssert(polled -> {
-          assertJsonEqual(polled.getKey(), JSON_SCHEMA_RECORD);
-          assertThat(polled.getContent()).isNull();
-        });
-  }
-
   @Test
   void valueWithJsonSchemaThrowsExceptionIfArgIsNotValidJsonObject() {
     new SendAndReadSpec()
         .withValueSchema(JSON_SCHEMA)
         .withMsgToSend(
             new CreateTopicMessageDTO()
+                .key(null)
+                .keySerde(StringSerde.name())
                 // 'f2' field has has type object instead of string
                 .content("{ \"f1\": 12, \"f2\": {}, \"schema\": \"some txt\" }")
+                .valueSerde(SchemaRegistrySerde.name())
         )
         .assertSendThrowsException();
   }
@@ -403,17 +361,20 @@ void topicMessageMetadataAvro() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key(AVRO_SCHEMA_1_JSON_RECORD)
+                .keySerde(SchemaRegistrySerde.name())
                 .content(AVRO_SCHEMA_2_JSON_RECORD)
+                .valueSerde(SchemaRegistrySerde.name())
         )
         .doAssert(polled -> {
           assertJsonEqual(polled.getKey(), AVRO_SCHEMA_1_JSON_RECORD);
           assertJsonEqual(polled.getContent(), AVRO_SCHEMA_2_JSON_RECORD);
           assertThat(polled.getKeySize()).isEqualTo(15L);
           assertThat(polled.getValueSize()).isEqualTo(15L);
-          assertThat(polled.getKeyFormat()).isEqualTo(MessageFormatDTO.AVRO);
-          assertThat(polled.getValueFormat()).isEqualTo(MessageFormatDTO.AVRO);
-          assertThat(polled.getKeySchemaId()).isNotEmpty();
-          assertThat(polled.getValueSchemaId()).isNotEmpty();
+          assertThat(polled.getKeyDeserializeProperties().get("schemaId")).isNotNull();
+          assertThat(polled.getValueDeserializeProperties().get("schemaId")).isNotNull();
+          assertThat(polled.getKeyDeserializeProperties().get("type")).isEqualTo("AVRO");
+          assertThat(polled.getValueDeserializeProperties().get("schemaId")).isNotNull();
+          assertThat(polled.getValueDeserializeProperties().get("type")).isEqualTo("AVRO");
         });
   }
 
@@ -425,17 +386,19 @@ void topicMessageMetadataProtobuf() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key(PROTOBUF_SCHEMA_JSON_RECORD)
+                .keySerde(SchemaRegistrySerde.name())
                 .content(PROTOBUF_SCHEMA_JSON_RECORD)
+                .valueSerde(SchemaRegistrySerde.name())
         )
         .doAssert(polled -> {
           assertJsonEqual(polled.getKey(), PROTOBUF_SCHEMA_JSON_RECORD);
           assertJsonEqual(polled.getContent(), PROTOBUF_SCHEMA_JSON_RECORD);
           assertThat(polled.getKeySize()).isEqualTo(18L);
           assertThat(polled.getValueSize()).isEqualTo(18L);
-          assertThat(polled.getKeyFormat()).isEqualTo(MessageFormatDTO.PROTOBUF);
-          assertThat(polled.getValueFormat()).isEqualTo(MessageFormatDTO.PROTOBUF);
-          assertThat(polled.getKeySchemaId()).isNotEmpty();
-          assertThat(polled.getValueSchemaId()).isNotEmpty();
+          assertThat(polled.getValueDeserializeProperties().get("schemaId")).isNotNull();
+          assertThat(polled.getKeyDeserializeProperties().get("type")).isEqualTo("PROTOBUF");
+          assertThat(polled.getValueDeserializeProperties().get("schemaId")).isNotNull();
+          assertThat(polled.getValueDeserializeProperties().get("type")).isEqualTo("PROTOBUF");
         });
   }
 
@@ -447,19 +410,21 @@ void topicMessageMetadataJson() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key(JSON_SCHEMA_RECORD)
+                .keySerde(SchemaRegistrySerde.name())
                 .content(JSON_SCHEMA_RECORD)
+                .valueSerde(SchemaRegistrySerde.name())
                 .headers(Map.of("header1", "value1"))
         )
         .doAssert(polled -> {
           assertJsonEqual(polled.getKey(), JSON_SCHEMA_RECORD);
           assertJsonEqual(polled.getContent(), JSON_SCHEMA_RECORD);
-          assertThat(polled.getKeyFormat()).isEqualTo(MessageFormatDTO.JSON);
-          assertThat(polled.getValueFormat()).isEqualTo(MessageFormatDTO.JSON);
-          assertThat(polled.getKeySchemaId()).isNotEmpty();
-          assertThat(polled.getValueSchemaId()).isNotEmpty();
           assertThat(polled.getKeySize()).isEqualTo(57L);
           assertThat(polled.getValueSize()).isEqualTo(57L);
           assertThat(polled.getHeadersSize()).isEqualTo(13L);
+          assertThat(polled.getValueDeserializeProperties().get("schemaId")).isNotNull();
+          assertThat(polled.getKeyDeserializeProperties().get("type")).isEqualTo("JSON");
+          assertThat(polled.getValueDeserializeProperties().get("schemaId")).isNotNull();
+          assertThat(polled.getValueDeserializeProperties().get("type")).isEqualTo("JSON");
         });
   }
 
@@ -469,7 +434,9 @@ void noKeyAndNoContentPresentTest() {
         .withMsgToSend(
             new CreateTopicMessageDTO()
                 .key(null)
+                .keySerde(StringSerde.name()) // any serde
                 .content(null)
+                .valueSerde(StringSerde.name()) // any serde
         )
         .doAssert(polled -> {
           assertThat(polled.getKey()).isNull();
@@ -514,10 +481,6 @@ private String createTopicAndCreateSchemas() {
       if (valueSchema != null) {
         schemaRegistry.schemaRegistryClient().register(topic + "-value", valueSchema);
       }
-
-      // need to update to see new topic & schemas
-      clustersMetricsScheduler.updateMetrics();
-
       return topic;
     }
 
@@ -547,7 +510,9 @@ public void doAssert(Consumer<TopicMessageDTO> msgAssert) {
                 ),
                 null,
                 null,
-                1
+                1,
+                msgToSend.getKeySerde().get(),
+                msgToSend.getValueSerde().get()
             ).filter(e -> e.getType().equals(TopicMessageEventDTO.TypeEnum.MESSAGE))
             .map(TopicMessageEventDTO::getMessage)
             .blockLast(Duration.ofSeconds(5000));
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index f64d8ce4da7..0ac9e6c46e8 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -4,7 +4,7 @@ info:
   version: 0.1.0
   title: Api Documentation
   termsOfService: urn:tos
-  contact: {}
+  contact: { }
   license:
     name: Apache 2.0
     url: http://www.apache.org/licenses/LICENSE-2.0
@@ -595,6 +595,37 @@ paths:
         400:
           description: Bad Request
 
+  /api/clusters/{clusterName}/topic/{topicName}/serdes:
+    get:
+      tags:
+        - Messages
+      summary: getSerdes
+      operationId: getSerdes
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: topicName
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: use
+          in: query
+          required: true
+          schema:
+            $ref: '#/components/schemas/SerdeUsage'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TopicSerdeSuggestion'
+
+
   /api/clusters/{clusterName}/topics/{topicName}/messages:
     get:
       tags:
@@ -639,6 +670,16 @@ paths:
           in: query
           schema:
             $ref: "#/components/schemas/SeekDirection"
+        - name: keySerde
+          in: query
+          description: "Serde that should be used for deserialization. Will be chosen automatically if not set."
+          schema:
+            type: string
+        - name: valueSerde
+          in: query
+          description: "Serde that should be used for deserialization. Will be chosen automatically if not set."
+          schema:
+            type: string
       responses:
         200:
           description: OK
@@ -703,31 +744,6 @@ paths:
         404:
           description: Not found
 
-  /api/clusters/{clusterName}/topics/{topicName}/messages/schema:
-    get:
-      tags:
-        - Messages
-      summary: getTopicSchema
-      operationId: getTopicSchema
-      parameters:
-        - name: clusterName
-          in: path
-          required: true
-          schema:
-            type: string
-        - name: topicName
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        200:
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TopicMessageSchema'
-
   /api/clusters/{clusterName}/topics/{topicName}/consumer-groups:
     get:
       tags:
@@ -1765,6 +1781,41 @@ paths:
                 $ref: '#/components/schemas/TimeStampFormat'
 components:
   schemas:
+    TopicSerdeSuggestion:
+      type: object
+      properties:
+        key:
+          type: array
+          items:
+            $ref: '#/components/schemas/SerdeDescription'
+        value:
+          type: array
+          items:
+            $ref: '#/components/schemas/SerdeDescription'
+
+    SerdeDescription:
+      type: object
+      properties:
+        name:
+          type: string
+        description:
+          type: string
+        preferred:
+          description: "This serde was automatically chosen by cluster config. This should be enabled in UI by default. Also it will be used for deserialization if no serdes passed."
+          type: boolean
+        schema:
+          type: string
+        additionalProperties:
+          type: object
+          additionalProperties:
+            type: object
+
+    SerdeUsage:
+      type: string
+      enum:
+        - SERIALIZE
+        - DESERIALIZE
+
     ErrorResponse:
       description: Error object that will be returned with 4XX and 5XX HTTP statuses
       type: object
@@ -2161,6 +2212,10 @@ components:
           type: integer
         cleanUpPolicy:
           $ref: '#/components/schemas/CleanUpPolicy'
+        keySerde:
+          type: string
+        valueSerde:
+          type: string
       required:
         - name
 
@@ -2309,37 +2364,14 @@ components:
         content:
           type: string
           nullable: true
-      required:
-        - partition
-
-    TopicMessageSchema:
-      type: object
-      properties:
-        key:
-          $ref: "#/components/schemas/MessageSchema"
-        value:
-          $ref: "#/components/schemas/MessageSchema"
-      required:
-        - key
-        - value
-
-    MessageSchema:
-      type: object
-      properties:
-        name:
-          type: string
-        source:
+        keySerde:
           type: string
-          enum:
-            - SOURCE_SCHEMA_REGISTRY
-            - SOURCE_PROTO_FILE
-            - SOURCE_UNKNOWN
-        schema:
+          nullable: true
+        valueSerde:
           type: string
+          nullable: true
       required:
-        - name
-        - source
-        - schema
+        - partition
 
     TopicMessageEvent:
       type: object
@@ -2412,8 +2444,10 @@ components:
         content:
           type: string
         keyFormat:
+          #deprecated - wont be filled - use 'keySerde' field instead
           $ref: "#/components/schemas/MessageFormat"
         valueFormat:
+          #deprecated - wont be filled - use 'valueSerde' field instead
           $ref: "#/components/schemas/MessageFormat"
         keySize:
           type: integer
@@ -2422,12 +2456,26 @@ components:
           type: integer
           format: int64
         keySchemaId:
+          deprecated: true
+          description: deprecated - wont be filled - use 'keyDeserializeProperties' field instead
           type: string
         valueSchemaId:
+          deprecated: true
+          description: deprecated - wont be filled - use 'valueDeserializeProperties' field instead
           type: string
         headersSize:
           type: integer
           format: int64
+        keySerde:
+          type: string
+        valueSerde:
+          type: string
+        keyDeserializeProperties:
+          additionalProperties:
+            type: object
+        valueDeserializeProperties:
+          additionalProperties:
+            type: object
       required:
         - partition
         - offset
diff --git a/kafka-ui-react-app/jest.config.ts b/kafka-ui-react-app/jest.config.ts
index 32dc0201554..1c0c012d559 100644
--- a/kafka-ui-react-app/jest.config.ts
+++ b/kafka-ui-react-app/jest.config.ts
@@ -11,6 +11,7 @@ export default {
     '<rootDir>/src/index.tsx',
     '<rootDir>/src/serviceWorker.ts',
   ],
+  coverageReporters: ['json', 'lcov', 'text', 'clover'],
   resolver: '<rootDir>/.jest/resolver.js',
   setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
   testMatch: [
diff --git a/kafka-ui-react-app/src/components/Connect/List/List.tsx b/kafka-ui-react-app/src/components/Connect/List/List.tsx
index 03f212c7f23..75a782fa0a6 100644
--- a/kafka-ui-react-app/src/components/Connect/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/List.tsx
@@ -3,15 +3,18 @@ import useAppParams from 'lib/hooks/useAppParams';
 import { ClusterNameRoute } from 'lib/paths';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import useSearch from 'lib/hooks/useSearch';
 import { useConnectors } from 'lib/hooks/api/kafkaConnect';
+import { useSearchParams } from 'react-router-dom';
 
 import ListItem from './ListItem';
 
 const List: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
-  const [search] = useSearch();
-  const { data: connectors } = useConnectors(clusterName, search);
+  const [searchParams] = useSearchParams();
+  const { data: connectors } = useConnectors(
+    clusterName,
+    searchParams.get('q') || ''
+  );
 
   return (
     <Table isFullwidth>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
index 776fbfd342a..a8df901be4d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
@@ -23,19 +23,16 @@ export const FiltersWrapper = styled.div`
   & > div:first-child {
     display: flex;
     justify-content: space-between;
-    padding-top: 16px;
+    padding-top: 2px;
+    align-items: flex-end;
   }
 `;
 
 export const FilterInputs = styled.div`
   display: flex;
   gap: 8px;
-  align-items: center;
+  align-items: flex-end;
   width: 90%;
-
-  & > div:first-child {
-    width: 25%;
-  }
 `;
 
 export const SeekTypeSelectorWrapper = styled.div`
@@ -98,10 +95,12 @@ export const MetricsIcon = styled.div`
   height: 12px;
 `;
 
-export const ClearAll = styled.span`
+export const ClearAll = styled.div`
   color: ${({ theme }) => theme.metrics.filters.color.normal};
   font-size: 12px;
   cursor: pointer;
+  line-height: 32px;
+  margin-left: 8px;
 `;
 
 export const ButtonContainer = styled.div`
@@ -218,11 +217,15 @@ export const FilterButtonWrapper = styled.div`
 `;
 
 export const ActiveSmartFilterWrapper = styled.div`
-  padding: 5px 0;
+  padding: 8px 0 5px;
   display: flex;
   gap: 10px;
   align-items: center;
   justify-content: flex-start;
+
+  & div:first-child {
+    width: 25%;
+  }
 `;
 
 export const DeleteSavedFilter = styled.div.attrs({ role: 'deleteIcon' })`
@@ -359,3 +362,9 @@ export const SeekTypeSelect = styled(Select)`
   border-bottom-right-radius: 0;
   user-select: none;
 `;
+
+export const Serdes = styled.div`
+  display: flex;
+  gap: 24px;
+  padding 8px 0;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 83b094a539f..3ee4b552efa 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -5,6 +5,7 @@ import {
   Partition,
   SeekDirection,
   SeekType,
+  SerdeUsage,
   TopicMessage,
   TopicMessageConsuming,
   TopicMessageEvent,
@@ -12,7 +13,7 @@ import {
 } from 'generated-sources';
 import React, { useContext } from 'react';
 import omitBy from 'lodash/omitBy';
-import { useNavigate, useLocation } from 'react-router-dom';
+import { useNavigate, useLocation, useSearchParams } from 'react-router-dom';
 import MultiSelect from 'components/common/MultiSelect/MultiSelect.styled';
 import { Option } from 'react-multi-select-component';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
@@ -34,6 +35,9 @@ import ClockIcon from 'components/common/Icons/ClockIcon';
 import ArrowDownIcon from 'components/common/Icons/ArrowDownIcon';
 import FileIcon from 'components/common/Icons/FileIcon';
 import { useTopicDetails } from 'lib/hooks/api/topics';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import { getSerdeOptions } from 'components/Topics/Topic/SendMessage/utils';
+import { useSerdes } from 'lib/hooks/api/topicMessages';
 
 import * as S from './Filters.styled';
 import {
@@ -87,12 +91,13 @@ const Filters: React.FC<FiltersProps> = ({
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
   const location = useLocation();
   const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
 
   const { data: topic } = useTopicDetails({ clusterName, topicName });
 
   const partitions = topic?.partitions || [];
 
-  const { searchParams, seekDirection, isLive, changeSeekDirection } =
+  const { seekDirection, isLive, changeSeekDirection } =
     useContext(TopicMessagesContext);
 
   const { value: isOpen, toggle } = useBoolean();
@@ -103,7 +108,6 @@ const Filters: React.FC<FiltersProps> = ({
     getSelectedPartitionsFromSeekToParam(searchParams, partitions)
   );
 
-  const [attempt, setAttempt] = React.useState(0);
   const [currentSeekType, setCurrentSeekType] = React.useState<SeekType>(
     (searchParams.get('seekType') as SeekType) || SeekType.OFFSET
   );
@@ -114,6 +118,12 @@ const Filters: React.FC<FiltersProps> = ({
   const [timestamp, setTimestamp] = React.useState<Date | null>(
     getTimestampFromSeekToParam(searchParams)
   );
+  const [keySerde, setKeySerde] = React.useState<string>(
+    searchParams.get('keySerde') as string
+  );
+  const [valueSerde, setValueSerde] = React.useState<string>(
+    searchParams.get('valueSerde') as string
+  );
 
   const [savedFilters, setSavedFilters] = React.useState<MessageFilters[]>(
     JSON.parse(localStorage.getItem('savedFilters') ?? '[]')
@@ -162,19 +172,6 @@ const Filters: React.FC<FiltersProps> = ({
     [partitions]
   );
 
-  const props: Query = React.useMemo(() => {
-    return {
-      q:
-        queryType === MessageFilterType.GROOVY_SCRIPT
-          ? activeFilter.code
-          : query,
-      filterQueryType: queryType,
-      attempt,
-      limit: PER_PAGE,
-      seekDirection,
-    };
-  }, [attempt, query, queryType, seekDirection, activeFilter]);
-
   const handleClearAllFilters = () => {
     setCurrentSeekType(SeekType.OFFSET);
     setOffset('');
@@ -191,56 +188,55 @@ const Filters: React.FC<FiltersProps> = ({
     );
   };
 
-  const handleFiltersSubmit = React.useCallback(
-    (currentOffset: string) => {
-      setAttempt(attempt + 1);
+  const handleFiltersSubmit = (currentOffset: string) => {
+    const nextAttempt = Number(searchParams.get('attempt') || 0) + 1;
+    const props: Query = {
+      q:
+        queryType === MessageFilterType.GROOVY_SCRIPT
+          ? activeFilter.code
+          : query,
+      filterQueryType: queryType,
+      attempt: nextAttempt,
+      limit: PER_PAGE,
+      seekDirection,
+      keySerde: keySerde || (searchParams.get('keySerde') as string),
+      valueSerde: valueSerde || (searchParams.get('valueSerde') as string),
+    };
 
-      if (isSeekTypeControlVisible) {
-        switch (seekDirection) {
-          case SeekDirection.FORWARD:
-            props.seekType = SeekType.BEGINNING;
-            break;
-          case SeekDirection.BACKWARD:
-          case SeekDirection.TAILING:
-            props.seekType = SeekType.LATEST;
-            break;
-          default:
-            props.seekType = currentSeekType;
-        }
-        props.seekTo = selectedPartitions.map(({ value }) => {
-          const offsetProperty =
-            seekDirection === SeekDirection.FORWARD ? 'offsetMin' : 'offsetMax';
-          const offsetBasedSeekTo =
-            currentOffset || partitionMap[value][offsetProperty];
-          const seekToOffset =
-            currentSeekType === SeekType.OFFSET
-              ? offsetBasedSeekTo
-              : timestamp?.getTime();
-
-          return `${value}::${seekToOffset || '0'}`;
-        });
+    if (isSeekTypeControlVisible) {
+      switch (seekDirection) {
+        case SeekDirection.FORWARD:
+          props.seekType = SeekType.BEGINNING;
+          break;
+        case SeekDirection.BACKWARD:
+        case SeekDirection.TAILING:
+          props.seekType = SeekType.LATEST;
+          break;
+        default:
+          props.seekType = currentSeekType;
       }
-
-      const newProps = omitBy(props, (v) => v === undefined || v === '');
-      const qs = Object.keys(newProps)
-        .map((key) => `${key}=${encodeURIComponent(newProps[key] as string)}`)
-        .join('&');
-
-      navigate({
-        search: `?${qs}`,
+      props.seekTo = selectedPartitions.map(({ value }) => {
+        const offsetProperty =
+          seekDirection === SeekDirection.FORWARD ? 'offsetMin' : 'offsetMax';
+        const offsetBasedSeekTo =
+          currentOffset || partitionMap[value][offsetProperty];
+        const seekToOffset =
+          currentSeekType === SeekType.OFFSET
+            ? offsetBasedSeekTo
+            : timestamp?.getTime();
+
+        return `${value}::${seekToOffset || '0'}`;
       });
-    },
-    [
-      seekDirection,
-      queryType,
-      activeFilter,
-      currentSeekType,
-      timestamp,
-      query,
-      selectedPartitions,
-      navigate,
-    ]
-  );
+    }
+
+    const newProps = omitBy(props, (v) => v === undefined || v === '');
+    const qs = Object.keys(newProps)
+      .map((key) => `${key}=${encodeURIComponent(newProps[key] as string)}`)
+      .join('&');
+    navigate({
+      search: `?${qs}`,
+    });
+  };
 
   const handleSSECancel = () => {
     if (!source.current) return;
@@ -389,78 +385,105 @@ const Filters: React.FC<FiltersProps> = ({
     setIsTailing(isLive);
   }, [isLive]);
 
+  const { data: serdes = {} } = useSerdes({
+    clusterName,
+    topicName,
+    use: SerdeUsage.DESERIALIZE,
+  });
+
   return (
     <S.FiltersWrapper>
       <div>
         <S.FilterInputs>
-          <Search placeholder="Search" disabled={isTailing} />
-          <S.SeekTypeSelectorWrapper>
-            <S.SeekTypeSelect
-              id="selectSeekType"
-              onChange={(option) => setCurrentSeekType(option as SeekType)}
-              value={currentSeekType}
+          <div>
+            <InputLabel>Seek Type</InputLabel>
+            <S.SeekTypeSelectorWrapper>
+              <S.SeekTypeSelect
+                id="selectSeekType"
+                onChange={(option) => setCurrentSeekType(option as SeekType)}
+                value={currentSeekType}
+                selectSize="M"
+                minWidth="100px"
+                options={SeekTypeOptions}
+                disabled={isTailing}
+              />
+
+              {currentSeekType === SeekType.OFFSET ? (
+                <S.OffsetSelector
+                  id="offset"
+                  type="text"
+                  inputSize="M"
+                  value={offset}
+                  placeholder="Offset"
+                  onChange={({ target: { value } }) => setOffset(value)}
+                  disabled={isTailing}
+                />
+              ) : (
+                <S.DatePickerInput
+                  selected={timestamp}
+                  onChange={(date: Date | null) => setTimestamp(date)}
+                  showTimeInput
+                  timeInputLabel="Time:"
+                  dateFormat="MMMM d, yyyy HH:mm"
+                  placeholderText="Select timestamp"
+                  disabled={isTailing}
+                />
+              )}
+            </S.SeekTypeSelectorWrapper>
+          </div>
+          <div>
+            <InputLabel>Partitions</InputLabel>
+            <MultiSelect
+              options={partitions.map((p) => ({
+                label: `Partition #${p.partition.toString()}`,
+                value: p.partition,
+              }))}
+              filterOptions={filterOptions}
+              value={selectedPartitions}
+              onChange={setSelectedPartitions}
+              labelledBy="Select partitions"
+              disabled={isTailing}
+            />
+          </div>
+          <div>
+            <InputLabel>Key Serde</InputLabel>
+            <Select
+              id="selectKeySerdeOptions"
+              aria-labelledby="selectKeySerdeOptions"
+              onChange={(option) => setKeySerde(option as string)}
+              minWidth="170px"
+              options={getSerdeOptions(serdes.key || [])}
+              value={searchParams.get('keySerde') as string}
               selectSize="M"
-              minWidth="100px"
-              options={SeekTypeOptions}
               disabled={isTailing}
             />
-            {currentSeekType === SeekType.OFFSET ? (
-              <S.OffsetSelector
-                id="offset"
-                type="text"
-                inputSize="M"
-                value={offset}
-                placeholder="Offset"
-                onChange={({ target: { value } }) => setOffset(value)}
-                disabled={isTailing}
-              />
-            ) : (
-              <S.DatePickerInput
-                selected={timestamp}
-                onChange={(date: Date | null) => setTimestamp(date)}
-                showTimeInput
-                timeInputLabel="Time:"
-                dateFormat="MMMM d, yyyy HH:mm"
-                placeholderText="Select timestamp"
-                disabled={isTailing}
-              />
-            )}
-          </S.SeekTypeSelectorWrapper>
-          <MultiSelect
-            options={partitions.map((p) => ({
-              label: `Partition #${p.partition.toString()}`,
-              value: p.partition,
-            }))}
-            filterOptions={filterOptions}
-            value={selectedPartitions}
-            onChange={setSelectedPartitions}
-            labelledBy="Select partitions"
-            disabled={isTailing}
-          />
+          </div>
+          <div>
+            <InputLabel>Content Serde</InputLabel>
+            <Select
+              id="selectValueSerdeOptions"
+              aria-labelledby="selectValueSerdeOptions"
+              onChange={(option) => setValueSerde(option as string)}
+              options={getSerdeOptions(serdes.value || [])}
+              value={searchParams.get('valueSerde') as string}
+              minWidth="170px"
+              selectSize="M"
+              disabled={isTailing}
+            />
+          </div>
           <S.ClearAll onClick={handleClearAllFilters}>Clear all</S.ClearAll>
-          {isFetching ? (
-            <Button
-              type="button"
-              buttonType="secondary"
-              buttonSize="M"
-              disabled={isSubmitDisabled}
-              onClick={handleSSECancel}
-              style={{ fontWeight: 500 }}
-            >
-              Cancel
-            </Button>
-          ) : (
-            <Button
-              type="submit"
-              buttonType="secondary"
-              buttonSize="M"
-              disabled={isSubmitDisabled}
-              onClick={() => handleFiltersSubmit(offset)}
-              style={{ fontWeight: 500 }}
-            >
-              Submit
-            </Button>
-          )}
+          <Button
+            type="submit"
+            buttonType="secondary"
+            buttonSize="M"
+            disabled={isSubmitDisabled}
+            onClick={() =>
+              isFetching ? handleSSECancel() : handleFiltersSubmit(offset)
+            }
+            style={{ fontWeight: 500 }}
+          >
+            {isFetching ? 'Cancel' : 'Submit'}
+          </Button>
         </S.FilterInputs>
         <Select
           selectSize="M"
@@ -472,6 +495,8 @@ const Filters: React.FC<FiltersProps> = ({
         />
       </div>
       <S.ActiveSmartFilterWrapper>
+        <Search placeholder="Search" disabled={isTailing} />
+
         <Button buttonType="primary" buttonSize="M" onClick={toggle}>
           <PlusIcon />
           Add Filters
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
index 7b06c2599a6..a0aef49da12 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
@@ -14,15 +14,20 @@ import { SeekDirection } from 'generated-sources';
 import { clusterTopicPath } from 'lib/paths';
 import { useTopicDetails } from 'lib/hooks/api/topics';
 import { externalTopicPayload } from 'lib/fixtures/topics';
+import { useSerdes } from 'lib/hooks/api/topicMessages';
+import { serdesPayload } from 'lib/fixtures/topicMessages';
 
 jest.mock('lib/hooks/api/topics', () => ({
   useTopicDetails: jest.fn(),
 }));
 
+jest.mock('lib/hooks/api/topicMessages', () => ({
+  useSerdes: jest.fn(),
+}));
+
 const defaultContextValue: ContextProps = {
   isLive: false,
   seekDirection: SeekDirection.FORWARD,
-  searchParams: new URLSearchParams(''),
   changeSeekDirection: jest.fn(),
 };
 
@@ -58,6 +63,9 @@ beforeEach(async () => {
   (useTopicDetails as jest.Mock).mockImplementation(() => ({
     data: externalTopicPayload,
   }));
+  (useSerdes as jest.Mock).mockImplementation(() => ({
+    data: serdesPayload,
+  }));
 });
 
 describe('Filters component', () => {
@@ -143,11 +151,11 @@ describe('Filters component', () => {
     });
 
     it('seekDirection select', () => {
-      userEvent.click(seekTypeSelects[1]);
-      userEvent.selectOptions(seekTypeSelects[1], [
+      userEvent.click(seekTypeSelects[3]);
+      userEvent.selectOptions(seekTypeSelects[3], [
         mockDirectionOptionSelectLabel,
       ]);
-      expect(options[1]).toHaveTextContent(mockDirectionOptionSelectLabel);
+      expect(options[3]).toHaveTextContent(mockDirectionOptionSelectLabel);
     });
   });
 
@@ -155,7 +163,7 @@ describe('Filters component', () => {
     renderComponent();
     userEvent.click(screen.getByText('Stop loading'));
     const option = screen.getAllByRole('option');
-    expect(option[1]).toHaveTextContent('Oldest First');
+    expect(option[3]).toHaveTextContent('Oldest First');
     expect(screen.getByText('Submit')).toBeInTheDocument();
   });
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
index 23b11249051..0e1642c5acc 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
@@ -1,10 +1,14 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import TopicMessagesContext from 'components/contexts/TopicMessagesContext';
-import { SeekDirection } from 'generated-sources';
-import { useLocation } from 'react-router-dom';
+import { SeekDirection, SerdeUsage } from 'generated-sources';
+import { useSearchParams } from 'react-router-dom';
+import { useSerdes } from 'lib/hooks/api/topicMessages';
+import useAppParams from 'lib/hooks/useAppParams';
+import { RouteParamsClusterTopic } from 'lib/paths';
+import { getDefaultSerdeName } from 'components/Topics/Topic/MessagesV2/utils/getDefaultSerdeName';
 
-import FiltersContainer from './Filters/FiltersContainer';
 import MessagesTable from './MessagesTable';
+import FiltersContainer from './Filters/FiltersContainer';
 
 export const SeekDirectionOptionsObj = {
   [SeekDirection.FORWARD]: {
@@ -27,12 +31,24 @@ export const SeekDirectionOptionsObj = {
 export const SeekDirectionOptions = Object.values(SeekDirectionOptionsObj);
 
 const Messages: React.FC = () => {
-  const location = useLocation();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
 
-  const searchParams = React.useMemo(
-    () => new URLSearchParams(location.search),
-    [location.search]
-  );
+  const { data: serdes = {} } = useSerdes({
+    clusterName,
+    topicName,
+    use: SerdeUsage.DESERIALIZE,
+  });
+
+  React.useEffect(() => {
+    if (!searchParams.get('keySerde')) {
+      searchParams.set('keySerde', getDefaultSerdeName(serdes.key || []));
+    }
+    if (!searchParams.get('valueSerde')) {
+      searchParams.set('valueSerde', getDefaultSerdeName(serdes.value || []));
+    }
+    setSearchParams(searchParams);
+  }, [serdes]);
 
   const defaultSeekValue = SeekDirectionOptions[0];
 
@@ -66,11 +82,10 @@ const Messages: React.FC = () => {
   const contextValue = useMemo(
     () => ({
       seekDirection,
-      searchParams,
       changeSeekDirection,
       isLive,
     }),
-    [seekDirection, searchParams, changeSeekDirection]
+    [seekDirection, changeSeekDirection]
   );
 
   return (
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
index 78209ef7bb7..0d1b5a6531f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
@@ -8,6 +8,12 @@ import Messages, {
 import { SeekDirection, SeekType } from 'generated-sources';
 import userEvent from '@testing-library/user-event';
 import { clusterTopicMessagesPath } from 'lib/paths';
+import { useSerdes } from 'lib/hooks/api/topicMessages';
+import { serdesPayload } from 'lib/fixtures/topicMessages';
+
+jest.mock('lib/hooks/api/topicMessages', () => ({
+  useSerdes: jest.fn(),
+}));
 
 describe('Messages', () => {
   const searchParams = `?filterQueryType=STRING_CONTAINS&attempt=0&limit=100&seekDirection=${SeekDirection.FORWARD}&seekType=${SeekType.OFFSET}&seekTo=0::9`;
@@ -28,20 +34,23 @@ describe('Messages', () => {
     Object.defineProperty(window, 'EventSource', {
       value: EventSourceMock,
     });
+    (useSerdes as jest.Mock).mockImplementation(() => ({
+      data: serdesPayload,
+    }));
   });
   describe('component rendering default behavior with the search params', () => {
     beforeEach(() => {
       renderComponent();
     });
     it('should check default seekDirection if it actually take the value from the url', () => {
-      expect(screen.getAllByRole('listbox')[1]).toHaveTextContent(
+      expect(screen.getAllByRole('listbox')[3]).toHaveTextContent(
         SeekDirectionOptionsObj[SeekDirection.FORWARD].label
       );
     });
 
     it('should check the SeekDirection select changes with live option', async () => {
-      const seekDirectionSelect = screen.getAllByRole('listbox')[1];
-      const seekDirectionOption = screen.getAllByRole('option')[1];
+      const seekDirectionSelect = screen.getAllByRole('listbox')[3];
+      const seekDirectionOption = screen.getAllByRole('option')[3];
 
       expect(seekDirectionOption).toHaveTextContent(
         SeekDirectionOptionsObj[SeekDirection.FORWARD].label
@@ -79,7 +88,7 @@ describe('Messages', () => {
       renderComponent(
         searchParams.replace(SeekDirection.FORWARD, SeekDirection.BACKWARD)
       );
-      expect(screen.getAllByRole('listbox')[1]).toHaveTextContent(
+      expect(screen.getAllByRole('listbox')[3]).toHaveTextContent(
         SeekDirectionOptionsObj[SeekDirection.BACKWARD].label
       );
     });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
index 1d065f78076..fa78e364a73 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
@@ -26,7 +26,6 @@ describe('MessagesTable', () => {
   const contextValue: ContextProps = {
     isLive: false,
     seekDirection: SeekDirection.FORWARD,
-    searchParams,
     changeSeekDirection: jest.fn(),
   };
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx
index 0deb6266df4..86e6391bc61 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx
@@ -2,13 +2,16 @@ import React from 'react';
 import { useForm } from 'react-hook-form';
 import { useSearchParams } from 'react-router-dom';
 import Input from 'components/common/Input/Input';
-import { ConsumingMode } from 'lib/hooks/api/topicMessages';
+import { ConsumingMode, useSerdes } from 'lib/hooks/api/topicMessages';
 import Select from 'components/common/Select/Select';
 import { InputLabel } from 'components/common/Input/InputLabel.styled';
 import { Option } from 'react-multi-select-component';
 import { Button } from 'components/common/Button/Button';
-import { Partition } from 'generated-sources';
+import { Partition, SerdeUsage } from 'generated-sources';
 import { getModeOptions } from 'components/Topics/Topic/MessagesV2/utils/consumingModes';
+import { getSerdeOptions } from 'components/Topics/Topic/SendMessage/utils';
+import useAppParams from 'lib/hooks/useAppParams';
+import { RouteParamsClusterTopic } from 'lib/paths';
 
 import * as S from './FiltersBar.styled';
 import { setSeekTo } from './utils';
@@ -18,6 +21,8 @@ type FormValues = {
   offset: string;
   time: Date;
   partitions: Option[];
+  keySerde: string;
+  valueSerde: string;
 };
 
 const Form: React.FC<{ isFetching: boolean; partitions: Partition[] }> = ({
@@ -25,6 +30,11 @@ const Form: React.FC<{ isFetching: boolean; partitions: Partition[] }> = ({
   partitions,
 }) => {
   const [searchParams, setSearchParams] = useSearchParams();
+  const routerProps = useAppParams<RouteParamsClusterTopic>();
+  const { data: serdes = {} } = useSerdes({
+    ...routerProps,
+    use: SerdeUsage.DESERIALIZE,
+  });
 
   const {
     handleSubmit,
@@ -39,23 +49,34 @@ const Form: React.FC<{ isFetching: boolean; partitions: Partition[] }> = ({
       time: searchParams.get('t')
         ? new Date(Number(searchParams.get('t')))
         : Date.now(),
+      keySerde: searchParams.get('keySerde') as string,
+      valueSerde: searchParams.get('valueSerde') as string,
     } as FormValues,
   });
   const mode = watch('mode');
   const offset = watch('offset');
   const time = watch('time');
+  const keySerde = watch('keySerde');
+  const valueSerde = watch('valueSerde');
 
   const onSubmit = (values: FormValues) => {
     searchParams.set('m', values.mode);
+    if (values.keySerde) {
+      searchParams.set('keySerde', values.keySerde);
+    }
+    if (values.valueSerde) {
+      searchParams.set('valueSerde', values.valueSerde);
+    }
     searchParams.delete('o');
     searchParams.delete('t');
     searchParams.delete('a');
     searchParams.delete('page');
-    if (values.mode === 'fromOffset' || values.mode === 'toOffset') {
+    if (['fromOffset', 'toOffset'].includes(mode)) {
       searchParams.set('o', values.offset);
-    } else if (values.mode === 'sinceTime' || values.mode === 'untilTime') {
+    } else if (['sinceTime', 'untilTime'].includes(mode)) {
       searchParams.set('t', `${values.time.getTime()}`);
     }
+
     setSeekTo(searchParams, partitions);
     setSearchParams(searchParams);
     reset(values);
@@ -69,6 +90,10 @@ const Form: React.FC<{ isFetching: boolean; partitions: Partition[] }> = ({
   const handleOffsetChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setValue('offset', e.target.value, { shouldDirty: true });
   };
+  const handleSerdeChange =
+    (type: 'keySerde' | 'valueSerde') => (option: string | number) => {
+      setValue(type, String(option), { shouldDirty: true });
+    };
   const handleRefresh: React.MouseEventHandler<HTMLButtonElement> = (e) => {
     e.stopPropagation();
     e.preventDefault();
@@ -116,6 +141,30 @@ const Form: React.FC<{ isFetching: boolean; partitions: Partition[] }> = ({
           />
         </S.FilterRow>
       )}
+      <S.FilterRow>
+        <InputLabel>Key Serde</InputLabel>
+        <Select
+          id="selectKeySerdeOptions"
+          aria-labelledby="selectKeySerdeOptions"
+          onChange={handleSerdeChange('keySerde')}
+          options={getSerdeOptions(serdes.key || [])}
+          value={keySerde}
+          selectSize="M"
+          minWidth="100%"
+        />
+      </S.FilterRow>
+      <S.FilterRow>
+        <InputLabel>Content Serde</InputLabel>
+        <Select
+          id="selectValueSerdeOptions"
+          aria-labelledby="selectValueSerdeOptions"
+          onChange={handleSerdeChange('valueSerde')}
+          options={getSerdeOptions(serdes.value || [])}
+          value={valueSerde}
+          selectSize="M"
+          minWidth="100%"
+        />
+      </S.FilterRow>
       <S.FilterFooter>
         <Button
           buttonType="secondary"
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
index ca256684c25..da464fe808f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
@@ -52,6 +52,7 @@ export const StatusBarWrapper = styled.div(
     white-space: nowrap;
     display: flex;
     justify-content: space-between;
+    z-index: 10;
   `
 );
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx
index 07d65d3c37d..333ab4a243c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx
@@ -15,7 +15,6 @@ import MessagesTable from './MessagesTable/MessagesTable';
 import * as S from './Messages.styled';
 import Meta from './FiltersBar/Meta';
 import Form from './FiltersBar/Form';
-import { setSeekTo } from './FiltersBar/utils';
 import handleNextPageClick from './utils/handleNextPageClick';
 import StatusBar from './StatusBar';
 import AdvancedFilter from './Advanced Filter/AdvancedFilter';
@@ -39,30 +38,6 @@ const Messages = () => {
 
   const partitions = topic.partitions || [];
 
-  /**
-   * Search params:
-   * - `q` - search query
-   * - `m` - way the consumer is going to consume the messages..
-   * - `o` - offset
-   * - `t` - timestamp
-   * - `perPage` - number of messages per page
-   * - `seekTo` - offset or timestamp to seek to.
-   *    Format: `0-101.1-987` - [partition 0, offset 101], [partition 1, offset 987]
-   * - `page` - page number
-   */
-  React.useEffect(() => {
-    if (!mode) {
-      searchParams.set('m', 'newest');
-    }
-    if (!searchParams.get('perPage')) {
-      searchParams.set('perPage', MESSAGES_PER_PAGE);
-    }
-    if (!searchParams.get('seekTo')) {
-      setSeekTo(searchParams, partitions);
-    }
-    setSearchParams(searchParams);
-  }, [topic]);
-
   // Pagination is disabled in live mode, also we don't want to show the button
   // if we are fetching the messages or if we are at the end of the topic
   const isPaginationDisabled =
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesContainer.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesContainer.tsx
new file mode 100644
index 00000000000..cc763a953e3
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesContainer.tsx
@@ -0,0 +1,62 @@
+import React, { Suspense } from 'react';
+import { ConsumingMode, useSerdes } from 'lib/hooks/api/topicMessages';
+import useAppParams from 'lib/hooks/useAppParams';
+import { RouteParamsClusterTopic } from 'lib/paths';
+import { useSearchParams } from 'react-router-dom';
+import { useTopicDetails } from 'lib/hooks/api/topics';
+import { MESSAGES_PER_PAGE } from 'lib/constants';
+import { SerdeUsage } from 'generated-sources';
+
+import { setSeekTo } from './FiltersBar/utils';
+import { getDefaultSerdeName } from './utils/getDefaultSerdeName';
+import Messages from './Messages';
+
+const MessagesContainer = () => {
+  const routerProps = useAppParams<RouteParamsClusterTopic>();
+  const [searchParams, setSearchParams] = useSearchParams();
+  const { data: serdes = {} } = useSerdes({
+    ...routerProps,
+    use: SerdeUsage.DESERIALIZE,
+  });
+  const mode = searchParams.get('m') as ConsumingMode;
+  const { data: topic = { partitions: [] } } = useTopicDetails(routerProps);
+  const partitions = topic.partitions || [];
+
+  /**
+   * Search params:
+   * - `q` - search query
+   * - `m` - way the consumer is going to consume the messages..
+   * - `o` - offset
+   * - `t` - timestamp
+   * - `perPage` - number of messages per page
+   * - `seekTo` - offset or timestamp to seek to.
+   *    Format: `0-101.1-987` - [partition 0, offset 101], [partition 1, offset 987]
+   * - `page` - page number
+   */
+  React.useEffect(() => {
+    if (!mode) {
+      searchParams.set('m', 'newest');
+    }
+    if (!searchParams.get('perPage')) {
+      searchParams.set('perPage', MESSAGES_PER_PAGE);
+    }
+    if (!searchParams.get('seekTo')) {
+      setSeekTo(searchParams, partitions);
+    }
+    if (!searchParams.get('keySerde')) {
+      searchParams.set('keySerde', getDefaultSerdeName(serdes.key || []));
+    }
+    if (!searchParams.get('valueSerde')) {
+      searchParams.set('valueSerde', getDefaultSerdeName(serdes.value || []));
+    }
+    setSearchParams(searchParams);
+  }, [topic, serdes]);
+
+  return (
+    <Suspense>
+      <Messages />
+    </Suspense>
+  );
+};
+
+export default MessagesContainer;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/getDefaultSerdeName.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/getDefaultSerdeName.ts
new file mode 100644
index 00000000000..27fc112c819
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/getDefaultSerdeName.ts
@@ -0,0 +1,13 @@
+import { SerdeDescription } from 'generated-sources';
+import { getPrefferedDescription } from 'components/Topics/Topic/SendMessage/utils';
+
+export const getDefaultSerdeName = (serdes: SerdeDescription[]) => {
+  const preffered = getPrefferedDescription(serdes);
+  if (preffered) {
+    return preffered.name || '';
+  }
+  if (serdes.length > 0) {
+    return serdes[0].name || '';
+  }
+  return '';
+};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 50278a3501d..087abe537ae 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -1,131 +1,116 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { useForm, Controller } from 'react-hook-form';
 import { RouteParamsClusterTopic } from 'lib/paths';
-import jsf from 'json-schema-faker';
 import { Button } from 'components/common/Button/Button';
 import Editor from 'components/common/Editor/Editor';
 import Select, { SelectOption } from 'components/common/Select/Select';
 import useAppParams from 'lib/hooks/useAppParams';
 import { showAlert } from 'lib/errorHandling';
-import {
-  useSendMessage,
-  useTopicDetails,
-  useTopicMessageSchema,
-} from 'lib/hooks/api/topics';
+import { useSendMessage, useTopicDetails } from 'lib/hooks/api/topics';
 import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import { useSerdes } from 'lib/hooks/api/topicMessages';
+import { SerdeUsage } from 'generated-sources';
 
-import validateMessage from './validateMessage';
 import * as S from './SendMessage.styled';
+import {
+  getDefaultValues,
+  getPartitionOptions,
+  getSerdeOptions,
+  validateBySchema,
+} from './utils';
 
-type FieldValues = Partial<{
+interface FormType {
   key: string;
   content: string;
   headers: string;
-  partition: number | string;
-}>;
+  partition: number;
+  keySerde: string;
+  valueSerde: string;
+}
 
 const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
   const { data: topic } = useTopicDetails({ clusterName, topicName });
-  const { data: messageSchema } = useTopicMessageSchema({
+  const { data: serdes = {} } = useSerdes({
     clusterName,
     topicName,
+    use: SerdeUsage.SERIALIZE,
   });
   const sendMessage = useSendMessage({ clusterName, topicName });
 
-  jsf.option('fillProperties', false);
-  jsf.option('alwaysFakeOptionals', true);
-
-  const partitions = topic?.partitions || [];
-
-  const selectPartitionOptions: Array<SelectOption> = partitions.map((p) => {
-    const value = String(p.partition);
-    return { value, label: value };
-  });
-
-  const keyDefaultValue = React.useMemo(() => {
-    if (!messageSchema) {
-      return undefined;
-    }
-    return JSON.stringify(
-      jsf.generate(JSON.parse(messageSchema.key.schema)),
-      null,
-      '\t'
-    );
-  }, [messageSchema]);
-
-  const contentDefaultValue = React.useMemo(() => {
-    if (!messageSchema) {
-      return undefined;
-    }
-    return JSON.stringify(
-      jsf.generate(JSON.parse(messageSchema.value.schema)),
-      null,
-      '\t'
-    );
-  }, [messageSchema]);
-
+  const defaultValues = React.useMemo(() => getDefaultValues(serdes), [serdes]);
+  const partitionOptions: SelectOption[] = React.useMemo(
+    () => getPartitionOptions(topic?.partitions || []),
+    [topic]
+  );
   const {
     handleSubmit,
-    formState: { isSubmitting, isDirty },
+    formState: { isSubmitting },
     control,
-    reset,
-  } = useForm<FieldValues>({
+  } = useForm<FormType>({
     mode: 'onChange',
     defaultValues: {
-      key: keyDefaultValue,
-      content: contentDefaultValue,
-      headers: undefined,
-      partition: undefined,
+      ...defaultValues,
+      partition: Number(partitionOptions[0].value),
     },
   });
 
-  useEffect(() => {
-    reset({
-      key: keyDefaultValue,
-      content: contentDefaultValue,
-    });
-  }, [keyDefaultValue, contentDefaultValue, reset]);
+  const submit = async ({
+    keySerde,
+    valueSerde,
+    key,
+    content,
+    headers,
+    partition,
+  }: FormType) => {
+    let errors: string[] = [];
 
-  const submit = async (data: {
-    key: string;
-    content: string;
-    headers: string;
-    partition: number;
-  }) => {
-    if (messageSchema) {
-      const { partition, key, content } = data;
-      const errors = validateMessage(key, content, messageSchema);
-      if (data.headers) {
-        try {
-          JSON.parse(data.headers);
-        } catch (error) {
-          errors.push('Wrong header format');
-        }
-      }
-      if (errors.length > 0) {
-        showAlert('error', {
-          id: `${clusterName}-${topicName}-createTopicMessageError`,
-          title: 'Validation Error',
-          message: (
-            <ul>
-              {errors.map((e) => (
-                <li key={e}>{e}</li>
-              ))}
-            </ul>
-          ),
-        });
-        return;
+    if (keySerde) {
+      const selectedKeySerde = serdes.key?.find((k) => k.name === keySerde);
+      errors = validateBySchema(key, selectedKeySerde?.schema, 'key');
+    }
+
+    if (valueSerde) {
+      const selectedValue = serdes.value?.find((v) => v.name === valueSerde);
+      errors = [
+        ...errors,
+        ...validateBySchema(content, selectedValue?.schema, 'content'),
+      ];
+    }
+
+    let parsedHeaders;
+    if (headers) {
+      try {
+        parsedHeaders = JSON.parse(headers);
+      } catch (error) {
+        errors.push('Wrong header format');
       }
-      const headers = data.headers ? JSON.parse(data.headers) : undefined;
-      await sendMessage.mutateAsync({
-        key: !key ? null : key,
-        content: !content ? null : content,
-        headers,
-        partition: !partition ? 0 : partition,
+    }
+
+    if (errors.length > 0) {
+      showAlert('error', {
+        id: `${clusterName}-${topicName}-createTopicMessageError`,
+        title: 'Validation Error',
+        message: (
+          <ul>
+            {errors.map((e) => (
+              <li key={e}>{e}</li>
+            ))}
+          </ul>
+        ),
       });
-      onSubmit();
+      return;
     }
+
+    await sendMessage.mutateAsync({
+      key: key || null,
+      content: content || null,
+      headers: parsedHeaders,
+      partition: partition || 0,
+      keySerde,
+      valueSerde,
+    });
+    onSubmit();
   };
 
   return (
@@ -137,16 +122,51 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
             <Controller
               control={control}
               name="partition"
-              defaultValue={selectPartitionOptions[0].value}
-              render={({ field: { name, onChange } }) => (
+              render={({ field: { name, onChange, value } }) => (
                 <Select
                   id="selectPartitionOptions"
                   aria-labelledby="selectPartitionOptions"
                   name={name}
                   onChange={onChange}
-                  minWidth="100px"
-                  options={selectPartitionOptions}
-                  value={selectPartitionOptions[0].value}
+                  minWidth="100%"
+                  options={partitionOptions}
+                  value={value}
+                />
+              )}
+            />
+          </S.Column>
+          <S.Column>
+            <InputLabel>Key Serde</InputLabel>
+            <Controller
+              control={control}
+              name="keySerde"
+              render={({ field: { name, onChange, value } }) => (
+                <Select
+                  id="selectKeySerdeOptions"
+                  aria-labelledby="selectKeySerdeOptions"
+                  name={name}
+                  onChange={onChange}
+                  minWidth="100%"
+                  options={getSerdeOptions(serdes.key || [])}
+                  value={value}
+                />
+              )}
+            />
+          </S.Column>
+          <S.Column>
+            <InputLabel>Content Serde</InputLabel>
+            <Controller
+              control={control}
+              name="valueSerde"
+              render={({ field: { name, onChange, value } }) => (
+                <Select
+                  id="selectValueSerdeOptions"
+                  aria-labelledby="selectValueSerdeOptions"
+                  name={name}
+                  onChange={onChange}
+                  minWidth="100%"
+                  options={getSerdeOptions(serdes.value || [])}
+                  value={value}
                 />
               )}
             />
@@ -207,7 +227,7 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
           buttonSize="M"
           buttonType="primary"
           type="submit"
-          disabled={!isDirty || isSubmitting}
+          disabled={isSubmitting}
         >
           Produce Message
         </Button>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
index b72e0fe6ca6..a4a5c12ef7c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
@@ -1,16 +1,14 @@
 import React from 'react';
 import SendMessage from 'components/Topics/Topic/SendMessage/SendMessage';
-import { act, screen } from '@testing-library/react';
+import { act, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterTopicPath } from 'lib/paths';
-import validateMessage from 'components/Topics/Topic/SendMessage/validateMessage';
-import { externalTopicPayload, topicMessageSchema } from 'lib/fixtures/topics';
-import {
-  useSendMessage,
-  useTopicDetails,
-  useTopicMessageSchema,
-} from 'lib/hooks/api/topics';
+import { validateBySchema } from 'components/Topics/Topic/SendMessage/utils';
+import { externalTopicPayload } from 'lib/fixtures/topics';
+import { useSendMessage, useTopicDetails } from 'lib/hooks/api/topics';
+import { useSerdes } from 'lib/hooks/api/topicMessages';
+import { serdesPayload } from 'lib/fixtures/topicMessages';
 
 import Mock = jest.Mock;
 
@@ -23,9 +21,10 @@ jest.mock('json-schema-faker', () => ({
   option: jest.fn(),
 }));
 
-jest.mock('components/Topics/Topic/SendMessage/validateMessage', () =>
-  jest.fn()
-);
+jest.mock('components/Topics/Topic/SendMessage/utils', () => ({
+  ...jest.requireActual('components/Topics/Topic/SendMessage/utils'),
+  validateBySchema: jest.fn(),
+}));
 
 jest.mock('lib/errorHandling', () => ({
   ...jest.requireActual('lib/errorHandling'),
@@ -34,10 +33,13 @@ jest.mock('lib/errorHandling', () => ({
 
 jest.mock('lib/hooks/api/topics', () => ({
   useTopicDetails: jest.fn(),
-  useTopicMessageSchema: jest.fn(),
   useSendMessage: jest.fn(),
 }));
 
+jest.mock('lib/hooks/api/topicMessages', () => ({
+  useSerdes: jest.fn(),
+}));
+
 const clusterName = 'testCluster';
 const topicName = externalTopicPayload.name;
 
@@ -58,14 +60,18 @@ const renderComponent = async () => {
 const renderAndSubmitData = async (error: string[] = []) => {
   await renderComponent();
   await act(() => {
-    userEvent.click(screen.getByRole('listbox'));
+    userEvent.click(screen.getAllByRole('listbox')[0]);
   });
   await act(() => {
     userEvent.click(screen.getAllByRole('option')[1]);
   });
+  (validateBySchema as Mock).mockImplementation(() => error);
+  const submitButton = screen.getByRole('button', {
+    name: 'Produce Message',
+  });
+  await waitFor(() => expect(submitButton).toBeEnabled());
   await act(() => {
-    (validateMessage as Mock).mockImplementation(() => error);
-    userEvent.click(screen.getByText('Produce Message'));
+    userEvent.click(submitButton);
   });
 };
 
@@ -74,15 +80,12 @@ describe('SendMessage', () => {
     (useTopicDetails as jest.Mock).mockImplementation(() => ({
       data: externalTopicPayload,
     }));
+    (useSerdes as jest.Mock).mockImplementation(() => ({
+      data: serdesPayload,
+    }));
   });
 
   describe('when schema is fetched', () => {
-    beforeEach(() => {
-      (useTopicMessageSchema as jest.Mock).mockImplementation(() => ({
-        data: topicMessageSchema,
-      }));
-    });
-
     it('calls sendTopicMessage on submit', async () => {
       const sendTopicMessageMock = jest.fn();
       (useSendMessage as jest.Mock).mockImplementation(() => ({
@@ -105,11 +108,6 @@ describe('SendMessage', () => {
   });
 
   describe('when schema is empty', () => {
-    beforeEach(() => {
-      (useTopicMessageSchema as jest.Mock).mockImplementation(() => ({
-        data: undefined,
-      }));
-    });
     it('renders if schema is not defined', async () => {
       await renderComponent();
       expect(screen.getAllByRole('textbox')[0].nodeValue).toBeNull();
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/utils.spec.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/utils.spec.ts
new file mode 100644
index 00000000000..6dbfe5fb6f2
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/utils.spec.ts
@@ -0,0 +1,85 @@
+import { serdesPayload } from 'lib/fixtures/topicMessages';
+import {
+  getDefaultValues,
+  getSerdeOptions,
+  validateBySchema,
+} from 'components/Topics/Topic/SendMessage/utils';
+import { SerdeDescription } from 'generated-sources';
+
+describe('SendMessage utils', () => {
+  describe('getDefaultValues', () => {
+    it('should return default values', () => {
+      const actual = getDefaultValues(serdesPayload);
+      expect(actual.keySerde).toEqual(
+        serdesPayload.key?.find((item) => item.preferred)?.name
+      );
+      expect(actual.key).not.toBeUndefined();
+      expect(actual.valueSerde).toEqual(
+        serdesPayload.value?.find((item) => item.preferred)?.name
+      );
+      expect(actual.content).not.toBeUndefined();
+    });
+    it('works even with empty serdes', () => {
+      const actual = getDefaultValues({});
+      expect(actual.keySerde).toBeUndefined();
+      expect(actual.key).toBeUndefined();
+      expect(actual.valueSerde).toBeUndefined();
+      expect(actual.content).toBeUndefined();
+    });
+  });
+  describe('getSerdeOptions', () => {
+    it('should return options', () => {
+      const options = getSerdeOptions(serdesPayload.key as SerdeDescription[]);
+      expect(options).toHaveLength(2);
+    });
+    it('should skip options without label', () => {
+      const keySerdes = serdesPayload.key as SerdeDescription[];
+      const payload = [{ ...keySerdes[0], name: undefined }, keySerdes[1]];
+      const options = getSerdeOptions(payload);
+      expect(options).toHaveLength(1);
+    });
+  });
+  describe('validateBySchema', () => {
+    const defaultSchema = '{"type": "integer", "minimum" : 1, "maximum" : 2 }';
+
+    it('should return empty error data if value is empty', () => {
+      expect(validateBySchema('', defaultSchema, 'key')).toHaveLength(0);
+    });
+
+    it('should return empty error data if schema is empty', () => {
+      expect(validateBySchema('My Value', '', 'key')).toHaveLength(0);
+    });
+
+    it('should return parsing error data if schema is not parsed with type of key', () => {
+      const schema = '{invalid';
+      expect(validateBySchema('My Value', schema, 'key')).toEqual([
+        `Error in parsing the "key" field schema`,
+      ]);
+    });
+    it('should return parsing error data if schema is not parsed with type of key', () => {
+      const schema = '{invalid';
+      expect(validateBySchema('My Value', schema, 'content')).toEqual([
+        `Error in parsing the "content" field schema`,
+      ]);
+    });
+    it('should return empty error data if schema type is string', () => {
+      const schema = `{"type": "string"}`;
+      expect(validateBySchema('My Value', schema, 'key')).toHaveLength(0);
+    });
+    it('returns errors on invalid input data', () => {
+      expect(validateBySchema('0', defaultSchema, 'key')).toEqual([
+        'Key/minimum - must be >= 1',
+      ]);
+    });
+    it('returns error on broken key value', () => {
+      expect(validateBySchema('{120', defaultSchema, 'key')).toEqual([
+        'Error in parsing the "key" field value',
+      ]);
+    });
+    it('returns error on broken content value', () => {
+      expect(validateBySchema('{120', defaultSchema, 'content')).toEqual([
+        'Error in parsing the "content" field value',
+      ]);
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/validateMessage.spec.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/validateMessage.spec.ts
deleted file mode 100644
index cc4e809bde6..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/validateMessage.spec.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import validateMessage from 'components/Topics/Topic/SendMessage/validateMessage';
-import { topicMessageSchema } from 'lib/fixtures/topics';
-import cloneDeep from 'lodash/cloneDeep';
-
-describe('validateMessage', () => {
-  const defaultValidKey = `{"f1": 32, "f2": "multi-state", "schema": "Bedfordshire violet SAS"}`;
-  const defaultValidContent = `{"f1": 21128, "f2": "Health Berkshire", "schema": "Dynamic"}`;
-
-  it('should return empty error data if value is empty', () => {
-    const key = ``;
-    const content = ``;
-    expect(validateMessage(key, content, topicMessageSchema)).toEqual([]);
-  });
-
-  it('should return empty error data if schema is empty', () => {
-    const key = `{"f1": 32, "f2": "multi-state", "schema": "Bedfordshire violet SAS"}`;
-    const content = `{"f1": 21128, "f2": "Health Berkshire", "schema": "Dynamic"}`;
-    const schema = cloneDeep(topicMessageSchema);
-    schema.key.schema = '';
-    schema.value.schema = '';
-    expect(validateMessage(key, content, schema)).toEqual([]);
-  });
-
-  it('should return parsing error data if schema is not parsed with type of key', () => {
-    const schema = cloneDeep(topicMessageSchema);
-    schema.key.schema = '{invalid';
-    expect(
-      validateMessage(defaultValidKey, defaultValidContent, schema)
-    ).toEqual([`Error in parsing the "key" field schema`]);
-  });
-
-  it('should return parsing error data if schema is not parsed with type of value', () => {
-    const schema = cloneDeep(topicMessageSchema);
-    schema.value.schema = '{invalid';
-    expect(
-      validateMessage(defaultValidKey, defaultValidContent, schema)
-    ).toEqual([`Error in parsing the "content" field schema`]);
-  });
-
-  it('should return empty error data if schema type is string', () => {
-    const schema = cloneDeep(topicMessageSchema);
-    schema.key.schema = `{"type": "string"}`;
-    schema.value.schema = `{"type": "string"}`;
-    expect(
-      validateMessage(defaultValidKey, defaultValidContent, schema)
-    ).toEqual([]);
-  });
-
-  it('should return  error data if compile Ajv data throws an error', () => {
-    expect(
-      validateMessage(defaultValidKey, defaultValidContent, topicMessageSchema)
-    ).toEqual([]);
-  });
-
-  it('returns no errors on correct input data', () => {
-    expect(
-      validateMessage(
-        defaultValidContent,
-        defaultValidContent,
-        topicMessageSchema
-      )
-    ).toEqual([]);
-  });
-
-  it('returns errors on invalid input data', () => {
-    const key = `{"f1": "32", "f2": "multi-state", "schema": "Bedfordshire violet SAS"}`;
-    const content = `{"f1": "21128", "f2": "Health Berkshire", "schema": "Dynamic"}`;
-    expect(validateMessage(key, content, topicMessageSchema)).toEqual([
-      'Key/properties/f1/type - must be integer',
-      'Content/properties/f1/type - must be integer',
-    ]);
-  });
-
-  it('returns error on broken key value', () => {
-    const key = `{"f1": "32", "f2": "multi-state", "schema": "Bedfordshire violet SAS"`;
-    const content = `{"f1": 21128, "f2": "Health Berkshire", "schema": "Dynamic"}`;
-    expect(validateMessage(key, content, topicMessageSchema)).toEqual([
-      'Error in parsing the "key" field value',
-    ]);
-  });
-
-  it('returns error on broken content value', () => {
-    const key = `{"f1": 32, "f2": "multi-state", "schema": "Bedfordshire violet SAS"}`;
-    const content = `{"f1": 21128, "f2": "Health Berkshire", "schema": "Dynamic"`;
-    expect(validateMessage(key, content, topicMessageSchema)).toEqual([
-      'Error in parsing the "content" field value',
-    ]);
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
new file mode 100644
index 00000000000..cbafcfeea10
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
@@ -0,0 +1,97 @@
+import {
+  Partition,
+  SerdeDescription,
+  TopicSerdeSuggestion,
+} from 'generated-sources';
+import jsf from 'json-schema-faker';
+import { compact } from 'lodash';
+import Ajv, { DefinedError } from 'ajv/dist/2020';
+import upperFirst from 'lodash/upperFirst';
+
+jsf.option('fillProperties', false);
+jsf.option('alwaysFakeOptionals', true);
+
+const generateValueFromSchema = (preffered?: SerdeDescription) => {
+  if (!preffered?.schema) {
+    return undefined;
+  }
+  const parsedSchema = JSON.parse(preffered.schema);
+  const value = jsf.generate(parsedSchema);
+  return JSON.stringify(value);
+};
+
+export const getPrefferedDescription = (serdes: SerdeDescription[]) =>
+  serdes.find((s) => s.preferred);
+
+export const getDefaultValues = (serdes: TopicSerdeSuggestion) => {
+  const keySerde = getPrefferedDescription(serdes.key || []);
+  const valueSerde = getPrefferedDescription(serdes.value || []);
+
+  return {
+    key: generateValueFromSchema(keySerde),
+    content: generateValueFromSchema(valueSerde),
+    headers: undefined,
+    partition: undefined,
+    keySerde: keySerde?.name,
+    valueSerde: valueSerde?.name,
+  };
+};
+
+export const getPartitionOptions = (partitions: Partition[]) =>
+  partitions.map(({ partition }) => ({
+    label: `Partition #${partition}`,
+    value: partition,
+  }));
+
+export const getSerdeOptions = (items: SerdeDescription[]) => {
+  const options = items.map(({ name }) => {
+    if (!name) return undefined;
+    return { label: name, value: name };
+  });
+
+  return compact(options);
+};
+
+export const validateBySchema = (
+  value: string,
+  schema: string | undefined,
+  type: 'key' | 'content'
+) => {
+  let errors: string[] = [];
+
+  if (!value || !schema) {
+    return errors;
+  }
+
+  let parcedSchema;
+  let parsedValue;
+
+  try {
+    parcedSchema = JSON.parse(schema);
+  } catch (e) {
+    return [`Error in parsing the "${type}" field schema`];
+  }
+  if (parcedSchema.type === 'string') {
+    return [];
+  }
+  try {
+    parsedValue = JSON.parse(value);
+  } catch (e) {
+    return [`Error in parsing the "${type}" field value`];
+  }
+  try {
+    const validate = new Ajv().compile(parcedSchema);
+    validate(parsedValue);
+    if (validate.errors) {
+      errors = validate.errors.map(
+        ({ schemaPath, message }) =>
+          `${schemaPath.replace('#', upperFirst(type))} - ${message}`
+      );
+    }
+  } catch (e) {
+    const err = e as DefinedError;
+    return [`${upperFirst(type)} ${err.message}`];
+  }
+
+  return errors;
+};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts
deleted file mode 100644
index 2d3aa23740e..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/validateMessage.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { TopicMessageSchema } from 'generated-sources';
-import Ajv, { DefinedError } from 'ajv/dist/2020';
-import upperFirst from 'lodash/upperFirst';
-
-const validateBySchema = (
-  value: string,
-  schema: string | undefined,
-  type: 'key' | 'content'
-) => {
-  let errors: string[] = [];
-
-  if (!value || !schema) {
-    return errors;
-  }
-
-  let parcedSchema;
-  let parsedValue;
-
-  try {
-    parcedSchema = JSON.parse(schema);
-  } catch (e) {
-    return [`Error in parsing the "${type}" field schema`];
-  }
-  if (parcedSchema.type === 'string') {
-    return [];
-  }
-  try {
-    parsedValue = JSON.parse(value);
-  } catch (e) {
-    return [`Error in parsing the "${type}" field value`];
-  }
-  try {
-    const validate = new Ajv().compile(parcedSchema);
-    validate(parsedValue);
-    if (validate.errors) {
-      errors = validate.errors.map(
-        ({ schemaPath, message }) =>
-          `${schemaPath.replace('#', upperFirst(type))} - ${message}`
-      );
-    }
-  } catch (e) {
-    const err = e as DefinedError;
-    return [`${upperFirst(type)} ${err.message}`];
-  }
-
-  return errors;
-};
-
-const validateMessage = (
-  key: string,
-  content: string,
-  messageSchema: TopicMessageSchema | undefined
-): string[] => [
-  ...validateBySchema(key, messageSchema?.key?.schema, 'key'),
-  ...validateBySchema(content, messageSchema?.value?.schema, 'content'),
-];
-
-export default validateMessage;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index 4bb8aa28bc5..2f0662ac221 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -35,7 +35,8 @@ import SlidingSidebar from 'components/common/SlidingSidebar';
 import useBoolean from 'lib/hooks/useBoolean';
 
 import Messages from './Messages/Messages';
-import MessagesV2 from './MessagesV2/Messages';
+// Messages v2
+import MessagesContainer from './MessagesV2/MessagesContainer';
 import Overview from './Overview/Overview';
 import Settings from './Settings/Settings';
 import TopicConsumerGroups from './ConsumerGroups/TopicConsumerGroups';
@@ -185,7 +186,7 @@ const Topic: React.FC = () => {
             path={clusterTopicMessagesRelativePath}
             element={<Messages />}
           />
-          <Route path="v2" element={<MessagesV2 />} />
+          <Route path="v2" element={<MessagesContainer />} />
           <Route
             path={clusterTopicSettingsRelativePath}
             element={<Settings />}
@@ -206,7 +207,9 @@ const Topic: React.FC = () => {
         onClose={closeSidebar}
         title="Produce Message"
       >
-        <SendMessage onSubmit={closeSidebar} />
+        <Suspense fallback={<PageLoader />}>
+          <SendMessage onSubmit={closeSidebar} />
+        </Suspense>
       </SlidingSidebar>
     </>
   );
diff --git a/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx b/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx
index 949a75b2ef2..794583dae73 100644
--- a/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx
@@ -23,7 +23,7 @@ describe('TableHeaderCell', () => {
       <table>
         <thead>
           <tr>
-            <TableHeaderCell {...props} />;
+            <TableHeaderCell {...props} />
           </tr>
         </thead>
       </table>
diff --git a/kafka-ui-react-app/src/components/contexts/TopicMessagesContext.ts b/kafka-ui-react-app/src/components/contexts/TopicMessagesContext.ts
index 642052b27e8..3ca2ca65521 100644
--- a/kafka-ui-react-app/src/components/contexts/TopicMessagesContext.ts
+++ b/kafka-ui-react-app/src/components/contexts/TopicMessagesContext.ts
@@ -3,7 +3,6 @@ import { SeekDirection } from 'generated-sources';
 
 export interface ContextProps {
   seekDirection: SeekDirection;
-  searchParams: URLSearchParams;
   changeSeekDirection(val: string): void;
   isLive: boolean;
 }
diff --git a/kafka-ui-react-app/src/lib/fixtures/topicMessages.ts b/kafka-ui-react-app/src/lib/fixtures/topicMessages.ts
new file mode 100644
index 00000000000..3288cc7e825
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/fixtures/topicMessages.ts
@@ -0,0 +1,38 @@
+import { TopicSerdeSuggestion } from 'generated-sources';
+
+export const serdesPayload: TopicSerdeSuggestion = {
+  key: [
+    {
+      name: 'String',
+      description: undefined,
+      preferred: false,
+      schema: undefined,
+      additionalProperties: undefined,
+    },
+    {
+      name: 'Int32',
+      description: undefined,
+      preferred: true,
+      schema:
+        '{   "type" : "integer",   "minimum" : -2147483648,   "maximum" : 2147483647 }',
+      additionalProperties: {},
+    },
+  ],
+  value: [
+    {
+      name: 'String',
+      description: undefined,
+      preferred: false,
+      schema: undefined,
+      additionalProperties: undefined,
+    },
+    {
+      name: 'Int64',
+      description: undefined,
+      preferred: true,
+      schema:
+        '{   "type" : "integer",   "minimum" : -9223372036854775808,   "maximum" : 9223372036854775807 }',
+      additionalProperties: {},
+    },
+  ],
+};
diff --git a/kafka-ui-react-app/src/lib/fixtures/topics.ts b/kafka-ui-react-app/src/lib/fixtures/topics.ts
index aa7f3cf058c..6fda7c2764d 100644
--- a/kafka-ui-react-app/src/lib/fixtures/topics.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/topics.ts
@@ -4,7 +4,6 @@ import {
   ConsumerGroupState,
   Topic,
   TopicConfig,
-  MessageSchemaSourceEnum,
   TopicAnalysis,
 } from 'generated-sources';
 
@@ -161,55 +160,6 @@ export const topicConfigPayload: TopicConfig[] = [
   },
 ];
 
-export const topicMessageSchema = {
-  key: {
-    name: 'key',
-    source: MessageSchemaSourceEnum.SCHEMA_REGISTRY,
-    schema: `{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "http://example.com/myURI.schema.json",
-  "title": "TestRecord",
-  "type": "object",
-  "additionalProperties": false,
-  "properties": {
-    "f1": {
-      "type": "integer"
-    },
-    "f2": {
-      "type": "string"
-    },
-    "schema": {
-      "type": "string"
-    }
-  }
-}
-`,
-  },
-  value: {
-    name: 'value',
-    source: MessageSchemaSourceEnum.SCHEMA_REGISTRY,
-    schema: `{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "http://example.com/myURI1.schema.json",
-  "title": "TestRecord",
-  "type": "object",
-  "additionalProperties": false,
-  "properties": {
-    "f1": {
-      "type": "integer"
-    },
-    "f2": {
-      "type": "string"
-    },
-    "schema": {
-      "type": "string"
-    }
-  }
-}
-`,
-  },
-};
-
 const topicStatsSize = {
   sum: 0,
   avg: 0,
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/topicMessages.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topicMessages.spec.ts
new file mode 100644
index 00000000000..49a143f227b
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topicMessages.spec.ts
@@ -0,0 +1,36 @@
+import { waitFor } from '@testing-library/react';
+import { renderQueryHook } from 'lib/testHelpers';
+import * as hooks from 'lib/hooks/api/topicMessages';
+import fetchMock from 'fetch-mock';
+import { UseQueryResult } from '@tanstack/react-query';
+import { SerdeUsage } from 'generated-sources';
+
+const clusterName = 'test-cluster';
+const topicName = 'test-topic';
+
+const expectQueryWorks = async (
+  mock: fetchMock.FetchMockStatic,
+  result: { current: UseQueryResult<unknown, unknown> }
+) => {
+  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
+  expect(mock.calls()).toHaveLength(1);
+  expect(result.current.data).toBeDefined();
+};
+
+jest.mock('lib/errorHandling', () => ({
+  ...jest.requireActual('lib/errorHandling'),
+  showServerError: jest.fn(),
+}));
+
+describe('Topic Messages hooks', () => {
+  beforeEach(() => fetchMock.restore());
+  it('handles useSerdes', async () => {
+    const path = `/api/clusters/${clusterName}/topic/${topicName}/serdes?use=SERIALIZE`;
+
+    const mock = fetchMock.getOnce(path, {});
+    const { result } = renderQueryHook(() =>
+      hooks.useSerdes({ clusterName, topicName, use: SerdeUsage.SERIALIZE })
+    );
+    await expectQueryWorks(mock, result);
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
index 6909989e340..b340084ff9a 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
@@ -55,13 +55,6 @@ describe('Topics hooks', () => {
     );
     await expectQueryWorks(mock, result);
   });
-  it('handles useTopicMessageSchema', async () => {
-    const mock = fetchMock.getOnce(`${topicPath}/messages/schema`, {});
-    const { result } = renderQueryHook(() =>
-      hooks.useTopicMessageSchema(topicParams)
-    );
-    await expectQueryWorks(mock, result);
-  });
   describe('useTopicAnalysis', () => {
     it('handles useTopicAnalysis', async () => {
       const mock = fetchMock.getOnce(`${topicPath}/analysis`, {});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
index 80c9ea02ab9..941841f11ba 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
@@ -3,6 +3,7 @@ import { fetchEventSource } from '@microsoft/fetch-event-source';
 import { BASE_PARAMS, MESSAGES_PER_PAGE } from 'lib/constants';
 import { ClusterName } from 'redux/interfaces';
 import {
+  GetSerdesRequest,
   SeekDirection,
   SeekType,
   TopicMessage,
@@ -13,6 +14,8 @@ import {
 import { showServerError } from 'lib/errorHandling';
 import toast from 'react-hot-toast';
 import { StopLoading } from 'components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled';
+import { useQuery } from '@tanstack/react-query';
+import { messagesApiClient } from 'lib/api';
 
 interface UseTopicMessagesProps {
   clusterName: ClusterName;
@@ -53,6 +56,8 @@ export const useTopicMessages = ({
         limit,
         seekTo: seekTo.replaceAll('-', '::').replaceAll('.', ','),
         q: searchParams.get('q') || '',
+        keySerde: searchParams.get('keySerde') || '',
+        valueSerde: searchParams.get('valueSerde') || '',
       });
 
       switch (mode) {
@@ -175,3 +180,17 @@ export const useTopicMessages = ({
     isFetching,
   };
 };
+
+export function useSerdes(props: GetSerdesRequest) {
+  const { clusterName, topicName, use } = props;
+  return useQuery(
+    ['clusters', clusterName, 'topics', topicName, 'serdes', use],
+    () => messagesApiClient.getSerdes(props),
+    {
+      refetchOnMount: false,
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: false,
+      refetchInterval: false,
+    }
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
index cbc2e9c54cf..2562d04e72b 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topics.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -215,11 +215,6 @@ export function useRecreateTopic(props: GetTopicDetailsRequest) {
   });
 }
 
-export function useTopicMessageSchema(props: GetTopicDetailsRequest) {
-  return useQuery(topicKeys.schema(props), () =>
-    messagesApi.getTopicSchema(props)
-  );
-}
 export function useSendMessage(props: GetTopicDetailsRequest) {
   const client = useQueryClient();
   return useMutation(
@@ -233,9 +228,7 @@ export function useSendMessage(props: GetTopicDetailsRequest) {
         client.invalidateQueries(topicKeys.all(props.clusterName));
       },
       onError: (e) => {
-        showServerError(e as Response, {
-          message: `Error in sending a message to ${props.topicName}`,
-        });
+        showServerError(e as Response);
       },
     }
   );
diff --git a/kafka-ui-react-app/src/lib/hooks/useSearch.ts b/kafka-ui-react-app/src/lib/hooks/useSearch.ts
deleted file mode 100644
index a1d4be5ec52..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/useSearch.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { useCallback, useEffect, useMemo } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
-
-const SEARCH_QUERY_ARG = 'q';
-
-// meant for use with <Search> component
-// returns value of Q search param (?q='something') and callback to change it
-const useSearch = (initValue = ''): [string, (value: string) => void] => {
-  const navigate = useNavigate();
-  const { search } = useLocation();
-  const queryParams = useMemo(() => new URLSearchParams(search), [search]);
-  const q = useMemo(
-    () => queryParams.get(SEARCH_QUERY_ARG)?.trim(),
-    [queryParams]
-  );
-  const page = useMemo(() => queryParams.get('page')?.trim(), [queryParams]);
-
-  // set intial value
-  useEffect(() => {
-    if (initValue.trim() !== '' && !q) {
-      queryParams.set(SEARCH_QUERY_ARG, initValue.trim());
-      navigate({ search: queryParams.toString() });
-    }
-  }, [navigate, initValue, q, queryParams]);
-
-  const handleChange = useCallback(
-    (value: string) => {
-      const trimmedValue = value.trim();
-      if (trimmedValue !== q) {
-        if (trimmedValue) {
-          queryParams.set(SEARCH_QUERY_ARG, trimmedValue);
-        } else {
-          queryParams.delete(SEARCH_QUERY_ARG);
-        }
-        // If we were on page 3 we can't determine if new search results have 3 pages - so we always reset page
-        if (page) {
-          queryParams.delete('page');
-        }
-        navigate(
-          {
-            search: queryParams.toString(),
-          },
-          { replace: true }
-        );
-      }
-    },
-    [q, page, navigate, queryParams]
-  );
-
-  return [q || initValue.trim() || '', handleChange];
-};
-
-export default useSearch;
diff --git a/kafka-ui-serde-api/pom.xml b/kafka-ui-serde-api/pom.xml
new file mode 100644
index 00000000000..3b2b9f55fa9
--- /dev/null
+++ b/kafka-ui-serde-api/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>kafka-ui</artifactId>
+        <groupId>com.provectus</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>kafka-ui-serde-api</artifactId>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+            </plugin>
+        </plugins>
+
+    </build>
+</project>
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/DeserializeResult.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/DeserializeResult.java
new file mode 100644
index 00000000000..bf965d124da
--- /dev/null
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/DeserializeResult.java
@@ -0,0 +1,59 @@
+package com.provectus.kafka.ui.serde.api;
+
+import java.util.Map;
+
+public final class DeserializeResult {
+
+  public enum Type {
+    STRING, JSON
+  }
+
+  private final String result;
+  private final Type type;
+  private final Map<String, Object> additionalProperties;
+
+  public DeserializeResult(String result, Type type, Map<String, Object> additionalProperties) {
+    this.result = result;
+    this.type = type;
+    this.additionalProperties = additionalProperties;
+  }
+
+  public String getResult() {
+    return result;
+  }
+
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  public Type getType() {
+    return type;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    DeserializeResult that = (DeserializeResult) o;
+    if (!result.equals(that.result)) {
+      return false;
+    }
+    if (type != that.type) {
+      return false;
+    }
+    return additionalProperties.equals(that.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = this.result.hashCode();
+    result = 31 * result + type.hashCode();
+    result = 31 * result + additionalProperties.hashCode();
+    return result;
+  }
+}
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java
new file mode 100644
index 00000000000..7eb81b43b8f
--- /dev/null
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java
@@ -0,0 +1,15 @@
+package com.provectus.kafka.ui.serde.api;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public interface PropertyResolver {
+
+  <T> Optional<T> getProperty(String key, Class<T> targetType);
+
+  <T> Optional<List<T>> getListProperty(String key, Class<T> itemType);
+
+  <K, V> Optional<Map<K, V>> getMapProperty(String key, Class<K> keyType, Class<V> valueType);
+
+}
\ No newline at end of file
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/RecordHeader.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/RecordHeader.java
new file mode 100644
index 00000000000..41762c0c800
--- /dev/null
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/RecordHeader.java
@@ -0,0 +1,9 @@
+package com.provectus.kafka.ui.serde.api;
+
+public interface RecordHeader {
+
+  String key();
+
+  byte[] value();
+
+}
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/RecordHeaders.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/RecordHeaders.java
new file mode 100644
index 00000000000..800adca26ad
--- /dev/null
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/RecordHeaders.java
@@ -0,0 +1,5 @@
+package com.provectus.kafka.ui.serde.api;
+
+
+public interface RecordHeaders extends Iterable<RecordHeader> {
+}
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/SchemaDescription.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/SchemaDescription.java
new file mode 100644
index 00000000000..64454754520
--- /dev/null
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/SchemaDescription.java
@@ -0,0 +1,23 @@
+package com.provectus.kafka.ui.serde.api;
+
+import java.util.Map;
+
+public final class SchemaDescription {
+
+  // can be json schema or plain text
+  private final String schema;
+  private final Map<String, Object> additionalProperties;
+
+  public SchemaDescription(String schema, Map<String, Object> additionalProperties) {
+    this.schema = schema;
+    this.additionalProperties = additionalProperties;
+  }
+
+  public String getSchema() {
+    return schema;
+  }
+
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+}
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java
new file mode 100644
index 00000000000..58cc1efb7b2
--- /dev/null
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java
@@ -0,0 +1,39 @@
+package com.provectus.kafka.ui.serde.api;
+
+import java.util.Optional;
+
+public interface Serde {
+
+  enum Target {
+    KEY, VALUE
+  }
+
+  void configure(
+      PropertyResolver serdeProperties,
+      PropertyResolver kafkaClusterProperties,
+      PropertyResolver globalProperties
+  );
+
+  Optional<String> getDescription();
+
+  Optional<SchemaDescription> getSchema(String topic, Target type);
+
+  boolean canDeserialize(String topic, Target type);
+
+  boolean canSerialize(String topic, Target type);
+
+  //----------------------------------------------------------------------------
+
+  Serializer serializer(String topic, Target type);
+
+  Deserializer deserializer(String topic, Target type);
+
+  interface Serializer {
+    byte[] serialize(String input);
+  }
+
+  interface Deserializer {
+    DeserializeResult deserialize(RecordHeaders headers, byte[] data);
+  }
+
+}
diff --git a/pom.xml b/pom.xml
index 513752c85f7..c8b8d5d5c3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,7 @@
     <modules>
         <module>kafka-ui-contract</module>
         <module>kafka-ui-api</module>
+        <module>kafka-ui-serde-api</module>
         <module>kafka-ui-e2e-checks</module>
     </modules>
 

From 97f1c639a3556725ee7205718f6e16f40f3753d3 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 28 Sep 2022 14:08:17 +0400
Subject: [PATCH 187/734] 1. fixing infinite recursion with cyclic references
 (#2640)

2. using record names in unions to make possible to use several record
3. tests refactored

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../jsonschema/AvroJsonSchemaConverter.java   |  70 ++++--
 .../AvroJsonSchemaConverterTest.java          | 223 ++++++++++++------
 2 files changed, 198 insertions(+), 95 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
index 61f742e7214..8c703526139 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
@@ -4,7 +4,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.avro.Schema;
@@ -22,7 +21,7 @@ public JsonSchema convert(URI basePath, Schema schema) {
     builder.type(type);
 
     Map<String, FieldSchema> definitions = new HashMap<>();
-    final FieldSchema root = convertSchema("root", schema, definitions, false);
+    final FieldSchema root = convertSchema(schema, definitions, true);
     builder.definitions(definitions);
 
     if (type.getType().equals(JsonType.Type.OBJECT)) {
@@ -36,11 +35,11 @@ public JsonSchema convert(URI basePath, Schema schema) {
 
 
   private FieldSchema convertField(Schema.Field field, Map<String, FieldSchema> definitions) {
-    return convertSchema(field.name(), field.schema(), definitions, true);
+    return convertSchema(field.schema(), definitions, false);
   }
 
-  private FieldSchema convertSchema(String name, Schema schema,
-                                    Map<String, FieldSchema> definitions, boolean ref) {
+  private FieldSchema convertSchema(Schema schema,
+                                    Map<String, FieldSchema> definitions, boolean isRoot) {
     if (!schema.isUnion()) {
       JsonType type = convertType(schema);
       switch (type.getType()) {
@@ -53,12 +52,12 @@ private FieldSchema convertSchema(String name, Schema schema,
           return new SimpleFieldSchema(type);
         case OBJECT:
           if (schema.getType().equals(Schema.Type.MAP)) {
-            return new MapFieldSchema(convertSchema(name, schema.getValueType(), definitions, ref));
+            return new MapFieldSchema(convertSchema(schema.getValueType(), definitions, isRoot));
           } else {
-            return createObjectSchema(name, schema, definitions, ref);
+            return createObjectSchema(schema, definitions, isRoot);
           }
         case ARRAY:
-          return createArraySchema(name, schema, definitions);
+          return createArraySchema(schema, definitions);
         default:
           throw new RuntimeException("Unknown type");
       }
@@ -67,20 +66,26 @@ private FieldSchema convertSchema(String name, Schema schema,
     }
   }
 
-  private FieldSchema createUnionSchema(Schema schema, Map<String, FieldSchema> definitions) {
 
+  // this method formats json-schema field in a way
+  // to fit avro-> json encoding rules (https://avro.apache.org/docs/1.11.1/specification/_print/#json-encoding)
+  private FieldSchema createUnionSchema(Schema schema, Map<String, FieldSchema> definitions) {
     final boolean nullable = schema.getTypes().stream()
         .anyMatch(t -> t.getType().equals(Schema.Type.NULL));
 
     final Map<String, FieldSchema> fields = schema.getTypes().stream()
         .filter(t -> !t.getType().equals(Schema.Type.NULL))
-        .map(f -> Tuples.of(
-            f.getType().getName().toLowerCase(Locale.ROOT),
-            convertSchema(
-                f.getType().getName().toLowerCase(Locale.ROOT),
-                f, definitions, true
-            )
-        )).collect(Collectors.toMap(
+        .map(f -> {
+          String oneOfFieldName;
+          if (f.getType().equals(Schema.Type.RECORD)) {
+            // for records using full record name
+            oneOfFieldName = f.getFullName();
+          } else {
+            // for primitive types - using type name
+            oneOfFieldName = f.getType().getName().toLowerCase();
+          }
+          return Tuples.of(oneOfFieldName, convertSchema(f, definitions, false));
+        }).collect(Collectors.toMap(
             Tuple2::getT1,
             Tuple2::getT2
         ));
@@ -97,8 +102,16 @@ private FieldSchema createUnionSchema(Schema schema, Map<String, FieldSchema> de
     }
   }
 
-  private FieldSchema createObjectSchema(String name, Schema schema,
-                                         Map<String, FieldSchema> definitions, boolean ref) {
+  private FieldSchema createObjectSchema(Schema schema,
+                                         Map<String, FieldSchema> definitions,
+                                         boolean isRoot) {
+    var definitionName = schema.getFullName();
+    if (definitions.containsKey(definitionName)) {
+      return createRefField(definitionName);
+    }
+    // adding stub record, need to avoid infinite recursion
+    definitions.put(definitionName, new ObjectFieldSchema(Map.of(), List.of()));
+
     final Map<String, FieldSchema> fields = schema.getFields().stream()
         .map(f -> Tuples.of(f.name(), convertField(f, definitions)))
         .collect(Collectors.toMap(
@@ -110,19 +123,26 @@ private FieldSchema createObjectSchema(String name, Schema schema,
         .filter(f -> !f.schema().isNullable())
         .map(Schema.Field::name).collect(Collectors.toList());
 
-    if (ref) {
-      String definitionName = String.format("Record%s", schema.getName());
-      definitions.put(definitionName, new ObjectFieldSchema(fields, required));
-      return new RefFieldSchema(String.format("#/definitions/%s", definitionName));
+    var objectSchema = new ObjectFieldSchema(fields, required);
+    if (isRoot) {
+      // replacing stub with self-reference (need for usage in json-schema's oneOf)
+      definitions.put(definitionName, new RefFieldSchema("#"));
+      return objectSchema;
     } else {
-      return new ObjectFieldSchema(fields, required);
+      // replacing stub record with actual object structure
+      definitions.put(definitionName, objectSchema);
+      return createRefField(definitionName);
     }
   }
 
-  private ArrayFieldSchema createArraySchema(String name, Schema schema,
+  private RefFieldSchema createRefField(String definitionName) {
+    return new RefFieldSchema(String.format("#/definitions/%s", definitionName));
+  }
+
+  private ArrayFieldSchema createArraySchema(Schema schema,
                                              Map<String, FieldSchema> definitions) {
     return new ArrayFieldSchema(
-        convertSchema(name, schema.getElementType(), definitions, true)
+        convertSchema(schema.getElementType(), definitions, false)
     );
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverterTest.java
index d78426d48a1..24d4daf7d9d 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverterTest.java
@@ -1,27 +1,29 @@
 package com.provectus.kafka.ui.util.jsonschema;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.fge.jsonschema.core.exceptions.ProcessingException;
-import com.github.fge.jsonschema.core.report.ProcessingReport;
-import com.github.fge.jsonschema.main.JsonSchemaFactory;
-import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import lombok.SneakyThrows;
 import org.apache.avro.Schema;
-import org.apache.avro.generic.GenericData;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class AvroJsonSchemaConverterTest {
-  @Test
-  public void avroConvertTest() throws URISyntaxException, JsonProcessingException {
-    final AvroJsonSchemaConverter converter = new AvroJsonSchemaConverter();
-    URI basePath = new URI("http://example.com/");
+class AvroJsonSchemaConverterTest {
+
+  private AvroJsonSchemaConverter converter;
+  private URI basePath;
+
+  @BeforeEach
+  void init() throws URISyntaxException {
+    converter = new AvroJsonSchemaConverter();
+    basePath = new URI("http://example.com/");
+  }
 
-    Schema recordSchema = (new Schema.Parser()).parse(
-         " {"
+  @Test
+  void avroConvertTest() {
+    String avroSchema =
+        " {"
             + "     \"type\": \"record\","
             + "     \"name\": \"Message\","
             + "     \"namespace\": \"com.provectus.kafka\","
@@ -76,45 +78,59 @@ public void avroConvertTest() throws URISyntaxException, JsonProcessingException
             + "             }"
             + "         }"
             + "     ]"
-            + " }"
-    );
+            + " }";
 
+    String expectedJsonSchema = "{ "
+        + "  \"$id\" : \"http://example.com/Message\", "
+        + "  \"$schema\" : \"https://json-schema.org/draft/2020-12/schema\", "
+        + "  \"type\" : \"object\", "
+        + "  \"properties\" : { "
+        + "    \"record\" : { \"$ref\" : \"#/definitions/com.provectus.kafka.InnerMessage\" } "
+        + "  }, "
+        + "  \"required\" : [ \"record\" ], "
+        + "  \"definitions\" : { "
+        + "    \"com.provectus.kafka.Message\" : { \"$ref\" : \"#\" }, "
+        + "    \"com.provectus.kafka.InnerMessage\" : { "
+        + "      \"type\" : \"object\", "
+        + "      \"properties\" : { "
+        + "        \"long_text\" : { "
+        + "          \"oneOf\" : [ { "
+        + "            \"type\" : \"null\" "
+        + "          }, { "
+        + "            \"type\" : \"object\", "
+        + "            \"properties\" : { "
+        + "              \"string\" : { "
+        + "                \"type\" : \"string\" "
+        + "              } "
+        + "            } "
+        + "          } ] "
+        + "        }, "
+        + "        \"array\" : { "
+        + "          \"type\" : \"array\", "
+        + "          \"items\" : { \"type\" : \"string\" } "
+        + "        }, "
+        + "        \"id\" : { \"type\" : \"integer\" }, "
+        + "        \"text\" : { \"type\" : \"string\" }, "
+        + "        \"map\" : { "
+        + "          \"type\" : \"object\", "
+        + "          \"additionalProperties\" : { \"type\" : \"integer\" } "
+        + "        }, "
+        + "        \"order\" : { "
+        + "          \"enum\" : [ \"SPADES\", \"HEARTS\", \"DIAMONDS\", \"CLUBS\" ], "
+        + "          \"type\" : \"string\" "
+        + "        } "
+        + "      }, "
+        + "      \"required\" : [ \"id\", \"text\", \"order\", \"array\", \"map\" ] "
+        + "    } "
+        + "  } "
+        + "}";
 
-    String expected = "{\"$id\":\"http://example.com/Message\","
-        + "\"$schema\":\"https://json-schema.org/draft/2020-12/schema\","
-        + "\"type\":\"object\",\"properties\":{\"record\":"
-        + "{\"$ref\":\"#/definitions/RecordInnerMessage\"}},"
-        + "\"required\":[\"record\"],\"definitions\":"
-        + "{\"RecordInnerMessage\":{\"type\":\"object\",\""
-        + "properties\":{\"long_text\":{\"oneOf\":[{\"type\":\"null\"},"
-        + "{\"type\":\"object\",\"properties\":{\"string\":"
-        + "{\"type\":\"string\"}}}]},\"array\":{\"type\":\"array\",\"items\":"
-        + "{\"type\":\"string\"}},\"id\":{\"type\":\"integer\"},\"text\":"
-        + "{\"type\":\"string\"},\"map\":{\"type\":\"object\","
-        + "\"additionalProperties\":{\"type\":\"integer\"}},"
-        + "\"order\":{\"enum\":[\"SPADES\",\"HEARTS\",\"DIAMONDS\",\"CLUBS\"],"
-        + "\"type\":\"string\"}},"
-        + "\"required\":[\"id\",\"text\",\"order\",\"array\",\"map\"]}}}";
-
-    final JsonSchema convertRecord = converter.convert(basePath, recordSchema);
-
-    ObjectMapper om = new ObjectMapper();
-    Assertions.assertEquals(
-        om.readTree(expected),
-        om.readTree(
-            convertRecord.toJson()
-        )
-    );
-
+    convertAndCompare(expectedJsonSchema, avroSchema);
   }
 
   @Test
-  public void testNullableUnions() throws URISyntaxException, IOException, ProcessingException {
-    final AvroJsonSchemaConverter converter = new AvroJsonSchemaConverter();
-    URI basePath = new URI("http://example.com/");
-    final ObjectMapper objectMapper = new ObjectMapper();
-
-    Schema recordSchema = (new Schema.Parser()).parse(
+  void testNullableUnions()  {
+    String avroSchema =
         " {"
             + "     \"type\": \"record\","
             + "     \"name\": \"Message\","
@@ -138,38 +154,105 @@ public void testNullableUnions() throws URISyntaxException, IOException, Process
             + "                         \"default\": null"
             + "                     }"
             + "     ]"
-            + " }"
-    );
-
-    final GenericData.Record record = new GenericData.Record(recordSchema);
-    record.put("text", "Hello world");
-    record.put("value", 100L);
-    byte[] jsonBytes = AvroSchemaUtils.toJson(record);
-    String serialized = new String(jsonBytes);
+            + " }";
 
-    String expected =
+    String expectedJsonSchema =
         "{\"$id\":\"http://example.com/Message\","
         + "\"$schema\":\"https://json-schema.org/draft/2020-12/schema\","
         + "\"type\":\"object\",\"properties\":{\"text\":"
         + "{\"oneOf\":[{\"type\":\"null\"},{\"type\":\"object\","
         + "\"properties\":{\"string\":{\"type\":\"string\"}}}]},\"value\":"
         + "{\"oneOf\":[{\"type\":\"null\"},{\"type\":\"object\","
-        + "\"properties\":{\"string\":{\"type\":\"string\"},\"long\":{\"type\":\"integer\"}}}]}}}";
+        + "\"properties\":{\"string\":{\"type\":\"string\"},\"long\":{\"type\":\"integer\"}}}]}},"
+        + "\"definitions\" : { \"com.provectus.kafka.Message\" : { \"$ref\" : \"#\" }}}";
 
-    final JsonSchema convert = converter.convert(basePath, recordSchema);
-    Assertions.assertEquals(
-        objectMapper.readTree(expected),
-        objectMapper.readTree(convert.toJson())
-    );
+    convertAndCompare(expectedJsonSchema, avroSchema);
+  }
 
+  @Test
+  void testRecordReferences() {
+    String avroSchema =
+        "{\n"
+            + "    \"type\": \"record\", "
+            + "    \"namespace\": \"n.s\", "
+            + "    \"name\": \"RootMsg\", "
+            + "    \"fields\":\n"
+            + "    [ "
+            + "        { "
+            + "            \"name\": \"inner1\", "
+            + "            \"type\": { "
+            + "                \"type\": \"record\", "
+            + "                \"name\": \"Inner\", "
+            + "                \"fields\": [ { \"name\": \"f1\", \"type\": \"double\" } ] "
+            + "            } "
+            + "        }, "
+            + "        { "
+            + "            \"name\": \"inner2\", "
+            + "            \"type\": { "
+            + "                \"type\": \"record\", "
+            + "                \"namespace\": \"n.s2\", "
+            + "                \"name\": \"Inner\", "
+            + "                \"fields\": "
+            + "                [ { \"name\": \"f1\", \"type\": \"double\" } ] "
+            + "            } "
+            + "        }, "
+            + "        { "
+            + "            \"name\": \"refField\", "
+            + "            \"type\": [ \"null\", \"Inner\", \"n.s2.Inner\", \"RootMsg\" ] "
+            + "        } "
+            + "    ] "
+            + "}";
+
+    String expectedJsonSchema = "{ "
+        + "  \"$id\" : \"http://example.com/RootMsg\", "
+        + "  \"$schema\" : \"https://json-schema.org/draft/2020-12/schema\", "
+        + "  \"type\" : \"object\", "
+        + "  \"properties\" : { "
+        + "    \"inner1\" : { \"$ref\" : \"#/definitions/n.s.Inner\" }, "
+        + "    \"inner2\" : { \"$ref\" : \"#/definitions/n.s2.Inner\" }, "
+        + "    \"refField\" : { "
+        + "      \"oneOf\" : [  "
+        + "      { "
+        + "        \"type\" : \"null\" "
+        + "      },  "
+        + "      { "
+        + "        \"type\" : \"object\", "
+        + "        \"properties\" : { "
+        + "          \"n.s.RootMsg\" : { \"$ref\" : \"#/definitions/n.s.RootMsg\" }, "
+        + "          \"n.s2.Inner\" : { \"$ref\" : \"#/definitions/n.s2.Inner\" }, "
+        + "          \"n.s.Inner\" : { \"$ref\" : \"#/definitions/n.s.Inner\" } "
+        + "        } "
+        + "      } ] "
+        + "    } "
+        + "  }, "
+        + "  \"required\" : [ \"inner1\", \"inner2\" ], "
+        + "  \"definitions\" : { "
+        + "    \"n.s.RootMsg\" : { \"$ref\" : \"#\" }, "
+        + "    \"n.s2.Inner\" : { "
+        + "      \"type\" : \"object\", "
+        + "      \"properties\" : { \"f1\" : { \"type\" : \"number\" } }, "
+        + "      \"required\" : [ \"f1\" ] "
+        + "    }, "
+        + "    \"n.s.Inner\" : { "
+        + "      \"type\" : \"object\", "
+        + "      \"properties\" : { \"f1\" : { \"type\" : \"number\" } }, "
+        + "      \"required\" : [ \"f1\" ] "
+        + "    } "
+        + "  } "
+        + "}";
 
-    final ProcessingReport validate =
-        JsonSchemaFactory.byDefault().getJsonSchema(
-            objectMapper.readTree(expected)
-        ).validate(
-            objectMapper.readTree(serialized)
-        );
+    convertAndCompare(expectedJsonSchema, avroSchema);
+  }
 
-    Assertions.assertTrue(validate.isSuccess());
+  @SneakyThrows
+  private void convertAndCompare(String expectedJsonSchema, String sourceAvroSchema) {
+    var parseAvroSchema = new Schema.Parser().parse(sourceAvroSchema);
+    var converted = converter.convert(basePath, parseAvroSchema).toJson();
+    var objectMapper = new ObjectMapper();
+    Assertions.assertEquals(
+        objectMapper.readTree(expectedJsonSchema),
+        objectMapper.readTree(converted)
+    );
   }
+
 }
\ No newline at end of file

From eb03a12233587252c6a9853a403b0361866a47ed Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Wed, 28 Sep 2022 15:23:16 +0400
Subject: [PATCH 188/734] Format dates in a single place, Display build date
 instead of full commit hash in version info (#2590)

* message

* if tag contains -SNAPSHOT - display formatted timestamp

* create Time format context

* fix pull request commits

* change pull request commits

* add fetchTimeFormat function

* add fetchTimeFormat function

* chnage test run

* fix testing error

* covered global context with tests

* removed unused import statement

* fixed smell

* pull master

* fixed code smeils

* covered Version component, hooks with tests, fixed code review comments

* converted outdated to boolean

* remove tag condition from return
---
 kafka-ui-react-app/src/components/App.tsx     | 158 +++++++++---------
 .../Topics/Topic/Messages/Message.tsx         |   8 +-
 .../MessageContent/MessageContent.tsx         |  12 +-
 .../Topic/Messages/__test__/Message.spec.tsx  |   3 +-
 .../Topic/Statistics/Indicators/Total.tsx     |  56 ++++---
 .../Topics/Topic/Statistics/Metrics.tsx       |   6 +-
 .../Topic/Statistics/PartitionInfoRow.tsx     |   8 +-
 .../src/components/Version/Version.tsx        |  48 +++---
 .../Version/__tests__/Version.spec.tsx        | 107 ++++++++++--
 .../src/components/__tests__/App.spec.tsx     |  13 ++
 .../components/contexts/ConfirmContext.tsx    |   4 +-
 .../contexts/GlobalSettingsContext.tsx        |  30 ++++
 kafka-ui-react-app/src/lib/api.ts             |  20 ++-
 kafka-ui-react-app/src/lib/constants.ts       |   9 +-
 kafka-ui-react-app/src/lib/dateTimeHelpers.ts |   2 +-
 .../src/lib/fixtures/actuatorInfo.ts          |  12 ++
 .../src/lib/fixtures/latestVersion.ts         |   3 +
 .../src/lib/fixtures/timeFormat.ts            |   3 +
 .../hooks/api/__tests__/actuatorInfo.spec.ts  |  17 ++
 .../lib/hooks/api/__tests__/brokers.spec.ts   |  13 +-
 .../lib/hooks/api/__tests__/clusters.spec.ts  |  13 +-
 .../hooks/api/__tests__/kafkaConnect.spec.ts  |  16 +-
 .../hooks/api/__tests__/latestVersion.spec.ts |  19 +++
 .../hooks/api/__tests__/timeFormat.spec.ts    |  17 ++
 .../lib/hooks/api/__tests__/topics.spec.ts    |  16 +-
 .../src/lib/hooks/api/actuatorInfo.ts         |  18 ++
 .../src/lib/hooks/api/kafkaConnect.ts         |   1 +
 .../src/lib/hooks/api/latestVersion.ts        |  21 +++
 .../src/lib/hooks/api/timeFormat.ts           |  11 ++
 .../src/lib/hooks/useTimeFormat.ts            |  10 ++
 kafka-ui-react-app/src/lib/testHelpers.tsx    |  51 ++++--
 kafka-ui-react-app/vite.config.ts             |   5 +
 32 files changed, 504 insertions(+), 226 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
 create mode 100644 kafka-ui-react-app/src/lib/fixtures/actuatorInfo.ts
 create mode 100644 kafka-ui-react-app/src/lib/fixtures/latestVersion.ts
 create mode 100644 kafka-ui-react-app/src/lib/fixtures/timeFormat.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/actuatorInfo.spec.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/latestVersion.spec.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/latestVersion.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useTimeFormat.ts

diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 2686e6fad3d..adc77b30015 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -1,6 +1,5 @@
 import React, { Suspense, useCallback } from 'react';
 import { Routes, Route, useLocation } from 'react-router-dom';
-import { GIT_TAG, GIT_COMMIT } from 'lib/constants';
 import { clusterPath, getNonExactPath } from 'lib/paths';
 import Nav from 'components/Nav/Nav';
 import PageLoader from 'components/common/PageLoader/PageLoader';
@@ -18,8 +17,9 @@ import Logo from 'components/common/Logo/Logo';
 import GitIcon from 'components/common/Icons/GitIcon';
 import DiscordIcon from 'components/common/Icons/DiscordIcon';
 
-import { ConfirmContextProvider } from './contexts/ConfirmContext';
 import ConfirmationModal from './common/ConfirmationModal/ConfirmationModal';
+import { ConfirmContextProvider } from './contexts/ConfirmContext';
+import { GlobalSettingsProvider } from './contexts/GlobalSettingsContext';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -46,89 +46,91 @@ const App: React.FC = () => {
 
   return (
     <QueryClientProvider client={queryClient}>
-      <ThemeProvider theme={theme}>
-        <ConfirmContextProvider>
-          <GlobalCSS />
-          <S.Layout>
-            <S.Navbar role="navigation" aria-label="Page Header">
-              <S.NavbarBrand>
+      <GlobalSettingsProvider>
+        <ThemeProvider theme={theme}>
+          <ConfirmContextProvider>
+            <GlobalCSS />
+            <S.Layout>
+              <S.Navbar role="navigation" aria-label="Page Header">
                 <S.NavbarBrand>
-                  <S.NavbarBurger
-                    onClick={onBurgerClick}
-                    onKeyDown={onBurgerClick}
-                    role="button"
-                    tabIndex={0}
-                    aria-label="burger"
-                  >
-                    <S.Span role="separator" />
-                    <S.Span role="separator" />
-                    <S.Span role="separator" />
-                  </S.NavbarBurger>
+                  <S.NavbarBrand>
+                    <S.NavbarBurger
+                      onClick={onBurgerClick}
+                      onKeyDown={onBurgerClick}
+                      role="button"
+                      tabIndex={0}
+                      aria-label="burger"
+                    >
+                      <S.Span role="separator" />
+                      <S.Span role="separator" />
+                      <S.Span role="separator" />
+                    </S.NavbarBurger>
 
-                  <S.Hyperlink to="/">
-                    <Logo />
-                    UI for Apache Kafka
-                  </S.Hyperlink>
+                    <S.Hyperlink to="/">
+                      <Logo />
+                      UI for Apache Kafka
+                    </S.Hyperlink>
 
-                  <S.NavbarItem>
-                    {GIT_TAG && <Version tag={GIT_TAG} commit={GIT_COMMIT} />}
-                  </S.NavbarItem>
+                    <S.NavbarItem>
+                      <Version />
+                    </S.NavbarItem>
+                  </S.NavbarBrand>
                 </S.NavbarBrand>
-              </S.NavbarBrand>
-              <S.NavbarSocial>
-                <S.LogoutLink href="/logout">
-                  <S.LogoutButton buttonType="primary" buttonSize="M">
-                    Log out
-                  </S.LogoutButton>
-                </S.LogoutLink>
-                <S.SocialLink
-                  href="https://github.com/provectus/kafka-ui"
-                  target="_blank"
-                >
-                  <GitIcon />
-                </S.SocialLink>
-                <S.SocialLink
-                  href="https://discord.com/invite/4DWzD7pGE5"
-                  target="_blank"
-                >
-                  <DiscordIcon />
-                </S.SocialLink>
-              </S.NavbarSocial>
-            </S.Navbar>
+                <S.NavbarSocial>
+                  <S.LogoutLink href="/logout">
+                    <S.LogoutButton buttonType="primary" buttonSize="M">
+                      Log out
+                    </S.LogoutButton>
+                  </S.LogoutLink>
+                  <S.SocialLink
+                    href="https://github.com/provectus/kafka-ui"
+                    target="_blank"
+                  >
+                    <GitIcon />
+                  </S.SocialLink>
+                  <S.SocialLink
+                    href="https://discord.com/invite/4DWzD7pGE5"
+                    target="_blank"
+                  >
+                    <DiscordIcon />
+                  </S.SocialLink>
+                </S.NavbarSocial>
+              </S.Navbar>
 
-            <S.Container>
-              <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
-                <Suspense fallback={<PageLoader />}>
-                  <Nav />
-                </Suspense>
-              </S.Sidebar>
-              <S.Overlay
-                $visible={isSidebarVisible}
-                onClick={closeSidebar}
-                onKeyDown={closeSidebar}
-                tabIndex={-1}
-                aria-hidden="true"
-                aria-label="Overlay"
-              />
-              <Routes>
-                {['/', '/ui', '/ui/clusters'].map((path) => (
+              <S.Container>
+                <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
+                  <Suspense fallback={<PageLoader />}>
+                    <Nav />
+                  </Suspense>
+                </S.Sidebar>
+                <S.Overlay
+                  $visible={isSidebarVisible}
+                  onClick={closeSidebar}
+                  onKeyDown={closeSidebar}
+                  tabIndex={-1}
+                  aria-hidden="true"
+                  aria-label="Overlay"
+                />
+                <Routes>
+                  {['/', '/ui', '/ui/clusters'].map((path) => (
+                    <Route
+                      key="Home" // optional: avoid full re-renders on route changes
+                      path={path}
+                      element={<Dashboard />}
+                    />
+                  ))}
                   <Route
-                    key="Home" // optional: avoid full re-renders on route changes
-                    path={path}
-                    element={<Dashboard />}
+                    path={getNonExactPath(clusterPath())}
+                    element={<ClusterPage />}
                   />
-                ))}
-                <Route
-                  path={getNonExactPath(clusterPath())}
-                  element={<ClusterPage />}
-                />
-              </Routes>
-            </S.Container>
-            <Toaster position="bottom-right" />
-          </S.Layout>
-          <ConfirmationModal />
-        </ConfirmContextProvider>
-      </ThemeProvider>
+                </Routes>
+              </S.Container>
+              <Toaster position="bottom-right" />
+            </S.Layout>
+            <ConfirmationModal />
+          </ConfirmContextProvider>
+        </ThemeProvider>
+      </GlobalSettingsProvider>
     </QueryClientProvider>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index 3584aee7973..fc4269bb32b 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { TopicMessage } from 'generated-sources';
+import styled from 'styled-components';
 import useDataSaver from 'lib/hooks/useDataSaver';
+import { TopicMessage } from 'generated-sources';
+import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 import MessageToggleIcon from 'components/common/Icons/MessageToggleIcon';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
-import styled from 'styled-components';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
-import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 import MessageContent from './MessageContent/MessageContent';
 import * as S from './MessageContent/MessageContent.styled';
@@ -48,6 +48,8 @@ const Message: React.FC<Props> = ({
     Headers: headers,
     Timestamp: timestamp,
   };
+  const formatTimestamp = useTimeFormat();
+
   const savedMessage = JSON.stringify(savedMessageJson, null, '\t');
   const { copyToClipboard, saveFile } = useDataSaver(
     'topic-message',
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
index 3a1bc9a500f..6e385916b5c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
@@ -1,8 +1,8 @@
-import { TopicMessageTimestampTypeEnum, SchemaType } from 'generated-sources';
 import React from 'react';
 import EditorViewer from 'components/common/EditorViewer/EditorViewer';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { formatTimestamp } from 'lib/dateTimeHelpers';
+import { useTimeFormat } from 'lib/hooks/useTimeFormat';
+import { SchemaType, TopicMessageTimestampTypeEnum } from 'generated-sources';
 
 import * as S from './MessageContent.styled';
 
@@ -27,7 +27,10 @@ const MessageContent: React.FC<MessageContentProps> = ({
   timestamp,
   timestampType,
 }) => {
+  const formatTimestamp = useTimeFormat();
+
   const [activeTab, setActiveTab] = React.useState<Tab>('content');
+
   const activeTabContent = () => {
     switch (activeTab) {
       case 'content':
@@ -38,24 +41,29 @@ const MessageContent: React.FC<MessageContentProps> = ({
         return JSON.stringify(headers);
     }
   };
+
   const handleKeyTabClick = (e: React.MouseEvent) => {
     e.preventDefault();
     setActiveTab('key');
   };
+
   const handleContentTabClick = (e: React.MouseEvent) => {
     e.preventDefault();
     setActiveTab('content');
   };
+
   const handleHeadersTabClick = (e: React.MouseEvent) => {
     e.preventDefault();
     setActiveTab('headers');
   };
+
   const keySize = new TextEncoder().encode(messageKey).length;
   const contentSize = new TextEncoder().encode(messageContent).length;
   const contentType =
     messageContent && messageContent.trim().startsWith('{')
       ? SchemaType.JSON
       : SchemaType.PROTOBUF;
+
   return (
     <S.Wrapper>
       <td colSpan={10}>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
index f92354ba184..1c9ec36ea3e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
@@ -7,6 +7,7 @@ import userEvent from '@testing-library/user-event';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 const messageContentText = 'messageContentText';
+const format = 'DD.MM.YYYY HH:mm:ss';
 
 jest.mock(
   'components/Topics/Topic/Messages/MessageContent/MessageContent',
@@ -48,7 +49,7 @@ describe('Message component', () => {
     expect(screen.getByText(mockMessage.content as string)).toBeInTheDocument();
     expect(screen.getByText(mockMessage.key as string)).toBeInTheDocument();
     expect(
-      screen.getByText(formatTimestamp(mockMessage.timestamp))
+      screen.getByText(formatTimestamp(mockMessage.timestamp, format))
     ).toBeInTheDocument();
     expect(screen.getByText(mockMessage.offset.toString())).toBeInTheDocument();
     expect(
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx
index f2aa53141e8..e30c13baf79 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import * as Metrics from 'components/common/Metrics';
+import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 import { TopicAnalysisStats } from 'generated-sources';
-import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 const Total: React.FC<TopicAnalysisStats> = ({
   totalMsgs,
@@ -13,30 +13,34 @@ const Total: React.FC<TopicAnalysisStats> = ({
   nullValues,
   approxUniqKeys,
   approxUniqValues,
-}) => (
-  <Metrics.Section title="Messages">
-    <Metrics.Indicator label="Total number">{totalMsgs}</Metrics.Indicator>
-    <Metrics.Indicator label="Offsets min-max">
-      {`${minOffset} - ${maxOffset}`}
-    </Metrics.Indicator>
-    <Metrics.Indicator label="Timestamp min-max">
-      {`${formatTimestamp(minTimestamp)} - ${formatTimestamp(maxTimestamp)}`}
-    </Metrics.Indicator>
-    <Metrics.Indicator label="Null keys">{nullKeys}</Metrics.Indicator>
-    <Metrics.Indicator
-      label="Unique keys"
-      title="Approximate number of unique keys"
-    >
-      {approxUniqKeys}
-    </Metrics.Indicator>
-    <Metrics.Indicator label="Null values">{nullValues}</Metrics.Indicator>
-    <Metrics.Indicator
-      label="Unique values"
-      title="Approximate number of unique values"
-    >
-      {approxUniqValues}
-    </Metrics.Indicator>
-  </Metrics.Section>
-);
+}) => {
+  const formatTimestamp = useTimeFormat();
+
+  return (
+    <Metrics.Section title="Messages">
+      <Metrics.Indicator label="Total number">{totalMsgs}</Metrics.Indicator>
+      <Metrics.Indicator label="Offsets min-max">
+        {`${minOffset} - ${maxOffset}`}
+      </Metrics.Indicator>
+      <Metrics.Indicator label="Timestamp min-max">
+        {`${formatTimestamp(minTimestamp)} - ${formatTimestamp(maxTimestamp)}`}
+      </Metrics.Indicator>
+      <Metrics.Indicator label="Null keys">{nullKeys}</Metrics.Indicator>
+      <Metrics.Indicator
+        label="Unique keys"
+        title="Approximate number of unique keys"
+      >
+        {approxUniqKeys}
+      </Metrics.Indicator>
+      <Metrics.Indicator label="Null values">{nullValues}</Metrics.Indicator>
+      <Metrics.Indicator
+        label="Unique values"
+        title="Approximate number of unique values"
+      >
+        {approxUniqValues}
+      </Metrics.Indicator>
+    </Metrics.Section>
+  );
+};
 
 export default Total;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
index be10efa5c3e..34feb01b72e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
@@ -14,7 +14,7 @@ import {
   Label,
 } from 'components/common/PropertiesList/PropertiesList.styled';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { formatTimestamp } from 'lib/dateTimeHelpers';
+import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 
 import * as S from './Statistics.styles';
 import Total from './Indicators/Total';
@@ -22,6 +22,8 @@ import SizeStats from './Indicators/SizeStats';
 import PartitionTable from './PartitionTable';
 
 const Metrics: React.FC = () => {
+  const formatTimestamp = useTimeFormat();
+
   const params = useAppParams<RouteParamsClusterTopic>();
   const [isAnalyzing, setIsAnalyzing] = React.useState(true);
   const analyzeTopic = useAnalyzeTopic(params);
@@ -76,7 +78,7 @@ const Metrics: React.FC = () => {
   return (
     <>
       <S.ActionsBar>
-        <S.CreatedAt>{formatTimestamp(data.result.finishedAt)}</S.CreatedAt>
+        <S.CreatedAt>{formatTimestamp(data?.result?.finishedAt)}</S.CreatedAt>
         <Button
           onClick={async () => {
             await analyzeTopic.mutateAsync();
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
index 1ee8ace97a7..546f3e619d6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
@@ -1,19 +1,21 @@
+import React from 'react';
 import { Row } from '@tanstack/react-table';
-import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import Heading from 'components/common/heading/Heading.styled';
+import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import {
   List,
   Label,
 } from 'components/common/PropertiesList/PropertiesList.styled';
+import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 import { TopicAnalysisStats } from 'generated-sources';
-import { formatTimestamp } from 'lib/dateTimeHelpers';
-import React from 'react';
 
 import * as S from './Statistics.styles';
 
 const PartitionInfoRow: React.FC<{ row: Row<TopicAnalysisStats> }> = ({
   row,
 }) => {
+  const formatTimestamp = useTimeFormat();
+
   const {
     totalMsgs,
     minTimestamp,
diff --git a/kafka-ui-react-app/src/components/Version/Version.tsx b/kafka-ui-react-app/src/components/Version/Version.tsx
index ecda8f4a6ee..6baab8db772 100644
--- a/kafka-ui-react-app/src/components/Version/Version.tsx
+++ b/kafka-ui-react-app/src/components/Version/Version.tsx
@@ -1,7 +1,10 @@
-import React, { useEffect, useState } from 'react';
-import { gitCommitPath } from 'lib/paths';
-import { GIT_REPO_LATEST_RELEASE_LINK } from 'lib/constants';
+import React from 'react';
 import WarningIcon from 'components/common/Icons/WarningIcon';
+import { gitCommitPath } from 'lib/paths';
+import { useTimeFormat } from 'lib/hooks/useTimeFormat';
+import { useActuatorInfo } from 'lib/hooks/api/actuatorInfo';
+import { BUILD_VERSION_PATTERN } from 'lib/constants';
+import { useLatestVersion } from 'lib/hooks/api/latestVersion';
 
 import * as S from './Version.styled';
 import compareVersions from './compareVersions';
@@ -11,29 +14,28 @@ export interface VesionProps {
   commit?: string;
 }
 
-const Version: React.FC<VesionProps> = ({ tag, commit }) => {
-  const [latestVersionInfo, setLatestVersionInfo] = useState({
-    outdated: false,
-    latestTag: '',
-  });
-
-  useEffect(() => {
-    fetch(GIT_REPO_LATEST_RELEASE_LINK)
-      .then((response) => response.json())
-      .then((data) => {
-        setLatestVersionInfo({
-          outdated: compareVersions(tag, data.tag_name) === -1,
-          latestTag: data.tag_name,
-        });
-      });
-  }, [tag]);
-
-  const { outdated, latestTag } = latestVersionInfo;
+const Version: React.FC = () => {
+  const formatTimestamp = useTimeFormat();
+  const { data: actuatorInfo = {} } = useActuatorInfo();
+  const { data: latestVersionInfo = {} } = useLatestVersion();
+
+  const tag = actuatorInfo?.build?.version;
+  const commit = actuatorInfo?.git?.commit.id;
+  const { tag_name: latestTag } = latestVersionInfo;
+
+  const outdated = compareVersions(tag, latestTag);
+
+  const currentVersion = tag?.match(BUILD_VERSION_PATTERN)
+    ? tag
+    : formatTimestamp(actuatorInfo?.build?.time);
+
+  if (!tag) return null;
+
   return (
     <S.Wrapper>
-      <S.CurrentVersion>{tag}</S.CurrentVersion>
+      <S.CurrentVersion>{currentVersion}</S.CurrentVersion>
 
-      {outdated && (
+      {!!outdated && (
         <S.OutdatedWarning
           title={`Your app version is outdated. Current latest version is ${latestTag}`}
         >
diff --git a/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx b/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx
index 2136032bcb4..cdfd5899640 100644
--- a/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx
+++ b/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx
@@ -1,22 +1,103 @@
 import React from 'react';
-import Version, { VesionProps } from 'components/Version/Version';
-import { screen } from '@testing-library/react';
+import { screen } from '@testing-library/dom';
+import Version from 'components/Version/Version';
 import { render } from 'lib/testHelpers';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
+import { useTimeFormat } from 'lib/hooks/api/timeFormat';
+import { useActuatorInfo } from 'lib/hooks/api/actuatorInfo';
+import { useLatestVersion } from 'lib/hooks/api/latestVersion';
+import { actuatorInfoPayload } from 'lib/fixtures/actuatorInfo';
+import { latestVersionPayload } from 'lib/fixtures/latestVersion';
+import { defaultGlobalSettingsValue } from 'components/contexts/GlobalSettingsContext';
 
-const tag = 'v1.0.1-SHAPSHOT';
-const commit = '123sdf34';
+jest.mock('lib/hooks/api/timeFormat', () => ({
+  useTimeFormat: jest.fn(),
+}));
+jest.mock('lib/hooks/api/actuatorInfo', () => ({
+  useActuatorInfo: jest.fn(),
+}));
+jest.mock('lib/hooks/api/latestVersion', () => ({
+  useLatestVersion: jest.fn(),
+}));
 
-describe('Version', () => {
-  const setupComponent = (props: VesionProps) => render(<Version {...props} />);
+describe('Version Component', () => {
+  const { timeStampFormat } = defaultGlobalSettingsValue;
 
-  it('renders', () => {
-    setupComponent({ tag });
-    expect(screen.getByText(tag)).toBeInTheDocument();
+  const versionTag = 'v0.5.0';
+  const snapshotTag = 'test-SNAPSHOT';
+  const commitTag = 'befd3b328e2c9c7df57b0c5746561b2f7fee8813';
+
+  const actuatorVersionPayload = actuatorInfoPayload(versionTag);
+  const formattedTimestamp = formatTimestamp(
+    actuatorVersionPayload.build.time,
+    timeStampFormat
+  );
+
+  beforeEach(() => {
+    (useTimeFormat as jest.Mock).mockImplementation(() => ({
+      data: {
+        timeStampFormat,
+      },
+    }));
+    (useActuatorInfo as jest.Mock).mockImplementation(() => ({
+      data: actuatorVersionPayload,
+    }));
+    (useLatestVersion as jest.Mock).mockImplementation(() => ({
+      data: latestVersionPayload,
+    }));
+  });
+
+  describe('tag does not exist', () => {
+    it('does not render component', async () => {
+      (useActuatorInfo as jest.Mock).mockImplementation(() => ({
+        data: null,
+      }));
+      const { container } = render(<Version />);
+      expect(container.firstChild).toBeEmptyDOMElement();
+    });
+  });
+
+  describe('renders current version', () => {
+    it('renders release build version as current version', async () => {
+      render(<Version />);
+      expect(screen.getByText(versionTag)).toBeInTheDocument();
+    });
+    it('renders formatted timestamp as current version when version is commit', async () => {
+      (useActuatorInfo as jest.Mock).mockImplementation(() => ({
+        data: actuatorInfoPayload(commitTag),
+      }));
+      render(<Version />);
+      expect(screen.getByText(formattedTimestamp)).toBeInTheDocument();
+    });
+    it('renders formatted timestamp as current version when version contains -SNAPSHOT', async () => {
+      (useActuatorInfo as jest.Mock).mockImplementation(() => ({
+        data: actuatorInfoPayload(snapshotTag),
+      }));
+      render(<Version />);
+      expect(screen.getByText(formattedTimestamp)).toBeInTheDocument();
+    });
+  });
+
+  describe('outdated build version', () => {
+    it('renders warning message', async () => {
+      (useActuatorInfo as jest.Mock).mockImplementation(() => ({
+        data: actuatorInfoPayload('v0.3.0'),
+      }));
+      render(<Version />);
+      expect(
+        screen.getByTitle(
+          `Your app version is outdated. Current latest version is ${latestVersionPayload.tag_name}`
+        )
+      ).toBeInTheDocument();
+    });
   });
 
-  it('shows current tag and commit', () => {
-    setupComponent({ tag, commit });
-    expect(screen.getByText(tag)).toBeInTheDocument();
-    expect(screen.getByText(commit)).toBeInTheDocument();
+  describe('current commit id with link', () => {
+    it('renders', async () => {
+      render(<Version />);
+      expect(
+        screen.getByText(actuatorVersionPayload.git.commit.id)
+      ).toBeInTheDocument();
+    });
   });
 });
diff --git a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
index 04716482619..6c9fcd6535d 100644
--- a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
+++ b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
@@ -3,14 +3,27 @@ import { screen, within } from '@testing-library/react';
 import App from 'components/App';
 import { render } from 'lib/testHelpers';
 import userEvent from '@testing-library/user-event';
+import { useTimeFormat } from 'lib/hooks/api/timeFormat';
+import { defaultGlobalSettingsValue } from 'components/contexts/GlobalSettingsContext';
 
 const burgerButtonOptions = { name: 'burger' };
 const logoutButtonOptions = { name: 'Log out' };
 
 jest.mock('components/Nav/Nav', () => () => <div>Navigation</div>);
 
+jest.mock('components/Version/Version', () => () => <div>Version</div>);
+
+jest.mock('lib/hooks/api/timeFormat', () => ({
+  ...jest.requireActual('lib/hooks/api/timeFormat'),
+  useTimeFormat: jest.fn(),
+}));
+
 describe('App', () => {
   beforeEach(() => {
+    (useTimeFormat as jest.Mock).mockImplementation(() => ({
+      data: defaultGlobalSettingsValue,
+    }));
+
     render(<App />, {
       initialEntries: ['/'],
     });
diff --git a/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx b/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx
index 8d1f0afaca3..f0958972ee8 100644
--- a/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx
+++ b/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx
@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
 
-type ConfirmContextType = {
+interface ConfirmContextType {
   content: React.ReactNode;
   confirm?: () => void;
   setContent: React.Dispatch<React.SetStateAction<React.ReactNode>>;
   setConfirm: React.Dispatch<React.SetStateAction<(() => void) | undefined>>;
   cancel: () => void;
-};
+}
 
 export const ConfirmContext = React.createContext<ConfirmContextType | null>(
   null
diff --git a/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
new file mode 100644
index 00000000000..9300fdb216e
--- /dev/null
+++ b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { useTimeFormat } from 'lib/hooks/api/timeFormat';
+
+interface GlobalSettingsContextValue {
+  timeStampFormat: string;
+}
+
+export const defaultGlobalSettingsValue = {
+  timeStampFormat: 'DD.MM.YYYY HH:mm:ss',
+};
+
+export const GlobalSettingsContext =
+  React.createContext<GlobalSettingsContextValue>(defaultGlobalSettingsValue);
+
+export const GlobalSettingsProvider: React.FC<
+  React.PropsWithChildren<unknown>
+> = ({ children }) => {
+  const { data } = useTimeFormat();
+
+  return (
+    <GlobalSettingsContext.Provider
+      value={{
+        timeStampFormat:
+          data?.timeStampFormat || defaultGlobalSettingsValue.timeStampFormat,
+      }}
+    >
+      {children}
+    </GlobalSettingsContext.Provider>
+  );
+};
diff --git a/kafka-ui-react-app/src/lib/api.ts b/kafka-ui-react-app/src/lib/api.ts
index a207403970a..5f967a249d9 100644
--- a/kafka-ui-react-app/src/lib/api.ts
+++ b/kafka-ui-react-app/src/lib/api.ts
@@ -1,23 +1,25 @@
 import {
+  KsqlApi,
+  TopicsApi,
+  SchemasApi,
   BrokersApi,
+  MessagesApi,
   ClustersApi,
   Configuration,
-  ConsumerGroupsApi,
   KafkaConnectApi,
-  KsqlApi,
-  MessagesApi,
-  SchemasApi,
-  TopicsApi,
+  ConsumerGroupsApi,
+  TimeStampFormatApi,
 } from 'generated-sources';
 import { BASE_PARAMS } from 'lib/constants';
 
 const apiClientConf = new Configuration(BASE_PARAMS);
 
+export const ksqlDbApiClient = new KsqlApi(apiClientConf);
+export const topicsApiClient = new TopicsApi(apiClientConf);
 export const brokersApiClient = new BrokersApi(apiClientConf);
+export const schemasApiClient = new SchemasApi(apiClientConf);
+export const timerStampFormatApiClient = new TimeStampFormatApi(apiClientConf);
+export const messagesApiClient = new MessagesApi(apiClientConf);
 export const clustersApiClient = new ClustersApi(apiClientConf);
 export const kafkaConnectApiClient = new KafkaConnectApi(apiClientConf);
 export const consumerGroupsApiClient = new ConsumerGroupsApi(apiClientConf);
-export const ksqlDbApiClient = new KsqlApi(apiClientConf);
-export const topicsApiClient = new TopicsApi(apiClientConf);
-export const messagesApiClient = new MessagesApi(apiClientConf);
-export const schemasApiClient = new SchemasApi(apiClientConf);
diff --git a/kafka-ui-react-app/src/lib/constants.ts b/kafka-ui-react-app/src/lib/constants.ts
index 5d4a40e724c..29f0c65635b 100644
--- a/kafka-ui-react-app/src/lib/constants.ts
+++ b/kafka-ui-react-app/src/lib/constants.ts
@@ -49,6 +49,7 @@ export const MILLISECONDS_IN_SECOND = 1_000;
 
 export const NOT_SET = -1;
 export const BYTES_IN_GB = 1_073_741_824;
+export const BUILD_VERSION_PATTERN = /v\d.\d.\d/;
 
 export const PER_PAGE = 25;
 export const MESSAGES_PER_PAGE = '100';
@@ -56,8 +57,6 @@ export const MESSAGES_PER_PAGE = '100';
 export const GIT_REPO_LINK = 'https://github.com/provectus/kafka-ui';
 export const GIT_REPO_LATEST_RELEASE_LINK =
   'https://api.github.com/repos/provectus/kafka-ui/releases/latest';
-export const GIT_TAG = process.env.VITE_TAG;
-export const GIT_COMMIT = process.env.VITE_COMMIT;
 
 export const LOCAL_STORAGE_KEY_PREFIX = 'kafka-ui';
 
@@ -67,3 +66,9 @@ export enum AsyncRequestStatus {
   fulfilled = 'fulfilled',
   rejected = 'rejected',
 }
+
+export const QUERY_REFETCH_OFF_OPTIONS = {
+  refetchOnMount: false,
+  refetchOnWindowFocus: false,
+  refetchIntervalInBackground: false,
+};
diff --git a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
index 0a9306464c1..57a8834ad3a 100644
--- a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
+++ b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 
 export const formatTimestamp = (
   timestamp: number | string | Date | undefined,
-  format = 'MM.DD.YY hh:mm:ss a'
+  format?: string
 ): string => {
   if (!timestamp) {
     return '';
diff --git a/kafka-ui-react-app/src/lib/fixtures/actuatorInfo.ts b/kafka-ui-react-app/src/lib/fixtures/actuatorInfo.ts
new file mode 100644
index 00000000000..e7dff6e1eca
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/fixtures/actuatorInfo.ts
@@ -0,0 +1,12 @@
+export const actuatorInfoPayload = (
+  version = 'befd3b328e2c9c7df57b0c5746561b2f7fee8813'
+) => ({
+  git: { commit: { id: 'befd3b3' } },
+  build: {
+    artifact: 'kafka-ui-api',
+    name: 'kafka-ui-api',
+    time: '2022-09-15T09:52:21.753Z',
+    version,
+    group: 'com.provectus',
+  },
+});
diff --git a/kafka-ui-react-app/src/lib/fixtures/latestVersion.ts b/kafka-ui-react-app/src/lib/fixtures/latestVersion.ts
new file mode 100644
index 00000000000..a6c9eca856e
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/fixtures/latestVersion.ts
@@ -0,0 +1,3 @@
+export const latestVersionPayload = {
+  tag_name: 'v0.4.0',
+};
diff --git a/kafka-ui-react-app/src/lib/fixtures/timeFormat.ts b/kafka-ui-react-app/src/lib/fixtures/timeFormat.ts
new file mode 100644
index 00000000000..3f070d46401
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/fixtures/timeFormat.ts
@@ -0,0 +1,3 @@
+export const timeFormatPayload = {
+  timeStampFormat: 'dd.MM.YYYY HH:mm:ss',
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/actuatorInfo.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/actuatorInfo.spec.ts
new file mode 100644
index 00000000000..c4e639680ed
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/actuatorInfo.spec.ts
@@ -0,0 +1,17 @@
+import fetchMock from 'fetch-mock';
+import * as hooks from 'lib/hooks/api/actuatorInfo';
+import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
+import { actuatorInfoPayload } from 'lib/fixtures/actuatorInfo';
+
+const actuatorInfoPath = '/actuator/info';
+
+describe('Actuator info hooks', () => {
+  beforeEach(() => fetchMock.restore());
+  describe('useActuatorInfo', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce(actuatorInfoPath, actuatorInfoPayload());
+      const { result } = renderQueryHook(() => hooks.useActuatorInfo());
+      await expectQueryWorks(mock, result);
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/brokers.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/brokers.spec.ts
index 9a8445989ce..3b90637c98c 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/brokers.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/brokers.spec.ts
@@ -1,23 +1,12 @@
-import { waitFor } from '@testing-library/react';
-import { renderQueryHook } from 'lib/testHelpers';
+import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
 import * as hooks from 'lib/hooks/api/brokers';
 import fetchMock from 'fetch-mock';
-import { UseQueryResult } from '@tanstack/react-query';
 
 const clusterName = 'test-cluster';
 const brokerId = 1;
 const brokersPath = `/api/clusters/${clusterName}/brokers`;
 const brokerPath = `${brokersPath}/${brokerId}`;
 
-const expectQueryWorks = async (
-  mock: fetchMock.FetchMockStatic,
-  result: { current: UseQueryResult<unknown, unknown> }
-) => {
-  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
-  expect(mock.calls()).toHaveLength(1);
-  expect(result.current.data).toBeDefined();
-};
-
 describe('Brokers hooks', () => {
   beforeEach(() => fetchMock.restore());
   describe('useBrokers', () => {
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/clusters.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/clusters.spec.ts
index 4e79b91d988..7112d945c3c 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/clusters.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/clusters.spec.ts
@@ -1,21 +1,10 @@
-import { waitFor } from '@testing-library/react';
-import { renderQueryHook } from 'lib/testHelpers';
+import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
 import * as hooks from 'lib/hooks/api/clusters';
 import fetchMock from 'fetch-mock';
-import { UseQueryResult } from '@tanstack/react-query';
 import { clustersPayload } from 'lib/fixtures/clusters';
 
 const clusterName = 'test-cluster';
 
-const expectQueryWorks = async (
-  mock: fetchMock.FetchMockStatic,
-  result: { current: UseQueryResult<unknown, unknown> }
-) => {
-  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
-  expect(mock.calls()).toHaveLength(1);
-  expect(result.current.data).toBeDefined();
-};
-
 describe('Clusters hooks', () => {
   beforeEach(() => fetchMock.restore());
   describe('useClusters', () => {
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts
index b67df5348ee..96d280f7d1c 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/kafkaConnect.spec.ts
@@ -1,9 +1,12 @@
 import { act, renderHook, waitFor } from '@testing-library/react';
-import { renderQueryHook, TestQueryClientProvider } from 'lib/testHelpers';
+import {
+  expectQueryWorks,
+  renderQueryHook,
+  TestQueryClientProvider,
+} from 'lib/testHelpers';
 import * as hooks from 'lib/hooks/api/kafkaConnect';
 import fetchMock from 'fetch-mock';
 import { connectors, connects, tasks } from 'lib/fixtures/kafkaConnect';
-import { UseQueryResult } from '@tanstack/react-query';
 import { ConnectorAction } from 'generated-sources';
 
 const clusterName = 'test-cluster';
@@ -20,15 +23,6 @@ const connectorProps = {
   connectorName,
 };
 
-const expectQueryWorks = async (
-  mock: fetchMock.FetchMockStatic,
-  result: { current: UseQueryResult<unknown, unknown> }
-) => {
-  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
-  expect(mock.calls()).toHaveLength(1);
-  expect(result.current.data).toBeDefined();
-};
-
 describe('kafkaConnect hooks', () => {
   beforeEach(() => fetchMock.restore());
   describe('useConnects', () => {
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/latestVersion.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/latestVersion.spec.ts
new file mode 100644
index 00000000000..0770bd4606d
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/latestVersion.spec.ts
@@ -0,0 +1,19 @@
+import fetchMock from 'fetch-mock';
+import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
+import * as hooks from 'lib/hooks/api/latestVersion';
+import { GIT_REPO_LATEST_RELEASE_LINK } from 'lib/constants';
+import { latestVersionPayload } from 'lib/fixtures/latestVersion';
+
+describe('Latest version hooks', () => {
+  beforeEach(() => fetchMock.restore());
+  describe('useLatestVersion', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce(
+        GIT_REPO_LATEST_RELEASE_LINK,
+        latestVersionPayload
+      );
+      const { result } = renderQueryHook(() => hooks.useLatestVersion());
+      await expectQueryWorks(mock, result);
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts
new file mode 100644
index 00000000000..cc080f58e14
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts
@@ -0,0 +1,17 @@
+import fetchMock from 'fetch-mock';
+import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
+import * as hooks from 'lib/hooks/api/timeFormat';
+import { timeFormatPayload } from 'lib/fixtures/timeFormat';
+
+const timeFormatPath = '/api/info/timestampformat';
+
+describe('Time format hooks', () => {
+  beforeEach(() => fetchMock.restore());
+  describe('useTimeFormat', () => {
+    it('returns the correct data', async () => {
+      const mock = fetchMock.getOnce(timeFormatPath, timeFormatPayload);
+      const { result } = renderQueryHook(() => hooks.useTimeFormat());
+      await expectQueryWorks(mock, result);
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
index b340084ff9a..34b864fd4a7 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/topics.spec.ts
@@ -1,8 +1,11 @@
 import { act, renderHook, waitFor } from '@testing-library/react';
-import { renderQueryHook, TestQueryClientProvider } from 'lib/testHelpers';
+import {
+  expectQueryWorks,
+  renderQueryHook,
+  TestQueryClientProvider,
+} from 'lib/testHelpers';
 import * as hooks from 'lib/hooks/api/topics';
 import fetchMock from 'fetch-mock';
-import { UseQueryResult } from '@tanstack/react-query';
 import { externalTopicPayload, topicConfigPayload } from 'lib/fixtures/topics';
 import { TopicFormData, TopicFormDataRaw } from 'redux/interfaces';
 import { CreateTopicMessage } from 'generated-sources';
@@ -10,15 +13,6 @@ import { CreateTopicMessage } from 'generated-sources';
 const clusterName = 'test-cluster';
 const topicName = 'test-topic';
 
-const expectQueryWorks = async (
-  mock: fetchMock.FetchMockStatic,
-  result: { current: UseQueryResult<unknown, unknown> }
-) => {
-  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
-  expect(mock.calls()).toHaveLength(1);
-  expect(result.current.data).toBeDefined();
-};
-
 const topicsPath = `/api/clusters/${clusterName}/topics`;
 const topicPath = `${topicsPath}/${topicName}`;
 
diff --git a/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts b/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts
new file mode 100644
index 00000000000..8373bf53d38
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts
@@ -0,0 +1,18 @@
+import { useQuery } from '@tanstack/react-query';
+import { BASE_PARAMS, QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
+
+const fetchActuatorInfo = async () => {
+  const data = await fetch('/actuator/info', BASE_PARAMS).then((res) =>
+    res.json()
+  );
+
+  return data;
+};
+
+export function useActuatorInfo() {
+  return useQuery(
+    ['actuatorInfo'],
+    fetchActuatorInfo,
+    QUERY_REFETCH_OFF_OPTIONS
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
index 7da7c5f875a..94f1ffb919d 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
@@ -121,6 +121,7 @@ export function useCreateConnector(clusterName: ClusterName) {
 }
 export function useDeleteConnector(props: UseConnectorProps) {
   const client = useQueryClient();
+
   return useMutation(() => api.deleteConnector(props), {
     onSuccess: () => client.invalidateQueries(connectorsKey(props.clusterName)),
   });
diff --git a/kafka-ui-react-app/src/lib/hooks/api/latestVersion.ts b/kafka-ui-react-app/src/lib/hooks/api/latestVersion.ts
new file mode 100644
index 00000000000..1087fb572e1
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/latestVersion.ts
@@ -0,0 +1,21 @@
+import { useQuery } from '@tanstack/react-query';
+import {
+  QUERY_REFETCH_OFF_OPTIONS,
+  GIT_REPO_LATEST_RELEASE_LINK,
+} from 'lib/constants';
+
+const fetchLatestVersion = async () => {
+  const data = await fetch(GIT_REPO_LATEST_RELEASE_LINK).then((res) =>
+    res.json()
+  );
+
+  return data;
+};
+
+export function useLatestVersion() {
+  return useQuery(
+    ['latestVersion'],
+    fetchLatestVersion,
+    QUERY_REFETCH_OFF_OPTIONS
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts b/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts
new file mode 100644
index 00000000000..fcbdf931520
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts
@@ -0,0 +1,11 @@
+import { useQuery } from '@tanstack/react-query';
+import { timerStampFormatApiClient as api } from 'lib/api';
+import { QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
+
+export function useTimeFormat() {
+  return useQuery(
+    ['settings', 'timestampformat'],
+    () => api.getTimeStampFormat(),
+    QUERY_REFETCH_OFF_OPTIONS
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/useTimeFormat.ts b/kafka-ui-react-app/src/lib/hooks/useTimeFormat.ts
new file mode 100644
index 00000000000..d84f8c6206d
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useTimeFormat.ts
@@ -0,0 +1,10 @@
+import { useContext } from 'react';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
+import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
+
+export const useTimeFormat = () => {
+  const { timeStampFormat } = useContext(GlobalSettingsContext);
+
+  return (timestamp?: number | string | Date, format?: string) =>
+    formatTimestamp(timestamp, format || timeStampFormat);
+};
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index f5eff421e5e..f3b660738f2 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -5,10 +5,16 @@ import {
   Route,
   Routes,
 } from 'react-router-dom';
+import fetchMock from 'fetch-mock';
 import { Provider } from 'react-redux';
 import { ThemeProvider } from 'styled-components';
 import theme from 'theme/theme';
-import { render, renderHook, RenderOptions } from '@testing-library/react';
+import {
+  render,
+  renderHook,
+  RenderOptions,
+  waitFor,
+} from '@testing-library/react';
 import { AnyAction, Store } from 'redux';
 import { RootState } from 'redux/interfaces';
 import { configureStore } from '@reduxjs/toolkit';
@@ -20,6 +26,10 @@ import {
 } from '@tanstack/react-query';
 import { ConfirmContextProvider } from 'components/contexts/ConfirmContext';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
+import {
+  defaultGlobalSettingsValue,
+  GlobalSettingsContext,
+} from 'components/contexts/GlobalSettingsContext';
 
 interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
   preloadedState?: Partial<RootState>;
@@ -32,6 +42,15 @@ interface WithRouteProps {
   path: string;
 }
 
+export const expectQueryWorks = async (
+  mock: fetchMock.FetchMockStatic,
+  result: { current: UseQueryResult<unknown, unknown> }
+) => {
+  await waitFor(() => expect(result.current.isFetched).toBeTruthy());
+  expect(mock.calls()).toHaveLength(1);
+  expect(result.current.data).toBeDefined();
+};
+
 export const WithRoute: React.FC<WithRouteProps> = ({ children, path }) => {
   return (
     <Routes>
@@ -68,20 +87,22 @@ const customRender = (
   const AllTheProviders: React.FC<PropsWithChildren<unknown>> = ({
     children,
   }) => (
-    <ThemeProvider theme={theme}>
-      <ConfirmContextProvider>
-        <Provider store={store}>
-          <TestQueryClientProvider>
-            <MemoryRouter initialEntries={initialEntries}>
-              <div>
-                {children}
-                <ConfirmationModal />
-              </div>
-            </MemoryRouter>
-          </TestQueryClientProvider>
-        </Provider>
-      </ConfirmContextProvider>
-    </ThemeProvider>
+    <TestQueryClientProvider>
+      <GlobalSettingsContext.Provider value={defaultGlobalSettingsValue}>
+        <ThemeProvider theme={theme}>
+          <ConfirmContextProvider>
+            <Provider store={store}>
+              <MemoryRouter initialEntries={initialEntries}>
+                <div>
+                  {children}
+                  <ConfirmationModal />
+                </div>
+              </MemoryRouter>
+            </Provider>
+          </ConfirmContextProvider>
+        </ThemeProvider>
+      </GlobalSettingsContext.Provider>
+    </TestQueryClientProvider>
   );
   return render(ui, { wrapper: AllTheProviders, ...renderOptions });
 };
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
index e8d3ac6d4e6..77ae2b35632 100644
--- a/kafka-ui-react-app/vite.config.ts
+++ b/kafka-ui-react-app/vite.config.ts
@@ -38,6 +38,11 @@ export default defineConfig(({ mode }) => {
             changeOrigin: true,
             secure: false,
           },
+          '/actuator/info': {
+            target: proxy,
+            changeOrigin: true,
+            secure: false,
+          },
         },
       },
     };

From 7db55d5acf29d1daab488ea959e40ff143054699 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 28 Sep 2022 15:56:03 +0400
Subject: [PATCH 189/734] Expose build info for actuator (#2583)

---
 kafka-ui-api/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index f2125787fcd..9a27d29b16e 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -236,6 +236,7 @@
                     <execution>
                         <goals>
                             <goal>repackage</goal>
+                            <goal>build-info</goal>
                         </goals>
                     </execution>
                 </executions>

From 3f4791ff0a70418836a7de5f263674d128bd43a5 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Thu, 29 Sep 2022 14:34:48 +0300
Subject: [PATCH 190/734] [e2e] create screen facade class and refactor objects
 of page classes (#2656)

* Deleted classes Pages.java, Helpers.java

* Refactored BaseTest.java, added extension of Facade

* Deleted ExtensionMethod(WaitUtils.class) from ConnectorCreateView

* Refactored of TestClasses, added new TestInstance(TestInstance.Lifecycle.PER_CLASS) annotation for using nonstatic BeforeAll/AfterAll annotation

* Deleted ExtensionMethod(WaitUtils.class) annotation in ConnectorsView

* Refactored SmokeTests

* Added new abstract class Facade

* ConnectorsTests upd

* BaseTest resolved

* Initial new object classes in Facade

* Fix and refactored test classes

* Revert "Fix and refactored test classes"

This reverts commit b0890b32ca15bdf8aa99a8da901c8d6ff783b7bd.

* rename apiHelpers / apiHelper

* refactored "new Objects classes"
---
 .../provectus/kafka/ui/helpers/Helpers.java   | 11 ----
 .../com/provectus/kafka/ui/pages/Pages.java   | 53 ---------------
 .../pages/connector/ConnectorCreateView.java  |  3 -
 .../ui/pages/connector/ConnectorsView.java    |  3 -
 .../com/provectus/kafka/ui/SmokeTests.java    |  4 +-
 .../com/provectus/kafka/ui/base/BaseTest.java |  6 +-
 .../com/provectus/kafka/ui/base/Facade.java   | 31 +++++++++
 .../kafka/ui/tests/ConnectorsTests.java       | 41 ++++++------
 .../kafka/ui/tests/SchemasTests.java          | 66 +++++++++----------
 .../provectus/kafka/ui/tests/TopicTests.java  | 49 +++++++-------
 10 files changed, 109 insertions(+), 158 deletions(-)
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/Helpers.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/Helpers.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/Helpers.java
deleted file mode 100644
index cda55a0cb25..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/Helpers.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.provectus.kafka.ui.helpers;
-
-
-
-public class Helpers {
-    public static final Helpers INSTANCE = new Helpers();
-
-    private Helpers(){}
-
-    public ApiHelper apiHelper = new ApiHelper();
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
deleted file mode 100644
index 79a7652dd4d..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/Pages.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.provectus.kafka.ui.pages;
-
-import com.provectus.kafka.ui.pages.connector.ConnectorsList;
-import com.provectus.kafka.ui.pages.connector.ConnectorsView;
-import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
-import com.provectus.kafka.ui.pages.topic.ProduceMessagePanel;
-import com.provectus.kafka.ui.pages.topic.TopicView;
-import com.provectus.kafka.ui.pages.topic.TopicsList;
-import io.qameta.allure.Step;
-
-public class Pages {
-
-    public static Pages INSTANCE = new Pages();
-
-    public MainPage mainPage = new MainPage();
-    public TopicsList topicsList = new TopicsList();
-    public TopicView topicView = new TopicView();
-    public ProduceMessagePanel produceMessagePanel = new ProduceMessagePanel();
-    public ConnectorsList connectorsList = new ConnectorsList();
-    public ConnectorsView connectorsView = new ConnectorsView();
-    public SchemaRegistryList schemaRegistry = new SchemaRegistryList();
-
-    @Step
-    public MainPage open() {
-        return openMainPage();
-    }
-
-    @Step
-    public MainPage openMainPage() {
-        return mainPage.goTo();
-    }
-
-    @Step
-    public TopicsList openTopicsList(String clusterName) {
-        return topicsList.goTo(clusterName);
-    }
-
-    @Step
-    public TopicView openTopicView(String clusterName, String topicName) {
-        return topicView.goTo(clusterName, topicName);
-    }
-
-    @Step
-    public ConnectorsList openConnectorsList(String clusterName) {
-        return connectorsList.goTo(clusterName);
-    }
-
-    @Step
-    public ConnectorsView openConnectorsView(String clusterName, String connectorName) {
-        return connectorsView.goTo(clusterName, connectorName);
-    }
-
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
index 16faa760581..296dff5b1f0 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
@@ -2,9 +2,7 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
-import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.$;
@@ -12,7 +10,6 @@
 import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
 import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
-@ExtensionMethod(WaitUtils.class)
 public class ConnectorCreateView {
 
     SelenideElement nameField = $(By.xpath("//input[@name='name']"));
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
index 48f05529e32..86c7f0dfdaa 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
@@ -4,9 +4,7 @@
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.settings.Source;
-import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
-import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 
@@ -14,7 +12,6 @@
 import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
 import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
-@ExtensionMethod(WaitUtils.class)
 public class ConnectorsView {
     private static final String path = "/ui/clusters/%s/connects/first/connectors/%s";
     protected SelenideElement submitButton = $(By.xpath("//button[@type='submit']"));
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
index ee2024d0e7d..c9c560c3edc 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
@@ -1,8 +1,8 @@
 package com.provectus.kafka.ui;
 
 import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -14,7 +14,7 @@ public class SmokeTests extends BaseTest {
     @CaseId(198)
     @DisplayName("main page should load")
     void mainPageLoads() {
-        pages.open()
+        mainPage.goTo()
                 .waitUntilScreenReady();
         compareScreenshots("main");
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index a69f3afc9dd..a864a36eb2c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -1,8 +1,6 @@
 package com.provectus.kafka.ui.base;
 
 import com.codeborne.selenide.WebDriverRunner;
-import com.provectus.kafka.ui.helpers.Helpers;
-import com.provectus.kafka.ui.pages.Pages;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.TestCaseGenerator;
 import com.provectus.kafka.ui.utilities.screenshots.Screenshooter;
@@ -30,13 +28,11 @@
 
 @Slf4j
 @DisplayNameGeneration(DisplayNameGenerator.class)
-public class BaseTest {
+public class BaseTest extends Facade {
 
   private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
   private static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
   protected static final String CLUSTER_NAME = "local";
-  protected Pages pages = Pages.INSTANCE;
-  protected Helpers helpers = Helpers.INSTANCE;
 
   private final Screenshooter screenshooter = new Screenshooter();
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
new file mode 100644
index 00000000000..8e9b1f149ab
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -0,0 +1,31 @@
+package com.provectus.kafka.ui.base;
+
+import com.provectus.kafka.ui.helpers.ApiHelper;
+import com.provectus.kafka.ui.pages.MainPage;
+import com.provectus.kafka.ui.pages.connector.ConnectorCreateView;
+import com.provectus.kafka.ui.pages.connector.ConnectorsList;
+import com.provectus.kafka.ui.pages.connector.ConnectorsView;
+import com.provectus.kafka.ui.pages.schema.SchemaCreateView;
+import com.provectus.kafka.ui.pages.schema.SchemaEditView;
+import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
+import com.provectus.kafka.ui.pages.schema.SchemaView;
+import com.provectus.kafka.ui.pages.topic.ProduceMessagePanel;
+import com.provectus.kafka.ui.pages.topic.TopicCreateEditSettingsView;
+import com.provectus.kafka.ui.pages.topic.TopicView;
+import com.provectus.kafka.ui.pages.topic.TopicsList;
+
+public abstract class Facade {
+    protected MainPage mainPage = new MainPage();
+    protected ApiHelper apiHelper = new ApiHelper();
+    protected ConnectorCreateView connectorCreateView = new ConnectorCreateView();
+    protected ConnectorsList connectorsList = new ConnectorsList();
+    protected ConnectorsView connectorsView = new ConnectorsView();
+    protected SchemaCreateView schemaCreateView = new SchemaCreateView();
+    protected SchemaEditView schemaEditView = new SchemaEditView();
+    protected SchemaView schemaView = new SchemaView();
+    protected SchemaRegistryList schemaRegistryList = new SchemaRegistryList();
+    protected ProduceMessagePanel produceMessagePanel = new ProduceMessagePanel();
+    protected TopicCreateEditSettingsView topicCreateEditSettingsView = new TopicCreateEditSettingsView();
+    protected TopicsList topicsList = new TopicsList();
+    protected TopicView topicView = new TopicView();
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index bc643fa5b3a..d99d08ffbd8 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -1,12 +1,11 @@
 package com.provectus.kafka.ui.tests;
 
 import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
 import org.junit.jupiter.api.*;
 
@@ -15,6 +14,7 @@
 
 import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ConnectorsTests extends BaseTest {
     private static final long SUITE_ID = 10;
     private static final String SUITE_TITLE = "Kafka Connect";
@@ -40,14 +40,14 @@ public class ConnectorsTests extends BaseTest {
             .setConfig(getResourceAsString("config_for_create_connector_via_api.json"));
 
     @BeforeAll
-    public static void beforeAll() {
+    public void beforeAll() {
         TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
         TOPIC_LIST.forEach(topic -> {
-            Helpers.INSTANCE.apiHelper.createTopic(CLUSTER_NAME, topic.getName());
-            Helpers.INSTANCE.apiHelper.sendMessage(CLUSTER_NAME, topic);
+            apiHelper.createTopic(CLUSTER_NAME, topic.getName());
+            apiHelper.sendMessage(CLUSTER_NAME, topic);
         });
         CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
-        CONNECTOR_LIST.forEach(connector -> Helpers.INSTANCE.apiHelper
+        CONNECTOR_LIST.forEach(connector -> apiHelper
                 .createConnector(CLUSTER_NAME, CONNECT_NAME, connector));
     }
 
@@ -60,14 +60,14 @@ public void createConnector() {
         Connector connectorForCreate = new Connector()
                 .setName("sink_postgres_activities_e2e_checks")
                 .setConfig(getResourceAsString("config_for_create_connector.json"));
-        pages.openConnectorsList(CLUSTER_NAME)
+        connectorsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .clickCreateConnectorButton()
                 .waitUntilScreenReady()
                 .setConnectorConfig(connectorForCreate.getName(), connectorForCreate.getConfig());
-        pages.openConnectorsList(CLUSTER_NAME)
+        connectorsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        Assertions.assertTrue(pages.connectorsList.isConnectorVisible(connectorForCreate.getName()),"isConnectorVisible()");
+        Assertions.assertTrue(connectorsList.isConnectorVisible(connectorForCreate.getName()),"isConnectorVisible()");
         CONNECTOR_LIST.add(connectorForCreate);
     }
 
@@ -77,15 +77,14 @@ public void createConnector() {
     @CaseId(196)
     @Test
     public void updateConnector() {
-        pages.openConnectorsList(CLUSTER_NAME)
+        connectorsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_UPDATE.getName());
-        pages.connectorsView
-                .waitUntilScreenReady()
+        connectorsView.waitUntilScreenReady()
                 .openConfigTab()
                 .setConfig(CONNECTOR_FOR_UPDATE.getConfig());
-        pages.openConnectorsList(CLUSTER_NAME);
-        Assertions.assertTrue(pages.connectorsList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()),"isConnectorVisible()");
+        connectorsList.goTo(CLUSTER_NAME);
+        Assertions.assertTrue(connectorsList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()),"isConnectorVisible()");
     }
 
     @DisplayName("should delete connector")
@@ -94,19 +93,19 @@ public void updateConnector() {
     @CaseId(195)
     @Test
     public void deleteConnector() {
-        pages.openConnectorsList(CLUSTER_NAME)
+        connectorsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_DELETE.getName());
-        pages.connectorsView.clickDeleteButton();
-        pages.openConnectorsList(CLUSTER_NAME);
-        Assertions.assertFalse(pages.connectorsList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()),"isConnectorVisible()");
+        connectorsView.clickDeleteButton();
+        connectorsList.goTo(CLUSTER_NAME);
+        Assertions.assertFalse(connectorsList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()),"isConnectorVisible()");
         CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
     }
 
     @AfterAll
-    public static void afterAll() {
+    public void afterAll() {
         CONNECTOR_LIST.forEach(connector ->
-                Helpers.INSTANCE.apiHelper.deleteConnector(CLUSTER_NAME, CONNECT_NAME, connector.getName()));
-        TOPIC_LIST.forEach(topic -> Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
+                apiHelper.deleteConnector(CLUSTER_NAME, CONNECT_NAME, connector.getName()));
+        TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index 02588bcc100..563cc343cac 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -2,14 +2,12 @@
 
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.pages.MainPage;
-import com.provectus.kafka.ui.pages.schema.SchemaEditView;
 import com.provectus.kafka.ui.pages.schema.SchemaView;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
@@ -19,7 +17,7 @@
 
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
-
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class SchemasTests extends BaseTest {
     private static final long SUITE_ID = 11;
@@ -31,9 +29,9 @@ public class SchemasTests extends BaseTest {
 
     @BeforeAll
     @SneakyThrows
-    public static void beforeAll() {
+    public void beforeAll() {
         SCHEMA_LIST.addAll(List.of(AVRO_API, JSON_API, PROTOBUF_API));
-        SCHEMA_LIST.forEach(schema -> Helpers.INSTANCE.apiHelper.createSchema(CLUSTER_NAME, schema));
+        SCHEMA_LIST.forEach(schema -> apiHelper.createSchema(CLUSTER_NAME, schema));
     }
 
     @DisplayName("should create AVRO schema")
@@ -44,17 +42,17 @@ public static void beforeAll() {
     @Order(1)
     void createSchemaAvro() {
         Schema schemaAvro = Schema.createSchemaAvro();
-        pages.openMainPage()
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.clickCreateSchema()
+        schemaRegistryList.clickCreateSchema()
                 .setSubjectName(schemaAvro.getName())
                 .setSchemaField(fileToString(schemaAvro.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaAvro.getType())
                 .clickSubmit()
                 .waitUntilScreenReady();
-        pages.mainPage
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        Assertions.assertTrue(pages.schemaRegistry.isSchemaVisible(schemaAvro.getName()),"isSchemaVisible()");
+        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(schemaAvro.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaAvro);
     }
 
@@ -66,13 +64,13 @@ void createSchemaAvro() {
     @Order(2)
     void updateSchemaAvro() {
         AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_for_update.json");
-        pages.openMainPage()
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.openSchema(AVRO_API.getName())
+        schemaRegistryList.openSchema(AVRO_API.getName())
                 .waitUntilScreenReady()
                 .openEditSchema();
-        Assertions.assertTrue(new SchemaEditView().isSchemaDropDownDisabled(),"isSchemaDropDownDisabled()");
-        new SchemaEditView().selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
+        Assertions.assertTrue(schemaEditView.isSchemaDropDownDisabled(),"isSchemaDropDownDisabled()");
+        schemaEditView.selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
                 .clickSubmit()
                 .waitUntilScreenReady();
@@ -86,12 +84,12 @@ void updateSchemaAvro() {
     @Test
     @Order(3)
     void deleteSchemaAvro() {
-        pages.openMainPage()
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.openSchema(AVRO_API.getName())
+        schemaRegistryList.openSchema(AVRO_API.getName())
                 .waitUntilScreenReady()
                 .removeSchema();
-        Assertions.assertFalse(pages.schemaRegistry.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
+        Assertions.assertFalse(schemaRegistryList.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.remove(AVRO_API);
     }
 
@@ -103,17 +101,16 @@ void deleteSchemaAvro() {
     @Order(4)
     void createSchemaJson() {
         Schema schemaJson = Schema.createSchemaJson();
-        pages.openMainPage()
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.clickCreateSchema()
+        schemaRegistryList.clickCreateSchema()
                 .setSubjectName(schemaJson.getName())
                 .setSchemaField(fileToString(schemaJson.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaJson.getType())
                 .clickSubmit()
                 .waitUntilScreenReady();
-        pages.mainPage
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        Assertions.assertTrue(pages.schemaRegistry.isSchemaVisible(schemaJson.getName()),"isSchemaVisible()");
+        mainPage.goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(schemaJson.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaJson);
     }
 
@@ -124,12 +121,12 @@ void createSchemaJson() {
     @Test
     @Order(5)
     void deleteSchemaJson() {
-        pages.openMainPage()
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.openSchema(JSON_API.getName())
+        schemaRegistryList.openSchema(JSON_API.getName())
                 .waitUntilScreenReady()
                 .removeSchema();
-        Assertions.assertFalse(pages.schemaRegistry.isSchemaVisible(JSON_API.getName()),"isSchemaVisible()");
+        Assertions.assertFalse(schemaRegistryList.isSchemaVisible(JSON_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.remove(JSON_API);
     }
 
@@ -141,17 +138,16 @@ void deleteSchemaJson() {
     @Order(6)
     void createSchemaProtobuf() {
         Schema schemaProtobuf = Schema.createSchemaProtobuf();
-        pages.openMainPage()
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.clickCreateSchema()
+        schemaRegistryList.clickCreateSchema()
                 .setSubjectName(schemaProtobuf.getName())
                 .setSchemaField(fileToString(schemaProtobuf.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaProtobuf.getType())
                 .clickSubmit()
                 .waitUntilScreenReady();
-        pages.mainPage
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        Assertions.assertTrue(pages.schemaRegistry.isSchemaVisible(schemaProtobuf.getName()),"isSchemaVisible()");
+        mainPage.goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
+        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(schemaProtobuf.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaProtobuf);
     }
 
@@ -162,17 +158,17 @@ void createSchemaProtobuf() {
     @Test
     @Order(7)
     void deleteSchemaProtobuf() {
-        pages.openMainPage()
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        pages.schemaRegistry.openSchema(PROTOBUF_API.getName())
+        schemaRegistryList.openSchema(PROTOBUF_API.getName())
                 .waitUntilScreenReady()
                 .removeSchema();
-        Assertions.assertFalse(pages.schemaRegistry.isSchemaVisible(PROTOBUF_API.getName()),"isSchemaVisible()");
+        Assertions.assertFalse(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.remove(PROTOBUF_API);
     }
 
     @AfterAll
-    public static void afterAll() {
-        SCHEMA_LIST.forEach(schema -> Helpers.INSTANCE.apiHelper.deleteSchema(CLUSTER_NAME, schema.getName()));
+    public void afterAll() {
+        SCHEMA_LIST.forEach(schema -> apiHelper.deleteSchema(CLUSTER_NAME, schema.getName()));
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 5c6b0b86c18..bc4f6d4b658 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -1,14 +1,12 @@
 package com.provectus.kafka.ui.tests;
 
 import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.helpers.Helpers;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.MainPage;
-import com.provectus.kafka.ui.pages.topic.TopicCreateEditSettingsView;
 import com.provectus.kafka.ui.pages.topic.TopicView;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.*;
@@ -18,6 +16,7 @@
 
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TopicTests extends BaseTest {
     private static final long SUITE_ID = 2;
     private static final String SUITE_TITLE = "Topics";
@@ -33,9 +32,9 @@ public class TopicTests extends BaseTest {
     private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
     @BeforeAll
-    public static void beforeAll() {
+    public void beforeAll() {
         TOPIC_LIST.addAll(List.of(TOPIC_FOR_UPDATE, TOPIC_FOR_DELETE));
-        TOPIC_LIST.forEach(topic -> Helpers.INSTANCE.apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
+        TOPIC_LIST.forEach(topic -> apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
     }
 
     @DisplayName("should create a topic")
@@ -45,15 +44,15 @@ public static void beforeAll() {
     @Test
     public void createTopic() {
         Topic topicToCreate = new Topic().setName("new-topic");
-        pages.open()
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS);
-        pages.topicsList.pressCreateNewTopic()
+        topicsList.pressCreateNewTopic()
                 .setTopicName(topicToCreate.getName())
                 .sendData()
                 .waitUntilScreenReady();
-        pages.open()
+        mainPage.goTo()
                 .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS);
-        Assertions.assertTrue(pages.topicsList.isTopicVisible(topicToCreate.getName()),"isTopicVisible");
+        Assertions.assertTrue(topicsList.isTopicVisible(topicToCreate.getName()),"isTopicVisible");
         TOPIC_LIST.add(topicToCreate);
     }
 
@@ -64,9 +63,9 @@ public void createTopic() {
     @CaseId(197)
     @Test
     public void updateTopic() {
-        pages.openTopicsList(CLUSTER_NAME)
+        topicsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        pages.topicsList.openTopic(TOPIC_FOR_UPDATE.getName())
+        topicsList.openTopic(TOPIC_FOR_UPDATE.getName())
                 .waitUntilScreenReady()
                 .openEditSettings()
                 .selectCleanupPolicy(TOPIC_FOR_UPDATE.getCompactPolicyValue())
@@ -76,16 +75,16 @@ public void updateTopic() {
                 .setMaxMessageBytes(TOPIC_FOR_UPDATE.getMaxMessageBytes())
                 .sendData()
                 .waitUntilScreenReady();
-        pages.openTopicsList(CLUSTER_NAME)
+        topicsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        pages.topicsList.openTopic(TOPIC_FOR_UPDATE.getName())
+        topicsList.openTopic(TOPIC_FOR_UPDATE.getName())
                 .waitUntilScreenReady()
                 .openEditSettings();
         SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(new TopicCreateEditSettingsView().getCleanupPolicy()).as("Cleanup Policy").isEqualTo(TOPIC_FOR_UPDATE.getCompactPolicyValue());
-        softly.assertThat(new TopicCreateEditSettingsView().getTimeToRetain()).as("Time to retain").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
-        softly.assertThat(new TopicCreateEditSettingsView().getMaxSizeOnDisk()).as("Max size on disk").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk());
-        softly.assertThat(new TopicCreateEditSettingsView().getMaxMessageBytes()).as("Max message bytes").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
+        softly.assertThat(topicCreateEditSettingsView.getCleanupPolicy()).as("Cleanup Policy").isEqualTo(TOPIC_FOR_UPDATE.getCompactPolicyValue());
+        softly.assertThat(topicCreateEditSettingsView.getTimeToRetain()).as("Time to retain").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
+        softly.assertThat(topicCreateEditSettingsView.getMaxSizeOnDisk()).as("Max size on disk").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk());
+        softly.assertThat(topicCreateEditSettingsView.getMaxMessageBytes()).as("Max message bytes").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
         softly.assertAll();
     }
 
@@ -95,14 +94,14 @@ public void updateTopic() {
     @CaseId(207)
     @Test
     public void deleteTopic() {
-        pages.openTopicsList(CLUSTER_NAME)
+        topicsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openTopic(TOPIC_FOR_DELETE.getName())
                 .waitUntilScreenReady()
                 .deleteTopic();
-        pages.openTopicsList(CLUSTER_NAME)
+        topicsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        Assertions.assertFalse(pages.topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()),"isTopicVisible");
+        Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()),"isTopicVisible");
         TOPIC_LIST.remove(TOPIC_FOR_DELETE);
     }
 
@@ -112,7 +111,7 @@ public void deleteTopic() {
     @CaseId(222)
     @Test
     void produceMessage() {
-        pages.openTopicsList(CLUSTER_NAME)
+        topicsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openTopic(TOPIC_FOR_UPDATE.getName())
                 .waitUntilScreenReady()
@@ -122,13 +121,13 @@ void produceMessage() {
                 .setKeyField(TOPIC_FOR_UPDATE.getMessageKey())
                 .submitProduceMessage();
         SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(pages.topicView.isKeyMessageVisible((TOPIC_FOR_UPDATE.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
-        softly.assertThat(pages.topicView.isContentMessageVisible((TOPIC_FOR_UPDATE.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
+        softly.assertThat(topicView.isKeyMessageVisible((TOPIC_FOR_UPDATE.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
+        softly.assertThat(topicView.isContentMessageVisible((TOPIC_FOR_UPDATE.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
         softly.assertAll();
     }
 
     @AfterAll
-    public static void afterAll() {
-        TOPIC_LIST.forEach(topic -> Helpers.INSTANCE.apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
+    public void afterAll() {
+        TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
     }
 }

From 2f786c080b78b39740a68297879775c4fc31e295 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 30 Sep 2022 13:21:54 +0400
Subject: [PATCH 191/734] ISSUE-2080: Consumer groups not found for topic
 (#2628)

* Fixing consumers visibility when offsets not committed
Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/mapper/ConsumerGroupMapper.java  | 15 +++++
 .../kafka/ui/model/InternalConsumerGroup.java | 10 ---
 .../ui/model/InternalTopicConsumerGroup.java  | 61 +++++++++++++++++++
 .../ui/service/ConsumerGroupService.java      | 41 +++++++------
 .../main/resources/swagger/kafka-ui-api.yaml  |  2 +
 5 files changed, 99 insertions(+), 30 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConsumerGroup.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
index d04484b3817..75c0a99039b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
@@ -6,6 +6,7 @@
 import com.provectus.kafka.ui.model.ConsumerGroupStateDTO;
 import com.provectus.kafka.ui.model.ConsumerGroupTopicPartitionDTO;
 import com.provectus.kafka.ui.model.InternalConsumerGroup;
+import com.provectus.kafka.ui.model.InternalTopicConsumerGroup;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,6 +25,20 @@ public static ConsumerGroupDTO toDto(InternalConsumerGroup c) {
     return convertToConsumerGroup(c, new ConsumerGroupDTO());
   }
 
+  public static ConsumerGroupDTO toDto(InternalTopicConsumerGroup c) {
+    ConsumerGroupDTO consumerGroup = new ConsumerGroupDetailsDTO();
+    consumerGroup.setTopics(1); //for ui backward-compatibility, need to rm usage from ui
+    consumerGroup.setGroupId(c.getGroupId());
+    consumerGroup.setMembers(c.getMembers());
+    consumerGroup.setMessagesBehind(c.getMessagesBehind());
+    consumerGroup.setSimple(c.isSimple());
+    consumerGroup.setPartitionAssignor(c.getPartitionAssignor());
+    consumerGroup.setState(mapConsumerGroupState(c.getState()));
+    Optional.ofNullable(c.getCoordinator())
+        .ifPresent(cd -> consumerGroup.setCoordinator(mapCoordinator(cd)));
+    return consumerGroup;
+  }
+
   public static ConsumerGroupDetailsDTO toDetailsDto(InternalConsumerGroup g) {
     ConsumerGroupDetailsDTO details = convertToConsumerGroup(g, new ConsumerGroupDetailsDTO());
     Map<TopicPartition, ConsumerGroupTopicPartitionDTO> partitionMap = new HashMap<>();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
index ab5b6eed388..d7b3a732f1f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
@@ -4,7 +4,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import lombok.Builder;
 import lombok.Data;
@@ -62,13 +61,4 @@ public static InternalConsumerGroup create(
     Optional.ofNullable(description.coordinator()).ifPresent(builder::coordinator);
     return builder.build();
   }
-
-  private InternalConsumerGroup.InternalMember filterConsumerMemberTopic(
-      InternalConsumerGroup.InternalMember member, Predicate<TopicPartition> partitionsFilter) {
-    var topicPartitions = member.getAssignment()
-        .stream()
-        .filter(partitionsFilter)
-        .collect(Collectors.toSet());
-    return member.toBuilder().assignment(topicPartitions).build();
-  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConsumerGroup.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConsumerGroup.java
new file mode 100644
index 00000000000..82e455ac582
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConsumerGroup.java
@@ -0,0 +1,61 @@
+package com.provectus.kafka.ui.model;
+
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import lombok.Builder;
+import lombok.Value;
+import org.apache.kafka.clients.admin.ConsumerGroupDescription;
+import org.apache.kafka.common.ConsumerGroupState;
+import org.apache.kafka.common.Node;
+import org.apache.kafka.common.TopicPartition;
+
+@Value
+@Builder
+public class InternalTopicConsumerGroup {
+
+  String groupId;
+  int members;
+  @Nullable
+  Long messagesBehind; //null means no committed offsets found for this group
+  boolean isSimple;
+  String partitionAssignor;
+  ConsumerGroupState state;
+  @Nullable
+  Node coordinator;
+
+  public static InternalTopicConsumerGroup create(
+      String topic,
+      ConsumerGroupDescription g,
+      Map<TopicPartition, Long> committedOffsets,
+      Map<TopicPartition, Long> endOffsets) {
+    return InternalTopicConsumerGroup.builder()
+        .groupId(g.groupId())
+        .members(
+            (int) g.members().stream()
+                // counting only members with target topic assignment
+                .filter(m -> m.assignment().topicPartitions().stream().anyMatch(p -> p.topic().equals(topic)))
+                .count()
+        )
+        .messagesBehind(calculateMessagesBehind(committedOffsets, endOffsets))
+        .isSimple(g.isSimpleConsumerGroup())
+        .partitionAssignor(g.partitionAssignor())
+        .state(g.state())
+        .coordinator(g.coordinator())
+        .build();
+  }
+
+  @Nullable
+  private static Long calculateMessagesBehind(Map<TopicPartition, Long> committedOffsets,
+                                              Map<TopicPartition, Long> endOffsets) {
+    if (committedOffsets.isEmpty()) {
+      return null;
+    }
+    return committedOffsets.entrySet().stream()
+        .mapToLong(e ->
+            Optional.ofNullable(endOffsets.get(e.getKey()))
+                .map(o -> o - e.getValue())
+                .orElse(0L)
+        ).sum();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index 81e4e763e56..a82224ed278 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.model.ConsumerGroupOrderingDTO;
 import com.provectus.kafka.ui.model.InternalConsumerGroup;
+import com.provectus.kafka.ui.model.InternalTopicConsumerGroup;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.SortOrderDTO;
 import java.util.ArrayList;
@@ -30,7 +31,6 @@
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
-
 @Service
 @RequiredArgsConstructor
 public class ConsumerGroupService {
@@ -71,37 +71,38 @@ public Mono<List<InternalConsumerGroup>> getAllConsumerGroups(KafkaCluster clust
             .flatMap(descriptions -> getConsumerGroups(ac, descriptions)));
   }
 
-  public Mono<List<InternalConsumerGroup>> getConsumerGroupsForTopic(KafkaCluster cluster,
-                                                                     String topic) {
+  public Mono<List<InternalTopicConsumerGroup>> getConsumerGroupsForTopic(KafkaCluster cluster,
+                                                                          String topic) {
     return adminClientService.get(cluster)
         // 1. getting topic's end offsets
         .flatMap(ac -> ac.listOffsets(topic, OffsetSpec.latest())
             .flatMap(endOffsets -> {
               var tps = new ArrayList<>(endOffsets.keySet());
               // 2. getting all consumer groups
-              return ac.listConsumerGroups()
-                  .flatMap((List<String> groups) ->
+              return describeConsumerGroups(ac, null)
+                  .flatMap((List<ConsumerGroupDescription> groups) ->
                       Flux.fromIterable(groups)
                           // 3. for each group trying to find committed offsets for topic
                           .flatMap(g ->
-                              ac.listConsumerGroupOffsets(g, tps)
-                                  .map(offsets -> Tuples.of(g, offsets)))
-                          .filter(t -> !t.getT2().isEmpty())
-                          .collectMap(Tuple2::getT1, Tuple2::getT2)
-                  )
-                  .flatMap((Map<String, Map<TopicPartition, Long>> groupOffsets) ->
-                      // 4. getting description for groups with non-emtpy offsets
-                      ac.describeConsumerGroups(groupOffsets.keySet())
-                          .map((Map<String, ConsumerGroupDescription> descriptions) ->
-                              descriptions.values().stream().map(desc ->
-                                      // 5. gathering into InternalConsumerGroup
-                                      InternalConsumerGroup.create(
-                                              desc, groupOffsets.get(desc.groupId()), endOffsets)
-                                  )
-                                  .collect(Collectors.toList())));
+                              ac.listConsumerGroupOffsets(g.groupId(), tps)
+                                  // 4. keeping only groups that relates to topic
+                                  .filter(offsets -> isConsumerGroupRelatesToTopic(topic, g, offsets))
+                                  // 5. constructing results
+                                  .map(offsets -> InternalTopicConsumerGroup.create(topic, g, offsets, endOffsets))
+                          ).collectList());
             }));
   }
 
+  private boolean isConsumerGroupRelatesToTopic(String topic,
+                                                ConsumerGroupDescription description,
+                                                Map<TopicPartition, Long> committedGroupOffsetsForTopic) {
+    boolean hasActiveMembersForTopic = description.members()
+        .stream()
+        .anyMatch(m -> m.assignment().topicPartitions().stream().anyMatch(tp -> tp.topic().equals(topic)));
+    boolean hasCommittedOffsets = !committedGroupOffsetsForTopic.isEmpty();
+    return hasActiveMembersForTopic || hasCommittedOffsets;
+  }
+
   @Value
   public static class ConsumerGroupsPage {
     List<InternalConsumerGroup> consumerGroups;
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 0ac9e6c46e8..e06c4537811 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2329,6 +2329,7 @@ components:
         messagesBehind:
           type: integer
           format: int64
+          description: null if consumer group has no offsets committed
       required:
         - groupId
 
@@ -2542,6 +2543,7 @@ components:
         messagesBehind:
           type: integer
           format: int64
+          description: null if consumer group has no offsets committed
         consumerId:
           type: string
         host:

From a1d14ab4304a4b5d51a8537ee38d128aeaaa2719 Mon Sep 17 00:00:00 2001
From: David-DB88 <58771979+David-DB88@users.noreply.github.com>
Date: Fri, 30 Sep 2022 17:04:40 +0400
Subject: [PATCH 192/734] Add warning message for the Topic Danger zone #2534
 (#2663)

* Add warning message for Danger zone in case of editing the Topic #2534

* Used existing palette color on warning message for Danger zone in case of editing the Topic #2534

* Update kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx    | 8 ++++++--
 .../Topics/Topic/Edit/DangerZone/DangerZone.tsx           | 4 ++++
 kafka-ui-react-app/src/theme/theme.ts                     | 5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
index b9ad51a669e..b5741c67e19 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
@@ -15,11 +15,15 @@ export const Wrapper = styled.div`
 `;
 
 export const Title = styled.h1`
-  color: ${({ theme }) => theme.dangerZone.color};
+  color: ${({ theme }) => theme.dangerZone.color.title};
   font-size: 20px;
   padding-bottom: 16px;
 `;
-
+export const Warning = styled.div`
+  color: ${({ theme }) => theme.dangerZone.color.warningMessage};
+  font-size: 12px;
+  padding-bottom: 16px;
+`;
 export const Form = styled.form`
   display: flex;
   align-items: flex-end;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
index 49f1d3574a4..59016d1d7a4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
@@ -81,6 +81,10 @@ const DangerZone: React.FC<DangerZoneProps> = ({
   return (
     <S.Wrapper>
       <S.Title>Danger Zone</S.Title>
+      <S.Warning>
+        Change these parameters only if you are absolutely sure what you are
+        doing.
+      </S.Warning>
       <div>
         <FormProvider {...partitionsMethods}>
           <S.Form
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index d05ad54cb94..19c082c2840 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -518,7 +518,10 @@ const theme = {
   },
   dangerZone: {
     borderColor: Colors.neutral[10],
-    color: Colors.red[50],
+    color: {
+      title: Colors.red[50],
+      warningMessage: Colors.neutral[50],
+    },
   },
   configList: {
     color: Colors.neutral[30],

From 55c8d6ac2d4bdfb9721c79d4894732c86e0380d9 Mon Sep 17 00:00:00 2001
From: Vaishnavi Joshi <vj.codes29@gmail.com>
Date: Sun, 2 Oct 2022 13:04:13 +0530
Subject: [PATCH 193/734] Topic list: Rename "total partitions" to "partitions"
 (#2687)

---
 kafka-ui-react-app/src/components/Topics/List/TopicTable.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/List/TopicTable.tsx b/kafka-ui-react-app/src/components/Topics/List/TopicTable.tsx
index a855435c876..dcafa61b915 100644
--- a/kafka-ui-react-app/src/components/Topics/List/TopicTable.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/TopicTable.tsx
@@ -42,7 +42,7 @@ const TopicTable: React.FC = () => {
       },
       {
         id: TopicColumnsToSort.TOTAL_PARTITIONS,
-        header: 'Total Partitions',
+        header: 'Partitions',
         accessorKey: 'partitionCount',
       },
       {

From 8731de1520705c29bfacbdf78c362912c6945132 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Sun, 2 Oct 2022 14:38:36 +0300
Subject: [PATCH 194/734] Add scrollable wrapper to the new table component
 (#2692)

---
 .../src/components/App.styled.ts              |   3 +-
 .../Brokers/Broker/Configs/Configs.styled.ts  |   2 +-
 .../Brokers/Broker/Configs/InputCell.tsx      |   2 +-
 .../Topic/MessagesV2/Messages.styled.ts       |   6 +-
 .../common/NewTable/Table.styled.ts           |   4 +
 .../src/components/common/NewTable/Table.tsx  | 164 +++++++++---------
 kafka-ui-react-app/src/theme/theme.ts         |   1 +
 7 files changed, 96 insertions(+), 86 deletions(-)

diff --git a/kafka-ui-react-app/src/components/App.styled.ts b/kafka-ui-react-app/src/components/App.styled.ts
index 71353f08762..90eade047d1 100644
--- a/kafka-ui-react-app/src/components/App.styled.ts
+++ b/kafka-ui-react-app/src/components/App.styled.ts
@@ -20,9 +20,10 @@ export const Container = styled.main(
     position: relative;
     padding-bottom: 30px;
     z-index: 20;
-
+    max-width: calc(100vw - ${theme.layout.navBarWidth});
     @media screen and (max-width: 1023px) {
       margin-left: initial;
+      max-width: 100vw;
     }
   `
 );
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts
index a49bcf5d7d9..03030b12498 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts
@@ -12,7 +12,7 @@ export const Value = styled.span`
   line-height: 24px;
   margin-right: 10px;
   text-overflow: ellipsis;
-  width: 600px;
+  max-width: 400px;
   overflow: hidden;
   white-space: nowrap;
 `;
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
index ceeff2bd59e..422abbbac99 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
@@ -70,7 +70,7 @@ const InputCell: React.FC<InputCellProps> = ({ row, getValue, onUpdate }) => {
           : { fontWeight: 400 }
       }
     >
-      <S.Value>{initialValue}</S.Value>
+      <S.Value title={initialValue}>{initialValue}</S.Value>
       <Button
         buttonType="primary"
         buttonSize="S"
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
index da464fe808f..c360f706d37 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
@@ -14,7 +14,7 @@ export const Wrapper = styled.div(
 
 export const Sidebar = styled.div(
   ({ theme }) => css`
-    width: 300px;
+    width: ${theme.layout.filtersSidebarWidth};
     position: sticky;
     top: ${theme.layout.navBarHeight};
     align-self: start;
@@ -27,7 +27,9 @@ export const SidebarContent = styled.div`
 
 export const TableWrapper = styled.div(
   ({ theme }) => css`
-    width: 100%;
+    width: calc(
+      100vw - ${theme.layout.navBarWidth} - ${theme.layout.filtersSidebarWidth}
+    );
     border-left: 1px solid ${theme.layout.stuffBorderColor};
   `
 );
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
index 483e4e32160..d66bb45091c 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
@@ -211,3 +211,7 @@ export const Ellipsis = styled.div`
   text-overflow: ellipsis;
   display: block;
 `;
+
+export const TableWrapper = styled.div`
+  overflow-x: auto;
+`;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 2d1646aa99e..7e3b571c375 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -198,95 +198,97 @@ const Table: React.FC<TableProps<any>> = ({
           />
         </S.TableActionsBar>
       )}
-      <S.Table>
-        <thead>
-          {table.getHeaderGroups().map((headerGroup) => (
-            <tr key={headerGroup.id}>
-              {!!enableRowSelection && (
-                <S.Th key={`${headerGroup.id}-select`}>
-                  {flexRender(
-                    SelectRowHeader,
-                    headerGroup.headers[0].getContext()
-                  )}
-                </S.Th>
-              )}
-              {table.getCanSomeRowsExpand() && (
-                <S.Th expander key={`${headerGroup.id}-expander`} />
-              )}
-              {headerGroup.headers.map((header) => (
-                <S.Th
-                  key={header.id}
-                  colSpan={header.colSpan}
-                  sortable={header.column.getCanSort()}
-                  sortOrder={header.column.getIsSorted()}
-                  onClick={header.column.getToggleSortingHandler()}
-                >
-                  <div>
-                    {flexRender(
-                      header.column.columnDef.header,
-                      header.getContext()
-                    )}
-                  </div>
-                </S.Th>
-              ))}
-            </tr>
-          ))}
-        </thead>
-        <tbody>
-          {table.getRowModel().rows.map((row) => (
-            <React.Fragment key={row.id}>
-              <S.Row
-                expanded={row.getIsExpanded()}
-                onClick={handleRowClick(row)}
-                clickable={
-                  !enableRowSelection &&
-                  (row.getCanExpand() || onRowClick !== undefined)
-                }
-              >
+      <S.TableWrapper>
+        <S.Table>
+          <thead>
+            {table.getHeaderGroups().map((headerGroup) => (
+              <tr key={headerGroup.id}>
                 {!!enableRowSelection && (
-                  <td key={`${row.id}-select`} style={{ width: '1px' }}>
+                  <S.Th key={`${headerGroup.id}-select`}>
                     {flexRender(
-                      SelectRowCell,
-                      row.getVisibleCells()[0].getContext()
+                      SelectRowHeader,
+                      headerGroup.headers[0].getContext()
                     )}
-                  </td>
+                  </S.Th>
                 )}
                 {table.getCanSomeRowsExpand() && (
-                  <td key={`${row.id}-expander`} style={{ width: '1px' }}>
-                    {flexRender(
-                      ExpanderCell,
-                      row.getVisibleCells()[0].getContext()
-                    )}
-                  </td>
+                  <S.Th expander key={`${headerGroup.id}-expander`} />
                 )}
-                {row
-                  .getVisibleCells()
-                  .map(({ id, getContext, column: { columnDef } }) => (
-                    <td key={id} style={columnDef.meta}>
-                      {flexRender(columnDef.cell, getContext())}
+                {headerGroup.headers.map((header) => (
+                  <S.Th
+                    key={header.id}
+                    colSpan={header.colSpan}
+                    sortable={header.column.getCanSort()}
+                    sortOrder={header.column.getIsSorted()}
+                    onClick={header.column.getToggleSortingHandler()}
+                  >
+                    <div>
+                      {flexRender(
+                        header.column.columnDef.header,
+                        header.getContext()
+                      )}
+                    </div>
+                  </S.Th>
+                ))}
+              </tr>
+            ))}
+          </thead>
+          <tbody>
+            {table.getRowModel().rows.map((row) => (
+              <React.Fragment key={row.id}>
+                <S.Row
+                  expanded={row.getIsExpanded()}
+                  onClick={handleRowClick(row)}
+                  clickable={
+                    !enableRowSelection &&
+                    (row.getCanExpand() || onRowClick !== undefined)
+                  }
+                >
+                  {!!enableRowSelection && (
+                    <td key={`${row.id}-select`} style={{ width: '1px' }}>
+                      {flexRender(
+                        SelectRowCell,
+                        row.getVisibleCells()[0].getContext()
+                      )}
                     </td>
-                  ))}
-              </S.Row>
-              {row.getIsExpanded() && SubComponent && (
-                <S.Row expanded>
-                  <td colSpan={row.getVisibleCells().length + 2}>
-                    <S.ExpandedRowInfo>
-                      <SubComponent row={row} />
-                    </S.ExpandedRowInfo>
-                  </td>
+                  )}
+                  {table.getCanSomeRowsExpand() && (
+                    <td key={`${row.id}-expander`} style={{ width: '1px' }}>
+                      {flexRender(
+                        ExpanderCell,
+                        row.getVisibleCells()[0].getContext()
+                      )}
+                    </td>
+                  )}
+                  {row
+                    .getVisibleCells()
+                    .map(({ id, getContext, column: { columnDef } }) => (
+                      <td key={id} style={columnDef.meta}>
+                        {flexRender(columnDef.cell, getContext())}
+                      </td>
+                    ))}
                 </S.Row>
-              )}
-            </React.Fragment>
-          ))}
-          {table.getRowModel().rows.length === 0 && (
-            <S.Row>
-              <S.EmptyTableMessageCell colSpan={100}>
-                {emptyMessage || 'No rows found'}
-              </S.EmptyTableMessageCell>
-            </S.Row>
-          )}
-        </tbody>
-      </S.Table>
+                {row.getIsExpanded() && SubComponent && (
+                  <S.Row expanded>
+                    <td colSpan={row.getVisibleCells().length + 2}>
+                      <S.ExpandedRowInfo>
+                        <SubComponent row={row} />
+                      </S.ExpandedRowInfo>
+                    </td>
+                  </S.Row>
+                )}
+              </React.Fragment>
+            ))}
+            {table.getRowModel().rows.length === 0 && (
+              <S.Row>
+                <S.EmptyTableMessageCell colSpan={100}>
+                  {emptyMessage || 'No rows found'}
+                </S.EmptyTableMessageCell>
+              </S.Row>
+            )}
+          </tbody>
+        </S.Table>
+      </S.TableWrapper>
       {table.getPageCount() > 1 && (
         <S.Pagination>
           <S.Pages>
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 19c082c2840..5a2b806a01f 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -90,6 +90,7 @@ const theme = {
     navBarWidth: '201px',
     navBarHeight: '53px',
     rightSidebarWidth: '70vw',
+    filtersSidebarWidth: '300px',
 
     stuffColor: Colors.neutral[5],
     stuffBorderColor: Colors.neutral[10],

From 68218668ec2088125e417cf2776f63386fafa8e3 Mon Sep 17 00:00:00 2001
From: David-DB88 <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 3 Oct 2022 12:42:48 +0400
Subject: [PATCH 195/734] fixed tests connectors buttons with a sandwich menu
 #2403 (#2666)

* fixed tests connectors buttons with a sandwich menu #2403

* Changed color delete button and fixed tests #2403

* fix deleteConnector()

* fix deleteConnector()

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../pages/connector/ConnectorCreateView.java  |  4 +-
 .../ui/pages/connector/ConnectorsList.java    |  4 +-
 .../ui/pages/connector/ConnectorsView.java    | 65 ++++++++------
 .../ui/pages/schema/SchemaCreateView.java     |  4 +-
 .../kafka/ui/pages/schema/SchemaEditView.java |  4 +-
 .../ui/pages/schema/SchemaRegistryList.java   |  4 +-
 .../kafka/ui/pages/schema/SchemaView.java     |  4 +-
 .../topic/TopicCreateEditSettingsView.java    |  4 +-
 .../kafka/ui/pages/topic/TopicView.java       |  8 +-
 .../kafka/ui/pages/topic/TopicsList.java      |  4 +-
 .../kafka/ui/utilities/WebUtils.java          |  9 +-
 .../kafka/ui/tests/ConnectorsTests.java       |  8 +-
 .../Connect/Details/Actions/Actions.tsx       | 86 ++++++-------------
 .../Actions/__tests__/Actions.spec.tsx        | 36 +++++---
 14 files changed, 123 insertions(+), 121 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
index 296dff5b1f0..88fbb957859 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
@@ -7,7 +7,7 @@
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.sleep;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
 public class ConnectorCreateView {
@@ -25,7 +25,7 @@ public ConnectorsView setConnectorConfig(String connectName, String configJson)
         contentTextArea.setValue("");
         contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
         nameField.click();
-        javaExecutorClick(submitButton);
+        clickByJavaScript(submitButton);
         sleep(4000);
         log.info("Connector config is submitted");
         return new ConnectorsView();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
index 2eb8fdb2821..9c16163b950 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
@@ -11,7 +11,7 @@
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 @ExtensionMethod(WaitUtils.class)
 public class ConnectorsList {
@@ -32,7 +32,7 @@ public ConnectorsList waitUntilScreenReady() {
 
     @Step("Click on button 'Create Connector'")
     public ConnectorCreateView clickCreateConnectorButton() {
-        javaExecutorClick($x("//button[text()='Create Connector']"));
+        clickByJavaScript($x("//button[text()='Create Connector']"));
         return new ConnectorCreateView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
index 86c7f0dfdaa..83a16590557 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
@@ -1,61 +1,74 @@
 package com.provectus.kafka.ui.pages.connector;
 
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.settings.Source;
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 
-import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.sleep;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
 public class ConnectorsView {
-    private static final String path = "/ui/clusters/%s/connects/first/connectors/%s";
-    protected SelenideElement submitButton = $(By.xpath("//button[@type='submit']"));
+    protected SelenideElement dotMenuBtn = $(By.xpath("//button[@aria-label='Dropdown Toggle']"));
+    protected SelenideElement deleteBtn = $(By.xpath("//li/div[text()='Delete']"));
+    protected SelenideElement confirmBtnMdl = $(By.xpath("//div[@role='dialog']//button[text()='Confirm']"));
+    protected SelenideElement submitBtn = $(By.xpath("//button[@type='submit']"));
     protected SelenideElement contentTextArea = $("[wrap]");
 
     @Step
-    public ConnectorsView goTo(String cluster, String connector) {
-        Selenide.open(String.format(Source.BASE_WEB_URL + path, cluster, connector));
+    public ConnectorsView waitUntilScreenReady() {
+        $(By.xpath("//a[text() ='Tasks']")).shouldBe(Condition.visible);
+        $(By.xpath("//a[text() ='Config']")).shouldBe(Condition.visible);
+        $(By.xpath("//a[text() ='Overview']")).shouldBe(Condition.visible);
         return this;
     }
 
     @Step()
     public ConnectorsView openConfigTab() {
-        javaExecutorClick($(By.xpath("//a[text() ='Config']")));
-        return new ConnectorsView();
+        clickByJavaScript($(By.xpath("//a[text() ='Config']")));
+        return this;
     }
 
-    @Step("Set connector config JSON")
+    @Step()
     public ConnectorsView setConfig(String configJson) {
         $("#config").click();
-        contentTextArea.sendKeys(Keys.LEFT_CONTROL+"a");
+        contentTextArea.sendKeys(Keys.LEFT_CONTROL + "a");
         contentTextArea.setValue("");
         contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
         $("#config").click();
-        submitButton.shouldBe(Condition.enabled);
-        javaExecutorClick(submitButton);
+        clickByJavaScript(submitBtn);
         sleep(4000);
         log.info("Connector config is submitted");
-        return new ConnectorsView();
+        return this;
     }
 
-    @Step("Click 'Delete' button")
-    public void clickDeleteButton() {
-        javaExecutorClick($x("//button[text()='Delete']"));
-        SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
-        confirmButton.shouldBe(Condition.enabled).click();
-        confirmButton.shouldBe(Condition.disappear);
+    @Step()
+    public ConnectorsView openDotMenu() {
+        clickByJavaScript(dotMenuBtn);
+        return this;
     }
 
-    @Step
-    public ConnectorsView waitUntilScreenReady() {
-        $(By.xpath("//a[text() ='Tasks']")).shouldBe(Condition.visible);
-        $(By.xpath("//a[text() ='Config']")).shouldBe(Condition.visible);
-        $(By.xpath("//a[text() ='Overview']")).shouldBe(Condition.visible);
+    @Step()
+    public ConnectorsView clickDeleteButton() {
+        clickByJavaScript(deleteBtn);
+        return this;
+    }
+
+    @Step()
+    public ConnectorsView clickConfirmButton() {
+        confirmBtnMdl.shouldBe(Condition.enabled).click();
+        confirmBtnMdl.shouldBe(Condition.disappear);
+        return this;
+    }
+
+    @Step()
+    public ConnectorsView deleteConnector() {
+        openDotMenu();
+        clickDeleteButton();
+        clickConfirmButton();
         return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
index aca3d0d6fca..b6fc2f8553b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
@@ -7,7 +7,7 @@
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 public class SchemaCreateView {
 
@@ -22,7 +22,7 @@ public SchemaCreateView selectSchemaTypeFromDropdown(SchemaType schemaType) {
     }
     @Step
     public SchemaView clickSubmit() {
-        javaExecutorClick(submitSchemaButton);
+        clickByJavaScript(submitSchemaButton);
         return new SchemaView();
     }
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
index 7dabffcd919..7cb793055b5 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
@@ -11,7 +11,7 @@
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 public class SchemaEditView {
 
@@ -32,7 +32,7 @@ public SchemaEditView selectCompatibilityLevelFromDropdown(CompatibilityLevel.Co
     }
     @Step
     public SchemaView clickSubmit() {
-        javaExecutorClick($(By.xpath("//button[@type='submit']")));
+        clickByJavaScript($(By.xpath("//button[@type='submit']")));
         return new SchemaView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index e8a08264ab8..713caf38914 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -7,7 +7,7 @@
 
 import static com.codeborne.selenide.Selenide.*;
 import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 public class SchemaRegistryList {
 
@@ -15,7 +15,7 @@ public class SchemaRegistryList {
 
     @Step
     public SchemaCreateView clickCreateSchema() {
-        javaExecutorClick(schemaButton);
+        clickByJavaScript(schemaButton);
         return new SchemaCreateView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
index b224bf102ec..92d4a0937ee 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
@@ -6,7 +6,7 @@
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 public class SchemaView {
 
@@ -30,7 +30,7 @@ public SchemaEditView openEditSchema(){
     }
     @Step
     public SchemaRegistryList removeSchema() {
-        javaExecutorClick(dotMenuBtn);
+        clickByJavaScript(dotMenuBtn);
         $(By.xpath("//*[contains(text(),'Remove')]")).click();
         SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
         confirmButton.shouldBe(Condition.enabled).click();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
index 1ee1cc1edaa..5a654a6a333 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
@@ -8,7 +8,7 @@
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TopicCreateEditSettingsView {
@@ -83,7 +83,7 @@ public TopicCreateEditSettingsView selectRetentionBytes(Long optionValue) {
     }
     @Step
     public TopicView sendData() {
-        javaExecutorClick($x("//button[@type='submit']"));
+        clickByJavaScript($x("//button[@type='submit']"));
         return new TopicView();
     }
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
index 4ac303573fa..6f401641ce3 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
@@ -10,7 +10,7 @@
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 @ExtensionMethod({WaitUtils.class})
 public class TopicView {
@@ -32,7 +32,7 @@ public TopicView waitUntilScreenReady() {
 
     @Step
     public TopicCreateEditSettingsView openEditSettings() {
-        javaExecutorClick(dotMenuBtn);
+        clickByJavaScript(dotMenuBtn);
         $x("//li[@role][text()='Edit settings']").click();
         return new TopicCreateEditSettingsView();
     }
@@ -45,7 +45,7 @@ public TopicView openTopicMenu(TopicMenu menu) {
 
     @Step
     public TopicsList deleteTopic() {
-        javaExecutorClick(dotMenuBtn);
+        clickByJavaScript(dotMenuBtn);
         $x("//ul[@role='menu']//div[text()='Remove Topic']").click();
         SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
         confirmButton.shouldBe(Condition.enabled).click();
@@ -55,7 +55,7 @@ public TopicsList deleteTopic() {
 
     @Step
     public ProduceMessagePanel clickOnButton(String buttonName) {
-        javaExecutorClick($(By.xpath(String.format("//div//button[text()='%s']", buttonName))));
+        clickByJavaScript($(By.xpath(String.format("//div//button[text()='%s']", buttonName))));
         return new ProduceMessagePanel();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 72fe6cfbf5b..0fb99d444ed 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -11,7 +11,7 @@
 
 import static com.codeborne.selenide.Selenide.*;
 import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
-import static com.provectus.kafka.ui.utilities.WebUtils.javaExecutorClick;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 @ExtensionMethod(WaitUtils.class)
 public class TopicsList {
@@ -33,7 +33,7 @@ public TopicsList waitUntilScreenReady() {
 
     @Step
     public TopicCreateEditSettingsView pressCreateNewTopic() {
-        javaExecutorClick($x("//button[normalize-space(text()) ='Add a Topic']"));
+        clickByJavaScript($x("//button[normalize-space(text()) ='Add a Topic']"));
         return new TopicCreateEditSettingsView();
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index f88a98f5baa..9795457c822 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -1,15 +1,18 @@
 package com.provectus.kafka.ui.utilities;
 
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import lombok.extern.slf4j.Slf4j;
 
+import static com.codeborne.selenide.Selenide.executeJavaScript;
+
 @Slf4j
 public class WebUtils {
 
-    public static void javaExecutorClick(SelenideElement element){
-        Selenide.executeJavaScript("arguments[0].click();", element);
+    public static void clickByJavaScript(SelenideElement element) {
+        element.shouldBe(Condition.enabled);
+        String script = "arguments[0].click();";
+        executeJavaScript(script, element);
     }
 
     public static boolean isVisible(SelenideElement element) {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index d99d08ffbd8..037db29edab 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -96,9 +96,13 @@ public void deleteConnector() {
         connectorsList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_DELETE.getName());
-        connectorsView.clickDeleteButton();
+        connectorsView
+                .waitUntilScreenReady()
+                .openDotMenu()
+                .clickDeleteButton()
+                .clickConfirmButton();
         connectorsList.goTo(CLUSTER_NAME);
-        Assertions.assertFalse(connectorsList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()),"isConnectorVisible()");
+        Assertions.assertFalse(connectorsList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
         CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
     }
 
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index ee0f3063468..bc76ccfcbb6 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -13,8 +13,8 @@ import {
   clusterConnectorsPath,
   RouterParamsClusterConnectConnector,
 } from 'lib/paths';
-import { Button } from 'components/common/Button/Button';
 import { useConfirm } from 'lib/hooks/useConfirm';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 
 const ConnectorActionsWrapperStyled = styled.div`
   display: flex;
@@ -63,66 +63,34 @@ const Actions: React.FC = () => {
 
   return (
     <ConnectorActionsWrapperStyled>
-      {connector?.status.state === ConnectorState.RUNNING && (
-        <Button
-          buttonSize="M"
-          buttonType="primary"
-          type="button"
-          onClick={pauseConnectorHandler}
+      <Dropdown>
+        {connector?.status.state === ConnectorState.RUNNING && (
+          <DropdownItem onClick={pauseConnectorHandler} disabled={isMutating}>
+            Pause
+          </DropdownItem>
+        )}
+        {connector?.status.state === ConnectorState.PAUSED && (
+          <DropdownItem onClick={resumeConnectorHandler} disabled={isMutating}>
+            Resume
+          </DropdownItem>
+        )}
+        <DropdownItem onClick={restartConnectorHandler} disabled={isMutating}>
+          Restart Connector
+        </DropdownItem>
+        <DropdownItem onClick={restartAllTasksHandler} disabled={isMutating}>
+          Restart All Tasks
+        </DropdownItem>
+        <DropdownItem onClick={restartFailedTasksHandler} disabled={isMutating}>
+          Restart Failed Tasks
+        </DropdownItem>
+        <DropdownItem
+          onClick={deleteConnectorHandler}
           disabled={isMutating}
+          danger
         >
-          Pause
-        </Button>
-      )}
-
-      {connector?.status.state === ConnectorState.PAUSED && (
-        <Button
-          buttonSize="M"
-          buttonType="primary"
-          type="button"
-          onClick={resumeConnectorHandler}
-          disabled={isMutating}
-        >
-          Resume
-        </Button>
-      )}
-
-      <Button
-        buttonSize="M"
-        buttonType="primary"
-        type="button"
-        onClick={restartConnectorHandler}
-        disabled={isMutating}
-      >
-        Restart Connector
-      </Button>
-      <Button
-        buttonSize="M"
-        buttonType="primary"
-        type="button"
-        onClick={restartAllTasksHandler}
-        disabled={isMutating}
-      >
-        Restart All Tasks
-      </Button>
-      <Button
-        buttonSize="M"
-        buttonType="primary"
-        type="button"
-        onClick={restartFailedTasksHandler}
-        disabled={isMutating}
-      >
-        Restart Failed Tasks
-      </Button>
-      <Button
-        buttonSize="M"
-        buttonType="secondary"
-        type="button"
-        onClick={deleteConnectorHandler}
-        disabled={isMutating}
-      >
-        Delete
-      </Button>
+          Delete
+        </DropdownItem>
+      </Dropdown>
     </ConnectorActionsWrapperStyled>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
index 3a2f70bf916..878e8bcee6c 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
@@ -33,7 +33,11 @@ const expectActionButtonsExists = () => {
   expect(screen.getByText('Restart Failed Tasks')).toBeInTheDocument();
   expect(screen.getByText('Delete')).toBeInTheDocument();
 };
-
+const afterClickDropDownButton = () => {
+  const dropDownButton = screen.getAllByRole('button');
+  expect(dropDownButton.length).toEqual(1);
+  userEvent.click(dropDownButton[0]);
+};
 describe('Actions', () => {
   afterEach(() => {
     mockHistoryPush.mockClear();
@@ -62,7 +66,8 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.PAUSED),
       }));
       renderComponent();
-      expect(screen.getAllByRole('button').length).toEqual(5);
+      afterClickDropDownButton();
+      expect(screen.getAllByRole('menuitem').length).toEqual(5);
       expect(screen.getByText('Resume')).toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
@@ -73,7 +78,8 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.FAILED),
       }));
       renderComponent();
-      expect(screen.getAllByRole('button').length).toEqual(4);
+      afterClickDropDownButton();
+      expect(screen.getAllByRole('menuitem').length).toEqual(4);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
@@ -84,7 +90,8 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.UNASSIGNED),
       }));
       renderComponent();
-      expect(screen.getAllByRole('button').length).toEqual(4);
+      afterClickDropDownButton();
+      expect(screen.getAllByRole('menuitem').length).toEqual(4);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
@@ -95,7 +102,8 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.RUNNING),
       }));
       renderComponent();
-      expect(screen.getAllByRole('button').length).toEqual(5);
+      afterClickDropDownButton();
+      expect(screen.getAllByRole('menuitem').length).toEqual(5);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.getByText('Pause')).toBeInTheDocument();
       expectActionButtonsExists();
@@ -110,8 +118,9 @@ describe('Actions', () => {
 
       it('opens confirmation modal when delete button clicked', async () => {
         renderComponent();
+        afterClickDropDownButton();
         await waitFor(() =>
-          userEvent.click(screen.getByRole('button', { name: 'Delete' }))
+          userEvent.click(screen.getByRole('menuitem', { name: 'Delete' }))
         );
         expect(screen.getByRole('dialog')).toBeInTheDocument();
       });
@@ -122,8 +131,9 @@ describe('Actions', () => {
           mutateAsync: restartConnector,
         }));
         renderComponent();
+        afterClickDropDownButton();
         userEvent.click(
-          screen.getByRole('button', { name: 'Restart Connector' })
+          screen.getByRole('menuitem', { name: 'Restart Connector' })
         );
         expect(restartConnector).toHaveBeenCalledWith(ConnectorAction.RESTART);
       });
@@ -134,8 +144,9 @@ describe('Actions', () => {
           mutateAsync: restartAllTasks,
         }));
         renderComponent();
+        afterClickDropDownButton();
         userEvent.click(
-          screen.getByRole('button', { name: 'Restart All Tasks' })
+          screen.getByRole('menuitem', { name: 'Restart All Tasks' })
         );
         expect(restartAllTasks).toHaveBeenCalledWith(
           ConnectorAction.RESTART_ALL_TASKS
@@ -148,8 +159,9 @@ describe('Actions', () => {
           mutateAsync: restartFailedTasks,
         }));
         renderComponent();
+        afterClickDropDownButton();
         userEvent.click(
-          screen.getByRole('button', { name: 'Restart Failed Tasks' })
+          screen.getByRole('menuitem', { name: 'Restart Failed Tasks' })
         );
         expect(restartFailedTasks).toHaveBeenCalledWith(
           ConnectorAction.RESTART_FAILED_TASKS
@@ -162,7 +174,8 @@ describe('Actions', () => {
           mutateAsync: pauseConnector,
         }));
         renderComponent();
-        userEvent.click(screen.getByRole('button', { name: 'Pause' }));
+        afterClickDropDownButton();
+        userEvent.click(screen.getByRole('menuitem', { name: 'Pause' }));
         expect(pauseConnector).toHaveBeenCalledWith(ConnectorAction.PAUSE);
       });
 
@@ -175,7 +188,8 @@ describe('Actions', () => {
           mutateAsync: resumeConnector,
         }));
         renderComponent();
-        userEvent.click(screen.getByRole('button', { name: 'Resume' }));
+        afterClickDropDownButton();
+        userEvent.click(screen.getByRole('menuitem', { name: 'Resume' }));
         expect(resumeConnector).toHaveBeenCalledWith(ConnectorAction.RESUME);
       });
     });

From b19b9d82e921cf0c2fb3e3fb6517c79d0b4053e8 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 3 Oct 2022 17:16:55 +0400
Subject: [PATCH 196/734] Minor backend fixes (#2696)

Minor backend fixes:
1. InternalTopic.leader fiels filling fix
2. bytesIn/OutPerSec fields set to TopicDTO
3. "subject" property added to SR SchemaDescription
---
 .../kafka/ui/model/InternalTopic.java         |  9 +++--
 .../builtin/sr/SchemaRegistrySerde.java       |  1 +
 .../builtin/sr/SchemaRegistrySerdeTest.java   | 35 ++++++++++++-------
 .../main/resources/swagger/kafka-ui-api.yaml  |  4 +++
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
index c6cc4b1b081..206e3a83fbc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
@@ -57,9 +57,12 @@ public static InternalTopic from(TopicDescription topicDescription,
           partitionDto.inSyncReplicasCount(partition.isr().size());
           partitionDto.replicasCount(partition.replicas().size());
           List<InternalReplica> replicas = partition.replicas().stream()
-              .map(r -> new InternalReplica(r.id(),
-                  partition.leader() != null && partition.leader().id() != r.id(),
-                  partition.isr().contains(r)))
+              .map(r ->
+                  InternalReplica.builder()
+                    .broker(r.id())
+                    .inSync(partition.isr().contains(r))
+                    .leader(partition.leader() != null && partition.leader().id() == r.id())
+                    .build())
               .collect(Collectors.toList());
           partitionDto.replicas(replicas);
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index eb67ee7643c..787bec28082 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -142,6 +142,7 @@ public Optional<SchemaDescription> getSchema(String topic, Target type) {
             new SchemaDescription(
                 convertSchema(schemaMetadata),
                 Map.of(
+                    "subject", subject,
                     "schemaId", schemaMetadata.getId(),
                     "latestVersion", schemaMetadata.getVersion(),
                     "type", schemaMetadata.getSchemaType() // AVRO / PROTOBUF / JSON
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
index 7e4e0145e55..c965930916f 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
@@ -23,6 +23,8 @@
 import org.apache.avro.io.EncoderFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 class SchemaRegistrySerdeTest {
 
@@ -36,21 +38,28 @@ void init() {
     serde.configure(List.of("wontbeused"), registryClient, "%s-key", "%s-value");
   }
 
-  @Test
-  void returnsSchemaDescriptionIfSchemaRegisteredInSR() throws RestClientException, IOException {
-    String topic = "test";
-    registryClient.register(topic + "-key", new AvroSchema("{ \"type\": \"int\" }"));
-    registryClient.register(topic + "-value", new AvroSchema("{ \"type\": \"float\" }"));
+  @ParameterizedTest
+  @CsvSource({
+      "test_topic, test_topic-key, KEY",
+      "test_topic, test_topic-value, VALUE"
+  })
+  @SneakyThrows
+  void returnsSchemaDescriptionIfSchemaRegisteredInSR(String topic, String subject, Serde.Target target) {
+    int schemaId = registryClient.register(subject, new AvroSchema("{ \"type\": \"int\" }"));
+    int registeredVersion = registryClient.getLatestSchemaMetadata(subject).getVersion();
 
-    var keySchemaOptional = serde.getSchema(topic, Serde.Target.KEY);
-    assertThat(keySchemaOptional)
-        .map(SchemaDescription::getSchema)
-        .contains("{\"$id\":\"int\",\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"type\":\"integer\"}");
+    var schemaOptional = serde.getSchema(topic, target);
+    assertThat(schemaOptional).isPresent();
 
-    var valueSchemaOptional = serde.getSchema(topic, Serde.Target.VALUE);
-    assertThat(valueSchemaOptional)
-        .map(SchemaDescription::getSchema)
-        .contains("{\"$id\":\"float\",\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"type\":\"number\"}");
+    SchemaDescription schemaDescription = schemaOptional.get();
+    assertThat(schemaDescription.getSchema())
+        .contains("{\"$id\":\"int\",\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"type\":\"integer\"}");
+    assertThat(schemaDescription.getAdditionalProperties())
+        .containsOnlyKeys("subject", "schemaId", "latestVersion", "type")
+        .containsEntry("subject", subject)
+        .containsEntry("schemaId", schemaId)
+        .containsEntry("latestVersion", registeredVersion)
+        .containsEntry("type", "AVRO");
   }
 
   @Test
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index e06c4537811..86e939562a2 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2035,6 +2035,10 @@ components:
           format: int64
         segmentCount:
           type: integer
+        bytesInPerSec:
+          type: number
+        bytesOutPerSec:
+          type: number
         underReplicatedPartitions:
           type: integer
         cleanUpPolicy:

From f8f3d872594f1636c32b7b5e02eada25c064d60e Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Tue, 4 Oct 2022 09:23:36 +0300
Subject: [PATCH 197/734] [e2e] Rename POM classes according to their type and
 naming on UI (#2698)

* Renamed classes for same name with UI

* Facade refactored

* Deleted SchemaCreateView.java

* accompanying changes

* deleted SchemaCreateView.java

* delete ConnectorDetails.java outdated

* add new ConnectorDetails class

* refactored of ConnectorCreateForm

* Added spaces between methods
---
 ...eateView.java => ConnectorCreateForm.java} | 14 ++--
 ...nectorsView.java => ConnectorDetails.java} | 18 ++---
 ...nectorsList.java => KafkaConnectList.java} | 18 ++---
 ...emaEditView.java => SchemaCreateForm.java} | 51 ++++++++------
 .../ui/pages/schema/SchemaCreateView.java     | 38 -----------
 .../{SchemaView.java => SchemaDetails.java}   |  9 +--
 .../ui/pages/schema/SchemaRegistryList.java   | 13 ++--
 .../ui/pages/topic/ProduceMessagePanel.java   |  4 +-
 ...ingsView.java => TopicCreateEditForm.java} | 66 ++++++++++++-------
 .../{TopicView.java => TopicDetails.java}     | 14 ++--
 .../kafka/ui/pages/topic/TopicsList.java      | 12 ++--
 .../com/provectus/kafka/ui/base/Facade.java   | 30 ++++-----
 .../kafka/ui/tests/ConnectorsTests.java       | 22 +++----
 .../kafka/ui/tests/SchemasTests.java          |  8 +--
 .../provectus/kafka/ui/tests/TopicTests.java  | 16 ++---
 15 files changed, 160 insertions(+), 173 deletions(-)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/{ConnectorCreateView.java => ConnectorCreateForm.java} (68%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/{ConnectorsView.java => ConnectorDetails.java} (84%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/{ConnectorsList.java => KafkaConnectList.java} (80%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/{SchemaEditView.java => SchemaCreateForm.java} (56%)
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/{SchemaView.java => SchemaDetails.java} (88%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/{TopicCreateEditSettingsView.java => TopicCreateEditForm.java} (78%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/{TopicView.java => TopicDetails.java} (91%)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
similarity index 68%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
index 88fbb957859..678786da69c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
@@ -10,16 +10,16 @@
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
-public class ConnectorCreateView {
+public class ConnectorCreateForm {
 
-    SelenideElement nameField = $(By.xpath("//input[@name='name']"));
-    SelenideElement contentTextArea = $(".ace_text-input");
-    SelenideElement submitButton = $(By.xpath("//button[@type='submit']"));
+    protected SelenideElement nameField = $(By.xpath("//input[@name='name']"));
+    protected SelenideElement contentTextArea = $(".ace_text-input");
+    protected SelenideElement submitButton = $(By.xpath("//button[@type='submit']"));
 
     private static final String path = "/ui/clusters/secondLocal/connectors/create_new";
 
     @Step("Set connector config JSON")
-    public ConnectorsView setConnectorConfig(String connectName, String configJson) {
+    public ConnectorDetails setConnectorConfig(String connectName, String configJson) {
         nameField.setValue(connectName);
         $("#config").click();
         contentTextArea.setValue("");
@@ -28,11 +28,11 @@ public ConnectorsView setConnectorConfig(String connectName, String configJson)
         clickByJavaScript(submitButton);
         sleep(4000);
         log.info("Connector config is submitted");
-        return new ConnectorsView();
+        return new ConnectorDetails();
     }
 
     @Step
-    public ConnectorCreateView waitUntilScreenReady() {
+    public ConnectorCreateForm waitUntilScreenReady() {
         nameField.shouldBe(Condition.visible);
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
similarity index 84%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
index 83a16590557..a63a1f47c16 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
@@ -11,7 +11,7 @@
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
-public class ConnectorsView {
+public class ConnectorDetails {
     protected SelenideElement dotMenuBtn = $(By.xpath("//button[@aria-label='Dropdown Toggle']"));
     protected SelenideElement deleteBtn = $(By.xpath("//li/div[text()='Delete']"));
     protected SelenideElement confirmBtnMdl = $(By.xpath("//div[@role='dialog']//button[text()='Confirm']"));
@@ -19,7 +19,7 @@ public class ConnectorsView {
     protected SelenideElement contentTextArea = $("[wrap]");
 
     @Step
-    public ConnectorsView waitUntilScreenReady() {
+    public ConnectorDetails waitUntilScreenReady() {
         $(By.xpath("//a[text() ='Tasks']")).shouldBe(Condition.visible);
         $(By.xpath("//a[text() ='Config']")).shouldBe(Condition.visible);
         $(By.xpath("//a[text() ='Overview']")).shouldBe(Condition.visible);
@@ -27,13 +27,13 @@ public ConnectorsView waitUntilScreenReady() {
     }
 
     @Step()
-    public ConnectorsView openConfigTab() {
+    public ConnectorDetails openConfigTab() {
         clickByJavaScript($(By.xpath("//a[text() ='Config']")));
         return this;
     }
 
     @Step()
-    public ConnectorsView setConfig(String configJson) {
+    public ConnectorDetails setConfig(String configJson) {
         $("#config").click();
         contentTextArea.sendKeys(Keys.LEFT_CONTROL + "a");
         contentTextArea.setValue("");
@@ -46,29 +46,29 @@ public ConnectorsView setConfig(String configJson) {
     }
 
     @Step()
-    public ConnectorsView openDotMenu() {
+    public ConnectorDetails openDotMenu() {
         clickByJavaScript(dotMenuBtn);
         return this;
     }
 
     @Step()
-    public ConnectorsView clickDeleteButton() {
+    public ConnectorDetails clickDeleteButton() {
         clickByJavaScript(deleteBtn);
         return this;
     }
 
     @Step()
-    public ConnectorsView clickConfirmButton() {
+    public ConnectorDetails clickConfirmButton() {
         confirmBtnMdl.shouldBe(Condition.enabled).click();
         confirmBtnMdl.shouldBe(Condition.disappear);
         return this;
     }
 
     @Step()
-    public ConnectorsView deleteConnector() {
+    public ConnectorDetails deleteConnector() {
         openDotMenu();
         clickDeleteButton();
         clickConfirmButton();
         return this;
     }
-}
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
similarity index 80%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
index 9c16163b950..70993072dfd 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
@@ -2,42 +2,42 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.utilities.WaitUtils;
 import com.provectus.kafka.ui.settings.Source;
+import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 @ExtensionMethod(WaitUtils.class)
-public class ConnectorsList {
+public class KafkaConnectList {
 
     private static final String path = "/ui/clusters/%s/connectors";
 
     @Step("Open URL to {cluster}")
-    public ConnectorsList goTo(String cluster) {
+    public KafkaConnectList goTo(String cluster) {
         Selenide.open(Source.BASE_WEB_URL + String.format(path, cluster));
         return this;
     }
 
     @Step
-    public ConnectorsList waitUntilScreenReady() {
+    public KafkaConnectList waitUntilScreenReady() {
         $(By.xpath("//h1[text()='Connectors']")).shouldBe(Condition.visible);
         return this;
     }
 
     @Step("Click on button 'Create Connector'")
-    public ConnectorCreateView clickCreateConnectorButton() {
+    public ConnectorCreateForm clickCreateConnectorButton() {
         clickByJavaScript($x("//button[text()='Create Connector']"));
-        return new ConnectorCreateView();
+        return new ConnectorCreateForm();
     }
 
     @Step
-    public ConnectorsList openConnector(String connectorName) {
+    public KafkaConnectList openConnector(String connectorName) {
         $(By.linkText(connectorName)).click();
         return this;
     }
@@ -49,7 +49,7 @@ public boolean isConnectorVisible(String connectorName) {
     }
 
     @Step
-    public ConnectorsList connectorIsUpdatedInList(String connectorName, String topicName) {
+    public KafkaConnectList connectorIsUpdatedInList(String connectorName, String topicName) {
         $(By.xpath(String.format("//a[text() = '%s']", connectorName))).shouldBe(Condition.visible);
         By.xpath(String.format("//a[text() = '%s']", topicName)).refreshUntil(Condition.visible);
         return this;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
similarity index 56%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
index 7cb793055b5..fec5db8b2e7 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaEditView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
@@ -1,6 +1,5 @@
 package com.provectus.kafka.ui.pages.schema;
 
-import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
@@ -13,31 +12,48 @@
 import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
-public class SchemaEditView {
+public class SchemaCreateForm {
 
+    protected SelenideElement subjectName = $(By.xpath("//input[@name='subject']"));
+    protected SelenideElement schemaField = $(By.xpath("//textarea[@name='schema']"));
+    protected SelenideElement submitSchemaButton = $(By.xpath("//button[@type='submit']"));
     protected SelenideElement newSchemaTextArea = $("#newSchema [wrap]");
     protected SelenideElement schemaTypeDropDown = $x("//ul[@name='schemaType']");
 
     @Step
-    public SchemaEditView selectSchemaTypeFromDropdown(SchemaType schemaType) {
-        $x("//ul[@name='schemaType']").click();
+    public SchemaCreateForm setSubjectName(String name) {
+        subjectName.setValue(name);
+        return this;
+    }
+
+    @Step
+    public SchemaCreateForm setSchemaField(String text) {
+        schemaField.setValue(text);
+        return this;
+    }
+
+    @Step
+    public SchemaCreateForm selectSchemaTypeFromDropdown(SchemaType schemaType) {
+        $("ul[role='listbox']").click();
         $x("//li[text()='" + schemaType.getValue() + "']").click();
         return this;
     }
+
     @Step
-    public SchemaEditView selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum level) {
+    public SchemaDetails clickSubmit() {
+        clickByJavaScript(submitSchemaButton);
+        return new SchemaDetails();
+    }
+
+    @Step
+    public SchemaCreateForm selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum level) {
         $x("//ul[@name='compatibilityLevel']").click();
         $x("//li[text()='" + level.getValue() + "']").click();
         return this;
     }
-    @Step
-    public SchemaView clickSubmit() {
-        clickByJavaScript($(By.xpath("//button[@type='submit']")));
-        return new SchemaView();
-    }
 
     @Step("Set new schema value")
-    public SchemaEditView setNewSchemaValue(String configJson) {
+    public SchemaCreateForm setNewSchemaValue(String configJson) {
         $("#newSchema").click();
         newSchemaTextArea.sendKeys(Keys.CONTROL + "a", Keys.BACK_SPACE);
         Selenide.executeJavaScript("arguments[0].value = '';", $("#newSchema"));
@@ -45,22 +61,15 @@ public SchemaEditView setNewSchemaValue(String configJson) {
         return this;
     }
 
-    @Step
-    public SchemaRegistryList removeSchema() {
-        $(By.xpath("//*[contains(text(),'Remove')]")).click();
-        $(By.xpath("//*[text()='Confirm']")).shouldBe(Condition.visible).click();
-        return new SchemaRegistryList();
-    }
-
     @Step
     public boolean isSchemaDropDownDisabled(){
         boolean disabled = false;
         try{
-           String attribute = schemaTypeDropDown.getAttribute("disabled");
-           disabled = true;
+            String attribute = schemaTypeDropDown.getAttribute("disabled");
+            disabled = true;
         }
         catch (Throwable ignored){
         }
-       return disabled;
+        return disabled;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
deleted file mode 100644
index b6fc2f8553b..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateView.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.provectus.kafka.ui.pages.schema;
-
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.api.model.SchemaType;
-import io.qameta.allure.Step;
-import org.openqa.selenium.By;
-
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-
-public class SchemaCreateView {
-
-    private final SelenideElement subjectName = $(By.xpath("//input[@name='subject']"));
-    private final SelenideElement schemaField = $(By.xpath("//textarea[@name='schema']"));
-    private final SelenideElement submitSchemaButton = $(By.xpath("//button[@type='submit']"));
-    @Step
-    public SchemaCreateView selectSchemaTypeFromDropdown(SchemaType schemaType) {
-        $("ul[role='listbox']").click();
-        $x("//li[text()='" + schemaType.getValue() + "']").click();
-        return this;
-    }
-    @Step
-    public SchemaView clickSubmit() {
-        clickByJavaScript(submitSchemaButton);
-        return new SchemaView();
-    }
-    @Step
-    public SchemaCreateView setSubjectName(String name) {
-        subjectName.setValue(name);
-        return this;
-    }
-    @Step
-    public SchemaCreateView setSchemaField(String text) {
-        schemaField.setValue(text);
-        return this;
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
similarity index 88%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
index 92d4a0937ee..27c3ec7dd1e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
@@ -8,12 +8,12 @@
 import static com.codeborne.selenide.Selenide.*;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
-public class SchemaView {
+public class SchemaDetails {
 
     protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
 
     @Step
-    public SchemaView waitUntilScreenReady() {
+    public SchemaDetails waitUntilScreenReady() {
         $("div#schema").shouldBe(Condition.visible);
         return this;
     }
@@ -24,10 +24,11 @@ public String getCompatibility() {
     }
 
     @Step
-    public SchemaEditView openEditSchema(){
+    public SchemaDetails openEditSchema(){
         $x("//button[text()= 'Edit Schema']").click();
-        return new SchemaEditView();
+        return this;
     }
+
     @Step
     public SchemaRegistryList removeSchema() {
         clickByJavaScript(dotMenuBtn);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index 713caf38914..eb378be3db6 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -5,24 +5,25 @@
 import io.qameta.allure.Step;
 import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 public class SchemaRegistryList {
 
     private final SelenideElement schemaButton = $(By.xpath("//*[contains(text(),'Create Schema')]"));
 
     @Step
-    public SchemaCreateView clickCreateSchema() {
+    public SchemaCreateForm clickCreateSchema() {
         clickByJavaScript(schemaButton);
-        return new SchemaCreateView();
+        return new SchemaCreateForm();
     }
 
     @Step
-    public SchemaView openSchema(String schemaName) {
+    public SchemaDetails openSchema(String schemaName) {
         $(By.xpath("//*[contains(text(),'" + schemaName + "')]")).click();
-        return new SchemaView();
+        return new SchemaDetails();
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
index 6abd045a068..d6ecebcd7a7 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
@@ -39,10 +39,10 @@ public ProduceMessagePanel setHeaderFiled(String value) {
     }
 
     @Step
-    public TopicView submitProduceMessage() {
+    public TopicDetails submitProduceMessage() {
         submitBtn.shouldBe(Condition.enabled).click();
         submitBtn.shouldBe(Condition.disappear);
         refresh();
-        return new TopicView().waitUntilScreenReady();
+        return new TopicDetails().waitUntilScreenReady();
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
similarity index 78%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
index 5a654a6a333..ef7e8f7c529 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditSettingsView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
@@ -11,48 +11,55 @@
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TopicCreateEditSettingsView {
+public class TopicCreateEditForm {
 
     private final SelenideElement timeToRetain = $(By.cssSelector("input#timeToRetain"));
     private final SelenideElement maxMessageBytes = $(By.name("maxMessageBytes"));
+
     @Step
-    public TopicCreateEditSettingsView setTopicName(String topicName) {
+    public TopicCreateEditForm setTopicName(String topicName) {
         $("input#topicFormName").setValue(topicName);
         return this;
     }
+
     @Step
-    public TopicCreateEditSettingsView setMinInsyncReplicas(Integer minInsyncReplicas) {
+    public TopicCreateEditForm setMinInsyncReplicas(Integer minInsyncReplicas) {
         $("input[name=minInSyncReplicas]").setValue(minInsyncReplicas.toString());
         return this;
     }
+
     @Step
-    public TopicCreateEditSettingsView setTimeToRetainDataInMs(Long ms) {
+    public TopicCreateEditForm setTimeToRetainDataInMs(Long ms) {
         timeToRetain.setValue(ms.toString());
         return this;
     }
+
     @Step
-    public TopicCreateEditSettingsView setTimeToRetainDataInMs(String ms) {
+    public TopicCreateEditForm setTimeToRetainDataInMs(String ms) {
         timeToRetain.setValue(ms);
         return this;
     }
 
     @Step
-    public TopicCreateEditSettingsView setMaxSizeOnDiskInGB(String value) {
+    public TopicCreateEditForm setMaxSizeOnDiskInGB(String value) {
         KafkaUISelectElement kafkaUISelectElement = new KafkaUISelectElement("retentionBytes");
         kafkaUISelectElement.selectByVisibleText(value);
         return this;
     }
+
     @Step
-    public TopicCreateEditSettingsView setMaxMessageBytes(Long bytes) {
+    public TopicCreateEditForm setMaxMessageBytes(Long bytes) {
         maxMessageBytes.setValue(bytes.toString());
         return this;
     }
+
     @Step
-    public TopicCreateEditSettingsView setMaxMessageBytes(String bytes) {
+    public TopicCreateEditForm setMaxMessageBytes(String bytes) {
         return setMaxMessageBytes(Long.parseLong(bytes));
     }
+
     @Step
-    public TopicCreateEditSettingsView setTimeToRetainDataInMsUsingButtons(String value) {
+    public TopicCreateEditForm setTimeToRetainDataInMsUsingButtons(String value) {
         timeToRetain
                 .parent()
                 .parent()
@@ -63,32 +70,37 @@ public TopicCreateEditSettingsView setTimeToRetainDataInMsUsingButtons(String va
     }
 
     @Step
-    public TopicCreateEditSettingsView selectCleanupPolicy(CleanupPolicyValue cleanupPolicyValue) {
+    public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyValue) {
         return selectFromDropDownByOptionValue("cleanupPolicy",
                 cleanupPolicyValue.getOptionValue());
     }
+
     @Step
-    public TopicCreateEditSettingsView selectCleanupPolicy(String cleanupPolicyOptionValue) {
+    public TopicCreateEditForm selectCleanupPolicy(String cleanupPolicyOptionValue) {
         $("ul#topicFormCleanupPolicy").click();
         $x("//li[text()='" + cleanupPolicyOptionValue + "']").click();
         return this;
     }
+
     @Step
-    public TopicCreateEditSettingsView selectRetentionBytes(String visibleValue) {
+    public TopicCreateEditForm selectRetentionBytes(String visibleValue) {
         return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
     }
+
     @Step
-    public TopicCreateEditSettingsView selectRetentionBytes(Long optionValue) {
+    public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
         return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
     }
+
     @Step
-    public TopicView sendData() {
+    public TopicDetails sendData() {
         clickByJavaScript($x("//button[@type='submit']"));
-        return new TopicView();
+        return new TopicDetails();
     }
+
     @Step
-    public TopicCreateEditSettingsView addCustomParameter(String customParameterName,
-                                                          String customParameterValue) {
+    public TopicCreateEditForm addCustomParameter(String customParameterName,
+                                                  String customParameterValue) {
         ElementsCollection customParametersElements =
                 $$("ul[role=listbox][name^=customParams][name$=name]");
         KafkaUISelectElement kafkaUISelectElement = null;
@@ -110,9 +122,10 @@ public TopicCreateEditSettingsView addCustomParameter(String customParameterName
                 .setValue(customParameterValue);
         return this;
     }
+
     @Step
-    public TopicCreateEditSettingsView updateCustomParameter(String customParameterName,
-                                                             String customParameterValue) {
+    public TopicCreateEditForm updateCustomParameter(String customParameterName,
+                                                     String customParameterValue) {
         SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
                 .find(Condition.exactText(customParameterName));
         String name = selenideElement.getAttribute("name");
@@ -122,8 +135,9 @@ public TopicCreateEditSettingsView updateCustomParameter(String customParameterN
         $(String.format("input[name^=%s]", name)).setValue(customParameterValue);
         return this;
     }
+
     @Step
-    public TopicCreateEditSettingsView cleanupPolicyIs(String value) {
+    public TopicCreateEditForm cleanupPolicyIs(String value) {
         String cleanupPolicy = new KafkaUISelectElement("cleanupPolicy")
                 .getCurrentValue();
         assertThat(cleanupPolicy)
@@ -131,14 +145,16 @@ public TopicCreateEditSettingsView cleanupPolicyIs(String value) {
                 .isEqualToIgnoringCase(value);
         return this;
     }
+
     @Step
-    public TopicCreateEditSettingsView timeToRetainIs(String time) {
+    public TopicCreateEditForm timeToRetainIs(String time) {
         String value = timeToRetain.getValue();
         assertThat(value)
                 .as("Time to retain data (in ms) should be " + time)
                 .isEqualTo(time);
         return this;
     }
+
     @Step
     public String getCleanupPolicy() {
         return new KafkaUISelectElement("cleanupPolicy").getCurrentValue();
@@ -215,15 +231,15 @@ public String getVisibleText() {
         }
     }
 
-    private TopicCreateEditSettingsView selectFromDropDownByOptionValue(String dropDownElementName,
-                                                                        String optionValue) {
+    private TopicCreateEditForm selectFromDropDownByOptionValue(String dropDownElementName,
+                                                                String optionValue) {
         KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
         select.selectByOptionValue(optionValue);
         return this;
     }
 
-    private TopicCreateEditSettingsView selectFromDropDownByVisibleText(String dropDownElementName,
-                                                                        String visibleText) {
+    private TopicCreateEditForm selectFromDropDownByVisibleText(String dropDownElementName,
+                                                                String visibleText) {
         KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
         select.selectByVisibleText(visibleText);
         return this;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
similarity index 91%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 6f401641ce3..e0400bea37b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -3,8 +3,8 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.utilities.WaitUtils;
 import com.provectus.kafka.ui.settings.Source;
+import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
@@ -13,32 +13,32 @@
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 @ExtensionMethod({WaitUtils.class})
-public class TopicView {
+public class TopicDetails {
 
     private static final String URL_PATH = "/ui/clusters/%s/topics/%s";
     protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
 
     @Step
-    public TopicView goTo(String cluster, String topic) {
+    public TopicDetails goTo(String cluster, String topic) {
         Selenide.open(Source.BASE_WEB_URL + String.format(URL_PATH, cluster, topic));
         return this;
     }
 
     @Step
-    public TopicView waitUntilScreenReady() {
+    public TopicDetails waitUntilScreenReady() {
         $(By.linkText("Overview")).shouldBe(Condition.visible);
         return this;
     }
 
     @Step
-    public TopicCreateEditSettingsView openEditSettings() {
+    public TopicCreateEditForm openEditSettings() {
         clickByJavaScript(dotMenuBtn);
         $x("//li[@role][text()='Edit settings']").click();
-        return new TopicCreateEditSettingsView();
+        return new TopicCreateEditForm();
     }
 
     @Step
-    public TopicView openTopicMenu(TopicMenu menu) {
+    public TopicDetails openTopicMenu(TopicMenu menu) {
         $(By.linkText(menu.getValue())).shouldBe(Condition.visible).click();
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 0fb99d444ed..3412e0d5da8 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -3,15 +3,15 @@
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.utilities.WaitUtils;
 import com.provectus.kafka.ui.settings.Source;
+import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 @ExtensionMethod(WaitUtils.class)
 public class TopicsList {
@@ -32,9 +32,9 @@ public TopicsList waitUntilScreenReady() {
     }
 
     @Step
-    public TopicCreateEditSettingsView pressCreateNewTopic() {
+    public TopicCreateEditForm pressCreateNewTopic() {
         clickByJavaScript($x("//button[normalize-space(text()) ='Add a Topic']"));
-        return new TopicCreateEditSettingsView();
+        return new TopicCreateEditForm();
     }
 
     @Step
@@ -44,9 +44,9 @@ public boolean isTopicVisible(String topicName) {
     }
 
     @Step
-    public TopicView openTopic(String topicName) {
+    public TopicDetails openTopic(String topicName) {
         $(By.linkText(topicName)).click();
-        return new TopicView();
+        return new TopicDetails();
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
index 8e9b1f149ab..46e17e0b961 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -2,30 +2,28 @@
 
 import com.provectus.kafka.ui.helpers.ApiHelper;
 import com.provectus.kafka.ui.pages.MainPage;
-import com.provectus.kafka.ui.pages.connector.ConnectorCreateView;
-import com.provectus.kafka.ui.pages.connector.ConnectorsList;
-import com.provectus.kafka.ui.pages.connector.ConnectorsView;
-import com.provectus.kafka.ui.pages.schema.SchemaCreateView;
-import com.provectus.kafka.ui.pages.schema.SchemaEditView;
+import com.provectus.kafka.ui.pages.connector.ConnectorCreateForm;
+import com.provectus.kafka.ui.pages.connector.ConnectorDetails;
+import com.provectus.kafka.ui.pages.connector.KafkaConnectList;
+import com.provectus.kafka.ui.pages.schema.SchemaCreateForm;
+import com.provectus.kafka.ui.pages.schema.SchemaDetails;
 import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
-import com.provectus.kafka.ui.pages.schema.SchemaView;
 import com.provectus.kafka.ui.pages.topic.ProduceMessagePanel;
-import com.provectus.kafka.ui.pages.topic.TopicCreateEditSettingsView;
-import com.provectus.kafka.ui.pages.topic.TopicView;
+import com.provectus.kafka.ui.pages.topic.TopicCreateEditForm;
+import com.provectus.kafka.ui.pages.topic.TopicDetails;
 import com.provectus.kafka.ui.pages.topic.TopicsList;
 
 public abstract class Facade {
     protected MainPage mainPage = new MainPage();
     protected ApiHelper apiHelper = new ApiHelper();
-    protected ConnectorCreateView connectorCreateView = new ConnectorCreateView();
-    protected ConnectorsList connectorsList = new ConnectorsList();
-    protected ConnectorsView connectorsView = new ConnectorsView();
-    protected SchemaCreateView schemaCreateView = new SchemaCreateView();
-    protected SchemaEditView schemaEditView = new SchemaEditView();
-    protected SchemaView schemaView = new SchemaView();
+    protected ConnectorCreateForm connectorCreateForm = new ConnectorCreateForm();
+    protected KafkaConnectList kafkaConnectList = new KafkaConnectList();
+    protected ConnectorDetails connectorDetails = new ConnectorDetails();
+    protected SchemaCreateForm schemaCreateForm = new SchemaCreateForm();
+    protected SchemaDetails schemaDetails = new SchemaDetails();
     protected SchemaRegistryList schemaRegistryList = new SchemaRegistryList();
     protected ProduceMessagePanel produceMessagePanel = new ProduceMessagePanel();
-    protected TopicCreateEditSettingsView topicCreateEditSettingsView = new TopicCreateEditSettingsView();
+    protected TopicCreateEditForm topicCreateEditForm = new TopicCreateEditForm();
     protected TopicsList topicsList = new TopicsList();
-    protected TopicView topicView = new TopicView();
+    protected TopicDetails topicDetails = new TopicDetails();
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 037db29edab..4cc0c783e4b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -60,14 +60,14 @@ public void createConnector() {
         Connector connectorForCreate = new Connector()
                 .setName("sink_postgres_activities_e2e_checks")
                 .setConfig(getResourceAsString("config_for_create_connector.json"));
-        connectorsList.goTo(CLUSTER_NAME)
+        kafkaConnectList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .clickCreateConnectorButton()
                 .waitUntilScreenReady()
                 .setConnectorConfig(connectorForCreate.getName(), connectorForCreate.getConfig());
-        connectorsList.goTo(CLUSTER_NAME)
+        kafkaConnectList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady();
-        Assertions.assertTrue(connectorsList.isConnectorVisible(connectorForCreate.getName()),"isConnectorVisible()");
+        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(connectorForCreate.getName()),"isConnectorVisible()");
         CONNECTOR_LIST.add(connectorForCreate);
     }
 
@@ -77,14 +77,14 @@ public void createConnector() {
     @CaseId(196)
     @Test
     public void updateConnector() {
-        connectorsList.goTo(CLUSTER_NAME)
+        kafkaConnectList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_UPDATE.getName());
-        connectorsView.waitUntilScreenReady()
+        connectorDetails.waitUntilScreenReady()
                 .openConfigTab()
                 .setConfig(CONNECTOR_FOR_UPDATE.getConfig());
-        connectorsList.goTo(CLUSTER_NAME);
-        Assertions.assertTrue(connectorsList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()),"isConnectorVisible()");
+        kafkaConnectList.goTo(CLUSTER_NAME);
+        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()),"isConnectorVisible()");
     }
 
     @DisplayName("should delete connector")
@@ -93,16 +93,16 @@ public void updateConnector() {
     @CaseId(195)
     @Test
     public void deleteConnector() {
-        connectorsList.goTo(CLUSTER_NAME)
+        kafkaConnectList.goTo(CLUSTER_NAME)
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_DELETE.getName());
-        connectorsView
+        connectorDetails
                 .waitUntilScreenReady()
                 .openDotMenu()
                 .clickDeleteButton()
                 .clickConfirmButton();
-        connectorsList.goTo(CLUSTER_NAME);
-        Assertions.assertFalse(connectorsList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
+        kafkaConnectList.goTo(CLUSTER_NAME);
+        Assertions.assertFalse(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
         CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index 563cc343cac..b8139024e7b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -4,7 +4,7 @@
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.pages.MainPage;
-import com.provectus.kafka.ui.pages.schema.SchemaView;
+import com.provectus.kafka.ui.pages.schema.SchemaDetails;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
@@ -69,12 +69,12 @@ void updateSchemaAvro() {
         schemaRegistryList.openSchema(AVRO_API.getName())
                 .waitUntilScreenReady()
                 .openEditSchema();
-        Assertions.assertTrue(schemaEditView.isSchemaDropDownDisabled(),"isSchemaDropDownDisabled()");
-        schemaEditView.selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
+        Assertions.assertTrue(schemaCreateForm.isSchemaDropDownDisabled(),"isSchemaDropDownDisabled()");
+        schemaCreateForm.selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
                 .clickSubmit()
                 .waitUntilScreenReady();
-        Assertions.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), new SchemaView().getCompatibility(), "getCompatibility()");
+        Assertions.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), new SchemaDetails().getCompatibility(), "getCompatibility()");
     }
 
     @DisplayName("should delete AVRO schema")
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index bc4f6d4b658..03628ecbfd3 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -3,7 +3,7 @@
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.MainPage;
-import com.provectus.kafka.ui.pages.topic.TopicView;
+import com.provectus.kafka.ui.pages.topic.TopicDetails;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
@@ -81,10 +81,10 @@ public void updateTopic() {
                 .waitUntilScreenReady()
                 .openEditSettings();
         SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(topicCreateEditSettingsView.getCleanupPolicy()).as("Cleanup Policy").isEqualTo(TOPIC_FOR_UPDATE.getCompactPolicyValue());
-        softly.assertThat(topicCreateEditSettingsView.getTimeToRetain()).as("Time to retain").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
-        softly.assertThat(topicCreateEditSettingsView.getMaxSizeOnDisk()).as("Max size on disk").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk());
-        softly.assertThat(topicCreateEditSettingsView.getMaxMessageBytes()).as("Max message bytes").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
+        softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("Cleanup Policy").isEqualTo(TOPIC_FOR_UPDATE.getCompactPolicyValue());
+        softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("Time to retain").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
+        softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("Max size on disk").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk());
+        softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("Max message bytes").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
         softly.assertAll();
     }
 
@@ -115,14 +115,14 @@ void produceMessage() {
                 .waitUntilScreenReady()
                 .openTopic(TOPIC_FOR_UPDATE.getName())
                 .waitUntilScreenReady()
-                .openTopicMenu(TopicView.TopicMenu.MESSAGES)
+                .openTopicMenu(TopicDetails.TopicMenu.MESSAGES)
                 .clickOnButton("Produce Message")
                 .setContentFiled(TOPIC_FOR_UPDATE.getMessageContent())
                 .setKeyField(TOPIC_FOR_UPDATE.getMessageKey())
                 .submitProduceMessage();
         SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(topicView.isKeyMessageVisible((TOPIC_FOR_UPDATE.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
-        softly.assertThat(topicView.isContentMessageVisible((TOPIC_FOR_UPDATE.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
+        softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_UPDATE.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
+        softly.assertThat(topicDetails.isContentMessageVisible((TOPIC_FOR_UPDATE.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
         softly.assertAll();
     }
 

From e3aeb0cac8d33d3dd9b9b7232e28fd7c613c0bef Mon Sep 17 00:00:00 2001
From: Aditya Bhattad <93488388+adityabhattad2021@users.noreply.github.com>
Date: Tue, 4 Oct 2022 17:53:11 +0530
Subject: [PATCH 198/734] Delete "Num Of Topics" column (#2690)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
index d1d6c4ece2c..0fc72fd82e8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
@@ -21,8 +21,7 @@ const TopicConsumerGroups: React.FC = () => {
       <thead>
         <tr>
           <TableHeaderCell title="Consumer Group ID" />
-          <TableHeaderCell title="Num Of Members" />
-          <TableHeaderCell title="Num Of Topics" />
+          <TableHeaderCell title="Active Consumers" />
           <TableHeaderCell title="Messages Behind" />
           <TableHeaderCell title="Coordinator" />
           <TableHeaderCell title="State" />
@@ -41,7 +40,6 @@ const TopicConsumerGroups: React.FC = () => {
               </Link>
             </TableKeyLink>
             <td>{consumer.members}</td>
-            <td>{consumer.topics}</td>
             <td>{consumer.messagesBehind}</td>
             <td>{consumer.coordinator?.id}</td>
             <td>

From 9632ffdbdbf119c2e6de41b6d992a2bd9bec3a20 Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Tue, 4 Oct 2022 20:25:55 +0800
Subject: [PATCH 199/734] Add "Messages behind" for Topics within Consumer
 group profile (#2614)

Co-authored-by: winniechiu <winniechiu@cht.com.tw>
---
 .../src/components/ConsumerGroups/Details/Details.tsx  |  1 +
 .../src/components/ConsumerGroups/Details/ListItem.tsx | 10 ++++++++++
 .../ConsumerGroups/Details/__tests__/Details.spec.tsx  |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index d45685d7638..a86252a3867 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -128,6 +128,7 @@ const Details: React.FC = () => {
           <tr>
             <TableHeaderCell> </TableHeaderCell>
             <TableHeaderCell title="Topic" />
+            <TableHeaderCell title="Messages behind" />
           </tr>
         </thead>
         <tbody>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx
index 7fab2e8b736..313ad234098 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx
@@ -18,6 +18,15 @@ interface Props {
 
 const ListItem: React.FC<Props> = ({ clusterName, name, consumers }) => {
   const [isOpen, setIsOpen] = React.useState(false);
+
+  const getTotalMessagesBehind = () => {
+    let count = 0;
+    consumers.forEach((consumer) => {
+      count += consumer?.messagesBehind || 0;
+    });
+    return count;
+  };
+
   return (
     <>
       <tr>
@@ -29,6 +38,7 @@ const ListItem: React.FC<Props> = ({ clusterName, name, consumers }) => {
         <TableKeyLink>
           <Link to={clusterTopicPath(clusterName, name)}>{name}</Link>
         </TableKeyLink>
+        <td>{getTotalMessagesBehind()}</td>
       </tr>
       {isOpen && <TopicContents consumers={consumers} />}
     </>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
index e16eae8669b..e086de8b636 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
@@ -65,7 +65,7 @@ describe('Details component', () => {
       expect(screen.getByText(groupId)).toBeInTheDocument();
 
       expect(screen.getByRole('table')).toBeInTheDocument();
-      expect(screen.getAllByRole('columnheader').length).toEqual(2);
+      expect(screen.getAllByRole('columnheader').length).toEqual(3);
 
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });

From c9613448242ff85c5f83361ec0c381ef39c37e58 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:31:07 +0400
Subject: [PATCH 200/734] Add "Total size" of Partition within Topic's
 statistics #2536 (#2662)

* add "Total size" of Partition within Topic's statistics #2536

* Used Bytes Formatted on total size of Partition within Topic's #2536

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../components/Topics/Topic/Statistics/PartitionInfoRow.tsx    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
index 546f3e619d6..698019f2c44 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
@@ -27,7 +27,6 @@ const PartitionInfoRow: React.FC<{ row: Row<TopicAnalysisStats> }> = ({
     keySize,
     valueSize,
   } = row.original;
-
   return (
     <S.PartitionInfo>
       <div>
@@ -35,6 +34,8 @@ const PartitionInfoRow: React.FC<{ row: Row<TopicAnalysisStats> }> = ({
         <List>
           <Label>Total message</Label>
           <span>{totalMsgs}</span>
+          <Label>Total size</Label>
+          <BytesFormatted value={(keySize?.sum || 0) + (valueSize?.sum || 0)} />
           <Label>Min. timestamp</Label>
           <span>{formatTimestamp(minTimestamp)}</span>
           <Label>Max. timestamp</Label>

From 6dff8f105ec55d04bf5018232dcb25c6b83d3e8b Mon Sep 17 00:00:00 2001
From: Marat Gumarov <ikey678@gmail.com>
Date: Fri, 7 Oct 2022 13:36:27 +0300
Subject: [PATCH 201/734] Support prometheus as a metrics interface (#2190)

* Unified internal metric representation (RawMetric)
* Prometheus retriever implemented
* Jmx metrics formatted to jmx-exporter openmentrics format

Co-authored-by: Mohamad Choukair <mchoukair@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: Daniel Ching <110129035+daching-provectus@users.noreply.github.com>
Co-authored-by: Daniel Ching <daching@provectus.com>
Co-authored-by: German Osin <germanosin@Germans-MacBook-Pro.local>
Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 README.md                                     |  16 +-
 documentation/compose/DOCKER_COMPOSE.md       |   1 +
 documentation/compose/auth-ldap.yaml          |   4 +-
 documentation/compose/e2e-tests.yaml          |   2 +-
 .../compose/jmx-exporter/kafka-broker.yml     |   2 +
 .../jmx-exporter/kafka-prepare-and-run        |  10 +
 .../compose/kafka-ui-auth-context.yaml        |   2 +-
 .../compose/kafka-ui-connectors-auth.yaml     |   2 +-
 .../compose/kafka-ui-jmx-secured.yml          |   8 +-
 .../compose/kafka-ui-with-jmx-exporter.yaml   |  45 ++++
 documentation/compose/kafka-ui.yaml           |   4 +-
 kafka-ui-api/pom.xml                          |  12 +
 .../kafka/ui/config/ClustersProperties.java   |  14 +-
 .../com/provectus/kafka/ui/config/Config.java |  21 --
 .../kafka/ui/mapper/ClusterMapper.java        |  24 +-
 ...xBrokerMetrics.java => BrokerMetrics.java} |   2 +-
 .../ui/model/InternalClusterMetrics.java      |   4 +-
 .../kafka/ui/model/InternalClusterState.java  |  33 +--
 .../kafka/ui/model/InternalTopic.java         |   9 +-
 .../kafka/ui/model/KafkaCluster.java          |   5 +-
 .../com/provectus/kafka/ui/model/Metrics.java |  38 +++
 .../kafka/ui/model/MetricsConfig.java         |  20 ++
 .../provectus/kafka/ui/model/Statistics.java  |  38 +++
 .../ui/service/AdminClientServiceImpl.java    |   1 -
 .../kafka/ui/service/BrokerService.java       |  13 +-
 .../kafka/ui/service/ClusterService.java      |  12 +-
 ....java => ClustersStatisticsScheduler.java} |   8 +-
 ...MetricsCache.java => StatisticsCache.java} |  47 +---
 ...icsService.java => StatisticsService.java} |  24 +-
 .../kafka/ui/service/TopicsService.java       |  47 ++--
 .../service/metrics/JmxMetricsFormatter.java  |  85 +++++++
 .../service/metrics/JmxMetricsRetriever.java  | 106 +++++++++
 .../ui/service/metrics/MetricsCollector.java  |  69 ++++++
 .../ui/service/metrics/MetricsRetriever.java  |   9 +
 .../PrometheusEndpointMetricsParser.java      |  46 ++++
 .../metrics/PrometheusMetricsRetriever.java   |  58 +++++
 .../kafka/ui/service/metrics/RawMetric.java   |  60 +++++
 .../ui/service/metrics/WellKnownMetrics.java  |  42 ++++
 .../provectus/kafka/ui/util/ClusterUtil.java  |   0
 .../kafka/ui/util/JmxClusterUtil.java         | 217 ------------------
 .../kafka/ui/util/JmxMetricsName.java         |  41 ----
 .../kafka/ui/util/JmxMetricsValueName.java    |  19 --
 .../provectus/kafka/ui/util/NumberUtil.java   |   4 -
 .../provectus/kafka/ui/util/OffsetsSeek.java  |   2 -
 .../src/main/resources/application-local.yml  |   8 +-
 .../kafka/ui/AbstractIntegrationTest.java     |   1 -
 .../kafka/ui/producer/KafkaTestProducer.java  |   1 -
 .../kafka/ui/service/SendAndReadTests.java    |   3 -
 .../service/TopicsServicePaginationTest.java  |  20 +-
 .../metrics/JmxMetricsFormatterTest.java      |  77 +++++++
 .../PrometheusEndpointMetricsParserTest.java  |  30 +++
 .../PrometheusMetricsRetrieverTest.java       |  64 ++++++
 .../service/metrics/WellKnownMetricsTest.java |  66 ++++++
 .../kafka/ui/util/NumberUtilTest.java         |  28 ---
 .../main/resources/swagger/kafka-ui-api.yaml  |   8 +-
 pom.xml                                       |   1 +
 56 files changed, 1034 insertions(+), 499 deletions(-)
 create mode 100644 documentation/compose/jmx-exporter/kafka-broker.yml
 create mode 100755 documentation/compose/jmx-exporter/kafka-prepare-and-run
 create mode 100644 documentation/compose/kafka-ui-with-jmx-exporter.yaml
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/{JmxBrokerMetrics.java => BrokerMetrics.java} (85%)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Metrics.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/MetricsConfig.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Statistics.java
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/{ClustersMetricsScheduler.java => ClustersStatisticsScheduler.java} (82%)
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/{MetricsCache.java => StatisticsCache.java} (54%)
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/{MetricsService.java => StatisticsService.java} (76%)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsFormatter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsCollector.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsRetriever.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointMetricsParser.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/RawMetric.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxClusterUtil.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxMetricsName.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxMetricsValueName.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/JmxMetricsFormatterTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointMetricsParserTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/WellKnownMetricsTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/NumberUtilTest.java

diff --git a/README.md b/README.md
index 4236f40116f..1440cb70869 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,9 @@ kafka:
         username: username
         password: password
 #     schemaNameTemplate: "%s-value"
-      jmxPort: 9997
+      metrics:
+        port: 9997
+        type: JMX
     -
 ```
 
@@ -102,7 +104,8 @@ kafka:
 * `schemaRegistryAuth.username`: schemaRegistry's basic authentication username
 * `schemaRegistryAuth.password`: schemaRegistry's basic authentication password
 * `schemaNameTemplate`: how keys are saved to schemaRegistry
-* `jmxPort`: open JMX port of a broker
+* `metrics.port`: open JMX port of a broker
+* `metrics.type`: Type of metrics, either JMX or PROMETHEUS. Defaulted to JMX.
 * `readOnly`: enable read only mode
 
 Configure as many clusters as you need by adding their configs below separated with `-`.
@@ -181,15 +184,16 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME`   	|SchemaRegistry's basic authentication username
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_PASSWORD`   	|SchemaRegistry's basic authentication password
 |`KAFKA_CLUSTERS_0_SCHEMANAMETEMPLATE` |How keys are saved to schemaRegistry
-|`KAFKA_CLUSTERS_0_JMXPORT`        	|Open JMX port of a broker
+|`KAFKA_CLUSTERS_0_METRICS_PORT`        	 |Open metrics port of a broker
+|`KAFKA_CLUSTERS_0_METRICS_TYPE`        	 |Type of metrics retriever to use. Valid values are JMX (default) or PROMETHEUS. If Prometheus, then metrics are read from prometheus-jmx-exporter instead of jmx
 |`KAFKA_CLUSTERS_0_READONLY`        	|Enable read-only mode. Default: false
 |`KAFKA_CLUSTERS_0_DISABLELOGDIRSCOLLECTION`        	|Disable collecting segments information. It should be true for confluent cloud. Default: false
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME` |Given name for the Kafka Connect cluster
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS` |Address of the Kafka Connect service endpoint
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_USERNAME`| Kafka Connect cluster's basic authentication username
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_PASSWORD`| Kafka Connect cluster's basic authentication password
-|`KAFKA_CLUSTERS_0_JMXSSL` |Enable SSL for JMX? `true` or `false`. For advanced setup, see `kafka-ui-jmx-secured.yml`
-|`KAFKA_CLUSTERS_0_JMXUSERNAME` |Username for JMX authentication
-|`KAFKA_CLUSTERS_0_JMXPASSWORD` |Password for JMX authentication
+|`KAFKA_CLUSTERS_0_METRICS_SSL`          |Enable SSL for Metrics? `true` or `false`. For advanced setup, see `kafka-ui-jmx-secured.yml`
+|`KAFKA_CLUSTERS_0_METRICS_USERNAME` |Username for Metrics authentication
+|`KAFKA_CLUSTERS_0_METRICS_PASSWORD` |Password for Metrics authentication
 |`TOPIC_RECREATE_DELAY_SECONDS` |Time delay between topic deletion and topic creation attempts for topic recreate functionality. Default: 1
 |`TOPIC_RECREATE_MAXRETRIES`  |Number of attempts of topic creation after topic deletion for topic recreate functionality. Default: 15
diff --git a/documentation/compose/DOCKER_COMPOSE.md b/documentation/compose/DOCKER_COMPOSE.md
index d019427d747..c380c99173b 100644
--- a/documentation/compose/DOCKER_COMPOSE.md
+++ b/documentation/compose/DOCKER_COMPOSE.md
@@ -12,3 +12,4 @@
 10. [kafka-ui-sasl.yaml](./kafka-ui-sasl.yaml) - SASL auth for Kafka.
 11. [kafka-ui-traefik-proxy.yaml](./kafka-ui-traefik-proxy.yaml) - Traefik specific proxy configuration.
 12. [oauth-cognito.yaml](./oauth-cognito.yaml) - OAuth2 with Cognito
+13. [kafka-ui-with-jmx-exporter.yaml](./kafka-ui-with-jmx-exporter.yaml) - A configuration with 2 kafka clusters with enabled prometheus jmx exporters instead of jmx.
diff --git a/documentation/compose/auth-ldap.yaml b/documentation/compose/auth-ldap.yaml
index 12069639f24..4d296927c92 100644
--- a/documentation/compose/auth-ldap.yaml
+++ b/documentation/compose/auth-ldap.yaml
@@ -15,14 +15,14 @@ services:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
       KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
-      KAFKA_CLUSTERS_0_JMXPORT: 9997
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       KAFKA_CLUSTERS_1_NAME: secondLocal
       KAFKA_CLUSTERS_1_BOOTSTRAPSERVERS: kafka1:29092
       KAFKA_CLUSTERS_1_ZOOKEEPER: zookeeper1:2181
-      KAFKA_CLUSTERS_1_JMXPORT: 9998
+      KAFKA_CLUSTERS_1_METRICS_PORT: 9998
       KAFKA_CLUSTERS_1_SCHEMAREGISTRY: http://schemaregistry1:8085
       KAFKA_CLUSTERS_1_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_1_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
diff --git a/documentation/compose/e2e-tests.yaml b/documentation/compose/e2e-tests.yaml
index bc0efffa909..e09ec517d2a 100644
--- a/documentation/compose/e2e-tests.yaml
+++ b/documentation/compose/e2e-tests.yaml
@@ -16,7 +16,7 @@ services:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
       KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
-      KAFKA_CLUSTERS_0_JMXPORT: 9997
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
diff --git a/documentation/compose/jmx-exporter/kafka-broker.yml b/documentation/compose/jmx-exporter/kafka-broker.yml
new file mode 100644
index 00000000000..cb19fee9f84
--- /dev/null
+++ b/documentation/compose/jmx-exporter/kafka-broker.yml
@@ -0,0 +1,2 @@
+rules:
+  - pattern: ".*"
\ No newline at end of file
diff --git a/documentation/compose/jmx-exporter/kafka-prepare-and-run b/documentation/compose/jmx-exporter/kafka-prepare-and-run
new file mode 100755
index 00000000000..2ccf17df505
--- /dev/null
+++ b/documentation/compose/jmx-exporter/kafka-prepare-and-run
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+JAVA_AGENT_FILE="/usr/share/jmx_exporter/jmx_prometheus_javaagent.jar"
+if [ ! -f "$JAVA_AGENT_FILE" ]
+then
+  echo "Downloading jmx_exporter javaagent"
+  curl -o $JAVA_AGENT_FILE https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar
+fi
+
+exec /etc/confluent/docker/run
\ No newline at end of file
diff --git a/documentation/compose/kafka-ui-auth-context.yaml b/documentation/compose/kafka-ui-auth-context.yaml
index a3c4bee36b8..fac1af0aa2a 100644
--- a/documentation/compose/kafka-ui-auth-context.yaml
+++ b/documentation/compose/kafka-ui-auth-context.yaml
@@ -14,7 +14,7 @@ services:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
       KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
-      KAFKA_CLUSTERS_0_JMXPORT: 9997
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       SERVER_SERVLET_CONTEXT_PATH: /kafkaui
       AUTH_TYPE: "LOGIN_FORM"
       SPRING_SECURITY_USER_NAME: admin
diff --git a/documentation/compose/kafka-ui-connectors-auth.yaml b/documentation/compose/kafka-ui-connectors-auth.yaml
index a3034351421..f6a61998029 100644
--- a/documentation/compose/kafka-ui-connectors-auth.yaml
+++ b/documentation/compose/kafka-ui-connectors-auth.yaml
@@ -18,7 +18,7 @@ services:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
       KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
-      KAFKA_CLUSTERS_0_JMXPORT: 9997
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
diff --git a/documentation/compose/kafka-ui-jmx-secured.yml b/documentation/compose/kafka-ui-jmx-secured.yml
index 133a19986d5..71f61b1e554 100644
--- a/documentation/compose/kafka-ui-jmx-secured.yml
+++ b/documentation/compose/kafka-ui-jmx-secured.yml
@@ -20,10 +20,10 @@ services:
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
-      KAFKA_CLUSTERS_0_JMXPORT: 9997
-      KAFKA_CLUSTERS_0_JMXSSL: 'true'
-      KAFKA_CLUSTERS_0_JMXUSERNAME: root
-      KAFKA_CLUSTERS_0_JMXPASSWORD: password
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9997
+      KAFKA_CLUSTERS_0_METRICS_SSL: 'true'
+      KAFKA_CLUSTERS_0_METRICS_USERNAME: root
+      KAFKA_CLUSTERS_0_METRICS_PASSWORD: password
       JAVA_OPTS: >-
         -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
         -Djavax.net.ssl.trustStore=/jmx/clienttruststore
diff --git a/documentation/compose/kafka-ui-with-jmx-exporter.yaml b/documentation/compose/kafka-ui-with-jmx-exporter.yaml
new file mode 100644
index 00000000000..e6d21584a75
--- /dev/null
+++ b/documentation/compose/kafka-ui-with-jmx-exporter.yaml
@@ -0,0 +1,45 @@
+---
+version: '2'
+services:
+
+  zookeeper0:
+    image: confluentinc/cp-zookeeper:5.2.4
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_TICK_TIME: 2000
+    ports:
+      - 2181:2181
+
+  kafka0:
+    image: confluentinc/cp-kafka:5.3.1
+    # downloading jmx_exporter javaagent and starting kafka
+    command: "/usr/share/jmx_exporter/kafka-prepare-and-run"
+    depends_on:
+      - zookeeper0
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_OPTS: -javaagent:/usr/share/jmx_exporter/jmx_prometheus_javaagent.jar=11001:/usr/share/jmx_exporter/kafka-broker.yml
+    ports:
+      - 9092:9092
+      - 11001:11001
+    volumes:
+      - ./jmx-exporter:/usr/share/jmx_exporter/
+
+  kafka-ui:
+    container_name: kafka-ui
+    image: provectuslabs/kafka-ui:latest
+    ports:
+      - 8080:8080
+    depends_on:
+      - zookeeper0
+      - kafka0
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
+      KAFKA_CLUSTERS_0_METRICS_PORT: 11001
+      KAFKA_CLUSTERS_0_METRICS_TYPE: PROMETHEUS
diff --git a/documentation/compose/kafka-ui.yaml b/documentation/compose/kafka-ui.yaml
index 8afe6b6d2f1..ff808ae1abc 100644
--- a/documentation/compose/kafka-ui.yaml
+++ b/documentation/compose/kafka-ui.yaml
@@ -18,14 +18,14 @@ services:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
       KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
-      KAFKA_CLUSTERS_0_JMXPORT: 9997
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       KAFKA_CLUSTERS_1_NAME: secondLocal
       KAFKA_CLUSTERS_1_BOOTSTRAPSERVERS: kafka1:29092
       KAFKA_CLUSTERS_1_ZOOKEEPER: zookeeper1:2181
-      KAFKA_CLUSTERS_1_JMXPORT: 9998
+      KAFKA_CLUSTERS_1_METRICS_PORT: 9998
       KAFKA_CLUSTERS_1_SCHEMAREGISTRY: http://schemaregistry1:8085
       KAFKA_CLUSTERS_1_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_1_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 9a27d29b16e..ab5fa62bd18 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -185,6 +185,18 @@
             <version>2.2.14</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>${okhttp3.mockwebserver.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp3.mockwebserver.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 0c7b8fb3d48..5b598003548 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -30,10 +30,7 @@ public static class Cluster {
     String ksqldbServer;
     KsqldbServerAuth ksqldbServerAuth;
     List<ConnectCluster> kafkaConnect;
-    int jmxPort;
-    boolean jmxSsl;
-    String jmxUsername;
-    String jmxPassword;
+    MetricsConfigData metrics;
     Properties properties;
     boolean readOnly = false;
     boolean disableLogDirsCollection = false;
@@ -42,6 +39,15 @@ public static class Cluster {
     String defaultValueSerde;
   }
 
+  @Data
+  public static class MetricsConfigData {
+    String type;
+    Integer port;
+    boolean ssl;
+    String username;
+    String password;
+  }
+
   @Data
   public static class ConnectCluster {
     String name;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/Config.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/Config.java
index 92174d2a478..37495b50291 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/Config.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/Config.java
@@ -1,14 +1,8 @@
 package com.provectus.kafka.ui.config;
 
-import com.provectus.kafka.ui.model.JmxConnectionInfo;
-import com.provectus.kafka.ui.util.JmxPoolFactory;
 import java.util.Collections;
 import java.util.Map;
-import javax.management.remote.JMXConnector;
 import lombok.AllArgsConstructor;
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
 import org.openapitools.jackson.nullable.JsonNullableModule;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Value;
@@ -49,21 +43,6 @@ public HttpHandler httpHandler(ObjectProvider<WebFluxProperties> propsProvider)
     return httpHandler;
   }
 
-
-  @Bean
-  public KeyedObjectPool<JmxConnectionInfo, JMXConnector> pool() {
-    var pool = new GenericKeyedObjectPool<>(new JmxPoolFactory());
-    pool.setConfig(poolConfig());
-    return pool;
-  }
-
-  private GenericKeyedObjectPoolConfig poolConfig() {
-    final var poolConfig = new GenericKeyedObjectPoolConfig();
-    poolConfig.setMaxIdlePerKey(3);
-    poolConfig.setMaxTotalPerKey(3);
-    return poolConfig;
-  }
-
   @Bean
   public MBeanExporter exporter() {
     final var exporter = new MBeanExporter();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index ac0fc4ea87c..bf7cb336360 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -23,9 +23,10 @@
 import com.provectus.kafka.ui.model.InternalSchemaRegistry;
 import com.provectus.kafka.ui.model.InternalTopic;
 import com.provectus.kafka.ui.model.InternalTopicConfig;
-import com.provectus.kafka.ui.model.JmxBrokerMetrics;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.KafkaConnectCluster;
+import com.provectus.kafka.ui.model.MetricDTO;
+import com.provectus.kafka.ui.model.Metrics;
 import com.provectus.kafka.ui.model.PartitionDTO;
 import com.provectus.kafka.ui.model.ReplicaDTO;
 import com.provectus.kafka.ui.model.TopicConfigDTO;
@@ -33,7 +34,8 @@
 import com.provectus.kafka.ui.model.TopicDetailsDTO;
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityCheck;
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel;
-import com.provectus.kafka.ui.util.JmxClusterUtil;
+import com.provectus.kafka.ui.service.metrics.RawMetric;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -53,15 +55,27 @@ public interface ClusterMapper {
   @Mapping(target = "properties", source = "properties", qualifiedByName = "setProperties")
   @Mapping(target = "schemaRegistry", source = ".", qualifiedByName = "setSchemaRegistry")
   @Mapping(target = "ksqldbServer", source = ".", qualifiedByName = "setKsqldbServer")
+  @Mapping(target = "metricsConfig", source = "metrics")
   KafkaCluster toKafkaCluster(ClustersProperties.Cluster clusterProperties);
 
   ClusterStatsDTO toClusterStats(InternalClusterState clusterState);
 
-  default ClusterMetricsDTO toClusterMetrics(JmxClusterUtil.JmxMetrics jmxMetrics) {
-    return new ClusterMetricsDTO().items(jmxMetrics.getMetrics());
+  default ClusterMetricsDTO toClusterMetrics(Metrics metrics) {
+    return new ClusterMetricsDTO()
+        .items(metrics.getSummarizedMetrics().map(this::convert).collect(Collectors.toList()));
   }
 
-  BrokerMetricsDTO toBrokerMetrics(JmxBrokerMetrics metrics);
+  private MetricDTO convert(RawMetric rawMetric) {
+    return new MetricDTO()
+        .name(rawMetric.name())
+        .labels(rawMetric.labels())
+        .value(rawMetric.value());
+  }
+
+  default BrokerMetricsDTO toBrokerMetrics(List<RawMetric> metrics) {
+    return new BrokerMetricsDTO()
+        .metrics(metrics.stream().map(this::convert).collect(Collectors.toList()));
+  }
 
   @Mapping(target = "isSensitive", source = "sensitive")
   @Mapping(target = "isReadOnly", source = "readOnly")
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/JmxBrokerMetrics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/BrokerMetrics.java
similarity index 85%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/JmxBrokerMetrics.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/BrokerMetrics.java
index e57cbbad308..2ffc8de1850 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/JmxBrokerMetrics.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/BrokerMetrics.java
@@ -6,6 +6,6 @@
 
 @Data
 @Builder(toBuilder = true)
-public class JmxBrokerMetrics {
+public class BrokerMetrics {
   private final List<MetricDTO> metrics;
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterMetrics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterMetrics.java
index b9706ef6c84..17aa8e51312 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterMetrics.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterMetrics.java
@@ -46,10 +46,10 @@ public static InternalClusterMetrics empty() {
   @Nullable // will be null if log dir collection disabled
   private final Map<Integer, InternalBrokerDiskUsage> internalBrokerDiskUsage;
 
-  // metrics from jmx
+  // metrics from metrics collector
   private final BigDecimal bytesInPerSec;
   private final BigDecimal bytesOutPerSec;
-  private final Map<Integer, JmxBrokerMetrics> internalBrokerMetrics;
+  private final Map<Integer, BrokerMetrics> internalBrokerMetrics;
   private final List<MetricDTO> metrics;
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java
index 410cb6319bc..bdd7a32d040 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.model;
 
 import com.google.common.base.Throwables;
-import com.provectus.kafka.ui.service.MetricsCache;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
@@ -28,21 +27,21 @@ public class InternalClusterState {
   private BigDecimal bytesOutPerSec;
   private Boolean readOnly;
 
-  public InternalClusterState(KafkaCluster cluster, MetricsCache.Metrics metrics) {
+  public InternalClusterState(KafkaCluster cluster, Statistics statistics) {
     name = cluster.getName();
-    status = metrics.getStatus();
-    lastError = Optional.ofNullable(metrics.getLastKafkaException())
+    status = statistics.getStatus();
+    lastError = Optional.ofNullable(statistics.getLastKafkaException())
         .map(e -> new MetricsCollectionErrorDTO()
             .message(e.getMessage())
             .stackTrace(Throwables.getStackTraceAsString(e)))
         .orElse(null);
-    topicCount = metrics.getTopicDescriptions().size();
-    brokerCount = metrics.getClusterDescription().getNodes().size();
-    activeControllers = metrics.getClusterDescription().getController() != null ? 1 : 0;
-    version = metrics.getVersion();
+    topicCount = statistics.getTopicDescriptions().size();
+    brokerCount = statistics.getClusterDescription().getNodes().size();
+    activeControllers = statistics.getClusterDescription().getController() != null ? 1 : 0;
+    version = statistics.getVersion();
 
-    if (metrics.getLogDirInfo() != null) {
-      diskUsage = metrics.getLogDirInfo().getBrokerStats().entrySet().stream()
+    if (statistics.getLogDirInfo() != null) {
+      diskUsage = statistics.getLogDirInfo().getBrokerStats().entrySet().stream()
           .map(e -> new BrokerDiskUsageDTO()
               .brokerId(e.getKey())
               .segmentSize(e.getValue().getSegmentSize())
@@ -50,15 +49,21 @@ public InternalClusterState(KafkaCluster cluster, MetricsCache.Metrics metrics)
           .collect(Collectors.toList());
     }
 
-    features = metrics.getFeatures();
+    features = statistics.getFeatures();
 
-    bytesInPerSec = metrics.getJmxMetrics().getBytesInPerSec().values().stream()
+    bytesInPerSec = statistics
+        .getMetrics()
+        .getBytesInPerSec()
+        .values().stream()
         .reduce(BigDecimal.ZERO, BigDecimal::add);
 
-    bytesOutPerSec = metrics.getJmxMetrics().getBytesOutPerSec().values().stream()
+    bytesOutPerSec = statistics
+        .getMetrics()
+        .getBytesOutPerSec()
+        .values().stream()
         .reduce(BigDecimal.ZERO, BigDecimal::add);
 
-    var partitionsStats = new PartitionsStats(metrics.getTopicDescriptions().values());
+    var partitionsStats = new PartitionsStats(statistics.getTopicDescriptions().values());
     onlinePartitionCount = partitionsStats.getOnlinePartitionCount();
     offlinePartitionCount = partitionsStats.getOfflinePartitionCount();
     inSyncReplicasCount = partitionsStats.getInSyncReplicasCount();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
index 206e3a83fbc..b669d0db414 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
@@ -1,6 +1,5 @@
 package com.provectus.kafka.ui.model;
 
-import com.provectus.kafka.ui.util.JmxClusterUtil;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -29,7 +28,7 @@ public class InternalTopic {
   private final List<InternalTopicConfig> topicConfigs;
   private final CleanupPolicy cleanUpPolicy;
 
-  // rates from jmx
+  // rates from metrics
   private final BigDecimal bytesInPerSec;
   private final BigDecimal bytesOutPerSec;
 
@@ -40,7 +39,7 @@ public class InternalTopic {
   public static InternalTopic from(TopicDescription topicDescription,
                                    List<ConfigEntry> configs,
                                    InternalPartitionsOffsets partitionsOffsets,
-                                   JmxClusterUtil.JmxMetrics jmxMetrics,
+                                   Metrics metrics,
                                    InternalLogDirStats logDirInfo) {
     var topic = InternalTopic.builder();
     topic.internal(
@@ -105,8 +104,8 @@ public static InternalTopic from(TopicDescription topicDescription,
       topic.segmentSize(segmentStats.getSegmentSize());
     }
 
-    topic.bytesInPerSec(jmxMetrics.getBytesInPerSec().get(topicDescription.name()));
-    topic.bytesOutPerSec(jmxMetrics.getBytesOutPerSec().get(topicDescription.name()));
+    topic.bytesInPerSec(metrics.getBytesInPerSec().get(topicDescription.name()));
+    topic.bytesOutPerSec(metrics.getBytesOutPerSec().get(topicDescription.name()));
 
     topic.topicConfigs(
         configs.stream().map(InternalTopicConfig::from).collect(Collectors.toList()));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
index c69a3d3c0d7..f90faa391d5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
@@ -13,10 +13,6 @@
 public class KafkaCluster {
   private final String name;
   private final String version;
-  private final Integer jmxPort;
-  private final boolean jmxSsl;
-  private final String jmxUsername;
-  private final String jmxPassword;
   private final String bootstrapServers;
   private final InternalSchemaRegistry schemaRegistry;
   private final InternalKsqlServer ksqldbServer;
@@ -24,4 +20,5 @@ public class KafkaCluster {
   private final Properties properties;
   private final boolean readOnly;
   private final boolean disableLogDirsCollection;
+  private final MetricsConfig metricsConfig;
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Metrics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Metrics.java
new file mode 100644
index 00000000000..f9f6943808b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Metrics.java
@@ -0,0 +1,38 @@
+package com.provectus.kafka.ui.model;
+
+import static java.util.stream.Collectors.toMap;
+
+import com.provectus.kafka.ui.service.metrics.RawMetric;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+import lombok.Builder;
+import lombok.Value;
+
+
+@Builder
+@Value
+public class Metrics {
+  Map<String, BigDecimal> bytesInPerSec;
+  Map<String, BigDecimal> bytesOutPerSec;
+  Map<Integer, List<RawMetric>> perBrokerMetrics;
+
+  public static Metrics empty() {
+    return Metrics.builder()
+        .bytesInPerSec(Map.of())
+        .bytesOutPerSec(Map.of())
+        .perBrokerMetrics(Map.of())
+        .build();
+  }
+
+  public Stream<RawMetric> getSummarizedMetrics() {
+    return perBrokerMetrics.values().stream()
+        .flatMap(Collection::stream)
+        .collect(toMap(RawMetric::identityKey, m -> m, (m1, m2) -> m1.copyWithValue(m1.value().add(m2.value()))))
+        .values()
+        .stream();
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/MetricsConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/MetricsConfig.java
new file mode 100644
index 00000000000..25540080800
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/MetricsConfig.java
@@ -0,0 +1,20 @@
+package com.provectus.kafka.ui.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class MetricsConfig {
+  public static final String JMX_METRICS_TYPE = "JMX";
+  public static final String PROMETHEUS_METRICS_TYPE = "PROMETHEUS";
+
+  private final String type;
+  private final Integer port;
+  private final boolean ssl;
+  private final String username;
+  private final String password;
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Statistics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Statistics.java
new file mode 100644
index 00000000000..cb74c5d5ab1
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Statistics.java
@@ -0,0 +1,38 @@
+package com.provectus.kafka.ui.model;
+
+import com.provectus.kafka.ui.service.ReactiveAdminClient;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import lombok.Builder;
+import lombok.Value;
+import org.apache.kafka.clients.admin.ConfigEntry;
+import org.apache.kafka.clients.admin.TopicDescription;
+
+@Value
+@Builder(toBuilder = true)
+public class Statistics {
+  ServerStatusDTO status;
+  Throwable lastKafkaException;
+  String version;
+  List<Feature> features;
+  ReactiveAdminClient.ClusterDescription clusterDescription;
+  Metrics metrics;
+  InternalLogDirStats logDirInfo;
+  Map<String, TopicDescription> topicDescriptions;
+  Map<String, List<ConfigEntry>> topicConfigs;
+
+  public static Statistics empty() {
+    return builder()
+        .status(ServerStatusDTO.OFFLINE)
+        .version("Unknown")
+        .features(List.of())
+        .clusterDescription(
+            new ReactiveAdminClient.ClusterDescription(null, null, List.of(), Set.of()))
+        .metrics(Metrics.empty())
+        .logDirInfo(InternalLogDirStats.empty())
+        .topicDescriptions(Map.of())
+        .topicConfigs(Map.of())
+        .build();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
index d8c96f8cbcc..7b93b1420e0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
@@ -12,7 +12,6 @@
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 
 @Service
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
index 28125874bb6..cd6ad93ba07 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
@@ -9,8 +9,8 @@
 import com.provectus.kafka.ui.model.BrokerLogdirUpdateDTO;
 import com.provectus.kafka.ui.model.BrokersLogdirsDTO;
 import com.provectus.kafka.ui.model.InternalBrokerConfig;
-import com.provectus.kafka.ui.model.JmxBrokerMetrics;
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.service.metrics.RawMetric;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -35,7 +35,7 @@
 @Slf4j
 public class BrokerService {
 
-  private final MetricsCache metricsCache;
+  private final StatisticsCache statisticsCache;
   private final AdminClientService adminClientService;
   private final DescribeLogDirsMapper describeLogDirsMapper;
 
@@ -54,7 +54,7 @@ private Mono<List<ConfigEntry>> loadBrokersConfig(
   }
 
   private Flux<InternalBrokerConfig> getBrokersConfig(KafkaCluster cluster, Integer brokerId) {
-    if (metricsCache.get(cluster).getClusterDescription().getNodes()
+    if (statisticsCache.get(cluster).getClusterDescription().getNodes()
         .stream().noneMatch(node -> node.id() == brokerId)) {
       return Flux.error(
           new NotFoundException(String.format("Broker with id %s not found", brokerId)));
@@ -125,7 +125,7 @@ private Mono<Map<Integer, Map<String, DescribeLogDirsResponse.LogDirInfo>>> getC
       KafkaCluster cluster, List<Integer> reqBrokers) {
     return adminClientService.get(cluster)
         .flatMap(admin -> {
-          List<Integer> brokers = metricsCache.get(cluster).getClusterDescription().getNodes()
+          List<Integer> brokers = statisticsCache.get(cluster).getClusterDescription().getNodes()
               .stream()
               .map(Node::id)
               .collect(Collectors.toList());
@@ -150,9 +150,8 @@ public Flux<InternalBrokerConfig> getBrokerConfig(KafkaCluster cluster, Integer
     return getBrokersConfig(cluster, brokerId);
   }
 
-  public Mono<JmxBrokerMetrics> getBrokerMetrics(KafkaCluster cluster, Integer brokerId) {
-    return Mono.justOrEmpty(
-            metricsCache.get(cluster).getJmxMetrics().getInternalBrokerMetrics().get(brokerId));
+  public Mono<List<RawMetric>> getBrokerMetrics(KafkaCluster cluster, Integer brokerId) {
+    return Mono.justOrEmpty(statisticsCache.get(cluster).getMetrics().getPerBrokerMetrics().get(brokerId));
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java
index d38af2a18ce..42c75f3d4e7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java
@@ -18,33 +18,33 @@
 @Slf4j
 public class ClusterService {
 
-  private final MetricsCache metricsCache;
+  private final StatisticsCache statisticsCache;
   private final ClustersStorage clustersStorage;
   private final ClusterMapper clusterMapper;
-  private final MetricsService metricsService;
+  private final StatisticsService statisticsService;
 
   public List<ClusterDTO> getClusters() {
     return clustersStorage.getKafkaClusters()
         .stream()
-        .map(c -> clusterMapper.toCluster(new InternalClusterState(c, metricsCache.get(c))))
+        .map(c -> clusterMapper.toCluster(new InternalClusterState(c, statisticsCache.get(c))))
         .collect(Collectors.toList());
   }
 
   public Mono<ClusterStatsDTO> getClusterStats(KafkaCluster cluster) {
     return Mono.justOrEmpty(
         clusterMapper.toClusterStats(
-            new InternalClusterState(cluster, metricsCache.get(cluster)))
+            new InternalClusterState(cluster, statisticsCache.get(cluster)))
     );
   }
 
   public Mono<ClusterMetricsDTO> getClusterMetrics(KafkaCluster cluster) {
     return Mono.just(
         clusterMapper.toClusterMetrics(
-            metricsCache.get(cluster).getJmxMetrics()));
+            statisticsCache.get(cluster).getMetrics()));
   }
 
   public Mono<ClusterDTO> updateCluster(KafkaCluster cluster) {
-    return metricsService.updateCache(cluster)
+    return statisticsService.updateCache(cluster)
         .map(metrics -> clusterMapper.toCluster(new InternalClusterState(cluster, metrics)));
   }
 }
\ No newline at end of file
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersMetricsScheduler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStatisticsScheduler.java
similarity index 82%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersMetricsScheduler.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStatisticsScheduler.java
index 53fff7060b1..f7ac1239a04 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersMetricsScheduler.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStatisticsScheduler.java
@@ -10,20 +10,20 @@
 @Component
 @RequiredArgsConstructor
 @Slf4j
-public class ClustersMetricsScheduler {
+public class ClustersStatisticsScheduler {
 
   private final ClustersStorage clustersStorage;
 
-  private final MetricsService metricsService;
+  private final StatisticsService statisticsService;
 
   @Scheduled(fixedRateString = "${kafka.update-metrics-rate-millis:30000}")
-  public void updateMetrics() {
+  public void updateStatistics() {
     Flux.fromIterable(clustersStorage.getKafkaClusters())
         .parallel()
         .runOn(Schedulers.parallel())
         .flatMap(cluster -> {
           log.debug("Start getting metrics for kafkaCluster: {}", cluster.getName());
-          return metricsService.updateCache(cluster)
+          return statisticsService.updateCache(cluster)
               .doOnSuccess(m -> log.debug("Metrics updated for cluster: {}", cluster.getName()));
         })
         .then()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsCache.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsCache.java
similarity index 54%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsCache.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsCache.java
index c568ef9df0f..3acd64262b0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsCache.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsCache.java
@@ -1,61 +1,28 @@
 package com.provectus.kafka.ui.service;
 
-import com.provectus.kafka.ui.model.Feature;
-import com.provectus.kafka.ui.model.InternalLogDirStats;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.ServerStatusDTO;
-import com.provectus.kafka.ui.util.JmxClusterUtil;
+import com.provectus.kafka.ui.model.Statistics;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import lombok.Builder;
-import lombok.Value;
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.apache.kafka.clients.admin.TopicDescription;
 import org.springframework.stereotype.Component;
 
 @Component
-public class MetricsCache {
+public class StatisticsCache {
 
-  @Value
-  @Builder(toBuilder = true)
-  public static class Metrics {
-    ServerStatusDTO status;
-    Throwable lastKafkaException;
-    String version;
-    List<Feature> features;
-    ReactiveAdminClient.ClusterDescription clusterDescription;
-    JmxClusterUtil.JmxMetrics jmxMetrics;
-    InternalLogDirStats logDirInfo;
-    Map<String, TopicDescription> topicDescriptions;
-    Map<String, List<ConfigEntry>> topicConfigs;
+  private final Map<String, Statistics> cache = new ConcurrentHashMap<>();
 
-    public static Metrics empty() {
-      return builder()
-          .status(ServerStatusDTO.OFFLINE)
-          .version("Unknown")
-          .features(List.of())
-          .clusterDescription(
-              new ReactiveAdminClient.ClusterDescription(null, null, List.of(), Set.of()))
-          .jmxMetrics(JmxClusterUtil.JmxMetrics.empty())
-          .logDirInfo(InternalLogDirStats.empty())
-          .topicDescriptions(Map.of())
-          .topicConfigs(Map.of())
-          .build();
-    }
-  }
-
-  private final Map<String, Metrics> cache = new ConcurrentHashMap<>();
-
-  public MetricsCache(ClustersStorage clustersStorage) {
-    var initializing = Metrics.empty().toBuilder().status(ServerStatusDTO.INITIALIZING).build();
+  public StatisticsCache(ClustersStorage clustersStorage) {
+    var initializing = Statistics.empty().toBuilder().status(ServerStatusDTO.INITIALIZING).build();
     clustersStorage.getKafkaClusters().forEach(c -> cache.put(c.getName(), initializing));
   }
 
-  public synchronized void replace(KafkaCluster c, Metrics stats) {
+  public synchronized void replace(KafkaCluster c, Statistics stats) {
     cache.put(c.getName(), stats);
   }
 
@@ -91,7 +58,7 @@ public synchronized void onTopicDelete(KafkaCluster c, String topic) {
     );
   }
 
-  public Metrics get(KafkaCluster c) {
+  public Statistics get(KafkaCluster c) {
     return Objects.requireNonNull(cache.get(c.getName()), "Unknown cluster metrics requested");
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
similarity index 76%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsService.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
index ac58ba8b773..9f0b9389996 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MetricsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
@@ -3,8 +3,10 @@
 import com.provectus.kafka.ui.model.Feature;
 import com.provectus.kafka.ui.model.InternalLogDirStats;
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.Metrics;
 import com.provectus.kafka.ui.model.ServerStatusDTO;
-import com.provectus.kafka.ui.util.JmxClusterUtil;
+import com.provectus.kafka.ui.model.Statistics;
+import com.provectus.kafka.ui.service.metrics.MetricsCollector;
 import java.util.List;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
@@ -17,33 +19,33 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class MetricsService {
+public class StatisticsService {
 
-  private final JmxClusterUtil jmxClusterUtil;
+  private final MetricsCollector metricsClusterUtil;
   private final AdminClientService adminClientService;
   private final FeatureService featureService;
-  private final MetricsCache cache;
+  private final StatisticsCache cache;
 
-  public Mono<MetricsCache.Metrics> updateCache(KafkaCluster c) {
-    return getMetrics(c).doOnSuccess(m -> cache.replace(c, m));
+  public Mono<Statistics> updateCache(KafkaCluster c) {
+    return getStatistics(c).doOnSuccess(m -> cache.replace(c, m));
   }
 
-  private Mono<MetricsCache.Metrics> getMetrics(KafkaCluster cluster) {
+  private Mono<Statistics> getStatistics(KafkaCluster cluster) {
     return adminClientService.get(cluster).flatMap(ac ->
             ac.describeCluster().flatMap(description ->
                 Mono.zip(
                     List.of(
-                        jmxClusterUtil.getBrokerMetrics(cluster, description.getNodes()),
+                        metricsClusterUtil.getBrokerMetrics(cluster, description.getNodes()),
                         getLogDirInfo(cluster, ac),
                         featureService.getAvailableFeatures(cluster, description.getController()),
                         loadTopicConfigs(cluster),
                         describeTopics(cluster)),
                     results ->
-                        MetricsCache.Metrics.builder()
+                        Statistics.builder()
                             .status(ServerStatusDTO.ONLINE)
                             .clusterDescription(description)
                             .version(ac.getVersion())
-                            .jmxMetrics((JmxClusterUtil.JmxMetrics) results[0])
+                            .metrics((Metrics) results[0])
                             .logDirInfo((InternalLogDirStats) results[1])
                             .features((List<Feature>) results[2])
                             .topicConfigs((Map<String, List<ConfigEntry>>) results[3])
@@ -53,7 +55,7 @@ private Mono<MetricsCache.Metrics> getMetrics(KafkaCluster cluster) {
         .doOnError(e ->
             log.error("Failed to collect cluster {} info", cluster.getName(), e))
         .onErrorResume(
-            e -> Mono.just(MetricsCache.Metrics.empty().toBuilder().lastKafkaException(e).build()));
+            e -> Mono.just(Statistics.empty().toBuilder().lastKafkaException(e).build()));
   }
 
   private Mono<InternalLogDirStats> getLogDirInfo(KafkaCluster cluster, ReactiveAdminClient c) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 91e5ebd2e65..1790a3005c2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -15,13 +15,14 @@
 import com.provectus.kafka.ui.model.InternalTopic;
 import com.provectus.kafka.ui.model.InternalTopicConfig;
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.Metrics;
 import com.provectus.kafka.ui.model.PartitionsIncreaseDTO;
 import com.provectus.kafka.ui.model.PartitionsIncreaseResponseDTO;
 import com.provectus.kafka.ui.model.ReplicationFactorChangeDTO;
 import com.provectus.kafka.ui.model.ReplicationFactorChangeResponseDTO;
+import com.provectus.kafka.ui.model.Statistics;
 import com.provectus.kafka.ui.model.TopicCreationDTO;
 import com.provectus.kafka.ui.model.TopicUpdateDTO;
-import com.provectus.kafka.ui.util.JmxClusterUtil;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Collections;
@@ -51,7 +52,7 @@ public class TopicsService {
 
   private final AdminClientService adminClientService;
   private final DeserializationService deserializationService;
-  private final MetricsCache metricsCache;
+  private final StatisticsCache statisticsCache;
   @Value("${topic.recreate.maxRetries:15}")
   private int recreateMaxRetries;
   @Value("${topic.recreate.delay.seconds:1}")
@@ -69,15 +70,15 @@ public Mono<List<InternalTopic>> loadTopics(KafkaCluster c, List<String> topics)
         .flatMap(ac ->
             ac.describeTopics(topics).zipWith(ac.getTopicsConfig(topics),
                 (descriptions, configs) -> {
-                  metricsCache.update(c, descriptions, configs);
+                  statisticsCache.update(c, descriptions, configs);
                   return getPartitionOffsets(descriptions, ac).map(offsets -> {
-                    var metrics = metricsCache.get(c);
+                    var metrics = statisticsCache.get(c);
                     return createList(
                         topics,
                         descriptions,
                         configs,
                         offsets,
-                        metrics.getJmxMetrics(),
+                        metrics.getMetrics(),
                         metrics.getLogDirInfo()
                     );
                   });
@@ -118,7 +119,7 @@ private List<InternalTopic> createList(List<String> orderedNames,
                                          Map<String, TopicDescription> descriptions,
                                          Map<String, List<ConfigEntry>> configs,
                                          InternalPartitionsOffsets partitionsOffsets,
-                                         JmxClusterUtil.JmxMetrics jmxMetrics,
+                                         Metrics metrics,
                                          InternalLogDirStats logDirInfo) {
     return orderedNames.stream()
         .filter(descriptions::containsKey)
@@ -126,7 +127,7 @@ private List<InternalTopic> createList(List<String> orderedNames,
             descriptions.get(t),
             configs.getOrDefault(t, List.of()),
             partitionsOffsets,
-            jmxMetrics,
+            metrics,
             logDirInfo
         ))
         .collect(toList());
@@ -249,7 +250,7 @@ public Mono<ReplicationFactorChangeResponseDTO> changeReplicationFactor(
         .flatMap(ac -> {
           Integer actual = topic.getReplicationFactor();
           Integer requested = replicationFactorChange.getTotalReplicationFactor();
-          Integer brokersCount = metricsCache.get(cluster).getClusterDescription()
+          Integer brokersCount = statisticsCache.get(cluster).getClusterDescription()
               .getNodes().size();
 
           if (requested.equals(actual)) {
@@ -365,7 +366,7 @@ private Map<Integer, List<Integer>> getCurrentAssignment(InternalTopic topic) {
 
   private Map<Integer, Integer> getBrokersMap(KafkaCluster cluster,
                                               Map<Integer, List<Integer>> currentAssignment) {
-    Map<Integer, Integer> result = metricsCache.get(cluster).getClusterDescription().getNodes()
+    Map<Integer, Integer> result = statisticsCache.get(cluster).getClusterDescription().getNodes()
         .stream()
         .map(Node::id)
         .collect(toMap(
@@ -413,9 +414,9 @@ public Mono<PartitionsIncreaseResponseDTO> increaseTopicPartitions(
   }
 
   public Mono<Void> deleteTopic(KafkaCluster cluster, String topicName) {
-    if (metricsCache.get(cluster).getFeatures().contains(Feature.TOPIC_DELETION)) {
+    if (statisticsCache.get(cluster).getFeatures().contains(Feature.TOPIC_DELETION)) {
       return adminClientService.get(cluster).flatMap(c -> c.deleteTopic(topicName))
-          .doOnSuccess(t -> metricsCache.onTopicDelete(cluster, topicName));
+          .doOnSuccess(t -> statisticsCache.onTopicDelete(cluster, topicName));
     } else {
       return Mono.error(new ValidationException("Topic deletion restricted"));
     }
@@ -441,18 +442,18 @@ public Mono<InternalTopic> cloneTopic(
   }
 
   public Mono<List<InternalTopic>> getTopicsForPagination(KafkaCluster cluster) {
-    MetricsCache.Metrics metrics = metricsCache.get(cluster);
-    return filterExisting(cluster, metrics.getTopicDescriptions().keySet())
-            .map(lst -> lst.stream()
-                .map(topicName ->
-                    InternalTopic.from(
-                        metrics.getTopicDescriptions().get(topicName),
-                        metrics.getTopicConfigs().getOrDefault(topicName, List.of()),
-                        InternalPartitionsOffsets.empty(),
-                        metrics.getJmxMetrics(),
-                        metrics.getLogDirInfo()))
-                .collect(toList())
-            );
+    Statistics stats = statisticsCache.get(cluster);
+    return filterExisting(cluster, stats.getTopicDescriptions().keySet())
+        .map(lst -> lst.stream()
+            .map(topicName ->
+                InternalTopic.from(
+                    stats.getTopicDescriptions().get(topicName),
+                    stats.getTopicConfigs().getOrDefault(topicName, List.of()),
+                    InternalPartitionsOffsets.empty(),
+                    stats.getMetrics(),
+                    stats.getLogDirInfo()))
+            .collect(toList())
+        );
   }
 
   private Mono<List<String>> filterExisting(KafkaCluster cluster, Collection<String> topics) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsFormatter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsFormatter.java
new file mode 100644
index 00000000000..4d3d31f50f4
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsFormatter.java
@@ -0,0 +1,85 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.management.MBeanAttributeInfo;
+import javax.management.ObjectName;
+
+/**
+ * Converts JMX metrics into JmxExporter prometheus format: <a href="https://github.com/prometheus/jmx_exporter#default-format">format</a>.
+ */
+class JmxMetricsFormatter {
+
+  // copied from https://github.com/prometheus/jmx_exporter/blob/b6b811b4aae994e812e902b26dd41f29364c0e2b/collector/src/main/java/io/prometheus/jmx/JmxMBeanPropertyCache.java#L15
+  private static final Pattern PROPERTY_PATTERN = Pattern.compile(
+      "([^,=:\\*\\?]+)=(\"(?:[^\\\\\"]*(?:\\\\.)?)*\"|[^,=:\"]*)");
+
+  static List<RawMetric> constructMetricsList(ObjectName jmxMetric,
+                                              MBeanAttributeInfo[] attributes,
+                                              Object[] attrValues) {
+    String domain = fixIllegalChars(jmxMetric.getDomain());
+    LinkedHashMap<String, String> labels = getLabelsMap(jmxMetric);
+    String firstLabel = labels.keySet().iterator().next();
+    String firstLabelValue = fixIllegalChars(labels.get(firstLabel));
+    labels.remove(firstLabel); //removing first label since it's value will be in name
+
+    List<RawMetric> result = new ArrayList<>(attributes.length);
+    for (int i = 0; i < attributes.length; i++) {
+      String attrName = fixIllegalChars(attributes[i].getName());
+      convertNumericValue(attrValues[i]).ifPresent(convertedValue -> {
+        String name = String.format("%s_%s_%s", domain, firstLabelValue, attrName);
+        var metric = RawMetric.create(name, labels, convertedValue);
+        result.add(metric);
+      });
+    }
+    return result;
+  }
+
+  private static String fixIllegalChars(String str) {
+    return str
+        .replace('.', '_')
+        .replace('-', '_');
+  }
+
+  private static Optional<BigDecimal> convertNumericValue(Object value) {
+    if (!(value instanceof Number)) {
+      return Optional.empty();
+    }
+    try {
+      if (value instanceof Long) {
+        return Optional.of(new BigDecimal((Long) value));
+      } else if (value instanceof Integer) {
+        return Optional.of(new BigDecimal((Integer) value));
+      }
+      return Optional.of(new BigDecimal(value.toString()));
+    } catch (NumberFormatException nfe) {
+      return Optional.empty();
+    }
+  }
+
+  /**
+   * Converts Mbean properties to map keeping order (copied from jmx_exporter repo).
+   */
+  private static LinkedHashMap<String, String> getLabelsMap(ObjectName mbeanName) {
+    LinkedHashMap<String, String> keyProperties = new LinkedHashMap<>();
+    String properties = mbeanName.getKeyPropertyListString();
+    Matcher match = PROPERTY_PATTERN.matcher(properties);
+    while (match.lookingAt()) {
+      String labelName = fixIllegalChars(match.group(1)); // label names should be fixed
+      String labelValue = match.group(2);
+      keyProperties.put(labelName, labelValue);
+      properties = properties.substring(match.end());
+      if (properties.startsWith(",")) {
+        properties = properties.substring(1);
+      }
+      match.reset(properties);
+    }
+    return keyProperties;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java
new file mode 100644
index 00000000000..8a6e10656d2
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java
@@ -0,0 +1,106 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import com.provectus.kafka.ui.model.JmxConnectionInfo;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.util.JmxPoolFactory;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.kafka.common.Node;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+
+
+@Service
+@Lazy
+@Slf4j
+class JmxMetricsRetriever implements MetricsRetriever, AutoCloseable {
+
+  private static final String JMX_URL = "service:jmx:rmi:///jndi/rmi://";
+  private static final String JMX_SERVICE_TYPE = "jmxrmi";
+  private static final String CANONICAL_NAME_PATTERN = "kafka.server*:*";
+
+  private final GenericKeyedObjectPool<JmxConnectionInfo, JMXConnector> pool;
+
+  public JmxMetricsRetriever() {
+    this.pool = new GenericKeyedObjectPool<>(new JmxPoolFactory());
+    GenericKeyedObjectPoolConfig<JMXConnector> poolConfig = new GenericKeyedObjectPoolConfig<>();
+    poolConfig.setMaxIdlePerKey(3);
+    poolConfig.setMaxTotalPerKey(3);
+    this.pool.setConfig(poolConfig);
+  }
+
+  @Override
+  public Flux<RawMetric> retrieve(KafkaCluster c, Node node) {
+    return Mono.fromSupplier(() -> retrieveSync(c, node))
+        .subscribeOn(Schedulers.boundedElastic())
+        .flatMapMany(Flux::fromIterable);
+  }
+
+  private List<RawMetric> retrieveSync(KafkaCluster c, Node node) {
+    String jmxUrl = JMX_URL + node.host() + ":" + c.getMetricsConfig().getPort() + "/" + JMX_SERVICE_TYPE;
+    log.debug("Collection JMX metrics for {}", jmxUrl);
+    final var connectionInfo = JmxConnectionInfo.builder()
+        .url(jmxUrl)
+        .ssl(c.getMetricsConfig().isSsl())
+        .username(c.getMetricsConfig().getUsername())
+        .password(c.getMetricsConfig().getPassword())
+        .build();
+    JMXConnector srv;
+    try {
+      srv = pool.borrowObject(connectionInfo);
+    } catch (Exception e) {
+      log.error("Cannot get JMX connector for the pool due to: ", e);
+      return Collections.emptyList();
+    }
+    List<RawMetric> result = new ArrayList<>();
+    try {
+      MBeanServerConnection msc = srv.getMBeanServerConnection();
+      var jmxMetrics = msc.queryNames(new ObjectName(CANONICAL_NAME_PATTERN), null);
+      for (ObjectName jmxMetric : jmxMetrics) {
+        result.addAll(extractObjectMetrics(jmxMetric, msc));
+      }
+      pool.returnObject(connectionInfo, srv);
+    } catch (Exception e) {
+      log.error("Error getting jmx metrics from {}", jmxUrl, e);
+      closeConnectionExceptionally(jmxUrl, srv);
+    }
+    log.debug("{} metrics collected for {}", result.size(), jmxUrl);
+    return result;
+  }
+
+  private void closeConnectionExceptionally(String url, JMXConnector srv) {
+    try {
+      pool.invalidateObject(new JmxConnectionInfo(url), srv);
+    } catch (Exception e) {
+      log.error("Cannot invalidate object in pool, {}", url, e);
+    }
+  }
+
+  @SneakyThrows
+  private List<RawMetric> extractObjectMetrics(ObjectName objectName, MBeanServerConnection msc) {
+    MBeanAttributeInfo[] attrNames = msc.getMBeanInfo(objectName).getAttributes();
+    Object[] attrValues = new Object[attrNames.length];
+    for (int i = 0; i < attrNames.length; i++) {
+      attrValues[i] = msc.getAttribute(objectName, attrNames[i].getName());
+    }
+    return JmxMetricsFormatter.constructMetricsList(objectName, attrNames, attrValues);
+  }
+
+  @Override
+  public void close() {
+    this.pool.close();
+  }
+}
+
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsCollector.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsCollector.java
new file mode 100644
index 00000000000..bd0506bed87
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsCollector.java
@@ -0,0 +1,69 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.Metrics;
+import com.provectus.kafka.ui.model.MetricsConfig;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.common.Node;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class MetricsCollector {
+
+  private final JmxMetricsRetriever jmxMetricsRetriever;
+  private final PrometheusMetricsRetriever prometheusMetricsRetriever;
+
+  public Mono<Metrics> getBrokerMetrics(KafkaCluster cluster, Collection<Node> nodes) {
+    return Flux.fromIterable(nodes)
+        .flatMap(n -> getMetrics(cluster, n).map(lst -> Tuples.of(n, lst)))
+        .collectMap(Tuple2::getT1, Tuple2::getT2)
+        .map(nodeMetrics -> collectMetrics(cluster, nodeMetrics))
+        .defaultIfEmpty(Metrics.empty());
+  }
+
+  private Mono<List<RawMetric>> getMetrics(KafkaCluster kafkaCluster, Node node) {
+    Flux<RawMetric> metricFlux = Flux.empty();
+    if (kafkaCluster.getMetricsConfig() != null) {
+      String type = kafkaCluster.getMetricsConfig().getType();
+      if (type == null || type.equalsIgnoreCase(MetricsConfig.JMX_METRICS_TYPE)) {
+        metricFlux = jmxMetricsRetriever.retrieve(kafkaCluster, node);
+      } else if (type.equalsIgnoreCase(MetricsConfig.PROMETHEUS_METRICS_TYPE)) {
+        metricFlux = prometheusMetricsRetriever.retrieve(kafkaCluster, node);
+      }
+    }
+    return metricFlux.collectList();
+  }
+
+  public Metrics collectMetrics(KafkaCluster cluster, Map<Node, List<RawMetric>> perBrokerMetrics) {
+    Metrics.MetricsBuilder builder = Metrics.builder()
+        .perBrokerMetrics(
+            perBrokerMetrics.entrySet()
+                .stream()
+                .collect(Collectors.toMap(e -> e.getKey().id(), Map.Entry::getValue)));
+
+    populateWellknowMetrics(cluster, perBrokerMetrics)
+        .apply(builder);
+
+    return builder.build();
+  }
+
+  private WellKnownMetrics populateWellknowMetrics(KafkaCluster cluster, Map<Node, List<RawMetric>> perBrokerMetrics) {
+    WellKnownMetrics wellKnownMetrics = new WellKnownMetrics();
+    perBrokerMetrics.forEach((node, metrics) ->
+        metrics.forEach(metric ->
+            wellKnownMetrics.populate(cluster, node, metric)));
+    return wellKnownMetrics;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsRetriever.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsRetriever.java
new file mode 100644
index 00000000000..7e1e126fa0d
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsRetriever.java
@@ -0,0 +1,9 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import com.provectus.kafka.ui.model.KafkaCluster;
+import org.apache.kafka.common.Node;
+import reactor.core.publisher.Flux;
+
+interface MetricsRetriever {
+  Flux<RawMetric> retrieve(KafkaCluster c, Node node);
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointMetricsParser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointMetricsParser.java
new file mode 100644
index 00000000000..1a51ca0afae
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointMetricsParser.java
@@ -0,0 +1,46 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.math.NumberUtils;
+
+@Slf4j
+class PrometheusEndpointMetricsParser {
+
+  /**
+   * Matches openmetrics format. For example, string:
+   * kafka_server_BrokerTopicMetrics_FiveMinuteRate{name="BytesInPerSec",topic="__consumer_offsets",} 16.94886650744339
+   * will produce:
+   * name=kafka_server_BrokerTopicMetrics_FiveMinuteRate
+   * value=16.94886650744339
+   * labels={name="BytesInPerSec", topic="__consumer_offsets"}",
+   */
+  private static final Pattern PATTERN = Pattern.compile(
+      "(?<metricName>^\\w+)([ \t]*\\{*(?<properties>.*)}*)[ \\t]+(?<value>[\\d]+\\.?[\\d]+)?");
+
+  static Optional<RawMetric> parse(String s) {
+    Matcher matcher = PATTERN.matcher(s);
+    if (matcher.matches()) {
+      String value = matcher.group("value");
+      String metricName = matcher.group("metricName");
+      if (metricName == null || !NumberUtils.isCreatable(value)) {
+        return Optional.empty();
+      }
+      var labels = Arrays.stream(matcher.group("properties").split(","))
+          .filter(str -> !"".equals(str))
+          .map(str -> str.split("="))
+          .filter(spit -> spit.length == 2)
+          .collect(Collectors.toUnmodifiableMap(
+              str -> str[0].trim(),
+              str -> str[1].trim().replace("\"", "")));
+
+      return Optional.of(RawMetric.create(metricName, labels, new BigDecimal(value)));
+    }
+    return Optional.empty();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java
new file mode 100644
index 00000000000..8e9334b418c
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java
@@ -0,0 +1,58 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Strings;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import java.util.Arrays;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.common.Node;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.util.UriComponentsBuilder;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+class PrometheusMetricsRetriever implements MetricsRetriever {
+
+  private static final String METRICS_ENDPOINT_PATH = "/metrics";
+  private static final int DEFAULT_EXPORTER_PORT = 11001;
+
+  private final WebClient webClient;
+
+  @Override
+  public Flux<RawMetric> retrieve(KafkaCluster c, Node node) {
+    log.debug("Retrieving metrics from prometheus exporter: {}:{}", node.host(), c.getMetricsConfig().getPort());
+    var metricsConfig = c.getMetricsConfig();
+    Integer port = Optional.ofNullable(metricsConfig.getPort()).orElse(DEFAULT_EXPORTER_PORT);
+    return retrieve(node.host(), port, metricsConfig.isSsl());
+  }
+
+  @VisibleForTesting
+  Flux<RawMetric> retrieve(String host, int port, boolean ssl) {
+    WebClient.ResponseSpec responseSpec = webClient.get()
+        .uri(UriComponentsBuilder.newInstance()
+            .scheme(ssl ? "https" : "http")
+            .host(host)
+            .port(port)
+            .path(METRICS_ENDPOINT_PATH).build().toUri())
+        .retrieve();
+
+    return responseSpec.bodyToMono(String.class)
+        .doOnError(e -> log.error("Error while getting metrics from {}", host, e))
+        .onErrorResume(th -> Mono.empty())
+        .flatMapMany(body ->
+            Flux.fromStream(
+                Arrays.stream(body.split("\\n"))
+                    .filter(str -> !Strings.isNullOrEmpty(str) && !str.startsWith("#")) // skipping comments strings
+                    .map(PrometheusEndpointMetricsParser::parse)
+                    .filter(Optional::isPresent)
+                    .map(Optional::get)
+            )
+        );
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/RawMetric.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/RawMetric.java
new file mode 100644
index 00000000000..659212f23ff
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/RawMetric.java
@@ -0,0 +1,60 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import java.math.BigDecimal;
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+public interface RawMetric {
+
+  String name();
+
+  Map<String, String> labels();
+
+  BigDecimal value();
+
+  // Key, that can be used for metrics reductions
+  default Object identityKey() {
+    return name() + "_" + labels();
+  }
+
+  RawMetric copyWithValue(BigDecimal newValue);
+
+  //--------------------------------------------------
+
+  static RawMetric create(String name, Map<String, String> labels, BigDecimal value) {
+    return new SimpleMetric(name, labels, value);
+  }
+
+  @AllArgsConstructor
+  @EqualsAndHashCode
+  @ToString
+  class SimpleMetric implements RawMetric {
+
+    private final String name;
+    private final Map<String, String> labels;
+    private final BigDecimal value;
+
+    @Override
+    public String name() {
+      return name;
+    }
+
+    @Override
+    public Map<String, String> labels() {
+      return labels;
+    }
+
+    @Override
+    public BigDecimal value() {
+      return value;
+    }
+
+    @Override
+    public RawMetric copyWithValue(BigDecimal newValue) {
+      return new SimpleMetric(name, labels, newValue);
+    }
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java
new file mode 100644
index 00000000000..fe8a55da12c
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java
@@ -0,0 +1,42 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
+import static org.apache.commons.lang3.StringUtils.endsWithIgnoreCase;
+
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.Metrics;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.kafka.common.Node;
+
+class WellKnownMetrics {
+
+  final Map<String, BigDecimal> bytesInFifteenMinuteRate = new HashMap<>();
+  final Map<String, BigDecimal> bytesOutFifteenMinuteRate = new HashMap<>();
+
+  void populate(KafkaCluster cluster, Node node, RawMetric rawMetric) {
+    updateTopicsIOrates(rawMetric);
+  }
+
+  void apply(Metrics.MetricsBuilder metricsBuilder) {
+    metricsBuilder.bytesInPerSec(bytesInFifteenMinuteRate);
+    metricsBuilder.bytesOutPerSec(bytesOutFifteenMinuteRate);
+  }
+
+  private void updateTopicsIOrates(RawMetric rawMetric) {
+    String name = rawMetric.name();
+    String topic = rawMetric.labels().get("topic");
+    if (topic != null
+        && containsIgnoreCase(name, "BrokerTopicMetrics")
+        && endsWithIgnoreCase(name, "FifteenMinuteRate")) {
+      String nameProperty = rawMetric.labels().get("name");
+      if ("BytesInPerSec".equalsIgnoreCase(nameProperty)) {
+        bytesInFifteenMinuteRate.compute(topic, (k, v) -> v == null ? rawMetric.value() : v.add(rawMetric.value()));
+      } else if ("BytesOutPerSec".equalsIgnoreCase(nameProperty)) {
+        bytesOutFifteenMinuteRate.compute(topic, (k, v) -> v == null ? rawMetric.value() : v.add(rawMetric.value()));
+      }
+    }
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxClusterUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxClusterUtil.java
deleted file mode 100644
index 163ebb5e9ed..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxClusterUtil.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.reducing;
-import static java.util.stream.Collectors.toList;
-
-import com.provectus.kafka.ui.model.JmxBrokerMetrics;
-import com.provectus.kafka.ui.model.JmxConnectionInfo;
-import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.MetricDTO;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import lombok.Builder;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.Value;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.pool2.KeyedObjectPool;
-import org.apache.kafka.common.Node;
-import org.jetbrains.annotations.Nullable;
-import org.springframework.stereotype.Component;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
-import reactor.util.function.Tuple2;
-import reactor.util.function.Tuples;
-
-@Component
-@Slf4j
-@RequiredArgsConstructor
-public class JmxClusterUtil {
-
-  private static final String JMX_URL = "service:jmx:rmi:///jndi/rmi://";
-  private static final String JMX_SERVICE_TYPE = "jmxrmi";
-  private static final String KAFKA_SERVER_PARAM = "kafka.server";
-  private static final String NAME_METRIC_FIELD = "name";
-  private final KeyedObjectPool<JmxConnectionInfo, JMXConnector> pool;
-
-  @Builder
-  @Value
-  public static class JmxMetrics {
-    Map<String, BigDecimal> bytesInPerSec;
-    Map<String, BigDecimal> bytesOutPerSec;
-    Map<Integer, JmxBrokerMetrics> internalBrokerMetrics;
-    List<MetricDTO> metrics;
-
-    public static JmxMetrics empty() {
-      return JmxClusterUtil.JmxMetrics.builder()
-          .bytesInPerSec(Map.of())
-          .bytesOutPerSec(Map.of())
-          .internalBrokerMetrics(Map.of())
-          .metrics(List.of())
-          .build();
-    }
-  }
-
-  public Mono<JmxMetrics> getBrokerMetrics(KafkaCluster cluster, Collection<Node> nodes) {
-    return Flux.fromIterable(nodes)
-        // jmx is a blocking api, so we trying to parallelize its execution on boundedElastic scheduler
-        .parallel()
-        .runOn(Schedulers.boundedElastic())
-        .map(n -> Map.entry(n.id(),
-            JmxBrokerMetrics.builder().metrics(getJmxMetric(cluster, n)).build()))
-        .sequential()
-        .collectMap(Map.Entry::getKey, Map.Entry::getValue)
-        .map(this::collectMetrics);
-  }
-
-  private List<MetricDTO> getJmxMetric(KafkaCluster cluster, Node node) {
-    return Optional.of(cluster)
-        .filter(c -> c.getJmxPort() != null)
-        .filter(c -> c.getJmxPort() > 0)
-        .map(c -> getJmxMetrics(node.host(), c.getJmxPort(), c.isJmxSsl(),
-            c.getJmxUsername(), c.getJmxPassword()))
-        .orElse(Collections.emptyList());
-  }
-
-  @SneakyThrows
-  private List<MetricDTO> getJmxMetrics(String host, int port, boolean jmxSsl,
-                                        @Nullable String username, @Nullable String password) {
-    String jmxUrl = JMX_URL + host + ":" + port + "/" + JMX_SERVICE_TYPE;
-    final var connectionInfo = JmxConnectionInfo.builder()
-        .url(jmxUrl)
-        .ssl(jmxSsl)
-        .username(username)
-        .password(password)
-        .build();
-    JMXConnector srv;
-    try {
-      srv = pool.borrowObject(connectionInfo);
-    } catch (Exception e) {
-      log.error("Cannot get JMX connector for the pool due to: ", e);
-      return Collections.emptyList();
-    }
-
-    List<MetricDTO> result = new ArrayList<>();
-    try {
-      MBeanServerConnection msc = srv.getMBeanServerConnection();
-      var jmxMetrics = msc.queryNames(null, null).stream()
-          .filter(q -> q.getCanonicalName().startsWith(KAFKA_SERVER_PARAM))
-          .collect(Collectors.toList());
-      for (ObjectName jmxMetric : jmxMetrics) {
-        final Hashtable<String, String> params = jmxMetric.getKeyPropertyList();
-        MetricDTO metric = new MetricDTO();
-        metric.setName(params.get(NAME_METRIC_FIELD));
-        metric.setCanonicalName(jmxMetric.getCanonicalName());
-        metric.setParams(params);
-        metric.setValue(getJmxMetrics(jmxMetric.getCanonicalName(), msc));
-        result.add(metric);
-      }
-      pool.returnObject(connectionInfo, srv);
-    } catch (Exception e) {
-      log.error("Cannot get jmxMetricsNames, {}", jmxUrl, e);
-      closeConnectionExceptionally(jmxUrl, srv);
-    }
-    return result;
-  }
-
-  @SneakyThrows
-  private Map<String, BigDecimal> getJmxMetrics(String canonicalName, MBeanServerConnection msc) {
-    Map<String, BigDecimal> resultAttr = new HashMap<>();
-    ObjectName name = new ObjectName(canonicalName);
-    var attrNames = msc.getMBeanInfo(name).getAttributes();
-    for (MBeanAttributeInfo attrName : attrNames) {
-      var value = msc.getAttribute(name, attrName.getName());
-      if (NumberUtil.isNumeric(value)) {
-        resultAttr.put(attrName.getName(), new BigDecimal(value.toString()));
-      }
-    }
-    return resultAttr;
-  }
-
-  private JmxMetrics collectMetrics(Map<Integer, JmxBrokerMetrics> perBrokerJmxMetrics) {
-    final List<MetricDTO> metrics = perBrokerJmxMetrics.values()
-        .stream()
-        .flatMap(b -> b.getMetrics().stream())
-        .collect(
-            groupingBy(
-                MetricDTO::getCanonicalName,
-                reducing(this::reduceJmxMetrics)
-            )
-        ).values().stream()
-        .filter(Optional::isPresent)
-        .map(Optional::get)
-        .collect(toList());
-    return JmxMetrics.builder()
-        .metrics(metrics)
-        .internalBrokerMetrics(perBrokerJmxMetrics)
-        .bytesInPerSec(findTopicMetrics(
-            metrics, JmxMetricsName.BYTES_IN_PER_SEC, JmxMetricsValueName.FIFTEEN_MINUTE_RATE))
-        .bytesOutPerSec(findTopicMetrics(
-            metrics, JmxMetricsName.BYTES_OUT_PER_SEC, JmxMetricsValueName.FIFTEEN_MINUTE_RATE))
-        .build();
-  }
-
-  private Map<String, BigDecimal> findTopicMetrics(List<MetricDTO> metrics,
-                                                   JmxMetricsName metricsName,
-                                                   JmxMetricsValueName valueName) {
-    return metrics.stream().filter(m -> metricsName.getValue().equals(m.getName()))
-        .filter(m -> m.getParams().containsKey("topic"))
-        .filter(m -> m.getValue().containsKey(valueName.getValue()))
-        .map(m -> Tuples.of(
-            m.getParams().get("topic"),
-            m.getValue().get(valueName.getValue())
-        )).collect(groupingBy(
-            Tuple2::getT1,
-            reducing(BigDecimal.ZERO, Tuple2::getT2, BigDecimal::add)
-        ));
-  }
-
-  private void closeConnectionExceptionally(String url, JMXConnector srv) {
-    try {
-      pool.invalidateObject(new JmxConnectionInfo(url), srv);
-    } catch (Exception e) {
-      log.error("Cannot invalidate object in pool, {}", url);
-    }
-  }
-
-  public MetricDTO reduceJmxMetrics(MetricDTO metric1, MetricDTO metric2) {
-    var result = new MetricDTO();
-    Map<String, BigDecimal> value = Stream.concat(
-        metric1.getValue().entrySet().stream(),
-        metric2.getValue().entrySet().stream()
-    ).collect(Collectors.groupingBy(
-        Map.Entry::getKey,
-        Collectors.reducing(BigDecimal.ZERO, Map.Entry::getValue, BigDecimal::add)
-    ));
-    result.setName(metric1.getName());
-    result.setCanonicalName(metric1.getCanonicalName());
-    result.setParams(metric1.getParams());
-    result.setValue(value);
-    return result;
-  }
-
-  private boolean isWellKnownMetric(MetricDTO metric) {
-    final Optional<String> param =
-        Optional.ofNullable(metric.getParams().get(NAME_METRIC_FIELD)).filter(p ->
-            Arrays.stream(JmxMetricsName.values()).map(JmxMetricsName::getValue)
-                .anyMatch(n -> n.equals(p))
-        );
-    return metric.getCanonicalName().contains(KAFKA_SERVER_PARAM) && param.isPresent();
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxMetricsName.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxMetricsName.java
deleted file mode 100644
index 2384fc85367..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxMetricsName.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-public enum JmxMetricsName {
-  MESSAGES_IN_PER_SEC("MessagesInPerSec"),
-  BYTES_IN_PER_SEC("BytesInPerSec"),
-  REPLICATION_BYTES_IN_PER_SEC("ReplicationBytesInPerSec"),
-  REQUESTS_PER_SEC("RequestsPerSec"),
-  ERRORS_PER_SEC("ErrorsPerSec"),
-  MESSAGE_CONVERSIONS_PER_SEC("MessageConversionsPerSec"),
-  BYTES_OUT_PER_SEC("BytesOutPerSec"),
-  REPLICATION_BYTES_OUT_PER_SEC("ReplicationBytesOutPerSec"),
-  NO_KEY_COMPACTED_TOPIC_RECORDS_PER_SEC("NoKeyCompactedTopicRecordsPerSec"),
-  INVALID_MAGIC_NUMBER_RECORDS_PER_SEC("InvalidMagicNumberRecordsPerSec"),
-  INVALID_MESSAGE_CRC_RECORDS_PER_SEC("InvalidMessageCrcRecordsPerSec"),
-  INVALID_OFFSET_OR_SEQUENCE_RECORDS_PER_SEC("InvalidOffsetOrSequenceRecordsPerSec"),
-  UNCLEAN_LEADER_ELECTIONS_PER_SEC("UncleanLeaderElectionsPerSec"),
-  ISR_SHRINKS_PER_SEC("IsrShrinksPerSec"),
-  ISR_EXPANDS_PER_SEC("IsrExpandsPerSec"),
-  REASSIGNMENT_BYTES_OUT_PER_SEC("ReassignmentBytesOutPerSec"),
-  REASSIGNMENT_BYTES_IN_PER_SEC("ReassignmentBytesInPerSec"),
-  PRODUCE_MESSAGE_CONVERSIONS_PER_SEC("ProduceMessageConversionsPerSec"),
-  FAILED_FETCH_REQUESTS_PER_SEC("FailedFetchRequestsPerSec"),
-  ZOOKEEPER_SYNC_CONNECTS_PER_SEC("ZooKeeperSyncConnectsPerSec"),
-  BYTES_REJECTED_PER_SEC("BytesRejectedPerSec"),
-  ZOO_KEEPER_AUTH_FAILURES_PER_SEC("ZooKeeperAuthFailuresPerSec"),
-  TOTAL_FETCH_REQUESTS_PER_SEC("TotalFetchRequestsPerSec"),
-  FAILED_ISR_UPDATES_PER_SEC("FailedIsrUpdatesPerSec"),
-  INCREMENTAL_FETCH_SESSION_EVICTIONS_PER_SEC("IncrementalFetchSessionEvictionsPerSec"),
-  FETCH_MESSAGE_CONVERSIONS_PER_SEC("FetchMessageConversionsPerSec"),
-  FAILED_PRODUCE_REQUESTS_PER_SEC("FailedProduceRequestsPerSe");
-
-  private final String value;
-
-  JmxMetricsName(String value) {
-    this.value = value;
-  }
-
-  public String getValue() {
-    return value;
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxMetricsValueName.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxMetricsValueName.java
deleted file mode 100644
index cbcc6cee078..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxMetricsValueName.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-public enum JmxMetricsValueName {
-  COUNT("Count"),
-  ONE_MINUTE_RATE("OneMinuteRate"),
-  FIFTEEN_MINUTE_RATE("FifteenMinuteRate"),
-  FIVE_MINUTE_RATE("FiveMinuteRate"),
-  MEAN_RATE("MeanRate");
-
-  private final String value;
-
-  JmxMetricsValueName(String value) {
-    this.value = value;
-  }
-
-  public String getValue() {
-    return value;
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java
index 9ea8c037cce..7237f1b8862 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.util;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.math.NumberUtils;
 
 @Slf4j
 public class NumberUtil {
@@ -9,9 +8,6 @@ public class NumberUtil {
   private NumberUtil() {
   }
 
-  public static boolean isNumeric(Object value) {
-    return value != null && NumberUtils.isCreatable(value.toString());
-  }
 
   public static float parserClusterVersion(String version) throws NumberFormatException {
     log.trace("Parsing cluster version [{}]", version);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java
index 0fd830b323d..e8d475a65d3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java
@@ -93,11 +93,9 @@ protected abstract Map<TopicPartition, Long> offsetsFromPositions(
   public static class WaitingOffsets {
     private final Map<Integer, Long> endOffsets; // partition number -> offset
     private final Map<Integer, Long> beginOffsets; // partition number -> offset
-    private final String topic;
 
     public WaitingOffsets(String topic, Consumer<?, ?> consumer,
                           Collection<TopicPartition> partitions) {
-      this.topic = topic;
       var allBeginningOffsets = consumer.beginningOffsets(partitions);
       var allEndOffsets = consumer.endOffsets(partitions);
 
diff --git a/kafka-ui-api/src/main/resources/application-local.yml b/kafka-ui-api/src/main/resources/application-local.yml
index 4f55ed49ccf..fd14a57ea01 100644
--- a/kafka-ui-api/src/main/resources/application-local.yml
+++ b/kafka-ui-api/src/main/resources/application-local.yml
@@ -8,7 +8,9 @@ kafka:
       kafkaConnect:
         - name: first
           address: http://localhost:8083
-      jmxPort: 9997
+      metrics:
+        port: 9997
+        type: JMX
   #    -
   #      name: secondLocal
   #      bootstrapServers: localhost:9093
@@ -17,7 +19,9 @@ kafka:
   #      kafkaConnect:
   #        - name: first
   #          address: http://localhost:8083
-  #      jmxPort: 9998
+  #      metrics:
+  #        port: 9998
+  #        type: JMX
   #      read-only: true
   #    -
   #      name: localUsingProtobufFile
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
index 5de2b93baac..afecccd1072 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
@@ -8,7 +8,6 @@
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.function.ThrowingConsumer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/producer/KafkaTestProducer.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/producer/KafkaTestProducer.java
index c8924188431..eaceb9ef245 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/producer/KafkaTestProducer.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/producer/KafkaTestProducer.java
@@ -2,7 +2,6 @@
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Future;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.clients.producer.ProducerRecord;
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java
index 1ddfd2d9ecf..4de939e0334 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java
@@ -129,9 +129,6 @@ public class SendAndReadTests extends AbstractIntegrationTest {
   @Autowired
   private ClustersStorage clustersStorage;
 
-  @Autowired
-  private ClustersMetricsScheduler clustersMetricsScheduler;
-
   @BeforeEach
   void init() {
     targetCluster = clustersStorage.getClusterByName(LOCAL).get();
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
index 42e44b08975..cc057db0b0d 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
@@ -14,11 +14,11 @@
 import com.provectus.kafka.ui.model.InternalSchemaRegistry;
 import com.provectus.kafka.ui.model.InternalTopic;
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.Metrics;
 import com.provectus.kafka.ui.model.SortOrderDTO;
 import com.provectus.kafka.ui.model.TopicColumnsToSortDTO;
 import com.provectus.kafka.ui.model.TopicDTO;
 import com.provectus.kafka.ui.service.analyze.TopicAnalysisService;
-import com.provectus.kafka.ui.util.JmxClusterUtil;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -42,7 +42,7 @@ class TopicsServicePaginationTest {
   private final ClustersStorage clustersStorage = mock(ClustersStorage.class);
   private final ClusterMapper clusterMapper = new ClusterMapperImpl();
 
-  private final TopicsController topicsController  = new TopicsController(
+  private final TopicsController topicsController = new TopicsController(
       topicsService, mock(TopicAnalysisService.class), clusterMapper);
 
   private void init(Map<String, InternalTopic> topicsInCache) {
@@ -66,7 +66,7 @@ public void shouldListFirst25Topics() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, false, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                JmxClusterUtil.JmxMetrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty()))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -93,7 +93,7 @@ public void shouldListFirst25TopicsSortedByNameDescendingOrder() {
         .map(Objects::toString)
         .map(name -> new TopicDescription(name, false, List.of()))
         .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-            JmxClusterUtil.JmxMetrics.empty(), InternalLogDirStats.empty()))
+            Metrics.empty(), InternalLogDirStats.empty()))
         .collect(Collectors.toMap(InternalTopic::getName, Function.identity()));
     init(internalTopics);
 
@@ -120,7 +120,7 @@ public void shouldCalculateCorrectPageCountForNonDivisiblePageSize() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, false, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                JmxClusterUtil.JmxMetrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty()))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -139,7 +139,7 @@ public void shouldCorrectlyHandleNonPositivePageNumberAndPageSize() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, false, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                JmxClusterUtil.JmxMetrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty()))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -158,7 +158,7 @@ public void shouldListBotInternalAndNonInternalTopics() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, Integer.parseInt(name) % 10 == 0, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                JmxClusterUtil.JmxMetrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty()))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -179,7 +179,7 @@ public void shouldListOnlyNonInternalTopics() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, Integer.parseInt(name) % 5 == 0, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                JmxClusterUtil.JmxMetrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty()))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -200,7 +200,7 @@ public void shouldListOnlyTopicsContainingOne() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, false, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                JmxClusterUtil.JmxMetrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty()))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -222,7 +222,7 @@ public void shouldListTopicsOrderedByPartitionsCount() {
                     new TopicPartitionInfo(p, null, List.of(), List.of()))
                 .collect(Collectors.toList())))
         .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), InternalPartitionsOffsets.empty(),
-            JmxClusterUtil.JmxMetrics.empty(), InternalLogDirStats.empty()))
+            Metrics.empty(), InternalLogDirStats.empty()))
         .collect(Collectors.toMap(InternalTopic::getName, Function.identity()));
 
     init(internalTopics);
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/JmxMetricsFormatterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/JmxMetricsFormatterTest.java
new file mode 100644
index 00000000000..1a4ff5134e6
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/JmxMetricsFormatterTest.java
@@ -0,0 +1,77 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import javax.management.MBeanAttributeInfo;
+import javax.management.ObjectName;
+import org.assertj.core.data.Offset;
+import org.junit.jupiter.api.Test;
+
+class JmxMetricsFormatterTest {
+
+  /**
+   * Original format is <a href="https://github.com/prometheus/jmx_exporter#default-format">here</a>.
+   */
+  @Test
+  void convertsJmxMetricsAccordingToJmxExporterFormat() throws Exception {
+    List<RawMetric> metrics = JmxMetricsFormatter.constructMetricsList(
+        new ObjectName(
+            "kafka.server:type=Some.BrokerTopic-Metrics,name=BytesOutPer-Sec,topic=test,some-lbl=123"),
+        new MBeanAttributeInfo[] {
+            createMbeanInfo("FifteenMinuteRate"),
+            createMbeanInfo("Mean"),
+            createMbeanInfo("Calls-count"),
+            createMbeanInfo("SkipValue"),
+        },
+        new Object[] {
+            123.0,
+            100.0,
+            10L,
+            "string values not supported"
+        }
+    );
+
+    assertThat(metrics).hasSize(3);
+
+    assertMetricsEqual(
+        RawMetric.create(
+            "kafka_server_Some_BrokerTopic_Metrics_FifteenMinuteRate",
+            Map.of("name", "BytesOutPer-Sec", "topic", "test",  "some_lbl", "123"),
+            BigDecimal.valueOf(123.0)
+        ),
+        metrics.get(0)
+    );
+
+    assertMetricsEqual(
+        RawMetric.create(
+            "kafka_server_Some_BrokerTopic_Metrics_Mean",
+            Map.of("name", "BytesOutPer-Sec", "topic", "test", "some_lbl", "123"),
+            BigDecimal.valueOf(100.0)
+        ),
+        metrics.get(1)
+    );
+
+    assertMetricsEqual(
+        RawMetric.create(
+            "kafka_server_Some_BrokerTopic_Metrics_Calls_count",
+            Map.of("name", "BytesOutPer-Sec", "topic", "test", "some_lbl", "123"),
+            BigDecimal.valueOf(10)
+        ),
+        metrics.get(2)
+    );
+  }
+
+  private static MBeanAttributeInfo createMbeanInfo(String name) {
+    return new MBeanAttributeInfo(name, "sometype-notused", null, true, true, false, null);
+  }
+
+  private void assertMetricsEqual(RawMetric expected, RawMetric actual) {
+    assertThat(actual.name()).isEqualTo(expected.name());
+    assertThat(actual.labels()).isEqualTo(expected.labels());
+    assertThat(actual.value()).isCloseTo(expected.value(), Offset.offset(new BigDecimal("0.001")));
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointMetricsParserTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointMetricsParserTest.java
new file mode 100644
index 00000000000..294215c8b18
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusEndpointMetricsParserTest.java
@@ -0,0 +1,30 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Map;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+
+class PrometheusEndpointMetricsParserTest {
+
+  @Test
+  void test() {
+    String metricsString =
+        "kafka_server_BrokerTopicMetrics_FifteenMinuteRate"
+            + "{name=\"BytesOutPerSec\",topic=\"__confluent.support.metrics\",} 123.1234";
+
+    Optional<RawMetric> parsedOpt = PrometheusEndpointMetricsParser.parse(metricsString);
+
+    assertThat(parsedOpt).hasValueSatisfying(metric -> {
+      assertThat(metric.name()).isEqualTo("kafka_server_BrokerTopicMetrics_FifteenMinuteRate");
+      assertThat(metric.value()).isEqualTo("123.1234");
+      assertThat(metric.labels()).containsExactlyEntriesOf(
+          Map.of(
+              "name", "BytesOutPerSec",
+              "topic", "__confluent.support.metrics"
+          ));
+    });
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java
new file mode 100644
index 00000000000..36d6c875814
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java
@@ -0,0 +1,64 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Map;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.test.StepVerifier;
+
+class PrometheusMetricsRetrieverTest {
+
+  private final PrometheusMetricsRetriever retriever = new PrometheusMetricsRetriever(WebClient.create());
+
+  private final MockWebServer mockWebServer = new MockWebServer();
+
+  @BeforeEach
+  void startMockServer() throws IOException {
+    mockWebServer.start();
+  }
+
+  @AfterEach
+  void stopMockServer() throws IOException {
+    mockWebServer.close();
+  }
+
+  @Test
+  void callsMetricsEndpointAndConvertsResponceToRawMetric() {
+    var url = mockWebServer.url("/metrics");
+    // body copied from real jmx exporter
+    MockResponse response = new MockResponse().setBody(
+        "# HELP kafka_server_KafkaRequestHandlerPool_FifteenMinuteRate Attribute exposed for management \n"
+            + "# TYPE kafka_server_KafkaRequestHandlerPool_FifteenMinuteRate untyped\n"
+            + "kafka_server_KafkaRequestHandlerPool_FifteenMinuteRate{name=\"RequestHandlerAvgIdlePercent\",} 0.898\n"
+            + "# HELP kafka_server_socket_server_metrics_request_size_avg The average size of requests sent. \n"
+            + "# TYPE kafka_server_socket_server_metrics_request_size_avg untyped\n"
+            + "kafka_server_socket_server_metrics_request_size_avg{listener=\"PLAIN\",networkProcessor=\"1\",} 101.1\n"
+            + "kafka_server_socket_server_metrics_request_size_avg{listener=\"PLAIN2\",networkProcessor=\"5\",} NaN"
+    );
+    mockWebServer.enqueue(response);
+
+    var firstMetric = RawMetric.create(
+        "kafka_server_KafkaRequestHandlerPool_FifteenMinuteRate",
+        Map.of("name", "RequestHandlerAvgIdlePercent"),
+        new BigDecimal("0.898")
+    );
+
+    var second = RawMetric.create(
+        "kafka_server_socket_server_metrics_request_size_avg",
+        Map.of("listener", "PLAIN", "networkProcessor", "1"),
+        new BigDecimal("101.1")
+    );
+
+    StepVerifier.create(retriever.retrieve(url.host(), url.port(), false))
+        .expectNext(firstMetric)
+        .expectNext(second)
+        // third metric should not be present, since it has "NaN" value
+        .verifyComplete();
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/WellKnownMetricsTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/WellKnownMetricsTest.java
new file mode 100644
index 00000000000..0917b684669
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/WellKnownMetricsTest.java
@@ -0,0 +1,66 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.Metrics;
+import java.math.BigDecimal;
+import java.util.Map;
+import org.apache.kafka.common.Node;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class WellKnownMetricsTest {
+
+  private final WellKnownMetrics wellKnownMetrics = new WellKnownMetrics();
+
+  @ParameterizedTest
+  @CsvSource({
+      //default jmx exporter format
+      //example: kafka_server_BrokerTopicMetrics_FifteenMinuteRate{name="BytesInPerSec",topic="test-topic",} 222.0
+      //example: kafka_server_BrokerTopicMetrics_FifteenMinuteRate{name="BytesOutPerSec",topic="test-topic",} 111.0
+      "kafka_server_BrokerTopicMetrics_FifteenMinuteRate, BytesInPerSec, BytesOutPerSec",
+
+      //default jmx exporter format, but lower-cased
+      //example: kafka_server_brokertopicmetrics_fifteenminuterate{name="bytesinpersec",topic="test-topic",} 222.0
+      //example: kafka_server_brokertopicmetrics_fifteenminuterate{name="bytesoutpersec",topic="test-topic",} 111.0
+      "kafka_server_brokertopicmetrics_fifteenminuterate, bytesinpersec, bytesoutpersec",
+
+      //unknown prefix metric name
+      "some_unknown_prefix_brokertopicmetrics_fifteenminuterate, bytesinpersec, bytesoutpersec",
+  })
+  void bytesIoTopicMetricsPopulated(String metricName, String bytesInLabel, String bytesOutLabel) {
+    var clusterParam = KafkaCluster.builder().build();
+    var nodeParam = new Node(0, "host", 123);
+
+    var in = RawMetric.create(metricName, Map.of("name", bytesInLabel, "topic", "test-topic"), new BigDecimal("1.0"));
+    var out = RawMetric.create(metricName, Map.of("name", bytesOutLabel, "topic", "test-topic"), new BigDecimal("2.0"));
+
+    // feeding metrics
+    for (int i = 0; i < 3; i++) {
+      wellKnownMetrics.populate(clusterParam, nodeParam, in);
+      wellKnownMetrics.populate(clusterParam, nodeParam, out);
+    }
+
+    assertThat(wellKnownMetrics.bytesInFifteenMinuteRate)
+        .containsEntry("test-topic", new BigDecimal("3.0"));
+
+    assertThat(wellKnownMetrics.bytesOutFifteenMinuteRate)
+        .containsEntry("test-topic", new BigDecimal("6.0"));
+  }
+
+  @Test
+  void appliesInnerStateToMetricsBuilder() {
+    wellKnownMetrics.bytesInFifteenMinuteRate.put("topic", new BigDecimal(1));
+    wellKnownMetrics.bytesOutFifteenMinuteRate.put("topic", new BigDecimal(2));
+
+    Metrics.MetricsBuilder builder = Metrics.builder();
+    wellKnownMetrics.apply(builder);
+    var metrics = builder.build();
+
+    assertThat(metrics.getBytesInPerSec()).containsExactlyEntriesOf(wellKnownMetrics.bytesInFifteenMinuteRate);
+    assertThat(metrics.getBytesOutPerSec()).containsExactlyEntriesOf(wellKnownMetrics.bytesOutFifteenMinuteRate);
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/NumberUtilTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/NumberUtilTest.java
deleted file mode 100644
index 1c85d655350..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/NumberUtilTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class NumberUtilTest {
-
-  @Test
-  void shouldReturnFalseWhenNonNumeric() {
-    Assertions.assertFalse(NumberUtil.isNumeric(Double.POSITIVE_INFINITY));
-    Assertions.assertFalse(NumberUtil.isNumeric(Double.NEGATIVE_INFINITY));
-    Assertions.assertFalse(NumberUtil.isNumeric(Double.NaN));
-    Assertions.assertFalse(NumberUtil.isNumeric(null));
-    Assertions.assertFalse(NumberUtil.isNumeric(" "));
-    Assertions.assertFalse(NumberUtil.isNumeric(new Object()));
-    Assertions.assertFalse(NumberUtil.isNumeric("1231asd"));
-  }
-
-  @Test
-  void shouldReturnTrueWhenNumeric() {
-    Assertions.assertTrue(NumberUtil.isNumeric("123.45"));
-    Assertions.assertTrue(NumberUtil.isNumeric(123.45));
-    Assertions.assertTrue(NumberUtil.isNumeric(123));
-    Assertions.assertTrue(NumberUtil.isNumeric(-123.45));
-    Assertions.assertTrue(NumberUtil.isNumeric(-1e-10));
-    Assertions.assertTrue(NumberUtil.isNumeric(1e-10));
-  }
-}
\ No newline at end of file
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 86e939562a2..68b8afa65a3 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2572,16 +2572,12 @@ components:
       properties:
         name:
           type: string
-        canonicalName:
-          type: string
-        params:
+        labels:
           type: string
           additionalProperties:
             type: string
         value:
-          type: string
-          additionalProperties:
-            type: number
+          type: number
 
     TopicLogdirs:
       type: object
diff --git a/pom.xml b/pom.xml
index c8b8d5d5c3c..c01fb507dd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,7 @@
         <confluent.version>7.0.1</confluent.version>
         <apache.commons.version>2.11.1</apache.commons.version>
         <test.containers.version>1.17.1</test.containers.version>
+        <okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>
         <junit-jupiter-engine.version>5.7.2</junit-jupiter-engine.version>
         <mockito.version>2.21.0</mockito.version>
         <assertj.version>3.19.0</assertj.version>

From 67eea972f77c1e133e9e7360740189a0fa3373f2 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Fri, 7 Oct 2022 15:01:58 +0300
Subject: [PATCH 202/734] Create navigation thru the app using web driver
 (#2701)

* [e2e] create navigation thru the app using web driver #2642

* [e2e]Fix create navigation thru the app using web driver #2642

* [e2e]Fix create navigation thru the app using web driver #2642

* [e2e]Fix2 create navigation thru the app using web driver #2642

* [e2e]Fix3 create navigation thru the app using web driver #2642

* [e2e]Fix4 create navigation thru the app using web driver #2642

* [e2e]Fix5 create navigation thru the app using web driver #2642

* [e2e]Fix6 create navigation thru the app using web driver #2642

* [e2e]Fix7 create navigation thru the app using web driver #2642

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../pages/{MainPage.java => NaviSideBar.java} |  59 +++++-----
 .../ui/pages/connector/KafkaConnectList.java  |  10 --
 .../ui/pages/schema/SchemaCreateForm.java     |   7 ++
 .../ui/pages/schema/SchemaRegistryList.java   |   7 ++
 .../ui/pages/topic/ProduceMessagePanel.java   |   2 +-
 .../kafka/ui/pages/topic/TopicDetails.java    |  18 ++-
 .../kafka/ui/pages/topic/TopicsList.java      |  24 +---
 .../provectus/kafka/ui/settings/Source.java   |   1 +
 .../com/provectus/kafka/ui/SmokeTests.java    |   2 -
 .../com/provectus/kafka/ui/base/BaseTest.java |  12 +-
 .../com/provectus/kafka/ui/base/Facade.java   |   4 +-
 .../com/provectus/kafka/ui/base/Setup.java    |  15 +++
 .../kafka/ui/tests/ConnectorsTests.java       |  38 ++++--
 .../kafka/ui/tests/SchemasTests.java          | 108 ++++++++++++------
 .../provectus/kafka/ui/tests/TopicTests.java  |  72 ++++++++----
 15 files changed, 230 insertions(+), 149 deletions(-)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{MainPage.java => NaviSideBar.java} (50%)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
similarity index 50%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
index ba93f0535c7..30796617122 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
@@ -1,58 +1,55 @@
 package com.provectus.kafka.ui.pages;
 
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.utilities.WaitUtils;
-import com.provectus.kafka.ui.settings.Source;
 import io.qameta.allure.Step;
-import lombok.experimental.ExtensionMethod;
-import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.$;
+import java.time.Duration;
+
 import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 
-@ExtensionMethod({WaitUtils.class})
-public class MainPage {
+public class NaviSideBar {
 
-    private static final String path = "/";
+    @Step
+    public NaviSideBar waitUntilScreenReady() {
+        $x("//*[contains(text(),'Loading')]").shouldBe(Condition.disappear, Duration.ofSeconds(30));
+        $x("//a[@title='Dashboard']").shouldBe(Condition.visible, Duration.ofSeconds(30));
+        return this;
+    }
 
     @Step
-    public MainPage goTo() {
-        Selenide.open(Source.BASE_WEB_URL + path);
+    public NaviSideBar openSideMenu(String clusterName, SideMenuOption option) {
+        SelenideElement clusterElement = $x(String.format("//aside/ul/li[contains(.,'%s')]", clusterName)).shouldBe(Condition.visible);
+        if (clusterElement.parent().$$x(".//ul").size() == 0) {
+            clusterElement.click();
+        }
+        clusterElement
+                .parent()
+                .$x(String.format(".//ul/li[contains(.,'%s')]", option.value))
+                .click();
         return this;
     }
 
     @Step
-    public MainPage waitUntilScreenReady() {
-        $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
-        $("input[name=switchRoundedDefault]").parent().$("span").shouldBe(Condition.visible);
+    public NaviSideBar openSideMenu(SideMenuOption option) {
+        openSideMenu(CLUSTER_NAME, option);
         return this;
     }
 
-    public enum SideMenuOptions {
+
+    public enum SideMenuOption {
         BROKERS("Brokers"),
         TOPICS("Topics"),
         CONSUMERS("Consumers"),
-        SCHEMA_REGISTRY("Schema Registry");
+        SCHEMA_REGISTRY("Schema Registry"),
+        KAFKA_CONNECT("Kafka Connect"),
+        KSQL_DB("KSQL DB");
 
         final String value;
 
-        SideMenuOptions(String value) {
+        SideMenuOption(String value) {
             this.value = value;
         }
     }
-
-    @Step
-    public MainPage goToSideMenu(String clusterName, SideMenuOptions option) {
-        SelenideElement clusterElement = $x(String.format("//aside/ul/li[contains(.,'%s')]", clusterName)).shouldBe(Condition.visible);
-        if (clusterElement.parent().$$x(".//ul").size() == 0) {
-            clusterElement.click();
-        }
-        clusterElement
-                .parent()
-                .$x(String.format(".//ul/li[contains(.,'%s')]", option.value))
-                .click();
-        return this;
-    }
-}
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
index 70993072dfd..b5986c7919e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
@@ -1,8 +1,6 @@
 package com.provectus.kafka.ui.pages.connector;
 
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.settings.Source;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
@@ -16,14 +14,6 @@
 @ExtensionMethod(WaitUtils.class)
 public class KafkaConnectList {
 
-    private static final String path = "/ui/clusters/%s/connectors";
-
-    @Step("Open URL to {cluster}")
-    public KafkaConnectList goTo(String cluster) {
-        Selenide.open(Source.BASE_WEB_URL + String.format(path, cluster));
-        return this;
-    }
-
     @Step
     public KafkaConnectList waitUntilScreenReady() {
         $(By.xpath("//h1[text()='Connectors']")).shouldBe(Condition.visible);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
index fec5db8b2e7..0f223ada78e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.pages.schema;
 
+import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
@@ -20,6 +21,12 @@ public class SchemaCreateForm {
     protected SelenideElement newSchemaTextArea = $("#newSchema [wrap]");
     protected SelenideElement schemaTypeDropDown = $x("//ul[@name='schemaType']");
 
+    @Step
+    public SchemaCreateForm waitUntilScreenReady() {
+        $x("//h1['Edit']").shouldBe(Condition.visible);
+        return this;
+    }
+
     @Step
     public SchemaCreateForm setSubjectName(String name) {
         subjectName.setValue(name);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index eb378be3db6..d37981d3044 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -14,6 +14,13 @@ public class SchemaRegistryList {
 
     private final SelenideElement schemaButton = $(By.xpath("//*[contains(text(),'Create Schema')]"));
 
+    @Step
+    public SchemaRegistryList waitUntilScreenReady(){
+        $x("//*[contains(text(),'Loading')]").shouldBe(Condition.disappear);
+        $x("//button[contains(text(),'Create Schema')]").shouldBe(Condition.visible);
+        return this;
+    }
+
     @Step
     public SchemaCreateForm clickCreateSchema() {
         clickByJavaScript(schemaButton);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
index d6ecebcd7a7..62d619a5394 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
@@ -43,6 +43,6 @@ public TopicDetails submitProduceMessage() {
         submitBtn.shouldBe(Condition.enabled).click();
         submitBtn.shouldBe(Condition.disappear);
         refresh();
-        return new TopicDetails().waitUntilScreenReady();
+        return new TopicDetails();
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index e0400bea37b..123c3d76eec 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -1,9 +1,7 @@
 package com.provectus.kafka.ui.pages.topic;
 
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.settings.Source;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
@@ -15,15 +13,8 @@
 @ExtensionMethod({WaitUtils.class})
 public class TopicDetails {
 
-    private static final String URL_PATH = "/ui/clusters/%s/topics/%s";
     protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
 
-    @Step
-    public TopicDetails goTo(String cluster, String topic) {
-        Selenide.open(Source.BASE_WEB_URL + String.format(URL_PATH, cluster, topic));
-        return this;
-    }
-
     @Step
     public TopicDetails waitUntilScreenReady() {
         $(By.linkText("Overview")).shouldBe(Condition.visible);
@@ -70,7 +61,9 @@ public boolean isContentMessageVisible(String contentMessage) {
     }
 
     private enum DotMenuHeaderItems {
-        EDIT_SETTINGS("Edit settings"), CLEAR_MESSAGES("Clear messages"), REMOVE_TOPIC("Remove topic");
+        EDIT_SETTINGS("Edit settings"),
+        CLEAR_MESSAGES("Clear messages"),
+        REMOVE_TOPIC("Remove topic");
 
         private final String value;
 
@@ -89,7 +82,10 @@ public String toString() {
     }
 
     public enum TopicMenu {
-        OVERVIEW("Overview"), MESSAGES("Messages"), CONSUMERS("Consumers"), SETTINGS("Settings");
+        OVERVIEW("Overview"),
+        MESSAGES("Messages"),
+        CONSUMERS("Consumers"),
+        SETTINGS("Settings");
 
         private final String value;
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 3412e0d5da8..0097bdb91a3 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -1,29 +1,19 @@
 package com.provectus.kafka.ui.pages.topic;
 
-import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
-import com.provectus.kafka.ui.settings.Source;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.*;
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 @ExtensionMethod(WaitUtils.class)
 public class TopicsList {
 
-    private static final String path = "/ui/clusters/%s/all-topics";
-
-    @Step
-    public TopicsList goTo(String cluster) {
-        Selenide.open(Source.BASE_WEB_URL + String.format(path, cluster));
-        return this;
-    }
-
     @Step
     public TopicsList waitUntilScreenReady() {
         $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
@@ -48,14 +38,4 @@ public TopicDetails openTopic(String topicName) {
         $(By.linkText(topicName)).click();
         return new TopicDetails();
     }
-
-    @Step
-    public TopicsList isTopicNotVisible(String topicName) {
-        $$x("//table/tbody/tr/td[2]")
-                .shouldBe(CollectionCondition.sizeGreaterThan(0))
-                .find(Condition.exactText(topicName))
-                .shouldBe(Condition.not(Condition.visible));
-        return this;
-    }
-
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java
index f1c780214cb..0cbd7ae7c39 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java
@@ -4,4 +4,5 @@ public abstract class Source {
 
   public static String BASE_API_URL = System.getProperty("BASE_URL", "http://localhost:8080");
   public static String BASE_WEB_URL = System.getProperty("BASE_DOCKER_URL", "http://host.testcontainers.internal:8080");
+  public static final String CLUSTER_NAME = "local";
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
index c9c560c3edc..e876d3a634b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
@@ -14,8 +14,6 @@ public class SmokeTests extends BaseTest {
     @CaseId(198)
     @DisplayName("main page should load")
     void mainPageLoads() {
-        mainPage.goTo()
-                .waitUntilScreenReady();
         compareScreenshots("main");
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index a864a36eb2c..a3086fd7151 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -1,5 +1,7 @@
 package com.provectus.kafka.ui.base;
 
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.TestCaseGenerator;
@@ -22,9 +24,10 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
 
-import static com.provectus.kafka.ui.base.Setup.clearReports;
-import static com.provectus.kafka.ui.base.Setup.setup;
+import static com.provectus.kafka.ui.base.Setup.*;
+import static com.provectus.kafka.ui.settings.Source.BASE_WEB_URL;
 
 @Slf4j
 @DisplayNameGeneration(DisplayNameGenerator.class)
@@ -32,8 +35,6 @@ public class BaseTest extends Facade {
 
   private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
   private static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
-  protected static final String CLUSTER_NAME = "local";
-
   private final Screenshooter screenshooter = new Screenshooter();
 
   protected static BrowserWebDriverContainer<?> webDriverContainer = null;
@@ -55,6 +56,8 @@ public void setWebDriver() {
     RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
     WebDriverRunner.setWebDriver(remoteWebDriver);
     remoteWebDriver.manage().window().setSize(new Dimension(1440, 1024));
+    Selenide.open(BASE_WEB_URL);
+    naviSideBar.waitUntilScreenReady();
   }
 
   @BeforeAll
@@ -118,5 +121,6 @@ public void afterMethod() {
     Allure.addAttachment("Screenshot",
         new ByteArrayInputStream(
             ((TakesScreenshot) webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
+    browserClear();
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
index 46e17e0b961..8d3aea55d4f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.base;
 
 import com.provectus.kafka.ui.helpers.ApiHelper;
-import com.provectus.kafka.ui.pages.MainPage;
+import com.provectus.kafka.ui.pages.NaviSideBar;
 import com.provectus.kafka.ui.pages.connector.ConnectorCreateForm;
 import com.provectus.kafka.ui.pages.connector.ConnectorDetails;
 import com.provectus.kafka.ui.pages.connector.KafkaConnectList;
@@ -14,7 +14,6 @@
 import com.provectus.kafka.ui.pages.topic.TopicsList;
 
 public abstract class Facade {
-    protected MainPage mainPage = new MainPage();
     protected ApiHelper apiHelper = new ApiHelper();
     protected ConnectorCreateForm connectorCreateForm = new ConnectorCreateForm();
     protected KafkaConnectList kafkaConnectList = new KafkaConnectList();
@@ -26,4 +25,5 @@ public abstract class Facade {
     protected TopicCreateEditForm topicCreateEditForm = new TopicCreateEditForm();
     protected TopicsList topicsList = new TopicsList();
     protected TopicDetails topicDetails = new TopicDetails();
+    protected NaviSideBar naviSideBar = new NaviSideBar();
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
index 954acb37ba7..2f64699eb26 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
@@ -2,13 +2,19 @@
 
 import com.codeborne.selenide.Configuration;
 import com.codeborne.selenide.logevents.SelenideLogger;
+import io.qameta.allure.Step;
 import io.qameta.allure.selenide.AllureSelenide;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.io.File;
 import java.util.Arrays;
 
+import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.settings.Source.BASE_WEB_URL;
+
 @Slf4j
 public abstract class Setup {
 
@@ -38,4 +44,13 @@ public static void clearReports() {
             }
         }
     }
+
+    @Step
+    public static void browserClear() {
+        log.debug("browserClear");
+        clearBrowserLocalStorage();
+        clearBrowserCookies();
+        refresh();
+        log.debug("=> DONE");
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 4cc0c783e4b..bc69eeee6f0 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -12,6 +12,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -60,14 +62,19 @@ public void createConnector() {
         Connector connectorForCreate = new Connector()
                 .setName("sink_postgres_activities_e2e_checks")
                 .setConfig(getResourceAsString("config_for_create_connector.json"));
-        kafkaConnectList.goTo(CLUSTER_NAME)
+        naviSideBar
+                .openSideMenu(KAFKA_CONNECT);
+        kafkaConnectList
                 .waitUntilScreenReady()
-                .clickCreateConnectorButton()
+                .clickCreateConnectorButton();
+        connectorCreateForm
                 .waitUntilScreenReady()
                 .setConnectorConfig(connectorForCreate.getName(), connectorForCreate.getConfig());
-        kafkaConnectList.goTo(CLUSTER_NAME)
+        naviSideBar
+                .openSideMenu(KAFKA_CONNECT);
+        kafkaConnectList
                 .waitUntilScreenReady();
-        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(connectorForCreate.getName()),"isConnectorVisible()");
+        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(connectorForCreate.getName()), "isConnectorVisible()");
         CONNECTOR_LIST.add(connectorForCreate);
     }
 
@@ -77,14 +84,20 @@ public void createConnector() {
     @CaseId(196)
     @Test
     public void updateConnector() {
-        kafkaConnectList.goTo(CLUSTER_NAME)
+        naviSideBar
+                .openSideMenu(KAFKA_CONNECT);
+        kafkaConnectList
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_UPDATE.getName());
-        connectorDetails.waitUntilScreenReady()
+        connectorDetails
+                .waitUntilScreenReady()
                 .openConfigTab()
                 .setConfig(CONNECTOR_FOR_UPDATE.getConfig());
-        kafkaConnectList.goTo(CLUSTER_NAME);
-        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()),"isConnectorVisible()");
+        naviSideBar
+                .openSideMenu(KAFKA_CONNECT);
+        kafkaConnectList
+                .waitUntilScreenReady();
+        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()), "isConnectorVisible()");
     }
 
     @DisplayName("should delete connector")
@@ -93,7 +106,9 @@ public void updateConnector() {
     @CaseId(195)
     @Test
     public void deleteConnector() {
-        kafkaConnectList.goTo(CLUSTER_NAME)
+        naviSideBar
+                .openSideMenu(KAFKA_CONNECT);
+        kafkaConnectList
                 .waitUntilScreenReady()
                 .openConnector(CONNECTOR_FOR_DELETE.getName());
         connectorDetails
@@ -101,7 +116,10 @@ public void deleteConnector() {
                 .openDotMenu()
                 .clickDeleteButton()
                 .clickConfirmButton();
-        kafkaConnectList.goTo(CLUSTER_NAME);
+        naviSideBar
+                .openSideMenu(KAFKA_CONNECT);
+        kafkaConnectList
+                .waitUntilScreenReady();
         Assertions.assertFalse(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
         CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index b8139024e7b..8fa81c98b17 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -3,8 +3,6 @@
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Schema;
-import com.provectus.kafka.ui.pages.MainPage;
-import com.provectus.kafka.ui.pages.schema.SchemaDetails;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
@@ -15,6 +13,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.SCHEMA_REGISTRY;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -42,16 +42,22 @@ public void beforeAll() {
     @Order(1)
     void createSchemaAvro() {
         Schema schemaAvro = Schema.createSchemaAvro();
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        schemaRegistryList.clickCreateSchema()
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
+                .waitUntilScreenReady()
+                .clickCreateSchema();
+        schemaCreateForm
                 .setSubjectName(schemaAvro.getName())
                 .setSchemaField(fileToString(schemaAvro.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaAvro.getType())
-                .clickSubmit()
+                .clickSubmit();
+        schemaDetails
+                .waitUntilScreenReady();
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
                 .waitUntilScreenReady();
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         Assertions.assertTrue(schemaRegistryList.isSchemaVisible(schemaAvro.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaAvro);
     }
@@ -64,17 +70,24 @@ void createSchemaAvro() {
     @Order(2)
     void updateSchemaAvro() {
         AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_for_update.json");
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        schemaRegistryList.openSchema(AVRO_API.getName())
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
+                .waitUntilScreenReady()
+                .openSchema(AVRO_API.getName());
+        schemaDetails
                 .waitUntilScreenReady()
                 .openEditSchema();
+        schemaCreateForm
+                .waitUntilScreenReady();
         Assertions.assertTrue(schemaCreateForm.isSchemaDropDownDisabled(),"isSchemaDropDownDisabled()");
-        schemaCreateForm.selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
+        schemaCreateForm
+                .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
-                .clickSubmit()
+                .clickSubmit();
+        schemaDetails
                 .waitUntilScreenReady();
-        Assertions.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), new SchemaDetails().getCompatibility(), "getCompatibility()");
+        Assertions.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), schemaDetails.getCompatibility(), "getCompatibility()");
     }
 
     @DisplayName("should delete AVRO schema")
@@ -84,11 +97,16 @@ void updateSchemaAvro() {
     @Test
     @Order(3)
     void deleteSchemaAvro() {
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        schemaRegistryList.openSchema(AVRO_API.getName())
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
+                .waitUntilScreenReady()
+                .openSchema(AVRO_API.getName());
+        schemaDetails
                 .waitUntilScreenReady()
                 .removeSchema();
+        schemaRegistryList
+                .waitUntilScreenReady();
         Assertions.assertFalse(schemaRegistryList.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.remove(AVRO_API);
     }
@@ -101,15 +119,22 @@ void deleteSchemaAvro() {
     @Order(4)
     void createSchemaJson() {
         Schema schemaJson = Schema.createSchemaJson();
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        schemaRegistryList.clickCreateSchema()
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
+                .waitUntilScreenReady()
+                .clickCreateSchema();
+        schemaCreateForm
                 .setSubjectName(schemaJson.getName())
                 .setSchemaField(fileToString(schemaJson.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaJson.getType())
-                .clickSubmit()
+                .clickSubmit();
+        schemaDetails
+                .waitUntilScreenReady();
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
                 .waitUntilScreenReady();
-        mainPage.goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         Assertions.assertTrue(schemaRegistryList.isSchemaVisible(schemaJson.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaJson);
     }
@@ -121,11 +146,16 @@ void createSchemaJson() {
     @Test
     @Order(5)
     void deleteSchemaJson() {
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        schemaRegistryList.openSchema(JSON_API.getName())
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
+                .waitUntilScreenReady()
+                .openSchema(JSON_API.getName());
+        schemaDetails
                 .waitUntilScreenReady()
                 .removeSchema();
+        schemaRegistryList
+                .waitUntilScreenReady();
         Assertions.assertFalse(schemaRegistryList.isSchemaVisible(JSON_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.remove(JSON_API);
     }
@@ -138,15 +168,22 @@ void deleteSchemaJson() {
     @Order(6)
     void createSchemaProtobuf() {
         Schema schemaProtobuf = Schema.createSchemaProtobuf();
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        schemaRegistryList.clickCreateSchema()
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
+                .waitUntilScreenReady()
+                .clickCreateSchema();
+        schemaCreateForm
                 .setSubjectName(schemaProtobuf.getName())
                 .setSchemaField(fileToString(schemaProtobuf.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaProtobuf.getType())
-                .clickSubmit()
+                .clickSubmit();
+        schemaDetails
+                .waitUntilScreenReady();
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
                 .waitUntilScreenReady();
-        mainPage.goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
         Assertions.assertTrue(schemaRegistryList.isSchemaVisible(schemaProtobuf.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaProtobuf);
     }
@@ -158,11 +195,16 @@ void createSchemaProtobuf() {
     @Test
     @Order(7)
     void deleteSchemaProtobuf() {
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
-        schemaRegistryList.openSchema(PROTOBUF_API.getName())
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
+                .waitUntilScreenReady()
+                .openSchema(PROTOBUF_API.getName());
+        schemaDetails
                 .waitUntilScreenReady()
                 .removeSchema();
+        schemaRegistryList
+                .waitUntilScreenReady();
         Assertions.assertFalse(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.remove(PROTOBUF_API);
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 03628ecbfd3..378190c6302 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -2,7 +2,6 @@
 
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.MainPage;
 import com.provectus.kafka.ui.pages.topic.TopicDetails;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
@@ -14,6 +13,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -44,15 +45,21 @@ public void beforeAll() {
     @Test
     public void createTopic() {
         Topic topicToCreate = new Topic().setName("new-topic");
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS);
-        topicsList.pressCreateNewTopic()
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
+                .waitUntilScreenReady()
+                .pressCreateNewTopic();
+        topicCreateEditForm
                 .setTopicName(topicToCreate.getName())
-                .sendData()
+                .sendData();
+        topicDetails
+                .waitUntilScreenReady();
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
                 .waitUntilScreenReady();
-        mainPage.goTo()
-                .goToSideMenu(CLUSTER_NAME, MainPage.SideMenuOptions.TOPICS);
-        Assertions.assertTrue(topicsList.isTopicVisible(topicToCreate.getName()),"isTopicVisible");
+        Assertions.assertTrue(topicsList.isTopicVisible(topicToCreate.getName()), "isTopicVisible");
         TOPIC_LIST.add(topicToCreate);
     }
 
@@ -63,21 +70,29 @@ public void createTopic() {
     @CaseId(197)
     @Test
     public void updateTopic() {
-        topicsList.goTo(CLUSTER_NAME)
-                .waitUntilScreenReady();
-        topicsList.openTopic(TOPIC_FOR_UPDATE.getName())
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
+                .waitUntilScreenReady()
+                .openTopic(TOPIC_FOR_UPDATE.getName());
+        topicDetails
                 .waitUntilScreenReady()
-                .openEditSettings()
+                .openEditSettings();
+        topicCreateEditForm
                 .selectCleanupPolicy(TOPIC_FOR_UPDATE.getCompactPolicyValue())
                 .setMinInsyncReplicas(10)
                 .setTimeToRetainDataInMs(TOPIC_FOR_UPDATE.getTimeToRetainData())
                 .setMaxSizeOnDiskInGB(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
                 .setMaxMessageBytes(TOPIC_FOR_UPDATE.getMaxMessageBytes())
-                .sendData()
-                .waitUntilScreenReady();
-        topicsList.goTo(CLUSTER_NAME)
+                .sendData();
+        topicDetails
                 .waitUntilScreenReady();
-        topicsList.openTopic(TOPIC_FOR_UPDATE.getName())
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
+                .waitUntilScreenReady()
+                .openTopic(TOPIC_FOR_UPDATE.getName());
+        topicDetails
                 .waitUntilScreenReady()
                 .openEditSettings();
         SoftAssertions softly = new SoftAssertions();
@@ -94,14 +109,19 @@ public void updateTopic() {
     @CaseId(207)
     @Test
     public void deleteTopic() {
-        topicsList.goTo(CLUSTER_NAME)
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
                 .waitUntilScreenReady()
-                .openTopic(TOPIC_FOR_DELETE.getName())
+                .openTopic(TOPIC_FOR_DELETE.getName());
+        topicDetails
                 .waitUntilScreenReady()
                 .deleteTopic();
-        topicsList.goTo(CLUSTER_NAME)
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
                 .waitUntilScreenReady();
-        Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()),"isTopicVisible");
+        Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
         TOPIC_LIST.remove(TOPIC_FOR_DELETE);
     }
 
@@ -111,15 +131,21 @@ public void deleteTopic() {
     @CaseId(222)
     @Test
     void produceMessage() {
-        topicsList.goTo(CLUSTER_NAME)
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
                 .waitUntilScreenReady()
-                .openTopic(TOPIC_FOR_UPDATE.getName())
+                .openTopic(TOPIC_FOR_UPDATE.getName());
+        topicDetails
                 .waitUntilScreenReady()
                 .openTopicMenu(TopicDetails.TopicMenu.MESSAGES)
-                .clickOnButton("Produce Message")
+                .clickOnButton("Produce Message");
+        produceMessagePanel
                 .setContentFiled(TOPIC_FOR_UPDATE.getMessageContent())
                 .setKeyField(TOPIC_FOR_UPDATE.getMessageKey())
                 .submitProduceMessage();
+        topicDetails
+                .waitUntilScreenReady();
         SoftAssertions softly = new SoftAssertions();
         softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_UPDATE.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
         softly.assertThat(topicDetails.isContentMessageVisible((TOPIC_FOR_UPDATE.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();

From 80eb2dccfea9b15b64e927493fbbc5158549c935 Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Fri, 7 Oct 2022 17:04:21 +0400
Subject: [PATCH 203/734] Unify tabs placement (#2637)

* Unify tabs placement

* moved topic page pane

* change

* remove topic pane change

* fix ConnectorsTests

Co-authored-by: Oleg Shur <workshur@gmail.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../ui/pages/connector/ConnectorDetails.java  |  1 -
 .../utilities/qaseIoUtils/QaseExtension.java  |  1 -
 .../Connect/Details/DetailsPage.tsx           | 19 ++----------------
 .../Details/__tests__/DetailsPage.spec.tsx    | 20 +++++++------------
 4 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
index a63a1f47c16..82768781d4d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
@@ -22,7 +22,6 @@ public class ConnectorDetails {
     public ConnectorDetails waitUntilScreenReady() {
         $(By.xpath("//a[text() ='Tasks']")).shouldBe(Condition.visible);
         $(By.xpath("//a[text() ='Config']")).shouldBe(Condition.visible);
-        $(By.xpath("//a[text() ='Overview']")).shouldBe(Condition.visible);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
index fcc19f31e2d..52c3ff9b908 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
@@ -37,7 +37,6 @@ public class QaseExtension implements TestExecutionListener {
     private static final String QASE_PROJECT = "KAFKAUI";
     private static final String QASE_ENABLE = "true";
 
-
     static {
         String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
         if (qaseApiToken == null || StringUtils.isEmpty(qaseApiToken)) {
diff --git a/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx b/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx
index 2ec9632b5e0..a5175ea8bfa 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/DetailsPage.tsx
@@ -5,8 +5,6 @@ import {
   clusterConnectConnectorConfigPath,
   clusterConnectConnectorConfigRelativePath,
   clusterConnectConnectorPath,
-  clusterConnectConnectorTasksPath,
-  clusterConnectConnectorTasksRelativePath,
   clusterConnectorsPath,
   RouterParamsClusterConnectConnector,
 } from 'lib/paths';
@@ -32,6 +30,7 @@ const DetailsPage: React.FC = () => {
       >
         <Actions />
       </PageHeading>
+      <Overview />
       <Navbar role="navigation">
         <NavLink
           to={clusterConnectConnectorPath(
@@ -41,16 +40,6 @@ const DetailsPage: React.FC = () => {
           )}
           className={({ isActive }) => (isActive ? 'is-active' : '')}
           end
-        >
-          Overview
-        </NavLink>
-        <NavLink
-          to={clusterConnectConnectorTasksPath(
-            clusterName,
-            connectName,
-            connectorName
-          )}
-          className={({ isActive }) => (isActive ? 'is-active' : '')}
         >
           Tasks
         </NavLink>
@@ -67,11 +56,7 @@ const DetailsPage: React.FC = () => {
       </Navbar>
       <Suspense fallback={<PageLoader />}>
         <Routes>
-          <Route index element={<Overview />} />
-          <Route
-            path={clusterConnectConnectorTasksRelativePath}
-            element={<Tasks />}
-          />
+          <Route index element={<Tasks />} />
           <Route
             path={clusterConnectConnectorConfigRelativePath}
             element={<Config />}
diff --git a/kafka-ui-react-app/src/components/Connect/Details/__tests__/DetailsPage.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/__tests__/DetailsPage.spec.tsx
index 8971111d4ba..46aa1037bef 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/__tests__/DetailsPage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/__tests__/DetailsPage.spec.tsx
@@ -3,14 +3,13 @@ import { render, WithRoute } from 'lib/testHelpers';
 import {
   clusterConnectConnectorConfigPath,
   clusterConnectConnectorPath,
-  clusterConnectConnectorTasksPath,
   getNonExactPath,
 } from 'lib/paths';
 import { screen } from '@testing-library/dom';
 import DetailsPage from 'components/Connect/Details/DetailsPage';
 
 const DetailsCompText = {
-  overview: 'Overview Page',
+  overview: 'Overview Pane',
   tasks: 'Tasks Page',
   config: 'Config Page',
   actions: 'Actions',
@@ -55,19 +54,14 @@ describe('Details Page', () => {
     expect(screen.getByText(DetailsCompText.actions));
   });
 
-  describe('Router component tests', () => {
-    it('should test if overview is rendering', () => {
-      renderComponent();
-      expect(screen.getByText(DetailsCompText.overview));
-    });
+  it('renders overview pane', () => {
+    renderComponent();
+    expect(screen.getByText(DetailsCompText.overview));
+  });
 
+  describe('Router component tests', () => {
     it('should test if tasks is rendering', () => {
-      const path = clusterConnectConnectorTasksPath(
-        clusterName,
-        connectName,
-        connectorName
-      );
-      renderComponent(path);
+      renderComponent();
       expect(screen.getByText(DetailsCompText.tasks));
     });
 

From 7d5b7de992da9ddb1a018a6a61db66c4dcb204aa Mon Sep 17 00:00:00 2001
From: Kris-K-Dev <92114648+Kris-K-Dev@users.noreply.github.com>
Date: Fri, 7 Oct 2022 11:20:22 -0400
Subject: [PATCH 204/734] =?UTF-8?q?#2325=20Make=20connectors=20table=20row?=
 =?UTF-8?q?s=20clickable=20and=20#2076=20Implement=20connec=E2=80=A6=20(#2?=
 =?UTF-8?q?689)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* #2325 Make connectors table rows clickable and #2076 Implement connectors sorting

* #2325 fix status sorting

* fix ConnectorsTests

* #2325 code review

* #2325 add test coverage

* #2325 code review fix

* #2325 fix redirects for topics

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../ui/pages/connector/KafkaConnectList.java  |   4 +-
 .../components/Connect/List/ActionsCell.tsx   |  43 ++++++
 .../components/Connect/List/List.styled.ts    |   6 +
 .../src/components/Connect/List/List.tsx      |  65 ++++----
 .../src/components/Connect/List/ListItem.tsx  |  98 ------------
 .../Connect/List/RunningTasksCell.tsx         |  21 +++
 .../components/Connect/List/TopicsCell.tsx    |  45 ++++++
 .../Connect/List/__tests__/List.spec.tsx      | 139 +++++++++++++-----
 .../Connect/List/__tests__/ListItem.spec.tsx  |  53 -------
 9 files changed, 254 insertions(+), 220 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
 create mode 100644 kafka-ui-react-app/src/components/Connect/List/RunningTasksCell.tsx
 create mode 100644 kafka-ui-react-app/src/components/Connect/List/TopicsCell.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
index b5986c7919e..89a73ff6931 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
@@ -28,14 +28,14 @@ public ConnectorCreateForm clickCreateConnectorButton() {
 
     @Step
     public KafkaConnectList openConnector(String connectorName) {
-        $(By.linkText(connectorName)).click();
+        $x("//tbody//td[1][text()='" + connectorName + "']").shouldBe(Condition.enabled).click();
         return this;
     }
 
     @Step
     public boolean isConnectorVisible(String connectorName) {
         $(By.xpath("//table")).shouldBe(Condition.visible);
-        return isVisible($x("//tbody//td[1]//a[text()='" + connectorName + "']"));
+        return isVisible($x("//tbody//td[1][text()='" + connectorName + "']"));
     }
 
     @Step
diff --git a/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx b/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx
new file mode 100644
index 00000000000..30b3df8a56d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { FullConnectorInfo } from 'generated-sources';
+import { CellContext } from '@tanstack/react-table';
+import { ClusterNameRoute } from 'lib/paths';
+import useAppParams from 'lib/hooks/useAppParams';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { useDeleteConnector } from 'lib/hooks/api/kafkaConnect';
+import { useConfirm } from 'lib/hooks/useConfirm';
+
+const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
+  row,
+}) => {
+  const { connect, name } = row.original;
+
+  const { clusterName } = useAppParams<ClusterNameRoute>();
+
+  const confirm = useConfirm();
+  const deleteMutation = useDeleteConnector({
+    clusterName,
+    connectName: connect,
+    connectorName: name,
+  });
+
+  const handleDelete = () => {
+    confirm(
+      <>
+        Are you sure want to remove <b>{name}</b> connector?
+      </>,
+      async () => {
+        await deleteMutation.mutateAsync();
+      }
+    );
+  };
+  return (
+    <Dropdown>
+      <DropdownItem onClick={handleDelete} danger>
+        Remove Connector
+      </DropdownItem>
+    </Dropdown>
+  );
+};
+
+export default ActionsCell;
diff --git a/kafka-ui-react-app/src/components/Connect/List/List.styled.ts b/kafka-ui-react-app/src/components/Connect/List/List.styled.ts
index f0e2631d2c1..799915fcb11 100644
--- a/kafka-ui-react-app/src/components/Connect/List/List.styled.ts
+++ b/kafka-ui-react-app/src/components/Connect/List/List.styled.ts
@@ -3,4 +3,10 @@ import styled from 'styled-components';
 export const TagsWrapper = styled.div`
   display: flex;
   flex-wrap: wrap;
+  span {
+    color: rgb(76, 76, 255) !important;
+    &:hover {
+      color: rgb(23, 23, 207) !important;
+    }
+  }
 `;
diff --git a/kafka-ui-react-app/src/components/Connect/List/List.tsx b/kafka-ui-react-app/src/components/Connect/List/List.tsx
index 75a782fa0a6..b5935e7bab2 100644
--- a/kafka-ui-react-app/src/components/Connect/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/List.tsx
@@ -1,14 +1,18 @@
 import React from 'react';
 import useAppParams from 'lib/hooks/useAppParams';
-import { ClusterNameRoute } from 'lib/paths';
-import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
+import { clusterConnectConnectorPath, ClusterNameRoute } from 'lib/paths';
+import Table, { TagCell } from 'components/common/NewTable';
+import { FullConnectorInfo } from 'generated-sources';
 import { useConnectors } from 'lib/hooks/api/kafkaConnect';
-import { useSearchParams } from 'react-router-dom';
+import { ColumnDef } from '@tanstack/react-table';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 
-import ListItem from './ListItem';
+import ActionsCell from './ActionsCell';
+import TopicsCell from './TopicsCell';
+import RunningTasksCell from './RunningTasksCell';
 
 const List: React.FC = () => {
+  const navigate = useNavigate();
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const [searchParams] = useSearchParams();
   const { data: connectors } = useConnectors(
@@ -16,35 +20,30 @@ const List: React.FC = () => {
     searchParams.get('q') || ''
   );
 
+  const columns = React.useMemo<ColumnDef<FullConnectorInfo>[]>(
+    () => [
+      { header: 'Name', accessorKey: 'name' },
+      { header: 'Connect', accessorKey: 'connect' },
+      { header: 'Type', accessorKey: 'type' },
+      { header: 'Plugin', accessorKey: 'connectorClass' },
+      { header: 'Topics', cell: TopicsCell },
+      { header: 'Status', accessorKey: 'status.state', cell: TagCell },
+      { header: 'Running Tasks', cell: RunningTasksCell },
+      { header: '', id: 'action', cell: ActionsCell },
+    ],
+    []
+  );
+
   return (
-    <Table isFullwidth>
-      <thead>
-        <tr>
-          <TableHeaderCell title="Name" />
-          <TableHeaderCell title="Connect" />
-          <TableHeaderCell title="Type" />
-          <TableHeaderCell title="Plugin" />
-          <TableHeaderCell title="Topics" />
-          <TableHeaderCell title="Status" />
-          <TableHeaderCell title="Running Tasks" />
-          <TableHeaderCell> </TableHeaderCell>
-        </tr>
-      </thead>
-      <tbody>
-        {(!connectors || connectors.length) === 0 && (
-          <tr>
-            <td colSpan={10}>No connectors found</td>
-          </tr>
-        )}
-        {connectors?.map((connector) => (
-          <ListItem
-            key={connector.name}
-            connector={connector}
-            clusterName={clusterName}
-          />
-        ))}
-      </tbody>
-    </Table>
+    <Table
+      data={connectors || []}
+      columns={columns}
+      enableSorting
+      onRowClick={({ original: { connect, name } }) =>
+        navigate(clusterConnectConnectorPath(clusterName, connect, name))
+      }
+      emptyMessage="No connectors found"
+    />
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
deleted file mode 100644
index 4d10001947b..00000000000
--- a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import React from 'react';
-import { FullConnectorInfo } from 'generated-sources';
-import { clusterConnectConnectorPath, clusterTopicPath } from 'lib/paths';
-import { ClusterName } from 'redux/interfaces';
-import { Link, NavLink } from 'react-router-dom';
-import { Tag } from 'components/common/Tag/Tag.styled';
-import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
-import getTagColor from 'components/common/Tag/getTagColor';
-import { useDeleteConnector } from 'lib/hooks/api/kafkaConnect';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
-import { useConfirm } from 'lib/hooks/useConfirm';
-
-import * as S from './List.styled';
-
-export interface ListItemProps {
-  clusterName: ClusterName;
-  connector: FullConnectorInfo;
-}
-
-const ListItem: React.FC<ListItemProps> = ({
-  clusterName,
-  connector: {
-    name,
-    connect,
-    type,
-    connectorClass,
-    topics,
-    status,
-    tasksCount,
-    failedTasksCount,
-  },
-}) => {
-  const confirm = useConfirm();
-  const deleteMutation = useDeleteConnector({
-    clusterName,
-    connectName: connect,
-    connectorName: name,
-  });
-
-  const handleDelete = () => {
-    confirm(
-      <>
-        Are you sure want to remove <b>{name}</b> connector?
-      </>,
-      async () => {
-        await deleteMutation.mutateAsync();
-      }
-    );
-  };
-
-  const runningTasks = React.useMemo(() => {
-    if (!tasksCount) return null;
-    return tasksCount - (failedTasksCount || 0);
-  }, [tasksCount, failedTasksCount]);
-
-  return (
-    <tr>
-      <TableKeyLink>
-        <NavLink to={clusterConnectConnectorPath(clusterName, connect, name)}>
-          {name}
-        </NavLink>
-      </TableKeyLink>
-      <td>{connect}</td>
-      <td>{type}</td>
-      <td>{connectorClass}</td>
-      <td>
-        <S.TagsWrapper>
-          {topics?.map((t) => (
-            <Tag key={t} color="gray">
-              <Link to={clusterTopicPath(clusterName, t)}>{t}</Link>
-            </Tag>
-          ))}
-        </S.TagsWrapper>
-      </td>
-      <td>
-        {status && <Tag color={getTagColor(status.state)}>{status.state}</Tag>}
-      </td>
-      <td>
-        {runningTasks && (
-          <span>
-            {runningTasks} of {tasksCount}
-          </span>
-        )}
-      </td>
-      <td>
-        <div>
-          <Dropdown>
-            <DropdownItem onClick={handleDelete} danger>
-              Remove Connector
-            </DropdownItem>
-          </Dropdown>
-        </div>
-      </td>
-    </tr>
-  );
-};
-
-export default ListItem;
diff --git a/kafka-ui-react-app/src/components/Connect/List/RunningTasksCell.tsx b/kafka-ui-react-app/src/components/Connect/List/RunningTasksCell.tsx
new file mode 100644
index 00000000000..4c3293d44c9
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/List/RunningTasksCell.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { FullConnectorInfo } from 'generated-sources';
+import { CellContext } from '@tanstack/react-table';
+
+const RunningTasksCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
+  row,
+}) => {
+  const { tasksCount, failedTasksCount } = row.original;
+
+  if (!tasksCount) {
+    return null;
+  }
+
+  return (
+    <>
+      {tasksCount - (failedTasksCount || 0)} of {tasksCount}
+    </>
+  );
+};
+
+export default RunningTasksCell;
diff --git a/kafka-ui-react-app/src/components/Connect/List/TopicsCell.tsx b/kafka-ui-react-app/src/components/Connect/List/TopicsCell.tsx
new file mode 100644
index 00000000000..ee48c2d2d3f
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/List/TopicsCell.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import { FullConnectorInfo } from 'generated-sources';
+import { CellContext } from '@tanstack/react-table';
+import { useNavigate } from 'react-router-dom';
+import { Tag } from 'components/common/Tag/Tag.styled';
+import { ClusterNameRoute, clusterTopicPath } from 'lib/paths';
+import useAppParams from 'lib/hooks/useAppParams';
+
+import * as S from './List.styled';
+
+const TopicsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
+  row,
+}) => {
+  const { topics } = row.original;
+  const { clusterName } = useAppParams<ClusterNameRoute>();
+  const navigate = useNavigate();
+
+  const navigateToTopic = (
+    e: React.KeyboardEvent | React.MouseEvent,
+    topic: string
+  ) => {
+    e.preventDefault();
+    e.stopPropagation();
+    navigate(clusterTopicPath(clusterName, topic));
+  };
+
+  return (
+    <S.TagsWrapper>
+      {topics?.map((t) => (
+        <Tag key={t} color="gray">
+          <span
+            role="link"
+            onClick={(e) => navigateToTopic(e, t)}
+            onKeyDown={(e) => navigateToTopic(e, t)}
+            tabIndex={0}
+          >
+            {t}
+          </span>
+        </Tag>
+      ))}
+    </S.TagsWrapper>
+  );
+};
+
+export default TopicsCell;
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
index a76b8092f25..04a7ba81506 100644
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
@@ -5,49 +5,120 @@ import ClusterContext, {
   initialValue,
 } from 'components/contexts/ClusterContext';
 import List from 'components/Connect/List/List';
-import { screen } from '@testing-library/react';
+import { act, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { render, WithRoute } from 'lib/testHelpers';
-import { clusterConnectorsPath } from 'lib/paths';
-import { useConnectors } from 'lib/hooks/api/kafkaConnect';
-
-jest.mock('components/Connect/List/ListItem', () => () => (
-  <tr>
-    <td>List Item</td>
-  </tr>
-));
+import { clusterConnectConnectorPath, clusterConnectorsPath } from 'lib/paths';
+import { useConnectors, useDeleteConnector } from 'lib/hooks/api/kafkaConnect';
+
+const mockedUsedNavigate = jest.fn();
+const mockDelete = jest.fn();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockedUsedNavigate,
+}));
+
 jest.mock('lib/hooks/api/kafkaConnect', () => ({
   useConnectors: jest.fn(),
+  useDeleteConnector: jest.fn(),
 }));
 
 const clusterName = 'local';
 
+const renderComponent = (contextValue: ContextProps = initialValue) =>
+  render(
+    <ClusterContext.Provider value={contextValue}>
+      <WithRoute path={clusterConnectorsPath()}>
+        <List />
+      </WithRoute>
+    </ClusterContext.Provider>,
+    { initialEntries: [clusterConnectorsPath(clusterName)] }
+  );
+
 describe('Connectors List', () => {
-  const renderComponent = (contextValue: ContextProps = initialValue) =>
-    render(
-      <ClusterContext.Provider value={contextValue}>
-        <WithRoute path={clusterConnectorsPath()}>
-          <List />
-        </WithRoute>
-      </ClusterContext.Provider>,
-      { initialEntries: [clusterConnectorsPath(clusterName)] }
-    );
-
-  it('renders empty connectors Table', async () => {
-    (useConnectors as jest.Mock).mockImplementation(() => ({
-      data: [],
-    }));
-
-    await renderComponent();
-    expect(screen.getByRole('table')).toBeInTheDocument();
-    expect(screen.getByText('No connectors found')).toBeInTheDocument();
+  describe('when the connectors are loaded', () => {
+    beforeEach(() => {
+      (useConnectors as jest.Mock).mockImplementation(() => ({
+        data: connectors,
+      }));
+    });
+
+    it('renders', async () => {
+      renderComponent();
+      expect(screen.getByRole('table')).toBeInTheDocument();
+      expect(screen.getAllByRole('row').length).toEqual(3);
+    });
+
+    it('opens broker when row clicked', async () => {
+      renderComponent();
+      await act(() => {
+        userEvent.click(
+          screen.getByRole('row', {
+            name: 'hdfs-source-connector first SOURCE FileStreamSource a b c RUNNING 2 of 2',
+          })
+        );
+      });
+      await waitFor(() =>
+        expect(mockedUsedNavigate).toBeCalledWith(
+          clusterConnectConnectorPath(
+            clusterName,
+            'first',
+            'hdfs-source-connector'
+          )
+        )
+      );
+    });
   });
 
-  it('renders connectors Table', async () => {
-    (useConnectors as jest.Mock).mockImplementation(() => ({
-      data: connectors,
-    }));
-    await renderComponent();
-    expect(screen.getByRole('table')).toBeInTheDocument();
-    expect(screen.getAllByText('List Item').length).toEqual(2);
+  describe('when table is empty', () => {
+    beforeEach(() => {
+      (useConnectors as jest.Mock).mockImplementation(() => ({
+        data: [],
+      }));
+    });
+
+    it('renders empty table', async () => {
+      renderComponent();
+      expect(screen.getByRole('table')).toBeInTheDocument();
+      expect(
+        screen.getByRole('row', { name: 'No connectors found' })
+      ).toBeInTheDocument();
+    });
+  });
+
+  describe('when remove connector modal is open', () => {
+    beforeEach(() => {
+      (useConnectors as jest.Mock).mockImplementation(() => ({
+        data: connectors,
+      }));
+      (useDeleteConnector as jest.Mock).mockImplementation(() => ({
+        mutateAsync: mockDelete,
+      }));
+    });
+
+    it('calls removeConnector on confirm', async () => {
+      renderComponent();
+      const removeButton = screen.getAllByText('Remove Connector')[0];
+      await waitFor(() => userEvent.click(removeButton));
+
+      const submitButton = screen.getAllByRole('button', {
+        name: 'Confirm',
+      })[0];
+      await act(() => userEvent.click(submitButton));
+      expect(mockDelete).toHaveBeenCalledWith();
+    });
+
+    it('closes the modal when cancel button is clicked', async () => {
+      renderComponent();
+      const removeButton = screen.getAllByText('Remove Connector')[0];
+      await waitFor(() => userEvent.click(removeButton));
+
+      const cancelButton = screen.getAllByRole('button', {
+        name: 'Cancel',
+      })[0];
+      await waitFor(() => userEvent.click(cancelButton));
+      expect(cancelButton).not.toBeInTheDocument();
+    });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx
deleted file mode 100644
index 715d0aeb4d3..00000000000
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import { connectors } from 'lib/fixtures/kafkaConnect';
-import ListItem, { ListItemProps } from 'components/Connect/List/ListItem';
-import { screen } from '@testing-library/react';
-import { render } from 'lib/testHelpers';
-
-describe('Connectors ListItem', () => {
-  const connector = connectors[0];
-  const setupWrapper = (props: Partial<ListItemProps> = {}) => (
-    <table>
-      <tbody>
-        <ListItem clusterName="local" connector={connector} {...props} />
-      </tbody>
-    </table>
-  );
-
-  it('renders item', () => {
-    render(setupWrapper());
-    expect(screen.getAllByRole('cell')[6]).toHaveTextContent('2 of 2');
-  });
-
-  it('topics tags are sorted', () => {
-    render(setupWrapper());
-    const getLink = screen.getAllByRole('link');
-    expect(getLink[1]).toHaveTextContent('a');
-    expect(getLink[2]).toHaveTextContent('b');
-    expect(getLink[3]).toHaveTextContent('c');
-  });
-
-  it('renders item with failed tasks', () => {
-    render(
-      setupWrapper({
-        connector: {
-          ...connector,
-          failedTasksCount: 1,
-        },
-      })
-    );
-    expect(screen.getAllByRole('cell')[6]).toHaveTextContent('1 of 2');
-  });
-
-  it('does not render info about tasks if taksCount is undefined', () => {
-    render(
-      setupWrapper({
-        connector: {
-          ...connector,
-          tasksCount: undefined,
-        },
-      })
-    );
-    expect(screen.getAllByRole('cell')[6]).toHaveTextContent('');
-  });
-});

From 0939d6140f5540bd421f19d61d862d363cff7456 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 10 Oct 2022 19:36:53 +0400
Subject: [PATCH 205/734] Migrate Dashboard table (#2694)

* Migrate Dashboard table to the new version on table components #2682

* Added universal component to the column section and added part of test  #2682

* Added universal component for the all new tables in project  #2682

* deleted color argument on LinkCell component

* deleted link on topic count

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../Brokers/BrokersList/BrokersList.tsx       | 13 +++-
 .../components/ConsumerGroups/List/List.tsx   |  8 ++-
 .../Dashboard/ClustersWidget/ClusterName.tsx  | 15 ++++
 .../ClustersWidget/ClustersWidget.tsx         | 68 +++++++------------
 .../__test__/ClustersWidget.spec.tsx          |  3 +-
 .../src/components/Schemas/List/List.tsx      | 12 +++-
 .../components/common/NewTable/LinkCell.tsx   |  6 +-
 .../common/NewTable/__test__/Table.spec.tsx   |  7 +-
 8 files changed, 76 insertions(+), 56 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClusterName.tsx

diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index 9f63be31c29..54bdcef5ff8 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -42,10 +42,19 @@ const BrokersList: React.FC = () => {
       };
     });
   }, [diskUsage, brokers]);
-
   const columns = React.useMemo<ColumnDef<typeof rows>[]>(
     () => [
-      { header: 'Broker ID', accessorKey: 'brokerId', cell: LinkCell },
+      {
+        header: 'Broker ID',
+        accessorKey: 'brokerId',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue }) => (
+          <LinkCell
+            value={`${getValue<string | number>()}`}
+            to={encodeURIComponent(`${getValue<string | number>()}`)}
+          />
+        ),
+      },
       { header: 'Segment Size', accessorKey: 'size', cell: SizeCell },
       { header: 'Segment Count', accessorKey: 'count' },
       { header: 'Port', accessorKey: 'port' },
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
index 89be57d6392..c7df01b5e95 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
@@ -49,7 +49,13 @@ const List: React.FC<Props> = ({ consumerGroups, totalPages }) => {
         id: ConsumerGroupOrdering.NAME,
         header: 'Group ID',
         accessorKey: 'groupId',
-        cell: LinkCell,
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue }) => (
+          <LinkCell
+            value={`${getValue<string | number>()}`}
+            to={encodeURIComponent(`${getValue<string | number>()}`)}
+          />
+        ),
       },
       {
         id: ConsumerGroupOrdering.MEMBERS,
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClusterName.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClusterName.tsx
new file mode 100644
index 00000000000..52702c348a7
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClusterName.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { CellContext } from '@tanstack/react-table';
+import { Tag } from 'components/common/Tag/Tag.styled';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const ClusterName: React.FC<CellContext<any, unknown>> = ({ row }) => {
+  return (
+    <>
+      {row.original.readOnly && <Tag color="blue">readonly</Tag>}
+      {row.original.name}
+    </>
+  );
+};
+
+export default ClusterName;
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
index 7e303c98763..0327a010012 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
@@ -1,16 +1,14 @@
 import React from 'react';
 import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
-import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { NavLink } from 'react-router-dom';
-import { clusterTopicsPath } from 'lib/paths';
 import Switch from 'components/common/Switch/Switch';
 import { useClusters } from 'lib/hooks/api/clusters';
-import { ServerStatus } from 'generated-sources';
+import { Cluster, ServerStatus } from 'generated-sources';
+import { ColumnDef } from '@tanstack/react-table';
+import Table, { SizeCell } from 'components/common/NewTable';
 
 import * as S from './ClustersWidget.styled';
+import ClusterName from './ClusterName';
 
 const ClustersWidget: React.FC = () => {
   const { data } = useClusters();
@@ -28,6 +26,19 @@ const ClustersWidget: React.FC = () => {
     };
   }, [data, showOfflineOnly]);
 
+  const columns = React.useMemo<ColumnDef<Cluster>[]>(
+    () => [
+      { header: 'Cluster name', accessorKey: 'name', cell: ClusterName },
+      { header: 'Version', accessorKey: 'version' },
+      { header: 'Brokers count', accessorKey: 'brokerCount' },
+      { header: 'Partitions', accessorKey: 'onlinePartitionCount' },
+      { header: 'Topics', accessorKey: 'topicCount' },
+      { header: 'Production', accessorKey: 'bytesInPerSec', cell: SizeCell },
+      { header: 'Consumption', accessorKey: 'bytesOutPerSec', cell: SizeCell },
+    ],
+    []
+  );
+
   const handleSwitch = () => setShowOfflineOnly(!showOfflineOnly);
   return (
     <>
@@ -51,45 +62,12 @@ const ClustersWidget: React.FC = () => {
         />
         <label>Only offline clusters</label>
       </S.SwitchWrapper>
-      <Table isFullwidth>
-        <thead>
-          <tr>
-            <TableHeaderCell title="Cluster name" />
-            <TableHeaderCell title="Version" />
-            <TableHeaderCell title="Brokers count" />
-            <TableHeaderCell title="Partitions" />
-            <TableHeaderCell title="Topics" />
-            <TableHeaderCell title="Production" />
-            <TableHeaderCell title="Consumption" />
-          </tr>
-        </thead>
-        <tbody>
-          {config.list.map((cluster) => (
-            <tr key={cluster.name}>
-              <S.TableCell maxWidth="99px" width="350">
-                {cluster.readOnly && <Tag color="blue">readonly</Tag>}{' '}
-                {cluster.name}
-              </S.TableCell>
-              <S.TableCell maxWidth="99px">{cluster.version}</S.TableCell>
-              <S.TableCell maxWidth="99px">{cluster.brokerCount}</S.TableCell>
-              <S.TableCell maxWidth="78px">
-                {cluster.onlinePartitionCount}
-              </S.TableCell>
-              <S.TableCell maxWidth="60px">
-                <NavLink to={clusterTopicsPath(cluster.name)}>
-                  {cluster.topicCount}
-                </NavLink>
-              </S.TableCell>
-              <S.TableCell maxWidth="85px">
-                <BytesFormatted value={cluster.bytesInPerSec} />
-              </S.TableCell>
-              <S.TableCell maxWidth="85px">
-                <BytesFormatted value={cluster.bytesOutPerSec} />
-              </S.TableCell>
-            </tr>
-          ))}
-        </tbody>
-      </Table>
+      <Table
+        columns={columns}
+        data={config?.list}
+        enableSorting
+        emptyMessage="Disk usage data not available"
+      />
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
index c5fa81342c6..dfdcb341796 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
@@ -36,8 +36,7 @@ describe('ClustersWidget', () => {
   });
 
   it('render clusterWidget cells', () => {
-    const cells = screen.getAllByRole('cells');
+    const cells = screen.getAllByRole('cell');
     expect(cells.length).toBe(14);
-    expect(cells[0]).toHaveStyle('max-width: 99px');
   });
 });
diff --git a/kafka-ui-react-app/src/components/Schemas/List/List.tsx b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
index 31c280b92ad..8999a81d7b4 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
@@ -54,7 +54,17 @@ const List: React.FC = () => {
 
   const columns = React.useMemo<ColumnDef<SchemaSubject>[]>(
     () => [
-      { header: 'Subject', accessorKey: 'subject', cell: LinkCell },
+      {
+        header: 'Subject',
+        accessorKey: 'subject',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue }) => (
+          <LinkCell
+            value={`${getValue<string | number>()}`}
+            to={encodeURIComponent(`${getValue<string | number>()}`)}
+          />
+        ),
+      },
       { header: 'Id', accessorKey: 'id' },
       { header: 'Type', accessorKey: 'schemaType' },
       { header: 'Version', accessorKey: 'version' },
diff --git a/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx
index b6ca656d1d1..e400fa0b9c3 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/LinkCell.tsx
@@ -1,13 +1,11 @@
 import React from 'react';
-import { CellContext } from '@tanstack/react-table';
 import { NavLink } from 'react-router-dom';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const LinkCell: React.FC<CellContext<any, unknown>> = ({ getValue }) => {
-  const value = `${getValue<string | number>()}`;
+const LinkCell = ({ value, to = '' }: any) => {
   const handleClick: React.MouseEventHandler = (e) => e.stopPropagation();
   return (
-    <NavLink to={encodeURIComponent(value)} title={value} onClick={handleClick}>
+    <NavLink to={to} title={value} onClick={handleClick}>
       {value}
     </NavLink>
   );
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index 412fafd484c..480f6e6db15 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -63,7 +63,12 @@ const columns: ColumnDef<Datum>[] = [
   {
     header: 'Text',
     accessorKey: 'text',
-    cell: LinkCell,
+    cell: ({ getValue }) => (
+      <LinkCell
+        value={`${getValue<string | number>()}`}
+        to={encodeURIComponent(`${getValue<string | number>()}`)}
+      />
+    ),
   },
   {
     header: 'Size',

From 19e38fb1bfe31d369bb9cd9b9eed5ddcbcef8b92 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 13 Oct 2022 22:30:07 +0400
Subject: [PATCH 206/734] Msk serverless support (BE) (#2737)

Msk serverless support:
1. ReactiveAdminClient.loadBrokersConfig returns empty map if configs retrieval not supported by kafka backend
2. ReactiveAdminClient.toMone exception unwrapping added
3. FeatureService delete topics enabled set true by default
4. TopicCreationDTO.replicationFactor made optional


Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../ui/exception/TopicMetadataException.java  |  4 ++
 .../kafka/ui/service/BrokerService.java       | 12 +---
 .../kafka/ui/service/FeatureService.java      |  2 +-
 .../kafka/ui/service/ReactiveAdminClient.java | 60 ++++++++++++-------
 .../kafka/ui/service/TopicsService.java       |  8 +--
 .../main/resources/swagger/kafka-ui-api.yaml  |  1 -
 6 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/TopicMetadataException.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/TopicMetadataException.java
index 7ccceefe614..a659f94f971 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/TopicMetadataException.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/TopicMetadataException.java
@@ -6,6 +6,10 @@ public TopicMetadataException(String message) {
     super(message);
   }
 
+  public TopicMetadataException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
   @Override
   public ErrorCode getErrorCode() {
     return ErrorCode.INVALID_ENTITY_STATE;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
index cd6ad93ba07..9c258fa8de8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
@@ -47,10 +47,7 @@ private Mono<Map<Integer, List<ConfigEntry>>> loadBrokersConfig(
   private Mono<List<ConfigEntry>> loadBrokersConfig(
       KafkaCluster cluster, Integer brokerId) {
     return loadBrokersConfig(cluster, Collections.singletonList(brokerId))
-        .map(map -> map.values().stream()
-            .findFirst()
-            .orElseThrow(() -> new NotFoundException(
-                String.format("Config for broker %s not found", brokerId))));
+        .map(map -> map.values().stream().findFirst().orElse(List.of()));
   }
 
   private Flux<InternalBrokerConfig> getBrokersConfig(KafkaCluster cluster, Integer brokerId) {
@@ -81,13 +78,6 @@ public Flux<BrokerDTO> getBrokers(KafkaCluster cluster) {
         .flatMapMany(Flux::fromIterable);
   }
 
-  public Mono<Node> getController(KafkaCluster cluster) {
-    return adminClientService
-        .get(cluster)
-        .flatMap(ReactiveAdminClient::describeCluster)
-        .map(ReactiveAdminClient.ClusterDescription::getController);
-  }
-
   public Mono<Void> updateBrokerLogDir(KafkaCluster cluster,
                                        Integer broker,
                                        BrokerLogdirUpdateDTO brokerLogDir) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
index 24a824fb168..9097f2b25e7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
@@ -60,6 +60,6 @@ private Mono<Boolean> isTopicDeletionEnabled(KafkaCluster cluster, Node controll
                 .filter(e -> e.name().equals(DELETE_TOPIC_ENABLED_SERVER_PROPERTY))
                 .map(e -> Boolean.parseBoolean(e.value()))
                 .findFirst()
-                .orElse(false));
+                .orElse(true));
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 0556b3a0461..c08b839410e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -18,6 +18,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -54,6 +55,7 @@
 import org.apache.kafka.common.config.ConfigResource;
 import org.apache.kafka.common.errors.GroupIdNotFoundException;
 import org.apache.kafka.common.errors.GroupNotEmptyException;
+import org.apache.kafka.common.errors.InvalidRequestException;
 import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
 import org.apache.kafka.common.requests.DescribeLogDirsResponse;
 import reactor.core.publisher.Mono;
@@ -81,7 +83,7 @@ public static class ClusterDescription {
   }
 
   public static Mono<ReactiveAdminClient> create(AdminClient adminClient) {
-    return getClusterVersionImpl(adminClient)
+    return getClusterVersion(adminClient)
         .map(ver ->
             new ReactiveAdminClient(
                 adminClient,
@@ -105,7 +107,13 @@ private static SupportedFeature getSupportedUpdateFeatureForVersion(String versi
   private static <T> Mono<T> toMono(KafkaFuture<T> future) {
     return Mono.<T>create(sink -> future.whenComplete((res, ex) -> {
       if (ex != null) {
-        sink.error(ex);
+        // KafkaFuture doc is unclear about what exception wrapper will be used
+        // (from docs it should be ExecutionException, be we actually see CompletionException, so checking both
+        if (ex instanceof CompletionException || ex instanceof ExecutionException) {
+          sink.error(ex.getCause()); //unwrapping exception
+        } else {
+          sink.error(ex);
+        }
       } else {
         sink.success(res);
       }
@@ -166,17 +174,29 @@ private Mono<Map<String, List<ConfigEntry>>> getTopicsConfigImpl(Collection<Stri
             c -> List.copyOf(c.getValue().entries()))));
   }
 
-  public Mono<Map<Integer, List<ConfigEntry>>> loadBrokersConfig(List<Integer> brokerIds) {
+  private static Mono<Map<Integer, List<ConfigEntry>>> loadBrokersConfig(AdminClient client, List<Integer> brokerIds) {
     List<ConfigResource> resources = brokerIds.stream()
         .map(brokerId -> new ConfigResource(ConfigResource.Type.BROKER, Integer.toString(brokerId)))
         .collect(toList());
     return toMono(client.describeConfigs(resources).all())
+        .doOnError(InvalidRequestException.class,
+            th -> log.trace("Error while getting broker {} configs", brokerIds, th))
+        // some kafka backends (like MSK serverless) do not support broker's configs retrieval,
+        // in that case InvalidRequestException will be thrown
+        .onErrorResume(InvalidRequestException.class, th -> Mono.just(Map.of()))
         .map(config -> config.entrySet().stream()
             .collect(toMap(
                 c -> Integer.valueOf(c.getKey().name()),
                 c -> new ArrayList<>(c.getValue().entries()))));
   }
 
+  /**
+   * Return per-broker configs or empty map if broker's configs retrieval not supported.
+   */
+  public Mono<Map<Integer, List<ConfigEntry>>> loadBrokersConfig(List<Integer> brokerIds) {
+    return loadBrokersConfig(client, brokerIds);
+  }
+
   public Mono<Map<String, TopicDescription>> describeTopics() {
     return listTopics(true).flatMap(this::describeTopics);
   }
@@ -280,20 +300,16 @@ public Mono<ClusterDescription> describeCluster() {
     }));
   }
 
-  private static Mono<String> getClusterVersionImpl(AdminClient client) {
-    return toMono(client.describeCluster().controller()).flatMap(controller ->
-        toMono(client.describeConfigs(
-                List.of(new ConfigResource(
-                    ConfigResource.Type.BROKER, String.valueOf(controller.id()))))
-            .all()
-            .thenApply(configs ->
-                configs.values().stream()
-                    .map(Config::entries)
-                    .flatMap(Collection::stream)
-                    .filter(entry -> entry.name().contains("inter.broker.protocol.version"))
-                    .findFirst().map(ConfigEntry::value)
-                    .orElse("1.0-UNKNOWN")
-            )));
+  private static Mono<String> getClusterVersion(AdminClient client) {
+    return toMono(client.describeCluster().controller())
+        .flatMap(controller -> loadBrokersConfig(client, List.of(controller.id())))
+        .map(configs -> configs.values().stream()
+            .flatMap(Collection::stream)
+            .filter(entry -> entry.name().contains("inter.broker.protocol.version"))
+            .findFirst()
+            .map(ConfigEntry::value)
+            .orElse("1.0-UNKNOWN")
+        );
   }
 
   public Mono<Void> deleteConsumerGroups(Collection<String> groupIds) {
@@ -306,10 +322,14 @@ public Mono<Void> deleteConsumerGroups(Collection<String> groupIds) {
 
   public Mono<Void> createTopic(String name,
                                 int numPartitions,
-                                short replicationFactor,
+                                @Nullable Integer replicationFactor,
                                 Map<String, String> configs) {
-    return toMono(client.createTopics(
-        List.of(new NewTopic(name, numPartitions, replicationFactor).configs(configs))).all());
+    var newTopic = new NewTopic(
+        name,
+        Optional.of(numPartitions),
+        Optional.ofNullable(replicationFactor).map(Integer::shortValue)
+    ).configs(configs);
+    return toMono(client.createTopics(List.of(newTopic)).all());
   }
 
   public Mono<Void> alterPartitionReassignments(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 1790a3005c2..2dffe0de75e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -170,11 +170,11 @@ private Mono<InternalTopic> createTopic(KafkaCluster c, ReactiveAdminClient admi
             adminClient.createTopic(
                 topicData.getName(),
                 topicData.getPartitions(),
-                topicData.getReplicationFactor().shortValue(),
+                topicData.getReplicationFactor(),
                 topicData.getConfigs()
             ).thenReturn(topicData)
         )
-        .onErrorResume(t -> Mono.error(new TopicMetadataException(t.getMessage())))
+        .onErrorMap(t -> new TopicMetadataException(t.getMessage(), t))
         .flatMap(topicData -> loadTopicAfterCreation(c, topicData.getName()));
   }
 
@@ -194,7 +194,7 @@ public Mono<InternalTopic> recreateTopic(KafkaCluster cluster, String topicName)
                         ac.createTopic(
                                 topic.getName(),
                                 topic.getPartitionCount(),
-                                (short) topic.getReplicationFactor(),
+                                topic.getReplicationFactor(),
                                 topic.getTopicConfigs()
                                     .stream()
                                     .collect(Collectors.toMap(InternalTopicConfig::getName,
@@ -430,7 +430,7 @@ public Mono<InternalTopic> cloneTopic(
                 ac.createTopic(
                     newTopicName,
                     topic.getPartitionCount(),
-                    (short) topic.getReplicationFactor(),
+                    topic.getReplicationFactor(),
                     topic.getTopicConfigs()
                         .stream()
                         .collect(Collectors
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 68b8afa65a3..af6c6c3e6ae 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2261,7 +2261,6 @@ components:
       required:
         - name
         - partitions
-        - replicationFactor
 
     TopicUpdate:
       type: object

From 8b91f50af5d4d1c72876a26356a6fde6eb74f34e Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 13 Oct 2022 22:41:43 +0400
Subject: [PATCH 207/734] Smart filter offset binding (#2732)

* adding "offset" var to smart filter binding

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../com/provectus/kafka/ui/emitter/MessageFilters.java     | 1 +
 .../com/provectus/kafka/ui/emitter/MessageFiltersTest.java | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java
index 446f166bfeb..ea0707f1029 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java
@@ -43,6 +43,7 @@ static Predicate<TopicMessageDTO> groovyScriptFilter(String script) {
     return msg -> {
       var bindings = getGroovyEngine().createBindings();
       bindings.put("partition", msg.getPartition());
+      bindings.put("offset", msg.getOffset());
       bindings.put("timestampMs", msg.getTimestamp().toInstant().toEpochMilli());
       bindings.put("keyAsText", msg.getKey());
       bindings.put("valueAsText", msg.getContent());
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
index 0986a292efe..426ba980205 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
@@ -73,6 +73,13 @@ void canCheckPartition() {
       assertFalse(f.test(msg().partition(0)));
     }
 
+    @Test
+    void canCheckOffset() {
+      var f = groovyScriptFilter("offset == 100");
+      assertTrue(f.test(msg().offset(100L)));
+      assertFalse(f.test(msg().offset(200L)));
+    }
+
     @Test
     void canCheckTimestampMs() {
       var ts = OffsetDateTime.now();

From 09e06e7854f172b06fe75355a974fba2f3e6e9f1 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 14 Oct 2022 12:29:34 +0400
Subject: [PATCH 208/734] Add workflows for helm release (#2632)

* add workflows

* fix

* add flow

* fix

* change names

* add comments

* fix helm.yaml file

* fix helm.yaml

* fix helm.yaml

* fix realse-helm.yaml
---
 .github/workflows/helm.yaml         | 29 +++++++++++++++-------
 .github/workflows/release-helm.yaml | 37 +++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 .github/workflows/release-helm.yaml

diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
index 0da4bdc51e4..255f92260f9 100644
--- a/.github/workflows/helm.yaml
+++ b/.github/workflows/helm.yaml
@@ -1,14 +1,11 @@
 name: Helm
 on:
-  pull_request:
-    types: [ 'opened', 'edited', 'reopened', 'synchronize' ]
-    paths:
-      - "charts/**"
-
-  schedule:
-    # * is a special character in YAML so you have to quote this string
-    - cron:  '0 8 * * 3'
-
+ pull_request:
+  types: ["opened", "edited", "reopened", "synchronize"]
+  branches:
+   - 'master'
+  paths:
+   - "charts/**"
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
@@ -30,3 +27,17 @@ jobs:
               echo $version;
               helm template --kube-version $version --set ingress.enabled=true charts/kafka-ui -f charts/kafka-ui/values.yaml | kubeval --additional-schema-locations https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master --strict -v $version;
             done
+      #check, was helm version increased in Chart.yaml?
+      - name: Check version
+        shell: bash
+        run: |
+          git fetch
+          git checkout master
+          helm_version_old=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk  '{print $2}')
+          git checkout $GITHUB_HEAD_REF
+          helm_version_new=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk  '{print $2}')
+          echo $helm_version_old
+          echo $helm_version_new
+          if [[ "$helm_version_new" > "$helm_version_old" ]]; then exit 0 ; else exit 1 ; fi
+
+
diff --git a/.github/workflows/release-helm.yaml b/.github/workflows/release-helm.yaml
new file mode 100644
index 00000000000..640c0acc1c1
--- /dev/null
+++ b/.github/workflows/release-helm.yaml
@@ -0,0 +1,37 @@
+name: Release helm
+on:
+ push:
+    branches:
+     - master
+    paths:
+      - "charts/**"
+
+jobs:
+ release-helm:
+  runs-on:
+   ubuntu-latest
+  steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+
+      - run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+
+      - uses: azure/setup-helm@v1
+
+      - name: add chart #realse helm with new version
+        run: |
+          echo "VERSION=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk '{print $2}')" >> $GITHUB_ENV
+          MSG=$(helm package  charts/kafka-ui)
+          git fetch origin
+          git stash
+          git checkout -b gh-pages origin/gh-pages
+          helm repo index .
+          git add -f ${MSG##*/} index.yaml
+          git commit -m "release ${{ env.VERSION }}"
+          git push
+      - uses: rickstaa/action-create-tag@v1 #create new tag
+        with:
+          tag: "charts/kafka-ui-${{ env.VERSION }}"

From 6a2b9cc59306bdbdb23047dfea4a7c04a5d0139c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 12:49:07 +0400
Subject: [PATCH 209/734] Bump pnpm/action-setup from 2.2.2 to 2.2.3 (#2746)

Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/pnpm/action-setup/releases)
- [Commits](https://github.com/pnpm/action-setup/compare/v2.2.2...v2.2.3)

---
updated-dependencies:
- dependency-name: pnpm/action-setup
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 50dc2709f9b..7db1337a0fa 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -20,7 +20,7 @@ jobs:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: pnpm/action-setup@v2.2.2
+      - uses: pnpm/action-setup@v2.2.3
         with:
           version: 7.4.0
       - name: Install node

From 37f1d2254e66b31bc827438b38f1505ae331c415 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 13:01:19 +0400
Subject: [PATCH 210/734] Bump jwalton/gh-docker-logs from 2.2.0 to 2.2.1
 (#2745)

Bumps [jwalton/gh-docker-logs](https://github.com/jwalton/gh-docker-logs) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/jwalton/gh-docker-logs/releases)
- [Changelog](https://github.com/jwalton/gh-docker-logs/blob/master/.releaserc)
- [Commits](https://github.com/jwalton/gh-docker-logs/compare/v2.2.0...v2.2.1)

---
updated-dependencies:
- dependency-name: jwalton/gh-docker-logs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/e2e-checks.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 6f2287e1eac..5ffec3b2b7f 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -76,4 +76,4 @@ jobs:
           target_url: https://${{ github.repository_owner }}.github.io/kafka-ui/allure/allure-results/${{ github.run_number }}
       - name: Dump docker logs on failure
         if: failure()
-        uses: jwalton/gh-docker-logs@v2.2.0
+        uses: jwalton/gh-docker-logs@v2.2.1

From 2b5dd270e22c6455c6a5999131dbf3ce3b770429 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 14 Oct 2022 13:16:29 +0400
Subject: [PATCH 211/734] Implement Connectors sorting / backend (#2291)

Co-authored-by: Artem Kazlanzhy <akazlanzhy@provectus.com>
---
 .../ui/controller/KafkaConnectController.java | 29 ++++++++++++++++++-
 .../main/resources/swagger/kafka-ui-api.yaml  | 18 ++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index 8011fe8e5fc..2813618abf9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -3,13 +3,16 @@
 import com.provectus.kafka.ui.api.KafkaConnectApi;
 import com.provectus.kafka.ui.model.ConnectDTO;
 import com.provectus.kafka.ui.model.ConnectorActionDTO;
+import com.provectus.kafka.ui.model.ConnectorColumnsToSortDTO;
 import com.provectus.kafka.ui.model.ConnectorDTO;
 import com.provectus.kafka.ui.model.ConnectorPluginConfigValidationResponseDTO;
 import com.provectus.kafka.ui.model.ConnectorPluginDTO;
 import com.provectus.kafka.ui.model.FullConnectorInfoDTO;
 import com.provectus.kafka.ui.model.NewConnectorDTO;
+import com.provectus.kafka.ui.model.SortOrderDTO;
 import com.provectus.kafka.ui.model.TaskDTO;
 import com.provectus.kafka.ui.service.KafkaConnectService;
+import java.util.Comparator;
 import java.util.Map;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -68,10 +71,16 @@ public Mono<ResponseEntity<Void>> deleteConnector(String clusterName, String con
   public Mono<ResponseEntity<Flux<FullConnectorInfoDTO>>> getAllConnectors(
       String clusterName,
       String search,
+      ConnectorColumnsToSortDTO orderBy,
+      SortOrderDTO sortOrder,
       ServerWebExchange exchange
   ) {
+    var comparator = sortOrder == null || sortOrder.equals(SortOrderDTO.ASC)
+            ? getConnectorsComparator(orderBy)
+            : getConnectorsComparator(orderBy).reversed();
     return Mono.just(ResponseEntity.ok(
-        kafkaConnectService.getAllConnectors(getCluster(clusterName), search)));
+        kafkaConnectService.getAllConnectors(getCluster(clusterName), search).sort(comparator))
+    );
   }
 
   @Override
@@ -142,4 +151,22 @@ public Mono<ResponseEntity<Flux<ConnectorPluginDTO>>> getConnectorPlugins(
             getCluster(clusterName), connectName, pluginName, requestBody)
         .map(ResponseEntity::ok);
   }
+
+  private Comparator<FullConnectorInfoDTO> getConnectorsComparator(ConnectorColumnsToSortDTO orderBy) {
+    var defaultComparator = Comparator.comparing(FullConnectorInfoDTO::getName);
+    if (orderBy == null) {
+      return defaultComparator;
+    }
+    switch (orderBy) {
+      case CONNECT:
+        return Comparator.comparing(FullConnectorInfoDTO::getConnect);
+      case TYPE:
+        return Comparator.comparing(FullConnectorInfoDTO::getType);
+      case STATUS:
+        return Comparator.comparing(fullConnectorInfoDTO -> fullConnectorInfoDTO.getStatus().getState());
+      case NAME:
+      default:
+        return defaultComparator;
+    }
+  }
 }
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index af6c6c3e6ae..d07c24a61b1 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1267,6 +1267,16 @@ paths:
           required: false
           schema:
             type: string
+        - name: orderBy
+          in: query
+          required: false
+          schema:
+            $ref: '#/components/schemas/ConnectorColumnsToSort'
+        - name: sortOrder
+          in: query
+          required: false
+          schema:
+            $ref: '#/components/schemas/SortOrder'
       responses:
         200:
           description: OK
@@ -2009,6 +2019,14 @@ components:
         - REPLICATION_FACTOR
         - SIZE
 
+    ConnectorColumnsToSort:
+      type: string
+      enum:
+        - NAME
+        - CONNECT
+        - TYPE
+        - STATUS
+
     SortOrder:
       type: string
       enum:

From 63b6bb3fa10dd33b069c15151bf706a313970550 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 17 Oct 2022 16:24:14 +0400
Subject: [PATCH 212/734] ISSUE-2202: smart filters headers test added (#2763)

---
 .../provectus/kafka/ui/emitter/MessageFiltersTest.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
index 426ba980205..94a377c9c84 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
@@ -13,6 +13,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Predicate;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.Nested;
@@ -80,6 +81,13 @@ void canCheckOffset() {
       assertFalse(f.test(msg().offset(200L)));
     }
 
+    @Test
+    void canCheckHeaders() {
+      var f = groovyScriptFilter("headers.size() == 2 && headers['k1'] == 'v1'");
+      assertTrue(f.test(msg().headers(Map.of("k1", "v1", "k2", "v2"))));
+      assertFalse(f.test(msg().headers(Map.of("k1", "unexpected", "k2", "v2"))));
+    }
+
     @Test
     void canCheckTimestampMs() {
       var ts = OffsetDateTime.now();

From 0e4a314082d6e5d64ba0d09e60ebff8f5170aac7 Mon Sep 17 00:00:00 2001
From: Aditya Bhattad <93488388+adityabhattad2021@users.noreply.github.com>
Date: Wed, 19 Oct 2022 22:54:19 +0530
Subject: [PATCH 213/734] Topic messages: rename "content" to "value" (#2765)

---
 .../src/components/Topics/Topic/Messages/Filters/Filters.tsx  | 2 +-
 .../src/components/Topics/Topic/Messages/MessagesTable.tsx    | 2 +-
 .../src/components/Topics/Topic/SendMessage/SendMessage.tsx   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 3ee4b552efa..c010ca65cb5 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -459,7 +459,7 @@ const Filters: React.FC<FiltersProps> = ({
             />
           </div>
           <div>
-            <InputLabel>Content Serde</InputLabel>
+            <InputLabel>Value Serde</InputLabel>
             <Select
               id="selectValueSerdeOptions"
               aria-labelledby="selectValueSerdeOptions"
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
index 4696b75e036..3deab1ecb5c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
@@ -27,7 +27,7 @@ const MessagesTable: React.FC = () => {
           <TableHeaderCell title="Partition" />
           <TableHeaderCell title="Timestamp" />
           <TableHeaderCell title="Key" />
-          <TableHeaderCell title="Content" />
+          <TableHeaderCell title="Value" />
           <TableHeaderCell> </TableHeaderCell>
         </tr>
       </thead>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 087abe537ae..b0c35fc7504 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -154,7 +154,7 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
             />
           </S.Column>
           <S.Column>
-            <InputLabel>Content Serde</InputLabel>
+            <InputLabel>Value Serde</InputLabel>
             <Controller
               control={control}
               name="valueSerde"
@@ -190,7 +190,7 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
             />
           </S.Column>
           <S.Column>
-            <InputLabel>Content</InputLabel>
+            <InputLabel>Value</InputLabel>
             <Controller
               control={control}
               name="content"

From 6581ee605b7574ecdb64a69fc88fddb47dde53bd Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Wed, 19 Oct 2022 21:27:06 +0400
Subject: [PATCH 214/734] Migrate Topic Overview to the new version of table
 #2684 (#2704)

* Migrate Topic Overview to the new version of table #2684

* changed Dropdown Toggle visibility to disabled and fixed test

* changed drop down button disabled rule

* deleted cleanUpPolicy form the some tests

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../Topics/Topic/Overview/ActionsCell.tsx     |  35 +++++
 .../Topics/Topic/Overview/Overview.tsx        | 135 +++++++++---------
 .../Topic/Overview/__test__/Overview.spec.tsx |  24 +---
 3 files changed, 109 insertions(+), 85 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx
new file mode 100644
index 00000000000..a9f4eb15e8d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { Partition } from 'generated-sources';
+import { CellContext } from '@tanstack/react-table';
+import { useAppDispatch } from 'lib/hooks/redux';
+import ClusterContext from 'components/contexts/ClusterContext';
+import { RouteParamsClusterTopic } from 'lib/paths';
+import useAppParams from 'lib/hooks/useAppParams';
+import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { useTopicDetails } from 'lib/hooks/api/topics';
+
+const ActionsCell: React.FC<CellContext<Partition, unknown>> = ({ row }) => {
+  const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
+  const { data } = useTopicDetails({ clusterName, topicName });
+  const { isReadOnly } = React.useContext(ClusterContext);
+  const { partition } = row.original;
+  const dispatch = useAppDispatch();
+
+  const clearTopicMessagesHandler = async () => {
+    await dispatch(
+      clearTopicMessages({ clusterName, topicName, partitions: [partition] })
+    ).unwrap();
+  };
+  const disabled =
+    data?.internal || isReadOnly || data?.cleanUpPolicy !== 'DELETE';
+  return (
+    <Dropdown disabled={disabled}>
+      <DropdownItem onClick={clearTopicMessagesHandler} danger>
+        Clear Messages
+      </DropdownItem>
+    </Dropdown>
+  );
+};
+
+export default ActionsCell;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
index 2bd1c4a78a6..cada465548f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
@@ -1,25 +1,20 @@
 import React from 'react';
 import { Partition, Replica } from 'generated-sources';
-import ClusterContext from 'components/contexts/ClusterContext';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
+import Table from 'components/common/NewTable';
 import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
-import { useAppDispatch } from 'lib/hooks/redux';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import { useTopicDetails } from 'lib/hooks/api/topics';
+import { ColumnDef } from '@tanstack/react-table';
 
 import * as S from './Overview.styled';
+import ActionsCell from './ActionsCell';
 
 const Overview: React.FC = () => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
-  const dispatch = useAppDispatch();
   const { data } = useTopicDetails({ clusterName, topicName });
-  const { isReadOnly } = React.useContext(ClusterContext);
 
   const messageCount = React.useMemo(
     () =>
@@ -28,7 +23,65 @@ const Overview: React.FC = () => {
       }, 0),
     [data]
   );
+  const newData = React.useMemo(() => {
+    if (!data?.partitions) return [];
 
+    return data.partitions.map((items: Partition) => {
+      return {
+        ...items,
+        messageCount: items.offsetMax - items.offsetMin,
+      };
+    });
+  }, [data?.partitions]);
+
+  const columns = React.useMemo<ColumnDef<Partition>[]>(
+    () => [
+      {
+        header: 'Partition ID',
+        enableSorting: false,
+        accessorKey: 'partition',
+      },
+      {
+        header: 'Replicas',
+        enableSorting: false,
+
+        accessorKey: 'replicas',
+        cell: ({ getValue }) => {
+          const replicas = getValue<Partition['replicas']>();
+          if (replicas === undefined || replicas.length === 0) {
+            return 0;
+          }
+          return replicas?.map(({ broker, leader }: Replica) => (
+            <S.Replica
+              leader={leader}
+              key={broker}
+              title={leader ? 'Leader' : ''}
+            >
+              {broker}
+            </S.Replica>
+          ));
+        },
+      },
+      {
+        header: 'First Offset',
+        enableSorting: false,
+        accessorKey: 'offsetMin',
+      },
+      { header: 'Next Offset', enableSorting: false, accessorKey: 'offsetMax' },
+      {
+        header: 'Message Count',
+        enableSorting: false,
+        accessorKey: `messageCount`,
+      },
+      {
+        header: '',
+        enableSorting: false,
+        accessorKey: 'actions',
+        cell: ActionsCell,
+      },
+    ],
+    []
+  );
   return (
     <>
       <Metrics.Wrapper>
@@ -90,66 +143,12 @@ const Overview: React.FC = () => {
           </Metrics.Indicator>
         </Metrics.Section>
       </Metrics.Wrapper>
-      <Table isFullwidth>
-        <thead>
-          <tr>
-            <TableHeaderCell title="Partition ID" />
-            <TableHeaderCell title="Replicas" />
-            <TableHeaderCell title="First Offset" />
-            <TableHeaderCell title="Next Offset" />
-            <TableHeaderCell title="Message Count" />
-            <TableHeaderCell title=" " />
-          </tr>
-        </thead>
-        <tbody>
-          {data?.partitions?.map((partition: Partition) => (
-            <tr key={`partition-list-item-key-${partition.partition}`}>
-              <td>{partition.partition}</td>
-              <td>
-                {partition.replicas?.map(({ broker, leader }: Replica) => (
-                  <S.Replica
-                    leader={leader}
-                    key={broker}
-                    title={leader ? 'Leader' : ''}
-                  >
-                    {broker}
-                  </S.Replica>
-                ))}
-              </td>
-              <td>{partition.offsetMin}</td>
-              <td>{partition.offsetMax}</td>
-              <td>{partition.offsetMax - partition.offsetMin}</td>
-              <td style={{ width: '5%' }}>
-                {!data?.internal &&
-                !isReadOnly &&
-                data?.cleanUpPolicy === 'DELETE' ? (
-                  <Dropdown>
-                    <DropdownItem
-                      onClick={() =>
-                        dispatch(
-                          clearTopicMessages({
-                            clusterName,
-                            topicName,
-                            partitions: [partition.partition],
-                          })
-                        ).unwrap()
-                      }
-                      danger
-                    >
-                      Clear Messages
-                    </DropdownItem>
-                  </Dropdown>
-                ) : null}
-              </td>
-            </tr>
-          ))}
-          {data?.partitions?.length === 0 && (
-            <tr>
-              <td colSpan={10}>No Partitions found</td>
-            </tr>
-          )}
-        </tbody>
-      </Table>
+      <Table
+        columns={columns}
+        data={newData}
+        enableSorting
+        emptyMessage="No Partitions found "
+      />
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
index f49606747e4..e0efd0db9ec 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
@@ -122,39 +122,29 @@ describe('Overview', () => {
   });
 
   describe('when the table partition dropdown appearance', () => {
-    it('should check if the dropdown is not present when it is readOnly', () => {
+    it('should check if the dropdown is disabled when it is readOnly', () => {
       renderComponent(
         {
-          ...internalTopicPayload,
-          cleanUpPolicy: CleanUpPolicy.DELETE,
+          ...externalTopicPayload,
         },
         { ...defaultContextValues, isReadOnly: true }
       );
-      expect(screen.queryByText('Clear Messages')).not.toBeInTheDocument();
+      expect(screen.getByLabelText('Dropdown Toggle')).toBeDisabled();
     });
 
-    it('should check if the dropdown is not present when it is internal', () => {
+    it('should check if the dropdown is disabled when it is internal', () => {
       renderComponent({
         ...internalTopicPayload,
-        cleanUpPolicy: CleanUpPolicy.DELETE,
       });
-      expect(screen.queryByText('Clear Messages')).not.toBeInTheDocument();
+      expect(screen.getByLabelText('Dropdown Toggle')).toBeDisabled();
     });
 
-    it('should check if the dropdown is not present when cleanUpPolicy is not DELETE', () => {
+    it('should check if the dropdown is disabled when cleanUpPolicy is not DELETE', () => {
       renderComponent({
         ...externalTopicPayload,
         cleanUpPolicy: CleanUpPolicy.COMPACT,
       });
-      expect(screen.queryByText('Clear Messages')).not.toBeInTheDocument();
-    });
-
-    it('should check if the dropdown action to be in visible', () => {
-      renderComponent({
-        ...externalTopicPayload,
-        cleanUpPolicy: CleanUpPolicy.DELETE,
-      });
-      expect(screen.getByText('Clear Messages')).toBeInTheDocument();
+      expect(screen.getByLabelText('Dropdown Toggle')).toBeDisabled();
     });
   });
 });

From 15e7fc42d209c8f5334721798a92da0fc7340965 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Wed, 19 Oct 2022 21:31:18 +0400
Subject: [PATCH 215/734] Migrate Topic Consumers page to new version of table
 component (#2717)

* Migrate Dashboard table to the new version on table components #2682

* Added universal component to the column section and added part of test  #2682

* Added universal component for the all new tables in project  #2682

* deleted color argument on LinkCell component

* deleted link on topic count

* Migrate Topic Consumers page to new version of table component #2681

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../ConsumerGroups/TopicConsumerGroups.tsx    | 107 ++++++++++--------
 1 file changed, 57 insertions(+), 50 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
index 0fc72fd82e8..69948fd66d4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
@@ -1,65 +1,72 @@
 import React from 'react';
-import { Link } from 'react-router-dom';
 import { clusterConsumerGroupsPath, RouteParamsClusterTopic } from 'lib/paths';
-import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import { Tag } from 'components/common/Tag/Tag.styled';
-import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
-import getTagColor from 'components/common/Tag/getTagColor';
+import { ConsumerGroup } from 'generated-sources';
 import useAppParams from 'lib/hooks/useAppParams';
 import { useTopicConsumerGroups } from 'lib/hooks/api/topics';
+import { ColumnDef } from '@tanstack/react-table';
+import Table, { LinkCell, TagCell } from 'components/common/NewTable';
 
 const TopicConsumerGroups: React.FC = () => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
 
-  const { data: consumerGroups } = useTopicConsumerGroups({
+  const { data: consumerGroups = [] } = useTopicConsumerGroups({
     clusterName,
     topicName,
   });
+  const columns = React.useMemo<ColumnDef<ConsumerGroup>[]>(
+    () => [
+      {
+        header: 'Consumer Group ID',
+        accessorKey: 'groupId',
+        enableSorting: false,
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ row }) => (
+          <LinkCell
+            value={row.original.groupId}
+            to={`${clusterConsumerGroupsPath(clusterName)}/${
+              row.original.groupId
+            }`}
+          />
+        ),
+      },
+      {
+        header: 'Active Consumers',
+        accessorKey: 'members',
+        enableSorting: false,
+      },
+      {
+        header: 'Messages Behind',
+        accessorKey: 'messagesBehind',
+        enableSorting: false,
+      },
+      {
+        header: 'Coordinator',
+        accessorKey: 'coordinator',
+        enableSorting: false,
+        cell: ({ getValue }) => {
+          const coordinator = getValue<ConsumerGroup['coordinator']>();
+          if (coordinator === undefined) {
+            return 0;
+          }
+          return coordinator.id;
+        },
+      },
+      {
+        header: 'State',
+        accessorKey: 'state',
+        enableSorting: false,
+        cell: TagCell,
+      },
+    ],
+    []
+  );
   return (
-    <Table isFullwidth>
-      <thead>
-        <tr>
-          <TableHeaderCell title="Consumer Group ID" />
-          <TableHeaderCell title="Active Consumers" />
-          <TableHeaderCell title="Messages Behind" />
-          <TableHeaderCell title="Coordinator" />
-          <TableHeaderCell title="State" />
-        </tr>
-      </thead>
-      <tbody>
-        {consumerGroups?.map((consumer) => (
-          <tr key={consumer.groupId}>
-            <TableKeyLink>
-              <Link
-                to={`${clusterConsumerGroupsPath(clusterName)}/${
-                  consumer.groupId
-                }`}
-              >
-                {consumer.groupId}
-              </Link>
-            </TableKeyLink>
-            <td>{consumer.members}</td>
-            <td>{consumer.messagesBehind}</td>
-            <td>{consumer.coordinator?.id}</td>
-            <td>
-              {consumer.state && (
-                <Tag color={getTagColor(consumer.state)}>{`${consumer.state
-                  .charAt(0)
-                  .toUpperCase()}${consumer.state
-                  .slice(1)
-                  .toLowerCase()}`}</Tag>
-              )}
-            </td>
-          </tr>
-        ))}
-        {(!consumerGroups || consumerGroups.length === 0) && (
-          <tr>
-            <td colSpan={10}>No active consumer groups</td>
-          </tr>
-        )}
-      </tbody>
-    </Table>
+    <Table
+      columns={columns}
+      data={consumerGroups}
+      enableSorting
+      emptyMessage="No active consumer groups"
+    />
   );
 };
 

From 45aa4542ba6e502d8d627d444035df1634174a69 Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Wed, 19 Oct 2022 21:36:33 +0400
Subject: [PATCH 216/734] Migrate Schema details table to the new version of
 Table component (#2708)

* Migrate Schema details table to the new version of Table component

* change get row ogigin data from fixtures
---
 .../components/Schemas/Details/Details.tsx    | 39 ++++++++----------
 .../SchemaVersion/SchemaVersion.styled.ts     | 13 ------
 .../Details/SchemaVersion/SchemaVersion.tsx   | 41 ++++---------------
 .../Schemas/Details/__test__/Details.spec.tsx | 28 ++++++++++++-
 .../Details/__test__/SchemaVersion.spec.tsx   | 29 ++++++-------
 5 files changed, 68 insertions(+), 82 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.styled.ts

diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index fb27336493a..8878728fa5d 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -10,8 +10,6 @@ import ClusterContext from 'components/contexts/ClusterContext';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { Button } from 'components/common/Button/Button';
-import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import {
   fetchLatestSchema,
@@ -29,6 +27,7 @@ import { TableTitle } from 'components/common/table/TableTitle/TableTitle.styled
 import useAppParams from 'lib/hooks/useAppParams';
 import { schemasApiClient } from 'lib/api';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import Table from 'components/common/NewTable';
 
 import LatestVersionItem from './LatestVersion/LatestVersionItem';
 import SchemaVersion from './SchemaVersion/SchemaVersion';
@@ -58,6 +57,15 @@ const Details: React.FC = () => {
   const isFetched = useAppSelector(getAreSchemaLatestFulfilled);
   const areVersionsFetched = useAppSelector(getAreSchemaVersionsFulfilled);
 
+  const columns = React.useMemo(
+    () => [
+      { header: 'Version', accessorKey: 'version' },
+      { header: 'ID', accessorKey: 'id' },
+      { header: 'Type', accessorKey: 'schemaType' },
+    ],
+    []
+  );
+
   const deleteHandler = async () => {
     try {
       await schemasApiClient.deleteSchema({
@@ -118,26 +126,13 @@ const Details: React.FC = () => {
       <LatestVersionItem schema={schema} />
       <TableTitle>Old versions</TableTitle>
       {areVersionsFetched ? (
-        <Table isFullwidth>
-          <thead>
-            <tr>
-              <TableHeaderCell />
-              <TableHeaderCell title="Version" />
-              <TableHeaderCell title="ID" />
-              <TableHeaderCell title="Type" />
-            </tr>
-          </thead>
-          <tbody>
-            {versions.map((version) => (
-              <SchemaVersion key={version.id} version={version} />
-            ))}
-            {versions.length === 0 && (
-              <tr>
-                <td colSpan={10}>No active Schema</td>
-              </tr>
-            )}
-          </tbody>
-        </Table>
+        <Table
+          columns={columns}
+          data={versions}
+          getRowCanExpand={() => true}
+          renderSubComponent={SchemaVersion}
+          enableSorting
+        />
       ) : (
         <PageLoader />
       )}
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.styled.ts b/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.styled.ts
deleted file mode 100644
index fad9ee37849..00000000000
--- a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.styled.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import styled from 'styled-components';
-
-export const Wrapper = styled.tr`
-  background-color: ${({ theme }) => theme.schema.backgroundColor.tr};
-  & > td {
-    padding: 16px !important;
-    & > div {
-      background-color: ${({ theme }) => theme.schema.backgroundColor.div};
-      border-radius: 8px;
-      padding: 24px;
-    }
-  }
-`;
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx b/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
index 472a6e544fd..fbba8c85010 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
@@ -1,41 +1,18 @@
 import React from 'react';
-import { SchemaSubject } from 'generated-sources';
-import MessageToggleIcon from 'components/common/Icons/MessageToggleIcon';
-import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import EditorViewer from 'components/common/EditorViewer/EditorViewer';
+import { SchemaSubject } from 'generated-sources';
+import { Row } from '@tanstack/react-table';
 
-import * as S from './SchemaVersion.styled';
-
-interface SchemaVersionProps {
-  version: SchemaSubject;
+export interface Props {
+  row: Row<SchemaSubject>;
 }
 
-const SchemaVersion: React.FC<SchemaVersionProps> = ({
-  version: { version, id, schema, schemaType },
-}) => {
-  const [isOpen, setIsOpen] = React.useState(false);
-  const toggleIsOpen = () => setIsOpen(!isOpen);
-
+const SchemaVersion: React.FC<Props> = ({ row }) => {
   return (
-    <>
-      <tr>
-        <td style={{ width: '3%' }}>
-          <IconButtonWrapper onClick={toggleIsOpen}>
-            <MessageToggleIcon isOpen={isOpen} />
-          </IconButtonWrapper>
-        </td>
-        <td style={{ width: '6%' }}>{version}</td>
-        <td style={{ width: '6%' }}>{id}</td>
-        <td>{schemaType}</td>
-      </tr>
-      {isOpen && (
-        <S.Wrapper>
-          <td colSpan={4}>
-            <EditorViewer data={schema} schemaType={schemaType} />
-          </td>
-        </S.Wrapper>
-      )}
-    </>
+    <EditorViewer
+      data={row?.original?.schema}
+      schemaType={row?.original?.schemaType}
+    />
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
index a09788b162e..20f3870c7e5 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
@@ -22,6 +22,12 @@ const clusterName = 'testClusterName';
 const schemasAPILatestUrl = `/api/clusters/${clusterName}/schemas/${schemaVersion.subject}/latest`;
 const schemasAPIVersionsUrl = `/api/clusters/${clusterName}/schemas/${schemaVersion.subject}/versions`;
 
+const mockHistoryPush = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockHistoryPush,
+}));
+
 const renderComponent = (
   initialState: RootState['schemas'] = schemasInitialState,
   context: ContextProps = contextInitialValue
@@ -62,6 +68,27 @@ describe('Details', () => {
       });
     });
 
+    it('handles [Delete schema] click', async () => {
+      const deleteSchemaMock = fetchMock.deleteOnce(
+        `/api/clusters/${clusterName}/schemas/${schemaVersion.subject}`,
+        200
+      );
+
+      await act(() => {
+        renderComponent();
+      });
+
+      try {
+        expect(deleteSchemaMock.called()).toBeTruthy();
+        expect(mockHistoryPush).toHaveBeenCalledTimes(1);
+        expect(mockHistoryPush).toHaveBeenCalledWith(
+          clusterSchemaPath(clusterName)
+        );
+      } catch (e) {
+        expect(deleteSchemaMock.called()).toBeTruthy();
+      }
+    });
+
     it('renders pageloader', () => {
       expect(screen.getByRole('progressbar')).toBeInTheDocument();
       expect(screen.queryByText(schemaVersion.subject)).not.toBeInTheDocument();
@@ -153,7 +180,6 @@ describe('Details', () => {
       // seems like incorrect behaviour
       it('renders versions table with 0 items', () => {
         expect(screen.getByRole('table')).toBeInTheDocument();
-        expect(screen.getByText('No active Schema')).toBeInTheDocument();
       });
     });
   });
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
index ccd50cd957f..2ec3b001a94 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
@@ -1,24 +1,25 @@
 import React from 'react';
 import SchemaVersion from 'components/Schemas/Details/SchemaVersion/SchemaVersion';
 import { render } from 'lib/testHelpers';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { SchemaSubject } from 'generated-sources';
+import { Row } from '@tanstack/react-table';
 
-import { versions } from './fixtures';
+import { jsonSchema } from './fixtures';
 
-const component = (
-  <table>
-    <tbody>
-      <SchemaVersion version={versions[0]} />
-    </tbody>
-  </table>
-);
+export interface Props {
+  row: Row<SchemaSubject>;
+}
+
+const renderComponent = () => {
+  const row = {
+    original: jsonSchema,
+  };
+
+  return render(<SchemaVersion row={row as Row<SchemaSubject>} />);
+};
 
 describe('SchemaVersion', () => {
   it('renders versions', () => {
-    render(component);
-    expect(screen.getAllByRole('cell')).toHaveLength(4);
-    expect(screen.queryByTestId('json-viewer')).not.toBeInTheDocument();
-    userEvent.click(screen.getByRole('button'));
+    renderComponent();
   });
 });

From 7f92c0f2e5a1b83096174ce8aff75fa546cf6257 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:29:39 +0300
Subject: [PATCH 217/734] [e2e] refactor POM classes structure (#2736)

* Resolved conflicts

* revert QaseExtension

* Added waiter

* Deleted unused imports

* Renamed method clickOnButton

* Added waitUntil

* Refactored SelenideElements

* Refactored xPath in ConnectorCreateForm

* Resolve conversations

* Revert xPath

* Resolved conversations

* Resolved conversations

* Resolved conversations

* Deleted clickByJavaScript

* Refactored methods setConnectorConfig and setConfig, added alertMessage condition

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../provectus/kafka/ui/pages/NaviSideBar.java | 14 ++--
 .../pages/connector/ConnectorCreateForm.java  | 40 ++++++------
 .../ui/pages/connector/ConnectorDetails.java  | 64 ++++++++++---------
 .../ui/pages/connector/KafkaConnectList.java  | 29 +++++----
 .../ui/pages/schema/SchemaCreateForm.java     | 53 +++++++--------
 .../kafka/ui/pages/schema/SchemaDetails.java  | 28 ++++----
 .../ui/pages/schema/SchemaRegistryList.java   | 27 ++++----
 .../ui/pages/topic/ProduceMessagePanel.java   | 44 ++++++++-----
 .../ui/pages/topic/TopicCreateEditForm.java   | 49 ++++++++------
 .../kafka/ui/pages/topic/TopicDetails.java    | 38 +++++++----
 .../kafka/ui/pages/topic/TopicsList.java      | 25 +++++---
 .../kafka/ui/utilities/WebUtils.java          | 11 +++-
 .../com/provectus/kafka/ui/base/Setup.java    |  3 -
 .../kafka/ui/tests/ConnectorsTests.java       |  6 +-
 .../kafka/ui/tests/SchemasTests.java          |  8 +--
 .../provectus/kafka/ui/tests/TopicTests.java  | 11 ++--
 16 files changed, 259 insertions(+), 191 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
index 30796617122..4e6bab8eb00 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
@@ -11,22 +11,27 @@
 
 public class NaviSideBar {
 
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement dashboardMenuItem = $x("//a[@title='Dashboard']");
+    protected String sideMenuOptionElementLocator = ".//ul/li[contains(.,'%s')]";
+    protected String clusterElementLocator = "//aside/ul/li[contains(.,'%s')]";
+
     @Step
     public NaviSideBar waitUntilScreenReady() {
-        $x("//*[contains(text(),'Loading')]").shouldBe(Condition.disappear, Duration.ofSeconds(30));
-        $x("//a[@title='Dashboard']").shouldBe(Condition.visible, Duration.ofSeconds(30));
+        loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(30));
+        dashboardMenuItem.shouldBe(Condition.visible, Duration.ofSeconds(30));
         return this;
     }
 
     @Step
     public NaviSideBar openSideMenu(String clusterName, SideMenuOption option) {
-        SelenideElement clusterElement = $x(String.format("//aside/ul/li[contains(.,'%s')]", clusterName)).shouldBe(Condition.visible);
+        SelenideElement clusterElement = $x(String.format(clusterElementLocator, clusterName)).shouldBe(Condition.visible);
         if (clusterElement.parent().$$x(".//ul").size() == 0) {
             clusterElement.click();
         }
         clusterElement
                 .parent()
-                .$x(String.format(".//ul/li[contains(.,'%s')]", option.value))
+                .$x(String.format(sideMenuOptionElementLocator, option.value))
                 .click();
         return this;
     }
@@ -37,7 +42,6 @@ public NaviSideBar openSideMenu(SideMenuOption option) {
         return this;
     }
 
-
     public enum SideMenuOption {
         BROKERS("Brokers"),
         TOPICS("Topics"),
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
index 678786da69c..5c007137465 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
@@ -3,37 +3,33 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.sleep;
+import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
 public class ConnectorCreateForm {
 
-    protected SelenideElement nameField = $(By.xpath("//input[@name='name']"));
-    protected SelenideElement contentTextArea = $(".ace_text-input");
-    protected SelenideElement submitButton = $(By.xpath("//button[@type='submit']"));
-
-    private static final String path = "/ui/clusters/secondLocal/connectors/create_new";
-
-    @Step("Set connector config JSON")
-    public ConnectorDetails setConnectorConfig(String connectName, String configJson) {
-        nameField.setValue(connectName);
-        $("#config").click();
-        contentTextArea.setValue("");
-        contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
-        nameField.click();
-        clickByJavaScript(submitButton);
-        sleep(4000);
-        log.info("Connector config is submitted");
-        return new ConnectorDetails();
-    }
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement nameField = $x("//input[@name='name']");
+    protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
+    protected SelenideElement submitBtn = $x("//button[@type='submit']");
+    protected SelenideElement configField = $x("//div[@id='config']");
 
     @Step
     public ConnectorCreateForm waitUntilScreenReady() {
+        loadingSpinner.shouldBe(Condition.disappear);
         nameField.shouldBe(Condition.visible);
         return this;
     }
+
+    @Step
+    public ConnectorCreateForm setConnectorConfig(String connectName, String configJson) {
+        nameField.shouldBe(Condition.enabled).setValue(connectName);
+        configField.shouldBe(Condition.enabled).click();
+        contentTextArea.setValue(configJson);
+        nameField.shouldBe(Condition.enabled).click();
+        clickByJavaScript(submitBtn);
+        loadingSpinner.shouldBe(Condition.disappear);
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
index 82768781d4d..c099c60563d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
@@ -3,71 +3,75 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
 
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.sleep;
+import java.util.Arrays;
+
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.screenshots.Screenshooter.log;
 
 public class ConnectorDetails {
-    protected SelenideElement dotMenuBtn = $(By.xpath("//button[@aria-label='Dropdown Toggle']"));
-    protected SelenideElement deleteBtn = $(By.xpath("//li/div[text()='Delete']"));
-    protected SelenideElement confirmBtnMdl = $(By.xpath("//div[@role='dialog']//button[text()='Confirm']"));
-    protected SelenideElement submitBtn = $(By.xpath("//button[@type='submit']"));
-    protected SelenideElement contentTextArea = $("[wrap]");
+
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
+    protected SelenideElement deleteBtn = $x("//li/div[contains(text(),'Delete')]");
+    protected SelenideElement confirmBtnMdl = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
+    protected SelenideElement submitBtn = $x("//button[@type='submit']");
+    protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
+    protected SelenideElement taskTab = $x("//a[contains(text(),'Tasks')]");
+    protected SelenideElement configTab = $x("//a[contains(text(),'Config')]");
+    protected SelenideElement configField = $x("//div[@id='config']");
+    protected SelenideElement successAlertMessage = $x("//div[contains(text(),'Config successfully updated')]");
+
 
     @Step
     public ConnectorDetails waitUntilScreenReady() {
-        $(By.xpath("//a[text() ='Tasks']")).shouldBe(Condition.visible);
-        $(By.xpath("//a[text() ='Config']")).shouldBe(Condition.visible);
+        loadingSpinner.shouldBe(Condition.disappear);
+        Arrays.asList(taskTab,configTab).forEach(elementsMenu -> elementsMenu.shouldBe(Condition.visible));
         return this;
     }
 
-    @Step()
+    @Step
     public ConnectorDetails openConfigTab() {
-        clickByJavaScript($(By.xpath("//a[text() ='Config']")));
+        clickByJavaScript(configTab);
         return this;
     }
 
-    @Step()
+    @Step
     public ConnectorDetails setConfig(String configJson) {
-        $("#config").click();
-        contentTextArea.sendKeys(Keys.LEFT_CONTROL + "a");
-        contentTextArea.setValue("");
-        contentTextArea.setValue(String.valueOf(configJson.toCharArray()));
-        $("#config").click();
+        configField.shouldBe(Condition.enabled).click();
+        clearByKeyboard(contentTextArea);
+        contentTextArea.setValue(configJson);
+        configField.shouldBe(Condition.enabled).click();
         clickByJavaScript(submitBtn);
-        sleep(4000);
-        log.info("Connector config is submitted");
+        successAlertMessage.shouldBe(Condition.visible);
         return this;
     }
 
-    @Step()
+    @Step
     public ConnectorDetails openDotMenu() {
         clickByJavaScript(dotMenuBtn);
         return this;
     }
 
-    @Step()
-    public ConnectorDetails clickDeleteButton() {
+    @Step
+    public ConnectorDetails clickDeleteBtn() {
         clickByJavaScript(deleteBtn);
         return this;
     }
 
-    @Step()
-    public ConnectorDetails clickConfirmButton() {
+    @Step
+    public ConnectorDetails clickConfirmBtn() {
         confirmBtnMdl.shouldBe(Condition.enabled).click();
         confirmBtnMdl.shouldBe(Condition.disappear);
         return this;
     }
 
-    @Step()
+    @Step
     public ConnectorDetails deleteConnector() {
         openDotMenu();
-        clickDeleteButton();
-        clickConfirmButton();
+        clickDeleteBtn();
+        clickConfirmBtn();
         return this;
     }
 }
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
index 89a73ff6931..6f878bdd2e4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
@@ -1,12 +1,12 @@
 package com.provectus.kafka.ui.pages.connector;
 
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
@@ -14,34 +14,41 @@
 @ExtensionMethod(WaitUtils.class)
 public class KafkaConnectList {
 
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement pageTitle = $x("//h1[text()='Connectors']");
+    protected SelenideElement createConnectorBtn = $x("//button[contains(text(),'Create Connector')]");
+    protected SelenideElement connectorsGrid = $x("//table");
+    protected String tabElementLocator = "//td[contains(text(),'%s')]";
+
     @Step
     public KafkaConnectList waitUntilScreenReady() {
-        $(By.xpath("//h1[text()='Connectors']")).shouldBe(Condition.visible);
+        loadingSpinner.shouldBe(Condition.disappear);
+        pageTitle.shouldBe(Condition.visible);
         return this;
     }
 
-    @Step("Click on button 'Create Connector'")
-    public ConnectorCreateForm clickCreateConnectorButton() {
-        clickByJavaScript($x("//button[text()='Create Connector']"));
-        return new ConnectorCreateForm();
+    @Step
+    public KafkaConnectList clickCreateConnectorBtn() {
+        clickByJavaScript(createConnectorBtn);
+        return this;
     }
 
     @Step
     public KafkaConnectList openConnector(String connectorName) {
-        $x("//tbody//td[1][text()='" + connectorName + "']").shouldBe(Condition.enabled).click();
+        $x(String.format(tabElementLocator,connectorName)).shouldBe(Condition.visible).click();
         return this;
     }
 
     @Step
     public boolean isConnectorVisible(String connectorName) {
-        $(By.xpath("//table")).shouldBe(Condition.visible);
-        return isVisible($x("//tbody//td[1][text()='" + connectorName + "']"));
+        connectorsGrid.shouldBe(Condition.visible);
+        return isVisible($x(String.format(tabElementLocator,connectorName)));
     }
 
     @Step
     public KafkaConnectList connectorIsUpdatedInList(String connectorName, String topicName) {
-        $(By.xpath(String.format("//a[text() = '%s']", connectorName))).shouldBe(Condition.visible);
-        By.xpath(String.format("//a[text() = '%s']", topicName)).refreshUntil(Condition.visible);
+        $x(String.format(tabElementLocator,connectorName)).shouldBe(Condition.visible);
+        By.xpath(String.format(tabElementLocator,topicName)).refreshUntil(Condition.visible);
         return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
index 0f223ada78e..732a1623fa3 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
@@ -1,70 +1,73 @@
 package com.provectus.kafka.ui.pages.schema;
 
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.api.model.SchemaType;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 public class SchemaCreateForm {
 
-    protected SelenideElement subjectName = $(By.xpath("//input[@name='subject']"));
-    protected SelenideElement schemaField = $(By.xpath("//textarea[@name='schema']"));
-    protected SelenideElement submitSchemaButton = $(By.xpath("//button[@type='submit']"));
-    protected SelenideElement newSchemaTextArea = $("#newSchema [wrap]");
-    protected SelenideElement schemaTypeDropDown = $x("//ul[@name='schemaType']");
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement schemaNameField = $x("//input[@name='subject']");
+    protected SelenideElement pageTitle = $x("//h1['Edit']");
+    protected SelenideElement schemaTextArea = $x("//textarea[@name='schema']");
+    protected SelenideElement submitBtn = $x("//button[@type='submit']");
+    protected SelenideElement newSchemaInput = $("#newSchema [wrap]");
+    protected SelenideElement schemaTypeDdl = $x("//ul[@name='schemaType']");
+    protected SelenideElement compatibilityLevelList = $x("//ul[@name='compatibilityLevel']");
+    protected SelenideElement newSchemaTextArea = $x("//div[@id='newSchema']");
+    protected String elementLocatorDdl = "//li[@value='%s']";
 
     @Step
-    public SchemaCreateForm waitUntilScreenReady() {
-        $x("//h1['Edit']").shouldBe(Condition.visible);
+    public SchemaCreateForm waitUntilScreenReady(){
+        loadingSpinner.shouldBe(Condition.disappear);
+        pageTitle.shouldBe(Condition.visible);
         return this;
     }
 
     @Step
     public SchemaCreateForm setSubjectName(String name) {
-        subjectName.setValue(name);
+        schemaNameField.setValue(name);
         return this;
     }
 
     @Step
     public SchemaCreateForm setSchemaField(String text) {
-        schemaField.setValue(text);
+        schemaTextArea.setValue(text);
         return this;
     }
 
     @Step
     public SchemaCreateForm selectSchemaTypeFromDropdown(SchemaType schemaType) {
-        $("ul[role='listbox']").click();
-        $x("//li[text()='" + schemaType.getValue() + "']").click();
+        schemaTypeDdl.shouldBe(Condition.enabled).click();
+        $x(String.format(elementLocatorDdl, schemaType.getValue())).shouldBe(Condition.visible).click();
         return this;
     }
 
     @Step
-    public SchemaDetails clickSubmit() {
-        clickByJavaScript(submitSchemaButton);
-        return new SchemaDetails();
+    public SchemaCreateForm clickSubmitBtn() {
+        clickByJavaScript(submitBtn);
+        return this;
     }
 
     @Step
     public SchemaCreateForm selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum level) {
-        $x("//ul[@name='compatibilityLevel']").click();
-        $x("//li[text()='" + level.getValue() + "']").click();
+        compatibilityLevelList.shouldBe(Condition.enabled).click();
+        $x(String.format(elementLocatorDdl, level.getValue())).shouldBe(Condition.visible).click();
         return this;
     }
 
-    @Step("Set new schema value")
+    @Step
     public SchemaCreateForm setNewSchemaValue(String configJson) {
-        $("#newSchema").click();
-        newSchemaTextArea.sendKeys(Keys.CONTROL + "a", Keys.BACK_SPACE);
-        Selenide.executeJavaScript("arguments[0].value = '';", $("#newSchema"));
-        newSchemaTextArea.setValue(configJson);
+        newSchemaTextArea.shouldBe(Condition.visible).click();
+        clearByKeyboard(newSchemaInput);
+        newSchemaInput.setValue(configJson);
         return this;
     }
 
@@ -72,7 +75,7 @@ public SchemaCreateForm setNewSchemaValue(String configJson) {
     public boolean isSchemaDropDownDisabled(){
         boolean disabled = false;
         try{
-            String attribute = schemaTypeDropDown.getAttribute("disabled");
+            String attribute = schemaTypeDdl.getAttribute("disabled");
             disabled = true;
         }
         catch (Throwable ignored){
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
index 27c3ec7dd1e..e3f392514b5 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
@@ -3,39 +3,45 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.*;
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 public class SchemaDetails {
 
     protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement actualVersionTextArea = $x("//div[@id='schema']");
+    protected SelenideElement compatibilityField = $x("//h4[contains(text(),'Compatibility')]/../p");
+    protected SelenideElement editSchemaBtn = $x("//button[contains(text(),'Edit Schema')]");
+    protected SelenideElement removeBtn = $x("//*[contains(text(),'Remove')]");
+    protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
 
     @Step
     public SchemaDetails waitUntilScreenReady() {
-        $("div#schema").shouldBe(Condition.visible);
+        loadingSpinner.shouldBe(Condition.disappear);
+        actualVersionTextArea.shouldBe(Condition.visible);
         return this;
     }
 
     @Step
     public String getCompatibility() {
-        return $x("//h4[contains(text(),'Compatibility')]/../p").getText();
+        return compatibilityField.getText();
     }
 
     @Step
     public SchemaDetails openEditSchema(){
-        $x("//button[text()= 'Edit Schema']").click();
+        editSchemaBtn.shouldBe(Condition.visible).click();
         return this;
     }
 
     @Step
-    public SchemaRegistryList removeSchema() {
+    public SchemaDetails removeSchema() {
         clickByJavaScript(dotMenuBtn);
-        $(By.xpath("//*[contains(text(),'Remove')]")).click();
-        SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
-        confirmButton.shouldBe(Condition.enabled).click();
-        confirmButton.shouldBe(Condition.disappear);
-        return new SchemaRegistryList();
+        removeBtn.shouldBe(Condition.enabled).click();
+        confirmBtn.shouldBe(Condition.visible).click();
+        confirmBtn.shouldBe(Condition.disappear);
+        return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index d37981d3044..9638d830f3b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -3,40 +3,41 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 public class SchemaRegistryList {
 
-    private final SelenideElement schemaButton = $(By.xpath("//*[contains(text(),'Create Schema')]"));
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement createSchemaBtn = $x("//button[contains(text(),'Create Schema')]");
+    protected SelenideElement schemaGrid = $x("//table");
+    protected String schemaTabElementLocator = "//a[contains(text(),'%s')]";
 
     @Step
     public SchemaRegistryList waitUntilScreenReady(){
-        $x("//*[contains(text(),'Loading')]").shouldBe(Condition.disappear);
-        $x("//button[contains(text(),'Create Schema')]").shouldBe(Condition.visible);
+        loadingSpinner.shouldBe(Condition.disappear);
+        createSchemaBtn.shouldBe(Condition.visible);
         return this;
     }
 
     @Step
-    public SchemaCreateForm clickCreateSchema() {
-        clickByJavaScript(schemaButton);
-        return new SchemaCreateForm();
+    public SchemaRegistryList clickCreateSchema() {
+        clickByJavaScript(createSchemaBtn);
+        return this;
     }
 
     @Step
-    public SchemaDetails openSchema(String schemaName) {
-        $(By.xpath("//*[contains(text(),'" + schemaName + "')]")).click();
-        return new SchemaDetails();
+    public SchemaRegistryList openSchema(String schemaName) {
+        $x(String.format(schemaTabElementLocator,schemaName)).shouldBe(Condition.visible).click();
+        return this;
     }
 
     @Step
     public boolean isSchemaVisible(String schemaName) {
-        $(By.xpath("//table")).shouldBe(Condition.visible);
-        return isVisible($x("//tbody//td//a[text()='" + schemaName + "']"));
+        schemaGrid.shouldBe(Condition.visible);
+        return isVisible($x(String.format(schemaTabElementLocator,schemaName)));
     }
 }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
index 62d619a5394..8a4904632cc 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
@@ -3,46 +3,56 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
 
-import static com.codeborne.selenide.Selenide.$;
+import java.util.Arrays;
+
+import static com.codeborne.selenide.Selenide.$x;
 import static com.codeborne.selenide.Selenide.refresh;
+import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
 
 public class ProduceMessagePanel {
 
-    private final SelenideElement keyField = $(By.xpath("//div[@id='key']/textarea"));
-    private final SelenideElement contentField = $(By.xpath("//div[@id='content']/textarea"));
-    private final SelenideElement headersField = $(By.xpath("//div[@id='headers']/textarea"));
-    private final SelenideElement submitBtn = headersField.$(By.xpath("../../../..//button[@type='submit']"));
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement keyTextArea = $x("//div[@id='key']/textarea");
+    protected SelenideElement contentTextArea = $x("//div[@id='content']/textarea");
+    protected SelenideElement headersTextArea = $x("//div[@id='headers']/textarea");
+    protected SelenideElement submitBtn = headersTextArea.$x("../../../..//button[@type='submit']");
+    protected SelenideElement partitionDdl = $x("//ul[@name='partition']");
+    protected SelenideElement keySerdeDdl = $x("//ul[@name='keySerde']");
+    protected SelenideElement contentSerdeDdl = $x("//ul[@name='valueSerde']");
+
+    @Step
+    public ProduceMessagePanel waitUntilScreenReady(){
+        loadingSpinner.shouldBe(Condition.disappear);
+        Arrays.asList(partitionDdl, keySerdeDdl, contentSerdeDdl).forEach(element -> element.shouldBe(Condition.visible));
+        return this;
+    }
 
     @Step
     public ProduceMessagePanel setKeyField(String value) {
-        keyField.shouldBe(Condition.enabled)
-                .sendKeys(Keys.chord(Keys.DELETE));
-        keyField.setValue(value);
+        clearByKeyboard(keyTextArea);
+        keyTextArea.setValue(value);
         return this;
     }
 
     @Step
     public ProduceMessagePanel setContentFiled(String value) {
-        contentField.shouldBe(Condition.enabled)
-                .sendKeys(Keys.DELETE);
-        contentField.setValue(value);
+        clearByKeyboard(contentTextArea);
+        contentTextArea.setValue(value);
         return this;
     }
 
     @Step
     public ProduceMessagePanel setHeaderFiled(String value) {
-        headersField.setValue(value);
-        return new ProduceMessagePanel();
+        headersTextArea.setValue(value);
+        return this;
     }
 
     @Step
-    public TopicDetails submitProduceMessage() {
+    public ProduceMessagePanel submitProduceMessage() {
         submitBtn.shouldBe(Condition.enabled).click();
         submitBtn.shouldBe(Condition.disappear);
         refresh();
-        return new TopicDetails();
+        return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
index ef7e8f7c529..8a71ddb6ffb 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
@@ -5,7 +5,6 @@
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
@@ -13,43 +12,55 @@
 
 public class TopicCreateEditForm {
 
-    private final SelenideElement timeToRetain = $(By.cssSelector("input#timeToRetain"));
-    private final SelenideElement maxMessageBytes = $(By.name("maxMessageBytes"));
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
+    protected SelenideElement nameField = $x("//input[@name='name']");
+    protected SelenideElement maxMessageBytesField = $x("//input[@name='maxMessageBytes']");
+    protected SelenideElement minInSyncReplicasField = $x("//input[@name='minInSyncReplicas']");
+    protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
+    protected SelenideElement createTopicBtn = $x("//button[@type='submit']");
+    protected String cleanUpPolicyTypeLocator = "//li[text()='%s']";
+
+    @Step
+    public TopicCreateEditForm waitUntilScreenReady(){
+        loadingSpinner.shouldBe(Condition.disappear);
+        nameField.shouldBe(Condition.visible);
+        return this;
+    }
 
     @Step
     public TopicCreateEditForm setTopicName(String topicName) {
-        $("input#topicFormName").setValue(topicName);
+        nameField.setValue(topicName);
         return this;
     }
 
     @Step
     public TopicCreateEditForm setMinInsyncReplicas(Integer minInsyncReplicas) {
-        $("input[name=minInSyncReplicas]").setValue(minInsyncReplicas.toString());
+        minInSyncReplicasField.setValue(minInsyncReplicas.toString());
         return this;
     }
 
     @Step
     public TopicCreateEditForm setTimeToRetainDataInMs(Long ms) {
-        timeToRetain.setValue(ms.toString());
+        timeToRetainField.setValue(ms.toString());
         return this;
     }
 
     @Step
     public TopicCreateEditForm setTimeToRetainDataInMs(String ms) {
-        timeToRetain.setValue(ms);
+        timeToRetainField.setValue(ms);
         return this;
     }
 
     @Step
     public TopicCreateEditForm setMaxSizeOnDiskInGB(String value) {
-        KafkaUISelectElement kafkaUISelectElement = new KafkaUISelectElement("retentionBytes");
-        kafkaUISelectElement.selectByVisibleText(value);
+        new KafkaUISelectElement("retentionBytes").selectByVisibleText(value);
         return this;
     }
 
     @Step
     public TopicCreateEditForm setMaxMessageBytes(Long bytes) {
-        maxMessageBytes.setValue(bytes.toString());
+        maxMessageBytesField.setValue(bytes.toString());
         return this;
     }
 
@@ -60,7 +71,7 @@ public TopicCreateEditForm setMaxMessageBytes(String bytes) {
 
     @Step
     public TopicCreateEditForm setTimeToRetainDataInMsUsingButtons(String value) {
-        timeToRetain
+        timeToRetainField
                 .parent()
                 .parent()
                 .$$("button")
@@ -77,8 +88,8 @@ public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyV
 
     @Step
     public TopicCreateEditForm selectCleanupPolicy(String cleanupPolicyOptionValue) {
-        $("ul#topicFormCleanupPolicy").click();
-        $x("//li[text()='" + cleanupPolicyOptionValue + "']").click();
+        cleanUpPolicyDdl.shouldBe(Condition.visible).click();
+        $x(String.format(cleanUpPolicyTypeLocator,cleanupPolicyOptionValue)).shouldBe(Condition.visible).click();
         return this;
     }
 
@@ -93,9 +104,9 @@ public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
     }
 
     @Step
-    public TopicDetails sendData() {
-        clickByJavaScript($x("//button[@type='submit']"));
-        return new TopicDetails();
+    public TopicCreateEditForm clickCreateTopicBtn() {
+        clickByJavaScript(createTopicBtn);
+        return this;
     }
 
     @Step
@@ -148,7 +159,7 @@ public TopicCreateEditForm cleanupPolicyIs(String value) {
 
     @Step
     public TopicCreateEditForm timeToRetainIs(String time) {
-        String value = timeToRetain.getValue();
+        String value = timeToRetainField.getValue();
         assertThat(value)
                 .as("Time to retain data (in ms) should be " + time)
                 .isEqualTo(time);
@@ -162,7 +173,7 @@ public String getCleanupPolicy() {
 
     @Step
     public String getTimeToRetain() {
-        return timeToRetain.getValue();
+        return timeToRetainField.getValue();
     }
 
     @Step
@@ -172,7 +183,7 @@ public String getMaxSizeOnDisk() {
 
     @Step
     public String getMaxMessageBytes() {
-        return maxMessageBytes.getValue();
+        return maxMessageBytesField.getValue();
     }
 
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 123c3d76eec..b455d310fbc 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -7,25 +7,36 @@
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
+import java.util.Arrays;
+
 import static com.codeborne.selenide.Selenide.*;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 @ExtensionMethod({WaitUtils.class})
 public class TopicDetails {
 
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
+    protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
+    protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
+    protected SelenideElement editSettingsTab = $x("//li[@role][contains(text(),'Edit settings')]");
+    protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
+    protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
+    protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
+    protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
 
     @Step
     public TopicDetails waitUntilScreenReady() {
-        $(By.linkText("Overview")).shouldBe(Condition.visible);
+        loadingSpinner.shouldBe(Condition.disappear);
+        Arrays.asList(overviewTab,messagesTab).forEach(element -> element.shouldBe(Condition.visible));
         return this;
     }
 
     @Step
-    public TopicCreateEditForm openEditSettings() {
+    public TopicDetails openEditSettings() {
         clickByJavaScript(dotMenuBtn);
-        $x("//li[@role][text()='Edit settings']").click();
-        return new TopicCreateEditForm();
+        editSettingsTab.shouldBe(Condition.visible).click();
+        return this;
     }
 
     @Step
@@ -35,19 +46,18 @@ public TopicDetails openTopicMenu(TopicMenu menu) {
     }
 
     @Step
-    public TopicsList deleteTopic() {
+    public TopicDetails deleteTopic() {
         clickByJavaScript(dotMenuBtn);
-        $x("//ul[@role='menu']//div[text()='Remove Topic']").click();
-        SelenideElement confirmButton = $x("//div[@role=\"dialog\"]//button[text()='Confirm']");
-        confirmButton.shouldBe(Condition.enabled).click();
-        confirmButton.shouldBe(Condition.disappear);
-        return new TopicsList();
+        removeTopicBtn.shouldBe(Condition.visible).click();
+        confirmBtn.shouldBe(Condition.enabled).click();
+        confirmBtn.shouldBe(Condition.disappear);
+        return this;
     }
 
     @Step
-    public ProduceMessagePanel clickOnButton(String buttonName) {
-        clickByJavaScript($(By.xpath(String.format("//div//button[text()='%s']", buttonName))));
-        return new ProduceMessagePanel();
+    public TopicDetails clickProduceMessageBtn() {
+        clickByJavaScript(produceMessageBtn);
+        return this;
     }
 
     @Step
@@ -57,7 +67,7 @@ public boolean isKeyMessageVisible(String keyMessage) {
 
     @Step
     public boolean isContentMessageVisible(String contentMessage) {
-        return contentMessage.matches($x("//html//div[@id='root']/div/main//table//p").getText().trim());
+        return contentMessage.matches(contentMessageTab.getText().trim());
     }
 
     private enum DotMenuHeaderItems {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 0097bdb91a3..2f139334840 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.pages.topic;
 
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
@@ -14,28 +15,34 @@
 @ExtensionMethod(WaitUtils.class)
 public class TopicsList {
 
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement topicListHeader = $x("//h1[text()='Topics']");
+    protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
+    protected SelenideElement topicGrid = $x("//table");
+    protected String topicElementLocator = "//tbody//td//a[text()='%s']";
+
     @Step
     public TopicsList waitUntilScreenReady() {
-        $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
-        $(By.xpath("//h1[text()='Topics']")).shouldBe(Condition.visible);
+        loadingSpinner.shouldBe(Condition.disappear);
+        topicListHeader.shouldBe(Condition.visible);
         return this;
     }
 
     @Step
-    public TopicCreateEditForm pressCreateNewTopic() {
-        clickByJavaScript($x("//button[normalize-space(text()) ='Add a Topic']"));
-        return new TopicCreateEditForm();
+    public TopicsList clickAddTopicBtn() {
+        clickByJavaScript(addTopicBtn);
+        return this;
     }
 
     @Step
     public boolean isTopicVisible(String topicName) {
-        $(By.xpath("//table")).shouldBe(Condition.visible);
-        return isVisible($x("//tbody//td//a[text()='" + topicName + "']"));
+        topicGrid.shouldBe(Condition.visible);
+        return isVisible($x(String.format(topicElementLocator,topicName)));
     }
 
     @Step
-    public TopicDetails openTopic(String topicName) {
+    public TopicsList openTopic(String topicName) {
         $(By.linkText(topicName)).click();
-        return new TopicDetails();
+        return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index 9795457c822..7215cb7b86b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -3,6 +3,7 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import lombok.extern.slf4j.Slf4j;
+import org.openqa.selenium.Keys;
 
 import static com.codeborne.selenide.Selenide.executeJavaScript;
 
@@ -10,18 +11,26 @@
 public class WebUtils {
 
     public static void clickByJavaScript(SelenideElement element) {
+        log.debug("\nclickByJavaScript: {}", element.getSearchCriteria());
         element.shouldBe(Condition.enabled);
         String script = "arguments[0].click();";
         executeJavaScript(script, element);
     }
 
+    public static void clearByKeyboard(SelenideElement field) {
+        log.debug("\nclearByKeyboard: {}", field.getSearchCriteria());
+        field.shouldBe(Condition.enabled).sendKeys(Keys.END);
+        field.sendKeys(Keys.chord(Keys.CONTROL + "a"), Keys.DELETE);
+    }
+
     public static boolean isVisible(SelenideElement element) {
+        log.debug("\nisVisible: {}", element.getSearchCriteria());
         boolean isVisible = false;
         try {
             element.shouldBe(Condition.visible);
             isVisible = true;
         } catch (Throwable e) {
-            log.debug("Element {} is not visible", element.getSearchCriteria());
+            log.debug("{} is not visible", element.getSearchCriteria());
         }
         return isVisible;
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
index 2f64699eb26..f9a7fc8e1b7 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
@@ -6,14 +6,11 @@
 import io.qameta.allure.selenide.AllureSelenide;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 
 import java.io.File;
 import java.util.Arrays;
 
 import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.settings.Source.BASE_WEB_URL;
 
 @Slf4j
 public abstract class Setup {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index bc69eeee6f0..bd06882887f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -66,7 +66,7 @@ public void createConnector() {
                 .openSideMenu(KAFKA_CONNECT);
         kafkaConnectList
                 .waitUntilScreenReady()
-                .clickCreateConnectorButton();
+                .clickCreateConnectorBtn();
         connectorCreateForm
                 .waitUntilScreenReady()
                 .setConnectorConfig(connectorForCreate.getName(), connectorForCreate.getConfig());
@@ -114,8 +114,8 @@ public void deleteConnector() {
         connectorDetails
                 .waitUntilScreenReady()
                 .openDotMenu()
-                .clickDeleteButton()
-                .clickConfirmButton();
+                .clickDeleteBtn()
+                .clickConfirmBtn();
         naviSideBar
                 .openSideMenu(KAFKA_CONNECT);
         kafkaConnectList
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index 8fa81c98b17..e76f28728e1 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -51,7 +51,7 @@ void createSchemaAvro() {
                 .setSubjectName(schemaAvro.getName())
                 .setSchemaField(fileToString(schemaAvro.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaAvro.getType())
-                .clickSubmit();
+                .clickSubmitBtn();
         schemaDetails
                 .waitUntilScreenReady();
         naviSideBar
@@ -84,7 +84,7 @@ void updateSchemaAvro() {
         schemaCreateForm
                 .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
-                .clickSubmit();
+                .clickSubmitBtn();
         schemaDetails
                 .waitUntilScreenReady();
         Assertions.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), schemaDetails.getCompatibility(), "getCompatibility()");
@@ -128,7 +128,7 @@ void createSchemaJson() {
                 .setSubjectName(schemaJson.getName())
                 .setSchemaField(fileToString(schemaJson.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaJson.getType())
-                .clickSubmit();
+                .clickSubmitBtn();
         schemaDetails
                 .waitUntilScreenReady();
         naviSideBar
@@ -177,7 +177,7 @@ void createSchemaProtobuf() {
                 .setSubjectName(schemaProtobuf.getName())
                 .setSchemaField(fileToString(schemaProtobuf.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaProtobuf.getType())
-                .clickSubmit();
+                .clickSubmitBtn();
         schemaDetails
                 .waitUntilScreenReady();
         naviSideBar
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 378190c6302..bb1cfc34273 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -49,10 +49,11 @@ public void createTopic() {
                 .openSideMenu(TOPICS);
         topicsList
                 .waitUntilScreenReady()
-                .pressCreateNewTopic();
+                .clickAddTopicBtn();
         topicCreateEditForm
+                .waitUntilScreenReady()
                 .setTopicName(topicToCreate.getName())
-                .sendData();
+                .clickCreateTopicBtn();
         topicDetails
                 .waitUntilScreenReady();
         naviSideBar
@@ -79,12 +80,13 @@ public void updateTopic() {
                 .waitUntilScreenReady()
                 .openEditSettings();
         topicCreateEditForm
+                .waitUntilScreenReady()
                 .selectCleanupPolicy(TOPIC_FOR_UPDATE.getCompactPolicyValue())
                 .setMinInsyncReplicas(10)
                 .setTimeToRetainDataInMs(TOPIC_FOR_UPDATE.getTimeToRetainData())
                 .setMaxSizeOnDiskInGB(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
                 .setMaxMessageBytes(TOPIC_FOR_UPDATE.getMaxMessageBytes())
-                .sendData();
+                .clickCreateTopicBtn();
         topicDetails
                 .waitUntilScreenReady();
         naviSideBar
@@ -139,8 +141,9 @@ void produceMessage() {
         topicDetails
                 .waitUntilScreenReady()
                 .openTopicMenu(TopicDetails.TopicMenu.MESSAGES)
-                .clickOnButton("Produce Message");
+                .clickProduceMessageBtn();
         produceMessagePanel
+                .waitUntilScreenReady()
                 .setContentFiled(TOPIC_FOR_UPDATE.getMessageContent())
                 .setKeyField(TOPIC_FOR_UPDATE.getMessageKey())
                 .submitProduceMessage();

From dc1785e3380a8db62b775c6cb88653babed46b58 Mon Sep 17 00:00:00 2001
From: komilos <kam.sharipova@gmail.com>
Date: Thu, 20 Oct 2022 14:17:26 +0300
Subject: [PATCH 218/734] Fix KSQL empty field in Stream properties causes
 errors (#2744)

Co-authored-by: Kamila Alekbaeva <kalekbaeva@provectus.com>
---
 .../src/components/KsqlDb/Query/Query.tsx     |  5 ++++-
 .../KsqlDb/Query/QueryForm/QueryForm.tsx      | 15 +++++++++++--
 .../QueryForm/__test__/QueryForm.spec.tsx     | 22 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
index efda3932175..7e875748636 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
@@ -167,7 +167,10 @@ const Query: FC = () => {
 
   const submitHandler = useCallback(
     (values: FormValues) => {
-      const streamsProperties = values.streamsProperties.reduce(
+      const filteredProperties = values.streamsProperties.filter(
+        (property) => property.key != null
+      );
+      const streamsProperties = filteredProperties.reduce(
         (acc, current) => ({
           ...acc,
           [current.key as keyof string]: current.value,
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
index ee78877d225..9965ea5189a 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { FormError } from 'components/common/Input/Input.styled';
 import { ErrorMessage } from '@hookform/error-message';
 import { useForm, Controller, useFieldArray } from 'react-hook-form';
@@ -46,6 +46,7 @@ const QueryForm: React.FC<Props> = ({
   const {
     handleSubmit,
     setValue,
+    getValues,
     control,
     formState: { errors },
   } = useForm<FormValues>({
@@ -64,6 +65,16 @@ const QueryForm: React.FC<Props> = ({
     name: 'streamsProperties',
   });
 
+  const handleAddNewProperty = useCallback(() => {
+    if (
+      getValues().streamsProperties.every((prop) => {
+        return prop.key;
+      })
+    ) {
+      append({ key: '', value: '' });
+    }
+  }, []);
+
   return (
     <S.QueryWrapper>
       <form onSubmit={handleSubmit(submitHandler)}>
@@ -164,7 +175,7 @@ const QueryForm: React.FC<Props> = ({
               type="button"
               buttonSize="M"
               buttonType="secondary"
-              onClick={() => append({ key: '', value: '' })}
+              onClick={handleAddNewProperty}
             >
               <PlusIcon />
               Add Stream Property
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
index 12a61a5fa5f..0b8aa60b78a 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
@@ -157,7 +157,7 @@ describe('QueryForm', () => {
     expect(submitFn.mock.calls.length).toBe(1);
   });
 
-  it('add new property', async () => {
+  it('adds new property', async () => {
     renderComponent({
       fetching: false,
       hasResults: false,
@@ -166,6 +166,8 @@ describe('QueryForm', () => {
       submitHandler: jest.fn(),
     });
 
+    const textbox = screen.getByLabelText('key');
+    await userEvent.type(textbox, 'prop_name');
     await act(() => {
       userEvent.click(
         screen.getByRole('button', { name: 'Add Stream Property' })
@@ -174,6 +176,23 @@ describe('QueryForm', () => {
     expect(screen.getAllByRole('textbox', { name: 'key' }).length).toEqual(2);
   });
 
+  it("doesn't add new property", async () => {
+    renderComponent({
+      fetching: false,
+      hasResults: false,
+      handleClearResults: jest.fn(),
+      handleSSECancel: jest.fn(),
+      submitHandler: jest.fn(),
+    });
+
+    await act(() => {
+      userEvent.click(
+        screen.getByRole('button', { name: 'Add Stream Property' })
+      );
+    });
+    expect(screen.getAllByRole('textbox', { name: 'key' }).length).toEqual(1);
+  });
+
   it('delete stream property', async () => {
     await renderComponent({
       fetching: false,
@@ -184,6 +203,7 @@ describe('QueryForm', () => {
     });
 
     await act(() => {
+      userEvent.paste(screen.getByRole('textbox', { name: 'key' }), 'test');
       userEvent.click(
         screen.getByRole('button', { name: 'Add Stream Property' })
       );

From 1c627ba0e88ddd1adb9076fc44a9c5b2e998ed6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 22:28:23 +0400
Subject: [PATCH 219/734] Bump pnpm/action-setup from 2.2.3 to 2.2.4 (#2757)

Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup) from 2.2.3 to 2.2.4.
- [Release notes](https://github.com/pnpm/action-setup/releases)
- [Commits](https://github.com/pnpm/action-setup/compare/v2.2.3...v2.2.4)

---
updated-dependencies:
- dependency-name: pnpm/action-setup
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 7db1337a0fa..866ee6f0030 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -20,7 +20,7 @@ jobs:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: pnpm/action-setup@v2.2.3
+      - uses: pnpm/action-setup@v2.2.4
         with:
           version: 7.4.0
       - name: Install node

From 3e72a7ac4ebac6af3e805e0500cab3d50767d635 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 22:29:36 +0400
Subject: [PATCH 220/734] Bump actions/setup-node from 3.4.1 to 3.5.1 (#2747)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.4.1 to 3.5.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.4.1...v3.5.1)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 866ee6f0030..baa2551d1c5 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           version: 7.4.0
       - name: Install node
-        uses: actions/setup-node@v3.4.1
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: "16.15.0"
           cache: "pnpm"

From daba2a1f51686aa1260c9c9350883b1af79df04e Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Thu, 20 Oct 2022 22:35:08 +0400
Subject: [PATCH 221/734] Fix helm charts validation (#2750)

* add workflows

* fix

* add flow

* fix

* change names

* add comments

* fix helm.yaml file

* fix helm.yaml

* fix helm.yaml

* fix realse-helm.yaml

* fix helm.yaml

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/helm.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
index 255f92260f9..d8c2875aed7 100644
--- a/.github/workflows/helm.yaml
+++ b/.github/workflows/helm.yaml
@@ -15,6 +15,18 @@ jobs:
         uses: Azure/setup-helm@v1
       - name: Setup Kubeval
         uses: lra/setup-kubeval@v1.0.1
+      #check, was helm version increased in Chart.yaml?
+      - name: Check version
+        shell: bash
+        run: |
+          git fetch
+          git checkout master
+          helm_version_old=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk  '{print $2}')
+          git checkout $GITHUB_HEAD_REF
+          helm_version_new=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk  '{print $2}')
+          echo $helm_version_old
+          echo $helm_version_new
+          if [[ "$helm_version_new" > "$helm_version_old" ]]; then exit 0 ; else exit 1 ; fi
       - name: Run kubeval
         shell: bash
         run: |

From f5e1dcbd82b5d16210736604eda572d994ebf113 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 22:42:24 +0400
Subject: [PATCH 222/734] Bump actions/stale from 5 to 6 (#2639)

Bumps [actions/stale](https://github.com/actions/stale) from 5 to 6.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
index 5e9ac844fb0..aafb50cedad 100644
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v6
         with:
           days-before-issue-stale: 7
           days-before-issue-close: 3

From b0e0da4c0d1bd66bb2ca053f421dc4c7e78d78dc Mon Sep 17 00:00:00 2001
From: Egorka Voronyansky <vrnsky@protonmail.ch>
Date: Fri, 21 Oct 2022 13:40:35 +0800
Subject: [PATCH 223/734] Bump version of mockito up to 4.8.1 (#2793)

* Bump version of mockito up to 4.8.1

* Change scope of byte buddy dependency to test

Co-authored-by: vrnsky <vrnsky@protonmail.com>
---
 kafka-ui-api/pom.xml | 6 ++++++
 pom.xml              | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index ab5fa62bd18..65ab22682fd 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -173,6 +173,12 @@
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>${byte-buddy.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/pom.xml b/pom.xml
index c01fb507dd5..2333b2472fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,8 @@
         <test.containers.version>1.17.1</test.containers.version>
         <okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>
         <junit-jupiter-engine.version>5.7.2</junit-jupiter-engine.version>
-        <mockito.version>2.21.0</mockito.version>
+        <mockito.version>4.8.1</mockito.version>
+        <byte-buddy.version>1.12.18</byte-buddy.version>
         <assertj.version>3.19.0</assertj.version>
         <antlr4-maven-plugin.version>4.7.1</antlr4-maven-plugin.version>
         <groovy.version>3.0.9</groovy.version>

From 40c3bcf82b7c21a367fb4112e7f8e51c843481ea Mon Sep 17 00:00:00 2001
From: Anton Mnykh <44034169+Redbutton18@users.noreply.github.com>
Date: Fri, 21 Oct 2022 14:43:21 +0300
Subject: [PATCH 224/734] Issue/2774 2 (#2785)

* clear message Test updated issue-2774

* clear message Test created issue-2774

* conflict resolving

* conflict resolving

* conflict resolving

* fix
---
 .../com/provectus/kafka/ui/models/Topic.java  |  2 +-
 .../kafka/ui/pages/topic/TopicDetails.java    | 39 +++++++++++++
 .../provectus/kafka/ui/tests/TopicTests.java  | 58 +++++++++++++++----
 3 files changed, 88 insertions(+), 11 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
index 725db0dd8dd..18763e37191 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
@@ -6,5 +6,5 @@
 @Data
 @Accessors(chain = true)
 public class Topic {
-    private String name, compactPolicyValue, timeToRetainData, maxSizeOnDisk, maxMessageBytes, messageKey, messageContent ;
+    private String name, cleanupPolicyValue, timeToRetainData, maxSizeOnDisk, maxMessageBytes, messageKey, messageContent ;
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index b455d310fbc..5b4f1d3c962 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -17,6 +17,8 @@ public class TopicDetails {
 
     protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
+    protected SelenideElement dotPartitionIdMenuBtn = $(By.cssSelector("button.sc-hOqruk.eYtACj"));
+    protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
     protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
     protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
     protected SelenideElement editSettingsTab = $x("//li[@role][contains(text(),'Edit settings')]");
@@ -45,6 +47,18 @@ public TopicDetails openTopicMenu(TopicMenu menu) {
         return this;
     }
 
+    @Step
+    public TopicDetails openDotPartitionIdMenu() {
+        dotPartitionIdMenuBtn.shouldBe(Condition.visible.because("dot menu invisible")).click();
+        return this;
+    }
+
+    @Step
+    public TopicDetails clickClearMessagesBtn() {
+        clearMessagesBtn.shouldBe(Condition.visible.because("Clear Messages invisible")).click();
+        return this;
+    }
+
     @Step
     public TopicDetails deleteTopic() {
         clickByJavaScript(dotMenuBtn);
@@ -70,6 +84,11 @@ public boolean isContentMessageVisible(String contentMessage) {
         return contentMessage.matches(contentMessageTab.getText().trim());
     }
 
+    @Step
+    public String MessageCountAmount() {
+        return $(By.xpath("//table[@class=\"sc-hiSbEG cvnuic\"]/tbody/tr/td[5]")).getText();
+    }
+
     private enum DotMenuHeaderItems {
         EDIT_SETTINGS("Edit settings"),
         CLEAR_MESSAGES("Clear messages"),
@@ -91,6 +110,26 @@ public String toString() {
         }
     }
 
+    public enum DotPartitionIdMenu {
+        CLEAR_MESSAGES("Clear messages");
+
+
+        private final String value;
+
+        DotPartitionIdMenu(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return "DotPartitionIdMenuItems{" + "value='" + value + '\'' + '}';
+        }
+    }
+
     public enum TopicMenu {
         OVERVIEW("Overview"),
         MESSAGES("Messages"),
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index bb1cfc34273..2b596a9e545 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -6,6 +6,7 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Issue;
 import io.qase.api.annotation.CaseId;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.*;
@@ -14,6 +15,7 @@
 import java.util.List;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.pages.topic.TopicDetails.DotPartitionIdMenu.CLEAR_MESSAGES;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
@@ -23,18 +25,23 @@ public class TopicTests extends BaseTest {
     private static final String SUITE_TITLE = "Topics";
     private static final Topic TOPIC_FOR_UPDATE = new Topic()
             .setName("topic-to-update")
-            .setCompactPolicyValue("Compact")
+            .setCleanupPolicyValue("Compact")
             .setTimeToRetainData("604800001")
             .setMaxSizeOnDisk("20 GB")
             .setMaxMessageBytes("1000020")
             .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
             .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+    private static final Topic TOPIC_FOR_MESSAGES = new Topic()
+            .setName("topic-with-clean-message-attribute")
+            .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
+            .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+
     private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete");
     private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
     @BeforeAll
     public void beforeAll() {
-        TOPIC_LIST.addAll(List.of(TOPIC_FOR_UPDATE, TOPIC_FOR_DELETE));
+        TOPIC_LIST.addAll(List.of(TOPIC_FOR_UPDATE, TOPIC_FOR_DELETE, TOPIC_FOR_MESSAGES));
         TOPIC_LIST.forEach(topic -> apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
     }
 
@@ -81,7 +88,7 @@ public void updateTopic() {
                 .openEditSettings();
         topicCreateEditForm
                 .waitUntilScreenReady()
-                .selectCleanupPolicy(TOPIC_FOR_UPDATE.getCompactPolicyValue())
+                .selectCleanupPolicy(TOPIC_FOR_UPDATE.getCleanupPolicyValue())
                 .setMinInsyncReplicas(10)
                 .setTimeToRetainDataInMs(TOPIC_FOR_UPDATE.getTimeToRetainData())
                 .setMaxSizeOnDiskInGB(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
@@ -98,7 +105,7 @@ public void updateTopic() {
                 .waitUntilScreenReady()
                 .openEditSettings();
         SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("Cleanup Policy").isEqualTo(TOPIC_FOR_UPDATE.getCompactPolicyValue());
+        softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("Cleanup Policy").isEqualTo(TOPIC_FOR_UPDATE.getCleanupPolicyValue());
         softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("Time to retain").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
         softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("Max size on disk").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk());
         softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("Max message bytes").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
@@ -126,7 +133,7 @@ public void deleteTopic() {
         Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
         TOPIC_LIST.remove(TOPIC_FOR_DELETE);
     }
-
+    
     @DisplayName("produce message")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
@@ -137,24 +144,55 @@ void produceMessage() {
                 .openSideMenu(TOPICS);
         topicsList
                 .waitUntilScreenReady()
-                .openTopic(TOPIC_FOR_UPDATE.getName());
+                .openTopic(TOPIC_FOR_MESSAGES.getName());
         topicDetails
                 .waitUntilScreenReady()
                 .openTopicMenu(TopicDetails.TopicMenu.MESSAGES)
                 .clickProduceMessageBtn();
         produceMessagePanel
                 .waitUntilScreenReady()
-                .setContentFiled(TOPIC_FOR_UPDATE.getMessageContent())
-                .setKeyField(TOPIC_FOR_UPDATE.getMessageKey())
+                .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
+                .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
                 .submitProduceMessage();
         topicDetails
                 .waitUntilScreenReady();
         SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_UPDATE.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
-        softly.assertThat(topicDetails.isContentMessageVisible((TOPIC_FOR_UPDATE.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
+        softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
+        softly.assertThat(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
         softly.assertAll();
     }
 
+    @Issue("Uncomment last assertion after bug https://github.com/provectus/kafka-ui/issues/2778 fix")
+    @DisplayName("clear message")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(19)
+    @Test
+    void clearMessage() {
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
+                .waitUntilScreenReady()
+                .openTopic(TOPIC_FOR_MESSAGES.getName());
+        topicDetails
+                .waitUntilScreenReady()
+                .openTopicMenu(TopicDetails.TopicMenu.OVERVIEW)
+                .clickProduceMessageBtn();
+        produceMessagePanel
+                .waitUntilScreenReady()
+                .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
+                .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
+                .submitProduceMessage();
+        topicDetails
+                .waitUntilScreenReady();
+        String messageAmount = topicDetails.MessageCountAmount();
+        Assertions.assertEquals(messageAmount,topicDetails.MessageCountAmount());
+        topicDetails
+                .openDotPartitionIdMenu()
+                .clickClearMessagesBtn();
+//        Assertions.assertEquals(Integer.toString(Integer.valueOf(messageAmount)-1),topicDetails.MessageCountAmount());
+    }
+
     @AfterAll
     public void afterAll() {
         TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));

From ae219de36cda741686711b194b83464d045109c3 Mon Sep 17 00:00:00 2001
From: Egorka Voronyansky <vrnsky@protonmail.ch>
Date: Sun, 23 Oct 2022 20:54:56 +0800
Subject: [PATCH 225/734] Bump Groovy version up to 3.0.13 (#2806)

Co-authored-by: vrnsky <vrnsky@protonmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2333b2472fb..d977385b946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <byte-buddy.version>1.12.18</byte-buddy.version>
         <assertj.version>3.19.0</assertj.version>
         <antlr4-maven-plugin.version>4.7.1</antlr4-maven-plugin.version>
-        <groovy.version>3.0.9</groovy.version>
+        <groovy.version>3.0.13</groovy.version>
         <datasketches-java.version>3.1.0</datasketches-java.version>
 
         <frontend-generated-sources-directory>..//kafka-ui-react-app/src/generated-sources

From 4558466ff6aec1bd4f26ab4dc8b8b85a52345ba3 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Sun, 23 Oct 2022 19:47:21 +0400
Subject: [PATCH 226/734] Emitters logic refactoring (#2729)

* Emitters logic refactoring:
1. consumers seeking moved to SeekOperations class
2. offsets info gathering moved to OffsetsInfo class

* wip

* checkstyle fix

* checkstyle fix

* minor improvements

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../ui/controller/MessagesController.java     |  28 ++-
 .../ui/emitter/BackwardRecordEmitter.java     | 107 ++++------
 .../ui/emitter/ForwardRecordEmitter.java      |  20 +-
 .../kafka/ui/emitter/OffsetsInfo.java         |  59 ++++++
 .../kafka/ui/emitter/SeekOperations.java      | 111 ++++++++++
 .../kafka/ui/emitter/TailingEmitter.java      |  25 ++-
 .../kafka/ui/model/ConsumerPosition.java      |   6 +-
 .../kafka/ui/service/MessagesService.java     |  35 ++--
 .../service/analyze/TopicAnalysisService.java |   8 +-
 .../provectus/kafka/ui/util/OffsetsSeek.java  | 143 -------------
 .../kafka/ui/util/OffsetsSeekBackward.java    | 120 -----------
 .../kafka/ui/util/OffsetsSeekForward.java     |  61 ------
 .../kafka/ui/emitter/OffsetsInfoTest.java     |  53 +++++
 .../kafka/ui/emitter/SeekOperationsTest.java  |  88 ++++++++
 .../kafka/ui/emitter/TailingEmitterTest.java  |   5 +-
 .../kafka/ui/service/MessagesServiceTest.java |   2 +-
 .../kafka/ui/service/RecordEmitterTest.java   |  70 +++----
 .../kafka/ui/service/SendAndReadTests.java    |   5 +-
 .../kafka/ui/util/OffsetsSeekTest.java        | 196 ------------------
 19 files changed, 465 insertions(+), 677 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/SeekOperations.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekBackward.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekForward.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/OffsetsInfoTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/SeekOperationsTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/OffsetsSeekTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
index fab4bcfd5c0..79ae59c3b30 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
@@ -5,6 +5,7 @@
 import static java.util.stream.Collectors.toMap;
 
 import com.provectus.kafka.ui.api.MessagesApi;
+import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.CreateTopicMessageDTO;
 import com.provectus.kafka.ui.model.MessageFilterTypeDTO;
@@ -18,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import javax.annotation.Nullable;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -63,18 +65,22 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String
                                                                            String keySerde,
                                                                            String valueSerde,
                                                                            ServerWebExchange exchange) {
+    seekType = seekType != null ? seekType : SeekTypeDTO.BEGINNING;
+    seekDirection = seekDirection != null ? seekDirection : SeekDirectionDTO.FORWARD;
+    filterQueryType = filterQueryType != null ? filterQueryType : MessageFilterTypeDTO.STRING_CONTAINS;
+    int recordsLimit =
+        Optional.ofNullable(limit).map(s -> Math.min(s, MAX_LOAD_RECORD_LIMIT)).orElse(DEFAULT_LOAD_RECORD_LIMIT);
+
     var positions = new ConsumerPosition(
-        seekType != null ? seekType : SeekTypeDTO.BEGINNING,
-        parseSeekTo(topicName, seekTo),
-        seekDirection
+        seekType,
+        topicName,
+        parseSeekTo(topicName, seekType, seekTo)
     );
-    int recordsLimit = Optional.ofNullable(limit)
-        .map(s -> Math.min(s, MAX_LOAD_RECORD_LIMIT))
-        .orElse(DEFAULT_LOAD_RECORD_LIMIT);
     return Mono.just(
         ResponseEntity.ok(
             messagesService.loadMessages(
-                getCluster(clusterName), topicName, positions, q, filterQueryType, recordsLimit, keySerde, valueSerde)
+                getCluster(clusterName), topicName, positions, q, filterQueryType,
+                recordsLimit, seekDirection, keySerde, valueSerde)
         )
     );
   }
@@ -92,9 +98,13 @@ public Mono<ResponseEntity<Void>> sendTopicMessages(
    * The format is [partition]::[offset] for specifying offsets
    * or [partition]::[timestamp in millis] for specifying timestamps.
    */
-  private Map<TopicPartition, Long> parseSeekTo(String topic, List<String> seekTo) {
+  @Nullable
+  private Map<TopicPartition, Long> parseSeekTo(String topic, SeekTypeDTO seekType, List<String> seekTo) {
     if (seekTo == null || seekTo.isEmpty()) {
-      return Map.of();
+      if (seekType == SeekTypeDTO.LATEST || seekType == SeekTypeDTO.BEGINNING) {
+        return null;
+      }
+      throw new ValidationException("seekTo should be set if seekType is " + seekType);
     }
     return seekTo.stream()
         .map(p -> {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
index 59db425b333..d2012355db6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
@@ -1,21 +1,18 @@
 package com.provectus.kafka.ui.emitter;
 
+import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
-import com.provectus.kafka.ui.util.OffsetsSeekBackward;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.TopicPartition;
@@ -29,80 +26,68 @@ public class BackwardRecordEmitter
 
   private static final Duration POLL_TIMEOUT = Duration.ofMillis(200);
 
-  private final Function<Map<String, Object>, KafkaConsumer<Bytes, Bytes>> consumerSupplier;
-  private final OffsetsSeekBackward offsetsSeek;
+  private final Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier;
+  private final ConsumerPosition consumerPosition;
+  private final int messagesPerPage;
 
   public BackwardRecordEmitter(
-      Function<Map<String, Object>, KafkaConsumer<Bytes, Bytes>> consumerSupplier,
-      OffsetsSeekBackward offsetsSeek,
+      Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
+      ConsumerPosition consumerPosition,
+      int messagesPerPage,
       ConsumerRecordDeserializer recordDeserializer) {
     super(recordDeserializer);
-    this.offsetsSeek = offsetsSeek;
+    this.consumerPosition = consumerPosition;
+    this.messagesPerPage = messagesPerPage;
     this.consumerSupplier = consumerSupplier;
   }
 
   @Override
   public void accept(FluxSink<TopicMessageEventDTO> sink) {
-    try (KafkaConsumer<Bytes, Bytes> configConsumer = consumerSupplier.apply(Map.of())) {
-      final List<TopicPartition> requestedPartitions =
-          offsetsSeek.getRequestedPartitions(configConsumer);
-      sendPhase(sink, "Request partitions");
-      final int msgsPerPartition = offsetsSeek.msgsPerPartition(requestedPartitions.size());
-      try (KafkaConsumer<Bytes, Bytes> consumer =
-               consumerSupplier.apply(
-                   Map.of(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, msgsPerPartition)
-               )
-      ) {
-        sendPhase(sink, "Created consumer");
-
-        SortedMap<TopicPartition, Long> readUntilOffsets =
-            new TreeMap<>(Comparator.comparingInt(TopicPartition::partition));
-        readUntilOffsets.putAll(offsetsSeek.getPartitionsOffsets(consumer));
-
-        sendPhase(sink, "Requested partitions offsets");
-        log.debug("partition offsets: {}", readUntilOffsets);
-        var waitingOffsets =
-            offsetsSeek.waitingOffsets(consumer, readUntilOffsets.keySet());
-        log.debug("waiting offsets {} {}",
-            waitingOffsets.getBeginOffsets(),
-            waitingOffsets.getEndOffsets()
-        );
-
-        while (!sink.isCancelled() && !waitingOffsets.beginReached()) {
-          new TreeMap<>(readUntilOffsets).forEach((tp, readToOffset) -> {
-            long lowestOffset = waitingOffsets.getBeginOffsets().get(tp.partition());
-            long readFromOffset = Math.max(lowestOffset, readToOffset - msgsPerPartition);
-
-            partitionPollIteration(tp, readFromOffset, readToOffset, consumer, sink)
-                .stream()
-                .filter(r -> !sink.isCancelled())
-                .forEach(r -> sendMessage(sink, r));
-
-            waitingOffsets.markPolled(tp.partition(), readFromOffset);
-            if (waitingOffsets.getBeginOffsets().get(tp.partition()) == null) {
-              // we fully read this partition -> removing it from polling iterations
-              readUntilOffsets.remove(tp);
-            } else {
-              readUntilOffsets.put(tp, readFromOffset);
-            }
-          });
-
-          if (waitingOffsets.beginReached()) {
-            log.debug("begin reached after partitions poll iteration");
-          } else if (sink.isCancelled()) {
-            log.debug("sink is cancelled after partitions poll iteration");
+    try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
+      sendPhase(sink, "Created consumer");
+
+      var seekOperations = SeekOperations.create(consumer, consumerPosition);
+      var readUntilOffsets = new TreeMap<TopicPartition, Long>(Comparator.comparingInt(TopicPartition::partition));
+      readUntilOffsets.putAll(seekOperations.getOffsetsForSeek());
+
+      int msgsToPollPerPartition = (int) Math.ceil((double) messagesPerPage / readUntilOffsets.size());
+      log.debug("'Until' offsets for polling: {}", readUntilOffsets);
+
+      while (!sink.isCancelled() && !readUntilOffsets.isEmpty()) {
+        new TreeMap<>(readUntilOffsets).forEach((tp, readToOffset) -> {
+          if (sink.isCancelled()) {
+            return; //fast return in case of sink cancellation
           }
+          long beginOffset = seekOperations.getBeginOffsets().get(tp);
+          long readFromOffset = Math.max(beginOffset, readToOffset - msgsToPollPerPartition);
+
+          partitionPollIteration(tp, readFromOffset, readToOffset, consumer, sink)
+              .stream()
+              .filter(r -> !sink.isCancelled())
+              .forEach(r -> sendMessage(sink, r));
+
+          if (beginOffset == readFromOffset) {
+            // we fully read this partition -> removing it from polling iterations
+            readUntilOffsets.remove(tp);
+          } else {
+            // updating 'to' offset for next polling iteration
+            readUntilOffsets.put(tp, readFromOffset);
+          }
+        });
+        if (readUntilOffsets.isEmpty()) {
+          log.debug("begin reached after partitions poll iteration");
+        } else if (sink.isCancelled()) {
+          log.debug("sink is cancelled after partitions poll iteration");
         }
-        sink.complete();
-        log.debug("Polling finished");
       }
+      sink.complete();
+      log.debug("Polling finished");
     } catch (Exception e) {
       log.error("Error occurred while consuming records", e);
       sink.error(e);
     }
   }
 
-
   private List<ConsumerRecord<Bytes, Bytes>> partitionPollIteration(
       TopicPartition tp,
       long fromOffset,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
index bc636cab7b2..69d9801b705 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
@@ -1,8 +1,8 @@
 package com.provectus.kafka.ui.emitter;
 
+import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
-import com.provectus.kafka.ui.util.OffsetsSeek;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -17,34 +17,38 @@ public class ForwardRecordEmitter
     implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
 
   private final Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier;
-  private final OffsetsSeek offsetsSeek;
+  private final ConsumerPosition position;
 
   public ForwardRecordEmitter(
       Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
-      OffsetsSeek offsetsSeek,
+      ConsumerPosition position,
       ConsumerRecordDeserializer recordDeserializer) {
     super(recordDeserializer);
+    this.position = position;
     this.consumerSupplier = consumerSupplier;
-    this.offsetsSeek = offsetsSeek;
   }
 
   @Override
   public void accept(FluxSink<TopicMessageEventDTO> sink) {
     try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
       sendPhase(sink, "Assigning partitions");
-      var waitingOffsets = offsetsSeek.assignAndSeek(consumer);
+      var seekOperations = SeekOperations.create(consumer, position);
+      seekOperations.assignAndSeekNonEmptyPartitions();
+
       // we use empty polls counting to verify that topic was fully read
       int emptyPolls = 0;
-      while (!sink.isCancelled() && !waitingOffsets.endReached() && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT) {
+      while (!sink.isCancelled()
+          && !seekOperations.assignedPartitionsFullyPolled()
+          && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT) {
+
         sendPhase(sink, "Polling");
         ConsumerRecords<Bytes, Bytes> records = poll(sink, consumer);
         log.info("{} records polled", records.count());
         emptyPolls = records.isEmpty() ? emptyPolls + 1 : 0;
 
         for (ConsumerRecord<Bytes, Bytes> msg : records) {
-          if (!sink.isCancelled() && !waitingOffsets.endReached()) {
+          if (!sink.isCancelled()) {
             sendMessage(sink, msg);
-            waitingOffsets.markPolled(msg);
           } else {
             break;
           }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java
new file mode 100644
index 00000000000..1b1381ea707
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java
@@ -0,0 +1,59 @@
+package com.provectus.kafka.ui.emitter;
+
+import com.google.common.base.Preconditions;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.common.TopicPartition;
+
+@Slf4j
+@Getter
+public class OffsetsInfo {
+
+  private final Consumer<?, ?> consumer;
+
+  private final Map<TopicPartition, Long> beginOffsets;
+  private final Map<TopicPartition, Long> endOffsets;
+
+  private final Set<TopicPartition> nonEmptyPartitions = new HashSet<>();
+  private final Set<TopicPartition> emptyPartitions = new HashSet<>();
+
+  public OffsetsInfo(Consumer<?, ?> consumer, String topic) {
+    this(consumer,
+        consumer.partitionsFor(topic).stream()
+            .map(pi -> new TopicPartition(topic, pi.partition()))
+            .collect(Collectors.toList())
+    );
+  }
+
+  public OffsetsInfo(Consumer<?, ?> consumer,
+                     Collection<TopicPartition> targetPartitions) {
+    this.consumer = consumer;
+    this.beginOffsets = consumer.beginningOffsets(targetPartitions);
+    this.endOffsets = consumer.endOffsets(targetPartitions);
+    endOffsets.forEach((tp, endOffset) -> {
+      var beginningOffset = beginOffsets.get(tp);
+      if (endOffset > beginningOffset) {
+        nonEmptyPartitions.add(tp);
+      } else {
+        emptyPartitions.add(tp);
+      }
+    });
+  }
+
+  public boolean assignedPartitionsFullyPolled() {
+    for (var tp: consumer.assignment()) {
+      Preconditions.checkArgument(endOffsets.containsKey(tp));
+      if (endOffsets.get(tp) > consumer.position(tp)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/SeekOperations.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/SeekOperations.java
new file mode 100644
index 00000000000..014b1207572
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/SeekOperations.java
@@ -0,0 +1,111 @@
+package com.provectus.kafka.ui.emitter;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.provectus.kafka.ui.model.ConsumerPosition;
+import com.provectus.kafka.ui.model.SeekTypeDTO;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.common.TopicPartition;
+
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+class SeekOperations {
+
+  private final Consumer<?, ?> consumer;
+  private final OffsetsInfo offsetsInfo;
+  private final Map<TopicPartition, Long> offsetsForSeek; //only contains non-empty partitions!
+
+  static SeekOperations create(Consumer<?, ?> consumer, ConsumerPosition consumerPosition) {
+    OffsetsInfo offsetsInfo;
+    if (consumerPosition.getSeekTo() == null) {
+      offsetsInfo = new OffsetsInfo(consumer, consumerPosition.getTopic());
+    } else {
+      offsetsInfo = new OffsetsInfo(consumer, consumerPosition.getSeekTo().keySet());
+    }
+    return new SeekOperations(
+        consumer,
+        offsetsInfo,
+        getOffsetsForSeek(consumer, offsetsInfo, consumerPosition.getSeekType(), consumerPosition.getSeekTo())
+    );
+  }
+
+  void assignAndSeekNonEmptyPartitions() {
+    consumer.assign(offsetsForSeek.keySet());
+    offsetsForSeek.forEach(consumer::seek);
+  }
+
+  Map<TopicPartition, Long> getBeginOffsets() {
+    return offsetsInfo.getBeginOffsets();
+  }
+
+  Map<TopicPartition, Long> getEndOffsets() {
+    return offsetsInfo.getEndOffsets();
+  }
+
+  boolean assignedPartitionsFullyPolled() {
+    return offsetsInfo.assignedPartitionsFullyPolled();
+  }
+
+  // Get offsets to seek to. NOTE: offsets do not contain empty partitions offsets
+  Map<TopicPartition, Long> getOffsetsForSeek() {
+    return offsetsForSeek;
+  }
+
+  /**
+   * Finds offsets for ConsumerPosition. Note: will return empty map if no offsets found for desired criteria.
+   */
+  @VisibleForTesting
+  static Map<TopicPartition, Long> getOffsetsForSeek(Consumer<?, ?> consumer,
+                                                             OffsetsInfo offsetsInfo,
+                                                             SeekTypeDTO seekType,
+                                                             @Nullable Map<TopicPartition, Long> seekTo) {
+    switch (seekType) {
+      case LATEST:
+        return consumer.endOffsets(offsetsInfo.getNonEmptyPartitions());
+      case BEGINNING:
+        return consumer.beginningOffsets(offsetsInfo.getNonEmptyPartitions());
+      case OFFSET:
+        Preconditions.checkNotNull(offsetsInfo);
+        return fixOffsets(offsetsInfo, seekTo);
+      case TIMESTAMP:
+        Preconditions.checkNotNull(offsetsInfo);
+        return offsetsForTimestamp(consumer, offsetsInfo, seekTo);
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  private static Map<TopicPartition, Long> fixOffsets(OffsetsInfo offsetsInfo, Map<TopicPartition, Long> offsets) {
+    offsets = new HashMap<>(offsets);
+    offsets.keySet().retainAll(offsetsInfo.getNonEmptyPartitions());
+
+    Map<TopicPartition, Long> result = new HashMap<>();
+    offsets.forEach((tp, targetOffset) -> {
+      long endOffset = offsetsInfo.getEndOffsets().get(tp);
+      long beginningOffset = offsetsInfo.getBeginOffsets().get(tp);
+      // fixing offsets with min - max bounds
+      if (targetOffset > endOffset) {
+        targetOffset = endOffset;
+      } else if (targetOffset < beginningOffset) {
+        targetOffset = beginningOffset;
+      }
+      result.put(tp, targetOffset);
+    });
+    return result;
+  }
+
+  private static Map<TopicPartition, Long> offsetsForTimestamp(Consumer<?, ?> consumer, OffsetsInfo offsetsInfo,
+                                                        Map<TopicPartition, Long> timestamps) {
+    timestamps = new HashMap<>(timestamps);
+    timestamps.keySet().retainAll(offsetsInfo.getNonEmptyPartitions());
+
+    return consumer.offsetsForTimes(timestamps).entrySet().stream()
+        .filter(e -> e.getValue() != null)
+        .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().offset()));
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
index 852c31038f0..12a8ae183dd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
@@ -1,8 +1,9 @@
 package com.provectus.kafka.ui.emitter;
 
+import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
-import com.provectus.kafka.ui.util.OffsetsSeek;
+import java.util.HashMap;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
@@ -15,21 +16,21 @@ public class TailingEmitter extends AbstractEmitter
     implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
 
   private final Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier;
-  private final OffsetsSeek offsetsSeek;
+  private final ConsumerPosition consumerPosition;
 
-  public TailingEmitter(ConsumerRecordDeserializer recordDeserializer,
-                        Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
-                        OffsetsSeek offsetsSeek) {
+  public TailingEmitter(Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
+                        ConsumerPosition consumerPosition,
+                        ConsumerRecordDeserializer recordDeserializer) {
     super(recordDeserializer);
     this.consumerSupplier = consumerSupplier;
-    this.offsetsSeek = offsetsSeek;
+    this.consumerPosition = consumerPosition;
   }
 
   @Override
   public void accept(FluxSink<TopicMessageEventDTO> sink) {
     try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
       log.debug("Starting topic tailing");
-      offsetsSeek.assignAndSeek(consumer);
+      assignAndSeek(consumer);
       while (!sink.isCancelled()) {
         sendPhase(sink, "Polling");
         var polled = poll(sink, consumer);
@@ -40,9 +41,17 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
     } catch (InterruptException kafkaInterruptException) {
       sink.complete();
     } catch (Exception e) {
-      log.error("Error consuming {}", offsetsSeek.getConsumerPosition(), e);
+      log.error("Error consuming {}", consumerPosition, e);
       sink.error(e);
     }
   }
 
+  private void assignAndSeek(KafkaConsumer<Bytes, Bytes> consumer) {
+    var seekOperations = SeekOperations.create(consumer, consumerPosition);
+    var seekOffsets = new HashMap<>(seekOperations.getEndOffsets()); // defaulting offsets to topic end
+    seekOffsets.putAll(seekOperations.getOffsetsForSeek()); // this will only set non-empty partitions
+    consumer.assign(seekOffsets.keySet());
+    seekOffsets.forEach(consumer::seek);
+  }
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ConsumerPosition.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ConsumerPosition.java
index 7c3f5a6229b..9d77923fbc6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ConsumerPosition.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ConsumerPosition.java
@@ -1,12 +1,14 @@
 package com.provectus.kafka.ui.model;
 
 import java.util.Map;
+import javax.annotation.Nullable;
 import lombok.Value;
 import org.apache.kafka.common.TopicPartition;
 
 @Value
 public class ConsumerPosition {
   SeekTypeDTO seekType;
-  Map<TopicPartition, Long> seekTo;
-  SeekDirectionDTO seekDirection;
+  String topic;
+  @Nullable
+  Map<TopicPartition, Long> seekTo; // null if positioning should apply to all tps
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index 9191a3840e8..1f217b1e40d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -14,12 +14,9 @@
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
-import com.provectus.kafka.ui.util.OffsetsSeekBackward;
-import com.provectus.kafka.ui.util.OffsetsSeekForward;
 import com.provectus.kafka.ui.util.ResultSizeLimiter;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
@@ -129,58 +126,62 @@ private Mono<RecordMetadata> sendMessageImpl(KafkaCluster cluster,
   }
 
   public Flux<TopicMessageEventDTO> loadMessages(KafkaCluster cluster, String topic,
-                                                 ConsumerPosition consumerPosition, String query,
+                                                 ConsumerPosition consumerPosition,
+                                                 @Nullable String query,
                                                  MessageFilterTypeDTO filterQueryType,
                                                  int limit,
+                                                 SeekDirectionDTO seekDirection,
                                                  @Nullable String keySerde,
                                                  @Nullable String valueSerde) {
     return withExistingTopic(cluster, topic)
         .flux()
         .flatMap(td -> loadMessagesImpl(cluster, topic, consumerPosition, query,
-            filterQueryType, limit, keySerde, valueSerde));
+            filterQueryType, limit, seekDirection, keySerde, valueSerde));
   }
 
   private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
                                                       String topic,
                                                       ConsumerPosition consumerPosition,
-                                                      String query,
+                                                      @Nullable String query,
                                                       MessageFilterTypeDTO filterQueryType,
                                                       int limit,
+                                                      SeekDirectionDTO seekDirection,
                                                       @Nullable String keySerde,
                                                       @Nullable String valueSerde) {
 
     java.util.function.Consumer<? super FluxSink<TopicMessageEventDTO>> emitter;
     ConsumerRecordDeserializer recordDeserializer =
         deserializationService.deserializerFor(cluster, topic, keySerde, valueSerde);
-    if (consumerPosition.getSeekDirection().equals(SeekDirectionDTO.FORWARD)) {
+    if (seekDirection.equals(SeekDirectionDTO.FORWARD)) {
       emitter = new ForwardRecordEmitter(
           () -> consumerGroupService.createConsumer(cluster),
-          new OffsetsSeekForward(topic, consumerPosition),
+          consumerPosition,
           recordDeserializer
       );
-    } else if (consumerPosition.getSeekDirection().equals(SeekDirectionDTO.BACKWARD)) {
+    } else if (seekDirection.equals(SeekDirectionDTO.BACKWARD)) {
       emitter = new BackwardRecordEmitter(
-          (Map<String, Object> props) -> consumerGroupService.createConsumer(cluster, props),
-          new OffsetsSeekBackward(topic, consumerPosition, limit),
+          () -> consumerGroupService.createConsumer(cluster),
+          consumerPosition,
+          limit,
           recordDeserializer
       );
     } else {
       emitter = new TailingEmitter(
-          recordDeserializer,
           () -> consumerGroupService.createConsumer(cluster),
-          new OffsetsSeekForward(topic, consumerPosition)
+          consumerPosition,
+          recordDeserializer
       );
     }
     return Flux.create(emitter)
         .filter(getMsgFilter(query, filterQueryType))
-        .takeWhile(createTakeWhilePredicate(consumerPosition, limit))
+        .takeWhile(createTakeWhilePredicate(seekDirection, limit))
         .subscribeOn(Schedulers.boundedElastic())
         .share();
   }
 
   private Predicate<TopicMessageEventDTO> createTakeWhilePredicate(
-      ConsumerPosition consumerPosition, int limit) {
-    return consumerPosition.getSeekDirection() == SeekDirectionDTO.TAILING
+      SeekDirectionDTO seekDirection, int limit) {
+    return seekDirection == SeekDirectionDTO.TAILING
         ? evt -> true // no limit for tailing
         : new ResultSizeLimiter(limit);
   }
@@ -189,8 +190,6 @@ private Predicate<TopicMessageEventDTO> getMsgFilter(String query, MessageFilter
     if (StringUtils.isEmpty(query)) {
       return evt -> true;
     }
-    filterQueryType = Optional.ofNullable(filterQueryType)
-        .orElse(MessageFilterTypeDTO.STRING_CONTAINS);
     var messageFilter = MessageFilters.createMsgFilter(query, filterQueryType);
     return evt -> {
       // we only apply filter for message events
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
index 3e72e8a07ea..3eb61a56d27 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
@@ -2,12 +2,12 @@
 
 import static com.provectus.kafka.ui.emitter.AbstractEmitter.NO_MORE_DATA_EMPTY_POLLS_COUNT;
 
+import com.provectus.kafka.ui.emitter.OffsetsInfo;
 import com.provectus.kafka.ui.exception.TopicAnalysisException;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.TopicAnalysisDTO;
 import com.provectus.kafka.ui.service.ConsumerGroupService;
 import com.provectus.kafka.ui.service.TopicsService;
-import com.provectus.kafka.ui.util.OffsetsSeek.WaitingOffsets;
 import java.io.Closeable;
 import java.time.Duration;
 import java.time.Instant;
@@ -119,14 +119,14 @@ public void run() {
         consumer.assign(topicPartitions);
         consumer.seekToBeginning(topicPartitions);
 
-        var waitingOffsets = new WaitingOffsets(topicId.topicName, consumer, topicPartitions);
-        for (int emptyPolls = 0; !waitingOffsets.endReached() && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT;) {
+        var offsetsInfo = new OffsetsInfo(consumer, topicId.topicName);
+        for (int emptyPolls = 0; !offsetsInfo.assignedPartitionsFullyPolled()
+            && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT;) {
           var polled = consumer.poll(Duration.ofSeconds(3));
           emptyPolls = polled.isEmpty() ? emptyPolls + 1 : 0;
           polled.forEach(r -> {
             totalStats.apply(r);
             partitionStats.get(r.partition()).apply(r);
-            waitingOffsets.markPolled(r);
           });
           updateProgress();
         }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java
deleted file mode 100644
index e8d475a65d3..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeek.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import com.provectus.kafka.ui.model.ConsumerPosition;
-import com.provectus.kafka.ui.model.SeekTypeDTO;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.utils.Bytes;
-import reactor.util.function.Tuple2;
-import reactor.util.function.Tuples;
-
-@Slf4j
-public abstract class OffsetsSeek {
-  protected final String topic;
-  protected final ConsumerPosition consumerPosition;
-
-  protected OffsetsSeek(String topic, ConsumerPosition consumerPosition) {
-    this.topic = topic;
-    this.consumerPosition = consumerPosition;
-  }
-
-  public ConsumerPosition getConsumerPosition() {
-    return consumerPosition;
-  }
-
-  public Map<TopicPartition, Long> getPartitionsOffsets(Consumer<Bytes, Bytes> consumer) {
-    SeekTypeDTO seekType = consumerPosition.getSeekType();
-    List<TopicPartition> partitions = getRequestedPartitions(consumer);
-    log.info("Positioning consumer for topic {} with {}", topic, consumerPosition);
-    Map<TopicPartition, Long> offsets;
-    switch (seekType) {
-      case OFFSET:
-        offsets = offsetsFromPositions(consumer, partitions);
-        break;
-      case TIMESTAMP:
-        offsets = offsetsForTimestamp(consumer);
-        break;
-      case BEGINNING:
-        offsets = offsetsFromBeginning(consumer, partitions);
-        break;
-      case LATEST:
-        offsets = endOffsets(consumer, partitions);
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown seekType: " + seekType);
-    }
-    return offsets;
-  }
-
-  public WaitingOffsets waitingOffsets(Consumer<Bytes, Bytes> consumer,
-                                       Collection<TopicPartition> partitions) {
-    return new WaitingOffsets(topic, consumer, partitions);
-  }
-
-  public WaitingOffsets assignAndSeek(Consumer<Bytes, Bytes> consumer) {
-    final Map<TopicPartition, Long> partitionsOffsets = getPartitionsOffsets(consumer);
-    consumer.assign(partitionsOffsets.keySet());
-    partitionsOffsets.forEach(consumer::seek);
-    log.info("Assignment: {}", consumer.assignment());
-    return waitingOffsets(consumer, partitionsOffsets.keySet());
-  }
-
-
-  public List<TopicPartition> getRequestedPartitions(Consumer<Bytes, Bytes> consumer) {
-    Map<TopicPartition, Long> partitionPositions = consumerPosition.getSeekTo();
-    return consumer.partitionsFor(topic).stream()
-        .filter(
-            p -> partitionPositions.isEmpty()
-                || partitionPositions.containsKey(new TopicPartition(p.topic(), p.partition()))
-        ).map(p -> new TopicPartition(p.topic(), p.partition()))
-        .collect(Collectors.toList());
-  }
-
-  protected Map<TopicPartition, Long> endOffsets(
-      Consumer<Bytes, Bytes> consumer, List<TopicPartition> partitions) {
-    return consumer.endOffsets(partitions);
-  }
-
-  protected abstract Map<TopicPartition, Long> offsetsFromBeginning(
-      Consumer<Bytes, Bytes> consumer, List<TopicPartition> partitions);
-
-  protected abstract Map<TopicPartition, Long> offsetsForTimestamp(
-      Consumer<Bytes, Bytes> consumer);
-
-  protected abstract Map<TopicPartition, Long> offsetsFromPositions(
-      Consumer<Bytes, Bytes> consumer, List<TopicPartition> partitions);
-
-  public static class WaitingOffsets {
-    private final Map<Integer, Long> endOffsets; // partition number -> offset
-    private final Map<Integer, Long> beginOffsets; // partition number -> offset
-
-    public WaitingOffsets(String topic, Consumer<?, ?> consumer,
-                          Collection<TopicPartition> partitions) {
-      var allBeginningOffsets = consumer.beginningOffsets(partitions);
-      var allEndOffsets = consumer.endOffsets(partitions);
-
-      this.endOffsets = allEndOffsets.entrySet().stream()
-          .filter(entry -> !allBeginningOffsets.get(entry.getKey()).equals(entry.getValue()))
-          .map(e -> Tuples.of(e.getKey().partition(), e.getValue() - 1))
-          .collect(Collectors.toMap(Tuple2::getT1, Tuple2::getT2));
-
-      this.beginOffsets = this.endOffsets.keySet().stream()
-          .map(p -> Tuples.of(p, allBeginningOffsets.get(new TopicPartition(topic, p))))
-          .collect(Collectors.toMap(Tuple2::getT1, Tuple2::getT2));
-    }
-
-    public void markPolled(ConsumerRecord<?, ?> rec) {
-      markPolled(rec.partition(), rec.offset());
-    }
-
-    public void markPolled(int partition, long offset) {
-      Long endWaiting = endOffsets.get(partition);
-      if (endWaiting != null && endWaiting <= offset) {
-        endOffsets.remove(partition);
-      }
-      Long beginWaiting = beginOffsets.get(partition);
-      if (beginWaiting != null && beginWaiting >= offset) {
-        beginOffsets.remove(partition);
-      }
-    }
-
-    public boolean endReached() {
-      return endOffsets.isEmpty();
-    }
-
-    public boolean beginReached() {
-      return beginOffsets.isEmpty();
-    }
-
-    public Map<Integer, Long> getEndOffsets() {
-      return endOffsets;
-    }
-
-    public Map<Integer, Long> getBeginOffsets() {
-      return beginOffsets;
-    }
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekBackward.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekBackward.java
deleted file mode 100644
index e3d8f1b5b84..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekBackward.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import com.provectus.kafka.ui.model.ConsumerPosition;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.utils.Bytes;
-import reactor.util.function.Tuple2;
-import reactor.util.function.Tuples;
-
-@Slf4j
-public class OffsetsSeekBackward extends OffsetsSeek {
-
-  private final int maxMessages;
-
-  public OffsetsSeekBackward(String topic,
-                             ConsumerPosition consumerPosition, int maxMessages) {
-    super(topic, consumerPosition);
-    this.maxMessages = maxMessages;
-  }
-
-  public int msgsPerPartition(int partitionsSize) {
-    return msgsPerPartition(maxMessages, partitionsSize);
-  }
-
-  public int msgsPerPartition(long awaitingMessages, int partitionsSize) {
-    return (int) Math.ceil((double) awaitingMessages / partitionsSize);
-  }
-
-
-  protected Map<TopicPartition, Long> offsetsFromPositions(Consumer<Bytes, Bytes> consumer,
-                                                           List<TopicPartition> partitions) {
-
-    return findOffsetsInt(consumer, consumerPosition.getSeekTo(), partitions);
-  }
-
-  protected Map<TopicPartition, Long> offsetsFromBeginning(Consumer<Bytes, Bytes> consumer,
-                                                           List<TopicPartition> partitions) {
-    return findOffsets(consumer, Map.of(), partitions);
-  }
-
-  protected Map<TopicPartition, Long> offsetsForTimestamp(Consumer<Bytes, Bytes> consumer) {
-    Map<TopicPartition, Long> timestampsToSearch =
-        consumerPosition.getSeekTo().entrySet().stream()
-            .collect(Collectors.toMap(
-                Map.Entry::getKey,
-                Map.Entry::getValue
-            ));
-    Map<TopicPartition, Long> offsetsForTimestamps = consumer.offsetsForTimes(timestampsToSearch)
-        .entrySet().stream()
-        .filter(e -> e.getValue() != null)
-        .map(v -> Tuples.of(v.getKey(), v.getValue().offset()))
-        .collect(Collectors.toMap(Tuple2::getT1, Tuple2::getT2));
-
-    if (offsetsForTimestamps.isEmpty()) {
-      throw new IllegalArgumentException("No offsets were found for requested timestamps");
-    }
-
-    log.info("Timestamps: {} to offsets: {}", timestampsToSearch, offsetsForTimestamps);
-
-    return findOffsets(consumer, offsetsForTimestamps, offsetsForTimestamps.keySet());
-  }
-
-  protected Map<TopicPartition, Long> findOffsetsInt(
-      Consumer<Bytes, Bytes> consumer, Map<TopicPartition, Long> seekTo,
-      List<TopicPartition> partitions) {
-    return findOffsets(consumer, seekTo, partitions);
-  }
-
-  protected Map<TopicPartition, Long> findOffsets(
-      Consumer<Bytes, Bytes> consumer, Map<TopicPartition, Long> seekTo,
-      Collection<TopicPartition> partitions) {
-
-    final Map<TopicPartition, Long> beginningOffsets = consumer.beginningOffsets(partitions);
-    final Map<TopicPartition, Long> endOffsets = consumer.endOffsets(partitions);
-
-    final Map<TopicPartition, Long> seekMap = new HashMap<>();
-    final Set<TopicPartition> emptyPartitions = new HashSet<>();
-
-    for (Map.Entry<TopicPartition, Long> entry : seekTo.entrySet()) {
-      final Long endOffset = endOffsets.get(entry.getKey());
-      final Long beginningOffset = beginningOffsets.get(entry.getKey());
-      if (beginningOffset != null
-          && endOffset != null
-          && beginningOffset < endOffset
-          && entry.getValue() > beginningOffset
-      ) {
-        final Long value;
-        if (entry.getValue() > endOffset) {
-          value = endOffset;
-        } else {
-          value = entry.getValue();
-        }
-
-        seekMap.put(entry.getKey(), value);
-      } else {
-        emptyPartitions.add(entry.getKey());
-      }
-    }
-
-    Set<TopicPartition> waiting = new HashSet<>(partitions);
-    waiting.removeAll(emptyPartitions);
-    waiting.removeAll(seekMap.keySet());
-
-    for (TopicPartition topicPartition : waiting) {
-      seekMap.put(topicPartition, endOffsets.get(topicPartition));
-    }
-
-    return seekMap;
-  }
-
-
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekForward.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekForward.java
deleted file mode 100644
index 6b6ea735fc3..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/OffsetsSeekForward.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import com.provectus.kafka.ui.model.ConsumerPosition;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.utils.Bytes;
-
-@Slf4j
-public class OffsetsSeekForward extends OffsetsSeek {
-
-  public OffsetsSeekForward(String topic, ConsumerPosition consumerPosition) {
-    super(topic, consumerPosition);
-  }
-
-  protected Map<TopicPartition, Long> offsetsFromPositions(Consumer<Bytes, Bytes> consumer,
-                                                           List<TopicPartition> partitions) {
-    final Map<TopicPartition, Long> offsets =
-        offsetsFromBeginning(consumer, partitions);
-
-    final Map<TopicPartition, Long> endOffsets = consumer.endOffsets(offsets.keySet());
-    final Set<TopicPartition> set = new HashSet<>(consumerPosition.getSeekTo().keySet());
-    final Map<TopicPartition, Long> collect = consumerPosition.getSeekTo().entrySet().stream()
-        .filter(e -> e.getValue() < endOffsets.get(e.getKey()))
-        .filter(e -> endOffsets.get(e.getKey()) > offsets.get(e.getKey()))
-        .collect(Collectors.toMap(
-            Map.Entry::getKey,
-            Map.Entry::getValue
-        ));
-    offsets.putAll(collect);
-    set.removeAll(collect.keySet());
-    set.forEach(offsets::remove);
-
-    return offsets;
-  }
-
-  protected Map<TopicPartition, Long> offsetsForTimestamp(Consumer<Bytes, Bytes> consumer) {
-    Map<TopicPartition, Long> offsetsForTimestamps =
-        consumer.offsetsForTimes(consumerPosition.getSeekTo())
-            .entrySet().stream()
-            .filter(e -> e.getValue() != null)
-            .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().offset()));
-
-    if (offsetsForTimestamps.isEmpty()) {
-      throw new IllegalArgumentException("No offsets were found for requested timestamps");
-    }
-
-    return offsetsForTimestamps;
-  }
-
-  protected Map<TopicPartition, Long> offsetsFromBeginning(Consumer<Bytes, Bytes> consumer,
-                                                           List<TopicPartition> partitions) {
-    return consumer.beginningOffsets(partitions);
-  }
-
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/OffsetsInfoTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/OffsetsInfoTest.java
new file mode 100644
index 00000000000..156f62846bf
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/OffsetsInfoTest.java
@@ -0,0 +1,53 @@
+package com.provectus.kafka.ui.emitter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.kafka.clients.consumer.MockConsumer;
+import org.apache.kafka.clients.consumer.OffsetResetStrategy;
+import org.apache.kafka.common.PartitionInfo;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class OffsetsInfoTest {
+
+  final String topic = "test";
+  final TopicPartition tp0 = new TopicPartition(topic, 0); //offsets: start 0, end 0
+  final TopicPartition tp1 = new TopicPartition(topic, 1); //offsets: start 10, end 10
+  final TopicPartition tp2 = new TopicPartition(topic, 2); //offsets: start 0, end 20
+  final TopicPartition tp3 = new TopicPartition(topic, 3); //offsets: start 25, end 30
+
+  MockConsumer<Bytes, Bytes> consumer;
+
+  @BeforeEach
+  void initMockConsumer() {
+    consumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST);
+    consumer.updatePartitions(
+        topic,
+        Stream.of(tp0, tp1, tp2, tp3)
+            .map(tp -> new PartitionInfo(topic, tp.partition(), null, null, null, null))
+            .collect(Collectors.toList()));
+    consumer.updateBeginningOffsets(Map.of(tp0, 0L, tp1, 10L, tp2, 0L, tp3, 25L));
+    consumer.updateEndOffsets(Map.of(tp0, 0L, tp1, 10L, tp2, 20L, tp3, 30L));
+  }
+
+  @Test
+  void fillsInnerFieldsAccordingToTopicState() {
+    var offsets = new OffsetsInfo(consumer, List.of(tp0, tp1, tp2, tp3));
+
+    assertThat(offsets.getBeginOffsets()).containsEntry(tp0, 0L).containsEntry(tp1, 10L).containsEntry(tp2, 0L)
+        .containsEntry(tp3, 25L);
+
+    assertThat(offsets.getEndOffsets()).containsEntry(tp0, 0L).containsEntry(tp1, 10L).containsEntry(tp2, 20L)
+        .containsEntry(tp3, 30L);
+
+    assertThat(offsets.getEmptyPartitions()).contains(tp0, tp1);
+    assertThat(offsets.getNonEmptyPartitions()).contains(tp2, tp3);
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/SeekOperationsTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/SeekOperationsTest.java
new file mode 100644
index 00000000000..affa423123c
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/SeekOperationsTest.java
@@ -0,0 +1,88 @@
+package com.provectus.kafka.ui.emitter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.model.SeekTypeDTO;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.kafka.clients.consumer.MockConsumer;
+import org.apache.kafka.clients.consumer.OffsetResetStrategy;
+import org.apache.kafka.common.PartitionInfo;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+class SeekOperationsTest {
+
+  final String topic = "test";
+  final TopicPartition tp0 = new TopicPartition(topic, 0); //offsets: start 0, end 0
+  final TopicPartition tp1 = new TopicPartition(topic, 1); //offsets: start 10, end 10
+  final TopicPartition tp2 = new TopicPartition(topic, 2); //offsets: start 0, end 20
+  final TopicPartition tp3 = new TopicPartition(topic, 3); //offsets: start 25, end 30
+
+  MockConsumer<Bytes, Bytes> consumer;
+
+  @BeforeEach
+  void initMockConsumer() {
+    consumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST);
+    consumer.updatePartitions(
+        topic,
+        Stream.of(tp0, tp1, tp2, tp3)
+            .map(tp -> new PartitionInfo(topic, tp.partition(), null, null, null, null))
+            .collect(Collectors.toList()));
+    consumer.updateBeginningOffsets(Map.of(tp0, 0L, tp1, 10L, tp2, 0L, tp3, 25L));
+    consumer.updateEndOffsets(Map.of(tp0, 0L, tp1, 10L, tp2, 20L, tp3, 30L));
+  }
+
+  @Nested
+  class GetOffsetsForSeek {
+
+    @Test
+    void latest() {
+      var offsets = SeekOperations.getOffsetsForSeek(
+          consumer,
+          new OffsetsInfo(consumer, topic),
+          SeekTypeDTO.LATEST,
+          null
+      );
+      assertThat(offsets).containsExactlyInAnyOrderEntriesOf(Map.of(tp2, 20L, tp3, 30L));
+    }
+
+    @Test
+    void beginning() {
+      var offsets = SeekOperations.getOffsetsForSeek(
+          consumer,
+          new OffsetsInfo(consumer, topic),
+          SeekTypeDTO.BEGINNING,
+          null
+      );
+      assertThat(offsets).containsExactlyInAnyOrderEntriesOf(Map.of(tp2, 0L, tp3, 25L));
+    }
+
+    @Test
+    void offsets() {
+      var offsets = SeekOperations.getOffsetsForSeek(
+          consumer,
+          new OffsetsInfo(consumer, topic),
+          SeekTypeDTO.OFFSET,
+          Map.of(tp1, 10L, tp2, 10L, tp3, 26L)
+      );
+      assertThat(offsets).containsExactlyInAnyOrderEntriesOf(Map.of(tp2, 10L, tp3, 26L));
+    }
+
+    @Test
+    void offsetsWithBoundsFixing() {
+      var offsets = SeekOperations.getOffsetsForSeek(
+          consumer,
+          new OffsetsInfo(consumer, topic),
+          SeekTypeDTO.OFFSET,
+          Map.of(tp1, 10L, tp2, 21L, tp3, 24L)
+      );
+      assertThat(offsets).containsExactlyInAnyOrderEntriesOf(Map.of(tp2, 20L, tp3, 25L));
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java
index 27fbda1e9de..cdb1eaaa549 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java
@@ -111,10 +111,11 @@ private Flux<TopicMessageEventDTO> createTailingFlux(
 
     return applicationContext.getBean(MessagesService.class)
         .loadMessages(cluster, topicName,
-            new ConsumerPosition(SeekTypeDTO.LATEST, Map.of(), SeekDirectionDTO.TAILING),
+            new ConsumerPosition(SeekTypeDTO.LATEST, topic, null),
             query,
             MessageFilterTypeDTO.STRING_CONTAINS,
             0,
+            SeekDirectionDTO.TAILING,
             "String",
             "String");
   }
@@ -137,7 +138,7 @@ private void waitUntilTailingInitialized(List<TopicMessageEventDTO> fluxOutput)
     Awaitility.await()
         .pollInSameThread()
         .pollDelay(Duration.ofMillis(100))
-        .atMost(Duration.ofSeconds(10))
+        .atMost(Duration.ofSeconds(200))
         .until(() -> fluxOutput.stream()
             .anyMatch(msg -> msg.getType() == TopicMessageEventDTO.TypeEnum.CONSUMING));
   }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
index 9dfbaed0b1d..8c18e20882c 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
@@ -45,7 +45,7 @@ void sendMessageReturnsExceptionWhenTopicNotFound() {
   @Test
   void loadMessagesReturnsExceptionWhenTopicNotFound() {
     StepVerifier.create(messagesService
-            .loadMessages(cluster, NON_EXISTING_TOPIC, null, null, null, 1, "String", "String"))
+            .loadMessages(cluster, NON_EXISTING_TOPIC, null, null, null, 1, null, "String", "String"))
         .expectError(TopicNotFoundException.class)
         .verify();
   }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
index e6c9b3c83a2..3289d177d2b 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
@@ -1,8 +1,7 @@
 package com.provectus.kafka.ui.service;
 
-import static com.provectus.kafka.ui.model.SeekDirectionDTO.BACKWARD;
-import static com.provectus.kafka.ui.model.SeekDirectionDTO.FORWARD;
 import static com.provectus.kafka.ui.model.SeekTypeDTO.BEGINNING;
+import static com.provectus.kafka.ui.model.SeekTypeDTO.LATEST;
 import static com.provectus.kafka.ui.model.SeekTypeDTO.OFFSET;
 import static com.provectus.kafka.ui.model.SeekTypeDTO.TIMESTAMP;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -17,8 +16,6 @@
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
 import com.provectus.kafka.ui.serdes.builtin.StringSerde;
-import com.provectus.kafka.ui.util.OffsetsSeekBackward;
-import com.provectus.kafka.ui.util.OffsetsSeekForward;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -112,18 +109,15 @@ private static ConsumerRecordDeserializer createRecordsDeserializer() {
   void pollNothingOnEmptyTopic() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekForward(EMPTY_TOPIC,
-            new ConsumerPosition(BEGINNING, Map.of(), FORWARD)
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
+        RECORD_DESERIALIZER
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekBackward(
-            EMPTY_TOPIC,
-            new ConsumerPosition(BEGINNING, Map.of(), BACKWARD),
-            100
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
+        100,
+        RECORD_DESERIALIZER
     );
 
     StepVerifier.create(
@@ -143,17 +137,15 @@ void pollNothingOnEmptyTopic() {
   void pollFullTopicFromBeginning() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekForward(TOPIC,
-            new ConsumerPosition(BEGINNING, Map.of(), FORWARD)
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(BEGINNING, TOPIC, null),
+        RECORD_DESERIALIZER
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekBackward(TOPIC,
-            new ConsumerPosition(BEGINNING, Map.of(), BACKWARD),
-            PARTITIONS * MSGS_PER_PARTITION
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(LATEST, TOPIC, null),
+        PARTITIONS * MSGS_PER_PARTITION,
+        RECORD_DESERIALIZER
     );
 
     List<String> expectedValues = SENT_RECORDS.stream().map(Record::getValue).collect(Collectors.toList());
@@ -172,17 +164,15 @@ void pollWithOffsets() {
 
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekForward(TOPIC,
-            new ConsumerPosition(OFFSET, targetOffsets, FORWARD)
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
+        RECORD_DESERIALIZER
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekBackward(TOPIC,
-            new ConsumerPosition(OFFSET, targetOffsets, BACKWARD),
-            PARTITIONS * MSGS_PER_PARTITION
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
+        PARTITIONS * MSGS_PER_PARTITION,
+        RECORD_DESERIALIZER
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -217,17 +207,15 @@ void pollWithTimestamps() {
 
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekForward(TOPIC,
-            new ConsumerPosition(TIMESTAMP, targetTimestamps, FORWARD)
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
+        RECORD_DESERIALIZER
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekBackward(TOPIC,
-            new ConsumerPosition(TIMESTAMP, targetTimestamps, BACKWARD),
-            PARTITIONS * MSGS_PER_PARTITION
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
+        PARTITIONS * MSGS_PER_PARTITION,
+        RECORD_DESERIALIZER
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -255,10 +243,9 @@ void backwardEmitterSeekToEnd() {
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekBackward(TOPIC,
-            new ConsumerPosition(OFFSET, targetOffsets, BACKWARD),
-            numMessages
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
+        numMessages,
+        RECORD_DESERIALIZER
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -281,10 +268,9 @@ void backwardEmitterSeekToBegin() {
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
-        new OffsetsSeekBackward(TOPIC,
-            new ConsumerPosition(OFFSET, offsets, BACKWARD),
-            100
-        ), RECORD_DESERIALIZER
+        new ConsumerPosition(OFFSET, TOPIC, offsets),
+        100,
+        RECORD_DESERIALIZER
     );
 
     expectEmitter(backwardEmitter,
@@ -331,7 +317,7 @@ private KafkaConsumer<Bytes, Bytes> createConsumer(Map<String, Object> propertie
     final Map<String, ? extends Serializable> map = Map.of(
         ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServers(),
         ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID().toString(),
-        ConsumerConfig.MAX_POLL_RECORDS_CONFIG, 20, // to check multiple polls
+        ConsumerConfig.MAX_POLL_RECORDS_CONFIG, 19, // to check multiple polls
         ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class,
         ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class
     );
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java
index 4de939e0334..78c111cdd19 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SendAndReadTests.java
@@ -502,12 +502,13 @@ public void doAssert(Consumer<TopicMessageDTO> msgAssert) {
                 topic,
                 new ConsumerPosition(
                     SeekTypeDTO.BEGINNING,
-                    Map.of(new TopicPartition(topic, 0), 0L),
-                    SeekDirectionDTO.FORWARD
+                    topic,
+                    Map.of(new TopicPartition(topic, 0), 0L)
                 ),
                 null,
                 null,
                 1,
+                SeekDirectionDTO.FORWARD,
                 msgToSend.getKeySerde().get(),
                 msgToSend.getValueSerde().get()
             ).filter(e -> e.getType().equals(TopicMessageEventDTO.TypeEnum.MESSAGE))
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/OffsetsSeekTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/OffsetsSeekTest.java
deleted file mode 100644
index 54c2064c1c2..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/OffsetsSeekTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.provectus.kafka.ui.model.ConsumerPosition;
-import com.provectus.kafka.ui.model.SeekDirectionDTO;
-import com.provectus.kafka.ui.model.SeekTypeDTO;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.MockConsumer;
-import org.apache.kafka.clients.consumer.OffsetResetStrategy;
-import org.apache.kafka.common.PartitionInfo;
-import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.utils.Bytes;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-class OffsetsSeekTest {
-
-  final String topic = "test";
-  final TopicPartition tp0 = new TopicPartition(topic, 0); //offsets: start 0, end 0
-  final TopicPartition tp1 = new TopicPartition(topic, 1); //offsets: start 10, end 10
-  final TopicPartition tp2 = new TopicPartition(topic, 2); //offsets: start 0, end 20
-  final TopicPartition tp3 = new TopicPartition(topic, 3); //offsets: start 25, end 30
-
-  MockConsumer<Bytes, Bytes> consumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST);
-
-  @BeforeEach
-  void initConsumer() {
-    consumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST);
-    consumer.updatePartitions(
-        topic,
-        Stream.of(tp0, tp1, tp2, tp3)
-            .map(tp -> new PartitionInfo(topic, tp.partition(), null, null, null, null))
-            .collect(Collectors.toList()));
-    consumer.updateBeginningOffsets(Map.of(
-        tp0, 0L,
-        tp1, 10L,
-        tp2, 0L,
-        tp3, 25L
-    ));
-    consumer.updateEndOffsets(Map.of(
-        tp0, 0L,
-        tp1, 10L,
-        tp2, 20L,
-        tp3, 30L
-    ));
-  }
-
-  @Test
-  void forwardSeekToBeginningAllPartitions() {
-    var seek = new OffsetsSeekForward(
-        topic,
-        new ConsumerPosition(
-            SeekTypeDTO.BEGINNING,
-            Map.of(tp0, 0L, tp1, 0L),
-            SeekDirectionDTO.FORWARD
-        )
-    );
-
-    seek.assignAndSeek(consumer);
-    assertThat(consumer.assignment()).containsExactlyInAnyOrder(tp0, tp1);
-    assertThat(consumer.position(tp0)).isZero();
-    assertThat(consumer.position(tp1)).isEqualTo(10L);
-  }
-
-  @Test
-  void backwardSeekToBeginningAllPartitions() {
-    var seek = new OffsetsSeekBackward(
-        topic,
-        new ConsumerPosition(
-            SeekTypeDTO.BEGINNING,
-            Map.of(tp2, 0L, tp3, 0L),
-            SeekDirectionDTO.BACKWARD
-        ),
-        10
-    );
-
-    seek.assignAndSeek(consumer);
-    assertThat(consumer.assignment()).containsExactlyInAnyOrder(tp2, tp3);
-    assertThat(consumer.position(tp2)).isEqualTo(20L);
-    assertThat(consumer.position(tp3)).isEqualTo(30L);
-  }
-
-  @Test
-  void forwardSeekToBeginningWithPartitionsList() {
-    var seek = new OffsetsSeekForward(
-        topic,
-        new ConsumerPosition(SeekTypeDTO.BEGINNING, Map.of(), SeekDirectionDTO.FORWARD));
-    seek.assignAndSeek(consumer);
-    assertThat(consumer.assignment()).containsExactlyInAnyOrder(tp0, tp1, tp2, tp3);
-    assertThat(consumer.position(tp0)).isZero();
-    assertThat(consumer.position(tp1)).isEqualTo(10L);
-    assertThat(consumer.position(tp2)).isZero();
-    assertThat(consumer.position(tp3)).isEqualTo(25L);
-  }
-
-  @Test
-  void backwardSeekToBeginningWithPartitionsList() {
-    var seek = new OffsetsSeekBackward(
-        topic,
-        new ConsumerPosition(SeekTypeDTO.BEGINNING, Map.of(), SeekDirectionDTO.BACKWARD),
-        10
-    );
-    seek.assignAndSeek(consumer);
-    assertThat(consumer.assignment()).containsExactlyInAnyOrder(tp0, tp1, tp2, tp3);
-    assertThat(consumer.position(tp0)).isZero();
-    assertThat(consumer.position(tp1)).isEqualTo(10L);
-    assertThat(consumer.position(tp2)).isEqualTo(20L);
-    assertThat(consumer.position(tp3)).isEqualTo(30L);
-  }
-
-
-  @Test
-  void forwardSeekToOffset() {
-    var seek = new OffsetsSeekForward(
-        topic,
-        new ConsumerPosition(
-            SeekTypeDTO.OFFSET,
-            Map.of(tp0, 0L, tp1, 1L, tp2, 2L),
-            SeekDirectionDTO.FORWARD
-        )
-    );
-    seek.assignAndSeek(consumer);
-    assertThat(consumer.assignment()).containsExactlyInAnyOrder(tp2);
-    assertThat(consumer.position(tp2)).isEqualTo(2L);
-  }
-
-  @Test
-  void backwardSeekToOffset() {
-    var seek = new OffsetsSeekBackward(
-        topic,
-        new ConsumerPosition(
-            SeekTypeDTO.OFFSET,
-            Map.of(tp0, 0L, tp1, 1L, tp2, 20L),
-            SeekDirectionDTO.BACKWARD
-        ),
-        2
-    );
-    seek.assignAndSeek(consumer);
-    assertThat(consumer.assignment()).containsExactlyInAnyOrder(tp2);
-    assertThat(consumer.position(tp2)).isEqualTo(20L);
-  }
-
-  @Test
-  void backwardSeekToOffsetOnlyOnePartition() {
-    var seek = new OffsetsSeekBackward(
-        topic,
-        new ConsumerPosition(
-            SeekTypeDTO.OFFSET,
-            Map.of(tp2, 20L),
-            SeekDirectionDTO.BACKWARD
-        ),
-        20
-    );
-    seek.assignAndSeek(consumer);
-    assertThat(consumer.assignment()).containsExactlyInAnyOrder(tp2);
-    assertThat(consumer.position(tp2)).isEqualTo(20L);
-  }
-
-
-  @Nested
-  class WaitingOffsetsTest {
-
-    OffsetsSeekForward.WaitingOffsets offsets;
-
-    @BeforeEach
-    void assignAndCreateOffsets() {
-      consumer.assign(List.of(tp0, tp1, tp2, tp3));
-      offsets = new OffsetsSeek.WaitingOffsets(topic, consumer, List.of(tp0, tp1, tp2, tp3));
-    }
-
-    @Test
-    void collectsSignificantOffsetsMinus1ForAssignedPartitions() {
-      // offsets for partition 0 & 1 should be skipped because they
-      // effectively contains no data (start offset = end offset)
-      assertThat(offsets.getEndOffsets()).containsExactlyInAnyOrderEntriesOf(
-          Map.of(2, 19L, 3, 29L)
-      );
-    }
-
-    @Test
-    void returnTrueWhenOffsetsReachedReached() {
-      assertThat(offsets.endReached()).isFalse();
-      offsets.markPolled(new ConsumerRecord<>(topic, 2, 19, null, null));
-      assertThat(offsets.endReached()).isFalse();
-      offsets.markPolled(new ConsumerRecord<>(topic, 3, 29, null, null));
-      assertThat(offsets.endReached()).isTrue();
-    }
-  }
-
-}

From d60808a2f268003046da0832d8b02294ea23ca1a Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Sun, 23 Oct 2022 19:49:11 +0400
Subject: [PATCH 227/734] Drop deprecated ksql api (#2796)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../provectus/kafka/ui/client/KsqlClient.java |  53 ------
 .../kafka/ui/controller/KsqlController.java   |  14 +-
 .../kafka/ui/service/KsqlService.java         |  47 -----
 .../strategy/ksql/statement/BaseStrategy.java | 166 ------------------
 .../ksql/statement/CreateStrategy.java        |  20 ---
 .../ksql/statement/DescribeStrategy.java      |  20 ---
 .../strategy/ksql/statement/DropStrategy.java |  20 ---
 .../ksql/statement/ExplainStrategy.java       |  20 ---
 .../ksql/statement/SelectStrategy.java        |  24 ---
 .../strategy/ksql/statement/ShowStrategy.java |  67 -------
 .../ksql/statement/TerminateStrategy.java     |  20 ---
 .../kafka/ui/service/KsqlServiceTest.java     | 104 -----------
 .../ksql/statement/CreateStrategyTest.java    |  85 ---------
 .../ksql/statement/DescribeStrategyTest.java  |  76 --------
 .../ksql/statement/DropStrategyTest.java      |  75 --------
 .../ksql/statement/ExplainStrategyTest.java   |  74 --------
 .../ksql/statement/SelectStrategyTest.java    |  79 ---------
 .../ksql/statement/ShowStrategyTest.java      | 102 -----------
 .../ksql/statement/TerminateStrategyTest.java |  72 --------
 .../main/resources/swagger/kafka-ui-api.yaml  |  62 -------
 20 files changed, 1 insertion(+), 1199 deletions(-)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/BaseStrategy.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategy.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategy.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategy.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategy.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategy.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategy.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategy.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategyTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategyTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategyTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategyTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategyTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategyTest.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategyTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java
deleted file mode 100644
index 8d051234abb..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KsqlClient.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.provectus.kafka.ui.client;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import com.provectus.kafka.ui.service.ksql.KsqlApiClient;
-import com.provectus.kafka.ui.strategy.ksql.statement.BaseStrategy;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Service;
-import org.springframework.web.reactive.function.BodyInserters;
-import org.springframework.web.reactive.function.client.ClientResponse;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class KsqlClient {
-  private final WebClient webClient;
-  private final ObjectMapper mapper;
-
-  public Mono<KsqlCommandResponseDTO> execute(BaseStrategy ksqlStatement, KafkaCluster cluster) {
-    return webClient.post()
-        .uri(ksqlStatement.getUri())
-        .headers(httpHeaders -> KsqlApiClient.setBasicAuthIfEnabled(httpHeaders, cluster))
-        .accept(new MediaType("application", "vnd.ksql.v1+json"))
-        .body(BodyInserters.fromValue(ksqlStatement.getKsqlCommand()))
-        .retrieve()
-        .onStatus(HttpStatus::isError, this::getErrorMessage)
-        .bodyToMono(byte[].class)
-        .map(this::toJson)
-        .map(ksqlStatement::serializeResponse);
-  }
-
-  private Mono<Throwable> getErrorMessage(ClientResponse response) {
-    return response
-        .bodyToMono(byte[].class)
-        .map(this::toJson)
-        .map(jsonNode -> jsonNode.get("message").asText())
-        .flatMap(error -> Mono.error(new UnprocessableEntityException(error)));
-  }
-
-  @SneakyThrows
-  private JsonNode toJson(byte[] content) {
-    return this.mapper.readTree(content);
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
index 62dc24fab28..c3d833e2b8e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
@@ -1,15 +1,12 @@
 package com.provectus.kafka.ui.controller;
 
 import com.provectus.kafka.ui.api.KsqlApi;
-import com.provectus.kafka.ui.model.KsqlCommandDTO;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
 import com.provectus.kafka.ui.model.KsqlCommandV2DTO;
 import com.provectus.kafka.ui.model.KsqlCommandV2ResponseDTO;
 import com.provectus.kafka.ui.model.KsqlResponseDTO;
 import com.provectus.kafka.ui.model.KsqlStreamDescriptionDTO;
 import com.provectus.kafka.ui.model.KsqlTableDescriptionDTO;
 import com.provectus.kafka.ui.model.KsqlTableResponseDTO;
-import com.provectus.kafka.ui.service.KsqlService;
 import com.provectus.kafka.ui.service.ksql.KsqlServiceV2;
 import java.util.List;
 import java.util.Map;
@@ -27,17 +24,8 @@
 @RequiredArgsConstructor
 @Slf4j
 public class KsqlController extends AbstractController implements KsqlApi {
-  private final KsqlService ksqlService;
-  private final KsqlServiceV2 ksqlServiceV2;
 
-  @Override
-  public Mono<ResponseEntity<KsqlCommandResponseDTO>> executeKsqlCommand(String clusterName,
-                                                                         Mono<KsqlCommandDTO>
-                                                                             ksqlCommand,
-                                                                         ServerWebExchange exchange) {
-    return ksqlService.executeKsqlCommand(getCluster(clusterName), ksqlCommand)
-        .map(ResponseEntity::ok);
-  }
+  private final KsqlServiceV2 ksqlServiceV2;
 
   @Override
   public Mono<ResponseEntity<KsqlCommandV2ResponseDTO>> executeKsql(String clusterName,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java
deleted file mode 100644
index 6f74ede75ec..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KsqlService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.provectus.kafka.ui.service;
-
-import com.provectus.kafka.ui.client.KsqlClient;
-import com.provectus.kafka.ui.exception.ClusterNotFoundException;
-import com.provectus.kafka.ui.exception.KsqlDbNotFoundException;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.KsqlCommandDTO;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import com.provectus.kafka.ui.strategy.ksql.statement.BaseStrategy;
-import java.util.List;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import reactor.core.publisher.Mono;
-
-@Service
-@RequiredArgsConstructor
-public class KsqlService {
-  private final KsqlClient ksqlClient;
-  private final List<BaseStrategy> ksqlStatementStrategies;
-
-  public Mono<KsqlCommandResponseDTO> executeKsqlCommand(KafkaCluster cluster,
-                                                         Mono<KsqlCommandDTO> ksqlCommand) {
-    return Mono.justOrEmpty(cluster)
-        .map(KafkaCluster::getKsqldbServer)
-        .onErrorResume(e -> {
-          Throwable throwable =
-              e instanceof ClusterNotFoundException ? e : new KsqlDbNotFoundException();
-          return Mono.error(throwable);
-        })
-        .flatMap(ksqlServer -> getStatementStrategyForKsqlCommand(ksqlCommand)
-            .map(statement -> statement.host(ksqlServer.getUrl()))
-        )
-        .flatMap(baseStrategy -> ksqlClient.execute(baseStrategy, cluster));
-  }
-
-  private Mono<BaseStrategy> getStatementStrategyForKsqlCommand(
-      Mono<KsqlCommandDTO> ksqlCommand) {
-    return ksqlCommand
-        .map(command -> ksqlStatementStrategies.stream()
-            .filter(s -> s.test(command.getKsql()))
-            .map(s -> s.ksqlCommand(command))
-            .findFirst())
-        .flatMap(Mono::justOrEmpty)
-        .switchIfEmpty(Mono.error(new UnprocessableEntityException("Invalid sql")));
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/BaseStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/BaseStrategy.java
deleted file mode 100644
index fa057116adb..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/BaseStrategy.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KsqlCommandDTO;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import com.provectus.kafka.ui.model.TableDTO;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-public abstract class BaseStrategy {
-  protected static final String KSQL_REQUEST_PATH = "/ksql";
-  protected static final String QUERY_REQUEST_PATH = "/query";
-  private static final String MAPPING_EXCEPTION_ERROR = "KSQL DB response mapping error";
-  protected String host = null;
-  protected KsqlCommandDTO ksqlCommand = null;
-
-  public String getUri() {
-    if (this.host != null) {
-      return this.host + this.getRequestPath();
-    }
-    throw new UnprocessableEntityException("Strategy doesn't have host");
-  }
-
-  public boolean test(String sql) {
-    return sql.trim().toLowerCase().matches(getTestRegExp());
-  }
-
-  public BaseStrategy host(String host) {
-    this.host = host;
-    return this;
-  }
-
-  public KsqlCommandDTO getKsqlCommand() {
-    return ksqlCommand;
-  }
-
-  public BaseStrategy ksqlCommand(KsqlCommandDTO ksqlCommand) {
-    this.ksqlCommand = ksqlCommand;
-    return this;
-  }
-
-  protected String getRequestPath() {
-    return BaseStrategy.KSQL_REQUEST_PATH;
-  }
-
-  protected KsqlCommandResponseDTO serializeTableResponse(JsonNode response, String key) {
-    JsonNode item = getResponseFirstItemValue(response, key);
-    TableDTO table = item.isArray() ? getTableFromArray(item) : getTableFromObject(item);
-    return (new KsqlCommandResponseDTO()).data(table);
-  }
-
-  protected KsqlCommandResponseDTO serializeMessageResponse(JsonNode response, String key) {
-    JsonNode item = getResponseFirstItemValue(response, key);
-    return (new KsqlCommandResponseDTO()).message(getMessageFromObject(item));
-  }
-
-  protected KsqlCommandResponseDTO serializeQueryResponse(JsonNode response) {
-    if (response.isArray() && response.size() > 0) {
-      TableDTO table = (new TableDTO())
-          .headers(getQueryResponseHeader(response))
-          .rows(getQueryResponseRows(response));
-      return (new KsqlCommandResponseDTO()).data(table);
-    }
-    throw new UnprocessableEntityException(MAPPING_EXCEPTION_ERROR);
-  }
-
-  private JsonNode getResponseFirstItemValue(JsonNode response, String key) {
-    if (response.isArray() && response.size() > 0) {
-      JsonNode first = response.get(0);
-      if (first.has(key)) {
-        return first.path(key);
-      }
-    }
-    throw new UnprocessableEntityException(MAPPING_EXCEPTION_ERROR);
-  }
-
-  private List<String> getQueryResponseHeader(JsonNode response) {
-    JsonNode headerRow = response.get(0);
-    if (headerRow.isObject() && headerRow.has("header")) {
-      String schema = headerRow.get("header").get("schema").asText();
-      return Arrays.stream(schema.split(",")).map(String::trim).collect(Collectors.toList());
-    }
-    return new ArrayList<>();
-  }
-
-  private List<List<String>> getQueryResponseRows(JsonNode node) {
-    return getStreamForJsonArray(node)
-        .filter(row -> row.has("row") && row.get("row").has("columns"))
-        .map(row -> row.get("row").get("columns"))
-        .map(cellNode -> getStreamForJsonArray(cellNode)
-            .map(JsonNode::asText)
-            .collect(Collectors.toList())
-        )
-        .collect(Collectors.toList());
-  }
-
-  private TableDTO getTableFromArray(JsonNode node) {
-    TableDTO table = new TableDTO();
-    table.headers(new ArrayList<>()).rows(new ArrayList<>());
-    if (node.size() > 0) {
-      List<String> keys = getJsonObjectKeys(node.get(0));
-      List<List<String>> rows = getTableRows(node, keys);
-      table.headers(keys).rows(rows);
-    }
-    return table;
-  }
-
-  private TableDTO getTableFromObject(JsonNode node) {
-    List<String> keys = getJsonObjectKeys(node);
-    List<String> values = getJsonObjectValues(node);
-    List<List<String>> rows = IntStream
-        .range(0, keys.size())
-        .mapToObj(i -> List.of(keys.get(i), values.get(i)))
-        .collect(Collectors.toList());
-    return (new TableDTO()).headers(List.of("key", "value")).rows(rows);
-  }
-
-  private String getMessageFromObject(JsonNode node) {
-    if (node.isObject() && node.has("message")) {
-      return node.get("message").asText();
-    }
-    throw new UnprocessableEntityException(MAPPING_EXCEPTION_ERROR);
-  }
-
-  private List<List<String>> getTableRows(JsonNode node, List<String> keys) {
-    return getStreamForJsonArray(node)
-        .map(row -> keys.stream()
-            .map(header -> row.get(header).asText())
-            .collect(Collectors.toList())
-        )
-        .collect(Collectors.toList());
-  }
-
-  private Stream<JsonNode> getStreamForJsonArray(JsonNode node) {
-    if (node.isArray() && node.size() > 0) {
-      return StreamSupport.stream(node.spliterator(), false);
-    }
-    throw new UnprocessableEntityException(MAPPING_EXCEPTION_ERROR);
-  }
-
-  private List<String> getJsonObjectKeys(JsonNode node) {
-    if (node.isObject()) {
-      return StreamSupport.stream(
-          Spliterators.spliteratorUnknownSize(node.fieldNames(), Spliterator.ORDERED), false
-      ).collect(Collectors.toList());
-    }
-    throw new UnprocessableEntityException(MAPPING_EXCEPTION_ERROR);
-  }
-
-  private List<String> getJsonObjectValues(JsonNode node) {
-    return getJsonObjectKeys(node).stream().map(key -> node.get(key).asText())
-        .collect(Collectors.toList());
-  }
-
-  public abstract KsqlCommandResponseDTO serializeResponse(JsonNode response);
-
-  protected abstract String getTestRegExp();
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategy.java
deleted file mode 100644
index d26046a0fdd..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CreateStrategy extends BaseStrategy {
-  private static final String RESPONSE_VALUE_KEY = "commandStatus";
-
-  @Override
-  public KsqlCommandResponseDTO serializeResponse(JsonNode response) {
-    return serializeMessageResponse(response, RESPONSE_VALUE_KEY);
-  }
-
-  @Override
-  protected String getTestRegExp() {
-    return "create (table|stream)(.*)(with|as select(.*)from)(.*);";
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategy.java
deleted file mode 100644
index b8d7435bad7..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DescribeStrategy extends BaseStrategy {
-  private static final String RESPONSE_VALUE_KEY = "sourceDescription";
-
-  @Override
-  public KsqlCommandResponseDTO serializeResponse(JsonNode response) {
-    return serializeTableResponse(response, RESPONSE_VALUE_KEY);
-  }
-
-  @Override
-  protected String getTestRegExp() {
-    return "describe (.*);";
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategy.java
deleted file mode 100644
index 95b6884dc10..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DropStrategy extends BaseStrategy {
-  private static final String RESPONSE_VALUE_KEY = "commandStatus";
-
-  @Override
-  public KsqlCommandResponseDTO serializeResponse(JsonNode response) {
-    return serializeMessageResponse(response, RESPONSE_VALUE_KEY);
-  }
-
-  @Override
-  protected String getTestRegExp() {
-    return "drop (table|stream) (.*);";
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategy.java
deleted file mode 100644
index 221113b7e8a..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ExplainStrategy extends BaseStrategy {
-  private static final String RESPONSE_VALUE_KEY = "queryDescription";
-
-  @Override
-  public KsqlCommandResponseDTO serializeResponse(JsonNode response) {
-    return serializeTableResponse(response, RESPONSE_VALUE_KEY);
-  }
-
-  @Override
-  protected String getTestRegExp() {
-    return "explain (.*);";
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategy.java
deleted file mode 100644
index e535c8107df..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategy.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SelectStrategy extends BaseStrategy {
-
-  @Override
-  public KsqlCommandResponseDTO serializeResponse(JsonNode response) {
-    return serializeQueryResponse(response);
-  }
-
-  @Override
-  protected String getRequestPath() {
-    return BaseStrategy.QUERY_REQUEST_PATH;
-  }
-
-  @Override
-  protected String getTestRegExp() {
-    return "select (.*) from (.*);";
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategy.java
deleted file mode 100644
index 93c635b0446..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.provectus.kafka.ui.model.KsqlCommandDTO;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import java.util.List;
-import java.util.Optional;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ShowStrategy extends BaseStrategy {
-  private static final List<String> SHOW_STATEMENTS =
-      List.of("functions", "topics", "streams", "tables", "queries", "properties");
-  private static final List<String> LIST_STATEMENTS =
-      List.of("functions", "topics", "streams", "tables");
-  private String responseValueKey = "";
-
-  @Override
-  public KsqlCommandResponseDTO serializeResponse(JsonNode response) {
-    return serializeTableResponse(response, responseValueKey);
-  }
-
-  @Override
-  public boolean test(String sql) {
-    Optional<String> statement = SHOW_STATEMENTS.stream()
-        .filter(s -> testSql(sql, getShowRegExp(s)) || testSql(sql, getListRegExp(s)))
-        .findFirst();
-    if (statement.isPresent()) {
-      setResponseValueKey(statement.get());
-      return true;
-    }
-    return false;
-  }
-
-  @Override
-  protected String getTestRegExp() {
-    return "";
-  }
-
-  @Override
-  public BaseStrategy ksqlCommand(KsqlCommandDTO ksqlCommand) {
-    // return new instance to avoid conflicts for parallel requests
-    ShowStrategy clone = new ShowStrategy();
-    clone.setResponseValueKey(responseValueKey);
-    clone.ksqlCommand = ksqlCommand;
-    return clone;
-  }
-
-  protected String getShowRegExp(String key) {
-    return "show " + key + ";";
-  }
-
-  protected String getListRegExp(String key) {
-    if (LIST_STATEMENTS.contains(key)) {
-      return "list " + key + ";";
-    }
-    return "";
-  }
-
-  private void setResponseValueKey(String path) {
-    responseValueKey = path;
-  }
-
-  private boolean testSql(String sql, String pattern) {
-    return sql.trim().toLowerCase().matches(pattern);
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategy.java
deleted file mode 100644
index b043b8c6c94..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import org.springframework.stereotype.Component;
-
-@Component
-public class TerminateStrategy extends BaseStrategy {
-  private static final String RESPONSE_VALUE_KEY = "commandStatus";
-
-  @Override
-  public KsqlCommandResponseDTO serializeResponse(JsonNode response) {
-    return serializeMessageResponse(response, RESPONSE_VALUE_KEY);
-  }
-
-  @Override
-  protected String getTestRegExp() {
-    return "terminate (.*);";
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java
deleted file mode 100644
index ed434efba44..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KsqlServiceTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.provectus.kafka.ui.service;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.provectus.kafka.ui.client.KsqlClient;
-import com.provectus.kafka.ui.exception.KsqlDbNotFoundException;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.InternalKsqlServer;
-import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.KsqlCommandDTO;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import com.provectus.kafka.ui.strategy.ksql.statement.BaseStrategy;
-import com.provectus.kafka.ui.strategy.ksql.statement.DescribeStrategy;
-import com.provectus.kafka.ui.strategy.ksql.statement.ShowStrategy;
-import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
-@ExtendWith(MockitoExtension.class)
-class KsqlServiceTest {
-  private KsqlService ksqlService;
-  private BaseStrategy baseStrategy;
-  private BaseStrategy alternativeStrategy;
-
-  @Mock
-  private ClustersStorage clustersStorage;
-  @Mock
-  private KsqlClient ksqlClient;
-
-
-  @BeforeEach
-  public void setUp() {
-    this.baseStrategy = new ShowStrategy();
-    this.alternativeStrategy = new DescribeStrategy();
-    this.ksqlService = new KsqlService(
-        this.ksqlClient,
-        List.of(baseStrategy, alternativeStrategy)
-    );
-  }
-
-  @Test
-  void shouldThrowKsqlDbNotFoundExceptionOnExecuteKsqlCommand() {
-    KsqlCommandDTO command = (new KsqlCommandDTO()).ksql("show streams;");
-    KafkaCluster kafkaCluster = Mockito.mock(KafkaCluster.class);
-    when(kafkaCluster.getKsqldbServer()).thenReturn(null);
-
-    StepVerifier.create(ksqlService.executeKsqlCommand(kafkaCluster, Mono.just(command)))
-        .verifyError(KsqlDbNotFoundException.class);
-  }
-
-  @Test
-  void shouldThrowUnprocessableEntityExceptionOnExecuteKsqlCommand() {
-    KsqlCommandDTO command =
-        (new KsqlCommandDTO()).ksql("CREATE STREAM users WITH (KAFKA_TOPIC='users');");
-    KafkaCluster kafkaCluster = Mockito.mock(KafkaCluster.class);
-    when(kafkaCluster.getKsqldbServer()).thenReturn(InternalKsqlServer.builder().url("localhost:8088").build());
-
-    StepVerifier.create(ksqlService.executeKsqlCommand(kafkaCluster, Mono.just(command)))
-        .verifyError(UnprocessableEntityException.class);
-
-    StepVerifier.create(ksqlService.executeKsqlCommand(kafkaCluster, Mono.just(command)))
-        .verifyErrorMessage("Invalid sql");
-  }
-
-  @Test
-  void shouldSetHostToStrategy() {
-    String host = "localhost:8088";
-    KsqlCommandDTO command = (new KsqlCommandDTO()).ksql("describe streams;");
-    KafkaCluster kafkaCluster = Mockito.mock(KafkaCluster.class);
-
-    when(kafkaCluster.getKsqldbServer()).thenReturn(InternalKsqlServer.builder().url(host).build());
-    when(ksqlClient.execute(any(), any())).thenReturn(Mono.just(new KsqlCommandResponseDTO()));
-
-    ksqlService.executeKsqlCommand(kafkaCluster, Mono.just(command)).block();
-    assertThat(alternativeStrategy.getUri()).isEqualTo(host + "/ksql");
-  }
-
-  @Test
-  void shouldCallClientAndReturnResponse() {
-    KsqlCommandDTO command = (new KsqlCommandDTO()).ksql("describe streams;");
-    KafkaCluster kafkaCluster = Mockito.mock(KafkaCluster.class);
-    KsqlCommandResponseDTO response = new KsqlCommandResponseDTO().message("success");
-
-    when(kafkaCluster.getKsqldbServer()).thenReturn(InternalKsqlServer.builder().url("host").build());
-    when(ksqlClient.execute(any(), any())).thenReturn(Mono.just(response));
-
-    KsqlCommandResponseDTO receivedResponse =
-        ksqlService.executeKsqlCommand(kafkaCluster, Mono.just(command)).block();
-    verify(ksqlClient, times(1)).execute(eq(alternativeStrategy), any());
-    assertThat(receivedResponse).isEqualTo(response);
-
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategyTest.java
deleted file mode 100644
index 257fb36d35d..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/CreateStrategyTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class CreateStrategyTest {
-  private final ObjectMapper mapper = new ObjectMapper();
-  private CreateStrategy strategy;
-
-  @BeforeEach
-  void setUp() {
-    strategy = new CreateStrategy();
-  }
-
-  @Test
-  void shouldReturnUri() {
-    strategy.host("ksqldb-server:8088");
-    assertThat(strategy.getUri()).isEqualTo("ksqldb-server:8088/ksql");
-  }
-
-  @Test
-  void shouldReturnTrueInTest() {
-    assertTrue(strategy.test("CREATE STREAM stream WITH (KAFKA_TOPIC='topic');"));
-    assertTrue(strategy.test("CREATE STREAM stream"
-        + " AS SELECT users.id AS userid FROM users EMIT CHANGES;"
-    ));
-    assertTrue(strategy.test(
-        "CREATE TABLE table (id VARCHAR) WITH (KAFKA_TOPIC='table');"
-    ));
-    assertTrue(strategy.test(
-        "CREATE TABLE pageviews_regions WITH (KEY_FORMAT='JSON')"
-            + "  AS SELECT gender, COUNT(*) AS numbers"
-            + "  FROM pageviews EMIT CHANGES;"
-    ));
-  }
-
-  @Test
-  void shouldReturnFalseInTest() {
-    assertFalse(strategy.test("show streams;"));
-    assertFalse(strategy.test("show tables;"));
-    assertFalse(strategy.test("CREATE TABLE test;"));
-    assertFalse(strategy.test("CREATE STREAM test;"));
-  }
-
-  @Test
-  void shouldSerializeResponse() {
-    String message = "updated successful";
-    JsonNode node = getResponseWithMessage(message);
-    KsqlCommandResponseDTO serializedResponse = strategy.serializeResponse(node);
-    assertThat(serializedResponse.getMessage()).isEqualTo(message);
-
-  }
-
-  @Test
-  void shouldSerializeWithException() {
-    JsonNode commandStatusNode = mapper.createObjectNode().put("commandStatus", "nodeWithMessage");
-    JsonNode node = mapper.createArrayNode().add(mapper.valueToTree(commandStatusNode));
-    Exception exception = assertThrows(
-        UnprocessableEntityException.class,
-        () -> strategy.serializeResponse(node)
-    );
-
-    assertThat(exception.getMessage()).isEqualTo("KSQL DB response mapping error");
-  }
-
-  @SneakyThrows
-  private JsonNode getResponseWithMessage(String message) {
-    JsonNode nodeWithMessage = mapper.createObjectNode().put("message", message);
-    JsonNode commandStatusNode = mapper.createObjectNode().set("commandStatus", nodeWithMessage);
-    return mapper.createArrayNode().add(mapper.valueToTree(commandStatusNode));
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategyTest.java
deleted file mode 100644
index 51cb0c742a4..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DescribeStrategyTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import com.provectus.kafka.ui.model.TableDTO;
-import java.util.List;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class DescribeStrategyTest {
-  private final ObjectMapper mapper = new ObjectMapper();
-  private DescribeStrategy strategy;
-
-  @BeforeEach
-  void setUp() {
-    strategy = new DescribeStrategy();
-  }
-
-  @Test
-  void shouldReturnUri() {
-    strategy.host("ksqldb-server:8088");
-    assertThat(strategy.getUri()).isEqualTo("ksqldb-server:8088/ksql");
-  }
-
-  @Test
-  void shouldReturnTrueInTest() {
-    assertTrue(strategy.test("DESCRIBE users;"));
-    assertTrue(strategy.test("DESCRIBE EXTENDED users;"));
-  }
-
-  @Test
-  void shouldReturnFalseInTest() {
-    assertFalse(strategy.test("list streams;"));
-    assertFalse(strategy.test("show tables;"));
-  }
-
-  @Test
-  void shouldSerializeResponse() {
-    JsonNode node = getResponseWithObjectNode();
-    KsqlCommandResponseDTO serializedResponse = strategy.serializeResponse(node);
-    TableDTO table = serializedResponse.getData();
-    assertThat(table.getHeaders()).isEqualTo(List.of("key", "value"));
-    assertThat(table.getRows()).isEqualTo(List.of(List.of("name", "kafka")));
-  }
-
-  @Test
-  void shouldSerializeWithException() {
-    JsonNode sourceDescriptionNode =
-        mapper.createObjectNode().put("sourceDescription", "nodeWithMessage");
-    JsonNode node = mapper.createArrayNode().add(mapper.valueToTree(sourceDescriptionNode));
-    Exception exception = assertThrows(
-        UnprocessableEntityException.class,
-        () -> strategy.serializeResponse(node)
-    );
-
-    assertThat(exception.getMessage()).isEqualTo("KSQL DB response mapping error");
-  }
-
-  @SneakyThrows
-  private JsonNode getResponseWithObjectNode() {
-    JsonNode nodeWithMessage = mapper.createObjectNode().put("name", "kafka");
-    JsonNode nodeWithResponse = mapper.createObjectNode().set("sourceDescription", nodeWithMessage);
-    return mapper.createArrayNode().add(mapper.valueToTree(nodeWithResponse));
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategyTest.java
deleted file mode 100644
index 5f2b8fcc844..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/DropStrategyTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class DropStrategyTest {
-  private final ObjectMapper mapper = new ObjectMapper();
-  private DropStrategy strategy;
-
-  @BeforeEach
-  void setUp() {
-    strategy = new DropStrategy();
-  }
-
-  @Test
-  void shouldReturnUri() {
-    strategy.host("ksqldb-server:8088");
-    assertThat(strategy.getUri()).isEqualTo("ksqldb-server:8088/ksql");
-  }
-
-  @Test
-  void shouldReturnTrueInTest() {
-    assertTrue(strategy.test("drop table table1;"));
-    assertTrue(strategy.test("drop stream stream2;"));
-  }
-
-  @Test
-  void shouldReturnFalseInTest() {
-    assertFalse(strategy.test("show streams;"));
-    assertFalse(strategy.test("show tables;"));
-    assertFalse(strategy.test("create table test;"));
-    assertFalse(strategy.test("create stream test;"));
-  }
-
-  @Test
-  void shouldSerializeResponse() {
-    String message = "updated successful";
-    JsonNode node = getResponseWithMessage(message);
-    KsqlCommandResponseDTO serializedResponse = strategy.serializeResponse(node);
-    assertThat(serializedResponse.getMessage()).isEqualTo(message);
-
-  }
-
-  @Test
-  void shouldSerializeWithException() {
-    JsonNode commandStatusNode = mapper.createObjectNode().put("commandStatus", "nodeWithMessage");
-    JsonNode node = mapper.createArrayNode().add(mapper.valueToTree(commandStatusNode));
-    Exception exception = assertThrows(
-        UnprocessableEntityException.class,
-        () -> strategy.serializeResponse(node)
-    );
-
-    assertThat(exception.getMessage()).isEqualTo("KSQL DB response mapping error");
-  }
-
-  @SneakyThrows
-  private JsonNode getResponseWithMessage(String message) {
-    JsonNode nodeWithMessage = mapper.createObjectNode().put("message", message);
-    JsonNode commandStatusNode = mapper.createObjectNode().set("commandStatus", nodeWithMessage);
-    return mapper.createArrayNode().add(mapper.valueToTree(commandStatusNode));
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategyTest.java
deleted file mode 100644
index 2582abedbf7..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ExplainStrategyTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import com.provectus.kafka.ui.model.TableDTO;
-import java.util.List;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class ExplainStrategyTest {
-  private final ObjectMapper mapper = new ObjectMapper();
-  private ExplainStrategy strategy;
-
-  @BeforeEach
-  void setUp() {
-    strategy = new ExplainStrategy();
-  }
-
-  @Test
-  void shouldReturnUri() {
-    strategy.host("ksqldb-server:8088");
-    assertThat(strategy.getUri()).isEqualTo("ksqldb-server:8088/ksql");
-  }
-
-  @Test
-  void shouldReturnTrueInTest() {
-    assertTrue(strategy.test("explain users_query_id;"));
-  }
-
-  @Test
-  void shouldReturnFalseInTest() {
-    assertFalse(strategy.test("show queries;"));
-  }
-
-  @Test
-  void shouldSerializeResponse() {
-    JsonNode node = getResponseWithObjectNode();
-    KsqlCommandResponseDTO serializedResponse = strategy.serializeResponse(node);
-    TableDTO table = serializedResponse.getData();
-    assertThat(table.getHeaders()).isEqualTo(List.of("key", "value"));
-    assertThat(table.getRows()).isEqualTo(List.of(List.of("name", "kafka")));
-  }
-
-  @Test
-  void shouldSerializeWithException() {
-    JsonNode sourceDescriptionNode =
-        mapper.createObjectNode().put("sourceDescription", "nodeWithMessage");
-    JsonNode node = mapper.createArrayNode().add(mapper.valueToTree(sourceDescriptionNode));
-    Exception exception = assertThrows(
-        UnprocessableEntityException.class,
-        () -> strategy.serializeResponse(node)
-    );
-
-    assertThat(exception.getMessage()).isEqualTo("KSQL DB response mapping error");
-  }
-
-  @SneakyThrows
-  private JsonNode getResponseWithObjectNode() {
-    JsonNode nodeWithMessage = mapper.createObjectNode().put("name", "kafka");
-    JsonNode nodeWithResponse = mapper.createObjectNode().set("queryDescription", nodeWithMessage);
-    return mapper.createArrayNode().add(mapper.valueToTree(nodeWithResponse));
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategyTest.java
deleted file mode 100644
index efeb87d5847..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/SelectStrategyTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import com.provectus.kafka.ui.model.TableDTO;
-import java.util.List;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class SelectStrategyTest {
-  private final ObjectMapper mapper = new ObjectMapper();
-  private SelectStrategy strategy;
-
-  @BeforeEach
-  void setUp() {
-    strategy = new SelectStrategy();
-  }
-
-  @Test
-  void shouldReturnUri() {
-    strategy.host("ksqldb-server:8088");
-    assertThat(strategy.getUri()).isEqualTo("ksqldb-server:8088/query");
-  }
-
-  @Test
-  void shouldReturnTrueInTest() {
-    assertTrue(strategy.test("select * from users;"));
-  }
-
-  @Test
-  void shouldReturnFalseInTest() {
-    assertFalse(strategy.test("show streams;"));
-    assertFalse(strategy.test("select *;"));
-  }
-
-  @Test
-  void shouldSerializeResponse() {
-    JsonNode node = getResponseWithData();
-    KsqlCommandResponseDTO serializedResponse = strategy.serializeResponse(node);
-    TableDTO table = serializedResponse.getData();
-    assertThat(table.getHeaders()).isEqualTo(List.of("header1", "header2"));
-    assertThat(table.getRows()).isEqualTo(List.of(List.of("value1", "value2")));
-  }
-
-  @Test
-  void shouldSerializeWithException() {
-    JsonNode node = mapper.createObjectNode();
-    Exception exception = assertThrows(
-        UnprocessableEntityException.class,
-        () -> strategy.serializeResponse(node)
-    );
-
-    assertThat(exception.getMessage()).isEqualTo("KSQL DB response mapping error");
-  }
-
-  @SneakyThrows
-  private JsonNode getResponseWithData() {
-    JsonNode headerNode = mapper.createObjectNode().set(
-        "header", mapper.createObjectNode().put("schema", "header1, header2")
-    );
-    JsonNode row = mapper.createObjectNode().set(
-        "row", mapper.createObjectNode().set(
-            "columns", mapper.createArrayNode().add("value1").add("value2")
-        )
-    );
-    return mapper.createArrayNode().add(headerNode).add(row);
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategyTest.java
deleted file mode 100644
index 3b12afa71ae..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/ShowStrategyTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import com.provectus.kafka.ui.model.TableDTO;
-import java.util.List;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestFactory;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class ShowStrategyTest {
-  private final ObjectMapper mapper = new ObjectMapper();
-  private ShowStrategy strategy;
-
-  @BeforeEach
-  void setUp() {
-    strategy = new ShowStrategy();
-  }
-
-  @Test
-  void shouldReturnUri() {
-    strategy.host("ksqldb-server:8088");
-    assertThat(strategy.getUri()).isEqualTo("ksqldb-server:8088/ksql");
-  }
-
-  @Test
-  void shouldReturnTrueInTest() {
-    assertTrue(strategy.test("SHOW STREAMS;"));
-    assertTrue(strategy.test("SHOW TABLES;"));
-    assertTrue(strategy.test("SHOW TOPICS;"));
-    assertTrue(strategy.test("SHOW QUERIES;"));
-    assertTrue(strategy.test("SHOW PROPERTIES;"));
-    assertTrue(strategy.test("SHOW FUNCTIONS;"));
-    assertTrue(strategy.test("LIST STREAMS;"));
-    assertTrue(strategy.test("LIST TABLES;"));
-    assertTrue(strategy.test("LIST TOPICS;"));
-    assertTrue(strategy.test("LIST FUNCTIONS;"));
-  }
-
-  @Test
-  void shouldReturnFalseInTest() {
-    assertFalse(strategy.test("LIST QUERIES;"));
-    assertFalse(strategy.test("LIST PROPERTIES;"));
-  }
-
-  @TestFactory
-  public Iterable<DynamicTest> shouldSerialize() {
-    return List.of(
-        shouldSerializeGenerate("streams", "show streams;"),
-        shouldSerializeGenerate("tables", "show tables;"),
-        shouldSerializeGenerate("topics", "show topics;"),
-        shouldSerializeGenerate("properties", "show properties;"),
-        shouldSerializeGenerate("functions", "show functions;"),
-        shouldSerializeGenerate("queries", "show queries;")
-    );
-  }
-
-  public DynamicTest shouldSerializeGenerate(final String key, final String sql) {
-    return DynamicTest.dynamicTest("Should serialize " + key,
-        () -> {
-          JsonNode node = getResponseWithData(key);
-          strategy.test(sql);
-          KsqlCommandResponseDTO serializedResponse = strategy.serializeResponse(node);
-          TableDTO table = serializedResponse.getData();
-          assertThat(table.getHeaders()).isEqualTo(List.of("header"));
-          assertThat(table.getRows()).isEqualTo(List.of(List.of("value")));
-        }
-    );
-  }
-
-  @Test
-  void shouldSerializeWithException() {
-    JsonNode node = getResponseWithData("streams");
-    strategy.test("show tables;");
-    Exception exception = assertThrows(
-        UnprocessableEntityException.class,
-        () -> strategy.serializeResponse(node)
-    );
-
-    assertThat(exception.getMessage()).isEqualTo("KSQL DB response mapping error");
-  }
-
-  @SneakyThrows
-  private JsonNode getResponseWithData(String key) {
-    JsonNode nodeWithDataItem = mapper.createObjectNode().put("header", "value");
-    JsonNode nodeWithData = mapper.createArrayNode().add(nodeWithDataItem);
-    JsonNode nodeWithResponse = mapper.createObjectNode().set(key, nodeWithData);
-    return mapper.createArrayNode().add(mapper.valueToTree(nodeWithResponse));
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategyTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategyTest.java
deleted file mode 100644
index 2f3b8756a1e..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/strategy/ksql/statement/TerminateStrategyTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.provectus.kafka.ui.strategy.ksql.statement;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
-import com.provectus.kafka.ui.model.KsqlCommandResponseDTO;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class TerminateStrategyTest {
-  private final ObjectMapper mapper = new ObjectMapper();
-  private TerminateStrategy strategy;
-
-  @BeforeEach
-  void setUp() {
-    strategy = new TerminateStrategy();
-  }
-
-  @Test
-  void shouldReturnUri() {
-    strategy.host("ksqldb-server:8088");
-    assertThat(strategy.getUri()).isEqualTo("ksqldb-server:8088/ksql");
-  }
-
-  @Test
-  void shouldReturnTrueInTest() {
-    assertTrue(strategy.test("terminate query_id;"));
-  }
-
-  @Test
-  void shouldReturnFalseInTest() {
-    assertFalse(strategy.test("show streams;"));
-    assertFalse(strategy.test("create table test;"));
-  }
-
-  @Test
-  void shouldSerializeResponse() {
-    String message = "query terminated.";
-    JsonNode node = getResponseWithMessage(message);
-    KsqlCommandResponseDTO serializedResponse = strategy.serializeResponse(node);
-    assertThat(serializedResponse.getMessage()).isEqualTo(message);
-
-  }
-
-  @Test
-  void shouldSerializeWithException() {
-    JsonNode commandStatusNode = mapper.createObjectNode().put("commandStatus", "nodeWithMessage");
-    JsonNode node = mapper.createArrayNode().add(mapper.valueToTree(commandStatusNode));
-    Exception exception = assertThrows(
-        UnprocessableEntityException.class,
-        () -> strategy.serializeResponse(node)
-    );
-
-    assertThat(exception.getMessage()).isEqualTo("KSQL DB response mapping error");
-  }
-
-  @SneakyThrows
-  private JsonNode getResponseWithMessage(String message) {
-    JsonNode nodeWithMessage = mapper.createObjectNode().put("message", message);
-    JsonNode commandStatusNode = mapper.createObjectNode().set("commandStatus", nodeWithMessage);
-    return mapper.createArrayNode().add(mapper.valueToTree(commandStatusNode));
-  }
-}
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index d07c24a61b1..55ea795f03e 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1561,31 +1561,6 @@ paths:
         200:
           description: OK
 
-  /api/clusters/{clusterName}/ksql:
-    description: Deprecated - use ksql/v2 instead!
-    post:
-      tags:
-        - Ksql
-      summary: executeKsqlCommand
-      operationId: executeKsqlCommand
-      parameters:
-        - name: clusterName
-          in: path
-          required: true
-          schema:
-            type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/KsqlCommand'
-      responses:
-        200:
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/KsqlCommandResponse'
 
   /api/clusters/{clusterName}/ksql/v2:
     post:
@@ -2986,18 +2961,6 @@ components:
           items:
             $ref: '#/components/schemas/ConnectorPluginConfig'
 
-    KsqlCommand:
-      type: object
-      properties:
-        ksql:
-          type: string
-        streamsProperties:
-          type: object
-          additionalProperties:
-            type: string
-      required:
-        - ksql
-
     KsqlCommandV2:
       type: object
       properties:
@@ -3044,31 +3007,6 @@ components:
         valueFormat:
           type: string
 
-    KsqlCommandResponse:
-      type: object
-      properties:
-        data:
-          $ref: '#/components/schemas/Table'
-        message:
-          type: string
-
-    Table:
-      type: object
-      properties:
-        headers:
-          type: array
-          items:
-            type: string
-        rows:
-          type: array
-          items:
-            type: array
-            items:
-              type: string
-      required:
-        - headers
-        - rows
-
     KsqlResponse:
       type: object
       properties:

From a2e87cc8d5ba21e2b01f2f240926298f382db63c Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 24 Oct 2022 11:13:06 +0300
Subject: [PATCH 228/734] [e2e] Fix openTopic() method to wait element (#2809)

---
 .../provectus/kafka/ui/pages/connector/KafkaConnectList.java   | 3 ++-
 .../provectus/kafka/ui/pages/schema/SchemaRegistryList.java    | 3 ++-
 .../java/com/provectus/kafka/ui/pages/topic/TopicsList.java    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
index 6f878bdd2e4..36a905d2d91 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
@@ -35,7 +35,8 @@ public KafkaConnectList clickCreateConnectorBtn() {
 
     @Step
     public KafkaConnectList openConnector(String connectorName) {
-        $x(String.format(tabElementLocator,connectorName)).shouldBe(Condition.visible).click();
+        $x(String.format(tabElementLocator,connectorName))
+                .shouldBe(Condition.enabled).click();
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index 9638d830f3b..b79fa307c41 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -30,7 +30,8 @@ public SchemaRegistryList clickCreateSchema() {
 
     @Step
     public SchemaRegistryList openSchema(String schemaName) {
-        $x(String.format(schemaTabElementLocator,schemaName)).shouldBe(Condition.visible).click();
+        $x(String.format(schemaTabElementLocator,schemaName))
+                .shouldBe(Condition.enabled).click();
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 2f139334840..793353cfad4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -42,7 +42,8 @@ public boolean isTopicVisible(String topicName) {
 
     @Step
     public TopicsList openTopic(String topicName) {
-        $(By.linkText(topicName)).click();
+        $(By.linkText(topicName))
+                .shouldBe(Condition.enabled).click();
         return this;
     }
 }

From dabe2878c1610fc6631d3ab81bb7aa7048617a47 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Mon, 24 Oct 2022 23:18:18 +0400
Subject: [PATCH 229/734] Fix helm charts validation (#2797)

---
 .github/workflows/helm.yaml | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
index d8c2875aed7..39a21548b67 100644
--- a/.github/workflows/helm.yaml
+++ b/.github/workflows/helm.yaml
@@ -19,11 +19,8 @@ jobs:
       - name: Check version
         shell: bash
         run: |
-          git fetch
-          git checkout master
-          helm_version_old=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk  '{print $2}')
-          git checkout $GITHUB_HEAD_REF
           helm_version_new=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk  '{print $2}')
+          helm_version_old=$(curl -s https://raw.githubusercontent.com/provectus/kafka-ui/master/charts/kafka-ui/Chart.yaml |   grep version | awk  '{print $2}' )
           echo $helm_version_old
           echo $helm_version_new
           if [[ "$helm_version_new" > "$helm_version_old" ]]; then exit 0 ; else exit 1 ; fi
@@ -39,17 +36,3 @@ jobs:
               echo $version;
               helm template --kube-version $version --set ingress.enabled=true charts/kafka-ui -f charts/kafka-ui/values.yaml | kubeval --additional-schema-locations https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master --strict -v $version;
             done
-      #check, was helm version increased in Chart.yaml?
-      - name: Check version
-        shell: bash
-        run: |
-          git fetch
-          git checkout master
-          helm_version_old=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk  '{print $2}')
-          git checkout $GITHUB_HEAD_REF
-          helm_version_new=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk  '{print $2}')
-          echo $helm_version_old
-          echo $helm_version_new
-          if [[ "$helm_version_new" > "$helm_version_old" ]]; then exit 0 ; else exit 1 ; fi
-
-

From f7f2e1dd1f6a146d7371e77bd497f82f21b03444 Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Mon, 24 Oct 2022 23:32:51 +0400
Subject: [PATCH 230/734] Fix wrong actuator URL with custom path (#2782)

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts b/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts
index 8373bf53d38..7e1835d9079 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts
@@ -2,9 +2,10 @@ import { useQuery } from '@tanstack/react-query';
 import { BASE_PARAMS, QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
 
 const fetchActuatorInfo = async () => {
-  const data = await fetch('/actuator/info', BASE_PARAMS).then((res) =>
-    res.json()
-  );
+  const data = await fetch(
+    `${BASE_PARAMS.basePath}/actuator/info`,
+    BASE_PARAMS
+  ).then((res) => res.json());
 
   return data;
 };

From 5a67adbf3e8fd5f71957b847a162d29fc3e5c12f Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 24 Oct 2022 23:34:20 +0400
Subject: [PATCH 231/734] Removed @types/yup package due to being deprecated
 also updated yup version to 0.32.11 (#2799)

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 kafka-ui-react-app/package.json   | 3 +--
 kafka-ui-react-app/pnpm-lock.yaml | 8 +-------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 22c9047db44..7420b8bddfd 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -16,7 +16,6 @@
     "@tanstack/react-table": "^8.5.10",
     "@testing-library/react": "^13.2.0",
     "@types/testing-library__jest-dom": "^5.14.5",
-    "@types/yup": "^0.29.13",
     "@vitejs/plugin-react": "^2.0.0",
     "ace-builds": "^1.7.1",
     "ajv": "^8.6.3",
@@ -47,7 +46,7 @@
     "vite": "^3.0.2",
     "vite-tsconfig-paths": "^3.5.0",
     "whatwg-fetch": "^3.6.2",
-    "yup": "^0.32.9",
+    "yup": "^0.32.11",
     "zustand": "^4.1.1"
   },
   "lint-staged": {
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index c789e1b0483..aabb45ce343 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -30,7 +30,6 @@ specifiers:
   '@types/react-router-dom': ^5.3.3
   '@types/styled-components': ^5.1.13
   '@types/testing-library__jest-dom': ^5.14.5
-  '@types/yup': ^0.29.13
   '@typescript-eslint/eslint-plugin': ^5.29.0
   '@typescript-eslint/parser': ^5.29.0
   '@vitejs/plugin-react': ^2.0.0
@@ -88,7 +87,7 @@ specifiers:
   vite: ^3.0.2
   vite-tsconfig-paths: ^3.5.0
   whatwg-fetch: ^3.6.2
-  yup: ^0.32.9
+  yup: ^0.32.11
   zustand: ^4.1.1
 
 dependencies:
@@ -104,7 +103,6 @@ dependencies:
   '@tanstack/react-table': 8.5.10_ef5jwxihqo6n7gxfmzogljlgcm
   '@testing-library/react': 13.2.0_ef5jwxihqo6n7gxfmzogljlgcm
   '@types/testing-library__jest-dom': 5.14.5
-  '@types/yup': 0.29.13
   '@vitejs/plugin-react': 2.0.0_vite@3.0.2
   ace-builds: 1.7.1
   ajv: 8.8.2
@@ -3546,10 +3544,6 @@ packages:
     dependencies:
       '@types/yargs-parser': 20.2.0
 
-  /@types/yup/0.29.13:
-    resolution: {integrity: sha512-qRyuv+P/1t1JK1rA+elmK1MmCL1BapEzKKfbEhDBV/LMMse4lmhZ/XbgETI39JveDJRpLjmToOI6uFtMW/WR2g==}
-    dev: false
-
   /@typescript-eslint/eslint-plugin/5.29.0_uaxwak76nssfibsnotx5epygnu:
     resolution: {integrity: sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}

From 1b8ee3b6723d2159217c39a43166e96035c4c311 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 25 Oct 2022 23:14:40 +0400
Subject: [PATCH 232/734] [UI] Topic search not working properly with
 pagination #2705 (#2766)

* added reset page to a search component

* changed search file

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/components/common/Search/Search.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kafka-ui-react-app/src/components/common/Search/Search.tsx b/kafka-ui-react-app/src/components/common/Search/Search.tsx
index 9baf1ed3b2e..66c0e95030b 100644
--- a/kafka-ui-react-app/src/components/common/Search/Search.tsx
+++ b/kafka-ui-react-app/src/components/common/Search/Search.tsx
@@ -22,6 +22,9 @@ const Search: React.FC<SearchProps> = ({
       onChange(e.target.value);
     } else {
       searchParams.set('q', e.target.value);
+      if (searchParams.get('page')) {
+        searchParams.set('page', '1');
+      }
       setSearchParams(searchParams);
     }
   }, 500);

From a12380100e061b55c6e4636e2899da0da38006b7 Mon Sep 17 00:00:00 2001
From: Artem Tanyhin <71770433+devils2ndself@users.noreply.github.com>
Date: Tue, 25 Oct 2022 15:41:09 -0400
Subject: [PATCH 233/734] [UI] Fix ksql panes overlap (#2804)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../components/KsqlDb/Query/QueryForm/QueryForm.styled.ts  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
index a8fa1cf7afa..3fc59fcecf4 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
@@ -34,17 +34,22 @@ export const StreamPropertiesContainer = styled.label`
 `;
 
 export const InputsContainer = styled.div`
+  overflow: hidden;
+  width: 100%;
   display: flex;
   justify-content: center;
   gap: 10px;
 `;
 
 export const StreamPropertiesInputWrapper = styled.div`
+  & {
+    width: 100%;
+  }
   & > input {
+    width: 100%;
     height: 40px;
     border: 1px solid grey;
     border-radius: 4px;
-    min-width: 300px;
     font-size: 16px;
     padding-left: 15px;
   }

From 25111085be6712aaab02a69384bc2c65b6c03a94 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Tue, 25 Oct 2022 23:43:44 +0400
Subject: [PATCH 234/734] Change app version in charts.yaml (#2821)

* change app version in charts.yaml

* change setup-helm-version
---
 .github/workflows/helm.yaml | 2 +-
 charts/kafka-ui/Chart.yaml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
index 39a21548b67..b8c88a43057 100644
--- a/.github/workflows/helm.yaml
+++ b/.github/workflows/helm.yaml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Helm tool installer
-        uses: Azure/setup-helm@v1
+        uses: Azure/setup-helm@v3
       - name: Setup Kubeval
         uses: lra/setup-kubeval@v1.0.1
       #check, was helm version increased in Chart.yaml?
diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index e0d9b0b1611..89982674019 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.4.3
-appVersion: latest
+version: 0.4.4
+appVersion: 0.4.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

From e87178136c86be37dbf1ff08eb74142dd53ccd99 Mon Sep 17 00:00:00 2001
From: Aditya Bhattad <93488388+adityabhattad2021@users.noreply.github.com>
Date: Wed, 26 Oct 2022 01:22:19 +0530
Subject: [PATCH 235/734] [UI] Changed Content to Value and updated a Test
 (#2812)

* Changed Content to Value and Update a Test

* Corrected content->value in tests

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Topic/Messages/MessageContent/MessageContent.tsx      | 4 ++--
 .../MessageContent/__tests__/MessageContent.spec.tsx      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
index 6e385916b5c..85f2dcd27c9 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
@@ -82,7 +82,7 @@ const MessageContent: React.FC<MessageContentProps> = ({
                 type="button"
                 onClick={handleContentTabClick}
               >
-                Content
+                Value
               </S.Tab>
               <S.Tab
                 $active={activeTab === 'headers'}
@@ -108,7 +108,7 @@ const MessageContent: React.FC<MessageContentProps> = ({
             </S.Metadata>
 
             <S.Metadata>
-              <S.MetadataLabel>Content</S.MetadataLabel>
+              <S.MetadataLabel>Value</S.MetadataLabel>
               <span>
                 <S.MetadataValue>{messageContentFormat}</S.MetadataValue>
                 <S.MetadataMeta>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
index 8159a8f7279..e7fbd2b44ab 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
@@ -61,7 +61,7 @@ describe('MessageContent screen', () => {
   });
 
   describe('when switched to display the headers', () => {
-    it('makes Headers tab active', () => {
+    it('makes headers tab active', () => {
       userEvent.click(screen.getByText('Headers'));
       expect(screen.getByText('Headers')).toHaveStyleRule(
         'background-color',
@@ -70,9 +70,9 @@ describe('MessageContent screen', () => {
     });
   });
 
-  describe('when switched to display the content', () => {
-    it('makes content tab active', () => {
-      const contentTab = screen.getAllByText('Content');
+  describe('when switched to display the value', () => {
+    it('makes value tab active', () => {
+      const contentTab = screen.getAllByText('Value');
       userEvent.click(contentTab[0]);
       expect(contentTab[0]).toHaveStyleRule(
         'background-color',

From e67d940981612753b406aa6273514c0b37c04788 Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Wed, 26 Oct 2022 12:07:03 +0400
Subject: [PATCH 236/734] added shouldDirty (#2776)

---
 .../src/components/Topics/shared/Form/TimeToRetainBtn.tsx   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtn.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtn.tsx
index 2364d90516a..8746eef7929 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtn.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtn.tsx
@@ -18,7 +18,11 @@ const TimeToRetainBtn: React.FC<Props> = ({ inputName, text, value }) => {
     <S.Button
       isActive={parseFloat(watchedValue) === value}
       type="button"
-      onClick={() => setValue(inputName, value)}
+      onClick={() =>
+        setValue(inputName, value, {
+          shouldDirty: true,
+        })
+      }
     >
       {text}
     </S.Button>

From b43ba68405dabd5ebf125fbe3681e2947f17e83c Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Wed, 26 Oct 2022 23:15:25 +0400
Subject: [PATCH 237/734] Testing library update to 14.4.3 (#2741)

* Update RTL to v14.4.3

* fixed test cases QueryForm.spec.tsx, SchemaVersion.spec.tsx

Co-authored-by: Oleg Shur <workshur@gmail.com>
Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 kafka-ui-react-app/package.json               |   2 +-
 kafka-ui-react-app/pnpm-lock.yaml             |  11 +-
 .../__test__/BrokerLogdir.spec.tsx            |  19 ++-
 .../Broker/Configs/__test__/Configs.spec.tsx  |  11 +-
 .../BrokersList/__test__/BrokersList.spec.tsx |   6 +-
 .../Cluster/__tests__/Cluster.spec.tsx        |  15 +--
 .../Actions/__tests__/Actions.spec.tsx        |  54 ++++----
 .../Details/Tasks/__tests__/Tasks.spec.tsx    |  16 +--
 .../Connect/List/__tests__/List.spec.tsx      |  16 ++-
 .../Connect/New/__tests__/New.spec.tsx        |  18 ++-
 .../__test__/ResetOffsets.spec.tsx            |  43 ++++---
 .../Details/__tests__/Details.spec.tsx        |  13 +-
 .../Details/__tests__/ListItem.spec.tsx       |   4 +-
 .../List/__test__/List.spec.tsx               |   4 +-
 .../__test__/ClustersWidget.spec.tsx          |  10 +-
 .../KsqlDbItem/__test__/KsqlDbItem.spec.tsx   |  44 +++----
 .../QueryForm/__test__/QueryForm.spec.tsx     |  97 ++++++---------
 .../KsqlDb/Query/__test__/Query.spec.tsx      |  35 +++---
 .../Nav/__tests__/ClusterMenu.spec.tsx        |  12 +-
 .../src/components/Nav/__tests__/Nav.spec.tsx |  15 +--
 .../Schemas/Details/__test__/Details.spec.tsx |   4 +-
 .../Details/__test__/SchemaVersion.spec.tsx   |   2 +-
 .../Schemas/Edit/__tests__/Edit.spec.tsx      |   4 +-
 .../__test__/GlobalSchemaSelector.spec.tsx    |  16 +--
 .../Schemas/List/__test__/List.spec.tsx       |   4 +-
 .../Schemas/New/__test__/New.spec.tsx         |  16 +--
 .../Topics/List/__tests__/ListPage.spec.tsx   |   6 +-
 .../Topics/List/__tests__/TopicTable.spec.tsx |  38 +++---
 .../Topics/New/__test__/New.spec.tsx          |  22 ++--
 .../DangerZone/__test__/DangerZone.spec.tsx   |  46 +++----
 .../__tests__/AddEditFilterContainer.spec.tsx |  83 ++++++-------
 .../Filters/__tests__/AddFilter.spec.tsx      | 117 +++++++++++-------
 .../Filters/__tests__/EditFilter.spec.tsx     |  14 +--
 .../Filters/__tests__/FilterModal.spec.tsx    |   6 +-
 .../Filters/__tests__/Filters.spec.tsx        |  69 ++++++-----
 .../Filters/__tests__/InfoModal.spec.tsx      |   4 +-
 .../Filters/__tests__/SavedFilters.spec.tsx   |  54 ++++----
 .../__tests__/MessageContent.spec.tsx         |  12 +-
 .../Topic/Messages/__test__/Message.spec.tsx  |  10 +-
 .../Topic/Messages/__test__/Messages.spec.tsx |  12 +-
 .../Topic/Overview/__test__/Overview.spec.tsx |   4 +-
 .../SendMessage/__test__/SendMessage.spec.tsx |  30 ++---
 .../Statistics/__test__/Metrics.spec.tsx      |   8 +-
 .../Topics/Topic/__test__/Topic.spec.tsx      |  32 ++---
 .../__test__/CustomParamField.spec.tsx        |   8 +-
 .../__test__/CustomParams.spec.tsx            |  42 +++++--
 .../Form/__tests__/TimeToRetainBtn.spec.tsx   |   4 +-
 .../shared/Form/__tests__/TopicForm.spec.tsx  |   9 +-
 .../src/components/__tests__/App.spec.tsx     |   4 +-
 .../common/Alert/__tests__/Alert.spec.tsx     |   4 +-
 .../common/Input/__tests__/Input.spec.tsx     |   8 +-
 .../common/NewTable/__test__/Table.spec.tsx   |  59 +++++----
 .../common/Search/__tests__/Search.spec.tsx   |   6 +-
 .../common/Select/__tests__/Select.spec.tsx   |  20 +--
 .../table/__tests__/TableHeaderCell.spec.tsx  |  16 +--
 55 files changed, 612 insertions(+), 626 deletions(-)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 7420b8bddfd..fa1842dedbd 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -82,7 +82,7 @@
     "@openapitools/openapi-generator-cli": "^2.5.1",
     "@testing-library/dom": "^8.11.1",
     "@testing-library/jest-dom": "^5.16.4",
-    "@testing-library/user-event": "^13.5.0",
+    "@testing-library/user-event": "^14.4.3",
     "@types/eventsource": "^1.1.8",
     "@types/jest": "^29.0.1",
     "@types/lodash": "^4.14.172",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index aabb45ce343..88fcfac42e1 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -19,7 +19,7 @@ specifiers:
   '@testing-library/dom': ^8.11.1
   '@testing-library/jest-dom': ^5.16.4
   '@testing-library/react': ^13.2.0
-  '@testing-library/user-event': ^13.5.0
+  '@testing-library/user-event': ^14.4.3
   '@types/eventsource': ^1.1.8
   '@types/jest': ^29.0.1
   '@types/lodash': ^4.14.172
@@ -144,7 +144,7 @@ devDependencies:
   '@openapitools/openapi-generator-cli': 2.5.1
   '@testing-library/dom': 8.13.0
   '@testing-library/jest-dom': 5.16.4
-  '@testing-library/user-event': 13.5.0_tlwynutqiyp5mns3woioasuxnq
+  '@testing-library/user-event': 14.4.3_tlwynutqiyp5mns3woioasuxnq
   '@types/eventsource': 1.1.8
   '@types/jest': 29.0.1
   '@types/lodash': 4.14.177
@@ -3337,13 +3337,12 @@ packages:
       react-dom: 18.1.0_react@18.1.0
     dev: false
 
-  /@testing-library/user-event/13.5.0_tlwynutqiyp5mns3woioasuxnq:
-    resolution: {integrity: sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==}
-    engines: {node: '>=10', npm: '>=6'}
+  /@testing-library/user-event/14.4.3_tlwynutqiyp5mns3woioasuxnq:
+    resolution: {integrity: sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==}
+    engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
     dependencies:
-      '@babel/runtime': 7.17.9
       '@testing-library/dom': 8.13.0
     dev: true
 
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
index bb48fde32a0..b8ae5bcd581 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/BrokerLogdir/__test__/BrokerLogdir.spec.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/dom';
 import { clusterBrokerPath } from 'lib/paths';
-import { act } from '@testing-library/react';
 import { brokerLogDirsPayload } from 'lib/fixtures/brokers';
 import { useBrokerLogDirs } from 'lib/hooks/api/brokers';
 import { BrokerLogdirs } from 'generated-sources';
@@ -20,16 +19,14 @@ describe('BrokerLogdir Component', () => {
     (useBrokerLogDirs as jest.Mock).mockImplementation(() => ({
       data: payload,
     }));
-    await act(() => {
-      render(
-        <WithRoute path={clusterBrokerPath()}>
-          <BrokerLogdir />
-        </WithRoute>,
-        {
-          initialEntries: [clusterBrokerPath(clusterName, brokerId)],
-        }
-      );
-    });
+    await render(
+      <WithRoute path={clusterBrokerPath()}>
+        <BrokerLogdir />
+      </WithRoute>,
+      {
+        initialEntries: [clusterBrokerPath(clusterName, brokerId)],
+      }
+    );
   };
 
   it('shows warning when server returns undefined logDirs response', async () => {
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/__test__/Configs.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/__test__/Configs.spec.tsx
index 500e65cfdc6..d82065eb321 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/__test__/Configs.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/__test__/Configs.spec.tsx
@@ -6,7 +6,6 @@ import { useBrokerConfig } from 'lib/hooks/api/brokers';
 import { brokerConfigPayload } from 'lib/fixtures/brokers';
 import Configs from 'components/Brokers/Broker/Configs/Configs';
 import userEvent from '@testing-library/user-event';
-import { act } from '@testing-library/react';
 
 const clusterName = 'Cluster_Name';
 const brokerId = 'Broker_Id';
@@ -42,9 +41,7 @@ describe('Configs', () => {
   });
 
   it('updates textbox value', async () => {
-    await act(() => {
-      userEvent.click(screen.getAllByLabelText('editAction')[0]);
-    });
+    await userEvent.click(screen.getAllByLabelText('editAction')[0]);
 
     const textbox = screen.getByLabelText('inputValue');
     expect(textbox).toBeInTheDocument();
@@ -59,9 +56,9 @@ describe('Configs', () => {
       screen.getByRole('button', { name: 'cancelAction' })
     ).toBeInTheDocument();
 
-    await act(() => {
-      userEvent.click(screen.getByRole('button', { name: 'confirmAction' }));
-    });
+    await userEvent.click(
+      screen.getByRole('button', { name: 'confirmAction' })
+    );
 
     expect(
       screen.getByText('Are you sure you want to change the value?')
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
index b90cef0a433..b11d477b600 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen, waitFor } from '@testing-library/dom';
 import { clusterBrokerPath, clusterBrokersPath } from 'lib/paths';
-import { act } from '@testing-library/react';
 import BrokersList from 'components/Brokers/BrokersList/BrokersList';
 import userEvent from '@testing-library/user-event';
 import { useBrokers } from 'lib/hooks/api/brokers';
@@ -57,9 +56,8 @@ describe('BrokersList Component', () => {
       });
       it('opens broker when row clicked', async () => {
         renderComponent();
-        await act(() => {
-          userEvent.click(screen.getByRole('cell', { name: '0' }));
-        });
+        await userEvent.click(screen.getByRole('cell', { name: '0' }));
+
         await waitFor(() =>
           expect(mockedUsedNavigate).toBeCalledWith(
             clusterBrokerPath(clusterName, '0')
diff --git a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
index b718db8b299..9fcb77a79a9 100644
--- a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
@@ -13,7 +13,6 @@ import {
   clusterSchemasPath,
   clusterTopicsPath,
 } from 'lib/paths';
-import { act } from 'react-dom/test-utils';
 import { useClusters } from 'lib/hooks/api/clusters';
 import { onlineClusterPayload } from 'lib/fixtures/clusters';
 
@@ -54,14 +53,12 @@ describe('Cluster', () => {
     (useClusters as jest.Mock).mockImplementation(() => ({
       data: payload,
     }));
-    await act(() => {
-      render(
-        <WithRoute path={`${clusterPath()}/*`}>
-          <ClusterComponent />
-        </WithRoute>,
-        { initialEntries: [pathname] }
-      );
-    });
+    await render(
+      <WithRoute path={`${clusterPath()}/*`}>
+        <ClusterComponent />
+      </WithRoute>,
+      { initialEntries: [pathname] }
+    );
   };
 
   it('renders Brokers', async () => {
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
index 878e8bcee6c..c3c4cff8f1a 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
@@ -33,10 +33,10 @@ const expectActionButtonsExists = () => {
   expect(screen.getByText('Restart Failed Tasks')).toBeInTheDocument();
   expect(screen.getByText('Delete')).toBeInTheDocument();
 };
-const afterClickDropDownButton = () => {
+const afterClickDropDownButton = async () => {
   const dropDownButton = screen.getAllByRole('button');
   expect(dropDownButton.length).toEqual(1);
-  userEvent.click(dropDownButton[0]);
+  await userEvent.click(dropDownButton[0]);
 };
 describe('Actions', () => {
   afterEach(() => {
@@ -61,48 +61,48 @@ describe('Actions', () => {
         { initialEntries: [path] }
       );
 
-    it('renders buttons when paused', () => {
+    it('renders buttons when paused', async () => {
       (useConnector as jest.Mock).mockImplementation(() => ({
         data: set({ ...connector }, 'status.state', ConnectorState.PAUSED),
       }));
       renderComponent();
-      afterClickDropDownButton();
+      await afterClickDropDownButton();
       expect(screen.getAllByRole('menuitem').length).toEqual(5);
       expect(screen.getByText('Resume')).toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
     });
 
-    it('renders buttons when failed', () => {
+    it('renders buttons when failed', async () => {
       (useConnector as jest.Mock).mockImplementation(() => ({
         data: set({ ...connector }, 'status.state', ConnectorState.FAILED),
       }));
       renderComponent();
-      afterClickDropDownButton();
+      await afterClickDropDownButton();
       expect(screen.getAllByRole('menuitem').length).toEqual(4);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
     });
 
-    it('renders buttons when unassigned', () => {
+    it('renders buttons when unassigned', async () => {
       (useConnector as jest.Mock).mockImplementation(() => ({
         data: set({ ...connector }, 'status.state', ConnectorState.UNASSIGNED),
       }));
       renderComponent();
-      afterClickDropDownButton();
+      await afterClickDropDownButton();
       expect(screen.getAllByRole('menuitem').length).toEqual(4);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
     });
 
-    it('renders buttons when running connector action', () => {
+    it('renders buttons when running connector action', async () => {
       (useConnector as jest.Mock).mockImplementation(() => ({
         data: set({ ...connector }, 'status.state', ConnectorState.RUNNING),
       }));
       renderComponent();
-      afterClickDropDownButton();
+      await afterClickDropDownButton();
       expect(screen.getAllByRole('menuitem').length).toEqual(5);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.getByText('Pause')).toBeInTheDocument();
@@ -118,34 +118,34 @@ describe('Actions', () => {
 
       it('opens confirmation modal when delete button clicked', async () => {
         renderComponent();
-        afterClickDropDownButton();
-        await waitFor(() =>
+        await afterClickDropDownButton();
+        await waitFor(async () =>
           userEvent.click(screen.getByRole('menuitem', { name: 'Delete' }))
         );
         expect(screen.getByRole('dialog')).toBeInTheDocument();
       });
 
-      it('calls restartConnector when restart button clicked', () => {
+      it('calls restartConnector when restart button clicked', async () => {
         const restartConnector = jest.fn();
         (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
           mutateAsync: restartConnector,
         }));
         renderComponent();
-        afterClickDropDownButton();
-        userEvent.click(
+        await afterClickDropDownButton();
+        await userEvent.click(
           screen.getByRole('menuitem', { name: 'Restart Connector' })
         );
         expect(restartConnector).toHaveBeenCalledWith(ConnectorAction.RESTART);
       });
 
-      it('calls restartAllTasks', () => {
+      it('calls restartAllTasks', async () => {
         const restartAllTasks = jest.fn();
         (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
           mutateAsync: restartAllTasks,
         }));
         renderComponent();
-        afterClickDropDownButton();
-        userEvent.click(
+        await afterClickDropDownButton();
+        await userEvent.click(
           screen.getByRole('menuitem', { name: 'Restart All Tasks' })
         );
         expect(restartAllTasks).toHaveBeenCalledWith(
@@ -153,14 +153,14 @@ describe('Actions', () => {
         );
       });
 
-      it('calls restartFailedTasks', () => {
+      it('calls restartFailedTasks', async () => {
         const restartFailedTasks = jest.fn();
         (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
           mutateAsync: restartFailedTasks,
         }));
         renderComponent();
-        afterClickDropDownButton();
-        userEvent.click(
+        await afterClickDropDownButton();
+        await userEvent.click(
           screen.getByRole('menuitem', { name: 'Restart Failed Tasks' })
         );
         expect(restartFailedTasks).toHaveBeenCalledWith(
@@ -168,18 +168,18 @@ describe('Actions', () => {
         );
       });
 
-      it('calls pauseConnector when pause button clicked', () => {
+      it('calls pauseConnector when pause button clicked', async () => {
         const pauseConnector = jest.fn();
         (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
           mutateAsync: pauseConnector,
         }));
         renderComponent();
-        afterClickDropDownButton();
-        userEvent.click(screen.getByRole('menuitem', { name: 'Pause' }));
+        await afterClickDropDownButton();
+        await userEvent.click(screen.getByRole('menuitem', { name: 'Pause' }));
         expect(pauseConnector).toHaveBeenCalledWith(ConnectorAction.PAUSE);
       });
 
-      it('calls resumeConnector when resume button clicked', () => {
+      it('calls resumeConnector when resume button clicked', async () => {
         const resumeConnector = jest.fn();
         (useConnector as jest.Mock).mockImplementation(() => ({
           data: set({ ...connector }, 'status.state', ConnectorState.PAUSED),
@@ -188,8 +188,8 @@ describe('Actions', () => {
           mutateAsync: resumeConnector,
         }));
         renderComponent();
-        afterClickDropDownButton();
-        userEvent.click(screen.getByRole('menuitem', { name: 'Resume' }));
+        await afterClickDropDownButton();
+        await userEvent.click(screen.getByRole('menuitem', { name: 'Resume' }));
         expect(resumeConnector).toHaveBeenCalledWith(ConnectorAction.RESUME);
       });
     });
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx
index da38068a203..dba12d4b0ea 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Tasks/__tests__/Tasks.spec.tsx
@@ -57,7 +57,7 @@ describe('Tasks', () => {
     ).toBeInTheDocument();
   });
 
-  it('renders truncates long trace and expands', () => {
+  it('renders truncates long trace and expands', async () => {
     renderComponent(tasks);
 
     const trace = tasks[2]?.status?.trace || '';
@@ -72,7 +72,7 @@ describe('Tasks', () => {
     //  Full trace is not visible
     expect(expandedDetails).not.toBeInTheDocument();
 
-    userEvent.click(thirdRow);
+    await userEvent.click(thirdRow);
 
     expect(
       screen.getByRole('row', {
@@ -82,7 +82,7 @@ describe('Tasks', () => {
   });
 
   describe('Action button', () => {
-    const expectDropdownExists = () => {
+    const expectDropdownExists = async () => {
       const firstTaskRow = screen.getByRole('row', {
         name: '1 kafka-connect0:8083 RUNNING',
       });
@@ -91,13 +91,13 @@ describe('Tasks', () => {
         name: 'Dropdown Toggle',
       });
       expect(extBtn).toBeEnabled();
-      userEvent.click(extBtn);
+      await userEvent.click(extBtn);
       expect(screen.getByRole('menu')).toBeInTheDocument();
     };
 
-    it('renders action button', () => {
+    it('renders action button', async () => {
       renderComponent(tasks);
-      expectDropdownExists();
+      await expectDropdownExists();
       expect(
         screen.getAllByRole('button', { name: 'Dropdown Toggle' }).length
       ).toEqual(tasks.length);
@@ -108,11 +108,11 @@ describe('Tasks', () => {
 
     it('works as expected', async () => {
       renderComponent(tasks);
-      expectDropdownExists();
+      await expectDropdownExists();
       const actionBtn = screen.getAllByRole('menuitem');
       expect(actionBtn[0]).toHaveTextContent('Restart task');
 
-      userEvent.click(actionBtn[0]);
+      await userEvent.click(actionBtn[0]);
       expect(
         screen.getByText('Are you sure you want to restart the task?')
       ).toBeInTheDocument();
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
index 04a7ba81506..9de28f38ffd 100644
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
@@ -5,7 +5,7 @@ import ClusterContext, {
   initialValue,
 } from 'components/contexts/ClusterContext';
 import List from 'components/Connect/List/List';
-import { act, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterConnectConnectorPath, clusterConnectorsPath } from 'lib/paths';
@@ -52,13 +52,11 @@ describe('Connectors List', () => {
 
     it('opens broker when row clicked', async () => {
       renderComponent();
-      await act(() => {
-        userEvent.click(
-          screen.getByRole('row', {
-            name: 'hdfs-source-connector first SOURCE FileStreamSource a b c RUNNING 2 of 2',
-          })
-        );
-      });
+      await userEvent.click(
+        screen.getByRole('row', {
+          name: 'hdfs-source-connector first SOURCE FileStreamSource a b c RUNNING 2 of 2',
+        })
+      );
       await waitFor(() =>
         expect(mockedUsedNavigate).toBeCalledWith(
           clusterConnectConnectorPath(
@@ -105,7 +103,7 @@ describe('Connectors List', () => {
       const submitButton = screen.getAllByRole('button', {
         name: 'Confirm',
       })[0];
-      await act(() => userEvent.click(submitButton));
+      await userEvent.click(submitButton);
       expect(mockDelete).toHaveBeenCalledWith();
     });
 
diff --git a/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx b/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
index bbb710a8af3..3b93c2d86c6 100644
--- a/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
@@ -31,16 +31,14 @@ jest.mock('lib/hooks/api/kafkaConnect', () => ({
 describe('New', () => {
   const clusterName = 'my-cluster';
   const simulateFormSubmit = async () => {
-    await act(() => {
-      userEvent.type(
-        screen.getByPlaceholderText('Connector Name'),
-        'my-connector'
-      );
-      userEvent.type(
-        screen.getByPlaceholderText('json'),
-        '{"class":"MyClass"}'.replace(/[{[]/g, '$&$&')
-      );
-    });
+    await userEvent.type(
+      screen.getByPlaceholderText('Connector Name'),
+      'my-connector'
+    );
+    await userEvent.type(
+      screen.getByPlaceholderText('json'),
+      '{"class":"MyClass"}'.replace(/[{[]/g, '$&$&')
+    );
 
     expect(screen.getByPlaceholderText('json')).toHaveValue(
       '{"class":"MyClass"}'
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx
index 963600b7976..9b0682f04f9 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx
@@ -33,25 +33,24 @@ const resetConsumerGroupOffsetsMockCalled = () =>
   ).toBeTruthy();
 
 const selectresetTypeAndPartitions = async (resetType: string) => {
-  userEvent.click(screen.getByLabelText('Reset Type'));
-  userEvent.click(screen.getByText(resetType));
-  userEvent.click(screen.getByText('Select...'));
-  await waitFor(() => {
-    userEvent.click(screen.getByText('Partition #0'));
-  });
+  await userEvent.click(screen.getByLabelText('Reset Type'));
+  await userEvent.click(screen.getByText(resetType));
+  await userEvent.click(screen.getByText('Select...'));
+
+  await userEvent.click(screen.getByText('Partition #0'));
 };
 
 const resetConsumerGroupOffsetsWith = async (
   resetType: string,
   offset: null | number = null
 ) => {
-  userEvent.click(screen.getByLabelText('Reset Type'));
+  await userEvent.click(screen.getByLabelText('Reset Type'));
   const options = screen.getAllByText(resetType);
-  userEvent.click(options.length > 1 ? options[1] : options[0]);
-  userEvent.click(screen.getByText('Select...'));
-  await waitFor(() => {
-    userEvent.click(screen.getByText('Partition #0'));
-  });
+  await userEvent.click(options.length > 1 ? options[1] : options[0]);
+  await userEvent.click(screen.getByText('Select...'));
+
+  await userEvent.click(screen.getByText('Partition #0'));
+
   fetchMock.postOnce(
     `/api/clusters/${clusterName}/consumer-groups/${groupId}/offsets`,
     200,
@@ -64,7 +63,7 @@ const resetConsumerGroupOffsetsWith = async (
       },
     }
   );
-  userEvent.click(screen.getByText('Submit'));
+  await userEvent.click(screen.getByText('Submit'));
   await waitFor(() => resetConsumerGroupOffsetsMockCalled());
 };
 
@@ -116,14 +115,14 @@ describe('ResetOffsets', () => {
             },
           }
         );
-        await waitFor(() => {
-          userEvent.click(screen.getAllByLabelText('Partition #0')[1]);
-        });
-        await waitFor(() => {
-          userEvent.keyboard('10');
-        });
-        userEvent.click(screen.getByText('Submit'));
-        await waitFor(() => resetConsumerGroupOffsetsMockCalled());
+
+        await userEvent.click(screen.getAllByLabelText('Partition #0')[1]);
+
+        await userEvent.keyboard('10');
+
+        await userEvent.click(screen.getByText('Submit'));
+
+        await resetConsumerGroupOffsetsMockCalled();
       });
       it('calls resetConsumerGroupOffsets with TIMESTAMP', async () => {
         await selectresetTypeAndPartitions('TIMESTAMP');
@@ -139,7 +138,7 @@ describe('ResetOffsets', () => {
             },
           }
         );
-        userEvent.click(screen.getByText('Submit'));
+        await userEvent.click(screen.getByText('Submit'));
         await waitFor(() =>
           expect(
             screen.getByText("This field shouldn't be empty!")
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
index e086de8b636..195e71411a0 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
@@ -13,7 +13,6 @@ import {
   waitForElementToBeRemoved,
 } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
-import { act } from '@testing-library/react';
 
 const clusterName = 'cluster1';
 const { groupId } = consumerGroupPayload;
@@ -71,7 +70,7 @@ describe('Details component', () => {
     });
 
     it('handles [Reset offset] click', async () => {
-      userEvent.click(screen.getByText('Reset offset'));
+      await userEvent.click(screen.getByText('Reset offset'));
       expect(mockNavigate).toHaveBeenLastCalledWith(
         clusterConsumerGroupResetRelativePath
       );
@@ -86,19 +85,19 @@ describe('Details component', () => {
 
     it('shows confirmation modal on consumer group delete', async () => {
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-      userEvent.click(screen.getByText('Delete consumer group'));
+      await userEvent.click(screen.getByText('Delete consumer group'));
       await waitFor(() =>
         expect(screen.queryByRole('dialog')).toBeInTheDocument()
       );
-      userEvent.click(screen.getByText('Cancel'));
+      await userEvent.click(screen.getByText('Cancel'));
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
 
     it('handles [Delete consumer group] click', async () => {
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-      await act(() => {
-        userEvent.click(screen.getByText('Delete consumer group'));
-      });
+
+      await userEvent.click(screen.getByText('Delete consumer group'));
+
       expect(screen.queryByRole('dialog')).toBeInTheDocument();
       const deleteConsumerGroupMock = fetchMock.deleteOnce(
         `/api/clusters/${clusterName}/consumer-groups/${groupId}`,
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx
index 5bbce7a9271..c4906e9209d 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx
@@ -39,8 +39,8 @@ describe('ListItem', () => {
     expect(screen.getByRole('row')).toBeInTheDocument();
   });
 
-  it('should renders list item with topic content open', () => {
-    userEvent.click(screen.getAllByRole('cell')[0].children[0]);
+  it('should renders list item with topic content open', async () => {
+    await userEvent.click(screen.getAllByRole('cell')[0].children[0]);
     expect(screen.getByText('Consumer ID')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx
index 500549c0aa1..a1393c2ccdf 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx
@@ -48,10 +48,10 @@ describe('List', () => {
       expect(screen.getByText('groupId2')).toBeInTheDocument();
     });
 
-    it('handles onRowClick', () => {
+    it('handles onRowClick', async () => {
       const row = screen.getByRole('row', { name: 'groupId1 0 1 1' });
       expect(row).toBeInTheDocument();
-      userEvent.click(row);
+      await userEvent.click(row);
       expect(mockedUsedNavigate).toHaveBeenCalledWith(
         clusterConsumerGroupDetailsPath(':clusterName', 'groupId1')
       );
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
index dfdcb341796..2d6f967e2c7 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { act, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import ClustersWidget from 'components/Dashboard/ClustersWidget/ClustersWidget';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
@@ -16,18 +16,16 @@ describe('ClustersWidget', () => {
       data: clustersPayload,
       isSuccess: true,
     }));
-    await act(() => {
-      render(<ClustersWidget />);
-    });
+    await render(<ClustersWidget />);
   });
 
   it('renders clusterWidget list', () => {
     expect(screen.getAllByRole('row').length).toBe(3);
   });
 
-  it('hides online cluster widgets', () => {
+  it('hides online cluster widgets', async () => {
     expect(screen.getAllByRole('row').length).toBe(3);
-    userEvent.click(screen.getByRole('checkbox'));
+    await userEvent.click(screen.getByRole('checkbox'));
     expect(screen.getAllByRole('row').length).toBe(2);
   });
 
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
index 366f01c020d..ea6705b6a4c 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
@@ -7,7 +7,6 @@ import KsqlDbItem, {
 } from 'components/KsqlDb/List/KsqlDbItem/KsqlDbItem';
 import { screen } from '@testing-library/dom';
 import { fetchKsqlDbTablesPayload } from 'redux/reducers/ksqlDb/__test__/fixtures';
-import { act } from '@testing-library/react';
 
 describe('KsqlDbItem', () => {
   const tablesPathname = clusterKsqlDbTablesPath();
@@ -27,37 +26,34 @@ describe('KsqlDbItem', () => {
     );
   };
 
-  it('renders progressbar when fetching tables and streams', async () => {
-    await act(() => renderComponent({ fetching: true }));
+  it('renders progressbar when fetching tables and streams', () => {
+    renderComponent({ fetching: true });
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
   });
 
-  it('show no text if no data found', async () => {
-    await act(() => renderComponent({}));
+  it('show no text if no data found', () => {
+    renderComponent({});
     expect(screen.getByText('No tables or streams found')).toBeInTheDocument();
   });
 
-  it('renders with tables', async () => {
-    await act(() =>
-      renderComponent({
-        rows: {
-          tables: fetchKsqlDbTablesPayload.tables,
-          streams: [],
-        },
-      })
-    );
+  it('renders with tables', () => {
+    renderComponent({
+      rows: {
+        tables: fetchKsqlDbTablesPayload.tables,
+        streams: [],
+      },
+    });
+
     expect(screen.getByRole('table').querySelectorAll('td')).toHaveLength(10);
   });
-  it('renders with streams', async () => {
-    await act(() =>
-      renderComponent({
-        type: KsqlDbItemType.Streams,
-        rows: {
-          tables: [],
-          streams: fetchKsqlDbTablesPayload.streams,
-        },
-      })
-    );
+  it('renders with streams', () => {
+    renderComponent({
+      type: KsqlDbItemType.Streams,
+      rows: {
+        tables: [],
+        streams: fetchKsqlDbTablesPayload.streams,
+      },
+    });
     expect(screen.getByRole('table').querySelectorAll('td')).toHaveLength(10);
   });
 });
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
index 0b8aa60b78a..76f8b213351 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import QueryForm, { Props } from 'components/KsqlDb/Query/QueryForm/QueryForm';
 import { screen, waitFor, within } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
-import { act } from '@testing-library/react';
 
 const renderComponent = (props: Props) => render(<QueryForm {...props} />);
 
@@ -57,10 +56,9 @@ describe('QueryForm', () => {
       submitHandler: submitFn,
     });
 
-    await act(() =>
-      userEvent.click(screen.getByRole('button', { name: 'Execute' }))
-    );
-    waitFor(() => {
+    await userEvent.click(screen.getByRole('button', { name: 'Execute' }));
+
+    await waitFor(() => {
       expect(screen.getByText('ksql is a required field')).toBeInTheDocument();
       expect(submitFn).not.toBeCalled();
     });
@@ -76,12 +74,16 @@ describe('QueryForm', () => {
       submitHandler: submitFn,
     });
 
-    await act(() => {
-      userEvent.paste(screen.getAllByRole('textbox')[0], 'show tables;');
-      userEvent.paste(screen.getByRole('textbox', { name: 'key' }), 'test');
-      userEvent.paste(screen.getByRole('textbox', { name: 'value' }), 'test');
-      userEvent.click(screen.getByRole('button', { name: 'Execute' }));
-    });
+    const textbox = screen.getAllByRole('textbox');
+    textbox[0].focus();
+    await userEvent.paste('show tables;');
+    const key = screen.getByRole('textbox', { name: 'key' });
+    key.focus();
+    await userEvent.paste('test');
+    const value = screen.getByRole('textbox', { name: 'value' });
+    value.focus();
+    await userEvent.paste('test');
+    await userEvent.click(screen.getByRole('button', { name: 'Execute' }));
 
     expect(
       screen.queryByText('ksql is a required field')
@@ -106,8 +108,8 @@ describe('QueryForm', () => {
 
     expect(screen.getByRole('button', { name: 'Clear results' })).toBeEnabled();
 
-    await act(() =>
-      userEvent.click(screen.getByRole('button', { name: 'Clear results' }))
+    await userEvent.click(
+      screen.getByRole('button', { name: 'Clear results' })
     );
 
     expect(clearFn).toBeCalled();
@@ -125,39 +127,12 @@ describe('QueryForm', () => {
 
     expect(screen.getByRole('button', { name: 'Stop query' })).toBeEnabled();
 
-    await act(() =>
-      userEvent.click(screen.getByRole('button', { name: 'Stop query' }))
-    );
+    await userEvent.click(screen.getByRole('button', { name: 'Stop query' }));
 
     expect(cancelFn).toBeCalled();
   });
 
-  it('submits form with ctrl+enter on KSQL editor', async () => {
-    const submitFn = jest.fn();
-    renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: submitFn,
-    });
-
-    await act(() => {
-      userEvent.paste(
-        within(screen.getByLabelText('KSQL')).getByRole('textbox'),
-        'show tables;'
-      );
-
-      userEvent.type(
-        within(screen.getByLabelText('KSQL')).getByRole('textbox'),
-        '{ctrl}{enter}'
-      );
-    });
-
-    expect(submitFn.mock.calls.length).toBe(1);
-  });
-
-  it('adds new property', async () => {
+  it('add new property', async () => {
     renderComponent({
       fetching: false,
       hasResults: false,
@@ -168,11 +143,9 @@ describe('QueryForm', () => {
 
     const textbox = screen.getByLabelText('key');
     await userEvent.type(textbox, 'prop_name');
-    await act(() => {
-      userEvent.click(
-        screen.getByRole('button', { name: 'Add Stream Property' })
-      );
-    });
+    await userEvent.click(
+      screen.getByRole('button', { name: 'Add Stream Property' })
+    );
     expect(screen.getAllByRole('textbox', { name: 'key' }).length).toEqual(2);
   });
 
@@ -185,11 +158,9 @@ describe('QueryForm', () => {
       submitHandler: jest.fn(),
     });
 
-    await act(() => {
-      userEvent.click(
-        screen.getByRole('button', { name: 'Add Stream Property' })
-      );
-    });
+    await userEvent.click(
+      screen.getByRole('button', { name: 'Add Stream Property' })
+    );
     expect(screen.getAllByRole('textbox', { name: 'key' }).length).toEqual(1);
   });
 
@@ -201,16 +172,18 @@ describe('QueryForm', () => {
       handleSSECancel: jest.fn(),
       submitHandler: jest.fn(),
     });
+    const textBoxes = screen.getAllByRole('textbox', { name: 'key' });
+    textBoxes[0].focus();
+    await userEvent.paste('test');
+    await userEvent.click(
+      screen.getByRole('button', { name: 'Add Stream Property' })
+    );
+    await userEvent.click(screen.getAllByLabelText('deleteProperty')[0]);
 
-    await act(() => {
-      userEvent.paste(screen.getByRole('textbox', { name: 'key' }), 'test');
-      userEvent.click(
-        screen.getByRole('button', { name: 'Add Stream Property' })
-      );
-    });
-    await act(() => {
-      userEvent.click(screen.getAllByLabelText('deleteProperty')[0]);
-    });
-    expect(screen.getAllByRole('textbox', { name: 'key' }).length).toEqual(1);
+    await screen.getByRole('button', { name: 'Add Stream Property' });
+
+    await userEvent.click(screen.getAllByLabelText('deleteProperty')[0]);
+
+    expect(textBoxes.length).toEqual(1);
   });
 });
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx
index 985ebde5e5b..705d86be5f6 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx
@@ -6,7 +6,6 @@ import Query, {
 import { screen } from '@testing-library/dom';
 import fetchMock from 'fetch-mock';
 import { clusterKsqlDbQueryPath } from 'lib/paths';
-import { act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 const clusterName = 'testLocal';
@@ -41,10 +40,10 @@ describe('Query', () => {
     });
     const inputs = screen.getAllByRole('textbox');
     const textAreaElement = inputs[0] as HTMLTextAreaElement;
-    await act(() => {
-      userEvent.paste(textAreaElement, 'show tables;');
-      userEvent.click(screen.getByRole('button', { name: 'Execute' }));
-    });
+
+    textAreaElement.focus();
+    await userEvent.paste('show tables;');
+    await userEvent.click(screen.getByRole('button', { name: 'Execute' }));
 
     expect(mock.calls().length).toBe(1);
   });
@@ -59,18 +58,20 @@ describe('Query', () => {
     Object.defineProperty(window, 'EventSource', {
       value: EventSourceMock,
     });
-    await act(() => {
-      const inputs = screen.getAllByRole('textbox');
-      const textAreaElement = inputs[0] as HTMLTextAreaElement;
-      userEvent.paste(textAreaElement, 'show tables;');
-    });
-    await act(() => {
-      userEvent.paste(screen.getByLabelText('key'), 'key');
-      userEvent.paste(screen.getByLabelText('value'), 'value');
-    });
-    await act(() => {
-      userEvent.click(screen.getByRole('button', { name: 'Execute' }));
-    });
+
+    const inputs = screen.getAllByRole('textbox');
+    const textAreaElement = inputs[0] as HTMLTextAreaElement;
+    textAreaElement.focus();
+    await userEvent.paste('show tables;');
+
+    const key = screen.getByLabelText('key');
+    key.focus();
+    await userEvent.paste('key');
+    const value = screen.getByLabelText('value');
+    value.focus();
+    await userEvent.paste('value');
+
+    await userEvent.click(screen.getByRole('button', { name: 'Execute' }));
 
     expect(mock.calls().length).toBe(1);
   });
diff --git a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx
index 11d273c6ece..22bc1eabf54 100644
--- a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx
+++ b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx
@@ -19,19 +19,19 @@ describe('ClusterMenu', () => {
   const getKafkaConnect = () => screen.getByTitle('Kafka Connect');
   const getCluster = () => screen.getByText(onlineClusterPayload.name);
 
-  it('renders cluster menu with default set of features', () => {
+  it('renders cluster menu with default set of features', async () => {
     render(setupComponent(onlineClusterPayload));
     expect(getCluster()).toBeInTheDocument();
 
     expect(getMenuItems().length).toEqual(1);
-    userEvent.click(getMenuItem());
+    await userEvent.click(getMenuItem());
     expect(getMenuItems().length).toEqual(4);
 
     expect(getBrokers()).toBeInTheDocument();
     expect(getTopics()).toBeInTheDocument();
     expect(getConsumers()).toBeInTheDocument();
   });
-  it('renders cluster menu with correct set of features', () => {
+  it('renders cluster menu with correct set of features', async () => {
     render(
       setupComponent({
         ...onlineClusterPayload,
@@ -43,7 +43,7 @@ describe('ClusterMenu', () => {
       })
     );
     expect(getMenuItems().length).toEqual(1);
-    userEvent.click(getMenuItem());
+    await userEvent.click(getMenuItem());
     expect(getMenuItems().length).toEqual(7);
 
     expect(getBrokers()).toBeInTheDocument();
@@ -64,7 +64,7 @@ describe('ClusterMenu', () => {
     expect(getTopics()).toBeInTheDocument();
     expect(getConsumers()).toBeInTheDocument();
   });
-  it('makes Kafka Connect link active', () => {
+  it('makes Kafka Connect link active', async () => {
     render(
       setupComponent({
         ...onlineClusterPayload,
@@ -73,7 +73,7 @@ describe('ClusterMenu', () => {
       { initialEntries: [clusterConnectorsPath(onlineClusterPayload.name)] }
     );
     expect(getMenuItems().length).toEqual(1);
-    userEvent.click(getMenuItem());
+    await userEvent.click(getMenuItem());
     expect(getMenuItems().length).toEqual(5);
 
     const kafkaConnect = getKafkaConnect();
diff --git a/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx b/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx
index 023fdfdba7e..582c3414119 100644
--- a/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx
+++ b/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import Nav from 'components/Nav/Nav';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
-import { act } from 'react-dom/test-utils';
 import { Cluster } from 'generated-sources';
 import { useClusters } from 'lib/hooks/api/clusters';
 import {
@@ -15,28 +14,26 @@ jest.mock('lib/hooks/api/clusters', () => ({
 }));
 
 describe('Nav', () => {
-  const renderComponent = async (payload: Cluster[] = []) => {
+  const renderComponent = (payload: Cluster[] = []) => {
     (useClusters as jest.Mock).mockImplementation(() => ({
       data: payload,
       isSuccess: true,
     }));
-    await act(() => {
-      render(<Nav />);
-    });
+    render(<Nav />);
   };
 
   const getDashboard = () => screen.getByText('Dashboard');
 
   const getMenuItemsCount = () => screen.getAllByRole('menuitem').length;
-  it('renders loader', async () => {
-    await renderComponent();
+  it('renders loader', () => {
+    renderComponent();
 
     expect(getMenuItemsCount()).toEqual(1);
     expect(getDashboard()).toBeInTheDocument();
   });
 
-  it('renders ClusterMenu', async () => {
-    await renderComponent([onlineClusterPayload, offlineClusterPayload]);
+  it('renders ClusterMenu', () => {
+    renderComponent([onlineClusterPayload, offlineClusterPayload]);
     expect(screen.getAllByRole('menu').length).toEqual(3);
     expect(getMenuItemsCount()).toEqual(3);
     expect(getDashboard()).toBeInTheDocument();
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
index 20f3870c7e5..b4c852f1457 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
@@ -56,9 +56,7 @@ describe('Details', () => {
         schemasAPIVersionsUrl,
         404
       );
-      await act(() => {
-        renderComponent();
-      });
+      await renderComponent();
 
       await waitFor(() => {
         expect(schemasAPILatestMock.called()).toBeTruthy();
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
index 2ec3b001a94..cc2aa81e899 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
@@ -19,7 +19,7 @@ const renderComponent = () => {
 };
 
 describe('SchemaVersion', () => {
-  it('renders versions', () => {
+  it('renders versions', async () => {
     renderComponent();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx
index b5dcb283873..0a302757a8d 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx
@@ -45,9 +45,7 @@ describe('Edit', () => {
   describe('fetch failed', () => {
     it('renders page loader', async () => {
       const schemasAPILatestMock = fetchMock.getOnce(schemasAPILatestUrl, 404);
-      await act(() => {
-        renderComponent();
-      });
+      await renderComponent();
       await waitFor(() => expect(schemasAPILatestMock.called()).toBeTruthy());
       expect(screen.getByRole('progressbar')).toBeInTheDocument();
       expect(screen.queryByText(schemaVersion.subject)).not.toBeInTheDocument();
diff --git a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx
index e8e8bcc453f..f117c5824ac 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/__test__/GlobalSchemaSelector.spec.tsx
@@ -9,11 +9,11 @@ import fetchMock from 'fetch-mock';
 
 const clusterName = 'testClusterName';
 
-const selectForwardOption = () => {
+const selectForwardOption = async () => {
   const dropdownElement = screen.getByRole('listbox');
   // clicks to open dropdown
-  userEvent.click(within(dropdownElement).getByRole('option'));
-  userEvent.click(
+  await userEvent.click(within(dropdownElement).getByRole('option'));
+  await userEvent.click(
     screen.getByText(CompatibilityLevelCompatibilityEnum.FORWARD)
   );
 };
@@ -59,19 +59,19 @@ describe('GlobalSchemaSelector', () => {
 
   it('shows popup when select value is changed', async () => {
     expectOptionIsSelected(CompatibilityLevelCompatibilityEnum.FULL);
-    selectForwardOption();
+    await selectForwardOption();
     expect(screen.getByText('Confirm the action')).toBeInTheDocument();
   });
 
-  it('resets select value when cancel is clicked', () => {
-    selectForwardOption();
-    userEvent.click(screen.getByText('Cancel'));
+  it('resets select value when cancel is clicked', async () => {
+    await selectForwardOption();
+    await userEvent.click(screen.getByText('Cancel'));
     expect(screen.queryByText('Confirm the action')).not.toBeInTheDocument();
     expectOptionIsSelected(CompatibilityLevelCompatibilityEnum.FULL);
   });
 
   it('sets new schema when confirm is clicked', async () => {
-    selectForwardOption();
+    await selectForwardOption();
     const putNewCompatibilityMock = fetchMock.putOnce(
       `api/clusters/${clusterName}/schemas/compatibility`,
       200,
diff --git a/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx
index a6636e5d876..f27f659b2c9 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx
@@ -109,14 +109,14 @@ describe('List', () => {
         expect(screen.getByText(schemaVersion1.subject)).toBeInTheDocument();
         expect(screen.getByText(schemaVersion2.subject)).toBeInTheDocument();
       });
-      it('handles onRowClick', () => {
+      it('handles onRowClick', async () => {
         const { id, schemaType, subject, version, compatibilityLevel } =
           schemaVersion2;
         const row = screen.getByRole('row', {
           name: `${subject} ${id} ${schemaType} ${version} ${compatibilityLevel}`,
         });
         expect(row).toBeInTheDocument();
-        userEvent.click(row);
+        await userEvent.click(row);
         expect(mockedUsedNavigate).toHaveBeenCalledWith(
           clusterSchemaPath(clusterName, subject)
         );
diff --git a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
index 6c4972f78f0..961833ca0d6 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
@@ -10,8 +10,8 @@ const subjectValue = 'subject';
 const schemaValue = 'schema';
 
 describe('New Component', () => {
-  beforeEach(() => {
-    render(
+  beforeEach(async () => {
+    await render(
       <WithRoute path={clusterSchemaNewPath()}>
         <New />
       </WithRoute>,
@@ -33,14 +33,14 @@ describe('New Component', () => {
     const schema = screen.getAllByRole('textbox')[1];
     const schemaTypeSelect = screen.getByRole('listbox');
 
-    await act(() => {
-      userEvent.type(subject, subjectValue);
+    await act(async () => {
+      await userEvent.type(subject, subjectValue);
     });
-    await act(() => {
-      userEvent.type(schema, schemaValue);
+    await act(async () => {
+      await userEvent.type(schema, schemaValue);
     });
-    await act(() => {
-      userEvent.selectOptions(schemaTypeSelect, ['AVRO']);
+    await act(async () => {
+      await userEvent.selectOptions(schemaTypeSelect, ['AVRO']);
     });
 
     const submitBtn = screen.getByRole('button', { name: /Submit/i });
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
index 5c5c3da778a..455565824ac 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
@@ -33,14 +33,14 @@ describe('ListPage Component', () => {
     renderComponent();
   });
 
-  it('handles switch of Internal Topics visibility', () => {
+  it('handles switch of Internal Topics visibility', async () => {
     const switchInput = screen.getByLabelText('Show Internal Topics');
     expect(switchInput).toBeInTheDocument();
 
     expect(global.localStorage.getItem('hideInternalTopics')).toBeNull();
-    userEvent.click(switchInput);
+    await userEvent.click(switchInput);
     expect(global.localStorage.getItem('hideInternalTopics')).toBeTruthy();
-    userEvent.click(switchInput);
+    await userEvent.click(switchInput);
     expect(global.localStorage.getItem('hideInternalTopics')).toBeNull();
   });
 
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
index 6031428895d..4b5f046cd9d 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
@@ -131,8 +131,8 @@ describe('TopicTable Components', () => {
           expect(screen.getAllByRole('checkbox')[2]).toBeEnabled();
         });
         describe('when only one topic is selected', () => {
-          beforeEach(() => {
-            userEvent.click(screen.getAllByRole('checkbox')[1]);
+          beforeEach(async () => {
+            await userEvent.click(screen.getAllByRole('checkbox')[1]);
           });
           it('renders batch actions bar', () => {
             expect(getButtonByName('Delete selected topics')).toBeEnabled();
@@ -143,9 +143,9 @@ describe('TopicTable Components', () => {
           });
         });
         describe('when more then one topics are selected', () => {
-          beforeEach(() => {
-            userEvent.click(screen.getAllByRole('checkbox')[1]);
-            userEvent.click(screen.getAllByRole('checkbox')[2]);
+          beforeEach(async () => {
+            await userEvent.click(screen.getAllByRole('checkbox')[1]);
+            await userEvent.click(screen.getAllByRole('checkbox')[2]);
           });
           it('renders batch actions bar', () => {
             expect(getButtonByName('Delete selected topics')).toBeEnabled();
@@ -190,12 +190,12 @@ describe('TopicTable Components', () => {
       });
     });
     describe('Action buttons', () => {
-      const expectDropdownExists = () => {
+      const expectDropdownExists = async () => {
         const btn = screen.getByRole('button', {
           name: 'Dropdown Toggle',
         });
         expect(btn).toBeEnabled();
-        userEvent.click(btn);
+        await userEvent.click(btn);
         expect(screen.getByRole('menu')).toBeInTheDocument();
       };
       it('renders disable action buttons for read-only cluster', () => {
@@ -204,7 +204,7 @@ describe('TopicTable Components', () => {
         expect(btns[0]).toBeDisabled();
         expect(btns[1]).toBeDisabled();
       });
-      it('renders action buttons', () => {
+      it('renders action buttons', async () => {
         renderComponent({ topics: topicsPayload, pageCount: 1 });
         expect(
           screen.getAllByRole('button', { name: 'Dropdown Toggle' }).length
@@ -228,7 +228,7 @@ describe('TopicTable Components', () => {
           name: 'Dropdown Toggle',
         });
         expect(extBtn).toBeEnabled();
-        userEvent.click(extBtn);
+        await userEvent.click(extBtn);
         expect(screen.getByRole('menu')).toBeInTheDocument();
       });
       describe('and clear messages action', () => {
@@ -241,7 +241,7 @@ describe('TopicTable Components', () => {
               },
             ],
           });
-          expectDropdownExists();
+          await expectDropdownExists();
           const actionBtn = screen.getAllByRole('menuitem');
           expect(actionBtn[0]).toHaveTextContent('Clear Messages');
           expect(actionBtn[0]).not.toHaveAttribute('aria-disabled');
@@ -255,7 +255,7 @@ describe('TopicTable Components', () => {
               },
             ],
           });
-          expectDropdownExists();
+          await expectDropdownExists();
           const actionBtn = screen.getAllByRole('menuitem');
           expect(actionBtn[0]).toHaveTextContent('Clear Messages');
           expect(actionBtn[0]).toHaveAttribute('aria-disabled');
@@ -269,8 +269,8 @@ describe('TopicTable Components', () => {
               },
             ],
           });
-          expectDropdownExists();
-          userEvent.click(screen.getByText('Clear Messages'));
+          await expectDropdownExists();
+          await userEvent.click(screen.getByText('Clear Messages'));
           expect(
             screen.getByText('Are you sure want to clear topic messages?')
           ).toBeInTheDocument();
@@ -284,22 +284,22 @@ describe('TopicTable Components', () => {
       describe('and remove topic action', () => {
         it('is visible only when topic deletion allowed for cluster', async () => {
           renderComponent({ topics: [topicsPayload[1]] });
-          expectDropdownExists();
+          await expectDropdownExists();
           const actionBtn = screen.getAllByRole('menuitem');
           expect(actionBtn[2]).toHaveTextContent('Remove Topic');
           expect(actionBtn[2]).not.toHaveAttribute('aria-disabled');
         });
         it('is disabled when topic deletion is not allowed for cluster', async () => {
           renderComponent({ topics: [topicsPayload[1]] }, false, false);
-          expectDropdownExists();
+          await expectDropdownExists();
           const actionBtn = screen.getAllByRole('menuitem');
           expect(actionBtn[2]).toHaveTextContent('Remove Topic');
           expect(actionBtn[2]).toHaveAttribute('aria-disabled');
         });
         it('works as expected', async () => {
           renderComponent({ topics: [topicsPayload[1]] });
-          expectDropdownExists();
-          userEvent.click(screen.getByText('Remove Topic'));
+          await expectDropdownExists();
+          await userEvent.click(screen.getByText('Remove Topic'));
           expect(screen.getByText('Confirm the action')).toBeInTheDocument();
           await waitFor(() =>
             userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
@@ -310,8 +310,8 @@ describe('TopicTable Components', () => {
       describe('and recreate topic action', () => {
         it('works as expected', async () => {
           renderComponent({ topics: [topicsPayload[1]] });
-          expectDropdownExists();
-          userEvent.click(screen.getByText('Recreate Topic'));
+          await expectDropdownExists();
+          await userEvent.click(screen.getByText('Recreate Topic'));
           expect(screen.getByText('Confirm the action')).toBeInTheDocument();
           await waitFor(() =>
             userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index 5cbbbbd2b98..70b66853079 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -60,11 +60,14 @@ describe('New', () => {
 
   it('validates form', async () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    await waitFor(() => {
-      userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
+    await waitFor(async () => {
+      await userEvent.type(
+        screen.getByPlaceholderText('Topic Name'),
+        topicName
+      );
     });
-    await waitFor(() => {
-      userEvent.clear(screen.getByPlaceholderText('Topic Name'));
+    await waitFor(async () => {
+      await userEvent.clear(screen.getByPlaceholderText('Topic Name'));
     });
     await waitFor(() => {
       expect(screen.getByText('name is a required field')).toBeInTheDocument();
@@ -87,11 +90,14 @@ describe('New', () => {
 
   it('submits valid form', async () => {
     await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    await act(() => {
-      userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
+    await act(async () => {
+      await userEvent.type(
+        screen.getByPlaceholderText('Topic Name'),
+        topicName
+      );
     });
-    await act(() => {
-      userEvent.click(screen.getByText('Create topic'));
+    await act(async () => {
+      await userEvent.click(screen.getByText('Create topic'));
     });
     await waitFor(() => expect(createTopicMock).toHaveBeenCalledTimes(1));
     await waitFor(() =>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
index aa5da64ed64..12961c4e344 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
@@ -34,8 +34,8 @@ const renderComponent = (props?: Partial<DangerZoneProps>) =>
     { initialEntries: [clusterTopicPath(clusterName, topicName)] }
   );
 
-const clickOnDialogSubmitButton = () => {
-  userEvent.click(
+const clickOnDialogSubmitButton = async () => {
+  await userEvent.click(
     within(screen.getByRole('dialog')).getByRole('button', {
       name: 'Confirm',
     })
@@ -45,7 +45,7 @@ const clickOnDialogSubmitButton = () => {
 const checkDialogThenPressCancel = async () => {
   const dialog = screen.getByRole('dialog');
   expect(screen.getByRole('dialog')).toBeInTheDocument();
-  userEvent.click(within(dialog).getByRole('button', { name: 'Cancel' }));
+  await userEvent.click(within(dialog).getByRole('button', { name: 'Cancel' }));
   await waitFor(() =>
     expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
   );
@@ -91,11 +91,13 @@ describe('DangerZone', () => {
     const numberOfPartitionsEditForm = screen.getByRole('form', {
       name: 'Edit number of partitions',
     });
-    userEvent.type(
+    await userEvent.type(
       within(numberOfPartitionsEditForm).getByRole('spinbutton'),
       '4'
     );
-    userEvent.click(within(numberOfPartitionsEditForm).getByRole('button'));
+    await userEvent.click(
+      within(numberOfPartitionsEditForm).getByRole('button')
+    );
     await waitFor(() => expect(screen.getByRole('dialog')).toBeInTheDocument());
     await waitFor(() => clickOnDialogSubmitButton());
     expect(mockIncreaseTopicPartitionsCount).toHaveBeenCalledTimes(1);
@@ -119,11 +121,13 @@ describe('DangerZone', () => {
       within(replicationFactorEditForm).getByRole('button', { name: 'Submit' })
     ).toBeInTheDocument();
 
-    userEvent.type(
+    await userEvent.type(
       within(replicationFactorEditForm).getByRole('spinbutton'),
       '4'
     );
-    userEvent.click(within(replicationFactorEditForm).getByRole('button'));
+    await userEvent.click(
+      within(replicationFactorEditForm).getByRole('button')
+    );
 
     await waitFor(() => expect(screen.getByRole('dialog')).toBeInTheDocument());
     await waitFor(() => clickOnDialogSubmitButton());
@@ -139,19 +143,19 @@ describe('DangerZone', () => {
     const partitionInputSubmitBtn = screen.getAllByText(/submit/i)[0];
     const value = (defaultPartitions - 4).toString();
     expect(partitionInputSubmitBtn).toBeDisabled();
-    await act(() => {
-      userEvent.clear(partitionInput);
-      userEvent.type(partitionInput, value);
+    await act(async () => {
+      await userEvent.clear(partitionInput);
+      await userEvent.type(partitionInput, value);
     });
     expect(partitionInput).toHaveValue(+value);
     expect(partitionInputSubmitBtn).toBeEnabled();
-    await act(() => {
-      userEvent.click(partitionInputSubmitBtn);
+    await act(async () => {
+      await userEvent.click(partitionInputSubmitBtn);
     });
     expect(
       screen.getByText(/You can only increase the number of partitions!/i)
     ).toBeInTheDocument();
-    userEvent.clear(partitionInput);
+    await userEvent.clear(partitionInput);
     await waitFor(() =>
       expect(screen.getByText(/are required/i)).toBeInTheDocument()
     );
@@ -166,11 +170,11 @@ describe('DangerZone', () => {
     await waitFor(() => userEvent.clear(replicatorFactorInput));
 
     expect(replicatorFactorInputSubmitBtn).toBeEnabled();
-    userEvent.click(replicatorFactorInputSubmitBtn);
+    await userEvent.click(replicatorFactorInputSubmitBtn);
     await waitFor(() =>
       expect(screen.getByText(/are required/i)).toBeInTheDocument()
     );
-    userEvent.type(replicatorFactorInput, '1');
+    await userEvent.type(replicatorFactorInput, '1');
     await waitFor(() =>
       expect(screen.queryByText(/are required/i)).not.toBeInTheDocument()
     );
@@ -182,9 +186,9 @@ describe('DangerZone', () => {
     const partitionInput = screen.getByPlaceholderText('Number of partitions');
     const partitionInputSubmitBtn = screen.getAllByText(/submit/i)[0];
 
-    await act(() => {
-      userEvent.type(partitionInput, '5');
-      userEvent.click(partitionInputSubmitBtn);
+    await act(async () => {
+      await userEvent.type(partitionInput, '5');
+      await userEvent.click(partitionInputSubmitBtn);
     });
 
     await checkDialogThenPressCancel();
@@ -196,9 +200,9 @@ describe('DangerZone', () => {
       screen.getByPlaceholderText('Replication Factor');
     const replicatorFactorInputSubmitBtn = screen.getAllByText(/submit/i)[1];
 
-    await act(() => {
-      userEvent.type(replicatorFactorInput, '5');
-      userEvent.click(replicatorFactorInputSubmitBtn);
+    await act(async () => {
+      await userEvent.type(replicatorFactorInput, '5');
+      await userEvent.click(replicatorFactorInputSubmitBtn);
     });
 
     await checkDialogThenPressCancel();
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
index 38c3b01fabe..fbd73695cac 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
@@ -15,16 +15,18 @@ describe('AddEditFilterContainer component', () => {
     code: 'mockCode',
   };
 
-  const renderComponent = (
+  const renderComponent = async (
     props: Partial<AddEditFilterContainerProps> = {}
   ) => {
-    render(
-      <AddEditFilterContainer
-        cancelBtnHandler={jest.fn()}
-        submitBtnText={props.submitBtnText || defaultSubmitBtn}
-        {...props}
-      />
-    );
+    await act(() => {
+      render(
+        <AddEditFilterContainer
+          cancelBtnHandler={jest.fn()}
+          submitBtnText={props.submitBtnText || defaultSubmitBtn}
+          {...props}
+        />
+      );
+    });
   };
 
   describe('default Component Parameters', () => {
@@ -43,35 +45,32 @@ describe('AddEditFilterContainer component', () => {
       const inputs = screen.getAllByRole('textbox');
 
       const textAreaElement = inputs[0] as HTMLTextAreaElement;
-      await act(() =>
-        userEvent.paste(textAreaElement, 'Hello World With TextArea')
-      );
+      textAreaElement.focus();
+      await userEvent.paste('Hello World With TextArea');
 
-      const inputNameElement = inputs[1];
-      await act(() => userEvent.type(inputNameElement, 'Hello World!'));
+      const inputNameElement = inputs[1] as HTMLTextAreaElement;
+      await userEvent.type(inputNameElement, 'Hello World!');
 
       expect(submitButtonElem).toBeEnabled();
 
-      await act(() => userEvent.clear(inputNameElement));
+      await userEvent.clear(inputNameElement);
+      await userEvent.tab();
 
       expect(submitButtonElem).toBeDisabled();
     });
 
     it('should view the error message after typing and clearing the input', async () => {
       const inputs = screen.getAllByRole('textbox');
-
+      const user = userEvent.setup();
       const textAreaElement = inputs[0] as HTMLTextAreaElement;
-      await act(() =>
-        userEvent.paste(textAreaElement, 'Hello World With TextArea')
-      );
-
       const inputNameElement = inputs[1];
-      await act(() => {
-        userEvent.type(inputNameElement, 'Hello World!');
 
-        userEvent.clear(inputNameElement);
-        userEvent.clear(textAreaElement);
-      });
+      await user.type(textAreaElement, 'Hello World With TextArea');
+      await user.type(inputNameElement, 'Hello World!');
+
+      await user.clear(inputNameElement);
+      await user.keyboard('{Control>}[KeyA]{/Control}{backspace}');
+      await user.tab();
 
       expect(screen.getByText(/required field/i)).toBeInTheDocument();
     });
@@ -79,11 +78,12 @@ describe('AddEditFilterContainer component', () => {
 
   describe('Custom setup for the component', () => {
     it('should render the input with default data if they are passed', async () => {
-      renderComponent({
-        inputDisplayNameDefaultValue: mockData.name,
-        inputCodeDefaultValue: mockData.code,
+      await act(() => {
+        renderComponent({
+          inputDisplayNameDefaultValue: mockData.name,
+          inputCodeDefaultValue: mockData.code,
+        });
       });
-
       const inputs = screen.getAllByRole('textbox');
       const textAreaElement = inputs[0] as HTMLTextAreaElement;
       const inputNameElement = inputs[1];
@@ -93,44 +93,43 @@ describe('AddEditFilterContainer component', () => {
 
     it('should test whether the cancel callback is being called', async () => {
       const cancelCallback = jest.fn();
-      renderComponent({
-        cancelBtnHandler: cancelCallback,
-      });
+      await act(() =>
+        renderComponent({
+          cancelBtnHandler: cancelCallback,
+        })
+      );
       const cancelBtnElement = screen.getByText(/cancel/i);
 
-      await act(() => userEvent.click(cancelBtnElement));
+      await userEvent.click(cancelBtnElement);
       expect(cancelCallback).toBeCalled();
     });
 
     it('should test whether the submit Callback is being called', async () => {
       const submitCallback = jest.fn();
-      renderComponent({
-        submitCallback,
-      });
+      await act(() => renderComponent({ submitCallback }));
 
       const inputs = screen.getAllByRole('textbox');
 
       const textAreaElement = inputs[0] as HTMLTextAreaElement;
-      userEvent.paste(textAreaElement, 'Hello World With TextArea');
+      textAreaElement.focus();
+      await userEvent.paste('Hello World With TextArea');
 
       const inputNameElement = inputs[1];
-      await act(() => userEvent.type(inputNameElement, 'Hello World!'));
+      await userEvent.type(inputNameElement, 'Hello World!');
 
       const submitBtnElement = screen.getByText(defaultSubmitBtn);
-
       expect(submitBtnElement).toBeEnabled();
 
-      await act(() => userEvent.click(submitBtnElement));
-
+      await userEvent.click(submitBtnElement);
       expect(submitCallback).toBeCalled();
     });
 
     it('should display the checkbox if the props is passed and initially check state', async () => {
-      renderComponent({ isAdd: true });
+      await act(() => renderComponent({ isAdd: true }));
       const checkbox = screen.getByRole('checkbox');
       expect(checkbox).toBeInTheDocument();
       expect(checkbox).not.toBeChecked();
-      await act(() => userEvent.click(checkbox));
+      await userEvent.click(checkbox);
       expect(checkbox).toBeChecked();
     });
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
index 0c12fd33436..342d064251d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
@@ -4,7 +4,7 @@ import AddFilter, {
 } from 'components/Topics/Topic/Messages/Filters/AddFilter';
 import { render } from 'lib/testHelpers';
 import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
-import { act, screen } from '@testing-library/react';
+import { act, fireEvent, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 const filters: MessageFilters[] = [
@@ -32,14 +32,12 @@ const renderComponent = (props: Partial<FilterModalProps> = {}) =>
 
 describe('AddFilter component', () => {
   describe('', () => {
-    beforeEach(async () => {
-      await act(() => {
-        renderComponent();
-      });
+    beforeEach(() => {
+      renderComponent();
     });
 
-    it('should test click on Saved Filters redirects to Saved components', () => {
-      userEvent.click(screen.getByRole('savedFilterText'));
+    it('should test click on Saved Filters redirects to Saved components', async () => {
+      await userEvent.click(screen.getByRole('savedFilterText'));
       expect(screen.getByText('Saved Filters')).toBeInTheDocument();
       expect(screen.getByRole('savedFilterText')).toBeInTheDocument();
     });
@@ -48,8 +46,8 @@ describe('AddFilter component', () => {
       expect(screen.getByRole('button', { name: 'info' })).toBeInTheDocument();
     });
 
-    it('renders InfoModal', () => {
-      userEvent.click(screen.getByRole('button', { name: 'info' }));
+    it('renders InfoModal', async () => {
+      await userEvent.click(screen.getByRole('button', { name: 'info' }));
       expect(screen.getByRole('button', { name: 'Ok' })).toBeInTheDocument();
       expect(
         screen.getByRole('list', { name: 'info-list' })
@@ -57,7 +55,7 @@ describe('AddFilter component', () => {
     });
 
     it('should test click on return to custom filter redirects to Saved Filters', async () => {
-      userEvent.click(screen.getByRole('savedFilterText'));
+      await userEvent.click(screen.getByRole('savedFilterText'));
 
       expect(screen.queryByText('Saved filters')).not.toBeInTheDocument();
       expect(screen.getByRole('savedFilterText')).toBeInTheDocument();
@@ -66,9 +64,7 @@ describe('AddFilter component', () => {
 
   describe('Add new filter', () => {
     beforeEach(async () => {
-      await act(() => {
-        renderComponent();
-      });
+      renderComponent();
     });
 
     it('adding new filter', async () => {
@@ -83,9 +79,10 @@ describe('AddFilter component', () => {
       expect(addFilterBtn).toBeDisabled();
       expect(screen.getByPlaceholderText('Enter Name')).toBeInTheDocument();
 
-      await act(() => {
-        userEvent.paste(codeTextBox, codeValue);
-        userEvent.type(nameTextBox, nameValue);
+      await act(async () => {
+        codeTextBox.focus();
+        await userEvent.paste(codeValue);
+        await userEvent.type(nameTextBox, nameValue);
       });
 
       expect(addFilterBtn).toBeEnabled();
@@ -101,7 +98,10 @@ describe('AddFilter component', () => {
       const addFilterBtn = screen.getByRole('button', { name: /Add filter/i });
       expect(addFilterBtn).toBeDisabled();
       expect(screen.getByPlaceholderText('Enter Name')).toBeInTheDocument();
-      await act(() => userEvent.paste(codeTextBox, code));
+      await act(async () => {
+        codeTextBox.focus();
+        await userEvent.paste(code);
+      });
       expect(addFilterBtn).toBeEnabled();
       expect(codeTextBox).toHaveValue(`${code}\n\n`);
     });
@@ -110,10 +110,10 @@ describe('AddFilter component', () => {
       await act(() => {
         renderComponent({ isSavedFiltersOpen: true });
       });
-      userEvent.click(screen.getByText('Saved Filters'));
+      await userEvent.click(screen.getByText('Saved Filters'));
       const index = 0;
       const editButton = screen.getAllByText('Edit')[index];
-      userEvent.click(editButton);
+      await userEvent.click(editButton);
       const { code, name } = filters[index];
       expect(editFilterMock).toHaveBeenCalledTimes(1);
       expect(editFilterMock).toHaveBeenCalledWith({
@@ -133,12 +133,10 @@ describe('AddFilter component', () => {
     const nameValue = 'filter name';
 
     beforeEach(async () => {
-      await act(() => {
-        renderComponent({
-          addFilter: addFilterMock,
-          activeFilterHandler: activeFilterHandlerMock,
-          toggleIsOpen: toggleModelMock,
-        });
+      await renderComponent({
+        addFilter: addFilterMock,
+        activeFilterHandler: activeFilterHandlerMock,
+        toggleIsOpen: toggleModelMock,
       });
     });
 
@@ -150,12 +148,14 @@ describe('AddFilter component', () => {
 
     describe('OnSubmit conditions with codeValue and nameValue in fields', () => {
       beforeEach(async () => {
-        await act(() => {
-          userEvent.paste(
-            screen.getAllByRole('textbox')[0] as HTMLTextAreaElement,
-            codeValue
-          );
-          userEvent.type(screen.getAllByRole('textbox')[1], nameValue);
+        const textAreaElement = screen.getAllByRole(
+          'textbox'
+        )[0] as HTMLTextAreaElement;
+        const input = screen.getAllByRole('textbox')[1];
+        await act(async () => {
+          textAreaElement.focus();
+          await userEvent.paste(codeValue);
+          await userEvent.type(input, nameValue);
         });
       });
 
@@ -166,16 +166,18 @@ describe('AddFilter component', () => {
         });
         expect(addFilterBtn).toBeEnabled();
 
-        await act(() => userEvent.click(addFilterBtn));
+        await act(async () => {
+          await userEvent.click(addFilterBtn);
+        });
 
         expect(activeFilterHandlerMock).toHaveBeenCalled();
         expect(addFilterMock).not.toHaveBeenCalled();
       });
 
       it('OnSubmit condition with checkbox on functionality', async () => {
-        await act(() => {
-          userEvent.click(screen.getByRole('checkbox'));
-          userEvent.click(screen.getAllByRole('button')[2]);
+        await act(async () => {
+          await userEvent.click(screen.getByRole('checkbox'));
+          await userEvent.click(screen.getAllByRole('button')[2]);
         });
 
         expect(activeFilterHandlerMock).not.toHaveBeenCalled();
@@ -193,11 +195,15 @@ describe('AddFilter component', () => {
           name: /Add filter/i,
         });
 
-        await act(() => userEvent.clear(nameTextBox));
+        await act(async () => {
+          await userEvent.clear(nameTextBox);
+        });
 
         expect(nameTextBox).toHaveValue('');
 
-        await act(() => userEvent.click(addFilterBtn));
+        await act(async () => {
+          await userEvent.click(addFilterBtn);
+        });
         expect(activeFilterHandlerMock).toHaveBeenCalledTimes(1);
 
         expect(activeFilterHandlerMock).toHaveBeenCalledWith(
@@ -211,17 +217,25 @@ describe('AddFilter component', () => {
         // get reset-ed
         expect(codeTextBox).toHaveValue(``);
         expect(toggleModelMock).toHaveBeenCalled();
-
-        await act(() => userEvent.paste(codeTextBox, codeValue));
+        codeTextBox.focus();
+        await act(async () => {
+          await userEvent.paste(codeValue);
+        });
         expect(codeTextBox).toHaveValue(`${codeValue}\n\n`);
 
-        await act(() => userEvent.click(checkbox));
+        await act(async () => {
+          await userEvent.click(checkbox);
+        });
         expect(addFilterBtn).toBeDisabled();
 
-        await act(() => userEvent.type(nameTextBox, nameValue));
+        await act(async () => {
+          await userEvent.type(nameTextBox, nameValue);
+        });
         expect(nameTextBox).toHaveValue(nameValue);
         expect(addFilterBtn).toBeEnabled();
-        await act(() => userEvent.click(addFilterBtn));
+        await act(async () => {
+          await userEvent.click(addFilterBtn);
+        });
 
         expect(activeFilterHandlerMock).toHaveBeenCalledTimes(1);
         expect(addFilterMock).toHaveBeenCalledWith({
@@ -238,16 +252,23 @@ describe('AddFilter component', () => {
       )[0] as HTMLTextAreaElement;
       const nameTextBox = screen.getAllByRole('textbox')[1];
       const addFilterBtn = screen.getByRole('button', { name: /Add filter/i });
-      await act(() => {
-        userEvent.clear(nameTextBox);
-        userEvent.clear(codeTextBox);
-        userEvent.paste(codeTextBox, longCodeValue);
+      act(() => {
+        // await userEvent.clear(nameTextBox);
+        // codeTextBox.focus();
+        // await userEvent.clear(codeTextBox);
+        fireEvent.input(nameTextBox, {
+          inputType: '',
+        });
+        fireEvent.input(codeTextBox, {
+          inputType: '',
+        });
       });
-
+      codeTextBox.focus();
+      await userEvent.paste(longCodeValue);
       expect(nameTextBox).toHaveValue('');
       expect(codeTextBox).toHaveValue(`${longCodeValue}\n\n`);
 
-      await act(() => userEvent.click(addFilterBtn));
+      await userEvent.click(addFilterBtn);
 
       const filterName = `${longCodeValue.slice(0, 16)}...`;
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
index 347c4eab207..212ecd8739f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
@@ -35,7 +35,7 @@ describe('EditFilter component', () => {
     await act(() => {
       renderComponent({ toggleEditModal });
     });
-    userEvent.click(screen.getByRole('button', { name: /Cancel/i }));
+    await userEvent.click(screen.getByRole('button', { name: /Cancel/i }));
     expect(toggleEditModal).toHaveBeenCalledTimes(1);
   });
 
@@ -43,16 +43,16 @@ describe('EditFilter component', () => {
     const toggleEditModal = jest.fn();
     const editSavedFilter = jest.fn();
 
-    await act(() => {
-      renderComponent({ toggleEditModal, editSavedFilter });
-    });
+    await renderComponent({ toggleEditModal, editSavedFilter });
 
     const inputs = screen.getAllByRole('textbox');
     const textAreaElement = inputs[0] as HTMLTextAreaElement;
     const inputNameElement = inputs[1];
-    await act(() => {
-      userEvent.paste(textAreaElement, 'edited code');
-      userEvent.type(inputNameElement, 'edited name');
+    await act(async () => {
+      textAreaElement.focus();
+      await userEvent.paste('edited code');
+      textAreaElement.focus();
+      await userEvent.type(inputNameElement, 'edited name');
       fireEvent.submit(screen.getByRole('form'));
     });
     expect(toggleEditModal).toHaveBeenCalledTimes(1);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
index d2c4ed7f527..5d41e8c447c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
@@ -32,9 +32,9 @@ describe('FilterModal component', () => {
       screen.getByRole('heading', { name: /add filter/i, level: 3 })
     ).toBeInTheDocument();
   });
-  it('renders component with edit filter modal', () => {
-    userEvent.click(screen.getByRole('savedFilterText'));
-    userEvent.click(screen.getByText('Edit'));
+  it('renders component with edit filter modal', async () => {
+    await userEvent.click(screen.getByRole('savedFilterText'));
+    await userEvent.click(screen.getByText('Edit'));
     expect(
       screen.getByRole('heading', { name: /edit saved filter/i, level: 3 })
     ).toBeInTheDocument();
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
index a0aef49da12..43c7b9328dc 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
@@ -92,17 +92,17 @@ describe('Filters component', () => {
       });
     });
 
-    it('search input', () => {
+    it('search input', async () => {
       const searchInput = screen.getByPlaceholderText('Search');
       expect(searchInput).toHaveValue('');
-      userEvent.type(searchInput, inputValue);
+      await userEvent.type(searchInput, inputValue);
       expect(searchInput).toHaveValue(inputValue);
     });
 
-    it('offset input', () => {
+    it('offset input', async () => {
       const offsetInput = screen.getByPlaceholderText('Offset');
       expect(offsetInput).toHaveValue('');
-      userEvent.type(offsetInput, inputValue);
+      await userEvent.type(offsetInput, inputValue);
       expect(offsetInput).toHaveValue(inputValue);
     });
 
@@ -110,10 +110,12 @@ describe('Filters component', () => {
       const seekTypeSelect = screen.getAllByRole('listbox');
       const option = screen.getAllByRole('option');
 
-      await act(() => userEvent.click(seekTypeSelect[0]));
+      await act(async () => {
+        await userEvent.click(seekTypeSelect[0]);
+      });
 
-      await act(() => {
-        userEvent.selectOptions(seekTypeSelect[0], ['Timestamp']);
+      await act(async () => {
+        await userEvent.selectOptions(seekTypeSelect[0], ['Timestamp']);
       });
 
       expect(option[0]).toHaveTextContent('Timestamp');
@@ -142,26 +144,28 @@ describe('Filters component', () => {
       options = screen.getAllByRole('option');
     });
 
-    it('seekType select', () => {
+    it('seekType select', async () => {
       expect(options[0]).toHaveTextContent('Offset');
-      userEvent.click(seekTypeSelects[0]);
-      userEvent.selectOptions(seekTypeSelects[0], [mockTypeOptionSelectLabel]);
+      await userEvent.click(seekTypeSelects[0]);
+      await userEvent.selectOptions(seekTypeSelects[0], [
+        mockTypeOptionSelectLabel,
+      ]);
       expect(options[0]).toHaveTextContent(mockTypeOptionSelectLabel);
       expect(screen.getByText('Submit')).toBeInTheDocument();
     });
 
-    it('seekDirection select', () => {
-      userEvent.click(seekTypeSelects[3]);
-      userEvent.selectOptions(seekTypeSelects[3], [
+    it('seekDirection select', async () => {
+      await userEvent.click(seekTypeSelects[3]);
+      await userEvent.selectOptions(seekTypeSelects[3], [
         mockDirectionOptionSelectLabel,
       ]);
       expect(options[3]).toHaveTextContent(mockDirectionOptionSelectLabel);
     });
   });
 
-  it('stop loading when live mode is active', () => {
+  it('stop loading when live mode is active', async () => {
     renderComponent();
-    userEvent.click(screen.getByText('Stop loading'));
+    await userEvent.click(screen.getByText('Stop loading'));
     const option = screen.getAllByRole('option');
     expect(option[3]).toHaveTextContent('Oldest First');
     expect(screen.getByText('Submit')).toBeInTheDocument();
@@ -169,13 +173,13 @@ describe('Filters component', () => {
 
   it('renders addFilter modal', async () => {
     renderComponent();
-    await act(() =>
-      userEvent.click(
+    await act(async () => {
+      await userEvent.click(
         screen.getByRole('button', {
           name: /add filters/i,
         })
-      )
-    );
+      );
+    });
     expect(screen.getByTestId('messageFilterModal')).toBeInTheDocument();
   });
 
@@ -183,13 +187,13 @@ describe('Filters component', () => {
     beforeEach(async () => {
       renderComponent();
 
-      await act(() =>
-        userEvent.click(
+      await act(async () => {
+        await userEvent.click(
           screen.getByRole('button', {
             name: /add filters/i,
           })
-        )
-      );
+        );
+      });
 
       const filterName = 'filter name';
       const filterCode = 'filter code';
@@ -201,21 +205,22 @@ describe('Filters component', () => {
 
       const textAreaElement = textBoxElements[0] as HTMLTextAreaElement;
       const inputNameElement = textBoxElements[1];
-      await act(() => {
-        userEvent.paste(textAreaElement, filterName);
-        userEvent.type(inputNameElement, filterCode);
+      await act(async () => {
+        textAreaElement.focus();
+        await userEvent.paste(filterName);
+        await userEvent.type(inputNameElement, filterCode);
       });
 
       expect(textAreaElement.value).toEqual(`${filterName}\n\n`);
       expect(inputNameElement).toHaveValue(filterCode);
 
-      await act(() =>
-        userEvent.click(
+      await act(async () => {
+        await userEvent.click(
           within(messageFilterModal).getByRole('button', {
             name: /add filter/i,
           })
-        )
-      );
+        );
+      });
     });
 
     it('shows saved smart filter', () => {
@@ -225,7 +230,9 @@ describe('Filters component', () => {
     it('delete the active smart Filter', async () => {
       const smartFilterElement = screen.getByTestId('activeSmartFilter');
       const deleteIcon = within(smartFilterElement).getByText('mock-CloseIcon');
-      await act(() => userEvent.click(deleteIcon));
+      await act(async () => {
+        await userEvent.click(deleteIcon);
+      });
 
       const anotherSmartFilterElement =
         screen.queryByTestId('activeSmartFilter');
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/InfoModal.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/InfoModal.spec.tsx
index 76d50b054d4..90a798b19a6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/InfoModal.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/InfoModal.spec.tsx
@@ -5,10 +5,10 @@ import React from 'react';
 import InfoModal from 'components/Topics/Topic/Messages/Filters/InfoModal';
 
 describe('InfoModal component', () => {
-  it('closes InfoModal', () => {
+  it('closes InfoModal', async () => {
     const toggleInfoModal = jest.fn();
     render(<InfoModal toggleIsOpen={toggleInfoModal} />);
-    userEvent.click(screen.getByRole('button', { name: 'Ok' }));
+    await userEvent.click(screen.getByRole('button', { name: 'Ok' }));
     expect(toggleInfoModal).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
index cac3bee8ec6..dff30487862 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
@@ -3,12 +3,7 @@ import SavedFilters, {
   Props,
 } from 'components/Topics/Topic/Messages/Filters/SavedFilters';
 import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
-import {
-  screen,
-  waitFor,
-  waitForElementToBeRemoved,
-  within,
-} from '@testing-library/react';
+import { screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
 
@@ -35,17 +30,17 @@ describe('SavedFilter Component', () => {
 
   const getSavedFilters = () => screen.getAllByRole('savedFilter');
 
-  it('should check the Cancel button click', () => {
+  it('should check the Cancel button click', async () => {
     const cancelMock = jest.fn();
     setUpComponent({ closeModal: cancelMock });
-    userEvent.click(screen.getByText(/cancel/i));
+    await userEvent.click(screen.getByText(/cancel/i));
     expect(cancelMock).toHaveBeenCalled();
   });
 
-  it('should check on go back button click', () => {
+  it('should check on go back button click', async () => {
     const onGoBackMock = jest.fn();
     setUpComponent({ onGoBack: onGoBackMock });
-    userEvent.click(screen.getByText(/back to create filters/i));
+    await userEvent.click(screen.getByText(/back to create filters/i));
     expect(onGoBackMock).toHaveBeenCalled();
   });
 
@@ -84,26 +79,26 @@ describe('SavedFilter Component', () => {
       expect(screen.getByText(mockFilters[1].name)).toBeInTheDocument();
     });
 
-    it('should check the Filter edit Button works', () => {
+    it('should check the Filter edit Button works', async () => {
       const savedFilters = getSavedFilters();
-      userEvent.hover(savedFilters[0]);
-      userEvent.click(within(savedFilters[0]).getByText(/edit/i));
+      await userEvent.hover(savedFilters[0]);
+      await userEvent.click(within(savedFilters[0]).getByText(/edit/i));
       expect(onEditMock).toHaveBeenCalled();
 
-      userEvent.hover(savedFilters[1]);
-      userEvent.click(within(savedFilters[1]).getByText(/edit/i));
+      await userEvent.hover(savedFilters[1]);
+      await userEvent.click(within(savedFilters[1]).getByText(/edit/i));
       expect(onEditMock).toHaveBeenCalledTimes(2);
     });
 
-    it('should check the select filter', () => {
+    it('should check the select filter', async () => {
       const selectFilterButton = screen.getByText(/Select filter/i);
 
-      userEvent.click(selectFilterButton);
+      await userEvent.click(selectFilterButton);
       expect(activeFilterMock).not.toHaveBeenCalled();
 
       const savedFilterElement = getSavedFilters();
-      userEvent.click(savedFilterElement[0]);
-      userEvent.click(selectFilterButton);
+      await userEvent.click(savedFilterElement[0]);
+      await userEvent.click(selectFilterButton);
 
       expect(activeFilterMock).toHaveBeenCalled();
       expect(cancelMock).toHaveBeenCalled();
@@ -121,12 +116,12 @@ describe('SavedFilter Component', () => {
       deleteMock.mockClear();
     });
 
-    it('Open Confirmation for the deletion modal', () => {
+    it('Open Confirmation for the deletion modal', async () => {
       setUpComponent({ deleteFilter: deleteMock });
       const savedFilters = getSavedFilters();
       const deleteIcons = screen.getAllByText('mock-DeleteIcon');
-      userEvent.hover(savedFilters[0]);
-      userEvent.click(deleteIcons[0]);
+      await userEvent.hover(savedFilters[0]);
+      await userEvent.click(deleteIcons[0]);
       const modelDialog = screen.getByRole('dialog');
       expect(modelDialog).toBeInTheDocument();
       expect(
@@ -139,8 +134,8 @@ describe('SavedFilter Component', () => {
       const savedFilters = getSavedFilters();
       const deleteIcons = screen.getAllByText('mock-DeleteIcon');
 
-      userEvent.hover(savedFilters[0]);
-      userEvent.click(deleteIcons[0]);
+      await userEvent.hover(savedFilters[0]);
+      await userEvent.click(deleteIcons[0]);
 
       const modelDialog = screen.getByRole('dialog');
       expect(modelDialog).toBeInTheDocument();
@@ -156,14 +151,13 @@ describe('SavedFilter Component', () => {
       const savedFilters = getSavedFilters();
       const deleteIcons = screen.getAllByText('mock-DeleteIcon');
 
-      userEvent.hover(savedFilters[0]);
-      userEvent.click(deleteIcons[0]);
+      await userEvent.hover(savedFilters[0]);
+      await userEvent.click(deleteIcons[0]);
 
-      await waitFor(() =>
-        userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
-      );
+      expect(screen.queryByRole('dialog')).toBeInTheDocument();
+      await userEvent.click(screen.getByRole('button', { name: 'Confirm' }));
       expect(deleteMock).toHaveBeenCalledTimes(1);
-      await waitForElementToBeRemoved(() => screen.queryByRole('dialog'));
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
index e7fbd2b44ab..f166d70d3b0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
@@ -50,9 +50,9 @@ describe('MessageContent screen', () => {
   });
 
   describe('when switched to display the key', () => {
-    it('makes key tab active', () => {
+    it('makes key tab active', async () => {
       const keyTab = screen.getAllByText('Key');
-      userEvent.click(keyTab[0]);
+      await userEvent.click(keyTab[0]);
       expect(keyTab[0]).toHaveStyleRule(
         'background-color',
         theme.secondaryTab.backgroundColor.active
@@ -61,8 +61,8 @@ describe('MessageContent screen', () => {
   });
 
   describe('when switched to display the headers', () => {
-    it('makes headers tab active', () => {
-      userEvent.click(screen.getByText('Headers'));
+    it('makes Headers tab active', async () => {
+      await userEvent.click(screen.getByText('Headers'));
       expect(screen.getByText('Headers')).toHaveStyleRule(
         'background-color',
         theme.secondaryTab.backgroundColor.active
@@ -71,9 +71,9 @@ describe('MessageContent screen', () => {
   });
 
   describe('when switched to display the value', () => {
-    it('makes value tab active', () => {
+    it('makes value tab active', async () => {
       const contentTab = screen.getAllByText('Value');
-      userEvent.click(contentTab[0]);
+      await userEvent.click(contentTab[0]);
       expect(contentTab[0]).toHaveStyleRule(
         'background-color',
         theme.secondaryTab.backgroundColor.active
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
index 1c9ec36ea3e..f70e2e0a42f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
@@ -66,24 +66,24 @@ describe('Message component', () => {
     ).not.toBeInTheDocument();
   });
 
-  it('should check the dropdown being visible during hover', () => {
+  it('should check the dropdown being visible during hover', async () => {
     renderComponent();
     const text = 'Save as a file';
     const trElement = screen.getByRole('row');
     expect(screen.queryByText(text)).not.toBeInTheDocument();
 
-    userEvent.hover(trElement);
+    await userEvent.hover(trElement);
     expect(screen.getByText(text)).toBeInTheDocument();
 
-    userEvent.unhover(trElement);
+    await userEvent.unhover(trElement);
     expect(screen.queryByText(text)).not.toBeInTheDocument();
   });
 
-  it('should check open Message Content functionality', () => {
+  it('should check open Message Content functionality', async () => {
     renderComponent();
     const messageToggleIcon = screen.getByRole('button', { hidden: true });
     expect(screen.queryByText(messageContentText)).not.toBeInTheDocument();
-    userEvent.click(messageToggleIcon);
+    await userEvent.click(messageToggleIcon);
     expect(screen.getByText(messageContentText)).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
index 0d1b5a6531f..3c43931688b 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
@@ -57,24 +57,24 @@ describe('Messages', () => {
       );
 
       const labelValue1 = SeekDirectionOptions[1].label;
-      userEvent.click(seekDirectionSelect);
-      userEvent.selectOptions(seekDirectionSelect, [labelValue1]);
+      await userEvent.click(seekDirectionSelect);
+      await userEvent.selectOptions(seekDirectionSelect, [labelValue1]);
       expect(seekDirectionOption).toHaveTextContent(labelValue1);
 
       const labelValue0 = SeekDirectionOptions[0].label;
-      userEvent.click(seekDirectionSelect);
-      userEvent.selectOptions(seekDirectionSelect, [labelValue0]);
+      await userEvent.click(seekDirectionSelect);
+      await userEvent.selectOptions(seekDirectionSelect, [labelValue0]);
       expect(seekDirectionOption).toHaveTextContent(labelValue0);
 
       const liveOptionConf = SeekDirectionOptions[2];
       const labelValue2 = liveOptionConf.label;
-      userEvent.click(seekDirectionSelect);
+      await userEvent.click(seekDirectionSelect);
       const liveModeLi = screen.getByRole(
         (role, element) =>
           role === 'option' &&
           element?.getAttribute('value') === liveOptionConf.value
       );
-      userEvent.selectOptions(seekDirectionSelect, [liveModeLi]);
+      await userEvent.selectOptions(seekDirectionSelect, [liveModeLi]);
       expect(seekDirectionOption).toHaveTextContent(labelValue2);
 
       await waitFor(() => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
index e0efd0db9ec..3f10635df52 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
@@ -109,14 +109,14 @@ describe('Overview', () => {
   });
 
   describe('when Clear Messages is clicked', () => {
-    it('should when Clear Messages is clicked', () => {
+    it('should when Clear Messages is clicked', async () => {
       renderComponent({
         ...externalTopicPayload,
         cleanUpPolicy: CleanUpPolicy.DELETE,
       });
 
       const clearMessagesButton = screen.getByText('Clear Messages');
-      userEvent.click(clearMessagesButton);
+      await userEvent.click(clearMessagesButton);
       expect(uwrapMock).toHaveBeenCalledTimes(1);
     });
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
index a4a5c12ef7c..609324b8f09 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import SendMessage from 'components/Topics/Topic/SendMessage/SendMessage';
-import { act, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterTopicPath } from 'lib/paths';
@@ -47,32 +47,26 @@ const mockOnSubmit = jest.fn();
 
 const renderComponent = async () => {
   const path = clusterTopicPath(clusterName, topicName);
-  await act(() => {
-    render(
-      <WithRoute path={clusterTopicPath()}>
-        <SendMessage onSubmit={mockOnSubmit} />
-      </WithRoute>,
-      { initialEntries: [path] }
-    );
-  });
+  await render(
+    <WithRoute path={clusterTopicPath()}>
+      <SendMessage onSubmit={mockOnSubmit} />
+    </WithRoute>,
+    { initialEntries: [path] }
+  );
 };
 
 const renderAndSubmitData = async (error: string[] = []) => {
   await renderComponent();
-  await act(() => {
-    userEvent.click(screen.getAllByRole('listbox')[0]);
-  });
-  await act(() => {
-    userEvent.click(screen.getAllByRole('option')[1]);
-  });
+  await userEvent.click(screen.getAllByRole('listbox')[0]);
+
+  await userEvent.click(screen.getAllByRole('option')[1]);
+
   (validateBySchema as Mock).mockImplementation(() => error);
   const submitButton = screen.getByRole('button', {
     name: 'Produce Message',
   });
   await waitFor(() => expect(submitButton).toBeEnabled());
-  await act(() => {
-    userEvent.click(submitButton);
-  });
+  await userEvent.click(submitButton);
 };
 
 describe('SendMessage', () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx
index 2f27802a002..ba49893a0e4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx
@@ -50,10 +50,10 @@ describe('Metrics', () => {
       renderComponent();
     });
 
-    it('renders Stop Analysis button', () => {
+    it('renders Stop Analysis button', async () => {
       const btn = screen.getByRole('button', { name: 'Stop Analysis' });
       expect(btn).toBeInTheDocument();
-      userEvent.click(btn);
+      await userEvent.click(btn);
       expect(cancelMock).toHaveBeenCalled();
     });
 
@@ -95,9 +95,9 @@ describe('Metrics', () => {
       expect(btns.length).toEqual(2);
       expect(screen.queryByText('Partition stats')).not.toBeInTheDocument();
 
-      userEvent.click(btns[0]);
+      await userEvent.click(btns[0]);
       expect(screen.getAllByText('Partition stats').length).toEqual(1);
-      userEvent.click(btns[1]);
+      await userEvent.click(btns[1]);
       expect(screen.getAllByText('Partition stats').length).toEqual(2);
     });
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
index dd9d0c59c7c..9baa8785e1b 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { act, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import ClusterContext from 'components/contexts/ClusterContext';
 import Details from 'components/Topics/Topic/Topic';
@@ -110,17 +110,17 @@ describe('Details', () => {
     });
 
     describe('when remove topic modal is open', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         renderComponent();
         const openModalButton = screen.getAllByText('Remove Topic')[0];
-        userEvent.click(openModalButton);
+        await userEvent.click(openModalButton);
       });
 
       it('calls deleteTopic on confirm', async () => {
         const submitButton = screen.getAllByRole('button', {
           name: 'Confirm',
         })[0];
-        await act(() => userEvent.click(submitButton));
+        await userEvent.click(submitButton);
         expect(mockDelete).toHaveBeenCalledWith(topic.name);
       });
       it('closes the modal when cancel button is clicked', async () => {
@@ -134,7 +134,7 @@ describe('Details', () => {
       beforeEach(async () => {
         await renderComponent();
         const confirmButton = screen.getAllByText('Clear messages')[0];
-        await act(() => userEvent.click(confirmButton));
+        await userEvent.click(confirmButton);
       });
 
       it('it calls clearTopicMessages on confirm', async () => {
@@ -154,10 +154,10 @@ describe('Details', () => {
     });
 
     describe('when edit settings is clicked', () => {
-      it('redirects to the edit page', () => {
+      it('redirects to the edit page', async () => {
         renderComponent();
         const button = screen.getAllByText('Edit settings')[0];
-        userEvent.click(button);
+        await userEvent.click(button);
         expect(mockNavigate).toHaveBeenCalledWith(clusterTopicEditRelativePath);
       });
     });
@@ -169,24 +169,24 @@ describe('Details', () => {
       const submitDeleteButton = screen.getByRole('button', {
         name: 'Confirm',
       });
-      await act(() => userEvent.click(submitDeleteButton));
+      await userEvent.click(submitDeleteButton);
       expect(mockNavigate).toHaveBeenCalledWith('../..');
     });
 
-    it('shows a confirmation popup on deleting topic messages', () => {
+    it('shows a confirmation popup on deleting topic messages', async () => {
       renderComponent();
       const clearMessagesButton = screen.getAllByText(/Clear messages/i)[0];
-      userEvent.click(clearMessagesButton);
+      await userEvent.click(clearMessagesButton);
 
       expect(
         screen.getByText(/Are you sure want to clear topic messages?/i)
       ).toBeInTheDocument();
     });
 
-    it('shows a confirmation popup on recreating topic', () => {
+    it('shows a confirmation popup on recreating topic', async () => {
       renderComponent();
       const recreateTopicButton = screen.getByText(/Recreate topic/i);
-      userEvent.click(recreateTopicButton);
+      await userEvent.click(recreateTopicButton);
       expect(
         screen.getByText(/Are you sure want to recreate topic?/i)
       ).toBeInTheDocument();
@@ -195,19 +195,19 @@ describe('Details', () => {
     it('is calling recreation function after click on Submit button', async () => {
       renderComponent();
       const recreateTopicButton = screen.getByText(/Recreate topic/i);
-      userEvent.click(recreateTopicButton);
+      await userEvent.click(recreateTopicButton);
       const confirmBtn = screen.getByRole('button', { name: /Confirm/i });
 
       await waitFor(() => userEvent.click(confirmBtn));
       expect(mockRecreate).toBeCalledTimes(1);
     });
 
-    it('closes popup confirmation window after click on Cancel button', () => {
+    it('closes popup confirmation window after click on Cancel button', async () => {
       renderComponent();
       const recreateTopicButton = screen.getByText(/Recreate topic/i);
-      userEvent.click(recreateTopicButton);
+      await userEvent.click(recreateTopicButton);
       const cancelBtn = screen.getByRole('button', { name: /cancel/i });
-      userEvent.click(cancelBtn);
+      await userEvent.click(cancelBtn);
       expect(
         screen.queryByText(/Are you sure want to recreate topic?/i)
       ).not.toBeInTheDocument();
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__test__/CustomParamField.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__test__/CustomParamField.spec.tsx
index d94812d73aa..8ff3b88dafa 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__test__/CustomParamField.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__test__/CustomParamField.spec.tsx
@@ -57,7 +57,7 @@ describe('CustomParamsField', () => {
   });
 
   describe('core functionality works', () => {
-    it('click on button triggers remove', () => {
+    it('click on button triggers remove', async () => {
       setupComponent({
         field,
         isDisabled,
@@ -66,11 +66,11 @@ describe('CustomParamsField', () => {
         existingFields,
         setExistingFields,
       });
-      userEvent.click(screen.getByRole('button'));
+      await userEvent.click(screen.getByRole('button'));
       expect(remove).toHaveBeenCalledTimes(1);
     });
 
-    it('pressing space on button triggers remove', () => {
+    it('pressing space on button triggers remove', async () => {
       setupComponent({
         field,
         isDisabled,
@@ -79,7 +79,7 @@ describe('CustomParamsField', () => {
         existingFields,
         setExistingFields,
       });
-      userEvent.type(screen.getByRole('button'), SPACE_KEY);
+      await userEvent.type(screen.getByRole('button'), SPACE_KEY);
       // userEvent.type triggers remove two times as at first it clicks on element and then presses space
       expect(remove).toHaveBeenCalledTimes(2);
     });
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__test__/CustomParams.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__test__/CustomParams.spec.tsx
index 09c58be6811..1a185637a65 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__test__/CustomParams.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__test__/CustomParams.spec.tsx
@@ -11,10 +11,10 @@ import { TOPIC_CUSTOM_PARAMS } from 'lib/constants';
 import { defaultValues } from './fixtures';
 
 const selectOption = async (listbox: HTMLElement, option: string) => {
-  await act(() => {
-    userEvent.click(listbox);
+  await act(async () => {
+    await userEvent.click(listbox);
   });
-  userEvent.click(screen.getByText(option));
+  await userEvent.click(screen.getByText(option));
 };
 
 const expectOptionIsSelected = (listbox: HTMLElement, option: string) => {
@@ -28,7 +28,9 @@ const expectOptionAvailability = async (
   option: string,
   disabled: boolean
 ) => {
-  await act(() => userEvent.click(listbox));
+  await act(async () => {
+    await userEvent.click(listbox);
+  });
   const selectedOptions = within(listbox).getAllByText(option).reverse();
   // its either two or one nodes, we only need last one
   const selectedOption = selectedOptions[0];
@@ -43,7 +45,9 @@ const expectOptionAvailability = async (
     'cursor',
     disabled ? 'not-allowed' : 'pointer'
   );
-  await act(() => userEvent.click(listbox));
+  await act(async () => {
+    await userEvent.click(listbox);
+  });
 };
 
 const renderComponent = (props: CustomParamsProps, defaults = {}) => {
@@ -85,7 +89,9 @@ describe('CustomParams', () => {
     beforeEach(async () => {
       renderComponent({ isSubmitting: false });
       button = screen.getByRole('button');
-      await act(() => userEvent.click(button));
+      await act(async () => {
+        await userEvent.click(button);
+      });
     });
 
     it('button click creates custom param fieldset', async () => {
@@ -120,8 +126,12 @@ describe('CustomParams', () => {
     });
 
     it('multiple button clicks create multiple fieldsets', async () => {
-      await act(() => userEvent.click(button));
-      await act(() => userEvent.click(button));
+      await act(async () => {
+        await userEvent.click(button);
+      });
+      await act(async () => {
+        await userEvent.click(button);
+      });
 
       const listboxes = screen.getAllByRole('listbox');
       expect(listboxes.length).toBe(3);
@@ -131,7 +141,9 @@ describe('CustomParams', () => {
     });
 
     it("can't select already selected option", async () => {
-      await act(() => userEvent.click(button));
+      await act(async () => {
+        await userEvent.click(button);
+      });
 
       const listboxes = screen.getAllByRole('listbox');
 
@@ -144,8 +156,12 @@ describe('CustomParams', () => {
     });
 
     it('when fieldset with selected custom property type is deleted disabled options update correctly', async () => {
-      await act(() => userEvent.click(button));
-      await act(() => userEvent.click(button));
+      await act(async () => {
+        await userEvent.click(button);
+      });
+      await act(async () => {
+        await userEvent.click(button);
+      });
 
       const listboxes = screen.getAllByRole('listbox');
 
@@ -172,7 +188,9 @@ describe('CustomParams', () => {
       const deleteSecondFieldsetButton = screen.getByTitle(
         'Delete customParam field 1'
       );
-      await act(() => userEvent.click(deleteSecondFieldsetButton));
+      await act(async () => {
+        await userEvent.click(deleteSecondFieldsetButton);
+      });
       expect(secondListbox).not.toBeInTheDocument();
 
       await expectOptionAvailability(
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx
index bf93b72d4ed..aaae57306a4 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx
@@ -46,9 +46,9 @@ describe('TimeToRetainBtn', () => {
       );
       expect(buttonElement).toHaveStyle(`border:none`);
     });
-    it('should test the non active state with click becoming active', () => {
+    it('should test the non active state with click becoming active', async () => {
       const buttonElement = screen.getByRole('button');
-      userEvent.click(buttonElement);
+      await userEvent.click(buttonElement);
       expect(buttonElement).toHaveStyle(
         `background-color:${theme.button.secondary.invertedColors.normal}`
       );
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
index fa12e8728c1..8454b401c11 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
@@ -67,14 +67,17 @@ describe('TopicForm', () => {
       onSubmit: onSubmit.mockImplementation((e) => e.preventDefault()),
     });
 
-    await act(() => {
-      userEvent.type(screen.getByPlaceholderText('Topic Name'), 'topicName');
+    await act(async () => {
+      await userEvent.type(
+        screen.getByPlaceholderText('Topic Name'),
+        'topicName'
+      );
     });
     await act(() => {
       fireEvent.submit(screen.getByLabelText('topic form'));
     });
 
-    userEvent.click(screen.getByRole('button', { name: 'Create topic' }));
+    await userEvent.click(screen.getByRole('button', { name: 'Create topic' }));
     expect(onSubmit).toBeCalledTimes(1);
   });
 });
diff --git a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
index 6c9fcd6535d..4190946c1fe 100644
--- a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
+++ b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
@@ -42,7 +42,7 @@ describe('App', () => {
     ).toBeInTheDocument();
   });
 
-  it('handle burger click correctly', () => {
+  it('handle burger click correctly', async () => {
     const burger = within(screen.getByLabelText('Page Header')).getByRole(
       'button',
       burgerButtonOptions
@@ -52,7 +52,7 @@ describe('App', () => {
     expect(overlay).toBeInTheDocument();
     expect(overlay).toHaveStyleRule('visibility: hidden');
     expect(burger).toHaveStyleRule('display: none');
-    userEvent.click(burger);
+    await userEvent.click(burger);
     expect(overlay).toHaveStyleRule('visibility: visible');
   });
 
diff --git a/kafka-ui-react-app/src/components/common/Alert/__tests__/Alert.spec.tsx b/kafka-ui-react-app/src/components/common/Alert/__tests__/Alert.spec.tsx
index a77f451b5e4..b4cea35348b 100644
--- a/kafka-ui-react-app/src/components/common/Alert/__tests__/Alert.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Alert/__tests__/Alert.spec.tsx
@@ -26,9 +26,9 @@ describe('Alert', () => {
     expect(screen.getByRole('contentinfo')).toHaveTextContent(message);
     expect(getButton()).toBeInTheDocument();
   });
-  it('handles dismiss callback', () => {
+  it('handles dismiss callback', async () => {
     setupComponent();
-    userEvent.click(getButton());
+    await userEvent.click(getButton());
     expect(dismiss).toHaveBeenCalled();
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx b/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx
index 25447ccae0c..3082f6f610a 100644
--- a/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx
@@ -25,17 +25,17 @@ describe('Custom Input', () => {
   describe('number', () => {
     const getInput = () => screen.getByRole('spinbutton');
 
-    it('allows user to type only numbers', () => {
+    it('allows user to type only numbers', async () => {
       render(setupWrapper({ type: 'number' }));
       const input = getInput();
-      userEvent.type(input, 'abc131');
+      await userEvent.type(input, 'abc131');
       expect(input).toHaveValue(131);
     });
 
-    it('allows negative values', () => {
+    it('allows negative values', async () => {
       render(setupWrapper({ type: 'number' }));
       const input = getInput();
-      userEvent.type(input, '-2');
+      await userEvent.type(input, '-2');
       expect(input).toHaveValue(-2);
     });
   });
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index 480f6e6db15..227dc552059 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -11,7 +11,6 @@ import { screen, waitFor } from '@testing-library/dom';
 import { ColumnDef, Row } from '@tanstack/react-table';
 import userEvent from '@testing-library/user-event';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
-import { act } from '@testing-library/react';
 import { ConnectorState, ConsumerGroupState } from 'generated-sources';
 
 const mockedUsedNavigate = jest.fn();
@@ -155,15 +154,15 @@ describe('Table', () => {
   });
 
   describe('ExpanderCell', () => {
-    it('renders button', () => {
+    it('renders button', async () => {
       renderComponent({ getRowCanExpand: () => true });
       const btns = screen.getAllByRole('button', { name: 'Expand row' });
       expect(btns.length).toEqual(data.length);
 
       expect(screen.queryByText('I am expanded row')).not.toBeInTheDocument();
-      userEvent.click(btns[2]);
+      await userEvent.click(btns[2]);
       expect(screen.getByText('I am expanded row')).toBeInTheDocument();
-      userEvent.click(btns[0]);
+      await userEvent.click(btns[0]);
       expect(screen.getAllByText('I am expanded row').length).toEqual(2);
     });
 
@@ -213,20 +212,20 @@ describe('Table', () => {
       expect(lastBtn).toBeInTheDocument();
       expect(lastBtn).toBeEnabled();
 
-      userEvent.click(nextBtn);
+      await userEvent.click(nextBtn);
       expect(screen.getByText('ipsum')).toBeInTheDocument();
       expect(prevBtn).toBeEnabled();
       expect(firstBtn).toBeEnabled();
 
-      userEvent.click(lastBtn);
+      await userEvent.click(lastBtn);
       expect(screen.getByText('sit')).toBeInTheDocument();
       expect(lastBtn).toBeDisabled();
       expect(nextBtn).toBeDisabled();
 
-      userEvent.click(prevBtn);
+      await userEvent.click(prevBtn);
       expect(screen.getByText('dolor')).toBeInTheDocument();
 
-      userEvent.click(firstBtn);
+      await userEvent.click(firstBtn);
       expect(screen.getByText('lorem')).toBeInTheDocument();
     });
 
@@ -243,22 +242,22 @@ describe('Table', () => {
         expect(goToPage).toBeInTheDocument();
         expect(goToPage).toHaveValue(1);
       });
-      it('updates page on Go To page change', () => {
+      it('updates page on Go To page change', async () => {
         const goToPage = getGoToPageInput();
-        userEvent.clear(goToPage);
-        userEvent.type(goToPage, '2');
+        await userEvent.clear(goToPage);
+        await userEvent.type(goToPage, '2');
         expect(goToPage).toHaveValue(2);
         expect(screen.getByText('ipsum')).toBeInTheDocument();
       });
-      it('does not update page on Go To page change if page is out of range', () => {
+      it('does not update page on Go To page change if page is out of range', async () => {
         const goToPage = getGoToPageInput();
-        userEvent.type(goToPage, '5');
+        await userEvent.type(goToPage, '5');
         expect(goToPage).toHaveValue(15);
         expect(screen.getByText('No rows found')).toBeInTheDocument();
       });
-      it('does not update page on Go To page change if page is not a number', () => {
+      it('does not update page on Go To page change if page is not a number', async () => {
         const goToPage = getGoToPageInput();
-        userEvent.type(goToPage, 'abc');
+        await userEvent.type(goToPage, 'abc');
         expect(goToPage).toHaveValue(1);
       });
     });
@@ -266,12 +265,10 @@ describe('Table', () => {
 
   describe('Sorting', () => {
     it('sort rows', async () => {
-      await act(() =>
-        renderComponent({
-          path: '/?sortBy=text&&sortDirection=desc',
-          enableSorting: true,
-        })
-      );
+      await renderComponent({
+        path: '/?sortBy=text&&sortDirection=desc',
+        enableSorting: true,
+      });
       expect(screen.getAllByRole('row').length).toEqual(data.length + 1);
       const th = screen.getByRole('columnheader', { name: 'Text' });
       expect(th).toBeInTheDocument();
@@ -319,42 +316,42 @@ describe('Table', () => {
       expect(checkboxes[4]).toBeDisabled();
     });
 
-    it('renders action bar', () => {
+    it('renders action bar', async () => {
       expect(screen.getAllByRole('row').length).toEqual(data.length + 1);
       expect(screen.queryByText('I am Action Bar')).not.toBeInTheDocument();
       const checkboxes = screen.getAllByRole('checkbox');
       expect(checkboxes.length).toEqual(data.length + 1);
-      userEvent.click(checkboxes[2]);
+      await userEvent.click(checkboxes[2]);
       expect(screen.getByText('I am Action Bar')).toBeInTheDocument();
     });
   });
   describe('Clickable Row', () => {
     const onRowClick = jest.fn();
-    it('handles onRowClick', () => {
+    it('handles onRowClick', async () => {
       renderComponent({ onRowClick });
       const rows = screen.getAllByRole('row');
       expect(rows.length).toEqual(data.length + 1);
-      userEvent.click(rows[1]);
+      await userEvent.click(rows[1]);
       expect(onRowClick).toHaveBeenCalledTimes(1);
     });
-    it('does nothing unless onRowClick is provided', () => {
+    it('does nothing unless onRowClick is provided', async () => {
       renderComponent();
       const rows = screen.getAllByRole('row');
       expect(rows.length).toEqual(data.length + 1);
-      userEvent.click(rows[1]);
+      await userEvent.click(rows[1]);
     });
-    it('does not handle onRowClick if enableRowSelection', () => {
+    it('does not handle onRowClick if enableRowSelection', async () => {
       renderComponent({ onRowClick, enableRowSelection: true });
       const rows = screen.getAllByRole('row');
       expect(rows.length).toEqual(data.length + 1);
-      userEvent.click(rows[1]);
+      await userEvent.click(rows[1]);
       expect(onRowClick).not.toHaveBeenCalled();
     });
-    it('does not handle onRowClick if expandable rows', () => {
+    it('does not handle onRowClick if expandable rows', async () => {
       renderComponent({ onRowClick, getRowCanExpand: () => true });
       const rows = screen.getAllByRole('row');
       expect(rows.length).toEqual(data.length + 1);
-      userEvent.click(rows[1]);
+      await userEvent.click(rows[1]);
       expect(onRowClick).not.toHaveBeenCalled();
     });
   });
diff --git a/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx b/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx
index b9d1aa362b4..808f229317e 100644
--- a/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx
@@ -24,11 +24,11 @@ describe('Search', () => {
       setSearchParamsMock,
     ]);
   });
-  it('calls handleSearch on input', () => {
+  it('calls handleSearch on input', async () => {
     render(<Search placeholder={placeholder} />);
     const input = screen.getByPlaceholderText(placeholder);
-    userEvent.click(input);
-    userEvent.keyboard('value');
+    await userEvent.click(input);
+    await userEvent.keyboard('value');
     expect(setSearchParamsMock).toHaveBeenCalledTimes(5);
   });
 
diff --git a/kafka-ui-react-app/src/components/common/Select/__tests__/Select.spec.tsx b/kafka-ui-react-app/src/components/common/Select/__tests__/Select.spec.tsx
index 1f6ce0851dd..f05d9e126b4 100644
--- a/kafka-ui-react-app/src/components/common/Select/__tests__/Select.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Select/__tests__/Select.spec.tsx
@@ -36,29 +36,29 @@ describe('Custom Select', () => {
       expect(getListbox()).toBeInTheDocument();
     });
 
-    it('show select options when select is being clicked', () => {
+    it('show select options when select is being clicked', async () => {
       expect(getOption()).toBeInTheDocument();
-      userEvent.click(getListbox());
+      await userEvent.click(getListbox());
       expect(screen.getAllByRole('option')).toHaveLength(3);
     });
 
-    it('checking select option change', () => {
+    it('checking select option change', async () => {
       const optionLabel = 'test-label1';
 
-      userEvent.click(getListbox());
-      userEvent.selectOptions(getListbox(), [optionLabel]);
+      await userEvent.click(getListbox());
+      await userEvent.selectOptions(getListbox(), [optionLabel]);
 
       expect(getOption()).toHaveTextContent(optionLabel);
     });
 
-    it('trying to select disabled option does not trigger change', () => {
+    it('trying to select disabled option does not trigger change', async () => {
       const normalOptionLabel = 'test-label1';
       const disabledOptionLabel = 'test-label2';
 
-      userEvent.click(getListbox());
-      userEvent.selectOptions(getListbox(), [normalOptionLabel]);
-      userEvent.click(getListbox());
-      userEvent.selectOptions(getListbox(), [disabledOptionLabel]);
+      await userEvent.click(getListbox());
+      await userEvent.selectOptions(getListbox(), [normalOptionLabel]);
+      await userEvent.click(getListbox());
+      await userEvent.selectOptions(getListbox(), [disabledOptionLabel]);
 
       expect(getOption()).toHaveTextContent(normalOptionLabel);
     });
diff --git a/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx b/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx
index 794583dae73..aa4f82c2b0a 100644
--- a/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx
@@ -61,7 +61,7 @@ describe('TableHeaderCell', () => {
     expect(title).toHaveStyle(`color: ${theme.table.th.color.active};`);
     expect(title).toHaveStyle('cursor: pointer;');
   });
-  it('renders click on title triggers handler', () => {
+  it('renders click on title triggers handler', async () => {
     setupComponent({
       title: testTitle,
       orderBy: TopicColumnsToSort.NAME,
@@ -69,11 +69,11 @@ describe('TableHeaderCell', () => {
       handleOrderBy,
     });
     const title = within(getColumnHeader()).getByRole('button');
-    userEvent.click(title);
+    await userEvent.click(title);
     expect(handleOrderBy.mock.calls.length).toBe(1);
   });
 
-  it('renders space on title triggers handler', () => {
+  it('renders space on title triggers handler', async () => {
     setupComponent({
       title: testTitle,
       orderBy: TopicColumnsToSort.NAME,
@@ -81,30 +81,30 @@ describe('TableHeaderCell', () => {
       handleOrderBy,
     });
     const title = within(getColumnHeader()).getByRole('button');
-    userEvent.type(title, SPACE_KEY);
+    await userEvent.type(title, SPACE_KEY);
     // userEvent.type clicks and only then presses space
     expect(handleOrderBy.mock.calls.length).toBe(2);
   });
 
-  it('click on preview triggers handler', () => {
+  it('click on preview triggers handler', async () => {
     setupComponent({
       title: testTitle,
       previewText: testPreviewText,
       onPreview,
     });
     const preview = within(getColumnHeader()).getByRole('button');
-    userEvent.click(preview);
+    await userEvent.click(preview);
     expect(onPreview.mock.calls.length).toBe(1);
   });
 
-  it('click on preview triggers handler', () => {
+  it('click on preview triggers handler', async () => {
     setupComponent({
       title: testTitle,
       previewText: testPreviewText,
       onPreview,
     });
     const preview = within(getColumnHeader()).getByRole('button');
-    userEvent.type(preview, SPACE_KEY);
+    await userEvent.type(preview, SPACE_KEY);
     expect(onPreview.mock.calls.length).toBe(2);
   });
 

From 80f7d156048ae9b05cf5a3724b71b3054f15a3ee Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Wed, 26 Oct 2022 23:20:48 +0400
Subject: [PATCH 238/734] Fix helm release workflow (#2826)

---
 .github/workflows/release-helm.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-helm.yaml b/.github/workflows/release-helm.yaml
index 640c0acc1c1..2e9cdb280dd 100644
--- a/.github/workflows/release-helm.yaml
+++ b/.github/workflows/release-helm.yaml
@@ -19,19 +19,20 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
 
-      - uses: azure/setup-helm@v1
+      - uses: azure/setup-helm@v3
 
       - name: add chart #realse helm with new version
         run: |
-          echo "VERSION=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk '{print $2}')" >> $GITHUB_ENV
-          MSG=$(helm package  charts/kafka-ui)
+          VERSION=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk '{print $2}')
+          echo "HELM_VERSION=$(echo ${VERSION})" >> $GITHUB_ENV
+          MSG=$(helm package charts/kafka-ui)
           git fetch origin
           git stash
           git checkout -b gh-pages origin/gh-pages
           helm repo index .
           git add -f ${MSG##*/} index.yaml
-          git commit -m "release ${{ env.VERSION }}"
+          git commit -m "release ${VERSION}"
           git push
       - uses: rickstaa/action-create-tag@v1 #create new tag
         with:
-          tag: "charts/kafka-ui-${{ env.VERSION }}"
+          tag: "charts/kafka-ui-${{ env.HELM_VERSION }}"

From 2853b34b5f4667e22dac5932a5000e740315bdb8 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 27 Oct 2022 00:03:42 +0400
Subject: [PATCH 239/734] Bump netty version (#2830)

---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index d7f4f3ea285..84e0808a2d6 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -32,7 +32,7 @@
         <maven.surefire-plugin.version>2.22.2</maven.surefire-plugin.version>
         <allure-maven.version>2.10.0</allure-maven.version>
         <kafka.version>3.0.0</kafka.version>
-        <netty.version>4.1.77.Final</netty.version>
+        <netty.version>4.1.84.Final</netty.version>
         <qase.io.version>2.1.3</qase.io.version>
     </properties>
 

From 7044e5709580bc4f4bca8b3a1c83e90024d0f4ff Mon Sep 17 00:00:00 2001
From: Egorka Voronyansky <vrnsky@protonmail.ch>
Date: Fri, 28 Oct 2022 16:50:04 +0800
Subject: [PATCH 240/734] Drop deprecated methods (#2837)

Co-authored-by: vrnsky <vrnsky@protonmail.com>
---
 .../controller/ConsumerGroupsController.java  | 11 ----------
 .../ui/service/ConsumerGroupService.java      |  7 ------
 .../main/resources/swagger/kafka-ui-api.yaml  | 22 -------------------
 3 files changed, 40 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
index c0d4d0296cf..4bba879b014 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
@@ -53,17 +53,6 @@ public Mono<ResponseEntity<ConsumerGroupDetailsDTO>> getConsumerGroup(
         .map(ResponseEntity::ok);
   }
 
-
-  @Override
-  public Mono<ResponseEntity<Flux<ConsumerGroupDTO>>> getConsumerGroups(String clusterName,
-                                                                        ServerWebExchange exchange) {
-    return consumerGroupService.getAllConsumerGroups(getCluster(clusterName))
-        .map(Flux::fromIterable)
-        .map(f -> f.map(ConsumerGroupMapper::toDto))
-        .map(ResponseEntity::ok)
-        .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()));
-  }
-
   @Override
   public Mono<ResponseEntity<Flux<ConsumerGroupDTO>>> getTopicConsumerGroups(
       String clusterName, String topicName, ServerWebExchange exchange) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index a82224ed278..ee9a9d8a6a0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -64,13 +64,6 @@ private Mono<List<InternalConsumerGroup>> getConsumerGroups(
         });
   }
 
-  @Deprecated // need to migrate to pagination
-  public Mono<List<InternalConsumerGroup>> getAllConsumerGroups(KafkaCluster cluster) {
-    return adminClientService.get(cluster)
-        .flatMap(ac -> describeConsumerGroups(ac, null)
-            .flatMap(descriptions -> getConsumerGroups(ac, descriptions)));
-  }
-
   public Mono<List<InternalTopicConsumerGroup>> getConsumerGroupsForTopic(KafkaCluster cluster,
                                                                           String topic) {
     return adminClientService.get(cluster)
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 55ea795f03e..c4765fb2202 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -862,28 +862,6 @@ paths:
         200:
           description: OK
 
-  /api/clusters/{clusterName}/consumer-groups:
-    get:
-      tags:
-        - Consumer Groups
-      summary: get all ConsumerGroups
-      operationId: getConsumerGroups
-      parameters:
-        - name: clusterName
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        200:
-          description: OK
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/ConsumerGroup'
-
   /api/clusters/{clusterName}/consumer-groups/{id}/offsets:
     post:
       tags:

From 972d02b8369f56a44bfbce89f8adbbebc69bc2d5 Mon Sep 17 00:00:00 2001
From: Harrison Kim <37385693+harrison-kim@users.noreply.github.com>
Date: Fri, 28 Oct 2022 11:52:54 -0400
Subject: [PATCH 241/734] [helm] Adding checksum for config from values (#2831)

* adding checksum for config from values

* Update Chart.yaml

Co-authored-by: Narekmat <47845266+Narekmat@users.noreply.github.com>
---
 charts/kafka-ui/templates/deployment.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index 1f7f6c92ad4..51703c7ed30 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -18,6 +18,7 @@ spec:
           {{- toYaml . | nindent 8 }}
       {{- end }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        checksum/configFromValues: {{ include (print $.Template.BasePath "/configmap_fromValues.yaml") . | sha256sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
       labels:
         {{- include "kafka-ui.selectorLabels" . | nindent 8 }}
@@ -136,4 +137,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
\ No newline at end of file
+      {{- end }}

From d2a62e27628cb55b88258df6a1f13b6faccb651d Mon Sep 17 00:00:00 2001
From: vitalymatyushik <vitaly_matyushik@outlook.com>
Date: Fri, 28 Oct 2022 17:55:35 +0200
Subject: [PATCH 242/734] Make topic bulk actions buttons always visible
 (#2835)

---
 .../src/components/Topics/List/BatchActionsBar.tsx     | 10 +++++++++-
 .../src/components/common/NewTable/Table.tsx           |  4 ++--
 .../components/common/NewTable/__test__/Table.spec.tsx |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
index a5acec28f5b..3ff45cfed78 100644
--- a/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
@@ -63,6 +63,12 @@ const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
   type Tuple = [string, string];
 
   const getCopyTopicPath = () => {
+    if (!rows.length) {
+      return {
+        pathname: '',
+        search: '',
+      };
+    }
     const topic = rows[0].original;
 
     const search = Object.keys(topic).reduce((acc: Tuple[], key) => {
@@ -86,13 +92,14 @@ const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
         buttonSize="M"
         buttonType="secondary"
         onClick={deleteTopicsHandler}
+        disabled={!selectedTopics.length}
       >
         Delete selected topics
       </Button>
       <Button
         buttonSize="M"
         buttonType="secondary"
-        disabled={selectedTopics.length > 1}
+        disabled={selectedTopics.length !== 1}
         to={getCopyTopicPath()}
       >
         Copy selected topic
@@ -101,6 +108,7 @@ const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
         buttonSize="M"
         buttonType="secondary"
         onClick={purgeTopicsHandler}
+        disabled={!selectedTopics.length}
       >
         Purge messages of selected topics
       </Button>
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 7e3b571c375..2c80ac18b27 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -101,7 +101,7 @@ const getSortingFromSearchParams = (searchParams: URLSearchParams) => {
  *    - use `enableRowSelection` prop to enable row selection. This prop can be a boolean or
  *      a function that returns true if the particular row can be selected.
  *    - use `batchActionsBar` prop to provide a component that will be rendered at the top of the table
- *      when row selection is enabled and there are selected rows.
+ *      when row selection is enabled.
  *
  * 5. Server side processing:
  *    - set `serverSideProcessing` to true
@@ -190,7 +190,7 @@ const Table: React.FC<TableProps<any>> = ({
 
   return (
     <>
-      {table.getSelectedRowModel().flatRows.length > 0 && BatchActionsBar && (
+      {BatchActionsBar && (
         <S.TableActionsBar>
           <BatchActionsBar
             rows={table.getSelectedRowModel().flatRows}
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index 227dc552059..dbfdddab662 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -318,7 +318,7 @@ describe('Table', () => {
 
     it('renders action bar', async () => {
       expect(screen.getAllByRole('row').length).toEqual(data.length + 1);
-      expect(screen.queryByText('I am Action Bar')).not.toBeInTheDocument();
+      expect(screen.queryByText('I am Action Bar')).toBeInTheDocument();
       const checkboxes = screen.getAllByRole('checkbox');
       expect(checkboxes.length).toEqual(data.length + 1);
       await userEvent.click(checkboxes[2]);

From 95e494ea09996c673ba2a876f5b829c066a2d9b4 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 28 Oct 2022 20:44:01 +0400
Subject: [PATCH 243/734] [helm] Fix app version (#2842)

---
 charts/kafka-ui/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 89982674019..2da8388a44a 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -3,5 +3,5 @@ name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
 version: 0.4.4
-appVersion: 0.4.0
+appVersion: v0.4.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

From b28492acd4a84f12bfcf8987f03c9e41c5410e65 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Sat, 29 Oct 2022 17:21:37 +0400
Subject: [PATCH 244/734] [FE] Fix fixtures (#2841)

---
 .../Brokers/utils/__test__/fixtures.ts        | 161 +-----------------
 1 file changed, 6 insertions(+), 155 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts
index 9ab3e4b662d..310c9bc54a3 100644
--- a/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Brokers/utils/__test__/fixtures.ts
@@ -6,169 +6,20 @@ export const brokerMetricsPayload: BrokerMetrics = {
   metrics: [
     {
       name: 'TotalFetchRequestsPerSec',
-      canonicalName:
-        'kafka.server:name=TotalFetchRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics',
-      params: {
-        topic: '_connect_status',
-        name: 'TotalFetchRequestsPerSec',
-        type: 'BrokerTopicMetrics',
-      },
-      value: {
-        OneMinuteRate: 19.408369293127542,
-        FifteenMinuteRate: 19.44631556589501,
-        Count: 191615,
-        FiveMinuteRate: 19.464393718807774,
-        MeanRate: 19.4233855043407,
+      labels: {
+        canonicalName:
+          'kafka.server:name=TotalFetchRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics',
       },
+      value: 10,
     },
     {
       name: 'ZooKeeperRequestLatencyMs',
-      canonicalName:
-        'kafka.server:name=ZooKeeperRequestLatencyMs,type=ZooKeeperClientMetrics',
-      params: {
-        name: 'ZooKeeperRequestLatencyMs',
-        type: 'ZooKeeperClientMetrics',
-      },
-      value: {
-        Mean: 4.907351022183558,
-        StdDev: 10.589608223906348,
-        '75thPercentile': 2,
-        '98thPercentile': 10,
-        Min: 0,
-        '95thPercentile': 5,
-        '99thPercentile': 15,
-        Max: 151,
-        '999thPercentile': 92.79700000000003,
-        Count: 2301,
-        '50thPercentile': 1,
-      },
+      value: 11,
     },
     {
       name: 'RequestHandlerAvgIdlePercent',
-      canonicalName:
-        'kafka.server:name=RequestHandlerAvgIdlePercent,type=KafkaRequestHandlerPool',
-      params: {
-        name: 'RequestHandlerAvgIdlePercent',
-        type: 'KafkaRequestHandlerPool',
-      },
-      value: {
-        OneMinuteRate: 0.9999008788765713,
-        FifteenMinuteRate: 0.9983845959639047,
-        Count: 9937344680371,
-        FiveMinuteRate: 0.9986337207880311,
-        MeanRate: 0.9971616923696525,
-      },
-    },
-    {
-      name: 'BytesInPerSec',
-      canonicalName:
-        'kafka.server:name=BytesInPerSec,topic=_connect_status,type=BrokerTopicMetrics',
-      params: {
-        topic: '_connect_status',
-        name: 'BytesInPerSec',
-        type: 'BrokerTopicMetrics',
-      },
-      value: {
-        OneMinuteRate: 0,
-        FifteenMinuteRate: 0,
-        Count: 0,
-        FiveMinuteRate: 0,
-        MeanRate: 0,
-      },
-    },
-    {
-      name: 'FetchMessageConversionsPerSec',
-      canonicalName:
-        'kafka.server:name=FetchMessageConversionsPerSec,topic=__consumer_offsets,type=BrokerTopicMetrics',
-      params: {
-        topic: '__consumer_offsets',
-        name: 'FetchMessageConversionsPerSec',
-        type: 'BrokerTopicMetrics',
-      },
-      value: {
-        OneMinuteRate: 0,
-        FifteenMinuteRate: 0,
-        Count: 0,
-        FiveMinuteRate: 0,
-        MeanRate: 0,
-      },
-    },
-    {
-      name: 'TotalProduceRequestsPerSec',
-      canonicalName:
-        'kafka.server:name=TotalProduceRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics',
-      params: {
-        topic: '_connect_status',
-        name: 'TotalProduceRequestsPerSec',
-        type: 'BrokerTopicMetrics',
-      },
-      value: {
-        OneMinuteRate: 0,
-        FifteenMinuteRate: 0,
-        Count: 0,
-        FiveMinuteRate: 0,
-        MeanRate: 0,
-      },
-    },
-    {
-      name: 'MaxLag',
-      canonicalName:
-        'kafka.server:clientId=Replica,name=MaxLag,type=ReplicaFetcherManager',
-      params: {
-        clientId: 'Replica',
-        name: 'MaxLag',
-        type: 'ReplicaFetcherManager',
-      },
-      value: {
-        Value: 0,
-      },
-    },
-    {
-      name: 'UnderMinIsrPartitionCount',
-      canonicalName:
-        'kafka.server:name=UnderMinIsrPartitionCount,type=ReplicaManager',
-      params: {
-        name: 'UnderMinIsrPartitionCount',
-        type: 'ReplicaManager',
-      },
-      value: {
-        Value: 0,
-      },
-    },
-    {
-      name: 'ZooKeeperDisconnectsPerSec',
-      canonicalName:
-        'kafka.server:name=ZooKeeperDisconnectsPerSec,type=SessionExpireListener',
-      params: {
-        name: 'ZooKeeperDisconnectsPerSec',
-        type: 'SessionExpireListener',
-      },
-      value: {
-        OneMinuteRate: 0,
-        FifteenMinuteRate: 0,
-        Count: 0,
-        FiveMinuteRate: 0,
-        MeanRate: 0,
-      },
-    },
-    {
-      name: 'BytesInPerSec',
-      canonicalName:
-        'kafka.server:name=BytesInPerSec,topic=__confluent.support.metrics,type=BrokerTopicMetrics',
-      params: {
-        topic: '__confluent.support.metrics',
-        name: 'BytesInPerSec',
-        type: 'BrokerTopicMetrics',
-      },
-      value: {
-        OneMinuteRate: 3.093893673470914e-70,
-        FifteenMinuteRate: 0.004057932469784932,
-        Count: 1263,
-        FiveMinuteRate: 1.047243693828501e-12,
-        MeanRate: 0.12704831069266603,
-      },
     },
   ],
 };
 export const transformedBrokerMetricsPayload =
-  '{"segmentSize":23,"segmentCount":23,"metrics":[{"name":"TotalFetchRequestsPerSec","canonicalName":"kafka.server:name=TotalFetchRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics","params":{"topic":"_connect_status","name":"TotalFetchRequestsPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":19.408369293127542,"FifteenMinuteRate":19.44631556589501,"Count":191615,"FiveMinuteRate":19.464393718807774,"MeanRate":19.4233855043407}},{"name":"ZooKeeperRequestLatencyMs","canonicalName":"kafka.server:name=ZooKeeperRequestLatencyMs,type=ZooKeeperClientMetrics","params":{"name":"ZooKeeperRequestLatencyMs","type":"ZooKeeperClientMetrics"},"value":{"Mean":4.907351022183558,"StdDev":10.589608223906348,"75thPercentile":2,"98thPercentile":10,"Min":0,"95thPercentile":5,"99thPercentile":15,"Max":151,"999thPercentile":92.79700000000003,"Count":2301,"50thPercentile":1}},{"name":"RequestHandlerAvgIdlePercent","canonicalName":"kafka.server:name=RequestHandlerAvgIdlePercent,type=KafkaRequestHandlerPool","params":{"name":"RequestHandlerAvgIdlePercent","type":"KafkaRequestHandlerPool"},"value":{"OneMinuteRate":0.9999008788765713,"FifteenMinuteRate":0.9983845959639047,"Count":9937344680371,"FiveMinuteRate":0.9986337207880311,"MeanRate":0.9971616923696525}},{"name":"BytesInPerSec","canonicalName":"kafka.server:name=BytesInPerSec,topic=_connect_status,type=BrokerTopicMetrics","params":{"topic":"_connect_status","name":"BytesInPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":0,"FifteenMinuteRate":0,"Count":0,"FiveMinuteRate":0,"MeanRate":0}},{"name":"FetchMessageConversionsPerSec","canonicalName":"kafka.server:name=FetchMessageConversionsPerSec,topic=__consumer_offsets,type=BrokerTopicMetrics","params":{"topic":"__consumer_offsets","name":"FetchMessageConversionsPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":0,"FifteenMinuteRate":0,"Count":0,"FiveMinuteRate":0,"MeanRate":0}},{"name":"TotalProduceRequestsPerSec","canonicalName":"kafka.server:name=TotalProduceRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics","params":{"topic":"_connect_status","name":"TotalProduceRequestsPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":0,"FifteenMinuteRate":0,"Count":0,"FiveMinuteRate":0,"MeanRate":0}},{"name":"MaxLag","canonicalName":"kafka.server:clientId=Replica,name=MaxLag,type=ReplicaFetcherManager","params":{"clientId":"Replica","name":"MaxLag","type":"ReplicaFetcherManager"},"value":{"Value":0}},{"name":"UnderMinIsrPartitionCount","canonicalName":"kafka.server:name=UnderMinIsrPartitionCount,type=ReplicaManager","params":{"name":"UnderMinIsrPartitionCount","type":"ReplicaManager"},"value":{"Value":0}},{"name":"ZooKeeperDisconnectsPerSec","canonicalName":"kafka.server:name=ZooKeeperDisconnectsPerSec,type=SessionExpireListener","params":{"name":"ZooKeeperDisconnectsPerSec","type":"SessionExpireListener"},"value":{"OneMinuteRate":0,"FifteenMinuteRate":0,"Count":0,"FiveMinuteRate":0,"MeanRate":0}},{"name":"BytesInPerSec","canonicalName":"kafka.server:name=BytesInPerSec,topic=__confluent.support.metrics,type=BrokerTopicMetrics","params":{"topic":"__confluent.support.metrics","name":"BytesInPerSec","type":"BrokerTopicMetrics"},"value":{"OneMinuteRate":3.093893673470914e-70,"FifteenMinuteRate":0.004057932469784932,"Count":1263,"FiveMinuteRate":1.047243693828501e-12,"MeanRate":0.12704831069266603}}]}';
+  '{"segmentSize":23,"segmentCount":23,"metrics":[{"name":"TotalFetchRequestsPerSec","labels":{"canonicalName":"kafka.server:name=TotalFetchRequestsPerSec,topic=_connect_status,type=BrokerTopicMetrics"},"value":10},{"name":"ZooKeeperRequestLatencyMs","value":11},{"name":"RequestHandlerAvgIdlePercent"}]}';

From 81072541a8aab5271c63ae168f44e3ac86fcce16 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Sat, 29 Oct 2022 22:45:21 +0400
Subject: [PATCH 245/734] [FE] Update readme (#2843)

---
 kafka-ui-react-app/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/README.md b/kafka-ui-react-app/README.md
index 8e5ea6ebf3b..8ab814cd1d5 100644
--- a/kafka-ui-react-app/README.md
+++ b/kafka-ui-react-app/README.md
@@ -66,4 +66,4 @@ pnpm start
 ```
 ## Links
 
-* [Create React App](https://github.com/facebook/create-react-app)
+* [Vite](https://github.com/vitejs/vite)

From 9a3cbfa14b8864bee4cfa91c2b00e57be28ad59a Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Sun, 30 Oct 2022 21:59:49 +0400
Subject: [PATCH 246/734] ISSUE-2787: Setting default config values properly
 (#2788)

ISSUE-2787:
1. Getting topic config defaults from server response
2. rm KafkaConstants
3. doc field added to TopicConfigDTO
4. ReactiveAdminClient.SupportedFeature refactor
---
 .../kafka/ui/model/InternalTopicConfig.java   | 21 ++++--
 .../kafka/ui/service/ReactiveAdminClient.java | 43 ++++++++----
 .../kafka/ui/service/TopicsService.java       |  4 +-
 .../provectus/kafka/ui/util/ClusterUtil.java  |  0
 .../kafka/ui/util/KafkaConstants.java         | 65 -------------------
 .../kafka/ui/KafkaConsumerTests.java          |  6 +-
 .../main/resources/swagger/kafka-ui-api.yaml  |  2 +
 7 files changed, 51 insertions(+), 90 deletions(-)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaConstants.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConfig.java
index 294894ebc2f..d061dd49813 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConfig.java
@@ -1,8 +1,5 @@
 package com.provectus.kafka.ui.model;
 
-import static com.provectus.kafka.ui.util.KafkaConstants.TOPIC_DEFAULT_CONFIGS;
-import static org.apache.kafka.common.config.TopicConfig.MESSAGE_FORMAT_VERSION_CONFIG;
-
 import java.util.List;
 import lombok.Builder;
 import lombok.Data;
@@ -19,6 +16,7 @@ public class InternalTopicConfig {
   private final boolean isSensitive;
   private final boolean isReadOnly;
   private final List<ConfigEntry.ConfigSynonym> synonyms;
+  private final String doc;
 
   public static InternalTopicConfig from(ConfigEntry configEntry) {
     InternalTopicConfig.InternalTopicConfigBuilder builder = InternalTopicConfig.builder()
@@ -27,11 +25,22 @@ public static InternalTopicConfig from(ConfigEntry configEntry) {
         .source(configEntry.source())
         .isReadOnly(configEntry.isReadOnly())
         .isSensitive(configEntry.isSensitive())
-        .synonyms(configEntry.synonyms());
-    if (configEntry.name().equals(MESSAGE_FORMAT_VERSION_CONFIG)) {
+        .synonyms(configEntry.synonyms())
+        .doc(configEntry.documentation());
+
+    if (configEntry.source() == ConfigEntry.ConfigSource.DEFAULT_CONFIG) {
+      // this is important case, because for some configs like "confluent.*" no synonyms returned, but
+      // they are set by default and "source" == DEFAULT_CONFIG
       builder.defaultValue(configEntry.value());
     } else {
-      builder.defaultValue(TOPIC_DEFAULT_CONFIGS.get(configEntry.name()));
+      // normally by default first entity of synonyms values will be used.
+      configEntry.synonyms().stream()
+          // skipping DYNAMIC_TOPIC_CONFIG value - which is explicitly set value when
+          // topic was created (not default), see ConfigEntry.synonyms() doc
+          .filter(s -> s.source() != ConfigEntry.ConfigSource.DYNAMIC_TOPIC_CONFIG)
+          .map(ConfigEntry.ConfigSynonym::value)
+          .findFirst()
+          .ifPresent(builder::defaultValue);
     }
     return builder.build();
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index c08b839410e..463e2d9b6c6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -12,6 +12,7 @@
 import com.provectus.kafka.ui.util.NumberUtil;
 import java.io.Closeable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -69,8 +70,24 @@
 public class ReactiveAdminClient implements Closeable {
 
   private enum SupportedFeature {
-    INCREMENTAL_ALTER_CONFIGS,
-    ALTER_CONFIGS
+    INCREMENTAL_ALTER_CONFIGS(2.3f),
+    CONFIG_DOCUMENTATION_RETRIEVAL(2.6f);
+
+    private final float sinceVersion;
+
+    SupportedFeature(float sinceVersion) {
+      this.sinceVersion = sinceVersion;
+    }
+
+    static Set<SupportedFeature> forVersion(float kafkaVersion) {
+      return Arrays.stream(SupportedFeature.values())
+          .filter(f -> kafkaVersion >= f.sinceVersion)
+          .collect(Collectors.toSet());
+    }
+
+    static Set<SupportedFeature> defaultFeatures() {
+      return Set.of();
+    }
   }
 
   @Value
@@ -88,18 +105,15 @@ public static Mono<ReactiveAdminClient> create(AdminClient adminClient) {
             new ReactiveAdminClient(
                 adminClient,
                 ver,
-                Set.of(getSupportedUpdateFeatureForVersion(ver))));
+                getSupportedUpdateFeaturesForVersion(ver)));
   }
 
-  private static SupportedFeature getSupportedUpdateFeatureForVersion(String versionStr) {
+  private static Set<SupportedFeature> getSupportedUpdateFeaturesForVersion(String versionStr) {
     try {
       float version = NumberUtil.parserClusterVersion(versionStr);
-      return version <= 2.3f
-          ? SupportedFeature.ALTER_CONFIGS
-          : SupportedFeature.INCREMENTAL_ALTER_CONFIGS;
+      return SupportedFeature.forVersion(version);
     } catch (NumberFormatException e) {
-      log.info("Assuming non-incremental alter configs due to version parsing error");
-      return SupportedFeature.ALTER_CONFIGS;
+      return SupportedFeature.defaultFeatures();
     }
   }
 
@@ -145,20 +159,21 @@ public String getVersion() {
   }
 
   public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig() {
-    return listTopics(true).flatMap(this::getTopicsConfig);
+    return listTopics(true).flatMap(topics -> getTopicsConfig(topics, false));
   }
 
-  public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig(Collection<String> topicNames) {
+  public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig(Collection<String> topicNames, boolean includeDoc) {
+    var includeDocFixed = features.contains(SupportedFeature.CONFIG_DOCUMENTATION_RETRIEVAL) && includeDoc;
     // we need to partition calls, because it can lead to AdminClient timeouts in case of large topics count
     return partitionCalls(
         topicNames,
         200,
-        this::getTopicsConfigImpl,
+        part -> getTopicsConfigImpl(part, includeDocFixed),
         (m1, m2) -> ImmutableMap.<String, List<ConfigEntry>>builder().putAll(m1).putAll(m2).build()
     );
   }
 
-  private Mono<Map<String, List<ConfigEntry>>> getTopicsConfigImpl(Collection<String> topicNames) {
+  private Mono<Map<String, List<ConfigEntry>>> getTopicsConfigImpl(Collection<String> topicNames, boolean includeDoc) {
     List<ConfigResource> resources = topicNames.stream()
         .map(topicName -> new ConfigResource(ConfigResource.Type.TOPIC, topicName))
         .collect(toList());
@@ -166,7 +181,7 @@ private Mono<Map<String, List<ConfigEntry>>> getTopicsConfigImpl(Collection<Stri
     return toMonoWithExceptionFilter(
         client.describeConfigs(
             resources,
-            new DescribeConfigsOptions().includeSynonyms(true)).values(),
+            new DescribeConfigsOptions().includeSynonyms(true).includeDocumentation(includeDoc)).values(),
         UnknownTopicOrPartitionException.class
     ).map(config -> config.entrySet().stream()
         .collect(toMap(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 2dffe0de75e..8badcebc360 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -68,7 +68,7 @@ public Mono<List<InternalTopic>> loadTopics(KafkaCluster c, List<String> topics)
     }
     return adminClientService.get(c)
         .flatMap(ac ->
-            ac.describeTopics(topics).zipWith(ac.getTopicsConfig(topics),
+            ac.describeTopics(topics).zipWith(ac.getTopicsConfig(topics, false),
                 (descriptions, configs) -> {
                   statisticsCache.update(c, descriptions, configs);
                   return getPartitionOffsets(descriptions, ac).map(offsets -> {
@@ -160,7 +160,7 @@ public Mono<InternalTopic> getTopicDetails(KafkaCluster cluster, String topicNam
 
   public Mono<List<ConfigEntry>> getTopicConfigs(KafkaCluster cluster, String topicName) {
     return adminClientService.get(cluster)
-        .flatMap(ac -> ac.getTopicsConfig(List.of(topicName)))
+        .flatMap(ac -> ac.getTopicsConfig(List.of(topicName), true))
         .map(m -> m.values().stream().findFirst().orElseThrow(TopicNotFoundException::new));
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ClusterUtil.java
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaConstants.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaConstants.java
deleted file mode 100644
index aa482c57b59..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaConstants.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import static org.apache.kafka.common.config.TopicConfig.CLEANUP_POLICY_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.CLEANUP_POLICY_DELETE;
-import static org.apache.kafka.common.config.TopicConfig.COMPRESSION_TYPE_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.DELETE_RETENTION_MS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.FILE_DELETE_DELAY_MS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.FLUSH_MESSAGES_INTERVAL_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.FLUSH_MS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.INDEX_INTERVAL_BYTES_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.MAX_COMPACTION_LAG_MS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.MAX_MESSAGE_BYTES_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.MESSAGE_DOWNCONVERSION_ENABLE_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.MESSAGE_TIMESTAMP_TYPE_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.MIN_CLEANABLE_DIRTY_RATIO_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.MIN_COMPACTION_LAG_MS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.MIN_IN_SYNC_REPLICAS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.PREALLOCATE_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.RETENTION_BYTES_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.RETENTION_MS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.SEGMENT_BYTES_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.SEGMENT_INDEX_BYTES_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.SEGMENT_JITTER_MS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.SEGMENT_MS_CONFIG;
-import static org.apache.kafka.common.config.TopicConfig.UNCLEAN_LEADER_ELECTION_ENABLE_CONFIG;
-
-import java.util.AbstractMap;
-import java.util.Map;
-
-public final class KafkaConstants {
-
-  private static final String LONG_MAX_STRING = Long.toString(Long.MAX_VALUE);
-
-  public static final Map<String, String> TOPIC_DEFAULT_CONFIGS = Map.ofEntries(
-      new AbstractMap.SimpleEntry<>(CLEANUP_POLICY_CONFIG, CLEANUP_POLICY_DELETE),
-      new AbstractMap.SimpleEntry<>(COMPRESSION_TYPE_CONFIG, "producer"),
-      new AbstractMap.SimpleEntry<>(DELETE_RETENTION_MS_CONFIG, "86400000"),
-      new AbstractMap.SimpleEntry<>(FILE_DELETE_DELAY_MS_CONFIG, "60000"),
-      new AbstractMap.SimpleEntry<>(FLUSH_MESSAGES_INTERVAL_CONFIG, LONG_MAX_STRING),
-      new AbstractMap.SimpleEntry<>(FLUSH_MS_CONFIG, LONG_MAX_STRING),
-      new AbstractMap.SimpleEntry<>("follower.replication.throttled.replicas", ""),
-      new AbstractMap.SimpleEntry<>(INDEX_INTERVAL_BYTES_CONFIG, "4096"),
-      new AbstractMap.SimpleEntry<>("leader.replication.throttled.replicas", ""),
-      new AbstractMap.SimpleEntry<>(MAX_COMPACTION_LAG_MS_CONFIG, LONG_MAX_STRING),
-      new AbstractMap.SimpleEntry<>(MAX_MESSAGE_BYTES_CONFIG, "1000012"),
-      new AbstractMap.SimpleEntry<>(MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS_CONFIG, LONG_MAX_STRING),
-      new AbstractMap.SimpleEntry<>(MESSAGE_TIMESTAMP_TYPE_CONFIG, "CreateTime"),
-      new AbstractMap.SimpleEntry<>(MIN_CLEANABLE_DIRTY_RATIO_CONFIG, "0.5"),
-      new AbstractMap.SimpleEntry<>(MIN_COMPACTION_LAG_MS_CONFIG, "0"),
-      new AbstractMap.SimpleEntry<>(MIN_IN_SYNC_REPLICAS_CONFIG, "1"),
-      new AbstractMap.SimpleEntry<>(PREALLOCATE_CONFIG, "false"),
-      new AbstractMap.SimpleEntry<>(RETENTION_BYTES_CONFIG, "-1"),
-      new AbstractMap.SimpleEntry<>(RETENTION_MS_CONFIG, "604800000"),
-      new AbstractMap.SimpleEntry<>(SEGMENT_BYTES_CONFIG, "1073741824"),
-      new AbstractMap.SimpleEntry<>(SEGMENT_INDEX_BYTES_CONFIG, "10485760"),
-      new AbstractMap.SimpleEntry<>(SEGMENT_JITTER_MS_CONFIG, "0"),
-      new AbstractMap.SimpleEntry<>(SEGMENT_MS_CONFIG, "604800000"),
-      new AbstractMap.SimpleEntry<>(UNCLEAN_LEADER_ELECTION_ENABLE_CONFIG, "false"),
-      new AbstractMap.SimpleEntry<>(MESSAGE_DOWNCONVERSION_ENABLE_CONFIG, "true")
-  );
-
-  private KafkaConstants() {
-  }
-}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerTests.java
index d248edf5e8c..ff11aa6656a 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerTests.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConsumerTests.java
@@ -3,10 +3,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.http.MediaType.TEXT_EVENT_STREAM;
 
-import com.provectus.kafka.ui.api.model.TopicConfig;
 import com.provectus.kafka.ui.model.BrokerConfigDTO;
 import com.provectus.kafka.ui.model.PartitionsIncreaseDTO;
 import com.provectus.kafka.ui.model.PartitionsIncreaseResponseDTO;
+import com.provectus.kafka.ui.model.TopicConfigDTO;
 import com.provectus.kafka.ui.model.TopicCreationDTO;
 import com.provectus.kafka.ui.model.TopicDetailsDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
@@ -206,12 +206,12 @@ public void shouldRetrieveTopicConfig() {
             .expectStatus()
             .isOk();
 
-    List<TopicConfig> configs = webTestClient.get()
+    List<TopicConfigDTO> configs = webTestClient.get()
             .uri("/api/clusters/{clusterName}/topics/{topicName}/config", LOCAL, topicName)
             .exchange()
             .expectStatus()
             .isOk()
-            .expectBodyList(TopicConfig.class)
+            .expectBodyList(TopicConfigDTO.class)
             .returnResult()
             .getResponseBody();
 
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index c4765fb2202..6a71863c7e8 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2213,6 +2213,8 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/ConfigSynonym"
+        doc:
+          type: string
       required:
         - name
 

From 2f2e19d1bce41ec8c0f867b20b4c72b20f764bf0 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 31 Oct 2022 12:46:27 +0400
Subject: [PATCH 247/734] Fix topic internal indication (#2846)

---
 .../main/java/com/provectus/kafka/ui/model/InternalTopic.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
index b669d0db414..a553165de4d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
@@ -42,9 +42,7 @@ public static InternalTopic from(TopicDescription topicDescription,
                                    Metrics metrics,
                                    InternalLogDirStats logDirInfo) {
     var topic = InternalTopic.builder();
-    topic.internal(
-        topicDescription.isInternal() || topicDescription.name().startsWith("_")
-    );
+    topic.internal(topicDescription.isInternal());
     topic.name(topicDescription.name());
 
     List<InternalPartition> partitions = topicDescription.partitions().stream()

From a8ccbc96c8196038c4e7c16936a5616b3e761e59 Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Mon, 31 Oct 2022 16:49:36 +0800
Subject: [PATCH 248/734] Upgrade kafka in compose files (#2601) (#2777)

* Upgrade kafka in compose files (#2601)

* Fix compose files (#2601)

* Fix arm64 compose file (#2601)
---
 docker-compose.md                             |   2 -
 documentation/compose/DOCKER_COMPOSE.md       |   1 +
 documentation/compose/auth-ldap.yaml          |  55 +++-----
 documentation/compose/e2e-tests.yaml          |  55 ++++----
 .../compose/kafka-cluster-sr-auth.yaml        |  71 ++++++----
 .../compose/kafka-clusters-only.yaml          | 132 +++++-------------
 documentation/compose/kafka-ssl.yml           |  46 +++---
 documentation/compose/kafka-ui-arm64.yaml     |  32 ++---
 .../compose/kafka-ui-auth-context.yaml        |  60 ++++----
 .../compose/kafka-ui-connectors-auth.yaml     |  97 ++++---------
 .../compose/kafka-ui-jmx-secured.yml          |  58 ++++----
 documentation/compose/kafka-ui-sasl.yaml      |  55 ++++----
 .../compose/kafka-ui-with-jmx-exporter.yaml   |  41 +++---
 documentation/compose/kafka-ui.yaml           | 107 +++++++-------
 .../compose/kafka-with-zookeeper.yaml         |  48 +++++++
 documentation/compose/scripts/clusterID       |   1 +
 .../compose/scripts/create_cluster_id.sh      |   1 +
 .../compose/scripts/update_run_cluster.sh     |  11 ++
 documentation/guides/SSO.md                   |   1 -
 19 files changed, 412 insertions(+), 462 deletions(-)
 create mode 100644 documentation/compose/kafka-with-zookeeper.yaml
 create mode 100644 documentation/compose/scripts/clusterID
 create mode 100644 documentation/compose/scripts/create_cluster_id.sh
 create mode 100644 documentation/compose/scripts/update_run_cluster.sh

diff --git a/docker-compose.md b/docker-compose.md
index d3912c67151..154882351c7 100644
--- a/docker-compose.md
+++ b/docker-compose.md
@@ -17,7 +17,6 @@ services:
     environment:
       - KAFKA_CLUSTERS_0_NAME=local
       - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092
-      - KAFKA_CLUSTERS_0_ZOOKEEPER=localhost:2181
 ```
 
 * If you prefer UI for Apache Kafka in read only mode
@@ -34,7 +33,6 @@ services:
     environment:
       - KAFKA_CLUSTERS_0_NAME=local
       - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092
-      - KAFKA_CLUSTERS_0_ZOOKEEPER=localhost:2181
       - KAFKA_CLUSTERS_0_READONLY=true
 ```
   
diff --git a/documentation/compose/DOCKER_COMPOSE.md b/documentation/compose/DOCKER_COMPOSE.md
index c380c99173b..00f54101bde 100644
--- a/documentation/compose/DOCKER_COMPOSE.md
+++ b/documentation/compose/DOCKER_COMPOSE.md
@@ -13,3 +13,4 @@
 11. [kafka-ui-traefik-proxy.yaml](./kafka-ui-traefik-proxy.yaml) - Traefik specific proxy configuration.
 12. [oauth-cognito.yaml](./oauth-cognito.yaml) - OAuth2 with Cognito
 13. [kafka-ui-with-jmx-exporter.yaml](./kafka-ui-with-jmx-exporter.yaml) - A configuration with 2 kafka clusters with enabled prometheus jmx exporters instead of jmx.
+14. [kafka-with-zookeeper.yaml](./kafka-with-zookeeper.yaml) - An example for using kafka with zookeeper
\ No newline at end of file
diff --git a/documentation/compose/auth-ldap.yaml b/documentation/compose/auth-ldap.yaml
index 4d296927c92..0e2f6337d8f 100644
--- a/documentation/compose/auth-ldap.yaml
+++ b/documentation/compose/auth-ldap.yaml
@@ -8,24 +8,13 @@ services:
     ports:
       - 8080:8080
     depends_on:
-      - zookeeper0
       - kafka0
       - schemaregistry0
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
-      KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
       KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
-      KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
-      KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
-      KAFKA_CLUSTERS_1_NAME: secondLocal
-      KAFKA_CLUSTERS_1_BOOTSTRAPSERVERS: kafka1:29092
-      KAFKA_CLUSTERS_1_ZOOKEEPER: zookeeper1:2181
-      KAFKA_CLUSTERS_1_METRICS_PORT: 9998
-      KAFKA_CLUSTERS_1_SCHEMAREGISTRY: http://schemaregistry1:8085
-      KAFKA_CLUSTERS_1_KAFKACONNECT_0_NAME: first
-      KAFKA_CLUSTERS_1_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       AUTH_TYPE: "LDAP"
       SPRING_LDAP_URLS: "ldap://ldap:10389"
       SPRING_LDAP_DN_PATTERN: "cn={0},ou=people,dc=planetexpress,dc=com"
@@ -47,41 +36,43 @@ services:
     image: rroemhild/test-openldap:latest
     hostname: "ldap"
 
-  zookeeper0:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2181:2181
-
   kafka0:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper0
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka0
+    container_name: kafka0
     ports:
-      - 9092:9092
-      - 9997:9997
+      - "9092:9092"
+      - "9997:9997"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      JMX_PORT: 9997
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
       KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+    volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   schemaregistry0:
-    image: confluentinc/cp-schema-registry:5.5.0
+    image: confluentinc/cp-schema-registry:7.2.1
     ports:
       - 8085:8085
     depends_on:
-      - zookeeper0
       - kafka0
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper0:2181
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
       SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
       SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
diff --git a/documentation/compose/e2e-tests.yaml b/documentation/compose/e2e-tests.yaml
index e09ec517d2a..205e6ec1d8a 100644
--- a/documentation/compose/e2e-tests.yaml
+++ b/documentation/compose/e2e-tests.yaml
@@ -8,57 +8,55 @@ services:
     ports:
       - 8080:8080
     depends_on:
-      - zookeeper0
       - kafka0
       - schemaregistry0
       - kafka-connect0
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
-      KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
       KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       KAFKA_CLUSTERS_0_KSQLDBSERVER: http://ksqldb:8088
 
-  zookeeper0:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2181:2181
-
   kafka0:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper0
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka0
+    container_name: kafka0
     ports:
-      - 9092:9092
-      - 9997:9997
+      - "9092:9092"
+      - "9997:9997"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
       KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
       KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
-      JMX_PORT: 9997
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
       KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+    volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   schemaregistry0:
-    image: confluentinc/cp-schema-registry:5.5.0
+    image: confluentinc/cp-schema-registry:7.2.1
     ports:
       - 8085:8085
     depends_on:
-      - zookeeper0
       - kafka0
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper0:2181
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
       SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
       SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
@@ -98,17 +96,16 @@ services:
 #      AWS_SECRET_ACCESS_KEY: ""
 
   kafka-init-topics:
-    image: confluentinc/cp-kafka:5.3.1
+    image: confluentinc/cp-kafka:7.2.1
     volumes:
       - ./message.json:/data/message.json
     depends_on:
       - kafka0
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
-               cub kafka-ready -b kafka1:29092 1 30 && \
-               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-topics --create --topic second.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper0:2181 && \
-               kafka-console-producer --broker-list kafka1:29092 -topic second.users < /data/message.json'"
+               cub kafka-ready -b kafka0:29092 1 30 && \
+               kafka-topics --create --topic users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+               kafka-topics --create --topic messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+               kafka-console-producer --bootstrap-server kafka0:29092 --topic users < /data/message.json'"
 
   postgres-db:
     build:
diff --git a/documentation/compose/kafka-cluster-sr-auth.yaml b/documentation/compose/kafka-cluster-sr-auth.yaml
index 6dbcb12e361..bf52f33d889 100644
--- a/documentation/compose/kafka-cluster-sr-auth.yaml
+++ b/documentation/compose/kafka-cluster-sr-auth.yaml
@@ -2,43 +2,44 @@
 version: '2'
 services:
 
-  zookeeper1:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2182:2181
-
   kafka1:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper1
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka1
+    container_name: kafka1
+    ports:
+      - "9092:9092"
+      - "9997:9997"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper1:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka1:29092,PLAINTEXT_HOST://localhost:9093
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka1:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      JMX_PORT: 9998
-      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.rmi.port=9998
-    ports:
-      - 9093:9093
-      - 9998:9998 
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka1:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka1:29092,CONTROLLER://kafka1:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+    volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   schemaregistry1:
-    image: confluentinc/cp-schema-registry:5.5.0
+    image: confluentinc/cp-schema-registry:7.2.1
     ports:
       - 18085:8085
     depends_on:
-      - zookeeper1
       - kafka1
     volumes:
       - ./jaas:/conf
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka1:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper1:2181
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
       SCHEMA_REGISTRY_HOST_NAME: schemaregistry1
       SCHEMA_REGISTRY_LISTENERS: http://schemaregistry1:8085
@@ -54,13 +55,29 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
   kafka-init-topics:
-    image: confluentinc/cp-kafka:5.3.1
+    image: confluentinc/cp-kafka:7.2.1
     volumes:
        - ./message.json:/data/message.json
     depends_on:
       - kafka1
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
                cub kafka-ready -b kafka1:29092 1 30 && \
-               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-topics --create --topic second.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-console-producer --broker-list kafka1:29092 -topic second.users < /data/message.json'"
+               kafka-topics --create --topic users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka1:29092 && \
+               kafka-topics --create --topic messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka1:29092 && \
+               kafka-console-producer --bootstrap-server kafka1:29092 --topic users < /data/message.json'"
+
+  kafka-ui:
+    container_name: kafka-ui
+    image: provectuslabs/kafka-ui:latest
+    ports:
+      - 8080:8080
+    depends_on:
+      - kafka1
+      - schemaregistry1
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka1:29092
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9997
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry1:8085
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME: admin
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_PASSWORD: letmein
\ No newline at end of file
diff --git a/documentation/compose/kafka-clusters-only.yaml b/documentation/compose/kafka-clusters-only.yaml
index 1e51dd5a4c9..b6a84ee92b2 100644
--- a/documentation/compose/kafka-clusters-only.yaml
+++ b/documentation/compose/kafka-clusters-only.yaml
@@ -1,83 +1,41 @@
 ---
-version: '2'
+version: "2"
 services:
-
-  zookeeper0:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-    - 2181:2181
-
   kafka0:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper0
-    environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 2
-      JMX_PORT: 9997
-      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.rmi.port=9997
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka0
+    container_name: kafka0
     ports:
-      - 9092:9092
-      - 9997:9997
-
-  kafka01:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper0
-    environment:
-      KAFKA_BROKER_ID: 2
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka01:29092,PLAINTEXT_HOST://localhost:9094
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,PLAIN:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 2
-      JMX_PORT: 9999
-      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.rmi.port=9999
-    ports:
-      - 9094:9094
-      - 9999:9999
-
-  zookeeper1:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2182:2181
-
-  kafka1:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper1
+      - "9092:9092"
+      - "9997:9997"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper1:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka1:29092,PLAINTEXT_HOST://localhost:9093
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT"
+      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092"
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      JMX_PORT: 9998
-      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote.rmi.port=9998
-    ports:
-      - 9093:9093
-      - 9998:9998 
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_PROCESS_ROLES: "broker,controller"
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: "1@kafka0:29093"
+      KAFKA_LISTENERS: "PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "PLAINTEXT"
+      KAFKA_CONTROLLER_LISTENER_NAMES: "CONTROLLER"
+      KAFKA_LOG_DIRS: "/tmp/kraft-combined-logs"
+    volumes:
+      - ./scripts/update_run_cluster.sh:/tmp/update_run.sh
+      - ./scripts/clusterID:/tmp/clusterID
+    command: 'bash -c ''if [ ! -f /tmp/update_run.sh ]; then echo "ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'''
 
   schemaregistry0:
-    image: confluentinc/cp-schema-registry:5.5.0
+    image: confluentinc/cp-schema-registry:7.2.1
     depends_on:
-      - zookeeper0
       - kafka0
-      - kafka01
     environment:
-      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092,PLAINTEXT://kafka01:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper0:2181
+      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
       SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
       SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
@@ -86,28 +44,10 @@ services:
       SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
     ports:
-    - 8085:8085
-
-  schemaregistry1:
-    image: confluentinc/cp-schema-registry:5.5.0
-    ports:
-      - 18085:8085
-    depends_on:
-      - zookeeper1
-      - kafka1
-    environment:
-      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka1:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper1:2181
-      SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
-      SCHEMA_REGISTRY_HOST_NAME: schemaregistry1
-      SCHEMA_REGISTRY_LISTENERS: http://schemaregistry1:8085
-
-      SCHEMA_REGISTRY_SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: "http"
-      SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
-      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
+      - 8085:8085
 
   kafka-connect0:
-    image: confluentinc/cp-kafka-connect:6.0.1
+    image: confluentinc/cp-kafka-connect:7.2.1
     ports:
       - 8083:8083
     depends_on:
@@ -131,16 +71,14 @@ services:
       CONNECT_REST_ADVERTISED_HOST_NAME: kafka-connect0
       CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
 
-
   kafka-init-topics:
-    image: confluentinc/cp-kafka:5.3.1
+    image: confluentinc/cp-kafka:7.2.1
     volumes:
-       - ./message.json:/data/message.json
+      - ./message.json:/data/message.json
     depends_on:
-      - kafka1
+      - kafka0
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
-               cub kafka-ready -b kafka1:29092 1 30 && \
-               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-topics --create --topic second.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper0:2181 && \
-               kafka-console-producer --broker-list kafka1:29092 -topic second.users < /data/message.json'"
+      cub kafka-ready -b kafka0:29092 1 30 && \
+      kafka-topics --create --topic users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+      kafka-topics --create --topic messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+      kafka-console-producer --bootstrap-server kafka0:29092 --topic users < /data/message.json'"
diff --git a/documentation/compose/kafka-ssl.yml b/documentation/compose/kafka-ssl.yml
index 2b6dae855ae..4fc7daebfff 100644
--- a/documentation/compose/kafka-ssl.yml
+++ b/documentation/compose/kafka-ssl.yml
@@ -7,13 +7,11 @@ services:
     ports:
       - 8080:8080
     depends_on:
-      - zookeeper0
-      - kafka0
+      - kafka
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SSL
-      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092 # SSL LISTENER!
-      KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:29092 # SSL LISTENER!
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_LOCATION: /kafka.truststore.jks
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_PASSWORD: secret
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_LOCATION: /kafka.keystore.jks
@@ -23,28 +21,30 @@ services:
       - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
       - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
 
-  zookeeper0:
-    image: confluentinc/cp-zookeeper:6.0.1
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2181:2181
-
-  kafka0:
-    image: confluentinc/cp-kafka:6.0.1
-    hostname: kafka0
-    depends_on:
-      - zookeeper0
+  kafka:
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka
+    container_name: kafka
     ports:
-      - '9092:9092'
+      - "9092:9092"
+      - "9997:9997"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,SSL:SSL,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'SSL://kafka:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_ADVERTISED_LISTENERS: SSL://kafka0:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: SSL:SSL,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: SSL
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_LISTENERS: 'SSL://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'SSL'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
       KAFKA_SECURITY_PROTOCOL: SSL
       KAFKA_SSL_ENABLED_MECHANISMS: PLAIN,SSL
       KAFKA_SSL_KEYSTORE_FILENAME: kafka.keystore.jks
@@ -56,6 +56,8 @@ services:
       KAFKA_SSL_CLIENT_AUTH: 'requested'
       KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # COMMON NAME VERIFICATION IS DISABLED SERVER-SIDE
     volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
       - ./ssl/creds:/etc/kafka/secrets/creds
       - ./ssl/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks
       - ./ssl/kafka.keystore.jks:/etc/kafka/secrets/kafka.keystore.jks
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
\ No newline at end of file
diff --git a/documentation/compose/kafka-ui-arm64.yaml b/documentation/compose/kafka-ui-arm64.yaml
index 70134c6b52a..bbcefecbf42 100644
--- a/documentation/compose/kafka-ui-arm64.yaml
+++ b/documentation/compose/kafka-ui-arm64.yaml
@@ -1,5 +1,3 @@
-# This compose file uses kafka cluster without zookeeper
-# Kafka without zookeeper is supported after image tag 6.2.0
 # ARM64 supported images for kafka can be found here
 # https://hub.docker.com/r/confluentinc/cp-kafka/tags?page=1&name=arm64
 ---
@@ -12,18 +10,18 @@ services:
       - 8080:8080
     depends_on:
       - kafka0
-      - schemaregistry0
+      - schema-registry0
       - kafka-connect0
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
-      KAFKA_CLUSTERS_0_JMXPORT: 9997
-      KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9997
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schema-registry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
 
   kafka0:
-    image: confluentinc/cp-kafka:7.0.5.arm64
+    image: confluentinc/cp-kafka:7.2.1.arm64
     hostname: kafka0
     container_name: kafka0
     ports:
@@ -44,14 +42,14 @@ services:
       KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
       KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
       KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
-      JMX_PORT: 9997
+      KAFKA_JMX_PORT: 9997
       KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
     volumes:
       - ./scripts/update_run.sh:/tmp/update_run.sh
     command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
-  schemaregistry0:
-    image: confluentinc/cp-schema-registry:7.0.5.arm64
+  schema-registry0:
+    image: confluentinc/cp-schema-registry:7.2.1.arm64
     ports:
       - 8085:8085
     depends_on:
@@ -59,20 +57,20 @@ services:
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
-      SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
-      SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
+      SCHEMA_REGISTRY_HOST_NAME: schema-registry0
+      SCHEMA_REGISTRY_LISTENERS: http://schema-registry0:8085
 
       SCHEMA_REGISTRY_SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: "http"
       SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
   kafka-connect0:
-    image: confluentinc/cp-kafka-connect:7.0.5.arm64
+    image: confluentinc/cp-kafka-connect:7.2.1.arm64
     ports:
       - 8083:8083
     depends_on:
       - kafka0
-      - schemaregistry0
+      - schema-registry0
     environment:
       CONNECT_BOOTSTRAP_SERVERS: kafka0:29092
       CONNECT_GROUP_ID: compose-connect-group
@@ -83,16 +81,16 @@ services:
       CONNECT_STATUS_STORAGE_TOPIC: _connect_status
       CONNECT_STATUS_STORAGE_REPLICATION_FACTOR: 1
       CONNECT_KEY_CONVERTER: org.apache.kafka.connect.storage.StringConverter
-      CONNECT_KEY_CONVERTER_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
+      CONNECT_KEY_CONVERTER_SCHEMA_REGISTRY_URL: http://schema-registry0:8085
       CONNECT_VALUE_CONVERTER: org.apache.kafka.connect.storage.StringConverter
-      CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
+      CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL: http://schema-registry0:8085
       CONNECT_INTERNAL_KEY_CONVERTER: org.apache.kafka.connect.json.JsonConverter
       CONNECT_INTERNAL_VALUE_CONVERTER: org.apache.kafka.connect.json.JsonConverter
       CONNECT_REST_ADVERTISED_HOST_NAME: kafka-connect0
       CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
 
   kafka-init-topics:
-    image: confluentinc/cp-kafka:7.0.5.arm64
+    image: confluentinc/cp-kafka:7.2.1.arm64
     volumes:
        - ./message.json:/data/message.json
     depends_on:
@@ -102,4 +100,4 @@ services:
                kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
                kafka-topics --create --topic second.messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
                kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
-               kafka-console-producer --broker-list kafka0:29092 -topic second.users < /data/message.json'"
+               kafka-console-producer --bootstrap-server kafka0:29092 --topic second.users < /data/message.json'"
diff --git a/documentation/compose/kafka-ui-auth-context.yaml b/documentation/compose/kafka-ui-auth-context.yaml
index fac1af0aa2a..69eebbfeebb 100644
--- a/documentation/compose/kafka-ui-auth-context.yaml
+++ b/documentation/compose/kafka-ui-auth-context.yaml
@@ -8,52 +8,40 @@ services:
     ports:
       - 8080:8080
     depends_on:
-      - zookeeper0
-      - kafka0
+      - kafka
     environment:
       KAFKA_CLUSTERS_0_NAME: local
-      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
-      KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:29092
       KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       SERVER_SERVLET_CONTEXT_PATH: /kafkaui
       AUTH_TYPE: "LOGIN_FORM"
       SPRING_SECURITY_USER_NAME: admin
       SPRING_SECURITY_USER_PASSWORD: pass
 
-  zookeeper0:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2181:2181
-
-  kafka0:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper0
+  kafka:
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka
+    container_name: kafka
     ports:
-      - 9092:9092
-      - 9997:9997
+      - "9092:9092"
+      - "9997:9997"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      JMX_PORT: 9997
-      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
-
-  kafka-init-topics:
-    image: confluentinc/cp-kafka:5.3.1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
     volumes:
-       - ./message.json:/data/message.json
-    depends_on:
-      - kafka0
-    command: "bash -c 'echo Waiting for Kafka to be ready... && \
-               cub kafka-ready -b kafka0:29092 1 30 && \
-               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --zookeeper zookeeper0:2181 && \
-               kafka-topics --create --topic second.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper0:2181 && \
-               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper0:2181 && \
-               kafka-console-producer --broker-list kafka0:29092 -topic second.users < /data/message.json'"
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
\ No newline at end of file
diff --git a/documentation/compose/kafka-ui-connectors-auth.yaml b/documentation/compose/kafka-ui-connectors-auth.yaml
index f6a61998029..b34c9d80864 100644
--- a/documentation/compose/kafka-ui-connectors-auth.yaml
+++ b/documentation/compose/kafka-ui-connectors-auth.yaml
@@ -1,68 +1,62 @@
 ---
-version: '2'
+version: "2"
 services:
-
   kafka-ui:
     container_name: kafka-ui
     image: provectuslabs/kafka-ui:latest
     ports:
       - 8080:8080
     depends_on:
-      - zookeeper0
-      - zookeeper1
       - kafka0
-      - kafka1
       - schemaregistry0
       - kafka-connect0
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
-      KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
       KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_USERNAME: admin
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_PASSWORD: admin-secret
-      KAFKA_CLUSTERS_0_KSQLDBSERVER: http://ksqldb:8088
-
-  zookeeper0:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2181:2181
 
   kafka0:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper0
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka0
+    container_name: kafka0
     ports:
-      - 9092:9092
-      - 9997:9997
+      - "9092:9092"
+      - "9997:9997"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT"
+      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092"
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
       KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
       KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
-      JMX_PORT: 9997
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
       KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
+      KAFKA_PROCESS_ROLES: "broker,controller"
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: "1@kafka0:29093"
+      KAFKA_LISTENERS: "PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092"
+      KAFKA_INTER_BROKER_LISTENER_NAME: "PLAINTEXT"
+      KAFKA_CONTROLLER_LISTENER_NAMES: "CONTROLLER"
+      KAFKA_LOG_DIRS: "/tmp/kraft-combined-logs"
+    volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: 'bash -c ''if [ ! -f /tmp/update_run.sh ]; then echo "ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'''
 
   schemaregistry0:
-    image: confluentinc/cp-schema-registry:5.5.0
+    image: confluentinc/cp-schema-registry:7.2.1
     ports:
       - 8085:8085
     depends_on:
-      - zookeeper0
       - kafka0
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper0:2181
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
       SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
       SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
@@ -71,7 +65,6 @@ services:
       SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
-
   kafka-connect0:
     build:
       context: ./kafka-connect
@@ -105,47 +98,17 @@ services:
       CONNECT_REST_EXTENSION_CLASSES: "org.apache.kafka.connect.rest.basic.auth.extension.BasicAuthSecurityRestExtension"
       KAFKA_OPTS: "-Djava.security.auth.login.config=/conf/kafka_connect.jaas"
 
-#      AWS_ACCESS_KEY_ID: ""
-#      AWS_SECRET_ACCESS_KEY: ""
+  #      AWS_ACCESS_KEY_ID: ""
+  #      AWS_SECRET_ACCESS_KEY: ""
 
   kafka-init-topics:
-    image: confluentinc/cp-kafka:5.3.1
+    image: confluentinc/cp-kafka:7.2.1
     volumes:
       - ./message.json:/data/message.json
-    depends_on:
-      - kafka1
-    command: "bash -c 'echo Waiting for Kafka to be ready... && \
-               cub kafka-ready -b kafka1:29092 1 30 && \
-               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-topics --create --topic second.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper0:2181 && \
-               kafka-console-producer --broker-list kafka1:29092 -topic second.users < /data/message.json'"
-
-  create-connectors:
-    image: ellerbrock/alpine-bash-curl-ssl
-    depends_on:
-      - postgres-db
-      - kafka-connect0
-    volumes:
-      - ./connectors:/connectors
-    command: bash -c '/connectors/start.sh'
-
-  ksqldb:
-    image: confluentinc/ksqldb-server:0.18.0
     depends_on:
       - kafka0
-      - kafka-connect0
-      - schemaregistry0
-    ports:
-      - 8088:8088
-    environment:
-      KSQL_CUB_KAFKA_TIMEOUT: 120
-      KSQL_LISTENERS: http://0.0.0.0:8088
-      KSQL_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
-      KSQL_KSQL_LOGGING_PROCESSING_STREAM_AUTO_CREATE: "true"
-      KSQL_KSQL_LOGGING_PROCESSING_TOPIC_AUTO_CREATE: "true"
-      KSQL_KSQL_CONNECT_URL: http://kafka-connect0:8083
-      KSQL_KSQL_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
-      KSQL_KSQL_SERVICE_ID: my_ksql_1
-      KSQL_KSQL_HIDDEN_TOPICS: '^_.*'
-      KSQL_CACHE_MAX_BYTES_BUFFERING: 0
+    command: "bash -c 'echo Waiting for Kafka to be ready... && \
+      cub kafka-ready -b kafka0:29092 1 30 && \
+      kafka-topics --create --topic users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+      kafka-topics --create --topic messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+      kafka-console-producer --bootstrap-server kafka0:29092 --topic users < /data/message.json'"
diff --git a/documentation/compose/kafka-ui-jmx-secured.yml b/documentation/compose/kafka-ui-jmx-secured.yml
index 71f61b1e554..de56a7e2c69 100644
--- a/documentation/compose/kafka-ui-jmx-secured.yml
+++ b/documentation/compose/kafka-ui-jmx-secured.yml
@@ -9,14 +9,12 @@ services:
       - 8080:8080
       - 5005:5005
     depends_on:
-      - zookeeper0
       - kafka0
       - schemaregistry0
       - kafka-connect0
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
-      KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
@@ -34,29 +32,29 @@ services:
       - ./jmx/clienttruststore:/jmx/clienttruststore
       - ./jmx/clientkeystore:/jmx/clientkeystore
 
-  zookeeper0:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2181:2181
-
   kafka0:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper0
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka0
+    container_name: kafka0
     ports:
       - 9092:9092
       - 9997:9997
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      JMX_PORT: 9997
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
       # CHMOD 700 FOR JMXREMOTE.* FILES
       KAFKA_JMX_OPTS: >-
         -Dcom.sun.management.jmxremote
@@ -75,21 +73,21 @@ services:
         -Djava.rmi.server.logCalls=true
 #        -Djavax.net.debug=ssl:handshake
     volumes:
-    - ./jmx/serverkeystore:/jmx/serverkeystore
-    - ./jmx/servertruststore:/jmx/servertruststore
-    - ./jmx/jmxremote.password:/jmx/jmxremote.password
-    - ./jmx/jmxremote.access:/jmx/jmxremote.access
+      - ./jmx/serverkeystore:/jmx/serverkeystore
+      - ./jmx/servertruststore:/jmx/servertruststore
+      - ./jmx/jmxremote.password:/jmx/jmxremote.password
+      - ./jmx/jmxremote.access:/jmx/jmxremote.access
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   schemaregistry0:
-    image: confluentinc/cp-schema-registry:5.5.0
+    image: confluentinc/cp-schema-registry:7.2.1
     ports:
       - 8085:8085
     depends_on:
-      - zookeeper0
       - kafka0
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper0:2181
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
       SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
       SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
@@ -99,7 +97,7 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
   kafka-connect0:
-    image: confluentinc/cp-kafka-connect:6.0.1
+    image: confluentinc/cp-kafka-connect:7.2.1
     ports:
       - 8083:8083
     depends_on:
@@ -124,13 +122,13 @@ services:
       CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
 
   kafka-init-topics:
-    image: confluentinc/cp-kafka:5.3.1
+    image: confluentinc/cp-kafka:7.2.1
     volumes:
       - ./message.json:/data/message.json
     depends_on:
       - kafka0
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
                cub kafka-ready -b kafka0:29092 1 30 && \
-               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --zookeeper zookeeper0:2181 && \
-               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper0:2181 && \
-               kafka-console-producer --broker-list kafka0:29092 -topic second.users < /data/message.json'"
+               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+               kafka-console-producer --bootstrap-server kafka0:29092 --topic second.users < /data/message.json'"
\ No newline at end of file
diff --git a/documentation/compose/kafka-ui-sasl.yaml b/documentation/compose/kafka-ui-sasl.yaml
index 1c0312f11a2..4b8fc02597f 100644
--- a/documentation/compose/kafka-ui-sasl.yaml
+++ b/documentation/compose/kafka-ui-sasl.yaml
@@ -8,45 +8,44 @@ services:
     ports:
       - 8080:8080
     depends_on:
-      - zookeeper
       - kafka
     environment:
       KAFKA_CLUSTERS_0_NAME: local
-#      SERVER_SERVLET_CONTEXT_PATH: "/kafkaui"
-      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:9092
-      KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper:2181
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:29092
       KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SASL_PLAINTEXT
       KAFKA_CLUSTERS_0_PROPERTIES_SASL_MECHANISM: PLAIN
       KAFKA_CLUSTERS_0_PROPERTIES_SASL_JAAS_CONFIG: 'org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="admin-secret";'
-  zookeeper:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2181:2181
 
   kafka:
-    image: wurstmeister/kafka:latest
+    image: confluentinc/cp-kafka:7.2.1
     hostname: kafka
     container_name: kafka
-    depends_on:
-      - zookeeper
     ports:
-      - '9092:9092'
+      - "9092:9092"
+      - "9997:9997"
     environment:
-      KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
-      KAFKA_LISTENERS: SASL_PLAINTEXT://kafka:9092
-      KAFKA_ADVERTISED_LISTENERS: SASL_PLAINTEXT://kafka:9092
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
-      ALLOW_PLAINTEXT_LISTENER: 'yes'
+      KAFKA_BROKER_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,SASL_PLAINTEXT:SASL_PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'SASL_PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OPTS: "-Djava.security.auth.login.config=/etc/kafka/jaas/kafka_server.conf"
-      KAFKA_AUTHORIZER_CLASS_NAME: kafka.security.auth.SimpleAclAuthorizer
-      KAFKA_INTER_BROKER_LISTENER_NAME: SASL_PLAINTEXT
-      KAFKA_SASL_ENABLED_MECHANISMS: PLAIN
-      KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL: PLAIN
-      KAFKA_SECURITY_PROTOCOL: SASL_PLAINTEXT
-      KAFKA_SUPER_USERS: User:admin,User:enzo
-      KAFKA_ALLOW_EVERYONE_IF_NO_ACL_FOUND: 'true'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_LISTENERS: 'SASL_PLAINTEXT://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'SASL_PLAINTEXT'
+      KAFKA_SASL_ENABLED_MECHANISMS: 'PLAIN'
+      KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL: 'PLAIN'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+      KAFKA_SECURITY_PROTOCOL: 'SASL_PLAINTEXT'
+      KAFKA_SUPER_USERS: 'User:admin,User:enzo'
     volumes:
-      - ./jaas:/etc/kafka/jaas
\ No newline at end of file
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+      - ./jaas:/etc/kafka/jaas
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
\ No newline at end of file
diff --git a/documentation/compose/kafka-ui-with-jmx-exporter.yaml b/documentation/compose/kafka-ui-with-jmx-exporter.yaml
index e6d21584a75..b0d940694b1 100644
--- a/documentation/compose/kafka-ui-with-jmx-exporter.yaml
+++ b/documentation/compose/kafka-ui-with-jmx-exporter.yaml
@@ -2,33 +2,33 @@
 version: '2'
 services:
 
-  zookeeper0:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2181:2181
-
   kafka0:
-    image: confluentinc/cp-kafka:5.3.1
-    # downloading jmx_exporter javaagent and starting kafka
-    command: "/usr/share/jmx_exporter/kafka-prepare-and-run"
-    depends_on:
-      - zookeeper0
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka0
+    container_name: kafka0
+    ports:
+      - "9092:9092"
+      - "11001:11001"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
       KAFKA_OPTS: -javaagent:/usr/share/jmx_exporter/jmx_prometheus_javaagent.jar=11001:/usr/share/jmx_exporter/kafka-broker.yml
-    ports:
-      - 9092:9092
-      - 11001:11001
     volumes:
       - ./jmx-exporter:/usr/share/jmx_exporter/
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /usr/share/jmx_exporter/kafka-prepare-and-run ; fi'"
 
   kafka-ui:
     container_name: kafka-ui
@@ -36,7 +36,6 @@ services:
     ports:
       - 8080:8080
     depends_on:
-      - zookeeper0
       - kafka0
     environment:
       KAFKA_CLUSTERS_0_NAME: local
diff --git a/documentation/compose/kafka-ui.yaml b/documentation/compose/kafka-ui.yaml
index ff808ae1abc..790cbfc0207 100644
--- a/documentation/compose/kafka-ui.yaml
+++ b/documentation/compose/kafka-ui.yaml
@@ -8,86 +8,89 @@ services:
     ports:
       - 8080:8080
     depends_on:
-      - zookeeper0
-      - zookeeper1
       - kafka0
       - kafka1
       - schemaregistry0
+      - schemaregistry1
       - kafka-connect0
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
-      KAFKA_CLUSTERS_0_ZOOKEEPER: zookeeper0:2181
       KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       KAFKA_CLUSTERS_1_NAME: secondLocal
       KAFKA_CLUSTERS_1_BOOTSTRAPSERVERS: kafka1:29092
-      KAFKA_CLUSTERS_1_ZOOKEEPER: zookeeper1:2181
-      KAFKA_CLUSTERS_1_METRICS_PORT: 9998
+      KAFKA_CLUSTERS_0_METRICS_PORT: 9998
       KAFKA_CLUSTERS_1_SCHEMAREGISTRY: http://schemaregistry1:8085
-      KAFKA_CLUSTERS_1_KAFKACONNECT_0_NAME: first
-      KAFKA_CLUSTERS_1_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
-
-  zookeeper0:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
-    ports:
-      - 2181:2181
 
   kafka0:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper0
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka0
+    container_name: kafka0
     ports:
-      - 9092:9092
-      - 9997:9997
+      - "9092:9092"
+      - "9997:9997"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper0:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      JMX_PORT: 9997
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
       KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
-
-  zookeeper1:
-    image: confluentinc/cp-zookeeper:5.2.4
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-      ZOOKEEPER_TICK_TIME: 2000
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+    volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   kafka1:
-    image: confluentinc/cp-kafka:5.3.1
-    depends_on:
-      - zookeeper1
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka1
+    container_name: kafka1
     ports:
-      - 9093:9093
-      - 9998:9998
+      - "9093:9092"
+      - "9998:9998"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper1:2181
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka1:29092,PLAINTEXT_HOST://localhost:9093
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
-      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka1:29092,PLAINTEXT_HOST://localhost:9092'
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      JMX_PORT: 9998
-      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka1 -Dcom.sun.management.jmxremote.rmi.port=9998
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9998
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9998
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka1:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://kafka1:29092,CONTROLLER://kafka1:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+    volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
 
   schemaregistry0:
-    image: confluentinc/cp-schema-registry:5.5.0
+    image: confluentinc/cp-schema-registry:7.2.1
     ports:
       - 8085:8085
     depends_on:
-      - zookeeper0
       - kafka0
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper0:2181
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
       SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
       SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
@@ -97,15 +100,13 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
   schemaregistry1:
-    image: confluentinc/cp-schema-registry:5.5.0
+    image: confluentinc/cp-schema-registry:7.2.1
     ports:
       - 18085:8085
     depends_on:
-      - zookeeper1
       - kafka1
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka1:29092
-      SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: zookeeper1:2181
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
       SCHEMA_REGISTRY_HOST_NAME: schemaregistry1
       SCHEMA_REGISTRY_LISTENERS: http://schemaregistry1:8085
@@ -140,14 +141,14 @@ services:
       CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
 
   kafka-init-topics:
-    image: confluentinc/cp-kafka:5.3.1
+    image: confluentinc/cp-kafka:7.2.1
     volumes:
        - ./message.json:/data/message.json
     depends_on:
       - kafka1
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
                cub kafka-ready -b kafka1:29092 1 30 && \
-               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-topics --create --topic second.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper1:2181 && \
-               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --zookeeper zookeeper0:2181 && \
-               kafka-console-producer --broker-list kafka1:29092 -topic second.users < /data/message.json'"
+               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka1:29092 && \
+               kafka-topics --create --topic second.messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka1:29092 && \
+               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
+               kafka-console-producer --bootstrap-server kafka1:29092 -topic second.users < /data/message.json'"
diff --git a/documentation/compose/kafka-with-zookeeper.yaml b/documentation/compose/kafka-with-zookeeper.yaml
new file mode 100644
index 00000000000..30e6f17eafd
--- /dev/null
+++ b/documentation/compose/kafka-with-zookeeper.yaml
@@ -0,0 +1,48 @@
+---
+version: '2'
+services:
+
+  zookeeper:
+    image: confluentinc/cp-zookeeper:7.2.1
+    hostname: zookeeper
+    container_name: zookeeper
+    ports:
+      - "2181:2181"
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_TICK_TIME: 2000
+
+  kafka:
+    image: confluentinc/cp-server:7.2.1
+    hostname: kafka
+    container_name: kafka
+    depends_on:
+      - zookeeper
+    ports:
+      - "9092:9092"
+      - "9997:9997"
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_CONFLUENT_LICENSE_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_CONFLUENT_BALANCER_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: kafka
+
+  kafka-init-topics:
+    image: confluentinc/cp-kafka:7.2.1
+    volumes:
+       - ./message.json:/data/message.json
+    depends_on:
+      - kafka
+    command: "bash -c 'echo Waiting for Kafka to be ready... && \
+               cub kafka-ready -b kafka:29092 1 30 && \
+               kafka-topics --create --topic users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka:29092 && \
+               kafka-topics --create --topic messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka:29092 && \
+               kafka-console-producer --bootstrap-server kafka:29092 --topic users < /data/message.json'"
diff --git a/documentation/compose/scripts/clusterID b/documentation/compose/scripts/clusterID
new file mode 100644
index 00000000000..4417a5a68d7
--- /dev/null
+++ b/documentation/compose/scripts/clusterID
@@ -0,0 +1 @@
+zlFiTJelTOuhnklFwLWixw
\ No newline at end of file
diff --git a/documentation/compose/scripts/create_cluster_id.sh b/documentation/compose/scripts/create_cluster_id.sh
new file mode 100644
index 00000000000..d946fbc4af3
--- /dev/null
+++ b/documentation/compose/scripts/create_cluster_id.sh
@@ -0,0 +1 @@
+kafka-storage random-uuid > /workspace/kafka-ui/documentation/compose/clusterID
\ No newline at end of file
diff --git a/documentation/compose/scripts/update_run_cluster.sh b/documentation/compose/scripts/update_run_cluster.sh
new file mode 100644
index 00000000000..31da333aae6
--- /dev/null
+++ b/documentation/compose/scripts/update_run_cluster.sh
@@ -0,0 +1,11 @@
+# This script is required to run kafka cluster (without zookeeper)
+#!/bin/sh
+
+# Docker workaround: Remove check for KAFKA_ZOOKEEPER_CONNECT parameter
+sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure
+
+# Docker workaround: Ignore cub zk-ready
+sed -i 's/cub zk-ready/echo ignore zk-ready/' /etc/confluent/docker/ensure
+
+# KRaft required step: Format the storage directory with a new cluster ID
+echo "kafka-storage format --ignore-formatted -t $(cat /tmp/clusterID) -c /etc/kafka/kafka.properties" >> /etc/confluent/docker/ensure
\ No newline at end of file
diff --git a/documentation/guides/SSO.md b/documentation/guides/SSO.md
index 1ddfab2c7fa..f0fae959bd8 100644
--- a/documentation/guides/SSO.md
+++ b/documentation/guides/SSO.md
@@ -58,7 +58,6 @@ For Azure AD (Office365) OAUTH2 you'll want to add additional environment variab
 docker run -p 8080:8080 \
         -e KAFKA_CLUSTERS_0_NAME="${cluster_name}"\
         -e KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS="${kafka_listeners}" \
-        -e KAFKA_CLUSTERS_0_ZOOKEEPER="${zookeeper_servers}" \
         -e KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS="${kafka_connect_servers}"
         -e AUTH_TYPE=OAUTH2 \
         -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_CLIENTID=uhvaPKIHU4ZF8Ne4B6PGvF0hWW6OcUSB \

From cb8049e769452a40007c29acdfae43e5e8abe53d Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 31 Oct 2022 13:17:23 +0400
Subject: [PATCH 249/734] Add a separate endpoint for frontend time format
 (#2847)

---
 .../kafka/ui/controller/InfoController.java     |  7 +++++++
 .../main/resources/swagger/kafka-ui-api.yaml    | 17 ++++++++++++++++-
 .../lib/hooks/api/__tests__/timeFormat.spec.ts  |  2 +-
 .../src/lib/hooks/api/timeFormat.ts             |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java
index 66e5d70bd33..cdda3d0953e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java
@@ -17,9 +17,16 @@ public class InfoController extends AbstractController implements TimeStampForma
 
   @Value("${timestamp.format:dd.MM.YYYY HH:mm:ss}")
   private String timeStampFormat;
+  @Value("${timestamp.format:DD.MM.YYYY HH:mm:ss}")
+  private String timeStampFormatIso;
 
   @Override
   public Mono<ResponseEntity<TimeStampFormatDTO>> getTimeStampFormat(ServerWebExchange exchange) {
     return Mono.just(ResponseEntity.ok(new TimeStampFormatDTO().timeStampFormat(timeStampFormat)));
   }
+
+  @Override
+  public Mono<ResponseEntity<TimeStampFormatDTO>> getTimeStampFormatISO(ServerWebExchange exchange) {
+    return Mono.just(ResponseEntity.ok(new TimeStampFormatDTO().timeStampFormat(timeStampFormatIso)));
+  }
 }
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 6a71863c7e8..a1ba87d85af 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1733,7 +1733,7 @@ paths:
     get:
       tags:
         - TimeStampFormat
-      summary: getTimeStampFormat
+      summary: get system default datetime format
       operationId: getTimeStampFormat
       responses:
         200:
@@ -1742,6 +1742,21 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/TimeStampFormat'
+
+  /api/info/timestampformat/iso:
+    get:
+      tags:
+        - TimeStampFormat
+      summary: get system default datetime format (in ISO format, for JS)
+      operationId: getTimeStampFormatISO
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TimeStampFormat'
+
 components:
   schemas:
     TopicSerdeSuggestion:
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts
index cc080f58e14..c6984c40b15 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts
@@ -3,7 +3,7 @@ import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
 import * as hooks from 'lib/hooks/api/timeFormat';
 import { timeFormatPayload } from 'lib/fixtures/timeFormat';
 
-const timeFormatPath = '/api/info/timestampformat';
+const timeFormatPath = '/api/info/timestampformat/iso';
 
 describe('Time format hooks', () => {
   beforeEach(() => fetchMock.restore());
diff --git a/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts b/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts
index fcbdf931520..3b36f74066f 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts
@@ -5,7 +5,7 @@ import { QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
 export function useTimeFormat() {
   return useQuery(
     ['settings', 'timestampformat'],
-    () => api.getTimeStampFormat(),
+    () => api.getTimeStampFormatISO(),
     QUERY_REFETCH_OFF_OPTIONS
   );
 }

From aa6c3083c2c44aa2a1764ea286d5fca9a34b4f9c Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 31 Oct 2022 16:46:19 +0400
Subject: [PATCH 250/734] ISSUE-2103: Fixing AdminClient timeout on listOffsets
 (#2781)

 ISSUE-2103: Fixing AdminClient timeout on listOffsets when partition's leader in not available:
1. ReactiveAdminClient.listOffsets methods now check if partitions have leader before executing
2. In all places where ReactiveAdminClient.listOffsets methods are used, we specify what to do if partition leader is not available - fail or skip such partitions
3. AdminClient.listOffsets calls splitted with partitionCalls
---
 .../kafka/ui/model/InternalPartition.java     |   8 +-
 .../ui/service/ConsumerGroupService.java      |   6 +-
 .../kafka/ui/service/MessagesService.java     |   4 +-
 .../kafka/ui/service/OffsetsResetService.java |   9 +-
 .../kafka/ui/service/ReactiveAdminClient.java | 100 ++++++++++++++----
 .../kafka/ui/service/TopicsService.java       |  10 +-
 6 files changed, 98 insertions(+), 39 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalPartition.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalPartition.java
index 76f916cb105..f5d16e0b65d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalPartition.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalPartition.java
@@ -13,12 +13,12 @@ public class InternalPartition {
   private final int inSyncReplicasCount;
   private final int replicasCount;
 
-  private final long offsetMin;
-  private final long offsetMax;
+  private final Long offsetMin;
+  private final Long offsetMax;
 
   // from log dir
-  private final long segmentSize;
-  private final long segmentCount;
+  private final Long segmentSize;
+  private final Integer segmentCount;
 
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index ee9a9d8a6a0..2de70c88ca2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -49,8 +49,8 @@ private Mono<List<InternalConsumerGroup>> getConsumerGroups(
           var tpsFromGroupOffsets = groupOffsetsMap.values().stream()
               .flatMap(v -> v.keySet().stream())
               .collect(Collectors.toSet());
-          // 2. getting end offsets for partitions with in committed offsets
-          return ac.listOffsets(tpsFromGroupOffsets, OffsetSpec.latest())
+          // 2. getting end offsets for partitions with committed offsets
+          return ac.listOffsets(tpsFromGroupOffsets, OffsetSpec.latest(), false)
               .map(endOffsets ->
                   descriptions.stream()
                       .map(desc -> {
@@ -68,7 +68,7 @@ public Mono<List<InternalTopicConsumerGroup>> getConsumerGroupsForTopic(KafkaClu
                                                                           String topic) {
     return adminClientService.get(cluster)
         // 1. getting topic's end offsets
-        .flatMap(ac -> ac.listOffsets(topic, OffsetSpec.latest())
+        .flatMap(ac -> ac.listTopicOffsets(topic, OffsetSpec.latest(), false)
             .flatMap(endOffsets -> {
               var tps = new ArrayList<>(endOffsets.keySet());
               // 2. getting all consumer groups
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index 1f217b1e40d..ecfeda01227 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -65,8 +65,8 @@ public Mono<Void> deleteTopicMessages(KafkaCluster cluster, String topicName,
   private Mono<Map<TopicPartition, Long>> offsetsForDeletion(KafkaCluster cluster, String topicName,
                                                              List<Integer> partitionsToInclude) {
     return adminClientService.get(cluster).flatMap(ac ->
-        ac.listOffsets(topicName, OffsetSpec.earliest())
-            .zipWith(ac.listOffsets(topicName, OffsetSpec.latest()),
+        ac.listTopicOffsets(topicName, OffsetSpec.earliest(), true)
+            .zipWith(ac.listTopicOffsets(topicName, OffsetSpec.latest(), true),
                 (start, end) ->
                     end.entrySet().stream()
                         .filter(e -> partitionsToInclude.isEmpty()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java
index b2675d51be8..36b812473e1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java
@@ -47,11 +47,12 @@ private Mono<Map<TopicPartition, Long>> offsets(ReactiveAdminClient client,
                                                   @Nullable Collection<Integer> partitions,
                                                   OffsetSpec spec) {
     if (partitions == null) {
-      return client.listOffsets(topic, spec);
+      return client.listTopicOffsets(topic, spec, true);
     }
     return client.listOffsets(
         partitions.stream().map(idx -> new TopicPartition(topic, idx)).collect(toSet()),
-        spec
+        spec,
+        true
     );
   }
 
@@ -84,9 +85,9 @@ public Mono<Void> resetToOffsets(
         .collect(toMap(e -> new TopicPartition(topic, e.getKey()), Map.Entry::getValue));
     return checkGroupCondition(cluster, group).flatMap(
         ac ->
-            ac.listOffsets(partitionOffsets.keySet(), OffsetSpec.earliest())
+            ac.listOffsets(partitionOffsets.keySet(), OffsetSpec.earliest(), true)
                 .flatMap(earliest ->
-                    ac.listOffsets(partitionOffsets.keySet(), OffsetSpec.latest())
+                    ac.listOffsets(partitionOffsets.keySet(), OffsetSpec.latest(), true)
                         .map(latest -> editOffsetsBounds(partitionOffsets, earliest, latest))
                         .flatMap(offsetsToCommit -> resetOffsets(ac, group, offsetsToCommit)))
     );
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 463e2d9b6c6..2504473b171 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -8,12 +8,15 @@
 import com.google.common.collect.Iterators;
 import com.provectus.kafka.ui.exception.IllegalEntityStateException;
 import com.provectus.kafka.ui.exception.NotFoundException;
+import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.util.MapUtil;
 import com.provectus.kafka.ui.util.NumberUtil;
+import com.provectus.kafka.ui.util.annotations.KafkaClientInternalsDependant;
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +28,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
@@ -51,6 +55,7 @@
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.Node;
 import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.TopicPartitionInfo;
 import org.apache.kafka.common.TopicPartitionReplica;
 import org.apache.kafka.common.acl.AclOperation;
 import org.apache.kafka.common.config.ConfigResource;
@@ -400,32 +405,81 @@ public Mono<Void> alterConsumerGroupOffsets(String groupId, Map<TopicPartition,
         .all());
   }
 
-  public Mono<Map<TopicPartition, Long>> listOffsets(String topic,
-                                                     OffsetSpec offsetSpec) {
-    return topicPartitions(topic).flatMap(tps -> listOffsets(tps, offsetSpec));
+  /**
+   * List offset for the topic's partitions and OffsetSpec.
+   * @param failOnUnknownLeader true - throw exception in case of no-leader partitions,
+   *                            false - skip partitions with no leader
+   */
+  public Mono<Map<TopicPartition, Long>> listTopicOffsets(String topic,
+                                                          OffsetSpec offsetSpec,
+                                                          boolean failOnUnknownLeader) {
+    return describeTopic(topic)
+        .map(td -> filterPartitionsWithLeaderCheck(List.of(td), p -> true, failOnUnknownLeader))
+        .flatMap(partitions -> listOffsetsUnsafe(partitions, offsetSpec));
   }
 
+  /**
+   * List offset for the specified partitions and OffsetSpec.
+   * @param failOnUnknownLeader true - throw exception in case of no-leader partitions,
+   *                            false - skip partitions with no leader
+   */
   public Mono<Map<TopicPartition, Long>> listOffsets(Collection<TopicPartition> partitions,
-                                                     OffsetSpec offsetSpec) {
-    //TODO: need to split this into multiple calls if number of target partitions is big
-    return toMono(
-        client.listOffsets(partitions.stream().collect(toMap(tp -> tp, tp -> offsetSpec))).all())
-        .map(offsets -> offsets.entrySet()
-            .stream()
-            // filtering partitions for which offsets were not found
-            .filter(e -> e.getValue().offset() >= 0)
-            .collect(toMap(Map.Entry::getKey, e -> e.getValue().offset())));
-  }
-
-  private Mono<Set<TopicPartition>> topicPartitions(String topic) {
-    return toMono(client.describeTopics(List.of(topic)).all())
-        .map(r -> r.values().stream()
-            .findFirst()
-            .stream()
-            .flatMap(d -> d.partitions().stream())
-            .map(p -> new TopicPartition(topic, p.partition()))
-            .collect(Collectors.toSet())
-        );
+                                                     OffsetSpec offsetSpec,
+                                                     boolean failOnUnknownLeader) {
+    return filterPartitionsWithLeaderCheck(partitions, failOnUnknownLeader)
+        .flatMap(parts -> listOffsetsUnsafe(parts, offsetSpec));
+  }
+
+  private Mono<Collection<TopicPartition>> filterPartitionsWithLeaderCheck(Collection<TopicPartition> partitions,
+                                                                           boolean failOnUnknownLeader) {
+    var targetTopics = partitions.stream().map(TopicPartition::topic).collect(Collectors.toSet());
+    return describeTopicsImpl(targetTopics)
+        .map(descriptions ->
+            filterPartitionsWithLeaderCheck(
+                descriptions.values(), partitions::contains, failOnUnknownLeader));
+  }
+
+  private Set<TopicPartition> filterPartitionsWithLeaderCheck(Collection<TopicDescription> topicDescriptions,
+                                                              Predicate<TopicPartition> partitionPredicate,
+                                                              boolean failOnUnknownLeader) {
+    var goodPartitions = new HashSet<TopicPartition>();
+    for (TopicDescription description : topicDescriptions) {
+      for (TopicPartitionInfo partitionInfo : description.partitions()) {
+        TopicPartition topicPartition = new TopicPartition(description.name(), partitionInfo.partition());
+        if (!partitionPredicate.test(topicPartition)) {
+          continue;
+        }
+        if (partitionInfo.leader() != null) {
+          goodPartitions.add(topicPartition);
+        } else if (failOnUnknownLeader) {
+          throw new ValidationException(String.format("Topic partition %s has no leader", topicPartition));
+        }
+      }
+    }
+    return goodPartitions;
+  }
+
+  // 1. NOTE(!): should only apply for partitions with existing leader,
+  // otherwise AdminClient will try to fetch topic metadata, fail and retry infinitely (until timeout)
+  // 2. TODO: check if it is a bug that AdminClient never throws LeaderNotAvailableException and just retrying instead
+  @KafkaClientInternalsDependant
+  public Mono<Map<TopicPartition, Long>> listOffsetsUnsafe(Collection<TopicPartition> partitions,
+                                                           OffsetSpec offsetSpec) {
+
+    Function<Collection<TopicPartition>, Mono<Map<TopicPartition, Long>>> call =
+        parts -> toMono(
+            client.listOffsets(parts.stream().collect(toMap(tp -> tp, tp -> offsetSpec))).all())
+            .map(offsets -> offsets.entrySet().stream()
+                // filtering partitions for which offsets were not found
+                .filter(e -> e.getValue().offset() >= 0)
+                .collect(toMap(Map.Entry::getKey, e -> e.getValue().offset())));
+
+    return partitionCalls(
+        partitions,
+        200,
+        call,
+        (m1, m2) -> ImmutableMap.<TopicPartition, Long>builder().putAll(m1).putAll(m2).build()
+    );
   }
 
   public Mono<Void> updateBrokerConfigByName(Integer brokerId, String name, String value) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 8badcebc360..7b08d69fd6c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -138,11 +138,15 @@ private Mono<InternalPartitionsOffsets> getPartitionOffsets(Map<String, TopicDes
                                                               ReactiveAdminClient ac) {
     var topicPartitions = descriptions.values().stream()
         .flatMap(desc ->
-            desc.partitions().stream().map(p -> new TopicPartition(desc.name(), p.partition())))
+            desc.partitions().stream()
+                // list offsets should only be applied to partitions with existing leader
+                // (see ReactiveAdminClient.listOffsetsUnsafe(..) docs)
+                .filter(tp -> tp.leader() != null)
+                .map(p -> new TopicPartition(desc.name(), p.partition())))
         .collect(toList());
 
-    return ac.listOffsets(topicPartitions, OffsetSpec.earliest())
-        .zipWith(ac.listOffsets(topicPartitions, OffsetSpec.latest()),
+    return ac.listOffsetsUnsafe(topicPartitions, OffsetSpec.earliest())
+        .zipWith(ac.listOffsetsUnsafe(topicPartitions, OffsetSpec.latest()),
             (earliest, latest) ->
                 topicPartitions.stream()
                     .filter(tp -> earliest.containsKey(tp) && latest.containsKey(tp))

From 2c74b4e1c2ddedcd0f73843eb630ed98340cf3dd Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 31 Oct 2022 17:41:11 +0400
Subject: [PATCH 251/734] ISSUE-2680: Smart filters stats propagation to UI
 (#2771)

ISSUE-2680: Smart filters stats propagation to UI :
1. DONE event type implemented to flag polling end
2. MessageFilterStats added to emitters context to count filter apply errors
---
 .../kafka/ui/emitter/AbstractEmitter.java     | 14 +++++++-
 .../ui/emitter/BackwardRecordEmitter.java     |  2 +-
 .../kafka/ui/emitter/ConsumingStats.java      | 28 ++++++++++++----
 .../ui/emitter/ForwardRecordEmitter.java      |  2 +-
 .../kafka/ui/emitter/MessageFilterStats.java  | 16 ++++++++++
 .../kafka/ui/emitter/MessageFilters.java      | 32 ++++++++++---------
 .../ui/service/AdminClientServiceImpl.java    |  1 +
 .../kafka/ui/service/MessagesService.java     | 17 ++++++++--
 .../kafka/ui/service/RecordEmitterTest.java   | 22 ++++++-------
 .../main/resources/swagger/kafka-ui-api.yaml  |  2 ++
 10 files changed, 97 insertions(+), 39 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilterStats.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
index ddb5dc3666c..35d8a3bef34 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
@@ -64,6 +64,18 @@ protected void sendPhase(FluxSink<TopicMessageEventDTO> sink, String name) {
   protected void sendConsuming(FluxSink<TopicMessageEventDTO> sink,
                                ConsumerRecords<Bytes, Bytes> records,
                                long elapsed) {
-    consumingStats.sendConsumingEvt(sink, records, elapsed);
+    consumingStats.sendConsumingEvt(sink, records, elapsed, getFilterApplyErrors(sink));
+  }
+
+  protected void sendFinishStatsAndCompleteSink(FluxSink<TopicMessageEventDTO> sink) {
+    consumingStats.sendFinishEvent(sink, getFilterApplyErrors(sink));
+    sink.complete();
+  }
+
+  protected Number getFilterApplyErrors(FluxSink<?> sink) {
+    return sink.contextView()
+        .<MessageFilterStats>getOrEmpty(MessageFilterStats.class)
+        .<Number>map(MessageFilterStats::getFilterApplyErrors)
+        .orElse(0);
   }
 }
\ No newline at end of file
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
index d2012355db6..fe1644676a0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
@@ -80,7 +80,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
           log.debug("sink is cancelled after partitions poll iteration");
         }
       }
-      sink.complete();
+      sendFinishStatsAndCompleteSink(sink);
       log.debug("Polling finished");
     } catch (Exception e) {
       log.error("Error occurred while consuming records", e);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
index 830eb87320b..bd0754fc687 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
@@ -16,7 +16,8 @@ class ConsumingStats {
 
   void sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
                         ConsumerRecords<Bytes, Bytes> polledRecords,
-                        long elapsed) {
+                        long elapsed,
+                        Number filterApplyErrors) {
     for (ConsumerRecord<Bytes, Bytes> rec : polledRecords) {
       for (Header header : rec.headers()) {
         bytes +=
@@ -27,15 +28,28 @@ void sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
     }
     this.records += polledRecords.count();
     this.elapsed += elapsed;
-    final TopicMessageConsumingDTO consuming = new TopicMessageConsumingDTO()
-        .bytesConsumed(this.bytes)
-        .elapsedMs(this.elapsed)
-        .isCancelled(sink.isCancelled())
-        .messagesConsumed(this.records);
     sink.next(
         new TopicMessageEventDTO()
             .type(TopicMessageEventDTO.TypeEnum.CONSUMING)
-            .consuming(consuming)
+            .consuming(createConsumingStats(sink, filterApplyErrors))
     );
   }
+
+  void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink, Number filterApplyErrors) {
+    sink.next(
+        new TopicMessageEventDTO()
+            .type(TopicMessageEventDTO.TypeEnum.DONE)
+            .consuming(createConsumingStats(sink, filterApplyErrors))
+    );
+  }
+
+  private TopicMessageConsumingDTO createConsumingStats(FluxSink<TopicMessageEventDTO> sink,
+                                                        Number filterApplyErrors) {
+    return new TopicMessageConsumingDTO()
+        .bytesConsumed(this.bytes)
+        .elapsedMs(this.elapsed)
+        .isCancelled(sink.isCancelled())
+        .filterApplyErrors(filterApplyErrors.intValue())
+        .messagesConsumed(this.records);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
index 69d9801b705..502a8c9a26c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
@@ -54,7 +54,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
           }
         }
       }
-      sink.complete();
+      sendFinishStatsAndCompleteSink(sink);
       log.info("Polling finished");
     } catch (Exception e) {
       log.error("Error occurred while consuming records", e);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilterStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilterStats.java
new file mode 100644
index 00000000000..3b6df3cdea4
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilterStats.java
@@ -0,0 +1,16 @@
+package com.provectus.kafka.ui.emitter;
+
+import java.util.concurrent.atomic.AtomicLong;
+import lombok.AccessLevel;
+import lombok.Getter;
+
+public class MessageFilterStats {
+
+  @Getter(AccessLevel.PACKAGE)
+  private final AtomicLong filterApplyErrors = new AtomicLong();
+
+  public final void incrementApplyErrors() {
+    filterApplyErrors.incrementAndGet();
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java
index ea0707f1029..e48501f6a75 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java
@@ -9,6 +9,7 @@
 import javax.script.CompiledScript;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.groovy.jsr223.GroovyScriptEngineImpl;
@@ -40,25 +41,26 @@ static Predicate<TopicMessageDTO> containsStringFilter(String string) {
   static Predicate<TopicMessageDTO> groovyScriptFilter(String script) {
     var compiledScript = compileScript(script);
     var jsonSlurper = new JsonSlurper();
-    return msg -> {
-      var bindings = getGroovyEngine().createBindings();
-      bindings.put("partition", msg.getPartition());
-      bindings.put("offset", msg.getOffset());
-      bindings.put("timestampMs", msg.getTimestamp().toInstant().toEpochMilli());
-      bindings.put("keyAsText", msg.getKey());
-      bindings.put("valueAsText", msg.getContent());
-      bindings.put("headers", msg.getHeaders());
-      bindings.put("key", parseToJsonOrReturnNull(jsonSlurper, msg.getKey()));
-      bindings.put("value", parseToJsonOrReturnNull(jsonSlurper, msg.getContent()));
-      try {
+    return new Predicate<TopicMessageDTO>() {
+      @SneakyThrows
+      @Override
+      public boolean test(TopicMessageDTO msg) {
+        var bindings = getGroovyEngine().createBindings();
+        bindings.put("partition", msg.getPartition());
+        bindings.put("offset", msg.getOffset());
+        bindings.put("timestampMs", msg.getTimestamp().toInstant().toEpochMilli());
+        bindings.put("keyAsText", msg.getKey());
+        bindings.put("valueAsText", msg.getContent());
+        bindings.put("headers", msg.getHeaders());
+        bindings.put("key", parseToJsonOrReturnNull(jsonSlurper, msg.getKey()));
+        bindings.put("value", parseToJsonOrReturnNull(jsonSlurper, msg.getContent()));
         var result = compiledScript.eval(bindings);
         if (result instanceof Boolean) {
           return (Boolean) result;
+        } else {
+          throw new ValidationException(
+              String.format("Unexpected script result: %s, Boolean should be returned instead", result));
         }
-        return false;
-      } catch (Exception e) {
-        log.trace("Error executing filter script '{}' on message '{}' ", script, msg, e);
-        return false;
       }
     };
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
index 7b93b1420e0..9291198df73 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
@@ -37,6 +37,7 @@ private Mono<ReactiveAdminClient> createAdminClient(KafkaCluster cluster) {
       properties
           .put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
       properties.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, clientTimeout);
+      properties.putIfAbsent(AdminClientConfig.CLIENT_ID_CONFIG, "kafka-ui-app");
       return AdminClient.create(properties);
     })
         .flatMap(ReactiveAdminClient::create)
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index ecfeda01227..d0bf94c98b6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.emitter.BackwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
+import com.provectus.kafka.ui.emitter.MessageFilterStats;
 import com.provectus.kafka.ui.emitter.MessageFilters;
 import com.provectus.kafka.ui.emitter.TailingEmitter;
 import com.provectus.kafka.ui.exception.TopicNotFoundException;
@@ -172,8 +173,10 @@ private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
           recordDeserializer
       );
     }
+    MessageFilterStats filterStats = new MessageFilterStats();
     return Flux.create(emitter)
-        .filter(getMsgFilter(query, filterQueryType))
+        .contextWrite(ctx -> ctx.put(MessageFilterStats.class, filterStats))
+        .filter(getMsgFilter(query, filterQueryType, filterStats))
         .takeWhile(createTakeWhilePredicate(seekDirection, limit))
         .subscribeOn(Schedulers.boundedElastic())
         .share();
@@ -186,7 +189,9 @@ private Predicate<TopicMessageEventDTO> createTakeWhilePredicate(
         : new ResultSizeLimiter(limit);
   }
 
-  private Predicate<TopicMessageEventDTO> getMsgFilter(String query, MessageFilterTypeDTO filterQueryType) {
+  private Predicate<TopicMessageEventDTO> getMsgFilter(String query,
+                                                       MessageFilterTypeDTO filterQueryType,
+                                                       MessageFilterStats filterStats) {
     if (StringUtils.isEmpty(query)) {
       return evt -> true;
     }
@@ -194,7 +199,13 @@ private Predicate<TopicMessageEventDTO> getMsgFilter(String query, MessageFilter
     return evt -> {
       // we only apply filter for message events
       if (evt.getType() == TopicMessageEventDTO.TypeEnum.MESSAGE) {
-        return messageFilter.test(evt.getMessage());
+        try {
+          return messageFilter.test(evt.getMessage());
+        } catch (Exception e) {
+          filterStats.incrementApplyErrors();
+          log.trace("Error applying filter '{}' for message {}", query, evt.getMessage());
+          return false;
+        }
       }
       return true;
     };
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
index 3289d177d2b..350386fd7e9 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
@@ -120,17 +120,17 @@ void pollNothingOnEmptyTopic() {
         RECORD_DESERIALIZER
     );
 
-    StepVerifier.create(
-        Flux.create(forwardEmitter)
-            .filter(m -> m.getType().equals(TopicMessageEventDTO.TypeEnum.MESSAGE))
-            .take(100)
-    ).expectNextCount(0).expectComplete().verify();
-
-    StepVerifier.create(
-        Flux.create(backwardEmitter)
-            .filter(m -> m.getType().equals(TopicMessageEventDTO.TypeEnum.MESSAGE))
-            .take(100)
-    ).expectNextCount(0).expectComplete().verify();
+    StepVerifier.create(Flux.create(forwardEmitter))
+        .expectNextMatches(m -> m.getType().equals(TopicMessageEventDTO.TypeEnum.PHASE))
+        .expectNextMatches(m -> m.getType().equals(TopicMessageEventDTO.TypeEnum.DONE))
+        .expectComplete()
+        .verify();
+
+    StepVerifier.create(Flux.create(backwardEmitter))
+        .expectNextMatches(m -> m.getType().equals(TopicMessageEventDTO.TypeEnum.PHASE))
+        .expectNextMatches(m -> m.getType().equals(TopicMessageEventDTO.TypeEnum.DONE))
+        .expectComplete()
+        .verify();
   }
 
   @Test
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index a1ba87d85af..1034fc32025 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2408,6 +2408,8 @@ components:
           type: boolean
         messagesConsumed:
           type: integer
+        filterApplyErrors:
+          type: integer
 
 
     TopicMessage:

From 99e50f8814e10577fead44957f41db5d213a6bb4 Mon Sep 17 00:00:00 2001
From: Boris Djurdjevic <boris@djurdjevic.ch>
Date: Mon, 31 Oct 2022 15:05:28 +0100
Subject: [PATCH 252/734] Support SSL for schema registry (#2832)

* feat(schema-registry): Implement schema-registry mTLS configuration

* chore(linter): Make checkstyle happy

* feat(schema-registry): Implement schema-registry mTLS configuration

* chore(linter): Make checkstyle happy

* chore(schema-registry): Refactor WebClient creation for PR #2832

Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 README.md                                     |  4 ++
 .../kafka/ui/config/ClustersProperties.java   |  9 +++
 .../kafka/ui/mapper/ClusterMapper.java        |  8 ++-
 .../ui/model/InternalSchemaRegistry.java      |  5 ++
 .../builtin/sr/SchemaRegistrySerde.java       | 42 +++++++++++-
 .../ui/service/SchemaRegistryService.java     | 24 +++++--
 .../kafka/ui/util/SecuredWebClient.java       | 66 +++++++++++++++++++
 7 files changed, 149 insertions(+), 9 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SecuredWebClient.java

diff --git a/README.md b/README.md
index 1440cb70869..ab829328967 100644
--- a/README.md
+++ b/README.md
@@ -183,6 +183,10 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRY`   	|SchemaRegistry's address
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME`   	|SchemaRegistry's basic authentication username
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_PASSWORD`   	|SchemaRegistry's basic authentication password
+|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTORELOCATION`   	|Path to the JKS keystore to communicate to SchemaRegistry
+|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTOREPASSWORD`   	|Password of the JKS keystore for SchemaRegistry
+|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTORELOCATION`   	|Path to the JKS truststore to communicate to SchemaRegistry
+|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTOREPASSWORD`   	|Password of the JKS truststore for SchemaRegistry
 |`KAFKA_CLUSTERS_0_SCHEMANAMETEMPLATE` |How keys are saved to schemaRegistry
 |`KAFKA_CLUSTERS_0_METRICS_PORT`        	 |Open metrics port of a broker
 |`KAFKA_CLUSTERS_0_METRICS_TYPE`        	 |Type of metrics retriever to use. Valid values are JMX (default) or PROMETHEUS. If Prometheus, then metrics are read from prometheus-jmx-exporter instead of jmx
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 5b598003548..4313c3248ec 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -27,6 +27,7 @@ public static class Cluster {
     String bootstrapServers;
     String schemaRegistry;
     SchemaRegistryAuth schemaRegistryAuth;
+    WebClientSsl schemaRegistrySsl;
     String ksqldbServer;
     KsqldbServerAuth ksqldbServerAuth;
     List<ConnectCluster> kafkaConnect;
@@ -62,6 +63,14 @@ public static class SchemaRegistryAuth {
     String password;
   }
 
+  @Data
+  public static class WebClientSsl {
+    String keystoreLocation;
+    String keystorePassword;
+    String truststoreLocation;
+    String truststorePassword;
+  }
+
   @Data
   public static class SerdeConfig {
     String name;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index bf7cb336360..9dc3103fca4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -35,7 +35,6 @@
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityCheck;
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel;
 import com.provectus.kafka.ui.service.metrics.RawMetric;
-import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -121,6 +120,13 @@ default InternalSchemaRegistry setSchemaRegistry(ClustersProperties.Cluster clus
       internalSchemaRegistry.password(clusterProperties.getSchemaRegistryAuth().getPassword());
     }
 
+    if (clusterProperties.getSchemaRegistrySsl() != null) {
+      internalSchemaRegistry.keystoreLocation(clusterProperties.getSchemaRegistrySsl().getKeystoreLocation());
+      internalSchemaRegistry.keystorePassword(clusterProperties.getSchemaRegistrySsl().getKeystorePassword());
+      internalSchemaRegistry.truststoreLocation(clusterProperties.getSchemaRegistrySsl().getTruststoreLocation());
+      internalSchemaRegistry.truststorePassword(clusterProperties.getSchemaRegistrySsl().getTruststorePassword());
+    }
+
     return internalSchemaRegistry.build();
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalSchemaRegistry.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalSchemaRegistry.java
index 1115bac1057..b96952d569c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalSchemaRegistry.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalSchemaRegistry.java
@@ -10,6 +10,11 @@ public class InternalSchemaRegistry {
   private final String password;
   private final FailoverUrlList url;
 
+  private final String keystoreLocation;
+  private final String truststoreLocation;
+  private final String keystorePassword;
+  private final String truststorePassword;
+
   public String getPrimaryNodeUri() {
     return url.get(0);
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index 787bec28082..9c43c7a63f7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -18,6 +18,7 @@
 import io.confluent.kafka.schemaregistry.client.CachedSchemaRegistryClient;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
+import io.confluent.kafka.schemaregistry.client.SchemaRegistryClientConfig;
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import io.confluent.kafka.schemaregistry.json.JsonSchemaProvider;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
@@ -32,6 +33,7 @@
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
+import org.apache.kafka.common.config.SslConfigs;
 
 
 public class SchemaRegistrySerde implements BuiltInSerde {
@@ -72,7 +74,20 @@ public void configure(PropertyResolver serdeProperties,
                 .orElse(null),
             serdeProperties.getProperty("password", String.class)
                 .or(() -> kafkaClusterProperties.getProperty("schemaRegistryAuth.password", String.class))
-                .orElse(null)
+                .orElse(null),
+
+            serdeProperties.getProperty("keystoreLocation", String.class)
+                    .or(() -> kafkaClusterProperties.getProperty("schemaRegistrySSL.keystoreLocation", String.class))
+                    .orElse(null),
+            serdeProperties.getProperty("keystorePassword", String.class)
+                    .or(() -> kafkaClusterProperties.getProperty("schemaRegistrySSL.keystorePassword", String.class))
+                    .orElse(null),
+            serdeProperties.getProperty("truststoreLocation", String.class)
+                    .or(() -> kafkaClusterProperties.getProperty("schemaRegistrySSL.truststoreLocation", String.class))
+                    .orElse(null),
+            serdeProperties.getProperty("truststorePassword", String.class)
+                    .or(() -> kafkaClusterProperties.getProperty("schemaRegistrySSL.truststorePassword", String.class))
+                    .orElse(null)
         ),
         serdeProperties.getProperty("keySchemaNameTemplate", String.class)
             .or(() -> kafkaClusterProperties.getProperty("keySchemaNameTemplate", String.class))
@@ -98,7 +113,12 @@ void configure(
 
   private static SchemaRegistryClient createSchemaRegistryClient(List<String> urls,
                                                                  @Nullable String username,
-                                                                 @Nullable String password) {
+                                                                 @Nullable String password,
+                                                                 @Nullable String keyStoreLocation,
+                                                                 @Nullable String keyStorePassword,
+                                                                 @Nullable String trustStoreLocation,
+                                                                 @Nullable String trustStorePassword
+                                                                 ) {
     Map<String, String> configs = new HashMap<>();
     if (username != null && password != null) {
       configs.put(BASIC_AUTH_CREDENTIALS_SOURCE, "USER_INFO");
@@ -110,6 +130,24 @@ private static SchemaRegistryClient createSchemaRegistryClient(List<String> urls
       throw new ValidationException(
           "You specified password but do not specified username");
     }
+
+    // We require at least a truststore. The logic is done similar to SchemaRegistryService.securedWebClientOnTLS
+    if (trustStoreLocation != null && trustStorePassword != null) {
+      configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG,
+          trustStoreLocation);
+      configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG,
+          trustStorePassword);
+
+      if (keyStoreLocation != null) {
+        configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG,
+            keyStoreLocation);
+        configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG,
+            keyStorePassword);
+        configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_KEY_PASSWORD_CONFIG,
+            keyStorePassword);
+      }
+    }
+
     return new CachedSchemaRegistryClient(
         urls,
         1_000,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
index 2a3039b3fe4..1cf3cb6ea5b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
@@ -21,6 +21,7 @@
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel;
 import com.provectus.kafka.ui.model.schemaregistry.InternalNewSchema;
 import com.provectus.kafka.ui.model.schemaregistry.SubjectIdResponse;
+import com.provectus.kafka.ui.util.SecuredWebClient;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Collections;
@@ -68,8 +69,6 @@ public class SchemaRegistryService {
   private static final String INCOMPATIBLE_WITH_AN_EARLIER_SCHEMA = "incompatible with an earlier schema";
   private static final String INVALID_SCHEMA = "Invalid Schema";
 
-  private final WebClient webClient;
-
   public Mono<List<SchemaSubjectDTO>> getAllLatestVersionSchemas(KafkaCluster cluster,
                                                                  List<String> subjects) {
     return Flux.fromIterable(subjects)
@@ -372,10 +371,23 @@ private WebClient.RequestBodySpec configuredWebClient(KafkaCluster cluster,
                                                         List<String> uriVariables,
                                                         MultiValueMap<String, String> queryParams) {
     final var schemaRegistry = cluster.getSchemaRegistry();
-    return webClient
-        .method(method)
-        .uri(buildUri(schemaRegistry, path, uriVariables, queryParams))
-        .headers(headers -> setBasicAuthIfEnabled(schemaRegistry, headers));
+
+    try {
+      WebClient.Builder schemaRegistryWebClient = SecuredWebClient.configure(
+          schemaRegistry.getKeystoreLocation(),
+          schemaRegistry.getKeystorePassword(),
+          schemaRegistry.getTruststoreLocation(),
+          schemaRegistry.getTruststorePassword()
+      );
+
+      return schemaRegistryWebClient.build()
+          .method(method)
+          .uri(buildUri(schemaRegistry, path, uriVariables, queryParams))
+          .headers(headers -> setBasicAuthIfEnabled(schemaRegistry, headers));
+    } catch (Exception e) {
+      throw new IllegalStateException(
+          "cannot create TLS configuration for schema-registry in cluster " + cluster.getName(), e);
+    }
   }
 
   private URI buildUri(InternalSchemaRegistry schemaRegistry, String path, List<String> uriVariables,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SecuredWebClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SecuredWebClient.java
new file mode 100644
index 00000000000..3e826c855ad
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SecuredWebClient.java
@@ -0,0 +1,66 @@
+package com.provectus.kafka.ui.util;
+
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.netty.http.client.HttpClient;
+
+public class SecuredWebClient {
+  public static WebClient.Builder configure(
+      String keystoreLocation,
+      String keystorePassword,
+      String truststoreLocation,
+      String truststorePassword)
+      throws NoSuchAlgorithmException, IOException, KeyStoreException, CertificateException, UnrecoverableKeyException {
+    // If we want to customize our TLS configuration, we need at least a truststore
+    if (truststoreLocation == null || truststorePassword == null) {
+      return WebClient.builder();
+    }
+
+    SslContextBuilder contextBuilder = SslContextBuilder.forClient();
+
+    // Prepare truststore
+    KeyStore trustStore = KeyStore.getInstance("JKS");
+    trustStore.load(
+        new FileInputStream((ResourceUtils.getFile(truststoreLocation))),
+        truststorePassword.toCharArray()
+    );
+
+    TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+        TrustManagerFactory.getDefaultAlgorithm()
+    );
+    trustManagerFactory.init(trustStore);
+    contextBuilder.trustManager(trustManagerFactory);
+
+    // Prepare keystore only if we got a keystore
+    if (keystoreLocation != null && keystorePassword != null) {
+      KeyStore keyStore = KeyStore.getInstance("JKS");
+      keyStore.load(
+          new FileInputStream(ResourceUtils.getFile(keystoreLocation)),
+          keystorePassword.toCharArray()
+      );
+
+      KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+      keyManagerFactory.init(keyStore, keystorePassword.toCharArray());
+      contextBuilder.keyManager(keyManagerFactory);
+    }
+
+    // Create webclient
+    SslContext context = contextBuilder.build();
+
+    return WebClient.builder()
+        .clientConnector(new ReactorClientHttpConnector(HttpClient.create().secure(t -> t.sslContext(context))));
+  }
+}
\ No newline at end of file

From 77f789fa6c4a2471417cf0136788ad39952df808 Mon Sep 17 00:00:00 2001
From: Anton Mnykh <44034169+Redbutton18@users.noreply.github.com>
Date: Tue, 1 Nov 2022 11:27:04 +0200
Subject: [PATCH 253/734] [e2e] TopicTests.redirectToConsumerFromTopicProfile :
 Redirect to consumer from topic profile (#2823)

* redirectToConsumerFromTopic init test created

* test execution clarification

* fix

* test brushing up

* test brushing up

* test brushing up

* test brushing up

* test brushing up

* test brushing up
---
 .../ui/pages/consumer/ConsumersDetails.java   | 32 +++++++++++++++++
 .../ui/pages/consumer/ConsumersList.java      | 11 ++++++
 .../kafka/ui/pages/topic/TopicDetails.java    |  7 ++++
 .../com/provectus/kafka/ui/base/Facade.java   |  4 +++
 .../provectus/kafka/ui/tests/TopicTests.java  | 34 +++++++++++++++++--
 5 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java
new file mode 100644
index 00000000000..37b020d935a
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java
@@ -0,0 +1,32 @@
+package com.provectus.kafka.ui.pages.consumer;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import io.qameta.allure.Step;
+
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
+
+public class ConsumersDetails {
+
+    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+    protected SelenideElement topicGrid = $x("//table");
+    protected String consumerIdHeaderLocator = "//h1[contains(text(),'%s')]";
+    protected String topicElementLocator = "//tbody//td//a[text()='%s']";
+    @Step
+    public ConsumersDetails waitUntilScreenReady() {
+        loadingSpinner.shouldBe(Condition.disappear);
+        topicGrid.shouldBe(Condition.visible);
+        return this;
+    }
+    @Step
+    public boolean isRedirectedConsumerTitleVisible(String consumerGroupId) {
+        return isVisible($x(String.format(consumerIdHeaderLocator, consumerGroupId)));
+    }
+    @Step
+    public boolean isTopicInConsumersDetailsVisible(String topicName) {
+        topicGrid.shouldBe(Condition.visible);
+        return isVisible($x(String.format(topicElementLocator, topicName)));
+    }
+
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java
new file mode 100644
index 00000000000..0797d121955
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java
@@ -0,0 +1,11 @@
+package com.provectus.kafka.ui.pages.consumer;
+
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.utilities.WaitUtils;
+import lombok.experimental.ExtensionMethod;
+
+import static com.codeborne.selenide.Selenide.$x;
+public class ConsumersList {
+
+    protected SelenideElement consumerListHeader = $x("//h1[text()='Consumers']");
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 5b4f1d3c962..73ce320a485 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -26,6 +26,7 @@ public class TopicDetails {
     protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
     protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
     protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
+    protected String consumerIdLocator = "//a[@title='%s']";
 
     @Step
     public TopicDetails waitUntilScreenReady() {
@@ -74,6 +75,12 @@ public TopicDetails clickProduceMessageBtn() {
         return this;
     }
 
+    @Step
+    public TopicDetails openConsumerGroup(String consumerId) {
+        $x(String.format(consumerIdLocator, consumerId)).click();
+        return this;
+    }
+
     @Step
     public boolean isKeyMessageVisible(String keyMessage) {
         return keyMessage.equals($("td[title]").getText());
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
index 8d3aea55d4f..ac223c62b11 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -5,6 +5,8 @@
 import com.provectus.kafka.ui.pages.connector.ConnectorCreateForm;
 import com.provectus.kafka.ui.pages.connector.ConnectorDetails;
 import com.provectus.kafka.ui.pages.connector.KafkaConnectList;
+import com.provectus.kafka.ui.pages.consumer.ConsumersDetails;
+import com.provectus.kafka.ui.pages.consumer.ConsumersList;
 import com.provectus.kafka.ui.pages.schema.SchemaCreateForm;
 import com.provectus.kafka.ui.pages.schema.SchemaDetails;
 import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
@@ -25,5 +27,7 @@ public abstract class Facade {
     protected TopicCreateEditForm topicCreateEditForm = new TopicCreateEditForm();
     protected TopicsList topicsList = new TopicsList();
     protected TopicDetails topicDetails = new TopicDetails();
+    protected ConsumersDetails consumersDetails = new ConsumersDetails();
+    protected ConsumersList consumersList = new ConsumersList();
     protected NaviSideBar naviSideBar = new NaviSideBar();
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 2b596a9e545..33ad3d015a1 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -15,14 +15,15 @@
 import java.util.List;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
-import static com.provectus.kafka.ui.pages.topic.TopicDetails.DotPartitionIdMenu.CLEAR_MESSAGES;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TopicTests extends BaseTest {
     private static final long SUITE_ID = 2;
     private static final String SUITE_TITLE = "Topics";
+
     private static final Topic TOPIC_FOR_UPDATE = new Topic()
             .setName("topic-to-update")
             .setCleanupPolicyValue("Compact")
@@ -186,11 +187,38 @@ void clearMessage() {
         topicDetails
                 .waitUntilScreenReady();
         String messageAmount = topicDetails.MessageCountAmount();
-        Assertions.assertEquals(messageAmount,topicDetails.MessageCountAmount());
+        assertThat(messageAmount)
+                .withFailMessage("message amount not equals").isEqualTo(topicDetails.MessageCountAmount());
         topicDetails
                 .openDotPartitionIdMenu()
                 .clickClearMessagesBtn();
-//        Assertions.assertEquals(Integer.toString(Integer.valueOf(messageAmount)-1),topicDetails.MessageCountAmount());
+//        assertThat(Integer.toString(Integer.valueOf(messageAmount)-1))
+//                .withFailMessage("message amount not decrease by one").isEqualTo(topicDetails.MessageCountAmount());
+    }
+
+    @DisplayName("Redirect to consumer from topic profile")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(20)
+    @Test
+    void redirectToConsumerFromTopic() {
+        String topicName = "source-activities";
+        String consumerGroupId = "connect-sink_postgres_activities";
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
+                .waitUntilScreenReady()
+                .openTopic(topicName);
+        topicDetails
+                .waitUntilScreenReady()
+                .openTopicMenu(TopicDetails.TopicMenu.CONSUMERS)
+                .openConsumerGroup(consumerGroupId);
+        consumersDetails
+                .waitUntilScreenReady();
+        assertThat(consumersDetails.isRedirectedConsumerTitleVisible(consumerGroupId))
+                .withFailMessage("isRedirectedConsumerTitleVisible").isTrue();
+        assertThat(consumersDetails.isTopicInConsumersDetailsVisible(topicName))
+                .withFailMessage("isTopicInConsumersDetailsVisible").isTrue();
     }
 
     @AfterAll

From cd2d8b026ffb8ec4ba9314dffb63465e50fe59b6 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Tue, 1 Nov 2022 16:20:43 +0400
Subject: [PATCH 254/734] [FE] Full width table display in KSQL_DB page (#2849)

---
 .../KsqlDb/Query/renderer/TableRenderer/TableRenderer.styled.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.styled.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.styled.tsx
index c02c30d3691..96ef549aa69 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.styled.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.styled.tsx
@@ -8,6 +8,7 @@ export const Wrapper = styled.div`
 
 export const ScrollableTable = styled(Table)`
   overflow-y: scroll;
+  width: 100%;
 
   td {
     vertical-align: top;

From ee920b43c45156cad1b89be31e43106ca3859edb Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Tue, 1 Nov 2022 15:10:16 +0200
Subject: [PATCH 255/734] Issue/refactoring of smoke test (#2851)

* Deleted methods like screenShooter from BaseTest

* Added TopPanel object class in Facade

* Added List of SideMenuOptions

* Deleted Screenshooter.java

* Deleted NoReferenceScreenshotFoundException.java

* Add methods in TopPanel

* Refactored SmokeTests class

* Refactored SmokeTests class

* Refactored SmokeTests class

* Resolve conversation

* Reformat discordBtn locator

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../provectus/kafka/ui/pages/NaviSideBar.java |  25 ++-
 .../provectus/kafka/ui/pages/TopPanel.java    |  24 +++
 .../NoReferenceScreenshotFoundException.java  |   7 -
 .../utilities/screenshots/Screenshooter.java  | 162 ------------------
 .../com/provectus/kafka/ui/SmokeTests.java    |  23 ++-
 .../com/provectus/kafka/ui/base/BaseTest.java |  13 --
 .../com/provectus/kafka/ui/base/Facade.java   |   2 +
 7 files changed, 64 insertions(+), 192 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/NoReferenceScreenshotFoundException.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/Screenshooter.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
index 4e6bab8eb00..0f6f4c22609 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
@@ -5,6 +5,9 @@
 import io.qameta.allure.Step;
 
 import java.time.Duration;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
@@ -16,6 +19,14 @@ public class NaviSideBar {
     protected String sideMenuOptionElementLocator = ".//ul/li[contains(.,'%s')]";
     protected String clusterElementLocator = "//aside/ul/li[contains(.,'%s')]";
 
+    private SelenideElement expandCluster(String clusterName) {
+        SelenideElement clusterElement = $x(String.format(clusterElementLocator, clusterName)).shouldBe(Condition.visible);
+        if (clusterElement.parent().$$x(".//ul").size() == 0) {
+            clusterElement.click();
+        }
+        return clusterElement;
+    }
+
     @Step
     public NaviSideBar waitUntilScreenReady() {
         loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(30));
@@ -25,11 +36,7 @@ public NaviSideBar waitUntilScreenReady() {
 
     @Step
     public NaviSideBar openSideMenu(String clusterName, SideMenuOption option) {
-        SelenideElement clusterElement = $x(String.format(clusterElementLocator, clusterName)).shouldBe(Condition.visible);
-        if (clusterElement.parent().$$x(".//ul").size() == 0) {
-            clusterElement.click();
-        }
-        clusterElement
+        expandCluster(clusterName)
                 .parent()
                 .$x(String.format(sideMenuOptionElementLocator, option.value))
                 .click();
@@ -43,6 +50,7 @@ public NaviSideBar openSideMenu(SideMenuOption option) {
     }
 
     public enum SideMenuOption {
+        DASHBOARD("Dashboard"),
         BROKERS("Brokers"),
         TOPICS("Topics"),
         CONSUMERS("Consumers"),
@@ -56,4 +64,11 @@ public enum SideMenuOption {
             this.value = value;
         }
     }
+
+    public List<SelenideElement> getAllMenuButtons() {
+        expandCluster(CLUSTER_NAME);
+        return Stream.of(SideMenuOption.values())
+                .map(option -> $x(String.format(sideMenuOptionElementLocator, option.value)))
+                .collect(Collectors.toList());
+    }
 }
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
new file mode 100644
index 00000000000..8101543abfc
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
@@ -0,0 +1,24 @@
+package com.provectus.kafka.ui.pages;
+
+import com.codeborne.selenide.SelenideElement;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static com.codeborne.selenide.Selenide.$x;
+
+public class TopPanel {
+    protected SelenideElement kafkaLogo = $x("//a[contains(text(),'UI for Apache Kafka')]");
+    protected SelenideElement kafkaVersion = $x("//a[@title='Current commit']");
+    protected SelenideElement logOutBtn = $x("//button[contains(text(),'Log out')]");
+    protected SelenideElement gitBtn = $x("//a[@href='https://github.com/provectus/kafka-ui']");
+    protected SelenideElement discordBtn = $x("//a[contains(@href,'https://discord.com/invite')]");
+
+    public List<SelenideElement> getAllVisibleElements() {
+        return Arrays.asList(kafkaLogo, kafkaVersion, logOutBtn, gitBtn, discordBtn);
+    }
+
+    public List<SelenideElement> getAllEnabledElements() {
+        return Arrays.asList(logOutBtn, gitBtn, discordBtn, kafkaLogo);
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/NoReferenceScreenshotFoundException.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/NoReferenceScreenshotFoundException.java
deleted file mode 100644
index 0011c4f0a13..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/NoReferenceScreenshotFoundException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.provectus.kafka.ui.utilities.screenshots;
-
-public class NoReferenceScreenshotFoundException extends Throwable {
-    public NoReferenceScreenshotFoundException(String name) {
-        super("no reference screenshot found for " + name);
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/Screenshooter.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/Screenshooter.java
deleted file mode 100644
index 136a9e8bd4b..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/screenshots/Screenshooter.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.provectus.kafka.ui.utilities.screenshots;
-
-import io.qameta.allure.Allure;
-import io.qameta.allure.Attachment;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.Assertions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import ru.yandex.qatools.ashot.AShot;
-import ru.yandex.qatools.ashot.Screenshot;
-import ru.yandex.qatools.ashot.comparison.ImageDiff;
-import ru.yandex.qatools.ashot.comparison.ImageDiffer;
-import ru.yandex.qatools.ashot.coordinates.WebDriverCoordsProvider;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.util.List;
-
-import static com.codeborne.selenide.WebDriverRunner.getWebDriver;
-
-public class Screenshooter {
-
-    public static Logger log = LoggerFactory.getLogger(Screenshooter.class);
-
-    private static final int PIXELS_THRESHOLD =
-            Integer.parseInt(System.getProperty("PIXELS_THRESHOLD", "200"));
-    private static final String SCREENSHOTS_FOLDER =
-            System.getProperty("SCREENSHOTS_FOLDER", "com/provectus/kafka/ui/utilities/screenshots/");
-    private static final String DIFF_SCREENSHOTS_FOLDER =
-            System.getProperty("DIFF_SCREENSHOTS_FOLDER", "build/__diff__/");
-    private static final String ACTUAL_SCREENSHOTS_FOLDER =
-            System.getProperty("ACTUAL_SCREENSHOTS_FOLDER", "build/__actual__/");
-    private static final boolean SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST =
-            Boolean.parseBoolean(System.getProperty("SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST", "true"));
-    private static final boolean TURN_OFF_SCREENSHOTS =
-            Boolean.parseBoolean(System.getProperty("TURN_OFF_SCREENSHOTS", "false"));
-    private static final boolean USE_LOCAL_BROWSER =
-            Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "false"));
-
-    private File newFile(String name) {
-        var file = new File(name);
-        if (!file.exists()) {
-            file.mkdirs();
-        }
-        return file;
-    }
-
-    public Screenshooter() {
-        List.of(SCREENSHOTS_FOLDER, DIFF_SCREENSHOTS_FOLDER, ACTUAL_SCREENSHOTS_FOLDER)
-                .forEach(this::newFile);
-    }
-
-    public void compareScreenshots(String name) {
-        compareScreenshots(name, false);
-    }
-
-
-    public void compareScreenshots(String name, boolean shouldUpdateScreenshotIfDiffer) {
-        if (TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER) {
-            log.warn(String.format("compareScreenshots turned off due TURN_OFF_SCREENSHOTS || USE_LOCAL_BROWSER: %b || %b"
-                    , TURN_OFF_SCREENSHOTS, USE_LOCAL_BROWSER));
-            return;
-        }
-        if (!doesScreenshotExist(name)) {
-            if (SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST) {
-                updateActualScreenshot(name);
-            } else {
-                try {
-                    throw new NoReferenceScreenshotFoundException(name);
-                } catch (NoReferenceScreenshotFoundException e) {
-                    e.printStackTrace();
-                }
-            }
-        } else {
-            makeImageDiff(name, shouldUpdateScreenshotIfDiffer);
-        }
-    }
-
-
-    private void updateActualScreenshot(String name) {
-        Screenshot actual =
-                new AShot().coordsProvider(new WebDriverCoordsProvider()).takeScreenshot(getWebDriver());
-        File file = newFile(SCREENSHOTS_FOLDER + name + ".png");
-        try {
-            ImageIO.write(actual.getImage(), "png", file);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        log.debug(String.format("created screenshot: %s \n at %s", name, file.getAbsolutePath()));
-    }
-
-    private static boolean doesScreenshotExist(String name) {
-        return new File(SCREENSHOTS_FOLDER + name + ".png").exists();
-    }
-
-    @SneakyThrows
-    private void makeImageDiff(String expectedName, boolean shouldUpdateScreenshotIfDiffer) {
-        String fullPathNameExpected = SCREENSHOTS_FOLDER + expectedName + ".png";
-        String fullPathNameActual = ACTUAL_SCREENSHOTS_FOLDER + expectedName + ".png";
-        String fullPathNameDiff = DIFF_SCREENSHOTS_FOLDER + expectedName + ".png";
-
-        //  activating allure plugin for showing diffs in report
-        Allure.label("testType", "screenshotDiff");
-
-        Screenshot actual =
-                new AShot().coordsProvider(new WebDriverCoordsProvider()).takeScreenshot(getWebDriver());
-        ImageIO.write(actual.getImage(), "png", newFile(fullPathNameActual));
-
-        Screenshot expected = new Screenshot(ImageIO.read(newFile(fullPathNameExpected)));
-        ImageDiff diff = new ImageDiffer().makeDiff(actual, expected);
-        BufferedImage diffImage = diff.getMarkedImage();
-        ImageIO.write(diffImage, "png", newFile(fullPathNameDiff));
-        // adding to report
-        diff(fullPathNameDiff);
-        // adding to report
-        actual(fullPathNameActual);
-        // adding to report
-        expected(fullPathNameExpected);
-
-        if (shouldUpdateScreenshotIfDiffer) {
-            if (diff.getDiffSize() > PIXELS_THRESHOLD) {
-                updateActualScreenshot(expectedName);
-            }
-        } else {
-            Assertions.assertTrue(
-                    PIXELS_THRESHOLD >= diff.getDiffSize(),
-                    String.format("Amount of differing pixels should be less or equals than %s, actual %s\n" +
-                                    "diff file: %s",
-                            PIXELS_THRESHOLD, diff.getDiffSize(), FileSystems.getDefault().getPath(fullPathNameDiff).normalize().toAbsolutePath()));
-        }
-    }
-
-    @SneakyThrows
-    private byte[] imgToBytes(String filename) {
-        BufferedImage bImage2 = ImageIO.read(new File(filename));
-        var bos2 = new ByteArrayOutputStream();
-        ImageIO.write(bImage2, "png", bos2);
-        return bos2.toByteArray();
-    }
-
-
-    @Attachment
-    private byte[] actual(String actualFileName) {
-        return imgToBytes(actualFileName);
-    }
-
-
-    @Attachment
-    private byte[] expected(String expectedFileName) {
-        return imgToBytes(expectedFileName);
-    }
-
-
-    @Attachment
-    private byte[] diff(String diffFileName) {
-        return imgToBytes(diffFileName);
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
index e876d3a634b..e1e6927c432 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
@@ -1,10 +1,11 @@
 package com.provectus.kafka.ui;
 
+import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
-import org.junit.jupiter.api.DisplayName;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.Test;
 
 public class SmokeTests extends BaseTest {
@@ -12,8 +13,20 @@ public class SmokeTests extends BaseTest {
     @Test
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(198)
-    @DisplayName("main page should load")
-    void mainPageLoads() {
-        compareScreenshots("main");
+    public void checkBasePageElements(){
+        SoftAssertions softly = new SoftAssertions();
+        topPanel.getAllVisibleElements()
+                .forEach(element ->
+                        softly.assertThat(element.is(Condition.visible))
+                                .as(element.getSearchCriteria() + " isVisible()").isTrue());
+        topPanel.getAllEnabledElements()
+                .forEach(element ->
+                        softly.assertThat(element.is(Condition.enabled))
+                                .as(element.getSearchCriteria() + " isEnabled()").isTrue());
+        naviSideBar.getAllMenuButtons()
+                .forEach(element ->
+                        softly.assertThat(element.is(Condition.enabled) && element.is(Condition.visible))
+                                .as(element.getSearchCriteria() + " isEnabled()").isTrue());
+        softly.assertAll();
     }
-}
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index a3086fd7151..11cf07c622e 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -1,11 +1,9 @@
 package com.provectus.kafka.ui.base;
 
-import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.TestCaseGenerator;
-import com.provectus.kafka.ui.utilities.screenshots.Screenshooter;
 import io.github.cdimascio.dotenv.Dotenv;
 import io.qameta.allure.Allure;
 import lombok.extern.slf4j.Slf4j;
@@ -24,7 +22,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.time.Duration;
 
 import static com.provectus.kafka.ui.base.Setup.*;
 import static com.provectus.kafka.ui.settings.Source.BASE_WEB_URL;
@@ -35,18 +32,8 @@ public class BaseTest extends Facade {
 
   private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
   private static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
-  private final Screenshooter screenshooter = new Screenshooter();
-
   protected static BrowserWebDriverContainer<?> webDriverContainer = null;
 
-  public void compareScreenshots(String name) {
-    screenshooter.compareScreenshots(name);
-  }
-
-  public void compareScreenshots(String name, Boolean shouldUpdateScreenshots) {
-    screenshooter.compareScreenshots(name, shouldUpdateScreenshots);
-  }
-
   private static boolean isARM64() {
     return System.getProperty("os.arch").equals("aarch64");
   }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
index ac223c62b11..5b9533c30ec 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.helpers.ApiHelper;
 import com.provectus.kafka.ui.pages.NaviSideBar;
+import com.provectus.kafka.ui.pages.TopPanel;
 import com.provectus.kafka.ui.pages.connector.ConnectorCreateForm;
 import com.provectus.kafka.ui.pages.connector.ConnectorDetails;
 import com.provectus.kafka.ui.pages.connector.KafkaConnectList;
@@ -30,4 +31,5 @@ public abstract class Facade {
     protected ConsumersDetails consumersDetails = new ConsumersDetails();
     protected ConsumersList consumersList = new ConsumersList();
     protected NaviSideBar naviSideBar = new NaviSideBar();
+    protected TopPanel topPanel = new TopPanel();
 }

From 337f6f165ed17a5c7a6187edf6a9756d720147a3 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 2 Nov 2022 19:26:56 +0400
Subject: [PATCH 256/734] Add editorconfig (#2861)

---
 .editorconfig | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 281 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..78be62990be
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,281 @@
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 120
+tab_width = 4
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = true
+ij_smart_tabs = false
+ij_visual_guides = none
+ij_wrap_on_typing = false
+trim_trailing_whitespace = true
+
+[*.java]
+indent_size = 2
+ij_continuation_indent_size = 4
+ij_java_align_consecutive_assignments = false
+ij_java_align_consecutive_variable_declarations = false
+ij_java_align_group_field_declarations = false
+ij_java_align_multiline_annotation_parameters = false
+ij_java_align_multiline_array_initializer_expression = false
+ij_java_align_multiline_assignment = false
+ij_java_align_multiline_binary_operation = false
+ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_extends_list = false
+ij_java_align_multiline_for = true
+ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_parameters = true
+ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parenthesized_expression = false
+ij_java_align_multiline_records = true
+ij_java_align_multiline_resources = true
+ij_java_align_multiline_ternary_operation = false
+ij_java_align_multiline_text_blocks = false
+ij_java_align_multiline_throws_list = false
+ij_java_align_subsequent_simple_methods = false
+ij_java_align_throws_keyword = false
+ij_java_align_types_in_multi_catch = true
+ij_java_annotation_parameter_wrap = off
+ij_java_array_initializer_new_line_after_left_brace = false
+ij_java_array_initializer_right_brace_on_new_line = false
+ij_java_array_initializer_wrap = normal
+ij_java_assert_statement_colon_on_next_line = false
+ij_java_assert_statement_wrap = normal
+ij_java_assignment_wrap = normal
+ij_java_binary_operation_sign_on_next_line = false
+ij_java_binary_operation_wrap = normal
+ij_java_blank_lines_after_anonymous_class_header = 0
+ij_java_blank_lines_after_class_header = 0
+ij_java_blank_lines_after_imports = 1
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_around_class = 1
+ij_java_blank_lines_around_field = 0
+ij_java_blank_lines_around_field_in_interface = 0
+ij_java_blank_lines_around_initializer = 1
+ij_java_blank_lines_around_method = 1
+ij_java_blank_lines_around_method_in_interface = 1
+ij_java_blank_lines_before_class_end = 0
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_method_body = 0
+ij_java_blank_lines_before_package = 1
+ij_java_block_brace_style = end_of_line
+ij_java_block_comment_add_space = false
+ij_java_block_comment_at_first_column = true
+ij_java_builder_methods = none
+ij_java_call_parameters_new_line_after_left_paren = false
+ij_java_call_parameters_right_paren_on_new_line = false
+ij_java_call_parameters_wrap = normal
+ij_java_case_statement_on_separate_line = true
+ij_java_catch_on_new_line = false
+ij_java_class_annotation_wrap = split_into_lines
+ij_java_class_brace_style = end_of_line
+ij_java_class_count_to_use_import_on_demand = 999
+ij_java_class_names_in_javadoc = 1
+ij_java_do_not_indent_top_level_class_members = false
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_not_wrap_after_single_annotation_in_parameter = false
+ij_java_do_while_brace_force = always
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = false
+ij_java_doc_keep_empty_lines = true
+ij_java_doc_keep_empty_parameter_tag = true
+ij_java_doc_keep_empty_return_tag = true
+ij_java_doc_keep_empty_throws_tag = true
+ij_java_doc_keep_invalid_tags = true
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_preserve_line_breaks = false
+ij_java_doc_use_throws_not_exception_tag = true
+ij_java_else_on_new_line = false
+ij_java_entity_dd_suffix = EJB
+ij_java_entity_eb_suffix = Bean
+ij_java_entity_hi_suffix = Home
+ij_java_entity_lhi_prefix = Local
+ij_java_entity_lhi_suffix = Home
+ij_java_entity_li_prefix = Local
+ij_java_entity_pk_class = java.lang.String
+ij_java_entity_vo_suffix = VO
+ij_java_enum_constants_wrap = normal
+ij_java_extends_keyword_wrap = normal
+ij_java_extends_list_wrap = normal
+ij_java_field_annotation_wrap = split_into_lines
+ij_java_finally_on_new_line = false
+ij_java_for_brace_force = always
+ij_java_for_statement_new_line_after_left_paren = false
+ij_java_for_statement_right_paren_on_new_line = false
+ij_java_for_statement_wrap = normal
+ij_java_generate_final_locals = false
+ij_java_generate_final_parameters = false
+ij_java_if_brace_force = always
+ij_java_imports_layout = $*,|,*
+ij_java_indent_case_from_switch = true
+ij_java_insert_inner_class_imports = false
+ij_java_insert_override_annotation = true
+ij_java_keep_blank_lines_before_right_brace = 2
+ij_java_keep_blank_lines_between_package_declaration_and_header = 2
+ij_java_keep_blank_lines_in_code = 2
+ij_java_keep_blank_lines_in_declarations = 2
+ij_java_keep_builder_methods_indents = false
+ij_java_keep_control_statement_in_one_line = true
+ij_java_keep_first_column_comment = true
+ij_java_keep_indents_on_empty_lines = false
+ij_java_keep_line_breaks = true
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_classes_in_one_line = false
+ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_methods_in_one_line = false
+ij_java_label_indent_absolute = false
+ij_java_label_indent_size = 0
+ij_java_lambda_brace_style = end_of_line
+ij_java_layout_static_imports_separately = true
+ij_java_line_comment_add_space = false
+ij_java_line_comment_add_space_on_reformat = false
+ij_java_line_comment_at_first_column = true
+ij_java_message_dd_suffix = EJB
+ij_java_message_eb_suffix = Bean
+ij_java_method_annotation_wrap = split_into_lines
+ij_java_method_brace_style = end_of_line
+ij_java_method_call_chain_wrap = normal
+ij_java_method_parameters_new_line_after_left_paren = false
+ij_java_method_parameters_right_paren_on_new_line = false
+ij_java_method_parameters_wrap = normal
+ij_java_modifier_list_wrap = false
+ij_java_multi_catch_types_wrap = normal
+ij_java_names_count_to_use_import_on_demand = 999
+ij_java_new_line_after_lparen_in_annotation = false
+ij_java_new_line_after_lparen_in_record_header = false
+ij_java_parameter_annotation_wrap = normal
+ij_java_parentheses_expression_new_line_after_left_paren = false
+ij_java_parentheses_expression_right_paren_on_new_line = false
+ij_java_place_assignment_sign_on_next_line = false
+ij_java_prefer_longer_names = true
+ij_java_prefer_parameters_wrap = false
+ij_java_record_components_wrap = normal
+ij_java_repeat_synchronized = true
+ij_java_replace_instanceof_and_cast = false
+ij_java_replace_null_check = true
+ij_java_replace_sum_lambda_with_method_ref = true
+ij_java_resource_list_new_line_after_left_paren = false
+ij_java_resource_list_right_paren_on_new_line = false
+ij_java_resource_list_wrap = normal
+ij_java_rparen_on_new_line_in_annotation = false
+ij_java_rparen_on_new_line_in_record_header = false
+ij_java_session_dd_suffix = EJB
+ij_java_session_eb_suffix = Bean
+ij_java_session_hi_suffix = Home
+ij_java_session_lhi_prefix = Local
+ij_java_session_lhi_suffix = Home
+ij_java_session_li_prefix = Local
+ij_java_session_si_suffix = Service
+ij_java_space_after_closing_angle_bracket_in_type_argument = false
+ij_java_space_after_colon = true
+ij_java_space_after_comma = true
+ij_java_space_after_comma_in_type_arguments = true
+ij_java_space_after_for_semicolon = true
+ij_java_space_after_quest = true
+ij_java_space_after_type_cast = true
+ij_java_space_before_annotation_array_initializer_left_brace = false
+ij_java_space_before_annotation_parameter_list = false
+ij_java_space_before_array_initializer_left_brace = true
+ij_java_space_before_catch_keyword = true
+ij_java_space_before_catch_left_brace = true
+ij_java_space_before_catch_parentheses = true
+ij_java_space_before_class_left_brace = true
+ij_java_space_before_colon = true
+ij_java_space_before_colon_in_foreach = true
+ij_java_space_before_comma = false
+ij_java_space_before_do_left_brace = true
+ij_java_space_before_else_keyword = true
+ij_java_space_before_else_left_brace = true
+ij_java_space_before_finally_keyword = true
+ij_java_space_before_finally_left_brace = true
+ij_java_space_before_for_left_brace = true
+ij_java_space_before_for_parentheses = true
+ij_java_space_before_for_semicolon = false
+ij_java_space_before_if_left_brace = true
+ij_java_space_before_if_parentheses = true
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_left_brace = true
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+ij_java_space_before_quest = true
+ij_java_space_before_switch_left_brace = true
+ij_java_space_before_switch_parentheses = true
+ij_java_space_before_synchronized_left_brace = true
+ij_java_space_before_synchronized_parentheses = true
+ij_java_space_before_try_left_brace = true
+ij_java_space_before_try_parentheses = true
+ij_java_space_before_type_parameter_list = false
+ij_java_space_before_while_keyword = true
+ij_java_space_before_while_left_brace = true
+ij_java_space_before_while_parentheses = true
+ij_java_space_inside_one_line_enum_braces = false
+ij_java_space_within_empty_array_initializer_braces = false
+ij_java_space_within_empty_method_call_parentheses = false
+ij_java_space_within_empty_method_parentheses = false
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_annotation_eq = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
+ij_java_spaces_within_angle_brackets = false
+ij_java_spaces_within_annotation_parentheses = false
+ij_java_spaces_within_array_initializer_braces = false
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_for_parentheses = false
+ij_java_spaces_within_if_parentheses = false
+ij_java_spaces_within_method_call_parentheses = false
+ij_java_spaces_within_method_parentheses = false
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_record_header = false
+ij_java_spaces_within_switch_parentheses = false
+ij_java_spaces_within_synchronized_parentheses = false
+ij_java_spaces_within_try_parentheses = false
+ij_java_spaces_within_while_parentheses = false
+ij_java_special_else_if_treatment = true
+ij_java_subclass_name_suffix = Impl
+ij_java_ternary_operation_signs_on_next_line = false
+ij_java_ternary_operation_wrap = normal
+ij_java_test_name_suffix = Test
+ij_java_throws_keyword_wrap = normal
+ij_java_throws_list_wrap = normal
+ij_java_use_external_annotations = false
+ij_java_use_fq_class_names = false
+ij_java_use_relative_indents = false
+ij_java_use_single_class_imports = true
+ij_java_variable_annotation_wrap = normal
+ij_java_visibility = public
+ij_java_while_brace_force = always
+ij_java_while_on_new_line = false
+ij_java_wrap_comments = false
+ij_java_wrap_first_method_in_call_chain = false
+ij_java_wrap_long_lines = false
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
+

From 5d80b3837137d4c3c4ee249f2038435a68c4191c Mon Sep 17 00:00:00 2001
From: Bob Du <i@bobdu.cc>
Date: Fri, 4 Nov 2022 01:12:59 +0800
Subject: [PATCH 257/734] [helm] fix default ingress path value (#2673)

* fix: helm value default ingress path

Signed-off-by: BobDu <i@bobdu.cc>

* Update Chart.yaml

Signed-off-by: BobDu <i@bobdu.cc>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 charts/kafka-ui/Chart.yaml  | 2 +-
 charts/kafka-ui/values.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 2da8388a44a..1ecf0eeecea 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.4.4
+version: 0.4.5
 appVersion: v0.4.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/values.yaml b/charts/kafka-ui/values.yaml
index 904cb4e6cc2..93d08100d97 100644
--- a/charts/kafka-ui/values.yaml
+++ b/charts/kafka-ui/values.yaml
@@ -100,7 +100,7 @@ ingress:
   ingressClassName: ""
 
   # The path for the Ingress
-  path: ""
+  path: "/"
 
   # The hostname for the Ingress
   host: ""

From c4bbbbe3da06779907a57b05354bcfcb9919ce81 Mon Sep 17 00:00:00 2001
From: Sherif Ayad <sherifkayad@users.noreply.github.com>
Date: Thu, 3 Nov 2022 18:16:04 +0100
Subject: [PATCH 258/734] [Helm] Added annotations for the deployment (#2749)

Signed-off-by: Sherif Ayad <sherif.k.ayad@gmail.com>

Signed-off-by: Sherif Ayad <sherif.k.ayad@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 charts/kafka-ui/Chart.yaml                | 2 +-
 charts/kafka-ui/templates/deployment.yaml | 4 ++++
 charts/kafka-ui/values.yaml               | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 1ecf0eeecea..2ae296b4ee6 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.4.5
+version: 0.4.6
 appVersion: v0.4.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index 51703c7ed30..a253fc6df51 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "kafka-ui.fullname" . }}
   labels:
     {{- include "kafka-ui.labels" . | nindent 4 }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
 {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
diff --git a/charts/kafka-ui/values.yaml b/charts/kafka-ui/values.yaml
index 93d08100d97..35e3ad3dd59 100644
--- a/charts/kafka-ui/values.yaml
+++ b/charts/kafka-ui/values.yaml
@@ -69,6 +69,10 @@ networkPolicy:
 podAnnotations: {}
 podLabels: {}
 
+## Annotations to be added to kafka-ui Deployment
+##
+annotations: {}
+
 podSecurityContext:
   {}
   # fsGroup: 2000

From b1891c021bc587f7c2ab7b28f13a4745ceab1f49 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Fri, 4 Nov 2022 14:03:33 +0200
Subject: [PATCH 259/734] [e2e] review tests to use more object details while
 creating and updating #2699 (#2864)

* [e2e] review tests to use more object details while creating and updating#2699

* [e2e] review tests to use more object details while creating and updating#2699

* [e2e] review tests to use more object details while creating and updating#2699

* [e2e] review tests to use more object details while creating and updating#2699

* [e2e] review tests to use more object details while creating and updating#2699

* [e2e]Fix review tests to use more object details while creating and updating#2699

* [e2e]Fix2 review tests to use more object details while creating and updating#2699

* [e2e]Fix3 review tests to use more object details while creating and updating#2699

* [e2e]Fix3 review tests to use more object details while creating and updating#2699

* [e2e]Fix3 review tests to use more object details while creating and updating#2699

* [e2e]Fix3 review tests to use more object details while creating and updating#2699

* [e2e]Fix3 review tests to use more object details while creating and updating#2699

* [e2e]Fix without loadingSpinner.

* [e2e]Fix without loadingSpinner.

* [e2e]Fix without configTab.

* fix KafkaConnectList()

* [e2e]Fix with refresh.

* fix ConnectorsTests()

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../com/provectus/kafka/ui/models/Schema.java |  6 +-
 .../com/provectus/kafka/ui/models/Topic.java  |  8 ++-
 .../provectus/kafka/ui/pages/NaviSideBar.java |  9 ++-
 .../pages/connector/ConnectorCreateForm.java  | 14 +++--
 .../ui/pages/connector/ConnectorDetails.java  | 61 +++++++++++--------
 .../ui/pages/connector/KafkaConnectList.java  | 17 +++---
 .../kafka/ui/pages/schema/SchemaDetails.java  | 13 ++++
 .../ui/pages/topic/TopicCreateEditForm.java   | 49 +++++++++++----
 .../kafka/ui/pages/topic/TopicDetails.java    | 22 ++++++-
 .../kafka/ui/utilities/WebUtils.java          | 12 ++++
 .../kafka/ui/tests/ConnectorsTests.java       | 31 +++++++---
 .../kafka/ui/tests/SchemasTests.java          | 22 ++++++-
 .../provectus/kafka/ui/tests/TopicTests.java  | 50 ++++++++++-----
 13 files changed, 225 insertions(+), 89 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
index 8097c2e7d72..a9c7dca75bf 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
@@ -14,19 +14,19 @@ public class Schema {
     private SchemaType type;
 
     public static Schema createSchemaAvro(){
-        return new Schema().setName(randomAlphabetic(10))
+        return new Schema().setName("schema_avro-" + randomAlphabetic(5))
                 .setType(SchemaType.AVRO)
                 .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_value.json");
     }
 
     public static Schema createSchemaJson(){
-        return new Schema().setName(randomAlphabetic(10))
+        return new Schema().setName("schema_json-" + randomAlphabetic(5))
                 .setType(SchemaType.JSON)
                 .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_Json_Value.json");
     }
 
     public static Schema createSchemaProtobuf(){
-        return new Schema().setName(randomAlphabetic(10))
+        return new Schema().setName("schema_protobuf-" + randomAlphabetic(5))
                 .setType(SchemaType.PROTOBUF)
                 .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_protobuf_value.txt");
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
index 18763e37191..d9a306a4f57 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
@@ -1,10 +1,14 @@
 package com.provectus.kafka.ui.models;
 
+import com.provectus.kafka.ui.pages.topic.TopicCreateEditForm;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 @Data
 @Accessors(chain = true)
 public class Topic {
-    private String name, cleanupPolicyValue, timeToRetainData, maxSizeOnDisk, maxMessageBytes, messageKey, messageContent ;
-}
+    private String name, timeToRetainData, maxMessageBytes, messageKey, messageContent,
+            partitions, customParameter;
+    private TopicCreateEditForm.CleanupPolicyValue cleanupPolicyValue;
+    private TopicCreateEditForm.MaxSizeOnDisk maxSizeOnDisk;
+}
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
index 0f6f4c22609..565bbd24e5c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
@@ -11,6 +11,7 @@
 
 import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByActions;
 
 public class NaviSideBar {
 
@@ -22,7 +23,7 @@ public class NaviSideBar {
     private SelenideElement expandCluster(String clusterName) {
         SelenideElement clusterElement = $x(String.format(clusterElementLocator, clusterName)).shouldBe(Condition.visible);
         if (clusterElement.parent().$$x(".//ul").size() == 0) {
-            clusterElement.click();
+            clickByActions(clusterElement);
         }
         return clusterElement;
     }
@@ -36,10 +37,8 @@ public NaviSideBar waitUntilScreenReady() {
 
     @Step
     public NaviSideBar openSideMenu(String clusterName, SideMenuOption option) {
-        expandCluster(clusterName)
-                .parent()
-                .$x(String.format(sideMenuOptionElementLocator, option.value))
-                .click();
+        clickByActions(expandCluster(clusterName).parent()
+                .$x(String.format(sideMenuOptionElementLocator, option.value)));
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
index 5c007137465..26cab86f63b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
@@ -5,6 +5,7 @@
 import io.qameta.allure.Step;
 
 import static com.codeborne.selenide.Selenide.$x;
+import static com.codeborne.selenide.Selenide.refresh;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
 
 public class ConnectorCreateForm {
@@ -23,13 +24,18 @@ public ConnectorCreateForm waitUntilScreenReady() {
     }
 
     @Step
-    public ConnectorCreateForm setConnectorConfig(String connectName, String configJson) {
+    public ConnectorCreateForm setConnectorDetails(String connectName, String configJson) {
         nameField.shouldBe(Condition.enabled).setValue(connectName);
         configField.shouldBe(Condition.enabled).click();
         contentTextArea.setValue(configJson);
         nameField.shouldBe(Condition.enabled).click();
-        clickByJavaScript(submitBtn);
-        loadingSpinner.shouldBe(Condition.disappear);
         return this;
     }
-}
\ No newline at end of file
+
+    @Step
+    public ConnectorCreateForm clickSubmitButton() {
+      clickByJavaScript(submitBtn);
+      loadingSpinner.shouldBe(Condition.disappear);
+      return this;
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
index c099c60563d..e5e6b4cbd3c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
@@ -1,35 +1,36 @@
 package com.provectus.kafka.ui.pages.connector;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
-
+import java.time.Duration;
 import java.util.Arrays;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-
 public class ConnectorDetails {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
-    protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
-    protected SelenideElement deleteBtn = $x("//li/div[contains(text(),'Delete')]");
-    protected SelenideElement confirmBtnMdl = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
-    protected SelenideElement submitBtn = $x("//button[@type='submit']");
-    protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
-    protected SelenideElement taskTab = $x("//a[contains(text(),'Tasks')]");
-    protected SelenideElement configTab = $x("//a[contains(text(),'Config')]");
-    protected SelenideElement configField = $x("//div[@id='config']");
-    protected SelenideElement successAlertMessage = $x("//div[contains(text(),'Config successfully updated')]");
+  protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+  protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
+  protected SelenideElement deleteBtn = $x("//li/div[contains(text(),'Delete')]");
+  protected SelenideElement confirmBtnMdl = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
+  protected SelenideElement submitBtn = $x("//button[@type='submit']");
+  protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
+  protected SelenideElement taskTab = $x("//a[contains(text(),'Tasks')]");
+  protected SelenideElement configTab = $x("//a[contains(text(),'Config')]");
+  protected SelenideElement configField = $x("//div[@id='config']");
+  protected SelenideElement successAlertMessage = $x("//div[contains(text(),'Config successfully updated')]");
+  protected String connectorHeaderLocator = "//h1[contains(text(),'%s')]";
 
-
-    @Step
-    public ConnectorDetails waitUntilScreenReady() {
-        loadingSpinner.shouldBe(Condition.disappear);
-        Arrays.asList(taskTab,configTab).forEach(elementsMenu -> elementsMenu.shouldBe(Condition.visible));
-        return this;
-    }
+  @Step
+  public ConnectorDetails waitUntilScreenReady() {
+    loadingSpinner.shouldBe(Condition.disappear);
+    dotMenuBtn.shouldBe(Condition.visible);
+    return this;
+  }
 
     @Step
     public ConnectorDetails openConfigTab() {
@@ -43,11 +44,16 @@ public ConnectorDetails setConfig(String configJson) {
         clearByKeyboard(contentTextArea);
         contentTextArea.setValue(configJson);
         configField.shouldBe(Condition.enabled).click();
-        clickByJavaScript(submitBtn);
-        successAlertMessage.shouldBe(Condition.visible);
         return this;
     }
 
+    @Step
+    public ConnectorDetails clickSubmitButton() {
+      clickByJavaScript(submitBtn);
+      successAlertMessage.shouldBe(Condition.visible);
+      return this;
+    }
+
     @Step
     public ConnectorDetails openDotMenu() {
         clickByJavaScript(dotMenuBtn);
@@ -74,4 +80,9 @@ public ConnectorDetails deleteConnector() {
         clickConfirmBtn();
         return this;
     }
-}
\ No newline at end of file
+
+    @Step
+    public boolean isConnectorHeaderVisible(String connectorName) {
+        return isVisible($x(String.format(connectorHeaderLocator,connectorName)));
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
index 36a905d2d91..16104ac1ca8 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
@@ -15,16 +15,15 @@
 public class KafkaConnectList {
 
     protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
-    protected SelenideElement pageTitle = $x("//h1[text()='Connectors']");
     protected SelenideElement createConnectorBtn = $x("//button[contains(text(),'Create Connector')]");
     protected SelenideElement connectorsGrid = $x("//table");
-    protected String tabElementLocator = "//td[contains(text(),'%s')]";
+    protected String connectorNameLocator = "//td[contains(text(),'%s')]";
 
     @Step
     public KafkaConnectList waitUntilScreenReady() {
-        loadingSpinner.shouldBe(Condition.disappear);
-        pageTitle.shouldBe(Condition.visible);
-        return this;
+      loadingSpinner.shouldBe(Condition.disappear);
+      createConnectorBtn.shouldBe(Condition.visible);
+      return this;
     }
 
     @Step
@@ -35,7 +34,7 @@ public KafkaConnectList clickCreateConnectorBtn() {
 
     @Step
     public KafkaConnectList openConnector(String connectorName) {
-        $x(String.format(tabElementLocator,connectorName))
+        $x(String.format(connectorNameLocator, connectorName))
                 .shouldBe(Condition.enabled).click();
         return this;
     }
@@ -43,13 +42,13 @@ public KafkaConnectList openConnector(String connectorName) {
     @Step
     public boolean isConnectorVisible(String connectorName) {
         connectorsGrid.shouldBe(Condition.visible);
-        return isVisible($x(String.format(tabElementLocator,connectorName)));
+        return isVisible($x(String.format(connectorNameLocator,connectorName)));
     }
 
     @Step
     public KafkaConnectList connectorIsUpdatedInList(String connectorName, String topicName) {
-        $x(String.format(tabElementLocator,connectorName)).shouldBe(Condition.visible);
-        By.xpath(String.format(tabElementLocator,topicName)).refreshUntil(Condition.visible);
+        $x(String.format(connectorNameLocator,connectorName)).shouldBe(Condition.visible);
+        By.xpath(String.format(connectorNameLocator,topicName)).refreshUntil(Condition.visible);
         return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
index e3f392514b5..981de748e99 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
@@ -7,6 +7,7 @@
 import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 public class SchemaDetails {
 
@@ -17,6 +18,8 @@ public class SchemaDetails {
     protected SelenideElement editSchemaBtn = $x("//button[contains(text(),'Edit Schema')]");
     protected SelenideElement removeBtn = $x("//*[contains(text(),'Remove')]");
     protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
+    protected SelenideElement schemaTypeDdl = $x("//h4[contains(text(),'Type')]/../p");
+    protected String schemaHeaderLocator = "//h1[contains(text(),'%s')]";
 
     @Step
     public SchemaDetails waitUntilScreenReady() {
@@ -30,6 +33,16 @@ public String getCompatibility() {
         return compatibilityField.getText();
     }
 
+    @Step
+    public boolean isSchemaHeaderVisible(String schemaName) {
+        return isVisible($x(String.format(schemaHeaderLocator,schemaName)));
+    }
+
+    @Step
+    public String getSchemaType() {
+        return schemaTypeDdl.getText();
+    }
+
     @Step
     public SchemaDetails openEditSchema(){
         editSchemaBtn.shouldBe(Condition.visible).click();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
index 8a71ddb6ffb..539520445ed 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
@@ -14,12 +14,14 @@ public class TopicCreateEditForm {
 
     protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
+    protected SelenideElement partitionsField = $x("//input[@name='partitions']");
     protected SelenideElement nameField = $x("//input[@name='name']");
     protected SelenideElement maxMessageBytesField = $x("//input[@name='maxMessageBytes']");
     protected SelenideElement minInSyncReplicasField = $x("//input[@name='minInSyncReplicas']");
     protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
+    protected SelenideElement maxSizeOnDiscDdl = $x("//ul[@id='topicFormRetentionBytes']");
     protected SelenideElement createTopicBtn = $x("//button[@type='submit']");
-    protected String cleanUpPolicyTypeLocator = "//li[text()='%s']";
+    protected String ddlElementLocator = "//li[@value='%s']";
 
     @Step
     public TopicCreateEditForm waitUntilScreenReady(){
@@ -53,8 +55,9 @@ public TopicCreateEditForm setTimeToRetainDataInMs(String ms) {
     }
 
     @Step
-    public TopicCreateEditForm setMaxSizeOnDiskInGB(String value) {
-        new KafkaUISelectElement("retentionBytes").selectByVisibleText(value);
+    public TopicCreateEditForm setMaxSizeOnDiskInGB(MaxSizeOnDisk MaxSizeOnDisk) {
+        maxSizeOnDiscDdl.shouldBe(Condition.visible).click();
+        $x(String.format(ddlElementLocator, MaxSizeOnDisk.getOptionValue())).shouldBe(Condition.visible).click();
         return this;
     }
 
@@ -69,6 +72,12 @@ public TopicCreateEditForm setMaxMessageBytes(String bytes) {
         return setMaxMessageBytes(Long.parseLong(bytes));
     }
 
+    @Step
+    public TopicCreateEditForm setPartitions(String partitions){
+        partitionsField.setValue(partitions);
+        return this;
+    }
+
     @Step
     public TopicCreateEditForm setTimeToRetainDataInMsUsingButtons(String value) {
         timeToRetainField
@@ -81,15 +90,9 @@ public TopicCreateEditForm setTimeToRetainDataInMsUsingButtons(String value) {
     }
 
     @Step
-    public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyValue) {
-        return selectFromDropDownByOptionValue("cleanupPolicy",
-                cleanupPolicyValue.getOptionValue());
-    }
-
-    @Step
-    public TopicCreateEditForm selectCleanupPolicy(String cleanupPolicyOptionValue) {
+    public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyOptionValue) {
         cleanUpPolicyDdl.shouldBe(Condition.visible).click();
-        $x(String.format(cleanUpPolicyTypeLocator,cleanupPolicyOptionValue)).shouldBe(Condition.visible).click();
+        $x(String.format(ddlElementLocator,cleanupPolicyOptionValue.getOptionValue())).shouldBe(Condition.visible).click();
         return this;
     }
 
@@ -242,6 +245,30 @@ public String getVisibleText() {
         }
     }
 
+    public enum MaxSizeOnDisk {
+        NOT_SET("-1", "Not Set"),
+        SIZE_1_GB("1073741824", "1 GB"),
+        SIZE_10_GB("10737418240", "10 GB"),
+        SIZE_20_GB("21474836480", "20 GB"),
+        SIZE_50_GB("53687091200", "50 GB");
+
+        private final String optionValue;
+        private final String visibleText;
+
+        MaxSizeOnDisk(String optionValue, String visibleText) {
+            this.optionValue = optionValue;
+            this.visibleText = visibleText;
+        }
+
+        public String getOptionValue() {
+            return optionValue;
+        }
+
+        public String getVisibleText() {
+            return visibleText;
+        }
+    }
+
     private TopicCreateEditForm selectFromDropDownByOptionValue(String dropDownElementName,
                                                                 String optionValue) {
         KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 73ce320a485..a065169c0ce 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -11,6 +11,7 @@
 
 import static com.codeborne.selenide.Selenide.*;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 @ExtensionMethod({WaitUtils.class})
 public class TopicDetails {
@@ -26,7 +27,10 @@ public class TopicDetails {
     protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
     protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
     protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
+    protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
+    protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
     protected String consumerIdLocator = "//a[@title='%s']";
+    protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
 
     @Step
     public TopicDetails waitUntilScreenReady() {
@@ -54,6 +58,21 @@ public TopicDetails openDotPartitionIdMenu() {
         return this;
     }
 
+    @Step
+    public String getCleanUpPolicy(){
+      return cleanUpPolicyField.getText();
+    }
+
+    @Step
+    public String getPartitions(){
+        return partitionsField.getText();
+    }
+
+    @Step
+    public boolean isTopicHeaderVisible(String topicName) {
+        return isVisible($x(String.format(topicHeaderLocator,topicName)));
+    }
+
     @Step
     public TopicDetails clickClearMessagesBtn() {
         clearMessagesBtn.shouldBe(Condition.visible.because("Clear Messages invisible")).click();
@@ -74,7 +93,6 @@ public TopicDetails clickProduceMessageBtn() {
         clickByJavaScript(produceMessageBtn);
         return this;
     }
-
     @Step
     public TopicDetails openConsumerGroup(String consumerId) {
         $x(String.format(consumerIdLocator, consumerId)).click();
@@ -158,4 +176,4 @@ public String toString() {
             return "TopicMenu{" + "value='" + value + '\'' + '}';
         }
     }
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index 7215cb7b86b..ad93bfbc772 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -2,14 +2,25 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.codeborne.selenide.WebDriverRunner;
 import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.Keys;
+import org.openqa.selenium.interactions.Actions;
 
 import static com.codeborne.selenide.Selenide.executeJavaScript;
 
 @Slf4j
 public class WebUtils {
 
+    public static void clickByActions(SelenideElement element) {
+        log.debug("\nclickByActions: {}", element.getSearchCriteria());
+        element.shouldBe(Condition.enabled);
+        new Actions(WebDriverRunner.getWebDriver())
+                .moveToElement(element)
+                .click(element)
+                .perform();
+    }
+
     public static void clickByJavaScript(SelenideElement element) {
         log.debug("\nclickByJavaScript: {}", element.getSearchCriteria());
         element.shouldBe(Condition.enabled);
@@ -34,4 +45,5 @@ public static boolean isVisible(SelenideElement element) {
         }
         return isVisible;
     }
+
 }
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index bd06882887f..1203fc9ebcf 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -15,6 +15,7 @@
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
+import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ConnectorsTests extends BaseTest {
@@ -26,19 +27,19 @@ public class ConnectorsTests extends BaseTest {
     private static final String MESSAGE_CONTENT = "message_content_create_topic.json";
     private static final String MESSAGE_KEY = " ";
     private static final Topic TOPIC_FOR_CREATE = new Topic()
-            .setName("topic_for_create_connector")
+            .setName("topic_for_create_connector-" + randomAlphabetic(5))
             .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
     private static final Topic TOPIC_FOR_DELETE = new Topic()
-            .setName("topic_for_delete_connector")
+            .setName("topic_for_delete_connector-" + randomAlphabetic(5))
             .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
     private static final Topic TOPIC_FOR_UPDATE = new Topic()
-            .setName("topic_for_update_connector")
+            .setName("topic_for_update_connector-" + randomAlphabetic(5))
             .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
     private static final Connector CONNECTOR_FOR_DELETE = new Connector()
-            .setName("sink_postgres_activities_e2e_checks_for_delete")
+            .setName("sink_postgres_activities_e2e_checks_for_delete-" + randomAlphabetic(5))
             .setConfig(getResourceAsString("delete_connector_config.json"));
     private static final Connector CONNECTOR_FOR_UPDATE = new Connector()
-            .setName("sink_postgres_activities_e2e_checks_for_update")
+            .setName("sink_postgres_activities_e2e_checks_for_update-" + randomAlphabetic(5))
             .setConfig(getResourceAsString("config_for_create_connector_via_api.json"));
 
     @BeforeAll
@@ -60,7 +61,7 @@ public void beforeAll() {
     @Test
     public void createConnector() {
         Connector connectorForCreate = new Connector()
-                .setName("sink_postgres_activities_e2e_checks")
+                .setName("sink_postgres_activities_e2e_checks-" + randomAlphabetic(5))
                 .setConfig(getResourceAsString("config_for_create_connector.json"));
         naviSideBar
                 .openSideMenu(KAFKA_CONNECT);
@@ -69,12 +70,23 @@ public void createConnector() {
                 .clickCreateConnectorBtn();
         connectorCreateForm
                 .waitUntilScreenReady()
-                .setConnectorConfig(connectorForCreate.getName(), connectorForCreate.getConfig());
+                .setConnectorDetails(connectorForCreate.getName(), connectorForCreate.getConfig())
+                .clickSubmitButton();
+        connectorDetails
+                .waitUntilScreenReady();
+        naviSideBar
+                .openSideMenu(KAFKA_CONNECT);
+        kafkaConnectList
+                .waitUntilScreenReady()
+                .openConnector(connectorForCreate.getName());
+        connectorDetails
+                .waitUntilScreenReady();
+        Assertions.assertTrue(connectorDetails.isConnectorHeaderVisible(connectorForCreate.getName()),"isConnectorTitleVisible()");
         naviSideBar
                 .openSideMenu(KAFKA_CONNECT);
         kafkaConnectList
                 .waitUntilScreenReady();
-        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(connectorForCreate.getName()), "isConnectorVisible()");
+        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
         CONNECTOR_LIST.add(connectorForCreate);
     }
 
@@ -92,7 +104,8 @@ public void updateConnector() {
         connectorDetails
                 .waitUntilScreenReady()
                 .openConfigTab()
-                .setConfig(CONNECTOR_FOR_UPDATE.getConfig());
+                .setConfig(CONNECTOR_FOR_UPDATE.getConfig())
+                .clickSubmitButton();
         naviSideBar
                 .openSideMenu(KAFKA_CONNECT);
         kafkaConnectList
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index e76f28728e1..e0c33e2f3c0 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -8,6 +8,7 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
 import lombok.SneakyThrows;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.*;
 
 import java.util.ArrayList;
@@ -54,11 +55,16 @@ void createSchemaAvro() {
                 .clickSubmitBtn();
         schemaDetails
                 .waitUntilScreenReady();
+        SoftAssertions softly = new SoftAssertions();
+        softly.assertThat(schemaDetails.isSchemaHeaderVisible(schemaAvro.getName())).as("isSchemaHeaderVisible()").isTrue();
+        softly.assertThat(schemaDetails.getSchemaType()).as("getSchemaType()").isEqualTo(schemaAvro.getType().getValue());
+        softly.assertThat(schemaDetails.getCompatibility()).as("getCompatibility()").isEqualTo(CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue());
+        softly.assertAll();
         naviSideBar
                 .openSideMenu(SCHEMA_REGISTRY);
         schemaRegistryList
                 .waitUntilScreenReady();
-        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(schemaAvro.getName()),"isSchemaVisible()");
+        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaAvro);
     }
 
@@ -131,11 +137,16 @@ void createSchemaJson() {
                 .clickSubmitBtn();
         schemaDetails
                 .waitUntilScreenReady();
+        SoftAssertions softly = new SoftAssertions();
+        softly.assertThat(schemaDetails.isSchemaHeaderVisible(schemaJson.getName())).as("isSchemaHeaderVisible()").isTrue();
+        softly.assertThat(schemaDetails.getSchemaType()).as("getSchemaType()").isEqualTo(schemaJson.getType().getValue());
+        softly.assertThat(schemaDetails.getCompatibility()).as("getCompatibility()").isEqualTo(CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue());
+        softly.assertAll();
         naviSideBar
                 .openSideMenu(SCHEMA_REGISTRY);
         schemaRegistryList
                 .waitUntilScreenReady();
-        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(schemaJson.getName()),"isSchemaVisible()");
+        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(JSON_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaJson);
     }
 
@@ -180,11 +191,16 @@ void createSchemaProtobuf() {
                 .clickSubmitBtn();
         schemaDetails
                 .waitUntilScreenReady();
+        SoftAssertions softly = new SoftAssertions();
+        softly.assertThat(schemaDetails.isSchemaHeaderVisible(schemaProtobuf.getName())).as("isSchemaHeaderVisible()").isTrue();
+        softly.assertThat(schemaDetails.getSchemaType()).as("getSchemaType()").isEqualTo(schemaProtobuf.getType().getValue());
+        softly.assertThat(schemaDetails.getCompatibility()).as("getCompatibility()").isEqualTo(CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue());
+        softly.assertAll();
         naviSideBar
                 .openSideMenu(SCHEMA_REGISTRY);
         schemaRegistryList
                 .waitUntilScreenReady();
-        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(schemaProtobuf.getName()),"isSchemaVisible()");
+        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaProtobuf);
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 33ad3d015a1..97f70c194e3 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -15,29 +15,36 @@
 import java.util.List;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.CleanupPolicyValue.COMPACT;
+import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.CleanupPolicyValue.DELETE;
+import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.MaxSizeOnDisk.SIZE_20_GB;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TopicTests extends BaseTest {
     private static final long SUITE_ID = 2;
     private static final String SUITE_TITLE = "Topics";
-
+    private static final Topic TOPIC_TO_CREATE = new Topic()
+            .setName("new-topic-"+ randomAlphabetic(5))
+            .setPartitions("1")
+            .setCleanupPolicyValue(DELETE);
     private static final Topic TOPIC_FOR_UPDATE = new Topic()
-            .setName("topic-to-update")
-            .setCleanupPolicyValue("Compact")
+            .setName("topic-to-update-" + randomAlphabetic(5))
+            .setCleanupPolicyValue(COMPACT)
             .setTimeToRetainData("604800001")
-            .setMaxSizeOnDisk("20 GB")
+            .setMaxSizeOnDisk(SIZE_20_GB)
             .setMaxMessageBytes("1000020")
             .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
             .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
     private static final Topic TOPIC_FOR_MESSAGES = new Topic()
-            .setName("topic-with-clean-message-attribute")
+            .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
             .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
             .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
 
-    private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete");
+    private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete-" + randomAlphabetic(5));
     private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
     @BeforeAll
@@ -52,7 +59,6 @@ public void beforeAll() {
     @CaseId(199)
     @Test
     public void createTopic() {
-        Topic topicToCreate = new Topic().setName("new-topic");
         naviSideBar
                 .openSideMenu(TOPICS);
         topicsList
@@ -60,16 +66,28 @@ public void createTopic() {
                 .clickAddTopicBtn();
         topicCreateEditForm
                 .waitUntilScreenReady()
-                .setTopicName(topicToCreate.getName())
+                .setTopicName(TOPIC_TO_CREATE.getName())
+                .setPartitions(TOPIC_TO_CREATE.getPartitions())
+                .selectCleanupPolicy(TOPIC_TO_CREATE.getCleanupPolicyValue())
                 .clickCreateTopicBtn();
         topicDetails
                 .waitUntilScreenReady();
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
+                .waitUntilScreenReady()
+                .openTopic(TOPIC_TO_CREATE.getName());
+        SoftAssertions softly = new SoftAssertions();
+        softly.assertThat(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName())).as("isTopicHeaderVisible()").isTrue();
+        softly.assertThat(topicDetails.getCleanUpPolicy()).as("getCleanUpPolicy()").isEqualTo(TOPIC_TO_CREATE.getCleanupPolicyValue().toString());
+        softly.assertThat(topicDetails.getPartitions()).as("getPartitions()").isEqualTo(TOPIC_TO_CREATE.getPartitions());
+        softly.assertAll();
         naviSideBar
                 .openSideMenu(TOPICS);
         topicsList
                 .waitUntilScreenReady();
-        Assertions.assertTrue(topicsList.isTopicVisible(topicToCreate.getName()), "isTopicVisible");
-        TOPIC_LIST.add(topicToCreate);
+        Assertions.assertTrue(topicsList.isTopicVisible(TOPIC_TO_CREATE.getName()), "isTopicVisible");
+        TOPIC_LIST.add(TOPIC_TO_CREATE);
     }
 
     @Disabled("https://github.com/provectus/kafka-ui/issues/2625")
@@ -89,7 +107,7 @@ public void updateTopic() {
                 .openEditSettings();
         topicCreateEditForm
                 .waitUntilScreenReady()
-                .selectCleanupPolicy(TOPIC_FOR_UPDATE.getCleanupPolicyValue())
+                .selectCleanupPolicy((TOPIC_FOR_UPDATE.getCleanupPolicyValue()))
                 .setMinInsyncReplicas(10)
                 .setTimeToRetainDataInMs(TOPIC_FOR_UPDATE.getTimeToRetainData())
                 .setMaxSizeOnDiskInGB(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
@@ -106,10 +124,10 @@ public void updateTopic() {
                 .waitUntilScreenReady()
                 .openEditSettings();
         SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("Cleanup Policy").isEqualTo(TOPIC_FOR_UPDATE.getCleanupPolicyValue());
-        softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("Time to retain").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
-        softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("Max size on disk").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk());
-        softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("Max message bytes").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
+        softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()").isEqualTo(TOPIC_FOR_UPDATE.getCleanupPolicyValue().getVisibleText());
+        softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
+        softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk().getVisibleText());
+        softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
         softly.assertAll();
     }
 
@@ -134,7 +152,7 @@ public void deleteTopic() {
         Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
         TOPIC_LIST.remove(TOPIC_FOR_DELETE);
     }
-    
+
     @DisplayName("produce message")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)

From 0818bb0144ca4b2f3b23a0ab9e374fa8bf727901 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 4 Nov 2022 23:11:08 +0400
Subject: [PATCH 260/734] [helm] Fix version and the workflow (#2880)

---
 .github/workflows/release-helm.yaml | 1 +
 charts/kafka-ui/Chart.yaml          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-helm.yaml b/.github/workflows/release-helm.yaml
index 2e9cdb280dd..50c10266b62 100644
--- a/.github/workflows/release-helm.yaml
+++ b/.github/workflows/release-helm.yaml
@@ -29,6 +29,7 @@ jobs:
           git fetch origin
           git stash
           git checkout -b gh-pages origin/gh-pages
+          git pull
           helm repo index .
           git add -f ${MSG##*/} index.yaml
           git commit -m "release ${VERSION}"
diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 2ae296b4ee6..1ecf0eeecea 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.4.6
+version: 0.4.5
 appVersion: v0.4.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

From 70cdeea819e812ccf38bb1daa1dd27ba6296d28a Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Mon, 7 Nov 2022 12:39:16 +0200
Subject: [PATCH 261/734] [e2e] Checking Topic creation possibility in case of
 empty Topic Name (#2888)

* [e2e] Checking Topic creation possibility in case of empty Topic Name

* [e2e] Fix1. createTopicButtonIsEnabled() changed to isCreateTopicButtonEnabled()
---
 .../ui/pages/topic/TopicCreateEditForm.java   |  5 ++
 .../kafka/ui/utilities/WebUtils.java          | 13 ++++-
 .../provectus/kafka/ui/tests/TopicTests.java  | 49 ++++++++++++++-----
 3 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
index 539520445ed..9a97e6dba32 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
@@ -8,6 +8,7 @@
 
 import static com.codeborne.selenide.Selenide.*;
 import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
+import static com.provectus.kafka.ui.utilities.WebUtils.isEnabled;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TopicCreateEditForm {
@@ -269,6 +270,10 @@ public String getVisibleText() {
         }
     }
 
+    public boolean isCreateTopicButtonEnabled(){
+       return isEnabled(createTopicBtn);
+    }
+
     private TopicCreateEditForm selectFromDropDownByOptionValue(String dropDownElementName,
                                                                 String optionValue) {
         KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index ad93bfbc772..e35cad9769a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -46,4 +46,15 @@ public static boolean isVisible(SelenideElement element) {
         return isVisible;
     }
 
-}
\ No newline at end of file
+  public static boolean isEnabled(SelenideElement element) {
+    log.debug("\nisEnabled: {}", element.getSearchCriteria());
+    boolean isEnabled = false;
+    try {
+      element.shouldBe(Condition.enabled);
+      isEnabled = true;
+    } catch (Throwable e) {
+      log.debug("{} is not enabled", element.getSearchCriteria());
+    }
+    return isEnabled;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 97f70c194e3..07bdf3b0b52 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -1,5 +1,14 @@
 package com.provectus.kafka.ui.tests;
 
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.CleanupPolicyValue.COMPACT;
+import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.CleanupPolicyValue.DELETE;
+import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.MaxSizeOnDisk.SIZE_20_GB;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.topic.TopicDetails;
@@ -8,20 +17,16 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qameta.allure.Issue;
 import io.qase.api.annotation.CaseId;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.*;
-
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
-import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.CleanupPolicyValue.COMPACT;
-import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.CleanupPolicyValue.DELETE;
-import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.MaxSizeOnDisk.SIZE_20_GB;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TopicTests extends BaseTest {
@@ -239,6 +244,26 @@ void redirectToConsumerFromTopic() {
                 .withFailMessage("isTopicInConsumersDetailsVisible").isTrue();
     }
 
+  @DisplayName("Checking Topic creation possibility in case of empty Topic Name")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(4)
+  @Test
+  void checkTopicCreatePossibility() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName("");
+    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
+    topicCreateEditForm
+        .setTopicName("testTopic1");
+    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isTrue();
+  }
+
     @AfterAll
     public void afterAll() {
         TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));

From 62f35e3e296791d1986fae07c8faa0290f4b1dc3 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen.schalanda@personio.de>
Date: Mon, 7 Nov 2022 11:57:59 +0100
Subject: [PATCH 262/734] Upgrade to Java 17 (Azul Zulu) (#2879)

* Feature: Upgrade to Java 17 (Azul Zulu)

Java/OpenJDK 13 has reached end of life (and end of security support)
more than 2.5 years ago: https://endoflife.date/java

This change set updates the build, CI pipeline, and Docker image of Kafka UI to Java 17 (LTS).

* Add back maven-compile-plugin to kafka-ui-e2e-checks
---
 .github/workflows/backend.yml                 | 15 +++------
 .github/workflows/branch-deploy.yml           | 15 +++------
 .github/workflows/build-public-image.yml      | 15 +++------
 .github/workflows/cve.yaml                    | 16 +++-------
 .github/workflows/e2e-checks.yaml             | 15 +++------
 .github/workflows/master.yaml                 | 16 +++-------
 .github/workflows/release.yaml                | 16 +++-------
 .../project/contributing/prerequisites.md     | 13 ++++----
 kafka-ui-api/Dockerfile                       |  5 ++-
 kafka-ui-api/pom.xml                          |  5 ---
 kafka-ui-contract/pom.xml                     |  2 --
 kafka-ui-e2e-checks/pom.xml                   |  9 ------
 pom.xml                                       | 32 +++++++++++++++++--
 13 files changed, 73 insertions(+), 101 deletions(-)

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 1d5b01275f0..0b031e89af3 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -16,17 +16,12 @@ jobs:
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Set up JDK 1.13
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.13
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index dd94c5c869e..0adf387085e 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -17,17 +17,12 @@ jobs:
           echo ::set-output name=tag::${tag}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Set up JDK 1.13
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.13
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
       - name: Build
         id: build
         run: |
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index c9d3bff1af7..493e7866477 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -14,17 +14,12 @@ jobs:
         run: |
           tag='${{ github.event.pull_request.number }}'
           echo ::set-output name=tag::${tag}
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-      - name: Set up JDK 1.13
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.13
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
       - name: Build
         id: build
         run: |
diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index 5e5d6f79822..cda9247dcc7 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -10,18 +10,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - name: Set up JDK 1.13
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.13
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
 
       - name: Build project
         id: build
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 5ffec3b2b7f..863f60f84b8 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -15,13 +15,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
       - name: Set the values
         id: set_env_values
         run: |
@@ -30,10 +23,12 @@ jobs:
         id: pull_chrome
         run: |
           docker pull selenium/standalone-chrome:103.0
-      - name: Set up JDK 1.13
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.13
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
       - name: Build with Maven
         id: build_app
         run: |
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 32642207961..c14a13d9c26 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -10,18 +10,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - name: Set up JDK 1.13
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.13
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
 
       - name: Build
         id: build
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 82a7087cff0..ab01dffe50c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -17,18 +17,12 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
 
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - name: Set up JDK 1.13
-        uses: actions/setup-java@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.13
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
 
       - name: Build with Maven
         id: build
diff --git a/documentation/project/contributing/prerequisites.md b/documentation/project/contributing/prerequisites.md
index fb21b352aa2..b2469678b0e 100644
--- a/documentation/project/contributing/prerequisites.md
+++ b/documentation/project/contributing/prerequisites.md
@@ -6,7 +6,7 @@ machine for local development.
 Before you begin contributing you must have:
 
 * A GitHub account
-* `Java` 13 or newer
+* `Java` 17 or newer
 * `Git`
 * `Docker`
 
@@ -17,18 +17,19 @@ Before you begin contributing you must have:
 ```sh
 brew cask
 ```
-3. Install JDK 13 via Homebrew cask:
+3. Install Eclipse Temurin 17 via Homebrew cask:
 ```sh
-brew tap adoptopenjdk/openjdk
-brew install adoptopenjdk13
+brew tap homebrew/cask-versions
+brew install temurin17
 ```
 4. Verify Installation
 ```sh
 java -version
 ```
-Note : In case JAVA13 is not set as your default Java then you can consider to include JAVA13 in your PATH after installation
+Note : In case OpenJDK 17 is not set as your default Java, you can consider to include it in your `$PATH` after installation
 ```sh
-export PATH="/Library/Java/JavaVirtualMachines/adoptopenjdk-13.jdk/Contents/Home/bin:$PATH
+export PATH="$(/usr/libexec/java_home -v 17)/bin:$PATH"
+export JAVA_HOME="$(/usr/libexec/java_home -v 17)"
 ```
 
 ## Tips
diff --git a/kafka-ui-api/Dockerfile b/kafka-ui-api/Dockerfile
index 2cd5fe08e55..c0c68ff0041 100644
--- a/kafka-ui-api/Dockerfile
+++ b/kafka-ui-api/Dockerfile
@@ -1,7 +1,6 @@
-FROM alpine:3.16.2
+FROM azul/zulu-openjdk-alpine:17
 
-RUN apk add --no-cache openjdk13-jre libc6-compat gcompat \
-&& addgroup -S kafkaui && adduser -S kafkaui -G kafkaui
+RUN addgroup -S kafkaui && adduser -S kafkaui -G kafkaui
 
 USER kafkaui
 
diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 65ab22682fd..e591069987b 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -262,10 +262,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.mapstruct</groupId>
@@ -293,7 +290,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
                     <argLine>@{argLine} --illegal-access=permit</argLine>
                 </configuration>
@@ -400,7 +396,6 @@
                     </plugin>
                     <plugin>
                         <artifactId>maven-resources-plugin</artifactId>
-                        <version>${maven-resources-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>copy-resources</id>
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index d9139a14f45..7f0863ed3b5 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -175,7 +175,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-clean-plugin</artifactId>
-                        <version>${maven-clean-plugin.version}</version>
                         <configuration>
                             <filesets>
                                 <fileset>
@@ -187,7 +186,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
-                        <version>${maven-resources-plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>copy-resource-one</id>
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 84e0808a2d6..54a41c56ca3 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -267,7 +267,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven.surefire-plugin.version}</version>
                         <configuration>
                             <skipTests>true</skipTests>
                         </configuration>
@@ -275,10 +274,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <source>${maven.compiler.source}</source>
-                            <target>${maven.compiler.target}</target>
-                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -319,10 +314,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <source>${maven.compiler.source}</source>
-                            <target>${maven.compiler.target}</target>
-                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/pom.xml b/pom.xml
index d977385b946..598ad62528c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,7 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>13</maven.compiler.source>
-        <maven.compiler.target>13</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <spring-boot.version>2.6.8</spring-boot.version>
@@ -26,7 +25,7 @@
         <pnpm.version>v7.4.0</pnpm.version>
         <fabric8-maven-plugin.version>0.40.2</fabric8-maven-plugin.version>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
@@ -87,6 +86,33 @@
         </pluginRepository>
     </pluginRepositories>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>${maven-resources-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>${maven-clean-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
     <groupId>com.provectus</groupId>
     <artifactId>kafka-ui</artifactId>
     <version>0.0.1-SNAPSHOT</version>

From b46ee9c5ccd2e8df436e05e76fad393bdd4c5179 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 7 Nov 2022 15:07:24 +0400
Subject: [PATCH 263/734] Broker configs: Display a tooltip about the source of
 the property (#2775)

* Broker configs: Display a tooltip about the source of the property #2679

* changed tooltip library to @tippyjs/react

* updated styled component import as S

* created separate object in root for theme

* moved tooltip component to Common

* Renamed TooltipComponent to Tooltip

* changed Configs Source Tooltip

* add pnpm lock version

* add @floating-ui/react-dom-interaction ti implement the tooltip , initial

* finalize the tooltip component and add test tio the component

* remove tippy library

* Styling modification in the Tooltip , in the Source pages

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Mgrdich <mgotm13@gmail.com>
---
 kafka-ui-react-app/package.json               |  1 +
 kafka-ui-react-app/pnpm-lock.yaml             | 53 ++++++++++++++++++-
 .../Brokers/Broker/Configs/Configs.styled.ts  | 10 ++++
 .../Brokers/Broker/Configs/Configs.tsx        | 24 ++++++++-
 .../src/components/common/Icons/InfoIcon.tsx  | 53 +++++++++++++++++++
 .../common/Tooltip/Tooltip.styled.ts          | 17 ++++++
 .../src/components/common/Tooltip/Tooltip.tsx | 47 ++++++++++++++++
 .../common/Tooltip/__tests__/Tooltip.spec.tsx | 29 ++++++++++
 kafka-ui-react-app/src/theme/theme.ts         |  4 ++
 9 files changed, 236 insertions(+), 2 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/InfoIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Tooltip/Tooltip.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Tooltip/__tests__/Tooltip.spec.tsx

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index fa1842dedbd..b0779e54884 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -7,6 +7,7 @@
     "@babel/core": "^7.16.0",
     "@babel/plugin-syntax-flow": "^7.18.6",
     "@babel/plugin-transform-react-jsx": "^7.18.6",
+    "@floating-ui/react-dom-interactions": "^0.10.3",
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
     "@microsoft/fetch-event-source": "^2.0.1",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 88fcfac42e1..dca028c2d9f 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -7,6 +7,7 @@ specifiers:
   '@babel/preset-env': ^7.18.2
   '@babel/preset-react': ^7.17.12
   '@babel/preset-typescript': ^7.17.12
+  '@floating-ui/react-dom-interactions': ^0.10.3
   '@hookform/error-message': ^2.0.0
   '@hookform/resolvers': ^2.7.1
   '@jest/types': ^29.0.3
@@ -94,6 +95,7 @@ dependencies:
   '@babel/core': 7.18.2
   '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.2
   '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
+  '@floating-ui/react-dom-interactions': 0.10.3_ohobp6rpsmerwlq5ipwfh5yigy
   '@hookform/error-message': 2.0.0_l2dcsysovzdujulgxvsen7vbsm
   '@hookform/resolvers': 2.8.9_react-hook-form@7.6.9
   '@microsoft/fetch-event-source': 2.0.1
@@ -2733,6 +2735,41 @@ packages:
       - supports-color
     dev: true
 
+  /@floating-ui/core/1.0.1:
+    resolution: {integrity: sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA==}
+    dev: false
+
+  /@floating-ui/dom/1.0.4:
+    resolution: {integrity: sha512-maYJRv+sAXTy4K9mzdv0JPyNW5YPVHrqtY90tEdI6XNpuLOP26Ci2pfwPsKBA/Wh4Z3FX5sUrtUFTdMYj9v+ug==}
+    dependencies:
+      '@floating-ui/core': 1.0.1
+    dev: false
+
+  /@floating-ui/react-dom-interactions/0.10.3_ohobp6rpsmerwlq5ipwfh5yigy:
+    resolution: {integrity: sha512-UEHqdnzyoiWNU5az/tAljr9iXFzN18DcvpMqW+/cXz4FEhDEB1ogLtWldOWCujLerPBnSRocADALafelOReMpw==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+    dependencies:
+      '@floating-ui/react-dom': 1.0.0_ef5jwxihqo6n7gxfmzogljlgcm
+      aria-hidden: 1.2.1_7cpxmzzodpxnolj5zcc5cr63ji
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+    transitivePeerDependencies:
+      - '@types/react'
+    dev: false
+
+  /@floating-ui/react-dom/1.0.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-uiOalFKPG937UCLm42RxjESTWUVpbbatvlphQAU6bsv+ence6IoVG8JOUZcy8eW81NkU+Idiwvx10WFLmR4MIg==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+    dependencies:
+      '@floating-ui/dom': 1.0.4
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+    dev: false
+
   /@hookform/error-message/2.0.0_l2dcsysovzdujulgxvsen7vbsm:
     resolution: {integrity: sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==}
     peerDependencies:
@@ -3899,6 +3936,21 @@ packages:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
     dev: true
 
+  /aria-hidden/1.2.1_7cpxmzzodpxnolj5zcc5cr63ji:
+    resolution: {integrity: sha512-PN344VAf9j1EAi+jyVHOJ8XidQdPVssGco39eNcsGdM4wcsILtxrKLkbuiMfLWYROK1FjRQasMWCBttrhjnr6A==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.9.0 || ^17.0.0 || ^18.0.0
+      react: ^16.9.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.0.9
+      react: 18.1.0
+      tslib: 2.4.0
+    dev: false
+
   /aria-query/4.2.2:
     resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
     engines: {node: '>=6.0'}
@@ -8531,7 +8583,6 @@ packages:
 
   /tslib/2.4.0:
     resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
-    dev: true
 
   /tsutils/3.21.0_typescript@4.7.4:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts
index 03030b12498..cced53373e8 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.styled.ts
@@ -24,3 +24,13 @@ export const SearchWrapper = styled.div`
   margin: 10px;
   width: 21%;
 `;
+
+export const Source = styled.div`
+  display: flex;
+  align-content: center;
+  svg {
+    margin-left: 10px;
+    vertical-align: middle;
+    cursor: pointer;
+  }
+`;
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
index 31a42f60df4..8f909facac0 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
@@ -9,10 +9,20 @@ import {
 import Table from 'components/common/NewTable';
 import { BrokerConfig, ConfigSource } from 'generated-sources';
 import Search from 'components/common/Search/Search';
+import Tooltip from 'components/common/Tooltip/Tooltip';
+import InfoIcon from 'components/common/Icons/InfoIcon';
 
 import InputCell from './InputCell';
 import * as S from './Configs.styled';
 
+const tooltipContent = `DYNAMIC_TOPIC_CONFIG = dynamic topic config that is configured for a specific topic
+DYNAMIC_BROKER_LOGGER_CONFIG = dynamic broker logger config that is configured for a specific broker
+DYNAMIC_BROKER_CONFIG = dynamic broker config that is configured for a specific broker
+DYNAMIC_DEFAULT_BROKER_CONFIG = dynamic broker config that is configured as default for all brokers in the cluster
+STATIC_BROKER_CONFIG = static broker config provided as broker properties at start up (e.g. server.properties file)
+DEFAULT_CONFIG = built-in default configuration for configs that have a default value
+UNKNOWN = source unknown e.g. in the ConfigEntry used for alter requests where source is not set`;
+
 const Configs: React.FC = () => {
   const [keyword, setKeyword] = React.useState('');
   const { clusterName, brokerId } = useAppParams<ClusterBrokerParam>();
@@ -57,7 +67,19 @@ const Configs: React.FC = () => {
         cell: renderCell,
       },
       {
-        header: 'Source',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        header: () => {
+          return (
+            <S.Source>
+              Source
+              <Tooltip
+                value={<InfoIcon />}
+                content={tooltipContent}
+                placement="top-end"
+              />
+            </S.Source>
+          );
+        },
         accessorKey: 'source',
       },
     ],
diff --git a/kafka-ui-react-app/src/components/common/Icons/InfoIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/InfoIcon.tsx
new file mode 100644
index 00000000000..8e947c6ca97
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/InfoIcon.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+
+const InfoIcon: React.FC = () => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 64 64"
+      width="12"
+      height="12"
+      aria-labelledby="title"
+      aria-describedby="desc"
+      role="img"
+    >
+      <desc>A line styled icon from Orion Icon Library.</desc>
+      <circle
+        data-name="layer2"
+        cx="32"
+        cy="32"
+        r="30"
+        fill="none"
+        stroke="#202020"
+        strokeMiterlimit="10"
+        strokeWidth="2"
+        strokeLinejoin="round"
+        strokeLinecap="round"
+      />
+      <path
+        data-name="layer1"
+        fill="none"
+        stroke="#202020"
+        strokeMiterlimit="10"
+        strokeWidth="2"
+        d="M28 26h4v22m-4 .008h8"
+        strokeLinejoin="round"
+        strokeLinecap="round"
+      />
+      <circle
+        data-name="layer1"
+        cx="31"
+        cy="19"
+        r="2"
+        fill="none"
+        stroke="#202020"
+        strokeMiterlimit="10"
+        strokeWidth="2"
+        strokeLinejoin="round"
+        strokeLinecap="round"
+      />
+    </svg>
+  );
+};
+
+export default InfoIcon;
diff --git a/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.styled.ts b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.styled.ts
new file mode 100644
index 00000000000..ee352995bd4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.styled.ts
@@ -0,0 +1,17 @@
+import styled from 'styled-components';
+
+export const MessageTooltip = styled.div`
+  max-width: 100%;
+  max-height: 100%;
+  background-color: ${({ theme }) => theme.tooltip.bg};
+  color: ${({ theme }) => theme.tooltip.text};
+  border-radius: 6px;
+  padding: 5px;
+  z-index: 1;
+  white-space: pre-wrap;
+`;
+
+export const Wrapper = styled.div`
+  display: flex;
+  align-items: center;
+`;
diff --git a/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
new file mode 100644
index 00000000000..cd76f4cc4f4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
@@ -0,0 +1,47 @@
+import React, { useState } from 'react';
+import {
+  useFloating,
+  useHover,
+  useInteractions,
+  Placement,
+} from '@floating-ui/react-dom-interactions';
+
+import * as S from './Tooltip.styled';
+
+export interface PropsTypes {
+  value: string | JSX.Element;
+  content: string;
+  placement?: Placement;
+}
+
+const Tooltip: React.FC<PropsTypes> = ({ value, content, placement }) => {
+  const [open, setOpen] = useState(false);
+  const { x, y, reference, floating, strategy, context } = useFloating({
+    open,
+    onOpenChange: setOpen,
+    placement,
+  });
+
+  useInteractions([useHover(context)]);
+
+  return (
+    <>
+      <S.Wrapper ref={reference}>{value}</S.Wrapper>
+      {open && (
+        <S.MessageTooltip
+          ref={floating}
+          style={{
+            position: strategy,
+            top: y ?? 0,
+            left: x ?? 0,
+            width: 'max-content',
+          }}
+        >
+          {content}
+        </S.MessageTooltip>
+      )}
+    </>
+  );
+};
+
+export default Tooltip;
diff --git a/kafka-ui-react-app/src/components/common/Tooltip/__tests__/Tooltip.spec.tsx b/kafka-ui-react-app/src/components/common/Tooltip/__tests__/Tooltip.spec.tsx
new file mode 100644
index 00000000000..df0cc470a1c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Tooltip/__tests__/Tooltip.spec.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { render } from 'lib/testHelpers';
+import { screen } from '@testing-library/react';
+import Tooltip from 'components/common/Tooltip/Tooltip';
+import userEvent from '@testing-library/user-event';
+
+describe('Tooltip', () => {
+  const tooltipText = 'tooltip';
+  const tooltipContent = 'tooltip_Content';
+
+  const setUpComponent = () =>
+    render(<Tooltip value={tooltipText} content={tooltipContent} />);
+
+  it('should render the tooltip element with its value text', () => {
+    setUpComponent();
+    expect(screen.getByText(tooltipText)).toBeInTheDocument();
+  });
+
+  it('should render the tooltip with default closed', () => {
+    setUpComponent();
+    expect(screen.queryByText(tooltipContent)).not.toBeInTheDocument();
+  });
+
+  it('should render the tooltip with and open during hover', async () => {
+    setUpComponent();
+    await userEvent.hover(screen.getByText(tooltipText));
+    expect(screen.getByText(tooltipContent)).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 5a2b806a01f..020d5819ee5 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -527,6 +527,10 @@ const theme = {
   configList: {
     color: Colors.neutral[30],
   },
+  tooltip: {
+    bg: Colors.neutral[70],
+    text: Colors.neutral[0],
+  },
   topicsList: {
     color: {
       normal: Colors.neutral[90],

From 3277186fc03c5a3a381ccf24b29924d13e7627fd Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen.schalanda@personio.de>
Date: Mon, 7 Nov 2022 12:15:40 +0100
Subject: [PATCH 264/734] Add support for multiple Protobuf files (#2874)

* Add support for multiple Protobuf files

* Ensure `protobufFiles` list is not empty

* Address review comments
---
 documentation/guides/Protobuf.md              |   6 +-
 .../ui/serdes/builtin/ProtobufFileSerde.java  | 145 ++++++---
 .../serdes/builtin/ProtobufFileSerdeTest.java | 296 ++++++++++++++++--
 kafka-ui-api/src/test/resources/sensor.proto  |  14 +
 4 files changed, 387 insertions(+), 74 deletions(-)
 create mode 100644 kafka-ui-api/src/test/resources/sensor.proto

diff --git a/documentation/guides/Protobuf.md b/documentation/guides/Protobuf.md
index d7c50ffb65e..93bc7133e0a 100644
--- a/documentation/guides/Protobuf.md
+++ b/documentation/guides/Protobuf.md
@@ -11,8 +11,12 @@ To configure Kafkaui to deserialize protobuf messages using a supplied protobuf
 kafka:
   clusters:
     - # Cluster configuration omitted.
-      # protobufFile is the path to the protobuf schema.
+      # protobufFile is the path to the protobuf schema. (deprecated: please use "protobufFiles")
       protobufFile: path/to/my.proto
+      # protobufFiles is the path to one or more protobuf schemas.
+      protobufFiles: 
+          - path/to/my.proto
+          - path/to/another.proto
       # protobufMessageName is the default protobuf type that is used to deserilize
       # the message's value if the topic is not found in protobufMessageNameByTopic.
       protobufMessageName: my.Type1
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
index 6e861cfe56b..567b98584b0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
@@ -3,6 +3,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.Empty;
 import com.google.protobuf.util.JsonFormat;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
 import com.provectus.kafka.ui.serde.api.PropertyResolver;
@@ -13,18 +14,21 @@
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaUtils;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import lombok.SneakyThrows;
 
-
 public class ProtobufFileSerde implements BuiltInSerde {
 
   public static String name() {
@@ -33,11 +37,11 @@ public static String name() {
 
   private static final ProtobufSchemaConverter SCHEMA_CONVERTER = new ProtobufSchemaConverter();
 
-  private Path protobufSchemaPath;
-
   private Map<String, Descriptor> messageDescriptorMap = new HashMap<>();
   private Map<String, Descriptor> keyMessageDescriptorMap = new HashMap<>();
 
+  private Map<Descriptor, Path> descriptorPaths = new HashMap<>();
+
   private Descriptor defaultMessageDescriptor;
 
   @Nullable
@@ -46,8 +50,10 @@ public static String name() {
   @Override
   public boolean initOnStartup(PropertyResolver kafkaClusterProperties,
                                PropertyResolver globalProperties) {
-    return kafkaClusterProperties.getProperty("protobufFile", String.class)
-        .isPresent();
+    Optional<String> protobufFile = kafkaClusterProperties.getProperty("protobufFile", String.class);
+    Optional<List<String>> protobufFiles = kafkaClusterProperties.getListProperty("protobufFiles", String.class);
+
+    return protobufFile.isPresent() || protobufFiles.map(files -> files.isEmpty() ? null : files).isPresent();
   }
 
   @SneakyThrows
@@ -55,55 +61,107 @@ public boolean initOnStartup(PropertyResolver kafkaClusterProperties,
   public void configure(PropertyResolver serdeProperties,
                         PropertyResolver kafkaClusterProperties,
                         PropertyResolver globalProperties) {
-    protobufSchemaPath = Path.of(
-        kafkaClusterProperties.getProperty("protobufFile", String.class)
-            .orElseThrow());
-    ProtobufSchema protobufSchema;
-    try (Stream<String> lines = Files.lines(protobufSchemaPath)) {
-      protobufSchema = new ProtobufSchema(lines.collect(Collectors.joining("\n")));
-    }
+    Map<Path, ProtobufSchema> protobufSchemas = joinPathProperties(kafkaClusterProperties).stream()
+        .map(path -> Map.entry(path, new ProtobufSchema(readFileAsString(path))))
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+
+    // Load all referenced message schemas and store their source proto file with the descriptors
+    Map<Descriptor, Path> descriptorPaths = new HashMap<>();
+    Optional<String> protobufMessageName = kafkaClusterProperties.getProperty("protobufMessageName", String.class);
+    protobufMessageName.ifPresent(messageName -> addProtobufSchema(descriptorPaths, protobufSchemas, messageName));
+
+    Optional<String> protobufMessageNameForKey =
+        kafkaClusterProperties.getProperty("protobufMessageNameForKey", String.class);
+    protobufMessageNameForKey
+        .ifPresent(messageName -> addProtobufSchema(descriptorPaths, protobufSchemas, messageName));
+
+    Optional<Map<String, String>> protobufMessageNameByTopic =
+        kafkaClusterProperties.getMapProperty("protobufMessageNameByTopic", String.class, String.class);
+    protobufMessageNameByTopic
+        .ifPresent(messageNamesByTopic -> addProtobufSchemas(descriptorPaths, protobufSchemas, messageNamesByTopic));
+
+    Optional<Map<String, String>> protobufMessageNameForKeyByTopic =
+        kafkaClusterProperties.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class);
+    protobufMessageNameForKeyByTopic
+        .ifPresent(messageNamesByTopic -> addProtobufSchemas(descriptorPaths, protobufSchemas, messageNamesByTopic));
+
+    // Fill dictionary for descriptor lookup by full message name
+    Map<String, Descriptor> descriptorMap = descriptorPaths.keySet().stream()
+        .collect(Collectors.toMap(Descriptor::getFullName, Function.identity()));
+
     configure(
-        protobufSchemaPath,
-        defaultMessageDescriptor = kafkaClusterProperties.getProperty("protobufMessageName", String.class)
-            .map(msgName -> Objects.requireNonNull(protobufSchema.toDescriptor(msgName),
-                "The given message type not found in protobuf definition: " + msgName))
-            // this is strange logic, but we need it to support serde's backward-compatibility
-            .orElseGet(protobufSchema::toDescriptor),
-        defaultKeyMessageDescriptor = kafkaClusterProperties.getProperty("protobufMessageNameForKey", String.class)
-            .map(msgName -> Objects.requireNonNull(protobufSchema.toDescriptor(msgName),
-                "The given message type not found in protobuf definition: " + msgName))
-            .orElse(null),
-        kafkaClusterProperties.getMapProperty("protobufMessageNameByTopic", String.class, String.class)
-            .map(map -> populateDescriptors(protobufSchema, map))
-            .orElse(Map.of()),
-        kafkaClusterProperties.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class)
-            .map(map -> populateDescriptors(protobufSchema, map))
-            .orElse(Map.of())
+        // this is strange logic, but we need it to support serde's backward-compatibility
+        protobufMessageName.map(descriptorMap::get).orElseGet(Empty::getDescriptor),
+        protobufMessageNameForKey.map(descriptorMap::get).orElse(null),
+        descriptorPaths,
+        protobufMessageNameByTopic.map(map -> populateDescriptors(descriptorMap, map)).orElse(Map.of()),
+        protobufMessageNameForKeyByTopic.map(map -> populateDescriptors(descriptorMap, map)).orElse(Map.of())
     );
   }
 
   @VisibleForTesting
   void configure(
-      Path protobufSchemaPath,
       Descriptor defaultMessageDescriptor,
       @Nullable Descriptor defaultKeyMessageDescriptor,
+      Map<Descriptor, Path> descriptorPaths,
       Map<String, Descriptor> messageDescriptorMap,
       Map<String, Descriptor> keyMessageDescriptorMap) {
-    this.protobufSchemaPath = protobufSchemaPath;
     this.defaultMessageDescriptor = defaultMessageDescriptor;
     this.defaultKeyMessageDescriptor = defaultKeyMessageDescriptor;
+    this.descriptorPaths = descriptorPaths;
     this.messageDescriptorMap = messageDescriptorMap;
     this.keyMessageDescriptorMap = keyMessageDescriptorMap;
   }
 
-  private Map<String, Descriptor> populateDescriptors(ProtobufSchema protobufSchema,
+  private static void addProtobufSchema(Map<Descriptor, Path> descriptorPaths,
+                                 Map<Path, ProtobufSchema> protobufSchemas,
+                                 String messageName) {
+    var descriptorAndPath = getDescriptorAndPath(protobufSchemas, messageName);
+    descriptorPaths.put(descriptorAndPath.getKey(), descriptorAndPath.getValue());
+  }
+
+  private static void addProtobufSchemas(Map<Descriptor, Path> descriptorPaths,
+                                  Map<Path, ProtobufSchema> protobufSchemas,
+                                  Map<String, String> messageNamesByTopic) {
+    messageNamesByTopic.values().stream()
+        .map(msgName -> getDescriptorAndPath(protobufSchemas, msgName))
+        .forEach(entry -> descriptorPaths.put(entry.getKey(), entry.getValue()));
+  }
+
+  private static List<Path> joinPathProperties(PropertyResolver propertyResolver) {
+    return Stream.concat(
+            propertyResolver.getProperty("protobufFile", String.class).map(List::of).stream(),
+            propertyResolver.getListProperty("protobufFiles", String.class).stream())
+        .flatMap(Collection::stream)
+        .distinct()
+        .map(Path::of)
+        .collect(Collectors.toList());
+  }
+
+  private static Map.Entry<Descriptor, Path> getDescriptorAndPath(Map<Path, ProtobufSchema> protobufSchemas,
+                                                                  String msgName) {
+    return protobufSchemas.entrySet().stream()
+            .filter(schema -> schema.getValue() != null && schema.getValue().toDescriptor(msgName) != null)
+            .map(schema -> Map.entry(schema.getValue().toDescriptor(msgName), schema.getKey()))
+            .findFirst()
+            .orElseThrow(() -> new NullPointerException(
+                    "The given message type not found in protobuf definition: " + msgName));
+  }
+
+  private static String readFileAsString(Path path) {
+    try {
+      return Files.readString(path);
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+
+  private Map<String, Descriptor> populateDescriptors(Map<String, Descriptor> descriptorMap,
                                                       Map<String, String> messageNameMap) {
     Map<String, Descriptor> descriptors = new HashMap<>();
     for (Map.Entry<String, String> entry : messageNameMap.entrySet()) {
-      var descriptor = Objects.requireNonNull(protobufSchema.toDescriptor(entry.getValue()),
-          "The given message type is not found in protobuf definition: "
-              + entry.getValue());
-      descriptors.put(entry.getKey(), descriptor);
+      descriptors.put(entry.getKey(), descriptorMap.get(entry.getValue()));
     }
     return descriptors;
   }
@@ -168,11 +226,14 @@ public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
 
   @Override
   public Optional<SchemaDescription> getSchema(String topic, Target type) {
-    return descriptorFor(topic, type)
-        .map(descriptor ->
-            new SchemaDescription(
-                SCHEMA_CONVERTER.convert(protobufSchemaPath.toUri(), descriptor).toJson(),
-                Map.of("messageName", descriptor.getFullName())
-            ));
+    return descriptorFor(topic, type).map(this::toSchemaDescription);
+  }
+
+  private SchemaDescription toSchemaDescription(Descriptor descriptor) {
+    Path path = descriptorPaths.get(descriptor);
+    return new SchemaDescription(
+        SCHEMA_CONVERTER.convert(path.toUri(), descriptor).toJson(),
+        Map.of("messageName", descriptor.getFullName())
+    );
   }
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
index 062839a6c0a..887792b6335 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
@@ -1,19 +1,25 @@
 package com.provectus.kafka.ui.serdes.builtin;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.Descriptors;
 import com.google.protobuf.util.JsonFormat;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
 import com.provectus.kafka.ui.serde.api.Serde;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import lombok.SneakyThrows;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.util.ResourceUtils;
 
 class ProtobufFileSerdeTest {
 
@@ -23,43 +29,93 @@ class ProtobufFileSerdeTest {
   private static final String sampleBookMsgJson = "{\"version\": 1, \"people\": ["
       + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"addrBook@example.com\", \"phones\":[]}]}";
 
+  private static final String sampleSensorMsgJson = "{ \"name\": \"My Sensor\", "
+      + "\"temperature\": 20.5, \"humidity\": 50, \"door\": \"OPEN\" }";
+
   // Sample message of type `test.Person`
-  private static byte[] personMessageBytes;
+  private byte[] personMessageBytes;
   // Sample message of type `test.AddressBook`
-  private static byte[] addressBookMessageBytes;
-  private static Path protobufSchemaPath;
-  private static ProtobufSchema protobufSchema;
+  private byte[] addressBookMessageBytes;
+  private byte[] sensorMessageBytes;
+  private Path addressBookSchemaPath;
+  private Path sensorSchemaPath;
+
+  private Descriptors.Descriptor personDescriptor;
+  private Descriptors.Descriptor addressBookDescriptor;
+  private Descriptors.Descriptor sensorDescriptor;
+  private Map<Descriptors.Descriptor, Path> descriptorPaths;
 
-  @BeforeAll
-  static void setUp() throws Exception {
-    protobufSchemaPath = Paths.get(ProtobufFileSerdeTest.class.getClassLoader()
-        .getResource("address-book.proto").toURI());
-    protobufSchema = new ProtobufSchema(Files.readString(protobufSchemaPath));
+  @BeforeEach
+  void setUp() throws Exception {
+    addressBookSchemaPath = ResourceUtils.getFile("classpath:address-book.proto").toPath();
+    sensorSchemaPath = ResourceUtils.getFile("classpath:sensor.proto").toPath();
 
-    DynamicMessage.Builder builder = protobufSchema.newMessageBuilder("test.Person");
+    ProtobufSchema addressBookSchema = new ProtobufSchema(Files.readString(addressBookSchemaPath));
+    var builder = addressBookSchema.newMessageBuilder("test.Person");
     JsonFormat.parser().merge(samplePersonMsgJson, builder);
     personMessageBytes = builder.build().toByteArray();
 
-    builder = protobufSchema.newMessageBuilder("test.AddressBook");
+    builder = addressBookSchema.newMessageBuilder("test.AddressBook");
     JsonFormat.parser().merge(sampleBookMsgJson, builder);
     addressBookMessageBytes = builder.build().toByteArray();
+    personDescriptor = addressBookSchema.toDescriptor("test.Person");
+    addressBookDescriptor = addressBookSchema.toDescriptor("test.AddressBook");
+
+    ProtobufSchema sensorSchema = new ProtobufSchema(Files.readString(sensorSchemaPath));
+    builder = sensorSchema.newMessageBuilder("iot.Sensor");
+    JsonFormat.parser().merge(sampleSensorMsgJson, builder);
+    sensorMessageBytes = builder.build().toByteArray();
+    sensorDescriptor = sensorSchema.toDescriptor("iot.Sensor");
+
+    descriptorPaths = Map.of(
+        personDescriptor, addressBookSchemaPath,
+        addressBookDescriptor, addressBookSchemaPath,
+        sensorDescriptor, sensorSchemaPath
+    );
   }
 
 
   @Test
   void testDeserialize() {
     var messageNameMap = Map.of(
-        "persons", protobufSchema.toDescriptor("test.Person"),
-        "books", protobufSchema.toDescriptor("test.AddressBook")
+        "persons", personDescriptor,
+        "books", addressBookDescriptor
     );
     var keyMessageNameMap = Map.of(
-        "books", protobufSchema.toDescriptor("test.AddressBook"));
+        "books", addressBookDescriptor);
+
+    var serde = new ProtobufFileSerde();
+    serde.configure(
+        null,
+        null,
+        descriptorPaths,
+        messageNameMap,
+        keyMessageNameMap
+    );
+
+    var deserializedPerson = serde.deserializer("persons", Serde.Target.VALUE)
+        .deserialize(null, personMessageBytes);
+    assertJsonEquals(samplePersonMsgJson, deserializedPerson.getResult());
+
+    var deserializedBook = serde.deserializer("books", Serde.Target.KEY)
+        .deserialize(null, addressBookMessageBytes);
+    assertJsonEquals(sampleBookMsgJson, deserializedBook.getResult());
+  }
 
+  @Test
+  void testDeserializeMultipleProtobuf() {
+    var messageNameMap = Map.of(
+        "persons", personDescriptor,
+        "books", addressBookDescriptor,
+        "sensors", sensorDescriptor
+    );
+    var keyMessageNameMap = Map.of(
+        "books", addressBookDescriptor);
     var serde = new ProtobufFileSerde();
     serde.configure(
-        protobufSchemaPath,
         null,
         null,
+        descriptorPaths,
         messageNameMap,
         keyMessageNameMap
     );
@@ -71,15 +127,19 @@ void testDeserialize() {
     var deserializedBook = serde.deserializer("books", Serde.Target.KEY)
         .deserialize(null, addressBookMessageBytes);
     assertJsonEquals(sampleBookMsgJson, deserializedBook.getResult());
+
+    var deserializedSensor = serde.deserializer("sensors", Serde.Target.VALUE)
+        .deserialize(null, sensorMessageBytes);
+    assertJsonEquals(sampleSensorMsgJson, deserializedSensor.getResult());
   }
 
   @Test
   void testDefaultMessageName() {
     var serde = new ProtobufFileSerde();
     serde.configure(
-        protobufSchemaPath,
-        protobufSchema.toDescriptor("test.Person"),
-        protobufSchema.toDescriptor("test.AddressBook"),
+        personDescriptor,
+        addressBookDescriptor,
+        descriptorPaths,
         Map.of(),
         Map.of()
     );
@@ -93,21 +153,20 @@ void testDefaultMessageName() {
     assertJsonEquals(sampleBookMsgJson, deserializedBook.getResult());
   }
 
-
   @Test
   void testSerialize() {
     var messageNameMap = Map.of(
-        "persons", protobufSchema.toDescriptor("test.Person"),
-        "books", protobufSchema.toDescriptor("test.AddressBook")
+        "persons", personDescriptor,
+        "books", addressBookDescriptor
     );
     var keyMessageNameMap = Map.of(
-        "books", protobufSchema.toDescriptor("test.AddressBook"));
+        "books", addressBookDescriptor);
 
     var serde = new ProtobufFileSerde();
     serde.configure(
-        protobufSchemaPath,
         null,
         null,
+        descriptorPaths,
         messageNameMap,
         keyMessageNameMap
     );
@@ -122,13 +181,46 @@ void testSerialize() {
     assertThat(booksBytes).isEqualTo(addressBookMessageBytes);
   }
 
+  @Test
+  void testSerializeMultipleProtobuf() {
+    var messageNameMap = Map.of(
+        "persons", personDescriptor,
+        "books", addressBookDescriptor,
+        "sensors", sensorDescriptor
+    );
+    var keyMessageNameMap = Map.of(
+        "books", addressBookDescriptor);
+
+    var serde = new ProtobufFileSerde();
+    serde.configure(
+        null,
+        null,
+        descriptorPaths,
+        messageNameMap,
+        keyMessageNameMap
+    );
+
+    var personBytes = serde.serializer("persons", Serde.Target.VALUE)
+        .serialize("{ \"name\": \"My Name\",\"id\": 101, \"email\": \"user1@example.com\" }");
+    assertThat(personBytes).isEqualTo(personMessageBytes);
+
+    var booksBytes = serde.serializer("books", Serde.Target.KEY)
+        .serialize("{\"version\": 1, \"people\": ["
+            + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"addrBook@example.com\" }]}");
+    assertThat(booksBytes).isEqualTo(addressBookMessageBytes);
+
+    var sensorBytes = serde.serializer("sensors", Serde.Target.VALUE)
+        .serialize("{ \"name\": \"My Sensor\", \"temperature\": 20.5, \"humidity\": 50, \"door\": \"OPEN\" }");
+    assertThat(sensorBytes).isEqualTo(sensorMessageBytes);
+  }
+
   @Test
   void testSerializeDefaults() {
     var serde = new ProtobufFileSerde();
     serde.configure(
-        protobufSchemaPath,
-        protobufSchema.toDescriptor("test.Person"),
-        protobufSchema.toDescriptor("test.AddressBook"),
+        personDescriptor,
+        addressBookDescriptor,
+        descriptorPaths,
         Map.of(),
         Map.of()
     );
@@ -143,10 +235,152 @@ void testSerializeDefaults() {
     assertThat(booksBytes).isEqualTo(addressBookMessageBytes);
   }
 
+  @Test
+  void initOnStartupReturnsFalseIfNoProtoFilesHaveBeenProvided() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+
+    var serde = new ProtobufFileSerde();
+    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    assertThat(startupSuccessful).isFalse();
+  }
+
+  @Test
+  void initOnStartupReturnsFalseIfProtoFilesListIsEmpty() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+    when(resolver.getListProperty("protobufFiles", String.class)).thenReturn(Optional.of(List.of()));
+
+    var serde = new ProtobufFileSerde();
+    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    assertThat(startupSuccessful).isFalse();
+  }
+
+  @Test
+  void initOnStartupReturnsTrueIfNoProtoFileHasBeenProvided() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+    when(resolver.getProperty("protobufFile", String.class)).thenReturn(Optional.of("file.proto"));
+
+    var serde = new ProtobufFileSerde();
+    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    assertThat(startupSuccessful).isTrue();
+  }
+
+  @Test
+  void initOnStartupReturnsTrueIfProtoFilesHasBeenProvided() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+    when(resolver.getListProperty("protobufFiles", String.class)).thenReturn(Optional.of(List.of("file.proto")));
+
+    var serde = new ProtobufFileSerde();
+    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    assertThat(startupSuccessful).isTrue();
+  }
+
+  @Test
+  void initOnStartupReturnsTrueIfProtoFileAndProtoFilesHaveBeenProvided() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+    when(resolver.getProperty("protobufFile", String.class)).thenReturn(Optional.of("file1.proto"));
+    when(resolver.getListProperty("protobufFiles", String.class)).thenReturn(Optional.of(List.of("file2.proto")));
+
+    var serde = new ProtobufFileSerde();
+    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    assertThat(startupSuccessful).isTrue();
+  }
+
+  @Test
+  void listOfProtobufFilesIsJoined() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+    when(resolver.getProperty("protobufFile", String.class))
+        .thenReturn(Optional.of(addressBookSchemaPath.toString()));
+    when(resolver.getListProperty("protobufFiles", String.class))
+        .thenReturn(Optional.of(List.of(sensorSchemaPath.toString())));
+    when(resolver.getProperty("protobufMessageName", String.class))
+        .thenReturn(Optional.of("test.AddressBook"));
+
+    Map<String, String> protobufMessageNameByTopic = Map.of(
+        "persons", "test.Person",
+        "books", "test.AddressBook",
+        "sensors", "iot.Sensor");
+    when(resolver.getMapProperty("protobufMessageNameByTopic", String.class, String.class))
+        .thenReturn(Optional.of(protobufMessageNameByTopic));
+
+    var serde = new ProtobufFileSerde();
+    serde.configure(resolver, resolver, resolver);
+
+    var deserializedPerson = serde.deserializer("persons", Serde.Target.VALUE)
+        .deserialize(null, personMessageBytes);
+    assertJsonEquals(samplePersonMsgJson, deserializedPerson.getResult());
+
+    var deserializedSensor = serde.deserializer("sensors", Serde.Target.VALUE)
+        .deserialize(null, sensorMessageBytes);
+    assertJsonEquals(sampleSensorMsgJson, deserializedSensor.getResult());
+  }
+
+  @Test
+  void unknownSchemaAsDefaultThrowsException() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+    when(resolver.getListProperty("protobufFiles", String.class))
+        .thenReturn(Optional.of(List.of(addressBookSchemaPath.toString(), sensorSchemaPath.toString())));
+    when(resolver.getProperty("protobufMessageName", String.class))
+        .thenReturn(Optional.of("test.NotExistent"));
+
+    var serde = new ProtobufFileSerde();
+    assertThatThrownBy(() -> serde.configure(resolver, resolver, resolver))
+        .isInstanceOf(NullPointerException.class)
+        .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
+  }
+
+  @Test
+  void unknownSchemaAsDefaultForKeyThrowsException() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+    when(resolver.getListProperty("protobufFiles", String.class))
+        .thenReturn(Optional.of(List.of(addressBookSchemaPath.toString(), sensorSchemaPath.toString())));
+    when(resolver.getProperty("protobufMessageName", String.class))
+        .thenReturn(Optional.of("test.AddressBook"));
+    when(resolver.getProperty("protobufMessageNameForKey", String.class))
+        .thenReturn(Optional.of("test.NotExistent"));
+
+    var serde = new ProtobufFileSerde();
+    assertThatThrownBy(() -> serde.configure(resolver, resolver, resolver))
+        .isInstanceOf(NullPointerException.class)
+        .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
+  }
+
+  @Test
+  void unknownSchemaAsTopicSchemaThrowsException() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+    when(resolver.getListProperty("protobufFiles", String.class))
+        .thenReturn(Optional.of(List.of(addressBookSchemaPath.toString(), sensorSchemaPath.toString())));
+    when(resolver.getProperty("protobufMessageName", String.class))
+        .thenReturn(Optional.of("test.AddressBook"));
+
+    when(resolver.getMapProperty("protobufMessageNameByTopic", String.class, String.class))
+        .thenReturn(Optional.of(Map.of("persons", "test.NotExistent")));
+
+    var serde = new ProtobufFileSerde();
+    assertThatThrownBy(() -> serde.configure(resolver, resolver, resolver))
+        .isInstanceOf(NullPointerException.class)
+        .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
+  }
+
+  @Test
+  void unknownSchemaAsTopicSchemaForKeyThrowsException() {
+    PropertyResolver resolver = mock(PropertyResolver.class);
+    when(resolver.getListProperty("protobufFiles", String.class))
+        .thenReturn(Optional.of(List.of(addressBookSchemaPath.toString(), sensorSchemaPath.toString())));
+    when(resolver.getProperty("protobufMessageName", String.class))
+        .thenReturn(Optional.of("test.AddressBook"));
+
+    when(resolver.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class))
+        .thenReturn(Optional.of(Map.of("persons", "test.NotExistent")));
+
+    var serde = new ProtobufFileSerde();
+    assertThatThrownBy(() -> serde.configure(resolver, resolver, resolver))
+        .isInstanceOf(NullPointerException.class)
+        .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
+  }
+
   @SneakyThrows
   private void assertJsonEquals(String expectedJson, String actualJson) {
     var mapper = new JsonMapper();
     assertThat(mapper.readTree(actualJson)).isEqualTo(mapper.readTree(expectedJson));
   }
-
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-api/src/test/resources/sensor.proto b/kafka-ui-api/src/test/resources/sensor.proto
new file mode 100644
index 00000000000..33b8c387e4c
--- /dev/null
+++ b/kafka-ui-api/src/test/resources/sensor.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+package iot;
+
+message Sensor {
+    string name = 1;
+    double temperature = 2;
+    int32 humidity = 3;
+
+    enum SwitchLevel {
+        CLOSED = 0;
+        OPEN = 1;
+    }
+    SwitchLevel door = 5;
+}

From 5b3478fdc384d0fcd3449fe193228f755fd88305 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen.schalanda@personio.de>
Date: Mon, 7 Nov 2022 12:18:50 +0100
Subject: [PATCH 265/734] Bump Maven to version 3.8.6 and reduce noise (#2882)

* Bump Maven wrapper to Maven 3.8.6

Using the official [Maven Wrapper](https://maven.apache.org/wrapper/) which was forked from the 3rd party Maven Wrapper plugin.

* Use Maven wrapper in GitHub workflows

* Reduce Maven-related noise in build jobs

```
-B,--batch-mode                        Run in non-interactive (batch)
                                        mode (disables output color)
-ntp,--no-transfer-progress            Do not display transfer progress
```
---
 .github/workflows/backend.yml            |   8 +-
 .github/workflows/branch-deploy.yml      |   6 +-
 .github/workflows/build-public-image.yml |   6 +-
 .github/workflows/cve.yaml               |   6 +-
 .github/workflows/e2e-checks.yaml        |   8 +-
 .github/workflows/master.yaml            |   6 +-
 .github/workflows/release.yaml           |   6 +-
 .mvn/wrapper/MavenWrapperDownloader.java | 117 -----------------------
 .mvn/wrapper/maven-wrapper.jar           | Bin 50710 -> 59925 bytes
 .mvn/wrapper/maven-wrapper.properties    |  20 +++-
 kafka-ui-e2e-checks/README.md            |   2 +-
 11 files changed, 42 insertions(+), 143 deletions(-)
 delete mode 100644 .mvn/wrapper/MavenWrapperDownloader.java

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 0b031e89af3..17a2fc10078 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -36,8 +36,8 @@ jobs:
           HEAD_REF: ${{ github.head_ref }}
           BASE_REF: ${{ github.base_ref }}
         run: |
-          mvn versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
+          ./mvnw -B -V -ntp verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
           -Dsonar.projectKey=com.provectus:kafka-ui_backend \
           -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
           -Dsonar.pullrequest.branch=$HEAD_REF \
@@ -48,6 +48,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_BACKEND }}
         run: |
-          mvn versions:set -DnewVersion=$GITHUB_SHA
-          mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
+          ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
+          ./mvnw -B -V -ntp verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
           -Dsonar.projectKey=com.provectus:kafka-ui_backend
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 0adf387085e..c2ac36c9edd 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -26,9 +26,9 @@ jobs:
       - name: Build
         id: build
         run: |
-          mvn versions:set -DnewVersion=$GITHUB_SHA
-          mvn clean package -Pprod -DskipTests
-          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
+          ./mvnw -B -V -ntp clean package -Pprod -DskipTests
+          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo "::set-output name=version::${VERSION}"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index 493e7866477..52e34242537 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -23,9 +23,9 @@ jobs:
       - name: Build
         id: build
         run: |
-          mvn versions:set -DnewVersion=$GITHUB_SHA
-          mvn clean package -Pprod -DskipTests
-          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
+          ./mvnw -B -V -ntp clean package -Pprod -DskipTests
+          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo "::set-output name=version::${VERSION}"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index cda9247dcc7..de839514800 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -20,9 +20,9 @@ jobs:
       - name: Build project
         id: build
         run: |
-          mvn versions:set -DnewVersion=$GITHUB_SHA
-          mvn clean package -DskipTests
-          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
+          ./mvnw -B -V -ntp clean package -DskipTests
+          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo "::set-output name=version::${VERSION}"
 
       - name: Set up QEMU
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 863f60f84b8..117e9993925 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -32,8 +32,8 @@ jobs:
       - name: Build with Maven
         id: build_app
         run: |
-          mvn versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          mvn clean package -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
+          ./mvnw -B -V -ntp clean package -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
       - name: compose app
         id: compose_app
         # use the following command until #819 will be fixed
@@ -41,8 +41,8 @@ jobs:
           docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
       - name: e2e run
         run: |
-          mvn versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          mvn -DQASEIO_API_TOKEN=${{ secrets.QASEIO_API_TOKEN }} -pl '!kafka-ui-api' test -Pprod
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
+          ./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ secrets.QASEIO_API_TOKEN }} -pl '!kafka-ui-api' test -Pprod
       - name: Generate allure report
         uses: simple-elf/allure-report-action@master
         if: always()
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index c14a13d9c26..ad89594bc03 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -20,9 +20,9 @@ jobs:
       - name: Build
         id: build
         run: |
-          mvn versions:set -DnewVersion=$GITHUB_SHA
-          mvn clean package -Pprod -DskipTests
-          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
+          ./mvnw -V -B -ntp clean package -Pprod -DskipTests
+          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo "::set-output name=version::${VERSION}"
 #################
 #               #
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ab01dffe50c..7c4dacfc975 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -27,9 +27,9 @@ jobs:
       - name: Build with Maven
         id: build
         run: |
-          mvn versions:set -DnewVersion=${{ github.event.release.tag_name }}
-          mvn clean package -Pprod -DskipTests
-          export VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.release.tag_name }}
+          ./mvnw -B -V -ntp clean package -Pprod -DskipTests
+          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo ::set-output name=version::${VERSION}
 
       - name: Upload files to a GitHub release
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
deleted file mode 100644
index e76d1f3241d..00000000000
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
index 2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054..bf82ff01c6cdae4a1bb754a6e062954d77ac5c11 100644
GIT binary patch
literal 59925
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
VCNKd3JGtOvEm(5t0lFyE{{i--k}m)N

literal 50710
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
EfAhh=DF6Tf

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 642d572ce90..dc3affce3dd 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index e652759e0c2..2d303dd5a0a 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -52,7 +52,7 @@ docker-compose -f documentation/compose/e2e-tests.yaml up -d
 ```
 2. Run tests using your QaseIO API token as environment variable (put instead %s into command below)
 ```
-mvn -DQASEIO_API_TOKEN='%s' -pl '!kafka-ui-api' test -Pprod
+./mvnw -DQASEIO_API_TOKEN='%s' -pl '!kafka-ui-api' test -Pprod
 ```
 
 ### Reporting

From 20543fc2f3830968d8cd9a6a3956f31157c36b6d Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Mon, 7 Nov 2022 15:23:40 +0400
Subject: [PATCH 266/734] Topic analysis visual improvements (#2691)

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../Topics/Topic/Statistics/Metrics.tsx       | 19 ++++---
 .../Topic/Statistics/Statistics.styles.ts     | 16 +++---
 .../Statistics/__test__/Metrics.spec.tsx      |  5 ++
 .../Statistics/__test__/Statistics.spec.tsx   | 23 +++++++--
 .../src/lib/__test__/dateTimeHelpers.spec.ts  | 51 +++++++++++++++++++
 kafka-ui-react-app/src/lib/dateTimeHelpers.ts | 11 ++++
 6 files changed, 106 insertions(+), 19 deletions(-)
 create mode 100644 kafka-ui-react-app/src/lib/__test__/dateTimeHelpers.spec.ts

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
index 34feb01b72e..40abb14d705 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import {
   useAnalyzeTopic,
   useCancelTopicAnalysis,
@@ -15,6 +15,7 @@ import {
 } from 'components/common/PropertiesList/PropertiesList.styled';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { useTimeFormat } from 'lib/hooks/useTimeFormat';
+import { calculateTimer } from 'lib/dateTimeHelpers';
 
 import * as S from './Statistics.styles';
 import Total from './Indicators/Total';
@@ -25,13 +26,14 @@ const Metrics: React.FC = () => {
   const formatTimestamp = useTimeFormat();
 
   const params = useAppParams<RouteParamsClusterTopic>();
-  const [isAnalyzing, setIsAnalyzing] = React.useState(true);
+
+  const [isAnalyzing, setIsAnalyzing] = useState(true);
   const analyzeTopic = useAnalyzeTopic(params);
   const cancelTopicAnalysis = useCancelTopicAnalysis(params);
 
   const { data } = useTopicAnalysis(params, isAnalyzing);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (data && !data.progress) {
       setIsAnalyzing(false);
     }
@@ -44,7 +46,10 @@ const Metrics: React.FC = () => {
   if (data.progress) {
     return (
       <S.ProgressContainer>
-        <ProgressBar completed={data.progress.completenessPercent || 0} />
+        <S.ProgressBarWrapper>
+          <ProgressBar completed={data.progress.completenessPercent || 0} />
+          <span> {Math.floor(data.progress.completenessPercent || 0)} %</span>
+        </S.ProgressBarWrapper>
         <Button
           onClick={async () => {
             await cancelTopicAnalysis.mutateAsync();
@@ -58,9 +63,12 @@ const Metrics: React.FC = () => {
         <List>
           <Label>Started at</Label>
           <span>{formatTimestamp(data.progress.startedAt, 'hh:mm:ss a')}</span>
+          <Label>Passed since start</Label>
+          <span>{calculateTimer(data.progress.startedAt as number)}</span>
           <Label>Scanned messages</Label>
+          <span>{data.progress.msgsScanned}</span>
+          <Label>Scanned size</Label>
           <span>
-            {data.progress.msgsScanned} /{' '}
             <BytesFormatted value={data.progress.bytesScanned} />
           </span>
         </List>
@@ -90,7 +98,6 @@ const Metrics: React.FC = () => {
           Restart Analysis
         </Button>
       </S.ActionsBar>
-
       <Informers.Wrapper>
         <Total {...totalStats} />
         {totalStats.keySize && (
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts
index 472562eef9d..06a4ae9c9d8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts
@@ -1,7 +1,4 @@
-import {
-  Label,
-  List,
-} from 'components/common/PropertiesList/PropertiesList.styled';
+import { List } from 'components/common/PropertiesList/PropertiesList.styled';
 import styled from 'styled-components';
 
 export const ProgressContainer = styled.div`
@@ -16,10 +13,6 @@ export const ProgressContainer = styled.div`
 
   ${List} {
     opacity: 0.5;
-
-    ${Label} {
-      text-align: right;
-    }
   }
 `;
 
@@ -42,3 +35,10 @@ export const PartitionInfo = styled.div`
   grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
   column-gap: 24px;
 `;
+
+export const ProgressBarWrapper = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 280px;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx
index ba49893a0e4..096a0af4c19 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Metrics.spec.tsx
@@ -34,6 +34,7 @@ describe('Metrics', () => {
 
   describe('when analysis is in progress', () => {
     const cancelMock = jest.fn();
+
     beforeEach(() => {
       (useCancelTopicAnalysis as jest.Mock).mockImplementation(() => ({
         mutateAsync: cancelMock,
@@ -62,6 +63,10 @@ describe('Metrics', () => {
       expect(progressbar).toBeInTheDocument();
       expect(progressbar).toHaveStyleRule('width', '0%');
     });
+
+    it('calculate Timer ', () => {
+      expect(screen.getByText('Passed since start')).toBeInTheDocument();
+    });
   });
 
   describe('when analysis is completed', () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
index d69c68b8edb..ef034b4d83a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
 import Statistics from 'components/Topics/Topic/Statistics/Statistics';
 import { clusterTopicStatisticsPath } from 'lib/paths';
-import { useTopicAnalysis } from 'lib/hooks/api/topics';
+import { useTopicAnalysis, useAnalyzeTopic } from 'lib/hooks/api/topics';
+import userEvent from '@testing-library/user-event';
 
 const clusterName = 'local';
 const topicName = 'topic';
@@ -11,6 +12,7 @@ const topicName = 'topic';
 jest.mock('lib/hooks/api/topics', () => ({
   ...jest.requireActual('lib/hooks/api/topics'),
   useTopicAnalysis: jest.fn(),
+  useAnalyzeTopic: jest.fn(),
 }));
 
 describe('Statistics', () => {
@@ -23,13 +25,24 @@ describe('Statistics', () => {
       { initialEntries: [path] }
     );
   };
-
-  it('renders Metricks component', () => {
+  const startMock = jest.fn();
+  it('renders Metricks component', async () => {
     (useTopicAnalysis as jest.Mock).mockImplementation(() => ({
       data: { result: 1 },
     }));
 
     renderComponent();
-    expect(screen.getByText('Restart Analysis')).toBeInTheDocument();
+    await expect(screen.getByText('Restart Analysis')).toBeInTheDocument();
+    expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
+  });
+  it('renders Start Analysis button', async () => {
+    (useAnalyzeTopic as jest.Mock).mockImplementation(() => ({
+      mutateAsync: startMock,
+    }));
+    renderComponent();
+    const btn = screen.getByRole('button', { name: 'Start Analysis' });
+    expect(btn).toBeInTheDocument();
+    await waitFor(() => userEvent.click(btn));
+    expect(startMock).toHaveBeenCalled();
   });
 });
diff --git a/kafka-ui-react-app/src/lib/__test__/dateTimeHelpers.spec.ts b/kafka-ui-react-app/src/lib/__test__/dateTimeHelpers.spec.ts
new file mode 100644
index 00000000000..c34371452b6
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/__test__/dateTimeHelpers.spec.ts
@@ -0,0 +1,51 @@
+import {
+  passedTime,
+  calculateTimer,
+  formatMilliseconds,
+} from 'lib/dateTimeHelpers';
+
+const startedAt = 1664891890889;
+
+describe('format Milliseconds', () => {
+  it('hours > 0', () => {
+    const result = formatMilliseconds(10000000);
+
+    expect(result).toEqual('2h 46m');
+  });
+  it('minutes > 0', () => {
+    const result = formatMilliseconds(1000000);
+
+    expect(result).toEqual('16m 40s');
+  });
+
+  it('seconds > 0', () => {
+    const result = formatMilliseconds(10000);
+
+    expect(result).toEqual('10s');
+  });
+
+  it('milliseconds > 0', () => {
+    const result = formatMilliseconds(100);
+
+    expect(result).toEqual('100ms' || '0ms');
+    expect(formatMilliseconds()).toEqual('0ms');
+  });
+});
+
+describe('calculate timer', () => {
+  it('time value < 10', () => {
+    expect(passedTime(5)).toBeTruthy();
+  });
+
+  it('time value > 9', () => {
+    expect(passedTime(10)).toBeTruthy();
+  });
+
+  it('run calculate time', () => {
+    expect(calculateTimer(startedAt));
+  });
+
+  it('return when startedAt > new Date()', () => {
+    expect(calculateTimer(1664891890889199)).toBe('00:00');
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
index 57a8834ad3a..5c72af7bc47 100644
--- a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
+++ b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
@@ -32,3 +32,14 @@ export const formatMilliseconds = (input = 0) => {
 
   return `${milliseconds}ms`;
 };
+
+export const passedTime = (value: number) => (value < 10 ? `0${value}` : value);
+
+export const calculateTimer = (startedAt: number) => {
+  const now = new Date().getTime();
+  const newDate = now - startedAt;
+  const minutes = dayjs(newDate).minute();
+  const second = dayjs(newDate).second();
+
+  return newDate > 0 ? `${passedTime(minutes)}:${passedTime(second)}` : '00:00';
+};

From 1b1caddd310d3c92c8f3430b991cc48efef469ff Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 7 Nov 2022 13:41:04 +0200
Subject: [PATCH 267/734] [e2e] fix TopicTest hardcode (#2894)

---
 .../kafka/ui/pages/topic/TopicDetails.java    | 47 ++++++-------------
 .../provectus/kafka/ui/tests/TopicTests.java  | 14 ++++--
 2 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index a065169c0ce..e619dc5c95d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -18,7 +18,6 @@ public class TopicDetails {
 
     protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
-    protected SelenideElement dotPartitionIdMenuBtn = $(By.cssSelector("button.sc-hOqruk.eYtACj"));
     protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
     protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
     protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
@@ -40,21 +39,26 @@ public TopicDetails waitUntilScreenReady() {
     }
 
     @Step
-    public TopicDetails openEditSettings() {
+    public TopicDetails openTopicMenu(TopicMenu menu) {
+        $(By.linkText(menu.getValue())).shouldBe(Condition.visible).click();
+        return this;
+    }
+
+    @Step
+    public TopicDetails openDotMenu() {
         clickByJavaScript(dotMenuBtn);
-        editSettingsTab.shouldBe(Condition.visible).click();
         return this;
     }
 
     @Step
-    public TopicDetails openTopicMenu(TopicMenu menu) {
-        $(By.linkText(menu.getValue())).shouldBe(Condition.visible).click();
+    public TopicDetails clickEditSettingsMenu() {
+        editSettingsTab.shouldBe(Condition.visible).click();
         return this;
     }
 
     @Step
-    public TopicDetails openDotPartitionIdMenu() {
-        dotPartitionIdMenuBtn.shouldBe(Condition.visible.because("dot menu invisible")).click();
+    public TopicDetails clickClearMessagesMenu() {
+        clearMessagesBtn.shouldBe(Condition.visible).click();
         return this;
     }
 
@@ -74,15 +78,13 @@ public boolean isTopicHeaderVisible(String topicName) {
     }
 
     @Step
-    public TopicDetails clickClearMessagesBtn() {
-        clearMessagesBtn.shouldBe(Condition.visible.because("Clear Messages invisible")).click();
+    public TopicDetails clickDeleteTopicMenu() {
+        removeTopicBtn.shouldBe(Condition.visible).click();
         return this;
     }
 
     @Step
-    public TopicDetails deleteTopic() {
-        clickByJavaScript(dotMenuBtn);
-        removeTopicBtn.shouldBe(Condition.visible).click();
+    public TopicDetails clickConfirmDeleteBtn() {
         confirmBtn.shouldBe(Condition.enabled).click();
         confirmBtn.shouldBe(Condition.disappear);
         return this;
@@ -93,6 +95,7 @@ public TopicDetails clickProduceMessageBtn() {
         clickByJavaScript(produceMessageBtn);
         return this;
     }
+
     @Step
     public TopicDetails openConsumerGroup(String consumerId) {
         $x(String.format(consumerIdLocator, consumerId)).click();
@@ -135,26 +138,6 @@ public String toString() {
         }
     }
 
-    public enum DotPartitionIdMenu {
-        CLEAR_MESSAGES("Clear messages");
-
-
-        private final String value;
-
-        DotPartitionIdMenu(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return "DotPartitionIdMenuItems{" + "value='" + value + '\'' + '}';
-        }
-    }
-
     public enum TopicMenu {
         OVERVIEW("Overview"),
         MESSAGES("Messages"),
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index 07bdf3b0b52..bf618f0222a 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -109,7 +109,8 @@ public void updateTopic() {
                 .openTopic(TOPIC_FOR_UPDATE.getName());
         topicDetails
                 .waitUntilScreenReady()
-                .openEditSettings();
+                .openDotMenu()
+                .clickEditSettingsMenu();
         topicCreateEditForm
                 .waitUntilScreenReady()
                 .selectCleanupPolicy((TOPIC_FOR_UPDATE.getCleanupPolicyValue()))
@@ -127,7 +128,8 @@ public void updateTopic() {
                 .openTopic(TOPIC_FOR_UPDATE.getName());
         topicDetails
                 .waitUntilScreenReady()
-                .openEditSettings();
+                .openDotMenu()
+                .clickEditSettingsMenu();
         SoftAssertions softly = new SoftAssertions();
         softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()").isEqualTo(TOPIC_FOR_UPDATE.getCleanupPolicyValue().getVisibleText());
         softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
@@ -149,7 +151,9 @@ public void deleteTopic() {
                 .openTopic(TOPIC_FOR_DELETE.getName());
         topicDetails
                 .waitUntilScreenReady()
-                .deleteTopic();
+                .openDotMenu()
+                .clickDeleteTopicMenu()
+                .clickConfirmDeleteBtn();
         naviSideBar
                 .openSideMenu(TOPICS);
         topicsList
@@ -213,8 +217,8 @@ void clearMessage() {
         assertThat(messageAmount)
                 .withFailMessage("message amount not equals").isEqualTo(topicDetails.MessageCountAmount());
         topicDetails
-                .openDotPartitionIdMenu()
-                .clickClearMessagesBtn();
+                .openDotMenu()
+                .clickClearMessagesMenu();
 //        assertThat(Integer.toString(Integer.valueOf(messageAmount)-1))
 //                .withFailMessage("message amount not decrease by one").isEqualTo(topicDetails.MessageCountAmount());
     }

From b0782da7d137fba481eb9059a60e052617255b2a Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Mon, 7 Nov 2022 17:01:57 +0400
Subject: [PATCH 268/734] [FE] Add a space to formatted sizes (#2848)

* Add space to formatted sizes + modification in the test components

* Bytes-format component to be treated as a single word

* fix TopicTests()

* Merge branch 'master' into issues/2676

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../kafka/ui/pages/topic/TopicDetails.java         |  6 +++---
 .../com/provectus/kafka/ui/tests/TopicTests.java   |  6 +++---
 .../Brokers/Broker/__test__/Broker.spec.tsx        |  2 +-
 .../Topics/List/__tests__/TopicTable.spec.tsx      |  8 ++++----
 .../common/BytesFormatted/BytesFormatted.styled.ts |  5 +++++
 .../common/BytesFormatted/BytesFormatted.tsx       | 14 ++++++++------
 .../__tests__/BytesFormatted.spec.tsx              | 12 ++++++------
 .../common/NewTable/__test__/Table.spec.tsx        |  8 ++++----
 8 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/common/BytesFormatted/BytesFormatted.styled.ts

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index e619dc5c95d..d0632817b7d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -21,7 +21,7 @@ public class TopicDetails {
     protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
     protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
     protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
-    protected SelenideElement editSettingsTab = $x("//li[@role][contains(text(),'Edit settings')]");
+    protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
     protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
     protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
     protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
@@ -39,7 +39,7 @@ public TopicDetails waitUntilScreenReady() {
     }
 
     @Step
-    public TopicDetails openTopicMenu(TopicMenu menu) {
+    public TopicDetails openDetailsTab(TopicMenu menu) {
         $(By.linkText(menu.getValue())).shouldBe(Condition.visible).click();
         return this;
     }
@@ -52,7 +52,7 @@ public TopicDetails openDotMenu() {
 
     @Step
     public TopicDetails clickEditSettingsMenu() {
-        editSettingsTab.shouldBe(Condition.visible).click();
+        editSettingsMenu.shouldBe(Condition.visible).click();
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index bf618f0222a..d707b5acafd 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -175,7 +175,7 @@ void produceMessage() {
                 .openTopic(TOPIC_FOR_MESSAGES.getName());
         topicDetails
                 .waitUntilScreenReady()
-                .openTopicMenu(TopicDetails.TopicMenu.MESSAGES)
+                .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
                 .clickProduceMessageBtn();
         produceMessagePanel
                 .waitUntilScreenReady()
@@ -204,7 +204,7 @@ void clearMessage() {
                 .openTopic(TOPIC_FOR_MESSAGES.getName());
         topicDetails
                 .waitUntilScreenReady()
-                .openTopicMenu(TopicDetails.TopicMenu.OVERVIEW)
+                .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
                 .clickProduceMessageBtn();
         produceMessagePanel
                 .waitUntilScreenReady()
@@ -238,7 +238,7 @@ void redirectToConsumerFromTopic() {
                 .openTopic(topicName);
         topicDetails
                 .waitUntilScreenReady()
-                .openTopicMenu(TopicDetails.TopicMenu.CONSUMERS)
+                .openDetailsTab(TopicDetails.TopicMenu.CONSUMERS)
                 .openConsumerGroup(consumerGroupId);
         consumersDetails
                 .waitUntilScreenReady();
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
index 9723149828c..ae6a7f4b3b6 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
@@ -66,7 +66,7 @@ describe('Broker Component', () => {
     expect(
       screen.getByText(brokerDiskUsage?.segmentCount || '')
     ).toBeInTheDocument();
-    expect(screen.getByText('12MB')).toBeInTheDocument();
+    expect(screen.getByText('12 MB')).toBeInTheDocument();
 
     expect(screen.getByText('Segment Count')).toBeInTheDocument();
     expect(
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
index 4b5f046cd9d..833b0825184 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
@@ -92,13 +92,13 @@ describe('TopicTable Components', () => {
         screen.getByRole('link', { name: '__internal.topic' })
       ).toBeInTheDocument();
       expect(
-        screen.getByRole('row', { name: '__internal.topic 1 0 1 0 0Bytes' })
+        screen.getByRole('row', { name: '__internal.topic 1 0 1 0 0 Bytes' })
       ).toBeInTheDocument();
       expect(
         screen.getByRole('link', { name: 'external.topic' })
       ).toBeInTheDocument();
       expect(
-        screen.getByRole('row', { name: 'external.topic 1 0 1 0 1KB' })
+        screen.getByRole('row', { name: 'external.topic 1 0 1 0 1 KB' })
       ).toBeInTheDocument();
 
       expect(screen.getAllByRole('checkbox').length).toEqual(3);
@@ -211,7 +211,7 @@ describe('TopicTable Components', () => {
         ).toEqual(2);
         // Internal topic action buttons are disabled
         const internalTopicRow = screen.getByRole('row', {
-          name: '__internal.topic 1 0 1 0 0Bytes',
+          name: '__internal.topic 1 0 1 0 0 Bytes',
         });
         expect(internalTopicRow).toBeInTheDocument();
         expect(
@@ -221,7 +221,7 @@ describe('TopicTable Components', () => {
         ).toBeDisabled();
         // External topic action buttons are enabled
         const externalTopicRow = screen.getByRole('row', {
-          name: 'external.topic 1 0 1 0 1KB',
+          name: 'external.topic 1 0 1 0 1 KB',
         });
         expect(externalTopicRow).toBeInTheDocument();
         const extBtn = within(externalTopicRow).getByRole('button', {
diff --git a/kafka-ui-react-app/src/components/common/BytesFormatted/BytesFormatted.styled.ts b/kafka-ui-react-app/src/components/common/BytesFormatted/BytesFormatted.styled.ts
new file mode 100644
index 00000000000..dc24760572b
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/BytesFormatted/BytesFormatted.styled.ts
@@ -0,0 +1,5 @@
+import styled from 'styled-components';
+
+export const NoWrap = styled.span`
+  white-space: nowrap;
+`;
diff --git a/kafka-ui-react-app/src/components/common/BytesFormatted/BytesFormatted.tsx b/kafka-ui-react-app/src/components/common/BytesFormatted/BytesFormatted.tsx
index 7cfb35cfd21..5bfc5a1670e 100644
--- a/kafka-ui-react-app/src/components/common/BytesFormatted/BytesFormatted.tsx
+++ b/kafka-ui-react-app/src/components/common/BytesFormatted/BytesFormatted.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
 
+import { NoWrap } from './BytesFormatted.styled';
+
 interface Props {
   value: string | number | undefined;
   precision?: number;
@@ -8,22 +10,22 @@ interface Props {
 export const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
 
 const BytesFormatted: React.FC<Props> = ({ value, precision = 0 }) => {
-  const formatedValue = React.useMemo((): string => {
+  const formattedValue = React.useMemo((): string => {
     try {
       const bytes = typeof value === 'string' ? parseInt(value, 10) : value;
       if (Number.isNaN(bytes) || (bytes && bytes < 0)) return `-Bytes`;
-      if (!bytes || bytes < 1024) return `${Math.ceil(bytes || 0)}${sizes[0]}`;
+      if (!bytes || bytes < 1024) return `${Math.ceil(bytes || 0)} ${sizes[0]}`;
       const pow = Math.floor(Math.log2(bytes) / 10);
       const multiplier = 10 ** (precision < 0 ? 0 : precision);
-      return (
-        Math.round((bytes * multiplier) / 1024 ** pow) / multiplier + sizes[pow]
-      );
+      return `${Math.round((bytes * multiplier) / 1024 ** pow) / multiplier} ${
+        sizes[pow]
+      }`;
     } catch (e) {
       return `-Bytes`;
     }
   }, [precision, value]);
 
-  return <span>{formatedValue}</span>;
+  return <NoWrap>{formattedValue}</NoWrap>;
 };
 
 export default BytesFormatted;
diff --git a/kafka-ui-react-app/src/components/common/BytesFormatted/__tests__/BytesFormatted.spec.tsx b/kafka-ui-react-app/src/components/common/BytesFormatted/__tests__/BytesFormatted.spec.tsx
index bfb7b85f502..e97767fa201 100644
--- a/kafka-ui-react-app/src/components/common/BytesFormatted/__tests__/BytesFormatted.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/BytesFormatted/__tests__/BytesFormatted.spec.tsx
@@ -7,29 +7,29 @@ import { render, screen } from '@testing-library/react';
 describe('BytesFormatted', () => {
   it('renders Bytes correctly', () => {
     render(<BytesFormatted value={666} />);
-    expect(screen.getByText('666Bytes')).toBeInTheDocument();
+    expect(screen.getByText('666 Bytes')).toBeInTheDocument();
   });
 
   it('renders correct units', () => {
     let value = 1;
     sizes.forEach((unit) => {
       render(<BytesFormatted value={value} />);
-      expect(screen.getByText(`1${unit}`)).toBeInTheDocument();
+      expect(screen.getByText(`1 ${unit}`)).toBeInTheDocument();
       value *= 1024;
     });
   });
 
   it('renders correct precision', () => {
     render(<BytesFormatted value={2000} precision={100} />);
-    expect(screen.getByText(`1.953125${sizes[1]}`)).toBeInTheDocument();
+    expect(screen.getByText(`1.953125 ${sizes[1]}`)).toBeInTheDocument();
 
     render(<BytesFormatted value={10000} precision={5} />);
-    expect(screen.getByText(`9.76563${sizes[1]}`)).toBeInTheDocument();
+    expect(screen.getByText(`9.76563 ${sizes[1]}`)).toBeInTheDocument();
   });
 
   it('correctly handles invalid props', () => {
     render(<BytesFormatted value={10000} precision={-1} />);
-    expect(screen.getByText(`10${sizes[1]}`)).toBeInTheDocument();
+    expect(screen.getByText(`10 ${sizes[1]}`)).toBeInTheDocument();
 
     render(<BytesFormatted value="some string" />);
     expect(screen.getAllByText(`-${sizes[0]}`).length).toBeTruthy();
@@ -38,6 +38,6 @@ describe('BytesFormatted', () => {
     expect(screen.getAllByText(`-${sizes[0]}`).length).toBeTruthy();
 
     render(<BytesFormatted value={undefined} />);
-    expect(screen.getByText(`0${sizes[0]}`)).toBeInTheDocument();
+    expect(screen.getByText(`0 ${sizes[0]}`)).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index dbfdddab662..2c65ea74b3d 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -125,10 +125,10 @@ describe('Table', () => {
 
   it('renders SizeCell', () => {
     renderComponent();
-    expect(screen.getByText('1KB')).toBeInTheDocument();
-    expect(screen.getByText('3Bytes')).toBeInTheDocument();
-    expect(screen.getByText('49KB')).toBeInTheDocument();
-    expect(screen.getByText('1MB')).toBeInTheDocument();
+    expect(screen.getByText('1 KB')).toBeInTheDocument();
+    expect(screen.getByText('3 Bytes')).toBeInTheDocument();
+    expect(screen.getByText('49 KB')).toBeInTheDocument();
+    expect(screen.getByText('1 MB')).toBeInTheDocument();
   });
 
   it('renders TimestampCell', () => {

From 794460821864714ef8a02f76de4510495db604bc Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen.schalanda@personio.de>
Date: Mon, 7 Nov 2022 16:08:17 +0100
Subject: [PATCH 269/734] CI: Fix GitHub Actions warnings for `::set-output`
 (#2897)

> The `set-output` command is deprecated and will be disabled soon.
> Please upgrade to using Environment Files.
> For more information see: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
---
 .github/workflows/branch-deploy.yml       | 4 ++--
 .github/workflows/build-public-image.yml  | 4 ++--
 .github/workflows/cve.yaml                | 2 +-
 .github/workflows/delete-public-image.yml | 2 +-
 .github/workflows/master.yaml             | 2 +-
 .github/workflows/release.yaml            | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index c2ac36c9edd..0cd0ebb8939 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -14,7 +14,7 @@ jobs:
         id: extract_branch
         run: |
           tag='pr${{ github.event.pull_request.number }}'
-          echo ::set-output name=tag::${tag}
+          echo "tag=${tag}" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up JDK
@@ -29,7 +29,7 @@ jobs:
           ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
           ./mvnw -B -V -ntp clean package -Pprod -DskipTests
           export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
-          echo "::set-output name=version::${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index 52e34242537..9db111c7a85 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -13,7 +13,7 @@ jobs:
         id: extract_branch
         run: |
           tag='${{ github.event.pull_request.number }}'
-          echo ::set-output name=tag::${tag}
+          echo "tag=${tag}" >> $GITHUB_OUTPUT
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -26,7 +26,7 @@ jobs:
           ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
           ./mvnw -B -V -ntp clean package -Pprod -DskipTests
           export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
-          echo "::set-output name=version::${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index de839514800..8ec0a708803 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -23,7 +23,7 @@ jobs:
           ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
           ./mvnw -B -V -ntp clean package -DskipTests
           export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
-          echo "::set-output name=version::${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
diff --git a/.github/workflows/delete-public-image.yml b/.github/workflows/delete-public-image.yml
index 425c397ae50..47e08713d87 100644
--- a/.github/workflows/delete-public-image.yml
+++ b/.github/workflows/delete-public-image.yml
@@ -13,7 +13,7 @@ jobs:
         run: |
           echo
           tag='${{ github.event.pull_request.number }}'
-          echo ::set-output name=tag::${tag}
+          echo "tag=${tag}" >> $GITHUB_OUTPUT
       - name: Configure AWS credentials for Kafka-UI account
         uses: aws-actions/configure-aws-credentials@v1
         with:
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index ad89594bc03..4d1173958bd 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -23,7 +23,7 @@ jobs:
           ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
           ./mvnw -V -B -ntp clean package -Pprod -DskipTests
           export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
-          echo "::set-output name=version::${VERSION}"
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
 #################
 #               #
 # Docker images #
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7c4dacfc975..78e8de804c8 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -30,7 +30,7 @@ jobs:
           ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.release.tag_name }}
           ./mvnw -B -V -ntp clean package -Pprod -DskipTests
           export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
-          echo ::set-output name=version::${VERSION}
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Upload files to a GitHub release
         uses: svenstaro/upload-release-action@2.3.0

From d6571ec7ae719cb6bf60cf12082219196fa04cd6 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen.schalanda@personio.de>
Date: Mon, 7 Nov 2022 16:16:26 +0100
Subject: [PATCH 270/734] CI: Scan Java source files with CodeQL (#2898)

* Scan Java code with CodeQL

* REMOVE ME: Trigger workflow run
---
 .github/workflows/codeql-analysis.yml | 11 ++++++++++-
 kafka-ui-api/pom.xml                  |  1 -
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 429f78c3391..c50da89ae86 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -20,6 +20,8 @@ on:
     paths:
     - 'kafka-ui-contract/**'
     - 'kafka-ui-react-app/**'
+    - 'kafka-ui-api/**'
+    - 'kafka-ui-serde-api/**'
   schedule:
     - cron: '39 15 * * 6'
 
@@ -31,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: [ 'javascript', 'java' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
@@ -50,6 +52,13 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
+    - name: Set up JDK
+      uses: actions/setup-java@v3
+      with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index e591069987b..f9fa40386fb 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -490,5 +490,4 @@
         </profile>
     </profiles>
 
-
 </project>

From fdf82986dc3adf262d52cc428a29cbc602aa1b7c Mon Sep 17 00:00:00 2001
From: kristi-dev <92114648+kristi-dev@users.noreply.github.com>
Date: Mon, 7 Nov 2022 15:34:33 +0000
Subject: [PATCH 271/734] Message fields previews (#2756)

* #2544 message fields preview

* #2544 add test coverage

* #2544 add tests to message table

* #2544 code review fix and validation message

* #2544 fix bug with validation and add edit values

* #2544 improve test coverage

* #2544 fix code review comments

* #2544 fix build fails

Co-authored-by: Kris-K-Dev <92114648+Kris-K-Dev@users.noreply.github.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Topics/Topic/Messages/Message.tsx         |  45 +++++-
 .../Topics/Topic/Messages/MessagesTable.tsx   |  41 +++++-
 .../Topic/Messages/PreviewModal.styled.ts     |  35 +++++
 .../Topics/Topic/Messages/PreviewModal.tsx    | 137 ++++++++++++++++++
 .../Topic/Messages/__test__/Message.spec.tsx  |  14 +-
 .../Messages/__test__/MessagesTable.spec.tsx  |  14 ++
 .../Messages/__test__/PreviewModal.spec.tsx   | 112 ++++++++++++++
 7 files changed, 389 insertions(+), 9 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.tsx
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/PreviewModal.spec.tsx

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index fc4269bb32b..7efb1f728c1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import React from 'react';
 import styled from 'styled-components';
 import useDataSaver from 'lib/hooks/useDataSaver';
@@ -22,7 +23,14 @@ const ClickableRow = styled.tr`
   cursor: pointer;
 `;
 
+export interface PreviewFilter {
+  field: string;
+  path: string;
+}
+
 export interface Props {
+  keyFilters: PreviewFilter[];
+  contentFilters: PreviewFilter[];
   message: TopicMessage;
 }
 
@@ -38,6 +46,8 @@ const Message: React.FC<Props> = ({
     keyFormat,
     headers,
   },
+  keyFilters,
+  contentFilters,
 }) => {
   const [isOpen, setIsOpen] = React.useState(false);
   const savedMessageJson = {
@@ -60,6 +70,33 @@ const Message: React.FC<Props> = ({
 
   const [vEllipsisOpen, setVEllipsisOpen] = React.useState(false);
 
+  const getParsedJson = (jsonValue: string) => {
+    try {
+      return JSON.parse(jsonValue);
+    } catch (e) {
+      return {};
+    }
+  };
+
+  const renderFilteredJson = (
+    jsonValue?: string,
+    filters?: PreviewFilter[]
+  ) => {
+    if (!filters?.length || !jsonValue) return jsonValue;
+
+    const parsedJson = getParsedJson(jsonValue);
+
+    return (
+      <>
+        {filters.map((item) => (
+          <div>
+            {item.field}: {get(parsedJson, item.path)}
+          </div>
+        ))}
+      </>
+    );
+  };
+
   return (
     <>
       <ClickableRow
@@ -77,10 +114,14 @@ const Message: React.FC<Props> = ({
         <td>
           <div>{formatTimestamp(timestamp)}</div>
         </td>
-        <StyledDataCell title={key}>{key}</StyledDataCell>
+        <StyledDataCell title={key}>
+          {renderFilteredJson(key, keyFilters)}
+        </StyledDataCell>
         <StyledDataCell>
           <S.Metadata>
-            <S.MetadataValue>{content}</S.MetadataValue>
+            <S.MetadataValue>
+              {renderFilteredJson(content, contentFilters)}
+            </S.MetadataValue>
           </S.Metadata>
         </StyledDataCell>
         <td style={{ width: '5%' }}>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
index 3deab1ecb5c..3c5901214b0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
@@ -2,7 +2,7 @@ import PageLoader from 'components/common/PageLoader/PageLoader';
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { TopicMessage } from 'generated-sources';
-import React, { useContext } from 'react';
+import React, { useContext, useState } from 'react';
 import {
   getTopicMessges,
   getIsTopicMessagesFetching,
@@ -10,14 +10,19 @@ import {
 import TopicMessagesContext from 'components/contexts/TopicMessagesContext';
 import { useAppSelector } from 'lib/hooks/redux';
 
-import Message from './Message';
+import PreviewModal from './PreviewModal';
+import Message, { PreviewFilter } from './Message';
 
 const MessagesTable: React.FC = () => {
+  const [previewFor, setPreviewFor] = useState<string | null>(null);
+
+  const [keyFilters, setKeyFilters] = useState<PreviewFilter[]>([]);
+  const [contentFilters, setContentFilters] = useState<PreviewFilter[]>([]);
+
   const { isLive } = useContext(TopicMessagesContext);
 
   const messages = useAppSelector(getTopicMessges);
   const isFetching = useAppSelector(getIsTopicMessagesFetching);
-
   return (
     <Table isFullwidth>
       <thead>
@@ -26,9 +31,33 @@ const MessagesTable: React.FC = () => {
           <TableHeaderCell title="Offset" />
           <TableHeaderCell title="Partition" />
           <TableHeaderCell title="Timestamp" />
-          <TableHeaderCell title="Key" />
-          <TableHeaderCell title="Value" />
+          <TableHeaderCell
+            title="Key"
+            previewText={`Preview ${
+              keyFilters.length ? `(${keyFilters.length} selected)` : ''
+            }`}
+            onPreview={() => setPreviewFor('key')}
+          />
+          <TableHeaderCell
+            title="Value"
+            previewText={`Preview ${
+              contentFilters.length ? `(${contentFilters.length} selected)` : ''
+            }`}
+            onPreview={() => setPreviewFor('content')}
+          />
           <TableHeaderCell> </TableHeaderCell>
+
+          {previewFor !== null && (
+            <PreviewModal
+              values={previewFor === 'key' ? keyFilters : contentFilters}
+              toggleIsOpen={() => setPreviewFor(null)}
+              setFilters={(payload: PreviewFilter[]) =>
+                previewFor === 'key'
+                  ? setKeyFilters(payload)
+                  : setContentFilters(payload)
+              }
+            />
+          )}
         </tr>
       </thead>
       <tbody>
@@ -41,6 +70,8 @@ const MessagesTable: React.FC = () => {
               message.partition,
             ].join('-')}
             message={message}
+            keyFilters={keyFilters}
+            contentFilters={contentFilters}
           />
         ))}
         {isFetching && isLive && !messages.length && (
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts
new file mode 100644
index 00000000000..35f221ddeab
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts
@@ -0,0 +1,35 @@
+import styled from 'styled-components';
+
+export const PreviewModal = styled.div`
+  height: auto;
+  width: 560px;
+  border-radius: 8px;
+  background: ${({ theme }) => theme.modal.backgroundColor};
+  position: absolute;
+  left: 25%;
+  border: 1px solid ${({ theme }) => theme.modal.border.contrast};
+  box-shadow: ${({ theme }) => theme.modal.shadow};
+  padding: 32px;
+  z-index: 1;
+`;
+
+export const ButtonWrapper = styled.div`
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  gap: 10px;
+`;
+
+export const EditForm = styled.div`
+  font-weight: 500;
+  padding-bottom: 7px;
+  display: flex;
+`;
+
+export const Field = styled.div`
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  margin-right: 5px;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.tsx
new file mode 100644
index 00000000000..9d60f075d7d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.tsx
@@ -0,0 +1,137 @@
+import React, { useEffect } from 'react';
+import { Button } from 'components/common/Button/Button';
+import { FormError } from 'components/common/Input/Input.styled';
+import Input from 'components/common/Input/Input';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
+import EditIcon from 'components/common/Icons/EditIcon';
+import CancelIcon from 'components/common/Icons/CancelIcon';
+
+import * as S from './PreviewModal.styled';
+import { PreviewFilter } from './Message';
+
+export interface InfoModalProps {
+  values: PreviewFilter[];
+  toggleIsOpen(): void;
+  setFilters: (payload: PreviewFilter[]) => void;
+}
+
+const PreviewModal: React.FC<InfoModalProps> = ({
+  values,
+  toggleIsOpen,
+  setFilters,
+}) => {
+  const [field, setField] = React.useState('');
+  const [path, setPath] = React.useState('');
+  const [errors, setErrors] = React.useState<string[]>([]);
+  const [editIndex, setEditIndex] = React.useState<number | undefined>();
+
+  const handleOk = () => {
+    const newErrors = [];
+
+    if (field === '') {
+      newErrors.push('field');
+    }
+
+    if (path === '') {
+      newErrors.push('path');
+    }
+
+    if (newErrors?.length) {
+      setErrors(newErrors);
+      return;
+    }
+
+    const newValues = [...values];
+
+    if (typeof editIndex !== 'undefined') {
+      newValues.splice(editIndex, 1, { field, path });
+    } else {
+      newValues.push({ field, path });
+    }
+
+    setFilters(newValues);
+    toggleIsOpen();
+  };
+
+  const handleRemove = (filter: PreviewFilter) => {
+    const newValues = values.filter(
+      (item) => item.field !== filter.field && item.path !== filter.path
+    );
+
+    setFilters(newValues);
+  };
+
+  useEffect(() => {
+    if (values?.length && typeof editIndex !== 'undefined') {
+      setField(values[editIndex].field);
+      setPath(values[editIndex].path);
+    }
+  }, [editIndex]);
+
+  return (
+    <S.PreviewModal>
+      {values.map((item, index) => (
+        <S.EditForm key="index">
+          <S.Field>
+            {' '}
+            {item.field} : {item.path}
+          </S.Field>
+          <IconButtonWrapper role="button" onClick={() => setEditIndex(index)}>
+            <EditIcon />
+          </IconButtonWrapper>
+          {'  '}
+          <IconButtonWrapper role="button" onClick={() => handleRemove(item)}>
+            <CancelIcon />
+          </IconButtonWrapper>
+        </S.EditForm>
+      ))}
+      <div>
+        <InputLabel htmlFor="previewFormField">Field</InputLabel>
+        <Input
+          type="text"
+          id="previewFormField"
+          min="1"
+          value={field}
+          placeholder="Field"
+          onChange={({ target }) => setField(target?.value)}
+        />
+        <FormError>{errors.includes('field') && 'Field is required'}</FormError>
+      </div>
+      <div>
+        <InputLabel htmlFor="previewFormJsonPath">Json path</InputLabel>
+        <Input
+          type="text"
+          id="previewFormJsonPath"
+          min="1"
+          value={path}
+          placeholder="Json Path"
+          onChange={({ target }) => setPath(target?.value)}
+        />
+        <FormError>
+          {errors.includes('path') && 'Json path is required'}
+        </FormError>
+      </div>
+      <S.ButtonWrapper>
+        <Button
+          buttonSize="M"
+          buttonType="secondary"
+          type="button"
+          onClick={toggleIsOpen}
+        >
+          Close
+        </Button>
+        <Button
+          buttonSize="M"
+          buttonType="secondary"
+          type="button"
+          onClick={handleOk}
+        >
+          Save
+        </Button>
+      </S.ButtonWrapper>
+    </S.PreviewModal>
+  );
+};
+
+export default PreviewModal;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
index f70e2e0a42f..ec4d9cd8434 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
 import { TopicMessage, TopicMessageTimestampTypeEnum } from 'generated-sources';
-import Message, { Props } from 'components/Topics/Topic/Messages/Message';
+import Message, {
+  PreviewFilter,
+  Props,
+} from 'components/Topics/Topic/Messages/Message';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
 import userEvent from '@testing-library/user-event';
@@ -30,6 +33,9 @@ describe('Message component', () => {
     headers: { header: 'test' },
   };
 
+  const mockKeyFilters: PreviewFilter[] = [];
+  const mockContentFilters: PreviewFilter[] = [];
+
   const renderComponent = (
     props: Partial<Props> = {
       message: mockMessage,
@@ -38,7 +44,11 @@ describe('Message component', () => {
     return render(
       <table>
         <tbody>
-          <Message message={props.message || mockMessage} />
+          <Message
+            message={props.message || mockMessage}
+            keyFilters={mockKeyFilters}
+            contentFilters={mockContentFilters}
+          />
         </tbody>
       </table>
     );
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
index fa78e364a73..37ad28b202b 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
 import MessagesTable from 'components/Topics/Topic/Messages/MessagesTable';
 import { SeekDirection, SeekType, TopicMessage } from 'generated-sources';
@@ -65,6 +66,19 @@ describe('MessagesTable', () => {
       expect(screen.getByRole('table')).toBeInTheDocument();
     });
 
+    it('should check preview buttons', async () => {
+      const previewButtons = await screen.findAllByRole('button', {
+        name: 'Preview',
+      });
+      expect(previewButtons).toHaveLength(2);
+    });
+
+    it('should show preview modal with validation', async () => {
+      await userEvent.click(screen.getAllByText('Preview')[0]);
+      expect(screen.getByPlaceholderText('Field')).toHaveValue('');
+      expect(screen.getByPlaceholderText('Json Path')).toHaveValue('');
+    });
+
     it('should check the if no elements is rendered in the table', () => {
       expect(screen.getByText(/No messages found/i)).toBeInTheDocument();
     });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/PreviewModal.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/PreviewModal.spec.tsx
new file mode 100644
index 00000000000..fbea81562ee
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/PreviewModal.spec.tsx
@@ -0,0 +1,112 @@
+import userEvent from '@testing-library/user-event';
+import { act, screen } from '@testing-library/react';
+import { render } from 'lib/testHelpers';
+import React from 'react';
+import { PreviewFilter } from 'components/Topics/Topic/Messages/Message';
+import { serdesPayload } from 'lib/fixtures/topicMessages';
+import { useSerdes } from 'lib/hooks/api/topicMessages';
+import PreviewModal, {
+  InfoModalProps,
+} from 'components/Topics/Topic/Messages/PreviewModal';
+
+jest.mock('components/common/Icons/CloseIcon', () => () => 'mock-CloseIcon');
+
+jest.mock('lib/hooks/api/topicMessages', () => ({
+  useSerdes: jest.fn(),
+}));
+
+beforeEach(async () => {
+  (useSerdes as jest.Mock).mockImplementation(() => ({
+    data: serdesPayload,
+  }));
+});
+
+const toggleInfoModal = jest.fn();
+const mockValues: PreviewFilter[] = [
+  {
+    field: '',
+    path: '',
+  },
+];
+
+const renderComponent = (props?: Partial<InfoModalProps>) => {
+  render(
+    <PreviewModal
+      toggleIsOpen={toggleInfoModal}
+      values={mockValues}
+      setFilters={jest.fn()}
+      {...props}
+    />
+  );
+};
+
+describe('PreviewModal component', () => {
+  it('closes PreviewModal', async () => {
+    renderComponent();
+    await userEvent.click(screen.getByRole('button', { name: 'Close' }));
+    expect(toggleInfoModal).toHaveBeenCalledTimes(1);
+  });
+
+  it('return if empty inputs', async () => {
+    renderComponent();
+    await userEvent.click(screen.getByRole('button', { name: 'Save' }));
+    expect(screen.getByText('Json path is required')).toBeInTheDocument();
+    expect(screen.getByText('Field is required')).toBeInTheDocument();
+  });
+
+  describe('Input elements', () => {
+    const fieldValue = 'type';
+    const pathValue = 'schema.type';
+
+    beforeEach(async () => {
+      await act(() => {
+        renderComponent();
+      });
+    });
+
+    it('field input', async () => {
+      const fieldInput = screen.getByPlaceholderText('Field');
+      expect(fieldInput).toHaveValue('');
+      await userEvent.type(fieldInput, fieldValue);
+      expect(fieldInput).toHaveValue(fieldValue);
+    });
+
+    it('path input', async () => {
+      const pathInput = screen.getByPlaceholderText('Json Path');
+      expect(pathInput).toHaveValue('');
+      await userEvent.type(pathInput, pathValue);
+      expect(pathInput).toHaveValue(pathValue.toString());
+    });
+  });
+
+  describe('edit and remove functionality', () => {
+    const fieldValue = 'type new';
+    const pathValue = 'schema.type.new';
+
+    it('remove values', async () => {
+      const setFilters = jest.fn();
+      await act(() => {
+        renderComponent({ setFilters });
+      });
+      await userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
+      expect(setFilters).toHaveBeenCalledTimes(1);
+    });
+
+    it('edit values', async () => {
+      const setFilters = jest.fn();
+      const toggleIsOpen = jest.fn();
+      await act(() => {
+        renderComponent({ setFilters });
+      });
+      userEvent.click(screen.getByRole('button', { name: 'Edit' }));
+      const fieldInput = screen.getByPlaceholderText('Field');
+      userEvent.type(fieldInput, fieldValue);
+      const pathInput = screen.getByPlaceholderText('Json Path');
+      userEvent.type(pathInput, pathValue);
+      userEvent.click(screen.getByRole('button', { name: 'Save' }));
+      await act(() => {
+        renderComponent({ setFilters, toggleIsOpen });
+      });
+    });
+  });
+});

From 61ac1d921ab02d89016e46408f14e566ffd2d5de Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Mon, 7 Nov 2022 19:45:22 +0400
Subject: [PATCH 272/734] [UI] Do not cache serdes endpoint results on frontend
 (#2814)

* Do not cache serdes endpoint results on frontend

* fixed refetch bug
---
 kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
index 941841f11ba..1357a15ea32 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
@@ -183,11 +183,11 @@ export const useTopicMessages = ({
 
 export function useSerdes(props: GetSerdesRequest) {
   const { clusterName, topicName, use } = props;
+
   return useQuery(
     ['clusters', clusterName, 'topics', topicName, 'serdes', use],
     () => messagesApiClient.getSerdes(props),
     {
-      refetchOnMount: false,
       refetchOnWindowFocus: false,
       refetchOnReconnect: false,
       refetchInterval: false,

From 8011f60ccfea888951935b9312a5f79740c09818 Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Mon, 7 Nov 2022 23:54:11 +0800
Subject: [PATCH 273/734] [Docs] Fix misplaced setting in compose files (#2886)

(cherry picked from commit de5b34a5c1c7ce6c727d980f7dba950ddbd528b4)
---
 documentation/compose/kafka-ui.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/compose/kafka-ui.yaml b/documentation/compose/kafka-ui.yaml
index 790cbfc0207..e18c33aa3d4 100644
--- a/documentation/compose/kafka-ui.yaml
+++ b/documentation/compose/kafka-ui.yaml
@@ -22,7 +22,7 @@ services:
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       KAFKA_CLUSTERS_1_NAME: secondLocal
       KAFKA_CLUSTERS_1_BOOTSTRAPSERVERS: kafka1:29092
-      KAFKA_CLUSTERS_0_METRICS_PORT: 9998
+      KAFKA_CLUSTERS_1_METRICS_PORT: 9998
       KAFKA_CLUSTERS_1_SCHEMAREGISTRY: http://schemaregistry1:8085
 
   kafka0:

From f113a9b07885a8b8c45774fdbac810b0225bca0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 15:13:57 +0400
Subject: [PATCH 274/734] Bump maven-clean-plugin from 3.1.0 to 3.2.0 (#2902)

Bumps [maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/apache/maven-clean-plugin/releases)
- [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.1.0...maven-clean-plugin-3.2.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-clean-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 598ad62528c..73d3bfeb3ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <fabric8-maven-plugin.version>0.40.2</fabric8-maven-plugin.version>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-        <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
+        <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <openapi-generator-maven-plugin.version>4.3.0</openapi-generator-maven-plugin.version>

From c86a429a172d68bb7b6109e82e762215cdf78fba Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen.schalanda@personio.de>
Date: Tue, 8 Nov 2022 12:27:09 +0100
Subject: [PATCH 275/734] [e2e] Fix NPE with Qase if the token is unavailable
 (#2896)

* Fix NullPointerException in QaseExtension if token is unavailable

The `QaseExtension` JUnit extension fails with a `NullPointerException` if `QASE_API_TOKEN` is unset.

Ideally, the extension would skip execution if the token was unavailable instead of failing.

* Emit warning if Qase is disabled locally
---
 .../utilities/qaseIoUtils/QaseExtension.java  | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
index 52c3ff9b908..474acd10999 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
@@ -35,21 +35,22 @@ public class QaseExtension implements TestExecutionListener {
     private final ResultsApi resultsApi = new ResultsApi(apiClient);
     private final Map<TestIdentifier, Long> testStartTimes = new ConcurrentHashMap<>();
     private static final String QASE_PROJECT = "KAFKAUI";
-    private static final String QASE_ENABLE = "true";
 
     static {
         String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
-        if (qaseApiToken == null || StringUtils.isEmpty(qaseApiToken)) {
-            throw new RuntimeException("QaseIO API token should be present");
-        }
-        if ("true".equalsIgnoreCase(System.getProperty("QASEIO_CREATE_TESTRUN"))) {
-            System.setProperty("QASE_RUN_NAME", "Automation run " +
-                    new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date()));
+        if (StringUtils.isEmpty(qaseApiToken)) {
+            log.warn("QASEIO_API_TOKEN system property is not set. Support for Qase will be disabled.");
+            System.setProperty("QASE_ENABLE", "false");
+        } else {
+            System.setProperty("QASE_ENABLE", "true");
+            System.setProperty("QASE_PROJECT_CODE", QASE_PROJECT);
+            System.setProperty("QASE_API_TOKEN", qaseApiToken);
+            System.setProperty("QASE_USE_BULK", "false");
+            if ("true".equalsIgnoreCase(System.getProperty("QASEIO_CREATE_TESTRUN"))) {
+              System.setProperty("QASE_RUN_NAME", "Automation run " +
+                   new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date()));
+            }
         }
-        System.setProperty("QASE_ENABLE", QASE_ENABLE);
-        System.setProperty("QASE_PROJECT_CODE", QASE_PROJECT);
-        System.setProperty("QASE_API_TOKEN", qaseApiToken);
-        System.setProperty("QASE_USE_BULK", "false");
     }
 
     @Override

From 8e35fd628abf2d08c56d7a3003c6cf4c43ec34c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 15:28:20 +0400
Subject: [PATCH 276/734] Bump aquasecurity/trivy-action from 0.7.1 to 0.8.0
 (#2884)

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.7.1 to 0.8.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.7.1...0.8.0)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index 8ec0a708803..ef7d784ca10 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -55,7 +55,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.7.1
+        uses: aquasecurity/trivy-action@0.8.0
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From fce4c23276ebd798f182a2af7150cabffb2d63db Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Tue, 8 Nov 2022 17:54:50 +0200
Subject: [PATCH 277/734] [e2e] Checking requiredness of Custom parameters
 within 'Create new Topic' (#2904)

* [e2e] Checking requiredness of Custom parameters within 'Create new Topic' #2889

* [e2e] Checking requiredness of Custom parameters within 'Create new Topic' #2889

* [e2e] Checking requiredness of Custom parameters within 'Create new Topic' #2889

* [e2e] Fix1

* [e2e] Fix1
---
 .../com/provectus/kafka/ui/models/Topic.java  |  13 +-
 .../ui/pages/topic/TopicCreateEditForm.java   | 532 +++++++++---------
 .../pages/topic/enums/CleanupPolicyValue.java |  24 +
 .../topic/enums/CustomParameterType.java      |  36 ++
 .../ui/pages/topic/enums/MaxSizeOnDisk.java   |  26 +
 .../provectus/kafka/ui/tests/TopicTests.java  |  33 +-
 6 files changed, 389 insertions(+), 275 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CleanupPolicyValue.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CustomParameterType.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/MaxSizeOnDisk.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
index d9a306a4f57..597529a92a4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
@@ -1,6 +1,8 @@
 package com.provectus.kafka.ui.models;
 
-import com.provectus.kafka.ui.pages.topic.TopicCreateEditForm;
+import com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue;
+import com.provectus.kafka.ui.pages.topic.enums.CustomParameterType;
+import com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -8,7 +10,8 @@
 @Accessors(chain = true)
 public class Topic {
     private String name, timeToRetainData, maxMessageBytes, messageKey, messageContent,
-            partitions, customParameter;
-    private TopicCreateEditForm.CleanupPolicyValue cleanupPolicyValue;
-    private TopicCreateEditForm.MaxSizeOnDisk maxSizeOnDisk;
-}
\ No newline at end of file
+            partitions, customParameterValue;
+    private CustomParameterType customParameterType;
+    private CleanupPolicyValue cleanupPolicyValue;
+    private MaxSizeOnDisk maxSizeOnDisk;
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
index 9a97e6dba32..a3f723164cb 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
@@ -1,290 +1,288 @@
 package com.provectus.kafka.ui.pages.topic;
 
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$$;
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
+import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
+import static com.provectus.kafka.ui.utilities.WebUtils.isEnabled;
+import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.codeborne.selenide.ClickOptions;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue;
+import com.provectus.kafka.ui.pages.topic.enums.CustomParameterType;
+import com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.WebUtils.isEnabled;
-import static org.assertj.core.api.Assertions.assertThat;
-
 public class TopicCreateEditForm {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
-    protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
-    protected SelenideElement partitionsField = $x("//input[@name='partitions']");
-    protected SelenideElement nameField = $x("//input[@name='name']");
-    protected SelenideElement maxMessageBytesField = $x("//input[@name='maxMessageBytes']");
-    protected SelenideElement minInSyncReplicasField = $x("//input[@name='minInSyncReplicas']");
-    protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
-    protected SelenideElement maxSizeOnDiscDdl = $x("//ul[@id='topicFormRetentionBytes']");
-    protected SelenideElement createTopicBtn = $x("//button[@type='submit']");
-    protected String ddlElementLocator = "//li[@value='%s']";
-
-    @Step
-    public TopicCreateEditForm waitUntilScreenReady(){
-        loadingSpinner.shouldBe(Condition.disappear);
-        nameField.shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setTopicName(String topicName) {
-        nameField.setValue(topicName);
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setMinInsyncReplicas(Integer minInsyncReplicas) {
-        minInSyncReplicasField.setValue(minInsyncReplicas.toString());
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setTimeToRetainDataInMs(Long ms) {
-        timeToRetainField.setValue(ms.toString());
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setTimeToRetainDataInMs(String ms) {
-        timeToRetainField.setValue(ms);
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setMaxSizeOnDiskInGB(MaxSizeOnDisk MaxSizeOnDisk) {
-        maxSizeOnDiscDdl.shouldBe(Condition.visible).click();
-        $x(String.format(ddlElementLocator, MaxSizeOnDisk.getOptionValue())).shouldBe(Condition.visible).click();
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setMaxMessageBytes(Long bytes) {
-        maxMessageBytesField.setValue(bytes.toString());
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setMaxMessageBytes(String bytes) {
-        return setMaxMessageBytes(Long.parseLong(bytes));
-    }
-
-    @Step
-    public TopicCreateEditForm setPartitions(String partitions){
-        partitionsField.setValue(partitions);
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setTimeToRetainDataInMsUsingButtons(String value) {
-        timeToRetainField
-                .parent()
-                .parent()
-                .$$("button")
-                .find(Condition.exactText(value))
-                .click();
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyOptionValue) {
-        cleanUpPolicyDdl.shouldBe(Condition.visible).click();
-        $x(String.format(ddlElementLocator,cleanupPolicyOptionValue.getOptionValue())).shouldBe(Condition.visible).click();
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm selectRetentionBytes(String visibleValue) {
-        return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
-    }
-
-    @Step
-    public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
-        return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
-    }
-
-    @Step
-    public TopicCreateEditForm clickCreateTopicBtn() {
-        clickByJavaScript(createTopicBtn);
-        return this;
+  protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+  protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
+  protected SelenideElement partitionsField = $x("//input[@name='partitions']");
+  protected SelenideElement nameField = $x("//input[@name='name']");
+  protected SelenideElement maxMessageBytesField = $x("//input[@name='maxMessageBytes']");
+  protected SelenideElement minInSyncReplicasField = $x("//input[@name='minInSyncReplicas']");
+  protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
+  protected SelenideElement maxSizeOnDiscDdl = $x("//ul[@id='topicFormRetentionBytes']");
+  protected SelenideElement customParameterDdl = $x("//ul[contains(@name,'customParams')]");
+  protected SelenideElement createTopicBtn = $x("//button[@type='submit']");
+  protected SelenideElement deleteCustomParameterBtn = $x("//span[contains(@title,'Delete customParam')]");
+  protected SelenideElement addCustomParameterTypeBtn = $x("//button[contains(text(),'Add Custom Parameter')]");
+  protected SelenideElement customParameterValueField = $x("//input[@placeholder='Value']");
+  protected SelenideElement validationCustomParameterValueMsg = $x("//p[contains(text(),'Value is required')]");
+  protected String ddlElementLocator = "//li[@value='%s']";
+
+  @Step
+  public TopicCreateEditForm waitUntilScreenReady() {
+    loadingSpinner.shouldBe(Condition.disappear);
+    nameField.shouldBe(Condition.visible);
+    return this;
+  }
+
+  public boolean isCreateTopicButtonEnabled() {
+    return isEnabled(createTopicBtn);
+  }
+
+  public boolean isDeleteCustomParameterButtonEnabled() {
+    return isEnabled(deleteCustomParameterBtn);
+  }
+
+  @Step
+  public TopicCreateEditForm setTopicName(String topicName) {
+    nameField.setValue(topicName);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setMinInsyncReplicas(Integer minInsyncReplicas) {
+    minInSyncReplicasField.setValue(minInsyncReplicas.toString());
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setTimeToRetainDataInMs(Long ms) {
+    timeToRetainField.setValue(ms.toString());
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setTimeToRetainDataInMs(String ms) {
+    timeToRetainField.setValue(ms);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setMaxSizeOnDiskInGB(MaxSizeOnDisk MaxSizeOnDisk) {
+    maxSizeOnDiscDdl.shouldBe(Condition.visible).click();
+    $x(String.format(ddlElementLocator, MaxSizeOnDisk.getOptionValue())).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm clickAddCustomParameterTypeButton() {
+    addCustomParameterTypeBtn.click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setCustomParameterType(CustomParameterType customParameterType) {
+    customParameterDdl.shouldBe(Condition.visible).click();
+    $x(String.format(ddlElementLocator, customParameterType.getOptionValue())).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm clearCustomParameterValue() {
+    clearByKeyboard(customParameterValueField);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setMaxMessageBytes(Long bytes) {
+    maxMessageBytesField.setValue(bytes.toString());
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setMaxMessageBytes(String bytes) {
+    return setMaxMessageBytes(Long.parseLong(bytes));
+  }
+
+  @Step
+  public TopicCreateEditForm setPartitions(String partitions) {
+    partitionsField.setValue(partitions);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setTimeToRetainDataInMsUsingButtons(String value) {
+    timeToRetainField
+        .parent()
+        .parent()
+        .$$("button")
+        .find(Condition.exactText(value))
+        .click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyOptionValue) {
+    cleanUpPolicyDdl.shouldBe(Condition.visible).click();
+    $x(String.format(ddlElementLocator, cleanupPolicyOptionValue.getOptionValue())).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm selectRetentionBytes(String visibleValue) {
+    return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
+  }
+
+  @Step
+  public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
+    return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
+  }
+
+  @Step
+  public TopicCreateEditForm clickCreateTopicBtn() {
+    clickByJavaScript(createTopicBtn);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm addCustomParameter(String customParameterName,
+                                                String customParameterValue) {
+    ElementsCollection customParametersElements =
+        $$("ul[role=listbox][name^=customParams][name$=name]");
+    KafkaUISelectElement kafkaUISelectElement = null;
+    if (customParametersElements.size() == 1) {
+      if ("Select".equals(customParametersElements.first().getText())) {
+        kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.first());
+      }
+    } else {
+      $$("button")
+          .find(Condition.exactText("Add Custom Parameter"))
+          .click();
+      customParametersElements = $$("ul[role=listbox][name^=customParams][name$=name]");
+      kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.last());
     }
-
-    @Step
-    public TopicCreateEditForm addCustomParameter(String customParameterName,
-                                                  String customParameterValue) {
-        ElementsCollection customParametersElements =
-                $$("ul[role=listbox][name^=customParams][name$=name]");
-        KafkaUISelectElement kafkaUISelectElement = null;
-        if (customParametersElements.size() == 1) {
-            if ("Select".equals(customParametersElements.first().getText())) {
-                kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.first());
-            }
-        } else {
-            $$("button")
-                    .find(Condition.exactText("Add Custom Parameter"))
-                    .click();
-            customParametersElements = $$("ul[role=listbox][name^=customParams][name$=name]");
-            kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.last());
-        }
-        if (kafkaUISelectElement != null) {
-            kafkaUISelectElement.selectByVisibleText(customParameterName);
-        }
-        $(String.format("input[name=\"customParams.%d.value\"]", customParametersElements.size() - 1))
-                .setValue(customParameterValue);
-        return this;
+    if (kafkaUISelectElement != null) {
+      kafkaUISelectElement.selectByVisibleText(customParameterName);
     }
-
-    @Step
-    public TopicCreateEditForm updateCustomParameter(String customParameterName,
-                                                     String customParameterValue) {
-        SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
-                .find(Condition.exactText(customParameterName));
-        String name = selenideElement.getAttribute("name");
-        if (name != null) {
-            name = name.substring(0, name.lastIndexOf("."));
-        }
-        $(String.format("input[name^=%s]", name)).setValue(customParameterValue);
-        return this;
+    $(String.format("input[name=\"customParams.%d.value\"]", customParametersElements.size() - 1))
+        .setValue(customParameterValue);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm updateCustomParameter(String customParameterName,
+                                                   String customParameterValue) {
+    SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
+        .find(Condition.exactText(customParameterName));
+    String name = selenideElement.getAttribute("name");
+    if (name != null) {
+      name = name.substring(0, name.lastIndexOf("."));
     }
-
-    @Step
-    public TopicCreateEditForm cleanupPolicyIs(String value) {
-        String cleanupPolicy = new KafkaUISelectElement("cleanupPolicy")
-                .getCurrentValue();
-        assertThat(cleanupPolicy)
-                .as("Clear policy value should be " + value)
-                .isEqualToIgnoringCase(value);
-        return this;
+    $(String.format("input[name^=%s]", name)).setValue(customParameterValue);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm cleanupPolicyIs(String value) {
+    String cleanupPolicy = new KafkaUISelectElement("cleanupPolicy")
+        .getCurrentValue();
+    assertThat(cleanupPolicy)
+        .as("Clear policy value should be " + value)
+        .isEqualToIgnoringCase(value);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm timeToRetainIs(String time) {
+    String value = timeToRetainField.getValue();
+    assertThat(value)
+        .as("Time to retain data (in ms) should be " + time)
+        .isEqualTo(time);
+    return this;
+  }
+
+  @Step
+  public String getCleanupPolicy() {
+    return new KafkaUISelectElement("cleanupPolicy").getCurrentValue();
+  }
+
+  @Step
+  public String getTimeToRetain() {
+    return timeToRetainField.getValue();
+  }
+
+  @Step
+  public String getMaxSizeOnDisk() {
+    return new KafkaUISelectElement("retentionBytes").getCurrentValue();
+  }
+
+  @Step
+  public String getMaxMessageBytes() {
+    return maxMessageBytesField.getValue();
+  }
+
+  @Step
+  public boolean isValidationMessageCustomParameterValueVisible() {
+    return isVisible(validationCustomParameterValueMsg);
+  }
+
+  @Step
+  public String getCustomParameterValue() {
+    return customParameterValueField.getValue();
+  }
+
+  private static class KafkaUISelectElement {
+
+    private final SelenideElement selectElement;
+
+    public KafkaUISelectElement(String selectElementName) {
+      this.selectElement = $("ul[role=listbox][name=" + selectElementName + "]");
     }
 
-    @Step
-    public TopicCreateEditForm timeToRetainIs(String time) {
-        String value = timeToRetainField.getValue();
-        assertThat(value)
-                .as("Time to retain data (in ms) should be " + time)
-                .isEqualTo(time);
-        return this;
-    }
-
-    @Step
-    public String getCleanupPolicy() {
-        return new KafkaUISelectElement("cleanupPolicy").getCurrentValue();
-    }
-
-    @Step
-    public String getTimeToRetain() {
-        return timeToRetainField.getValue();
-    }
-
-    @Step
-    public String getMaxSizeOnDisk() {
-        return new KafkaUISelectElement("retentionBytes").getCurrentValue();
-    }
-
-    @Step
-    public String getMaxMessageBytes() {
-        return maxMessageBytesField.getValue();
-    }
-
-
-    private static class KafkaUISelectElement {
-
-        private final SelenideElement selectElement;
-
-        public KafkaUISelectElement(String selectElementName) {
-            this.selectElement = $("ul[role=listbox][name=" + selectElementName + "]");
-        }
-
-        public KafkaUISelectElement(SelenideElement selectElement) {
-            this.selectElement = selectElement;
-        }
-
-        public void selectByOptionValue(String optionValue) {
-            selectElement.click();
-            selectElement
-                    .$$x(".//ul/li[@role='option']")
-                    .find(Condition.attribute("value", optionValue))
-                    .click(ClickOptions.usingJavaScript());
-        }
-
-        public void selectByVisibleText(String visibleText) {
-            selectElement.click();
-            selectElement
-                    .$$("ul>li[role=option]")
-                    .find(Condition.exactText(visibleText))
-                    .click();
-        }
-
-        public String getCurrentValue() {
-            return selectElement.$("li").getText();
-        }
-    }
-
-    public enum CleanupPolicyValue {
-        DELETE("delete", "Delete"),
-        COMPACT("compact", "Compact"),
-        COMPACT_DELETE("compact,delete", "Compact,Delete");
-
-        private final String optionValue;
-        private final String visibleText;
-
-        CleanupPolicyValue(String optionValue, String visibleText) {
-            this.optionValue = optionValue;
-            this.visibleText = visibleText;
-        }
-
-        public String getOptionValue() {
-            return optionValue;
-        }
-
-        public String getVisibleText() {
-            return visibleText;
-        }
-    }
-
-    public enum MaxSizeOnDisk {
-        NOT_SET("-1", "Not Set"),
-        SIZE_1_GB("1073741824", "1 GB"),
-        SIZE_10_GB("10737418240", "10 GB"),
-        SIZE_20_GB("21474836480", "20 GB"),
-        SIZE_50_GB("53687091200", "50 GB");
-
-        private final String optionValue;
-        private final String visibleText;
-
-        MaxSizeOnDisk(String optionValue, String visibleText) {
-            this.optionValue = optionValue;
-            this.visibleText = visibleText;
-        }
-
-        public String getOptionValue() {
-            return optionValue;
-        }
-
-        public String getVisibleText() {
-            return visibleText;
-        }
+    public KafkaUISelectElement(SelenideElement selectElement) {
+      this.selectElement = selectElement;
     }
 
-    public boolean isCreateTopicButtonEnabled(){
-       return isEnabled(createTopicBtn);
+    public void selectByOptionValue(String optionValue) {
+      selectElement.click();
+      selectElement
+          .$$x(".//ul/li[@role='option']")
+          .find(Condition.attribute("value", optionValue))
+          .click(ClickOptions.usingJavaScript());
     }
 
-    private TopicCreateEditForm selectFromDropDownByOptionValue(String dropDownElementName,
-                                                                String optionValue) {
-        KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
-        select.selectByOptionValue(optionValue);
-        return this;
+    public void selectByVisibleText(String visibleText) {
+      selectElement.click();
+      selectElement
+          .$$("ul>li[role=option]")
+          .find(Condition.exactText(visibleText))
+          .click();
     }
 
-    private TopicCreateEditForm selectFromDropDownByVisibleText(String dropDownElementName,
-                                                                String visibleText) {
-        KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
-        select.selectByVisibleText(visibleText);
-        return this;
+    public String getCurrentValue() {
+      return selectElement.$("li").getText();
     }
+  }
+
+  private TopicCreateEditForm selectFromDropDownByOptionValue(String dropDownElementName,
+                                                              String optionValue) {
+    KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
+    select.selectByOptionValue(optionValue);
+    return this;
+  }
+
+  private TopicCreateEditForm selectFromDropDownByVisibleText(String dropDownElementName,
+                                                              String visibleText) {
+    KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
+    select.selectByVisibleText(visibleText);
+    return this;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CleanupPolicyValue.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CleanupPolicyValue.java
new file mode 100644
index 00000000000..86b87325a0d
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CleanupPolicyValue.java
@@ -0,0 +1,24 @@
+package com.provectus.kafka.ui.pages.topic.enums;
+
+public enum CleanupPolicyValue {
+  DELETE("delete", "Delete"),
+  COMPACT("compact", "Compact"),
+  COMPACT_DELETE("compact,delete", "Compact,Delete");
+
+  private final String optionValue;
+  private final String visibleText;
+
+  CleanupPolicyValue(String optionValue, String visibleText) {
+    this.optionValue = optionValue;
+    this.visibleText = visibleText;
+  }
+
+  public String getOptionValue() {
+    return optionValue;
+  }
+
+  public String getVisibleText() {
+    return visibleText;
+  }
+}
+
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CustomParameterType.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CustomParameterType.java
new file mode 100644
index 00000000000..bc2f3befaee
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CustomParameterType.java
@@ -0,0 +1,36 @@
+package com.provectus.kafka.ui.pages.topic.enums;
+
+public enum CustomParameterType {
+  COMPRESSION_TYPE("compression.type"),
+  DELETE_RETENTION_MS("delete.retention.ms"),
+  FILE_DELETE_DELAY_MS("file.delete.delay.ms"),
+  FLUSH_MESSAGES("flush.messages"),
+  FLUSH_MS("flush.ms"),
+  FOLLOWER_REPLICATION_THROTTLED_REPLICAS("follower.replication.throttled.replicas"),
+  INDEX_INTERVAL_BYTES("index.interval.bytes"),
+  LEADER_REPLICATION_THROTTLED_REPLICAS("leader.replication.throttled.replicas"),
+  MAX_COMPACTION_LAG_MS("max.compaction.lag.ms"),
+  MESSAGE_DOWNCONVERSION_ENABLE("message.downconversion.enable"),
+  MESSAGE_FORMAT_VERSION("message.format.version"),
+  MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS("message.timestamp.difference.max.ms"),
+  MESSAGE_TIMESTAMP_TYPE("message.timestamp.type"),
+  MIN_CLEANABLE_DIRTY_RATIO("min.cleanable.dirty.ratio"),
+  MIN_COMPACTION_LAG_MS("min.compaction.lag.ms"),
+  PREALLOCATE("preallocate"),
+  RETENTION_BYTES("retention.bytes"),
+  SEGMENT_BYTES("segment.bytes"),
+  SEGMENT_INDEX_BYTES("segment.index.bytes"),
+  SEGMENT_JITTER_MS("segment.jitter.ms"),
+  SEGMENT_MS("segment.ms"),
+  UNCLEAN_LEADER_ELECTION_ENABLE("unclean.leader.election.enable");
+
+  private final String optionValue;
+
+  CustomParameterType(String optionValue) {
+    this.optionValue = optionValue;
+  }
+
+  public String getOptionValue() {
+    return optionValue;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/MaxSizeOnDisk.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/MaxSizeOnDisk.java
new file mode 100644
index 00000000000..bdb476d1e6d
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/MaxSizeOnDisk.java
@@ -0,0 +1,26 @@
+package com.provectus.kafka.ui.pages.topic.enums;
+
+public enum MaxSizeOnDisk {
+  NOT_SET("-1", "Not Set"),
+  SIZE_1_GB("1073741824", "1 GB"),
+  SIZE_10_GB("10737418240", "10 GB"),
+  SIZE_20_GB("21474836480", "20 GB"),
+  SIZE_50_GB("53687091200", "50 GB");
+
+  private final String optionValue;
+  private final String visibleText;
+
+  MaxSizeOnDisk(String optionValue, String visibleText) {
+    this.optionValue = optionValue;
+    this.visibleText = visibleText;
+  }
+
+  public String getOptionValue() {
+    return optionValue;
+  }
+
+  public String getVisibleText() {
+    return visibleText;
+  }
+}
+
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index d707b5acafd..aaa7a6fe8b6 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -1,9 +1,10 @@
 package com.provectus.kafka.ui.tests;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
-import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.CleanupPolicyValue.COMPACT;
-import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.CleanupPolicyValue.DELETE;
-import static com.provectus.kafka.ui.pages.topic.TopicCreateEditForm.MaxSizeOnDisk.SIZE_20_GB;
+import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
+import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.DELETE;
+import static com.provectus.kafka.ui.pages.topic.enums.CustomParameterType.COMPRESSION_TYPE;
+import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_20_GB;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
@@ -35,6 +36,8 @@ public class TopicTests extends BaseTest {
     private static final Topic TOPIC_TO_CREATE = new Topic()
             .setName("new-topic-"+ randomAlphabetic(5))
             .setPartitions("1")
+            .setCustomParameterType(COMPRESSION_TYPE)
+            .setCustomParameterValue("producer")
             .setCleanupPolicyValue(DELETE);
     private static final Topic TOPIC_FOR_UPDATE = new Topic()
             .setName("topic-to-update-" + randomAlphabetic(5))
@@ -268,6 +271,30 @@ void checkTopicCreatePossibility() {
     assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isTrue();
   }
 
+  @DisplayName("Checking requiredness of Custom parameters within 'Create new Topic'")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(6)
+  @Test
+  void checkCustomParametersWithinCreateNewTopic() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(TOPIC_TO_CREATE.getName())
+        .clickAddCustomParameterTypeButton()
+        .setCustomParameterType(TOPIC_TO_CREATE.getCustomParameterType());
+    assertThat(topicCreateEditForm.isDeleteCustomParameterButtonEnabled()).as("isDeleteCustomParameterButtonEnabled()")
+        .isTrue();
+    topicCreateEditForm
+        .clearCustomParameterValue();
+    assertThat(topicCreateEditForm.isValidationMessageCustomParameterValueVisible())
+        .as("isValidationMessageCustomParameterValueVisible()").isTrue();
+  }
+
     @AfterAll
     public void afterAll() {
         TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));

From 5a06d659e28c341dede029da982afd5ffec542c4 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Wed, 9 Nov 2022 13:52:20 +0200
Subject: [PATCH 278/734] Issue/copy specify abstract objects as much as
 possible cross screen classes (#2913)

* Reformat all classes and add extends dependencies

* Refactored of base locators

* Fix and resolve conflicts

* Refactored BasePage methods and Pages classes

* Refactored unused locators

* Added extends ConsumersList

* Resolve conversation
---
 .../provectus/kafka/ui/pages/BasePage.java    | 78 +++++++++++++++++++
 .../provectus/kafka/ui/pages/NaviSideBar.java | 15 ++--
 .../pages/connector/ConnectorCreateForm.java  | 17 ++--
 .../ui/pages/connector/ConnectorDetails.java  | 22 +++---
 .../ui/pages/connector/KafkaConnectList.java  | 32 +++-----
 .../ui/pages/consumer/ConsumersDetails.java   | 21 +++--
 .../ui/pages/consumer/ConsumersList.java      |  9 +--
 .../ui/pages/schema/SchemaCreateForm.java     | 19 ++---
 .../kafka/ui/pages/schema/SchemaDetails.java  | 14 ++--
 .../ui/pages/schema/SchemaRegistryList.java   | 20 ++---
 .../ui/pages/topic/ProduceMessagePanel.java   | 14 ++--
 .../ui/pages/topic/TopicCreateEditForm.java   | 15 ++--
 .../kafka/ui/pages/topic/TopicDetails.java    | 17 ++--
 .../kafka/ui/pages/topic/TopicsList.java      | 23 ++----
 .../kafka/ui/tests/ConnectorsTests.java       | 20 +++--
 .../kafka/ui/tests/SchemasTests.java          | 31 +++++---
 16 files changed, 205 insertions(+), 162 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
new file mode 100644
index 00000000000..827a663cc51
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -0,0 +1,78 @@
+package com.provectus.kafka.ui.pages;
+
+import static com.codeborne.selenide.Selenide.$x;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.utilities.WebUtils;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public abstract class BasePage extends WebUtils {
+
+  protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+  protected SelenideElement submitBtn = $x("//button[@type='submit']");
+  protected SelenideElement tableGrid = $x("//table");
+  protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
+  protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
+  protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
+  protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
+
+  protected void waitUntilSpinnerDisappear() {
+    log.debug("\nwaitUntilSpinnerDisappear");
+    loadingSpinner.shouldBe(Condition.disappear);
+  }
+
+  protected void clickSubmitBtn() {
+    clickByJavaScript(submitBtn);
+  }
+
+  protected SelenideElement getTableElement(String elementName) {
+    log.debug("\ngetTableElement: {}", elementName);
+    return $x(String.format(tableElementNameLocator, elementName));
+  }
+
+  protected String getAlertHeader() {
+    log.debug("\ngetAlertHeader");
+    String result = alertHeader.shouldBe(Condition.visible).getText();
+    log.debug("-> {}", result);
+    return result;
+  }
+
+  protected String getAlertMessage() {
+    log.debug("\ngetAlertMessage");
+    String result = alertMessage.shouldBe(Condition.visible).getText();
+    log.debug("-> {}", result);
+    return result;
+  }
+
+  protected boolean isAlertVisible(AlertHeader header) {
+    log.debug("\nisAlertVisible: {}", header.toString());
+    boolean result = getAlertHeader().equals(header.toString());
+    log.debug("-> {}", result);
+    return result;
+  }
+
+  protected boolean isAlertVisible(AlertHeader header, String message) {
+    log.debug("\nisAlertVisible: {} {}", header, message);
+    boolean result = isAlertVisible(header) && getAlertMessage().equals(message);
+    log.debug("-> {}", result);
+    return result;
+  }
+
+  public enum AlertHeader {
+    SUCCESS("Success"),
+    VALIDATION_ERROR("Validation Error"),
+    BAD_REQUEST("400 Bad Request");
+
+    private final String value;
+
+    AlertHeader(String value) {
+      this.value = value;
+    }
+
+    public String toString() {
+      return value;
+    }
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
index 565bbd24e5c..4a3b8f828de 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
@@ -1,21 +1,18 @@
 package com.provectus.kafka.ui.pages;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
-
 import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByActions;
-
-public class NaviSideBar {
+public class NaviSideBar extends BasePage {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement dashboardMenuItem = $x("//a[@title='Dashboard']");
     protected String sideMenuOptionElementLocator = ".//ul/li[contains(.,'%s')]";
     protected String clusterElementLocator = "//aside/ul/li[contains(.,'%s')]";
@@ -30,7 +27,7 @@ private SelenideElement expandCluster(String clusterName) {
 
     @Step
     public NaviSideBar waitUntilScreenReady() {
-        loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(30));
+        waitUntilSpinnerDisappear();
         dashboardMenuItem.shouldBe(Condition.visible, Duration.ofSeconds(30));
         return this;
     }
@@ -70,4 +67,4 @@ public List<SelenideElement> getAllMenuButtons() {
                 .map(option -> $x(String.format(sideMenuOptionElementLocator, option.value)))
                 .collect(Collectors.toList());
     }
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
index 26cab86f63b..093341cd646 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
@@ -1,24 +1,21 @@
 package com.provectus.kafka.ui.pages.connector;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.codeborne.selenide.Selenide.refresh;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-
-public class ConnectorCreateForm {
+public class ConnectorCreateForm extends BasePage {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement nameField = $x("//input[@name='name']");
     protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
-    protected SelenideElement submitBtn = $x("//button[@type='submit']");
     protected SelenideElement configField = $x("//div[@id='config']");
 
     @Step
     public ConnectorCreateForm waitUntilScreenReady() {
-        loadingSpinner.shouldBe(Condition.disappear);
+        waitUntilSpinnerDisappear();
         nameField.shouldBe(Condition.visible);
         return this;
     }
@@ -34,8 +31,8 @@ public ConnectorCreateForm setConnectorDetails(String connectName, String config
 
     @Step
     public ConnectorCreateForm clickSubmitButton() {
-      clickByJavaScript(submitBtn);
-      loadingSpinner.shouldBe(Condition.disappear);
+      clickSubmitBtn();
+      waitUntilSpinnerDisappear();
       return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
index e5e6b4cbd3c..291c4aa6f3f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
@@ -1,33 +1,25 @@
 package com.provectus.kafka.ui.pages.connector;
 
 import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-import java.time.Duration;
-import java.util.Arrays;
 
-public class ConnectorDetails {
+public class ConnectorDetails extends BasePage {
 
-  protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
-  protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
   protected SelenideElement deleteBtn = $x("//li/div[contains(text(),'Delete')]");
   protected SelenideElement confirmBtnMdl = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
-  protected SelenideElement submitBtn = $x("//button[@type='submit']");
   protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
   protected SelenideElement taskTab = $x("//a[contains(text(),'Tasks')]");
   protected SelenideElement configTab = $x("//a[contains(text(),'Config')]");
   protected SelenideElement configField = $x("//div[@id='config']");
-  protected SelenideElement successAlertMessage = $x("//div[contains(text(),'Config successfully updated')]");
   protected String connectorHeaderLocator = "//h1[contains(text(),'%s')]";
 
   @Step
   public ConnectorDetails waitUntilScreenReady() {
-    loadingSpinner.shouldBe(Condition.disappear);
+    waitUntilSpinnerDisappear();
     dotMenuBtn.shouldBe(Condition.visible);
     return this;
   }
@@ -49,8 +41,7 @@ public ConnectorDetails setConfig(String configJson) {
 
     @Step
     public ConnectorDetails clickSubmitButton() {
-      clickByJavaScript(submitBtn);
-      successAlertMessage.shouldBe(Condition.visible);
+      clickSubmitBtn();
       return this;
     }
 
@@ -85,4 +76,9 @@ public ConnectorDetails deleteConnector() {
     public boolean isConnectorHeaderVisible(String connectorName) {
         return isVisible($x(String.format(connectorHeaderLocator,connectorName)));
     }
+
+    @Step
+    public boolean isAlertWithMessageVisible(AlertHeader header, String message){
+      return isAlertVisible(header, message);
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
index 16104ac1ca8..316178d1d22 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
@@ -1,27 +1,27 @@
 package com.provectus.kafka.ui.pages.connector;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
-import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 @ExtensionMethod(WaitUtils.class)
-public class KafkaConnectList {
+public class KafkaConnectList extends BasePage {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement createConnectorBtn = $x("//button[contains(text(),'Create Connector')]");
-    protected SelenideElement connectorsGrid = $x("//table");
-    protected String connectorNameLocator = "//td[contains(text(),'%s')]";
+
+    public KafkaConnectList(){
+        tableElementNameLocator = "//tbody//td[contains(text(),'%s')]";
+    }
 
     @Step
     public KafkaConnectList waitUntilScreenReady() {
-      loadingSpinner.shouldBe(Condition.disappear);
+      waitUntilSpinnerDisappear();
       createConnectorBtn.shouldBe(Condition.visible);
       return this;
     }
@@ -34,21 +34,13 @@ public KafkaConnectList clickCreateConnectorBtn() {
 
     @Step
     public KafkaConnectList openConnector(String connectorName) {
-        $x(String.format(connectorNameLocator, connectorName))
-                .shouldBe(Condition.enabled).click();
+      getTableElement(connectorName).shouldBe(Condition.enabled).click();
         return this;
     }
 
     @Step
     public boolean isConnectorVisible(String connectorName) {
-        connectorsGrid.shouldBe(Condition.visible);
-        return isVisible($x(String.format(connectorNameLocator,connectorName)));
-    }
-
-    @Step
-    public KafkaConnectList connectorIsUpdatedInList(String connectorName, String topicName) {
-        $x(String.format(connectorNameLocator,connectorName)).shouldBe(Condition.visible);
-        By.xpath(String.format(connectorNameLocator,topicName)).refreshUntil(Condition.visible);
-        return this;
+        tableGrid.shouldBe(Condition.visible);
+        return isVisible(getTableElement(connectorName));
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java
index 37b020d935a..dabdff88ec0 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java
@@ -1,32 +1,31 @@
 package com.provectus.kafka.ui.pages.consumer;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
-
-public class ConsumersDetails {
+public class ConsumersDetails extends BasePage {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
-    protected SelenideElement topicGrid = $x("//table");
     protected String consumerIdHeaderLocator = "//h1[contains(text(),'%s')]";
     protected String topicElementLocator = "//tbody//td//a[text()='%s']";
+
     @Step
     public ConsumersDetails waitUntilScreenReady() {
-        loadingSpinner.shouldBe(Condition.disappear);
-        topicGrid.shouldBe(Condition.visible);
+        waitUntilSpinnerDisappear();
+        tableGrid.shouldBe(Condition.visible);
         return this;
     }
+
     @Step
     public boolean isRedirectedConsumerTitleVisible(String consumerGroupId) {
         return isVisible($x(String.format(consumerIdHeaderLocator, consumerGroupId)));
     }
+
     @Step
     public boolean isTopicInConsumersDetailsVisible(String topicName) {
-        topicGrid.shouldBe(Condition.visible);
+        tableGrid.shouldBe(Condition.visible);
         return isVisible($x(String.format(topicElementLocator, topicName)));
     }
-
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java
index 0797d121955..07824736bea 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java
@@ -1,11 +1,10 @@
 package com.provectus.kafka.ui.pages.consumer;
 
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.utilities.WaitUtils;
-import lombok.experimental.ExtensionMethod;
-
 import static com.codeborne.selenide.Selenide.$x;
-public class ConsumersList {
+
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+public class ConsumersList extends BasePage {
 
     protected SelenideElement consumerListHeader = $x("//h1[text()='Consumers']");
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
index 732a1623fa3..ec6455fcfa2 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
@@ -1,23 +1,20 @@
 package com.provectus.kafka.ui.pages.schema;
 
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.api.model.SchemaType;
+import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-
-public class SchemaCreateForm {
+public class SchemaCreateForm extends BasePage {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement schemaNameField = $x("//input[@name='subject']");
     protected SelenideElement pageTitle = $x("//h1['Edit']");
     protected SelenideElement schemaTextArea = $x("//textarea[@name='schema']");
-    protected SelenideElement submitBtn = $x("//button[@type='submit']");
     protected SelenideElement newSchemaInput = $("#newSchema [wrap]");
     protected SelenideElement schemaTypeDdl = $x("//ul[@name='schemaType']");
     protected SelenideElement compatibilityLevelList = $x("//ul[@name='compatibilityLevel']");
@@ -26,7 +23,7 @@ public class SchemaCreateForm {
 
     @Step
     public SchemaCreateForm waitUntilScreenReady(){
-        loadingSpinner.shouldBe(Condition.disappear);
+        waitUntilSpinnerDisappear();
         pageTitle.shouldBe(Condition.visible);
         return this;
     }
@@ -51,8 +48,8 @@ public SchemaCreateForm selectSchemaTypeFromDropdown(SchemaType schemaType) {
     }
 
     @Step
-    public SchemaCreateForm clickSubmitBtn() {
-        clickByJavaScript(submitBtn);
+    public SchemaCreateForm clickSubmitButton() {
+        clickSubmitBtn();
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
index 981de748e99..b9808d05405 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
@@ -1,18 +1,14 @@
 package com.provectus.kafka.ui.pages.schema;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
-
-public class SchemaDetails {
+public class SchemaDetails extends BasePage {
 
-    protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement actualVersionTextArea = $x("//div[@id='schema']");
     protected SelenideElement compatibilityField = $x("//h4[contains(text(),'Compatibility')]/../p");
     protected SelenideElement editSchemaBtn = $x("//button[contains(text(),'Edit Schema')]");
@@ -23,7 +19,7 @@ public class SchemaDetails {
 
     @Step
     public SchemaDetails waitUntilScreenReady() {
-        loadingSpinner.shouldBe(Condition.disappear);
+        waitUntilSpinnerDisappear();
         actualVersionTextArea.shouldBe(Condition.visible);
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
index b79fa307c41..e6476ab1f6f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
@@ -1,23 +1,19 @@
 package com.provectus.kafka.ui.pages.schema;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
-
-public class SchemaRegistryList {
+public class SchemaRegistryList extends BasePage {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement createSchemaBtn = $x("//button[contains(text(),'Create Schema')]");
-    protected SelenideElement schemaGrid = $x("//table");
-    protected String schemaTabElementLocator = "//a[contains(text(),'%s')]";
 
     @Step
     public SchemaRegistryList waitUntilScreenReady(){
-        loadingSpinner.shouldBe(Condition.disappear);
+        waitUntilSpinnerDisappear();
         createSchemaBtn.shouldBe(Condition.visible);
         return this;
     }
@@ -30,15 +26,15 @@ public SchemaRegistryList clickCreateSchema() {
 
     @Step
     public SchemaRegistryList openSchema(String schemaName) {
-        $x(String.format(schemaTabElementLocator,schemaName))
+        getTableElement(schemaName)
                 .shouldBe(Condition.enabled).click();
         return this;
     }
 
     @Step
     public boolean isSchemaVisible(String schemaName) {
-        schemaGrid.shouldBe(Condition.visible);
-        return isVisible($x(String.format(schemaTabElementLocator,schemaName)));
+        tableGrid.shouldBe(Condition.visible);
+        return isVisible(getTableElement(schemaName));
     }
 }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
index 8a4904632cc..d4dd3d8c158 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
@@ -1,18 +1,16 @@
 package com.provectus.kafka.ui.pages.topic;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.codeborne.selenide.Selenide.refresh;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-
 import java.util.Arrays;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.codeborne.selenide.Selenide.refresh;
-import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
-
-public class ProduceMessagePanel {
+public class ProduceMessagePanel extends BasePage {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement keyTextArea = $x("//div[@id='key']/textarea");
     protected SelenideElement contentTextArea = $x("//div[@id='content']/textarea");
     protected SelenideElement headersTextArea = $x("//div[@id='headers']/textarea");
@@ -23,7 +21,7 @@ public class ProduceMessagePanel {
 
     @Step
     public ProduceMessagePanel waitUntilScreenReady(){
-        loadingSpinner.shouldBe(Condition.disappear);
+        waitUntilSpinnerDisappear();
         Arrays.asList(partitionDdl, keySerdeDdl, contentSerdeDdl).forEach(element -> element.shouldBe(Condition.visible));
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
index a3f723164cb..e44ba5c86fb 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
@@ -3,24 +3,20 @@
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$$;
 import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.clearByKeyboard;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.WebUtils.isEnabled;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.codeborne.selenide.ClickOptions;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue;
 import com.provectus.kafka.ui.pages.topic.enums.CustomParameterType;
 import com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk;
 import io.qameta.allure.Step;
 
-public class TopicCreateEditForm {
+public class TopicCreateEditForm extends BasePage {
 
-  protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
   protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
   protected SelenideElement partitionsField = $x("//input[@name='partitions']");
   protected SelenideElement nameField = $x("//input[@name='name']");
@@ -29,7 +25,6 @@ public class TopicCreateEditForm {
   protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
   protected SelenideElement maxSizeOnDiscDdl = $x("//ul[@id='topicFormRetentionBytes']");
   protected SelenideElement customParameterDdl = $x("//ul[contains(@name,'customParams')]");
-  protected SelenideElement createTopicBtn = $x("//button[@type='submit']");
   protected SelenideElement deleteCustomParameterBtn = $x("//span[contains(@title,'Delete customParam')]");
   protected SelenideElement addCustomParameterTypeBtn = $x("//button[contains(text(),'Add Custom Parameter')]");
   protected SelenideElement customParameterValueField = $x("//input[@placeholder='Value']");
@@ -38,13 +33,13 @@ public class TopicCreateEditForm {
 
   @Step
   public TopicCreateEditForm waitUntilScreenReady() {
-    loadingSpinner.shouldBe(Condition.disappear);
+    waitUntilSpinnerDisappear();
     nameField.shouldBe(Condition.visible);
     return this;
   }
 
   public boolean isCreateTopicButtonEnabled() {
-    return isEnabled(createTopicBtn);
+    return isEnabled(submitBtn);
   }
 
   public boolean isDeleteCustomParameterButtonEnabled() {
@@ -148,7 +143,7 @@ public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
 
   @Step
   public TopicCreateEditForm clickCreateTopicBtn() {
-    clickByJavaScript(createTopicBtn);
+    clickSubmitBtn();
     return this;
   }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index d0632817b7d..c9469fab735 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -1,23 +1,20 @@
 package com.provectus.kafka.ui.pages.topic;
 
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
+import java.util.Arrays;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
-import java.util.Arrays;
-
-import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
-
 @ExtensionMethod({WaitUtils.class})
-public class TopicDetails {
+public class TopicDetails extends BasePage {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
-    protected SelenideElement dotMenuBtn = $$x("//button[@aria-label='Dropdown Toggle']").first();
     protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
     protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
     protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
@@ -33,7 +30,7 @@ public class TopicDetails {
 
     @Step
     public TopicDetails waitUntilScreenReady() {
-        loadingSpinner.shouldBe(Condition.disappear);
+        waitUntilSpinnerDisappear();
         Arrays.asList(overviewTab,messagesTab).forEach(element -> element.shouldBe(Condition.visible));
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 793353cfad4..34e997152ff 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -1,29 +1,23 @@
 package com.provectus.kafka.ui.pages.topic;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import lombok.experimental.ExtensionMethod;
-import org.openqa.selenium.By;
-
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.utilities.WebUtils.clickByJavaScript;
-import static com.provectus.kafka.ui.utilities.WebUtils.isVisible;
 
 @ExtensionMethod(WaitUtils.class)
-public class TopicsList {
+public class TopicsList extends BasePage {
 
-    protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
     protected SelenideElement topicListHeader = $x("//h1[text()='Topics']");
     protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
-    protected SelenideElement topicGrid = $x("//table");
-    protected String topicElementLocator = "//tbody//td//a[text()='%s']";
 
     @Step
     public TopicsList waitUntilScreenReady() {
-        loadingSpinner.shouldBe(Condition.disappear);
+        waitUntilSpinnerDisappear();
         topicListHeader.shouldBe(Condition.visible);
         return this;
     }
@@ -36,14 +30,13 @@ public TopicsList clickAddTopicBtn() {
 
     @Step
     public boolean isTopicVisible(String topicName) {
-        topicGrid.shouldBe(Condition.visible);
-        return isVisible($x(String.format(topicElementLocator,topicName)));
+        tableGrid.shouldBe(Condition.visible);
+        return isVisible(getTableElement(topicName));
     }
 
     @Step
     public TopicsList openTopic(String topicName) {
-        $(By.linkText(topicName))
-                .shouldBe(Condition.enabled).click();
+        getTableElement(topicName).shouldBe(Condition.enabled).click();
         return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
index 1203fc9ebcf..505cb6bcf00 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
@@ -1,5 +1,11 @@
 package com.provectus.kafka.ui.tests;
 
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
+import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Topic;
@@ -7,15 +13,14 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
-import org.junit.jupiter.api.*;
-
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
-import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ConnectorsTests extends BaseTest {
@@ -106,6 +111,7 @@ public void updateConnector() {
                 .openConfigTab()
                 .setConfig(CONNECTOR_FOR_UPDATE.getConfig())
                 .clickSubmitButton();
+        Assertions.assertTrue(connectorDetails.isAlertWithMessageVisible(SUCCESS,"Config successfully updated."),"isAlertWithMessageVisible()");
         naviSideBar
                 .openSideMenu(KAFKA_CONNECT);
         kafkaConnectList
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
index e0c33e2f3c0..681b95bbb56 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
@@ -1,5 +1,9 @@
 package com.provectus.kafka.ui.tests;
 
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.SCHEMA_REGISTRY;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Schema;
@@ -7,16 +11,19 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
-import lombok.SneakyThrows;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.*;
-
 import java.util.ArrayList;
 import java.util.List;
-
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.SCHEMA_REGISTRY;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+import lombok.SneakyThrows;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestMethodOrder;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -52,7 +59,7 @@ void createSchemaAvro() {
                 .setSubjectName(schemaAvro.getName())
                 .setSchemaField(fileToString(schemaAvro.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaAvro.getType())
-                .clickSubmitBtn();
+                .clickSubmitButton();
         schemaDetails
                 .waitUntilScreenReady();
         SoftAssertions softly = new SoftAssertions();
@@ -90,7 +97,7 @@ void updateSchemaAvro() {
         schemaCreateForm
                 .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
-                .clickSubmitBtn();
+                .clickSubmitButton();
         schemaDetails
                 .waitUntilScreenReady();
         Assertions.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), schemaDetails.getCompatibility(), "getCompatibility()");
@@ -134,7 +141,7 @@ void createSchemaJson() {
                 .setSubjectName(schemaJson.getName())
                 .setSchemaField(fileToString(schemaJson.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaJson.getType())
-                .clickSubmitBtn();
+                .clickSubmitButton();
         schemaDetails
                 .waitUntilScreenReady();
         SoftAssertions softly = new SoftAssertions();
@@ -188,7 +195,7 @@ void createSchemaProtobuf() {
                 .setSubjectName(schemaProtobuf.getName())
                 .setSchemaField(fileToString(schemaProtobuf.getValuePath()))
                 .selectSchemaTypeFromDropdown(schemaProtobuf.getType())
-                .clickSubmitBtn();
+                .clickSubmitButton();
         schemaDetails
                 .waitUntilScreenReady();
         SoftAssertions softly = new SoftAssertions();

From 74b20d5a5883b14003a889816418496ea0ca47e3 Mon Sep 17 00:00:00 2001
From: kristi-dev <92114648+kristi-dev@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:47:25 +0000
Subject: [PATCH 279/734] #2685 Migrate Topic Settings page to the new version
 of table component (#2834)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Topics/Topic/Settings/ConfigListItem.tsx  | 24 -------
 .../Topics/Topic/Settings/Settings.styled.ts  | 19 ++---
 .../Topics/Topic/Settings/Settings.tsx        | 69 ++++++++++++++-----
 .../Settings/__test__/ConfigListItem.spec.tsx | 45 ------------
 .../Topic/Settings/__test__/Settings.spec.tsx | 16 ++---
 5 files changed, 67 insertions(+), 106 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Settings/ConfigListItem.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/ConfigListItem.spec.tsx

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Settings/ConfigListItem.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Settings/ConfigListItem.tsx
deleted file mode 100644
index cc0b36caa05..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Settings/ConfigListItem.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { TopicConfig } from 'generated-sources';
-import React from 'react';
-
-import * as S from './Settings.styled';
-
-export interface ListItemProps {
-  config: TopicConfig;
-}
-
-const ConfigListItem: React.FC<ListItemProps> = ({
-  config: { name, value, defaultValue },
-}) => {
-  const hasCustomValue = !!defaultValue && value !== defaultValue;
-
-  return (
-    <S.Row $hasCustomValue={hasCustomValue}>
-      <td>{name}</td>
-      <td>{value}</td>
-      <td title="Default Value">{hasCustomValue && defaultValue}</td>
-    </S.Row>
-  );
-};
-
-export default ConfigListItem;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.styled.ts
index 30aa0f2afe6..e11a2ba80b4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.styled.ts
@@ -1,13 +1,14 @@
 import styled, { css } from 'styled-components';
 
-export const Row = styled.tr<{ $hasCustomValue?: boolean }>(
-  ({ theme, $hasCustomValue }) => css`
-    & > td {
-      font-weight: ${$hasCustomValue ? 500 : 400};
-      &:last-child {
-        color: ${theme.configList.color};
-        font-weight: 400;
-      }
-    }
+export const Value = styled.span<{ $hasCustomValue?: boolean }>(
+  ({ $hasCustomValue }) => css`
+    font-weight: ${$hasCustomValue ? 500 : 400};
+  `
+);
+
+export const DefaultValue = styled.span(
+  ({ theme }) => css`
+    color: ${theme.configList.color};
+    font-weight: 400;
   `
 );
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.tsx
index d7b553af9d5..001fc2c0090 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Settings/Settings.tsx
@@ -1,31 +1,62 @@
 import React from 'react';
-import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
+import Table from 'components/common/NewTable';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import { useTopicConfig } from 'lib/hooks/api/topics';
+import { CellContext, ColumnDef } from '@tanstack/react-table';
+import { TopicConfig } from 'generated-sources';
 
-import ConfigListItem from './ConfigListItem';
+import * as S from './Settings.styled';
+
+const ValueCell: React.FC<CellContext<TopicConfig, unknown>> = ({
+  row,
+  renderValue,
+}) => {
+  const { defaultValue } = row.original;
+  const { value } = row.original;
+  const hasCustomValue = !!defaultValue && value !== defaultValue;
+
+  return (
+    <S.Value $hasCustomValue={hasCustomValue}>{renderValue<string>()}</S.Value>
+  );
+};
+
+const DefaultValueCell: React.FC<CellContext<TopicConfig, unknown>> = ({
+  row,
+  getValue,
+}) => {
+  const defaultValue = getValue<TopicConfig['defaultValue']>();
+  const { value } = row.original;
+  const hasCustomValue = !!defaultValue && value !== defaultValue;
+  return <S.DefaultValue>{hasCustomValue && defaultValue}</S.DefaultValue>;
+};
 
 const Settings: React.FC = () => {
   const props = useAppParams<RouteParamsClusterTopic>();
-  const { data } = useTopicConfig(props);
-  return (
-    <Table isFullwidth>
-      <thead>
-        <tr>
-          <TableHeaderCell title="Key" />
-          <TableHeaderCell title="Value" />
-          <TableHeaderCell title="Default Value" />
-        </tr>
-      </thead>
-      <tbody>
-        {data?.map((item) => (
-          <ConfigListItem key={item.name} config={item} />
-        ))}
-      </tbody>
-    </Table>
+  const { data = [] } = useTopicConfig(props);
+
+  const columns = React.useMemo<ColumnDef<TopicConfig>[]>(
+    () => [
+      {
+        header: 'Key',
+        accessorKey: 'name',
+        cell: ValueCell,
+      },
+      {
+        header: 'Value',
+        accessorKey: 'value',
+        cell: ValueCell,
+      },
+      {
+        header: 'Default Value',
+        accessorKey: 'defaultValue',
+        cell: DefaultValueCell,
+      },
+    ],
+    []
   );
+
+  return <Table columns={columns} data={data} />;
 };
 
 export default Settings;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/ConfigListItem.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/ConfigListItem.spec.tsx
deleted file mode 100644
index b363ff55337..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/ConfigListItem.spec.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-import { render } from 'lib/testHelpers';
-import { screen } from '@testing-library/react';
-import ConfigListItem, {
-  ListItemProps,
-} from 'components/Topics/Topic/Settings/ConfigListItem';
-
-const setupComponent = (props: ListItemProps) => {
-  render(
-    <table>
-      <tbody>
-        <ConfigListItem {...props} />
-      </tbody>
-    </table>
-  );
-};
-
-const getName = () => screen.getByText('someName');
-const getValue = () => screen.getByText('someValue');
-
-it('renders with CustomValue', () => {
-  setupComponent({
-    config: {
-      name: 'someName',
-      value: 'someValue',
-      defaultValue: 'someDefaultValue',
-    },
-  });
-  expect(getName()).toBeInTheDocument();
-  expect(getName()).toHaveStyle('font-weight: 500');
-  expect(getValue()).toBeInTheDocument();
-  expect(getValue()).toHaveStyle('font-weight: 500');
-  expect(screen.getByText('someDefaultValue')).toBeInTheDocument();
-});
-
-it('renders without CustomValue', () => {
-  setupComponent({
-    config: { name: 'someName', value: 'someValue', defaultValue: 'someValue' },
-  });
-  expect(getName()).toBeInTheDocument();
-  expect(getName()).toHaveStyle('font-weight: 400');
-  expect(getValue()).toBeInTheDocument();
-  expect(getValue()).toHaveStyle('font-weight: 400');
-  expect(screen.getByTitle('Default Value')).toHaveTextContent('');
-});
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/Settings.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/Settings.spec.tsx
index cf5236ffa15..c2aa9a93e5d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/Settings.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Settings/__test__/Settings.spec.tsx
@@ -13,11 +13,8 @@ jest.mock('lib/hooks/api/topics', () => ({
   useTopicConfig: jest.fn(),
 }));
 
-jest.mock('components/Topics/Topic/Settings/ConfigListItem', () => () => (
-  <tr>
-    <td>ConfigListItemMock</td>
-  </tr>
-));
+const getName = () => screen.getByText('compression.type');
+const getValue = () => screen.getByText('producer');
 
 describe('Settings', () => {
   const renderComponent = () => {
@@ -37,9 +34,10 @@ describe('Settings', () => {
     renderComponent();
   });
 
-  it('should check it returns null if no config is passed', () => {
-    expect(screen.getByRole('table')).toBeInTheDocument();
-    const items = screen.getAllByText('ConfigListItemMock');
-    expect(items.length).toEqual(topicConfigPayload.length);
+  it('renders without CustomValue', () => {
+    expect(getName()).toBeInTheDocument();
+    expect(getName()).toHaveStyle('font-weight: 400');
+    expect(getValue()).toBeInTheDocument();
+    expect(getValue()).toHaveStyle('font-weight: 400');
   });
 });

From 9f5d9126dacb1ef8c8299d14c1a8e2efe408154d Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 10 Nov 2022 00:43:18 +0400
Subject: [PATCH 280/734] Add a missing space for partitions count (#2803)

* Add a missing space for partitions count

* Update BrokersList.tsx
---
 .../src/components/Brokers/BrokersList/BrokersList.tsx           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index 54bdcef5ff8..3fce89fbae9 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -92,6 +92,7 @@ const BrokersList: React.FC = () => {
               onlinePartitionCount
             )}
             <Metrics.LightText>
+              {' '}
               of {(onlinePartitionCount || 0) + (offlinePartitionCount || 0)}
             </Metrics.LightText>
           </Metrics.Indicator>

From af1065fca875f47487c64bc9b7f3598b8144b8cb Mon Sep 17 00:00:00 2001
From: Anton Mnykh <44034169+Redbutton18@users.noreply.github.com>
Date: Thu, 10 Nov 2022 13:06:15 +0200
Subject: [PATCH 281/734] [e2e] TopicTests.messageCopyFromTopicProfile :
 Message copy from topic profile (#2901)

* test fix

* test fix2

* locator fix

* test fix

* test fix2

* test fix2

* test fix3

* fix clearMessage test
add MessageGridItem class

* fix clearMessage test
add MessageGridItem class

* disabled copyMessageFromTopicProfile
added link to issue

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 kafka-ui-e2e-checks/screenshots/main.png      | Bin 38538 -> 0 bytes
 .../kafka/ui/pages/topic/TopicDetails.java    | 283 +++++++++++-------
 .../provectus/kafka/ui/tests/TopicTests.java  |  79 +++--
 3 files changed, 230 insertions(+), 132 deletions(-)
 delete mode 100644 kafka-ui-e2e-checks/screenshots/main.png

diff --git a/kafka-ui-e2e-checks/screenshots/main.png b/kafka-ui-e2e-checks/screenshots/main.png
deleted file mode 100644
index be6817331461c99a6e8bbe403f7f57deca7320f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38538
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

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index c9469fab735..61a04115fb4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -1,159 +1,230 @@
 package com.provectus.kafka.ui.pages.topic;
 
 import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
 
+import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
 @ExtensionMethod({WaitUtils.class})
 public class TopicDetails extends BasePage {
 
-    protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
-    protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
-    protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
-    protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
-    protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
-    protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
-    protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
-    protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
-    protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
-    protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
-    protected String consumerIdLocator = "//a[@title='%s']";
-    protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
-
-    @Step
-    public TopicDetails waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        Arrays.asList(overviewTab,messagesTab).forEach(element -> element.shouldBe(Condition.visible));
-        return this;
+  protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
+  protected SelenideElement messageAmountCell = $x("//tbody/tr/td[5]");
+  protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
+  protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
+  protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
+  protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
+  protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
+  protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
+  protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
+  protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
+  protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
+  protected ElementsCollection messageGridItems = $$x("//tbody//tr");
+  protected String consumerIdLocator = "//a[@title='%s']";
+  protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
+
+  @Step
+  public TopicDetails waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    dotMenuBtn.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public TopicDetails openDetailsTab(TopicMenu menu) {
+    $(By.linkText(menu.toString())).shouldBe(Condition.visible).click();
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  @Step
+  public TopicDetails openDotMenu() {
+    clickByJavaScript(dotMenuBtn);
+    return this;
+  }
+
+  @Step
+  public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
+    return isAlertVisible(header, message);
+  }
+
+  @Step
+  public TopicDetails clickEditSettingsMenu() {
+    editSettingsMenu.shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickClearMessagesMenu() {
+    clearMessagesBtn.shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public String getCleanUpPolicy() {
+    return cleanUpPolicyField.getText();
+  }
+
+  @Step
+  public String getPartitions() {
+    return partitionsField.getText();
+  }
+
+  @Step
+  public boolean isTopicHeaderVisible(String topicName) {
+    return isVisible($x(String.format(topicHeaderLocator, topicName)));
+  }
+
+  @Step
+  public TopicDetails clickDeleteTopicMenu() {
+    removeTopicBtn.shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickConfirmDeleteBtn() {
+    confirmBtn.shouldBe(Condition.enabled).click();
+    confirmBtn.shouldBe(Condition.disappear);
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickProduceMessageBtn() {
+    clickByJavaScript(produceMessageBtn);
+    return this;
+  }
+
+  @Step
+  public TopicDetails openConsumerGroup(String consumerId) {
+    $x(String.format(consumerIdLocator, consumerId)).click();
+    return this;
+  }
+
+  @Step
+  public boolean isKeyMessageVisible(String keyMessage) {
+    return keyMessage.equals($("td[title]").getText());
+  }
+
+  @Step
+  public boolean isContentMessageVisible(String contentMessage) {
+    return contentMessage.matches(contentMessageTab.getText().trim());
+  }
+
+  @Step
+  public int getMessageCountAmount() {
+    return Integer.parseInt(messageAmountCell.getText().trim());
+  }
+
+  private List<TopicDetails.MessageGridItem> initItems() {
+    List<TopicDetails.MessageGridItem> gridItemList = new ArrayList<>();
+    messageGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new TopicDetails.MessageGridItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public TopicDetails.MessageGridItem getMessage(int offset) {
+    return initItems().stream()
+        .filter(e -> e.getOffset() == offset)
+        .findFirst().orElse(null);
+  }
+
+  @Step
+  public TopicDetails.MessageGridItem getRandomMessage() {
+    return getMessage(initItems().size() - 1);
+  }
+
+  public static class MessageGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    private MessageGridItem(SelenideElement element) {
+      this.element = element;
     }
 
     @Step
-    public TopicDetails openDetailsTab(TopicMenu menu) {
-        $(By.linkText(menu.getValue())).shouldBe(Condition.visible).click();
-        return this;
+    public MessageGridItem clickExpand() {
+      clickByJavaScript(element.$x("./td[1]/span"));
+      return this;
     }
 
-    @Step
-    public TopicDetails openDotMenu() {
-        clickByJavaScript(dotMenuBtn);
-        return this;
+    private SelenideElement getOffsetElm() {
+      return element.$x("./td[2]");
     }
 
     @Step
-    public TopicDetails clickEditSettingsMenu() {
-        editSettingsMenu.shouldBe(Condition.visible).click();
-        return this;
+    public int getOffset() {
+      return Integer.parseInt(getOffsetElm().getText().trim());
     }
 
     @Step
-    public TopicDetails clickClearMessagesMenu() {
-        clearMessagesBtn.shouldBe(Condition.visible).click();
-        return this;
+    public int getPartition() {
+      return Integer.parseInt(element.$x("./td[3]").getText().trim());
     }
 
     @Step
-    public String getCleanUpPolicy(){
-      return cleanUpPolicyField.getText();
+    public String getTimestamp() {
+      return element.$x("./td[4]/div").getText().trim();
     }
 
     @Step
-    public String getPartitions(){
-        return partitionsField.getText();
+    public String getKey() {
+      return element.$x("./td[5]").getText().trim();
     }
 
     @Step
-    public boolean isTopicHeaderVisible(String topicName) {
-        return isVisible($x(String.format(topicHeaderLocator,topicName)));
+    public String getValue() {
+      return element.$x("./td[6]/span/p").getText().trim();
     }
 
     @Step
-    public TopicDetails clickDeleteTopicMenu() {
-        removeTopicBtn.shouldBe(Condition.visible).click();
-        return this;
+    public MessageGridItem openDotMenu() {
+      getOffsetElm().hover();
+      element.$x("./td[7]/div/button[@aria-label='Dropdown Toggle']")
+          .shouldBe(Condition.visible).click();
+      return this;
     }
 
     @Step
-    public TopicDetails clickConfirmDeleteBtn() {
-        confirmBtn.shouldBe(Condition.enabled).click();
-        confirmBtn.shouldBe(Condition.disappear);
-        return this;
+    public MessageGridItem clickCopyToClipBoard() {
+      clickByJavaScript(element.$x("./td[7]//li[text() = 'Copy to clipboard']")
+          .shouldBe(Condition.visible));
+      return this;
     }
 
     @Step
-    public TopicDetails clickProduceMessageBtn() {
-        clickByJavaScript(produceMessageBtn);
-        return this;
+    public MessageGridItem clickSaveAsFile() {
+      clickByJavaScript(element.$x("./td[7]//li[text() = 'Save as a file']")
+          .shouldBe(Condition.visible));
+      return this;
     }
+  }
 
-    @Step
-    public TopicDetails openConsumerGroup(String consumerId) {
-        $x(String.format(consumerIdLocator, consumerId)).click();
-        return this;
-    }
+  public enum TopicMenu {
+    OVERVIEW("Overview"),
+    MESSAGES("Messages"),
+    CONSUMERS("Consumers"),
+    SETTINGS("Settings");
 
-    @Step
-    public boolean isKeyMessageVisible(String keyMessage) {
-        return keyMessage.equals($("td[title]").getText());
-    }
+    private final String value;
 
-    @Step
-    public boolean isContentMessageVisible(String contentMessage) {
-        return contentMessage.matches(contentMessageTab.getText().trim());
-    }
-
-    @Step
-    public String MessageCountAmount() {
-        return $(By.xpath("//table[@class=\"sc-hiSbEG cvnuic\"]/tbody/tr/td[5]")).getText();
+    TopicMenu(String value) {
+      this.value = value;
     }
 
-    private enum DotMenuHeaderItems {
-        EDIT_SETTINGS("Edit settings"),
-        CLEAR_MESSAGES("Clear messages"),
-        REMOVE_TOPIC("Remove topic");
-
-        private final String value;
-
-        DotMenuHeaderItems(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return "DotMenuHeaderItems{" + "value='" + value + '\'' + '}';
-        }
-    }
-
-    public enum TopicMenu {
-        OVERVIEW("Overview"),
-        MESSAGES("Messages"),
-        CONSUMERS("Consumers"),
-        SETTINGS("Settings");
-
-        private final String value;
-
-        TopicMenu(String value) {
-            this.value = value;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        @Override
-        public String toString() {
-            return "TopicMenu{" + "value='" + value + '\'' + '}';
-        }
+    public String toString() {
+      return value;
     }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
index aaa7a6fe8b6..dc7a3b130a8 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.tests;
 
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.DELETE;
@@ -12,6 +13,7 @@
 
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.pages.topic.TopicDetails;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
@@ -98,7 +100,8 @@ public void createTopic() {
         TOPIC_LIST.add(TOPIC_TO_CREATE);
     }
 
-    @Disabled("https://github.com/provectus/kafka-ui/issues/2625")
+    @Disabled()
+    @Issue("https://github.com/provectus/kafka-ui/issues/2625")
     @DisplayName("should update a topic")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
@@ -193,37 +196,37 @@ void produceMessage() {
         softly.assertAll();
     }
 
-    @Issue("Uncomment last assertion after bug https://github.com/provectus/kafka-ui/issues/2778 fix")
+    @Disabled
+    @Issue("https://github.com/provectus/kafka-ui/issues/2778")
     @DisplayName("clear message")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(19)
     @Test
     void clearMessage() {
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady()
-                .openTopic(TOPIC_FOR_MESSAGES.getName());
-        topicDetails
-                .waitUntilScreenReady()
-                .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
-                .clickProduceMessageBtn();
-        produceMessagePanel
-                .waitUntilScreenReady()
-                .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
-                .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
-                .submitProduceMessage();
-        topicDetails
-                .waitUntilScreenReady();
-        String messageAmount = topicDetails.MessageCountAmount();
-        assertThat(messageAmount)
-                .withFailMessage("message amount not equals").isEqualTo(topicDetails.MessageCountAmount());
-        topicDetails
-                .openDotMenu()
-                .clickClearMessagesMenu();
-//        assertThat(Integer.toString(Integer.valueOf(messageAmount)-1))
-//                .withFailMessage("message amount not decrease by one").isEqualTo(topicDetails.MessageCountAmount());
+      naviSideBar
+          .openSideMenu(TOPICS);
+      topicsList
+          .waitUntilScreenReady()
+          .openTopic(TOPIC_FOR_MESSAGES.getName());
+      topicDetails
+          .waitUntilScreenReady()
+          .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
+          .clickProduceMessageBtn();
+      int messageAmount = topicDetails.getMessageCountAmount();
+      produceMessagePanel
+          .waitUntilScreenReady()
+          .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
+          .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
+          .submitProduceMessage();
+      topicDetails
+          .waitUntilScreenReady();
+      Assertions.assertEquals(messageAmount + 1, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
+      topicDetails
+          .openDotMenu()
+          .clickClearMessagesMenu()
+          .waitUntilScreenReady();
+      Assertions.assertEquals(0, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
     }
 
     @DisplayName("Redirect to consumer from topic profile")
@@ -295,6 +298,30 @@ void checkCustomParametersWithinCreateNewTopic() {
         .as("isValidationMessageCustomParameterValueVisible()").isTrue();
   }
 
+  @Disabled
+  @Issue("https://github.com/provectus/kafka-ui/issues/2819")
+  @DisplayName("Message copy from topic profile")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(21)
+  @Test
+  void copyMessageFromTopicProfile() {
+    String topicName = "_schemas";
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(topicName);
+    topicDetails
+        .waitUntilScreenReady()
+        .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
+        .getRandomMessage()
+        .openDotMenu()
+        .clickCopyToClipBoard();
+    Assertions.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Copied successfully!"),
+        "isAlertWithMessageVisible()");
+  }
+
     @AfterAll
     public void afterAll() {
         TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));

From 8b7c8e3216df2e0686fd7a6b3daa5263fb9cbb11 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Thu, 10 Nov 2022 18:50:17 +0300
Subject: [PATCH 282/734] Remove messages v2 (#2917)

---
 .../Topics/Topic/Messages/Messages.styled.ts  |   6 +
 .../Topics/Topic/Messages/Messages.tsx        |   2 +-
 .../utils => Messages}/getDefaultSerdeName.ts |   0
 .../Advanced Filter/AdvancedFilter.tsx        |  53 -----
 .../Topic/MessagesV2/Advanced Filter/Form.tsx | 118 -----------
 .../FiltersBar/FiltersBar.styled.ts           |  75 -------
 .../Topic/MessagesV2/FiltersBar/Form.tsx      | 193 ------------------
 .../Topic/MessagesV2/FiltersBar/Meta.tsx      |  46 -----
 .../Topic/MessagesV2/FiltersBar/utils.ts      | 112 ----------
 .../Topic/MessagesV2/Messages.styled.ts       |  64 ------
 .../Topics/Topic/MessagesV2/Messages.tsx      | 112 ----------
 .../Topic/MessagesV2/MessagesContainer.tsx    |  62 ------
 .../MessagesV2/MessagesTable/ActionsCell.tsx  |  25 ---
 .../MessageContent/MessageContent.styled.ts   |  55 -----
 .../MessageContent/MessageContent.tsx         | 106 ----------
 .../MessagesTable/MessagesTable.tsx           |  41 ----
 .../Topics/Topic/MessagesV2/StatusBar.tsx     |  39 ----
 .../Topic/MessagesV2/utils/consumingModes.ts  |  50 -----
 .../MessagesV2/utils/handleNextPageClick.ts   |  65 ------
 .../src/components/Topics/Topic/Topic.tsx     |   3 -
 .../src/lib/hooks/api/topicMessages.tsx       |   2 +-
 21 files changed, 8 insertions(+), 1221 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.styled.ts
 rename kafka-ui-react-app/src/components/Topics/Topic/{MessagesV2/utils => Messages}/getDefaultSerdeName.ts (100%)
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/AdvancedFilter.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/Form.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Meta.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/utils.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesContainer.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/ActionsCell.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessagesTable.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/StatusBar.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/consumingModes.ts
 delete mode 100644 kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/handleNextPageClick.ts

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.styled.ts
new file mode 100644
index 00000000000..4f457464147
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.styled.ts
@@ -0,0 +1,6 @@
+import styled from 'styled-components';
+
+export const StopLoading = styled.div`
+  color: ${({ theme }) => theme.pageLoader.borderColor};
+  cursor: pointer;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
index 0e1642c5acc..b71e4eb8fa2 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
@@ -5,7 +5,7 @@ import { useSearchParams } from 'react-router-dom';
 import { useSerdes } from 'lib/hooks/api/topicMessages';
 import useAppParams from 'lib/hooks/useAppParams';
 import { RouteParamsClusterTopic } from 'lib/paths';
-import { getDefaultSerdeName } from 'components/Topics/Topic/MessagesV2/utils/getDefaultSerdeName';
+import { getDefaultSerdeName } from 'components/Topics/Topic/Messages/getDefaultSerdeName';
 
 import MessagesTable from './MessagesTable';
 import FiltersContainer from './Filters/FiltersContainer';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/getDefaultSerdeName.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/getDefaultSerdeName.ts
similarity index 100%
rename from kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/getDefaultSerdeName.ts
rename to kafka-ui-react-app/src/components/Topics/Topic/Messages/getDefaultSerdeName.ts
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/AdvancedFilter.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/AdvancedFilter.tsx
deleted file mode 100644
index a3155ca73f4..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/AdvancedFilter.tsx	
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import { useMessageFiltersStore } from 'lib/hooks/useMessageFiltersStore';
-import * as StyledTable from 'components/common/NewTable/Table.styled';
-import Heading from 'components/common/heading/Heading.styled';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
-
-import Form from './Form';
-
-const AdvancedFilter = () => {
-  const { save, apply, filters, remove } = useMessageFiltersStore();
-  return (
-    <div>
-      <Heading level={4}>Add new filter</Heading>
-      <Form save={save} apply={apply} />
-      {filters.length > 0 && (
-        <>
-          <Heading level={4}>Saved Filters</Heading>
-          <StyledTable.Table>
-            <thead>
-              <tr>
-                <StyledTable.Th>Name</StyledTable.Th>
-                <StyledTable.Th>Value</StyledTable.Th>
-                <StyledTable.Th> </StyledTable.Th>
-              </tr>
-            </thead>
-            <tbody>
-              {filters.map((filter) => (
-                <tr key={filter.name}>
-                  <td>{filter.name}</td>
-                  <td>
-                    <pre>{filter.value}</pre>
-                  </td>
-                  <td>
-                    <Dropdown>
-                      <DropdownItem onClick={() => apply(filter)}>
-                        Apply Filter
-                      </DropdownItem>
-                      <DropdownItem onClick={() => remove(filter.name)}>
-                        Delete filter
-                      </DropdownItem>
-                    </Dropdown>
-                  </td>
-                </tr>
-              ))}
-            </tbody>
-          </StyledTable.Table>
-        </>
-      )}
-    </div>
-  );
-};
-
-export default AdvancedFilter;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/Form.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/Form.tsx
deleted file mode 100644
index 71f11911f16..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Advanced Filter/Form.tsx	
+++ /dev/null
@@ -1,118 +0,0 @@
-import React from 'react';
-import * as S from 'components/Topics/Topic/Messages/Filters/Filters.styled';
-import { InputLabel } from 'components/common/Input/InputLabel.styled';
-import Input from 'components/common/Input/Input';
-import { FormProvider, Controller, useForm } from 'react-hook-form';
-import { ErrorMessage } from '@hookform/error-message';
-import { Button } from 'components/common/Button/Button';
-import { FormError } from 'components/common/Input/Input.styled';
-import Editor from 'components/common/Editor/Editor';
-import { yupResolver } from '@hookform/resolvers/yup';
-import yup from 'lib/yupExtended';
-import { AdvancedFilter } from 'lib/hooks/useMessageFiltersStore';
-
-const validationSchema = yup.object().shape({
-  value: yup.string().required(),
-  name: yup.string().required(),
-});
-
-export interface FormProps {
-  name?: string;
-  value?: string;
-  save(filter: AdvancedFilter): void;
-  apply(filter: AdvancedFilter): void;
-}
-
-const Form: React.FC<FormProps> = ({ name, value, save, apply }) => {
-  const methods = useForm<AdvancedFilter>({
-    mode: 'onChange',
-    resolver: yupResolver(validationSchema),
-  });
-  const {
-    handleSubmit,
-    control,
-    formState: { isDirty, isSubmitting, isValid, errors },
-    reset,
-    getValues,
-  } = methods;
-
-  const onSubmit = React.useCallback(
-    (values: AdvancedFilter) => {
-      apply(values);
-      reset({ name: '', value: '' });
-    },
-    [reset, save]
-  );
-
-  const onSave = React.useCallback(() => {
-    save(getValues());
-    handleSubmit(onSubmit);
-  }, []);
-
-  return (
-    <FormProvider {...methods}>
-      <form onSubmit={handleSubmit(onSubmit)} aria-label="Filters submit Form">
-        <div>
-          <InputLabel>Filter code</InputLabel>
-          <Controller
-            control={control}
-            name="value"
-            defaultValue={value}
-            render={({ field }) => (
-              <Editor
-                value={field.value}
-                minLines={5}
-                maxLines={28}
-                onChange={field.onChange}
-                setOptions={{
-                  showLineNumbers: false,
-                }}
-              />
-            )}
-          />
-        </div>
-        <div>
-          <FormError>
-            <ErrorMessage errors={errors} name="value" />
-          </FormError>
-        </div>
-        <div>
-          <InputLabel>Display name</InputLabel>
-          <Input
-            inputSize="M"
-            placeholder="Enter Name"
-            autoComplete="off"
-            name="name"
-            defaultValue={name}
-          />
-        </div>
-        <div>
-          <FormError>
-            <ErrorMessage errors={errors} name="name" />
-          </FormError>
-        </div>
-        <S.FilterButtonWrapper>
-          <Button
-            buttonSize="M"
-            buttonType="secondary"
-            type="submit"
-            disabled={!isValid || isSubmitting || !isDirty}
-            onClick={onSave}
-          >
-            Save & Apply
-          </Button>
-          <Button
-            buttonSize="M"
-            buttonType="primary"
-            type="submit"
-            disabled={isSubmitting || !isDirty}
-          >
-            Apply Filter
-          </Button>
-        </S.FilterButtonWrapper>
-      </form>
-    </FormProvider>
-  );
-};
-
-export default Form;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled.ts
deleted file mode 100644
index bd36e913e6c..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import styled from 'styled-components';
-import DatePicker from 'react-datepicker';
-
-export const Meta = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  padding: 6px 16px;
-  border-bottom: 1px solid ${({ theme }) => theme.layout.stuffBorderColor};
-`;
-
-export const MetaRow = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 20px;
-`;
-
-export const Metric = styled.div`
-  color: ${({ theme }) => theme.metrics.filters.color.normal};
-  font-size: 12px;
-  display: flex;
-`;
-
-export const MetricIcon = styled.div`
-  color: ${({ theme }) => theme.metrics.filters.color.icon};
-  padding-right: 6px;
-  height: 12px;
-`;
-
-export const MetaMessage = styled.div.attrs({
-  role: 'contentLoader',
-})`
-  color: ${({ theme }) => theme.heading.h3.color};
-  font-size: 12px;
-  display: flex;
-  gap: 8px;
-`;
-
-export const StopLoading = styled.div`
-  color: ${({ theme }) => theme.pageLoader.borderColor};
-  cursor: pointer;
-`;
-
-export const FilterRow = styled.div`
-  margin: 8px 0 8px;
-`;
-export const FilterFooter = styled.div`
-  display: flex;
-  gap: 8px;
-  justify-content: end;
-  margin: 16px 0;
-`;
-
-export const DatePickerInput = styled(DatePicker)`
-  height: 32px;
-  border: 1px ${(props) => props.theme.select.borderColor.normal} solid;
-  border-radius: 4px;
-  font-size: 14px;
-  width: 100%;
-  padding-left: 12px;
-  color: ${(props) => props.theme.select.color.normal};
-
-  background-image: url('data:image/svg+xml,%3Csvg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M1 1L5 5L9 1" stroke="%23454F54"/%3E%3C/svg%3E%0A') !important;
-  background-repeat: no-repeat !important;
-  background-position-x: 96% !important;
-  background-position-y: 55% !important;
-  appearance: none !important;
-
-  &:hover {
-    cursor: pointer;
-  }
-  &:focus {
-    outline: none;
-  }
-`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx
deleted file mode 100644
index 86e6391bc61..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Form.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import React from 'react';
-import { useForm } from 'react-hook-form';
-import { useSearchParams } from 'react-router-dom';
-import Input from 'components/common/Input/Input';
-import { ConsumingMode, useSerdes } from 'lib/hooks/api/topicMessages';
-import Select from 'components/common/Select/Select';
-import { InputLabel } from 'components/common/Input/InputLabel.styled';
-import { Option } from 'react-multi-select-component';
-import { Button } from 'components/common/Button/Button';
-import { Partition, SerdeUsage } from 'generated-sources';
-import { getModeOptions } from 'components/Topics/Topic/MessagesV2/utils/consumingModes';
-import { getSerdeOptions } from 'components/Topics/Topic/SendMessage/utils';
-import useAppParams from 'lib/hooks/useAppParams';
-import { RouteParamsClusterTopic } from 'lib/paths';
-
-import * as S from './FiltersBar.styled';
-import { setSeekTo } from './utils';
-
-type FormValues = {
-  mode: ConsumingMode;
-  offset: string;
-  time: Date;
-  partitions: Option[];
-  keySerde: string;
-  valueSerde: string;
-};
-
-const Form: React.FC<{ isFetching: boolean; partitions: Partition[] }> = ({
-  isFetching,
-  partitions,
-}) => {
-  const [searchParams, setSearchParams] = useSearchParams();
-  const routerProps = useAppParams<RouteParamsClusterTopic>();
-  const { data: serdes = {} } = useSerdes({
-    ...routerProps,
-    use: SerdeUsage.DESERIALIZE,
-  });
-
-  const {
-    handleSubmit,
-    setValue,
-    watch,
-    formState: { isDirty },
-    reset,
-  } = useForm<FormValues>({
-    defaultValues: {
-      mode: searchParams.get('m') || 'newest',
-      offset: searchParams.get('o') || '0',
-      time: searchParams.get('t')
-        ? new Date(Number(searchParams.get('t')))
-        : Date.now(),
-      keySerde: searchParams.get('keySerde') as string,
-      valueSerde: searchParams.get('valueSerde') as string,
-    } as FormValues,
-  });
-  const mode = watch('mode');
-  const offset = watch('offset');
-  const time = watch('time');
-  const keySerde = watch('keySerde');
-  const valueSerde = watch('valueSerde');
-
-  const onSubmit = (values: FormValues) => {
-    searchParams.set('m', values.mode);
-    if (values.keySerde) {
-      searchParams.set('keySerde', values.keySerde);
-    }
-    if (values.valueSerde) {
-      searchParams.set('valueSerde', values.valueSerde);
-    }
-    searchParams.delete('o');
-    searchParams.delete('t');
-    searchParams.delete('a');
-    searchParams.delete('page');
-    if (['fromOffset', 'toOffset'].includes(mode)) {
-      searchParams.set('o', values.offset);
-    } else if (['sinceTime', 'untilTime'].includes(mode)) {
-      searchParams.set('t', `${values.time.getTime()}`);
-    }
-
-    setSeekTo(searchParams, partitions);
-    setSearchParams(searchParams);
-    reset(values);
-  };
-
-  const handleTimestampChange = (value: Date | null) => {
-    if (value) {
-      setValue('time', value, { shouldDirty: true });
-    }
-  };
-  const handleOffsetChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setValue('offset', e.target.value, { shouldDirty: true });
-  };
-  const handleSerdeChange =
-    (type: 'keySerde' | 'valueSerde') => (option: string | number) => {
-      setValue(type, String(option), { shouldDirty: true });
-    };
-  const handleRefresh: React.MouseEventHandler<HTMLButtonElement> = (e) => {
-    e.stopPropagation();
-    e.preventDefault();
-    searchParams.set('a', `${Number(searchParams.get('a') || 0) + 1}`);
-    setSearchParams(searchParams);
-  };
-
-  return (
-    <form onSubmit={handleSubmit(onSubmit)}>
-      <S.FilterRow>
-        <InputLabel>Mode</InputLabel>
-        <Select
-          selectSize="M"
-          minWidth="100%"
-          value={mode}
-          options={getModeOptions()}
-          isLive={mode === 'live' && isFetching}
-          onChange={(option: string | number) =>
-            setValue('mode', option as ConsumingMode, { shouldDirty: true })
-          }
-        />
-      </S.FilterRow>
-      {['sinceTime', 'untilTime'].includes(mode) && (
-        <S.FilterRow>
-          <InputLabel>Time</InputLabel>
-          <S.DatePickerInput
-            selected={time}
-            onChange={handleTimestampChange}
-            showTimeInput
-            timeInputLabel="Time:"
-            dateFormat="MMMM d, yyyy HH:mm"
-            placeholderText="Select timestamp"
-          />
-        </S.FilterRow>
-      )}
-      {['fromOffset', 'toOffset'].includes(mode) && (
-        <S.FilterRow>
-          <InputLabel>Offset</InputLabel>
-          <Input
-            type="text"
-            inputSize="M"
-            value={offset}
-            placeholder="Offset"
-            onChange={handleOffsetChange}
-          />
-        </S.FilterRow>
-      )}
-      <S.FilterRow>
-        <InputLabel>Key Serde</InputLabel>
-        <Select
-          id="selectKeySerdeOptions"
-          aria-labelledby="selectKeySerdeOptions"
-          onChange={handleSerdeChange('keySerde')}
-          options={getSerdeOptions(serdes.key || [])}
-          value={keySerde}
-          selectSize="M"
-          minWidth="100%"
-        />
-      </S.FilterRow>
-      <S.FilterRow>
-        <InputLabel>Content Serde</InputLabel>
-        <Select
-          id="selectValueSerdeOptions"
-          aria-labelledby="selectValueSerdeOptions"
-          onChange={handleSerdeChange('valueSerde')}
-          options={getSerdeOptions(serdes.value || [])}
-          value={valueSerde}
-          selectSize="M"
-          minWidth="100%"
-        />
-      </S.FilterRow>
-      <S.FilterFooter>
-        <Button
-          buttonType="secondary"
-          disabled={!isDirty}
-          buttonSize="S"
-          onClick={() => reset()}
-        >
-          Clear All
-        </Button>
-        <Button
-          buttonType="secondary"
-          buttonSize="S"
-          disabled={isDirty || isFetching}
-          onClick={handleRefresh}
-        >
-          Refresh
-        </Button>
-        <Button buttonType="primary" disabled={!isDirty} buttonSize="S">
-          Apply Mode
-        </Button>
-      </S.FilterFooter>
-    </form>
-  );
-};
-
-export default Form;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Meta.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Meta.tsx
deleted file mode 100644
index 9057b2514bc..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/Meta.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import ArrowDownIcon from 'components/common/Icons/ArrowDownIcon';
-import ClockIcon from 'components/common/Icons/ClockIcon';
-import FileIcon from 'components/common/Icons/FileIcon';
-import { TopicMessageConsuming } from 'generated-sources';
-import { formatMilliseconds } from 'lib/dateTimeHelpers';
-import React from 'react';
-
-import * as S from './FiltersBar.styled';
-
-interface MetaProps {
-  meta?: TopicMessageConsuming;
-  phase?: string;
-  isFetching: boolean;
-}
-
-const Meta: React.FC<MetaProps> = ({ meta = {} }) => {
-  const { bytesConsumed, messagesConsumed, elapsedMs } = meta;
-
-  return (
-    <S.Meta>
-      <S.MetaRow>
-        <S.Metric title="Messages Consumed">
-          <S.MetricIcon>
-            <FileIcon />
-          </S.MetricIcon>
-          <span>{messagesConsumed || 0} msg.</span>
-        </S.Metric>
-        <S.Metric title="Bytes Consumed">
-          <S.MetricIcon>
-            <ArrowDownIcon />
-          </S.MetricIcon>
-          <BytesFormatted value={bytesConsumed || 0} />
-        </S.Metric>
-        <S.Metric title="Elapsed Time">
-          <S.MetricIcon>
-            <ClockIcon />
-          </S.MetricIcon>
-          <span>{formatMilliseconds(elapsedMs)}</span>
-        </S.Metric>
-      </S.MetaRow>
-    </S.Meta>
-  );
-};
-
-export default Meta;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/utils.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/utils.ts
deleted file mode 100644
index 99528b270d3..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/FiltersBar/utils.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { Partition } from 'generated-sources';
-import { ConsumingMode } from 'lib/hooks/api/topicMessages';
-import { Option } from 'react-multi-select-component';
-
-export const filterOptions = (options: Option[], filter: string) => {
-  if (!filter) {
-    return options;
-  }
-  return options.filter(({ value }) => value && value.toString() === filter);
-};
-
-export const convertPartitionsToOptions = (ids: Array<string>): Option[] =>
-  ids.map((id) => ({
-    label: `Partition #${id}`,
-    value: `${id}`,
-  }));
-
-export const getSelectedPartitions = (
-  allIds: string[],
-  query: string | null
-) => {
-  let selectedIds: string[] = [];
-  switch (query) {
-    case null: // Empty array of partitions in searchParams - means all
-    case 'all':
-      selectedIds = allIds;
-      break;
-    case 'none':
-      selectedIds = [];
-      break;
-    default:
-      selectedIds = query.split('.');
-      break;
-  }
-  return convertPartitionsToOptions(selectedIds);
-};
-
-type PartionOffsetKey = 'offsetMax' | 'offsetMin';
-
-const generateSeekTo = (
-  partitions: Partition[],
-  type: 'property' | 'value',
-  value: PartionOffsetKey | string
-) => {
-  // we iterating over existing partitions to avoid sending wrong partition ids to the backend
-  const seekTo = partitions.map((partition) => {
-    const { partition: id } = partition;
-    switch (type) {
-      case 'property':
-        return `${id}-${partition[value as PartionOffsetKey]}`;
-      case 'value':
-        return `${id}-${value}`;
-      default:
-        return null;
-    }
-  });
-
-  return seekTo.join('.');
-};
-
-export const generateSeekToForSelectedPartitions = (
-  mode: ConsumingMode,
-  partitions: Partition[],
-  offset: string,
-  time: string
-) => {
-  switch (mode) {
-    case 'live':
-    case 'newest':
-      return generateSeekTo(partitions, 'property', 'offsetMax');
-    case 'fromOffset':
-    case 'toOffset':
-      return generateSeekTo(partitions, 'value', offset);
-    case 'sinceTime':
-    case 'untilTime':
-      return generateSeekTo(partitions, 'value', time);
-    default:
-      // case 'oldest';
-      return generateSeekTo(partitions, 'value', '0');
-  }
-};
-
-export const setSeekTo = (
-  searchParams: URLSearchParams,
-  partitions: Partition[]
-) => {
-  const currentSeekTo = searchParams.get('seekTo');
-  const mode = searchParams.get('m') as ConsumingMode;
-  const offset = (searchParams.get('o') as string) || '0';
-  const time =
-    (searchParams.get('t') as string) || new Date().getTime().toString();
-
-  let selectedPartitions: Partition[] = [];
-  // if not `seekTo` property in search params, we set it to all partition
-  if (!currentSeekTo) {
-    selectedPartitions = partitions;
-  } else {
-    const partitionIds = currentSeekTo
-      .split('.')
-      .map((prop) => prop.split('-')[0]);
-
-    selectedPartitions = partitions.filter(({ partition }) =>
-      partitionIds.includes(String(partition))
-    );
-  }
-  searchParams.set(
-    'seekTo',
-    generateSeekToForSelectedPartitions(mode, selectedPartitions, offset, time)
-  );
-
-  return searchParams;
-};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
deleted file mode 100644
index c360f706d37..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.styled.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import styled, { css } from 'styled-components';
-
-export const Wrapper = styled.div(
-  ({ theme }) => css`
-    display: grid;
-    grid-template-columns: 300px 1fr;
-    justify-items: center;
-    min-height: calc(
-      100vh - ${theme.layout.navBarHeight} - ${theme.pageHeading.height} -
-        ${theme.primaryTab.height}
-    );
-  `
-);
-
-export const Sidebar = styled.div(
-  ({ theme }) => css`
-    width: ${theme.layout.filtersSidebarWidth};
-    position: sticky;
-    top: ${theme.layout.navBarHeight};
-    align-self: start;
-  `
-);
-
-export const SidebarContent = styled.div`
-  padding: 8px 16px 16px;
-`;
-
-export const TableWrapper = styled.div(
-  ({ theme }) => css`
-    width: calc(
-      100vw - ${theme.layout.navBarWidth} - ${theme.layout.filtersSidebarWidth}
-    );
-    border-left: 1px solid ${theme.layout.stuffBorderColor};
-  `
-);
-
-export const Pagination = styled.div`
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 8px;
-  position: fixed;
-  bottom: 0;
-  padding: 16px;
-  width: 300px;
-`;
-
-export const StatusBarWrapper = styled.div(
-  ({ theme }) => css`
-    padding: 4px 8px;
-    position: sticky;
-    top: ${theme.layout.navBarHeight};
-    background-color: ${theme.layout.backgroundColor};
-    border-bottom: 1px solid ${theme.layout.stuffBorderColor};
-    white-space: nowrap;
-    display: flex;
-    justify-content: space-between;
-    z-index: 10;
-  `
-);
-
-export const StatusTags = styled.div`
-  display: flex;
-  gap: 4px;
-`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx
deleted file mode 100644
index 333ab4a243c..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/Messages.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import React from 'react';
-import { ConsumingMode, useTopicMessages } from 'lib/hooks/api/topicMessages';
-import useAppParams from 'lib/hooks/useAppParams';
-import { RouteParamsClusterTopic } from 'lib/paths';
-import { useNavigate, useSearchParams } from 'react-router-dom';
-import { useTopicDetails } from 'lib/hooks/api/topics';
-import { MESSAGES_PER_PAGE } from 'lib/constants';
-import Search from 'components/common/Search/Search';
-import { Button } from 'components/common/Button/Button';
-import PlusIcon from 'components/common/Icons/PlusIcon';
-import SlidingSidebar from 'components/common/SlidingSidebar';
-import useBoolean from 'lib/hooks/useBoolean';
-
-import MessagesTable from './MessagesTable/MessagesTable';
-import * as S from './Messages.styled';
-import Meta from './FiltersBar/Meta';
-import Form from './FiltersBar/Form';
-import handleNextPageClick from './utils/handleNextPageClick';
-import StatusBar from './StatusBar';
-import AdvancedFilter from './Advanced Filter/AdvancedFilter';
-
-const Messages = () => {
-  const routerProps = useAppParams<RouteParamsClusterTopic>();
-  const [searchParams, setSearchParams] = useSearchParams();
-  const navigate = useNavigate();
-  const {
-    value: isAdvancedFiltersSidebarVisible,
-    setFalse: closeAdvancedFiltersSidebar,
-    setTrue: openAdvancedFiltersSidebar,
-  } = useBoolean();
-  const { messages, meta, phase, isFetching } = useTopicMessages({
-    ...routerProps,
-    searchParams,
-  });
-  const mode = searchParams.get('m') as ConsumingMode;
-  const isTailing = mode === 'live' && isFetching;
-  const { data: topic = { partitions: [] } } = useTopicDetails(routerProps);
-
-  const partitions = topic.partitions || [];
-
-  // Pagination is disabled in live mode, also we don't want to show the button
-  // if we are fetching the messages or if we are at the end of the topic
-  const isPaginationDisabled =
-    isTailing ||
-    ['newest', 'oldest'].includes(mode) || // TODO: remove after BE is fixed
-    isFetching ||
-    !searchParams.get('seekTo');
-
-  const isNextPageButtonDisabled =
-    isPaginationDisabled ||
-    messages.length < Number(searchParams.get('perPage') || MESSAGES_PER_PAGE);
-  const isPrevPageButtonDisabled =
-    isPaginationDisabled || !searchParams.get('page');
-
-  const handleNextPage = () =>
-    handleNextPageClick(messages, searchParams, setSearchParams);
-
-  return (
-    <>
-      <S.Wrapper>
-        <S.Sidebar>
-          <Meta meta={meta} phase={phase} isFetching={isFetching} />
-          <S.SidebarContent>
-            <Search placeholder="Search" />
-            <Form isFetching={isFetching} partitions={partitions} />
-          </S.SidebarContent>
-          <S.Pagination>
-            <Button
-              buttonType="secondary"
-              buttonSize="L"
-              disabled={isPrevPageButtonDisabled}
-              onClick={() => navigate(-1)}
-            >
-              ← Back
-            </Button>
-            <Button
-              buttonType="secondary"
-              buttonSize="L"
-              disabled={isNextPageButtonDisabled}
-              onClick={handleNextPage}
-            >
-              Next →
-            </Button>
-          </S.Pagination>
-        </S.Sidebar>
-        <S.TableWrapper>
-          <S.StatusBarWrapper>
-            <StatusBar />
-            <Button
-              buttonType="primary"
-              buttonSize="S"
-              onClick={openAdvancedFiltersSidebar}
-            >
-              <PlusIcon />
-              Advanced Filter
-            </Button>
-          </S.StatusBarWrapper>
-          <MessagesTable messages={messages} isLive={isTailing} />
-        </S.TableWrapper>
-      </S.Wrapper>
-      <SlidingSidebar
-        title="Advanced filtering"
-        open={isAdvancedFiltersSidebarVisible}
-        onClose={closeAdvancedFiltersSidebar}
-      >
-        <AdvancedFilter />
-      </SlidingSidebar>
-    </>
-  );
-};
-
-export default Messages;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesContainer.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesContainer.tsx
deleted file mode 100644
index cc763a953e3..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesContainer.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { Suspense } from 'react';
-import { ConsumingMode, useSerdes } from 'lib/hooks/api/topicMessages';
-import useAppParams from 'lib/hooks/useAppParams';
-import { RouteParamsClusterTopic } from 'lib/paths';
-import { useSearchParams } from 'react-router-dom';
-import { useTopicDetails } from 'lib/hooks/api/topics';
-import { MESSAGES_PER_PAGE } from 'lib/constants';
-import { SerdeUsage } from 'generated-sources';
-
-import { setSeekTo } from './FiltersBar/utils';
-import { getDefaultSerdeName } from './utils/getDefaultSerdeName';
-import Messages from './Messages';
-
-const MessagesContainer = () => {
-  const routerProps = useAppParams<RouteParamsClusterTopic>();
-  const [searchParams, setSearchParams] = useSearchParams();
-  const { data: serdes = {} } = useSerdes({
-    ...routerProps,
-    use: SerdeUsage.DESERIALIZE,
-  });
-  const mode = searchParams.get('m') as ConsumingMode;
-  const { data: topic = { partitions: [] } } = useTopicDetails(routerProps);
-  const partitions = topic.partitions || [];
-
-  /**
-   * Search params:
-   * - `q` - search query
-   * - `m` - way the consumer is going to consume the messages..
-   * - `o` - offset
-   * - `t` - timestamp
-   * - `perPage` - number of messages per page
-   * - `seekTo` - offset or timestamp to seek to.
-   *    Format: `0-101.1-987` - [partition 0, offset 101], [partition 1, offset 987]
-   * - `page` - page number
-   */
-  React.useEffect(() => {
-    if (!mode) {
-      searchParams.set('m', 'newest');
-    }
-    if (!searchParams.get('perPage')) {
-      searchParams.set('perPage', MESSAGES_PER_PAGE);
-    }
-    if (!searchParams.get('seekTo')) {
-      setSeekTo(searchParams, partitions);
-    }
-    if (!searchParams.get('keySerde')) {
-      searchParams.set('keySerde', getDefaultSerdeName(serdes.key || []));
-    }
-    if (!searchParams.get('valueSerde')) {
-      searchParams.set('valueSerde', getDefaultSerdeName(serdes.value || []));
-    }
-    setSearchParams(searchParams);
-  }, [topic, serdes]);
-
-  return (
-    <Suspense>
-      <Messages />
-    </Suspense>
-  );
-};
-
-export default MessagesContainer;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/ActionsCell.tsx
deleted file mode 100644
index 3769cdf95f6..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/ActionsCell.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import { TopicMessage } from 'generated-sources';
-import { CellContext } from '@tanstack/react-table';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
-import useDataSaver from 'lib/hooks/useDataSaver';
-
-const ActionsCell: React.FC<CellContext<TopicMessage, unknown>> = ({ row }) => {
-  const { content } = row.original;
-
-  const { copyToClipboard, saveFile } = useDataSaver(
-    'topic-message',
-    content || ''
-  );
-
-  return (
-    <Dropdown>
-      <DropdownItem onClick={copyToClipboard}>
-        Copy content to clipboard
-      </DropdownItem>
-      <DropdownItem onClick={saveFile}>Save content as a file</DropdownItem>
-    </Dropdown>
-  );
-};
-
-export default ActionsCell;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.styled.ts
deleted file mode 100644
index 9ca2bfbf4f8..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.styled.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import styled, { css } from 'styled-components';
-import * as SEditorViewer from 'components/common/EditorViewer/EditorViewer.styled';
-
-export const Section = styled.div`
-  display: grid;
-  grid-template-columns: 1fr 400px;
-  align-items: stretch;
-`;
-
-export const ContentBox = styled.div`
-  background-color: white;
-  border-right: 1px solid ${({ theme }) => theme.layout.stuffBorderColor};
-  display: flex;
-  flex-direction: column;
-  padding-right: 16px;
-  & nav {
-    padding-bottom: 16px;
-  }
-
-  ${SEditorViewer.Wrapper} {
-    flex-grow: 1;
-  }
-`;
-
-export const MetadataWrapper = styled.div`
-  padding-left: 16px;
-`;
-
-export const Tab = styled.button<{ $active?: boolean }>(
-  ({ theme, $active }) => css`
-    background-color: ${theme.secondaryTab.backgroundColor[
-      $active ? 'active' : 'normal'
-    ]};
-    color: ${theme.secondaryTab.color[$active ? 'active' : 'normal']};
-    padding: 6px 16px;
-    height: 32px;
-    border: 1px solid ${theme.layout.stuffBorderColor};
-    cursor: pointer;
-    &:hover {
-      background-color: ${theme.secondaryTab.backgroundColor.hover};
-      color: ${theme.secondaryTab.color.hover};
-    }
-    &:first-child {
-      border-radius: 4px 0 0 4px;
-    }
-    &:last-child {
-      border-radius: 0 4px 4px 0;
-    }
-    &:not(:last-child) {
-      border-right: 0px;
-    }
-  `
-);
-
-export const Tabs = styled.nav``;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.tsx
deleted file mode 100644
index e0eb83a3726..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessageContent/MessageContent.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { SchemaType, TopicMessage } from 'generated-sources';
-import React from 'react';
-import EditorViewer from 'components/common/EditorViewer/EditorViewer';
-import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { formatTimestamp } from 'lib/dateTimeHelpers';
-import { Row } from '@tanstack/react-table';
-import {
-  Label,
-  List,
-  SubText,
-} from 'components/common/PropertiesList/PropertiesList.styled';
-
-import * as S from './MessageContent.styled';
-
-type Tab = 'key' | 'content' | 'headers';
-
-const MessageContent: React.FC<{ row: Row<TopicMessage> }> = ({ row }) => {
-  const {
-    content,
-    valueFormat,
-    key,
-    keyFormat,
-    headers,
-    timestamp,
-    timestampType,
-  } = row.original;
-
-  const [activeTab, setActiveTab] = React.useState<Tab>('content');
-  const activeTabContent = () => {
-    switch (activeTab) {
-      case 'content':
-        return content;
-      case 'key':
-        return key;
-      default:
-        return JSON.stringify(headers || {});
-    }
-  };
-
-  const encoder = new TextEncoder();
-  const keySize = encoder.encode(key).length;
-  const contentSize = encoder.encode(content).length;
-  const contentType =
-    content && content.trim().startsWith('{')
-      ? SchemaType.JSON
-      : SchemaType.PROTOBUF;
-  return (
-    <S.Section>
-      <S.ContentBox>
-        <S.Tabs>
-          <S.Tab
-            type="button"
-            $active={activeTab === 'key'}
-            onClick={() => setActiveTab('key')}
-          >
-            Key
-          </S.Tab>
-          <S.Tab
-            $active={activeTab === 'content'}
-            type="button"
-            onClick={() => setActiveTab('content')}
-          >
-            Content
-          </S.Tab>
-          <S.Tab
-            $active={activeTab === 'headers'}
-            type="button"
-            onClick={() => setActiveTab('headers')}
-          >
-            Headers
-          </S.Tab>
-        </S.Tabs>
-        <EditorViewer
-          data={activeTabContent() || ''}
-          maxLines={28}
-          schemaType={contentType}
-        />
-      </S.ContentBox>
-      <S.MetadataWrapper>
-        <List>
-          <Label>Timestamp</Label>
-          <span>
-            {formatTimestamp(timestamp)}
-            <SubText>Timestamp type: {timestampType}</SubText>
-          </span>
-          <Label>Content</Label>
-          <span>
-            {valueFormat}
-            <SubText>
-              Size: <BytesFormatted value={contentSize} />
-            </SubText>
-          </span>
-          <Label>Key</Label>
-          <span>
-            {keyFormat}
-            <SubText>
-              Size: <BytesFormatted value={keySize} />
-            </SubText>
-          </span>
-        </List>
-      </S.MetadataWrapper>
-    </S.Section>
-  );
-};
-
-export default MessageContent;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessagesTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessagesTable.tsx
deleted file mode 100644
index 995594d4c7c..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/MessagesTable/MessagesTable.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import { ColumnDef } from '@tanstack/react-table';
-import Table, { TimestampCell } from 'components/common/NewTable';
-import { TopicMessage } from 'generated-sources';
-import TruncatedTextCell from 'components/common/NewTable/TimestampCell copy';
-
-import MessageContent from './MessageContent/MessageContent';
-import ActionsCell from './ActionsCell';
-
-const MessagesTable: React.FC<{
-  messages: TopicMessage[];
-  isLive: boolean;
-}> = ({ messages, isLive }) => {
-  const columns = React.useMemo<ColumnDef<TopicMessage>[]>(
-    () => [
-      { header: 'Offset', accessorKey: 'offset' },
-      { header: 'Partition', accessorKey: 'partition' },
-      { header: 'Timestamp', accessorKey: 'timestamp', cell: TimestampCell },
-      { header: 'Key', accessorKey: 'key', cell: TruncatedTextCell },
-      { header: 'Content', accessorKey: 'content', cell: TruncatedTextCell },
-      { header: '', id: 'action', cell: ActionsCell },
-    ],
-    []
-  );
-
-  return (
-    <Table
-      columns={columns}
-      data={messages}
-      serverSideProcessing
-      pageCount={1}
-      emptyMessage={isLive ? 'Consuming messages...' : 'No messages to display'}
-      getRowCanExpand={() => true}
-      enableRowSelection={false}
-      enableSorting={false}
-      renderSubComponent={MessageContent}
-    />
-  );
-};
-
-export default MessagesTable;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/StatusBar.tsx b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/StatusBar.tsx
deleted file mode 100644
index 7f707cf481c..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/StatusBar.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import { useSearchParams } from 'react-router-dom';
-import { Tag } from 'components/common/Tag/Tag.styled';
-import { ConsumingMode } from 'lib/hooks/api/topicMessages';
-
-import { StatusTags } from './Messages.styled';
-import { getModeTitle } from './utils/consumingModes';
-
-const StatusBar = () => {
-  const [searchParams] = useSearchParams();
-
-  const mode = getModeTitle(
-    (searchParams.get('m') as ConsumingMode) || undefined
-  );
-  const offset = searchParams.get('o');
-  const timestamp = searchParams.get('t');
-  const query = searchParams.get('q');
-
-  return (
-    <StatusTags>
-      <Tag color="green">
-        {offset || timestamp ? (
-          <>
-            {mode}: <b>{offset || timestamp}</b>
-          </>
-        ) : (
-          mode
-        )}
-      </Tag>
-      {query && (
-        <Tag color="blue">
-          Search: <b>{query}</b>
-        </Tag>
-      )}
-    </StatusTags>
-  );
-};
-
-export default StatusBar;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/consumingModes.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/consumingModes.ts
deleted file mode 100644
index 1f3671999a6..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/consumingModes.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { ConsumingMode } from 'lib/hooks/api/topicMessages';
-import { SelectOption } from 'components/common/Select/Select';
-
-interface Mode {
-  key: ConsumingMode;
-  title: string;
-}
-
-interface ModeOption extends SelectOption {
-  value: ConsumingMode;
-}
-
-const config: Mode[] = [
-  {
-    key: 'live',
-    title: 'Live mode',
-  },
-  {
-    key: 'newest',
-    title: 'Newest first',
-  },
-  {
-    key: 'oldest',
-    title: 'Oldest first',
-  },
-  {
-    key: 'fromOffset',
-    title: 'From offset',
-  },
-  {
-    key: 'toOffset',
-    title: 'To offset',
-  },
-  {
-    key: 'sinceTime',
-    title: 'Since time',
-  },
-  {
-    key: 'untilTime',
-    title: 'Until time',
-  },
-];
-
-export const getModeOptions = (): ModeOption[] =>
-  config.map(({ key, title }) => ({ value: key, label: title }));
-
-export const getModeTitle = (mode: ConsumingMode = 'newest') => {
-  const modeConfig = config.find((item) => item.key === mode) as Mode;
-  return modeConfig.title;
-};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/handleNextPageClick.ts b/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/handleNextPageClick.ts
deleted file mode 100644
index 2d92d962bd6..00000000000
--- a/kafka-ui-react-app/src/components/Topics/Topic/MessagesV2/utils/handleNextPageClick.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { TopicMessage } from 'generated-sources';
-import { ConsumingMode } from 'lib/hooks/api/topicMessages';
-
-export default (
-  messages: TopicMessage[],
-  searchParams: URLSearchParams,
-  setSearchParams: (params: URLSearchParams) => void
-) => {
-  const seekTo = searchParams.get('seekTo');
-  const mode = searchParams.get('m') as ConsumingMode;
-  const page = searchParams.get('page');
-  if (!seekTo || !mode) return;
-
-  // parse current seekTo query param to array of [partition, offset] tuples
-  const configTuple = seekTo?.split('.').map((item) => {
-    const [partition, offset] = item.split('-');
-    return { partition: Number(partition), offset: Number(offset) };
-  });
-
-  // Reverse messages array for faster last displayed message search.
-  const reversedMessages = [...messages].reverse();
-
-  if (!configTuple) return;
-
-  const newConfigTuple = configTuple.map(({ partition, offset }) => {
-    const message = reversedMessages.find((m) => partition === m.partition);
-    if (!message) {
-      return { partition, offset };
-    }
-
-    switch (mode) {
-      case 'fromOffset':
-      case 'oldest':
-        // First message in the reversed array is the message with max offset.
-        // Replace offset in seekTo query param with the max offset for
-        // each partition from displayed messages array.
-        return { partition, offset: Math.max(message.offset, offset) };
-      case 'toOffset':
-      case 'newest':
-        // First message in the reversed array is the message with min offset.
-        return { partition, offset: Math.min(message.offset, offset) };
-      case 'sinceTime':
-        // First message in the reversed array is the message with max timestamp.
-        return {
-          partition,
-          offset: Math.max(new Date(message.timestamp).getTime(), offset),
-        };
-      case 'untilTime':
-        // First message in the reversed array is the message with min timestamp.
-        return {
-          partition,
-          offset: Math.min(new Date(message.timestamp).getTime(), offset),
-        };
-      default:
-        return { partition, offset };
-    }
-  });
-  searchParams.set('page', String(Number(page || 0) + 1));
-  searchParams.set(
-    'seekTo',
-    newConfigTuple.map((t) => `${t.partition}-${t.offset}`).join('.')
-  );
-
-  setSearchParams(searchParams);
-};
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index 2f0662ac221..6beca214b27 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -35,8 +35,6 @@ import SlidingSidebar from 'components/common/SlidingSidebar';
 import useBoolean from 'lib/hooks/useBoolean';
 
 import Messages from './Messages/Messages';
-// Messages v2
-import MessagesContainer from './MessagesV2/MessagesContainer';
 import Overview from './Overview/Overview';
 import Settings from './Settings/Settings';
 import TopicConsumerGroups from './ConsumerGroups/TopicConsumerGroups';
@@ -186,7 +184,6 @@ const Topic: React.FC = () => {
             path={clusterTopicMessagesRelativePath}
             element={<Messages />}
           />
-          <Route path="v2" element={<MessagesContainer />} />
           <Route
             path={clusterTopicSettingsRelativePath}
             element={<Settings />}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
index 1357a15ea32..e3ec49ee027 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
@@ -13,9 +13,9 @@ import {
 } from 'generated-sources';
 import { showServerError } from 'lib/errorHandling';
 import toast from 'react-hot-toast';
-import { StopLoading } from 'components/Topics/Topic/MessagesV2/FiltersBar/FiltersBar.styled';
 import { useQuery } from '@tanstack/react-query';
 import { messagesApiClient } from 'lib/api';
+import { StopLoading } from 'components/Topics/Topic/Messages/Messages.styled';
 
 interface UseTopicMessagesProps {
   clusterName: ClusterName;

From 97aa114696b59167837886f554f6062094619fb5 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Fri, 11 Nov 2022 15:43:15 +0400
Subject: [PATCH 283/734] Non-serializable warning (#2921)

* fixed non-serializable values in selectors.spec.ts, navigation warning in Table.spec.tsx,

* added await for userEvent in Table.spec.tsx,

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../common/NewTable/__test__/Table.spec.tsx          |  8 ++++----
 .../topicMessages/__test__/selectors.spec.ts         | 12 ++++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index 2c65ea74b3d..43dd7b8dbf7 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -144,11 +144,11 @@ describe('Table', () => {
       expect(screen.getByRole('link', { name: 'lorem' })).toBeInTheDocument();
     });
 
-    it('link click stops propagation', () => {
+    it('link click stops propagation', async () => {
       const onRowClick = jest.fn();
       renderComponent({ onRowClick });
       const link = screen.getByRole('link', { name: 'lorem' });
-      userEvent.click(link);
+      await userEvent.click(link);
       expect(onRowClick).not.toHaveBeenCalled();
     });
   });
@@ -273,9 +273,9 @@ describe('Table', () => {
       const th = screen.getByRole('columnheader', { name: 'Text' });
       expect(th).toBeInTheDocument();
 
-      let rows = [];
+      let rows = screen.getAllByRole('row');
       // Check initial sort order by text column is descending
-      rows = screen.getAllByRole('row');
+
       expect(rows[4].textContent?.indexOf('dolor')).toBeGreaterThan(-1);
       expect(rows[3].textContent?.indexOf('ipsum')).toBeGreaterThan(-1);
       expect(rows[2].textContent?.indexOf('lorem')).toBeGreaterThan(-1);
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/__test__/selectors.spec.ts
index 3e84e730c88..d324a2d5e97 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/__test__/selectors.spec.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/__test__/selectors.spec.ts
@@ -9,6 +9,10 @@ import {
 
 import { topicMessagePayload, topicMessagesMetaPayload } from './fixtures';
 
+const newTopicMessagePayload = {
+  ...topicMessagePayload,
+  timestamp: topicMessagePayload.timestamp.toString(),
+};
 describe('TopicMessages selectors', () => {
   describe('Initial state', () => {
     it('returns empty message array', () => {
@@ -28,14 +32,18 @@ describe('TopicMessages selectors', () => {
 
   describe('state', () => {
     beforeAll(() => {
-      store.dispatch(addTopicMessage({ message: topicMessagePayload }));
+      store.dispatch(
+        addTopicMessage({
+          message: newTopicMessagePayload,
+        })
+      );
       store.dispatch(updateTopicMessagesPhase('consuming'));
       store.dispatch(updateTopicMessagesMeta(topicMessagesMetaPayload));
     });
 
     it('returns messages', () => {
       expect(selectors.getTopicMessges(store.getState())).toEqual([
-        topicMessagePayload,
+        newTopicMessagePayload,
       ]);
     });
 

From 6de731778bf9e2884f5f50a464d4f399055de81e Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Fri, 11 Nov 2022 15:19:11 +0200
Subject: [PATCH 284/734] Issue/copy checking topics section within kafka UI
 application (#2925)

* Commit

* Moved and renamed classes from Tests

* Added new methods and refactored getRandomMessage()

* Moved SmokeTests from tests to com.provectus.kafka.ui

* Moved SmokeTests from com.provectus.kafka.ui to Suite

* resolve conversation

* resolve conversation
---
 .../provectus/kafka/ui/pages/TopPanel.java    |   7 +-
 .../kafka/ui/pages/topic/TopicDetails.java    |   3 +-
 .../kafka/ui/pages/topic/TopicsList.java      |  42 +++
 .../kafka/ui/{ => suite}/SmokeTests.java      |   4 +-
 .../connectors}/ConnectorsTests.java          |   2 +-
 .../schemas}/SchemasTests.java                |   2 +-
 .../ui/suite/topics/TopicActionsTests.java    | 259 ++++++++++++++
 .../ui/suite/topics/TopicMessagesTests.java   | 133 +++++++
 .../provectus/kafka/ui/tests/TopicTests.java  | 329 ------------------
 9 files changed, 443 insertions(+), 338 deletions(-)
 rename kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/{ => suite}/SmokeTests.java (97%)
 rename kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/{tests => suite/connectors}/ConnectorsTests.java (99%)
 rename kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/{tests => suite/schemas}/SchemasTests.java (99%)
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicActionsTests.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
index 8101543abfc..267bb4a9b21 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
@@ -1,13 +1,12 @@
 package com.provectus.kafka.ui.pages;
 
-import com.codeborne.selenide.SelenideElement;
+import static com.codeborne.selenide.Selenide.$x;
 
+import com.codeborne.selenide.SelenideElement;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.codeborne.selenide.Selenide.$x;
-
-public class TopPanel {
+public class TopPanel extends BasePage{
     protected SelenideElement kafkaLogo = $x("//a[contains(text(),'UI for Apache Kafka')]");
     protected SelenideElement kafkaVersion = $x("//a[@title='Current commit']");
     protected SelenideElement logOutBtn = $x("//button[contains(text(),'Log out')]");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 61a04115fb4..9ac485c26b7 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -3,6 +3,7 @@
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
+import static org.apache.commons.lang.math.RandomUtils.nextInt;
 
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
@@ -142,7 +143,7 @@ public TopicDetails.MessageGridItem getMessage(int offset) {
 
   @Step
   public TopicDetails.MessageGridItem getRandomMessage() {
-    return getMessage(initItems().size() - 1);
+    return getMessage(nextInt(initItems().size() - 1));
   }
 
   public static class MessageGridItem extends BasePage {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 34e997152ff..cd61bd72721 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -7,6 +7,11 @@
 import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import lombok.experimental.ExtensionMethod;
 
 @ExtensionMethod(WaitUtils.class)
@@ -14,6 +19,10 @@ public class TopicsList extends BasePage {
 
     protected SelenideElement topicListHeader = $x("//h1[text()='Topics']");
     protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
+    protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
+    protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
+    protected String сolumnHeaderLocator = "//table//tr/th/div[text()='%s']";
+    protected String actionButtonLocator = "//button[text()='%s']";
 
     @Step
     public TopicsList waitUntilScreenReady() {
@@ -39,4 +48,37 @@ public TopicsList openTopic(String topicName) {
         getTableElement(topicName).shouldBe(Condition.enabled).click();
         return this;
     }
+
+    private List<SelenideElement> getActionButtons() {
+      return Stream.of("Delete selected topics", "Copy selected topic", "Purge messages of selected topics")
+          .map(name -> $x(String.format(actionButtonLocator, name)))
+          .collect(Collectors.toList());
+    }
+
+    private List<SelenideElement> getVisibleColumnHeaders() {
+      return Stream.of("Replication Factor","Number of messages","Topic Name", "Partitions", "Out of sync replicas", "Size")
+          .map(name -> $x(String.format(сolumnHeaderLocator, name)))
+        .collect(Collectors.toList());
+    }
+
+    private List<SelenideElement> getEnabledColumnHeaders(){
+      return Stream.of("Topic Name", "Partitions", "Out of sync replicas", "Size")
+          .map(name -> $x(String.format(сolumnHeaderLocator, name)))
+          .collect(Collectors.toList());
+    }
+
+    @Step
+    public List<SelenideElement> getAllVisibleElements() {
+      List<SelenideElement> visibleElements = new ArrayList<>(getVisibleColumnHeaders());
+      visibleElements.addAll(Arrays.asList(searchField, addTopicBtn, tableGrid));
+      visibleElements.addAll(getActionButtons());
+      return visibleElements;
+    }
+
+    @Step
+    public List<SelenideElement> getAllEnabledElements() {
+      List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
+      enabledElements.addAll(Arrays.asList(searchField, showInternalRadioBtn,addTopicBtn));
+      return enabledElements;
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java
similarity index 97%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
rename to kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java
index e1e6927c432..ed7d901fe4b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui;
+package com.provectus.kafka.ui.suite;
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.base.BaseTest;
@@ -29,4 +29,4 @@ public void checkBasePageElements(){
                                 .as(element.getSearchCriteria() + " isEnabled()").isTrue());
         softly.assertAll();
     }
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
similarity index 99%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
rename to kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
index 505cb6bcf00..5e8ed9157ab 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.tests;
+package com.provectus.kafka.ui.suite.connectors;
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
similarity index 99%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
rename to kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
index 681b95bbb56..553568795dd 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.tests;
+package com.provectus.kafka.ui.suite.schemas;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.SCHEMA_REGISTRY;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicActionsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicActionsTests.java
new file mode 100644
index 00000000000..3bc6dc07b4a
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicActionsTests.java
@@ -0,0 +1,259 @@
+package com.provectus.kafka.ui.suite.topics;
+
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
+import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.DELETE;
+import static com.provectus.kafka.ui.pages.topic.enums.CustomParameterType.COMPRESSION_TYPE;
+import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_20_GB;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.base.BaseTest;
+import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.pages.topic.TopicDetails;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Issue;
+import io.qase.api.annotation.CaseId;
+import java.util.ArrayList;
+import java.util.List;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class TopicActionsTests extends BaseTest {
+  private static final long SUITE_ID = 2;
+  private static final String SUITE_TITLE = "Topics";
+  private static final Topic TOPIC_TO_CREATE = new Topic()
+      .setName("new-topic-"+ randomAlphabetic(5))
+      .setPartitions("1")
+      .setCustomParameterType(COMPRESSION_TYPE)
+      .setCustomParameterValue("producer")
+      .setCleanupPolicyValue(DELETE);
+  private static final Topic TOPIC_FOR_UPDATE = new Topic()
+      .setName("topic-to-update-" + randomAlphabetic(5))
+      .setCleanupPolicyValue(COMPACT)
+      .setTimeToRetainData("604800001")
+      .setMaxSizeOnDisk(SIZE_20_GB)
+      .setMaxMessageBytes("1000020")
+      .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
+      .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+
+  private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete-" + randomAlphabetic(5));
+  private static final List<Topic> TOPIC_LIST = new ArrayList<>();
+
+  @BeforeAll
+  public void beforeAll() {
+    TOPIC_LIST.addAll(List.of(TOPIC_FOR_UPDATE, TOPIC_FOR_DELETE));
+    TOPIC_LIST.forEach(topic -> apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
+  }
+
+  @DisplayName("should create a topic")
+  @Suite(suiteId = 4, title = "Create new Topic")
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(199)
+  @Test
+  public void createTopic() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(TOPIC_TO_CREATE.getName())
+        .setPartitions(TOPIC_TO_CREATE.getPartitions())
+        .selectCleanupPolicy(TOPIC_TO_CREATE.getCleanupPolicyValue())
+        .clickCreateTopicBtn();
+    topicDetails
+        .waitUntilScreenReady();
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(TOPIC_TO_CREATE.getName());
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName())).as("isTopicHeaderVisible()").isTrue();
+    softly.assertThat(topicDetails.getCleanUpPolicy()).as("getCleanUpPolicy()").isEqualTo(TOPIC_TO_CREATE.getCleanupPolicyValue().toString());
+    softly.assertThat(topicDetails.getPartitions()).as("getPartitions()").isEqualTo(TOPIC_TO_CREATE.getPartitions());
+    softly.assertAll();
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady();
+    Assertions.assertTrue(topicsList.isTopicVisible(TOPIC_TO_CREATE.getName()), "isTopicVisible");
+    TOPIC_LIST.add(TOPIC_TO_CREATE);
+  }
+
+  @Disabled()
+  @Issue("https://github.com/provectus/kafka-ui/issues/2625")
+  @DisplayName("should update a topic")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(197)
+  @Test
+  public void updateTopic() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(TOPIC_FOR_UPDATE.getName());
+    topicDetails
+        .waitUntilScreenReady()
+        .openDotMenu()
+        .clickEditSettingsMenu();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .selectCleanupPolicy((TOPIC_FOR_UPDATE.getCleanupPolicyValue()))
+        .setMinInsyncReplicas(10)
+        .setTimeToRetainDataInMs(TOPIC_FOR_UPDATE.getTimeToRetainData())
+        .setMaxSizeOnDiskInGB(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
+        .setMaxMessageBytes(TOPIC_FOR_UPDATE.getMaxMessageBytes())
+        .clickCreateTopicBtn();
+    topicDetails
+        .waitUntilScreenReady();
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(TOPIC_FOR_UPDATE.getName());
+    topicDetails
+        .waitUntilScreenReady()
+        .openDotMenu()
+        .clickEditSettingsMenu();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()").isEqualTo(TOPIC_FOR_UPDATE.getCleanupPolicyValue().getVisibleText());
+    softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
+    softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk().getVisibleText());
+    softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
+    softly.assertAll();
+  }
+
+  @DisplayName("should delete topic")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(207)
+  @Test
+  public void deleteTopic() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(TOPIC_FOR_DELETE.getName());
+    topicDetails
+        .waitUntilScreenReady()
+        .openDotMenu()
+        .clickDeleteTopicMenu()
+        .clickConfirmDeleteBtn();
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady();
+    Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
+    TOPIC_LIST.remove(TOPIC_FOR_DELETE);
+  }
+
+  @DisplayName("Redirect to consumer from topic profile")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(20)
+  @Test
+  void redirectToConsumerFromTopic() {
+    String topicName = "source-activities";
+    String consumerGroupId = "connect-sink_postgres_activities";
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(topicName);
+    topicDetails
+        .waitUntilScreenReady()
+        .openDetailsTab(TopicDetails.TopicMenu.CONSUMERS)
+        .openConsumerGroup(consumerGroupId);
+    consumersDetails
+        .waitUntilScreenReady();
+    assertThat(consumersDetails.isRedirectedConsumerTitleVisible(consumerGroupId))
+        .withFailMessage("isRedirectedConsumerTitleVisible").isTrue();
+    assertThat(consumersDetails.isTopicInConsumersDetailsVisible(topicName))
+        .withFailMessage("isTopicInConsumersDetailsVisible").isTrue();
+  }
+
+  @DisplayName("Checking Topic creation possibility in case of empty Topic Name")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(4)
+  @Test
+  void checkTopicCreatePossibility() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName("");
+    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
+    topicCreateEditForm
+        .setTopicName("testTopic1");
+    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isTrue();
+  }
+
+  @DisplayName("Checking requiredness of Custom parameters within 'Create new Topic'")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(6)
+  @Test
+  void checkCustomParametersWithinCreateNewTopic() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(TOPIC_TO_CREATE.getName())
+        .clickAddCustomParameterTypeButton()
+        .setCustomParameterType(TOPIC_TO_CREATE.getCustomParameterType());
+    assertThat(topicCreateEditForm.isDeleteCustomParameterButtonEnabled()).as("isDeleteCustomParameterButtonEnabled()")
+        .isTrue();
+    topicCreateEditForm
+        .clearCustomParameterValue();
+    assertThat(topicCreateEditForm.isValidationMessageCustomParameterValueVisible())
+        .as("isValidationMessageCustomParameterValueVisible()").isTrue();
+  }
+
+  @DisplayName("Checking Topics section within Kafka-ui Application")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(2)
+  @Test
+  void checkTopicListElements(){
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady();
+    SoftAssertions softly = new SoftAssertions();
+    topicsList.getAllVisibleElements().forEach(
+        element -> softly.assertThat(element.is(Condition.visible)).as(element.getSearchCriteria() + " isVisible()")
+            .isTrue());
+    topicsList.getAllEnabledElements().forEach(
+        element -> softly.assertThat(element.is(Condition.enabled)).as(element.getSearchCriteria() + " isEnabled()")
+            .isTrue());
+    softly.assertAll();
+  }
+
+  @AfterAll
+  public void afterAll() {
+    TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
new file mode 100644
index 00000000000..f3da20747be
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -0,0 +1,133 @@
+package com.provectus.kafka.ui.suite.topics;
+
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+
+import com.provectus.kafka.ui.base.BaseTest;
+import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.pages.topic.TopicDetails;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Issue;
+import io.qase.api.annotation.CaseId;
+import java.util.ArrayList;
+import java.util.List;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class TopicMessagesTests extends BaseTest {
+  private static final long SUITE_ID = 2;
+  private static final String SUITE_TITLE = "Topics";
+  private static final Topic TOPIC_FOR_MESSAGES = new Topic()
+      .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
+      .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
+      .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+  private static final List<Topic> TOPIC_LIST = new ArrayList<>();
+
+  @BeforeAll
+  public void beforeAll() {
+    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES));
+    TOPIC_LIST.forEach(topic -> apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
+  }
+
+  @DisplayName("produce message")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(222)
+  @Test
+  void produceMessage() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(TOPIC_FOR_MESSAGES.getName());
+    topicDetails
+        .waitUntilScreenReady()
+        .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
+        .clickProduceMessageBtn();
+    produceMessagePanel
+        .waitUntilScreenReady()
+        .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
+        .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
+        .submitProduceMessage();
+    topicDetails
+        .waitUntilScreenReady();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
+    softly.assertThat(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
+    softly.assertAll();
+  }
+
+  @Disabled
+  @Issue("https://github.com/provectus/kafka-ui/issues/2778")
+  @DisplayName("clear message")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(19)
+  @Test
+  void clearMessage() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(TOPIC_FOR_MESSAGES.getName());
+    topicDetails
+        .waitUntilScreenReady()
+        .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
+        .clickProduceMessageBtn();
+    int messageAmount = topicDetails.getMessageCountAmount();
+    produceMessagePanel
+        .waitUntilScreenReady()
+        .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
+        .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
+        .submitProduceMessage();
+    topicDetails
+        .waitUntilScreenReady();
+    Assertions.assertEquals(messageAmount + 1, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
+    topicDetails
+        .openDotMenu()
+        .clickClearMessagesMenu()
+        .waitUntilScreenReady();
+    Assertions.assertEquals(0, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
+  }
+
+  @Disabled
+  @Issue("https://github.com/provectus/kafka-ui/issues/2819")
+  @DisplayName("Message copy from topic profile")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(21)
+  @Test
+  void copyMessageFromTopicProfile() {
+    String topicName = "_schemas";
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(topicName);
+    topicDetails
+        .waitUntilScreenReady()
+        .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
+        .getRandomMessage()
+        .openDotMenu()
+        .clickCopyToClipBoard();
+    Assertions.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Copied successfully!"),
+        "isAlertWithMessageVisible()");
+  }
+
+  @AfterAll
+  public void afterAll() {
+    TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
deleted file mode 100644
index dc7a3b130a8..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
+++ /dev/null
@@ -1,329 +0,0 @@
-package com.provectus.kafka.ui.tests;
-
-import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
-import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
-import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.DELETE;
-import static com.provectus.kafka.ui.pages.topic.enums.CustomParameterType.COMPRESSION_TYPE;
-import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_20_GB;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.BasePage;
-import com.provectus.kafka.ui.pages.topic.TopicDetails;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
-import io.qameta.allure.Issue;
-import io.qase.api.annotation.CaseId;
-import java.util.ArrayList;
-import java.util.List;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class TopicTests extends BaseTest {
-    private static final long SUITE_ID = 2;
-    private static final String SUITE_TITLE = "Topics";
-    private static final Topic TOPIC_TO_CREATE = new Topic()
-            .setName("new-topic-"+ randomAlphabetic(5))
-            .setPartitions("1")
-            .setCustomParameterType(COMPRESSION_TYPE)
-            .setCustomParameterValue("producer")
-            .setCleanupPolicyValue(DELETE);
-    private static final Topic TOPIC_FOR_UPDATE = new Topic()
-            .setName("topic-to-update-" + randomAlphabetic(5))
-            .setCleanupPolicyValue(COMPACT)
-            .setTimeToRetainData("604800001")
-            .setMaxSizeOnDisk(SIZE_20_GB)
-            .setMaxMessageBytes("1000020")
-            .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
-            .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
-    private static final Topic TOPIC_FOR_MESSAGES = new Topic()
-            .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
-            .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
-            .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
-
-    private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete-" + randomAlphabetic(5));
-    private static final List<Topic> TOPIC_LIST = new ArrayList<>();
-
-    @BeforeAll
-    public void beforeAll() {
-        TOPIC_LIST.addAll(List.of(TOPIC_FOR_UPDATE, TOPIC_FOR_DELETE, TOPIC_FOR_MESSAGES));
-        TOPIC_LIST.forEach(topic -> apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
-    }
-
-    @DisplayName("should create a topic")
-    @Suite(suiteId = 4, title = "Create new Topic")
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(199)
-    @Test
-    public void createTopic() {
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady()
-                .clickAddTopicBtn();
-        topicCreateEditForm
-                .waitUntilScreenReady()
-                .setTopicName(TOPIC_TO_CREATE.getName())
-                .setPartitions(TOPIC_TO_CREATE.getPartitions())
-                .selectCleanupPolicy(TOPIC_TO_CREATE.getCleanupPolicyValue())
-                .clickCreateTopicBtn();
-        topicDetails
-                .waitUntilScreenReady();
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady()
-                .openTopic(TOPIC_TO_CREATE.getName());
-        SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName())).as("isTopicHeaderVisible()").isTrue();
-        softly.assertThat(topicDetails.getCleanUpPolicy()).as("getCleanUpPolicy()").isEqualTo(TOPIC_TO_CREATE.getCleanupPolicyValue().toString());
-        softly.assertThat(topicDetails.getPartitions()).as("getPartitions()").isEqualTo(TOPIC_TO_CREATE.getPartitions());
-        softly.assertAll();
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady();
-        Assertions.assertTrue(topicsList.isTopicVisible(TOPIC_TO_CREATE.getName()), "isTopicVisible");
-        TOPIC_LIST.add(TOPIC_TO_CREATE);
-    }
-
-    @Disabled()
-    @Issue("https://github.com/provectus/kafka-ui/issues/2625")
-    @DisplayName("should update a topic")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(197)
-    @Test
-    public void updateTopic() {
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady()
-                .openTopic(TOPIC_FOR_UPDATE.getName());
-        topicDetails
-                .waitUntilScreenReady()
-                .openDotMenu()
-                .clickEditSettingsMenu();
-        topicCreateEditForm
-                .waitUntilScreenReady()
-                .selectCleanupPolicy((TOPIC_FOR_UPDATE.getCleanupPolicyValue()))
-                .setMinInsyncReplicas(10)
-                .setTimeToRetainDataInMs(TOPIC_FOR_UPDATE.getTimeToRetainData())
-                .setMaxSizeOnDiskInGB(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
-                .setMaxMessageBytes(TOPIC_FOR_UPDATE.getMaxMessageBytes())
-                .clickCreateTopicBtn();
-        topicDetails
-                .waitUntilScreenReady();
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady()
-                .openTopic(TOPIC_FOR_UPDATE.getName());
-        topicDetails
-                .waitUntilScreenReady()
-                .openDotMenu()
-                .clickEditSettingsMenu();
-        SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()").isEqualTo(TOPIC_FOR_UPDATE.getCleanupPolicyValue().getVisibleText());
-        softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
-        softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk().getVisibleText());
-        softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
-        softly.assertAll();
-    }
-
-    @DisplayName("should delete topic")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(207)
-    @Test
-    public void deleteTopic() {
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady()
-                .openTopic(TOPIC_FOR_DELETE.getName());
-        topicDetails
-                .waitUntilScreenReady()
-                .openDotMenu()
-                .clickDeleteTopicMenu()
-                .clickConfirmDeleteBtn();
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady();
-        Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
-        TOPIC_LIST.remove(TOPIC_FOR_DELETE);
-    }
-
-    @DisplayName("produce message")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(222)
-    @Test
-    void produceMessage() {
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady()
-                .openTopic(TOPIC_FOR_MESSAGES.getName());
-        topicDetails
-                .waitUntilScreenReady()
-                .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
-                .clickProduceMessageBtn();
-        produceMessagePanel
-                .waitUntilScreenReady()
-                .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
-                .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
-                .submitProduceMessage();
-        topicDetails
-                .waitUntilScreenReady();
-        SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
-        softly.assertThat(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
-        softly.assertAll();
-    }
-
-    @Disabled
-    @Issue("https://github.com/provectus/kafka-ui/issues/2778")
-    @DisplayName("clear message")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(19)
-    @Test
-    void clearMessage() {
-      naviSideBar
-          .openSideMenu(TOPICS);
-      topicsList
-          .waitUntilScreenReady()
-          .openTopic(TOPIC_FOR_MESSAGES.getName());
-      topicDetails
-          .waitUntilScreenReady()
-          .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
-          .clickProduceMessageBtn();
-      int messageAmount = topicDetails.getMessageCountAmount();
-      produceMessagePanel
-          .waitUntilScreenReady()
-          .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
-          .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
-          .submitProduceMessage();
-      topicDetails
-          .waitUntilScreenReady();
-      Assertions.assertEquals(messageAmount + 1, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
-      topicDetails
-          .openDotMenu()
-          .clickClearMessagesMenu()
-          .waitUntilScreenReady();
-      Assertions.assertEquals(0, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
-    }
-
-    @DisplayName("Redirect to consumer from topic profile")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(20)
-    @Test
-    void redirectToConsumerFromTopic() {
-        String topicName = "source-activities";
-        String consumerGroupId = "connect-sink_postgres_activities";
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady()
-                .openTopic(topicName);
-        topicDetails
-                .waitUntilScreenReady()
-                .openDetailsTab(TopicDetails.TopicMenu.CONSUMERS)
-                .openConsumerGroup(consumerGroupId);
-        consumersDetails
-                .waitUntilScreenReady();
-        assertThat(consumersDetails.isRedirectedConsumerTitleVisible(consumerGroupId))
-                .withFailMessage("isRedirectedConsumerTitleVisible").isTrue();
-        assertThat(consumersDetails.isTopicInConsumersDetailsVisible(topicName))
-                .withFailMessage("isTopicInConsumersDetailsVisible").isTrue();
-    }
-
-  @DisplayName("Checking Topic creation possibility in case of empty Topic Name")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(4)
-  @Test
-  void checkTopicCreatePossibility() {
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .clickAddTopicBtn();
-    topicCreateEditForm
-        .waitUntilScreenReady()
-        .setTopicName("");
-    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
-    topicCreateEditForm
-        .setTopicName("testTopic1");
-    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isTrue();
-  }
-
-  @DisplayName("Checking requiredness of Custom parameters within 'Create new Topic'")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(6)
-  @Test
-  void checkCustomParametersWithinCreateNewTopic() {
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .clickAddTopicBtn();
-    topicCreateEditForm
-        .waitUntilScreenReady()
-        .setTopicName(TOPIC_TO_CREATE.getName())
-        .clickAddCustomParameterTypeButton()
-        .setCustomParameterType(TOPIC_TO_CREATE.getCustomParameterType());
-    assertThat(topicCreateEditForm.isDeleteCustomParameterButtonEnabled()).as("isDeleteCustomParameterButtonEnabled()")
-        .isTrue();
-    topicCreateEditForm
-        .clearCustomParameterValue();
-    assertThat(topicCreateEditForm.isValidationMessageCustomParameterValueVisible())
-        .as("isValidationMessageCustomParameterValueVisible()").isTrue();
-  }
-
-  @Disabled
-  @Issue("https://github.com/provectus/kafka-ui/issues/2819")
-  @DisplayName("Message copy from topic profile")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(21)
-  @Test
-  void copyMessageFromTopicProfile() {
-    String topicName = "_schemas";
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(topicName);
-    topicDetails
-        .waitUntilScreenReady()
-        .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
-        .getRandomMessage()
-        .openDotMenu()
-        .clickCopyToClipBoard();
-    Assertions.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Copied successfully!"),
-        "isAlertWithMessageVisible()");
-  }
-
-    @AfterAll
-    public void afterAll() {
-        TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
-    }
-}

From 8dc1e00ca2711fd3058f434a077d3ada2cc902fa Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Sat, 12 Nov 2022 00:04:01 +0400
Subject: [PATCH 285/734] fixed undefined (reading 'data') warning in
 Statistics.spec.tsx (#2927)

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../Topics/Topic/Statistics/__test__/Statistics.spec.tsx    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
index ef034b4d83a..cc70ed51c35 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
@@ -32,13 +32,19 @@ describe('Statistics', () => {
     }));
 
     renderComponent();
+
     await expect(screen.getByText('Restart Analysis')).toBeInTheDocument();
     expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
   });
   it('renders Start Analysis button', async () => {
+    // throwing intentional For error boundaries to work
+    jest.spyOn(console, 'error').mockImplementation(() => undefined);
     (useAnalyzeTopic as jest.Mock).mockImplementation(() => ({
       mutateAsync: startMock,
     }));
+    (useTopicAnalysis as jest.Mock).mockImplementation(() => {
+      throw new Error('Error boundary');
+    });
     renderComponent();
     const btn = screen.getByRole('button', { name: 'Start Analysis' });
     expect(btn).toBeInTheDocument();

From f47a0382f73fc88b778d87492d09bc9b8427da1c Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 14 Nov 2022 13:53:56 +0300
Subject: [PATCH 286/734] Fix CVEs, Nov. 22 (#2926)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73d3bfeb3ad..ecb707e1da0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
         <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-boot.version>2.6.8</spring-boot.version>
+        <spring-boot.version>2.7.5</spring-boot.version>
         <jackson-databind-nullable.version>0.2.2</jackson-databind-nullable.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <org.projectlombok.version>1.18.20</org.projectlombok.version>
@@ -33,7 +33,7 @@
         <swagger-annotations.version>1.6.0</swagger-annotations.version>
         <springdoc-openapi-webflux-ui.version>1.2.32</springdoc-openapi-webflux-ui.version>
         <avro.version>1.11.0</avro.version>
-        <confluent.version>7.0.1</confluent.version>
+        <confluent.version>7.3.0</confluent.version>
         <apache.commons.version>2.11.1</apache.commons.version>
         <test.containers.version>1.17.1</test.containers.version>
         <okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>

From 818149977cc234bf18ba9eeabb00926c16610bc4 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Mon, 14 Nov 2022 18:02:34 +0200
Subject: [PATCH 287/734] [e2e]Checking the information of used Broker in a
 cluster (#2931)

* [e2e] Fix1

* [e2e] BrokersDetails added

* [e2e] BrokersDetails added

* [e2e] Lists in Details Added

* [e2e] Fix WebUtils

* [e2e] All changes

* [e2e] Fix2
---
 .../provectus/kafka/ui/pages/BasePage.java    |  2 +
 .../ui/pages/brokers/BrokersDetails.java      | 56 +++++++++++++++++
 .../kafka/ui/pages/brokers/BrokersList.java   | 32 ++++++++++
 .../kafka/ui/pages/topic/TopicsList.java      |  1 -
 .../kafka/ui/utilities/WebUtils.java          | 62 +++++++++----------
 .../com/provectus/kafka/ui/base/Facade.java   |  4 ++
 .../kafka/ui/suite/brokers/BrokersTests.java  | 42 +++++++++++++
 7 files changed, 167 insertions(+), 32 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index 827a663cc51..de733b668f9 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -16,7 +16,9 @@ public abstract class BasePage extends WebUtils {
   protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
   protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
   protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
+  protected String summaryCellLocator = "//div[contains(text(),'%s')]";
   protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
+  protected String сolumnHeaderLocator = "//table//tr/th/div[text()='%s']";
 
   protected void waitUntilSpinnerDisappear() {
     log.debug("\nwaitUntilSpinnerDisappear");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
new file mode 100644
index 00000000000..8ae28c0944e
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
@@ -0,0 +1,56 @@
+package com.provectus.kafka.ui.pages.brokers;
+
+import static com.codeborne.selenide.Selenide.$x;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class BrokersDetails extends BasePage {
+
+  protected SelenideElement logDirectoriesTab = $x("//a[text()='Log directories']");
+  protected SelenideElement metricsTab = $x("//a[text()='Metrics']");
+
+  @Step
+  public BrokersDetails waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    Arrays.asList(logDirectoriesTab, metricsTab).forEach(element -> element.shouldBe(Condition.visible));
+    return this;
+  }
+
+  private List<SelenideElement> getVisibleColumnHeaders() {
+    return Stream.of("Name", "Topics", "Error", "Partitions")
+        .map(name -> $x(String.format(сolumnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  private List<SelenideElement> getEnabledColumnHeaders() {
+    return Stream.of("Name", "Error")
+        .map(name -> $x(String.format(сolumnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  private List<SelenideElement> getVisibleSummaryCells() {
+    return Stream.of("Segment Size", "Segment Count", "Port", "Host")
+        .map(name -> $x(String.format(summaryCellLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  @Step
+  public List<SelenideElement> getAllEnabledElements() {
+    return getEnabledColumnHeaders();
+  }
+
+  @Step
+  public List<SelenideElement> getAllVisibleElements() {
+    List<SelenideElement> visibleElements = new ArrayList<>(getVisibleSummaryCells());
+    visibleElements.addAll(getVisibleColumnHeaders());
+    return visibleElements;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
new file mode 100644
index 00000000000..0d9ee67492c
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -0,0 +1,32 @@
+package com.provectus.kafka.ui.pages.brokers;
+
+import static com.codeborne.selenide.Selenide.$x;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
+
+public class BrokersList extends BasePage {
+
+  protected SelenideElement brokersListHeader = $x("//h1[text()='Brokers']");
+
+  @Step
+  public BrokersList waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    brokersListHeader.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public boolean isBrokerVisible(String brokerId) {
+    tableGrid.shouldBe(Condition.visible);
+    return isVisible(getTableElement(brokerId));
+  }
+
+  @Step
+  public BrokersList openBroker(String brokerName) {
+    getTableElement(brokerName).shouldBe(Condition.enabled).click();
+    return this;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index cd61bd72721..4ce2721d6fd 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -21,7 +21,6 @@ public class TopicsList extends BasePage {
     protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
     protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
     protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
-    protected String сolumnHeaderLocator = "//table//tr/th/div[text()='%s']";
     protected String actionButtonLocator = "//button[text()='%s']";
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index e35cad9769a..35a0a06f7a5 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -1,5 +1,7 @@
 package com.provectus.kafka.ui.utilities;
 
+import static com.codeborne.selenide.Selenide.executeJavaScript;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
@@ -7,44 +9,42 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
-import static com.codeborne.selenide.Selenide.executeJavaScript;
-
 @Slf4j
 public class WebUtils {
 
-    public static void clickByActions(SelenideElement element) {
-        log.debug("\nclickByActions: {}", element.getSearchCriteria());
-        element.shouldBe(Condition.enabled);
-        new Actions(WebDriverRunner.getWebDriver())
-                .moveToElement(element)
-                .click(element)
-                .perform();
-    }
+  public static void clickByActions(SelenideElement element) {
+    log.debug("\nclickByActions: {}", element.getSearchCriteria());
+    element.shouldBe(Condition.enabled);
+    new Actions(WebDriverRunner.getWebDriver())
+        .moveToElement(element)
+        .click(element)
+        .perform();
+  }
 
-    public static void clickByJavaScript(SelenideElement element) {
-        log.debug("\nclickByJavaScript: {}", element.getSearchCriteria());
-        element.shouldBe(Condition.enabled);
-        String script = "arguments[0].click();";
-        executeJavaScript(script, element);
-    }
+  public static void clickByJavaScript(SelenideElement element) {
+    log.debug("\nclickByJavaScript: {}", element.getSearchCriteria());
+    element.shouldBe(Condition.enabled);
+    String script = "arguments[0].click();";
+    executeJavaScript(script, element);
+  }
 
-    public static void clearByKeyboard(SelenideElement field) {
-        log.debug("\nclearByKeyboard: {}", field.getSearchCriteria());
-        field.shouldBe(Condition.enabled).sendKeys(Keys.END);
-        field.sendKeys(Keys.chord(Keys.CONTROL + "a"), Keys.DELETE);
-    }
+  public static void clearByKeyboard(SelenideElement field) {
+    log.debug("\nclearByKeyboard: {}", field.getSearchCriteria());
+    field.shouldBe(Condition.enabled).sendKeys(Keys.END);
+    field.sendKeys(Keys.chord(Keys.CONTROL + "a"), Keys.DELETE);
+  }
 
-    public static boolean isVisible(SelenideElement element) {
-        log.debug("\nisVisible: {}", element.getSearchCriteria());
-        boolean isVisible = false;
-        try {
-            element.shouldBe(Condition.visible);
-            isVisible = true;
-        } catch (Throwable e) {
-            log.debug("{} is not visible", element.getSearchCriteria());
-        }
-        return isVisible;
+  public static boolean isVisible(SelenideElement element) {
+    log.debug("\nisVisible: {}", element.getSearchCriteria());
+    boolean isVisible = false;
+    try {
+      element.shouldBe(Condition.visible);
+      isVisible = true;
+    } catch (Throwable e) {
+      log.debug("{} is not visible", element.getSearchCriteria());
     }
+    return isVisible;
+  }
 
   public static boolean isEnabled(SelenideElement element) {
     log.debug("\nisEnabled: {}", element.getSearchCriteria());
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
index 5b9533c30ec..279704b8b95 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -3,6 +3,8 @@
 import com.provectus.kafka.ui.helpers.ApiHelper;
 import com.provectus.kafka.ui.pages.NaviSideBar;
 import com.provectus.kafka.ui.pages.TopPanel;
+import com.provectus.kafka.ui.pages.brokers.BrokersDetails;
+import com.provectus.kafka.ui.pages.brokers.BrokersList;
 import com.provectus.kafka.ui.pages.connector.ConnectorCreateForm;
 import com.provectus.kafka.ui.pages.connector.ConnectorDetails;
 import com.provectus.kafka.ui.pages.connector.KafkaConnectList;
@@ -32,4 +34,6 @@ public abstract class Facade {
     protected ConsumersList consumersList = new ConsumersList();
     protected NaviSideBar naviSideBar = new NaviSideBar();
     protected TopPanel topPanel = new TopPanel();
+    protected BrokersList brokersList = new BrokersList();
+    protected BrokersDetails brokersDetails = new BrokersDetails();
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
new file mode 100644
index 00000000000..5a493438f98
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
@@ -0,0 +1,42 @@
+package com.provectus.kafka.ui.suite.brokers;
+
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.BROKERS;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.base.BaseTest;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qase.api.annotation.CaseId;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+public class BrokersTests extends BaseTest {
+  private static final String SUITE_TITLE = "Brokers";
+  private static final long SUITE_ID = 1;
+
+  @DisplayName("Checking the existing Broker's profile in a cluster")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(85)
+  @Test
+  public void checkExistingBrokersInCluster(){
+    naviSideBar
+        .openSideMenu(BROKERS);
+    brokersList
+        .waitUntilScreenReady();
+    assertThat(brokersList.isBrokerVisible("1")).as("isBrokerVisible()").isTrue();
+    brokersList
+        .openBroker("1");
+    brokersDetails
+        .waitUntilScreenReady();
+    SoftAssertions softly = new SoftAssertions();
+    brokersDetails.getAllVisibleElements().forEach(element -> softly.assertThat(element.is(Condition.visible))
+        .as(element.getSearchCriteria() + " isVisible()").isTrue());
+    brokersDetails.getAllEnabledElements().forEach(element -> softly.assertThat(element.is(Condition.enabled))
+        .as(element.getSearchCriteria() + " isEnabled()").isTrue());
+    softly.assertAll();
+  }
+}

From e26f9787d842ad56aefbc98c7ec6f9851fd35c1b Mon Sep 17 00:00:00 2001
From: Boris Djurdjevic <boris@djurdjevic.ch>
Date: Tue, 15 Nov 2022 11:11:57 +0100
Subject: [PATCH 288/734] Implement mTLS for KC (#2833)

* feat(kafka-connect): Implement kafka-connect mTLS configuration

* chore(kafka-connect): Use SecuredWebClient

* feat(ssl-demo): Configure SANs and recreate certificates

* feat(ssl-demo): Add docker-compose demo with TLS enabled components
---
 README.md                                     |   4 +
 .../compose/kafka-ssl-components.yaml         | 144 ++++++++++++++++++
 documentation/compose/ssl/generate_certs.sh   |   3 +-
 documentation/compose/ssl/kafka.keystore.jks  | Bin 3976 -> 4739 bytes
 .../compose/ssl/kafka.truststore.jks          | Bin 952 -> 952 bytes
 documentation/compose/ssl/san.cnf             |   2 +
 .../ui/client/RetryingKafkaConnectClient.java |  32 +++-
 .../kafka/ui/config/ClustersProperties.java   |   4 +
 .../kafka/ui/model/KafkaConnectCluster.java   |   5 +
 9 files changed, 189 insertions(+), 5 deletions(-)
 create mode 100644 documentation/compose/kafka-ssl-components.yaml
 mode change 100644 => 100755 documentation/compose/ssl/generate_certs.sh
 create mode 100644 documentation/compose/ssl/san.cnf

diff --git a/README.md b/README.md
index ab829328967..3bc6e4635d9 100644
--- a/README.md
+++ b/README.md
@@ -196,6 +196,10 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS` |Address of the Kafka Connect service endpoint
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_USERNAME`| Kafka Connect cluster's basic authentication username
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_PASSWORD`| Kafka Connect cluster's basic authentication password
+|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTORELOCATION`| Path to the JKS keystore to communicate to Kafka Connect
+|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTOREPASSWORD`| Password of the JKS keystore for Kafka Connect
+|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_TRUSTSTORELOCATION`| Path to the JKS truststore to communicate to Kafka Connect
+|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_TRUSTSTOREPASSWORD`| Password of the JKS truststore for Kafka Connect
 |`KAFKA_CLUSTERS_0_METRICS_SSL`          |Enable SSL for Metrics? `true` or `false`. For advanced setup, see `kafka-ui-jmx-secured.yml`
 |`KAFKA_CLUSTERS_0_METRICS_USERNAME` |Username for Metrics authentication
 |`KAFKA_CLUSTERS_0_METRICS_PASSWORD` |Password for Metrics authentication
diff --git a/documentation/compose/kafka-ssl-components.yaml b/documentation/compose/kafka-ssl-components.yaml
new file mode 100644
index 00000000000..ef1f3f88821
--- /dev/null
+++ b/documentation/compose/kafka-ssl-components.yaml
@@ -0,0 +1,144 @@
+---
+version: '3.4'
+services:
+  kafka-ui:
+    container_name: kafka-ui
+    image: provectuslabs/kafka-ui:latest
+    ports:
+      - 8080:8080
+    depends_on:
+      - kafka0
+      - schemaregistry0
+      - kafka-connect0
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SSL
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092 # SSL LISTENER!
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_LOCATION: /kafka.truststore.jks
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_PASSWORD: secret
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_LOCATION: /kafka.keystore.jks
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_PASSWORD: secret
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # DISABLE COMMON NAME VERIFICATION
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRY: https://schemaregistry0:8085
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTORELOCATION: /kafka.keystore.jks
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTOREPASSWORD: "secret"
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTORELOCATION: /kafka.truststore.jks
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTOREPASSWORD: "secret"
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: local
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: https://kafka-connect0:8083
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTORELOCATION: /kafka.keystore.jks
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTOREPASSWORD: "secret"
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_TRUSTSTORELOCATION: /kafka.truststore.jks
+      KAFKA_CLUSTERS_0_KAFKACONNECT_0_TRUSTSTOREPASSWORD: "secret"
+    volumes:
+      - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
+      - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
+
+  kafka0:
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka0
+    container_name: kafka0
+    ports:
+      - "9092:9092"
+      - "9997:9997"
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,SSL:SSL,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'SSL://kafka0:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+      KAFKA_LISTENERS: 'SSL://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'SSL'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+      KAFKA_SECURITY_PROTOCOL: SSL
+      KAFKA_SSL_ENABLED_MECHANISMS: PLAIN,SSL
+      KAFKA_SSL_KEYSTORE_FILENAME: kafka.keystore.jks
+      KAFKA_SSL_KEYSTORE_CREDENTIALS: creds
+      KAFKA_SSL_KEY_CREDENTIALS: creds
+      KAFKA_SSL_TRUSTSTORE_FILENAME: kafka.truststore.jks
+      KAFKA_SSL_TRUSTSTORE_CREDENTIALS: creds
+      #KAFKA_SSL_CLIENT_AUTH: 'required'
+      KAFKA_SSL_CLIENT_AUTH: 'requested'
+      KAFKA_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # COMMON NAME VERIFICATION IS DISABLED SERVER-SIDE
+    volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+      - ./ssl/creds:/etc/kafka/secrets/creds
+      - ./ssl/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks
+      - ./ssl/kafka.keystore.jks:/etc/kafka/secrets/kafka.keystore.jks
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
+
+  schemaregistry0:
+    image: confluentinc/cp-schema-registry:7.2.1
+    depends_on:
+      - kafka0
+    environment:
+      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: SSL://kafka0:29092
+      SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: SSL
+      SCHEMA_REGISTRY_KAFKASTORE_SSL_TRUSTSTORE_LOCATION: /kafka.truststore.jks
+      SCHEMA_REGISTRY_KAFKASTORE_SSL_TRUSTSTORE_PASSWORD: secret
+      SCHEMA_REGISTRY_KAFKASTORE_SSL_KEYSTORE_LOCATION: /kafka.keystore.jks
+      SCHEMA_REGISTRY_KAFKASTORE_SSL_KEYSTORE_PASSWORD: secret
+      SCHEMA_REGISTRY_KAFKASTORE_SSL_KEY_PASSWORD: secret
+      SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
+      SCHEMA_REGISTRY_LISTENERS: https://schemaregistry0:8085
+      SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: https
+
+      SCHEMA_REGISTRY_SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: "https"
+      SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
+      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
+      SCHEMA_REGISTRY_SSL_CLIENT_AUTHENTICATION: "REQUIRED"
+      SCHEMA_REGISTRY_SSL_TRUSTSTORE_LOCATION: /kafka.truststore.jks
+      SCHEMA_REGISTRY_SSL_TRUSTSTORE_PASSWORD: secret
+      SCHEMA_REGISTRY_SSL_KEYSTORE_LOCATION: /kafka.keystore.jks
+      SCHEMA_REGISTRY_SSL_KEYSTORE_PASSWORD: secret
+      SCHEMA_REGISTRY_SSL_KEY_PASSWORD: secret
+    ports:
+      - 8085:8085
+    volumes:
+      - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
+      - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
+
+  kafka-connect0:
+    image: confluentinc/cp-kafka-connect:7.2.1
+    ports:
+      - 8083:8083
+    depends_on:
+      - kafka0
+      - schemaregistry0
+    environment:
+      CONNECT_BOOTSTRAP_SERVERS: kafka0:29092
+      CONNECT_GROUP_ID: compose-connect-group
+      CONNECT_CONFIG_STORAGE_TOPIC: _connect_configs
+      CONNECT_CONFIG_STORAGE_REPLICATION_FACTOR: 1
+      CONNECT_OFFSET_STORAGE_TOPIC: _connect_offset
+      CONNECT_OFFSET_STORAGE_REPLICATION_FACTOR: 1
+      CONNECT_STATUS_STORAGE_TOPIC: _connect_status
+      CONNECT_STATUS_STORAGE_REPLICATION_FACTOR: 1
+      CONNECT_KEY_CONVERTER: org.apache.kafka.connect.storage.StringConverter
+      CONNECT_KEY_CONVERTER_SCHEMA_REGISTRY_URL: https://schemaregistry0:8085
+      CONNECT_VALUE_CONVERTER: org.apache.kafka.connect.storage.StringConverter
+      CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL: https://schemaregistry0:8085
+      CONNECT_INTERNAL_KEY_CONVERTER: org.apache.kafka.connect.json.JsonConverter
+      CONNECT_INTERNAL_VALUE_CONVERTER: org.apache.kafka.connect.json.JsonConverter
+      CONNECT_REST_ADVERTISED_HOST_NAME: kafka-connect0
+      CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
+      CONNECT_SECURITY_PROTOCOL: "SSL"
+      CONNECT_SSL_KEYSTORE_LOCATION: "/kafka.keystore.jks"
+      CONNECT_SSL_KEY_PASSWORD: "secret"
+      CONNECT_SSL_KEYSTORE_PASSWORD: "secret"
+      CONNECT_SSL_TRUSTSTORE_LOCATION: "/kafka.truststore.jks"
+      CONNECT_SSL_TRUSTSTORE_PASSWORD: "secret"
+      CONNECT_SSL_CLIENT_AUTH: "requested"
+      CONNECT_REST_ADVERTISED_LISTENER: "https"
+      CONNECT_LISTENERS: "https://kafka-connect0:8083"
+    volumes:
+      - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
+      - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
diff --git a/documentation/compose/ssl/generate_certs.sh b/documentation/compose/ssl/generate_certs.sh
old mode 100644
new mode 100755
index ebb916657bd..455321ef580
--- a/documentation/compose/ssl/generate_certs.sh
+++ b/documentation/compose/ssl/generate_certs.sh
@@ -144,7 +144,8 @@ echo "Now the trust store's private key (CA) will sign the keystore's certificat
 echo
 openssl x509 -req -CA $CA_CERT_FILE -CAkey $trust_store_private_key_file \
   -in $KEYSTORE_SIGN_REQUEST -out $KEYSTORE_SIGNED_CERT \
-  -days $VALIDITY_IN_DAYS -CAcreateserial
+  -days $VALIDITY_IN_DAYS -CAcreateserial \
+  -extensions kafka -extfile san.cnf
 # creates $KEYSTORE_SIGN_REQUEST_SRL which is never used or needed.
 
 echo
diff --git a/documentation/compose/ssl/kafka.keystore.jks b/documentation/compose/ssl/kafka.keystore.jks
index 54b3f3d1bc4a512c7d2e36f57f03f28e5829b3f0..a1e0548389e3b982aa4cd5559c8a5229f897fa76 100644
GIT binary patch
literal 4739
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

literal 3976
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
EA5Exv&Hw-a

diff --git a/documentation/compose/ssl/kafka.truststore.jks b/documentation/compose/ssl/kafka.truststore.jks
index eff350ce4e948bfa46e9829ae2bda2dfb43dbfc8..3baa1aa1c0e7ee878b2f303af891c6eca1e1f69e 100644
GIT binary patch
delta 688
zcmV;h0#E(82e=228wG?e<*_i4AQ}`qT#vhm+<`Dc-DO6_`>yL$`jlUhPGK4`Ff%bR
zHZwIbHCh)9GcqwSGB`0dGc_?aT9I8%lNJFWf2HT<3bFsNXjzZW961fVRzkLm62feJ
zQX}AK455a`(U=71w0&C<#=QZsOQBPhckes|?r}5J*&QyV9GQ}qD->#%V9#9-&d3qR
z=7g6a`BGai02pIC$?n%%wNuxZ)Y(P+w}doxEyvwep7Wg#z6&iY%p7@%-FF4mcE6UO
ze{@4=pjxO2sT8K*m8petD)xK%(po&>X!29}O=#S)F{SoLTjYfB7)$u~c5HP$?CSfz
z!PD%Na<}_`)b{FSIkPhtz34;D<HNXHX&2|&d+J=Z8Oyn1oR#Va$w4tnbUq*TQ1$l9
zTseRHq#2oxuC66_zCYvxDYq{-k;4EgOJt7%0|5X5qf;<ZFdYU1RUHll76cScn<34u
zHv_f&b)FeGttUfNo$8)29|i+e9U}x7FcyFmO`9Rjtv3U;{B@ogIISl`RGsRclYasw
ze<u87OXYyW2pf}F*g9k)W~RQcV;4^{#9*4FxI-7Pq><R6ZCO-Xt~V|uXb{2)LqmTQ
zwA2tAnHmW~b~^~%QG=wuja_81R4#8e8-Nxy4{y2oZB(DF0itWQcWeujj~7{6SYP&%
z5tzbpah1xv#aRpmUJKgXG{IhIdnr@%e+kW~Rn*%QVAwTwewa$iexcaq3Hb8ftaO(`
zet=xu>w%rYm}j3w=ua3-wyA**kdK=NJ+V7ujVRZ;%qb|+Pfs5-*XEI;H*ZR(0w9qe
zv*CMAJ(Hm{O~X`f`kze7(QuPgf~{eD;c^UCAFTn<G?FY-*|G7PXwo&Qe6+w47O;XT
W`R@OUy>}&f$Hcb{4s)VIW<vmwF+9ou

delta 688
zcmV;h0#E(82e=228wGyU-|~%-AQ}`r%L1HSCMhO^Yw~k9Wo61+==@2MPGK4_GB7tW
zH8eRfGg=o7GcqtTFf}nXG&wOdT9I8%lNJFWf31Y>{WxBe4pjjr&9nC2MQ68K?F$-l
zPX3=V&0v_mN+8cpc`ZVgb#(HMvJ{Rv$@~vLxk|UatOobJ2987xLQXjd{!RjwI?!J7
z9?KRGXH_Oj{orNGPqLM~I+mJPug8q=;!N>4^xQK$srIY^Ot`j)bJSLWp9Vay`iEj4
ze?Pf2MbzJ|D&ZB(y7`0vr#;R^9WG=#NEe~7-WPf|2`uKlkZ9!@0uMTJGYenK(_1#x
zz7C=PNQ-k5Z=I$yGtfzUgC?kQoy{qk6$<|lulO28A1Dt~zO<vX02`RuWqtNgsrA>e
zuLDq0ojLEDtp^>!L3<iLJC}Rp3VD#XOLo5k0|5X5qf;<ZFdYU1RUHll76cTw@lz+j
z<G8I=o6qf{Q-hM$Y|xP~9|i+e9U}x7FcyFmw((OZz~i{BRh!T4qEmyC)@;y`lYasw
ze;~K3<ddIWn9upiVS96FisVm5#d~c`^n7aNipAcUfB}A5@PX{(Y!1-h3Li%8L<yaH
zuD5Epn?muaC)0gCv4i7L>fhaM{vt}3Zfa?S-20h_|4MT`<Hy4OV=WRF3~xa#C%T|;
z{^%yK<CB<A-sAzgt3dG2XT)J(Q3-p<e=FHZzP%uRts7wD8?r{r2&&2K|JE@2HDBQ%
zKRiTQk4-6JQ^d0L&EAE{;ZO{VRj_hDmJoz}|JUyuZb)@+jaEa<?I^hf&gzyO$Y%ag
z4W3)~4Wqf{i;M_Q12AD@V`t;mg3<09F*DnI5!F2DoyEL5JH}BhK(9<*pD;V(7Myi7
WPL3{ImhR&eK@I%H+|PZqd{H!`PeWM%

diff --git a/documentation/compose/ssl/san.cnf b/documentation/compose/ssl/san.cnf
new file mode 100644
index 00000000000..53c52a9718f
--- /dev/null
+++ b/documentation/compose/ssl/san.cnf
@@ -0,0 +1,2 @@
+[kafka]
+subjectAltName = DNS:kafka0,DNS:schemaregistry0,DNS:kafka-connect0
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
index b1115d0eef1..6f71441d177 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
@@ -10,21 +10,32 @@
 import com.provectus.kafka.ui.connect.model.NewConnector;
 import com.provectus.kafka.ui.exception.KafkaConnectConflictReponseException;
 import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.model.InternalSchemaRegistry;
+import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.KafkaConnectCluster;
+import com.provectus.kafka.ui.util.SecuredWebClient;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import java.io.FileInputStream;
+import java.security.KeyStore;
 import java.text.DateFormat;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.openapitools.jackson.nullable.JsonNullableModule;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.http.codec.json.Jackson2JsonEncoder;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.ResourceUtils;
 import org.springframework.util.unit.DataSize;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
@@ -32,6 +43,7 @@
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.netty.http.client.HttpClient;
 import reactor.util.retry.Retry;
 
 @Slf4j
@@ -89,7 +101,7 @@ private static class RetryingApiClient extends ApiClient {
     private static final ObjectMapper mapper = buildObjectMapper(dateFormat);
 
     public RetryingApiClient(KafkaConnectCluster config, DataSize maxBuffSize) {
-      super(buildWebClient(mapper, maxBuffSize), mapper, dateFormat);
+      super(buildWebClient(mapper, maxBuffSize, config), mapper, dateFormat);
       setBasePath(config.getAddress());
       setUsername(config.getUserName());
       setPassword(config.getPassword());
@@ -101,7 +113,7 @@ public static DateFormat getDefaultDateFormat() {
       return dateFormat;
     }
 
-    public static WebClient buildWebClient(ObjectMapper mapper, DataSize maxBuffSize) {
+    public static WebClient buildWebClient(ObjectMapper mapper, DataSize maxBuffSize, KafkaConnectCluster config) {
       ExchangeStrategies strategies = ExchangeStrategies
               .builder()
               .codecs(clientDefaultCodecsConfigurer -> {
@@ -113,8 +125,20 @@ public static WebClient buildWebClient(ObjectMapper mapper, DataSize maxBuffSize
                         .maxInMemorySize((int) maxBuffSize.toBytes());
               })
               .build();
-      WebClient.Builder webClient = WebClient.builder().exchangeStrategies(strategies);
-      return webClient.build();
+
+      try {
+        WebClient.Builder webClient = SecuredWebClient.configure(
+            config.getKeystoreLocation(),
+            config.getKeystorePassword(),
+            config.getTruststoreLocation(),
+            config.getTruststorePassword()
+        );
+
+        return webClient.exchangeStrategies(strategies).build();
+      } catch (Exception e) {
+        throw new IllegalStateException(
+            "cannot create TLS configuration for kafka-connect cluster " + config.getName(), e);
+      }
     }
 
     public static ObjectMapper buildObjectMapper(DateFormat dateFormat) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 4313c3248ec..45800278b84 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -55,6 +55,10 @@ public static class ConnectCluster {
     String address;
     String userName;
     String password;
+    String keystoreLocation;
+    String keystorePassword;
+    String truststoreLocation;
+    String truststorePassword;
   }
 
   @Data
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaConnectCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaConnectCluster.java
index 6131f3fa9e9..4a95b0e890e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaConnectCluster.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaConnectCluster.java
@@ -13,4 +13,9 @@ public class KafkaConnectCluster {
   private final String address;
   private final String userName;
   private final String password;
+
+  private final String keystoreLocation;
+  private final String truststoreLocation;
+  private final String keystorePassword;
+  private final String truststorePassword;
 }

From 0d0a24491586a499890897dac5f3546510f53cd5 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen.schalanda@personio.de>
Date: Tue, 15 Nov 2022 11:22:16 +0100
Subject: [PATCH 289/734] Centralize dependency versions and bump where
 necessary (#2929)

---
 kafka-ui-api/pom.xml        |  18 +----
 kafka-ui-contract/pom.xml   |   2 -
 kafka-ui-e2e-checks/pom.xml |  20 +-----
 kafka-ui-serde-api/pom.xml  |   2 +
 pom.xml                     | 130 +++++++++++++++++++++++++++++-------
 5 files changed, 109 insertions(+), 63 deletions(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index f9fa40386fb..95c64071dc5 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -20,18 +20,6 @@
         <sonar.language>java</sonar.language>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -103,7 +91,7 @@
         <dependency>
             <groupId>software.amazon.msk</groupId>
             <artifactId>aws-msk-iam-auth</artifactId>
-            <version>1.1.3</version>
+            <version>1.1.5</version>
         </dependency>
 
         <dependency>
@@ -140,25 +128,21 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>${test.containers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>kafka</artifactId>
-            <version>${test.containers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${test.containers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-jupiter-engine.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index 7f0863ed3b5..3c898b4fcf4 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -21,12 +21,10 @@
                 <dependency>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-webflux</artifactId>
-                    <version>${spring-boot.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-validation</artifactId>
-                    <version>${spring-boot.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>io.swagger</groupId>
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 54a41c56ca3..12a702a76a5 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -12,27 +12,22 @@
     <artifactId>kafka-ui-e2e-checks</artifactId>
     <properties>
         <kafka-ui-contract>${project.version}</kafka-ui-contract>
-        <junit.version>5.8.2</junit.version>
         <aspectj.version>1.9.8</aspectj.version>
         <allure.version>2.18.1</allure.version>
         <json-smart.version>2.4.8</json-smart.version>
-        <testcontainers.version>1.17.2</testcontainers.version>
         <selenide.version>6.6.3</selenide.version>
         <assertj.version>3.23.1</assertj.version>
         <google.auto-service.version>1.0.1</google.auto-service.version>
         <hamcrest.version>2.2</hamcrest.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <testcontainers.junit-jupiter.version>1.17.2</testcontainers.junit-jupiter.version>
         <allure.java-commons.version>2.18.1</allure.java-commons.version>
         <dotenv.version>2.2.4</dotenv.version>
-        <junit.platform-launcher.version>1.8.2</junit.platform-launcher.version>
         <allure.maven-plugin.version>2.6</allure.maven-plugin.version>
         <ashot.version>1.5.4</ashot.version>
         <allure.screendiff-plugin.version>2.18.1</allure.screendiff-plugin.version>
         <maven.surefire-plugin.version>2.22.2</maven.surefire-plugin.version>
         <allure-maven.version>2.10.0</allure-maven.version>
-        <kafka.version>3.0.0</kafka.version>
-        <netty.version>4.1.84.Final</netty.version>
+        <kafka.version>3.3.1</kafka.version>
         <qase.io.version>2.1.3</qase.io.version>
     </properties>
 
@@ -89,54 +84,44 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-resolver</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-unix-common</artifactId>
-            <version>${netty.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-resolver-dns-native-macos</artifactId>
-            <version>${netty.version}</version>
             <classifier>osx-aarch_64</classifier>
         </dependency>
 
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>${testcontainers.version}</version>
         </dependency>
 
         <dependency>
@@ -199,7 +184,6 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${testcontainers.junit-jupiter.version}</version>
         </dependency>
         <dependency>
             <groupId>io.qameta.allure</groupId>
@@ -214,7 +198,6 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>${junit.platform-launcher.version}</version>
         </dependency>
         <dependency>
             <groupId>ru.yandex.qatools.allure</groupId>
@@ -245,7 +228,6 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>selenium</artifactId>
-            <version>${testcontainers.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/kafka-ui-serde-api/pom.xml b/kafka-ui-serde-api/pom.xml
index 3b2b9f55fa9..b9aca207e58 100644
--- a/kafka-ui-serde-api/pom.xml
+++ b/kafka-ui-serde-api/pom.xml
@@ -13,10 +13,12 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
                 <version>2.5.2</version>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.0.2</version>
             </plugin>
diff --git a/pom.xml b/pom.xml
index ecb707e1da0..32bb407fff0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,41 +14,54 @@
         <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-boot.version>2.7.5</spring-boot.version>
-        <jackson-databind-nullable.version>0.2.2</jackson-databind-nullable.version>
-        <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
-        <org.projectlombok.version>1.18.20</org.projectlombok.version>
-        <org.projectlombok.e2e-checks.version>1.18.20</org.projectlombok.e2e-checks.version>
+        <frontend-generated-sources-directory>..//kafka-ui-react-app/src/generated-sources
+        </frontend-generated-sources-directory>
+        <sonar.organization>provectus</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <git.revision>latest</git.revision>
-        <kafka-clients.version>3.2.0</kafka-clients.version>
+
+        <!-- Dependency versions -->
+        <antlr4-maven-plugin.version>4.7.1</antlr4-maven-plugin.version>
+        <apache.commons.version>2.11.1</apache.commons.version>
+        <assertj.version>3.19.0</assertj.version>
+        <avro.version>1.11.1</avro.version>
+        <byte-buddy.version>1.12.18</byte-buddy.version>
+        <confluent.version>7.3.0</confluent.version>
+        <datasketches-java.version>3.1.0</datasketches-java.version>
+        <groovy.version>3.0.13</groovy.version>
+        <jackson-databind-nullable.version>0.2.4</jackson-databind-nullable.version>
+        <jackson.version>2.14.0</jackson.version>
+        <kafka-clients.version>3.3.1</kafka-clients.version>
+        <netty.version>4.1.85.Final</netty.version>
+        <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
+        <org.projectlombok.version>1.18.24</org.projectlombok.version>
+        <protobuf-java.version>3.21.9</protobuf-java.version>
+        <reactor-netty.version>1.1.0</reactor-netty.version>
+        <scala-lang.library.version>2.13.9</scala-lang.library.version>
+        <snakeyaml.version>1.33</snakeyaml.version>
+        <spring-boot.version>2.7.5</spring-boot.version>
+        <spring-security.version>5.7.5</spring-security.version>
+
+        <!-- Test dependency versions -->
+        <junit.version>5.9.1</junit.version>
+        <mockito.version>4.8.1</mockito.version>
+        <okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>
+        <testcontainers.version>1.17.5</testcontainers.version>
+
+        <!-- Frontend dependency versions -->
         <node.version>v16.15.0</node.version>
         <pnpm.version>v7.4.0</pnpm.version>
+
+        <!-- Plugin versions -->
         <fabric8-maven-plugin.version>0.40.2</fabric8-maven-plugin.version>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
-        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <openapi-generator-maven-plugin.version>4.3.0</openapi-generator-maven-plugin.version>
-        <swagger-annotations.version>1.6.0</swagger-annotations.version>
         <springdoc-openapi-webflux-ui.version>1.2.32</springdoc-openapi-webflux-ui.version>
-        <avro.version>1.11.0</avro.version>
-        <confluent.version>7.3.0</confluent.version>
-        <apache.commons.version>2.11.1</apache.commons.version>
-        <test.containers.version>1.17.1</test.containers.version>
-        <okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>
-        <junit-jupiter-engine.version>5.7.2</junit-jupiter-engine.version>
-        <mockito.version>4.8.1</mockito.version>
-        <byte-buddy.version>1.12.18</byte-buddy.version>
-        <assertj.version>3.19.0</assertj.version>
-        <antlr4-maven-plugin.version>4.7.1</antlr4-maven-plugin.version>
-        <groovy.version>3.0.13</groovy.version>
-        <datasketches-java.version>3.1.0</datasketches-java.version>
-
-        <frontend-generated-sources-directory>..//kafka-ui-react-app/src/generated-sources
-        </frontend-generated-sources-directory>
-        <sonar.organization>provectus</sonar.organization>
-        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <swagger-annotations.version>1.6.0</swagger-annotations.version>
     </properties>
 
     <repositories>
@@ -86,6 +99,73 @@
         </pluginRepository>
     </pluginRepositories>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-bom</artifactId>
+                <version>${spring-security.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>${netty.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-library</artifactId>
+                <version>${scala-lang.library.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf-java.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.projectreactor.netty</groupId>
+                <artifactId>reactor-netty-http</artifactId>
+                <version>${reactor-netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <pluginManagement>
             <plugins>

From 5900f8e957f2abf078bb6db4552b186a9e21a0b5 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 15 Nov 2022 16:05:06 +0400
Subject: [PATCH 290/734] Snappy native impl fix (#2940)

* wip

* wip

* wip

* wip

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 kafka-ui-api/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-api/Dockerfile b/kafka-ui-api/Dockerfile
index c0c68ff0041..96e0eb414b1 100644
--- a/kafka-ui-api/Dockerfile
+++ b/kafka-ui-api/Dockerfile
@@ -1,5 +1,6 @@
 FROM azul/zulu-openjdk-alpine:17
 
+RUN apk add --no-cache gcompat # need to make snappy codec work
 RUN addgroup -S kafkaui && adduser -S kafkaui -G kafkaui
 
 USER kafkaui

From 7fcbf7507b3ebbd9259b538ba291d76d0f2b8a5f Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Wed, 16 Nov 2022 19:36:27 +0400
Subject: [PATCH 291/734] Changed Topic messages 'save as a file ' also changed
 test case (#2873)

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
---
 .../lib/hooks/__tests__/useDataSaver.spec.tsx | 27 ++-----------------
 .../src/lib/hooks/useDataSaver.ts             | 20 +++++---------
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
index 510fb955455..f0631850e5c 100644
--- a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
@@ -15,30 +15,8 @@ describe('useDataSaver hook', () => {
 
     afterAll(() => jest.useRealTimers());
 
-    it('downloads json file', () => {
-      const link: HTMLAnchorElement = document.createElement('a');
-      link.click = jest.fn();
-
-      const mockCreate = jest
-        .spyOn(document, 'createElement')
-        .mockImplementation(() => link);
-
-      const HookWrapper: React.FC = () => {
-        const { saveFile } = useDataSaver('message', content);
-        useEffect(() => saveFile(), [saveFile]);
-        return null;
-      };
-
-      render(<HookWrapper />);
-      expect(mockCreate).toHaveBeenCalledTimes(2);
-      expect(link.download).toEqual('message_1616581196000.json');
-      expect(link.href).toEqual(`data:text/json;charset=utf-8,${content}`);
-      expect(link.click).toHaveBeenCalledTimes(1);
-
-      mockCreate.mockRestore();
-    });
-
     it('downloads txt file', () => {
+      global.URL.createObjectURL = jest.fn();
       const link: HTMLAnchorElement = document.createElement('a');
       link.click = jest.fn();
 
@@ -54,8 +32,7 @@ describe('useDataSaver hook', () => {
 
       render(<HookWrapper />);
       expect(mockCreate).toHaveBeenCalledTimes(2);
-      expect(link.download).toEqual('message_1616581196000.txt');
-      expect(link.href).toEqual(`data:text/json;charset=utf-8,content`);
+      expect(link.download).toEqual('message');
       expect(link.click).toHaveBeenCalledTimes(1);
 
       mockCreate.mockRestore();
diff --git a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
index 6dba2700be8..d1ff61386dc 100644
--- a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
@@ -1,4 +1,3 @@
-import isObject from 'lodash/isObject';
 import { showSuccessAlert } from 'lib/errorHandling';
 
 const useDataSaver = (
@@ -17,19 +16,14 @@ const useDataSaver = (
       });
     }
   };
-
   const saveFile = () => {
-    const extension = isObject(data) ? 'json' : 'txt';
-    const dataStr = `data:text/json;charset=utf-8,${data}`;
-    const downloadAnchorNode = document.createElement('a');
-    downloadAnchorNode.setAttribute('href', dataStr);
-    downloadAnchorNode.setAttribute(
-      'download',
-      `${subject}_${new Date().getTime()}.${extension}`
-    );
-    document.body.appendChild(downloadAnchorNode);
-    downloadAnchorNode.click();
-    downloadAnchorNode.remove();
+    const blob = new Blob([data as BlobPart], { type: 'text/json' });
+    const elem = window.document.createElement('a');
+    elem.href = window.URL.createObjectURL(blob);
+    elem.download = subject;
+    document.body.appendChild(elem);
+    elem.click();
+    document.body.removeChild(elem);
   };
 
   return { copyToClipboard, saveFile };

From 8bb9f6365823ed8ad181f68ec3a37e6652c4e39e Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Thu, 17 Nov 2022 19:17:28 +0800
Subject: [PATCH 292/734] Seek type field became empty with refreshing the page
 (#2863)

* Seek type field became empty with refreshing the page (#2857)

* Seek type field became empty with refreshing the page (#2857)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../components/Topics/Topic/Messages/Filters/Filters.tsx    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index c010ca65cb5..1b99650f715 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -109,7 +109,11 @@ const Filters: React.FC<FiltersProps> = ({
   );
 
   const [currentSeekType, setCurrentSeekType] = React.useState<SeekType>(
-    (searchParams.get('seekType') as SeekType) || SeekType.OFFSET
+    SeekTypeOptions.find(
+      (ele) => ele.value === (searchParams.get('seekType') as SeekType)
+    ) !== undefined
+      ? (searchParams.get('seekType') as SeekType)
+      : SeekType.OFFSET
   );
   const [offset, setOffset] = React.useState<string>(
     getOffsetFromSeekToParam(searchParams)

From 93af20c46cacef03fbd06eceebe3a6caffda7b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Cort=C3=A9s=20L=C3=B3pez?=
 <joseacl@gmail.com>
Date: Fri, 18 Nov 2022 09:10:02 +0100
Subject: [PATCH 293/734] [helm] Allow Skip Certificates Verification in
 readiness and liveness probes (#2924)

* Allow Skip Certificates Verification in readiness and liveness probe

* Fixed chart version

* Allow Skip Certificates Verification in readiness and liveness probe

* Fixed chart version

* Rename of the variable use in values

* Allow Skip Certificates Verification in readiness and liveness probe

* Fixed chart version

* Rename of the variable use in values

* Fixed HTTPS scheme

Co-authored-by: Jose Antonio Cortes Lopez <jacortes@theworkshop.com>
---
 charts/kafka-ui/Chart.yaml                | 2 +-
 charts/kafka-ui/templates/deployment.yaml | 6 ++++++
 charts/kafka-ui/values.yaml               | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 1ecf0eeecea..2ae296b4ee6 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.4.5
+version: 0.4.6
 appVersion: v0.4.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index a253fc6df51..219e9b44061 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -87,6 +87,9 @@ spec:
               {{- $contextPath := .Values.envs.config.SERVER_SERVLET_CONTEXT_PATH | default "" | printf "%s/actuator/health" | urlParse }}
               path: {{ get $contextPath "path" }}
               port: http
+              {{- if .Values.probes.useHttpsScheme }}
+              scheme: HTTPS
+              {{- end }}
             initialDelaySeconds: 60
             periodSeconds: 30
             timeoutSeconds: 10
@@ -95,6 +98,9 @@ spec:
               {{- $contextPath := .Values.envs.config.SERVER_SERVLET_CONTEXT_PATH | default "" | printf "%s/actuator/health" | urlParse }}
               path: {{ get $contextPath "path" }}
               port: http
+              {{- if .Values.probes.useHttpsScheme }}
+              scheme: HTTPS
+              {{- end }}
             initialDelaySeconds: 60
             periodSeconds: 30
             timeoutSeconds: 10
diff --git a/charts/kafka-ui/values.yaml b/charts/kafka-ui/values.yaml
index 35e3ad3dd59..dce32059e14 100644
--- a/charts/kafka-ui/values.yaml
+++ b/charts/kafka-ui/values.yaml
@@ -73,6 +73,11 @@ podLabels: {}
 ##
 annotations: {}
 
+## Set field schema as HTTPS for readines and liveness probe
+##
+probes:
+  useHttpsScheme: false
+
 podSecurityContext:
   {}
   # fsGroup: 2000

From d1013b69dadf9b5ff5037f3ab450b22bb11213cf Mon Sep 17 00:00:00 2001
From: Anton Mnykh <44034169+Redbutton18@users.noreply.github.com>
Date: Mon, 21 Nov 2022 13:44:22 +0200
Subject: [PATCH 294/734] [e2e] Checking Filter adding within
 Topics/Topic/Messages with filled required fields (#2939)

* soft assertion method refactored

* getFilterName() method refactored

* soft assertions refactoring

* add softAssertions

* add softAssertions

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../kafka/ui/pages/topic/TopicDetails.java    | 96 +++++++++++++++----
 .../kafka/ui/pages/topic/TopicsList.java      |  2 +-
 .../kafka/ui/utilities/WebUtils.java          | 12 +++
 ...opicActionsTests.java => TopicsTests.java} | 63 ++++++++++--
 4 files changed, 146 insertions(+), 27 deletions(-)
 rename kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/{TopicActionsTests.java => TopicsTests.java} (80%)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 9ac485c26b7..e968d4f9372 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -13,6 +13,7 @@
 import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
@@ -24,6 +25,14 @@ public class TopicDetails extends BasePage {
   protected SelenideElement messageAmountCell = $x("//tbody/tr/td[5]");
   protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
   protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
+  protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
+  protected SelenideElement savedFiltersField = $x("//div[text()='Saved Filters']");
+  protected SelenideElement addFilterCodeModalTitle = $x("//label[text()='Filter code']");
+  protected SelenideElement addFilterCodeInput = $x("//div[@id='ace-editor']//textarea");
+  protected SelenideElement saveThisFilterCheckBoxAddFilterMdl = $x("//input[@name='saveFilter']");
+  protected SelenideElement displayNameInputAddFilterMdl = $x("//input[@placeholder='Enter Name']");
+  protected SelenideElement cancelBtnAddFilterMdl = $x("//button[text()='Cancel']");
+  protected SelenideElement addFilterBtnAddFilterMdl = $x("//button[text()='Add filter']");
   protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
   protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
   protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
@@ -34,6 +43,7 @@ public class TopicDetails extends BasePage {
   protected ElementsCollection messageGridItems = $$x("//tbody//tr");
   protected String consumerIdLocator = "//a[@title='%s']";
   protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
+  protected String filterNameLocator = "//*[@data-testid='activeSmartFilter']";
 
   @Step
   public TopicDetails waitUntilScreenReady() {
@@ -106,6 +116,58 @@ public TopicDetails clickProduceMessageBtn() {
     return this;
   }
 
+  @Step
+  public TopicDetails clickMessagesAddFiltersBtn() {
+    addFiltersBtn.shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public TopicDetails waitUntilAddFiltersMdlVisible() {
+    addFilterCodeModalTitle.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickAddFilterBtnAddFilterMdl() {
+    addFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
+    addFilterCodeModalTitle.shouldBe(Condition.hidden);
+    return this;
+  }
+
+  @Step
+  public TopicDetails setFilterCodeFieldAddFilterMdl(String filterCode) {
+    addFilterCodeInput.shouldBe(Condition.enabled).sendKeys(filterCode);
+    return this;
+  }
+
+  @Step
+  public boolean isSaveThisFilterCheckBoxSelected() {
+    return isSelected(saveThisFilterCheckBoxAddFilterMdl);
+  }
+
+  @Step
+  public boolean isAddFilterBtnAddFilterMdlEnabled() {
+    return isEnabled(addFilterBtnAddFilterMdl);
+  }
+
+  @Step
+  public String getFilterName() {
+    return $x(filterNameLocator).getText();
+  }
+
+  public List<SelenideElement> getAllAddFilterModalVisibleElements() {
+    return Arrays.asList(savedFiltersField, displayNameInputAddFilterMdl, addFilterBtnAddFilterMdl, cancelBtnAddFilterMdl);
+  }
+
+  public List<SelenideElement> getAllAddFilterModalEnabledElements() {
+    return Arrays.asList(displayNameInputAddFilterMdl, cancelBtnAddFilterMdl);
+  }
+
+  public List<SelenideElement> getAllAddFilterModalDisabledElements() {
+    return Arrays.asList(addFilterBtnAddFilterMdl);
+  }
+
   @Step
   public TopicDetails openConsumerGroup(String consumerId) {
     $x(String.format(consumerIdLocator, consumerId)).click();
@@ -146,6 +208,23 @@ public TopicDetails.MessageGridItem getRandomMessage() {
     return getMessage(nextInt(initItems().size() - 1));
   }
 
+  public enum TopicMenu {
+    OVERVIEW("Overview"),
+    MESSAGES("Messages"),
+    CONSUMERS("Consumers"),
+    SETTINGS("Settings");
+
+    private final String value;
+
+    TopicMenu(String value) {
+      this.value = value;
+    }
+
+    public String toString() {
+      return value;
+    }
+  }
+
   public static class MessageGridItem extends BasePage {
 
     private final SelenideElement element;
@@ -211,21 +290,4 @@ public MessageGridItem clickSaveAsFile() {
       return this;
     }
   }
-
-  public enum TopicMenu {
-    OVERVIEW("Overview"),
-    MESSAGES("Messages"),
-    CONSUMERS("Consumers"),
-    SETTINGS("Settings");
-
-    private final String value;
-
-    TopicMenu(String value) {
-      this.value = value;
-    }
-
-    public String toString() {
-      return value;
-    }
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 4ce2721d6fd..dcda2ce4dff 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -17,7 +17,7 @@
 @ExtensionMethod(WaitUtils.class)
 public class TopicsList extends BasePage {
 
-    protected SelenideElement topicListHeader = $x("//h1[text()='Topics']");
+    protected SelenideElement topicListHeader = $x("//*[text()='Topics']");
     protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
     protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
     protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index 35a0a06f7a5..3ba6d053ecd 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -57,4 +57,16 @@ public static boolean isEnabled(SelenideElement element) {
     }
     return isEnabled;
   }
+
+  public static boolean isSelected(SelenideElement element) {
+    log.debug("\nisSelected: {}", element.getSearchCriteria());
+    boolean isSelected = false;
+    try {
+      element.shouldBe(Condition.selected);
+      isSelected = true;
+    } catch (Throwable e) {
+      log.debug("{} is not selected", element.getSearchCriteria());
+    }
+    return isSelected;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicActionsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
similarity index 80%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicActionsTests.java
rename to kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 3bc6dc07b4a..c342a216074 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicActionsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -31,11 +31,11 @@
 import org.junit.jupiter.api.TestInstance;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class TopicActionsTests extends BaseTest {
+public class TopicsTests extends BaseTest {
   private static final long SUITE_ID = 2;
   private static final String SUITE_TITLE = "Topics";
   private static final Topic TOPIC_TO_CREATE = new Topic()
-      .setName("new-topic-"+ randomAlphabetic(5))
+      .setName("new-topic-" + randomAlphabetic(5))
       .setPartitions("1")
       .setCustomParameterType(COMPRESSION_TYPE)
       .setCustomParameterValue("producer")
@@ -83,8 +83,10 @@ public void createTopic() {
         .waitUntilScreenReady()
         .openTopic(TOPIC_TO_CREATE.getName());
     SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName())).as("isTopicHeaderVisible()").isTrue();
-    softly.assertThat(topicDetails.getCleanUpPolicy()).as("getCleanUpPolicy()").isEqualTo(TOPIC_TO_CREATE.getCleanupPolicyValue().toString());
+    softly.assertThat(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName())).as("isTopicHeaderVisible()")
+        .isTrue();
+    softly.assertThat(topicDetails.getCleanUpPolicy()).as("getCleanUpPolicy()")
+        .isEqualTo(TOPIC_TO_CREATE.getCleanupPolicyValue().toString());
     softly.assertThat(topicDetails.getPartitions()).as("getPartitions()").isEqualTo(TOPIC_TO_CREATE.getPartitions());
     softly.assertAll();
     naviSideBar
@@ -132,10 +134,14 @@ public void updateTopic() {
         .openDotMenu()
         .clickEditSettingsMenu();
     SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()").isEqualTo(TOPIC_FOR_UPDATE.getCleanupPolicyValue().getVisibleText());
-    softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()").isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
-    softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()").isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk().getVisibleText());
-    softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()").isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
+    softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()")
+        .isEqualTo(TOPIC_FOR_UPDATE.getCleanupPolicyValue().getVisibleText());
+    softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()")
+        .isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
+    softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()")
+        .isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk().getVisibleText());
+    softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()")
+        .isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
     softly.assertAll();
   }
 
@@ -237,7 +243,7 @@ void checkCustomParametersWithinCreateNewTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(2)
   @Test
-  void checkTopicListElements(){
+  void checkTopicListElements() {
     naviSideBar
         .openSideMenu(TOPICS);
     topicsList
@@ -252,6 +258,45 @@ void checkTopicListElements(){
     softly.assertAll();
   }
 
+  @DisplayName("Filter adding within Topic")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(12)
+  @Test
+  void addingNewFilterWithinTopic() {
+    String topicName = "_schemas";
+    String filterName = "123ABC";
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(topicName);
+    topicDetails
+        .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
+        .clickMessagesAddFiltersBtn()
+        .waitUntilAddFiltersMdlVisible();
+    SoftAssertions softly = new SoftAssertions();
+    topicDetails.getAllAddFilterModalVisibleElements().forEach(element ->
+        softly.assertThat(element.is(Condition.visible))
+            .as(element.getSearchCriteria() + " isVisible()").isTrue());
+    topicDetails.getAllAddFilterModalEnabledElements().forEach(element ->
+        softly.assertThat(element.is(Condition.enabled))
+            .as(element.getSearchCriteria() + " isEnabled()").isTrue());
+    topicDetails.getAllAddFilterModalDisabledElements().forEach(element ->
+        softly.assertThat(element.is(Condition.enabled))
+            .as(element.getSearchCriteria() + " isEnabled()").isFalse());
+    softly.assertThat(topicDetails.isSaveThisFilterCheckBoxSelected()).as("isSaveThisFilterCheckBoxSelected()")
+        .isFalse();
+    softly.assertAll();
+    topicDetails
+        .setFilterCodeFieldAddFilterMdl(filterName);
+    assertThat(topicDetails.isAddFilterBtnAddFilterMdlEnabled()).as("isMessagesAddFilterTabAddFilterBtnEnabled()")
+        .isTrue();
+    topicDetails.clickAddFilterBtnAddFilterMdl();
+    assertThat(topicDetails.getFilterName()).as("isFilterNameVisible(filterName)")
+        .isEqualTo(filterName);
+  }
+
   @AfterAll
   public void afterAll() {
     TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));

From 9457d5ff2b7346d4dfd815a6bfcbb7612cab9acd Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Mon, 21 Nov 2022 14:02:10 +0200
Subject: [PATCH 295/734] Issue/copy checking compare versions operation for
 schema (#2951)

* resolve conversation

* Refactored assetions in SchemasTests -> compareVersionOperation

* Rename method selectFirstVersionFromDropDown

* last changes

* resolve conversations

* resolve conversations

* rename elementLocatorDdl to ddlElementLocator

* Resolve conversation

* Resolve conversation

* Resolved

* Resolved conversation

* Resolved conversation

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../provectus/kafka/ui/pages/BasePage.java    |  2 +-
 .../ui/pages/brokers/BrokersDetails.java      |  4 +-
 .../ui/pages/connector/KafkaConnectList.java  |  3 -
 .../ui/pages/schema/SchemaCreateForm.java     | 33 +++++++++-
 .../kafka/ui/pages/schema/SchemaDetails.java  | 17 +++++-
 .../kafka/ui/pages/topic/TopicDetails.java    |  3 -
 .../kafka/ui/pages/topic/TopicsList.java      |  7 +--
 .../kafka/ui/utilities/WaitUtils.java         | 31 ----------
 .../kafka/ui/suite/schemas/SchemasTests.java  | 61 +++++++++++++------
 9 files changed, 94 insertions(+), 67 deletions(-)
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WaitUtils.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index de733b668f9..069b1b41dda 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -18,7 +18,7 @@ public abstract class BasePage extends WebUtils {
   protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
   protected String summaryCellLocator = "//div[contains(text(),'%s')]";
   protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
-  protected String сolumnHeaderLocator = "//table//tr/th/div[text()='%s']";
+  protected String columnHeaderLocator = "//table//tr/th/div[text()='%s']";
 
   protected void waitUntilSpinnerDisappear() {
     log.debug("\nwaitUntilSpinnerDisappear");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
index 8ae28c0944e..77fc9e0b41c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
@@ -26,13 +26,13 @@ public BrokersDetails waitUntilScreenReady() {
 
   private List<SelenideElement> getVisibleColumnHeaders() {
     return Stream.of("Name", "Topics", "Error", "Partitions")
-        .map(name -> $x(String.format(сolumnHeaderLocator, name)))
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
         .collect(Collectors.toList());
   }
 
   private List<SelenideElement> getEnabledColumnHeaders() {
     return Stream.of("Name", "Error")
-        .map(name -> $x(String.format(сolumnHeaderLocator, name)))
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
         .collect(Collectors.toList());
   }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
index 316178d1d22..b86734b2dc6 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
@@ -5,12 +5,9 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
-import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
-import lombok.experimental.ExtensionMethod;
 
 
-@ExtensionMethod(WaitUtils.class)
 public class KafkaConnectList extends BasePage {
 
     protected SelenideElement createConnectorBtn = $x("//button[contains(text(),'Create Connector')]");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
index ec6455fcfa2..7d0d5c58a93 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.pages.schema;
 
 import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
 
 import com.codeborne.selenide.Condition;
@@ -9,6 +10,7 @@
 import com.provectus.kafka.ui.api.model.SchemaType;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+import java.util.List;
 
 public class SchemaCreateForm extends BasePage {
 
@@ -19,7 +21,10 @@ public class SchemaCreateForm extends BasePage {
     protected SelenideElement schemaTypeDdl = $x("//ul[@name='schemaType']");
     protected SelenideElement compatibilityLevelList = $x("//ul[@name='compatibilityLevel']");
     protected SelenideElement newSchemaTextArea = $x("//div[@id='newSchema']");
-    protected String elementLocatorDdl = "//li[@value='%s']";
+    protected SelenideElement schemaVersionDdl = $$x("//ul[@role='listbox']/li[text()='Version 2']").first();
+    protected List<SelenideElement> visibleMarkers = $$x("//div[@class='ace_scroller']//div[contains(@class,'codeMarker')]");
+    protected List<SelenideElement> elementsCompareVersionDdl = $$x("//ul[@role='listbox']/ul/li");
+    protected String ddlElementLocator = "//li[@value='%s']";
 
     @Step
     public SchemaCreateForm waitUntilScreenReady(){
@@ -43,7 +48,7 @@ public SchemaCreateForm setSchemaField(String text) {
     @Step
     public SchemaCreateForm selectSchemaTypeFromDropdown(SchemaType schemaType) {
         schemaTypeDdl.shouldBe(Condition.enabled).click();
-        $x(String.format(elementLocatorDdl, schemaType.getValue())).shouldBe(Condition.visible).click();
+        $x(String.format(ddlElementLocator, schemaType.getValue())).shouldBe(Condition.visible).click();
         return this;
     }
 
@@ -56,10 +61,32 @@ public SchemaCreateForm clickSubmitButton() {
     @Step
     public SchemaCreateForm selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum level) {
         compatibilityLevelList.shouldBe(Condition.enabled).click();
-        $x(String.format(elementLocatorDdl, level.getValue())).shouldBe(Condition.visible).click();
+        $x(String.format(ddlElementLocator, level.getValue())).shouldBe(Condition.visible).click();
         return this;
     }
 
+    @Step
+    public SchemaCreateForm openSchemaVersionDdl(){
+      schemaVersionDdl.shouldBe(Condition.enabled).click();
+      return this;
+    }
+
+    @Step
+    public int getVersionsNumberFromList(){
+      return elementsCompareVersionDdl.size();
+    }
+
+    @Step
+    public SchemaCreateForm selectVersionFromDropDown(int versionNumberDd){
+      $x(String.format(ddlElementLocator,versionNumberDd)).shouldBe(Condition.visible).click();
+      return this;
+    }
+
+    @Step
+    public int getMarkedLinesNumber(){
+      return visibleMarkers.size();
+    }
+
     @Step
     public SchemaCreateForm setNewSchemaValue(String configJson) {
         newSchemaTextArea.shouldBe(Condition.visible).click();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
index b9808d05405..ce211337099 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
@@ -14,7 +14,9 @@ public class SchemaDetails extends BasePage {
     protected SelenideElement editSchemaBtn = $x("//button[contains(text(),'Edit Schema')]");
     protected SelenideElement removeBtn = $x("//*[contains(text(),'Remove')]");
     protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
-    protected SelenideElement schemaTypeDdl = $x("//h4[contains(text(),'Type')]/../p");
+    protected SelenideElement schemaTypeField = $x("//h4[contains(text(),'Type')]/../p");
+    protected SelenideElement latestVersionField = $x("//h4[contains(text(),'Latest version')]/../p");
+    protected SelenideElement compareVersionBtn = $x("//button[text()='Compare Versions']");
     protected String schemaHeaderLocator = "//h1[contains(text(),'%s')]";
 
     @Step
@@ -34,9 +36,14 @@ public boolean isSchemaHeaderVisible(String schemaName) {
         return isVisible($x(String.format(schemaHeaderLocator,schemaName)));
     }
 
+    @Step
+    public int getLatestVersion(){
+      return Integer.parseInt(latestVersionField.getText());
+    }
+
     @Step
     public String getSchemaType() {
-        return schemaTypeDdl.getText();
+        return schemaTypeField.getText();
     }
 
     @Step
@@ -45,6 +52,12 @@ public SchemaDetails openEditSchema(){
         return this;
     }
 
+    @Step
+    public SchemaDetails openCompareVersionMenu(){
+      compareVersionBtn.shouldBe(Condition.enabled).click();
+      return this;
+    }
+
     @Step
     public SchemaDetails removeSchema() {
         clickByJavaScript(dotMenuBtn);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index e968d4f9372..95c3e6fb23f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -10,15 +10,12 @@
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
-import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import lombok.experimental.ExtensionMethod;
 import org.openqa.selenium.By;
 
-@ExtensionMethod({WaitUtils.class})
 public class TopicDetails extends BasePage {
 
   protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index dcda2ce4dff..c32621bf1a5 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -5,16 +5,13 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
-import com.provectus.kafka.ui.utilities.WaitUtils;
 import io.qameta.allure.Step;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import lombok.experimental.ExtensionMethod;
 
-@ExtensionMethod(WaitUtils.class)
 public class TopicsList extends BasePage {
 
     protected SelenideElement topicListHeader = $x("//*[text()='Topics']");
@@ -56,13 +53,13 @@ private List<SelenideElement> getActionButtons() {
 
     private List<SelenideElement> getVisibleColumnHeaders() {
       return Stream.of("Replication Factor","Number of messages","Topic Name", "Partitions", "Out of sync replicas", "Size")
-          .map(name -> $x(String.format(сolumnHeaderLocator, name)))
+          .map(name -> $x(String.format(columnHeaderLocator, name)))
         .collect(Collectors.toList());
     }
 
     private List<SelenideElement> getEnabledColumnHeaders(){
       return Stream.of("Topic Name", "Partitions", "Out of sync replicas", "Size")
-          .map(name -> $x(String.format(сolumnHeaderLocator, name)))
+          .map(name -> $x(String.format(columnHeaderLocator, name)))
           .collect(Collectors.toList());
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WaitUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WaitUtils.java
deleted file mode 100644
index ec4ee223cb8..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WaitUtils.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.provectus.kafka.ui.utilities;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.SelenideElement;
-import org.junit.jupiter.api.Assertions;
-import org.openqa.selenium.By;
-
-import static com.codeborne.selenide.Selenide.*;
-import static com.codeborne.selenide.Selenide.$;
-
-public class WaitUtils {
-    public static void refreshUntil(By by, Condition condition) {
-        int i = 0;
-        do {
-            refresh();
-            i++;
-            sleep(2000);
-        } while ($$(by).size() < 1 && i != 20);
-        $(by).shouldBe(condition);
-    }
-
-    public static void waitForSelectedValue(SelenideElement element, String selectedValue) {
-        int i = 0;
-        do {
-            refresh();
-            i++;
-            sleep(2000);
-        } while (!selectedValue.equals(element.getSelectedValue()) && i != 60);
-        Assertions.assertEquals(selectedValue, element.getSelectedValue()) ;
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
index 553568795dd..398130bcd19 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
@@ -103,25 +103,52 @@ void updateSchemaAvro() {
         Assertions.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), schemaDetails.getCompatibility(), "getCompatibility()");
     }
 
+    @DisplayName("Checking Compare Versions operation for Schema")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(186)
+    @Test
+    @Order(3)
+    void compareVersionsOperation() {
+      naviSideBar
+          .openSideMenu(SCHEMA_REGISTRY);
+      schemaRegistryList
+          .waitUntilScreenReady()
+          .openSchema(AVRO_API.getName());
+      int latestVersion = schemaDetails
+          .waitUntilScreenReady()
+          .getLatestVersion();
+      schemaDetails
+          .openCompareVersionMenu();
+      int versionsNumberFromDdl = schemaCreateForm
+          .waitUntilScreenReady()
+          .openSchemaVersionDdl()
+          .getVersionsNumberFromList();
+      Assertions.assertEquals(latestVersion,versionsNumberFromDdl,"Versions number is not matched");
+      schemaCreateForm
+          .selectVersionFromDropDown(1);
+      Assertions.assertEquals(53, schemaCreateForm.getMarkedLinesNumber(), "getAllMarkedLines()");
+    }
+
     @DisplayName("should delete AVRO schema")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(187)
     @Test
-    @Order(3)
+    @Order(4)
     void deleteSchemaAvro() {
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
-        schemaRegistryList
-                .waitUntilScreenReady()
-                .openSchema(AVRO_API.getName());
-        schemaDetails
-                .waitUntilScreenReady()
-                .removeSchema();
-        schemaRegistryList
-                .waitUntilScreenReady();
-        Assertions.assertFalse(schemaRegistryList.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
-        SCHEMA_LIST.remove(AVRO_API);
+      naviSideBar
+          .openSideMenu(SCHEMA_REGISTRY);
+      schemaRegistryList
+          .waitUntilScreenReady()
+          .openSchema(AVRO_API.getName());
+      schemaDetails
+          .waitUntilScreenReady()
+          .removeSchema();
+      schemaRegistryList
+          .waitUntilScreenReady();
+      Assertions.assertFalse(schemaRegistryList.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
+      SCHEMA_LIST.remove(AVRO_API);
     }
 
     @DisplayName("should create JSON schema")
@@ -129,7 +156,7 @@ void deleteSchemaAvro() {
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(89)
     @Test
-    @Order(4)
+    @Order(5)
     void createSchemaJson() {
         Schema schemaJson = Schema.createSchemaJson();
         naviSideBar
@@ -162,7 +189,7 @@ void createSchemaJson() {
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(189)
     @Test
-    @Order(5)
+    @Order(6)
     void deleteSchemaJson() {
         naviSideBar
                 .openSideMenu(SCHEMA_REGISTRY);
@@ -183,7 +210,7 @@ void deleteSchemaJson() {
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(91)
     @Test
-    @Order(6)
+    @Order(7)
     void createSchemaProtobuf() {
         Schema schemaProtobuf = Schema.createSchemaProtobuf();
         naviSideBar
@@ -216,7 +243,7 @@ void createSchemaProtobuf() {
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(223)
     @Test
-    @Order(7)
+    @Order(8)
     void deleteSchemaProtobuf() {
         naviSideBar
                 .openSideMenu(SCHEMA_REGISTRY);

From 9256b741bee0d5f1aec7f2e98019019b6e6c1cd2 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 22 Nov 2022 16:40:34 +0400
Subject: [PATCH 296/734] fixed All warnings with Act function in testing
 library (#2910)

* fixed All warnings whit Act function in testing library

* added act functions as described in the testing library documentation

* removed 'return' from renderComponents

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../Schemas/New/__test__/New.spec.tsx         |  34 +++---
 .../Topics/List/__tests__/ListPage.spec.tsx   |   5 +-
 .../Topics/List/__tests__/TopicTable.spec.tsx |  28 ++---
 .../Topics/New/__test__/New.spec.tsx          |  63 ++++------
 .../DangerZone/__test__/DangerZone.spec.tsx   |  56 ++++-----
 .../Topics/Topic/Edit/__test__/Edit.spec.tsx  |  16 +--
 .../__tests__/AddEditFilterContainer.spec.tsx |  59 +++++----
 .../Filters/__tests__/AddFilter.spec.tsx      | 113 ++++++++----------
 .../Filters/__tests__/EditFilter.spec.tsx     |  19 ++-
 .../Filters/__tests__/FilterModal.spec.tsx    |   6 +-
 .../Filters/__tests__/Filters.spec.tsx        |  85 ++++++-------
 .../Filters/__tests__/SavedFilters.spec.tsx   |   5 +-
 .../Topic/Messages/__test__/Message.spec.tsx  |   5 +-
 .../Topics/__tests__/Topics.spec.tsx          |   5 +-
 14 files changed, 215 insertions(+), 284 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
index 961833ca0d6..0af62ba2ffe 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import New from 'components/Schemas/New/New';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterSchemaNewPath } from 'lib/paths';
-import { act, screen } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 const clusterName = 'local';
@@ -10,15 +10,17 @@ const subjectValue = 'subject';
 const schemaValue = 'schema';
 
 describe('New Component', () => {
-  beforeEach(async () => {
-    await render(
-      <WithRoute path={clusterSchemaNewPath()}>
-        <New />
-      </WithRoute>,
-      {
-        initialEntries: [clusterSchemaNewPath(clusterName)],
-      }
-    );
+  beforeEach(() => {
+    waitFor(() => {
+      render(
+        <WithRoute path={clusterSchemaNewPath()}>
+          <New />
+        </WithRoute>,
+        {
+          initialEntries: [clusterSchemaNewPath(clusterName)],
+        }
+      );
+    });
   });
 
   it('renders component', () => {
@@ -33,15 +35,9 @@ describe('New Component', () => {
     const schema = screen.getAllByRole('textbox')[1];
     const schemaTypeSelect = screen.getByRole('listbox');
 
-    await act(async () => {
-      await userEvent.type(subject, subjectValue);
-    });
-    await act(async () => {
-      await userEvent.type(schema, schemaValue);
-    });
-    await act(async () => {
-      await userEvent.selectOptions(schemaTypeSelect, ['AVRO']);
-    });
+    await userEvent.type(subject, subjectValue);
+    await userEvent.type(schema, schemaValue);
+    await userEvent.selectOptions(schemaTypeSelect, ['AVRO']);
 
     const submitBtn = screen.getByRole('button', { name: /Submit/i });
     expect(submitBtn).toBeEnabled();
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
index 455565824ac..72415dbebce 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
@@ -11,8 +11,8 @@ const clusterName = 'test-cluster';
 jest.mock('components/Topics/List/TopicTable', () => () => <>TopicTableMock</>);
 
 describe('ListPage Component', () => {
-  const renderComponent = () => {
-    return render(
+  const renderComponent = () =>
+    render(
       <ClusterContext.Provider
         value={{
           isReadOnly: false,
@@ -27,7 +27,6 @@ describe('ListPage Component', () => {
       </ClusterContext.Provider>,
       { initialEntries: [clusterTopicsPath(clusterName)] }
     );
-  };
 
   beforeEach(() => {
     renderComponent();
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
index 833b0825184..2dd3db4ad16 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, WithRoute } from 'lib/testHelpers';
-import { act, screen, waitFor, within } from '@testing-library/react';
+import { screen, within } from '@testing-library/react';
 import { CleanUpPolicy, TopicsResponse } from 'generated-sources';
 import { externalTopicPayload, topicsPayload } from 'lib/fixtures/topics';
 import ClusterContext from 'components/contexts/ClusterContext';
@@ -156,7 +156,7 @@ describe('TopicTable Components', () => {
           });
           it('handels delete button click', async () => {
             const button = getButtonByName('Delete selected topics');
-            await act(() => userEvent.click(button));
+            await userEvent.click(button);
             expect(
               screen.getByText(
                 'Are you sure you want to remove selected topics?'
@@ -165,14 +165,14 @@ describe('TopicTable Components', () => {
             const confirmBtn = getButtonByName('Confirm');
             expect(confirmBtn).toBeInTheDocument();
             expect(deleteTopicMock).not.toHaveBeenCalled();
-            await act(() => userEvent.click(confirmBtn));
+            await userEvent.click(confirmBtn);
             expect(deleteTopicMock).toHaveBeenCalledTimes(2);
             expect(screen.getAllByRole('checkbox')[1]).not.toBeChecked();
             expect(screen.getAllByRole('checkbox')[2]).not.toBeChecked();
           });
           it('handels purge messages button click', async () => {
             const button = getButtonByName('Purge messages of selected topics');
-            await act(() => userEvent.click(button));
+            await userEvent.click(button);
             expect(
               screen.getByText(
                 'Are you sure you want to purge messages of selected topics?'
@@ -181,7 +181,7 @@ describe('TopicTable Components', () => {
             const confirmBtn = getButtonByName('Confirm');
             expect(confirmBtn).toBeInTheDocument();
             expect(mockUnwrap).not.toHaveBeenCalled();
-            await act(() => userEvent.click(confirmBtn));
+            await userEvent.click(confirmBtn);
             expect(mockUnwrap).toHaveBeenCalledTimes(2);
             expect(screen.getAllByRole('checkbox')[1]).not.toBeChecked();
             expect(screen.getAllByRole('checkbox')[2]).not.toBeChecked();
@@ -205,7 +205,7 @@ describe('TopicTable Components', () => {
         expect(btns[1]).toBeDisabled();
       });
       it('renders action buttons', async () => {
-        renderComponent({ topics: topicsPayload, pageCount: 1 });
+        await renderComponent({ topics: topicsPayload, pageCount: 1 });
         expect(
           screen.getAllByRole('button', { name: 'Dropdown Toggle' }).length
         ).toEqual(2);
@@ -274,8 +274,8 @@ describe('TopicTable Components', () => {
           expect(
             screen.getByText('Are you sure want to clear topic messages?')
           ).toBeInTheDocument();
-          await act(() =>
-            userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+          await userEvent.click(
+            screen.getByRole('button', { name: 'Confirm' })
           );
           expect(mockUnwrap).toHaveBeenCalled();
         });
@@ -301,10 +301,10 @@ describe('TopicTable Components', () => {
           await expectDropdownExists();
           await userEvent.click(screen.getByText('Remove Topic'));
           expect(screen.getByText('Confirm the action')).toBeInTheDocument();
-          await waitFor(() =>
-            userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+          await userEvent.click(
+            screen.getByRole('button', { name: 'Confirm' })
           );
-          await waitFor(() => expect(deleteTopicMock).toHaveBeenCalled());
+          expect(deleteTopicMock).toHaveBeenCalled();
         });
       });
       describe('and recreate topic action', () => {
@@ -313,10 +313,10 @@ describe('TopicTable Components', () => {
           await expectDropdownExists();
           await userEvent.click(screen.getByText('Recreate Topic'));
           expect(screen.getByText('Confirm the action')).toBeInTheDocument();
-          await waitFor(() =>
-            userEvent.click(screen.getByRole('button', { name: 'Confirm' }))
+          await userEvent.click(
+            screen.getByRole('button', { name: 'Confirm' })
           );
-          await waitFor(() => expect(recreateTopicMock).toHaveBeenCalled());
+          expect(recreateTopicMock).toHaveBeenCalled();
         });
       });
     });
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index 70b66853079..fbdb1e3b44f 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -24,7 +24,7 @@ jest.mock('lib/hooks/api/topics', () => ({
   useCreateTopic: jest.fn(),
 }));
 
-const renderComponent = (path: string) => {
+const renderComponent = (path: string) =>
   render(
     <Routes>
       <Route path={clusterTopicNewPath()} element={<New />} />
@@ -33,7 +33,7 @@ const renderComponent = (path: string) => {
     </Routes>,
     { initialEntries: [path] }
   );
-};
+
 const createTopicMock = jest.fn();
 
 describe('New', () => {
@@ -47,28 +47,21 @@ describe('New', () => {
   });
 
   it('checks header for create new', async () => {
-    await act(() => renderComponent(clusterTopicNewPath(clusterName)));
+    await act(() => {
+      renderComponent(clusterTopicNewPath(clusterName));
+    });
     expect(screen.getByRole('heading', { name: 'Create' })).toBeInTheDocument();
   });
 
-  it('checks header for copy', async () => {
-    await act(() =>
-      renderComponent(`${clusterTopicCopyPath(clusterName)}?name=test`)
-    );
+  it('checks header for copy', () => {
+    renderComponent(`${clusterTopicCopyPath(clusterName)}?name=test`);
     expect(screen.getByRole('heading', { name: 'Copy' })).toBeInTheDocument();
   });
 
   it('validates form', async () => {
-    await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    await waitFor(async () => {
-      await userEvent.type(
-        screen.getByPlaceholderText('Topic Name'),
-        topicName
-      );
-    });
-    await waitFor(async () => {
-      await userEvent.clear(screen.getByPlaceholderText('Topic Name'));
-    });
+    renderComponent(clusterTopicNewPath(clusterName));
+    await userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
+    await userEvent.clear(screen.getByPlaceholderText('Topic Name'));
     await waitFor(() => {
       expect(screen.getByText('name is a required field')).toBeInTheDocument();
     });
@@ -77,31 +70,21 @@ describe('New', () => {
   });
 
   it('validates form invalid name', async () => {
-    await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    await waitFor(() => {
-      userEvent.type(screen.getByPlaceholderText('Topic Name'), 'Invalid,Name');
-    });
-    await waitFor(() => {
-      expect(
-        screen.getByText('Only alphanumeric, _, -, and . allowed')
-      ).toBeInTheDocument();
-    });
+    renderComponent(clusterTopicNewPath(clusterName));
+    await userEvent.type(
+      screen.getByPlaceholderText('Topic Name'),
+      'Invalid,Name'
+    );
+    expect(
+      screen.getByText('Only alphanumeric, _, -, and . allowed')
+    ).toBeInTheDocument();
   });
 
   it('submits valid form', async () => {
-    await act(() => renderComponent(clusterTopicNewPath(clusterName)));
-    await act(async () => {
-      await userEvent.type(
-        screen.getByPlaceholderText('Topic Name'),
-        topicName
-      );
-    });
-    await act(async () => {
-      await userEvent.click(screen.getByText('Create topic'));
-    });
-    await waitFor(() => expect(createTopicMock).toHaveBeenCalledTimes(1));
-    await waitFor(() =>
-      expect(mockNavigate).toHaveBeenLastCalledWith(`../${topicName}`)
-    );
+    renderComponent(clusterTopicNewPath(clusterName));
+    await userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
+    await userEvent.click(screen.getByText('Create topic'));
+    expect(createTopicMock).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenLastCalledWith(`../${topicName}`);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
index 12961c4e344..b8d5d06dcab 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/__test__/DangerZone.spec.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import DangerZone, {
   DangerZoneProps,
 } from 'components/Topics/Topic/Edit/DangerZone/DangerZone';
-import { act, screen, waitFor, within } from '@testing-library/react';
+import { screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render, WithRoute } from 'lib/testHelpers';
 import {
@@ -52,7 +52,7 @@ const checkDialogThenPressCancel = async () => {
 };
 
 describe('DangerZone', () => {
-  it('renders the component', async () => {
+  it('renders the component', () => {
     renderComponent();
 
     const numberOfPartitionsEditForm = screen.getByRole('form', {
@@ -98,8 +98,8 @@ describe('DangerZone', () => {
     await userEvent.click(
       within(numberOfPartitionsEditForm).getByRole('button')
     );
-    await waitFor(() => expect(screen.getByRole('dialog')).toBeInTheDocument());
-    await waitFor(() => clickOnDialogSubmitButton());
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+    await clickOnDialogSubmitButton();
     expect(mockIncreaseTopicPartitionsCount).toHaveBeenCalledTimes(1);
   });
 
@@ -129,12 +129,10 @@ describe('DangerZone', () => {
       within(replicationFactorEditForm).getByRole('button')
     );
 
-    await waitFor(() => expect(screen.getByRole('dialog')).toBeInTheDocument());
-    await waitFor(() => clickOnDialogSubmitButton());
+    expect(screen.getByRole('dialog')).toBeInTheDocument();
+    await clickOnDialogSubmitButton();
 
-    await waitFor(() => {
-      expect(mockUpdateTopicReplicationFactor).toHaveBeenCalledTimes(1);
-    });
+    expect(mockUpdateTopicReplicationFactor).toHaveBeenCalledTimes(1);
   });
 
   it('should view the validation error when partition value is lower than the default passed or empty', async () => {
@@ -143,22 +141,20 @@ describe('DangerZone', () => {
     const partitionInputSubmitBtn = screen.getAllByText(/submit/i)[0];
     const value = (defaultPartitions - 4).toString();
     expect(partitionInputSubmitBtn).toBeDisabled();
-    await act(async () => {
-      await userEvent.clear(partitionInput);
-      await userEvent.type(partitionInput, value);
-    });
+
+    await userEvent.clear(partitionInput);
+    await userEvent.type(partitionInput, value);
+
     expect(partitionInput).toHaveValue(+value);
     expect(partitionInputSubmitBtn).toBeEnabled();
-    await act(async () => {
-      await userEvent.click(partitionInputSubmitBtn);
-    });
+
+    await userEvent.click(partitionInputSubmitBtn);
+
     expect(
       screen.getByText(/You can only increase the number of partitions!/i)
     ).toBeInTheDocument();
     await userEvent.clear(partitionInput);
-    await waitFor(() =>
-      expect(screen.getByText(/are required/i)).toBeInTheDocument()
-    );
+    expect(screen.getByText(/are required/i)).toBeInTheDocument();
   });
 
   it('should view the validation error when Replication Facto value is lower than the default passed or empty', async () => {
@@ -167,17 +163,13 @@ describe('DangerZone', () => {
       screen.getByPlaceholderText('Replication Factor');
     const replicatorFactorInputSubmitBtn = screen.getAllByText(/submit/i)[1];
 
-    await waitFor(() => userEvent.clear(replicatorFactorInput));
+    await userEvent.clear(replicatorFactorInput);
 
     expect(replicatorFactorInputSubmitBtn).toBeEnabled();
     await userEvent.click(replicatorFactorInputSubmitBtn);
-    await waitFor(() =>
-      expect(screen.getByText(/are required/i)).toBeInTheDocument()
-    );
+    expect(screen.getByText(/are required/i)).toBeInTheDocument();
     await userEvent.type(replicatorFactorInput, '1');
-    await waitFor(() =>
-      expect(screen.queryByText(/are required/i)).not.toBeInTheDocument()
-    );
+    expect(screen.queryByText(/are required/i)).not.toBeInTheDocument();
   });
 
   it('should close the partitions dialog if he cancel button is pressed', async () => {
@@ -186,10 +178,8 @@ describe('DangerZone', () => {
     const partitionInput = screen.getByPlaceholderText('Number of partitions');
     const partitionInputSubmitBtn = screen.getAllByText(/submit/i)[0];
 
-    await act(async () => {
-      await userEvent.type(partitionInput, '5');
-      await userEvent.click(partitionInputSubmitBtn);
-    });
+    await userEvent.type(partitionInput, '5');
+    await userEvent.click(partitionInputSubmitBtn);
 
     await checkDialogThenPressCancel();
   });
@@ -200,10 +190,8 @@ describe('DangerZone', () => {
       screen.getByPlaceholderText('Replication Factor');
     const replicatorFactorInputSubmitBtn = screen.getAllByText(/submit/i)[1];
 
-    await act(async () => {
-      await userEvent.type(replicatorFactorInput, '5');
-      await userEvent.click(replicatorFactorInputSubmitBtn);
-    });
+    await userEvent.type(replicatorFactorInput, '5');
+    await userEvent.click(replicatorFactorInputSubmitBtn);
 
     await checkDialogThenPressCancel();
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
index 592cd9419d0..1fe79f383ca 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import Edit from 'components/Topics/Topic/Edit/Edit';
-import { act, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
 import userEvent from '@testing-library/user-event';
 import { clusterTopicEditPath } from 'lib/paths';
@@ -39,7 +39,7 @@ const updateTopicMock = jest.fn();
 
 const renderComponent = () => {
   const path = clusterTopicEditPath(clusterName, topicName);
-  render(
+  return render(
     <WithRoute path={clusterTopicEditPath()}>
       <Edit />
     </WithRoute>,
@@ -48,7 +48,7 @@ const renderComponent = () => {
 };
 
 describe('Edit Component', () => {
-  beforeEach(async () => {
+  beforeEach(() => {
     (useTopicDetails as jest.Mock).mockImplementation(() => ({
       data: internalTopicPayload,
     }));
@@ -59,21 +59,21 @@ describe('Edit Component', () => {
       isLoading: false,
       mutateAsync: updateTopicMock,
     }));
-    await act(() => renderComponent());
+    renderComponent();
   });
 
-  it('renders DangerZone component', async () => {
+  it('renders DangerZone component', () => {
     expect(screen.getByText(`DangerZone`)).toBeInTheDocument();
   });
 
   it('submits form correctly', async () => {
-    await act(() => renderComponent());
+    renderComponent();
     const btn = screen.getAllByText(/Update topic/i)[0];
     const field = screen.getByRole('spinbutton', {
       name: 'Min In Sync Replicas * Min In Sync Replicas *',
     });
-    await act(() => userEvent.type(field, '1'));
-    await act(() => userEvent.click(btn));
+    await userEvent.type(field, '1');
+    await userEvent.click(btn);
     expect(updateTopicMock).toHaveBeenCalledTimes(1);
     expect(mockNavigate).toHaveBeenCalledWith('../');
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
index fbd73695cac..f3a64966684 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
@@ -15,30 +15,28 @@ describe('AddEditFilterContainer component', () => {
     code: 'mockCode',
   };
 
-  const renderComponent = async (
+  const renderComponent = (
     props: Partial<AddEditFilterContainerProps> = {}
   ) => {
-    await act(() => {
-      render(
-        <AddEditFilterContainer
-          cancelBtnHandler={jest.fn()}
-          submitBtnText={props.submitBtnText || defaultSubmitBtn}
-          {...props}
-        />
-      );
-    });
+    return render(
+      <AddEditFilterContainer
+        cancelBtnHandler={jest.fn()}
+        submitBtnText={props.submitBtnText || defaultSubmitBtn}
+        {...props}
+      />
+    );
   };
 
   describe('default Component Parameters', () => {
-    beforeEach(async () => {
-      await act(() => renderComponent());
-    });
-
-    it('should check the default Button text', () => {
+    it('should check the default Button text', async () => {
+      await act(() => {
+        renderComponent();
+      });
       expect(screen.getByText(defaultSubmitBtn)).toBeInTheDocument();
     });
 
     it('should check whether the submit Button is disabled when the form is pristine and disabled if dirty', async () => {
+      renderComponent();
       const submitButtonElem = screen.getByText(defaultSubmitBtn);
       expect(submitButtonElem).toBeDisabled();
 
@@ -60,6 +58,9 @@ describe('AddEditFilterContainer component', () => {
     });
 
     it('should view the error message after typing and clearing the input', async () => {
+      await act(() => {
+        renderComponent();
+      });
       const inputs = screen.getAllByRole('textbox');
       const user = userEvent.setup();
       const textAreaElement = inputs[0] as HTMLTextAreaElement;
@@ -77,12 +78,10 @@ describe('AddEditFilterContainer component', () => {
   });
 
   describe('Custom setup for the component', () => {
-    it('should render the input with default data if they are passed', async () => {
-      await act(() => {
-        renderComponent({
-          inputDisplayNameDefaultValue: mockData.name,
-          inputCodeDefaultValue: mockData.code,
-        });
+    it('should render the input with default data if they are passed', () => {
+      renderComponent({
+        inputDisplayNameDefaultValue: mockData.name,
+        inputCodeDefaultValue: mockData.code,
       });
       const inputs = screen.getAllByRole('textbox');
       const textAreaElement = inputs[0] as HTMLTextAreaElement;
@@ -93,11 +92,9 @@ describe('AddEditFilterContainer component', () => {
 
     it('should test whether the cancel callback is being called', async () => {
       const cancelCallback = jest.fn();
-      await act(() =>
-        renderComponent({
-          cancelBtnHandler: cancelCallback,
-        })
-      );
+      renderComponent({
+        cancelBtnHandler: cancelCallback,
+      });
       const cancelBtnElement = screen.getByText(/cancel/i);
 
       await userEvent.click(cancelBtnElement);
@@ -106,7 +103,7 @@ describe('AddEditFilterContainer component', () => {
 
     it('should test whether the submit Callback is being called', async () => {
       const submitCallback = jest.fn();
-      await act(() => renderComponent({ submitCallback }));
+      renderComponent({ submitCallback });
 
       const inputs = screen.getAllByRole('textbox');
 
@@ -125,7 +122,7 @@ describe('AddEditFilterContainer component', () => {
     });
 
     it('should display the checkbox if the props is passed and initially check state', async () => {
-      await act(() => renderComponent({ isAdd: true }));
+      renderComponent({ isAdd: true });
       const checkbox = screen.getByRole('checkbox');
       expect(checkbox).toBeInTheDocument();
       expect(checkbox).not.toBeChecked();
@@ -135,11 +132,11 @@ describe('AddEditFilterContainer component', () => {
 
     it('should pass and render the correct button text', async () => {
       const submitBtnText = 'submitBtnTextTest';
-      await act(() =>
+      await act(() => {
         renderComponent({
           submitBtnText,
-        })
-      );
+        });
+      });
       expect(screen.getByText(submitBtnText)).toBeInTheDocument();
     });
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
index 342d064251d..ca4b38a8cef 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
@@ -32,21 +32,22 @@ const renderComponent = (props: Partial<FilterModalProps> = {}) =>
 
 describe('AddFilter component', () => {
   describe('', () => {
-    beforeEach(() => {
-      renderComponent();
-    });
-
     it('should test click on Saved Filters redirects to Saved components', async () => {
+      renderComponent();
       await userEvent.click(screen.getByRole('savedFilterText'));
       expect(screen.getByText('Saved Filters')).toBeInTheDocument();
       expect(screen.getByRole('savedFilterText')).toBeInTheDocument();
     });
 
-    it('info button to be in the document', () => {
+    it('info button to be in the document', async () => {
+      await act(() => {
+        renderComponent();
+      });
       expect(screen.getByRole('button', { name: 'info' })).toBeInTheDocument();
     });
 
     it('renders InfoModal', async () => {
+      renderComponent();
       await userEvent.click(screen.getByRole('button', { name: 'info' }));
       expect(screen.getByRole('button', { name: 'Ok' })).toBeInTheDocument();
       expect(
@@ -55,19 +56,18 @@ describe('AddFilter component', () => {
     });
 
     it('should test click on return to custom filter redirects to Saved Filters', async () => {
+      await act(() => {
+        renderComponent();
+      });
       await userEvent.click(screen.getByRole('savedFilterText'));
-
       expect(screen.queryByText('Saved filters')).not.toBeInTheDocument();
       expect(screen.getByRole('savedFilterText')).toBeInTheDocument();
     });
   });
 
   describe('Add new filter', () => {
-    beforeEach(async () => {
-      renderComponent();
-    });
-
     it('adding new filter', async () => {
+      renderComponent();
       const codeValue = 'filter code';
       const nameValue = 'filter name';
       const textBoxes = screen.getAllByRole('textbox');
@@ -79,11 +79,9 @@ describe('AddFilter component', () => {
       expect(addFilterBtn).toBeDisabled();
       expect(screen.getByPlaceholderText('Enter Name')).toBeInTheDocument();
 
-      await act(async () => {
-        codeTextBox.focus();
-        await userEvent.paste(codeValue);
-        await userEvent.type(nameTextBox, nameValue);
-      });
+      codeTextBox.focus();
+      await userEvent.paste(codeValue);
+      await userEvent.type(nameTextBox, nameValue);
 
       expect(addFilterBtn).toBeEnabled();
       expect(codeTextBox.value).toEqual(`${codeValue}\n\n`);
@@ -91,6 +89,7 @@ describe('AddFilter component', () => {
     });
 
     it('should check unSaved filter without name', async () => {
+      renderComponent();
       const codeTextBox = screen.getAllByRole(
         'textbox'
       )[0] as HTMLTextAreaElement;
@@ -98,16 +97,16 @@ describe('AddFilter component', () => {
       const addFilterBtn = screen.getByRole('button', { name: /Add filter/i });
       expect(addFilterBtn).toBeDisabled();
       expect(screen.getByPlaceholderText('Enter Name')).toBeInTheDocument();
-      await act(async () => {
-        codeTextBox.focus();
-        await userEvent.paste(code);
-      });
+      codeTextBox.focus();
+      await userEvent.paste(code);
+      await userEvent.tab();
       expect(addFilterBtn).toBeEnabled();
       expect(codeTextBox).toHaveValue(`${code}\n\n`);
     });
 
     it('calls editFilter when edit button is clicked in saved filters', async () => {
       await act(() => {
+        renderComponent();
         renderComponent({ isSavedFiltersOpen: true });
       });
       await userEvent.click(screen.getByText('Saved Filters'));
@@ -132,14 +131,6 @@ describe('AddFilter component', () => {
     const longCodeValue = 'a long filter code';
     const nameValue = 'filter name';
 
-    beforeEach(async () => {
-      await renderComponent({
-        addFilter: addFilterMock,
-        activeFilterHandler: activeFilterHandlerMock,
-        toggleIsOpen: toggleModelMock,
-      });
-    });
-
     afterEach(() => {
       addFilterMock.mockClear();
       activeFilterHandlerMock.mockClear();
@@ -148,15 +139,18 @@ describe('AddFilter component', () => {
 
     describe('OnSubmit conditions with codeValue and nameValue in fields', () => {
       beforeEach(async () => {
+        renderComponent({
+          addFilter: addFilterMock,
+          activeFilterHandler: activeFilterHandlerMock,
+          toggleIsOpen: toggleModelMock,
+        });
         const textAreaElement = screen.getAllByRole(
           'textbox'
         )[0] as HTMLTextAreaElement;
         const input = screen.getAllByRole('textbox')[1];
-        await act(async () => {
-          textAreaElement.focus();
-          await userEvent.paste(codeValue);
-          await userEvent.type(input, nameValue);
-        });
+        textAreaElement.focus();
+        await userEvent.paste(codeValue);
+        await userEvent.type(input, nameValue);
       });
 
       it('OnSubmit condition with checkbox off functionality', async () => {
@@ -166,19 +160,15 @@ describe('AddFilter component', () => {
         });
         expect(addFilterBtn).toBeEnabled();
 
-        await act(async () => {
-          await userEvent.click(addFilterBtn);
-        });
+        await userEvent.click(addFilterBtn);
 
         expect(activeFilterHandlerMock).toHaveBeenCalled();
         expect(addFilterMock).not.toHaveBeenCalled();
       });
 
       it('OnSubmit condition with checkbox on functionality', async () => {
-        await act(async () => {
-          await userEvent.click(screen.getByRole('checkbox'));
-          await userEvent.click(screen.getAllByRole('button')[2]);
-        });
+        await userEvent.click(screen.getByRole('checkbox'));
+        await userEvent.click(screen.getAllByRole('button')[2]);
 
         expect(activeFilterHandlerMock).not.toHaveBeenCalled();
         expect(addFilterMock).toHaveBeenCalled();
@@ -195,15 +185,10 @@ describe('AddFilter component', () => {
           name: /Add filter/i,
         });
 
-        await act(async () => {
-          await userEvent.clear(nameTextBox);
-        });
-
+        await userEvent.clear(nameTextBox);
         expect(nameTextBox).toHaveValue('');
 
-        await act(async () => {
-          await userEvent.click(addFilterBtn);
-        });
+        await userEvent.click(addFilterBtn);
         expect(activeFilterHandlerMock).toHaveBeenCalledTimes(1);
 
         expect(activeFilterHandlerMock).toHaveBeenCalledWith(
@@ -215,27 +200,25 @@ describe('AddFilter component', () => {
           -1
         );
         // get reset-ed
+        await userEvent.clear(codeTextBox);
+
         expect(codeTextBox).toHaveValue(``);
         expect(toggleModelMock).toHaveBeenCalled();
-        codeTextBox.focus();
-        await act(async () => {
-          await userEvent.paste(codeValue);
-        });
+
+        await userEvent.type(codeTextBox, codeValue);
         expect(codeTextBox).toHaveValue(`${codeValue}\n\n`);
 
-        await act(async () => {
-          await userEvent.click(checkbox);
-        });
+        await userEvent.click(checkbox);
+        await userEvent.tab();
+
         expect(addFilterBtn).toBeDisabled();
 
-        await act(async () => {
-          await userEvent.type(nameTextBox, nameValue);
-        });
-        expect(nameTextBox).toHaveValue(nameValue);
+        await userEvent.paste(nameValue);
+        expect(nameTextBox).toHaveValue(`${nameValue}`);
+        await userEvent.tab();
+
         expect(addFilterBtn).toBeEnabled();
-        await act(async () => {
-          await userEvent.click(addFilterBtn);
-        });
+        await userEvent.click(addFilterBtn);
 
         expect(activeFilterHandlerMock).toHaveBeenCalledTimes(1);
         expect(addFilterMock).toHaveBeenCalledWith({
@@ -247,15 +230,19 @@ describe('AddFilter component', () => {
     });
 
     it('should use sliced code as the filter name if filter name is empty', async () => {
+      await act(() => {
+        renderComponent({
+          addFilter: addFilterMock,
+          activeFilterHandler: activeFilterHandlerMock,
+          toggleIsOpen: toggleModelMock,
+        });
+      });
       const codeTextBox = screen.getAllByRole(
         'textbox'
       )[0] as HTMLTextAreaElement;
       const nameTextBox = screen.getAllByRole('textbox')[1];
       const addFilterBtn = screen.getByRole('button', { name: /Add filter/i });
       act(() => {
-        // await userEvent.clear(nameTextBox);
-        // codeTextBox.focus();
-        // await userEvent.clear(codeTextBox);
         fireEvent.input(nameTextBox, {
           inputType: '',
         });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
index 212ecd8739f..f08a5d0c3d2 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
@@ -3,7 +3,7 @@ import EditFilter, {
   EditFilterProps,
 } from 'components/Topics/Topic/Messages/Filters/EditFilter';
 import { render } from 'lib/testHelpers';
-import { screen, fireEvent, within, act } from '@testing-library/react';
+import { screen, within, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { FilterEdit } from 'components/Topics/Topic/Messages/Filters/FilterModal';
 
@@ -32,9 +32,7 @@ describe('EditFilter component', () => {
 
   it('closes editFilter modal', async () => {
     const toggleEditModal = jest.fn();
-    await act(() => {
-      renderComponent({ toggleEditModal });
-    });
+    renderComponent({ toggleEditModal });
     await userEvent.click(screen.getByRole('button', { name: /Cancel/i }));
     expect(toggleEditModal).toHaveBeenCalledTimes(1);
   });
@@ -43,18 +41,15 @@ describe('EditFilter component', () => {
     const toggleEditModal = jest.fn();
     const editSavedFilter = jest.fn();
 
-    await renderComponent({ toggleEditModal, editSavedFilter });
+    renderComponent({ toggleEditModal, editSavedFilter });
 
     const inputs = screen.getAllByRole('textbox');
     const textAreaElement = inputs[0] as HTMLTextAreaElement;
     const inputNameElement = inputs[1];
-    await act(async () => {
-      textAreaElement.focus();
-      await userEvent.paste('edited code');
-      textAreaElement.focus();
-      await userEvent.type(inputNameElement, 'edited name');
-      fireEvent.submit(screen.getByRole('form'));
-    });
+    textAreaElement.focus();
+    await userEvent.paste('edited code');
+    await userEvent.type(inputNameElement, 'edited name');
+    await userEvent.click(screen.getByRole('button', { name: /Save/i }));
     expect(toggleEditModal).toHaveBeenCalledTimes(1);
     expect(editSavedFilter).toHaveBeenCalledTimes(1);
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
index 5d41e8c447c..c97bdc1b2a2 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
@@ -21,18 +21,18 @@ const renderComponent = (props?: Partial<FilterModalProps>) =>
       {...props}
     />
   );
+
 describe('FilterModal component', () => {
-  beforeEach(async () => {
+  it('renders component with add filter modal', async () => {
     await act(() => {
       renderComponent();
     });
-  });
-  it('renders component with add filter modal', () => {
     expect(
       screen.getByRole('heading', { name: /add filter/i, level: 3 })
     ).toBeInTheDocument();
   });
   it('renders component with edit filter modal', async () => {
+    renderComponent();
     await userEvent.click(screen.getByRole('savedFilterText'));
     await userEvent.click(screen.getByText('Edit'));
     expect(
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
index 43c7b9328dc..e248fdeaeb8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
@@ -5,7 +5,7 @@ import Filters, {
   SeekTypeOptions,
 } from 'components/Topics/Topic/Messages/Filters/Filters';
 import { EventSourceMock, render, WithRoute } from 'lib/testHelpers';
-import { act, screen, within, waitFor } from '@testing-library/react';
+import { screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import TopicMessagesContext, {
   ContextProps,
@@ -39,7 +39,7 @@ const topicName = 'topic-name';
 const renderComponent = (
   props: Partial<FiltersProps> = {},
   ctx: ContextProps = defaultContextValue
-) => {
+) =>
   render(
     <WithRoute path={clusterTopicPath()}>
       <TopicMessagesContext.Provider value={ctx}>
@@ -57,7 +57,6 @@ const renderComponent = (
     </WithRoute>,
     { initialEntries: [clusterTopicPath(clusterName, topicName)] }
   );
-};
 
 beforeEach(async () => {
   (useTopicDetails as jest.Mock).mockImplementation(() => ({
@@ -86,10 +85,8 @@ describe('Filters component', () => {
   describe('Input elements', () => {
     const inputValue = 'Hello World!';
 
-    beforeEach(async () => {
-      await act(() => {
-        renderComponent();
-      });
+    beforeEach(() => {
+      renderComponent();
     });
 
     it('search input', async () => {
@@ -110,19 +107,15 @@ describe('Filters component', () => {
       const seekTypeSelect = screen.getAllByRole('listbox');
       const option = screen.getAllByRole('option');
 
-      await act(async () => {
-        await userEvent.click(seekTypeSelect[0]);
-      });
+      await userEvent.click(seekTypeSelect[0]);
 
-      await act(async () => {
-        await userEvent.selectOptions(seekTypeSelect[0], ['Timestamp']);
-      });
+      await userEvent.selectOptions(seekTypeSelect[0], ['Timestamp']);
 
       expect(option[0]).toHaveTextContent('Timestamp');
       const timestampInput = screen.getByPlaceholderText('Select timestamp');
       expect(timestampInput).toHaveValue('');
 
-      await waitFor(() => userEvent.type(timestampInput, inputValue));
+      await userEvent.type(timestampInput, inputValue);
 
       expect(timestampInput).toHaveValue(inputValue);
       expect(screen.getByText('Submit')).toBeInTheDocument();
@@ -173,13 +166,11 @@ describe('Filters component', () => {
 
   it('renders addFilter modal', async () => {
     renderComponent();
-    await act(async () => {
-      await userEvent.click(
-        screen.getByRole('button', {
-          name: /add filters/i,
-        })
-      );
-    });
+    await userEvent.click(
+      screen.getByRole('button', {
+        name: /add filters/i,
+      })
+    );
     expect(screen.getByTestId('messageFilterModal')).toBeInTheDocument();
   });
 
@@ -187,13 +178,11 @@ describe('Filters component', () => {
     beforeEach(async () => {
       renderComponent();
 
-      await act(async () => {
-        await userEvent.click(
-          screen.getByRole('button', {
-            name: /add filters/i,
-          })
-        );
-      });
+      await userEvent.click(
+        screen.getByRole('button', {
+          name: 'Add Filters',
+        })
+      );
 
       const filterName = 'filter name';
       const filterCode = 'filter code';
@@ -205,34 +194,34 @@ describe('Filters component', () => {
 
       const textAreaElement = textBoxElements[0] as HTMLTextAreaElement;
       const inputNameElement = textBoxElements[1];
-      await act(async () => {
-        textAreaElement.focus();
-        await userEvent.paste(filterName);
-        await userEvent.type(inputNameElement, filterCode);
-      });
-
-      expect(textAreaElement.value).toEqual(`${filterName}\n\n`);
-      expect(inputNameElement).toHaveValue(filterCode);
-
-      await act(async () => {
-        await userEvent.click(
-          within(messageFilterModal).getByRole('button', {
-            name: /add filter/i,
-          })
-        );
-      });
+
+      textAreaElement.focus();
+      await userEvent.paste(filterCode);
+      await userEvent.type(inputNameElement, filterName);
+
+      expect(textAreaElement).toHaveValue(`${filterCode}\n\n`);
+      expect(inputNameElement).toHaveValue('filter name');
+      expect(
+        screen.getByRole('button', {
+          name: 'Add filter',
+        })
+      ).toBeEnabled();
+      await userEvent.click(
+        screen.getByRole('button', {
+          name: 'Add filter',
+        })
+      );
+      await userEvent.tab();
     });
 
-    it('shows saved smart filter', () => {
+    it('shows saved smart filter', async () => {
       expect(screen.getByTestId('activeSmartFilter')).toBeInTheDocument();
     });
 
     it('delete the active smart Filter', async () => {
       const smartFilterElement = screen.getByTestId('activeSmartFilter');
       const deleteIcon = within(smartFilterElement).getByText('mock-CloseIcon');
-      await act(async () => {
-        await userEvent.click(deleteIcon);
-      });
+      await userEvent.click(deleteIcon);
 
       const anotherSmartFilterElement =
         screen.queryByTestId('activeSmartFilter');
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
index dff30487862..dde99f39a81 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
@@ -15,8 +15,8 @@ describe('SavedFilter Component', () => {
     { name: 'One More Filter', code: 'code1' },
   ];
 
-  const setUpComponent = (props: Partial<Props> = {}) => {
-    return render(
+  const setUpComponent = (props: Partial<Props> = {}) =>
+    render(
       <SavedFilters
         filters={props.filters || mockFilters}
         onEdit={props.onEdit || jest.fn()}
@@ -26,7 +26,6 @@ describe('SavedFilter Component', () => {
         deleteFilter={props.deleteFilter || jest.fn()}
       />
     );
-  };
 
   const getSavedFilters = () => screen.getAllByRole('savedFilter');
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
index ec4d9cd8434..8c1ca2ea9e3 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
@@ -40,8 +40,8 @@ describe('Message component', () => {
     props: Partial<Props> = {
       message: mockMessage,
     }
-  ) => {
-    return render(
+  ) =>
+    render(
       <table>
         <tbody>
           <Message
@@ -52,7 +52,6 @@ describe('Message component', () => {
         </tbody>
       </table>
     );
-  };
 
   it('shows the data in the table row', () => {
     renderComponent();
diff --git a/kafka-ui-react-app/src/components/Topics/__tests__/Topics.spec.tsx b/kafka-ui-react-app/src/components/Topics/__tests__/Topics.spec.tsx
index 07254c21412..0e077445fc6 100644
--- a/kafka-ui-react-app/src/components/Topics/__tests__/Topics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/__tests__/Topics.spec.tsx
@@ -27,14 +27,13 @@ jest.mock('components/Topics/New/New', () => () => (
 describe('Topics Component', () => {
   const clusterName = 'clusterName';
   const topicName = 'topicName';
-  const setUpComponent = (path: string) => {
-    return render(
+  const setUpComponent = (path: string) =>
+    render(
       <WithRoute path={getNonExactPath(clusterTopicsPath())}>
         <Topics />
       </WithRoute>,
       { initialEntries: [path] }
     );
-  };
 
   it('should check if the page is Topics List rendered', () => {
     setUpComponent(clusterTopicsPath(clusterName));

From 7e82e7434ea2d555d881e03a230e5e21db0636d4 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 22 Nov 2022 21:08:52 +0400
Subject: [PATCH 297/734] =?UTF-8?q?fixed=20unchecking=20the=20already=20ch?=
 =?UTF-8?q?ecked=20Topics=20from=20main=20checkbox=20is=20not=E2=80=A6=20(?=
 =?UTF-8?q?#2941)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fixed unchecking the already checked Topics from main checkbox is not available

* remove commented part

* added checked on header

* changed getToggleAllPageRowsSelectedHandler function to  getToggleAllRowsSelectedHandler

* changed getIsSomePageRowsSelected function to  getIsSomeRowsSelected

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../src/components/common/NewTable/SelectRowHeader.tsx      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx b/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx
index 8121f3cd446..d33282f2838 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/SelectRowHeader.tsx
@@ -6,9 +6,9 @@ const SelectRowHeader: React.FC<HeaderContext<unknown, unknown>> = ({
   table,
 }) => (
   <IndeterminateCheckbox
-    checked={table.getIsAllPageRowsSelected()}
-    indeterminate={table.getIsSomePageRowsSelected()}
-    onChange={table.getToggleAllPageRowsSelectedHandler()}
+    checked={table.getIsAllRowsSelected()}
+    indeterminate={table.getIsSomeRowsSelected()}
+    onChange={table.getToggleAllRowsSelectedHandler()}
   />
 );
 

From e77b91316463863160d389b0d53e9186c69b8d41 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 25 Nov 2022 14:35:06 +0400
Subject: [PATCH 298/734] Documentation for pluggable serdes (#2702)

* 1. Minor serde's code improvements
2. Javadoc added to serde-related code

* Serdes configuration docs WIP

* wip

* DeserializeResult.toString impl added

* SchemeRegistry.canDeserialize checks subject existence

* Update Serialization.md

* Update README.md

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 README.md                                     |   2 +
 documentation/guides/Serialization.md         | 169 ++++++++++++++++++
 .../kafka/ui/serdes/ClusterSerdes.java        |  42 +++--
 .../ui/serdes/ProducerRecordCreator.java      |   7 +-
 .../kafka/ui/serdes/SerdeInstance.java        |  18 +-
 .../builtin/sr/SchemaRegistrySerde.java       |   3 +-
 .../ui/service/DeserializationService.java    |   7 +-
 .../builtin/sr/SchemaRegistrySerdeTest.java   |  17 +-
 .../kafka/ui/serde/api/DeserializeResult.java |  54 ++++--
 .../kafka/ui/serde/api/PropertyResolver.java  |  30 ++++
 .../kafka/ui/serde/api/SchemaDescription.java |  16 +-
 .../provectus/kafka/ui/serde/api/Serde.java   |  71 +++++++-
 12 files changed, 398 insertions(+), 38 deletions(-)
 create mode 100644 documentation/guides/Serialization.md

diff --git a/README.md b/README.md
index 3bc6e4635d9..acfa55f4af1 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ the cloud.
 * **Browse Messages** — browse messages with JSON, plain text, and Avro encoding
 * **Dynamic Topic Configuration** — create and configure new topics with dynamic configuration
 * **Configurable Authentification** — secure your installation with optional Github/Gitlab/Google OAuth 2.0
+* **Custom serialization/deserialization plugins** - use a ready-to-go serde for your data like AWS Glue or Smile, or code your own!
 
 # The Interface
 UI for Apache Kafka wraps major functions of Apache Kafka with an intuitive user interface.
@@ -76,6 +77,7 @@ We have plenty of [docker-compose files](documentation/compose/DOCKER_COMPOSE.md
 - [AWS IAM configuration](documentation/guides/AWS_IAM.md)
 - [Docker-compose files](documentation/compose/DOCKER_COMPOSE.md)
 - [Connection to a secure broker](documentation/guides/SECURE_BROKER.md)
+- [Configure seriliazation/deserialization plugins or code your own](documentation/guides/Serialization.md)
 
 ### Configuration File
 Example of how to configure clusters in the [application-local.yml](https://github.com/provectus/kafka-ui/blob/master/kafka-ui-api/src/main/resources/application-local.yml) configuration file:
diff --git a/documentation/guides/Serialization.md b/documentation/guides/Serialization.md
new file mode 100644
index 00000000000..d44a3e65d15
--- /dev/null
+++ b/documentation/guides/Serialization.md
@@ -0,0 +1,169 @@
+## Serialization and deserialization and custom plugins
+
+Kafka-ui supports multiple ways to serialize/deserialize data.
+
+
+### Int32, Int64, UInt32, UInt64
+Big-endian 4/8 bytes representation of signed/unsigned integers.
+
+### Base64
+Base64 (RFC4648) binary data representation. Can be useful in case if the actual data is not important, but exactly the same (byte-wise) key/value should be send.
+
+### String 
+Treats binary data as a string in specified encoding. Default encoding is UTF-8.
+
+Class name: `com.provectus.kafka.ui.serdes.builtin.StringSerde`
+
+Sample configuration (if you want to overwrite default configuration):
+```yaml
+kafka:
+  clusters:
+    - name: Cluster1
+      # Other Cluster configuration omitted ... 
+      serdes:
+          # registering String serde with custom config
+        - name: AsciiString
+          className: com.provectus.kafka.ui.serdes.builtin.StringSerde
+          properties:
+            encoding: "ASCII"
+        
+          # overriding build-it String serde config   
+        - name: String 
+          properties:
+            encoding: "UTF-16"
+```
+
+### Protobuf
+[Deprecated configuration is here](Protobuf.md)
+
+Class name: `com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde`
+
+Sample configuration:
+```yaml
+kafka:
+  clusters:
+    - name: Cluster1
+      # Other Cluster configuration omitted ... 
+      serdes:
+        - name: ProtobufFile
+          properties:
+            # path to the protobuf schema file
+            protobufFile: path/to/my.proto
+            # default protobuf type that is used for KEY serialization/deserialization
+            # optional
+            protobufMessageNameForKey: my.Type1
+            # mapping of topic names to protobuf types, that will be used for KEYS  serialization/deserialization
+            # optional
+            protobufMessageNameForKeyByTopic:
+              topic1: my.KeyType1
+              topic2: my.KeyType2
+            # default protobuf type that is used for VALUE serialization/deserialization
+            # optional, if not set - first type in file will be used as default
+            protobufMessageName: my.Type1
+            # mapping of topic names to protobuf types, that will be used for VALUES  serialization/deserialization
+            # optional
+            protobufMessageNameByTopic:
+              topic1: my.Type1
+              topic2: my.Type2
+```
+
+### SchemaRegistry
+SchemaRegistry serde is automatically configured if schema registry properties set on cluster level.
+But you can override them or add new SchemaRegistry serde that will connect to another schema-registry instance. 
+
+Class name: `com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde`
+
+Sample configuration:
+```yaml
+kafka:
+  clusters:
+    - name: Cluster1
+      # this schema-registry will be used by SchemaRegistrySerde by default
+      schemaRegistry: http://main-schema-registry:8081
+      serdes:
+        - name: SchemaRegistry
+          properties:
+            # but you can override cluster-level properties
+            url:  http://another-schema-registry:8081
+            # auth properties, optional
+            username: nameForAuth
+            password: P@ssW0RdForAuth
+        
+          # and also add another SchemaRegistry serde
+        - name: AnotherOneSchemaRegistry
+          className: com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde
+          properties:
+            url:  http://another-yet-schema-registry:8081
+            username: nameForAuth_2
+            password: P@ssW0RdForAuth_2
+```
+
+## Setting serdes for specific topics
+You can specify preferable serde for topics key/value. This serde will be chosen by default in UI on topic's view/produce pages. 
+To do so, set `topicValuesPattern/topicValuesPattern` properties for the selected serde. Kafka-ui will choose a first serde that matches specified pattern.
+
+Sample configuration:
+```yaml
+kafka:
+  clusters:
+    - name: Cluster1
+      serdes:
+        - name: String
+          topicKeysPattern: click-events|imp-events
+        
+        - name: Int64
+          topicKeysPattern: ".*-events"
+        
+        - name: SchemaRegistry
+          properties:
+            url:  http://schema-registry:8081
+          topicValuesPattern: click-events|imp-events
+```
+
+
+## Default serdes
+You can specify which serde will be chosen in UI by default if no other serdes selected via `topicKeysPattern/topicValuesPattern` settings.
+
+Sample configuration:
+```yaml
+kafka:
+  clusters:
+    - name: Cluster1
+      defaultKeySerde: Int34
+      defaultValueSerde: String
+      serdes:
+        - name: Int32
+          topicKeysPattern: click-events|imp-events
+```
+
+## Fallback
+If selected serde couldn't be applied (exception was thrown), then fallback (String serde with UTF-8 encoding) serde will be applied. Such messages will be specially highlighted in UI.
+
+## Custom pluggable serde registration
+You can implement your own serde and register it in kafka-ui application.
+To do so:
+1. Add `kafka-ui-serde-api` dependency (should be downloadable via maven central)
+2. Implement `com.provectus.kafka.ui.serde.api.Serde` interface. See javadoc for implementation requirements.
+3. Pack your serde into uber jar, or provide directory with no-dependency jar and it's dependencies jars
+
+
+Example pluggable serdes :
+https://github.com/provectus/kafkaui-smile-serde
+https://github.com/provectus/kafkaui-glue-sr-serde
+
+Sample configuration:
+```yaml
+kafka:
+  clusters:
+    - name: Cluster1
+      serdes:
+        - name: MyCustomSerde
+          className: my.lovely.org.KafkaUiSerde
+          filePath: /var/lib/kui-serde/my-kui-serde.jar
+          
+        - name: MyCustomSerde2
+          className: my.lovely.org.KafkaUiSerde2
+          filePath: /var/lib/kui-serde2
+          properties:
+            prop1: v1
+```
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java
index a64fa31167a..6d7251cd86d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java
@@ -1,6 +1,8 @@
 package com.provectus.kafka.ui.serdes;
 
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableMap;
 import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.serde.api.PropertyResolver;
@@ -14,6 +16,7 @@
 import com.provectus.kafka.ui.serdes.builtin.UInt64Serde;
 import com.provectus.kafka.ui.serdes.builtin.UuidBinarySerde;
 import com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde;
+import java.io.Closeable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -26,22 +29,22 @@
 import org.springframework.core.env.Environment;
 
 @Slf4j
-public class ClusterSerdes {
+public class ClusterSerdes implements Closeable {
 
   private static final CustomSerdeLoader CUSTOM_SERDE_LOADER = new CustomSerdeLoader();
 
   private static final Map<String, Class<? extends BuiltInSerde>> BUILT_IN_SERDES =
-      Map.of(
-          StringSerde.name(), StringSerde.class,
-          Int32Serde.name(), Int32Serde.class,
-          Int64Serde.name(), Int64Serde.class,
-          UInt32Serde.name(), UInt32Serde.class,
-          UInt64Serde.name(), UInt64Serde.class,
-          UuidBinarySerde.name(), UuidBinarySerde.class,
-          Base64Serde.name(), Base64Serde.class,
-          SchemaRegistrySerde.name(), SchemaRegistrySerde.class,
-          ProtobufFileSerde.name(), ProtobufFileSerde.class
-      );
+      ImmutableMap.<String, Class<? extends BuiltInSerde>>builder()
+          .put(StringSerde.name(), StringSerde.class)
+          .put(Int32Serde.name(), Int32Serde.class)
+          .put(Int64Serde.name(), Int64Serde.class)
+          .put(UInt32Serde.name(), UInt32Serde.class)
+          .put(UInt64Serde.name(), UInt64Serde.class)
+          .put(Base64Serde.name(), Base64Serde.class)
+          .put(SchemaRegistrySerde.name(), SchemaRegistrySerde.class)
+          .put(ProtobufFileSerde.name(), ProtobufFileSerde.class)
+          .put(UuidBinarySerde.name(), UuidBinarySerde.class)
+          .build();
 
   // using linked map to keep order of serdes added to it
   private final Map<String, SerdeInstance> serdes = new LinkedHashMap<>();
@@ -64,6 +67,9 @@ public ClusterSerdes(Environment env,
     ClustersProperties.Cluster clusterProp = clustersProperties.getClusters().get(clusterIndex);
     for (int i = 0; i < clusterProp.getSerde().size(); i++) {
       var sendeConf = clusterProp.getSerde().get(i);
+      if (Strings.isNullOrEmpty(sendeConf.getName())) {
+        throw new ValidationException("'name' property not set for serde: " + sendeConf);
+      }
       if (serdes.containsKey(sendeConf.getName())) {
         throw new ValidationException("Multiple serdes with same name: " + sendeConf.getName());
       }
@@ -154,6 +160,14 @@ private SerdeInstance loadCustom(ClustersProperties.SerdeConfig serdeConfig,
                                    PropertyResolver serdeProps,
                                    PropertyResolver clusterProps,
                                    PropertyResolver globalProps) {
+    if (Strings.isNullOrEmpty(serdeConfig.getClassName())) {
+      throw new ValidationException(
+          "'className' property not set for custom serde " + serdeConfig.getName());
+    }
+    if (Strings.isNullOrEmpty(serdeConfig.getFilePath())) {
+      throw new ValidationException(
+          "'filePath' property not set for custom serde " + serdeConfig.getName());
+    }
     var loaded = CUSTOM_SERDE_LOADER.loadAndConfigure(
         serdeConfig.getClassName(), serdeConfig.getFilePath(), serdeProps, clusterProps, globalProps);
     return new SerdeInstance(
@@ -215,4 +229,8 @@ public SerdeInstance suggestSerdeForDeserialize(String topic, Serde.Target type)
         .orElse(serdes.get(StringSerde.name()));
   }
 
+  @Override
+  public void close() {
+    serdes.values().forEach(SerdeInstance::close);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ProducerRecordCreator.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ProducerRecordCreator.java
index 85dce9cb76e..f48f1c08099 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ProducerRecordCreator.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ProducerRecordCreator.java
@@ -25,14 +25,11 @@ public ProducerRecord<byte[], byte[]> create(String topic,
         partition,
         key == null ? null : keySerializer.serialize(key),
         value == null ? null : valuesSerializer.serialize(value),
-        createHeaders(headers)
+        headers == null ? null : createHeaders(headers)
     );
   }
 
-  private Iterable<Header> createHeaders(@Nullable Map<String, String> clientHeaders) {
-    if (clientHeaders == null) {
-      return new RecordHeaders();
-    }
+  private Iterable<Header> createHeaders(Map<String, String> clientHeaders) {
     RecordHeaders headers = new RecordHeaders();
     clientHeaders.forEach((k, v) -> headers.add(new RecordHeader(k, v.getBytes())));
     return headers;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
index 0cec2c71834..09980e7e423 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
@@ -2,16 +2,18 @@
 
 import com.provectus.kafka.ui.serde.api.SchemaDescription;
 import com.provectus.kafka.ui.serde.api.Serde;
+import java.io.Closeable;
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
-
+@Slf4j
 @RequiredArgsConstructor
-public class SerdeInstance {
+public class SerdeInstance implements Closeable {
 
   @Getter
   private final String name;
@@ -68,4 +70,16 @@ public Serde.Deserializer deserializer(String topic, Serde.Target type) {
       return (headers, data) -> wrapWithClassloader(() -> deserializer.deserialize(headers, data));
     });
   }
+
+  @Override
+  public void close() {
+    wrapWithClassloader(() -> {
+      try {
+        serde.close();
+      } catch (Exception e) {
+        log.error("Error closing serde " + name, e);
+      }
+      return null;
+    });
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index 9c43c7a63f7..5af6249c079 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -163,7 +163,8 @@ public Optional<String> getDescription() {
 
   @Override
   public boolean canDeserialize(String topic, Target type) {
-    return true;
+    String subject = schemaSubject(topic, type);
+    return getSchemaBySubject(subject).isPresent();
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
index 94c493c96d8..a8d53a549c5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
@@ -9,6 +9,7 @@
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
 import com.provectus.kafka.ui.serdes.SerdeInstance;
+import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -21,7 +22,7 @@
 
 @Slf4j
 @Component
-public class DeserializationService {
+public class DeserializationService implements Closeable {
 
   private final Map<KafkaCluster, ClusterSerdes> clusterSerdes = new ConcurrentHashMap<>();
 
@@ -137,4 +138,8 @@ private SerdeDescriptionDTO toDto(SerdeInstance serdeInstance,
         .preferred(preferred);
   }
 
+  @Override
+  public void close() {
+    clusterSerdes.values().forEach(ClusterSerdes::close);
+  }
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
index c965930916f..092b3e8b3c9 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
@@ -130,10 +130,25 @@ void deserializeReturnsJsonAvroMsgJsonRepresentation() throws RestClientExceptio
   }
 
   @Test
-  void canDeserializeReturnsTrueAlways() {
+  void canDeserializeAndCanSerializeReturnsTrueIfSubjectExists() throws Exception {
     String topic = RandomString.make(10);
+    registryClient.register(topic + "-key", new AvroSchema("\"int\""));
+    registryClient.register(topic + "-value", new AvroSchema("\"int\""));
+
     assertThat(serde.canDeserialize(topic, Serde.Target.KEY)).isTrue();
     assertThat(serde.canDeserialize(topic, Serde.Target.VALUE)).isTrue();
+
+    assertThat(serde.canSerialize(topic, Serde.Target.KEY)).isTrue();
+    assertThat(serde.canSerialize(topic, Serde.Target.VALUE)).isTrue();
+  }
+
+  @Test
+  void canDeserializeAndCanSerializeReturnsFalseIfSubjectDoesNotExist() {
+    String topic = RandomString.make(10);
+    assertThat(serde.canDeserialize(topic, Serde.Target.KEY)).isFalse();
+    assertThat(serde.canDeserialize(topic, Serde.Target.VALUE)).isFalse();
+    assertThat(serde.canSerialize(topic, Serde.Target.KEY)).isFalse();
+    assertThat(serde.canSerialize(topic, Serde.Target.VALUE)).isFalse();
   }
 
   private void assertJsonsEqual(String expected, String actual) throws JsonProcessingException {
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/DeserializeResult.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/DeserializeResult.java
index bf965d124da..1aa111dc60b 100644
--- a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/DeserializeResult.java
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/DeserializeResult.java
@@ -1,31 +1,54 @@
 package com.provectus.kafka.ui.serde.api;
 
+import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 
+/**
+ * Result of {@code Deserializer} work.
+ */
 public final class DeserializeResult {
 
   public enum Type {
     STRING, JSON
   }
 
+  // nullable
   private final String result;
   private final Type type;
   private final Map<String, Object> additionalProperties;
 
+  /**
+   * @param result string representation of deserialized binary data
+   * @param type type of string - can it be converted to json or not
+   * @param additionalProperties additional information about deserialized value (will be shown in UI)
+   */
   public DeserializeResult(String result, Type type, Map<String, Object> additionalProperties) {
     this.result = result;
-    this.type = type;
-    this.additionalProperties = additionalProperties;
+    this.type = type != null ? type : Type.STRING;
+    this.additionalProperties = additionalProperties != null ? additionalProperties : Collections.emptyMap();
   }
 
+  /**
+   * @return string representation of deserialized binary data, can be null
+   */
   public String getResult() {
     return result;
   }
 
+  /**
+   * @return additional information about deserialized value.
+   * Will be show as json dictionary in UI (serialized with Jackson object mapper).
+   * It is recommended to use primitive types and strings for values.
+   */
   public Map<String, Object> getAdditionalProperties() {
     return additionalProperties;
   }
 
+  /**
+   * @return type of deserialized result. Will be used as hint for some internal logic
+   * (ex. if type==STRING smart filters won't try to parse it as json for further usage)
+   */
   public Type getType() {
     return type;
   }
@@ -38,22 +61,25 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) {
       return false;
     }
-
     DeserializeResult that = (DeserializeResult) o;
-    if (!result.equals(that.result)) {
-      return false;
-    }
-    if (type != that.type) {
-      return false;
-    }
-    return additionalProperties.equals(that.additionalProperties);
+    return Objects.equals(result, that.result)
+        && type == that.type
+        && additionalProperties.equals(that.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    int result = this.result.hashCode();
-    result = 31 * result + type.hashCode();
-    result = 31 * result + additionalProperties.hashCode();
-    return result;
+    return Objects.hash(result, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    return "DeserializeResult{"
+        + "result='" + result
+        + '\''
+        + ", type=" + type
+        + ", additionalProperties="
+        + additionalProperties
+        + '}';
   }
 }
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java
index 7eb81b43b8f..526e2d7f641 100644
--- a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java
@@ -4,12 +4,42 @@
 import java.util.Map;
 import java.util.Optional;
 
+/**
+ * Provides access to configuration properties.
+ *
+ * @implNote Actual implementation uses {@code org.springframework.boot.context.properties.bind.Binder} class
+ * to bind values to target types. Target type params can be custom configs classes, not only simple types and strings.
+ *
+ */
 public interface PropertyResolver {
 
+  /**
+   * Get property value by name.
+   *
+   * @param key property name
+   * @param targetType type of property value
+   * @return property value or empty {@code Optional} if property not found
+   */
   <T> Optional<T> getProperty(String key, Class<T> targetType);
 
+
+  /**
+   * Get list-property value by name
+   *
+   * @param key list property name
+   * @param itemType type of list element
+   * @return list property value or empty {@code Optional} if property not found
+   */
   <T> Optional<List<T>> getListProperty(String key, Class<T> itemType);
 
+  /**
+   * Get map-property value by name
+   *
+   * @param key  map-property name
+   * @param keyType type of map key
+   * @param valueType type of map value
+   * @return map-property value or empty {@code Optional} if property not found
+   */
   <K, V> Optional<Map<K, V>> getMapProperty(String key, Class<K> keyType, Class<V> valueType);
 
 }
\ No newline at end of file
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/SchemaDescription.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/SchemaDescription.java
index 64454754520..9eb5d9da0ca 100644
--- a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/SchemaDescription.java
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/SchemaDescription.java
@@ -2,21 +2,35 @@
 
 import java.util.Map;
 
+/**
+ * Description of topic's key/value schema.
+ */
 public final class SchemaDescription {
 
-  // can be json schema or plain text
   private final String schema;
   private final Map<String, Object> additionalProperties;
 
+  /**
+   *
+   * @param schema schema descriptions.
+   *              If contains json-schema (preferred) UI will use it for validation and sample data generation.
+   * @param additionalProperties additional properties about schema (may be rendered in UI in the future)
+   */
   public SchemaDescription(String schema, Map<String, Object> additionalProperties) {
     this.schema = schema;
     this.additionalProperties = additionalProperties;
   }
 
+  /**
+   * @return schema description text. Preferably contains json-schema. Can be null.
+   */
   public String getSchema() {
     return schema;
   }
 
+  /**
+   * @return additional properties about schema
+   */
   public Map<String, Object> getAdditionalProperties() {
     return additionalProperties;
   }
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java
index 58cc1efb7b2..5dc43d59b11 100644
--- a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java
@@ -1,37 +1,106 @@
 package com.provectus.kafka.ui.serde.api;
 
+import java.io.Closeable;
 import java.util.Optional;
 
-public interface Serde {
+/**
+ * Main interface of  serialization/deserialization logic.
+ * It provides ability to serialize, deserialize topic's keys and values, and optionally provides
+ * information about data schema inside topic.
+ * <p/>
+ * <b>Lifecycle:</b><br/>
+ * 1. on application startup kafka-ui scans configs and finds all custom serde definitions<br/>
+ * 2. for each custom serde its own separated child-first classloader is created<br/>
+ * 3. kafka-ui loads class defined in configuration and instantiates instance of that class using default, non-arg constructor<br/>
+ * 4. {@code configure(...)} method called<br/>
+ * 5. various methods called during application runtime<br/>
+ * 6. on application shutdown kafka-ui calls {@code close()} method on serde instance<br/>
+ * <p/>
+ * <b>Implementation considerations:</b><br/>
+ * 1. Implementation class should have default/non-arg contructor<br/>
+ * 2. All methods except {@code configure(...)} and {@code close()} can be called from different threads. So, your code should be thread-safe.<br/>
+ * 3. All methods will be executed in separate child-first classloader.<br/>
+ */
+public interface Serde extends Closeable {
 
+  /**
+   * Kafka record's part that Serde will be applied to.
+   */
   enum Target {
     KEY, VALUE
   }
 
+  /**
+   * Reads configuration using property resolvers and sets up serde's internal state.
+   *
+   * @param serdeProperties        specific serde instance's properties
+   * @param kafkaClusterProperties properties of the custer for what serde is instantiated
+   * @param globalProperties       global application properties
+   */
   void configure(
       PropertyResolver serdeProperties,
       PropertyResolver kafkaClusterProperties,
       PropertyResolver globalProperties
   );
 
+  /**
+   * @return Serde's description. Treated as Markdown text. Will be shown in UI.
+   */
   Optional<String> getDescription();
 
+  /**
+   * @return SchemaDescription for specified topic's key/value.
+   * {@code Optional.empty} if there is not information about schema.
+   */
   Optional<SchemaDescription> getSchema(String topic, Target type);
 
+  /**
+   * @return true if this Serde can be applied to specified topic's key/value deserialization
+   */
   boolean canDeserialize(String topic, Target type);
 
+  /**
+   * @return true if this Serde can be applied to specified topic's key/value serialization
+   */
   boolean canSerialize(String topic, Target type);
 
+  /**
+   * Closes resources opened by Serde.
+   */
+  @Override
+  default void close() {
+    //intentionally left blank
+  }
+
   //----------------------------------------------------------------------------
 
+  /**
+   * Creates {@code Serializer} for specified topic's key/value.
+   * Kafka-ui doesn't cache  {@code Serializes} - new one will be created each time user's message needs to be serialized.
+   * (Unless kafka-ui supports batch inserts).
+   */
   Serializer serializer(String topic, Target type);
 
+  /**
+   * Creates {@code Deserializer} for specified topic's key/value.
+   * {@code Deserializer} will be created for each kafka polling and will be used for all messages within that polling cycle.
+   */
   Deserializer deserializer(String topic, Target type);
 
+  /**
+   * Serializes client's input to {@code bytes[]} that will be sent to kafka as key/value (depending on what {@code Type} it was created for).
+   */
   interface Serializer {
+
+    /**
+     * @param input string entered by user into UI text field.<br/> Note: this input is not formatted in any way.
+     */
     byte[] serialize(String input);
   }
 
+  /**
+   * Deserializes polled record's key/value (depending on what {@code Type} it was created for).
+   */
   interface Deserializer {
     DeserializeResult deserialize(RecordHeaders headers, byte[] data);
   }

From 7fe999660c93e516a5e95729a358a2eafec5889e Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Fri, 25 Nov 2022 18:23:30 +0400
Subject: [PATCH 299/734] Topic creation: lock page until creation request
 finished (#2815)

* Topic creation: lock page until creation request finished

* use isLoading when create topic

* used isSubmitting property

* remove connectors import
---
 kafka-ui-react-app/src/components/Topics/New/New.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/New/New.tsx b/kafka-ui-react-app/src/components/Topics/New/New.tsx
index cf992789362..1fbd59090d2 100644
--- a/kafka-ui-react-app/src/components/Topics/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/New.tsx
@@ -57,7 +57,7 @@ const New: React.FC = () => {
           partitionCount={Number(partitionCount)}
           replicationFactor={Number(replicationFactor)}
           inSyncReplicas={Number(inSyncReplicas)}
-          isSubmitting={false}
+          isSubmitting={createTopic.isLoading}
           onSubmit={methods.handleSubmit(onSubmit)}
         />
       </FormProvider>

From 5f232a3966cda70eac34aa2b32ec4a610404d1c6 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Fri, 25 Nov 2022 17:17:16 +0200
Subject: [PATCH 300/734] Issue/checking available operations for selected
 topic within 'all topics' page (#2972)

* Update TopicTests and added new methods

* Delete actionButtonsLocator

* Resolve conversation

* Refactored SoftAssertions

* Changed custom topics for default

* Changed custom topics for default

* Changed custom topics for default

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../kafka/ui/pages/topic/TopicsList.java      | 23 ++++++++++---
 .../kafka/ui/suite/topics/TopicsTests.java    | 34 +++++++++++++++++++
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index c32621bf1a5..11d47a07ca3 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -18,7 +18,10 @@ public class TopicsList extends BasePage {
     protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
     protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
     protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
-    protected String actionButtonLocator = "//button[text()='%s']";
+    protected SelenideElement deleteSelectedTopicsBtn = $x("//button[text()='Delete selected topics']");
+    protected SelenideElement copySelectedTopicBtn = $x("//button[text()='Copy selected topic']");
+    protected SelenideElement purgeMessagesOfSelectedTopicsBtn = $x("//button[text()='Purge messages of selected topics']");
+    protected String checkBoxListLocator = "//a[@title='%s']//ancestor::td/../td/input[@type='checkbox']";
 
     @Step
     public TopicsList waitUntilScreenReady() {
@@ -45,9 +48,21 @@ public TopicsList openTopic(String topicName) {
         return this;
     }
 
-    private List<SelenideElement> getActionButtons() {
-      return Stream.of("Delete selected topics", "Copy selected topic", "Purge messages of selected topics")
-          .map(name -> $x(String.format(actionButtonLocator, name)))
+    @Step
+    public TopicsList selectCheckboxByName(String topicName){
+      SelenideElement checkBox = $x(String.format(checkBoxListLocator,topicName));
+      if(!checkBox.is(Condition.selected)){clickByJavaScript(checkBox);}
+      return this;
+    }
+
+    @Step
+    public boolean isCopySelectedTopicBtnEnabled(){
+      return isEnabled(copySelectedTopicBtn);
+    }
+
+    @Step
+    public List<SelenideElement> getActionButtons() {
+      return Stream.of(deleteSelectedTopicsBtn, copySelectedTopicBtn, purgeMessagesOfSelectedTopicsBtn)
           .collect(Collectors.toList());
     }
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index c342a216074..05b614c3bbb 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -27,10 +27,14 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestMethodOrder;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class TopicsTests extends BaseTest {
   private static final long SUITE_ID = 2;
   private static final String SUITE_TITLE = "Topics";
@@ -63,6 +67,7 @@ public void beforeAll() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(199)
   @Test
+  @Order(1)
   public void createTopic() {
     naviSideBar
         .openSideMenu(TOPICS);
@@ -97,6 +102,28 @@ public void createTopic() {
     TOPIC_LIST.add(TOPIC_TO_CREATE);
   }
 
+  @DisplayName("Checking available operations for selected Topic within 'All Topics' page")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(7)
+  @Test
+  @Order(2)
+  void checkAvailableOperations(){
+    String processingTopic = "my_ksql_1ksql_processing_log";
+    String confluentTopic = "_confluent-ksql-my_ksql_1_command_topic";
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .selectCheckboxByName(processingTopic);
+    topicsList.getActionButtons().
+        forEach(element -> assertThat(element.is(Condition.enabled))
+            .as(element.getSearchCriteria() + " isEnabled()").isTrue());
+    topicsList
+        .selectCheckboxByName(confluentTopic);
+    Assertions.assertFalse(topicsList.isCopySelectedTopicBtnEnabled(),"isCopySelectedTopicBtnEnabled()");
+  }
+
   @Disabled()
   @Issue("https://github.com/provectus/kafka-ui/issues/2625")
   @DisplayName("should update a topic")
@@ -104,6 +131,7 @@ public void createTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(197)
   @Test
+  @Order(3)
   public void updateTopic() {
     naviSideBar
         .openSideMenu(TOPICS);
@@ -150,6 +178,7 @@ public void updateTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(207)
   @Test
+  @Order(4)
   public void deleteTopic() {
     naviSideBar
         .openSideMenu(TOPICS);
@@ -174,6 +203,7 @@ public void deleteTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(20)
   @Test
+  @Order(5)
   void redirectToConsumerFromTopic() {
     String topicName = "source-activities";
     String consumerGroupId = "connect-sink_postgres_activities";
@@ -199,6 +229,7 @@ void redirectToConsumerFromTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(4)
   @Test
+  @Order(6)
   void checkTopicCreatePossibility() {
     naviSideBar
         .openSideMenu(TOPICS);
@@ -219,6 +250,7 @@ void checkTopicCreatePossibility() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(6)
   @Test
+  @Order(7)
   void checkCustomParametersWithinCreateNewTopic() {
     naviSideBar
         .openSideMenu(TOPICS);
@@ -243,6 +275,7 @@ void checkCustomParametersWithinCreateNewTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(2)
   @Test
+  @Order(8)
   void checkTopicListElements() {
     naviSideBar
         .openSideMenu(TOPICS);
@@ -263,6 +296,7 @@ void checkTopicListElements() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(12)
   @Test
+  @Order(9)
   void addingNewFilterWithinTopic() {
     String topicName = "_schemas";
     String filterName = "123ABC";

From 20ecc74dd9aba38156e5cc88847e3a41fd663feb Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 28 Nov 2022 12:54:07 +0400
Subject: [PATCH 301/734] Data masking (#2850)

Data masking:
1. properties & mapping added to ClustersProperties
2. DataMasking provides function that doing masking for specified topic & target
3. Masking policies implemented: MASK, REMOVE, REPLACE
---
 .github/workflows/documentation.yaml          |   2 +-
 documentation/guides/DataMasking.md           | 123 ++++++++++++++++++
 .../kafka/ui/config/ClustersProperties.java   |  15 +++
 .../kafka/ui/mapper/ClusterMapper.java        |   5 +
 .../kafka/ui/model/KafkaCluster.java          |   2 +
 .../ui/service/DeserializationService.java    |  18 ++-
 .../kafka/ui/service/MessagesService.java     |  17 +++
 .../kafka/ui/service/masking/DataMasking.java |  92 +++++++++++++
 .../ui/service/masking/policies/Mask.java     |  94 +++++++++++++
 .../masking/policies/MaskingPolicy.java       |  39 ++++++
 .../ui/service/masking/policies/Remove.java   |  43 ++++++
 .../ui/service/masking/policies/Replace.java  |  64 +++++++++
 .../kafka/ui/AbstractIntegrationTest.java     |   3 +
 .../kafka/ui/service/MessagesServiceTest.java |  41 ++++++
 .../ui/service/masking/DataMaskingTest.java   |  89 +++++++++++++
 .../ui/service/masking/policies/MaskTest.java |  68 ++++++++++
 .../service/masking/policies/RemoveTest.java  |  72 ++++++++++
 .../service/masking/policies/ReplaceTest.java |  68 ++++++++++
 18 files changed, 847 insertions(+), 8 deletions(-)
 create mode 100644 documentation/guides/DataMasking.md
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Remove.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/DataMaskingTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/MaskTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/RemoveTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/ReplaceTest.java

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
index fb79e3f53ff..30267a22310 100644
--- a/.github/workflows/documentation.yaml
+++ b/.github/workflows/documentation.yaml
@@ -18,6 +18,6 @@ jobs:
         uses: urlstechie/urlchecker-action@0.0.33
         with:
           exclude_patterns: localhost,127.0.,192.168.
-          exclude_urls: https://api.server,https://graph.microsoft.com/User.Read,https://dev-a63ggcut.auth0.com/
+          exclude_urls: https://api.server,https://graph.microsoft.com/User.Read,https://dev-a63ggcut.auth0.com/,http://main-schema-registry:8081,http://schema-registry:8081,http://another-yet-schema-registry:8081,http://another-schema-registry:8081
           print_all: false
           file_types: .md
diff --git a/documentation/guides/DataMasking.md b/documentation/guides/DataMasking.md
new file mode 100644
index 00000000000..a50f5013dba
--- /dev/null
+++ b/documentation/guides/DataMasking.md
@@ -0,0 +1,123 @@
+# Topics data masking
+
+You can configure kafka-ui to mask sensitive data shown in Messages page.
+
+Several masking policies supported:
+
+### REMOVE
+For json objects - remove target fields, otherwise - return "null" string.
+```yaml
+- type: REMOVE
+  fields: [ "id", "name" ]
+  ...
+```
+
+Apply examples:
+```
+{ "id": 1234, "name": { "first": "James" }, "age": 30 } 
+ ->
+{ "age": 30 } 
+```
+```
+non-json string -> null
+```
+
+### REPLACE
+For json objects - replace target field's values with specified replacement string (by default with `***DATA_MASKED***`). Note: if target field's value is object, then replacement applied to all its fields recursively (see example). 
+
+```yaml
+- type: REPLACE
+  fields: [ "id", "name" ]
+  replacement: "***"  #optional, "***DATA_MASKED***" by default
+  ...
+```
+
+Apply examples:
+```
+{ "id": 1234, "name": { "first": "James", "last": "Bond" }, "age": 30 } 
+ ->
+{ "id": "***", "name": { "first": "***", "last": "***" }, "age": 30 } 
+```
+```
+non-json string -> ***
+```
+
+### MASK
+Mask target field's values with specified masking characters, recursively (spaces and line separators will be kept as-is).
+`pattern` array specifies what symbols will be used to replace upper-case chars, lower-case chars, digits and other symbols correspondingly.
+
+```yaml
+- type: MASK
+  fields: [ "id", "name" ]
+  pattern: ["A", "a", "N", "_"]   # optional, default is ["X", "x", "n", "-"]
+  ...
+```
+
+Apply examples:
+```
+{ "id": 1234, "name": { "first": "James", "last": "Bond!" }, "age": 30 } 
+ ->
+{ "id": "NNNN", "name": { "first": "Aaaaa", "last": "Aaaa_" }, "age": 30 } 
+```
+```
+Some string! -> Aaaa aaaaaa_
+```
+
+----
+
+For each policy, if `fields` not specified, then policy will be applied to all object's fields or whole string if it is not a json-object.
+
+You can specify which masks will be applied to topic's keys/values. Multiple policies will be applied if topic matches both policy's patterns.
+
+Yaml configuration example:
+```yaml
+kafka:
+  clusters:
+    - name: ClusterName
+      # Other Cluster configuration omitted ... 
+      masking:
+        - type: REMOVE
+          fields: [ "id" ]
+          topicKeysPattern: "events-with-ids-.*"
+          topicValuesPattern: "events-with-ids-.*"
+          
+        - type: REPLACE
+          fields: [ "companyName", "organizationName" ]
+          replacement: "***MASKED_ORG_NAME***"   #optional
+          topicValuesPattern: "org-events-.*"
+        
+        - type: MASK
+          fields: [ "name", "surname" ]
+          pattern: ["A", "a", "N", "_"]  #optional
+          topicValuesPattern: "user-states"
+
+        - type: MASK
+          topicValuesPattern: "very-secured-topic"
+```
+
+Same configuration in env-vars fashion:
+```
+...
+KAFKA_CLUSTERS_0_MASKING_0_TYPE: REMOVE
+KAFKA_CLUSTERS_0_MASKING_0_FIELDS_0: "id"
+KAFKA_CLUSTERS_0_MASKING_0_TOPICKEYSPATTERN: "events-with-ids-.*"
+KAFKA_CLUSTERS_0_MASKING_0_TOPICVALUESPATTERN: "events-with-ids-.*"
+
+KAFKA_CLUSTERS_0_MASKING_1_TYPE: REPLACE
+KAFKA_CLUSTERS_0_MASKING_1_FIELDS_0: "companyName"
+KAFKA_CLUSTERS_0_MASKING_1_FIELDS_1: "organizationName"
+KAFKA_CLUSTERS_0_MASKING_1_REPLACEMENT: "***MASKED_ORG_NAME***"
+KAFKA_CLUSTERS_0_MASKING_1_TOPICVALUESPATTERN: "org-events-.*"
+
+KAFKA_CLUSTERS_0_MASKING_2_TYPE: MASK
+KAFKA_CLUSTERS_0_MASKING_2_FIELDS_0: "name"
+KAFKA_CLUSTERS_0_MASKING_2_FIELDS_1: "surname"
+KAFKA_CLUSTERS_0_MASKING_2_PATTERN_0: 'A'
+KAFKA_CLUSTERS_0_MASKING_2_PATTERN_1: 'a'
+KAFKA_CLUSTERS_0_MASKING_2_PATTERN_2: 'N'
+KAFKA_CLUSTERS_0_MASKING_2_PATTERN_3: '_'
+KAFKA_CLUSTERS_0_MASKING_2_TOPICVALUESPATTERN: "user-states"
+
+KAFKA_CLUSTERS_0_MASKING_3_TYPE: MASK
+KAFKA_CLUSTERS_0_MASKING_3_TOPICVALUESPATTERN: "very-secured-topic"
+```
\ No newline at end of file
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 45800278b84..7943efdb617 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -38,6 +38,7 @@ public static class Cluster {
     List<SerdeConfig> serde = new ArrayList<>();
     String defaultKeySerde;
     String defaultValueSerde;
+    List<Masking> masking = new ArrayList<>();
   }
 
   @Data
@@ -92,6 +93,20 @@ public static class KsqldbServerAuth {
     String password;
   }
 
+  @Data
+  public static class Masking {
+    Type type;
+    List<String> fields = List.of(); //if empty - policy will be applied to all fields
+    List<String> pattern = List.of("X", "x", "n", "-"); //used when type=MASK
+    String replacement = "***DATA_MASKED***"; //used when type=REPLACE
+    String topicKeysPattern;
+    String topicValuesPattern;
+
+    public enum Type {
+      REMOVE, MASK, REPLACE
+    }
+  }
+
   @PostConstruct
   public void validateAndSetDefaults() {
     validateClusterNames();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index 9dc3103fca4..9328e99a860 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -34,6 +34,7 @@
 import com.provectus.kafka.ui.model.TopicDetailsDTO;
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityCheck;
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel;
+import com.provectus.kafka.ui.service.masking.DataMasking;
 import com.provectus.kafka.ui.service.metrics.RawMetric;
 import java.util.Arrays;
 import java.util.Collections;
@@ -178,6 +179,10 @@ default BrokerDiskUsageDTO map(Integer id, InternalBrokerDiskUsage internalBroke
     return brokerDiskUsage;
   }
 
+  default DataMasking map(List<ClustersProperties.Masking> maskingProperties) {
+    return DataMasking.create(maskingProperties);
+  }
+
   @Named("setProperties")
   default Properties setProperties(Properties properties) {
     Properties copy = new Properties();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
index f90faa391d5..28dc89d0f13 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model;
 
+import com.provectus.kafka.ui.service.masking.DataMasking;
 import java.util.List;
 import java.util.Properties;
 import lombok.AccessLevel;
@@ -21,4 +22,5 @@ public class KafkaCluster {
   private final boolean readOnly;
   private final boolean disableLogDirsCollection;
   private final MetricsConfig metricsConfig;
+  private final DataMasking masking;
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
index a8d53a549c5..57c87042421 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
@@ -24,7 +24,7 @@
 @Component
 public class DeserializationService implements Closeable {
 
-  private final Map<KafkaCluster, ClusterSerdes> clusterSerdes = new ConcurrentHashMap<>();
+  private final Map<String, ClusterSerdes> clusterSerdes = new ConcurrentHashMap<>();
 
   public DeserializationService(Environment env,
                                 ClustersStorage clustersStorage,
@@ -32,15 +32,19 @@ public DeserializationService(Environment env,
     for (int i = 0; i < clustersProperties.getClusters().size(); i++) {
       var clusterProperties = clustersProperties.getClusters().get(i);
       var cluster = clustersStorage.getClusterByName(clusterProperties.getName()).get();
-      clusterSerdes.put(cluster, new ClusterSerdes(env, clustersProperties, i));
+      clusterSerdes.put(cluster.getName(), new ClusterSerdes(env, clustersProperties, i));
     }
   }
 
+  private ClusterSerdes getSerdesFor(KafkaCluster cluster) {
+    return clusterSerdes.get(cluster.getName());
+  }
+
   private Serde.Serializer getSerializer(KafkaCluster cluster,
                                          String topic,
                                          Serde.Target type,
                                          String serdeName) {
-    var serdes = this.clusterSerdes.get(cluster);
+    var serdes = getSerdesFor(cluster);
     var serde = serdes.serdeForName(serdeName)
         .orElseThrow(() -> new ValidationException(
             String.format("Serde %s not found", serdeName)));
@@ -55,7 +59,7 @@ private SerdeInstance getSerdeForDeserialize(KafkaCluster cluster,
                                                String topic,
                                                Serde.Target type,
                                                @Nullable String serdeName) {
-    var serdes = this.clusterSerdes.get(cluster);
+    var serdes = getSerdesFor(cluster);
     if (serdeName != null) {
       var serde = serdes.serdeForName(serdeName)
           .orElseThrow(() -> new ValidationException(String.format("Serde '%s' not found", serdeName)));
@@ -85,7 +89,7 @@ public ConsumerRecordDeserializer deserializerFor(KafkaCluster cluster,
                                                     @Nullable String valueSerdeName) {
     var keySerde = getSerdeForDeserialize(cluster, topic, Serde.Target.KEY, keySerdeName);
     var valueSerde = getSerdeForDeserialize(cluster, topic, Serde.Target.VALUE, valueSerdeName);
-    var fallbackSerde = clusterSerdes.get(cluster).getFallbackSerde();
+    var fallbackSerde = getSerdesFor(cluster).getFallbackSerde();
     return new ConsumerRecordDeserializer(
         keySerde.getName(),
         keySerde.deserializer(topic, Serde.Target.KEY),
@@ -100,7 +104,7 @@ public ConsumerRecordDeserializer deserializerFor(KafkaCluster cluster,
   public List<SerdeDescriptionDTO> getSerdesForSerialize(KafkaCluster cluster,
                                                          String topic,
                                                          Serde.Target serdeType) {
-    var serdes = clusterSerdes.get(cluster);
+    var serdes = getSerdesFor(cluster);
     var preferred = serdes.suggestSerdeForSerialize(topic, serdeType);
     var result = new ArrayList<SerdeDescriptionDTO>();
     result.add(toDto(preferred, topic, serdeType, true));
@@ -114,7 +118,7 @@ public List<SerdeDescriptionDTO> getSerdesForSerialize(KafkaCluster cluster,
   public List<SerdeDescriptionDTO> getSerdesForDeserialize(KafkaCluster cluster,
                                                            String topic,
                                                            Serde.Target serdeType) {
-    var serdes = clusterSerdes.get(cluster);
+    var serdes = getSerdesFor(cluster);
     var preferred = serdes.suggestSerdeForDeserialize(topic, serdeType);
     var result = new ArrayList<SerdeDescriptionDTO>();
     result.add(toDto(preferred, topic, serdeType, true));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index d0bf94c98b6..7654758fdf3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -13,6 +13,7 @@
 import com.provectus.kafka.ui.model.MessageFilterTypeDTO;
 import com.provectus.kafka.ui.model.SeekDirectionDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
+import com.provectus.kafka.ui.serde.api.Serde;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
 import com.provectus.kafka.ui.util.ResultSizeLimiter;
@@ -21,6 +22,7 @@
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
@@ -177,6 +179,7 @@ private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
     return Flux.create(emitter)
         .contextWrite(ctx -> ctx.put(MessageFilterStats.class, filterStats))
         .filter(getMsgFilter(query, filterQueryType, filterStats))
+        .map(getDataMasker(cluster, topic))
         .takeWhile(createTakeWhilePredicate(seekDirection, limit))
         .subscribeOn(Schedulers.boundedElastic())
         .share();
@@ -189,6 +192,20 @@ private Predicate<TopicMessageEventDTO> createTakeWhilePredicate(
         : new ResultSizeLimiter(limit);
   }
 
+  private UnaryOperator<TopicMessageEventDTO> getDataMasker(KafkaCluster cluster, String topicName) {
+    var keyMasker = cluster.getMasking().getMaskingFunction(topicName, Serde.Target.KEY);
+    var valMasker = cluster.getMasking().getMaskingFunction(topicName, Serde.Target.VALUE);
+    return evt -> {
+      if (evt.getType() != TopicMessageEventDTO.TypeEnum.MESSAGE) {
+        return evt;
+      }
+      return evt.message(
+        evt.getMessage()
+            .key(keyMasker.apply(evt.getMessage().getKey()))
+            .content(valMasker.apply(evt.getMessage().getContent())));
+    };
+  }
+
   private Predicate<TopicMessageEventDTO> getMsgFilter(String query,
                                                        MessageFilterTypeDTO filterQueryType,
                                                        MessageFilterStats filterStats) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
new file mode 100644
index 00000000000..a8a69ad752b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
@@ -0,0 +1,92 @@
+package com.provectus.kafka.ui.service.masking;
+
+import static java.util.stream.Collectors.toList;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.service.masking.policies.MaskingPolicy;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.UnaryOperator;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+import lombok.Value;
+import org.apache.commons.lang3.StringUtils;
+
+public class DataMasking {
+
+  private static final JsonMapper JSON_MAPPER = new JsonMapper();
+
+  @Value
+  static class Mask {
+    @Nullable
+    Pattern topicKeysPattern;
+    @Nullable
+    Pattern topicValuesPattern;
+
+    MaskingPolicy policy;
+
+    boolean shouldBeApplied(String topic, Serde.Target target) {
+      return target == Serde.Target.KEY
+          ? topicKeysPattern != null && topicKeysPattern.matcher(topic).matches()
+          : topicValuesPattern != null && topicValuesPattern.matcher(topic).matches();
+    }
+  }
+
+  private final List<Mask> masks;
+
+  public static DataMasking create(List<ClustersProperties.Masking> config) {
+    return new DataMasking(
+        config.stream().map(property -> {
+          Preconditions.checkNotNull(property.getType(), "masking type not specifed");
+          Preconditions.checkArgument(
+              StringUtils.isNotEmpty(property.getTopicKeysPattern())
+                  || StringUtils.isNotEmpty(property.getTopicValuesPattern()),
+              "topicKeysPattern or topicValuesPattern (or both) should be set for masking policy");
+          return new Mask(
+              Optional.ofNullable(property.getTopicKeysPattern()).map(Pattern::compile).orElse(null),
+              Optional.ofNullable(property.getTopicValuesPattern()).map(Pattern::compile).orElse(null),
+              MaskingPolicy.create(property)
+          );
+        }).collect(toList()));
+  }
+
+  @VisibleForTesting
+  DataMasking(List<Mask> masks) {
+    this.masks = masks;
+  }
+
+  public UnaryOperator<String> getMaskingFunction(String topic, Serde.Target target) {
+    var targetMasks = masks.stream().filter(m -> m.shouldBeApplied(topic, target)).collect(toList());
+    if (targetMasks.isEmpty()) {
+      return UnaryOperator.identity();
+    }
+    return inputStr -> {
+      if (inputStr == null) {
+        return null;
+      }
+      try {
+        JsonNode json = JSON_MAPPER.readTree(inputStr);
+        if (json.isContainerNode()) {
+          for (Mask targetMask : targetMasks) {
+            json = targetMask.policy.applyToJsonContainer((ContainerNode<?>) json);
+          }
+          return json.toString();
+        }
+      } catch (JsonProcessingException jsonException) {
+        //just ignore
+      }
+      // if we can't parse input as json or parsed json is not object/array
+      // we just apply first found policy
+      // (there is no need to apply all of them, because they will just override each other)
+      return targetMasks.get(0).policy.applyToString(inputStr);
+    };
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java
new file mode 100644
index 00000000000..1459e95f00a
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java
@@ -0,0 +1,94 @@
+package com.provectus.kafka.ui.service.masking.policies;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.base.Preconditions;
+import java.util.List;
+import java.util.function.UnaryOperator;
+
+class Mask extends MaskingPolicy {
+
+  private final UnaryOperator<String> masker;
+
+  Mask(List<String> fieldNames, List<String> maskingChars) {
+    super(fieldNames);
+    this.masker = createMasker(maskingChars);
+  }
+
+  @Override
+  public ContainerNode<?> applyToJsonContainer(ContainerNode<?> node) {
+    return (ContainerNode<?>) maskWithFieldsCheck(node);
+  }
+
+  @Override
+  public String applyToString(String str) {
+    return masker.apply(str);
+  }
+
+  private static UnaryOperator<String> createMasker(List<String> maskingChars) {
+    Preconditions.checkNotNull(maskingChars);
+    Preconditions.checkArgument(maskingChars.size() == 4, "mask pattern should contain 4 elements");
+    return input -> {
+      StringBuilder sb = new StringBuilder(input.length());
+      for (int i = 0; i < input.length(); i++) {
+        int cp = input.codePointAt(i);
+        switch (Character.getType(cp)) {
+          case Character.SPACE_SEPARATOR:
+          case Character.LINE_SEPARATOR:
+          case Character.PARAGRAPH_SEPARATOR:
+            sb.appendCodePoint(cp); // keeping separators as-is
+            break;
+          case Character.UPPERCASE_LETTER:
+            sb.append(maskingChars.get(0));
+            break;
+          case Character.LOWERCASE_LETTER:
+            sb.append(maskingChars.get(1));
+            break;
+          case Character.DECIMAL_DIGIT_NUMBER:
+            sb.append(maskingChars.get(2));
+            break;
+          default:
+            sb.append(maskingChars.get(3));
+        }
+      }
+      return sb.toString();
+    };
+  }
+
+  private JsonNode maskWithFieldsCheck(JsonNode node) {
+    if (node.isObject()) {
+      ObjectNode obj = ((ObjectNode) node).objectNode();
+      node.fields().forEachRemaining(f -> {
+        String fieldName = f.getKey();
+        JsonNode fieldVal = f.getValue();
+        if (fieldShouldBeMasked(fieldName)) {
+          obj.set(fieldName, maskNodeRecursively(fieldVal));
+        } else {
+          obj.set(fieldName, maskWithFieldsCheck(fieldVal));
+        }
+      });
+      return obj;
+    } else if (node.isArray()) {
+      ArrayNode arr = ((ArrayNode) node).arrayNode(node.size());
+      node.elements().forEachRemaining(e -> arr.add(maskWithFieldsCheck(e)));
+      return arr;
+    }
+    return node;
+  }
+
+  private JsonNode maskNodeRecursively(JsonNode node) {
+    if (node.isObject()) {
+      ObjectNode obj = ((ObjectNode) node).objectNode();
+      node.fields().forEachRemaining(f -> obj.set(f.getKey(), maskNodeRecursively(f.getValue())));
+      return obj;
+    } else if (node.isArray()) {
+      ArrayNode arr = ((ArrayNode) node).arrayNode(node.size());
+      node.elements().forEachRemaining(e -> arr.add(maskNodeRecursively(e)));
+      return arr;
+    }
+    return new TextNode(masker.apply(node.asText()));
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java
new file mode 100644
index 00000000000..25a463a9da8
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java
@@ -0,0 +1,39 @@
+package com.provectus.kafka.ui.service.masking.policies;
+
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.google.common.base.Preconditions;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public abstract class MaskingPolicy {
+
+  public static MaskingPolicy create(ClustersProperties.Masking property) {
+    Preconditions.checkNotNull(property.getFields());
+    switch (property.getType()) {
+      case REMOVE:
+        return new Remove(property.getFields());
+      case REPLACE:
+        return new Replace(property.getFields(), property.getReplacement());
+      case MASK:
+        return new Mask(property.getFields(), property.getPattern());
+      default:
+        throw new IllegalStateException("Unknown policy type: " + property.getType());
+    }
+  }
+
+  //----------------------------------------------------------------
+
+  // empty list means policy will be applied to all fields
+  private final List<String> fieldNames;
+
+  protected boolean fieldShouldBeMasked(String fieldName) {
+    return fieldNames.isEmpty() || fieldNames.contains(fieldName);
+  }
+
+  public abstract ContainerNode<?> applyToJsonContainer(ContainerNode<?> node);
+
+  public abstract String applyToString(String str);
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Remove.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Remove.java
new file mode 100644
index 00000000000..eb38b0d3e3a
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Remove.java
@@ -0,0 +1,43 @@
+package com.provectus.kafka.ui.service.masking.policies;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.util.List;
+
+class Remove extends MaskingPolicy {
+
+  Remove(List<String> fieldNames) {
+    super(fieldNames);
+  }
+
+  @Override
+  public String applyToString(String str) {
+    return "null";
+  }
+
+  @Override
+  public ContainerNode<?> applyToJsonContainer(ContainerNode<?> node) {
+    return (ContainerNode<?>) removeFields(node);
+  }
+
+  private JsonNode removeFields(JsonNode node) {
+    if (node.isObject()) {
+      ObjectNode obj = ((ObjectNode) node).objectNode();
+      node.fields().forEachRemaining(f -> {
+        String fieldName = f.getKey();
+        JsonNode fieldVal = f.getValue();
+        if (!fieldShouldBeMasked(fieldName)) {
+          obj.set(fieldName, removeFields(fieldVal));
+        }
+      });
+      return obj;
+    } else if (node.isArray()) {
+      var arr = ((ArrayNode) node).arrayNode(node.size());
+      node.elements().forEachRemaining(e -> arr.add(removeFields(e)));
+      return arr;
+    }
+    return node;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java
new file mode 100644
index 00000000000..a335730258a
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java
@@ -0,0 +1,64 @@
+package com.provectus.kafka.ui.service.masking.policies;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.base.Preconditions;
+import java.util.List;
+
+class Replace extends MaskingPolicy {
+
+  private final String replacement;
+
+  Replace(List<String> fieldNames, String replacementString) {
+    super(fieldNames);
+    this.replacement = Preconditions.checkNotNull(replacementString);
+  }
+
+  @Override
+  public String applyToString(String str) {
+    return replacement;
+  }
+
+  @Override
+  public ContainerNode<?> applyToJsonContainer(ContainerNode<?> node) {
+    return (ContainerNode<?>) replaceWithFieldsCheck(node);
+  }
+
+  private JsonNode replaceWithFieldsCheck(JsonNode node) {
+    if (node.isObject()) {
+      ObjectNode obj = ((ObjectNode) node).objectNode();
+      node.fields().forEachRemaining(f -> {
+        String fieldName = f.getKey();
+        JsonNode fieldVal = f.getValue();
+        if (fieldShouldBeMasked(fieldName)) {
+          obj.set(fieldName, replaceRecursive(fieldVal));
+        } else {
+          obj.set(fieldName, replaceWithFieldsCheck(fieldVal));
+        }
+      });
+      return obj;
+    } else if (node.isArray()) {
+      ArrayNode arr = ((ArrayNode) node).arrayNode(node.size());
+      node.elements().forEachRemaining(e -> arr.add(replaceWithFieldsCheck(e)));
+      return arr;
+    }
+    // if it is not an object or array - we have nothing to replace here
+    return node;
+  }
+
+  private JsonNode replaceRecursive(JsonNode node) {
+    if (node.isObject()) {
+      ObjectNode obj = ((ObjectNode) node).objectNode();
+      node.fields().forEachRemaining(f -> obj.set(f.getKey(), replaceRecursive(f.getValue())));
+      return obj;
+    } else if (node.isArray()) {
+      ArrayNode arr = ((ArrayNode) node).arrayNode(node.size());
+      node.elements().forEachRemaining(e -> arr.add(replaceRecursive(e)));
+      return arr;
+    }
+    return new TextNode(replacement);
+  }
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
index afecccd1072..a30e45fb3ed 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
@@ -66,6 +66,9 @@ public void initialize(@NotNull ConfigurableApplicationContext context) {
       System.setProperty("kafka.clusters.0.kafkaConnect.0.userName", "kafka-connect");
       System.setProperty("kafka.clusters.0.kafkaConnect.0.password", "kafka-connect");
       System.setProperty("kafka.clusters.0.kafkaConnect.0.address", kafkaConnect.getTarget());
+      System.setProperty("kafka.clusters.0.masking.0.type", "REPLACE");
+      System.setProperty("kafka.clusters.0.masking.0.replacement", "***");
+      System.setProperty("kafka.clusters.0.masking.0.topicValuesPattern", "masking-test-.*");
 
       System.setProperty("kafka.clusters.1.name", SECOND_LOCAL);
       System.setProperty("kafka.clusters.1.readOnly", "true");
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
index 8c18e20882c..ec2ae985f17 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
@@ -2,17 +2,27 @@
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.exception.TopicNotFoundException;
+import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.CreateTopicMessageDTO;
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.SeekDirectionDTO;
+import com.provectus.kafka.ui.model.SeekTypeDTO;
+import com.provectus.kafka.ui.model.TopicMessageDTO;
+import com.provectus.kafka.ui.model.TopicMessageEventDTO;
+import com.provectus.kafka.ui.producer.KafkaTestProducer;
+import com.provectus.kafka.ui.serdes.builtin.StringSerde;
 import java.util.List;
 import java.util.UUID;
+import org.apache.kafka.clients.admin.NewTopic;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
 class MessagesServiceTest extends AbstractIntegrationTest {
 
+  private static final String MASKED_TOPICS_PREFIX = "masking-test-";
   private static final String NON_EXISTING_TOPIC = UUID.randomUUID().toString();
 
   @Autowired
@@ -50,4 +60,35 @@ void loadMessagesReturnsExceptionWhenTopicNotFound() {
         .verify();
   }
 
+  @Test
+  void maskingAppliedOnConfiguredClusters() {
+    String testTopic = MASKED_TOPICS_PREFIX + UUID.randomUUID();
+    try (var producer = KafkaTestProducer.forKafka(kafka)) {
+      createTopic(new NewTopic(testTopic, 1, (short) 1));
+      producer.send(testTopic, "message1");
+      producer.send(testTopic, "message2");
+
+      Flux<TopicMessageDTO> msgsFlux = messagesService.loadMessages(
+          cluster,
+          testTopic,
+          new ConsumerPosition(SeekTypeDTO.BEGINNING, testTopic, null),
+          null,
+          null,
+          100,
+          SeekDirectionDTO.FORWARD,
+          StringSerde.name(),
+          StringSerde.name()
+      ).filter(evt -> evt.getType() == TopicMessageEventDTO.TypeEnum.MESSAGE)
+          .map(TopicMessageEventDTO::getMessage);
+
+      // both messages should be masked
+      StepVerifier.create(msgsFlux)
+          .expectNextMatches(msg -> msg.getContent().equals("***"))
+          .expectNextMatches(msg -> msg.getContent().equals("***"))
+          .verifyComplete();
+    } finally {
+      deleteTopic(testTopic);
+    }
+  }
+
 }
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/DataMaskingTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/DataMaskingTest.java
new file mode 100644
index 00000000000..4fb51af0a21
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/DataMaskingTest.java
@@ -0,0 +1,89 @@
+package com.provectus.kafka.ui.service.masking;
+
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.service.masking.policies.MaskingPolicy;
+import java.util.List;
+import java.util.regex.Pattern;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+class DataMaskingTest {
+
+  private static final String TOPIC = "test_topic";
+
+  private DataMasking masking;
+
+  private MaskingPolicy policy1;
+  private MaskingPolicy policy2;
+  private MaskingPolicy policy3;
+
+  @BeforeEach
+  void init() {
+    policy1 = spy(createMaskPolicy());
+    policy2 = spy(createMaskPolicy());
+    policy3 = spy(createMaskPolicy());
+
+    masking = new DataMasking(
+        List.of(
+            new DataMasking.Mask(Pattern.compile(TOPIC), null, policy1),
+            new DataMasking.Mask(null, Pattern.compile(TOPIC), policy2),
+            new DataMasking.Mask(null, Pattern.compile(TOPIC + "|otherTopic"), policy3)));
+  }
+
+  private MaskingPolicy createMaskPolicy() {
+    var props = new ClustersProperties.Masking();
+    props.setType(ClustersProperties.Masking.Type.REMOVE);
+    return MaskingPolicy.create(props);
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {
+      "{\"some\": \"json\"}",
+      "[ {\"json\": \"array\"} ]"
+  })
+  @SneakyThrows
+  void appliesMasksToJsonContainerArgsBasedOnTopicPatterns(String jsonObjOrArr) {
+    var parsedJson = (ContainerNode<?>) new JsonMapper().readTree(jsonObjOrArr);
+
+    masking.getMaskingFunction(TOPIC, Serde.Target.KEY).apply(jsonObjOrArr);
+    verify(policy1).applyToJsonContainer(eq(parsedJson));
+    verifyNoInteractions(policy2, policy3);
+
+    reset(policy1, policy2, policy3);
+
+    masking.getMaskingFunction(TOPIC, Serde.Target.VALUE).apply(jsonObjOrArr);
+    verify(policy2).applyToJsonContainer(eq(parsedJson));
+    verify(policy3).applyToJsonContainer(eq(policy2.applyToJsonContainer(parsedJson)));
+    verifyNoInteractions(policy1);
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {
+      "non json str",
+      "234",
+      "null"
+  })
+  void appliesFirstFoundMaskToStringArgsBasedOnTopicPatterns(String nonJsonObjOrArrString) {
+    masking.getMaskingFunction(TOPIC, Serde.Target.KEY).apply(nonJsonObjOrArrString);
+    verify(policy1).applyToString(eq(nonJsonObjOrArrString));
+    verifyNoInteractions(policy2, policy3);
+
+    reset(policy1, policy2, policy3);
+
+    masking.getMaskingFunction(TOPIC, Serde.Target.VALUE).apply(nonJsonObjOrArrString);
+    verify(policy2).applyToString(eq(nonJsonObjOrArrString));
+    verifyNoInteractions(policy1, policy3);
+  }
+
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/MaskTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/MaskTest.java
new file mode 100644
index 00000000000..9cb97012458
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/MaskTest.java
@@ -0,0 +1,68 @@
+package com.provectus.kafka.ui.service.masking.policies;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import java.util.List;
+import java.util.stream.Stream;
+import lombok.SneakyThrows;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class MaskTest {
+
+  private static final List<String> TARGET_FIELDS = List.of("id", "name");
+  private static final List<String> PATTERN = List.of("X", "x", "n", "-");
+
+  @ParameterizedTest
+  @MethodSource
+  void testApplyToJsonContainer(List<String> fields, ContainerNode<?> original, ContainerNode<?> expected) {
+    Mask policy = new Mask(fields, PATTERN);
+    assertThat(policy.applyToJsonContainer(original)).isEqualTo(expected);
+  }
+
+  private static Stream<Arguments> testApplyToJsonContainer() {
+    return Stream.of(
+        Arguments.of(
+            TARGET_FIELDS,
+            parse("{ \"id\": 123, \"name\": { \"first\": \"James\", \"surname\": \"Bond777!\"}}"),
+            parse("{ \"id\": \"nnn\", \"name\": { \"first\": \"Xxxxx\", \"surname\": \"Xxxxnnn-\"}}")
+        ),
+        Arguments.of(
+            TARGET_FIELDS,
+            parse("[{ \"id\": 123, \"f2\": 234}, { \"name\": \"1.2\", \"f2\": 345} ]"),
+            parse("[{ \"id\": \"nnn\", \"f2\": 234}, { \"name\": \"n-n\", \"f2\": 345} ]")
+        ),
+        Arguments.of(
+            TARGET_FIELDS,
+            parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Bond777!\"}}"),
+            parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Xxxxnnn-\"}}")
+        ),
+        Arguments.of(
+            List.of(),
+            parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Bond777!\"}}"),
+            parse("{ \"outer\": { \"f1\": \"Xxxxx\", \"name\": \"Xxxxnnn-\"}}")
+        )
+    );
+  }
+
+  @ParameterizedTest
+  @CsvSource({
+      "Some string?!1, Xxxx xxxxxx--n",
+      "1.24343, n-nnnnn",
+      "null, xxxx"
+  })
+  void testApplyToString(String original, String expected) {
+    Mask policy = new Mask(List.of(), PATTERN);
+    assertThat(policy.applyToString(original)).isEqualTo(expected);
+  }
+
+  @SneakyThrows
+  private static JsonNode parse(String str) {
+    return new JsonMapper().readTree(str);
+  }
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/RemoveTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/RemoveTest.java
new file mode 100644
index 00000000000..31ef4eb3c35
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/RemoveTest.java
@@ -0,0 +1,72 @@
+package com.provectus.kafka.ui.service.masking.policies;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import java.util.List;
+import java.util.stream.Stream;
+import lombok.SneakyThrows;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class RemoveTest {
+
+  private static final List<String> TARGET_FIELDS = List.of("id", "name");
+
+  @ParameterizedTest
+  @MethodSource
+  void testApplyToJsonContainer(List<String> fields, ContainerNode<?> original, ContainerNode<?>  expected) {
+    var policy = new Remove(fields);
+    assertThat(policy.applyToJsonContainer(original)).isEqualTo(expected);
+  }
+
+  private static Stream<Arguments> testApplyToJsonContainer() {
+    return Stream.of(
+        Arguments.of(
+            TARGET_FIELDS,
+            parse("{ \"id\": 123, \"name\": { \"first\": \"James\", \"surname\": \"Bond777!\"}}"),
+            parse("{}")
+        ),
+        Arguments.of(
+            TARGET_FIELDS,
+            parse("[{ \"id\": 123, \"f2\": 234}, { \"name\": \"1.2\", \"f2\": 345} ]"),
+            parse("[{ \"f2\": 234}, { \"f2\": 345} ]")
+        ),
+        Arguments.of(
+            TARGET_FIELDS,
+            parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Bond777!\"}}"),
+            parse("{ \"outer\": { \"f1\": \"James\"}}")
+        ),
+        Arguments.of(
+            List.of(),
+            parse("{ \"outer\": { \"f1\": \"v1\", \"f2\": \"v2\", \"inner\" : {\"if1\": \"iv1\"}}}"),
+            parse("{}")
+        ),
+        Arguments.of(
+            List.of(),
+            parse("[{ \"f1\": 123}, { \"f2\": \"1.2\"} ]"),
+            parse("[{}, {}]")
+        )
+    );
+  }
+
+  @SneakyThrows
+  private static JsonNode parse(String str) {
+    return new JsonMapper().readTree(str);
+  }
+
+  @ParameterizedTest
+  @CsvSource({
+      "Some string?!1, null",
+      "1.24343, null",
+      "null, null"
+  })
+  void testApplyToString(String original, String expected) {
+    var policy = new Remove(List.of());
+    assertThat(policy.applyToString(original)).isEqualTo(expected);
+  }
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/ReplaceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/ReplaceTest.java
new file mode 100644
index 00000000000..f3ac69747b8
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/ReplaceTest.java
@@ -0,0 +1,68 @@
+package com.provectus.kafka.ui.service.masking.policies;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import java.util.List;
+import java.util.stream.Stream;
+import lombok.SneakyThrows;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class ReplaceTest {
+
+  private static final List<String> TARGET_FIELDS = List.of("id", "name");
+  private static final String REPLACEMENT_STRING = "***";
+
+  @ParameterizedTest
+  @MethodSource
+  void testApplyToJsonContainer(List<String> fields, ContainerNode<?> original, ContainerNode<?>  expected) {
+    var policy = new Replace(fields, REPLACEMENT_STRING);
+    assertThat(policy.applyToJsonContainer(original)).isEqualTo(expected);
+  }
+
+  private static Stream<Arguments> testApplyToJsonContainer() {
+    return Stream.of(
+        Arguments.of(
+            TARGET_FIELDS,
+            parse("{ \"id\": 123, \"name\": { \"first\": \"James\", \"surname\": \"Bond777!\"}}"),
+            parse("{ \"id\": \"***\", \"name\": { \"first\": \"***\", \"surname\": \"***\"}}")
+        ),
+        Arguments.of(
+            TARGET_FIELDS,
+            parse("[{ \"id\": 123, \"f2\": 234}, { \"name\": \"1.2\", \"f2\": 345} ]"),
+            parse("[{ \"id\": \"***\", \"f2\": 234}, { \"name\": \"***\", \"f2\": 345} ]")
+        ),
+        Arguments.of(
+            TARGET_FIELDS,
+            parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Bond777!\"}}"),
+            parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"***\"}}")
+        ),
+        Arguments.of(
+            List.of(),
+            parse("{ \"outer\": { \"f1\": \"v1\", \"f2\": \"v2\", \"inner\" : {\"if1\": \"iv1\"}}}"),
+            parse("{ \"outer\": { \"f1\": \"***\", \"f2\": \"***\", \"inner\" : {\"if1\": \"***\"}}}}")
+        )
+    );
+  }
+
+  @SneakyThrows
+  private static JsonNode parse(String str) {
+    return new JsonMapper().readTree(str);
+  }
+
+  @ParameterizedTest
+  @CsvSource({
+      "Some string?!1, ***",
+      "1.24343, ***",
+      "null, ***"
+  })
+  void testApplyToString(String original, String expected) {
+    var policy = new Replace(List.of(), REPLACEMENT_STRING);
+    assertThat(policy.applyToString(original)).isEqualTo(expected);
+  }
+}
\ No newline at end of file

From 216b4acd3ddf92d4a0b8fa5357006353b52248ae Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 30 Nov 2022 18:43:48 +0400
Subject: [PATCH 302/734] Serdes improvements and fixes (#2989)

Serdes improvements and fixes:
1. Built-in serdel's auto-configuration separated from explicit configuration (when properties set in serde configuration)
2. Serdes initialization logic extracted into SerdesInitializer.java
3. docker-compose example with serdes configuration added
4. Serialization.md document fixed
---
 documentation/compose/kafka-ui-serdes.yaml    | 111 ++++++++
 documentation/compose/proto/key-types.proto   |  11 +
 documentation/compose/proto/values.proto      |  12 +
 documentation/guides/Protobuf.md              |  22 +-
 documentation/guides/Serialization.md         |  28 +-
 .../kafka/ui/serdes/BuiltInSerde.java         |  19 +-
 .../kafka/ui/serdes/ClusterSerdes.java        | 173 +-----------
 .../kafka/ui/serdes/SerdeInstance.java        |   6 +-
 .../kafka/ui/serdes/SerdesInitializer.java    | 251 ++++++++++++++++++
 .../kafka/ui/serdes/builtin/Int32Serde.java   |   6 -
 .../kafka/ui/serdes/builtin/Int64Serde.java   |   7 -
 .../ui/serdes/builtin/ProtobufFileSerde.java  |  43 +--
 .../kafka/ui/serdes/builtin/StringSerde.java  |   9 +-
 .../kafka/ui/serdes/builtin/UInt32Serde.java  |   7 -
 .../kafka/ui/serdes/builtin/UInt64Serde.java  |   9 -
 .../ui/serdes/builtin/UuidBinarySerde.java    |   7 +-
 .../builtin/sr/SchemaRegistrySerde.java       |  59 ++--
 .../ui/service/DeserializationService.java    |   6 +-
 .../ui/serdes/SerdesInitializerTest.java      | 183 +++++++++++++
 .../serdes/builtin/ProtobufFileSerdeTest.java |  20 +-
 20 files changed, 708 insertions(+), 281 deletions(-)
 create mode 100644 documentation/compose/kafka-ui-serdes.yaml
 create mode 100644 documentation/compose/proto/key-types.proto
 create mode 100644 documentation/compose/proto/values.proto
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/SerdesInitializerTest.java

diff --git a/documentation/compose/kafka-ui-serdes.yaml b/documentation/compose/kafka-ui-serdes.yaml
new file mode 100644
index 00000000000..143d454bb50
--- /dev/null
+++ b/documentation/compose/kafka-ui-serdes.yaml
@@ -0,0 +1,111 @@
+---
+version: '2'
+services:
+
+    kafka-ui:
+        container_name: kafka-ui
+        image: provectuslabs/kafka-ui:latest
+        ports:
+            - 8080:8080
+        depends_on:
+            - kafka0
+            - schemaregistry0
+        environment:
+            kafka.clusters.0.name: SerdeExampleCluster
+            kafka.clusters.0.bootstrapServers: kafka0:29092
+            kafka.clusters.0.schemaRegistry: http://schemaregistry0:8085
+            # optional auth and ssl properties for SR
+            #kafka.clusters.0.schemaRegistryAuth.username: "use"
+            #kafka.clusters.0.schemaRegistryAuth.password: "pswrd"
+            #kafka.clusters.0.schemaRegistrySSL.keystoreLocation: /kafka.keystore.jks
+            #kafka.clusters.0.schemaRegistrySSL.keystorePassword: "secret"
+            #kafka.clusters.0.schemaRegistrySSL.truststoreLocation: /kafka.truststore.jks
+            #kafka.clusters.0.schemaRegistrySSL.truststorePassword: "secret"
+
+            kafka.clusters.0.defaultKeySerde: Int32  #optional
+            kafka.clusters.0.defaultValueSerde: String #optional
+
+            kafka.clusters.0.serde.0.name: ProtobufFile
+            kafka.clusters.0.serde.0.topicKeysPattern: "topic1"
+            kafka.clusters.0.serde.0.topicValuesPattern: "topic1"
+            kafka.clusters.0.serde.0.properties.protobufFiles.0: /protofiles/key-types.proto
+            kafka.clusters.0.serde.0.properties.protobufFiles.1: /protofiles/values.proto
+            kafka.clusters.0.serde.0.properties.protobufMessageNameForKey: test.MyKey # default type for keys
+            kafka.clusters.0.serde.0.properties.protobufMessageName: test.MyValue # default type for values
+            kafka.clusters.0.serde.0.properties.protobufMessageNameForKeyByTopic.topic1: test.MySpecificTopicKey # keys type for topic "topic1"
+            kafka.clusters.0.serde.0.properties.protobufMessageNameByTopic.topic1: test.MySpecificTopicValue # values type for topic "topic1"
+
+            kafka.clusters.0.serde.1.name: String
+            #kafka.clusters.0.serde.1.properties.encoding: "UTF-16" #optional, default is UTF-8
+            kafka.clusters.0.serde.1.topicValuesPattern: "json-events|text-events"
+
+            kafka.clusters.0.serde.2.name: AsciiString
+            kafka.clusters.0.serde.2.className: com.provectus.kafka.ui.serdes.builtin.StringSerde
+            kafka.clusters.0.serde.2.properties.encoding: "ASCII"
+
+            kafka.clusters.0.serde.3.name: SchemaRegistry # will be configured automatically using cluster SR
+            kafka.clusters.0.serde.3.topicValuesPattern: "sr-topic.*"
+
+            kafka.clusters.0.serde.4.name: AnotherSchemaRegistry
+            kafka.clusters.0.serde.4.className: com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde
+            kafka.clusters.0.serde.4.properties.url: http://schemaregistry0:8085
+            kafka.clusters.0.serde.4.properties.keySchemaNameTemplate: "%s-key"
+            kafka.clusters.0.serde.4.properties.schemaNameTemplate: "%s-value"
+            #kafka.clusters.0.serde.4.topicValuesPattern: "sr2-topic.*"
+            # optional auth and ssl properties for SR:
+            #kafka.clusters.0.serde.4.properties.username: "user"
+            #kafka.clusters.0.serde.4.properties.password: "passw"
+            #kafka.clusters.0.serde.4.properties.keystoreLocation:  /kafka.keystore.jks
+            #kafka.clusters.0.serde.4.properties.keystorePassword: "secret"
+            #kafka.clusters.0.serde.4.properties.truststoreLocation: /kafka.truststore.jks
+            #kafka.clusters.0.serde.4.properties.truststorePassword: "secret"
+
+            kafka.clusters.0.serde.5.name: UInt64
+            kafka.clusters.0.serde.5.topicKeysPattern: "topic-with-uint64keys"
+        volumes:
+            - ./proto:/protofiles
+
+    kafka0:
+        image: confluentinc/cp-kafka:7.2.1
+        hostname: kafka0
+        container_name: kafka0
+        ports:
+            - "9092:9092"
+            - "9997:9997"
+        environment:
+            KAFKA_BROKER_ID: 1
+            KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+            KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092'
+            KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+            KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+            KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+            KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+            KAFKA_JMX_PORT: 9997
+            KAFKA_JMX_HOSTNAME: localhost
+            KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
+            KAFKA_PROCESS_ROLES: 'broker,controller'
+            KAFKA_NODE_ID: 1
+            KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka0:29093'
+            KAFKA_LISTENERS: 'PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+            KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+            KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+            KAFKA_LOG_DIRS: '/tmp/kraft-combined-logs'
+        volumes:
+            - ./scripts/update_run.sh:/tmp/update_run.sh
+        command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
+
+    schemaregistry0:
+        image: confluentinc/cp-schema-registry:7.2.1
+        ports:
+            - 8085:8085
+        depends_on:
+            - kafka0
+        environment:
+            SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
+            SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
+            SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
+            SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
+
+            SCHEMA_REGISTRY_SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: "http"
+            SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
+            SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
diff --git a/documentation/compose/proto/key-types.proto b/documentation/compose/proto/key-types.proto
new file mode 100644
index 00000000000..908aed5689d
--- /dev/null
+++ b/documentation/compose/proto/key-types.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+package test;
+
+message MyKey {
+    string myKeyF1 = 1;
+}
+
+message MySpecificTopicKey {
+    string special_field1 = 1;
+    string special_field2 = 2;
+}
diff --git a/documentation/compose/proto/values.proto b/documentation/compose/proto/values.proto
new file mode 100644
index 00000000000..fbdd994761b
--- /dev/null
+++ b/documentation/compose/proto/values.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+package test;
+
+message MySpecificTopicValue {
+    string f1 = 1;
+    string f2 = 2;
+}
+
+message MyValue {
+  int32 version = 1;
+  string payload = 2;
+}
diff --git a/documentation/guides/Protobuf.md b/documentation/guides/Protobuf.md
index 93bc7133e0a..533a6a8f482 100644
--- a/documentation/guides/Protobuf.md
+++ b/documentation/guides/Protobuf.md
@@ -1,5 +1,7 @@
 # Kafkaui Protobuf Support
 
+### This document is deprecated, please see examples in [Serialization document](Serialization.md).
+
 Kafkaui supports deserializing protobuf messages in two ways:
 1. Using Confluent Schema Registry's [protobuf support](https://docs.confluent.io/platform/current/schema-registry/serdes-develop/serdes-protobuf.html).
 2. Supplying a protobuf file as well as a configuration that maps topic names to protobuf types.
@@ -15,11 +17,11 @@ kafka:
       protobufFile: path/to/my.proto
       # protobufFiles is the path to one or more protobuf schemas.
       protobufFiles: 
-          - path/to/my.proto
-          - path/to/another.proto
+        - /path/to/my.proto
+        - /path/to/another.proto
       # protobufMessageName is the default protobuf type that is used to deserilize
       # the message's value if the topic is not found in protobufMessageNameByTopic.
-      protobufMessageName: my.Type1
+      protobufMessageName: my.DefaultValType
       # protobufMessageNameByTopic is a mapping of topic names to protobuf types.
       # This mapping is required and is used to deserialize the Kafka message's value.
       protobufMessageNameByTopic:
@@ -27,11 +29,23 @@ kafka:
         topic2: my.Type2
       # protobufMessageNameForKey is the default protobuf type that is used to deserilize
       # the message's key if the topic is not found in protobufMessageNameForKeyByTopic.
-      protobufMessageNameForKey: my.Type1
+      protobufMessageNameForKey: my.DefaultKeyType
       # protobufMessageNameForKeyByTopic is a mapping of topic names to protobuf types.
       # This mapping is optional and is used to deserialize the Kafka message's key.
       # If a protobuf type is not found for a topic's key, the key is deserialized as a string,
       # unless protobufMessageNameForKey is specified.
       protobufMessageNameForKeyByTopic:
         topic1: my.KeyType1
+```
+
+Same config with flattened config (for docker-compose):
+
+```text
+kafka.clusters.0.protobufFiles.0: /path/to/my.proto
+kafka.clusters.0.protobufFiles.1: /path/to/another.proto
+kafka.clusters.0.protobufMessageName: my.DefaultValType
+kafka.clusters.0.protobufMessageNameByTopic.topic1: my.Type1
+kafka.clusters.0.protobufMessageNameByTopic.topic2: my.Type2
+kafka.clusters.0.protobufMessageNameForKey: my.DefaultKeyType
+kafka.clusters.0.protobufMessageNameForKeyByTopic.topic1: my.KeyType1
 ```
\ No newline at end of file
diff --git a/documentation/guides/Serialization.md b/documentation/guides/Serialization.md
index d44a3e65d15..19869a8bc18 100644
--- a/documentation/guides/Serialization.md
+++ b/documentation/guides/Serialization.md
@@ -34,7 +34,6 @@ kafka:
 ```
 
 ### Protobuf
-[Deprecated configuration is here](Protobuf.md)
 
 Class name: `com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde`
 
@@ -47,8 +46,10 @@ kafka:
       serdes:
         - name: ProtobufFile
           properties:
-            # path to the protobuf schema file
-            protobufFile: path/to/my.proto
+            # path to the protobuf schema files
+            protobufFiles:
+              - path/to/my.proto
+              - path/to/another.proto
             # default protobuf type that is used for KEY serialization/deserialization
             # optional
             protobufMessageNameForKey: my.Type1
@@ -64,12 +65,15 @@ kafka:
             # optional
             protobufMessageNameByTopic:
               topic1: my.Type1
-              topic2: my.Type2
+              "topic.2": my.Type2
 ```
+Docker-compose sample for Protobuf serialization is [here](../compose/kafka-ui-serdes.yaml).
+
+Legacy configuration for protobuf is [here](Protobuf.md).
 
 ### SchemaRegistry
 SchemaRegistry serde is automatically configured if schema registry properties set on cluster level.
-But you can override them or add new SchemaRegistry serde that will connect to another schema-registry instance. 
+But you can add new SchemaRegistry-typed serdes that will connect to another schema-registry instance. 
 
 Class name: `com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde`
 
@@ -78,24 +82,22 @@ Sample configuration:
 kafka:
   clusters:
     - name: Cluster1
-      # this schema-registry will be used by SchemaRegistrySerde by default
+      # this url will be used by "SchemaRegistry" by default
       schemaRegistry: http://main-schema-registry:8081
       serdes:
-        - name: SchemaRegistry
+        - name: AnotherSchemaRegistry
+          className: com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde
           properties:
-            # but you can override cluster-level properties
             url:  http://another-schema-registry:8081
             # auth properties, optional
             username: nameForAuth
             password: P@ssW0RdForAuth
         
           # and also add another SchemaRegistry serde
-        - name: AnotherOneSchemaRegistry
+        - name: ThirdSchemaRegistry
           className: com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde
           properties:
             url:  http://another-yet-schema-registry:8081
-            username: nameForAuth_2
-            password: P@ssW0RdForAuth_2
 ```
 
 ## Setting serdes for specific topics
@@ -115,8 +117,6 @@ kafka:
           topicKeysPattern: ".*-events"
         
         - name: SchemaRegistry
-          properties:
-            url:  http://schema-registry:8081
           topicValuesPattern: click-events|imp-events
 ```
 
@@ -129,7 +129,7 @@ Sample configuration:
 kafka:
   clusters:
     - name: Cluster1
-      defaultKeySerde: Int34
+      defaultKeySerde: Int32
       defaultValueSerde: String
       serdes:
         - name: Int32
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/BuiltInSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/BuiltInSerde.java
index be896dca501..c72a83ee29b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/BuiltInSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/BuiltInSerde.java
@@ -5,8 +5,23 @@
 
 public interface BuiltInSerde extends Serde {
 
-  default boolean initOnStartup(PropertyResolver kafkaClusterProperties,
-                                PropertyResolver globalProperties) {
+  // returns true is serde has enough properties set on cluster&global levels to
+  // be configured without explicit config provide
+  default boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties,
+                                      PropertyResolver globalProperties) {
     return true;
   }
+
+  // will be called for build-in serdes that were not explicitly registered
+  // and that returned true on canBeAutoConfigured(..) call.
+  // NOTE: Serde.configure() method won't be called if serde is auto-configured!
+  default void autoConfigure(PropertyResolver kafkaClusterProperties,
+                             PropertyResolver globalProperties) {
+  }
+
+  @Override
+  default void configure(PropertyResolver serdeProperties,
+                         PropertyResolver kafkaClusterProperties,
+                         PropertyResolver globalProperties) {
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java
index 6d7251cd86d..1c64cf02f8c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ClusterSerdes.java
@@ -1,188 +1,31 @@
 package com.provectus.kafka.ui.serdes;
 
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
-import com.provectus.kafka.ui.config.ClustersProperties;
-import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.serde.api.PropertyResolver;
 import com.provectus.kafka.ui.serde.api.Serde;
-import com.provectus.kafka.ui.serdes.builtin.Base64Serde;
-import com.provectus.kafka.ui.serdes.builtin.Int32Serde;
-import com.provectus.kafka.ui.serdes.builtin.Int64Serde;
-import com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde;
 import com.provectus.kafka.ui.serdes.builtin.StringSerde;
-import com.provectus.kafka.ui.serdes.builtin.UInt32Serde;
-import com.provectus.kafka.ui.serdes.builtin.UInt64Serde;
-import com.provectus.kafka.ui.serdes.builtin.UuidBinarySerde;
-import com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde;
 import java.io.Closeable;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import lombok.SneakyThrows;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.env.Environment;
 
 @Slf4j
+@RequiredArgsConstructor
 public class ClusterSerdes implements Closeable {
 
-  private static final CustomSerdeLoader CUSTOM_SERDE_LOADER = new CustomSerdeLoader();
-
-  private static final Map<String, Class<? extends BuiltInSerde>> BUILT_IN_SERDES =
-      ImmutableMap.<String, Class<? extends BuiltInSerde>>builder()
-          .put(StringSerde.name(), StringSerde.class)
-          .put(Int32Serde.name(), Int32Serde.class)
-          .put(Int64Serde.name(), Int64Serde.class)
-          .put(UInt32Serde.name(), UInt32Serde.class)
-          .put(UInt64Serde.name(), UInt64Serde.class)
-          .put(Base64Serde.name(), Base64Serde.class)
-          .put(SchemaRegistrySerde.name(), SchemaRegistrySerde.class)
-          .put(ProtobufFileSerde.name(), ProtobufFileSerde.class)
-          .put(UuidBinarySerde.name(), UuidBinarySerde.class)
-          .build();
-
-  // using linked map to keep order of serdes added to it
-  private final Map<String, SerdeInstance> serdes = new LinkedHashMap<>();
+  final Map<String, SerdeInstance> serdes;
 
   @Nullable
-  private final SerdeInstance defaultKeySerde;
+  final SerdeInstance defaultKeySerde;
 
   @Nullable
-  private final SerdeInstance defaultValueSerde;
-
-  private final SerdeInstance fallbackSerde;
-
-  public ClusterSerdes(Environment env,
-                       ClustersProperties clustersProperties,
-                       int clusterIndex) {
-    var globalPropertiesResolver = new PropertyResolverImpl(env);
-    var clusterPropertiesResolver = new PropertyResolverImpl(env, "kafka.clusters." + clusterIndex);
-
-    // initializing serdes from config
-    ClustersProperties.Cluster clusterProp = clustersProperties.getClusters().get(clusterIndex);
-    for (int i = 0; i < clusterProp.getSerde().size(); i++) {
-      var sendeConf = clusterProp.getSerde().get(i);
-      if (Strings.isNullOrEmpty(sendeConf.getName())) {
-        throw new ValidationException("'name' property not set for serde: " + sendeConf);
-      }
-      if (serdes.containsKey(sendeConf.getName())) {
-        throw new ValidationException("Multiple serdes with same name: " + sendeConf.getName());
-      }
-      var instance = initSerdeFromConfig(
-          sendeConf,
-          new PropertyResolverImpl(env, "kafka.clusters." + clusterIndex + ".serde." + i + ".properties"),
-          clusterPropertiesResolver,
-          globalPropertiesResolver
-      );
-      serdes.put(sendeConf.getName(), instance);
-    }
-
-    // initializing built-in serdes if they haven't been already initialized
-    BUILT_IN_SERDES.forEach((name, clazz) -> {
-      if (!serdes.containsKey(name)) { // serde can be already initialized with custom config
-        var serde = createSerdeInstance(clazz);
-        if (serde.initOnStartup(clusterPropertiesResolver, globalPropertiesResolver)) {
-          serde.configure(
-              PropertyResolverImpl.empty(),
-              clusterPropertiesResolver,
-              globalPropertiesResolver
-          );
-          serdes.put(name, new SerdeInstance(name, serde, null, null, null));
-        }
-      }
-    });
-
-    defaultKeySerde = Optional.ofNullable(clusterProp.getDefaultKeySerde())
-        .map(name -> Preconditions.checkNotNull(serdes.get(name), "Default key serde not found"))
-        .or(() -> Optional.ofNullable(serdes.get(SchemaRegistrySerde.name())))
-        .or(() -> Optional.ofNullable(serdes.get(ProtobufFileSerde.name())))
-        .orElse(null);
-
-    defaultValueSerde = Optional.ofNullable(clusterProp.getDefaultValueSerde())
-        .map(name -> Preconditions.checkNotNull(serdes.get(name), "Default value serde not found"))
-        .or(() -> Optional.ofNullable(serdes.get(SchemaRegistrySerde.name())))
-        .or(() -> Optional.ofNullable(serdes.get(ProtobufFileSerde.name())))
-        .orElse(null);
-
-    fallbackSerde = createFallbackSerde();
-  }
-
-  private SerdeInstance createFallbackSerde() {
-    StringSerde serde = new StringSerde();
-    serde.configure(PropertyResolverImpl.empty(), PropertyResolverImpl.empty(), PropertyResolverImpl.empty());
-    return new SerdeInstance("Fallback", serde, null, null, null);
-  }
+  final SerdeInstance defaultValueSerde;
 
-  @SneakyThrows
-  private SerdeInstance initSerdeFromConfig(ClustersProperties.SerdeConfig serdeConfig,
-                                            PropertyResolver serdeProps,
-                                            PropertyResolver clusterProps,
-                                            PropertyResolver globalProps) {
-    String name = serdeConfig.getName();
-    // configuring one of prebuilt serdes with custom params
-    if (BUILT_IN_SERDES.containsKey(name)) {
-      if (serdeConfig.getClassName() != null) {
-        throw new ValidationException("className can't be set for built-in serde");
-      }
-      if (serdeConfig.getFilePath() != null) {
-        throw new ValidationException("filePath can't be set for built-in serde");
-      }
-      var clazz = BUILT_IN_SERDES.get(name);
-      Serde serde = createSerdeInstance(clazz);
-      serde.configure(serdeProps, clusterProps, globalProps);
-      return new SerdeInstance(
-          name,
-          serde,
-          nullablePattern(serdeConfig.getTopicKeysPattern()),
-          nullablePattern(serdeConfig.getTopicValuesPattern()),
-          null
-      );
-    }
-    log.info("Loading custom serde {}", serdeConfig.getName());
-    return loadCustom(serdeConfig, serdeProps, clusterProps, globalProps);
-  }
-
-  @SneakyThrows
-  private <T extends Serde> T createSerdeInstance(Class<T> clazz) {
-    return clazz.getDeclaredConstructor().newInstance();
-  }
-
-  public SerdeInstance getFallbackSerde() {
-    return fallbackSerde;
-  }
-
-  private SerdeInstance loadCustom(ClustersProperties.SerdeConfig serdeConfig,
-                                   PropertyResolver serdeProps,
-                                   PropertyResolver clusterProps,
-                                   PropertyResolver globalProps) {
-    if (Strings.isNullOrEmpty(serdeConfig.getClassName())) {
-      throw new ValidationException(
-          "'className' property not set for custom serde " + serdeConfig.getName());
-    }
-    if (Strings.isNullOrEmpty(serdeConfig.getFilePath())) {
-      throw new ValidationException(
-          "'filePath' property not set for custom serde " + serdeConfig.getName());
-    }
-    var loaded = CUSTOM_SERDE_LOADER.loadAndConfigure(
-        serdeConfig.getClassName(), serdeConfig.getFilePath(), serdeProps, clusterProps, globalProps);
-    return new SerdeInstance(
-        serdeConfig.getName(),
-        loaded.getSerde(),
-        nullablePattern(serdeConfig.getTopicKeysPattern()),
-        nullablePattern(serdeConfig.getTopicValuesPattern()),
-        loaded.getClassLoader()
-    );
-  }
-
-  @Nullable
-  private Pattern nullablePattern(@Nullable String pattern) {
-    return pattern == null ? null : Pattern.compile(pattern);
-  }
+  @Getter
+  final SerdeInstance fallbackSerde;
 
   private Optional<SerdeInstance> findSerdeByPatternsOrDefault(String topic,
                                                                Serde.Target type,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
index 09980e7e423..e047e8466c6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
@@ -16,9 +16,9 @@
 public class SerdeInstance implements Closeable {
 
   @Getter
-  private final String name;
+  final String name;
 
-  private final Serde serde;
+  final Serde serde;
 
   @Nullable
   final Pattern topicKeyPattern;
@@ -27,7 +27,7 @@ public class SerdeInstance implements Closeable {
   final Pattern topicValuePattern;
 
   @Nullable // will be set for custom serdes
-  private final ClassLoader classLoader;
+  final ClassLoader classLoader;
 
   private <T> T wrapWithClassloader(Supplier<T> call) {
     if (classLoader == null) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
new file mode 100644
index 00000000000..8eb94d3a6df
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
@@ -0,0 +1,251 @@
+package com.provectus.kafka.ui.serdes;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableMap;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.config.ClustersProperties.SerdeConfig;
+import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.builtin.Base64Serde;
+import com.provectus.kafka.ui.serdes.builtin.Int32Serde;
+import com.provectus.kafka.ui.serdes.builtin.Int64Serde;
+import com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde;
+import com.provectus.kafka.ui.serdes.builtin.StringSerde;
+import com.provectus.kafka.ui.serdes.builtin.UInt32Serde;
+import com.provectus.kafka.ui.serdes.builtin.UInt64Serde;
+import com.provectus.kafka.ui.serdes.builtin.UuidBinarySerde;
+import com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import javax.annotation.Nullable;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.env.Environment;
+
+@Slf4j
+public class SerdesInitializer {
+
+  private final Map<String, Class<? extends BuiltInSerde>> builtInSerdeClasses;
+  private final CustomSerdeLoader customSerdeLoader;
+
+  public SerdesInitializer() {
+    this(
+        ImmutableMap.<String, Class<? extends BuiltInSerde>>builder()
+            .put(StringSerde.name(), StringSerde.class)
+            .put(SchemaRegistrySerde.name(), SchemaRegistrySerde.class)
+            .put(ProtobufFileSerde.name(), ProtobufFileSerde.class)
+            .put(Int32Serde.name(), Int32Serde.class)
+            .put(Int64Serde.name(), Int64Serde.class)
+            .put(UInt32Serde.name(), UInt32Serde.class)
+            .put(UInt64Serde.name(), UInt64Serde.class)
+            .put(Base64Serde.name(), Base64Serde.class)
+            .put(UuidBinarySerde.name(), UuidBinarySerde.class)
+            .build(),
+        new CustomSerdeLoader()
+    );
+  }
+
+  @VisibleForTesting
+  SerdesInitializer(Map<String, Class<? extends BuiltInSerde>> builtInSerdeClasses,
+                    CustomSerdeLoader customSerdeLoader) {
+    this.builtInSerdeClasses = builtInSerdeClasses;
+    this.customSerdeLoader = customSerdeLoader;
+  }
+
+  /**
+   * Initialization algorithm:
+   * First, we iterate over explicitly configured serdes from cluster config:
+   * > if serde has name = one of built-in serde's names:
+   * - if serde's properties are empty, we treat it as serde should be
+   * auto-configured - we try to do that
+   * - if serde's properties not empty, we treat it as an intention to
+   * override default configuration, so we configuring it with specific config (calling configure(..))
+   * <p/>
+   * > if serde has className = one of built-in serde's classes:
+   * - initializing it with specific config and with default classloader
+   * <p/>
+   * > if serde has custom className != one of built-in serde's classes:
+   * - initializing it with specific config and with custom classloader (see CustomSerdeLoader)
+   * <p/>
+   * Second, we iterate over remaining built-in serdes (that we NOT explicitly configured by config)
+   * trying to auto-configure them and  registering with empty patterns - they will be present
+   * in Serde selection in UI, but not assigned to any topic k/v.
+   */
+  public ClusterSerdes init(Environment env,
+                            ClustersProperties clustersProperties,
+                            int clusterIndex) {
+    ClustersProperties.Cluster clusterProperties = clustersProperties.getClusters().get(clusterIndex);
+    log.debug("Configuring serdes for cluster {}", clusterProperties.getName());
+
+    var globalPropertiesResolver = new PropertyResolverImpl(env);
+    var clusterPropertiesResolver = new PropertyResolverImpl(env, "kafka.clusters." + clusterIndex);
+
+    Map<String, SerdeInstance> registeredSerdes = new LinkedHashMap<>();
+    // initializing serdes from config
+    for (int i = 0; i < clusterProperties.getSerde().size(); i++) {
+      SerdeConfig serdeConfig = clusterProperties.getSerde().get(i);
+      if (Strings.isNullOrEmpty(serdeConfig.getName())) {
+        throw new ValidationException("'name' property not set for serde: " + serdeConfig);
+      }
+      if (registeredSerdes.containsKey(serdeConfig.getName())) {
+        throw new ValidationException("Multiple serdes with same name: " + serdeConfig.getName());
+      }
+      var instance = createSerdeFromConfig(
+          serdeConfig,
+          new PropertyResolverImpl(env, "kafka.clusters." + clusterIndex + ".serde." + i + ".properties"),
+          clusterPropertiesResolver,
+          globalPropertiesResolver
+      );
+      registeredSerdes.put(serdeConfig.getName(), instance);
+    }
+
+    // initializing remaining built-in serdes with empty selection patters
+    builtInSerdeClasses.forEach((name, clazz) -> {
+      if (!registeredSerdes.containsKey(name)) {
+        BuiltInSerde serde = createSerdeInstance(clazz);
+        if (autoConfigureSerde(serde, clusterPropertiesResolver, globalPropertiesResolver)) {
+          registeredSerdes.put(name, new SerdeInstance(name, serde, null, null, null));
+        }
+      }
+    });
+
+    return new ClusterSerdes(
+        registeredSerdes,
+        Optional.ofNullable(clusterProperties.getDefaultKeySerde())
+            .map(name -> Preconditions.checkNotNull(registeredSerdes.get(name), "Default key serde not found"))
+            .or(() -> Optional.ofNullable(registeredSerdes.get(SchemaRegistrySerde.name())))
+            .or(() -> Optional.ofNullable(registeredSerdes.get(ProtobufFileSerde.name())))
+            .orElse(null),
+        Optional.ofNullable(clusterProperties.getDefaultValueSerde())
+            .map(name -> Preconditions.checkNotNull(registeredSerdes.get(name), "Default value serde not found"))
+            .or(() -> Optional.ofNullable(registeredSerdes.get(SchemaRegistrySerde.name())))
+            .or(() -> Optional.ofNullable(registeredSerdes.get(ProtobufFileSerde.name())))
+            .orElse(null),
+        createFallbackSerde()
+    );
+  }
+
+  private SerdeInstance createFallbackSerde() {
+    StringSerde serde = new StringSerde();
+    serde.configure(PropertyResolverImpl.empty(), PropertyResolverImpl.empty(), PropertyResolverImpl.empty());
+    return new SerdeInstance("Fallback", serde, null, null, null);
+  }
+
+  @SneakyThrows
+  private SerdeInstance createSerdeFromConfig(SerdeConfig serdeConfig,
+                                              PropertyResolver serdeProps,
+                                              PropertyResolver clusterProps,
+                                              PropertyResolver globalProps) {
+    if (builtInSerdeClasses.containsKey(serdeConfig.getName())) {
+      return createSerdeWithBuiltInSerdeName(serdeConfig, serdeProps, clusterProps, globalProps);
+    }
+    if (serdeConfig.getClassName() != null) {
+      var builtInSerdeClass = builtInSerdeClasses.values().stream()
+          .filter(c -> c.getName().equals(serdeConfig.getClassName()))
+          .findAny();
+      // built-in serde type with custom name
+      if (builtInSerdeClass.isPresent()) {
+        return createSerdeWithBuiltInClass(builtInSerdeClass.get(), serdeConfig, serdeProps, clusterProps, globalProps);
+      }
+    }
+    log.info("Loading custom serde {}", serdeConfig.getName());
+    return loadAndInitCustomSerde(serdeConfig, serdeProps, clusterProps, globalProps);
+  }
+
+  private SerdeInstance createSerdeWithBuiltInSerdeName(SerdeConfig serdeConfig,
+                                                        PropertyResolver serdeProps,
+                                                        PropertyResolver clusterProps,
+                                                        PropertyResolver globalProps) {
+    String name = serdeConfig.getName();
+    if (serdeConfig.getClassName() != null) {
+      throw new ValidationException("className can't be set for built-in serde");
+    }
+    if (serdeConfig.getFilePath() != null) {
+      throw new ValidationException("filePath can't be set for built-in serde types");
+    }
+    var clazz = builtInSerdeClasses.get(name);
+    BuiltInSerde serde = createSerdeInstance(clazz);
+    if (serdeConfig.getProperties().isEmpty()) {
+      if (!autoConfigureSerde(serde, serdeProps, globalProps)) {
+        // no properties provided and serde does not support auto-configuration
+        throw new ValidationException(name + " serde is not configured");
+      }
+    } else {
+      // configuring serde with explicitly set properties
+      serde.configure(serdeProps, clusterProps, globalProps);
+    }
+    return new SerdeInstance(
+        name,
+        serde,
+        nullablePattern(serdeConfig.getTopicKeysPattern()),
+        nullablePattern(serdeConfig.getTopicValuesPattern()),
+        null
+    );
+  }
+
+  private boolean autoConfigureSerde(BuiltInSerde serde, PropertyResolver clusterProps, PropertyResolver globalProps) {
+    if (serde.canBeAutoConfigured(clusterProps, globalProps)) {
+      serde.autoConfigure(clusterProps, globalProps);
+      return true;
+    }
+    return false;
+  }
+
+  @SneakyThrows
+  private SerdeInstance createSerdeWithBuiltInClass(Class<? extends BuiltInSerde> clazz,
+                                                    SerdeConfig serdeConfig,
+                                                    PropertyResolver serdeProps,
+                                                    PropertyResolver clusterProps,
+                                                    PropertyResolver globalProps) {
+    if (serdeConfig.getFilePath() != null) {
+      throw new ValidationException("filePath can't be set for built-in serde type");
+    }
+    BuiltInSerde serde = createSerdeInstance(clazz);
+    serde.configure(serdeProps, clusterProps, globalProps);
+    return new SerdeInstance(
+        serdeConfig.getName(),
+        serde,
+        nullablePattern(serdeConfig.getTopicKeysPattern()),
+        nullablePattern(serdeConfig.getTopicValuesPattern()),
+        null
+    );
+  }
+
+  @SneakyThrows
+  private <T extends Serde> T createSerdeInstance(Class<T> clazz) {
+    return clazz.getDeclaredConstructor().newInstance();
+  }
+
+  private SerdeInstance loadAndInitCustomSerde(SerdeConfig serdeConfig,
+                                               PropertyResolver serdeProps,
+                                               PropertyResolver clusterProps,
+                                               PropertyResolver globalProps) {
+    if (Strings.isNullOrEmpty(serdeConfig.getClassName())) {
+      throw new ValidationException(
+          "'className' property not set for custom serde " + serdeConfig.getName());
+    }
+    if (Strings.isNullOrEmpty(serdeConfig.getFilePath())) {
+      throw new ValidationException(
+          "'filePath' property not set for custom serde " + serdeConfig.getName());
+    }
+    var loaded = customSerdeLoader.loadAndConfigure(
+        serdeConfig.getClassName(), serdeConfig.getFilePath(), serdeProps, clusterProps, globalProps);
+    return new SerdeInstance(
+        serdeConfig.getName(),
+        loaded.getSerde(),
+        nullablePattern(serdeConfig.getTopicKeysPattern()),
+        nullablePattern(serdeConfig.getTopicValuesPattern()),
+        loaded.getClassLoader()
+    );
+  }
+
+  @Nullable
+  private Pattern nullablePattern(@Nullable String pattern) {
+    return pattern == null ? null : Pattern.compile(pattern);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java
index e28fc8fe5f3..95343a0eeb5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java
@@ -14,12 +14,6 @@ public static String name() {
     return "Int32";
   }
 
-  @Override
-  public void configure(PropertyResolver serdeProperties,
-                        PropertyResolver kafkaClusterProperties,
-                        PropertyResolver globalProperties) {
-  }
-
   @Override
   public Optional<String> getDescription() {
     return Optional.empty();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java
index 4e320aa1047..54741291b24 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java
@@ -15,13 +15,6 @@ public static String name() {
     return "Int64";
   }
 
-  @Override
-  public void configure(PropertyResolver serdeProperties,
-                        PropertyResolver kafkaClusterProperties,
-                        PropertyResolver globalProperties) {
-
-  }
-
   @Override
   public Optional<String> getDescription() {
     return Optional.empty();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
index 567b98584b0..664c75b70d7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
@@ -3,8 +3,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.DynamicMessage;
-import com.google.protobuf.Empty;
 import com.google.protobuf.util.JsonFormat;
+import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
 import com.provectus.kafka.ui.serde.api.PropertyResolver;
 import com.provectus.kafka.ui.serde.api.RecordHeaders;
@@ -42,47 +42,55 @@ public static String name() {
 
   private Map<Descriptor, Path> descriptorPaths = new HashMap<>();
 
+  @Nullable
   private Descriptor defaultMessageDescriptor;
 
   @Nullable
   private Descriptor defaultKeyMessageDescriptor;
 
   @Override
-  public boolean initOnStartup(PropertyResolver kafkaClusterProperties,
-                               PropertyResolver globalProperties) {
+  public boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties,
+                                     PropertyResolver globalProperties) {
     Optional<String> protobufFile = kafkaClusterProperties.getProperty("protobufFile", String.class);
     Optional<List<String>> protobufFiles = kafkaClusterProperties.getListProperty("protobufFiles", String.class);
+    return protobufFile.isPresent() || protobufFiles.filter(files -> !files.isEmpty()).isPresent();
+  }
 
-    return protobufFile.isPresent() || protobufFiles.map(files -> files.isEmpty() ? null : files).isPresent();
+  @Override
+  public void autoConfigure(PropertyResolver kafkaClusterProperties,
+                            PropertyResolver globalProperties) {
+    configure(kafkaClusterProperties);
   }
 
-  @SneakyThrows
   @Override
   public void configure(PropertyResolver serdeProperties,
                         PropertyResolver kafkaClusterProperties,
                         PropertyResolver globalProperties) {
-    Map<Path, ProtobufSchema> protobufSchemas = joinPathProperties(kafkaClusterProperties).stream()
+    configure(serdeProperties);
+  }
+
+  private void configure(PropertyResolver properties) {
+    Map<Path, ProtobufSchema> protobufSchemas = joinPathProperties(properties).stream()
         .map(path -> Map.entry(path, new ProtobufSchema(readFileAsString(path))))
         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
-
     // Load all referenced message schemas and store their source proto file with the descriptors
     Map<Descriptor, Path> descriptorPaths = new HashMap<>();
-    Optional<String> protobufMessageName = kafkaClusterProperties.getProperty("protobufMessageName", String.class);
+    Optional<String> protobufMessageName = properties.getProperty("protobufMessageName", String.class);
     protobufMessageName.ifPresent(messageName -> addProtobufSchema(descriptorPaths, protobufSchemas, messageName));
 
     Optional<String> protobufMessageNameForKey =
-        kafkaClusterProperties.getProperty("protobufMessageNameForKey", String.class);
+        properties.getProperty("protobufMessageNameForKey", String.class);
     protobufMessageNameForKey
         .ifPresent(messageName -> addProtobufSchema(descriptorPaths, protobufSchemas, messageName));
 
     Optional<Map<String, String>> protobufMessageNameByTopic =
-        kafkaClusterProperties.getMapProperty("protobufMessageNameByTopic", String.class, String.class);
+        properties.getMapProperty("protobufMessageNameByTopic", String.class, String.class);
     protobufMessageNameByTopic
         .ifPresent(messageNamesByTopic -> addProtobufSchemas(descriptorPaths, protobufSchemas, messageNamesByTopic));
 
     Optional<Map<String, String>> protobufMessageNameForKeyByTopic =
-        kafkaClusterProperties.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class);
+        properties.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class);
     protobufMessageNameForKeyByTopic
         .ifPresent(messageNamesByTopic -> addProtobufSchemas(descriptorPaths, protobufSchemas, messageNamesByTopic));
 
@@ -91,8 +99,7 @@ public void configure(PropertyResolver serdeProperties,
         .collect(Collectors.toMap(Descriptor::getFullName, Function.identity()));
 
     configure(
-        // this is strange logic, but we need it to support serde's backward-compatibility
-        protobufMessageName.map(descriptorMap::get).orElseGet(Empty::getDescriptor),
+        protobufMessageName.map(descriptorMap::get).orElse(null),
         protobufMessageNameForKey.map(descriptorMap::get).orElse(null),
         descriptorPaths,
         protobufMessageNameByTopic.map(map -> populateDescriptors(descriptorMap, map)).orElse(Map.of()),
@@ -102,11 +109,17 @@ public void configure(PropertyResolver serdeProperties,
 
   @VisibleForTesting
   void configure(
-      Descriptor defaultMessageDescriptor,
+      @Nullable Descriptor defaultMessageDescriptor,
       @Nullable Descriptor defaultKeyMessageDescriptor,
       Map<Descriptor, Path> descriptorPaths,
       Map<String, Descriptor> messageDescriptorMap,
       Map<String, Descriptor> keyMessageDescriptorMap) {
+    if (defaultMessageDescriptor == null
+        && defaultKeyMessageDescriptor == null
+        && messageDescriptorMap.isEmpty()
+        && keyMessageDescriptorMap.isEmpty()) {
+      throw new ValidationException("Neither default, not per-topic descriptors defined for " + name() + " serde");
+    }
     this.defaultMessageDescriptor = defaultMessageDescriptor;
     this.defaultKeyMessageDescriptor = defaultKeyMessageDescriptor;
     this.descriptorPaths = descriptorPaths;
@@ -142,7 +155,7 @@ private static List<Path> joinPathProperties(PropertyResolver propertyResolver)
   private static Map.Entry<Descriptor, Path> getDescriptorAndPath(Map<Path, ProtobufSchema> protobufSchemas,
                                                                   String msgName) {
     return protobufSchemas.entrySet().stream()
-            .filter(schema -> schema.getValue() != null && schema.getValue().toDescriptor(msgName) != null)
+            .filter(schema -> schema.getValue().toDescriptor(msgName) != null)
             .map(schema -> Map.entry(schema.getValue().toDescriptor(msgName), schema.getKey()))
             .findFirst()
             .orElseThrow(() -> new NullPointerException(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/StringSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/StringSerde.java
index 6ca20dd22fa..3e3671c29c5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/StringSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/StringSerde.java
@@ -15,16 +15,15 @@ public static String name() {
     return "String";
   }
 
-  private Charset encoding;
+  private Charset encoding = StandardCharsets.UTF_8;
 
   @Override
   public void configure(PropertyResolver serdeProperties,
                         PropertyResolver kafkaClusterProperties,
                         PropertyResolver globalProperties) {
-    encoding = Charset.forName(
-        serdeProperties.getProperty("encoding", String.class)
-            .orElse(StandardCharsets.UTF_8.name())
-    );
+    serdeProperties.getProperty("encoding", String.class)
+        .map(Charset::forName)
+        .ifPresent(e -> StringSerde.this.encoding = e);
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt32Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt32Serde.java
index be4f5d12716..64645fa79e4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt32Serde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt32Serde.java
@@ -3,7 +3,6 @@
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.UnsignedInteger;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
-import com.provectus.kafka.ui.serde.api.PropertyResolver;
 import com.provectus.kafka.ui.serde.api.SchemaDescription;
 import com.provectus.kafka.ui.serdes.BuiltInSerde;
 import java.util.Map;
@@ -15,12 +14,6 @@ public static String name() {
     return "UInt32";
   }
 
-  @Override
-  public void configure(PropertyResolver serdeProperties,
-                        PropertyResolver kafkaClusterProperties,
-                        PropertyResolver globalProperties) {
-  }
-
   @Override
   public Optional<String> getDescription() {
     return Optional.empty();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java
index 14e0806dc1d..9f6d1421dd1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java
@@ -4,13 +4,11 @@
 import com.google.common.primitives.UnsignedInteger;
 import com.google.common.primitives.UnsignedLong;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
-import com.provectus.kafka.ui.serde.api.PropertyResolver;
 import com.provectus.kafka.ui.serde.api.RecordHeaders;
 import com.provectus.kafka.ui.serde.api.SchemaDescription;
 import com.provectus.kafka.ui.serdes.BuiltInSerde;
 import java.util.Map;
 import java.util.Optional;
-import org.apache.kafka.common.header.Headers;
 
 
 public class UInt64Serde implements BuiltInSerde {
@@ -19,13 +17,6 @@ public static String name() {
     return "UInt64";
   }
 
-  @Override
-  public void configure(PropertyResolver serdeProperties,
-                        PropertyResolver kafkaClusterProperties,
-                        PropertyResolver globalProperties) {
-
-  }
-
   @Override
   public Optional<String> getDescription() {
     return Optional.empty();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java
index 673122aca71..c5ae606b937 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java
@@ -10,7 +10,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-import org.apache.kafka.common.header.Headers;
 
 
 public class UuidBinarySerde implements BuiltInSerde {
@@ -19,14 +18,14 @@ public static String name() {
     return "UUIDBinary";
   }
 
-  private boolean mostSignificantBitsFirst;
+  private boolean mostSignificantBitsFirst = true;
 
   @Override
   public void configure(PropertyResolver serdeProperties,
                         PropertyResolver kafkaClusterProperties,
                         PropertyResolver globalProperties) {
-    mostSignificantBitsFirst = serdeProperties.getProperty("mostSignificantBitsFirst", Boolean.class)
-        .orElse(true);
+    serdeProperties.getProperty("mostSignificantBitsFirst", Boolean.class)
+        .ifPresent(msb -> UuidBinarySerde.this.mostSignificantBitsFirst = msb);
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index 5af6249c079..9c3d0a9d375 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -50,13 +50,35 @@ public static String name() {
   private Map<SchemaType, MessageFormatter> schemaRegistryFormatters;
 
   @Override
-  public boolean initOnStartup(PropertyResolver kafkaClusterProperties,
-                               PropertyResolver globalProperties) {
+  public boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties,
+                                     PropertyResolver globalProperties) {
     return kafkaClusterProperties.getListProperty("schemaRegistry", String.class)
         .filter(lst -> !lst.isEmpty())
         .isPresent();
   }
 
+  @Override
+  public void autoConfigure(PropertyResolver kafkaClusterProperties,
+                            PropertyResolver globalProperties) {
+    var urls = kafkaClusterProperties.getListProperty("schemaRegistry", String.class)
+        .filter(lst -> !lst.isEmpty())
+        .orElseThrow(() -> new ValidationException("No urls provided for schema registry"));
+    configure(
+        urls,
+        createSchemaRegistryClient(
+            urls,
+            kafkaClusterProperties.getProperty("schemaRegistryAuth.username", String.class).orElse(null),
+            kafkaClusterProperties.getProperty("schemaRegistryAuth.password", String.class).orElse(null),
+            kafkaClusterProperties.getProperty("schemaRegistrySSL.keystoreLocation", String.class).orElse(null),
+            kafkaClusterProperties.getProperty("schemaRegistrySSL.keystorePassword", String.class).orElse(null),
+            kafkaClusterProperties.getProperty("schemaRegistrySSL.truststoreLocation", String.class).orElse(null),
+            kafkaClusterProperties.getProperty("schemaRegistrySSL.truststorePassword", String.class).orElse(null)
+        ),
+        kafkaClusterProperties.getProperty("schemaRegistryKeySchemaNameTemplate", String.class).orElse("%s-key"),
+        kafkaClusterProperties.getProperty("schemaRegistrySchemaNameTemplate", String.class).orElse("%s-value")
+    );
+  }
+
   @Override
   public void configure(PropertyResolver serdeProperties,
                         PropertyResolver kafkaClusterProperties,
@@ -69,32 +91,15 @@ public void configure(PropertyResolver serdeProperties,
         urls,
         createSchemaRegistryClient(
             urls,
-            serdeProperties.getProperty("username", String.class)
-                .or(() -> kafkaClusterProperties.getProperty("schemaRegistryAuth.username", String.class))
-                .orElse(null),
-            serdeProperties.getProperty("password", String.class)
-                .or(() -> kafkaClusterProperties.getProperty("schemaRegistryAuth.password", String.class))
-                .orElse(null),
-
-            serdeProperties.getProperty("keystoreLocation", String.class)
-                    .or(() -> kafkaClusterProperties.getProperty("schemaRegistrySSL.keystoreLocation", String.class))
-                    .orElse(null),
-            serdeProperties.getProperty("keystorePassword", String.class)
-                    .or(() -> kafkaClusterProperties.getProperty("schemaRegistrySSL.keystorePassword", String.class))
-                    .orElse(null),
-            serdeProperties.getProperty("truststoreLocation", String.class)
-                    .or(() -> kafkaClusterProperties.getProperty("schemaRegistrySSL.truststoreLocation", String.class))
-                    .orElse(null),
-            serdeProperties.getProperty("truststorePassword", String.class)
-                    .or(() -> kafkaClusterProperties.getProperty("schemaRegistrySSL.truststorePassword", String.class))
-                    .orElse(null)
+            serdeProperties.getProperty("username", String.class).orElse(null),
+            serdeProperties.getProperty("password", String.class).orElse(null),
+            serdeProperties.getProperty("keystoreLocation", String.class).orElse(null),
+            serdeProperties.getProperty("keystorePassword", String.class).orElse(null),
+            serdeProperties.getProperty("truststoreLocation", String.class).orElse(null),
+            serdeProperties.getProperty("truststorePassword", String.class).orElse(null)
         ),
-        serdeProperties.getProperty("keySchemaNameTemplate", String.class)
-            .or(() -> kafkaClusterProperties.getProperty("keySchemaNameTemplate", String.class))
-            .orElse("%s-key"),
-        serdeProperties.getProperty("schemaNameTemplate", String.class)
-            .or(() -> kafkaClusterProperties.getProperty("schemaNameTemplate", String.class))
-            .orElse("%s-value")
+        serdeProperties.getProperty("keySchemaNameTemplate", String.class).orElse("%s-key"),
+        serdeProperties.getProperty("schemaNameTemplate", String.class).orElse("%s-value")
     );
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
index 57c87042421..7965321ba61 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
@@ -9,6 +9,7 @@
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
 import com.provectus.kafka.ui.serdes.SerdeInstance;
+import com.provectus.kafka.ui.serdes.SerdesInitializer;
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
@@ -16,11 +17,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 import javax.validation.ValidationException;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
-@Slf4j
 @Component
 public class DeserializationService implements Closeable {
 
@@ -29,10 +28,11 @@ public class DeserializationService implements Closeable {
   public DeserializationService(Environment env,
                                 ClustersStorage clustersStorage,
                                 ClustersProperties clustersProperties) {
+    var serdesInitializer = new SerdesInitializer();
     for (int i = 0; i < clustersProperties.getClusters().size(); i++) {
       var clusterProperties = clustersProperties.getClusters().get(i);
       var cluster = clustersStorage.getClusterByName(clusterProperties.getName()).get();
-      clusterSerdes.put(cluster.getName(), new ClusterSerdes(env, clustersProperties, i));
+      clusterSerdes.put(cluster.getName(), serdesInitializer.init(env, clustersProperties, i));
     }
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/SerdesInitializerTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/SerdesInitializerTest.java
new file mode 100644
index 00000000000..4041f755edd
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/SerdesInitializerTest.java
@@ -0,0 +1,183 @@
+package com.provectus.kafka.ui.serdes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serdes.builtin.Int32Serde;
+import com.provectus.kafka.ui.serdes.builtin.StringSerde;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.springframework.core.env.Environment;
+import org.springframework.mock.env.MockEnvironment;
+
+class SerdesInitializerTest {
+
+  private final Environment env = new MockEnvironment();
+  private final CustomSerdeLoader customSerdeLoaderMock = mock(CustomSerdeLoader.class);
+
+  private final SerdesInitializer initializer = new SerdesInitializer(
+      Map.of(
+          "BuiltIn1", BuiltInSerdeWithAutoconfigure.class,
+          "BuiltIn2", BuiltInSerdeMock2NoAutoConfigure.class,
+          Int32Serde.name(), Int32Serde.class,
+          StringSerde.name(), StringSerde.class
+      ),
+      customSerdeLoaderMock
+  );
+
+  @Test
+  void pluggedSerdesInitializedByLoader() {
+    ClustersProperties.SerdeConfig customSerdeConfig = new ClustersProperties.SerdeConfig();
+    customSerdeConfig.setName("MyPluggedSerde");
+    customSerdeConfig.setFilePath("/custom.jar");
+    customSerdeConfig.setClassName("org.test.MyPluggedSerde");
+    customSerdeConfig.setTopicKeysPattern("keys");
+    customSerdeConfig.setTopicValuesPattern("values");
+
+    when(customSerdeLoaderMock.loadAndConfigure(anyString(), anyString(), any(), any(), any()))
+        .thenReturn(new CustomSerdeLoader.CustomSerde(new StringSerde(), new URLClassLoader(new URL[]{})));
+
+    var serdes = init(customSerdeConfig);
+
+    SerdeInstance customSerdeInstance = serdes.serdes.get("MyPluggedSerde");
+    verifyPatternsMatch(customSerdeConfig, customSerdeInstance);
+    assertThat(customSerdeInstance.classLoader).isNotNull();
+
+    verify(customSerdeLoaderMock).loadAndConfigure(
+        eq(customSerdeConfig.getClassName()),
+        eq(customSerdeConfig.getFilePath()),
+        any(), any(), any()
+    );
+  }
+
+  @Test
+  void serdeWithBuiltInNameAndNoPropertiesCantBeInitializedIfSerdeNotSupportAutoConfigure() {
+    ClustersProperties.SerdeConfig serdeConfig = new ClustersProperties.SerdeConfig();
+    serdeConfig.setName("BuiltIn2"); //auto-configuration not supported
+    serdeConfig.setTopicKeysPattern("keys");
+    serdeConfig.setTopicValuesPattern("vals");
+
+    assertThatCode(() -> initializer.init(env, createProperties(serdeConfig), 0))
+        .isInstanceOf(ValidationException.class);
+  }
+
+  @Test
+  void serdeWithBuiltInNameAndNoPropertiesIsAutoConfiguredIfPossible() {
+    ClustersProperties.SerdeConfig serdeConfig = new ClustersProperties.SerdeConfig();
+    serdeConfig.setName("BuiltIn1"); // supports auto-configuration
+    serdeConfig.setTopicKeysPattern("keys");
+    serdeConfig.setTopicValuesPattern("vals");
+
+    var serdes = init(serdeConfig);
+
+    SerdeInstance autoConfiguredSerde = serdes.serdes.get("BuiltIn1");
+    verifyAutoConfigured(autoConfiguredSerde);
+    verifyPatternsMatch(serdeConfig, autoConfiguredSerde);
+  }
+
+  @Test
+  void serdeWithBuiltInNameAndSetPropertiesAreExplicitlyConfigured() {
+    ClustersProperties.SerdeConfig serdeConfig = new ClustersProperties.SerdeConfig();
+    serdeConfig.setName("BuiltIn1");
+    serdeConfig.setProperties(Map.of("any", "property"));
+    serdeConfig.setTopicKeysPattern("keys");
+    serdeConfig.setTopicValuesPattern("vals");
+
+    var serdes = init(serdeConfig);
+
+    SerdeInstance explicitlyConfiguredSerde = serdes.serdes.get("BuiltIn1");
+    verifyExplicitlyConfigured(explicitlyConfiguredSerde);
+    verifyPatternsMatch(serdeConfig, explicitlyConfiguredSerde);
+  }
+
+  @Test
+  void serdeWithCustomNameAndBuiltInClassnameAreExplicitlyConfigured() {
+    ClustersProperties.SerdeConfig serdeConfig = new ClustersProperties.SerdeConfig();
+    serdeConfig.setName("SomeSerde");
+    serdeConfig.setClassName(BuiltInSerdeWithAutoconfigure.class.getName());
+    serdeConfig.setTopicKeysPattern("keys");
+    serdeConfig.setTopicValuesPattern("vals");
+
+    var serdes = init(serdeConfig);
+
+    SerdeInstance explicitlyConfiguredSerde = serdes.serdes.get("SomeSerde");
+    verifyExplicitlyConfigured(explicitlyConfiguredSerde);
+    verifyPatternsMatch(serdeConfig, explicitlyConfiguredSerde);
+  }
+
+  private ClusterSerdes init(ClustersProperties.SerdeConfig... serdeConfigs) {
+    return initializer.init(env, createProperties(serdeConfigs), 0);
+  }
+
+  private ClustersProperties createProperties(ClustersProperties.SerdeConfig... serdeConfigs) {
+    ClustersProperties.Cluster cluster = new ClustersProperties.Cluster();
+    cluster.setName("test");
+    cluster.setSerde(List.of(serdeConfigs));
+
+    ClustersProperties clustersProperties = new ClustersProperties();
+    clustersProperties.setClusters(List.of(cluster));
+    return clustersProperties;
+  }
+
+  private void verifyExplicitlyConfigured(SerdeInstance serde) {
+    assertThat(((BuiltInSerdeWithAutoconfigure) serde.serde).autoConfigureCheckCalled).isFalse();
+    assertThat(((BuiltInSerdeWithAutoconfigure) serde.serde).autoConfigured).isFalse();
+    assertThat(((BuiltInSerdeWithAutoconfigure) serde.serde).explicitlyConfigured).isTrue();
+  }
+
+  private void verifyAutoConfigured(SerdeInstance serde) {
+    assertThat(((BuiltInSerdeWithAutoconfigure) serde.serde).autoConfigureCheckCalled).isTrue();
+    assertThat(((BuiltInSerdeWithAutoconfigure) serde.serde).autoConfigured).isTrue();
+    assertThat(((BuiltInSerdeWithAutoconfigure) serde.serde).explicitlyConfigured).isFalse();
+  }
+
+  private void verifyPatternsMatch(ClustersProperties.SerdeConfig config, SerdeInstance serde) {
+    assertThat(serde.topicKeyPattern.pattern()).isEqualTo(config.getTopicKeysPattern());
+    assertThat(serde.topicValuePattern.pattern()).isEqualTo(config.getTopicValuesPattern());
+  }
+
+  static class BuiltInSerdeWithAutoconfigure extends StringSerde {
+
+    boolean explicitlyConfigured = false;
+    boolean autoConfigured = false;
+    boolean autoConfigureCheckCalled = false;
+
+    @Override
+    public boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties, PropertyResolver globalProperties) {
+      this.autoConfigureCheckCalled = true;
+      return true;
+    }
+
+    @Override
+    public void autoConfigure(PropertyResolver kafkaClusterProperties, PropertyResolver globalProperties) {
+      this.autoConfigured = true;
+    }
+
+    @Override
+    public void configure(PropertyResolver serdeProperties,
+                          PropertyResolver kafkaClusterProperties,
+                          PropertyResolver globalProperties) {
+      this.explicitlyConfigured = true;
+    }
+  }
+
+  static class BuiltInSerdeMock2NoAutoConfigure extends BuiltInSerdeWithAutoconfigure {
+    @Override
+    public boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties, PropertyResolver globalProperties) {
+      this.autoConfigureCheckCalled = true;
+      return false;
+    }
+  }
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
index 887792b6335..3de915145f4 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
@@ -236,52 +236,52 @@ void testSerializeDefaults() {
   }
 
   @Test
-  void initOnStartupReturnsFalseIfNoProtoFilesHaveBeenProvided() {
+  void canBeAutoConfiguredReturnsFalseIfNoProtoFilesHaveBeenProvided() {
     PropertyResolver resolver = mock(PropertyResolver.class);
 
     var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
     assertThat(startupSuccessful).isFalse();
   }
 
   @Test
-  void initOnStartupReturnsFalseIfProtoFilesListIsEmpty() {
+  void canBeAutoConfiguredReturnsFalseIfProtoFilesListIsEmpty() {
     PropertyResolver resolver = mock(PropertyResolver.class);
     when(resolver.getListProperty("protobufFiles", String.class)).thenReturn(Optional.of(List.of()));
 
     var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
     assertThat(startupSuccessful).isFalse();
   }
 
   @Test
-  void initOnStartupReturnsTrueIfNoProtoFileHasBeenProvided() {
+  void canBeAutoConfiguredReturnsTrueIfNoProtoFileHasBeenProvided() {
     PropertyResolver resolver = mock(PropertyResolver.class);
     when(resolver.getProperty("protobufFile", String.class)).thenReturn(Optional.of("file.proto"));
 
     var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
     assertThat(startupSuccessful).isTrue();
   }
 
   @Test
-  void initOnStartupReturnsTrueIfProtoFilesHasBeenProvided() {
+  void canBeAutoConfiguredReturnsTrueIfProtoFilesHasBeenProvided() {
     PropertyResolver resolver = mock(PropertyResolver.class);
     when(resolver.getListProperty("protobufFiles", String.class)).thenReturn(Optional.of(List.of("file.proto")));
 
     var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
     assertThat(startupSuccessful).isTrue();
   }
 
   @Test
-  void initOnStartupReturnsTrueIfProtoFileAndProtoFilesHaveBeenProvided() {
+  void canBeAutoConfiguredReturnsTrueIfProtoFileAndProtoFilesHaveBeenProvided() {
     PropertyResolver resolver = mock(PropertyResolver.class);
     when(resolver.getProperty("protobufFile", String.class)).thenReturn(Optional.of("file1.proto"));
     when(resolver.getListProperty("protobufFiles", String.class)).thenReturn(Optional.of(List.of("file2.proto")));
 
     var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.initOnStartup(resolver, resolver);
+    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
     assertThat(startupSuccessful).isTrue();
   }
 

From c804a6d00bce6eee1108740ba7714ebf7bc6668d Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 1 Dec 2022 13:20:48 +0400
Subject: [PATCH 303/734] Serde autoconfiguration fix (#2997)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../java/com/provectus/kafka/ui/serdes/SerdesInitializer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
index 8eb94d3a6df..b49767d1d53 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
@@ -171,7 +171,7 @@ private SerdeInstance createSerdeWithBuiltInSerdeName(SerdeConfig serdeConfig,
     var clazz = builtInSerdeClasses.get(name);
     BuiltInSerde serde = createSerdeInstance(clazz);
     if (serdeConfig.getProperties().isEmpty()) {
-      if (!autoConfigureSerde(serde, serdeProps, globalProps)) {
+      if (!autoConfigureSerde(serde, clusterProps, globalProps)) {
         // no properties provided and serde does not support auto-configuration
         throw new ValidationException(name + " serde is not configured");
       }

From 052d8af45632265cc88192663b14fec5aff713f5 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 1 Dec 2022 21:09:23 +0400
Subject: [PATCH 304/734] ISSUE-2968: Deleting a config parameter of topic
 doesn't take effect (#3001)

ReactiveAdminClient::incrementalAlterConfig now replaces all topic configs, not only altering changed
---
 .../kafka/ui/service/ReactiveAdminClient.java | 37 +++++---
 .../ui/service/ReactiveAdminClientTest.java   | 92 +++++++++++++++++++
 2 files changed, 117 insertions(+), 12 deletions(-)
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 2504473b171..ebaa8475595 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -32,6 +32,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
@@ -147,6 +149,7 @@ private static <T> Mono<T> toMono(KafkaFuture<T> future) {
 
   //---------------------------------------------------------------------------------
 
+  @Getter(AccessLevel.PACKAGE) // visible for testing
   private final AdminClient client;
   private final String version;
   private final Set<SupportedFeature> features;
@@ -361,9 +364,14 @@ public Mono<Void> createPartitions(Map<String, NewPartitions> newPartitionsMap)
     return toMono(client.createPartitions(newPartitionsMap).all());
   }
 
+
+  // NOTE: places whole current topic config with new one. Entries that were present in old config,
+  // but missed in new will be set to default
   public Mono<Void> updateTopicConfig(String topicName, Map<String, String> configs) {
     if (features.contains(SupportedFeature.INCREMENTAL_ALTER_CONFIGS)) {
-      return incrementalAlterConfig(topicName, configs);
+      return getTopicsConfigImpl(List.of(topicName), false)
+          .map(conf -> conf.getOrDefault(topicName, List.of()))
+          .flatMap(currentConfigs -> incrementalAlterConfig(topicName, currentConfigs, configs));
     } else {
       return alterConfig(topicName, configs);
     }
@@ -499,17 +507,22 @@ public Mono<Void> alterReplicaLogDirs(Map<TopicPartitionReplica, String> replica
     return toMono(client.alterReplicaLogDirs(replicaAssignment).all());
   }
 
-  private Mono<Void> incrementalAlterConfig(String topicName, Map<String, String> configs) {
-    var config = configs.entrySet().stream()
-        .flatMap(cfg -> Stream.of(
-            new AlterConfigOp(
-                new ConfigEntry(
-                    cfg.getKey(),
-                    cfg.getValue()),
-                AlterConfigOp.OpType.SET)))
-        .collect(toList());
-    var topicResource = new ConfigResource(ConfigResource.Type.TOPIC, topicName);
-    return toMono(client.incrementalAlterConfigs(Map.of(topicResource, config)).all());
+  private Mono<Void> incrementalAlterConfig(String topicName,
+                                            List<ConfigEntry> currentConfigs,
+                                            Map<String, String> newConfigs) {
+    var configsToDelete = currentConfigs.stream()
+        .filter(e -> e.source() == ConfigEntry.ConfigSource.DYNAMIC_TOPIC_CONFIG) //manually set configs only
+        .filter(e -> !newConfigs.containsKey(e.name()))
+        .map(e -> new AlterConfigOp(e, AlterConfigOp.OpType.DELETE));
+
+    var configsToSet = newConfigs.entrySet().stream()
+        .map(e -> new AlterConfigOp(new ConfigEntry(e.getKey(), e.getValue()), AlterConfigOp.OpType.SET));
+
+    return toMono(client.incrementalAlterConfigs(
+        Map.of(
+            new ConfigResource(ConfigResource.Type.TOPIC, topicName),
+            Stream.concat(configsToDelete, configsToSet).toList()
+        )).all());
   }
 
   @SuppressWarnings("deprecation")
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
new file mode 100644
index 00000000000..a84b42a4e3f
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
@@ -0,0 +1,92 @@
+package com.provectus.kafka.ui.service;
+
+import static java.util.Objects.requireNonNull;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.AbstractIntegrationTest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Stream;
+import lombok.SneakyThrows;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AlterConfigOp;
+import org.apache.kafka.clients.admin.Config;
+import org.apache.kafka.clients.admin.ConfigEntry;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.common.config.ConfigResource;
+import org.junit.function.ThrowingRunnable;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import reactor.test.StepVerifier;
+
+class ReactiveAdminClientTest extends AbstractIntegrationTest {
+
+  private final List<ThrowingRunnable> clearings = new ArrayList<>();
+
+  private AdminClient adminClient;
+  private ReactiveAdminClient reactiveAdminClient;
+
+  @BeforeEach
+  void init() {
+    AdminClientService adminClientService = applicationContext.getBean(AdminClientService.class);
+    ClustersStorage clustersStorage = applicationContext.getBean(ClustersStorage.class);
+    reactiveAdminClient = requireNonNull(adminClientService.get(clustersStorage.getClusterByName(LOCAL).get()).block());
+    adminClient = reactiveAdminClient.getClient();
+  }
+
+  @AfterEach
+  void tearDown() {
+    for (ThrowingRunnable clearing : clearings) {
+      try {
+        clearing.run();
+      } catch (Throwable th) {
+        //NOOP
+      }
+    }
+  }
+
+  @Test
+  void testUpdateTopicConfigs() throws Exception {
+    String topic = UUID.randomUUID().toString();
+    createTopics(new NewTopic(topic, 1, (short) 1));
+
+    var configResource = new ConfigResource(ConfigResource.Type.TOPIC, topic);
+
+    adminClient.incrementalAlterConfigs(
+        Map.of(
+            configResource,
+            List.of(
+                new AlterConfigOp(new ConfigEntry("compression.type", "gzip"), AlterConfigOp.OpType.SET),
+                new AlterConfigOp(new ConfigEntry("retention.bytes", "12345678"), AlterConfigOp.OpType.SET)
+            )
+        )
+    ).all().get();
+
+    StepVerifier.create(
+        reactiveAdminClient.updateTopicConfig(
+            topic,
+            Map.of(
+                "compression.type", "snappy", //changing existing config
+                "file.delete.delay.ms", "12345" // adding new one
+            )
+        )
+    ).expectComplete().verify();
+
+    Config config = adminClient.describeConfigs(List.of(configResource)).values().get(configResource).get();
+    assertThat(config.get("retention.bytes").value()).isNotEqualTo("12345678"); // wes reset to default
+    assertThat(config.get("compression.type").value()).isEqualTo("snappy");
+    assertThat(config.get("file.delete.delay.ms").value()).isEqualTo("12345");
+  }
+
+
+  @SneakyThrows
+  void createTopics(NewTopic... topics) {
+    adminClient.createTopics(List.of(topics)).all().get();
+    clearings.add(() -> adminClient.deleteTopics(Stream.of(topics).map(NewTopic::name).toList()).all().get());
+  }
+
+
+}

From ec5b59de60cabaee4ec1a99ba8d1fac8cd40ea67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 11:04:15 +0400
Subject: [PATCH 305/734] Bump aspectj.version from 1.9.8 to 1.9.9.1 (#2936)

Bumps `aspectj.version` from 1.9.8 to 1.9.9.1.

Updates `aspectjrt` from 1.9.8 to 1.9.9.1
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)

Updates `aspectjweaver` from 1.9.8 to 1.9.9.1
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)

---
updated-dependencies:
- dependency-name: org.aspectj:aspectjrt
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.aspectj:aspectjweaver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 12a702a76a5..27d034feecc 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>kafka-ui-e2e-checks</artifactId>
     <properties>
         <kafka-ui-contract>${project.version}</kafka-ui-contract>
-        <aspectj.version>1.9.8</aspectj.version>
+        <aspectj.version>1.9.9.1</aspectj.version>
         <allure.version>2.18.1</allure.version>
         <json-smart.version>2.4.8</json-smart.version>
         <selenide.version>6.6.3</selenide.version>

From 6e62ee0072332e92176b03682c40efc988f5d2e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 11:04:42 +0400
Subject: [PATCH 306/734] Bump mockito.version from 4.8.1 to 4.9.0 (#2945)

Bumps `mockito.version` from 4.8.1 to 4.9.0.

Updates `mockito-core` from 4.8.1 to 4.9.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0)

Updates `mockito-junit-jupiter` from 4.8.1 to 4.9.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 32bb407fff0..0a570bacf9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 
         <!-- Test dependency versions -->
         <junit.version>5.9.1</junit.version>
-        <mockito.version>4.8.1</mockito.version>
+        <mockito.version>4.9.0</mockito.version>
         <okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>
         <testcontainers.version>1.17.5</testcontainers.version>
 

From 4216feb8b254e95ab9e50a32842af7275e6b6720 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 11:22:13 +0400
Subject: [PATCH 307/734] Bump urlstechie/urlchecker-action from 0.0.33 to
 0.0.34 (#2955)

Bumps [urlstechie/urlchecker-action](https://github.com/urlstechie/urlchecker-action) from 0.0.33 to 0.0.34.
- [Release notes](https://github.com/urlstechie/urlchecker-action/releases)
- [Commits](https://github.com/urlstechie/urlchecker-action/compare/0.0.33...0.0.34)

---
updated-dependencies:
- dependency-name: urlstechie/urlchecker-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/documentation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
index 30267a22310..5fef435fc9c 100644
--- a/.github/workflows/documentation.yaml
+++ b/.github/workflows/documentation.yaml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Check URLs in files
-        uses: urlstechie/urlchecker-action@0.0.33
+        uses: urlstechie/urlchecker-action@0.0.34
         with:
           exclude_patterns: localhost,127.0.,192.168.
           exclude_urls: https://api.server,https://graph.microsoft.com/User.Read,https://dev-a63ggcut.auth0.com/,http://main-schema-registry:8081,http://schema-registry:8081,http://another-yet-schema-registry:8081,http://another-schema-registry:8081

From 212479d98f79aac5f72a386125bde3b02e549463 Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Fri, 2 Dec 2022 15:47:32 +0800
Subject: [PATCH 308/734] [FE] [Bug] "Select filter" button is active without
 selecting any saved filter (#2900)

* "Select filter" button is active without selecting any saved filter within Topic/Messages/Saved filters (#2870)

* Add minor tests

* Fix prettier

* Fix unit test

* Fix unit test
---
 .../Topics/Topic/Messages/Filters/SavedFilters.tsx       | 2 ++
 .../Messages/Filters/__tests__/SavedFilters.spec.tsx     | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
index 6a757d34383..da5033e8cac 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
@@ -51,6 +51,7 @@ const SavedFilters: FC<Props> = ({
       </>,
       () => {
         deleteFilter(index);
+        setSelectedFilter(-1);
       }
     );
   };
@@ -95,6 +96,7 @@ const SavedFilters: FC<Props> = ({
           buttonType="primary"
           type="button"
           onClick={activateFilter}
+          disabled={selectedFilter === -1}
         >
           Select filter
         </Button>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
index dde99f39a81..c4d6a4202c4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/SavedFilters.spec.tsx
@@ -50,6 +50,9 @@ describe('SavedFilter Component', () => {
     it('should check the rendering of the empty filter', () => {
       expect(screen.getByText(/no saved filter/i)).toBeInTheDocument();
       expect(screen.queryByRole('savedFilter')).not.toBeInTheDocument();
+
+      const selectFilterButton = screen.getByText(/Select filter/i);
+      expect(selectFilterButton).toBeDisabled();
     });
   });
 
@@ -116,7 +119,6 @@ describe('SavedFilter Component', () => {
     });
 
     it('Open Confirmation for the deletion modal', async () => {
-      setUpComponent({ deleteFilter: deleteMock });
       const savedFilters = getSavedFilters();
       const deleteIcons = screen.getAllByText('mock-DeleteIcon');
       await userEvent.hover(savedFilters[0]);
@@ -129,7 +131,6 @@ describe('SavedFilter Component', () => {
     });
 
     it('Close Confirmations deletion modal with button', async () => {
-      setUpComponent({ deleteFilter: deleteMock });
       const savedFilters = getSavedFilters();
       const deleteIcons = screen.getAllByText('mock-DeleteIcon');
 
@@ -146,7 +147,6 @@ describe('SavedFilter Component', () => {
     });
 
     it('Delete the saved filter', async () => {
-      setUpComponent({ deleteFilter: deleteMock });
       const savedFilters = getSavedFilters();
       const deleteIcons = screen.getAllByText('mock-DeleteIcon');
 
@@ -157,6 +157,9 @@ describe('SavedFilter Component', () => {
       await userEvent.click(screen.getByRole('button', { name: 'Confirm' }));
       expect(deleteMock).toHaveBeenCalledTimes(1);
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+
+      const selectFilterButton = screen.getByText(/Select filter/i);
+      expect(selectFilterButton).toBeDisabled();
     });
   });
 });

From 45f304ac9f748c4a79960bef5d23e91f3ba2b968 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 12:08:07 +0400
Subject: [PATCH 309/734] Bump allure-java-commons from 2.18.1 to 2.20.1
 (#2912)

Bumps [allure-java-commons](https://github.com/allure-framework/allure-java) from 2.18.1 to 2.20.1.
- [Release notes](https://github.com/allure-framework/allure-java/releases)
- [Commits](https://github.com/allure-framework/allure-java/compare/2.18.1...2.20.1)

---
updated-dependencies:
- dependency-name: io.qameta.allure:allure-java-commons
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 27d034feecc..41e4ef750e9 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -20,7 +20,7 @@
         <google.auto-service.version>1.0.1</google.auto-service.version>
         <hamcrest.version>2.2</hamcrest.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <allure.java-commons.version>2.18.1</allure.java-commons.version>
+        <allure.java-commons.version>2.20.1</allure.java-commons.version>
         <dotenv.version>2.2.4</dotenv.version>
         <allure.maven-plugin.version>2.6</allure.maven-plugin.version>
         <ashot.version>1.5.4</ashot.version>

From 67e67d02d2ad5f767a9a7ca115e684f84663aa60 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 2 Dec 2022 13:30:59 +0400
Subject: [PATCH 310/734] [Infra]: Fix terraform deploy (#2999)

---
 .github/workflows/terraform-deploy.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/terraform-deploy.yml b/.github/workflows/terraform-deploy.yml
index d7ac8b9a306..8ec07be0a9a 100644
--- a/.github/workflows/terraform-deploy.yml
+++ b/.github/workflows/terraform-deploy.yml
@@ -35,10 +35,6 @@ jobs:
       - name: Terraform Install
         uses: hashicorp/setup-terraform@v2
 
-      - name: Terraform format
-        id: fmt
-        run: cd $TF_DIR && terraform fmt -check
-
       - name: Terraform init
         id: init
         run: cd $TF_DIR && terraform init --backend-config="../envs/pro/terraform-backend.tfvars"

From 8717416d85d81275541444841e2764ca168af9fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 19:44:26 +0400
Subject: [PATCH 311/734] Bump dotenv-java from 2.2.4 to 2.3.1 (#3008)

Bumps [dotenv-java](https://github.com/cdimascio/dotenv-java) from 2.2.4 to 2.3.1.
- [Release notes](https://github.com/cdimascio/dotenv-java/releases)
- [Changelog](https://github.com/cdimascio/dotenv-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cdimascio/dotenv-java/commits/v2.3.1)

---
updated-dependencies:
- dependency-name: io.github.cdimascio:dotenv-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 41e4ef750e9..1d1aaf3d5fc 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -21,7 +21,7 @@
         <hamcrest.version>2.2</hamcrest.version>
         <slf4j.version>1.7.36</slf4j.version>
         <allure.java-commons.version>2.20.1</allure.java-commons.version>
-        <dotenv.version>2.2.4</dotenv.version>
+        <dotenv.version>2.3.1</dotenv.version>
         <allure.maven-plugin.version>2.6</allure.maven-plugin.version>
         <ashot.version>1.5.4</ashot.version>
         <allure.screendiff-plugin.version>2.18.1</allure.screendiff-plugin.version>

From 43ccca43c2c1aa2cbb6ed9fc97ef99e17daa63bb Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 5 Dec 2022 17:02:45 +0400
Subject: [PATCH 312/734] Fix random topic creation fails (#3004)

ReactiveAdminClient::listOffsetsUnsafe now skipping non-initialized partitions. This prevents UnknownTopicOrPartitionException to be leaked to high-level logic levels (preventing TopicService::loadTopicAfterCreation to do retries)
---
 .../kafka/ui/service/ReactiveAdminClient.java | 29 +++++++---
 .../ui/service/ReactiveAdminClientTest.java   | 56 +++++++++++++++++++
 2 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index ebaa8475595..c655cc2ad9b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -3,6 +3,7 @@
 import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
+import static org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterators;
@@ -16,6 +17,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -45,6 +47,7 @@
 import org.apache.kafka.clients.admin.ConsumerGroupListing;
 import org.apache.kafka.clients.admin.DescribeConfigsOptions;
 import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsOptions;
+import org.apache.kafka.clients.admin.ListOffsetsResult;
 import org.apache.kafka.clients.admin.ListTopicsOptions;
 import org.apache.kafka.clients.admin.NewPartitionReassignment;
 import org.apache.kafka.clients.admin.NewPartitions;
@@ -170,6 +173,7 @@ public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig() {
     return listTopics(true).flatMap(topics -> getTopicsConfig(topics, false));
   }
 
+  //NOTE: skips not-found topics (for which UnknownTopicOrPartitionException was thrown by AdminClient)
   public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig(Collection<String> topicNames, boolean includeDoc) {
     var includeDocFixed = features.contains(SupportedFeature.CONFIG_DOCUMENTATION_RETRIEVAL) && includeDoc;
     // we need to partition calls, because it can lead to AdminClient timeouts in case of large topics count
@@ -258,7 +262,7 @@ public Mono<TopicDescription> describeTopic(String topic) {
    * This method converts input map into Mono[Map] ignoring keys for which KafkaFutures
    * finished with <code>clazz</code> exception.
    */
-  private <K, V> Mono<Map<K, V>> toMonoWithExceptionFilter(Map<K, KafkaFuture<V>> values,
+  static <K, V> Mono<Map<K, V>> toMonoWithExceptionFilter(Map<K, KafkaFuture<V>> values,
                                                            Class<? extends KafkaException> clazz) {
     if (values.isEmpty()) {
       return Mono.just(Map.of());
@@ -468,19 +472,26 @@ private Set<TopicPartition> filterPartitionsWithLeaderCheck(Collection<TopicDesc
   }
 
   // 1. NOTE(!): should only apply for partitions with existing leader,
-  // otherwise AdminClient will try to fetch topic metadata, fail and retry infinitely (until timeout)
-  // 2. TODO: check if it is a bug that AdminClient never throws LeaderNotAvailableException and just retrying instead
+  //    otherwise AdminClient will try to fetch topic metadata, fail and retry infinitely (until timeout)
+  // 2. NOTE(!): Skips partitions that were not initialized yet
+  //    (UnknownTopicOrPartitionException thrown, ex. after topic creation)
+  // 3. TODO: check if it is a bug that AdminClient never throws LeaderNotAvailableException and just retrying instead
   @KafkaClientInternalsDependant
   public Mono<Map<TopicPartition, Long>> listOffsetsUnsafe(Collection<TopicPartition> partitions,
                                                            OffsetSpec offsetSpec) {
 
     Function<Collection<TopicPartition>, Mono<Map<TopicPartition, Long>>> call =
-        parts -> toMono(
-            client.listOffsets(parts.stream().collect(toMap(tp -> tp, tp -> offsetSpec))).all())
-            .map(offsets -> offsets.entrySet().stream()
-                // filtering partitions for which offsets were not found
-                .filter(e -> e.getValue().offset() >= 0)
-                .collect(toMap(Map.Entry::getKey, e -> e.getValue().offset())));
+        parts -> {
+          ListOffsetsResult r = client.listOffsets(parts.stream().collect(toMap(tp -> tp, tp -> offsetSpec)));
+          Map<TopicPartition, KafkaFuture<ListOffsetsResultInfo>> perPartitionResults = new HashMap<>();
+          parts.forEach(p -> perPartitionResults.put(p, r.partitionResult(p)));
+
+          return toMonoWithExceptionFilter(perPartitionResults, UnknownTopicOrPartitionException.class)
+              .map(offsets -> offsets.entrySet().stream()
+                  // filtering partitions for which offsets were not found
+                  .filter(e -> e.getValue().offset() >= 0)
+                  .collect(toMap(Map.Entry::getKey, e -> e.getValue().offset())));
+        };
 
     return partitionCalls(
         partitions,
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
index a84b42a4e3f..26df31426da 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
@@ -1,9 +1,11 @@
 package com.provectus.kafka.ui.service;
 
+import static com.provectus.kafka.ui.service.ReactiveAdminClient.toMonoWithExceptionFilter;
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
+import com.provectus.kafka.ui.producer.KafkaTestProducer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -15,7 +17,13 @@
 import org.apache.kafka.clients.admin.Config;
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.admin.OffsetSpec;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.KafkaFuture;
+import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.config.ConfigResource;
+import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
+import org.apache.kafka.common.internals.KafkaFutureImpl;
 import org.junit.function.ThrowingRunnable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -88,5 +96,53 @@ void createTopics(NewTopic... topics) {
     clearings.add(() -> adminClient.deleteTopics(Stream.of(topics).map(NewTopic::name).toList()).all().get());
   }
 
+  @Test
+  void testToMonoWithExceptionFilter() {
+    var failedFuture = new KafkaFutureImpl<String>();
+    failedFuture.completeExceptionally(new UnknownTopicOrPartitionException());
+
+    var okFuture = new KafkaFutureImpl<String>();
+    okFuture.complete("done");
+
+    Map<String, KafkaFuture<String>> arg = Map.of("failure", failedFuture, "ok", okFuture);
+    StepVerifier.create(toMonoWithExceptionFilter(arg, UnknownTopicOrPartitionException.class))
+        .assertNext(result -> assertThat(result).hasSize(1).containsEntry("ok", "done"))
+        .verifyComplete();
+  }
+
+  @Test
+  void testListOffsetsUnsafe() {
+    String topic = UUID.randomUUID().toString();
+    createTopics(new NewTopic(topic, 2, (short) 1));
+
+    // sending messages to have non-zero offsets for tp
+    try (var producer = KafkaTestProducer.forKafka(kafka)) {
+      producer.send(new ProducerRecord<>(topic, 1, "k", "v"));
+      producer.send(new ProducerRecord<>(topic, 1, "k", "v"));
+    }
+
+    var requestedPartitions = List.of(
+        new TopicPartition(topic, 0),
+        new TopicPartition(topic, 1)
+    );
+
+    StepVerifier.create(reactiveAdminClient.listOffsetsUnsafe(requestedPartitions, OffsetSpec.earliest()))
+        .assertNext(offsets -> {
+          assertThat(offsets)
+              .hasSize(2)
+              .containsEntry(new TopicPartition(topic, 0), 0L)
+              .containsEntry(new TopicPartition(topic, 1), 0L);
+        })
+        .verifyComplete();
+
+    StepVerifier.create(reactiveAdminClient.listOffsetsUnsafe(requestedPartitions, OffsetSpec.latest()))
+        .assertNext(offsets -> {
+          assertThat(offsets)
+              .hasSize(2)
+              .containsEntry(new TopicPartition(topic, 0), 0L)
+              .containsEntry(new TopicPartition(topic, 1), 2L);
+        })
+        .verifyComplete();
+  }
 
 }

From b87665a12cdc0ec7d6ccec8a198fda8d0a3f47ea Mon Sep 17 00:00:00 2001
From: Boris Djurdjevic <boris@djurdjevic.ch>
Date: Wed, 7 Dec 2022 04:38:13 +0100
Subject: [PATCH 313/734] [KSQL] Implement mTLS configuration (#2984)

* feat(ksqldb): Add mTLS support

* doc(ksqldb): Add SSL configuration

* chore(compose): Add ksqldb0 to key material

* feat(ksqldb): Add SSL-enabled demo ksqlDB instance

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 README.md                                     |   4 ++
 .../compose/kafka-ssl-components.yaml         |  36 ++++++++++++++++++
 documentation/compose/ssl/kafka.keystore.jks  | Bin 4739 -> 4110 bytes
 .../compose/ssl/kafka.truststore.jks          | Bin 952 -> 952 bytes
 documentation/compose/ssl/san.cnf             |   2 +-
 .../kafka/ui/config/ClustersProperties.java   |   1 +
 .../kafka/ui/mapper/ClusterMapper.java        |   7 ++++
 .../kafka/ui/model/InternalKsqlServer.java    |   7 +++-
 .../kafka/ui/service/ksql/KsqlApiClient.java  |  24 +++++++++---
 9 files changed, 74 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index acfa55f4af1..313bcf4ae16 100644
--- a/README.md
+++ b/README.md
@@ -181,6 +181,10 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_KSQLDBSERVER` 	| KSQL DB server address
 |`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_USERNAME` 	| KSQL DB server's basic authentication username
 |`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_PASSWORD` 	| KSQL DB server's basic authentication password
+|`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTORELOCATION`   	|Path to the JKS keystore to communicate to KSQL DB
+|`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTOREPASSWORD`   	|Password of the JKS keystore for KSQL DB
+|`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_TRUSTSTORELOCATION`   	|Path to the JKS truststore to communicate to KSQL DB
+|`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_TRUSTSTOREPASSWORD`   	|Password of the JKS truststore for KSQL DB
 |`KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL` 	|Security protocol to connect to the brokers. For SSL connection use "SSL", for plaintext connection don't set this environment variable
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRY`   	|SchemaRegistry's address
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME`   	|SchemaRegistry's basic authentication username
diff --git a/documentation/compose/kafka-ssl-components.yaml b/documentation/compose/kafka-ssl-components.yaml
index ef1f3f88821..0c1287b6477 100644
--- a/documentation/compose/kafka-ssl-components.yaml
+++ b/documentation/compose/kafka-ssl-components.yaml
@@ -10,6 +10,7 @@ services:
       - kafka0
       - schemaregistry0
       - kafka-connect0
+      - ksqldb0
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SSL
@@ -24,6 +25,11 @@ services:
       KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTOREPASSWORD: "secret"
       KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTORELOCATION: /kafka.truststore.jks
       KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTOREPASSWORD: "secret"
+      KAFKA_CLUSTERS_0_KSQLDBSERVER: https://ksqldb0:8088
+      KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTORELOCATION: /kafka.keystore.jks
+      KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTOREPASSWORD: "secret"
+      KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_TRUSTSTORELOCATION: /kafka.truststore.jks
+      KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_TRUSTSTOREPASSWORD: "secret"
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: local
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: https://kafka-connect0:8083
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTORELOCATION: /kafka.keystore.jks
@@ -142,3 +148,33 @@ services:
     volumes:
       - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
       - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
+
+  ksqldb0:
+    image: confluentinc/ksqldb-server:0.18.0
+    depends_on:
+      - kafka0
+      - kafka-connect0
+      - schemaregistry0
+    ports:
+      - 8088:8088
+    environment:
+      KSQL_CUB_KAFKA_TIMEOUT: 120
+      KSQL_LISTENERS: https://0.0.0.0:8088
+      KSQL_BOOTSTRAP_SERVERS: SSL://kafka0:29092
+      KSQL_SECURITY_PROTOCOL: SSL
+      KSQL_SSL_TRUSTSTORE_LOCATION: /kafka.truststore.jks
+      KSQL_SSL_TRUSTSTORE_PASSWORD: secret
+      KSQL_SSL_KEYSTORE_LOCATION: /kafka.keystore.jks
+      KSQL_SSL_KEYSTORE_PASSWORD: secret
+      KSQL_SSL_KEY_PASSWORD: secret
+      KSQL_SSL_CLIENT_AUTHENTICATION: REQUIRED
+      KSQL_KSQL_LOGGING_PROCESSING_STREAM_AUTO_CREATE: "true"
+      KSQL_KSQL_LOGGING_PROCESSING_TOPIC_AUTO_CREATE: "true"
+      KSQL_KSQL_CONNECT_URL: https://kafka-connect0:8083
+      KSQL_KSQL_SCHEMA_REGISTRY_URL: https://schemaregistry0:8085
+      KSQL_KSQL_SERVICE_ID: my_ksql_1
+      KSQL_KSQL_HIDDEN_TOPICS: '^_.*'
+      KSQL_CACHE_MAX_BYTES_BUFFERING: 0
+    volumes:
+      - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
+      - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
diff --git a/documentation/compose/ssl/kafka.keystore.jks b/documentation/compose/ssl/kafka.keystore.jks
index a1e0548389e3b982aa4cd5559c8a5229f897fa76..eab29e914a8773efd41e6d3fa7c96f855b3aaeeb 100644
GIT binary patch
literal 4110
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

literal 4739
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

diff --git a/documentation/compose/ssl/kafka.truststore.jks b/documentation/compose/ssl/kafka.truststore.jks
index 3baa1aa1c0e7ee878b2f303af891c6eca1e1f69e..875caf6f1564606b324809d4388d166e0dd885f2 100644
GIT binary patch
delta 686
zcmV;f0#W_A2e=2290bCG%LI`i8Wa#wHk==Ib|+Zh-m`8aMj&5Tr&*CsVi_?qIWRag
zF)%V(7Y#EqF)=bWFgP<YFfv+^T}_h~0U&?NIOn3nQsg|CtHpRQ-krcZrR8#Ta_%cA
zIl|Q2k%7J?K>)0vSyJw6!?Pu4YzR=Fqf$bu!&nO65M=`FIw(O3N2tDn;`i8P)0uzx
zfWdbC1+FET_pdmg^Gn)y@H?>}?NF{a#vwgGIZW(9zw)Wrk^%)1*a8ATxJno`h4p{l
zEacUzwhj!TR;Rll7?tN>=ycwSOrONv4IoKIv$TZ`<=&1@X6&q;F;NfgK2XPGQd6As
zx=vKUWUQojYiAP8Nqm=)Pr5TgzNmPiTXr~{wAap?HZcR`prtCDk`vIQA1Jm>&^pi-
zWJ~V&c2H@IN11Q~>eRjhOlwglDoabP`2qt000E;@Fi|ia1_M<c4g?ki6f;GTj!Zb9
zurF;mFqrBs9N9TOGB6(o163U(1Q;+DfD|)Dkd90^ps+7(I53#%Egac7J~ESk0wsSu
z(UEVy9~F&ZXbkG}Y1*5|JVF_fJig&_NyU?nSg$Q7+(o&k-3jUb{0cU<4+OF(m#4+@
zH*<JlJmx@TI7tdK&KQ>SgHP<NcSxa9NG{4xH`UNEnHj2T{MY*Ogpue9_h_-RQv|x|
zt`!}UJeG}xlKtbw8d(orl~tvnZe@SgGnS{K4VG?uAnu<6Hn<|?-7M`3C=Cg1jVedW
zRIz6187q<^TssuJPY9*{BplW7ZaY~_lAeU<;X-d&`BciKN3)CZkk{o_D&4nc^m2lg
zbSW-OynZ*j<7TNpsOF>3ATCAfV=q>;0@3{)I5UjH2gTTb^{CJ^T_aVDJ1G`zA>>ty
U`<Ou}w%k6WNptDv;>3WN%rxvatN;K2

delta 686
zcmV;f0#W_A2e=2290V@qu`rP!8WcNRkGqK6fiObdWk$vOuIp6#lwXlfVi_<qF)=nX
zH8C|>7Y#EqF)%VXF*Y+bF*RC|T}_h~0U&>+=jIBr|FCFTkIo!94ZK!Dwu=(NY<yB9
z;Ajk?hQ`sD1n0DUTM@>+0kBJ<Q<Zn`JOu7>Gt}7~E~Ffpl9nqJYL{ToT@TL45y$3)
zmm&F5TQ2|@V>`+2*ITty*O%1UMf|sfG<7Y<-Bq6Roe#bXEi23%d5PV31=V)HmY{!h
zLujB{s0pbQrr?#Sg>owPd->8@JmF~aQ~6D3+_5pG_D5Ufgzy+k`1f{fbv^9r`@X@`
z?38l1`+wB->SZ~zGZ($+L(SvExLau#=h=JeT(ud?xni7^>Ica|F-mkkAN5f6_RCy3
zfBU2vnU1cmC3n6*<O3<UFE^3H04hslj{*Y$00E;@Fi|ia1_M<c4g?ki6iu5U&8;^B
zwfuFS891#cLsXsWo-iK<163U(1Q;+DfD}!eA<eBf1GW5ho*6i;Cqq=7>YkH-0wsSY
z{A5ezfWrtIlUUd~WFls!zOQ2!Pcp<{nxwcx7qFy}*r9D%R9mh$E+l9W!U;n|e-yOT
z5F42q2|{)|2;5PFq`r+^WU*8(Z#El%7BvrVx%q8WpREC+YqfW53zLr*SzB0N_L32p
z!f|nx%Dlx{3<X{b+T1k3UTAwMQ}cfb&8St>+Z15fHFkcOO3Hqr*yRcM^4_d;mqLDk
zT-@t{oxzxApGD|T7)-XQfew(5n+83xJ7bL~*SgFpDAG?)A2iqIk)k(mN~Z!Kksq_+
zdrm!*p)^gyRBrm8Ov=%4lT?DOVSC|n3|1el0njv(EL7RC@tbJUHK}~Gz!Da)f+_j#
U|BAhLC3(lhw+#++qC;jw0HFjt6#xJL

diff --git a/documentation/compose/ssl/san.cnf b/documentation/compose/ssl/san.cnf
index 53c52a9718f..5c69c8eca61 100644
--- a/documentation/compose/ssl/san.cnf
+++ b/documentation/compose/ssl/san.cnf
@@ -1,2 +1,2 @@
 [kafka]
-subjectAltName = DNS:kafka0,DNS:schemaregistry0,DNS:kafka-connect0
+subjectAltName = DNS:kafka0,DNS:schemaregistry0,DNS:kafka-connect0,DNS:ksqldb0
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 7943efdb617..e3a653d9eeb 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -30,6 +30,7 @@ public static class Cluster {
     WebClientSsl schemaRegistrySsl;
     String ksqldbServer;
     KsqldbServerAuth ksqldbServerAuth;
+    WebClientSsl ksqldbServerSsl;
     List<ConnectCluster> kafkaConnect;
     MetricsConfigData metrics;
     Properties properties;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index 9328e99a860..f413d21257b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -146,6 +146,13 @@ default InternalKsqlServer setKsqldbServer(ClustersProperties.Cluster clusterPro
       internalKsqlServerBuilder.password(clusterProperties.getKsqldbServerAuth().getPassword());
     }
 
+    if (clusterProperties.getKsqldbServerSsl() != null) {
+      internalKsqlServerBuilder.keystoreLocation(clusterProperties.getKsqldbServerSsl().getKeystoreLocation());
+      internalKsqlServerBuilder.keystorePassword(clusterProperties.getKsqldbServerSsl().getKeystorePassword());
+      internalKsqlServerBuilder.truststoreLocation(clusterProperties.getKsqldbServerSsl().getTruststoreLocation());
+      internalKsqlServerBuilder.truststorePassword(clusterProperties.getKsqldbServerSsl().getTruststorePassword());
+    }
+
     return internalKsqlServerBuilder.build();
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java
index a1c715bb586..f56167d997a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java
@@ -5,10 +5,15 @@
 import lombok.ToString;
 
 @Data
-@ToString(exclude = "password")
+@ToString(exclude = {"password", "keystorePassword", "truststorePassword"})
 @Builder(toBuilder = true)
 public class InternalKsqlServer {
   private final String url;
   private final String username;
   private final String password;
+
+  private final String keystoreLocation;
+  private final String truststoreLocation;
+  private final String keystorePassword;
+  private final String truststorePassword;
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
index b83da666aaf..4ce343132ed 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
@@ -11,6 +11,7 @@
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.service.ksql.response.ResponseParser;
+import com.provectus.kafka.ui.util.SecuredWebClient;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -79,11 +80,24 @@ private WebClient webClient() {
                       MimeTypeUtils.APPLICATION_OCTET_STREAM));
         })
         .build();
-    return WebClient.builder()
-        .codecs(c -> c.defaultCodecs().maxInMemorySize((int) maxBuffSize.toBytes()))
-        .defaultHeaders(httpHeaders -> setBasicAuthIfEnabled(httpHeaders, cluster))
-        .exchangeStrategies(exchangeStrategies)
-        .build();
+
+    try {
+      WebClient.Builder securedWebClient = SecuredWebClient.configure(
+          cluster.getKsqldbServer().getKeystoreLocation(),
+          cluster.getKsqldbServer().getKeystorePassword(),
+          cluster.getKsqldbServer().getTruststoreLocation(),
+          cluster.getKsqldbServer().getTruststorePassword()
+      );
+
+      return securedWebClient
+          .codecs(c -> c.defaultCodecs().maxInMemorySize((int) maxBuffSize.toBytes()))
+          .defaultHeaders(httpHeaders -> setBasicAuthIfEnabled(httpHeaders, cluster))
+          .exchangeStrategies(exchangeStrategies)
+          .build();
+    } catch (Exception e) {
+      throw new IllegalStateException(
+          "cannot create TLS configuration for ksqlDB in cluster " + cluster.getName(), e);
+    }
   }
 
   public static void setBasicAuthIfEnabled(HttpHeaders headers, KafkaCluster cluster) {

From 39d0c3750fdb17e411b6dc4da844ab04bccd5d13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 07:39:00 +0400
Subject: [PATCH 314/734] Bump byte-buddy from 1.12.18 to 1.12.19 (#3022)

Bumps [byte-buddy](https://github.com/raphw/byte-buddy) from 1.12.18 to 1.12.19.
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.12.18...byte-buddy-1.12.19)

---
updated-dependencies:
- dependency-name: net.bytebuddy:byte-buddy
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0a570bacf9e..498a23968e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <apache.commons.version>2.11.1</apache.commons.version>
         <assertj.version>3.19.0</assertj.version>
         <avro.version>1.11.1</avro.version>
-        <byte-buddy.version>1.12.18</byte-buddy.version>
+        <byte-buddy.version>1.12.19</byte-buddy.version>
         <confluent.version>7.3.0</confluent.version>
         <datasketches-java.version>3.1.0</datasketches-java.version>
         <groovy.version>3.0.13</groovy.version>

From ed61852e4044afe9535bfc7c442fac26dfa0af12 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 7 Dec 2022 08:51:11 +0400
Subject: [PATCH 315/734] Implement per-cluster polling rates limits (#2981)

* Polling throttling:
1. PollingThrottler class for per-cluster throttle managing
2. UI-publishing throttle for TailingEmitter
3. Elastic scheduler assigned for places where Serde interfaces are used

* int cast fix

* compilation fix

* test threshold fix

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 README.md                                     |  1 +
 .../kafka/ui/config/ClustersProperties.java   |  1 +
 .../ui/controller/MessagesController.java     |  4 +-
 .../kafka/ui/emitter/AbstractEmitter.java     | 14 +++--
 .../ui/emitter/BackwardRecordEmitter.java     |  7 ++-
 .../kafka/ui/emitter/ConsumingStats.java      | 19 +++----
 .../ui/emitter/ForwardRecordEmitter.java      | 11 ++--
 .../kafka/ui/emitter/TailingEmitter.java      |  8 +--
 .../kafka/ui/mapper/ClusterMapper.java        |  8 +++
 .../kafka/ui/model/KafkaCluster.java          |  3 ++
 .../ui/service/DeserializationService.java    |  5 ++
 .../kafka/ui/service/MessagesService.java     | 32 +++++++++--
 .../kafka/ui/service/TopicsService.java       |  1 -
 .../service/analyze/TopicAnalysisService.java |  9 +++-
 .../kafka/ui/util/ConsumerRecordsUtil.java    | 29 ++++++++++
 .../kafka/ui/util/PollingThrottler.java       | 54 +++++++++++++++++++
 .../kafka/ui/emitter/TailingEmitterTest.java  |  2 +-
 .../kafka/ui/service/RecordEmitterTest.java   | 31 +++++++----
 .../kafka/ui/util/PollingThrottlerTest.java   | 39 ++++++++++++++
 19 files changed, 233 insertions(+), 45 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordsUtil.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/PollingThrottlerTest.java

diff --git a/README.md b/README.md
index 313bcf4ae16..f7c67deae64 100644
--- a/README.md
+++ b/README.md
@@ -209,5 +209,6 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_METRICS_SSL`          |Enable SSL for Metrics? `true` or `false`. For advanced setup, see `kafka-ui-jmx-secured.yml`
 |`KAFKA_CLUSTERS_0_METRICS_USERNAME` |Username for Metrics authentication
 |`KAFKA_CLUSTERS_0_METRICS_PASSWORD` |Password for Metrics authentication
+|`KAFKA_CLUSTERS_0_POLLING_THROTTLE_RATE` |Max traffic rate (bytes/sec) that kafka-ui allowed to reach when polling messages from the cluster. Default: 0 (not limited)
 |`TOPIC_RECREATE_DELAY_SECONDS` |Time delay between topic deletion and topic creation attempts for topic recreate functionality. Default: 1
 |`TOPIC_RECREATE_MAXRETRIES`  |Number of attempts of topic creation after topic deletion for topic recreate functionality. Default: 15
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index e3a653d9eeb..2894fd107a8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -40,6 +40,7 @@ public static class Cluster {
     String defaultKeySerde;
     String defaultValueSerde;
     List<Masking> masking = new ArrayList<>();
+    long pollingThrottleRate = 0;
   }
 
   @Data
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
index 79ae59c3b30..f32d31b47b4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
@@ -30,6 +30,7 @@
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 @RestController
 @RequiredArgsConstructor
@@ -135,6 +136,7 @@ public Mono<ResponseEntity<TopicSerdeSuggestionDTO>> getSerdes(String clusterNam
             .value(use == SerdeUsageDTO.SERIALIZE
                 ? deserializationService.getSerdesForSerialize(getCluster(clusterName), topicName, VALUE)
                 : deserializationService.getSerdesForDeserialize(getCluster(clusterName), topicName, VALUE))
-    ).map(ResponseEntity::ok);
+    ).subscribeOn(Schedulers.boundedElastic())
+        .map(ResponseEntity::ok);
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
index 35d8a3bef34..7cd01061d04 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
@@ -4,6 +4,7 @@
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.model.TopicMessagePhaseDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import com.provectus.kafka.ui.util.PollingThrottler;
 import java.time.Duration;
 import java.time.Instant;
 import org.apache.kafka.clients.consumer.Consumer;
@@ -24,9 +25,11 @@ public abstract class AbstractEmitter {
 
   private final ConsumerRecordDeserializer recordDeserializer;
   private final ConsumingStats consumingStats = new ConsumingStats();
+  private final PollingThrottler throttler;
 
-  protected AbstractEmitter(ConsumerRecordDeserializer recordDeserializer) {
+  protected AbstractEmitter(ConsumerRecordDeserializer recordDeserializer, PollingThrottler throttler) {
     this.recordDeserializer = recordDeserializer;
+    this.throttler = throttler;
   }
 
   protected ConsumerRecords<Bytes, Bytes> poll(
@@ -39,7 +42,8 @@ protected ConsumerRecords<Bytes, Bytes> poll(
     Instant start = Instant.now();
     ConsumerRecords<Bytes, Bytes> records = consumer.poll(timeout);
     Instant finish = Instant.now();
-    sendConsuming(sink, records, Duration.between(start, finish).toMillis());
+    int polledBytes = sendConsuming(sink, records, Duration.between(start, finish).toMillis());
+    throttler.throttleAfterPoll(polledBytes);
     return records;
   }
 
@@ -61,10 +65,10 @@ protected void sendPhase(FluxSink<TopicMessageEventDTO> sink, String name) {
     );
   }
 
-  protected void sendConsuming(FluxSink<TopicMessageEventDTO> sink,
+  protected int sendConsuming(FluxSink<TopicMessageEventDTO> sink,
                                ConsumerRecords<Bytes, Bytes> records,
                                long elapsed) {
-    consumingStats.sendConsumingEvt(sink, records, elapsed, getFilterApplyErrors(sink));
+    return consumingStats.sendConsumingEvt(sink, records, elapsed, getFilterApplyErrors(sink));
   }
 
   protected void sendFinishStatsAndCompleteSink(FluxSink<TopicMessageEventDTO> sink) {
@@ -78,4 +82,4 @@ protected Number getFilterApplyErrors(FluxSink<?> sink) {
         .<Number>map(MessageFilterStats::getFilterApplyErrors)
         .orElse(0);
   }
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
index fe1644676a0..c651bd5e56b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
@@ -3,6 +3,7 @@
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import com.provectus.kafka.ui.util.PollingThrottler;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,8 +35,9 @@ public BackwardRecordEmitter(
       Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
       ConsumerPosition consumerPosition,
       int messagesPerPage,
-      ConsumerRecordDeserializer recordDeserializer) {
-    super(recordDeserializer);
+      ConsumerRecordDeserializer recordDeserializer,
+      PollingThrottler throttler) {
+    super(recordDeserializer, throttler);
     this.consumerPosition = consumerPosition;
     this.messagesPerPage = messagesPerPage;
     this.consumerSupplier = consumerSupplier;
@@ -43,6 +45,7 @@ public BackwardRecordEmitter(
 
   @Override
   public void accept(FluxSink<TopicMessageEventDTO> sink) {
+    log.debug("Starting backward polling for {}", consumerPosition);
     try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
       sendPhase(sink, "Created consumer");
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
index bd0754fc687..68c1cff098d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
@@ -2,9 +2,8 @@
 
 import com.provectus.kafka.ui.model.TopicMessageConsumingDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
+import com.provectus.kafka.ui.util.ConsumerRecordsUtil;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
 
@@ -14,18 +13,15 @@ class ConsumingStats {
   private int records = 0;
   private long elapsed = 0;
 
-  void sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
+  /**
+   * returns bytes polled.
+   */
+  int sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
                         ConsumerRecords<Bytes, Bytes> polledRecords,
                         long elapsed,
                         Number filterApplyErrors) {
-    for (ConsumerRecord<Bytes, Bytes> rec : polledRecords) {
-      for (Header header : rec.headers()) {
-        bytes +=
-            (header.key() != null ? header.key().getBytes().length : 0L)
-                + (header.value() != null ? header.value().length : 0L);
-      }
-      bytes += rec.serializedKeySize() + rec.serializedValueSize();
-    }
+    int polledBytes = ConsumerRecordsUtil.calculatePolledSize(polledRecords);
+    bytes += polledBytes;
     this.records += polledRecords.count();
     this.elapsed += elapsed;
     sink.next(
@@ -33,6 +29,7 @@ void sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
             .type(TopicMessageEventDTO.TypeEnum.CONSUMING)
             .consuming(createConsumingStats(sink, filterApplyErrors))
     );
+    return polledBytes;
   }
 
   void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink, Number filterApplyErrors) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
index 502a8c9a26c..132b4790297 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
@@ -3,6 +3,7 @@
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import com.provectus.kafka.ui.util.PollingThrottler;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -22,14 +23,16 @@ public class ForwardRecordEmitter
   public ForwardRecordEmitter(
       Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
       ConsumerPosition position,
-      ConsumerRecordDeserializer recordDeserializer) {
-    super(recordDeserializer);
+      ConsumerRecordDeserializer recordDeserializer,
+      PollingThrottler throttler) {
+    super(recordDeserializer, throttler);
     this.position = position;
     this.consumerSupplier = consumerSupplier;
   }
 
   @Override
   public void accept(FluxSink<TopicMessageEventDTO> sink) {
+    log.debug("Starting forward polling for {}", position);
     try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
       sendPhase(sink, "Assigning partitions");
       var seekOperations = SeekOperations.create(consumer, position);
@@ -43,7 +46,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
 
         sendPhase(sink, "Polling");
         ConsumerRecords<Bytes, Bytes> records = poll(sink, consumer);
-        log.info("{} records polled", records.count());
+        log.debug("{} records polled", records.count());
         emptyPolls = records.isEmpty() ? emptyPolls + 1 : 0;
 
         for (ConsumerRecord<Bytes, Bytes> msg : records) {
@@ -55,7 +58,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
         }
       }
       sendFinishStatsAndCompleteSink(sink);
-      log.info("Polling finished");
+      log.debug("Polling finished");
     } catch (Exception e) {
       log.error("Error occurred while consuming records", e);
       sink.error(e);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
index 12a8ae183dd..025dd874cfa 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
@@ -3,6 +3,7 @@
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import com.provectus.kafka.ui.util.PollingThrottler;
 import java.util.HashMap;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
@@ -20,16 +21,17 @@ public class TailingEmitter extends AbstractEmitter
 
   public TailingEmitter(Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
                         ConsumerPosition consumerPosition,
-                        ConsumerRecordDeserializer recordDeserializer) {
-    super(recordDeserializer);
+                        ConsumerRecordDeserializer recordDeserializer,
+                        PollingThrottler throttler) {
+    super(recordDeserializer, throttler);
     this.consumerSupplier = consumerSupplier;
     this.consumerPosition = consumerPosition;
   }
 
   @Override
   public void accept(FluxSink<TopicMessageEventDTO> sink) {
+    log.debug("Starting tailing polling for {}", consumerPosition);
     try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
-      log.debug("Starting topic tailing");
       assignAndSeek(consumer);
       while (!sink.isCancelled()) {
         sendPhase(sink, "Polling");
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index f413d21257b..588afc1f957 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -36,11 +36,13 @@
 import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel;
 import com.provectus.kafka.ui.service.masking.DataMasking;
 import com.provectus.kafka.ui.service.metrics.RawMetric;
+import com.provectus.kafka.ui.util.PollingThrottler;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.mapstruct.Mapper;
@@ -56,6 +58,7 @@ public interface ClusterMapper {
   @Mapping(target = "schemaRegistry", source = ".", qualifiedByName = "setSchemaRegistry")
   @Mapping(target = "ksqldbServer", source = ".", qualifiedByName = "setKsqldbServer")
   @Mapping(target = "metricsConfig", source = "metrics")
+  @Mapping(target = "throttler", source = ".", qualifiedByName = "createClusterThrottler")
   KafkaCluster toKafkaCluster(ClustersProperties.Cluster clusterProperties);
 
   ClusterStatsDTO toClusterStats(InternalClusterState clusterState);
@@ -156,6 +159,11 @@ default InternalKsqlServer setKsqldbServer(ClustersProperties.Cluster clusterPro
     return internalKsqlServerBuilder.build();
   }
 
+  @Named("createClusterThrottler")
+  default Supplier<PollingThrottler> createClusterThrottler(ClustersProperties.Cluster cluster) {
+    return PollingThrottler.throttlerSupplier(cluster);
+  }
+
   TopicDetailsDTO toTopicDetails(InternalTopic topic);
 
   @Mapping(target = "isReadOnly", source = "readOnly")
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
index 28dc89d0f13..5c9a0753f61 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
@@ -1,8 +1,10 @@
 package com.provectus.kafka.ui.model;
 
 import com.provectus.kafka.ui.service.masking.DataMasking;
+import com.provectus.kafka.ui.util.PollingThrottler;
 import java.util.List;
 import java.util.Properties;
+import java.util.function.Supplier;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -23,4 +25,5 @@ public class KafkaCluster {
   private final boolean disableLogDirsCollection;
   private final MetricsConfig metricsConfig;
   private final DataMasking masking;
+  private final Supplier<PollingThrottler> throttler;
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
index 7965321ba61..cd868559709 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
@@ -20,6 +20,11 @@
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
+/**
+ * Class is responsible for managing serdes for kafka clusters.
+ * NOTE: Since Serde interface is designed to be blocking it is required that DeserializationService
+ * (and all Serde-related code) calls executed within special thread pool (boundedElastic).
+ */
 @Component
 public class DeserializationService implements Closeable {
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index 7654758fdf3..eaf6fbb889a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.service;
 
+import com.google.common.util.concurrent.RateLimiter;
 import com.provectus.kafka.ui.emitter.BackwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.MessageFilterStats;
@@ -46,6 +47,10 @@
 @RequiredArgsConstructor
 @Slf4j
 public class MessagesService {
+
+  // limiting UI messages rate to 20/sec in tailing mode
+  public static final int TAILING_UI_MESSAGE_THROTTLE_RATE = 20;
+
   private final AdminClientService adminClientService;
   private final DeserializationService deserializationService;
   private final ConsumerGroupService consumerGroupService;
@@ -83,6 +88,7 @@ private Mono<Map<TopicPartition, Long>> offsetsForDeletion(KafkaCluster cluster,
   public Mono<RecordMetadata> sendMessage(KafkaCluster cluster, String topic,
                                           CreateTopicMessageDTO msg) {
     return withExistingTopic(cluster, topic)
+        .publishOn(Schedulers.boundedElastic())
         .flatMap(desc -> sendMessageImpl(cluster, desc, msg));
   }
 
@@ -138,6 +144,7 @@ public Flux<TopicMessageEventDTO> loadMessages(KafkaCluster cluster, String topi
                                                  @Nullable String valueSerde) {
     return withExistingTopic(cluster, topic)
         .flux()
+        .publishOn(Schedulers.boundedElastic())
         .flatMap(td -> loadMessagesImpl(cluster, topic, consumerPosition, query,
             filterQueryType, limit, seekDirection, keySerde, valueSerde));
   }
@@ -159,20 +166,23 @@ private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
       emitter = new ForwardRecordEmitter(
           () -> consumerGroupService.createConsumer(cluster),
           consumerPosition,
-          recordDeserializer
+          recordDeserializer,
+          cluster.getThrottler().get()
       );
     } else if (seekDirection.equals(SeekDirectionDTO.BACKWARD)) {
       emitter = new BackwardRecordEmitter(
           () -> consumerGroupService.createConsumer(cluster),
           consumerPosition,
           limit,
-          recordDeserializer
+          recordDeserializer,
+          cluster.getThrottler().get()
       );
     } else {
       emitter = new TailingEmitter(
           () -> consumerGroupService.createConsumer(cluster),
           consumerPosition,
-          recordDeserializer
+          recordDeserializer,
+          cluster.getThrottler().get()
       );
     }
     MessageFilterStats filterStats = new MessageFilterStats();
@@ -181,8 +191,7 @@ private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
         .filter(getMsgFilter(query, filterQueryType, filterStats))
         .map(getDataMasker(cluster, topic))
         .takeWhile(createTakeWhilePredicate(seekDirection, limit))
-        .subscribeOn(Schedulers.boundedElastic())
-        .share();
+        .map(throttleUiPublish(seekDirection));
   }
 
   private Predicate<TopicMessageEventDTO> createTakeWhilePredicate(
@@ -228,4 +237,17 @@ private Predicate<TopicMessageEventDTO> getMsgFilter(String query,
     };
   }
 
+  private <T> UnaryOperator<T> throttleUiPublish(SeekDirectionDTO seekDirection) {
+    if (seekDirection == SeekDirectionDTO.TAILING) {
+      RateLimiter rateLimiter = RateLimiter.create(TAILING_UI_MESSAGE_THROTTLE_RATE);
+      return m -> {
+        rateLimiter.acquire(1);
+        return m;
+      };
+    }
+    // there is no need to throttle UI production rate for non-tailing modes, since max number of produced
+    // messages is limited for them (with page size)
+    return UnaryOperator.identity();
+  }
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 7b08d69fd6c..19757ab6aa8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -51,7 +51,6 @@
 public class TopicsService {
 
   private final AdminClientService adminClientService;
-  private final DeserializationService deserializationService;
   private final StatisticsCache statisticsCache;
   @Value("${topic.recreate.maxRetries:15}")
   private int recreateMaxRetries;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
index 3eb61a56d27..9b6bd787671 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
@@ -8,6 +8,7 @@
 import com.provectus.kafka.ui.model.TopicAnalysisDTO;
 import com.provectus.kafka.ui.service.ConsumerGroupService;
 import com.provectus.kafka.ui.service.TopicsService;
+import com.provectus.kafka.ui.util.PollingThrottler;
 import java.io.Closeable;
 import java.time.Duration;
 import java.time.Instant;
@@ -62,7 +63,7 @@ private synchronized void startAnalysis(KafkaCluster cluster,
     if (analysisTasksStore.isAnalysisInProgress(topicId)) {
       throw new TopicAnalysisException("Topic is already analyzing");
     }
-    var task = new AnalysisTask(cluster, topicId, partitionsCnt, approxNumberOfMsgs);
+    var task = new AnalysisTask(cluster, topicId, partitionsCnt, approxNumberOfMsgs, cluster.getThrottler().get());
     analysisTasksStore.registerNewTask(topicId, task);
     Schedulers.boundedElastic().schedule(task);
   }
@@ -82,13 +83,15 @@ class AnalysisTask implements Runnable, Closeable {
     private final TopicIdentity topicId;
     private final int partitionsCnt;
     private final long approxNumberOfMsgs;
+    private final PollingThrottler throttler;
 
     private final TopicAnalysisStats totalStats = new TopicAnalysisStats();
     private final Map<Integer, TopicAnalysisStats> partitionStats = new HashMap<>();
 
     private final KafkaConsumer<Bytes, Bytes> consumer;
 
-    AnalysisTask(KafkaCluster cluster, TopicIdentity topicId, int partitionsCnt, long approxNumberOfMsgs) {
+    AnalysisTask(KafkaCluster cluster, TopicIdentity topicId, int partitionsCnt,
+                 long approxNumberOfMsgs, PollingThrottler throttler) {
       this.topicId = topicId;
       this.approxNumberOfMsgs = approxNumberOfMsgs;
       this.partitionsCnt = partitionsCnt;
@@ -100,6 +103,7 @@ class AnalysisTask implements Runnable, Closeable {
               ConsumerConfig.MAX_POLL_RECORDS_CONFIG, "100000"
           )
       );
+      this.throttler = throttler;
     }
 
     @Override
@@ -123,6 +127,7 @@ public void run() {
         for (int emptyPolls = 0; !offsetsInfo.assignedPartitionsFullyPolled()
             && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT;) {
           var polled = consumer.poll(Duration.ofSeconds(3));
+          throttler.throttleAfterPoll(polled);
           emptyPolls = polled.isEmpty() ? emptyPolls + 1 : 0;
           polled.forEach(r -> {
             totalStats.apply(r);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordsUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordsUtil.java
new file mode 100644
index 00000000000..e4efcb0f750
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordsUtil.java
@@ -0,0 +1,29 @@
+package com.provectus.kafka.ui.util;
+
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.utils.Bytes;
+
+public class ConsumerRecordsUtil {
+
+  public static int calculatePolledRecSize(ConsumerRecord<Bytes, Bytes> rec) {
+    int polledBytes = 0;
+    for (Header header : rec.headers()) {
+      polledBytes +=
+          (header.key() != null ? header.key().getBytes().length : 0)
+              + (header.value() != null ? header.value().length : 0);
+    }
+    polledBytes += rec.key() == null ? 0 : rec.serializedKeySize();
+    polledBytes += rec.value() == null ? 0 : rec.serializedValueSize();
+    return polledBytes;
+  }
+
+  public static int calculatePolledSize(Iterable<ConsumerRecord<Bytes, Bytes>> recs) {
+    int polledBytes = 0;
+    for (ConsumerRecord<Bytes, Bytes> rec : recs) {
+      polledBytes += calculatePolledRecSize(rec);
+    }
+    return polledBytes;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java
new file mode 100644
index 00000000000..213f0fdbd7f
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java
@@ -0,0 +1,54 @@
+package com.provectus.kafka.ui.util;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.util.concurrent.RateLimiter;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import java.util.Optional;
+import java.util.function.Supplier;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.common.utils.Bytes;
+
+@Slf4j
+public class PollingThrottler {
+
+  public static Supplier<PollingThrottler> throttlerSupplier(ClustersProperties.Cluster cluster) {
+    long rate = cluster.getPollingThrottleRate();
+    if (rate <= 0) {
+      return PollingThrottler::noop;
+    }
+    // RateLimiter instance should be shared across all created throttlers
+    var rateLimiter = RateLimiter.create(rate);
+    return () -> new PollingThrottler(cluster.getName(), rateLimiter);
+  }
+
+  private final String clusterName;
+  private final RateLimiter rateLimiter;
+  private boolean throttled;
+
+  @VisibleForTesting
+  public PollingThrottler(String clusterName, RateLimiter rateLimiter) {
+    this.clusterName = clusterName;
+    this.rateLimiter = rateLimiter;
+  }
+
+  public static PollingThrottler noop() {
+    return new PollingThrottler("noop", RateLimiter.create(Long.MAX_VALUE));
+  }
+
+  public void throttleAfterPoll(int polledBytes) {
+    if (polledBytes > 0) {
+      double sleptSeconds = rateLimiter.acquire(polledBytes);
+      if (!throttled && sleptSeconds > 0.0) {
+        throttled = true;
+        log.debug("Polling throttling enabled for cluster {} at rate {} bytes/sec", clusterName, rateLimiter.getRate());
+      }
+    }
+  }
+
+  public void throttleAfterPoll(ConsumerRecords<Bytes, Bytes> polled) {
+    throttleAfterPoll(ConsumerRecordsUtil.calculatePolledSize(polled));
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java
index cdb1eaaa549..2798bd213fe 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/TailingEmitterTest.java
@@ -143,4 +143,4 @@ private void waitUntilTailingInitialized(List<TopicMessageEventDTO> fluxOutput)
             .anyMatch(msg -> msg.getType() == TopicMessageEventDTO.TypeEnum.CONSUMING));
   }
 
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
index 350386fd7e9..79e81a180fc 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
@@ -16,6 +16,7 @@
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
 import com.provectus.kafka.ui.serdes.builtin.StringSerde;
+import com.provectus.kafka.ui.util.PollingThrottler;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -110,14 +111,16 @@ void pollNothingOnEmptyTopic() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
         100,
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     StepVerifier.create(Flux.create(forwardEmitter))
@@ -138,14 +141,16 @@ void pollFullTopicFromBeginning() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(BEGINNING, TOPIC, null),
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(LATEST, TOPIC, null),
         PARTITIONS * MSGS_PER_PARTITION,
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     List<String> expectedValues = SENT_RECORDS.stream().map(Record::getValue).collect(Collectors.toList());
@@ -165,14 +170,16 @@ void pollWithOffsets() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
         PARTITIONS * MSGS_PER_PARTITION,
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -208,14 +215,16 @@ void pollWithTimestamps() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
         PARTITIONS * MSGS_PER_PARTITION,
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -245,7 +254,8 @@ void backwardEmitterSeekToEnd() {
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
         numMessages,
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -270,7 +280,8 @@ void backwardEmitterSeekToBegin() {
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, offsets),
         100,
-        RECORD_DESERIALIZER
+        RECORD_DESERIALIZER,
+        PollingThrottler.noop()
     );
 
     expectEmitter(backwardEmitter,
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/PollingThrottlerTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/PollingThrottlerTest.java
new file mode 100644
index 00000000000..ab333cb11a4
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/PollingThrottlerTest.java
@@ -0,0 +1,39 @@
+package com.provectus.kafka.ui.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Percentage.withPercentage;
+
+import com.google.common.base.Stopwatch;
+import com.google.common.util.concurrent.RateLimiter;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+
+class PollingThrottlerTest {
+
+  @Test
+  void testTrafficThrottled() {
+    var throttler = new PollingThrottler("test", RateLimiter.create(1000));
+    long polledBytes = 0;
+    var stopwatch = Stopwatch.createStarted();
+    while (stopwatch.elapsed(TimeUnit.SECONDS) < 1) {
+      int newPolled = ThreadLocalRandom.current().nextInt(10);
+      throttler.throttleAfterPoll(newPolled);
+      polledBytes += newPolled;
+    }
+    assertThat(polledBytes).isCloseTo(1000, withPercentage(3.0));
+  }
+
+  @Test
+  void noopThrottlerDoNotLimitPolling() {
+    var noopThrottler = PollingThrottler.noop();
+    var stopwatch = Stopwatch.createStarted();
+    // emulating that we polled 1GB
+    for (int i = 0; i < 1024; i++) {
+      noopThrottler.throttleAfterPoll(1024 * 1024);
+    }
+    // checking that were are able to "poll" 1GB in less than a second
+    assertThat(stopwatch.elapsed().getSeconds()).isLessThan(1);
+  }
+
+}

From 1108c760e5f0b23908f3818500b78fe57d44ce71 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 7 Dec 2022 08:51:22 +0400
Subject: [PATCH 316/734] [BE] Fix a case when controller is not found (#3030)

* ISSUE-3024: kui not working when controller not found
1. ReactiveAdminClient::getClusterVersion now takes into account that controller can not be visible
2. Uniq clientId generation added for consumers and adminClients
3. ReactiveAdminClient::toMonoWithExceptionFilter implementation simplified

* uniq adminclient clientId generation

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../ui/service/AdminClientServiceImpl.java    |  2 +-
 .../ui/service/ConsumerGroupService.java      |  3 +-
 .../kafka/ui/service/ReactiveAdminClient.java | 70 ++++++++++---------
 .../ui/service/ReactiveAdminClientTest.java   |  9 ++-
 4 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
index 9291198df73..3589a07a47d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
@@ -37,7 +37,7 @@ private Mono<ReactiveAdminClient> createAdminClient(KafkaCluster cluster) {
       properties
           .put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
       properties.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, clientTimeout);
-      properties.putIfAbsent(AdminClientConfig.CLIENT_ID_CONFIG, "kafka-ui-app");
+      properties.putIfAbsent(AdminClientConfig.CLIENT_ID_CONFIG, "kafka-ui-admin-client-" + System.currentTimeMillis());
       return AdminClient.create(properties);
     })
         .flatMap(ReactiveAdminClient::create)
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index 2de70c88ca2..55289a87edd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -11,7 +11,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.UUID;
 import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
@@ -197,7 +196,7 @@ public KafkaConsumer<Bytes, Bytes> createConsumer(KafkaCluster cluster,
                                                     Map<String, Object> properties) {
     Properties props = new Properties();
     props.putAll(cluster.getProperties());
-    props.put(ConsumerConfig.CLIENT_ID_CONFIG, "kafka-ui-" + UUID.randomUUID());
+    props.put(ConsumerConfig.CLIENT_ID_CONFIG, "kafka-ui-consumer-" + System.currentTimeMillis());
     props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
     props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class);
     props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index c655cc2ad9b..2e3605145aa 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -25,9 +25,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletionException;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -260,37 +258,32 @@ public Mono<TopicDescription> describeTopic(String topic) {
    * such topics in resulting map.
    * <p/>
    * This method converts input map into Mono[Map] ignoring keys for which KafkaFutures
-   * finished with <code>clazz</code> exception.
+   * finished with <code>clazz</code> exception and empty Monos.
    */
   static <K, V> Mono<Map<K, V>> toMonoWithExceptionFilter(Map<K, KafkaFuture<V>> values,
-                                                           Class<? extends KafkaException> clazz) {
+                                                          Class<? extends KafkaException> clazz) {
     if (values.isEmpty()) {
       return Mono.just(Map.of());
     }
 
-    List<Mono<Tuple2<K, V>>> monos = values.entrySet().stream()
-        .map(e -> toMono(e.getValue()).map(r -> Tuples.of(e.getKey(), r)))
-        .collect(toList());
-
-    return Mono.create(sink -> {
-      var finishedCnt = new AtomicInteger();
-      var results = new ConcurrentHashMap<K, V>();
-      monos.forEach(mono -> mono.subscribe(
-          r -> {
-            results.put(r.getT1(), r.getT2());
-            if (finishedCnt.incrementAndGet() == monos.size()) {
-              sink.success(results);
-            }
-          },
-          th -> {
-            if (!th.getClass().isAssignableFrom(clazz)) {
-              sink.error(th);
-            } else if (finishedCnt.incrementAndGet() == monos.size()) {
-              sink.success(results);
-            }
-          }
-      ));
-    });
+    List<Mono<Tuple2<K, Optional<V>>>> monos = values.entrySet().stream()
+        .map(e ->
+            toMono(e.getValue())
+                .map(r -> Tuples.of(e.getKey(), Optional.of(r)))
+                .defaultIfEmpty(Tuples.of(e.getKey(), Optional.empty())) //tracking empty Monos
+                .onErrorResume(
+                    // tracking Monos with suppressible error
+                    th -> th.getClass().isAssignableFrom(clazz),
+                    th -> Mono.just(Tuples.of(e.getKey(), Optional.empty()))))
+        .toList();
+
+    return Mono.zip(
+        monos,
+        resultsArr -> Stream.of(resultsArr)
+            .map(obj -> (Tuple2<K, Optional<V>>) obj)
+            .filter(t -> t.getT2().isPresent()) //skipping empty & suppressible-errors
+            .collect(Collectors.toMap(Tuple2::getT1, t -> t.getT2().get()))
+    );
   }
 
   public Mono<Map<Integer, Map<String, DescribeLogDirsResponse.LogDirInfo>>> describeLogDirs() {
@@ -305,6 +298,10 @@ public Mono<Map<Integer, Map<String, DescribeLogDirsResponse.LogDirInfo>>> descr
   }
 
   public Mono<ClusterDescription> describeCluster() {
+    return describeClusterImpl(client);
+  }
+
+  private static Mono<ClusterDescription> describeClusterImpl(AdminClient client) {
     var r = client.describeCluster();
     var all = KafkaFuture.allOf(r.nodes(), r.clusterId(), r.controller(), r.authorizedOperations());
     return Mono.create(sink -> all.whenComplete((res, ex) -> {
@@ -328,15 +325,20 @@ public Mono<ClusterDescription> describeCluster() {
   }
 
   private static Mono<String> getClusterVersion(AdminClient client) {
-    return toMono(client.describeCluster().controller())
-        .flatMap(controller -> loadBrokersConfig(client, List.of(controller.id())))
-        .map(configs -> configs.values().stream()
+    return describeClusterImpl(client)
+        // choosing node from which we will get configs (starting with controller)
+        .flatMap(descr -> descr.controller != null
+            ? Mono.just(descr.controller)
+            : Mono.justOrEmpty(descr.nodes.stream().findFirst())
+        )
+        .flatMap(node -> loadBrokersConfig(client, List.of(node.id())))
+        .flatMap(configs -> configs.values().stream()
             .flatMap(Collection::stream)
             .filter(entry -> entry.name().contains("inter.broker.protocol.version"))
             .findFirst()
-            .map(ConfigEntry::value)
-            .orElse("1.0-UNKNOWN")
-        );
+            .map(configEntry -> Mono.just(configEntry.value()))
+            .orElse(Mono.empty()))
+        .switchIfEmpty(Mono.just("1.0-UNKNOWN"));
   }
 
   public Mono<Void> deleteConsumerGroups(Collection<String> groupIds) {
@@ -419,6 +421,7 @@ public Mono<Void> alterConsumerGroupOffsets(String groupId, Map<TopicPartition,
 
   /**
    * List offset for the topic's partitions and OffsetSpec.
+   *
    * @param failOnUnknownLeader true - throw exception in case of no-leader partitions,
    *                            false - skip partitions with no leader
    */
@@ -432,6 +435,7 @@ public Mono<Map<TopicPartition, Long>> listTopicOffsets(String topic,
 
   /**
    * List offset for the specified partitions and OffsetSpec.
+   *
    * @param failOnUnknownLeader true - throw exception in case of no-leader partitions,
    *                            false - skip partitions with no leader
    */
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
index 26df31426da..99cfedad4cf 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
@@ -104,7 +104,14 @@ void testToMonoWithExceptionFilter() {
     var okFuture = new KafkaFutureImpl<String>();
     okFuture.complete("done");
 
-    Map<String, KafkaFuture<String>> arg = Map.of("failure", failedFuture, "ok", okFuture);
+    var emptyFuture = new KafkaFutureImpl<String>();
+    emptyFuture.complete(null);
+
+    Map<String, KafkaFuture<String>> arg = Map.of(
+        "failure", failedFuture,
+        "ok", okFuture,
+        "empty", emptyFuture
+    );
     StepVerifier.create(toMonoWithExceptionFilter(arg, UnknownTopicOrPartitionException.class))
         .assertNext(result -> assertThat(result).hasSize(1).containsEntry("ok", "done"))
         .verifyComplete();

From dbdf14312240e0b36f378b3c274202ffe6cb818e Mon Sep 17 00:00:00 2001
From: Pranav Yadav <Pranavyadav3912@gmail.com>
Date: Wed, 7 Dec 2022 13:33:10 +0530
Subject: [PATCH 317/734] chore: changed `dateFormat` for Timestamp value
 (#2895)

* chore: changed `dateFormat` for Timestamp value

- in Topic/Messages
- closes #2858

* consider case-sensitivity in `dateFormat`

:)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/Topics/Topic/Messages/Filters/Filters.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 1b99650f715..9f54e56d5a4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -428,7 +428,7 @@ const Filters: React.FC<FiltersProps> = ({
                   onChange={(date: Date | null) => setTimestamp(date)}
                   showTimeInput
                   timeInputLabel="Time:"
-                  dateFormat="MMMM d, yyyy HH:mm"
+                  dateFormat="MMM d, yyyy HH:mm"
                   placeholderText="Select timestamp"
                   disabled={isTailing}
                 />

From 1ba8d14819067ef1e109b73e92d3ba59fed4a7f9 Mon Sep 17 00:00:00 2001
From: kristi-dev <92114648+kristi-dev@users.noreply.github.com>
Date: Wed, 7 Dec 2022 08:42:55 +0000
Subject: [PATCH 318/734] KSQL: Focus onto query field after incorrect query
 execution (#2970)

---
 .../KsqlDb/Query/QueryForm/QueryForm.tsx         | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
index 9965ea5189a..26622881f72 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useRef } from 'react';
 import { FormError } from 'components/common/Input/Input.styled';
 import { ErrorMessage } from '@hookform/error-message';
 import { useForm, Controller, useFieldArray } from 'react-hook-form';
@@ -8,6 +8,7 @@ import CloseIcon from 'components/common/Icons/CloseIcon';
 import { yupResolver } from '@hookform/resolvers/yup';
 import yup from 'lib/yupExtended';
 import PlusIcon from 'components/common/Icons/PlusIcon';
+import ReactAce from 'react-ace/lib/ace';
 
 import * as S from './QueryForm.styled';
 
@@ -75,6 +76,17 @@ const QueryForm: React.FC<Props> = ({
     }
   }, []);
 
+  const inputRef = useRef<ReactAce>(null);
+
+  const handleFocus = () => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const textInput = inputRef?.current?.editor?.textInput as any;
+
+    if (textInput) {
+      textInput.focus();
+    }
+  };
+
   return (
     <S.QueryWrapper>
       <form onSubmit={handleSubmit(submitHandler)}>
@@ -111,6 +123,7 @@ const QueryForm: React.FC<Props> = ({
                     },
                   ]}
                   readOnly={fetching}
+                  ref={inputRef}
                 />
               )}
             />
@@ -188,6 +201,7 @@ const QueryForm: React.FC<Props> = ({
             buttonSize="M"
             type="submit"
             disabled={fetching}
+            onClick={handleFocus}
           >
             Execute
           </Button>

From fdde380072f8a269607f6ac0ef683813f31a0141 Mon Sep 17 00:00:00 2001
From: kristi-dev <92114648+kristi-dev@users.noreply.github.com>
Date: Wed, 7 Dec 2022 09:09:14 +0000
Subject: [PATCH 319/734] [FE] Fix create connector button availability (#2952)

---
 kafka-ui-react-app/src/components/Connect/New/New.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Connect/New/New.tsx b/kafka-ui-react-app/src/components/Connect/New/New.tsx
index 2040f238bd2..2e93b4f5ce5 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/New.tsx
@@ -42,7 +42,7 @@ const New: React.FC = () => {
   const mutation = useCreateConnector(clusterName);
 
   const methods = useForm<FormValues>({
-    mode: 'onTouched',
+    mode: 'all',
     resolver: yupResolver(validationSchema),
     defaultValues: {
       connectName: get(connects, '0.name', ''),

From e07ce28b2c021e4e572f639be7ff6b7c10bf9cb2 Mon Sep 17 00:00:00 2001
From: komilos <kam.sharipova@gmail.com>
Date: Wed, 7 Dec 2022 19:01:37 +0300
Subject: [PATCH 320/734] Fix UI broker list display in some cases (#2903)

* UI now showing broker list when DISABLELOGDIRSCOLLECTION=true

* specs fix

* code review fixes

* fix the diskUsage check in the empty array case

* fix the diskUsage check in the empty array case minor segment size fix

Co-authored-by: Kamila Alekbaeva <kalekbaeva@provectus.com>
Co-authored-by: Ilya Kuramshin <iliax@proton.me>
Co-authored-by: Mgrdich <mgotm13@gmail.com>
---
 .../Brokers/BrokersList/BrokersList.tsx       | 41 ++++++++++++++++---
 .../BrokersList/__test__/BrokersList.spec.tsx | 32 +++++++++++++--
 2 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index 3fce89fbae9..d74c1bcb700 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -10,6 +10,8 @@ import Table, { LinkCell, SizeCell } from 'components/common/NewTable';
 import { ColumnDef } from '@tanstack/react-table';
 import { clusterBrokerPath } from 'lib/paths';
 
+const NA = 'N/A';
+
 const BrokersList: React.FC = () => {
   const navigate = useNavigate();
   const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
@@ -29,14 +31,26 @@ const BrokersList: React.FC = () => {
   } = clusterStats;
 
   const rows = React.useMemo(() => {
-    if (!diskUsage) return [];
+    let brokersResource;
+    if (!diskUsage || !diskUsage?.length) {
+      brokersResource =
+        brokers?.map((broker) => {
+          return {
+            brokerId: broker.id,
+            segmentSize: NA,
+            segmentCount: NA,
+          };
+        }) || [];
+    } else {
+      brokersResource = diskUsage;
+    }
 
-    return diskUsage.map(({ brokerId, segmentSize, segmentCount }) => {
+    return brokersResource.map(({ brokerId, segmentSize, segmentCount }) => {
       const broker = brokers?.find(({ id }) => id === brokerId);
       return {
         brokerId,
-        size: segmentSize,
-        count: segmentCount,
+        size: segmentSize || NA,
+        count: segmentCount || NA,
         port: broker?.port,
         host: broker?.host,
       };
@@ -55,7 +69,24 @@ const BrokersList: React.FC = () => {
           />
         ),
       },
-      { header: 'Segment Size', accessorKey: 'size', cell: SizeCell },
+      {
+        header: 'Segment Size',
+        accessorKey: 'size',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue, table, cell, column, renderValue, row }) =>
+          getValue() === NA ? (
+            NA
+          ) : (
+            <SizeCell
+              table={table}
+              column={column}
+              row={row}
+              cell={cell}
+              getValue={getValue}
+              renderValue={renderValue}
+            />
+          ),
+      },
       { header: 'Segment Count', accessorKey: 'count' },
       { header: 'Port', accessorKey: 'port' },
       { header: 'Host', accessorKey: 'host' },
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
index b11d477b600..cf36c64059d 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
@@ -134,12 +134,36 @@ describe('BrokersList Component', () => {
         }));
       });
 
-      it('renders empty table', async () => {
+      describe('when it has no brokers', () => {
+        beforeEach(() => {
+          (useBrokers as jest.Mock).mockImplementation(() => ({
+            data: [],
+          }));
+        });
+
+        it('renders empty table', async () => {
+          renderComponent();
+          expect(screen.getByRole('table')).toBeInTheDocument();
+          expect(
+            screen.getByRole('row', { name: 'Disk usage data not available' })
+          ).toBeInTheDocument();
+        });
+      });
+
+      it('renders list of all brokers', async () => {
         renderComponent();
         expect(screen.getByRole('table')).toBeInTheDocument();
-        expect(
-          screen.getByRole('row', { name: 'Disk usage data not available' })
-        ).toBeInTheDocument();
+        expect(screen.getAllByRole('row').length).toEqual(3);
+      });
+      it('opens broker when row clicked', async () => {
+        renderComponent();
+        await userEvent.click(screen.getByRole('cell', { name: '1' }));
+
+        await waitFor(() =>
+          expect(mockedUsedNavigate).toBeCalledWith(
+            clusterBrokerPath(clusterName, '1')
+          )
+        );
       });
     });
   });

From 4dc0f6d81e90b384e6eda1f69bde892dfd66a305 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Fri, 9 Dec 2022 13:31:51 +0400
Subject: [PATCH 321/734] [FE] Implement 404/403s (#2966)

* Add SuspenseQueryComponent for the ErrorBoundary delegation , implement this component in all those pages where the issue was happening

* Add Comment to the SuspenseQueryComponent

* Create the Error page

* Error page styling modifications

* Error Page redirections

* Redux Request handle error case and Navigation

* SuspenseQueryComponent test suites

* minor ErrorPage component modifications

* Add error page test suites

* SuspenseQueryComponent Error handling modification
---
 kafka-ui-react-app/src/components/App.tsx     | 19 +++++++++-
 .../src/components/Brokers/Brokers.tsx        | 10 ++++-
 .../src/components/Connect/Connect.tsx        |  7 +++-
 .../components/ErrorPage/ErrorPage.styled.ts  | 20 ++++++++++
 .../src/components/ErrorPage/ErrorPage.tsx    | 28 ++++++++++++++
 .../ErrorPage/__tests__/ErrorPage.spec.tsx    | 24 ++++++++++++
 .../components/Schemas/Details/Details.tsx    |  6 +++
 .../src/components/Schemas/Edit/Edit.tsx      |  6 +++
 .../src/components/Topics/Topics.tsx          | 10 ++++-
 .../SuspenseQueryComponent.tsx                | 29 +++++++++++++++
 .../__test__/SuspenseQueryComponent.spec.tsx  | 37 +++++++++++++++++++
 kafka-ui-react-app/src/lib/paths.ts           |  3 ++
 .../redux/reducers/schemas/schemasSlice.ts    |  5 +++
 kafka-ui-react-app/src/theme/theme.ts         |  3 ++
 14 files changed, 202 insertions(+), 5 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/ErrorPage/ErrorPage.tsx
 create mode 100644 kafka-ui-react-app/src/components/ErrorPage/__tests__/ErrorPage.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/SuspenseQueryComponent/SuspenseQueryComponent.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/SuspenseQueryComponent/__test__/SuspenseQueryComponent.spec.tsx

diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index adc77b30015..a76495f0d47 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -1,6 +1,11 @@
 import React, { Suspense, useCallback } from 'react';
-import { Routes, Route, useLocation } from 'react-router-dom';
-import { clusterPath, getNonExactPath } from 'lib/paths';
+import { Routes, Route, useLocation, Navigate } from 'react-router-dom';
+import {
+  accessErrorPage,
+  clusterPath,
+  errorPage,
+  getNonExactPath,
+} from 'lib/paths';
 import Nav from 'components/Nav/Nav';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import Dashboard from 'components/Dashboard/Dashboard';
@@ -20,6 +25,7 @@ import DiscordIcon from 'components/common/Icons/DiscordIcon';
 import ConfirmationModal from './common/ConfirmationModal/ConfirmationModal';
 import { ConfirmContextProvider } from './contexts/ConfirmContext';
 import { GlobalSettingsProvider } from './contexts/GlobalSettingsContext';
+import ErrorPage from './ErrorPage/ErrorPage';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -123,6 +129,15 @@ const App: React.FC = () => {
                     path={getNonExactPath(clusterPath())}
                     element={<ClusterPage />}
                   />
+                  <Route
+                    path={accessErrorPage}
+                    element={<ErrorPage status={403} text="Access is Denied" />}
+                  />
+                  <Route path={errorPage} element={<ErrorPage />} />
+                  <Route
+                    path="*"
+                    element={<Navigate to={errorPage} replace />}
+                  />
                 </Routes>
               </S.Container>
               <Toaster position="bottom-right" />
diff --git a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
index 36f6a9d36d0..742ac937ca8 100644
--- a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx
@@ -3,11 +3,19 @@ import { Route, Routes } from 'react-router-dom';
 import { getNonExactPath, RouteParams } from 'lib/paths';
 import BrokersList from 'components/Brokers/BrokersList/BrokersList';
 import Broker from 'components/Brokers/Broker/Broker';
+import SuspenseQueryComponent from 'components/common/SuspenseQueryComponent/SuspenseQueryComponent';
 
 const Brokers: React.FC = () => (
   <Routes>
     <Route index element={<BrokersList />} />
-    <Route path={getNonExactPath(RouteParams.brokerId)} element={<Broker />} />
+    <Route
+      path={getNonExactPath(RouteParams.brokerId)}
+      element={
+        <SuspenseQueryComponent>
+          <Broker />
+        </SuspenseQueryComponent>
+      }
+    />
   </Routes>
 );
 
diff --git a/kafka-ui-react-app/src/components/Connect/Connect.tsx b/kafka-ui-react-app/src/components/Connect/Connect.tsx
index efbac701ec4..095055cb615 100644
--- a/kafka-ui-react-app/src/components/Connect/Connect.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Connect.tsx
@@ -9,6 +9,7 @@ import {
   clusterConnectorsPath,
 } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
+import SuspenseQueryComponent from 'components/common/SuspenseQueryComponent/SuspenseQueryComponent';
 
 import ListPage from './List/ListPage';
 import New from './New/New';
@@ -23,7 +24,11 @@ const Connect: React.FC = () => {
       <Route path={clusterConnectorNewRelativePath} element={<New />} />
       <Route
         path={getNonExactPath(clusterConnectConnectorRelativePath)}
-        element={<DetailsPage />}
+        element={
+          <SuspenseQueryComponent>
+            <DetailsPage />
+          </SuspenseQueryComponent>
+        }
       />
       <Route
         path={clusterConnectConnectorsRelativePath}
diff --git a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
new file mode 100644
index 00000000000..e8f8a0339a4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
@@ -0,0 +1,20 @@
+import styled from 'styled-components';
+
+export const Wrapper = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  gap: 20px;
+  margin-top: 100px;
+`;
+
+export const Number = styled.div`
+  font-size: 100px;
+  color: ${({ theme }) => theme.errorPage.text};
+  line-height: initial;
+`;
+
+export const Text = styled.div`
+  font-size: 20px;
+`;
diff --git a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.tsx b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.tsx
new file mode 100644
index 00000000000..823f2f0a75a
--- /dev/null
+++ b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { Button } from 'components/common/Button/Button';
+
+import * as S from './ErrorPage.styled';
+
+interface Props {
+  status?: number;
+  text?: string;
+  btnText?: string;
+}
+
+const ErrorPage: React.FC<Props> = ({
+  status = 404,
+  text = 'Page is not found',
+  btnText = 'Go Back to Dashboard',
+}) => {
+  return (
+    <S.Wrapper>
+      <S.Number>{status}</S.Number>
+      <S.Text>{text}</S.Text>
+      <Button buttonType="primary" buttonSize="M" to="/">
+        {btnText}
+      </Button>
+    </S.Wrapper>
+  );
+};
+
+export default ErrorPage;
diff --git a/kafka-ui-react-app/src/components/ErrorPage/__tests__/ErrorPage.spec.tsx b/kafka-ui-react-app/src/components/ErrorPage/__tests__/ErrorPage.spec.tsx
new file mode 100644
index 00000000000..18a745b1922
--- /dev/null
+++ b/kafka-ui-react-app/src/components/ErrorPage/__tests__/ErrorPage.spec.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { render } from 'lib/testHelpers';
+import ErrorPage from 'components/ErrorPage/ErrorPage';
+
+describe('ErrorPage', () => {
+  it('should check Error Page rendering with default text', () => {
+    render(<ErrorPage />);
+    expect(screen.getByText('404')).toBeInTheDocument();
+    expect(screen.getByText('Page is not found')).toBeInTheDocument();
+    expect(screen.getByText('Go Back to Dashboard')).toBeInTheDocument();
+  });
+  it('should check Error Page rendering with custom text', () => {
+    const props = {
+      status: 403,
+      text: 'access is denied',
+      btnText: 'Go back',
+    };
+    render(<ErrorPage {...props} />);
+    expect(screen.getByText(props.status)).toBeInTheDocument();
+    expect(screen.getByText(props.text)).toBeInTheDocument();
+    expect(screen.getByText(props.btnText)).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index 8878728fa5d..38fbb043f2a 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -20,6 +20,7 @@ import {
   SCHEMA_LATEST_FETCH_ACTION,
   selectAllSchemaVersions,
   getSchemaLatest,
+  getAreSchemaLatestRejected,
 } from 'redux/reducers/schemas/schemasSlice';
 import { showServerError } from 'lib/errorHandling';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
@@ -55,6 +56,7 @@ const Details: React.FC = () => {
   const versions = useAppSelector((state) => selectAllSchemaVersions(state));
   const schema = useAppSelector(getSchemaLatest);
   const isFetched = useAppSelector(getAreSchemaLatestFulfilled);
+  const isRejected = useAppSelector(getAreSchemaLatestRejected);
   const areVersionsFetched = useAppSelector(getAreSchemaVersionsFulfilled);
 
   const columns = React.useMemo(
@@ -78,6 +80,10 @@ const Details: React.FC = () => {
     }
   };
 
+  if (isRejected) {
+    navigate('/404');
+  }
+
   if (!isFetched || !schema) {
     return <PageLoader />;
   }
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
index a09f45a568c..464537d9c4d 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
@@ -25,6 +25,7 @@ import {
   SCHEMA_LATEST_FETCH_ACTION,
   getAreSchemaLatestFulfilled,
   schemaUpdated,
+  getAreSchemaLatestRejected,
 } from 'redux/reducers/schemas/schemasSlice';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
@@ -54,6 +55,7 @@ const Edit: React.FC = () => {
 
   const schema = useAppSelector((state) => getSchemaLatest(state));
   const isFetched = useAppSelector(getAreSchemaLatestFulfilled);
+  const isRejected = useAppSelector(getAreSchemaLatestRejected);
 
   const formatedSchema = React.useMemo(() => {
     return schema?.schemaType === SchemaType.PROTOBUF
@@ -98,6 +100,10 @@ const Edit: React.FC = () => {
     }
   };
 
+  if (isRejected) {
+    navigate('/404');
+  }
+
   if (!isFetched || !schema) {
     return <PageLoader />;
   }
diff --git a/kafka-ui-react-app/src/components/Topics/Topics.tsx b/kafka-ui-react-app/src/components/Topics/Topics.tsx
index 73f6dfc7e12..d6557a85807 100644
--- a/kafka-ui-react-app/src/components/Topics/Topics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topics.tsx
@@ -6,6 +6,7 @@ import {
   getNonExactPath,
   RouteParams,
 } from 'lib/paths';
+import SuspenseQueryComponent from 'components/common/SuspenseQueryComponent/SuspenseQueryComponent';
 
 import New from './New/New';
 import ListPage from './List/ListPage';
@@ -16,7 +17,14 @@ const Topics: React.FC = () => (
     <Route index element={<ListPage />} />
     <Route path={clusterTopicNewRelativePath} element={<New />} />
     <Route path={clusterTopicCopyRelativePath} element={<New />} />
-    <Route path={getNonExactPath(RouteParams.topicName)} element={<Topic />} />
+    <Route
+      path={getNonExactPath(RouteParams.topicName)}
+      element={
+        <SuspenseQueryComponent>
+          <Topic />
+        </SuspenseQueryComponent>
+      }
+    />
   </Routes>
 );
 
diff --git a/kafka-ui-react-app/src/components/common/SuspenseQueryComponent/SuspenseQueryComponent.tsx b/kafka-ui-react-app/src/components/common/SuspenseQueryComponent/SuspenseQueryComponent.tsx
new file mode 100644
index 00000000000..2efbb1e0b00
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/SuspenseQueryComponent/SuspenseQueryComponent.tsx
@@ -0,0 +1,29 @@
+import React, { PropsWithChildren } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
+import { Navigate } from 'react-router-dom';
+
+const ErrorComponent: React.FC<{ error: Error }> = ({ error }) => {
+  const errorStatus = (error as unknown as Response)?.status
+    ? (error as unknown as Response).status
+    : '404';
+
+  return <Navigate to={`/${errorStatus}`} />;
+};
+
+/**
+ * @description
+ * basic idea that you can not choose a wrong url, that is why you are safe, but when
+ * the user tries to manipulate some url to get the the desired result and the BE returns 404
+ * it will be propagated to this component and redirected
+ *
+ * !!NOTE!! But only use this Component for GET query Throw error cause maybe in the future inner functionality may change
+ * */
+const SuspenseQueryComponent: React.FC<PropsWithChildren<unknown>> = ({
+  children,
+}) => {
+  return (
+    <ErrorBoundary FallbackComponent={ErrorComponent}>{children}</ErrorBoundary>
+  );
+};
+
+export default SuspenseQueryComponent;
diff --git a/kafka-ui-react-app/src/components/common/SuspenseQueryComponent/__test__/SuspenseQueryComponent.spec.tsx b/kafka-ui-react-app/src/components/common/SuspenseQueryComponent/__test__/SuspenseQueryComponent.spec.tsx
new file mode 100644
index 00000000000..fd191236a8a
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/SuspenseQueryComponent/__test__/SuspenseQueryComponent.spec.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { render } from 'lib/testHelpers';
+import { screen } from '@testing-library/react';
+import SuspenseQueryComponent from 'components/common/SuspenseQueryComponent/SuspenseQueryComponent';
+
+const fallback = 'fallback';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  Navigate: () => <div>{fallback}</div>,
+}));
+
+describe('SuspenseQueryComponent', () => {
+  const text = 'text';
+
+  it('should render the inner component if no error occurs', () => {
+    render(<SuspenseQueryComponent>{text}</SuspenseQueryComponent>);
+    expect(screen.getByText(text)).toBeInTheDocument();
+  });
+
+  it('should not render the inner component and call navigate', () => {
+    // throwing intentional For error boundaries to work
+    jest.spyOn(console, 'error').mockImplementation(() => undefined);
+    const Component = () => {
+      throw new Error('new Error');
+    };
+
+    render(
+      <SuspenseQueryComponent>
+        <Component />
+      </SuspenseQueryComponent>
+    );
+    expect(screen.queryByText(text)).not.toBeInTheDocument();
+    expect(screen.getByText(fallback)).toBeInTheDocument();
+    jest.clearAllMocks();
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 1b3d4b13019..a4a82c7293c 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -23,6 +23,9 @@ export enum RouteParams {
 
 export const getNonExactPath = (path: string) => `${path}/*`;
 
+export const errorPage = '/404';
+export const accessErrorPage = '/403';
+
 export const clusterPath = (
   clusterName: ClusterName = RouteParams.clusterName
 ) => `/ui/clusters/${clusterName}`;
diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts b/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
index 049e0bedd71..018775ced0a 100644
--- a/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/schemas/schemasSlice.ts
@@ -134,6 +134,11 @@ export const getAreSchemaLatestFulfilled = createSelector(
   createFetchingSelector(SCHEMA_LATEST_FETCH_ACTION),
   (status) => status === AsyncRequestStatus.fulfilled
 );
+export const getAreSchemaLatestRejected = createSelector(
+  createFetchingSelector(SCHEMA_LATEST_FETCH_ACTION),
+  (status) => status === AsyncRequestStatus.rejected
+);
+
 export const getAreSchemaVersionsFulfilled = createSelector(
   createFetchingSelector(SCHEMAS_VERSIONS_FETCH_ACTION),
   (status) => status === AsyncRequestStatus.fulfilled
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 020d5819ee5..33c8b2959c8 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -581,6 +581,9 @@ const theme = {
   statictics: {
     createdAtColor: Colors.neutral[50],
   },
+  errorPage: {
+    text: Colors.blue[45],
+  },
 };
 
 export type ThemeType = typeof theme;

From ddc76ac3ba1ce6e20357ee132b7e9e1bedba0ef3 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 9 Dec 2022 17:34:07 +0400
Subject: [PATCH 322/734] Implement a workflow to release serde api (#3049)

---
 .github/workflows/release-serde-api.yaml | 33 ++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/release-serde-api.yaml

diff --git a/.github/workflows/release-serde-api.yaml b/.github/workflows/release-serde-api.yaml
new file mode 100644
index 00000000000..e13fa7a23a0
--- /dev/null
+++ b/.github/workflows/release-serde-api.yaml
@@ -0,0 +1,33 @@
+name: Release-serde-api
+on: workflow_dispatch
+
+jobs:
+  release-serde-api:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: "17"
+          distribution: "zulu"
+          cache: "maven"
+
+      - id: install-secret-key
+        name: Install GPG secret key
+        run: |
+          cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import
+
+      - name: Publish to Maven Central
+        run: |
+          MVN_VERSION=$(curl -s https://search.maven.org/solrsearch/select?q=g:"com.provectus"+AND+a:"kafka-ui-serde-api" | grep -o '"latestVersion": *"[^"]*"' | grep -o '"[^"]*"$' | sed 's/"//g')
+          MVN_VERSION=$(echo "$MVN_VERSION" | awk 'BEGIN{FS=OFS="."} {$2+=1} 1')
+          mvn -B -ntp versions:set -DnewVersion=$MVN_VERSION -pl kafka-ui-serde-api
+          mvn source:jar  javadoc:jar  package  gpg:sign -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} -Dserver.username=${{ secrets.NEXUS_USERNAME }} -Dserver.password=${{ secrets.NEXUS_PASSWORD }} nexus-staging:deploy   -pl kafka-ui-serde-api  -s settings.xml

From 65b229593970c02a9c5c20f9d89d4f2852a2420d Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 9 Dec 2022 17:51:55 +0400
Subject: [PATCH 323/734] Implement a workflow to prepare helm charts release
 (#2950)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/create-branch-for-helm.yaml | 28 +++++++++++++++
 .github/workflows/release.yaml                | 34 +++++--------------
 2 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 .github/workflows/create-branch-for-helm.yaml

diff --git a/.github/workflows/create-branch-for-helm.yaml b/.github/workflows/create-branch-for-helm.yaml
new file mode 100644
index 00000000000..b3e7d5f4ed8
--- /dev/null
+++ b/.github/workflows/create-branch-for-helm.yaml
@@ -0,0 +1,28 @@
+name: prepare-helm-release
+on:
+  repository_dispatch:
+    types: [prepare-helm-release]
+jobs:
+  change-app-version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+      - name: Change versions
+        run: |
+          git checkout -b release-${{ github.event.client_payload.appversion}}
+          version=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk '{print $2}')
+          version=${version%.*}.$((${version##*.}+1))
+          sed -i "s/version:.*/version: ${version}/" charts/kafka-ui/Chart.yaml
+          sed -i "s/appVersion:.*/appVersion: ${{ github.event.client_payload.appversion}}/" charts/kafka-ui/Chart.yaml
+          git add  charts/kafka-ui/Chart.yaml
+          git commit -m "release ${version}"
+          git push --set-upstream origin release-${{ github.event.client_payload.appversion}}
+      - name: Slack Notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_TITLE: "release-${{ github.event.client_payload.appversion}}"
+          SLACK_MESSAGE: "A new release of the helm chart has been prepared. Branch name: release-${{ github.event.client_payload.appversion}}"
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 78e8de804c8..34b13bb877c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -87,32 +87,14 @@ jobs:
 
   charts:
     runs-on: ubuntu-latest
+    permissions:
+      actions: write
     needs: release
     steps:
-      - uses: actions/checkout@v3
+      - name: Repository Dispatch
+        uses: peter-evans/repository-dispatch@v2
         with:
-          fetch-depth: 1
-
-      - run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-
-      - uses: azure/setup-helm@v1
-
-      - name: update chart version
-        run: |
-          export version=${{needs.release.outputs.version}}
-          sed -i "s/version:.*/version: ${version}/" charts/kafka-ui/Chart.yaml
-          sed -i "s/appVersion:.*/appVersion: ${version}/" charts/kafka-ui/Chart.yaml
-
-      - name: add chart
-        run: |
-          export VERSION=${{needs.release.outputs.version}}
-          MSG=$(helm package --app-version ${VERSION} charts/kafka-ui)
-          git fetch origin
-          git stash
-          git checkout -b gh-pages origin/gh-pages
-          helm repo index .
-          git add -f ${MSG##*/} index.yaml
-          git commit -m "release ${VERSION}"
-          git push
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: provectus/kafka-ui
+          event-type: prepare-helm-release
+          client-payload: '{"appversion": "${{ needs.release.outputs.version }}"}'

From b81c20d36d35412961e1ba4fed9c4eb7b599fa02 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 9 Dec 2022 17:59:25 +0400
Subject: [PATCH 324/734] Serde-api release adjustments (#3050)

* kafka-api-serde-api pom fixes

* change pom and add settings

* fix xml

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-api/pom.xml       |   2 +-
 kafka-ui-serde-api/pom.xml | 145 ++++++++++++++++++++++++++++++-------
 pom.xml                    |   1 +
 settings.xml               |  17 +++++
 4 files changed, 139 insertions(+), 26 deletions(-)
 create mode 100644 settings.xml

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 95c64071dc5..c7e850fe953 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.provectus</groupId>
             <artifactId>kafka-ui-serde-api</artifactId>
-            <version>${project.version}</version>
+            <version>${kafka-ui-serde-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
diff --git a/kafka-ui-serde-api/pom.xml b/kafka-ui-serde-api/pom.xml
index b9aca207e58..ad0a88ca403 100644
--- a/kafka-ui-serde-api/pom.xml
+++ b/kafka-ui-serde-api/pom.xml
@@ -1,28 +1,123 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>kafka-ui</artifactId>
-        <groupId>com.provectus</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>kafka-ui-serde-api</artifactId>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <version>2.5.2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-            </plugin>
-        </plugins>
-
-    </build>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>jar</packaging>
+	<properties>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+	</properties>
+	<distributionManagement>
+		<snapshotRepository>
+			<id>ossrh</id>
+			<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+		</snapshotRepository>
+		<repository>
+			<id>ossrh</id>
+			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+		</repository>
+	</distributionManagement>
+	<name>kafka-ui-serde-api</name>
+	<description>kafka-ui-serde-api</description>
+	<url>http://github.com/provectus/kafka-ui</url>
+	<licenses>
+		<license>
+			<name>The Apache License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<name>Provectus</name>
+			<email>maintainers.kafka-ui@provectus.com</email>
+			<organization>Provectus</organization>
+			<organizationUrl>https://provectus.com</organizationUrl>
+		</developer>
+	</developers>
+	<scm>
+		<connection>scm:git:git://github.com/provectus/kafka-ui.git</connection>
+		<developerConnection>scm:git:ssh://github.com:provectus/kafka-ui.git</developerConnection>
+		<url>https://github.com/provectus/kafka-ui</url>
+	</scm>
+	<groupId>com.provectus</groupId>
+	<artifactId>kafka-ui-serde-api</artifactId>
+	<version>1.0.0</version>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>2.5.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>3.0.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<version>1.6.13</version>
+					<extensions>true</extensions>
+					<configuration>
+						<serverId>ossrh</serverId>
+						<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+						<autoReleaseAfterClose>true</autoReleaseAfterClose>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-source-plugin</artifactId>
+					<version>2.2.1</version>
+					<executions>
+						<execution>
+							<id>attach-sources</id>
+							<goals>
+								<goal>jar-no-fork</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId>
+					<configuration>
+						<source>8</source>
+					</configuration>
+					<version>3.4.1</version>
+					<executions>
+						<execution>
+							<id>attach-javadocs</id>
+							<goals>
+								<goal>jar</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-gpg-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>sign-artifacts</id>
+							<phase>verify</phase>
+							<goals>
+								<goal>sign</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<!-- Prevent gpg from using pinentry programs -->
+						<gpgArguments>
+							<arg>--pinentry-mode</arg>
+							<arg>loopback</arg>
+						</gpgArguments>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 </project>
diff --git a/pom.xml b/pom.xml
index 498a23968e0..df8ff040793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
         <snakeyaml.version>1.33</snakeyaml.version>
         <spring-boot.version>2.7.5</spring-boot.version>
         <spring-security.version>5.7.5</spring-security.version>
+        <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
 
         <!-- Test dependency versions -->
         <junit.version>5.9.1</junit.version>
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 00000000000..7935a5f5390
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,17 @@
+<settings>
+  <servers>
+    <server>
+     <id>ossrh</id>
+     <username>${server.username}</username>
+     <password>${server.password}</password>
+    </server>
+  </servers>
+  <profiles>
+    <profile>
+      <id>ossrh</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+  </profiles>
+</settings>
\ No newline at end of file

From efb9ec3f1355eae264fba3087308f4d15fffa38f Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 9 Dec 2022 18:42:22 +0400
Subject: [PATCH 325/734] [Chore] Fix serde api javadoc generation (#3054)

---
 .../com/provectus/kafka/ui/serde/api/PropertyResolver.java    | 3 +--
 .../src/main/java/com/provectus/kafka/ui/serde/api/Serde.java | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java
index 526e2d7f641..363b98bd58f 100644
--- a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/PropertyResolver.java
@@ -6,8 +6,7 @@
 
 /**
  * Provides access to configuration properties.
- *
- * @implNote Actual implementation uses {@code org.springframework.boot.context.properties.bind.Binder} class
+ *Actual implementation uses {@code org.springframework.boot.context.properties.bind.Binder} class
  * to bind values to target types. Target type params can be custom configs classes, not only simple types and strings.
  *
  */
diff --git a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java
index 5dc43d59b11..49552a1440a 100644
--- a/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java
+++ b/kafka-ui-serde-api/src/main/java/com/provectus/kafka/ui/serde/api/Serde.java
@@ -7,7 +7,7 @@
  * Main interface of  serialization/deserialization logic.
  * It provides ability to serialize, deserialize topic's keys and values, and optionally provides
  * information about data schema inside topic.
- * <p/>
+ * <p>
  * <b>Lifecycle:</b><br/>
  * 1. on application startup kafka-ui scans configs and finds all custom serde definitions<br/>
  * 2. for each custom serde its own separated child-first classloader is created<br/>
@@ -15,7 +15,7 @@
  * 4. {@code configure(...)} method called<br/>
  * 5. various methods called during application runtime<br/>
  * 6. on application shutdown kafka-ui calls {@code close()} method on serde instance<br/>
- * <p/>
+ * <p>
  * <b>Implementation considerations:</b><br/>
  * 1. Implementation class should have default/non-arg contructor<br/>
  * 2. All methods except {@code configure(...)} and {@code close()} can be called from different threads. So, your code should be thread-safe.<br/>

From b0c897b5c804cfec7d9941438f7d2dab5b60b6e2 Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Fri, 9 Dec 2022 19:09:13 +0400
Subject: [PATCH 326/734] UI support for MSK (#2828)

* UI support for MSK

* fixed test changes

* fixed pull request comments

* Use the opposite operator (!==) instead.

* fixed update topic

* Minor code modifications in the Edit Submission logic

* minor typescript code change, in the TopicFormData

* minor CustomParamField short circuit code efficiency improveral

* Topic Form Edit , sanitization of Default non-dirty fields, while sending the dynamic ones

* fix checkTopicCreatePossibility()

* fix checkTopicCreatePossibility()

Co-authored-by: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Co-authored-by: Mgrdich <mgotm13@gmail.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../com/provectus/kafka/ui/models/Topic.java  |  4 +-
 .../ui/pages/topic/TopicCreateEditForm.java   | 10 +-
 .../kafka/ui/pages/topic/TopicDetails.java    |  4 +-
 .../kafka/ui/suite/topics/TopicsTests.java    | 20 ++--
 .../Topics/New/__test__/New.spec.tsx          | 35 ++++---
 .../src/components/Topics/Topic/Edit/Edit.tsx | 21 ++++-
 .../Topics/Topic/Edit/__test__/Edit.spec.tsx  |  2 +-
 .../Topic/Edit/topicParamsTransformer.ts      |  2 +-
 .../Form/CustomParams/CustomParamField.tsx    | 10 +-
 .../shared/Form/CustomParams/CustomParams.tsx | 12 ++-
 .../Topics/shared/Form/TimeToRetain.tsx       |  2 +-
 .../Topics/shared/Form/TopicForm.tsx          | 94 ++++++++++---------
 .../shared/Form/__tests__/TopicForm.spec.tsx  |  6 +-
 .../src/lib/hooks/api/topics.ts               | 42 ++++++---
 kafka-ui-react-app/src/lib/yupExtended.ts     | 25 +----
 .../src/redux/interfaces/topic.ts             |  6 +-
 16 files changed, 177 insertions(+), 118 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
index 597529a92a4..53c234c8d38 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
@@ -9,8 +9,8 @@
 @Data
 @Accessors(chain = true)
 public class Topic {
-    private String name, timeToRetainData, maxMessageBytes, messageKey, messageContent,
-            partitions, customParameterValue;
+    private String name, timeToRetainData, maxMessageBytes, messageKey, messageContent, customParameterValue;
+    private int numberOfPartitions;
     private CustomParameterType customParameterType;
     private CleanupPolicyValue cleanupPolicyValue;
     private MaxSizeOnDisk maxSizeOnDisk;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
index e44ba5c86fb..3822cca257a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
@@ -48,7 +48,10 @@ public boolean isDeleteCustomParameterButtonEnabled() {
 
   @Step
   public TopicCreateEditForm setTopicName(String topicName) {
-    nameField.setValue(topicName);
+    nameField.shouldBe(Condition.enabled).clear();
+    if (topicName != null) {
+      nameField.sendKeys(topicName);
+    }
     return this;
   }
 
@@ -108,8 +111,9 @@ public TopicCreateEditForm setMaxMessageBytes(String bytes) {
   }
 
   @Step
-  public TopicCreateEditForm setPartitions(String partitions) {
-    partitionsField.setValue(partitions);
+  public TopicCreateEditForm setNumberOfPartitions(int partitions) {
+    partitionsField.shouldBe(Condition.enabled).clear();
+    partitionsField.sendKeys(String.valueOf(partitions));
     return this;
   }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 95c3e6fb23f..5b7e9e119d4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -85,8 +85,8 @@ public String getCleanUpPolicy() {
   }
 
   @Step
-  public String getPartitions() {
-    return partitionsField.getText();
+  public int getPartitions() {
+    return Integer.parseInt(partitionsField.getText().trim());
   }
 
   @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 05b614c3bbb..f2db96cb7a5 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -8,6 +8,7 @@
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+import static org.apache.commons.lang3.RandomUtils.nextInt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.codeborne.selenide.Condition;
@@ -40,7 +41,7 @@ public class TopicsTests extends BaseTest {
   private static final String SUITE_TITLE = "Topics";
   private static final Topic TOPIC_TO_CREATE = new Topic()
       .setName("new-topic-" + randomAlphabetic(5))
-      .setPartitions("1")
+      .setNumberOfPartitions(1)
       .setCustomParameterType(COMPRESSION_TYPE)
       .setCustomParameterValue("producer")
       .setCleanupPolicyValue(DELETE);
@@ -77,7 +78,7 @@ public void createTopic() {
     topicCreateEditForm
         .waitUntilScreenReady()
         .setTopicName(TOPIC_TO_CREATE.getName())
-        .setPartitions(TOPIC_TO_CREATE.getPartitions())
+        .setNumberOfPartitions(TOPIC_TO_CREATE.getNumberOfPartitions())
         .selectCleanupPolicy(TOPIC_TO_CREATE.getCleanupPolicyValue())
         .clickCreateTopicBtn();
     topicDetails
@@ -92,7 +93,8 @@ public void createTopic() {
         .isTrue();
     softly.assertThat(topicDetails.getCleanUpPolicy()).as("getCleanUpPolicy()")
         .isEqualTo(TOPIC_TO_CREATE.getCleanupPolicyValue().toString());
-    softly.assertThat(topicDetails.getPartitions()).as("getPartitions()").isEqualTo(TOPIC_TO_CREATE.getPartitions());
+    softly.assertThat(topicDetails.getPartitions()).as("getPartitions()")
+        .isEqualTo(TOPIC_TO_CREATE.getNumberOfPartitions());
     softly.assertAll();
     naviSideBar
         .openSideMenu(TOPICS);
@@ -237,11 +239,17 @@ void checkTopicCreatePossibility() {
         .waitUntilScreenReady()
         .clickAddTopicBtn();
     topicCreateEditForm
-        .waitUntilScreenReady()
-        .setTopicName("");
+        .waitUntilScreenReady();
+    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
+    topicCreateEditForm
+        .setTopicName("testName");
+    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
+    topicCreateEditForm
+        .setTopicName(null)
+        .setNumberOfPartitions(nextInt(1, 10));
     assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
     topicCreateEditForm
-        .setTopicName("testTopic1");
+        .setTopicName("testName");
     assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isTrue();
   }
 
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index fbdb1e3b44f..9f51c68d846 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import New from 'components/Topics/New/New';
 import { Route, Routes } from 'react-router-dom';
-import { act, screen, waitFor } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import {
   clusterTopicCopyPath,
   clusterTopicNewPath,
@@ -13,18 +13,17 @@ import { useCreateTopic } from 'lib/hooks/api/topics';
 
 const clusterName = 'local';
 const topicName = 'test-topic';
+const minValue = '1';
 
 const mockNavigate = jest.fn();
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useNavigate: () => mockNavigate,
 }));
-
 jest.mock('lib/hooks/api/topics', () => ({
   useCreateTopic: jest.fn(),
 }));
-
-const renderComponent = (path: string) =>
+const renderComponent = (path: string) => {
   render(
     <Routes>
       <Route path={clusterTopicNewPath()} element={<New />} />
@@ -33,9 +32,9 @@ const renderComponent = (path: string) =>
     </Routes>,
     { initialEntries: [path] }
   );
+};
 
 const createTopicMock = jest.fn();
-
 describe('New', () => {
   beforeEach(() => {
     (useCreateTopic as jest.Mock).mockImplementation(() => ({
@@ -45,7 +44,6 @@ describe('New', () => {
   afterEach(() => {
     mockNavigate.mockClear();
   });
-
   it('checks header for create new', async () => {
     await act(() => {
       renderComponent(clusterTopicNewPath(clusterName));
@@ -57,14 +55,25 @@ describe('New', () => {
     renderComponent(`${clusterTopicCopyPath(clusterName)}?name=test`);
     expect(screen.getByRole('heading', { name: 'Copy' })).toBeInTheDocument();
   });
-
   it('validates form', async () => {
-    renderComponent(clusterTopicNewPath(clusterName));
+    await renderComponent(clusterTopicNewPath(clusterName));
     await userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
     await userEvent.clear(screen.getByPlaceholderText('Topic Name'));
-    await waitFor(() => {
-      expect(screen.getByText('name is a required field')).toBeInTheDocument();
-    });
+    await userEvent.tab();
+    await expect(
+      screen.getByText('name is a required field')
+    ).toBeInTheDocument();
+
+    await userEvent.type(
+      screen.getByLabelText('Number of partitions *'),
+      minValue
+    );
+    await userEvent.clear(screen.getByLabelText('Number of partitions *'));
+    await userEvent.tab();
+    await expect(
+      screen.getByText('Number of partitions is required and must be a number')
+    ).toBeInTheDocument();
+
     expect(createTopicMock).not.toHaveBeenCalled();
     expect(mockNavigate).not.toHaveBeenCalled();
   });
@@ -83,6 +92,10 @@ describe('New', () => {
   it('submits valid form', async () => {
     renderComponent(clusterTopicNewPath(clusterName));
     await userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
+    await userEvent.type(
+      screen.getByLabelText('Number of partitions *'),
+      minValue
+    );
     await userEvent.click(screen.getByText('Create topic'));
     expect(createTopicMock).toHaveBeenCalledTimes(1);
     expect(mockNavigate).toHaveBeenLastCalledWith(`../${topicName}`);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
index f2421b5379a..8760d5961b5 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
@@ -19,6 +19,7 @@ import {
   useUpdateTopic,
 } from 'lib/hooks/api/topics';
 import DangerZone from 'components/Topics/Topic/Edit/DangerZone/DangerZone';
+import { ConfigSource } from 'generated-sources';
 
 export const TOPIC_EDIT_FORM_DEFAULT_PROPS = {
   partitions: 1,
@@ -54,9 +55,24 @@ const Edit: React.FC = () => {
   topicConfig?.forEach((param) => {
     config.byName[param.name] = param;
   });
-
   const onSubmit = async (data: TopicFormDataRaw) => {
-    await updateTopic.mutateAsync(data);
+    const filteredDirtyDefaultEntries = Object.entries(data).filter(
+      ([key, val]) => {
+        const isDirty =
+          String(val) !==
+          String(defaultValues[key as keyof typeof defaultValues]);
+
+        const isDefaultConfig =
+          config.byName[key]?.source === ConfigSource.DEFAULT_CONFIG;
+
+        // if it is changed should be sent or if it was Dynamic
+        return isDirty || !isDefaultConfig;
+      }
+    );
+
+    const newData = Object.fromEntries(filteredDirtyDefaultEntries);
+
+    await updateTopic.mutateAsync(newData);
     navigate('../');
   };
 
@@ -64,6 +80,7 @@ const Edit: React.FC = () => {
     <>
       <FormProvider {...methods}>
         <TopicForm
+          config={config.byName}
           topicName={topicName}
           retentionBytes={defaultValues.retentionBytes}
           inSyncReplicas={Number(defaultValues.minInSyncReplicas)}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
index 1fe79f383ca..e7c3e288c65 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/__test__/Edit.spec.tsx
@@ -70,7 +70,7 @@ describe('Edit Component', () => {
     renderComponent();
     const btn = screen.getAllByText(/Update topic/i)[0];
     const field = screen.getByRole('spinbutton', {
-      name: 'Min In Sync Replicas * Min In Sync Replicas *',
+      name: 'Min In Sync Replicas Min In Sync Replicas',
     });
     await userEvent.type(field, '1');
     await userEvent.click(btn);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
index 6ff3fb77cab..e60faf11ccb 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
@@ -20,7 +20,7 @@ const topicParamsTransformer = (topic?: Topic, config?: TopicConfig[]) => {
 
   const customParams = config.reduce((acc, { name, value, defaultValue }) => {
     if (value === defaultValue) return acc;
-    if (!Object.keys(TOPIC_CUSTOM_PARAMS).includes(name)) return acc;
+    if (!TOPIC_CUSTOM_PARAMS[name]) return acc;
     return [...acc, { name, value }];
   }, [] as { name: string; value?: string }[]);
 
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
index 2b85b5276c7..7edbc5426dd 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
@@ -2,7 +2,7 @@ import React, { useRef } from 'react';
 import { ErrorMessage } from '@hookform/error-message';
 import { TOPIC_CUSTOM_PARAMS } from 'lib/constants';
 import { FieldArrayWithId, useFormContext, Controller } from 'react-hook-form';
-import { TopicFormData } from 'redux/interfaces';
+import { TopicConfigParams, TopicFormData } from 'redux/interfaces';
 import { InputLabel } from 'components/common/Input/InputLabel.styled';
 import { FormError } from 'components/common/Input/Input.styled';
 import Select from 'components/common/Select/Select';
@@ -10,10 +10,12 @@ import Input from 'components/common/Input/Input';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import CloseIcon from 'components/common/Icons/CloseIcon';
 import * as C from 'components/Topics/shared/Form/TopicForm.styled';
+import { ConfigSource } from 'generated-sources';
 
 import * as S from './CustomParams.styled';
 
 export interface Props {
+  config?: TopicConfigParams;
   isDisabled: boolean;
   index: number;
   existingFields: string[];
@@ -27,6 +29,7 @@ const CustomParamField: React.FC<Props> = ({
   isDisabled,
   index,
   remove,
+  config,
   existingFields,
   setExistingFields,
 }) => {
@@ -44,7 +47,10 @@ const CustomParamField: React.FC<Props> = ({
     .map((option) => ({
       value: option,
       label: option,
-      disabled: existingFields.includes(option),
+      disabled:
+        (config &&
+          config[option].source !== ConfigSource.DYNAMIC_TOPIC_CONFIG) ||
+        existingFields.includes(option),
     }));
 
   React.useEffect(() => {
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx
index a85b4a2fc4d..bd000b00f3f 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { TopicFormData } from 'redux/interfaces';
+import { TopicConfigParams, TopicFormData } from 'redux/interfaces';
 import { useFieldArray, useFormContext, useWatch } from 'react-hook-form';
 import { Button } from 'components/common/Button/Button';
 import { TOPIC_CUSTOM_PARAMS_PREFIX } from 'lib/constants';
@@ -9,10 +9,15 @@ import CustomParamField from './CustomParamField';
 import * as S from './CustomParams.styled';
 
 export interface CustomParamsProps {
+  config?: TopicConfigParams;
   isSubmitting: boolean;
+  isEditing?: boolean;
 }
 
-const CustomParams: React.FC<CustomParamsProps> = ({ isSubmitting }) => {
+const CustomParams: React.FC<CustomParamsProps> = ({
+  isSubmitting,
+  config,
+}) => {
   const { control } = useFormContext<TopicFormData>();
   const { fields, append, remove } = useFieldArray({
     control,
@@ -41,9 +46,10 @@ const CustomParams: React.FC<CustomParamsProps> = ({ isSubmitting }) => {
 
   return (
     <S.ParamsWrapper>
-      {controlledFields.map((field, idx) => (
+      {controlledFields?.map((field, idx) => (
         <CustomParamField
           key={field.id}
+          config={config}
           field={field}
           remove={removeField}
           index={idx}
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetain.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetain.tsx
index daa515ae7bf..93925181a6e 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetain.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetain.tsx
@@ -39,7 +39,7 @@ const TimeToRetain: React.FC<Props> = ({ isSubmitting }) => {
       <Input
         id="timeToRetain"
         type="number"
-        defaultValue={defaultValue}
+        placeholder=" Time to retain data (in ms)"
         name={name}
         hookFormOptions={{
           min: { value: -1, message: 'must be greater than or equal to -1' },
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index 20898e8de6d..a44aa266f77 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
 import { NOT_SET, BYTES_IN_GB } from 'lib/constants';
-import { ClusterName, TopicName } from 'redux/interfaces';
+import { ClusterName, TopicConfigParams, TopicName } from 'redux/interfaces';
 import { ErrorMessage } from '@hookform/error-message';
 import Select, { SelectOption } from 'components/common/Select/Select';
 import Input from 'components/common/Input/Input';
@@ -18,6 +18,7 @@ import TimeToRetain from './TimeToRetain';
 import * as S from './TopicForm.styled';
 
 export interface Props {
+  config?: TopicConfigParams;
   topicName?: TopicName;
   partitionCount?: number;
   replicationFactor?: number;
@@ -44,14 +45,12 @@ const RetentionBytesOptions: Array<SelectOption> = [
 ];
 
 const TopicForm: React.FC<Props> = ({
+  config,
   retentionBytes,
   topicName,
   isEditing,
   isSubmitting,
   onSubmit,
-  partitionCount,
-  replicationFactor,
-  inSyncReplicas,
   cleanUpPolicy,
 }) => {
   const {
@@ -109,7 +108,6 @@ const TopicForm: React.FC<Props> = ({
                   type="number"
                   placeholder="Number of partitions"
                   min="1"
-                  defaultValue={partitionCount}
                   name="partitions"
                 />
                 <FormError>
@@ -117,20 +115,28 @@ const TopicForm: React.FC<Props> = ({
                 </FormError>
               </div>
               <div>
-                <InputLabel htmlFor="topicFormReplicationFactor">
-                  Replication Factor *
+                <InputLabel
+                  id="topicFormCleanupPolicyLabel"
+                  htmlFor="topicFormCleanupPolicy"
+                >
+                  Cleanup policy
                 </InputLabel>
-                <Input
-                  id="topicFormReplicationFactor"
-                  type="number"
-                  placeholder="Replication Factor"
-                  min="1"
-                  defaultValue={replicationFactor}
-                  name="replicationFactor"
+                <Controller
+                  defaultValue={CleanupPolicyOptions[0].value}
+                  control={control}
+                  name="cleanupPolicy"
+                  render={({ field: { name, onChange } }) => (
+                    <Select
+                      id="topicFormCleanupPolicy"
+                      aria-labelledby="topicFormCleanupPolicyLabel"
+                      name={name}
+                      value={getCleanUpPolicy}
+                      onChange={onChange}
+                      minWidth="250px"
+                      options={CleanupPolicyOptions}
+                    />
+                  )}
                 />
-                <FormError>
-                  <ErrorMessage errors={errors} name="replicationFactor" />
-                </FormError>
               </div>
             </S.Column>
           )}
@@ -139,44 +145,36 @@ const TopicForm: React.FC<Props> = ({
         <S.Column>
           <div>
             <InputLabel htmlFor="topicFormMinInSyncReplicas">
-              Min In Sync Replicas *
+              Min In Sync Replicas
             </InputLabel>
             <Input
               id="topicFormMinInSyncReplicas"
               type="number"
               placeholder="Min In Sync Replicas"
               min="1"
-              defaultValue={inSyncReplicas}
               name="minInSyncReplicas"
             />
             <FormError>
               <ErrorMessage errors={errors} name="minInSyncReplicas" />
             </FormError>
           </div>
-          <div>
-            <InputLabel
-              id="topicFormCleanupPolicyLabel"
-              htmlFor="topicFormCleanupPolicy"
-            >
-              Cleanup policy
-            </InputLabel>
-            <Controller
-              defaultValue={CleanupPolicyOptions[0].value}
-              control={control}
-              name="cleanupPolicy"
-              render={({ field: { name, onChange } }) => (
-                <Select
-                  id="topicFormCleanupPolicy"
-                  aria-labelledby="topicFormCleanupPolicyLabel"
-                  name={name}
-                  value={getCleanUpPolicy}
-                  onChange={onChange}
-                  minWidth="250px"
-                  options={CleanupPolicyOptions}
-                />
-              )}
-            />
-          </div>
+          {!isEditing && (
+            <div>
+              <InputLabel htmlFor="topicFormReplicationFactor">
+                Replication Factor
+              </InputLabel>
+              <Input
+                id="topicFormReplicationFactor"
+                type="number"
+                placeholder="Replication Factor"
+                min="1"
+                name="replicationFactor"
+              />
+              <FormError>
+                <ErrorMessage errors={errors} name="replicationFactor" />
+              </FormError>
+            </div>
+          )}
         </S.Column>
 
         <S.Column>
@@ -213,13 +211,13 @@ const TopicForm: React.FC<Props> = ({
 
           <div>
             <InputLabel htmlFor="topicFormMaxMessageBytes">
-              Maximum message size in bytes *
+              Maximum message size in bytes
             </InputLabel>
             <Input
               id="topicFormMaxMessageBytes"
               type="number"
+              placeholder="Maximum message size"
               min="1"
-              defaultValue="1000012"
               name="maxMessageBytes"
             />
             <FormError>
@@ -229,7 +227,11 @@ const TopicForm: React.FC<Props> = ({
         </S.Column>
 
         <S.CustomParamsHeading>Custom parameters</S.CustomParamsHeading>
-        <CustomParams isSubmitting={isSubmitting} />
+        <CustomParams
+          config={config}
+          isSubmitting={isSubmitting}
+          isEditing={isEditing}
+        />
         <S.ButtonWrapper>
           <Button
             type="button"
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
index 8454b401c11..c1006b6d7ef 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
@@ -36,9 +36,9 @@ describe('TopicForm', () => {
     expectByRoleAndNameToBeInDocument('textbox', 'Topic Name *');
 
     expectByRoleAndNameToBeInDocument('spinbutton', 'Number of partitions *');
-    expectByRoleAndNameToBeInDocument('spinbutton', 'Replication Factor *');
+    expectByRoleAndNameToBeInDocument('spinbutton', 'Replication Factor');
 
-    expectByRoleAndNameToBeInDocument('spinbutton', 'Min In Sync Replicas *');
+    expectByRoleAndNameToBeInDocument('spinbutton', 'Min In Sync Replicas');
     expectByRoleAndNameToBeInDocument('listbox', 'Cleanup policy');
 
     expectByRoleAndNameToBeInDocument(
@@ -53,7 +53,7 @@ describe('TopicForm', () => {
     expectByRoleAndNameToBeInDocument('listbox', 'Max size on disk in GB');
     expectByRoleAndNameToBeInDocument(
       'spinbutton',
-      'Maximum message size in bytes *'
+      'Maximum message size in bytes'
     );
 
     expectByRoleAndNameToBeInDocument('heading', 'Custom parameters');
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
index 2562d04e72b..ced27faceea 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topics.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -82,19 +82,33 @@ const formatTopicCreation = (form: TopicFormData): TopicCreation => {
     customParams,
   } = form;
 
-  return {
+  const configs = {
+    'cleanup.policy': cleanupPolicy,
+    'retention.ms': retentionMs.toString(),
+    'retention.bytes': retentionBytes.toString(),
+    'max.message.bytes': maxMessageBytes.toString(),
+    'min.insync.replicas': minInSyncReplicas.toString(),
+    ...Object.values(customParams || {}).reduce(topicReducer, {}),
+  };
+
+  const cleanConfigs = () => {
+    return Object.fromEntries(
+      Object.entries(configs).filter(([, val]) => val !== '')
+    );
+  };
+
+  const topicsvalue = {
     name,
     partitions,
-    replicationFactor,
-    configs: {
-      'cleanup.policy': cleanupPolicy,
-      'retention.ms': retentionMs.toString(),
-      'retention.bytes': retentionBytes.toString(),
-      'max.message.bytes': maxMessageBytes.toString(),
-      'min.insync.replicas': minInSyncReplicas.toString(),
-      ...Object.values(customParams || {}).reduce(topicReducer, {}),
-    },
+    configs: cleanConfigs(),
   };
+
+  return replicationFactor.toString() !== ''
+    ? {
+        ...topicsvalue,
+        replicationFactor,
+      }
+    : topicsvalue;
 };
 
 export function useCreateTopic(clusterName: ClusterName) {
@@ -141,8 +155,12 @@ const formatTopicUpdate = (form: TopicFormDataRaw): TopicUpdate => {
 export function useUpdateTopic(props: GetTopicDetailsRequest) {
   const client = useQueryClient();
   return useMutation(
-    (data: TopicFormDataRaw) =>
-      api.updateTopic({ ...props, topicUpdate: formatTopicUpdate(data) }),
+    (data: TopicFormDataRaw) => {
+      return api.updateTopic({
+        ...props,
+        topicUpdate: formatTopicUpdate(data),
+      });
+    },
     {
       onSuccess: () => {
         showSuccessAlert({
diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index d9c476aa76a..9faaf65f446 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -59,29 +59,12 @@ export const topicFormValidationSchema = yup.object().shape({
     .max(2147483647)
     .required()
     .typeError('Number of partitions is required and must be a number'),
-  replicationFactor: yup
-    .number()
-    .min(1)
-    .max(2147483647)
-    .required()
-    .typeError('Replication factor is required and must be a number'),
-  minInSyncReplicas: yup
-    .number()
-    .min(1)
-    .max(2147483647)
-    .required()
-    .typeError('Min in sync replicas is required and must be a number'),
+  replicationFactor: yup.string(),
+  minInSyncReplicas: yup.string(),
   cleanupPolicy: yup.string().required(),
-  retentionMs: yup
-    .number()
-    .min(-1, 'Must be greater than or equal to -1')
-    .typeError('Time to retain data is required and must be a number'),
+  retentionMs: yup.string(),
   retentionBytes: yup.number(),
-  maxMessageBytes: yup
-    .number()
-    .min(1)
-    .required()
-    .typeError('Maximum message size is required and must be a number'),
+  maxMessageBytes: yup.string(),
   customParams: yup.array().of(
     yup.object().shape({
       name: yup.string().required('Custom parameter is required'),
diff --git a/kafka-ui-react-app/src/redux/interfaces/topic.ts b/kafka-ui-react-app/src/redux/interfaces/topic.ts
index 4cb4f7c089b..9f667e135e8 100644
--- a/kafka-ui-react-app/src/redux/interfaces/topic.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/topic.ts
@@ -8,7 +8,7 @@ import {
 
 export type TopicName = Topic['name'];
 
-interface TopicConfigParams {
+export interface TopicConfigParams {
   [paramName: string]: TopicConfig;
 }
 
@@ -23,7 +23,7 @@ interface TopicFormCustomParams {
 
 export type TopicFormFormattedParams = TopicCreation['configs'];
 
-export interface TopicFormDataRaw {
+interface TopicFormDataModified {
   name: string;
   partitions: number;
   replicationFactor: number;
@@ -35,6 +35,8 @@ export interface TopicFormDataRaw {
   customParams: TopicFormCustomParams;
 }
 
+export type TopicFormDataRaw = Partial<TopicFormDataModified>;
+
 export interface TopicFormData {
   name: string;
   partitions: number;

From 7837622d5eaacae9bade7342f14732967e1b48d0 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 9 Dec 2022 19:31:51 +0400
Subject: [PATCH 327/734] Update release drafter

Add security block & ignore AQA
---
 .github/release_drafter.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/release_drafter.yaml b/.github/release_drafter.yaml
index 421697f2e70..c9cbe51a076 100644
--- a/.github/release_drafter.yaml
+++ b/.github/release_drafter.yaml
@@ -9,6 +9,7 @@ template: |
 exclude-labels:
   - 'scope/infrastructure'
   - 'scope/QA'
+  - 'scope/AQA'
   - 'type/dependencies'
   - 'type/chore'
   - 'type/documentation'
@@ -24,6 +25,9 @@ categories:
   - title: '🔨Bug Fixes'
     labels:
       - 'type/bug'
+  - title: 'Security'
+    labels:
+      - 'type/security'
   - title: '⎈ Helm/K8S Changes'
     labels:
       - 'scope/k8s'

From f9906b5d307da11303177c4ddc04d4658c4ebfab Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 12 Dec 2022 14:15:55 +0400
Subject: [PATCH 328/734] Brokers API improvements (#2743)

* Brokers API improvements:
1. broker io rates stats added
2. active controller property set to node id
3. minor refactoring
4. FE: Add an indicator for an active broker controller

Co-authored-by: Mgrdich <mgotm13@gmail.com>
Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Co-authored-by: Mgrdich <mgotm13@gmail.com>
---
 .../ui/controller/BrokersController.java      |  3 +-
 .../kafka/ui/mapper/ClusterMapper.java        |  4 +
 .../kafka/ui/model/InternalBroker.java        | 24 +++++
 .../kafka/ui/model/InternalClusterState.java  | 15 ++-
 .../kafka/ui/model/InternalTopic.java         |  4 +-
 .../com/provectus/kafka/ui/model/Metrics.java | 13 ++-
 .../kafka/ui/service/BrokerService.java       | 13 +--
 .../kafka/ui/service/ReactiveAdminClient.java | 39 ++++----
 .../ui/service/metrics/MetricsCollector.java  |  2 +-
 .../ui/service/metrics/WellKnownMetrics.java  | 33 ++++++-
 .../kafka/ui/service/BrokerServiceTest.java   | 10 +-
 .../service/metrics/WellKnownMetricsTest.java | 95 ++++++++++++-------
 .../main/resources/swagger/kafka-ui-api.yaml  |  5 +
 .../Brokers/BrokersList/BrokersList.styled.ts | 16 ++++
 .../Brokers/BrokersList/BrokersList.tsx       | 48 ++++++++--
 .../common/Icons/CheckMarkRoundIcon.tsx       | 22 +++++
 .../src/components/common/Icons/StarIcon.tsx  |  9 ++
 17 files changed, 256 insertions(+), 99 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalBroker.java
 create mode 100644 kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/CheckMarkRoundIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/StarIcon.tsx

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
index df809d615ac..b1a3d3a3c91 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
@@ -37,7 +37,8 @@ public Mono<ResponseEntity<BrokerMetricsDTO>> getBrokersMetrics(String clusterNa
   @Override
   public Mono<ResponseEntity<Flux<BrokerDTO>>> getBrokers(String clusterName,
                                                           ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity.ok(brokerService.getBrokers(getCluster(clusterName))));
+    return Mono.just(ResponseEntity.ok(
+        brokerService.getBrokers(getCluster(clusterName)).map(clusterMapper::toBrokerDto)));
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index 588afc1f957..50c543c8e28 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.model.BrokerConfigDTO;
+import com.provectus.kafka.ui.model.BrokerDTO;
 import com.provectus.kafka.ui.model.BrokerDiskUsageDTO;
 import com.provectus.kafka.ui.model.BrokerMetricsDTO;
 import com.provectus.kafka.ui.model.ClusterDTO;
@@ -14,6 +15,7 @@
 import com.provectus.kafka.ui.model.ConnectDTO;
 import com.provectus.kafka.ui.model.FailoverUrlList;
 import com.provectus.kafka.ui.model.Feature;
+import com.provectus.kafka.ui.model.InternalBroker;
 import com.provectus.kafka.ui.model.InternalBrokerConfig;
 import com.provectus.kafka.ui.model.InternalBrokerDiskUsage;
 import com.provectus.kafka.ui.model.InternalClusterState;
@@ -103,6 +105,8 @@ default ConfigSynonymDTO toConfigSynonym(ConfigEntry.ConfigSynonym config) {
 
   PartitionDTO toPartition(InternalPartition topic);
 
+  BrokerDTO toBrokerDto(InternalBroker broker);
+
   @Named("setSchemaRegistry")
   default InternalSchemaRegistry setSchemaRegistry(ClustersProperties.Cluster clusterProperties) {
     if (clusterProperties == null
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalBroker.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalBroker.java
new file mode 100644
index 00000000000..edab9a8aeb5
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalBroker.java
@@ -0,0 +1,24 @@
+package com.provectus.kafka.ui.model;
+
+import java.math.BigDecimal;
+import lombok.Data;
+import org.apache.kafka.common.Node;
+
+@Data
+public class InternalBroker {
+
+  private final Integer id;
+  private final String host;
+  private final Integer port;
+  private final BigDecimal bytesInPerSec;
+  private final BigDecimal bytesOutPerSec;
+
+  public InternalBroker(Node node, Statistics statistics) {
+    this.id = node.id();
+    this.host = node.host();
+    this.port = node.port();
+    this.bytesInPerSec = statistics.getMetrics().getBrokerBytesInPerSec().get(node.id());
+    this.bytesOutPerSec = statistics.getMetrics().getBrokerBytesOutPerSec().get(node.id());
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java
index bdd7a32d040..5f6d06ced5c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java
@@ -6,6 +6,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.Data;
+import org.apache.kafka.common.Node;
 
 @Data
 public class InternalClusterState {
@@ -37,7 +38,9 @@ public InternalClusterState(KafkaCluster cluster, Statistics statistics) {
         .orElse(null);
     topicCount = statistics.getTopicDescriptions().size();
     brokerCount = statistics.getClusterDescription().getNodes().size();
-    activeControllers = statistics.getClusterDescription().getController() != null ? 1 : 0;
+    activeControllers = Optional.ofNullable(statistics.getClusterDescription().getController())
+        .map(Node::id)
+        .orElse(null);
     version = statistics.getVersion();
 
     if (statistics.getLogDirInfo() != null) {
@@ -53,15 +56,17 @@ public InternalClusterState(KafkaCluster cluster, Statistics statistics) {
 
     bytesInPerSec = statistics
         .getMetrics()
-        .getBytesInPerSec()
+        .getBrokerBytesInPerSec()
         .values().stream()
-        .reduce(BigDecimal.ZERO, BigDecimal::add);
+        .reduce(BigDecimal::add)
+        .orElse(null);
 
     bytesOutPerSec = statistics
         .getMetrics()
-        .getBytesOutPerSec()
+        .getBrokerBytesOutPerSec()
         .values().stream()
-        .reduce(BigDecimal.ZERO, BigDecimal::add);
+        .reduce(BigDecimal::add)
+        .orElse(null);
 
     var partitionsStats = new PartitionsStats(statistics.getTopicDescriptions().values());
     onlinePartitionCount = partitionsStats.getOnlinePartitionCount();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
index a553165de4d..efabd15f098 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
@@ -102,8 +102,8 @@ public static InternalTopic from(TopicDescription topicDescription,
       topic.segmentSize(segmentStats.getSegmentSize());
     }
 
-    topic.bytesInPerSec(metrics.getBytesInPerSec().get(topicDescription.name()));
-    topic.bytesOutPerSec(metrics.getBytesOutPerSec().get(topicDescription.name()));
+    topic.bytesInPerSec(metrics.getTopicBytesInPerSec().get(topicDescription.name()));
+    topic.bytesOutPerSec(metrics.getTopicBytesOutPerSec().get(topicDescription.name()));
 
     topic.topicConfigs(
         configs.stream().map(InternalTopicConfig::from).collect(Collectors.toList()));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Metrics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Metrics.java
index f9f6943808b..02bfe6dea13 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Metrics.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Metrics.java
@@ -15,14 +15,19 @@
 @Builder
 @Value
 public class Metrics {
-  Map<String, BigDecimal> bytesInPerSec;
-  Map<String, BigDecimal> bytesOutPerSec;
+
+  Map<Integer, BigDecimal> brokerBytesInPerSec;
+  Map<Integer, BigDecimal> brokerBytesOutPerSec;
+  Map<String, BigDecimal> topicBytesInPerSec;
+  Map<String, BigDecimal> topicBytesOutPerSec;
   Map<Integer, List<RawMetric>> perBrokerMetrics;
 
   public static Metrics empty() {
     return Metrics.builder()
-        .bytesInPerSec(Map.of())
-        .bytesOutPerSec(Map.of())
+        .brokerBytesInPerSec(Map.of())
+        .brokerBytesOutPerSec(Map.of())
+        .topicBytesInPerSec(Map.of())
+        .topicBytesOutPerSec(Map.of())
         .perBrokerMetrics(Map.of())
         .build();
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
index 9c258fa8de8..720642157b0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
@@ -5,9 +5,9 @@
 import com.provectus.kafka.ui.exception.NotFoundException;
 import com.provectus.kafka.ui.exception.TopicOrPartitionNotFoundException;
 import com.provectus.kafka.ui.mapper.DescribeLogDirsMapper;
-import com.provectus.kafka.ui.model.BrokerDTO;
 import com.provectus.kafka.ui.model.BrokerLogdirUpdateDTO;
 import com.provectus.kafka.ui.model.BrokersLogdirsDTO;
+import com.provectus.kafka.ui.model.InternalBroker;
 import com.provectus.kafka.ui.model.InternalBrokerConfig;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.service.metrics.RawMetric;
@@ -63,18 +63,13 @@ private Flux<InternalBrokerConfig> getBrokersConfig(KafkaCluster cluster, Intege
         .flatMapMany(Flux::fromIterable);
   }
 
-  public Flux<BrokerDTO> getBrokers(KafkaCluster cluster) {
+  public Flux<InternalBroker> getBrokers(KafkaCluster cluster) {
     return adminClientService
         .get(cluster)
         .flatMap(ReactiveAdminClient::describeCluster)
         .map(description -> description.getNodes().stream()
-            .map(node -> {
-              BrokerDTO broker = new BrokerDTO();
-              broker.setId(node.id());
-              broker.setHost(node.host());
-              broker.setPort(node.port());
-              return broker;
-            }).collect(Collectors.toList()))
+            .map(node -> new InternalBroker(node, statisticsCache.get(cluster)))
+            .collect(Collectors.toList()))
         .flatMapMany(Flux::fromIterable);
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 2e3605145aa..bca3bac3a92 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -1,6 +1,5 @@
 package com.provectus.kafka.ui.service;
 
-import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 import static org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo;
@@ -43,6 +42,7 @@
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.apache.kafka.clients.admin.ConsumerGroupDescription;
 import org.apache.kafka.clients.admin.ConsumerGroupListing;
+import org.apache.kafka.clients.admin.DescribeClusterOptions;
 import org.apache.kafka.clients.admin.DescribeConfigsOptions;
 import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsOptions;
 import org.apache.kafka.clients.admin.ListOffsetsResult;
@@ -53,6 +53,7 @@
 import org.apache.kafka.clients.admin.OffsetSpec;
 import org.apache.kafka.clients.admin.RecordsToDelete;
 import org.apache.kafka.clients.admin.TopicDescription;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.OffsetAndMetadata;
 import org.apache.kafka.common.KafkaException;
 import org.apache.kafka.common.KafkaFuture;
@@ -125,7 +126,8 @@ private static Set<SupportedFeature> getSupportedUpdateFeaturesForVersion(String
     }
   }
 
-  //TODO: discuss - maybe we should map kafka-library's exceptions to our exceptions here
+  // NOTE: if KafkaFuture returns null, that Mono will be empty(!), since Reactor does not support nullable results
+  // (see MonoSink.success(..) javadoc for details)
   private static <T> Mono<T> toMono(KafkaFuture<T> future) {
     return Mono.<T>create(sink -> future.whenComplete((res, ex) -> {
       if (ex != null) {
@@ -302,26 +304,19 @@ public Mono<ClusterDescription> describeCluster() {
   }
 
   private static Mono<ClusterDescription> describeClusterImpl(AdminClient client) {
-    var r = client.describeCluster();
-    var all = KafkaFuture.allOf(r.nodes(), r.clusterId(), r.controller(), r.authorizedOperations());
-    return Mono.create(sink -> all.whenComplete((res, ex) -> {
-      if (ex != null) {
-        sink.error(ex);
-      } else {
-        try {
-          sink.success(
-              new ClusterDescription(
-                  getUninterruptibly(r.controller()),
-                  getUninterruptibly(r.clusterId()),
-                  getUninterruptibly(r.nodes()),
-                  getUninterruptibly(r.authorizedOperations())
-              )
-          );
-        } catch (ExecutionException e) {
-          // can't be here, because all futures already completed
-        }
-      }
-    }));
+    var result = client.describeCluster(new DescribeClusterOptions().includeAuthorizedOperations(true));
+    var allOfFuture = KafkaFuture.allOf(
+        result.controller(), result.clusterId(), result.nodes(), result.authorizedOperations());
+    return toMono(allOfFuture).then(
+        Mono.fromCallable(() ->
+          new ClusterDescription(
+            result.controller().get(),
+            result.clusterId().get(),
+            result.nodes().get(),
+            result.authorizedOperations().get()
+          )
+        )
+    );
   }
 
   private static Mono<String> getClusterVersion(AdminClient client) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsCollector.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsCollector.java
index bd0506bed87..fca7ab1fea0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsCollector.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/MetricsCollector.java
@@ -62,7 +62,7 @@ private WellKnownMetrics populateWellknowMetrics(KafkaCluster cluster, Map<Node,
     WellKnownMetrics wellKnownMetrics = new WellKnownMetrics();
     perBrokerMetrics.forEach((node, metrics) ->
         metrics.forEach(metric ->
-            wellKnownMetrics.populate(cluster, node, metric)));
+            wellKnownMetrics.populate(node, metric)));
     return wellKnownMetrics;
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java
index fe8a55da12c..10ad128c657 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java
@@ -3,7 +3,6 @@
 import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
 import static org.apache.commons.lang3.StringUtils.endsWithIgnoreCase;
 
-import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.Metrics;
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -12,16 +11,42 @@
 
 class WellKnownMetrics {
 
+  // per broker
+  final Map<Integer, BigDecimal> brokerBytesInFifteenMinuteRate = new HashMap<>();
+  final Map<Integer, BigDecimal> brokerBytesOutFifteenMinuteRate = new HashMap<>();
+
+  // per topic
   final Map<String, BigDecimal> bytesInFifteenMinuteRate = new HashMap<>();
   final Map<String, BigDecimal> bytesOutFifteenMinuteRate = new HashMap<>();
 
-  void populate(KafkaCluster cluster, Node node, RawMetric rawMetric) {
+  void populate(Node node, RawMetric rawMetric) {
+    updateBrokerIOrates(node, rawMetric);
     updateTopicsIOrates(rawMetric);
   }
 
   void apply(Metrics.MetricsBuilder metricsBuilder) {
-    metricsBuilder.bytesInPerSec(bytesInFifteenMinuteRate);
-    metricsBuilder.bytesOutPerSec(bytesOutFifteenMinuteRate);
+    metricsBuilder.topicBytesInPerSec(bytesInFifteenMinuteRate);
+    metricsBuilder.topicBytesOutPerSec(bytesOutFifteenMinuteRate);
+    metricsBuilder.brokerBytesInPerSec(brokerBytesInFifteenMinuteRate);
+    metricsBuilder.brokerBytesOutPerSec(brokerBytesOutFifteenMinuteRate);
+  }
+
+  private void updateBrokerIOrates(Node node, RawMetric rawMetric) {
+    String name = rawMetric.name();
+    if (!brokerBytesInFifteenMinuteRate.containsKey(node.id())
+        && rawMetric.labels().size() == 1
+        && "BytesInPerSec".equalsIgnoreCase(rawMetric.labels().get("name"))
+        && containsIgnoreCase(name, "BrokerTopicMetrics")
+        && endsWithIgnoreCase(name, "FifteenMinuteRate")) {
+      brokerBytesInFifteenMinuteRate.put(node.id(),  rawMetric.value());
+    }
+    if (!brokerBytesOutFifteenMinuteRate.containsKey(node.id())
+        && rawMetric.labels().size() == 1
+        && "BytesOutPerSec".equalsIgnoreCase(rawMetric.labels().get("name"))
+        && containsIgnoreCase(name, "BrokerTopicMetrics")
+        && endsWithIgnoreCase(name, "FifteenMinuteRate")) {
+      brokerBytesOutFifteenMinuteRate.put(node.id(), rawMetric.value());
+    }
   }
 
   private void updateTopicsIOrates(RawMetric rawMetric) {
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/BrokerServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/BrokerServiceTest.java
index 33e90e3b0b5..62a6a0fc752 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/BrokerServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/BrokerServiceTest.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.service;
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
-import com.provectus.kafka.ui.model.BrokerDTO;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import reactor.test.StepVerifier;
@@ -16,14 +15,11 @@ class BrokerServiceTest extends AbstractIntegrationTest {
 
   @Test
   void getBrokersReturnsFilledBrokerDto() {
-    BrokerDTO expectedBroker = new BrokerDTO();
-    expectedBroker.setId(1);
-    expectedBroker.setHost(kafka.getHost());
-    expectedBroker.setPort(kafka.getFirstMappedPort());
-
     var localCluster = clustersStorage.getClusterByName(LOCAL).get();
     StepVerifier.create(brokerService.getBrokers(localCluster))
-        .expectNext(expectedBroker)
+        .expectNextMatches(b -> b.getId().equals(1)
+            && b.getHost().equals(kafka.getHost())
+            && b.getPort().equals(kafka.getFirstMappedPort()))
         .verifyComplete();
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/WellKnownMetricsTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/WellKnownMetricsTest.java
index 0917b684669..c1c9c04058a 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/WellKnownMetricsTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/WellKnownMetricsTest.java
@@ -2,65 +2,92 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.Metrics;
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.Map;
+import java.util.Optional;
 import org.apache.kafka.common.Node;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
 
 class WellKnownMetricsTest {
 
   private final WellKnownMetrics wellKnownMetrics = new WellKnownMetrics();
 
-  @ParameterizedTest
-  @CsvSource({
-      //default jmx exporter format
-      //example: kafka_server_BrokerTopicMetrics_FifteenMinuteRate{name="BytesInPerSec",topic="test-topic",} 222.0
-      //example: kafka_server_BrokerTopicMetrics_FifteenMinuteRate{name="BytesOutPerSec",topic="test-topic",} 111.0
-      "kafka_server_BrokerTopicMetrics_FifteenMinuteRate, BytesInPerSec, BytesOutPerSec",
-
-      //default jmx exporter format, but lower-cased
-      //example: kafka_server_brokertopicmetrics_fifteenminuterate{name="bytesinpersec",topic="test-topic",} 222.0
-      //example: kafka_server_brokertopicmetrics_fifteenminuterate{name="bytesoutpersec",topic="test-topic",} 111.0
-      "kafka_server_brokertopicmetrics_fifteenminuterate, bytesinpersec, bytesoutpersec",
-
-      //unknown prefix metric name
-      "some_unknown_prefix_brokertopicmetrics_fifteenminuterate, bytesinpersec, bytesoutpersec",
-  })
-  void bytesIoTopicMetricsPopulated(String metricName, String bytesInLabel, String bytesOutLabel) {
-    var clusterParam = KafkaCluster.builder().build();
-    var nodeParam = new Node(0, "host", 123);
-
-    var in = RawMetric.create(metricName, Map.of("name", bytesInLabel, "topic", "test-topic"), new BigDecimal("1.0"));
-    var out = RawMetric.create(metricName, Map.of("name", bytesOutLabel, "topic", "test-topic"), new BigDecimal("2.0"));
-
-    // feeding metrics
-    for (int i = 0; i < 3; i++) {
-      wellKnownMetrics.populate(clusterParam, nodeParam, in);
-      wellKnownMetrics.populate(clusterParam, nodeParam, out);
-    }
-
+  @Test
+  void bytesIoTopicMetricsPopulated() {
+    populateWith(
+        new Node(0, "host", 123),
+        "kafka_server_BrokerTopicMetrics_FifteenMinuteRate{name=\"BytesInPerSec\",topic=\"test-topic\",} 1.0",
+        "kafka_server_BrokerTopicMetrics_FifteenMinuteRate{name=\"BytesOutPerSec\",topic=\"test-topic\",} 2.0",
+        "kafka_server_brokertopicmetrics_fifteenminuterate{name=\"bytesinpersec\",topic=\"test-topic\",} 1.0",
+        "kafka_server_brokertopicmetrics_fifteenminuterate{name=\"bytesoutpersec\",topic=\"test-topic\",} 2.0",
+        "some_unknown_prefix_brokertopicmetrics_fifteenminuterate{name=\"bytesinpersec\",topic=\"test-topic\",} 1.0",
+        "some_unknown_prefix_brokertopicmetrics_fifteenminuterate{name=\"bytesoutpersec\",topic=\"test-topic\",} 2.0"
+    );
     assertThat(wellKnownMetrics.bytesInFifteenMinuteRate)
         .containsEntry("test-topic", new BigDecimal("3.0"));
-
     assertThat(wellKnownMetrics.bytesOutFifteenMinuteRate)
         .containsEntry("test-topic", new BigDecimal("6.0"));
   }
 
+  @Test
+  void bytesIoBrokerMetricsPopulated() {
+    populateWith(
+        new Node(1, "host1", 123),
+        "kafka_server_BrokerTopicMetrics_FifteenMinuteRate{name=\"BytesInPerSec\",} 1.0",
+        "kafka_server_BrokerTopicMetrics_FifteenMinuteRate{name=\"BytesOutPerSec\",} 2.0"
+    );
+    populateWith(
+        new Node(2, "host2", 345),
+        "some_unknown_prefix_brokertopicmetrics_fifteenminuterate{name=\"bytesinpersec\",} 10.0",
+        "some_unknown_prefix_brokertopicmetrics_fifteenminuterate{name=\"bytesoutpersec\",} 20.0"
+    );
+
+    assertThat(wellKnownMetrics.brokerBytesInFifteenMinuteRate)
+        .hasSize(2)
+        .containsEntry(1, new BigDecimal("1.0"))
+        .containsEntry(2, new BigDecimal("10.0"));
+
+    assertThat(wellKnownMetrics.brokerBytesOutFifteenMinuteRate)
+        .hasSize(2)
+        .containsEntry(1, new BigDecimal("2.0"))
+        .containsEntry(2, new BigDecimal("20.0"));
+  }
+
   @Test
   void appliesInnerStateToMetricsBuilder() {
+    //filling per topic io rates
     wellKnownMetrics.bytesInFifteenMinuteRate.put("topic", new BigDecimal(1));
     wellKnownMetrics.bytesOutFifteenMinuteRate.put("topic", new BigDecimal(2));
 
+    //filling per broker io rates
+    wellKnownMetrics.brokerBytesInFifteenMinuteRate.put(1, new BigDecimal(1));
+    wellKnownMetrics.brokerBytesOutFifteenMinuteRate.put(1, new BigDecimal(2));
+    wellKnownMetrics.brokerBytesInFifteenMinuteRate.put(2, new BigDecimal(10));
+    wellKnownMetrics.brokerBytesOutFifteenMinuteRate.put(2, new BigDecimal(20));
+
     Metrics.MetricsBuilder builder = Metrics.builder();
     wellKnownMetrics.apply(builder);
     var metrics = builder.build();
 
-    assertThat(metrics.getBytesInPerSec()).containsExactlyEntriesOf(wellKnownMetrics.bytesInFifteenMinuteRate);
-    assertThat(metrics.getBytesOutPerSec()).containsExactlyEntriesOf(wellKnownMetrics.bytesOutFifteenMinuteRate);
+    // checking per topic io rates
+    assertThat(metrics.getTopicBytesInPerSec()).containsExactlyEntriesOf(wellKnownMetrics.bytesInFifteenMinuteRate);
+    assertThat(metrics.getTopicBytesOutPerSec()).containsExactlyEntriesOf(wellKnownMetrics.bytesOutFifteenMinuteRate);
+
+    // checking per broker io rates
+    assertThat(metrics.getBrokerBytesInPerSec()).containsExactlyInAnyOrderEntriesOf(
+        Map.of(1, new BigDecimal(1), 2, new BigDecimal(10)));
+    assertThat(metrics.getBrokerBytesOutPerSec()).containsExactlyInAnyOrderEntriesOf(
+        Map.of(1, new BigDecimal(2), 2, new BigDecimal(20)));
+  }
+
+  private void populateWith(Node n, String... prometheusMetric) {
+    Arrays.stream(prometheusMetric)
+        .map(PrometheusEndpointMetricsParser::parse)
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .forEach(m -> wellKnownMetrics.populate(n, m));
   }
 
 }
\ No newline at end of file
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 1034fc32025..f604025bb1a 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1901,6 +1901,7 @@ components:
           deprecated: true
         activeControllers:
           type: integer
+          description: Id of broker which is cluster's controller. null, if controller not known yet.
         onlinePartitionCount:
           type: integer
         offlinePartitionCount:
@@ -2269,6 +2270,10 @@ components:
           type: string
         port:
           type: integer
+        bytesInPerSec:
+          type: number
+        bytesOutPerSec:
+          type: number
       required:
         - id
 
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.styled.ts b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.styled.ts
new file mode 100644
index 00000000000..964e64368dc
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.styled.ts
@@ -0,0 +1,16 @@
+import styled from 'styled-components';
+
+export const RowCell = styled.div`
+  display: flex;
+  width: 100%;
+  align-items: center;
+
+  svg {
+    width: 20px;
+    padding-left: 6px;
+  }
+`;
+
+export const DangerText = styled.span`
+  color: ${({ theme }) => theme.circularAlert.color.error};
+`;
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index d74c1bcb700..f1aa4988112 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -7,8 +7,12 @@ import useAppParams from 'lib/hooks/useAppParams';
 import { useBrokers } from 'lib/hooks/api/brokers';
 import { useClusterStats } from 'lib/hooks/api/clusters';
 import Table, { LinkCell, SizeCell } from 'components/common/NewTable';
+import CheckMarkRoundIcon from 'components/common/Icons/CheckMarkRoundIcon';
 import { ColumnDef } from '@tanstack/react-table';
 import { clusterBrokerPath } from 'lib/paths';
+import Tooltip from 'components/common/Tooltip/Tooltip';
+
+import * as S from './BrokersList.styled';
 
 const NA = 'N/A';
 
@@ -56,17 +60,27 @@ const BrokersList: React.FC = () => {
       };
     });
   }, [diskUsage, brokers]);
+
   const columns = React.useMemo<ColumnDef<typeof rows>[]>(
     () => [
       {
         header: 'Broker ID',
         accessorKey: 'brokerId',
         // eslint-disable-next-line react/no-unstable-nested-components
-        cell: ({ getValue }) => (
-          <LinkCell
-            value={`${getValue<string | number>()}`}
-            to={encodeURIComponent(`${getValue<string | number>()}`)}
-          />
+        cell: ({ row: { id }, getValue }) => (
+          <S.RowCell>
+            <LinkCell
+              value={`${getValue<string | number>()}`}
+              to={encodeURIComponent(`${getValue<string | number>()}`)}
+            />
+            {id === String(activeControllers) && (
+              <Tooltip
+                value={<CheckMarkRoundIcon />}
+                content="Active Controller"
+                placement="right"
+              />
+            )}
+          </S.RowCell>
         ),
       },
       {
@@ -89,7 +103,10 @@ const BrokersList: React.FC = () => {
       },
       { header: 'Segment Count', accessorKey: 'count' },
       { header: 'Port', accessorKey: 'port' },
-      { header: 'Host', accessorKey: 'host' },
+      {
+        header: 'Host',
+        accessorKey: 'host',
+      },
     ],
     []
   );
@@ -98,6 +115,8 @@ const BrokersList: React.FC = () => {
   const areAllInSync = inSyncReplicasCount && replicas === inSyncReplicasCount;
   const partitionIsOffline = offlinePartitionCount && offlinePartitionCount > 0;
 
+  const isActiveControllerUnKnown = typeof activeControllers === 'undefined';
+
   return (
     <>
       <PageHeading text="Brokers" />
@@ -106,8 +125,15 @@ const BrokersList: React.FC = () => {
           <Metrics.Indicator label="Broker Count">
             {brokerCount}
           </Metrics.Indicator>
-          <Metrics.Indicator label="Active Controllers">
-            {activeControllers}
+          <Metrics.Indicator
+            label="Active Controller"
+            isAlert={isActiveControllerUnKnown}
+          >
+            {isActiveControllerUnKnown ? (
+              <S.DangerText>No Active Controller</S.DangerText>
+            ) : (
+              activeControllers
+            )}
           </Metrics.Indicator>
           <Metrics.Indicator label="Version">{version}</Metrics.Indicator>
         </Metrics.Section>
@@ -123,8 +149,10 @@ const BrokersList: React.FC = () => {
               onlinePartitionCount
             )}
             <Metrics.LightText>
-              {' '}
-              of {(onlinePartitionCount || 0) + (offlinePartitionCount || 0)}
+              {` of ${
+                (onlinePartitionCount || 0) + (offlinePartitionCount || 0)
+              }
+              `}
             </Metrics.LightText>
           </Metrics.Indicator>
           <Metrics.Indicator
diff --git a/kafka-ui-react-app/src/components/common/Icons/CheckMarkRoundIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/CheckMarkRoundIcon.tsx
new file mode 100644
index 00000000000..e14898385b6
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/CheckMarkRoundIcon.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+const CheckMarkRoundIcon: React.FC = () => {
+  return (
+    <svg
+      width="14"
+      height="14"
+      viewBox="0 0 14 14"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M7 14C10.866 14 14 10.866 14 7C14 3.13401 10.866 0 7 0C3.13401 0 0 3.13401 0 7C0 10.866 3.13401 14 7 14ZM11.2796 5.39575C11.5831 5.1139 11.6007 4.63935 11.3188 4.33582C11.037 4.03228 10.5624 4.01471 10.2589 4.29656L6.13018 8.13037L3.74111 5.91194C3.43757 5.63009 2.96303 5.64767 2.68117 5.9512C2.39932 6.25473 2.4169 6.72928 2.72043 7.01113L5.61984 9.70344C5.9076 9.97065 6.35276 9.97065 6.64052 9.70344L11.2796 5.39575Z"
+        fill="#33CC66"
+      />
+    </svg>
+  );
+};
+
+export default CheckMarkRoundIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/StarIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/StarIcon.tsx
new file mode 100644
index 00000000000..7dacf2b1b90
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/StarIcon.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+
+const StarIcon: React.FC = () => (
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 260 245">
+    <path d="m56,237 74-228 74,228L10,96h240" />
+  </svg>
+);
+
+export default StarIcon;

From c2be45fd06263169feb514fe3bfe419bafcee377 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Mon, 19 Dec 2022 21:44:14 +0400
Subject: [PATCH 329/734] [FE] Fix invalid SeekType value for the offset and
 timestamp fields (#3057)

* SeekType fix the value during the offset and timestamp fields

* BE: thread interruption logging added to Emitters

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/emitter/BackwardRecordEmitter.java          | 4 ++++
 .../provectus/kafka/ui/emitter/ForwardRecordEmitter.java | 4 ++++
 .../com/provectus/kafka/ui/emitter/TailingEmitter.java   | 1 +
 .../components/Topics/Topic/Messages/Filters/Filters.tsx | 9 +++++++++
 4 files changed, 18 insertions(+)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
index c651bd5e56b..996f8b9f70c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
@@ -17,6 +17,7 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.errors.InterruptException;
 import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
 
@@ -85,6 +86,9 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
       }
       sendFinishStatsAndCompleteSink(sink);
       log.debug("Polling finished");
+    } catch (InterruptException kafkaInterruptException) {
+      log.debug("Polling finished due to thread interruption");
+      sink.complete();
     } catch (Exception e) {
       log.error("Error occurred while consuming records", e);
       sink.error(e);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
index 132b4790297..9fadb149d48 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
@@ -9,6 +9,7 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.errors.InterruptException;
 import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
 
@@ -59,6 +60,9 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
       }
       sendFinishStatsAndCompleteSink(sink);
       log.debug("Polling finished");
+    } catch (InterruptException kafkaInterruptException) {
+      log.debug("Polling finished due to thread interruption");
+      sink.complete();
     } catch (Exception e) {
       log.error("Error occurred while consuming records", e);
       sink.error(e);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
index 025dd874cfa..06cd8dad998 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
@@ -41,6 +41,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
       sink.complete();
       log.debug("Tailing finished");
     } catch (InterruptException kafkaInterruptException) {
+      log.debug("Tailing finished due to thread interruption");
       sink.complete();
     } catch (Exception e) {
       log.error("Error consuming {}", consumerPosition, e);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 9f54e56d5a4..0e3d3d46614 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -219,6 +219,15 @@ const Filters: React.FC<FiltersProps> = ({
         default:
           props.seekType = currentSeekType;
       }
+
+      if (offset && currentSeekType === SeekType.OFFSET) {
+        props.seekType = SeekType.OFFSET;
+      }
+
+      if (timestamp && currentSeekType === SeekType.TIMESTAMP) {
+        props.seekType = SeekType.TIMESTAMP;
+      }
+
       props.seekTo = selectedPartitions.map(({ value }) => {
         const offsetProperty =
           seekDirection === SeekDirection.FORWARD ? 'offsetMin' : 'offsetMax';

From 5c723d9b4491019bc6de01e3746b5b86d70f0560 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 22 Dec 2022 16:05:53 +0300
Subject: [PATCH 330/734] Role based access control (#2790)

* Role based access control

* Fix build + checkstyle

* Refactoring, some bug fixes, review fixes

* Compile permission value patterns

* Make the resource a enum instead of a string

* Refactoring

* Make clusters required

* Fix formatting

* switch the switch case to a smart switch case

* Get rid of topic analysis actions

* Rename endpoints, fix an issue

* Return a flag indicating if rbac is on and a username

* Fix yaml indent in editorconfig

* Fix github & cognito role name fetching

* Fix case matching for actions

* Update readme

* Add an endpoint to determine if a user can create a resource

* Fix tests (I hope so)

* Fix tests

* Use spring configs instead of a separate file, rename endpoints

* Add "ALL" action
Get rid of unnecessary cache, save groups into spring auth
Review fixes

* Make "all" action case-insensitive

* Role based access control / FrontEnd  (#2933)

* Initial modifications and mocking the For the RoleAccess

* fix the Suspense issue in the components , comment the Tests to implement later

* minor test comment

* Roles and configuration and santization of data

* initialize RoleCheck hook

* make the App test file visible + minor modification in the permission hook

* Structure the data so the Burger header toggle does not rerender the whole application

* add tests to the NavBar and the Page container , add tests

* NavBar and PageContainer bug fixes

* Roles Testing code modification

* covering Topics create button Actions, and Schema create button Actions

* minor typescript code modifications for the cluster required parameter in the rolesHelper

* minor typescript code modifications for the cluster required parameter in the rolesHelper

* minor code modification to describe the Permission tests more clearly

* Produce message Permissions with Tests Suites for Topic

* Add Schema Edit Permission with tests

* Minor role changes

* Add ActionButton Component to handle the Button with tooltip

* Add ActionButton Component to handle the Button with tooltip

* Add Action Button to every Button create Action

* ActionButton add test suites

* usePermission code modification to include regular expressions

* Abstract Actions Component for code repetition, add Configs Edit button Permission + add the tests suites to it.

* Schema Remove functionality Permission and Test Suites + creation of the ActionDropdownItem for Actions

* Topic Edit Clear and delete Topic , Permissions with test suites

* ActionsCell For Topic Message Overview for permissions with tests suites

* Connector Delete , Consumer Groups Permission + writing test suites

* Add Permissions to the Topics ActionCell

* Topic Table Permissions Tests Suites

* Headless Logic for the Permission Part

* add documentation for the headless Part of the permission + add modification of the data version 2 for efficient algorithmic lookup

* replace modify data logic and isPermitted function to have faster access to the data

* Add Permission helpers tests suites

* usePermission hook test suites

* BatchActionsBar add Permissions + minor modification in TopicTable tests suites

* Statistics and Metrics code Permission + add test suites

* Recreate Topic Permissions in the Topic page, add tests suites

* Actions for the Connector components

* Messages NavLink View Permission

* Test suites messages code modifications

* Permissions comment code modifications

* Replacing the Mock Data With the actual code

* Add ActionNavLink test suites

* BatchActionsBar code smell modifications

* maximizing the permissions tests suites

* maximizing the permissions tests suites

* maximizing the permissions tests suites

* Tooltip code refactoring and fix the positions issue

* permissions increase the tests coverage

* add user info at the navigation header and tests suites

* Add Global Schema Selector Permissions with test suites

* Roles minor code removal

* Change the Action Component form hook mixin approach to declarative props approach

* add isPermitted function for multiple Actions , adding tests suites for this particular case

* remove redundant Permissions test blocks from the components

* remove redundant Permissions test blocks from the components

* Action Buttons test suites' coverage + generalizing the code of the Actions

* add invalid Permission check in Action Components tests suites

* Modularization of Actions Components

* Modularization of Actions Components by adding DropDownAction to it.

* Reflect the BE Changes to the UI , by changing the default behavior or the testing of roles.

* Reflect the BE Changes to the UI , by changing the default behavior or the testing of roles.

* Get rid of not necessary usePermission mocks

* Modifications in the UserInfo data , to consider the UI without any login functionality

* minor code modifications in the BatchActionBar component

* change the Query key for the user info

* change the default message for the tooltip

* Fix the Create Role Access for Topics and Schemas

* ListPage Connector create permissions

* add Headless logic for Create Permission with test suites. + add react hook render-er

* Create Button ActionButton logic implementation

* Remove Code smells , by removing the duplications

* increase the test suites for isPermittedToCreate logic

* increase the test suites for isPermittedToCreate logic

* Change the UserResourceType Enum with the new value

* Apply New Resource Creation validation, for Topic, Schema, Connector

* Apply New Resource Creation validation, for Topic, Schema, Connector

* minor code refactor modifications

* minor code modification in the topics useCreate hook

* Async Validation for all the Create Pages

* caching test for optimal performance in async validation schemas

* Reverting the Front End Validation

* Reverting the Front End Validation

* Authorization API minor syntax modifications

* fix SmokeTests

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>

Co-authored-by: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .editorconfig                                 |   5 +
 README.md                                     |   1 +
 kafka-ui-api/pom.xml                          |   1 +
 .../ui/config/auth/AuthenticatedUser.java     |   8 +
 .../auth/CognitoOAuthSecurityConfig.java      |  80 ---
 .../kafka/ui/config/auth/OAuthProperties.java |  43 ++
 .../config/auth/OAuthPropertiesConverter.java |  68 ++
 .../ui/config/auth/OAuthSecurityConfig.java   | 137 ++--
 .../kafka/ui/config/auth/RbacOAuth2User.java  |  30 +
 .../kafka/ui/config/auth/RbacOidcUser.java    |  47 ++
 .../kafka/ui/config/auth/RbacUser.java        |  10 +
 .../RoleBasedAccessControlProperties.java     |  23 +
 .../auth/condition/CognitoCondition.java      |  13 +
 .../logout/CognitoLogoutSuccessHandler.java}  |  28 +-
 .../auth/logout/LogoutSuccessHandler.java     |  15 +
 .../logout/OAuthLogoutSuccessHandler.java     |  46 ++
 .../config/auth/props/CognitoProperties.java  |  44 --
 .../kafka/ui/controller/AccessController.java |  80 +++
 .../ui/controller/BrokersController.java      |  95 ++-
 .../ui/controller/ClustersController.java     |  50 +-
 .../controller/ConsumerGroupsController.java  | 196 ++++--
 .../ui/controller/KafkaConnectController.java | 166 ++++-
 .../kafka/ui/controller/KsqlController.java   |  52 +-
 .../ui/controller/MessagesController.java     |  81 ++-
 .../ui/controller/SchemasController.java      | 180 ++++--
 .../kafka/ui/controller/TopicsController.java | 244 +++++--
 .../kafka/ui/exception/ErrorCode.java         |   2 +
 .../kafka/ui/model/rbac/AccessContext.java    | 134 ++++
 .../kafka/ui/model/rbac/Permission.java       |  72 +++
 .../kafka/ui/model/rbac/Resource.java         |  21 +
 .../provectus/kafka/ui/model/rbac/Role.java   |  19 +
 .../kafka/ui/model/rbac/Subject.java          |  24 +
 .../rbac/permission/ClusterConfigAction.java  |  18 +
 .../model/rbac/permission/ConnectAction.java  |  19 +
 .../rbac/permission/ConsumerGroupAction.java  |  20 +
 .../ui/model/rbac/permission/KsqlAction.java  |  15 +
 .../rbac/permission/PermissibleAction.java    |   4 +
 .../model/rbac/permission/SchemaAction.java   |  21 +
 .../ui/model/rbac/permission/TopicAction.java |  24 +
 .../ui/model/rbac/provider/Provider.java      |  27 +
 .../JsonSchemaSchemaRegistrySerializer.java   |   2 +-
 .../kafka/ui/service/ClusterService.java      |   1 +
 .../ui/service/ConsumerGroupService.java      |  16 +-
 .../kafka/ui/service/KafkaConnectService.java |  15 +-
 .../kafka/ui/service/ReactiveAdminClient.java |   2 +-
 .../ui/service/SchemaRegistryService.java     |  66 +-
 .../kafka/ui/service/TopicsService.java       |   8 +-
 .../rbac/AbstractProviderCondition.java       |  31 +
 .../ui/service/rbac/AccessControlService.java | 398 ++++++++++++
 .../extractor/CognitoAuthorityExtractor.java  |  70 ++
 .../extractor/GithubAuthorityExtractor.java   |  99 +++
 .../extractor/GoogleAuthorityExtractor.java   |  69 ++
 .../extractor/LdapAuthorityExtractor.java     |  23 +
 .../extractor/OauthAuthorityExtractor.java    |  31 +
 .../extractor/ProviderAuthorityExtractor.java |  14 +
 .../KafkaClientInternalsDependant.java        |   2 +-
 .../src/main/resources/application-local.yml  |  22 +-
 .../service/SchemaRegistryPaginationTest.java |  70 +-
 .../service/TopicsServicePaginationTest.java  |   8 +-
 .../ui/util/AccessControlServiceMock.java     |  23 +
 .../main/resources/swagger/kafka-ui-api.yaml  |  88 ++-
 .../provectus/kafka/ui/pages/TopPanel.java    |   4 +-
 .../src/components/App.styled.ts              | 245 +------
 kafka-ui-react-app/src/components/App.tsx     | 147 ++---
 .../Brokers/Broker/Configs/InputCell.tsx      |  11 +-
 .../Connect/Details/Actions/Actions.tsx       |  79 ++-
 .../src/components/Connect/List/ListPage.tsx  |  12 +-
 .../src/components/Connect/New/New.tsx        |   2 +-
 .../Connect/New/__tests__/New.spec.tsx        |   3 +-
 .../ConsumerGroups/Details/Details.tsx        |  30 +-
 .../src/components/KsqlDb/List/List.tsx       |  17 +-
 .../KsqlDb/List/__test__/List.spec.tsx        |   9 +-
 .../src/components/NavBar/NavBar.styled.ts    | 146 +++++
 .../src/components/NavBar/NavBar.tsx          |  60 ++
 .../NavBar/UserInfo/UserInfo.styled.ts        |  19 +
 .../components/NavBar/UserInfo/UserInfo.tsx   |  35 +
 .../UserInfo/__tests__/UserInfo.spec.tsx      |  44 ++
 .../NavBar/__tests__/NavBar.spec.tsx          |  28 +
 .../PageContainer/PageContainer.styled.ts     |  88 +++
 .../PageContainer/PageContainer.tsx           |  41 ++
 .../__tests__/PageContainer.spec.tsx          |  47 ++
 .../components/Schemas/Details/Details.tsx    |  25 +-
 .../GlobalSchemaSelector.tsx                  |  14 +-
 .../src/components/Schemas/List/List.tsx      |  12 +-
 .../src/components/Schemas/New/New.tsx        |  43 +-
 .../components/Topics/List/ActionsCell.tsx    |  23 +-
 .../Topics/List/BatchActionsBar.tsx           |  44 +-
 .../src/components/Topics/List/ListPage.tsx   |  11 +-
 .../Topics/List/__tests__/ListPage.spec.tsx   |  31 +-
 .../Topics/List/__tests__/TopicTable.spec.tsx |   4 +-
 .../src/components/Topics/New/New.tsx         |   8 +-
 .../Topics/New/__test__/New.spec.tsx          |   3 +-
 .../Topics/Topic/Overview/ActionsCell.tsx     |  17 +-
 .../Topics/Topic/Statistics/Metrics.tsx       |  21 +-
 .../Topics/Topic/Statistics/Statistics.tsx    |  12 +-
 .../Statistics/__test__/Statistics.spec.tsx   |   8 +-
 .../src/components/Topics/Topic/Topic.tsx     |  79 ++-
 .../src/components/__tests__/App.spec.tsx     |  44 +-
 .../ActionButton/ActionButton.tsx             |  18 +
 .../ActionCanButton/ActionCanButton.tsx       |  48 ++
 .../__tests__/ActionCanButton.spec.tsx        |  56 ++
 .../ActionCreateButton/ActionCreateButton.tsx |  15 +
 .../__tests__/ActionCreateButton.spec.tsx     |  98 +++
 .../ActionPermissionButton.tsx                |  19 +
 .../__tests__/ActionPermissionButton.spec.tsx |  98 +++
 .../__tests__/ActionButton.spec.tsx           |  48 ++
 .../ActionComponent/ActionComponent.styled.ts |  22 +
 .../common/ActionComponent/ActionComponent.ts |  16 +
 .../ActionDropDownItem/ActionDropdownItem.tsx |  60 ++
 .../ActionNavLink/ActionNavLink.tsx           |  62 ++
 .../__tests__/ActionNavLink.spec.tsx          |  93 +++
 .../ActionSelect/ActionSelect.tsx             |  55 ++
 .../__tests__/ActionSelect.spec.tsx           |  73 +++
 .../ActionComponent/__tests__/fixtures.ts     |  41 ++
 .../common/ActionComponent/index.ts           |  13 +
 .../components/common/Button/Button.styled.ts |   2 +-
 .../src/components/common/Button/Button.tsx   |   2 +-
 .../common/Dropdown/Dropdown.styled.ts        |   2 +-
 .../common/Dropdown/DropdownItem.tsx          |  56 +-
 .../common/Icons/DropdownArrowIcon.tsx        |  10 +-
 .../src/components/common/Icons/UserIcon.tsx  |  22 +
 .../common/Navigation/Navbar.styled.ts        |   7 +-
 .../contexts/UserInfoRolesAccessContext.tsx   |  39 ++
 .../src/lib/__test__/permission.spec.ts       | 604 ++++++++++++++++++
 kafka-ui-react-app/src/lib/api.ts             |   2 +
 kafka-ui-react-app/src/lib/errorHandling.tsx  |   2 +-
 .../src/lib/hooks/__tests__/fixtures.ts       |  33 +
 .../__tests__/useCreatePermission.spec.tsx    | 117 ++++
 .../hooks/__tests__/usePermission.spec.tsx    | 122 ++++
 .../src/lib/hooks/api/kafkaConnect.ts         |  15 +-
 kafka-ui-react-app/src/lib/hooks/api/roles.ts |  11 +
 .../src/lib/hooks/api/topics.ts               |  14 +-
 .../src/lib/hooks/useActionTooltip.ts         |  36 ++
 .../src/lib/hooks/useCreatePermisson.ts       |  14 +
 .../src/lib/hooks/usePermission.ts            |  17 +
 .../src/lib/hooks/useUserInfo.ts              |   6 +
 kafka-ui-react-app/src/lib/permissions.ts     | 151 +++++
 kafka-ui-react-app/src/lib/testHelpers.tsx    |  58 +-
 kafka-ui-react-app/src/lib/yupExtended.ts     |  24 +-
 kafka-ui-react-app/src/theme/theme.ts         |   1 +
 pom.xml                                       |   2 +-
 141 files changed, 5771 insertions(+), 1120 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AuthenticatedUser.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/CognitoOAuthSecurityConfig.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOAuth2User.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOidcUser.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacUser.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RoleBasedAccessControlProperties.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/CognitoCondition.java
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/{CognitoOidcLogoutSuccessHandler.java => auth/logout/CognitoLogoutSuccessHandler.java} (61%)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/LogoutSuccessHandler.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/OAuthLogoutSuccessHandler.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/props/CognitoProperties.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Role.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Subject.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ClusterConfigAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConsumerGroupAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/KsqlAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/SchemaAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/TopicAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/provider/Provider.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AbstractProviderCondition.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GoogleAuthorityExtractor.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/LdapAuthorityExtractor.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/OauthAuthorityExtractor.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/ProviderAuthorityExtractor.java
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/{annotations => annotation}/KafkaClientInternalsDependant.java (82%)
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java
 create mode 100644 kafka-ui-react-app/src/components/NavBar/NavBar.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/NavBar/NavBar.tsx
 create mode 100644 kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
 create mode 100644 kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/NavBar/__tests__/NavBar.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/PageContainer/PageContainer.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
 create mode 100644 kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionButton.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCanButton/ActionCanButton.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCanButton/__tests__/ActionCanButton.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCreateButton/ActionCreateButton.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCreateButton/__tests__/ActionCreateButton.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionPermissionButton/ActionPermissionButton.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionPermissionButton/__tests__/ActionPermissionButton.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/__tests__/ActionButton.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.ts
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionDropDownItem/ActionDropdownItem.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionNavLink/ActionNavLink.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionNavLink/__tests__/ActionNavLink.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionSelect/ActionSelect.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/ActionSelect/__tests__/ActionSelect.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts
 create mode 100644 kafka-ui-react-app/src/components/common/ActionComponent/index.ts
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/UserIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/contexts/UserInfoRolesAccessContext.tsx
 create mode 100644 kafka-ui-react-app/src/lib/__test__/permission.spec.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/__tests__/fixtures.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/__tests__/useCreatePermission.spec.tsx
 create mode 100644 kafka-ui-react-app/src/lib/hooks/__tests__/usePermission.spec.tsx
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/roles.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useActionTooltip.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useCreatePermisson.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/usePermission.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/useUserInfo.ts
 create mode 100644 kafka-ui-react-app/src/lib/permissions.ts

diff --git a/.editorconfig b/.editorconfig
index 78be62990be..4e23fc5467f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -279,3 +279,8 @@ ij_java_wrap_long_lines = false
 insert_final_newline = false
 trim_trailing_whitespace = false
 
+[*.yaml]
+indent_size = 2
+[*.yml]
+indent_size = 2
+
diff --git a/README.md b/README.md
index f7c67deae64..c54e0cb3c19 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ the cloud.
 * **Dynamic Topic Configuration** — create and configure new topics with dynamic configuration
 * **Configurable Authentification** — secure your installation with optional Github/Gitlab/Google OAuth 2.0
 * **Custom serialization/deserialization plugins** - use a ready-to-go serde for your data like AWS Glue or Smile, or code your own!
+* **Role based access control** - manage permissions to access the UI with granular precision
 
 # The Interface
 UI for Apache Kafka wraps major functions of Apache Kafka with an intuitive user interface.
diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index c7e850fe953..87640206932 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -306,6 +306,7 @@
                         </configuration>
                     </execution>
                 </executions>
+
             </plugin>
             <plugin>
                 <groupId>org.antlr</groupId>
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AuthenticatedUser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AuthenticatedUser.java
new file mode 100644
index 00000000000..bb69e2ddcd8
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AuthenticatedUser.java
@@ -0,0 +1,8 @@
+package com.provectus.kafka.ui.config.auth;
+
+import java.util.Collection;
+import lombok.Value;
+
+public record AuthenticatedUser(String principal, Collection<String> groups) {
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/CognitoOAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/CognitoOAuthSecurityConfig.java
deleted file mode 100644
index 9db66e142d7..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/CognitoOAuthSecurityConfig.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.provectus.kafka.ui.config.auth;
-
-import com.provectus.kafka.ui.config.CognitoOidcLogoutSuccessHandler;
-import com.provectus.kafka.ui.config.auth.props.CognitoProperties;
-import java.util.Optional;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
-import org.springframework.security.config.web.server.ServerHttpSecurity;
-import org.springframework.security.oauth2.client.registration.ClientRegistration;
-import org.springframework.security.oauth2.client.registration.ClientRegistrations;
-import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository;
-import org.springframework.security.web.server.SecurityWebFilterChain;
-import org.springframework.security.web.server.authentication.logout.ServerLogoutSuccessHandler;
-
-@Configuration
-@EnableWebFluxSecurity
-@ConditionalOnProperty(value = "auth.type", havingValue = "OAUTH2_COGNITO")
-@RequiredArgsConstructor
-@Slf4j
-public class CognitoOAuthSecurityConfig extends AbstractAuthSecurityConfig {
-
-  private static final String COGNITO = "cognito";
-
-  @Bean
-  public SecurityWebFilterChain configure(ServerHttpSecurity http, CognitoProperties props) {
-    log.info("Configuring Cognito OAUTH2 authentication.");
-
-    String clientId = props.getClientId();
-    String logoutUrl = props.getLogoutUri();
-
-    final ServerLogoutSuccessHandler logoutHandler = new CognitoOidcLogoutSuccessHandler(logoutUrl, clientId);
-
-    return http.authorizeExchange()
-        .pathMatchers(AUTH_WHITELIST)
-        .permitAll()
-        .anyExchange()
-        .authenticated()
-
-        .and()
-        .oauth2Login()
-
-        .and()
-        .oauth2Client()
-
-        .and()
-        .logout()
-        .logoutSuccessHandler(logoutHandler)
-
-        .and()
-        .csrf().disable()
-        .build();
-  }
-
-  @Bean
-  public InMemoryReactiveClientRegistrationRepository clientRegistrationRepository(CognitoProperties props) {
-    ClientRegistration.Builder builder = ClientRegistrations
-        .fromIssuerLocation(props.getIssuerUri())
-        .registrationId(COGNITO);
-
-    builder.clientId(props.getClientId());
-    builder.clientSecret(props.getClientSecret());
-
-    Optional.ofNullable(props.getScope()).ifPresent(builder::scope);
-    Optional.ofNullable(props.getUserNameAttribute()).ifPresent(builder::userNameAttributeName);
-
-    return new InMemoryReactiveClientRegistrationRepository(builder.build());
-  }
-
-  @Bean
-  @ConfigurationProperties("auth.cognito")
-  public CognitoProperties cognitoProperties() {
-    return new CognitoProperties();
-  }
-
-}
\ No newline at end of file
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
new file mode 100644
index 00000000000..f79d217fa79
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
@@ -0,0 +1,43 @@
+package com.provectus.kafka.ui.config.auth;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.PostConstruct;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.util.Assert;
+
+@ConfigurationProperties("auth.oauth2")
+@Data
+public class OAuthProperties {
+  private Map<String, OAuth2Provider> client = new HashMap<>();
+
+  @PostConstruct
+  public void validate() {
+    getClient().values().forEach(this::validateProvider);
+  }
+
+  private void validateProvider(final OAuth2Provider provider) {
+    Assert.hasText(provider.getClientId(), "Client id must not be empty.");
+    Assert.hasText(provider.getProvider(), "Provider name must not be empty");
+  }
+
+  @Data
+  public static class OAuth2Provider {
+    private String provider;
+    private String clientId;
+    private String clientSecret;
+    private String clientName;
+    private String redirectUri;
+    private String authorizationGrantType;
+    private Set<String> scope;
+    private String issuerUri;
+    private String authorizationUri;
+    private String tokenUri;
+    private String userInfoUri;
+    private String jwkSetUri;
+    private String userNameAttribute;
+    private Map<String, String> customParams;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
new file mode 100644
index 00000000000..8fffbfb6997
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
@@ -0,0 +1,68 @@
+package com.provectus.kafka.ui.config.auth;
+
+import static com.provectus.kafka.ui.config.auth.OAuthProperties.OAuth2Provider;
+import static org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties.Provider;
+import static org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties.Registration;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class OAuthPropertiesConverter {
+
+  private static final String TYPE = "type";
+  private static final String GOOGLE = "google";
+
+  public static OAuth2ClientProperties convertProperties(final OAuthProperties properties) {
+    final var result = new OAuth2ClientProperties();
+    properties.getClient().forEach((key, provider) -> {
+      var registration = new Registration();
+      registration.setClientId(provider.getClientId());
+      registration.setClientSecret(provider.getClientSecret());
+      registration.setClientName(provider.getClientName());
+      registration.setScope(provider.getScope());
+      registration.setRedirectUri(provider.getRedirectUri());
+      registration.setAuthorizationGrantType(provider.getAuthorizationGrantType());
+
+      result.getRegistration().put(key, registration);
+
+      var clientProvider = new Provider();
+      applyCustomTransformations(provider);
+
+      clientProvider.setAuthorizationUri(provider.getAuthorizationUri());
+      clientProvider.setIssuerUri(provider.getIssuerUri());
+      clientProvider.setJwkSetUri(provider.getJwkSetUri());
+      clientProvider.setTokenUri(provider.getTokenUri());
+      clientProvider.setUserInfoUri(provider.getUserInfoUri());
+      clientProvider.setUserNameAttribute(provider.getUserNameAttribute());
+
+      result.getProvider().put(key, clientProvider);
+    });
+    return result;
+  }
+
+  private static void applyCustomTransformations(OAuth2Provider provider) {
+    applyGoogleTransformations(provider);
+  }
+
+  private static void applyGoogleTransformations(OAuth2Provider provider) {
+    if (!isGoogle(provider)) {
+      return;
+    }
+
+    String allowedDomain = provider.getCustomParams().get("allowedDomain");
+    if (StringUtils.isEmpty(allowedDomain)) {
+      return;
+    }
+
+    final String newUri = provider.getAuthorizationUri() + "?hd=" + allowedDomain;
+    provider.setAuthorizationUri(newUri);
+  }
+
+  private static boolean isGoogle(OAuth2Provider provider) {
+    return provider.getCustomParams().get(TYPE).equalsIgnoreCase(GOOGLE);
+  }
+}
+
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
index 657cab26449..1d237e01736 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
@@ -1,66 +1,131 @@
 package com.provectus.kafka.ui.config.auth;
 
-import lombok.AllArgsConstructor;
+import com.provectus.kafka.ui.config.auth.logout.OAuthLogoutSuccessHandler;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import com.provectus.kafka.ui.service.rbac.extractor.ProviderAuthorityExtractor;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.ApplicationContext;
+import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
+import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientPropertiesRegistrationAdapter;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcReactiveOAuth2UserService;
+import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
+import org.springframework.security.oauth2.client.oidc.web.server.logout.OidcClientInitiatedServerLogoutSuccessHandler;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository;
+import org.springframework.security.oauth2.client.registration.ReactiveClientRegistrationRepository;
+import org.springframework.security.oauth2.client.userinfo.DefaultReactiveOAuth2UserService;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
+import org.springframework.security.oauth2.client.userinfo.ReactiveOAuth2UserService;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.server.SecurityWebFilterChain;
-import org.springframework.util.ClassUtils;
+import org.springframework.security.web.server.authentication.logout.ServerLogoutSuccessHandler;
+import reactor.core.publisher.Mono;
 
 @Configuration
-@EnableWebFluxSecurity
 @ConditionalOnProperty(value = "auth.type", havingValue = "OAUTH2")
-@AllArgsConstructor
+@EnableConfigurationProperties(OAuthProperties.class)
+@EnableWebFluxSecurity
+@EnableReactiveMethodSecurity
+@RequiredArgsConstructor
 @Log4j2
 public class OAuthSecurityConfig extends AbstractAuthSecurityConfig {
 
-  public static final String REACTIVE_CLIENT_REGISTRATION_REPOSITORY_CLASSNAME =
-      "org.springframework.security.oauth2.client.registration."
-          + "ReactiveClientRegistrationRepository";
-
-  private static final boolean IS_OAUTH2_PRESENT = ClassUtils.isPresent(
-      REACTIVE_CLIENT_REGISTRATION_REPOSITORY_CLASSNAME,
-      OAuthSecurityConfig.class.getClassLoader()
-  );
-
-  private final ApplicationContext context;
+  private final OAuthProperties properties;
 
   @Bean
-  public SecurityWebFilterChain configure(ServerHttpSecurity http) {
+  public SecurityWebFilterChain configure(ServerHttpSecurity http, OAuthLogoutSuccessHandler logoutHandler) {
     log.info("Configuring OAUTH2 authentication.");
-    http.authorizeExchange()
+
+    return http.authorizeExchange()
         .pathMatchers(AUTH_WHITELIST)
         .permitAll()
         .anyExchange()
-        .authenticated();
+        .authenticated()
+
+        .and()
+        .oauth2Login()
+
+        .and()
+        .logout()
+        .logoutSuccessHandler(logoutHandler)
+
+        .and()
+        .csrf().disable()
+        .build();
+  }
+
+  @Bean
+  public ReactiveOAuth2UserService<OidcUserRequest, OidcUser> customOidcUserService(AccessControlService acs) {
+    final OidcReactiveOAuth2UserService delegate = new OidcReactiveOAuth2UserService();
+    return request -> delegate.loadUser(request)
+        .flatMap(user -> {
+          String providerId = request.getClientRegistration().getRegistrationId();
+          final var extractor = getExtractor(providerId, acs);
+          if (extractor == null) {
+            return Mono.just(user);
+          }
 
-    if (IS_OAUTH2_PRESENT && OAuth2ClasspathGuard.shouldConfigure(this.context)) {
-      OAuth2ClasspathGuard.configure(http);
-    }
+          return extractor.extract(acs, user, Map.of("request", request))
+              .map(groups -> new RbacOidcUser(user, groups));
+        });
+  }
+
+  @Bean
+  public ReactiveOAuth2UserService<OAuth2UserRequest, OAuth2User> customOauth2UserService(AccessControlService acs) {
+    final DefaultReactiveOAuth2UserService delegate = new DefaultReactiveOAuth2UserService();
+    return request -> delegate.loadUser(request)
+        .flatMap(user -> {
+          String providerId = request.getClientRegistration().getRegistrationId();
+          final var extractor = getExtractor(providerId, acs);
+          if (extractor == null) {
+            return Mono.just(user);
+          }
 
-    return http.csrf().disable().build();
+          return extractor.extract(acs, user, Map.of("request", request))
+              .map(groups -> new RbacOAuth2User(user, groups));
+        });
   }
 
-  private static class OAuth2ClasspathGuard {
-    static void configure(ServerHttpSecurity http) {
-      http
-          .oauth2Login()
-          .and()
-          .oauth2Client();
-    }
-
-    static boolean shouldConfigure(ApplicationContext context) {
-      ClassLoader loader = context.getClassLoader();
-      Class<?> reactiveClientRegistrationRepositoryClass =
-          ClassUtils.resolveClassName(REACTIVE_CLIENT_REGISTRATION_REPOSITORY_CLASSNAME, loader);
-      return context.getBeanNamesForType(reactiveClientRegistrationRepositoryClass).length == 1;
-    }
+  @Bean
+  public InMemoryReactiveClientRegistrationRepository clientRegistrationRepository() {
+    final OAuth2ClientProperties props = OAuthPropertiesConverter.convertProperties(properties);
+    final List<ClientRegistration> registrations =
+        new ArrayList<>(OAuth2ClientPropertiesRegistrationAdapter.getClientRegistrations(props).values());
+    return new InMemoryReactiveClientRegistrationRepository(registrations);
   }
 
+  @Bean
+  public ServerLogoutSuccessHandler defaultOidcLogoutHandler(final ReactiveClientRegistrationRepository repository) {
+    return new OidcClientInitiatedServerLogoutSuccessHandler(repository);
+  }
+
+  @Nullable
+  private ProviderAuthorityExtractor getExtractor(final String providerId, AccessControlService acs) {
+    final String provider = getProviderByProviderId(providerId);
+    Optional<ProviderAuthorityExtractor> extractor = acs.getExtractors()
+        .stream()
+        .filter(e -> e.isApplicable(provider))
+        .findFirst();
+
+    return extractor.orElse(null);
+  }
+
+  private String getProviderByProviderId(final String providerId) {
+    return properties.getClient().get(providerId).getProvider();
+  }
 
 }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOAuth2User.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOAuth2User.java
new file mode 100644
index 00000000000..79f3055413e
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOAuth2User.java
@@ -0,0 +1,30 @@
+package com.provectus.kafka.ui.config.auth;
+
+import java.util.Collection;
+import java.util.Map;
+import lombok.Value;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+
+public record RbacOAuth2User(OAuth2User user, Collection<String> groups) implements RbacUser, OAuth2User {
+
+  @Override
+  public Map<String, Object> getAttributes() {
+    return user.getAttributes();
+  }
+
+  @Override
+  public Collection<? extends GrantedAuthority> getAuthorities() {
+    return user.getAuthorities();
+  }
+
+  @Override
+  public String getName() {
+    return user.getName();
+  }
+
+  @Override
+  public String name() {
+    return user.getName();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOidcUser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOidcUser.java
new file mode 100644
index 00000000000..2ecab7343f3
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOidcUser.java
@@ -0,0 +1,47 @@
+package com.provectus.kafka.ui.config.auth;
+
+import java.util.Collection;
+import java.util.Map;
+import lombok.Value;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.core.oidc.OidcIdToken;
+import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+
+public record RbacOidcUser(OidcUser user, Collection<String> groups) implements RbacUser, OidcUser {
+
+  @Override
+  public Map<String, Object> getClaims() {
+    return user.getClaims();
+  }
+
+  @Override
+  public OidcUserInfo getUserInfo() {
+    return user.getUserInfo();
+  }
+
+  @Override
+  public OidcIdToken getIdToken() {
+    return user.getIdToken();
+  }
+
+  @Override
+  public Map<String, Object> getAttributes() {
+    return user.getAttributes();
+  }
+
+  @Override
+  public Collection<? extends GrantedAuthority> getAuthorities() {
+    return user.getAuthorities();
+  }
+
+  @Override
+  public String getName() {
+    return user.getName();
+  }
+
+  @Override
+  public String name() {
+    return user.getName();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacUser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacUser.java
new file mode 100644
index 00000000000..f3229f37a47
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacUser.java
@@ -0,0 +1,10 @@
+package com.provectus.kafka.ui.config.auth;
+
+import java.util.Collection;
+
+public interface RbacUser {
+  String name();
+
+  Collection<String> groups();
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RoleBasedAccessControlProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RoleBasedAccessControlProperties.java
new file mode 100644
index 00000000000..cf1cdb5b704
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RoleBasedAccessControlProperties.java
@@ -0,0 +1,23 @@
+package com.provectus.kafka.ui.config.auth;
+
+import com.provectus.kafka.ui.model.rbac.Role;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.PostConstruct;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("rbac")
+public class RoleBasedAccessControlProperties {
+
+  private final List<Role> roles = new ArrayList<>();
+
+  @PostConstruct
+  public void init() {
+    roles.forEach(Role::validate);
+  }
+
+  public List<Role> getRoles() {
+    return roles;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/CognitoCondition.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/CognitoCondition.java
new file mode 100644
index 00000000000..dc56195ecc9
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/CognitoCondition.java
@@ -0,0 +1,13 @@
+package com.provectus.kafka.ui.config.auth.condition;
+
+import com.provectus.kafka.ui.service.rbac.AbstractProviderCondition;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+public class CognitoCondition extends AbstractProviderCondition implements Condition {
+  @Override
+  public boolean matches(final ConditionContext context, final AnnotatedTypeMetadata metadata) {
+    return getRegisteredProvidersTypes(context.getEnvironment()).stream().anyMatch(a -> a.equalsIgnoreCase("cognito"));
+  }
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CognitoOidcLogoutSuccessHandler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java
similarity index 61%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CognitoOidcLogoutSuccessHandler.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java
index 52e366f3abf..3d725c659df 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CognitoOidcLogoutSuccessHandler.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java
@@ -1,27 +1,34 @@
-package com.provectus.kafka.ui.config;
+package com.provectus.kafka.ui.config.auth.logout;
 
+import com.provectus.kafka.ui.config.auth.OAuthProperties;
+import com.provectus.kafka.ui.config.auth.condition.CognitoCondition;
+import com.provectus.kafka.ui.model.rbac.provider.Provider;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.server.WebFilterExchange;
-import org.springframework.security.web.server.authentication.logout.ServerLogoutSuccessHandler;
 import org.springframework.security.web.util.UrlUtils;
+import org.springframework.stereotype.Component;
 import org.springframework.web.server.WebSession;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
 import reactor.core.publisher.Mono;
 
-@RequiredArgsConstructor
-public class CognitoOidcLogoutSuccessHandler implements ServerLogoutSuccessHandler {
+@Component
+@Conditional(CognitoCondition.class)
+public class CognitoLogoutSuccessHandler implements LogoutSuccessHandler {
 
-  private final String logoutUrl;
-  private final String clientId;
+  @Override
+  public boolean isApplicable(String provider) {
+    return Provider.Name.COGNITO.equalsIgnoreCase(provider);
+  }
 
   @Override
-  public Mono<Void> onLogoutSuccess(final WebFilterExchange exchange, final Authentication authentication) {
+  public Mono<Void> handle(WebFilterExchange exchange, Authentication authentication,
+                           OAuthProperties.OAuth2Provider provider) {
     final ServerHttpResponse response = exchange.getExchange().getResponse();
     response.setStatusCode(HttpStatus.FOUND);
 
@@ -39,8 +46,8 @@ public Mono<Void> onLogoutSuccess(final WebFilterExchange exchange, final Authen
         .build();
 
     final var uri = UriComponentsBuilder
-        .fromUri(URI.create(logoutUrl))
-        .queryParam("client_id", clientId)
+        .fromUri(URI.create(provider.getCustomParams().get("logoutUrl")))
+        .queryParam("client_id", provider.getClientId())
         .queryParam("logout_uri", baseUrl)
         .encode(StandardCharsets.UTF_8)
         .build()
@@ -49,5 +56,6 @@ public Mono<Void> onLogoutSuccess(final WebFilterExchange exchange, final Authen
     response.getHeaders().setLocation(uri);
     return exchange.getExchange().getSession().flatMap(WebSession::invalidate);
   }
+
 }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/LogoutSuccessHandler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/LogoutSuccessHandler.java
new file mode 100644
index 00000000000..6a2d90b1342
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/LogoutSuccessHandler.java
@@ -0,0 +1,15 @@
+package com.provectus.kafka.ui.config.auth.logout;
+
+import com.provectus.kafka.ui.config.auth.OAuthProperties;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.server.WebFilterExchange;
+import reactor.core.publisher.Mono;
+
+public interface LogoutSuccessHandler {
+
+  boolean isApplicable(final String provider);
+
+  Mono<Void> handle(final WebFilterExchange exchange,
+                    final Authentication authentication,
+                    final OAuthProperties.OAuth2Provider provider);
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/OAuthLogoutSuccessHandler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/OAuthLogoutSuccessHandler.java
new file mode 100644
index 00000000000..a2b6a8abbc6
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/OAuthLogoutSuccessHandler.java
@@ -0,0 +1,46 @@
+package com.provectus.kafka.ui.config.auth.logout;
+
+import com.provectus.kafka.ui.config.auth.OAuthProperties;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
+import org.springframework.security.web.server.WebFilterExchange;
+import org.springframework.security.web.server.authentication.logout.ServerLogoutSuccessHandler;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+@Component
+@ConditionalOnProperty(value = "auth.type", havingValue = "OAUTH2")
+public class OAuthLogoutSuccessHandler implements ServerLogoutSuccessHandler {
+  private final OAuthProperties properties;
+  private final List<LogoutSuccessHandler> logoutSuccessHandlers;
+  private final ServerLogoutSuccessHandler defaultOidcLogoutHandler;
+
+  public OAuthLogoutSuccessHandler(final OAuthProperties properties,
+                                   final List<LogoutSuccessHandler> logoutSuccessHandlers,
+                                   final @Qualifier("defaultOidcLogoutHandler") ServerLogoutSuccessHandler handler) {
+    this.properties = properties;
+    this.logoutSuccessHandlers = logoutSuccessHandlers;
+    this.defaultOidcLogoutHandler = handler;
+  }
+
+  @Override
+  public Mono<Void> onLogoutSuccess(final WebFilterExchange exchange,
+                                    final Authentication authentication) {
+    final OAuth2AuthenticationToken oauthToken = (OAuth2AuthenticationToken) authentication;
+    final String providerId = oauthToken.getAuthorizedClientRegistrationId();
+    final OAuthProperties.OAuth2Provider oAuth2Provider = properties.getClient().get(providerId);
+    return getLogoutHandler(oAuth2Provider.getProvider())
+        .map(handler -> handler.handle(exchange, authentication, oAuth2Provider))
+        .orElseGet(() -> defaultOidcLogoutHandler.onLogoutSuccess(exchange, authentication));
+  }
+
+  private Optional<LogoutSuccessHandler> getLogoutHandler(final String provider) {
+    return logoutSuccessHandlers.stream()
+        .filter(h -> h.isApplicable(provider))
+        .findFirst();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/props/CognitoProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/props/CognitoProperties.java
deleted file mode 100644
index 4eb4508b97e..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/props/CognitoProperties.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.provectus.kafka.ui.config.auth.props;
-
-import lombok.Data;
-import lombok.ToString;
-import org.jetbrains.annotations.Nullable;
-
-@Data
-@ToString(exclude = "clientSecret")
-public class CognitoProperties {
-
-  String clientId;
-  String logoutUri;
-  String issuerUri;
-  String clientSecret;
-  @Nullable
-  String scope;
-  @Nullable
-  String userNameAttribute;
-
-  public String getClientId() {
-    return clientId;
-  }
-
-  public String getLogoutUri() {
-    return logoutUri;
-  }
-
-  public String getIssuerUri() {
-    return issuerUri;
-  }
-
-  public String getClientSecret() {
-    return clientSecret;
-  }
-
-  public @Nullable String getScope() {
-    return scope;
-  }
-
-  public @Nullable String getUserNameAttribute() {
-    return userNameAttribute;
-  }
-
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
new file mode 100644
index 00000000000..131a37982a3
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
@@ -0,0 +1,80 @@
+package com.provectus.kafka.ui.controller;
+
+import com.provectus.kafka.ui.api.AuthorizationApi;
+import com.provectus.kafka.ui.model.ActionDTO;
+import com.provectus.kafka.ui.model.AuthenticationInfoDTO;
+import com.provectus.kafka.ui.model.ResourceTypeDTO;
+import com.provectus.kafka.ui.model.UserInfoDTO;
+import com.provectus.kafka.ui.model.UserPermissionDTO;
+import com.provectus.kafka.ui.model.rbac.Permission;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.security.Principal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.context.ReactiveSecurityContextHolder;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequiredArgsConstructor
+public class AccessController implements AuthorizationApi {
+
+  private final AccessControlService accessControlService;
+
+  public Mono<ResponseEntity<AuthenticationInfoDTO>> getUserAuthInfo(ServerWebExchange exchange) {
+    AuthenticationInfoDTO dto = new AuthenticationInfoDTO();
+    dto.setRbacEnabled(accessControlService.isRbacEnabled());
+    UserInfoDTO userInfo = new UserInfoDTO();
+
+    Mono<List<UserPermissionDTO>> permissions = accessControlService.getUser()
+        .map(user -> accessControlService.getRoles()
+            .stream()
+            .filter(role -> user.groups().contains(role.getName()))
+            .map(role -> mapPermissions(role.getPermissions(), role.getClusters()))
+            .flatMap(Collection::stream)
+            .collect(Collectors.toList())
+        )
+        .switchIfEmpty(Mono.just(Collections.emptyList()));
+
+    Mono<String> userName = ReactiveSecurityContextHolder.getContext()
+        .map(SecurityContext::getAuthentication)
+        .map(Principal::getName);
+
+    return userName
+        .zipWith(permissions)
+        .map(data -> {
+          userInfo.setUsername(data.getT1());
+          userInfo.setPermissions(data.getT2());
+
+          dto.setUserInfo(userInfo);
+          return dto;
+        })
+        .switchIfEmpty(Mono.just(dto))
+        .map(ResponseEntity::ok);
+  }
+
+  private List<UserPermissionDTO> mapPermissions(List<Permission> permissions, List<String> clusters) {
+    return permissions
+        .stream()
+        .map(permission -> {
+          UserPermissionDTO dto = new UserPermissionDTO();
+          dto.setClusters(clusters);
+          dto.setResource(ResourceTypeDTO.fromValue(permission.getResource().toString().toUpperCase()));
+          dto.setValue(permission.getValue() != null ? permission.getValue().toString() : null);
+          dto.setActions(permission.getActions()
+              .stream()
+              .map(String::toUpperCase)
+              .map(ActionDTO::valueOf)
+              .collect(Collectors.toList()));
+          return dto;
+        })
+        .collect(Collectors.toList());
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
index b1a3d3a3c91..c02b848eed3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
@@ -8,7 +8,10 @@
 import com.provectus.kafka.ui.model.BrokerLogdirUpdateDTO;
 import com.provectus.kafka.ui.model.BrokerMetricsDTO;
 import com.provectus.kafka.ui.model.BrokersLogdirsDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
 import com.provectus.kafka.ui.service.BrokerService;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,47 +27,78 @@
 public class BrokersController extends AbstractController implements BrokersApi {
   private final BrokerService brokerService;
   private final ClusterMapper clusterMapper;
+  private final AccessControlService accessControlService;
 
   @Override
-  public Mono<ResponseEntity<BrokerMetricsDTO>> getBrokersMetrics(String clusterName, Integer id,
-                                                                  ServerWebExchange exchange) {
-    return brokerService.getBrokerMetrics(getCluster(clusterName), id)
-        .map(clusterMapper::toBrokerMetrics)
-        .map(ResponseEntity::ok)
-        .onErrorReturn(ResponseEntity.notFound().build());
+  public Mono<ResponseEntity<Flux<BrokerDTO>>> getBrokers(String clusterName,
+                                                          ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .build());
+
+    var job = brokerService.getBrokers(getCluster(clusterName)).map(clusterMapper::toBrokerDto);
+
+    return validateAccess.thenReturn(ResponseEntity.ok(job));
   }
 
   @Override
-  public Mono<ResponseEntity<Flux<BrokerDTO>>> getBrokers(String clusterName,
-                                                          ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity.ok(
-        brokerService.getBrokers(getCluster(clusterName)).map(clusterMapper::toBrokerDto)));
+  public Mono<ResponseEntity<BrokerMetricsDTO>> getBrokersMetrics(String clusterName, Integer id,
+                                                                  ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .build());
+
+    return validateAccess.then(
+        brokerService.getBrokerMetrics(getCluster(clusterName), id)
+            .map(clusterMapper::toBrokerMetrics)
+            .map(ResponseEntity::ok)
+            .onErrorReturn(ResponseEntity.notFound().build())
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Flux<BrokersLogdirsDTO>>> getAllBrokersLogdirs(String clusterName,
                                                                             List<Integer> brokers,
-                                                                            ServerWebExchange exchange
-  ) {
-    return Mono.just(ResponseEntity.ok(
+                                                                            ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .build());
+
+    return validateAccess.thenReturn(ResponseEntity.ok(
         brokerService.getAllBrokersLogdirs(getCluster(clusterName), brokers)));
   }
 
   @Override
-  public Mono<ResponseEntity<Flux<BrokerConfigDTO>>> getBrokerConfig(String clusterName, Integer id,
+  public Mono<ResponseEntity<Flux<BrokerConfigDTO>>> getBrokerConfig(String clusterName,
+                                                                     Integer id,
                                                                      ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity.ok(
-        brokerService.getBrokerConfig(getCluster(clusterName), id)
-            .map(clusterMapper::toBrokerConfig)));
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .clusterConfigActions(ClusterConfigAction.VIEW)
+        .build());
+
+    return validateAccess.thenReturn(
+        ResponseEntity.ok(
+            brokerService.getBrokerConfig(getCluster(clusterName), id)
+                .map(clusterMapper::toBrokerConfig))
+    );
   }
 
   @Override
-  public Mono<ResponseEntity<Void>> updateBrokerTopicPartitionLogDir(
-      String clusterName, Integer id, Mono<BrokerLogdirUpdateDTO> brokerLogdir,
-      ServerWebExchange exchange) {
-    return brokerLogdir
-        .flatMap(bld -> brokerService.updateBrokerLogDir(getCluster(clusterName), id, bld))
-        .map(ResponseEntity::ok);
+  public Mono<ResponseEntity<Void>> updateBrokerTopicPartitionLogDir(String clusterName,
+                                                                     Integer id,
+                                                                     Mono<BrokerLogdirUpdateDTO> brokerLogdir,
+                                                                     ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .clusterConfigActions(ClusterConfigAction.VIEW, ClusterConfigAction.EDIT)
+        .build());
+
+    return validateAccess.then(
+        brokerLogdir
+            .flatMap(bld -> brokerService.updateBrokerLogDir(getCluster(clusterName), id, bld))
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
@@ -73,9 +107,16 @@ public Mono<ResponseEntity<Void>> updateBrokerConfigByName(String clusterName,
                                                              String name,
                                                              Mono<BrokerConfigItemDTO> brokerConfig,
                                                              ServerWebExchange exchange) {
-    return brokerConfig
-        .flatMap(bci -> brokerService.updateBrokerConfigByName(
-            getCluster(clusterName), id, name, bci.getValue()))
-        .map(ResponseEntity::ok);
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .clusterConfigActions(ClusterConfigAction.VIEW, ClusterConfigAction.EDIT)
+        .build());
+
+    return validateAccess.then(
+        brokerConfig
+            .flatMap(bci -> brokerService.updateBrokerConfigByName(
+                getCluster(clusterName), id, name, bci.getValue()))
+            .map(ResponseEntity::ok)
+    );
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java
index 38b2b1dc654..b28bf84936e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java
@@ -4,7 +4,9 @@
 import com.provectus.kafka.ui.model.ClusterDTO;
 import com.provectus.kafka.ui.model.ClusterMetricsDTO;
 import com.provectus.kafka.ui.model.ClusterStatsDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.ClusterService;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -18,31 +20,57 @@
 @Slf4j
 public class ClustersController extends AbstractController implements ClustersApi {
   private final ClusterService clusterService;
+  private final AccessControlService accessControlService;
+
+  @Override
+  public Mono<ResponseEntity<Flux<ClusterDTO>>> getClusters(ServerWebExchange exchange) {
+    Flux<ClusterDTO> job = Flux.fromIterable(clusterService.getClusters())
+        .filterWhen(accessControlService::isClusterAccessible);
+
+    return Mono.just(ResponseEntity.ok(job));
+  }
 
   @Override
   public Mono<ResponseEntity<ClusterMetricsDTO>> getClusterMetrics(String clusterName,
                                                                    ServerWebExchange exchange) {
-    return clusterService.getClusterMetrics(getCluster(clusterName))
-        .map(ResponseEntity::ok)
-        .onErrorReturn(ResponseEntity.notFound().build());
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .build();
+
+    return accessControlService.validateAccess(context)
+        .then(
+            clusterService.getClusterMetrics(getCluster(clusterName))
+                .map(ResponseEntity::ok)
+                .onErrorReturn(ResponseEntity.notFound().build())
+        );
   }
 
   @Override
   public Mono<ResponseEntity<ClusterStatsDTO>> getClusterStats(String clusterName,
                                                                ServerWebExchange exchange) {
-    return clusterService.getClusterStats(getCluster(clusterName))
-        .map(ResponseEntity::ok)
-        .onErrorReturn(ResponseEntity.notFound().build());
-  }
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .build();
 
-  @Override
-  public Mono<ResponseEntity<Flux<ClusterDTO>>> getClusters(ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity.ok(Flux.fromIterable(clusterService.getClusters())));
+    return accessControlService.validateAccess(context)
+        .then(
+            clusterService.getClusterStats(getCluster(clusterName))
+                .map(ResponseEntity::ok)
+                .onErrorReturn(ResponseEntity.notFound().build())
+        );
   }
 
   @Override
   public Mono<ResponseEntity<ClusterDTO>> updateClusterInfo(String clusterName,
                                                             ServerWebExchange exchange) {
-    return clusterService.updateCluster(getCluster(clusterName)).map(ResponseEntity::ok);
+
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .build();
+
+    return accessControlService.validateAccess(context)
+        .then(
+            clusterService.updateCluster(getCluster(clusterName)).map(ResponseEntity::ok)
+        );
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
index 4bba879b014..afea878fa8a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
@@ -1,5 +1,8 @@
 package com.provectus.kafka.ui.controller;
 
+import static com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction.DELETE;
+import static com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction.RESET_OFFSETS;
+import static com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction.VIEW;
 import static java.util.stream.Collectors.toMap;
 
 import com.provectus.kafka.ui.api.ConsumerGroupsApi;
@@ -12,10 +15,14 @@
 import com.provectus.kafka.ui.model.ConsumerGroupsPageResponseDTO;
 import com.provectus.kafka.ui.model.PartitionOffsetDTO;
 import com.provectus.kafka.ui.model.SortOrderDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
 import com.provectus.kafka.ui.service.ConsumerGroupService;
 import com.provectus.kafka.ui.service.OffsetsResetService;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,33 +41,65 @@ public class ConsumerGroupsController extends AbstractController implements Cons
 
   private final ConsumerGroupService consumerGroupService;
   private final OffsetsResetService offsetsResetService;
+  private final AccessControlService accessControlService;
 
   @Value("${consumer.groups.page.size:25}")
   private int defaultConsumerGroupsPageSize;
 
   @Override
-  public Mono<ResponseEntity<Void>> deleteConsumerGroup(String clusterName, String id,
+  public Mono<ResponseEntity<Void>> deleteConsumerGroup(String clusterName,
+                                                        String id,
                                                         ServerWebExchange exchange) {
-    return consumerGroupService.deleteConsumerGroupById(getCluster(clusterName), id)
-        .thenReturn(ResponseEntity.ok().build());
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .consumerGroup(id)
+        .consumerGroupActions(DELETE)
+        .build());
+
+    return validateAccess.then(
+        consumerGroupService.deleteConsumerGroupById(getCluster(clusterName), id)
+            .thenReturn(ResponseEntity.ok().build())
+    );
   }
 
   @Override
-  public Mono<ResponseEntity<ConsumerGroupDetailsDTO>> getConsumerGroup(
-      String clusterName, String consumerGroupId, ServerWebExchange exchange) {
-    return consumerGroupService.getConsumerGroupDetail(getCluster(clusterName), consumerGroupId)
-        .map(ConsumerGroupMapper::toDetailsDto)
-        .map(ResponseEntity::ok);
+  public Mono<ResponseEntity<ConsumerGroupDetailsDTO>> getConsumerGroup(String clusterName,
+                                                                        String consumerGroupId,
+                                                                        ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .consumerGroup(consumerGroupId)
+        .consumerGroupActions(VIEW)
+        .build());
+
+    return validateAccess.then(
+        consumerGroupService.getConsumerGroupDetail(getCluster(clusterName), consumerGroupId)
+            .map(ConsumerGroupMapper::toDetailsDto)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
-  public Mono<ResponseEntity<Flux<ConsumerGroupDTO>>> getTopicConsumerGroups(
-      String clusterName, String topicName, ServerWebExchange exchange) {
-    return consumerGroupService.getConsumerGroupsForTopic(getCluster(clusterName), topicName)
-        .map(Flux::fromIterable)
-        .map(f -> f.map(ConsumerGroupMapper::toDto))
-        .map(ResponseEntity::ok)
-        .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()));
+  public Mono<ResponseEntity<Flux<ConsumerGroupDTO>>> getTopicConsumerGroups(String clusterName,
+                                                                             String topicName,
+                                                                             ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(TopicAction.VIEW)
+        .build());
+
+    Mono<ResponseEntity<Flux<ConsumerGroupDTO>>> job =
+        consumerGroupService.getConsumerGroupsForTopic(getCluster(clusterName), topicName)
+            .flatMapMany(Flux::fromIterable)
+            .filterWhen(cg -> accessControlService.isConsumerGroupAccessible(cg.getGroupId(), clusterName))
+            .map(ConsumerGroupMapper::toDto)
+            .collectList()
+            .map(Flux::fromIterable)
+            .map(ResponseEntity::ok)
+            .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()));
+
+    return validateAccess.then(job);
   }
 
   @Override
@@ -72,16 +111,79 @@ public Mono<ResponseEntity<ConsumerGroupsPageResponseDTO>> getConsumerGroupsPage
       ConsumerGroupOrderingDTO orderBy,
       SortOrderDTO sortOrderDto,
       ServerWebExchange exchange) {
-    return consumerGroupService.getConsumerGroupsPage(
-            getCluster(clusterName),
-            Optional.ofNullable(page).filter(i -> i > 0).orElse(1),
-            Optional.ofNullable(perPage).filter(i -> i > 0).orElse(defaultConsumerGroupsPageSize),
-            search,
-            Optional.ofNullable(orderBy).orElse(ConsumerGroupOrderingDTO.NAME),
-            Optional.ofNullable(sortOrderDto).orElse(SortOrderDTO.ASC)
-        )
-        .map(this::convertPage)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        // consumer group access validation is within the service
+        .build());
+
+    return validateAccess.then(
+        consumerGroupService.getConsumerGroupsPage(
+                getCluster(clusterName),
+                Optional.ofNullable(page).filter(i -> i > 0).orElse(1),
+                Optional.ofNullable(perPage).filter(i -> i > 0).orElse(defaultConsumerGroupsPageSize),
+                search,
+                Optional.ofNullable(orderBy).orElse(ConsumerGroupOrderingDTO.NAME),
+                Optional.ofNullable(sortOrderDto).orElse(SortOrderDTO.ASC)
+            )
+            .map(this::convertPage)
+            .map(ResponseEntity::ok)
+    );
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> resetConsumerGroupOffsets(String clusterName,
+                                                              String group,
+                                                              Mono<ConsumerGroupOffsetsResetDTO> resetDto,
+                                                              ServerWebExchange exchange) {
+    return resetDto.flatMap(reset -> {
+      Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+          .cluster(clusterName)
+          .topic(reset.getTopic())
+          .topicActions(TopicAction.VIEW)
+          .consumerGroupActions(RESET_OFFSETS)
+          .build());
+
+      Supplier<Mono<Void>> mono = () -> {
+        var cluster = getCluster(clusterName);
+        switch (reset.getResetType()) {
+          case EARLIEST:
+            return offsetsResetService
+                .resetToEarliest(cluster, group, reset.getTopic(), reset.getPartitions());
+          case LATEST:
+            return offsetsResetService
+                .resetToLatest(cluster, group, reset.getTopic(), reset.getPartitions());
+          case TIMESTAMP:
+            if (reset.getResetToTimestamp() == null) {
+              return Mono.error(
+                  new ValidationException(
+                      "resetToTimestamp is required when TIMESTAMP reset type used"
+                  )
+              );
+            }
+            return offsetsResetService
+                .resetToTimestamp(cluster, group, reset.getTopic(), reset.getPartitions(),
+                    reset.getResetToTimestamp());
+          case OFFSET:
+            if (CollectionUtils.isEmpty(reset.getPartitionsOffsets())) {
+              return Mono.error(
+                  new ValidationException(
+                      "partitionsOffsets is required when OFFSET reset type used"
+                  )
+              );
+            }
+            Map<Integer, Long> offsets = reset.getPartitionsOffsets().stream()
+                .collect(toMap(PartitionOffsetDTO::getPartition, PartitionOffsetDTO::getOffset));
+            return offsetsResetService.resetToOffsets(cluster, group, reset.getTopic(), offsets);
+          default:
+            return Mono.error(
+                new ValidationException("Unknown resetType " + reset.getResetType())
+            );
+        }
+      };
+
+      return validateAccess.then(mono.get());
+    }).thenReturn(ResponseEntity.ok().build());
   }
 
   private ConsumerGroupsPageResponseDTO convertPage(ConsumerGroupService.ConsumerGroupsPage
@@ -94,48 +196,4 @@ private ConsumerGroupsPageResponseDTO convertPage(ConsumerGroupService.ConsumerG
             .collect(Collectors.toList()));
   }
 
-  @Override
-  public Mono<ResponseEntity<Void>> resetConsumerGroupOffsets(String clusterName, String group,
-                                                              Mono<ConsumerGroupOffsetsResetDTO>
-                                                                  consumerGroupOffsetsReset,
-                                                              ServerWebExchange exchange) {
-    return consumerGroupOffsetsReset.flatMap(reset -> {
-      var cluster = getCluster(clusterName);
-      switch (reset.getResetType()) {
-        case EARLIEST:
-          return offsetsResetService
-              .resetToEarliest(cluster, group, reset.getTopic(), reset.getPartitions());
-        case LATEST:
-          return offsetsResetService
-              .resetToLatest(cluster, group, reset.getTopic(), reset.getPartitions());
-        case TIMESTAMP:
-          if (reset.getResetToTimestamp() == null) {
-            return Mono.error(
-                new ValidationException(
-                    "resetToTimestamp is required when TIMESTAMP reset type used"
-                )
-            );
-          }
-          return offsetsResetService
-              .resetToTimestamp(cluster, group, reset.getTopic(), reset.getPartitions(),
-                  reset.getResetToTimestamp());
-        case OFFSET:
-          if (CollectionUtils.isEmpty(reset.getPartitionsOffsets())) {
-            return Mono.error(
-                new ValidationException(
-                    "partitionsOffsets is required when OFFSET reset type used"
-                )
-            );
-          }
-          Map<Integer, Long> offsets = reset.getPartitionsOffsets().stream()
-              .collect(toMap(PartitionOffsetDTO::getPartition, PartitionOffsetDTO::getOffset));
-          return offsetsResetService.resetToOffsets(cluster, group, reset.getTopic(), offsets);
-        default:
-          return Mono.error(
-              new ValidationException("Unknown resetType " + reset.getResetType())
-          );
-      }
-    }).thenReturn(ResponseEntity.ok().build());
-  }
-
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index 2813618abf9..dcf452bb841 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -11,7 +11,10 @@
 import com.provectus.kafka.ui.model.NewConnectorDTO;
 import com.provectus.kafka.ui.model.SortOrderDTO;
 import com.provectus.kafka.ui.model.TaskDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
 import com.provectus.kafka.ui.service.KafkaConnectService;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Comparator;
 import java.util.Map;
 import javax.validation.Valid;
@@ -28,42 +31,83 @@
 @Slf4j
 public class KafkaConnectController extends AbstractController implements KafkaConnectApi {
   private final KafkaConnectService kafkaConnectService;
+  private final AccessControlService accessControlService;
 
   @Override
   public Mono<ResponseEntity<Flux<ConnectDTO>>> getConnects(String clusterName,
                                                             ServerWebExchange exchange) {
-    return kafkaConnectService.getConnects(getCluster(clusterName)).map(ResponseEntity::ok);
+
+    Flux<ConnectDTO> flux = Flux.fromIterable(kafkaConnectService.getConnects(getCluster(clusterName)))
+        .filterWhen(dto -> accessControlService.isConnectAccessible(dto, clusterName));
+
+    return Mono.just(ResponseEntity.ok(flux));
   }
 
   @Override
   public Mono<ResponseEntity<Flux<String>>> getConnectors(String clusterName, String connectName,
                                                           ServerWebExchange exchange) {
-    var connectors = kafkaConnectService.getConnectors(getCluster(clusterName), connectName);
-    return Mono.just(ResponseEntity.ok(connectors));
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW)
+        .build());
+
+    return validateAccess.thenReturn(
+        ResponseEntity.ok(kafkaConnectService.getConnectors(getCluster(clusterName), connectName))
+    );
   }
 
   @Override
   public Mono<ResponseEntity<ConnectorDTO>> createConnector(String clusterName, String connectName,
                                                             @Valid Mono<NewConnectorDTO> connector,
                                                             ServerWebExchange exchange) {
-    return kafkaConnectService.createConnector(getCluster(clusterName), connectName, connector)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW, ConnectAction.CREATE)
+        .build());
+
+    return validateAccess.then(
+        kafkaConnectService.createConnector(getCluster(clusterName), connectName, connector)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
   public Mono<ResponseEntity<ConnectorDTO>> getConnector(String clusterName, String connectName,
                                                          String connectorName,
                                                          ServerWebExchange exchange) {
-    return kafkaConnectService.getConnector(getCluster(clusterName), connectName, connectorName)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW)
+        .connector(connectorName)
+        .build());
+
+    return validateAccess.then(
+        kafkaConnectService.getConnector(getCluster(clusterName), connectName, connectorName)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Void>> deleteConnector(String clusterName, String connectName,
                                                     String connectorName,
                                                     ServerWebExchange exchange) {
-    return kafkaConnectService.deleteConnector(getCluster(clusterName), connectName, connectorName)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
+        .build());
+
+    return validateAccess.then(
+        kafkaConnectService.deleteConnector(getCluster(clusterName), connectName, connectorName)
+            .map(ResponseEntity::ok)
+    );
   }
 
 
@@ -76,11 +120,13 @@ public Mono<ResponseEntity<Flux<FullConnectorInfoDTO>>> getAllConnectors(
       ServerWebExchange exchange
   ) {
     var comparator = sortOrder == null || sortOrder.equals(SortOrderDTO.ASC)
-            ? getConnectorsComparator(orderBy)
-            : getConnectorsComparator(orderBy).reversed();
-    return Mono.just(ResponseEntity.ok(
-        kafkaConnectService.getAllConnectors(getCluster(clusterName), search).sort(comparator))
-    );
+        ? getConnectorsComparator(orderBy)
+        : getConnectorsComparator(orderBy).reversed();
+    Flux<FullConnectorInfoDTO> job = kafkaConnectService.getAllConnectors(getCluster(clusterName), search)
+        .filterWhen(dto -> accessControlService.isConnectAccessible(dto.getConnect(), clusterName))
+        .filterWhen(dto -> accessControlService.isConnectorAccessible(dto.getConnect(), dto.getName(), clusterName));
+
+    return Mono.just(ResponseEntity.ok(job.sort(comparator)));
   }
 
   @Override
@@ -88,9 +134,18 @@ public Mono<ResponseEntity<Map<String, Object>>> getConnectorConfig(String clust
                                                                       String connectName,
                                                                       String connectorName,
                                                                       ServerWebExchange exchange) {
-    return kafkaConnectService
-        .getConnectorConfig(getCluster(clusterName), connectName, connectorName)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW)
+        .build());
+
+    return validateAccess.then(
+        kafkaConnectService
+            .getConnectorConfig(getCluster(clusterName), connectName, connectorName)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
@@ -99,9 +154,18 @@ public Mono<ResponseEntity<ConnectorDTO>> setConnectorConfig(String clusterName,
                                                                String connectorName,
                                                                @Valid Mono<Object> requestBody,
                                                                ServerWebExchange exchange) {
-    return kafkaConnectService
-        .setConnectorConfig(getCluster(clusterName), connectName, connectorName, requestBody)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
+        .build());
+
+    return validateAccess.then(
+        kafkaConnectService
+            .setConnectorConfig(getCluster(clusterName), connectName, connectorName, requestBody)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
@@ -109,9 +173,18 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
                                                          String connectorName,
                                                          ConnectorActionDTO action,
                                                          ServerWebExchange exchange) {
-    return kafkaConnectService
-        .updateConnectorState(getCluster(clusterName), connectName, connectorName, action)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
+        .build());
+
+    return validateAccess.then(
+        kafkaConnectService
+            .updateConnectorState(getCluster(clusterName), connectName, connectorName, action)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
@@ -119,31 +192,56 @@ public Mono<ResponseEntity<Flux<TaskDTO>>> getConnectorTasks(String clusterName,
                                                                String connectName,
                                                                String connectorName,
                                                                ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity
-        .ok(kafkaConnectService
-            .getConnectorTasks(getCluster(clusterName), connectName, connectorName)));
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW)
+        .build());
+
+    return validateAccess.thenReturn(
+        ResponseEntity
+            .ok(kafkaConnectService
+                .getConnectorTasks(getCluster(clusterName), connectName, connectorName))
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Void>> restartConnectorTask(String clusterName, String connectName,
                                                          String connectorName, Integer taskId,
                                                          ServerWebExchange exchange) {
-    return kafkaConnectService
-        .restartConnectorTask(getCluster(clusterName), connectName, connectorName, taskId)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
+        .build());
+
+    return validateAccess.then(
+        kafkaConnectService
+            .restartConnectorTask(getCluster(clusterName), connectName, connectorName, taskId)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Flux<ConnectorPluginDTO>>> getConnectorPlugins(
       String clusterName, String connectName, ServerWebExchange exchange) {
-    return kafkaConnectService
-        .getConnectorPlugins(getCluster(clusterName), connectName)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW)
+        .build());
+
+    return validateAccess.then(
+        kafkaConnectService
+            .getConnectorPlugins(getCluster(clusterName), connectName)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
-  public Mono<ResponseEntity<ConnectorPluginConfigValidationResponseDTO>>
-      validateConnectorPluginConfig(
+  public Mono<ResponseEntity<ConnectorPluginConfigValidationResponseDTO>> validateConnectorPluginConfig(
       String clusterName, String connectName, String pluginName, @Valid Mono<Object> requestBody,
       ServerWebExchange exchange) {
     return kafkaConnectService
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
index c3d833e2b8e..3a171b9b05b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
@@ -7,7 +7,10 @@
 import com.provectus.kafka.ui.model.KsqlStreamDescriptionDTO;
 import com.provectus.kafka.ui.model.KsqlTableDescriptionDTO;
 import com.provectus.kafka.ui.model.KsqlTableResponseDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.permission.KsqlAction;
 import com.provectus.kafka.ui.service.ksql.KsqlServiceV2;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -19,51 +22,74 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-
 @RestController
 @RequiredArgsConstructor
 @Slf4j
 public class KsqlController extends AbstractController implements KsqlApi {
 
   private final KsqlServiceV2 ksqlServiceV2;
+  private final AccessControlService accessControlService;
 
   @Override
   public Mono<ResponseEntity<KsqlCommandV2ResponseDTO>> executeKsql(String clusterName,
                                                                     Mono<KsqlCommandV2DTO>
                                                                         ksqlCommand2Dto,
                                                                     ServerWebExchange exchange) {
-    return ksqlCommand2Dto.map(dto -> {
-      var id = ksqlServiceV2.registerCommand(
-          getCluster(clusterName),
-          dto.getKsql(),
-          Optional.ofNullable(dto.getStreamsProperties()).orElse(Map.of()));
-      return new KsqlCommandV2ResponseDTO().pipeId(id);
-    }).map(ResponseEntity::ok);
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .ksqlActions(KsqlAction.EXECUTE)
+        .build());
+
+    return validateAccess.then(
+        ksqlCommand2Dto.map(dto -> {
+          var id = ksqlServiceV2.registerCommand(
+              getCluster(clusterName),
+              dto.getKsql(),
+              Optional.ofNullable(dto.getStreamsProperties()).orElse(Map.of()));
+          return new KsqlCommandV2ResponseDTO().pipeId(id);
+        }).map(ResponseEntity::ok)
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Flux<KsqlResponseDTO>>> openKsqlResponsePipe(String clusterName,
                                                                           String pipeId,
                                                                           ServerWebExchange exchange) {
-    return Mono.just(
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .ksqlActions(KsqlAction.EXECUTE)
+        .build());
+
+    return validateAccess.thenReturn(
         ResponseEntity.ok(ksqlServiceV2.execute(pipeId)
             .map(table -> new KsqlResponseDTO()
                 .table(
                     new KsqlTableResponseDTO()
                         .header(table.getHeader())
                         .columnNames(table.getColumnNames())
-                        .values((List<List<Object>>) ((List<?>) (table.getValues())))))));
+                        .values((List<List<Object>>) ((List<?>) (table.getValues()))))))
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Flux<KsqlStreamDescriptionDTO>>> listStreams(String clusterName,
-                                                                         ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity.ok(ksqlServiceV2.listStreams(getCluster(clusterName))));
+                                                                          ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .ksqlActions(KsqlAction.EXECUTE)
+        .build());
+
+    return validateAccess.thenReturn(ResponseEntity.ok(ksqlServiceV2.listStreams(getCluster(clusterName))));
   }
 
   @Override
   public Mono<ResponseEntity<Flux<KsqlTableDescriptionDTO>>> listTables(String clusterName,
                                                                         ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity.ok(ksqlServiceV2.listTables(getCluster(clusterName))));
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .ksqlActions(KsqlAction.EXECUTE)
+        .build());
+
+    return validateAccess.thenReturn(ResponseEntity.ok(ksqlServiceV2.listTables(getCluster(clusterName))));
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
index f32d31b47b4..1ba511ab07c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
@@ -1,5 +1,8 @@
 package com.provectus.kafka.ui.controller;
 
+import static com.provectus.kafka.ui.model.rbac.permission.TopicAction.MESSAGES_DELETE;
+import static com.provectus.kafka.ui.model.rbac.permission.TopicAction.MESSAGES_PRODUCE;
+import static com.provectus.kafka.ui.model.rbac.permission.TopicAction.MESSAGES_READ;
 import static com.provectus.kafka.ui.serde.api.Serde.Target.KEY;
 import static com.provectus.kafka.ui.serde.api.Serde.Target.VALUE;
 import static java.util.stream.Collectors.toMap;
@@ -14,8 +17,11 @@
 import com.provectus.kafka.ui.model.SerdeUsageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.model.TopicSerdeSuggestionDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
 import com.provectus.kafka.ui.service.DeserializationService;
 import com.provectus.kafka.ui.service.MessagesService;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -42,16 +48,26 @@ public class MessagesController extends AbstractController implements MessagesAp
 
   private final MessagesService messagesService;
   private final DeserializationService deserializationService;
+  private final AccessControlService accessControlService;
 
   @Override
   public Mono<ResponseEntity<Void>> deleteTopicMessages(
       String clusterName, String topicName, @Valid List<Integer> partitions,
       ServerWebExchange exchange) {
-    return messagesService.deleteTopicMessages(
-        getCluster(clusterName),
-        topicName,
-        Optional.ofNullable(partitions).orElse(List.of())
-    ).thenReturn(ResponseEntity.ok().build());
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(MESSAGES_DELETE)
+        .build());
+
+    return validateAccess.then(
+        messagesService.deleteTopicMessages(
+            getCluster(clusterName),
+            topicName,
+            Optional.ofNullable(partitions).orElse(List.of())
+        ).thenReturn(ResponseEntity.ok().build())
+    );
   }
 
   @Override
@@ -66,6 +82,12 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String
                                                                            String keySerde,
                                                                            String valueSerde,
                                                                            ServerWebExchange exchange) {
+    final Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(MESSAGES_READ)
+        .build());
+
     seekType = seekType != null ? seekType : SeekTypeDTO.BEGINNING;
     seekDirection = seekDirection != null ? seekDirection : SeekDirectionDTO.FORWARD;
     filterQueryType = filterQueryType != null ? filterQueryType : MessageFilterTypeDTO.STRING_CONTAINS;
@@ -77,22 +99,33 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String
         topicName,
         parseSeekTo(topicName, seekType, seekTo)
     );
-    return Mono.just(
+    Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> job = Mono.just(
         ResponseEntity.ok(
             messagesService.loadMessages(
                 getCluster(clusterName), topicName, positions, q, filterQueryType,
                 recordsLimit, seekDirection, keySerde, valueSerde)
         )
     );
+
+    return validateAccess.then(job);
   }
 
   @Override
   public Mono<ResponseEntity<Void>> sendTopicMessages(
       String clusterName, String topicName, @Valid Mono<CreateTopicMessageDTO> createTopicMessage,
       ServerWebExchange exchange) {
-    return createTopicMessage.flatMap(msg ->
-        messagesService.sendMessage(getCluster(clusterName), topicName, msg).then()
-    ).map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(MESSAGES_PRODUCE)
+        .build());
+
+    return validateAccess.then(
+        createTopicMessage.flatMap(msg ->
+            messagesService.sendMessage(getCluster(clusterName), topicName, msg).then()
+        ).map(ResponseEntity::ok)
+    );
   }
 
   /**
@@ -128,15 +161,25 @@ public Mono<ResponseEntity<TopicSerdeSuggestionDTO>> getSerdes(String clusterNam
                                                                  String topicName,
                                                                  SerdeUsageDTO use,
                                                                  ServerWebExchange exchange) {
-    return Mono.just(
-        new TopicSerdeSuggestionDTO()
-            .key(use == SerdeUsageDTO.SERIALIZE
-                ? deserializationService.getSerdesForSerialize(getCluster(clusterName), topicName, KEY)
-                : deserializationService.getSerdesForDeserialize(getCluster(clusterName), topicName, KEY))
-            .value(use == SerdeUsageDTO.SERIALIZE
-                ? deserializationService.getSerdesForSerialize(getCluster(clusterName), topicName, VALUE)
-                : deserializationService.getSerdesForDeserialize(getCluster(clusterName), topicName, VALUE))
-    ).subscribeOn(Schedulers.boundedElastic())
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(TopicAction.VIEW)
+        .build());
+
+    TopicSerdeSuggestionDTO dto = new TopicSerdeSuggestionDTO()
+        .key(use == SerdeUsageDTO.SERIALIZE
+            ? deserializationService.getSerdesForSerialize(getCluster(clusterName), topicName, KEY)
+            : deserializationService.getSerdesForDeserialize(getCluster(clusterName), topicName, KEY))
+        .value(use == SerdeUsageDTO.SERIALIZE
+            ? deserializationService.getSerdesForSerialize(getCluster(clusterName), topicName, VALUE)
+            : deserializationService.getSerdesForDeserialize(getCluster(clusterName), topicName, VALUE));
+
+    return validateAccess.then(
+        Mono.just(dto)
+            .subscribeOn(Schedulers.boundedElastic())
+            .map(ResponseEntity::ok)
+    );
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
index 55187903a65..9c5710fe41c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
@@ -9,8 +9,10 @@
 import com.provectus.kafka.ui.model.NewSchemaSubjectDTO;
 import com.provectus.kafka.ui.model.SchemaSubjectDTO;
 import com.provectus.kafka.ui.model.SchemaSubjectsResponseDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.permission.SchemaAction;
 import com.provectus.kafka.ui.service.SchemaRegistryService;
-import java.util.Arrays;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Valid;
@@ -33,6 +35,7 @@ public class SchemasController extends AbstractController implements SchemasApi
   private final ClusterMapper mapper;
 
   private final SchemaRegistryService schemaRegistryService;
+  private final AccessControlService accessControlService;
 
   @Override
   protected KafkaCluster getCluster(String clusterName) {
@@ -47,48 +50,105 @@ protected KafkaCluster getCluster(String clusterName) {
   public Mono<ResponseEntity<CompatibilityCheckResponseDTO>> checkSchemaCompatibility(
       String clusterName, String subject, @Valid Mono<NewSchemaSubjectDTO> newSchemaSubject,
       ServerWebExchange exchange) {
-    return schemaRegistryService.checksSchemaCompatibility(
-            getCluster(clusterName), subject, newSchemaSubject)
-        .map(mapper::toCompatibilityCheckResponse)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schema(subject)
+        .schemaActions(SchemaAction.VIEW)
+        .build());
+
+    return validateAccess.then(
+        schemaRegistryService.checksSchemaCompatibility(
+                getCluster(clusterName), subject, newSchemaSubject)
+            .map(mapper::toCompatibilityCheckResponse)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
   public Mono<ResponseEntity<SchemaSubjectDTO>> createNewSchema(
       String clusterName, @Valid Mono<NewSchemaSubjectDTO> newSchemaSubject,
       ServerWebExchange exchange) {
-    return schemaRegistryService
-        .registerNewSchema(getCluster(clusterName), newSchemaSubject)
-        .map(ResponseEntity::ok);
+
+    return newSchemaSubject.flatMap(dto -> {
+      Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+          .cluster(clusterName)
+          .schemaActions(SchemaAction.CREATE)
+          .build());
+
+      return validateAccess.then(
+          schemaRegistryService
+              .registerNewSchema(getCluster(clusterName), dto)
+              .map(ResponseEntity::ok)
+      );
+    });
   }
 
   @Override
-  public Mono<ResponseEntity<Void>> deleteLatestSchema(
-      String clusterName, String subject, ServerWebExchange exchange) {
-    return schemaRegistryService.deleteLatestSchemaSubject(getCluster(clusterName), subject)
-        .thenReturn(ResponseEntity.ok().build());
+  public Mono<ResponseEntity<Void>> deleteLatestSchema(String clusterName,
+                                                       String subject,
+                                                       ServerWebExchange exchange) {
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schema(subject)
+        .schemaActions(SchemaAction.DELETE)
+        .build());
+
+    return validateAccess.then(
+        schemaRegistryService.deleteLatestSchemaSubject(getCluster(clusterName), subject)
+            .thenReturn(ResponseEntity.ok().build())
+    );
   }
 
   @Override
-  public Mono<ResponseEntity<Void>> deleteSchema(
-      String clusterName, String subjectName, ServerWebExchange exchange) {
-    return schemaRegistryService.deleteSchemaSubjectEntirely(getCluster(clusterName), subjectName)
-        .thenReturn(ResponseEntity.ok().build());
+  public Mono<ResponseEntity<Void>> deleteSchema(String clusterName,
+                                                 String subject,
+                                                 ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schema(subject)
+        .schemaActions(SchemaAction.DELETE)
+        .build());
+
+    return validateAccess.then(
+        schemaRegistryService.deleteSchemaSubjectEntirely(getCluster(clusterName), subject)
+            .thenReturn(ResponseEntity.ok().build())
+    );
   }
 
   @Override
-  public Mono<ResponseEntity<Void>> deleteSchemaByVersion(
-      String clusterName, String subjectName, Integer version, ServerWebExchange exchange) {
-    return schemaRegistryService.deleteSchemaSubjectByVersion(getCluster(clusterName), subjectName, version)
-        .thenReturn(ResponseEntity.ok().build());
+  public Mono<ResponseEntity<Void>> deleteSchemaByVersion(String clusterName,
+                                                          String subject,
+                                                          Integer version,
+                                                          ServerWebExchange exchange) {
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schema(subject)
+        .schemaActions(SchemaAction.DELETE)
+        .build());
+
+    return validateAccess.then(
+        schemaRegistryService.deleteSchemaSubjectByVersion(getCluster(clusterName), subject, version)
+            .thenReturn(ResponseEntity.ok().build())
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Flux<SchemaSubjectDTO>>> getAllVersionsBySubject(
-      String clusterName, String subjectName, ServerWebExchange exchange) {
+      String clusterName, String subject, ServerWebExchange exchange) {
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schema(subject)
+        .schemaActions(SchemaAction.VIEW)
+        .build());
+
     Flux<SchemaSubjectDTO> schemas =
-        schemaRegistryService.getAllVersionsBySubject(getCluster(clusterName), subjectName);
-    return Mono.just(ResponseEntity.ok(schemas));
+        schemaRegistryService.getAllVersionsBySubject(getCluster(clusterName), subject);
+
+    return validateAccess.thenReturn(ResponseEntity.ok(schemas));
   }
 
   @Override
@@ -101,18 +161,36 @@ public Mono<ResponseEntity<CompatibilityLevelDTO>> getGlobalSchemaCompatibilityL
   }
 
   @Override
-  public Mono<ResponseEntity<SchemaSubjectDTO>> getLatestSchema(String clusterName, String subject,
+  public Mono<ResponseEntity<SchemaSubjectDTO>> getLatestSchema(String clusterName,
+                                                                String subject,
                                                                 ServerWebExchange exchange) {
-    return schemaRegistryService.getLatestSchemaVersionBySubject(getCluster(clusterName), subject)
-        .map(ResponseEntity::ok);
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schema(subject)
+        .schemaActions(SchemaAction.VIEW)
+        .build());
+
+    return validateAccess.then(
+        schemaRegistryService.getLatestSchemaVersionBySubject(getCluster(clusterName), subject)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
   public Mono<ResponseEntity<SchemaSubjectDTO>> getSchemaByVersion(
       String clusterName, String subject, Integer version, ServerWebExchange exchange) {
-    return schemaRegistryService.getSchemaSubjectByVersion(
-            getCluster(clusterName), subject, version)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schema(subject)
+        .schemaActions(SchemaAction.VIEW)
+        .build());
+
+    return validateAccess.then(
+        schemaRegistryService.getSchemaSubjectByVersion(
+                getCluster(clusterName), subject, version)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
@@ -120,16 +198,19 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
                                                                     @Valid Integer pageNum,
                                                                     @Valid Integer perPage,
                                                                     @Valid String search,
-                                                                    ServerWebExchange serverWebExchange) {
+                                                                    ServerWebExchange exchange) {
     return schemaRegistryService
         .getAllSubjectNames(getCluster(clusterName))
+        .flatMapMany(Flux::fromArray)
+        .filterWhen(schema -> accessControlService.isSchemaAccessible(schema, clusterName))
+        .collectList()
         .flatMap(subjects -> {
           int pageSize = perPage != null && perPage > 0 ? perPage : DEFAULT_PAGE_SIZE;
           int subjectToSkip = ((pageNum != null && pageNum > 0 ? pageNum : 1) - 1) * pageSize;
-          List<String> filteredSubjects = Arrays.stream(subjects)
+          List<String> filteredSubjects = subjects
+              .stream()
               .filter(subj -> search == null || StringUtils.containsIgnoreCase(subj, search))
-              .sorted()
-              .collect(Collectors.toList());
+              .sorted().toList();
           var totalPages = (filteredSubjects.size() / pageSize)
               + (filteredSubjects.size() % pageSize == 0 ? 0 : 1);
           List<String> subjectsToRender = filteredSubjects.stream()
@@ -138,26 +219,45 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
               .collect(Collectors.toList());
           return schemaRegistryService.getAllLatestVersionSchemas(getCluster(clusterName), subjectsToRender)
               .map(a -> new SchemaSubjectsResponseDTO().pageCount(totalPages).schemas(a));
-        }).map(ResponseEntity::ok);
+        })
+        .map(ResponseEntity::ok);
   }
 
   @Override
   public Mono<ResponseEntity<Void>> updateGlobalSchemaCompatibilityLevel(
       String clusterName, @Valid Mono<CompatibilityLevelDTO> compatibilityLevel,
       ServerWebExchange exchange) {
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schemaActions(SchemaAction.MODIFY_GLOBAL_COMPATIBILITY)
+        .build());
+
     log.info("Updating schema compatibility globally");
-    return schemaRegistryService.updateSchemaCompatibility(
-            getCluster(clusterName), compatibilityLevel)
-        .map(ResponseEntity::ok);
+
+    return validateAccess.then(
+        schemaRegistryService.updateSchemaCompatibility(
+                getCluster(clusterName), compatibilityLevel)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Void>> updateSchemaCompatibilityLevel(
       String clusterName, String subject, @Valid Mono<CompatibilityLevelDTO> compatibilityLevel,
       ServerWebExchange exchange) {
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schemaActions(SchemaAction.EDIT)
+        .build());
+
     log.info("Updating schema compatibility for subject: {}", subject);
-    return schemaRegistryService.updateSchemaCompatibility(
-            getCluster(clusterName), subject, compatibilityLevel)
-        .map(ResponseEntity::ok);
+
+    return validateAccess.then(
+        schemaRegistryService.updateSchemaCompatibility(
+                getCluster(clusterName), subject, compatibilityLevel)
+            .map(ResponseEntity::ok)
+    );
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
index ccfe898fdcb..c9cfca18e83 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
@@ -1,5 +1,10 @@
 package com.provectus.kafka.ui.controller;
 
+import static com.provectus.kafka.ui.model.rbac.permission.TopicAction.CREATE;
+import static com.provectus.kafka.ui.model.rbac.permission.TopicAction.DELETE;
+import static com.provectus.kafka.ui.model.rbac.permission.TopicAction.EDIT;
+import static com.provectus.kafka.ui.model.rbac.permission.TopicAction.MESSAGES_READ;
+import static com.provectus.kafka.ui.model.rbac.permission.TopicAction.VIEW;
 import static java.util.stream.Collectors.toList;
 
 import com.provectus.kafka.ui.api.TopicsApi;
@@ -19,8 +24,10 @@
 import com.provectus.kafka.ui.model.TopicDetailsDTO;
 import com.provectus.kafka.ui.model.TopicUpdateDTO;
 import com.provectus.kafka.ui.model.TopicsResponseDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.TopicsService;
 import com.provectus.kafka.ui.service.analyze.TopicAnalysisService;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Comparator;
 import java.util.List;
 import javax.validation.Valid;
@@ -44,66 +51,121 @@ public class TopicsController extends AbstractController implements TopicsApi {
   private final TopicsService topicsService;
   private final TopicAnalysisService topicAnalysisService;
   private final ClusterMapper clusterMapper;
+  private final AccessControlService accessControlService;
 
   @Override
   public Mono<ResponseEntity<TopicDTO>> createTopic(
       String clusterName, @Valid Mono<TopicCreationDTO> topicCreation, ServerWebExchange exchange) {
-    return topicsService.createTopic(getCluster(clusterName), topicCreation)
-        .map(clusterMapper::toTopic)
-        .map(s -> new ResponseEntity<>(s, HttpStatus.OK))
-        .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()));
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topicActions(CREATE)
+        .build());
+
+    return validateAccess.then(
+        topicsService.createTopic(getCluster(clusterName), topicCreation)
+            .map(clusterMapper::toTopic)
+            .map(s -> new ResponseEntity<>(s, HttpStatus.OK))
+            .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()))
+    );
   }
 
   @Override
   public Mono<ResponseEntity<TopicDTO>> recreateTopic(String clusterName,
-                                                      String topicName, ServerWebExchange serverWebExchange) {
-    return topicsService.recreateTopic(getCluster(clusterName), topicName)
-        .map(clusterMapper::toTopic)
-        .map(s -> new ResponseEntity<>(s, HttpStatus.CREATED));
+                                                      String topicName, ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(VIEW, CREATE, DELETE)
+        .build());
+
+    return validateAccess.then(
+        topicsService.recreateTopic(getCluster(clusterName), topicName)
+            .map(clusterMapper::toTopic)
+            .map(s -> new ResponseEntity<>(s, HttpStatus.CREATED))
+    );
   }
 
   @Override
   public Mono<ResponseEntity<TopicDTO>> cloneTopic(
       String clusterName, String topicName, String newTopicName, ServerWebExchange exchange) {
-    return topicsService.cloneTopic(getCluster(clusterName), topicName, newTopicName)
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(VIEW, CREATE)
+        .build());
+
+    return validateAccess.then(topicsService.cloneTopic(getCluster(clusterName), topicName, newTopicName)
         .map(clusterMapper::toTopic)
-        .map(s -> new ResponseEntity<>(s, HttpStatus.CREATED));
+        .map(s -> new ResponseEntity<>(s, HttpStatus.CREATED))
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Void>> deleteTopic(
       String clusterName, String topicName, ServerWebExchange exchange) {
-    return topicsService.deleteTopic(getCluster(clusterName), topicName).map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(DELETE)
+        .build());
+
+    return validateAccess.then(
+        topicsService.deleteTopic(getCluster(clusterName), topicName).map(ResponseEntity::ok)
+    );
   }
 
 
   @Override
   public Mono<ResponseEntity<Flux<TopicConfigDTO>>> getTopicConfigs(
       String clusterName, String topicName, ServerWebExchange exchange) {
-    return topicsService.getTopicConfigs(getCluster(clusterName), topicName)
-        .map(lst -> lst.stream()
-            .map(InternalTopicConfig::from)
-            .map(clusterMapper::toTopicConfig)
-            .collect(toList()))
-        .map(Flux::fromIterable)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(VIEW)
+        .build());
+
+    return validateAccess.then(
+        topicsService.getTopicConfigs(getCluster(clusterName), topicName)
+            .map(lst -> lst.stream()
+                .map(InternalTopicConfig::from)
+                .map(clusterMapper::toTopicConfig)
+                .collect(toList()))
+            .map(Flux::fromIterable)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
   public Mono<ResponseEntity<TopicDetailsDTO>> getTopicDetails(
       String clusterName, String topicName, ServerWebExchange exchange) {
-    return topicsService.getTopicDetails(getCluster(clusterName), topicName)
-        .map(clusterMapper::toTopicDetails)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(VIEW)
+        .build());
+
+    return validateAccess.then(
+        topicsService.getTopicDetails(getCluster(clusterName), topicName)
+            .map(clusterMapper::toTopicDetails)
+            .map(ResponseEntity::ok)
+    );
   }
 
-  public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName, @Valid Integer page,
+  @Override
+  public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName,
+                                                           @Valid Integer page,
                                                            @Valid Integer perPage,
                                                            @Valid Boolean showInternal,
                                                            @Valid String search,
                                                            @Valid TopicColumnsToSortDTO orderBy,
                                                            @Valid SortOrderDTO sortOrder,
                                                            ServerWebExchange exchange) {
+
     return topicsService.getTopicsForPagination(getCluster(clusterName))
         .flatMap(existingTopics -> {
           int pageSize = perPage != null && perPage > 0 ? perPage : DEFAULT_PAGE_SIZE;
@@ -115,7 +177,7 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName, @Va
                   || showInternal != null && showInternal)
               .filter(topic -> search == null || StringUtils.contains(topic.getName(), search))
               .sorted(comparator)
-              .collect(toList());
+              .toList();
           var totalPages = (filtered.size() / pageSize)
               + (filtered.size() % pageSize == 0 ? 0 : 1);
 
@@ -126,42 +188,34 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName, @Va
               .collect(toList());
 
           return topicsService.loadTopics(getCluster(clusterName), topicsPage)
+              .flatMapMany(Flux::fromIterable)
+              .filterWhen(dto -> accessControlService.isTopicAccessible(dto, clusterName))
+              .collectList()
               .map(topicsToRender ->
                   new TopicsResponseDTO()
                       .topics(topicsToRender.stream().map(clusterMapper::toTopic).collect(toList()))
                       .pageCount(totalPages));
-        }).map(ResponseEntity::ok);
-  }
-
-  private Comparator<InternalTopic> getComparatorForTopic(
-      TopicColumnsToSortDTO orderBy) {
-    var defaultComparator = Comparator.comparing(InternalTopic::getName);
-    if (orderBy == null) {
-      return defaultComparator;
-    }
-    switch (orderBy) {
-      case TOTAL_PARTITIONS:
-        return Comparator.comparing(InternalTopic::getPartitionCount);
-      case OUT_OF_SYNC_REPLICAS:
-        return Comparator.comparing(t -> t.getReplicas() - t.getInSyncReplicas());
-      case REPLICATION_FACTOR:
-        return Comparator.comparing(InternalTopic::getReplicationFactor);
-      case SIZE:
-        return Comparator.comparing(InternalTopic::getSegmentSize);
-      case NAME:
-      default:
-        return defaultComparator;
-    }
+        })
+        .map(ResponseEntity::ok);
   }
 
   @Override
   public Mono<ResponseEntity<TopicDTO>> updateTopic(
-      String clusterId, String topicName, @Valid Mono<TopicUpdateDTO> topicUpdate,
+      String clusterName, String topicName, @Valid Mono<TopicUpdateDTO> topicUpdate,
       ServerWebExchange exchange) {
-    return topicsService
-        .updateTopic(getCluster(clusterId), topicName, topicUpdate)
-        .map(clusterMapper::toTopic)
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(VIEW, EDIT)
+        .build());
+
+    return validateAccess.then(
+        topicsService
+            .updateTopic(getCluster(clusterName), topicName, topicUpdate)
+            .map(clusterMapper::toTopic)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
@@ -169,9 +223,18 @@ public Mono<ResponseEntity<PartitionsIncreaseResponseDTO>> increaseTopicPartitio
       String clusterName, String topicName,
       Mono<PartitionsIncreaseDTO> partitionsIncrease,
       ServerWebExchange exchange) {
-    return partitionsIncrease.flatMap(partitions ->
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(VIEW, EDIT)
+        .build());
+
+    return validateAccess.then(
+        partitionsIncrease.flatMap(partitions ->
             topicsService.increaseTopicPartitions(getCluster(clusterName), topicName, partitions)
-        ).map(ResponseEntity::ok);
+        ).map(ResponseEntity::ok)
+    );
   }
 
   @Override
@@ -179,23 +242,48 @@ public Mono<ResponseEntity<ReplicationFactorChangeResponseDTO>> changeReplicatio
       String clusterName, String topicName,
       Mono<ReplicationFactorChangeDTO> replicationFactorChange,
       ServerWebExchange exchange) {
-    return replicationFactorChange
-        .flatMap(rfc ->
-            topicsService.changeReplicationFactor(getCluster(clusterName), topicName, rfc))
-        .map(ResponseEntity::ok);
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(VIEW, EDIT)
+        .build());
+
+    return validateAccess.then(
+        replicationFactorChange
+            .flatMap(rfc ->
+                topicsService.changeReplicationFactor(getCluster(clusterName), topicName, rfc))
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Void>> analyzeTopic(String clusterName, String topicName, ServerWebExchange exchange) {
-    return topicAnalysisService.analyze(getCluster(clusterName), topicName)
-        .thenReturn(ResponseEntity.ok().build());
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(MESSAGES_READ)
+        .build());
+
+    return validateAccess.then(
+        topicAnalysisService.analyze(getCluster(clusterName), topicName)
+            .thenReturn(ResponseEntity.ok().build())
+    );
   }
 
   @Override
   public Mono<ResponseEntity<Void>> cancelTopicAnalysis(String clusterName, String topicName,
-                                                       ServerWebExchange exchange) {
+                                                        ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(MESSAGES_READ)
+        .build());
+
     topicAnalysisService.cancelAnalysis(getCluster(clusterName), topicName);
-    return Mono.just(ResponseEntity.ok().build());
+
+    return validateAccess.thenReturn(ResponseEntity.ok().build());
   }
 
 
@@ -203,10 +291,36 @@ public Mono<ResponseEntity<Void>> cancelTopicAnalysis(String clusterName, String
   public Mono<ResponseEntity<TopicAnalysisDTO>> getTopicAnalysis(String clusterName,
                                                                  String topicName,
                                                                  ServerWebExchange exchange) {
-    return Mono.just(
-        topicAnalysisService.getTopicAnalysis(getCluster(clusterName), topicName)
-            .map(ResponseEntity::ok)
-            .orElseGet(() -> ResponseEntity.notFound().build())
-    );
+
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(MESSAGES_READ)
+        .build());
+
+    return validateAccess.thenReturn(topicAnalysisService.getTopicAnalysis(getCluster(clusterName), topicName)
+        .map(ResponseEntity::ok)
+        .orElseGet(() -> ResponseEntity.notFound().build()));
+  }
+
+  private Comparator<InternalTopic> getComparatorForTopic(
+      TopicColumnsToSortDTO orderBy) {
+    var defaultComparator = Comparator.comparing(InternalTopic::getName);
+    if (orderBy == null) {
+      return defaultComparator;
+    }
+    switch (orderBy) {
+      case TOTAL_PARTITIONS:
+        return Comparator.comparing(InternalTopic::getPartitionCount);
+      case OUT_OF_SYNC_REPLICAS:
+        return Comparator.comparing(t -> t.getReplicas() - t.getInSyncReplicas());
+      case REPLICATION_FACTOR:
+        return Comparator.comparing(InternalTopic::getReplicationFactor);
+      case SIZE:
+        return Comparator.comparing(InternalTopic::getSegmentSize);
+      case NAME:
+      default:
+        return defaultComparator;
+    }
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java
index ecd1915316f..6c05eec206e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java
@@ -7,6 +7,8 @@
 
 public enum ErrorCode {
 
+  FORBIDDEN(403, HttpStatus.FORBIDDEN),
+
   UNEXPECTED(5000, HttpStatus.INTERNAL_SERVER_ERROR),
   KSQL_API_ERROR(5001, HttpStatus.INTERNAL_SERVER_ERROR),
   BINDING_FAIL(4001, HttpStatus.BAD_REQUEST),
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
new file mode 100644
index 00000000000..abe18fb9668
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
@@ -0,0 +1,134 @@
+package com.provectus.kafka.ui.model.rbac;
+
+import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
+import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
+import com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction;
+import com.provectus.kafka.ui.model.rbac.permission.KsqlAction;
+import com.provectus.kafka.ui.model.rbac.permission.SchemaAction;
+import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import lombok.Value;
+import org.springframework.util.Assert;
+
+@Value
+public class AccessContext {
+
+  String cluster;
+  Collection<ClusterConfigAction> clusterConfigActions;
+
+  String topic;
+  Collection<TopicAction> topicActions;
+
+  String consumerGroup;
+  Collection<ConsumerGroupAction> consumerGroupActions;
+
+  String connect;
+  Collection<ConnectAction> connectActions;
+
+  String connector;
+
+  String schema;
+  Collection<SchemaAction> schemaActions;
+
+  Collection<KsqlAction> ksqlActions;
+
+  public static AccessContextBuilder builder() {
+    return new AccessContextBuilder();
+  }
+
+  public static final class AccessContextBuilder {
+    private String cluster;
+    private Collection<ClusterConfigAction> clusterConfigActions = Collections.emptySet();
+    private String topic;
+    private Collection<TopicAction> topicActions = Collections.emptySet();
+    private String consumerGroup;
+    private Collection<ConsumerGroupAction> consumerGroupActions = Collections.emptySet();
+    private String connect;
+    private Collection<ConnectAction> connectActions = Collections.emptySet();
+    private String connector;
+    private String schema;
+    private Collection<SchemaAction> schemaActions = Collections.emptySet();
+    private Collection<KsqlAction> ksqlActions = Collections.emptySet();
+
+    private AccessContextBuilder() {
+    }
+
+    public AccessContextBuilder cluster(String cluster) {
+      this.cluster = cluster;
+      return this;
+    }
+
+    public AccessContextBuilder clusterConfigActions(ClusterConfigAction... actions) {
+      Assert.isTrue(actions.length > 0, "actions not present");
+      this.clusterConfigActions = List.of(actions);
+      return this;
+    }
+
+    public AccessContextBuilder topic(String topic) {
+      this.topic = topic;
+      return this;
+    }
+
+    public AccessContextBuilder topicActions(TopicAction... actions) {
+      Assert.isTrue(actions.length > 0, "actions not present");
+      this.topicActions = List.of(actions);
+      return this;
+    }
+
+    public AccessContextBuilder consumerGroup(String consumerGroup) {
+      this.consumerGroup = consumerGroup;
+      return this;
+    }
+
+    public AccessContextBuilder consumerGroupActions(ConsumerGroupAction... actions) {
+      Assert.isTrue(actions.length > 0, "actions not present");
+      this.consumerGroupActions = List.of(actions);
+      return this;
+    }
+
+    public AccessContextBuilder connect(String connect) {
+      this.connect = connect;
+      return this;
+    }
+
+    public AccessContextBuilder connectActions(ConnectAction... actions) {
+      Assert.isTrue(actions.length > 0, "actions not present");
+      this.connectActions = List.of(actions);
+      return this;
+    }
+
+    public AccessContextBuilder connector(String connector) {
+      this.connector = connector;
+      return this;
+    }
+
+    public AccessContextBuilder schema(String schema) {
+      this.schema = schema;
+      return this;
+    }
+
+    public AccessContextBuilder schemaActions(SchemaAction... actions) {
+      Assert.isTrue(actions.length > 0, "actions not present");
+      this.schemaActions = List.of(actions);
+      return this;
+    }
+
+    public AccessContextBuilder ksqlActions(KsqlAction... actions) {
+      Assert.isTrue(actions.length > 0, "actions not present");
+      this.ksqlActions = List.of(actions);
+      return this;
+    }
+
+    public AccessContext build() {
+      return new AccessContext(cluster, clusterConfigActions,
+          topic, topicActions,
+          consumerGroup, consumerGroupActions,
+          connect, connectActions,
+          connector,
+          schema, schemaActions,
+          ksqlActions);
+    }
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
new file mode 100644
index 00000000000..9aa23b46c71
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
@@ -0,0 +1,72 @@
+package com.provectus.kafka.ui.model.rbac;
+
+import static com.provectus.kafka.ui.model.rbac.Resource.CLUSTERCONFIG;
+import static com.provectus.kafka.ui.model.rbac.Resource.KSQL;
+
+import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
+import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
+import com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction;
+import com.provectus.kafka.ui.model.rbac.permission.KsqlAction;
+import com.provectus.kafka.ui.model.rbac.permission.SchemaAction;
+import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import org.apache.commons.collections.CollectionUtils;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.util.Assert;
+
+@Getter
+@ToString
+@EqualsAndHashCode
+public class Permission {
+
+  Resource resource;
+
+  @Nullable
+  Pattern value;
+  List<String> actions;
+
+  @SuppressWarnings("unused")
+  public void setResource(String resource) {
+    this.resource = Resource.fromString(resource.toUpperCase());
+  }
+
+  public void setValue(String value) {
+    this.value = Pattern.compile(value);
+  }
+
+  @SuppressWarnings("unused")
+  public void setActions(List<String> actions) {
+    this.actions = actions;
+  }
+
+  public void validate() {
+    Assert.notNull(resource, "resource cannot be null");
+    if (!List.of(KSQL, CLUSTERCONFIG).contains(this.resource)) {
+      Assert.notNull(value, "permission value can't be empty for resource " + resource);
+    }
+  }
+
+  public void transform() {
+    if (CollectionUtils.isEmpty(actions) || this.actions.stream().noneMatch("ALL"::equalsIgnoreCase)) {
+      return;
+    }
+    this.actions = getActionValues();
+  }
+
+  private List<String> getActionValues() {
+    return switch (this.resource) {
+      case CLUSTERCONFIG -> Arrays.stream(ClusterConfigAction.values()).map(Enum::toString).toList();
+      case TOPIC -> Arrays.stream(TopicAction.values()).map(Enum::toString).toList();
+      case CONSUMER -> Arrays.stream(ConsumerGroupAction.values()).map(Enum::toString).toList();
+      case SCHEMA -> Arrays.stream(SchemaAction.values()).map(Enum::toString).toList();
+      case CONNECT -> Arrays.stream(ConnectAction.values()).map(Enum::toString).toList();
+      case KSQL -> Arrays.stream(KsqlAction.values()).map(Enum::toString).toList();
+    };
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
new file mode 100644
index 00000000000..3dafd7e6b24
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
@@ -0,0 +1,21 @@
+package com.provectus.kafka.ui.model.rbac;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum Resource {
+
+  CLUSTERCONFIG,
+  TOPIC,
+  CONSUMER,
+  SCHEMA,
+  CONNECT,
+  KSQL;
+
+  @Nullable
+  public static Resource fromString(String name) {
+    return EnumUtils.getEnum(Resource.class, name);
+  }
+
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Role.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Role.java
new file mode 100644
index 00000000000..96a03e08a3c
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Role.java
@@ -0,0 +1,19 @@
+package com.provectus.kafka.ui.model.rbac;
+
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class Role {
+
+  String name;
+  List<String> clusters;
+  List<Subject> subjects;
+  List<Permission> permissions;
+
+  public void validate() {
+    permissions.forEach(Permission::transform);
+    permissions.forEach(Permission::validate);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Subject.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Subject.java
new file mode 100644
index 00000000000..851a3d1fc4a
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Subject.java
@@ -0,0 +1,24 @@
+package com.provectus.kafka.ui.model.rbac;
+
+import com.provectus.kafka.ui.model.rbac.provider.Provider;
+import lombok.Getter;
+
+@Getter
+public class Subject {
+
+  Provider provider;
+  String type;
+  String value;
+
+  public void setProvider(String provider) {
+    this.provider = Provider.fromString(provider.toUpperCase());
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ClusterConfigAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ClusterConfigAction.java
new file mode 100644
index 00000000000..54adcf5340a
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ClusterConfigAction.java
@@ -0,0 +1,18 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum ClusterConfigAction implements PermissibleAction {
+
+  VIEW,
+  EDIT
+
+  ;
+
+  @Nullable
+  public static ClusterConfigAction fromString(String name) {
+    return EnumUtils.getEnum(ClusterConfigAction.class, name);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java
new file mode 100644
index 00000000000..3db4d4953c4
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java
@@ -0,0 +1,19 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum ConnectAction implements PermissibleAction {
+
+  VIEW,
+  EDIT,
+  CREATE
+
+  ;
+
+  @Nullable
+  public static ConnectAction fromString(String name) {
+    return EnumUtils.getEnum(ConnectAction.class, name);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConsumerGroupAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConsumerGroupAction.java
new file mode 100644
index 00000000000..cef23059db6
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConsumerGroupAction.java
@@ -0,0 +1,20 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum ConsumerGroupAction implements PermissibleAction {
+
+  VIEW,
+  DELETE,
+
+  RESET_OFFSETS
+
+  ;
+
+  @Nullable
+  public static ConsumerGroupAction fromString(String name) {
+    return EnumUtils.getEnum(ConsumerGroupAction.class, name);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/KsqlAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/KsqlAction.java
new file mode 100644
index 00000000000..e3a6aa8c9f9
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/KsqlAction.java
@@ -0,0 +1,15 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum KsqlAction implements PermissibleAction {
+
+  EXECUTE;
+
+  @Nullable
+  public static KsqlAction fromString(String name) {
+    return EnumUtils.getEnum(KsqlAction.class, name);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java
new file mode 100644
index 00000000000..3a99eb10e6f
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java
@@ -0,0 +1,4 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+public interface PermissibleAction {
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/SchemaAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/SchemaAction.java
new file mode 100644
index 00000000000..1f3f4649256
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/SchemaAction.java
@@ -0,0 +1,21 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum SchemaAction implements PermissibleAction {
+
+  VIEW,
+  CREATE,
+  DELETE,
+  EDIT,
+  MODIFY_GLOBAL_COMPATIBILITY
+
+  ;
+
+  @Nullable
+  public static SchemaAction fromString(String name) {
+    return EnumUtils.getEnum(SchemaAction.class, name);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/TopicAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/TopicAction.java
new file mode 100644
index 00000000000..debf9fac4c0
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/TopicAction.java
@@ -0,0 +1,24 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum TopicAction implements PermissibleAction {
+
+  VIEW,
+  CREATE,
+  EDIT,
+  DELETE,
+
+  MESSAGES_READ,
+  MESSAGES_PRODUCE,
+  MESSAGES_DELETE,
+
+  ;
+
+  @Nullable
+  public static TopicAction fromString(String name) {
+    return EnumUtils.getEnum(TopicAction.class, name);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/provider/Provider.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/provider/Provider.java
new file mode 100644
index 00000000000..27f7a56ada9
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/provider/Provider.java
@@ -0,0 +1,27 @@
+package com.provectus.kafka.ui.model.rbac.provider;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum Provider {
+
+  OAUTH_GOOGLE,
+  OAUTH_GITHUB,
+
+  OAUTH_COGNITO,
+
+  LDAP,
+  LDAP_AD;
+
+  @Nullable
+  public static Provider fromString(String name) {
+    return EnumUtils.getEnum(Provider.class, name);
+  }
+
+  public static class Name {
+    public static String GOOGLE = "google";
+    public static String GITHUB = "github";
+    public static String COGNITO = "cognito";
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java
index 0dd3458abd1..406ab2db5d4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.util.annotations.KafkaClientInternalsDependant;
+import com.provectus.kafka.ui.util.annotation.KafkaClientInternalsDependant;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java
index 42c75f3d4e7..18071400b5a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClusterService.java
@@ -38,6 +38,7 @@ public Mono<ClusterStatsDTO> getClusterStats(KafkaCluster cluster) {
   }
 
   public Mono<ClusterMetricsDTO> getClusterMetrics(KafkaCluster cluster) {
+
     return Mono.just(
         clusterMapper.toClusterMetrics(
             statisticsCache.get(cluster).getMetrics()));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index 55289a87edd..e2a9592f7e9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -5,6 +5,7 @@
 import com.provectus.kafka.ui.model.InternalTopicConsumerGroup;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.SortOrderDTO;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -35,6 +36,7 @@
 public class ConsumerGroupService {
 
   private final AdminClientService adminClientService;
+  private final AccessControlService accessControlService;
 
   private Mono<List<InternalConsumerGroup>> getConsumerGroups(
       ReactiveAdminClient ac,
@@ -107,8 +109,7 @@ public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
       int perPage,
       @Nullable String search,
       ConsumerGroupOrderingDTO orderBy,
-      SortOrderDTO sortOrderDto
-  ) {
+      SortOrderDTO sortOrderDto) {
     var comparator = sortOrderDto.equals(SortOrderDTO.ASC)
         ? getPaginationComparator(orderBy)
         : getPaginationComparator(orderBy).reversed();
@@ -121,9 +122,14 @@ public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
                     .skip((long) (page - 1) * perPage)
                     .limit(perPage)
                     .collect(Collectors.toList())
-            ).map(cgs -> new ConsumerGroupsPage(
-                cgs,
-                (descriptions.size() / perPage) + (descriptions.size() % perPage == 0 ? 0 : 1))))
+            )
+                .flatMapMany(Flux::fromIterable)
+                .filterWhen(
+                    cg -> accessControlService.isConsumerGroupAccessible(cg.getGroupId(), cluster.getName()))
+                .collect(Collectors.toList())
+                .map(cgs -> new ConsumerGroupsPage(
+                    cgs,
+                    (descriptions.size() / perPage) + (descriptions.size() % perPage == 0 ? 0 : 1))))
     );
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
index 69fd7a26276..d749c8c9005 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
@@ -52,19 +52,16 @@ public class KafkaConnectService {
   private final KafkaConfigSanitizer kafkaConfigSanitizer;
   private final KafkaConnectClientsFactory kafkaConnectClientsFactory;
 
-  public Mono<Flux<ConnectDTO>> getConnects(KafkaCluster cluster) {
-    return Mono.just(
-        Flux.fromIterable(
-            cluster.getKafkaConnect().stream()
-                .map(clusterMapper::toKafkaConnect)
-                .collect(Collectors.toList())
-        )
-    );
+  public List<ConnectDTO> getConnects(KafkaCluster cluster) {
+    return cluster.getKafkaConnect().stream()
+        .map(clusterMapper::toKafkaConnect)
+        .collect(Collectors.toList());
   }
 
   public Flux<FullConnectorInfoDTO> getAllConnectors(final KafkaCluster cluster,
                                                      final String search) {
-    return getConnects(cluster)
+    Mono<Flux<ConnectDTO>> clusters = Mono.just(Flux.fromIterable(getConnects(cluster))); // TODO get rid
+    return clusters
         .flatMapMany(Function.identity())
         .flatMap(connect -> getConnectorNames(cluster, connect.getName()))
         .flatMap(pair -> getConnector(cluster, pair.getT1(), pair.getT2()))
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index bca3bac3a92..b06716e6314 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -11,7 +11,7 @@
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.util.MapUtil;
 import com.provectus.kafka.ui.util.NumberUtil;
-import com.provectus.kafka.ui.util.annotations.KafkaClientInternalsDependant;
+import com.provectus.kafka.ui.util.annotation.KafkaClientInternalsDependant;
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
index 1cf3cb6ea5b..43a25636cc6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
@@ -24,6 +24,7 @@
 import com.provectus.kafka.ui.util.SecuredWebClient;
 import java.io.IOException;
 import java.net.URI;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Formatter;
 import java.util.List;
@@ -198,17 +199,12 @@ public Mono<Void> deleteSchemaSubjectEntirely(KafkaCluster cluster,
    * and then returns the whole content by requesting its latest version.
    */
   public Mono<SchemaSubjectDTO> registerNewSchema(KafkaCluster cluster,
-                                                  Mono<NewSchemaSubjectDTO> newSchemaSubject) {
-    return newSchemaSubject
-        .flatMap(schema -> {
-          SchemaTypeDTO schemaType =
-              SchemaTypeDTO.AVRO == schema.getSchemaType() ? null : schema.getSchemaType();
-          Mono<InternalNewSchema> newSchema =
-              Mono.just(new InternalNewSchema(schema.getSchema(), schemaType));
-          String subject = schema.getSubject();
-          return submitNewSchema(subject, newSchema, cluster)
-              .flatMap(resp -> getLatestSchemaVersionBySubject(cluster, subject));
-        });
+                                                  NewSchemaSubjectDTO dto) {
+    SchemaTypeDTO schemaType = SchemaTypeDTO.AVRO == dto.getSchemaType() ? null : dto.getSchemaType();
+    Mono<InternalNewSchema> newSchema = Mono.just(new InternalNewSchema(dto.getSchema(), schemaType));
+    String subject = dto.getSubject();
+    return submitNewSchema(subject, newSchema, cluster)
+        .flatMap(resp -> getLatestSchemaVersionBySubject(cluster, subject));
   }
 
   @NotNull
@@ -258,18 +254,18 @@ public Mono<Void> updateSchemaCompatibility(KafkaCluster cluster, @Nullable Stri
                                               Mono<CompatibilityLevelDTO> compatibilityLevel) {
     String configEndpoint = Objects.isNull(schemaName) ? "/config" : "/config/{schemaName}";
     return configuredWebClient(
-            cluster,
-            HttpMethod.PUT,
-            configEndpoint,
+        cluster,
+        HttpMethod.PUT,
+        configEndpoint,
         schemaName)
-            .contentType(MediaType.APPLICATION_JSON)
-            .body(BodyInserters.fromPublisher(compatibilityLevel, CompatibilityLevelDTO.class))
-            .retrieve()
-            .onStatus(NOT_FOUND::equals,
-                throwIfNotFoundStatus(formatted(NO_SUCH_SCHEMA, schemaName)))
-            .bodyToMono(Void.class)
-            .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
-                () -> this.updateSchemaCompatibility(cluster, schemaName, compatibilityLevel))));
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(BodyInserters.fromPublisher(compatibilityLevel, CompatibilityLevelDTO.class))
+        .retrieve()
+        .onStatus(NOT_FOUND::equals,
+            throwIfNotFoundStatus(formatted(NO_SUCH_SCHEMA, schemaName)))
+        .bodyToMono(Void.class)
+        .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
+            () -> this.updateSchemaCompatibility(cluster, schemaName, compatibilityLevel))));
   }
 
   public Mono<Void> updateSchemaCompatibility(KafkaCluster cluster,
@@ -278,7 +274,7 @@ public Mono<Void> updateSchemaCompatibility(KafkaCluster cluster,
   }
 
   public Mono<InternalCompatibilityLevel> getSchemaCompatibilityLevel(KafkaCluster cluster,
-                                                                 String schemaName) {
+                                                                      String schemaName) {
     String globalConfig = Objects.isNull(schemaName) ? "/config" : "/config/{schemaName}";
     final var values = new LinkedMultiValueMap<String, String>();
     values.add("defaultToGlobal", "true");
@@ -298,7 +294,7 @@ public Mono<InternalCompatibilityLevel> getGlobalSchemaCompatibilityLevel(KafkaC
   }
 
   private Mono<InternalCompatibilityLevel> getSchemaCompatibilityInfoOrGlobal(KafkaCluster cluster,
-                                                                         String schemaName) {
+                                                                              String schemaName) {
     return this.getSchemaCompatibilityLevel(cluster, schemaName)
         .switchIfEmpty(this.getGlobalSchemaCompatibilityLevel(cluster));
   }
@@ -306,18 +302,18 @@ private Mono<InternalCompatibilityLevel> getSchemaCompatibilityInfoOrGlobal(Kafk
   public Mono<InternalCompatibilityCheck> checksSchemaCompatibility(
       KafkaCluster cluster, String schemaName, Mono<NewSchemaSubjectDTO> newSchemaSubject) {
     return configuredWebClient(
-            cluster,
-            HttpMethod.POST,
-            "/compatibility/subjects/{schemaName}/versions/latest",
+        cluster,
+        HttpMethod.POST,
+        "/compatibility/subjects/{schemaName}/versions/latest",
         schemaName)
-            .contentType(MediaType.APPLICATION_JSON)
-            .body(BodyInserters.fromPublisher(newSchemaSubject, NewSchemaSubjectDTO.class))
-            .retrieve()
-            .onStatus(NOT_FOUND::equals,
-                throwIfNotFoundStatus(formatted(NO_SUCH_SCHEMA, schemaName)))
-            .bodyToMono(InternalCompatibilityCheck.class)
-            .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
-                () -> this.checksSchemaCompatibility(cluster, schemaName, newSchemaSubject))));
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(BodyInserters.fromPublisher(newSchemaSubject, NewSchemaSubjectDTO.class))
+        .retrieve()
+        .onStatus(NOT_FOUND::equals,
+            throwIfNotFoundStatus(formatted(NO_SUCH_SCHEMA, schemaName)))
+        .bodyToMono(InternalCompatibilityCheck.class)
+        .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
+            () -> this.checksSchemaCompatibility(cluster, schemaName, newSchemaSubject))));
   }
 
   public String formatted(String str, Object... args) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 19757ab6aa8..ab22cecaafc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -460,8 +460,12 @@ public Mono<List<InternalTopic>> getTopicsForPagination(KafkaCluster cluster) {
   }
 
   private Mono<List<String>> filterExisting(KafkaCluster cluster, Collection<String> topics) {
-    return adminClientService.get(cluster).flatMap(ac -> ac.listTopics(true))
-        .map(existing -> existing.stream().filter(topics::contains).collect(toList()));
+    return adminClientService.get(cluster)
+        .flatMap(ac -> ac.listTopics(true))
+        .map(existing -> existing
+            .stream()
+            .filter(topics::contains)
+            .collect(toList()));
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AbstractProviderCondition.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AbstractProviderCondition.java
new file mode 100644
index 00000000000..4382ad8646f
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AbstractProviderCondition.java
@@ -0,0 +1,31 @@
+package com.provectus.kafka.ui.service.rbac;
+
+import com.provectus.kafka.ui.config.auth.OAuthProperties;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.context.properties.bind.Bindable;
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.core.env.Environment;
+
+public abstract class AbstractProviderCondition {
+  private static final Bindable<Map<String, OAuthProperties.OAuth2Provider>> OAUTH2_PROPERTIES = Bindable
+      .mapOf(String.class, OAuthProperties.OAuth2Provider.class);
+
+  protected Set<String> getRegisteredProvidersTypes(final Environment env) {
+    final Map<String, OAuthProperties.OAuth2Provider> properties = Binder.get(env)
+        .bind("auth.oauth2.client", OAUTH2_PROPERTIES)
+        .orElse(Map.of());
+    return properties.values().stream()
+        .map(OAuthProperties.OAuth2Provider::getCustomParams)
+        .filter(Objects::nonNull)
+        .filter(Predicate.not(Map::isEmpty))
+        .map(params -> params.get("type"))
+        .filter(Objects::nonNull)
+        .filter(StringUtils::isNotEmpty)
+        .collect(Collectors.toSet());
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
new file mode 100644
index 00000000000..32cde63adbd
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -0,0 +1,398 @@
+package com.provectus.kafka.ui.service.rbac;
+
+import com.provectus.kafka.ui.config.auth.AuthenticatedUser;
+import com.provectus.kafka.ui.config.auth.RbacUser;
+import com.provectus.kafka.ui.config.auth.RoleBasedAccessControlProperties;
+import com.provectus.kafka.ui.model.ClusterDTO;
+import com.provectus.kafka.ui.model.ConnectDTO;
+import com.provectus.kafka.ui.model.InternalTopic;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.Permission;
+import com.provectus.kafka.ui.model.rbac.Resource;
+import com.provectus.kafka.ui.model.rbac.Role;
+import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
+import com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction;
+import com.provectus.kafka.ui.model.rbac.permission.SchemaAction;
+import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
+import com.provectus.kafka.ui.service.rbac.extractor.CognitoAuthorityExtractor;
+import com.provectus.kafka.ui.service.rbac.extractor.GithubAuthorityExtractor;
+import com.provectus.kafka.ui.service.rbac.extractor.GoogleAuthorityExtractor;
+import com.provectus.kafka.ui.service.rbac.extractor.LdapAuthorityExtractor;
+import com.provectus.kafka.ui.service.rbac.extractor.ProviderAuthorityExtractor;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+import javax.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.core.context.ReactiveSecurityContextHolder;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import reactor.core.publisher.Mono;
+
+@Service
+@RequiredArgsConstructor
+@EnableConfigurationProperties(RoleBasedAccessControlProperties.class)
+@Slf4j
+public class AccessControlService {
+
+  @Nullable
+  private final InMemoryReactiveClientRegistrationRepository clientRegistrationRepository;
+
+  private boolean rbacEnabled = false;
+  private Set<ProviderAuthorityExtractor> extractors = Collections.emptySet();
+  private final RoleBasedAccessControlProperties properties;
+
+  @PostConstruct
+  public void init() {
+    if (properties.getRoles().isEmpty()) {
+      log.trace("No roles provided, disabling RBAC");
+      return;
+    }
+    rbacEnabled = true;
+
+    this.extractors = properties.getRoles()
+        .stream()
+        .map(role -> role.getSubjects()
+            .stream()
+            .map(provider -> switch (provider.getProvider()) {
+              case OAUTH_COGNITO -> new CognitoAuthorityExtractor();
+              case OAUTH_GOOGLE -> new GoogleAuthorityExtractor();
+              case OAUTH_GITHUB -> new GithubAuthorityExtractor();
+              case LDAP, LDAP_AD -> new LdapAuthorityExtractor();
+            }).collect(Collectors.toSet()))
+        .flatMap(Set::stream)
+        .collect(Collectors.toSet());
+
+    if ((clientRegistrationRepository == null || !clientRegistrationRepository.iterator().hasNext())
+        && !properties.getRoles().isEmpty()) {
+      log.error("Roles are configured but no authentication methods are present. Authentication might fail.");
+    }
+  }
+
+  public Mono<Void> validateAccess(AccessContext context) {
+    if (!rbacEnabled) {
+      return Mono.empty();
+    }
+
+    return getUser()
+        .doOnNext(user -> {
+          boolean accessGranted =
+              isClusterAccessible(context, user)
+                  && isClusterConfigAccessible(context, user)
+                  && isTopicAccessible(context, user)
+                  && isConsumerGroupAccessible(context, user)
+                  && isConnectAccessible(context, user)
+                  && isConnectorAccessible(context, user) // TODO connector selectors
+                  && isSchemaAccessible(context, user)
+                  && isKsqlAccessible(context, user);
+
+          if (!accessGranted) {
+            throw new AccessDeniedException("Access denied");
+          }
+        })
+        .then();
+  }
+
+  public Mono<AuthenticatedUser> getUser() {
+    return ReactiveSecurityContextHolder.getContext()
+        .map(SecurityContext::getAuthentication)
+        .filter(authentication -> authentication.getPrincipal() instanceof RbacUser)
+        .map(authentication -> ((RbacUser) authentication.getPrincipal()))
+        .map(user -> new AuthenticatedUser(user.name(), user.groups()));
+  }
+
+  private boolean isClusterAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    Assert.isTrue(StringUtils.isNotEmpty(context.getCluster()), "cluster value is empty");
+
+    return properties.getRoles()
+        .stream()
+        .filter(filterRole(user))
+        .anyMatch(filterCluster(context.getCluster()));
+  }
+
+  public Mono<Boolean> isClusterAccessible(ClusterDTO cluster) {
+    if (!rbacEnabled) {
+      return Mono.just(true);
+    }
+
+    AccessContext accessContext = AccessContext
+        .builder()
+        .cluster(cluster.getName())
+        .build();
+
+    return getUser().map(u -> isClusterAccessible(accessContext, u));
+  }
+
+  public boolean isClusterConfigAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    if (CollectionUtils.isEmpty(context.getClusterConfigActions())) {
+      return true;
+    }
+    Assert.isTrue(StringUtils.isNotEmpty(context.getCluster()), "cluster value is empty");
+
+    Set<String> requiredActions = context.getClusterConfigActions()
+        .stream()
+        .map(a -> a.toString().toUpperCase())
+        .collect(Collectors.toSet());
+
+    return isAccessible(Resource.CLUSTERCONFIG, context.getCluster(), user, context, requiredActions);
+  }
+
+  public boolean isTopicAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    if (context.getTopic() == null && context.getTopicActions().isEmpty()) {
+      return true;
+    }
+    Assert.isTrue(!context.getTopicActions().isEmpty(), "actions are empty");
+
+    Set<String> requiredActions = context.getTopicActions()
+        .stream()
+        .map(a -> a.toString().toUpperCase())
+        .collect(Collectors.toSet());
+
+    return isAccessible(Resource.TOPIC, context.getTopic(), user, context, requiredActions);
+  }
+
+  public Mono<Boolean> isTopicAccessible(InternalTopic dto, String clusterName) {
+    if (!rbacEnabled) {
+      return Mono.just(true);
+    }
+
+    AccessContext accessContext = AccessContext
+        .builder()
+        .cluster(clusterName)
+        .topic(dto.getName())
+        .topicActions(TopicAction.VIEW)
+        .build();
+
+    return getUser().map(u -> isTopicAccessible(accessContext, u));
+  }
+
+  private boolean isConsumerGroupAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    if (context.getConsumerGroup() == null && context.getConsumerGroupActions().isEmpty()) {
+      return true;
+    }
+    Assert.isTrue(!context.getConsumerGroupActions().isEmpty(), "actions are empty");
+
+    Set<String> requiredActions = context.getConsumerGroupActions()
+        .stream()
+        .map(a -> a.toString().toUpperCase())
+        .collect(Collectors.toSet());
+
+    return isAccessible(Resource.CONSUMER, context.getConsumerGroup(), user, context, requiredActions);
+  }
+
+  public Mono<Boolean> isConsumerGroupAccessible(String groupId, String clusterName) {
+    if (!rbacEnabled) {
+      return Mono.just(true);
+    }
+
+    AccessContext accessContext = AccessContext
+        .builder()
+        .cluster(clusterName)
+        .consumerGroup(groupId)
+        .consumerGroupActions(ConsumerGroupAction.VIEW)
+        .build();
+
+    return getUser().map(u -> isConsumerGroupAccessible(accessContext, u));
+  }
+
+  public boolean isSchemaAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    if (context.getSchema() == null && context.getSchemaActions().isEmpty()) {
+      return true;
+    }
+    Assert.isTrue(!context.getSchemaActions().isEmpty(), "actions are empty");
+
+    Set<String> requiredActions = context.getSchemaActions()
+        .stream()
+        .map(a -> a.toString().toUpperCase())
+        .collect(Collectors.toSet());
+
+    return isAccessible(Resource.SCHEMA, context.getSchema(), user, context, requiredActions);
+  }
+
+  public Mono<Boolean> isSchemaAccessible(String schema, String clusterName) {
+    if (!rbacEnabled) {
+      return Mono.just(true);
+    }
+
+    AccessContext accessContext = AccessContext
+        .builder()
+        .cluster(clusterName)
+        .schema(schema)
+        .schemaActions(SchemaAction.VIEW)
+        .build();
+
+    return getUser().map(u -> isSchemaAccessible(accessContext, u));
+  }
+
+  public boolean isConnectAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    if (context.getConnect() == null && context.getConnectActions().isEmpty()) {
+      return true;
+    }
+    Assert.isTrue(!context.getConnectActions().isEmpty(), "actions are empty");
+
+    Set<String> requiredActions = context.getConnectActions()
+        .stream()
+        .map(a -> a.toString().toUpperCase())
+        .collect(Collectors.toSet());
+
+    return isAccessible(Resource.CONNECT, context.getConnect(), user, context, requiredActions);
+  }
+
+  public Mono<Boolean> isConnectAccessible(ConnectDTO dto, String clusterName) {
+    if (!rbacEnabled) {
+      return Mono.just(true);
+    }
+
+    return isConnectAccessible(dto.getName(), clusterName);
+  }
+
+  public Mono<Boolean> isConnectAccessible(String connectName, String clusterName) {
+    if (!rbacEnabled) {
+      return Mono.just(true);
+    }
+
+    AccessContext accessContext = AccessContext
+        .builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW)
+        .build();
+
+    return getUser().map(u -> isConnectAccessible(accessContext, u));
+  }
+
+  public boolean isConnectorAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    return isConnectAccessible(context, user);
+  }
+
+  public Mono<Boolean> isConnectorAccessible(String connectName, String connectorName, String clusterName) {
+    if (!rbacEnabled) {
+      return Mono.just(true);
+    }
+
+    AccessContext accessContext = AccessContext
+        .builder()
+        .cluster(clusterName)
+        .connect(connectName)
+        .connectActions(ConnectAction.VIEW)
+        .connector(connectorName)
+        .build();
+
+    return getUser().map(u -> isConnectorAccessible(accessContext, u));
+  }
+
+  private boolean isKsqlAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    if (context.getKsqlActions().isEmpty()) {
+      return true;
+    }
+
+    Set<String> requiredActions = context.getKsqlActions()
+        .stream()
+        .map(a -> a.toString().toUpperCase())
+        .collect(Collectors.toSet());
+
+    return isAccessible(Resource.KSQL, null, user, context, requiredActions);
+  }
+
+  public Set<ProviderAuthorityExtractor> getExtractors() {
+    return extractors;
+  }
+
+  public List<Role> getRoles() {
+    if (!rbacEnabled) {
+      return Collections.emptyList();
+    }
+    return Collections.unmodifiableList(properties.getRoles());
+  }
+
+  private boolean isAccessible(Resource resource, String resourceValue,
+                               AuthenticatedUser user, AccessContext context, Set<String> requiredActions) {
+    Set<String> grantedActions = properties.getRoles()
+        .stream()
+        .filter(filterRole(user))
+        .filter(filterCluster(context.getCluster()))
+        .flatMap(grantedRole -> grantedRole.getPermissions().stream())
+        .filter(filterResource(resource))
+        .filter(filterResourceValue(resourceValue))
+        .flatMap(grantedPermission -> grantedPermission.getActions().stream())
+        .map(String::toUpperCase)
+        .collect(Collectors.toSet());
+
+    return grantedActions.containsAll(requiredActions);
+  }
+
+  private Predicate<Role> filterRole(AuthenticatedUser user) {
+    return role -> user.groups().contains(role.getName());
+  }
+
+  private Predicate<Role> filterCluster(String cluster) {
+    return grantedRole -> grantedRole.getClusters()
+        .stream()
+        .anyMatch(cluster::equalsIgnoreCase);
+  }
+
+  private Predicate<Permission> filterResource(Resource resource) {
+    return grantedPermission -> resource == grantedPermission.getResource();
+  }
+
+  private Predicate<Permission> filterResourceValue(String resourceValue) {
+
+    if (resourceValue == null) {
+      return grantedPermission -> true;
+    }
+    return grantedPermission -> {
+      Pattern value = grantedPermission.getValue();
+      if (value == null) {
+        return true;
+      }
+      return value.matcher(resourceValue).matches();
+    };
+  }
+
+  public boolean isRbacEnabled() {
+    return rbacEnabled;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
new file mode 100644
index 00000000000..a10e0829cc9
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
@@ -0,0 +1,70 @@
+package com.provectus.kafka.ui.service.rbac.extractor;
+
+import com.nimbusds.jose.shaded.json.JSONArray;
+import com.provectus.kafka.ui.model.rbac.Role;
+import com.provectus.kafka.ui.model.rbac.provider.Provider;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+public class CognitoAuthorityExtractor implements ProviderAuthorityExtractor {
+
+  private static final String COGNITO_GROUPS_ATTRIBUTE_NAME = "cognito:groups";
+
+  @Override
+  public boolean isApplicable(String provider) {
+    return Provider.Name.COGNITO.equalsIgnoreCase(provider);
+  }
+
+  @Override
+  public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<String, Object> additionalParams) {
+    log.debug("Extracting cognito user authorities");
+
+    DefaultOAuth2User principal;
+    try {
+      principal = (DefaultOAuth2User) value;
+    } catch (ClassCastException e) {
+      log.error("Can't cast value to DefaultOAuth2User", e);
+      throw new RuntimeException();
+    }
+
+    Set<String> groupsByUsername = acs.getRoles()
+        .stream()
+        .filter(r -> r.getSubjects()
+            .stream()
+            .filter(s -> s.getProvider().equals(Provider.OAUTH_COGNITO))
+            .filter(s -> s.getType().equals("user"))
+            .anyMatch(s -> s.getValue().equals(principal.getName())))
+        .map(Role::getName)
+        .collect(Collectors.toSet());
+
+    JSONArray groups = principal.getAttribute(COGNITO_GROUPS_ATTRIBUTE_NAME);
+    if (groups == null) {
+      log.debug("Cognito groups param is not present");
+      return Mono.just(groupsByUsername);
+    }
+
+    Set<String> groupsByGroups = acs.getRoles()
+        .stream()
+        .filter(role -> role.getSubjects()
+            .stream()
+            .filter(s -> s.getProvider().equals(Provider.OAUTH_COGNITO))
+            .filter(s -> s.getType().equals("group"))
+            .anyMatch(subject -> Stream.of(groups.toArray())
+                .map(Object::toString)
+                .distinct()
+                .anyMatch(cognitoGroup -> cognitoGroup.equals(subject.getValue()))
+            ))
+        .map(Role::getName)
+        .collect(Collectors.toSet());
+
+    return Mono.just(Stream.concat(groupsByUsername.stream(), groupsByGroups.stream()).collect(Collectors.toSet()));
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
new file mode 100644
index 00000000000..882c727375a
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
@@ -0,0 +1,99 @@
+package com.provectus.kafka.ui.service.rbac.extractor;
+
+import com.provectus.kafka.ui.model.rbac.Role;
+import com.provectus.kafka.ui.model.rbac.provider.Provider;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
+import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+public class GithubAuthorityExtractor implements ProviderAuthorityExtractor {
+
+  private static final String ORGANIZATION_ATTRIBUTE_NAME = "organizations_url";
+  private static final String USERNAME_ATTRIBUTE_NAME = "login";
+  private static final String ORGANIZATION_NAME = "login";
+  private static final String GITHUB_ACCEPT_HEADER = "application/vnd.github+json";
+
+  private final WebClient webClient = WebClient.create("https://api.github.com");
+
+  @Override
+  public boolean isApplicable(String provider) {
+    return Provider.Name.GITHUB.equalsIgnoreCase(provider);
+  }
+
+  @Override
+  public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<String, Object> additionalParams) {
+    DefaultOAuth2User principal;
+    try {
+      principal = (DefaultOAuth2User) value;
+    } catch (ClassCastException e) {
+      log.error("Can't cast value to DefaultOAuth2User", e);
+      throw new RuntimeException();
+    }
+
+    Set<String> groupsByUsername = new HashSet<>();
+    String username = principal.getAttribute(USERNAME_ATTRIBUTE_NAME);
+    if (username == null) {
+      log.debug("Github username param is not present");
+    } else {
+      acs.getRoles()
+          .stream()
+          .filter(r -> r.getSubjects()
+              .stream()
+              .filter(s -> s.getProvider().equals(Provider.OAUTH_GITHUB))
+              .filter(s -> s.getType().equals("user"))
+              .anyMatch(s -> s.getValue().equals(username)))
+          .map(Role::getName)
+          .forEach(groupsByUsername::add);
+    }
+
+    String organization = principal.getAttribute(ORGANIZATION_ATTRIBUTE_NAME);
+    if (organization == null) {
+      log.debug("Github organization param is not present");
+      return Mono.just(groupsByUsername);
+    }
+
+    final Mono<List<Map<String, Object>>> userOrganizations = webClient
+        .get()
+        .uri("/user/orgs")
+        .headers(headers -> {
+          headers.set(HttpHeaders.ACCEPT, GITHUB_ACCEPT_HEADER);
+          OAuth2UserRequest request = (OAuth2UserRequest) additionalParams.get("request");
+          headers.setBearerAuth(request.getAccessToken().getTokenValue());
+        })
+        .retrieve()
+        //@formatter:off
+        .bodyToMono(new ParameterizedTypeReference<>() {});
+    //@formatter:on
+
+    return userOrganizations
+        .map(orgsMap -> {
+          var groupsByOrg = acs.getRoles()
+              .stream()
+              .filter(role -> role.getSubjects()
+                  .stream()
+                  .filter(s -> s.getProvider().equals(Provider.OAUTH_GITHUB))
+                  .filter(s -> s.getType().equals("organization"))
+                  .anyMatch(subject -> orgsMap.stream()
+                      .map(org -> org.get(ORGANIZATION_NAME).toString())
+                      .distinct()
+                      .anyMatch(orgName -> orgName.equalsIgnoreCase(subject.getValue()))
+                  ))
+              .map(Role::getName);
+
+          return Stream.concat(groupsByOrg, groupsByUsername.stream()).collect(Collectors.toSet());
+        });
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GoogleAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GoogleAuthorityExtractor.java
new file mode 100644
index 00000000000..747a9dea052
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GoogleAuthorityExtractor.java
@@ -0,0 +1,69 @@
+package com.provectus.kafka.ui.service.rbac.extractor;
+
+import com.provectus.kafka.ui.model.rbac.Role;
+import com.provectus.kafka.ui.model.rbac.provider.Provider;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+public class GoogleAuthorityExtractor implements ProviderAuthorityExtractor {
+
+  private static final String GOOGLE_DOMAIN_ATTRIBUTE_NAME = "hd";
+  public static final String EMAIL_ATTRIBUTE_NAME = "email";
+
+  @Override
+  public boolean isApplicable(String provider) {
+    return Provider.Name.GOOGLE.equalsIgnoreCase(provider);
+  }
+
+  @Override
+  public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<String, Object> additionalParams) {
+    log.debug("Extracting google user authorities");
+
+    DefaultOAuth2User principal;
+    try {
+      principal = (DefaultOAuth2User) value;
+    } catch (ClassCastException e) {
+      log.error("Can't cast value to DefaultOAuth2User", e);
+      throw new RuntimeException();
+    }
+
+    Set<String> groupsByUsername = acs.getRoles()
+        .stream()
+        .filter(r -> r.getSubjects()
+            .stream()
+            .filter(s -> s.getProvider().equals(Provider.OAUTH_GOOGLE))
+            .filter(s -> s.getType().equals("user"))
+            .anyMatch(s -> s.getValue().equals(principal.getAttribute(EMAIL_ATTRIBUTE_NAME))))
+        .map(Role::getName)
+        .collect(Collectors.toSet());
+
+
+    String domain = principal.getAttribute(GOOGLE_DOMAIN_ATTRIBUTE_NAME);
+    if (domain == null) {
+      log.debug("Google domain param is not present");
+      return Mono.just(groupsByUsername);
+    }
+
+    List<String> groupsByDomain = acs.getRoles()
+        .stream()
+        .filter(r -> r.getSubjects()
+            .stream()
+            .filter(s -> s.getProvider().equals(Provider.OAUTH_GOOGLE))
+            .filter(s -> s.getType().equals("domain"))
+            .anyMatch(s -> s.getValue().equals(domain)))
+        .map(Role::getName)
+        .toList();
+
+    return Mono.just(Stream.concat(groupsByUsername.stream(), groupsByDomain.stream())
+        .collect(Collectors.toSet()));
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/LdapAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/LdapAuthorityExtractor.java
new file mode 100644
index 00000000000..6284bb29234
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/LdapAuthorityExtractor.java
@@ -0,0 +1,23 @@
+package com.provectus.kafka.ui.service.rbac.extractor;
+
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+public class LdapAuthorityExtractor implements ProviderAuthorityExtractor {
+
+  @Override
+  public boolean isApplicable(String provider) {
+    return false; // TODO #2752
+  }
+
+  @Override
+  public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<String, Object> additionalParams) {
+    return Mono.just(Collections.emptySet()); // TODO #2752
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/OauthAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/OauthAuthorityExtractor.java
new file mode 100644
index 00000000000..a97efe85a86
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/OauthAuthorityExtractor.java
@@ -0,0 +1,31 @@
+package com.provectus.kafka.ui.service.rbac.extractor;
+
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.Map;
+import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+public class OauthAuthorityExtractor implements ProviderAuthorityExtractor {
+
+  @Override
+  public boolean isApplicable(String provider) {
+    return false; // TODO #2844
+  }
+
+  @Override
+  public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<String, Object> additionalParams) {
+    DefaultOAuth2User principal;
+    try {
+      principal = (DefaultOAuth2User) value;
+    } catch (ClassCastException e) {
+      log.error("Can't cast value to DefaultOAuth2User", e);
+      throw new RuntimeException();
+    }
+
+    return Mono.just(Set.of(principal.getName())); // TODO #2844
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/ProviderAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/ProviderAuthorityExtractor.java
new file mode 100644
index 00000000000..7cc25e4c619
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/ProviderAuthorityExtractor.java
@@ -0,0 +1,14 @@
+package com.provectus.kafka.ui.service.rbac.extractor;
+
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.Map;
+import java.util.Set;
+import reactor.core.publisher.Mono;
+
+public interface ProviderAuthorityExtractor {
+
+  boolean isApplicable(String provider);
+
+  Mono<Set<String>> extract(AccessControlService acs, Object value, Map<String, Object> additionalParams);
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotations/KafkaClientInternalsDependant.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotation/KafkaClientInternalsDependant.java
similarity index 82%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotations/KafkaClientInternalsDependant.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotation/KafkaClientInternalsDependant.java
index 1003ff0d7fd..5fe22118a2e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotations/KafkaClientInternalsDependant.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotation/KafkaClientInternalsDependant.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.util.annotations;
+package com.provectus.kafka.ui.util.annotation;
 
 /**
  * All code places that depend on kafka-client's internals or implementation-specific logic
diff --git a/kafka-ui-api/src/main/resources/application-local.yml b/kafka-ui-api/src/main/resources/application-local.yml
index fd14a57ea01..5eaeee10b4f 100644
--- a/kafka-ui-api/src/main/resources/application-local.yml
+++ b/kafka-ui-api/src/main/resources/application-local.yml
@@ -34,7 +34,27 @@ kafka:
 spring:
   jmx:
     enabled: true
+  security:
+    oauth2:
+      client:
+        registration:
+          cognito:
+            clientId: xx
+            clientSecret: yy
+            scope: openid
+            client-name: cognito
+            provider: cognito
+            redirect-uri: http://localhost:8080/login/oauth2/code/cognito
+            authorization-grant-type: authorization_code
+        provider:
+          cognito:
+            issuer-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj
+            jwk-set-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj/.well-known/jwks.json
+            user-name-attribute: username
 auth:
   type: DISABLED
+
+roles.file: /tmp/roles.yml
+
 #server:
-#  port: 8080 #- Port in which kafka-ui will run.
+#  port: 8080 #- Port in which kafka-ui will run.
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
index 67ab2403397..6ad38f2cc1e 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
@@ -11,10 +11,13 @@
 import com.provectus.kafka.ui.model.InternalSchemaRegistry;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.SchemaSubjectDTO;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import com.provectus.kafka.ui.util.AccessControlServiceMock;
 import java.util.Comparator;
 import java.util.Optional;
 import java.util.stream.IntStream;
 import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
 import reactor.core.publisher.Mono;
 
 public class SchemaRegistryPaginationTest {
@@ -24,55 +27,58 @@ public class SchemaRegistryPaginationTest {
   private final SchemaRegistryService schemaRegistryService = mock(SchemaRegistryService.class);
   private final ClustersStorage clustersStorage = mock(ClustersStorage.class);
   private final ClusterMapper clusterMapper = mock(ClusterMapper.class);
+  private final AccessControlService accessControlService = new AccessControlServiceMock().getMock();
 
-  private final SchemasController controller = new SchemasController(clusterMapper, schemaRegistryService);
+  private final SchemasController controller
+      = new SchemasController(clusterMapper, schemaRegistryService, accessControlService);
 
   private void init(String[] subjects) {
     when(schemaRegistryService.getAllSubjectNames(isA(KafkaCluster.class)))
-                .thenReturn(Mono.just(subjects));
+        .thenReturn(Mono.just(subjects));
     when(schemaRegistryService
-            .getAllLatestVersionSchemas(isA(KafkaCluster.class), anyList())).thenCallRealMethod();
+        .getAllLatestVersionSchemas(isA(KafkaCluster.class), anyList())).thenCallRealMethod();
     when(clustersStorage.getClusterByName(isA(String.class)))
-            .thenReturn(Optional.of(buildKafkaCluster(LOCAL_KAFKA_CLUSTER_NAME)));
+        .thenReturn(Optional.of(buildKafkaCluster(LOCAL_KAFKA_CLUSTER_NAME)));
     when(schemaRegistryService.getLatestSchemaVersionBySubject(isA(KafkaCluster.class), isA(String.class)))
-            .thenAnswer(a -> Mono.just(new SchemaSubjectDTO().subject(a.getArgument(1))));
-    this.controller.setClustersStorage(clustersStorage);
+        .thenAnswer(a -> Mono.just(new SchemaSubjectDTO().subject(a.getArgument(1))));
+
+    ReflectionTestUtils.setField(controller, "clustersStorage", clustersStorage);
   }
 
   @Test
   void shouldListFirst25andThen10Schemas() {
     init(
-            IntStream.rangeClosed(1, 100)
-                    .boxed()
-                    .map(num -> "subject" + num)
-                    .toArray(String[]::new)
+        IntStream.rangeClosed(1, 100)
+            .boxed()
+            .map(num -> "subject" + num)
+            .toArray(String[]::new)
     );
     var schemasFirst25 = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-            null, null, null, null).block();
+        null, null, null, null).block();
     assertThat(schemasFirst25.getBody().getPageCount()).isEqualTo(4);
     assertThat(schemasFirst25.getBody().getSchemas()).hasSize(25);
     assertThat(schemasFirst25.getBody().getSchemas())
-            .isSortedAccordingTo(Comparator.comparing(SchemaSubjectDTO::getSubject));
+        .isSortedAccordingTo(Comparator.comparing(SchemaSubjectDTO::getSubject));
 
     var schemasFirst10 = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-            null, 10, null, null).block();
+        null, 10, null, null).block();
 
     assertThat(schemasFirst10.getBody().getPageCount()).isEqualTo(10);
     assertThat(schemasFirst10.getBody().getSchemas()).hasSize(10);
     assertThat(schemasFirst10.getBody().getSchemas())
-            .isSortedAccordingTo(Comparator.comparing(SchemaSubjectDTO::getSubject));
+        .isSortedAccordingTo(Comparator.comparing(SchemaSubjectDTO::getSubject));
   }
 
   @Test
   void shouldListSchemasContaining_1() {
     init(
-              IntStream.rangeClosed(1, 100)
-                      .boxed()
-                      .map(num -> "subject" + num)
-                      .toArray(String[]::new)
+        IntStream.rangeClosed(1, 100)
+            .boxed()
+            .map(num -> "subject" + num)
+            .toArray(String[]::new)
     );
     var schemasSearch7 = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-            null, null, "1", null).block();
+        null, null, "1", null).block();
     assertThat(schemasSearch7.getBody().getPageCount()).isEqualTo(1);
     assertThat(schemasSearch7.getBody().getSchemas()).hasSize(20);
   }
@@ -80,13 +86,13 @@ void shouldListSchemasContaining_1() {
   @Test
   void shouldCorrectlyHandleNonPositivePageNumberAndPageSize() {
     init(
-                IntStream.rangeClosed(1, 100)
-                        .boxed()
-                        .map(num -> "subject" + num)
-                        .toArray(String[]::new)
+        IntStream.rangeClosed(1, 100)
+            .boxed()
+            .map(num -> "subject" + num)
+            .toArray(String[]::new)
     );
     var schemas = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-            0, -1, null, null).block();
+        0, -1, null, null).block();
 
     assertThat(schemas.getBody().getPageCount()).isEqualTo(4);
     assertThat(schemas.getBody().getSchemas()).hasSize(25);
@@ -96,14 +102,14 @@ void shouldCorrectlyHandleNonPositivePageNumberAndPageSize() {
   @Test
   void shouldCalculateCorrectPageCountForNonDivisiblePageSize() {
     init(
-                IntStream.rangeClosed(1, 100)
-                        .boxed()
-                        .map(num -> "subject" + num)
-                        .toArray(String[]::new)
+        IntStream.rangeClosed(1, 100)
+            .boxed()
+            .map(num -> "subject" + num)
+            .toArray(String[]::new)
     );
 
     var schemas = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-            4, 33, null, null).block();
+        4, 33, null, null).block();
 
     assertThat(schemas.getBody().getPageCount()).isEqualTo(4);
     assertThat(schemas.getBody().getSchemas()).hasSize(1);
@@ -112,8 +118,8 @@ void shouldCalculateCorrectPageCountForNonDivisiblePageSize() {
 
   private KafkaCluster buildKafkaCluster(String clusterName) {
     return KafkaCluster.builder()
-            .name(clusterName)
-            .schemaRegistry(InternalSchemaRegistry.builder().build())
-            .build();
+        .name(clusterName)
+        .schemaRegistry(InternalSchemaRegistry.builder().build())
+        .build();
   }
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
index cc057db0b0d..e140ab61df9 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
@@ -19,6 +19,8 @@
 import com.provectus.kafka.ui.model.TopicColumnsToSortDTO;
 import com.provectus.kafka.ui.model.TopicDTO;
 import com.provectus.kafka.ui.service.analyze.TopicAnalysisService;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import com.provectus.kafka.ui.util.AccessControlServiceMock;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -32,6 +34,7 @@
 import org.apache.kafka.clients.admin.TopicDescription;
 import org.apache.kafka.common.TopicPartitionInfo;
 import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
 import reactor.core.publisher.Mono;
 
 class TopicsServicePaginationTest {
@@ -41,9 +44,10 @@ class TopicsServicePaginationTest {
   private final TopicsService topicsService = mock(TopicsService.class);
   private final ClustersStorage clustersStorage = mock(ClustersStorage.class);
   private final ClusterMapper clusterMapper = new ClusterMapperImpl();
+  private final AccessControlService accessControlService = new AccessControlServiceMock().getMock();
 
   private final TopicsController topicsController = new TopicsController(
-      topicsService, mock(TopicAnalysisService.class), clusterMapper);
+      topicsService, mock(TopicAnalysisService.class), clusterMapper, accessControlService);
 
   private void init(Map<String, InternalTopic> topicsInCache) {
 
@@ -56,7 +60,7 @@ private void init(Map<String, InternalTopic> topicsInCache) {
           List<String> lst = a.getArgument(1);
           return Mono.just(lst.stream().map(topicsInCache::get).collect(Collectors.toList()));
         });
-    this.topicsController.setClustersStorage(clustersStorage);
+    ReflectionTestUtils.setField(topicsController, "clustersStorage", clustersStorage);
   }
 
   @Test
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java
new file mode 100644
index 00000000000..263f1367d8c
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java
@@ -0,0 +1,23 @@
+package com.provectus.kafka.ui.util;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import org.mockito.Mockito;
+import reactor.core.publisher.Mono;
+
+public class AccessControlServiceMock {
+
+  public AccessControlService getMock() {
+    AccessControlService mock = Mockito.mock(AccessControlService.class);
+
+    when(mock.validateAccess(any())).thenReturn(Mono.empty());
+    when(mock.isSchemaAccessible(anyString(), anyString())).thenReturn(Mono.just(true));
+
+    when(mock.isTopicAccessible(any(), anyString())).thenReturn(Mono.just(true));
+
+    return mock;
+  }
+}
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index f604025bb1a..5cc8e0fea1c 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -7,7 +7,7 @@ info:
   contact: { }
   license:
     name: Apache 2.0
-    url: http://www.apache.org/licenses/LICENSE-2.0
+    url: https://www.apache.org/licenses/LICENSE-2.0
 tags:
   - name: /api/clusters
   - name: /api/clusters/connects
@@ -1757,6 +1757,20 @@ paths:
               schema:
                 $ref: '#/components/schemas/TimeStampFormat'
 
+  /api/authorization:
+    get:
+      tags:
+        - Authorization
+      summary: Get user authentication related info
+      operationId: getUserAuthInfo
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AuthenticationInfo'
+
 components:
   schemas:
     TopicSerdeSuggestion:
@@ -2646,7 +2660,7 @@ components:
           type: string
         schemaType:
           $ref: '#/components/schemas/SchemaType'
-          description: upon updating a schema, the type of an existing schema can't be changed
+          # upon updating a schema, the type of existing schema can't be changed
       required:
         - subject
         - schema
@@ -3154,3 +3168,73 @@ components:
         - COMPACT
         - COMPACT_DELETE
         - UNKNOWN
+
+    AuthenticationInfo:
+      type: object
+      properties:
+        rbacEnabled:
+          type: boolean
+          description: true if role based access control is enabled and granular permission access is required
+        userInfo:
+          $ref: '#/components/schemas/UserInfo'
+      required:
+        - rbacEnabled
+
+    UserInfo:
+      type: object
+      properties:
+        username:
+          type: string
+        permissions:
+          type: array
+          items:
+            $ref: '#/components/schemas/UserPermission'
+      required:
+        - username
+        - permissions
+
+    UserPermission:
+      type: object
+      properties:
+        clusters:
+          type: array
+          items:
+            type: string
+        resource:
+          $ref: '#/components/schemas/ResourceType'
+        value:
+          type: string
+        actions:
+          type: array
+          items:
+            $ref: '#/components/schemas/Action'
+      required:
+        - clusters
+        - resource
+        - actions
+
+    Action:
+      type: string
+      enum:
+        - VIEW
+        - EDIT
+        - CREATE
+        - DELETE
+        - RESET_OFFSETS
+        - EXECUTE
+        - MODIFY_GLOBAL_COMPATIBILITY
+        - ANALYSIS_VIEW
+        - ANALYSIS_RUN
+        - MESSAGES_READ
+        - MESSAGES_PRODUCE
+        - MESSAGES_DELETE
+
+    ResourceType:
+      type: string
+      enum:
+        - CLUSTERCONFIG
+        - TOPIC
+        - CONSUMER
+        - SCHEMA
+        - CONNECT
+        - KSQL
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
index 267bb4a9b21..5e5a3176471 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
@@ -14,10 +14,10 @@ public class TopPanel extends BasePage{
     protected SelenideElement discordBtn = $x("//a[contains(@href,'https://discord.com/invite')]");
 
     public List<SelenideElement> getAllVisibleElements() {
-        return Arrays.asList(kafkaLogo, kafkaVersion, logOutBtn, gitBtn, discordBtn);
+        return Arrays.asList(kafkaLogo, kafkaVersion, gitBtn, discordBtn);
     }
 
     public List<SelenideElement> getAllEnabledElements() {
-        return Arrays.asList(logOutBtn, gitBtn, discordBtn, kafkaLogo);
+        return Arrays.asList(gitBtn, discordBtn, kafkaLogo);
     }
 }
diff --git a/kafka-ui-react-app/src/components/App.styled.ts b/kafka-ui-react-app/src/components/App.styled.ts
index 90eade047d1..418e5d8a124 100644
--- a/kafka-ui-react-app/src/components/App.styled.ts
+++ b/kafka-ui-react-app/src/components/App.styled.ts
@@ -1,9 +1,4 @@
-import styled, { css } from 'styled-components';
-import { Link } from 'react-router-dom';
-
-import { Button } from './common/Button/Button';
-import GitIcon from './common/Icons/GitIcon';
-import DiscordIcon from './common/Icons/DiscordIcon';
+import styled from 'styled-components';
 
 export const Layout = styled.div`
   min-width: 1200px;
@@ -12,241 +7,3 @@ export const Layout = styled.div`
     min-width: initial;
   }
 `;
-
-export const Container = styled.main(
-  ({ theme }) => css`
-    margin-top: ${theme.layout.navBarHeight};
-    margin-left: ${theme.layout.navBarWidth};
-    position: relative;
-    padding-bottom: 30px;
-    z-index: 20;
-    max-width: calc(100vw - ${theme.layout.navBarWidth});
-    @media screen and (max-width: 1023px) {
-      margin-left: initial;
-      max-width: 100vw;
-    }
-  `
-);
-
-export const Sidebar = styled.div<{ $visible: boolean }>(
-  ({ theme, $visible }) => css`
-    width: ${theme.layout.navBarWidth};
-    display: flex;
-    flex-direction: column;
-    border-right: 1px solid ${theme.layout.stuffBorderColor};
-    position: fixed;
-    top: ${theme.layout.navBarHeight};
-    left: 0;
-    bottom: 0;
-    padding: 8px 16px;
-    overflow-y: scroll;
-    transition: width 0.25s, opacity 0.25s, transform 0.25s,
-      -webkit-transform 0.25s;
-    background: ${theme.menu.backgroundColor.normal};
-    @media screen and (max-width: 1023px) {
-      ${$visible &&
-      css`
-        transform: translate3d(${theme.layout.navBarWidth}, 0, 0);
-      `};
-      left: -${theme.layout.navBarWidth};
-      z-index: 100;
-    }
-
-    &::-webkit-scrollbar {
-      width: 8px;
-    }
-
-    &::-webkit-scrollbar-track {
-      background-color: ${theme.scrollbar.trackColor.normal};
-    }
-
-    &::-webkit-scrollbar-thumb {
-      width: 8px;
-      background-color: ${theme.scrollbar.thumbColor.normal};
-      border-radius: 4px;
-    }
-
-    &:hover::-webkit-scrollbar-thumb {
-      background: ${theme.scrollbar.thumbColor.active};
-    }
-
-    &:hover::-webkit-scrollbar-track {
-      background-color: ${theme.scrollbar.trackColor.active};
-    }
-  `
-);
-
-export const Overlay = styled.div<{ $visible: boolean }>(
-  ({ theme, $visible }) => css`
-    height: calc(100vh - ${theme.layout.navBarHeight});
-    z-index: 99;
-    visibility: hidden;
-    opacity: 0;
-    -webkit-transition: all 0.5s ease;
-    transition: all 0.5s ease;
-    left: 0;
-    position: absolute;
-    top: 0;
-    ${$visible &&
-    css`
-      @media screen and (max-width: 1023px) {
-        bottom: 0;
-        right: 0;
-        visibility: visible;
-        opacity: 0.7;
-        background-color: ${theme.layout.overlay.backgroundColor};
-      }
-    `}
-  `
-);
-
-export const Navbar = styled.nav(
-  ({ theme }) => css`
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    border-bottom: 1px solid ${theme.layout.stuffBorderColor};
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    z-index: 30;
-    background-color: ${theme.menu.backgroundColor.normal};
-    min-height: 3.25rem;
-  `
-);
-
-export const NavbarBrand = styled.div`
-  display: flex;
-  justify-content: flex-end;
-  align-items: center !important;
-  flex-shrink: 0;
-  min-height: 3.25rem;
-`;
-
-export const SocialLink = styled.a(
-  ({ theme: { layout, icons } }) => css`
-    display: block;
-    margin-top: 5px;
-    cursor: pointer;
-    fill: ${layout.socialLink.color};
-
-    &:hover {
-      ${DiscordIcon} {
-        fill: ${icons.discord.hover};
-      }
-      ${GitIcon} {
-        fill: ${icons.git.hover};
-      }
-    }
-    &:active {
-      ${DiscordIcon} {
-        fill: ${icons.discord.active};
-      }
-      ${GitIcon} {
-        fill: ${icons.git.active};
-      }
-    }
-  `
-);
-
-export const NavbarSocial = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  margin: 10px;
-`;
-
-export const NavbarItem = styled.div`
-  display: flex;
-  position: relative;
-  flex-grow: 0;
-  flex-shrink: 0;
-  align-items: center;
-  line-height: 1.5;
-  padding: 0.5rem 0.75rem;
-`;
-
-export const NavbarBurger = styled.div(
-  ({ theme }) => css`
-    display: block;
-    position: relative;
-    cursor: pointer;
-    height: 3.25rem;
-    width: 3.25rem;
-    margin: 0;
-    padding: 0;
-
-    &:hover {
-      background-color: ${theme.menu.backgroundColor.hover};
-    }
-
-    @media screen and (min-width: 1024px) {
-      display: none;
-    }
-  `
-);
-
-export const Span = styled.span(
-  ({ theme }) => css`
-    display: block;
-    position: absolute;
-    background: ${theme.menu.color.active};
-    height: 1px;
-    left: calc(50% - 8px);
-    transform-origin: center;
-    transition-duration: 86ms;
-    transition-property: background-color, opacity, transform, -webkit-transform;
-    transition-timing-function: ease-out;
-    width: 16px;
-
-    &:first-child {
-      top: calc(50% - 6px);
-    }
-    &:nth-child(2) {
-      top: calc(50% - 1px);
-    }
-    &:nth-child(3) {
-      top: calc(50% + 4px);
-    }
-  `
-);
-
-export const Hyperlink = styled(Link)(
-  ({ theme }) => css`
-    position: relative;
-
-    display: flex;
-    flex-grow: 0;
-    flex-shrink: 0;
-    align-items: center;
-    gap: 8px;
-
-    margin: 0;
-    padding: 0.5rem 0.75rem;
-
-    font-family: Inter, sans-serif;
-    font-style: normal;
-    font-weight: bold;
-    font-size: 12px;
-    line-height: 16px;
-    color: ${theme.menu.color.active};
-    text-decoration: none;
-    word-break: break-word;
-    cursor: pointer;
-  `
-);
-
-export const LogoutButton = styled(Button)(
-  ({ theme }) => css`
-    color: ${theme.button.primary.invertedColors.normal};
-    background: none !important;
-    padding: 0 8px;
-  `
-);
-
-export const LogoutLink = styled.a(
-  () => css`
-    margin-right: 2px;
-  `
-);
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index a76495f0d47..682e9d21ca4 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -1,16 +1,14 @@
-import React, { Suspense, useCallback } from 'react';
-import { Routes, Route, useLocation, Navigate } from 'react-router-dom';
+import React, { Suspense } from 'react';
+import { Routes, Route, Navigate } from 'react-router-dom';
 import {
   accessErrorPage,
   clusterPath,
   errorPage,
   getNonExactPath,
 } from 'lib/paths';
-import Nav from 'components/Nav/Nav';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import Dashboard from 'components/Dashboard/Dashboard';
 import ClusterPage from 'components/Cluster/Cluster';
-import Version from 'components/Version/Version';
 import { ThemeProvider } from 'styled-components';
 import theme from 'theme/theme';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
@@ -18,14 +16,13 @@ import { showServerError } from 'lib/errorHandling';
 import { Toaster } from 'react-hot-toast';
 import GlobalCSS from 'components/global.css';
 import * as S from 'components/App.styled';
-import Logo from 'components/common/Logo/Logo';
-import GitIcon from 'components/common/Icons/GitIcon';
-import DiscordIcon from 'components/common/Icons/DiscordIcon';
 
 import ConfirmationModal from './common/ConfirmationModal/ConfirmationModal';
 import { ConfirmContextProvider } from './contexts/ConfirmContext';
 import { GlobalSettingsProvider } from './contexts/GlobalSettingsContext';
 import ErrorPage from './ErrorPage/ErrorPage';
+import { UserInfoRolesAccessProvider } from './contexts/UserInfoRolesAccessContext';
+import PageContainer from './PageContainer/PageContainer';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -41,109 +38,47 @@ const queryClient = new QueryClient({
 });
 
 const App: React.FC = () => {
-  const [isSidebarVisible, setIsSidebarVisible] = React.useState(false);
-  const onBurgerClick = () => setIsSidebarVisible(!isSidebarVisible);
-  const closeSidebar = useCallback(() => setIsSidebarVisible(false), []);
-  const location = useLocation();
-
-  React.useEffect(() => {
-    closeSidebar();
-  }, [location, closeSidebar]);
-
   return (
     <QueryClientProvider client={queryClient}>
       <GlobalSettingsProvider>
         <ThemeProvider theme={theme}>
-          <ConfirmContextProvider>
-            <GlobalCSS />
-            <S.Layout>
-              <S.Navbar role="navigation" aria-label="Page Header">
-                <S.NavbarBrand>
-                  <S.NavbarBrand>
-                    <S.NavbarBurger
-                      onClick={onBurgerClick}
-                      onKeyDown={onBurgerClick}
-                      role="button"
-                      tabIndex={0}
-                      aria-label="burger"
-                    >
-                      <S.Span role="separator" />
-                      <S.Span role="separator" />
-                      <S.Span role="separator" />
-                    </S.NavbarBurger>
-
-                    <S.Hyperlink to="/">
-                      <Logo />
-                      UI for Apache Kafka
-                    </S.Hyperlink>
-
-                    <S.NavbarItem>
-                      <Version />
-                    </S.NavbarItem>
-                  </S.NavbarBrand>
-                </S.NavbarBrand>
-                <S.NavbarSocial>
-                  <S.LogoutLink href="/logout">
-                    <S.LogoutButton buttonType="primary" buttonSize="M">
-                      Log out
-                    </S.LogoutButton>
-                  </S.LogoutLink>
-                  <S.SocialLink
-                    href="https://github.com/provectus/kafka-ui"
-                    target="_blank"
-                  >
-                    <GitIcon />
-                  </S.SocialLink>
-                  <S.SocialLink
-                    href="https://discord.com/invite/4DWzD7pGE5"
-                    target="_blank"
-                  >
-                    <DiscordIcon />
-                  </S.SocialLink>
-                </S.NavbarSocial>
-              </S.Navbar>
-
-              <S.Container>
-                <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
-                  <Suspense fallback={<PageLoader />}>
-                    <Nav />
-                  </Suspense>
-                </S.Sidebar>
-                <S.Overlay
-                  $visible={isSidebarVisible}
-                  onClick={closeSidebar}
-                  onKeyDown={closeSidebar}
-                  tabIndex={-1}
-                  aria-hidden="true"
-                  aria-label="Overlay"
-                />
-                <Routes>
-                  {['/', '/ui', '/ui/clusters'].map((path) => (
-                    <Route
-                      key="Home" // optional: avoid full re-renders on route changes
-                      path={path}
-                      element={<Dashboard />}
-                    />
-                  ))}
-                  <Route
-                    path={getNonExactPath(clusterPath())}
-                    element={<ClusterPage />}
-                  />
-                  <Route
-                    path={accessErrorPage}
-                    element={<ErrorPage status={403} text="Access is Denied" />}
-                  />
-                  <Route path={errorPage} element={<ErrorPage />} />
-                  <Route
-                    path="*"
-                    element={<Navigate to={errorPage} replace />}
-                  />
-                </Routes>
-              </S.Container>
-              <Toaster position="bottom-right" />
-            </S.Layout>
-            <ConfirmationModal />
-          </ConfirmContextProvider>
+          <Suspense fallback={<PageLoader />}>
+            <UserInfoRolesAccessProvider>
+              <ConfirmContextProvider>
+                <GlobalCSS />
+                <S.Layout>
+                  <PageContainer>
+                    <Routes>
+                      {['/', '/ui', '/ui/clusters'].map((path) => (
+                        <Route
+                          key="Home" // optional: avoid full re-renders on route changes
+                          path={path}
+                          element={<Dashboard />}
+                        />
+                      ))}
+                      <Route
+                        path={getNonExactPath(clusterPath())}
+                        element={<ClusterPage />}
+                      />
+                      <Route
+                        path={accessErrorPage}
+                        element={
+                          <ErrorPage status={403} text="Access is Denied" />
+                        }
+                      />
+                      <Route path={errorPage} element={<ErrorPage />} />
+                      <Route
+                        path="*"
+                        element={<Navigate to={errorPage} replace />}
+                      />
+                    </Routes>
+                  </PageContainer>
+                  <Toaster position="bottom-right" />
+                </S.Layout>
+                <ConfirmationModal />
+              </ConfirmContextProvider>
+            </UserInfoRolesAccessProvider>
+          </Suspense>
         </ThemeProvider>
       </GlobalSettingsProvider>
     </QueryClientProvider>
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
index 422abbbac99..bf54c45c617 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/InputCell.tsx
@@ -4,9 +4,10 @@ import CheckmarkIcon from 'components/common/Icons/CheckmarkIcon';
 import EditIcon from 'components/common/Icons/EditIcon';
 import CancelIcon from 'components/common/Icons/CancelIcon';
 import { useConfirm } from 'lib/hooks/useConfirm';
-import { BrokerConfig } from 'generated-sources';
+import { Action, BrokerConfig, ResourceType } from 'generated-sources';
 import { Button } from 'components/common/Button/Button';
 import Input from 'components/common/Input/Input';
+import { ActionButton } from 'components/common/ActionComponent';
 
 import * as S from './Configs.styled';
 
@@ -71,14 +72,18 @@ const InputCell: React.FC<InputCellProps> = ({ row, getValue, onUpdate }) => {
       }
     >
       <S.Value title={initialValue}>{initialValue}</S.Value>
-      <Button
+      <ActionButton
         buttonType="primary"
         buttonSize="S"
         aria-label="editAction"
         onClick={() => setIsEdit(true)}
+        permission={{
+          resource: ResourceType.CLUSTERCONFIG,
+          action: Action.EDIT,
+        }}
       >
         <EditIcon /> Edit
-      </Button>
+      </ActionButton>
     </S.ValueWrapper>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index bc76ccfcbb6..f475b739e12 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -2,7 +2,12 @@ import React from 'react';
 import styled from 'styled-components';
 import { useNavigate } from 'react-router-dom';
 import { useIsMutating } from '@tanstack/react-query';
-import { ConnectorState, ConnectorAction } from 'generated-sources';
+import {
+  Action,
+  ConnectorAction,
+  ConnectorState,
+  ResourceType,
+} from 'generated-sources';
 import useAppParams from 'lib/hooks/useAppParams';
 import {
   useConnector,
@@ -14,7 +19,8 @@ import {
   RouterParamsClusterConnectConnector,
 } from 'lib/paths';
 import { useConfirm } from 'lib/hooks/useConfirm';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { Dropdown } from 'components/common/Dropdown';
+import { ActionDropdownItem } from 'components/common/ActionComponent';
 
 const ConnectorActionsWrapperStyled = styled.div`
   display: flex;
@@ -65,31 +71,76 @@ const Actions: React.FC = () => {
     <ConnectorActionsWrapperStyled>
       <Dropdown>
         {connector?.status.state === ConnectorState.RUNNING && (
-          <DropdownItem onClick={pauseConnectorHandler} disabled={isMutating}>
+          <ActionDropdownItem
+            onClick={pauseConnectorHandler}
+            disabled={isMutating}
+            permission={{
+              resource: ResourceType.CONNECT,
+              action: Action.EDIT,
+              value: routerProps.connectorName,
+            }}
+          >
             Pause
-          </DropdownItem>
+          </ActionDropdownItem>
         )}
         {connector?.status.state === ConnectorState.PAUSED && (
-          <DropdownItem onClick={resumeConnectorHandler} disabled={isMutating}>
+          <ActionDropdownItem
+            onClick={resumeConnectorHandler}
+            disabled={isMutating}
+            permission={{
+              resource: ResourceType.CONNECT,
+              action: Action.EDIT,
+              value: routerProps.connectorName,
+            }}
+          >
             Resume
-          </DropdownItem>
+          </ActionDropdownItem>
         )}
-        <DropdownItem onClick={restartConnectorHandler} disabled={isMutating}>
+        <ActionDropdownItem
+          onClick={restartConnectorHandler}
+          disabled={isMutating}
+          permission={{
+            resource: ResourceType.CONNECT,
+            action: Action.EDIT,
+            value: routerProps.connectorName,
+          }}
+        >
           Restart Connector
-        </DropdownItem>
-        <DropdownItem onClick={restartAllTasksHandler} disabled={isMutating}>
+        </ActionDropdownItem>
+        <ActionDropdownItem
+          onClick={restartAllTasksHandler}
+          disabled={isMutating}
+          permission={{
+            resource: ResourceType.CONNECT,
+            action: Action.EDIT,
+            value: routerProps.connectorName,
+          }}
+        >
           Restart All Tasks
-        </DropdownItem>
-        <DropdownItem onClick={restartFailedTasksHandler} disabled={isMutating}>
+        </ActionDropdownItem>
+        <ActionDropdownItem
+          onClick={restartFailedTasksHandler}
+          disabled={isMutating}
+          permission={{
+            resource: ResourceType.CONNECT,
+            action: Action.EDIT,
+            value: routerProps.connectorName,
+          }}
+        >
           Restart Failed Tasks
-        </DropdownItem>
-        <DropdownItem
+        </ActionDropdownItem>
+        <ActionDropdownItem
           onClick={deleteConnectorHandler}
           disabled={isMutating}
           danger
+          permission={{
+            resource: ResourceType.CONNECT,
+            action: Action.DELETE,
+            value: routerProps.connectorName,
+          }}
         >
           Delete
-        </DropdownItem>
+        </ActionDropdownItem>
       </Dropdown>
     </ConnectorActionsWrapperStyled>
   );
diff --git a/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx b/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx
index 904be0d7b6c..94ec8354c93 100644
--- a/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/ListPage.tsx
@@ -5,10 +5,10 @@ import ClusterContext from 'components/contexts/ClusterContext';
 import Search from 'components/common/Search/Search';
 import * as Metrics from 'components/common/Metrics';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import { Button } from 'components/common/Button/Button';
+import { ActionButton } from 'components/common/ActionComponent';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import PageLoader from 'components/common/PageLoader/PageLoader';
-import { ConnectorState } from 'generated-sources';
+import { Action, ConnectorState, ResourceType } from 'generated-sources';
 import { useConnectors } from 'lib/hooks/api/kafkaConnect';
 
 import List from './List';
@@ -33,13 +33,17 @@ const ListPage: React.FC = () => {
     <>
       <PageHeading text="Connectors">
         {!isReadOnly && (
-          <Button
+          <ActionButton
             buttonType="primary"
             buttonSize="M"
             to={clusterConnectorNewRelativePath}
+            permission={{
+              resource: ResourceType.CONNECT,
+              action: Action.CREATE,
+            }}
           >
             Create Connector
-          </Button>
+          </ActionButton>
         )}
       </PageHeading>
       <Metrics.Wrapper>
diff --git a/kafka-ui-react-app/src/components/Connect/New/New.tsx b/kafka-ui-react-app/src/components/Connect/New/New.tsx
index 2e93b4f5ce5..f1232bae462 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/New.tsx
@@ -65,7 +65,7 @@ const New: React.FC = () => {
   }, [connects, getValues, setValue]);
 
   const onSubmit = async (values: FormValues) => {
-    const connector = await mutation.mutateAsync({
+    const connector = await mutation.createResource({
       connectName: values.connectName,
       newConnector: {
         name: values.name,
diff --git a/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx b/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
index 3b93c2d86c6..88c79d51cbc 100644
--- a/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
@@ -23,6 +23,7 @@ jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useNavigate: () => mockHistoryPush,
 }));
+
 jest.mock('lib/hooks/api/kafkaConnect', () => ({
   useConnects: jest.fn(),
   useCreateConnector: jest.fn(),
@@ -67,7 +68,7 @@ describe('New', () => {
       return Promise.resolve(connector);
     });
     (useCreateConnector as jest.Mock).mockImplementation(() => ({
-      mutateAsync: createConnectorMock,
+      createResource: createConnectorMock,
     }));
     renderComponent();
     await simulateFormSubmit();
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index a86252a3867..961410ffd2f 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -17,15 +17,17 @@ import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import {
-  fetchConsumerGroupDetails,
   deleteConsumerGroup,
-  selectById,
-  getIsConsumerGroupDeleted,
+  fetchConsumerGroupDetails,
   getAreConsumerGroupDetailsFulfilled,
+  getIsConsumerGroupDeleted,
+  selectById,
 } from 'redux/reducers/consumerGroups/consumerGroupsSlice';
 import getTagColor from 'components/common/Tag/getTagColor';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { Dropdown } from 'components/common/Dropdown';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
+import { Action, ResourceType } from 'generated-sources';
+import { ActionDropdownItem } from 'components/common/ActionComponent';
 
 import ListItem from './ListItem';
 
@@ -84,14 +86,28 @@ const Details: React.FC = () => {
         >
           {!isReadOnly && (
             <Dropdown>
-              <DropdownItem onClick={onResetOffsets}>Reset offset</DropdownItem>
-              <DropdownItem
+              <ActionDropdownItem
+                onClick={onResetOffsets}
+                permission={{
+                  resource: ResourceType.CONSUMER,
+                  action: Action.RESET_OFFSETS,
+                  value: consumerGroupID,
+                }}
+              >
+                Reset offset
+              </ActionDropdownItem>
+              <ActionDropdownItem
                 confirm="Are you sure you want to delete this consumer group?"
                 onClick={onDelete}
                 danger
+                permission={{
+                  resource: ResourceType.CONSUMER,
+                  action: Action.DELETE,
+                  value: consumerGroupID,
+                }}
               >
                 Delete consumer group
-              </DropdownItem>
+              </ActionDropdownItem>
             </Dropdown>
           )}
         </PageHeading>
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
index f911d2807f3..698bcd6f953 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
@@ -4,18 +4,19 @@ import * as Metrics from 'components/common/Metrics';
 import { getKsqlDbTables } from 'redux/reducers/ksqlDb/selectors';
 import {
   clusterKsqlDbQueryRelativePath,
-  ClusterNameRoute,
   clusterKsqlDbStreamsPath,
-  clusterKsqlDbTablesPath,
   clusterKsqlDbStreamsRelativePath,
+  clusterKsqlDbTablesPath,
   clusterKsqlDbTablesRelativePath,
+  ClusterNameRoute,
 } from 'lib/paths';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import { Button } from 'components/common/Button/Button';
+import { ActionButton } from 'components/common/ActionComponent';
 import Navbar from 'components/common/Navigation/Navbar.styled';
-import { NavLink, Route, Routes, Navigate } from 'react-router-dom';
+import { Navigate, NavLink, Route, Routes } from 'react-router-dom';
 import { fetchKsqlDbTables } from 'redux/reducers/ksqlDb/ksqlDbSlice';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
+import { Action, ResourceType } from 'generated-sources';
 
 import KsqlDbItem, { KsqlDbItemType } from './KsqlDbItem/KsqlDbItem';
 
@@ -33,13 +34,17 @@ const List: FC = () => {
   return (
     <>
       <PageHeading text="KSQL DB">
-        <Button
+        <ActionButton
           to={clusterKsqlDbQueryRelativePath}
           buttonType="primary"
           buttonSize="M"
+          permission={{
+            resource: ResourceType.KSQL,
+            action: Action.EXECUTE,
+          }}
         >
           Execute KSQL Request
-        </Button>
+        </ActionButton>
       </PageHeading>
       <Metrics.Wrapper>
         <Metrics.Section>
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
index b685485b551..c6309076b5e 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
@@ -6,15 +6,16 @@ import { screen } from '@testing-library/dom';
 import { act } from '@testing-library/react';
 
 describe('KsqlDb List', () => {
-  afterEach(() => fetchMock.reset());
-  it('renders List component with Tables and Streams tabs', async () => {
+  const renderComponent = async () => {
     await act(() => {
       render(<List />);
     });
-
+  };
+  afterEach(() => fetchMock.reset());
+  it('renders List component with Tables and Streams tabs', async () => {
+    await renderComponent();
     const Tables = screen.getByTitle('Tables');
     const Streams = screen.getByTitle('Streams');
-
     expect(Tables).toBeInTheDocument();
     expect(Streams).toBeInTheDocument();
   });
diff --git a/kafka-ui-react-app/src/components/NavBar/NavBar.styled.ts b/kafka-ui-react-app/src/components/NavBar/NavBar.styled.ts
new file mode 100644
index 00000000000..a665468fcef
--- /dev/null
+++ b/kafka-ui-react-app/src/components/NavBar/NavBar.styled.ts
@@ -0,0 +1,146 @@
+import styled, { css } from 'styled-components';
+import { Link } from 'react-router-dom';
+import DiscordIcon from 'components/common/Icons/DiscordIcon';
+import GitIcon from 'components/common/Icons/GitIcon';
+
+export const Navbar = styled.nav(
+  ({ theme }) => css`
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 1px solid ${theme.layout.stuffBorderColor};
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 30;
+    background-color: ${theme.menu.backgroundColor.normal};
+    min-height: 3.25rem;
+  `
+);
+
+export const NavbarBrand = styled.div`
+  display: flex;
+  justify-content: flex-end;
+  align-items: center !important;
+  flex-shrink: 0;
+  min-height: 3.25rem;
+`;
+
+export const SocialLink = styled.a(
+  ({ theme: { layout, icons } }) => css`
+    display: block;
+    margin-top: 5px;
+    cursor: pointer;
+    fill: ${layout.socialLink.color};
+
+    &:hover {
+      ${DiscordIcon} {
+        fill: ${icons.discord.hover};
+      }
+
+      ${GitIcon} {
+        fill: ${icons.git.hover};
+      }
+    }
+
+    &:active {
+      ${DiscordIcon} {
+        fill: ${icons.discord.active};
+      }
+
+      ${GitIcon} {
+        fill: ${icons.git.active};
+      }
+    }
+  `
+);
+
+export const NavbarSocial = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin: 10px;
+`;
+
+export const NavbarItem = styled.div`
+  display: flex;
+  position: relative;
+  flex-grow: 0;
+  flex-shrink: 0;
+  align-items: center;
+  line-height: 1.5;
+  padding: 0.5rem 0.75rem;
+`;
+
+export const NavbarBurger = styled.div(
+  ({ theme }) => css`
+    display: block;
+    position: relative;
+    cursor: pointer;
+    height: 3.25rem;
+    width: 3.25rem;
+    margin: 0;
+    padding: 0;
+
+    &:hover {
+      background-color: ${theme.menu.backgroundColor.hover};
+    }
+
+    @media screen and (min-width: 1024px) {
+      display: none;
+    }
+  `
+);
+
+export const Span = styled.span(
+  ({ theme }) => css`
+    display: block;
+    position: absolute;
+    background: ${theme.menu.color.active};
+    height: 1px;
+    left: calc(50% - 8px);
+    transform-origin: center;
+    transition-duration: 86ms;
+    transition-property: background-color, opacity, transform, -webkit-transform;
+    transition-timing-function: ease-out;
+    width: 16px;
+
+    &:first-child {
+      top: calc(50% - 6px);
+    }
+
+    &:nth-child(2) {
+      top: calc(50% - 1px);
+    }
+
+    &:nth-child(3) {
+      top: calc(50% + 4px);
+    }
+  `
+);
+
+export const Hyperlink = styled(Link)(
+  ({ theme }) => css`
+    position: relative;
+
+    display: flex;
+    flex-grow: 0;
+    flex-shrink: 0;
+    align-items: center;
+    gap: 8px;
+
+    margin: 0;
+    padding: 0.5rem 0.75rem;
+
+    font-family: Inter, sans-serif;
+    font-style: normal;
+    font-weight: bold;
+    font-size: 12px;
+    line-height: 16px;
+    color: ${theme.menu.color.active};
+    text-decoration: none;
+    word-break: break-word;
+    cursor: pointer;
+  `
+);
diff --git a/kafka-ui-react-app/src/components/NavBar/NavBar.tsx b/kafka-ui-react-app/src/components/NavBar/NavBar.tsx
new file mode 100644
index 00000000000..275e77f5e30
--- /dev/null
+++ b/kafka-ui-react-app/src/components/NavBar/NavBar.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import Logo from 'components/common/Logo/Logo';
+import Version from 'components/Version/Version';
+import GitIcon from 'components/common/Icons/GitIcon';
+import DiscordIcon from 'components/common/Icons/DiscordIcon';
+
+import * as S from './NavBar.styled';
+import UserInfo from './UserInfo/UserInfo';
+
+interface Props {
+  onBurgerClick: () => void;
+}
+
+const NavBar: React.FC<Props> = ({ onBurgerClick }) => {
+  return (
+    <S.Navbar role="navigation" aria-label="Page Header">
+      <S.NavbarBrand>
+        <S.NavbarBrand>
+          <S.NavbarBurger
+            onClick={onBurgerClick}
+            onKeyDown={onBurgerClick}
+            role="button"
+            tabIndex={0}
+            aria-label="burger"
+          >
+            <S.Span role="separator" />
+            <S.Span role="separator" />
+            <S.Span role="separator" />
+          </S.NavbarBurger>
+
+          <S.Hyperlink to="/">
+            <Logo />
+            UI for Apache Kafka
+          </S.Hyperlink>
+
+          <S.NavbarItem>
+            <Version />
+          </S.NavbarItem>
+        </S.NavbarBrand>
+      </S.NavbarBrand>
+      <S.NavbarSocial>
+        <S.SocialLink
+          href="https://github.com/provectus/kafka-ui"
+          target="_blank"
+        >
+          <GitIcon />
+        </S.SocialLink>
+        <S.SocialLink
+          href="https://discord.com/invite/4DWzD7pGE5"
+          target="_blank"
+        >
+          <DiscordIcon />
+        </S.SocialLink>
+        <UserInfo />
+      </S.NavbarSocial>
+    </S.Navbar>
+  );
+};
+
+export default NavBar;
diff --git a/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.styled.ts b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.styled.ts
new file mode 100644
index 00000000000..85154d76799
--- /dev/null
+++ b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.styled.ts
@@ -0,0 +1,19 @@
+import styled, { css } from 'styled-components';
+
+export const Wrapper = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 5px;
+  svg {
+    position: relative;
+  }
+`;
+
+export const Text = styled.div(
+  ({ theme }) => css`
+    color: ${theme.button.primary.invertedColors.normal};
+  `
+);
+
+export const LogoutLink = styled.a``;
diff --git a/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
new file mode 100644
index 00000000000..bae205ad03c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import UserIcon from 'components/common/Icons/UserIcon';
+import DropdownArrowIcon from 'components/common/Icons/DropdownArrowIcon';
+import { useTheme } from 'styled-components';
+import { useUserInfo } from 'lib/hooks/useUserInfo';
+
+import * as S from './UserInfo.styled';
+
+const UserInfo = () => {
+  const { username } = useUserInfo();
+  const theme = useTheme();
+
+  return username ? (
+    <Dropdown
+      label={
+        <S.Wrapper>
+          <UserIcon />
+          <S.Text>{username}</S.Text>
+          <DropdownArrowIcon
+            isOpen={false}
+            style={{}}
+            color={theme.button.primary.invertedColors.normal}
+          />
+        </S.Wrapper>
+      }
+    >
+      <DropdownItem>
+        <S.LogoutLink href="/logout">Log out</S.LogoutLink>
+      </DropdownItem>
+    </Dropdown>
+  ) : null;
+};
+
+export default UserInfo;
diff --git a/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx b/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx
new file mode 100644
index 00000000000..f474783c471
--- /dev/null
+++ b/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { render } from 'lib/testHelpers';
+import UserInfo from 'components/NavBar/UserInfo/UserInfo';
+import { useUserInfo } from 'lib/hooks/useUserInfo';
+import userEvent from '@testing-library/user-event';
+
+jest.mock('lib/hooks/useUserInfo', () => ({
+  useUserInfo: jest.fn(),
+}));
+
+describe('UserInfo', () => {
+  const renderComponent = () => render(<UserInfo />);
+
+  it('should render the userInfo with correct data', () => {
+    const username = 'someName';
+    (useUserInfo as jest.Mock).mockImplementation(() => ({ username }));
+
+    renderComponent();
+    expect(screen.getByText(username)).toBeInTheDocument();
+  });
+
+  it('should render the userInfo during click opens the dropdown', async () => {
+    const username = 'someName';
+    (useUserInfo as jest.Mock).mockImplementation(() => ({ username }));
+
+    renderComponent();
+    const dropdown = screen.getByText(username);
+    await userEvent.click(dropdown);
+
+    const logout = screen.getByText('Log out');
+    expect(logout).toBeInTheDocument();
+    expect(logout).toHaveAttribute('href', '/logout');
+  });
+
+  it('should not render anything if the username does not exists', () => {
+    (useUserInfo as jest.Mock).mockImplementation(() => ({
+      username: undefined,
+    }));
+
+    renderComponent();
+    expect(screen.queryByRole('listbox')).not.toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/NavBar/__tests__/NavBar.spec.tsx b/kafka-ui-react-app/src/components/NavBar/__tests__/NavBar.spec.tsx
new file mode 100644
index 00000000000..c4dd443d41c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/NavBar/__tests__/NavBar.spec.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { render } from 'lib/testHelpers';
+import NavBar from 'components/NavBar/NavBar';
+import { screen, within } from '@testing-library/react';
+
+const burgerButtonOptions = { name: 'burger' };
+
+jest.mock('components/Version/Version', () => () => <div>Version</div>);
+jest.mock('components/NavBar/UserInfo/UserInfo', () => () => (
+  <div>UserInfo</div>
+));
+
+describe('NavBar', () => {
+  beforeEach(() => {
+    render(<NavBar onBurgerClick={jest.fn()} />);
+  });
+
+  it('correctly renders header', () => {
+    const header = screen.getByLabelText('Page Header');
+    expect(header).toBeInTheDocument();
+    expect(within(header).getByText('UI for Apache Kafka')).toBeInTheDocument();
+    expect(within(header).getAllByRole('separator').length).toEqual(3);
+    expect(
+      within(header).getByRole('button', burgerButtonOptions)
+    ).toBeInTheDocument();
+    expect(within(header).getByText('UserInfo')).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/PageContainer/PageContainer.styled.ts b/kafka-ui-react-app/src/components/PageContainer/PageContainer.styled.ts
new file mode 100644
index 00000000000..bd217b4da99
--- /dev/null
+++ b/kafka-ui-react-app/src/components/PageContainer/PageContainer.styled.ts
@@ -0,0 +1,88 @@
+import styled, { css } from 'styled-components';
+
+export const Container = styled.main(
+  ({ theme }) => css`
+    margin-top: ${theme.layout.navBarHeight};
+    margin-left: ${theme.layout.navBarWidth};
+    position: relative;
+    padding-bottom: 30px;
+    z-index: 20;
+    max-width: calc(100vw - ${theme.layout.navBarWidth});
+    @media screen and (max-width: 1023px) {
+      margin-left: initial;
+      max-width: 100vw;
+    }
+  `
+);
+
+export const Sidebar = styled.div<{ $visible: boolean }>(
+  ({ theme, $visible }) => css`
+    width: ${theme.layout.navBarWidth};
+    display: flex;
+    flex-direction: column;
+    border-right: 1px solid ${theme.layout.stuffBorderColor};
+    position: fixed;
+    top: ${theme.layout.navBarHeight};
+    left: 0;
+    bottom: 0;
+    padding: 8px 16px;
+    overflow-y: scroll;
+    transition: width 0.25s, opacity 0.25s, transform 0.25s,
+      -webkit-transform 0.25s;
+    background: ${theme.menu.backgroundColor.normal};
+    @media screen and (max-width: 1023px) {
+      ${$visible &&
+      css`
+        transform: translate3d(${theme.layout.navBarWidth}, 0, 0);
+      `};
+      left: -${theme.layout.navBarWidth};
+      z-index: 100;
+    }
+
+    &::-webkit-scrollbar {
+      width: 8px;
+    }
+
+    &::-webkit-scrollbar-track {
+      background-color: ${theme.scrollbar.trackColor.normal};
+    }
+
+    &::-webkit-scrollbar-thumb {
+      width: 8px;
+      background-color: ${theme.scrollbar.thumbColor.normal};
+      border-radius: 4px;
+    }
+
+    &:hover::-webkit-scrollbar-thumb {
+      background: ${theme.scrollbar.thumbColor.active};
+    }
+
+    &:hover::-webkit-scrollbar-track {
+      background-color: ${theme.scrollbar.trackColor.active};
+    }
+  `
+);
+
+export const Overlay = styled.div<{ $visible: boolean }>(
+  ({ theme, $visible }) => css`
+    height: calc(100vh - ${theme.layout.navBarHeight});
+    z-index: 99;
+    visibility: hidden;
+    opacity: 0;
+    -webkit-transition: all 0.5s ease;
+    transition: all 0.5s ease;
+    left: 0;
+    position: absolute;
+    top: 0;
+    ${$visible &&
+    css`
+      @media screen and (max-width: 1023px) {
+        bottom: 0;
+        right: 0;
+        visibility: visible;
+        opacity: 0.7;
+        background-color: ${theme.layout.overlay.backgroundColor};
+      }
+    `}
+  `
+);
diff --git a/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
new file mode 100644
index 00000000000..3459e84ec23
--- /dev/null
+++ b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
@@ -0,0 +1,41 @@
+import React, { PropsWithChildren, Suspense, useCallback } from 'react';
+import { useLocation } from 'react-router-dom';
+import NavBar from 'components/NavBar/NavBar';
+import * as S from 'components/PageContainer/PageContainer.styled';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+import Nav from 'components/Nav/Nav';
+
+const PageContainer: React.FC<PropsWithChildren<unknown>> = ({ children }) => {
+  const [isSidebarVisible, setIsSidebarVisible] = React.useState(false);
+  const onBurgerClick = () => setIsSidebarVisible(!isSidebarVisible);
+  const closeSidebar = useCallback(() => setIsSidebarVisible(false), []);
+  const location = useLocation();
+
+  React.useEffect(() => {
+    closeSidebar();
+  }, [location, closeSidebar]);
+
+  return (
+    <>
+      <NavBar onBurgerClick={onBurgerClick} />
+      <S.Container>
+        <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
+          <Suspense fallback={<PageLoader />}>
+            <Nav />
+          </Suspense>
+        </S.Sidebar>
+        <S.Overlay
+          $visible={isSidebarVisible}
+          onClick={closeSidebar}
+          onKeyDown={closeSidebar}
+          tabIndex={-1}
+          aria-hidden="true"
+          aria-label="Overlay"
+        />
+        {children}
+      </S.Container>
+    </>
+  );
+};
+
+export default PageContainer;
diff --git a/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx b/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx
new file mode 100644
index 00000000000..cc78384d2f2
--- /dev/null
+++ b/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { render } from 'lib/testHelpers';
+import PageContainer from 'components/PageContainer/PageContainer';
+import { useClusters } from 'lib/hooks/api/clusters';
+
+const burgerButtonOptions = { name: 'burger' };
+
+jest.mock('lib/hooks/api/clusters', () => ({
+  ...jest.requireActual('lib/hooks/api/roles'),
+  useClusters: jest.fn(),
+}));
+
+jest.mock('components/Version/Version', () => () => <div>Version</div>);
+
+describe('Page Container', () => {
+  beforeEach(() => {
+    (useClusters as jest.Mock).mockImplementation(() => ({
+      isSuccess: false,
+    }));
+
+    render(
+      <PageContainer>
+        <div>child</div>
+      </PageContainer>
+    );
+  });
+
+  it('handle burger click correctly', async () => {
+    const burger = within(screen.getByLabelText('Page Header')).getByRole(
+      'button',
+      burgerButtonOptions
+    );
+    const overlay = screen.getByLabelText('Overlay');
+    expect(screen.getByLabelText('Sidebar')).toBeInTheDocument();
+    expect(overlay).toBeInTheDocument();
+    expect(overlay).toHaveStyleRule('visibility: hidden');
+    expect(burger).toHaveStyleRule('display: none');
+    await userEvent.click(burger);
+    expect(overlay).toHaveStyleRule('visibility: visible');
+  });
+
+  it('render the inner container', async () => {
+    expect(screen.getByText('child')).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
index 38fbb043f2a..4204e647bea 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx
@@ -27,8 +27,13 @@ import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
 import { TableTitle } from 'components/common/table/TableTitle/TableTitle.styled';
 import useAppParams from 'lib/hooks/useAppParams';
 import { schemasApiClient } from 'lib/api';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { Dropdown } from 'components/common/Dropdown';
 import Table from 'components/common/NewTable';
+import { Action, ResourceType } from 'generated-sources';
+import {
+  ActionButton,
+  ActionDropdownItem,
+} from 'components/common/ActionComponent';
 
 import LatestVersionItem from './LatestVersion/LatestVersionItem';
 import SchemaVersion from './SchemaVersion/SchemaVersion';
@@ -106,15 +111,20 @@ const Details: React.FC = () => {
             >
               Compare Versions
             </Button>
-            <Button
+            <ActionButton
               buttonSize="M"
               buttonType="primary"
               to={clusterSchemaEditPageRelativePath}
+              permission={{
+                resource: ResourceType.SCHEMA,
+                action: Action.EDIT,
+                value: subject,
+              }}
             >
               Edit Schema
-            </Button>
+            </ActionButton>
             <Dropdown>
-              <DropdownItem
+              <ActionDropdownItem
                 confirm={
                   <>
                     Are you sure want to remove <b>{subject}</b> schema?
@@ -122,9 +132,14 @@ const Details: React.FC = () => {
                 }
                 onClick={deleteHandler}
                 danger
+                permission={{
+                  resource: ResourceType.SCHEMA,
+                  action: Action.DELETE,
+                  value: subject,
+                }}
               >
                 Remove schema
-              </DropdownItem>
+              </ActionDropdownItem>
             </Dropdown>
           </>
         )}
diff --git a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
index c68380d3737..002d71a37fd 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
-import Select from 'components/common/Select/Select';
-import { CompatibilityLevelCompatibilityEnum } from 'generated-sources';
+import {
+  Action,
+  CompatibilityLevelCompatibilityEnum,
+  ResourceType,
+} from 'generated-sources';
 import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import { fetchSchemas } from 'redux/reducers/schemas/schemasSlice';
@@ -10,6 +13,7 @@ import { showServerError } from 'lib/errorHandling';
 import { useConfirm } from 'lib/hooks/useConfirm';
 import { useSearchParams } from 'react-router-dom';
 import { PER_PAGE } from 'lib/constants';
+import { ActionSelect } from 'components/common/ActionComponent';
 
 import * as S from './GlobalSchemaSelector.styled';
 
@@ -79,7 +83,7 @@ const GlobalSchemaSelector: React.FC = () => {
   return (
     <S.Wrapper>
       <div>Global Compatibility Level: </div>
-      <Select
+      <ActionSelect
         selectSize="M"
         defaultValue={currentCompatibilityLevel}
         minWidth="200px"
@@ -88,6 +92,10 @@ const GlobalSchemaSelector: React.FC = () => {
         options={Object.keys(CompatibilityLevelCompatibilityEnum).map(
           (level) => ({ value: level, label: level })
         )}
+        permission={{
+          resource: ResourceType.SCHEMA,
+          action: Action.MODIFY_GLOBAL_COMPATIBILITY,
+        }}
       />
     </S.Wrapper>
   );
diff --git a/kafka-ui-react-app/src/components/Schemas/List/List.tsx b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
index 8999a81d7b4..50ef556c603 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/List.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/List/List.tsx
@@ -5,7 +5,7 @@ import {
   clusterSchemaPath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
-import { Button } from 'components/common/Button/Button';
+import { ActionButton } from 'components/common/ActionComponent';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
@@ -22,7 +22,7 @@ import Search from 'components/common/Search/Search';
 import PlusIcon from 'components/common/Icons/PlusIcon';
 import Table, { LinkCell } from 'components/common/NewTable';
 import { ColumnDef } from '@tanstack/react-table';
-import { SchemaSubject } from 'generated-sources';
+import { Action, SchemaSubject, ResourceType } from 'generated-sources';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { PER_PAGE } from 'lib/constants';
 
@@ -79,13 +79,17 @@ const List: React.FC = () => {
         {!isReadOnly && (
           <>
             <GlobalSchemaSelector />
-            <Button
+            <ActionButton
               buttonSize="M"
               buttonType="primary"
               to={clusterSchemaNewRelativePath}
+              permission={{
+                resource: ResourceType.SCHEMA,
+                action: Action.CREATE,
+              }}
             >
               <PlusIcon /> Create Schema
-            </Button>
+            </ActionButton>
           </>
         )}
       </PageHeading>
diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.tsx b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
index 39fa49e7416..0d6e9d8ffa5 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { NewSchemaSubjectRaw } from 'redux/interfaces';
-import { FormProvider, useForm, Controller } from 'react-hook-form';
+import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { ErrorMessage } from '@hookform/error-message';
 import {
   ClusterNameRoute,
@@ -22,6 +22,8 @@ import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import { showServerError } from 'lib/errorHandling';
 import { schemasApiClient } from 'lib/api';
+import yup from 'lib/yupExtended';
+import { yupResolver } from '@hookform/resolvers/yup';
 
 import * as S from './New.styled';
 
@@ -31,6 +33,28 @@ const SchemaTypeOptions: Array<SelectOption> = [
   { value: SchemaType.PROTOBUF, label: 'PROTOBUF' },
 ];
 
+const schemaCreate = async (
+  { subject, schema, schemaType }: NewSchemaSubjectRaw,
+  clusterName: string
+) => {
+  return schemasApiClient.createNewSchema({
+    clusterName,
+    newSchemaSubject: { subject, schema, schemaType },
+  });
+};
+
+const validationSchema = yup.object().shape({
+  subject: yup
+    .string()
+    .required('Subject is required.')
+    .matches(
+      SCHEMA_NAME_VALIDATION_PATTERN,
+      'Only alphanumeric, _, -, and . allowed'
+    ),
+  schema: yup.string().required('Schema is required.'),
+  schemaType: yup.string().required('Schema Type is required.'),
+});
+
 const New: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const navigate = useNavigate();
@@ -40,6 +64,7 @@ const New: React.FC = () => {
     defaultValues: {
       schemaType: SchemaType.AVRO,
     },
+    resolver: yupResolver(validationSchema),
   });
   const {
     register,
@@ -54,10 +79,10 @@ const New: React.FC = () => {
     schemaType,
   }: NewSchemaSubjectRaw) => {
     try {
-      const resp = await schemasApiClient.createNewSchema({
-        clusterName,
-        newSchemaSubject: { subject, schema, schemaType },
-      });
+      const resp = await schemaCreate(
+        { subject, schema, schemaType } as NewSchemaSubjectRaw,
+        clusterName
+      );
       dispatch(schemaAdded(resp));
       navigate(clusterSchemaPath(clusterName, subject));
     } catch (e) {
@@ -79,13 +104,6 @@ const New: React.FC = () => {
             inputSize="M"
             placeholder="Schema Name"
             name="subject"
-            hookFormOptions={{
-              required: 'Schema Name is required.',
-              pattern: {
-                value: SCHEMA_NAME_VALIDATION_PATTERN,
-                message: 'Only alphanumeric, _, -, and . allowed',
-              },
-            }}
             autoComplete="off"
             disabled={isSubmitting}
           />
@@ -111,7 +129,6 @@ const New: React.FC = () => {
           <InputLabel>Schema Type *</InputLabel>
           <Controller
             control={control}
-            rules={{ required: 'Schema Type is required.' }}
             name="schemaType"
             defaultValue={SchemaTypeOptions[0].value as SchemaType}
             render={({ field: { name, onChange, value } }) => (
diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
index fbd0ea6d68c..4fb5f26c7d2 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { CleanUpPolicy, Topic } from 'generated-sources';
+import { Action, CleanUpPolicy, Topic, ResourceType } from 'generated-sources';
 import { CellContext } from '@tanstack/react-table';
 import { useAppDispatch } from 'lib/hooks/redux';
 import ClusterContext from 'components/contexts/ClusterContext';
@@ -17,6 +17,7 @@ import {
   useDeleteTopic,
   useRecreateTopic,
 } from 'lib/hooks/api/topics';
+import { ActionDropdownItem } from 'components/common/ActionComponent';
 
 const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
   const { name, internal, cleanUpPolicy } = row.original;
@@ -36,18 +37,23 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
     await dispatch(
       clearTopicMessages({ clusterName, topicName: name })
     ).unwrap();
-    queryClient.invalidateQueries(topicKeys.all(clusterName));
+    return queryClient.invalidateQueries(topicKeys.all(clusterName));
   };
 
   const isCleanupDisabled = cleanUpPolicy !== CleanUpPolicy.DELETE;
 
   return (
     <Dropdown disabled={disabled}>
-      <DropdownItem
+      <ActionDropdownItem
         disabled={isCleanupDisabled}
         onClick={clearTopicMessagesHandler}
         confirm="Are you sure want to clear topic messages?"
         danger
+        permission={{
+          resource: ResourceType.TOPIC,
+          action: Action.MESSAGES_DELETE,
+          value: name,
+        }}
       >
         Clear Messages
         <DropdownItemHint>
@@ -55,7 +61,7 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
           <br />
           with DELETE policy
         </DropdownItemHint>
-      </DropdownItem>
+      </ActionDropdownItem>
       <DropdownItem
         onClick={recreateTopic.mutateAsync}
         confirm={
@@ -67,7 +73,7 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
       >
         Recreate Topic
       </DropdownItem>
-      <DropdownItem
+      <ActionDropdownItem
         disabled={!isTopicDeletionAllowed}
         onClick={() => deleteTopic.mutateAsync(name)}
         confirm={
@@ -76,6 +82,11 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
           </>
         }
         danger
+        permission={{
+          resource: ResourceType.TOPIC,
+          action: Action.DELETE,
+          value: name,
+        }}
       >
         Remove Topic
         {!isTopicDeletionAllowed && (
@@ -85,7 +96,7 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
             configuration level
           </DropdownItemHint>
         )}
-      </DropdownItem>
+      </ActionDropdownItem>
     </Dropdown>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
index 3ff45cfed78..d75f4d0da2c 100644
--- a/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Row } from '@tanstack/react-table';
-import { Topic } from 'generated-sources';
+import { Action, Topic, ResourceType } from 'generated-sources';
 import useAppParams from 'lib/hooks/useAppParams';
 import { ClusterName } from 'redux/interfaces';
 import { topicKeys, useDeleteTopic } from 'lib/hooks/api/topics';
@@ -10,6 +10,9 @@ import { useAppDispatch } from 'lib/hooks/redux';
 import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import { clusterTopicCopyRelativePath } from 'lib/paths';
 import { useQueryClient } from '@tanstack/react-query';
+import { ActionCanButton } from 'components/common/ActionComponent';
+import { isPermitted } from 'lib/permissions';
+import { useUserInfo } from 'lib/hooks/useUserInfo';
 
 interface BatchActionsbarProps {
   rows: Row<Topic>[];
@@ -85,17 +88,45 @@ const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
       search: new URLSearchParams(search).toString(),
     };
   };
+  const { roles, rbacFlag } = useUserInfo();
+
+  const canDeleteSelectedTopics = useMemo(() => {
+    return selectedTopics.every((value) =>
+      isPermitted({
+        roles,
+        resource: ResourceType.TOPIC,
+        action: Action.DELETE,
+        value,
+        clusterName,
+        rbacFlag,
+      })
+    );
+  }, [selectedTopics, clusterName, roles]);
+
+  const canPurgeSelectedTopics = useMemo(() => {
+    return selectedTopics.every((value) =>
+      isPermitted({
+        roles,
+        resource: ResourceType.TOPIC,
+        action: Action.MESSAGES_DELETE,
+        value,
+        clusterName,
+        rbacFlag,
+      })
+    );
+  }, [selectedTopics, clusterName, roles]);
 
   return (
     <>
-      <Button
+      <ActionCanButton
         buttonSize="M"
         buttonType="secondary"
         onClick={deleteTopicsHandler}
         disabled={!selectedTopics.length}
+        canDoAction={canDeleteSelectedTopics}
       >
         Delete selected topics
-      </Button>
+      </ActionCanButton>
       <Button
         buttonSize="M"
         buttonType="secondary"
@@ -104,14 +135,15 @@ const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
       >
         Copy selected topic
       </Button>
-      <Button
+      <ActionCanButton
         buttonSize="M"
         buttonType="secondary"
         onClick={purgeTopicsHandler}
         disabled={!selectedTopics.length}
+        canDoAction={canPurgeSelectedTopics}
       >
         Purge messages of selected topics
-      </Button>
+      </ActionCanButton>
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
index 94bf4ef14ad..fc1c9dad666 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ListPage.tsx
@@ -4,13 +4,14 @@ import { clusterTopicNewRelativePath } from 'lib/paths';
 import { PER_PAGE } from 'lib/constants';
 import ClusterContext from 'components/contexts/ClusterContext';
 import Search from 'components/common/Search/Search';
-import { Button } from 'components/common/Button/Button';
+import { ActionButton } from 'components/common/ActionComponent';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import Switch from 'components/common/Switch/Switch';
 import PlusIcon from 'components/common/Icons/PlusIcon';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import TopicTable from 'components/Topics/List/TopicTable';
+import { Action, ResourceType } from 'generated-sources';
 
 const ListPage: React.FC = () => {
   const { isReadOnly } = React.useContext(ClusterContext);
@@ -47,13 +48,17 @@ const ListPage: React.FC = () => {
     <>
       <PageHeading text="Topics">
         {!isReadOnly && (
-          <Button
+          <ActionButton
             buttonType="primary"
             buttonSize="M"
             to={clusterTopicNewRelativePath}
+            permission={{
+              resource: ResourceType.TOPIC,
+              action: Action.CREATE,
+            }}
           >
             <PlusIcon /> Add a Topic
-          </Button>
+          </ActionButton>
         )}
       </PageHeading>
       <ControlPanelWrapper hasInput>
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
index 72415dbebce..c829329533a 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListPage.spec.tsx
@@ -28,22 +28,23 @@ describe('ListPage Component', () => {
       { initialEntries: [clusterTopicsPath(clusterName)] }
     );
 
-  beforeEach(() => {
-    renderComponent();
-  });
-
-  it('handles switch of Internal Topics visibility', async () => {
-    const switchInput = screen.getByLabelText('Show Internal Topics');
-    expect(switchInput).toBeInTheDocument();
+  describe('Component Render', () => {
+    beforeEach(() => {
+      renderComponent();
+    });
+    it('handles switch of Internal Topics visibility', async () => {
+      const switchInput = screen.getByLabelText('Show Internal Topics');
+      expect(switchInput).toBeInTheDocument();
 
-    expect(global.localStorage.getItem('hideInternalTopics')).toBeNull();
-    await userEvent.click(switchInput);
-    expect(global.localStorage.getItem('hideInternalTopics')).toBeTruthy();
-    await userEvent.click(switchInput);
-    expect(global.localStorage.getItem('hideInternalTopics')).toBeNull();
-  });
+      expect(global.localStorage.getItem('hideInternalTopics')).toBeNull();
+      await userEvent.click(switchInput);
+      expect(global.localStorage.getItem('hideInternalTopics')).toBeTruthy();
+      await userEvent.click(switchInput);
+      expect(global.localStorage.getItem('hideInternalTopics')).toBeNull();
+    });
 
-  it('renders the TopicsTable', () => {
-    expect(screen.getByText('TopicTableMock')).toBeInTheDocument();
+    it('renders the TopicsTable', () => {
+      expect(screen.getByText('TopicTableMock')).toBeInTheDocument();
+    });
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
index 2dd3db4ad16..72baa05bc58 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
@@ -66,7 +66,9 @@ describe('TopicTable Components', () => {
           <TopicTable />
         </WithRoute>
       </ClusterContext.Provider>,
-      { initialEntries: [clusterTopicsPath(clusterName)] }
+      {
+        initialEntries: [clusterTopicsPath(clusterName)],
+      }
     );
   };
 
diff --git a/kafka-ui-react-app/src/components/Topics/New/New.tsx b/kafka-ui-react-app/src/components/Topics/New/New.tsx
index 1fbd59090d2..cf21d0acd20 100644
--- a/kafka-ui-react-app/src/components/Topics/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/New.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { TopicFormData } from 'redux/interfaces';
-import { useForm, FormProvider } from 'react-hook-form';
+import { FormProvider, useForm } from 'react-hook-form';
 import { ClusterNameRoute, clusterTopicsPath } from 'lib/paths';
 import TopicForm from 'components/Topics/shared/Form/TopicForm';
-import { useNavigate, useLocation } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { topicFormValidationSchema } from 'lib/yupExtended';
 import PageHeading from 'components/common/PageHeading/PageHeading';
@@ -19,12 +19,12 @@ enum Filters {
 }
 
 const New: React.FC = () => {
+  const { clusterName } = useAppParams<ClusterNameRoute>();
   const methods = useForm<TopicFormData>({
     mode: 'onChange',
     resolver: yupResolver(topicFormValidationSchema),
   });
 
-  const { clusterName } = useAppParams<ClusterNameRoute>();
   const createTopic = useCreateTopic(clusterName);
 
   const navigate = useNavigate();
@@ -39,7 +39,7 @@ const New: React.FC = () => {
   const cleanUpPolicy = params.get(Filters.CLEANUP_POLICY) || 'Delete';
 
   const onSubmit = async (data: TopicFormData) => {
-    await createTopic.mutateAsync(data);
+    await createTopic.createResource(data);
     navigate(`../${data.name}`);
   };
 
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index 9f51c68d846..eeccf3267e9 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -23,6 +23,7 @@ jest.mock('react-router-dom', () => ({
 jest.mock('lib/hooks/api/topics', () => ({
   useCreateTopic: jest.fn(),
 }));
+
 const renderComponent = (path: string) => {
   render(
     <Routes>
@@ -38,7 +39,7 @@ const createTopicMock = jest.fn();
 describe('New', () => {
   beforeEach(() => {
     (useCreateTopic as jest.Mock).mockImplementation(() => ({
-      mutateAsync: createTopicMock,
+      createResource: createTopicMock,
     }));
   });
   afterEach(() => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx
index a9f4eb15e8d..0e1eed205a9 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx
@@ -1,13 +1,14 @@
 import React from 'react';
-import { Partition } from 'generated-sources';
+import { Action, Partition, ResourceType } from 'generated-sources';
 import { CellContext } from '@tanstack/react-table';
 import { useAppDispatch } from 'lib/hooks/redux';
 import ClusterContext from 'components/contexts/ClusterContext';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { Dropdown } from 'components/common/Dropdown';
 import { useTopicDetails } from 'lib/hooks/api/topics';
+import { ActionDropdownItem } from 'components/common/ActionComponent';
 
 const ActionsCell: React.FC<CellContext<Partition, unknown>> = ({ row }) => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
@@ -25,9 +26,17 @@ const ActionsCell: React.FC<CellContext<Partition, unknown>> = ({ row }) => {
     data?.internal || isReadOnly || data?.cleanUpPolicy !== 'DELETE';
   return (
     <Dropdown disabled={disabled}>
-      <DropdownItem onClick={clearTopicMessagesHandler} danger>
+      <ActionDropdownItem
+        onClick={clearTopicMessagesHandler}
+        danger
+        permission={{
+          resource: ResourceType.TOPIC,
+          action: Action.MESSAGES_DELETE,
+          value: topicName,
+        }}
+      >
         Clear Messages
-      </DropdownItem>
+      </ActionDropdownItem>
     </Dropdown>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
index 40abb14d705..a0909a4ebcc 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
@@ -6,7 +6,6 @@ import {
 } from 'lib/hooks/api/topics';
 import useAppParams from 'lib/hooks/useAppParams';
 import { RouteParamsClusterTopic } from 'lib/paths';
-import { Button } from 'components/common/Button/Button';
 import * as Informers from 'components/common/Metrics';
 import ProgressBar from 'components/common/ProgressBar/ProgressBar';
 import {
@@ -16,6 +15,8 @@ import {
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 import { calculateTimer } from 'lib/dateTimeHelpers';
+import { Action, ResourceType } from 'generated-sources';
+import { ActionButton } from 'components/common/ActionComponent';
 
 import * as S from './Statistics.styles';
 import Total from './Indicators/Total';
@@ -50,16 +51,21 @@ const Metrics: React.FC = () => {
           <ProgressBar completed={data.progress.completenessPercent || 0} />
           <span> {Math.floor(data.progress.completenessPercent || 0)} %</span>
         </S.ProgressBarWrapper>
-        <Button
+        <ActionButton
           onClick={async () => {
             await cancelTopicAnalysis.mutateAsync();
             setIsAnalyzing(true);
           }}
           buttonType="primary"
           buttonSize="M"
+          permission={{
+            resource: ResourceType.TOPIC,
+            action: Action.MESSAGES_READ,
+            value: params.topicName,
+          }}
         >
           Stop Analysis
-        </Button>
+        </ActionButton>
         <List>
           <Label>Started at</Label>
           <span>{formatTimestamp(data.progress.startedAt, 'hh:mm:ss a')}</span>
@@ -87,16 +93,21 @@ const Metrics: React.FC = () => {
     <>
       <S.ActionsBar>
         <S.CreatedAt>{formatTimestamp(data?.result?.finishedAt)}</S.CreatedAt>
-        <Button
+        <ActionButton
           onClick={async () => {
             await analyzeTopic.mutateAsync();
             setIsAnalyzing(true);
           }}
           buttonType="primary"
           buttonSize="S"
+          permission={{
+            resource: ResourceType.TOPIC,
+            action: Action.MESSAGES_READ,
+            value: params.topicName,
+          }}
         >
           Restart Analysis
-        </Button>
+        </ActionButton>
       </S.ActionsBar>
       <Informers.Wrapper>
         <Total {...totalStats} />
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.tsx
index 66ea07ba7aa..fd275028ba8 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.tsx
@@ -5,7 +5,8 @@ import useAppParams from 'lib/hooks/useAppParams';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import { QueryErrorResetBoundary } from '@tanstack/react-query';
 import { ErrorBoundary } from 'react-error-boundary';
-import { Button } from 'components/common/Button/Button';
+import { Action, ResourceType } from 'generated-sources';
+import { ActionButton } from 'components/common/ActionComponent';
 
 import * as S from './Statistics.styles';
 import Metrics from './Metrics';
@@ -21,16 +22,21 @@ const Statistics: React.FC = () => {
           onReset={reset}
           fallbackRender={({ resetErrorBoundary }) => (
             <S.ProgressContainer>
-              <Button
+              <ActionButton
                 onClick={async () => {
                   await analyzeTopic.mutateAsync();
                   resetErrorBoundary();
                 }}
                 buttonType="primary"
                 buttonSize="M"
+                permission={{
+                  resource: ResourceType.TOPIC,
+                  action: Action.MESSAGES_READ,
+                  value: params.topicName,
+                }}
               >
                 Start Analysis
-              </Button>
+              </ActionButton>
             </S.ProgressContainer>
           )}
         >
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
index cc70ed51c35..2cc592c9816 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/__test__/Statistics.spec.tsx
@@ -26,29 +26,25 @@ describe('Statistics', () => {
     );
   };
   const startMock = jest.fn();
-  it('renders Metricks component', async () => {
+  it('renders Metrics component', async () => {
     (useTopicAnalysis as jest.Mock).mockImplementation(() => ({
       data: { result: 1 },
     }));
 
     renderComponent();
-
     await expect(screen.getByText('Restart Analysis')).toBeInTheDocument();
     expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
   });
   it('renders Start Analysis button', async () => {
-    // throwing intentional For error boundaries to work
     jest.spyOn(console, 'error').mockImplementation(() => undefined);
     (useAnalyzeTopic as jest.Mock).mockImplementation(() => ({
       mutateAsync: startMock,
     }));
-    (useTopicAnalysis as jest.Mock).mockImplementation(() => {
-      throw new Error('Error boundary');
-    });
     renderComponent();
     const btn = screen.getByRole('button', { name: 'Start Analysis' });
     expect(btn).toBeInTheDocument();
     await waitFor(() => userEvent.click(btn));
     expect(startMock).toHaveBeenCalled();
+    jest.clearAllMocks();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index 6beca214b27..01e140c8bb0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -1,25 +1,25 @@
 import React, { Suspense } from 'react';
 import { NavLink, Route, Routes, useNavigate } from 'react-router-dom';
 import {
-  RouteParamsClusterTopic,
-  clusterTopicMessagesRelativePath,
-  clusterTopicSettingsRelativePath,
   clusterTopicConsumerGroupsRelativePath,
   clusterTopicEditRelativePath,
-  clusterTopicStatisticsRelativePath,
+  clusterTopicMessagesRelativePath,
+  clusterTopicSettingsRelativePath,
   clusterTopicsPath,
+  clusterTopicStatisticsRelativePath,
+  RouteParamsClusterTopic,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import { Button } from 'components/common/Button/Button';
+import {
+  ActionButton,
+  ActionNavLink,
+  ActionDropdownItem,
+} from 'components/common/ActionComponent';
 import Navbar from 'components/common/Navigation/Navbar.styled';
 import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
-import {
-  Dropdown,
-  DropdownItem,
-  DropdownItemHint,
-} from 'components/common/Dropdown';
+import { Dropdown, DropdownItemHint } from 'components/common/Dropdown';
 import {
   useDeleteTopic,
   useRecreateTopic,
@@ -29,7 +29,7 @@ import {
   clearTopicMessages,
   resetTopicMessages,
 } from 'redux/reducers/topicMessages/topicMessagesSlice';
-import { CleanUpPolicy } from 'generated-sources';
+import { Action, CleanUpPolicy, ResourceType } from 'generated-sources';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import SlidingSidebar from 'components/common/SlidingSidebar';
 import useBoolean from 'lib/hooks/useBoolean';
@@ -50,6 +50,7 @@ const Topic: React.FC = () => {
     setTrue: openSidebar,
   } = useBoolean(false);
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
+
   const navigate = useNavigate();
   const deleteTopic = useDeleteTopic(clusterName);
   const recreateTopic = useRecreateTopic({ clusterName, topicName });
@@ -78,31 +79,48 @@ const Topic: React.FC = () => {
         backText="Topics"
         backTo={clusterTopicsPath(clusterName)}
       >
-        <Button
+        <ActionButton
           buttonSize="M"
           buttonType="primary"
           onClick={openSidebar}
           disabled={isReadOnly}
+          permission={{
+            resource: ResourceType.TOPIC,
+            action: Action.MESSAGES_PRODUCE,
+            value: topicName,
+          }}
         >
           Produce Message
-        </Button>
+        </ActionButton>
         <Dropdown disabled={isReadOnly || data?.internal}>
-          <DropdownItem onClick={() => navigate(clusterTopicEditRelativePath)}>
+          <ActionDropdownItem
+            onClick={() => navigate(clusterTopicEditRelativePath)}
+            permission={{
+              resource: ResourceType.TOPIC,
+              action: Action.EDIT,
+              value: topicName,
+            }}
+          >
             Edit settings
             <DropdownItemHint>
               Pay attention! This operation has
               <br />
               especially important consequences.
             </DropdownItemHint>
-          </DropdownItem>
+          </ActionDropdownItem>
 
-          <DropdownItem
+          <ActionDropdownItem
             onClick={() =>
               dispatch(clearTopicMessages({ clusterName, topicName })).unwrap()
             }
             confirm="Are you sure want to clear topic messages?"
             disabled={!canCleanup}
             danger
+            permission={{
+              resource: ResourceType.TOPIC,
+              action: Action.MESSAGES_DELETE,
+              value: topicName,
+            }}
           >
             Clear messages
             <DropdownItemHint>
@@ -110,9 +128,9 @@ const Topic: React.FC = () => {
               <br />
               with DELETE policy
             </DropdownItemHint>
-          </DropdownItem>
+          </ActionDropdownItem>
 
-          <DropdownItem
+          <ActionDropdownItem
             onClick={recreateTopic.mutateAsync}
             confirm={
               <>
@@ -120,10 +138,15 @@ const Topic: React.FC = () => {
               </>
             }
             danger
+            permission={{
+              resource: ResourceType.TOPIC,
+              action: [Action.MESSAGES_READ, Action.CREATE, Action.DELETE],
+              value: topicName,
+            }}
           >
             Recreate Topic
-          </DropdownItem>
-          <DropdownItem
+          </ActionDropdownItem>
+          <ActionDropdownItem
             onClick={deleteTopicHandler}
             confirm={
               <>
@@ -132,6 +155,11 @@ const Topic: React.FC = () => {
             }
             disabled={!isTopicDeletionAllowed}
             danger
+            permission={{
+              resource: ResourceType.TOPIC,
+              action: Action.DELETE,
+              value: topicName,
+            }}
           >
             Remove Topic
             {!isTopicDeletionAllowed && (
@@ -141,7 +169,7 @@ const Topic: React.FC = () => {
                 configuration level
               </DropdownItemHint>
             )}
-          </DropdownItem>
+          </ActionDropdownItem>
         </Dropdown>
       </PageHeading>
       <Navbar role="navigation">
@@ -152,12 +180,17 @@ const Topic: React.FC = () => {
         >
           Overview
         </NavLink>
-        <NavLink
+        <ActionNavLink
           to={clusterTopicMessagesRelativePath}
           className={({ isActive }) => (isActive ? 'is-active' : '')}
+          permission={{
+            resource: ResourceType.TOPIC,
+            action: Action.MESSAGES_READ,
+            value: topicName,
+          }}
         >
           Messages
-        </NavLink>
+        </ActionNavLink>
         <NavLink
           to={clusterTopicConsumerGroupsRelativePath}
           className={({ isActive }) => (isActive ? 'is-active' : '')}
diff --git a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
index 4190946c1fe..82fb74719a5 100644
--- a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
+++ b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
@@ -1,61 +1,41 @@
 import React from 'react';
-import { screen, within } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import App from 'components/App';
 import { render } from 'lib/testHelpers';
-import userEvent from '@testing-library/user-event';
 import { useTimeFormat } from 'lib/hooks/api/timeFormat';
 import { defaultGlobalSettingsValue } from 'components/contexts/GlobalSettingsContext';
-
-const burgerButtonOptions = { name: 'burger' };
-const logoutButtonOptions = { name: 'Log out' };
+import { useGetUserInfo } from 'lib/hooks/api/roles';
 
 jest.mock('components/Nav/Nav', () => () => <div>Navigation</div>);
 
 jest.mock('components/Version/Version', () => () => <div>Version</div>);
 
+jest.mock('components/NavBar/NavBar', () => () => <div>NavBar</div>);
+
 jest.mock('lib/hooks/api/timeFormat', () => ({
   ...jest.requireActual('lib/hooks/api/timeFormat'),
   useTimeFormat: jest.fn(),
 }));
 
+jest.mock('lib/hooks/api/roles', () => ({
+  useGetUserInfo: jest.fn(),
+}));
+
 describe('App', () => {
   beforeEach(() => {
     (useTimeFormat as jest.Mock).mockImplementation(() => ({
       data: defaultGlobalSettingsValue,
     }));
 
+    (useGetUserInfo as jest.Mock).mockImplementation(() => ({
+      data: {},
+    }));
+
     render(<App />, {
       initialEntries: ['/'],
     });
   });
 
-  it('correctly renders header', () => {
-    const header = screen.getByLabelText('Page Header');
-    expect(header).toBeInTheDocument();
-    expect(within(header).getByText('UI for Apache Kafka')).toBeInTheDocument();
-    expect(within(header).getAllByRole('separator').length).toEqual(3);
-    expect(
-      within(header).getByRole('button', burgerButtonOptions)
-    ).toBeInTheDocument();
-    expect(
-      within(header).getByRole('button', logoutButtonOptions)
-    ).toBeInTheDocument();
-  });
-
-  it('handle burger click correctly', async () => {
-    const burger = within(screen.getByLabelText('Page Header')).getByRole(
-      'button',
-      burgerButtonOptions
-    );
-    const overlay = screen.getByLabelText('Overlay');
-    expect(screen.getByLabelText('Sidebar')).toBeInTheDocument();
-    expect(overlay).toBeInTheDocument();
-    expect(overlay).toHaveStyleRule('visibility: hidden');
-    expect(burger).toHaveStyleRule('display: none');
-    await userEvent.click(burger);
-    expect(overlay).toHaveStyleRule('visibility: visible');
-  });
-
   it('Renders navigation', async () => {
     expect(screen.getByText('Navigation')).toBeInTheDocument();
   });
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionButton.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionButton.tsx
new file mode 100644
index 00000000000..b7be1a97b59
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionButton.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { Props as ButtonProps } from 'components/common/Button/Button';
+import { ActionComponentProps } from 'components/common/ActionComponent/ActionComponent';
+import { Action } from 'generated-sources';
+import ActionPermissionButton from 'components/common/ActionComponent/ActionButton/ActionPermissionButton/ActionPermissionButton';
+import ActionCreateButton from 'components/common/ActionComponent/ActionButton//ActionCreateButton/ActionCreateButton';
+
+interface Props extends ActionComponentProps, ButtonProps {}
+
+const ActionButton: React.FC<Props> = ({ permission, ...props }) => {
+  return permission.action === Action.CREATE ? (
+    <ActionCreateButton permission={permission} {...props} />
+  ) : (
+    <ActionPermissionButton permission={permission} {...props} />
+  );
+};
+
+export default ActionButton;
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCanButton/ActionCanButton.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCanButton/ActionCanButton.tsx
new file mode 100644
index 00000000000..00d16d43ba4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCanButton/ActionCanButton.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { Button, Props as ButtonProps } from 'components/common/Button/Button';
+import * as S from 'components/common/ActionComponent/ActionComponent.styled';
+import {
+  ActionComponentProps,
+  getDefaultActionMessage,
+} from 'components/common/ActionComponent/ActionComponent';
+import { useActionTooltip } from 'lib/hooks/useActionTooltip';
+
+interface Props extends Omit<ActionComponentProps, 'permission'>, ButtonProps {
+  canDoAction: boolean;
+}
+
+const ActionButton: React.FC<Props> = ({
+  placement = 'bottom-end',
+  message = getDefaultActionMessage(),
+  disabled,
+  canDoAction,
+  ...props
+}) => {
+  const isDisabled = !canDoAction;
+
+  const { x, y, reference, floating, strategy, open } = useActionTooltip(
+    isDisabled,
+    placement
+  );
+
+  return (
+    <S.Wrapper ref={reference}>
+      <Button {...props} disabled={disabled || isDisabled} />
+      {open && (
+        <S.MessageTooltipLimited
+          ref={floating}
+          style={{
+            position: strategy,
+            top: y ?? 0,
+            left: x ?? 0,
+            width: 'max-content',
+          }}
+        >
+          {message}
+        </S.MessageTooltipLimited>
+      )}
+    </S.Wrapper>
+  );
+};
+
+export default ActionButton;
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCanButton/__tests__/ActionCanButton.spec.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCanButton/__tests__/ActionCanButton.spec.tsx
new file mode 100644
index 00000000000..0ea35729586
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCanButton/__tests__/ActionCanButton.spec.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { render } from 'lib/testHelpers';
+import ActionCanButton from 'components/common/ActionComponent/ActionButton/ActionCanButton/ActionCanButton';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { getDefaultActionMessage } from 'components/common/ActionComponent/ActionComponent';
+
+describe('ActionButton', () => {
+  const tooltipText = getDefaultActionMessage();
+
+  it('should render the button with the correct text, for the permission tooltip not to show', async () => {
+    render(
+      <ActionCanButton buttonType="primary" buttonSize="M" canDoAction>
+        test
+      </ActionCanButton>
+    );
+    const button = screen.getByRole('button', { name: 'test' });
+    expect(button).toBeInTheDocument();
+    expect(button).toBeEnabled();
+    await userEvent.hover(button);
+    expect(screen.queryByText(tooltipText)).not.toBeInTheDocument();
+  });
+
+  it('should make the button disable and view the tooltip with the default text', async () => {
+    render(
+      <ActionCanButton buttonType="primary" buttonSize="M" canDoAction={false}>
+        test
+      </ActionCanButton>
+    );
+    const button = screen.getByRole('button');
+    expect(button).toBeDisabled();
+    expect(screen.queryByText(tooltipText)).not.toBeInTheDocument();
+    await userEvent.hover(button);
+    expect(screen.getByText(tooltipText)).toBeInTheDocument();
+  });
+
+  it('should make the button disable and view the tooltip with the given text', async () => {
+    const customTooltipText = 'something here';
+
+    render(
+      <ActionCanButton
+        buttonType="primary"
+        buttonSize="M"
+        canDoAction={false}
+        message={customTooltipText}
+      />
+    );
+    const button = screen.getByRole('button');
+    expect(button).toBeDisabled();
+    expect(screen.queryByText(customTooltipText)).not.toBeInTheDocument();
+    await userEvent.hover(button);
+    expect(screen.getByText(customTooltipText)).toBeInTheDocument();
+    await userEvent.unhover(button);
+    expect(screen.queryByText(customTooltipText)).not.toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCreateButton/ActionCreateButton.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCreateButton/ActionCreateButton.tsx
new file mode 100644
index 00000000000..a1a20f5a291
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCreateButton/ActionCreateButton.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { Props as ButtonProps } from 'components/common/Button/Button';
+import { ActionComponentProps } from 'components/common/ActionComponent/ActionComponent';
+import { useCreatePermission } from 'lib/hooks/useCreatePermisson';
+import ActionCanButton from 'components/common/ActionComponent/ActionButton/ActionCanButton/ActionCanButton';
+
+interface Props extends ActionComponentProps, ButtonProps {}
+
+const ActionCreateButton: React.FC<Props> = ({ permission, ...props }) => {
+  const canDoAction = useCreatePermission(permission.resource);
+
+  return <ActionCanButton canDoAction={canDoAction} {...props} />;
+};
+
+export default ActionCreateButton;
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCreateButton/__tests__/ActionCreateButton.spec.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCreateButton/__tests__/ActionCreateButton.spec.tsx
new file mode 100644
index 00000000000..424f1e607e6
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionCreateButton/__tests__/ActionCreateButton.spec.tsx
@@ -0,0 +1,98 @@
+import React from 'react';
+import { render } from 'lib/testHelpers';
+import ActionCreateButton from 'components/common/ActionComponent/ActionButton/ActionCreateButton/ActionCreateButton';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { getDefaultActionMessage } from 'components/common/ActionComponent/ActionComponent';
+import { useParams } from 'react-router-dom';
+import {
+  clusterName,
+  validPermission,
+  invalidPermission,
+  tooltipIsShowing,
+  userInfoRbacEnabled,
+} from 'components/common/ActionComponent/__tests__/fixtures';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: jest.fn(),
+}));
+
+describe('ActionCreateButton', () => {
+  const tooltipText = getDefaultActionMessage();
+
+  beforeEach(() => {
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName,
+    }));
+  });
+
+  it('should render the button with the correct text, for the permission tooltip not to show', async () => {
+    render(
+      <ActionCreateButton
+        buttonType="primary"
+        buttonSize="M"
+        permission={validPermission}
+      >
+        test
+      </ActionCreateButton>,
+      {
+        userInfo: userInfoRbacEnabled,
+      }
+    );
+    const button = screen.getByRole('button', { name: 'test' });
+    expect(button).toBeInTheDocument();
+    expect(button).toBeEnabled();
+    await userEvent.hover(button);
+    expect(screen.queryByText(tooltipText)).not.toBeInTheDocument();
+  });
+
+  it('should make the button disable and view the tooltip with the default text', async () => {
+    render(
+      <ActionCreateButton
+        buttonType="primary"
+        buttonSize="M"
+        permission={invalidPermission}
+      >
+        test
+      </ActionCreateButton>,
+      { userInfo: userInfoRbacEnabled }
+    );
+    const button = screen.getByRole('button');
+    expect(button).toBeDisabled();
+    await tooltipIsShowing(button, tooltipText);
+  });
+
+  it('should make the button disable and view the tooltip with the given text', async () => {
+    const customTooltipText = 'something here';
+
+    render(
+      <ActionCreateButton
+        buttonType="primary"
+        buttonSize="M"
+        permission={invalidPermission}
+        message={customTooltipText}
+      />,
+      { userInfo: userInfoRbacEnabled }
+    );
+    const button = screen.getByRole('button');
+    expect(button).toBeDisabled();
+    await tooltipIsShowing(button, customTooltipText);
+  });
+
+  it('should render the Button but disabled cause the given role is not correct', async () => {
+    render(
+      <ActionCreateButton
+        buttonType="primary"
+        buttonSize="M"
+        permission={invalidPermission}
+      />,
+      {
+        userInfo: userInfoRbacEnabled,
+      }
+    );
+    const button = screen.getByRole('button');
+    expect(button).toBeDisabled();
+    await tooltipIsShowing(button, tooltipText);
+  });
+});
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionPermissionButton/ActionPermissionButton.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionPermissionButton/ActionPermissionButton.tsx
new file mode 100644
index 00000000000..6f30df97324
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionPermissionButton/ActionPermissionButton.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Props as ButtonProps } from 'components/common/Button/Button';
+import { ActionComponentProps } from 'components/common/ActionComponent/ActionComponent';
+import { usePermission } from 'lib/hooks/usePermission';
+import ActionCanButton from 'components/common/ActionComponent/ActionButton/ActionCanButton/ActionCanButton';
+
+interface Props extends ActionComponentProps, ButtonProps {}
+
+const ActionPermissionButton: React.FC<Props> = ({ permission, ...props }) => {
+  const canDoAction = usePermission(
+    permission.resource,
+    permission.action,
+    permission.value
+  );
+
+  return <ActionCanButton canDoAction={canDoAction} {...props} />;
+};
+
+export default ActionPermissionButton;
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionPermissionButton/__tests__/ActionPermissionButton.spec.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionPermissionButton/__tests__/ActionPermissionButton.spec.tsx
new file mode 100644
index 00000000000..cc6f7c4131c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/ActionPermissionButton/__tests__/ActionPermissionButton.spec.tsx
@@ -0,0 +1,98 @@
+import React from 'react';
+import { render } from 'lib/testHelpers';
+import ActionPermissionButton from 'components/common/ActionComponent/ActionButton/ActionPermissionButton/ActionPermissionButton';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { getDefaultActionMessage } from 'components/common/ActionComponent/ActionComponent';
+import { useParams } from 'react-router-dom';
+import {
+  clusterName,
+  validPermission,
+  invalidPermission,
+  tooltipIsShowing,
+  userInfoRbacEnabled,
+} from 'components/common/ActionComponent/__tests__/fixtures';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: jest.fn(),
+}));
+
+describe('ActionPermissionButton', () => {
+  const tooltipText = getDefaultActionMessage();
+
+  beforeEach(() => {
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName,
+    }));
+  });
+
+  it('should render the button with the correct text, for the permission tooltip not to show', async () => {
+    render(
+      <ActionPermissionButton
+        buttonType="primary"
+        buttonSize="M"
+        permission={validPermission}
+      >
+        test
+      </ActionPermissionButton>,
+      {
+        userInfo: userInfoRbacEnabled,
+      }
+    );
+    const button = screen.getByRole('button', { name: 'test' });
+    expect(button).toBeInTheDocument();
+    expect(button).toBeEnabled();
+    await userEvent.hover(button);
+    expect(screen.queryByText(tooltipText)).not.toBeInTheDocument();
+  });
+
+  it('should make the button disable and view the tooltip with the default text', async () => {
+    render(
+      <ActionPermissionButton
+        buttonType="primary"
+        buttonSize="M"
+        permission={invalidPermission}
+      >
+        test
+      </ActionPermissionButton>,
+      { userInfo: userInfoRbacEnabled }
+    );
+    const button = screen.getByRole('button');
+    expect(button).toBeDisabled();
+    await tooltipIsShowing(button, tooltipText);
+  });
+
+  it('should make the button disable and view the tooltip with the given text', async () => {
+    const customTooltipText = 'something here';
+
+    render(
+      <ActionPermissionButton
+        buttonType="primary"
+        buttonSize="M"
+        permission={invalidPermission}
+        message={customTooltipText}
+      />,
+      { userInfo: userInfoRbacEnabled }
+    );
+    const button = screen.getByRole('button');
+    expect(button).toBeDisabled();
+    await tooltipIsShowing(button, customTooltipText);
+  });
+
+  it('should render the Button but disabled cause the given role is not correct', async () => {
+    render(
+      <ActionPermissionButton
+        buttonType="primary"
+        buttonSize="M"
+        permission={invalidPermission}
+      />,
+      {
+        userInfo: userInfoRbacEnabled,
+      }
+    );
+    const button = screen.getByRole('button');
+    expect(button).toBeDisabled();
+    await tooltipIsShowing(button, tooltipText);
+  });
+});
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/__tests__/ActionButton.spec.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/__tests__/ActionButton.spec.tsx
new file mode 100644
index 00000000000..989842a8377
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionButton/__tests__/ActionButton.spec.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import ActionButton from 'components/common/ActionComponent/ActionButton/ActionButton';
+import { render } from 'lib/testHelpers';
+import { Action, ResourceType } from 'generated-sources';
+
+const createText = 'create';
+const otherText = 'create';
+
+jest.mock(
+  'components/common/ActionComponent/ActionButton/ActionCreateButton/ActionCreateButton',
+  () => () => <div>{createText}</div>
+);
+
+jest.mock(
+  'components/common/ActionComponent/ActionButton/ActionPermissionButton/ActionPermissionButton',
+  () => () => <div>{otherText}</div>
+);
+
+describe('ActionButton', () => {
+  it('should check when passes action create it renders create component', () => {
+    render(
+      <ActionButton
+        permission={{
+          action: Action.CREATE,
+          resource: ResourceType.CONNECT,
+        }}
+        buttonType="secondary"
+        buttonSize="S"
+      />
+    );
+    expect(screen.getByText(createText)).toBeInTheDocument();
+  });
+
+  it('should check when passes other actions types it renders Others component', () => {
+    render(
+      <ActionButton
+        permission={{
+          action: Action.EDIT,
+          resource: ResourceType.CONNECT,
+        }}
+        buttonType="secondary"
+        buttonSize="S"
+      />
+    );
+    expect(screen.getByText(createText)).toBeInTheDocument();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.styled.ts b/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.styled.ts
new file mode 100644
index 00000000000..ace26a048ae
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.styled.ts
@@ -0,0 +1,22 @@
+import styled from 'styled-components';
+
+export const Wrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+`;
+
+export const MessageTooltip = styled.div`
+  background-color: ${({ theme }) => theme.tooltip.bg};
+  color: ${({ theme }) => theme.tooltip.text};
+  border-radius: 6px;
+  padding: 5px;
+  z-index: 1;
+  white-space: pre-wrap;
+`;
+
+export const MessageTooltipLimited = styled(MessageTooltip)`
+  max-width: 100%;
+  max-height: 100%;
+`;
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.ts b/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.ts
new file mode 100644
index 00000000000..346b916ca1b
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.ts
@@ -0,0 +1,16 @@
+import { Placement } from '@floating-ui/react-dom-interactions';
+import { Action, ResourceType } from 'generated-sources';
+
+export interface ActionComponentProps {
+  permission: {
+    resource: ResourceType;
+    action: Action | Array<Action>;
+    value?: string;
+  };
+  message?: string;
+  placement?: Placement;
+}
+
+export function getDefaultActionMessage() {
+  return "You don't have a required permission to perform this action";
+}
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionDropDownItem/ActionDropdownItem.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionDropDownItem/ActionDropdownItem.tsx
new file mode 100644
index 00000000000..437a22817af
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionDropDownItem/ActionDropdownItem.tsx
@@ -0,0 +1,60 @@
+import React from 'react';
+import * as S from 'components/common/ActionComponent/ActionComponent.styled';
+import {
+  ActionComponentProps,
+  getDefaultActionMessage,
+} from 'components/common/ActionComponent/ActionComponent';
+import { useActionTooltip } from 'lib/hooks/useActionTooltip';
+import { usePermission } from 'lib/hooks/usePermission';
+import { DropdownItemProps } from 'components/common/Dropdown/DropdownItem';
+import { DropdownItem } from 'components/common/Dropdown';
+
+interface Props extends ActionComponentProps, DropdownItemProps {}
+
+const ActionDropdownItem: React.FC<Props> = ({
+  permission,
+  message = getDefaultActionMessage(),
+  placement = 'left',
+  children,
+  disabled,
+  ...props
+}) => {
+  const canDoAction = usePermission(
+    permission.resource,
+    permission.action,
+    permission.value
+  );
+
+  const isDisabled = !canDoAction;
+
+  const { x, y, reference, floating, strategy, open } = useActionTooltip(
+    isDisabled,
+    placement
+  );
+
+  return (
+    <>
+      <DropdownItem
+        {...props}
+        disabled={disabled || isDisabled}
+        ref={reference}
+      >
+        {children}
+      </DropdownItem>
+      {open && (
+        <S.MessageTooltip
+          ref={floating}
+          style={{
+            position: strategy,
+            top: y ?? 0,
+            left: x ?? 0,
+          }}
+        >
+          {message}
+        </S.MessageTooltip>
+      )}
+    </>
+  );
+};
+
+export default ActionDropdownItem;
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionNavLink/ActionNavLink.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionNavLink/ActionNavLink.tsx
new file mode 100644
index 00000000000..f6a802f1c1a
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionNavLink/ActionNavLink.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import {
+  ActionComponentProps,
+  getDefaultActionMessage,
+} from 'components/common/ActionComponent/ActionComponent';
+import { NavLink, NavLinkProps } from 'react-router-dom';
+import * as S from 'components/common/ActionComponent/ActionComponent.styled';
+import { useActionTooltip } from 'lib/hooks/useActionTooltip';
+import { usePermission } from 'lib/hooks/usePermission';
+
+interface Props extends ActionComponentProps, NavLinkProps {}
+
+const ActionNavLink: React.FC<Props> = ({
+  message = getDefaultActionMessage(),
+  placement,
+  children,
+  permission,
+  className,
+  ...props
+}) => {
+  const canDoAction = usePermission(
+    permission.resource,
+    permission.action,
+    permission.value
+  );
+
+  const isDisabled = !canDoAction;
+
+  const { x, y, reference, floating, strategy, open } = useActionTooltip(
+    isDisabled,
+    placement
+  );
+
+  return (
+    <>
+      <NavLink
+        {...props}
+        ref={reference}
+        className={isDisabled ? 'is-disabled' : className}
+        aria-disabled={isDisabled}
+        onClick={(event) => (isDisabled ? event.preventDefault() : null)}
+      >
+        {children}
+      </NavLink>
+      {open && (
+        <S.MessageTooltipLimited
+          ref={floating}
+          style={{
+            position: strategy,
+            top: y ?? 0,
+            left: x ?? 0,
+            width: 'max-content',
+          }}
+        >
+          {message}
+        </S.MessageTooltipLimited>
+      )}
+    </>
+  );
+};
+
+export default ActionNavLink;
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionNavLink/__tests__/ActionNavLink.spec.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionNavLink/__tests__/ActionNavLink.spec.tsx
new file mode 100644
index 00000000000..c88546c7865
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionNavLink/__tests__/ActionNavLink.spec.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { render } from 'lib/testHelpers';
+import ActionNavLink from 'components/common/ActionComponent/ActionNavLink/ActionNavLink';
+import { getDefaultActionMessage } from 'components/common/ActionComponent/ActionComponent';
+import { useParams } from 'react-router-dom';
+import {
+  clusterName,
+  validPermission,
+  invalidPermission,
+  tooltipIsShowing,
+  userInfoRbacEnabled,
+} from 'components/common/ActionComponent/__tests__/fixtures';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: jest.fn(),
+}));
+
+describe('ActionNavLink', () => {
+  const tooltipText = getDefaultActionMessage();
+
+  beforeEach(() => {
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName,
+    }));
+  });
+
+  it('should render the button with the correct text, for the permission tooltip not to show', async () => {
+    render(
+      <ActionNavLink to="/" permission={validPermission}>
+        test
+      </ActionNavLink>,
+      {
+        userInfo: userInfoRbacEnabled,
+      }
+    );
+    const link = screen.getByRole('link', { name: 'test' });
+    expect(link).toBeInTheDocument();
+    await userEvent.hover(link);
+    expect(screen.queryByText(tooltipText)).not.toBeInTheDocument();
+  });
+
+  it('should make the button disable and view the tooltip with the default text', async () => {
+    render(
+      <ActionNavLink to="/" permission={invalidPermission}>
+        test
+      </ActionNavLink>,
+      {
+        userInfo: userInfoRbacEnabled,
+      }
+    );
+    const link = screen.getByRole('link');
+    expect(link).toHaveAttribute('aria-disabled');
+
+    await tooltipIsShowing(link, tooltipText);
+  });
+
+  it('should make the button disable and view the tooltip with the given text', async () => {
+    const customTooltipText = 'something here';
+
+    render(
+      <ActionNavLink
+        to="/"
+        permission={invalidPermission}
+        message={customTooltipText}
+      />,
+      {
+        userInfo: userInfoRbacEnabled,
+      }
+    );
+    const button = screen.getByRole('link');
+    expect(button).toHaveAttribute('aria-disabled');
+
+    await tooltipIsShowing(button, customTooltipText);
+  });
+
+  it('should render the Link with the correct text, but disabled cause the given role is not correct', async () => {
+    render(
+      <ActionNavLink to="/" permission={invalidPermission}>
+        test
+      </ActionNavLink>,
+      {
+        userInfo: userInfoRbacEnabled,
+      }
+    );
+    const button = screen.getByRole('link');
+    expect(button).toHaveAttribute('aria-disabled');
+
+    await tooltipIsShowing(button, tooltipText);
+  });
+});
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionSelect/ActionSelect.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionSelect/ActionSelect.tsx
new file mode 100644
index 00000000000..31c73982a5f
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionSelect/ActionSelect.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import Select, { SelectProps } from 'components/common/Select/Select';
+import {
+  ActionComponentProps,
+  getDefaultActionMessage,
+} from 'components/common/ActionComponent/ActionComponent';
+import { useActionTooltip } from 'lib/hooks/useActionTooltip';
+import { usePermission } from 'lib/hooks/usePermission';
+import * as S from 'components/common/ActionComponent/ActionComponent.styled';
+
+interface Props extends SelectProps, ActionComponentProps {}
+
+const ActionSelect: React.FC<Props> = ({
+  message = getDefaultActionMessage(),
+  permission,
+  placement = 'bottom',
+  disabled,
+  ...props
+}) => {
+  const canDoAction = usePermission(
+    permission.resource,
+    permission.action,
+    permission.value
+  );
+
+  const isDisabled = !canDoAction;
+
+  const { x, y, reference, floating, strategy, open } = useActionTooltip(
+    isDisabled,
+    placement
+  );
+
+  return (
+    <>
+      <div ref={reference}>
+        <Select {...props} disabled={disabled || isDisabled} />
+      </div>
+      {open && (
+        <S.MessageTooltipLimited
+          ref={floating}
+          style={{
+            position: strategy,
+            top: y ?? 0,
+            left: x ?? 0,
+            width: 'max-content',
+          }}
+        >
+          {message}
+        </S.MessageTooltipLimited>
+      )}
+    </>
+  );
+};
+
+export default ActionSelect;
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionSelect/__tests__/ActionSelect.spec.tsx b/kafka-ui-react-app/src/components/common/ActionComponent/ActionSelect/__tests__/ActionSelect.spec.tsx
new file mode 100644
index 00000000000..da51526bf14
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionSelect/__tests__/ActionSelect.spec.tsx
@@ -0,0 +1,73 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { render } from 'lib/testHelpers';
+import ActionSelect from 'components/common/ActionComponent/ActionSelect/ActionSelect';
+import { getDefaultActionMessage } from 'components/common/ActionComponent/ActionComponent';
+import {
+  clusterName,
+  validPermission,
+  invalidPermission,
+  tooltipIsShowing,
+  userInfoRbacEnabled,
+} from 'components/common/ActionComponent/__tests__/fixtures';
+import { useParams } from 'react-router-dom';
+import userEvent from '@testing-library/user-event';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: jest.fn(),
+}));
+
+describe('ActionSelect', () => {
+  const tooltipText = getDefaultActionMessage();
+
+  beforeEach(() => {
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName,
+    }));
+  });
+
+  it('should render the button with the correct text, for the permission tooltip not to show', async () => {
+    render(<ActionSelect permission={validPermission} />, {
+      userInfo: userInfoRbacEnabled,
+    });
+    const list = screen.getByRole('listbox');
+    expect(list).toBeInTheDocument();
+    await userEvent.hover(list);
+    expect(screen.queryByText(tooltipText)).not.toBeInTheDocument();
+  });
+
+  it('should make the button disable and view the tooltip with the default text', async () => {
+    render(<ActionSelect permission={invalidPermission} />, {
+      userInfo: userInfoRbacEnabled,
+    });
+    const list = screen.getByRole('listbox');
+    await tooltipIsShowing(list, tooltipText);
+  });
+
+  it('should make the button disable and view the tooltip with the given text', async () => {
+    const customTooltipText = 'something here else';
+
+    render(
+      <ActionSelect
+        permission={invalidPermission}
+        message={customTooltipText}
+      />,
+      {
+        userInfo: userInfoRbacEnabled,
+      }
+    );
+    const list = screen.getByRole('listbox');
+
+    await tooltipIsShowing(list, customTooltipText);
+  });
+
+  it('should render the Select, but disabled cause the given role is not correct', async () => {
+    render(<ActionSelect permission={invalidPermission} />, {
+      userInfo: userInfoRbacEnabled,
+    });
+    const list = screen.getByRole('listbox');
+
+    await tooltipIsShowing(list, tooltipText);
+  });
+});
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts b/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts
new file mode 100644
index 00000000000..9107dcc7750
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts
@@ -0,0 +1,41 @@
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { Action, ResourceType } from 'generated-sources';
+
+export const clusterName = 'local';
+
+export const validPermission = {
+  resource: ResourceType.TOPIC,
+  action: Action.CREATE,
+};
+
+export const invalidPermission = {
+  resource: ResourceType.SCHEMA,
+  action: Action.DELETE,
+};
+
+export const roles = [
+  {
+    ...validPermission,
+    actions: [validPermission.action],
+    clusters: [clusterName],
+  },
+];
+
+export const userInfoRbacEnabled = {
+  rbacFlag: true,
+  roles,
+};
+
+export const userInfoRbacDisabled = {
+  rbacFlag: false,
+  roles,
+};
+
+export const tooltipIsShowing = async (button: HTMLElement, text: string) => {
+  expect(screen.queryByText(text)).not.toBeInTheDocument();
+  await userEvent.hover(button);
+  expect(screen.getByText(text)).toBeInTheDocument();
+  await userEvent.unhover(button);
+  expect(screen.queryByText(text)).not.toBeInTheDocument();
+};
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/index.ts b/kafka-ui-react-app/src/components/common/ActionComponent/index.ts
new file mode 100644
index 00000000000..d959680b9fc
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/index.ts
@@ -0,0 +1,13 @@
+import ActionSelect from './ActionSelect/ActionSelect';
+import ActionButton from './ActionButton/ActionButton';
+import ActionCanButton from './ActionButton/ActionCanButton/ActionCanButton';
+import ActionNavLink from './ActionNavLink/ActionNavLink';
+import ActionDropdownItem from './ActionDropDownItem/ActionDropdownItem';
+
+export {
+  ActionSelect,
+  ActionNavLink,
+  ActionCanButton,
+  ActionButton,
+  ActionDropdownItem,
+};
diff --git a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
index 49c1bd303e5..574e8a6c5eb 100644
--- a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
@@ -11,7 +11,7 @@ const StyledButton = styled.button<ButtonProps>`
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  padding: 0px 12px;
+  padding: 0 12px;
   border: none;
   border-radius: 4px;
   white-space: nowrap;
diff --git a/kafka-ui-react-app/src/components/common/Button/Button.tsx b/kafka-ui-react-app/src/components/common/Button/Button.tsx
index 5a359211b2c..66cf42d347a 100644
--- a/kafka-ui-react-app/src/components/common/Button/Button.tsx
+++ b/kafka-ui-react-app/src/components/common/Button/Button.tsx
@@ -4,7 +4,7 @@ import StyledButton, {
 import React from 'react';
 import { Link } from 'react-router-dom';
 
-interface Props
+export interface Props
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     ButtonProps {
   to?: string | object;
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
index 2daf062d852..6095c50d522 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
@@ -20,7 +20,7 @@ export const Dropdown = styled(ControlledMenu)(
     // container for the menu items
     ${menuSelector.name} {
       border: 1px solid ${dropdown.borderColor};
-      box-shadow: 0px 4px 16px ${dropdown.shadow};
+      box-shadow: 0 4px 16px ${dropdown.shadow};
       padding: 8px 0;
       border-radius: 4px;
       font-size: 14px;
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx b/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
index fc4df14fedb..4caf6b5f637 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
+++ b/kafka-ui-react-app/src/components/common/Dropdown/DropdownItem.tsx
@@ -4,40 +4,36 @@ import { useConfirm } from 'lib/hooks/useConfirm';
 
 import * as S from './Dropdown.styled';
 
-interface DropdownItemProps extends PropsWithChildren<MenuItemProps> {
+export interface DropdownItemProps extends PropsWithChildren<MenuItemProps> {
   danger?: boolean;
   onClick?(): void;
   confirm?: React.ReactNode;
 }
 
-const DropdownItem: React.FC<DropdownItemProps> = ({
-  onClick,
-  danger,
-  children,
-  confirm,
-  ...rest
-}) => {
-  const confirmation = useConfirm();
-
-  const handleClick = (e: ClickEvent) => {
-    if (!onClick) return;
-
-    // eslint-disable-next-line no-param-reassign
-    e.stopPropagation = true;
-    e.syntheticEvent.stopPropagation();
-
-    if (confirm) {
-      confirmation(confirm, onClick);
-    } else {
-      onClick();
-    }
-  };
-
-  return (
-    <MenuItem onClick={handleClick} {...rest}>
-      {danger ? <S.DangerItem>{children}</S.DangerItem> : children}
-    </MenuItem>
-  );
-};
+const DropdownItem = React.forwardRef<unknown, DropdownItemProps>(
+  ({ onClick, danger, children, confirm, ...rest }, ref) => {
+    const confirmation = useConfirm();
+
+    const handleClick = (e: ClickEvent) => {
+      if (!onClick) return;
+
+      // eslint-disable-next-line no-param-reassign
+      e.stopPropagation = true;
+      e.syntheticEvent.stopPropagation();
+
+      if (confirm) {
+        confirmation(confirm, onClick);
+      } else {
+        onClick();
+      }
+    };
+
+    return (
+      <MenuItem onClick={handleClick} {...rest} ref={ref}>
+        {danger ? <S.DangerItem>{children}</S.DangerItem> : children}
+      </MenuItem>
+    );
+  }
+);
 
 export default DropdownItem;
diff --git a/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx
index f19a9b45ad2..c656cc5170c 100644
--- a/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx
@@ -1,11 +1,13 @@
-import React from 'react';
+import React, { CSSProperties } from 'react';
 import { useTheme } from 'styled-components';
 
 interface Props {
   isOpen: boolean;
+  style?: CSSProperties;
+  color?: string;
 }
 
-const DropdownArrowIcon: React.FC<Props> = ({ isOpen }) => {
+const DropdownArrowIcon: React.FC<Props> = ({ isOpen, style, color }) => {
   const theme = useTheme();
 
   return (
@@ -13,10 +15,10 @@ const DropdownArrowIcon: React.FC<Props> = ({ isOpen }) => {
       width="24"
       height="24"
       fill="none"
-      style={{ position: 'absolute', right: '5px' }}
+      style={style || { position: 'absolute', right: '5px' }}
       stroke="currentColor"
       strokeWidth="2"
-      color={theme.icons.dropdownArrowIcon}
+      color={color || theme.icons.dropdownArrowIcon}
       transform={isOpen ? 'rotate(180)' : ''}
     >
       <path d="M6 9L12 15 18 9" />
diff --git a/kafka-ui-react-app/src/components/common/Icons/UserIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/UserIcon.tsx
new file mode 100644
index 00000000000..e9d462ed8b4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/UserIcon.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+const UserIcon = () => {
+  return (
+    <svg
+      width="18"
+      height="20"
+      viewBox="0 0 18 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M9 1.75C7.20507 1.75 5.75 3.20507 5.75 5C5.75 6.79493 7.20507 8.25 9 8.25C10.7949 8.25 12.25 6.79493 12.25 5C12.25 3.20507 10.7949 1.75 9 1.75ZM4.25 5C4.25 2.37665 6.37665 0.25 9 0.25C11.6234 0.25 13.75 2.37665 13.75 5C13.75 7.62335 11.6234 9.75 9 9.75C6.37665 9.75 4.25 7.62335 4.25 5ZM1.64124 13.6412C2.53204 12.7504 3.74022 12.25 5 12.25H13C14.2598 12.25 15.468 12.7504 16.3588 13.6412C17.2496 14.532 17.75 15.7402 17.75 17V19C17.75 19.4142 17.4142 19.75 17 19.75C16.5858 19.75 16.25 19.4142 16.25 19V17C16.25 16.138 15.9076 15.3114 15.2981 14.7019C14.6886 14.0924 13.862 13.75 13 13.75H5C4.13805 13.75 3.3114 14.0924 2.7019 14.7019C2.09241 15.3114 1.75 16.138 1.75 17V19C1.75 19.4142 1.41421 19.75 1 19.75C0.585786 19.75 0.25 19.4142 0.25 19V17C0.25 15.7402 0.750445 14.532 1.64124 13.6412Z"
+        fill="#4C4CFF"
+      />
+    </svg>
+  );
+};
+
+export default UserIcon;
diff --git a/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts b/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
index ff4eca6999d..1c2bd45c84e 100644
--- a/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
@@ -22,7 +22,12 @@ const Navbar = styled.nav`
         solid;
       color: ${(props) => props.theme.primaryTab.color.active};
     }
-    &:hover:not(.is-active) {
+    &.is-disabled {
+      color: ${(props) => props.theme.primaryTab.color.disabled};
+      border-bottom: 1px ${(props) => props.theme.primaryTab.borderColor.normal};
+      cursor: not-allowed;
+    }
+    &:hover:not(.is-active, .is-disabled) {
       border-bottom: 1px ${(props) => props.theme.primaryTab.borderColor.hover}
         solid;
       color: ${(props) => props.theme.primaryTab.color.hover};
diff --git a/kafka-ui-react-app/src/components/contexts/UserInfoRolesAccessContext.tsx b/kafka-ui-react-app/src/components/contexts/UserInfoRolesAccessContext.tsx
new file mode 100644
index 00000000000..075b17a38a6
--- /dev/null
+++ b/kafka-ui-react-app/src/components/contexts/UserInfoRolesAccessContext.tsx
@@ -0,0 +1,39 @@
+import React, { useMemo } from 'react';
+import { useGetUserInfo } from 'lib/hooks/api/roles';
+import { modifyRolesData, RolesModifiedTypes } from 'lib/permissions';
+
+export interface UserInfoType {
+  username: string;
+  roles: RolesModifiedTypes;
+  rbacFlag: boolean;
+}
+
+export const UserInfoRolesAccessContext = React.createContext({
+  username: '',
+  roles: new Map() as RolesModifiedTypes,
+  rbacFlag: true,
+});
+
+export const UserInfoRolesAccessProvider: React.FC<
+  React.PropsWithChildren<unknown>
+> = ({ children }) => {
+  const { data } = useGetUserInfo();
+
+  const contextValue = useMemo(() => {
+    const username = data?.userInfo?.username ? data?.userInfo?.username : '';
+
+    const roles = modifyRolesData(data?.userInfo?.permissions);
+
+    return {
+      username,
+      rbacFlag: !!data?.rbacEnabled,
+      roles,
+    };
+  }, [data]);
+
+  return (
+    <UserInfoRolesAccessContext.Provider value={contextValue}>
+      {children}
+    </UserInfoRolesAccessContext.Provider>
+  );
+};
diff --git a/kafka-ui-react-app/src/lib/__test__/permission.spec.ts b/kafka-ui-react-app/src/lib/__test__/permission.spec.ts
new file mode 100644
index 00000000000..144370a0f00
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/__test__/permission.spec.ts
@@ -0,0 +1,604 @@
+import {
+  isPermitted,
+  isPermittedToCreate,
+  modifyRolesData,
+} from 'lib/permissions';
+import { Action, ResourceType } from 'generated-sources';
+
+describe('Permission Helpers', () => {
+  const clusterName1 = 'local';
+  const clusterName2 = 'dev';
+
+  const userPermissionsMock = [
+    {
+      clusters: [clusterName1],
+      resource: ResourceType.TOPIC,
+      actions: [Action.VIEW, Action.CREATE],
+    },
+    {
+      clusters: [clusterName1],
+      resource: ResourceType.KSQL,
+      actions: [Action.EXECUTE],
+    },
+    {
+      clusters: [clusterName1, clusterName2],
+      resource: ResourceType.SCHEMA,
+      actions: [Action.VIEW],
+    },
+    {
+      clusters: [clusterName1, clusterName2],
+      resource: ResourceType.CONNECT,
+      actions: [Action.VIEW],
+    },
+    {
+      clusters: [clusterName1],
+      resource: ResourceType.CLUSTERCONFIG,
+      actions: [Action.EDIT],
+    },
+    {
+      clusters: [clusterName1],
+      resource: ResourceType.CONSUMER,
+      actions: [Action.DELETE],
+    },
+    {
+      clusters: [clusterName1],
+      resource: ResourceType.SCHEMA,
+      actions: [Action.EDIT, Action.DELETE, Action.CREATE],
+      value: '123.*',
+    },
+    {
+      clusters: [clusterName1, clusterName2],
+      resource: ResourceType.TOPIC,
+      value: 'test.*',
+      actions: [Action.MESSAGES_DELETE],
+    },
+    {
+      clusters: [clusterName1, clusterName2],
+      resource: ResourceType.TOPIC,
+      value: '.*',
+      actions: [Action.EDIT, Action.DELETE],
+    },
+  ];
+
+  const roles = modifyRolesData(userPermissionsMock);
+
+  describe('modifyRoles', () => {
+    it('should check if it transforms the data in a correct format to normal keys', () => {
+      const result = modifyRolesData(userPermissionsMock);
+      expect(result.keys()).toContain(clusterName1);
+      expect(result.keys()).toContain(clusterName2);
+
+      const cluster1Map = result.get(clusterName1);
+      const cluster2Map = result.get(clusterName2);
+
+      expect(cluster1Map).toBeDefined();
+      expect(cluster2Map).toBeDefined();
+
+      // first cluster
+      expect(cluster1Map?.has(ResourceType.CLUSTERCONFIG)).toBeTruthy();
+      expect(cluster1Map?.has(ResourceType.CLUSTERCONFIG)).toBeTruthy();
+      expect(cluster1Map?.has(ResourceType.CONSUMER)).toBeTruthy();
+      expect(cluster1Map?.has(ResourceType.CONNECT)).toBeTruthy();
+      expect(cluster1Map?.has(ResourceType.KSQL)).toBeTruthy();
+      expect(cluster1Map?.has(ResourceType.TOPIC)).toBeTruthy();
+
+      // second cluster
+      expect(cluster2Map?.has(ResourceType.SCHEMA)).toBeTruthy();
+      expect(cluster2Map?.has(ResourceType.CONNECT)).toBeTruthy();
+      expect(cluster2Map?.has(ResourceType.TOPIC)).toBeTruthy();
+      expect(cluster2Map?.has(ResourceType.CLUSTERCONFIG)).toBeFalsy();
+
+      expect(cluster2Map?.has(ResourceType.CONSUMER)).toBeFalsy();
+      expect(cluster2Map?.has(ResourceType.KSQL)).toBeFalsy();
+    });
+
+    it('should check if it transforms the data length in keys are correct', () => {
+      const result = modifyRolesData(userPermissionsMock);
+
+      const cluster1Map = result.get(clusterName1);
+      const cluster2Map = result.get(clusterName2);
+
+      expect(result.size).toBe(2);
+
+      expect(cluster1Map?.size).toBe(6);
+      expect(cluster2Map?.size).toBe(3);
+
+      // clusterMap1
+      expect(cluster1Map?.get(ResourceType.TOPIC)).toHaveLength(3);
+      expect(cluster1Map?.get(ResourceType.SCHEMA)).toHaveLength(2);
+      expect(cluster1Map?.get(ResourceType.CONSUMER)).toHaveLength(1);
+      expect(cluster1Map?.get(ResourceType.CLUSTERCONFIG)).toHaveLength(1);
+      expect(cluster1Map?.get(ResourceType.CONNECT)).toHaveLength(1);
+      expect(cluster1Map?.get(ResourceType.CLUSTERCONFIG)).toHaveLength(1);
+
+      // clusterMap2
+      expect(cluster2Map?.get(ResourceType.SCHEMA)).toHaveLength(1);
+    });
+  });
+
+  describe('isPermitted', () => {
+    it('should check if the isPermitted returns the correct when there is no roles or clusters', () => {
+      expect(
+        isPermitted({
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          clusterName: 'unFoundCluster',
+          resource: ResourceType.TOPIC,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: 'unFoundCluster',
+          resource: ResourceType.TOPIC,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: '',
+          resource: ResourceType.TOPIC,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          roles: new Map(),
+          clusterName: 'unFoundCluster',
+          resource: ResourceType.TOPIC,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          roles: new Map(),
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+    });
+
+    it('should check if the isPermitted returns the correct value without name values', () => {
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.TOPIC,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.CLUSTERCONFIG,
+          action: Action.EDIT,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.KSQL,
+          action: Action.EXECUTE,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.KSQL,
+          action: Action.EXECUTE,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.SCHEMA,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.CONNECT,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.CONNECT,
+          action: Action.VIEW,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+    });
+
+    it('should check if the isPermitted returns the correct value with name values', () => {
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: Action.EDIT,
+          value: '123456',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: Action.EDIT,
+          value: '123',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: Action.EDIT,
+          value: 'some_wrong_value',
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.TOPIC,
+          action: Action.MESSAGES_DELETE,
+          value: 'test_something',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
+          action: Action.MESSAGES_DELETE,
+          value: 'test_something',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.TOPIC,
+          action: Action.EDIT,
+          value: 'any_text',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.TOPIC,
+          action: Action.EDIT,
+          value: 'any_text',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
+          action: Action.DELETE,
+          value: 'some_other',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.TOPIC,
+          action: Action.DELETE,
+          value: 'some_other',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+    });
+
+    it('should test the algorithmic worse case when the input is multiple actions', () => {
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.EDIT, Action.DELETE],
+          value: '123456',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.EDIT],
+          value: '123456',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.EDIT],
+          value: '123456',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.DELETE],
+          value: '123456',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.DELETE, Action.EDIT],
+          value: '123456',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.EDIT, Action.VIEW],
+          value: '123456',
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.EDIT, Action.VIEW],
+          value: 'notFound',
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [],
+          value: '123456',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+    });
+
+    it('should check the rbac flag and works with permissions accordingly', () => {
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [],
+          value: '123456',
+          rbacFlag: false,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.EDIT, Action.VIEW],
+          value: '123456',
+          rbacFlag: false,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.EDIT, Action.VIEW],
+          value: 'notFound',
+          rbacFlag: false,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles: new Map(),
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          action: [Action.EDIT, Action.VIEW],
+          value: 'notFound',
+          rbacFlag: false,
+        })
+      ).toBeTruthy();
+    });
+  });
+
+  describe('isPermittedToCreate', () => {
+    it('should check if the isPermitted returns the correct when there is no roles or clusters', () => {
+      expect(
+        isPermittedToCreate({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermittedToCreate({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.TOPIC,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermittedToCreate({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
+          rbacFlag: false,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermittedToCreate({
+          roles,
+          clusterName: clusterName2,
+          resource: ResourceType.TOPIC,
+          rbacFlag: false,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermittedToCreate({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.SCHEMA,
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
+
+      expect(
+        isPermittedToCreate({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.CONNECT,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermittedToCreate({
+          roles: new Map(),
+          clusterName: 'unFoundCluster',
+          resource: ResourceType.TOPIC,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermittedToCreate({
+          roles,
+          clusterName: 'unFoundCluster',
+          resource: ResourceType.TOPIC,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+
+      expect(
+        isPermittedToCreate({
+          roles: new Map(),
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
+          rbacFlag: true,
+        })
+      ).toBeFalsy();
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/api.ts b/kafka-ui-react-app/src/lib/api.ts
index 5f967a249d9..fea556e6433 100644
--- a/kafka-ui-react-app/src/lib/api.ts
+++ b/kafka-ui-react-app/src/lib/api.ts
@@ -9,6 +9,7 @@ import {
   KafkaConnectApi,
   ConsumerGroupsApi,
   TimeStampFormatApi,
+  AuthorizationApi,
 } from 'generated-sources';
 import { BASE_PARAMS } from 'lib/constants';
 
@@ -23,3 +24,4 @@ export const messagesApiClient = new MessagesApi(apiClientConf);
 export const clustersApiClient = new ClustersApi(apiClientConf);
 export const kafkaConnectApiClient = new KafkaConnectApi(apiClientConf);
 export const consumerGroupsApiClient = new ConsumerGroupsApi(apiClientConf);
+export const AuthorizationApiClient = new AuthorizationApi(apiClientConf);
diff --git a/kafka-ui-react-app/src/lib/errorHandling.tsx b/kafka-ui-react-app/src/lib/errorHandling.tsx
index a3033b87a06..f07f4cf52ac 100644
--- a/kafka-ui-react-app/src/lib/errorHandling.tsx
+++ b/kafka-ui-react-app/src/lib/errorHandling.tsx
@@ -50,7 +50,7 @@ export const showAlert = (
   );
 };
 
-export const showSuccessAlert = async (options: AlertOptions) => {
+export const showSuccessAlert = (options: AlertOptions) => {
   showAlert('success', {
     ...options,
     title: options.title || 'Success',
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/fixtures.ts b/kafka-ui-react-app/src/lib/hooks/__tests__/fixtures.ts
new file mode 100644
index 00000000000..435e0286f5c
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/fixtures.ts
@@ -0,0 +1,33 @@
+import { Action, ResourceType } from 'generated-sources';
+import { modifyRolesData } from 'lib/permissions';
+
+export const clusterName1 = 'local';
+export const clusterName2 = 'dev';
+
+export const userPermissionsMock = [
+  {
+    clusters: [clusterName1],
+    resource: ResourceType.TOPIC,
+    actions: [Action.CREATE],
+  },
+  {
+    clusters: [clusterName1],
+    resource: ResourceType.SCHEMA,
+    actions: [Action.EDIT, Action.DELETE],
+    value: '123.*',
+  },
+  {
+    clusters: [clusterName1, clusterName2],
+    resource: ResourceType.TOPIC,
+    value: 'test.*',
+    actions: [Action.MESSAGES_DELETE],
+  },
+  {
+    clusters: [clusterName1, clusterName2],
+    resource: ResourceType.TOPIC,
+    value: '.*',
+    actions: [Action.EDIT, Action.DELETE],
+  },
+];
+
+export const modifiedData = modifyRolesData(userPermissionsMock);
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/useCreatePermission.spec.tsx b/kafka-ui-react-app/src/lib/hooks/__tests__/useCreatePermission.spec.tsx
new file mode 100644
index 00000000000..56161a0c697
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/useCreatePermission.spec.tsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import { useParams } from 'react-router-dom';
+import { renderHook } from '@testing-library/react';
+import { isPermittedToCreate } from 'lib/permissions';
+import { Action, ResourceType } from 'generated-sources';
+import {
+  UserInfoRolesAccessContext,
+  UserInfoType,
+} from 'components/contexts/UserInfoRolesAccessContext';
+import { useCreatePermission } from 'lib/hooks/useCreatePermisson';
+
+import { modifiedData, clusterName1, clusterName2 } from './fixtures';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: jest.fn(),
+}));
+
+describe('useCreatePermission', () => {
+  const customRenderer = ({
+    resource,
+    userInfo,
+  }: {
+    resource: ResourceType;
+    userInfo: UserInfoType;
+  }) =>
+    renderHook(() => useCreatePermission(resource), {
+      wrapper: ({ children }) => (
+        // eslint-disable-next-line react/react-in-jsx-scope
+
+        // issue in initialProps of wrapper
+        <UserInfoRolesAccessContext.Provider value={userInfo}>
+          {children}
+        </UserInfoRolesAccessContext.Provider>
+      ),
+    });
+
+  it('should check if the hook renders the same value as the isPermittedToCreate Headless logic method', () => {
+    const permissionConfig = {
+      resource: ResourceType.TOPIC,
+      userInfo: {
+        roles: modifiedData,
+        rbacFlag: true,
+        username: '',
+      },
+    };
+
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName: clusterName1,
+    }));
+
+    const { result } = customRenderer(permissionConfig);
+
+    expect(result.current).toEqual(
+      isPermittedToCreate({
+        ...permissionConfig,
+        roles: modifiedData,
+        clusterName: clusterName1,
+        rbacFlag: true,
+      })
+    );
+  });
+
+  it('should check if the hook renders the same value as the isPermittedToCreate Headless logic method for Schema', () => {
+    const permissionConfig = {
+      resource: ResourceType.SCHEMA,
+      action: Action.CREATE,
+      userInfo: {
+        roles: modifiedData,
+        rbacFlag: false,
+        username: '',
+      },
+    };
+
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName: clusterName1,
+    }));
+
+    const { result } = customRenderer(permissionConfig);
+
+    expect(result.current).toEqual(
+      isPermittedToCreate({
+        ...permissionConfig,
+        roles: modifiedData,
+        clusterName: clusterName1,
+        rbacFlag: false,
+      })
+    );
+  });
+
+  it('should check if the hook renders the same value as the isPermittedToCreate Headless logic method for another Cluster', () => {
+    const permissionConfig = {
+      resource: ResourceType.SCHEMA,
+      action: Action.CREATE,
+      userInfo: {
+        roles: modifiedData,
+        rbacFlag: true,
+        username: '',
+      },
+    };
+
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName: clusterName2,
+    }));
+
+    const { result } = customRenderer(permissionConfig);
+
+    expect(result.current).toEqual(
+      isPermittedToCreate({
+        ...permissionConfig,
+        roles: modifiedData,
+        clusterName: clusterName2,
+        rbacFlag: true,
+      })
+    );
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/usePermission.spec.tsx b/kafka-ui-react-app/src/lib/hooks/__tests__/usePermission.spec.tsx
new file mode 100644
index 00000000000..94b0572e117
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/usePermission.spec.tsx
@@ -0,0 +1,122 @@
+import React from 'react';
+import { useParams } from 'react-router-dom';
+import { renderHook } from '@testing-library/react';
+import { usePermission } from 'lib/hooks/usePermission';
+import { isPermitted } from 'lib/permissions';
+import { Action, ResourceType } from 'generated-sources';
+import {
+  UserInfoRolesAccessContext,
+  UserInfoType,
+} from 'components/contexts/UserInfoRolesAccessContext';
+
+import { clusterName1, modifiedData, clusterName2 } from './fixtures';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: jest.fn(),
+}));
+
+describe('usePermission', () => {
+  const customRenderer = ({
+    resource,
+    action,
+    value,
+    userInfo,
+  }: {
+    resource: ResourceType;
+    action: Action;
+    value?: string;
+    userInfo: UserInfoType;
+  }) =>
+    renderHook(() => usePermission(resource, action, value), {
+      wrapper: ({ children }) => (
+        // eslint-disable-next-line react/react-in-jsx-scope
+
+        // issue in initialProps of wrapper
+        <UserInfoRolesAccessContext.Provider value={userInfo}>
+          {children}
+        </UserInfoRolesAccessContext.Provider>
+      ),
+    });
+
+  it('should check if the hook renders the same value as the isPermitted Headless logic method', () => {
+    const permissionConfig = {
+      resource: ResourceType.TOPIC,
+      action: Action.CREATE,
+      userInfo: {
+        roles: modifiedData,
+        rbacFlag: true,
+        username: '',
+      },
+    };
+
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName: clusterName1,
+    }));
+
+    const { result } = customRenderer(permissionConfig);
+
+    expect(result.current).toEqual(
+      isPermitted({
+        ...permissionConfig,
+        roles: modifiedData,
+        clusterName: clusterName1,
+        rbacFlag: true,
+      })
+    );
+  });
+
+  it('should check if the hook renders the same value as the isPermitted Headless logic method for Schema', () => {
+    const permissionConfig = {
+      resource: ResourceType.SCHEMA,
+      action: Action.CREATE,
+      userInfo: {
+        roles: modifiedData,
+        rbacFlag: true,
+        username: '',
+      },
+    };
+
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName: clusterName1,
+    }));
+
+    const { result } = customRenderer(permissionConfig);
+
+    expect(result.current).toEqual(
+      isPermitted({
+        ...permissionConfig,
+        roles: modifiedData,
+        clusterName: clusterName1,
+        rbacFlag: true,
+      })
+    );
+  });
+
+  it('should check if the hook renders the same value as the isPermitted Headless logic method for another Cluster', () => {
+    const permissionConfig = {
+      resource: ResourceType.SCHEMA,
+      action: Action.CREATE,
+      userInfo: {
+        roles: modifiedData,
+        rbacFlag: true,
+        username: '',
+      },
+    };
+
+    (useParams as jest.Mock).mockImplementation(() => ({
+      clusterName: clusterName2,
+    }));
+
+    const { result } = customRenderer(permissionConfig);
+
+    expect(result.current).toEqual(
+      isPermitted({
+        ...permissionConfig,
+        roles: modifiedData,
+        clusterName: clusterName2,
+        rbacFlag: true,
+      })
+    );
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
index 94f1ffb919d..dd340306535 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
@@ -109,7 +109,7 @@ export function useUpdateConnectorConfig(props: UseConnectorProps) {
     }
   );
 }
-export function useCreateConnector(clusterName: ClusterName) {
+export function useCreateConnectorMutation(clusterName: ClusterName) {
   const client = useQueryClient();
   return useMutation(
     (props: CreateConnectorProps) =>
@@ -119,6 +119,19 @@ export function useCreateConnector(clusterName: ClusterName) {
     }
   );
 }
+
+// this will change later when we validate the request before
+export function useCreateConnector(clusterName: ClusterName) {
+  const mutate = useCreateConnectorMutation(clusterName);
+
+  return {
+    createResource: async (param: CreateConnectorProps) => {
+      return mutate.mutateAsync(param);
+    },
+    ...mutate,
+  };
+}
+
 export function useDeleteConnector(props: UseConnectorProps) {
   const client = useQueryClient();
 
diff --git a/kafka-ui-react-app/src/lib/hooks/api/roles.ts b/kafka-ui-react-app/src/lib/hooks/api/roles.ts
new file mode 100644
index 00000000000..d91d9c76209
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/roles.ts
@@ -0,0 +1,11 @@
+import { useQuery } from '@tanstack/react-query';
+import { AuthorizationApiClient } from 'lib/api';
+import { QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
+
+export function useGetUserInfo() {
+  return useQuery(
+    ['userInfo'],
+    () => AuthorizationApiClient.getUserAuthInfo(),
+    QUERY_REFETCH_OFF_OPTIONS
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
index ced27faceea..9af0b63d620 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topics.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -111,7 +111,7 @@ const formatTopicCreation = (form: TopicFormData): TopicCreation => {
     : topicsvalue;
 };
 
-export function useCreateTopic(clusterName: ClusterName) {
+export function useCreateTopicMutation(clusterName: ClusterName) {
   const client = useQueryClient();
   return useMutation(
     (data: TopicFormData) =>
@@ -130,6 +130,18 @@ export function useCreateTopic(clusterName: ClusterName) {
   );
 }
 
+// this will change later when we validate the request before
+export function useCreateTopic(clusterName: ClusterName) {
+  const mutate = useCreateTopicMutation(clusterName);
+
+  return {
+    createResource: async (param: TopicFormData) => {
+      return mutate.mutateAsync(param);
+    },
+    ...mutate,
+  };
+}
+
 const formatTopicUpdate = (form: TopicFormDataRaw): TopicUpdate => {
   const {
     cleanupPolicy,
diff --git a/kafka-ui-react-app/src/lib/hooks/useActionTooltip.ts b/kafka-ui-react-app/src/lib/hooks/useActionTooltip.ts
new file mode 100644
index 00000000000..f8f84988989
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useActionTooltip.ts
@@ -0,0 +1,36 @@
+import { useState } from 'react';
+import {
+  autoPlacement,
+  offset,
+  Placement,
+  useFloating,
+  useHover,
+  useInteractions,
+} from '@floating-ui/react-dom-interactions';
+
+export function useActionTooltip(isDisabled?: boolean, placement?: Placement) {
+  const [open, setOpen] = useState(false);
+
+  const setTooltipOpen = (state: boolean) => {
+    if (!isDisabled) return;
+    setOpen(state);
+  };
+
+  const { x, y, reference, floating, strategy, context } = useFloating({
+    open,
+    onOpenChange: setTooltipOpen,
+    placement,
+    middleware: [offset(10), autoPlacement()],
+  });
+
+  useInteractions([useHover(context)]);
+
+  return {
+    x,
+    y,
+    reference,
+    floating,
+    strategy,
+    open,
+  };
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/useCreatePermisson.ts b/kafka-ui-react-app/src/lib/hooks/useCreatePermisson.ts
new file mode 100644
index 00000000000..79777aa8cbe
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useCreatePermisson.ts
@@ -0,0 +1,14 @@
+import { useContext } from 'react';
+import { ResourceType } from 'generated-sources';
+import { UserInfoRolesAccessContext } from 'components/contexts/UserInfoRolesAccessContext';
+import { ClusterNameRoute } from 'lib/paths';
+import { isPermittedToCreate } from 'lib/permissions';
+
+import useAppParams from './useAppParams';
+
+export function useCreatePermission(resource: ResourceType): boolean {
+  const { clusterName } = useAppParams<ClusterNameRoute>();
+  const { roles, rbacFlag } = useContext(UserInfoRolesAccessContext);
+
+  return isPermittedToCreate({ roles, resource, clusterName, rbacFlag });
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/usePermission.ts b/kafka-ui-react-app/src/lib/hooks/usePermission.ts
new file mode 100644
index 00000000000..269d36caa6a
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/usePermission.ts
@@ -0,0 +1,17 @@
+import { useContext } from 'react';
+import { Action, ResourceType } from 'generated-sources';
+import { UserInfoRolesAccessContext } from 'components/contexts/UserInfoRolesAccessContext';
+import { ClusterNameRoute } from 'lib/paths';
+import { isPermitted } from 'lib/permissions';
+import useAppParams from 'lib/hooks/useAppParams';
+
+export function usePermission(
+  resource: ResourceType,
+  action: Action | Array<Action>,
+  value?: string
+): boolean {
+  const { clusterName } = useAppParams<ClusterNameRoute>();
+  const { roles, rbacFlag } = useContext(UserInfoRolesAccessContext);
+
+  return isPermitted({ roles, resource, action, clusterName, value, rbacFlag });
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/useUserInfo.ts b/kafka-ui-react-app/src/lib/hooks/useUserInfo.ts
new file mode 100644
index 00000000000..6ae28f93ace
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/useUserInfo.ts
@@ -0,0 +1,6 @@
+import { useContext } from 'react';
+import { UserInfoRolesAccessContext } from 'components/contexts/UserInfoRolesAccessContext';
+
+export function useUserInfo() {
+  return useContext(UserInfoRolesAccessContext);
+}
diff --git a/kafka-ui-react-app/src/lib/permissions.ts b/kafka-ui-react-app/src/lib/permissions.ts
new file mode 100644
index 00000000000..20b8d4a115f
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/permissions.ts
@@ -0,0 +1,151 @@
+import { Action, UserPermission, ResourceType } from 'generated-sources';
+
+export type RolesType = UserPermission[];
+
+export type RolesModifiedTypes = Map<string, Map<ResourceType, RolesType>>;
+
+export function modifyRolesData(
+  data?: RolesType
+): Map<string, Map<ResourceType, RolesType>> {
+  const map = new Map<string, Map<ResourceType, RolesType>>();
+
+  data?.forEach((item) => {
+    item.clusters.forEach((name) => {
+      const cluster = map.get(name);
+      if (cluster) {
+        const { resource } = item;
+
+        const resourceItem = cluster.get(resource);
+        if (resourceItem) {
+          cluster.set(resource, resourceItem.concat(item));
+          return;
+        }
+        cluster.set(resource, [item]);
+        return;
+      }
+
+      map.set(name, new Map().set(item.resource, [item]));
+    });
+  });
+  return map;
+}
+
+interface IsPermittedConfig {
+  roles?: RolesModifiedTypes;
+  resource: ResourceType;
+  action: Action | Array<Action>;
+  clusterName: string;
+  value?: string;
+  rbacFlag: boolean;
+}
+
+/**
+ * @description it the logic behind depending on the roles whether a certain action
+ * is permitted or not the philosophy is inspired from Headless UI libraries where
+ * you separate the logic from the renderer besides the Creation process which is handled by isPermittedToCreate
+ *
+ * Algorithm: we Mapped the cluster name and the resource name , because all the actions in them are
+ * constant and limited and hence faster lookup approach
+ *
+ * @example you can use this in the hook format where it used in , or if you want to calculate it dynamically
+ * you can call this dynamically in your component but the render is on you from that point on
+ *
+ * Don't use this anywhere , use the hook version in the component for declarative purposes
+ *
+ * Array action approach bear in mind they should be from the same resource with the same name restrictions, then the logic it
+ * will try to find every element from the given array inside the permissions data
+ *
+ * DON'T use the array approach until it is necessary to do so
+ *
+ * */
+export function isPermitted({
+  roles,
+  resource,
+  action,
+  clusterName,
+  value,
+  rbacFlag,
+}: {
+  roles?: RolesModifiedTypes;
+  resource: ResourceType;
+  action: Action | Array<Action>;
+  clusterName: string;
+  value?: string;
+  rbacFlag: boolean;
+}) {
+  if (!rbacFlag) return true;
+
+  // short circuit
+  if (!roles || roles.size === 0) return false;
+
+  // short circuit
+  const clusterMap = roles.get(clusterName);
+  if (!clusterMap) return false;
+
+  // short circuit
+  const resourceData = clusterMap.get(resource);
+  if (!resourceData) return false;
+
+  return (
+    resourceData.findIndex((item) => {
+      let valueCheck = true;
+      if (item.value) {
+        valueCheck = false;
+
+        if (value) valueCheck = new RegExp(item.value).test(value);
+      }
+
+      // short circuit
+      if (!valueCheck) return false;
+
+      if (!Array.isArray(action)) {
+        return item.actions.includes(action);
+      }
+
+      // every given action should be found in that resource
+      return action.every(
+        (currentAction) =>
+          item.actions.findIndex((element) => element === currentAction) !== -1
+      );
+    }) !== -1
+  );
+}
+
+/**
+ * @description it the logic behind depending on create roles, since create has extra custom permission logic that is why
+ * it is seperated from the others
+ *
+ * Algorithm: we Mapped the cluster name and the resource name , because all the actions in them are
+ * constant and limited and hence faster lookup approach
+ *
+ * @example you can use this in the hook format where it used in , or if you want to calculate it dynamically
+ * you can call this dynamically in your component but the render is on you from that point on
+ *
+ * Don't use this anywhere , use the hook version in the component for declarative purposes
+ *
+ * */
+export function isPermittedToCreate({
+  roles,
+  resource,
+  clusterName,
+  rbacFlag,
+}: Omit<IsPermittedConfig, 'value' | 'action'>) {
+  if (!rbacFlag) return true;
+
+  // short circuit
+  if (!roles || roles.size === 0) return false;
+
+  // short circuit
+  const clusterMap = roles.get(clusterName);
+  if (!clusterMap) return false;
+
+  // short circuit
+  const resourceData = clusterMap.get(resource);
+  if (!resourceData) return false;
+
+  const action = Action.CREATE;
+
+  return resourceData.some((item) => {
+    return item.actions.includes(action);
+  });
+}
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index f3b660738f2..8186bb7a908 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -1,4 +1,4 @@
-import React, { PropsWithChildren, ReactElement } from 'react';
+import React, { PropsWithChildren, ReactElement, useMemo } from 'react';
 import {
   MemoryRouter,
   MemoryRouterProps,
@@ -30,11 +30,18 @@ import {
   defaultGlobalSettingsValue,
   GlobalSettingsContext,
 } from 'components/contexts/GlobalSettingsContext';
+import { UserInfoRolesAccessContext } from 'components/contexts/UserInfoRolesAccessContext';
+
+import { RolesType, modifyRolesData } from './permissions';
 
 interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
   preloadedState?: Partial<RootState>;
   store?: Store<Partial<RootState>, AnyAction>;
   initialEntries?: MemoryRouterProps['initialEntries'];
+  userInfo?: {
+    roles?: RolesType;
+    rbacFlag: boolean;
+  };
 }
 
 interface WithRouteProps {
@@ -71,6 +78,32 @@ export const TestQueryClientProvider: React.FC<PropsWithChildren<unknown>> = ({
   );
 };
 
+/**
+ * @description it will create a UserInfo Provider that will actually
+ * disable the rbacFlag , to user if you can pass it as an argument
+ * */
+export const TestUserInfoProvider: React.FC<
+  PropsWithChildren<{ data?: { roles?: RolesType; rbacFlag: boolean } }>
+> = ({ children, data }) => {
+  const contextValue = useMemo(() => {
+    const roles = modifyRolesData(data?.roles);
+
+    return {
+      username: 'test',
+      rbacFlag: !!(typeof data?.rbacFlag === 'undefined'
+        ? false
+        : data?.rbacFlag),
+      roles,
+    };
+  }, [data]);
+
+  return (
+    <UserInfoRolesAccessContext.Provider value={contextValue}>
+      {children}
+    </UserInfoRolesAccessContext.Provider>
+  );
+};
+
 const customRender = (
   ui: ReactElement,
   {
@@ -80,6 +113,7 @@ const customRender = (
       preloadedState,
     }),
     initialEntries,
+    userInfo,
     ...renderOptions
   }: CustomRenderOptions = {}
 ) => {
@@ -90,16 +124,18 @@ const customRender = (
     <TestQueryClientProvider>
       <GlobalSettingsContext.Provider value={defaultGlobalSettingsValue}>
         <ThemeProvider theme={theme}>
-          <ConfirmContextProvider>
-            <Provider store={store}>
-              <MemoryRouter initialEntries={initialEntries}>
-                <div>
-                  {children}
-                  <ConfirmationModal />
-                </div>
-              </MemoryRouter>
-            </Provider>
-          </ConfirmContextProvider>
+          <TestUserInfoProvider data={userInfo}>
+            <ConfirmContextProvider>
+              <Provider store={store}>
+                <MemoryRouter initialEntries={initialEntries}>
+                  <div>
+                    {children}
+                    <ConfirmationModal />
+                  </div>
+                </MemoryRouter>
+              </Provider>
+            </ConfirmContextProvider>
+          </TestUserInfoProvider>
         </ThemeProvider>
       </GlobalSettingsContext.Provider>
     </TestQueryClientProvider>
diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index 9faaf65f446..dfe60648ac7 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -40,9 +40,27 @@ const isJsonObject = () => {
   );
 };
 
-yup.addMethod(yup.string, 'isJsonObject', isJsonObject);
+/**
+ * due to yup rerunning all the object validiation during any render, it makes sense to cache the async results
+ * */
+export function cacheTest(
+  asyncValidate: (val?: string, ctx?: AnyObject) => Promise<boolean>
+) {
+  let valid = false;
+  let closureValue = '';
 
-export default yup;
+  return async (value?: string, ctx?: AnyObject) => {
+    if (value !== closureValue) {
+      const response = await asyncValidate(value, ctx);
+      closureValue = value || '';
+      valid = response;
+      return response;
+    }
+    return valid;
+  };
+}
+
+yup.addMethod(yup.string, 'isJsonObject', isJsonObject);
 
 export const topicFormValidationSchema = yup.object().shape({
   name: yup
@@ -72,3 +90,5 @@ export const topicFormValidationSchema = yup.object().shape({
     })
   ),
 });
+
+export default yup;
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 33c8b2959c8..d642bf3b94d 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -362,6 +362,7 @@ const theme = {
       normal: Colors.neutral[50],
       hover: Colors.neutral[90],
       active: Colors.neutral[90],
+      disabled: Colors.neutral[30],
     },
     borderColor: {
       normal: 'transparent',
diff --git a/pom.xml b/pom.xml
index df8ff040793..9abb41a865d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,8 +29,8 @@
         <confluent.version>7.3.0</confluent.version>
         <datasketches-java.version>3.1.0</datasketches-java.version>
         <groovy.version>3.0.13</groovy.version>
-        <jackson-databind-nullable.version>0.2.4</jackson-databind-nullable.version>
         <jackson.version>2.14.0</jackson.version>
+        <jackson-databind-nullable.version>0.2.4</jackson-databind-nullable.version>
         <kafka-clients.version>3.3.1</kafka-clients.version>
         <netty.version>4.1.85.Final</netty.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>

From c099fc13cdfdb72f3f4e77f9dc34cea62c62b8bd Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 23 Dec 2022 13:14:16 +0400
Subject: [PATCH 331/734] Update readme

add datamasking and rbac links
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c54e0cb3c19..a0ca023bc04 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,8 @@ the cloud.
 * **Dynamic Topic Configuration** — create and configure new topics with dynamic configuration
 * **Configurable Authentification** — secure your installation with optional Github/Gitlab/Google OAuth 2.0
 * **Custom serialization/deserialization plugins** - use a ready-to-go serde for your data like AWS Glue or Smile, or code your own!
-* **Role based access control** - manage permissions to access the UI with granular precision
+* **Role based access control** - [manage permissions](https://github.com/provectus/kafka-ui/wiki/RBAC-(role-based-access-control)) to access the UI with granular precision
+* **Data masking** - [obfuscate](https://github.com/provectus/kafka-ui/blob/master/documentation/guides/DataMasking.md) sensitive data in topic messages
 
 # The Interface
 UI for Apache Kafka wraps major functions of Apache Kafka with an intuitive user interface.

From a0a464d455a7ee6fa02965206b00754fa1e89e49 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Fri, 23 Dec 2022 15:46:03 +0400
Subject: [PATCH 332/734] [FE] Fix cleanup policy submit/display (#3067)

* TopicForm CleanupPolicy default value clash in the edit page

* minor code import modification in topicsParamsTransformer

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Topic/Edit/topicParamsTransformer.ts      |  4 +
 .../Topics/shared/Form/TopicForm.tsx          | 75 ++++++++++---------
 2 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
index e60faf11ccb..910f31a5fd2 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/topicParamsTransformer.ts
@@ -4,6 +4,7 @@ import {
   TOPIC_CUSTOM_PARAMS_PREFIX,
 } from 'lib/constants';
 import { TOPIC_EDIT_FORM_DEFAULT_PROPS } from 'components/Topics/Topic/Edit/Edit';
+import { getCleanUpPolicyValue } from 'components/Topics/shared/Form/TopicForm';
 import { Topic, TopicConfig } from 'generated-sources';
 
 export const getValue = (
@@ -30,6 +31,9 @@ const topicParamsTransformer = (topic?: Topic, config?: TopicConfig[]) => {
     replicationFactor: topic.replicationFactor,
     partitions:
       topic.partitionCount || TOPIC_EDIT_FORM_DEFAULT_PROPS.partitions,
+    cleanupPolicy:
+      getCleanUpPolicyValue(topic.cleanUpPolicy) ||
+      TOPIC_EDIT_FORM_DEFAULT_PROPS.cleanupPolicy,
     maxMessageBytes: getValue(config, 'max.message.bytes', 1000012),
     minInSyncReplicas: getValue(config, 'min.insync.replicas', 1),
     retentionBytes: getValue(config, 'retention.bytes', -1),
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index a44aa266f77..15f60eaaac2 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -36,6 +36,17 @@ const CleanupPolicyOptions: Array<SelectOption> = [
   { value: 'compact,delete', label: 'Compact,Delete' },
 ];
 
+export const getCleanUpPolicyValue = (cleanUpPolicy?: string) => {
+  if (!cleanUpPolicy) return undefined;
+
+  return CleanupPolicyOptions.find((option: SelectOption) => {
+    return (
+      option.value.toString().replace(/,/g, '_') ===
+      cleanUpPolicy?.toLowerCase()
+    );
+  })?.value.toString();
+};
+
 const RetentionBytesOptions: Array<SelectOption> = [
   { value: NOT_SET, label: 'Not Set' },
   { value: BYTES_IN_GB, label: '1 GB' },
@@ -61,12 +72,7 @@ const TopicForm: React.FC<Props> = ({
   const navigate = useNavigate();
   const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
   const getCleanUpPolicy =
-    CleanupPolicyOptions.find((option: SelectOption) => {
-      return (
-        option.value.toString().replace(/,/g, '_') ===
-        cleanUpPolicy?.toLowerCase()
-      );
-    })?.value || CleanupPolicyOptions[0].value;
+    getCleanUpPolicyValue(cleanUpPolicy) || CleanupPolicyOptions[0].value;
 
   const getRetentionBytes =
     RetentionBytesOptions.find((option: SelectOption) => {
@@ -97,8 +103,8 @@ const TopicForm: React.FC<Props> = ({
             </S.NameField>
           </S.Column>
 
-          {!isEditing && (
-            <S.Column>
+          <S.Column>
+            {!isEditing && (
               <div>
                 <InputLabel htmlFor="topicFormNumberOfPartitions">
                   Number of partitions *
@@ -114,32 +120,33 @@ const TopicForm: React.FC<Props> = ({
                   <ErrorMessage errors={errors} name="partitions" />
                 </FormError>
               </div>
-              <div>
-                <InputLabel
-                  id="topicFormCleanupPolicyLabel"
-                  htmlFor="topicFormCleanupPolicy"
-                >
-                  Cleanup policy
-                </InputLabel>
-                <Controller
-                  defaultValue={CleanupPolicyOptions[0].value}
-                  control={control}
-                  name="cleanupPolicy"
-                  render={({ field: { name, onChange } }) => (
-                    <Select
-                      id="topicFormCleanupPolicy"
-                      aria-labelledby="topicFormCleanupPolicyLabel"
-                      name={name}
-                      value={getCleanUpPolicy}
-                      onChange={onChange}
-                      minWidth="250px"
-                      options={CleanupPolicyOptions}
-                    />
-                  )}
-                />
-              </div>
-            </S.Column>
-          )}
+            )}
+
+            <div>
+              <InputLabel
+                id="topicFormCleanupPolicyLabel"
+                htmlFor="topicFormCleanupPolicy"
+              >
+                Cleanup policy
+              </InputLabel>
+              <Controller
+                defaultValue={CleanupPolicyOptions[0].value}
+                control={control}
+                name="cleanupPolicy"
+                render={({ field: { name, onChange } }) => (
+                  <Select
+                    id="topicFormCleanupPolicy"
+                    aria-labelledby="topicFormCleanupPolicyLabel"
+                    name={name}
+                    value={getCleanUpPolicy}
+                    onChange={onChange}
+                    minWidth="250px"
+                    options={CleanupPolicyOptions}
+                  />
+                )}
+              />
+            </div>
+          </S.Column>
         </fieldset>
 
         <S.Column>

From 33784e3e837a9f64dc4a39f4147e1c11e54f9401 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Fri, 23 Dec 2022 15:47:40 +0400
Subject: [PATCH 333/734] Get back messages pagination (#2862)

* initial messages pagination , modification in v2

add minor test in messages table component

Add Messages pagination

add next feature in the Advanced Filters

Messages Table add Back button navigation

remove un-necessary code from the messages table

minor code refactors to remove unnecessary codes

page parameter fix in the query of the advanced Filters

minor change in the test file to keep uniformity of the project

set default table limit for first request messages v1

* pagination fix the initial disable
---
 .../Topics/Topic/Messages/Filters/Filters.tsx |   4 +
 .../Topics/Topic/Messages/Messages.tsx        |   4 +
 .../Topics/Topic/Messages/MessagesTable.tsx   | 174 ++++++++++++------
 .../Messages/__test__/MessagesTable.spec.tsx  |   5 +-
 4 files changed, 124 insertions(+), 63 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 0e3d3d46614..096a714c4ee 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -93,6 +93,8 @@ const Filters: React.FC<FiltersProps> = ({
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
 
+  const page = searchParams.get('page');
+
   const { data: topic } = useTopicDetails({ clusterName, topicName });
 
   const partitions = topic?.partitions || [];
@@ -202,6 +204,7 @@ const Filters: React.FC<FiltersProps> = ({
       filterQueryType: queryType,
       attempt: nextAttempt,
       limit: PER_PAGE,
+      page: page || 0,
       seekDirection,
       keySerde: keySerde || (searchParams.get('keySerde') as string),
       valueSerde: valueSerde || (searchParams.get('valueSerde') as string),
@@ -392,6 +395,7 @@ const Filters: React.FC<FiltersProps> = ({
     timestamp,
     query,
     seekDirection,
+    page,
   ]);
 
   React.useEffect(() => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
index b71e4eb8fa2..35490c627e3 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Messages.tsx
@@ -6,6 +6,7 @@ import { useSerdes } from 'lib/hooks/api/topicMessages';
 import useAppParams from 'lib/hooks/useAppParams';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import { getDefaultSerdeName } from 'components/Topics/Topic/Messages/getDefaultSerdeName';
+import { MESSAGES_PER_PAGE } from 'lib/constants';
 
 import MessagesTable from './MessagesTable';
 import FiltersContainer from './Filters/FiltersContainer';
@@ -47,6 +48,9 @@ const Messages: React.FC = () => {
     if (!searchParams.get('valueSerde')) {
       searchParams.set('valueSerde', getDefaultSerdeName(serdes.value || []));
     }
+    if (!searchParams.get('limit')) {
+      searchParams.set('limit', MESSAGES_PER_PAGE);
+    }
     setSearchParams(searchParams);
   }, [serdes]);
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
index 3c5901214b0..96e9f40d73d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
@@ -9,6 +9,10 @@ import {
 } from 'redux/reducers/topicMessages/selectors';
 import TopicMessagesContext from 'components/contexts/TopicMessagesContext';
 import { useAppSelector } from 'lib/hooks/redux';
+import { Button } from 'components/common/Button/Button';
+import { useSearchParams } from 'react-router-dom';
+import { MESSAGES_PER_PAGE } from 'lib/constants';
+import * as S from 'components/common/NewTable/Table.styled';
 
 import PreviewModal from './PreviewModal';
 import Message, { PreviewFilter } from './Message';
@@ -19,75 +23,123 @@ const MessagesTable: React.FC = () => {
   const [keyFilters, setKeyFilters] = useState<PreviewFilter[]>([]);
   const [contentFilters, setContentFilters] = useState<PreviewFilter[]>([]);
 
+  const [searchParams, setSearchParams] = useSearchParams();
+  const page = searchParams.get('page');
   const { isLive } = useContext(TopicMessagesContext);
 
   const messages = useAppSelector(getTopicMessges);
   const isFetching = useAppSelector(getIsTopicMessagesFetching);
+
+  const isTailing = isLive && isFetching;
+
+  // Pagination is disabled in live mode, also we don't want to show the button
+  // if we are fetching the messages or if we are at the end of the topic
+  const isPaginationDisabled = isTailing || isFetching;
+
+  const isNextPageButtonDisabled =
+    isPaginationDisabled || messages.length < Number(MESSAGES_PER_PAGE);
+  const isPrevPageButtonDisabled =
+    isPaginationDisabled || !Number(searchParams.get('page'));
+
+  const handleNextPage = () => {
+    searchParams.set('page', String(Number(page || 0) + 1));
+    setSearchParams(searchParams);
+  };
+
+  const handlePrevPage = () => {
+    searchParams.set('page', String(Number(page || 0) - 1));
+    setSearchParams(searchParams);
+  };
+
   return (
-    <Table isFullwidth>
-      <thead>
-        <tr>
-          <TableHeaderCell> </TableHeaderCell>
-          <TableHeaderCell title="Offset" />
-          <TableHeaderCell title="Partition" />
-          <TableHeaderCell title="Timestamp" />
-          <TableHeaderCell
-            title="Key"
-            previewText={`Preview ${
-              keyFilters.length ? `(${keyFilters.length} selected)` : ''
-            }`}
-            onPreview={() => setPreviewFor('key')}
-          />
-          <TableHeaderCell
-            title="Value"
-            previewText={`Preview ${
-              contentFilters.length ? `(${contentFilters.length} selected)` : ''
-            }`}
-            onPreview={() => setPreviewFor('content')}
-          />
-          <TableHeaderCell> </TableHeaderCell>
+    <>
+      <Table isFullwidth>
+        <thead>
+          <tr>
+            <TableHeaderCell> </TableHeaderCell>
+            <TableHeaderCell title="Offset" />
+            <TableHeaderCell title="Partition" />
+            <TableHeaderCell title="Timestamp" />
+            <TableHeaderCell
+              title="Key"
+              previewText={`Preview ${
+                keyFilters.length ? `(${keyFilters.length} selected)` : ''
+              }`}
+              onPreview={() => setPreviewFor('key')}
+            />
+            <TableHeaderCell
+              title="Value"
+              previewText={`Preview ${
+                contentFilters.length
+                  ? `(${contentFilters.length} selected)`
+                  : ''
+              }`}
+              onPreview={() => setPreviewFor('content')}
+            />
+            <TableHeaderCell> </TableHeaderCell>
 
-          {previewFor !== null && (
-            <PreviewModal
-              values={previewFor === 'key' ? keyFilters : contentFilters}
-              toggleIsOpen={() => setPreviewFor(null)}
-              setFilters={(payload: PreviewFilter[]) =>
-                previewFor === 'key'
-                  ? setKeyFilters(payload)
-                  : setContentFilters(payload)
-              }
+            {previewFor !== null && (
+              <PreviewModal
+                values={previewFor === 'key' ? keyFilters : contentFilters}
+                toggleIsOpen={() => setPreviewFor(null)}
+                setFilters={(payload: PreviewFilter[]) =>
+                  previewFor === 'key'
+                    ? setKeyFilters(payload)
+                    : setContentFilters(payload)
+                }
+              />
+            )}
+          </tr>
+        </thead>
+        <tbody>
+          {messages.map((message: TopicMessage) => (
+            <Message
+              key={[
+                message.offset,
+                message.timestamp,
+                message.key,
+                message.partition,
+              ].join('-')}
+              message={message}
+              keyFilters={keyFilters}
+              contentFilters={contentFilters}
             />
+          ))}
+          {isFetching && isLive && !messages.length && (
+            <tr>
+              <td colSpan={10}>
+                <PageLoader />
+              </td>
+            </tr>
           )}
-        </tr>
-      </thead>
-      <tbody>
-        {messages.map((message: TopicMessage) => (
-          <Message
-            key={[
-              message.offset,
-              message.timestamp,
-              message.key,
-              message.partition,
-            ].join('-')}
-            message={message}
-            keyFilters={keyFilters}
-            contentFilters={contentFilters}
-          />
-        ))}
-        {isFetching && isLive && !messages.length && (
-          <tr>
-            <td colSpan={10}>
-              <PageLoader />
-            </td>
-          </tr>
-        )}
-        {messages.length === 0 && !isFetching && (
-          <tr>
-            <td colSpan={10}>No messages found</td>
-          </tr>
-        )}
-      </tbody>
-    </Table>
+          {messages.length === 0 && !isFetching && (
+            <tr>
+              <td colSpan={10}>No messages found</td>
+            </tr>
+          )}
+        </tbody>
+      </Table>
+      <S.Pagination>
+        <S.Pages>
+          <Button
+            buttonType="secondary"
+            buttonSize="L"
+            disabled={isPrevPageButtonDisabled}
+            onClick={handlePrevPage}
+          >
+            ← Back
+          </Button>
+          <Button
+            buttonType="secondary"
+            buttonSize="L"
+            disabled={isNextPageButtonDisabled}
+            onClick={handleNextPage}
+          >
+            Next →
+          </Button>
+        </S.Pages>
+      </S.Pagination>
+    </>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
index 37ad28b202b..e2aeb68bbba 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
@@ -85,9 +85,10 @@ describe('MessagesTable', () => {
   });
 
   describe('Custom Setup with different props value', () => {
-    it('should check if next click is gone during isLive Param', () => {
+    it('should check if next button and previous is disabled isLive Param', () => {
       setUpComponent(searchParams, { ...contextValue, isLive: true });
-      expect(screen.queryByText(/next/i)).not.toBeInTheDocument();
+      expect(screen.queryByText(/next/i)).toBeDisabled();
+      expect(screen.queryByText(/back/i)).toBeDisabled();
     });
 
     it('should check the display of the loader element', () => {

From 027d9b4653e2f3ea13d4de6a0b2bd568106ffb40 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 23 Dec 2022 16:45:21 +0300
Subject: [PATCH 334/734] Change message timestamp format (#3113)

* Drop experimental endpoints

* [FE] Change message timestamp format (#3119)

* remove dayjs from the code base

* remove dayjs library and clean up the hook codes

* minor obsolete fixtures deletion

* minor provider code modifications

* minor provider code modifications

* minor linter code modifications

* minor date local and language code modifications

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>

* removing timestamp api from the generated sources

Co-authored-by: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Co-authored-by: Mgrdich <mgotm13@gmail.com>
---
 .../kafka/ui/controller/InfoController.java   | 32 -------------------
 .../main/resources/swagger/kafka-ui-api.yaml  | 27 ----------------
 kafka-ui-react-app/package.json               |  1 -
 kafka-ui-react-app/pnpm-lock.yaml             |  6 ----
 .../Topics/Topic/Messages/Message.tsx         |  3 +-
 .../MessageContent/MessageContent.tsx         |  4 +--
 .../Topic/Messages/__test__/Message.spec.tsx  | 15 +++------
 .../Topic/Statistics/Indicators/Total.tsx     |  4 +--
 .../Topics/Topic/Statistics/Metrics.tsx       | 13 +++++---
 .../Topic/Statistics/PartitionInfoRow.tsx     |  4 +--
 .../src/components/Version/Version.tsx        |  3 +-
 .../Version/__tests__/Version.spec.tsx        | 17 +---------
 .../src/components/__tests__/App.spec.tsx     | 13 --------
 .../contexts/GlobalSettingsContext.tsx        | 22 ++-----------
 kafka-ui-react-app/src/lib/api.ts             |  2 --
 kafka-ui-react-app/src/lib/dateTimeHelpers.ts | 25 ++++++++++-----
 .../src/lib/fixtures/timeFormat.ts            |  3 --
 .../hooks/__tests__/dateTimeHelpers.spec.ts   | 23 +++++++++++++
 .../hooks/api/__tests__/timeFormat.spec.ts    | 17 ----------
 .../src/lib/hooks/api/timeFormat.ts           | 11 -------
 .../src/lib/hooks/useTimeFormat.ts            | 10 ------
 kafka-ui-react-app/src/lib/testHelpers.tsx    |  7 ++--
 22 files changed, 63 insertions(+), 199 deletions(-)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java
 delete mode 100644 kafka-ui-react-app/src/lib/fixtures/timeFormat.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/__tests__/dateTimeHelpers.spec.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/useTimeFormat.ts

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java
deleted file mode 100644
index cdda3d0953e..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/InfoController.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.provectus.kafka.ui.controller;
-
-import com.provectus.kafka.ui.api.TimeStampFormatApi;
-import com.provectus.kafka.ui.model.TimeStampFormatDTO;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-
-@RestController
-@RequiredArgsConstructor
-@Slf4j
-public class InfoController extends AbstractController implements TimeStampFormatApi {
-
-  @Value("${timestamp.format:dd.MM.YYYY HH:mm:ss}")
-  private String timeStampFormat;
-  @Value("${timestamp.format:DD.MM.YYYY HH:mm:ss}")
-  private String timeStampFormatIso;
-
-  @Override
-  public Mono<ResponseEntity<TimeStampFormatDTO>> getTimeStampFormat(ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity.ok(new TimeStampFormatDTO().timeStampFormat(timeStampFormat)));
-  }
-
-  @Override
-  public Mono<ResponseEntity<TimeStampFormatDTO>> getTimeStampFormatISO(ServerWebExchange exchange) {
-    return Mono.just(ResponseEntity.ok(new TimeStampFormatDTO().timeStampFormat(timeStampFormatIso)));
-  }
-}
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 5cc8e0fea1c..dc3cca80d8b 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1729,33 +1729,6 @@ paths:
                 $ref: '#/components/schemas/PartitionsIncreaseResponse'
         404:
           description: Not found
-  /api/info/timestampformat:
-    get:
-      tags:
-        - TimeStampFormat
-      summary: get system default datetime format
-      operationId: getTimeStampFormat
-      responses:
-        200:
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TimeStampFormat'
-
-  /api/info/timestampformat/iso:
-    get:
-      tags:
-        - TimeStampFormat
-      summary: get system default datetime format (in ISO format, for JS)
-      operationId: getTimeStampFormatISO
-      responses:
-        200:
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TimeStampFormat'
 
   /api/authorization:
     get:
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index b0779e54884..bbb159abd41 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -22,7 +22,6 @@
     "ajv": "^8.6.3",
     "babel-jest": "^29.0.3",
     "classnames": "^2.2.6",
-    "dayjs": "^1.11.2",
     "fetch-mock": "^9.11.0",
     "jest": "^29.0.3",
     "jest-watch-typeahead": "^2.0.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index dca028c2d9f..db189eb663e 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -38,7 +38,6 @@ specifiers:
   ajv: ^8.6.3
   babel-jest: ^29.0.3
   classnames: ^2.2.6
-  dayjs: ^1.11.2
   dotenv: ^16.0.1
   eslint: ^8.3.0
   eslint-config-airbnb: ^19.0.4
@@ -110,7 +109,6 @@ dependencies:
   ajv: 8.8.2
   babel-jest: 29.0.3_@babel+core@7.18.2
   classnames: 2.3.1
-  dayjs: 1.11.3
   fetch-mock: 9.11.0
   jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
   jest-watch-typeahead: 2.0.0_jest@29.0.3
@@ -4686,10 +4684,6 @@ packages:
     resolution: {integrity: sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q==}
     engines: {node: '>=0.11'}
 
-  /dayjs/1.11.3:
-    resolution: {integrity: sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A==}
-    dev: false
-
   /debug/2.6.9:
     resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     peerDependencies:
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index 7efb1f728c1..82a705c3a33 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -3,10 +3,10 @@ import React from 'react';
 import styled from 'styled-components';
 import useDataSaver from 'lib/hooks/useDataSaver';
 import { TopicMessage } from 'generated-sources';
-import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 import MessageToggleIcon from 'components/common/Icons/MessageToggleIcon';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 import MessageContent from './MessageContent/MessageContent';
 import * as S from './MessageContent/MessageContent.styled';
@@ -58,7 +58,6 @@ const Message: React.FC<Props> = ({
     Headers: headers,
     Timestamp: timestamp,
   };
-  const formatTimestamp = useTimeFormat();
 
   const savedMessage = JSON.stringify(savedMessageJson, null, '\t');
   const { copyToClipboard, saveFile } = useDataSaver(
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
index 85f2dcd27c9..6edfdde54c1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import EditorViewer from 'components/common/EditorViewer/EditorViewer';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 import { SchemaType, TopicMessageTimestampTypeEnum } from 'generated-sources';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 import * as S from './MessageContent.styled';
 
@@ -27,8 +27,6 @@ const MessageContent: React.FC<MessageContentProps> = ({
   timestamp,
   timestampType,
 }) => {
-  const formatTimestamp = useTimeFormat();
-
   const [activeTab, setActiveTab] = React.useState<Tab>('content');
 
   const activeTabContent = () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
index 8c1ca2ea9e3..c01f4af3d41 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
@@ -1,16 +1,12 @@
 import React from 'react';
 import { TopicMessage, TopicMessageTimestampTypeEnum } from 'generated-sources';
-import Message, {
-  PreviewFilter,
-  Props,
-} from 'components/Topics/Topic/Messages/Message';
+import Message, { Props } from 'components/Topics/Topic/Messages/Message';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
 import userEvent from '@testing-library/user-event';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 const messageContentText = 'messageContentText';
-const format = 'DD.MM.YYYY HH:mm:ss';
 
 jest.mock(
   'components/Topics/Topic/Messages/MessageContent/MessageContent',
@@ -33,9 +29,6 @@ describe('Message component', () => {
     headers: { header: 'test' },
   };
 
-  const mockKeyFilters: PreviewFilter[] = [];
-  const mockContentFilters: PreviewFilter[] = [];
-
   const renderComponent = (
     props: Partial<Props> = {
       message: mockMessage,
@@ -46,8 +39,8 @@ describe('Message component', () => {
         <tbody>
           <Message
             message={props.message || mockMessage}
-            keyFilters={mockKeyFilters}
-            contentFilters={mockContentFilters}
+            keyFilters={[]}
+            contentFilters={[]}
           />
         </tbody>
       </table>
@@ -58,7 +51,7 @@ describe('Message component', () => {
     expect(screen.getByText(mockMessage.content as string)).toBeInTheDocument();
     expect(screen.getByText(mockMessage.key as string)).toBeInTheDocument();
     expect(
-      screen.getByText(formatTimestamp(mockMessage.timestamp, format))
+      screen.getByText(formatTimestamp(mockMessage.timestamp))
     ).toBeInTheDocument();
     expect(screen.getByText(mockMessage.offset.toString())).toBeInTheDocument();
     expect(
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx
index e30c13baf79..65e5892b41b 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Indicators/Total.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import * as Metrics from 'components/common/Metrics';
-import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 import { TopicAnalysisStats } from 'generated-sources';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 const Total: React.FC<TopicAnalysisStats> = ({
   totalMsgs,
@@ -14,8 +14,6 @@ const Total: React.FC<TopicAnalysisStats> = ({
   approxUniqKeys,
   approxUniqValues,
 }) => {
-  const formatTimestamp = useTimeFormat();
-
   return (
     <Metrics.Section title="Messages">
       <Metrics.Indicator label="Total number">{totalMsgs}</Metrics.Indicator>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
index a0909a4ebcc..41907fec781 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
@@ -13,8 +13,7 @@ import {
   Label,
 } from 'components/common/PropertiesList/PropertiesList.styled';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
-import { useTimeFormat } from 'lib/hooks/useTimeFormat';
-import { calculateTimer } from 'lib/dateTimeHelpers';
+import { calculateTimer, formatTimestamp } from 'lib/dateTimeHelpers';
 import { Action, ResourceType } from 'generated-sources';
 import { ActionButton } from 'components/common/ActionComponent';
 
@@ -24,8 +23,6 @@ import SizeStats from './Indicators/SizeStats';
 import PartitionTable from './PartitionTable';
 
 const Metrics: React.FC = () => {
-  const formatTimestamp = useTimeFormat();
-
   const params = useAppParams<RouteParamsClusterTopic>();
 
   const [isAnalyzing, setIsAnalyzing] = useState(true);
@@ -68,7 +65,13 @@ const Metrics: React.FC = () => {
         </ActionButton>
         <List>
           <Label>Started at</Label>
-          <span>{formatTimestamp(data.progress.startedAt, 'hh:mm:ss a')}</span>
+          <span>
+            {formatTimestamp(data.progress.startedAt, {
+              hour: 'numeric',
+              minute: 'numeric',
+              second: 'numeric',
+            })}
+          </span>
           <Label>Passed since start</Label>
           <span>{calculateTimer(data.progress.startedAt as number)}</span>
           <Label>Scanned messages</Label>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
index 698019f2c44..51c1f85c2f1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/PartitionInfoRow.tsx
@@ -6,16 +6,14 @@ import {
   List,
   Label,
 } from 'components/common/PropertiesList/PropertiesList.styled';
-import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 import { TopicAnalysisStats } from 'generated-sources';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 import * as S from './Statistics.styles';
 
 const PartitionInfoRow: React.FC<{ row: Row<TopicAnalysisStats> }> = ({
   row,
 }) => {
-  const formatTimestamp = useTimeFormat();
-
   const {
     totalMsgs,
     minTimestamp,
diff --git a/kafka-ui-react-app/src/components/Version/Version.tsx b/kafka-ui-react-app/src/components/Version/Version.tsx
index 6baab8db772..2a91f9ec3be 100644
--- a/kafka-ui-react-app/src/components/Version/Version.tsx
+++ b/kafka-ui-react-app/src/components/Version/Version.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import WarningIcon from 'components/common/Icons/WarningIcon';
 import { gitCommitPath } from 'lib/paths';
-import { useTimeFormat } from 'lib/hooks/useTimeFormat';
 import { useActuatorInfo } from 'lib/hooks/api/actuatorInfo';
 import { BUILD_VERSION_PATTERN } from 'lib/constants';
 import { useLatestVersion } from 'lib/hooks/api/latestVersion';
+import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 import * as S from './Version.styled';
 import compareVersions from './compareVersions';
@@ -15,7 +15,6 @@ export interface VesionProps {
 }
 
 const Version: React.FC = () => {
-  const formatTimestamp = useTimeFormat();
   const { data: actuatorInfo = {} } = useActuatorInfo();
   const { data: latestVersionInfo = {} } = useLatestVersion();
 
diff --git a/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx b/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx
index cdfd5899640..d407966058c 100644
--- a/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx
+++ b/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx
@@ -3,16 +3,11 @@ import { screen } from '@testing-library/dom';
 import Version from 'components/Version/Version';
 import { render } from 'lib/testHelpers';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
-import { useTimeFormat } from 'lib/hooks/api/timeFormat';
 import { useActuatorInfo } from 'lib/hooks/api/actuatorInfo';
 import { useLatestVersion } from 'lib/hooks/api/latestVersion';
 import { actuatorInfoPayload } from 'lib/fixtures/actuatorInfo';
 import { latestVersionPayload } from 'lib/fixtures/latestVersion';
-import { defaultGlobalSettingsValue } from 'components/contexts/GlobalSettingsContext';
 
-jest.mock('lib/hooks/api/timeFormat', () => ({
-  useTimeFormat: jest.fn(),
-}));
 jest.mock('lib/hooks/api/actuatorInfo', () => ({
   useActuatorInfo: jest.fn(),
 }));
@@ -21,24 +16,14 @@ jest.mock('lib/hooks/api/latestVersion', () => ({
 }));
 
 describe('Version Component', () => {
-  const { timeStampFormat } = defaultGlobalSettingsValue;
-
   const versionTag = 'v0.5.0';
   const snapshotTag = 'test-SNAPSHOT';
   const commitTag = 'befd3b328e2c9c7df57b0c5746561b2f7fee8813';
 
   const actuatorVersionPayload = actuatorInfoPayload(versionTag);
-  const formattedTimestamp = formatTimestamp(
-    actuatorVersionPayload.build.time,
-    timeStampFormat
-  );
+  const formattedTimestamp = formatTimestamp(actuatorVersionPayload.build.time);
 
   beforeEach(() => {
-    (useTimeFormat as jest.Mock).mockImplementation(() => ({
-      data: {
-        timeStampFormat,
-      },
-    }));
     (useActuatorInfo as jest.Mock).mockImplementation(() => ({
       data: actuatorVersionPayload,
     }));
diff --git a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
index 82fb74719a5..6157c2291e2 100644
--- a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
+++ b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
@@ -2,31 +2,18 @@ import React from 'react';
 import { screen } from '@testing-library/react';
 import App from 'components/App';
 import { render } from 'lib/testHelpers';
-import { useTimeFormat } from 'lib/hooks/api/timeFormat';
-import { defaultGlobalSettingsValue } from 'components/contexts/GlobalSettingsContext';
 import { useGetUserInfo } from 'lib/hooks/api/roles';
 
 jest.mock('components/Nav/Nav', () => () => <div>Navigation</div>);
 
 jest.mock('components/Version/Version', () => () => <div>Version</div>);
 
-jest.mock('components/NavBar/NavBar', () => () => <div>NavBar</div>);
-
-jest.mock('lib/hooks/api/timeFormat', () => ({
-  ...jest.requireActual('lib/hooks/api/timeFormat'),
-  useTimeFormat: jest.fn(),
-}));
-
 jest.mock('lib/hooks/api/roles', () => ({
   useGetUserInfo: jest.fn(),
 }));
 
 describe('App', () => {
   beforeEach(() => {
-    (useTimeFormat as jest.Mock).mockImplementation(() => ({
-      data: defaultGlobalSettingsValue,
-    }));
-
     (useGetUserInfo as jest.Mock).mockImplementation(() => ({
       data: {},
     }));
diff --git a/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
index 9300fdb216e..a1c3a386f5c 100644
--- a/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
+++ b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
@@ -1,29 +1,13 @@
 import React from 'react';
-import { useTimeFormat } from 'lib/hooks/api/timeFormat';
 
-interface GlobalSettingsContextValue {
-  timeStampFormat: string;
-}
-
-export const defaultGlobalSettingsValue = {
-  timeStampFormat: 'DD.MM.YYYY HH:mm:ss',
-};
-
-export const GlobalSettingsContext =
-  React.createContext<GlobalSettingsContextValue>(defaultGlobalSettingsValue);
+// This is here for future global code settings modification , it does not do anything now
+export const GlobalSettingsContext = React.createContext<boolean>(true);
 
 export const GlobalSettingsProvider: React.FC<
   React.PropsWithChildren<unknown>
 > = ({ children }) => {
-  const { data } = useTimeFormat();
-
   return (
-    <GlobalSettingsContext.Provider
-      value={{
-        timeStampFormat:
-          data?.timeStampFormat || defaultGlobalSettingsValue.timeStampFormat,
-      }}
-    >
+    <GlobalSettingsContext.Provider value={false}>
       {children}
     </GlobalSettingsContext.Provider>
   );
diff --git a/kafka-ui-react-app/src/lib/api.ts b/kafka-ui-react-app/src/lib/api.ts
index fea556e6433..f83cc539834 100644
--- a/kafka-ui-react-app/src/lib/api.ts
+++ b/kafka-ui-react-app/src/lib/api.ts
@@ -8,7 +8,6 @@ import {
   Configuration,
   KafkaConnectApi,
   ConsumerGroupsApi,
-  TimeStampFormatApi,
   AuthorizationApi,
 } from 'generated-sources';
 import { BASE_PARAMS } from 'lib/constants';
@@ -19,7 +18,6 @@ export const ksqlDbApiClient = new KsqlApi(apiClientConf);
 export const topicsApiClient = new TopicsApi(apiClientConf);
 export const brokersApiClient = new BrokersApi(apiClientConf);
 export const schemasApiClient = new SchemasApi(apiClientConf);
-export const timerStampFormatApiClient = new TimeStampFormatApi(apiClientConf);
 export const messagesApiClient = new MessagesApi(apiClientConf);
 export const clustersApiClient = new ClustersApi(apiClientConf);
 export const kafkaConnectApiClient = new KafkaConnectApi(apiClientConf);
diff --git a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
index 5c72af7bc47..3dce0edd78a 100644
--- a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
+++ b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
@@ -1,14 +1,22 @@
-import dayjs from 'dayjs';
-
 export const formatTimestamp = (
-  timestamp: number | string | Date | undefined,
-  format?: string
+  timestamp?: number | string | Date,
+  format: Intl.DateTimeFormatOptions = { hour12: false }
 ): string => {
   if (!timestamp) {
     return '';
   }
 
-  return dayjs(timestamp).format(format);
+  // empty array gets the default one from the browser
+  const date = new Date(timestamp);
+
+  // invalid date
+  if (Number.isNaN(date.getTime())) {
+    return '';
+  }
+
+  // browser support
+  const language = navigator.language || navigator.languages[0];
+  return date.toLocaleString(language || [], format);
 };
 
 export const formatMilliseconds = (input = 0) => {
@@ -36,10 +44,11 @@ export const formatMilliseconds = (input = 0) => {
 export const passedTime = (value: number) => (value < 10 ? `0${value}` : value);
 
 export const calculateTimer = (startedAt: number) => {
-  const now = new Date().getTime();
+  const nowDate = new Date();
+  const now = nowDate.getTime();
   const newDate = now - startedAt;
-  const minutes = dayjs(newDate).minute();
-  const second = dayjs(newDate).second();
+  const minutes = nowDate.getMinutes();
+  const second = nowDate.getSeconds();
 
   return newDate > 0 ? `${passedTime(minutes)}:${passedTime(second)}` : '00:00';
 };
diff --git a/kafka-ui-react-app/src/lib/fixtures/timeFormat.ts b/kafka-ui-react-app/src/lib/fixtures/timeFormat.ts
deleted file mode 100644
index 3f070d46401..00000000000
--- a/kafka-ui-react-app/src/lib/fixtures/timeFormat.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const timeFormatPayload = {
-  timeStampFormat: 'dd.MM.YYYY HH:mm:ss',
-};
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/dateTimeHelpers.spec.ts b/kafka-ui-react-app/src/lib/hooks/__tests__/dateTimeHelpers.spec.ts
new file mode 100644
index 00000000000..5ed95fa8515
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/dateTimeHelpers.spec.ts
@@ -0,0 +1,23 @@
+import { formatTimestamp } from 'lib/dateTimeHelpers';
+
+describe('dateTimeHelpers', () => {
+  describe('formatTimestamp', () => {
+    it('should check the empty case', () => {
+      expect(formatTimestamp('')).toBe('');
+    });
+
+    it('should check the invalid case', () => {
+      expect(formatTimestamp('invalid')).toBe('');
+    });
+
+    it('should output the correct date', () => {
+      const date = new Date();
+      expect(formatTimestamp(date)).toBe(
+        date.toLocaleString([], { hour12: false })
+      );
+      expect(formatTimestamp(date.getTime())).toBe(
+        date.toLocaleString([], { hour12: false })
+      );
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts
deleted file mode 100644
index c6984c40b15..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/timeFormat.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import fetchMock from 'fetch-mock';
-import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
-import * as hooks from 'lib/hooks/api/timeFormat';
-import { timeFormatPayload } from 'lib/fixtures/timeFormat';
-
-const timeFormatPath = '/api/info/timestampformat/iso';
-
-describe('Time format hooks', () => {
-  beforeEach(() => fetchMock.restore());
-  describe('useTimeFormat', () => {
-    it('returns the correct data', async () => {
-      const mock = fetchMock.getOnce(timeFormatPath, timeFormatPayload);
-      const { result } = renderQueryHook(() => hooks.useTimeFormat());
-      await expectQueryWorks(mock, result);
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts b/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts
deleted file mode 100644
index 3b36f74066f..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/api/timeFormat.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { timerStampFormatApiClient as api } from 'lib/api';
-import { QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
-
-export function useTimeFormat() {
-  return useQuery(
-    ['settings', 'timestampformat'],
-    () => api.getTimeStampFormatISO(),
-    QUERY_REFETCH_OFF_OPTIONS
-  );
-}
diff --git a/kafka-ui-react-app/src/lib/hooks/useTimeFormat.ts b/kafka-ui-react-app/src/lib/hooks/useTimeFormat.ts
deleted file mode 100644
index d84f8c6206d..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/useTimeFormat.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { useContext } from 'react';
-import { formatTimestamp } from 'lib/dateTimeHelpers';
-import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
-
-export const useTimeFormat = () => {
-  const { timeStampFormat } = useContext(GlobalSettingsContext);
-
-  return (timestamp?: number | string | Date, format?: string) =>
-    formatTimestamp(timestamp, format || timeStampFormat);
-};
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index 8186bb7a908..9218e861111 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -26,10 +26,7 @@ import {
 } from '@tanstack/react-query';
 import { ConfirmContextProvider } from 'components/contexts/ConfirmContext';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
-import {
-  defaultGlobalSettingsValue,
-  GlobalSettingsContext,
-} from 'components/contexts/GlobalSettingsContext';
+import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
 import { UserInfoRolesAccessContext } from 'components/contexts/UserInfoRolesAccessContext';
 
 import { RolesType, modifyRolesData } from './permissions';
@@ -122,7 +119,7 @@ const customRender = (
     children,
   }) => (
     <TestQueryClientProvider>
-      <GlobalSettingsContext.Provider value={defaultGlobalSettingsValue}>
+      <GlobalSettingsContext.Provider value={false}>
         <ThemeProvider theme={theme}>
           <TestUserInfoProvider data={userInfo}>
             <ConfirmContextProvider>

From 2b790df989b996ae2ef4843847c63c5b4e046c41 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 23 Dec 2022 18:54:28 +0400
Subject: [PATCH 335/734] Fix helm release workflow (#3131)

---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 34b13bb877c..0e87c10fd2b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -88,7 +88,7 @@ jobs:
   charts:
     runs-on: ubuntu-latest
     permissions:
-      actions: write
+      contents: write
     needs: release
     steps:
       - name: Repository Dispatch

From 58e0cc8d49b2ff260f3d3e97b30e025a79140373 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Tue, 29 Nov 2022 17:15:08 +0200
Subject: [PATCH 336/734] [e2e]Checking 'Show Internal Topics' toggle
 functionality within 'All Topics' page/Issue#2938 (#2983)

* [e2e] Checking 'Show Internal Topics' toggle functionality within 'All Topics' page

* [e2e] First Checking 'Show Internal Topics' toggle functionality within 'All Topics' page

* [e2e] Second Checking 'Show Internal Topics' toggle functionality within 'All Topics' page

* [e2e] selectItem locator is changed

* [e2e] assertion added

* [e2e] assertion added

(cherry picked from commit 27db304b1b3f779363891dccdaf365e17dbaf593)
---
 .../kafka/ui/pages/topic/TopicsList.java      | 118 ++++++++++++++++--
 .../kafka/ui/utilities/WebUtils.java          |   9 ++
 .../kafka/ui/suite/topics/TopicsTests.java    |  38 +++++-
 3 files changed, 152 insertions(+), 13 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 11d47a07ca3..4c88f45aa90 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -1,8 +1,11 @@
 package com.provectus.kafka.ui.pages.topic;
 
+import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
 
+import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
@@ -21,7 +24,7 @@ public class TopicsList extends BasePage {
     protected SelenideElement deleteSelectedTopicsBtn = $x("//button[text()='Delete selected topics']");
     protected SelenideElement copySelectedTopicBtn = $x("//button[text()='Copy selected topic']");
     protected SelenideElement purgeMessagesOfSelectedTopicsBtn = $x("//button[text()='Purge messages of selected topics']");
-    protected String checkBoxListLocator = "//a[@title='%s']//ancestor::td/../td/input[@type='checkbox']";
+    protected ElementsCollection topicsGridItems = $$x("//tr[@class]");
 
     @Step
     public TopicsList waitUntilScreenReady() {
@@ -43,18 +46,22 @@ public boolean isTopicVisible(String topicName) {
     }
 
     @Step
-    public TopicsList openTopic(String topicName) {
-        getTableElement(topicName).shouldBe(Condition.enabled).click();
-        return this;
+    public boolean isShowInternalRadioBtnSelected() {
+      return isSelected(showInternalRadioBtn);
     }
 
     @Step
-    public TopicsList selectCheckboxByName(String topicName){
-      SelenideElement checkBox = $x(String.format(checkBoxListLocator,topicName));
-      if(!checkBox.is(Condition.selected)){clickByJavaScript(checkBox);}
+    public TopicsList setShowInternalRadioButton(boolean select) {
+      selectElement(showInternalRadioBtn, select);
       return this;
     }
 
+    @Step
+    public TopicsList openTopic(String topicName) {
+        getTopicItem(topicName).openItem();
+        return this;
+    }
+
     @Step
     public boolean isCopySelectedTopicBtnEnabled(){
       return isEnabled(copySelectedTopicBtn);
@@ -92,4 +99,101 @@ public List<SelenideElement> getAllEnabledElements() {
       enabledElements.addAll(Arrays.asList(searchField, showInternalRadioBtn,addTopicBtn));
       return enabledElements;
     }
+
+    private List<TopicGridItem> initGridItems() {
+      List<TopicGridItem> gridItemList = new ArrayList<>();
+      topicsGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+          .forEach(item -> gridItemList.add(new TopicGridItem(item)));
+      return gridItemList;
+    }
+
+  @Step
+  public TopicGridItem getTopicItem(String name) {
+    return initGridItems().stream()
+        .filter(e -> e.getName().equals(name))
+        .findFirst().orElse(null);
+  }
+
+    @Step
+    public List<TopicGridItem> getNonInternalTopics() {
+      return initGridItems().stream()
+          .filter(e -> !e.isInternal())
+          .collect(Collectors.toList());
+    }
+
+    @Step
+    public List<TopicGridItem> getInternalTopics() {
+      return initGridItems().stream()
+          .filter(TopicGridItem::isInternal)
+          .collect(Collectors.toList());
+    }
+
+    public static class TopicGridItem extends BasePage {
+
+      private final SelenideElement element;
+
+      public TopicGridItem(SelenideElement element) {
+        this.element = element;
+      }
+
+      @Step
+      public void selectItem(boolean select) {
+        selectElement(element.$x("./td[1]/input"), select);
+      }
+
+      @Step
+      public boolean isInternal() {
+        boolean internal = false;
+        try {
+          element.$x("./td[2]/a/span").shouldBe(Condition.visible);
+          internal = true;
+        } catch (Throwable ignored) {
+        }
+        return internal;
+      }
+
+      private SelenideElement getNameElm() {
+        return element.$x("./td[2]");
+      }
+
+      @Step
+      public String getName() {
+        return getNameElm().getText().trim();
+      }
+
+      @Step
+      public void openItem() {
+        getNameElm().click();
+      }
+
+      @Step
+      public int getPartition() {
+        return Integer.parseInt(element.$x("./td[3]").getText().trim());
+      }
+
+      @Step
+      public int getOutOfSyncReplicas() {
+        return Integer.parseInt(element.$x("./td[4]").getText().trim());
+      }
+
+      @Step
+      public int getReplicationFactor() {
+        return Integer.parseInt(element.$x("./td[5]").getText().trim());
+      }
+
+      @Step
+      public int getNumberOfMessages() {
+        return Integer.parseInt(element.$x("./td[6]").getText().trim());
+      }
+
+      @Step
+      public int getSize() {
+        return Integer.parseInt(element.$x("./td[7]").getText().trim());
+      }
+
+      @Step
+      public void openDotMenu(){
+        element.$x("./td[8]//button").click();
+      }
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index 3ba6d053ecd..307361ad5db 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -69,4 +69,13 @@ public static boolean isSelected(SelenideElement element) {
     }
     return isSelected;
   }
+
+  public static boolean selectElement(SelenideElement element, boolean select){
+    if (select) {
+      if (!element.isSelected()) clickByJavaScript(element);
+    } else {
+      if (element.isSelected()) clickByJavaScript(element);
+    }
+    return true;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index f2db96cb7a5..1433f867cc8 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -110,20 +110,23 @@ public void createTopic() {
   @CaseId(7)
   @Test
   @Order(2)
-  void checkAvailableOperations(){
+  void checkAvailableOperations() {
     String processingTopic = "my_ksql_1ksql_processing_log";
     String confluentTopic = "_confluent-ksql-my_ksql_1_command_topic";
     naviSideBar
         .openSideMenu(TOPICS);
     topicsList
         .waitUntilScreenReady()
-        .selectCheckboxByName(processingTopic);
-    topicsList.getActionButtons().
-        forEach(element -> assertThat(element.is(Condition.enabled))
+        .getTopicItem(processingTopic)
+        .selectItem(true);
+    topicsList
+        .getActionButtons()
+        .forEach(element -> assertThat(element.is(Condition.enabled))
             .as(element.getSearchCriteria() + " isEnabled()").isTrue());
     topicsList
-        .selectCheckboxByName(confluentTopic);
-    Assertions.assertFalse(topicsList.isCopySelectedTopicBtnEnabled(),"isCopySelectedTopicBtnEnabled()");
+        .getTopicItem(confluentTopic)
+        .selectItem(true);
+    Assertions.assertFalse(topicsList.isCopySelectedTopicBtnEnabled(), "isCopySelectedTopicBtnEnabled()");
   }
 
   @Disabled()
@@ -339,6 +342,29 @@ void addingNewFilterWithinTopic() {
         .isEqualTo(filterName);
   }
 
+  @DisplayName("Checking 'Show Internal Topics' toggle functionality within 'All Topics' page")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(11)
+  @Test
+  @Order(10)
+  void checkShowInternalTopicsButtonFunctionality(){
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicsList.isShowInternalRadioBtnSelected()).as("isInternalRadioBtnSelected()").isTrue();
+    softly.assertThat(topicsList.getInternalTopics()).as("getInternalTopics()").size().isGreaterThan(0);
+    softly.assertThat(topicsList.getNonInternalTopics()).as("getNonInternalTopics()").size().isGreaterThan(0);
+    softly.assertAll();
+    topicsList
+        .setShowInternalRadioButton(false);
+    softly.assertThat(topicsList.getInternalTopics()).as("getInternalTopics()").size().isEqualTo(0);
+    softly.assertThat(topicsList.getNonInternalTopics()).as("getNonInternalTopics()").size().isGreaterThan(0);
+    softly.assertAll();
+  }
+
   @AfterAll
   public void afterAll() {
     TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));

From 51b5b3339f3f897f222aafb0b4f0aea2cec27349 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Wed, 30 Nov 2022 16:01:09 +0200
Subject: [PATCH 337/734] [e2e]SchemasTests.updateSchemaAvro : Update schema
 avro ( REFACTORED WITH NEW ASSERTIONS) (#2992)

* Added softAssertions and few methods for assert

* Refactored softAssertions and few methods for assert

(cherry picked from commit 86c72d7d8527e00aaa5ac45a04a8909e7a6a21fb)
---
 .../ui/pages/schema/SchemaCreateForm.java     | 22 +++++++++++++++----
 .../kafka/ui/suite/schemas/SchemasTests.java  |  9 +++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
index 7d0d5c58a93..d749b5feb8b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
@@ -11,6 +11,8 @@
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class SchemaCreateForm extends BasePage {
 
@@ -21,6 +23,7 @@ public class SchemaCreateForm extends BasePage {
     protected SelenideElement schemaTypeDdl = $x("//ul[@name='schemaType']");
     protected SelenideElement compatibilityLevelList = $x("//ul[@name='compatibilityLevel']");
     protected SelenideElement newSchemaTextArea = $x("//div[@id='newSchema']");
+    protected SelenideElement latestSchemaTextArea = $x("//div[@id='latestSchema']");
     protected SelenideElement schemaVersionDdl = $$x("//ul[@role='listbox']/li[text()='Version 2']").first();
     protected List<SelenideElement> visibleMarkers = $$x("//div[@class='ace_scroller']//div[contains(@class,'codeMarker')]");
     protected List<SelenideElement> elementsCompareVersionDdl = $$x("//ul[@role='listbox']/ul/li");
@@ -96,14 +99,25 @@ public SchemaCreateForm setNewSchemaValue(String configJson) {
     }
 
     @Step
-    public boolean isSchemaDropDownDisabled(){
-        boolean disabled = false;
+    public List<SelenideElement> getAllDetailsPageElements() {
+      return Stream.of(compatibilityLevelList, newSchemaTextArea, latestSchemaTextArea, submitBtn, schemaTypeDdl)
+          .collect(Collectors.toList());
+    }
+
+    @Step
+    public boolean isSubmitBtnEnabled(){
+      return isEnabled(submitBtn);
+    }
+
+    @Step
+    public boolean isSchemaDropDownEnabled(){
+        boolean enabled = true;
         try{
             String attribute = schemaTypeDdl.getAttribute("disabled");
-            disabled = true;
+            enabled = false;
         }
         catch (Throwable ignored){
         }
-        return disabled;
+        return enabled;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
index 398130bcd19..f112c7b5881 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
@@ -4,6 +4,7 @@
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
+import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Schema;
@@ -93,7 +94,13 @@ void updateSchemaAvro() {
                 .openEditSchema();
         schemaCreateForm
                 .waitUntilScreenReady();
-        Assertions.assertTrue(schemaCreateForm.isSchemaDropDownDisabled(),"isSchemaDropDownDisabled()");
+        SoftAssertions softly = new SoftAssertions();
+        schemaCreateForm.getAllDetailsPageElements()
+            .forEach(element -> softly.assertThat(element.is(Condition.visible))
+                .as(element.getSearchCriteria() + " isVisible").isTrue());
+        softly.assertThat(schemaCreateForm.isSubmitBtnEnabled()).as("isSubmitBtnEnabled()").isFalse();
+        softly.assertThat(schemaCreateForm.isSchemaDropDownEnabled()).as("isSchemaDropDownEnabled()").isFalse();
+        softly.assertAll();
         schemaCreateForm
                 .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
                 .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))

From 141111ae920ea62846d83191feb0cf9da81ae1af Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Fri, 2 Dec 2022 22:30:10 +0800
Subject: [PATCH 338/734] [e2e]Checking filter saving within Messages/Topic
 profile/Saved Filters (#3003)

* [e2e]Checking filter saving within Messages/Topic profile/Saved Filters

* resolve conversation

* resolve conversation

* resolve conversation

* resolve conversation

* resolve conversation

* resolve conversation

(cherry picked from commit a503c29472bbfc8f4c57680fd71ba7bfb007d6f9)
---
 .../kafka/ui/pages/topic/TopicDetails.java    | 50 ++++++++++++----
 .../kafka/ui/suite/topics/TopicsTests.java    | 58 ++++++++++++++-----
 2 files changed, 84 insertions(+), 24 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 5b7e9e119d4..65e8350f1c9 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -23,7 +23,7 @@ public class TopicDetails extends BasePage {
   protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
   protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
   protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
-  protected SelenideElement savedFiltersField = $x("//div[text()='Saved Filters']");
+  protected SelenideElement savedFiltersLink = $x("//div[text()='Saved Filters']");
   protected SelenideElement addFilterCodeModalTitle = $x("//label[text()='Filter code']");
   protected SelenideElement addFilterCodeInput = $x("//div[@id='ace-editor']//textarea");
   protected SelenideElement saveThisFilterCheckBoxAddFilterMdl = $x("//input[@name='saveFilter']");
@@ -37,10 +37,12 @@ public class TopicDetails extends BasePage {
   protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
   protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
   protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
+  protected SelenideElement backToCreateFiltersLink = $x("//div[text()='Back To create filters']");
   protected ElementsCollection messageGridItems = $$x("//tbody//tr");
+  protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
   protected String consumerIdLocator = "//a[@title='%s']";
   protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
-  protected String filterNameLocator = "//*[@data-testid='activeSmartFilter']";
+  protected String activeFilterNameLocator = "//div[@data-testid='activeSmartFilter'][contains(text(),'%s')]";
 
   @Step
   public TopicDetails waitUntilScreenReady() {
@@ -120,15 +122,20 @@ public TopicDetails clickMessagesAddFiltersBtn() {
   }
 
   @Step
-  public TopicDetails waitUntilAddFiltersMdlVisible() {
-    addFilterCodeModalTitle.shouldBe(Condition.visible);
+  public TopicDetails openSavedFiltersListMdl(){
+    savedFiltersLink.shouldBe(Condition.enabled).click();
+    backToCreateFiltersLink.shouldBe(Condition.visible);
     return this;
   }
 
   @Step
-  public TopicDetails clickAddFilterBtnAddFilterMdl() {
-    addFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
-    addFilterCodeModalTitle.shouldBe(Condition.hidden);
+  public boolean isFilterVisibleAtSavedFiltersMdl(String filterName){
+    return isVisible($x(String.format(savedFilterNameLocator,filterName)));
+  }
+
+  @Step
+  public TopicDetails waitUntilAddFiltersMdlVisible() {
+    addFilterCodeModalTitle.shouldBe(Condition.visible);
     return this;
   }
 
@@ -138,23 +145,46 @@ public TopicDetails setFilterCodeFieldAddFilterMdl(String filterCode) {
     return this;
   }
 
+  @Step
+  public TopicDetails selectSaveThisFilterCheckboxMdl(boolean select){
+    selectElement(saveThisFilterCheckBoxAddFilterMdl, select);
+    return this;
+  }
+
   @Step
   public boolean isSaveThisFilterCheckBoxSelected() {
     return isSelected(saveThisFilterCheckBoxAddFilterMdl);
   }
 
+  @Step
+  public TopicDetails setDisplayNameFldAddFilterMdl(String displayName) {
+    displayNameInputAddFilterMdl.shouldBe(Condition.enabled).sendKeys(displayName);
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickAddFilterBtnAndCloseMdl(boolean closeModal) {
+    addFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
+    if(closeModal){
+      addFilterCodeModalTitle.shouldBe(Condition.hidden);}
+    else{
+      addFilterCodeModalTitle.shouldBe(Condition.visible);
+    }
+    return this;
+  }
+
   @Step
   public boolean isAddFilterBtnAddFilterMdlEnabled() {
     return isEnabled(addFilterBtnAddFilterMdl);
   }
 
   @Step
-  public String getFilterName() {
-    return $x(filterNameLocator).getText();
+  public boolean isActiveFilterVisible(String activeFilterName) {
+    return isVisible($x(String.format(activeFilterNameLocator, activeFilterName)));
   }
 
   public List<SelenideElement> getAllAddFilterModalVisibleElements() {
-    return Arrays.asList(savedFiltersField, displayNameInputAddFilterMdl, addFilterBtnAddFilterMdl, cancelBtnAddFilterMdl);
+    return Arrays.asList(savedFiltersLink, displayNameInputAddFilterMdl, addFilterBtnAddFilterMdl, cancelBtnAddFilterMdl);
   }
 
   public List<SelenideElement> getAllAddFilterModalEnabledElements() {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 1433f867cc8..802dc11d1db 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.suite.topics;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.DELETE;
 import static com.provectus.kafka.ui.pages.topic.enums.CustomParameterType.COMPRESSION_TYPE;
@@ -8,8 +9,9 @@
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-import static org.apache.commons.lang3.RandomUtils.nextInt;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.apache.commons.lang3.RandomUtils.nextInt;
+import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.base.BaseTest;
@@ -111,20 +113,18 @@ public void createTopic() {
   @Test
   @Order(2)
   void checkAvailableOperations() {
-    String processingTopic = "my_ksql_1ksql_processing_log";
-    String confluentTopic = "_confluent-ksql-my_ksql_1_command_topic";
     naviSideBar
         .openSideMenu(TOPICS);
     topicsList
         .waitUntilScreenReady()
-        .getTopicItem(processingTopic)
+        .getTopicItem("my_ksql_1ksql_processing_log")
         .selectItem(true);
     topicsList
         .getActionButtons()
         .forEach(element -> assertThat(element.is(Condition.enabled))
             .as(element.getSearchCriteria() + " isEnabled()").isTrue());
     topicsList
-        .getTopicItem(confluentTopic)
+        .getTopicItem("_confluent-ksql-my_ksql_1_command_topic")
         .selectItem(true);
     Assertions.assertFalse(topicsList.isCopySelectedTopicBtnEnabled(), "isCopySelectedTopicBtnEnabled()");
   }
@@ -309,15 +309,15 @@ void checkTopicListElements() {
   @Test
   @Order(9)
   void addingNewFilterWithinTopic() {
-    String topicName = "_schemas";
-    String filterName = "123ABC";
+    String filterName = randomAlphanumeric(5);
     naviSideBar
         .openSideMenu(TOPICS);
     topicsList
         .waitUntilScreenReady()
-        .openTopic(topicName);
+        .openTopic("_schemas");
     topicDetails
-        .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
+        .waitUntilScreenReady()
+        .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()
         .waitUntilAddFiltersMdlVisible();
     SoftAssertions softly = new SoftAssertions();
@@ -335,11 +335,41 @@ void addingNewFilterWithinTopic() {
     softly.assertAll();
     topicDetails
         .setFilterCodeFieldAddFilterMdl(filterName);
-    assertThat(topicDetails.isAddFilterBtnAddFilterMdlEnabled()).as("isMessagesAddFilterTabAddFilterBtnEnabled()")
+    assertThat(topicDetails.isAddFilterBtnAddFilterMdlEnabled()).as("isAddFilterBtnAddFilterMdlEnabled()")
+        .isTrue();
+    topicDetails.clickAddFilterBtnAndCloseMdl(true);
+    assertThat(topicDetails.isActiveFilterVisible(filterName)).as("isActiveFilterVisible()")
         .isTrue();
-    topicDetails.clickAddFilterBtnAddFilterMdl();
-    assertThat(topicDetails.getFilterName()).as("isFilterNameVisible(filterName)")
-        .isEqualTo(filterName);
+  }
+
+  @DisplayName("Checking filter saving within Messages/Topic profile/Saved Filters")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(13)
+  @Test
+  @Order(10)
+  void checkFilterSavingWithinSavedFilters() {
+    String displayName = randomAlphanumeric(5);
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic("my_ksql_1ksql_processing_log");
+    topicDetails
+        .waitUntilScreenReady()
+        .openDetailsTab(MESSAGES)
+        .clickMessagesAddFiltersBtn()
+        .waitUntilAddFiltersMdlVisible()
+        .setFilterCodeFieldAddFilterMdl(randomAlphanumeric(4))
+        .selectSaveThisFilterCheckboxMdl(true)
+        .setDisplayNameFldAddFilterMdl(displayName);
+    assertThat(topicDetails.isAddFilterBtnAddFilterMdlEnabled()).as("isAddFilterBtnAddFilterMdlEnabled()")
+        .isTrue();
+    topicDetails
+        .clickAddFilterBtnAndCloseMdl(false)
+        .openSavedFiltersListMdl();
+    assertThat(topicDetails.isFilterVisibleAtSavedFiltersMdl(displayName))
+        .as("isFilterVisibleAtSavedFiltersMdl()").isTrue();
   }
 
   @DisplayName("Checking 'Show Internal Topics' toggle functionality within 'All Topics' page")
@@ -347,7 +377,7 @@ void addingNewFilterWithinTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(11)
   @Test
-  @Order(10)
+  @Order(11)
   void checkShowInternalTopicsButtonFunctionality(){
     naviSideBar
         .openSideMenu(TOPICS);

From 1f44abf1b68b36805a848869073649d45b9b3dda Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Mon, 5 Dec 2022 13:56:54 +0200
Subject: [PATCH 339/734] [e2e]Checking the Brokers overview (#3014)

* [e2e]Checking the Brokers overview

* [e2e]FirstUpdate Checking the Brokers overview

* [e2e]SecondUpdate Checking the Brokers overview

* [e2e]FirstFix Checking the Brokers overview

* [e2e]FirstFix Checking the Brokers overview

(cherry picked from commit 0a24b2d7658a2fd9cfe5cb7af6961edb2c8fe1f6)
---
 .../provectus/kafka/ui/pages/BasePage.java    |   3 +
 .../kafka/ui/pages/brokers/BrokersList.java   | 103 +++++++++++++++++-
 .../kafka/ui/pages/topic/TopicDetails.java    |   2 +-
 .../kafka/ui/pages/topic/TopicsList.java      |   5 +-
 .../kafka/ui/suite/brokers/BrokersTests.java  |  21 +++-
 5 files changed, 122 insertions(+), 12 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index 069b1b41dda..d7b342b0254 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -1,8 +1,10 @@
 package com.provectus.kafka.ui.pages;
 
+import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
 
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.utilities.WebUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +18,7 @@ public abstract class BasePage extends WebUtils {
   protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
   protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
   protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
+  protected ElementsCollection allGridItems = $$x("//tr[@class]");
   protected String summaryCellLocator = "//div[contains(text(),'%s')]";
   protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
   protected String columnHeaderLocator = "//table//tr/th/div[text()='%s']";
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
index 0d9ee67492c..3df1a09304b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -2,10 +2,15 @@
 
 import static com.codeborne.selenide.Selenide.$x;
 
+import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class BrokersList extends BasePage {
 
@@ -19,14 +24,100 @@ public BrokersList waitUntilScreenReady() {
   }
 
   @Step
-  public boolean isBrokerVisible(String brokerId) {
-    tableGrid.shouldBe(Condition.visible);
-    return isVisible(getTableElement(brokerId));
+  public BrokersList openBroker(String brokerId) {
+    getBrokerItem(brokerId).openItem();
+    return this;
+  }
+
+  private List<SelenideElement> getUptimeSummaryCells() {
+    return Stream.of("Broker Count", "Active Controllers", "Version")
+        .map(name -> $x(String.format(summaryCellLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  private List<SelenideElement> getPartitionsSummaryCells() {
+    return Stream.of("Online", "URP", "In Sync Replicas", "Out Of Sync Replicas")
+        .map(name -> $x(String.format(summaryCellLocator, name)))
+        .collect(Collectors.toList());
   }
 
   @Step
-  public BrokersList openBroker(String brokerName) {
-    getTableElement(brokerName).shouldBe(Condition.enabled).click();
-    return this;
+  public List<SelenideElement> getAllVisibleElements() {
+    List<SelenideElement> visibleElements = new ArrayList<>(getUptimeSummaryCells());
+    visibleElements.addAll(getPartitionsSummaryCells());
+    return visibleElements;
+  }
+
+  private List<SelenideElement> getEnabledColumnHeaders() {
+    return Stream.of("Broker ID", "Segment Size", "Segment Count", "Port", "Host")
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  @Step
+  public List<SelenideElement> getAllEnabledElements() {
+    return getEnabledColumnHeaders();
+  }
+
+  private List<BrokersList.BrokerGridItem> initGridItems() {
+    List<BrokersList.BrokerGridItem> gridItemList = new ArrayList<>();
+    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new BrokersList.BrokerGridItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public BrokerGridItem getBrokerItem(String id){
+    return initGridItems().stream()
+        .filter(e ->e.getId().equals(id))
+        .findFirst().orElse(null);
+  }
+
+  @Step
+  public List<BrokerGridItem> getAllBrokers(){
+    return initGridItems();
+  }
+
+  public static class BrokerGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    public BrokerGridItem(SelenideElement element) {
+      this.element = element;
+    }
+
+    private SelenideElement getIdElm() {
+      return element.$x("./td[1]/a");
+    }
+
+    @Step
+    public String getId() {
+      return getIdElm().getText().trim();
+    }
+
+    @Step
+    public void openItem() {
+      getIdElm().click();
+    }
+
+    @Step
+    public int getSegmentSize(){
+      return Integer.parseInt(element.$x("./td[2]").getText().trim());
+    }
+
+    @Step
+    public int getSegmentCount(){
+      return Integer.parseInt(element.$x("./td[3]").getText().trim());
+    }
+
+    @Step
+    public int getPort(){
+      return Integer.parseInt(element.$x("./td[4]").getText().trim());
+    }
+
+    @Step
+    public String getHost(){
+      return element.$x("./td[5]").getText().trim();
+    }
   }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 65e8350f1c9..f7e250f48f0 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -218,7 +218,7 @@ public int getMessageCountAmount() {
 
   private List<TopicDetails.MessageGridItem> initItems() {
     List<TopicDetails.MessageGridItem> gridItemList = new ArrayList<>();
-    messageGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
         .forEach(item -> gridItemList.add(new TopicDetails.MessageGridItem(item)));
     return gridItemList;
   }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 4c88f45aa90..871ecbb752f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -1,11 +1,9 @@
 package com.provectus.kafka.ui.pages.topic;
 
-import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
 
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
@@ -24,7 +22,6 @@ public class TopicsList extends BasePage {
     protected SelenideElement deleteSelectedTopicsBtn = $x("//button[text()='Delete selected topics']");
     protected SelenideElement copySelectedTopicBtn = $x("//button[text()='Copy selected topic']");
     protected SelenideElement purgeMessagesOfSelectedTopicsBtn = $x("//button[text()='Purge messages of selected topics']");
-    protected ElementsCollection topicsGridItems = $$x("//tr[@class]");
 
     @Step
     public TopicsList waitUntilScreenReady() {
@@ -102,7 +99,7 @@ public List<SelenideElement> getAllEnabledElements() {
 
     private List<TopicGridItem> initGridItems() {
       List<TopicGridItem> gridItemList = new ArrayList<>();
-      topicsGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+      allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
           .forEach(item -> gridItemList.add(new TopicGridItem(item)));
       return gridItemList;
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
index 5a493438f98..dcff92bc28c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
@@ -17,6 +17,25 @@ public class BrokersTests extends BaseTest {
   private static final String SUITE_TITLE = "Brokers";
   private static final long SUITE_ID = 1;
 
+  @DisplayName("Checking the Brokers overview")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(1)
+  @Test
+  public void checkBrokersOverview(){
+    naviSideBar
+        .openSideMenu(BROKERS);
+    brokersList
+        .waitUntilScreenReady();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(brokersList.getAllBrokers()).as("getAllBrokers()").size().isGreaterThan(0);
+    brokersList.getAllVisibleElements().forEach(element -> softly.assertThat(element.is(Condition.visible))
+        .as(element.getSearchCriteria() + " isVisible()").isTrue());
+    brokersList.getAllEnabledElements().forEach(element -> softly.assertThat(element.is(Condition.enabled))
+        .as(element.getSearchCriteria() + " isEnabled()").isTrue());
+    softly.assertAll();
+  }
+
   @DisplayName("Checking the existing Broker's profile in a cluster")
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
@@ -27,7 +46,7 @@ public void checkExistingBrokersInCluster(){
         .openSideMenu(BROKERS);
     brokersList
         .waitUntilScreenReady();
-    assertThat(brokersList.isBrokerVisible("1")).as("isBrokerVisible()").isTrue();
+    assertThat(brokersList.getAllBrokers()).as("getAllBrokers()").size().isGreaterThan(0);
     brokersList
         .openBroker("1");
     brokersDetails

From 7170493ad1700235966efe40b4e0661b010bd285 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Tue, 6 Dec 2022 12:13:36 +0200
Subject: [PATCH 340/734] =?UTF-8?q?[e2e]Checking=20'Time=20to=20retain=20d?=
 =?UTF-8?q?ata=20(in=20ms)'=20custom=20value=20with=20editing=E2=80=A6=20(?=
 =?UTF-8?q?#3023)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [e2e]Checking 'Time to retain data (in ms)' custom value with editing Topic's settings

* resolve conversations

* resolve conversation and refactored test addingNewFilterWithinTopic() with randomAlphabetic()

* resolve conversation and refactored test checkFilterSavingWithinSavedFilters() with randomAlphabetic()

(cherry picked from commit d2d039e36c7e78343e4b0d98632a891982660695)
---
 .../kafka/ui/pages/topic/TopicDetails.java    |  6 +++
 .../kafka/ui/suite/topics/TopicsTests.java    | 50 ++++++++++++++++---
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index f7e250f48f0..09904a89c50 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -43,6 +43,7 @@ public class TopicDetails extends BasePage {
   protected String consumerIdLocator = "//a[@title='%s']";
   protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
   protected String activeFilterNameLocator = "//div[@data-testid='activeSmartFilter'][contains(text(),'%s')]";
+  protected String settingsGridValueLocator = "//tbody/tr/td/span[text()='%s']//ancestor::tr/td[2]/span";
 
   @Step
   public TopicDetails waitUntilScreenReady() {
@@ -58,6 +59,11 @@ public TopicDetails openDetailsTab(TopicMenu menu) {
     return this;
   }
 
+  @Step
+  public String getSettingsGridValueByKey(String key){
+    return $x(String.format(settingsGridValueLocator, key)).scrollTo().shouldBe(Condition.visible).getText();
+  }
+
   @Step
   public TopicDetails openDotMenu() {
     clickByJavaScript(dotMenuBtn);
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 802dc11d1db..ce48ce9f373 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -2,6 +2,7 @@
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
 import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
+import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.SETTINGS;
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.DELETE;
 import static com.provectus.kafka.ui.pages.topic.enums.CustomParameterType.COMPRESSION_TYPE;
@@ -256,12 +257,47 @@ void checkTopicCreatePossibility() {
     assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isTrue();
   }
 
+  @DisplayName("Checking 'Time to retain data (in ms)' custom value with editing Topic's settings")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(266)
+  @Test
+  @Order(7)
+  void checkTimeToRetainDataCustomValueWithEditingTopic() {
+    Topic topicToRetainData = new Topic()
+        .setName("topic-to-retain-data-" + randomAlphabetic(5))
+        .setTimeToRetainData("86400000");
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(topicToRetainData.getName());
+    assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()").isEqualTo("604800000");
+    topicCreateEditForm
+        .setTimeToRetainDataInMs(topicToRetainData.getTimeToRetainData())
+        .clickCreateTopicBtn();
+    topicDetails
+        .waitUntilScreenReady()
+        .openDotMenu()
+        .clickEditSettingsMenu();
+    assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()")
+        .isEqualTo(topicToRetainData.getTimeToRetainData());
+    topicDetails
+        .openDetailsTab(SETTINGS);
+    assertThat(topicDetails.getSettingsGridValueByKey("retention.ms")).as("getSettingsGridValueByKey()")
+        .isEqualTo(topicToRetainData.getTimeToRetainData());
+    TOPIC_LIST.add(topicToRetainData);
+  }
+
   @DisplayName("Checking requiredness of Custom parameters within 'Create new Topic'")
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(6)
   @Test
-  @Order(7)
+  @Order(8)
   void checkCustomParametersWithinCreateNewTopic() {
     naviSideBar
         .openSideMenu(TOPICS);
@@ -286,7 +322,7 @@ void checkCustomParametersWithinCreateNewTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(2)
   @Test
-  @Order(8)
+  @Order(9)
   void checkTopicListElements() {
     naviSideBar
         .openSideMenu(TOPICS);
@@ -307,9 +343,9 @@ void checkTopicListElements() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(12)
   @Test
-  @Order(9)
+  @Order(10)
   void addingNewFilterWithinTopic() {
-    String filterName = randomAlphanumeric(5);
+    String filterName = randomAlphabetic(5);
     naviSideBar
         .openSideMenu(TOPICS);
     topicsList
@@ -347,9 +383,9 @@ void addingNewFilterWithinTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(13)
   @Test
-  @Order(10)
+  @Order(11)
   void checkFilterSavingWithinSavedFilters() {
-    String displayName = randomAlphanumeric(5);
+    String displayName = randomAlphabetic(5);
     naviSideBar
         .openSideMenu(TOPICS);
     topicsList
@@ -377,7 +413,7 @@ void checkFilterSavingWithinSavedFilters() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(11)
   @Test
-  @Order(11)
+  @Order(12)
   void checkShowInternalTopicsButtonFunctionality(){
     naviSideBar
         .openSideMenu(TOPICS);

From b5c87e047fa53f9480ad095e0763c9426ef14613 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Tue, 6 Dec 2022 19:17:46 +0200
Subject: [PATCH 341/734] [e2e]Checking applying saved filter within
 Topic/Messages (#3029)

* [e2e]Checking applying saved filter within Topic/Messages

* resolve conversations

* resolve conversation

(cherry picked from commit b6b1b8bda58e1cf9a3478ccbdbcd7f3ec0b89102)
---
 .../kafka/ui/pages/topic/TopicDetails.java    | 24 ++++++++++----
 .../kafka/ui/suite/topics/TopicsTests.java    | 33 +++++++++++++++++--
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 09904a89c50..4a38e7909d7 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -1,20 +1,18 @@
 package com.provectus.kafka.ui.pages.topic;
 
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
-import static org.apache.commons.lang.math.RandomUtils.nextInt;
-
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+import org.openqa.selenium.By;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selenide.*;
+import static org.apache.commons.lang.math.RandomUtils.nextInt;
 
 public class TopicDetails extends BasePage {
 
@@ -30,6 +28,7 @@ public class TopicDetails extends BasePage {
   protected SelenideElement displayNameInputAddFilterMdl = $x("//input[@placeholder='Enter Name']");
   protected SelenideElement cancelBtnAddFilterMdl = $x("//button[text()='Cancel']");
   protected SelenideElement addFilterBtnAddFilterMdl = $x("//button[text()='Add filter']");
+  protected SelenideElement selectFilterBtnAddFilterMdl = $x("//button[text()='Select filter']");
   protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
   protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
   protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
@@ -139,6 +138,19 @@ public boolean isFilterVisibleAtSavedFiltersMdl(String filterName){
     return isVisible($x(String.format(savedFilterNameLocator,filterName)));
   }
 
+  @Step
+  public TopicDetails selectFilterAtSavedFiltersMdl(String filterName){
+    $x(String.format(savedFilterNameLocator, filterName)).shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickSelectFilterBtnAtSavedFiltersMdl(){
+    selectFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
+    addFilterCodeModalTitle.shouldBe(Condition.disappear);
+    return this;
+  }
+
   @Step
   public TopicDetails waitUntilAddFiltersMdlVisible() {
     addFilterCodeModalTitle.shouldBe(Condition.visible);
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index ce48ce9f373..c4bed24a69c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -396,7 +396,7 @@ void checkFilterSavingWithinSavedFilters() {
         .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()
         .waitUntilAddFiltersMdlVisible()
-        .setFilterCodeFieldAddFilterMdl(randomAlphanumeric(4))
+        .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
         .selectSaveThisFilterCheckboxMdl(true)
         .setDisplayNameFldAddFilterMdl(displayName);
     assertThat(topicDetails.isAddFilterBtnAddFilterMdlEnabled()).as("isAddFilterBtnAddFilterMdlEnabled()")
@@ -408,12 +408,41 @@ void checkFilterSavingWithinSavedFilters() {
         .as("isFilterVisibleAtSavedFiltersMdl()").isTrue();
   }
 
+  @DisplayName("Checking applying saved filter within Topic/Messages")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(14)
+  @Test
+  @Order(12)
+  void checkingApplyingSavedFilterWithinTopicMessages() {
+    String displayName = randomAlphabetic(5);
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic("my_ksql_1ksql_processing_log");
+    topicDetails
+        .waitUntilScreenReady()
+        .openDetailsTab(MESSAGES)
+        .clickMessagesAddFiltersBtn()
+        .waitUntilAddFiltersMdlVisible()
+        .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
+        .selectSaveThisFilterCheckboxMdl(true)
+        .setDisplayNameFldAddFilterMdl(displayName)
+        .clickAddFilterBtnAndCloseMdl(false)
+        .openSavedFiltersListMdl()
+        .selectFilterAtSavedFiltersMdl(displayName)
+        .clickSelectFilterBtnAtSavedFiltersMdl();
+    assertThat(topicDetails.isActiveFilterVisible(displayName))
+        .as("isActiveFilterVisible()").isTrue();
+  }
+
   @DisplayName("Checking 'Show Internal Topics' toggle functionality within 'All Topics' page")
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(11)
   @Test
-  @Order(12)
+  @Order(13)
   void checkShowInternalTopicsButtonFunctionality(){
     naviSideBar
         .openSideMenu(TOPICS);

From da456727b705a6a66018591414eb837320b5e760 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Fri, 16 Dec 2022 14:32:20 +0200
Subject: [PATCH 342/734] [e2e] Create method with common steps inside test
 classes (#3045)

* [e2e] Create method with common steps inside test classes. Connectors, Schema, Brokers are done.

* [e2e] Create method with common steps inside test classes. Topics are done.

* [e2e] First Fix. Create method with common steps inside test classes.

* [e2e]TopicName in redirectToConsumerFromTopic changed.

* [e2e]TopicName in redirectToConsumerFromTopic returned.

* [e2e]Broker tests fix.

* [e2e]Topic tests fix. .setNumberOfPartitions(1) and setTimeToRetainDataInMs("604800000") added.

* [e2e]Topic tests fix. verifyVisibleElements() and verifyEnabledElements added.

* [e2e]Topic tests fix. verifyVisibleElements() and verifyEnabledElements added.

* [e2e]Fix with verifyElementsCondition()

* [e2e]Fix SmokeTests.

* [e2e]Fix2 SmokeTests.

(cherry picked from commit c13440b65d602399d27d7110580fe18856ad0603)
---
 .../kafka/ui/pages/brokers/BrokersList.java   |   4 +-
 .../com/provectus/kafka/ui/base/BaseTest.java |  33 +++++
 .../provectus/kafka/ui/suite/SmokeTests.java  |  21 +--
 .../kafka/ui/suite/brokers/BrokersTests.java  |  38 +++--
 .../ui/suite/connectors/ConnectorsTests.java  |  65 ++++-----
 .../kafka/ui/suite/schemas/SchemasTests.java  |  89 +++++-------
 .../ui/suite/topics/TopicMessagesTests.java   |  21 +--
 .../kafka/ui/suite/topics/TopicsTests.java    | 132 ++++--------------
 8 files changed, 148 insertions(+), 255 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
index 3df1a09304b..98ed497e422 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -30,7 +30,7 @@ public BrokersList openBroker(String brokerId) {
   }
 
   private List<SelenideElement> getUptimeSummaryCells() {
-    return Stream.of("Broker Count", "Active Controllers", "Version")
+    return Stream.of("Broker Count", "Active Controller", "Version")
         .map(name -> $x(String.format(summaryCellLocator, name)))
         .collect(Collectors.toList());
   }
@@ -87,7 +87,7 @@ public BrokerGridItem(SelenideElement element) {
     }
 
     private SelenideElement getIdElm() {
-      return element.$x("./td[1]/a");
+      return element.$x("./td[1]/div/a");
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 11cf07c622e..d3a279cc713 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -1,13 +1,17 @@
 package com.provectus.kafka.ui.base;
 
+import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
+import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.TestCaseGenerator;
 import io.github.cdimascio.dotenv.Dotenv;
 import io.qameta.allure.Allure;
+import io.qase.api.annotation.Step;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.*;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.OutputType;
@@ -22,8 +26,10 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 
 import static com.provectus.kafka.ui.base.Setup.*;
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
 import static com.provectus.kafka.ui.settings.Source.BASE_WEB_URL;
 
 @Slf4j
@@ -110,4 +116,31 @@ public void afterMethod() {
             ((TakesScreenshot) webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
     browserClear();
   }
+
+  @Step
+  protected void navigateToTopics(){
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void navigateToTopicsAndOpenDetails(String topicName){
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .openTopic(topicName);
+    topicDetails
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void verifyElementsCondition(List<SelenideElement> elementList, Condition expectedCondition) {
+    SoftAssertions softly = new SoftAssertions();
+    elementList.forEach(element -> softly.assertThat(element.is(expectedCondition))
+        .as(element.getSearchCriteria() + " is " + expectedCondition).isTrue());
+    softly.assertAll();
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java
index ed7d901fe4b..ac5f5c57557 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java
@@ -5,7 +5,8 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
-import org.assertj.core.api.SoftAssertions;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.Test;
 
 public class SmokeTests extends BaseTest {
@@ -14,19 +15,9 @@ public class SmokeTests extends BaseTest {
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(198)
     public void checkBasePageElements(){
-        SoftAssertions softly = new SoftAssertions();
-        topPanel.getAllVisibleElements()
-                .forEach(element ->
-                        softly.assertThat(element.is(Condition.visible))
-                                .as(element.getSearchCriteria() + " isVisible()").isTrue());
-        topPanel.getAllEnabledElements()
-                .forEach(element ->
-                        softly.assertThat(element.is(Condition.enabled))
-                                .as(element.getSearchCriteria() + " isEnabled()").isTrue());
-        naviSideBar.getAllMenuButtons()
-                .forEach(element ->
-                        softly.assertThat(element.is(Condition.enabled) && element.is(Condition.visible))
-                                .as(element.getSearchCriteria() + " isEnabled()").isTrue());
-        softly.assertAll();
+      verifyElementsCondition(Stream.concat(topPanel.getAllVisibleElements().stream(), naviSideBar.getAllMenuButtons().stream())
+          .collect(Collectors.toList()),Condition.visible);
+      verifyElementsCondition(Stream.concat(topPanel.getAllEnabledElements().stream(), naviSideBar.getAllMenuButtons().stream())
+          .collect(Collectors.toList()),Condition.enabled);
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
index dcff92bc28c..0b54a4015ce 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
@@ -8,8 +8,8 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
-import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -23,17 +23,10 @@ public class BrokersTests extends BaseTest {
   @CaseId(1)
   @Test
   public void checkBrokersOverview(){
-    naviSideBar
-        .openSideMenu(BROKERS);
-    brokersList
-        .waitUntilScreenReady();
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(brokersList.getAllBrokers()).as("getAllBrokers()").size().isGreaterThan(0);
-    brokersList.getAllVisibleElements().forEach(element -> softly.assertThat(element.is(Condition.visible))
-        .as(element.getSearchCriteria() + " isVisible()").isTrue());
-    brokersList.getAllEnabledElements().forEach(element -> softly.assertThat(element.is(Condition.enabled))
-        .as(element.getSearchCriteria() + " isEnabled()").isTrue());
-    softly.assertAll();
+    navigateToBrokers();
+    assertThat(brokersList.getAllBrokers()).as("getAllBrokers()").size().isGreaterThan(0);
+    verifyElementsCondition(brokersList.getAllVisibleElements(), Condition.visible);
+    verifyElementsCondition(brokersList.getAllEnabledElements(), Condition.enabled);
   }
 
   @DisplayName("Checking the existing Broker's profile in a cluster")
@@ -42,20 +35,21 @@ public void checkBrokersOverview(){
   @CaseId(85)
   @Test
   public void checkExistingBrokersInCluster(){
-    naviSideBar
-        .openSideMenu(BROKERS);
-    brokersList
-        .waitUntilScreenReady();
+    navigateToBrokers();
     assertThat(brokersList.getAllBrokers()).as("getAllBrokers()").size().isGreaterThan(0);
     brokersList
         .openBroker("1");
     brokersDetails
         .waitUntilScreenReady();
-    SoftAssertions softly = new SoftAssertions();
-    brokersDetails.getAllVisibleElements().forEach(element -> softly.assertThat(element.is(Condition.visible))
-        .as(element.getSearchCriteria() + " isVisible()").isTrue());
-    brokersDetails.getAllEnabledElements().forEach(element -> softly.assertThat(element.is(Condition.enabled))
-        .as(element.getSearchCriteria() + " isEnabled()").isTrue());
-    softly.assertAll();
+    verifyElementsCondition(brokersDetails.getAllVisibleElements(), Condition.visible);
+    verifyElementsCondition(brokersDetails.getAllVisibleElements(), Condition.enabled);
+  }
+
+  @Step
+  private void navigateToBrokers(){
+    naviSideBar
+        .openSideMenu(BROKERS);
+    brokersList
+        .waitUntilScreenReady();
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
index 5e8ed9157ab..980c2d9d48b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
@@ -12,6 +12,7 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
 import java.util.ArrayList;
 import java.util.List;
@@ -68,10 +69,8 @@ public void createConnector() {
         Connector connectorForCreate = new Connector()
                 .setName("sink_postgres_activities_e2e_checks-" + randomAlphabetic(5))
                 .setConfig(getResourceAsString("config_for_create_connector.json"));
-        naviSideBar
-                .openSideMenu(KAFKA_CONNECT);
-        kafkaConnectList
-                .waitUntilScreenReady()
+        navigateToConnectors();
+      kafkaConnectList
                 .clickCreateConnectorBtn();
         connectorCreateForm
                 .waitUntilScreenReady()
@@ -79,18 +78,9 @@ public void createConnector() {
                 .clickSubmitButton();
         connectorDetails
                 .waitUntilScreenReady();
-        naviSideBar
-                .openSideMenu(KAFKA_CONNECT);
-        kafkaConnectList
-                .waitUntilScreenReady()
-                .openConnector(connectorForCreate.getName());
-        connectorDetails
-                .waitUntilScreenReady();
+        navigateToConnectorsAndOpenDetails(connectorForCreate.getName());
         Assertions.assertTrue(connectorDetails.isConnectorHeaderVisible(connectorForCreate.getName()),"isConnectorTitleVisible()");
-        naviSideBar
-                .openSideMenu(KAFKA_CONNECT);
-        kafkaConnectList
-                .waitUntilScreenReady();
+        navigateToConnectors();
         Assertions.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
         CONNECTOR_LIST.add(connectorForCreate);
     }
@@ -101,21 +91,13 @@ public void createConnector() {
     @CaseId(196)
     @Test
     public void updateConnector() {
-        naviSideBar
-                .openSideMenu(KAFKA_CONNECT);
-        kafkaConnectList
-                .waitUntilScreenReady()
-                .openConnector(CONNECTOR_FOR_UPDATE.getName());
-        connectorDetails
-                .waitUntilScreenReady()
+      navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_UPDATE.getName());
+      connectorDetails
                 .openConfigTab()
                 .setConfig(CONNECTOR_FOR_UPDATE.getConfig())
                 .clickSubmitButton();
         Assertions.assertTrue(connectorDetails.isAlertWithMessageVisible(SUCCESS,"Config successfully updated."),"isAlertWithMessageVisible()");
-        naviSideBar
-                .openSideMenu(KAFKA_CONNECT);
-        kafkaConnectList
-                .waitUntilScreenReady();
+        navigateToConnectors();
         Assertions.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()), "isConnectorVisible()");
     }
 
@@ -125,20 +107,12 @@ public void updateConnector() {
     @CaseId(195)
     @Test
     public void deleteConnector() {
-        naviSideBar
-                .openSideMenu(KAFKA_CONNECT);
-        kafkaConnectList
-                .waitUntilScreenReady()
-                .openConnector(CONNECTOR_FOR_DELETE.getName());
-        connectorDetails
-                .waitUntilScreenReady()
+      navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_DELETE.getName());
+      connectorDetails
                 .openDotMenu()
                 .clickDeleteBtn()
                 .clickConfirmBtn();
-        naviSideBar
-                .openSideMenu(KAFKA_CONNECT);
-        kafkaConnectList
-                .waitUntilScreenReady();
+      navigateToConnectors();
         Assertions.assertFalse(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
         CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
     }
@@ -149,4 +123,21 @@ public void afterAll() {
                 apiHelper.deleteConnector(CLUSTER_NAME, CONNECT_NAME, connector.getName()));
         TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
     }
+
+    @Step
+    private void navigateToConnectors(){
+      naviSideBar
+          .openSideMenu(KAFKA_CONNECT);
+      kafkaConnectList
+          .waitUntilScreenReady();
+    }
+
+    @Step
+    private void navigateToConnectorsAndOpenDetails(String connectorName){
+      navigateToConnectors();
+      kafkaConnectList
+          .openConnector(connectorName);
+      connectorDetails
+          .waitUntilScreenReady();
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
index f112c7b5881..92daffd2495 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
@@ -11,6 +11,7 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
 import java.util.ArrayList;
 import java.util.List;
@@ -51,10 +52,8 @@ public void beforeAll() {
     @Order(1)
     void createSchemaAvro() {
         Schema schemaAvro = Schema.createSchemaAvro();
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
+        navigateToSchemaRegistry();
         schemaRegistryList
-                .waitUntilScreenReady()
                 .clickCreateSchema();
         schemaCreateForm
                 .setSubjectName(schemaAvro.getName())
@@ -68,10 +67,7 @@ void createSchemaAvro() {
         softly.assertThat(schemaDetails.getSchemaType()).as("getSchemaType()").isEqualTo(schemaAvro.getType().getValue());
         softly.assertThat(schemaDetails.getCompatibility()).as("getCompatibility()").isEqualTo(CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue());
         softly.assertAll();
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
-        schemaRegistryList
-                .waitUntilScreenReady();
+        navigateToSchemaRegistry();
         Assertions.assertTrue(schemaRegistryList.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaAvro);
     }
@@ -84,20 +80,13 @@ void createSchemaAvro() {
     @Order(2)
     void updateSchemaAvro() {
         AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_for_update.json");
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
-        schemaRegistryList
-                .waitUntilScreenReady()
-                .openSchema(AVRO_API.getName());
+        navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
         schemaDetails
-                .waitUntilScreenReady()
                 .openEditSchema();
         schemaCreateForm
                 .waitUntilScreenReady();
-        SoftAssertions softly = new SoftAssertions();
-        schemaCreateForm.getAllDetailsPageElements()
-            .forEach(element -> softly.assertThat(element.is(Condition.visible))
-                .as(element.getSearchCriteria() + " isVisible").isTrue());
+      verifyElementsCondition(schemaCreateForm.getAllDetailsPageElements(), Condition.visible);
+      SoftAssertions softly = new SoftAssertions();
         softly.assertThat(schemaCreateForm.isSubmitBtnEnabled()).as("isSubmitBtnEnabled()").isFalse();
         softly.assertThat(schemaCreateForm.isSchemaDropDownEnabled()).as("isSchemaDropDownEnabled()").isFalse();
         softly.assertAll();
@@ -117,11 +106,7 @@ void updateSchemaAvro() {
     @Test
     @Order(3)
     void compareVersionsOperation() {
-      naviSideBar
-          .openSideMenu(SCHEMA_REGISTRY);
-      schemaRegistryList
-          .waitUntilScreenReady()
-          .openSchema(AVRO_API.getName());
+      navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
       int latestVersion = schemaDetails
           .waitUntilScreenReady()
           .getLatestVersion();
@@ -144,13 +129,8 @@ void compareVersionsOperation() {
     @Test
     @Order(4)
     void deleteSchemaAvro() {
-      naviSideBar
-          .openSideMenu(SCHEMA_REGISTRY);
-      schemaRegistryList
-          .waitUntilScreenReady()
-          .openSchema(AVRO_API.getName());
+      navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
       schemaDetails
-          .waitUntilScreenReady()
           .removeSchema();
       schemaRegistryList
           .waitUntilScreenReady();
@@ -166,10 +146,8 @@ void deleteSchemaAvro() {
     @Order(5)
     void createSchemaJson() {
         Schema schemaJson = Schema.createSchemaJson();
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
+        navigateToSchemaRegistry();
         schemaRegistryList
-                .waitUntilScreenReady()
                 .clickCreateSchema();
         schemaCreateForm
                 .setSubjectName(schemaJson.getName())
@@ -183,10 +161,7 @@ void createSchemaJson() {
         softly.assertThat(schemaDetails.getSchemaType()).as("getSchemaType()").isEqualTo(schemaJson.getType().getValue());
         softly.assertThat(schemaDetails.getCompatibility()).as("getCompatibility()").isEqualTo(CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue());
         softly.assertAll();
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
-        schemaRegistryList
-                .waitUntilScreenReady();
+        navigateToSchemaRegistry();
         Assertions.assertTrue(schemaRegistryList.isSchemaVisible(JSON_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaJson);
     }
@@ -198,13 +173,8 @@ void createSchemaJson() {
     @Test
     @Order(6)
     void deleteSchemaJson() {
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
-        schemaRegistryList
-                .waitUntilScreenReady()
-                .openSchema(JSON_API.getName());
-        schemaDetails
-                .waitUntilScreenReady()
+      navigateToSchemaRegistryAndOpenDetails(JSON_API.getName());
+      schemaDetails
                 .removeSchema();
         schemaRegistryList
                 .waitUntilScreenReady();
@@ -220,10 +190,8 @@ void deleteSchemaJson() {
     @Order(7)
     void createSchemaProtobuf() {
         Schema schemaProtobuf = Schema.createSchemaProtobuf();
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
+        navigateToSchemaRegistry();
         schemaRegistryList
-                .waitUntilScreenReady()
                 .clickCreateSchema();
         schemaCreateForm
                 .setSubjectName(schemaProtobuf.getName())
@@ -237,10 +205,7 @@ void createSchemaProtobuf() {
         softly.assertThat(schemaDetails.getSchemaType()).as("getSchemaType()").isEqualTo(schemaProtobuf.getType().getValue());
         softly.assertThat(schemaDetails.getCompatibility()).as("getCompatibility()").isEqualTo(CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue());
         softly.assertAll();
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
-        schemaRegistryList
-                .waitUntilScreenReady();
+        navigateToSchemaRegistry();
         Assertions.assertTrue(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()),"isSchemaVisible()");
         SCHEMA_LIST.add(schemaProtobuf);
     }
@@ -252,13 +217,8 @@ void createSchemaProtobuf() {
     @Test
     @Order(8)
     void deleteSchemaProtobuf() {
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
-        schemaRegistryList
-                .waitUntilScreenReady()
-                .openSchema(PROTOBUF_API.getName());
-        schemaDetails
-                .waitUntilScreenReady()
+      navigateToSchemaRegistryAndOpenDetails(PROTOBUF_API.getName());
+      schemaDetails
                 .removeSchema();
         schemaRegistryList
                 .waitUntilScreenReady();
@@ -270,4 +230,21 @@ void deleteSchemaProtobuf() {
     public void afterAll() {
         SCHEMA_LIST.forEach(schema -> apiHelper.deleteSchema(CLUSTER_NAME, schema.getName()));
     }
+
+    @Step
+    private void navigateToSchemaRegistry(){
+      naviSideBar
+          .openSideMenu(SCHEMA_REGISTRY);
+      schemaRegistryList
+          .waitUntilScreenReady();
+    }
+
+    @Step
+    private void navigateToSchemaRegistryAndOpenDetails(String schemaName){
+      navigateToSchemaRegistry();
+      schemaRegistryList
+          .openSchema(schemaName);
+      schemaDetails
+          .waitUntilScreenReady();
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
index f3da20747be..8fbf915d543 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -47,13 +47,8 @@ public void beforeAll() {
   @CaseId(222)
   @Test
   void produceMessage() {
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(TOPIC_FOR_MESSAGES.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
     topicDetails
-        .waitUntilScreenReady()
         .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
         .clickProduceMessageBtn();
     produceMessagePanel
@@ -77,13 +72,8 @@ void produceMessage() {
   @CaseId(19)
   @Test
   void clearMessage() {
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(TOPIC_FOR_MESSAGES.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
     topicDetails
-        .waitUntilScreenReady()
         .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
         .clickProduceMessageBtn();
     int messageAmount = topicDetails.getMessageCountAmount();
@@ -111,13 +101,8 @@ void clearMessage() {
   @Test
   void copyMessageFromTopicProfile() {
     String topicName = "_schemas";
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(topicName);
+    navigateToTopicsAndOpenDetails(topicName);
     topicDetails
-        .waitUntilScreenReady()
         .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
         .getRandomMessage()
         .openDotMenu()
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index c4bed24a69c..03e64e73df1 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -1,6 +1,5 @@
 package com.provectus.kafka.ui.suite.topics;
 
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
 import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
 import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.SETTINGS;
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
@@ -73,10 +72,8 @@ public void beforeAll() {
   @Test
   @Order(1)
   public void createTopic() {
-    naviSideBar
-        .openSideMenu(TOPICS);
+    navigateToTopics();
     topicsList
-        .waitUntilScreenReady()
         .clickAddTopicBtn();
     topicCreateEditForm
         .waitUntilScreenReady()
@@ -84,13 +81,7 @@ public void createTopic() {
         .setNumberOfPartitions(TOPIC_TO_CREATE.getNumberOfPartitions())
         .selectCleanupPolicy(TOPIC_TO_CREATE.getCleanupPolicyValue())
         .clickCreateTopicBtn();
-    topicDetails
-        .waitUntilScreenReady();
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(TOPIC_TO_CREATE.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_TO_CREATE.getName());
     SoftAssertions softly = new SoftAssertions();
     softly.assertThat(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName())).as("isTopicHeaderVisible()")
         .isTrue();
@@ -99,10 +90,7 @@ public void createTopic() {
     softly.assertThat(topicDetails.getPartitions()).as("getPartitions()")
         .isEqualTo(TOPIC_TO_CREATE.getNumberOfPartitions());
     softly.assertAll();
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady();
+    navigateToTopics();
     Assertions.assertTrue(topicsList.isTopicVisible(TOPIC_TO_CREATE.getName()), "isTopicVisible");
     TOPIC_LIST.add(TOPIC_TO_CREATE);
   }
@@ -114,16 +102,11 @@ public void createTopic() {
   @Test
   @Order(2)
   void checkAvailableOperations() {
-    naviSideBar
-        .openSideMenu(TOPICS);
+    navigateToTopics();
     topicsList
-        .waitUntilScreenReady()
         .getTopicItem("my_ksql_1ksql_processing_log")
         .selectItem(true);
-    topicsList
-        .getActionButtons()
-        .forEach(element -> assertThat(element.is(Condition.enabled))
-            .as(element.getSearchCriteria() + " isEnabled()").isTrue());
+    verifyElementsCondition(topicsList.getActionButtons(),Condition.enabled);
     topicsList
         .getTopicItem("_confluent-ksql-my_ksql_1_command_topic")
         .selectItem(true);
@@ -139,13 +122,8 @@ void checkAvailableOperations() {
   @Test
   @Order(3)
   public void updateTopic() {
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(TOPIC_FOR_UPDATE.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_UPDATE.getName());
     topicDetails
-        .waitUntilScreenReady()
         .openDotMenu()
         .clickEditSettingsMenu();
     topicCreateEditForm
@@ -158,13 +136,8 @@ public void updateTopic() {
         .clickCreateTopicBtn();
     topicDetails
         .waitUntilScreenReady();
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(TOPIC_FOR_UPDATE.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_UPDATE.getName());
     topicDetails
-        .waitUntilScreenReady()
         .openDotMenu()
         .clickEditSettingsMenu();
     SoftAssertions softly = new SoftAssertions();
@@ -186,20 +159,12 @@ public void updateTopic() {
   @Test
   @Order(4)
   public void deleteTopic() {
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(TOPIC_FOR_DELETE.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_DELETE.getName());
     topicDetails
-        .waitUntilScreenReady()
         .openDotMenu()
         .clickDeleteTopicMenu()
         .clickConfirmDeleteBtn();
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady();
+    navigateToTopics();
     Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
     TOPIC_LIST.remove(TOPIC_FOR_DELETE);
   }
@@ -213,13 +178,8 @@ public void deleteTopic() {
   void redirectToConsumerFromTopic() {
     String topicName = "source-activities";
     String consumerGroupId = "connect-sink_postgres_activities";
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(topicName);
+    navigateToTopicsAndOpenDetails(topicName);
     topicDetails
-        .waitUntilScreenReady()
         .openDetailsTab(TopicDetails.TopicMenu.CONSUMERS)
         .openConsumerGroup(consumerGroupId);
     consumersDetails
@@ -237,10 +197,8 @@ void redirectToConsumerFromTopic() {
   @Test
   @Order(6)
   void checkTopicCreatePossibility() {
-    naviSideBar
-        .openSideMenu(TOPICS);
+    navigateToTopics();
     topicsList
-        .waitUntilScreenReady()
         .clickAddTopicBtn();
     topicCreateEditForm
         .waitUntilScreenReady();
@@ -267,14 +225,14 @@ void checkTimeToRetainDataCustomValueWithEditingTopic() {
     Topic topicToRetainData = new Topic()
         .setName("topic-to-retain-data-" + randomAlphabetic(5))
         .setTimeToRetainData("86400000");
-    naviSideBar
-        .openSideMenu(TOPICS);
+    navigateToTopics();
     topicsList
-        .waitUntilScreenReady()
         .clickAddTopicBtn();
     topicCreateEditForm
         .waitUntilScreenReady()
-        .setTopicName(topicToRetainData.getName());
+        .setTopicName(topicToRetainData.getName())
+        .setNumberOfPartitions(1)
+        .setTimeToRetainDataInMs("604800000");
     assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()").isEqualTo("604800000");
     topicCreateEditForm
         .setTimeToRetainDataInMs(topicToRetainData.getTimeToRetainData())
@@ -299,8 +257,7 @@ void checkTimeToRetainDataCustomValueWithEditingTopic() {
   @Test
   @Order(8)
   void checkCustomParametersWithinCreateNewTopic() {
-    naviSideBar
-        .openSideMenu(TOPICS);
+    navigateToTopics();
     topicsList
         .waitUntilScreenReady()
         .clickAddTopicBtn();
@@ -324,18 +281,9 @@ void checkCustomParametersWithinCreateNewTopic() {
   @Test
   @Order(9)
   void checkTopicListElements() {
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady();
-    SoftAssertions softly = new SoftAssertions();
-    topicsList.getAllVisibleElements().forEach(
-        element -> softly.assertThat(element.is(Condition.visible)).as(element.getSearchCriteria() + " isVisible()")
-            .isTrue());
-    topicsList.getAllEnabledElements().forEach(
-        element -> softly.assertThat(element.is(Condition.enabled)).as(element.getSearchCriteria() + " isEnabled()")
-            .isTrue());
-    softly.assertAll();
+    navigateToTopics();
+    verifyElementsCondition(topicsList.getAllVisibleElements(), Condition.visible);
+    verifyElementsCondition(topicsList.getAllEnabledElements(), Condition.enabled);
   }
 
   @DisplayName("Filter adding within Topic")
@@ -346,29 +294,16 @@ void checkTopicListElements() {
   @Order(10)
   void addingNewFilterWithinTopic() {
     String filterName = randomAlphabetic(5);
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic("_schemas");
+    navigateToTopicsAndOpenDetails("_schemas");
     topicDetails
-        .waitUntilScreenReady()
         .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()
         .waitUntilAddFiltersMdlVisible();
-    SoftAssertions softly = new SoftAssertions();
-    topicDetails.getAllAddFilterModalVisibleElements().forEach(element ->
-        softly.assertThat(element.is(Condition.visible))
-            .as(element.getSearchCriteria() + " isVisible()").isTrue());
-    topicDetails.getAllAddFilterModalEnabledElements().forEach(element ->
-        softly.assertThat(element.is(Condition.enabled))
-            .as(element.getSearchCriteria() + " isEnabled()").isTrue());
-    topicDetails.getAllAddFilterModalDisabledElements().forEach(element ->
-        softly.assertThat(element.is(Condition.enabled))
-            .as(element.getSearchCriteria() + " isEnabled()").isFalse());
-    softly.assertThat(topicDetails.isSaveThisFilterCheckBoxSelected()).as("isSaveThisFilterCheckBoxSelected()")
+    verifyElementsCondition(topicDetails.getAllAddFilterModalVisibleElements(), Condition.visible);
+    verifyElementsCondition(topicDetails.getAllAddFilterModalEnabledElements(), Condition.enabled);
+    verifyElementsCondition(topicDetails.getAllAddFilterModalDisabledElements(), Condition.disabled);
+    assertThat(topicDetails.isSaveThisFilterCheckBoxSelected()).as("isSaveThisFilterCheckBoxSelected()")
         .isFalse();
-    softly.assertAll();
     topicDetails
         .setFilterCodeFieldAddFilterMdl(filterName);
     assertThat(topicDetails.isAddFilterBtnAddFilterMdlEnabled()).as("isAddFilterBtnAddFilterMdlEnabled()")
@@ -386,13 +321,8 @@ void addingNewFilterWithinTopic() {
   @Order(11)
   void checkFilterSavingWithinSavedFilters() {
     String displayName = randomAlphabetic(5);
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic("my_ksql_1ksql_processing_log");
+    navigateToTopicsAndOpenDetails("my_ksql_1ksql_processing_log");
     topicDetails
-        .waitUntilScreenReady()
         .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()
         .waitUntilAddFiltersMdlVisible()
@@ -416,13 +346,8 @@ void checkFilterSavingWithinSavedFilters() {
   @Order(12)
   void checkingApplyingSavedFilterWithinTopicMessages() {
     String displayName = randomAlphabetic(5);
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic("my_ksql_1ksql_processing_log");
+    navigateToTopicsAndOpenDetails("my_ksql_1ksql_processing_log");
     topicDetails
-        .waitUntilScreenReady()
         .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()
         .waitUntilAddFiltersMdlVisible()
@@ -444,10 +369,7 @@ void checkingApplyingSavedFilterWithinTopicMessages() {
   @Test
   @Order(13)
   void checkShowInternalTopicsButtonFunctionality(){
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady();
+    navigateToTopics();
     SoftAssertions softly = new SoftAssertions();
     softly.assertThat(topicsList.isShowInternalRadioBtnSelected()).as("isInternalRadioBtnSelected()").isTrue();
     softly.assertThat(topicsList.getInternalTopics()).as("getInternalTopics()").size().isGreaterThan(0);

From 6375cc9afd390fa3574e021927d5866e2372af8b Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Mon, 19 Dec 2022 18:10:29 +0200
Subject: [PATCH 343/734] [e2e]Checking messages filtering by Offset within
 Topic/Messages (#3066)

* Checking messages filtering by Offset within Topic/Messages

* Fix test checkTimeToRetainDataCustomValueWithEditingTopic(), refactored assertions on topicCreateEditForm from "604800000" to ""

* Fix test checkTimeToRetainDataCustomValueWithEditingTopic(),added setNumberOfPartitions as mandatory field

* resolve conversations

* resolve conversations

* resolve conversations

(cherry picked from commit de7f7db26919e7c23d49ea2c3e38f455205dec5e)
---
 .../kafka/ui/pages/topic/TopicDetails.java    | 38 +++++++++++++++++--
 .../ui/suite/topics/TopicMessagesTests.java   | 33 +++++++++++++---
 2 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 4a38e7909d7..6b328ab22e0 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -1,18 +1,20 @@
 package com.provectus.kafka.ui.pages.topic;
 
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+import static org.apache.commons.lang.math.RandomUtils.nextInt;
+
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
-import static com.codeborne.selenide.Selenide.*;
-import static org.apache.commons.lang.math.RandomUtils.nextInt;
+import org.openqa.selenium.By;
 
 public class TopicDetails extends BasePage {
 
@@ -20,6 +22,8 @@ public class TopicDetails extends BasePage {
   protected SelenideElement messageAmountCell = $x("//tbody/tr/td[5]");
   protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
   protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
+  protected SelenideElement seekTypeDdl = $x("//ul[@id='selectSeekType']/li");
+  protected SelenideElement seekTypeField = $x("//label[text()='Seek Type']//..//input");
   protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
   protected SelenideElement savedFiltersLink = $x("//div[text()='Saved Filters']");
   protected SelenideElement addFilterCodeModalTitle = $x("//label[text()='Filter code']");
@@ -38,6 +42,7 @@ public class TopicDetails extends BasePage {
   protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
   protected SelenideElement backToCreateFiltersLink = $x("//div[text()='Back To create filters']");
   protected ElementsCollection messageGridItems = $$x("//tbody//tr");
+  protected String seekFilterDdlLocator = "//ul[@id='selectSeekType']/ul/li[text()='%s']";
   protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
   protected String consumerIdLocator = "//a[@title='%s']";
   protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
@@ -120,6 +125,26 @@ public TopicDetails clickProduceMessageBtn() {
     return this;
   }
 
+  @Step
+  public TopicDetails selectSeekTypeDdlMessagesTab(String seekTypeName){
+    seekTypeDdl.shouldBe(Condition.enabled).click();
+    $x(String.format(seekFilterDdlLocator, seekTypeName)).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicDetails setSeekTypeValueFldMessagesTab(String seekTypeValue){
+    seekTypeField.shouldBe(Condition.enabled).sendKeys(seekTypeValue);
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickSubmitFiltersBtnMessagesTab(){
+    clickByJavaScript(submitBtn);
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
   @Step
   public TopicDetails clickMessagesAddFiltersBtn() {
     addFiltersBtn.shouldBe(Condition.enabled).click();
@@ -248,6 +273,11 @@ public TopicDetails.MessageGridItem getMessage(int offset) {
         .findFirst().orElse(null);
   }
 
+  @Step
+  public List<MessageGridItem> getAllMessages(){
+    return initItems();
+  }
+
   @Step
   public TopicDetails.MessageGridItem getRandomMessage() {
     return getMessage(nextInt(initItems().size() - 1));
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
index 8fbf915d543..67d531c8a67 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.suite.topics;
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
@@ -59,8 +59,10 @@ void produceMessage() {
     topicDetails
         .waitUntilScreenReady();
     SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey()))).withFailMessage("isKeyMessageVisible()").isTrue();
-    softly.assertThat(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim())).withFailMessage("isContentMessageVisible()").isTrue();
+    softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey())))
+        .withFailMessage("isKeyMessageVisible()").isTrue();
+    softly.assertThat(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim()))
+        .withFailMessage("isContentMessageVisible()").isTrue();
     softly.assertAll();
   }
 
@@ -100,8 +102,7 @@ void clearMessage() {
   @CaseId(21)
   @Test
   void copyMessageFromTopicProfile() {
-    String topicName = "_schemas";
-    navigateToTopicsAndOpenDetails(topicName);
+    navigateToTopicsAndOpenDetails("_schemas");
     topicDetails
         .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
         .getRandomMessage()
@@ -111,6 +112,28 @@ void copyMessageFromTopicProfile() {
         "isAlertWithMessageVisible()");
   }
 
+  @Disabled
+  @Issue("https://github.com/provectus/kafka-ui/issues/2856")
+  @DisplayName("Checking messages filtering by Offset within Topic/Messages")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(15)
+  @Test
+  void checkingMessageFilteringByOffset() {
+    String offsetValue = "2";
+    navigateToTopicsAndOpenDetails("_schemas");
+    topicDetails
+        .openDetailsTab(MESSAGES)
+        .selectSeekTypeDdlMessagesTab("Offset")
+        .setSeekTypeValueFldMessagesTab(offsetValue)
+        .clickSubmitFiltersBtnMessagesTab();
+    SoftAssertions softly = new SoftAssertions();
+    topicDetails.getAllMessages()
+        .forEach(messages -> softly.assertThat(messages.getOffset() == Integer.parseInt(offsetValue))
+        .as("getAllMessages()").isTrue());
+    softly.assertAll();
+  }
+
   @AfterAll
   public void afterAll() {
     TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));

From 5fafa05cd0c19ed8ecb2a888f0af6f23c69880e6 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 23 Dec 2022 19:15:58 +0400
Subject: [PATCH 344/734] Release a helm update (#3133)

* release 0.5.0
---
 charts/kafka-ui/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 2ae296b4ee6..1028c0afb12 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.4.6
-appVersion: v0.4.0
+version: 0.5.0
+appVersion: v0.5.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

From c31bc7e3be40db07d7bd30017b08feaed302938f Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 23 Dec 2022 19:18:29 +0400
Subject: [PATCH 345/734] Fix separate env deploy workflow (#3085)

* fix bash

* fix workflow
---
 .../workflows/separate_env_public_create.yml  | 63 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
index eb59e55f7ad..4e99783c270 100644
--- a/.github/workflows/separate_env_public_create.yml
+++ b/.github/workflows/separate_env_public_create.yml
@@ -8,8 +8,69 @@ on:
         default: 'demo'
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: get branch name
+        id: extract_branch
+        run: |
+          tag='${{ github.event.inputs.ENV_NAME }}-$(date '+%F-%H-%M-%S')'
+          echo "tag=${tag}" >> $GITHUB_OUTPUT
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
+      - name: Build
+        id: build
+        run: |
+          ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
+          ./mvnw -B -V -ntp clean package -Pprod -DskipTests
+          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      - name: Configure AWS credentials for Kafka-UI account
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-central-1
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+      - name: Build and push
+        id: docker_build_and_push
+        uses: docker/build-push-action@v3
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: kafka-ui-api
+          push: true
+          tags: 297478128798.dkr.ecr.eu-central-1.amazonaws.com/kafka-ui:${{ steps.extract_branch.outputs.tag }}
+          build-args: |
+            JAR_FILE=kafka-ui-api-${{ steps.build.outputs.version }}.jar
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+    outputs:
+      tag: ${{ steps.extract_branch.outputs.tag }}
+
   separate-env-create:
     runs-on: ubuntu-latest
+    needs: build
     steps:
       - name: clone
         run: |
@@ -18,7 +79,7 @@ jobs:
       - name: separate env create
         run: |
           cd kafka-ui-infra/aws-infrastructure4eks/argocd/scripts
-          bash separate_env_create.sh ${{ github.event.inputs.ENV_NAME }} ${{ secrets.FEATURE_TESTING_UI_PASSWORD }}
+          bash separate_env_create.sh ${{ github.event.inputs.ENV_NAME }} ${{ secrets.FEATURE_TESTING_UI_PASSWORD }} ${{ needs.build.outputs.tag }}
           git config --global user.email "kafka-ui-infra@provectus.com"
           git config --global user.name "kafka-ui-infra"
           git add -A

From aead0e960c60f55ad7ca13285221addb966ed57b Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 23 Dec 2022 19:19:24 +0400
Subject: [PATCH 346/734] Get rid of auto bump of serde api version (#3122)

---
 .github/workflows/release-serde-api.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/release-serde-api.yaml b/.github/workflows/release-serde-api.yaml
index e13fa7a23a0..227dbcec24c 100644
--- a/.github/workflows/release-serde-api.yaml
+++ b/.github/workflows/release-serde-api.yaml
@@ -27,7 +27,4 @@ jobs:
 
       - name: Publish to Maven Central
         run: |
-          MVN_VERSION=$(curl -s https://search.maven.org/solrsearch/select?q=g:"com.provectus"+AND+a:"kafka-ui-serde-api" | grep -o '"latestVersion": *"[^"]*"' | grep -o '"[^"]*"$' | sed 's/"//g')
-          MVN_VERSION=$(echo "$MVN_VERSION" | awk 'BEGIN{FS=OFS="."} {$2+=1} 1')
-          mvn -B -ntp versions:set -DnewVersion=$MVN_VERSION -pl kafka-ui-serde-api
           mvn source:jar  javadoc:jar  package  gpg:sign -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} -Dserver.username=${{ secrets.NEXUS_USERNAME }} -Dserver.password=${{ secrets.NEXUS_PASSWORD }} nexus-staging:deploy   -pl kafka-ui-serde-api  -s settings.xml

From 7ee79c4b002519c9a7e52b5c7a7194c76236a142 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 23 Dec 2022 23:38:49 +0400
Subject: [PATCH 347/734] Fix branch name within env create workflow (#3134)

---
 .github/workflows/separate_env_public_create.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
index 4e99783c270..551001031ca 100644
--- a/.github/workflows/separate_env_public_create.yml
+++ b/.github/workflows/separate_env_public_create.yml
@@ -15,7 +15,7 @@ jobs:
       - name: get branch name
         id: extract_branch
         run: |
-          tag='${{ github.event.inputs.ENV_NAME }}-$(date '+%F-%H-%M-%S')'
+          tag="${{ github.event.inputs.ENV_NAME }}-$(date '+%F-%H-%M-%S')"
           echo "tag=${tag}" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From f4e6afed2b2f996920c9f588275bf5666aecbed8 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Sat, 24 Dec 2022 18:36:25 +0300
Subject: [PATCH 348/734] [Helm] Update spring config location var name (#3139)

* [Helm] Update spring config location var name

* Bump chart version
---
 charts/kafka-ui/Chart.yaml                | 2 +-
 charts/kafka-ui/templates/deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 1028c0afb12..28e1a892aac 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.5.0
+version: 0.5.1
 appVersion: v0.5.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
index 219e9b44061..3e4ac2b4b35 100644
--- a/charts/kafka-ui/templates/deployment.yaml
+++ b/charts/kafka-ui/templates/deployment.yaml
@@ -53,7 +53,7 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
             {{- if or .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
-            - name: SPRING_CONFIG_LOCATION
+            - name: SPRING_CONFIG_ADDITIONAL-LOCATION
               {{- if .Values.yamlApplicationConfig }}
               value: /kafka-ui/config.yml
               {{- else if .Values.yamlApplicationConfigConfigMap }}

From c0598a99ed259082c888d59dd4c39eb16b7c7f94 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Tue, 20 Dec 2022 18:19:31 +0200
Subject: [PATCH 349/734] [e2e] Update case "Checking the information of used
 Broker in a cluster" (#3094)

* [e2e] Update case "Checking the information of used Broker in a cluster"

* [e2e] Update case "Checking the information of used Broker in a cluster"

* [e2e] Update case "Checking the information of used Broker in a cluster"

* [e2e]First Fix Update case "Checking the information of used Broker in a cluster"

* [e2e]Second Fix Update case "Checking the information of used Broker in a cluster"

* [e2e]Third Fix Update case "Checking the information of used Broker in a cluster"

* [e2e]Third Fix Update case "Checking the information of used Broker in a cluster"

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
(cherry picked from commit ca3916aae01494a890ba021535400ff148df0fcb)
---
 .../provectus/kafka/ui/pages/BasePage.java    |  2 +-
 .../pages/brokers/BrokersConfigTabPanel.java  | 40 +++++++++++++++++++
 .../ui/pages/brokers/BrokersDetails.java      | 37 ++++++++++++++++-
 .../kafka/ui/pages/brokers/BrokersList.java   | 10 ++---
 .../com/provectus/kafka/ui/base/Facade.java   |  2 +
 .../kafka/ui/suite/brokers/BrokersTests.java  | 12 +++++-
 6 files changed, 94 insertions(+), 9 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTabPanel.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index d7b342b0254..cf559af1e2c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -21,7 +21,7 @@ public abstract class BasePage extends WebUtils {
   protected ElementsCollection allGridItems = $$x("//tr[@class]");
   protected String summaryCellLocator = "//div[contains(text(),'%s')]";
   protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
-  protected String columnHeaderLocator = "//table//tr/th/div[text()='%s']";
+  protected String columnHeaderLocator = "//table//tr/th//div[text()='%s']";
 
   protected void waitUntilSpinnerDisappear() {
     log.debug("\nwaitUntilSpinnerDisappear");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTabPanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTabPanel.java
new file mode 100644
index 00000000000..b7f1402a57e
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTabPanel.java
@@ -0,0 +1,40 @@
+package com.provectus.kafka.ui.pages.brokers;
+
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class BrokersConfigTabPanel extends BasePage {
+
+  protected List<SelenideElement> editBtn = $$x("//button[@aria-label='editAction']");
+  protected SelenideElement searchByKeyField = $x("//input[@placeholder='Search by Key']");
+
+  @Step
+  public BrokersConfigTabPanel waitUntilScreenReady(){
+    waitUntilSpinnerDisappear();
+    searchByKeyField.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public boolean isSearchByKeyVisible() {
+   return isVisible(searchByKeyField);
+  }
+
+  public List<SelenideElement> getColumnHeaders() {
+    return Stream.of("Key", "Value", "Source")
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  public List<SelenideElement> getEditButtons() {
+    return editBtn;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
index 77fc9e0b41c..4eca65f1f47 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.pages.brokers;
 
+import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
 
 import com.codeborne.selenide.Condition;
@@ -11,11 +12,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.openqa.selenium.By;
 
 public class BrokersDetails extends BasePage {
 
   protected SelenideElement logDirectoriesTab = $x("//a[text()='Log directories']");
   protected SelenideElement metricsTab = $x("//a[text()='Metrics']");
+  protected String brokersTabLocator = "//a[text()='%s']";
 
   @Step
   public BrokersDetails waitUntilScreenReady() {
@@ -24,6 +27,13 @@ public BrokersDetails waitUntilScreenReady() {
     return this;
   }
 
+  @Step
+  public BrokersDetails openDetailsTab(DetailsTab menu) {
+    $(By.linkText(menu.toString())).shouldBe(Condition.enabled).click();
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
   private List<SelenideElement> getVisibleColumnHeaders() {
     return Stream.of("Name", "Topics", "Error", "Partitions")
         .map(name -> $x(String.format(columnHeaderLocator, name)))
@@ -42,15 +52,40 @@ private List<SelenideElement> getVisibleSummaryCells() {
         .collect(Collectors.toList());
   }
 
+  private List<SelenideElement> getDetailsTabs() {
+    return Stream.of(DetailsTab.values())
+        .map(name -> $x(String.format(brokersTabLocator, name)))
+        .collect(Collectors.toList());
+  }
+
   @Step
   public List<SelenideElement> getAllEnabledElements() {
-    return getEnabledColumnHeaders();
+    List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
+    enabledElements.addAll(getDetailsTabs());
+    return enabledElements;
   }
 
   @Step
   public List<SelenideElement> getAllVisibleElements() {
     List<SelenideElement> visibleElements = new ArrayList<>(getVisibleSummaryCells());
     visibleElements.addAll(getVisibleColumnHeaders());
+    visibleElements.addAll(getDetailsTabs());
     return visibleElements;
   }
+
+  public enum DetailsTab {
+    LOG_DIRECTORIES("Log directories"),
+    CONFIGS("Configs"),
+    METRICS("Metrics");
+
+    private final String value;
+
+    DetailsTab(String value) {
+      this.value = value;
+    }
+
+    public String toString() {
+      return value;
+    }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
index 98ed497e422..239a6359343 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -24,7 +24,7 @@ public BrokersList waitUntilScreenReady() {
   }
 
   @Step
-  public BrokersList openBroker(String brokerId) {
+  public BrokersList openBroker(int brokerId) {
     getBrokerItem(brokerId).openItem();
     return this;
   }
@@ -67,9 +67,9 @@ private List<BrokersList.BrokerGridItem> initGridItems() {
   }
 
   @Step
-  public BrokerGridItem getBrokerItem(String id){
+  public BrokerGridItem getBrokerItem(int id){
     return initGridItems().stream()
-        .filter(e ->e.getId().equals(id))
+        .filter(e ->e.getId() == id)
         .findFirst().orElse(null);
   }
 
@@ -91,8 +91,8 @@ private SelenideElement getIdElm() {
     }
 
     @Step
-    public String getId() {
-      return getIdElm().getText().trim();
+    public int getId() {
+      return Integer.parseInt(getIdElm().getText().trim());
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
index 279704b8b95..1e3ea4d630f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -3,6 +3,7 @@
 import com.provectus.kafka.ui.helpers.ApiHelper;
 import com.provectus.kafka.ui.pages.NaviSideBar;
 import com.provectus.kafka.ui.pages.TopPanel;
+import com.provectus.kafka.ui.pages.brokers.BrokersConfigTabPanel;
 import com.provectus.kafka.ui.pages.brokers.BrokersDetails;
 import com.provectus.kafka.ui.pages.brokers.BrokersList;
 import com.provectus.kafka.ui.pages.connector.ConnectorCreateForm;
@@ -36,4 +37,5 @@ public abstract class Facade {
     protected TopPanel topPanel = new TopPanel();
     protected BrokersList brokersList = new BrokersList();
     protected BrokersDetails brokersDetails = new BrokersDetails();
+    protected BrokersConfigTabPanel brokersConfigTabPanel = new BrokersConfigTabPanel();
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
index 0b54a4015ce..2fc2adce35c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.suite.brokers;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.BROKERS;
+import static com.provectus.kafka.ui.pages.brokers.BrokersDetails.DetailsTab.CONFIGS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.codeborne.selenide.Condition;
@@ -38,11 +39,18 @@ public void checkExistingBrokersInCluster(){
     navigateToBrokers();
     assertThat(brokersList.getAllBrokers()).as("getAllBrokers()").size().isGreaterThan(0);
     brokersList
-        .openBroker("1");
+        .openBroker(1);
     brokersDetails
         .waitUntilScreenReady();
     verifyElementsCondition(brokersDetails.getAllVisibleElements(), Condition.visible);
-    verifyElementsCondition(brokersDetails.getAllVisibleElements(), Condition.enabled);
+    verifyElementsCondition(brokersDetails.getAllEnabledElements(), Condition.enabled);
+    brokersDetails
+        .openDetailsTab(CONFIGS);
+    brokersConfigTabPanel
+        .waitUntilScreenReady();
+    verifyElementsCondition(brokersConfigTabPanel.getColumnHeaders(), Condition.visible);
+    verifyElementsCondition(brokersConfigTabPanel.getEditButtons(), Condition.enabled);
+    assertThat(brokersConfigTabPanel.isSearchByKeyVisible()).as("isSearchByKeyVisible()").isTrue();
   }
 
   @Step

From 49daf27898c848c8d2fee380f60d1243a4286ba3 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Thu, 22 Dec 2022 18:05:38 +0200
Subject: [PATCH 350/734] [e2e] Checking Topics settings to make sure
 retention.bytes is right according to Max size on disk in GB selected value
 (#3118)

* [e2e] Checking Topics settings to make sure retention.bytes is right according to Max size on disk in GB selected value. Created new class - SettingsPanel and inner class in SettingsPanel. Add new test to Topicstests.

* First Update. Checking Topics settings to make sure retention.bytes is right according to Max size on disk in GB selected value

* Second Update. Checking Topics settings to make sure retention.bytes is right according to Max size on disk in GB selected value

* Second Update. Checking Topics settings to make sure retention.bytes is right according to Max size on disk in GB selected value

* [e2e] Final Fix. add topicSettingsTab.waitUntilScreenReady();

(cherry picked from commit a9d7d6c5153ea63999f69f0b0433362a0b5a9c74)
---
 ...figTabPanel.java => BrokersConfigTab.java} |  4 +-
 .../ui/pages/topic/TopicSettingsTab.java      | 65 ++++++++++++++
 .../com/provectus/kafka/ui/base/Facade.java   |  6 +-
 .../kafka/ui/suite/brokers/BrokersTests.java  |  8 +-
 .../kafka/ui/suite/topics/TopicsTests.java    | 84 ++++++++++++++++---
 5 files changed, 146 insertions(+), 21 deletions(-)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/{BrokersConfigTabPanel.java => BrokersConfigTab.java} (90%)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicSettingsTab.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTabPanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
similarity index 90%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTabPanel.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
index b7f1402a57e..70bba6047a8 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTabPanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
@@ -11,13 +11,13 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public class BrokersConfigTabPanel extends BasePage {
+public class BrokersConfigTab extends BasePage {
 
   protected List<SelenideElement> editBtn = $$x("//button[@aria-label='editAction']");
   protected SelenideElement searchByKeyField = $x("//input[@placeholder='Search by Key']");
 
   @Step
-  public BrokersConfigTabPanel waitUntilScreenReady(){
+  public BrokersConfigTab waitUntilScreenReady(){
     waitUntilSpinnerDisappear();
     searchByKeyField.shouldBe(Condition.visible);
     return this;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicSettingsTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicSettingsTab.java
new file mode 100644
index 00000000000..4bf78fb2af0
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicSettingsTab.java
@@ -0,0 +1,65 @@
+package com.provectus.kafka.ui.pages.topic;
+
+import static com.codeborne.selenide.Selenide.$x;
+
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TopicSettingsTab extends BasePage {
+
+  protected SelenideElement defaultValueColumnHeaderLocator = $x("//div[text() = 'Default Value']");
+
+  @Step
+  public TopicSettingsTab waitUntilScreenReady(){
+    waitUntilSpinnerDisappear();
+    defaultValueColumnHeaderLocator.shouldBe(Condition.visible);
+    return this;
+  }
+
+  private List<SettingsGridItem> initGridItems() {
+    List<SettingsGridItem> gridItemList = new ArrayList<>();
+    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new SettingsGridItem(item)));
+    return gridItemList;
+  }
+
+  private TopicSettingsTab.SettingsGridItem getItemByKey(String key){
+    return initGridItems().stream()
+        .filter(e ->e.getKey().equals(key))
+        .findFirst().orElse(null);
+  }
+
+  @Step
+  public String getValueByKey(String key){
+    return getItemByKey(key).getValue();
+  }
+
+  public static class SettingsGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    public SettingsGridItem(SelenideElement element) {
+      this.element = element;
+    }
+
+    @Step
+    public String getKey(){
+      return element.$x("./td[1]/span").getText().trim();
+    }
+
+    @Step
+    public String getValue(){
+      return element.$x("./td[2]/span").getText().trim();
+    }
+
+    @Step
+    public String getDefaultValue() {
+      return element.$x("./td[3]/span").getText().trim();
+    }
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
index 1e3ea4d630f..c39df88dc25 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -3,7 +3,7 @@
 import com.provectus.kafka.ui.helpers.ApiHelper;
 import com.provectus.kafka.ui.pages.NaviSideBar;
 import com.provectus.kafka.ui.pages.TopPanel;
-import com.provectus.kafka.ui.pages.brokers.BrokersConfigTabPanel;
+import com.provectus.kafka.ui.pages.brokers.BrokersConfigTab;
 import com.provectus.kafka.ui.pages.brokers.BrokersDetails;
 import com.provectus.kafka.ui.pages.brokers.BrokersList;
 import com.provectus.kafka.ui.pages.connector.ConnectorCreateForm;
@@ -15,6 +15,7 @@
 import com.provectus.kafka.ui.pages.schema.SchemaDetails;
 import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
 import com.provectus.kafka.ui.pages.topic.ProduceMessagePanel;
+import com.provectus.kafka.ui.pages.topic.TopicSettingsTab;
 import com.provectus.kafka.ui.pages.topic.TopicCreateEditForm;
 import com.provectus.kafka.ui.pages.topic.TopicDetails;
 import com.provectus.kafka.ui.pages.topic.TopicsList;
@@ -37,5 +38,6 @@ public abstract class Facade {
     protected TopPanel topPanel = new TopPanel();
     protected BrokersList brokersList = new BrokersList();
     protected BrokersDetails brokersDetails = new BrokersDetails();
-    protected BrokersConfigTabPanel brokersConfigTabPanel = new BrokersConfigTabPanel();
+    protected BrokersConfigTab brokersConfigTab = new BrokersConfigTab();
+    protected TopicSettingsTab topicSettingsTab = new TopicSettingsTab();
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
index 2fc2adce35c..0cba13812c3 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
@@ -46,11 +46,11 @@ public void checkExistingBrokersInCluster(){
     verifyElementsCondition(brokersDetails.getAllEnabledElements(), Condition.enabled);
     brokersDetails
         .openDetailsTab(CONFIGS);
-    brokersConfigTabPanel
+    brokersConfigTab
         .waitUntilScreenReady();
-    verifyElementsCondition(brokersConfigTabPanel.getColumnHeaders(), Condition.visible);
-    verifyElementsCondition(brokersConfigTabPanel.getEditButtons(), Condition.enabled);
-    assertThat(brokersConfigTabPanel.isSearchByKeyVisible()).as("isSearchByKeyVisible()").isTrue();
+    verifyElementsCondition(brokersConfigTab.getColumnHeaders(), Condition.visible);
+    verifyElementsCondition(brokersConfigTab.getEditButtons(), Condition.enabled);
+    assertThat(brokersConfigTab.isSearchByKeyVisible()).as("isSearchByKeyVisible()").isTrue();
   }
 
   @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 03e64e73df1..8353b8a2ffd 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -5,6 +5,8 @@
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.DELETE;
 import static com.provectus.kafka.ui.pages.topic.enums.CustomParameterType.COMPRESSION_TYPE;
+import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.NOT_SET;
+import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_1_GB;
 import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_20_GB;
 import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
@@ -47,21 +49,26 @@ public class TopicsTests extends BaseTest {
       .setCustomParameterType(COMPRESSION_TYPE)
       .setCustomParameterValue("producer")
       .setCleanupPolicyValue(DELETE);
-  private static final Topic TOPIC_FOR_UPDATE = new Topic()
+  private static final Topic TOPIC_TO_UPDATE = new Topic()
       .setName("topic-to-update-" + randomAlphabetic(5))
+      .setNumberOfPartitions(1)
       .setCleanupPolicyValue(COMPACT)
       .setTimeToRetainData("604800001")
       .setMaxSizeOnDisk(SIZE_20_GB)
       .setMaxMessageBytes("1000020")
       .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
       .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
-
+  private static final Topic TOPIC_TO_CHECK_SETTINGS = new Topic()
+      .setName("new-topic-" + randomAlphabetic(5))
+      .setNumberOfPartitions(1)
+      .setMaxMessageBytes("1000012")
+      .setMaxSizeOnDisk(NOT_SET);
   private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete-" + randomAlphabetic(5));
   private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
   @BeforeAll
   public void beforeAll() {
-    TOPIC_LIST.addAll(List.of(TOPIC_FOR_UPDATE, TOPIC_FOR_DELETE));
+    TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE, TOPIC_FOR_DELETE));
     TOPIC_LIST.forEach(topic -> apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
   }
 
@@ -122,33 +129,33 @@ void checkAvailableOperations() {
   @Test
   @Order(3)
   public void updateTopic() {
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_UPDATE.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE.getName());
     topicDetails
         .openDotMenu()
         .clickEditSettingsMenu();
     topicCreateEditForm
         .waitUntilScreenReady()
-        .selectCleanupPolicy((TOPIC_FOR_UPDATE.getCleanupPolicyValue()))
+        .selectCleanupPolicy((TOPIC_TO_UPDATE.getCleanupPolicyValue()))
         .setMinInsyncReplicas(10)
-        .setTimeToRetainDataInMs(TOPIC_FOR_UPDATE.getTimeToRetainData())
-        .setMaxSizeOnDiskInGB(TOPIC_FOR_UPDATE.getMaxSizeOnDisk())
-        .setMaxMessageBytes(TOPIC_FOR_UPDATE.getMaxMessageBytes())
+        .setTimeToRetainDataInMs(TOPIC_TO_UPDATE.getTimeToRetainData())
+        .setMaxSizeOnDiskInGB(TOPIC_TO_UPDATE.getMaxSizeOnDisk())
+        .setMaxMessageBytes(TOPIC_TO_UPDATE.getMaxMessageBytes())
         .clickCreateTopicBtn();
     topicDetails
         .waitUntilScreenReady();
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_UPDATE.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE.getName());
     topicDetails
         .openDotMenu()
         .clickEditSettingsMenu();
     SoftAssertions softly = new SoftAssertions();
     softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()")
-        .isEqualTo(TOPIC_FOR_UPDATE.getCleanupPolicyValue().getVisibleText());
+        .isEqualTo(TOPIC_TO_UPDATE.getCleanupPolicyValue().getVisibleText());
     softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()")
-        .isEqualTo(TOPIC_FOR_UPDATE.getTimeToRetainData());
+        .isEqualTo(TOPIC_TO_UPDATE.getTimeToRetainData());
     softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()")
-        .isEqualTo(TOPIC_FOR_UPDATE.getMaxSizeOnDisk().getVisibleText());
+        .isEqualTo(TOPIC_TO_UPDATE.getMaxSizeOnDisk().getVisibleText());
     softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()")
-        .isEqualTo(TOPIC_FOR_UPDATE.getMaxMessageBytes());
+        .isEqualTo(TOPIC_TO_UPDATE.getMaxMessageBytes());
     softly.assertAll();
   }
 
@@ -382,6 +389,57 @@ void checkShowInternalTopicsButtonFunctionality(){
     softly.assertAll();
   }
 
+  @DisplayName("Checking Topics settings to make sure retention.bytes is right according to Max size on disk in GB selected value")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(56)
+  @Test
+  void checkRetentionBytesAccordingToMaxSizeOnDisk(){
+    navigateToTopics();
+    topicsList
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(TOPIC_TO_CHECK_SETTINGS.getName())
+        .setNumberOfPartitions(TOPIC_TO_CHECK_SETTINGS.getNumberOfPartitions())
+        .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
+        .clickCreateTopicBtn();
+    topicDetails
+        .waitUntilScreenReady();
+    TOPIC_LIST.add(TOPIC_TO_CHECK_SETTINGS);
+    topicDetails
+        .openDetailsTab(SETTINGS);
+    topicSettingsTab
+        .waitUntilScreenReady();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicSettingsTab.getValueByKey("retention.bytes"))
+        .as("getValueOfKey(retention.bytes)").isEqualTo(TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue());
+    softly.assertThat(topicSettingsTab.getValueByKey("max.message.bytes"))
+        .as("getValueOfKey(max.message.bytes)").isEqualTo(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes());
+    softly.assertAll();
+    TOPIC_TO_CHECK_SETTINGS
+        .setMaxSizeOnDisk(SIZE_1_GB)
+        .setMaxMessageBytes("1000056");
+    topicDetails
+        .openDotMenu()
+        .clickEditSettingsMenu();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setMaxSizeOnDiskInGB(TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk())
+        .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
+        .clickCreateTopicBtn();
+    topicDetails
+        .waitUntilScreenReady()
+        .openDetailsTab(SETTINGS);
+    topicSettingsTab
+        .waitUntilScreenReady();
+    softly.assertThat(topicSettingsTab.getValueByKey("retention.bytes"))
+        .as("getValueOfKey(retention.bytes)").isEqualTo(TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue());
+    softly.assertThat(topicSettingsTab.getValueByKey("max.message.bytes"))
+        .as("getValueOfKey(max.message.bytes)").isEqualTo(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes());
+    softly.assertAll();
+  }
+
   @AfterAll
   public void afterAll() {
     TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));

From 5f4bb43afd3a516176db481944fb5adb3178a40e Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Fri, 23 Dec 2022 15:48:05 +0200
Subject: [PATCH 351/734] [e2e] TopicTests.recreateTopicFromTopicProfile :
 Recreate topic from topic profile (#3125)

* [e2e] TopicTests.recreateTopicFromTopicProfile : Recreate topic from topic profile

* [e2e] TopicTests.recreateTopicFromTopicProfile : Recreate topic from topic profile

* [e2e] Final Fix. add topicSettingsTab.waitUntilScreenReady();

* [e2e] Final Fix.

* [e2e] Final Fix 2.

(cherry picked from commit 22439f30e803f4090489ded783055c0728bff6a2)
---
 .../kafka/ui/pages/topic/TopicDetails.java    | 15 +++++++-
 .../kafka/ui/suite/topics/TopicsTests.java    | 34 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 6b328ab22e0..70d5934d048 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -19,6 +19,7 @@
 public class TopicDetails extends BasePage {
 
   protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
+  protected SelenideElement recreateTopicBtn = $x("//div[text()='Recreate Topic']");
   protected SelenideElement messageAmountCell = $x("//tbody/tr/td[5]");
   protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
   protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
@@ -41,6 +42,7 @@ public class TopicDetails extends BasePage {
   protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
   protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
   protected SelenideElement backToCreateFiltersLink = $x("//div[text()='Back To create filters']");
+  protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
   protected ElementsCollection messageGridItems = $$x("//tbody//tr");
   protected String seekFilterDdlLocator = "//ul[@id='selectSeekType']/ul/li[text()='%s']";
   protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
@@ -85,12 +87,23 @@ public TopicDetails clickEditSettingsMenu() {
     return this;
   }
 
+  @Step
+  public boolean isConfirmationMdlVisible(){
+    return isVisible(confirmationMdl);
+  }
+
   @Step
   public TopicDetails clickClearMessagesMenu() {
     clearMessagesBtn.shouldBe(Condition.visible).click();
     return this;
   }
 
+  @Step
+  public TopicDetails clickRecreateTopicMenu(){
+    recreateTopicBtn.shouldBe(Condition.visible).click();
+    return this;
+  }
+
   @Step
   public String getCleanUpPolicy() {
     return cleanUpPolicyField.getText();
@@ -113,7 +126,7 @@ public TopicDetails clickDeleteTopicMenu() {
   }
 
   @Step
-  public TopicDetails clickConfirmDeleteBtn() {
+  public TopicDetails clickConfirmBtnMdl() {
     confirmBtn.shouldBe(Condition.enabled).click();
     confirmBtn.shouldBe(Condition.disappear);
     return this;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 8353b8a2ffd..150af44e7a1 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.suite.topics;
 
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
 import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
 import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.SETTINGS;
 import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
@@ -170,7 +171,7 @@ public void deleteTopic() {
     topicDetails
         .openDotMenu()
         .clickDeleteTopicMenu()
-        .clickConfirmDeleteBtn();
+        .clickConfirmBtnMdl();
     navigateToTopics();
     Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
     TOPIC_LIST.remove(TOPIC_FOR_DELETE);
@@ -440,6 +441,37 @@ void checkRetentionBytesAccordingToMaxSizeOnDisk(){
     softly.assertAll();
   }
 
+  @DisplayName("TopicTests.recreateTopicFromTopicProfile : Recreate topic from topic profile")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(247)
+  @Test
+  void recreateTopicFromTopicProfile(){
+    Topic topicToRecreate = new Topic()
+        .setName("topic-to-recreate-" + randomAlphabetic(5))
+        .setNumberOfPartitions(1);
+    navigateToTopics();
+    topicsList
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(topicToRecreate.getName())
+        .setNumberOfPartitions(topicToRecreate.getNumberOfPartitions())
+        .clickCreateTopicBtn();
+    topicDetails
+        .waitUntilScreenReady();
+    TOPIC_LIST.add(topicToRecreate);
+    topicDetails
+        .openDotMenu()
+        .clickRecreateTopicMenu();
+    assertThat(topicDetails.isConfirmationMdlVisible()).as("isConfirmationMdlVisible()").isTrue();
+    topicDetails
+        .clickConfirmBtnMdl();
+    assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS,
+        String.format("Topic %s successfully recreated!", topicToRecreate.getName())))
+        .as("isAlertWithMessageVisible()").isTrue();
+  }
+
   @AfterAll
   public void afterAll() {
     TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));

From 8b126d843ee17dc2b79590d951d9b28e8e85f3ca Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 28 Dec 2022 13:34:35 +0300
Subject: [PATCH 352/734] Fix google oauth with rbac (#3155)

---
 .../ui/config/auth/OAuthPropertiesConverter.java      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
index 8fffbfb6997..c3d20664914 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
@@ -8,12 +8,14 @@
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
+import org.springframework.security.config.oauth2.client.CommonOAuth2Provider;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class OAuthPropertiesConverter {
 
   private static final String TYPE = "type";
   private static final String GOOGLE = "google";
+  public static final String DUMMY = "dummy";
 
   public static OAuth2ClientProperties convertProperties(final OAuthProperties properties) {
     final var result = new OAuth2ClientProperties();
@@ -57,7 +59,14 @@ private static void applyGoogleTransformations(OAuth2Provider provider) {
       return;
     }
 
-    final String newUri = provider.getAuthorizationUri() + "?hd=" + allowedDomain;
+    String authorizationUri = CommonOAuth2Provider.GOOGLE
+        .getBuilder(DUMMY)
+        .clientId(DUMMY)
+        .build()
+        .getProviderDetails()
+        .getAuthorizationUri();
+
+    final String newUri = authorizationUri + "?hd=" + allowedDomain;
     provider.setAuthorizationUri(newUri);
   }
 

From b3b0a1286dc60a9f6b0175bb330eb6cb1cac8c5d Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Wed, 28 Dec 2022 15:19:49 +0400
Subject: [PATCH 353/734] Post allure reports to s3 instead of a branch (#3158)

* add s3

* fix yaml
---
 .github/workflows/e2e-checks.yaml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 117e9993925..791cece6de2 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -52,14 +52,13 @@ jobs:
           gh_pages: allure-results
           allure_report: allure-report
           subfolder: allure-results
-      - name: Deploy allure report to Github Pages
-        if: always()
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: allure-history
-          publish_branch: gh-pages
-          destination_dir: ./allure
+      - uses: jakejarvis/s3-sync-action@master
+        env:
+          AWS_S3_BUCKET: 'kafkaui-allure-reports'
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: 'eu-central-1'
+          SOURCE_DIR: 'allure-history/allure-results'
       - name: Post the link to allure report
         if: always()
         uses: Sibz/github-status-action@v1.1.6
@@ -68,7 +67,7 @@ jobs:
           context: "Test report"
           state: "success"
           sha: ${{ github.event.pull_request.head.sha  || github.sha }}
-          target_url: https://${{ github.repository_owner }}.github.io/kafka-ui/allure/allure-results/${{ github.run_number }}
+          target_url: https://kafkaui-allure-reports.s3.eu-central-1.amazonaws.com/${{ github.run_number }}/index.html
       - name: Dump docker logs on failure
         if: failure()
         uses: jwalton/gh-docker-logs@v2.2.1

From f11ce312d1c9eb611775779cdcfb27e63115fc65 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Wed, 28 Dec 2022 17:05:50 +0400
Subject: [PATCH 354/734] [e2e] [infra] Fix allure reports s3 upload condition
 (#3159)

* Update e2e-checks.yaml

* Update e2e-checks.yaml
---
 .github/workflows/e2e-checks.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 791cece6de2..422eca59567 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -53,6 +53,7 @@ jobs:
           allure_report: allure-report
           subfolder: allure-results
       - uses: jakejarvis/s3-sync-action@master
+        if: always()
         env:
           AWS_S3_BUCKET: 'kafkaui-allure-reports'
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -67,7 +68,7 @@ jobs:
           context: "Test report"
           state: "success"
           sha: ${{ github.event.pull_request.head.sha  || github.sha }}
-          target_url: https://kafkaui-allure-reports.s3.eu-central-1.amazonaws.com/${{ github.run_number }}/index.html
+          target_url: http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com/${{ github.run_number }}
       - name: Dump docker logs on failure
         if: failure()
         uses: jwalton/gh-docker-logs@v2.2.1

From 16750bd899443dd696e03e2c2254fe2973d0eb20 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Wed, 28 Dec 2022 16:39:52 +0200
Subject: [PATCH 355/734] [e2e] Update BaseTest with removing redundant data
 (#3160)

* test commit

* fix BaseTest

* upd global

* upd global

* upd global
---
 kafka-ui-e2e-checks/.env.example              |  3 -
 .../provectus/kafka/ui/pages/NaviSideBar.java |  2 +-
 .../ApiService.java}                          |  8 +-
 .../settings/{Source.java => BaseSource.java} |  2 +-
 .../com/provectus/kafka/ui/base/BaseTest.java | 82 +++++++------------
 .../com/provectus/kafka/ui/base/Config.java   | 19 -----
 .../com/provectus/kafka/ui/base/Facade.java   |  4 +-
 .../com/provectus/kafka/ui/base/Setup.java    | 53 ------------
 .../ui/suite/connectors/ConnectorsTests.java  | 12 +--
 .../kafka/ui/suite/schemas/SchemasTests.java  |  6 +-
 .../ui/suite/topics/TopicMessagesTests.java   |  6 +-
 .../kafka/ui/suite/topics/TopicsTests.java    |  7 +-
 12 files changed, 53 insertions(+), 151 deletions(-)
 delete mode 100644 kafka-ui-e2e-checks/.env.example
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/{helpers/ApiHelper.java => services/ApiService.java} (96%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/{Source.java => BaseSource.java} (89%)
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Config.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java

diff --git a/kafka-ui-e2e-checks/.env.example b/kafka-ui-e2e-checks/.env.example
deleted file mode 100644
index de43f7b2dc0..00000000000
--- a/kafka-ui-e2e-checks/.env.example
+++ /dev/null
@@ -1,3 +0,0 @@
-USE_LOCAL_BROWSER=true
-SHOULD_START_SELENOID=false
-TURN_OFF_SCREENSHOTS=true
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
index 4a3b8f828de..b70bf7755aa 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.pages;
 
 import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
similarity index 96%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index b9f5506e6e4..ec0bbe3bfb5 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/helpers/ApiHelper.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.helpers;
+package com.provectus.kafka.ui.services;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.provectus.kafka.ui.api.ApiClient;
@@ -13,7 +13,7 @@
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.settings.Source;
+import com.provectus.kafka.ui.settings.BaseSource;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -26,11 +26,11 @@
 
 
 @Slf4j
-public class ApiHelper {
+public class ApiService {
 
     int partitions = 1;
     int replicationFactor = 1;
-    String baseURL = Source.BASE_API_URL;
+    String baseURL = BaseSource.BASE_API_URL;
 
 
     @SneakyThrows
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
similarity index 89%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
index 0cbd7ae7c39..c0de5629318 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/Source.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
@@ -1,6 +1,6 @@
 package com.provectus.kafka.ui.settings;
 
-public abstract class Source {
+public abstract class BaseSource {
 
   public static String BASE_API_URL = System.getProperty("BASE_URL", "http://localhost:8080");
   public static String BASE_WEB_URL = System.getProperty("BASE_DOCKER_URL", "http://host.testcontainers.internal:8080");
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index d3a279cc713..3a48f9f962d 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -1,18 +1,27 @@
 package com.provectus.kafka.ui.base;
 
+import static com.codeborne.selenide.Selenide.clearBrowserCookies;
+import static com.codeborne.selenide.Selenide.clearBrowserLocalStorage;
+import static com.codeborne.selenide.Selenide.refresh;
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.settings.BaseSource.BASE_WEB_URL;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.TestCaseGenerator;
-import io.github.cdimascio.dotenv.Dotenv;
 import io.qameta.allure.Allure;
 import io.qase.api.annotation.Step;
+import java.io.ByteArrayInputStream;
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
 import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayNameGeneration;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.TakesScreenshot;
@@ -23,15 +32,6 @@
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.utility.DockerImageName;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import static com.provectus.kafka.ui.base.Setup.*;
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
-import static com.provectus.kafka.ui.settings.Source.BASE_WEB_URL;
-
 @Slf4j
 @DisplayNameGeneration(DisplayNameGenerator.class)
 public class BaseTest extends Facade {
@@ -44,22 +44,12 @@ private static boolean isARM64() {
     return System.getProperty("os.arch").equals("aarch64");
   }
 
-  @BeforeEach
-  public void setWebDriver() {
-    RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
-    WebDriverRunner.setWebDriver(remoteWebDriver);
-    remoteWebDriver.manage().window().setSize(new Dimension(1440, 1024));
-    Selenide.open(BASE_WEB_URL);
-    naviSideBar.waitUntilScreenReady();
-  }
-
   @BeforeAll
   public static void start() {
     DockerImageName image = isARM64()
         ? DockerImageName.parse(SELENIARM_STANDALONE_CHROMIUM).asCompatibleSubstituteFor(SELENIUM_IMAGE_NAME)
         : DockerImageName.parse(SELENIUM_IMAGE_NAME);
     log.info("Using [{}] as image name for chrome", image.getUnversionedPart());
-
     webDriverContainer = new BrowserWebDriverContainer<>(image)
         .withEnv("JAVA_OPTS", "-Dwebdriver.chrome.whitelistedIps=")
         .withCapabilities(new ChromeOptions()
@@ -68,7 +58,7 @@ public static void start() {
             .addArguments("--no-sandbox")
             .addArguments("--verbose")
         )
-            .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
+        .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
     try {
       Testcontainers.exposeHostPorts(8080);
       log.info("Starting browser container");
@@ -78,29 +68,6 @@ public static void start() {
     }
   }
 
-  static {
-    if (!new File("./.env").exists()) {
-      try {
-        FileUtils.copyFile(new File(".env.example"), new File(".env"));
-      } catch (IOException e) {
-        log.error("couldn't copy .env.example to .env. Please add .env");
-        e.printStackTrace();
-      }
-    }
-    Dotenv.load().entries().forEach(env -> System.setProperty(env.getKey(), env.getValue()));
-    if (Config.CLEAR_REPORTS_DIR) {
-      clearReports();
-    }
-    setup();
-    Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-      if (TestCaseGenerator.FAILED) {
-        log.error(
-                "Tests FAILED because some problem with @CaseId annotation. Verify that all tests annotated with @CaseId and Id is correct!");
-        Runtime.getRuntime().halt(100500);
-      }
-    }));
-  }
-
   @AfterAll
   public static void tearDown() {
     if (webDriverContainer.isRunning()) {
@@ -109,16 +76,27 @@ public static void tearDown() {
     }
   }
 
+  @BeforeEach
+  public void beforeMethod() {
+    RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
+    WebDriverRunner.setWebDriver(remoteWebDriver);
+    remoteWebDriver.manage()
+        .window().setSize(new Dimension(1440, 1024));
+    Selenide.open(BASE_WEB_URL);
+    naviSideBar.waitUntilScreenReady();
+  }
+
   @AfterEach
   public void afterMethod() {
-    Allure.addAttachment("Screenshot",
-        new ByteArrayInputStream(
-            ((TakesScreenshot) webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
-    browserClear();
+    Allure.addAttachment("Screenshot", new ByteArrayInputStream(((TakesScreenshot)
+        webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
+    clearBrowserLocalStorage();
+    clearBrowserCookies();
+    refresh();
   }
 
   @Step
-  protected void navigateToTopics(){
+  protected void navigateToTopics() {
     naviSideBar
         .openSideMenu(TOPICS);
     topicsList
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Config.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Config.java
deleted file mode 100644
index 900a6c0f902..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Config.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.provectus.kafka.ui.base;
-
-public abstract class Config {
-
-  public static boolean CLEAR_REPORTS_DIR =
-          Boolean.parseBoolean(System.getProperty("CLEAR_REPORTS_DIR", "true"));
-  public static boolean USE_LOCAL_BROWSER =
-          Boolean.parseBoolean(System.getProperty("USE_LOCAL_BROWSER", "true"));
-  public static String REPORTS_FOLDER = System.getProperty("REPORTS_FOLDER", "allure-results");
-  public static Boolean SCREENSHOTS =
-          Boolean.parseBoolean(System.getProperty("SCREENSHOTS", "true"));
-  public static Boolean SAVE_PAGE_SOURCE =
-          Boolean.parseBoolean(System.getProperty("SAVE_PAGE_SOURCE", "false"));
-  public static Boolean REOPEN_BROWSER_ON_FAIL =
-          Boolean.parseBoolean(System.getProperty("REOPEN_BROWSER_ON_FAIL", "true"));
-  public static String BROWSER = System.getProperty("BROWSER", "chromium");
-  public static String BROWSER_SIZE = System.getProperty("BROWSER_SIZE", "1920x1080");
-  public static Boolean ENABLE_VNC = Boolean.parseBoolean(System.getProperty("ENABLE_VNC", "true"));
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
index c39df88dc25..1dad47a7007 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -1,6 +1,6 @@
 package com.provectus.kafka.ui.base;
 
-import com.provectus.kafka.ui.helpers.ApiHelper;
+import com.provectus.kafka.ui.services.ApiService;
 import com.provectus.kafka.ui.pages.NaviSideBar;
 import com.provectus.kafka.ui.pages.TopPanel;
 import com.provectus.kafka.ui.pages.brokers.BrokersConfigTab;
@@ -21,7 +21,7 @@
 import com.provectus.kafka.ui.pages.topic.TopicsList;
 
 public abstract class Facade {
-    protected ApiHelper apiHelper = new ApiHelper();
+    protected ApiService apiService = new ApiService();
     protected ConnectorCreateForm connectorCreateForm = new ConnectorCreateForm();
     protected KafkaConnectList kafkaConnectList = new KafkaConnectList();
     protected ConnectorDetails connectorDetails = new ConnectorDetails();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
deleted file mode 100644
index f9a7fc8e1b7..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Setup.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.provectus.kafka.ui.base;
-
-import com.codeborne.selenide.Configuration;
-import com.codeborne.selenide.logevents.SelenideLogger;
-import io.qameta.allure.Step;
-import io.qameta.allure.selenide.AllureSelenide;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.File;
-import java.util.Arrays;
-
-import static com.codeborne.selenide.Selenide.*;
-
-@Slf4j
-public abstract class Setup {
-
-    @SneakyThrows
-    static void setup() {
-        Configuration.reportsFolder = Config.REPORTS_FOLDER;
-        Configuration.screenshots = Config.SCREENSHOTS;
-        Configuration.savePageSource = Config.SAVE_PAGE_SOURCE;
-        Configuration.reopenBrowserOnFail = Config.REOPEN_BROWSER_ON_FAIL;
-        Configuration.browser = Config.BROWSER;
-        Configuration.timeout = 10000;
-        Configuration.pageLoadTimeout = 180000;
-        Configuration.browserSize = Config.BROWSER_SIZE;
-        SelenideLogger.addListener("allure", new AllureSelenide().savePageSource(false));
-    }
-
-    public static void clearReports() {
-        log.info(String.format("Clearing reports dir [%s]...", Config.REPORTS_FOLDER));
-        File allureResults = new File(Config.REPORTS_FOLDER);
-        if (allureResults.isDirectory()) {
-            File[] list = allureResults.listFiles();
-            if (list != null) {
-                Arrays.stream(list)
-                        .sequential()
-                        .filter(e -> !e.getName().equals("categories.json"))
-                        .forEach(File::delete);
-            }
-        }
-    }
-
-    @Step
-    public static void browserClear() {
-        log.debug("browserClear");
-        clearBrowserLocalStorage();
-        clearBrowserCookies();
-        refresh();
-        log.debug("=> DONE");
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
index 980c2d9d48b..665b8fb2ff0 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
@@ -2,7 +2,7 @@
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
 
@@ -52,11 +52,11 @@ public class ConnectorsTests extends BaseTest {
     public void beforeAll() {
         TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
         TOPIC_LIST.forEach(topic -> {
-            apiHelper.createTopic(CLUSTER_NAME, topic.getName());
-            apiHelper.sendMessage(CLUSTER_NAME, topic);
+            apiService.createTopic(CLUSTER_NAME, topic.getName());
+            apiService.sendMessage(CLUSTER_NAME, topic);
         });
         CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
-        CONNECTOR_LIST.forEach(connector -> apiHelper
+        CONNECTOR_LIST.forEach(connector -> apiService
                 .createConnector(CLUSTER_NAME, CONNECT_NAME, connector));
     }
 
@@ -120,8 +120,8 @@ public void deleteConnector() {
     @AfterAll
     public void afterAll() {
         CONNECTOR_LIST.forEach(connector ->
-                apiHelper.deleteConnector(CLUSTER_NAME, CONNECT_NAME, connector.getName()));
-        TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
+                apiService.deleteConnector(CLUSTER_NAME, CONNECT_NAME, connector.getName()));
+        TOPIC_LIST.forEach(topic -> apiService.deleteTopic(CLUSTER_NAME, topic.getName()));
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
index 92daffd2495..1af657ca976 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.suite.schemas;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.SCHEMA_REGISTRY;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 import com.codeborne.selenide.Condition;
@@ -41,7 +41,7 @@ public class SchemasTests extends BaseTest {
     @SneakyThrows
     public void beforeAll() {
         SCHEMA_LIST.addAll(List.of(AVRO_API, JSON_API, PROTOBUF_API));
-        SCHEMA_LIST.forEach(schema -> apiHelper.createSchema(CLUSTER_NAME, schema));
+        SCHEMA_LIST.forEach(schema -> apiService.createSchema(CLUSTER_NAME, schema));
     }
 
     @DisplayName("should create AVRO schema")
@@ -228,7 +228,7 @@ void deleteSchemaProtobuf() {
 
     @AfterAll
     public void afterAll() {
-        SCHEMA_LIST.forEach(schema -> apiHelper.deleteSchema(CLUSTER_NAME, schema.getName()));
+        SCHEMA_LIST.forEach(schema -> apiService.deleteSchema(CLUSTER_NAME, schema.getName()));
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
index 67d531c8a67..f18150f8347 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -2,7 +2,7 @@
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
 import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
 
@@ -38,7 +38,7 @@ public class TopicMessagesTests extends BaseTest {
   @BeforeAll
   public void beforeAll() {
     TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES));
-    TOPIC_LIST.forEach(topic -> apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
+    TOPIC_LIST.forEach(topic -> apiService.createTopic(CLUSTER_NAME, topic.getName()));
   }
 
   @DisplayName("produce message")
@@ -136,6 +136,6 @@ void checkingMessageFilteringByOffset() {
 
   @AfterAll
   public void afterAll() {
-    TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
+    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(CLUSTER_NAME, topic.getName()));
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 150af44e7a1..01eff46b980 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -9,12 +9,11 @@
 import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.NOT_SET;
 import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_1_GB;
 import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_20_GB;
-import static com.provectus.kafka.ui.settings.Source.CLUSTER_NAME;
+import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.apache.commons.lang3.RandomUtils.nextInt;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.base.BaseTest;
@@ -70,7 +69,7 @@ public class TopicsTests extends BaseTest {
   @BeforeAll
   public void beforeAll() {
     TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE, TOPIC_FOR_DELETE));
-    TOPIC_LIST.forEach(topic -> apiHelper.createTopic(CLUSTER_NAME, topic.getName()));
+    TOPIC_LIST.forEach(topic -> apiService.createTopic(CLUSTER_NAME, topic.getName()));
   }
 
   @DisplayName("should create a topic")
@@ -474,6 +473,6 @@ void recreateTopicFromTopicProfile(){
 
   @AfterAll
   public void afterAll() {
-    TOPIC_LIST.forEach(topic -> apiHelper.deleteTopic(CLUSTER_NAME, topic.getName()));
+    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(CLUSTER_NAME, topic.getName()));
   }
 }

From 0cba8240b7d6aff7f9417c5651bf811f935254b3 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 28 Dec 2022 19:49:26 +0400
Subject: [PATCH 356/734] Bug: UnsupportedVersionException:
 includeClusterAuthorizedOperations (#3157)

* ISSUE-3141: checking kafka version before setting includeAuthorizedOperations for describeCluster api call
---
 .../kafka/ui/service/ReactiveAdminClient.java     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index b06716e6314..1ffbd429180 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -43,6 +43,7 @@
 import org.apache.kafka.clients.admin.ConsumerGroupDescription;
 import org.apache.kafka.clients.admin.ConsumerGroupListing;
 import org.apache.kafka.clients.admin.DescribeClusterOptions;
+import org.apache.kafka.clients.admin.DescribeClusterResult;
 import org.apache.kafka.clients.admin.DescribeConfigsOptions;
 import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsOptions;
 import org.apache.kafka.clients.admin.ListOffsetsResult;
@@ -80,7 +81,8 @@ public class ReactiveAdminClient implements Closeable {
 
   private enum SupportedFeature {
     INCREMENTAL_ALTER_CONFIGS(2.3f),
-    CONFIG_DOCUMENTATION_RETRIEVAL(2.6f);
+    CONFIG_DOCUMENTATION_RETRIEVAL(2.6f),
+    DESCRIBE_CLUSTER_INCLUDE_AUTHORIZED_OPERATIONS(2.3f);
 
     private final float sinceVersion;
 
@@ -300,11 +302,14 @@ public Mono<Map<Integer, Map<String, DescribeLogDirsResponse.LogDirInfo>>> descr
   }
 
   public Mono<ClusterDescription> describeCluster() {
-    return describeClusterImpl(client);
+    return describeClusterImpl(client, features);
   }
 
-  private static Mono<ClusterDescription> describeClusterImpl(AdminClient client) {
-    var result = client.describeCluster(new DescribeClusterOptions().includeAuthorizedOperations(true));
+  private static Mono<ClusterDescription> describeClusterImpl(AdminClient client, Set<SupportedFeature> features) {
+    boolean includeAuthorizedOperations =
+        features.contains(SupportedFeature.DESCRIBE_CLUSTER_INCLUDE_AUTHORIZED_OPERATIONS);
+    DescribeClusterResult result = client.describeCluster(
+        new DescribeClusterOptions().includeAuthorizedOperations(includeAuthorizedOperations));
     var allOfFuture = KafkaFuture.allOf(
         result.controller(), result.clusterId(), result.nodes(), result.authorizedOperations());
     return toMono(allOfFuture).then(
@@ -320,7 +325,7 @@ private static Mono<ClusterDescription> describeClusterImpl(AdminClient client)
   }
 
   private static Mono<String> getClusterVersion(AdminClient client) {
-    return describeClusterImpl(client)
+    return describeClusterImpl(client, Set.of())
         // choosing node from which we will get configs (starting with controller)
         .flatMap(descr -> descr.controller != null
             ? Mono.just(descr.controller)

From 9fad0d0ee3c1d3e77eb37b4e510a8c0a77db66b1 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Thu, 29 Dec 2022 13:45:18 +0300
Subject: [PATCH 357/734] Upgarde to Vite v4 (#3062)

* Upgarde to Vite v4

* Fix warnings

* resolved validateDOMNesting(...) warning also remove act from PreviewModal.spec.tsx

* Revert "resolved validateDOMNesting(...) warning also remove act from PreviewModal.spec.tsx"

This reverts commit f24660918f32491fef4fea8fb0c4c60dfc4048a0.

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 kafka-ui-react-app/jest.config.ts             |   2 +-
 kafka-ui-react-app/package.json               |  10 +-
 kafka-ui-react-app/pnpm-lock.yaml             | 860 +++++++++---------
 kafka-ui-react-app/src/components/App.tsx     |   2 +-
 .../src/components/Connect/New/New.tsx        |   2 +-
 .../Details/__tests__/Details.spec.tsx        |   1 -
 .../Schemas/Details/__test__/Details.spec.tsx |  69 +-
 .../Schemas/Edit/__tests__/Edit.spec.tsx      |  27 +-
 .../Schemas/New/__test__/New.spec.tsx         |  30 +-
 .../Topics/List/__tests__/TopicTable.spec.tsx |  19 +-
 .../Topics/New/__test__/New.spec.tsx          |  15 +-
 .../Topic/Messages/__test__/Messages.spec.tsx |   9 +
 .../Messages/__test__/MessagesTable.spec.tsx  |  28 +-
 .../Topics/Topic/Overview/Overview.tsx        |   2 +-
 .../Topic/Overview/__test__/Overview.spec.tsx |  14 +-
 .../Topics/Topic/__test__/Topic.spec.tsx      |  11 +-
 .../src/components/common/NewTable/Table.tsx  |   6 +-
 .../{global.css.ts => globalCss.ts}           |   0
 kafka-ui-react-app/vite.config.ts             |   3 +-
 19 files changed, 523 insertions(+), 587 deletions(-)
 rename kafka-ui-react-app/src/components/{global.css.ts => globalCss.ts} (100%)

diff --git a/kafka-ui-react-app/jest.config.ts b/kafka-ui-react-app/jest.config.ts
index 1c0c012d559..d2fc35de857 100644
--- a/kafka-ui-react-app/jest.config.ts
+++ b/kafka-ui-react-app/jest.config.ts
@@ -19,7 +19,7 @@ export default {
   ],
   testEnvironment: 'jsdom',
   transform: {
-    '\\.[jt]sx?$': 'babel-jest',
+    '\\.[jt]sx?$': '@swc/jest',
     '^.+\\.css$': '<rootDir>/.jest/cssTransform.js',
   },
   transformIgnorePatterns: [
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index bbb159abd41..6353452605a 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -17,10 +17,8 @@
     "@tanstack/react-table": "^8.5.10",
     "@testing-library/react": "^13.2.0",
     "@types/testing-library__jest-dom": "^5.14.5",
-    "@vitejs/plugin-react": "^2.0.0",
     "ace-builds": "^1.7.1",
     "ajv": "^8.6.3",
-    "babel-jest": "^29.0.3",
     "classnames": "^2.2.6",
     "fetch-mock": "^9.11.0",
     "jest": "^29.0.3",
@@ -43,8 +41,8 @@
     "sass": "^1.52.3",
     "styled-components": "^5.3.1",
     "use-debounce": "^8.0.1",
-    "vite": "^3.0.2",
-    "vite-tsconfig-paths": "^3.5.0",
+    "vite": "^4.0.0",
+    "vite-tsconfig-paths": "^4.0.2",
     "whatwg-fetch": "^3.6.2",
     "yup": "^0.32.11",
     "zustand": "^4.1.1"
@@ -80,6 +78,8 @@
     "@babel/preset-typescript": "^7.17.12",
     "@jest/types": "^29.0.3",
     "@openapitools/openapi-generator-cli": "^2.5.1",
+    "@swc/core": "^1.3.22",
+    "@swc/jest": "^0.2.24",
     "@testing-library/dom": "^8.11.1",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/user-event": "^14.4.3",
@@ -94,6 +94,7 @@
     "@types/styled-components": "^5.1.13",
     "@typescript-eslint/eslint-plugin": "^5.29.0",
     "@typescript-eslint/parser": "^5.29.0",
+    "@vitejs/plugin-react-swc": "^3.0.0",
     "dotenv": "^16.0.1",
     "eslint": "^8.3.0",
     "eslint-config-airbnb": "^19.0.4",
@@ -115,7 +116,6 @@
     "lint-staged": "^13.0.2",
     "prettier": "^2.3.1",
     "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.0",
     "ts-node": "^10.8.1",
     "ts-prune": "^0.10.3",
     "typescript": "^4.7.4"
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index db189eb663e..8a37026d6c3 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -14,6 +14,8 @@ specifiers:
   '@microsoft/fetch-event-source': ^2.0.1
   '@openapitools/openapi-generator-cli': ^2.5.1
   '@reduxjs/toolkit': ^1.8.3
+  '@swc/core': ^1.3.22
+  '@swc/jest': ^0.2.24
   '@szhsin/react-menu': ^3.1.1
   '@tanstack/react-query': ^4.0.5
   '@tanstack/react-table': ^8.5.10
@@ -33,10 +35,9 @@ specifiers:
   '@types/testing-library__jest-dom': ^5.14.5
   '@typescript-eslint/eslint-plugin': ^5.29.0
   '@typescript-eslint/parser': ^5.29.0
-  '@vitejs/plugin-react': ^2.0.0
+  '@vitejs/plugin-react-swc': ^3.0.0
   ace-builds: ^1.7.1
   ajv: ^8.6.3
-  babel-jest: ^29.0.3
   classnames: ^2.2.6
   dotenv: ^16.0.1
   eslint: ^8.3.0
@@ -79,13 +80,12 @@ specifiers:
   rimraf: ^3.0.2
   sass: ^1.52.3
   styled-components: ^5.3.1
-  ts-jest: ^29.0.0
   ts-node: ^10.8.1
   ts-prune: ^0.10.3
   typescript: ^4.7.4
   use-debounce: ^8.0.1
-  vite: ^3.0.2
-  vite-tsconfig-paths: ^3.5.0
+  vite: ^4.0.0
+  vite-tsconfig-paths: ^4.0.2
   whatwg-fetch: ^3.6.2
   yup: ^0.32.11
   zustand: ^4.1.1
@@ -104,10 +104,8 @@ dependencies:
   '@tanstack/react-table': 8.5.10_ef5jwxihqo6n7gxfmzogljlgcm
   '@testing-library/react': 13.2.0_ef5jwxihqo6n7gxfmzogljlgcm
   '@types/testing-library__jest-dom': 5.14.5
-  '@vitejs/plugin-react': 2.0.0_vite@3.0.2
   ace-builds: 1.7.1
   ajv: 8.8.2
-  babel-jest: 29.0.3_@babel+core@7.18.2
   classnames: 2.3.1
   fetch-mock: 9.11.0
   jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
@@ -130,8 +128,8 @@ dependencies:
   sass: 1.52.3
   styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
   use-debounce: 8.0.1_react@18.1.0
-  vite: 3.0.2_sass@1.52.3
-  vite-tsconfig-paths: 3.5.0_vite@3.0.2
+  vite: 4.0.0_binvsr2w2vzqveeue6ibz2djda
+  vite-tsconfig-paths: 4.0.2_eqmiqdrctagsk5ranq2vs4ssty
   whatwg-fetch: 3.6.2
   yup: 0.32.11
   zustand: 4.1.1_react@18.1.0
@@ -142,6 +140,8 @@ devDependencies:
   '@babel/preset-typescript': 7.17.12_@babel+core@7.18.2
   '@jest/types': 29.0.3
   '@openapitools/openapi-generator-cli': 2.5.1
+  '@swc/core': 1.3.22
+  '@swc/jest': 0.2.24_@swc+core@1.3.22
   '@testing-library/dom': 8.13.0
   '@testing-library/jest-dom': 5.16.4
   '@testing-library/user-event': 14.4.3_tlwynutqiyp5mns3woioasuxnq
@@ -156,6 +156,7 @@ devDependencies:
   '@types/styled-components': 5.1.18
   '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
   '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+  '@vitejs/plugin-react-swc': 3.0.0_vite@4.0.0
   dotenv: 16.0.1
   eslint: 8.16.0
   eslint-config-airbnb: 19.0.4_iayhaebzx3saen2ll7sn5gqmdq
@@ -177,8 +178,7 @@ devDependencies:
   lint-staged: 13.0.2
   prettier: 2.5.1
   rimraf: 3.0.2
-  ts-jest: 29.0.0_2zqe2lz5fp2msj34ct3vkutym4
-  ts-node: 10.8.1_t4lrjbt3sxauai4t5o275zsepa
+  ts-node: 10.8.1_seagpw47opwyivxvtfydnuwcuy
   ts-prune: 0.10.3
   typescript: 4.7.4
 
@@ -1084,6 +1084,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
@@ -1093,14 +1094,6 @@ packages:
       '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
 
-  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
   /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
@@ -1116,6 +1109,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.9:
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
@@ -1230,14 +1224,6 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
-  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
   /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
@@ -1253,6 +1239,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
@@ -1287,6 +1274,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
@@ -1303,6 +1291,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
@@ -1319,6 +1308,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
@@ -1335,6 +1325,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
@@ -1351,6 +1342,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
@@ -1367,6 +1359,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
@@ -1404,6 +1397,7 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
+    dev: true
 
   /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.9:
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
@@ -2022,36 +2016,6 @@ packages:
       '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.9
     dev: true
 
-  /@babel/plugin-transform-react-jsx-development/7.18.6_@babel+core@7.18.9:
-    resolution: {integrity: sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.9
-    dev: false
-
-  /@babel/plugin-transform-react-jsx-self/7.18.6_@babel+core@7.18.9:
-    resolution: {integrity: sha512-A0LQGx4+4Jv7u/tWzoJF7alZwnBDQd6cGLh9P+Ttk4dpiL+J5p7NSNv/9tlEFFJDq3kjxOavWmbm6t0Gk+A3Ig==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: false
-
-  /@babel/plugin-transform-react-jsx-source/7.18.6_@babel+core@7.18.9:
-    resolution: {integrity: sha512-utZmlASneDfdaMh0m/WausbjUjEdGrQJz0vFK93d7wD3xf5wBtX219+q6IlCNZeguIcxS2f/CvLZrlLSvSHQXw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: false
-
   /@babel/plugin-transform-react-jsx/7.18.6_@babel+core@7.18.2:
     resolution: {integrity: sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==}
     engines: {node: '>=6.9.0'}
@@ -2077,6 +2041,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
       '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.9
       '@babel/types': 7.18.7
+    dev: true
 
   /@babel/plugin-transform-react-pure-annotations/7.16.7_@babel+core@7.18.2:
     resolution: {integrity: sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==}
@@ -2698,10 +2663,6 @@ packages:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
 
-  /@cush/relative/1.0.0:
-    resolution: {integrity: sha512-RpfLEtTlyIxeNPGKcokS+p3BZII/Q3bYxryFRglh5H3A3T8q9fsLYm72VYAMEOOIBLEa8o93kFLiBDUWKrwXZA==}
-    dev: false
-
   /@emotion/is-prop-valid/0.8.8:
     resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==}
     dependencies:
@@ -2716,6 +2677,182 @@ packages:
   /@emotion/unitless/0.7.5:
     resolution: {integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==}
 
+  /@esbuild/android-arm/0.16.4:
+    resolution: {integrity: sha512-rZzb7r22m20S1S7ufIc6DC6W659yxoOrl7sKP1nCYhuvUlnCFHVSbATG4keGUtV8rDz11sRRDbWkvQZpzPaHiw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/android-arm64/0.16.4:
+    resolution: {integrity: sha512-VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/android-x64/0.16.4:
+    resolution: {integrity: sha512-MW+B2O++BkcOfMWmuHXB15/l1i7wXhJFqbJhp82IBOais8RBEQv2vQz/jHrDEHaY2X0QY7Wfw86SBL2PbVOr0g==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/darwin-arm64/0.16.4:
+    resolution: {integrity: sha512-a28X1O//aOfxwJVZVs7ZfM8Tyih2Za4nKJrBwW5Wm4yKsnwBy9aiS/xwpxiiTRttw3EaTg4Srerhcm6z0bu9Wg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/darwin-x64/0.16.4:
+    resolution: {integrity: sha512-e3doCr6Ecfwd7VzlaQqEPrnbvvPjE9uoTpxG5pyLzr2rI2NMjDHmvY1E5EO81O/e9TUOLLkXA5m6T8lfjK9yAA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/freebsd-arm64/0.16.4:
+    resolution: {integrity: sha512-Oup3G/QxBgvvqnXWrBed7xxkFNwAwJVHZcklWyQt7YCAL5bfUkaa6FVWnR78rNQiM8MqqLiT6ZTZSdUFuVIg1w==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/freebsd-x64/0.16.4:
+    resolution: {integrity: sha512-vAP+eYOxlN/Bpo/TZmzEQapNS8W1njECrqkTpNgvXskkkJC2AwOXwZWai/Kc2vEFZUXQttx6UJbj9grqjD/+9Q==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-arm/0.16.4:
+    resolution: {integrity: sha512-A47ZmtpIPyERxkSvIv+zLd6kNIOtJH03XA0Hy7jaceRDdQaQVGSDt4mZqpWqJYgDk9rg96aglbF6kCRvPGDSUA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-arm64/0.16.4:
+    resolution: {integrity: sha512-2zXoBhv4r5pZiyjBKrOdFP4CXOChxXiYD50LRUU+65DkdS5niPFHbboKZd/c81l0ezpw7AQnHeoCy5hFrzzs4g==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-ia32/0.16.4:
+    resolution: {integrity: sha512-uxdSrpe9wFhz4yBwt2kl2TxS/NWEINYBUFIxQtaEVtglm1eECvsj1vEKI0KX2k2wCe17zDdQ3v+jVxfwVfvvjw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-loong64/0.16.4:
+    resolution: {integrity: sha512-peDrrUuxbZ9Jw+DwLCh/9xmZAk0p0K1iY5d2IcwmnN+B87xw7kujOkig6ZRcZqgrXgeRGurRHn0ENMAjjD5DEg==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-mips64el/0.16.4:
+    resolution: {integrity: sha512-sD9EEUoGtVhFjjsauWjflZklTNr57KdQ6xfloO4yH1u7vNQlOfAlhEzbyBKfgbJlW7rwXYBdl5/NcZ+Mg2XhQA==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-ppc64/0.16.4:
+    resolution: {integrity: sha512-X1HSqHUX9D+d0l6/nIh4ZZJ94eQky8d8z6yxAptpZE3FxCWYWvTDd9X9ST84MGZEJx04VYUD/AGgciddwO0b8g==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-riscv64/0.16.4:
+    resolution: {integrity: sha512-97ANpzyNp0GTXCt6SRdIx1ngwncpkV/z453ZuxbnBROCJ5p/55UjhbaG23UdHj88fGWLKPFtMoU4CBacz4j9FA==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-s390x/0.16.4:
+    resolution: {integrity: sha512-pUvPQLPmbEeJRPjP0DYTC1vjHyhrnCklQmCGYbipkep+oyfTn7GTBJXoPodR7ZS5upmEyc8lzAkn2o29wD786A==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/linux-x64/0.16.4:
+    resolution: {integrity: sha512-N55Q0mJs3Sl8+utPRPBrL6NLYZKBCLLx0bme/+RbjvMforTGGzFvsRl4xLTZMUBFC1poDzBEPTEu5nxizQ9Nlw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/netbsd-x64/0.16.4:
+    resolution: {integrity: sha512-LHSJLit8jCObEQNYkgsDYBh2JrJT53oJO2HVdkSYLa6+zuLJh0lAr06brXIkljrlI+N7NNW1IAXGn/6IZPi3YQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/openbsd-x64/0.16.4:
+    resolution: {integrity: sha512-nLgdc6tWEhcCFg/WVFaUxHcPK3AP/bh+KEwKtl69Ay5IBqUwKDaq/6Xk0E+fh/FGjnLwqFSsarsbPHeKM8t8Sw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/sunos-x64/0.16.4:
+    resolution: {integrity: sha512-08SluG24GjPO3tXKk95/85n9kpyZtXCVwURR2i4myhrOfi3jspClV0xQQ0W0PYWHioJj+LejFMt41q+PG3mlAQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/win32-arm64/0.16.4:
+    resolution: {integrity: sha512-yYiRDQcqLYQSvNQcBKN7XogbrSvBE45FEQdH8fuXPl7cngzkCvpsG2H9Uey39IjQ6gqqc+Q4VXYHsQcKW0OMjQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/win32-ia32/0.16.4:
+    resolution: {integrity: sha512-5rabnGIqexekYkh9zXG5waotq8mrdlRoBqAktjx2W3kb0zsI83mdCwrcAeKYirnUaTGztR5TxXcXmQrEzny83w==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@esbuild/win32-x64/0.16.4:
+    resolution: {integrity: sha512-sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
   /@eslint/eslintrc/1.3.0:
     resolution: {integrity: sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -2881,6 +3018,13 @@ packages:
       - supports-color
       - ts-node
 
+  /@jest/create-cache-key-function/27.5.1:
+    resolution: {integrity: sha512-dmH1yW+makpTSURTy8VzdUwFnfQh1G8R+DxO2Ho2FFmBbKFEVm+3jWdvFhE2VqB/LATCTokkP0dotjyQyw5/AQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@jest/types': 27.5.1
+    dev: true
+
   /@jest/environment/29.0.3:
     resolution: {integrity: sha512-iKl272NKxYNQNqXMQandAIwjhQaGw5uJfGXduu8dS9llHi8jV2ChWrtOAVPnMbaaoDhnI3wgUGNDvZgHeEJQCA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -3035,6 +3179,17 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@jest/types/27.5.1:
+    resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      '@types/istanbul-lib-coverage': 2.0.3
+      '@types/istanbul-reports': 3.0.1
+      '@types/node': 16.11.7
+      '@types/yargs': 16.0.4
+      chalk: 4.1.2
+    dev: true
+
   /@jest/types/28.1.1:
     resolution: {integrity: sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
@@ -3278,6 +3433,114 @@ packages:
     dependencies:
       '@sinonjs/commons': 1.8.3
 
+  /@swc/core-darwin-arm64/1.3.22:
+    resolution: {integrity: sha512-MMhtPsuXp8gpUgr9bs+RZQ2IyFGiUNDG93usCDAFgAF+6VVp+YaAVjET/3/Bx5Lk2WAt0RxT62C9KTEw1YMo3w==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core-darwin-x64/1.3.22:
+    resolution: {integrity: sha512-SG6QbNat4GZ5VJU3Zo6a54oQOtbhJVE6BCQw4JjOCZJmAeBzNebGy9wsT4+fCJNHC3C5qtaRw7ToXJvLniXwfg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core-linux-arm-gnueabihf/1.3.22:
+    resolution: {integrity: sha512-4E+TdQT1oHnHjDaPs/DyrRy9lOuFd6ncEd67yYA4j9lFqt6nuz/jnXss45k8KU7wR5kOTtdW73xPwkU4NbOWdw==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core-linux-arm64-gnu/1.3.22:
+    resolution: {integrity: sha512-6VcynOMbOBcbLutIPENI3Ejvg5LGz/Pwvzm25hM0FoiEtPxHA+tawQUwLx8Alk1Yr+Rnqid06UEZ0veJOGn2pQ==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core-linux-arm64-musl/1.3.22:
+    resolution: {integrity: sha512-86RxGy0L3qa4De3xWHx8vL2caTxvSLSWTlgUW/Yd4l1pvrCFibMjhkImGu5ViKiReX9DlBtJ7CBs4dln2kHidw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core-linux-x64-gnu/1.3.22:
+    resolution: {integrity: sha512-FLkbiqsdXsVIFZi6iedx4rSBGX8x0vo/5aDlklSxJAAYOcQpO0QADKP5Yr65iMT1d6ABCt2d+/StpGLF7GWOcA==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core-linux-x64-musl/1.3.22:
+    resolution: {integrity: sha512-giBuw+Z0Bq6fpZ0Y5TcfpcQwf9p/cE1fOQyO/K1XSTn/haQOqFi7421Jq/dFThSARZiXw1u9Om9VFbwxr8VI+A==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core-win32-arm64-msvc/1.3.22:
+    resolution: {integrity: sha512-loKGO+ZM2By6VdrmVJk1G79jVgDPaee93qLFuis5KyeoLLb4m1MlNMc/6SIDZUSuYg6NqaGP1spFeiFetMQ4Zg==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core-win32-ia32-msvc/1.3.22:
+    resolution: {integrity: sha512-lvNWAZ3QjXMsrsch6oLLQVikT/hC/4ZcLrTBXa14HwQylaYigkGElgp3ekJr78HjWDPwB46GXwBbNMG0VNAfvA==}
+    engines: {node: '>=10'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core-win32-x64-msvc/1.3.22:
+    resolution: {integrity: sha512-ESyn4lZXAKEE3mcTaDfXatsolCiEfVGstsXdgBmZYa6o1IE1bDW8FE7Ob/Y+82WTpm9+A9ZYXYjZ62t67POHZg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    optional: true
+
+  /@swc/core/1.3.22:
+    resolution: {integrity: sha512-oQ9EPEb7NgWcGIDoVfLCuffvtC4MzVtrwjqwKzFHP8FUh1fn8+2wraOjkkDXW74BB4Hgve5ykkaHix9bebB9Ww==}
+    engines: {node: '>=10'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@swc/core-darwin-arm64': 1.3.22
+      '@swc/core-darwin-x64': 1.3.22
+      '@swc/core-linux-arm-gnueabihf': 1.3.22
+      '@swc/core-linux-arm64-gnu': 1.3.22
+      '@swc/core-linux-arm64-musl': 1.3.22
+      '@swc/core-linux-x64-gnu': 1.3.22
+      '@swc/core-linux-x64-musl': 1.3.22
+      '@swc/core-win32-arm64-msvc': 1.3.22
+      '@swc/core-win32-ia32-msvc': 1.3.22
+      '@swc/core-win32-x64-msvc': 1.3.22
+
+  /@swc/jest/0.2.24_@swc+core@1.3.22:
+    resolution: {integrity: sha512-fwgxQbM1wXzyKzl1+IW0aGrRvAA8k0Y3NxFhKigbPjOJ4mCKnWEcNX9HQS3gshflcxq8YKhadabGUVfdwjCr6Q==}
+    engines: {npm: '>= 7.0.0'}
+    peerDependencies:
+      '@swc/core': '*'
+    dependencies:
+      '@jest/create-cache-key-function': 27.5.1
+      '@swc/core': 1.3.22
+      jsonc-parser: 3.2.0
+    dev: true
+
   /@szhsin/react-menu/3.1.1_ef5jwxihqo6n7gxfmzogljlgcm:
     resolution: {integrity: sha512-IdHLyH61M+KqjTrvqglKo7JnbC0GIkg4OCtlXBxQPEjx/ecR5g0Iycqm+SG3rObEoniLZEz32iJkefve/LAHMA==}
     peerDependencies:
@@ -3573,6 +3836,12 @@ packages:
   /@types/yargs-parser/20.2.0:
     resolution: {integrity: sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==}
 
+  /@types/yargs/16.0.4:
+    resolution: {integrity: sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==}
+    dependencies:
+      '@types/yargs-parser': 20.2.0
+    dev: true
+
   /@types/yargs/17.0.10:
     resolution: {integrity: sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==}
     dependencies:
@@ -3777,23 +4046,14 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-react/2.0.0_vite@3.0.2:
-    resolution: {integrity: sha512-zHkRR+X4zqEPNBbKV2FvWSxK7Q6crjMBVIAYroSU8Nbb4M3E5x4qOiLoqJBHtXgr27kfednXjkwr3lr8jS6Wrw==}
-    engines: {node: '>=14.18.0'}
+  /@vitejs/plugin-react-swc/3.0.0_vite@4.0.0:
+    resolution: {integrity: sha512-vYlodz/mjYRbxMGbHzDgR8aPR+z8n7K/enWkyBGH096xrL2DIPCuTvQVRYPTXGyy6wO7OFiMxZ3r4nKQD1sH0A==}
     peerDependencies:
-      vite: ^3.0.0
+      vite: ^4.0.0
     dependencies:
-      '@babel/core': 7.18.9
-      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.9
-      '@babel/plugin-transform-react-jsx-development': 7.18.6_@babel+core@7.18.9
-      '@babel/plugin-transform-react-jsx-self': 7.18.6_@babel+core@7.18.9
-      '@babel/plugin-transform-react-jsx-source': 7.18.6_@babel+core@7.18.9
-      magic-string: 0.26.2
-      react-refresh: 0.14.0
-      vite: 3.0.2_sass@1.52.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+      '@swc/core': 1.3.22
+      vite: 4.0.0_binvsr2w2vzqveeue6ibz2djda
+    dev: true
 
   /abab/2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
@@ -4022,33 +4282,16 @@ packages:
     dev: true
 
   /axios/0.26.1:
-    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
-    dependencies:
-      follow-redirects: 1.14.8
-    transitivePeerDependencies:
-      - debug
-    dev: true
-
-  /axobject-query/2.2.0:
-    resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
-    dev: true
-
-  /babel-jest/29.0.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-ApPyHSOhS/sVzwUOQIWJmdvDhBsMG01HX9z7ogtkp1TToHGGUWFlnXJUIzCgKPSfiYLn3ibipCYzsKSURHEwLg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@babel/core': ^7.8.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@jest/transform': 29.0.3
-      '@types/babel__core': 7.1.19
-      babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.0.2_@babel+core@7.18.2
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      slash: 3.0.0
+    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
+    dependencies:
+      follow-redirects: 1.14.8
     transitivePeerDependencies:
-      - supports-color
+      - debug
+    dev: true
+
+  /axobject-query/2.2.0:
+    resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
+    dev: true
 
   /babel-jest/29.0.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-ApPyHSOhS/sVzwUOQIWJmdvDhBsMG01HX9z7ogtkp1TToHGGUWFlnXJUIzCgKPSfiYLn3ibipCYzsKSURHEwLg==}
@@ -4193,25 +4436,6 @@ packages:
     resolution: {integrity: sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==}
     dev: true
 
-  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.2:
-    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.2
-      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.2
-
   /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.9:
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
@@ -4231,16 +4455,6 @@ packages:
       '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
       '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.9
 
-  /babel-preset-jest/29.0.2_@babel+core@7.18.2:
-    resolution: {integrity: sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.2
-      babel-plugin-jest-hoist: 29.0.2
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2
-
   /babel-preset-jest/29.0.2_@babel+core@7.18.9:
     resolution: {integrity: sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -4285,7 +4499,6 @@ packages:
   /binary-extensions/2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
-    dev: false
 
   /bl/4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
@@ -4322,13 +4535,6 @@ packages:
       node-releases: 2.0.5
       picocolors: 1.0.0
 
-  /bs-logger/0.2.6:
-    resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
-    engines: {node: '>= 6'}
-    dependencies:
-      fast-json-stable-stringify: 2.1.0
-    dev: true
-
   /bser/2.1.1:
     resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
     dependencies:
@@ -4427,7 +4633,6 @@ packages:
       readdirp: 3.6.0
     optionalDependencies:
       fsevents: 2.3.2
-    dev: false
 
   /ci-info/3.3.1:
     resolution: {integrity: sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==}
@@ -4911,213 +5116,34 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
-  /esbuild-android-64/0.14.49:
-    resolution: {integrity: sha512-vYsdOTD+yi+kquhBiFWl3tyxnj2qZJsl4tAqwhT90ktUdnyTizgle7TjNx6Ar1bN7wcwWqZ9QInfdk2WVagSww==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-android-arm64/0.14.49:
-    resolution: {integrity: sha512-g2HGr/hjOXCgSsvQZ1nK4nW/ei8JUx04Li74qub9qWrStlysaVmadRyTVuW32FGIpLQyc5sUjjZopj49eGGM2g==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-darwin-64/0.14.49:
-    resolution: {integrity: sha512-3rvqnBCtX9ywso5fCHixt2GBCUsogNp9DjGmvbBohh31Ces34BVzFltMSxJpacNki96+WIcX5s/vum+ckXiLYg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-darwin-arm64/0.14.49:
-    resolution: {integrity: sha512-XMaqDxO846srnGlUSJnwbijV29MTKUATmOLyQSfswbK/2X5Uv28M9tTLUJcKKxzoo9lnkYPsx2o8EJcTYwCs/A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-freebsd-64/0.14.49:
-    resolution: {integrity: sha512-NJ5Q6AjV879mOHFri+5lZLTp5XsO2hQ+KSJYLbfY9DgCu8s6/Zl2prWXVANYTeCDLlrIlNNYw8y34xqyLDKOmQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-freebsd-arm64/0.14.49:
-    resolution: {integrity: sha512-lFLtgXnAc3eXYqj5koPlBZvEbBSOSUbWO3gyY/0+4lBdRqELyz4bAuamHvmvHW5swJYL7kngzIZw6kdu25KGOA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-32/0.14.49:
-    resolution: {integrity: sha512-zTTH4gr2Kb8u4QcOpTDVn7Z8q7QEIvFl/+vHrI3cF6XOJS7iEI1FWslTo3uofB2+mn6sIJEQD9PrNZKoAAMDiA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-64/0.14.49:
-    resolution: {integrity: sha512-hYmzRIDzFfLrB5c1SknkxzM8LdEUOusp6M2TnuQZJLRtxTgyPnZZVtyMeCLki0wKgYPXkFsAVhi8vzo2mBNeTg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-arm/0.14.49:
-    resolution: {integrity: sha512-iE3e+ZVv1Qz1Sy0gifIsarJMQ89Rpm9mtLSRtG3AH0FPgAzQ5Z5oU6vYzhc/3gSPi2UxdCOfRhw2onXuFw/0lg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-arm64/0.14.49:
-    resolution: {integrity: sha512-KLQ+WpeuY+7bxukxLz5VgkAAVQxUv67Ft4DmHIPIW+2w3ObBPQhqNoeQUHxopoW/aiOn3m99NSmSV+bs4BSsdA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-mips64le/0.14.49:
-    resolution: {integrity: sha512-n+rGODfm8RSum5pFIqFQVQpYBw+AztL8s6o9kfx7tjfK0yIGF6tm5HlG6aRjodiiKkH2xAiIM+U4xtQVZYU4rA==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-ppc64le/0.14.49:
-    resolution: {integrity: sha512-WP9zR4HX6iCBmMFH+XHHng2LmdoIeUmBpL4aL2TR8ruzXyT4dWrJ5BSbT8iNo6THN8lod6GOmYDLq/dgZLalGw==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-riscv64/0.14.49:
-    resolution: {integrity: sha512-h66ORBz+Dg+1KgLvzTVQEA1LX4XBd1SK0Fgbhhw4akpG/YkN8pS6OzYI/7SGENiN6ao5hETRDSkVcvU9NRtkMQ==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-linux-s390x/0.14.49:
-    resolution: {integrity: sha512-DhrUoFVWD+XmKO1y7e4kNCqQHPs6twz6VV6Uezl/XHYGzM60rBewBF5jlZjG0nCk5W/Xy6y1xWeopkrhFFM0sQ==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-netbsd-64/0.14.49:
-    resolution: {integrity: sha512-BXaUwFOfCy2T+hABtiPUIpWjAeWK9P8O41gR4Pg73hpzoygVGnj0nI3YK4SJhe52ELgtdgWP/ckIkbn2XaTxjQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-openbsd-64/0.14.49:
-    resolution: {integrity: sha512-lP06UQeLDGmVPw9Rg437Btu6J9/BmyhdoefnQ4gDEJTtJvKtQaUcOQrhjTq455ouZN4EHFH1h28WOJVANK41kA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-sunos-64/0.14.49:
-    resolution: {integrity: sha512-4c8Zowp+V3zIWje329BeLbGh6XI9c/rqARNaj5yPHdC61pHI9UNdDxT3rePPJeWcEZVKjkiAS6AP6kiITp7FSw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-windows-32/0.14.49:
-    resolution: {integrity: sha512-q7Rb+J9yHTeKr9QTPDYkqfkEj8/kcKz9lOabDuvEXpXuIcosWCJgo5Z7h/L4r7rbtTH4a8U2FGKb6s1eeOHmJA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-windows-64/0.14.49:
-    resolution: {integrity: sha512-+Cme7Ongv0UIUTniPqfTX6mJ8Deo7VXw9xN0yJEN1lQMHDppTNmKwAM3oGbD/Vqff+07K2gN0WfNkMohmG+dVw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild-windows-arm64/0.14.49:
-    resolution: {integrity: sha512-v+HYNAXzuANrCbbLFJ5nmO3m5y2PGZWLe3uloAkLt87aXiO2mZr3BTmacZdjwNkNEHuH3bNtN8cak+mzVjVPfA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /esbuild/0.14.49:
-    resolution: {integrity: sha512-/TlVHhOaq7Yz8N1OJrjqM3Auzo5wjvHFLk+T8pIue+fhnhIMpfAzsG6PLVMbFveVxqD2WOp3QHei+52IMUNmCw==}
+  /esbuild/0.16.4:
+    resolution: {integrity: sha512-qQrPMQpPTWf8jHugLWHoGqZjApyx3OEm76dlTXobHwh/EBbavbRdjXdYi/GWr43GyN0sfpap14GPkb05NH3ROA==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      esbuild-android-64: 0.14.49
-      esbuild-android-arm64: 0.14.49
-      esbuild-darwin-64: 0.14.49
-      esbuild-darwin-arm64: 0.14.49
-      esbuild-freebsd-64: 0.14.49
-      esbuild-freebsd-arm64: 0.14.49
-      esbuild-linux-32: 0.14.49
-      esbuild-linux-64: 0.14.49
-      esbuild-linux-arm: 0.14.49
-      esbuild-linux-arm64: 0.14.49
-      esbuild-linux-mips64le: 0.14.49
-      esbuild-linux-ppc64le: 0.14.49
-      esbuild-linux-riscv64: 0.14.49
-      esbuild-linux-s390x: 0.14.49
-      esbuild-netbsd-64: 0.14.49
-      esbuild-openbsd-64: 0.14.49
-      esbuild-sunos-64: 0.14.49
-      esbuild-windows-32: 0.14.49
-      esbuild-windows-64: 0.14.49
-      esbuild-windows-arm64: 0.14.49
-    dev: false
+      '@esbuild/android-arm': 0.16.4
+      '@esbuild/android-arm64': 0.16.4
+      '@esbuild/android-x64': 0.16.4
+      '@esbuild/darwin-arm64': 0.16.4
+      '@esbuild/darwin-x64': 0.16.4
+      '@esbuild/freebsd-arm64': 0.16.4
+      '@esbuild/freebsd-x64': 0.16.4
+      '@esbuild/linux-arm': 0.16.4
+      '@esbuild/linux-arm64': 0.16.4
+      '@esbuild/linux-ia32': 0.16.4
+      '@esbuild/linux-loong64': 0.16.4
+      '@esbuild/linux-mips64el': 0.16.4
+      '@esbuild/linux-ppc64': 0.16.4
+      '@esbuild/linux-riscv64': 0.16.4
+      '@esbuild/linux-s390x': 0.16.4
+      '@esbuild/linux-x64': 0.16.4
+      '@esbuild/netbsd-x64': 0.16.4
+      '@esbuild/openbsd-x64': 0.16.4
+      '@esbuild/sunos-x64': 0.16.4
+      '@esbuild/win32-arm64': 0.16.4
+      '@esbuild/win32-ia32': 0.16.4
+      '@esbuild/win32-x64': 0.16.4
 
   /escalade/3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
@@ -5858,10 +5884,6 @@ packages:
       is-glob: 4.0.3
     dev: true
 
-  /glob-regex/0.3.2:
-    resolution: {integrity: sha512-m5blUd3/OqDTWwzBBtWBPrGlAzatRywHameHeekAZyZrskYouOGdNB8T/q6JucucvJXtOuyHIn0/Yia7iDasDw==}
-    dev: false
-
   /glob-to-regexp/0.4.1:
     resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
     dev: false
@@ -6059,7 +6081,6 @@ packages:
 
   /immutable/4.0.0:
     resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==}
-    dev: false
 
   /import-fresh/3.3.0:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
@@ -6136,7 +6157,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       binary-extensions: 2.2.0
-    dev: false
 
   /is-boolean-object/1.1.1:
     resolution: {integrity: sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==}
@@ -6415,7 +6435,7 @@ packages:
       pretty-format: 29.0.3
       slash: 3.0.0
       strip-json-comments: 3.1.1
-      ts-node: 10.8.1_t4lrjbt3sxauai4t5o275zsepa
+      ts-node: 10.8.1_seagpw47opwyivxvtfydnuwcuy
     transitivePeerDependencies:
       - supports-color
 
@@ -6912,6 +6932,10 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
+  /jsonc-parser/3.2.0:
+    resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
+    dev: true
+
   /jsonfile/6.1.0:
     resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
     dependencies:
@@ -7047,10 +7071,6 @@ packages:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
     dev: false
 
-  /lodash.memoize/4.1.2:
-    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
-    dev: true
-
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
@@ -7096,13 +7116,6 @@ packages:
     resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
     hasBin: true
 
-  /magic-string/0.26.2:
-    resolution: {integrity: sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==}
-    engines: {node: '>=12'}
-    dependencies:
-      sourcemap-codec: 1.4.8
-    dev: false
-
   /make-dir/3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
@@ -7165,6 +7178,7 @@ packages:
 
   /minimist/1.2.6:
     resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==}
+    dev: true
 
   /mkdirp/1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
@@ -7195,7 +7209,6 @@ packages:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
-    dev: false
 
   /natural-compare/1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
@@ -7521,14 +7534,13 @@ packages:
   /postcss-value-parser/4.1.0:
     resolution: {integrity: sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==}
 
-  /postcss/8.4.14:
-    resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==}
+  /postcss/8.4.20:
+    resolution: {integrity: sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
       nanoid: 3.3.4
       picocolors: 1.0.0
       source-map-js: 1.0.2
-    dev: false
 
   /prelude-ls/1.1.2:
     resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
@@ -7771,11 +7783,6 @@ packages:
       use-sync-external-store: 1.2.0_react@18.1.0
     dev: false
 
-  /react-refresh/0.14.0:
-    resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
   /react-router-dom/6.3.0_ef5jwxihqo6n7gxfmzogljlgcm:
     resolution: {integrity: sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==}
     peerDependencies:
@@ -7827,16 +7834,6 @@ packages:
     engines: {node: '>=8.10.0'}
     dependencies:
       picomatch: 2.3.1
-    dev: false
-
-  /recrawl-sync/2.2.2:
-    resolution: {integrity: sha512-E2sI4F25Fu2nrfV+KsnC7/qfk/spQIYXlonfQoS4rwxeNK5BjxnLPbWiRXHVXPwYBOTWtPX5765kTm/zJiL+LQ==}
-    dependencies:
-      '@cush/relative': 1.0.0
-      glob-regex: 0.3.2
-      slash: 3.0.0
-      tslib: 1.13.0
-    dev: false
 
   /redent/3.0.0:
     resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
@@ -8006,13 +8003,12 @@ packages:
       glob: 7.2.0
     dev: true
 
-  /rollup/2.77.0:
-    resolution: {integrity: sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==}
-    engines: {node: '>=10.0.0'}
+  /rollup/3.7.3:
+    resolution: {integrity: sha512-7e68MQbAWCX6mI4/0lG1WHd+NdNAlVamg0Zkd+8LZ/oXojligdGnCNyHlzXqXCZObyjs5FRc3AH0b17iJESGIQ==}
+    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
       fsevents: 2.3.2
-    dev: false
 
   /run-async/2.4.1:
     resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
@@ -8057,7 +8053,6 @@ packages:
       chokidar: 3.5.2
       immutable: 4.0.0
       source-map-js: 1.0.2
-    dev: false
 
   /saxes/6.0.0:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
@@ -8151,7 +8146,6 @@ packages:
   /source-map-js/1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
-    dev: false
 
   /source-map-resolve/0.6.0:
     resolution: {integrity: sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==}
@@ -8171,10 +8165,6 @@ packages:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
-  /sourcemap-codec/1.4.8:
-    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
-    dev: false
-
   /spawn-command/0.0.2-1:
     resolution: {integrity: sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==}
     dev: true
@@ -8279,6 +8269,7 @@ packages:
   /strip-bom/3.0.0:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
     engines: {node: '>=4'}
+    dev: true
 
   /strip-bom/4.0.0:
     resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
@@ -8462,42 +8453,6 @@ packages:
     engines: {node: 10.* || >= 12.*}
     dev: true
 
-  /ts-jest/29.0.0_2zqe2lz5fp2msj34ct3vkutym4:
-    resolution: {integrity: sha512-OxUaigbv5Aon3OMLY9HBtwkGMs1upWE/URrmmVQFzzOcGlEPVuWzGmXUIkWGt/95Dj/T6MGuTrHHGL6kT6Yn8g==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    hasBin: true
-    peerDependencies:
-      '@babel/core': '>=7.0.0-beta.0 <8'
-      '@jest/types': ^29.0.0
-      babel-jest: ^29.0.0
-      esbuild: '*'
-      jest: ^29.0.0
-      typescript: '>=4.3'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      '@jest/types':
-        optional: true
-      babel-jest:
-        optional: true
-      esbuild:
-        optional: true
-    dependencies:
-      '@babel/core': 7.18.2
-      '@jest/types': 29.0.3
-      babel-jest: 29.0.3_@babel+core@7.18.2
-      bs-logger: 0.2.6
-      fast-json-stable-stringify: 2.1.0
-      jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
-      jest-util: 29.0.3
-      json5: 2.2.1
-      lodash.memoize: 4.1.2
-      make-error: 1.3.6
-      semver: 7.3.7
-      typescript: 4.7.4
-      yargs-parser: 21.0.1
-    dev: true
-
   /ts-morph/13.0.3:
     resolution: {integrity: sha512-pSOfUMx8Ld/WUreoSzvMFQG5i9uEiWIsBYjpU9+TTASOeUa89j5HykomeqVULm1oqWtBdleI3KEFRLrlA3zGIw==}
     dependencies:
@@ -8505,7 +8460,7 @@ packages:
       code-block-writer: 11.0.1
     dev: true
 
-  /ts-node/10.8.1_t4lrjbt3sxauai4t5o275zsepa:
+  /ts-node/10.8.1_seagpw47opwyivxvtfydnuwcuy:
     resolution: {integrity: sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==}
     hasBin: true
     peerDependencies:
@@ -8520,6 +8475,7 @@ packages:
         optional: true
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
+      '@swc/core': 1.3.22
       '@tsconfig/node10': 1.0.9
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
@@ -8547,6 +8503,19 @@ packages:
       ts-morph: 13.0.3
     dev: true
 
+  /tsconfck/2.0.1_typescript@4.7.4:
+    resolution: {integrity: sha512-/ipap2eecmVBmBlsQLBRbUmUNFwNJV/z2E+X0FPtHNjPwroMZQ7m39RMaCywlCulBheYXgMdUlWDd9rzxwMA0Q==}
+    engines: {node: ^14.13.1 || ^16 || >=18, pnpm: ^7.0.1}
+    hasBin: true
+    peerDependencies:
+      typescript: ^4.3.5
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      typescript: 4.7.4
+    dev: false
+
   /tsconfig-paths/3.14.1:
     resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
     dependencies:
@@ -8556,16 +8525,9 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /tsconfig-paths/4.0.0:
-    resolution: {integrity: sha512-SLBg2GBKlR6bVtMgJJlud/o3waplKtL7skmLkExomIiaAtLGtVsoXIqP3SYdjbcH9lq/KVv7pMZeCBpLYOit6Q==}
-    dependencies:
-      json5: 2.2.1
-      minimist: 1.2.6
-      strip-bom: 3.0.0
-    dev: false
-
   /tslib/1.13.0:
     resolution: {integrity: sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==}
+    dev: true
 
   /tslib/2.0.3:
     resolution: {integrity: sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==}
@@ -8713,47 +8675,53 @@ packages:
       '@types/istanbul-lib-coverage': 2.0.3
       convert-source-map: 1.7.0
 
-  /vite-tsconfig-paths/3.5.0_vite@3.0.2:
-    resolution: {integrity: sha512-NKIubr7gXgh/3uniQaOytSg+aKWPrjquP6anAy+zCWEn6h9fB8z2/qdlfQrTgZWaXJ2pHVlllrSdRZltHn9P4g==}
+  /vite-tsconfig-paths/4.0.2_eqmiqdrctagsk5ranq2vs4ssty:
+    resolution: {integrity: sha512-UzU8zwbCQrdUkj/Z0tnh293n4ScRcjJLoS8nPme2iB2FHoU5q8rhilb7AbhLlUC1uv4t6jSzVWnENjPnyGseeQ==}
     peerDependencies:
       vite: '>2.0.0-0'
     dependencies:
       debug: 4.3.4
       globrex: 0.1.2
-      recrawl-sync: 2.2.2
-      tsconfig-paths: 4.0.0
-      vite: 3.0.2_sass@1.52.3
+      tsconfck: 2.0.1_typescript@4.7.4
+      vite: 4.0.0_binvsr2w2vzqveeue6ibz2djda
     transitivePeerDependencies:
       - supports-color
+      - typescript
     dev: false
 
-  /vite/3.0.2_sass@1.52.3:
-    resolution: {integrity: sha512-TAqydxW/w0U5AoL5AsD9DApTvGb2iNbGs3sN4u2VdT1GFkQVUfgUldt+t08TZgi23uIauh1TUOQJALduo9GXqw==}
+  /vite/4.0.0_binvsr2w2vzqveeue6ibz2djda:
+    resolution: {integrity: sha512-ynad+4kYs8Jcnn8J7SacS9vAbk7eMy0xWg6E7bAhS1s79TK+D7tVFGXVZ55S7RNLRROU1rxoKlvZ/qjaB41DGA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
+      '@types/node': '>= 14'
       less: '*'
       sass: '*'
       stylus: '*'
+      sugarss: '*'
       terser: ^5.4.0
     peerDependenciesMeta:
+      '@types/node':
+        optional: true
       less:
         optional: true
       sass:
         optional: true
       stylus:
         optional: true
+      sugarss:
+        optional: true
       terser:
         optional: true
     dependencies:
-      esbuild: 0.14.49
-      postcss: 8.4.14
+      '@types/node': 16.11.7
+      esbuild: 0.16.4
+      postcss: 8.4.20
       resolve: 1.22.1
-      rollup: 2.77.0
+      rollup: 3.7.3
       sass: 1.52.3
     optionalDependencies:
       fsevents: 2.3.2
-    dev: false
 
   /w3c-hr-time/1.0.2:
     resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 682e9d21ca4..f5ac957e2e8 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -14,7 +14,7 @@ import theme from 'theme/theme';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { showServerError } from 'lib/errorHandling';
 import { Toaster } from 'react-hot-toast';
-import GlobalCSS from 'components/global.css';
+import GlobalCSS from 'components/globalCss';
 import * as S from 'components/App.styled';
 
 import ConfirmationModal from './common/ConfirmationModal/ConfirmationModal';
diff --git a/kafka-ui-react-app/src/components/Connect/New/New.tsx b/kafka-ui-react-app/src/components/Connect/New/New.tsx
index f1232bae462..2e399359425 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/New.tsx
@@ -147,7 +147,7 @@ const New: React.FC = () => {
             control={control}
             name="config"
             render={({ field }) => (
-              <Editor {...field} readOnly={isSubmitting} />
+              <Editor {...field} readOnly={isSubmitting} ref={null} />
             )}
           />
           <FormError>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
index 195e71411a0..0ed5504e793 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
@@ -77,7 +77,6 @@ describe('Details component', () => {
     });
 
     it('renders search input', async () => {
-      await renderComponent();
       expect(
         screen.getByPlaceholderText('Search by Topic Name')
       ).toBeInTheDocument();
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
index b4c852f1457..3b58c376e93 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import Details from 'components/Schemas/Details/Details';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterSchemaPath } from 'lib/paths';
-import { screen, waitFor } from '@testing-library/dom';
+import { screen } from '@testing-library/dom';
 import {
   schemasInitialState,
   schemaVersion,
@@ -50,44 +50,17 @@ describe('Details', () => {
   afterEach(() => fetchMock.reset());
 
   describe('fetch failed', () => {
-    beforeEach(async () => {
+    it('renders pageloader', async () => {
       const schemasAPILatestMock = fetchMock.getOnce(schemasAPILatestUrl, 404);
       const schemasAPIVersionsMock = fetchMock.getOnce(
         schemasAPIVersionsUrl,
         404
       );
-      await renderComponent();
-
-      await waitFor(() => {
-        expect(schemasAPILatestMock.called()).toBeTruthy();
-      });
-      await waitFor(() => {
-        expect(schemasAPIVersionsMock.called()).toBeTruthy();
-      });
-    });
-
-    it('handles [Delete schema] click', async () => {
-      const deleteSchemaMock = fetchMock.deleteOnce(
-        `/api/clusters/${clusterName}/schemas/${schemaVersion.subject}`,
-        200
-      );
-
       await act(() => {
         renderComponent();
       });
-
-      try {
-        expect(deleteSchemaMock.called()).toBeTruthy();
-        expect(mockHistoryPush).toHaveBeenCalledTimes(1);
-        expect(mockHistoryPush).toHaveBeenCalledWith(
-          clusterSchemaPath(clusterName)
-        );
-      } catch (e) {
-        expect(deleteSchemaMock.called()).toBeTruthy();
-      }
-    });
-
-    it('renders pageloader', () => {
+      expect(schemasAPILatestMock.called(schemasAPILatestUrl)).toBeTruthy();
+      expect(schemasAPIVersionsMock.called(schemasAPIVersionsUrl)).toBeTruthy();
       expect(screen.getByRole('progressbar')).toBeInTheDocument();
       expect(screen.queryByText(schemaVersion.subject)).not.toBeInTheDocument();
       expect(screen.queryByText('Edit Schema')).not.toBeInTheDocument();
@@ -97,7 +70,7 @@ describe('Details', () => {
 
   describe('fetch success', () => {
     describe('has schema versions', () => {
-      beforeEach(async () => {
+      it('renders component with schema info', async () => {
         const schemasAPILatestMock = fetchMock.getOnce(
           schemasAPILatestUrl,
           schemaVersion
@@ -109,15 +82,8 @@ describe('Details', () => {
         await act(() => {
           renderComponent();
         });
-        await waitFor(() => {
-          expect(schemasAPILatestMock.called()).toBeTruthy();
-        });
-        await waitFor(() => {
-          expect(schemasAPIVersionsMock.called()).toBeTruthy();
-        });
-      });
-
-      it('renders component with schema info', () => {
+        expect(schemasAPILatestMock.called()).toBeTruthy();
+        expect(schemasAPIVersionsMock.called()).toBeTruthy();
         expect(screen.getByText('Edit Schema')).toBeInTheDocument();
         expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
         expect(screen.getByRole('table')).toBeInTheDocument();
@@ -126,7 +92,7 @@ describe('Details', () => {
 
     describe('fetch success schema with non ascii characters', () => {
       describe('has schema versions', () => {
-        beforeEach(async () => {
+        it('renders component with schema info', async () => {
           const schemasAPILatestMock = fetchMock.getOnce(
             schemasAPILatestUrl,
             schemaVersionWithNonAsciiChars
@@ -138,15 +104,8 @@ describe('Details', () => {
           await act(() => {
             renderComponent();
           });
-          await waitFor(() => {
-            expect(schemasAPILatestMock.called()).toBeTruthy();
-          });
-          await waitFor(() => {
-            expect(schemasAPIVersionsMock.called()).toBeTruthy();
-          });
-        });
-
-        it('renders component with schema info', () => {
+          expect(schemasAPILatestMock.called()).toBeTruthy();
+          expect(schemasAPIVersionsMock.called()).toBeTruthy();
           expect(screen.getByText('Edit Schema')).toBeInTheDocument();
           expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
           expect(screen.getByRole('table')).toBeInTheDocument();
@@ -167,12 +126,8 @@ describe('Details', () => {
         await act(() => {
           renderComponent();
         });
-        await waitFor(() => {
-          expect(schemasAPILatestMock.called()).toBeTruthy();
-        });
-        await waitFor(() => {
-          expect(schemasAPIVersionsMock.called()).toBeTruthy();
-        });
+        expect(schemasAPILatestMock.called()).toBeTruthy();
+        expect(schemasAPIVersionsMock.called()).toBeTruthy();
       });
 
       // seems like incorrect behaviour
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx
index 0a302757a8d..618a0e6c302 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/__tests__/Edit.spec.tsx
@@ -7,7 +7,7 @@ import {
   schemaVersion,
   schemaVersionWithNonAsciiChars,
 } from 'redux/reducers/schemas/__test__/fixtures';
-import { screen, waitFor } from '@testing-library/dom';
+import { screen } from '@testing-library/dom';
 import ClusterContext, {
   ContextProps,
   initialValue as contextInitialValue,
@@ -42,28 +42,14 @@ const renderComponent = (
 describe('Edit', () => {
   afterEach(() => fetchMock.reset());
 
-  describe('fetch failed', () => {
-    it('renders page loader', async () => {
-      const schemasAPILatestMock = fetchMock.getOnce(schemasAPILatestUrl, 404);
-      await renderComponent();
-      await waitFor(() => expect(schemasAPILatestMock.called()).toBeTruthy());
-      expect(screen.getByRole('progressbar')).toBeInTheDocument();
-      expect(screen.queryByText(schemaVersion.subject)).not.toBeInTheDocument();
-      expect(screen.queryByText('Submit')).not.toBeInTheDocument();
-    });
-  });
-
   describe('fetch success', () => {
     describe('has schema versions', () => {
       it('renders component with schema info', async () => {
-        const schemasAPILatestMock = fetchMock.getOnce(
-          schemasAPILatestUrl,
-          schemaVersion
-        );
+        fetchMock.getOnce(schemasAPILatestUrl, schemaVersion);
         await act(() => {
           renderComponent();
         });
-        await waitFor(() => expect(schemasAPILatestMock.called()).toBeTruthy());
+        expect(fetchMock.called(schemasAPILatestUrl)).toBeTruthy();
         expect(screen.getByText('Submit')).toBeInTheDocument();
         expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
       });
@@ -73,14 +59,11 @@ describe('Edit', () => {
   describe('fetch success schema with non ascii characters', () => {
     describe('has schema versions', () => {
       it('renders component with schema info', async () => {
-        const schemasAPILatestMock = fetchMock.getOnce(
-          schemasAPILatestUrl,
-          schemaVersionWithNonAsciiChars
-        );
+        fetchMock.getOnce(schemasAPILatestUrl, schemaVersionWithNonAsciiChars);
         await act(() => {
           renderComponent();
         });
-        await waitFor(() => expect(schemasAPILatestMock.called()).toBeTruthy());
+        expect(fetchMock.called(schemasAPILatestUrl)).toBeTruthy();
         expect(screen.getByText('Submit')).toBeInTheDocument();
         expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
       });
diff --git a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
index 0af62ba2ffe..af0d9e8d3a9 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import New from 'components/Schemas/New/New';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterSchemaNewPath } from 'lib/paths';
-import { screen, waitFor } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 const clusterName = 'local';
@@ -10,26 +10,30 @@ const subjectValue = 'subject';
 const schemaValue = 'schema';
 
 describe('New Component', () => {
-  beforeEach(() => {
-    waitFor(() => {
-      render(
-        <WithRoute path={clusterSchemaNewPath()}>
-          <New />
-        </WithRoute>,
-        {
-          initialEntries: [clusterSchemaNewPath(clusterName)],
-        }
-      );
-    });
+  const renderComponent = async () => {
+    render(
+      <WithRoute path={clusterSchemaNewPath()}>
+        <New />
+      </WithRoute>,
+      {
+        initialEntries: [clusterSchemaNewPath(clusterName)],
+      }
+    );
+  };
+
+  beforeEach(async () => {
+    await act(renderComponent);
   });
 
-  it('renders component', () => {
+  it('renders component', async () => {
     expect(screen.getByText('Create')).toBeInTheDocument();
   });
+
   it('submit button will be disabled while form fields are not filled', () => {
     const submitBtn = screen.getByRole('button', { name: /submit/i });
     expect(submitBtn).toBeDisabled();
   });
+
   it('submit button will be enabled when form fields are filled', async () => {
     const subject = screen.getByPlaceholderText('Schema Name');
     const schema = screen.getAllByRole('textbox')[1];
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
index 72baa05bc58..5e494cdfc8f 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
@@ -12,18 +12,18 @@ import {
 } from 'lib/hooks/api/topics';
 import TopicTable from 'components/Topics/List/TopicTable';
 import { clusterTopicsPath } from 'lib/paths';
+import { useAppDispatch } from 'lib/hooks/redux';
 
 const clusterName = 'test-cluster';
-const mockUnwrap = jest.fn();
-const useDispatchMock = () => jest.fn(() => ({ unwrap: mockUnwrap }));
-
-const getButtonByName = (name: string) => screen.getByRole('button', { name });
+const unwrapMock = jest.fn();
 
 jest.mock('lib/hooks/redux', () => ({
   ...jest.requireActual('lib/hooks/redux'),
-  useAppDispatch: useDispatchMock,
+  useAppDispatch: jest.fn(),
 }));
 
+const getButtonByName = (name: string) => screen.getByRole('button', { name });
+
 jest.mock('lib/hooks/api/topics', () => ({
   ...jest.requireActual('lib/hooks/api/topics'),
   useDeleteTopic: jest.fn(),
@@ -42,6 +42,9 @@ describe('TopicTable Components', () => {
     (useRecreateTopic as jest.Mock).mockImplementation(() => ({
       mutateAsync: recreateTopicMock,
     }));
+    (useAppDispatch as jest.Mock).mockImplementation(() => () => ({
+      unwrap: unwrapMock,
+    }));
   });
 
   const renderComponent = (
@@ -182,9 +185,9 @@ describe('TopicTable Components', () => {
             ).toBeInTheDocument();
             const confirmBtn = getButtonByName('Confirm');
             expect(confirmBtn).toBeInTheDocument();
-            expect(mockUnwrap).not.toHaveBeenCalled();
+            expect(unwrapMock).not.toHaveBeenCalled();
             await userEvent.click(confirmBtn);
-            expect(mockUnwrap).toHaveBeenCalledTimes(2);
+            expect(unwrapMock).toHaveBeenCalledTimes(2);
             expect(screen.getAllByRole('checkbox')[1]).not.toBeChecked();
             expect(screen.getAllByRole('checkbox')[2]).not.toBeChecked();
           });
@@ -279,7 +282,7 @@ describe('TopicTable Components', () => {
           await userEvent.click(
             screen.getByRole('button', { name: 'Confirm' })
           );
-          expect(mockUnwrap).toHaveBeenCalled();
+          expect(unwrapMock).toHaveBeenCalled();
         });
       });
 
diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index eeccf3267e9..f3d75d1bc8b 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -34,7 +34,6 @@ const renderComponent = (path: string) => {
     { initialEntries: [path] }
   );
 };
-
 const createTopicMock = jest.fn();
 describe('New', () => {
   beforeEach(() => {
@@ -42,9 +41,6 @@ describe('New', () => {
       createResource: createTopicMock,
     }));
   });
-  afterEach(() => {
-    mockNavigate.mockClear();
-  });
   it('checks header for create new', async () => {
     await act(() => {
       renderComponent(clusterTopicNewPath(clusterName));
@@ -52,19 +48,20 @@ describe('New', () => {
     expect(screen.getByRole('heading', { name: 'Create' })).toBeInTheDocument();
   });
 
-  it('checks header for copy', () => {
-    renderComponent(`${clusterTopicCopyPath(clusterName)}?name=test`);
+  it('checks header for copy', async () => {
+    await act(() => {
+      renderComponent(`${clusterTopicCopyPath(clusterName)}?name=test`);
+    });
     expect(screen.getByRole('heading', { name: 'Copy' })).toBeInTheDocument();
   });
   it('validates form', async () => {
-    await renderComponent(clusterTopicNewPath(clusterName));
+    renderComponent(clusterTopicNewPath(clusterName));
     await userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
     await userEvent.clear(screen.getByPlaceholderText('Topic Name'));
     await userEvent.tab();
     await expect(
       screen.getByText('name is a required field')
     ).toBeInTheDocument();
-
     await userEvent.type(
       screen.getByLabelText('Number of partitions *'),
       minValue
@@ -78,7 +75,6 @@ describe('New', () => {
     expect(createTopicMock).not.toHaveBeenCalled();
     expect(mockNavigate).not.toHaveBeenCalled();
   });
-
   it('validates form invalid name', async () => {
     renderComponent(clusterTopicNewPath(clusterName));
     await userEvent.type(
@@ -89,7 +85,6 @@ describe('New', () => {
       screen.getByText('Only alphanumeric, _, -, and . allowed')
     ).toBeInTheDocument();
   });
-
   it('submits valid form', async () => {
     renderComponent(clusterTopicNewPath(clusterName));
     await userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
index 3c43931688b..e3a4db8f443 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
@@ -10,11 +10,17 @@ import userEvent from '@testing-library/user-event';
 import { clusterTopicMessagesPath } from 'lib/paths';
 import { useSerdes } from 'lib/hooks/api/topicMessages';
 import { serdesPayload } from 'lib/fixtures/topicMessages';
+import { useTopicDetails } from 'lib/hooks/api/topics';
+import { externalTopicPayload } from 'lib/fixtures/topics';
 
 jest.mock('lib/hooks/api/topicMessages', () => ({
   useSerdes: jest.fn(),
 }));
 
+jest.mock('lib/hooks/api/topics', () => ({
+  useTopicDetails: jest.fn(),
+}));
+
 describe('Messages', () => {
   const searchParams = `?filterQueryType=STRING_CONTAINS&attempt=0&limit=100&seekDirection=${SeekDirection.FORWARD}&seekType=${SeekType.OFFSET}&seekTo=0::9`;
   const renderComponent = (param: string = searchParams) => {
@@ -37,6 +43,9 @@ describe('Messages', () => {
     (useSerdes as jest.Mock).mockImplementation(() => ({
       data: serdesPayload,
     }));
+    (useTopicDetails as jest.Mock).mockImplementation(() => ({
+      data: externalTopicPayload,
+    }));
   });
   describe('component rendering default behavior with the search params', () => {
     beforeEach(() => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
index e2aeb68bbba..7b1e80f8c27 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/MessagesTable.spec.tsx
@@ -21,16 +21,21 @@ jest.mock('react-router-dom', () => ({
 }));
 
 describe('MessagesTable', () => {
-  const seekToResult = '&seekTo=0::9';
-  const searchParamsValue = `?filterQueryType=STRING_CONTAINS&attempt=0&limit=100&seekDirection=${SeekDirection.FORWARD}&seekType=${SeekType.OFFSET}${seekToResult}`;
-  const searchParams = new URLSearchParams(searchParamsValue);
+  const searchParams = new URLSearchParams({
+    filterQueryType: 'STRING_CONTAINS',
+    attempt: '0',
+    limit: '100',
+    seekDirection: SeekDirection.FORWARD,
+    seekType: SeekType.OFFSET,
+    seekTo: '0::9',
+  });
   const contextValue: ContextProps = {
     isLive: false,
     seekDirection: SeekDirection.FORWARD,
     changeSeekDirection: jest.fn(),
   };
 
-  const setUpComponent = (
+  const renderComponent = (
     params: URLSearchParams = searchParams,
     ctx: ContextProps = contextValue,
     messages: TopicMessage[] = [],
@@ -43,7 +48,7 @@ describe('MessagesTable', () => {
         <MessagesTable />
       </TopicMessagesContext.Provider>,
       {
-        initialEntries: [customPath],
+        initialEntries: [`/messages?${customPath}`],
         preloadedState: {
           topicMessages: {
             messages,
@@ -59,7 +64,7 @@ describe('MessagesTable', () => {
 
   describe('Default props Setup for MessagesTable component', () => {
     beforeEach(() => {
-      setUpComponent();
+      renderComponent();
     });
 
     it('should check the render', () => {
@@ -86,20 +91,25 @@ describe('MessagesTable', () => {
 
   describe('Custom Setup with different props value', () => {
     it('should check if next button and previous is disabled isLive Param', () => {
-      setUpComponent(searchParams, { ...contextValue, isLive: true });
+      renderComponent(searchParams, { ...contextValue, isLive: true });
       expect(screen.queryByText(/next/i)).toBeDisabled();
       expect(screen.queryByText(/back/i)).toBeDisabled();
     });
 
     it('should check the display of the loader element', () => {
-      setUpComponent(searchParams, { ...contextValue, isLive: true }, [], true);
+      renderComponent(
+        searchParams,
+        { ...contextValue, isLive: true },
+        [],
+        true
+      );
       expect(screen.getByRole('progressbar')).toBeInTheDocument();
     });
   });
 
   describe('should render Messages table with data', () => {
     beforeEach(() => {
-      setUpComponent(searchParams, { ...contextValue }, mockTopicsMessages);
+      renderComponent(searchParams, { ...contextValue }, mockTopicsMessages);
     });
 
     it('should check the rendering of the messages', () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
index cada465548f..f2f133f89d9 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Partition, Replica } from 'generated-sources';
+import type { Partition, Replica } from 'generated-sources';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import Table from 'components/common/NewTable';
 import * as Metrics from 'components/common/Metrics';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
index 3f10635df52..d248757853d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
@@ -9,6 +9,7 @@ import userEvent from '@testing-library/user-event';
 import { clusterTopicPath } from 'lib/paths';
 import { Replica } from 'components/Topics/Topic/Overview/Overview.styled';
 import { useTopicDetails } from 'lib/hooks/api/topics';
+import { useAppDispatch } from 'lib/hooks/redux';
 import {
   externalTopicPayload,
   internalTopicPayload,
@@ -27,12 +28,11 @@ jest.mock('lib/hooks/api/topics', () => ({
   useTopicDetails: jest.fn(),
 }));
 
-const uwrapMock = jest.fn();
-const useDispatchMock = () => jest.fn(() => ({ unwrap: uwrapMock }));
+const unwrapMock = jest.fn();
 
 jest.mock('lib/hooks/redux', () => ({
   ...jest.requireActual('lib/hooks/redux'),
-  useAppDispatch: useDispatchMock,
+  useAppDispatch: jest.fn(),
 }));
 
 describe('Overview', () => {
@@ -54,6 +54,12 @@ describe('Overview', () => {
     );
   };
 
+  beforeEach(() => {
+    (useAppDispatch as jest.Mock).mockImplementation(() => () => ({
+      unwrap: unwrapMock,
+    }));
+  });
+
   it('at least one replica was rendered', () => {
     renderComponent();
     expect(screen.getByLabelText('replica-info')).toBeInTheDocument();
@@ -117,7 +123,7 @@ describe('Overview', () => {
 
       const clearMessagesButton = screen.getByText('Clear Messages');
       await userEvent.click(clearMessagesButton);
-      expect(uwrapMock).toHaveBeenCalledTimes(1);
+      expect(unwrapMock).toHaveBeenCalledTimes(1);
     });
   });
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
index 9baa8785e1b..a686b38e2ba 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
@@ -20,6 +20,7 @@ import {
   useRecreateTopic,
   useTopicDetails,
 } from 'lib/hooks/api/topics';
+import { useAppDispatch } from 'lib/hooks/redux';
 
 const mockNavigate = jest.fn();
 jest.mock('react-router-dom', () => ({
@@ -32,12 +33,11 @@ jest.mock('lib/hooks/api/topics', () => ({
   useRecreateTopic: jest.fn(),
 }));
 
-const mockUnwrap = jest.fn();
-const useDispatchMock = () => jest.fn(() => ({ unwrap: mockUnwrap }));
+const unwrapMock = jest.fn();
 
 jest.mock('lib/hooks/redux', () => ({
   ...jest.requireActual('lib/hooks/redux'),
-  useAppDispatch: useDispatchMock,
+  useAppDispatch: jest.fn(),
 }));
 
 jest.mock('components/Topics/Topic/Overview/Overview', () => () => (
@@ -98,6 +98,9 @@ describe('Details', () => {
     (useRecreateTopic as jest.Mock).mockImplementation(() => ({
       mutateAsync: mockRecreate,
     }));
+    (useAppDispatch as jest.Mock).mockImplementation(() => () => ({
+      unwrap: unwrapMock,
+    }));
   });
   describe('Action Bar', () => {
     describe('when it has readonly flag', () => {
@@ -142,7 +145,7 @@ describe('Details', () => {
           name: 'Confirm',
         })[0];
         await waitFor(() => userEvent.click(submitButton));
-        expect(mockUnwrap).toHaveBeenCalledTimes(1);
+        expect(unwrapMock).toHaveBeenCalledTimes(1);
       });
 
       it('closes the modal when cancel button is clicked', async () => {
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 2c80ac18b27..07cf338f10b 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -5,12 +5,14 @@ import {
   getExpandedRowModel,
   getSortedRowModel,
   useReactTable,
-  ColumnDef,
+  getPaginationRowModel,
+} from '@tanstack/react-table';
+import type {
   Row,
   SortingState,
   OnChangeFn,
   PaginationState,
-  getPaginationRowModel,
+  ColumnDef,
 } from '@tanstack/react-table';
 import { useSearchParams } from 'react-router-dom';
 import { PER_PAGE } from 'lib/constants';
diff --git a/kafka-ui-react-app/src/components/global.css.ts b/kafka-ui-react-app/src/components/globalCss.ts
similarity index 100%
rename from kafka-ui-react-app/src/components/global.css.ts
rename to kafka-ui-react-app/src/components/globalCss.ts
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
index 77ae2b35632..7b329779071 100644
--- a/kafka-ui-react-app/vite.config.ts
+++ b/kafka-ui-react-app/vite.config.ts
@@ -4,7 +4,7 @@ import {
   UserConfigExport,
   splitVendorChunkPlugin,
 } from 'vite';
-import react from '@vitejs/plugin-react';
+import react from '@vitejs/plugin-react-swc';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig(({ mode }) => {
@@ -25,7 +25,6 @@ export default defineConfig(({ mode }) => {
     },
   };
   const proxy = process.env.VITE_DEV_PROXY;
-
   if (mode === 'development' && proxy) {
     return {
       ...defaultConfig,

From 87ffb4716a2c634f3e68c8ce5a2a2a0e61203ee5 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Fri, 30 Dec 2022 15:21:51 +0200
Subject: [PATCH 358/734] [e2e]TopicTests.copyTopic : Copy topic (#3165)

* [e2e]TopicTests.copyTopic : Copy topic

* [e2e]TopicTests.copyTopic : Copy topic

* [e2e]TopicTests.copyTopic : Copy topic

* [e2e]First fix.TopicTests.copyTopic : Copy topic

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../kafka/ui/pages/topic/TopicsList.java      | 11 +++++--
 .../com/provectus/kafka/ui/base/BaseTest.java |  2 +-
 .../kafka/ui/suite/topics/TopicsTests.java    | 32 +++++++++++++++++++
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 871ecbb752f..f24df1e926a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -70,6 +70,12 @@ public List<SelenideElement> getActionButtons() {
           .collect(Collectors.toList());
     }
 
+    @Step
+    public TopicsList clickCopySelectedTopicBtn(){
+      copySelectedTopicBtn.shouldBe(Condition.enabled).click();
+      return this;
+    }
+
     private List<SelenideElement> getVisibleColumnHeaders() {
       return Stream.of("Replication Factor","Number of messages","Topic Name", "Partitions", "Out of sync replicas", "Size")
           .map(name -> $x(String.format(columnHeaderLocator, name)))
@@ -134,8 +140,9 @@ public TopicGridItem(SelenideElement element) {
       }
 
       @Step
-      public void selectItem(boolean select) {
-        selectElement(element.$x("./td[1]/input"), select);
+      public TopicsList selectItem(boolean select) {
+         selectElement(element.$x("./td[1]/input"), select);
+         return new TopicsList();
       }
 
       @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 3a48f9f962d..9290c0af3b4 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -34,7 +34,7 @@
 
 @Slf4j
 @DisplayNameGeneration(DisplayNameGenerator.class)
-public class BaseTest extends Facade {
+public abstract class BaseTest extends Facade {
 
   private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
   private static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 01eff46b980..89857df9675 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -471,6 +471,38 @@ void recreateTopicFromTopicProfile(){
         .as("isAlertWithMessageVisible()").isTrue();
   }
 
+  @DisplayName("TopicTests.copyTopic : Copy topic")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(8)
+  @Test
+  void checkCopyTopicPossibility(){
+    Topic topicToCopy = new Topic()
+        .setName("topic-to-copy-" + randomAlphabetic(5))
+        .setNumberOfPartitions(1);
+    navigateToTopics();
+    topicsList
+        .getTopicItem("_schemas")
+        .selectItem(true)
+        .clickCopySelectedTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady();
+    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
+    topicCreateEditForm
+        .setTopicName(topicToCopy.getName())
+        .setNumberOfPartitions(topicToCopy.getNumberOfPartitions())
+        .clickCreateTopicBtn();
+    topicDetails
+        .waitUntilScreenReady();
+    TOPIC_LIST.add(topicToCopy);
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully created."))
+        .as("isAlertWithMessageVisible()").isTrue();
+    softly.assertThat(topicDetails.isTopicHeaderVisible(topicToCopy.getName()))
+        .as("isTopicHeaderVisible()").isTrue();
+    softly.assertAll();
+  }
+
   @AfterAll
   public void afterAll() {
     TOPIC_LIST.forEach(topic -> apiService.deleteTopic(CLUSTER_NAME, topic.getName()));

From 0f908ce55f63c1dbc85904b3c50ea8b311f157ea Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 3 Jan 2023 14:51:04 +0400
Subject: [PATCH 359/734] [Docs] Update JMX in kafka-ui.yaml (#3173)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 documentation/compose/kafka-ui.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/documentation/compose/kafka-ui.yaml b/documentation/compose/kafka-ui.yaml
index e18c33aa3d4..32c874b6760 100644
--- a/documentation/compose/kafka-ui.yaml
+++ b/documentation/compose/kafka-ui.yaml
@@ -41,7 +41,6 @@ services:
       KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
       KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
       KAFKA_JMX_PORT: 9997
-      KAFKA_JMX_HOSTNAME: localhost
       KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9997
       KAFKA_PROCESS_ROLES: 'broker,controller'
       KAFKA_NODE_ID: 1
@@ -70,7 +69,6 @@ services:
       KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
       KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
       KAFKA_JMX_PORT: 9998
-      KAFKA_JMX_HOSTNAME: localhost
       KAFKA_JMX_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9998
       KAFKA_PROCESS_ROLES: 'broker,controller'
       KAFKA_NODE_ID: 1

From eef63466fb3aee13a63d8071b1abf3de425f3f2b Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 3 Jan 2023 14:52:28 +0400
Subject: [PATCH 360/734] [BE] Update tests for confluent platform 7+ (#3038)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../com/provectus/kafka/ui/KafkaConnectServiceTests.java     | 3 ++-
 .../provectus/kafka/ui/container/KafkaConnectContainer.java  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java
index e886a0884d7..f71149d3d8f 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui;
 
 import static java.util.function.Predicate.not;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.provectus.kafka.ui.model.ConnectorDTO;
@@ -335,7 +336,7 @@ public void shouldRetrieveConnectorPlugins() {
         .exchange()
         .expectStatus().isOk()
         .expectBodyList(ConnectorPluginDTO.class)
-        .value(plugins -> assertEquals(14, plugins.size()));
+        .value(plugins -> assertThat(plugins.size()).isGreaterThan(0));
   }
 
   @Test
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/container/KafkaConnectContainer.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/container/KafkaConnectContainer.java
index b0098b307f5..00ed50cc200 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/container/KafkaConnectContainer.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/container/KafkaConnectContainer.java
@@ -39,7 +39,10 @@ public KafkaConnectContainer withKafka(Network network, String bootstrapServers)
     withEnv("CONNECT_INTERNAL_VALUE_CONVERTER", "org.apache.kafka.connect.json.JsonConverter");
     withEnv("CONNECT_REST_ADVERTISED_HOST_NAME", "kafka-connect");
     withEnv("CONNECT_REST_PORT", String.valueOf(CONNECT_PORT));
-    withEnv("CONNECT_PLUGIN_PATH", "/usr/share/java,/usr/share/confluent-hub-components");
+    withEnv("CONNECT_PLUGIN_PATH",
+        "/usr/share/java,/usr/share/confluent-hub-components,"
+            // adding additional paths to find FileStreamSinkConnector
+            + "/usr/local/share/kafka/plugins,/usr/share/filestream-connectors");
     return self();
   }
 

From 9b87d3829b024ba89c28dec97394013a3c83973b Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 3 Jan 2023 18:29:33 +0300
Subject: [PATCH 361/734] Fix minor RBAC/auth NPEs, init null collections
 (#3185)

---
 .../com/provectus/kafka/ui/config/auth/OAuthProperties.java  | 5 +++--
 .../kafka/ui/config/auth/OAuthPropertiesConverter.java       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
index f79d217fa79..db192ae826b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.config.auth;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.PostConstruct;
@@ -31,13 +32,13 @@ public static class OAuth2Provider {
     private String clientName;
     private String redirectUri;
     private String authorizationGrantType;
-    private Set<String> scope;
+    private Set<String> scope = new HashSet<>();
     private String issuerUri;
     private String authorizationUri;
     private String tokenUri;
     private String userInfoUri;
     private String jwkSetUri;
     private String userNameAttribute;
-    private Map<String, String> customParams;
+    private Map<String, String> customParams = new HashMap<>();
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
index c3d20664914..8e4a8575a8c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
@@ -71,7 +71,7 @@ private static void applyGoogleTransformations(OAuth2Provider provider) {
   }
 
   private static boolean isGoogle(OAuth2Provider provider) {
-    return provider.getCustomParams().get(TYPE).equalsIgnoreCase(GOOGLE);
+    return GOOGLE.equalsIgnoreCase(provider.getCustomParams().get(TYPE));
   }
 }
 

From 9d9892752454e0522968ce225175fc1e6d03c322 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Tue, 3 Jan 2023 19:54:42 +0400
Subject: [PATCH 362/734] [FE] Implement a full support for custom context path
 (#3106)

* Vite Custom Plugin code initialization , ( not building on js file )

* Fix the lazy loading functionality in vite

* add lazy loading in the Cluster page

* minor comment code cleanup

* Remove un-necessary files for configuration of the vite

* minor naming modifications

* minor code modification to encode a variable in the root
---
 .../kafka/ui/controller/StaticController.java |  6 +-
 kafka-ui-react-app/index.html                 | 15 +--
 .../src/components/Cluster/Cluster.tsx        | 96 +++++++++----------
 .../Cluster/__tests__/Cluster.spec.tsx        |  5 +-
 kafka-ui-react-app/vite.config.ts             | 20 ++++
 5 files changed, 80 insertions(+), 62 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java
index 696f47073b7..72138c8010c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java
@@ -53,9 +53,7 @@ public String getRenderedFile(ServerWebExchange exchange, AtomicReference<String
   @SneakyThrows
   private String buildFile(Resource file, String contextPath) {
     return ResourceUtil.readAsString(file)
-        .replace("\"/assets/", "\"" + contextPath + "/assets/")
-        .replace("\"/favicon/", "\"" + contextPath + "/favicon/")
-        .replace("/manifest.json", contextPath + "/manifest.json")
-        .replace("window.basePath = ''", "window.basePath=\"" + contextPath + "\"");
+        .replace("\"assets/", "\"" + contextPath + "/assets/")
+        .replace("PUBLIC-PATH-VARIABLE",  contextPath);
   }
 }
diff --git a/kafka-ui-react-app/index.html b/kafka-ui-react-app/index.html
index 7b4ed2772aa..aa3f89f8f90 100644
--- a/kafka-ui-react-app/index.html
+++ b/kafka-ui-react-app/index.html
@@ -3,7 +3,6 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-
     <!-- Google fonts -->
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
@@ -13,14 +12,18 @@
     />
 
     <!-- Favicons -->
-    <link rel="icon" href="/favicon/favicon.ico" sizes="any" />
-    <link rel="icon" href="/favicon/icon.svg" type="image/svg+xml" />
-    <link rel="apple-touch-icon" href="/favicon/apple-touch-icon.png" />
-    <link rel="manifest" href="/manifest.json" />
+    <link rel="icon" href="PUBLIC-PATH-VARIABLE/favicon/favicon.ico" sizes="any" />
+    <link rel="icon" href="PUBLIC-PATH-VARIABLE/favicon/icon.svg" type="image/svg+xml" />
+    <link rel="apple-touch-icon" href="PUBLIC-PATH-VARIABLE/favicon/apple-touch-icon.png" />
+    <link rel="manifest" href="PUBLIC-PATH-VARIABLE/manifest.json" />
 
     <title>UI for Apache Kafka</title>
     <script type="text/javascript">
-      window.basePath = '';
+      window.basePath = 'PUBLIC-PATH-VARIABLE';
+
+      window.__assetsPathBuilder = function (importer) {
+        return window.basePath+ "/" + importer;
+      };
     </script>
   </head>
 
diff --git a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
index 11cc975b4ff..89c4931754c 100644
--- a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
@@ -16,23 +16,15 @@ import {
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { useClusters } from 'lib/hooks/api/clusters';
-import Brokers from 'components/Brokers/Brokers';
-import Topics from 'components/Topics/Topics';
-import Schemas from 'components/Schemas/Schemas';
-import Connect from 'components/Connect/Connect';
-import KsqlDb from 'components/KsqlDb/KsqlDb';
-import ConsumerGroups from 'components/ConsumerGroups/ConsumerGroups';
 
-// We can't use Lazy loading till we have a better way to update publicPath in runtime
-// Now java app replaces paths in builded index.html file.
-// const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
-// const Topics = React.lazy(() => import('components/Topics/Topics'));
-// const Schemas = React.lazy(() => import('components/Schemas/Schemas'));
-// const Connect = React.lazy(() => import('components/Connect/Connect'));
-// const KsqlDb = React.lazy(() => import('components/KsqlDb/KsqlDb'));
-// const ConsumerGroups = React.lazy(
-//   () => import('components/ConsumerGroups/ConsumerGroups')
-// );
+const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
+const Topics = React.lazy(() => import('components/Topics/Topics'));
+const Schemas = React.lazy(() => import('components/Schemas/Schemas'));
+const Connect = React.lazy(() => import('components/Connect/Connect'));
+const KsqlDb = React.lazy(() => import('components/KsqlDb/KsqlDb'));
+const ConsumerGroups = React.lazy(
+  () => import('components/ConsumerGroups/ConsumerGroups')
+);
 
 const Cluster: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
@@ -59,49 +51,51 @@ const Cluster: React.FC = () => {
   return (
     <Suspense fallback={<PageLoader />}>
       <ClusterContext.Provider value={contextValue}>
-        <Routes>
-          <Route
-            path={getNonExactPath(clusterBrokerRelativePath)}
-            element={<Brokers />}
-          />
-          <Route
-            path={getNonExactPath(clusterTopicsRelativePath)}
-            element={<Topics />}
-          />
-          <Route
-            path={getNonExactPath(clusterConsumerGroupsRelativePath)}
-            element={<ConsumerGroups />}
-          />
-          {contextValue.hasSchemaRegistryConfigured && (
+        <Suspense fallback={<PageLoader />}>
+          <Routes>
             <Route
-              path={getNonExactPath(clusterSchemasRelativePath)}
-              element={<Schemas />}
+              path={getNonExactPath(clusterBrokerRelativePath)}
+              element={<Brokers />}
             />
-          )}
-          {contextValue.hasKafkaConnectConfigured && (
             <Route
-              path={getNonExactPath(clusterConnectsRelativePath)}
-              element={<Connect />}
+              path={getNonExactPath(clusterTopicsRelativePath)}
+              element={<Topics />}
             />
-          )}
-          {contextValue.hasKafkaConnectConfigured && (
             <Route
-              path={getNonExactPath(clusterConnectorsRelativePath)}
-              element={<Connect />}
+              path={getNonExactPath(clusterConsumerGroupsRelativePath)}
+              element={<ConsumerGroups />}
             />
-          )}
-          {contextValue.hasKsqlDbConfigured && (
+            {contextValue.hasSchemaRegistryConfigured && (
+              <Route
+                path={getNonExactPath(clusterSchemasRelativePath)}
+                element={<Schemas />}
+              />
+            )}
+            {contextValue.hasKafkaConnectConfigured && (
+              <Route
+                path={getNonExactPath(clusterConnectsRelativePath)}
+                element={<Connect />}
+              />
+            )}
+            {contextValue.hasKafkaConnectConfigured && (
+              <Route
+                path={getNonExactPath(clusterConnectorsRelativePath)}
+                element={<Connect />}
+              />
+            )}
+            {contextValue.hasKsqlDbConfigured && (
+              <Route
+                path={getNonExactPath(clusterKsqlDbRelativePath)}
+                element={<KsqlDb />}
+              />
+            )}
             <Route
-              path={getNonExactPath(clusterKsqlDbRelativePath)}
-              element={<KsqlDb />}
+              path="/"
+              element={<Navigate to={clusterBrokerRelativePath} replace />}
             />
-          )}
-          <Route
-            path="/"
-            element={<Navigate to={clusterBrokerRelativePath} replace />}
-          />
-        </Routes>
-        <Outlet />
+          </Routes>
+          <Outlet />
+        </Suspense>
       </ClusterContext.Provider>
     </Suspense>
   );
diff --git a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
index 9fcb77a79a9..d7b2c6d2bb2 100644
--- a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
+++ b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Cluster, ClusterFeaturesEnum } from 'generated-sources';
 import ClusterComponent from 'components/Cluster/Cluster';
-import { screen } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
 import {
   clusterBrokersPath,
@@ -59,6 +59,9 @@ describe('Cluster', () => {
       </WithRoute>,
       { initialEntries: [pathname] }
     );
+    await waitFor(() => {
+      expect(screen.queryByRole('progressbar')).not.toBeInTheDocument();
+    });
   };
 
   it('renders Brokers', async () => {
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
index 7b329779071..3320bb8cd87 100644
--- a/kafka-ui-react-app/vite.config.ts
+++ b/kafka-ui-react-app/vite.config.ts
@@ -18,6 +18,26 @@ export default defineConfig(({ mode }) => {
     build: {
       outDir: 'build',
     },
+    experimental: {
+      renderBuiltUrl(
+        filename: string,
+        {
+          hostType,
+        }: {
+          hostId: string;
+          hostType: 'js' | 'css' | 'html';
+          type: 'asset' | 'public';
+        }
+      ) {
+        if (hostType === 'js') {
+          return {
+            runtime: `window.__assetsPathBuilder(${JSON.stringify(filename)})`,
+          };
+        }
+
+        return filename;
+      },
+    },
     define: {
       'process.env.NODE_ENV': `"${mode}"`,
       'process.env.VITE_TAG': `"${process.env.VITE_TAG}"`,

From c559b909db22cea4d46807021aa0be305acfd497 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Wed, 4 Jan 2023 08:50:22 +0400
Subject: [PATCH 363/734] Implement healthcheck for e2e (#3069)

* add health check

* add health checks
---
 documentation/compose/e2e-tests.yaml | 66 +++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/documentation/compose/e2e-tests.yaml b/documentation/compose/e2e-tests.yaml
index 205e6ec1d8a..2a422c54d45 100644
--- a/documentation/compose/e2e-tests.yaml
+++ b/documentation/compose/e2e-tests.yaml
@@ -7,10 +7,18 @@ services:
     image: provectuslabs/kafka-ui:latest
     ports:
       - 8080:8080
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider  http://localhost:8080/actuator/health
+      interval: 30s
+      timeout: 10s
+      retries: 10  
     depends_on:
-      - kafka0
-      - schemaregistry0
-      - kafka-connect0
+        kafka0:
+          condition: service_healthy
+        schemaregistry0:
+          condition: service_healthy
+        kafka-connect0:
+          condition: service_healthy
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
@@ -24,6 +32,11 @@ services:
     image: confluentinc/cp-kafka:7.2.1
     hostname: kafka0
     container_name: kafka0
+    healthcheck:
+     test: unset JMX_PORT && KAFKA_JMX_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9999" && kafka-broker-api-versions --bootstrap-server=localhost:9092
+     interval: 30s
+     timeout: 10s
+     retries: 10
     ports:
       - "9092:9092"
       - "9997:9997"
@@ -54,7 +67,13 @@ services:
     ports:
       - 8085:8085
     depends_on:
-      - kafka0
+      kafka0:
+          condition: service_healthy
+    healthcheck:
+     test: ["CMD", "timeout", "1", "curl", "--silent", "--fail", "http://schemaregistry0:8085/subjects"]
+     interval: 30s
+     timeout: 10s
+     retries: 10
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
@@ -73,8 +92,15 @@ services:
     ports:
       - 8083:8083
     depends_on:
-      - kafka0
-      - schemaregistry0
+      kafka0:
+          condition: service_healthy
+      schemaregistry0:
+          condition: service_healthy
+    healthcheck:
+      test: ["CMD", "nc", "127.0.0.1", "8083"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
     environment:
       CONNECT_BOOTSTRAP_SERVERS: kafka0:29092
       CONNECT_GROUP_ID: compose-connect-group
@@ -100,7 +126,8 @@ services:
     volumes:
       - ./message.json:/data/message.json
     depends_on:
-      - kafka0
+      kafka0:
+          condition: service_healthy
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
                cub kafka-ready -b kafka0:29092 1 30 && \
                kafka-topics --create --topic users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
@@ -114,6 +141,11 @@ services:
         image: postgres:9.6.22
     ports:
       - 5432:5432
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U dev_user"]
+      interval: 10s
+      timeout: 5s
+      retries: 5  
     environment:
       POSTGRES_USER: 'dev_user'
       POSTGRES_PASSWORD: '12345'
@@ -121,18 +153,28 @@ services:
   create-connectors:
     image: ellerbrock/alpine-bash-curl-ssl
     depends_on:
-      - postgres-db
-      - kafka-connect0
+      postgres-db:
+          condition: service_healthy
+      kafka-connect0:
+        condition: service_healthy
     volumes:
       - ./connectors:/connectors
     command: bash -c '/connectors/start.sh'
 
   ksqldb:
     image: confluentinc/ksqldb-server:0.18.0
+    healthcheck:
+      test: ["CMD", "timeout", "1", "curl", "--silent", "--fail", "http://localhost:8088/info"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
     depends_on:
-      - kafka0
-      - kafka-connect0
-      - schemaregistry0
+      kafka0:
+        condition: service_healthy
+      kafka-connect0:
+        condition: service_healthy
+      schemaregistry0:
+         condition: service_healthy
     ports:
       - 8088:8088
     environment:

From 53cdb684783817e7efab4fb75e1133cb25e857fb Mon Sep 17 00:00:00 2001
From: BulatKha <112083452+BulatKha@users.noreply.github.com>
Date: Wed, 4 Jan 2023 07:51:49 +0300
Subject: [PATCH 364/734] Update bug_report.md (#2908)

* Update bug_report.md

Added:
1. Actual result,
2. Suggestions on naming convention
3. CAPSed the system info partially and moved to top. Alternative: use the warning emoji and move outside the commented block
4. Specified few examples of additional context, that might help collecting more info n the bug.

* Update bug_report.md

replaced severity and priority suggestion.

* Update .github/ISSUE_TEMPLATE/bug_report.md

done

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>

* Update bug_report.md

- Moved actual and expected result together at the top
- Changed to "Alternative scenarios"
- Changed number 4 in additional context as well
-removed duplication of "Steps to reproduce"

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md | 30 ++++++++++++++++++----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index aee341a0feb..4ba9ce02f59 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -15,33 +15,36 @@ https://github.com/provectus/kafka-ui/discussions
 
 -->
 
-**Describe the bug**
-<!--(A clear and concise description of what the bug is.)-->
+<!--
+Please follow the naming conventions for bugs:
+<Feature/Area/Scope> :  <Compact, but specific problem summary> 
+Avoid generic titles, like “Topics: incorrect layout of message sorting drop-down list”. Better use something like: “Topics: Message sorting drop-down list overlaps the "Submit" button”.
+
+-->
 
+**Describe the bug** (Actual behavior)
+<!--(A clear and concise description of what the bug is.Use a list, if there is more than one problem)-->
+
+**Expected behavior**
+<!--(A clear and concise description of what you expected to happen.)-->
 
 **Set up**
 <!--
+WE MIGHT CLOSE THE ISSUE without further explanation IF YOU DON'T PROVIDE THIS INFORMATION.
+
 How do you run the app? Please provide as much info as possible:
 1. App version (docker image version or check commit hash in the top left corner in UI)
 2. Helm chart version, if you use one
 3. Any IAAC configs
-
-We might close the issue without further explanation if you don't provide such information.
 -->
 
 
 **Steps to Reproduce**
 <!-- We'd like you to provide an example setup (via docker-compose, helm, etc.) 
 to reproduce the problem, especially with a complex setups. -->
-Steps to reproduce the behavior:
 
 1. 
 
-**Expected behavior**
-<!--
-(A clear and concise description of what you expected to happen)
--->
-
 **Screenshots**
 <!--
 (If applicable, add screenshots to help explain your problem)
@@ -50,5 +53,10 @@ Steps to reproduce the behavior:
 
 **Additional context**
 <!--
-(Add any other context about the problem here)
+Add any other context about the problem here. E.g.: 
+1. Are there any alternative scenarios (different data/methods/configuration/setup) you have tried? 
+   Were they successfull or same issue occured? Please provide steps as well.
+2. Related issues (if there are any).
+3. Logs (if available)
+4. Is there any serious impact or behaviour on the end-user because of this issue, that can be overlooked?
 -->

From e1708550d5796da07ef3bc006f24bd82580da3c9 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Thu, 5 Jan 2023 11:33:44 +0400
Subject: [PATCH 365/734] [FE] Build fails after #2372 (#3192)

* Fix the dev environment for the front end.

* Fix the dependency installation location
---
 kafka-ui-react-app/index.html     | 10 +++----
 kafka-ui-react-app/package.json   |  3 +-
 kafka-ui-react-app/pnpm-lock.yaml | 50 +++++++++++++++++++++++++++++++
 kafka-ui-react-app/vite.config.ts | 10 ++++++-
 4 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-react-app/index.html b/kafka-ui-react-app/index.html
index aa3f89f8f90..33e18ad2688 100644
--- a/kafka-ui-react-app/index.html
+++ b/kafka-ui-react-app/index.html
@@ -12,14 +12,14 @@
     />
 
     <!-- Favicons -->
-    <link rel="icon" href="PUBLIC-PATH-VARIABLE/favicon/favicon.ico" sizes="any" />
-    <link rel="icon" href="PUBLIC-PATH-VARIABLE/favicon/icon.svg" type="image/svg+xml" />
-    <link rel="apple-touch-icon" href="PUBLIC-PATH-VARIABLE/favicon/apple-touch-icon.png" />
-    <link rel="manifest" href="PUBLIC-PATH-VARIABLE/manifest.json" />
+    <link rel="icon" href="<%= PUBLIC_PATH %>/favicon/favicon.ico" sizes="any" />
+    <link rel="icon" href="<%= PUBLIC_PATH %>/favicon/icon.svg" type="image/svg+xml" />
+    <link rel="apple-touch-icon" href="<%= PUBLIC_PATH %>/favicon/apple-touch-icon.png" />
+    <link rel="manifest" href="<%= PUBLIC_PATH %>/manifest.json" />
 
     <title>UI for Apache Kafka</title>
     <script type="text/javascript">
-      window.basePath = 'PUBLIC-PATH-VARIABLE';
+      window.basePath = '<%= PUBLIC_PATH %>';
 
       window.__assetsPathBuilder = function (importer) {
         return window.basePath+ "/" + importer;
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 6353452605a..a385c08c881 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -118,7 +118,8 @@
     "rimraf": "^3.0.2",
     "ts-node": "^10.8.1",
     "ts-prune": "^0.10.3",
-    "typescript": "^4.7.4"
+    "typescript": "^4.7.4",
+    "vite-plugin-ejs": "^1.6.4"
   },
   "engines": {
     "node": "v16.15.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 8a37026d6c3..b69eb15c985 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -85,6 +85,7 @@ specifiers:
   typescript: ^4.7.4
   use-debounce: ^8.0.1
   vite: ^4.0.0
+  vite-plugin-ejs: ^1.6.4
   vite-tsconfig-paths: ^4.0.2
   whatwg-fetch: ^3.6.2
   yup: ^0.32.11
@@ -181,6 +182,7 @@ devDependencies:
   ts-node: 10.8.1_seagpw47opwyivxvtfydnuwcuy
   ts-prune: 0.10.3
   typescript: 4.7.4
+  vite-plugin-ejs: 1.6.4
 
 packages:
 
@@ -4266,6 +4268,10 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /async/3.2.4:
+    resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}
+    dev: true
+
   /asynckit/0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
     dev: true
@@ -4514,6 +4520,12 @@ packages:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
+  /brace-expansion/2.0.1:
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+    dependencies:
+      balanced-match: 1.0.2
+    dev: true
+
   /braces/3.0.2:
     resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
     engines: {node: '>=8'}
@@ -5040,6 +5052,14 @@ packages:
       wcwidth: 1.0.1
     dev: true
 
+  /ejs/3.1.8:
+    resolution: {integrity: sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+    dependencies:
+      jake: 10.8.5
+    dev: true
+
   /electron-to-chromium/1.4.151:
     resolution: {integrity: sha512-XaG2LpZi9fdiWYOqJh0dJy4SlVywCvpgYXhzOlZTp4JqSKqxn5URqOjbm9OMYB3aInA2GuHQiem1QUOc1yT0Pw==}
 
@@ -5740,6 +5760,12 @@ packages:
       flat-cache: 3.0.4
     dev: true
 
+  /filelist/1.0.4:
+    resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
+    dependencies:
+      minimatch: 5.1.2
+    dev: true
+
   /fill-range/7.0.1:
     resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
     engines: {node: '>=8'}
@@ -6340,6 +6366,17 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /jake/10.8.5:
+    resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      async: 3.2.4
+      chalk: 4.1.2
+      filelist: 1.0.4
+      minimatch: 3.1.2
+    dev: true
+
   /jest-changed-files/29.0.0:
     resolution: {integrity: sha512-28/iDMDrUpGoCitTURuDqUzWQoWmOmOKOFST1mi2lwh62X4BFf6khgH3uSuo1e49X/UDjuApAj3w0wLOex4VPQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -7176,6 +7213,13 @@ packages:
     dependencies:
       brace-expansion: 1.1.11
 
+  /minimatch/5.1.2:
+    resolution: {integrity: sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==}
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimist/1.2.6:
     resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==}
     dev: true
@@ -8675,6 +8719,12 @@ packages:
       '@types/istanbul-lib-coverage': 2.0.3
       convert-source-map: 1.7.0
 
+  /vite-plugin-ejs/1.6.4:
+    resolution: {integrity: sha512-23p1RS4PiA0veXY5/gHZ60pl3pPvd8NEqdBsDgxNK8nM1rjFFDcVb0paNmuipzCgNP/Y0f/Id22M7Il4kvZ2jA==}
+    dependencies:
+      ejs: 3.1.8
+    dev: true
+
   /vite-tsconfig-paths/4.0.2_eqmiqdrctagsk5ranq2vs4ssty:
     resolution: {integrity: sha512-UzU8zwbCQrdUkj/Z0tnh293n4ScRcjJLoS8nPme2iB2FHoU5q8rhilb7AbhLlUC1uv4t6jSzVWnENjPnyGseeQ==}
     peerDependencies:
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
index 3320bb8cd87..189e72e7f9d 100644
--- a/kafka-ui-react-app/vite.config.ts
+++ b/kafka-ui-react-app/vite.config.ts
@@ -6,12 +6,20 @@ import {
 } from 'vite';
 import react from '@vitejs/plugin-react-swc';
 import tsconfigPaths from 'vite-tsconfig-paths';
+import { ViteEjsPlugin } from 'vite-plugin-ejs';
 
 export default defineConfig(({ mode }) => {
   process.env = { ...process.env, ...loadEnv(mode, process.cwd()) };
 
   const defaultConfig: UserConfigExport = {
-    plugins: [react(), tsconfigPaths(), splitVendorChunkPlugin()],
+    plugins: [
+      react(),
+      tsconfigPaths(),
+      splitVendorChunkPlugin(),
+      ViteEjsPlugin({
+        PUBLIC_PATH: mode !== 'development' ? 'PUBLIC-PATH-VARIABLE' : '',
+      }),
+    ],
     server: {
       port: 3000,
     },

From d7527f5cd7490594f6636789b563b264777e0ae5 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 6 Jan 2023 12:12:40 +0400
Subject: [PATCH 366/734] Update security policy version list

---
 SECURITY.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 26e7552b42b..7e2343711a9 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,7 +6,8 @@ Following versions of the project are currently being supported with security up
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.4.x   | :white_check_mark: |
+| 0.5.x   | :white_check_mark: |
+| 0.4.x   | :x: |
 | 0.3.x   | :x:                |
 | 0.2.x   | :x:                |
 | 0.1.x   | :x:                |

From f21e912a33d843b7cc781e94d7e8b2d987adf189 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 6 Jan 2023 16:41:38 +0400
Subject: [PATCH 367/734] Update readme: add producthunt badge

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a0ca023bc04..727468b8432 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@
 ![UI for Apache Kafka Price Free](documentation/images/free-open-source.svg)
 [![Release version](https://img.shields.io/github/v/release/provectus/kafka-ui)](https://github.com/provectus/kafka-ui/releases)
 [![Chat with us](https://img.shields.io/discord/897805035122077716)](https://discord.gg/4DWzD7pGE5)
+[![Product hunt](https://i.imgur.com/FTbs5O0.png)](https://www.producthunt.com/posts/ui-for-apache-kafka-2)
 
 ### DISCLAIMER
 <em>UI for Apache Kafka is a free tool built and supported by the open-source community. Curated by Provectus, it will remain free and open-source, without any paid features or subscription plans to be added in the future.

From a905946987d9b1f831b713eb5da3c02ee515edaf Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 9 Jan 2023 12:21:41 +0400
Subject: [PATCH 368/734] Update readme: remove producthunt badge

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 727468b8432..a0ca023bc04 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@
 ![UI for Apache Kafka Price Free](documentation/images/free-open-source.svg)
 [![Release version](https://img.shields.io/github/v/release/provectus/kafka-ui)](https://github.com/provectus/kafka-ui/releases)
 [![Chat with us](https://img.shields.io/discord/897805035122077716)](https://discord.gg/4DWzD7pGE5)
-[![Product hunt](https://i.imgur.com/FTbs5O0.png)](https://www.producthunt.com/posts/ui-for-apache-kafka-2)
 
 ### DISCLAIMER
 <em>UI for Apache Kafka is a free tool built and supported by the open-source community. Curated by Provectus, it will remain free and open-source, without any paid features or subscription plans to be added in the future.

From 8f6cbffa0d87de10d9d30ae0f7f4a42c5941d997 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 9 Jan 2023 14:04:46 +0200
Subject: [PATCH 369/734] [e2e] Add Local browser VM option (#3203)

* test commit

* fix BaseTest

* upd global

* upd global

* upd global

* add local browser VM option

* fix TopicsList column header locator
---
 kafka-ui-e2e-checks/README.md                 | 21 +---
 .../kafka/ui/pages/topic/TopicsList.java      |  2 +-
 .../kafka/ui/services/ApiService.java         | 46 ++++-----
 .../kafka/ui/settings/BaseSource.java         | 16 +++-
 .../kafka/ui/settings/configs/Config.java     |  4 +
 .../kafka/ui/settings/configs/Profiles.java   | 13 +++
 .../ui/settings/drivers/LocalWebDriver.java   | 67 +++++++++++++
 .../com/provectus/kafka/ui/base/BaseTest.java | 95 +++++++++++--------
 8 files changed, 178 insertions(+), 86 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Config.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java

diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index 2d303dd5a0a..42f17fc84a5 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -6,7 +6,6 @@ This repository is for E2E UI automation.
 
 - [Prerequisites](#prerequisites)
 - [How to install](#how-to-install)
-- [Environment variables](#environment-variables)
 - [How to run checks](#how-to-run-checks)
 - [Reporting](#reporting)
 - [Environments setup](#environments-setup)
@@ -27,22 +26,6 @@ git clone https://github.com/provectus/kafka-ui.git
 cd  kafka-ui-e2e-checks
 docker pull selenoid/vnc:chrome_86.0  
 ```
-### Environment variables
-
-|Name               	                |   Default   | Description
-|---------------------------------------|-------------|---------------------
-|`USE_LOCAL_BROWSER`                    |  `true`     | clear reports dir on startup
-|`CLEAR_REPORTS_DIR`                    |  `true`     | clear reports dir on startup
-|`SHOULD_START_SELENOID`                |  `false`    | starts selenoid container on startup
-|`SELENOID_URL`                         |  `http://localhost:4444/wd/hub`    | URL of remote selenoid instance
-|`BASE_URL`                             |  `http://192.168.1.2:8080/`    | base url for selenide configuration
-|`PIXELS_THRESHOLD`                     |  `200`    | Amount of pixels, that should be different to fail screenshot check
-|`SCREENSHOTS_FOLDER`                   |  `screenshots/`    | folder for keeping reference screenshots
-|`DIFF_SCREENSHOTS_FOLDER`              |  `build/__diff__/`    | folder for keeping  screenshots diffs
-|`ACTUAL_SCREENSHOTS_FOLDER`            |  `build/__actual__/`   | folder for keeping  actual screenshots(during checks)
-|`SHOULD_SAVE_SCREENSHOTS_IF_NOT_EXIST` |  `true`    | folder for keeping  actual screenshots(during checks)
-|`TURN_OFF_SCREENSHOTS`                 |  `false`    | If true, `compareScreenshots` will not fail on different screenshots. Useful for functional debugging on local machine, while preserving golden screenshots made in selenoid
-
 ### How to run checks
 
 1. Run `kafka-ui`: 
@@ -54,6 +37,10 @@ docker-compose -f documentation/compose/e2e-tests.yaml up -d
 ```
 ./mvnw -DQASEIO_API_TOKEN='%s' -pl '!kafka-ui-api' test -Pprod
 ```
+3. To run tests on your local Chrome browser just add next VM option to the Run Configuration
+```
+-Dbrowser=local
+```
 
 ### Reporting
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index f24df1e926a..1a28050369d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -15,7 +15,7 @@
 
 public class TopicsList extends BasePage {
 
-    protected SelenideElement topicListHeader = $x("//*[text()='Topics']");
+    protected SelenideElement topicListHeader = $x("//h1[text()='Topics']");
     protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
     protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
     protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index ec0bbe3bfb5..ad1fad76b2e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -1,5 +1,9 @@
 package com.provectus.kafka.ui.services;
 
+import static com.codeborne.selenide.Selenide.sleep;
+import static com.provectus.kafka.ui.settings.BaseSource.BASE_LOCAL_URL;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.provectus.kafka.ui.api.ApiClient;
 import com.provectus.kafka.ui.api.api.KafkaConnectApi;
@@ -13,58 +17,48 @@
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.settings.BaseSource;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.codeborne.selenide.Selenide.sleep;
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
-
 
 @Slf4j
 public class ApiService {
 
-    int partitions = 1;
-    int replicationFactor = 1;
-    String baseURL = BaseSource.BASE_API_URL;
-
-
     @SneakyThrows
     private TopicsApi topicApi() {
-        return new TopicsApi(new ApiClient().setBasePath(baseURL));
+      return new TopicsApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
     }
 
     @SneakyThrows
     private SchemasApi schemaApi() {
-        return new SchemasApi(new ApiClient().setBasePath(baseURL));
+      return new SchemasApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
     }
 
     @SneakyThrows
     private KafkaConnectApi connectorApi() {
-        return new KafkaConnectApi(new ApiClient().setBasePath(baseURL));
+      return new KafkaConnectApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
     }
 
     @SneakyThrows
     private MessagesApi messageApi() {
-        return new MessagesApi(new ApiClient().setBasePath(baseURL));
+      return new MessagesApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
     }
 
     @SneakyThrows
     public void createTopic(String clusterName, String topicName) {
-        TopicCreation topic = new TopicCreation();
-        topic.setName(topicName);
-        topic.setPartitions(partitions);
-        topic.setReplicationFactor(replicationFactor);
-        try {
-            topicApi().createTopic(clusterName, topic).block();
-            sleep(2000);
-        } catch (WebClientResponseException ex) {
-            ex.printStackTrace();
-        }
+      TopicCreation topic = new TopicCreation();
+      topic.setName(topicName);
+      topic.setPartitions(1);
+      topic.setReplicationFactor(1);
+      try {
+        topicApi().createTopic(clusterName, topic).block();
+        sleep(2000);
+      } catch (WebClientResponseException ex) {
+        ex.printStackTrace();
+      }
     }
 
     public void deleteTopic(String clusterName, String topicName) {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
index c0de5629318..e108d4e5540 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
@@ -1,8 +1,20 @@
 package com.provectus.kafka.ui.settings;
 
+import com.provectus.kafka.ui.settings.configs.Config;
+import org.aeonbits.owner.ConfigFactory;
+
 public abstract class BaseSource {
 
-  public static String BASE_API_URL = System.getProperty("BASE_URL", "http://localhost:8080");
-  public static String BASE_WEB_URL = System.getProperty("BASE_DOCKER_URL", "http://host.testcontainers.internal:8080");
+  private static Config config;
+  public static final String BASE_CONTAINER_URL = "http://host.testcontainers.internal:8080";
+  public static final String BASE_LOCAL_URL = "http://localhost:8080";
   public static final String CLUSTER_NAME = "local";
+  public static final String BROWSER = config().browser();
+
+  private static Config config() {
+    if (config == null) {
+      config = ConfigFactory.create(Config.class, System.getProperties());
+    }
+    return config;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Config.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Config.java
new file mode 100644
index 00000000000..5340db0176f
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Config.java
@@ -0,0 +1,4 @@
+package com.provectus.kafka.ui.settings.configs;
+
+public interface Config extends Profiles {
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
new file mode 100644
index 00000000000..9a5ca691076
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
@@ -0,0 +1,13 @@
+package com.provectus.kafka.ui.settings.configs;
+
+import org.aeonbits.owner.Config;
+
+public interface Profiles extends Config {
+
+  String CONTAINER = "container";
+  String LOCAL = "local";
+
+  @Key("browser")
+  @DefaultValue(CONTAINER)
+  String browser();
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java
new file mode 100644
index 00000000000..b1dabffc84d
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java
@@ -0,0 +1,67 @@
+package com.provectus.kafka.ui.settings.drivers;
+
+import static com.codeborne.selenide.Selenide.clearBrowserCookies;
+import static com.codeborne.selenide.Selenide.clearBrowserLocalStorage;
+import static com.codeborne.selenide.Selenide.open;
+import static com.codeborne.selenide.Selenide.refresh;
+
+import com.codeborne.selenide.Configuration;
+import com.codeborne.selenide.WebDriverRunner;
+import com.codeborne.selenide.logevents.SelenideLogger;
+import io.qameta.allure.Step;
+import io.qameta.allure.selenide.AllureSelenide;
+import org.openqa.selenium.chrome.ChromeOptions;
+
+public abstract class LocalWebDriver {
+
+  private static org.openqa.selenium.WebDriver getWebDriver() {
+    try {
+      return WebDriverRunner.getWebDriver();
+    } catch (IllegalStateException ex) {
+      Configuration.headless = false;
+      Configuration.browser = "chrome";
+      Configuration.browserSize = "1920x1080";
+      /**screenshots and savePageSource config is needed for local debug
+       * optionally can be set as 'false' to not duplicate Allure report
+       */
+      Configuration.screenshots = true;
+      Configuration.savePageSource = true;
+      Configuration.pageLoadTimeout = 120000;
+      Configuration.browserCapabilities = new ChromeOptions()
+          .addArguments("--lang=en_US");
+      open();
+      return WebDriverRunner.getWebDriver();
+    }
+  }
+
+  @Step
+  public static void openUrl(String url) {
+    if (!getWebDriver().getCurrentUrl().equals(url)) {
+      getWebDriver().get(url);
+    }
+  }
+
+  @Step
+  public static void browserInit() {
+    getWebDriver();
+  }
+
+  @Step
+  public static void browserClear() {
+    clearBrowserLocalStorage();
+    clearBrowserCookies();
+    refresh();
+  }
+
+  @Step
+  public static void browserQuit() {
+    getWebDriver().quit();
+  }
+
+  @Step
+  public static void loggerSetup() {
+    SelenideLogger.addListener("AllureSelenide", new AllureSelenide()
+        .screenshots(true)
+        .savePageSource(false));
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 9290c0af3b4..f7c6e5d0182 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -1,19 +1,22 @@
 package com.provectus.kafka.ui.base;
 
-import static com.codeborne.selenide.Selenide.clearBrowserCookies;
-import static com.codeborne.selenide.Selenide.clearBrowserLocalStorage;
-import static com.codeborne.selenide.Selenide.refresh;
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
-import static com.provectus.kafka.ui.settings.BaseSource.BASE_WEB_URL;
+import static com.provectus.kafka.ui.settings.BaseSource.BASE_CONTAINER_URL;
+import static com.provectus.kafka.ui.settings.BaseSource.BASE_LOCAL_URL;
+import static com.provectus.kafka.ui.settings.BaseSource.BROWSER;
+import static com.provectus.kafka.ui.settings.configs.Profiles.CONTAINER;
+import static com.provectus.kafka.ui.settings.configs.Profiles.LOCAL;
+import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.browserClear;
+import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.browserQuit;
+import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.loggerSetup;
+import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.openUrl;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
-import io.qameta.allure.Allure;
 import io.qase.api.annotation.Step;
-import java.io.ByteArrayInputStream;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.api.SoftAssertions;
@@ -23,8 +26,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.openqa.selenium.Dimension;
-import org.openqa.selenium.OutputType;
-import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.testcontainers.Testcontainers;
@@ -46,53 +47,67 @@ private static boolean isARM64() {
 
   @BeforeAll
   public static void start() {
-    DockerImageName image = isARM64()
-        ? DockerImageName.parse(SELENIARM_STANDALONE_CHROMIUM).asCompatibleSubstituteFor(SELENIUM_IMAGE_NAME)
-        : DockerImageName.parse(SELENIUM_IMAGE_NAME);
-    log.info("Using [{}] as image name for chrome", image.getUnversionedPart());
-    webDriverContainer = new BrowserWebDriverContainer<>(image)
-        .withEnv("JAVA_OPTS", "-Dwebdriver.chrome.whitelistedIps=")
-        .withCapabilities(new ChromeOptions()
-            .addArguments("--disable-dev-shm-usage")
-            .addArguments("--disable-gpu")
-            .addArguments("--no-sandbox")
-            .addArguments("--verbose")
-        )
-        .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
-    try {
-      Testcontainers.exposeHostPorts(8080);
-      log.info("Starting browser container");
-      webDriverContainer.start();
-    } catch (Throwable e) {
-      log.error("Couldn't start a container", e);
+    switch (BROWSER) {
+      case (CONTAINER) -> {
+        DockerImageName image = isARM64()
+            ? DockerImageName.parse(SELENIARM_STANDALONE_CHROMIUM).asCompatibleSubstituteFor(SELENIUM_IMAGE_NAME)
+            : DockerImageName.parse(SELENIUM_IMAGE_NAME);
+        log.info("Using [{}] as image name for chrome", image.getUnversionedPart());
+        webDriverContainer = new BrowserWebDriverContainer<>(image)
+            .withEnv("JAVA_OPTS", "-Dwebdriver.chrome.whitelistedIps=")
+            .withCapabilities(new ChromeOptions()
+                .addArguments("--disable-dev-shm-usage")
+                .addArguments("--disable-gpu")
+                .addArguments("--no-sandbox")
+                .addArguments("--verbose")
+            )
+            .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
+        try {
+          Testcontainers.exposeHostPorts(8080);
+          log.info("Starting browser container");
+          webDriverContainer.start();
+        } catch (Throwable e) {
+          log.error("Couldn't start a container", e);
+        }
+      }
+      case (LOCAL) -> loggerSetup();
+      default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
     }
   }
 
   @AfterAll
   public static void tearDown() {
-    if (webDriverContainer.isRunning()) {
-      webDriverContainer.close();
-      webDriverContainer.stop();
+    switch (BROWSER) {
+      case (CONTAINER) -> {
+        if (webDriverContainer.isRunning()) {
+          webDriverContainer.close();
+          webDriverContainer.stop();
+        }
+      }
+      case (LOCAL) -> browserQuit();
+      default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
     }
   }
 
   @BeforeEach
   public void beforeMethod() {
-    RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
-    WebDriverRunner.setWebDriver(remoteWebDriver);
-    remoteWebDriver.manage()
-        .window().setSize(new Dimension(1440, 1024));
-    Selenide.open(BASE_WEB_URL);
+    switch (BROWSER) {
+      case (CONTAINER) -> {
+        RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
+        WebDriverRunner.setWebDriver(remoteWebDriver);
+        remoteWebDriver.manage()
+            .window().setSize(new Dimension(1440, 1024));
+        Selenide.open(BASE_CONTAINER_URL);
+      }
+      case (LOCAL) -> openUrl(BASE_LOCAL_URL);
+      default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
+    }
     naviSideBar.waitUntilScreenReady();
   }
 
   @AfterEach
   public void afterMethod() {
-    Allure.addAttachment("Screenshot", new ByteArrayInputStream(((TakesScreenshot)
-        webDriverContainer.getWebDriver()).getScreenshotAs(OutputType.BYTES)));
-    clearBrowserLocalStorage();
-    clearBrowserCookies();
-    refresh();
+    browserClear();
   }
 
   @Step

From cf9b653e46e42f82ded7d6833285f4e9467a2c6f Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 9 Jan 2023 16:39:24 +0400
Subject: [PATCH 370/734] Fix aws publisher var type

---
 .github/workflows/aws_publisher.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/aws_publisher.yaml b/.github/workflows/aws_publisher.yaml
index 495f104c602..879a81ae43b 100644
--- a/.github/workflows/aws_publisher.yaml
+++ b/.github/workflows/aws_publisher.yaml
@@ -14,6 +14,7 @@ on:
         description: 'If set to true, the request to update AWS Server product version will be raised'
         required: true
         default: false
+        type: boolean
 
 jobs:
   build-ami:

From 0048a7eabdd078606768487af74c4403f8142b60 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 9 Jan 2023 17:24:09 +0400
Subject: [PATCH 371/734] Fix aws publisher var condition

---
 .github/workflows/aws_publisher.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/aws_publisher.yaml b/.github/workflows/aws_publisher.yaml
index 879a81ae43b..0d0f081f564 100644
--- a/.github/workflows/aws_publisher.yaml
+++ b/.github/workflows/aws_publisher.yaml
@@ -58,7 +58,7 @@ jobs:
 
       # add fresh AMI to AWS Marketplace
       - name: Publish Artifact at Marketplace
-        if: ${{ github.event.inputs.PublishOnMarketplace == true }}
+        if: ${{ github.event.inputs.PublishOnMarketplace == 'true' }}
         env:
           PRODUCT_ID: ${{ secrets.AWS_SERVER_PRODUCT_ID }}
           RELEASE_VERSION: "${{ github.event.inputs.KafkaUIReleaseVersion }}"

From 7fc94ecdbfc6aec961370e582cc3e261c81ffd2e Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Tue, 10 Jan 2023 14:34:58 +0200
Subject: [PATCH 372/734] [e2e]TopicTests.clearMessageOfTopic : Clear message
 of topic (#3208)

* [e2e]TopicTests.clearMessageOfTopic : Clear message of topic

* [e2e]First Fix.TopicTests.clearMessageOfTopic : Clear message of topic

* [e2e]First Fix.TopicTests.clearMessageOfTopic : Clear message of topic

* [e2e]First Fix.TopicTests.clearMessageOfTopic : Clear message of topic

* [e2e]Second Fix.TopicTests.clearMessageOfTopic : Clear message of topic
---
 .../provectus/kafka/ui/pages/BasePage.java    |  6 +++
 .../kafka/ui/pages/topic/TopicDetails.java    |  6 +--
 .../kafka/ui/pages/topic/TopicsList.java      | 39 +++++++++++++---
 .../ui/suite/topics/TopicMessagesTests.java   | 44 ++++++++++++++++++-
 4 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index cf559af1e2c..67bf5a7c590 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -18,6 +18,7 @@ public abstract class BasePage extends WebUtils {
   protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
   protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
   protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
+  protected SelenideElement confirmBtn = $x("//button[contains(text(),'Confirm')]");
   protected ElementsCollection allGridItems = $$x("//tr[@class]");
   protected String summaryCellLocator = "//div[contains(text(),'%s')]";
   protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
@@ -65,6 +66,11 @@ protected boolean isAlertVisible(AlertHeader header, String message) {
     return result;
   }
 
+  protected void clickConfirmButton() {
+    confirmBtn.shouldBe(Condition.enabled).click();
+    confirmBtn.shouldBe(Condition.disappear);
+  }
+
   public enum AlertHeader {
     SUCCESS("Success"),
     VALIDATION_ERROR("Validation Error"),
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 70d5934d048..bd8cbd3d02c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -36,7 +36,6 @@ public class TopicDetails extends BasePage {
   protected SelenideElement selectFilterBtnAddFilterMdl = $x("//button[text()='Select filter']");
   protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
   protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
-  protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
   protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
   protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
   protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
@@ -77,7 +76,7 @@ public TopicDetails openDotMenu() {
   }
 
   @Step
-  public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
+  public boolean isAlertWithMessageVisible(AlertHeader header, String message){
     return isAlertVisible(header, message);
   }
 
@@ -127,8 +126,7 @@ public TopicDetails clickDeleteTopicMenu() {
 
   @Step
   public TopicDetails clickConfirmBtnMdl() {
-    confirmBtn.shouldBe(Condition.enabled).click();
-    confirmBtn.shouldBe(Condition.disappear);
+    clickConfirmButton();
     return this;
   }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 1a28050369d..73e2610b7e9 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.pages.topic;
 
+import static com.codeborne.selenide.Condition.visible;
 import static com.codeborne.selenide.Selenide.$x;
 
 import com.codeborne.selenide.CollectionCondition;
@@ -22,11 +23,12 @@ public class TopicsList extends BasePage {
     protected SelenideElement deleteSelectedTopicsBtn = $x("//button[text()='Delete selected topics']");
     protected SelenideElement copySelectedTopicBtn = $x("//button[text()='Copy selected topic']");
     protected SelenideElement purgeMessagesOfSelectedTopicsBtn = $x("//button[text()='Purge messages of selected topics']");
+    protected SelenideElement clearMessagesBtn = $x("//ul[contains(@class ,'open')]//div[text()='Clear Messages']");
 
     @Step
     public TopicsList waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
-        topicListHeader.shouldBe(Condition.visible);
+        topicListHeader.shouldBe(visible);
         return this;
     }
 
@@ -38,7 +40,7 @@ public TopicsList clickAddTopicBtn() {
 
     @Step
     public boolean isTopicVisible(String topicName) {
-        tableGrid.shouldBe(Condition.visible);
+        tableGrid.shouldBe(visible);
         return isVisible(getTableElement(topicName));
     }
 
@@ -59,6 +61,12 @@ public TopicsList openTopic(String topicName) {
         return this;
     }
 
+    @Step
+    public TopicsList openDotMenuByTopicName(String topicName){
+      getTopicItem(topicName).openDotMenu();
+      return this;
+    }
+
     @Step
     public boolean isCopySelectedTopicBtnEnabled(){
       return isEnabled(copySelectedTopicBtn);
@@ -76,6 +84,23 @@ public TopicsList clickCopySelectedTopicBtn(){
       return this;
     }
 
+    @Step
+    public TopicsList clickClearMessagesBtn(){
+      clickByJavaScript(clearMessagesBtn.shouldBe(visible));
+      return this;
+    }
+
+    @Step
+    public TopicsList clickConfirmBtnMdl() {
+    clickConfirmButton();
+    return this;
+    }
+
+    @Step
+    public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
+      return isAlertVisible(header, message);
+    }
+
     private List<SelenideElement> getVisibleColumnHeaders() {
       return Stream.of("Replication Factor","Number of messages","Topic Name", "Partitions", "Out of sync replicas", "Size")
           .map(name -> $x(String.format(columnHeaderLocator, name)))
@@ -110,12 +135,12 @@ private List<TopicGridItem> initGridItems() {
       return gridItemList;
     }
 
-  @Step
-  public TopicGridItem getTopicItem(String name) {
-    return initGridItems().stream()
+    @Step
+    public TopicGridItem getTopicItem(String name) {
+      return initGridItems().stream()
         .filter(e -> e.getName().equals(name))
         .findFirst().orElse(null);
-  }
+    }
 
     @Step
     public List<TopicGridItem> getNonInternalTopics() {
@@ -149,7 +174,7 @@ public TopicsList selectItem(boolean select) {
       public boolean isInternal() {
         boolean internal = false;
         try {
-          element.$x("./td[2]/a/span").shouldBe(Condition.visible);
+          element.$x("./td[2]/a/span").shouldBe(visible);
           internal = true;
         } catch (Throwable ignored) {
         }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
index f18150f8347..22b3b6e97b8 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -5,6 +5,7 @@
 import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
@@ -33,11 +34,15 @@ public class TopicMessagesTests extends BaseTest {
       .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
       .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
       .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+  private static final Topic TOPIC_TO_CLEAR_MESSAGES = new Topic()
+      .setName("topic-to-clear-message-attribute-" + randomAlphabetic(5))
+      .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
+      .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
   private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
   @BeforeAll
   public void beforeAll() {
-    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES));
+    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_TO_CLEAR_MESSAGES));
     TOPIC_LIST.forEach(topic -> apiService.createTopic(CLUSTER_NAME, topic.getName()));
   }
 
@@ -108,7 +113,7 @@ void copyMessageFromTopicProfile() {
         .getRandomMessage()
         .openDotMenu()
         .clickCopyToClipBoard();
-    Assertions.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Copied successfully!"),
+    Assertions.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,"Copied successfully!"),
         "isAlertWithMessageVisible()");
   }
 
@@ -134,6 +139,41 @@ void checkingMessageFilteringByOffset() {
     softly.assertAll();
   }
 
+  @DisplayName("TopicTests.clearMessageOfTopic : Clear message of topic")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(239)
+  @Test
+  void checkClearTopicMessage() {
+    navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_MESSAGES.getName());
+    topicDetails
+        .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
+        .clickProduceMessageBtn();
+    produceMessagePanel
+        .waitUntilScreenReady()
+        .setContentFiled(TOPIC_TO_CLEAR_MESSAGES.getMessageContent())
+        .setKeyField(TOPIC_TO_CLEAR_MESSAGES.getMessageKey())
+        .submitProduceMessage();
+    topicDetails
+        .waitUntilScreenReady();
+    navigateToTopics();
+    topicsList
+        .waitUntilScreenReady();
+    assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_MESSAGES.getName()).getNumberOfMessages())
+        .as("getNumberOfMessages()").isEqualTo(1);
+    topicsList
+        .openDotMenuByTopicName(TOPIC_TO_CLEAR_MESSAGES.getName())
+        .clickClearMessagesBtn()
+        .clickConfirmBtnMdl();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicsList.isAlertWithMessageVisible(SUCCESS,
+        String.format("%s messages have been successfully cleared!",TOPIC_TO_CLEAR_MESSAGES.getName())))
+        .as("isAlertWithMessageVisible()").isTrue();
+    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_MESSAGES.getName()).getNumberOfMessages())
+        .as("getNumberOfMessages()").isEqualTo(0);
+    softly.assertAll();
+  }
+
   @AfterAll
   public void afterAll() {
     TOPIC_LIST.forEach(topic -> apiService.deleteTopic(CLUSTER_NAME, topic.getName()));

From 8ffd542a808c5476156d1070a21fd340adf64a6b Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Tue, 10 Jan 2023 17:54:16 +0400
Subject: [PATCH 373/734] [FE] Remove classnames lib from the bundle (#3199)

---
 kafka-ui-react-app/package.json   | 1 -
 kafka-ui-react-app/pnpm-lock.yaml | 2 --
 2 files changed, 3 deletions(-)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index a385c08c881..f51939d5978 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -19,7 +19,6 @@
     "@types/testing-library__jest-dom": "^5.14.5",
     "ace-builds": "^1.7.1",
     "ajv": "^8.6.3",
-    "classnames": "^2.2.6",
     "fetch-mock": "^9.11.0",
     "jest": "^29.0.3",
     "jest-watch-typeahead": "^2.0.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index b69eb15c985..c7e33aea0ae 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -38,7 +38,6 @@ specifiers:
   '@vitejs/plugin-react-swc': ^3.0.0
   ace-builds: ^1.7.1
   ajv: ^8.6.3
-  classnames: ^2.2.6
   dotenv: ^16.0.1
   eslint: ^8.3.0
   eslint-config-airbnb: ^19.0.4
@@ -107,7 +106,6 @@ dependencies:
   '@types/testing-library__jest-dom': 5.14.5
   ace-builds: 1.7.1
   ajv: 8.8.2
-  classnames: 2.3.1
   fetch-mock: 9.11.0
   jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
   jest-watch-typeahead: 2.0.0_jest@29.0.3

From cf4571b964d2276b5385b7c46d71612c2296c925 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Wed, 11 Jan 2023 18:17:35 +0400
Subject: [PATCH 374/734] [FE] Fix deleting a consumer hangs the page (#3116)

remove getIsConsumerGroupDeleted from consumerGroupsSlice.ts

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../ConsumerGroups/Details/Details.tsx          | 17 ++++++-----------
 .../consumerGroups/consumerGroupsSlice.ts       |  5 -----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index 961410ffd2f..098a487081a 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -18,10 +18,9 @@ import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeader
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import {
   deleteConsumerGroup,
+  selectById,
   fetchConsumerGroupDetails,
   getAreConsumerGroupDetailsFulfilled,
-  getIsConsumerGroupDeleted,
-  selectById,
 } from 'redux/reducers/consumerGroups/consumerGroupsSlice';
 import getTagColor from 'components/common/Tag/getTagColor';
 import { Dropdown } from 'components/common/Dropdown';
@@ -41,23 +40,19 @@ const Details: React.FC = () => {
   const consumerGroup = useAppSelector((state) =>
     selectById(state, consumerGroupID)
   );
-  const isDeleted = useAppSelector(getIsConsumerGroupDeleted);
   const isFetched = useAppSelector(getAreConsumerGroupDetailsFulfilled);
 
   React.useEffect(() => {
     dispatch(fetchConsumerGroupDetails({ clusterName, consumerGroupID }));
   }, [clusterName, consumerGroupID, dispatch]);
 
-  const onDelete = () => {
-    dispatch(deleteConsumerGroup({ clusterName, consumerGroupID }));
+  const onDelete = async () => {
+    const res = await dispatch(
+      deleteConsumerGroup({ clusterName, consumerGroupID })
+    ).unwrap();
+    if (res) navigate('../');
   };
 
-  React.useEffect(() => {
-    if (isDeleted) {
-      navigate('../');
-    }
-  }, [clusterName, navigate, isDeleted]);
-
   const onResetOffsets = () => {
     navigate(clusterConsumerGroupResetRelativePath);
   };
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
index 2b7709b0099..91420f04043 100644
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
@@ -195,11 +195,6 @@ export const getAreConsumerGroupsPagedFulfilled = createSelector(
   (status) => status === AsyncRequestStatus.fulfilled
 );
 
-export const getIsConsumerGroupDeleted = createSelector(
-  createFetchingSelector('consumerGroups/deleteConsumerGroup'),
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
 export const getAreConsumerGroupDetailsFulfilled = createSelector(
   createFetchingSelector('consumerGroups/fetchConsumerGroupDetails'),
   (status) => status === AsyncRequestStatus.fulfilled

From 356be08fc7f4f88ee566271ba6c59957d304e232 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Thu, 12 Jan 2023 11:21:40 +0400
Subject: [PATCH 375/734] [e2e] Fix allure url (#3189)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/e2e-checks.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 422eca59567..7725d33d4a1 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -52,6 +52,7 @@ jobs:
           gh_pages: allure-results
           allure_report: allure-report
           subfolder: allure-results
+          report_url: "http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com"
       - uses: jakejarvis/s3-sync-action@master
         if: always()
         env:

From 566dab078f7e4f75804f0aa6ba706cc8d73a127e Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Thu, 12 Jan 2023 10:20:54 +0200
Subject: [PATCH 376/734] [e2e]TopicTests.recreateTopic : Recreate topic
 (#3213)

* [e2e]TopicTests.recreateTopic : Recreate topic

* fix isInternal()

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../kafka/ui/pages/topic/TopicsList.java      | 10 ++++-
 .../ui/suite/topics/TopicMessagesTests.java   | 41 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 73e2610b7e9..afe5633e440 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -8,6 +8,7 @@
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -24,6 +25,7 @@ public class TopicsList extends BasePage {
     protected SelenideElement copySelectedTopicBtn = $x("//button[text()='Copy selected topic']");
     protected SelenideElement purgeMessagesOfSelectedTopicsBtn = $x("//button[text()='Purge messages of selected topics']");
     protected SelenideElement clearMessagesBtn = $x("//ul[contains(@class ,'open')]//div[text()='Clear Messages']");
+    protected SelenideElement recreateTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Recreate Topic']");
 
     @Step
     public TopicsList waitUntilScreenReady() {
@@ -90,6 +92,12 @@ public TopicsList clickClearMessagesBtn(){
       return this;
     }
 
+    @Step
+    public TopicsList clickRecreateTopicBtn(){
+      clickByJavaScript(recreateTopicBtn.shouldBe(visible));
+      return this;
+    }
+
     @Step
     public TopicsList clickConfirmBtnMdl() {
     clickConfirmButton();
@@ -174,7 +182,7 @@ public TopicsList selectItem(boolean select) {
       public boolean isInternal() {
         boolean internal = false;
         try {
-          element.$x("./td[2]/a/span").shouldBe(visible);
+          element.$x("./td[2]/a/span").shouldBe(visible, Duration.ofMillis(500));
           internal = true;
         } catch (Throwable ignored) {
         }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
index 22b3b6e97b8..68dd2f72201 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -38,11 +38,15 @@ public class TopicMessagesTests extends BaseTest {
       .setName("topic-to-clear-message-attribute-" + randomAlphabetic(5))
       .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
       .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+  private static final Topic TOPIC_TO_RECREATE = new Topic()
+      .setName("topic-to-recreate-attribute-" + randomAlphabetic(5))
+      .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
+      .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
   private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
   @BeforeAll
   public void beforeAll() {
-    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_TO_CLEAR_MESSAGES));
+    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_TO_CLEAR_MESSAGES, TOPIC_TO_RECREATE));
     TOPIC_LIST.forEach(topic -> apiService.createTopic(CLUSTER_NAME, topic.getName()));
   }
 
@@ -174,6 +178,41 @@ void checkClearTopicMessage() {
     softly.assertAll();
   }
 
+  @DisplayName("TopicTests.recreateTopic : Recreate topic")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(240)
+  @Test
+  void checkRecreateTopic(){
+    navigateToTopicsAndOpenDetails(TOPIC_TO_RECREATE.getName());
+    topicDetails
+        .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
+        .clickProduceMessageBtn();
+    produceMessagePanel
+        .waitUntilScreenReady()
+        .setContentFiled(TOPIC_TO_RECREATE.getMessageContent())
+        .setKeyField(TOPIC_TO_RECREATE.getMessageKey())
+        .submitProduceMessage();
+    topicDetails
+        .waitUntilScreenReady();
+    navigateToTopics();
+    topicsList
+        .waitUntilScreenReady();
+    assertThat(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages())
+        .as("getNumberOfMessages()").isEqualTo(1);
+    topicsList
+        .openDotMenuByTopicName(TOPIC_TO_RECREATE.getName())
+        .clickRecreateTopicBtn()
+        .clickConfirmBtnMdl();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS,
+            String.format("Topic %s successfully recreated!", TOPIC_TO_RECREATE.getName())))
+        .as("isAlertWithMessageVisible()").isTrue();
+    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages())
+        .as("getNumberOfMessages()").isEqualTo(0);
+    softly.assertAll();
+  }
+
   @AfterAll
   public void afterAll() {
     TOPIC_LIST.forEach(topic -> apiService.deleteTopic(CLUSTER_NAME, topic.getName()));

From aeda502b09d1dcf132f825d4b0779972037f74e9 Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Thu, 12 Jan 2023 19:34:33 +0400
Subject: [PATCH 377/734] [FE] Fix HTTP 414 with a big partitions list selected
 (#3145)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Topics/Topic/Messages/Filters/Filters.tsx | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 096a714c4ee..08e4aed6912 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -231,18 +231,21 @@ const Filters: React.FC<FiltersProps> = ({
         props.seekType = SeekType.TIMESTAMP;
       }
 
-      props.seekTo = selectedPartitions.map(({ value }) => {
-        const offsetProperty =
-          seekDirection === SeekDirection.FORWARD ? 'offsetMin' : 'offsetMax';
-        const offsetBasedSeekTo =
-          currentOffset || partitionMap[value][offsetProperty];
-        const seekToOffset =
-          currentSeekType === SeekType.OFFSET
-            ? offsetBasedSeekTo
-            : timestamp?.getTime();
-
-        return `${value}::${seekToOffset || '0'}`;
-      });
+      if (selectedPartitions.length !== partitions.length) {
+        // not everything in the partition is selected
+        props.seekTo = selectedPartitions.map(({ value }) => {
+          const offsetProperty =
+            seekDirection === SeekDirection.FORWARD ? 'offsetMin' : 'offsetMax';
+          const offsetBasedSeekTo =
+            currentOffset || partitionMap[value][offsetProperty];
+          const seekToOffset =
+            currentSeekType === SeekType.OFFSET
+              ? offsetBasedSeekTo
+              : timestamp?.getTime();
+
+          return `${value}::${seekToOffset || '0'}`;
+        });
+      }
     }
 
     const newProps = omitBy(props, (v) => v === undefined || v === '');

From 57585891d16714fe4ea662f7b4c7c868ba4b77f7 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Thu, 12 Jan 2023 17:43:37 +0200
Subject: [PATCH 378/734] [e2e] Increate chrome startup timeout (#3223)

* test commit

* fix BaseTest

* upd global

* upd global

* upd global

* add local browser VM option

* fix TopicsList column header locator

* fix withStartupTimeout()
---
 .../src/test/java/com/provectus/kafka/ui/base/BaseTest.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index f7c6e5d0182..5ad98fe8542 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -17,6 +17,7 @@
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
 import io.qase.api.annotation.Step;
+import java.time.Duration;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.api.SoftAssertions;
@@ -55,6 +56,7 @@ public static void start() {
         log.info("Using [{}] as image name for chrome", image.getUnversionedPart());
         webDriverContainer = new BrowserWebDriverContainer<>(image)
             .withEnv("JAVA_OPTS", "-Dwebdriver.chrome.whitelistedIps=")
+            .withStartupTimeout(Duration.ofSeconds(180))
             .withCapabilities(new ChromeOptions()
                 .addArguments("--disable-dev-shm-usage")
                 .addArguments("--disable-gpu")

From 578468d09023c9898c14774f8a827058b4fb68d0 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 12 Jan 2023 23:14:28 +0400
Subject: [PATCH 379/734] Consumer groups loading performance impr (#3188)

ISSUE-3148, ISSUE-3188: Topic consumers retrieval performance impr
1. batch listConsumerGroupOffsets method implemented
2. describeConsumerGroups parallelized
3. minor improvements in ReactiveAdminClient
4. (not related to perf) ConsumerGroupMapper messagesBehind setting fixed
---
 .../controller/ConsumerGroupsController.java  |   4 +-
 .../kafka/ui/mapper/ConsumerGroupMapper.java  |  18 +-
 .../ui/service/ConsumerGroupService.java      | 191 ++++++++++--------
 .../kafka/ui/service/OffsetsResetService.java |   2 +-
 .../kafka/ui/service/ReactiveAdminClient.java | 119 +++++++----
 .../com/provectus/kafka/ui/util/MapUtil.java  |  21 --
 .../ui/service/ReactiveAdminClientTest.java   |  91 +++++++++
 7 files changed, 290 insertions(+), 156 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
index afea878fa8a..fd7505d99bd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
@@ -189,8 +189,8 @@ public Mono<ResponseEntity<Void>> resetConsumerGroupOffsets(String clusterName,
   private ConsumerGroupsPageResponseDTO convertPage(ConsumerGroupService.ConsumerGroupsPage
                                                         consumerGroupConsumerGroupsPage) {
     return new ConsumerGroupsPageResponseDTO()
-        .pageCount(consumerGroupConsumerGroupsPage.getTotalPages())
-        .consumerGroups(consumerGroupConsumerGroupsPage.getConsumerGroups()
+        .pageCount(consumerGroupConsumerGroupsPage.totalPages())
+        .consumerGroups(consumerGroupConsumerGroupsPage.consumerGroups()
             .stream()
             .map(ConsumerGroupMapper::toDto)
             .collect(Collectors.toList()));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
index 75c0a99039b..9f7e32ed148 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
@@ -89,13 +89,17 @@ private static <T extends ConsumerGroupDTO> T convertToConsumerGroup(
             .flatMap(m -> m.getAssignment().stream().map(TopicPartition::topic))
     ).collect(Collectors.toSet()).size();
 
-    long messagesBehind = c.getOffsets().entrySet().stream()
-        .mapToLong(e ->
-            Optional.ofNullable(c.getEndOffsets())
-                .map(o -> o.get(e.getKey()))
-                .map(o -> o - e.getValue())
-                .orElse(0L)
-        ).sum();
+    Long messagesBehind = null;
+    // messagesBehind should be undefined if no committed offsets found for topic
+    if (!c.getOffsets().isEmpty()) {
+      messagesBehind = c.getOffsets().entrySet().stream()
+          .mapToLong(e ->
+              Optional.ofNullable(c.getEndOffsets())
+                  .map(o -> o.get(e.getKey()))
+                  .map(o -> o - e.getValue())
+                  .orElse(0L)
+          ).sum();
+    }
 
     consumerGroup.setMessagesBehind(messagesBehind);
     consumerGroup.setTopics(numTopics);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index e2a9592f7e9..1a74914ff43 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.service;
 
+import com.google.common.collect.Table;
 import com.provectus.kafka.ui.model.ConsumerGroupOrderingDTO;
 import com.provectus.kafka.ui.model.InternalConsumerGroup;
 import com.provectus.kafka.ui.model.InternalTopicConsumerGroup;
@@ -7,6 +8,7 @@
 import com.provectus.kafka.ui.model.SortOrderDTO;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -14,22 +16,21 @@
 import java.util.Properties;
 import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
-import lombok.Value;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.admin.ConsumerGroupDescription;
+import org.apache.kafka.clients.admin.ConsumerGroupListing;
 import org.apache.kafka.clients.admin.OffsetSpec;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.ConsumerGroupState;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.serialization.BytesDeserializer;
 import org.apache.kafka.common.utils.Bytes;
 import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.util.function.Tuple2;
-import reactor.util.function.Tuples;
 
 @Service
 @RequiredArgsConstructor
@@ -41,21 +42,16 @@ public class ConsumerGroupService {
   private Mono<List<InternalConsumerGroup>> getConsumerGroups(
       ReactiveAdminClient ac,
       List<ConsumerGroupDescription> descriptions) {
-    return Flux.fromIterable(descriptions)
-        // 1. getting committed offsets for all groups
-        .flatMap(desc -> ac.listConsumerGroupOffsets(desc.groupId())
-            .map(offsets -> Tuples.of(desc, offsets)))
-        .collectMap(Tuple2::getT1, Tuple2::getT2)
-        .flatMap((Map<ConsumerGroupDescription, Map<TopicPartition, Long>> groupOffsetsMap) -> {
-          var tpsFromGroupOffsets = groupOffsetsMap.values().stream()
-              .flatMap(v -> v.keySet().stream())
-              .collect(Collectors.toSet());
+    var groupNames = descriptions.stream().map(ConsumerGroupDescription::groupId).toList();
+    // 1. getting committed offsets for all groups
+    return ac.listConsumerGroupOffsets(groupNames, null)
+        .flatMap((Table<String, TopicPartition, Long> committedOffsets) -> {
           // 2. getting end offsets for partitions with committed offsets
-          return ac.listOffsets(tpsFromGroupOffsets, OffsetSpec.latest(), false)
+          return ac.listOffsets(committedOffsets.columnKeySet(), OffsetSpec.latest(), false)
               .map(endOffsets ->
                   descriptions.stream()
                       .map(desc -> {
-                        var groupOffsets = groupOffsetsMap.get(desc);
+                        var groupOffsets = committedOffsets.row(desc.groupId());
                         var endOffsetsForGroup = new HashMap<>(endOffsets);
                         endOffsetsForGroup.keySet().retainAll(groupOffsets.keySet());
                         // 3. gathering description & offsets
@@ -73,105 +69,122 @@ public Mono<List<InternalTopicConsumerGroup>> getConsumerGroupsForTopic(KafkaClu
             .flatMap(endOffsets -> {
               var tps = new ArrayList<>(endOffsets.keySet());
               // 2. getting all consumer groups
-              return describeConsumerGroups(ac, null)
-                  .flatMap((List<ConsumerGroupDescription> groups) ->
-                      Flux.fromIterable(groups)
-                          // 3. for each group trying to find committed offsets for topic
-                          .flatMap(g ->
-                              ac.listConsumerGroupOffsets(g.groupId(), tps)
-                                  // 4. keeping only groups that relates to topic
-                                  .filter(offsets -> isConsumerGroupRelatesToTopic(topic, g, offsets))
-                                  // 5. constructing results
-                                  .map(offsets -> InternalTopicConsumerGroup.create(topic, g, offsets, endOffsets))
-                          ).collectList());
+              return describeConsumerGroups(ac)
+                  .flatMap((List<ConsumerGroupDescription> groups) -> {
+                        // 3. trying to find committed offsets for topic
+                        var groupNames = groups.stream().map(ConsumerGroupDescription::groupId).toList();
+                        return ac.listConsumerGroupOffsets(groupNames, tps).map(offsets ->
+                            groups.stream()
+                                // 4. keeping only groups that relates to topic
+                                .filter(g -> isConsumerGroupRelatesToTopic(topic, g, offsets.containsRow(g.groupId())))
+                                .map(g ->
+                                    // 5. constructing results
+                                    InternalTopicConsumerGroup.create(topic, g, offsets.row(g.groupId()), endOffsets))
+                                .toList()
+                        );
+                      }
+                  );
             }));
   }
 
   private boolean isConsumerGroupRelatesToTopic(String topic,
                                                 ConsumerGroupDescription description,
-                                                Map<TopicPartition, Long> committedGroupOffsetsForTopic) {
+                                                boolean hasCommittedOffsets) {
     boolean hasActiveMembersForTopic = description.members()
         .stream()
         .anyMatch(m -> m.assignment().topicPartitions().stream().anyMatch(tp -> tp.topic().equals(topic)));
-    boolean hasCommittedOffsets = !committedGroupOffsetsForTopic.isEmpty();
     return hasActiveMembersForTopic || hasCommittedOffsets;
   }
 
-  @Value
-  public static class ConsumerGroupsPage {
-    List<InternalConsumerGroup> consumerGroups;
-    int totalPages;
+  public record ConsumerGroupsPage(List<InternalConsumerGroup> consumerGroups, int totalPages) {
   }
 
   public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
       KafkaCluster cluster,
-      int page,
+      int pageNum,
       int perPage,
       @Nullable String search,
       ConsumerGroupOrderingDTO orderBy,
       SortOrderDTO sortOrderDto) {
-    var comparator = sortOrderDto.equals(SortOrderDTO.ASC)
-        ? getPaginationComparator(orderBy)
-        : getPaginationComparator(orderBy).reversed();
     return adminClientService.get(cluster).flatMap(ac ->
-        describeConsumerGroups(ac, search).flatMap(descriptions ->
-            getConsumerGroups(
-                ac,
-                descriptions.stream()
-                    .sorted(comparator)
-                    .skip((long) (page - 1) * perPage)
-                    .limit(perPage)
-                    .collect(Collectors.toList())
+        ac.listConsumerGroups()
+            .map(listing -> search == null
+                ? listing
+                : listing.stream()
+                .filter(g -> StringUtils.containsIgnoreCase(g.groupId(), search))
+                .toList()
             )
-                .flatMapMany(Flux::fromIterable)
-                .filterWhen(
-                    cg -> accessControlService.isConsumerGroupAccessible(cg.getGroupId(), cluster.getName()))
-                .collect(Collectors.toList())
-                .map(cgs -> new ConsumerGroupsPage(
-                    cgs,
-                    (descriptions.size() / perPage) + (descriptions.size() % perPage == 0 ? 0 : 1))))
-    );
+            .flatMapIterable(lst -> lst)
+            .filterWhen(cg -> accessControlService.isConsumerGroupAccessible(cg.groupId(), cluster.getName()))
+            .collectList()
+            .flatMap(allGroups ->
+                loadSortedDescriptions(ac, allGroups, pageNum, perPage, orderBy, sortOrderDto)
+                    .flatMap(descriptions -> getConsumerGroups(ac, descriptions)
+                        .map(page -> new ConsumerGroupsPage(
+                            page,
+                            (allGroups.size() / perPage) + (allGroups.size() % perPage == 0 ? 0 : 1))))));
   }
 
-  private Comparator<ConsumerGroupDescription> getPaginationComparator(ConsumerGroupOrderingDTO
-                                                                           orderBy) {
-    switch (orderBy) {
-      case NAME:
-        return Comparator.comparing(ConsumerGroupDescription::groupId);
-      case STATE:
-        ToIntFunction<ConsumerGroupDescription> statesPriorities = cg -> {
-          switch (cg.state()) {
-            case STABLE:
-              return 0;
-            case COMPLETING_REBALANCE:
-              return 1;
-            case PREPARING_REBALANCE:
-              return 2;
-            case EMPTY:
-              return 3;
-            case DEAD:
-              return 4;
-            case UNKNOWN:
-              return 5;
-            default:
-              return 100;
-          }
-        };
-        return Comparator.comparingInt(statesPriorities);
-      case MEMBERS:
-        return Comparator.comparingInt(cg -> cg.members().size());
-      default:
-        throw new IllegalStateException("Unsupported order by: " + orderBy);
-    }
+  private Mono<List<ConsumerGroupDescription>> loadSortedDescriptions(ReactiveAdminClient ac,
+                                                                      List<ConsumerGroupListing> groups,
+                                                                      int pageNum,
+                                                                      int perPage,
+                                                                      ConsumerGroupOrderingDTO orderBy,
+                                                                      SortOrderDTO sortOrderDto) {
+    return switch (orderBy) {
+      case NAME -> {
+        Comparator<ConsumerGroupListing> comparator = Comparator.comparing(ConsumerGroupListing::groupId);
+        yield loadDescriptionsByListings(ac, groups, comparator, pageNum, perPage, sortOrderDto);
+      }
+      case STATE -> {
+        ToIntFunction<ConsumerGroupListing> statesPriorities =
+            cg -> switch (cg.state().orElse(ConsumerGroupState.UNKNOWN)) {
+              case STABLE -> 0;
+              case COMPLETING_REBALANCE -> 1;
+              case PREPARING_REBALANCE -> 2;
+              case EMPTY -> 3;
+              case DEAD -> 4;
+              case UNKNOWN -> 5;
+            };
+        var comparator = Comparator.comparingInt(statesPriorities);
+        yield loadDescriptionsByListings(ac, groups, comparator, pageNum, perPage, sortOrderDto);
+      }
+      case MEMBERS -> {
+        var comparator = Comparator.<ConsumerGroupDescription>comparingInt(cg -> cg.members().size());
+        var groupNames = groups.stream().map(ConsumerGroupListing::groupId).toList();
+        yield ac.describeConsumerGroups(groupNames)
+            .map(descriptions ->
+                sortAndPaginate(descriptions.values(), comparator, pageNum, perPage, sortOrderDto).toList());
+      }
+    };
   }
 
-  private Mono<List<ConsumerGroupDescription>> describeConsumerGroups(ReactiveAdminClient ac,
-                                                                      @Nullable String search) {
-    return ac.listConsumerGroups()
-        .map(groupIds -> groupIds
-            .stream()
-            .filter(groupId -> search == null || StringUtils.containsIgnoreCase(groupId, search))
-            .collect(Collectors.toList()))
+  private Mono<List<ConsumerGroupDescription>> loadDescriptionsByListings(ReactiveAdminClient ac,
+                                                                          List<ConsumerGroupListing> listings,
+                                                                          Comparator<ConsumerGroupListing> comparator,
+                                                                          int pageNum,
+                                                                          int perPage,
+                                                                          SortOrderDTO sortOrderDto) {
+    List<String> sortedGroups = sortAndPaginate(listings, comparator, pageNum, perPage, sortOrderDto)
+        .map(ConsumerGroupListing::groupId)
+        .toList();
+    return ac.describeConsumerGroups(sortedGroups)
+        .map(descrMap -> sortedGroups.stream().map(descrMap::get).toList());
+  }
+
+  private <T> Stream<T> sortAndPaginate(Collection<T> collection,
+                                        Comparator<T> comparator,
+                                        int pageNum,
+                                        int perPage,
+                                        SortOrderDTO sortOrderDto) {
+    return collection.stream()
+        .sorted(sortOrderDto == SortOrderDTO.ASC ? comparator : comparator.reversed())
+        .skip((long) (pageNum - 1) * perPage)
+        .limit(perPage);
+  }
+
+  private Mono<List<ConsumerGroupDescription>> describeConsumerGroups(ReactiveAdminClient ac) {
+    return ac.listConsumerGroupNames()
         .flatMap(ac::describeConsumerGroups)
         .map(cgs -> new ArrayList<>(cgs.values()));
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java
index 36b812473e1..67fc268d428 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/OffsetsResetService.java
@@ -98,7 +98,7 @@ private Mono<ReactiveAdminClient> checkGroupCondition(KafkaCluster cluster, Stri
         .flatMap(ac ->
             // we need to call listConsumerGroups() to check group existence, because
             // describeConsumerGroups() will return consumer group even if it doesn't exist
-            ac.listConsumerGroups()
+            ac.listConsumerGroupNames()
                 .filter(cgs -> cgs.stream().anyMatch(g -> g.equals(groupId)))
                 .flatMap(cgs -> ac.describeConsumerGroups(List.of(groupId)))
                 .filter(cgs -> cgs.containsKey(groupId))
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 1ffbd429180..b24180fa48d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -4,12 +4,12 @@
 import static java.util.stream.Collectors.toMap;
 import static org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterators;
+import com.google.common.collect.ImmutableTable;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Table;
 import com.provectus.kafka.ui.exception.IllegalEntityStateException;
 import com.provectus.kafka.ui.exception.NotFoundException;
 import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.util.MapUtil;
 import com.provectus.kafka.ui.util.NumberUtil;
 import com.provectus.kafka.ui.util.annotation.KafkaClientInternalsDependant;
 import java.io.Closeable;
@@ -18,7 +18,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -45,7 +44,7 @@
 import org.apache.kafka.clients.admin.DescribeClusterOptions;
 import org.apache.kafka.clients.admin.DescribeClusterResult;
 import org.apache.kafka.clients.admin.DescribeConfigsOptions;
-import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsOptions;
+import org.apache.kafka.clients.admin.ListConsumerGroupOffsetsSpec;
 import org.apache.kafka.clients.admin.ListOffsetsResult;
 import org.apache.kafka.clients.admin.ListTopicsOptions;
 import org.apache.kafka.clients.admin.NewPartitionReassignment;
@@ -54,7 +53,6 @@
 import org.apache.kafka.clients.admin.OffsetSpec;
 import org.apache.kafka.clients.admin.RecordsToDelete;
 import org.apache.kafka.clients.admin.TopicDescription;
-import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.OffsetAndMetadata;
 import org.apache.kafka.common.KafkaException;
 import org.apache.kafka.common.KafkaFuture;
@@ -69,6 +67,7 @@
 import org.apache.kafka.common.errors.InvalidRequestException;
 import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
 import org.apache.kafka.common.requests.DescribeLogDirsResponse;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 import reactor.util.function.Tuple2;
@@ -183,7 +182,7 @@ public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig(Collection<String> t
         topicNames,
         200,
         part -> getTopicsConfigImpl(part, includeDocFixed),
-        (m1, m2) -> ImmutableMap.<String, List<ConfigEntry>>builder().putAll(m1).putAll(m2).build()
+        mapMerger()
     );
   }
 
@@ -236,7 +235,7 @@ public Mono<Map<String, TopicDescription>> describeTopics(Collection<String> top
         topics,
         200,
         this::describeTopicsImpl,
-        (m1, m2) -> ImmutableMap.<String, TopicDescription>builder().putAll(m1).putAll(m2).build()
+        mapMerger()
     );
   }
 
@@ -383,32 +382,57 @@ public Mono<Void> updateTopicConfig(String topicName, Map<String, String> config
     }
   }
 
-  public Mono<List<String>> listConsumerGroups() {
-    return toMono(client.listConsumerGroups().all())
-        .map(lst -> lst.stream().map(ConsumerGroupListing::groupId).collect(toList()));
+  public Mono<List<String>> listConsumerGroupNames() {
+    return listConsumerGroups().map(lst -> lst.stream().map(ConsumerGroupListing::groupId).toList());
   }
 
-  public Mono<Map<String, ConsumerGroupDescription>> describeConsumerGroups(Collection<String> groupIds) {
-    return toMono(client.describeConsumerGroups(groupIds).all());
+  public Mono<Collection<ConsumerGroupListing>> listConsumerGroups() {
+    return toMono(client.listConsumerGroups().all());
   }
 
-  public Mono<Map<TopicPartition, Long>> listConsumerGroupOffsets(String groupId) {
-    return listConsumerGroupOffsets(groupId, new ListConsumerGroupOffsetsOptions());
+  public Mono<Map<String, ConsumerGroupDescription>> describeConsumerGroups(Collection<String> groupIds) {
+    return partitionCalls(
+        groupIds,
+        25,
+        4,
+        ids -> toMono(client.describeConsumerGroups(ids).all()),
+        mapMerger()
+    );
   }
 
-  public Mono<Map<TopicPartition, Long>> listConsumerGroupOffsets(
-      String groupId, List<TopicPartition> partitions) {
-    return listConsumerGroupOffsets(groupId,
-        new ListConsumerGroupOffsetsOptions().topicPartitions(partitions));
-  }
+  // group -> partition -> offset
+  // NOTE: partitions with no committed offsets will be skipped
+  public Mono<Table<String, TopicPartition, Long>> listConsumerGroupOffsets(List<String> consumerGroups,
+                                                                            // all partitions if null passed
+                                                                            @Nullable List<TopicPartition> partitions) {
+    Function<Collection<String>, Mono<Map<String, Map<TopicPartition, OffsetAndMetadata>>>> call =
+        groups -> toMono(
+            client.listConsumerGroupOffsets(
+                groups.stream()
+                    .collect(Collectors.toMap(
+                        g -> g,
+                        g -> new ListConsumerGroupOffsetsSpec().topicPartitions(partitions)
+                    ))).all()
+        );
+
+    Mono<Map<String, Map<TopicPartition, OffsetAndMetadata>>> merged = partitionCalls(
+        consumerGroups,
+        25,
+        4,
+        call,
+        mapMerger()
+    );
 
-  private Mono<Map<TopicPartition, Long>> listConsumerGroupOffsets(
-      String groupId, ListConsumerGroupOffsetsOptions options) {
-    return toMono(client.listConsumerGroupOffsets(groupId, options).partitionsToOffsetAndMetadata())
-        .map(MapUtil::removeNullValues)
-        .map(m -> m.entrySet().stream()
-            .map(e -> Tuples.of(e.getKey(), e.getValue().offset()))
-            .collect(Collectors.toMap(Tuple2::getT1, Tuple2::getT2)));
+    return merged.map(map -> {
+      var table = ImmutableTable.<String, TopicPartition, Long>builder();
+      map.forEach((g, tpOffsets) -> tpOffsets.forEach((tp, offset) -> {
+        if (offset != null) {
+          // offset will be null for partitions that don't have committed offset for this group
+          table.put(g, tp, offset.offset());
+        }
+      }));
+      return table.build();
+    });
   }
 
   public Mono<Void> alterConsumerGroupOffsets(String groupId, Map<TopicPartition, Long> offsets) {
@@ -501,7 +525,7 @@ public Mono<Map<TopicPartition, Long>> listOffsetsUnsafe(Collection<TopicPartiti
         partitions,
         200,
         call,
-        (m1, m2) -> ImmutableMap.<TopicPartition, Long>builder().putAll(m1).putAll(m2).build()
+        mapMerger()
     );
   }
 
@@ -551,7 +575,7 @@ private Mono<Void> alterConfig(String topicName, Map<String, String> configs) {
   }
 
   /**
-   * Splits input collection into batches, applies each batch sequentially to function
+   * Splits input collection into batches, converts each batch into Mono, sequentially subscribes to them
    * and merges output Monos into one Mono.
    */
   private static <R, I> Mono<R> partitionCalls(Collection<I> items,
@@ -561,14 +585,37 @@ private static <R, I> Mono<R> partitionCalls(Collection<I> items,
     if (items.isEmpty()) {
       return call.apply(items);
     }
-    Iterator<List<I>> parts = Iterators.partition(items.iterator(), partitionSize);
-    Mono<R> mono = call.apply(parts.next());
-    while (parts.hasNext()) {
-      var nextPart = parts.next();
-      // calls will be executed sequentially
-      mono = mono.flatMap(res1 -> call.apply(nextPart).map(res2 -> merger.apply(res1, res2)));
+    Iterable<List<I>> parts = Iterables.partition(items, partitionSize);
+    return Flux.fromIterable(parts)
+        .concatMap(call)
+        .reduce(merger);
+  }
+
+  /**
+   * Splits input collection into batches, converts each batch into Mono, subscribes to them (concurrently,
+   * with specified concurrency level) and merges output Monos into one Mono.
+   */
+  private static <R, I> Mono<R> partitionCalls(Collection<I> items,
+                                               int partitionSize,
+                                               int concurrency,
+                                               Function<Collection<I>, Mono<R>> call,
+                                               BiFunction<R, R, R> merger) {
+    if (items.isEmpty()) {
+      return call.apply(items);
     }
-    return mono;
+    Iterable<List<I>> parts = Iterables.partition(items, partitionSize);
+    return Flux.fromIterable(parts)
+        .flatMap(call, concurrency)
+        .reduce(merger);
+  }
+
+  private static <K, V> BiFunction<Map<K, V>, Map<K, V>, Map<K, V>> mapMerger() {
+    return (m1, m2) -> {
+      var merged = new HashMap<K, V>();
+      merged.putAll(m1);
+      merged.putAll(m2);
+      return merged;
+    };
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/MapUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/MapUtil.java
index d1a5c035ee6..e69de29bb2d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/MapUtil.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/MapUtil.java
@@ -1,21 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class MapUtil {
-
-  private MapUtil() {
-  }
-
-  public static <K, V> Map<K, V> removeNullValues(Map<K, V> map) {
-    return map.entrySet().stream()
-        .filter(e -> e.getValue() != null)
-        .collect(
-            Collectors.toMap(
-                Map.Entry::getKey,
-                Map.Entry::getValue
-            )
-        );
-  }
-}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
index 99cfedad4cf..2e302009ac1 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
@@ -2,14 +2,18 @@
 
 import static com.provectus.kafka.ui.service.ReactiveAdminClient.toMonoWithExceptionFilter;
 import static java.util.Objects.requireNonNull;
+import static org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.producer.KafkaTestProducer;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.UUID;
+import java.util.function.Function;
 import java.util.stream.Stream;
 import lombok.SneakyThrows;
 import org.apache.kafka.clients.admin.AdminClient;
@@ -18,12 +22,16 @@
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.apache.kafka.clients.admin.OffsetSpec;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.clients.consumer.OffsetAndMetadata;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.KafkaFuture;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.config.ConfigResource;
 import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
 import org.apache.kafka.common.internals.KafkaFutureImpl;
+import org.apache.kafka.common.serialization.StringDeserializer;
 import org.junit.function.ThrowingRunnable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -96,6 +104,14 @@ void createTopics(NewTopic... topics) {
     clearings.add(() -> adminClient.deleteTopics(Stream.of(topics).map(NewTopic::name).toList()).all().get());
   }
 
+  void fillTopic(String topic, int msgsCnt) {
+    try (var producer = KafkaTestProducer.forKafka(kafka)) {
+      for (int i = 0; i < msgsCnt; i++) {
+        producer.send(topic, UUID.randomUUID().toString());
+      }
+    }
+  }
+
   @Test
   void testToMonoWithExceptionFilter() {
     var failedFuture = new KafkaFutureImpl<String>();
@@ -152,4 +168,79 @@ void testListOffsetsUnsafe() {
         .verifyComplete();
   }
 
+
+  @Test
+  void testListConsumerGroupOffsets() throws Exception {
+    String topic = UUID.randomUUID().toString();
+    String anotherTopic = UUID.randomUUID().toString();
+    createTopics(new NewTopic(topic, 2, (short) 1), new NewTopic(anotherTopic, 1, (short) 1));
+    fillTopic(topic, 10);
+
+    Function<String, KafkaConsumer<String, String>> consumerSupplier = groupName -> {
+      Properties p = new Properties();
+      p.setProperty(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServers());
+      p.setProperty(ConsumerConfig.GROUP_ID_CONFIG, groupName);
+      p.setProperty(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+      p.setProperty(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+      p.setProperty(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class.getName());
+      p.setProperty(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "false");
+      return new KafkaConsumer<String, String>(p);
+    };
+
+    String fullyPolledConsumer = UUID.randomUUID().toString();
+    try (KafkaConsumer<String, String> c = consumerSupplier.apply(fullyPolledConsumer)) {
+      c.subscribe(List.of(topic));
+      int polled = 0;
+      while (polled < 10) {
+        polled += c.poll(Duration.ofMillis(50)).count();
+      }
+      c.commitSync();
+    }
+
+    String polled1MsgConsumer = UUID.randomUUID().toString();
+    try (KafkaConsumer<String, String> c = consumerSupplier.apply(polled1MsgConsumer)) {
+      c.subscribe(List.of(topic));
+      c.poll(Duration.ofMillis(100));
+      c.commitSync(Map.of(tp(topic, 0), new OffsetAndMetadata(1)));
+    }
+
+    String noCommitConsumer = UUID.randomUUID().toString();
+    try (KafkaConsumer<String, String> c = consumerSupplier.apply(noCommitConsumer)) {
+      c.subscribe(List.of(topic));
+      c.poll(Duration.ofMillis(100));
+    }
+
+    Map<TopicPartition, ListOffsetsResultInfo> endOffsets = adminClient.listOffsets(Map.of(
+        tp(topic, 0), OffsetSpec.latest(),
+        tp(topic, 1), OffsetSpec.latest())).all().get();
+
+    StepVerifier.create(
+            reactiveAdminClient.listConsumerGroupOffsets(
+                List.of(fullyPolledConsumer, polled1MsgConsumer, noCommitConsumer),
+                List.of(
+                    tp(topic, 0),
+                    tp(topic, 1),
+                    tp(anotherTopic, 0))
+            )
+        ).assertNext(table -> {
+
+          assertThat(table.row(polled1MsgConsumer))
+              .containsEntry(tp(topic, 0), 1L)
+              .hasSize(1);
+
+          assertThat(table.row(noCommitConsumer))
+              .isEmpty();
+
+          assertThat(table.row(fullyPolledConsumer))
+              .containsEntry(tp(topic, 0), endOffsets.get(tp(topic, 0)).offset())
+              .containsEntry(tp(topic, 1), endOffsets.get(tp(topic, 1)).offset())
+              .hasSize(2);
+        })
+        .verifyComplete();
+  }
+
+  private static TopicPartition tp(String topic, int partition) {
+    return new TopicPartition(topic, partition);
+  }
+
 }

From a03b6844e0000a1aedcf6d7ed1472789277f1009 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Fri, 13 Jan 2023 08:14:58 +0200
Subject: [PATCH 380/734] Checking messages filtering by timestamp within
 messages/topic (#3195)

* Added setTime methods

* Refactored ApiService class with reload methods and fix sendMessageMethod

* Added TimeUtils class

* Refactored all testClasses with new reloaded methods from ApiService

* Refactored naming and DateTimeFormatter pattern

* fix deleteTopic method

* fix checkingMessageFilteringByOffset() test

* fix AfterAll class in ConnectorsTests

* Added Locale.Us for DateTimeFormatter pattern

* refactored equals to isEqual checkingMessageFilteringByTimestamp()

* Added argument for locale as "--lang=es"

* Deleted seconds from setTime(), refactored pattern of timestamp

* Refactored assertions of checkingMessageFilteringByTimestamp()

* Revert seekTypeField locator

* Refactored hh to HH in pattern

* Refactored waitUntilScreenReady() in TopicDetails

* Refactored topicListHeader locator

* Refactored of TopicMessagesTests

* fix mc

* resolve conversation

* resolve conversation and deleted txt files

* Added SneakyThrows annotation

* refactored mid mistakes

* Added offsetElm Condition

* Resolve conversation of methods

* Fix spinner locator

* revert clickSubmitFiltersBtnMessagesTab() method

* Added disabled annotation for checkingMessageFilteringByTimestamp()

* Resolve conversation

* Refactored waitUntilSpinnerDisappear()

* Reformat methods order

* Disabled and refactored checkingMessageFilteringByOffset()

* Uncommented AfterAllClass

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../provectus/kafka/ui/pages/BasePage.java    |  7 +-
 .../kafka/ui/pages/topic/TopicDetails.java    | 86 +++++++++++++++--
 .../kafka/ui/services/ApiService.java         | 83 ++++++++++++----
 .../kafka/ui/utilities/TimeUtils.java         | 16 ++++
 .../com/provectus/kafka/ui/base/BaseTest.java |  1 +
 .../ui/suite/connectors/ConnectorsTests.java  | 21 ++---
 .../kafka/ui/suite/schemas/SchemasTests.java  |  5 +-
 .../ui/suite/topics/TopicMessagesTests.java   | 94 ++++++++++++++-----
 .../kafka/ui/suite/topics/TopicsTests.java    | 12 +--
 .../src/test/resources/producedkey.txt        |  1 -
 .../src/test/resources/testData.txt           |  1 -
 11 files changed, 254 insertions(+), 73 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/resources/producedkey.txt
 delete mode 100644 kafka-ui-e2e-checks/src/test/resources/testData.txt

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index 67bf5a7c590..8b12d3b0d3f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -7,12 +7,13 @@
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.utilities.WebUtils;
+import java.time.Duration;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public abstract class BasePage extends WebUtils {
 
-  protected SelenideElement loadingSpinner = $x("//*[contains(text(),'Loading')]");
+  protected SelenideElement loadingSpinner = $x("//div[@role='progressbar']");
   protected SelenideElement submitBtn = $x("//button[@type='submit']");
   protected SelenideElement tableGrid = $x("//table");
   protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
@@ -26,7 +27,9 @@ public abstract class BasePage extends WebUtils {
 
   protected void waitUntilSpinnerDisappear() {
     log.debug("\nwaitUntilSpinnerDisappear");
-    loadingSpinner.shouldBe(Condition.disappear);
+    if(isVisible(loadingSpinner)){
+      loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(30));
+    }
   }
 
   protected void clickSubmitBtn() {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index bd8cbd3d02c..1de0478abec 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -3,6 +3,7 @@
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
+import static com.codeborne.selenide.Selenide.sleep;
 import static org.apache.commons.lang.math.RandomUtils.nextInt;
 
 import com.codeborne.selenide.CollectionCondition;
@@ -11,9 +12,17 @@
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
 import org.openqa.selenium.By;
 
 public class TopicDetails extends BasePage {
@@ -24,7 +33,7 @@ public class TopicDetails extends BasePage {
   protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
   protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
   protected SelenideElement seekTypeDdl = $x("//ul[@id='selectSeekType']/li");
-  protected SelenideElement seekTypeField = $x("//label[text()='Seek Type']//..//input");
+  protected SelenideElement seekTypeField = $x("//label[text()='Seek Type']//..//div/input");
   protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
   protected SelenideElement savedFiltersLink = $x("//div[text()='Saved Filters']");
   protected SelenideElement addFilterCodeModalTitle = $x("//label[text()='Filter code']");
@@ -33,6 +42,7 @@ public class TopicDetails extends BasePage {
   protected SelenideElement displayNameInputAddFilterMdl = $x("//input[@placeholder='Enter Name']");
   protected SelenideElement cancelBtnAddFilterMdl = $x("//button[text()='Cancel']");
   protected SelenideElement addFilterBtnAddFilterMdl = $x("//button[text()='Add filter']");
+  protected SelenideElement addFiltersBtnMessages = $x("//button[text()='Add Filters']");
   protected SelenideElement selectFilterBtnAddFilterMdl = $x("//button[text()='Select filter']");
   protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
   protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
@@ -43,6 +53,11 @@ public class TopicDetails extends BasePage {
   protected SelenideElement backToCreateFiltersLink = $x("//div[text()='Back To create filters']");
   protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
   protected ElementsCollection messageGridItems = $$x("//tbody//tr");
+  protected SelenideElement actualCalendarDate = $x("//div[@class='react-datepicker__current-month']");
+  protected SelenideElement previousMonthButton = $x("//button[@aria-label='Previous Month']");
+  protected SelenideElement nextMonthButton = $x("//button[@aria-label='Next Month']");
+  protected SelenideElement calendarTimeFld = $x("//input[@placeholder='Time']");
+  protected String dayCellLtr = "//div[@role='option'][contains(text(),'%d')]";
   protected String seekFilterDdlLocator = "//ul[@id='selectSeekType']/ul/li[text()='%s']";
   protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
   protected String consumerIdLocator = "//a[@title='%s']";
@@ -53,7 +68,7 @@ public class TopicDetails extends BasePage {
   @Step
   public TopicDetails waitUntilScreenReady() {
     waitUntilSpinnerDisappear();
-    dotMenuBtn.shouldBe(Condition.visible);
+    overviewTab.shouldBe(Condition.visible);
     return this;
   }
 
@@ -265,6 +280,63 @@ public boolean isContentMessageVisible(String contentMessage) {
     return contentMessage.matches(contentMessageTab.getText().trim());
   }
 
+  private void selectYear(int expectedYear) {
+    while (getActualCalendarDate().getYear() > expectedYear) {
+      clickByJavaScript(previousMonthButton);
+      sleep(1000);
+      if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
+        throw new IllegalArgumentException("Unable to select year");
+      }
+    }
+  }
+
+  private void selectMonth(int expectedMonth) {
+    while (getActualCalendarDate().getMonthValue() > expectedMonth) {
+      clickByJavaScript(previousMonthButton);
+      sleep(1000);
+      if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
+        throw new IllegalArgumentException("Unable to select month");
+      }
+    }
+  }
+
+  private void selectDay(int expectedDay) {
+    Objects.requireNonNull($$x(String.format(dayCellLtr, expectedDay)).stream()
+        .filter(day -> !Objects.requireNonNull(day.getAttribute("class")).contains("outside-month"))
+        .findFirst().orElse(null)).shouldBe(Condition.enabled).click();
+  }
+
+  private void setTime(LocalDateTime dateTime) {
+    calendarTimeFld.shouldBe(Condition.enabled)
+        .sendKeys(String.valueOf(dateTime.getHour()), String.valueOf(dateTime.getMinute()));
+  }
+
+  @Step
+  public TopicDetails selectDateAndTimeByCalendar(LocalDateTime dateTime) {
+    setTime(dateTime);
+    selectYear(dateTime.getYear());
+    selectMonth(dateTime.getMonthValue());
+    selectDay(dateTime.getDayOfMonth());
+    return this;
+  }
+
+  private LocalDate getActualCalendarDate() {
+    String monthAndYearStr = actualCalendarDate.getText().trim();
+    DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+        .parseCaseInsensitive()
+        .append(DateTimeFormatter.ofPattern("MMMM yyyy"))
+        .toFormatter(Locale.ENGLISH);
+    YearMonth yearMonth = formatter.parse(monthAndYearStr, YearMonth::from);
+    return yearMonth.atDay(1);
+  }
+
+  @Step
+  public TopicDetails openCalendarSeekType(){
+    seekTypeField.shouldBe(Condition.enabled).click();
+    actualCalendarDate.shouldBe(Condition.visible);
+    return this;
+  }
+
   @Step
   public int getMessageCountAmount() {
     return Integer.parseInt(messageAmountCell.getText().trim());
@@ -278,7 +350,7 @@ private List<TopicDetails.MessageGridItem> initItems() {
   }
 
   @Step
-  public TopicDetails.MessageGridItem getMessage(int offset) {
+  public TopicDetails.MessageGridItem getMessageByOffset(int offset) {
     return initItems().stream()
         .filter(e -> e.getOffset() == offset)
         .findFirst().orElse(null);
@@ -291,7 +363,7 @@ public List<MessageGridItem> getAllMessages(){
 
   @Step
   public TopicDetails.MessageGridItem getRandomMessage() {
-    return getMessage(nextInt(initItems().size() - 1));
+    return getMessageByOffset(nextInt(initItems().size() - 1));
   }
 
   public enum TopicMenu {
@@ -340,8 +412,10 @@ public int getPartition() {
     }
 
     @Step
-    public String getTimestamp() {
-      return element.$x("./td[4]/div").getText().trim();
+    public LocalDateTime getTimestamp() {
+      String timestampValue = element.$x("./td[4]/div").getText().trim();
+      DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d/yyyy, HH:mm:ss");
+      return LocalDateTime.parse(timestampValue, formatter);
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index ad1fad76b2e..8451ef836e1 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.services;
 
 import static com.codeborne.selenide.Selenide.sleep;
-import static com.provectus.kafka.ui.settings.BaseSource.BASE_LOCAL_URL;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -17,6 +16,8 @@
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.settings.BaseSource;
+import io.qameta.allure.Step;
 import java.util.HashMap;
 import java.util.Map;
 import lombok.SneakyThrows;
@@ -25,7 +26,7 @@
 
 
 @Slf4j
-public class ApiService {
+public class ApiService extends BaseSource {
 
     @SneakyThrows
     private TopicsApi topicApi() {
@@ -48,7 +49,7 @@ private MessagesApi messageApi() {
     }
 
     @SneakyThrows
-    public void createTopic(String clusterName, String topicName) {
+    private void createTopic(String clusterName, String topicName) {
       TopicCreation topic = new TopicCreation();
       topic.setName(topicName);
       topic.setPartitions(1);
@@ -61,15 +62,28 @@ public void createTopic(String clusterName, String topicName) {
       }
     }
 
-    public void deleteTopic(String clusterName, String topicName) {
+    @Step
+    public ApiService createTopic(String topicName) {
+      createTopic(CLUSTER_NAME, topicName);
+      return this;
+    }
+
+    @SneakyThrows
+    private void deleteTopic(String clusterName, String topicName) {
         try {
             topicApi().deleteTopic(clusterName, topicName).block();
         } catch (WebClientResponseException ignore) {
         }
     }
 
+    @Step
+    public ApiService deleteTopic(String topicName){
+      deleteTopic(CLUSTER_NAME, topicName);
+      return this;
+    }
+
     @SneakyThrows
-    public void createSchema(String clusterName, Schema schema) {
+    private void createSchema(String clusterName, Schema schema) {
         NewSchemaSubject schemaSubject = new NewSchemaSubject();
         schemaSubject.setSubject(schema.getName());
         schemaSubject.setSchema(fileToString(schema.getValuePath()));
@@ -81,24 +95,42 @@ public void createSchema(String clusterName, Schema schema) {
         }
     }
 
+    @Step
+    public ApiService createSchema(Schema schema){
+      createSchema(CLUSTER_NAME, schema);
+      return this;
+    }
+
     @SneakyThrows
-    public void deleteSchema(String clusterName, String schemaName) {
+    private void deleteSchema(String clusterName, String schemaName) {
         try {
             schemaApi().deleteSchema(clusterName, schemaName).block();
         } catch (WebClientResponseException ignore) {
         }
     }
 
+    @Step
+    public ApiService deleteSchema(String schemaName){
+      deleteSchema(CLUSTER_NAME, schemaName);
+      return this;
+    }
+
     @SneakyThrows
-    public void deleteConnector(String clusterName, String connectName, String connectorName) {
+    private void deleteConnector(String clusterName, String connectName, String connectorName) {
         try {
             connectorApi().deleteConnector(clusterName, connectName, connectorName).block();
         } catch (WebClientResponseException ignore) {
         }
     }
 
+    @Step
+    public ApiService deleteConnector(String connectName, String connectorName){
+      deleteConnector(CLUSTER_NAME, connectName, connectorName);
+      return this;
+    }
+
     @SneakyThrows
-    public void createConnector(String clusterName, String connectName, Connector connector) {
+    private void createConnector(String clusterName, String connectName, Connector connector) {
         NewConnector connectorProperties = new NewConnector();
         connectorProperties.setName(connector.getName());
         Map<String, Object> configMap = new ObjectMapper().readValue(connector.getConfig(), HashMap.class);
@@ -110,20 +142,35 @@ public void createConnector(String clusterName, String connectName, Connector co
         connectorApi().createConnector(clusterName, connectName, connectorProperties).block();
     }
 
+    @Step
+    public ApiService createConnector(String connectName, Connector connector){
+      createConnector(CLUSTER_NAME, connectName, connector);
+      return this;
+    }
+
+    @Step
     public String getFirstConnectName(String clusterName) {
         return connectorApi().getConnects(clusterName).blockFirst().getName();
     }
 
     @SneakyThrows
-    public void sendMessage(String clusterName, Topic topic) {
-        CreateTopicMessage createMessage = new CreateTopicMessage();
-        createMessage.partition(0);
-        createMessage.setContent(topic.getMessageContent());
-        createMessage.setKey(topic.getMessageKey());
-        try {
-            messageApi().sendTopicMessages(clusterName, topic.getName(), createMessage).block();
-        } catch (WebClientResponseException ex) {
-            ex.getRawStatusCode();
-        }
+    private void sendMessage(String clusterName, Topic topic) {
+      CreateTopicMessage createMessage = new CreateTopicMessage();
+      createMessage.setPartition(0);
+      createMessage.setKeySerde("String");
+      createMessage.setValueSerde("String");
+      createMessage.setKey(topic.getMessageKey());
+      createMessage.setContent(topic.getMessageContent());
+      try {
+        messageApi().sendTopicMessages(clusterName, topic.getName(), createMessage).block();
+      } catch (WebClientResponseException ex) {
+        ex.getRawStatusCode();
+      }
+    }
+
+    @Step
+    public ApiService sendMessage(Topic topic) {
+      sendMessage(CLUSTER_NAME, topic);
+      return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java
new file mode 100644
index 00000000000..259f70c3ccc
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java
@@ -0,0 +1,16 @@
+package com.provectus.kafka.ui.utilities;
+
+import static com.codeborne.selenide.Selenide.sleep;
+
+import java.time.LocalTime;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class TimeUtils {
+
+  public static void waitUntilNewMinuteStarted(){
+    int secondsLeft = 60 - LocalTime.now().getSecond();
+    log.debug("\nwaitUntilNewMinuteStarted: {}s", secondsLeft);
+    sleep(secondsLeft * 1000);
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
index 5ad98fe8542..6db92244ba4 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
@@ -62,6 +62,7 @@ public static void start() {
                 .addArguments("--disable-gpu")
                 .addArguments("--no-sandbox")
                 .addArguments("--verbose")
+                .addArguments("--lang=es")
             )
             .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
         try {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
index 665b8fb2ff0..ec2e3d5a0f1 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
@@ -2,7 +2,6 @@
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
-import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
 
@@ -50,14 +49,14 @@ public class ConnectorsTests extends BaseTest {
 
     @BeforeAll
     public void beforeAll() {
-        TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
-        TOPIC_LIST.forEach(topic -> {
-            apiService.createTopic(CLUSTER_NAME, topic.getName());
-            apiService.sendMessage(CLUSTER_NAME, topic);
-        });
-        CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
-        CONNECTOR_LIST.forEach(connector -> apiService
-                .createConnector(CLUSTER_NAME, CONNECT_NAME, connector));
+      TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
+      TOPIC_LIST.forEach(topic -> apiService
+          .createTopic(topic.getName())
+          .sendMessage(topic)
+      );
+      CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
+      CONNECTOR_LIST.forEach(connector -> apiService
+          .createConnector(CONNECT_NAME, connector));
     }
 
     @DisplayName("should create a connector")
@@ -120,8 +119,8 @@ public void deleteConnector() {
     @AfterAll
     public void afterAll() {
         CONNECTOR_LIST.forEach(connector ->
-                apiService.deleteConnector(CLUSTER_NAME, CONNECT_NAME, connector.getName()));
-        TOPIC_LIST.forEach(topic -> apiService.deleteTopic(CLUSTER_NAME, topic.getName()));
+                apiService.deleteConnector(CONNECT_NAME, connector.getName()));
+        TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
index 1af657ca976..ea98b4abe1a 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.suite.schemas;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.SCHEMA_REGISTRY;
-import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 import com.codeborne.selenide.Condition;
@@ -41,7 +40,7 @@ public class SchemasTests extends BaseTest {
     @SneakyThrows
     public void beforeAll() {
         SCHEMA_LIST.addAll(List.of(AVRO_API, JSON_API, PROTOBUF_API));
-        SCHEMA_LIST.forEach(schema -> apiService.createSchema(CLUSTER_NAME, schema));
+        SCHEMA_LIST.forEach(schema -> apiService.createSchema(schema));
     }
 
     @DisplayName("should create AVRO schema")
@@ -228,7 +227,7 @@ void deleteSchemaProtobuf() {
 
     @AfterAll
     public void afterAll() {
-        SCHEMA_LIST.forEach(schema -> apiService.deleteSchema(CLUSTER_NAME, schema.getName()));
+        SCHEMA_LIST.forEach(schema -> apiService.deleteSchema(schema.getName()));
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
index 68dd2f72201..db2d67106b6 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -2,8 +2,8 @@
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
 import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
-import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.OVERVIEW;
+import static com.provectus.kafka.ui.utilities.TimeUtils.waitUntilNewMinuteStarted;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -15,8 +15,12 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qameta.allure.Issue;
 import io.qase.api.annotation.CaseId;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
@@ -32,22 +36,29 @@ public class TopicMessagesTests extends BaseTest {
   private static final String SUITE_TITLE = "Topics";
   private static final Topic TOPIC_FOR_MESSAGES = new Topic()
       .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
-      .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
-      .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
   private static final Topic TOPIC_TO_CLEAR_MESSAGES = new Topic()
       .setName("topic-to-clear-message-attribute-" + randomAlphabetic(5))
-      .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
-      .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
+  private static final Topic TOPIC_FOR_CHECKING_FILTERS = new Topic()
+      .setName("topic_for_checking_filters" + randomAlphabetic(5))
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
   private static final Topic TOPIC_TO_RECREATE = new Topic()
       .setName("topic-to-recreate-attribute-" + randomAlphabetic(5))
-      .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
-      .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
   private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
   @BeforeAll
   public void beforeAll() {
-    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_TO_CLEAR_MESSAGES, TOPIC_TO_RECREATE));
-    TOPIC_LIST.forEach(topic -> apiService.createTopic(CLUSTER_NAME, topic.getName()));
+    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECKING_FILTERS, TOPIC_TO_CLEAR_MESSAGES, TOPIC_TO_RECREATE));
+    TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
+    IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
+    waitUntilNewMinuteStarted();
+    IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
   }
 
   @DisplayName("produce message")
@@ -58,7 +69,7 @@ public void beforeAll() {
   void produceMessage() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
     topicDetails
-        .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
+        .openDetailsTab(MESSAGES)
         .clickProduceMessageBtn();
     produceMessagePanel
         .waitUntilScreenReady()
@@ -85,7 +96,7 @@ void produceMessage() {
   void clearMessage() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
     topicDetails
-        .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
+        .openDetailsTab(OVERVIEW)
         .clickProduceMessageBtn();
     int messageAmount = topicDetails.getMessageCountAmount();
     produceMessagePanel
@@ -111,35 +122,70 @@ void clearMessage() {
   @CaseId(21)
   @Test
   void copyMessageFromTopicProfile() {
-    navigateToTopicsAndOpenDetails("_schemas");
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
     topicDetails
-        .openDetailsTab(TopicDetails.TopicMenu.MESSAGES)
+        .openDetailsTab(MESSAGES)
         .getRandomMessage()
         .openDotMenu()
         .clickCopyToClipBoard();
-    Assertions.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,"Copied successfully!"),
+    Assertions.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Copied successfully!"),
         "isAlertWithMessageVisible()");
   }
 
   @Disabled
-  @Issue("https://github.com/provectus/kafka-ui/issues/2856")
+  @Issue("https://github.com/provectus/kafka-ui/issues/2394")
   @DisplayName("Checking messages filtering by Offset within Topic/Messages")
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(15)
   @Test
   void checkingMessageFilteringByOffset() {
-    String offsetValue = "2";
-    navigateToTopicsAndOpenDetails("_schemas");
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES);
+    TopicDetails.MessageGridItem secondMessage = topicDetails.getMessageByOffset(1);
     topicDetails
-        .openDetailsTab(MESSAGES)
         .selectSeekTypeDdlMessagesTab("Offset")
-        .setSeekTypeValueFldMessagesTab(offsetValue)
+        .setSeekTypeValueFldMessagesTab(String.valueOf(secondMessage.getOffset()))
+        .clickSubmitFiltersBtnMessagesTab();
+    SoftAssertions softly = new SoftAssertions();
+    topicDetails.getAllMessages().forEach(message ->
+        softly.assertThat(message.getOffset() == secondMessage.getOffset()
+                || message.getOffset() > secondMessage.getOffset())
+            .as(String.format("Expected offset is: %s, but found: %s", secondMessage.getOffset(), message.getOffset()))
+            .isTrue());
+    softly.assertAll();
+  }
+
+  @Disabled
+  @Issue("https://github.com/provectus/kafka-ui/issues/3215")
+  @Issue("https://github.com/provectus/kafka-ui/issues/2345")
+  @DisplayName("Checking messages filtering by Timestamp within Messages/Topic")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(16)
+  @Test
+  void checkingMessageFilteringByTimestamp() {
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES);
+    LocalDateTime firstTimestamp = topicDetails.getMessageByOffset(0).getTimestamp();
+    List<TopicDetails.MessageGridItem> nextMessages = topicDetails.getAllMessages().stream()
+        .filter(message -> message.getTimestamp().getMinute() != firstTimestamp.getMinute())
+        .collect(Collectors.toList());
+    LocalDateTime nextTimestamp = Objects.requireNonNull(nextMessages.stream()
+        .findFirst().orElse(null)).getTimestamp();
+    topicDetails
+        .selectSeekTypeDdlMessagesTab("Timestamp")
+        .openCalendarSeekType()
+        .selectDateAndTimeByCalendar(nextTimestamp)
         .clickSubmitFiltersBtnMessagesTab();
     SoftAssertions softly = new SoftAssertions();
-    topicDetails.getAllMessages()
-        .forEach(messages -> softly.assertThat(messages.getOffset() == Integer.parseInt(offsetValue))
-        .as("getAllMessages()").isTrue());
+    topicDetails.getAllMessages().forEach(message ->
+        softly.assertThat(message.getTimestamp().isEqual(nextTimestamp)
+                || message.getTimestamp().isAfter(nextTimestamp))
+            .as(String.format("Expected timestamp is: %s, but found: %s", nextTimestamp, message.getTimestamp()))
+            .isTrue());
     softly.assertAll();
   }
 
@@ -215,6 +261,6 @@ void checkRecreateTopic(){
 
   @AfterAll
   public void afterAll() {
-    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(CLUSTER_NAME, topic.getName()));
+    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 89857df9675..bc2ebe0889b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -9,11 +9,9 @@
 import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.NOT_SET;
 import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_1_GB;
 import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_20_GB;
-import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.apache.commons.lang3.RandomUtils.nextInt;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.base.BaseTest;
@@ -56,8 +54,8 @@ public class TopicsTests extends BaseTest {
       .setTimeToRetainData("604800001")
       .setMaxSizeOnDisk(SIZE_20_GB)
       .setMaxMessageBytes("1000020")
-      .setMessageKey(fileToString(System.getProperty("user.dir") + "/src/test/resources/producedkey.txt"))
-      .setMessageContent(fileToString(System.getProperty("user.dir") + "/src/test/resources/testData.txt"));
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
   private static final Topic TOPIC_TO_CHECK_SETTINGS = new Topic()
       .setName("new-topic-" + randomAlphabetic(5))
       .setNumberOfPartitions(1)
@@ -69,7 +67,7 @@ public class TopicsTests extends BaseTest {
   @BeforeAll
   public void beforeAll() {
     TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE, TOPIC_FOR_DELETE));
-    TOPIC_LIST.forEach(topic -> apiService.createTopic(CLUSTER_NAME, topic.getName()));
+    TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
   }
 
   @DisplayName("should create a topic")
@@ -505,6 +503,6 @@ void checkCopyTopicPossibility(){
 
   @AfterAll
   public void afterAll() {
-    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(CLUSTER_NAME, topic.getName()));
+    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/resources/producedkey.txt b/kafka-ui-e2e-checks/src/test/resources/producedkey.txt
deleted file mode 100644
index f1ccb75d55d..00000000000
--- a/kafka-ui-e2e-checks/src/test/resources/producedkey.txt
+++ /dev/null
@@ -1 +0,0 @@
-"key"
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/resources/testData.txt b/kafka-ui-e2e-checks/src/test/resources/testData.txt
deleted file mode 100644
index 9b9d3b66546..00000000000
--- a/kafka-ui-e2e-checks/src/test/resources/testData.txt
+++ /dev/null
@@ -1 +0,0 @@
-"print"

From 6096ad1d4944a6573a77cc9b99444951ae5da33d Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Fri, 13 Jan 2023 12:14:56 +0200
Subject: [PATCH 381/734] [e2e] Create common method for produce message in
 TopicMessagesTests (#3228)

* [e2e] Create common method for produce message in TopicMessagesTests

* [e2e] Create common method for produce message in TopicMessagesTests

* [e2e] Create common method for produce message in TopicMessagesTests
---
 .../ui/suite/topics/TopicMessagesTests.java   | 64 +++++++------------
 .../kafka/ui/suite/topics/TopicsTests.java    |  1 -
 2 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
index db2d67106b6..164a2ff5093 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -21,6 +21,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import io.qase.api.annotation.Step;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
@@ -43,7 +44,7 @@ public class TopicMessagesTests extends BaseTest {
       .setMessageKey(randomAlphabetic(5))
       .setMessageContent(randomAlphabetic(10));
   private static final Topic TOPIC_FOR_CHECKING_FILTERS = new Topic()
-      .setName("topic_for_checking_filters" + randomAlphabetic(5))
+      .setName("topic-for-checking-filters-" + randomAlphabetic(5))
       .setMessageKey(randomAlphabetic(5))
       .setMessageContent(randomAlphabetic(10));
   private static final Topic TOPIC_TO_RECREATE = new Topic()
@@ -69,15 +70,8 @@ public void beforeAll() {
   void produceMessage() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
     topicDetails
-        .openDetailsTab(MESSAGES)
-        .clickProduceMessageBtn();
-    produceMessagePanel
-        .waitUntilScreenReady()
-        .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
-        .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
-        .submitProduceMessage();
-    topicDetails
-        .waitUntilScreenReady();
+        .openDetailsTab(MESSAGES);
+    produceMessage(TOPIC_FOR_MESSAGES);
     SoftAssertions softly = new SoftAssertions();
     softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey())))
         .withFailMessage("isKeyMessageVisible()").isTrue();
@@ -96,16 +90,9 @@ void produceMessage() {
   void clearMessage() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
     topicDetails
-        .openDetailsTab(OVERVIEW)
-        .clickProduceMessageBtn();
+        .openDetailsTab(OVERVIEW);
     int messageAmount = topicDetails.getMessageCountAmount();
-    produceMessagePanel
-        .waitUntilScreenReady()
-        .setContentFiled(TOPIC_FOR_MESSAGES.getMessageContent())
-        .setKeyField(TOPIC_FOR_MESSAGES.getMessageKey())
-        .submitProduceMessage();
-    topicDetails
-        .waitUntilScreenReady();
+    produceMessage(TOPIC_FOR_MESSAGES);
     Assertions.assertEquals(messageAmount + 1, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
     topicDetails
         .openDotMenu()
@@ -197,18 +184,9 @@ void checkingMessageFilteringByTimestamp() {
   void checkClearTopicMessage() {
     navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_MESSAGES.getName());
     topicDetails
-        .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
-        .clickProduceMessageBtn();
-    produceMessagePanel
-        .waitUntilScreenReady()
-        .setContentFiled(TOPIC_TO_CLEAR_MESSAGES.getMessageContent())
-        .setKeyField(TOPIC_TO_CLEAR_MESSAGES.getMessageKey())
-        .submitProduceMessage();
-    topicDetails
-        .waitUntilScreenReady();
+        .openDetailsTab(OVERVIEW);
+  produceMessage(TOPIC_TO_CLEAR_MESSAGES);
     navigateToTopics();
-    topicsList
-        .waitUntilScreenReady();
     assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_MESSAGES.getName()).getNumberOfMessages())
         .as("getNumberOfMessages()").isEqualTo(1);
     topicsList
@@ -232,18 +210,9 @@ void checkClearTopicMessage() {
   void checkRecreateTopic(){
     navigateToTopicsAndOpenDetails(TOPIC_TO_RECREATE.getName());
     topicDetails
-        .openDetailsTab(TopicDetails.TopicMenu.OVERVIEW)
-        .clickProduceMessageBtn();
-    produceMessagePanel
-        .waitUntilScreenReady()
-        .setContentFiled(TOPIC_TO_RECREATE.getMessageContent())
-        .setKeyField(TOPIC_TO_RECREATE.getMessageKey())
-        .submitProduceMessage();
-    topicDetails
-        .waitUntilScreenReady();
+        .openDetailsTab(OVERVIEW);
+    produceMessage(TOPIC_TO_RECREATE);
     navigateToTopics();
-    topicsList
-        .waitUntilScreenReady();
     assertThat(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages())
         .as("getNumberOfMessages()").isEqualTo(1);
     topicsList
@@ -259,6 +228,19 @@ void checkRecreateTopic(){
     softly.assertAll();
   }
 
+  @Step
+  protected void produceMessage(Topic topic){
+    topicDetails
+        .clickProduceMessageBtn();
+    produceMessagePanel
+        .waitUntilScreenReady()
+        .setKeyField(topic.getMessageKey())
+        .setContentFiled(topic.getMessageContent())
+        .submitProduceMessage();
+    topicDetails
+        .waitUntilScreenReady();
+  }
+
   @AfterAll
   public void afterAll() {
     TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index bc2ebe0889b..b5f4e0d9778 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -264,7 +264,6 @@ void checkTimeToRetainDataCustomValueWithEditingTopic() {
   void checkCustomParametersWithinCreateNewTopic() {
     navigateToTopics();
     topicsList
-        .waitUntilScreenReady()
         .clickAddTopicBtn();
     topicCreateEditForm
         .waitUntilScreenReady()

From b4e7f3763b68362b0df6a0a167b344d5f6bf18af Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Fri, 13 Jan 2023 17:02:09 +0200
Subject: [PATCH 382/734] TopicTests.removeTopicFromAllTopics : Remove topic
 from all topics (#3231)

* TopicTests.removeTopicFromAllTopics : Remove topic from all topics

* Resolve conversation
---
 .../kafka/ui/pages/topic/TopicsList.java      |  7 ++
 .../kafka/ui/suite/topics/TopicsTests.java    | 67 ++++++++++++-------
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index afe5633e440..9db1d18c8bd 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -26,6 +26,7 @@ public class TopicsList extends BasePage {
     protected SelenideElement purgeMessagesOfSelectedTopicsBtn = $x("//button[text()='Purge messages of selected topics']");
     protected SelenideElement clearMessagesBtn = $x("//ul[contains(@class ,'open')]//div[text()='Clear Messages']");
     protected SelenideElement recreateTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Recreate Topic']");
+    protected SelenideElement removeTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Remove Topic']");
 
     @Step
     public TopicsList waitUntilScreenReady() {
@@ -98,6 +99,12 @@ public TopicsList clickRecreateTopicBtn(){
       return this;
     }
 
+    @Step
+    public TopicsList clickRemoveTopicBtn(){
+      clickByJavaScript(removeTopicBtn.shouldBe(visible));
+      return this;
+    }
+
     @Step
     public TopicsList clickConfirmBtnMdl() {
     clickConfirmButton();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index b5f4e0d9778..b70daa33079 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -47,8 +47,8 @@ public class TopicsTests extends BaseTest {
       .setCustomParameterType(COMPRESSION_TYPE)
       .setCustomParameterValue("producer")
       .setCleanupPolicyValue(DELETE);
-  private static final Topic TOPIC_TO_UPDATE = new Topic()
-      .setName("topic-to-update-" + randomAlphabetic(5))
+  private static final Topic TOPIC_TO_UPDATE_AND_DELETE = new Topic()
+      .setName("topic-to-update-and-delete-" + randomAlphabetic(5))
       .setNumberOfPartitions(1)
       .setCleanupPolicyValue(COMPACT)
       .setTimeToRetainData("604800001")
@@ -66,7 +66,7 @@ public class TopicsTests extends BaseTest {
 
   @BeforeAll
   public void beforeAll() {
-    TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE, TOPIC_FOR_DELETE));
+    TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE_AND_DELETE, TOPIC_FOR_DELETE));
     TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
   }
 
@@ -127,42 +127,60 @@ void checkAvailableOperations() {
   @Test
   @Order(3)
   public void updateTopic() {
-    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
     topicDetails
         .openDotMenu()
         .clickEditSettingsMenu();
     topicCreateEditForm
         .waitUntilScreenReady()
-        .selectCleanupPolicy((TOPIC_TO_UPDATE.getCleanupPolicyValue()))
+        .selectCleanupPolicy((TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue()))
         .setMinInsyncReplicas(10)
-        .setTimeToRetainDataInMs(TOPIC_TO_UPDATE.getTimeToRetainData())
-        .setMaxSizeOnDiskInGB(TOPIC_TO_UPDATE.getMaxSizeOnDisk())
-        .setMaxMessageBytes(TOPIC_TO_UPDATE.getMaxMessageBytes())
+        .setTimeToRetainDataInMs(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetainData())
+        .setMaxSizeOnDiskInGB(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk())
+        .setMaxMessageBytes(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes())
         .clickCreateTopicBtn();
     topicDetails
         .waitUntilScreenReady();
-    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
     topicDetails
         .openDotMenu()
         .clickEditSettingsMenu();
     SoftAssertions softly = new SoftAssertions();
     softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()")
-        .isEqualTo(TOPIC_TO_UPDATE.getCleanupPolicyValue().getVisibleText());
+        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText());
     softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()")
-        .isEqualTo(TOPIC_TO_UPDATE.getTimeToRetainData());
+        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetainData());
     softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()")
-        .isEqualTo(TOPIC_TO_UPDATE.getMaxSizeOnDisk().getVisibleText());
+        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText());
     softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()")
-        .isEqualTo(TOPIC_TO_UPDATE.getMaxMessageBytes());
+        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes());
     softly.assertAll();
   }
 
+  @DisplayName("TopicTests.removeTopicFromAllTopics : Remove topic from 'all topics'/'TopicList'")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(242)
+  @Test
+  @Order(4)
+  public void removeTopicFromTopicList() {
+    navigateToTopics();
+    topicsList
+        .openDotMenuByTopicName(TOPIC_TO_UPDATE_AND_DELETE.getName())
+        .clickRemoveTopicBtn()
+        .clickConfirmBtnMdl();
+    Assertions.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
+            String.format("Topic %s successfully deleted!", TOPIC_TO_UPDATE_AND_DELETE.getName())),
+        "isAlertWithMessageVisible()");
+    TOPIC_LIST.remove(TOPIC_TO_UPDATE_AND_DELETE);
+  }
+
   @DisplayName("should delete topic")
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(207)
   @Test
-  @Order(4)
+  @Order(5)
   public void deleteTopic() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_DELETE.getName());
     topicDetails
@@ -179,7 +197,7 @@ public void deleteTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(20)
   @Test
-  @Order(5)
+  @Order(6)
   void redirectToConsumerFromTopic() {
     String topicName = "source-activities";
     String consumerGroupId = "connect-sink_postgres_activities";
@@ -200,7 +218,7 @@ void redirectToConsumerFromTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(4)
   @Test
-  @Order(6)
+  @Order(7)
   void checkTopicCreatePossibility() {
     navigateToTopics();
     topicsList
@@ -225,7 +243,7 @@ void checkTopicCreatePossibility() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(266)
   @Test
-  @Order(7)
+  @Order(8)
   void checkTimeToRetainDataCustomValueWithEditingTopic() {
     Topic topicToRetainData = new Topic()
         .setName("topic-to-retain-data-" + randomAlphabetic(5))
@@ -260,7 +278,7 @@ void checkTimeToRetainDataCustomValueWithEditingTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(6)
   @Test
-  @Order(8)
+  @Order(9)
   void checkCustomParametersWithinCreateNewTopic() {
     navigateToTopics();
     topicsList
@@ -283,7 +301,7 @@ void checkCustomParametersWithinCreateNewTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(2)
   @Test
-  @Order(9)
+  @Order(10)
   void checkTopicListElements() {
     navigateToTopics();
     verifyElementsCondition(topicsList.getAllVisibleElements(), Condition.visible);
@@ -295,7 +313,7 @@ void checkTopicListElements() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(12)
   @Test
-  @Order(10)
+  @Order(11)
   void addingNewFilterWithinTopic() {
     String filterName = randomAlphabetic(5);
     navigateToTopicsAndOpenDetails("_schemas");
@@ -322,7 +340,7 @@ void addingNewFilterWithinTopic() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(13)
   @Test
-  @Order(11)
+  @Order(12)
   void checkFilterSavingWithinSavedFilters() {
     String displayName = randomAlphabetic(5);
     navigateToTopicsAndOpenDetails("my_ksql_1ksql_processing_log");
@@ -347,7 +365,7 @@ void checkFilterSavingWithinSavedFilters() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(14)
   @Test
-  @Order(12)
+  @Order(13)
   void checkingApplyingSavedFilterWithinTopicMessages() {
     String displayName = randomAlphabetic(5);
     navigateToTopicsAndOpenDetails("my_ksql_1ksql_processing_log");
@@ -371,7 +389,7 @@ void checkingApplyingSavedFilterWithinTopicMessages() {
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(11)
   @Test
-  @Order(13)
+  @Order(14)
   void checkShowInternalTopicsButtonFunctionality(){
     navigateToTopics();
     SoftAssertions softly = new SoftAssertions();
@@ -391,6 +409,7 @@ void checkShowInternalTopicsButtonFunctionality(){
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(56)
   @Test
+  @Order(15)
   void checkRetentionBytesAccordingToMaxSizeOnDisk(){
     navigateToTopics();
     topicsList
@@ -442,6 +461,7 @@ void checkRetentionBytesAccordingToMaxSizeOnDisk(){
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(247)
   @Test
+  @Order(16)
   void recreateTopicFromTopicProfile(){
     Topic topicToRecreate = new Topic()
         .setName("topic-to-recreate-" + randomAlphabetic(5))
@@ -473,6 +493,7 @@ void recreateTopicFromTopicProfile(){
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(8)
   @Test
+  @Order(17)
   void checkCopyTopicPossibility(){
     Topic topicToCopy = new Topic()
         .setName("topic-to-copy-" + randomAlphabetic(5))

From 7c6d04bca04fd2ea657c6c493cf6c67d538d093d Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 16 Jan 2023 14:49:04 +0400
Subject: [PATCH 383/734] Proto to JsonSchema well-known types support (#3088)

1. Add support for predefined (well-known) protobuf types.
2. `preservingProtoFieldNames` mode is enabled for proto messages formatting to fit proto file's message's field names
3. Invalid oneof-processing logic removed
4. Protobuf -> JsonSchema self-reference issue fixed
5. format added to Timestamp protobuf type
---
 .../serdes/builtin/sr/MessageFormatter.java   |   9 +-
 .../ui/util/jsonschema/AnyFieldSchema.java    |  27 +++
 .../jsonschema/AvroJsonSchemaConverter.java   |   2 +-
 .../kafka/ui/util/jsonschema/JsonSchema.java  |   4 +
 .../ui/util/jsonschema/ObjectFieldSchema.java |   3 +
 .../jsonschema/ProtobufSchemaConverter.java   | 211 ++++++++++++------
 .../ui/util/jsonschema/RefFieldSchema.java    |   4 +
 .../ui/util/jsonschema/SimpleJsonType.java    |  16 +-
 .../ProtobufSchemaConverterTest.java          | 176 ++++++++++-----
 kafka-ui-react-app/package.json               |   3 +
 kafka-ui-react-app/pnpm-lock.yaml             |  94 +++++++-
 .../Topics/Topic/SendMessage/utils.ts         |   5 +-
 12 files changed, 416 insertions(+), 138 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AnyFieldSchema.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java
index 04e1af091b2..52e8c6f33a4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java
@@ -2,9 +2,9 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.protobuf.Message;
+import com.google.protobuf.util.JsonFormat;
 import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaUtils;
 import io.confluent.kafka.serializers.KafkaAvroDeserializer;
 import io.confluent.kafka.serializers.json.KafkaJsonSchemaDeserializer;
 import io.confluent.kafka.serializers.protobuf.KafkaProtobufDeserializer;
@@ -52,8 +52,11 @@ class ProtobufMessageFormatter implements MessageFormatter {
     @SneakyThrows
     public String format(String topic, byte[] value) {
       final Message message = protobufDeserializer.deserialize(topic, value);
-      byte[] jsonBytes = ProtobufSchemaUtils.toJson(message);
-      return new String(jsonBytes);
+      return JsonFormat.printer()
+          .includingDefaultValueFields()
+          .omittingInsignificantWhitespace()
+          .preservingProtoFieldNames()
+          .print(message);
     }
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AnyFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AnyFieldSchema.java
new file mode 100644
index 00000000000..6352f04a947
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AnyFieldSchema.java
@@ -0,0 +1,27 @@
+package com.provectus.kafka.ui.util.jsonschema;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+// Specifies field that can contain any kind of value - primitive, complex and nulls
+public class AnyFieldSchema implements FieldSchema {
+
+  public static AnyFieldSchema get() {
+    return new AnyFieldSchema();
+  }
+
+  private AnyFieldSchema() {
+  }
+
+  @Override
+  public JsonNode toJsonNode(ObjectMapper mapper) {
+    var arr = mapper.createArrayNode();
+    arr.add("number");
+    arr.add("string");
+    arr.add("object");
+    arr.add("array");
+    arr.add("boolean");
+    arr.add("null");
+    return mapper.createObjectNode().set("type", arr);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
index 8c703526139..d2cd0e65f39 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
@@ -110,7 +110,7 @@ private FieldSchema createObjectSchema(Schema schema,
       return createRefField(definitionName);
     }
     // adding stub record, need to avoid infinite recursion
-    definitions.put(definitionName, new ObjectFieldSchema(Map.of(), List.of()));
+    definitions.put(definitionName, ObjectFieldSchema.EMPTY);
 
     final Map<String, FieldSchema> fields = schema.getFields().stream()
         .map(f -> Tuples.of(f.name(), convertField(f, definitions)))
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonSchema.java
index e8d0594c6cb..248cd027d47 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonSchema.java
@@ -23,6 +23,7 @@ public class JsonSchema {
   private final Map<String, FieldSchema> properties;
   private final Map<String, FieldSchema> definitions;
   private final List<String> required;
+  private final String rootRef;
 
   public String toJson() {
     final ObjectMapper mapper = new ObjectMapper();
@@ -53,6 +54,9 @@ public String toJson() {
               ))
       ));
     }
+    if (rootRef != null) {
+      objectNode.set("$ref", new TextNode(rootRef));
+    }
     return objectNode.toString();
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ObjectFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ObjectFieldSchema.java
index 7a279e465e6..589fe10533a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ObjectFieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ObjectFieldSchema.java
@@ -10,6 +10,9 @@
 import reactor.util.function.Tuples;
 
 public class ObjectFieldSchema implements FieldSchema {
+
+  public static final ObjectFieldSchema EMPTY = new ObjectFieldSchema(Map.of(), List.of());
+
   private final Map<String, FieldSchema> properties;
   private final List<String> required;
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java
index 57b49363230..219039b31ed 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java
@@ -1,90 +1,103 @@
 package com.provectus.kafka.ui.util.jsonschema;
 
+import static java.util.Objects.requireNonNull;
+
+import com.fasterxml.jackson.databind.node.BigIntegerNode;
+import com.fasterxml.jackson.databind.node.IntNode;
+import com.fasterxml.jackson.databind.node.LongNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.primitives.UnsignedInteger;
+import com.google.common.primitives.UnsignedLong;
+import com.google.protobuf.Any;
+import com.google.protobuf.BoolValue;
+import com.google.protobuf.BytesValue;
 import com.google.protobuf.Descriptors;
+import com.google.protobuf.DoubleValue;
+import com.google.protobuf.Duration;
+import com.google.protobuf.FieldMask;
+import com.google.protobuf.FloatValue;
+import com.google.protobuf.Int32Value;
+import com.google.protobuf.Int64Value;
+import com.google.protobuf.ListValue;
+import com.google.protobuf.StringValue;
+import com.google.protobuf.Struct;
+import com.google.protobuf.Timestamp;
+import com.google.protobuf.UInt32Value;
+import com.google.protobuf.UInt64Value;
+import com.google.protobuf.Value;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
 public class ProtobufSchemaConverter implements JsonSchemaConverter<Descriptors.Descriptor> {
-  @Override
-  public JsonSchema convert(URI basePath, Descriptors.Descriptor schema) {
-    final JsonSchema.JsonSchemaBuilder builder = JsonSchema.builder();
 
-    builder.id(basePath.resolve(schema.getFullName()));
-    builder.type(new SimpleJsonType(JsonType.Type.OBJECT));
+  private final Set<String> simpleTypesWrapperNames = Set.of(
+      BoolValue.getDescriptor().getFullName(),
+      Int32Value.getDescriptor().getFullName(),
+      UInt32Value.getDescriptor().getFullName(),
+      Int64Value.getDescriptor().getFullName(),
+      UInt64Value.getDescriptor().getFullName(),
+      StringValue.getDescriptor().getFullName(),
+      BytesValue.getDescriptor().getFullName(),
+      FloatValue.getDescriptor().getFullName(),
+      DoubleValue.getDescriptor().getFullName()
+  );
 
+  @Override
+  public JsonSchema convert(URI basePath, Descriptors.Descriptor schema) {
     Map<String, FieldSchema> definitions = new HashMap<>();
-    final ObjectFieldSchema root =
-        (ObjectFieldSchema) convertObjectSchema(schema, definitions, false);
-    builder.definitions(definitions);
-
-    builder.properties(root.getProperties());
-    builder.required(root.getRequired());
-
-    return builder.build();
+    RefFieldSchema rootRef = registerObjectAndReturnRef(schema, definitions);
+    return JsonSchema.builder()
+        .id(basePath.resolve(schema.getFullName()))
+        .type(new SimpleJsonType(JsonType.Type.OBJECT))
+        .rootRef(rootRef.getRef())
+        .definitions(definitions)
+        .build();
   }
 
-  private FieldSchema convertObjectSchema(Descriptors.Descriptor schema,
-                                          Map<String, FieldSchema> definitions, boolean ref) {
-    final Map<String, FieldSchema> fields = schema.getFields().stream()
-        .map(f -> Tuples.of(f.getName(), convertField(f, definitions)))
-        .collect(Collectors.toMap(
-            Tuple2::getT1,
-            Tuple2::getT2
-        ));
-
-    final Map<String, OneOfFieldSchema> oneOfFields = schema.getOneofs().stream().map(o ->
-        Tuples.of(
-            o.getName(),
-            new OneOfFieldSchema(
-                o.getFields().stream().map(
-                    Descriptors.FieldDescriptor::getName
-                ).map(fields::get).collect(Collectors.toList())
-            )
-        )
-    ).collect(Collectors.toMap(
-        Tuple2::getT1,
-        Tuple2::getT2
-    ));
-
-    final List<String> allOneOfFields = schema.getOneofs().stream().flatMap(o ->
-        o.getFields().stream().map(Descriptors.FieldDescriptor::getName)
-    ).collect(Collectors.toList());
+  private RefFieldSchema registerObjectAndReturnRef(Descriptors.Descriptor schema,
+                                                    Map<String, FieldSchema> definitions) {
+    var definition = schema.getFullName();
+    if (definitions.containsKey(definition)) {
+      return createRefField(definition);
+    }
+    // adding stub record, need to avoid infinite recursion
+    definitions.put(definition, ObjectFieldSchema.EMPTY);
 
-    final Map<String, FieldSchema> excludedOneOf = fields.entrySet().stream()
-        .filter(f -> !allOneOfFields.contains(f.getKey()))
-        .collect(Collectors.toMap(
-            Map.Entry::getKey,
-            Map.Entry::getValue
-        ));
+    Map<String, FieldSchema> fields = schema.getFields().stream()
+        .map(f -> Tuples.of(f.getName(), convertField(f, definitions)))
+        .collect(Collectors.toMap(Tuple2::getT1, Tuple2::getT2));
 
-    Map<String, FieldSchema> finalFields = new HashMap<>(excludedOneOf);
-    finalFields.putAll(oneOfFields);
+    List<String> required = schema.getFields().stream()
+        .filter(Descriptors.FieldDescriptor::isRequired)
+        .map(Descriptors.FieldDescriptor::getName)
+        .collect(Collectors.toList());
 
-    final List<String> required = schema.getFields().stream()
-        .filter(f -> !f.isOptional())
-        .map(Descriptors.FieldDescriptor::getName).collect(Collectors.toList());
+    // replacing stub record with actual object structure
+    definitions.put(definition, new ObjectFieldSchema(fields, required));
+    return createRefField(definition);
+  }
 
-    if (ref) {
-      String definitionName = String.format("record.%s", schema.getFullName());
-      definitions.put(definitionName, new ObjectFieldSchema(finalFields, required));
-      return new RefFieldSchema(String.format("#/definitions/%s", definitionName));
-    } else {
-      return new ObjectFieldSchema(fields, required);
-    }
+  private RefFieldSchema createRefField(String definition) {
+    return new RefFieldSchema("#/definitions/%s".formatted(definition));
   }
 
   private FieldSchema convertField(Descriptors.FieldDescriptor field,
                                    Map<String, FieldSchema> definitions) {
+    Optional<FieldSchema> wellKnownTypeSchema = convertProtoWellKnownTypes(field);
+    if (wellKnownTypeSchema.isPresent()) {
+      return wellKnownTypeSchema.get();
+    }
     final JsonType jsonType = convertType(field);
-
     FieldSchema fieldSchema;
     if (jsonType.getType().equals(JsonType.Type.OBJECT)) {
-      fieldSchema = convertObjectSchema(field.getMessageType(), definitions, true);
+      fieldSchema = registerObjectAndReturnRef(field.getMessageType(), definitions);
     } else {
       fieldSchema = new SimpleFieldSchema(jsonType);
     }
@@ -96,20 +109,88 @@ private FieldSchema convertField(Descriptors.FieldDescriptor field,
     }
   }
 
+  // converts Protobuf Well-known type (from google.protobuf.* packages) to Json-schema types
+  // see JsonFormat::buildWellKnownTypePrinters for impl details
+  private Optional<FieldSchema> convertProtoWellKnownTypes(Descriptors.FieldDescriptor field) {
+    // all well-known types are messages
+    if (field.getType() != Descriptors.FieldDescriptor.Type.MESSAGE) {
+      return Optional.empty();
+    }
+    String typeName = field.getMessageType().getFullName();
+    if (typeName.equals(Timestamp.getDescriptor().getFullName())) {
+      return Optional.of(
+          new SimpleFieldSchema(
+              new SimpleJsonType(JsonType.Type.STRING, Map.of("format", new TextNode("date-time")))));
+    }
+    if (typeName.equals(Duration.getDescriptor().getFullName())) {
+      return Optional.of(
+          new SimpleFieldSchema(
+              //TODO: current UI is failing when format=duration is set - need to fix this first
+              new SimpleJsonType(JsonType.Type.STRING // , Map.of("format", new TextNode("duration"))
+              )));
+    }
+    if (typeName.equals(FieldMask.getDescriptor().getFullName())) {
+      return Optional.of(new SimpleFieldSchema(new SimpleJsonType(JsonType.Type.STRING)));
+    }
+    if (typeName.equals(Any.getDescriptor().getFullName()) || typeName.equals(Struct.getDescriptor().getFullName())) {
+      return Optional.of(ObjectFieldSchema.EMPTY);
+    }
+    if (typeName.equals(Value.getDescriptor().getFullName())) {
+      return Optional.of(AnyFieldSchema.get());
+    }
+    if (typeName.equals(ListValue.getDescriptor().getFullName())) {
+      return Optional.of(new ArrayFieldSchema(AnyFieldSchema.get()));
+    }
+    if (simpleTypesWrapperNames.contains(typeName)) {
+      return Optional.of(new SimpleFieldSchema(
+          convertType(requireNonNull(field.getMessageType().findFieldByName("value")))));
+    }
+    return Optional.empty();
+  }
 
   private JsonType convertType(Descriptors.FieldDescriptor field) {
     switch (field.getType()) {
       case INT32:
-      case INT64:
+      case FIXED32:
+      case SFIXED32:
       case SINT32:
-      case SINT64:
+        return new SimpleJsonType(
+            JsonType.Type.INTEGER,
+            Map.of(
+                "maximum", IntNode.valueOf(Integer.MAX_VALUE),
+                "minimum", IntNode.valueOf(Integer.MIN_VALUE)
+            )
+        );
       case UINT32:
-      case UINT64:
-      case FIXED32:
+        return new SimpleJsonType(
+            JsonType.Type.INTEGER,
+            Map.of(
+                "maximum", LongNode.valueOf(UnsignedInteger.MAX_VALUE.longValue()),
+                "minimum", IntNode.valueOf(0)
+            )
+        );
+      //TODO: actually all *64 types will be printed with quotes (as strings),
+      // see JsonFormat::printSingleFieldValue for impl. This can cause problems when you copy-paste from messages
+      // table to `Produce` area - need to think if it is critical or not.
+      case INT64:
       case FIXED64:
-      case SFIXED32:
       case SFIXED64:
-        return new SimpleJsonType(JsonType.Type.INTEGER);
+      case SINT64:
+        return new SimpleJsonType(
+            JsonType.Type.INTEGER,
+            Map.of(
+                "maximum", LongNode.valueOf(Long.MAX_VALUE),
+                "minimum", LongNode.valueOf(Long.MIN_VALUE)
+            )
+        );
+      case UINT64:
+        return new SimpleJsonType(
+            JsonType.Type.INTEGER,
+            Map.of(
+                "maximum", new BigIntegerNode(UnsignedLong.MAX_VALUE.bigIntegerValue()),
+                "minimum", LongNode.valueOf(0)
+            )
+        );
       case MESSAGE:
       case GROUP:
         return new SimpleJsonType(JsonType.Type.OBJECT);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/RefFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/RefFieldSchema.java
index 82d544c6964..fa122f0f7e0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/RefFieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/RefFieldSchema.java
@@ -15,4 +15,8 @@ public RefFieldSchema(String ref) {
   public JsonNode toJsonNode(ObjectMapper mapper) {
     return mapper.createObjectNode().set("$ref", new TextNode(ref));
   }
+
+  public String getRef() {
+    return ref;
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleJsonType.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleJsonType.java
index 806ce95a9fe..56ab56b48c2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleJsonType.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleJsonType.java
@@ -3,19 +3,27 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 
 public class SimpleJsonType extends JsonType {
 
+  private final Map<String, JsonNode> additionalTypeProperties;
+
   public SimpleJsonType(Type type) {
+    this(type, Map.of());
+  }
+
+  public SimpleJsonType(Type type, Map<String, JsonNode> additionalTypeProperties) {
     super(type);
+    this.additionalTypeProperties = additionalTypeProperties;
   }
 
   @Override
   public Map<String, JsonNode> toJsonNode(ObjectMapper mapper) {
-    return Map.of(
-        "type",
-        new TextNode(type.getName())
-    );
+    return ImmutableMap.<String, JsonNode>builder()
+        .put("type", new TextNode(type.getName()))
+        .putAll(additionalTypeProperties)
+        .build();
   }
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java
index 605ed6ea007..662c3ae22b7 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java
@@ -1,70 +1,138 @@
 package com.provectus.kafka.ui.util.jsonschema;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import java.net.URI;
-import java.net.URISyntaxException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 
-public class ProtobufSchemaConverterTest {
+class ProtobufSchemaConverterTest {
 
   @Test
-  public void testSimpleProto() throws URISyntaxException, JsonProcessingException {
-
-    String proto = "syntax = \"proto3\";\n"
-        + "package com.acme;\n"
-        + "\n"
-        + "message MyRecord {\n"
-        + "  string f1 = 1;\n"
-        + "  OtherRecord f2 = 2;\n"
-        + "  repeated OtherRecord f3 = 3;\n"
-        + "}\n"
-        + "\n"
-        + "message OtherRecord {\n"
-        + "  int32 other_id = 1;\n"
-        + "  Order order = 2;\n"
-        + "  oneof optionalField {"
-        + "    string name = 3;"
-        + "    uint64 size = 4;"
-        + "  }"
-        + "}\n"
-        + "\n"
-        + "enum Order {\n"
-        + "    FIRST = 1;\n"
-        + "    SECOND = 1;\n"
-        + "}\n";
-
-    String expected =
-        "{\"$id\":\"http://example.com/com.acme.MyRecord\","
-        + "\"$schema\":\"https://json-schema.org/draft/2020-12/schema\","
-        + "\"type\":\"object\",\"properties\":{\"f1\":{\"type\":\"string\"},"
-        + "\"f2\":{\"$ref\":\"#/definitions/record.com.acme.OtherRecord\"},"
-        + "\"f3\":{\"type\":\"array\","
-        + "\"items\":{\"$ref\":\"#/definitions/record.com.acme.OtherRecord\"}}},"
-        + "\"required\":[\"f3\"],"
-        + "\"definitions\":"
-        + "{\"record.com.acme.OtherRecord\":"
-        + "{\"type\":\"object\",\"properties\":"
-        + "{\"optionalField\":{\"oneOf\":[{\"type\":\"string\"},"
-        + "{\"type\":\"integer\"}]},\"other_id\":"
-        + "{\"type\":\"integer\"},\"order\":{\"enum\":[\"FIRST\",\"SECOND\"],"
-        + "\"type\":\"string\"}}}}}";
-
-    ProtobufSchema protobufSchema = new ProtobufSchema(proto);
-
-    final ProtobufSchemaConverter converter = new ProtobufSchemaConverter();
+  void testSchemaConvert() throws Exception {
+    String protoSchema = """
+        syntax = "proto3";
+        package test;
+
+        import "google/protobuf/timestamp.proto";
+        import "google/protobuf/duration.proto";
+        import "google/protobuf/struct.proto";
+        import "google/protobuf/wrappers.proto";
+
+        message TestMsg {
+            string string_field = 1;
+            int32 int32_field = 2;
+            bool bool_field = 3;
+            SampleEnum enum_field = 4;
+
+            enum SampleEnum {
+                ENUM_V1 = 0;
+                ENUM_V2 = 1;
+            }
+
+            google.protobuf.Timestamp ts_field = 5;
+            google.protobuf.Struct struct_field = 6;
+            google.protobuf.ListValue lst_v_field = 7;
+            google.protobuf.Duration duration_field = 8;
+
+            oneof some_oneof1 {
+                google.protobuf.Value v1 = 9;
+                google.protobuf.Value v2 = 10;
+            }
+            // wrapper fields:
+            google.protobuf.Int64Value int64_w_field = 11;
+            google.protobuf.Int32Value int32_w_field = 12;
+            google.protobuf.UInt64Value uint64_w_field = 13;
+            google.protobuf.UInt32Value uint32_w_field = 14;
+            google.protobuf.StringValue string_w_field = 15;
+            google.protobuf.BoolValue bool_w_field = 16;
+            google.protobuf.DoubleValue double_w_field = 17;
+            google.protobuf.FloatValue float_w_field = 18;
+
+            //embedded msg
+            EmbeddedMsg emb = 19;
+            repeated EmbeddedMsg emb_list = 20;
+
+            message EmbeddedMsg {
+                int32 emb_f1 = 1;
+                TestMsg outer_ref = 2;
+            }
+        }""";
+
+
+    String expectedJsonSchema = """
+        {
+            "$id": "http://example.com/test.TestMsg",
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "type": "object",
+            "definitions":
+            {
+                "test.TestMsg":
+                {
+                    "type": "object",
+                    "properties":
+                    {
+                        "enum_field": {
+                            "enum":
+                            [
+                                "ENUM_V1",
+                                "ENUM_V2"
+                            ],
+                            "type": "string"
+                        },
+                        "string_w_field": { "type": "string" },
+                        "ts_field": { "type": "string", "format": "date-time" },
+                        "emb_list": {
+                            "type": "array",
+                            "items": { "$ref": "#/definitions/test.TestMsg.EmbeddedMsg" }
+                        },
+                        "float_w_field": { "type": "number" },
+                        "lst_v_field": {
+                            "type": "array",
+                            "items": { "type":[ "number", "string", "object", "array", "boolean", "null" ] }
+                        },
+                        "struct_field": { "type": "object", "properties": {} },
+                        "string_field": { "type": "string" },
+                        "double_w_field": { "type": "number" },
+                        "bool_field": { "type": "boolean" },
+                        "int32_w_field": { "type": "integer", "maximum": 2147483647, "minimum": -2147483648 },
+                        "duration_field": { "type": "string" },
+                        "int32_field": { "type": "integer", "maximum": 2147483647, "minimum": -2147483648 },
+                        "int64_w_field": {
+                            "type": "integer",
+                            "maximum": 9223372036854775807, "minimum": -9223372036854775808
+                        },
+                        "v1": { "type": [ "number", "string", "object", "array", "boolean", "null" ] },
+                        "emb": { "$ref": "#/definitions/test.TestMsg.EmbeddedMsg" },
+                        "v2": { "type": [ "number", "string", "object", "array", "boolean", "null" ] },
+                        "uint32_w_field": { "type": "integer", "maximum": 4294967295, "minimum": 0 },
+                        "bool_w_field": { "type": "boolean" },
+                        "uint64_w_field": { "type": "integer", "maximum": 18446744073709551615, "minimum": 0 }
+                    }
+                },
+                "test.TestMsg.EmbeddedMsg": {
+                    "type": "object",
+                    "properties":
+                    {
+                        "emb_f1": { "type": "integer", "maximum": 2147483647, "minimum": -2147483648 },
+                        "outer_ref": { "$ref": "#/definitions/test.TestMsg" }
+                    }
+                }
+            },
+            "$ref": "#/definitions/test.TestMsg"
+        }""";
+
+    ProtobufSchemaConverter converter = new ProtobufSchemaConverter();
+    ProtobufSchema protobufSchema = new ProtobufSchema(protoSchema);
     URI basePath = new URI("http://example.com/");
 
-    final JsonSchema convert =
-        converter.convert(basePath, protobufSchema.toDescriptor("MyRecord"));
+    JsonSchema converted = converter.convert(basePath, protobufSchema.toDescriptor());
+    assertJsonEqual(expectedJsonSchema, converted.toJson());
+  }
 
+  private void assertJsonEqual(String expected, String actual) throws Exception {
     ObjectMapper om = new ObjectMapper();
-    Assertions.assertEquals(
-        om.readTree(expected),
-        om.readTree(convert.toJson())
-    );
+    Assertions.assertEquals(om.readTree(expected), om.readTree(actual));
   }
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index f51939d5978..5c51e700076 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -19,6 +19,9 @@
     "@types/testing-library__jest-dom": "^5.14.5",
     "ace-builds": "^1.7.1",
     "ajv": "^8.6.3",
+    "ajv-formats": "^2.1.1",
+    "babel-jest": "^29.0.3",
+    "classnames": "^2.2.6",
     "fetch-mock": "^9.11.0",
     "jest": "^29.0.3",
     "jest-watch-typeahead": "^2.0.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index c7e33aea0ae..52390df0cde 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -38,6 +38,9 @@ specifiers:
   '@vitejs/plugin-react-swc': ^3.0.0
   ace-builds: ^1.7.1
   ajv: ^8.6.3
+  ajv-formats: ^2.1.1
+  babel-jest: ^29.0.3
+  classnames: ^2.2.6
   dotenv: ^16.0.1
   eslint: ^8.3.0
   eslint-config-airbnb: ^19.0.4
@@ -106,6 +109,9 @@ dependencies:
   '@types/testing-library__jest-dom': 5.14.5
   ace-builds: 1.7.1
   ajv: 8.8.2
+  ajv-formats: 2.1.1_ajv@8.8.2
+  babel-jest: 29.0.3_@babel+core@7.18.2
+  classnames: 2.3.1
   fetch-mock: 9.11.0
   jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
   jest-watch-typeahead: 2.0.0_jest@29.0.3
@@ -1084,7 +1090,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
@@ -1094,6 +1099,15 @@ packages:
       '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
 
+  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
+
   /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
@@ -1109,7 +1123,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.9:
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
@@ -1224,6 +1237,15 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: true
 
+  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.2:
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
+
   /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
@@ -1239,7 +1261,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
@@ -1274,7 +1295,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
@@ -1291,7 +1311,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
@@ -1308,7 +1327,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.9:
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
@@ -1325,7 +1343,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
@@ -1342,7 +1359,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
@@ -1359,7 +1375,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
@@ -1397,7 +1412,6 @@ packages:
     dependencies:
       '@babel/core': 7.18.2
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
 
   /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.9:
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
@@ -4115,6 +4129,17 @@ packages:
       indent-string: 4.0.0
     dev: true
 
+  /ajv-formats/2.1.1_ajv@8.8.2:
+    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+    dependencies:
+      ajv: 8.8.2
+    dev: false
+
   /ajv/6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
@@ -4297,6 +4322,24 @@ packages:
     resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
     dev: true
 
+  /babel-jest/29.0.3_@babel+core@7.18.2:
+    resolution: {integrity: sha512-ApPyHSOhS/sVzwUOQIWJmdvDhBsMG01HX9z7ogtkp1TToHGGUWFlnXJUIzCgKPSfiYLn3ibipCYzsKSURHEwLg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.8.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@jest/transform': 29.0.3
+      '@types/babel__core': 7.1.19
+      babel-plugin-istanbul: 6.1.1
+      babel-preset-jest: 29.0.2_@babel+core@7.18.2
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      slash: 3.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /babel-jest/29.0.3_@babel+core@7.18.9:
     resolution: {integrity: sha512-ApPyHSOhS/sVzwUOQIWJmdvDhBsMG01HX9z7ogtkp1TToHGGUWFlnXJUIzCgKPSfiYLn3ibipCYzsKSURHEwLg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -4440,6 +4483,26 @@ packages:
     resolution: {integrity: sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==}
     dev: true
 
+  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.2:
+    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.2
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.2
+      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.2
+    dev: false
+
   /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.9:
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
@@ -4459,6 +4522,17 @@ packages:
       '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
       '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.9
 
+  /babel-preset-jest/29.0.2_@babel+core@7.18.2:
+    resolution: {integrity: sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.18.2
+      babel-plugin-jest-hoist: 29.0.2
+      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2
+    dev: false
+
   /babel-preset-jest/29.0.2_@babel+core@7.18.9:
     resolution: {integrity: sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
index cbafcfeea10..8a368036c06 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
@@ -6,6 +6,7 @@ import {
 import jsf from 'json-schema-faker';
 import { compact } from 'lodash';
 import Ajv, { DefinedError } from 'ajv/dist/2020';
+import addFormats from 'ajv-formats';
 import upperFirst from 'lodash/upperFirst';
 
 jsf.option('fillProperties', false);
@@ -80,7 +81,9 @@ export const validateBySchema = (
     return [`Error in parsing the "${type}" field value`];
   }
   try {
-    const validate = new Ajv().compile(parcedSchema);
+    const ajv = new Ajv();
+    addFormats(ajv);
+    const validate = ajv.compile(parcedSchema);
     validate(parsedValue);
     if (validate.errors) {
       errors = validate.errors.map(

From 799c2c455af010c089c9097e43348265d37e7b51 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 16 Jan 2023 15:27:55 +0400
Subject: [PATCH 384/734] Implement SchemaRegistry openapi client (#3123)

Failover clients for SchemaRegistry, Kafka-connect, KSQL:
1. SchemeRegistry openapi client generation
2. WebClient configuration logic moved to WebClientConfigurator class
3. ReactiveFailover utility implemented
4. Connect, Ksql moved to ReactiveFailover usage
---
 .../ui/client/KafkaConnectClientsFactory.java |  22 -
 .../ui/client/RetryingKafkaConnectClient.java |  91 +---
 .../kafka/ui/config/ClustersProperties.java   |   6 +
 .../ui/controller/KafkaConnectController.java |   6 +-
 .../ui/controller/SchemasController.java      | 125 ++---
 .../SchemaCompatibilityException.java         |   4 +-
 .../SchemaTypeNotSupportedException.java      |  12 -
 .../kafka/ui/mapper/ClusterMapper.java        | 100 +---
 .../kafka/ui/mapper/KafkaSrMapper.java        |  37 ++
 .../kafka/ui/model/FailoverUrlList.java       |  59 ---
 .../kafka/ui/model/InternalKsqlServer.java    |  19 -
 .../ui/model/InternalSchemaRegistry.java      |  33 --
 .../kafka/ui/model/KafkaCluster.java          |  15 +-
 .../kafka/ui/model/KafkaConnectCluster.java   |  21 -
 .../kafka/ui/service/ClustersStorage.java     |   5 +-
 .../kafka/ui/service/FeatureService.java      |   9 +-
 .../kafka/ui/service/KafkaClusterFactory.java | 133 +++++
 .../kafka/ui/service/KafkaConnectService.java |  78 +--
 .../ui/service/SchemaRegistryService.java     | 496 ++++--------------
 .../kafka/ui/service/ksql/KsqlApiClient.java  | 115 ++--
 .../kafka/ui/service/ksql/KsqlServiceV2.java  |  20 +-
 .../kafka/ui/util/ReactiveFailover.java       | 154 ++++++
 .../kafka/ui/util/SecuredWebClient.java       |  66 ---
 .../kafka/ui/util/WebClientConfigurator.java  | 136 +++++
 .../kafka/ui/model/FailoverUrlListTest.java   |  69 ---
 .../service/SchemaRegistryPaginationTest.java |  86 +--
 .../service/TopicsServicePaginationTest.java  |   2 -
 .../ui/service/ksql/KsqlApiClientTest.java    |  12 +-
 .../ui/service/ksql/KsqlServiceV2Test.java    |  33 +-
 .../kafka/ui/util/ReactiveFailoverTest.java   | 233 ++++++++
 kafka-ui-contract/pom.xml                     |  26 +
 .../main/resources/swagger/kafka-sr-api.yaml  | 404 ++++++++++++++
 32 files changed, 1508 insertions(+), 1119 deletions(-)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClientsFactory.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/SchemaTypeNotSupportedException.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaSrMapper.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/FailoverUrlList.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalSchemaRegistry.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaConnectCluster.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SecuredWebClient.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
 delete mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/model/FailoverUrlListTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/ReactiveFailoverTest.java
 create mode 100644 kafka-ui-contract/src/main/resources/swagger/kafka-sr-api.yaml

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClientsFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClientsFactory.java
deleted file mode 100644
index 3a5195f5cf0..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/KafkaConnectClientsFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.provectus.kafka.ui.client;
-
-import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
-import com.provectus.kafka.ui.model.KafkaConnectCluster;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.unit.DataSize;
-
-@Service
-public class KafkaConnectClientsFactory {
-
-  @Value("${webclient.max-in-memory-buffer-size:20MB}")
-  private DataSize maxBuffSize;
-
-  private final Map<String, KafkaConnectClientApi> cache = new ConcurrentHashMap<>();
-
-  public KafkaConnectClientApi withKafkaConnectConfig(KafkaConnectCluster config) {
-    return cache.computeIfAbsent(config.getAddress(), s -> new RetryingKafkaConnectClient(config, maxBuffSize));
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
index 6f71441d177..be5686e2f95 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
@@ -1,49 +1,29 @@
 package com.provectus.kafka.ui.client;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import static com.provectus.kafka.ui.config.ClustersProperties.ConnectCluster;
+
 import com.provectus.kafka.ui.connect.ApiClient;
-import com.provectus.kafka.ui.connect.RFC3339DateFormat;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
 import com.provectus.kafka.ui.connect.model.Connector;
 import com.provectus.kafka.ui.connect.model.NewConnector;
 import com.provectus.kafka.ui.exception.KafkaConnectConflictReponseException;
 import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.model.InternalSchemaRegistry;
-import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.KafkaConnectCluster;
-import com.provectus.kafka.ui.util.SecuredWebClient;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import java.io.FileInputStream;
-import java.security.KeyStore;
-import java.text.DateFormat;
+import com.provectus.kafka.ui.util.WebClientConfigurator;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
-import java.util.TimeZone;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
 import lombok.extern.slf4j.Slf4j;
-import org.openapitools.jackson.nullable.JsonNullableModule;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.http.codec.json.Jackson2JsonDecoder;
-import org.springframework.http.codec.json.Jackson2JsonEncoder;
 import org.springframework.util.MultiValueMap;
-import org.springframework.util.ResourceUtils;
 import org.springframework.util.unit.DataSize;
 import org.springframework.web.client.RestClientException;
-import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.netty.http.client.HttpClient;
 import reactor.util.retry.Retry;
 
 @Slf4j
@@ -51,7 +31,7 @@ public class RetryingKafkaConnectClient extends KafkaConnectClientApi {
   private static final int MAX_RETRIES = 5;
   private static final Duration RETRIES_DELAY = Duration.ofMillis(200);
 
-  public RetryingKafkaConnectClient(KafkaConnectCluster config, DataSize maxBuffSize) {
+  public RetryingKafkaConnectClient(ConnectCluster config, DataSize maxBuffSize) {
     super(new RetryingApiClient(config, maxBuffSize));
   }
 
@@ -97,58 +77,27 @@ public Mono<Connector> setConnectorConfig(String connectorName, Map<String, Obje
 
   private static class RetryingApiClient extends ApiClient {
 
-    private static final DateFormat dateFormat = getDefaultDateFormat();
-    private static final ObjectMapper mapper = buildObjectMapper(dateFormat);
-
-    public RetryingApiClient(KafkaConnectCluster config, DataSize maxBuffSize) {
-      super(buildWebClient(mapper, maxBuffSize, config), mapper, dateFormat);
+    public RetryingApiClient(ConnectCluster config, DataSize maxBuffSize) {
+      super(buildWebClient(maxBuffSize, config), null, null);
       setBasePath(config.getAddress());
       setUsername(config.getUserName());
       setPassword(config.getPassword());
     }
 
-    public static DateFormat getDefaultDateFormat() {
-      DateFormat dateFormat = new RFC3339DateFormat();
-      dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-      return dateFormat;
-    }
-
-    public static WebClient buildWebClient(ObjectMapper mapper, DataSize maxBuffSize, KafkaConnectCluster config) {
-      ExchangeStrategies strategies = ExchangeStrategies
-              .builder()
-              .codecs(clientDefaultCodecsConfigurer -> {
-                clientDefaultCodecsConfigurer.defaultCodecs()
-                        .jackson2JsonEncoder(new Jackson2JsonEncoder(mapper, MediaType.APPLICATION_JSON));
-                clientDefaultCodecsConfigurer.defaultCodecs()
-                        .jackson2JsonDecoder(new Jackson2JsonDecoder(mapper, MediaType.APPLICATION_JSON));
-                clientDefaultCodecsConfigurer.defaultCodecs()
-                        .maxInMemorySize((int) maxBuffSize.toBytes());
-              })
-              .build();
-
-      try {
-        WebClient.Builder webClient = SecuredWebClient.configure(
-            config.getKeystoreLocation(),
-            config.getKeystorePassword(),
-            config.getTruststoreLocation(),
-            config.getTruststorePassword()
-        );
-
-        return webClient.exchangeStrategies(strategies).build();
-      } catch (Exception e) {
-        throw new IllegalStateException(
-            "cannot create TLS configuration for kafka-connect cluster " + config.getName(), e);
-      }
-    }
-
-    public static ObjectMapper buildObjectMapper(DateFormat dateFormat) {
-      ObjectMapper mapper = new ObjectMapper();
-      mapper.setDateFormat(dateFormat);
-      mapper.registerModule(new JavaTimeModule());
-      mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-      JsonNullableModule jnm = new JsonNullableModule();
-      mapper.registerModule(jnm);
-      return mapper;
+    public static WebClient buildWebClient(DataSize maxBuffSize, ConnectCluster config) {
+      return new WebClientConfigurator()
+          .configureSsl(
+              config.getKeystoreLocation(),
+              config.getKeystorePassword(),
+              config.getTruststoreLocation(),
+              config.getTruststorePassword()
+          )
+          .configureBasicAuth(
+              config.getUserName(),
+              config.getPassword()
+          )
+          .configureBufferSize(maxBuffSize)
+          .build();
     }
 
     @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 2894fd107a8..e709f33d4f4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -8,7 +8,10 @@
 import java.util.Properties;
 import java.util.Set;
 import javax.annotation.PostConstruct;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
@@ -53,6 +56,9 @@ public static class MetricsConfigData {
   }
 
   @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  @Builder(toBuilder = true)
   public static class ConnectCluster {
     String name;
     String address;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index dcf452bb841..2f8bb2dbf4a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -234,9 +234,9 @@ public Mono<ResponseEntity<Flux<ConnectorPluginDTO>>> getConnectorPlugins(
         .build());
 
     return validateAccess.then(
-        kafkaConnectService
-            .getConnectorPlugins(getCluster(clusterName), connectName)
-            .map(ResponseEntity::ok)
+        Mono.just(
+            ResponseEntity.ok(
+                kafkaConnectService.getConnectorPlugins(getCluster(clusterName), connectName)))
     );
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
index 9c5710fe41c..f32be1c97e8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
@@ -2,7 +2,8 @@
 
 import com.provectus.kafka.ui.api.SchemasApi;
 import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.mapper.ClusterMapper;
+import com.provectus.kafka.ui.mapper.KafkaSrMapper;
+import com.provectus.kafka.ui.mapper.KafkaSrMapperImpl;
 import com.provectus.kafka.ui.model.CompatibilityCheckResponseDTO;
 import com.provectus.kafka.ui.model.CompatibilityLevelDTO;
 import com.provectus.kafka.ui.model.KafkaCluster;
@@ -32,7 +33,7 @@ public class SchemasController extends AbstractController implements SchemasApi
 
   private static final Integer DEFAULT_PAGE_SIZE = 25;
 
-  private final ClusterMapper mapper;
+  private final KafkaSrMapper kafkaSrMapper = new KafkaSrMapperImpl();
 
   private final SchemaRegistryService schemaRegistryService;
   private final AccessControlService accessControlService;
@@ -40,7 +41,7 @@ public class SchemasController extends AbstractController implements SchemasApi
   @Override
   protected KafkaCluster getCluster(String clusterName) {
     var c = super.getCluster(clusterName);
-    if (c.getSchemaRegistry() == null) {
+    if (c.getSchemaRegistryClient() == null) {
       throw new ValidationException("Schema Registry is not set for cluster " + clusterName);
     }
     return c;
@@ -48,9 +49,8 @@ protected KafkaCluster getCluster(String clusterName) {
 
   @Override
   public Mono<ResponseEntity<CompatibilityCheckResponseDTO>> checkSchemaCompatibility(
-      String clusterName, String subject, @Valid Mono<NewSchemaSubjectDTO> newSchemaSubject,
+      String clusterName, String subject, @Valid Mono<NewSchemaSubjectDTO> newSchemaSubjectMono,
       ServerWebExchange exchange) {
-
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
         .schema(subject)
@@ -58,37 +58,41 @@ public Mono<ResponseEntity<CompatibilityCheckResponseDTO>> checkSchemaCompatibil
         .build());
 
     return validateAccess.then(
-        schemaRegistryService.checksSchemaCompatibility(
-                getCluster(clusterName), subject, newSchemaSubject)
-            .map(mapper::toCompatibilityCheckResponse)
+        newSchemaSubjectMono.flatMap(subjectDTO ->
+                schemaRegistryService.checksSchemaCompatibility(
+                    getCluster(clusterName),
+                    subject,
+                    kafkaSrMapper.fromDto(subjectDTO)
+                ))
+            .map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
     );
   }
 
   @Override
   public Mono<ResponseEntity<SchemaSubjectDTO>> createNewSchema(
-      String clusterName, @Valid Mono<NewSchemaSubjectDTO> newSchemaSubject,
+      String clusterName, @Valid Mono<NewSchemaSubjectDTO> newSchemaSubjectMono,
       ServerWebExchange exchange) {
+    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+        .cluster(clusterName)
+        .schemaActions(SchemaAction.CREATE)
+        .build());
 
-    return newSchemaSubject.flatMap(dto -> {
-      Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
-          .cluster(clusterName)
-          .schemaActions(SchemaAction.CREATE)
-          .build());
-
-      return validateAccess.then(
-          schemaRegistryService
-              .registerNewSchema(getCluster(clusterName), dto)
-              .map(ResponseEntity::ok)
-      );
-    });
+    return validateAccess.then(
+        newSchemaSubjectMono.flatMap(newSubject ->
+                schemaRegistryService.registerNewSchema(
+                    getCluster(clusterName),
+                    newSubject.getSubject(),
+                    kafkaSrMapper.fromDto(newSubject)
+                )
+            ).map(kafkaSrMapper::toDto)
+            .map(ResponseEntity::ok)
+    );
   }
 
   @Override
-  public Mono<ResponseEntity<Void>> deleteLatestSchema(String clusterName,
-                                                       String subject,
-                                                       ServerWebExchange exchange) {
-
+  public Mono<ResponseEntity<Void>> deleteLatestSchema(
+      String clusterName, String subject, ServerWebExchange exchange) {
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
         .schema(subject)
@@ -102,9 +106,8 @@ public Mono<ResponseEntity<Void>> deleteLatestSchema(String clusterName,
   }
 
   @Override
-  public Mono<ResponseEntity<Void>> deleteSchema(String clusterName,
-                                                 String subject,
-                                                 ServerWebExchange exchange) {
+  public Mono<ResponseEntity<Void>> deleteSchema(
+      String clusterName, String subject, ServerWebExchange exchange) {
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
         .schema(subject)
@@ -118,36 +121,32 @@ public Mono<ResponseEntity<Void>> deleteSchema(String clusterName,
   }
 
   @Override
-  public Mono<ResponseEntity<Void>> deleteSchemaByVersion(String clusterName,
-                                                          String subject,
-                                                          Integer version,
-                                                          ServerWebExchange exchange) {
-
+  public Mono<ResponseEntity<Void>> deleteSchemaByVersion(
+      String clusterName, String subjectName, Integer version, ServerWebExchange exchange) {
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
-        .schema(subject)
+        .schema(subjectName)
         .schemaActions(SchemaAction.DELETE)
         .build());
 
     return validateAccess.then(
-        schemaRegistryService.deleteSchemaSubjectByVersion(getCluster(clusterName), subject, version)
+        schemaRegistryService.deleteSchemaSubjectByVersion(getCluster(clusterName), subjectName, version)
             .thenReturn(ResponseEntity.ok().build())
     );
   }
 
   @Override
   public Mono<ResponseEntity<Flux<SchemaSubjectDTO>>> getAllVersionsBySubject(
-      String clusterName, String subject, ServerWebExchange exchange) {
-
+      String clusterName, String subjectName, ServerWebExchange exchange) {
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
-        .schema(subject)
+        .schema(subjectName)
         .schemaActions(SchemaAction.VIEW)
         .build());
 
     Flux<SchemaSubjectDTO> schemas =
-        schemaRegistryService.getAllVersionsBySubject(getCluster(clusterName), subject);
-
+        schemaRegistryService.getAllVersionsBySubject(getCluster(clusterName), subjectName)
+            .map(kafkaSrMapper::toDto);
     return validateAccess.thenReturn(ResponseEntity.ok(schemas));
   }
 
@@ -155,7 +154,7 @@ public Mono<ResponseEntity<Flux<SchemaSubjectDTO>>> getAllVersionsBySubject(
   public Mono<ResponseEntity<CompatibilityLevelDTO>> getGlobalSchemaCompatibilityLevel(
       String clusterName, ServerWebExchange exchange) {
     return schemaRegistryService.getGlobalSchemaCompatibilityLevel(getCluster(clusterName))
-        .map(mapper::toCompatibilityLevelDto)
+        .map(c -> new CompatibilityLevelDTO().compatibility(kafkaSrMapper.toDto(c)))
         .map(ResponseEntity::ok)
         .defaultIfEmpty(ResponseEntity.notFound().build());
   }
@@ -172,6 +171,7 @@ public Mono<ResponseEntity<SchemaSubjectDTO>> getLatestSchema(String clusterName
 
     return validateAccess.then(
         schemaRegistryService.getLatestSchemaVersionBySubject(getCluster(clusterName), subject)
+            .map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
     );
   }
@@ -179,7 +179,6 @@ public Mono<ResponseEntity<SchemaSubjectDTO>> getLatestSchema(String clusterName
   @Override
   public Mono<ResponseEntity<SchemaSubjectDTO>> getSchemaByVersion(
       String clusterName, String subject, Integer version, ServerWebExchange exchange) {
-
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
         .schema(subject)
@@ -189,6 +188,7 @@ public Mono<ResponseEntity<SchemaSubjectDTO>> getSchemaByVersion(
     return validateAccess.then(
         schemaRegistryService.getSchemaSubjectByVersion(
                 getCluster(clusterName), subject, version)
+            .map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
     );
   }
@@ -198,10 +198,10 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
                                                                     @Valid Integer pageNum,
                                                                     @Valid Integer perPage,
                                                                     @Valid String search,
-                                                                    ServerWebExchange exchange) {
+                                                                    ServerWebExchange serverWebExchange) {
     return schemaRegistryService
         .getAllSubjectNames(getCluster(clusterName))
-        .flatMapMany(Flux::fromArray)
+        .flatMapIterable(l -> l)
         .filterWhen(schema -> accessControlService.isSchemaAccessible(schema, clusterName))
         .collectList()
         .flatMap(subjects -> {
@@ -218,46 +218,49 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
               .limit(pageSize)
               .collect(Collectors.toList());
           return schemaRegistryService.getAllLatestVersionSchemas(getCluster(clusterName), subjectsToRender)
-              .map(a -> new SchemaSubjectsResponseDTO().pageCount(totalPages).schemas(a));
-        })
-        .map(ResponseEntity::ok);
+              .map(subjs -> subjs.stream().map(kafkaSrMapper::toDto).toList())
+              .map(subjs -> new SchemaSubjectsResponseDTO().pageCount(totalPages).schemas(subjs));
+        }).map(ResponseEntity::ok);
   }
 
   @Override
   public Mono<ResponseEntity<Void>> updateGlobalSchemaCompatibilityLevel(
-      String clusterName, @Valid Mono<CompatibilityLevelDTO> compatibilityLevel,
+      String clusterName, @Valid Mono<CompatibilityLevelDTO> compatibilityLevelMono,
       ServerWebExchange exchange) {
-
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
         .schemaActions(SchemaAction.MODIFY_GLOBAL_COMPATIBILITY)
         .build());
 
-    log.info("Updating schema compatibility globally");
-
     return validateAccess.then(
-        schemaRegistryService.updateSchemaCompatibility(
-                getCluster(clusterName), compatibilityLevel)
-            .map(ResponseEntity::ok)
+        compatibilityLevelMono
+            .flatMap(compatibilityLevelDTO ->
+                schemaRegistryService.updateGlobalSchemaCompatibility(
+                    getCluster(clusterName),
+                    kafkaSrMapper.fromDto(compatibilityLevelDTO.getCompatibility())
+                ))
+            .thenReturn(ResponseEntity.ok().build())
     );
   }
 
   @Override
   public Mono<ResponseEntity<Void>> updateSchemaCompatibilityLevel(
-      String clusterName, String subject, @Valid Mono<CompatibilityLevelDTO> compatibilityLevel,
+      String clusterName, String subject, @Valid Mono<CompatibilityLevelDTO> compatibilityLevelMono,
       ServerWebExchange exchange) {
-
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
         .schemaActions(SchemaAction.EDIT)
         .build());
 
-    log.info("Updating schema compatibility for subject: {}", subject);
-
     return validateAccess.then(
-        schemaRegistryService.updateSchemaCompatibility(
-                getCluster(clusterName), subject, compatibilityLevel)
-            .map(ResponseEntity::ok)
+        compatibilityLevelMono
+            .flatMap(compatibilityLevelDTO ->
+                schemaRegistryService.updateSchemaCompatibility(
+                    getCluster(clusterName),
+                    subject,
+                    kafkaSrMapper.fromDto(compatibilityLevelDTO.getCompatibility())
+                ))
+            .thenReturn(ResponseEntity.ok().build())
     );
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/SchemaCompatibilityException.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/SchemaCompatibilityException.java
index 6ea5d12d81b..bed98d63eaa 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/SchemaCompatibilityException.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/SchemaCompatibilityException.java
@@ -1,8 +1,8 @@
 package com.provectus.kafka.ui.exception;
 
 public class SchemaCompatibilityException extends CustomBaseException {
-  public SchemaCompatibilityException(String message) {
-    super(message);
+  public SchemaCompatibilityException() {
+    super("Schema being registered is incompatible with an earlier schema");
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/SchemaTypeNotSupportedException.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/SchemaTypeNotSupportedException.java
deleted file mode 100644
index 9fd7a06af87..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/SchemaTypeNotSupportedException.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.provectus.kafka.ui.exception;
-
-public class SchemaTypeNotSupportedException extends UnprocessableEntityException {
-
-  private static final String REQUIRED_SCHEMA_REGISTRY_VERSION = "5.5.0";
-
-  public SchemaTypeNotSupportedException() {
-    super(String.format("Current version of Schema Registry does "
-        + "not support provided schema type,"
-        + " version %s or later is required here.", REQUIRED_SCHEMA_REGISTRY_VERSION));
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index 50c543c8e28..0d33b5ca568 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -8,25 +8,18 @@
 import com.provectus.kafka.ui.model.ClusterDTO;
 import com.provectus.kafka.ui.model.ClusterMetricsDTO;
 import com.provectus.kafka.ui.model.ClusterStatsDTO;
-import com.provectus.kafka.ui.model.CompatibilityCheckResponseDTO;
-import com.provectus.kafka.ui.model.CompatibilityLevelDTO;
 import com.provectus.kafka.ui.model.ConfigSourceDTO;
 import com.provectus.kafka.ui.model.ConfigSynonymDTO;
 import com.provectus.kafka.ui.model.ConnectDTO;
-import com.provectus.kafka.ui.model.FailoverUrlList;
 import com.provectus.kafka.ui.model.Feature;
 import com.provectus.kafka.ui.model.InternalBroker;
 import com.provectus.kafka.ui.model.InternalBrokerConfig;
 import com.provectus.kafka.ui.model.InternalBrokerDiskUsage;
 import com.provectus.kafka.ui.model.InternalClusterState;
-import com.provectus.kafka.ui.model.InternalKsqlServer;
 import com.provectus.kafka.ui.model.InternalPartition;
 import com.provectus.kafka.ui.model.InternalReplica;
-import com.provectus.kafka.ui.model.InternalSchemaRegistry;
 import com.provectus.kafka.ui.model.InternalTopic;
 import com.provectus.kafka.ui.model.InternalTopicConfig;
-import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.KafkaConnectCluster;
 import com.provectus.kafka.ui.model.MetricDTO;
 import com.provectus.kafka.ui.model.Metrics;
 import com.provectus.kafka.ui.model.PartitionDTO;
@@ -34,35 +27,20 @@
 import com.provectus.kafka.ui.model.TopicConfigDTO;
 import com.provectus.kafka.ui.model.TopicDTO;
 import com.provectus.kafka.ui.model.TopicDetailsDTO;
-import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityCheck;
-import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel;
 import com.provectus.kafka.ui.service.masking.DataMasking;
 import com.provectus.kafka.ui.service.metrics.RawMetric;
-import com.provectus.kafka.ui.util.PollingThrottler;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.Named;
 
 @Mapper(componentModel = "spring")
 public interface ClusterMapper {
 
   ClusterDTO toCluster(InternalClusterState clusterState);
 
-  @Mapping(target = "properties", source = "properties", qualifiedByName = "setProperties")
-  @Mapping(target = "schemaRegistry", source = ".", qualifiedByName = "setSchemaRegistry")
-  @Mapping(target = "ksqldbServer", source = ".", qualifiedByName = "setKsqldbServer")
-  @Mapping(target = "metricsConfig", source = "metrics")
-  @Mapping(target = "throttler", source = ".", qualifiedByName = "createClusterThrottler")
-  KafkaCluster toKafkaCluster(ClustersProperties.Cluster clusterProperties);
-
   ClusterStatsDTO toClusterStats(InternalClusterState clusterState);
 
   default ClusterMetricsDTO toClusterMetrics(Metrics metrics) {
@@ -107,67 +85,6 @@ default ConfigSynonymDTO toConfigSynonym(ConfigEntry.ConfigSynonym config) {
 
   BrokerDTO toBrokerDto(InternalBroker broker);
 
-  @Named("setSchemaRegistry")
-  default InternalSchemaRegistry setSchemaRegistry(ClustersProperties.Cluster clusterProperties) {
-    if (clusterProperties == null
-        || clusterProperties.getSchemaRegistry() == null) {
-      return null;
-    }
-
-    InternalSchemaRegistry.InternalSchemaRegistryBuilder internalSchemaRegistry =
-        InternalSchemaRegistry.builder();
-
-    internalSchemaRegistry.url(
-        clusterProperties.getSchemaRegistry() != null
-            ? new FailoverUrlList(Arrays.asList(clusterProperties.getSchemaRegistry().split(",")))
-            : new FailoverUrlList(Collections.emptyList())
-    );
-
-    if (clusterProperties.getSchemaRegistryAuth() != null) {
-      internalSchemaRegistry.username(clusterProperties.getSchemaRegistryAuth().getUsername());
-      internalSchemaRegistry.password(clusterProperties.getSchemaRegistryAuth().getPassword());
-    }
-
-    if (clusterProperties.getSchemaRegistrySsl() != null) {
-      internalSchemaRegistry.keystoreLocation(clusterProperties.getSchemaRegistrySsl().getKeystoreLocation());
-      internalSchemaRegistry.keystorePassword(clusterProperties.getSchemaRegistrySsl().getKeystorePassword());
-      internalSchemaRegistry.truststoreLocation(clusterProperties.getSchemaRegistrySsl().getTruststoreLocation());
-      internalSchemaRegistry.truststorePassword(clusterProperties.getSchemaRegistrySsl().getTruststorePassword());
-    }
-
-    return internalSchemaRegistry.build();
-  }
-
-  @Named("setKsqldbServer")
-  default InternalKsqlServer setKsqldbServer(ClustersProperties.Cluster clusterProperties) {
-    if (clusterProperties == null
-            || clusterProperties.getKsqldbServer() == null) {
-      return null;
-    }
-
-    InternalKsqlServer.InternalKsqlServerBuilder internalKsqlServerBuilder =
-            InternalKsqlServer.builder().url(clusterProperties.getKsqldbServer());
-
-    if (clusterProperties.getKsqldbServerAuth() != null) {
-      internalKsqlServerBuilder.username(clusterProperties.getKsqldbServerAuth().getUsername());
-      internalKsqlServerBuilder.password(clusterProperties.getKsqldbServerAuth().getPassword());
-    }
-
-    if (clusterProperties.getKsqldbServerSsl() != null) {
-      internalKsqlServerBuilder.keystoreLocation(clusterProperties.getKsqldbServerSsl().getKeystoreLocation());
-      internalKsqlServerBuilder.keystorePassword(clusterProperties.getKsqldbServerSsl().getKeystorePassword());
-      internalKsqlServerBuilder.truststoreLocation(clusterProperties.getKsqldbServerSsl().getTruststoreLocation());
-      internalKsqlServerBuilder.truststorePassword(clusterProperties.getKsqldbServerSsl().getTruststorePassword());
-    }
-
-    return internalKsqlServerBuilder.build();
-  }
-
-  @Named("createClusterThrottler")
-  default Supplier<PollingThrottler> createClusterThrottler(ClustersProperties.Cluster cluster) {
-    return PollingThrottler.throttlerSupplier(cluster);
-  }
-
   TopicDetailsDTO toTopicDetails(InternalTopic topic);
 
   @Mapping(target = "isReadOnly", source = "readOnly")
@@ -176,16 +93,10 @@ default Supplier<PollingThrottler> createClusterThrottler(ClustersProperties.Clu
 
   ReplicaDTO toReplica(InternalReplica replica);
 
-  ConnectDTO toKafkaConnect(KafkaConnectCluster connect);
+  ConnectDTO toKafkaConnect(ClustersProperties.ConnectCluster connect);
 
   List<ClusterDTO.FeaturesEnum> toFeaturesEnum(List<Feature> features);
 
-  @Mapping(target = "isCompatible", source = "compatible")
-  CompatibilityCheckResponseDTO toCompatibilityCheckResponse(InternalCompatibilityCheck dto);
-
-  @Mapping(target = "compatibility", source = "compatibilityLevel")
-  CompatibilityLevelDTO toCompatibilityLevelDto(InternalCompatibilityLevel dto);
-
   default List<PartitionDTO> map(Map<Integer, InternalPartition> map) {
     return map.values().stream().map(this::toPartition).collect(Collectors.toList());
   }
@@ -202,13 +113,4 @@ default DataMasking map(List<ClustersProperties.Masking> maskingProperties) {
     return DataMasking.create(maskingProperties);
   }
 
-  @Named("setProperties")
-  default Properties setProperties(Properties properties) {
-    Properties copy = new Properties();
-    if (properties != null) {
-      copy.putAll(properties);
-    }
-    return copy;
-  }
-
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaSrMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaSrMapper.java
new file mode 100644
index 00000000000..ea3435d4aa1
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaSrMapper.java
@@ -0,0 +1,37 @@
+package com.provectus.kafka.ui.mapper;
+
+import com.provectus.kafka.ui.model.CompatibilityCheckResponseDTO;
+import com.provectus.kafka.ui.model.CompatibilityLevelDTO;
+import com.provectus.kafka.ui.model.NewSchemaSubjectDTO;
+import com.provectus.kafka.ui.model.SchemaSubjectDTO;
+import com.provectus.kafka.ui.model.SchemaTypeDTO;
+import com.provectus.kafka.ui.service.SchemaRegistryService;
+import com.provectus.kafka.ui.sr.model.Compatibility;
+import com.provectus.kafka.ui.sr.model.CompatibilityCheckResponse;
+import com.provectus.kafka.ui.sr.model.NewSubject;
+import com.provectus.kafka.ui.sr.model.SchemaType;
+import java.util.Optional;
+import org.mapstruct.Mapper;
+
+
+@Mapper(componentModel = "spring")
+public interface KafkaSrMapper {
+
+  default SchemaSubjectDTO toDto(SchemaRegistryService.SubjectWithCompatibilityLevel s) {
+    return new SchemaSubjectDTO()
+        .id(s.getId())
+        .version(s.getVersion())
+        .subject(s.getSubject())
+        .schema(s.getSchema())
+        .schemaType(SchemaTypeDTO.fromValue(Optional.ofNullable(s.getSchemaType()).orElse(SchemaType.AVRO).getValue()))
+        .compatibilityLevel(s.getCompatibility().toString());
+  }
+
+  CompatibilityCheckResponseDTO toDto(CompatibilityCheckResponse ccr);
+
+  CompatibilityLevelDTO.CompatibilityEnum toDto(Compatibility compatibility);
+
+  NewSubject fromDto(NewSchemaSubjectDTO subjectDto);
+
+  Compatibility fromDto(CompatibilityLevelDTO.CompatibilityEnum dtoEnum);
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/FailoverUrlList.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/FailoverUrlList.java
deleted file mode 100644
index 1a760ba3396..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/FailoverUrlList.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.provectus.kafka.ui.model;
-
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import lombok.experimental.Delegate;
-
-public class FailoverUrlList {
-
-  public static final int DEFAULT_RETRY_GRACE_PERIOD_IN_MS = 5000;
-
-  private final Map<Integer, Instant> failures = new ConcurrentHashMap<>();
-  private final AtomicInteger index = new AtomicInteger(0);
-  @Delegate
-  private final List<String> urls;
-  private final int retryGracePeriodInMs;
-
-  public FailoverUrlList(List<String> urls) {
-    this(urls, DEFAULT_RETRY_GRACE_PERIOD_IN_MS);
-  }
-
-  public FailoverUrlList(List<String> urls, int retryGracePeriodInMs) {
-    if (urls != null && !urls.isEmpty()) {
-      this.urls = new ArrayList<>(urls);
-    } else {
-      throw new IllegalArgumentException("Expected at least one URL to be passed in constructor");
-    }
-    this.retryGracePeriodInMs = retryGracePeriodInMs;
-  }
-
-  public String current() {
-    return this.urls.get(this.index.get());
-  }
-
-  public void fail(String url) {
-    int currentIndex = this.index.get();
-    if ((this.urls.get(currentIndex)).equals(url)) {
-      this.failures.put(currentIndex, Instant.now());
-      this.index.compareAndSet(currentIndex, (currentIndex + 1) % this.urls.size());
-    }
-  }
-
-  public boolean isFailoverAvailable() {
-    var now = Instant.now();
-    return this.urls.size() > this.failures.size()
-            || this.failures
-                    .values()
-                    .stream()
-                    .anyMatch(e -> now.isAfter(e.plusMillis(retryGracePeriodInMs)));
-  }
-
-  @Override
-  public String toString() {
-    return this.urls.toString();
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java
deleted file mode 100644
index f56167d997a..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalKsqlServer.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.provectus.kafka.ui.model;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.ToString;
-
-@Data
-@ToString(exclude = {"password", "keystorePassword", "truststorePassword"})
-@Builder(toBuilder = true)
-public class InternalKsqlServer {
-  private final String url;
-  private final String username;
-  private final String password;
-
-  private final String keystoreLocation;
-  private final String truststoreLocation;
-  private final String keystorePassword;
-  private final String truststorePassword;
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalSchemaRegistry.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalSchemaRegistry.java
deleted file mode 100644
index b96952d569c..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalSchemaRegistry.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.provectus.kafka.ui.model;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder(toBuilder = true)
-public class InternalSchemaRegistry {
-  private final String username;
-  private final String password;
-  private final FailoverUrlList url;
-
-  private final String keystoreLocation;
-  private final String truststoreLocation;
-  private final String keystorePassword;
-  private final String truststorePassword;
-
-  public String getPrimaryNodeUri() {
-    return url.get(0);
-  }
-
-  public String getUri() {
-    return url.current();
-  }
-
-  public void markAsUnavailable(String url) {
-    this.url.fail(url);
-  }
-
-  public boolean isFailoverAvailable() {
-    return this.url.isFailoverAvailable();
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
index 5c9a0753f61..d87113633f5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
@@ -1,8 +1,13 @@
 package com.provectus.kafka.ui.model;
 
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
+import com.provectus.kafka.ui.service.ksql.KsqlApiClient;
 import com.provectus.kafka.ui.service.masking.DataMasking;
+import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
 import com.provectus.kafka.ui.util.PollingThrottler;
-import java.util.List;
+import com.provectus.kafka.ui.util.ReactiveFailover;
+import java.util.Map;
 import java.util.Properties;
 import java.util.function.Supplier;
 import lombok.AccessLevel;
@@ -14,16 +19,18 @@
 @Builder(toBuilder = true)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class KafkaCluster {
+  private final ClustersProperties.Cluster originalProperties;
+
   private final String name;
   private final String version;
   private final String bootstrapServers;
-  private final InternalSchemaRegistry schemaRegistry;
-  private final InternalKsqlServer ksqldbServer;
-  private final List<KafkaConnectCluster> kafkaConnect;
   private final Properties properties;
   private final boolean readOnly;
   private final boolean disableLogDirsCollection;
   private final MetricsConfig metricsConfig;
   private final DataMasking masking;
   private final Supplier<PollingThrottler> throttler;
+  private final ReactiveFailover<KafkaSrClientApi> schemaRegistryClient;
+  private final Map<String, ReactiveFailover<KafkaConnectClientApi>> connectsClients;
+  private final ReactiveFailover<KsqlApiClient> ksqlClient;
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaConnectCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaConnectCluster.java
deleted file mode 100644
index 4a95b0e890e..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaConnectCluster.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.provectus.kafka.ui.model;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder(toBuilder = true)
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class KafkaConnectCluster {
-  private final String name;
-  private final String address;
-  private final String userName;
-  private final String password;
-
-  private final String keystoreLocation;
-  private final String truststoreLocation;
-  private final String keystorePassword;
-  private final String truststorePassword;
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStorage.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStorage.java
index 08b71b4d318..c0143ad8c59 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStorage.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStorage.java
@@ -2,7 +2,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.provectus.kafka.ui.config.ClustersProperties;
-import com.provectus.kafka.ui.mapper.ClusterMapper;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import java.util.Collection;
 import java.util.Optional;
@@ -13,9 +12,9 @@ public class ClustersStorage {
 
   private final ImmutableMap<String, KafkaCluster> kafkaClusters;
 
-  public ClustersStorage(ClustersProperties properties, ClusterMapper mapper) {
+  public ClustersStorage(ClustersProperties properties, KafkaClusterFactory factory) {
     var builder = ImmutableMap.<String, KafkaCluster>builder();
-    properties.getClusters().forEach(c -> builder.put(c.getName(), mapper.toKafkaCluster(c)));
+    properties.getClusters().forEach(c -> builder.put(c.getName(), factory.create(c)));
     this.kafkaClusters = builder.build();
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
index 9097f2b25e7..b2694d9f7db 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
@@ -27,17 +28,17 @@ public class FeatureService {
   public Mono<List<Feature>> getAvailableFeatures(KafkaCluster cluster, @Nullable Node controller) {
     List<Mono<Feature>> features = new ArrayList<>();
 
-    if (Optional.ofNullable(cluster.getKafkaConnect())
-        .filter(Predicate.not(List::isEmpty))
+    if (Optional.ofNullable(cluster.getConnectsClients())
+        .filter(Predicate.not(Map::isEmpty))
         .isPresent()) {
       features.add(Mono.just(Feature.KAFKA_CONNECT));
     }
 
-    if (cluster.getKsqldbServer() != null) {
+    if (cluster.getKsqlClient() != null) {
       features.add(Mono.just(Feature.KSQL_DB));
     }
 
-    if (cluster.getSchemaRegistry() != null) {
+    if (cluster.getSchemaRegistryClient() != null) {
       features.add(Mono.just(Feature.SCHEMA_REGISTRY));
     }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
new file mode 100644
index 00000000000..b1000131eec
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
@@ -0,0 +1,133 @@
+package com.provectus.kafka.ui.service;
+
+import com.provectus.kafka.ui.client.RetryingKafkaConnectClient;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.MetricsConfig;
+import com.provectus.kafka.ui.service.ksql.KsqlApiClient;
+import com.provectus.kafka.ui.service.masking.DataMasking;
+import com.provectus.kafka.ui.sr.ApiClient;
+import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
+import com.provectus.kafka.ui.util.PollingThrottler;
+import com.provectus.kafka.ui.util.ReactiveFailover;
+import com.provectus.kafka.ui.util.WebClientConfigurator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.unit.DataSize;
+import org.springframework.web.reactive.function.client.WebClient;
+
+@Service
+@RequiredArgsConstructor
+public class KafkaClusterFactory {
+
+  @Value("${webclient.max-in-memory-buffer-size:20MB}")
+  private DataSize maxBuffSize;
+
+  public KafkaCluster create(ClustersProperties.Cluster clusterProperties) {
+    KafkaCluster.KafkaClusterBuilder builder = KafkaCluster.builder();
+
+    builder.name(clusterProperties.getName());
+    builder.bootstrapServers(clusterProperties.getBootstrapServers());
+    builder.properties(Optional.ofNullable(clusterProperties.getProperties()).orElse(new Properties()));
+    builder.readOnly(clusterProperties.isReadOnly());
+    builder.disableLogDirsCollection(clusterProperties.isDisableLogDirsCollection());
+    builder.masking(DataMasking.create(clusterProperties.getMasking()));
+    builder.metricsConfig(metricsConfigDataToMetricsConfig(clusterProperties.getMetrics()));
+    builder.throttler(PollingThrottler.throttlerSupplier(clusterProperties));
+
+    builder.schemaRegistryClient(schemaRegistryClient(clusterProperties));
+    builder.connectsClients(connectClients(clusterProperties));
+    builder.ksqlClient(ksqlClient(clusterProperties));
+
+    builder.originalProperties(clusterProperties);
+
+    return builder.build();
+  }
+
+  @Nullable
+  private Map<String, ReactiveFailover<KafkaConnectClientApi>> connectClients(
+      ClustersProperties.Cluster clusterProperties) {
+    if (clusterProperties.getKafkaConnect() == null) {
+      return null;
+    }
+    Map<String, ReactiveFailover<KafkaConnectClientApi>> connects = new HashMap<>();
+    clusterProperties.getKafkaConnect().forEach(c -> {
+      ReactiveFailover<KafkaConnectClientApi> failover = ReactiveFailover.create(
+          parseUrlList(c.getAddress()),
+          url -> new RetryingKafkaConnectClient(c.toBuilder().address(url).build(), maxBuffSize),
+          ReactiveFailover.CONNECTION_REFUSED_EXCEPTION_FILTER,
+          "No alive connect instances available",
+          ReactiveFailover.DEFAULT_RETRY_GRACE_PERIOD_MS
+      );
+      connects.put(c.getName(), failover);
+    });
+    return connects;
+  }
+
+  @Nullable
+  private ReactiveFailover<KafkaSrClientApi> schemaRegistryClient(ClustersProperties.Cluster clusterProperties) {
+    if (clusterProperties.getSchemaRegistry() == null) {
+      return null;
+    }
+    var auth = Optional.ofNullable(clusterProperties.getSchemaRegistryAuth())
+        .orElse(new ClustersProperties.SchemaRegistryAuth());
+    WebClient webClient = new WebClientConfigurator()
+        .configureSsl(clusterProperties.getSchemaRegistrySsl())
+        .configureBasicAuth(auth.getUsername(), auth.getPassword())
+        .build();
+    return ReactiveFailover.create(
+        parseUrlList(clusterProperties.getSchemaRegistry()),
+        url -> new KafkaSrClientApi(new ApiClient(webClient, null, null).setBasePath(url)),
+        ReactiveFailover.CONNECTION_REFUSED_EXCEPTION_FILTER,
+        "No live schemaRegistry instances available",
+        ReactiveFailover.DEFAULT_RETRY_GRACE_PERIOD_MS
+    );
+  }
+
+  @Nullable
+  private ReactiveFailover<KsqlApiClient> ksqlClient(ClustersProperties.Cluster clusterProperties) {
+    if (clusterProperties.getKsqldbServer() == null) {
+      return null;
+    }
+    return ReactiveFailover.create(
+        parseUrlList(clusterProperties.getKsqldbServer()),
+        url -> new KsqlApiClient(
+            url,
+            clusterProperties.getKsqldbServerAuth(),
+            clusterProperties.getKsqldbServerSsl(),
+            maxBuffSize
+        ),
+        ReactiveFailover.CONNECTION_REFUSED_EXCEPTION_FILTER,
+        "No live ksqldb instances available",
+        ReactiveFailover.DEFAULT_RETRY_GRACE_PERIOD_MS
+    );
+  }
+
+  private List<String> parseUrlList(String url) {
+    return Stream.of(url.split(",")).map(String::trim).filter(s -> !s.isBlank()).toList();
+  }
+
+  @Nullable
+  private MetricsConfig metricsConfigDataToMetricsConfig(ClustersProperties.MetricsConfigData metricsConfigData) {
+    if (metricsConfigData == null) {
+      return null;
+    }
+    MetricsConfig.MetricsConfigBuilder builder = MetricsConfig.builder();
+    builder.type(metricsConfigData.getType());
+    builder.port(metricsConfigData.getPort());
+    builder.ssl(metricsConfigData.isSsl());
+    builder.username(metricsConfigData.getUsername());
+    builder.password(metricsConfigData.getPassword());
+    return builder.build();
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
index d749c8c9005..cfc190cffdb 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
@@ -2,13 +2,12 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.client.KafkaConnectClientsFactory;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
 import com.provectus.kafka.ui.connect.model.ConnectorStatus;
 import com.provectus.kafka.ui.connect.model.ConnectorStatusConnector;
 import com.provectus.kafka.ui.connect.model.ConnectorTopics;
 import com.provectus.kafka.ui.connect.model.TaskStatus;
-import com.provectus.kafka.ui.exception.ConnectNotFoundException;
+import com.provectus.kafka.ui.exception.NotFoundException;
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.mapper.ClusterMapper;
 import com.provectus.kafka.ui.mapper.KafkaConnectMapper;
@@ -24,9 +23,11 @@
 import com.provectus.kafka.ui.model.NewConnectorDTO;
 import com.provectus.kafka.ui.model.TaskDTO;
 import com.provectus.kafka.ui.model.connect.InternalConnectInfo;
+import com.provectus.kafka.ui.util.ReactiveFailover;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -50,12 +51,11 @@ public class KafkaConnectService {
   private final KafkaConnectMapper kafkaConnectMapper;
   private final ObjectMapper objectMapper;
   private final KafkaConfigSanitizer kafkaConfigSanitizer;
-  private final KafkaConnectClientsFactory kafkaConnectClientsFactory;
 
   public List<ConnectDTO> getConnects(KafkaCluster cluster) {
-    return cluster.getKafkaConnect().stream()
-        .map(clusterMapper::toKafkaConnect)
-        .collect(Collectors.toList());
+    return Optional.ofNullable(cluster.getOriginalProperties().getKafkaConnect())
+        .map(lst -> lst.stream().map(clusterMapper::toKafkaConnect).toList())
+        .orElse(List.of());
   }
 
   public Flux<FullConnectorInfoDTO> getAllConnectors(final KafkaCluster cluster,
@@ -118,8 +118,9 @@ private Stream<String> getSearchValues(FullConnectorInfoDTO fullConnectorInfo) {
 
   private Mono<ConnectorTopics> getConnectorTopics(KafkaCluster cluster, String connectClusterName,
                                                    String connectorName) {
-    return withConnectClient(cluster, connectClusterName)
-        .flatMap(c -> c.getConnectorTopics(connectorName).map(result -> result.get(connectorName)))
+    return api(cluster, connectClusterName)
+        .mono(c -> c.getConnectorTopics(connectorName))
+        .map(result -> result.get(connectorName))
         // old connectors don't have this api, setting empty list for
         // backward-compatibility
         .onErrorResume(Exception.class, e -> Mono.just(new ConnectorTopics().topics(List.of())));
@@ -141,8 +142,8 @@ private List<String> parseToList(String json) {
   }
 
   public Flux<String> getConnectors(KafkaCluster cluster, String connectName) {
-    return withConnectClient(cluster, connectName)
-        .flatMapMany(client ->
+    return api(cluster, connectName)
+        .flux(client ->
             client.getConnectors(null)
                 .doOnError(e -> log.error("Unexpected error upon getting connectors", e))
         );
@@ -150,8 +151,8 @@ public Flux<String> getConnectors(KafkaCluster cluster, String connectName) {
 
   public Mono<ConnectorDTO> createConnector(KafkaCluster cluster, String connectName,
                                             Mono<NewConnectorDTO> connector) {
-    return withConnectClient(cluster, connectName)
-        .flatMap(client ->
+    return api(cluster, connectName)
+        .mono(client ->
             connector
                 .flatMap(c -> connectorExists(cluster, connectName, c.getName())
                     .map(exists -> {
@@ -177,8 +178,8 @@ private Mono<Boolean> connectorExists(KafkaCluster cluster, String connectName,
 
   public Mono<ConnectorDTO> getConnector(KafkaCluster cluster, String connectName,
                                          String connectorName) {
-    return withConnectClient(cluster, connectName)
-        .flatMap(client -> client.getConnector(connectorName)
+    return api(cluster, connectName)
+        .mono(client -> client.getConnector(connectorName)
             .map(kafkaConnectMapper::fromClient)
             .flatMap(connector ->
                 client.getConnectorStatus(connector.getName())
@@ -226,8 +227,8 @@ private Mono<ConnectorStatus> emptyStatus(String connectorName) {
 
   public Mono<Map<String, Object>> getConnectorConfig(KafkaCluster cluster, String connectName,
                                                       String connectorName) {
-    return withConnectClient(cluster, connectName)
-        .flatMap(c -> c.getConnectorConfig(connectorName))
+    return api(cluster, connectName)
+        .mono(c -> c.getConnectorConfig(connectorName))
         .map(connectorConfig -> {
           final Map<String, Object> obfuscatedMap = new HashMap<>();
           connectorConfig.forEach((key, value) ->
@@ -238,8 +239,8 @@ public Mono<Map<String, Object>> getConnectorConfig(KafkaCluster cluster, String
 
   public Mono<ConnectorDTO> setConnectorConfig(KafkaCluster cluster, String connectName,
                                                String connectorName, Mono<Object> requestBody) {
-    return withConnectClient(cluster, connectName)
-        .flatMap(c ->
+    return api(cluster, connectName)
+        .mono(c ->
             requestBody
                 .flatMap(body -> c.setConnectorConfig(connectorName, (Map<String, Object>) body))
                 .map(kafkaConnectMapper::fromClient));
@@ -247,14 +248,14 @@ public Mono<ConnectorDTO> setConnectorConfig(KafkaCluster cluster, String connec
 
   public Mono<Void> deleteConnector(
       KafkaCluster cluster, String connectName, String connectorName) {
-    return withConnectClient(cluster, connectName)
-        .flatMap(c -> c.deleteConnector(connectorName));
+    return api(cluster, connectName)
+        .mono(c -> c.deleteConnector(connectorName));
   }
 
   public Mono<Void> updateConnectorState(KafkaCluster cluster, String connectName,
                                          String connectorName, ConnectorActionDTO action) {
-    return withConnectClient(cluster, connectName)
-        .flatMap(client -> {
+    return api(cluster, connectName)
+        .mono(client -> {
           switch (action) {
             case RESTART:
               return client.restartConnector(connectorName, false, false);
@@ -283,8 +284,8 @@ private Mono<Void> restartTasks(KafkaCluster cluster, String connectName,
   }
 
   public Flux<TaskDTO> getConnectorTasks(KafkaCluster cluster, String connectName, String connectorName) {
-    return withConnectClient(cluster, connectName)
-        .flatMapMany(client ->
+    return api(cluster, connectName)
+        .flux(client ->
             client.getConnectorTasks(connectorName)
                 .onErrorResume(WebClientResponseException.NotFound.class, e -> Flux.empty())
                 .map(kafkaConnectMapper::fromClient)
@@ -299,20 +300,20 @@ public Flux<TaskDTO> getConnectorTasks(KafkaCluster cluster, String connectName,
 
   public Mono<Void> restartConnectorTask(KafkaCluster cluster, String connectName,
                                          String connectorName, Integer taskId) {
-    return withConnectClient(cluster, connectName)
-        .flatMap(client -> client.restartConnectorTask(connectorName, taskId));
+    return api(cluster, connectName)
+        .mono(client -> client.restartConnectorTask(connectorName, taskId));
   }
 
-  public Mono<Flux<ConnectorPluginDTO>> getConnectorPlugins(KafkaCluster cluster,
-                                                            String connectName) {
-    return withConnectClient(cluster, connectName)
-        .map(client -> client.getConnectorPlugins().map(kafkaConnectMapper::fromClient));
+  public Flux<ConnectorPluginDTO> getConnectorPlugins(KafkaCluster cluster,
+                                                      String connectName) {
+    return api(cluster, connectName)
+        .flux(client -> client.getConnectorPlugins().map(kafkaConnectMapper::fromClient));
   }
 
   public Mono<ConnectorPluginConfigValidationResponseDTO> validateConnectorPluginConfig(
       KafkaCluster cluster, String connectName, String pluginName, Mono<Object> requestBody) {
-    return withConnectClient(cluster, connectName)
-        .flatMap(client ->
+    return api(cluster, connectName)
+        .mono(client ->
             requestBody
                 .flatMap(body ->
                     client.validateConnectorPluginConfig(pluginName, (Map<String, Object>) body))
@@ -320,11 +321,12 @@ public Mono<ConnectorPluginConfigValidationResponseDTO> validateConnectorPluginC
         );
   }
 
-  private Mono<KafkaConnectClientApi> withConnectClient(KafkaCluster cluster, String connectName) {
-    return Mono.justOrEmpty(cluster.getKafkaConnect().stream()
-            .filter(connect -> connect.getName().equals(connectName))
-            .findFirst())
-        .switchIfEmpty(Mono.error(ConnectNotFoundException::new))
-        .map(kafkaConnectClientsFactory::withKafkaConnectConfig);
+  private ReactiveFailover<KafkaConnectClientApi> api(KafkaCluster cluster, String connectName) {
+    var client = cluster.getConnectsClients().get(connectName);
+    if (client == null) {
+      throw new NotFoundException(
+          "Connect %s not found for cluster %s".formatted(connectName, cluster.getName()));
+    }
+    return client;
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
index 43a25636cc6..f98bb5d376c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
@@ -1,54 +1,31 @@
 package com.provectus.kafka.ui.service;
 
-import static org.springframework.http.HttpStatus.CONFLICT;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;
-
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.provectus.kafka.ui.exception.SchemaCompatibilityException;
-import com.provectus.kafka.ui.exception.SchemaFailedToDeleteException;
 import com.provectus.kafka.ui.exception.SchemaNotFoundException;
-import com.provectus.kafka.ui.exception.SchemaTypeNotSupportedException;
-import com.provectus.kafka.ui.exception.UnprocessableEntityException;
 import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.model.CompatibilityLevelDTO;
-import com.provectus.kafka.ui.model.InternalSchemaRegistry;
 import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.model.NewSchemaSubjectDTO;
-import com.provectus.kafka.ui.model.SchemaSubjectDTO;
-import com.provectus.kafka.ui.model.SchemaTypeDTO;
-import com.provectus.kafka.ui.model.schemaregistry.ErrorResponse;
-import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityCheck;
-import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel;
-import com.provectus.kafka.ui.model.schemaregistry.InternalNewSchema;
-import com.provectus.kafka.ui.model.schemaregistry.SubjectIdResponse;
-import com.provectus.kafka.ui.util.SecuredWebClient;
+import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
+import com.provectus.kafka.ui.sr.model.Compatibility;
+import com.provectus.kafka.ui.sr.model.CompatibilityCheckResponse;
+import com.provectus.kafka.ui.sr.model.CompatibilityConfig;
+import com.provectus.kafka.ui.sr.model.CompatibilityLevelChange;
+import com.provectus.kafka.ui.sr.model.NewSubject;
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import com.provectus.kafka.ui.util.ReactiveFailover;
+import com.provectus.kafka.ui.util.WebClientConfigurator;
 import java.io.IOException;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Formatter;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.Delegate;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.reactive.function.BodyInserters;
-import org.springframework.web.reactive.function.client.ClientResponse;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientRequestException;
-import org.springframework.web.util.UriComponentsBuilder;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -57,404 +34,141 @@
 @RequiredArgsConstructor
 public class SchemaRegistryService {
 
-  public static final String NO_SUCH_SCHEMA_VERSION = "No such schema %s with version %s";
-  public static final String NO_SUCH_SCHEMA = "No such schema %s";
-
-  private static final String URL_SUBJECTS = "/subjects";
-  private static final String URL_SUBJECT = "/subjects/{schemaName}";
-  private static final String URL_SUBJECT_VERSIONS = "/subjects/{schemaName}/versions";
-  private static final String URL_SUBJECT_BY_VERSION = "/subjects/{schemaName}/versions/{version}";
   private static final String LATEST = "latest";
 
-  private static final String UNRECOGNIZED_FIELD_SCHEMA_TYPE = "Unrecognized field: schemaType";
-  private static final String INCOMPATIBLE_WITH_AN_EARLIER_SCHEMA = "incompatible with an earlier schema";
-  private static final String INVALID_SCHEMA = "Invalid Schema";
+  @AllArgsConstructor
+  public static class SubjectWithCompatibilityLevel {
+    @Delegate
+    SchemaSubject subject;
+    @Getter
+    Compatibility compatibility;
+  }
+
+  private ReactiveFailover<KafkaSrClientApi> api(KafkaCluster cluster) {
+    return cluster.getSchemaRegistryClient();
+  }
 
-  public Mono<List<SchemaSubjectDTO>> getAllLatestVersionSchemas(KafkaCluster cluster,
-                                                                 List<String> subjects) {
+  public Mono<List<SubjectWithCompatibilityLevel>> getAllLatestVersionSchemas(KafkaCluster cluster,
+                                                                              List<String> subjects) {
     return Flux.fromIterable(subjects)
         .concatMap(subject -> getLatestSchemaVersionBySubject(cluster, subject))
         .collect(Collectors.toList());
   }
 
-  public Mono<String[]> getAllSubjectNames(KafkaCluster cluster) {
-    return configuredWebClient(
-        cluster,
-        HttpMethod.GET,
-        URL_SUBJECTS)
-        .retrieve()
-        .bodyToMono(String[].class)
-        .doOnError(e -> log.error("Unexpected error", e))
-        .as(m -> failoverAble(m,
-            new FailoverMono<>(cluster.getSchemaRegistry(), () -> this.getAllSubjectNames(cluster))));
+  public Mono<List<String>> getAllSubjectNames(KafkaCluster cluster) {
+    return api(cluster)
+        .mono(c -> c.getAllSubjectNames(null, false))
+        .flatMapIterable(this::parseSubjectListString)
+        .collectList();
+  }
+
+  @SneakyThrows
+  private List<String> parseSubjectListString(String subjectNamesStr) {
+    //workaround for https://github.com/spring-projects/spring-framework/issues/24734
+    return new JsonMapper().readValue(subjectNamesStr, new TypeReference<List<String>>() {
+    });
   }
 
-  public Flux<SchemaSubjectDTO> getAllVersionsBySubject(KafkaCluster cluster, String subject) {
+  public Flux<SubjectWithCompatibilityLevel> getAllVersionsBySubject(KafkaCluster cluster, String subject) {
     Flux<Integer> versions = getSubjectVersions(cluster, subject);
     return versions.flatMap(version -> getSchemaSubjectByVersion(cluster, subject, version));
   }
 
   private Flux<Integer> getSubjectVersions(KafkaCluster cluster, String schemaName) {
-    return configuredWebClient(
-        cluster,
-        HttpMethod.GET,
-        URL_SUBJECT_VERSIONS,
-        schemaName)
-        .retrieve()
-        .onStatus(NOT_FOUND::equals,
-            throwIfNotFoundStatus(formatted(NO_SUCH_SCHEMA, schemaName)))
-        .bodyToFlux(Integer.class)
-        .as(f -> failoverAble(f, new FailoverFlux<>(cluster.getSchemaRegistry(),
-            () -> this.getSubjectVersions(cluster, schemaName))));
+    return api(cluster).flux(c -> c.getSubjectVersions(schemaName));
   }
 
-  public Mono<SchemaSubjectDTO> getSchemaSubjectByVersion(KafkaCluster cluster, String schemaName,
-                                                          Integer version) {
-    return this.getSchemaSubject(cluster, schemaName, String.valueOf(version));
+  public Mono<SubjectWithCompatibilityLevel> getSchemaSubjectByVersion(KafkaCluster cluster,
+                                                                       String schemaName,
+                                                                       Integer version) {
+    return getSchemaSubject(cluster, schemaName, String.valueOf(version));
   }
 
-  public Mono<SchemaSubjectDTO> getLatestSchemaVersionBySubject(KafkaCluster cluster,
-                                                                String schemaName) {
-    return this.getSchemaSubject(cluster, schemaName, LATEST);
+  public Mono<SubjectWithCompatibilityLevel> getLatestSchemaVersionBySubject(KafkaCluster cluster,
+                                                                             String schemaName) {
+    return getSchemaSubject(cluster, schemaName, LATEST);
   }
 
-  private Mono<SchemaSubjectDTO> getSchemaSubject(KafkaCluster cluster, String schemaName,
-                                                  String version) {
-    return configuredWebClient(
-        cluster,
-        HttpMethod.GET,
-        SchemaRegistryService.URL_SUBJECT_BY_VERSION,
-        List.of(schemaName, version))
-        .retrieve()
-        .onStatus(NOT_FOUND::equals,
-            throwIfNotFoundStatus(formatted(NO_SUCH_SCHEMA_VERSION, schemaName, version))
-        )
-        .bodyToMono(SchemaSubjectDTO.class)
-        .map(this::withSchemaType)
+  private Mono<SubjectWithCompatibilityLevel> getSchemaSubject(KafkaCluster cluster, String schemaName,
+                                                               String version) {
+    return api(cluster)
+        .mono(c -> c.getSubjectVersion(schemaName, version))
         .zipWith(getSchemaCompatibilityInfoOrGlobal(cluster, schemaName))
-        .map(tuple -> {
-          SchemaSubjectDTO schema = tuple.getT1();
-          String compatibilityLevel = tuple.getT2().getCompatibilityLevel();
-          schema.setCompatibilityLevel(compatibilityLevel);
-          return schema;
-        })
-        .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
-            () -> this.getSchemaSubject(cluster, schemaName, version))));
-  }
-
-  /**
-   * If {@link SchemaSubjectDTO#getSchemaType()} is null, then AVRO, otherwise,
-   * adds the schema type as is.
-   */
-  @NotNull
-  private SchemaSubjectDTO withSchemaType(SchemaSubjectDTO s) {
-    return s.schemaType(Optional.ofNullable(s.getSchemaType()).orElse(SchemaTypeDTO.AVRO));
+        .map(t -> new SubjectWithCompatibilityLevel(t.getT1(), t.getT2()))
+        .onErrorResume(WebClientResponseException.NotFound.class, th -> Mono.error(new SchemaNotFoundException()));
   }
 
-  public Mono<Void> deleteSchemaSubjectByVersion(KafkaCluster cluster,
-                                                 String schemaName,
-                                                 Integer version) {
-    return this.deleteSchemaSubject(cluster, schemaName, String.valueOf(version));
+  public Mono<Void> deleteSchemaSubjectByVersion(KafkaCluster cluster, String schemaName, Integer version) {
+    return deleteSchemaSubject(cluster, schemaName, String.valueOf(version));
   }
 
-  public Mono<Void> deleteLatestSchemaSubject(KafkaCluster cluster,
-                                              String schemaName) {
-    return this.deleteSchemaSubject(cluster, schemaName, LATEST);
+  public Mono<Void> deleteLatestSchemaSubject(KafkaCluster cluster, String schemaName) {
+    return deleteSchemaSubject(cluster, schemaName, LATEST);
   }
 
-  private Mono<Void> deleteSchemaSubject(KafkaCluster cluster, String schemaName,
-                                         String version) {
-    return configuredWebClient(
-        cluster,
-        HttpMethod.DELETE,
-        SchemaRegistryService.URL_SUBJECT_BY_VERSION,
-        List.of(schemaName, version))
-        .retrieve()
-        .onStatus(NOT_FOUND::equals,
-            throwIfNotFoundStatus(formatted(NO_SUCH_SCHEMA_VERSION, schemaName, version))
-        )
-        .toBodilessEntity()
-        .then()
-        .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
-            () -> this.deleteSchemaSubject(cluster, schemaName, version))));
+  private Mono<Void> deleteSchemaSubject(KafkaCluster cluster, String schemaName, String version) {
+    return api(cluster).mono(c -> c.deleteSubjectVersion(schemaName, version, false));
   }
 
-  public Mono<Void> deleteSchemaSubjectEntirely(KafkaCluster cluster,
-                                                String schemaName) {
-    return configuredWebClient(
-        cluster,
-        HttpMethod.DELETE,
-        URL_SUBJECT,
-        schemaName)
-        .retrieve()
-        .onStatus(HttpStatus::isError, errorOnSchemaDeleteFailure(schemaName))
-        .toBodilessEntity()
-        .then()
-        .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
-            () -> this.deleteSchemaSubjectEntirely(cluster, schemaName))));
+  public Mono<Void> deleteSchemaSubjectEntirely(KafkaCluster cluster, String schemaName) {
+    return api(cluster).mono(c -> c.deleteAllSubjectVersions(schemaName, false));
   }
 
   /**
    * Checks whether the provided schema duplicates the previous or not, creates a new schema
    * and then returns the whole content by requesting its latest version.
    */
-  public Mono<SchemaSubjectDTO> registerNewSchema(KafkaCluster cluster,
-                                                  NewSchemaSubjectDTO dto) {
-    SchemaTypeDTO schemaType = SchemaTypeDTO.AVRO == dto.getSchemaType() ? null : dto.getSchemaType();
-    Mono<InternalNewSchema> newSchema = Mono.just(new InternalNewSchema(dto.getSchema(), schemaType));
-    String subject = dto.getSubject();
-    return submitNewSchema(subject, newSchema, cluster)
-        .flatMap(resp -> getLatestSchemaVersionBySubject(cluster, subject));
-  }
-
-  @NotNull
-  private Mono<SubjectIdResponse> submitNewSchema(String subject,
-                                                  Mono<InternalNewSchema> newSchemaSubject,
-                                                  KafkaCluster cluster) {
-    return configuredWebClient(
-        cluster,
-        HttpMethod.POST,
-        URL_SUBJECT_VERSIONS, subject)
-        .contentType(MediaType.APPLICATION_JSON)
-        .body(BodyInserters.fromPublisher(newSchemaSubject, InternalNewSchema.class))
-        .retrieve()
-        .onStatus(status -> UNPROCESSABLE_ENTITY.equals(status) || CONFLICT.equals(status),
-            r -> r.bodyToMono(ErrorResponse.class)
-                .flatMap(this::getMonoError))
-        .bodyToMono(SubjectIdResponse.class)
-        .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
-            () -> submitNewSchema(subject, newSchemaSubject, cluster))));
-  }
-
-  @NotNull
-  private Mono<Throwable> getMonoError(ErrorResponse x) {
-    if (isUnrecognizedFieldSchemaTypeMessage(x.getMessage())) {
-      return Mono.error(new SchemaTypeNotSupportedException());
-    } else if (isIncompatibleSchemaMessage(x.getMessage())) {
-      return Mono.error(new SchemaCompatibilityException(x.getMessage()));
-    } else {
-      log.error(x.getMessage());
-      return Mono.error(new UnprocessableEntityException(INVALID_SCHEMA));
-    }
-  }
-
-  @NotNull
-  private Function<ClientResponse, Mono<? extends Throwable>> throwIfNotFoundStatus(
-      String formatted) {
-    return resp -> Mono.error(new SchemaNotFoundException(formatted));
-  }
-
-  /**
-   * Updates a compatibility level for a <code>schemaName</code>.
-   *
-   * @param schemaName is a schema subject name
-   * @see com.provectus.kafka.ui.model.CompatibilityLevelDTO.CompatibilityEnum
-   */
-  public Mono<Void> updateSchemaCompatibility(KafkaCluster cluster, @Nullable String schemaName,
-                                              Mono<CompatibilityLevelDTO> compatibilityLevel) {
-    String configEndpoint = Objects.isNull(schemaName) ? "/config" : "/config/{schemaName}";
-    return configuredWebClient(
-        cluster,
-        HttpMethod.PUT,
-        configEndpoint,
-        schemaName)
-        .contentType(MediaType.APPLICATION_JSON)
-        .body(BodyInserters.fromPublisher(compatibilityLevel, CompatibilityLevelDTO.class))
-        .retrieve()
-        .onStatus(NOT_FOUND::equals,
-            throwIfNotFoundStatus(formatted(NO_SUCH_SCHEMA, schemaName)))
-        .bodyToMono(Void.class)
-        .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
-            () -> this.updateSchemaCompatibility(cluster, schemaName, compatibilityLevel))));
+  public Mono<SubjectWithCompatibilityLevel> registerNewSchema(KafkaCluster cluster,
+                                                               String subject,
+                                                               NewSubject newSchemaSubject) {
+    return api(cluster)
+        .mono(c -> c.registerNewSchema(subject, newSchemaSubject))
+        .onErrorMap(WebClientResponseException.Conflict.class,
+            th -> new SchemaCompatibilityException())
+        .onErrorMap(WebClientResponseException.UnprocessableEntity.class,
+            th -> new ValidationException("Invalid schema"))
+        .then(getLatestSchemaVersionBySubject(cluster, subject));
   }
 
   public Mono<Void> updateSchemaCompatibility(KafkaCluster cluster,
-                                              Mono<CompatibilityLevelDTO> compatibilityLevel) {
-    return updateSchemaCompatibility(cluster, null, compatibilityLevel);
-  }
-
-  public Mono<InternalCompatibilityLevel> getSchemaCompatibilityLevel(KafkaCluster cluster,
-                                                                      String schemaName) {
-    String globalConfig = Objects.isNull(schemaName) ? "/config" : "/config/{schemaName}";
-    final var values = new LinkedMultiValueMap<String, String>();
-    values.add("defaultToGlobal", "true");
-    return configuredWebClient(
-        cluster,
-        HttpMethod.GET,
-        globalConfig,
-        (schemaName == null ? Collections.emptyList() : List.of(schemaName)),
-        values)
-        .retrieve()
-        .bodyToMono(InternalCompatibilityLevel.class)
+                                              String schemaName,
+                                              Compatibility compatibility) {
+    return api(cluster)
+        .mono(c -> c.updateSubjectCompatibilityLevel(
+            schemaName, new CompatibilityLevelChange().compatibility(compatibility)))
+        .then();
+  }
+
+  public Mono<Void> updateGlobalSchemaCompatibility(KafkaCluster cluster,
+                                                    Compatibility compatibility) {
+    return api(cluster)
+        .mono(c -> c.updateGlobalCompatibilityLevel(new CompatibilityLevelChange().compatibility(compatibility)))
+        .then();
+  }
+
+  public Mono<Compatibility> getSchemaCompatibilityLevel(KafkaCluster cluster,
+                                                         String schemaName) {
+    return api(cluster)
+        .mono(c -> c.getSubjectCompatibilityLevel(schemaName, true))
+        .map(CompatibilityConfig::getCompatibilityLevel)
         .onErrorResume(error -> Mono.empty());
   }
 
-  public Mono<InternalCompatibilityLevel> getGlobalSchemaCompatibilityLevel(KafkaCluster cluster) {
-    return this.getSchemaCompatibilityLevel(cluster, null);
+  public Mono<Compatibility> getGlobalSchemaCompatibilityLevel(KafkaCluster cluster) {
+    return api(cluster)
+        .mono(KafkaSrClientApi::getGlobalCompatibilityLevel)
+        .map(CompatibilityConfig::getCompatibilityLevel);
   }
 
-  private Mono<InternalCompatibilityLevel> getSchemaCompatibilityInfoOrGlobal(KafkaCluster cluster,
-                                                                              String schemaName) {
-    return this.getSchemaCompatibilityLevel(cluster, schemaName)
+  private Mono<Compatibility> getSchemaCompatibilityInfoOrGlobal(KafkaCluster cluster,
+                                                                 String schemaName) {
+    return getSchemaCompatibilityLevel(cluster, schemaName)
         .switchIfEmpty(this.getGlobalSchemaCompatibilityLevel(cluster));
   }
 
-  public Mono<InternalCompatibilityCheck> checksSchemaCompatibility(
-      KafkaCluster cluster, String schemaName, Mono<NewSchemaSubjectDTO> newSchemaSubject) {
-    return configuredWebClient(
-        cluster,
-        HttpMethod.POST,
-        "/compatibility/subjects/{schemaName}/versions/latest",
-        schemaName)
-        .contentType(MediaType.APPLICATION_JSON)
-        .body(BodyInserters.fromPublisher(newSchemaSubject, NewSchemaSubjectDTO.class))
-        .retrieve()
-        .onStatus(NOT_FOUND::equals,
-            throwIfNotFoundStatus(formatted(NO_SUCH_SCHEMA, schemaName)))
-        .bodyToMono(InternalCompatibilityCheck.class)
-        .as(m -> failoverAble(m, new FailoverMono<>(cluster.getSchemaRegistry(),
-            () -> this.checksSchemaCompatibility(cluster, schemaName, newSchemaSubject))));
-  }
-
-  public String formatted(String str, Object... args) {
-    try (Formatter formatter = new Formatter()) {
-      return formatter.format(str, args).toString();
-    }
-  }
-
-  private void setBasicAuthIfEnabled(InternalSchemaRegistry schemaRegistry, HttpHeaders headers) {
-    if (schemaRegistry.getUsername() != null && schemaRegistry.getPassword() != null) {
-      headers.setBasicAuth(
-          schemaRegistry.getUsername(),
-          schemaRegistry.getPassword()
-      );
-    } else if (schemaRegistry.getUsername() != null) {
-      throw new ValidationException(
-          "You specified username but did not specify password");
-    } else if (schemaRegistry.getPassword() != null) {
-      throw new ValidationException(
-          "You specified password but did not specify username");
-    }
-  }
-
-  private boolean isUnrecognizedFieldSchemaTypeMessage(String errorMessage) {
-    return errorMessage.contains(UNRECOGNIZED_FIELD_SCHEMA_TYPE);
-  }
-
-  private boolean isIncompatibleSchemaMessage(String message) {
-    return message.contains(INCOMPATIBLE_WITH_AN_EARLIER_SCHEMA);
-  }
-
-  private WebClient.RequestBodySpec configuredWebClient(KafkaCluster cluster, HttpMethod method,
-                                                        String uri) {
-    return configuredWebClient(cluster, method, uri, Collections.emptyList(),
-        new LinkedMultiValueMap<>());
-  }
-
-  private WebClient.RequestBodySpec configuredWebClient(KafkaCluster cluster, HttpMethod method,
-                                                        String uri, List<String> uriVariables) {
-    return configuredWebClient(cluster, method, uri, uriVariables, new LinkedMultiValueMap<>());
-  }
-
-  private WebClient.RequestBodySpec configuredWebClient(KafkaCluster cluster, HttpMethod method,
-                                                        String uri, @Nullable String uriVariable) {
-    List<String> uriVariables = uriVariable == null ? Collections.emptyList() : List.of(uriVariable);
-    return configuredWebClient(cluster, method, uri, uriVariables, new LinkedMultiValueMap<>());
-  }
-
-  private WebClient.RequestBodySpec configuredWebClient(KafkaCluster cluster,
-                                                        HttpMethod method, String path,
-                                                        List<String> uriVariables,
-                                                        MultiValueMap<String, String> queryParams) {
-    final var schemaRegistry = cluster.getSchemaRegistry();
-
-    try {
-      WebClient.Builder schemaRegistryWebClient = SecuredWebClient.configure(
-          schemaRegistry.getKeystoreLocation(),
-          schemaRegistry.getKeystorePassword(),
-          schemaRegistry.getTruststoreLocation(),
-          schemaRegistry.getTruststorePassword()
-      );
-
-      return schemaRegistryWebClient.build()
-          .method(method)
-          .uri(buildUri(schemaRegistry, path, uriVariables, queryParams))
-          .headers(headers -> setBasicAuthIfEnabled(schemaRegistry, headers));
-    } catch (Exception e) {
-      throw new IllegalStateException(
-          "cannot create TLS configuration for schema-registry in cluster " + cluster.getName(), e);
-    }
-  }
-
-  private URI buildUri(InternalSchemaRegistry schemaRegistry, String path, List<String> uriVariables,
-                       MultiValueMap<String, String> queryParams) {
-    final var builder = UriComponentsBuilder
-        .fromHttpUrl(schemaRegistry.getUri() + path);
-    builder.queryParams(queryParams);
-    return builder.build(uriVariables.toArray());
-  }
-
-  private Function<ClientResponse, Mono<? extends Throwable>> errorOnSchemaDeleteFailure(String schemaName) {
-    return resp -> {
-      if (NOT_FOUND.equals(resp.statusCode())) {
-        return Mono.error(new SchemaNotFoundException(schemaName));
-      }
-      return Mono.error(new SchemaFailedToDeleteException(schemaName));
-    };
-  }
-
-  private <T> Mono<T> failoverAble(Mono<T> request, FailoverMono<T> failoverMethod) {
-    return request.onErrorResume(failoverMethod::failover);
-  }
-
-  private <T> Flux<T> failoverAble(Flux<T> request, FailoverFlux<T> failoverMethod) {
-    return request.onErrorResume(failoverMethod::failover);
-  }
-
-  private abstract static class Failover<E> {
-    private final InternalSchemaRegistry schemaRegistry;
-    private final Supplier<E> failover;
-
-    private Failover(InternalSchemaRegistry schemaRegistry, Supplier<E> failover) {
-      this.schemaRegistry = Objects.requireNonNull(schemaRegistry);
-      this.failover = Objects.requireNonNull(failover);
-    }
-
-    abstract E error(Throwable error);
-
-    public E failover(Throwable error) {
-      if (error instanceof WebClientRequestException
-          && error.getCause() instanceof IOException
-          && schemaRegistry.isFailoverAvailable()) {
-        var uri = ((WebClientRequestException) error).getUri();
-        schemaRegistry.markAsUnavailable(String.format("%s://%s", uri.getScheme(), uri.getAuthority()));
-        return failover.get();
-      }
-      return error(error);
-    }
-  }
-
-  private static class FailoverMono<T> extends Failover<Mono<T>> {
-
-    private FailoverMono(InternalSchemaRegistry schemaRegistry, Supplier<Mono<T>> failover) {
-      super(schemaRegistry, failover);
-    }
-
-    @Override
-    Mono<T> error(Throwable error) {
-      return Mono.error(error);
-    }
-  }
-
-  private static class FailoverFlux<T> extends Failover<Flux<T>> {
-
-    private FailoverFlux(InternalSchemaRegistry schemaRegistry, Supplier<Flux<T>> failover) {
-      super(schemaRegistry, failover);
-    }
-
-    @Override
-    Flux<T> error(Throwable error) {
-      return Flux.error(error);
-    }
+  public Mono<CompatibilityCheckResponse> checksSchemaCompatibility(KafkaCluster cluster,
+                                                                    String schemaName,
+                                                                    NewSubject newSchemaSubject) {
+    return api(cluster).mono(c -> c.checkSchemaCompatibility(schemaName, LATEST, true, newSchemaSubject));
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
index 4ce343132ed..e0b95c522a5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
@@ -4,28 +4,29 @@
 import static ksql.KsqlGrammarParser.PrintTopicContext;
 import static ksql.KsqlGrammarParser.SingleStatementContext;
 import static ksql.KsqlGrammarParser.UndefineVariableContext;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.TextNode;
-import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.service.ksql.response.ResponseParser;
-import com.provectus.kafka.ui.util.SecuredWebClient;
+import com.provectus.kafka.ui.util.WebClientConfigurator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import javax.annotation.Nullable;
 import lombok.Builder;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.codec.DecodingException;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.json.Jackson2JsonEncoder;
+import org.springframework.util.MimeType;
 import org.springframework.util.MimeTypeUtils;
 import org.springframework.util.unit.DataSize;
-import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
@@ -34,6 +35,8 @@
 @Slf4j
 public class KsqlApiClient {
 
+  private static final MimeType KQL_API_MIME_TYPE = MimeTypeUtils.parseMimeType("application/vnd.ksql.v1+json");
+
   private static final Set<Class<?>> UNSUPPORTED_STMT_TYPES = Set.of(
       PrintTopicContext.class,
       DefineVariableContext.class,
@@ -60,60 +63,46 @@ private static class KsqlRequest {
 
   //--------------------------------------------------------------------------------------------
 
-  private final KafkaCluster cluster;
-  private final DataSize maxBuffSize;
+  private final String baseUrl;
+  private final WebClient webClient;
 
-  public KsqlApiClient(KafkaCluster cluster, DataSize maxBuffSize) {
-    this.cluster = cluster;
-    this.maxBuffSize = maxBuffSize;
+  public KsqlApiClient(String baseUrl,
+                       @Nullable ClustersProperties.KsqldbServerAuth ksqldbServerAuth,
+                       @Nullable ClustersProperties.WebClientSsl ksqldbServerSsl,
+                       @Nullable DataSize maxBuffSize) {
+    this.baseUrl = baseUrl;
+    this.webClient = webClient(ksqldbServerAuth, ksqldbServerSsl, maxBuffSize);
   }
 
-  private WebClient webClient() {
-    var exchangeStrategies = ExchangeStrategies.builder()
-        .codecs(configurer -> {
-          configurer.customCodecs()
-              .register(
-                  new Jackson2JsonDecoder(
-                      new ObjectMapper(),
-                      // some ksqldb versions do not set content-type header in response,
-                      // but we still need to use JsonDecoder for it
-                      MimeTypeUtils.APPLICATION_OCTET_STREAM));
+  private static WebClient webClient(@Nullable ClustersProperties.KsqldbServerAuth ksqldbServerAuth,
+                                     @Nullable ClustersProperties.WebClientSsl ksqldbServerSsl,
+                                     @Nullable DataSize maxBuffSize) {
+    ksqldbServerAuth = Optional.ofNullable(ksqldbServerAuth).orElse(new ClustersProperties.KsqldbServerAuth());
+    ksqldbServerSsl = Optional.ofNullable(ksqldbServerSsl).orElse(new ClustersProperties.WebClientSsl());
+    maxBuffSize = Optional.ofNullable(maxBuffSize).orElse(DataSize.ofMegabytes(20));
+
+    return new WebClientConfigurator()
+        .configureSsl(
+            ksqldbServerSsl.getKeystoreLocation(),
+            ksqldbServerSsl.getKeystorePassword(),
+            ksqldbServerSsl.getTruststoreLocation(),
+            ksqldbServerSsl.getTruststorePassword()
+        )
+        .configureBasicAuth(
+            ksqldbServerAuth.getUsername(),
+            ksqldbServerAuth.getPassword()
+        )
+        .configureBufferSize(maxBuffSize)
+        .configureCodecs(codecs -> {
+          var mapper = new JsonMapper();
+          codecs.defaultCodecs()
+              .jackson2JsonEncoder(new Jackson2JsonEncoder(mapper, KQL_API_MIME_TYPE, APPLICATION_JSON));
+          // some ksqldb versions do not set content-type header in response,
+          // but we still need to use JsonDecoder for it
+          codecs.defaultCodecs()
+              .jackson2JsonDecoder(new Jackson2JsonDecoder(mapper, MimeTypeUtils.ALL));
         })
         .build();
-
-    try {
-      WebClient.Builder securedWebClient = SecuredWebClient.configure(
-          cluster.getKsqldbServer().getKeystoreLocation(),
-          cluster.getKsqldbServer().getKeystorePassword(),
-          cluster.getKsqldbServer().getTruststoreLocation(),
-          cluster.getKsqldbServer().getTruststorePassword()
-      );
-
-      return securedWebClient
-          .codecs(c -> c.defaultCodecs().maxInMemorySize((int) maxBuffSize.toBytes()))
-          .defaultHeaders(httpHeaders -> setBasicAuthIfEnabled(httpHeaders, cluster))
-          .exchangeStrategies(exchangeStrategies)
-          .build();
-    } catch (Exception e) {
-      throw new IllegalStateException(
-          "cannot create TLS configuration for ksqlDB in cluster " + cluster.getName(), e);
-    }
-  }
-
-  public static void setBasicAuthIfEnabled(HttpHeaders headers, KafkaCluster cluster) {
-    String username = cluster.getKsqldbServer().getUsername();
-    String password = cluster.getKsqldbServer().getPassword();
-    if (username != null && password != null) {
-      headers.setBasicAuth(username, password);
-    } else if (username != null) {
-      throw new ValidationException("You specified username but did not specify password");
-    } else if (password != null) {
-      throw new ValidationException("You specified password but did not specify username");
-    }
-  }
-
-  private String baseKsqlDbUri() {
-    return cluster.getKsqldbServer().getUrl();
   }
 
   private KsqlRequest ksqlRequest(String ksql, Map<String, String> streamProperties) {
@@ -121,11 +110,11 @@ private KsqlRequest ksqlRequest(String ksql, Map<String, String> streamPropertie
   }
 
   private Flux<KsqlResponseTable> executeSelect(String ksql, Map<String, String> streamProperties) {
-    return webClient()
+    return webClient
         .post()
-        .uri(baseKsqlDbUri() + "/query")
-        .accept(MediaType.parseMediaType("application/vnd.ksql.v1+json"))
-        .contentType(MediaType.parseMediaType("application/vnd.ksql.v1+json"))
+        .uri(baseUrl + "/query")
+        .accept(new MediaType(KQL_API_MIME_TYPE))
+        .contentType(new MediaType(KQL_API_MIME_TYPE))
         .bodyValue(ksqlRequest(ksql, streamProperties))
         .retrieve()
         .bodyToFlux(JsonNode.class)
@@ -151,11 +140,11 @@ private boolean isUnexpectedJsonArrayEndCharException(Throwable th) {
 
   private Flux<KsqlResponseTable> executeStatement(String ksql,
                                                    Map<String, String> streamProperties) {
-    return webClient()
+    return webClient
         .post()
-        .uri(baseKsqlDbUri() + "/ksql")
-        .accept(MediaType.parseMediaType("application/vnd.ksql.v1+json"))
-        .contentType(MediaType.parseMediaType("application/json"))
+        .uri(baseUrl + "/ksql")
+        .accept(new MediaType(KQL_API_MIME_TYPE))
+        .contentType(APPLICATION_JSON)
         .bodyValue(ksqlRequest(ksql, streamProperties))
         .exchangeToFlux(
             resp -> {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java
index 63fcede3611..efd7e9ca2e9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java
@@ -14,21 +14,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.util.unit.DataSize;
 import reactor.core.publisher.Flux;
 
 @Slf4j
 @Service
 public class KsqlServiceV2 {
 
-  private final DataSize maxBuffSize;
-
-  public KsqlServiceV2(@Value("${webclient.max-in-memory-buffer-size:20MB}") DataSize maxBuffSize) {
-    this.maxBuffSize = maxBuffSize;
-  }
-
   @lombok.Value
   private static class KsqlExecuteCommand {
     KafkaCluster cluster;
@@ -55,13 +47,13 @@ public Flux<KsqlResponseTable> execute(String commandId) {
       throw new ValidationException("No command registered with id " + commandId);
     }
     registeredCommands.invalidate(commandId);
-    return new KsqlApiClient(cmd.cluster, maxBuffSize)
-        .execute(cmd.ksql, cmd.streamProperties);
+    return cmd.cluster.getKsqlClient()
+        .flux(client -> client.execute(cmd.ksql, cmd.streamProperties));
   }
 
   public Flux<KsqlTableDescriptionDTO> listTables(KafkaCluster cluster) {
-    return new KsqlApiClient(cluster, maxBuffSize)
-        .execute("LIST TABLES;", Map.of())
+    return cluster.getKsqlClient()
+        .flux(client -> client.execute("LIST TABLES;", Map.of()))
         .flatMap(resp -> {
           if (!resp.getHeader().equals("Tables")) {
             log.error("Unexpected result header: {}", resp.getHeader());
@@ -82,8 +74,8 @@ public Flux<KsqlTableDescriptionDTO> listTables(KafkaCluster cluster) {
   }
 
   public Flux<KsqlStreamDescriptionDTO> listStreams(KafkaCluster cluster) {
-    return new KsqlApiClient(cluster, maxBuffSize)
-        .execute("LIST STREAMS;", Map.of())
+    return cluster.getKsqlClient()
+        .flux(client -> client.execute("LIST STREAMS;", Map.of()))
         .flatMap(resp -> {
           if (!resp.getHeader().equals("Streams")) {
             log.error("Unexpected result header: {}", resp.getHeader());
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java
new file mode 100644
index 00000000000..1066dc71786
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java
@@ -0,0 +1,154 @@
+package com.provectus.kafka.ui.util;
+
+import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import org.springframework.web.reactive.function.client.WebClientRequestException;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public class ReactiveFailover<T> {
+
+  public static final Duration DEFAULT_RETRY_GRACE_PERIOD_MS = Duration.ofSeconds(5);
+  public static final Predicate<Throwable> CONNECTION_REFUSED_EXCEPTION_FILTER =
+      error -> error.getCause() instanceof IOException && error.getCause().getMessage().contains("Connection refused");
+
+  private final List<PublisherHolder<T>> publishers;
+  private int currentIndex = 0;
+
+  private final Predicate<Throwable> failoverExceptionsPredicate;
+  private final String noAvailablePublishersMsg;
+
+  public static <T> ReactiveFailover<T> create(List<T> publishers,
+                                               Predicate<Throwable> failoverExeptionsPredicate,
+                                               String noAvailablePublishersMsg,
+                                               Duration retryGracePeriodMs) {
+    return new ReactiveFailover<>(
+        publishers.stream().map(p -> new PublisherHolder<>(() -> p, retryGracePeriodMs.toMillis())).toList(),
+        failoverExeptionsPredicate,
+        noAvailablePublishersMsg
+    );
+  }
+
+  public static <T, A> ReactiveFailover<T> create(List<A> args,
+                                                  Function<A, T> factory,
+                                                  Predicate<Throwable> failoverExeptionsPredicate,
+                                                  String noAvailablePublishersMsg,
+                                                  Duration retryGracePeriodMs) {
+    return new ReactiveFailover<>(
+        args.stream().map(arg ->
+            new PublisherHolder<>(() -> factory.apply(arg), retryGracePeriodMs.toMillis())).toList(),
+        failoverExeptionsPredicate,
+        noAvailablePublishersMsg
+    );
+  }
+
+  private ReactiveFailover(List<PublisherHolder<T>> publishers,
+                   Predicate<Throwable> failoverExceptionsPredicate,
+                   String noAvailablePublishersMsg) {
+    Preconditions.checkArgument(!publishers.isEmpty());
+    this.publishers = publishers;
+    this.failoverExceptionsPredicate = failoverExceptionsPredicate;
+    this.noAvailablePublishersMsg = noAvailablePublishersMsg;
+  }
+
+  public <V> Mono<V> mono(Function<T, Mono<V>> f) {
+    List<PublisherHolder<T>> candidates = getActivePublishers();
+    if (candidates.isEmpty()) {
+      return Mono.error(() -> new IllegalStateException(noAvailablePublishersMsg));
+    }
+    return mono(f, candidates);
+  }
+
+  private <V> Mono<V> mono(Function<T, Mono<V>> f, List<PublisherHolder<T>> candidates) {
+    var publisher = candidates.get(0);
+    return f.apply(publisher.get())
+        .onErrorResume(failoverExceptionsPredicate, th -> {
+          publisher.markFailed();
+          if (candidates.size() == 1) {
+            return Mono.error(th);
+          }
+          var newCandidates = candidates.stream().skip(1).filter(PublisherHolder::isActive).toList();
+          if (newCandidates.isEmpty()) {
+            return Mono.error(th);
+          }
+          return mono(f, newCandidates);
+        });
+  }
+
+  public <V> Flux<V> flux(Function<T, Flux<V>> f) {
+    List<PublisherHolder<T>> candidates = getActivePublishers();
+    if (candidates.isEmpty()) {
+      return Flux.error(() -> new IllegalStateException(noAvailablePublishersMsg));
+    }
+    return flux(f, candidates);
+  }
+
+  private <V> Flux<V> flux(Function<T, Flux<V>> f, List<PublisherHolder<T>> candidates) {
+    var publisher = candidates.get(0);
+    return f.apply(publisher.get())
+        .onErrorResume(failoverExceptionsPredicate, th -> {
+          publisher.markFailed();
+          if (candidates.size() == 1) {
+            return Flux.error(th);
+          }
+          var newCandidates = candidates.stream().skip(1).filter(PublisherHolder::isActive).toList();
+          if (newCandidates.isEmpty()) {
+            return Flux.error(th);
+          }
+          return flux(f, newCandidates);
+        });
+  }
+
+  /**
+   * Returns list of active publishers, starting with latest active.
+   */
+  private synchronized List<PublisherHolder<T>> getActivePublishers() {
+    var result = new ArrayList<PublisherHolder<T>>();
+    for (int i = 0, j = currentIndex; i < publishers.size(); i++) {
+      var publisher = publishers.get(j);
+      if (publisher.isActive()) {
+        result.add(publisher);
+      } else if (currentIndex == j) {
+        currentIndex = ++currentIndex == publishers.size() ? 0 : currentIndex;
+      }
+      j = ++j == publishers.size() ? 0 : j;
+    }
+    return result;
+  }
+
+  static class PublisherHolder<T> {
+
+    private final long retryGracePeriodMs;
+    private final Supplier<T> supplier;
+    private final AtomicLong lastErrorTs = new AtomicLong();
+    private T publisherInstance;
+
+    PublisherHolder(Supplier<T> supplier, long retryGracePeriodMs) {
+      this.supplier = supplier;
+      this.retryGracePeriodMs = retryGracePeriodMs;
+    }
+
+    synchronized T get() {
+      if (publisherInstance == null) {
+        publisherInstance = supplier.get();
+      }
+      return publisherInstance;
+    }
+
+    void markFailed() {
+      lastErrorTs.set(System.currentTimeMillis());
+    }
+
+    boolean isActive() {
+      return System.currentTimeMillis() - lastErrorTs.get() > retryGracePeriodMs;
+    }
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SecuredWebClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SecuredWebClient.java
deleted file mode 100644
index 3e826c855ad..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SecuredWebClient.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.netty.http.client.HttpClient;
-
-public class SecuredWebClient {
-  public static WebClient.Builder configure(
-      String keystoreLocation,
-      String keystorePassword,
-      String truststoreLocation,
-      String truststorePassword)
-      throws NoSuchAlgorithmException, IOException, KeyStoreException, CertificateException, UnrecoverableKeyException {
-    // If we want to customize our TLS configuration, we need at least a truststore
-    if (truststoreLocation == null || truststorePassword == null) {
-      return WebClient.builder();
-    }
-
-    SslContextBuilder contextBuilder = SslContextBuilder.forClient();
-
-    // Prepare truststore
-    KeyStore trustStore = KeyStore.getInstance("JKS");
-    trustStore.load(
-        new FileInputStream((ResourceUtils.getFile(truststoreLocation))),
-        truststorePassword.toCharArray()
-    );
-
-    TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
-        TrustManagerFactory.getDefaultAlgorithm()
-    );
-    trustManagerFactory.init(trustStore);
-    contextBuilder.trustManager(trustManagerFactory);
-
-    // Prepare keystore only if we got a keystore
-    if (keystoreLocation != null && keystorePassword != null) {
-      KeyStore keyStore = KeyStore.getInstance("JKS");
-      keyStore.load(
-          new FileInputStream(ResourceUtils.getFile(keystoreLocation)),
-          keystorePassword.toCharArray()
-      );
-
-      KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-      keyManagerFactory.init(keyStore, keystorePassword.toCharArray());
-      contextBuilder.keyManager(keyManagerFactory);
-    }
-
-    // Create webclient
-    SslContext context = contextBuilder.build();
-
-    return WebClient.builder()
-        .clientConnector(new ReactorClientHttpConnector(HttpClient.create().secure(t -> t.sslContext(context))));
-  }
-}
\ No newline at end of file
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
new file mode 100644
index 00000000000..f07529530d6
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
@@ -0,0 +1,136 @@
+package com.provectus.kafka.ui.util;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.exception.ValidationException;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import java.io.FileInputStream;
+import java.security.KeyStore;
+import java.util.function.Consumer;
+import javax.annotation.Nullable;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
+import lombok.SneakyThrows;
+import org.openapitools.jackson.nullable.JsonNullableModule;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.http.codec.ClientCodecConfigurer;
+import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.json.Jackson2JsonEncoder;
+import org.springframework.util.ResourceUtils;
+import org.springframework.util.unit.DataSize;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.netty.http.client.HttpClient;
+
+public class WebClientConfigurator {
+
+  private final WebClient.Builder builder = WebClient.builder();
+
+  public WebClientConfigurator() {
+    configureObjectMapper(defaultOM());
+  }
+
+  private static ObjectMapper defaultOM() {
+    return new ObjectMapper()
+        .registerModule(new JavaTimeModule())
+        .registerModule(new JsonNullableModule())
+        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+  }
+
+
+  public WebClientConfigurator configureSsl(@Nullable ClustersProperties.WebClientSsl ssl) {
+    if (ssl != null) {
+      return configureSsl(
+          ssl.getKeystoreLocation(),
+          ssl.getKeystorePassword(),
+          ssl.getTruststoreLocation(),
+          ssl.getTruststorePassword()
+      );
+    }
+    return this;
+  }
+
+  @SneakyThrows
+  public WebClientConfigurator configureSsl(
+      @Nullable String keystoreLocation,
+      @Nullable String keystorePassword,
+      @Nullable String truststoreLocation,
+      @Nullable String truststorePassword) {
+    // If we want to customize our TLS configuration, we need at least a truststore
+    if (truststoreLocation == null || truststorePassword == null) {
+      return this;
+    }
+
+    SslContextBuilder contextBuilder = SslContextBuilder.forClient();
+
+    // Prepare truststore
+    KeyStore trustStore = KeyStore.getInstance("JKS");
+    trustStore.load(
+        new FileInputStream((ResourceUtils.getFile(truststoreLocation))),
+        truststorePassword.toCharArray()
+    );
+
+    TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+        TrustManagerFactory.getDefaultAlgorithm()
+    );
+    trustManagerFactory.init(trustStore);
+    contextBuilder.trustManager(trustManagerFactory);
+
+    // Prepare keystore only if we got a keystore
+    if (keystoreLocation != null && keystorePassword != null) {
+      KeyStore keyStore = KeyStore.getInstance("JKS");
+      keyStore.load(
+          new FileInputStream(ResourceUtils.getFile(keystoreLocation)),
+          keystorePassword.toCharArray()
+      );
+
+      KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+      keyManagerFactory.init(keyStore, keystorePassword.toCharArray());
+      contextBuilder.keyManager(keyManagerFactory);
+    }
+
+    // Create webclient
+    SslContext context = contextBuilder.build();
+
+    builder.clientConnector(new ReactorClientHttpConnector(HttpClient.create().secure(t -> t.sslContext(context))));
+    return this;
+  }
+
+  public WebClientConfigurator configureBasicAuth(@Nullable String username, @Nullable String password) {
+    if (username != null && password != null) {
+      builder.defaultHeaders(httpHeaders -> httpHeaders.setBasicAuth(username, password));
+    } else if (username != null) {
+      throw new ValidationException("You specified username but did not specify password");
+    } else if (password != null) {
+      throw new ValidationException("You specified password but did not specify username");
+    }
+    return this;
+  }
+
+  public WebClientConfigurator configureBufferSize(DataSize maxBuffSize) {
+    builder.codecs(c -> c.defaultCodecs().maxInMemorySize((int) maxBuffSize.toBytes()));
+    return this;
+  }
+
+  public WebClientConfigurator configureObjectMapper(ObjectMapper mapper) {
+    builder.codecs(codecs -> {
+      codecs.defaultCodecs()
+          .jackson2JsonEncoder(new Jackson2JsonEncoder(mapper, MediaType.APPLICATION_JSON));
+      codecs.defaultCodecs()
+          .jackson2JsonDecoder(new Jackson2JsonDecoder(mapper, MediaType.APPLICATION_JSON));
+    });
+    return this;
+  }
+
+  public WebClientConfigurator configureCodecs(Consumer<ClientCodecConfigurer> configurer) {
+    builder.codecs(configurer);
+    return this;
+  }
+
+  public WebClient build() {
+    return builder.build();
+  }
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/model/FailoverUrlListTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/model/FailoverUrlListTest.java
deleted file mode 100644
index 5cbbaf73539..00000000000
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/model/FailoverUrlListTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.provectus.kafka.ui.model;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-
-class FailoverUrlListTest {
-
-  public static final int RETRY_GRACE_PERIOD_IN_MS = 10;
-
-  @Nested
-  @SuppressWarnings("all")
-  class ShouldHaveFailoverAvailableWhen {
-
-    private FailoverUrlList failoverUrlList;
-
-    @BeforeEach
-    void before() {
-      failoverUrlList = new FailoverUrlList(List.of("localhost:123", "farawayhost:5678"), RETRY_GRACE_PERIOD_IN_MS);
-    }
-
-    @Test
-    void thereAreNoFailures() {
-      assertThat(failoverUrlList.isFailoverAvailable()).isTrue();
-    }
-
-    @Test
-    void withLessFailuresThenAvailableUrls() {
-      failoverUrlList.fail(failoverUrlList.current());
-
-      assertThat(failoverUrlList.isFailoverAvailable()).isTrue();
-    }
-
-    @Test
-    void withAllFailuresAndAtLeastOneAfterTheGraceTimeoutPeriod() throws InterruptedException {
-      failoverUrlList.fail(failoverUrlList.current());
-      failoverUrlList.fail(failoverUrlList.current());
-
-      Thread.sleep(RETRY_GRACE_PERIOD_IN_MS + 1);
-
-      assertThat(failoverUrlList.isFailoverAvailable()).isTrue();
-    }
-
-    @Nested
-    @SuppressWarnings("all")
-    class ShouldNotHaveFailoverAvailableWhen {
-
-      private FailoverUrlList failoverUrlList;
-
-      @BeforeEach
-      void before() {
-        failoverUrlList = new FailoverUrlList(List.of("localhost:123", "farawayhost:5678"), 1000);
-      }
-
-      @Test
-      void allFailuresWithinGracePeriod() {
-        failoverUrlList.fail(failoverUrlList.current());
-        failoverUrlList.fail(failoverUrlList.current());
-
-        assertThat(failoverUrlList.isFailoverAvailable()).isFalse();
-      }
-    }
-  }
-}
-
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
index 6ad38f2cc1e..ed56abbb814 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
@@ -7,78 +7,78 @@
 import static org.mockito.Mockito.when;
 
 import com.provectus.kafka.ui.controller.SchemasController;
-import com.provectus.kafka.ui.mapper.ClusterMapper;
-import com.provectus.kafka.ui.model.InternalSchemaRegistry;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.SchemaSubjectDTO;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import com.provectus.kafka.ui.sr.model.Compatibility;
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import com.provectus.kafka.ui.util.AccessControlServiceMock;
+import com.provectus.kafka.ui.util.ReactiveFailover;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Optional;
 import java.util.stream.IntStream;
 import org.junit.jupiter.api.Test;
-import org.springframework.test.util.ReflectionTestUtils;
 import reactor.core.publisher.Mono;
 
 public class SchemaRegistryPaginationTest {
 
   private static final String LOCAL_KAFKA_CLUSTER_NAME = "local";
 
-  private final SchemaRegistryService schemaRegistryService = mock(SchemaRegistryService.class);
-  private final ClustersStorage clustersStorage = mock(ClustersStorage.class);
-  private final ClusterMapper clusterMapper = mock(ClusterMapper.class);
-  private final AccessControlService accessControlService = new AccessControlServiceMock().getMock();
+  private SchemasController controller;
 
-  private final SchemasController controller
-      = new SchemasController(clusterMapper, schemaRegistryService, accessControlService);
+  private void init(List<String> subjects) {
+    ClustersStorage clustersStorage = mock(ClustersStorage.class);
+    when(clustersStorage.getClusterByName(isA(String.class)))
+        .thenReturn(Optional.of(buildKafkaCluster(LOCAL_KAFKA_CLUSTER_NAME)));
 
-  private void init(String[] subjects) {
+    SchemaRegistryService schemaRegistryService = mock(SchemaRegistryService.class);
     when(schemaRegistryService.getAllSubjectNames(isA(KafkaCluster.class)))
-        .thenReturn(Mono.just(subjects));
+                .thenReturn(Mono.just(subjects));
     when(schemaRegistryService
-        .getAllLatestVersionSchemas(isA(KafkaCluster.class), anyList())).thenCallRealMethod();
-    when(clustersStorage.getClusterByName(isA(String.class)))
-        .thenReturn(Optional.of(buildKafkaCluster(LOCAL_KAFKA_CLUSTER_NAME)));
+            .getAllLatestVersionSchemas(isA(KafkaCluster.class), anyList())).thenCallRealMethod();
     when(schemaRegistryService.getLatestSchemaVersionBySubject(isA(KafkaCluster.class), isA(String.class)))
-        .thenAnswer(a -> Mono.just(new SchemaSubjectDTO().subject(a.getArgument(1))));
+            .thenAnswer(a -> Mono.just(
+                new SchemaRegistryService.SubjectWithCompatibilityLevel(
+                    new SchemaSubject().subject(a.getArgument(1)), Compatibility.FULL)));
 
-    ReflectionTestUtils.setField(controller, "clustersStorage", clustersStorage);
+    this.controller = new SchemasController(schemaRegistryService, new AccessControlServiceMock().getMock());
+    this.controller.setClustersStorage(clustersStorage);
   }
 
   @Test
   void shouldListFirst25andThen10Schemas() {
     init(
-        IntStream.rangeClosed(1, 100)
-            .boxed()
-            .map(num -> "subject" + num)
-            .toArray(String[]::new)
+            IntStream.rangeClosed(1, 100)
+                    .boxed()
+                    .map(num -> "subject" + num)
+                    .toList()
     );
     var schemasFirst25 = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-        null, null, null, null).block();
+            null, null, null, null).block();
     assertThat(schemasFirst25.getBody().getPageCount()).isEqualTo(4);
     assertThat(schemasFirst25.getBody().getSchemas()).hasSize(25);
     assertThat(schemasFirst25.getBody().getSchemas())
-        .isSortedAccordingTo(Comparator.comparing(SchemaSubjectDTO::getSubject));
+            .isSortedAccordingTo(Comparator.comparing(SchemaSubjectDTO::getSubject));
 
     var schemasFirst10 = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-        null, 10, null, null).block();
+            null, 10, null, null).block();
 
     assertThat(schemasFirst10.getBody().getPageCount()).isEqualTo(10);
     assertThat(schemasFirst10.getBody().getSchemas()).hasSize(10);
     assertThat(schemasFirst10.getBody().getSchemas())
-        .isSortedAccordingTo(Comparator.comparing(SchemaSubjectDTO::getSubject));
+            .isSortedAccordingTo(Comparator.comparing(SchemaSubjectDTO::getSubject));
   }
 
   @Test
   void shouldListSchemasContaining_1() {
     init(
-        IntStream.rangeClosed(1, 100)
-            .boxed()
-            .map(num -> "subject" + num)
-            .toArray(String[]::new)
+              IntStream.rangeClosed(1, 100)
+                      .boxed()
+                      .map(num -> "subject" + num)
+                      .toList()
     );
     var schemasSearch7 = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-        null, null, "1", null).block();
+            null, null, "1", null).block();
     assertThat(schemasSearch7.getBody().getPageCount()).isEqualTo(1);
     assertThat(schemasSearch7.getBody().getSchemas()).hasSize(20);
   }
@@ -86,13 +86,13 @@ void shouldListSchemasContaining_1() {
   @Test
   void shouldCorrectlyHandleNonPositivePageNumberAndPageSize() {
     init(
-        IntStream.rangeClosed(1, 100)
-            .boxed()
-            .map(num -> "subject" + num)
-            .toArray(String[]::new)
+                IntStream.rangeClosed(1, 100)
+                        .boxed()
+                        .map(num -> "subject" + num)
+                        .toList()
     );
     var schemas = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-        0, -1, null, null).block();
+            0, -1, null, null).block();
 
     assertThat(schemas.getBody().getPageCount()).isEqualTo(4);
     assertThat(schemas.getBody().getSchemas()).hasSize(25);
@@ -102,14 +102,14 @@ void shouldCorrectlyHandleNonPositivePageNumberAndPageSize() {
   @Test
   void shouldCalculateCorrectPageCountForNonDivisiblePageSize() {
     init(
-        IntStream.rangeClosed(1, 100)
-            .boxed()
-            .map(num -> "subject" + num)
-            .toArray(String[]::new)
+                IntStream.rangeClosed(1, 100)
+                        .boxed()
+                        .map(num -> "subject" + num)
+                        .toList()
     );
 
     var schemas = controller.getSchemas(LOCAL_KAFKA_CLUSTER_NAME,
-        4, 33, null, null).block();
+            4, 33, null, null).block();
 
     assertThat(schemas.getBody().getPageCount()).isEqualTo(4);
     assertThat(schemas.getBody().getSchemas()).hasSize(1);
@@ -118,8 +118,8 @@ void shouldCalculateCorrectPageCountForNonDivisiblePageSize() {
 
   private KafkaCluster buildKafkaCluster(String clusterName) {
     return KafkaCluster.builder()
-        .name(clusterName)
-        .schemaRegistry(InternalSchemaRegistry.builder().build())
-        .build();
+            .name(clusterName)
+            .schemaRegistryClient(mock(ReactiveFailover.class))
+            .build();
   }
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
index e140ab61df9..44b771f1542 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
@@ -11,7 +11,6 @@
 import com.provectus.kafka.ui.mapper.ClusterMapperImpl;
 import com.provectus.kafka.ui.model.InternalLogDirStats;
 import com.provectus.kafka.ui.model.InternalPartitionsOffsets;
-import com.provectus.kafka.ui.model.InternalSchemaRegistry;
 import com.provectus.kafka.ui.model.InternalTopic;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.Metrics;
@@ -87,7 +86,6 @@ public void shouldListFirst25Topics() {
   private KafkaCluster buildKafkaCluster(String clusterName) {
     return KafkaCluster.builder()
         .name(clusterName)
-        .schemaRegistry(InternalSchemaRegistry.builder().build())
         .build();
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
index a797175091f..069b173100e 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
@@ -9,15 +9,12 @@
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.container.KsqlDbContainer;
-import com.provectus.kafka.ui.model.InternalKsqlServer;
-import com.provectus.kafka.ui.model.KafkaCluster;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.unit.DataSize;
 import org.testcontainers.shaded.org.awaitility.Awaitility;
 import org.testcontainers.utility.DockerImageName;
 import reactor.test.StepVerifier;
@@ -28,8 +25,6 @@ class KsqlApiClientTest extends AbstractIntegrationTest {
       DockerImageName.parse("confluentinc/ksqldb-server").withTag("0.24.0"))
       .withKafka(kafka);
 
-  private static final DataSize maxBuffSize = DataSize.ofMegabytes(20);
-
   @BeforeAll
   static void startContainer() {
     KSQL_DB.start();
@@ -43,8 +38,7 @@ static void stopContainer() {
   // Tutorial is here: https://ksqldb.io/quickstart.html
   @Test
   void ksqTutorialQueriesWork() {
-    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(
-            InternalKsqlServer.builder().url(KSQL_DB.url()).build()).build(), maxBuffSize);
+    var client = ksqlClient();
     execCommandSync(client,
         "CREATE STREAM riderLocations (profileId VARCHAR, latitude DOUBLE, longitude DOUBLE) "
             + "WITH (kafka_topic='locations', value_format='json', partitions=1);",
@@ -130,5 +124,9 @@ private void execCommandSync(KsqlApiClient client, String... ksqls) {
     }
   }
 
+  private KsqlApiClient ksqlClient() {
+    return new KsqlApiClient(KSQL_DB.url(), null, null, null);
+  }
+
 
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
index 89823d643ea..a4098b0275e 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
@@ -4,10 +4,11 @@
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.container.KsqlDbContainer;
-import com.provectus.kafka.ui.model.InternalKsqlServer;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.KsqlStreamDescriptionDTO;
 import com.provectus.kafka.ui.model.KsqlTableDescriptionDTO;
+import com.provectus.kafka.ui.util.ReactiveFailover;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -35,29 +36,25 @@ static void init() {
 
   @AfterAll
   static void cleanup() {
-    var client = new KsqlApiClient(KafkaCluster.builder().ksqldbServer(
-        InternalKsqlServer.builder().url(KSQL_DB.url()).build()).build(), maxBuffSize);
-
     TABLES_TO_DELETE.forEach(t ->
-        client.execute(String.format("DROP TABLE IF EXISTS %s DELETE TOPIC;", t), Map.of())
+        ksqlClient().execute(String.format("DROP TABLE IF EXISTS %s DELETE TOPIC;", t), Map.of())
             .blockLast());
 
     STREAMS_TO_DELETE.forEach(s ->
-        client.execute(String.format("DROP STREAM IF EXISTS %s DELETE TOPIC;", s), Map.of())
+        ksqlClient().execute(String.format("DROP STREAM IF EXISTS %s DELETE TOPIC;", s), Map.of())
             .blockLast());
 
     KSQL_DB.stop();
   }
 
-  private final KsqlServiceV2 ksqlService = new KsqlServiceV2(maxBuffSize);
+  private final KsqlServiceV2 ksqlService = new KsqlServiceV2();
 
   @Test
   void listStreamsReturnsAllKsqlStreams() {
-    var cluster = KafkaCluster.builder().ksqldbServer(InternalKsqlServer.builder().url(KSQL_DB.url()).build()).build();
     var streamName = "stream_" + System.currentTimeMillis();
     STREAMS_TO_DELETE.add(streamName);
 
-    new KsqlApiClient(cluster, maxBuffSize)
+    ksqlClient()
         .execute(
             String.format("CREATE STREAM %s ( "
                 + "  c1 BIGINT KEY, "
@@ -70,7 +67,7 @@ void listStreamsReturnsAllKsqlStreams() {
             Map.of())
         .blockLast();
 
-    var streams = ksqlService.listStreams(cluster).collectList().block();
+    var streams = ksqlService.listStreams(cluster()).collectList().block();
     assertThat(streams).contains(
         new KsqlStreamDescriptionDTO()
             .name(streamName.toUpperCase())
@@ -82,11 +79,10 @@ void listStreamsReturnsAllKsqlStreams() {
 
   @Test
   void listTablesReturnsAllKsqlTables() {
-    var cluster = KafkaCluster.builder().ksqldbServer(InternalKsqlServer.builder().url(KSQL_DB.url()).build()).build();
     var tableName = "table_" + System.currentTimeMillis();
     TABLES_TO_DELETE.add(tableName);
 
-    new KsqlApiClient(cluster, maxBuffSize)
+    ksqlClient()
         .execute(
             String.format("CREATE TABLE %s ( "
                 + "   c1 BIGINT PRIMARY KEY, "
@@ -99,7 +95,7 @@ void listTablesReturnsAllKsqlTables() {
             Map.of())
         .blockLast();
 
-    var tables = ksqlService.listTables(cluster).collectList().block();
+    var tables = ksqlService.listTables(cluster()).collectList().block();
     assertThat(tables).contains(
         new KsqlTableDescriptionDTO()
             .name(tableName.toUpperCase())
@@ -110,4 +106,15 @@ void listTablesReturnsAllKsqlTables() {
     );
   }
 
+  private static KafkaCluster cluster() {
+    return KafkaCluster.builder()
+        .ksqlClient(ReactiveFailover.create(
+            List.of(ksqlClient()), th -> true, "", ReactiveFailover.DEFAULT_RETRY_GRACE_PERIOD_MS))
+        .build();
+  }
+
+  private static KsqlApiClient ksqlClient() {
+    return new KsqlApiClient(KSQL_DB.url(), null, null, null);
+  }
+
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/ReactiveFailoverTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/ReactiveFailoverTest.java
new file mode 100644
index 00000000000..245dab9722a
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/ReactiveFailoverTest.java
@@ -0,0 +1,233 @@
+package com.provectus.kafka.ui.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.common.base.Preconditions;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+class ReactiveFailoverTest {
+
+  private static final String NO_AVAILABLE_PUBLISHERS_MSG = "no active publishers!";
+  private static final Predicate<Throwable> FAILING_EXCEPTION_FILTER = th -> th.getMessage().contains("fail!");
+  private static final Supplier<Throwable> FAILING_EXCEPTION_SUPPLIER = () -> new IllegalStateException("fail!");
+  private static final Duration RETRY_PERIOD = Duration.ofMillis(300);
+
+  private final List<Publisher> publishers = Stream.generate(Publisher::new).limit(3).toList();
+
+  private final ReactiveFailover<Publisher> failover = ReactiveFailover.create(
+      publishers,
+      FAILING_EXCEPTION_FILTER,
+      NO_AVAILABLE_PUBLISHERS_MSG,
+      RETRY_PERIOD
+  );
+
+  @Test
+  void testMonoFailoverCycle() throws InterruptedException {
+    // starting with first publisher:
+    // 0 -> ok : ok
+    monoCheck(
+        Map.of(
+            0, okMono()
+        ),
+        List.of(0),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+
+    // 0 -> fail, 1 -> ok : ok
+    monoCheck(
+        Map.of(
+            0, failingMono(),
+            1, okMono()
+        ),
+        List.of(0, 1),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+
+    // 0.failed, 1.failed, 2 -> ok : ok
+    monoCheck(
+        Map.of(
+            1, failingMono(),
+            2, okMono()
+        ),
+        List.of(1, 2),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+
+    // 0.failed, 1.failed, 2 -> fail : failing exception
+    monoCheck(
+        Map.of(
+            2, failingMono()
+        ),
+        List.of(2),
+        step -> step.verifyErrorMessage(FAILING_EXCEPTION_SUPPLIER.get().getMessage())
+    );
+
+    // 0.failed, 1.failed, 2.failed : No alive publisher exception
+    monoCheck(
+        Map.of(),
+        List.of(),
+        step -> step.verifyErrorMessage(NO_AVAILABLE_PUBLISHERS_MSG)
+    );
+
+    // resetting retry: all publishers became alive: 0.ok, 1.ok, 2.ok
+    Thread.sleep(RETRY_PERIOD.toMillis() + 1);
+
+    // starting with last errored publisher:
+    // 2 -> fail, 0 -> fail, 1 -> ok : ok
+    monoCheck(
+        Map.of(
+            2, failingMono(),
+            0, failingMono(),
+            1, okMono()
+        ),
+        List.of(2, 0, 1),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+
+    // 1 -> ok : ok
+    monoCheck(
+        Map.of(
+            1, okMono()
+        ),
+        List.of(1),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+  }
+
+  @Test
+  void testFluxFailoverCycle() throws InterruptedException {
+    // starting with first publisher:
+    // 0 -> ok : ok
+    fluxCheck(
+        Map.of(
+            0, okFlux()
+        ),
+        List.of(0),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+
+    // 0 -> fail, 1 -> ok : ok
+    fluxCheck(
+        Map.of(
+            0, failingFlux(),
+            1, okFlux()
+        ),
+        List.of(0, 1),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+
+    // 0.failed, 1.failed, 2 -> ok : ok
+    fluxCheck(
+        Map.of(
+            1, failingFlux(),
+            2, okFlux()
+        ),
+        List.of(1, 2),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+
+    // 0.failed, 1.failed, 2 -> fail : failing exception
+    fluxCheck(
+        Map.of(
+            2, failingFlux()
+        ),
+        List.of(2),
+        step -> step.verifyErrorMessage(FAILING_EXCEPTION_SUPPLIER.get().getMessage())
+    );
+
+    // 0.failed, 1.failed, 2.failed : No alive publisher exception
+    fluxCheck(
+        Map.of(),
+        List.of(),
+        step -> step.verifyErrorMessage(NO_AVAILABLE_PUBLISHERS_MSG)
+    );
+
+    // resetting retry: all publishers became alive: 0.ok, 1.ok, 2.ok
+    Thread.sleep(RETRY_PERIOD.toMillis() + 1);
+
+    // starting with last errored publisher:
+    // 2 -> fail, 0 -> fail, 1 -> ok : ok
+    fluxCheck(
+        Map.of(
+            2, failingFlux(),
+            0, failingFlux(),
+            1, okFlux()
+        ),
+        List.of(2, 0, 1),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+
+    // 1 -> ok : ok
+    fluxCheck(
+        Map.of(
+            1, okFlux()
+        ),
+        List.of(1),
+        step -> step.expectNextCount(1).verifyComplete()
+    );
+  }
+
+  private void monoCheck(Map<Integer, Mono<String>> mock,
+                         List<Integer> publishersToBeCalled, // for checking calls order
+                         Consumer<StepVerifier.Step<?>> stepVerifier) {
+    AtomicInteger calledCount = new AtomicInteger();
+    var mono = failover.mono(publisher -> {
+      int calledPublisherIdx = publishers.indexOf(publisher);
+      assertThat(calledPublisherIdx).isEqualTo(publishersToBeCalled.get(calledCount.getAndIncrement()));
+      return Preconditions.checkNotNull(
+          mock.get(calledPublisherIdx),
+          "Mono result not set for publisher %d", calledPublisherIdx
+      );
+    });
+    stepVerifier.accept(StepVerifier.create(mono));
+    assertThat(calledCount.get()).isEqualTo(publishersToBeCalled.size());
+  }
+
+
+  private void fluxCheck(Map<Integer, Flux<String>> mock,
+                         List<Integer> publishersToBeCalled, // for checking calls order
+                         Consumer<StepVerifier.Step<?>> stepVerifier) {
+    AtomicInteger calledCount = new AtomicInteger();
+    var flux = failover.flux(publisher -> {
+      int calledPublisherIdx = publishers.indexOf(publisher);
+      assertThat(calledPublisherIdx).isEqualTo(publishersToBeCalled.get(calledCount.getAndIncrement()));
+      return Preconditions.checkNotNull(
+          mock.get(calledPublisherIdx),
+          "Mono result not set for publisher %d", calledPublisherIdx
+      );
+    });
+    stepVerifier.accept(StepVerifier.create(flux));
+    assertThat(calledCount.get()).isEqualTo(publishersToBeCalled.size());
+  }
+
+  private Flux<String> okFlux() {
+    return Flux.just("ok");
+  }
+
+  private Flux<String> failingFlux() {
+    return Flux.error(FAILING_EXCEPTION_SUPPLIER);
+  }
+
+  private Mono<String> okMono() {
+    return Mono.just("ok");
+  }
+
+  private Mono<String> failingMono() {
+    return Mono.error(FAILING_EXCEPTION_SUPPLIER);
+  }
+
+  public static class Publisher {
+  }
+
+}
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index 3c898b4fcf4..3e8437258b9 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -122,6 +122,32 @@
                                         <asyncNative>true</asyncNative>
                                         <library>webclient</library>
 
+                                        <useBeanValidation>true</useBeanValidation>
+                                        <dateLibrary>java8</dateLibrary>
+                                    </configOptions>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>generate-sr-client</id>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                                <configuration>
+                                    <inputSpec>${project.basedir}/src/main/resources/swagger/kafka-sr-api.yaml
+                                    </inputSpec>
+                                    <output>${project.build.directory}/generated-sources/kafka-sr-client</output>
+                                    <generatorName>java</generatorName>
+                                    <generateApiTests>false</generateApiTests>
+                                    <generateModelTests>false</generateModelTests>
+
+                                    <configOptions>
+                                        <modelPackage>com.provectus.kafka.ui.sr.model</modelPackage>
+                                        <apiPackage>com.provectus.kafka.ui.sr.api</apiPackage>
+                                        <sourceFolder>kafka-sr-client</sourceFolder>
+
+                                        <asyncNative>true</asyncNative>
+                                        <library>webclient</library>
+
                                         <useBeanValidation>true</useBeanValidation>
                                         <dateLibrary>java8</dateLibrary>
                                     </configOptions>
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-sr-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-sr-api.yaml
new file mode 100644
index 00000000000..84ee36b48de
--- /dev/null
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-sr-api.yaml
@@ -0,0 +1,404 @@
+openapi: 3.0.0
+info:
+    description: Api Documentation
+    version: 0.1.0
+    title: Api Documentation
+    termsOfService: urn:tos
+    contact: {}
+    license:
+        name: Apache 2.0
+        url: http://www.apache.org/licenses/LICENSE-2.0
+tags:
+    - name: /schemaregistry
+servers:
+    - url: /localhost
+
+paths:
+    /subjects:
+        get:
+            tags:
+              - KafkaSrClient
+            summary: get all connectors from Kafka Connect service
+            operationId: getAllSubjectNames
+            parameters:
+              - name: subjectPrefix
+                in: query
+                required: false
+                schema:
+                  type: string
+              - name: deleted
+                in: query
+                schema:
+                  type: boolean
+            responses:
+                200:
+                  description: OK
+                  content:
+                      application/json:
+                          schema:
+                            #workaround for https://github.com/spring-projects/spring-framework/issues/24734
+                            type: string
+
+    /subjects/{subject}:
+        delete:
+            tags:
+                - KafkaSrClient
+            operationId: deleteAllSubjectVersions
+            parameters:
+                - name: subject
+                  in: path
+                  required: true
+                  schema:
+                    type: string
+                - name: permanent
+                  in: query
+                  schema:
+                    type: boolean
+                  required: false
+            responses:
+                200:
+                    description: OK
+                404:
+                    description: Not found
+
+    /subjects/{subject}/versions/{version}:
+        get:
+            tags:
+              - KafkaSrClient
+            operationId: getSubjectVersion
+            parameters:
+              - name: subject
+                in: path
+                required: true
+                schema:
+                  type: string
+              - name: version
+                in: path
+                required: true
+                schema:
+                  type: string
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/SchemaSubject'
+                404:
+                    description: Not found
+                422:
+                    description: Invalid version
+        delete:
+            tags:
+                - KafkaSrClient
+            operationId: deleteSubjectVersion
+            parameters:
+                - name: subject
+                  in: path
+                  required: true
+                  schema:
+                    type: string
+                - name: permanent
+                  in: query
+                  required: false
+                  schema:
+                    type: boolean
+                    default: false
+                - name: version
+                  in: path
+                  required: true
+                  schema:
+                    type: string
+            responses:
+                200:
+                    description: OK
+                404:
+                    description: Not found
+
+    /subjects/{subject}/versions:
+        get:
+            tags:
+                - KafkaSrClient
+            operationId: getSubjectVersions
+            parameters:
+                - name: subject
+                  in: path
+                  required: true
+                  schema:
+                      type: string
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                type: array
+                                items:
+                                    type: integer
+                                    format: int32
+                404:
+                    description: Not found
+        post:
+            tags:
+                - KafkaSrClient
+            operationId: registerNewSchema
+            parameters:
+                - name: subject
+                  in: path
+                  required: true
+                  schema:
+                      type: string
+            requestBody:
+                content:
+                    application/json:
+                        schema:
+                            $ref: '#/components/schemas/NewSubject'
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/SubjectId'
+
+    /config/:
+        get:
+            tags:
+                - KafkaSrClient
+            operationId: getGlobalCompatibilityLevel
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/CompatibilityConfig'
+                404:
+                    description: Not found
+        put:
+            tags:
+                - KafkaSrClient
+            operationId: updateGlobalCompatibilityLevel
+            requestBody:
+                content:
+                    application/json:
+                        schema:
+                            $ref: '#/components/schemas/CompatibilityLevelChange'
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/CompatibilityLevelChange'
+                404:
+                    description: Not found
+
+    /config/{subject}:
+        get:
+            tags:
+                - KafkaSrClient
+            operationId: getSubjectCompatibilityLevel
+            parameters:
+                - name: subject
+                  in: path
+                  required: true
+                  schema:
+                      type: string
+                - name: defaultToGlobal
+                  in: query
+                  required: true
+                  schema:
+                      type: boolean
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/CompatibilityConfig'
+                404:
+                    description: Not found
+        put:
+            tags:
+                - KafkaSrClient
+            operationId: updateSubjectCompatibilityLevel
+            parameters:
+                - name: subject
+                  in: path
+                  required: true
+                  schema:
+                      type: string
+            requestBody:
+                content:
+                    application/json:
+                        schema:
+                            $ref: '#/components/schemas/CompatibilityLevelChange'
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/CompatibilityLevelChange'
+                404:
+                    description: Not found
+        delete:
+            tags:
+                - KafkaSrClient
+            operationId: deleteSubjectCompatibilityLevel
+            parameters:
+                - name: subject
+                  in: path
+                  required: true
+                  schema:
+                      type: string
+            responses:
+                200:
+                    description: OK
+                404:
+                    description: Not found
+
+    /compatibility/subjects/{subject}/versions/{version}:
+        post:
+            tags:
+                - KafkaSrClient
+            operationId: checkSchemaCompatibility
+            parameters:
+                - name: subject
+                  in: path
+                  required: true
+                  schema:
+                      type: string
+                - name: version
+                  in: path
+                  required: true
+                  schema:
+                      type: string
+                - name: verbose
+                  in: query
+                  description: Show reason a schema fails the compatibility test
+                  schema:
+                      type: boolean
+            requestBody:
+                content:
+                    application/json:
+                        schema:
+                            $ref: '#/components/schemas/NewSubject'
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/CompatibilityCheckResponse'
+                404:
+                    description: Not found
+
+security:
+    - basicAuth: []
+
+components:
+    securitySchemes:
+        basicAuth:
+            type: http
+            scheme: basic
+    schemas:
+        SchemaSubject:
+            type: object
+            properties:
+              subject:
+                type: string
+              version:
+                type: string
+              id:
+                type: integer
+              schema:
+                type: string
+              schemaType:
+                  $ref: '#/components/schemas/SchemaType'
+            required:
+              - id
+              - subject
+              - version
+              - schema
+              - schemaType
+
+        SchemaType:
+          type: string
+          description: upon updating a schema, the type of an existing schema can't be changed
+          enum:
+            - AVRO
+            - JSON
+            - PROTOBUF
+
+        SchemaReference:
+            type: object
+            properties:
+                name:
+                    type: string
+                subject:
+                    type: string
+                version:
+                    type: integer
+            required:
+                - name
+                - subject
+                - version
+
+        SubjectId:
+            type: object
+            properties:
+                id:
+                    type: integer
+
+        NewSubject:
+            type: object
+            description: should be set for creating/updating schema subject
+            properties:
+                schema:
+                    type: string
+                schemaType:
+                    $ref: '#/components/schemas/SchemaType'
+                references:
+                    type: array
+                    items:
+                        $ref: '#/components/schemas/SchemaReference'
+            required:
+                - schema
+                - schemaType
+
+        CompatibilityConfig:
+            type: object
+            properties:
+                compatibilityLevel:
+                    $ref: '#/components/schemas/Compatibility'
+            required:
+                - compatibilityLevel
+
+        CompatibilityLevelChange:
+            type: object
+            properties:
+                compatibility:
+                    $ref: '#/components/schemas/Compatibility'
+            required:
+                - compatibility
+
+
+        Compatibility:
+            type: string
+            enum:
+                - BACKWARD
+                - BACKWARD_TRANSITIVE
+                - FORWARD
+                - FORWARD_TRANSITIVE
+                - FULL
+                - FULL_TRANSITIVE
+                - NONE
+
+
+        CompatibilityCheckResponse:
+            type: object
+            properties:
+                is_compatible:
+                    type: boolean

From f55376b40bc88dde7262a2de09addf8097e747f9 Mon Sep 17 00:00:00 2001
From: Wanis Fahmy <51237742+wanisfahmyDE@users.noreply.github.com>
Date: Mon, 16 Jan 2023 14:53:06 +0100
Subject: [PATCH 385/734] [BE] Impl basic auth for prometheus (#3201)

* fix(3143): passes prometheus basic auth credentials

Co-authored-by: theurichde <tim.heurich@idealo.de>

* fix(3143): applies review comments

Co-authored-by: theurichde <tim.heurich@idealo.de>

Co-authored-by: theurichde <tim.heurich@idealo.de>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../metrics/PrometheusMetricsRetriever.java   | 23 +++++---
 .../PrometheusMetricsRetrieverTest.java       | 55 +++++++++++++++----
 2 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java
index 8e9334b418c..e4cb4c36cb8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java
@@ -3,6 +3,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.MetricsConfig;
 import java.util.Arrays;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -27,20 +28,26 @@ class PrometheusMetricsRetriever implements MetricsRetriever {
   @Override
   public Flux<RawMetric> retrieve(KafkaCluster c, Node node) {
     log.debug("Retrieving metrics from prometheus exporter: {}:{}", node.host(), c.getMetricsConfig().getPort());
-    var metricsConfig = c.getMetricsConfig();
-    Integer port = Optional.ofNullable(metricsConfig.getPort()).orElse(DEFAULT_EXPORTER_PORT);
-    return retrieve(node.host(), port, metricsConfig.isSsl());
+    return retrieve(node.host(), c.getMetricsConfig());
   }
 
   @VisibleForTesting
-  Flux<RawMetric> retrieve(String host, int port, boolean ssl) {
-    WebClient.ResponseSpec responseSpec = webClient.get()
+  Flux<RawMetric> retrieve(String host, MetricsConfig metricsConfig) {
+    int port = Optional.ofNullable(metricsConfig.getPort()).orElse(DEFAULT_EXPORTER_PORT);
+
+    var request = webClient.get()
         .uri(UriComponentsBuilder.newInstance()
-            .scheme(ssl ? "https" : "http")
+            .scheme(metricsConfig.isSsl() ? "https" : "http")
             .host(host)
             .port(port)
-            .path(METRICS_ENDPOINT_PATH).build().toUri())
-        .retrieve();
+            .path(METRICS_ENDPOINT_PATH).build().toUri());
+
+    if (metricsConfig.getUsername() != null && metricsConfig.getPassword() != null) {
+      request.headers(
+          httpHeaders -> httpHeaders.setBasicAuth(metricsConfig.getUsername(), metricsConfig.getPassword()));
+    }
+
+    WebClient.ResponseSpec responseSpec = request.retrieve();
 
     return responseSpec.bodyToMono(String.class)
         .doOnError(e -> log.error("Error while getting metrics from {}", host, e))
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java
index 36d6c875814..f4e8cdfe757 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java
@@ -1,7 +1,9 @@
 package com.provectus.kafka.ui.service.metrics;
 
+import com.provectus.kafka.ui.model.MetricsConfig;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
@@ -30,8 +32,33 @@ void stopMockServer() throws IOException {
   @Test
   void callsMetricsEndpointAndConvertsResponceToRawMetric() {
     var url = mockWebServer.url("/metrics");
+    mockWebServer.enqueue(prepareResponse());
+
+    MetricsConfig metricsConfig = prepareMetricsConfig(url.port(), null, null);
+
+    StepVerifier.create(retriever.retrieve(url.host(), metricsConfig))
+        .expectNextSequence(expectedRawMetrics())
+        // third metric should not be present, since it has "NaN" value
+        .verifyComplete();
+  }
+
+  @Test
+  void callsSecureMetricsEndpointAndConvertsResponceToRawMetric() {
+    var url = mockWebServer.url("/metrics");
+    mockWebServer.enqueue(prepareResponse());
+
+
+    MetricsConfig metricsConfig = prepareMetricsConfig(url.port(), "username", "password");
+
+    StepVerifier.create(retriever.retrieve(url.host(), metricsConfig))
+        .expectNextSequence(expectedRawMetrics())
+        // third metric should not be present, since it has "NaN" value
+        .verifyComplete();
+  }
+
+  MockResponse prepareResponse() {
     // body copied from real jmx exporter
-    MockResponse response = new MockResponse().setBody(
+    return new MockResponse().setBody(
         "# HELP kafka_server_KafkaRequestHandlerPool_FifteenMinuteRate Attribute exposed for management \n"
             + "# TYPE kafka_server_KafkaRequestHandlerPool_FifteenMinuteRate untyped\n"
             + "kafka_server_KafkaRequestHandlerPool_FifteenMinuteRate{name=\"RequestHandlerAvgIdlePercent\",} 0.898\n"
@@ -40,7 +67,19 @@ void callsMetricsEndpointAndConvertsResponceToRawMetric() {
             + "kafka_server_socket_server_metrics_request_size_avg{listener=\"PLAIN\",networkProcessor=\"1\",} 101.1\n"
             + "kafka_server_socket_server_metrics_request_size_avg{listener=\"PLAIN2\",networkProcessor=\"5\",} NaN"
     );
-    mockWebServer.enqueue(response);
+  }
+
+  MetricsConfig prepareMetricsConfig(Integer port, String username, String password) {
+    return MetricsConfig.builder()
+        .ssl(false)
+        .port(port)
+        .type(MetricsConfig.PROMETHEUS_METRICS_TYPE)
+        .username(username)
+        .password(password)
+        .build();
+  }
+
+  List<RawMetric> expectedRawMetrics() {
 
     var firstMetric = RawMetric.create(
         "kafka_server_KafkaRequestHandlerPool_FifteenMinuteRate",
@@ -48,17 +87,11 @@ void callsMetricsEndpointAndConvertsResponceToRawMetric() {
         new BigDecimal("0.898")
     );
 
-    var second = RawMetric.create(
+    var secondMetric = RawMetric.create(
         "kafka_server_socket_server_metrics_request_size_avg",
         Map.of("listener", "PLAIN", "networkProcessor", "1"),
         new BigDecimal("101.1")
     );
-
-    StepVerifier.create(retriever.retrieve(url.host(), url.port(), false))
-        .expectNext(firstMetric)
-        .expectNext(second)
-        // third metric should not be present, since it has "NaN" value
-        .verifyComplete();
+    return List.of(firstMetric, secondMetric);
   }
-
-}
\ No newline at end of file
+}

From c2d7d70a8ec35809aa7b5a54d4b98eb1925845d8 Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Mon, 16 Jan 2023 18:39:45 +0200
Subject: [PATCH 386/734] [e2e]TopicTests.clearMessageOfTopicFromTopicProfile :
 Clear message of topic from topic profile (#3240)

---
 .../ui/suite/topics/TopicMessagesTests.java   | 66 ++++++++++++++-----
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
index 164a2ff5093..205707a263e 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -15,19 +15,20 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qameta.allure.Issue;
 import io.qase.api.annotation.CaseId;
+import io.qase.api.annotation.Step;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import io.qase.api.annotation.Step;
 import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
@@ -66,6 +67,7 @@ public void beforeAll() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(222)
+  @Order(1)
   @Test
   void produceMessage() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
@@ -86,6 +88,7 @@ void produceMessage() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(19)
+  @Order(2)
   @Test
   void clearMessage() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
@@ -101,12 +104,40 @@ void clearMessage() {
     Assertions.assertEquals(0, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
   }
 
+  @DisplayName("TopicTests.clearMessageOfTopic : Clear message of topic")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(239)
+  @Order(3)
+  @Test
+  void checkClearTopicMessage() {
+    navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_MESSAGES.getName());
+    topicDetails
+        .openDetailsTab(OVERVIEW);
+    produceMessage(TOPIC_TO_CLEAR_MESSAGES);
+    navigateToTopics();
+    assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_MESSAGES.getName()).getNumberOfMessages())
+        .as("getNumberOfMessages()").isEqualTo(1);
+    topicsList
+        .openDotMenuByTopicName(TOPIC_TO_CLEAR_MESSAGES.getName())
+        .clickClearMessagesBtn()
+        .clickConfirmBtnMdl();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicsList.isAlertWithMessageVisible(SUCCESS,
+            String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_MESSAGES.getName())))
+        .as("isAlertWithMessageVisible()").isTrue();
+    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_MESSAGES.getName()).getNumberOfMessages())
+        .as("getNumberOfMessages()").isEqualTo(0);
+    softly.assertAll();
+  }
+
   @Disabled
   @Issue("https://github.com/provectus/kafka-ui/issues/2819")
   @DisplayName("Message copy from topic profile")
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(21)
+  @Order(4)
   @Test
   void copyMessageFromTopicProfile() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
@@ -125,6 +156,7 @@ void copyMessageFromTopicProfile() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(15)
+  @Order(5)
   @Test
   void checkingMessageFilteringByOffset() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
@@ -151,6 +183,7 @@ void checkingMessageFilteringByOffset() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(16)
+  @Order(6)
   @Test
   void checkingMessageFilteringByTimestamp() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
@@ -176,29 +209,27 @@ void checkingMessageFilteringByTimestamp() {
     softly.assertAll();
   }
 
-  @DisplayName("TopicTests.clearMessageOfTopic : Clear message of topic")
+  @Disabled
+  @Issue("https://github.com/provectus/kafka-ui/issues/2778")
+  @DisplayName("Clear message of topic from topic profile")
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(239)
+  @CaseId(246)
+  @Order(7)
   @Test
-  void checkClearTopicMessage() {
-    navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_MESSAGES.getName());
+  void checkClearTopicMessageFromOverviewTab() {
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
     topicDetails
-        .openDetailsTab(OVERVIEW);
-  produceMessage(TOPIC_TO_CLEAR_MESSAGES);
-    navigateToTopics();
-    assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_MESSAGES.getName()).getNumberOfMessages())
-        .as("getNumberOfMessages()").isEqualTo(1);
-    topicsList
-        .openDotMenuByTopicName(TOPIC_TO_CLEAR_MESSAGES.getName())
-        .clickClearMessagesBtn()
+        .openDetailsTab(OVERVIEW)
+        .openDotMenu()
+        .clickClearMessagesMenu()
         .clickConfirmBtnMdl();
     SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicsList.isAlertWithMessageVisible(SUCCESS,
-        String.format("%s messages have been successfully cleared!",TOPIC_TO_CLEAR_MESSAGES.getName())))
+    softly.assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS,
+            String.format("%s messages have been successfully cleared!", TOPIC_FOR_CHECKING_FILTERS.getName())))
         .as("isAlertWithMessageVisible()").isTrue();
-    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_MESSAGES.getName()).getNumberOfMessages())
-        .as("getNumberOfMessages()").isEqualTo(0);
+    softly.assertThat(topicDetails.getMessageCountAmount())
+        .as("getMessageCountAmount()= " + topicDetails.getMessageCountAmount()).isEqualTo(0);
     softly.assertAll();
   }
 
@@ -206,6 +237,7 @@ void checkClearTopicMessage() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(240)
+  @Order(8)
   @Test
   void checkRecreateTopic(){
     navigateToTopicsAndOpenDetails(TOPIC_TO_RECREATE.getName());

From 5d31189609ddb7024d5f16a4f9ed52cbb9022355 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 17 Jan 2023 22:38:44 +0400
Subject: [PATCH 387/734] ISSUE-3222: SchemaRegistrySerde
 checkSchemaExistenceForDeserialize property added (#3235)

---
 .../builtin/sr/SchemaRegistrySerde.java       | 19 ++++---
 .../builtin/sr/SchemaRegistrySerdeTest.java   | 54 ++++++++++++++++---
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index 9c3d0a9d375..a4d7ee8891d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -46,6 +46,7 @@ public static String name() {
   private List<String> schemaRegistryUrls;
   private String valueSchemaNameTemplate;
   private String keySchemaNameTemplate;
+  private boolean checkSchemaExistenceForDeserialize;
 
   private Map<SchemaType, MessageFormatter> schemaRegistryFormatters;
 
@@ -75,7 +76,9 @@ public void autoConfigure(PropertyResolver kafkaClusterProperties,
             kafkaClusterProperties.getProperty("schemaRegistrySSL.truststorePassword", String.class).orElse(null)
         ),
         kafkaClusterProperties.getProperty("schemaRegistryKeySchemaNameTemplate", String.class).orElse("%s-key"),
-        kafkaClusterProperties.getProperty("schemaRegistrySchemaNameTemplate", String.class).orElse("%s-value")
+        kafkaClusterProperties.getProperty("schemaRegistrySchemaNameTemplate", String.class).orElse("%s-value"),
+        kafkaClusterProperties.getProperty("schemaRegistryCheckSchemaExistenceForDeserialize", Boolean.class)
+            .orElse(false)
     );
   }
 
@@ -99,7 +102,9 @@ public void configure(PropertyResolver serdeProperties,
             serdeProperties.getProperty("truststorePassword", String.class).orElse(null)
         ),
         serdeProperties.getProperty("keySchemaNameTemplate", String.class).orElse("%s-key"),
-        serdeProperties.getProperty("schemaNameTemplate", String.class).orElse("%s-value")
+        serdeProperties.getProperty("schemaNameTemplate", String.class).orElse("%s-value"),
+        kafkaClusterProperties.getProperty("checkSchemaExistenceForDeserialize", Boolean.class)
+            .orElse(false)
     );
   }
 
@@ -108,12 +113,14 @@ void configure(
       List<String> schemaRegistryUrls,
       SchemaRegistryClient schemaRegistryClient,
       String keySchemaNameTemplate,
-      String valueSchemaNameTemplate) {
+      String valueSchemaNameTemplate,
+      boolean checkTopicSchemaExistenceForDeserialize) {
     this.schemaRegistryUrls = schemaRegistryUrls;
     this.schemaRegistryClient = schemaRegistryClient;
     this.keySchemaNameTemplate = keySchemaNameTemplate;
     this.valueSchemaNameTemplate = valueSchemaNameTemplate;
     this.schemaRegistryFormatters = MessageFormatter.createMap(schemaRegistryClient);
+    this.checkSchemaExistenceForDeserialize = checkTopicSchemaExistenceForDeserialize;
   }
 
   private static SchemaRegistryClient createSchemaRegistryClient(List<String> urls,
@@ -122,8 +129,7 @@ private static SchemaRegistryClient createSchemaRegistryClient(List<String> urls
                                                                  @Nullable String keyStoreLocation,
                                                                  @Nullable String keyStorePassword,
                                                                  @Nullable String trustStoreLocation,
-                                                                 @Nullable String trustStorePassword
-                                                                 ) {
+                                                                 @Nullable String trustStorePassword) {
     Map<String, String> configs = new HashMap<>();
     if (username != null && password != null) {
       configs.put(BASIC_AUTH_CREDENTIALS_SOURCE, "USER_INFO");
@@ -169,7 +175,8 @@ public Optional<String> getDescription() {
   @Override
   public boolean canDeserialize(String topic, Target type) {
     String subject = schemaSubject(topic, type);
-    return getSchemaBySubject(subject).isPresent();
+    return !checkSchemaExistenceForDeserialize
+        || getSchemaBySubject(subject).isPresent();
   }
 
   @Override
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
index 092b3e8b3c9..4ea2bf3c2ac 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
@@ -22,6 +22,7 @@
 import org.apache.avro.io.Encoder;
 import org.apache.avro.io.EncoderFactory;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -35,7 +36,7 @@ class SchemaRegistrySerdeTest {
   @BeforeEach
   void init() {
     serde = new SchemaRegistrySerde();
-    serde.configure(List.of("wontbeused"), registryClient, "%s-key", "%s-value");
+    serde.configure(List.of("wontbeused"), registryClient, "%s-key", "%s-value", true);
   }
 
   @ParameterizedTest
@@ -129,24 +130,61 @@ void deserializeReturnsJsonAvroMsgJsonRepresentation() throws RestClientExceptio
         .contains(Map.entry("schemaId", schemaId));
   }
 
+  @Nested
+  class SerdeWithDisabledSubjectExistenceCheck {
+
+    @BeforeEach
+    void init() {
+      serde.configure(List.of("wontbeused"), registryClient, "%s-key", "%s-value", false);
+    }
+
+    @Test
+    void canDeserializeAlwaysReturnsTrue() {
+      String topic = RandomString.make(10);
+      assertThat(serde.canDeserialize(topic, Serde.Target.KEY)).isTrue();
+      assertThat(serde.canDeserialize(topic, Serde.Target.VALUE)).isTrue();
+    }
+  }
+
+  @Nested
+  class SerdeWithEnabledSubjectExistenceCheck {
+
+    @BeforeEach
+    void init() {
+      serde.configure(List.of("wontbeused"), registryClient, "%s-key", "%s-value", true);
+    }
+
+    @Test
+    void canDeserializeReturnsTrueIfSubjectExists() throws Exception {
+      String topic = RandomString.make(10);
+      registryClient.register(topic + "-key", new AvroSchema("\"int\""));
+      registryClient.register(topic + "-value", new AvroSchema("\"int\""));
+
+      assertThat(serde.canDeserialize(topic, Serde.Target.KEY)).isTrue();
+      assertThat(serde.canDeserialize(topic, Serde.Target.VALUE)).isTrue();
+    }
+
+    @Test
+    void canDeserializeReturnsFalseIfSubjectDoesNotExist() {
+      String topic = RandomString.make(10);
+      assertThat(serde.canDeserialize(topic, Serde.Target.KEY)).isFalse();
+      assertThat(serde.canDeserialize(topic, Serde.Target.VALUE)).isFalse();
+    }
+  }
+
   @Test
   void canDeserializeAndCanSerializeReturnsTrueIfSubjectExists() throws Exception {
     String topic = RandomString.make(10);
     registryClient.register(topic + "-key", new AvroSchema("\"int\""));
     registryClient.register(topic + "-value", new AvroSchema("\"int\""));
 
-    assertThat(serde.canDeserialize(topic, Serde.Target.KEY)).isTrue();
-    assertThat(serde.canDeserialize(topic, Serde.Target.VALUE)).isTrue();
-
     assertThat(serde.canSerialize(topic, Serde.Target.KEY)).isTrue();
     assertThat(serde.canSerialize(topic, Serde.Target.VALUE)).isTrue();
   }
 
   @Test
-  void canDeserializeAndCanSerializeReturnsFalseIfSubjectDoesNotExist() {
+  void canSerializeReturnsFalseIfSubjectDoesNotExist() {
     String topic = RandomString.make(10);
-    assertThat(serde.canDeserialize(topic, Serde.Target.KEY)).isFalse();
-    assertThat(serde.canDeserialize(topic, Serde.Target.VALUE)).isFalse();
     assertThat(serde.canSerialize(topic, Serde.Target.KEY)).isFalse();
     assertThat(serde.canSerialize(topic, Serde.Target.VALUE)).isFalse();
   }
@@ -178,4 +216,4 @@ private byte[] jsonToAvro(String json, AvroSchema schema) {
     return output.toByteArray();
   }
 
-}
\ No newline at end of file
+}

From ceb9c5dd85ce5543b9863c5bc500e67467c358fb Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Mon, 23 Jan 2023 08:11:00 +0400
Subject: [PATCH 388/734] [FE] Fix URL for Logout button (#3246)

---
 .../components/NavBar/UserInfo/UserInfo.tsx   |  2 +-
 .../UserInfo/__tests__/UserInfo.spec.tsx      | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
index bae205ad03c..a70276afabd 100644
--- a/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
+++ b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
@@ -26,7 +26,7 @@ const UserInfo = () => {
       }
     >
       <DropdownItem>
-        <S.LogoutLink href="/logout">Log out</S.LogoutLink>
+        <S.LogoutLink href={`${window.basePath}/logout`}>Log out</S.LogoutLink>
       </DropdownItem>
     </Dropdown>
   ) : null;
diff --git a/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx b/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx
index f474783c471..b51f00da024 100644
--- a/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx
+++ b/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx
@@ -22,6 +22,10 @@ describe('UserInfo', () => {
 
   it('should render the userInfo during click opens the dropdown', async () => {
     const username = 'someName';
+    Object.defineProperty(window, 'basePath', {
+      value: '',
+      writable: true,
+    });
     (useUserInfo as jest.Mock).mockImplementation(() => ({ username }));
 
     renderComponent();
@@ -33,6 +37,22 @@ describe('UserInfo', () => {
     expect(logout).toHaveAttribute('href', '/logout');
   });
 
+  it('should render correct url during basePath initialization', async () => {
+    const username = 'someName';
+    const baseUrl = '/path';
+    Object.defineProperty(window, 'basePath', {
+      value: baseUrl,
+      writable: true,
+    });
+    (useUserInfo as jest.Mock).mockImplementation(() => ({ username }));
+
+    renderComponent();
+
+    const logout = screen.getByText('Log out');
+    expect(logout).toBeInTheDocument();
+    expect(logout).toHaveAttribute('href', `${baseUrl}/logout`);
+  });
+
   it('should not render anything if the username does not exists', () => {
     (useUserInfo as jest.Mock).mockImplementation(() => ({
       username: undefined,

From 0ff8c0d4fb9d7ea4d075a2c65f6f14144d4c6a1f Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Mon, 23 Jan 2023 18:27:55 +0400
Subject: [PATCH 389/734] Polish workflow names (#3232)

* Change workflow names

* chnage name

* Update branch-deploy.yml

* Update documentation.yaml

* Update branch-remove.yml

* Update backend.yml

* Update frontend.yaml

* Update helm.yaml

* Update master.yaml

* Update e2e-checks.yaml

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/backend.yml                 | 2 +-
 .github/workflows/branch-deploy.yml           | 2 +-
 .github/workflows/branch-remove.yml           | 2 +-
 .github/workflows/create-branch-for-helm.yaml | 2 +-
 .github/workflows/documentation.yaml          | 2 +-
 .github/workflows/e2e-checks.yaml             | 2 +-
 .github/workflows/frontend.yaml               | 2 +-
 .github/workflows/helm.yaml                   | 2 +-
 .github/workflows/master.yaml                 | 2 +-
 .github/workflows/release-serde-api.yaml      | 2 +-
 .github/workflows/terraform-deploy.yml        | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 17a2fc10078..dc4700458f2 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -1,4 +1,4 @@
-name: backend
+name: Backend build and test
 on:
   push:
     branches:
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 0cd0ebb8939..aeb9951dc8d 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -1,4 +1,4 @@
-name: DeployFromBranch
+name: Feature testing init
 on:
   workflow_dispatch:
 
diff --git a/.github/workflows/branch-remove.yml b/.github/workflows/branch-remove.yml
index 59024af6cbd..c93fa89eba2 100644
--- a/.github/workflows/branch-remove.yml
+++ b/.github/workflows/branch-remove.yml
@@ -1,4 +1,4 @@
-name: RemoveCustomDeployment
+name: Feature testing destroy
 on:
   workflow_dispatch:
   pull_request:
diff --git a/.github/workflows/create-branch-for-helm.yaml b/.github/workflows/create-branch-for-helm.yaml
index b3e7d5f4ed8..d755e3da8f0 100644
--- a/.github/workflows/create-branch-for-helm.yaml
+++ b/.github/workflows/create-branch-for-helm.yaml
@@ -1,4 +1,4 @@
-name: prepare-helm-release
+name: Prepare helm release
 on:
   repository_dispatch:
     types: [prepare-helm-release]
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
index 5fef435fc9c..70fff483dab 100644
--- a/.github/workflows/documentation.yaml
+++ b/.github/workflows/documentation.yaml
@@ -1,4 +1,4 @@
-name: Documentation
+name: Documentation URLs linter
 on:
   pull_request:
     types:
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 7725d33d4a1..89e9d71f0ba 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -1,4 +1,4 @@
-name: e2e-checks
+name: E2E tests
 on:
   pull_request_target:
     types: ["opened", "edited", "reopened", "synchronize"]
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index baa2551d1c5..ff877db5595 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -1,4 +1,4 @@
-name: frontend
+name: Frontend build and test
 on:
   push:
     branches:
diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
index b8c88a43057..427c63e0b32 100644
--- a/.github/workflows/helm.yaml
+++ b/.github/workflows/helm.yaml
@@ -1,4 +1,4 @@
-name: Helm
+name: Helm linter
 on:
  pull_request:
   types: ["opened", "edited", "reopened", "synchronize"]
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 4d1173958bd..6baa4c8835f 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -1,4 +1,4 @@
-name: Master
+name: Master branch build & deploy
 on:
   workflow_dispatch:
   push:
diff --git a/.github/workflows/release-serde-api.yaml b/.github/workflows/release-serde-api.yaml
index 227dbcec24c..e9a35ee30ea 100644
--- a/.github/workflows/release-serde-api.yaml
+++ b/.github/workflows/release-serde-api.yaml
@@ -1,4 +1,4 @@
-name: Release-serde-api
+name: Release serde api
 on: workflow_dispatch
 
 jobs:
diff --git a/.github/workflows/terraform-deploy.yml b/.github/workflows/terraform-deploy.yml
index 8ec07be0a9a..6df90e7338b 100644
--- a/.github/workflows/terraform-deploy.yml
+++ b/.github/workflows/terraform-deploy.yml
@@ -1,4 +1,4 @@
-name: terraform_deploy
+name: Terraform deploy
 on:
   workflow_dispatch:
     inputs:

From 9cfa184cea9e3273673d955806a0d21700be8e8b Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Mon, 23 Jan 2023 18:05:00 +0200
Subject: [PATCH 390/734] [e2e]TopicTests.purgeMessagesOfTopics : Purge
 messages of topics (#3254)

* [e2e] Create common method for produce message in TopicMessagesTests

* [e2e]TopicTests.purgeMessagesOfTopics : Purge messages of topics. First fix

* [e2e]TopicTests.purgeMessagesOfTopics : Purge messages of topics. First fix

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../provectus/kafka/ui/pages/BasePage.java    | 11 ++++
 .../kafka/ui/pages/topic/TopicDetails.java    |  3 +-
 .../kafka/ui/pages/topic/TopicsList.java      | 17 +++++
 .../ui/suite/topics/TopicMessagesTests.java   | 64 +++++++++++++++----
 4 files changed, 79 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index 8b12d3b0d3f..afe95432ca8 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -19,7 +19,9 @@ public abstract class BasePage extends WebUtils {
   protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
   protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
   protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
+  protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
   protected SelenideElement confirmBtn = $x("//button[contains(text(),'Confirm')]");
+  protected SelenideElement cancelBtn = $x("//button[contains(text(),'Cancel')]");
   protected ElementsCollection allGridItems = $$x("//tr[@class]");
   protected String summaryCellLocator = "//div[contains(text(),'%s')]";
   protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
@@ -74,6 +76,15 @@ protected void clickConfirmButton() {
     confirmBtn.shouldBe(Condition.disappear);
   }
 
+  protected void clickCancelButton() {
+    cancelBtn.shouldBe(Condition.enabled).click();
+    cancelBtn.shouldBe(Condition.disappear);
+  }
+
+  protected boolean isConfirmationModalVisible() {
+    return isVisible(confirmationMdl);
+  }
+
   public enum AlertHeader {
     SUCCESS("Success"),
     VALIDATION_ERROR("Validation Error"),
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
index 1de0478abec..119f602a402 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
@@ -51,7 +51,6 @@ public class TopicDetails extends BasePage {
   protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
   protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
   protected SelenideElement backToCreateFiltersLink = $x("//div[text()='Back To create filters']");
-  protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
   protected ElementsCollection messageGridItems = $$x("//tbody//tr");
   protected SelenideElement actualCalendarDate = $x("//div[@class='react-datepicker__current-month']");
   protected SelenideElement previousMonthButton = $x("//button[@aria-label='Previous Month']");
@@ -103,7 +102,7 @@ public TopicDetails clickEditSettingsMenu() {
 
   @Step
   public boolean isConfirmationMdlVisible(){
-    return isVisible(confirmationMdl);
+    return isConfirmationModalVisible();
   }
 
   @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
index 9db1d18c8bd..6280ffe8a47 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
@@ -87,6 +87,12 @@ public TopicsList clickCopySelectedTopicBtn(){
       return this;
     }
 
+    @Step
+    public TopicsList clickPurgeMessagesOfSelectedTopicsBtn(){
+    purgeMessagesOfSelectedTopicsBtn.shouldBe(Condition.enabled).click();
+    return this;
+    }
+
     @Step
     public TopicsList clickClearMessagesBtn(){
       clickByJavaScript(clearMessagesBtn.shouldBe(visible));
@@ -111,6 +117,17 @@ public TopicsList clickConfirmBtnMdl() {
     return this;
     }
 
+    @Step
+    public TopicsList clickCancelBtnMdl(){
+      clickCancelButton();
+      return this;
+    }
+
+    @Step
+    public boolean isConfirmationMdlVisible(){
+      return isConfirmationModalVisible();
+    }
+
     @Step
     public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
       return isAlertVisible(header, message);
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
index 205707a263e..4993a2d4837 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
@@ -40,8 +40,8 @@ public class TopicMessagesTests extends BaseTest {
       .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
       .setMessageKey(randomAlphabetic(5))
       .setMessageContent(randomAlphabetic(10));
-  private static final Topic TOPIC_TO_CLEAR_MESSAGES = new Topic()
-      .setName("topic-to-clear-message-attribute-" + randomAlphabetic(5))
+  private static final Topic TOPIC_TO_CLEAR_AND_PURGE_MESSAGES = new Topic()
+      .setName("topic-to-clear-and-purge-messages-attribute-" + randomAlphabetic(5))
       .setMessageKey(randomAlphabetic(5))
       .setMessageContent(randomAlphabetic(10));
   private static final Topic TOPIC_FOR_CHECKING_FILTERS = new Topic()
@@ -56,7 +56,8 @@ public class TopicMessagesTests extends BaseTest {
 
   @BeforeAll
   public void beforeAll() {
-    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECKING_FILTERS, TOPIC_TO_CLEAR_MESSAGES, TOPIC_TO_RECREATE));
+    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECKING_FILTERS, TOPIC_TO_CLEAR_AND_PURGE_MESSAGES,
+        TOPIC_TO_RECREATE));
     TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
     IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
     waitUntilNewMinuteStarted();
@@ -111,22 +112,57 @@ void clearMessage() {
   @Order(3)
   @Test
   void checkClearTopicMessage() {
-    navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_MESSAGES.getName());
+    navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
     topicDetails
         .openDetailsTab(OVERVIEW);
-    produceMessage(TOPIC_TO_CLEAR_MESSAGES);
+    produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
     navigateToTopics();
-    assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_MESSAGES.getName()).getNumberOfMessages())
+    assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages())
         .as("getNumberOfMessages()").isEqualTo(1);
     topicsList
-        .openDotMenuByTopicName(TOPIC_TO_CLEAR_MESSAGES.getName())
+        .openDotMenuByTopicName(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
         .clickClearMessagesBtn()
         .clickConfirmBtnMdl();
     SoftAssertions softly = new SoftAssertions();
     softly.assertThat(topicsList.isAlertWithMessageVisible(SUCCESS,
-            String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_MESSAGES.getName())))
+            String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())))
         .as("isAlertWithMessageVisible()").isTrue();
-    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_MESSAGES.getName()).getNumberOfMessages())
+    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages())
+        .as("getNumberOfMessages()").isEqualTo(0);
+    softly.assertAll();
+  }
+
+  @DisplayName("TopicTests.purgeMessagesOfTopics : Purge messages of topics")
+  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(10)
+  @Order(4)
+  @Test
+  void checkPurgeMessagePossibility(){
+    navigateToTopics();
+    int messageAmount = topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages();
+    topicsList
+        .openTopic(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
+    topicDetails
+        .openDetailsTab(OVERVIEW);
+    produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
+    navigateToTopics();
+    assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages())
+        .as("getNumberOfMessages()").isEqualTo(messageAmount +1);
+    topicsList
+        .getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
+        .selectItem(true)
+        .clickPurgeMessagesOfSelectedTopicsBtn();
+    assertThat(topicsList.isConfirmationMdlVisible()).as("isConfirmationMdlVisible()").isTrue();
+    topicsList
+        .clickCancelBtnMdl()
+        .clickPurgeMessagesOfSelectedTopicsBtn()
+        .clickConfirmBtnMdl();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicsList.isAlertWithMessageVisible(SUCCESS,
+            String.format("%s messages have been successfully cleared!",TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())))
+        .as("isAlertWithMessageVisible()").isTrue();
+    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages())
         .as("getNumberOfMessages()").isEqualTo(0);
     softly.assertAll();
   }
@@ -137,7 +173,7 @@ void checkClearTopicMessage() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(21)
-  @Order(4)
+  @Order(5)
   @Test
   void copyMessageFromTopicProfile() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
@@ -156,7 +192,7 @@ void copyMessageFromTopicProfile() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(15)
-  @Order(5)
+  @Order(6)
   @Test
   void checkingMessageFilteringByOffset() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
@@ -183,7 +219,7 @@ void checkingMessageFilteringByOffset() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(16)
-  @Order(6)
+  @Order(7)
   @Test
   void checkingMessageFilteringByTimestamp() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
@@ -215,7 +251,7 @@ void checkingMessageFilteringByTimestamp() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(246)
-  @Order(7)
+  @Order(8)
   @Test
   void checkClearTopicMessageFromOverviewTab() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
@@ -237,7 +273,7 @@ void checkClearTopicMessageFromOverviewTab() {
   @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
   @AutomationStatus(status = Status.AUTOMATED)
   @CaseId(240)
-  @Order(8)
+  @Order(9)
   @Test
   void checkRecreateTopic(){
     navigateToTopicsAndOpenDetails(TOPIC_TO_RECREATE.getName());

From ded4e268252cd463989f50eada4100266ced8e13 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 24 Jan 2023 12:52:27 +0400
Subject: [PATCH 391/734] [BE] Chore: ConfigTest stats initialization added
 (#3260)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../provectus/kafka/ui/service/ConfigTest.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ConfigTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ConfigTest.java
index 290a926ccf2..6bc114b4119 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ConfigTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ConfigTest.java
@@ -4,10 +4,13 @@
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.model.BrokerConfigDTO;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.ServerStatusDTO;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
@@ -19,6 +22,18 @@ public class ConfigTest extends AbstractIntegrationTest {
   @Autowired
   private WebTestClient webTestClient;
 
+  @BeforeEach
+  void waitUntilStatsInitialized() {
+    Awaitility.await()
+        .atMost(Duration.ofSeconds(10))
+        .pollInSameThread()
+        .until(() -> {
+          var stats = applicationContext.getBean(StatisticsCache.class)
+              .get(KafkaCluster.builder().name(LOCAL).build());
+          return stats.getStatus() == ServerStatusDTO.ONLINE;
+        });
+  }
+
   @Test
   public void testAlterConfig() {
     String name = "background.threads";

From 0e671a939646eb283e529ea976d5b2e1fa91fcb5 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Tue, 24 Jan 2023 12:52:54 +0400
Subject: [PATCH 392/734] [Helm] Add variable for pathtype (#3259)

---
 charts/kafka-ui/Chart.yaml             | 2 +-
 charts/kafka-ui/templates/ingress.yaml | 6 +++---
 charts/kafka-ui/values.yaml            | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 28e1a892aac..3a1759a3911 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.5.1
+version: 0.5.2
 appVersion: v0.5.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/ingress.yaml b/charts/kafka-ui/templates/ingress.yaml
index e4b33439c42..13e746d8d1b 100644
--- a/charts/kafka-ui/templates/ingress.yaml
+++ b/charts/kafka-ui/templates/ingress.yaml
@@ -35,7 +35,7 @@ spec:
 {{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") $isHigher1p19 -}}
           {{- range .Values.ingress.precedingPaths }}
           - path: {{ .path }}
-            pathType: Prefix
+            pathType: {{ .Values.ingress.pathType }}
             backend:
               service:
                 name: {{ .serviceName }}
@@ -47,13 +47,13 @@ spec:
                 name: {{ $fullName }}
                 port:
                   number: {{ $svcPort }}
-            pathType: Prefix
+            pathType: {{ .Values.ingress.pathType }}
 {{- if .Values.ingress.path }}
             path: {{ .Values.ingress.path }}
 {{- end }}
           {{- range .Values.ingress.succeedingPaths }}
           - path: {{ .path }}
-            pathType: Prefix
+            pathType: {{ .Values.ingress.pathType }}
             backend:
               service:
                 name: {{ .serviceName }}
diff --git a/charts/kafka-ui/values.yaml b/charts/kafka-ui/values.yaml
index dce32059e14..3c30b408134 100644
--- a/charts/kafka-ui/values.yaml
+++ b/charts/kafka-ui/values.yaml
@@ -111,6 +111,9 @@ ingress:
   # The path for the Ingress
   path: "/"
 
+  # The path type for the Ingress
+  pathType: "Prefix"  
+
   # The hostname for the Ingress
   host: ""
 

From 43fcf6dce17283adc963f8661abe5b3e0410372d Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 26 Jan 2023 11:12:59 +0400
Subject: [PATCH 393/734] [BE] Suppressing failures when describe log dirs not
 supported (#3262)

* Suppressing failures when describe log dirs not supported
---
 README.md                                      |  1 -
 .../kafka/ui/config/ClustersProperties.java    |  1 -
 .../provectus/kafka/ui/model/KafkaCluster.java |  1 -
 .../kafka/ui/service/KafkaClusterFactory.java  |  1 -
 .../kafka/ui/service/ReactiveAdminClient.java  |  8 +++++++-
 .../kafka/ui/service/StatisticsService.java    | 18 ++++++++++--------
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index a0ca023bc04..b66ac8f37f1 100644
--- a/README.md
+++ b/README.md
@@ -199,7 +199,6 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_METRICS_PORT`        	 |Open metrics port of a broker
 |`KAFKA_CLUSTERS_0_METRICS_TYPE`        	 |Type of metrics retriever to use. Valid values are JMX (default) or PROMETHEUS. If Prometheus, then metrics are read from prometheus-jmx-exporter instead of jmx
 |`KAFKA_CLUSTERS_0_READONLY`        	|Enable read-only mode. Default: false
-|`KAFKA_CLUSTERS_0_DISABLELOGDIRSCOLLECTION`        	|Disable collecting segments information. It should be true for confluent cloud. Default: false
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME` |Given name for the Kafka Connect cluster
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS` |Address of the Kafka Connect service endpoint
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_USERNAME`| Kafka Connect cluster's basic authentication username
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index e709f33d4f4..01d4de12570 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -38,7 +38,6 @@ public static class Cluster {
     MetricsConfigData metrics;
     Properties properties;
     boolean readOnly = false;
-    boolean disableLogDirsCollection = false;
     List<SerdeConfig> serde = new ArrayList<>();
     String defaultKeySerde;
     String defaultValueSerde;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
index d87113633f5..9933d7e4675 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
@@ -26,7 +26,6 @@ public class KafkaCluster {
   private final String bootstrapServers;
   private final Properties properties;
   private final boolean readOnly;
-  private final boolean disableLogDirsCollection;
   private final MetricsConfig metricsConfig;
   private final DataMasking masking;
   private final Supplier<PollingThrottler> throttler;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
index b1000131eec..7113f5af367 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
@@ -39,7 +39,6 @@ public KafkaCluster create(ClustersProperties.Cluster clusterProperties) {
     builder.bootstrapServers(clusterProperties.getBootstrapServers());
     builder.properties(Optional.ofNullable(clusterProperties.getProperties()).orElse(new Properties()));
     builder.readOnly(clusterProperties.isReadOnly());
-    builder.disableLogDirsCollection(clusterProperties.isDisableLogDirsCollection());
     builder.masking(DataMasking.create(clusterProperties.getMasking()));
     builder.metricsConfig(metricsConfigDataToMetricsConfig(clusterProperties.getMetrics()));
     builder.throttler(PollingThrottler.throttlerSupplier(clusterProperties));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index b24180fa48d..ea56edcf96e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -66,6 +66,7 @@
 import org.apache.kafka.common.errors.GroupNotEmptyException;
 import org.apache.kafka.common.errors.InvalidRequestException;
 import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
+import org.apache.kafka.common.errors.UnsupportedVersionException;
 import org.apache.kafka.common.requests.DescribeLogDirsResponse;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -297,7 +298,12 @@ public Mono<Map<Integer, Map<String, DescribeLogDirsResponse.LogDirInfo>>> descr
 
   public Mono<Map<Integer, Map<String, DescribeLogDirsResponse.LogDirInfo>>> describeLogDirs(
       Collection<Integer> brokerIds) {
-    return toMono(client.describeLogDirs(brokerIds).all());
+    return toMono(client.describeLogDirs(brokerIds).all())
+        .onErrorResume(UnsupportedVersionException.class, th -> Mono.just(Map.of()))
+        .onErrorResume(th -> true, th -> {
+          log.warn("Error while calling describeLogDirs", th);
+          return Mono.just(Map.of());
+        });
   }
 
   public Mono<ClusterDescription> describeCluster() {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
index 9f0b9389996..e6dbb27ee9f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
@@ -1,5 +1,7 @@
 package com.provectus.kafka.ui.service;
 
+import static com.provectus.kafka.ui.service.ReactiveAdminClient.ClusterDescription;
+
 import com.provectus.kafka.ui.model.Feature;
 import com.provectus.kafka.ui.model.InternalLogDirStats;
 import com.provectus.kafka.ui.model.KafkaCluster;
@@ -9,10 +11,12 @@
 import com.provectus.kafka.ui.service.metrics.MetricsCollector;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.apache.kafka.clients.admin.TopicDescription;
+import org.apache.kafka.common.Node;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
@@ -21,7 +25,7 @@
 @Slf4j
 public class StatisticsService {
 
-  private final MetricsCollector metricsClusterUtil;
+  private final MetricsCollector metricsCollector;
   private final AdminClientService adminClientService;
   private final FeatureService featureService;
   private final StatisticsCache cache;
@@ -35,8 +39,8 @@ private Mono<Statistics> getStatistics(KafkaCluster cluster) {
             ac.describeCluster().flatMap(description ->
                 Mono.zip(
                     List.of(
-                        metricsClusterUtil.getBrokerMetrics(cluster, description.getNodes()),
-                        getLogDirInfo(cluster, ac),
+                        metricsCollector.getBrokerMetrics(cluster, description.getNodes()),
+                        getLogDirInfo(description, ac),
                         featureService.getAvailableFeatures(cluster, description.getController()),
                         loadTopicConfigs(cluster),
                         describeTopics(cluster)),
@@ -58,11 +62,9 @@ private Mono<Statistics> getStatistics(KafkaCluster cluster) {
             e -> Mono.just(Statistics.empty().toBuilder().lastKafkaException(e).build()));
   }
 
-  private Mono<InternalLogDirStats> getLogDirInfo(KafkaCluster cluster, ReactiveAdminClient c) {
-    if (!cluster.isDisableLogDirsCollection()) {
-      return c.describeLogDirs().map(InternalLogDirStats::new);
-    }
-    return Mono.just(InternalLogDirStats.empty());
+  private Mono<InternalLogDirStats> getLogDirInfo(ClusterDescription desc, ReactiveAdminClient ac) {
+    var brokerIds = desc.getNodes().stream().map(Node::id).collect(Collectors.toSet());
+    return ac.describeLogDirs(brokerIds).map(InternalLogDirStats::new);
   }
 
   private Mono<Map<String, TopicDescription>> describeTopics(KafkaCluster c) {

From 640777dbdab2d3da6324edfb3bdac066ff1727fe Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Mon, 30 Jan 2023 18:13:56 +0200
Subject: [PATCH 394/734] [e2e]TopicTests.editSettingsOfTopic : Edit settings
 of topic (#3271)

* [e2e] Create common method for produce message in TopicMessagesTests

* [e2e]TopicTests.editSettingsOfTopic : Edit settings of topic

* [e2e]TopicTests.editSettingsOfTopic : Edit settings of topic

* [e2e]TopicTests.editSettingsOfTopic : Edit settings of topic.         waitUntilScreenReady() Fix

* [e2e]TopicTests.editSettingsOfTopic : Edit settings of topic.         waitUntilScreenReady() Fix 2
---
 .../com/provectus/kafka/ui/models/Topic.java  |  2 +
 .../ui/pages/topic/TopicCreateEditForm.java   | 16 ++++----
 .../ui/pages/topic/enums/TimeToRetain.java    | 25 +++++++++++
 .../kafka/ui/suite/topics/TopicsTests.java    | 41 ++++++++++++++-----
 4 files changed, 67 insertions(+), 17 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/TimeToRetain.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
index 53c234c8d38..16b3ef6e2fb 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
@@ -3,6 +3,7 @@
 import com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue;
 import com.provectus.kafka.ui.pages.topic.enums.CustomParameterType;
 import com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk;
+import com.provectus.kafka.ui.pages.topic.enums.TimeToRetain;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -14,4 +15,5 @@ public class Topic {
     private CustomParameterType customParameterType;
     private CleanupPolicyValue cleanupPolicyValue;
     private MaxSizeOnDisk maxSizeOnDisk;
+    private TimeToRetain timeToRetain;
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
index 3822cca257a..1ad65bdb36d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
@@ -13,6 +13,7 @@
 import com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue;
 import com.provectus.kafka.ui.pages.topic.enums.CustomParameterType;
 import com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk;
+import com.provectus.kafka.ui.pages.topic.enums.TimeToRetain;
 import io.qameta.allure.Step;
 
 public class TopicCreateEditForm extends BasePage {
@@ -30,6 +31,8 @@ public class TopicCreateEditForm extends BasePage {
   protected SelenideElement customParameterValueField = $x("//input[@placeholder='Value']");
   protected SelenideElement validationCustomParameterValueMsg = $x("//p[contains(text(),'Value is required')]");
   protected String ddlElementLocator = "//li[@value='%s']";
+  protected String btnTimeToRetainLocator = "//button[@class][text()='%s']";
+
 
   @Step
   public TopicCreateEditForm waitUntilScreenReady() {
@@ -46,6 +49,10 @@ public boolean isDeleteCustomParameterButtonEnabled() {
     return isEnabled(deleteCustomParameterBtn);
   }
 
+  public boolean isNameFieldEnabled(){
+    return isEnabled(nameField);
+  }
+
   @Step
   public TopicCreateEditForm setTopicName(String topicName) {
     nameField.shouldBe(Condition.enabled).clear();
@@ -118,13 +125,8 @@ public TopicCreateEditForm setNumberOfPartitions(int partitions) {
   }
 
   @Step
-  public TopicCreateEditForm setTimeToRetainDataInMsUsingButtons(String value) {
-    timeToRetainField
-        .parent()
-        .parent()
-        .$$("button")
-        .find(Condition.exactText(value))
-        .click();
+  public TopicCreateEditForm setTimeToRetainDataByButtons(TimeToRetain timeToRetain) {
+    $x(String.format(btnTimeToRetainLocator, timeToRetain.getButton())).shouldBe(Condition.enabled).click();
     return this;
   }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/TimeToRetain.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/TimeToRetain.java
new file mode 100644
index 00000000000..9d42bf800f4
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/TimeToRetain.java
@@ -0,0 +1,25 @@
+package com.provectus.kafka.ui.pages.topic.enums;
+
+public enum TimeToRetain {
+  BTN_12_HOURS("12 hours", "43200000"),
+  BTN_1_DAY("1 day", "86400000"),
+  BTN_2_DAYS("2 days", "172800000"),
+  BTN_7_DAYS("7 days", "604800000"),
+  BTN_4_WEEKS("4 weeks", "2419200000");
+
+  private final String button;
+  private final String value;
+
+  TimeToRetain(String button, String value) {
+    this.button = button;
+    this.value = value;
+  }
+
+  public String getButton(){
+    return button;
+  }
+
+  public String getValue(){
+    return value;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index b70daa33079..7f301835c8a 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -8,7 +8,9 @@
 import static com.provectus.kafka.ui.pages.topic.enums.CustomParameterType.COMPRESSION_TYPE;
 import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.NOT_SET;
 import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_1_GB;
-import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_20_GB;
+import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_50_GB;
+import static com.provectus.kafka.ui.pages.topic.enums.TimeToRetain.BTN_2_DAYS;
+import static com.provectus.kafka.ui.pages.topic.enums.TimeToRetain.BTN_7_DAYS;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
 import static org.apache.commons.lang3.RandomUtils.nextInt;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -50,10 +52,10 @@ public class TopicsTests extends BaseTest {
   private static final Topic TOPIC_TO_UPDATE_AND_DELETE = new Topic()
       .setName("topic-to-update-and-delete-" + randomAlphabetic(5))
       .setNumberOfPartitions(1)
-      .setCleanupPolicyValue(COMPACT)
-      .setTimeToRetainData("604800001")
-      .setMaxSizeOnDisk(SIZE_20_GB)
-      .setMaxMessageBytes("1000020")
+      .setCleanupPolicyValue(DELETE)
+      .setTimeToRetain(BTN_7_DAYS)
+      .setMaxSizeOnDisk(NOT_SET)
+      .setMaxMessageBytes("1048588")
       .setMessageKey(randomAlphabetic(5))
       .setMessageContent(randomAlphabetic(10));
   private static final Topic TOPIC_TO_CHECK_SETTINGS = new Topic()
@@ -132,24 +134,43 @@ public void updateTopic() {
         .openDotMenu()
         .clickEditSettingsMenu();
     topicCreateEditForm
-        .waitUntilScreenReady()
+        .waitUntilScreenReady();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()")
+        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText());
+    softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()")
+        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue());
+    softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()")
+        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText());
+    softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()")
+        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes());
+    softly.assertAll();
+    TOPIC_TO_UPDATE_AND_DELETE
+        .setCleanupPolicyValue(COMPACT)
+        .setTimeToRetain(BTN_2_DAYS)
+        .setMaxSizeOnDisk(SIZE_50_GB).setMaxMessageBytes("1048589");
+    topicCreateEditForm
         .selectCleanupPolicy((TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue()))
-        .setMinInsyncReplicas(10)
-        .setTimeToRetainDataInMs(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetainData())
+        .setTimeToRetainDataByButtons(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain())
         .setMaxSizeOnDiskInGB(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk())
         .setMaxMessageBytes(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes())
         .clickCreateTopicBtn();
+    softly.assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully updated."))
+        .as("isAlertWithMessageVisible()").isTrue();
+    softly.assertThat(topicDetails.isTopicHeaderVisible(TOPIC_TO_UPDATE_AND_DELETE.getName()))
+        .as("isTopicHeaderVisible()").isTrue();
+    softly.assertAll();
     topicDetails
         .waitUntilScreenReady();
     navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
     topicDetails
         .openDotMenu()
         .clickEditSettingsMenu();
-    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(topicCreateEditForm.isNameFieldEnabled()).as("isNameFieldEnabled()").isFalse();
     softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()")
         .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText());
     softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()")
-        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetainData());
+        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue());
     softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()")
         .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText());
     softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()")

From 1b0925141988d8f0a9a5370b2dbe45a5e55f823a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Batuhan=20K=C3=BC=C3=A7=C3=BCkali?=
 <mail@batuhankucukali.com>
Date: Tue, 31 Jan 2023 10:55:21 +0300
Subject: [PATCH 395/734] [BE] Fix case-sensitive search in broker's topics
 (#3276)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../com/provectus/kafka/ui/controller/TopicsController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
index c9cfca18e83..a587d53770a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
@@ -175,7 +175,7 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName,
           List<InternalTopic> filtered = existingTopics.stream()
               .filter(topic -> !topic.isInternal()
                   || showInternal != null && showInternal)
-              .filter(topic -> search == null || StringUtils.contains(topic.getName(), search))
+              .filter(topic -> search == null || StringUtils.containsIgnoreCase(topic.getName(), search))
               .sorted(comparator)
               .toList();
           var totalPages = (filtered.size() / pageSize)

From d1f04e05bb21081e1e08b4315129b9be6d8c0c38 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 31 Jan 2023 11:57:21 +0400
Subject: [PATCH 396/734] [Be] Fix MessagesServiceTest, waiting of kafka write
 added (#3287)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../com/provectus/kafka/ui/service/MessagesServiceTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
index ec2ae985f17..75a69adec71 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
@@ -61,12 +61,12 @@ void loadMessagesReturnsExceptionWhenTopicNotFound() {
   }
 
   @Test
-  void maskingAppliedOnConfiguredClusters() {
+  void maskingAppliedOnConfiguredClusters() throws Exception {
     String testTopic = MASKED_TOPICS_PREFIX + UUID.randomUUID();
     try (var producer = KafkaTestProducer.forKafka(kafka)) {
       createTopic(new NewTopic(testTopic, 1, (short) 1));
       producer.send(testTopic, "message1");
-      producer.send(testTopic, "message2");
+      producer.send(testTopic, "message2").get();
 
       Flux<TopicMessageDTO> msgsFlux = messagesService.loadMessages(
           cluster,
@@ -91,4 +91,4 @@ void maskingAppliedOnConfiguredClusters() {
     }
   }
 
-}
\ No newline at end of file
+}

From 9f9bd36b0fbf17776bc520e1e4dc4eb85a4a0b09 Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:24:31 +0800
Subject: [PATCH 397/734] Display offline ISR by Partition on Topic overview
 (#2887)

* Display In Sync Replicas (ISR) by Partition on Topic overview (#2703)

* add unit test

---------

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Topics/Topic/Overview/Overview.styled.ts        | 10 ++++++++--
 .../components/Topics/Topic/Overview/Overview.tsx   |  3 ++-
 .../Topic/Overview/__test__/Overview.spec.tsx       | 13 +++++++++++++
 kafka-ui-react-app/src/theme/theme.ts               |  3 +++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.styled.ts
index a64db26117e..d274a1ba9d9 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.styled.ts
@@ -2,9 +2,15 @@ import styled from 'styled-components';
 
 export const Replica = styled.span.attrs({ 'aria-label': 'replica-info' })<{
   leader?: boolean;
+  outOfSync?: boolean;
 }>`
-  color: ${({ leader, theme }) =>
-    leader ? theme.topicMetaData.liderReplica.color : null};
+  color: ${({ leader, outOfSync, theme }) => {
+    if (outOfSync) return theme.topicMetaData.outOfSync.color;
+    if (leader) return theme.topicMetaData.liderReplica.color;
+    return null;
+  }};
+
+  font-weight: ${({ outOfSync }) => (outOfSync ? '500' : null)};
 
   &:after {
     content: ', ';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
index f2f133f89d9..c639ac2b625 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/Overview.tsx
@@ -51,9 +51,10 @@ const Overview: React.FC = () => {
           if (replicas === undefined || replicas.length === 0) {
             return 0;
           }
-          return replicas?.map(({ broker, leader }: Replica) => (
+          return replicas?.map(({ broker, leader, inSync }: Replica) => (
             <S.Replica
               leader={leader}
+              outOfSync={!inSync}
               key={broker}
               title={leader ? 'Leader' : ''}
             >
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
index d248757853d..d02b2b228cb 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
@@ -75,6 +75,19 @@ describe('Overview', () => {
     );
   });
 
+  describe('when replicas out of sync', () => {
+    it('should be the appropriate color', () => {
+      render(<Replica outOfSync />);
+      const element = screen.getByLabelText('replica-info');
+      expect(element).toBeInTheDocument();
+      expect(element).toHaveStyleRule(
+        'color',
+        theme.topicMetaData.outOfSync.color
+      );
+      expect(element).toHaveStyleRule('font-weight', '500');
+    });
+  });
+
   describe('when it has internal flag', () => {
     it('renders the Action button for Topic', () => {
       renderComponent({
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index d642bf3b94d..9eb8ac3fc79 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -517,6 +517,9 @@ const theme = {
     liderReplica: {
       color: Colors.green[60],
     },
+    outOfSync: {
+      color: Colors.red[50],
+    },
   },
   dangerZone: {
     borderColor: Colors.neutral[10],

From fdf8db98a22c7403c2910b326dbe6458d3ddcbba Mon Sep 17 00:00:00 2001
From: Mgrdich <46796009+Mgrdich@users.noreply.github.com>
Date: Wed, 1 Feb 2023 11:25:16 +0400
Subject: [PATCH 398/734] Fix json paths in field previews (#3028)

* Fix the Preview Modal , Dom Nesting issue inside a Table

* minor modifications to the PreviewModal and rhe row data to get rid of errorsin the console

* add JSONPATH library to implement the parsing with it instead of loadash get
---
 kafka-ui-react-app/package.json               |  1 +
 kafka-ui-react-app/pnpm-lock.yaml             |  7 +++++
 .../Topics/Topic/Messages/Message.tsx         | 13 +++++----
 .../Topics/Topic/Messages/MessagesTable.tsx   | 27 +++++++++----------
 .../Topic/Messages/PreviewModal.styled.ts     |  1 +
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 5c51e700076..94759221dfd 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -26,6 +26,7 @@
     "jest": "^29.0.3",
     "jest-watch-typeahead": "^2.0.0",
     "json-schema-faker": "^0.5.0-rcv.44",
+    "jsonpath-plus": "^7.2.0",
     "lodash": "^4.17.21",
     "pretty-ms": "7.0.1",
     "react": "^18.1.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 52390df0cde..eb9b03c0447 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -63,6 +63,7 @@ specifiers:
   jest-styled-components: ^7.0.8
   jest-watch-typeahead: ^2.0.0
   json-schema-faker: ^0.5.0-rcv.44
+  jsonpath-plus: ^7.2.0
   lint-staged: ^13.0.2
   lodash: ^4.17.21
   prettier: ^2.3.1
@@ -116,6 +117,7 @@ dependencies:
   jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
   jest-watch-typeahead: 2.0.0_jest@29.0.3
   json-schema-faker: 0.5.0-rcv.44
+  jsonpath-plus: 7.2.0
   lodash: 4.17.21
   pretty-ms: 7.0.1
   react: 18.1.0
@@ -7058,6 +7060,11 @@ packages:
     engines: {node: '>=10.0.0'}
     dev: false
 
+  /jsonpath-plus/7.2.0:
+    resolution: {integrity: sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==}
+    engines: {node: '>=12.0.0'}
+    dev: false
+
   /jsx-ast-utils/3.3.0:
     resolution: {integrity: sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==}
     engines: {node: '>=4.0'}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index 82a705c3a33..cb2dbbb3c0c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -1,4 +1,3 @@
-import get from 'lodash/get';
 import React from 'react';
 import styled from 'styled-components';
 import useDataSaver from 'lib/hooks/useDataSaver';
@@ -7,6 +6,7 @@ import MessageToggleIcon from 'components/common/Icons/MessageToggleIcon';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
+import { JSONPath } from 'jsonpath-plus';
 
 import MessageContent from './MessageContent/MessageContent';
 import * as S from './MessageContent/MessageContent.styled';
@@ -88,9 +88,12 @@ const Message: React.FC<Props> = ({
     return (
       <>
         {filters.map((item) => (
-          <div>
-            {item.field}: {get(parsedJson, item.path)}
-          </div>
+          <span key={`${item.path}--${item.field}`}>
+            {item.field}:{' '}
+            {JSON.stringify(
+              JSONPath({ path: item.path, json: parsedJson, wrap: false })
+            )}
+          </span>
         ))}
       </>
     );
@@ -116,7 +119,7 @@ const Message: React.FC<Props> = ({
         <StyledDataCell title={key}>
           {renderFilteredJson(key, keyFilters)}
         </StyledDataCell>
-        <StyledDataCell>
+        <StyledDataCell title={content}>
           <S.Metadata>
             <S.MetadataValue>
               {renderFilteredJson(content, contentFilters)}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
index 96e9f40d73d..10e4f4dfa17 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessagesTable.tsx
@@ -52,7 +52,18 @@ const MessagesTable: React.FC = () => {
   };
 
   return (
-    <>
+    <div style={{ position: 'relative' }}>
+      {previewFor !== null && (
+        <PreviewModal
+          values={previewFor === 'key' ? keyFilters : contentFilters}
+          toggleIsOpen={() => setPreviewFor(null)}
+          setFilters={(payload: PreviewFilter[]) =>
+            previewFor === 'key'
+              ? setKeyFilters(payload)
+              : setContentFilters(payload)
+          }
+        />
+      )}
       <Table isFullwidth>
         <thead>
           <tr>
@@ -77,18 +88,6 @@ const MessagesTable: React.FC = () => {
               onPreview={() => setPreviewFor('content')}
             />
             <TableHeaderCell> </TableHeaderCell>
-
-            {previewFor !== null && (
-              <PreviewModal
-                values={previewFor === 'key' ? keyFilters : contentFilters}
-                toggleIsOpen={() => setPreviewFor(null)}
-                setFilters={(payload: PreviewFilter[]) =>
-                  previewFor === 'key'
-                    ? setKeyFilters(payload)
-                    : setContentFilters(payload)
-                }
-              />
-            )}
           </tr>
         </thead>
         <tbody>
@@ -139,7 +138,7 @@ const MessagesTable: React.FC = () => {
           </Button>
         </S.Pages>
       </S.Pagination>
-    </>
+    </div>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts
index 35f221ddeab..c1cecfbbd05 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts
@@ -7,6 +7,7 @@ export const PreviewModal = styled.div`
   background: ${({ theme }) => theme.modal.backgroundColor};
   position: absolute;
   left: 25%;
+  top: 30px; // some margin
   border: 1px solid ${({ theme }) => theme.modal.border.contrast};
   box-shadow: ${({ theme }) => theme.modal.shadow};
   padding: 32px;

From 398181e0d25fc94cf58793d8cafec5fb0a1f06ee Mon Sep 17 00:00:00 2001
From: Alexandr Nezboretskiy <88882353+anezboretskiy@users.noreply.github.com>
Date: Wed, 1 Feb 2023 11:24:40 +0200
Subject: [PATCH 399/734] [e2e] checking ksql request execution (#3295)

* Added ksqlApi methods

* Added classObjects to Facade

* Added models for streams and tables

* ad pages classes

* ad enums

* ad checkingKsqlRequestExecution()

* Refactored default topics to constant

* Refactored KsqlTests

* Resolve conversations

---------

Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../kafka/ui/pages/ksqldb/KsqlDbList.java     | 137 +++++++++++++++++
 .../kafka/ui/pages/ksqldb/KsqlQueryForm.java  | 144 ++++++++++++++++++
 .../ui/pages/ksqldb/enums/KsqlMenuTabs.java   |  16 ++
 .../pages/ksqldb/enums/KsqlQueryConfig.java   |  18 +++
 .../kafka/ui/pages/ksqldb/models/Stream.java  |  10 ++
 .../kafka/ui/pages/ksqldb/models/Table.java   |  10 ++
 .../kafka/ui/services/ApiService.java         |  83 ++++++++++
 .../com/provectus/kafka/ui/base/Facade.java   |   9 +-
 .../kafka/ui/suite/ksqldb/KsqlTests.java      |  65 ++++++++
 .../kafka/ui/suite/topics/TopicsTests.java    |  10 +-
 10 files changed, 496 insertions(+), 6 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/ksqldb/KsqlTests.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
new file mode 100644
index 00000000000..ec735df65a7
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
@@ -0,0 +1,137 @@
+package com.provectus.kafka.ui.pages.ksqldb;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import com.provectus.kafka.ui.pages.ksqldb.enums.KsqlMenuTabs;
+import io.qameta.allure.Step;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.openqa.selenium.By;
+
+public class KsqlDbList extends BasePage {
+  protected SelenideElement executeKsqlBtn = $x("//button[text()='Execute KSQL Request']");
+  protected SelenideElement tablesTab = $x("//nav[@role='navigation']/a[text()='Tables']");
+  protected SelenideElement streamsTab = $x("//nav[@role='navigation']/a[text()='Streams']");
+
+  @Step
+  public KsqlDbList waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    Arrays.asList(tablesTab, streamsTab).forEach(tab -> tab.shouldBe(Condition.visible));
+    return this;
+  }
+
+  @Step
+  public KsqlDbList clickExecuteKsqlRequestBtn() {
+    clickByJavaScript(executeKsqlBtn);
+    return this;
+  }
+
+  @Step
+  public KsqlDbList openDetailsTab(KsqlMenuTabs menu) {
+    $(By.linkText(menu.toString())).shouldBe(Condition.visible).click();
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  private List<KsqlDbList.KsqlTablesGridItem> initTablesItems() {
+    List<KsqlDbList.KsqlTablesGridItem> gridItemList = new ArrayList<>();
+    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new KsqlDbList.KsqlTablesGridItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public KsqlDbList.KsqlTablesGridItem getTableByName(String tableName) {
+    return initTablesItems().stream()
+        .filter(e -> e.getTableName().equals(tableName))
+        .findFirst().orElse(null);
+  }
+
+  public static class KsqlTablesGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    public KsqlTablesGridItem(SelenideElement element) {
+      this.element = element;
+    }
+
+    @Step
+    public String getTableName() {
+      return element.$x("./td[1]").getText().trim();
+    }
+
+    @Step
+    public String getTopicName() {
+      return element.$x("./td[2]").getText().trim();
+    }
+
+    @Step
+    public String getKeyFormat() {
+      return element.$x("./td[3]").getText().trim();
+    }
+
+    @Step
+    public String getValueFormat() {
+      return element.$x("./td[4]").getText().trim();
+    }
+
+    @Step
+    public String getIsWindowed() {
+      return element.$x("./td[5]").getText().trim();
+    }
+  }
+
+  private List<KsqlDbList.KsqlStreamsGridItem> initStreamsItems() {
+    List<KsqlDbList.KsqlStreamsGridItem> gridItemList = new ArrayList<>();
+    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new KsqlDbList.KsqlStreamsGridItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public KsqlDbList.KsqlStreamsGridItem getStreamByName(String streamName) {
+    return initStreamsItems().stream()
+        .filter(e -> e.getStreamName().equals(streamName))
+        .findFirst().orElse(null);
+  }
+
+  public static class KsqlStreamsGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    public KsqlStreamsGridItem(SelenideElement element) {
+      this.element = element;
+    }
+
+    @Step
+    public String getStreamName() {
+      return element.$x("./td[1]").getText().trim();
+    }
+
+    @Step
+    public String getTopicName() {
+      return element.$x("./td[2]").getText().trim();
+    }
+
+    @Step
+    public String getKeyFormat() {
+      return element.$x("./td[3]").getText().trim();
+    }
+
+    @Step
+    public String getValueFormat() {
+      return element.$x("./td[4]").getText().trim();
+    }
+
+    @Step
+    public String getIsWindowed() {
+      return element.$x("./td[5]").getText().trim();
+    }
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
new file mode 100644
index 00000000000..21ceacdbb7f
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
@@ -0,0 +1,144 @@
+package com.provectus.kafka.ui.pages.ksqldb;
+
+import static com.codeborne.selenide.Condition.visible;
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+public class KsqlQueryForm extends BasePage {
+  protected SelenideElement pageTitle = $x("//h1[text()='Query']");
+  protected SelenideElement clearBtn = $x("//div/button[text()='Clear']");
+  protected SelenideElement executeBtn = $x("//div/button[text()='Execute']");
+  protected SelenideElement stopQueryBtn = $x("//div/button[text()='Stop query']");
+  protected SelenideElement clearResultsBtn = $x("//div/button[text()='Clear results']");
+  protected SelenideElement addStreamPropertyBtn = $x("//button[text()='Add Stream Property']");
+  protected SelenideElement queryAreaValue = $x("//div[@class='ace_content']");
+  protected SelenideElement queryArea = $x("//div[@id='ksql']/textarea[@class='ace_text-input']");
+  protected ElementsCollection ksqlGridItems = $$x("//tbody//tr");
+  protected ElementsCollection keyField = $$x("//input[@aria-label='value']");
+  protected ElementsCollection valueField = $$x("//input[@aria-label='value']");
+
+  @Step
+  public KsqlQueryForm waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    pageTitle.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickClearBtn() {
+    clickByJavaScript(clearBtn);
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickExecuteBtn() {
+    clickByJavaScript(executeBtn);
+    if (queryAreaValue.getText().contains("EMIT CHANGES;")) {
+      loadingSpinner.shouldBe(Condition.visible);
+    } else {
+      waitUntilSpinnerDisappear();
+    }
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickStopQueryBtn() {
+    clickByJavaScript(stopQueryBtn);
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickClearResultsBtn() {
+    clickByJavaScript(clearResultsBtn);
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickAddStreamProperty() {
+    clickByJavaScript(addStreamPropertyBtn);
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm setQuery(String query) {
+    queryAreaValue.shouldBe(Condition.visible).click();
+    queryArea.setValue(query);
+    return this;
+  }
+
+  private List<KsqlQueryForm.KsqlResponseGridItem> initItems() {
+    List<KsqlQueryForm.KsqlResponseGridItem> gridItemList = new ArrayList<>();
+    ksqlGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new KsqlQueryForm.KsqlResponseGridItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public KsqlQueryForm.KsqlResponseGridItem getTableByName(String name) {
+    return initItems().stream()
+        .filter(e -> e.getName().equalsIgnoreCase(name))
+        .findFirst().orElse(null);
+  }
+
+  public static class KsqlResponseGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    private KsqlResponseGridItem(SelenideElement element) {
+      this.element = element;
+    }
+
+    @Step
+    public String getType() {
+      return element.$x("./td[1]").getText().trim();
+    }
+
+    @Step
+    public String getName() {
+      return element.$x("./td[2]").scrollTo().getText().trim();
+    }
+
+    @Step
+    public boolean isVisible() {
+      boolean isVisible = false;
+      try {
+        element.$x("./td[2]").shouldBe(visible, Duration.ofMillis(500));
+        isVisible = true;
+      } catch (Throwable ignored) {
+      }
+      return isVisible;
+    }
+
+    @Step
+    public String getTopic() {
+      return element.$x("./td[3]").getText().trim();
+    }
+
+    @Step
+    public String getKeyFormat() {
+      return element.$x("./td[4]").getText().trim();
+    }
+
+    @Step
+    public String getValueFormat() {
+      return element.$x("./td[5]").getText().trim();
+    }
+
+    @Step
+    public String getIsWindowed() {
+      return element.$x("./td[6]").getText().trim();
+    }
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java
new file mode 100644
index 00000000000..f3bb55d42b0
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java
@@ -0,0 +1,16 @@
+package com.provectus.kafka.ui.pages.ksqldb.enums;
+
+public enum KsqlMenuTabs {
+    TABLES("Table"),
+    STREAMS("Streams");
+
+    private final String value;
+
+    KsqlMenuTabs(String value) {
+      this.value = value;
+    }
+
+    public String toString() {
+      return value;
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java
new file mode 100644
index 00000000000..c918b079973
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java
@@ -0,0 +1,18 @@
+package com.provectus.kafka.ui.pages.ksqldb.enums;
+
+public enum KsqlQueryConfig {
+    SHOW_TABLES("show tables;"),
+    SHOW_STREAMS("show streams;"),
+    SELECT_ALL_FROM("SELECT * FROM %s\n" +
+        "EMIT CHANGES;");
+
+    private final String query;
+
+    KsqlQueryConfig(String query) {
+      this.query = query;
+    }
+
+    public String getQuery(){
+      return query;
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java
new file mode 100644
index 00000000000..f61b8243866
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java
@@ -0,0 +1,10 @@
+package com.provectus.kafka.ui.pages.ksqldb.models;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class Stream {
+  private String name, topicName, valueFormat, partitions;
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java
new file mode 100644
index 00000000000..cbb0c1d2a72
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java
@@ -0,0 +1,10 @@
+package com.provectus.kafka.ui.pages.ksqldb.models;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class Table {
+  private String name, streamName;
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index 8451ef836e1..c41796cb85c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -6,20 +6,28 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.provectus.kafka.ui.api.ApiClient;
 import com.provectus.kafka.ui.api.api.KafkaConnectApi;
+import com.provectus.kafka.ui.api.api.KsqlApi;
 import com.provectus.kafka.ui.api.api.MessagesApi;
 import com.provectus.kafka.ui.api.api.SchemasApi;
 import com.provectus.kafka.ui.api.api.TopicsApi;
 import com.provectus.kafka.ui.api.model.CreateTopicMessage;
+import com.provectus.kafka.ui.api.model.KsqlCommandV2;
+import com.provectus.kafka.ui.api.model.KsqlCommandV2Response;
+import com.provectus.kafka.ui.api.model.KsqlResponse;
 import com.provectus.kafka.ui.api.model.NewConnector;
 import com.provectus.kafka.ui.api.model.NewSchemaSubject;
 import com.provectus.kafka.ui.api.model.TopicCreation;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.pages.ksqldb.models.Stream;
+import com.provectus.kafka.ui.pages.ksqldb.models.Table;
 import com.provectus.kafka.ui.settings.BaseSource;
 import io.qameta.allure.Step;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -48,6 +56,9 @@ private MessagesApi messageApi() {
       return new MessagesApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
     }
 
+    @SneakyThrows
+    private KsqlApi ksqlApi(){return new KsqlApi(new ApiClient().setBasePath(BASE_LOCAL_URL));}
+
     @SneakyThrows
     private void createTopic(String clusterName, String topicName) {
       TopicCreation topic = new TopicCreation();
@@ -173,4 +184,76 @@ public ApiService sendMessage(Topic topic) {
       sendMessage(CLUSTER_NAME, topic);
       return this;
     }
+
+    @Step
+    public ApiService createStream(Stream stream) {
+      KsqlCommandV2Response pipeIdStream = ksqlApi().executeKsql(
+          CLUSTER_NAME, new KsqlCommandV2()
+              .ksql(String.format("CREATE STREAM %s (profileId VARCHAR, latitude DOUBLE, longitude DOUBLE) ",
+                  stream.getName())
+                  + String.format("WITH (kafka_topic='%s', value_format='json', partitions=1);",
+                  stream.getTopicName())))
+          .block();
+      assert pipeIdStream != null;
+      List<KsqlResponse> responseListStream =
+          ksqlApi().openKsqlResponsePipe(CLUSTER_NAME, pipeIdStream.getPipeId()).collectList().block();
+      assert Objects.requireNonNull(responseListStream).size() != 0;
+      return this;
+    }
+
+    @Step
+    public ApiService createTables(Table firstTable, Table secondTable) {
+      KsqlCommandV2Response pipeIdTable1 = ksqlApi().executeKsql(
+          CLUSTER_NAME, new KsqlCommandV2().ksql(
+              String.format("CREATE TABLE %s AS ", firstTable.getName())
+                  + "  SELECT profileId, "
+                  + "         LATEST_BY_OFFSET(latitude) AS la, "
+                  + "         LATEST_BY_OFFSET(longitude) AS lo "
+                  + String.format("  FROM %s ", firstTable.getStreamName())
+                  + "  GROUP BY profileId "
+                  + "  EMIT CHANGES;"))
+          .block();
+      assert pipeIdTable1 != null;
+      List<KsqlResponse> responseListTable =
+          ksqlApi().openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable1.getPipeId()).collectList().block();
+      assert Objects.requireNonNull(responseListTable).size() != 0;
+      KsqlCommandV2Response pipeIdTable2 = ksqlApi().executeKsql(
+          CLUSTER_NAME,
+          new KsqlCommandV2().ksql(String.format("CREATE TABLE %s AS ", secondTable.getName())
+              + "  SELECT ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1) AS distanceInMiles, "
+              + "         COLLECT_LIST(profileId) AS riders, "
+              + "         COUNT(*) AS count "
+              + String.format("  FROM %s ", firstTable.getName())
+              + "  GROUP BY ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1);"))
+          .block();
+      assert pipeIdTable2 != null;
+      List<KsqlResponse> responseListTable2 =
+          ksqlApi().openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable2.getPipeId()).collectList().block();
+      assert Objects.requireNonNull(responseListTable2).size() != 0;
+      return this;
+    }
+
+    @Step
+    public ApiService insertInto(Stream stream) {
+      String streamName = stream.getName();
+      KsqlCommandV2Response pipeIdInsert = ksqlApi().executeKsql(CLUSTER_NAME, new KsqlCommandV2()
+              .ksql(
+                  "INSERT INTO " + streamName + " (profileId, latitude, longitude) VALUES ('c2309eec', 37.7877, -122.4205);"
+                      + "INSERT INTO " + streamName +
+                      " (profileId, latitude, longitude) VALUES ('18f4ea86', 37.3903, -122.0643); "
+                      + "INSERT INTO " + streamName +
+                      " (profileId, latitude, longitude) VALUES ('4ab5cbad', 37.3952, -122.0813); "
+                      + "INSERT INTO " + streamName +
+                      " (profileId, latitude, longitude) VALUES ('8b6eae59', 37.3944, -122.0813); "
+                      + "INSERT INTO " + streamName +
+                      " (profileId, latitude, longitude) VALUES ('4a7c7b41', 37.4049, -122.0822); "
+                      + "INSERT INTO " + streamName +
+                      " (profileId, latitude, longitude) VALUES ('4ddad000', 37.7857, -122.4011);"))
+          .block();
+      assert pipeIdInsert != null;
+      List<KsqlResponse> responseListInsert =
+          ksqlApi().openKsqlResponsePipe(CLUSTER_NAME, pipeIdInsert.getPipeId()).collectList().block();
+      assert Objects.requireNonNull(responseListInsert).size() != 0;
+      return this;
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
index 1dad47a7007..ac4180fe611 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
@@ -1,6 +1,5 @@
 package com.provectus.kafka.ui.base;
 
-import com.provectus.kafka.ui.services.ApiService;
 import com.provectus.kafka.ui.pages.NaviSideBar;
 import com.provectus.kafka.ui.pages.TopPanel;
 import com.provectus.kafka.ui.pages.brokers.BrokersConfigTab;
@@ -11,14 +10,17 @@
 import com.provectus.kafka.ui.pages.connector.KafkaConnectList;
 import com.provectus.kafka.ui.pages.consumer.ConsumersDetails;
 import com.provectus.kafka.ui.pages.consumer.ConsumersList;
+import com.provectus.kafka.ui.pages.ksqldb.KsqlDbList;
+import com.provectus.kafka.ui.pages.ksqldb.KsqlQueryForm;
 import com.provectus.kafka.ui.pages.schema.SchemaCreateForm;
 import com.provectus.kafka.ui.pages.schema.SchemaDetails;
 import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
 import com.provectus.kafka.ui.pages.topic.ProduceMessagePanel;
-import com.provectus.kafka.ui.pages.topic.TopicSettingsTab;
 import com.provectus.kafka.ui.pages.topic.TopicCreateEditForm;
 import com.provectus.kafka.ui.pages.topic.TopicDetails;
+import com.provectus.kafka.ui.pages.topic.TopicSettingsTab;
 import com.provectus.kafka.ui.pages.topic.TopicsList;
+import com.provectus.kafka.ui.services.ApiService;
 
 public abstract class Facade {
     protected ApiService apiService = new ApiService();
@@ -40,4 +42,7 @@ public abstract class Facade {
     protected BrokersDetails brokersDetails = new BrokersDetails();
     protected BrokersConfigTab brokersConfigTab = new BrokersConfigTab();
     protected TopicSettingsTab topicSettingsTab = new TopicSettingsTab();
+    protected KsqlQueryForm ksqlQueryForm = new KsqlQueryForm();
+    protected KsqlDbList ksqlDbList = new KsqlDbList();
+
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/ksqldb/KsqlTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/ksqldb/KsqlTests.java
new file mode 100644
index 00000000000..ee03fd8de1a
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/ksqldb/KsqlTests.java
@@ -0,0 +1,65 @@
+package com.provectus.kafka.ui.suite.ksqldb;
+
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KSQL_DB;
+import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_TABLES;
+import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+
+import com.provectus.kafka.ui.base.BaseTest;
+import com.provectus.kafka.ui.pages.ksqldb.models.Stream;
+import com.provectus.kafka.ui.pages.ksqldb.models.Table;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qase.api.annotation.CaseId;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class KsqlTests extends BaseTest {
+  private static final long SUITE_ID = 8;
+  private static final String SUITE_TITLE = "KSQL_DB";
+  private static final Stream STREAM_FOR_CHECKING_TABLES = new Stream()
+      .setName("STREAM_FOR_CHECKING_TABLES_" + randomAlphabetic(4).toUpperCase())
+      .setTopicName("TOPIC_FOR_STREAM_" + randomAlphabetic(4).toUpperCase());
+  private static final Table FIRST_TABLE = new Table()
+      .setName("FIRST_TABLE"+ randomAlphabetic(4).toUpperCase())
+      .setStreamName(STREAM_FOR_CHECKING_TABLES.getName());
+  private static final Table SECOND_TABLE = new Table()
+      .setName("SECOND_TABLE"+ randomAlphabetic(4).toUpperCase())
+      .setStreamName(STREAM_FOR_CHECKING_TABLES.getName());
+
+  @BeforeAll
+  public void beforeAll(){
+    apiService
+        .createStream(STREAM_FOR_CHECKING_TABLES)
+        .createTables(FIRST_TABLE, SECOND_TABLE);
+  }
+
+  @DisplayName("check KSQL request execution")
+  @Suite(suiteId = SUITE_ID,title = SUITE_TITLE)
+  @AutomationStatus(status = Status.AUTOMATED)
+  @CaseId(41)
+  @Test
+  @Order(1)
+  public void checkingKsqlRequestExecution() {
+    naviSideBar
+        .openSideMenu(KSQL_DB);
+    ksqlDbList
+        .waitUntilScreenReady()
+        .clickExecuteKsqlRequestBtn();
+    ksqlQueryForm
+        .waitUntilScreenReady()
+        .setQuery(SHOW_TABLES.getQuery())
+        .clickExecuteBtn();
+    SoftAssertions softly = new SoftAssertions();
+    softly.assertThat(ksqlQueryForm.getTableByName(FIRST_TABLE.getName()).isVisible())
+        .as("getTableName()").isTrue();
+    softly.assertThat(ksqlQueryForm.getTableByName(SECOND_TABLE.getName()).isVisible())
+        .as("getTableName()").isTrue();
+    softly.assertAll();
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
index 7f301835c8a..fa51ebe1fc4 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
@@ -63,12 +63,14 @@ public class TopicsTests extends BaseTest {
       .setNumberOfPartitions(1)
       .setMaxMessageBytes("1000012")
       .setMaxSizeOnDisk(NOT_SET);
+  private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
+      .setName("topic-for-check-filters-" + randomAlphabetic(5));
   private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete-" + randomAlphabetic(5));
   private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
   @BeforeAll
   public void beforeAll() {
-    TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE_AND_DELETE, TOPIC_FOR_DELETE));
+    TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE_AND_DELETE, TOPIC_FOR_DELETE, TOPIC_FOR_CHECK_FILTERS));
     TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
   }
 
@@ -337,7 +339,7 @@ void checkTopicListElements() {
   @Order(11)
   void addingNewFilterWithinTopic() {
     String filterName = randomAlphabetic(5);
-    navigateToTopicsAndOpenDetails("_schemas");
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
     topicDetails
         .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()
@@ -364,7 +366,7 @@ void addingNewFilterWithinTopic() {
   @Order(12)
   void checkFilterSavingWithinSavedFilters() {
     String displayName = randomAlphabetic(5);
-    navigateToTopicsAndOpenDetails("my_ksql_1ksql_processing_log");
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
     topicDetails
         .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()
@@ -389,7 +391,7 @@ void checkFilterSavingWithinSavedFilters() {
   @Order(13)
   void checkingApplyingSavedFilterWithinTopicMessages() {
     String displayName = randomAlphabetic(5);
-    navigateToTopicsAndOpenDetails("my_ksql_1ksql_processing_log");
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
     topicDetails
         .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()

From 9e1e9b379905772afd7fb6815a2d28d817bf193e Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Thu, 2 Feb 2023 15:24:42 +0200
Subject: [PATCH 400/734] [e2e] switch to TestNG (#3301)

* test commit

* fix BaseTest

* upd global

* upd global

* upd global

* add local browser VM option

* fix TopicsList column header locator

* fix withStartupTimeout()

* switch e2e to TestNG

* upd pom

* upd page classes

* upd -pl kafka-ui-e2e-checks
---
 .github/workflows/e2e-checks.yaml             |   2 +-
 kafka-ui-e2e-checks/README.md                 |  55 +-
 kafka-ui-e2e-checks/pom.xml                   | 143 ++---
 .../provectus/kafka/ui/models/Connector.java  |   1 -
 .../com/provectus/kafka/ui/models/Schema.java |  10 +-
 .../com/provectus/kafka/ui/models/Topic.java  |   9 +-
 .../provectus/kafka/ui/pages/BasePage.java    | 175 +++---
 .../provectus/kafka/ui/pages/NaviSideBar.java |  21 +-
 .../provectus/kafka/ui/pages/TopPanel.java    |   8 +-
 .../ui/pages/brokers/BrokersConfigTab.java    |  55 +-
 .../ui/pages/brokers/BrokersDetails.java      | 147 ++---
 .../kafka/ui/pages/brokers/BrokersList.java   | 179 +++---
 .../ConnectorCreateForm.java                  |  12 +-
 .../ConnectorDetails.java                     |  42 +-
 .../KafkaConnectList.java                     |  16 +-
 .../ConsumersDetails.java                     |   6 +-
 .../ConsumersList.java                        |   7 +-
 .../pages/{ksqldb => ksqlDb}/KsqlDbList.java  |   8 +-
 .../{ksqldb => ksqlDb}/KsqlQueryForm.java     |   6 +-
 .../enums/KsqlMenuTabs.java                   |   7 +-
 .../enums/KsqlQueryConfig.java                |  11 +-
 .../{ksqldb => ksqlDb}/models/Stream.java     |   5 +-
 .../{ksqldb => ksqlDb}/models/Table.java      |   5 +-
 .../{schema => schemas}/SchemaCreateForm.java |  46 +-
 .../{schema => schemas}/SchemaDetails.java    |  20 +-
 .../SchemaRegistryList.java                   |   8 +-
 .../ui/pages/topic/TopicCreateEditForm.java   | 289 ---------
 .../kafka/ui/pages/topic/TopicDetails.java    | 452 --------------
 .../ui/pages/topic/TopicSettingsTab.java      |  65 ---
 .../kafka/ui/pages/topic/TopicsList.java      | 260 ---------
 .../pages/topic/enums/CleanupPolicyValue.java |  24 -
 .../topic/enums/CustomParameterType.java      |  36 --
 .../ui/pages/topic/enums/MaxSizeOnDisk.java   |  26 -
 .../ui/pages/topic/enums/TimeToRetain.java    |  25 -
 .../ProduceMessagePanel.java                  |  11 +-
 .../ui/pages/topics/TopicCreateEditForm.java  | 267 +++++++++
 .../kafka/ui/pages/topics/TopicDetails.java   | 446 ++++++++++++++
 .../ui/pages/topics/TopicSettingsTab.java     |  66 +++
 .../kafka/ui/pages/topics/TopicsList.java     | 261 +++++++++
 .../topics/enums/CleanupPolicyValue.java      |  25 +
 .../topics/enums/CustomParameterType.java     |  37 ++
 .../ui/pages/topics/enums/MaxSizeOnDisk.java  |  27 +
 .../ui/pages/topics/enums/TimeToRetain.java   |  26 +
 .../kafka/ui/services/ApiService.java         | 251 ++++----
 .../ui/settings/listeners/AllureListener.java |  35 ++
 .../ui/settings/listeners/LoggerListener.java |  37 ++
 .../kafka/ui/utilities/TimeUtils.java         |  15 +-
 .../kafka/ui/utilities/WebUtils.java          | 116 ++--
 .../qaseIoUtils/DisplayNameGenerator.java     |  33 --
 .../utilities/qaseIoUtils/QaseExtension.java  |  15 +-
 .../qaseIoUtils/TestCaseGenerator.java        |   2 +-
 .../java/com/provectus/kafka/ui/BaseTest.java | 135 +++++
 .../provectus/kafka/ui/{base => }/Facade.java |  29 +-
 .../com/provectus/kafka/ui/base/BaseTest.java | 142 -----
 .../kafka/ui/smokeSuite/SmokeTest.java        |  26 +
 .../ui/smokeSuite/brokers/BrokersTest.java    |  61 ++
 .../connectors/ConnectorsTest.java}           | 100 ++--
 .../ui/smokeSuite/ksqlDb/KsqlDbTest.java      |  58 ++
 .../ui/smokeSuite/schemas/SchemasTest.java    | 229 ++++++++
 .../ui/smokeSuite/topics/MessagesTest.java    | 292 ++++++++++
 .../ui/smokeSuite/topics/TopicsTest.java      | 503 ++++++++++++++++
 .../provectus/kafka/ui/suite/SmokeTests.java  |  23 -
 .../kafka/ui/suite/brokers/BrokersTests.java  |  63 --
 .../kafka/ui/suite/ksqldb/KsqlTests.java      |  65 ---
 .../kafka/ui/suite/schemas/SchemasTests.java  | 249 --------
 .../ui/suite/topics/TopicMessagesTests.java   | 316 ----------
 .../kafka/ui/suite/topics/TopicsTests.java    | 551 ------------------
 .../src/test/resources/regression.xml         |   8 +
 .../src/test/resources/smoke.xml              |   8 +
 69 files changed, 3314 insertions(+), 3395 deletions(-)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{connector => connectors}/ConnectorCreateForm.java (89%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{connector => connectors}/ConnectorDetails.java (62%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{connector => connectors}/KafkaConnectList.java (77%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{consumer => consumers}/ConsumersDetails.java (95%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{consumer => consumers}/ConsumersList.java (84%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ksqldb => ksqlDb}/KsqlDbList.java (95%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ksqldb => ksqlDb}/KsqlQueryForm.java (97%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ksqldb => ksqlDb}/enums/KsqlMenuTabs.java (64%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ksqldb => ksqlDb}/enums/KsqlQueryConfig.java (58%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ksqldb => ksqlDb}/models/Stream.java (50%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ksqldb => ksqlDb}/models/Table.java (55%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{schema => schemas}/SchemaCreateForm.java (76%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{schema => schemas}/SchemaDetails.java (82%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{schema => schemas}/SchemaRegistryList.java (90%)
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicSettingsTab.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CleanupPolicyValue.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CustomParameterType.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/MaxSizeOnDisk.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/TimeToRetain.java
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{topic => topics}/ProduceMessagePanel.java (94%)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CleanupPolicyValue.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CustomParameterType.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/MaxSizeOnDisk.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/TimeToRetain.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/AllureListener.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/LoggerListener.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/DisplayNameGenerator.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
 rename kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/{base => }/Facade.java (65%)
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
 rename kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/{suite/connectors/ConnectorsTests.java => smokeSuite/connectors/ConnectorsTest.java} (63%)
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/ksqldb/KsqlTests.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/regression.xml
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/smoke.xml

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 89e9d71f0ba..85e3c17d2f3 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -42,7 +42,7 @@ jobs:
       - name: e2e run
         run: |
           ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          ./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ secrets.QASEIO_API_TOKEN }} -pl '!kafka-ui-api' test -Pprod
+          ./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ secrets.QASEIO_API_TOKEN }} -pl 'kafka-ui-e2e-checks' test -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -Pprod
       - name: Generate allure report
         uses: simple-elf/allure-report-action@master
         if: always()
diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index 42f17fc84a5..651e3c11439 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -1,6 +1,6 @@
 ### E2E UI automation for Kafka-ui
 
-This repository is for E2E UI automation. 
+This repository is for E2E UI automation.
 
 ### Table of Contents
 
@@ -16,28 +16,42 @@ This repository is for E2E UI automation.
 - [How to develop](#how-to-develop)
 
 ### Prerequisites
+
 - Docker & Docker-compose
 - Java (install aarch64 jdk if you have M1/arm chip)
 - Maven
-  
+
 ### How to install
+
 ```
 git clone https://github.com/provectus/kafka-ui.git
 cd  kafka-ui-e2e-checks
 docker pull selenoid/vnc:chrome_86.0  
 ```
+
 ### How to run checks
 
-1. Run `kafka-ui`: 
+1. Run `kafka-ui`:
+
 ```
 cd kafka-ui
 docker-compose -f documentation/compose/e2e-tests.yaml up -d
 ```
-2. Run tests using your QaseIO API token as environment variable (put instead %s into command below)
+
+2. Run Smoke test suite using your QaseIO API token as environment variable (put instead %s into command below)
+
+```
+./mvnw -DQASEIO_API_TOKEN='%s' -pl 'kafka-ui-e2e-checks' test -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -Pprod
 ```
-./mvnw -DQASEIO_API_TOKEN='%s' -pl '!kafka-ui-api' test -Pprod
+
+3. Run Regression test suite using your QaseIO API token as environment variable (put instead %s into command below)
+
 ```
-3. To run tests on your local Chrome browser just add next VM option to the Run Configuration
+./mvnw -DQASEIO_API_TOKEN='%s' -pl 'kafka-ui-e2e-checks' test -Dsurefire.suiteXmlFiles='src/test/resources/regression.xml' -Pprod
+```
+
+4. To run tests on your local Chrome browser just add next VM option to the Run Configuration
+
 ```
 -Dbrowser=local
 ```
@@ -47,25 +61,40 @@ docker-compose -f documentation/compose/e2e-tests.yaml up -d
 Reports are in `allure-results` folder.
 If you have installed allure commandline [here](https://www.npmjs.com/package/allure-commandline))
 You can see allure report with command:
+
 ```
 allure serve
 ```
+
 ### Screenshots
 
 Reference screenshots are in `SCREENSHOTS_FOLDER`  (default,`kafka-ui-e2e-checks/screenshots`)
 
 ### How to develop
-> ⚠️ todo 
+
+> ⚠️ todo
+
 ### Setting for different environments
-> ⚠️ todo 
+
+> ⚠️ todo
+
 ### Test Data
-> ⚠️ todo 
+
+> ⚠️ todo
+
 ### Actions
-> ⚠️ todo 
+
+> ⚠️ todo
+
 ### Checks
-> ⚠️ todo 
+
+> ⚠️ todo
+
 ### Parallelization
-> ⚠️ todo 
+
+> ⚠️ todo
+
 ### Tips
- - install `Selenium UI Testing plugin` in IDEA
+
+- install `Selenium UI Testing plugin` in IDEA
 
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 1d1aaf3d5fc..33ee947af09 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -1,42 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>kafka-ui</artifactId>
         <groupId>com.provectus</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>kafka-ui-e2e-checks</artifactId>
+
     <properties>
+        <maven.surefire-plugin.version>3.0.0-M8</maven.surefire-plugin.version>
         <kafka-ui-contract>${project.version}</kafka-ui-contract>
-        <aspectj.version>1.9.9.1</aspectj.version>
-        <allure.version>2.18.1</allure.version>
-        <json-smart.version>2.4.8</json-smart.version>
+        <testcontainers.version>1.17.6</testcontainers.version>
+        <junit.platform.version>1.9.2</junit.platform.version>
         <selenide.version>6.6.3</selenide.version>
+        <testng.version>7.6.1</testng.version>
+        <allure.version>2.20.1</allure.version>
+        <aspectj.version>1.9.9.1</aspectj.version>
         <assertj.version>3.23.1</assertj.version>
-        <google.auto-service.version>1.0.1</google.auto-service.version>
         <hamcrest.version>2.2</hamcrest.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <allure.java-commons.version>2.20.1</allure.java-commons.version>
         <dotenv.version>2.3.1</dotenv.version>
-        <allure.maven-plugin.version>2.6</allure.maven-plugin.version>
-        <ashot.version>1.5.4</ashot.version>
-        <allure.screendiff-plugin.version>2.18.1</allure.screendiff-plugin.version>
-        <maven.surefire-plugin.version>2.22.2</maven.surefire-plugin.version>
-        <allure-maven.version>2.10.0</allure-maven.version>
         <kafka.version>3.3.1</kafka.version>
         <qase.io.version>2.1.3</qase.io.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>net.minidev</groupId>
-            <artifactId>json-smart</artifactId>
-            <version>${json-smart.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_2.13</artifactId>
@@ -122,23 +114,43 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
+            <version>${testcontainers.version}</version>
         </dependency>
-
         <dependency>
-            <groupId>io.qameta.allure</groupId>
-            <artifactId>allure-junit5</artifactId>
-            <version>${allure.version}</version>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>selenium</artifactId>
+            <version>${testcontainers.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>${junit.platform.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-engine</artifactId>
+            <version>${junit.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>com.codeborne</groupId>
             <artifactId>selenide</artifactId>
             <version>${selenide.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.qameta.allure</groupId>
             <artifactId>allure-selenide</artifactId>
             <version>${allure.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.qameta.allure</groupId>
+            <artifactId>allure-testng</artifactId>
+            <version>${allure.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
@@ -150,20 +162,9 @@
             <version>${assertj.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.google.auto.service</groupId>
-            <artifactId>auto-service</artifactId>
-            <version>${google.auto-service.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>${aspectj.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -175,61 +176,16 @@
             <artifactId>lombok</artifactId>
             <version>${org.projectlombok.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${aspectj.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.qameta.allure</groupId>
-            <artifactId>allure-java-commons</artifactId>
-            <version>${allure.java-commons.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.github.cdimascio</groupId>
             <artifactId>dotenv-java</artifactId>
             <version>${dotenv.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-launcher</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ru.yandex.qatools.allure</groupId>
-            <artifactId>allure-maven-plugin</artifactId>
-            <version>${allure.maven-plugin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ru.yandex.qatools.ashot</groupId>
-            <artifactId>ashot</artifactId>
-            <version>${ashot.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.seleniumhq.selenium</groupId>
-                    <artifactId>selenium-remote-driver</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.qameta.allure.plugins</groupId>
-            <artifactId>screen-diff-plugin</artifactId>
-            <version>${allure.screendiff-plugin.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.provectus</groupId>
             <artifactId>kafka-ui-contract</artifactId>
             <version>${kafka-ui-contract}</version>
         </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>selenium</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.qase</groupId>
             <artifactId>qase-api</artifactId>
@@ -252,6 +208,13 @@
                         <configuration>
                             <skipTests>true</skipTests>
                         </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-testng</artifactId>
+                                <version>${maven.surefire-plugin.version}</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -269,18 +232,16 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${maven.surefire-plugin.version}</version>
                         <configuration>
-                            <testFailureIgnore>false</testFailureIgnore>
-                            <systemProperties>
-                                <property>
-                                    <name>junit.jupiter.extensions.autodetection.enabled</name>
-                                    <value>true</value>
-                                </property>
-                            </systemProperties>
                             <argLine>
                                 -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
                             </argLine>
                         </configuration>
                         <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-testng</artifactId>
+                                <version>${maven.surefire-plugin.version}</version>
+                            </dependency>
                             <dependency>
                                 <groupId>org.aspectj</groupId>
                                 <artifactId>aspectjweaver</artifactId>
@@ -291,11 +252,7 @@
                     <plugin>
                         <groupId>io.qameta.allure</groupId>
                         <artifactId>allure-maven</artifactId>
-                        <version>${allure-maven.version}</version>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>2.10.0</version>
                     </plugin>
                 </plugins>
             </build>
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java
index 9e30ba9f196..48088cdf916 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java
@@ -8,5 +8,4 @@
 public class Connector {
 
     private String name, config;
-
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
index a9c7dca75bf..cd573037bac 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
@@ -4,28 +4,28 @@
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 @Data
 @Accessors(chain = true)
 public class Schema {
 
-    private String name,valuePath;
+    private String name, valuePath;
     private SchemaType type;
 
-    public static Schema createSchemaAvro(){
+    public static Schema createSchemaAvro() {
         return new Schema().setName("schema_avro-" + randomAlphabetic(5))
                 .setType(SchemaType.AVRO)
                 .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_value.json");
     }
 
-    public static Schema createSchemaJson(){
+    public static Schema createSchemaJson() {
         return new Schema().setName("schema_json-" + randomAlphabetic(5))
                 .setType(SchemaType.JSON)
                 .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_Json_Value.json");
     }
 
-    public static Schema createSchemaProtobuf(){
+    public static Schema createSchemaProtobuf() {
         return new Schema().setName("schema_protobuf-" + randomAlphabetic(5))
                 .setType(SchemaType.PROTOBUF)
                 .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_protobuf_value.txt");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
index 16b3ef6e2fb..21486a93f1d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
@@ -1,15 +1,16 @@
 package com.provectus.kafka.ui.models;
 
-import com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue;
-import com.provectus.kafka.ui.pages.topic.enums.CustomParameterType;
-import com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk;
-import com.provectus.kafka.ui.pages.topic.enums.TimeToRetain;
+import com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue;
+import com.provectus.kafka.ui.pages.topics.enums.CustomParameterType;
+import com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk;
+import com.provectus.kafka.ui.pages.topics.enums.TimeToRetain;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 @Data
 @Accessors(chain = true)
 public class Topic {
+
     private String name, timeToRetainData, maxMessageBytes, messageKey, messageContent, customParameterValue;
     private int numberOfPartitions;
     private CustomParameterType customParameterType;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index afe95432ca8..daea5c0d54a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -1,103 +1,104 @@
 package com.provectus.kafka.ui.pages;
 
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
-
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.utilities.WebUtils;
-import java.time.Duration;
 import lombok.extern.slf4j.Slf4j;
 
+import java.time.Duration;
+
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+
 @Slf4j
 public abstract class BasePage extends WebUtils {
 
-  protected SelenideElement loadingSpinner = $x("//div[@role='progressbar']");
-  protected SelenideElement submitBtn = $x("//button[@type='submit']");
-  protected SelenideElement tableGrid = $x("//table");
-  protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
-  protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
-  protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
-  protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
-  protected SelenideElement confirmBtn = $x("//button[contains(text(),'Confirm')]");
-  protected SelenideElement cancelBtn = $x("//button[contains(text(),'Cancel')]");
-  protected ElementsCollection allGridItems = $$x("//tr[@class]");
-  protected String summaryCellLocator = "//div[contains(text(),'%s')]";
-  protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
-  protected String columnHeaderLocator = "//table//tr/th//div[text()='%s']";
-
-  protected void waitUntilSpinnerDisappear() {
-    log.debug("\nwaitUntilSpinnerDisappear");
-    if(isVisible(loadingSpinner)){
-      loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(30));
+    protected SelenideElement loadingSpinner = $x("//div[@role='progressbar']");
+    protected SelenideElement submitBtn = $x("//button[@type='submit']");
+    protected SelenideElement tableGrid = $x("//table");
+    protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
+    protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
+    protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
+    protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
+    protected SelenideElement confirmBtn = $x("//button[contains(text(),'Confirm')]");
+    protected SelenideElement cancelBtn = $x("//button[contains(text(),'Cancel')]");
+    protected ElementsCollection allGridItems = $$x("//tr[@class]");
+    protected String summaryCellLocator = "//div[contains(text(),'%s')]";
+    protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
+    protected String columnHeaderLocator = "//table//tr/th//div[text()='%s']";
+
+    protected void waitUntilSpinnerDisappear() {
+        log.debug("\nwaitUntilSpinnerDisappear");
+        if (isVisible(loadingSpinner)) {
+            loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(30));
+        }
+    }
+
+    protected void clickSubmitBtn() {
+        clickByJavaScript(submitBtn);
     }
-  }
-
-  protected void clickSubmitBtn() {
-    clickByJavaScript(submitBtn);
-  }
-
-  protected SelenideElement getTableElement(String elementName) {
-    log.debug("\ngetTableElement: {}", elementName);
-    return $x(String.format(tableElementNameLocator, elementName));
-  }
-
-  protected String getAlertHeader() {
-    log.debug("\ngetAlertHeader");
-    String result = alertHeader.shouldBe(Condition.visible).getText();
-    log.debug("-> {}", result);
-    return result;
-  }
-
-  protected String getAlertMessage() {
-    log.debug("\ngetAlertMessage");
-    String result = alertMessage.shouldBe(Condition.visible).getText();
-    log.debug("-> {}", result);
-    return result;
-  }
-
-  protected boolean isAlertVisible(AlertHeader header) {
-    log.debug("\nisAlertVisible: {}", header.toString());
-    boolean result = getAlertHeader().equals(header.toString());
-    log.debug("-> {}", result);
-    return result;
-  }
-
-  protected boolean isAlertVisible(AlertHeader header, String message) {
-    log.debug("\nisAlertVisible: {} {}", header, message);
-    boolean result = isAlertVisible(header) && getAlertMessage().equals(message);
-    log.debug("-> {}", result);
-    return result;
-  }
-
-  protected void clickConfirmButton() {
-    confirmBtn.shouldBe(Condition.enabled).click();
-    confirmBtn.shouldBe(Condition.disappear);
-  }
-
-  protected void clickCancelButton() {
-    cancelBtn.shouldBe(Condition.enabled).click();
-    cancelBtn.shouldBe(Condition.disappear);
-  }
-
-  protected boolean isConfirmationModalVisible() {
-    return isVisible(confirmationMdl);
-  }
-
-  public enum AlertHeader {
-    SUCCESS("Success"),
-    VALIDATION_ERROR("Validation Error"),
-    BAD_REQUEST("400 Bad Request");
-
-    private final String value;
-
-    AlertHeader(String value) {
-      this.value = value;
+
+    protected SelenideElement getTableElement(String elementName) {
+        log.debug("\ngetTableElement: {}", elementName);
+        return $x(String.format(tableElementNameLocator, elementName));
     }
 
-    public String toString() {
-      return value;
+    protected String getAlertHeader() {
+        log.debug("\ngetAlertHeader");
+        String result = alertHeader.shouldBe(Condition.visible).getText();
+        log.debug("-> {}", result);
+        return result;
+    }
+
+    protected String getAlertMessage() {
+        log.debug("\ngetAlertMessage");
+        String result = alertMessage.shouldBe(Condition.visible).getText();
+        log.debug("-> {}", result);
+        return result;
+    }
+
+    protected boolean isAlertVisible(AlertHeader header) {
+        log.debug("\nisAlertVisible: {}", header.toString());
+        boolean result = getAlertHeader().equals(header.toString());
+        log.debug("-> {}", result);
+        return result;
+    }
+
+    protected boolean isAlertVisible(AlertHeader header, String message) {
+        log.debug("\nisAlertVisible: {} {}", header, message);
+        boolean result = isAlertVisible(header) && getAlertMessage().equals(message);
+        log.debug("-> {}", result);
+        return result;
+    }
+
+    protected void clickConfirmButton() {
+        confirmBtn.shouldBe(Condition.enabled).click();
+        confirmBtn.shouldBe(Condition.disappear);
+    }
+
+    protected void clickCancelButton() {
+        cancelBtn.shouldBe(Condition.enabled).click();
+        cancelBtn.shouldBe(Condition.disappear);
+    }
+
+    protected boolean isConfirmationModalVisible() {
+        return isVisible(confirmationMdl);
+    }
+
+    public enum AlertHeader {
+        SUCCESS("Success"),
+        VALIDATION_ERROR("Validation Error"),
+        BAD_REQUEST("400 Bad Request");
+
+        private final String value;
+
+        AlertHeader(String value) {
+            this.value = value;
+        }
+
+        public String toString() {
+            return value;
+        }
     }
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
index b70bf7755aa..3c5b0fe6d9f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
@@ -1,16 +1,17 @@
 package com.provectus.kafka.ui.pages;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
-
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import io.qameta.allure.Step;
+
 import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
+
 public class NaviSideBar extends BasePage {
 
     protected SelenideElement dashboardMenuItem = $x("//a[@title='Dashboard']");
@@ -45,6 +46,13 @@ public NaviSideBar openSideMenu(SideMenuOption option) {
         return this;
     }
 
+    public List<SelenideElement> getAllMenuButtons() {
+        expandCluster(CLUSTER_NAME);
+        return Stream.of(SideMenuOption.values())
+                .map(option -> $x(String.format(sideMenuOptionElementLocator, option.value)))
+                .collect(Collectors.toList());
+    }
+
     public enum SideMenuOption {
         DASHBOARD("Dashboard"),
         BROKERS("Brokers"),
@@ -60,11 +68,4 @@ public enum SideMenuOption {
             this.value = value;
         }
     }
-
-    public List<SelenideElement> getAllMenuButtons() {
-        expandCluster(CLUSTER_NAME);
-        return Stream.of(SideMenuOption.values())
-                .map(option -> $x(String.format(sideMenuOptionElementLocator, option.value)))
-                .collect(Collectors.toList());
-    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
index 5e5a3176471..28de4fe0588 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
@@ -1,12 +1,14 @@
 package com.provectus.kafka.ui.pages;
 
-import static com.codeborne.selenide.Selenide.$x;
-
 import com.codeborne.selenide.SelenideElement;
+
 import java.util.Arrays;
 import java.util.List;
 
-public class TopPanel extends BasePage{
+import static com.codeborne.selenide.Selenide.$x;
+
+public class TopPanel extends BasePage {
+
     protected SelenideElement kafkaLogo = $x("//a[contains(text(),'UI for Apache Kafka')]");
     protected SelenideElement kafkaVersion = $x("//a[@title='Current commit']");
     protected SelenideElement logOutBtn = $x("//button[contains(text(),'Log out')]");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
index 70bba6047a8..7b37d6709c8 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
@@ -1,40 +1,41 @@
 package com.provectus.kafka.ui.pages.brokers;
 
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
-
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+
 public class BrokersConfigTab extends BasePage {
 
-  protected List<SelenideElement> editBtn = $$x("//button[@aria-label='editAction']");
-  protected SelenideElement searchByKeyField = $x("//input[@placeholder='Search by Key']");
-
-  @Step
-  public BrokersConfigTab waitUntilScreenReady(){
-    waitUntilSpinnerDisappear();
-    searchByKeyField.shouldBe(Condition.visible);
-    return this;
-  }
-
-  @Step
-  public boolean isSearchByKeyVisible() {
-   return isVisible(searchByKeyField);
-  }
-
-  public List<SelenideElement> getColumnHeaders() {
-    return Stream.of("Key", "Value", "Source")
-        .map(name -> $x(String.format(columnHeaderLocator, name)))
-        .collect(Collectors.toList());
-  }
-
-  public List<SelenideElement> getEditButtons() {
-    return editBtn;
-  }
+    protected List<SelenideElement> editBtn = $$x("//button[@aria-label='editAction']");
+    protected SelenideElement searchByKeyField = $x("//input[@placeholder='Search by Key']");
+
+    @Step
+    public BrokersConfigTab waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        searchByKeyField.shouldBe(Condition.visible);
+        return this;
+    }
+
+    @Step
+    public boolean isSearchByKeyVisible() {
+        return isVisible(searchByKeyField);
+    }
+
+    public List<SelenideElement> getColumnHeaders() {
+        return Stream.of("Key", "Value", "Source")
+                .map(name -> $x(String.format(columnHeaderLocator, name)))
+                .collect(Collectors.toList());
+    }
+
+    public List<SelenideElement> getEditButtons() {
+        return editBtn;
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
index 4eca65f1f47..8cc3dd98bad 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
@@ -1,91 +1,92 @@
 package com.provectus.kafka.ui.pages.brokers;
 
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$x;
-
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+import org.openqa.selenium.By;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
 
 public class BrokersDetails extends BasePage {
 
-  protected SelenideElement logDirectoriesTab = $x("//a[text()='Log directories']");
-  protected SelenideElement metricsTab = $x("//a[text()='Metrics']");
-  protected String brokersTabLocator = "//a[text()='%s']";
-
-  @Step
-  public BrokersDetails waitUntilScreenReady() {
-    waitUntilSpinnerDisappear();
-    Arrays.asList(logDirectoriesTab, metricsTab).forEach(element -> element.shouldBe(Condition.visible));
-    return this;
-  }
-
-  @Step
-  public BrokersDetails openDetailsTab(DetailsTab menu) {
-    $(By.linkText(menu.toString())).shouldBe(Condition.enabled).click();
-    waitUntilSpinnerDisappear();
-    return this;
-  }
-
-  private List<SelenideElement> getVisibleColumnHeaders() {
-    return Stream.of("Name", "Topics", "Error", "Partitions")
-        .map(name -> $x(String.format(columnHeaderLocator, name)))
-        .collect(Collectors.toList());
-  }
-
-  private List<SelenideElement> getEnabledColumnHeaders() {
-    return Stream.of("Name", "Error")
-        .map(name -> $x(String.format(columnHeaderLocator, name)))
-        .collect(Collectors.toList());
-  }
-
-  private List<SelenideElement> getVisibleSummaryCells() {
-    return Stream.of("Segment Size", "Segment Count", "Port", "Host")
-        .map(name -> $x(String.format(summaryCellLocator, name)))
-        .collect(Collectors.toList());
-  }
-
-  private List<SelenideElement> getDetailsTabs() {
-    return Stream.of(DetailsTab.values())
-        .map(name -> $x(String.format(brokersTabLocator, name)))
-        .collect(Collectors.toList());
-  }
-
-  @Step
-  public List<SelenideElement> getAllEnabledElements() {
-    List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
-    enabledElements.addAll(getDetailsTabs());
-    return enabledElements;
-  }
-
-  @Step
-  public List<SelenideElement> getAllVisibleElements() {
-    List<SelenideElement> visibleElements = new ArrayList<>(getVisibleSummaryCells());
-    visibleElements.addAll(getVisibleColumnHeaders());
-    visibleElements.addAll(getDetailsTabs());
-    return visibleElements;
-  }
-
-  public enum DetailsTab {
-    LOG_DIRECTORIES("Log directories"),
-    CONFIGS("Configs"),
-    METRICS("Metrics");
-
-    private final String value;
-
-    DetailsTab(String value) {
-      this.value = value;
+    protected SelenideElement logDirectoriesTab = $x("//a[text()='Log directories']");
+    protected SelenideElement metricsTab = $x("//a[text()='Metrics']");
+    protected String brokersTabLocator = "//a[text()='%s']";
+
+    @Step
+    public BrokersDetails waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        Arrays.asList(logDirectoriesTab, metricsTab).forEach(element -> element.shouldBe(Condition.visible));
+        return this;
+    }
+
+    @Step
+    public BrokersDetails openDetailsTab(DetailsTab menu) {
+        $(By.linkText(menu.toString())).shouldBe(Condition.enabled).click();
+        waitUntilSpinnerDisappear();
+        return this;
+    }
+
+    private List<SelenideElement> getVisibleColumnHeaders() {
+        return Stream.of("Name", "Topics", "Error", "Partitions")
+                .map(name -> $x(String.format(columnHeaderLocator, name)))
+                .collect(Collectors.toList());
     }
 
-    public String toString() {
-      return value;
+    private List<SelenideElement> getEnabledColumnHeaders() {
+        return Stream.of("Name", "Error")
+                .map(name -> $x(String.format(columnHeaderLocator, name)))
+                .collect(Collectors.toList());
+    }
+
+    private List<SelenideElement> getVisibleSummaryCells() {
+        return Stream.of("Segment Size", "Segment Count", "Port", "Host")
+                .map(name -> $x(String.format(summaryCellLocator, name)))
+                .collect(Collectors.toList());
+    }
+
+    private List<SelenideElement> getDetailsTabs() {
+        return Stream.of(DetailsTab.values())
+                .map(name -> $x(String.format(brokersTabLocator, name)))
+                .collect(Collectors.toList());
+    }
+
+    @Step
+    public List<SelenideElement> getAllEnabledElements() {
+        List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
+        enabledElements.addAll(getDetailsTabs());
+        return enabledElements;
+    }
+
+    @Step
+    public List<SelenideElement> getAllVisibleElements() {
+        List<SelenideElement> visibleElements = new ArrayList<>(getVisibleSummaryCells());
+        visibleElements.addAll(getVisibleColumnHeaders());
+        visibleElements.addAll(getDetailsTabs());
+        return visibleElements;
+    }
+
+    public enum DetailsTab {
+        LOG_DIRECTORIES("Log directories"),
+        CONFIGS("Configs"),
+        METRICS("Metrics");
+
+        private final String value;
+
+        DetailsTab(String value) {
+            this.value = value;
+        }
+
+        public String toString() {
+            return value;
+        }
     }
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
index 239a6359343..6db2d20ad65 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -1,123 +1,124 @@
 package com.provectus.kafka.ui.pages.brokers;
 
-import static com.codeborne.selenide.Selenide.$x;
-
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 public class BrokersList extends BasePage {
 
-  protected SelenideElement brokersListHeader = $x("//h1[text()='Brokers']");
-
-  @Step
-  public BrokersList waitUntilScreenReady() {
-    waitUntilSpinnerDisappear();
-    brokersListHeader.shouldBe(Condition.visible);
-    return this;
-  }
-
-  @Step
-  public BrokersList openBroker(int brokerId) {
-    getBrokerItem(brokerId).openItem();
-    return this;
-  }
-
-  private List<SelenideElement> getUptimeSummaryCells() {
-    return Stream.of("Broker Count", "Active Controller", "Version")
-        .map(name -> $x(String.format(summaryCellLocator, name)))
-        .collect(Collectors.toList());
-  }
-
-  private List<SelenideElement> getPartitionsSummaryCells() {
-    return Stream.of("Online", "URP", "In Sync Replicas", "Out Of Sync Replicas")
-        .map(name -> $x(String.format(summaryCellLocator, name)))
-        .collect(Collectors.toList());
-  }
-
-  @Step
-  public List<SelenideElement> getAllVisibleElements() {
-    List<SelenideElement> visibleElements = new ArrayList<>(getUptimeSummaryCells());
-    visibleElements.addAll(getPartitionsSummaryCells());
-    return visibleElements;
-  }
-
-  private List<SelenideElement> getEnabledColumnHeaders() {
-    return Stream.of("Broker ID", "Segment Size", "Segment Count", "Port", "Host")
-        .map(name -> $x(String.format(columnHeaderLocator, name)))
-        .collect(Collectors.toList());
-  }
-
-  @Step
-  public List<SelenideElement> getAllEnabledElements() {
-    return getEnabledColumnHeaders();
-  }
-
-  private List<BrokersList.BrokerGridItem> initGridItems() {
-    List<BrokersList.BrokerGridItem> gridItemList = new ArrayList<>();
-    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-        .forEach(item -> gridItemList.add(new BrokersList.BrokerGridItem(item)));
-    return gridItemList;
-  }
-
-  @Step
-  public BrokerGridItem getBrokerItem(int id){
-    return initGridItems().stream()
-        .filter(e ->e.getId() == id)
-        .findFirst().orElse(null);
-  }
-
-  @Step
-  public List<BrokerGridItem> getAllBrokers(){
-    return initGridItems();
-  }
-
-  public static class BrokerGridItem extends BasePage {
-
-    private final SelenideElement element;
-
-    public BrokerGridItem(SelenideElement element) {
-      this.element = element;
-    }
+    protected SelenideElement brokersListHeader = $x("//h1[text()='Brokers']");
 
-    private SelenideElement getIdElm() {
-      return element.$x("./td[1]/div/a");
+    @Step
+    public BrokersList waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        brokersListHeader.shouldBe(Condition.visible);
+        return this;
     }
 
     @Step
-    public int getId() {
-      return Integer.parseInt(getIdElm().getText().trim());
+    public BrokersList openBroker(int brokerId) {
+        getBrokerItem(brokerId).openItem();
+        return this;
     }
 
-    @Step
-    public void openItem() {
-      getIdElm().click();
+    private List<SelenideElement> getUptimeSummaryCells() {
+        return Stream.of("Broker Count", "Active Controller", "Version")
+                .map(name -> $x(String.format(summaryCellLocator, name)))
+                .collect(Collectors.toList());
+    }
+
+    private List<SelenideElement> getPartitionsSummaryCells() {
+        return Stream.of("Online", "URP", "In Sync Replicas", "Out Of Sync Replicas")
+                .map(name -> $x(String.format(summaryCellLocator, name)))
+                .collect(Collectors.toList());
     }
 
     @Step
-    public int getSegmentSize(){
-      return Integer.parseInt(element.$x("./td[2]").getText().trim());
+    public List<SelenideElement> getAllVisibleElements() {
+        List<SelenideElement> visibleElements = new ArrayList<>(getUptimeSummaryCells());
+        visibleElements.addAll(getPartitionsSummaryCells());
+        return visibleElements;
+    }
+
+    private List<SelenideElement> getEnabledColumnHeaders() {
+        return Stream.of("Broker ID", "Segment Size", "Segment Count", "Port", "Host")
+                .map(name -> $x(String.format(columnHeaderLocator, name)))
+                .collect(Collectors.toList());
     }
 
     @Step
-    public int getSegmentCount(){
-      return Integer.parseInt(element.$x("./td[3]").getText().trim());
+    public List<SelenideElement> getAllEnabledElements() {
+        return getEnabledColumnHeaders();
+    }
+
+    private List<BrokersList.BrokerGridItem> initGridItems() {
+        List<BrokersList.BrokerGridItem> gridItemList = new ArrayList<>();
+        allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+                .forEach(item -> gridItemList.add(new BrokersList.BrokerGridItem(item)));
+        return gridItemList;
     }
 
     @Step
-    public int getPort(){
-      return Integer.parseInt(element.$x("./td[4]").getText().trim());
+    public BrokerGridItem getBrokerItem(int id) {
+        return initGridItems().stream()
+                .filter(e -> e.getId() == id)
+                .findFirst().orElseThrow();
     }
 
     @Step
-    public String getHost(){
-      return element.$x("./td[5]").getText().trim();
+    public List<BrokerGridItem> getAllBrokers() {
+        return initGridItems();
+    }
+
+    public static class BrokerGridItem extends BasePage {
+
+        private final SelenideElement element;
+
+        public BrokerGridItem(SelenideElement element) {
+            this.element = element;
+        }
+
+        private SelenideElement getIdElm() {
+            return element.$x("./td[1]/div/a");
+        }
+
+        @Step
+        public int getId() {
+            return Integer.parseInt(getIdElm().getText().trim());
+        }
+
+        @Step
+        public void openItem() {
+            getIdElm().click();
+        }
+
+        @Step
+        public int getSegmentSize() {
+            return Integer.parseInt(element.$x("./td[2]").getText().trim());
+        }
+
+        @Step
+        public int getSegmentCount() {
+            return Integer.parseInt(element.$x("./td[3]").getText().trim());
+        }
+
+        @Step
+        public int getPort() {
+            return Integer.parseInt(element.$x("./td[4]").getText().trim());
+        }
+
+        @Step
+        public String getHost() {
+            return element.$x("./td[5]").getText().trim();
+        }
     }
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java
similarity index 89%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java
index 093341cd646..7bc2aa88aa9 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java
@@ -1,12 +1,12 @@
-package com.provectus.kafka.ui.pages.connector;
-
-import static com.codeborne.selenide.Selenide.$x;
+package com.provectus.kafka.ui.pages.connectors;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 public class ConnectorCreateForm extends BasePage {
 
     protected SelenideElement nameField = $x("//input[@name='name']");
@@ -31,8 +31,8 @@ public ConnectorCreateForm setConnectorDetails(String connectName, String config
 
     @Step
     public ConnectorCreateForm clickSubmitButton() {
-      clickSubmitBtn();
-      waitUntilSpinnerDisappear();
-      return this;
+        clickSubmitBtn();
+        waitUntilSpinnerDisappear();
+        return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorDetails.java
similarity index 62%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorDetails.java
index 291c4aa6f3f..fbe1984ce33 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorDetails.java
@@ -1,28 +1,28 @@
-package com.provectus.kafka.ui.pages.connector;
-
-import static com.codeborne.selenide.Selenide.$x;
+package com.provectus.kafka.ui.pages.connectors;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 public class ConnectorDetails extends BasePage {
 
-  protected SelenideElement deleteBtn = $x("//li/div[contains(text(),'Delete')]");
-  protected SelenideElement confirmBtnMdl = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
-  protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
-  protected SelenideElement taskTab = $x("//a[contains(text(),'Tasks')]");
-  protected SelenideElement configTab = $x("//a[contains(text(),'Config')]");
-  protected SelenideElement configField = $x("//div[@id='config']");
-  protected String connectorHeaderLocator = "//h1[contains(text(),'%s')]";
+    protected SelenideElement deleteBtn = $x("//li/div[contains(text(),'Delete')]");
+    protected SelenideElement confirmBtnMdl = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
+    protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
+    protected SelenideElement taskTab = $x("//a[contains(text(),'Tasks')]");
+    protected SelenideElement configTab = $x("//a[contains(text(),'Config')]");
+    protected SelenideElement configField = $x("//div[@id='config']");
+    protected String connectorHeaderLocator = "//h1[contains(text(),'%s')]";
 
-  @Step
-  public ConnectorDetails waitUntilScreenReady() {
-    waitUntilSpinnerDisappear();
-    dotMenuBtn.shouldBe(Condition.visible);
-    return this;
-  }
+    @Step
+    public ConnectorDetails waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        dotMenuBtn.shouldBe(Condition.visible);
+        return this;
+    }
 
     @Step
     public ConnectorDetails openConfigTab() {
@@ -41,8 +41,8 @@ public ConnectorDetails setConfig(String configJson) {
 
     @Step
     public ConnectorDetails clickSubmitButton() {
-      clickSubmitBtn();
-      return this;
+        clickSubmitBtn();
+        return this;
     }
 
     @Step
@@ -74,11 +74,11 @@ public ConnectorDetails deleteConnector() {
 
     @Step
     public boolean isConnectorHeaderVisible(String connectorName) {
-        return isVisible($x(String.format(connectorHeaderLocator,connectorName)));
+        return isVisible($x(String.format(connectorHeaderLocator, connectorName)));
     }
 
     @Step
-    public boolean isAlertWithMessageVisible(AlertHeader header, String message){
-      return isAlertVisible(header, message);
+    public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
+        return isAlertVisible(header, message);
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java
similarity index 77%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java
index b86734b2dc6..3be18265118 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java
@@ -1,26 +1,26 @@
-package com.provectus.kafka.ui.pages.connector;
-
-import static com.codeborne.selenide.Selenide.$x;
+package com.provectus.kafka.ui.pages.connectors;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 
 public class KafkaConnectList extends BasePage {
 
     protected SelenideElement createConnectorBtn = $x("//button[contains(text(),'Create Connector')]");
 
-    public KafkaConnectList(){
+    public KafkaConnectList() {
         tableElementNameLocator = "//tbody//td[contains(text(),'%s')]";
     }
 
     @Step
     public KafkaConnectList waitUntilScreenReady() {
-      waitUntilSpinnerDisappear();
-      createConnectorBtn.shouldBe(Condition.visible);
-      return this;
+        waitUntilSpinnerDisappear();
+        createConnectorBtn.shouldBe(Condition.visible);
+        return this;
     }
 
     @Step
@@ -31,7 +31,7 @@ public KafkaConnectList clickCreateConnectorBtn() {
 
     @Step
     public KafkaConnectList openConnector(String connectorName) {
-      getTableElement(connectorName).shouldBe(Condition.enabled).click();
+        getTableElement(connectorName).shouldBe(Condition.enabled).click();
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersDetails.java
similarity index 95%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersDetails.java
index dabdff88ec0..240dc613c4e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersDetails.java
@@ -1,11 +1,11 @@
-package com.provectus.kafka.ui.pages.consumer;
-
-import static com.codeborne.selenide.Selenide.$x;
+package com.provectus.kafka.ui.pages.consumers;
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 public class ConsumersDetails extends BasePage {
 
     protected String consumerIdHeaderLocator = "//h1[contains(text(),'%s')]";
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
similarity index 84%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
index 07824736bea..b3a3be42a21 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumer/ConsumersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
@@ -1,9 +1,10 @@
-package com.provectus.kafka.ui.pages.consumer;
-
-import static com.codeborne.selenide.Selenide.$x;
+package com.provectus.kafka.ui.pages.consumers;
 
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
+
+import static com.codeborne.selenide.Selenide.$x;
+
 public class ConsumersList extends BasePage {
 
     protected SelenideElement consumerListHeader = $x("//h1[text()='Consumers']");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
similarity index 95%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
index ec735df65a7..84c23d0ac3f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.ksqldb;
+package com.provectus.kafka.ui.pages.ksqlDb;
 
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
@@ -7,7 +7,7 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
-import com.provectus.kafka.ui.pages.ksqldb.enums.KsqlMenuTabs;
+import com.provectus.kafka.ui.pages.ksqlDb.enums.KsqlMenuTabs;
 import io.qameta.allure.Step;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -50,7 +50,7 @@ private List<KsqlDbList.KsqlTablesGridItem> initTablesItems() {
   public KsqlDbList.KsqlTablesGridItem getTableByName(String tableName) {
     return initTablesItems().stream()
         .filter(e -> e.getTableName().equals(tableName))
-        .findFirst().orElse(null);
+        .findFirst().orElseThrow();
   }
 
   public static class KsqlTablesGridItem extends BasePage {
@@ -98,7 +98,7 @@ private List<KsqlDbList.KsqlStreamsGridItem> initStreamsItems() {
   public KsqlDbList.KsqlStreamsGridItem getStreamByName(String streamName) {
     return initStreamsItems().stream()
         .filter(e -> e.getStreamName().equals(streamName))
-        .findFirst().orElse(null);
+        .findFirst().orElseThrow();
   }
 
   public static class KsqlStreamsGridItem extends BasePage {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
similarity index 97%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
index 21ceacdbb7f..e34fbedb1cb 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.ksqldb;
+package com.provectus.kafka.ui.pages.ksqlDb;
 
 import static com.codeborne.selenide.Condition.visible;
 import static com.codeborne.selenide.Selenide.$$x;
@@ -24,7 +24,7 @@ public class KsqlQueryForm extends BasePage {
   protected SelenideElement queryAreaValue = $x("//div[@class='ace_content']");
   protected SelenideElement queryArea = $x("//div[@id='ksql']/textarea[@class='ace_text-input']");
   protected ElementsCollection ksqlGridItems = $$x("//tbody//tr");
-  protected ElementsCollection keyField = $$x("//input[@aria-label='value']");
+  protected ElementsCollection keyField = $$x("//input[@aria-label='key']");
   protected ElementsCollection valueField = $$x("//input[@aria-label='value']");
 
   @Step
@@ -89,7 +89,7 @@ private List<KsqlQueryForm.KsqlResponseGridItem> initItems() {
   public KsqlQueryForm.KsqlResponseGridItem getTableByName(String name) {
     return initItems().stream()
         .filter(e -> e.getName().equalsIgnoreCase(name))
-        .findFirst().orElse(null);
+        .findFirst().orElseThrow();
   }
 
   public static class KsqlResponseGridItem extends BasePage {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlMenuTabs.java
similarity index 64%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlMenuTabs.java
index f3bb55d42b0..bb719dc0f6a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlMenuTabs.java
@@ -1,16 +1,17 @@
-package com.provectus.kafka.ui.pages.ksqldb.enums;
+package com.provectus.kafka.ui.pages.ksqlDb.enums;
 
 public enum KsqlMenuTabs {
+
     TABLES("Table"),
     STREAMS("Streams");
 
     private final String value;
 
     KsqlMenuTabs(String value) {
-      this.value = value;
+        this.value = value;
     }
 
     public String toString() {
-      return value;
+        return value;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlQueryConfig.java
similarity index 58%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlQueryConfig.java
index c918b079973..9f85837474e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlQueryConfig.java
@@ -1,18 +1,19 @@
-package com.provectus.kafka.ui.pages.ksqldb.enums;
+package com.provectus.kafka.ui.pages.ksqlDb.enums;
 
 public enum KsqlQueryConfig {
+
     SHOW_TABLES("show tables;"),
     SHOW_STREAMS("show streams;"),
     SELECT_ALL_FROM("SELECT * FROM %s\n" +
-        "EMIT CHANGES;");
+            "EMIT CHANGES;");
 
     private final String query;
 
     KsqlQueryConfig(String query) {
-      this.query = query;
+        this.query = query;
     }
 
-    public String getQuery(){
-      return query;
+    public String getQuery() {
+        return query;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Stream.java
similarity index 50%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Stream.java
index f61b8243866..4030a478c47 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Stream.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.ksqldb.models;
+package com.provectus.kafka.ui.pages.ksqlDb.models;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -6,5 +6,6 @@
 @Data
 @Accessors(chain = true)
 public class Stream {
-  private String name, topicName, valueFormat, partitions;
+
+    private String name, topicName, valueFormat, partitions;
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Table.java
similarity index 55%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Table.java
index cbb0c1d2a72..1856fffd85c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Table.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.ksqldb.models;
+package com.provectus.kafka.ui.pages.ksqlDb.models;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -6,5 +6,6 @@
 @Data
 @Accessors(chain = true)
 public class Table {
-  private String name, streamName;
+
+    private String name, streamName;
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java
similarity index 76%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java
index d749b5feb8b..b823b6b9925 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java
@@ -1,8 +1,4 @@
-package com.provectus.kafka.ui.pages.schema;
-
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
+package com.provectus.kafka.ui.pages.schemas;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
@@ -10,10 +6,13 @@
 import com.provectus.kafka.ui.api.model.SchemaType;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.codeborne.selenide.Selenide.*;
+
 public class SchemaCreateForm extends BasePage {
 
     protected SelenideElement schemaNameField = $x("//input[@name='subject']");
@@ -30,7 +29,7 @@ public class SchemaCreateForm extends BasePage {
     protected String ddlElementLocator = "//li[@value='%s']";
 
     @Step
-    public SchemaCreateForm waitUntilScreenReady(){
+    public SchemaCreateForm waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
         pageTitle.shouldBe(Condition.visible);
         return this;
@@ -69,25 +68,25 @@ public SchemaCreateForm selectCompatibilityLevelFromDropdown(CompatibilityLevel.
     }
 
     @Step
-    public SchemaCreateForm openSchemaVersionDdl(){
-      schemaVersionDdl.shouldBe(Condition.enabled).click();
-      return this;
+    public SchemaCreateForm openSchemaVersionDdl() {
+        schemaVersionDdl.shouldBe(Condition.enabled).click();
+        return this;
     }
 
     @Step
-    public int getVersionsNumberFromList(){
-      return elementsCompareVersionDdl.size();
+    public int getVersionsNumberFromList() {
+        return elementsCompareVersionDdl.size();
     }
 
     @Step
-    public SchemaCreateForm selectVersionFromDropDown(int versionNumberDd){
-      $x(String.format(ddlElementLocator,versionNumberDd)).shouldBe(Condition.visible).click();
-      return this;
+    public SchemaCreateForm selectVersionFromDropDown(int versionNumberDd) {
+        $x(String.format(ddlElementLocator, versionNumberDd)).shouldBe(Condition.visible).click();
+        return this;
     }
 
     @Step
-    public int getMarkedLinesNumber(){
-      return visibleMarkers.size();
+    public int getMarkedLinesNumber() {
+        return visibleMarkers.size();
     }
 
     @Step
@@ -100,23 +99,22 @@ public SchemaCreateForm setNewSchemaValue(String configJson) {
 
     @Step
     public List<SelenideElement> getAllDetailsPageElements() {
-      return Stream.of(compatibilityLevelList, newSchemaTextArea, latestSchemaTextArea, submitBtn, schemaTypeDdl)
-          .collect(Collectors.toList());
+        return Stream.of(compatibilityLevelList, newSchemaTextArea, latestSchemaTextArea, submitBtn, schemaTypeDdl)
+                .collect(Collectors.toList());
     }
 
     @Step
-    public boolean isSubmitBtnEnabled(){
-      return isEnabled(submitBtn);
+    public boolean isSubmitBtnEnabled() {
+        return isEnabled(submitBtn);
     }
 
     @Step
-    public boolean isSchemaDropDownEnabled(){
+    public boolean isSchemaDropDownEnabled() {
         boolean enabled = true;
-        try{
+        try {
             String attribute = schemaTypeDdl.getAttribute("disabled");
             enabled = false;
-        }
-        catch (Throwable ignored){
+        } catch (Throwable ignored) {
         }
         return enabled;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java
similarity index 82%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java
index ce211337099..fc7013d46f6 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java
@@ -1,12 +1,12 @@
-package com.provectus.kafka.ui.pages.schema;
-
-import static com.codeborne.selenide.Selenide.$x;
+package com.provectus.kafka.ui.pages.schemas;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 public class SchemaDetails extends BasePage {
 
     protected SelenideElement actualVersionTextArea = $x("//div[@id='schema']");
@@ -33,12 +33,12 @@ public String getCompatibility() {
 
     @Step
     public boolean isSchemaHeaderVisible(String schemaName) {
-        return isVisible($x(String.format(schemaHeaderLocator,schemaName)));
+        return isVisible($x(String.format(schemaHeaderLocator, schemaName)));
     }
 
     @Step
-    public int getLatestVersion(){
-      return Integer.parseInt(latestVersionField.getText());
+    public int getLatestVersion() {
+        return Integer.parseInt(latestVersionField.getText());
     }
 
     @Step
@@ -47,15 +47,15 @@ public String getSchemaType() {
     }
 
     @Step
-    public SchemaDetails openEditSchema(){
+    public SchemaDetails openEditSchema() {
         editSchemaBtn.shouldBe(Condition.visible).click();
         return this;
     }
 
     @Step
-    public SchemaDetails openCompareVersionMenu(){
-      compareVersionBtn.shouldBe(Condition.enabled).click();
-      return this;
+    public SchemaDetails openCompareVersionMenu() {
+        compareVersionBtn.shouldBe(Condition.enabled).click();
+        return this;
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java
similarity index 90%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java
index e6476ab1f6f..8f65947734b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java
@@ -1,18 +1,18 @@
-package com.provectus.kafka.ui.pages.schema;
-
-import static com.codeborne.selenide.Selenide.$x;
+package com.provectus.kafka.ui.pages.schemas;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 public class SchemaRegistryList extends BasePage {
 
     protected SelenideElement createSchemaBtn = $x("//button[contains(text(),'Create Schema')]");
 
     @Step
-    public SchemaRegistryList waitUntilScreenReady(){
+    public SchemaRegistryList waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
         createSchemaBtn.shouldBe(Condition.visible);
         return this;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
deleted file mode 100644
index 1ad65bdb36d..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicCreateEditForm.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package com.provectus.kafka.ui.pages.topic;
-
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$$;
-import static com.codeborne.selenide.Selenide.$x;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.codeborne.selenide.ClickOptions;
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.ElementsCollection;
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.pages.BasePage;
-import com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue;
-import com.provectus.kafka.ui.pages.topic.enums.CustomParameterType;
-import com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk;
-import com.provectus.kafka.ui.pages.topic.enums.TimeToRetain;
-import io.qameta.allure.Step;
-
-public class TopicCreateEditForm extends BasePage {
-
-  protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
-  protected SelenideElement partitionsField = $x("//input[@name='partitions']");
-  protected SelenideElement nameField = $x("//input[@name='name']");
-  protected SelenideElement maxMessageBytesField = $x("//input[@name='maxMessageBytes']");
-  protected SelenideElement minInSyncReplicasField = $x("//input[@name='minInSyncReplicas']");
-  protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
-  protected SelenideElement maxSizeOnDiscDdl = $x("//ul[@id='topicFormRetentionBytes']");
-  protected SelenideElement customParameterDdl = $x("//ul[contains(@name,'customParams')]");
-  protected SelenideElement deleteCustomParameterBtn = $x("//span[contains(@title,'Delete customParam')]");
-  protected SelenideElement addCustomParameterTypeBtn = $x("//button[contains(text(),'Add Custom Parameter')]");
-  protected SelenideElement customParameterValueField = $x("//input[@placeholder='Value']");
-  protected SelenideElement validationCustomParameterValueMsg = $x("//p[contains(text(),'Value is required')]");
-  protected String ddlElementLocator = "//li[@value='%s']";
-  protected String btnTimeToRetainLocator = "//button[@class][text()='%s']";
-
-
-  @Step
-  public TopicCreateEditForm waitUntilScreenReady() {
-    waitUntilSpinnerDisappear();
-    nameField.shouldBe(Condition.visible);
-    return this;
-  }
-
-  public boolean isCreateTopicButtonEnabled() {
-    return isEnabled(submitBtn);
-  }
-
-  public boolean isDeleteCustomParameterButtonEnabled() {
-    return isEnabled(deleteCustomParameterBtn);
-  }
-
-  public boolean isNameFieldEnabled(){
-    return isEnabled(nameField);
-  }
-
-  @Step
-  public TopicCreateEditForm setTopicName(String topicName) {
-    nameField.shouldBe(Condition.enabled).clear();
-    if (topicName != null) {
-      nameField.sendKeys(topicName);
-    }
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm setMinInsyncReplicas(Integer minInsyncReplicas) {
-    minInSyncReplicasField.setValue(minInsyncReplicas.toString());
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm setTimeToRetainDataInMs(Long ms) {
-    timeToRetainField.setValue(ms.toString());
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm setTimeToRetainDataInMs(String ms) {
-    timeToRetainField.setValue(ms);
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm setMaxSizeOnDiskInGB(MaxSizeOnDisk MaxSizeOnDisk) {
-    maxSizeOnDiscDdl.shouldBe(Condition.visible).click();
-    $x(String.format(ddlElementLocator, MaxSizeOnDisk.getOptionValue())).shouldBe(Condition.visible).click();
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm clickAddCustomParameterTypeButton() {
-    addCustomParameterTypeBtn.click();
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm setCustomParameterType(CustomParameterType customParameterType) {
-    customParameterDdl.shouldBe(Condition.visible).click();
-    $x(String.format(ddlElementLocator, customParameterType.getOptionValue())).shouldBe(Condition.visible).click();
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm clearCustomParameterValue() {
-    clearByKeyboard(customParameterValueField);
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm setMaxMessageBytes(Long bytes) {
-    maxMessageBytesField.setValue(bytes.toString());
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm setMaxMessageBytes(String bytes) {
-    return setMaxMessageBytes(Long.parseLong(bytes));
-  }
-
-  @Step
-  public TopicCreateEditForm setNumberOfPartitions(int partitions) {
-    partitionsField.shouldBe(Condition.enabled).clear();
-    partitionsField.sendKeys(String.valueOf(partitions));
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm setTimeToRetainDataByButtons(TimeToRetain timeToRetain) {
-    $x(String.format(btnTimeToRetainLocator, timeToRetain.getButton())).shouldBe(Condition.enabled).click();
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyOptionValue) {
-    cleanUpPolicyDdl.shouldBe(Condition.visible).click();
-    $x(String.format(ddlElementLocator, cleanupPolicyOptionValue.getOptionValue())).shouldBe(Condition.visible).click();
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm selectRetentionBytes(String visibleValue) {
-    return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
-  }
-
-  @Step
-  public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
-    return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
-  }
-
-  @Step
-  public TopicCreateEditForm clickCreateTopicBtn() {
-    clickSubmitBtn();
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm addCustomParameter(String customParameterName,
-                                                String customParameterValue) {
-    ElementsCollection customParametersElements =
-        $$("ul[role=listbox][name^=customParams][name$=name]");
-    KafkaUISelectElement kafkaUISelectElement = null;
-    if (customParametersElements.size() == 1) {
-      if ("Select".equals(customParametersElements.first().getText())) {
-        kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.first());
-      }
-    } else {
-      $$("button")
-          .find(Condition.exactText("Add Custom Parameter"))
-          .click();
-      customParametersElements = $$("ul[role=listbox][name^=customParams][name$=name]");
-      kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.last());
-    }
-    if (kafkaUISelectElement != null) {
-      kafkaUISelectElement.selectByVisibleText(customParameterName);
-    }
-    $(String.format("input[name=\"customParams.%d.value\"]", customParametersElements.size() - 1))
-        .setValue(customParameterValue);
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm updateCustomParameter(String customParameterName,
-                                                   String customParameterValue) {
-    SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
-        .find(Condition.exactText(customParameterName));
-    String name = selenideElement.getAttribute("name");
-    if (name != null) {
-      name = name.substring(0, name.lastIndexOf("."));
-    }
-    $(String.format("input[name^=%s]", name)).setValue(customParameterValue);
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm cleanupPolicyIs(String value) {
-    String cleanupPolicy = new KafkaUISelectElement("cleanupPolicy")
-        .getCurrentValue();
-    assertThat(cleanupPolicy)
-        .as("Clear policy value should be " + value)
-        .isEqualToIgnoringCase(value);
-    return this;
-  }
-
-  @Step
-  public TopicCreateEditForm timeToRetainIs(String time) {
-    String value = timeToRetainField.getValue();
-    assertThat(value)
-        .as("Time to retain data (in ms) should be " + time)
-        .isEqualTo(time);
-    return this;
-  }
-
-  @Step
-  public String getCleanupPolicy() {
-    return new KafkaUISelectElement("cleanupPolicy").getCurrentValue();
-  }
-
-  @Step
-  public String getTimeToRetain() {
-    return timeToRetainField.getValue();
-  }
-
-  @Step
-  public String getMaxSizeOnDisk() {
-    return new KafkaUISelectElement("retentionBytes").getCurrentValue();
-  }
-
-  @Step
-  public String getMaxMessageBytes() {
-    return maxMessageBytesField.getValue();
-  }
-
-  @Step
-  public boolean isValidationMessageCustomParameterValueVisible() {
-    return isVisible(validationCustomParameterValueMsg);
-  }
-
-  @Step
-  public String getCustomParameterValue() {
-    return customParameterValueField.getValue();
-  }
-
-  private static class KafkaUISelectElement {
-
-    private final SelenideElement selectElement;
-
-    public KafkaUISelectElement(String selectElementName) {
-      this.selectElement = $("ul[role=listbox][name=" + selectElementName + "]");
-    }
-
-    public KafkaUISelectElement(SelenideElement selectElement) {
-      this.selectElement = selectElement;
-    }
-
-    public void selectByOptionValue(String optionValue) {
-      selectElement.click();
-      selectElement
-          .$$x(".//ul/li[@role='option']")
-          .find(Condition.attribute("value", optionValue))
-          .click(ClickOptions.usingJavaScript());
-    }
-
-    public void selectByVisibleText(String visibleText) {
-      selectElement.click();
-      selectElement
-          .$$("ul>li[role=option]")
-          .find(Condition.exactText(visibleText))
-          .click();
-    }
-
-    public String getCurrentValue() {
-      return selectElement.$("li").getText();
-    }
-  }
-
-  private TopicCreateEditForm selectFromDropDownByOptionValue(String dropDownElementName,
-                                                              String optionValue) {
-    KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
-    select.selectByOptionValue(optionValue);
-    return this;
-  }
-
-  private TopicCreateEditForm selectFromDropDownByVisibleText(String dropDownElementName,
-                                                              String visibleText) {
-    KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
-    select.selectByVisibleText(visibleText);
-    return this;
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
deleted file mode 100644
index 119f602a402..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicDetails.java
+++ /dev/null
@@ -1,452 +0,0 @@
-package com.provectus.kafka.ui.pages.topic;
-
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
-import static com.codeborne.selenide.Selenide.sleep;
-import static org.apache.commons.lang.math.RandomUtils.nextInt;
-
-import com.codeborne.selenide.CollectionCondition;
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.ElementsCollection;
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.pages.BasePage;
-import io.qameta.allure.Step;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.YearMonth;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import org.openqa.selenium.By;
-
-public class TopicDetails extends BasePage {
-
-  protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
-  protected SelenideElement recreateTopicBtn = $x("//div[text()='Recreate Topic']");
-  protected SelenideElement messageAmountCell = $x("//tbody/tr/td[5]");
-  protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
-  protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
-  protected SelenideElement seekTypeDdl = $x("//ul[@id='selectSeekType']/li");
-  protected SelenideElement seekTypeField = $x("//label[text()='Seek Type']//..//div/input");
-  protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
-  protected SelenideElement savedFiltersLink = $x("//div[text()='Saved Filters']");
-  protected SelenideElement addFilterCodeModalTitle = $x("//label[text()='Filter code']");
-  protected SelenideElement addFilterCodeInput = $x("//div[@id='ace-editor']//textarea");
-  protected SelenideElement saveThisFilterCheckBoxAddFilterMdl = $x("//input[@name='saveFilter']");
-  protected SelenideElement displayNameInputAddFilterMdl = $x("//input[@placeholder='Enter Name']");
-  protected SelenideElement cancelBtnAddFilterMdl = $x("//button[text()='Cancel']");
-  protected SelenideElement addFilterBtnAddFilterMdl = $x("//button[text()='Add filter']");
-  protected SelenideElement addFiltersBtnMessages = $x("//button[text()='Add Filters']");
-  protected SelenideElement selectFilterBtnAddFilterMdl = $x("//button[text()='Select filter']");
-  protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
-  protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
-  protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
-  protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
-  protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
-  protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
-  protected SelenideElement backToCreateFiltersLink = $x("//div[text()='Back To create filters']");
-  protected ElementsCollection messageGridItems = $$x("//tbody//tr");
-  protected SelenideElement actualCalendarDate = $x("//div[@class='react-datepicker__current-month']");
-  protected SelenideElement previousMonthButton = $x("//button[@aria-label='Previous Month']");
-  protected SelenideElement nextMonthButton = $x("//button[@aria-label='Next Month']");
-  protected SelenideElement calendarTimeFld = $x("//input[@placeholder='Time']");
-  protected String dayCellLtr = "//div[@role='option'][contains(text(),'%d')]";
-  protected String seekFilterDdlLocator = "//ul[@id='selectSeekType']/ul/li[text()='%s']";
-  protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
-  protected String consumerIdLocator = "//a[@title='%s']";
-  protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
-  protected String activeFilterNameLocator = "//div[@data-testid='activeSmartFilter'][contains(text(),'%s')]";
-  protected String settingsGridValueLocator = "//tbody/tr/td/span[text()='%s']//ancestor::tr/td[2]/span";
-
-  @Step
-  public TopicDetails waitUntilScreenReady() {
-    waitUntilSpinnerDisappear();
-    overviewTab.shouldBe(Condition.visible);
-    return this;
-  }
-
-  @Step
-  public TopicDetails openDetailsTab(TopicMenu menu) {
-    $(By.linkText(menu.toString())).shouldBe(Condition.visible).click();
-    waitUntilSpinnerDisappear();
-    return this;
-  }
-
-  @Step
-  public String getSettingsGridValueByKey(String key){
-    return $x(String.format(settingsGridValueLocator, key)).scrollTo().shouldBe(Condition.visible).getText();
-  }
-
-  @Step
-  public TopicDetails openDotMenu() {
-    clickByJavaScript(dotMenuBtn);
-    return this;
-  }
-
-  @Step
-  public boolean isAlertWithMessageVisible(AlertHeader header, String message){
-    return isAlertVisible(header, message);
-  }
-
-  @Step
-  public TopicDetails clickEditSettingsMenu() {
-    editSettingsMenu.shouldBe(Condition.visible).click();
-    return this;
-  }
-
-  @Step
-  public boolean isConfirmationMdlVisible(){
-    return isConfirmationModalVisible();
-  }
-
-  @Step
-  public TopicDetails clickClearMessagesMenu() {
-    clearMessagesBtn.shouldBe(Condition.visible).click();
-    return this;
-  }
-
-  @Step
-  public TopicDetails clickRecreateTopicMenu(){
-    recreateTopicBtn.shouldBe(Condition.visible).click();
-    return this;
-  }
-
-  @Step
-  public String getCleanUpPolicy() {
-    return cleanUpPolicyField.getText();
-  }
-
-  @Step
-  public int getPartitions() {
-    return Integer.parseInt(partitionsField.getText().trim());
-  }
-
-  @Step
-  public boolean isTopicHeaderVisible(String topicName) {
-    return isVisible($x(String.format(topicHeaderLocator, topicName)));
-  }
-
-  @Step
-  public TopicDetails clickDeleteTopicMenu() {
-    removeTopicBtn.shouldBe(Condition.visible).click();
-    return this;
-  }
-
-  @Step
-  public TopicDetails clickConfirmBtnMdl() {
-    clickConfirmButton();
-    return this;
-  }
-
-  @Step
-  public TopicDetails clickProduceMessageBtn() {
-    clickByJavaScript(produceMessageBtn);
-    return this;
-  }
-
-  @Step
-  public TopicDetails selectSeekTypeDdlMessagesTab(String seekTypeName){
-    seekTypeDdl.shouldBe(Condition.enabled).click();
-    $x(String.format(seekFilterDdlLocator, seekTypeName)).shouldBe(Condition.visible).click();
-    return this;
-  }
-
-  @Step
-  public TopicDetails setSeekTypeValueFldMessagesTab(String seekTypeValue){
-    seekTypeField.shouldBe(Condition.enabled).sendKeys(seekTypeValue);
-    return this;
-  }
-
-  @Step
-  public TopicDetails clickSubmitFiltersBtnMessagesTab(){
-    clickByJavaScript(submitBtn);
-    waitUntilSpinnerDisappear();
-    return this;
-  }
-
-  @Step
-  public TopicDetails clickMessagesAddFiltersBtn() {
-    addFiltersBtn.shouldBe(Condition.enabled).click();
-    return this;
-  }
-
-  @Step
-  public TopicDetails openSavedFiltersListMdl(){
-    savedFiltersLink.shouldBe(Condition.enabled).click();
-    backToCreateFiltersLink.shouldBe(Condition.visible);
-    return this;
-  }
-
-  @Step
-  public boolean isFilterVisibleAtSavedFiltersMdl(String filterName){
-    return isVisible($x(String.format(savedFilterNameLocator,filterName)));
-  }
-
-  @Step
-  public TopicDetails selectFilterAtSavedFiltersMdl(String filterName){
-    $x(String.format(savedFilterNameLocator, filterName)).shouldBe(Condition.enabled).click();
-    return this;
-  }
-
-  @Step
-  public TopicDetails clickSelectFilterBtnAtSavedFiltersMdl(){
-    selectFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
-    addFilterCodeModalTitle.shouldBe(Condition.disappear);
-    return this;
-  }
-
-  @Step
-  public TopicDetails waitUntilAddFiltersMdlVisible() {
-    addFilterCodeModalTitle.shouldBe(Condition.visible);
-    return this;
-  }
-
-  @Step
-  public TopicDetails setFilterCodeFieldAddFilterMdl(String filterCode) {
-    addFilterCodeInput.shouldBe(Condition.enabled).sendKeys(filterCode);
-    return this;
-  }
-
-  @Step
-  public TopicDetails selectSaveThisFilterCheckboxMdl(boolean select){
-    selectElement(saveThisFilterCheckBoxAddFilterMdl, select);
-    return this;
-  }
-
-  @Step
-  public boolean isSaveThisFilterCheckBoxSelected() {
-    return isSelected(saveThisFilterCheckBoxAddFilterMdl);
-  }
-
-  @Step
-  public TopicDetails setDisplayNameFldAddFilterMdl(String displayName) {
-    displayNameInputAddFilterMdl.shouldBe(Condition.enabled).sendKeys(displayName);
-    return this;
-  }
-
-  @Step
-  public TopicDetails clickAddFilterBtnAndCloseMdl(boolean closeModal) {
-    addFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
-    if(closeModal){
-      addFilterCodeModalTitle.shouldBe(Condition.hidden);}
-    else{
-      addFilterCodeModalTitle.shouldBe(Condition.visible);
-    }
-    return this;
-  }
-
-  @Step
-  public boolean isAddFilterBtnAddFilterMdlEnabled() {
-    return isEnabled(addFilterBtnAddFilterMdl);
-  }
-
-  @Step
-  public boolean isActiveFilterVisible(String activeFilterName) {
-    return isVisible($x(String.format(activeFilterNameLocator, activeFilterName)));
-  }
-
-  public List<SelenideElement> getAllAddFilterModalVisibleElements() {
-    return Arrays.asList(savedFiltersLink, displayNameInputAddFilterMdl, addFilterBtnAddFilterMdl, cancelBtnAddFilterMdl);
-  }
-
-  public List<SelenideElement> getAllAddFilterModalEnabledElements() {
-    return Arrays.asList(displayNameInputAddFilterMdl, cancelBtnAddFilterMdl);
-  }
-
-  public List<SelenideElement> getAllAddFilterModalDisabledElements() {
-    return Arrays.asList(addFilterBtnAddFilterMdl);
-  }
-
-  @Step
-  public TopicDetails openConsumerGroup(String consumerId) {
-    $x(String.format(consumerIdLocator, consumerId)).click();
-    return this;
-  }
-
-  @Step
-  public boolean isKeyMessageVisible(String keyMessage) {
-    return keyMessage.equals($("td[title]").getText());
-  }
-
-  @Step
-  public boolean isContentMessageVisible(String contentMessage) {
-    return contentMessage.matches(contentMessageTab.getText().trim());
-  }
-
-  private void selectYear(int expectedYear) {
-    while (getActualCalendarDate().getYear() > expectedYear) {
-      clickByJavaScript(previousMonthButton);
-      sleep(1000);
-      if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
-        throw new IllegalArgumentException("Unable to select year");
-      }
-    }
-  }
-
-  private void selectMonth(int expectedMonth) {
-    while (getActualCalendarDate().getMonthValue() > expectedMonth) {
-      clickByJavaScript(previousMonthButton);
-      sleep(1000);
-      if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
-        throw new IllegalArgumentException("Unable to select month");
-      }
-    }
-  }
-
-  private void selectDay(int expectedDay) {
-    Objects.requireNonNull($$x(String.format(dayCellLtr, expectedDay)).stream()
-        .filter(day -> !Objects.requireNonNull(day.getAttribute("class")).contains("outside-month"))
-        .findFirst().orElse(null)).shouldBe(Condition.enabled).click();
-  }
-
-  private void setTime(LocalDateTime dateTime) {
-    calendarTimeFld.shouldBe(Condition.enabled)
-        .sendKeys(String.valueOf(dateTime.getHour()), String.valueOf(dateTime.getMinute()));
-  }
-
-  @Step
-  public TopicDetails selectDateAndTimeByCalendar(LocalDateTime dateTime) {
-    setTime(dateTime);
-    selectYear(dateTime.getYear());
-    selectMonth(dateTime.getMonthValue());
-    selectDay(dateTime.getDayOfMonth());
-    return this;
-  }
-
-  private LocalDate getActualCalendarDate() {
-    String monthAndYearStr = actualCalendarDate.getText().trim();
-    DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-        .parseCaseInsensitive()
-        .append(DateTimeFormatter.ofPattern("MMMM yyyy"))
-        .toFormatter(Locale.ENGLISH);
-    YearMonth yearMonth = formatter.parse(monthAndYearStr, YearMonth::from);
-    return yearMonth.atDay(1);
-  }
-
-  @Step
-  public TopicDetails openCalendarSeekType(){
-    seekTypeField.shouldBe(Condition.enabled).click();
-    actualCalendarDate.shouldBe(Condition.visible);
-    return this;
-  }
-
-  @Step
-  public int getMessageCountAmount() {
-    return Integer.parseInt(messageAmountCell.getText().trim());
-  }
-
-  private List<TopicDetails.MessageGridItem> initItems() {
-    List<TopicDetails.MessageGridItem> gridItemList = new ArrayList<>();
-    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-        .forEach(item -> gridItemList.add(new TopicDetails.MessageGridItem(item)));
-    return gridItemList;
-  }
-
-  @Step
-  public TopicDetails.MessageGridItem getMessageByOffset(int offset) {
-    return initItems().stream()
-        .filter(e -> e.getOffset() == offset)
-        .findFirst().orElse(null);
-  }
-
-  @Step
-  public List<MessageGridItem> getAllMessages(){
-    return initItems();
-  }
-
-  @Step
-  public TopicDetails.MessageGridItem getRandomMessage() {
-    return getMessageByOffset(nextInt(initItems().size() - 1));
-  }
-
-  public enum TopicMenu {
-    OVERVIEW("Overview"),
-    MESSAGES("Messages"),
-    CONSUMERS("Consumers"),
-    SETTINGS("Settings");
-
-    private final String value;
-
-    TopicMenu(String value) {
-      this.value = value;
-    }
-
-    public String toString() {
-      return value;
-    }
-  }
-
-  public static class MessageGridItem extends BasePage {
-
-    private final SelenideElement element;
-
-    private MessageGridItem(SelenideElement element) {
-      this.element = element;
-    }
-
-    @Step
-    public MessageGridItem clickExpand() {
-      clickByJavaScript(element.$x("./td[1]/span"));
-      return this;
-    }
-
-    private SelenideElement getOffsetElm() {
-      return element.$x("./td[2]");
-    }
-
-    @Step
-    public int getOffset() {
-      return Integer.parseInt(getOffsetElm().getText().trim());
-    }
-
-    @Step
-    public int getPartition() {
-      return Integer.parseInt(element.$x("./td[3]").getText().trim());
-    }
-
-    @Step
-    public LocalDateTime getTimestamp() {
-      String timestampValue = element.$x("./td[4]/div").getText().trim();
-      DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d/yyyy, HH:mm:ss");
-      return LocalDateTime.parse(timestampValue, formatter);
-    }
-
-    @Step
-    public String getKey() {
-      return element.$x("./td[5]").getText().trim();
-    }
-
-    @Step
-    public String getValue() {
-      return element.$x("./td[6]/span/p").getText().trim();
-    }
-
-    @Step
-    public MessageGridItem openDotMenu() {
-      getOffsetElm().hover();
-      element.$x("./td[7]/div/button[@aria-label='Dropdown Toggle']")
-          .shouldBe(Condition.visible).click();
-      return this;
-    }
-
-    @Step
-    public MessageGridItem clickCopyToClipBoard() {
-      clickByJavaScript(element.$x("./td[7]//li[text() = 'Copy to clipboard']")
-          .shouldBe(Condition.visible));
-      return this;
-    }
-
-    @Step
-    public MessageGridItem clickSaveAsFile() {
-      clickByJavaScript(element.$x("./td[7]//li[text() = 'Save as a file']")
-          .shouldBe(Condition.visible));
-      return this;
-    }
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicSettingsTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicSettingsTab.java
deleted file mode 100644
index 4bf78fb2af0..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicSettingsTab.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.provectus.kafka.ui.pages.topic;
-
-import static com.codeborne.selenide.Selenide.$x;
-
-import com.codeborne.selenide.CollectionCondition;
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.pages.BasePage;
-import io.qameta.allure.Step;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TopicSettingsTab extends BasePage {
-
-  protected SelenideElement defaultValueColumnHeaderLocator = $x("//div[text() = 'Default Value']");
-
-  @Step
-  public TopicSettingsTab waitUntilScreenReady(){
-    waitUntilSpinnerDisappear();
-    defaultValueColumnHeaderLocator.shouldBe(Condition.visible);
-    return this;
-  }
-
-  private List<SettingsGridItem> initGridItems() {
-    List<SettingsGridItem> gridItemList = new ArrayList<>();
-    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-        .forEach(item -> gridItemList.add(new SettingsGridItem(item)));
-    return gridItemList;
-  }
-
-  private TopicSettingsTab.SettingsGridItem getItemByKey(String key){
-    return initGridItems().stream()
-        .filter(e ->e.getKey().equals(key))
-        .findFirst().orElse(null);
-  }
-
-  @Step
-  public String getValueByKey(String key){
-    return getItemByKey(key).getValue();
-  }
-
-  public static class SettingsGridItem extends BasePage {
-
-    private final SelenideElement element;
-
-    public SettingsGridItem(SelenideElement element) {
-      this.element = element;
-    }
-
-    @Step
-    public String getKey(){
-      return element.$x("./td[1]/span").getText().trim();
-    }
-
-    @Step
-    public String getValue(){
-      return element.$x("./td[2]/span").getText().trim();
-    }
-
-    @Step
-    public String getDefaultValue() {
-      return element.$x("./td[3]/span").getText().trim();
-    }
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
deleted file mode 100644
index 6280ffe8a47..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package com.provectus.kafka.ui.pages.topic;
-
-import static com.codeborne.selenide.Condition.visible;
-import static com.codeborne.selenide.Selenide.$x;
-
-import com.codeborne.selenide.CollectionCondition;
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.pages.BasePage;
-import io.qameta.allure.Step;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class TopicsList extends BasePage {
-
-    protected SelenideElement topicListHeader = $x("//h1[text()='Topics']");
-    protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
-    protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
-    protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
-    protected SelenideElement deleteSelectedTopicsBtn = $x("//button[text()='Delete selected topics']");
-    protected SelenideElement copySelectedTopicBtn = $x("//button[text()='Copy selected topic']");
-    protected SelenideElement purgeMessagesOfSelectedTopicsBtn = $x("//button[text()='Purge messages of selected topics']");
-    protected SelenideElement clearMessagesBtn = $x("//ul[contains(@class ,'open')]//div[text()='Clear Messages']");
-    protected SelenideElement recreateTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Recreate Topic']");
-    protected SelenideElement removeTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Remove Topic']");
-
-    @Step
-    public TopicsList waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        topicListHeader.shouldBe(visible);
-        return this;
-    }
-
-    @Step
-    public TopicsList clickAddTopicBtn() {
-        clickByJavaScript(addTopicBtn);
-        return this;
-    }
-
-    @Step
-    public boolean isTopicVisible(String topicName) {
-        tableGrid.shouldBe(visible);
-        return isVisible(getTableElement(topicName));
-    }
-
-    @Step
-    public boolean isShowInternalRadioBtnSelected() {
-      return isSelected(showInternalRadioBtn);
-    }
-
-    @Step
-    public TopicsList setShowInternalRadioButton(boolean select) {
-      selectElement(showInternalRadioBtn, select);
-      return this;
-    }
-
-    @Step
-    public TopicsList openTopic(String topicName) {
-        getTopicItem(topicName).openItem();
-        return this;
-    }
-
-    @Step
-    public TopicsList openDotMenuByTopicName(String topicName){
-      getTopicItem(topicName).openDotMenu();
-      return this;
-    }
-
-    @Step
-    public boolean isCopySelectedTopicBtnEnabled(){
-      return isEnabled(copySelectedTopicBtn);
-    }
-
-    @Step
-    public List<SelenideElement> getActionButtons() {
-      return Stream.of(deleteSelectedTopicsBtn, copySelectedTopicBtn, purgeMessagesOfSelectedTopicsBtn)
-          .collect(Collectors.toList());
-    }
-
-    @Step
-    public TopicsList clickCopySelectedTopicBtn(){
-      copySelectedTopicBtn.shouldBe(Condition.enabled).click();
-      return this;
-    }
-
-    @Step
-    public TopicsList clickPurgeMessagesOfSelectedTopicsBtn(){
-    purgeMessagesOfSelectedTopicsBtn.shouldBe(Condition.enabled).click();
-    return this;
-    }
-
-    @Step
-    public TopicsList clickClearMessagesBtn(){
-      clickByJavaScript(clearMessagesBtn.shouldBe(visible));
-      return this;
-    }
-
-    @Step
-    public TopicsList clickRecreateTopicBtn(){
-      clickByJavaScript(recreateTopicBtn.shouldBe(visible));
-      return this;
-    }
-
-    @Step
-    public TopicsList clickRemoveTopicBtn(){
-      clickByJavaScript(removeTopicBtn.shouldBe(visible));
-      return this;
-    }
-
-    @Step
-    public TopicsList clickConfirmBtnMdl() {
-    clickConfirmButton();
-    return this;
-    }
-
-    @Step
-    public TopicsList clickCancelBtnMdl(){
-      clickCancelButton();
-      return this;
-    }
-
-    @Step
-    public boolean isConfirmationMdlVisible(){
-      return isConfirmationModalVisible();
-    }
-
-    @Step
-    public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
-      return isAlertVisible(header, message);
-    }
-
-    private List<SelenideElement> getVisibleColumnHeaders() {
-      return Stream.of("Replication Factor","Number of messages","Topic Name", "Partitions", "Out of sync replicas", "Size")
-          .map(name -> $x(String.format(columnHeaderLocator, name)))
-        .collect(Collectors.toList());
-    }
-
-    private List<SelenideElement> getEnabledColumnHeaders(){
-      return Stream.of("Topic Name", "Partitions", "Out of sync replicas", "Size")
-          .map(name -> $x(String.format(columnHeaderLocator, name)))
-          .collect(Collectors.toList());
-    }
-
-    @Step
-    public List<SelenideElement> getAllVisibleElements() {
-      List<SelenideElement> visibleElements = new ArrayList<>(getVisibleColumnHeaders());
-      visibleElements.addAll(Arrays.asList(searchField, addTopicBtn, tableGrid));
-      visibleElements.addAll(getActionButtons());
-      return visibleElements;
-    }
-
-    @Step
-    public List<SelenideElement> getAllEnabledElements() {
-      List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
-      enabledElements.addAll(Arrays.asList(searchField, showInternalRadioBtn,addTopicBtn));
-      return enabledElements;
-    }
-
-    private List<TopicGridItem> initGridItems() {
-      List<TopicGridItem> gridItemList = new ArrayList<>();
-      allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-          .forEach(item -> gridItemList.add(new TopicGridItem(item)));
-      return gridItemList;
-    }
-
-    @Step
-    public TopicGridItem getTopicItem(String name) {
-      return initGridItems().stream()
-        .filter(e -> e.getName().equals(name))
-        .findFirst().orElse(null);
-    }
-
-    @Step
-    public List<TopicGridItem> getNonInternalTopics() {
-      return initGridItems().stream()
-          .filter(e -> !e.isInternal())
-          .collect(Collectors.toList());
-    }
-
-    @Step
-    public List<TopicGridItem> getInternalTopics() {
-      return initGridItems().stream()
-          .filter(TopicGridItem::isInternal)
-          .collect(Collectors.toList());
-    }
-
-    public static class TopicGridItem extends BasePage {
-
-      private final SelenideElement element;
-
-      public TopicGridItem(SelenideElement element) {
-        this.element = element;
-      }
-
-      @Step
-      public TopicsList selectItem(boolean select) {
-         selectElement(element.$x("./td[1]/input"), select);
-         return new TopicsList();
-      }
-
-      @Step
-      public boolean isInternal() {
-        boolean internal = false;
-        try {
-          element.$x("./td[2]/a/span").shouldBe(visible, Duration.ofMillis(500));
-          internal = true;
-        } catch (Throwable ignored) {
-        }
-        return internal;
-      }
-
-      private SelenideElement getNameElm() {
-        return element.$x("./td[2]");
-      }
-
-      @Step
-      public String getName() {
-        return getNameElm().getText().trim();
-      }
-
-      @Step
-      public void openItem() {
-        getNameElm().click();
-      }
-
-      @Step
-      public int getPartition() {
-        return Integer.parseInt(element.$x("./td[3]").getText().trim());
-      }
-
-      @Step
-      public int getOutOfSyncReplicas() {
-        return Integer.parseInt(element.$x("./td[4]").getText().trim());
-      }
-
-      @Step
-      public int getReplicationFactor() {
-        return Integer.parseInt(element.$x("./td[5]").getText().trim());
-      }
-
-      @Step
-      public int getNumberOfMessages() {
-        return Integer.parseInt(element.$x("./td[6]").getText().trim());
-      }
-
-      @Step
-      public int getSize() {
-        return Integer.parseInt(element.$x("./td[7]").getText().trim());
-      }
-
-      @Step
-      public void openDotMenu(){
-        element.$x("./td[8]//button").click();
-      }
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CleanupPolicyValue.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CleanupPolicyValue.java
deleted file mode 100644
index 86b87325a0d..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CleanupPolicyValue.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.provectus.kafka.ui.pages.topic.enums;
-
-public enum CleanupPolicyValue {
-  DELETE("delete", "Delete"),
-  COMPACT("compact", "Compact"),
-  COMPACT_DELETE("compact,delete", "Compact,Delete");
-
-  private final String optionValue;
-  private final String visibleText;
-
-  CleanupPolicyValue(String optionValue, String visibleText) {
-    this.optionValue = optionValue;
-    this.visibleText = visibleText;
-  }
-
-  public String getOptionValue() {
-    return optionValue;
-  }
-
-  public String getVisibleText() {
-    return visibleText;
-  }
-}
-
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CustomParameterType.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CustomParameterType.java
deleted file mode 100644
index bc2f3befaee..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/CustomParameterType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.provectus.kafka.ui.pages.topic.enums;
-
-public enum CustomParameterType {
-  COMPRESSION_TYPE("compression.type"),
-  DELETE_RETENTION_MS("delete.retention.ms"),
-  FILE_DELETE_DELAY_MS("file.delete.delay.ms"),
-  FLUSH_MESSAGES("flush.messages"),
-  FLUSH_MS("flush.ms"),
-  FOLLOWER_REPLICATION_THROTTLED_REPLICAS("follower.replication.throttled.replicas"),
-  INDEX_INTERVAL_BYTES("index.interval.bytes"),
-  LEADER_REPLICATION_THROTTLED_REPLICAS("leader.replication.throttled.replicas"),
-  MAX_COMPACTION_LAG_MS("max.compaction.lag.ms"),
-  MESSAGE_DOWNCONVERSION_ENABLE("message.downconversion.enable"),
-  MESSAGE_FORMAT_VERSION("message.format.version"),
-  MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS("message.timestamp.difference.max.ms"),
-  MESSAGE_TIMESTAMP_TYPE("message.timestamp.type"),
-  MIN_CLEANABLE_DIRTY_RATIO("min.cleanable.dirty.ratio"),
-  MIN_COMPACTION_LAG_MS("min.compaction.lag.ms"),
-  PREALLOCATE("preallocate"),
-  RETENTION_BYTES("retention.bytes"),
-  SEGMENT_BYTES("segment.bytes"),
-  SEGMENT_INDEX_BYTES("segment.index.bytes"),
-  SEGMENT_JITTER_MS("segment.jitter.ms"),
-  SEGMENT_MS("segment.ms"),
-  UNCLEAN_LEADER_ELECTION_ENABLE("unclean.leader.election.enable");
-
-  private final String optionValue;
-
-  CustomParameterType(String optionValue) {
-    this.optionValue = optionValue;
-  }
-
-  public String getOptionValue() {
-    return optionValue;
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/MaxSizeOnDisk.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/MaxSizeOnDisk.java
deleted file mode 100644
index bdb476d1e6d..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/MaxSizeOnDisk.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.provectus.kafka.ui.pages.topic.enums;
-
-public enum MaxSizeOnDisk {
-  NOT_SET("-1", "Not Set"),
-  SIZE_1_GB("1073741824", "1 GB"),
-  SIZE_10_GB("10737418240", "10 GB"),
-  SIZE_20_GB("21474836480", "20 GB"),
-  SIZE_50_GB("53687091200", "50 GB");
-
-  private final String optionValue;
-  private final String visibleText;
-
-  MaxSizeOnDisk(String optionValue, String visibleText) {
-    this.optionValue = optionValue;
-    this.visibleText = visibleText;
-  }
-
-  public String getOptionValue() {
-    return optionValue;
-  }
-
-  public String getVisibleText() {
-    return visibleText;
-  }
-}
-
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/TimeToRetain.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/TimeToRetain.java
deleted file mode 100644
index 9d42bf800f4..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/enums/TimeToRetain.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.provectus.kafka.ui.pages.topic.enums;
-
-public enum TimeToRetain {
-  BTN_12_HOURS("12 hours", "43200000"),
-  BTN_1_DAY("1 day", "86400000"),
-  BTN_2_DAYS("2 days", "172800000"),
-  BTN_7_DAYS("7 days", "604800000"),
-  BTN_4_WEEKS("4 weeks", "2419200000");
-
-  private final String button;
-  private final String value;
-
-  TimeToRetain(String button, String value) {
-    this.button = button;
-    this.value = value;
-  }
-
-  public String getButton(){
-    return button;
-  }
-
-  public String getValue(){
-    return value;
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
similarity index 94%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
index d4dd3d8c158..a16d2c83a05 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/ProduceMessagePanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
@@ -1,14 +1,15 @@
-package com.provectus.kafka.ui.pages.topic;
-
-import static com.codeborne.selenide.Selenide.$x;
-import static com.codeborne.selenide.Selenide.refresh;
+package com.provectus.kafka.ui.pages.topics;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+
 import java.util.Arrays;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.codeborne.selenide.Selenide.refresh;
+
 public class ProduceMessagePanel extends BasePage {
 
     protected SelenideElement keyTextArea = $x("//div[@id='key']/textarea");
@@ -20,7 +21,7 @@ public class ProduceMessagePanel extends BasePage {
     protected SelenideElement contentSerdeDdl = $x("//ul[@name='valueSerde']");
 
     @Step
-    public ProduceMessagePanel waitUntilScreenReady(){
+    public ProduceMessagePanel waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
         Arrays.asList(partitionDdl, keySerdeDdl, contentSerdeDdl).forEach(element -> element.shouldBe(Condition.visible));
         return this;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
new file mode 100644
index 00000000000..7deed1b7fde
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
@@ -0,0 +1,267 @@
+package com.provectus.kafka.ui.pages.topics;
+
+import com.codeborne.selenide.ClickOptions;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue;
+import com.provectus.kafka.ui.pages.topics.enums.CustomParameterType;
+import com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk;
+import com.provectus.kafka.ui.pages.topics.enums.TimeToRetain;
+import io.qameta.allure.Step;
+
+import static com.codeborne.selenide.Selenide.*;
+
+public class TopicCreateEditForm extends BasePage {
+
+    protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
+    protected SelenideElement partitionsField = $x("//input[@name='partitions']");
+    protected SelenideElement nameField = $x("//input[@name='name']");
+    protected SelenideElement maxMessageBytesField = $x("//input[@name='maxMessageBytes']");
+    protected SelenideElement minInSyncReplicasField = $x("//input[@name='minInSyncReplicas']");
+    protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
+    protected SelenideElement maxSizeOnDiscDdl = $x("//ul[@id='topicFormRetentionBytes']");
+    protected SelenideElement customParameterDdl = $x("//ul[contains(@name,'customParams')]");
+    protected SelenideElement deleteCustomParameterBtn = $x("//span[contains(@title,'Delete customParam')]");
+    protected SelenideElement addCustomParameterTypeBtn = $x("//button[contains(text(),'Add Custom Parameter')]");
+    protected SelenideElement customParameterValueField = $x("//input[@placeholder='Value']");
+    protected SelenideElement validationCustomParameterValueMsg = $x("//p[contains(text(),'Value is required')]");
+    protected String ddlElementLocator = "//li[@value='%s']";
+    protected String btnTimeToRetainLocator = "//button[@class][text()='%s']";
+
+
+    @Step
+    public TopicCreateEditForm waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        nameField.shouldBe(Condition.visible);
+        return this;
+    }
+
+    public boolean isCreateTopicButtonEnabled() {
+        return isEnabled(submitBtn);
+    }
+
+    public boolean isDeleteCustomParameterButtonEnabled() {
+        return isEnabled(deleteCustomParameterBtn);
+    }
+
+    public boolean isNameFieldEnabled() {
+        return isEnabled(nameField);
+    }
+
+    @Step
+    public TopicCreateEditForm setTopicName(String topicName) {
+        nameField.shouldBe(Condition.enabled).clear();
+        if (topicName != null) {
+            nameField.sendKeys(topicName);
+        }
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm setMinInsyncReplicas(Integer minInsyncReplicas) {
+        minInSyncReplicasField.setValue(minInsyncReplicas.toString());
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm setTimeToRetainDataInMs(Long ms) {
+        timeToRetainField.setValue(ms.toString());
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm setTimeToRetainDataInMs(String ms) {
+        timeToRetainField.setValue(ms);
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm setMaxSizeOnDiskInGB(MaxSizeOnDisk MaxSizeOnDisk) {
+        maxSizeOnDiscDdl.shouldBe(Condition.visible).click();
+        $x(String.format(ddlElementLocator, MaxSizeOnDisk.getOptionValue())).shouldBe(Condition.visible).click();
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm clickAddCustomParameterTypeButton() {
+        addCustomParameterTypeBtn.click();
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm setCustomParameterType(CustomParameterType customParameterType) {
+        customParameterDdl.shouldBe(Condition.visible).click();
+        $x(String.format(ddlElementLocator, customParameterType.getOptionValue())).shouldBe(Condition.visible).click();
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm clearCustomParameterValue() {
+        clearByKeyboard(customParameterValueField);
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm setNumberOfPartitions(int partitions) {
+        partitionsField.shouldBe(Condition.enabled).clear();
+        partitionsField.sendKeys(String.valueOf(partitions));
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm setTimeToRetainDataByButtons(TimeToRetain timeToRetain) {
+        $x(String.format(btnTimeToRetainLocator, timeToRetain.getButton())).shouldBe(Condition.enabled).click();
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyOptionValue) {
+        cleanUpPolicyDdl.shouldBe(Condition.visible).click();
+        $x(String.format(ddlElementLocator, cleanupPolicyOptionValue.getOptionValue())).shouldBe(Condition.visible).click();
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm selectRetentionBytes(String visibleValue) {
+        return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
+    }
+
+    @Step
+    public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
+        return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
+    }
+
+    @Step
+    public TopicCreateEditForm clickCreateTopicBtn() {
+        clickSubmitBtn();
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm addCustomParameter(String customParameterName,
+                                                  String customParameterValue) {
+        ElementsCollection customParametersElements =
+                $$("ul[role=listbox][name^=customParams][name$=name]");
+        KafkaUISelectElement kafkaUISelectElement = null;
+        if (customParametersElements.size() == 1) {
+            if ("Select".equals(customParametersElements.first().getText())) {
+                kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.first());
+            }
+        } else {
+            $$("button")
+                    .find(Condition.exactText("Add Custom Parameter"))
+                    .click();
+            customParametersElements = $$("ul[role=listbox][name^=customParams][name$=name]");
+            kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.last());
+        }
+        if (kafkaUISelectElement != null) {
+            kafkaUISelectElement.selectByVisibleText(customParameterName);
+        }
+        $(String.format("input[name=\"customParams.%d.value\"]", customParametersElements.size() - 1))
+                .setValue(customParameterValue);
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm updateCustomParameter(String customParameterName,
+                                                     String customParameterValue) {
+        SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
+                .find(Condition.exactText(customParameterName));
+        String name = selenideElement.getAttribute("name");
+        if (name != null) {
+            name = name.substring(0, name.lastIndexOf("."));
+        }
+        $(String.format("input[name^=%s]", name)).setValue(customParameterValue);
+        return this;
+    }
+
+    @Step
+    public String getCleanupPolicy() {
+        return new KafkaUISelectElement("cleanupPolicy").getCurrentValue();
+    }
+
+    @Step
+    public String getTimeToRetain() {
+        return timeToRetainField.getValue();
+    }
+
+    @Step
+    public String getMaxSizeOnDisk() {
+        return new KafkaUISelectElement("retentionBytes").getCurrentValue();
+    }
+
+    @Step
+    public String getMaxMessageBytes() {
+        return maxMessageBytesField.getValue();
+    }
+
+    @Step
+    public TopicCreateEditForm setMaxMessageBytes(Long bytes) {
+        maxMessageBytesField.setValue(bytes.toString());
+        return this;
+    }
+
+    @Step
+    public TopicCreateEditForm setMaxMessageBytes(String bytes) {
+        return setMaxMessageBytes(Long.parseLong(bytes));
+    }
+
+    @Step
+    public boolean isValidationMessageCustomParameterValueVisible() {
+        return isVisible(validationCustomParameterValueMsg);
+    }
+
+    @Step
+    public String getCustomParameterValue() {
+        return customParameterValueField.getValue();
+    }
+
+    private TopicCreateEditForm selectFromDropDownByOptionValue(String dropDownElementName,
+                                                                String optionValue) {
+        KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
+        select.selectByOptionValue(optionValue);
+        return this;
+    }
+
+    private TopicCreateEditForm selectFromDropDownByVisibleText(String dropDownElementName,
+                                                                String visibleText) {
+        KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
+        select.selectByVisibleText(visibleText);
+        return this;
+    }
+
+    private static class KafkaUISelectElement {
+
+        private final SelenideElement selectElement;
+
+        public KafkaUISelectElement(String selectElementName) {
+            this.selectElement = $("ul[role=listbox][name=" + selectElementName + "]");
+        }
+
+        public KafkaUISelectElement(SelenideElement selectElement) {
+            this.selectElement = selectElement;
+        }
+
+        public void selectByOptionValue(String optionValue) {
+            selectElement.click();
+            selectElement
+                    .$$x(".//ul/li[@role='option']")
+                    .find(Condition.attribute("value", optionValue))
+                    .click(ClickOptions.usingJavaScript());
+        }
+
+        public void selectByVisibleText(String visibleText) {
+            selectElement.click();
+            selectElement
+                    .$$("ul>li[role=option]")
+                    .find(Condition.exactText(visibleText))
+                    .click();
+        }
+
+        public String getCurrentValue() {
+            return selectElement.$("li").getText();
+        }
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
new file mode 100644
index 00000000000..78ec2cef14e
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
@@ -0,0 +1,446 @@
+package com.provectus.kafka.ui.pages.topics;
+
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
+import org.openqa.selenium.By;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.util.*;
+
+import static com.codeborne.selenide.Selenide.*;
+import static org.testcontainers.shaded.org.apache.commons.lang3.RandomUtils.nextInt;
+
+public class TopicDetails extends BasePage {
+
+    protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
+    protected SelenideElement recreateTopicBtn = $x("//div[text()='Recreate Topic']");
+    protected SelenideElement messageAmountCell = $x("//tbody/tr/td[5]");
+    protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
+    protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
+    protected SelenideElement seekTypeDdl = $x("//ul[@id='selectSeekType']/li");
+    protected SelenideElement seekTypeField = $x("//label[text()='Seek Type']//..//div/input");
+    protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
+    protected SelenideElement savedFiltersLink = $x("//div[text()='Saved Filters']");
+    protected SelenideElement addFilterCodeModalTitle = $x("//label[text()='Filter code']");
+    protected SelenideElement addFilterCodeInput = $x("//div[@id='ace-editor']//textarea");
+    protected SelenideElement saveThisFilterCheckBoxAddFilterMdl = $x("//input[@name='saveFilter']");
+    protected SelenideElement displayNameInputAddFilterMdl = $x("//input[@placeholder='Enter Name']");
+    protected SelenideElement cancelBtnAddFilterMdl = $x("//button[text()='Cancel']");
+    protected SelenideElement addFilterBtnAddFilterMdl = $x("//button[text()='Add filter']");
+    protected SelenideElement addFiltersBtnMessages = $x("//button[text()='Add Filters']");
+    protected SelenideElement selectFilterBtnAddFilterMdl = $x("//button[text()='Select filter']");
+    protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
+    protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
+    protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
+    protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
+    protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
+    protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
+    protected SelenideElement backToCreateFiltersLink = $x("//div[text()='Back To create filters']");
+    protected ElementsCollection messageGridItems = $$x("//tbody//tr");
+    protected SelenideElement actualCalendarDate = $x("//div[@class='react-datepicker__current-month']");
+    protected SelenideElement previousMonthButton = $x("//button[@aria-label='Previous Month']");
+    protected SelenideElement nextMonthButton = $x("//button[@aria-label='Next Month']");
+    protected SelenideElement calendarTimeFld = $x("//input[@placeholder='Time']");
+    protected String dayCellLtr = "//div[@role='option'][contains(text(),'%d')]";
+    protected String seekFilterDdlLocator = "//ul[@id='selectSeekType']/ul/li[text()='%s']";
+    protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
+    protected String consumerIdLocator = "//a[@title='%s']";
+    protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
+    protected String activeFilterNameLocator = "//div[@data-testid='activeSmartFilter'][contains(text(),'%s')]";
+    protected String settingsGridValueLocator = "//tbody/tr/td/span[text()='%s']//ancestor::tr/td[2]/span";
+
+    @Step
+    public TopicDetails waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        overviewTab.shouldBe(Condition.visible);
+        return this;
+    }
+
+    @Step
+    public TopicDetails openDetailsTab(TopicMenu menu) {
+        $(By.linkText(menu.toString())).shouldBe(Condition.visible).click();
+        waitUntilSpinnerDisappear();
+        return this;
+    }
+
+    @Step
+    public String getSettingsGridValueByKey(String key) {
+        return $x(String.format(settingsGridValueLocator, key)).scrollTo().shouldBe(Condition.visible).getText();
+    }
+
+    @Step
+    public TopicDetails openDotMenu() {
+        clickByJavaScript(dotMenuBtn);
+        return this;
+    }
+
+    @Step
+    public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
+        return isAlertVisible(header, message);
+    }
+
+    @Step
+    public TopicDetails clickEditSettingsMenu() {
+        editSettingsMenu.shouldBe(Condition.visible).click();
+        return this;
+    }
+
+    @Step
+    public boolean isConfirmationMdlVisible() {
+        return isConfirmationModalVisible();
+    }
+
+    @Step
+    public TopicDetails clickClearMessagesMenu() {
+        clearMessagesBtn.shouldBe(Condition.visible).click();
+        return this;
+    }
+
+    @Step
+    public TopicDetails clickRecreateTopicMenu() {
+        recreateTopicBtn.shouldBe(Condition.visible).click();
+        return this;
+    }
+
+    @Step
+    public String getCleanUpPolicy() {
+        return cleanUpPolicyField.getText();
+    }
+
+    @Step
+    public int getPartitions() {
+        return Integer.parseInt(partitionsField.getText().trim());
+    }
+
+    @Step
+    public boolean isTopicHeaderVisible(String topicName) {
+        return isVisible($x(String.format(topicHeaderLocator, topicName)));
+    }
+
+    @Step
+    public TopicDetails clickDeleteTopicMenu() {
+        removeTopicBtn.shouldBe(Condition.visible).click();
+        return this;
+    }
+
+    @Step
+    public TopicDetails clickConfirmBtnMdl() {
+        clickConfirmButton();
+        return this;
+    }
+
+    @Step
+    public TopicDetails clickProduceMessageBtn() {
+        clickByJavaScript(produceMessageBtn);
+        return this;
+    }
+
+    @Step
+    public TopicDetails selectSeekTypeDdlMessagesTab(String seekTypeName) {
+        seekTypeDdl.shouldBe(Condition.enabled).click();
+        $x(String.format(seekFilterDdlLocator, seekTypeName)).shouldBe(Condition.visible).click();
+        return this;
+    }
+
+    @Step
+    public TopicDetails setSeekTypeValueFldMessagesTab(String seekTypeValue) {
+        seekTypeField.shouldBe(Condition.enabled).sendKeys(seekTypeValue);
+        return this;
+    }
+
+    @Step
+    public TopicDetails clickSubmitFiltersBtnMessagesTab() {
+        clickByJavaScript(submitBtn);
+        waitUntilSpinnerDisappear();
+        return this;
+    }
+
+    @Step
+    public TopicDetails clickMessagesAddFiltersBtn() {
+        addFiltersBtn.shouldBe(Condition.enabled).click();
+        return this;
+    }
+
+    @Step
+    public TopicDetails openSavedFiltersListMdl() {
+        savedFiltersLink.shouldBe(Condition.enabled).click();
+        backToCreateFiltersLink.shouldBe(Condition.visible);
+        return this;
+    }
+
+    @Step
+    public boolean isFilterVisibleAtSavedFiltersMdl(String filterName) {
+        return isVisible($x(String.format(savedFilterNameLocator, filterName)));
+    }
+
+    @Step
+    public TopicDetails selectFilterAtSavedFiltersMdl(String filterName) {
+        $x(String.format(savedFilterNameLocator, filterName)).shouldBe(Condition.enabled).click();
+        return this;
+    }
+
+    @Step
+    public TopicDetails clickSelectFilterBtnAtSavedFiltersMdl() {
+        selectFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
+        addFilterCodeModalTitle.shouldBe(Condition.disappear);
+        return this;
+    }
+
+    @Step
+    public TopicDetails waitUntilAddFiltersMdlVisible() {
+        addFilterCodeModalTitle.shouldBe(Condition.visible);
+        return this;
+    }
+
+    @Step
+    public TopicDetails setFilterCodeFieldAddFilterMdl(String filterCode) {
+        addFilterCodeInput.shouldBe(Condition.enabled).sendKeys(filterCode);
+        return this;
+    }
+
+    @Step
+    public TopicDetails selectSaveThisFilterCheckboxMdl(boolean select) {
+        selectElement(saveThisFilterCheckBoxAddFilterMdl, select);
+        return this;
+    }
+
+    @Step
+    public boolean isSaveThisFilterCheckBoxSelected() {
+        return isSelected(saveThisFilterCheckBoxAddFilterMdl);
+    }
+
+    @Step
+    public TopicDetails setDisplayNameFldAddFilterMdl(String displayName) {
+        displayNameInputAddFilterMdl.shouldBe(Condition.enabled).sendKeys(displayName);
+        return this;
+    }
+
+    @Step
+    public TopicDetails clickAddFilterBtnAndCloseMdl(boolean closeModal) {
+        addFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
+        if (closeModal) {
+            addFilterCodeModalTitle.shouldBe(Condition.hidden);
+        } else {
+            addFilterCodeModalTitle.shouldBe(Condition.visible);
+        }
+        return this;
+    }
+
+    @Step
+    public boolean isAddFilterBtnAddFilterMdlEnabled() {
+        return isEnabled(addFilterBtnAddFilterMdl);
+    }
+
+    @Step
+    public boolean isActiveFilterVisible(String activeFilterName) {
+        return isVisible($x(String.format(activeFilterNameLocator, activeFilterName)));
+    }
+
+    public List<SelenideElement> getAllAddFilterModalVisibleElements() {
+        return Arrays.asList(savedFiltersLink, displayNameInputAddFilterMdl, addFilterBtnAddFilterMdl, cancelBtnAddFilterMdl);
+    }
+
+    public List<SelenideElement> getAllAddFilterModalEnabledElements() {
+        return Arrays.asList(displayNameInputAddFilterMdl, cancelBtnAddFilterMdl);
+    }
+
+    public List<SelenideElement> getAllAddFilterModalDisabledElements() {
+        return Collections.singletonList(addFilterBtnAddFilterMdl);
+    }
+
+    @Step
+    public TopicDetails openConsumerGroup(String consumerId) {
+        $x(String.format(consumerIdLocator, consumerId)).click();
+        return this;
+    }
+
+    @Step
+    public boolean isKeyMessageVisible(String keyMessage) {
+        return keyMessage.equals($("td[title]").getText());
+    }
+
+    @Step
+    public boolean isContentMessageVisible(String contentMessage) {
+        return contentMessage.matches(contentMessageTab.getText().trim());
+    }
+
+    private void selectYear(int expectedYear) {
+        while (getActualCalendarDate().getYear() > expectedYear) {
+            clickByJavaScript(previousMonthButton);
+            sleep(1000);
+            if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
+                throw new IllegalArgumentException("Unable to select year");
+            }
+        }
+    }
+
+    private void selectMonth(int expectedMonth) {
+        while (getActualCalendarDate().getMonthValue() > expectedMonth) {
+            clickByJavaScript(previousMonthButton);
+            sleep(1000);
+            if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
+                throw new IllegalArgumentException("Unable to select month");
+            }
+        }
+    }
+
+    private void selectDay(int expectedDay) {
+        Objects.requireNonNull($$x(String.format(dayCellLtr, expectedDay)).stream()
+                .filter(day -> !Objects.requireNonNull(day.getAttribute("class")).contains("outside-month"))
+                .findFirst().orElseThrow()).shouldBe(Condition.enabled).click();
+    }
+
+    private void setTime(LocalDateTime dateTime) {
+        calendarTimeFld.shouldBe(Condition.enabled)
+                .sendKeys(String.valueOf(dateTime.getHour()), String.valueOf(dateTime.getMinute()));
+    }
+
+    @Step
+    public TopicDetails selectDateAndTimeByCalendar(LocalDateTime dateTime) {
+        setTime(dateTime);
+        selectYear(dateTime.getYear());
+        selectMonth(dateTime.getMonthValue());
+        selectDay(dateTime.getDayOfMonth());
+        return this;
+    }
+
+    private LocalDate getActualCalendarDate() {
+        String monthAndYearStr = actualCalendarDate.getText().trim();
+        DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+                .parseCaseInsensitive()
+                .append(DateTimeFormatter.ofPattern("MMMM yyyy"))
+                .toFormatter(Locale.ENGLISH);
+        YearMonth yearMonth = formatter.parse(monthAndYearStr, YearMonth::from);
+        return yearMonth.atDay(1);
+    }
+
+    @Step
+    public TopicDetails openCalendarSeekType() {
+        seekTypeField.shouldBe(Condition.enabled).click();
+        actualCalendarDate.shouldBe(Condition.visible);
+        return this;
+    }
+
+    @Step
+    public int getMessageCountAmount() {
+        return Integer.parseInt(messageAmountCell.getText().trim());
+    }
+
+    private List<TopicDetails.MessageGridItem> initItems() {
+        List<TopicDetails.MessageGridItem> gridItemList = new ArrayList<>();
+        allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+                .forEach(item -> gridItemList.add(new TopicDetails.MessageGridItem(item)));
+        return gridItemList;
+    }
+
+    @Step
+    public TopicDetails.MessageGridItem getMessageByOffset(int offset) {
+        return initItems().stream()
+                .filter(e -> e.getOffset() == offset)
+                .findFirst().orElseThrow();
+    }
+
+    @Step
+    public List<MessageGridItem> getAllMessages() {
+        return initItems();
+    }
+
+    @Step
+    public TopicDetails.MessageGridItem getRandomMessage() {
+        return getMessageByOffset(nextInt(0, initItems().size() - 1));
+    }
+
+    public enum TopicMenu {
+        OVERVIEW("Overview"),
+        MESSAGES("Messages"),
+        CONSUMERS("Consumers"),
+        SETTINGS("Settings");
+
+        private final String value;
+
+        TopicMenu(String value) {
+            this.value = value;
+        }
+
+        public String toString() {
+            return value;
+        }
+    }
+
+    public static class MessageGridItem extends BasePage {
+
+        private final SelenideElement element;
+
+        private MessageGridItem(SelenideElement element) {
+            this.element = element;
+        }
+
+        @Step
+        public MessageGridItem clickExpand() {
+            clickByJavaScript(element.$x("./td[1]/span"));
+            return this;
+        }
+
+        private SelenideElement getOffsetElm() {
+            return element.$x("./td[2]");
+        }
+
+        @Step
+        public int getOffset() {
+            return Integer.parseInt(getOffsetElm().getText().trim());
+        }
+
+        @Step
+        public int getPartition() {
+            return Integer.parseInt(element.$x("./td[3]").getText().trim());
+        }
+
+        @Step
+        public LocalDateTime getTimestamp() {
+            String timestampValue = element.$x("./td[4]/div").getText().trim();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d/yyyy, HH:mm:ss");
+            return LocalDateTime.parse(timestampValue, formatter);
+        }
+
+        @Step
+        public String getKey() {
+            return element.$x("./td[5]").getText().trim();
+        }
+
+        @Step
+        public String getValue() {
+            return element.$x("./td[6]/span/p").getText().trim();
+        }
+
+        @Step
+        public MessageGridItem openDotMenu() {
+            getOffsetElm().hover();
+            element.$x("./td[7]/div/button[@aria-label='Dropdown Toggle']")
+                    .shouldBe(Condition.visible).click();
+            return this;
+        }
+
+        @Step
+        public MessageGridItem clickCopyToClipBoard() {
+            clickByJavaScript(element.$x("./td[7]//li[text() = 'Copy to clipboard']")
+                    .shouldBe(Condition.visible));
+            return this;
+        }
+
+        @Step
+        public MessageGridItem clickSaveAsFile() {
+            clickByJavaScript(element.$x("./td[7]//li[text() = 'Save as a file']")
+                    .shouldBe(Condition.visible));
+            return this;
+        }
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java
new file mode 100644
index 00000000000..2b00c97c40f
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java
@@ -0,0 +1,66 @@
+package com.provectus.kafka.ui.pages.topics;
+
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.codeborne.selenide.Selenide.$x;
+
+public class TopicSettingsTab extends BasePage {
+
+    protected SelenideElement defaultValueColumnHeaderLocator = $x("//div[text() = 'Default Value']");
+
+    @Step
+    public TopicSettingsTab waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        defaultValueColumnHeaderLocator.shouldBe(Condition.visible);
+        return this;
+    }
+
+    private List<SettingsGridItem> initGridItems() {
+        List<SettingsGridItem> gridItemList = new ArrayList<>();
+        allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+                .forEach(item -> gridItemList.add(new SettingsGridItem(item)));
+        return gridItemList;
+    }
+
+    private TopicSettingsTab.SettingsGridItem getItemByKey(String key) {
+        return initGridItems().stream()
+                .filter(e -> e.getKey().equals(key))
+                .findFirst().orElseThrow();
+    }
+
+    @Step
+    public String getValueByKey(String key) {
+        return getItemByKey(key).getValue();
+    }
+
+    public static class SettingsGridItem extends BasePage {
+
+        private final SelenideElement element;
+
+        public SettingsGridItem(SelenideElement element) {
+            this.element = element;
+        }
+
+        @Step
+        public String getKey() {
+            return element.$x("./td[1]/span").getText().trim();
+        }
+
+        @Step
+        public String getValue() {
+            return element.$x("./td[2]/span").getText().trim();
+        }
+
+        @Step
+        public String getDefaultValue() {
+            return element.$x("./td[3]/span").getText().trim();
+        }
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
new file mode 100644
index 00000000000..291c94667fb
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
@@ -0,0 +1,261 @@
+package com.provectus.kafka.ui.pages.topics;
+
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static com.codeborne.selenide.Condition.visible;
+import static com.codeborne.selenide.Selenide.$x;
+
+public class TopicsList extends BasePage {
+
+    protected SelenideElement topicListHeader = $x("//h1[text()='Topics']");
+    protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
+    protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
+    protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
+    protected SelenideElement deleteSelectedTopicsBtn = $x("//button[text()='Delete selected topics']");
+    protected SelenideElement copySelectedTopicBtn = $x("//button[text()='Copy selected topic']");
+    protected SelenideElement purgeMessagesOfSelectedTopicsBtn = $x("//button[text()='Purge messages of selected topics']");
+    protected SelenideElement clearMessagesBtn = $x("//ul[contains(@class ,'open')]//div[text()='Clear Messages']");
+    protected SelenideElement recreateTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Recreate Topic']");
+    protected SelenideElement removeTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Remove Topic']");
+
+    @Step
+    public TopicsList waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        topicListHeader.shouldBe(visible);
+        return this;
+    }
+
+    @Step
+    public TopicsList clickAddTopicBtn() {
+        clickByJavaScript(addTopicBtn);
+        return this;
+    }
+
+    @Step
+    public boolean isTopicVisible(String topicName) {
+        tableGrid.shouldBe(visible);
+        return isVisible(getTableElement(topicName));
+    }
+
+    @Step
+    public boolean isShowInternalRadioBtnSelected() {
+        return isSelected(showInternalRadioBtn);
+    }
+
+    @Step
+    public TopicsList setShowInternalRadioButton(boolean select) {
+        selectElement(showInternalRadioBtn, select);
+        return this;
+    }
+
+    @Step
+    public TopicsList openTopic(String topicName) {
+        getTopicItem(topicName).openItem();
+        return this;
+    }
+
+    @Step
+    public TopicsList openDotMenuByTopicName(String topicName) {
+        getTopicItem(topicName).openDotMenu();
+        return this;
+    }
+
+    @Step
+    public boolean isCopySelectedTopicBtnEnabled() {
+        return isEnabled(copySelectedTopicBtn);
+    }
+
+    @Step
+    public List<SelenideElement> getActionButtons() {
+        return Stream.of(deleteSelectedTopicsBtn, copySelectedTopicBtn, purgeMessagesOfSelectedTopicsBtn)
+                .collect(Collectors.toList());
+    }
+
+    @Step
+    public TopicsList clickCopySelectedTopicBtn() {
+        copySelectedTopicBtn.shouldBe(Condition.enabled).click();
+        return this;
+    }
+
+    @Step
+    public TopicsList clickPurgeMessagesOfSelectedTopicsBtn() {
+        purgeMessagesOfSelectedTopicsBtn.shouldBe(Condition.enabled).click();
+        return this;
+    }
+
+    @Step
+    public TopicsList clickClearMessagesBtn() {
+        clickByJavaScript(clearMessagesBtn.shouldBe(visible));
+        return this;
+    }
+
+    @Step
+    public TopicsList clickRecreateTopicBtn() {
+        clickByJavaScript(recreateTopicBtn.shouldBe(visible));
+        return this;
+    }
+
+    @Step
+    public TopicsList clickRemoveTopicBtn() {
+        clickByJavaScript(removeTopicBtn.shouldBe(visible));
+        return this;
+    }
+
+    @Step
+    public TopicsList clickConfirmBtnMdl() {
+        clickConfirmButton();
+        return this;
+    }
+
+    @Step
+    public TopicsList clickCancelBtnMdl() {
+        clickCancelButton();
+        return this;
+    }
+
+    @Step
+    public boolean isConfirmationMdlVisible() {
+        return isConfirmationModalVisible();
+    }
+
+    @Step
+    public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
+        return isAlertVisible(header, message);
+    }
+
+    private List<SelenideElement> getVisibleColumnHeaders() {
+        return Stream.of("Replication Factor", "Number of messages", "Topic Name", "Partitions", "Out of sync replicas", "Size")
+                .map(name -> $x(String.format(columnHeaderLocator, name)))
+                .collect(Collectors.toList());
+    }
+
+    private List<SelenideElement> getEnabledColumnHeaders() {
+        return Stream.of("Topic Name", "Partitions", "Out of sync replicas", "Size")
+                .map(name -> $x(String.format(columnHeaderLocator, name)))
+                .collect(Collectors.toList());
+    }
+
+    @Step
+    public List<SelenideElement> getAllVisibleElements() {
+        List<SelenideElement> visibleElements = new ArrayList<>(getVisibleColumnHeaders());
+        visibleElements.addAll(Arrays.asList(searchField, addTopicBtn, tableGrid));
+        visibleElements.addAll(getActionButtons());
+        return visibleElements;
+    }
+
+    @Step
+    public List<SelenideElement> getAllEnabledElements() {
+        List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
+        enabledElements.addAll(Arrays.asList(searchField, showInternalRadioBtn, addTopicBtn));
+        return enabledElements;
+    }
+
+    private List<TopicGridItem> initGridItems() {
+        List<TopicGridItem> gridItemList = new ArrayList<>();
+        allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+                .forEach(item -> gridItemList.add(new TopicGridItem(item)));
+        return gridItemList;
+    }
+
+    @Step
+    public TopicGridItem getTopicItem(String name) {
+        return initGridItems().stream()
+                .filter(e -> e.getName().equals(name))
+                .findFirst().orElseThrow();
+    }
+
+    @Step
+    public List<TopicGridItem> getNonInternalTopics() {
+        return initGridItems().stream()
+                .filter(e -> !e.isInternal())
+                .collect(Collectors.toList());
+    }
+
+    @Step
+    public List<TopicGridItem> getInternalTopics() {
+        return initGridItems().stream()
+                .filter(TopicGridItem::isInternal)
+                .collect(Collectors.toList());
+    }
+
+    public static class TopicGridItem extends BasePage {
+
+        private final SelenideElement element;
+
+        public TopicGridItem(SelenideElement element) {
+            this.element = element;
+        }
+
+        @Step
+        public TopicsList selectItem(boolean select) {
+            selectElement(element.$x("./td[1]/input"), select);
+            return new TopicsList();
+        }
+
+        @Step
+        public boolean isInternal() {
+            boolean internal = false;
+            try {
+                element.$x("./td[2]/a/span").shouldBe(visible, Duration.ofMillis(500));
+                internal = true;
+            } catch (Throwable ignored) {
+            }
+            return internal;
+        }
+
+        private SelenideElement getNameElm() {
+            return element.$x("./td[2]");
+        }
+
+        @Step
+        public String getName() {
+            return getNameElm().getText().trim();
+        }
+
+        @Step
+        public void openItem() {
+            getNameElm().click();
+        }
+
+        @Step
+        public int getPartition() {
+            return Integer.parseInt(element.$x("./td[3]").getText().trim());
+        }
+
+        @Step
+        public int getOutOfSyncReplicas() {
+            return Integer.parseInt(element.$x("./td[4]").getText().trim());
+        }
+
+        @Step
+        public int getReplicationFactor() {
+            return Integer.parseInt(element.$x("./td[5]").getText().trim());
+        }
+
+        @Step
+        public int getNumberOfMessages() {
+            return Integer.parseInt(element.$x("./td[6]").getText().trim());
+        }
+
+        @Step
+        public int getSize() {
+            return Integer.parseInt(element.$x("./td[7]").getText().trim());
+        }
+
+        @Step
+        public void openDotMenu() {
+            element.$x("./td[8]//button").click();
+        }
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CleanupPolicyValue.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CleanupPolicyValue.java
new file mode 100644
index 00000000000..48c0c0fbcb8
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CleanupPolicyValue.java
@@ -0,0 +1,25 @@
+package com.provectus.kafka.ui.pages.topics.enums;
+
+public enum CleanupPolicyValue {
+
+    DELETE("delete", "Delete"),
+    COMPACT("compact", "Compact"),
+    COMPACT_DELETE("compact,delete", "Compact,Delete");
+
+    private final String optionValue;
+    private final String visibleText;
+
+    CleanupPolicyValue(String optionValue, String visibleText) {
+        this.optionValue = optionValue;
+        this.visibleText = visibleText;
+    }
+
+    public String getOptionValue() {
+        return optionValue;
+    }
+
+    public String getVisibleText() {
+        return visibleText;
+    }
+}
+
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CustomParameterType.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CustomParameterType.java
new file mode 100644
index 00000000000..f4cb5cb9517
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CustomParameterType.java
@@ -0,0 +1,37 @@
+package com.provectus.kafka.ui.pages.topics.enums;
+
+public enum CustomParameterType {
+
+    COMPRESSION_TYPE("compression.type"),
+    DELETE_RETENTION_MS("delete.retention.ms"),
+    FILE_DELETE_DELAY_MS("file.delete.delay.ms"),
+    FLUSH_MESSAGES("flush.messages"),
+    FLUSH_MS("flush.ms"),
+    FOLLOWER_REPLICATION_THROTTLED_REPLICAS("follower.replication.throttled.replicas"),
+    INDEX_INTERVAL_BYTES("index.interval.bytes"),
+    LEADER_REPLICATION_THROTTLED_REPLICAS("leader.replication.throttled.replicas"),
+    MAX_COMPACTION_LAG_MS("max.compaction.lag.ms"),
+    MESSAGE_DOWNCONVERSION_ENABLE("message.downconversion.enable"),
+    MESSAGE_FORMAT_VERSION("message.format.version"),
+    MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS("message.timestamp.difference.max.ms"),
+    MESSAGE_TIMESTAMP_TYPE("message.timestamp.type"),
+    MIN_CLEANABLE_DIRTY_RATIO("min.cleanable.dirty.ratio"),
+    MIN_COMPACTION_LAG_MS("min.compaction.lag.ms"),
+    PREALLOCATE("preallocate"),
+    RETENTION_BYTES("retention.bytes"),
+    SEGMENT_BYTES("segment.bytes"),
+    SEGMENT_INDEX_BYTES("segment.index.bytes"),
+    SEGMENT_JITTER_MS("segment.jitter.ms"),
+    SEGMENT_MS("segment.ms"),
+    UNCLEAN_LEADER_ELECTION_ENABLE("unclean.leader.election.enable");
+
+    private final String optionValue;
+
+    CustomParameterType(String optionValue) {
+        this.optionValue = optionValue;
+    }
+
+    public String getOptionValue() {
+        return optionValue;
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/MaxSizeOnDisk.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/MaxSizeOnDisk.java
new file mode 100644
index 00000000000..8f459eea75a
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/MaxSizeOnDisk.java
@@ -0,0 +1,27 @@
+package com.provectus.kafka.ui.pages.topics.enums;
+
+public enum MaxSizeOnDisk {
+
+    NOT_SET("-1", "Not Set"),
+    SIZE_1_GB("1073741824", "1 GB"),
+    SIZE_10_GB("10737418240", "10 GB"),
+    SIZE_20_GB("21474836480", "20 GB"),
+    SIZE_50_GB("53687091200", "50 GB");
+
+    private final String optionValue;
+    private final String visibleText;
+
+    MaxSizeOnDisk(String optionValue, String visibleText) {
+        this.optionValue = optionValue;
+        this.visibleText = visibleText;
+    }
+
+    public String getOptionValue() {
+        return optionValue;
+    }
+
+    public String getVisibleText() {
+        return visibleText;
+    }
+}
+
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/TimeToRetain.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/TimeToRetain.java
new file mode 100644
index 00000000000..c07abdc175c
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/TimeToRetain.java
@@ -0,0 +1,26 @@
+package com.provectus.kafka.ui.pages.topics.enums;
+
+public enum TimeToRetain {
+
+    BTN_12_HOURS("12 hours", "43200000"),
+    BTN_1_DAY("1 day", "86400000"),
+    BTN_2_DAYS("2 days", "172800000"),
+    BTN_7_DAYS("7 days", "604800000"),
+    BTN_4_WEEKS("4 weeks", "2419200000");
+
+    private final String button;
+    private final String value;
+
+    TimeToRetain(String button, String value) {
+        this.button = button;
+        this.value = value;
+    }
+
+    public String getButton() {
+        return button;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index c41796cb85c..54f69b5198e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -1,36 +1,27 @@
 package com.provectus.kafka.ui.services;
 
-import static com.codeborne.selenide.Selenide.sleep;
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.provectus.kafka.ui.api.ApiClient;
-import com.provectus.kafka.ui.api.api.KafkaConnectApi;
-import com.provectus.kafka.ui.api.api.KsqlApi;
-import com.provectus.kafka.ui.api.api.MessagesApi;
-import com.provectus.kafka.ui.api.api.SchemasApi;
-import com.provectus.kafka.ui.api.api.TopicsApi;
-import com.provectus.kafka.ui.api.model.CreateTopicMessage;
-import com.provectus.kafka.ui.api.model.KsqlCommandV2;
-import com.provectus.kafka.ui.api.model.KsqlCommandV2Response;
-import com.provectus.kafka.ui.api.model.KsqlResponse;
-import com.provectus.kafka.ui.api.model.NewConnector;
-import com.provectus.kafka.ui.api.model.NewSchemaSubject;
-import com.provectus.kafka.ui.api.model.TopicCreation;
+import com.provectus.kafka.ui.api.api.*;
+import com.provectus.kafka.ui.api.model.*;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.ksqldb.models.Stream;
-import com.provectus.kafka.ui.pages.ksqldb.models.Table;
+import com.provectus.kafka.ui.pages.ksqlDb.models.Stream;
+import com.provectus.kafka.ui.pages.ksqlDb.models.Table;
 import com.provectus.kafka.ui.settings.BaseSource;
 import io.qameta.allure.Step;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
+
+import static com.codeborne.selenide.Selenide.sleep;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 
 @Slf4j
@@ -38,45 +29,47 @@ public class ApiService extends BaseSource {
 
     @SneakyThrows
     private TopicsApi topicApi() {
-      return new TopicsApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+        return new TopicsApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
     }
 
     @SneakyThrows
     private SchemasApi schemaApi() {
-      return new SchemasApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+        return new SchemasApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
     }
 
     @SneakyThrows
     private KafkaConnectApi connectorApi() {
-      return new KafkaConnectApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+        return new KafkaConnectApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
     }
 
     @SneakyThrows
     private MessagesApi messageApi() {
-      return new MessagesApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+        return new MessagesApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
     }
 
     @SneakyThrows
-    private KsqlApi ksqlApi(){return new KsqlApi(new ApiClient().setBasePath(BASE_LOCAL_URL));}
+    private KsqlApi ksqlApi() {
+        return new KsqlApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+    }
 
     @SneakyThrows
     private void createTopic(String clusterName, String topicName) {
-      TopicCreation topic = new TopicCreation();
-      topic.setName(topicName);
-      topic.setPartitions(1);
-      topic.setReplicationFactor(1);
-      try {
-        topicApi().createTopic(clusterName, topic).block();
-        sleep(2000);
-      } catch (WebClientResponseException ex) {
-        ex.printStackTrace();
-      }
+        TopicCreation topic = new TopicCreation();
+        topic.setName(topicName);
+        topic.setPartitions(1);
+        topic.setReplicationFactor(1);
+        try {
+            topicApi().createTopic(clusterName, topic).block();
+            sleep(2000);
+        } catch (WebClientResponseException ex) {
+            ex.printStackTrace();
+        }
     }
 
     @Step
     public ApiService createTopic(String topicName) {
-      createTopic(CLUSTER_NAME, topicName);
-      return this;
+        createTopic(CLUSTER_NAME, topicName);
+        return this;
     }
 
     @SneakyThrows
@@ -88,9 +81,9 @@ private void deleteTopic(String clusterName, String topicName) {
     }
 
     @Step
-    public ApiService deleteTopic(String topicName){
-      deleteTopic(CLUSTER_NAME, topicName);
-      return this;
+    public ApiService deleteTopic(String topicName) {
+        deleteTopic(CLUSTER_NAME, topicName);
+        return this;
     }
 
     @SneakyThrows
@@ -107,9 +100,9 @@ private void createSchema(String clusterName, Schema schema) {
     }
 
     @Step
-    public ApiService createSchema(Schema schema){
-      createSchema(CLUSTER_NAME, schema);
-      return this;
+    public ApiService createSchema(Schema schema) {
+        createSchema(CLUSTER_NAME, schema);
+        return this;
     }
 
     @SneakyThrows
@@ -121,9 +114,9 @@ private void deleteSchema(String clusterName, String schemaName) {
     }
 
     @Step
-    public ApiService deleteSchema(String schemaName){
-      deleteSchema(CLUSTER_NAME, schemaName);
-      return this;
+    public ApiService deleteSchema(String schemaName) {
+        deleteSchema(CLUSTER_NAME, schemaName);
+        return this;
     }
 
     @SneakyThrows
@@ -135,9 +128,9 @@ private void deleteConnector(String clusterName, String connectName, String conn
     }
 
     @Step
-    public ApiService deleteConnector(String connectName, String connectorName){
-      deleteConnector(CLUSTER_NAME, connectName, connectorName);
-      return this;
+    public ApiService deleteConnector(String connectName, String connectorName) {
+        deleteConnector(CLUSTER_NAME, connectName, connectorName);
+        return this;
     }
 
     @SneakyThrows
@@ -154,9 +147,9 @@ private void createConnector(String clusterName, String connectName, Connector c
     }
 
     @Step
-    public ApiService createConnector(String connectName, Connector connector){
-      createConnector(CLUSTER_NAME, connectName, connector);
-      return this;
+    public ApiService createConnector(String connectName, Connector connector) {
+        createConnector(CLUSTER_NAME, connectName, connector);
+        return this;
     }
 
     @Step
@@ -166,94 +159,102 @@ public String getFirstConnectName(String clusterName) {
 
     @SneakyThrows
     private void sendMessage(String clusterName, Topic topic) {
-      CreateTopicMessage createMessage = new CreateTopicMessage();
-      createMessage.setPartition(0);
-      createMessage.setKeySerde("String");
-      createMessage.setValueSerde("String");
-      createMessage.setKey(topic.getMessageKey());
-      createMessage.setContent(topic.getMessageContent());
-      try {
-        messageApi().sendTopicMessages(clusterName, topic.getName(), createMessage).block();
-      } catch (WebClientResponseException ex) {
-        ex.getRawStatusCode();
-      }
+        CreateTopicMessage createMessage = new CreateTopicMessage();
+        createMessage.setPartition(0);
+        createMessage.setKeySerde("String");
+        createMessage.setValueSerde("String");
+        createMessage.setKey(topic.getMessageKey());
+        createMessage.setContent(topic.getMessageContent());
+        try {
+            messageApi().sendTopicMessages(clusterName, topic.getName(), createMessage).block();
+        } catch (WebClientResponseException ex) {
+            ex.getRawStatusCode();
+        }
     }
 
     @Step
     public ApiService sendMessage(Topic topic) {
-      sendMessage(CLUSTER_NAME, topic);
-      return this;
+        sendMessage(CLUSTER_NAME, topic);
+        return this;
     }
 
     @Step
     public ApiService createStream(Stream stream) {
-      KsqlCommandV2Response pipeIdStream = ksqlApi().executeKsql(
-          CLUSTER_NAME, new KsqlCommandV2()
-              .ksql(String.format("CREATE STREAM %s (profileId VARCHAR, latitude DOUBLE, longitude DOUBLE) ",
-                  stream.getName())
-                  + String.format("WITH (kafka_topic='%s', value_format='json', partitions=1);",
-                  stream.getTopicName())))
-          .block();
-      assert pipeIdStream != null;
-      List<KsqlResponse> responseListStream =
-          ksqlApi().openKsqlResponsePipe(CLUSTER_NAME, pipeIdStream.getPipeId()).collectList().block();
-      assert Objects.requireNonNull(responseListStream).size() != 0;
-      return this;
+        KsqlCommandV2Response pipeIdStream = ksqlApi()
+                .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
+                        .ksql(String.format("CREATE STREAM %s (profileId VARCHAR, latitude DOUBLE, longitude DOUBLE) ",
+                                stream.getName())
+                                + String.format("WITH (kafka_topic='%s', value_format='json', partitions=1);",
+                                stream.getTopicName())))
+                .block();
+        assert pipeIdStream != null;
+        List<KsqlResponse> responseListStream = ksqlApi()
+                .openKsqlResponsePipe(CLUSTER_NAME, pipeIdStream.getPipeId())
+                .collectList()
+                .block();
+        assert Objects.requireNonNull(responseListStream).size() != 0;
+        return this;
     }
 
     @Step
     public ApiService createTables(Table firstTable, Table secondTable) {
-      KsqlCommandV2Response pipeIdTable1 = ksqlApi().executeKsql(
-          CLUSTER_NAME, new KsqlCommandV2().ksql(
-              String.format("CREATE TABLE %s AS ", firstTable.getName())
-                  + "  SELECT profileId, "
-                  + "         LATEST_BY_OFFSET(latitude) AS la, "
-                  + "         LATEST_BY_OFFSET(longitude) AS lo "
-                  + String.format("  FROM %s ", firstTable.getStreamName())
-                  + "  GROUP BY profileId "
-                  + "  EMIT CHANGES;"))
-          .block();
-      assert pipeIdTable1 != null;
-      List<KsqlResponse> responseListTable =
-          ksqlApi().openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable1.getPipeId()).collectList().block();
-      assert Objects.requireNonNull(responseListTable).size() != 0;
-      KsqlCommandV2Response pipeIdTable2 = ksqlApi().executeKsql(
-          CLUSTER_NAME,
-          new KsqlCommandV2().ksql(String.format("CREATE TABLE %s AS ", secondTable.getName())
-              + "  SELECT ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1) AS distanceInMiles, "
-              + "         COLLECT_LIST(profileId) AS riders, "
-              + "         COUNT(*) AS count "
-              + String.format("  FROM %s ", firstTable.getName())
-              + "  GROUP BY ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1);"))
-          .block();
-      assert pipeIdTable2 != null;
-      List<KsqlResponse> responseListTable2 =
-          ksqlApi().openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable2.getPipeId()).collectList().block();
-      assert Objects.requireNonNull(responseListTable2).size() != 0;
-      return this;
+        KsqlCommandV2Response pipeIdTable1 = ksqlApi()
+                .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
+                        .ksql(String.format("CREATE TABLE %s AS ", firstTable.getName())
+                                + "  SELECT profileId, "
+                                + "         LATEST_BY_OFFSET(latitude) AS la, "
+                                + "         LATEST_BY_OFFSET(longitude) AS lo "
+                                + String.format("  FROM %s ", firstTable.getStreamName())
+                                + "  GROUP BY profileId "
+                                + "  EMIT CHANGES;"))
+                .block();
+        assert pipeIdTable1 != null;
+        List<KsqlResponse> responseListTable = ksqlApi()
+                .openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable1.getPipeId())
+                .collectList()
+                .block();
+        assert Objects.requireNonNull(responseListTable).size() != 0;
+        KsqlCommandV2Response pipeIdTable2 = ksqlApi()
+                .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
+                        .ksql(String.format("CREATE TABLE %s AS ", secondTable.getName())
+                                + "  SELECT ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1) AS distanceInMiles, "
+                                + "         COLLECT_LIST(profileId) AS riders, "
+                                + "         COUNT(*) AS count "
+                                + String.format("  FROM %s ", firstTable.getName())
+                                + "  GROUP BY ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1);"))
+                .block();
+        assert pipeIdTable2 != null;
+        List<KsqlResponse> responseListTable2 = ksqlApi()
+                .openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable2.getPipeId())
+                .collectList()
+                .block();
+        assert Objects.requireNonNull(responseListTable2).size() != 0;
+        return this;
     }
 
     @Step
     public ApiService insertInto(Stream stream) {
-      String streamName = stream.getName();
-      KsqlCommandV2Response pipeIdInsert = ksqlApi().executeKsql(CLUSTER_NAME, new KsqlCommandV2()
-              .ksql(
-                  "INSERT INTO " + streamName + " (profileId, latitude, longitude) VALUES ('c2309eec', 37.7877, -122.4205);"
-                      + "INSERT INTO " + streamName +
-                      " (profileId, latitude, longitude) VALUES ('18f4ea86', 37.3903, -122.0643); "
-                      + "INSERT INTO " + streamName +
-                      " (profileId, latitude, longitude) VALUES ('4ab5cbad', 37.3952, -122.0813); "
-                      + "INSERT INTO " + streamName +
-                      " (profileId, latitude, longitude) VALUES ('8b6eae59', 37.3944, -122.0813); "
-                      + "INSERT INTO " + streamName +
-                      " (profileId, latitude, longitude) VALUES ('4a7c7b41', 37.4049, -122.0822); "
-                      + "INSERT INTO " + streamName +
-                      " (profileId, latitude, longitude) VALUES ('4ddad000', 37.7857, -122.4011);"))
-          .block();
-      assert pipeIdInsert != null;
-      List<KsqlResponse> responseListInsert =
-          ksqlApi().openKsqlResponsePipe(CLUSTER_NAME, pipeIdInsert.getPipeId()).collectList().block();
-      assert Objects.requireNonNull(responseListInsert).size() != 0;
-      return this;
+        String streamName = stream.getName();
+        KsqlCommandV2Response pipeIdInsert = ksqlApi()
+                .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
+                        .ksql("INSERT INTO " + streamName + " (profileId, latitude, longitude) VALUES ('c2309eec', 37.7877, -122.4205);"
+                                + "INSERT INTO " + streamName +
+                                " (profileId, latitude, longitude) VALUES ('18f4ea86', 37.3903, -122.0643); "
+                                + "INSERT INTO " + streamName +
+                                " (profileId, latitude, longitude) VALUES ('4ab5cbad', 37.3952, -122.0813); "
+                                + "INSERT INTO " + streamName +
+                                " (profileId, latitude, longitude) VALUES ('8b6eae59', 37.3944, -122.0813); "
+                                + "INSERT INTO " + streamName +
+                                " (profileId, latitude, longitude) VALUES ('4a7c7b41', 37.4049, -122.0822); "
+                                + "INSERT INTO " + streamName +
+                                " (profileId, latitude, longitude) VALUES ('4ddad000', 37.7857, -122.4011);"))
+                .block();
+        assert pipeIdInsert != null;
+        List<KsqlResponse> responseListInsert = ksqlApi()
+                .openKsqlResponsePipe(CLUSTER_NAME, pipeIdInsert.getPipeId())
+                .collectList()
+                .block();
+        assert Objects.requireNonNull(responseListInsert).size() != 0;
+        return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/AllureListener.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/AllureListener.java
new file mode 100644
index 00000000000..74119f8480a
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/AllureListener.java
@@ -0,0 +1,35 @@
+package com.provectus.kafka.ui.settings.listeners;
+
+import com.codeborne.selenide.Screenshots;
+import io.qameta.allure.Allure;
+import io.qameta.allure.testng.AllureTestNg;
+import org.testng.ITestListener;
+import org.testng.ITestResult;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Objects;
+
+import static java.nio.file.Files.newInputStream;
+
+public class AllureListener extends AllureTestNg implements ITestListener {
+
+    private void takeScreenshot() {
+        File screenshot = Screenshots.takeScreenShotAsFile();
+        try {
+            Allure.addAttachment(Objects.requireNonNull(screenshot).getName(), newInputStream(screenshot.toPath()));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void onTestFailure(ITestResult result) {
+        takeScreenshot();
+    }
+
+    @Override
+    public void onTestSkipped(ITestResult result) {
+        takeScreenshot();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/LoggerListener.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/LoggerListener.java
new file mode 100644
index 00000000000..ca096cd2387
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/LoggerListener.java
@@ -0,0 +1,37 @@
+package com.provectus.kafka.ui.settings.listeners;
+
+import lombok.extern.slf4j.Slf4j;
+import org.testng.ITestResult;
+import org.testng.TestListenerAdapter;
+
+@Slf4j
+public class LoggerListener extends TestListenerAdapter {
+
+    @Override
+    public void onTestStart(final ITestResult testResult) {
+        log.info(String.format("\n------------------------------------------------------------------------ " +
+                        "\nTEST STARTED: %s.%s \n------------------------------------------------------------------------ \n",
+                testResult.getInstanceName(), testResult.getName()));
+    }
+
+    @Override
+    public void onTestSuccess(final ITestResult testResult) {
+        log.info(String.format("\n------------------------------------------------------------------------ " +
+                        "\nTEST PASSED: %s.%s \n------------------------------------------------------------------------ \n",
+                testResult.getInstanceName(), testResult.getName()));
+    }
+
+    @Override
+    public void onTestFailure(final ITestResult testResult) {
+        log.info(String.format("\n------------------------------------------------------------------------ " +
+                        "\nTEST FAILED: %s.%s \n------------------------------------------------------------------------ \n",
+                testResult.getInstanceName(), testResult.getName()));
+    }
+
+    @Override
+    public void onTestSkipped(final ITestResult testResult) {
+        log.info(String.format("\n------------------------------------------------------------------------ " +
+                        "\nTEST SKIPPED: %s.%s \n------------------------------------------------------------------------ \n",
+                testResult.getInstanceName(), testResult.getName()));
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java
index 259f70c3ccc..f53e8897e9f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java
@@ -1,16 +1,17 @@
 package com.provectus.kafka.ui.utilities;
 
-import static com.codeborne.selenide.Selenide.sleep;
+import lombok.extern.slf4j.Slf4j;
 
 import java.time.LocalTime;
-import lombok.extern.slf4j.Slf4j;
+
+import static com.codeborne.selenide.Selenide.sleep;
 
 @Slf4j
 public class TimeUtils {
 
-  public static void waitUntilNewMinuteStarted(){
-    int secondsLeft = 60 - LocalTime.now().getSecond();
-    log.debug("\nwaitUntilNewMinuteStarted: {}s", secondsLeft);
-    sleep(secondsLeft * 1000);
-  }
+    public static void waitUntilNewMinuteStarted() {
+        int secondsLeft = 60 - LocalTime.now().getSecond();
+        log.debug("\nwaitUntilNewMinuteStarted: {}s", secondsLeft);
+        sleep(secondsLeft * 1000);
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index 307361ad5db..7e0de1ac65b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -1,7 +1,5 @@
 package com.provectus.kafka.ui.utilities;
 
-import static com.codeborne.selenide.Selenide.executeJavaScript;
-
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
@@ -9,73 +7,75 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
+import static com.codeborne.selenide.Selenide.executeJavaScript;
+
 @Slf4j
 public class WebUtils {
 
-  public static void clickByActions(SelenideElement element) {
-    log.debug("\nclickByActions: {}", element.getSearchCriteria());
-    element.shouldBe(Condition.enabled);
-    new Actions(WebDriverRunner.getWebDriver())
-        .moveToElement(element)
-        .click(element)
-        .perform();
-  }
+    public static void clickByActions(SelenideElement element) {
+        log.debug("\nclickByActions: {}", element.getSearchCriteria());
+        element.shouldBe(Condition.enabled);
+        new Actions(WebDriverRunner.getWebDriver())
+                .moveToElement(element)
+                .click(element)
+                .perform();
+    }
 
-  public static void clickByJavaScript(SelenideElement element) {
-    log.debug("\nclickByJavaScript: {}", element.getSearchCriteria());
-    element.shouldBe(Condition.enabled);
-    String script = "arguments[0].click();";
-    executeJavaScript(script, element);
-  }
+    public static void clickByJavaScript(SelenideElement element) {
+        log.debug("\nclickByJavaScript: {}", element.getSearchCriteria());
+        element.shouldBe(Condition.enabled);
+        String script = "arguments[0].click();";
+        executeJavaScript(script, element);
+    }
 
-  public static void clearByKeyboard(SelenideElement field) {
-    log.debug("\nclearByKeyboard: {}", field.getSearchCriteria());
-    field.shouldBe(Condition.enabled).sendKeys(Keys.END);
-    field.sendKeys(Keys.chord(Keys.CONTROL + "a"), Keys.DELETE);
-  }
+    public static void clearByKeyboard(SelenideElement field) {
+        log.debug("\nclearByKeyboard: {}", field.getSearchCriteria());
+        field.shouldBe(Condition.enabled).sendKeys(Keys.END);
+        field.sendKeys(Keys.chord(Keys.CONTROL + "a"), Keys.DELETE);
+    }
 
-  public static boolean isVisible(SelenideElement element) {
-    log.debug("\nisVisible: {}", element.getSearchCriteria());
-    boolean isVisible = false;
-    try {
-      element.shouldBe(Condition.visible);
-      isVisible = true;
-    } catch (Throwable e) {
-      log.debug("{} is not visible", element.getSearchCriteria());
+    public static boolean isVisible(SelenideElement element) {
+        log.debug("\nisVisible: {}", element.getSearchCriteria());
+        boolean isVisible = false;
+        try {
+            element.shouldBe(Condition.visible);
+            isVisible = true;
+        } catch (Throwable e) {
+            log.debug("{} is not visible", element.getSearchCriteria());
+        }
+        return isVisible;
     }
-    return isVisible;
-  }
 
-  public static boolean isEnabled(SelenideElement element) {
-    log.debug("\nisEnabled: {}", element.getSearchCriteria());
-    boolean isEnabled = false;
-    try {
-      element.shouldBe(Condition.enabled);
-      isEnabled = true;
-    } catch (Throwable e) {
-      log.debug("{} is not enabled", element.getSearchCriteria());
+    public static boolean isEnabled(SelenideElement element) {
+        log.debug("\nisEnabled: {}", element.getSearchCriteria());
+        boolean isEnabled = false;
+        try {
+            element.shouldBe(Condition.enabled);
+            isEnabled = true;
+        } catch (Throwable e) {
+            log.debug("{} is not enabled", element.getSearchCriteria());
+        }
+        return isEnabled;
     }
-    return isEnabled;
-  }
 
-  public static boolean isSelected(SelenideElement element) {
-    log.debug("\nisSelected: {}", element.getSearchCriteria());
-    boolean isSelected = false;
-    try {
-      element.shouldBe(Condition.selected);
-      isSelected = true;
-    } catch (Throwable e) {
-      log.debug("{} is not selected", element.getSearchCriteria());
+    public static boolean isSelected(SelenideElement element) {
+        log.debug("\nisSelected: {}", element.getSearchCriteria());
+        boolean isSelected = false;
+        try {
+            element.shouldBe(Condition.selected);
+            isSelected = true;
+        } catch (Throwable e) {
+            log.debug("{} is not selected", element.getSearchCriteria());
+        }
+        return isSelected;
     }
-    return isSelected;
-  }
 
-  public static boolean selectElement(SelenideElement element, boolean select){
-    if (select) {
-      if (!element.isSelected()) clickByJavaScript(element);
-    } else {
-      if (element.isSelected()) clickByJavaScript(element);
+    public static boolean selectElement(SelenideElement element, boolean select) {
+        if (select) {
+            if (!element.isSelected()) clickByJavaScript(element);
+        } else {
+            if (element.isSelected()) clickByJavaScript(element);
+        }
+        return true;
     }
-    return true;
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/DisplayNameGenerator.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/DisplayNameGenerator.java
deleted file mode 100644
index 15d239983cf..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/DisplayNameGenerator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils;
-
-import org.junit.platform.commons.util.ClassUtils;
-import org.junit.platform.commons.util.Preconditions;
-
-import java.lang.reflect.Method;
-
-public class DisplayNameGenerator implements org.junit.jupiter.api.DisplayNameGenerator {
-  @Override
-  public String generateDisplayNameForClass(Class<?> testClass) {
-    String name = testClass.getName();
-    int lastDot = name.lastIndexOf('.');
-    return name.substring(lastDot + 1).replaceAll("([A-Z])", " $1").toLowerCase();
-  }
-
-  @Override
-  public String generateDisplayNameForNestedClass(Class<?> nestedClass) {
-    return nestedClass.getSimpleName();
-  }
-
-  @Override
-  public String generateDisplayNameForMethod(Class<?> testClass, Method testMethod) {
-    return testMethod.getName().replaceAll("([A-Z])", " $1").toLowerCase()
-        + parameterTypesAsString(testMethod);
-  }
-
-  static String parameterTypesAsString(Method method) {
-    Preconditions.notNull(method, "Method must not be null");
-    return method.getParameterTypes().length == 0
-        ? ""
-        : '(' + ClassUtils.nullSafeToString(Class::getSimpleName, method.getParameterTypes()) + ')';
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
index 474acd10999..e12f0705173 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
@@ -9,7 +9,6 @@
 import io.qase.client.model.ResultCreate.StatusEnum;
 import io.qase.client.model.ResultCreateSteps;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.support.descriptor.MethodSource;
@@ -26,19 +25,17 @@
 import static io.qase.api.QaseClient.getConfig;
 import static io.qase.api.utils.IntegrationUtils.getCaseId;
 import static io.qase.api.utils.IntegrationUtils.getStacktrace;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.junit.platform.engine.TestExecutionResult.Status.SUCCESSFUL;
 
 @Slf4j
 public class QaseExtension implements TestExecutionListener {
 
-    private final ApiClient apiClient = QaseClient.getApiClient();
-    private final ResultsApi resultsApi = new ResultsApi(apiClient);
-    private final Map<TestIdentifier, Long> testStartTimes = new ConcurrentHashMap<>();
     private static final String QASE_PROJECT = "KAFKAUI";
 
     static {
         String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
-        if (StringUtils.isEmpty(qaseApiToken)) {
+        if (isEmpty(qaseApiToken)) {
             log.warn("QASEIO_API_TOKEN system property is not set. Support for Qase will be disabled.");
             System.setProperty("QASE_ENABLE", "false");
         } else {
@@ -47,12 +44,16 @@ public class QaseExtension implements TestExecutionListener {
             System.setProperty("QASE_API_TOKEN", qaseApiToken);
             System.setProperty("QASE_USE_BULK", "false");
             if ("true".equalsIgnoreCase(System.getProperty("QASEIO_CREATE_TESTRUN"))) {
-              System.setProperty("QASE_RUN_NAME", "Automation run " +
-                   new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date()));
+                System.setProperty("QASE_RUN_NAME", "Automation run " +
+                        new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date()));
             }
         }
     }
 
+    private final ApiClient apiClient = QaseClient.getApiClient();
+    private final ResultsApi resultsApi = new ResultsApi(apiClient);
+    private final Map<TestIdentifier, Long> testStartTimes = new ConcurrentHashMap<>();
+
     @Override
     public void executionStarted(TestIdentifier testIdentifier) {
         if (QaseClient.isEnabled() && testIdentifier.isTest()) {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java
index 05666621c47..1c534b73951 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java
@@ -23,9 +23,9 @@
 @Slf4j
 public class TestCaseGenerator {
 
-    public static boolean FAILED = false;
     private static final ApiClient apiClient = QaseClient.getApiClient();
     private static final CasesApi casesApi = new CasesApi(apiClient);
+    public static boolean FAILED = false;
 
     @SneakyThrows
     public static void createTestCaseIfNotExists(Method testMethod) {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
new file mode 100644
index 00000000000..bc68cc66377
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
@@ -0,0 +1,135 @@
+package com.provectus.kafka.ui;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.Selenide;
+import com.codeborne.selenide.SelenideElement;
+import com.codeborne.selenide.WebDriverRunner;
+import com.provectus.kafka.ui.settings.listeners.AllureListener;
+import com.provectus.kafka.ui.settings.listeners.LoggerListener;
+import io.qase.api.annotation.Step;
+import lombok.extern.slf4j.Slf4j;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.remote.RemoteWebDriver;
+import org.testcontainers.Testcontainers;
+import org.testcontainers.containers.BrowserWebDriverContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
+import org.testng.annotations.*;
+import org.testng.asserts.SoftAssert;
+
+import java.time.Duration;
+import java.util.List;
+
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.settings.BaseSource.*;
+import static com.provectus.kafka.ui.settings.configs.Profiles.CONTAINER;
+import static com.provectus.kafka.ui.settings.configs.Profiles.LOCAL;
+import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.*;
+
+@Slf4j
+@Listeners({AllureListener.class, LoggerListener.class})
+public abstract class BaseTest extends Facade {
+
+    private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
+    private static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
+    protected static BrowserWebDriverContainer<?> webDriverContainer = null;
+
+    private static boolean isARM64() {
+        return System.getProperty("os.arch").equals("aarch64");
+    }
+
+    @BeforeSuite(alwaysRun = true)
+    public void beforeSuite() {
+        switch (BROWSER) {
+            case (CONTAINER) -> {
+                DockerImageName image = isARM64()
+                        ? DockerImageName.parse(SELENIARM_STANDALONE_CHROMIUM).asCompatibleSubstituteFor(SELENIUM_IMAGE_NAME)
+                        : DockerImageName.parse(SELENIUM_IMAGE_NAME);
+                log.info("Using [{}] as image name for chrome", image.getUnversionedPart());
+                webDriverContainer = new BrowserWebDriverContainer<>(image)
+                        .withEnv("JAVA_OPTS", "-Dwebdriver.chrome.whitelistedIps=")
+                        .withStartupTimeout(Duration.ofSeconds(180))
+                        .withCapabilities(new ChromeOptions()
+                                .addArguments("--disable-dev-shm-usage")
+                                .addArguments("--disable-gpu")
+                                .addArguments("--no-sandbox")
+                                .addArguments("--verbose")
+                                .addArguments("--lang=es")
+                        )
+                        .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
+                try {
+                    Testcontainers.exposeHostPorts(8080);
+                    log.info("Starting browser container");
+                    webDriverContainer.start();
+                } catch (Throwable e) {
+                    log.error("Couldn't start a container", e);
+                }
+            }
+            case (LOCAL) -> loggerSetup();
+            default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
+        }
+    }
+
+    @AfterSuite(alwaysRun = true)
+    public void afterSuite() {
+        switch (BROWSER) {
+            case (CONTAINER) -> {
+                if (webDriverContainer.isRunning()) {
+                    webDriverContainer.close();
+                    webDriverContainer.stop();
+                }
+            }
+            case (LOCAL) -> browserQuit();
+            default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
+        }
+    }
+
+    @BeforeMethod(alwaysRun = true)
+    public void beforeMethod() {
+        switch (BROWSER) {
+            case (CONTAINER) -> {
+                RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
+                WebDriverRunner.setWebDriver(remoteWebDriver);
+                remoteWebDriver.manage()
+                        .window().setSize(new Dimension(1440, 1024));
+                Selenide.open(BASE_CONTAINER_URL);
+            }
+            case (LOCAL) -> openUrl(BASE_LOCAL_URL);
+            default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
+        }
+        naviSideBar.waitUntilScreenReady();
+    }
+
+    @AfterMethod(alwaysRun = true)
+    public void afterMethod() {
+        browserClear();
+    }
+
+    @Step
+    protected void navigateToTopics() {
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
+                .waitUntilScreenReady();
+    }
+
+    @Step
+    protected void navigateToTopicsAndOpenDetails(String topicName) {
+        naviSideBar
+                .openSideMenu(TOPICS);
+        topicsList
+                .waitUntilScreenReady()
+                .openTopic(topicName);
+        topicDetails
+                .waitUntilScreenReady();
+    }
+
+    @Step
+    protected void verifyElementsCondition(List<SelenideElement> elementList, Condition expectedCondition) {
+        SoftAssert softly = new SoftAssert();
+        elementList.forEach(element -> softly.assertTrue(element.is(expectedCondition),
+                element.getSearchCriteria() + " is " + expectedCondition));
+        softly.assertAll();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
similarity index 65%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
rename to kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
index ac4180fe611..a26f600e1dd 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
@@ -1,25 +1,21 @@
-package com.provectus.kafka.ui.base;
+package com.provectus.kafka.ui;
 
 import com.provectus.kafka.ui.pages.NaviSideBar;
 import com.provectus.kafka.ui.pages.TopPanel;
 import com.provectus.kafka.ui.pages.brokers.BrokersConfigTab;
 import com.provectus.kafka.ui.pages.brokers.BrokersDetails;
 import com.provectus.kafka.ui.pages.brokers.BrokersList;
-import com.provectus.kafka.ui.pages.connector.ConnectorCreateForm;
-import com.provectus.kafka.ui.pages.connector.ConnectorDetails;
-import com.provectus.kafka.ui.pages.connector.KafkaConnectList;
-import com.provectus.kafka.ui.pages.consumer.ConsumersDetails;
-import com.provectus.kafka.ui.pages.consumer.ConsumersList;
-import com.provectus.kafka.ui.pages.ksqldb.KsqlDbList;
-import com.provectus.kafka.ui.pages.ksqldb.KsqlQueryForm;
-import com.provectus.kafka.ui.pages.schema.SchemaCreateForm;
-import com.provectus.kafka.ui.pages.schema.SchemaDetails;
-import com.provectus.kafka.ui.pages.schema.SchemaRegistryList;
-import com.provectus.kafka.ui.pages.topic.ProduceMessagePanel;
-import com.provectus.kafka.ui.pages.topic.TopicCreateEditForm;
-import com.provectus.kafka.ui.pages.topic.TopicDetails;
-import com.provectus.kafka.ui.pages.topic.TopicSettingsTab;
-import com.provectus.kafka.ui.pages.topic.TopicsList;
+import com.provectus.kafka.ui.pages.connectors.ConnectorCreateForm;
+import com.provectus.kafka.ui.pages.connectors.ConnectorDetails;
+import com.provectus.kafka.ui.pages.connectors.KafkaConnectList;
+import com.provectus.kafka.ui.pages.consumers.ConsumersDetails;
+import com.provectus.kafka.ui.pages.consumers.ConsumersList;
+import com.provectus.kafka.ui.pages.ksqlDb.KsqlDbList;
+import com.provectus.kafka.ui.pages.ksqlDb.KsqlQueryForm;
+import com.provectus.kafka.ui.pages.schemas.SchemaCreateForm;
+import com.provectus.kafka.ui.pages.schemas.SchemaDetails;
+import com.provectus.kafka.ui.pages.schemas.SchemaRegistryList;
+import com.provectus.kafka.ui.pages.topics.*;
 import com.provectus.kafka.ui.services.ApiService;
 
 public abstract class Facade {
@@ -44,5 +40,4 @@ public abstract class Facade {
     protected TopicSettingsTab topicSettingsTab = new TopicSettingsTab();
     protected KsqlQueryForm ksqlQueryForm = new KsqlQueryForm();
     protected KsqlDbList ksqlDbList = new KsqlDbList();
-
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
deleted file mode 100644
index 6db92244ba4..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/base/BaseTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.provectus.kafka.ui.base;
-
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
-import static com.provectus.kafka.ui.settings.BaseSource.BASE_CONTAINER_URL;
-import static com.provectus.kafka.ui.settings.BaseSource.BASE_LOCAL_URL;
-import static com.provectus.kafka.ui.settings.BaseSource.BROWSER;
-import static com.provectus.kafka.ui.settings.configs.Profiles.CONTAINER;
-import static com.provectus.kafka.ui.settings.configs.Profiles.LOCAL;
-import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.browserClear;
-import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.browserQuit;
-import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.loggerSetup;
-import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.openUrl;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.Selenide;
-import com.codeborne.selenide.SelenideElement;
-import com.codeborne.selenide.WebDriverRunner;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.DisplayNameGenerator;
-import io.qase.api.annotation.Step;
-import java.time.Duration;
-import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayNameGeneration;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import org.testcontainers.Testcontainers;
-import org.testcontainers.containers.BrowserWebDriverContainer;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.utility.DockerImageName;
-
-@Slf4j
-@DisplayNameGeneration(DisplayNameGenerator.class)
-public abstract class BaseTest extends Facade {
-
-  private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
-  private static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
-  protected static BrowserWebDriverContainer<?> webDriverContainer = null;
-
-  private static boolean isARM64() {
-    return System.getProperty("os.arch").equals("aarch64");
-  }
-
-  @BeforeAll
-  public static void start() {
-    switch (BROWSER) {
-      case (CONTAINER) -> {
-        DockerImageName image = isARM64()
-            ? DockerImageName.parse(SELENIARM_STANDALONE_CHROMIUM).asCompatibleSubstituteFor(SELENIUM_IMAGE_NAME)
-            : DockerImageName.parse(SELENIUM_IMAGE_NAME);
-        log.info("Using [{}] as image name for chrome", image.getUnversionedPart());
-        webDriverContainer = new BrowserWebDriverContainer<>(image)
-            .withEnv("JAVA_OPTS", "-Dwebdriver.chrome.whitelistedIps=")
-            .withStartupTimeout(Duration.ofSeconds(180))
-            .withCapabilities(new ChromeOptions()
-                .addArguments("--disable-dev-shm-usage")
-                .addArguments("--disable-gpu")
-                .addArguments("--no-sandbox")
-                .addArguments("--verbose")
-                .addArguments("--lang=es")
-            )
-            .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
-        try {
-          Testcontainers.exposeHostPorts(8080);
-          log.info("Starting browser container");
-          webDriverContainer.start();
-        } catch (Throwable e) {
-          log.error("Couldn't start a container", e);
-        }
-      }
-      case (LOCAL) -> loggerSetup();
-      default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
-    }
-  }
-
-  @AfterAll
-  public static void tearDown() {
-    switch (BROWSER) {
-      case (CONTAINER) -> {
-        if (webDriverContainer.isRunning()) {
-          webDriverContainer.close();
-          webDriverContainer.stop();
-        }
-      }
-      case (LOCAL) -> browserQuit();
-      default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
-    }
-  }
-
-  @BeforeEach
-  public void beforeMethod() {
-    switch (BROWSER) {
-      case (CONTAINER) -> {
-        RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
-        WebDriverRunner.setWebDriver(remoteWebDriver);
-        remoteWebDriver.manage()
-            .window().setSize(new Dimension(1440, 1024));
-        Selenide.open(BASE_CONTAINER_URL);
-      }
-      case (LOCAL) -> openUrl(BASE_LOCAL_URL);
-      default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
-    }
-    naviSideBar.waitUntilScreenReady();
-  }
-
-  @AfterEach
-  public void afterMethod() {
-    browserClear();
-  }
-
-  @Step
-  protected void navigateToTopics() {
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady();
-  }
-
-  @Step
-  protected void navigateToTopicsAndOpenDetails(String topicName){
-    naviSideBar
-        .openSideMenu(TOPICS);
-    topicsList
-        .waitUntilScreenReady()
-        .openTopic(topicName);
-    topicDetails
-        .waitUntilScreenReady();
-  }
-
-  @Step
-  protected void verifyElementsCondition(List<SelenideElement> elementList, Condition expectedCondition) {
-    SoftAssertions softly = new SoftAssertions();
-    elementList.forEach(element -> softly.assertThat(element.is(expectedCondition))
-        .as(element.getSearchCriteria() + " is " + expectedCondition).isTrue());
-    softly.assertAll();
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
new file mode 100644
index 00000000000..e0971a0a9e1
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
@@ -0,0 +1,26 @@
+package com.provectus.kafka.ui.smokeSuite;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qase.api.annotation.CaseId;
+import org.testng.annotations.Test;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class SmokeTest extends BaseTest {
+
+    @Test
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(198)
+    public void checkBasePageElements() {
+        verifyElementsCondition(
+                Stream.concat(topPanel.getAllVisibleElements().stream(), naviSideBar.getAllMenuButtons().stream())
+                        .collect(Collectors.toList()), Condition.visible);
+        verifyElementsCondition(
+                Stream.concat(topPanel.getAllEnabledElements().stream(), naviSideBar.getAllMenuButtons().stream())
+                        .collect(Collectors.toList()), Condition.enabled);
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
new file mode 100644
index 00000000000..7f46456a6cc
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
@@ -0,0 +1,61 @@
+package com.provectus.kafka.ui.smokeSuite.brokers;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Step;
+import io.qase.api.annotation.CaseId;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.BROKERS;
+import static com.provectus.kafka.ui.pages.brokers.BrokersDetails.DetailsTab.CONFIGS;
+
+public class BrokersTest extends BaseTest {
+
+    private static final String SUITE_TITLE = "Brokers";
+    private static final long SUITE_ID = 1;
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(1)
+    @Test
+    public void checkBrokersOverview() {
+        navigateToBrokers();
+        Assert.assertTrue(brokersList.getAllBrokers().size() > 0, "getAllBrokers()");
+        verifyElementsCondition(brokersList.getAllVisibleElements(), Condition.visible);
+        verifyElementsCondition(brokersList.getAllEnabledElements(), Condition.enabled);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(85)
+    @Test
+    public void checkExistingBrokersInCluster() {
+        navigateToBrokers();
+        Assert.assertTrue(brokersList.getAllBrokers().size() > 0, "getAllBrokers()");
+        brokersList
+                .openBroker(1);
+        brokersDetails
+                .waitUntilScreenReady();
+        verifyElementsCondition(brokersDetails.getAllVisibleElements(), Condition.visible);
+        verifyElementsCondition(brokersDetails.getAllEnabledElements(), Condition.enabled);
+        brokersDetails
+                .openDetailsTab(CONFIGS);
+        brokersConfigTab
+                .waitUntilScreenReady();
+        verifyElementsCondition(brokersConfigTab.getColumnHeaders(), Condition.visible);
+        verifyElementsCondition(brokersConfigTab.getEditButtons(), Condition.enabled);
+        Assert.assertTrue(brokersConfigTab.isSearchByKeyVisible(), "isSearchByKeyVisible()");
+    }
+
+    @Step
+    private void navigateToBrokers() {
+        naviSideBar
+                .openSideMenu(BROKERS);
+        brokersList
+                .waitUntilScreenReady();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
similarity index 63%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
rename to kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
index ec2e3d5a0f1..0b162283e49 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/connectors/ConnectorsTests.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
@@ -1,11 +1,6 @@
-package com.provectus.kafka.ui.suite.connectors;
+package com.provectus.kafka.ui.smokeSuite.connectors;
 
-import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
-import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-
-import com.provectus.kafka.ui.base.BaseTest;
+import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
@@ -13,17 +8,21 @@
 import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class ConnectorsTests extends BaseTest {
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
+import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+public class ConnectorsTest extends BaseTest {
+
     private static final long SUITE_ID = 10;
     private static final String SUITE_TITLE = "Kafka Connect";
     private static final String CONNECT_NAME = "first";
@@ -47,19 +46,18 @@ public class ConnectorsTests extends BaseTest {
             .setName("sink_postgres_activities_e2e_checks_for_update-" + randomAlphabetic(5))
             .setConfig(getResourceAsString("config_for_create_connector_via_api.json"));
 
-    @BeforeAll
-    public void beforeAll() {
-      TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
-      TOPIC_LIST.forEach(topic -> apiService
-          .createTopic(topic.getName())
-          .sendMessage(topic)
-      );
-      CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
-      CONNECTOR_LIST.forEach(connector -> apiService
-          .createConnector(CONNECT_NAME, connector));
+    @BeforeClass(alwaysRun = true)
+    public void beforeClass() {
+        TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
+        TOPIC_LIST.forEach(topic -> apiService
+                .createTopic(topic.getName())
+                .sendMessage(topic)
+        );
+        CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
+        CONNECTOR_LIST.forEach(connector -> apiService
+                .createConnector(CONNECT_NAME, connector));
     }
 
-    @DisplayName("should create a connector")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(42)
@@ -69,7 +67,7 @@ public void createConnector() {
                 .setName("sink_postgres_activities_e2e_checks-" + randomAlphabetic(5))
                 .setConfig(getResourceAsString("config_for_create_connector.json"));
         navigateToConnectors();
-      kafkaConnectList
+        kafkaConnectList
                 .clickCreateConnectorBtn();
         connectorCreateForm
                 .waitUntilScreenReady()
@@ -78,65 +76,63 @@ public void createConnector() {
         connectorDetails
                 .waitUntilScreenReady();
         navigateToConnectorsAndOpenDetails(connectorForCreate.getName());
-        Assertions.assertTrue(connectorDetails.isConnectorHeaderVisible(connectorForCreate.getName()),"isConnectorTitleVisible()");
+        Assert.assertTrue(connectorDetails.isConnectorHeaderVisible(connectorForCreate.getName()), "isConnectorTitleVisible()");
         navigateToConnectors();
-        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
+        Assert.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
         CONNECTOR_LIST.add(connectorForCreate);
     }
 
-    @DisplayName("should update a connector")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(196)
     @Test
     public void updateConnector() {
-      navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_UPDATE.getName());
-      connectorDetails
+        navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_UPDATE.getName());
+        connectorDetails
                 .openConfigTab()
                 .setConfig(CONNECTOR_FOR_UPDATE.getConfig())
                 .clickSubmitButton();
-        Assertions.assertTrue(connectorDetails.isAlertWithMessageVisible(SUCCESS,"Config successfully updated."),"isAlertWithMessageVisible()");
+        Assert.assertTrue(connectorDetails.isAlertWithMessageVisible(SUCCESS, "Config successfully updated."), "isAlertWithMessageVisible()");
         navigateToConnectors();
-        Assertions.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()), "isConnectorVisible()");
+        Assert.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()), "isConnectorVisible()");
     }
 
-    @DisplayName("should delete connector")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(195)
     @Test
     public void deleteConnector() {
-      navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_DELETE.getName());
-      connectorDetails
+        navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_DELETE.getName());
+        connectorDetails
                 .openDotMenu()
                 .clickDeleteBtn()
                 .clickConfirmBtn();
-      navigateToConnectors();
-        Assertions.assertFalse(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
+        navigateToConnectors();
+        Assert.assertFalse(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
         CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
     }
 
-    @AfterAll
-    public void afterAll() {
+    @AfterClass(alwaysRun = true)
+    public void afterClass() {
         CONNECTOR_LIST.forEach(connector ->
                 apiService.deleteConnector(CONNECT_NAME, connector.getName()));
         TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
     }
 
     @Step
-    private void navigateToConnectors(){
-      naviSideBar
-          .openSideMenu(KAFKA_CONNECT);
-      kafkaConnectList
-          .waitUntilScreenReady();
+    private void navigateToConnectors() {
+        naviSideBar
+                .openSideMenu(KAFKA_CONNECT);
+        kafkaConnectList
+                .waitUntilScreenReady();
     }
 
     @Step
-    private void navigateToConnectorsAndOpenDetails(String connectorName){
-      navigateToConnectors();
-      kafkaConnectList
-          .openConnector(connectorName);
-      connectorDetails
-          .waitUntilScreenReady();
+    private void navigateToConnectorsAndOpenDetails(String connectorName) {
+        navigateToConnectors();
+        kafkaConnectList
+                .openConnector(connectorName);
+        connectorDetails
+                .waitUntilScreenReady();
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
new file mode 100644
index 00000000000..8689c0abde3
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
@@ -0,0 +1,58 @@
+package com.provectus.kafka.ui.smokeSuite.ksqlDb;
+
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.pages.ksqlDb.models.Stream;
+import com.provectus.kafka.ui.pages.ksqlDb.models.Table;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qase.api.annotation.CaseId;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KSQL_DB;
+import static com.provectus.kafka.ui.pages.ksqlDb.enums.KsqlQueryConfig.SHOW_TABLES;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+public class KsqlDbTest extends BaseTest {
+
+    private static final long SUITE_ID = 8;
+    private static final String SUITE_TITLE = "KSQL_DB";
+    private static final Stream STREAM_FOR_CHECKING_TABLES = new Stream()
+            .setName("STREAM_FOR_CHECKING_TABLES_" + randomAlphabetic(4).toUpperCase())
+            .setTopicName("TOPIC_FOR_STREAM_" + randomAlphabetic(4).toUpperCase());
+    private static final Table FIRST_TABLE = new Table()
+            .setName("FIRST_TABLE" + randomAlphabetic(4).toUpperCase())
+            .setStreamName(STREAM_FOR_CHECKING_TABLES.getName());
+    private static final Table SECOND_TABLE = new Table()
+            .setName("SECOND_TABLE" + randomAlphabetic(4).toUpperCase())
+            .setStreamName(STREAM_FOR_CHECKING_TABLES.getName());
+
+    @BeforeClass(alwaysRun = true)
+    public void beforeClass() {
+        apiService
+                .createStream(STREAM_FOR_CHECKING_TABLES)
+                .createTables(FIRST_TABLE, SECOND_TABLE);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(41)
+    @Test
+    public void checkShowTablesRequestExecution() {
+        naviSideBar
+                .openSideMenu(KSQL_DB);
+        ksqlDbList
+                .waitUntilScreenReady()
+                .clickExecuteKsqlRequestBtn();
+        ksqlQueryForm
+                .waitUntilScreenReady()
+                .setQuery(SHOW_TABLES.getQuery())
+                .clickExecuteBtn();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(ksqlQueryForm.getTableByName(FIRST_TABLE.getName()).isVisible(), "getTableName()");
+        softly.assertTrue(ksqlQueryForm.getTableByName(SECOND_TABLE.getName()).isVisible(), "getTableName()");
+        softly.assertAll();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
new file mode 100644
index 00000000000..5c8871b4fc4
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
@@ -0,0 +1,229 @@
+package com.provectus.kafka.ui.smokeSuite.schemas;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.api.model.CompatibilityLevel;
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.models.Schema;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Step;
+import io.qase.api.annotation.CaseId;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.SCHEMA_REGISTRY;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+
+public class SchemasTest extends BaseTest {
+
+    private static final long SUITE_ID = 11;
+    private static final String SUITE_TITLE = "Schema Registry";
+    private static final List<Schema> SCHEMA_LIST = new ArrayList<>();
+    private static final Schema AVRO_API = Schema.createSchemaAvro();
+    private static final Schema JSON_API = Schema.createSchemaJson();
+    private static final Schema PROTOBUF_API = Schema.createSchemaProtobuf();
+
+    @BeforeClass(alwaysRun = true)
+    public void beforeClass() {
+        SCHEMA_LIST.addAll(List.of(AVRO_API, JSON_API, PROTOBUF_API));
+        SCHEMA_LIST.forEach(schema -> apiService.createSchema(schema));
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(43)
+    @Test(priority = 1)
+    public void createSchemaAvro() {
+        Schema schemaAvro = Schema.createSchemaAvro();
+        navigateToSchemaRegistry();
+        schemaRegistryList
+                .clickCreateSchema();
+        schemaCreateForm
+                .setSubjectName(schemaAvro.getName())
+                .setSchemaField(fileToString(schemaAvro.getValuePath()))
+                .selectSchemaTypeFromDropdown(schemaAvro.getType())
+                .clickSubmitButton();
+        schemaDetails
+                .waitUntilScreenReady();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(schemaDetails.isSchemaHeaderVisible(schemaAvro.getName()), "isSchemaHeaderVisible()");
+        softly.assertEquals(schemaDetails.getSchemaType(), schemaAvro.getType().getValue(), "getSchemaType()");
+        softly.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue(),
+                "getCompatibility()");
+        softly.assertAll();
+        navigateToSchemaRegistry();
+        Assert.assertTrue(schemaRegistryList.isSchemaVisible(AVRO_API.getName()), "isSchemaVisible()");
+        SCHEMA_LIST.add(schemaAvro);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(186)
+    @Test(priority = 2)
+    public void updateSchemaAvro() {
+        AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_for_update.json");
+        navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
+        schemaDetails
+                .openEditSchema();
+        schemaCreateForm
+                .waitUntilScreenReady();
+        verifyElementsCondition(schemaCreateForm.getAllDetailsPageElements(), Condition.visible);
+        SoftAssert softly = new SoftAssert();
+        softly.assertFalse(schemaCreateForm.isSubmitBtnEnabled(), "isSubmitBtnEnabled()");
+        softly.assertFalse(schemaCreateForm.isSchemaDropDownEnabled(), "isSchemaDropDownEnabled()");
+        softly.assertAll();
+        schemaCreateForm
+                .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
+                .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
+                .clickSubmitButton();
+        schemaDetails
+                .waitUntilScreenReady();
+        Assert.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), schemaDetails.getCompatibility(), "getCompatibility()");
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(186)
+    @Test(priority = 3)
+    public void compareVersionsOperation() {
+        navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
+        int latestVersion = schemaDetails
+                .waitUntilScreenReady()
+                .getLatestVersion();
+        schemaDetails
+                .openCompareVersionMenu();
+        int versionsNumberFromDdl = schemaCreateForm
+                .waitUntilScreenReady()
+                .openSchemaVersionDdl()
+                .getVersionsNumberFromList();
+        Assert.assertEquals(latestVersion, versionsNumberFromDdl, "Versions number is not matched");
+        schemaCreateForm
+                .selectVersionFromDropDown(1);
+        Assert.assertEquals(53, schemaCreateForm.getMarkedLinesNumber(), "getAllMarkedLines()");
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(187)
+    @Test(priority = 4)
+    public void deleteSchemaAvro() {
+        navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
+        schemaDetails
+                .removeSchema();
+        schemaRegistryList
+                .waitUntilScreenReady();
+        Assert.assertFalse(schemaRegistryList.isSchemaVisible(AVRO_API.getName()), "isSchemaVisible()");
+        SCHEMA_LIST.remove(AVRO_API);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(89)
+    @Test(priority = 5)
+    public void createSchemaJson() {
+        Schema schemaJson = Schema.createSchemaJson();
+        navigateToSchemaRegistry();
+        schemaRegistryList
+                .clickCreateSchema();
+        schemaCreateForm
+                .setSubjectName(schemaJson.getName())
+                .setSchemaField(fileToString(schemaJson.getValuePath()))
+                .selectSchemaTypeFromDropdown(schemaJson.getType())
+                .clickSubmitButton();
+        schemaDetails
+                .waitUntilScreenReady();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(schemaDetails.isSchemaHeaderVisible(schemaJson.getName()), "isSchemaHeaderVisible()");
+        softly.assertEquals(schemaDetails.getSchemaType(), schemaJson.getType().getValue(), "getSchemaType()");
+        softly.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue(),
+                "getCompatibility()");
+        softly.assertAll();
+        navigateToSchemaRegistry();
+        Assert.assertTrue(schemaRegistryList.isSchemaVisible(JSON_API.getName()), "isSchemaVisible()");
+        SCHEMA_LIST.add(schemaJson);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(189)
+    @Test(priority = 6)
+    public void deleteSchemaJson() {
+        navigateToSchemaRegistryAndOpenDetails(JSON_API.getName());
+        schemaDetails
+                .removeSchema();
+        schemaRegistryList
+                .waitUntilScreenReady();
+        Assert.assertFalse(schemaRegistryList.isSchemaVisible(JSON_API.getName()), "isSchemaVisible()");
+        SCHEMA_LIST.remove(JSON_API);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(91)
+    @Test(priority = 7)
+    public void createSchemaProtobuf() {
+        Schema schemaProtobuf = Schema.createSchemaProtobuf();
+        navigateToSchemaRegistry();
+        schemaRegistryList
+                .clickCreateSchema();
+        schemaCreateForm
+                .setSubjectName(schemaProtobuf.getName())
+                .setSchemaField(fileToString(schemaProtobuf.getValuePath()))
+                .selectSchemaTypeFromDropdown(schemaProtobuf.getType())
+                .clickSubmitButton();
+        schemaDetails
+                .waitUntilScreenReady();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(schemaDetails.isSchemaHeaderVisible(schemaProtobuf.getName()), "isSchemaHeaderVisible()");
+        softly.assertEquals(schemaDetails.getSchemaType(), schemaProtobuf.getType().getValue(), "getSchemaType()");
+        softly.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue(),
+                "getCompatibility()");
+        softly.assertAll();
+        navigateToSchemaRegistry();
+        Assert.assertTrue(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()), "isSchemaVisible()");
+        SCHEMA_LIST.add(schemaProtobuf);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(223)
+    @Test(priority = 8)
+    public void deleteSchemaProtobuf() {
+        navigateToSchemaRegistryAndOpenDetails(PROTOBUF_API.getName());
+        schemaDetails
+                .removeSchema();
+        schemaRegistryList
+                .waitUntilScreenReady();
+        Assert.assertFalse(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()), "isSchemaVisible()");
+        SCHEMA_LIST.remove(PROTOBUF_API);
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void afterClass() {
+        SCHEMA_LIST.forEach(schema -> apiService.deleteSchema(schema.getName()));
+    }
+
+    @Step
+    private void navigateToSchemaRegistry() {
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
+                .waitUntilScreenReady();
+    }
+
+    @Step
+    private void navigateToSchemaRegistryAndOpenDetails(String schemaName) {
+        navigateToSchemaRegistry();
+        schemaRegistryList
+                .openSchema(schemaName);
+        schemaDetails
+                .waitUntilScreenReady();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
new file mode 100644
index 00000000000..66f7d8a50a3
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
@@ -0,0 +1,292 @@
+package com.provectus.kafka.ui.smokeSuite.topics;
+
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.pages.topics.TopicDetails;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Issue;
+import io.qase.api.annotation.CaseId;
+import io.qase.api.annotation.Step;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.IntStream;
+
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.MESSAGES;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.OVERVIEW;
+import static com.provectus.kafka.ui.utilities.TimeUtils.waitUntilNewMinuteStarted;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+public class MessagesTest extends BaseTest {
+
+    private static final long SUITE_ID = 2;
+    private static final String SUITE_TITLE = "Topics";
+    private static final Topic TOPIC_FOR_MESSAGES = new Topic()
+            .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
+            .setMessageKey(randomAlphabetic(5))
+            .setMessageContent(randomAlphabetic(10));
+    private static final Topic TOPIC_TO_CLEAR_AND_PURGE_MESSAGES = new Topic()
+            .setName("topic-to-clear-and-purge-messages-attribute-" + randomAlphabetic(5))
+            .setMessageKey(randomAlphabetic(5))
+            .setMessageContent(randomAlphabetic(10));
+    private static final Topic TOPIC_FOR_CHECKING_FILTERS = new Topic()
+            .setName("topic-for-checking-filters-" + randomAlphabetic(5))
+            .setMessageKey(randomAlphabetic(5))
+            .setMessageContent(randomAlphabetic(10));
+    private static final Topic TOPIC_TO_RECREATE = new Topic()
+            .setName("topic-to-recreate-attribute-" + randomAlphabetic(5))
+            .setMessageKey(randomAlphabetic(5))
+            .setMessageContent(randomAlphabetic(10));
+    private static final List<Topic> TOPIC_LIST = new ArrayList<>();
+
+    @BeforeClass(alwaysRun = true)
+    public void beforeClass() {
+        TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECKING_FILTERS, TOPIC_TO_CLEAR_AND_PURGE_MESSAGES,
+                TOPIC_TO_RECREATE));
+        TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
+        IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
+        waitUntilNewMinuteStarted();
+        IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(222)
+    @Test(priority = 1)
+    public void produceMessage() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
+        topicDetails
+                .openDetailsTab(MESSAGES);
+        produceMessage(TOPIC_FOR_MESSAGES);
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey())),
+                "isKeyMessageVisible()");
+        softly.assertTrue(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim()),
+                "isContentMessageVisible()");
+        softly.assertAll();
+    }
+
+    @Ignore
+    @Issue("https://github.com/provectus/kafka-ui/issues/2778")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(19)
+    @Test(priority = 2)
+    public void clearMessage() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
+        topicDetails
+                .openDetailsTab(OVERVIEW);
+        int messageAmount = topicDetails.getMessageCountAmount();
+        produceMessage(TOPIC_FOR_MESSAGES);
+        Assert.assertEquals(messageAmount + 1, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
+        topicDetails
+                .openDotMenu()
+                .clickClearMessagesMenu()
+                .waitUntilScreenReady();
+        Assert.assertEquals(0, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(239)
+    @Test(priority = 3)
+    public void checkClearTopicMessage() {
+        navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
+        topicDetails
+                .openDetailsTab(OVERVIEW);
+        produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
+        navigateToTopics();
+        Assert.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(), 1,
+                "getNumberOfMessages()");
+        topicsList
+                .openDotMenuByTopicName(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
+                .clickClearMessagesBtn()
+                .clickConfirmBtnMdl();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
+                        String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())),
+                "isAlertWithMessageVisible()");
+        softly.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(), 0,
+                "getNumberOfMessages()");
+        softly.assertAll();
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(10)
+    @Test(priority = 4)
+    public void checkPurgeMessagePossibility() {
+        navigateToTopics();
+        int messageAmount = topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages();
+        topicsList
+                .openTopic(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
+        topicDetails
+                .openDetailsTab(OVERVIEW);
+        produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
+        navigateToTopics();
+        Assert.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(),
+                messageAmount + 1, "getNumberOfMessages()");
+        topicsList
+                .getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
+                .selectItem(true)
+                .clickPurgeMessagesOfSelectedTopicsBtn();
+        Assert.assertTrue(topicsList.isConfirmationMdlVisible(), "isConfirmationMdlVisible()");
+        topicsList
+                .clickCancelBtnMdl()
+                .clickPurgeMessagesOfSelectedTopicsBtn()
+                .clickConfirmBtnMdl();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
+                        String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())),
+                "isAlertWithMessageVisible()");
+        softly.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(), 0,
+                "getNumberOfMessages()");
+        softly.assertAll();
+    }
+
+    @Ignore
+    @Issue("https://github.com/provectus/kafka-ui/issues/2819")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(21)
+    @Test(priority = 5)
+    public void copyMessageFromTopicProfile() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+        topicDetails
+                .openDetailsTab(MESSAGES)
+                .getRandomMessage()
+                .openDotMenu()
+                .clickCopyToClipBoard();
+        Assert.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Copied successfully!"),
+                "isAlertWithMessageVisible()");
+    }
+
+    @Ignore
+    @Issue("https://github.com/provectus/kafka-ui/issues/2394")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(15)
+    @Test(priority = 6)
+    public void checkingMessageFilteringByOffset() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+        topicDetails
+                .openDetailsTab(MESSAGES);
+        TopicDetails.MessageGridItem secondMessage = topicDetails.getMessageByOffset(1);
+        topicDetails
+                .selectSeekTypeDdlMessagesTab("Offset")
+                .setSeekTypeValueFldMessagesTab(String.valueOf(secondMessage.getOffset()))
+                .clickSubmitFiltersBtnMessagesTab();
+        SoftAssert softly = new SoftAssert();
+        topicDetails.getAllMessages().forEach(message ->
+                softly.assertTrue(message.getOffset() == secondMessage.getOffset()
+                                || message.getOffset() > secondMessage.getOffset(),
+                        String.format("Expected offset is: %s, but found: %s", secondMessage.getOffset(), message.getOffset())));
+        softly.assertAll();
+    }
+
+    @Ignore
+    @Issue("https://github.com/provectus/kafka-ui/issues/3215")
+    @Issue("https://github.com/provectus/kafka-ui/issues/2345")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(16)
+    @Test(priority = 7)
+    public void checkingMessageFilteringByTimestamp() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+        topicDetails
+                .openDetailsTab(MESSAGES);
+        LocalDateTime firstTimestamp = topicDetails.getMessageByOffset(0).getTimestamp();
+        List<TopicDetails.MessageGridItem> nextMessages = topicDetails.getAllMessages().stream()
+                .filter(message -> message.getTimestamp().getMinute() != firstTimestamp.getMinute())
+                .toList();
+        LocalDateTime nextTimestamp = Objects.requireNonNull(nextMessages.stream()
+                .findFirst().orElseThrow()).getTimestamp();
+        topicDetails
+                .selectSeekTypeDdlMessagesTab("Timestamp")
+                .openCalendarSeekType()
+                .selectDateAndTimeByCalendar(nextTimestamp)
+                .clickSubmitFiltersBtnMessagesTab();
+        SoftAssert softly = new SoftAssert();
+        topicDetails.getAllMessages().forEach(message ->
+                softly.assertTrue(message.getTimestamp().isEqual(nextTimestamp)
+                                || message.getTimestamp().isAfter(nextTimestamp),
+                        String.format("Expected timestamp is: %s, but found: %s", nextTimestamp, message.getTimestamp())));
+        softly.assertAll();
+    }
+
+    @Ignore
+    @Issue("https://github.com/provectus/kafka-ui/issues/2778")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(246)
+    @Test(priority = 8)
+    public void checkClearTopicMessageFromOverviewTab() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+        topicDetails
+                .openDetailsTab(OVERVIEW)
+                .openDotMenu()
+                .clickClearMessagesMenu()
+                .clickConfirmBtnMdl();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
+                        String.format("%s messages have been successfully cleared!", TOPIC_FOR_CHECKING_FILTERS.getName())),
+                "isAlertWithMessageVisible()");
+        softly.assertEquals(topicDetails.getMessageCountAmount(), 0,
+                "getMessageCountAmount()= " + topicDetails.getMessageCountAmount());
+        softly.assertAll();
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(240)
+    @Test(priority = 9)
+    public void checkRecreateTopic() {
+        navigateToTopicsAndOpenDetails(TOPIC_TO_RECREATE.getName());
+        topicDetails
+                .openDetailsTab(OVERVIEW);
+        produceMessage(TOPIC_TO_RECREATE);
+        navigateToTopics();
+        Assert.assertEquals(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages(), 1,
+                "getNumberOfMessages()");
+        topicsList
+                .openDotMenuByTopicName(TOPIC_TO_RECREATE.getName())
+                .clickRecreateTopicBtn()
+                .clickConfirmBtnMdl();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
+                        String.format("Topic %s successfully recreated!", TOPIC_TO_RECREATE.getName())),
+                "isAlertWithMessageVisible()");
+        softly.assertEquals(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages(), 0,
+                "getNumberOfMessages()");
+        softly.assertAll();
+    }
+
+    @Step
+    protected void produceMessage(Topic topic) {
+        topicDetails
+                .clickProduceMessageBtn();
+        produceMessagePanel
+                .waitUntilScreenReady()
+                .setKeyField(topic.getMessageKey())
+                .setContentFiled(topic.getMessageContent())
+                .submitProduceMessage();
+        topicDetails
+                .waitUntilScreenReady();
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void afterClass() {
+        TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
new file mode 100644
index 00000000000..62fb0b04488
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
@@ -0,0 +1,503 @@
+package com.provectus.kafka.ui.smokeSuite.topics;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.pages.topics.TopicDetails;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import io.qameta.allure.Issue;
+import io.qase.api.annotation.CaseId;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.MESSAGES;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.SETTINGS;
+import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.COMPACT;
+import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.DELETE;
+import static com.provectus.kafka.ui.pages.topics.enums.CustomParameterType.COMPRESSION_TYPE;
+import static com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk.*;
+import static com.provectus.kafka.ui.pages.topics.enums.TimeToRetain.BTN_2_DAYS;
+import static com.provectus.kafka.ui.pages.topics.enums.TimeToRetain.BTN_7_DAYS;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.apache.commons.lang3.RandomUtils.nextInt;
+
+public class TopicsTest extends BaseTest {
+
+    private static final long SUITE_ID = 2;
+    private static final String SUITE_TITLE = "Topics";
+    private static final Topic TOPIC_TO_CREATE = new Topic()
+            .setName("new-topic-" + randomAlphabetic(5))
+            .setNumberOfPartitions(1)
+            .setCustomParameterType(COMPRESSION_TYPE)
+            .setCustomParameterValue("producer")
+            .setCleanupPolicyValue(DELETE);
+    private static final Topic TOPIC_TO_UPDATE_AND_DELETE = new Topic()
+            .setName("topic-to-update-and-delete-" + randomAlphabetic(5))
+            .setNumberOfPartitions(1)
+            .setCleanupPolicyValue(DELETE)
+            .setTimeToRetain(BTN_7_DAYS)
+            .setMaxSizeOnDisk(NOT_SET)
+            .setMaxMessageBytes("1048588")
+            .setMessageKey(randomAlphabetic(5))
+            .setMessageContent(randomAlphabetic(10));
+    private static final Topic TOPIC_TO_CHECK_SETTINGS = new Topic()
+            .setName("new-topic-" + randomAlphabetic(5))
+            .setNumberOfPartitions(1)
+            .setMaxMessageBytes("1000012")
+            .setMaxSizeOnDisk(NOT_SET);
+    private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
+            .setName("topic-for-check-filters-" + randomAlphabetic(5));
+    private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete-" + randomAlphabetic(5));
+    private static final List<Topic> TOPIC_LIST = new ArrayList<>();
+
+    @BeforeClass(alwaysRun = true)
+    public void beforeClass() {
+        TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE_AND_DELETE, TOPIC_FOR_DELETE, TOPIC_FOR_CHECK_FILTERS));
+        TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
+    }
+
+    @Suite(suiteId = 4, title = "Create new Topic")
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(199)
+    @Test(priority = 1)
+    public void createTopic() {
+        navigateToTopics();
+        topicsList
+                .clickAddTopicBtn();
+        topicCreateEditForm
+                .waitUntilScreenReady()
+                .setTopicName(TOPIC_TO_CREATE.getName())
+                .setNumberOfPartitions(TOPIC_TO_CREATE.getNumberOfPartitions())
+                .selectCleanupPolicy(TOPIC_TO_CREATE.getCleanupPolicyValue())
+                .clickCreateTopicBtn();
+        navigateToTopicsAndOpenDetails(TOPIC_TO_CREATE.getName());
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName()), "isTopicHeaderVisible()");
+        softly.assertEquals(topicDetails.getCleanUpPolicy(), TOPIC_TO_CREATE.getCleanupPolicyValue().toString(), "getCleanUpPolicy()");
+        softly.assertEquals(topicDetails.getPartitions(), TOPIC_TO_CREATE.getNumberOfPartitions(), "getPartitions()");
+        softly.assertAll();
+        navigateToTopics();
+        Assert.assertTrue(topicsList.isTopicVisible(TOPIC_TO_CREATE.getName()), "isTopicVisible()");
+        TOPIC_LIST.add(TOPIC_TO_CREATE);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(7)
+    @Test(priority = 2)
+    void checkAvailableOperations() {
+        navigateToTopics();
+        topicsList
+                .getTopicItem("my_ksql_1ksql_processing_log")
+                .selectItem(true);
+        verifyElementsCondition(topicsList.getActionButtons(), Condition.enabled);
+        topicsList
+                .getTopicItem("_confluent-ksql-my_ksql_1_command_topic")
+                .selectItem(true);
+        Assert.assertFalse(topicsList.isCopySelectedTopicBtnEnabled(), "isCopySelectedTopicBtnEnabled()");
+    }
+
+    @Ignore
+    @Issue("https://github.com/provectus/kafka-ui/issues/2625")
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(197)
+    @Test(priority = 3)
+    public void updateTopic() {
+        navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
+        topicDetails
+                .openDotMenu()
+                .clickEditSettingsMenu();
+        topicCreateEditForm
+                .waitUntilScreenReady();
+        SoftAssert softly = new SoftAssert();
+        softly.assertEquals(topicCreateEditForm.getCleanupPolicy(),
+                TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText(), "getCleanupPolicy()");
+        softly.assertEquals(topicCreateEditForm.getTimeToRetain(),
+                TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue(), "getTimeToRetain()");
+        softly.assertEquals(topicCreateEditForm.getMaxSizeOnDisk(),
+                TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText(), "getMaxSizeOnDisk()");
+        softly.assertEquals(topicCreateEditForm.getMaxMessageBytes(),
+                TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes(), "getMaxMessageBytes()");
+        softly.assertAll();
+        TOPIC_TO_UPDATE_AND_DELETE
+                .setCleanupPolicyValue(COMPACT)
+                .setTimeToRetain(BTN_2_DAYS)
+                .setMaxSizeOnDisk(SIZE_50_GB).setMaxMessageBytes("1048589");
+        topicCreateEditForm
+                .selectCleanupPolicy((TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue()))
+                .setTimeToRetainDataByButtons(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain())
+                .setMaxSizeOnDiskInGB(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk())
+                .setMaxMessageBytes(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes())
+                .clickCreateTopicBtn();
+        softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully updated."),
+                "isAlertWithMessageVisible()");
+        softly.assertTrue(topicDetails.isTopicHeaderVisible(TOPIC_TO_UPDATE_AND_DELETE.getName()),
+                "isTopicHeaderVisible()");
+        softly.assertAll();
+        topicDetails
+                .waitUntilScreenReady();
+        navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
+        topicDetails
+                .openDotMenu()
+                .clickEditSettingsMenu();
+        softly.assertFalse(topicCreateEditForm.isNameFieldEnabled(), "isNameFieldEnabled()");
+        softly.assertEquals(topicCreateEditForm.getCleanupPolicy(),
+                TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText(), "getCleanupPolicy()");
+        softly.assertEquals(topicCreateEditForm.getTimeToRetain(),
+                TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue(), "getTimeToRetain()");
+        softly.assertEquals(topicCreateEditForm.getMaxSizeOnDisk(),
+                TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText(), "getMaxSizeOnDisk()");
+        softly.assertEquals(topicCreateEditForm.getMaxMessageBytes(),
+                TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes(), "getMaxMessageBytes()");
+        softly.assertAll();
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(242)
+    @Test(priority = 4)
+    public void removeTopicFromTopicList() {
+        navigateToTopics();
+        topicsList
+                .openDotMenuByTopicName(TOPIC_TO_UPDATE_AND_DELETE.getName())
+                .clickRemoveTopicBtn()
+                .clickConfirmBtnMdl();
+        Assert.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
+                        String.format("Topic %s successfully deleted!", TOPIC_TO_UPDATE_AND_DELETE.getName())),
+                "isAlertWithMessageVisible()");
+        TOPIC_LIST.remove(TOPIC_TO_UPDATE_AND_DELETE);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(207)
+    @Test(priority = 5)
+    public void deleteTopic() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_DELETE.getName());
+        topicDetails
+                .openDotMenu()
+                .clickDeleteTopicMenu()
+                .clickConfirmBtnMdl();
+        navigateToTopics();
+        Assert.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
+        TOPIC_LIST.remove(TOPIC_FOR_DELETE);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(20)
+    @Test(priority = 6)
+    public void redirectToConsumerFromTopic() {
+        String topicName = "source-activities";
+        String consumerGroupId = "connect-sink_postgres_activities";
+        navigateToTopicsAndOpenDetails(topicName);
+        topicDetails
+                .openDetailsTab(TopicDetails.TopicMenu.CONSUMERS)
+                .openConsumerGroup(consumerGroupId);
+        consumersDetails
+                .waitUntilScreenReady();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(consumersDetails.isRedirectedConsumerTitleVisible(consumerGroupId),
+                "isRedirectedConsumerTitleVisible()");
+        softly.assertTrue(consumersDetails.isTopicInConsumersDetailsVisible(topicName),
+                "isTopicInConsumersDetailsVisible()");
+        softly.assertAll();
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(4)
+    @Test(priority = 7)
+    public void checkTopicCreatePossibility() {
+        navigateToTopics();
+        topicsList
+                .clickAddTopicBtn();
+        topicCreateEditForm
+                .waitUntilScreenReady();
+        Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+        topicCreateEditForm
+                .setTopicName("testName");
+        Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+        topicCreateEditForm
+                .setTopicName(null)
+                .setNumberOfPartitions(nextInt(1, 10));
+        Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+        topicCreateEditForm
+                .setTopicName("testName");
+        Assert.assertTrue(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(266)
+    @Test(priority = 8)
+    public void checkTimeToRetainDataCustomValueWithEditingTopic() {
+        Topic topicToRetainData = new Topic()
+                .setName("topic-to-retain-data-" + randomAlphabetic(5))
+                .setTimeToRetainData("86400000");
+        navigateToTopics();
+        topicsList
+                .clickAddTopicBtn();
+        topicCreateEditForm
+                .waitUntilScreenReady()
+                .setTopicName(topicToRetainData.getName())
+                .setNumberOfPartitions(1)
+                .setTimeToRetainDataInMs("604800000");
+        Assert.assertEquals(topicCreateEditForm.getTimeToRetain(), "604800000", "getTimeToRetain()");
+        topicCreateEditForm
+                .setTimeToRetainDataInMs(topicToRetainData.getTimeToRetainData())
+                .clickCreateTopicBtn();
+        topicDetails
+                .waitUntilScreenReady()
+                .openDotMenu()
+                .clickEditSettingsMenu();
+        Assert.assertEquals(topicCreateEditForm.getTimeToRetain(), topicToRetainData.getTimeToRetainData(),
+                "getTimeToRetain()");
+        topicDetails
+                .openDetailsTab(SETTINGS);
+        Assert.assertEquals(topicDetails.getSettingsGridValueByKey("retention.ms"), topicToRetainData.getTimeToRetainData(),
+                "getSettingsGridValueByKey()");
+        TOPIC_LIST.add(topicToRetainData);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(6)
+    @Test(priority = 9)
+    public void checkCustomParametersWithinCreateNewTopic() {
+        navigateToTopics();
+        topicsList
+                .clickAddTopicBtn();
+        topicCreateEditForm
+                .waitUntilScreenReady()
+                .setTopicName(TOPIC_TO_CREATE.getName())
+                .clickAddCustomParameterTypeButton()
+                .setCustomParameterType(TOPIC_TO_CREATE.getCustomParameterType());
+        Assert.assertTrue(topicCreateEditForm.isDeleteCustomParameterButtonEnabled(),
+                "isDeleteCustomParameterButtonEnabled()");
+        topicCreateEditForm
+                .clearCustomParameterValue();
+        Assert.assertTrue(topicCreateEditForm.isValidationMessageCustomParameterValueVisible(),
+                "isValidationMessageCustomParameterValueVisible()");
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(2)
+    @Test(priority = 10)
+    public void checkTopicListElements() {
+        navigateToTopics();
+        verifyElementsCondition(topicsList.getAllVisibleElements(), Condition.visible);
+        verifyElementsCondition(topicsList.getAllEnabledElements(), Condition.enabled);
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(12)
+    @Test(priority = 11)
+    public void addingNewFilterWithinTopic() {
+        String filterName = randomAlphabetic(5);
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+        topicDetails
+                .openDetailsTab(MESSAGES)
+                .clickMessagesAddFiltersBtn()
+                .waitUntilAddFiltersMdlVisible();
+        verifyElementsCondition(topicDetails.getAllAddFilterModalVisibleElements(), Condition.visible);
+        verifyElementsCondition(topicDetails.getAllAddFilterModalEnabledElements(), Condition.enabled);
+        verifyElementsCondition(topicDetails.getAllAddFilterModalDisabledElements(), Condition.disabled);
+        Assert.assertFalse(topicDetails.isSaveThisFilterCheckBoxSelected(), "isSaveThisFilterCheckBoxSelected()");
+        topicDetails
+                .setFilterCodeFieldAddFilterMdl(filterName);
+        Assert.assertTrue(topicDetails.isAddFilterBtnAddFilterMdlEnabled(), "isAddFilterBtnAddFilterMdlEnabled()");
+        topicDetails.clickAddFilterBtnAndCloseMdl(true);
+        Assert.assertTrue(topicDetails.isActiveFilterVisible(filterName), "isActiveFilterVisible()");
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(13)
+    @Test(priority = 12)
+    public void checkFilterSavingWithinSavedFilters() {
+        String displayName = randomAlphabetic(5);
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+        topicDetails
+                .openDetailsTab(MESSAGES)
+                .clickMessagesAddFiltersBtn()
+                .waitUntilAddFiltersMdlVisible()
+                .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
+                .selectSaveThisFilterCheckboxMdl(true)
+                .setDisplayNameFldAddFilterMdl(displayName);
+        Assert.assertTrue(topicDetails.isAddFilterBtnAddFilterMdlEnabled(),
+                "isAddFilterBtnAddFilterMdlEnabled()");
+        topicDetails
+                .clickAddFilterBtnAndCloseMdl(false)
+                .openSavedFiltersListMdl();
+        Assert.assertTrue(topicDetails.isFilterVisibleAtSavedFiltersMdl(displayName),
+                "isFilterVisibleAtSavedFiltersMdl()");
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(14)
+    @Test(priority = 13)
+    public void checkApplyingSavedFilterWithinTopicMessages() {
+        String displayName = randomAlphabetic(5);
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+        topicDetails
+                .openDetailsTab(MESSAGES)
+                .clickMessagesAddFiltersBtn()
+                .waitUntilAddFiltersMdlVisible()
+                .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
+                .selectSaveThisFilterCheckboxMdl(true)
+                .setDisplayNameFldAddFilterMdl(displayName)
+                .clickAddFilterBtnAndCloseMdl(false)
+                .openSavedFiltersListMdl()
+                .selectFilterAtSavedFiltersMdl(displayName)
+                .clickSelectFilterBtnAtSavedFiltersMdl();
+        Assert.assertTrue(topicDetails.isActiveFilterVisible(displayName), "isActiveFilterVisible()");
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(11)
+    @Test(priority = 14)
+    public void checkShowInternalTopicsButtonFunctionality() {
+        navigateToTopics();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(topicsList.isShowInternalRadioBtnSelected(), "isInternalRadioBtnSelected()");
+        softly.assertTrue(topicsList.getInternalTopics().size() > 0, "getInternalTopics()");
+        softly.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
+        softly.assertAll();
+        topicsList
+                .setShowInternalRadioButton(false);
+        softly.assertEquals(topicsList.getInternalTopics().size(), 0, "getInternalTopics()");
+        softly.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
+        softly.assertAll();
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(56)
+    @Test(priority = 15)
+    public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
+        navigateToTopics();
+        topicsList
+                .clickAddTopicBtn();
+        topicCreateEditForm
+                .waitUntilScreenReady()
+                .setTopicName(TOPIC_TO_CHECK_SETTINGS.getName())
+                .setNumberOfPartitions(TOPIC_TO_CHECK_SETTINGS.getNumberOfPartitions())
+                .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
+                .clickCreateTopicBtn();
+        topicDetails
+                .waitUntilScreenReady();
+        TOPIC_LIST.add(TOPIC_TO_CHECK_SETTINGS);
+        topicDetails
+                .openDetailsTab(SETTINGS);
+        topicSettingsTab
+                .waitUntilScreenReady();
+        SoftAssert softly = new SoftAssert();
+        softly.assertEquals(topicSettingsTab.getValueByKey("retention.bytes"),
+                TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue(), "getValueOfKey(retention.bytes)");
+        softly.assertEquals(topicSettingsTab.getValueByKey("max.message.bytes"),
+                TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes(), "getValueOfKey(max.message.bytes)");
+        softly.assertAll();
+        TOPIC_TO_CHECK_SETTINGS
+                .setMaxSizeOnDisk(SIZE_1_GB)
+                .setMaxMessageBytes("1000056");
+        topicDetails
+                .openDotMenu()
+                .clickEditSettingsMenu();
+        topicCreateEditForm
+                .waitUntilScreenReady()
+                .setMaxSizeOnDiskInGB(TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk())
+                .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
+                .clickCreateTopicBtn();
+        topicDetails
+                .waitUntilScreenReady()
+                .openDetailsTab(SETTINGS);
+        topicSettingsTab
+                .waitUntilScreenReady();
+        softly.assertEquals(topicSettingsTab.getValueByKey("retention.bytes"),
+                TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue(), "getValueOfKey(retention.bytes)");
+        softly.assertEquals(topicSettingsTab.getValueByKey("max.message.bytes"),
+                TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes(), "getValueOfKey(max.message.bytes)");
+        softly.assertAll();
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(247)
+    @Test(priority = 16)
+    public void recreateTopicFromTopicProfile() {
+        Topic topicToRecreate = new Topic()
+                .setName("topic-to-recreate-" + randomAlphabetic(5))
+                .setNumberOfPartitions(1);
+        navigateToTopics();
+        topicsList
+                .clickAddTopicBtn();
+        topicCreateEditForm
+                .waitUntilScreenReady()
+                .setTopicName(topicToRecreate.getName())
+                .setNumberOfPartitions(topicToRecreate.getNumberOfPartitions())
+                .clickCreateTopicBtn();
+        topicDetails
+                .waitUntilScreenReady();
+        TOPIC_LIST.add(topicToRecreate);
+        topicDetails
+                .openDotMenu()
+                .clickRecreateTopicMenu();
+        Assert.assertTrue(topicDetails.isConfirmationMdlVisible(), "isConfirmationMdlVisible()");
+        topicDetails
+                .clickConfirmBtnMdl();
+        Assert.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
+                        String.format("Topic %s successfully recreated!", topicToRecreate.getName())),
+                "isAlertWithMessageVisible()");
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(8)
+    @Test(priority = 17)
+    public void checkCopyTopicPossibility() {
+        Topic topicToCopy = new Topic()
+                .setName("topic-to-copy-" + randomAlphabetic(5))
+                .setNumberOfPartitions(1);
+        navigateToTopics();
+        topicsList
+                .getTopicItem("_schemas")
+                .selectItem(true)
+                .clickCopySelectedTopicBtn();
+        topicCreateEditForm
+                .waitUntilScreenReady();
+        Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+        topicCreateEditForm
+                .setTopicName(topicToCopy.getName())
+                .setNumberOfPartitions(topicToCopy.getNumberOfPartitions())
+                .clickCreateTopicBtn();
+        topicDetails
+                .waitUntilScreenReady();
+        TOPIC_LIST.add(topicToCopy);
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully created."),
+                "isAlertWithMessageVisible()");
+        softly.assertTrue(topicDetails.isTopicHeaderVisible(topicToCopy.getName()), "isTopicHeaderVisible()");
+        softly.assertAll();
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void afterClass() {
+        TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java
deleted file mode 100644
index ac5f5c57557..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/SmokeTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.provectus.kafka.ui.suite;
-
-import com.codeborne.selenide.Condition;
-import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
-import io.qase.api.annotation.CaseId;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.junit.jupiter.api.Test;
-
-public class SmokeTests extends BaseTest {
-
-    @Test
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(198)
-    public void checkBasePageElements(){
-      verifyElementsCondition(Stream.concat(topPanel.getAllVisibleElements().stream(), naviSideBar.getAllMenuButtons().stream())
-          .collect(Collectors.toList()),Condition.visible);
-      verifyElementsCondition(Stream.concat(topPanel.getAllEnabledElements().stream(), naviSideBar.getAllMenuButtons().stream())
-          .collect(Collectors.toList()),Condition.enabled);
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
deleted file mode 100644
index 0cba13812c3..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/brokers/BrokersTests.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.provectus.kafka.ui.suite.brokers;
-
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.BROKERS;
-import static com.provectus.kafka.ui.pages.brokers.BrokersDetails.DetailsTab.CONFIGS;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.codeborne.selenide.Condition;
-import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
-import io.qameta.allure.Step;
-import io.qase.api.annotation.CaseId;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-public class BrokersTests extends BaseTest {
-  private static final String SUITE_TITLE = "Brokers";
-  private static final long SUITE_ID = 1;
-
-  @DisplayName("Checking the Brokers overview")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(1)
-  @Test
-  public void checkBrokersOverview(){
-    navigateToBrokers();
-    assertThat(brokersList.getAllBrokers()).as("getAllBrokers()").size().isGreaterThan(0);
-    verifyElementsCondition(brokersList.getAllVisibleElements(), Condition.visible);
-    verifyElementsCondition(brokersList.getAllEnabledElements(), Condition.enabled);
-  }
-
-  @DisplayName("Checking the existing Broker's profile in a cluster")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(85)
-  @Test
-  public void checkExistingBrokersInCluster(){
-    navigateToBrokers();
-    assertThat(brokersList.getAllBrokers()).as("getAllBrokers()").size().isGreaterThan(0);
-    brokersList
-        .openBroker(1);
-    brokersDetails
-        .waitUntilScreenReady();
-    verifyElementsCondition(brokersDetails.getAllVisibleElements(), Condition.visible);
-    verifyElementsCondition(brokersDetails.getAllEnabledElements(), Condition.enabled);
-    brokersDetails
-        .openDetailsTab(CONFIGS);
-    brokersConfigTab
-        .waitUntilScreenReady();
-    verifyElementsCondition(brokersConfigTab.getColumnHeaders(), Condition.visible);
-    verifyElementsCondition(brokersConfigTab.getEditButtons(), Condition.enabled);
-    assertThat(brokersConfigTab.isSearchByKeyVisible()).as("isSearchByKeyVisible()").isTrue();
-  }
-
-  @Step
-  private void navigateToBrokers(){
-    naviSideBar
-        .openSideMenu(BROKERS);
-    brokersList
-        .waitUntilScreenReady();
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/ksqldb/KsqlTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/ksqldb/KsqlTests.java
deleted file mode 100644
index ee03fd8de1a..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/ksqldb/KsqlTests.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.provectus.kafka.ui.suite.ksqldb;
-
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KSQL_DB;
-import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_TABLES;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-
-import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.pages.ksqldb.models.Stream;
-import com.provectus.kafka.ui.pages.ksqldb.models.Table;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
-import io.qase.api.annotation.CaseId;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class KsqlTests extends BaseTest {
-  private static final long SUITE_ID = 8;
-  private static final String SUITE_TITLE = "KSQL_DB";
-  private static final Stream STREAM_FOR_CHECKING_TABLES = new Stream()
-      .setName("STREAM_FOR_CHECKING_TABLES_" + randomAlphabetic(4).toUpperCase())
-      .setTopicName("TOPIC_FOR_STREAM_" + randomAlphabetic(4).toUpperCase());
-  private static final Table FIRST_TABLE = new Table()
-      .setName("FIRST_TABLE"+ randomAlphabetic(4).toUpperCase())
-      .setStreamName(STREAM_FOR_CHECKING_TABLES.getName());
-  private static final Table SECOND_TABLE = new Table()
-      .setName("SECOND_TABLE"+ randomAlphabetic(4).toUpperCase())
-      .setStreamName(STREAM_FOR_CHECKING_TABLES.getName());
-
-  @BeforeAll
-  public void beforeAll(){
-    apiService
-        .createStream(STREAM_FOR_CHECKING_TABLES)
-        .createTables(FIRST_TABLE, SECOND_TABLE);
-  }
-
-  @DisplayName("check KSQL request execution")
-  @Suite(suiteId = SUITE_ID,title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(41)
-  @Test
-  @Order(1)
-  public void checkingKsqlRequestExecution() {
-    naviSideBar
-        .openSideMenu(KSQL_DB);
-    ksqlDbList
-        .waitUntilScreenReady()
-        .clickExecuteKsqlRequestBtn();
-    ksqlQueryForm
-        .waitUntilScreenReady()
-        .setQuery(SHOW_TABLES.getQuery())
-        .clickExecuteBtn();
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(ksqlQueryForm.getTableByName(FIRST_TABLE.getName()).isVisible())
-        .as("getTableName()").isTrue();
-    softly.assertThat(ksqlQueryForm.getTableByName(SECOND_TABLE.getName()).isVisible())
-        .as("getTableName()").isTrue();
-    softly.assertAll();
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
deleted file mode 100644
index ea98b4abe1a..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/schemas/SchemasTests.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package com.provectus.kafka.ui.suite.schemas;
-
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.SCHEMA_REGISTRY;
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
-
-import com.codeborne.selenide.Condition;
-import com.provectus.kafka.ui.api.model.CompatibilityLevel;
-import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.models.Schema;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
-import io.qameta.allure.Step;
-import io.qase.api.annotation.CaseId;
-import java.util.ArrayList;
-import java.util.List;
-import lombok.SneakyThrows;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.TestMethodOrder;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class SchemasTests extends BaseTest {
-    private static final long SUITE_ID = 11;
-    private static final String SUITE_TITLE = "Schema Registry";
-    private static final List<Schema> SCHEMA_LIST = new ArrayList<>();
-    private static final Schema AVRO_API = Schema.createSchemaAvro();
-    private static final Schema JSON_API = Schema.createSchemaJson();
-    private static final Schema PROTOBUF_API = Schema.createSchemaProtobuf();
-
-    @BeforeAll
-    @SneakyThrows
-    public void beforeAll() {
-        SCHEMA_LIST.addAll(List.of(AVRO_API, JSON_API, PROTOBUF_API));
-        SCHEMA_LIST.forEach(schema -> apiService.createSchema(schema));
-    }
-
-    @DisplayName("should create AVRO schema")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(43)
-    @Test
-    @Order(1)
-    void createSchemaAvro() {
-        Schema schemaAvro = Schema.createSchemaAvro();
-        navigateToSchemaRegistry();
-        schemaRegistryList
-                .clickCreateSchema();
-        schemaCreateForm
-                .setSubjectName(schemaAvro.getName())
-                .setSchemaField(fileToString(schemaAvro.getValuePath()))
-                .selectSchemaTypeFromDropdown(schemaAvro.getType())
-                .clickSubmitButton();
-        schemaDetails
-                .waitUntilScreenReady();
-        SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(schemaDetails.isSchemaHeaderVisible(schemaAvro.getName())).as("isSchemaHeaderVisible()").isTrue();
-        softly.assertThat(schemaDetails.getSchemaType()).as("getSchemaType()").isEqualTo(schemaAvro.getType().getValue());
-        softly.assertThat(schemaDetails.getCompatibility()).as("getCompatibility()").isEqualTo(CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue());
-        softly.assertAll();
-        navigateToSchemaRegistry();
-        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
-        SCHEMA_LIST.add(schemaAvro);
-    }
-
-    @DisplayName("should update AVRO schema")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(186)
-    @Test
-    @Order(2)
-    void updateSchemaAvro() {
-        AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_for_update.json");
-        navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
-        schemaDetails
-                .openEditSchema();
-        schemaCreateForm
-                .waitUntilScreenReady();
-      verifyElementsCondition(schemaCreateForm.getAllDetailsPageElements(), Condition.visible);
-      SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(schemaCreateForm.isSubmitBtnEnabled()).as("isSubmitBtnEnabled()").isFalse();
-        softly.assertThat(schemaCreateForm.isSchemaDropDownEnabled()).as("isSchemaDropDownEnabled()").isFalse();
-        softly.assertAll();
-        schemaCreateForm
-                .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
-                .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
-                .clickSubmitButton();
-        schemaDetails
-                .waitUntilScreenReady();
-        Assertions.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), schemaDetails.getCompatibility(), "getCompatibility()");
-    }
-
-    @DisplayName("Checking Compare Versions operation for Schema")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(186)
-    @Test
-    @Order(3)
-    void compareVersionsOperation() {
-      navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
-      int latestVersion = schemaDetails
-          .waitUntilScreenReady()
-          .getLatestVersion();
-      schemaDetails
-          .openCompareVersionMenu();
-      int versionsNumberFromDdl = schemaCreateForm
-          .waitUntilScreenReady()
-          .openSchemaVersionDdl()
-          .getVersionsNumberFromList();
-      Assertions.assertEquals(latestVersion,versionsNumberFromDdl,"Versions number is not matched");
-      schemaCreateForm
-          .selectVersionFromDropDown(1);
-      Assertions.assertEquals(53, schemaCreateForm.getMarkedLinesNumber(), "getAllMarkedLines()");
-    }
-
-    @DisplayName("should delete AVRO schema")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(187)
-    @Test
-    @Order(4)
-    void deleteSchemaAvro() {
-      navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
-      schemaDetails
-          .removeSchema();
-      schemaRegistryList
-          .waitUntilScreenReady();
-      Assertions.assertFalse(schemaRegistryList.isSchemaVisible(AVRO_API.getName()),"isSchemaVisible()");
-      SCHEMA_LIST.remove(AVRO_API);
-    }
-
-    @DisplayName("should create JSON schema")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(89)
-    @Test
-    @Order(5)
-    void createSchemaJson() {
-        Schema schemaJson = Schema.createSchemaJson();
-        navigateToSchemaRegistry();
-        schemaRegistryList
-                .clickCreateSchema();
-        schemaCreateForm
-                .setSubjectName(schemaJson.getName())
-                .setSchemaField(fileToString(schemaJson.getValuePath()))
-                .selectSchemaTypeFromDropdown(schemaJson.getType())
-                .clickSubmitButton();
-        schemaDetails
-                .waitUntilScreenReady();
-        SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(schemaDetails.isSchemaHeaderVisible(schemaJson.getName())).as("isSchemaHeaderVisible()").isTrue();
-        softly.assertThat(schemaDetails.getSchemaType()).as("getSchemaType()").isEqualTo(schemaJson.getType().getValue());
-        softly.assertThat(schemaDetails.getCompatibility()).as("getCompatibility()").isEqualTo(CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue());
-        softly.assertAll();
-        navigateToSchemaRegistry();
-        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(JSON_API.getName()),"isSchemaVisible()");
-        SCHEMA_LIST.add(schemaJson);
-    }
-
-    @DisplayName("should delete JSON schema")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(189)
-    @Test
-    @Order(6)
-    void deleteSchemaJson() {
-      navigateToSchemaRegistryAndOpenDetails(JSON_API.getName());
-      schemaDetails
-                .removeSchema();
-        schemaRegistryList
-                .waitUntilScreenReady();
-        Assertions.assertFalse(schemaRegistryList.isSchemaVisible(JSON_API.getName()),"isSchemaVisible()");
-        SCHEMA_LIST.remove(JSON_API);
-    }
-
-    @DisplayName("should create PROTOBUF schema")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(91)
-    @Test
-    @Order(7)
-    void createSchemaProtobuf() {
-        Schema schemaProtobuf = Schema.createSchemaProtobuf();
-        navigateToSchemaRegistry();
-        schemaRegistryList
-                .clickCreateSchema();
-        schemaCreateForm
-                .setSubjectName(schemaProtobuf.getName())
-                .setSchemaField(fileToString(schemaProtobuf.getValuePath()))
-                .selectSchemaTypeFromDropdown(schemaProtobuf.getType())
-                .clickSubmitButton();
-        schemaDetails
-                .waitUntilScreenReady();
-        SoftAssertions softly = new SoftAssertions();
-        softly.assertThat(schemaDetails.isSchemaHeaderVisible(schemaProtobuf.getName())).as("isSchemaHeaderVisible()").isTrue();
-        softly.assertThat(schemaDetails.getSchemaType()).as("getSchemaType()").isEqualTo(schemaProtobuf.getType().getValue());
-        softly.assertThat(schemaDetails.getCompatibility()).as("getCompatibility()").isEqualTo(CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue());
-        softly.assertAll();
-        navigateToSchemaRegistry();
-        Assertions.assertTrue(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()),"isSchemaVisible()");
-        SCHEMA_LIST.add(schemaProtobuf);
-    }
-
-    @DisplayName("should delete PROTOBUF schema")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(223)
-    @Test
-    @Order(8)
-    void deleteSchemaProtobuf() {
-      navigateToSchemaRegistryAndOpenDetails(PROTOBUF_API.getName());
-      schemaDetails
-                .removeSchema();
-        schemaRegistryList
-                .waitUntilScreenReady();
-        Assertions.assertFalse(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()),"isSchemaVisible()");
-        SCHEMA_LIST.remove(PROTOBUF_API);
-    }
-
-    @AfterAll
-    public void afterAll() {
-        SCHEMA_LIST.forEach(schema -> apiService.deleteSchema(schema.getName()));
-    }
-
-    @Step
-    private void navigateToSchemaRegistry(){
-      naviSideBar
-          .openSideMenu(SCHEMA_REGISTRY);
-      schemaRegistryList
-          .waitUntilScreenReady();
-    }
-
-    @Step
-    private void navigateToSchemaRegistryAndOpenDetails(String schemaName){
-      navigateToSchemaRegistry();
-      schemaRegistryList
-          .openSchema(schemaName);
-      schemaDetails
-          .waitUntilScreenReady();
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
deleted file mode 100644
index 4993a2d4837..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicMessagesTests.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package com.provectus.kafka.ui.suite.topics;
-
-import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
-import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.OVERVIEW;
-import static com.provectus.kafka.ui.utilities.TimeUtils.waitUntilNewMinuteStarted;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.topic.TopicDetails;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
-import io.qameta.allure.Issue;
-import io.qase.api.annotation.CaseId;
-import io.qase.api.annotation.Step;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class TopicMessagesTests extends BaseTest {
-  private static final long SUITE_ID = 2;
-  private static final String SUITE_TITLE = "Topics";
-  private static final Topic TOPIC_FOR_MESSAGES = new Topic()
-      .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
-      .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
-  private static final Topic TOPIC_TO_CLEAR_AND_PURGE_MESSAGES = new Topic()
-      .setName("topic-to-clear-and-purge-messages-attribute-" + randomAlphabetic(5))
-      .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
-  private static final Topic TOPIC_FOR_CHECKING_FILTERS = new Topic()
-      .setName("topic-for-checking-filters-" + randomAlphabetic(5))
-      .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
-  private static final Topic TOPIC_TO_RECREATE = new Topic()
-      .setName("topic-to-recreate-attribute-" + randomAlphabetic(5))
-      .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
-  private static final List<Topic> TOPIC_LIST = new ArrayList<>();
-
-  @BeforeAll
-  public void beforeAll() {
-    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECKING_FILTERS, TOPIC_TO_CLEAR_AND_PURGE_MESSAGES,
-        TOPIC_TO_RECREATE));
-    TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
-    IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
-    waitUntilNewMinuteStarted();
-    IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
-  }
-
-  @DisplayName("produce message")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(222)
-  @Order(1)
-  @Test
-  void produceMessage() {
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
-    topicDetails
-        .openDetailsTab(MESSAGES);
-    produceMessage(TOPIC_FOR_MESSAGES);
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey())))
-        .withFailMessage("isKeyMessageVisible()").isTrue();
-    softly.assertThat(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim()))
-        .withFailMessage("isContentMessageVisible()").isTrue();
-    softly.assertAll();
-  }
-
-  @Disabled
-  @Issue("https://github.com/provectus/kafka-ui/issues/2778")
-  @DisplayName("clear message")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(19)
-  @Order(2)
-  @Test
-  void clearMessage() {
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
-    topicDetails
-        .openDetailsTab(OVERVIEW);
-    int messageAmount = topicDetails.getMessageCountAmount();
-    produceMessage(TOPIC_FOR_MESSAGES);
-    Assertions.assertEquals(messageAmount + 1, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
-    topicDetails
-        .openDotMenu()
-        .clickClearMessagesMenu()
-        .waitUntilScreenReady();
-    Assertions.assertEquals(0, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
-  }
-
-  @DisplayName("TopicTests.clearMessageOfTopic : Clear message of topic")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(239)
-  @Order(3)
-  @Test
-  void checkClearTopicMessage() {
-    navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
-    topicDetails
-        .openDetailsTab(OVERVIEW);
-    produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
-    navigateToTopics();
-    assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages())
-        .as("getNumberOfMessages()").isEqualTo(1);
-    topicsList
-        .openDotMenuByTopicName(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
-        .clickClearMessagesBtn()
-        .clickConfirmBtnMdl();
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicsList.isAlertWithMessageVisible(SUCCESS,
-            String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())))
-        .as("isAlertWithMessageVisible()").isTrue();
-    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages())
-        .as("getNumberOfMessages()").isEqualTo(0);
-    softly.assertAll();
-  }
-
-  @DisplayName("TopicTests.purgeMessagesOfTopics : Purge messages of topics")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(10)
-  @Order(4)
-  @Test
-  void checkPurgeMessagePossibility(){
-    navigateToTopics();
-    int messageAmount = topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages();
-    topicsList
-        .openTopic(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
-    topicDetails
-        .openDetailsTab(OVERVIEW);
-    produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
-    navigateToTopics();
-    assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages())
-        .as("getNumberOfMessages()").isEqualTo(messageAmount +1);
-    topicsList
-        .getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
-        .selectItem(true)
-        .clickPurgeMessagesOfSelectedTopicsBtn();
-    assertThat(topicsList.isConfirmationMdlVisible()).as("isConfirmationMdlVisible()").isTrue();
-    topicsList
-        .clickCancelBtnMdl()
-        .clickPurgeMessagesOfSelectedTopicsBtn()
-        .clickConfirmBtnMdl();
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicsList.isAlertWithMessageVisible(SUCCESS,
-            String.format("%s messages have been successfully cleared!",TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())))
-        .as("isAlertWithMessageVisible()").isTrue();
-    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages())
-        .as("getNumberOfMessages()").isEqualTo(0);
-    softly.assertAll();
-  }
-
-  @Disabled
-  @Issue("https://github.com/provectus/kafka-ui/issues/2819")
-  @DisplayName("Message copy from topic profile")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(21)
-  @Order(5)
-  @Test
-  void copyMessageFromTopicProfile() {
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
-    topicDetails
-        .openDetailsTab(MESSAGES)
-        .getRandomMessage()
-        .openDotMenu()
-        .clickCopyToClipBoard();
-    Assertions.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Copied successfully!"),
-        "isAlertWithMessageVisible()");
-  }
-
-  @Disabled
-  @Issue("https://github.com/provectus/kafka-ui/issues/2394")
-  @DisplayName("Checking messages filtering by Offset within Topic/Messages")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(15)
-  @Order(6)
-  @Test
-  void checkingMessageFilteringByOffset() {
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
-    topicDetails
-        .openDetailsTab(MESSAGES);
-    TopicDetails.MessageGridItem secondMessage = topicDetails.getMessageByOffset(1);
-    topicDetails
-        .selectSeekTypeDdlMessagesTab("Offset")
-        .setSeekTypeValueFldMessagesTab(String.valueOf(secondMessage.getOffset()))
-        .clickSubmitFiltersBtnMessagesTab();
-    SoftAssertions softly = new SoftAssertions();
-    topicDetails.getAllMessages().forEach(message ->
-        softly.assertThat(message.getOffset() == secondMessage.getOffset()
-                || message.getOffset() > secondMessage.getOffset())
-            .as(String.format("Expected offset is: %s, but found: %s", secondMessage.getOffset(), message.getOffset()))
-            .isTrue());
-    softly.assertAll();
-  }
-
-  @Disabled
-  @Issue("https://github.com/provectus/kafka-ui/issues/3215")
-  @Issue("https://github.com/provectus/kafka-ui/issues/2345")
-  @DisplayName("Checking messages filtering by Timestamp within Messages/Topic")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(16)
-  @Order(7)
-  @Test
-  void checkingMessageFilteringByTimestamp() {
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
-    topicDetails
-        .openDetailsTab(MESSAGES);
-    LocalDateTime firstTimestamp = topicDetails.getMessageByOffset(0).getTimestamp();
-    List<TopicDetails.MessageGridItem> nextMessages = topicDetails.getAllMessages().stream()
-        .filter(message -> message.getTimestamp().getMinute() != firstTimestamp.getMinute())
-        .collect(Collectors.toList());
-    LocalDateTime nextTimestamp = Objects.requireNonNull(nextMessages.stream()
-        .findFirst().orElse(null)).getTimestamp();
-    topicDetails
-        .selectSeekTypeDdlMessagesTab("Timestamp")
-        .openCalendarSeekType()
-        .selectDateAndTimeByCalendar(nextTimestamp)
-        .clickSubmitFiltersBtnMessagesTab();
-    SoftAssertions softly = new SoftAssertions();
-    topicDetails.getAllMessages().forEach(message ->
-        softly.assertThat(message.getTimestamp().isEqual(nextTimestamp)
-                || message.getTimestamp().isAfter(nextTimestamp))
-            .as(String.format("Expected timestamp is: %s, but found: %s", nextTimestamp, message.getTimestamp()))
-            .isTrue());
-    softly.assertAll();
-  }
-
-  @Disabled
-  @Issue("https://github.com/provectus/kafka-ui/issues/2778")
-  @DisplayName("Clear message of topic from topic profile")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(246)
-  @Order(8)
-  @Test
-  void checkClearTopicMessageFromOverviewTab() {
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
-    topicDetails
-        .openDetailsTab(OVERVIEW)
-        .openDotMenu()
-        .clickClearMessagesMenu()
-        .clickConfirmBtnMdl();
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS,
-            String.format("%s messages have been successfully cleared!", TOPIC_FOR_CHECKING_FILTERS.getName())))
-        .as("isAlertWithMessageVisible()").isTrue();
-    softly.assertThat(topicDetails.getMessageCountAmount())
-        .as("getMessageCountAmount()= " + topicDetails.getMessageCountAmount()).isEqualTo(0);
-    softly.assertAll();
-  }
-
-  @DisplayName("TopicTests.recreateTopic : Recreate topic")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(240)
-  @Order(9)
-  @Test
-  void checkRecreateTopic(){
-    navigateToTopicsAndOpenDetails(TOPIC_TO_RECREATE.getName());
-    topicDetails
-        .openDetailsTab(OVERVIEW);
-    produceMessage(TOPIC_TO_RECREATE);
-    navigateToTopics();
-    assertThat(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages())
-        .as("getNumberOfMessages()").isEqualTo(1);
-    topicsList
-        .openDotMenuByTopicName(TOPIC_TO_RECREATE.getName())
-        .clickRecreateTopicBtn()
-        .clickConfirmBtnMdl();
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS,
-            String.format("Topic %s successfully recreated!", TOPIC_TO_RECREATE.getName())))
-        .as("isAlertWithMessageVisible()").isTrue();
-    softly.assertThat(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages())
-        .as("getNumberOfMessages()").isEqualTo(0);
-    softly.assertAll();
-  }
-
-  @Step
-  protected void produceMessage(Topic topic){
-    topicDetails
-        .clickProduceMessageBtn();
-    produceMessagePanel
-        .waitUntilScreenReady()
-        .setKeyField(topic.getMessageKey())
-        .setContentFiled(topic.getMessageContent())
-        .submitProduceMessage();
-    topicDetails
-        .waitUntilScreenReady();
-  }
-
-  @AfterAll
-  public void afterAll() {
-    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
deleted file mode 100644
index fa51ebe1fc4..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/suite/topics/TopicsTests.java
+++ /dev/null
@@ -1,551 +0,0 @@
-package com.provectus.kafka.ui.suite.topics;
-
-import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.MESSAGES;
-import static com.provectus.kafka.ui.pages.topic.TopicDetails.TopicMenu.SETTINGS;
-import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.COMPACT;
-import static com.provectus.kafka.ui.pages.topic.enums.CleanupPolicyValue.DELETE;
-import static com.provectus.kafka.ui.pages.topic.enums.CustomParameterType.COMPRESSION_TYPE;
-import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.NOT_SET;
-import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_1_GB;
-import static com.provectus.kafka.ui.pages.topic.enums.MaxSizeOnDisk.SIZE_50_GB;
-import static com.provectus.kafka.ui.pages.topic.enums.TimeToRetain.BTN_2_DAYS;
-import static com.provectus.kafka.ui.pages.topic.enums.TimeToRetain.BTN_7_DAYS;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
-import static org.apache.commons.lang3.RandomUtils.nextInt;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.codeborne.selenide.Condition;
-import com.provectus.kafka.ui.base.BaseTest;
-import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.topic.TopicDetails;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
-import io.qameta.allure.Issue;
-import io.qase.api.annotation.CaseId;
-import java.util.ArrayList;
-import java.util.List;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.TestMethodOrder;
-
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-public class TopicsTests extends BaseTest {
-  private static final long SUITE_ID = 2;
-  private static final String SUITE_TITLE = "Topics";
-  private static final Topic TOPIC_TO_CREATE = new Topic()
-      .setName("new-topic-" + randomAlphabetic(5))
-      .setNumberOfPartitions(1)
-      .setCustomParameterType(COMPRESSION_TYPE)
-      .setCustomParameterValue("producer")
-      .setCleanupPolicyValue(DELETE);
-  private static final Topic TOPIC_TO_UPDATE_AND_DELETE = new Topic()
-      .setName("topic-to-update-and-delete-" + randomAlphabetic(5))
-      .setNumberOfPartitions(1)
-      .setCleanupPolicyValue(DELETE)
-      .setTimeToRetain(BTN_7_DAYS)
-      .setMaxSizeOnDisk(NOT_SET)
-      .setMaxMessageBytes("1048588")
-      .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
-  private static final Topic TOPIC_TO_CHECK_SETTINGS = new Topic()
-      .setName("new-topic-" + randomAlphabetic(5))
-      .setNumberOfPartitions(1)
-      .setMaxMessageBytes("1000012")
-      .setMaxSizeOnDisk(NOT_SET);
-  private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
-      .setName("topic-for-check-filters-" + randomAlphabetic(5));
-  private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete-" + randomAlphabetic(5));
-  private static final List<Topic> TOPIC_LIST = new ArrayList<>();
-
-  @BeforeAll
-  public void beforeAll() {
-    TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE_AND_DELETE, TOPIC_FOR_DELETE, TOPIC_FOR_CHECK_FILTERS));
-    TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
-  }
-
-  @DisplayName("should create a topic")
-  @Suite(suiteId = 4, title = "Create new Topic")
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(199)
-  @Test
-  @Order(1)
-  public void createTopic() {
-    navigateToTopics();
-    topicsList
-        .clickAddTopicBtn();
-    topicCreateEditForm
-        .waitUntilScreenReady()
-        .setTopicName(TOPIC_TO_CREATE.getName())
-        .setNumberOfPartitions(TOPIC_TO_CREATE.getNumberOfPartitions())
-        .selectCleanupPolicy(TOPIC_TO_CREATE.getCleanupPolicyValue())
-        .clickCreateTopicBtn();
-    navigateToTopicsAndOpenDetails(TOPIC_TO_CREATE.getName());
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName())).as("isTopicHeaderVisible()")
-        .isTrue();
-    softly.assertThat(topicDetails.getCleanUpPolicy()).as("getCleanUpPolicy()")
-        .isEqualTo(TOPIC_TO_CREATE.getCleanupPolicyValue().toString());
-    softly.assertThat(topicDetails.getPartitions()).as("getPartitions()")
-        .isEqualTo(TOPIC_TO_CREATE.getNumberOfPartitions());
-    softly.assertAll();
-    navigateToTopics();
-    Assertions.assertTrue(topicsList.isTopicVisible(TOPIC_TO_CREATE.getName()), "isTopicVisible");
-    TOPIC_LIST.add(TOPIC_TO_CREATE);
-  }
-
-  @DisplayName("Checking available operations for selected Topic within 'All Topics' page")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(7)
-  @Test
-  @Order(2)
-  void checkAvailableOperations() {
-    navigateToTopics();
-    topicsList
-        .getTopicItem("my_ksql_1ksql_processing_log")
-        .selectItem(true);
-    verifyElementsCondition(topicsList.getActionButtons(),Condition.enabled);
-    topicsList
-        .getTopicItem("_confluent-ksql-my_ksql_1_command_topic")
-        .selectItem(true);
-    Assertions.assertFalse(topicsList.isCopySelectedTopicBtnEnabled(), "isCopySelectedTopicBtnEnabled()");
-  }
-
-  @Disabled()
-  @Issue("https://github.com/provectus/kafka-ui/issues/2625")
-  @DisplayName("should update a topic")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(197)
-  @Test
-  @Order(3)
-  public void updateTopic() {
-    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
-    topicDetails
-        .openDotMenu()
-        .clickEditSettingsMenu();
-    topicCreateEditForm
-        .waitUntilScreenReady();
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()")
-        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText());
-    softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()")
-        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue());
-    softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()")
-        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText());
-    softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()")
-        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes());
-    softly.assertAll();
-    TOPIC_TO_UPDATE_AND_DELETE
-        .setCleanupPolicyValue(COMPACT)
-        .setTimeToRetain(BTN_2_DAYS)
-        .setMaxSizeOnDisk(SIZE_50_GB).setMaxMessageBytes("1048589");
-    topicCreateEditForm
-        .selectCleanupPolicy((TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue()))
-        .setTimeToRetainDataByButtons(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain())
-        .setMaxSizeOnDiskInGB(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk())
-        .setMaxMessageBytes(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes())
-        .clickCreateTopicBtn();
-    softly.assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully updated."))
-        .as("isAlertWithMessageVisible()").isTrue();
-    softly.assertThat(topicDetails.isTopicHeaderVisible(TOPIC_TO_UPDATE_AND_DELETE.getName()))
-        .as("isTopicHeaderVisible()").isTrue();
-    softly.assertAll();
-    topicDetails
-        .waitUntilScreenReady();
-    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
-    topicDetails
-        .openDotMenu()
-        .clickEditSettingsMenu();
-    softly.assertThat(topicCreateEditForm.isNameFieldEnabled()).as("isNameFieldEnabled()").isFalse();
-    softly.assertThat(topicCreateEditForm.getCleanupPolicy()).as("getCleanupPolicy()")
-        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText());
-    softly.assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()")
-        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue());
-    softly.assertThat(topicCreateEditForm.getMaxSizeOnDisk()).as("getMaxSizeOnDisk()")
-        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText());
-    softly.assertThat(topicCreateEditForm.getMaxMessageBytes()).as("getMaxMessageBytes()")
-        .isEqualTo(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes());
-    softly.assertAll();
-  }
-
-  @DisplayName("TopicTests.removeTopicFromAllTopics : Remove topic from 'all topics'/'TopicList'")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(242)
-  @Test
-  @Order(4)
-  public void removeTopicFromTopicList() {
-    navigateToTopics();
-    topicsList
-        .openDotMenuByTopicName(TOPIC_TO_UPDATE_AND_DELETE.getName())
-        .clickRemoveTopicBtn()
-        .clickConfirmBtnMdl();
-    Assertions.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
-            String.format("Topic %s successfully deleted!", TOPIC_TO_UPDATE_AND_DELETE.getName())),
-        "isAlertWithMessageVisible()");
-    TOPIC_LIST.remove(TOPIC_TO_UPDATE_AND_DELETE);
-  }
-
-  @DisplayName("should delete topic")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(207)
-  @Test
-  @Order(5)
-  public void deleteTopic() {
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_DELETE.getName());
-    topicDetails
-        .openDotMenu()
-        .clickDeleteTopicMenu()
-        .clickConfirmBtnMdl();
-    navigateToTopics();
-    Assertions.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
-    TOPIC_LIST.remove(TOPIC_FOR_DELETE);
-  }
-
-  @DisplayName("Redirect to consumer from topic profile")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(20)
-  @Test
-  @Order(6)
-  void redirectToConsumerFromTopic() {
-    String topicName = "source-activities";
-    String consumerGroupId = "connect-sink_postgres_activities";
-    navigateToTopicsAndOpenDetails(topicName);
-    topicDetails
-        .openDetailsTab(TopicDetails.TopicMenu.CONSUMERS)
-        .openConsumerGroup(consumerGroupId);
-    consumersDetails
-        .waitUntilScreenReady();
-    assertThat(consumersDetails.isRedirectedConsumerTitleVisible(consumerGroupId))
-        .withFailMessage("isRedirectedConsumerTitleVisible").isTrue();
-    assertThat(consumersDetails.isTopicInConsumersDetailsVisible(topicName))
-        .withFailMessage("isTopicInConsumersDetailsVisible").isTrue();
-  }
-
-  @DisplayName("Checking Topic creation possibility in case of empty Topic Name")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(4)
-  @Test
-  @Order(7)
-  void checkTopicCreatePossibility() {
-    navigateToTopics();
-    topicsList
-        .clickAddTopicBtn();
-    topicCreateEditForm
-        .waitUntilScreenReady();
-    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
-    topicCreateEditForm
-        .setTopicName("testName");
-    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
-    topicCreateEditForm
-        .setTopicName(null)
-        .setNumberOfPartitions(nextInt(1, 10));
-    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
-    topicCreateEditForm
-        .setTopicName("testName");
-    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isTrue();
-  }
-
-  @DisplayName("Checking 'Time to retain data (in ms)' custom value with editing Topic's settings")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(266)
-  @Test
-  @Order(8)
-  void checkTimeToRetainDataCustomValueWithEditingTopic() {
-    Topic topicToRetainData = new Topic()
-        .setName("topic-to-retain-data-" + randomAlphabetic(5))
-        .setTimeToRetainData("86400000");
-    navigateToTopics();
-    topicsList
-        .clickAddTopicBtn();
-    topicCreateEditForm
-        .waitUntilScreenReady()
-        .setTopicName(topicToRetainData.getName())
-        .setNumberOfPartitions(1)
-        .setTimeToRetainDataInMs("604800000");
-    assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()").isEqualTo("604800000");
-    topicCreateEditForm
-        .setTimeToRetainDataInMs(topicToRetainData.getTimeToRetainData())
-        .clickCreateTopicBtn();
-    topicDetails
-        .waitUntilScreenReady()
-        .openDotMenu()
-        .clickEditSettingsMenu();
-    assertThat(topicCreateEditForm.getTimeToRetain()).as("getTimeToRetain()")
-        .isEqualTo(topicToRetainData.getTimeToRetainData());
-    topicDetails
-        .openDetailsTab(SETTINGS);
-    assertThat(topicDetails.getSettingsGridValueByKey("retention.ms")).as("getSettingsGridValueByKey()")
-        .isEqualTo(topicToRetainData.getTimeToRetainData());
-    TOPIC_LIST.add(topicToRetainData);
-  }
-
-  @DisplayName("Checking requiredness of Custom parameters within 'Create new Topic'")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(6)
-  @Test
-  @Order(9)
-  void checkCustomParametersWithinCreateNewTopic() {
-    navigateToTopics();
-    topicsList
-        .clickAddTopicBtn();
-    topicCreateEditForm
-        .waitUntilScreenReady()
-        .setTopicName(TOPIC_TO_CREATE.getName())
-        .clickAddCustomParameterTypeButton()
-        .setCustomParameterType(TOPIC_TO_CREATE.getCustomParameterType());
-    assertThat(topicCreateEditForm.isDeleteCustomParameterButtonEnabled()).as("isDeleteCustomParameterButtonEnabled()")
-        .isTrue();
-    topicCreateEditForm
-        .clearCustomParameterValue();
-    assertThat(topicCreateEditForm.isValidationMessageCustomParameterValueVisible())
-        .as("isValidationMessageCustomParameterValueVisible()").isTrue();
-  }
-
-  @DisplayName("Checking Topics section within Kafka-ui Application")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(2)
-  @Test
-  @Order(10)
-  void checkTopicListElements() {
-    navigateToTopics();
-    verifyElementsCondition(topicsList.getAllVisibleElements(), Condition.visible);
-    verifyElementsCondition(topicsList.getAllEnabledElements(), Condition.enabled);
-  }
-
-  @DisplayName("Filter adding within Topic")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(12)
-  @Test
-  @Order(11)
-  void addingNewFilterWithinTopic() {
-    String filterName = randomAlphabetic(5);
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-    topicDetails
-        .openDetailsTab(MESSAGES)
-        .clickMessagesAddFiltersBtn()
-        .waitUntilAddFiltersMdlVisible();
-    verifyElementsCondition(topicDetails.getAllAddFilterModalVisibleElements(), Condition.visible);
-    verifyElementsCondition(topicDetails.getAllAddFilterModalEnabledElements(), Condition.enabled);
-    verifyElementsCondition(topicDetails.getAllAddFilterModalDisabledElements(), Condition.disabled);
-    assertThat(topicDetails.isSaveThisFilterCheckBoxSelected()).as("isSaveThisFilterCheckBoxSelected()")
-        .isFalse();
-    topicDetails
-        .setFilterCodeFieldAddFilterMdl(filterName);
-    assertThat(topicDetails.isAddFilterBtnAddFilterMdlEnabled()).as("isAddFilterBtnAddFilterMdlEnabled()")
-        .isTrue();
-    topicDetails.clickAddFilterBtnAndCloseMdl(true);
-    assertThat(topicDetails.isActiveFilterVisible(filterName)).as("isActiveFilterVisible()")
-        .isTrue();
-  }
-
-  @DisplayName("Checking filter saving within Messages/Topic profile/Saved Filters")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(13)
-  @Test
-  @Order(12)
-  void checkFilterSavingWithinSavedFilters() {
-    String displayName = randomAlphabetic(5);
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-    topicDetails
-        .openDetailsTab(MESSAGES)
-        .clickMessagesAddFiltersBtn()
-        .waitUntilAddFiltersMdlVisible()
-        .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
-        .selectSaveThisFilterCheckboxMdl(true)
-        .setDisplayNameFldAddFilterMdl(displayName);
-    assertThat(topicDetails.isAddFilterBtnAddFilterMdlEnabled()).as("isAddFilterBtnAddFilterMdlEnabled()")
-        .isTrue();
-    topicDetails
-        .clickAddFilterBtnAndCloseMdl(false)
-        .openSavedFiltersListMdl();
-    assertThat(topicDetails.isFilterVisibleAtSavedFiltersMdl(displayName))
-        .as("isFilterVisibleAtSavedFiltersMdl()").isTrue();
-  }
-
-  @DisplayName("Checking applying saved filter within Topic/Messages")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(14)
-  @Test
-  @Order(13)
-  void checkingApplyingSavedFilterWithinTopicMessages() {
-    String displayName = randomAlphabetic(5);
-    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-    topicDetails
-        .openDetailsTab(MESSAGES)
-        .clickMessagesAddFiltersBtn()
-        .waitUntilAddFiltersMdlVisible()
-        .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
-        .selectSaveThisFilterCheckboxMdl(true)
-        .setDisplayNameFldAddFilterMdl(displayName)
-        .clickAddFilterBtnAndCloseMdl(false)
-        .openSavedFiltersListMdl()
-        .selectFilterAtSavedFiltersMdl(displayName)
-        .clickSelectFilterBtnAtSavedFiltersMdl();
-    assertThat(topicDetails.isActiveFilterVisible(displayName))
-        .as("isActiveFilterVisible()").isTrue();
-  }
-
-  @DisplayName("Checking 'Show Internal Topics' toggle functionality within 'All Topics' page")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(11)
-  @Test
-  @Order(14)
-  void checkShowInternalTopicsButtonFunctionality(){
-    navigateToTopics();
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicsList.isShowInternalRadioBtnSelected()).as("isInternalRadioBtnSelected()").isTrue();
-    softly.assertThat(topicsList.getInternalTopics()).as("getInternalTopics()").size().isGreaterThan(0);
-    softly.assertThat(topicsList.getNonInternalTopics()).as("getNonInternalTopics()").size().isGreaterThan(0);
-    softly.assertAll();
-    topicsList
-        .setShowInternalRadioButton(false);
-    softly.assertThat(topicsList.getInternalTopics()).as("getInternalTopics()").size().isEqualTo(0);
-    softly.assertThat(topicsList.getNonInternalTopics()).as("getNonInternalTopics()").size().isGreaterThan(0);
-    softly.assertAll();
-  }
-
-  @DisplayName("Checking Topics settings to make sure retention.bytes is right according to Max size on disk in GB selected value")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(56)
-  @Test
-  @Order(15)
-  void checkRetentionBytesAccordingToMaxSizeOnDisk(){
-    navigateToTopics();
-    topicsList
-        .clickAddTopicBtn();
-    topicCreateEditForm
-        .waitUntilScreenReady()
-        .setTopicName(TOPIC_TO_CHECK_SETTINGS.getName())
-        .setNumberOfPartitions(TOPIC_TO_CHECK_SETTINGS.getNumberOfPartitions())
-        .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
-        .clickCreateTopicBtn();
-    topicDetails
-        .waitUntilScreenReady();
-    TOPIC_LIST.add(TOPIC_TO_CHECK_SETTINGS);
-    topicDetails
-        .openDetailsTab(SETTINGS);
-    topicSettingsTab
-        .waitUntilScreenReady();
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicSettingsTab.getValueByKey("retention.bytes"))
-        .as("getValueOfKey(retention.bytes)").isEqualTo(TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue());
-    softly.assertThat(topicSettingsTab.getValueByKey("max.message.bytes"))
-        .as("getValueOfKey(max.message.bytes)").isEqualTo(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes());
-    softly.assertAll();
-    TOPIC_TO_CHECK_SETTINGS
-        .setMaxSizeOnDisk(SIZE_1_GB)
-        .setMaxMessageBytes("1000056");
-    topicDetails
-        .openDotMenu()
-        .clickEditSettingsMenu();
-    topicCreateEditForm
-        .waitUntilScreenReady()
-        .setMaxSizeOnDiskInGB(TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk())
-        .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
-        .clickCreateTopicBtn();
-    topicDetails
-        .waitUntilScreenReady()
-        .openDetailsTab(SETTINGS);
-    topicSettingsTab
-        .waitUntilScreenReady();
-    softly.assertThat(topicSettingsTab.getValueByKey("retention.bytes"))
-        .as("getValueOfKey(retention.bytes)").isEqualTo(TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue());
-    softly.assertThat(topicSettingsTab.getValueByKey("max.message.bytes"))
-        .as("getValueOfKey(max.message.bytes)").isEqualTo(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes());
-    softly.assertAll();
-  }
-
-  @DisplayName("TopicTests.recreateTopicFromTopicProfile : Recreate topic from topic profile")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(247)
-  @Test
-  @Order(16)
-  void recreateTopicFromTopicProfile(){
-    Topic topicToRecreate = new Topic()
-        .setName("topic-to-recreate-" + randomAlphabetic(5))
-        .setNumberOfPartitions(1);
-    navigateToTopics();
-    topicsList
-        .clickAddTopicBtn();
-    topicCreateEditForm
-        .waitUntilScreenReady()
-        .setTopicName(topicToRecreate.getName())
-        .setNumberOfPartitions(topicToRecreate.getNumberOfPartitions())
-        .clickCreateTopicBtn();
-    topicDetails
-        .waitUntilScreenReady();
-    TOPIC_LIST.add(topicToRecreate);
-    topicDetails
-        .openDotMenu()
-        .clickRecreateTopicMenu();
-    assertThat(topicDetails.isConfirmationMdlVisible()).as("isConfirmationMdlVisible()").isTrue();
-    topicDetails
-        .clickConfirmBtnMdl();
-    assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS,
-        String.format("Topic %s successfully recreated!", topicToRecreate.getName())))
-        .as("isAlertWithMessageVisible()").isTrue();
-  }
-
-  @DisplayName("TopicTests.copyTopic : Copy topic")
-  @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-  @AutomationStatus(status = Status.AUTOMATED)
-  @CaseId(8)
-  @Test
-  @Order(17)
-  void checkCopyTopicPossibility(){
-    Topic topicToCopy = new Topic()
-        .setName("topic-to-copy-" + randomAlphabetic(5))
-        .setNumberOfPartitions(1);
-    navigateToTopics();
-    topicsList
-        .getTopicItem("_schemas")
-        .selectItem(true)
-        .clickCopySelectedTopicBtn();
-    topicCreateEditForm
-        .waitUntilScreenReady();
-    assertThat(topicCreateEditForm.isCreateTopicButtonEnabled()).as("isCreateTopicButtonEnabled()").isFalse();
-    topicCreateEditForm
-        .setTopicName(topicToCopy.getName())
-        .setNumberOfPartitions(topicToCopy.getNumberOfPartitions())
-        .clickCreateTopicBtn();
-    topicDetails
-        .waitUntilScreenReady();
-    TOPIC_LIST.add(topicToCopy);
-    SoftAssertions softly = new SoftAssertions();
-    softly.assertThat(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully created."))
-        .as("isAlertWithMessageVisible()").isTrue();
-    softly.assertThat(topicDetails.isTopicHeaderVisible(topicToCopy.getName()))
-        .as("isTopicHeaderVisible()").isTrue();
-    softly.assertAll();
-  }
-
-  @AfterAll
-  public void afterAll() {
-    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
-  }
-}
diff --git a/kafka-ui-e2e-checks/src/test/resources/regression.xml b/kafka-ui-e2e-checks/src/test/resources/regression.xml
new file mode 100644
index 00000000000..fff1df60852
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/regression.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
+<suite name="RegressionSuite">
+    <test name="Regression" enabled="true" parallel="classes" thread-count="1">
+        <packages>
+            <package name="com.provectus.kafka.ui.regressionSuite.*"/>
+        </packages>
+    </test>
+</suite>
diff --git a/kafka-ui-e2e-checks/src/test/resources/smoke.xml b/kafka-ui-e2e-checks/src/test/resources/smoke.xml
new file mode 100644
index 00000000000..e0a8f082e8f
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/smoke.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
+<suite name="SmokeSuite">
+    <test name="Smoke" enabled="true" parallel="classes" thread-count="1">
+        <packages>
+            <package name="com.provectus.kafka.ui.smokeSuite.*"/>
+        </packages>
+    </test>
+</suite>

From 6ffcd845fa3363033ef764e9a18a8de0808faa75 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 9 Feb 2023 14:53:43 +0300
Subject: [PATCH 401/734] Fix e2e run (#3326)

* Fix e2e run

* add suite profiles

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .github/workflows/e2e-checks.yaml                  |  4 ++--
 kafka-ui-e2e-checks/README.md                      | 14 ++++++++++----
 .../kafka/ui/settings/configs/Profiles.java        | 14 +++++++++-----
 .../provectus/kafka/ui/testSuite/TestClass.java    |  4 ++++
 .../src/test/resources/regression.xml              |  3 ++-
 kafka-ui-e2e-checks/src/test/resources/sanity.xml  |  8 ++++++++
 6 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/testSuite/TestClass.java
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/sanity.xml

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 85e3c17d2f3..40178c67d87 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -33,7 +33,7 @@ jobs:
         id: build_app
         run: |
           ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          ./mvnw -B -V -ntp clean package -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
+          ./mvnw -B -V -ntp clean install -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
       - name: compose app
         id: compose_app
         # use the following command until #819 will be fixed
@@ -42,7 +42,7 @@ jobs:
       - name: e2e run
         run: |
           ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          ./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ secrets.QASEIO_API_TOKEN }} -pl 'kafka-ui-e2e-checks' test -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -Pprod
+          ./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ secrets.QASEIO_API_TOKEN }} -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -Dsuite=smoke -f 'kafka-ui-e2e-checks' test -Pprod
       - name: Generate allure report
         uses: simple-elf/allure-report-action@master
         if: always()
diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index 651e3c11439..bd8e0ba7049 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -41,16 +41,22 @@ docker-compose -f documentation/compose/e2e-tests.yaml up -d
 2. Run Smoke test suite using your QaseIO API token as environment variable (put instead %s into command below)
 
 ```
-./mvnw -DQASEIO_API_TOKEN='%s' -pl 'kafka-ui-e2e-checks' test -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -Pprod
+./mvnw -DQASEIO_API_TOKEN='%s' -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -Dsuite=smoke -f 'kafka-ui-e2e-checks' test -Pprod
 ```
 
-3. Run Regression test suite using your QaseIO API token as environment variable (put instead %s into command below)
+3. Run Sanity test suite using your QaseIO API token as environment variable (put instead %s into command below)
 
 ```
-./mvnw -DQASEIO_API_TOKEN='%s' -pl 'kafka-ui-e2e-checks' test -Dsurefire.suiteXmlFiles='src/test/resources/regression.xml' -Pprod
+./mvnw -DQASEIO_API_TOKEN='%s' -Dsurefire.suiteXmlFiles='src/test/resources/sanity.xml' -Dsuite=sanity -f 'kafka-ui-e2e-checks' test -Pprod
 ```
 
-4. To run tests on your local Chrome browser just add next VM option to the Run Configuration
+4. Run Regression test suite using your QaseIO API token as environment variable (put instead %s into command below)
+
+```
+./mvnw -DQASEIO_API_TOKEN='%s' -Dsurefire.suiteXmlFiles='src/test/resources/regression.xml' -Dsuite=regression -f 'kafka-ui-e2e-checks' test -Pprod
+```
+
+5. To run tests on your local Chrome browser just add next VM option to the Run Configuration
 
 ```
 -Dbrowser=local
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
index 9a5ca691076..27696c46d6e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
@@ -4,10 +4,14 @@
 
 public interface Profiles extends Config {
 
-  String CONTAINER = "container";
-  String LOCAL = "local";
+    String CONTAINER = "container";
+    String LOCAL = "local";
 
-  @Key("browser")
-  @DefaultValue(CONTAINER)
-  String browser();
+    @Key("browser")
+    @DefaultValue(CONTAINER)
+    String browser();
+
+    @Key("suite")
+    @DefaultValue("custom")
+    String suite();
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/testSuite/TestClass.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/testSuite/TestClass.java
new file mode 100644
index 00000000000..af5a4aea3fb
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/testSuite/TestClass.java
@@ -0,0 +1,4 @@
+package com.provectus.kafka.ui.testSuite;
+
+public class TestClass {
+}
diff --git a/kafka-ui-e2e-checks/src/test/resources/regression.xml b/kafka-ui-e2e-checks/src/test/resources/regression.xml
index fff1df60852..2c34f4a929f 100644
--- a/kafka-ui-e2e-checks/src/test/resources/regression.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/regression.xml
@@ -2,7 +2,8 @@
 <suite name="RegressionSuite">
     <test name="Regression" enabled="true" parallel="classes" thread-count="1">
         <packages>
-            <package name="com.provectus.kafka.ui.regressionSuite.*"/>
+            <package name="com.provectus.kafka.ui.smokeSuite.*"/>
+            <package name="com.provectus.kafka.ui.sanitySuite.*"/>
         </packages>
     </test>
 </suite>
diff --git a/kafka-ui-e2e-checks/src/test/resources/sanity.xml b/kafka-ui-e2e-checks/src/test/resources/sanity.xml
new file mode 100644
index 00000000000..e1c8e8a31f2
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/sanity.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
+<suite name="SanitySuite">
+    <test name="Sanity" enabled="true" parallel="classes" thread-count="1">
+        <packages>
+            <package name="com.provectus.kafka.ui.sanitySuite.*"/>
+        </packages>
+    </test>
+</suite>

From 45a6e73d295c904a26ded39621058165fc200506 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 9 Feb 2023 16:13:04 +0400
Subject: [PATCH 402/734] [BE] SR: maxInMemorySize property setting added to SR
 client (#3310)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../java/com/provectus/kafka/ui/service/KafkaClusterFactory.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
index 7113f5af367..aea92ab4c45 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
@@ -82,6 +82,7 @@ private ReactiveFailover<KafkaSrClientApi> schemaRegistryClient(ClustersProperti
     WebClient webClient = new WebClientConfigurator()
         .configureSsl(clusterProperties.getSchemaRegistrySsl())
         .configureBasicAuth(auth.getUsername(), auth.getPassword())
+        .configureBufferSize(maxBuffSize)
         .build();
     return ReactiveFailover.create(
         parseUrlList(clusterProperties.getSchemaRegistry()),

From 8663ef6e8422b84a18cc19d82832d4f0fcf6b1cd Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:23:50 +0200
Subject: [PATCH 403/734] [e2e] Checking Clearing results for already executed
 KSQL Request (#3327)

* test commit

* fix BaseTest

* upd global

* upd global

* upd global

* add local browser VM option

* fix TopicsList column header locator

* fix withStartupTimeout()

* switch e2e to TestNG

* upd pom

* upd page classes

* upd -pl kafka-ui-e2e-checks

* test commit

* Revert "test commit"

This reverts commit 4b505321ac5e164986a7a1886ac40c6744b8ecb1.

* fix workflow module

* upd test -f 'kafka-ui-e2e-checks'

* crt clearResultsForExecutedRequest test

* add suite profiles

* fix clickClearResultsBtn
---
 .../kafka/ui/pages/ksqlDb/KsqlQueryForm.java  | 225 +++++++++---------
 .../ui/smokeSuite/ksqlDb/KsqlDbTest.java      |  26 +-
 2 files changed, 143 insertions(+), 108 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
index e34fbedb1cb..30ac1007fdb 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
@@ -1,144 +1,155 @@
 package com.provectus.kafka.ui.pages.ksqlDb;
 
-import static com.codeborne.selenide.Condition.visible;
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
-
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.codeborne.selenide.Condition.visible;
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+
 public class KsqlQueryForm extends BasePage {
-  protected SelenideElement pageTitle = $x("//h1[text()='Query']");
-  protected SelenideElement clearBtn = $x("//div/button[text()='Clear']");
-  protected SelenideElement executeBtn = $x("//div/button[text()='Execute']");
-  protected SelenideElement stopQueryBtn = $x("//div/button[text()='Stop query']");
-  protected SelenideElement clearResultsBtn = $x("//div/button[text()='Clear results']");
-  protected SelenideElement addStreamPropertyBtn = $x("//button[text()='Add Stream Property']");
-  protected SelenideElement queryAreaValue = $x("//div[@class='ace_content']");
-  protected SelenideElement queryArea = $x("//div[@id='ksql']/textarea[@class='ace_text-input']");
-  protected ElementsCollection ksqlGridItems = $$x("//tbody//tr");
-  protected ElementsCollection keyField = $$x("//input[@aria-label='key']");
-  protected ElementsCollection valueField = $$x("//input[@aria-label='value']");
-
-  @Step
-  public KsqlQueryForm waitUntilScreenReady() {
-    waitUntilSpinnerDisappear();
-    pageTitle.shouldBe(Condition.visible);
-    return this;
-  }
-
-  @Step
-  public KsqlQueryForm clickClearBtn() {
-    clickByJavaScript(clearBtn);
-    return this;
-  }
-
-  @Step
-  public KsqlQueryForm clickExecuteBtn() {
-    clickByJavaScript(executeBtn);
-    if (queryAreaValue.getText().contains("EMIT CHANGES;")) {
-      loadingSpinner.shouldBe(Condition.visible);
-    } else {
-      waitUntilSpinnerDisappear();
+    protected SelenideElement pageTitle = $x("//h1[text()='Query']");
+    protected SelenideElement clearBtn = $x("//div/button[text()='Clear']");
+    protected SelenideElement executeBtn = $x("//div/button[text()='Execute']");
+    protected SelenideElement stopQueryBtn = $x("//div/button[text()='Stop query']");
+    protected SelenideElement clearResultsBtn = $x("//div/button[text()='Clear results']");
+    protected SelenideElement addStreamPropertyBtn = $x("//button[text()='Add Stream Property']");
+    protected SelenideElement queryAreaValue = $x("//div[@class='ace_content']");
+    protected SelenideElement queryArea = $x("//div[@id='ksql']/textarea[@class='ace_text-input']");
+    protected ElementsCollection ksqlGridItems = $$x("//tbody//tr");
+    protected ElementsCollection keyField = $$x("//input[@aria-label='key']");
+    protected ElementsCollection valueField = $$x("//input[@aria-label='value']");
+
+    @Step
+    public KsqlQueryForm waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        pageTitle.shouldBe(Condition.visible);
+        return this;
     }
-    return this;
-  }
-
-  @Step
-  public KsqlQueryForm clickStopQueryBtn() {
-    clickByJavaScript(stopQueryBtn);
-    waitUntilSpinnerDisappear();
-    return this;
-  }
-
-  @Step
-  public KsqlQueryForm clickClearResultsBtn() {
-    clickByJavaScript(clearResultsBtn);
-    waitUntilSpinnerDisappear();
-    return this;
-  }
-
-  @Step
-  public KsqlQueryForm clickAddStreamProperty() {
-    clickByJavaScript(addStreamPropertyBtn);
-    return this;
-  }
-
-  @Step
-  public KsqlQueryForm setQuery(String query) {
-    queryAreaValue.shouldBe(Condition.visible).click();
-    queryArea.setValue(query);
-    return this;
-  }
-
-  private List<KsqlQueryForm.KsqlResponseGridItem> initItems() {
-    List<KsqlQueryForm.KsqlResponseGridItem> gridItemList = new ArrayList<>();
-    ksqlGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-        .forEach(item -> gridItemList.add(new KsqlQueryForm.KsqlResponseGridItem(item)));
-    return gridItemList;
-  }
-
-  @Step
-  public KsqlQueryForm.KsqlResponseGridItem getTableByName(String name) {
-    return initItems().stream()
-        .filter(e -> e.getName().equalsIgnoreCase(name))
-        .findFirst().orElseThrow();
-  }
-
-  public static class KsqlResponseGridItem extends BasePage {
-
-    private final SelenideElement element;
-
-    private KsqlResponseGridItem(SelenideElement element) {
-      this.element = element;
+
+    @Step
+    public KsqlQueryForm clickClearBtn() {
+        clickByJavaScript(clearBtn);
+        return this;
     }
 
     @Step
-    public String getType() {
-      return element.$x("./td[1]").getText().trim();
+    public KsqlQueryForm clickExecuteBtn() {
+        clickByActions(executeBtn);
+        if (queryAreaValue.getText().contains("EMIT CHANGES;")) {
+            loadingSpinner.shouldBe(Condition.visible);
+        } else {
+            waitUntilSpinnerDisappear();
+        }
+        return this;
     }
 
     @Step
-    public String getName() {
-      return element.$x("./td[2]").scrollTo().getText().trim();
+    public KsqlQueryForm clickStopQueryBtn() {
+        clickByActions(stopQueryBtn);
+        waitUntilSpinnerDisappear();
+        return this;
     }
 
     @Step
-    public boolean isVisible() {
-      boolean isVisible = false;
-      try {
-        element.$x("./td[2]").shouldBe(visible, Duration.ofMillis(500));
-        isVisible = true;
-      } catch (Throwable ignored) {
-      }
-      return isVisible;
+    public KsqlQueryForm clickClearResultsBtn() {
+        clickByActions(clearResultsBtn);
+        waitUntilSpinnerDisappear();
+        return this;
     }
 
     @Step
-    public String getTopic() {
-      return element.$x("./td[3]").getText().trim();
+    public KsqlQueryForm clickAddStreamProperty() {
+        clickByJavaScript(addStreamPropertyBtn);
+        return this;
     }
 
     @Step
-    public String getKeyFormat() {
-      return element.$x("./td[4]").getText().trim();
+    public KsqlQueryForm setQuery(String query) {
+        queryAreaValue.shouldBe(Condition.visible).click();
+        queryArea.setValue(query);
+        return this;
     }
 
     @Step
-    public String getValueFormat() {
-      return element.$x("./td[5]").getText().trim();
+    public KsqlQueryForm.KsqlResponseGridItem getTableByName(String name) {
+        return initItems().stream()
+                .filter(e -> e.getName().equalsIgnoreCase(name))
+                .findFirst().orElseThrow();
     }
 
     @Step
-    public String getIsWindowed() {
-      return element.$x("./td[6]").getText().trim();
+    public boolean areResultsVisible() {
+        boolean visible = false;
+        try {
+            visible = initItems().size() > 0;
+        } catch (Throwable ignored) {
+        }
+        return visible;
+    }
+
+    private List<KsqlQueryForm.KsqlResponseGridItem> initItems() {
+        List<KsqlQueryForm.KsqlResponseGridItem> gridItemList = new ArrayList<>();
+        ksqlGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+                .forEach(item -> gridItemList.add(new KsqlQueryForm.KsqlResponseGridItem(item)));
+        return gridItemList;
+    }
+
+    public static class KsqlResponseGridItem extends BasePage {
+
+        private final SelenideElement element;
+
+        private KsqlResponseGridItem(SelenideElement element) {
+            this.element = element;
+        }
+
+        @Step
+        public String getType() {
+            return element.$x("./td[1]").getText().trim();
+        }
+
+        @Step
+        public String getName() {
+            return element.$x("./td[2]").scrollTo().getText().trim();
+        }
+
+        @Step
+        public boolean isVisible() {
+            boolean isVisible = false;
+            try {
+                element.$x("./td[2]").shouldBe(visible, Duration.ofMillis(500));
+                isVisible = true;
+            } catch (Throwable ignored) {
+            }
+            return isVisible;
+        }
+
+        @Step
+        public String getTopic() {
+            return element.$x("./td[3]").getText().trim();
+        }
+
+        @Step
+        public String getKeyFormat() {
+            return element.$x("./td[4]").getText().trim();
+        }
+
+        @Step
+        public String getValueFormat() {
+            return element.$x("./td[5]").getText().trim();
+        }
+
+        @Step
+        public String getIsWindowed() {
+            return element.$x("./td[6]").getText().trim();
+        }
     }
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
index 8689c0abde3..be847b00a7a 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
@@ -39,7 +39,7 @@ public void beforeClass() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(41)
-    @Test
+    @Test(priority = 1)
     public void checkShowTablesRequestExecution() {
         naviSideBar
                 .openSideMenu(KSQL_DB);
@@ -51,8 +51,32 @@ public void checkShowTablesRequestExecution() {
                 .setQuery(SHOW_TABLES.getQuery())
                 .clickExecuteBtn();
         SoftAssert softly = new SoftAssert();
+        softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
         softly.assertTrue(ksqlQueryForm.getTableByName(FIRST_TABLE.getName()).isVisible(), "getTableName()");
         softly.assertTrue(ksqlQueryForm.getTableByName(SECOND_TABLE.getName()).isVisible(), "getTableName()");
         softly.assertAll();
     }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(86)
+    @Test(priority = 2)
+    public void clearResultsForExecutedRequest() {
+        naviSideBar
+                .openSideMenu(KSQL_DB);
+        ksqlDbList
+                .waitUntilScreenReady()
+                .clickExecuteKsqlRequestBtn();
+        ksqlQueryForm
+                .waitUntilScreenReady()
+                .setQuery(SHOW_TABLES.getQuery())
+                .clickExecuteBtn();
+        SoftAssert softly = new SoftAssert();
+        softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
+        softly.assertAll();
+        ksqlQueryForm
+                .clickClearResultsBtn();
+        softly.assertFalse(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
+        softly.assertAll();
+    }
 }

From eeef330fc03b5fdf6891b1e6d5b60ebee4bc4f8f Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 13 Feb 2023 13:06:44 +0200
Subject: [PATCH 404/734] [e2e] Check custom parameters availability (#3340)

* test commit

* fix BaseTest

* upd global

* upd global

* upd global

* add local browser VM option

* fix TopicsList column header locator

* fix withStartupTimeout()

* switch e2e to TestNG

* upd pom

* upd page classes

* upd -pl kafka-ui-e2e-checks

* test commit

* Revert "test commit"

This reverts commit 4b505321ac5e164986a7a1886ac40c6744b8ecb1.

* fix workflow module

* create checkCustomParametersAvailability()

* upd test -f 'kafka-ui-e2e-checks'

* upd checkCustomParametersAvailability()

* upd checkCustomParametersWithinEditExistingTopic
---
 .../provectus/kafka/ui/pages/BasePage.java    |  7 ++-
 .../kafka/ui/pages/brokers/BrokersList.java   |  2 +-
 .../kafka/ui/pages/ksqlDb/KsqlDbList.java     |  4 +-
 .../ui/pages/topics/TopicCreateEditForm.java  | 19 +++++--
 .../kafka/ui/pages/topics/TopicDetails.java   |  2 +-
 .../ui/pages/topics/TopicSettingsTab.java     |  2 +-
 .../kafka/ui/pages/topics/TopicsList.java     |  2 +-
 .../ui/smokeSuite/topics/TopicsTest.java      | 53 +++++++++++++------
 8 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index daea5c0d54a..e51942a39ce 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -23,7 +23,8 @@ public abstract class BasePage extends WebUtils {
     protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
     protected SelenideElement confirmBtn = $x("//button[contains(text(),'Confirm')]");
     protected SelenideElement cancelBtn = $x("//button[contains(text(),'Cancel')]");
-    protected ElementsCollection allGridItems = $$x("//tr[@class]");
+    protected ElementsCollection ddlOptions = $$x("//li[@value]");
+    protected ElementsCollection gridItems = $$x("//tr[@class]");
     protected String summaryCellLocator = "//div[contains(text(),'%s')]";
     protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
     protected String columnHeaderLocator = "//table//tr/th//div[text()='%s']";
@@ -44,6 +45,10 @@ protected SelenideElement getTableElement(String elementName) {
         return $x(String.format(tableElementNameLocator, elementName));
     }
 
+    protected ElementsCollection getDdlOptions() {
+        return ddlOptions;
+    }
+
     protected String getAlertHeader() {
         log.debug("\ngetAlertHeader");
         String result = alertHeader.shouldBe(Condition.visible).getText();
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
index 6db2d20ad65..3d3a58f355e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -62,7 +62,7 @@ public List<SelenideElement> getAllEnabledElements() {
 
     private List<BrokersList.BrokerGridItem> initGridItems() {
         List<BrokersList.BrokerGridItem> gridItemList = new ArrayList<>();
-        allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
                 .forEach(item -> gridItemList.add(new BrokersList.BrokerGridItem(item)));
         return gridItemList;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
index 84c23d0ac3f..25246a86ed5 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
@@ -41,7 +41,7 @@ public KsqlDbList openDetailsTab(KsqlMenuTabs menu) {
 
   private List<KsqlDbList.KsqlTablesGridItem> initTablesItems() {
     List<KsqlDbList.KsqlTablesGridItem> gridItemList = new ArrayList<>();
-    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
         .forEach(item -> gridItemList.add(new KsqlDbList.KsqlTablesGridItem(item)));
     return gridItemList;
   }
@@ -89,7 +89,7 @@ public String getIsWindowed() {
 
   private List<KsqlDbList.KsqlStreamsGridItem> initStreamsItems() {
     List<KsqlDbList.KsqlStreamsGridItem> gridItemList = new ArrayList<>();
-    allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
         .forEach(item -> gridItemList.add(new KsqlDbList.KsqlStreamsGridItem(item)));
     return gridItemList;
   }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
index 7deed1b7fde..f60bd6d431e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
@@ -1,9 +1,6 @@
 package com.provectus.kafka.ui.pages.topics;
 
-import com.codeborne.selenide.ClickOptions;
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.ElementsCollection;
-import com.codeborne.selenide.SelenideElement;
+import com.codeborne.selenide.*;
 import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue;
 import com.provectus.kafka.ui.pages.topics.enums.CustomParameterType;
@@ -91,8 +88,20 @@ public TopicCreateEditForm clickAddCustomParameterTypeButton() {
     }
 
     @Step
-    public TopicCreateEditForm setCustomParameterType(CustomParameterType customParameterType) {
+    public TopicCreateEditForm openCustomParameterTypeDdl() {
         customParameterDdl.shouldBe(Condition.visible).click();
+        ddlOptions.shouldHave(CollectionCondition.sizeGreaterThan(0));
+        return this;
+    }
+
+    @Step
+    public ElementsCollection getAllDdlOptions() {
+        return getDdlOptions();
+    }
+
+    @Step
+    public TopicCreateEditForm setCustomParameterType(CustomParameterType customParameterType) {
+        openCustomParameterTypeDdl();
         $x(String.format(ddlElementLocator, customParameterType.getOptionValue())).shouldBe(Condition.visible).click();
         return this;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
index 78ec2cef14e..980a66b791d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
@@ -337,7 +337,7 @@ public int getMessageCountAmount() {
 
     private List<TopicDetails.MessageGridItem> initItems() {
         List<TopicDetails.MessageGridItem> gridItemList = new ArrayList<>();
-        allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
                 .forEach(item -> gridItemList.add(new TopicDetails.MessageGridItem(item)));
         return gridItemList;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java
index 2b00c97c40f..3c0fcac211d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java
@@ -24,7 +24,7 @@ public TopicSettingsTab waitUntilScreenReady() {
 
     private List<SettingsGridItem> initGridItems() {
         List<SettingsGridItem> gridItemList = new ArrayList<>();
-        allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
                 .forEach(item -> gridItemList.add(new SettingsGridItem(item)));
         return gridItemList;
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
index 291c94667fb..499d5fe965a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
@@ -163,7 +163,7 @@ public List<SelenideElement> getAllEnabledElements() {
 
     private List<TopicGridItem> initGridItems() {
         List<TopicGridItem> gridItemList = new ArrayList<>();
-        allGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
                 .forEach(item -> gridItemList.add(new TopicGridItem(item)));
         return gridItemList;
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
index 62fb0b04488..8b86d82c9e6 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
@@ -108,11 +108,32 @@ void checkAvailableOperations() {
     }
 
     @Ignore
-    @Issue("https://github.com/provectus/kafka-ui/issues/2625")
+    @Issue("https://github.com/provectus/kafka-ui/issues/3071")
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(197)
+    @CaseId(268)
     @Test(priority = 3)
+    public void checkCustomParametersWithinEditExistingTopic() {
+        navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
+        topicDetails
+                .openDotMenu()
+                .clickEditSettingsMenu();
+        SoftAssert softly = new SoftAssert();
+        topicCreateEditForm
+                .waitUntilScreenReady()
+                .clickAddCustomParameterTypeButton()
+                .openCustomParameterTypeDdl()
+                .getAllDdlOptions()
+                .forEach(option ->
+                        softly.assertTrue(!option.is(Condition.attribute("disabled")),
+                                option.getText() + " is enabled:"));
+        softly.assertAll();
+    }
+
+    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
+    @AutomationStatus(status = Status.AUTOMATED)
+    @CaseId(197)
+    @Test(priority = 4)
     public void updateTopic() {
         navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
         topicDetails
@@ -166,7 +187,7 @@ public void updateTopic() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(242)
-    @Test(priority = 4)
+    @Test(priority = 5)
     public void removeTopicFromTopicList() {
         navigateToTopics();
         topicsList
@@ -182,7 +203,7 @@ public void removeTopicFromTopicList() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(207)
-    @Test(priority = 5)
+    @Test(priority = 6)
     public void deleteTopic() {
         navigateToTopicsAndOpenDetails(TOPIC_FOR_DELETE.getName());
         topicDetails
@@ -197,7 +218,7 @@ public void deleteTopic() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(20)
-    @Test(priority = 6)
+    @Test(priority = 7)
     public void redirectToConsumerFromTopic() {
         String topicName = "source-activities";
         String consumerGroupId = "connect-sink_postgres_activities";
@@ -218,7 +239,7 @@ public void redirectToConsumerFromTopic() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(4)
-    @Test(priority = 7)
+    @Test(priority = 8)
     public void checkTopicCreatePossibility() {
         navigateToTopics();
         topicsList
@@ -241,7 +262,7 @@ public void checkTopicCreatePossibility() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(266)
-    @Test(priority = 8)
+    @Test(priority = 9)
     public void checkTimeToRetainDataCustomValueWithEditingTopic() {
         Topic topicToRetainData = new Topic()
                 .setName("topic-to-retain-data-" + randomAlphabetic(5))
@@ -274,7 +295,7 @@ public void checkTimeToRetainDataCustomValueWithEditingTopic() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(6)
-    @Test(priority = 9)
+    @Test(priority = 10)
     public void checkCustomParametersWithinCreateNewTopic() {
         navigateToTopics();
         topicsList
@@ -295,7 +316,7 @@ public void checkCustomParametersWithinCreateNewTopic() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(2)
-    @Test(priority = 10)
+    @Test(priority = 11)
     public void checkTopicListElements() {
         navigateToTopics();
         verifyElementsCondition(topicsList.getAllVisibleElements(), Condition.visible);
@@ -305,7 +326,7 @@ public void checkTopicListElements() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(12)
-    @Test(priority = 11)
+    @Test(priority = 12)
     public void addingNewFilterWithinTopic() {
         String filterName = randomAlphabetic(5);
         navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
@@ -327,7 +348,7 @@ public void addingNewFilterWithinTopic() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(13)
-    @Test(priority = 12)
+    @Test(priority = 13)
     public void checkFilterSavingWithinSavedFilters() {
         String displayName = randomAlphabetic(5);
         navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
@@ -350,7 +371,7 @@ public void checkFilterSavingWithinSavedFilters() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(14)
-    @Test(priority = 13)
+    @Test(priority = 14)
     public void checkApplyingSavedFilterWithinTopicMessages() {
         String displayName = randomAlphabetic(5);
         navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
@@ -371,7 +392,7 @@ public void checkApplyingSavedFilterWithinTopicMessages() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(11)
-    @Test(priority = 14)
+    @Test(priority = 15)
     public void checkShowInternalTopicsButtonFunctionality() {
         navigateToTopics();
         SoftAssert softly = new SoftAssert();
@@ -389,7 +410,7 @@ public void checkShowInternalTopicsButtonFunctionality() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(56)
-    @Test(priority = 15)
+    @Test(priority = 16)
     public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
         navigateToTopics();
         topicsList
@@ -439,7 +460,7 @@ public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(247)
-    @Test(priority = 16)
+    @Test(priority = 17)
     public void recreateTopicFromTopicProfile() {
         Topic topicToRecreate = new Topic()
                 .setName("topic-to-recreate-" + randomAlphabetic(5))
@@ -469,7 +490,7 @@ public void recreateTopicFromTopicProfile() {
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
     @AutomationStatus(status = Status.AUTOMATED)
     @CaseId(8)
-    @Test(priority = 17)
+    @Test(priority = 18)
     public void checkCopyTopicPossibility() {
         Topic topicToCopy = new Topic()
                 .setName("topic-to-copy-" + randomAlphabetic(5))

From ebd25c61b1736b707ca1003c0c9872a0c605df58 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 14 Feb 2023 14:13:52 +0400
Subject: [PATCH 405/734] Using JRE instead of JDK in docker image construction
 (#3341)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 kafka-ui-api/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-api/Dockerfile b/kafka-ui-api/Dockerfile
index 96e0eb414b1..81df41bd1dd 100644
--- a/kafka-ui-api/Dockerfile
+++ b/kafka-ui-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk-alpine:17
+FROM azul/zulu-openjdk-alpine:17-jre
 
 RUN apk add --no-cache gcompat # need to make snappy codec work
 RUN addgroup -S kafkaui && adduser -S kafkaui -G kafkaui

From cbb166026d8c6360836def9bf9c208313023961c Mon Sep 17 00:00:00 2001
From: Konstantinos Papadakis <37328944+cpapad@users.noreply.github.com>
Date: Wed, 15 Feb 2023 15:31:05 +0200
Subject: [PATCH 406/734] Helm: Make secrets resource creation optional (#3324)

* Fixes #3299

* bumps chart version

---------

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 charts/kafka-ui/Chart.yaml            | 2 +-
 charts/kafka-ui/templates/secret.yaml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 3a1759a3911..6e5f0ee2d5b 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.5.2
+version: 0.5.3
 appVersion: v0.5.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/secret.yaml b/charts/kafka-ui/templates/secret.yaml
index a2d1f25fa2f..1f974503dc6 100644
--- a/charts/kafka-ui/templates/secret.yaml
+++ b/charts/kafka-ui/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.envs.secret -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -9,3 +10,4 @@ data:
   {{- range $key, $val := .Values.envs.secret }}
   {{ $key }}: {{ $val | b64enc | quote }}
   {{- end -}}
+{{- end}}
\ No newline at end of file

From a87b31aca1f24f0ad22e6903d8b4f199827e9cc3 Mon Sep 17 00:00:00 2001
From: Michael Kreis <michi.kreis@gmail.com>
Date: Wed, 15 Feb 2023 15:13:53 +0100
Subject: [PATCH 407/734] BE: Extend testcase with a recursive reference
 (#3314)

Fixes #2824

Co-authored-by: Michael Kreis <michael.kreis@raiffeisen.ch>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java
index 662c3ae22b7..02da33bb120 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java
@@ -57,6 +57,7 @@ enum SampleEnum {
             message EmbeddedMsg {
                 int32 emb_f1 = 1;
                 TestMsg outer_ref = 2;
+                EmbeddedMsg self_ref = 3;
             }
         }""";
 
@@ -116,7 +117,8 @@ enum SampleEnum {
                     "properties":
                     {
                         "emb_f1": { "type": "integer", "maximum": 2147483647, "minimum": -2147483648 },
-                        "outer_ref": { "$ref": "#/definitions/test.TestMsg" }
+                        "outer_ref": { "$ref": "#/definitions/test.TestMsg" },
+                        "self_ref": { "$ref": "#/definitions/test.TestMsg.EmbeddedMsg" }
                     }
                 }
             },

From f2ec4d76de481f1a049ae59c4c6fa352bdab7a30 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 17 Feb 2023 16:18:28 +0400
Subject: [PATCH 408/734] Avro (Embedded) serde implementation (#3266)

* Avro (Embedded) serde implementation

---------

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/serdes/SerdesInitializer.java    |  2 +
 .../ui/serdes/builtin/AvroEmbeddedSerde.java  | 72 +++++++++++++++
 .../serdes/builtin/AvroEmbeddedSerdeTest.java | 92 +++++++++++++++++++
 3 files changed, 166 insertions(+)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerde.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerdeTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
index b49767d1d53..2e057874e74 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
@@ -9,6 +9,7 @@
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.serde.api.PropertyResolver;
 import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.builtin.AvroEmbeddedSerde;
 import com.provectus.kafka.ui.serdes.builtin.Base64Serde;
 import com.provectus.kafka.ui.serdes.builtin.Int32Serde;
 import com.provectus.kafka.ui.serdes.builtin.Int64Serde;
@@ -43,6 +44,7 @@ public SerdesInitializer() {
             .put(Int64Serde.name(), Int64Serde.class)
             .put(UInt32Serde.name(), UInt32Serde.class)
             .put(UInt64Serde.name(), UInt64Serde.class)
+            .put(AvroEmbeddedSerde.name(), AvroEmbeddedSerde.class)
             .put(Base64Serde.name(), Base64Serde.class)
             .put(UuidBinarySerde.name(), UuidBinarySerde.class)
             .build(),
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerde.java
new file mode 100644
index 00000000000..73a1ed54845
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerde.java
@@ -0,0 +1,72 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.RecordHeaders;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
+import java.util.Map;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.apache.avro.file.DataFileReader;
+import org.apache.avro.file.SeekableByteArrayInput;
+import org.apache.avro.generic.GenericDatumReader;
+
+public class AvroEmbeddedSerde implements BuiltInSerde {
+
+  public static String name() {
+    return "Avro (Embedded)";
+  }
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return false;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return new Deserializer() {
+      @SneakyThrows
+      @Override
+      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
+        try (var reader = new DataFileReader<>(new SeekableByteArrayInput(data), new GenericDatumReader<>())) {
+          if (!reader.hasNext()) {
+            // this is very strange situation, when only header present in payload
+            // returning null in this case
+            return new DeserializeResult(null, DeserializeResult.Type.JSON, Map.of());
+          }
+          Object avroObj = reader.next();
+          String jsonValue = new String(AvroSchemaUtils.toJson(avroObj));
+          return new DeserializeResult(jsonValue, DeserializeResult.Type.JSON, Map.of());
+        }
+      }
+    };
+  }
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerdeTest.java
new file mode 100644
index 00000000000..2f4734ce069
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerdeTest.java
@@ -0,0 +1,92 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
+import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import org.apache.avro.Schema;
+import org.apache.avro.file.DataFileWriter;
+import org.apache.avro.generic.GenericData;
+import org.apache.avro.generic.GenericDatumWriter;
+import org.apache.avro.generic.GenericRecord;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+class AvroEmbeddedSerdeTest {
+
+  private AvroEmbeddedSerde avroEmbeddedSerde;
+
+  @BeforeEach
+  void init() {
+    avroEmbeddedSerde = new AvroEmbeddedSerde();
+    avroEmbeddedSerde.configure(
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty()
+    );
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void canDeserializeReturnsTrueForAllTargets(Serde.Target target) {
+    assertThat(avroEmbeddedSerde.canDeserialize("anyTopic", target))
+        .isTrue();
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void canSerializeReturnsFalseForAllTargets(Serde.Target target) {
+    assertThat(avroEmbeddedSerde.canSerialize("anyTopic", target))
+        .isFalse();
+  }
+
+  @Test
+  void deserializerParsesAvroDataWithEmbeddedSchema() throws Exception {
+    Schema schema = new Schema.Parser().parse("""
+        {
+          "type": "record",
+          "name": "TestAvroRecord",
+          "fields": [
+            { "name": "field1", "type": "string" },
+            { "name": "field2", "type": "int" }
+          ]
+        }
+        """
+    );
+    GenericRecord record = new GenericData.Record(schema);
+    record.put("field1", "this is test msg");
+    record.put("field2", 100500);
+
+    String jsonRecord = new String(AvroSchemaUtils.toJson(record));
+    byte[] serializedRecordBytes = serializeAvroWithEmbeddedSchema(record);
+
+    var deserializer = avroEmbeddedSerde.deserializer("anyTopic", Serde.Target.KEY);
+    DeserializeResult result = deserializer.deserialize(null, serializedRecordBytes);
+    assertThat(result.getType()).isEqualTo(DeserializeResult.Type.JSON);
+    assertThat(result.getAdditionalProperties()).isEmpty();
+    assertJsonEquals(jsonRecord, result.getResult());
+  }
+
+  private void assertJsonEquals(String expected, String actual) throws IOException {
+    var mapper = new JsonMapper();
+    assertThat(mapper.readTree(actual)).isEqualTo(mapper.readTree(expected));
+  }
+
+  private byte[] serializeAvroWithEmbeddedSchema(GenericRecord record) throws IOException {
+    try (DataFileWriter<GenericRecord> writer = new DataFileWriter<>(new GenericDatumWriter<>());
+         ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+      writer.create(record.getSchema(), baos);
+      writer.append(record);
+      writer.flush();
+      return baos.toByteArray();
+    }
+  }
+
+}

From ba99c20ad984a1b9f6c77401450150aed53cb939 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:04:18 +0200
Subject: [PATCH 409/734] [e2e] Update Qase integration, impl additional e2e
 workflows (#3372)

---
 .github/workflows/e2e-automation.yml          |  85 +++++++++
 .github/workflows/e2e-checks.yaml             |   8 +-
 .github/workflows/e2e-weekly.yml              |  70 +++++++
 kafka-ui-e2e-checks/README.md                 |  18 +-
 kafka-ui-e2e-checks/pom.xml                   |  28 ++-
 .../kafka/ui/settings/BaseSource.java         |  21 ++-
 .../kafka/ui/settings/configs/Profiles.java   |   8 +-
 .../utilities/qaseIoUtils/QaseExtension.java  | 145 ---------------
 .../qaseIoUtils/TestCaseGenerator.java        | 173 ------------------
 .../utilities/qaseIoUtils/enums/Status.java   |   5 -
 .../ui/utilities/qaseUtils/QaseSetup.java     |  34 ++++
 .../annotations/AutomationStatus.java         |   4 +-
 .../annotations/Suite.java                    |   2 +-
 .../ui/utilities/qaseUtils/enums/Status.java  |   5 +
 .../provectus/kafka/ui/variables/Browser.java |   7 +
 .../provectus/kafka/ui/variables/Suite.java   |  11 ++
 ...it.platform.launcher.TestExecutionListener |   1 -
 .../java/com/provectus/kafka/ui/BaseTest.java |  11 +-
 .../kafka/ui/manualSuite/TestClass.java       |   4 +
 .../kafka/ui/qaseSuite/TestClass.java         |   4 +
 .../kafka/ui/sanitySuite/TestClass.java       |   4 +
 .../kafka/ui/smokeSuite/SmokeTest.java        |   4 +-
 .../ui/smokeSuite/brokers/BrokersTest.java    |   6 +-
 .../smokeSuite/connectors/ConnectorsTest.java |   6 +-
 .../ui/smokeSuite/ksqlDb/KsqlDbTest.java      |   6 +-
 .../ui/smokeSuite/schemas/SchemasTest.java    |   6 +-
 .../ui/smokeSuite/topics/MessagesTest.java    |   8 +-
 .../ui/smokeSuite/topics/TopicsTest.java      |   6 +-
 .../kafka/ui/testSuite/TestClass.java         |   4 -
 .../src/test/resources/manual.xml             |   8 +
 .../src/test/resources/qase.xml               |   8 +
 .../src/test/resources/regression.xml         |   1 +
 32 files changed, 305 insertions(+), 406 deletions(-)
 create mode 100644 .github/workflows/e2e-automation.yml
 create mode 100644 .github/workflows/e2e-weekly.yml
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/enums/Status.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/{qaseIoUtils => qaseUtils}/annotations/AutomationStatus.java (58%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/{qaseIoUtils => qaseUtils}/annotations/Suite.java (74%)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Browser.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/TestClass.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/TestClass.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitySuite/TestClass.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/testSuite/TestClass.java
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/manual.xml
 create mode 100644 kafka-ui-e2e-checks/src/test/resources/qase.xml

diff --git a/.github/workflows/e2e-automation.yml b/.github/workflows/e2e-automation.yml
new file mode 100644
index 00000000000..50e3e9f1d42
--- /dev/null
+++ b/.github/workflows/e2e-automation.yml
@@ -0,0 +1,85 @@
+name: E2E Automation suite
+on:
+  workflow_dispatch:
+    inputs:
+      test_suite:
+        description: 'Select test suite to run'
+        default: 'regression'
+        required: true
+        type: choice
+        options:
+          - manual
+          - qase
+          - regression
+          - sanity
+          - smoke
+      qase_token:
+        description: 'Set Qase token to enable integration'
+        required: false
+        type: string
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.sha }}
+      - name: Set up environment
+        id: set_env_values
+        run: |
+          cat "./kafka-ui-e2e-checks/.env.ci" >> "./kafka-ui-e2e-checks/.env"
+      - name: Pull with Docker
+        id: pull_chrome
+        run: |
+          docker pull selenium/standalone-chrome:103.0
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
+      - name: Build with Maven
+        id: build_app
+        run: |
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.sha }}
+          ./mvnw -B -V -ntp clean install -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
+      - name: Compose with Docker
+        id: compose_app
+        # use the following command until #819 will be fixed
+        run: |
+          docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
+      - name: Run test suite
+        run: |
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.sha }}
+          ./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ github.event.inputs.qase_token }} -Dsurefire.suiteXmlFiles='src/test/resources/${{ github.event.inputs.test_suite }}.xml' -Dsuite=${{ github.event.inputs.test_suite }} -f 'kafka-ui-e2e-checks' test -Pprod
+      - name: Generate Allure report
+        uses: simple-elf/allure-report-action@master
+        if: always()
+        id: allure-report
+        with:
+          allure_results: ./kafka-ui-e2e-checks/allure-results
+          gh_pages: allure-results
+          allure_report: allure-report
+          subfolder: allure-results
+          report_url: "http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com"
+      - uses: jakejarvis/s3-sync-action@master
+        if: always()
+        env:
+          AWS_S3_BUCKET: 'kafkaui-allure-reports'
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: 'eu-central-1'
+          SOURCE_DIR: 'allure-history/allure-results'
+      - name: Deploy report to Amazon S3
+        if: always()
+        uses: Sibz/github-status-action@v1.1.6
+        with:
+          authToken: ${{secrets.GITHUB_TOKEN}}
+          context: "Test report"
+          state: "success"
+          sha: ${{ github.sha }}
+          target_url: http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com/${{ github.run_number }}
+      - name: Dump Docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v2.2.1
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 40178c67d87..a21821e79c8 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -1,7 +1,7 @@
-name: E2E tests
+name: E2E PR health check
 on:
   pull_request_target:
-    types: ["opened", "edited", "reopened", "synchronize"]
+    types: [ "opened", "edited", "reopened", "synchronize" ]
     paths:
       - "kafka-ui-api/**"
       - "kafka-ui-contract/**"
@@ -42,7 +42,7 @@ jobs:
       - name: e2e run
         run: |
           ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
-          ./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ secrets.QASEIO_API_TOKEN }} -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -Dsuite=smoke -f 'kafka-ui-e2e-checks' test -Pprod
+          ./mvnw -B -V -ntp -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -f 'kafka-ui-e2e-checks' test -Pprod
       - name: Generate allure report
         uses: simple-elf/allure-report-action@master
         if: always()
@@ -66,7 +66,7 @@ jobs:
         uses: Sibz/github-status-action@v1.1.6
         with:
           authToken: ${{secrets.GITHUB_TOKEN}}
-          context: "Test report"
+          context: "Click Details button to open Allure report"
           state: "success"
           sha: ${{ github.event.pull_request.head.sha  || github.sha }}
           target_url: http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com/${{ github.run_number }}
diff --git a/.github/workflows/e2e-weekly.yml b/.github/workflows/e2e-weekly.yml
new file mode 100644
index 00000000000..2bf2001ec23
--- /dev/null
+++ b/.github/workflows/e2e-weekly.yml
@@ -0,0 +1,70 @@
+name: E2E Weekly suite
+on:
+  schedule:
+    - cron: '0 1 * * 1'
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.sha }}
+      - name: Set up environment
+        id: set_env_values
+        run: |
+          cat "./kafka-ui-e2e-checks/.env.ci" >> "./kafka-ui-e2e-checks/.env"
+      - name: Pull with Docker
+        id: pull_chrome
+        run: |
+          docker pull selenium/standalone-chrome:103.0
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
+      - name: Build with Maven
+        id: build_app
+        run: |
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.sha }}
+          ./mvnw -B -V -ntp clean install -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
+      - name: Compose with Docker
+        id: compose_app
+        # use the following command until #819 will be fixed
+        run: |
+          docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
+      - name: Run test suite
+        run: |
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.sha }}
+          ./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ secrets.QASEIO_API_TOKEN }} -Dsurefire.suiteXmlFiles='src/test/resources/sanity.xml' -Dsuite=weekly -f 'kafka-ui-e2e-checks' test -Pprod
+      - name: Generate Allure report
+        uses: simple-elf/allure-report-action@master
+        if: always()
+        id: allure-report
+        with:
+          allure_results: ./kafka-ui-e2e-checks/allure-results
+          gh_pages: allure-results
+          allure_report: allure-report
+          subfolder: allure-results
+          report_url: "http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com"
+      - uses: jakejarvis/s3-sync-action@master
+        if: always()
+        env:
+          AWS_S3_BUCKET: 'kafkaui-allure-reports'
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: 'eu-central-1'
+          SOURCE_DIR: 'allure-history/allure-results'
+      - name: Deploy report to Amazon S3
+        if: always()
+        uses: Sibz/github-status-action@v1.1.6
+        with:
+          authToken: ${{secrets.GITHUB_TOKEN}}
+          context: "Test report"
+          state: "success"
+          sha: ${{ github.sha }}
+          target_url: http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com/${{ github.run_number }}
+      - name: Dump Docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v2.2.1
diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index bd8e0ba7049..ed231876350 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -38,25 +38,13 @@ cd kafka-ui
 docker-compose -f documentation/compose/e2e-tests.yaml up -d
 ```
 
-2. Run Smoke test suite using your QaseIO API token as environment variable (put instead %s into command below)
+2. To run test suite select its name (options: regression, sanity, smoke) and put it instead %s into command below
 
 ```
-./mvnw -DQASEIO_API_TOKEN='%s' -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -Dsuite=smoke -f 'kafka-ui-e2e-checks' test -Pprod
+./mvnw -Dsurefire.suiteXmlFiles='src/test/resources/%s.xml' -f 'kafka-ui-e2e-checks' test -Pprod
 ```
 
-3. Run Sanity test suite using your QaseIO API token as environment variable (put instead %s into command below)
-
-```
-./mvnw -DQASEIO_API_TOKEN='%s' -Dsurefire.suiteXmlFiles='src/test/resources/sanity.xml' -Dsuite=sanity -f 'kafka-ui-e2e-checks' test -Pprod
-```
-
-4. Run Regression test suite using your QaseIO API token as environment variable (put instead %s into command below)
-
-```
-./mvnw -DQASEIO_API_TOKEN='%s' -Dsurefire.suiteXmlFiles='src/test/resources/regression.xml' -Dsuite=regression -f 'kafka-ui-e2e-checks' test -Pprod
-```
-
-5. To run tests on your local Chrome browser just add next VM option to the Run Configuration
+3. To run tests on your local Chrome browser just add next VM option to the Run Configuration
 
 ```
 -Dbrowser=local
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 33ee947af09..5a91f0f995b 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -15,17 +15,16 @@
         <maven.surefire-plugin.version>3.0.0-M8</maven.surefire-plugin.version>
         <kafka-ui-contract>${project.version}</kafka-ui-contract>
         <testcontainers.version>1.17.6</testcontainers.version>
-        <junit.platform.version>1.9.2</junit.platform.version>
         <selenide.version>6.6.3</selenide.version>
         <testng.version>7.6.1</testng.version>
         <allure.version>2.20.1</allure.version>
+        <qase.io.version>3.0.2</qase.io.version>
         <aspectj.version>1.9.9.1</aspectj.version>
         <assertj.version>3.23.1</assertj.version>
         <hamcrest.version>2.2</hamcrest.version>
         <slf4j.version>1.7.36</slf4j.version>
         <dotenv.version>2.3.1</dotenv.version>
         <kafka.version>3.3.1</kafka.version>
-        <qase.io.version>2.1.3</qase.io.version>
     </properties>
 
     <dependencies>
@@ -121,16 +120,6 @@
             <artifactId>selenium</artifactId>
             <version>${testcontainers.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-launcher</artifactId>
-            <version>${junit.platform.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-engine</artifactId>
-            <version>${junit.platform.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.codeborne</groupId>
             <artifactId>selenide</artifactId>
@@ -151,6 +140,16 @@
             <artifactId>allure-testng</artifactId>
             <version>${allure.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.qase</groupId>
+            <artifactId>qase-testng</artifactId>
+            <version>${qase.io.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.qase</groupId>
+            <artifactId>qase-api</artifactId>
+            <version>${qase.io.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
@@ -186,11 +185,6 @@
             <artifactId>kafka-ui-contract</artifactId>
             <version>${kafka-ui-contract}</version>
         </dependency>
-        <dependency>
-            <groupId>io.qase</groupId>
-            <artifactId>qase-api</artifactId>
-            <version>${qase.io.version}</version>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
index e108d4e5540..ebead7b0892 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
@@ -5,16 +5,17 @@
 
 public abstract class BaseSource {
 
-  private static Config config;
-  public static final String BASE_CONTAINER_URL = "http://host.testcontainers.internal:8080";
-  public static final String BASE_LOCAL_URL = "http://localhost:8080";
-  public static final String CLUSTER_NAME = "local";
-  public static final String BROWSER = config().browser();
+    public static final String BASE_CONTAINER_URL = "http://host.testcontainers.internal:8080";
+    public static final String BASE_LOCAL_URL = "http://localhost:8080";
+    public static final String CLUSTER_NAME = "local";
+    private static Config config;
+    public static final String BROWSER = config().browser();
+    public static final String SUITE_NAME = config().suite();
 
-  private static Config config() {
-    if (config == null) {
-      config = ConfigFactory.create(Config.class, System.getProperties());
+    private static Config config() {
+        if (config == null) {
+            config = ConfigFactory.create(Config.class, System.getProperties());
+        }
+        return config;
     }
-    return config;
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
index 27696c46d6e..ef61d7d7701 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
@@ -2,16 +2,16 @@
 
 import org.aeonbits.owner.Config;
 
-public interface Profiles extends Config {
+import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
+import static com.provectus.kafka.ui.variables.Suite.CUSTOM;
 
-    String CONTAINER = "container";
-    String LOCAL = "local";
+public interface Profiles extends Config {
 
     @Key("browser")
     @DefaultValue(CONTAINER)
     String browser();
 
     @Key("suite")
-    @DefaultValue("custom")
+    @DefaultValue(CUSTOM)
     String suite();
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
deleted file mode 100644
index e12f0705173..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseExtension.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils;
-
-import io.qase.api.QaseClient;
-import io.qase.api.StepStorage;
-import io.qase.api.exceptions.QaseException;
-import io.qase.client.ApiClient;
-import io.qase.client.api.ResultsApi;
-import io.qase.client.model.ResultCreate;
-import io.qase.client.model.ResultCreate.StatusEnum;
-import io.qase.client.model.ResultCreateSteps;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.platform.engine.TestExecutionResult;
-import org.junit.platform.engine.TestSource;
-import org.junit.platform.engine.support.descriptor.MethodSource;
-import org.junit.platform.launcher.TestExecutionListener;
-import org.junit.platform.launcher.TestIdentifier;
-
-import javax.annotation.Nullable;
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static io.qase.api.QaseClient.getConfig;
-import static io.qase.api.utils.IntegrationUtils.getCaseId;
-import static io.qase.api.utils.IntegrationUtils.getStacktrace;
-import static org.apache.commons.lang3.StringUtils.isEmpty;
-import static org.junit.platform.engine.TestExecutionResult.Status.SUCCESSFUL;
-
-@Slf4j
-public class QaseExtension implements TestExecutionListener {
-
-    private static final String QASE_PROJECT = "KAFKAUI";
-
-    static {
-        String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
-        if (isEmpty(qaseApiToken)) {
-            log.warn("QASEIO_API_TOKEN system property is not set. Support for Qase will be disabled.");
-            System.setProperty("QASE_ENABLE", "false");
-        } else {
-            System.setProperty("QASE_ENABLE", "true");
-            System.setProperty("QASE_PROJECT_CODE", QASE_PROJECT);
-            System.setProperty("QASE_API_TOKEN", qaseApiToken);
-            System.setProperty("QASE_USE_BULK", "false");
-            if ("true".equalsIgnoreCase(System.getProperty("QASEIO_CREATE_TESTRUN"))) {
-                System.setProperty("QASE_RUN_NAME", "Automation run " +
-                        new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date()));
-            }
-        }
-    }
-
-    private final ApiClient apiClient = QaseClient.getApiClient();
-    private final ResultsApi resultsApi = new ResultsApi(apiClient);
-    private final Map<TestIdentifier, Long> testStartTimes = new ConcurrentHashMap<>();
-
-    @Override
-    public void executionStarted(TestIdentifier testIdentifier) {
-        if (QaseClient.isEnabled() && testIdentifier.isTest()) {
-            testStartTimes.put(testIdentifier, System.currentTimeMillis());
-        }
-    }
-
-    @Override
-    public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
-        if (!testIdentifier.isTest() || !QaseClient.isEnabled()
-                || !testStartTimes.containsKey(testIdentifier)) {
-            return;
-        }
-        TestSource testSource = testIdentifier.getSource().orElse(null);
-        Method testMethod = null;
-        if (testSource instanceof MethodSource) {
-            testMethod = getMethod((MethodSource) testSource);
-        }
-        TestCaseGenerator.createTestCaseIfNotExists(testMethod);
-        Duration duration = Duration.ofMillis(System.currentTimeMillis() - this.testStartTimes.remove(testIdentifier));
-        sendResults(testExecutionResult, duration, testMethod);
-    }
-
-    private void sendResults(TestExecutionResult testExecutionResult, Duration timeSpent, Method testMethod) {
-        if (testMethod != null) {
-            ResultCreate resultCreate = getResultItem(testExecutionResult, timeSpent, testMethod);
-            try {
-                resultsApi.createResult(getConfig().projectCode(),
-                        getConfig().runId(),
-                        resultCreate);
-                log.info("Method = " + testMethod.getName() + ": Result added to test run with Id = {}", getConfig().runId());
-            } catch (QaseException e) {
-                log.error("Method = " + testMethod.getName() + ": Result not added to test Run because there is no @CaseId annotation or case not found", e);
-            }
-        }
-    }
-
-    private ResultCreate getResultItem(TestExecutionResult testExecutionResult, Duration timeSpent, Method testMethod) {
-        String testCaseTitle = TestCaseGenerator.generateTestCaseTitle(testMethod);
-        TestCaseGenerator.createTestCaseIfNotExists(testMethod);
-        Long caseId = getCaseId(testMethod);
-        Map<Long, String> cases = TestCaseGenerator.getTestCasesTitleAndId();
-        StatusEnum status = StatusEnum.SKIPPED;
-
-        if (caseId == null || !TestCaseGenerator.isCaseIdPresentInQaseIo(testMethod)) {
-            for (Map.Entry<Long, String> map : cases.entrySet()) {
-                if (map.getValue().matches(testCaseTitle)) {
-                    caseId = map.getKey();
-                    log.info("There is no annotation @CaseId but there is test case with title '" + testCaseTitle + "' and with id = " + caseId
-                            + " that will be added to test Run");
-                }
-            }
-        }
-
-        if (TestCaseGenerator.getAutomationStatus(testMethod) == 2) {
-            status = testExecutionResult.getStatus() == SUCCESSFUL ? StatusEnum.PASSED : StatusEnum.FAILED;
-        }
-
-        String comment = testExecutionResult.getThrowable()
-                .flatMap(throwable -> Optional.of(throwable.toString())).orElse(null);
-        Boolean isDefect = testExecutionResult.getThrowable()
-                .flatMap(throwable -> Optional.of(throwable instanceof AssertionError))
-                .orElse(false);
-        String stacktrace = testExecutionResult.getThrowable()
-                .flatMap(throwable -> Optional.of(getStacktrace(throwable))).orElse(null);
-        LinkedList<ResultCreateSteps> steps = StepStorage.getSteps();
-        return new ResultCreate()
-                .caseId(caseId)
-                .status(status)
-                .timeMs(timeSpent.toMillis())
-                .comment(comment)
-                .stacktrace(stacktrace)
-                .steps(steps.isEmpty() ? null : steps)
-                .defect(isDefect);
-    }
-
-    @Nullable
-    private Method getMethod(MethodSource testSource) {
-        try {
-            Class<?> testClass = Class.forName(testSource.getClassName());
-            return Arrays.stream(testClass.getDeclaredMethods())
-                    .filter(method -> MethodSource.from(method).equals(testSource))
-                    .findFirst().orElse(null);
-        } catch (ClassNotFoundException e) {
-            log.error(e.getMessage());
-            return null;
-        }
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java
deleted file mode 100644
index 1c534b73951..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/TestCaseGenerator.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils;
-
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
-import io.qase.api.QaseClient;
-import io.qase.api.annotation.CaseId;
-import io.qase.client.ApiClient;
-import io.qase.client.api.CasesApi;
-import io.qase.client.model.*;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Assert;
-import org.junit.platform.engine.support.descriptor.MethodSource;
-
-import java.lang.reflect.Method;
-import java.util.*;
-
-import static io.qase.api.QaseClient.getConfig;
-
-@Slf4j
-public class TestCaseGenerator {
-
-    private static final ApiClient apiClient = QaseClient.getApiClient();
-    private static final CasesApi casesApi = new CasesApi(apiClient);
-    public static boolean FAILED = false;
-
-    @SneakyThrows
-    public static void createTestCaseIfNotExists(Method testMethod) {
-        TestCaseCreate caseCreate = new TestCaseCreate();
-        String testCaseTitle = generateTestCaseTitle(testMethod);
-        if (!isMethodAnnotatedWithCaseId(testMethod) || !TestCaseGenerator.isCaseIdPresentInQaseIo(testMethod)) {
-            if (!isCaseTitleExistInQaseIo(testMethod)) {
-                caseCreate.setTitle(testCaseTitle);
-                caseCreate.setAutomation(getAutomationStatus(testMethod));
-                if (isMethodAnnotatedWithSuite(testMethod)) {
-                    long suiteId = testMethod.getAnnotation(Suite.class).suiteId();
-                    caseCreate.suiteId(suiteId);
-                }
-                Long caseId = Objects.requireNonNull(casesApi.createCase(getConfig().projectCode(), caseCreate).getResult()).getId();
-                log.info("New test case = '" + testCaseTitle + "' created with id " + caseId);
-            }
-        }
-    }
-
-    @SneakyThrows
-    public static HashMap<Long, String> getTestCasesTitleAndId() {
-        HashMap<Long, String> map = new HashMap<>();
-        boolean getCases = true;
-        int offSet = 0;
-        while (getCases) {
-            getCases = false;
-            TestCaseListResponse response =
-                    casesApi.getCases(getConfig().projectCode(), new Filters().status(Filters.SERIALIZED_NAME_STATUS), 100, offSet);
-            TestCaseListResponseAllOfResult result = response.getResult();
-            Assert.assertNotNull(result);
-            List<TestCase> entities = result.getEntities();
-            Assert.assertNotNull(entities);
-            if (entities.size() > 0) {
-                for (TestCase test : entities) {
-                    map.put(test.getId(), test.getTitle());
-                }
-                offSet = offSet + 100;
-                getCases = true;
-            }
-        }
-        return map;
-    }
-
-    public static boolean isCaseIdPresentInQaseIo(Method testMethod) {
-        if (!testMethod.isAnnotationPresent(CaseId.class)) {
-            return false;
-        }
-        long caseId = testMethod.getAnnotation(CaseId.class).value();
-        HashMap<Long, String> cases = getTestCasesTitleAndId();
-        String title;
-        if (!cases.containsKey(caseId)) {
-            FAILED = true;
-            log.error("The method " + testMethod.getName() + " has wrong @CaseId =" + caseId + " that does not exist in Qase.io. " +
-                    "Please put correct @CaseId");
-            return false;
-        } else {
-            for (Map.Entry<Long, String> map : cases.entrySet()) {
-                if (map.getKey().equals(caseId)) {
-                    title = map.getValue();
-                    if (!title.matches(generateTestCaseTitle(testMethod))) {
-                        log.error("This CaseId =" + caseId + " belong to test with title = " + title);
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    private static boolean isCaseTitleExistInQaseIo(Method testMethod) {
-        HashMap<Long, String> cases = getTestCasesTitleAndId();
-        String title = generateTestCaseTitle(testMethod);
-        if (cases.containsValue(title)) {
-            for (Map.Entry<Long, String> map : cases.entrySet()) {
-                if (map.getValue().matches(title)) {
-                    long caseId = map.getKey();
-                    log.info("Test case with title '" + title + "' and id " + caseId + " exist in Qase.io. Verify that annotation @CaseId is correct");
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    public static int getAutomationStatus(Method testMethod) {
-        if (testMethod.isAnnotationPresent(AutomationStatus.class)) {
-            if (testMethod.getAnnotation(AutomationStatus.class).status().equals(Status.TO_BE_AUTOMATED))
-                return 1;
-            else if (testMethod.getAnnotation(AutomationStatus.class).status().equals(Status.MANUAL))
-                return 0;
-        }
-        return 2;
-    }
-
-    private static boolean isMethodAnnotatedWithCaseId(Method testMethod) {
-        if (!testMethod.isAnnotationPresent(CaseId.class)) {
-            FAILED = true;
-            log.error("You must put annotation @CaseId. The method " + testMethod.getName() + " is NOT annotated with @CaseId.");
-            return false;
-        }
-        return true;
-    }
-
-    private static boolean isMethodAnnotatedWithSuite(Method testMethod) {
-        if (!testMethod.isAnnotationPresent(Suite.class)) {
-            log.info("The method " + testMethod.getName() + " is not annotated with @Suite and new test case will be added without suite");
-            return false;
-        }
-        log.trace("The method is annotated with @Suite with id " + testMethod.getAnnotation(Suite.class).suiteId());
-        return true;
-    }
-
-    private static boolean isMethodAnnotatedWithAutomationStatus(Method testMethod) {
-        if (!testMethod.isAnnotationPresent(AutomationStatus.class)) {
-            log.error("The method " + testMethod.getName() + " is NOT annotated with @AutomationStatus.");
-            return false;
-        }
-        return true;
-    }
-
-    private static String formatTestCaseTitle(String testMethodName) {
-        String[] split = StringUtils.splitByCharacterTypeCamelCase(testMethodName);
-        String[] name = Arrays.stream(split).map(String::toLowerCase).toArray(String[]::new);
-        String[] subarray = ArrayUtils.subarray(name, 1, name.length);
-        ArrayList<String> stringList = new ArrayList<>(Arrays.asList(subarray));
-        stringList.add(0, StringUtils.capitalize(name[0]));
-        return StringUtils.join(stringList, " ");
-    }
-
-    public static String generateTestCaseTitle(Method testMethod) {
-        return getClassName(MethodSource.from(testMethod)) + "." + testMethod.getName() + " : " +
-                formatTestCaseTitle(testMethod.getName());
-    }
-
-    private static String getClassName(MethodSource testSource) {
-        Class<?> testClass;
-        try {
-            testClass = Class.forName(testSource.getClassName());
-        } catch (ClassNotFoundException e) {
-            log.error(e.getMessage());
-            return null;
-        }
-        return testClass.getSimpleName();
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/enums/Status.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/enums/Status.java
deleted file mode 100644
index 024acbc91a6..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/enums/Status.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils.enums;
-
-public enum Status {
-    AUTOMATED, TO_BE_AUTOMATED, MANUAL;
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java
new file mode 100644
index 00000000000..aa1a1213f91
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java
@@ -0,0 +1,34 @@
+package com.provectus.kafka.ui.utilities.qaseUtils;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+
+import static com.provectus.kafka.ui.settings.BaseSource.SUITE_NAME;
+import static com.provectus.kafka.ui.variables.Suite.MANUAL;
+import static org.apache.commons.lang3.BooleanUtils.FALSE;
+import static org.apache.commons.lang3.BooleanUtils.TRUE;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+
+@Slf4j
+public class QaseSetup {
+
+    public static void testRunSetup() {
+        String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
+        if (isEmpty(qaseApiToken)) {
+            log.warn("Integration with Qase is disabled due to run config or token wasn't defined.");
+            System.setProperty("QASE_ENABLE", FALSE);
+        } else {
+            log.warn("Integration with Qase is enabled. Find this run at https://app.qase.io/run/KAFKAUI.");
+            String automation = SUITE_NAME.equalsIgnoreCase(MANUAL) ? "" : "Automation ";
+            System.setProperty("QASE_ENABLE", TRUE);
+            System.setProperty("QASE_PROJECT_CODE", "KAFKAUI");
+            System.setProperty("QASE_API_TOKEN", qaseApiToken);
+            System.setProperty("QASE_USE_BULK", TRUE);
+            System.setProperty("QASE_RUN_NAME", DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")
+                    .format(OffsetDateTime.now(ZoneOffset.UTC)) + ": " + automation + SUITE_NAME.toUpperCase() + " suite");
+        }
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/AutomationStatus.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/AutomationStatus.java
similarity index 58%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/AutomationStatus.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/AutomationStatus.java
index abaed2a0eec..7f3c0da89e8 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/AutomationStatus.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/AutomationStatus.java
@@ -1,6 +1,6 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils.annotations;
+package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
 
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/Suite.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java
similarity index 74%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/Suite.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java
index 3e688cd797c..09b971b48c6 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/Suite.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils.annotations;
+package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java
new file mode 100644
index 00000000000..d97e42b3e47
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java
@@ -0,0 +1,5 @@
+package com.provectus.kafka.ui.utilities.qaseUtils.enums;
+
+public enum Status {
+    AUTOMATED, TO_BE_AUTOMATED, MANUAL
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Browser.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Browser.java
new file mode 100644
index 00000000000..cb3873cdb5b
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Browser.java
@@ -0,0 +1,7 @@
+package com.provectus.kafka.ui.variables;
+
+public interface Browser {
+
+    String CONTAINER = "container";
+    String LOCAL = "local";
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java
new file mode 100644
index 00000000000..c0a823600a4
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java
@@ -0,0 +1,11 @@
+package com.provectus.kafka.ui.variables;
+
+public interface Suite {
+
+    String CUSTOM = "custom";
+    String MANUAL = "manual";
+    String QASE = "qase";
+    String REGRESSION = "regression";
+    String SANITY = "sanity";
+    String SMOKE = "smoke";
+}
diff --git a/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
deleted file mode 100644
index dd3c3f5e908..00000000000
--- a/kafka-ui-e2e-checks/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener
+++ /dev/null
@@ -1 +0,0 @@
-com.provectus.kafka.ui.utilities.qaseIoUtils.QaseExtension
\ No newline at end of file
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
index bc68cc66377..aa05462dc0b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
@@ -6,7 +6,8 @@
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.settings.listeners.AllureListener;
 import com.provectus.kafka.ui.settings.listeners.LoggerListener;
-import io.qase.api.annotation.Step;
+import io.qameta.allure.Step;
+import io.qase.testng.QaseListener;
 import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.chrome.ChromeOptions;
@@ -23,12 +24,13 @@
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
 import static com.provectus.kafka.ui.settings.BaseSource.*;
-import static com.provectus.kafka.ui.settings.configs.Profiles.CONTAINER;
-import static com.provectus.kafka.ui.settings.configs.Profiles.LOCAL;
 import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.*;
+import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.testRunSetup;
+import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
+import static com.provectus.kafka.ui.variables.Browser.LOCAL;
 
 @Slf4j
-@Listeners({AllureListener.class, LoggerListener.class})
+@Listeners({AllureListener.class, LoggerListener.class, QaseListener.class})
 public abstract class BaseTest extends Facade {
 
     private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
@@ -41,6 +43,7 @@ private static boolean isARM64() {
 
     @BeforeSuite(alwaysRun = true)
     public void beforeSuite() {
+        testRunSetup();
         switch (BROWSER) {
             case (CONTAINER) -> {
                 DockerImageName image = isARM64()
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/TestClass.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/TestClass.java
new file mode 100644
index 00000000000..c75516955a9
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/TestClass.java
@@ -0,0 +1,4 @@
+package com.provectus.kafka.ui.manualSuite;
+
+public class TestClass {
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/TestClass.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/TestClass.java
new file mode 100644
index 00000000000..d3cea529215
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/TestClass.java
@@ -0,0 +1,4 @@
+package com.provectus.kafka.ui.qaseSuite;
+
+public class TestClass {
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitySuite/TestClass.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitySuite/TestClass.java
new file mode 100644
index 00000000000..89402f3fc82
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitySuite/TestClass.java
@@ -0,0 +1,4 @@
+package com.provectus.kafka.ui.sanitySuite;
+
+public class TestClass {
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
index e0971a0a9e1..fc87e885029 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
@@ -2,8 +2,8 @@
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
 import org.testng.annotations.Test;
 
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
index 7f46456a6cc..c2f3e20c4a6 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
@@ -2,9 +2,9 @@
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
 import org.testng.Assert;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
index 0b162283e49..30b380d6d06 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
@@ -3,9 +3,9 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
 import org.testng.Assert;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
index be847b00a7a..9716b3905d7 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
@@ -3,9 +3,9 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.pages.ksqlDb.models.Stream;
 import com.provectus.kafka.ui.pages.ksqlDb.models.Table;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
index 5c8871b4fc4..6473684c06c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
@@ -4,9 +4,9 @@
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Schema;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
 import org.testng.Assert;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
index 66f7d8a50a3..2dee8588d79 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
@@ -3,12 +3,12 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.topics.TopicDetails;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Issue;
+import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
-import io.qase.api.annotation.Step;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
index 8b86d82c9e6..6f847d7d68b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
@@ -4,9 +4,9 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.topics.TopicDetails;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Issue;
 import io.qase.api.annotation.CaseId;
 import org.testng.Assert;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/testSuite/TestClass.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/testSuite/TestClass.java
deleted file mode 100644
index af5a4aea3fb..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/testSuite/TestClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.provectus.kafka.ui.testSuite;
-
-public class TestClass {
-}
diff --git a/kafka-ui-e2e-checks/src/test/resources/manual.xml b/kafka-ui-e2e-checks/src/test/resources/manual.xml
new file mode 100644
index 00000000000..dff467651e0
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/manual.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
+<suite name="ManualSuite">
+    <test name="Manual" enabled="true" parallel="classes" thread-count="1">
+        <packages>
+            <package name="com.provectus.kafka.ui.manualSuite.*"/>
+        </packages>
+    </test>
+</suite>
diff --git a/kafka-ui-e2e-checks/src/test/resources/qase.xml b/kafka-ui-e2e-checks/src/test/resources/qase.xml
new file mode 100644
index 00000000000..2b5d023b1a5
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/resources/qase.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
+<suite name="QaseSuite">
+    <test name="Qase" enabled="true" parallel="classes" thread-count="1">
+        <packages>
+            <package name="com.provectus.kafka.ui.qaseSuite.*"/>
+        </packages>
+    </test>
+</suite>
diff --git a/kafka-ui-e2e-checks/src/test/resources/regression.xml b/kafka-ui-e2e-checks/src/test/resources/regression.xml
index 2c34f4a929f..01db95d03b5 100644
--- a/kafka-ui-e2e-checks/src/test/resources/regression.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/regression.xml
@@ -4,6 +4,7 @@
         <packages>
             <package name="com.provectus.kafka.ui.smokeSuite.*"/>
             <package name="com.provectus.kafka.ui.sanitySuite.*"/>
+            <package name="com.provectus.kafka.ui.manualSuite.*"/>
         </packages>
     </test>
 </suite>

From 37e6f021b35d6316469819fdaae927467b33de46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 17:21:13 +0400
Subject: [PATCH 410/734] Bump testng from 7.6.1 to 7.7.0 in
 /kafka-ui-e2e-checks (#3304)

Bumps [testng](https://github.com/cbeust/testng) from 7.6.1 to 7.7.0.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/compare/7.6.1...7.7.0)

---
updated-dependencies:
- dependency-name: org.testng:testng
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 5a91f0f995b..833f7a92242 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -16,7 +16,7 @@
         <kafka-ui-contract>${project.version}</kafka-ui-contract>
         <testcontainers.version>1.17.6</testcontainers.version>
         <selenide.version>6.6.3</selenide.version>
-        <testng.version>7.6.1</testng.version>
+        <testng.version>7.7.0</testng.version>
         <allure.version>2.20.1</allure.version>
         <qase.io.version>3.0.2</qase.io.version>
         <aspectj.version>1.9.9.1</aspectj.version>

From fadd307564183eeb93169b147b0c2baf5b738641 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 17:24:13 +0400
Subject: [PATCH 411/734] Bump svenstaro/upload-release-action from 2.3.0 to
 2.4.1 (#3306)

Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/svenstaro/upload-release-action/releases)
- [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenstaro/upload-release-action/compare/2.3.0...2.4.1)

---
updated-dependencies:
- dependency-name: svenstaro/upload-release-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0e87c10fd2b..af538c90c80 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -33,7 +33,7 @@ jobs:
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Upload files to a GitHub release
-        uses: svenstaro/upload-release-action@2.3.0
+        uses: svenstaro/upload-release-action@2.4.1
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: kafka-ui-api/target/kafka-ui-api-${{ steps.build.outputs.version }}.jar

From c9f0298000c7752049e626bf4a061cff3926e97f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 17:25:12 +0400
Subject: [PATCH 412/734] Bump aquasecurity/trivy-action from 0.8.0 to 0.9.1
 (#3337)

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.8.0 to 0.9.1.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.8.0...0.9.1)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index ef7d784ca10..5b0e2779dd9 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -55,7 +55,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.8.0
+        uses: aquasecurity/trivy-action@0.9.1
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From e584b15d97d0c5e14e4a1aa24a951dcd02ee336b Mon Sep 17 00:00:00 2001
From: mkuts12 <mkuts12@gmail.com>
Date: Tue, 21 Feb 2023 15:40:05 +0200
Subject: [PATCH 413/734] Update serialization guide (#3375)

[line](https://github.com/provectus/kafka-ui/blob/f2ec4d76de481f1a049ae59c4c6fa352bdab7a30/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java#L41)
but I'm not familiar enough with Go to be sure.
---
 documentation/guides/Serialization.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/documentation/guides/Serialization.md b/documentation/guides/Serialization.md
index 19869a8bc18..3f827441d2e 100644
--- a/documentation/guides/Serialization.md
+++ b/documentation/guides/Serialization.md
@@ -20,7 +20,7 @@ kafka:
   clusters:
     - name: Cluster1
       # Other Cluster configuration omitted ... 
-      serdes:
+      serde:
           # registering String serde with custom config
         - name: AsciiString
           className: com.provectus.kafka.ui.serdes.builtin.StringSerde
@@ -43,7 +43,7 @@ kafka:
   clusters:
     - name: Cluster1
       # Other Cluster configuration omitted ... 
-      serdes:
+      serde:
         - name: ProtobufFile
           properties:
             # path to the protobuf schema files
@@ -84,7 +84,7 @@ kafka:
     - name: Cluster1
       # this url will be used by "SchemaRegistry" by default
       schemaRegistry: http://main-schema-registry:8081
-      serdes:
+      serde:
         - name: AnotherSchemaRegistry
           className: com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde
           properties:
@@ -109,7 +109,7 @@ Sample configuration:
 kafka:
   clusters:
     - name: Cluster1
-      serdes:
+      serde:
         - name: String
           topicKeysPattern: click-events|imp-events
         
@@ -131,7 +131,7 @@ kafka:
     - name: Cluster1
       defaultKeySerde: Int32
       defaultValueSerde: String
-      serdes:
+      serde:
         - name: Int32
           topicKeysPattern: click-events|imp-events
 ```
@@ -156,7 +156,7 @@ Sample configuration:
 kafka:
   clusters:
     - name: Cluster1
-      serdes:
+      serde:
         - name: MyCustomSerde
           className: my.lovely.org.KafkaUiSerde
           filePath: /var/lib/kui-serde/my-kui-serde.jar

From 741bbc1be1bd8dba4fdfe854ca01f6f60b80c0a0 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 22 Feb 2023 11:50:49 +0400
Subject: [PATCH 414/734] [BE] Supress kafka authorization errors (#3376)

* wip

* wip

* typo fix, minor impr

* test fixes

* wip

---------

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/service/ReactiveAdminClient.java | 35 +++++++++++++------
 .../kafka/ui/service/TopicsService.java       |  9 +++--
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index ea56edcf96e..7cdf2ef16d7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -62,9 +62,11 @@
 import org.apache.kafka.common.TopicPartitionReplica;
 import org.apache.kafka.common.acl.AclOperation;
 import org.apache.kafka.common.config.ConfigResource;
+import org.apache.kafka.common.errors.ClusterAuthorizationException;
 import org.apache.kafka.common.errors.GroupIdNotFoundException;
 import org.apache.kafka.common.errors.GroupNotEmptyException;
 import org.apache.kafka.common.errors.InvalidRequestException;
+import org.apache.kafka.common.errors.TopicAuthorizationException;
 import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
 import org.apache.kafka.common.errors.UnsupportedVersionException;
 import org.apache.kafka.common.requests.DescribeLogDirsResponse;
@@ -176,6 +178,7 @@ public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig() {
   }
 
   //NOTE: skips not-found topics (for which UnknownTopicOrPartitionException was thrown by AdminClient)
+  //and topics for which DESCRIBE_CONFIGS permission is not set (TopicAuthorizationException was thrown)
   public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig(Collection<String> topicNames, boolean includeDoc) {
     var includeDocFixed = features.contains(SupportedFeature.CONFIG_DOCUMENTATION_RETRIEVAL) && includeDoc;
     // we need to partition calls, because it can lead to AdminClient timeouts in case of large topics count
@@ -196,7 +199,8 @@ private Mono<Map<String, List<ConfigEntry>>> getTopicsConfigImpl(Collection<Stri
         client.describeConfigs(
             resources,
             new DescribeConfigsOptions().includeSynonyms(true).includeDocumentation(includeDoc)).values(),
-        UnknownTopicOrPartitionException.class
+        UnknownTopicOrPartitionException.class,
+        TopicAuthorizationException.class
     ).map(config -> config.entrySet().stream()
         .collect(toMap(
             c -> c.getKey().name(),
@@ -208,11 +212,17 @@ private static Mono<Map<Integer, List<ConfigEntry>>> loadBrokersConfig(AdminClie
         .map(brokerId -> new ConfigResource(ConfigResource.Type.BROKER, Integer.toString(brokerId)))
         .collect(toList());
     return toMono(client.describeConfigs(resources).all())
-        .doOnError(InvalidRequestException.class,
-            th -> log.trace("Error while getting broker {} configs", brokerIds, th))
         // some kafka backends (like MSK serverless) do not support broker's configs retrieval,
         // in that case InvalidRequestException will be thrown
-        .onErrorResume(InvalidRequestException.class, th -> Mono.just(Map.of()))
+        .onErrorResume(InvalidRequestException.class, th -> {
+          log.trace("Error while getting broker {} configs", brokerIds, th);
+          return Mono.just(Map.of());
+        })
+        // there are situations when kafka-ui user has no DESCRIBE_CONFIGS permission on cluster
+        .onErrorResume(ClusterAuthorizationException.class, th -> {
+          log.trace("AuthorizationException while getting configs for brokers {}", brokerIds, th);
+          return Mono.just(Map.of());
+        })
         .map(config -> config.entrySet().stream()
             .collect(toMap(
                 c -> Integer.valueOf(c.getKey().name()),
@@ -242,13 +252,16 @@ public Mono<Map<String, TopicDescription>> describeTopics(Collection<String> top
 
   private Mono<Map<String, TopicDescription>> describeTopicsImpl(Collection<String> topics) {
     return toMonoWithExceptionFilter(
-        client.describeTopics(topics).values(),
-        UnknownTopicOrPartitionException.class
+        client.describeTopics(topics).topicNameValues(),
+        UnknownTopicOrPartitionException.class,
+        // we only describe topics that we see from listTopics() API, so we should have permission to do it,
+        // but also adding this exception here for rare case when access restricted after we called listTopics()
+        TopicAuthorizationException.class
     );
   }
 
   /**
-   * Returns TopicDescription mono, or Empty Mono if topic not found.
+   * Returns TopicDescription mono, or Empty Mono if topic not visible.
    */
   public Mono<TopicDescription> describeTopic(String topic) {
     return describeTopics(List.of(topic)).flatMap(m -> Mono.justOrEmpty(m.get(topic)));
@@ -262,10 +275,11 @@ public Mono<TopicDescription> describeTopic(String topic) {
    * such topics in resulting map.
    * <p/>
    * This method converts input map into Mono[Map] ignoring keys for which KafkaFutures
-   * finished with <code>clazz</code> exception and empty Monos.
+   * finished with <code>classes</code> exceptions and empty Monos.
    */
+  @SafeVarargs
   static <K, V> Mono<Map<K, V>> toMonoWithExceptionFilter(Map<K, KafkaFuture<V>> values,
-                                                          Class<? extends KafkaException> clazz) {
+                                                          Class<? extends KafkaException>... classes) {
     if (values.isEmpty()) {
       return Mono.just(Map.of());
     }
@@ -277,7 +291,7 @@ static <K, V> Mono<Map<K, V>> toMonoWithExceptionFilter(Map<K, KafkaFuture<V>> v
                 .defaultIfEmpty(Tuples.of(e.getKey(), Optional.empty())) //tracking empty Monos
                 .onErrorResume(
                     // tracking Monos with suppressible error
-                    th -> th.getClass().isAssignableFrom(clazz),
+                    th -> Stream.of(classes).anyMatch(clazz -> th.getClass().isAssignableFrom(clazz)),
                     th -> Mono.just(Tuples.of(e.getKey(), Optional.empty()))))
         .toList();
 
@@ -300,6 +314,7 @@ public Mono<Map<Integer, Map<String, DescribeLogDirsResponse.LogDirInfo>>> descr
       Collection<Integer> brokerIds) {
     return toMono(client.describeLogDirs(brokerIds).all())
         .onErrorResume(UnsupportedVersionException.class, th -> Mono.just(Map.of()))
+        .onErrorResume(ClusterAuthorizationException.class, th -> Mono.just(Map.of()))
         .onErrorResume(th -> true, th -> {
           log.warn("Error while calling describeLogDirs", th);
           return Mono.just(Map.of());
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index ab22cecaafc..b9038677267 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -162,9 +162,14 @@ public Mono<InternalTopic> getTopicDetails(KafkaCluster cluster, String topicNam
   }
 
   public Mono<List<ConfigEntry>> getTopicConfigs(KafkaCluster cluster, String topicName) {
+    // there 2 case that we cover here:
+    // 1. topic not found/visible - describeTopic() will be empty and we will throw TopicNotFoundException
+    // 2. topic is visible, but we don't have DESCRIBE_CONFIG permission - we should return empty list
     return adminClientService.get(cluster)
-        .flatMap(ac -> ac.getTopicsConfig(List.of(topicName), true))
-        .map(m -> m.values().stream().findFirst().orElseThrow(TopicNotFoundException::new));
+        .flatMap(ac -> ac.describeTopic(topicName)
+            .switchIfEmpty(Mono.error(new TopicNotFoundException()))
+            .then(ac.getTopicsConfig(List.of(topicName), true))
+            .map(m -> m.values().stream().findFirst().orElse(List.of())));
   }
 
   private Mono<InternalTopic> createTopic(KafkaCluster c, ReactiveAdminClient adminClient,

From 526b2915f59f34cfa2f41d9f1313268efde05bc1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Feb 2023 14:34:31 +0400
Subject: [PATCH 415/734] Bump selenide from 6.6.3 to 6.11.2 (#3309)

Bumps [selenide](https://github.com/selenide/selenide) from 6.6.3 to 6.11.2.
- [Release notes](https://github.com/selenide/selenide/releases)
- [Changelog](https://github.com/selenide/selenide/blob/master/CHANGELOG.md)
- [Commits](https://github.com/selenide/selenide/compare/v6.6.3...v6.11.2)

---
updated-dependencies:
- dependency-name: com.codeborne:selenide
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 833f7a92242..b6724773121 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -15,7 +15,7 @@
         <maven.surefire-plugin.version>3.0.0-M8</maven.surefire-plugin.version>
         <kafka-ui-contract>${project.version}</kafka-ui-contract>
         <testcontainers.version>1.17.6</testcontainers.version>
-        <selenide.version>6.6.3</selenide.version>
+        <selenide.version>6.11.2</selenide.version>
         <testng.version>7.7.0</testng.version>
         <allure.version>2.20.1</allure.version>
         <qase.io.version>3.0.2</qase.io.version>

From ea348102c22a4eb4fdaa24a635ca7f4184970442 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Thu, 23 Feb 2023 15:47:59 +0400
Subject: [PATCH 416/734] FE: Redesign connector actions (#3197)

* redesign connector actions

* remove xpect(dropDownButton.length).toEqual(2) from Actions.spec.tsx

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Connect/Details/Actions/Action.styled.ts  | 23 +++++++++++++
 .../Connect/Details/Actions/Actions.tsx       | 25 +++++++-------
 .../Actions/__tests__/Actions.spec.tsx        | 33 ++++++++++---------
 .../components/common/Button/Button.styled.ts |  6 ++--
 .../common/Icons/ChevronDownIcon.tsx          | 24 ++++++++++++++
 kafka-ui-react-app/src/theme/theme.ts         |  1 +
 6 files changed, 84 insertions(+), 28 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Connect/Details/Actions/Action.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/ChevronDownIcon.tsx

diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Action.styled.ts b/kafka-ui-react-app/src/components/Connect/Details/Actions/Action.styled.ts
new file mode 100644
index 00000000000..a2998acdc21
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Action.styled.ts
@@ -0,0 +1,23 @@
+import styled from 'styled-components';
+
+export const ConnectorActionsWrapperStyled = styled.div`
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8px;
+`;
+export const ButtonLabel = styled.span`
+  margin-right: 11.5px;
+`;
+export const RestartButton = styled.div`
+  padding: 0 12px;
+  border: none;
+  border-radius: 4px;
+  display: flex;
+  -webkit-align-items: center;
+  background: #e8e8fc;
+  color: #171a1c;
+  font-size: 14px;
+  font-weight: 500;
+  height: 32px;
+`;
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index f475b739e12..530f0db1471 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import styled from 'styled-components';
 import { useNavigate } from 'react-router-dom';
 import { useIsMutating } from '@tanstack/react-query';
 import {
@@ -21,13 +20,9 @@ import {
 import { useConfirm } from 'lib/hooks/useConfirm';
 import { Dropdown } from 'components/common/Dropdown';
 import { ActionDropdownItem } from 'components/common/ActionComponent';
+import ChevronDownIcon from 'components/common/Icons/ChevronDownIcon';
 
-const ConnectorActionsWrapperStyled = styled.div`
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: 8px;
-`;
+import * as S from './Action.styled';
 
 const Actions: React.FC = () => {
   const navigate = useNavigate();
@@ -66,10 +61,16 @@ const Actions: React.FC = () => {
     stateMutation.mutateAsync(ConnectorAction.PAUSE);
   const resumeConnectorHandler = () =>
     stateMutation.mutateAsync(ConnectorAction.RESUME);
-
   return (
-    <ConnectorActionsWrapperStyled>
-      <Dropdown>
+    <S.ConnectorActionsWrapperStyled>
+      <Dropdown
+        label={
+          <S.RestartButton>
+            <S.ButtonLabel>Restart</S.ButtonLabel>
+            <ChevronDownIcon />
+          </S.RestartButton>
+        }
+      >
         {connector?.status.state === ConnectorState.RUNNING && (
           <ActionDropdownItem
             onClick={pauseConnectorHandler}
@@ -129,6 +130,8 @@ const Actions: React.FC = () => {
         >
           Restart Failed Tasks
         </ActionDropdownItem>
+      </Dropdown>
+      <Dropdown>
         <ActionDropdownItem
           onClick={deleteConnectorHandler}
           disabled={isMutating}
@@ -142,7 +145,7 @@ const Actions: React.FC = () => {
           Delete
         </ActionDropdownItem>
       </Dropdown>
-    </ConnectorActionsWrapperStyled>
+    </S.ConnectorActionsWrapperStyled>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
index c3c4cff8f1a..9dce7507f59 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/__tests__/Actions.spec.tsx
@@ -35,8 +35,11 @@ const expectActionButtonsExists = () => {
 };
 const afterClickDropDownButton = async () => {
   const dropDownButton = screen.getAllByRole('button');
-  expect(dropDownButton.length).toEqual(1);
-  await userEvent.click(dropDownButton[0]);
+  await userEvent.click(dropDownButton[1]);
+};
+const afterClickRestartButton = async () => {
+  const dropDownButton = screen.getByText('Restart');
+  await userEvent.click(dropDownButton);
 };
 describe('Actions', () => {
   afterEach(() => {
@@ -66,8 +69,8 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.PAUSED),
       }));
       renderComponent();
-      await afterClickDropDownButton();
-      expect(screen.getAllByRole('menuitem').length).toEqual(5);
+      await afterClickRestartButton();
+      expect(screen.getAllByRole('menuitem').length).toEqual(4);
       expect(screen.getByText('Resume')).toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
@@ -78,8 +81,8 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.FAILED),
       }));
       renderComponent();
-      await afterClickDropDownButton();
-      expect(screen.getAllByRole('menuitem').length).toEqual(4);
+      await afterClickRestartButton();
+      expect(screen.getAllByRole('menuitem').length).toEqual(3);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
@@ -90,8 +93,8 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.UNASSIGNED),
       }));
       renderComponent();
-      await afterClickDropDownButton();
-      expect(screen.getAllByRole('menuitem').length).toEqual(4);
+      await afterClickRestartButton();
+      expect(screen.getAllByRole('menuitem').length).toEqual(3);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.queryByText('Pause')).not.toBeInTheDocument();
       expectActionButtonsExists();
@@ -102,8 +105,8 @@ describe('Actions', () => {
         data: set({ ...connector }, 'status.state', ConnectorState.RUNNING),
       }));
       renderComponent();
-      await afterClickDropDownButton();
-      expect(screen.getAllByRole('menuitem').length).toEqual(5);
+      await afterClickRestartButton();
+      expect(screen.getAllByRole('menuitem').length).toEqual(4);
       expect(screen.queryByText('Resume')).not.toBeInTheDocument();
       expect(screen.getByText('Pause')).toBeInTheDocument();
       expectActionButtonsExists();
@@ -131,7 +134,7 @@ describe('Actions', () => {
           mutateAsync: restartConnector,
         }));
         renderComponent();
-        await afterClickDropDownButton();
+        await afterClickRestartButton();
         await userEvent.click(
           screen.getByRole('menuitem', { name: 'Restart Connector' })
         );
@@ -144,7 +147,7 @@ describe('Actions', () => {
           mutateAsync: restartAllTasks,
         }));
         renderComponent();
-        await afterClickDropDownButton();
+        await afterClickRestartButton();
         await userEvent.click(
           screen.getByRole('menuitem', { name: 'Restart All Tasks' })
         );
@@ -159,7 +162,7 @@ describe('Actions', () => {
           mutateAsync: restartFailedTasks,
         }));
         renderComponent();
-        await afterClickDropDownButton();
+        await afterClickRestartButton();
         await userEvent.click(
           screen.getByRole('menuitem', { name: 'Restart Failed Tasks' })
         );
@@ -174,7 +177,7 @@ describe('Actions', () => {
           mutateAsync: pauseConnector,
         }));
         renderComponent();
-        await afterClickDropDownButton();
+        await afterClickRestartButton();
         await userEvent.click(screen.getByRole('menuitem', { name: 'Pause' }));
         expect(pauseConnector).toHaveBeenCalledWith(ConnectorAction.PAUSE);
       });
@@ -188,7 +191,7 @@ describe('Actions', () => {
           mutateAsync: resumeConnector,
         }));
         renderComponent();
-        await afterClickDropDownButton();
+        await afterClickRestartButton();
         await userEvent.click(screen.getByRole('menuitem', { name: 'Resume' }));
         expect(resumeConnector).toHaveBeenCalledWith(ConnectorAction.RESUME);
       });
diff --git a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
index 574e8a6c5eb..4cf793a5ed4 100644
--- a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
@@ -58,8 +58,10 @@ const StyledButton = styled.button<ButtonProps>`
     color: ${(props) => props.theme.button.primary.color};
   }
 
-  & svg {
-    margin-right: 7px;
+  & :first-of-type {
+    svg {
+      margin-right: 7px;
+    }
   }
 `;
 
diff --git a/kafka-ui-react-app/src/components/common/Icons/ChevronDownIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/ChevronDownIcon.tsx
new file mode 100644
index 00000000000..d9bf102474d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/ChevronDownIcon.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { useTheme } from 'styled-components';
+
+const ChevronDownIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      width="10"
+      height="6"
+      viewBox="0 0 10 6"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M0.646447 0.646447C0.841709 0.451184 1.15829 0.451184 1.35355 0.646447L5 4.29289L8.64645 0.646447C8.84171 0.451184 9.15829 0.451184 9.35355 0.646447C9.54882 0.841709 9.54882 1.15829 9.35355 1.35355L5.35355 5.35355C5.15829 5.54882 4.84171 5.54882 4.64645 5.35355L0.646447 1.35355C0.451184 1.15829 0.451184 0.841709 0.646447 0.646447Z"
+        fill={theme.icons.chevronDownIcon}
+      />
+    </svg>
+  );
+};
+
+export default ChevronDownIcon;
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 9eb8ac3fc79..73da7bf84d0 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -547,6 +547,7 @@ const theme = {
     },
   },
   icons: {
+    chevronDownIcon: Colors.neutral[90],
     closeIcon: Colors.neutral[30],
     deleteIcon: Colors.red[20],
     warningIcon: Colors.yellow[20],

From ad5b0d44f0dd1a3455d03dfd18ea69758e450104 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 23 Feb 2023 23:56:34 +0400
Subject: [PATCH 417/734] Ksql select header's response parsing improved, tests
 added (#3377)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../service/ksql/response/ResponseParser.java | 37 +++++++++++++++----
 .../ksql/response/ResponseParserTest.java     | 25 +++++++++++++
 2 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/response/ResponseParserTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java
index 4781d159e7b..647e23a78ec 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java
@@ -3,14 +3,13 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.provectus.kafka.ui.exception.KsqlApiException;
 import com.provectus.kafka.ui.service.ksql.KsqlApiClient;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 
 public class ResponseParser {
@@ -24,11 +23,7 @@ public static Optional<KsqlApiClient.KsqlResponseTable> parseSelectResponse(Json
       return Optional.of(
           KsqlApiClient.KsqlResponseTable.builder()
               .header("Schema")
-              .columnNames(
-                  Arrays.stream(jsonNode.get("header").get("schema").asText().split(","))
-                      .map(String::trim)
-                      .collect(Collectors.toList())
-              )
+              .columnNames(parseSelectHeadersString(jsonNode.get("header").get("schema").asText()))
               .build());
     }
     if (arrayFieldNonEmpty(jsonNode, "row")) {
@@ -46,6 +41,34 @@ public static Optional<KsqlApiClient.KsqlResponseTable> parseSelectResponse(Json
     return Optional.empty();
   }
 
+  @VisibleForTesting
+  static List<String> parseSelectHeadersString(String str) {
+    List<String> headers = new ArrayList<>();
+    int structNesting = 0;
+    boolean quotes = false;
+    var headerBuilder = new StringBuilder();
+    for (char ch : str.toCharArray()) {
+      if (ch == '<') {
+        structNesting++;
+      } else if (ch == '>') {
+        structNesting--;
+      } else if (ch == '`') {
+        quotes = !quotes;
+      } else if (ch == ' ' && headerBuilder.isEmpty()) {
+        continue; //skipping leading & training whitespaces
+      } else if (ch == ',' && structNesting == 0 && !quotes) {
+        headers.add(headerBuilder.toString());
+        headerBuilder = new StringBuilder();
+        continue;
+      }
+      headerBuilder.append(ch);
+    }
+    if (!headerBuilder.isEmpty()) {
+      headers.add(headerBuilder.toString());
+    }
+    return headers;
+  }
+
   public static KsqlApiClient.KsqlResponseTable errorTableWithTextMsg(String errorText) {
     return KsqlApiClient.KsqlResponseTable.builder()
         .header("Execution error")
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/response/ResponseParserTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/response/ResponseParserTest.java
new file mode 100644
index 00000000000..02552449336
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/response/ResponseParserTest.java
@@ -0,0 +1,25 @@
+package com.provectus.kafka.ui.service.ksql.response;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class ResponseParserTest {
+
+  @Test
+  void parsesSelectHeaderIntoColumnNames() {
+    assertThat(ResponseParser.parseSelectHeadersString("`inQuotes` INT, notInQuotes INT"))
+        .containsExactly("`inQuotes` INT", "notInQuotes INT");
+
+    assertThat(ResponseParser.parseSelectHeadersString("`name with comma,` INT, name2 STRING"))
+        .containsExactly("`name with comma,` INT", "name2 STRING");
+
+    assertThat(ResponseParser.parseSelectHeadersString(
+        "`topLvl` INT, `struct` STRUCT<`nested1` STRING, anotherName STRUCT<nested2 INT>>"))
+        .containsExactly(
+            "`topLvl` INT",
+            "`struct` STRUCT<`nested1` STRING, anotherName STRUCT<nested2 INT>>"
+        );
+  }
+
+}

From 9b76d595132955e6048bb7f6b40a3a74bf53209f Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:50:12 +0400
Subject: [PATCH 418/734] Fix checkout action commit ref (#3405)

* fix checkout

* fix other actions

---------

Co-authored-by: Narek Matevosyan <nmatevosyan@provectus.com>
---
 .github/workflows/branch-deploy.yml              | 2 ++
 .github/workflows/build-public-image.yml         | 2 ++
 .github/workflows/master.yaml                    | 2 ++
 .github/workflows/release.yaml                   | 1 +
 .github/workflows/separate_env_public_create.yml | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index aeb9951dc8d..b694a3c7fdc 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -10,6 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: get branch name
         id: extract_branch
         run: |
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index 9db111c7a85..d593326fa68 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -9,6 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: get branch name
         id: extract_branch
         run: |
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 6baa4c8835f..01651ee76d0 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -9,6 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up JDK
         uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index af538c90c80..6906ff063c9 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -12,6 +12,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - run: |
           git config user.name github-actions
diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
index 551001031ca..fde65dffaba 100644
--- a/.github/workflows/separate_env_public_create.yml
+++ b/.github/workflows/separate_env_public_create.yml
@@ -12,6 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: get branch name
         id: extract_branch
         run: |

From c8619268cd1e791b5d509371981cb0d9b0a80e99 Mon Sep 17 00:00:00 2001
From: kristi-dev <92114648+kristi-dev@users.noreply.github.com>
Date: Mon, 27 Feb 2023 10:44:28 +0000
Subject: [PATCH 419/734] FE: Topics: make the topic name field focused (#2986)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/components/Connect/New/New.tsx            | 1 +
 kafka-ui-react-app/src/components/Schemas/New/New.tsx            | 1 +
 .../src/components/Topics/shared/Form/TopicForm.tsx              | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kafka-ui-react-app/src/components/Connect/New/New.tsx b/kafka-ui-react-app/src/components/Connect/New/New.tsx
index 2e399359425..1d3f230631a 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/New.tsx
@@ -133,6 +133,7 @@ const New: React.FC = () => {
             inputSize="M"
             placeholder="Connector Name"
             name="name"
+            autoFocus
             autoComplete="off"
             disabled={isSubmitting}
           />
diff --git a/kafka-ui-react-app/src/components/Schemas/New/New.tsx b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
index 0d6e9d8ffa5..3e5d39c9df5 100644
--- a/kafka-ui-react-app/src/components/Schemas/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/New/New.tsx
@@ -103,6 +103,7 @@ const New: React.FC = () => {
           <Input
             inputSize="M"
             placeholder="Schema Name"
+            autoFocus
             name="subject"
             autoComplete="off"
             disabled={isSubmitting}
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index 15f60eaaac2..ae9d429236a 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -93,6 +93,7 @@ const TopicForm: React.FC<Props> = ({
               <InputLabel htmlFor="topicFormName">Topic Name *</InputLabel>
               <Input
                 id="topicFormName"
+                autoFocus
                 name="name"
                 placeholder="Topic Name"
                 defaultValue={topicName}

From ffa49ebb3d4cada57d415d7b5ee054987ac32977 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Wed, 1 Mar 2023 10:32:04 +0200
Subject: [PATCH 420/734] [e2e]Checking Messages count per page within Topic
 (#3413)

* [e2e]Checking available custom parameters with Topic editing

* [e2e]Checking Messages count per page within Topic

* [e2e]Checking Messages count per page within Topic.First Fix

* [e2e]Checking Messages count per page within Topic.Issue added

* [e2e]Checking Messages count per page within Topic.Second Fix

* [e2e]Checking Messages count per page within Topic.Second Fix

* [e2e]Checking Messages count per page within Topic.Third Fix

* [e2e]Checking Messages count per page within Topic.Third Fix
---
 .../provectus/kafka/ui/pages/BasePage.java    |  2 ++
 .../kafka/ui/pages/topics/TopicDetails.java   | 17 ++++++++++
 .../ui/smokeSuite/topics/MessagesTest.java    | 33 ++++++++++++++++++-
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index e51942a39ce..c131bd8e0d1 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -23,6 +23,8 @@ public abstract class BasePage extends WebUtils {
     protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
     protected SelenideElement confirmBtn = $x("//button[contains(text(),'Confirm')]");
     protected SelenideElement cancelBtn = $x("//button[contains(text(),'Cancel')]");
+    protected SelenideElement backBtn = $x("//button[contains(text(),'Back')]");
+    protected SelenideElement nextBtn = $x("//button[contains(text(),'Next')]");
     protected ElementsCollection ddlOptions = $$x("//li[@value]");
     protected ElementsCollection gridItems = $$x("//tr[@class]");
     protected String summaryCellLocator = "//div[contains(text(),'%s')]";
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
index 980a66b791d..a99afd903b6 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
@@ -170,6 +170,13 @@ public TopicDetails clickMessagesAddFiltersBtn() {
         return this;
     }
 
+    @Step
+    public TopicDetails clickNextButton() {
+      nextBtn.shouldBe(Condition.enabled).click();
+      waitUntilSpinnerDisappear();
+      return this;
+    }
+
     @Step
     public TopicDetails openSavedFiltersListMdl() {
         savedFiltersLink.shouldBe(Condition.enabled).click();
@@ -240,6 +247,16 @@ public boolean isAddFilterBtnAddFilterMdlEnabled() {
         return isEnabled(addFilterBtnAddFilterMdl);
     }
 
+    @Step
+    public boolean isBackButtonEnabled() {
+        return isEnabled(backBtn);
+    }
+
+    @Step
+    public boolean isNextButtonEnabled() {
+      return isEnabled(nextBtn);
+    }
+
     @Step
     public boolean isActiveFilterVisible(String activeFilterName) {
         return isVisible($x(String.format(activeFilterNameLocator, activeFilterName)));
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
index 2dee8588d79..5e5af5c0448 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
@@ -9,6 +9,7 @@
 import io.qameta.allure.Issue;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
+import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -48,16 +49,21 @@ public class MessagesTest extends BaseTest {
             .setName("topic-to-recreate-attribute-" + randomAlphabetic(5))
             .setMessageKey(randomAlphabetic(5))
             .setMessageContent(randomAlphabetic(10));
+    private static final Topic TOPIC_FOR_CHECK_MESSAGES_COUNT = new Topic()
+             .setName("topic-for-check-messages-count" + randomAlphabetic(5))
+             .setMessageKey(randomAlphabetic(5))
+             .setMessageContent(randomAlphabetic(10));
     private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
     @BeforeClass(alwaysRun = true)
     public void beforeClass() {
         TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECKING_FILTERS, TOPIC_TO_CLEAR_AND_PURGE_MESSAGES,
-                TOPIC_TO_RECREATE));
+                TOPIC_TO_RECREATE, TOPIC_FOR_CHECK_MESSAGES_COUNT));
         TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
         IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
         waitUntilNewMinuteStarted();
         IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
+        IntStream.range(1, 110).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_MESSAGES_COUNT));
     }
 
     @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
@@ -272,6 +278,31 @@ public void checkRecreateTopic() {
         softly.assertAll();
     }
 
+    @Ignore
+    @Issue("https://github.com/provectus/kafka-ui/issues/3129")
+    @QaseId(267)
+    @Test(priority = 10)
+    public void CheckMessagesCountPerPageWithinTopic() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_MESSAGES_COUNT.getName());
+        topicDetails
+                .openDetailsTab(MESSAGES);
+        int messagesPerPage = topicDetails.getAllMessages().size();
+        SoftAssert softly = new SoftAssert();
+        softly.assertEquals(messagesPerPage, 100, "getAllMessages()");
+        softly.assertFalse(topicDetails.isBackButtonEnabled(), "isBackButtonEnabled()");
+        softly.assertTrue(topicDetails.isNextButtonEnabled(), "isNextButtonEnabled()");
+        softly.assertAll();
+        int lastOffsetOnPage = topicDetails.getAllMessages()
+                        .get(messagesPerPage -1).getOffset();
+        topicDetails
+                .clickNextButton();
+        softly.assertEquals(topicDetails.getAllMessages().stream().findFirst().orElseThrow().getOffset(),
+                lastOffsetOnPage + 1, "findFirst().getOffset()");
+        softly.assertTrue(topicDetails.isBackButtonEnabled(), "isBackButtonEnabled()");
+        softly.assertFalse(topicDetails.isNextButtonEnabled(), "isNextButtonEnabled()");
+        softly.assertAll();
+    }
+
     @Step
     protected void produceMessage(Topic topic) {
         topicDetails

From 59837394fbd06602e0d04827d2edbc8673197d88 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 1 Mar 2023 16:13:29 +0400
Subject: [PATCH 421/734] Integration with ODD (#3289)

ODD integration
Exporting statistics:
- topics as DataSets (metadata + schemas)
- connectors as DataTransformers (metadata + inputs&outputs)Exporting to ODD:
---
 kafka-ui-api/pom.xml                          |  25 ++
 .../ui/controller/KafkaConnectController.java |   6 +-
 .../ui/service/KafkaConfigSanitizer.java      |   3 +-
 .../kafka/ui/service/KafkaConnectService.java |  75 ++---
 .../integration/odd/ConnectorInfo.java        | 167 ++++++++++
 .../integration/odd/ConnectorsExporter.java   |  96 ++++++
 .../service/integration/odd/OddExporter.java  | 106 ++++++
 .../integration/odd/OddExporterScheduler.java |  27 ++
 .../integration/odd/OddIntegrationConfig.java |  31 ++
 .../odd/OddIntegrationProperties.java         |  15 +
 .../ui/service/integration/odd/Oddrn.java     |  79 +++++
 .../integration/odd/TopicsExporter.java       | 111 +++++++
 .../integration/odd/schema/AvroExtractor.java | 262 +++++++++++++++
 .../odd/schema/DataSetFieldsExtractors.java   |  38 +++
 .../odd/schema/JsonSchemaExtractor.java       | 311 ++++++++++++++++++
 .../odd/schema/ProtoExtractor.java            | 230 +++++++++++++
 .../kafka/ui/util/ReactiveFailover.java       |  11 +-
 .../kafka/ui/KafkaConnectServiceTests.java    |   5 +-
 .../ui/service/KafkaConfigSanitizerTest.java  |   7 +
 .../odd/ConnectorsExporterTest.java           | 111 +++++++
 .../integration/odd/TopicsExporterTest.java   | 167 ++++++++++
 .../odd/schema/AvroExtractorTest.java         | 272 +++++++++++++++
 .../odd/schema/JsonSchemaExtractorTest.java   | 145 ++++++++
 .../odd/schema/ProtoExtractorTest.java        | 187 +++++++++++
 pom.xml                                       |   2 +
 25 files changed, 2437 insertions(+), 52 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorInfo.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporterScheduler.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddIntegrationConfig.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddIntegrationProperties.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/Oddrn.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporterTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractorTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractorTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractorTest.java

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 87640206932..e61827fd73d 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -199,6 +199,31 @@
             <version>${antlr4-maven-plugin.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendatadiscovery</groupId>
+            <artifactId>oddrn-generator-java</artifactId>
+            <version>${odd-oddrn-generator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendatadiscovery</groupId>
+            <artifactId>ingestion-contract-client</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-webflux</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.projectreactor</groupId>
+                    <artifactId>reactor-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.projectreactor.ipc</groupId>
+                    <artifactId>reactor-netty</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>${odd-oddrn-client.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-ldap</artifactId>
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index 2f8bb2dbf4a..9ffd901c078 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -37,10 +37,10 @@ public class KafkaConnectController extends AbstractController implements KafkaC
   public Mono<ResponseEntity<Flux<ConnectDTO>>> getConnects(String clusterName,
                                                             ServerWebExchange exchange) {
 
-    Flux<ConnectDTO> flux = Flux.fromIterable(kafkaConnectService.getConnects(getCluster(clusterName)))
+    Flux<ConnectDTO> availableConnects = kafkaConnectService.getConnects(getCluster(clusterName))
         .filterWhen(dto -> accessControlService.isConnectAccessible(dto, clusterName));
 
-    return Mono.just(ResponseEntity.ok(flux));
+    return Mono.just(ResponseEntity.ok(availableConnects));
   }
 
   @Override
@@ -54,7 +54,7 @@ public Mono<ResponseEntity<Flux<String>>> getConnectors(String clusterName, Stri
         .build());
 
     return validateAccess.thenReturn(
-        ResponseEntity.ok(kafkaConnectService.getConnectors(getCluster(clusterName), connectName))
+        ResponseEntity.ok(kafkaConnectService.getConnectorNames(getCluster(clusterName), connectName))
     );
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java
index 30daa1ca57c..aa267098226 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java
@@ -17,7 +17,8 @@
 class KafkaConfigSanitizer extends Sanitizer {
   private static final List<String> DEFAULT_PATTERNS_TO_SANITIZE = Arrays.asList(
       "basic.auth.user.info",  /* For Schema Registry credentials */
-      "password", "secret", "token", "key", ".*credentials.*"  /* General credential patterns */
+      "password", "secret", "token", "key", ".*credentials.*",   /* General credential patterns */
+      "aws.access.*", "aws.secret.*", "aws.session.*"   /* AWS-related credential patterns */
   );
 
   KafkaConfigSanitizer(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
index cfc190cffdb..163732fae9f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
@@ -28,10 +28,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -40,7 +40,6 @@
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
 @Service
@@ -52,18 +51,18 @@ public class KafkaConnectService {
   private final ObjectMapper objectMapper;
   private final KafkaConfigSanitizer kafkaConfigSanitizer;
 
-  public List<ConnectDTO> getConnects(KafkaCluster cluster) {
-    return Optional.ofNullable(cluster.getOriginalProperties().getKafkaConnect())
-        .map(lst -> lst.stream().map(clusterMapper::toKafkaConnect).toList())
-        .orElse(List.of());
+  public Flux<ConnectDTO> getConnects(KafkaCluster cluster) {
+    return Flux.fromIterable(
+        Optional.ofNullable(cluster.getOriginalProperties().getKafkaConnect())
+            .map(lst -> lst.stream().map(clusterMapper::toKafkaConnect).toList())
+            .orElse(List.of())
+    );
   }
 
   public Flux<FullConnectorInfoDTO> getAllConnectors(final KafkaCluster cluster,
-                                                     final String search) {
-    Mono<Flux<ConnectDTO>> clusters = Mono.just(Flux.fromIterable(getConnects(cluster))); // TODO get rid
-    return clusters
-        .flatMapMany(Function.identity())
-        .flatMap(connect -> getConnectorNames(cluster, connect.getName()))
+                                                     @Nullable final String search) {
+    return getConnects(cluster)
+        .flatMap(connect -> getConnectorNames(cluster, connect.getName()).map(cn -> Tuples.of(connect.getName(), cn)))
         .flatMap(pair -> getConnector(cluster, pair.getT1(), pair.getT2()))
         .flatMap(connector ->
             getConnectorConfig(cluster, connector.getConnect(), connector.getName())
@@ -99,56 +98,46 @@ public Flux<FullConnectorInfoDTO> getAllConnectors(final KafkaCluster cluster,
         .filter(matchesSearchTerm(search));
   }
 
-  private Predicate<FullConnectorInfoDTO> matchesSearchTerm(final String search) {
-    return connector -> getSearchValues(connector)
-        .anyMatch(value -> value.contains(
-            StringUtils.defaultString(
-                    search,
-                    StringUtils.EMPTY)
-                .toUpperCase()));
+  private Predicate<FullConnectorInfoDTO> matchesSearchTerm(@Nullable final String search) {
+    if (search == null) {
+      return c -> true;
+    }
+    return connector -> getStringsForSearch(connector)
+        .anyMatch(string -> StringUtils.containsIgnoreCase(string, search));
   }
 
-  private Stream<String> getSearchValues(FullConnectorInfoDTO fullConnectorInfo) {
+  private Stream<String> getStringsForSearch(FullConnectorInfoDTO fullConnectorInfo) {
     return Stream.of(
-            fullConnectorInfo.getName(),
-            fullConnectorInfo.getStatus().getState().getValue(),
-            fullConnectorInfo.getType().getValue())
-        .map(String::toUpperCase);
+        fullConnectorInfo.getName(),
+        fullConnectorInfo.getStatus().getState().getValue(),
+        fullConnectorInfo.getType().getValue());
   }
 
-  private Mono<ConnectorTopics> getConnectorTopics(KafkaCluster cluster, String connectClusterName,
-                                                   String connectorName) {
+  public Mono<ConnectorTopics> getConnectorTopics(KafkaCluster cluster, String connectClusterName,
+                                                  String connectorName) {
     return api(cluster, connectClusterName)
         .mono(c -> c.getConnectorTopics(connectorName))
         .map(result -> result.get(connectorName))
-        // old connectors don't have this api, setting empty list for
+        // old Connect API versions don't have this endpoint, setting empty list for
         // backward-compatibility
         .onErrorResume(Exception.class, e -> Mono.just(new ConnectorTopics().topics(List.of())));
   }
 
-  private Flux<Tuple2<String, String>> getConnectorNames(KafkaCluster cluster, String connectName) {
-    return getConnectors(cluster, connectName)
-        .collectList().map(e -> e.get(0))
+  public Flux<String> getConnectorNames(KafkaCluster cluster, String connectName) {
+    return api(cluster, connectName)
+        .flux(client -> client.getConnectors(null))
         // for some reason `getConnectors` method returns the response as a single string
-        .map(this::parseToList)
-        .flatMapMany(Flux::fromIterable)
-        .map(connector -> Tuples.of(connectName, connector));
+        .collectList().map(e -> e.get(0))
+        .map(this::parseConnectorsNamesStringToList)
+        .flatMapMany(Flux::fromIterable);
   }
 
   @SneakyThrows
-  private List<String> parseToList(String json) {
+  private List<String> parseConnectorsNamesStringToList(String json) {
     return objectMapper.readValue(json, new TypeReference<>() {
     });
   }
 
-  public Flux<String> getConnectors(KafkaCluster cluster, String connectName) {
-    return api(cluster, connectName)
-        .flux(client ->
-            client.getConnectors(null)
-                .doOnError(e -> log.error("Unexpected error upon getting connectors", e))
-        );
-  }
-
   public Mono<ConnectorDTO> createConnector(KafkaCluster cluster, String connectName,
                                             Mono<NewConnectorDTO> connector) {
     return api(cluster, connectName)
@@ -171,9 +160,7 @@ public Mono<ConnectorDTO> createConnector(KafkaCluster cluster, String connectNa
   private Mono<Boolean> connectorExists(KafkaCluster cluster, String connectName,
                                         String connectorName) {
     return getConnectorNames(cluster, connectName)
-        .map(Tuple2::getT2)
-        .collectList()
-        .map(connectorNames -> connectorNames.contains(connectorName));
+        .any(name -> name.equals(connectorName));
   }
 
   public Mono<ConnectorDTO> getConnector(KafkaCluster cluster, String connectName,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorInfo.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorInfo.java
new file mode 100644
index 00000000000..a7844579bfd
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorInfo.java
@@ -0,0 +1,167 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import com.provectus.kafka.ui.model.ConnectorTypeDTO;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import javax.annotation.Nullable;
+import org.apache.commons.collections.CollectionUtils;
+import org.opendatadiscovery.oddrn.JdbcUrlParser;
+import org.opendatadiscovery.oddrn.model.HivePath;
+import org.opendatadiscovery.oddrn.model.MysqlPath;
+import org.opendatadiscovery.oddrn.model.PostgreSqlPath;
+import org.opendatadiscovery.oddrn.model.SnowflakePath;
+
+record ConnectorInfo(List<String> inputs,
+                     List<String> outputs) {
+
+  static ConnectorInfo extract(String className,
+                               ConnectorTypeDTO type,
+                               Map<String, Object> config,
+                               List<String> topicsFromApi, // can be empty for old Connect API versions
+                               Function<String, String> topicOddrnBuilder) {
+    return switch (className) {
+      case "org.apache.kafka.connect.file.FileStreamSinkConnector",
+          "org.apache.kafka.connect.file.FileStreamSourceConnector",
+          "FileStreamSource",
+          "FileStreamSink" -> extractFileIoConnector(type, topicsFromApi, config, topicOddrnBuilder);
+      case "io.confluent.connect.s3.S3SinkConnector" -> extractS3Sink(type, topicsFromApi, config, topicOddrnBuilder);
+      case "io.confluent.connect.jdbc.JdbcSinkConnector" ->
+          extractJdbcSink(type, topicsFromApi, config, topicOddrnBuilder);
+      case "io.debezium.connector.postgresql.PostgresConnector" -> extractDebeziumPg(config);
+      case "io.debezium.connector.mysql.MySqlConnector" -> extractDebeziumMysql(config);
+      default -> new ConnectorInfo(
+          extractInputs(type, topicsFromApi, config, topicOddrnBuilder),
+          extractOutputs(type, topicsFromApi, config, topicOddrnBuilder)
+      );
+    };
+  }
+
+  private static ConnectorInfo extractFileIoConnector(ConnectorTypeDTO type,
+                                                      List<String> topics,
+                                                      Map<String, Object> config,
+                                                      Function<String, String> topicOddrnBuilder) {
+    return new ConnectorInfo(
+        extractInputs(type, topics, config, topicOddrnBuilder),
+        extractOutputs(type, topics, config, topicOddrnBuilder)
+    );
+  }
+
+  private static ConnectorInfo extractJdbcSink(ConnectorTypeDTO type,
+                                               List<String> topics,
+                                               Map<String, Object> config,
+                                               Function<String, String> topicOddrnBuilder) {
+    String tableNameFormat = (String) config.getOrDefault("table.name.format", "${topic}");
+    List<String> targetTables = extractTopicNamesBestEffort(topics, config)
+        .map(topic -> tableNameFormat.replace("${kafka}", topic))
+        .toList();
+
+    String connectionUrl = (String) config.get("connection.url");
+    List<String> outputs = new ArrayList<>();
+    @Nullable var knownJdbcPath = new JdbcUrlParser().parse(connectionUrl);
+    if (knownJdbcPath instanceof PostgreSqlPath p) {
+      targetTables.forEach(t -> outputs.add(p.toBuilder().table(t).build().oddrn()));
+    }
+    if (knownJdbcPath instanceof MysqlPath p) {
+      targetTables.forEach(t -> outputs.add(p.toBuilder().table(t).build().oddrn()));
+    }
+    if (knownJdbcPath instanceof HivePath p) {
+      targetTables.forEach(t -> outputs.add(p.toBuilder().table(t).build().oddrn()));
+    }
+    if (knownJdbcPath instanceof SnowflakePath p) {
+      targetTables.forEach(t -> outputs.add(p.toBuilder().table(t).build().oddrn()));
+    }
+    return new ConnectorInfo(
+        extractInputs(type, topics, config, topicOddrnBuilder),
+        outputs
+    );
+  }
+
+  private static ConnectorInfo extractDebeziumPg(Map<String, Object> config) {
+    String host = (String) config.get("database.hostname");
+    String dbName = (String) config.get("database.dbname");
+    var inputs = List.of(
+        PostgreSqlPath.builder()
+            .host(host)
+            .database(dbName)
+            .build().oddrn()
+    );
+    return new ConnectorInfo(inputs, List.of());
+  }
+
+  private static ConnectorInfo extractDebeziumMysql(Map<String, Object> config) {
+    String host = (String) config.get("database.hostname");
+    var inputs = List.of(
+        MysqlPath.builder()
+            .host(host)
+            .build()
+            .oddrn()
+    );
+    return new ConnectorInfo(inputs, List.of());
+  }
+
+  private static ConnectorInfo extractS3Sink(ConnectorTypeDTO type,
+                                             List<String> topics,
+                                             Map<String, Object> config,
+                                             Function<String, String> topicOrrdnBuilder) {
+    String bucketName = (String) config.get("s3.bucket.name");
+    String topicsDir = (String) config.getOrDefault("topics.dir", "topics");
+    String directoryDelim = (String) config.getOrDefault("directory.delim", "/");
+    List<String> outputs = extractTopicNamesBestEffort(topics, config)
+        .map(topic -> Oddrn.awsS3Oddrn(bucketName, topicsDir + directoryDelim + topic))
+        .toList();
+    return new ConnectorInfo(
+        extractInputs(type, topics, config, topicOrrdnBuilder),
+        outputs
+    );
+  }
+
+  private static List<String> extractInputs(ConnectorTypeDTO type,
+                                            List<String> topicsFromApi,
+                                            Map<String, Object> config,
+                                            Function<String, String> topicOrrdnBuilder) {
+    return type == ConnectorTypeDTO.SINK
+        ? extractTopicsOddrns(config, topicsFromApi, topicOrrdnBuilder)
+        : List.of();
+  }
+
+  private static List<String> extractOutputs(ConnectorTypeDTO type,
+                                             List<String> topicsFromApi,
+                                             Map<String, Object> config,
+                                             Function<String, String> topicOrrdnBuilder) {
+    return type == ConnectorTypeDTO.SOURCE
+        ? extractTopicsOddrns(config, topicsFromApi, topicOrrdnBuilder)
+        : List.of();
+  }
+
+  private static Stream<String> extractTopicNamesBestEffort(
+      // topic list can be empty for old Connect API versions
+      List<String> topicsFromApi,
+      Map<String, Object> config
+  ) {
+    if (CollectionUtils.isNotEmpty(topicsFromApi)) {
+      return topicsFromApi.stream();
+    }
+
+    // trying to extract topic names from config
+    String topicsString = (String) config.get("topics");
+    String topicString = (String) config.get("topic");
+    return Stream.of(topicsString, topicString)
+        .filter(Objects::nonNull)
+        .flatMap(str -> Stream.of(str.split(",")))
+        .map(String::trim)
+        .filter(s -> !s.isBlank());
+  }
+
+  private static List<String> extractTopicsOddrns(Map<String, Object> config,
+                                                  List<String> topicsFromApi,
+                                                  Function<String, String> topicOrrdnBuilder) {
+    return extractTopicNamesBestEffort(topicsFromApi, config)
+        .map(topicOrrdnBuilder)
+        .toList();
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporter.java
new file mode 100644
index 00000000000..2fad00bbfaf
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporter.java
@@ -0,0 +1,96 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import com.provectus.kafka.ui.connect.model.ConnectorTopics;
+import com.provectus.kafka.ui.model.ConnectDTO;
+import com.provectus.kafka.ui.model.ConnectorDTO;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.service.KafkaConnectService;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.opendatadiscovery.client.model.DataEntity;
+import org.opendatadiscovery.client.model.DataEntityList;
+import org.opendatadiscovery.client.model.DataEntityType;
+import org.opendatadiscovery.client.model.DataSource;
+import org.opendatadiscovery.client.model.DataTransformer;
+import org.opendatadiscovery.client.model.MetadataExtension;
+import reactor.core.publisher.Flux;
+
+@RequiredArgsConstructor
+class ConnectorsExporter {
+
+  private final KafkaConnectService kafkaConnectService;
+
+  Flux<DataEntityList> export(KafkaCluster cluster) {
+    return kafkaConnectService.getConnects(cluster)
+        .flatMap(connect -> kafkaConnectService.getConnectorNames(cluster, connect.getName())
+            .flatMap(connectorName -> kafkaConnectService.getConnector(cluster, connect.getName(), connectorName))
+            .flatMap(connectorDTO ->
+                kafkaConnectService.getConnectorTopics(cluster, connect.getName(), connectorDTO.getName())
+                    .map(topics -> createConnectorDataEntity(cluster, connect, connectorDTO, topics)))
+            .buffer(100)
+            .map(connectDataEntities -> {
+              String dsOddrn = Oddrn.connectDataSourceOddrn(connect.getAddress());
+              return new DataEntityList()
+                  .dataSourceOddrn(dsOddrn)
+                  .items(connectDataEntities);
+            })
+        );
+  }
+
+  Flux<DataSource> getConnectDataSources(KafkaCluster cluster) {
+    return kafkaConnectService.getConnects(cluster)
+        .map(ConnectorsExporter::toDataSource);
+  }
+
+  private static DataSource toDataSource(ConnectDTO connect) {
+    return new DataSource()
+        .oddrn(Oddrn.connectDataSourceOddrn(connect.getAddress()))
+        .name(connect.getName())
+        .description("Kafka Connect");
+  }
+
+  private static DataEntity createConnectorDataEntity(KafkaCluster cluster,
+                                                      ConnectDTO connect,
+                                                      ConnectorDTO connector,
+                                                      ConnectorTopics connectorTopics) {
+    var metadata = new HashMap<>(extractMetadata(connector));
+    metadata.put("type", connector.getType().name());
+
+    var info = extractConnectorInfo(cluster, connector, connectorTopics);
+    DataTransformer transformer = new DataTransformer();
+    transformer.setInputs(info.inputs());
+    transformer.setOutputs(info.outputs());
+
+    return new DataEntity()
+        .oddrn(Oddrn.connectorOddrn(connect.getAddress(), connector.getName()))
+        .name(connector.getName())
+        .description("Kafka Connector \"%s\" (%s)".formatted(connector.getName(), connector.getType()))
+        .type(DataEntityType.JOB)
+        .dataTransformer(transformer)
+        .metadata(List.of(
+            new MetadataExtension()
+                .schemaUrl(URI.create("wontbeused.oops"))
+                .metadata(metadata)));
+  }
+
+  private static Map<String, Object> extractMetadata(ConnectorDTO connector) {
+    // will be sanitized by KafkaConfigSanitizer (if it's enabled)
+    return connector.getConfig();
+  }
+
+  private static ConnectorInfo extractConnectorInfo(KafkaCluster cluster,
+                                                    ConnectorDTO connector,
+                                                    ConnectorTopics topics) {
+    return ConnectorInfo.extract(
+        (String) connector.getConfig().get("connector.class"),
+        connector.getType(),
+        connector.getConfig(),
+        topics.getTopics(),
+        topic -> Oddrn.topicOddrn(cluster, topic)
+    );
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporter.java
new file mode 100644
index 00000000000..2917e811bed
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporter.java
@@ -0,0 +1,106 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.service.KafkaConnectService;
+import com.provectus.kafka.ui.service.StatisticsCache;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import lombok.SneakyThrows;
+import org.opendatadiscovery.client.ApiClient;
+import org.opendatadiscovery.client.api.OpenDataDiscoveryIngestionApi;
+import org.opendatadiscovery.client.model.DataEntity;
+import org.opendatadiscovery.client.model.DataEntityList;
+import org.opendatadiscovery.client.model.DataSource;
+import org.opendatadiscovery.client.model.DataSourceList;
+import org.springframework.http.HttpHeaders;
+import reactor.core.publisher.Mono;
+
+class OddExporter {
+
+  private final OpenDataDiscoveryIngestionApi oddApi;
+  private final TopicsExporter topicsExporter;
+  private final ConnectorsExporter connectorsExporter;
+
+  public OddExporter(StatisticsCache statisticsCache,
+                     KafkaConnectService connectService,
+                     OddIntegrationProperties oddIntegrationProperties) {
+    this(
+        createApiClient(oddIntegrationProperties),
+        new TopicsExporter(createTopicsFilter(oddIntegrationProperties), statisticsCache),
+        new ConnectorsExporter(connectService)
+    );
+  }
+
+  @VisibleForTesting
+  OddExporter(OpenDataDiscoveryIngestionApi oddApi,
+              TopicsExporter topicsExporter,
+              ConnectorsExporter connectorsExporter) {
+    this.oddApi = oddApi;
+    this.topicsExporter = topicsExporter;
+    this.connectorsExporter = connectorsExporter;
+  }
+
+  private static Predicate<String> createTopicsFilter(OddIntegrationProperties properties) {
+    if (properties.getTopicsRegex() == null) {
+      return topic -> !topic.startsWith("_");
+    }
+    Pattern pattern = Pattern.compile(properties.getTopicsRegex());
+    return topic -> pattern.matcher(topic).matches();
+  }
+
+  private static OpenDataDiscoveryIngestionApi createApiClient(OddIntegrationProperties properties) {
+    Preconditions.checkNotNull(properties.getUrl(), "ODD url not set");
+    Preconditions.checkNotNull(properties.getToken(), "ODD token not set");
+    var apiClient = new ApiClient()
+        .setBasePath(properties.getUrl())
+        .addDefaultHeader(HttpHeaders.AUTHORIZATION, "Bearer " + properties.getToken());
+    return new OpenDataDiscoveryIngestionApi(apiClient);
+  }
+
+  public Mono<Void> export(KafkaCluster cluster) {
+    return exportTopics(cluster)
+        .then(exportKafkaConnects(cluster));
+  }
+
+  private Mono<Void> exportTopics(KafkaCluster c) {
+    return createKafkaDataSource(c)
+        .thenMany(topicsExporter.export(c))
+        .concatMap(this::sentDataEntities)
+        .then();
+  }
+
+  private Mono<Void> exportKafkaConnects(KafkaCluster cluster) {
+    return createConnectDataSources(cluster)
+        .thenMany(connectorsExporter.export(cluster))
+        .concatMap(this::sentDataEntities)
+        .then();
+  }
+
+  private Mono<Void> createConnectDataSources(KafkaCluster cluster) {
+    return connectorsExporter.getConnectDataSources(cluster)
+        .buffer(100)
+        .concatMap(dataSources -> oddApi.createDataSource(new DataSourceList().items(dataSources)))
+        .then();
+  }
+
+  private Mono<Void> createKafkaDataSource(KafkaCluster cluster) {
+    String clusterOddrn = Oddrn.clusterOddrn(cluster);
+    return oddApi.createDataSource(
+        new DataSourceList()
+            .addItemsItem(
+                new DataSource()
+                    .oddrn(clusterOddrn)
+                    .name(cluster.getName())
+                    .description("Kafka cluster")
+            )
+    );
+  }
+
+  private Mono<Void> sentDataEntities(DataEntityList dataEntityList) {
+    return oddApi.postDataEntityList(dataEntityList);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporterScheduler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporterScheduler.java
new file mode 100644
index 00000000000..7201737f9f8
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporterScheduler.java
@@ -0,0 +1,27 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import com.provectus.kafka.ui.service.ClustersStorage;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import reactor.core.publisher.Flux;
+import reactor.core.scheduler.Schedulers;
+
+@RequiredArgsConstructor
+class OddExporterScheduler {
+
+  private final ClustersStorage clustersStorage;
+  private final OddExporter oddExporter;
+
+  @Scheduled(fixedRateString = "${kafka.send-stats-to-odd-millis:30000}")
+  public void sendMetricsToOdd() {
+    Flux.fromIterable(clustersStorage.getKafkaClusters())
+        .parallel()
+        .runOn(Schedulers.parallel())
+        .flatMap(oddExporter::export)
+        .then()
+        .block();
+  }
+
+
+}
+
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddIntegrationConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddIntegrationConfig.java
new file mode 100644
index 00000000000..6bade3022ac
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddIntegrationConfig.java
@@ -0,0 +1,31 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import com.provectus.kafka.ui.service.ClustersStorage;
+import com.provectus.kafka.ui.service.KafkaConnectService;
+import com.provectus.kafka.ui.service.StatisticsCache;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnProperty(value = "integration.odd.url")
+class OddIntegrationConfig {
+
+  @Bean
+  OddIntegrationProperties oddIntegrationProperties() {
+    return new OddIntegrationProperties();
+  }
+
+  @Bean
+  OddExporter oddExporter(StatisticsCache statisticsCache,
+                          KafkaConnectService connectService,
+                          OddIntegrationProperties oddIntegrationProperties) {
+    return new OddExporter(statisticsCache, connectService, oddIntegrationProperties);
+  }
+
+  @Bean
+  OddExporterScheduler oddExporterScheduler(ClustersStorage storage, OddExporter exporter) {
+    return new OddExporterScheduler(storage, exporter);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddIntegrationProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddIntegrationProperties.java
new file mode 100644
index 00000000000..cbb8d89238e
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddIntegrationProperties.java
@@ -0,0 +1,15 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+
+@Data
+@ConfigurationProperties("integration.odd")
+public class OddIntegrationProperties {
+
+  String url;
+  String token;
+  String topicsRegex;
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/Oddrn.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/Oddrn.java
new file mode 100644
index 00000000000..d228843b21b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/Oddrn.java
@@ -0,0 +1,79 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import com.provectus.kafka.ui.model.KafkaCluster;
+import java.net.URI;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.experimental.UtilityClass;
+import org.opendatadiscovery.oddrn.Generator;
+import org.opendatadiscovery.oddrn.model.AwsS3Path;
+import org.opendatadiscovery.oddrn.model.KafkaConnectorPath;
+import org.opendatadiscovery.oddrn.model.KafkaPath;
+
+@UtilityClass
+public class Oddrn {
+
+  private static final Generator GENERATOR = new Generator();
+
+  String clusterOddrn(KafkaCluster cluster) {
+    return KafkaPath.builder()
+        .cluster(bootstrapServersForOddrn(cluster.getBootstrapServers()))
+        .build()
+        .oddrn();
+  }
+
+  KafkaPath topicOddrnPath(KafkaCluster cluster, String topic) {
+    return KafkaPath.builder()
+        .cluster(bootstrapServersForOddrn(cluster.getBootstrapServers()))
+        .topic(topic)
+        .build();
+  }
+
+  String topicOddrn(KafkaCluster cluster, String topic) {
+    return topicOddrnPath(cluster, topic).oddrn();
+  }
+
+  String awsS3Oddrn(String bucket, String key) {
+    return AwsS3Path.builder()
+        .bucket(bucket)
+        .key(key)
+        .build()
+        .oddrn();
+  }
+
+  String connectDataSourceOddrn(String connectUrl) {
+    return KafkaConnectorPath.builder()
+        .host(normalizedConnectHosts(connectUrl))
+        .build()
+        .oddrn();
+  }
+
+  private String normalizedConnectHosts(String connectUrlStr) {
+    return Stream.of(connectUrlStr.split(","))
+        .map(String::trim)
+        .sorted()
+        .map(url -> {
+          var uri = URI.create(url);
+          String host = uri.getHost();
+          String portSuffix = (uri.getPort() > 0 ? (":" + uri.getPort()) : "");
+          return host + portSuffix;
+        })
+        .collect(Collectors.joining(","));
+  }
+
+  String connectorOddrn(String connectUrl, String connectorName) {
+    return KafkaConnectorPath.builder()
+        .host(normalizedConnectHosts(connectUrl))
+        .connector(connectorName)
+        .build()
+        .oddrn();
+  }
+
+  private String bootstrapServersForOddrn(String bootstrapServers) {
+    return Stream.of(bootstrapServers.split(","))
+        .map(String::trim)
+        .sorted()
+        .collect(Collectors.joining(","));
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java
new file mode 100644
index 00000000000..ad72e6f1dce
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java
@@ -0,0 +1,111 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import com.google.common.collect.ImmutableMap;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.Statistics;
+import com.provectus.kafka.ui.service.StatisticsCache;
+import com.provectus.kafka.ui.service.integration.odd.schema.DataSetFieldsExtractors;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.admin.ConfigEntry;
+import org.apache.kafka.clients.admin.TopicDescription;
+import org.opendatadiscovery.client.model.DataEntity;
+import org.opendatadiscovery.client.model.DataEntityList;
+import org.opendatadiscovery.client.model.DataEntityType;
+import org.opendatadiscovery.client.model.DataSet;
+import org.opendatadiscovery.client.model.DataSetField;
+import org.opendatadiscovery.client.model.MetadataExtension;
+import org.opendatadiscovery.oddrn.model.KafkaPath;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@RequiredArgsConstructor
+class TopicsExporter {
+
+  private final Predicate<String> topicFilter;
+  private final StatisticsCache statisticsCache;
+
+  Flux<DataEntityList> export(KafkaCluster cluster) {
+    String clusterOddrn = Oddrn.clusterOddrn(cluster);
+    Statistics stats = statisticsCache.get(cluster);
+    return Flux.fromIterable(stats.getTopicDescriptions().keySet())
+        .filter(topicFilter)
+        .flatMap(topic -> createTopicDataEntity(cluster, topic, stats))
+        .buffer(100)
+        .map(topicsEntities ->
+            new DataEntityList()
+                .dataSourceOddrn(clusterOddrn)
+                .items(topicsEntities));
+  }
+
+  private Mono<DataEntity> createTopicDataEntity(KafkaCluster cluster, String topic, Statistics stats) {
+    KafkaPath topicOddrnPath = Oddrn.topicOddrnPath(cluster, topic);
+    return
+        Mono.zip(
+                getTopicSchema(cluster, topic, topicOddrnPath, true),
+                getTopicSchema(cluster, topic, topicOddrnPath, false)
+            )
+            .map(keyValueFields -> {
+                  var dataset = new DataSet();
+                  keyValueFields.getT1().forEach(dataset::addFieldListItem);
+                  keyValueFields.getT2().forEach(dataset::addFieldListItem);
+                  return new DataEntity()
+                      .name(topic)
+                      .description("Kafka topic \"%s\"".formatted(topic))
+                      .oddrn(Oddrn.topicOddrn(cluster, topic))
+                      .type(DataEntityType.KAFKA_TOPIC)
+                      .dataset(dataset)
+                      .addMetadataItem(
+                          new MetadataExtension()
+                              .schemaUrl(URI.create("wontbeused.oops"))
+                              .metadata(getTopicMetadata(topic, stats)));
+                }
+            );
+  }
+
+  private Map<String, Object> getNonDefaultConfigs(String topic, Statistics stats) {
+    List<ConfigEntry> config = stats.getTopicConfigs().get(topic);
+    if (config == null) {
+      return Map.of();
+    }
+    return config.stream()
+        .filter(c -> c.source() == ConfigEntry.ConfigSource.DYNAMIC_TOPIC_CONFIG)
+        .collect(Collectors.toMap(ConfigEntry::name, ConfigEntry::value));
+  }
+
+  private Map<String, Object> getTopicMetadata(String topic, Statistics stats) {
+    TopicDescription topicDescription = stats.getTopicDescriptions().get(topic);
+    return ImmutableMap.<String, Object>builder()
+        .put("partitions", topicDescription.partitions().size())
+        .put("replication_factor", topicDescription.partitions().get(0).replicas().size())
+        .putAll(getNonDefaultConfigs(topic, stats))
+        .build();
+  }
+
+  private Mono<List<DataSetField>> getTopicSchema(KafkaCluster cluster,
+                                                  String topic,
+                                                  KafkaPath topicOddrn,
+                                                  //currently we only retrieve value schema
+                                                  boolean isKey) {
+    if (cluster.getSchemaRegistryClient() == null) {
+      return Mono.just(List.of());
+    }
+    String subject = topic + (isKey ? "-key" : "-value");
+    return cluster.getSchemaRegistryClient()
+        .mono(client -> client.getSubjectVersion(subject, "latest"))
+        .map(subj -> DataSetFieldsExtractors.extract(subj, topicOddrn, isKey))
+        .onErrorResume(WebClientResponseException.NotFound.class, th -> Mono.just(List.of()))
+        .onErrorResume(th -> true, th -> {
+          log.warn("Error retrieving subject {} for cluster {}", subject, cluster.getName(), th);
+          return Mono.just(List.of());
+        });
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java
new file mode 100644
index 00000000000..538bbde1a8a
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java
@@ -0,0 +1,262 @@
+package com.provectus.kafka.ui.service.integration.odd.schema;
+
+import com.google.common.collect.ImmutableSet;
+import com.provectus.kafka.ui.service.integration.odd.Oddrn;
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.experimental.UtilityClass;
+import org.apache.avro.Schema;
+import org.opendatadiscovery.client.model.DataSetField;
+import org.opendatadiscovery.client.model.DataSetFieldType;
+import org.opendatadiscovery.oddrn.model.KafkaPath;
+
+@UtilityClass
+class AvroExtractor {
+
+  static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
+    var schema = new Schema.Parser().parse(subject.getSchema());
+    List<DataSetField> result = new ArrayList<>();
+    result.add(DataSetFieldsExtractors.rootField(topicOddrn, isKey));
+    extract(
+        schema,
+        topicOddrn.oddrn() + "/columns/" + (isKey ? "key" : "value"),
+        null,
+        null,
+        null,
+        false,
+        ImmutableSet.of(),
+        result
+    );
+    return result;
+  }
+
+  private void extract(Schema schema,
+                       String parentOddr,
+                       String oddrn, //null for root
+                       String name,
+                       String doc,
+                       Boolean nullable,
+                       ImmutableSet<String> registeredRecords,
+                       List<DataSetField> sink
+  ) {
+    switch (schema.getType()) {
+      case RECORD -> extractRecord(schema, parentOddr, oddrn, name, doc, nullable, registeredRecords, sink);
+      case UNION -> extractUnion(schema, parentOddr, oddrn, name, doc, registeredRecords, sink);
+      case ARRAY -> extractArray(schema, parentOddr, oddrn, name, doc, nullable, registeredRecords, sink);
+      case MAP -> extractMap(schema, parentOddr, oddrn, name, doc, nullable, registeredRecords, sink);
+      default -> extractPrimitive(schema, parentOddr, oddrn, name, doc, nullable, sink);
+    }
+  }
+
+  private DataSetField createDataSetField(String name,
+                                          String doc,
+                                          String parentOddrn,
+                                          String oddrn,
+                                          Schema schema,
+                                          Boolean nullable) {
+    return new DataSetField()
+        .name(name)
+        .description(doc)
+        .parentFieldOddrn(parentOddrn)
+        .oddrn(oddrn)
+        .type(mapSchema(schema, nullable));
+  }
+
+  private void extractRecord(Schema schema,
+                             String parentOddr,
+                             String oddrn, //null for root
+                             String name,
+                             String doc,
+                             Boolean nullable,
+                             ImmutableSet<String> registeredRecords,
+                             List<DataSetField> sink) {
+    boolean isRoot = oddrn == null;
+    if (!isRoot) {
+      sink.add(createDataSetField(name, doc, parentOddr, oddrn, schema, nullable));
+      if (registeredRecords.contains(schema.getFullName())) {
+        // avoiding recursion by checking if record already registered in parsing chain
+        return;
+      }
+    }
+    var newRegisteredRecords = ImmutableSet.<String>builder()
+        .addAll(registeredRecords)
+        .add(schema.getFullName())
+        .build();
+
+    schema.getFields().forEach(f ->
+        extract(
+            f.schema(),
+            isRoot ? parentOddr : oddrn,
+            isRoot
+                ? parentOddr + "/" + f.name()
+                : oddrn + "/fields/" + f.name(),
+            f.name(),
+            f.doc(),
+            false,
+            newRegisteredRecords,
+            sink
+        ));
+  }
+
+  private void extractUnion(Schema schema,
+                            String parentOddr,
+                            String oddrn, //null for root
+                            String name,
+                            String doc,
+                            ImmutableSet<String> registeredRecords,
+                            List<DataSetField> sink) {
+    boolean isRoot = oddrn == null;
+    boolean containsNull = schema.getTypes().stream().map(Schema::getType).anyMatch(t -> t == Schema.Type.NULL);
+    // if it is not root and there is only 2 values for union (null and smth else)
+    // we registering this field as optional without mentioning union
+    if (!isRoot && containsNull && schema.getTypes().size() == 2) {
+      var nonNullSchema = schema.getTypes().stream()
+          .filter(s -> s.getType() != Schema.Type.NULL)
+          .findFirst()
+          .orElseThrow(IllegalStateException::new);
+      extract(
+          nonNullSchema,
+          parentOddr,
+          oddrn,
+          name,
+          doc,
+          true,
+          registeredRecords,
+          sink
+      );
+      return;
+    }
+    oddrn = isRoot ? parentOddr + "/union" : oddrn;
+    if (isRoot) {
+      sink.add(createDataSetField("Avro root union", doc, parentOddr, oddrn, schema, containsNull));
+    } else {
+      sink.add(createDataSetField(name, doc, parentOddr, oddrn, schema, containsNull));
+    }
+    for (Schema t : schema.getTypes()) {
+      if (t.getType() != Schema.Type.NULL) {
+        extract(
+            t,
+            oddrn,
+            oddrn + "/values/" + t.getName(),
+            t.getName(),
+            t.getDoc(),
+            containsNull,
+            registeredRecords,
+            sink
+        );
+      }
+    }
+  }
+
+  private void extractArray(Schema schema,
+                            String parentOddr,
+                            String oddrn, //null for root
+                            String name,
+                            String doc,
+                            Boolean nullable,
+                            ImmutableSet<String> registeredRecords,
+                            List<DataSetField> sink) {
+    boolean isRoot = oddrn == null;
+    oddrn = isRoot ? parentOddr + "/array" : oddrn;
+    if (isRoot) {
+      sink.add(createDataSetField("Avro root Array", doc, parentOddr, oddrn, schema, nullable));
+    } else {
+      sink.add(createDataSetField(name, doc, parentOddr, oddrn, schema, nullable));
+    }
+    extract(
+        schema.getElementType(),
+        oddrn,
+        oddrn + "/items/" + schema.getElementType().getName(),
+        schema.getElementType().getName(),
+        schema.getElementType().getDoc(),
+        false,
+        registeredRecords,
+        sink
+    );
+  }
+
+  private void extractMap(Schema schema,
+                          String parentOddr,
+                          String oddrn, //null for root
+                          String name,
+                          String doc,
+                          Boolean nullable,
+                          ImmutableSet<String> registeredRecords,
+                          List<DataSetField> sink) {
+    boolean isRoot = oddrn == null;
+    oddrn = isRoot ? parentOddr + "/map" : oddrn;
+    if (isRoot) {
+      sink.add(createDataSetField("Avro root map", doc, parentOddr, oddrn, schema, nullable));
+    } else {
+      sink.add(createDataSetField(name, doc, parentOddr, oddrn, schema, nullable));
+    }
+    extract(
+        new Schema.Parser().parse("\"string\""),
+        oddrn,
+        oddrn + "/key",
+        "key",
+        null,
+        nullable,
+        registeredRecords,
+        sink
+    );
+    extract(
+        schema.getValueType(),
+        oddrn,
+        oddrn + "/value",
+        "value",
+        null,
+        nullable,
+        registeredRecords,
+        sink
+    );
+  }
+
+
+  private void extractPrimitive(Schema schema,
+                                String parentOddr,
+                                String oddrn, //null for root
+                                String name,
+                                String doc,
+                                Boolean nullable,
+                                List<DataSetField> sink) {
+    boolean isRoot = oddrn == null;
+    String primOddrn = isRoot ? (parentOddr + "/" + schema.getType()) : oddrn;
+    if (isRoot) {
+      sink.add(createDataSetField("Root avro " + schema.getType(),
+          doc, parentOddr, primOddrn, schema, nullable));
+    } else {
+      sink.add(createDataSetField(name, doc, parentOddr, primOddrn, schema, nullable));
+    }
+  }
+
+  private DataSetFieldType.TypeEnum mapType(Schema.Type type) {
+    return switch (type) {
+      case INT, LONG -> DataSetFieldType.TypeEnum.INTEGER;
+      case FLOAT, DOUBLE, FIXED -> DataSetFieldType.TypeEnum.NUMBER;
+      case STRING, ENUM -> DataSetFieldType.TypeEnum.STRING;
+      case BOOLEAN -> DataSetFieldType.TypeEnum.BOOLEAN;
+      case BYTES -> DataSetFieldType.TypeEnum.BINARY;
+      case ARRAY -> DataSetFieldType.TypeEnum.LIST;
+      case RECORD -> DataSetFieldType.TypeEnum.STRUCT;
+      case MAP -> DataSetFieldType.TypeEnum.MAP;
+      case UNION -> DataSetFieldType.TypeEnum.UNION;
+      case NULL -> DataSetFieldType.TypeEnum.UNKNOWN;
+    };
+  }
+
+  private DataSetFieldType mapSchema(Schema schema, Boolean nullable) {
+    return new DataSetFieldType()
+        .logicalType(logicalType(schema))
+        .isNullable(nullable)
+        .type(mapType(schema.getType()));
+  }
+
+  private String logicalType(Schema schema) {
+    return schema.getType() == Schema.Type.RECORD
+        ? schema.getFullName()
+        : schema.getType().toString().toLowerCase();
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java
new file mode 100644
index 00000000000..746f172b57f
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java
@@ -0,0 +1,38 @@
+package com.provectus.kafka.ui.service.integration.odd.schema;
+
+import com.provectus.kafka.ui.service.integration.odd.Oddrn;
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import com.provectus.kafka.ui.sr.model.SchemaType;
+import java.util.List;
+import java.util.Optional;
+import lombok.experimental.UtilityClass;
+import org.opendatadiscovery.client.model.DataSetField;
+import org.opendatadiscovery.client.model.DataSetFieldType;
+import org.opendatadiscovery.oddrn.model.KafkaPath;
+
+@UtilityClass
+public class DataSetFieldsExtractors {
+
+  public List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
+    SchemaType schemaType = Optional.ofNullable(subject.getSchemaType()).orElse(SchemaType.AVRO);
+    return switch (schemaType) {
+      case AVRO -> AvroExtractor.extract(subject, topicOddrn, isKey);
+      case JSON -> JsonSchemaExtractor.extract(subject, topicOddrn, isKey);
+      case PROTOBUF -> ProtoExtractor.extract(subject, topicOddrn, isKey);
+    };
+  }
+
+
+  DataSetField rootField(KafkaPath topicOddrn, boolean isKey) {
+    var rootOddrn = topicOddrn.oddrn() + "/columns/" + (isKey ? "key" : "value");
+    return new DataSetField()
+        .name(isKey ? "key" : "value")
+        .description("Topic's " + (isKey ? "key" : "value") + " schema")
+        .parentFieldOddrn(topicOddrn.oddrn())
+        .oddrn(rootOddrn)
+        .type(new DataSetFieldType()
+            .type(DataSetFieldType.TypeEnum.STRUCT)
+            .isNullable(true));
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java
new file mode 100644
index 00000000000..f92e1fc876b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java
@@ -0,0 +1,311 @@
+package com.provectus.kafka.ui.service.integration.odd.schema;
+
+import com.google.common.collect.ImmutableSet;
+import com.provectus.kafka.ui.service.integration.odd.Oddrn;
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import io.confluent.kafka.schemaregistry.json.JsonSchema;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import lombok.experimental.UtilityClass;
+import org.everit.json.schema.ArraySchema;
+import org.everit.json.schema.BooleanSchema;
+import org.everit.json.schema.CombinedSchema;
+import org.everit.json.schema.FalseSchema;
+import org.everit.json.schema.NullSchema;
+import org.everit.json.schema.NumberSchema;
+import org.everit.json.schema.ObjectSchema;
+import org.everit.json.schema.ReferenceSchema;
+import org.everit.json.schema.Schema;
+import org.everit.json.schema.StringSchema;
+import org.everit.json.schema.TrueSchema;
+import org.opendatadiscovery.client.model.DataSetField;
+import org.opendatadiscovery.client.model.DataSetFieldType;
+import org.opendatadiscovery.client.model.MetadataExtension;
+import org.opendatadiscovery.oddrn.model.KafkaPath;
+
+@UtilityClass
+class JsonSchemaExtractor {
+
+  static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
+    Schema schema = new JsonSchema(subject.getSchema()).rawSchema();
+    List<DataSetField> result = new ArrayList<>();
+    result.add(DataSetFieldsExtractors.rootField(topicOddrn, isKey));
+    extract(
+        schema,
+        topicOddrn.oddrn() + "/columns/" + (isKey ? "key" : "value"),
+        null,
+        null,
+        null,
+        ImmutableSet.of(),
+        result
+    );
+    return result;
+  }
+
+  private void extract(Schema schema,
+                       String parentOddr,
+                       String oddrn, //null for root
+                       String name,
+                       Boolean nullable,
+                       ImmutableSet<String> registeredRecords,
+                       List<DataSetField> sink) {
+    if (schema instanceof ReferenceSchema s) {
+      Optional.ofNullable(s.getReferredSchema())
+          .ifPresent(refSchema -> extract(refSchema, parentOddr, oddrn, name, nullable, registeredRecords, sink));
+    } else if (schema instanceof ObjectSchema s) {
+      extractObject(s, parentOddr, oddrn, name, nullable, registeredRecords, sink);
+    } else if (schema instanceof ArraySchema s) {
+      extractArray(s, parentOddr, oddrn, name, nullable, registeredRecords, sink);
+    } else if (schema instanceof CombinedSchema cs) {
+      extractCombined(cs, parentOddr, oddrn, name, nullable, registeredRecords, sink);
+    } else if (schema instanceof BooleanSchema
+        || schema instanceof NumberSchema
+        || schema instanceof StringSchema
+        || schema instanceof NullSchema
+    ) {
+      extractPrimitive(schema, parentOddr, oddrn, name, nullable, sink);
+    } else {
+      extractUnknown(schema, parentOddr, oddrn, name, nullable, sink);
+    }
+  }
+
+  private void extractPrimitive(Schema schema,
+                                String parentOddr,
+                                String oddrn, //null for root
+                                String name,
+                                Boolean nullable,
+                                List<DataSetField> sink) {
+    boolean isRoot = oddrn == null;
+    sink.add(
+        createDataSetField(
+            schema,
+            isRoot ? "Root JSON primitive" : name,
+            parentOddr,
+            isRoot ? (parentOddr + "/" + logicalTypeName(schema)) : oddrn,
+            mapType(schema),
+            logicalTypeName(schema),
+            nullable
+        )
+    );
+  }
+
+  private void extractUnknown(Schema schema,
+                              String parentOddr,
+                              String oddrn, //null for root
+                              String name,
+                              Boolean nullable,
+                              List<DataSetField> sink) {
+    boolean isRoot = oddrn == null;
+    sink.add(
+        createDataSetField(
+            schema,
+            isRoot ? "Root type " + logicalTypeName(schema) : name,
+            parentOddr,
+            isRoot ? (parentOddr + "/" + logicalTypeName(schema)) : oddrn,
+            DataSetFieldType.TypeEnum.UNKNOWN,
+            logicalTypeName(schema),
+            nullable
+        )
+    );
+  }
+
+  private void extractObject(ObjectSchema schema,
+                             String parentOddr,
+                             String oddrn, //null for root
+                             String name,
+                             Boolean nullable,
+                             ImmutableSet<String> registeredRecords,
+                             List<DataSetField> sink) {
+    boolean isRoot = oddrn == null;
+    // schemaLocation can be null for empty object schemas (like if it used in anyOf)
+    @Nullable var schemaLocation = schema.getSchemaLocation();
+    if (!isRoot) {
+      sink.add(createDataSetField(
+          schema,
+          name,
+          parentOddr,
+          oddrn,
+          DataSetFieldType.TypeEnum.STRUCT,
+          logicalTypeName(schema),
+          nullable
+      ));
+      if (schemaLocation != null && registeredRecords.contains(schemaLocation)) {
+        // avoiding recursion by checking if record already registered in parsing chain
+        return;
+      }
+    }
+
+    var newRegisteredRecords = schemaLocation == null
+        ? registeredRecords
+        : ImmutableSet.<String>builder()
+        .addAll(registeredRecords)
+        .add(schemaLocation)
+        .build();
+
+    schema.getPropertySchemas().forEach((propertyName, propertySchema) -> {
+      boolean required = schema.getRequiredProperties().contains(propertyName);
+      extract(
+          propertySchema,
+          isRoot ? parentOddr : oddrn,
+          isRoot
+              ? parentOddr + "/" + propertyName
+              : oddrn + "/fields/" + propertyName,
+          propertyName,
+          !required,
+          newRegisteredRecords,
+          sink
+      );
+    });
+  }
+
+  private void extractArray(ArraySchema schema,
+                            String parentOddr,
+                            String oddrn, //null for root
+                            String name,
+                            Boolean nullable,
+                            ImmutableSet<String> registeredRecords,
+                            List<DataSetField> sink) {
+    boolean isRoot = oddrn == null;
+    oddrn = isRoot ? parentOddr + "/array" : oddrn;
+    if (isRoot) {
+      sink.add(
+          createDataSetField(
+              schema,
+              "Json array root",
+              parentOddr,
+              oddrn,
+              DataSetFieldType.TypeEnum.LIST,
+              "array",
+              nullable
+          ));
+    } else {
+      sink.add(
+          createDataSetField(
+              schema,
+              name,
+              parentOddr,
+              oddrn,
+              DataSetFieldType.TypeEnum.LIST,
+              "array",
+              nullable
+          ));
+    }
+    @Nullable var itemsSchema = schema.getAllItemSchema();
+    if (itemsSchema != null) {
+      extract(
+          itemsSchema,
+          oddrn,
+          oddrn + "/items/" + logicalTypeName(itemsSchema),
+          logicalTypeName(itemsSchema),
+          false,
+          registeredRecords,
+          sink
+      );
+    }
+  }
+
+  private void extractCombined(CombinedSchema schema,
+                               String parentOddr,
+                               String oddrn, //null for root
+                               String name,
+                               Boolean nullable,
+                               ImmutableSet<String> registeredRecords,
+                               List<DataSetField> sink) {
+    String combineType = "unknown";
+    if (schema.getCriterion() == CombinedSchema.ALL_CRITERION) {
+      combineType = "allOf";
+    }
+    if (schema.getCriterion() == CombinedSchema.ANY_CRITERION) {
+      combineType = "anyOf";
+    }
+    if (schema.getCriterion() == CombinedSchema.ONE_CRITERION) {
+      combineType = "oneOf";
+    }
+
+    boolean isRoot = oddrn == null;
+    oddrn = isRoot ? (parentOddr + "/" + combineType) : (oddrn + "/" + combineType);
+    sink.add(
+        createDataSetField(
+            schema,
+            isRoot ? "Root %s".formatted(combineType) : name,
+            parentOddr,
+            oddrn,
+            DataSetFieldType.TypeEnum.UNION,
+            combineType,
+            nullable
+        ).addMetadataItem(new MetadataExtension()
+            .schemaUrl(URI.create("wontbeused.oops"))
+            .metadata(Map.of("criterion", combineType)))
+    );
+
+    for (Schema subschema : schema.getSubschemas()) {
+      extract(
+          subschema,
+          oddrn,
+          oddrn + "/values/" + logicalTypeName(subschema),
+          logicalTypeName(subschema),
+          nullable,
+          registeredRecords,
+          sink
+      );
+    }
+  }
+
+  private String getDescription(Schema schema) {
+    return Optional.ofNullable(schema.getTitle())
+        .orElse(schema.getDescription());
+  }
+
+  private String logicalTypeName(Schema schema) {
+    return schema.getClass()
+        .getSimpleName()
+        .replace("Schema", "");
+  }
+
+  private DataSetField createDataSetField(Schema schema,
+                                          String name,
+                                          String parentOddrn,
+                                          String oddrn,
+                                          DataSetFieldType.TypeEnum type,
+                                          String logicalType,
+                                          Boolean nullable) {
+    return new DataSetField()
+        .name(name)
+        .parentFieldOddrn(parentOddrn)
+        .oddrn(oddrn)
+        .description(getDescription(schema))
+        .type(
+            new DataSetFieldType()
+                .isNullable(nullable)
+                .logicalType(logicalType)
+                .type(type)
+        );
+  }
+
+  private DataSetFieldType.TypeEnum mapType(Schema type) {
+    if (type instanceof NumberSchema) {
+      return DataSetFieldType.TypeEnum.NUMBER;
+    }
+    if (type instanceof StringSchema) {
+      return DataSetFieldType.TypeEnum.STRING;
+    }
+    if (type instanceof BooleanSchema || type instanceof TrueSchema || type instanceof FalseSchema) {
+      return DataSetFieldType.TypeEnum.BOOLEAN;
+    }
+    if (type instanceof ObjectSchema) {
+      return DataSetFieldType.TypeEnum.STRUCT;
+    }
+    if (type instanceof ReferenceSchema s) {
+      return mapType(s.getReferredSchema());
+    }
+    if (type instanceof CombinedSchema) {
+      return DataSetFieldType.TypeEnum.UNION;
+    }
+    return DataSetFieldType.TypeEnum.UNKNOWN;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java
new file mode 100644
index 00000000000..b4a53782391
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java
@@ -0,0 +1,230 @@
+package com.provectus.kafka.ui.service.integration.odd.schema;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.protobuf.BoolValue;
+import com.google.protobuf.BytesValue;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.DoubleValue;
+import com.google.protobuf.Duration;
+import com.google.protobuf.FloatValue;
+import com.google.protobuf.Int32Value;
+import com.google.protobuf.Int64Value;
+import com.google.protobuf.StringValue;
+import com.google.protobuf.Timestamp;
+import com.google.protobuf.UInt32Value;
+import com.google.protobuf.UInt64Value;
+import com.google.protobuf.Value;
+import com.provectus.kafka.ui.service.integration.odd.Oddrn;
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import lombok.experimental.UtilityClass;
+import org.opendatadiscovery.client.model.DataSetField;
+import org.opendatadiscovery.client.model.DataSetFieldType;
+import org.opendatadiscovery.client.model.DataSetFieldType.TypeEnum;
+import org.opendatadiscovery.oddrn.model.KafkaPath;
+
+@UtilityClass
+class ProtoExtractor {
+
+  private static final Set<String> PRIMITIVES_WRAPPER_TYPE_NAMES = Set.of(
+      BoolValue.getDescriptor().getFullName(),
+      Int32Value.getDescriptor().getFullName(),
+      UInt32Value.getDescriptor().getFullName(),
+      Int64Value.getDescriptor().getFullName(),
+      UInt64Value.getDescriptor().getFullName(),
+      StringValue.getDescriptor().getFullName(),
+      BytesValue.getDescriptor().getFullName(),
+      FloatValue.getDescriptor().getFullName(),
+      DoubleValue.getDescriptor().getFullName()
+  );
+
+  List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
+    Descriptor schema = new ProtobufSchema(subject.getSchema()).toDescriptor();
+    List<DataSetField> result = new ArrayList<>();
+    result.add(DataSetFieldsExtractors.rootField(topicOddrn, isKey));
+    var rootOddrn = topicOddrn.oddrn() + "/columns/" + (isKey ? "key" : "value");
+    schema.getFields().forEach(f ->
+        extract(f,
+            rootOddrn,
+            rootOddrn + "/" + f.getName(),
+            f.getName(),
+            !f.isRequired(),
+            f.isRepeated(),
+            ImmutableSet.of(schema.getFullName()),
+            result
+        ));
+    return result;
+  }
+
+  private void extract(Descriptors.FieldDescriptor field,
+                       String parentOddr,
+                       String oddrn, //null for root
+                       String name,
+                       boolean nullable,
+                       boolean repeated,
+                       ImmutableSet<String> registeredRecords,
+                       List<DataSetField> sink) {
+    if (repeated) {
+      extractRepeated(field, parentOddr, oddrn, name, nullable, registeredRecords, sink);
+    } else if (field.getType() == Descriptors.FieldDescriptor.Type.MESSAGE) {
+      extractMessage(field, parentOddr, oddrn, name, nullable, registeredRecords, sink);
+    } else {
+      extractPrimitive(field, parentOddr, oddrn, name, nullable, sink);
+    }
+  }
+
+  // converts some(!) Protobuf Well-known type (from google.protobuf.* packages)
+  // see JsonFormat::buildWellKnownTypePrinters for impl details
+  private boolean extractProtoWellKnownType(Descriptors.FieldDescriptor field,
+                                            String parentOddr,
+                                            String oddrn, //null for root
+                                            String name,
+                                            boolean nullable,
+                                            List<DataSetField> sink) {
+    // all well-known types are messages
+    if (field.getType() != Descriptors.FieldDescriptor.Type.MESSAGE) {
+      return false;
+    }
+    String typeName = field.getMessageType().getFullName();
+    if (typeName.equals(Timestamp.getDescriptor().getFullName())) {
+      sink.add(createDataSetField(name, parentOddr, oddrn, TypeEnum.DATETIME, typeName, nullable));
+      return true;
+    }
+    if (typeName.equals(Duration.getDescriptor().getFullName())) {
+      sink.add(createDataSetField(name, parentOddr, oddrn, TypeEnum.DURATION, typeName, nullable));
+      return true;
+    }
+    if (typeName.equals(Value.getDescriptor().getFullName())) {
+      //TODO: use ANY type when it will appear in ODD
+      sink.add(createDataSetField(name, parentOddr, oddrn, TypeEnum.UNKNOWN, typeName, nullable));
+      return true;
+    }
+    if (PRIMITIVES_WRAPPER_TYPE_NAMES.contains(typeName)) {
+      var wrapped = field.getMessageType().findFieldByName("value");
+      sink.add(createDataSetField(name, parentOddr, oddrn, mapType(wrapped.getType()), typeName, true));
+      return true;
+    }
+    return false;
+  }
+
+  private void extractRepeated(Descriptors.FieldDescriptor field,
+                               String parentOddr,
+                               String oddrn, //null for root
+                               String name,
+                               boolean nullable,
+                               ImmutableSet<String> registeredRecords,
+                               List<DataSetField> sink) {
+    sink.add(createDataSetField(name, parentOddr, oddrn, TypeEnum.LIST, "repeated", nullable));
+
+    String itemName = field.getType() == Descriptors.FieldDescriptor.Type.MESSAGE
+        ? field.getMessageType().getName()
+        : field.getType().name().toLowerCase();
+
+    extract(
+        field,
+        oddrn,
+        oddrn + "/items/" + itemName,
+        itemName,
+        nullable,
+        false,
+        registeredRecords,
+        sink
+    );
+  }
+
+  private void extractMessage(Descriptors.FieldDescriptor field,
+                              String parentOddr,
+                              String oddrn, //null for root
+                              String name,
+                              boolean nullable,
+                              ImmutableSet<String> registeredRecords,
+                              List<DataSetField> sink) {
+    if (extractProtoWellKnownType(field, parentOddr, oddrn, name, nullable, sink)) {
+      return;
+    }
+    sink.add(createDataSetField(name, parentOddr, oddrn, TypeEnum.STRUCT, getLogicalTypeName(field), nullable));
+
+    String msgTypeName = field.getMessageType().getFullName();
+    if (registeredRecords.contains(msgTypeName)) {
+      // avoiding recursion by checking if record already registered in parsing chain
+      return;
+    }
+    var newRegisteredRecords = ImmutableSet.<String>builder()
+        .addAll(registeredRecords)
+        .add(msgTypeName)
+        .build();
+
+    field.getMessageType()
+        .getFields()
+        .forEach(f -> {
+          extract(f,
+              oddrn,
+              oddrn + "/fields/" + f.getName(),
+              f.getName(),
+              !f.isRequired(),
+              f.isRepeated(),
+              newRegisteredRecords,
+              sink
+          );
+        });
+  }
+
+  private void extractPrimitive(Descriptors.FieldDescriptor field,
+                                String parentOddr,
+                                String oddrn,
+                                String name,
+                                boolean nullable,
+                                List<DataSetField> sink) {
+    sink.add(
+        createDataSetField(
+            name,
+            parentOddr,
+            oddrn,
+            mapType(field.getType()),
+            getLogicalTypeName(field),
+            nullable
+        )
+    );
+  }
+
+  private String getLogicalTypeName(Descriptors.FieldDescriptor f) {
+    return f.getType() == Descriptors.FieldDescriptor.Type.MESSAGE
+        ? f.getMessageType().getFullName()
+        : f.getType().name().toLowerCase();
+  }
+
+  private DataSetField createDataSetField(String name,
+                                          String parentOddrn,
+                                          String oddrn,
+                                          TypeEnum type,
+                                          String logicalType,
+                                          Boolean nullable) {
+    return new DataSetField()
+        .name(name)
+        .parentFieldOddrn(parentOddrn)
+        .oddrn(oddrn)
+        .type(
+            new DataSetFieldType()
+                .isNullable(nullable)
+                .logicalType(logicalType)
+                .type(type)
+        );
+  }
+
+
+  private TypeEnum mapType(Descriptors.FieldDescriptor.Type type) {
+    return switch (type) {
+      case INT32, INT64, SINT32, SFIXED32, SINT64, UINT32, UINT64, FIXED32, FIXED64, SFIXED64 -> TypeEnum.INTEGER;
+      case FLOAT, DOUBLE -> TypeEnum.NUMBER;
+      case STRING, ENUM -> TypeEnum.STRING;
+      case BOOL -> TypeEnum.BOOLEAN;
+      case BYTES -> TypeEnum.BINARY;
+      case MESSAGE, GROUP -> TypeEnum.STRUCT;
+    };
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java
index 1066dc71786..926298271dd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java
@@ -9,7 +9,6 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-import org.springframework.web.reactive.function.client.WebClientRequestException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -25,6 +24,16 @@ public class ReactiveFailover<T> {
   private final Predicate<Throwable> failoverExceptionsPredicate;
   private final String noAvailablePublishersMsg;
 
+  // creates single-publisher failover (basically for tests usage)
+  public static <T> ReactiveFailover<T> createNoop(T publisher) {
+    return create(
+        List.of(publisher),
+        th -> true,
+        "publisher is not available",
+        DEFAULT_RETRY_GRACE_PERIOD_MS
+    );
+  }
+
   public static <T> ReactiveFailover<T> create(List<T> publishers,
                                                Predicate<Throwable> failoverExeptionsPredicate,
                                                String noAvailablePublishersMsg,
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java
index f71149d3d8f..a8271835219 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/KafkaConnectServiceTests.java
@@ -142,9 +142,8 @@ public void shouldListConnectors() {
         .uri("/api/clusters/{clusterName}/connects/{connectName}/connectors", LOCAL, connectName)
         .exchange()
         .expectStatus().isOk()
-        .expectBody()
-        .jsonPath(String.format("$[?(@ == '%s')]", connectorName))
-        .exists();
+        .expectBodyList(String.class)
+        .contains(connectorName);
   }
 
   @Test
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java
index 0cc5a36c068..232e1d37035 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java
@@ -26,6 +26,13 @@ void obfuscateCredentials() {
     assertThat(sanitizer.sanitize("main.consumer.sasl.jaas.config", "secret")).isEqualTo("******");
     assertThat(sanitizer.sanitize("database.password", "secret")).isEqualTo("******");
     assertThat(sanitizer.sanitize("basic.auth.user.info", "secret")).isEqualTo("******");
+
+    //AWS var sanitizing
+    assertThat(sanitizer.sanitize("aws.access.key.id", "secret")).isEqualTo("******");
+    assertThat(sanitizer.sanitize("aws.accessKeyId", "secret")).isEqualTo("******");
+    assertThat(sanitizer.sanitize("aws.secret.access.key", "secret")).isEqualTo("******");
+    assertThat(sanitizer.sanitize("aws.secretAccessKey", "secret")).isEqualTo("******");
+    assertThat(sanitizer.sanitize("aws.sessionToken", "secret")).isEqualTo("******");
   }
 
   @Test
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporterTest.java
new file mode 100644
index 00000000000..20c0d96ad16
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporterTest.java
@@ -0,0 +1,111 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.provectus.kafka.ui.connect.model.ConnectorTopics;
+import com.provectus.kafka.ui.model.ConnectDTO;
+import com.provectus.kafka.ui.model.ConnectorDTO;
+import com.provectus.kafka.ui.model.ConnectorTypeDTO;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.service.KafkaConnectService;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.opendatadiscovery.client.model.DataEntity;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+class ConnectorsExporterTest {
+
+  private static final KafkaCluster CLUSTER = KafkaCluster.builder()
+      .name("test cluster")
+      .bootstrapServers("localhost:9092")
+      .build();
+
+  private final KafkaConnectService kafkaConnectService = mock(KafkaConnectService.class);
+  private final ConnectorsExporter exporter = new ConnectorsExporter(kafkaConnectService);
+
+  @Test
+  void exportsConnectorsAsDataTransformers() {
+    ConnectDTO connect = new ConnectDTO();
+    connect.setName("testConnect");
+    connect.setAddress("http://kconnect:8083");
+
+    ConnectorDTO sinkConnector = new ConnectorDTO();
+    sinkConnector.setName("testSink");
+    sinkConnector.setType(ConnectorTypeDTO.SINK);
+    sinkConnector.setConnect(connect.getName());
+    sinkConnector.setConfig(
+        Map.of(
+            "connector.class", "FileStreamSink",
+            "file", "filePathHere",
+            "topic", "inputTopic"
+        )
+    );
+
+    ConnectorDTO sourceConnector = new ConnectorDTO();
+    sourceConnector.setName("testSource");
+    sourceConnector.setConnect(connect.getName());
+    sourceConnector.setType(ConnectorTypeDTO.SOURCE);
+    sourceConnector.setConfig(
+        Map.of(
+            "connector.class", "FileStreamSource",
+            "file", "filePathHere",
+            "topic", "outputTopic"
+        )
+    );
+
+    when(kafkaConnectService.getConnects(CLUSTER))
+        .thenReturn(Flux.just(connect));
+
+    when(kafkaConnectService.getConnectorNames(CLUSTER, connect.getName()))
+        .thenReturn(Flux.just(sinkConnector.getName(), sourceConnector.getName()));
+
+    when(kafkaConnectService.getConnector(CLUSTER, connect.getName(), sinkConnector.getName()))
+        .thenReturn(Mono.just(sinkConnector));
+
+    when(kafkaConnectService.getConnector(CLUSTER, connect.getName(), sourceConnector.getName()))
+        .thenReturn(Mono.just(sourceConnector));
+
+    when(kafkaConnectService.getConnectorTopics(CLUSTER, connect.getName(), sourceConnector.getName()))
+        .thenReturn(Mono.just(new ConnectorTopics().topics(List.of("outputTopic"))));
+
+    when(kafkaConnectService.getConnectorTopics(CLUSTER, connect.getName(), sinkConnector.getName()))
+        .thenReturn(Mono.just(new ConnectorTopics().topics(List.of("inputTopic"))));
+
+    StepVerifier.create(exporter.export(CLUSTER))
+        .assertNext(dataEntityList -> {
+          assertThat(dataEntityList.getDataSourceOddrn())
+              .isEqualTo("//kafkaconnect/host/kconnect:8083");
+
+          assertThat(dataEntityList.getItems())
+              .hasSize(2);
+
+          assertThat(dataEntityList.getItems())
+              .filteredOn(DataEntity::getOddrn, "//kafkaconnect/host/kconnect:8083/connectors/testSink")
+              .singleElement()
+              .satisfies(sink -> {
+                assertThat(sink.getMetadata().get(0).getMetadata())
+                    .containsOnlyKeys("type", "connector.class", "file", "topic");
+                assertThat(sink.getDataTransformer().getInputs()).contains(
+                    "//kafka/cluster/localhost:9092/topics/inputTopic");
+              });
+
+          assertThat(dataEntityList.getItems())
+              .filteredOn(DataEntity::getOddrn, "//kafkaconnect/host/kconnect:8083/connectors/testSource")
+              .singleElement()
+              .satisfies(source -> {
+                assertThat(source.getMetadata().get(0).getMetadata())
+                    .containsOnlyKeys("type", "connector.class", "file", "topic");
+                assertThat(source.getDataTransformer().getOutputs()).contains(
+                    "//kafka/cluster/localhost:9092/topics/outputTopic");
+              });
+
+        })
+        .verifyComplete();
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java
new file mode 100644
index 00000000000..4d512612a67
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java
@@ -0,0 +1,167 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.Statistics;
+import com.provectus.kafka.ui.service.StatisticsCache;
+import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import com.provectus.kafka.ui.sr.model.SchemaType;
+import com.provectus.kafka.ui.util.ReactiveFailover;
+import java.util.List;
+import java.util.Map;
+import org.apache.kafka.clients.admin.ConfigEntry;
+import org.apache.kafka.clients.admin.TopicDescription;
+import org.apache.kafka.common.Node;
+import org.apache.kafka.common.TopicPartitionInfo;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.opendatadiscovery.client.model.DataEntity;
+import org.opendatadiscovery.client.model.DataEntityType;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+class TopicsExporterTest {
+
+  private final KafkaSrClientApi schemaRegistryClientMock = mock(KafkaSrClientApi.class);
+
+  private final KafkaCluster cluster = KafkaCluster.builder()
+      .name("testCluster")
+      .bootstrapServers("localhost:9092,localhost:19092")
+      .schemaRegistryClient(ReactiveFailover.createNoop(schemaRegistryClientMock))
+      .build();
+
+  private Statistics stats;
+
+  private TopicsExporter topicsExporter;
+
+  @BeforeEach
+  void init() {
+    var statisticsCacheMock = mock(StatisticsCache.class);
+    when(statisticsCacheMock.get(cluster)).thenAnswer(invocationOnMock -> stats);
+
+    topicsExporter = new TopicsExporter(
+        topic -> !topic.startsWith("_"),
+        statisticsCacheMock
+    );
+  }
+
+  @Test
+  void doesNotExportTopicsWhichDontFitFiltrationRule() {
+    when(schemaRegistryClientMock.getSubjectVersion(anyString(), anyString()))
+        .thenReturn(Mono.error(new RuntimeException("Not found")));
+
+    stats = Statistics.empty()
+        .toBuilder()
+        .topicDescriptions(
+            Map.of(
+                "_hidden", new TopicDescription("_hidden", false, List.of(
+                    new TopicPartitionInfo(0, null, List.of(), List.of())
+                )),
+                "visible", new TopicDescription("visible", false, List.of(
+                    new TopicPartitionInfo(0, null, List.of(), List.of())
+                ))
+            )
+        )
+        .build();
+
+    StepVerifier.create(topicsExporter.export(cluster))
+        .assertNext(entityList -> {
+          assertThat(entityList.getDataSourceOddrn())
+              .isNotEmpty();
+
+          assertThat(entityList.getItems())
+              .hasSize(1)
+              .allSatisfy(e -> e.getOddrn().contains("visible"));
+        })
+        .verifyComplete();
+  }
+
+  @Test
+  void doesExportTopicData() {
+    when(schemaRegistryClientMock.getSubjectVersion("testTopic-value", "latest"))
+        .thenReturn(Mono.just(
+            new SchemaSubject()
+                .schema("\"string\"")
+                .schemaType(SchemaType.AVRO)
+        ));
+
+    when(schemaRegistryClientMock.getSubjectVersion("testTopic-key", "latest"))
+        .thenReturn(Mono.just(
+            new SchemaSubject()
+                .schema("\"int\"")
+                .schemaType(SchemaType.AVRO)
+        ));
+
+    stats = Statistics.empty()
+        .toBuilder()
+        .topicDescriptions(
+            Map.of(
+                "testTopic",
+                new TopicDescription(
+                    "testTopic",
+                    false,
+                    List.of(
+                        new TopicPartitionInfo(
+                            0,
+                            null,
+                            List.of(
+                                new Node(1, "host1", 9092),
+                                new Node(2, "host2", 9092)
+                            ),
+                            List.of())
+                    ))
+            )
+        )
+        .topicConfigs(
+            Map.of(
+                "testTopic", List.of(
+                    new ConfigEntry(
+                        "custom.config",
+                        "100500",
+                        ConfigEntry.ConfigSource.DYNAMIC_TOPIC_CONFIG,
+                        false,
+                        false,
+                        List.of(),
+                        ConfigEntry.ConfigType.INT,
+                        null
+                    )
+                )
+            )
+        )
+        .build();
+
+    StepVerifier.create(topicsExporter.export(cluster))
+        .assertNext(entityList -> {
+          assertThat(entityList.getItems())
+              .hasSize(1);
+
+          DataEntity topicEntity = entityList.getItems().get(0);
+          assertThat(topicEntity.getName()).isNotEmpty();
+          assertThat(topicEntity.getOddrn())
+              .isEqualTo("//kafka/cluster/localhost:19092,localhost:9092/topics/testTopic");
+          assertThat(topicEntity.getType()).isEqualTo(DataEntityType.KAFKA_TOPIC);
+          assertThat(topicEntity.getMetadata())
+              .hasSize(1)
+              .singleElement()
+              .satisfies(e ->
+                  assertThat(e.getMetadata())
+                      .containsExactlyInAnyOrderEntriesOf(
+                          Map.of(
+                              "partitions", 1,
+                              "replication_factor", 2,
+                              "custom.config", "100500")));
+
+          assertThat(topicEntity.getDataset()).isNotNull();
+          assertThat(topicEntity.getDataset().getFieldList())
+              .hasSize(4); // 2 field for key, 2 for value
+        })
+        .verifyComplete();
+  }
+
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractorTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractorTest.java
new file mode 100644
index 00000000000..d523d7cd417
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractorTest.java
@@ -0,0 +1,272 @@
+package com.provectus.kafka.ui.service.integration.odd.schema;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.opendatadiscovery.client.model.DataSetField;
+import org.opendatadiscovery.client.model.DataSetFieldType;
+import org.opendatadiscovery.oddrn.model.KafkaPath;
+
+class AvroExtractorTest {
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  void test(boolean isKey) {
+    var list = AvroExtractor.extract(
+        new SchemaSubject()
+            .schema("""
+                {
+                    "type": "record",
+                    "name": "Message",
+                    "namespace": "com.provectus.kafka",
+                    "fields":
+                    [
+                        {
+                            "name": "f1",
+                            "type":
+                            {
+                                "type": "array",
+                                "items":
+                                {
+                                    "type": "record",
+                                    "name": "ArrElement",
+                                    "fields":
+                                    [
+                                        {
+                                            "name": "longmap",
+                                            "type":
+                                            {
+                                                "type": "map",
+                                                "values": "long"
+                                            }
+                                        }
+                                    ]
+                                }
+                            }
+                        },
+                        {
+                            "name": "f2",
+                            "type":
+                            {
+                                "type": "record",
+                                "name": "InnerMessage",
+                                "fields":
+                                [
+                                    {
+                                        "name": "text",
+                                        "doc": "string field here",
+                                        "type": "string"
+                                    },
+                                    {
+                                        "name": "innerMsgRef",
+                                        "type": "InnerMessage"
+                                    },
+                                    {
+                                        "name": "nullable_union",
+                                        "type":
+                                        [
+                                            "null",
+                                            "string",
+                                            "int"
+                                        ],
+                                        "default": null
+                                    },
+                                    {
+                                        "name": "order_enum",
+                                        "type":
+                                        {
+                                            "type": "enum",
+                                            "name": "Suit",
+                                            "symbols":
+                                            [
+                                                "SPADES",
+                                                "HEARTS"
+                                            ]
+                                        }
+                                    },
+                                    {
+                                        "name": "str_list",
+                                        "type":
+                                        {
+                                            "type": "array",
+                                            "items": "string"
+                                        }
+                                    }
+                                ]
+                            }
+                        }
+                    ]
+                }
+                """),
+
+        KafkaPath.builder()
+            .cluster("localhost:9092")
+            .topic("someTopic")
+            .build(),
+        isKey
+    );
+
+    String baseOddrn = "//kafka/cluster/localhost:9092/topics/someTopic/columns/" + (isKey ? "key" : "value");
+
+    assertThat(list).contains(
+        DataSetFieldsExtractors.rootField(
+            KafkaPath.builder().cluster("localhost:9092").topic("someTopic").build(),
+            isKey
+        ),
+        new DataSetField()
+            .name("f1")
+            .parentFieldOddrn(baseOddrn)
+            .oddrn(baseOddrn + "/f1")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.LIST)
+                    .logicalType("array")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("ArrElement")
+            .parentFieldOddrn(baseOddrn + "/f1")
+            .oddrn(baseOddrn + "/f1/items/ArrElement")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.STRUCT)
+                    .logicalType("com.provectus.kafka.ArrElement")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("longmap")
+            .parentFieldOddrn(baseOddrn + "/f1/items/ArrElement")
+            .oddrn(baseOddrn + "/f1/items/ArrElement/fields/longmap")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.MAP)
+                    .logicalType("map")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("key")
+            .parentFieldOddrn(baseOddrn + "/f1/items/ArrElement/fields/longmap")
+            .oddrn(baseOddrn + "/f1/items/ArrElement/fields/longmap/key")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.STRING)
+                    .logicalType("string")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("value")
+            .parentFieldOddrn(baseOddrn + "/f1/items/ArrElement/fields/longmap")
+            .oddrn(baseOddrn + "/f1/items/ArrElement/fields/longmap/value")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.INTEGER)
+                    .logicalType("long")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("f2")
+            .parentFieldOddrn(baseOddrn)
+            .oddrn(baseOddrn + "/f2")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.STRUCT)
+                    .logicalType("com.provectus.kafka.InnerMessage")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("text")
+            .parentFieldOddrn(baseOddrn + "/f2")
+            .oddrn(baseOddrn + "/f2/fields/text")
+            .description("string field here")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.STRING)
+                    .logicalType("string")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("innerMsgRef")
+            .parentFieldOddrn(baseOddrn + "/f2")
+            .oddrn(baseOddrn + "/f2/fields/innerMsgRef")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.STRUCT)
+                    .logicalType("com.provectus.kafka.InnerMessage")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("nullable_union")
+            .parentFieldOddrn(baseOddrn + "/f2")
+            .oddrn(baseOddrn + "/f2/fields/nullable_union")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.UNION)
+                    .logicalType("union")
+                    .isNullable(true)
+            ),
+        new DataSetField()
+            .name("string")
+            .parentFieldOddrn(baseOddrn + "/f2/fields/nullable_union")
+            .oddrn(baseOddrn + "/f2/fields/nullable_union/values/string")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.STRING)
+                    .logicalType("string")
+                    .isNullable(true)
+            ),
+        new DataSetField()
+            .name("int")
+            .parentFieldOddrn(baseOddrn + "/f2/fields/nullable_union")
+            .oddrn(baseOddrn + "/f2/fields/nullable_union/values/int")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.INTEGER)
+                    .logicalType("int")
+                    .isNullable(true)
+            ),
+        new DataSetField()
+            .name("int")
+            .parentFieldOddrn(baseOddrn + "/f2/fields/nullable_union")
+            .oddrn(baseOddrn + "/f2/fields/nullable_union/values/int")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.INTEGER)
+                    .logicalType("int")
+                    .isNullable(true)
+            ),
+        new DataSetField()
+            .name("order_enum")
+            .parentFieldOddrn(baseOddrn + "/f2")
+            .oddrn(baseOddrn + "/f2/fields/order_enum")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.STRING)
+                    .logicalType("enum")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("str_list")
+            .parentFieldOddrn(baseOddrn + "/f2")
+            .oddrn(baseOddrn + "/f2/fields/str_list")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.LIST)
+                    .logicalType("array")
+                    .isNullable(false)
+            ),
+        new DataSetField()
+            .name("string")
+            .parentFieldOddrn(baseOddrn + "/f2/fields/str_list")
+            .oddrn(baseOddrn + "/f2/fields/str_list/items/string")
+            .type(
+                new DataSetFieldType()
+                    .type(DataSetFieldType.TypeEnum.STRING)
+                    .logicalType("string")
+                    .isNullable(false)
+            )
+    );
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractorTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractorTest.java
new file mode 100644
index 00000000000..7968e52e6dd
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractorTest.java
@@ -0,0 +1,145 @@
+package com.provectus.kafka.ui.service.integration.odd.schema;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.opendatadiscovery.client.model.DataSetField;
+import org.opendatadiscovery.client.model.DataSetFieldType;
+import org.opendatadiscovery.client.model.MetadataExtension;
+import org.opendatadiscovery.oddrn.model.KafkaPath;
+
+class JsonSchemaExtractorTest {
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  void test(boolean isKey) {
+    String jsonSchema = """
+        {
+            "$id": "http://example.com/test.TestMsg",
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "type": "object",
+            "required": [ "int32_field" ],
+            "properties":
+            {
+                "int32_field": { "type": "integer", "title": "field title" },
+                "lst_s_field": { "type": "array", "items": { "type": "string" }, "description": "field descr" },
+                "untyped_struct_field": { "type": "object", "properties": {} },
+                "union_field": { "type": [ "number", "object", "null" ] },
+                "struct_field": {
+                    "type": "object",
+                    "properties": {
+                        "bool_field": { "type": "boolean" }
+                    }
+                }
+            }
+        }
+        """;
+    var fields = JsonSchemaExtractor.extract(
+        new SchemaSubject().schema(jsonSchema),
+        KafkaPath.builder()
+            .cluster("localhost:9092")
+            .topic("someTopic")
+            .build(),
+        isKey
+    );
+
+    String baseOddrn = "//kafka/cluster/localhost:9092/topics/someTopic/columns/" + (isKey ? "key" : "value");
+
+    assertThat(fields).contains(
+        DataSetFieldsExtractors.rootField(
+            KafkaPath.builder().cluster("localhost:9092").topic("someTopic").build(),
+            isKey
+        ),
+        new DataSetField()
+            .name("int32_field")
+            .parentFieldOddrn(baseOddrn)
+            .oddrn(baseOddrn + "/int32_field")
+            .description("field title")
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.NUMBER)
+                .logicalType("Number")
+                .isNullable(false)),
+        new DataSetField()
+            .name("lst_s_field")
+            .parentFieldOddrn(baseOddrn)
+            .oddrn(baseOddrn + "/lst_s_field")
+            .description("field descr")
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.LIST)
+                .logicalType("array")
+                .isNullable(true)),
+        new DataSetField()
+            .name("String")
+            .parentFieldOddrn(baseOddrn + "/lst_s_field")
+            .oddrn(baseOddrn + "/lst_s_field/items/String")
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.STRING)
+                .logicalType("String")
+                .isNullable(false)),
+        new DataSetField()
+            .name("untyped_struct_field")
+            .parentFieldOddrn(baseOddrn)
+            .oddrn(baseOddrn + "/untyped_struct_field")
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.STRUCT)
+                .logicalType("Object")
+                .isNullable(true)),
+        new DataSetField()
+            .name("union_field")
+            .parentFieldOddrn(baseOddrn)
+            .oddrn(baseOddrn + "/union_field/anyOf")
+            .metadata(List.of(new MetadataExtension()
+                .schemaUrl(URI.create("wontbeused.oops"))
+                .metadata(Map.of("criterion", "anyOf"))))
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.UNION)
+                .logicalType("anyOf")
+                .isNullable(true)),
+        new DataSetField()
+            .name("Number")
+            .parentFieldOddrn(baseOddrn + "/union_field/anyOf")
+            .oddrn(baseOddrn + "/union_field/anyOf/values/Number")
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.NUMBER)
+                .logicalType("Number")
+                .isNullable(true)),
+        new DataSetField()
+            .name("Object")
+            .parentFieldOddrn(baseOddrn + "/union_field/anyOf")
+            .oddrn(baseOddrn + "/union_field/anyOf/values/Object")
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.STRUCT)
+                .logicalType("Object")
+                .isNullable(true)),
+        new DataSetField()
+            .name("Null")
+            .parentFieldOddrn(baseOddrn + "/union_field/anyOf")
+            .oddrn(baseOddrn + "/union_field/anyOf/values/Null")
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.UNKNOWN)
+                .logicalType("Null")
+                .isNullable(true)),
+        new DataSetField()
+            .name("struct_field")
+            .parentFieldOddrn(baseOddrn)
+            .oddrn(baseOddrn + "/struct_field")
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.STRUCT)
+                .logicalType("Object")
+                .isNullable(true)),
+        new DataSetField()
+            .name("bool_field")
+            .parentFieldOddrn(baseOddrn + "/struct_field")
+            .oddrn(baseOddrn + "/struct_field/fields/bool_field")
+            .type(new DataSetFieldType()
+                .type(DataSetFieldType.TypeEnum.BOOLEAN)
+                .logicalType("Boolean")
+                .isNullable(true))
+    );
+  }
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractorTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractorTest.java
new file mode 100644
index 00000000000..cbb97a859c2
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractorTest.java
@@ -0,0 +1,187 @@
+package com.provectus.kafka.ui.service.integration.odd.schema;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.opendatadiscovery.client.model.DataSetField;
+import org.opendatadiscovery.client.model.DataSetFieldType;
+import org.opendatadiscovery.oddrn.model.KafkaPath;
+
+class ProtoExtractorTest {
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  void test(boolean isKey) {
+    String protoSchema = """
+        syntax = "proto3";
+        package test;
+
+        import "google/protobuf/timestamp.proto";
+        import "google/protobuf/duration.proto";
+        import "google/protobuf/struct.proto";
+        import "google/protobuf/wrappers.proto";
+
+        message TestMsg {
+            map<string, int32> mapField = 100;
+            int32 int32_field = 2;
+            bool bool_field = 3;
+            SampleEnum enum_field = 4;
+
+            enum SampleEnum {
+                ENUM_V1 = 0;
+                ENUM_V2 = 1;
+            }
+
+            google.protobuf.Timestamp ts_field = 5;
+            google.protobuf.Duration duration_field = 8;
+
+            oneof some_oneof1 {
+                google.protobuf.Value one_of_v1 = 9;
+                google.protobuf.Value one_of_v2 = 10;
+            }
+            // wrapper field:
+            google.protobuf.Int64Value int64_w_field = 11;
+
+            //embedded msg
+            EmbeddedMsg emb = 19;
+
+            message EmbeddedMsg {
+                int32 emb_f1 = 1;
+                TestMsg outer_ref = 2;
+            }
+        }""";
+
+    var list = ProtoExtractor.extract(
+        new SchemaSubject()
+            .schema(protoSchema),
+        KafkaPath.builder()
+            .cluster("localhost:9092")
+            .topic("someTopic")
+            .build(),
+        isKey
+    );
+
+    String baseOddrn = "//kafka/cluster/localhost:9092/topics/someTopic/columns/" + (isKey ? "key" : "value");
+
+    assertThat(list)
+        .contains(
+            DataSetFieldsExtractors.rootField(
+                KafkaPath.builder().cluster("localhost:9092").topic("someTopic").build(),
+                isKey
+            ),
+            new DataSetField()
+                .name("mapField")
+                .parentFieldOddrn(baseOddrn)
+                .oddrn(baseOddrn + "/mapField")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.LIST)
+                        .logicalType("repeated")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("int32_field")
+                .parentFieldOddrn(baseOddrn)
+                .oddrn(baseOddrn + "/int32_field")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.INTEGER)
+                        .logicalType("int32")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("enum_field")
+                .parentFieldOddrn(baseOddrn)
+                .oddrn(baseOddrn + "/enum_field")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.STRING)
+                        .logicalType("enum")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("ts_field")
+                .parentFieldOddrn(baseOddrn)
+                .oddrn(baseOddrn + "/ts_field")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.DATETIME)
+                        .logicalType("google.protobuf.Timestamp")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("duration_field")
+                .parentFieldOddrn(baseOddrn)
+                .oddrn(baseOddrn + "/duration_field")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.DURATION)
+                        .logicalType("google.protobuf.Duration")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("one_of_v1")
+                .parentFieldOddrn(baseOddrn)
+                .oddrn(baseOddrn + "/one_of_v1")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.UNKNOWN)
+                        .logicalType("google.protobuf.Value")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("one_of_v2")
+                .parentFieldOddrn(baseOddrn)
+                .oddrn(baseOddrn + "/one_of_v2")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.UNKNOWN)
+                        .logicalType("google.protobuf.Value")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("int64_w_field")
+                .parentFieldOddrn(baseOddrn)
+                .oddrn(baseOddrn + "/int64_w_field")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.INTEGER)
+                        .logicalType("google.protobuf.Int64Value")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("emb")
+                .parentFieldOddrn(baseOddrn)
+                .oddrn(baseOddrn + "/emb")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.STRUCT)
+                        .logicalType("test.TestMsg.EmbeddedMsg")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("emb_f1")
+                .parentFieldOddrn(baseOddrn + "/emb")
+                .oddrn(baseOddrn + "/emb/fields/emb_f1")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.INTEGER)
+                        .logicalType("int32")
+                        .isNullable(true)
+                ),
+            new DataSetField()
+                .name("outer_ref")
+                .parentFieldOddrn(baseOddrn + "/emb")
+                .oddrn(baseOddrn + "/emb/fields/outer_ref")
+                .type(
+                    new DataSetFieldType()
+                        .type(DataSetFieldType.TypeEnum.STRUCT)
+                        .logicalType("test.TestMsg")
+                        .isNullable(true)
+                )
+        );
+  }
+
+}
diff --git a/pom.xml b/pom.xml
index 9abb41a865d..9266c2c14fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,8 @@
         <spring-boot.version>2.7.5</spring-boot.version>
         <spring-security.version>5.7.5</spring-security.version>
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
+        <odd-oddrn-generator.version>0.1.15</odd-oddrn-generator.version>
+        <odd-oddrn-client.version>0.1.19</odd-oddrn-client.version>
 
         <!-- Test dependency versions -->
         <junit.version>5.9.1</junit.version>

From b5e3d1f92825c05942d950d8e1383bba4834cf2f Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 6 Mar 2023 12:49:38 +0400
Subject: [PATCH 422/734] [FE] Brokers: fix missing tooltip for config source
 (#3356)

* .

* ..

* added getReferenceProps getFloatingProps

* testing

* testing2

* testing3

* added autoUpdate

* added @floating-ui/react

* removed @floating-ui/react-dom-interactions

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 kafka-ui-react-app/package.json               |  2 +-
 kafka-ui-react-app/pnpm-lock.yaml             | 37 +++++++++++--------
 .../common/ActionComponent/ActionComponent.ts |  2 +-
 .../src/components/common/Tooltip/Tooltip.tsx | 16 ++++----
 .../src/lib/hooks/useActionTooltip.ts         |  2 +-
 5 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 94759221dfd..f4f5bf855f1 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -7,7 +7,7 @@
     "@babel/core": "^7.16.0",
     "@babel/plugin-syntax-flow": "^7.18.6",
     "@babel/plugin-transform-react-jsx": "^7.18.6",
-    "@floating-ui/react-dom-interactions": "^0.10.3",
+    "@floating-ui/react": "^0.19.2",
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
     "@microsoft/fetch-event-source": "^2.0.1",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index eb9b03c0447..41d370327b2 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -7,7 +7,7 @@ specifiers:
   '@babel/preset-env': ^7.18.2
   '@babel/preset-react': ^7.17.12
   '@babel/preset-typescript': ^7.17.12
-  '@floating-ui/react-dom-interactions': ^0.10.3
+  '@floating-ui/react': ^0.19.2
   '@hookform/error-message': ^2.0.0
   '@hookform/resolvers': ^2.7.1
   '@jest/types': ^29.0.3
@@ -98,7 +98,7 @@ dependencies:
   '@babel/core': 7.18.2
   '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.2
   '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
-  '@floating-ui/react-dom-interactions': 0.10.3_ohobp6rpsmerwlq5ipwfh5yigy
+  '@floating-ui/react': 0.19.2_ohobp6rpsmerwlq5ipwfh5yigy
   '@hookform/error-message': 2.0.0_l2dcsysovzdujulgxvsen7vbsm
   '@hookform/resolvers': 2.8.9_react-hook-form@7.6.9
   '@microsoft/fetch-event-source': 2.0.1
@@ -2886,39 +2886,40 @@ packages:
       - supports-color
     dev: true
 
-  /@floating-ui/core/1.0.1:
-    resolution: {integrity: sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA==}
+  /@floating-ui/core/1.2.1:
+    resolution: {integrity: sha512-LSqwPZkK3rYfD7GKoIeExXOyYx6Q1O4iqZWwIehDNuv3Dv425FIAE8PRwtAx1imEolFTHgBEcoFHm9MDnYgPCg==}
     dev: false
 
-  /@floating-ui/dom/1.0.4:
-    resolution: {integrity: sha512-maYJRv+sAXTy4K9mzdv0JPyNW5YPVHrqtY90tEdI6XNpuLOP26Ci2pfwPsKBA/Wh4Z3FX5sUrtUFTdMYj9v+ug==}
+  /@floating-ui/dom/1.2.1:
+    resolution: {integrity: sha512-Rt45SmRiV8eU+xXSB9t0uMYiQ/ZWGE/jumse2o3i5RGlyvcbqOF4q+1qBnzLE2kZ5JGhq0iMkcGXUKbFe7MpTA==}
     dependencies:
-      '@floating-ui/core': 1.0.1
+      '@floating-ui/core': 1.2.1
     dev: false
 
-  /@floating-ui/react-dom-interactions/0.10.3_ohobp6rpsmerwlq5ipwfh5yigy:
-    resolution: {integrity: sha512-UEHqdnzyoiWNU5az/tAljr9iXFzN18DcvpMqW+/cXz4FEhDEB1ogLtWldOWCujLerPBnSRocADALafelOReMpw==}
+  /@floating-ui/react-dom/1.3.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-htwHm67Ji5E/pROEAr7f8IKFShuiCKHwUC/UY4vC3I5jiSvGFAYnSYiZO5MlGmads+QqvUkR9ANHEguGrDv72g==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
     dependencies:
-      '@floating-ui/react-dom': 1.0.0_ef5jwxihqo6n7gxfmzogljlgcm
-      aria-hidden: 1.2.1_7cpxmzzodpxnolj5zcc5cr63ji
+      '@floating-ui/dom': 1.2.1
       react: 18.1.0
       react-dom: 18.1.0_react@18.1.0
-    transitivePeerDependencies:
-      - '@types/react'
     dev: false
 
-  /@floating-ui/react-dom/1.0.0_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-uiOalFKPG937UCLm42RxjESTWUVpbbatvlphQAU6bsv+ence6IoVG8JOUZcy8eW81NkU+Idiwvx10WFLmR4MIg==}
+  /@floating-ui/react/0.19.2_ohobp6rpsmerwlq5ipwfh5yigy:
+    resolution: {integrity: sha512-JyNk4A0Ezirq8FlXECvRtQOX/iBe5Ize0W/pLkrZjfHW9GUV7Xnq6zm6fyZuQzaHHqEnVizmvlA96e1/CkZv+w==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
     dependencies:
-      '@floating-ui/dom': 1.0.4
+      '@floating-ui/react-dom': 1.3.0_ef5jwxihqo6n7gxfmzogljlgcm
+      aria-hidden: 1.2.1_7cpxmzzodpxnolj5zcc5cr63ji
       react: 18.1.0
       react-dom: 18.1.0_react@18.1.0
+      tabbable: 6.1.1
+    transitivePeerDependencies:
+      - '@types/react'
     dev: false
 
   /@hookform/error-message/2.0.0_l2dcsysovzdujulgxvsen7vbsm:
@@ -8481,6 +8482,10 @@ packages:
       tslib: 2.4.0
     dev: true
 
+  /tabbable/6.1.1:
+    resolution: {integrity: sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==}
+    dev: false
+
   /tapable/2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.ts b/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.ts
index 346b916ca1b..4d6e593ef29 100644
--- a/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.ts
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/ActionComponent.ts
@@ -1,4 +1,4 @@
-import { Placement } from '@floating-ui/react-dom-interactions';
+import { Placement } from '@floating-ui/react';
 import { Action, ResourceType } from 'generated-sources';
 
 export interface ActionComponentProps {
diff --git a/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
index cd76f4cc4f4..4c22cd72fdf 100644
--- a/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
+++ b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
@@ -4,7 +4,7 @@ import {
   useHover,
   useInteractions,
   Placement,
-} from '@floating-ui/react-dom-interactions';
+} from '@floating-ui/react';
 
 import * as S from './Tooltip.styled';
 
@@ -16,26 +16,28 @@ export interface PropsTypes {
 
 const Tooltip: React.FC<PropsTypes> = ({ value, content, placement }) => {
   const [open, setOpen] = useState(false);
-  const { x, y, reference, floating, strategy, context } = useFloating({
+  const { x, y, refs, strategy, context } = useFloating({
     open,
     onOpenChange: setOpen,
     placement,
   });
-
-  useInteractions([useHover(context)]);
-
+  const hover = useHover(context);
+  const { getReferenceProps, getFloatingProps } = useInteractions([hover]);
   return (
     <>
-      <S.Wrapper ref={reference}>{value}</S.Wrapper>
+      <div ref={refs.setReference} {...getReferenceProps()}>
+        <S.Wrapper>{value}</S.Wrapper>
+      </div>
       {open && (
         <S.MessageTooltip
-          ref={floating}
+          ref={refs.setFloating}
           style={{
             position: strategy,
             top: y ?? 0,
             left: x ?? 0,
             width: 'max-content',
           }}
+          {...getFloatingProps()}
         >
           {content}
         </S.MessageTooltip>
diff --git a/kafka-ui-react-app/src/lib/hooks/useActionTooltip.ts b/kafka-ui-react-app/src/lib/hooks/useActionTooltip.ts
index f8f84988989..3fcb7ec48bc 100644
--- a/kafka-ui-react-app/src/lib/hooks/useActionTooltip.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useActionTooltip.ts
@@ -6,7 +6,7 @@ import {
   useFloating,
   useHover,
   useInteractions,
-} from '@floating-ui/react-dom-interactions';
+} from '@floating-ui/react';
 
 export function useActionTooltip(isDisabled?: boolean, placement?: Placement) {
   const [open, setOpen] = useState(false);

From 18c046af5b8e6d639af921dacb664b30d0b0f44b Mon Sep 17 00:00:00 2001
From: Snowfox0618 <60497052+Snowfox0618@users.noreply.github.com>
Date: Mon, 6 Mar 2023 16:50:58 +0800
Subject: [PATCH 423/734] [FE] Fix number of partitions field validation issue
 (#3400)

* Now user can only input valid digits, and '-' is not allowed in positive-only inputs.

* Fix ISSUE#3319

Now user can only input valid digits, and '-' is not allowed in positive-only inputs.

* Revert "Fix ISSUE#3319"

This reverts commit a4e34f5af3b4f049bc19089cfa53b7a99aafb0cf.

* Fix ISSUE#3319
Created a helper function, and added a unit test to cover it.

* Fix ISSUE#3319
Located the helper function outside the component, and renamed some unit tests to make their meaning more clear.

* Fix ISSUE#3319
- Added an attribute 'integerOnly' to component 'Input', to represent whether this input component instance will accept decimal.
- Improved input-check function and paste-check function, to avoid invalid number format (like '3-3', '3.3.3').
- Added new unit tests to test new input-check and paste-check functions.
- Added attribute 'integerOnly' to Input instances in the TopicForm component.
---
 .../Topics/shared/Form/TopicForm.tsx          |   8 +
 .../src/components/common/Input/Input.tsx     | 116 +++++++++++--
 .../common/Input/__tests__/Input.spec.tsx     | 159 ++++++++++++++++--
 .../common/NewTable/__test__/Table.spec.tsx   |  11 ++
 4 files changed, 269 insertions(+), 25 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index ae9d429236a..e8d7f1b844a 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -116,6 +116,8 @@ const TopicForm: React.FC<Props> = ({
                   placeholder="Number of partitions"
                   min="1"
                   name="partitions"
+                  positiveOnly
+                  integerOnly
                 />
                 <FormError>
                   <ErrorMessage errors={errors} name="partitions" />
@@ -161,6 +163,8 @@ const TopicForm: React.FC<Props> = ({
               placeholder="Min In Sync Replicas"
               min="1"
               name="minInSyncReplicas"
+              positiveOnly
+              integerOnly
             />
             <FormError>
               <ErrorMessage errors={errors} name="minInSyncReplicas" />
@@ -177,6 +181,8 @@ const TopicForm: React.FC<Props> = ({
                 placeholder="Replication Factor"
                 min="1"
                 name="replicationFactor"
+                positiveOnly
+                integerOnly
               />
               <FormError>
                 <ErrorMessage errors={errors} name="replicationFactor" />
@@ -227,6 +233,8 @@ const TopicForm: React.FC<Props> = ({
               placeholder="Maximum message size"
               min="1"
               name="maxMessageBytes"
+              positiveOnly
+              integerOnly
             />
             <FormError>
               <ErrorMessage errors={errors} name="maxMessageBytes" />
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.tsx b/kafka-ui-react-app/src/components/common/Input/Input.tsx
index 932f954aa5c..f5049e69618 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/Input.tsx
@@ -11,6 +11,87 @@ export interface InputProps
   hookFormOptions?: RegisterOptions;
   search?: boolean;
   positiveOnly?: boolean;
+
+  // Some may only accept integer, like `Number of Partitions`
+  // some may accept decimal
+  integerOnly?: boolean;
+}
+
+function inputNumberCheck(
+  key: string,
+  positiveOnly: boolean,
+  integerOnly: boolean,
+  getValues: (name: string) => string,
+  componentName: string
+) {
+  let isValid = true;
+  if (!((key >= '0' && key <= '9') || key === '-' || key === '.')) {
+    // If not a valid digit char.
+    isValid = false;
+  } else {
+    // If there is any restriction.
+    if (positiveOnly) {
+      isValid = !(key === '-');
+    }
+    if (isValid && integerOnly) {
+      isValid = !(key === '.');
+    }
+
+    // Check invalid format
+    const value = getValues(componentName);
+
+    if (isValid && (key === '-' || key === '.')) {
+      if (!positiveOnly) {
+        if (key === '-') {
+          if (value !== '') {
+            // '-' should not appear anywhere except the start of the string
+            isValid = false;
+          }
+        }
+      }
+      if (!integerOnly) {
+        if (key === '.') {
+          if (value === '' || value.indexOf('.') !== -1) {
+            // '.' should not appear at the start of the string or appear twice
+            isValid = false;
+          }
+        }
+      }
+    }
+  }
+  return isValid;
+}
+
+function pasteNumberCheck(
+  text: string,
+  positiveOnly: boolean,
+  integerOnly: boolean
+) {
+  let value: string;
+  value = text;
+  let sign = '';
+  if (!positiveOnly) {
+    if (value.charAt(0) === '-') {
+      sign = '-';
+    }
+  }
+  if (integerOnly) {
+    value = value.replace(/\D/g, '');
+  } else {
+    value = value.replace(/[^\d.]/g, '');
+    if (value.indexOf('.') !== value.lastIndexOf('.')) {
+      const strs = value.split('.');
+      value = '';
+      for (let i = 0; i < strs.length; i += 1) {
+        value += strs[i];
+        if (i === 0) {
+          value += '.';
+        }
+      }
+    }
+  }
+  value = sign + value;
+  return value;
 }
 
 const Input: React.FC<InputProps> = ({
@@ -20,17 +101,27 @@ const Input: React.FC<InputProps> = ({
   inputSize = 'L',
   type,
   positiveOnly,
+  integerOnly,
   ...rest
 }) => {
   const methods = useFormContext();
+
   const keyPressEventHandler = (
     event: React.KeyboardEvent<HTMLInputElement>
   ) => {
-    const { key, code } = event;
+    const { key } = event;
     if (type === 'number') {
-      // Manualy prevent input of 'e' character for all number inputs
+      // Manually prevent input of non-digit and non-minus for all number inputs
       // and prevent input of negative numbers for positiveOnly inputs
-      if (key === 'e' || (positiveOnly && (key === '-' || code === 'Minus'))) {
+      if (
+        !inputNumberCheck(
+          key,
+          typeof positiveOnly === 'boolean' ? positiveOnly : false,
+          typeof integerOnly === 'boolean' ? integerOnly : false,
+          methods.getValues,
+          typeof name === 'string' ? name : ''
+        )
+      ) {
         event.preventDefault();
       }
     }
@@ -38,17 +129,14 @@ const Input: React.FC<InputProps> = ({
   const pasteEventHandler = (event: React.ClipboardEvent<HTMLInputElement>) => {
     if (type === 'number') {
       const { clipboardData } = event;
-      const text = clipboardData.getData('Text');
-      // replace all non-digit characters with empty string
-      let value = text.replace(/[^\d.]/g, '');
-      if (positiveOnly) {
-        // check if value is negative
-        const parsedData = parseFloat(value);
-        if (parsedData < 0) {
-          // remove minus sign
-          value = String(Math.abs(parsedData));
-        }
-      }
+      // The 'clipboardData' does not have key 'Text', but has key 'text' instead.
+      const text = clipboardData.getData('text');
+      // Check the format of pasted text.
+      const value = pasteNumberCheck(
+        text,
+        typeof positiveOnly === 'boolean' ? positiveOnly : false,
+        typeof integerOnly === 'boolean' ? integerOnly : false
+      );
       // if paste value contains non-numeric characters or
       // negative for positiveOnly fields then prevent paste
       if (value !== text) {
diff --git a/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx b/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx
index 3082f6f610a..0254196965d 100644
--- a/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/__tests__/Input.spec.tsx
@@ -4,12 +4,23 @@ import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
 import userEvent from '@testing-library/user-event';
 
+// Mock useFormContext
+let component: HTMLInputElement;
+
 const setupWrapper = (props?: Partial<InputProps>) => (
   <Input name="test" {...props} />
 );
 jest.mock('react-hook-form', () => ({
   useFormContext: () => ({
     register: jest.fn(),
+
+    // Mock methods.getValues and methods.setValue
+    getValues: jest.fn(() => {
+      return component.value;
+    }),
+    setValue: jest.fn((key, val) => {
+      component.value = val;
+    }),
   }),
 }));
 
@@ -23,20 +34,146 @@ describe('Custom Input', () => {
     });
   });
   describe('number', () => {
-    const getInput = () => screen.getByRole('spinbutton');
+    const getInput = () => screen.getByRole<HTMLInputElement>('spinbutton');
+
+    describe('input', () => {
+      it('allows user to type numbers only', async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.type(input, 'abc131');
+        expect(input).toHaveValue(131);
+      });
+
+      it('allows user to type negative values', async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.type(input, '-2');
+        expect(input).toHaveValue(-2);
+      });
+
+      it('allows user to type positive values only', async () => {
+        render(setupWrapper({ type: 'number', positiveOnly: true }));
+        const input = getInput();
+        component = input;
+        await userEvent.type(input, '-2');
+        expect(input).toHaveValue(2);
+      });
+
+      it('allows user to type decimal', async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.type(input, '2.3');
+        expect(input).toHaveValue(2.3);
+      });
+
+      it('allows user to type integer only', async () => {
+        render(setupWrapper({ type: 'number', integerOnly: true }));
+        const input = getInput();
+        component = input;
+        await userEvent.type(input, '2.3');
+        expect(input).toHaveValue(23);
+      });
+
+      it("not allow '-' appear at any position of the string except the start", async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.type(input, '2-3');
+        expect(input).toHaveValue(23);
+      });
 
-    it('allows user to type only numbers', async () => {
-      render(setupWrapper({ type: 'number' }));
-      const input = getInput();
-      await userEvent.type(input, 'abc131');
-      expect(input).toHaveValue(131);
+      it("not allow '.' appear at the start of the string", async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.type(input, '.33');
+        expect(input).toHaveValue(33);
+      });
+
+      it("not allow '.' appear twice in the string", async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.type(input, '3.3.3');
+        expect(input).toHaveValue(3.33);
+      });
     });
 
-    it('allows negative values', async () => {
-      render(setupWrapper({ type: 'number' }));
-      const input = getInput();
-      await userEvent.type(input, '-2');
-      expect(input).toHaveValue(-2);
+    describe('paste', () => {
+      it('allows user to paste numbers only', async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.click(input);
+        await userEvent.paste('abc131');
+        expect(input).toHaveValue(131);
+      });
+
+      it('allows user to paste negative values', async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.click(input);
+        await userEvent.paste('-2');
+        expect(input).toHaveValue(-2);
+      });
+
+      it('allows user to paste positive values only', async () => {
+        render(setupWrapper({ type: 'number', positiveOnly: true }));
+        const input = getInput();
+        component = input;
+        await userEvent.click(input);
+        await userEvent.paste('-2');
+        expect(input).toHaveValue(2);
+      });
+
+      it('allows user to paste decimal', async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.click(input);
+        await userEvent.paste('2.3');
+        expect(input).toHaveValue(2.3);
+      });
+
+      it('allows user to paste integer only', async () => {
+        render(setupWrapper({ type: 'number', integerOnly: true }));
+        const input = getInput();
+        component = input;
+        await userEvent.click(input);
+        await userEvent.paste('2.3');
+        expect(input).toHaveValue(23);
+      });
+
+      it("not allow '-' appear at any position of the pasted string except the start", async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.click(input);
+        await userEvent.paste('2-3');
+        expect(input).toHaveValue(23);
+      });
+
+      it("not allow '.' appear at the start of the pasted string", async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.click(input);
+        await userEvent.paste('.33');
+        expect(input).toHaveValue(0.33);
+      });
+
+      it("not allow '.' appear twice in the pasted string", async () => {
+        render(setupWrapper({ type: 'number' }));
+        const input = getInput();
+        component = input;
+        await userEvent.click(input);
+        await userEvent.paste('3.3.3');
+        expect(input).toHaveValue(3.33);
+      });
     });
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index 43dd7b8dbf7..c60cccdabea 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -20,6 +20,17 @@ jest.mock('react-router-dom', () => ({
   useNavigate: () => mockedUsedNavigate,
 }));
 
+// This is needed by ESLint.
+jest.mock('react-hook-form', () => ({
+  useFormContext: () => ({
+    register: jest.fn(),
+
+    // Mock methods.getValues and methods.setValue
+    getValues: jest.fn(),
+    setValue: jest.fn(),
+  }),
+}));
+
 type Datum = typeof data[0];
 
 const data = [

From f193e5fed7f2e5e33ef3b5d72bf0db33e5e9d6dc Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 6 Mar 2023 10:59:48 +0200
Subject: [PATCH 424/734] [e2e] Setup qase integration (once again) (#3441)

* add checkNewBrokersTest

* add manual cases and listeners

* add manual cases and listeners

* add manual cases and listeners

* upd manual suite

* upd listeners

* add readme

* upd template

* upd naming

* upd template

* upd template

* upd template

* upd template

* fix naming

* fix MessagesTest

* upd manual cases

* upd comments
---
 .github/workflows/e2e-automation.yml          |   2 -
 .github/workflows/e2e-manual.yml              |  43 ++++++
 kafka-ui-e2e-checks/QASE.md                   |  70 ++++++++++
 kafka-ui-e2e-checks/README.md                 |   5 +
 kafka-ui-e2e-checks/pom.xml                   |   6 +-
 .../listeners/QaseCreateListener.java         | 123 ++++++++++++++++++
 .../listeners/QaseResultListener.java         | 102 +++++++++++++++
 .../ui/utilities/qaseUtils/QaseSetup.java     |   2 +-
 .../qaseUtils/annotations/Automation.java     |  15 +++
 .../annotations/AutomationStatus.java         |  12 --
 .../qaseUtils/annotations/Status.java         |  13 ++
 .../qaseUtils/annotations/Suite.java          |   7 +-
 .../ui/utilities/qaseUtils/enums/State.java   |  18 +++
 .../ui/utilities/qaseUtils/enums/Status.java  |  15 ++-
 .../provectus/kafka/ui/variables/Suite.java   |   1 -
 .../java/com/provectus/kafka/ui/BaseTest.java |   8 +-
 .../java/com/provectus/kafka/ui/Facade.java   |   1 +
 .../kafka/ui/manualSuite/BaseManualTest.java  |  28 ++++
 .../kafka/ui/manualSuite/TestClass.java       |   4 -
 .../ui/manualSuite/suite/DataMaskingTest.java |  29 +++++
 .../kafka/ui/manualSuite/suite/RbacTest.java  |  53 ++++++++
 .../ui/manualSuite/suite/TopicsTest.java      |  95 ++++++++++++++
 .../kafka/ui/qaseSuite/BaseQaseTest.java      |  16 +++
 .../kafka/ui/qaseSuite/Template.java          |  58 +++++++++
 .../kafka/ui/qaseSuite/TestClass.java         |   4 -
 .../kafka/ui/smokeSuite/SmokeTest.java        |   7 +-
 .../ui/smokeSuite/brokers/BrokersTest.java    |  16 +--
 .../smokeSuite/connectors/ConnectorsTest.java |  19 +--
 .../ui/smokeSuite/ksqlDb/KsqlDbTest.java      |  25 ++--
 .../ui/smokeSuite/schemas/SchemasTest.java    |  41 ++----
 .../ui/smokeSuite/topics/MessagesTest.java    |  74 ++++-------
 .../ui/smokeSuite/topics/TopicsTest.java      |  81 +++---------
 32 files changed, 768 insertions(+), 225 deletions(-)
 create mode 100644 .github/workflows/e2e-manual.yml
 create mode 100644 kafka-ui-e2e-checks/QASE.md
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseCreateListener.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Automation.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/AutomationStatus.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Status.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/State.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/TestClass.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/DataMaskingTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/RbacTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/TestClass.java

diff --git a/.github/workflows/e2e-automation.yml b/.github/workflows/e2e-automation.yml
index 50e3e9f1d42..5a5018c9e5c 100644
--- a/.github/workflows/e2e-automation.yml
+++ b/.github/workflows/e2e-automation.yml
@@ -8,8 +8,6 @@ on:
         required: true
         type: choice
         options:
-          - manual
-          - qase
           - regression
           - sanity
           - smoke
diff --git a/.github/workflows/e2e-manual.yml b/.github/workflows/e2e-manual.yml
new file mode 100644
index 00000000000..68963e29faa
--- /dev/null
+++ b/.github/workflows/e2e-manual.yml
@@ -0,0 +1,43 @@
+name: E2E Manual suite
+on:
+  workflow_dispatch:
+    inputs:
+      test_suite:
+        description: 'Select test suite to run'
+        default: 'manual'
+        required: true
+        type: choice
+        options:
+          - manual
+          - qase
+      qase_token:
+        description: 'Set Qase token to enable integration'
+        required: true
+        type: string
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.sha }}
+      - name: Set up environment
+        id: set_env_values
+        run: |
+          cat "./kafka-ui-e2e-checks/.env.ci" >> "./kafka-ui-e2e-checks/.env"
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
+      - name: Build with Maven
+        id: build_app
+        run: |
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.sha }}
+          ./mvnw -B -V -ntp clean install -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
+      - name: Run test suite
+        run: |
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ github.sha }}
+          ./mvnw -B -V -ntp -DQASEIO_API_TOKEN=${{ github.event.inputs.qase_token }} -Dsurefire.suiteXmlFiles='src/test/resources/${{ github.event.inputs.test_suite }}.xml' -Dsuite=${{ github.event.inputs.test_suite }} -f 'kafka-ui-e2e-checks' test -Pprod
diff --git a/kafka-ui-e2e-checks/QASE.md b/kafka-ui-e2e-checks/QASE.md
new file mode 100644
index 00000000000..b09731515a3
--- /dev/null
+++ b/kafka-ui-e2e-checks/QASE.md
@@ -0,0 +1,70 @@
+### E2E integration with Qase.io TMS (for internal users)
+
+### Table of Contents
+
+- [Intro](#intro)
+- [Set up Qase.io integration](#set-up-qase-integration)
+- [Test case creation](#test-case-creation)
+- [Test run reporting](#test-run-reporting)
+
+### Intro
+
+We're using [Qase.io](https://help.qase.io/en/) as TMS to keep test cases and accumulate test runs.
+Integration is set up through API using [qase-api](https://mvnrepository.com/artifact/io.qase/qase-api)
+and [qase-testng](https://mvnrepository.com/artifact/io.qase/qase-testng) libraries.
+
+### Set up Qase integration
+
+To set up integration locally add next VM option `-DQASEIO_API_TOKEN='%s'`
+(add your [Qase token](https://app.qase.io/user/api/token) instead of '%s') into your run configuration
+
+### Test case creation
+
+All new test cases can be added into TMS by default if they have no QaseId and QaseTitle matching already existing
+cases.
+But to handle `@Suite` and `@Automation` we added custom QaseCreateListener. To create new test case for next sync with
+Qase (see example `kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java`):
+
+1. Create new class in `kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/suit`
+2. Inherit it from `kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java`
+3. Create new test method with some name inside the class and annotate it with:
+
+- `@Automation` (optional - Not automated by default) - to set one of automation states: NOT_AUTOMATED, TO_BE_AUTOMATED,
+  AUTOMATED
+- `@QaseTitle` (required) - to set title for new test case and to check is there no existing cases with same title in
+  Qase.io
+- `@Status` (optional - Draft by default) - to set one of case statuses: ACTUAL, DRAFT, DEPRECATED
+- `@Suite` (optional) - to store new case in some existing package need to set its id, otherwise case will be stored in
+  the root
+- `@Test` (required) - annotation from TestNG to specify this method as test
+
+4. Create new private void step methods with some name inside the same class and annotate it with
+   @io.qase.api.annotation.Step to specify this method as step.
+5. Use defined step methods inside created test method in concrete order
+6. If there are any additional cases to create you can repeat scenario in a new class
+7. There are two ways to sync newly created cases in the framework with Qase.io:
+
+- sync can be performed locally - run new test classes with
+  already [set up Qase.io integration](#Set up Qase.io integration)
+- also you can commit and push your changes, then
+  run [E2E Manual suite](https://github.com/provectus/kafka-ui/actions/workflows/e2e-manual.yml) on your branch
+
+8. No test run in Qase.io will be created, new test case will be stored defined directory
+   in [project's repository](https://app.qase.io/project/KAFKAUI)
+9. To add expected results into created test case edit in Qase.io manually
+
+### Test run reporting
+
+To handle manual test cases with status `Skipped` we added custom QaseResultListener. To create new test run:
+
+1. All test methods should be annotated with actual `@QaseId`
+2. There are two ways to sync newly created cases in the framework with Qase.io:
+
+- run can be performed locally - run test classes (or suites) with
+  already [set up Qase.io integration](#Set up Qase.io integration), they will be labeled as `Automation CUSTOM suite`
+- also you can commit and push your changes, then
+  run [E2E Automation suite](https://github.com/provectus/kafka-ui/actions/workflows/e2e-automation.yml) on your branch
+
+3. All new test runs will be added into [project's test runs](https://app.qase.io/run/KAFKAUI) with corresponding label
+   using QaseId to identify existing cases
+4. All test cases from manual suite are set up to have `Skipped` status in test runs to perform them manually
diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index ed231876350..d7f3c77c1f7 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -7,6 +7,7 @@ This repository is for E2E UI automation.
 - [Prerequisites](#prerequisites)
 - [How to install](#how-to-install)
 - [How to run checks](#how-to-run-checks)
+- [Qase.io integration (for internal users)](#qase-integration)
 - [Reporting](#reporting)
 - [Environments setup](#environments-setup)
 - [Test Data](#test-data)
@@ -50,6 +51,10 @@ docker-compose -f documentation/compose/e2e-tests.yaml up -d
 -Dbrowser=local
 ```
 
+### Qase integration
+
+Found instruction for Qase.io integration (for internal use only) at `kafka-ui-e2e-checks/QASE.md`
+
 ### Reporting
 
 Reports are in `allure-results` folder.
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index b6724773121..6d3fc6e64eb 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -17,10 +17,10 @@
         <testcontainers.version>1.17.6</testcontainers.version>
         <selenide.version>6.11.2</selenide.version>
         <testng.version>7.7.0</testng.version>
-        <allure.version>2.20.1</allure.version>
-        <qase.io.version>3.0.2</qase.io.version>
+        <allure.version>2.21.0</allure.version>
+        <qase.io.version>3.0.3</qase.io.version>
         <aspectj.version>1.9.9.1</aspectj.version>
-        <assertj.version>3.23.1</assertj.version>
+        <assertj.version>3.24.2</assertj.version>
         <hamcrest.version>2.2</hamcrest.version>
         <slf4j.version>1.7.36</slf4j.version>
         <dotenv.version>2.3.1</dotenv.version>
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseCreateListener.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseCreateListener.java
new file mode 100644
index 00000000000..c40481c300a
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseCreateListener.java
@@ -0,0 +1,123 @@
+package com.provectus.kafka.ui.settings.listeners;
+
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import io.qase.api.QaseClient;
+import io.qase.api.StepStorage;
+import io.qase.api.annotation.QaseId;
+import io.qase.client.ApiClient;
+import io.qase.client.api.CasesApi;
+import io.qase.client.model.*;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.testng.Assert;
+import org.testng.ITestListener;
+import org.testng.ITestResult;
+import org.testng.TestListenerAdapter;
+
+import java.lang.reflect.Method;
+import java.util.*;
+
+import static io.qase.api.utils.IntegrationUtils.getCaseTitle;
+
+@Slf4j
+public class QaseCreateListener extends TestListenerAdapter implements ITestListener {
+
+    private static final CasesApi QASE_API = getQaseApi();
+
+    private static CasesApi getQaseApi() {
+        ApiClient apiClient = QaseClient.getApiClient();
+        apiClient.setApiKey(System.getProperty("QASEIO_API_TOKEN"));
+        return new CasesApi(apiClient);
+    }
+
+    private static int getStatus(Method method) {
+        if (method.isAnnotationPresent(Status.class))
+            return method.getDeclaredAnnotation(Status.class).status().getValue();
+        return 1;
+    }
+
+    private static int getAutomation(Method method) {
+        if (method.isAnnotationPresent(Automation.class))
+            return method.getDeclaredAnnotation(Automation.class).state().getValue();
+        return 0;
+    }
+
+    @SneakyThrows
+    private static HashMap<Long, String> getCaseTitlesAndIdsFromQase() {
+        HashMap<Long, String> cases = new HashMap<>();
+        boolean getCases = true;
+        int offSet = 0;
+        while (getCases) {
+            getCases = false;
+            TestCaseListResponse response = QASE_API.getCases(System.getProperty("QASE_PROJECT_CODE"),
+                    new GetCasesFiltersParameter().status(GetCasesFiltersParameter.SERIALIZED_NAME_STATUS), 100, offSet);
+            TestCaseListResponseAllOfResult result = response.getResult();
+            Assert.assertNotNull(result);
+            List<TestCase> entities = result.getEntities();
+            Assert.assertNotNull(entities);
+            if (entities.size() > 0) {
+                for (TestCase testCase : entities) {
+                    cases.put(testCase.getId(), testCase.getTitle());
+                }
+                offSet = offSet + 100;
+                getCases = true;
+            }
+        }
+        return cases;
+    }
+
+    private static boolean isCaseWithTitleExistInQase(Method method) {
+        HashMap<Long, String> cases = getCaseTitlesAndIdsFromQase();
+        String title = getCaseTitle(method);
+        if (cases.containsValue(title)) {
+            for (Map.Entry<Long, String> map : cases.entrySet()) {
+                if (map.getValue().matches(title)) {
+                    long id = map.getKey();
+                    log.warn(String.format("Test case with @QaseTitle='%s' already exists with @QaseId=%d. " +
+                            "Please verify @QaseTitle annotation", title, id));
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    @SneakyThrows
+    public void onTestSuccess(final ITestResult testResult) {
+        Method method = testResult.getMethod()
+                .getConstructorOrMethod()
+                .getMethod();
+        String title = getCaseTitle(method);
+        if (!method.isAnnotationPresent(QaseId.class)) {
+            if (title != null) {
+                if (!isCaseWithTitleExistInQase(method)) {
+                    LinkedList<ResultCreateStepsInner> resultSteps = StepStorage.stopSteps();
+                    LinkedList<TestCaseCreateStepsInner> createSteps = new LinkedList<>();
+                    resultSteps.forEach(step -> {
+                        TestCaseCreateStepsInner caseStep = new TestCaseCreateStepsInner();
+                        caseStep.setAction(step.getAction());
+                        caseStep.setExpectedResult(step.getExpectedResult());
+                        createSteps.add(caseStep);
+                    });
+                    TestCaseCreate newCase = new TestCaseCreate();
+                    newCase.setTitle(title);
+                    newCase.setStatus(getStatus(method));
+                    newCase.setAutomation(getAutomation(method));
+                    newCase.setSteps(createSteps);
+                    if (method.isAnnotationPresent(Suite.class)) {
+                        long suiteId = method.getDeclaredAnnotation(Suite.class).id();
+                        newCase.suiteId(suiteId);
+                    }
+                    Long id = Objects.requireNonNull(QASE_API.createCase(System.getProperty("QASE_PROJECT_CODE"),
+                            newCase).getResult()).getId();
+                    log.info(String.format("New test case '%s' was created with @QaseId=%d", title, id));
+                }
+            } else
+                log.warn("To create new test case in Qase.io please add @QaseTitle annotation");
+        } else
+            log.warn("To create new test case in Qase.io please remove @QaseId annotation");
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java
new file mode 100644
index 00000000000..abab897bfc9
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java
@@ -0,0 +1,102 @@
+package com.provectus.kafka.ui.settings.listeners;
+
+import io.qase.api.StepStorage;
+import io.qase.api.config.QaseConfig;
+import io.qase.api.services.QaseTestCaseListener;
+import io.qase.client.model.ResultCreate;
+import io.qase.client.model.ResultCreateCase;
+import io.qase.client.model.ResultCreateStepsInner;
+import io.qase.testng.guice.module.TestNgModule;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.testng.ITestContext;
+import org.testng.ITestListener;
+import org.testng.ITestResult;
+import org.testng.TestListenerAdapter;
+
+import java.lang.reflect.Method;
+import java.util.LinkedList;
+import java.util.Optional;
+
+import static io.qase.api.utils.IntegrationUtils.*;
+import static io.qase.client.model.ResultCreate.StatusEnum.*;
+
+@Slf4j
+public class QaseResultListener extends TestListenerAdapter implements ITestListener {
+
+    private static final String REPORTER_NAME = "TestNG";
+
+    static {
+        System.setProperty(QaseConfig.QASE_CLIENT_REPORTER_NAME_KEY, REPORTER_NAME);
+    }
+
+    @Getter(lazy = true, value = AccessLevel.PRIVATE)
+    private final QaseTestCaseListener qaseTestCaseListener = createQaseListener();
+
+    private static QaseTestCaseListener createQaseListener() {
+        return TestNgModule.getInjector().getInstance(QaseTestCaseListener.class);
+    }
+
+    @Override
+    public void onTestStart(ITestResult result) {
+        getQaseTestCaseListener().onTestCaseStarted();
+        super.onTestStart(result);
+    }
+
+    @Override
+    public void onTestSuccess(ITestResult tr) {
+        getQaseTestCaseListener()
+                .onTestCaseFinished(resultCreate -> setupResultItem(resultCreate, tr, PASSED));
+        super.onTestSuccess(tr);
+    }
+
+    @Override
+    public void onTestSkipped(ITestResult tr) {
+        getQaseTestCaseListener()
+                .onTestCaseFinished(resultCreate -> setupResultItem(resultCreate, tr, SKIPPED));
+        super.onTestSuccess(tr);
+    }
+
+    @Override
+    public void onTestFailure(ITestResult tr) {
+        getQaseTestCaseListener()
+                .onTestCaseFinished(resultCreate -> setupResultItem(resultCreate, tr, FAILED));
+        super.onTestFailure(tr);
+    }
+
+    @Override
+    public void onFinish(ITestContext testContext) {
+        getQaseTestCaseListener().onTestCasesSetFinished();
+        super.onFinish(testContext);
+    }
+
+    private void setupResultItem(ResultCreate resultCreate, ITestResult result, ResultCreate.StatusEnum status) {
+        Optional<Throwable> resultThrowable = Optional.ofNullable(result.getThrowable());
+        String comment = resultThrowable
+                .flatMap(throwable -> Optional.of(throwable.toString())).orElse(null);
+        Boolean isDefect = resultThrowable
+                .flatMap(throwable -> Optional.of(throwable instanceof AssertionError))
+                .orElse(false);
+        String stacktrace = resultThrowable
+                .flatMap(throwable -> Optional.of(getStacktrace(throwable)))
+                .orElse(null);
+        Method method = result.getMethod()
+                .getConstructorOrMethod()
+                .getMethod();
+        Long caseId = getCaseId(method);
+        String caseTitle = null;
+        if (caseId == null) {
+            caseTitle = getCaseTitle(method);
+        }
+        LinkedList<ResultCreateStepsInner> steps = StepStorage.stopSteps();
+        resultCreate
+                ._case(caseTitle == null ? null : new ResultCreateCase().title(caseTitle))
+                .caseId(caseId)
+                .status(status)
+                .comment(comment)
+                .stacktrace(stacktrace)
+                .steps(steps.isEmpty() ? null : steps)
+                .defect(isDefect);
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java
index aa1a1213f91..60be014a0ab 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java
@@ -15,7 +15,7 @@
 @Slf4j
 public class QaseSetup {
 
-    public static void testRunSetup() {
+    public static void qaseIntegrationSetup() {
         String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
         if (isEmpty(qaseApiToken)) {
             log.warn("Integration with Qase is disabled due to run config or token wasn't defined.");
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Automation.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Automation.java
new file mode 100644
index 00000000000..556263c111f
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Automation.java
@@ -0,0 +1,15 @@
+package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
+
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.State;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Automation {
+
+    State state();
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/AutomationStatus.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/AutomationStatus.java
deleted file mode 100644
index 7f3c0da89e8..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/AutomationStatus.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
-
-import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface AutomationStatus {
-
-    Status status();
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Status.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Status.java
new file mode 100644
index 00000000000..3c31f2345c1
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Status.java
@@ -0,0 +1,13 @@
+package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Status {
+
+    com.provectus.kafka.ui.utilities.qaseUtils.enums.Status status();
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java
index 09b971b48c6..fa1c2c3dd75 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java
@@ -1,10 +1,13 @@
 package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
+@Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Suite {
-    long suiteId();
-    String title();
+
+    long id();
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/State.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/State.java
new file mode 100644
index 00000000000..cdbbaf38dec
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/State.java
@@ -0,0 +1,18 @@
+package com.provectus.kafka.ui.utilities.qaseUtils.enums;
+
+public enum State {
+
+    NOT_AUTOMATED(0),
+    TO_BE_AUTOMATED(1),
+    AUTOMATED(2);
+
+    private final int value;
+
+    State(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java
index d97e42b3e47..adc8bf24b9d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java
@@ -1,5 +1,18 @@
 package com.provectus.kafka.ui.utilities.qaseUtils.enums;
 
 public enum Status {
-    AUTOMATED, TO_BE_AUTOMATED, MANUAL
+
+    ACTUAL(0),
+    DRAFT(1),
+    DEPRECATED(2);
+
+    private final int value;
+
+    Status(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java
index c0a823600a4..74f60dd0d2e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java
@@ -4,7 +4,6 @@ public interface Suite {
 
     String CUSTOM = "custom";
     String MANUAL = "manual";
-    String QASE = "qase";
     String REGRESSION = "regression";
     String SANITY = "sanity";
     String SMOKE = "smoke";
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
index aa05462dc0b..399f81e1aa2 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
@@ -6,8 +6,8 @@
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.settings.listeners.AllureListener;
 import com.provectus.kafka.ui.settings.listeners.LoggerListener;
+import com.provectus.kafka.ui.settings.listeners.QaseResultListener;
 import io.qameta.allure.Step;
-import io.qase.testng.QaseListener;
 import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.chrome.ChromeOptions;
@@ -25,12 +25,12 @@
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
 import static com.provectus.kafka.ui.settings.BaseSource.*;
 import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.*;
-import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.testRunSetup;
+import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
 import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
 import static com.provectus.kafka.ui.variables.Browser.LOCAL;
 
 @Slf4j
-@Listeners({AllureListener.class, LoggerListener.class, QaseListener.class})
+@Listeners({AllureListener.class, LoggerListener.class, QaseResultListener.class})
 public abstract class BaseTest extends Facade {
 
     private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
@@ -43,7 +43,7 @@ private static boolean isARM64() {
 
     @BeforeSuite(alwaysRun = true)
     public void beforeSuite() {
-        testRunSetup();
+        qaseIntegrationSetup();
         switch (BROWSER) {
             case (CONTAINER) -> {
                 DockerImageName image = isARM64()
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
index a26f600e1dd..c370c01b5fe 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
@@ -19,6 +19,7 @@
 import com.provectus.kafka.ui.services.ApiService;
 
 public abstract class Facade {
+
     protected ApiService apiService = new ApiService();
     protected ConnectorCreateForm connectorCreateForm = new ConnectorCreateForm();
     protected KafkaConnectList kafkaConnectList = new KafkaConnectList();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java
new file mode 100644
index 00000000000..d9891a0b507
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java
@@ -0,0 +1,28 @@
+package com.provectus.kafka.ui.manualSuite;
+
+import com.provectus.kafka.ui.settings.listeners.QaseResultListener;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import org.testng.SkipException;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Listeners;
+
+import java.lang.reflect.Method;
+
+import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
+
+@Listeners(QaseResultListener.class)
+public abstract class BaseManualTest {
+
+    @BeforeSuite
+    public void beforeSuite() {
+        qaseIntegrationSetup();
+    }
+
+    @BeforeMethod
+    public void beforeMethod(Method method) {
+        if (method.getAnnotation(Automation.class).state().equals(NOT_AUTOMATED))
+            throw new SkipException("Skip test exception");
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/TestClass.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/TestClass.java
deleted file mode 100644
index c75516955a9..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/TestClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.provectus.kafka.ui.manualSuite;
-
-public class TestClass {
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/DataMaskingTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/DataMaskingTest.java
new file mode 100644
index 00000000000..23b6e6539e4
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/DataMaskingTest.java
@@ -0,0 +1,29 @@
+package com.provectus.kafka.ui.manualSuite.suite;
+
+import com.provectus.kafka.ui.manualSuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
+
+public class DataMaskingTest extends BaseManualTest {
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(262)
+    @Test
+    public void testCaseA() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(264)
+    @Test
+    public void testCaseB() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(265)
+    @Test
+    public void testCaseC() {
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/RbacTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/RbacTest.java
new file mode 100644
index 00000000000..aad85652f5d
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/RbacTest.java
@@ -0,0 +1,53 @@
+package com.provectus.kafka.ui.manualSuite.suite;
+
+import com.provectus.kafka.ui.manualSuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
+
+public class RbacTest extends BaseManualTest {
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(249)
+    @Test
+    public void testCaseA() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(251)
+    @Test
+    public void testCaseB() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(257)
+    @Test
+    public void testCaseC() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(258)
+    @Test
+    public void testCaseD() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(259)
+    @Test
+    public void testCaseE() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(260)
+    @Test
+    public void testCaseF() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(261)
+    @Test
+    public void testCaseG() {
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
new file mode 100644
index 00000000000..d768f939ce0
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
@@ -0,0 +1,95 @@
+package com.provectus.kafka.ui.manualSuite.suite;
+
+import com.provectus.kafka.ui.manualSuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
+
+public class TopicsTest extends BaseManualTest {
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(17)
+    @Test
+    public void testCaseA() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(18)
+    @Test
+    public void testCaseB() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(22)
+    @Test
+    public void testCaseC() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(46)
+    @Test
+    public void testCaseD() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(47)
+    @Test
+    public void testCaseE() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(48)
+    @Test
+    public void testCaseF() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(49)
+    @Test
+    public void testCaseG() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(50)
+    @Test
+    public void testCaseH() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(57)
+    @Test
+    public void testCaseI() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(58)
+    @Test
+    public void testCaseJ() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(269)
+    @Test
+    public void testCaseK() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(270)
+    @Test
+    public void testCaseL() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(271)
+    @Test
+    public void testCaseM() {
+    }
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(272)
+    @Test
+    public void testCaseN() {
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java
new file mode 100644
index 00000000000..977cbd6dc4a
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java
@@ -0,0 +1,16 @@
+package com.provectus.kafka.ui.qaseSuite;
+
+import com.provectus.kafka.ui.settings.listeners.QaseCreateListener;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Listeners;
+
+import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
+
+@Listeners(QaseCreateListener.class)
+public abstract class BaseQaseTest {
+
+    @BeforeSuite
+    public void beforeSuite() {
+        qaseIntegrationSetup();
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java
new file mode 100644
index 00000000000..cf0101fe79f
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java
@@ -0,0 +1,58 @@
+package com.provectus.kafka.ui.qaseSuite;
+
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import io.qase.api.annotation.QaseTitle;
+import io.qase.api.annotation.Step;
+
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.Status.DRAFT;
+
+public class Template extends BaseQaseTest {
+
+    /**
+     * this class is a kind of placeholder or example, use is as template to create new one
+     * copy class into kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/suite
+     * place it into regarding folder and rename according to test case summary from Qase.io
+     * uncomment @Test and set all annotations according to kafka-ui-e2e-checks/QASE.md
+     */
+
+    @Automation(state = NOT_AUTOMATED)
+    @QaseTitle("testCaseA title")
+    @Status(status = DRAFT)
+    @Suite(id = 0)
+//    @org.testng.annotations.Test
+    public void testCaseA() {
+        stepA();
+        stepB();
+        stepC();
+        stepD();
+        stepE();
+        stepF();
+    }
+
+    @Step("stepA action")
+    private void stepA() {
+    }
+
+    @Step("stepB action")
+    private void stepB() {
+    }
+
+    @Step("stepC action")
+    private void stepC() {
+    }
+
+    @Step("stepD action")
+    private void stepD() {
+    }
+
+    @Step("stepE action")
+    private void stepE() {
+    }
+
+    @Step("stepF action")
+    private void stepF() {
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/TestClass.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/TestClass.java
deleted file mode 100644
index d3cea529215..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/TestClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.provectus.kafka.ui.qaseSuite;
-
-public class TestClass {
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
index fc87e885029..a0c4f05da23 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
@@ -2,9 +2,7 @@
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
-import io.qase.api.annotation.CaseId;
+import io.qase.api.annotation.QaseId;
 import org.testng.annotations.Test;
 
 import java.util.stream.Collectors;
@@ -12,9 +10,8 @@
 
 public class SmokeTest extends BaseTest {
 
+    @QaseId(198)
     @Test
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(198)
     public void checkBasePageElements() {
         verifyElementsCondition(
                 Stream.concat(topPanel.getAllVisibleElements().stream(), naviSideBar.getAllMenuButtons().stream())
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
index c2f3e20c4a6..7b11aa6556c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
@@ -2,11 +2,8 @@
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Step;
-import io.qase.api.annotation.CaseId;
+import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -15,12 +12,7 @@
 
 public class BrokersTest extends BaseTest {
 
-    private static final String SUITE_TITLE = "Brokers";
-    private static final long SUITE_ID = 1;
-
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(1)
+    @QaseId(1)
     @Test
     public void checkBrokersOverview() {
         navigateToBrokers();
@@ -29,9 +21,7 @@ public void checkBrokersOverview() {
         verifyElementsCondition(brokersList.getAllEnabledElements(), Condition.enabled);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(85)
+    @QaseId(85)
     @Test
     public void checkExistingBrokersInCluster() {
         navigateToBrokers();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
index 30b380d6d06..5291648014e 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
@@ -3,11 +3,8 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Step;
-import io.qase.api.annotation.CaseId;
+import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -23,8 +20,6 @@
 
 public class ConnectorsTest extends BaseTest {
 
-    private static final long SUITE_ID = 10;
-    private static final String SUITE_TITLE = "Kafka Connect";
     private static final String CONNECT_NAME = "first";
     private static final List<Topic> TOPIC_LIST = new ArrayList<>();
     private static final List<Connector> CONNECTOR_LIST = new ArrayList<>();
@@ -58,9 +53,7 @@ public void beforeClass() {
                 .createConnector(CONNECT_NAME, connector));
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(42)
+    @QaseId(42)
     @Test
     public void createConnector() {
         Connector connectorForCreate = new Connector()
@@ -82,9 +75,7 @@ public void createConnector() {
         CONNECTOR_LIST.add(connectorForCreate);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(196)
+    @QaseId(196)
     @Test
     public void updateConnector() {
         navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_UPDATE.getName());
@@ -97,9 +88,7 @@ public void updateConnector() {
         Assert.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()), "isConnectorVisible()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(195)
+    @QaseId(195)
     @Test
     public void deleteConnector() {
         navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_DELETE.getName());
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
index 9716b3905d7..3627f321df6 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
@@ -3,10 +3,7 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.pages.ksqlDb.models.Stream;
 import com.provectus.kafka.ui.pages.ksqlDb.models.Table;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
-import io.qase.api.annotation.CaseId;
+import io.qase.api.annotation.QaseId;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.testng.asserts.SoftAssert;
@@ -17,28 +14,24 @@
 
 public class KsqlDbTest extends BaseTest {
 
-    private static final long SUITE_ID = 8;
-    private static final String SUITE_TITLE = "KSQL_DB";
-    private static final Stream STREAM_FOR_CHECKING_TABLES = new Stream()
-            .setName("STREAM_FOR_CHECKING_TABLES_" + randomAlphabetic(4).toUpperCase())
+    private static final Stream STREAM_FOR_CHECK_TABLES = new Stream()
+            .setName("STREAM_FOR_CHECK_TABLES_" + randomAlphabetic(4).toUpperCase())
             .setTopicName("TOPIC_FOR_STREAM_" + randomAlphabetic(4).toUpperCase());
     private static final Table FIRST_TABLE = new Table()
             .setName("FIRST_TABLE" + randomAlphabetic(4).toUpperCase())
-            .setStreamName(STREAM_FOR_CHECKING_TABLES.getName());
+            .setStreamName(STREAM_FOR_CHECK_TABLES.getName());
     private static final Table SECOND_TABLE = new Table()
             .setName("SECOND_TABLE" + randomAlphabetic(4).toUpperCase())
-            .setStreamName(STREAM_FOR_CHECKING_TABLES.getName());
+            .setStreamName(STREAM_FOR_CHECK_TABLES.getName());
 
     @BeforeClass(alwaysRun = true)
     public void beforeClass() {
         apiService
-                .createStream(STREAM_FOR_CHECKING_TABLES)
+                .createStream(STREAM_FOR_CHECK_TABLES)
                 .createTables(FIRST_TABLE, SECOND_TABLE);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(41)
+    @QaseId(41)
     @Test(priority = 1)
     public void checkShowTablesRequestExecution() {
         naviSideBar
@@ -57,9 +50,7 @@ public void checkShowTablesRequestExecution() {
         softly.assertAll();
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(86)
+    @QaseId(86)
     @Test(priority = 2)
     public void clearResultsForExecutedRequest() {
         naviSideBar
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
index 6473684c06c..56ff2c0ff04 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
@@ -1,14 +1,11 @@
 package com.provectus.kafka.ui.smokeSuite.schemas;
 
 import com.codeborne.selenide.Condition;
-import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.models.Schema;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Step;
-import io.qase.api.annotation.CaseId;
+import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -23,8 +20,6 @@
 
 public class SchemasTest extends BaseTest {
 
-    private static final long SUITE_ID = 11;
-    private static final String SUITE_TITLE = "Schema Registry";
     private static final List<Schema> SCHEMA_LIST = new ArrayList<>();
     private static final Schema AVRO_API = Schema.createSchemaAvro();
     private static final Schema JSON_API = Schema.createSchemaJson();
@@ -36,9 +31,7 @@ public void beforeClass() {
         SCHEMA_LIST.forEach(schema -> apiService.createSchema(schema));
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(43)
+    @QaseId(43)
     @Test(priority = 1)
     public void createSchemaAvro() {
         Schema schemaAvro = Schema.createSchemaAvro();
@@ -63,9 +56,7 @@ public void createSchemaAvro() {
         SCHEMA_LIST.add(schemaAvro);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(186)
+    @QaseId(186)
     @Test(priority = 2)
     public void updateSchemaAvro() {
         AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_for_update.json");
@@ -88,9 +79,7 @@ public void updateSchemaAvro() {
         Assert.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), schemaDetails.getCompatibility(), "getCompatibility()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(186)
+    @QaseId(186)
     @Test(priority = 3)
     public void compareVersionsOperation() {
         navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
@@ -109,9 +98,7 @@ public void compareVersionsOperation() {
         Assert.assertEquals(53, schemaCreateForm.getMarkedLinesNumber(), "getAllMarkedLines()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(187)
+    @QaseId(187)
     @Test(priority = 4)
     public void deleteSchemaAvro() {
         navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
@@ -123,9 +110,7 @@ public void deleteSchemaAvro() {
         SCHEMA_LIST.remove(AVRO_API);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(89)
+    @QaseId(89)
     @Test(priority = 5)
     public void createSchemaJson() {
         Schema schemaJson = Schema.createSchemaJson();
@@ -150,9 +135,7 @@ public void createSchemaJson() {
         SCHEMA_LIST.add(schemaJson);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(189)
+    @QaseId(189)
     @Test(priority = 6)
     public void deleteSchemaJson() {
         navigateToSchemaRegistryAndOpenDetails(JSON_API.getName());
@@ -164,9 +147,7 @@ public void deleteSchemaJson() {
         SCHEMA_LIST.remove(JSON_API);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(91)
+    @QaseId(91)
     @Test(priority = 7)
     public void createSchemaProtobuf() {
         Schema schemaProtobuf = Schema.createSchemaProtobuf();
@@ -191,9 +172,7 @@ public void createSchemaProtobuf() {
         SCHEMA_LIST.add(schemaProtobuf);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(223)
+    @QaseId(223)
     @Test(priority = 8)
     public void deleteSchemaProtobuf() {
         navigateToSchemaRegistryAndOpenDetails(PROTOBUF_API.getName());
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
index 5e5af5c0448..9f8d18b6855 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
@@ -3,12 +3,8 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.topics.TopicDetails;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Issue;
 import io.qameta.allure.Step;
-import io.qase.api.annotation.CaseId;
 import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -31,8 +27,6 @@
 
 public class MessagesTest extends BaseTest {
 
-    private static final long SUITE_ID = 2;
-    private static final String SUITE_TITLE = "Topics";
     private static final Topic TOPIC_FOR_MESSAGES = new Topic()
             .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
             .setMessageKey(randomAlphabetic(5))
@@ -41,8 +35,8 @@ public class MessagesTest extends BaseTest {
             .setName("topic-to-clear-and-purge-messages-attribute-" + randomAlphabetic(5))
             .setMessageKey(randomAlphabetic(5))
             .setMessageContent(randomAlphabetic(10));
-    private static final Topic TOPIC_FOR_CHECKING_FILTERS = new Topic()
-            .setName("topic-for-checking-filters-" + randomAlphabetic(5))
+    private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
+            .setName("topic-for-check-filters-" + randomAlphabetic(5))
             .setMessageKey(randomAlphabetic(5))
             .setMessageContent(randomAlphabetic(10));
     private static final Topic TOPIC_TO_RECREATE = new Topic()
@@ -50,25 +44,23 @@ public class MessagesTest extends BaseTest {
             .setMessageKey(randomAlphabetic(5))
             .setMessageContent(randomAlphabetic(10));
     private static final Topic TOPIC_FOR_CHECK_MESSAGES_COUNT = new Topic()
-             .setName("topic-for-check-messages-count" + randomAlphabetic(5))
-             .setMessageKey(randomAlphabetic(5))
-             .setMessageContent(randomAlphabetic(10));
+            .setName("topic-for-check-messages-count" + randomAlphabetic(5))
+            .setMessageKey(randomAlphabetic(5))
+            .setMessageContent(randomAlphabetic(10));
     private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
     @BeforeClass(alwaysRun = true)
     public void beforeClass() {
-        TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECKING_FILTERS, TOPIC_TO_CLEAR_AND_PURGE_MESSAGES,
+        TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECK_FILTERS, TOPIC_TO_CLEAR_AND_PURGE_MESSAGES,
                 TOPIC_TO_RECREATE, TOPIC_FOR_CHECK_MESSAGES_COUNT));
         TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
-        IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
+        IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_FILTERS));
         waitUntilNewMinuteStarted();
-        IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECKING_FILTERS));
+        IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_FILTERS));
         IntStream.range(1, 110).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_MESSAGES_COUNT));
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(222)
+    @QaseId(222)
     @Test(priority = 1)
     public void produceMessage() {
         navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
@@ -85,9 +77,7 @@ public void produceMessage() {
 
     @Ignore
     @Issue("https://github.com/provectus/kafka-ui/issues/2778")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(19)
+    @QaseId(19)
     @Test(priority = 2)
     public void clearMessage() {
         navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
@@ -103,9 +93,7 @@ public void clearMessage() {
         Assert.assertEquals(0, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(239)
+    @QaseId(239)
     @Test(priority = 3)
     public void checkClearTopicMessage() {
         navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
@@ -128,9 +116,7 @@ public void checkClearTopicMessage() {
         softly.assertAll();
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(10)
+    @QaseId(10)
     @Test(priority = 4)
     public void checkPurgeMessagePossibility() {
         navigateToTopics();
@@ -163,12 +149,10 @@ public void checkPurgeMessagePossibility() {
 
     @Ignore
     @Issue("https://github.com/provectus/kafka-ui/issues/2819")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(21)
+    @QaseId(21)
     @Test(priority = 5)
     public void copyMessageFromTopicProfile() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
         topicDetails
                 .openDetailsTab(MESSAGES)
                 .getRandomMessage()
@@ -180,12 +164,10 @@ public void copyMessageFromTopicProfile() {
 
     @Ignore
     @Issue("https://github.com/provectus/kafka-ui/issues/2394")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(15)
+    @QaseId(15)
     @Test(priority = 6)
-    public void checkingMessageFilteringByOffset() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+    public void checkMessageFilteringByOffset() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
         topicDetails
                 .openDetailsTab(MESSAGES);
         TopicDetails.MessageGridItem secondMessage = topicDetails.getMessageByOffset(1);
@@ -204,12 +186,10 @@ public void checkingMessageFilteringByOffset() {
     @Ignore
     @Issue("https://github.com/provectus/kafka-ui/issues/3215")
     @Issue("https://github.com/provectus/kafka-ui/issues/2345")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(16)
+    @QaseId(16)
     @Test(priority = 7)
-    public void checkingMessageFilteringByTimestamp() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+    public void checkMessageFilteringByTimestamp() {
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
         topicDetails
                 .openDetailsTab(MESSAGES);
         LocalDateTime firstTimestamp = topicDetails.getMessageByOffset(0).getTimestamp();
@@ -233,12 +213,10 @@ public void checkingMessageFilteringByTimestamp() {
 
     @Ignore
     @Issue("https://github.com/provectus/kafka-ui/issues/2778")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(246)
+    @QaseId(246)
     @Test(priority = 8)
     public void checkClearTopicMessageFromOverviewTab() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECKING_FILTERS.getName());
+        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
         topicDetails
                 .openDetailsTab(OVERVIEW)
                 .openDotMenu()
@@ -246,16 +224,14 @@ public void checkClearTopicMessageFromOverviewTab() {
                 .clickConfirmBtnMdl();
         SoftAssert softly = new SoftAssert();
         softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
-                        String.format("%s messages have been successfully cleared!", TOPIC_FOR_CHECKING_FILTERS.getName())),
+                        String.format("%s messages have been successfully cleared!", TOPIC_FOR_CHECK_FILTERS.getName())),
                 "isAlertWithMessageVisible()");
         softly.assertEquals(topicDetails.getMessageCountAmount(), 0,
                 "getMessageCountAmount()= " + topicDetails.getMessageCountAmount());
         softly.assertAll();
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(240)
+    @QaseId(240)
     @Test(priority = 9)
     public void checkRecreateTopic() {
         navigateToTopicsAndOpenDetails(TOPIC_TO_RECREATE.getName());
@@ -293,7 +269,7 @@ public void CheckMessagesCountPerPageWithinTopic() {
         softly.assertTrue(topicDetails.isNextButtonEnabled(), "isNextButtonEnabled()");
         softly.assertAll();
         int lastOffsetOnPage = topicDetails.getAllMessages()
-                        .get(messagesPerPage -1).getOffset();
+                .get(messagesPerPage - 1).getOffset();
         topicDetails
                 .clickNextButton();
         softly.assertEquals(topicDetails.getAllMessages().stream().findFirst().orElseThrow().getOffset(),
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
index 6f847d7d68b..3f1347cb391 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
@@ -4,11 +4,8 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.topics.TopicDetails;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Issue;
-import io.qase.api.annotation.CaseId;
+import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -33,8 +30,6 @@
 
 public class TopicsTest extends BaseTest {
 
-    private static final long SUITE_ID = 2;
-    private static final String SUITE_TITLE = "Topics";
     private static final Topic TOPIC_TO_CREATE = new Topic()
             .setName("new-topic-" + randomAlphabetic(5))
             .setNumberOfPartitions(1)
@@ -66,9 +61,7 @@ public void beforeClass() {
         TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
     }
 
-    @Suite(suiteId = 4, title = "Create new Topic")
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(199)
+    @QaseId(199)
     @Test(priority = 1)
     public void createTopic() {
         navigateToTopics();
@@ -91,9 +84,7 @@ public void createTopic() {
         TOPIC_LIST.add(TOPIC_TO_CREATE);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(7)
+    @QaseId(7)
     @Test(priority = 2)
     void checkAvailableOperations() {
         navigateToTopics();
@@ -109,9 +100,7 @@ void checkAvailableOperations() {
 
     @Ignore
     @Issue("https://github.com/provectus/kafka-ui/issues/3071")
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(268)
+    @QaseId(268)
     @Test(priority = 3)
     public void checkCustomParametersWithinEditExistingTopic() {
         navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
@@ -130,9 +119,7 @@ public void checkCustomParametersWithinEditExistingTopic() {
         softly.assertAll();
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(197)
+    @QaseId(197)
     @Test(priority = 4)
     public void updateTopic() {
         navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
@@ -184,9 +171,7 @@ public void updateTopic() {
         softly.assertAll();
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(242)
+    @QaseId(242)
     @Test(priority = 5)
     public void removeTopicFromTopicList() {
         navigateToTopics();
@@ -200,9 +185,7 @@ public void removeTopicFromTopicList() {
         TOPIC_LIST.remove(TOPIC_TO_UPDATE_AND_DELETE);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(207)
+    @QaseId(207)
     @Test(priority = 6)
     public void deleteTopic() {
         navigateToTopicsAndOpenDetails(TOPIC_FOR_DELETE.getName());
@@ -215,9 +198,7 @@ public void deleteTopic() {
         TOPIC_LIST.remove(TOPIC_FOR_DELETE);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(20)
+    @QaseId(20)
     @Test(priority = 7)
     public void redirectToConsumerFromTopic() {
         String topicName = "source-activities";
@@ -236,9 +217,7 @@ public void redirectToConsumerFromTopic() {
         softly.assertAll();
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(4)
+    @QaseId(4)
     @Test(priority = 8)
     public void checkTopicCreatePossibility() {
         navigateToTopics();
@@ -259,9 +238,7 @@ public void checkTopicCreatePossibility() {
         Assert.assertTrue(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(266)
+    @QaseId(266)
     @Test(priority = 9)
     public void checkTimeToRetainDataCustomValueWithEditingTopic() {
         Topic topicToRetainData = new Topic()
@@ -292,9 +269,7 @@ public void checkTimeToRetainDataCustomValueWithEditingTopic() {
         TOPIC_LIST.add(topicToRetainData);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(6)
+    @QaseId(6)
     @Test(priority = 10)
     public void checkCustomParametersWithinCreateNewTopic() {
         navigateToTopics();
@@ -313,9 +288,7 @@ public void checkCustomParametersWithinCreateNewTopic() {
                 "isValidationMessageCustomParameterValueVisible()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(2)
+    @QaseId(2)
     @Test(priority = 11)
     public void checkTopicListElements() {
         navigateToTopics();
@@ -323,11 +296,9 @@ public void checkTopicListElements() {
         verifyElementsCondition(topicsList.getAllEnabledElements(), Condition.enabled);
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(12)
+    @QaseId(12)
     @Test(priority = 12)
-    public void addingNewFilterWithinTopic() {
+    public void addNewFilterWithinTopic() {
         String filterName = randomAlphabetic(5);
         navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
         topicDetails
@@ -345,9 +316,7 @@ public void addingNewFilterWithinTopic() {
         Assert.assertTrue(topicDetails.isActiveFilterVisible(filterName), "isActiveFilterVisible()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(13)
+    @QaseId(13)
     @Test(priority = 13)
     public void checkFilterSavingWithinSavedFilters() {
         String displayName = randomAlphabetic(5);
@@ -368,9 +337,7 @@ public void checkFilterSavingWithinSavedFilters() {
                 "isFilterVisibleAtSavedFiltersMdl()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(14)
+    @QaseId(14)
     @Test(priority = 14)
     public void checkApplyingSavedFilterWithinTopicMessages() {
         String displayName = randomAlphabetic(5);
@@ -389,9 +356,7 @@ public void checkApplyingSavedFilterWithinTopicMessages() {
         Assert.assertTrue(topicDetails.isActiveFilterVisible(displayName), "isActiveFilterVisible()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(11)
+    @QaseId(11)
     @Test(priority = 15)
     public void checkShowInternalTopicsButtonFunctionality() {
         navigateToTopics();
@@ -407,9 +372,7 @@ public void checkShowInternalTopicsButtonFunctionality() {
         softly.assertAll();
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(56)
+    @QaseId(56)
     @Test(priority = 16)
     public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
         navigateToTopics();
@@ -457,9 +420,7 @@ public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
         softly.assertAll();
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(247)
+    @QaseId(247)
     @Test(priority = 17)
     public void recreateTopicFromTopicProfile() {
         Topic topicToRecreate = new Topic()
@@ -487,9 +448,7 @@ public void recreateTopicFromTopicProfile() {
                 "isAlertWithMessageVisible()");
     }
 
-    @Suite(suiteId = SUITE_ID, title = SUITE_TITLE)
-    @AutomationStatus(status = Status.AUTOMATED)
-    @CaseId(8)
+    @QaseId(8)
     @Test(priority = 18)
     public void checkCopyTopicPossibility() {
         Topic topicToCopy = new Topic()

From 8889463f7b2fc8b5e559c9f163346aa9825f55fc Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 6 Mar 2023 16:41:35 +0200
Subject: [PATCH 425/734] add httpcomponents (#3449)

---
 kafka-ui-e2e-checks/pom.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 6d3fc6e64eb..0b458cf1739 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -15,6 +15,8 @@
         <maven.surefire-plugin.version>3.0.0-M8</maven.surefire-plugin.version>
         <kafka-ui-contract>${project.version}</kafka-ui-contract>
         <testcontainers.version>1.17.6</testcontainers.version>
+        <httpcomponents.version>5.2.1</httpcomponents.version>
+        <selenium.version>4.8.1</selenium.version>
         <selenide.version>6.11.2</selenide.version>
         <testng.version>7.7.0</testng.version>
         <allure.version>2.21.0</allure.version>
@@ -120,6 +122,21 @@
             <artifactId>selenium</artifactId>
             <version>${testcontainers.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
+            <version>${httpcomponents.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>${httpcomponents.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-http</artifactId>
+            <version>${selenium.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.codeborne</groupId>
             <artifactId>selenide</artifactId>

From be151b4d82b4029e14d2a37d54efbff939fe7bf4 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 7 Mar 2023 10:36:52 +0400
Subject: [PATCH 426/734] [FE] Add a warning when copying to clipboard in
 non-SSL envs (#3394)

* set a warning message on copyToClipboard if user use http

* Update kafka-ui-react-app/src/lib/hooks/useDataSaver.ts

* changed custom type whit warning

* added  warning title

* added test case for warning message

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../components/common/Alert/Alert.styled.ts   |  4 +--
 .../src/components/common/Alert/Alert.tsx     |  4 +--
 kafka-ui-react-app/src/lib/errorHandling.tsx  |  3 +-
 .../lib/hooks/__tests__/useDataSaver.spec.tsx | 31 ++++++++++++++++++-
 .../src/lib/hooks/useDataSaver.ts             |  9 +++++-
 5 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
index 58ae2ed09df..eefd3bd3be0 100644
--- a/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Alert/Alert.styled.ts
@@ -1,7 +1,7 @@
-import { ToastType } from 'react-hot-toast';
 import styled from 'styled-components';
+import { ToastTypes } from 'lib/errorHandling';
 
-export const Alert = styled.div<{ $type: ToastType }>`
+export const Alert = styled.div<{ $type: ToastTypes }>`
   background-color: ${({ $type, theme }) => theme.alert.color[$type]};
   width: 500px;
   min-height: 64px;
diff --git a/kafka-ui-react-app/src/components/common/Alert/Alert.tsx b/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
index 8f9d167d1e8..5b58a573d4a 100644
--- a/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
+++ b/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import CloseIcon from 'components/common/Icons/CloseIcon';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
-import { ToastType } from 'react-hot-toast';
+import { ToastTypes } from 'lib/errorHandling';
 
 import * as S from './Alert.styled';
 
 export interface AlertProps {
   title: string;
-  type: ToastType;
+  type: ToastTypes;
   message: React.ReactNode;
   onDissmiss(): void;
 }
diff --git a/kafka-ui-react-app/src/lib/errorHandling.tsx b/kafka-ui-react-app/src/lib/errorHandling.tsx
index f07f4cf52ac..58b2a8bb704 100644
--- a/kafka-ui-react-app/src/lib/errorHandling.tsx
+++ b/kafka-ui-react-app/src/lib/errorHandling.tsx
@@ -9,6 +9,7 @@ interface ServerResponse {
   url?: string;
   message?: ErrorResponse['message'];
 }
+export type ToastTypes = ToastType | 'warning';
 
 export const getResponse = async (
   response: Response
@@ -34,7 +35,7 @@ interface AlertOptions {
 }
 
 export const showAlert = (
-  type: ToastType,
+  type: ToastTypes,
   { title, message, id }: AlertOptions
 ) => {
   toast.custom(
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
index f0631850e5c..9b125575d97 100644
--- a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx
@@ -1,7 +1,12 @@
 import React, { useEffect } from 'react';
 import useDataSaver from 'lib/hooks/useDataSaver';
 import { render } from '@testing-library/react';
+import { showAlert } from 'lib/errorHandling';
 
+jest.mock('lib/errorHandling', () => ({
+  ...jest.requireActual('lib/errorHandling'),
+  showAlert: jest.fn(),
+}));
 describe('useDataSaver hook', () => {
   const content = {
     title: 'title',
@@ -38,7 +43,6 @@ describe('useDataSaver hook', () => {
       mockCreate.mockRestore();
     });
   });
-
   describe('copies the data to the clipboard', () => {
     Object.assign(navigator, {
       clipboard: {
@@ -74,4 +78,29 @@ describe('useDataSaver hook', () => {
       );
     });
   });
+  describe('navigator clipboard is undefined', () => {
+    it('calls showAlert with the correct parameters when clipboard API is unavailable', () => {
+      Object.assign(navigator, {
+        clipboard: undefined,
+      });
+
+      const HookWrapper: React.FC = () => {
+        const { copyToClipboard } = useDataSaver('topic', content);
+        useEffect(() => {
+          copyToClipboard();
+        }, [copyToClipboard]);
+        return null;
+      };
+
+      render(<HookWrapper />);
+
+      expect(showAlert).toHaveBeenCalledTimes(1);
+      expect(showAlert).toHaveBeenCalledWith('warning', {
+        id: 'topic',
+        title: 'Warning',
+        message:
+          'Copying to clipboard is unavailable due to unsecured (non-HTTPS) connection',
+      });
+    });
+  });
 });
diff --git a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
index d1ff61386dc..9bcc1036794 100644
--- a/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useDataSaver.ts
@@ -1,4 +1,4 @@
-import { showSuccessAlert } from 'lib/errorHandling';
+import { showAlert, showSuccessAlert } from 'lib/errorHandling';
 
 const useDataSaver = (
   subject: string,
@@ -14,6 +14,13 @@ const useDataSaver = (
         title: '',
         message: 'Copied successfully!',
       });
+    } else {
+      showAlert('warning', {
+        id: subject,
+        title: 'Warning',
+        message:
+          'Copying to clipboard is unavailable due to unsecured (non-HTTPS) connection',
+      });
     }
   };
   const saveFile = () => {

From e261143bb466998302e7b91ccd6ad07622bc548a Mon Sep 17 00:00:00 2001
From: kristi-dev <92114648+kristi-dev@users.noreply.github.com>
Date: Tue, 7 Mar 2023 06:39:15 +0000
Subject: [PATCH 427/734] [FE] Fix oldest first button overlaps the Submit
 button (#3005)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../components/Topics/Topic/Messages/Filters/Filters.styled.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
index a8df901be4d..10802ee0db1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
@@ -33,6 +33,7 @@ export const FilterInputs = styled.div`
   gap: 8px;
   align-items: flex-end;
   width: 90%;
+  flex-wrap: wrap;
 `;
 
 export const SeekTypeSelectorWrapper = styled.div`

From b3f74cbfea7b43e50a817331e0ed549e35d566d9 Mon Sep 17 00:00:00 2001
From: Arthur <79512124+ArthurNiedial@users.noreply.github.com>
Date: Tue, 7 Mar 2023 11:36:12 +0200
Subject: [PATCH 428/734] [e2e]Checking the URL redirections for kafka-ui pages
 (#3450)

* [e2e]Checking the URL redirections for kafka-ui pages

* [e2e]Checking the URL redirections for kafka-ui pages

* [e2e]Checking the URL redirections for kafka-ui pages

* [e2e]Checking the URL redirections for kafka-ui pages

* rmv ignore from copyMessageFromTopicProfile

* move @QaseId(21) to manualSuite

---------

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../ui/pages/consumers/ConsumersList.java     |  9 +++
 .../com/provectus/kafka/ui/variables/Url.java | 11 ++++
 .../java/com/provectus/kafka/ui/BaseTest.java | 62 ++++++++++++++++++-
 .../ui/manualSuite/suite/TopicsTest.java      | 30 +++++----
 .../kafka/ui/smokeSuite/SmokeTest.java        | 31 ++++++++++
 .../ui/smokeSuite/brokers/BrokersTest.java    | 10 ---
 .../smokeSuite/connectors/ConnectorsTest.java | 19 ------
 .../ui/smokeSuite/ksqlDb/KsqlDbTest.java      |  9 +--
 .../ui/smokeSuite/schemas/SchemasTest.java    | 19 ------
 .../ui/smokeSuite/topics/MessagesTest.java    | 15 -----
 10 files changed, 131 insertions(+), 84 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
index b3a3be42a21..6d0c1d48f73 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
@@ -1,11 +1,20 @@
 package com.provectus.kafka.ui.pages.consumers;
 
+import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
 
 import static com.codeborne.selenide.Selenide.$x;
 
 public class ConsumersList extends BasePage {
 
     protected SelenideElement consumerListHeader = $x("//h1[text()='Consumers']");
+    
+    @Step
+    public ConsumersList waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        consumerListHeader.shouldHave(Condition.visible);
+        return this;
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java
new file mode 100644
index 00000000000..f612d743a5c
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java
@@ -0,0 +1,11 @@
+package com.provectus.kafka.ui.variables;
+
+public interface Url {
+    
+    String BROKERS_LIST_URL = "http://%s:8080/ui/clusters/local/brokers";
+    String TOPICS_LIST_URL = "http://%s:8080/ui/clusters/local/all-topics?perPage=25";
+    String CONSUMERS_LIST_URL = "http://%s:8080/ui/clusters/local/consumer-groups";
+    String SCHEMA_REGISTRY_LIST_URL = "http://%s:8080/ui/clusters/local/schemas";
+    String KAFKA_CONNECT_LIST_URL = "http://%s:8080/ui/clusters/local/connectors";
+    String KSQL_DB_LIST_URL = "http://%s:8080/ui/clusters/local/ksqldb/tables";
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
index 399f81e1aa2..b2e7e007e58 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
@@ -22,7 +22,7 @@
 import java.time.Duration;
 import java.util.List;
 
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
+import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.*;
 import static com.provectus.kafka.ui.settings.BaseSource.*;
 import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.*;
 import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
@@ -108,6 +108,14 @@ public void beforeMethod() {
     public void afterMethod() {
         browserClear();
     }
+    
+    @Step
+    protected void navigateToBrokers() {
+        naviSideBar
+                .openSideMenu(BROKERS);
+        brokersList
+                .waitUntilScreenReady();
+    }
 
     @Step
     protected void navigateToTopics() {
@@ -127,7 +135,57 @@ protected void navigateToTopicsAndOpenDetails(String topicName) {
         topicDetails
                 .waitUntilScreenReady();
     }
-
+    
+    @Step
+    protected void navigateToConsumers() {
+        naviSideBar
+                .openSideMenu(CONSUMERS);
+        consumersList
+                .waitUntilScreenReady();
+    }
+    
+    @Step
+    protected void navigateToSchemaRegistry() {
+        naviSideBar
+                .openSideMenu(SCHEMA_REGISTRY);
+        schemaRegistryList
+                .waitUntilScreenReady();
+    }
+    
+    @Step
+    protected void navigateToSchemaRegistryAndOpenDetails(String schemaName) {
+        navigateToSchemaRegistry();
+        schemaRegistryList
+                .openSchema(schemaName);
+        schemaDetails
+                .waitUntilScreenReady();
+    }
+    
+    @Step
+    protected void navigateToConnectors() {
+        naviSideBar
+                .openSideMenu(KAFKA_CONNECT);
+        kafkaConnectList
+                .waitUntilScreenReady();
+    }
+    
+    @Step
+    protected void navigateToConnectorsAndOpenDetails(String connectorName) {
+        navigateToConnectors();
+        kafkaConnectList
+                .openConnector(connectorName);
+        connectorDetails
+                .waitUntilScreenReady();
+    }
+    
+    @Step
+    protected void navigateToKsqlDb() {
+        naviSideBar
+                .openSideMenu(KSQL_DB);
+        ksqlDbList
+                .waitUntilScreenReady();
+    }
+    
     @Step
     protected void verifyElementsCondition(List<SelenideElement> elementList, Condition expectedCondition) {
         SoftAssert softly = new SoftAssert();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
index d768f939ce0..35188e3f45e 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
@@ -21,75 +21,81 @@ public void testCaseA() {
     public void testCaseB() {
     }
 
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(21)
+    @Test()
+    public void testCaseC() {
+    }
+
     @Automation(state = NOT_AUTOMATED)
     @QaseId(22)
     @Test
-    public void testCaseC() {
+    public void testCaseD() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(46)
     @Test
-    public void testCaseD() {
+    public void testCaseE() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(47)
     @Test
-    public void testCaseE() {
+    public void testCaseF() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(48)
     @Test
-    public void testCaseF() {
+    public void testCaseG() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(49)
     @Test
-    public void testCaseG() {
+    public void testCaseH() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(50)
     @Test
-    public void testCaseH() {
+    public void testCaseI() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(57)
     @Test
-    public void testCaseI() {
+    public void testCaseJ() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(58)
     @Test
-    public void testCaseJ() {
+    public void testCaseK() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(269)
     @Test
-    public void testCaseK() {
+    public void testCaseL() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(270)
     @Test
-    public void testCaseL() {
+    public void testCaseM() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(271)
     @Test
-    public void testCaseM() {
+    public void testCaseN() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(272)
     @Test
-    public void testCaseN() {
+    public void testCaseO() {
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
index a0c4f05da23..0ea5d2eb827 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
@@ -1,13 +1,20 @@
 package com.provectus.kafka.ui.smokeSuite;
 
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.BaseTest;
+import io.qameta.allure.Step;
 import io.qase.api.annotation.QaseId;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.provectus.kafka.ui.settings.BaseSource.BROWSER;
+import static com.provectus.kafka.ui.variables.Browser.LOCAL;
+import static com.provectus.kafka.ui.variables.Url.*;
+
 public class SmokeTest extends BaseTest {
 
     @QaseId(198)
@@ -20,4 +27,28 @@ public void checkBasePageElements() {
                 Stream.concat(topPanel.getAllEnabledElements().stream(), naviSideBar.getAllMenuButtons().stream())
                         .collect(Collectors.toList()), Condition.enabled);
     }
+
+    @QaseId(45)
+    @Test
+    public void checkUrlWhileNavigating() {
+        navigateToBrokers();
+        verifyCurrentUrl(BROKERS_LIST_URL);
+        navigateToTopics();
+        verifyCurrentUrl(TOPICS_LIST_URL);
+        navigateToConsumers();
+        verifyCurrentUrl(CONSUMERS_LIST_URL);
+        navigateToSchemaRegistry();
+        verifyCurrentUrl(SCHEMA_REGISTRY_LIST_URL);
+        navigateToConnectors();
+        verifyCurrentUrl(KAFKA_CONNECT_LIST_URL);
+        navigateToKsqlDb();
+        verifyCurrentUrl(KSQL_DB_LIST_URL);
+    }
+
+    @Step
+    private void verifyCurrentUrl(String expectedUrl) {
+        String host = BROWSER.equals(LOCAL) ? "localhost" : "host.testcontainers.internal";
+        Assert.assertEquals(WebDriverRunner.getWebDriver().getCurrentUrl(),
+                String.format(expectedUrl, host), "getCurrentUrl()");
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
index 7b11aa6556c..c9029e30ae5 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
@@ -2,12 +2,10 @@
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
-import io.qameta.allure.Step;
 import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.BROKERS;
 import static com.provectus.kafka.ui.pages.brokers.BrokersDetails.DetailsTab.CONFIGS;
 
 public class BrokersTest extends BaseTest {
@@ -40,12 +38,4 @@ public void checkExistingBrokersInCluster() {
         verifyElementsCondition(brokersConfigTab.getEditButtons(), Condition.enabled);
         Assert.assertTrue(brokersConfigTab.isSearchByKeyVisible(), "isSearchByKeyVisible()");
     }
-
-    @Step
-    private void navigateToBrokers() {
-        naviSideBar
-                .openSideMenu(BROKERS);
-        brokersList
-                .waitUntilScreenReady();
-    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
index 5291648014e..c54138d8c5a 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
@@ -3,7 +3,6 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Topic;
-import io.qameta.allure.Step;
 import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -14,7 +13,6 @@
 import java.util.List;
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KAFKA_CONNECT;
 import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
@@ -107,21 +105,4 @@ public void afterClass() {
                 apiService.deleteConnector(CONNECT_NAME, connector.getName()));
         TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
     }
-
-    @Step
-    private void navigateToConnectors() {
-        naviSideBar
-                .openSideMenu(KAFKA_CONNECT);
-        kafkaConnectList
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    private void navigateToConnectorsAndOpenDetails(String connectorName) {
-        navigateToConnectors();
-        kafkaConnectList
-                .openConnector(connectorName);
-        connectorDetails
-                .waitUntilScreenReady();
-    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
index 3627f321df6..ab1705922a1 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
@@ -8,7 +8,6 @@
 import org.testng.annotations.Test;
 import org.testng.asserts.SoftAssert;
 
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.KSQL_DB;
 import static com.provectus.kafka.ui.pages.ksqlDb.enums.KsqlQueryConfig.SHOW_TABLES;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
@@ -34,10 +33,8 @@ public void beforeClass() {
     @QaseId(41)
     @Test(priority = 1)
     public void checkShowTablesRequestExecution() {
-        naviSideBar
-                .openSideMenu(KSQL_DB);
+        navigateToKsqlDb();
         ksqlDbList
-                .waitUntilScreenReady()
                 .clickExecuteKsqlRequestBtn();
         ksqlQueryForm
                 .waitUntilScreenReady()
@@ -53,10 +50,8 @@ public void checkShowTablesRequestExecution() {
     @QaseId(86)
     @Test(priority = 2)
     public void clearResultsForExecutedRequest() {
-        naviSideBar
-                .openSideMenu(KSQL_DB);
+        navigateToKsqlDb();
         ksqlDbList
-                .waitUntilScreenReady()
                 .clickExecuteKsqlRequestBtn();
         ksqlQueryForm
                 .waitUntilScreenReady()
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
index 56ff2c0ff04..bc9519ee500 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
@@ -4,7 +4,6 @@
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.models.Schema;
-import io.qameta.allure.Step;
 import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -15,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.SCHEMA_REGISTRY;
 import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
 
 public class SchemasTest extends BaseTest {
@@ -188,21 +186,4 @@ public void deleteSchemaProtobuf() {
     public void afterClass() {
         SCHEMA_LIST.forEach(schema -> apiService.deleteSchema(schema.getName()));
     }
-
-    @Step
-    private void navigateToSchemaRegistry() {
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
-        schemaRegistryList
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    private void navigateToSchemaRegistryAndOpenDetails(String schemaName) {
-        navigateToSchemaRegistry();
-        schemaRegistryList
-                .openSchema(schemaName);
-        schemaDetails
-                .waitUntilScreenReady();
-    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
index 9f8d18b6855..dc7fc403c82 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
@@ -147,21 +147,6 @@ public void checkPurgeMessagePossibility() {
         softly.assertAll();
     }
 
-    @Ignore
-    @Issue("https://github.com/provectus/kafka-ui/issues/2819")
-    @QaseId(21)
-    @Test(priority = 5)
-    public void copyMessageFromTopicProfile() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-        topicDetails
-                .openDetailsTab(MESSAGES)
-                .getRandomMessage()
-                .openDotMenu()
-                .clickCopyToClipBoard();
-        Assert.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Copied successfully!"),
-                "isAlertWithMessageVisible()");
-    }
-
     @Ignore
     @Issue("https://github.com/provectus/kafka-ui/issues/2394")
     @QaseId(15)

From 4d20cb695804d4247731dffc62ebdb5d685647be Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 7 Mar 2023 16:24:19 +0400
Subject: [PATCH 429/734] [BE] ProtobufFilesSerde imports implementation &
 refactoring (#3357)

* Feature: Support more complex Protobuf files

The changes in https://github.com/provectus/kafka-ui/pull/2874 added
initial support for using more than 1 Protobuf file in Kafka UI in
absence of a proper schema registry.

This change is building upon that functionality to support more complex
scenarios in which there are multiple Protobuf files being used and not
all of them are explicitly listed (for example imports).

It's using the already present Wire library from Square to do the heavy
lifting and create a comprehensive schema from all Protobuf files and
directories listed in the Kafka UI configuration.

* Refactor schema loading logic and reuse in tests

* Add support for reading Protobufs from ZIP archives

* Remove unused ProtobufFileSerde#toLocation(Path)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

---------

Co-authored-by: Jochen Schalanda <jochen.schalanda@personio.de>
Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 documentation/compose/kafka-ui-serdes.yaml    |   3 +-
 documentation/compose/proto/key-types.proto   |   4 +
 documentation/guides/Protobuf.md              |  22 +-
 documentation/guides/Serialization.md         |   6 +-
 .../ui/serdes/builtin/ProtobufFileSerde.java  | 397 ++++++++++----
 .../serdes/builtin/ProtobufFileSerdeTest.java | 516 +++++++++---------
 .../{ => protobuf-serde}/address-book.proto   |  12 +-
 .../protobuf-serde/lang-description.proto     |  11 +
 .../protobuf-serde/language/language.proto    |  11 +
 .../{ => protobuf-serde}/sensor.proto         |   2 +-
 10 files changed, 596 insertions(+), 388 deletions(-)
 rename kafka-ui-api/src/test/resources/{ => protobuf-serde}/address-book.proto (81%)
 create mode 100644 kafka-ui-api/src/test/resources/protobuf-serde/lang-description.proto
 create mode 100644 kafka-ui-api/src/test/resources/protobuf-serde/language/language.proto
 rename kafka-ui-api/src/test/resources/{ => protobuf-serde}/sensor.proto (93%)

diff --git a/documentation/compose/kafka-ui-serdes.yaml b/documentation/compose/kafka-ui-serdes.yaml
index 143d454bb50..c380a34f6b4 100644
--- a/documentation/compose/kafka-ui-serdes.yaml
+++ b/documentation/compose/kafka-ui-serdes.yaml
@@ -28,8 +28,7 @@ services:
             kafka.clusters.0.serde.0.name: ProtobufFile
             kafka.clusters.0.serde.0.topicKeysPattern: "topic1"
             kafka.clusters.0.serde.0.topicValuesPattern: "topic1"
-            kafka.clusters.0.serde.0.properties.protobufFiles.0: /protofiles/key-types.proto
-            kafka.clusters.0.serde.0.properties.protobufFiles.1: /protofiles/values.proto
+            kafka.clusters.0.serde.0.properties.protobufFilesDir: /protofiles/
             kafka.clusters.0.serde.0.properties.protobufMessageNameForKey: test.MyKey # default type for keys
             kafka.clusters.0.serde.0.properties.protobufMessageName: test.MyValue # default type for values
             kafka.clusters.0.serde.0.properties.protobufMessageNameForKeyByTopic.topic1: test.MySpecificTopicKey # keys type for topic "topic1"
diff --git a/documentation/compose/proto/key-types.proto b/documentation/compose/proto/key-types.proto
index 908aed5689d..1f5e22a427d 100644
--- a/documentation/compose/proto/key-types.proto
+++ b/documentation/compose/proto/key-types.proto
@@ -1,11 +1,15 @@
 syntax = "proto3";
 package test;
 
+import "google/protobuf/wrappers.proto";
+
 message MyKey {
     string myKeyF1 = 1;
+    google.protobuf.UInt64Value uint_64_wrapper = 2;
 }
 
 message MySpecificTopicKey {
     string special_field1 = 1;
     string special_field2 = 2;
+    google.protobuf.FloatValue float_wrapper = 3;
 }
diff --git a/documentation/guides/Protobuf.md b/documentation/guides/Protobuf.md
index 533a6a8f482..12f92448c81 100644
--- a/documentation/guides/Protobuf.md
+++ b/documentation/guides/Protobuf.md
@@ -12,22 +12,26 @@ To configure Kafkaui to deserialize protobuf messages using a supplied protobuf
 ```yaml
 kafka:
   clusters:
-    - # Cluster configuration omitted.
-      # protobufFile is the path to the protobuf schema. (deprecated: please use "protobufFiles")
+    - # Cluster configuration omitted...
+      # protobufFilesDir specifies root location for proto files (will be scanned recursively)
+      # NOTE: if 'protobufFilesDir' specified, then 'protobufFile' and 'protobufFiles' settings will be ignored
+      protobufFilesDir: "/path/to/my-protobufs"
+      # (DEPRECATED) protobufFile is the path to the protobuf schema. (deprecated: please use "protobufFiles")
       protobufFile: path/to/my.proto
-      # protobufFiles is the path to one or more protobuf schemas.
-      protobufFiles: 
-        - /path/to/my.proto
-        - /path/to/another.proto
-      # protobufMessageName is the default protobuf type that is used to deserilize
-      # the message's value if the topic is not found in protobufMessageNameByTopic.
+      # (DEPRECATED) protobufFiles is the location of one or more protobuf schemas
+      protobufFiles:
+        - /path/to/my-protobufs/my.proto
+        - /path/to/my-protobufs/another.proto
+        - /path/to/my-protobufs:test/test.proto
+      # protobufMessageName is the default protobuf type that is used to deserialize
+      # the message's value if the topic is not found in protobufMessageNameByTopic.    
       protobufMessageName: my.DefaultValType
       # protobufMessageNameByTopic is a mapping of topic names to protobuf types.
       # This mapping is required and is used to deserialize the Kafka message's value.
       protobufMessageNameByTopic:
         topic1: my.Type1
         topic2: my.Type2
-      # protobufMessageNameForKey is the default protobuf type that is used to deserilize
+      # protobufMessageNameForKey is the default protobuf type that is used to deserialize
       # the message's key if the topic is not found in protobufMessageNameForKeyByTopic.
       protobufMessageNameForKey: my.DefaultKeyType
       # protobufMessageNameForKeyByTopic is a mapping of topic names to protobuf types.
diff --git a/documentation/guides/Serialization.md b/documentation/guides/Serialization.md
index 3f827441d2e..b9690f2cba1 100644
--- a/documentation/guides/Serialization.md
+++ b/documentation/guides/Serialization.md
@@ -46,10 +46,8 @@ kafka:
       serde:
         - name: ProtobufFile
           properties:
-            # path to the protobuf schema files
-            protobufFiles:
-              - path/to/my.proto
-              - path/to/another.proto
+            # path to the protobuf schema files directory
+            protobufFilesDir: "path/to/protofiles"
             # default protobuf type that is used for KEY serialization/deserialization
             # optional
             protobufMessageNameForKey: my.Type1
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
index 664c75b70d7..8a4c28a320a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
@@ -1,9 +1,36 @@
 package com.provectus.kafka.ui.serdes.builtin;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.protobuf.AnyProto;
+import com.google.protobuf.ApiProto;
+import com.google.protobuf.DescriptorProtos;
+import com.google.protobuf.Descriptors;
 import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.DurationProto;
 import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.EmptyProto;
+import com.google.protobuf.FieldMaskProto;
+import com.google.protobuf.SourceContextProto;
+import com.google.protobuf.StructProto;
+import com.google.protobuf.TimestampProto;
+import com.google.protobuf.TypeProto;
+import com.google.protobuf.WrappersProto;
 import com.google.protobuf.util.JsonFormat;
+import com.google.type.ColorProto;
+import com.google.type.DateProto;
+import com.google.type.DateTimeProto;
+import com.google.type.DayOfWeekProto;
+import com.google.type.ExprProto;
+import com.google.type.FractionProto;
+import com.google.type.IntervalProto;
+import com.google.type.LatLngProto;
+import com.google.type.MoneyProto;
+import com.google.type.MonthProto;
+import com.google.type.PhoneNumberProto;
+import com.google.type.PostalAddressProto;
+import com.google.type.QuaternionProto;
+import com.google.type.TimeOfDayProto;
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
 import com.provectus.kafka.ui.serde.api.PropertyResolver;
@@ -11,13 +38,19 @@
 import com.provectus.kafka.ui.serde.api.SchemaDescription;
 import com.provectus.kafka.ui.serdes.BuiltInSerde;
 import com.provectus.kafka.ui.util.jsonschema.ProtobufSchemaConverter;
+import com.squareup.wire.schema.ErrorCollector;
+import com.squareup.wire.schema.Linker;
+import com.squareup.wire.schema.Loader;
+import com.squareup.wire.schema.Location;
+import com.squareup.wire.schema.ProtoFile;
+import com.squareup.wire.schema.internal.parser.ProtoFileElement;
+import com.squareup.wire.schema.internal.parser.ProtoParser;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaUtils;
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -28,7 +61,10 @@
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 
+@Slf4j
 public class ProtobufFileSerde implements BuiltInSerde {
 
   public static String name() {
@@ -51,132 +87,35 @@ public static String name() {
   @Override
   public boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties,
                                      PropertyResolver globalProperties) {
-    Optional<String> protobufFile = kafkaClusterProperties.getProperty("protobufFile", String.class);
-    Optional<List<String>> protobufFiles = kafkaClusterProperties.getListProperty("protobufFiles", String.class);
-    return protobufFile.isPresent() || protobufFiles.filter(files -> !files.isEmpty()).isPresent();
+    return Configuration.canBeAutoConfigured(kafkaClusterProperties);
   }
 
   @Override
   public void autoConfigure(PropertyResolver kafkaClusterProperties,
                             PropertyResolver globalProperties) {
-    configure(kafkaClusterProperties);
+    configure(Configuration.create(kafkaClusterProperties));
   }
 
   @Override
   public void configure(PropertyResolver serdeProperties,
                         PropertyResolver kafkaClusterProperties,
                         PropertyResolver globalProperties) {
-    configure(serdeProperties);
-  }
-
-  private void configure(PropertyResolver properties) {
-    Map<Path, ProtobufSchema> protobufSchemas = joinPathProperties(properties).stream()
-        .map(path -> Map.entry(path, new ProtobufSchema(readFileAsString(path))))
-        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-
-    // Load all referenced message schemas and store their source proto file with the descriptors
-    Map<Descriptor, Path> descriptorPaths = new HashMap<>();
-    Optional<String> protobufMessageName = properties.getProperty("protobufMessageName", String.class);
-    protobufMessageName.ifPresent(messageName -> addProtobufSchema(descriptorPaths, protobufSchemas, messageName));
-
-    Optional<String> protobufMessageNameForKey =
-        properties.getProperty("protobufMessageNameForKey", String.class);
-    protobufMessageNameForKey
-        .ifPresent(messageName -> addProtobufSchema(descriptorPaths, protobufSchemas, messageName));
-
-    Optional<Map<String, String>> protobufMessageNameByTopic =
-        properties.getMapProperty("protobufMessageNameByTopic", String.class, String.class);
-    protobufMessageNameByTopic
-        .ifPresent(messageNamesByTopic -> addProtobufSchemas(descriptorPaths, protobufSchemas, messageNamesByTopic));
-
-    Optional<Map<String, String>> protobufMessageNameForKeyByTopic =
-        properties.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class);
-    protobufMessageNameForKeyByTopic
-        .ifPresent(messageNamesByTopic -> addProtobufSchemas(descriptorPaths, protobufSchemas, messageNamesByTopic));
-
-    // Fill dictionary for descriptor lookup by full message name
-    Map<String, Descriptor> descriptorMap = descriptorPaths.keySet().stream()
-        .collect(Collectors.toMap(Descriptor::getFullName, Function.identity()));
-
-    configure(
-        protobufMessageName.map(descriptorMap::get).orElse(null),
-        protobufMessageNameForKey.map(descriptorMap::get).orElse(null),
-        descriptorPaths,
-        protobufMessageNameByTopic.map(map -> populateDescriptors(descriptorMap, map)).orElse(Map.of()),
-        protobufMessageNameForKeyByTopic.map(map -> populateDescriptors(descriptorMap, map)).orElse(Map.of())
-    );
+    configure(Configuration.create(serdeProperties));
   }
 
   @VisibleForTesting
-  void configure(
-      @Nullable Descriptor defaultMessageDescriptor,
-      @Nullable Descriptor defaultKeyMessageDescriptor,
-      Map<Descriptor, Path> descriptorPaths,
-      Map<String, Descriptor> messageDescriptorMap,
-      Map<String, Descriptor> keyMessageDescriptorMap) {
-    if (defaultMessageDescriptor == null
-        && defaultKeyMessageDescriptor == null
-        && messageDescriptorMap.isEmpty()
-        && keyMessageDescriptorMap.isEmpty()) {
+  void configure(Configuration configuration) {
+    if (configuration.defaultMessageDescriptor() == null
+        && configuration.defaultKeyMessageDescriptor() == null
+        && configuration.messageDescriptorMap().isEmpty()
+        && configuration.keyMessageDescriptorMap().isEmpty()) {
       throw new ValidationException("Neither default, not per-topic descriptors defined for " + name() + " serde");
     }
-    this.defaultMessageDescriptor = defaultMessageDescriptor;
-    this.defaultKeyMessageDescriptor = defaultKeyMessageDescriptor;
-    this.descriptorPaths = descriptorPaths;
-    this.messageDescriptorMap = messageDescriptorMap;
-    this.keyMessageDescriptorMap = keyMessageDescriptorMap;
-  }
-
-  private static void addProtobufSchema(Map<Descriptor, Path> descriptorPaths,
-                                 Map<Path, ProtobufSchema> protobufSchemas,
-                                 String messageName) {
-    var descriptorAndPath = getDescriptorAndPath(protobufSchemas, messageName);
-    descriptorPaths.put(descriptorAndPath.getKey(), descriptorAndPath.getValue());
-  }
-
-  private static void addProtobufSchemas(Map<Descriptor, Path> descriptorPaths,
-                                  Map<Path, ProtobufSchema> protobufSchemas,
-                                  Map<String, String> messageNamesByTopic) {
-    messageNamesByTopic.values().stream()
-        .map(msgName -> getDescriptorAndPath(protobufSchemas, msgName))
-        .forEach(entry -> descriptorPaths.put(entry.getKey(), entry.getValue()));
-  }
-
-  private static List<Path> joinPathProperties(PropertyResolver propertyResolver) {
-    return Stream.concat(
-            propertyResolver.getProperty("protobufFile", String.class).map(List::of).stream(),
-            propertyResolver.getListProperty("protobufFiles", String.class).stream())
-        .flatMap(Collection::stream)
-        .distinct()
-        .map(Path::of)
-        .collect(Collectors.toList());
-  }
-
-  private static Map.Entry<Descriptor, Path> getDescriptorAndPath(Map<Path, ProtobufSchema> protobufSchemas,
-                                                                  String msgName) {
-    return protobufSchemas.entrySet().stream()
-            .filter(schema -> schema.getValue().toDescriptor(msgName) != null)
-            .map(schema -> Map.entry(schema.getValue().toDescriptor(msgName), schema.getKey()))
-            .findFirst()
-            .orElseThrow(() -> new NullPointerException(
-                    "The given message type not found in protobuf definition: " + msgName));
-  }
-
-  private static String readFileAsString(Path path) {
-    try {
-      return Files.readString(path);
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
-  }
-
-  private Map<String, Descriptor> populateDescriptors(Map<String, Descriptor> descriptorMap,
-                                                      Map<String, String> messageNameMap) {
-    Map<String, Descriptor> descriptors = new HashMap<>();
-    for (Map.Entry<String, String> entry : messageNameMap.entrySet()) {
-      descriptors.put(entry.getKey(), descriptorMap.get(entry.getValue()));
-    }
-    return descriptors;
+    this.defaultMessageDescriptor = configuration.defaultMessageDescriptor();
+    this.defaultKeyMessageDescriptor = configuration.defaultKeyMessageDescriptor();
+    this.descriptorPaths = configuration.descriptorPaths();
+    this.messageDescriptorMap = configuration.messageDescriptorMap();
+    this.keyMessageDescriptorMap = configuration.keyMessageDescriptorMap();
   }
 
   @Override
@@ -249,4 +188,238 @@ private SchemaDescription toSchemaDescription(Descriptor descriptor) {
         Map.of("messageName", descriptor.getFullName())
     );
   }
+
+  @SneakyThrows
+  private static String readFileAsString(Path path) {
+    return Files.readString(path);
+  }
+
+  //----------------------------------------------------------------------------------------------------------------
+
+  @VisibleForTesting
+  record Configuration(@Nullable Descriptor defaultMessageDescriptor,
+                       @Nullable Descriptor defaultKeyMessageDescriptor,
+                       Map<Descriptor, Path> descriptorPaths,
+                       Map<String, Descriptor> messageDescriptorMap,
+                       Map<String, Descriptor> keyMessageDescriptorMap) {
+
+    static boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties) {
+      Optional<String> protobufFile = kafkaClusterProperties.getProperty("protobufFile", String.class);
+      Optional<List<String>> protobufFiles = kafkaClusterProperties.getListProperty("protobufFiles", String.class);
+      Optional<String> protobufFilesDir = kafkaClusterProperties.getProperty("protobufFilesDir", String.class);
+      return protobufFilesDir.isPresent()
+          || protobufFile.isPresent()
+          || protobufFiles.filter(files -> !files.isEmpty()).isPresent();
+    }
+
+    static Configuration create(PropertyResolver properties) {
+      var protobufSchemas = loadSchemas(
+          properties.getProperty("protobufFile", String.class),
+          properties.getListProperty("protobufFiles", String.class),
+          properties.getProperty("protobufFilesDir", String.class)
+      );
+
+      // Load all referenced message schemas and store their source proto file with the descriptors
+      Map<Descriptor, Path> descriptorPaths = new HashMap<>();
+      Optional<String> protobufMessageName = properties.getProperty("protobufMessageName", String.class);
+      protobufMessageName.ifPresent(messageName -> addProtobufSchema(descriptorPaths, protobufSchemas, messageName));
+
+      Optional<String> protobufMessageNameForKey =
+          properties.getProperty("protobufMessageNameForKey", String.class);
+      protobufMessageNameForKey
+          .ifPresent(messageName -> addProtobufSchema(descriptorPaths, protobufSchemas, messageName));
+
+      Optional<Map<String, String>> protobufMessageNameByTopic =
+          properties.getMapProperty("protobufMessageNameByTopic", String.class, String.class);
+      protobufMessageNameByTopic
+          .ifPresent(messageNamesByTopic -> addProtobufSchemas(descriptorPaths, protobufSchemas, messageNamesByTopic));
+
+      Optional<Map<String, String>> protobufMessageNameForKeyByTopic =
+          properties.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class);
+      protobufMessageNameForKeyByTopic
+          .ifPresent(messageNamesByTopic -> addProtobufSchemas(descriptorPaths, protobufSchemas, messageNamesByTopic));
+
+      // Fill dictionary for descriptor lookup by full message name
+      Map<String, Descriptor> descriptorMap = descriptorPaths.keySet().stream()
+          .collect(Collectors.toMap(Descriptor::getFullName, Function.identity()));
+
+      return new Configuration(
+          protobufMessageName.map(descriptorMap::get).orElse(null),
+          protobufMessageNameForKey.map(descriptorMap::get).orElse(null),
+          descriptorPaths,
+          protobufMessageNameByTopic.map(map -> populateDescriptors(descriptorMap, map)).orElse(Map.of()),
+          protobufMessageNameForKeyByTopic.map(map -> populateDescriptors(descriptorMap, map)).orElse(Map.of())
+      );
+    }
+
+    private static Map.Entry<Descriptor, Path> getDescriptorAndPath(Map<Path, ProtobufSchema> protobufSchemas,
+                                                                    String msgName) {
+      return protobufSchemas.entrySet().stream()
+          .filter(schema -> schema.getValue().toDescriptor(msgName) != null)
+          .map(schema -> Map.entry(schema.getValue().toDescriptor(msgName), schema.getKey()))
+          .findFirst()
+          .orElseThrow(() -> new NullPointerException(
+              "The given message type not found in protobuf definition: " + msgName));
+    }
+
+    private static Map<String, Descriptor> populateDescriptors(Map<String, Descriptor> descriptorMap,
+                                                               Map<String, String> messageNameMap) {
+      Map<String, Descriptor> descriptors = new HashMap<>();
+      for (Map.Entry<String, String> entry : messageNameMap.entrySet()) {
+        descriptors.put(entry.getKey(), descriptorMap.get(entry.getValue()));
+      }
+      return descriptors;
+    }
+
+    @VisibleForTesting
+    static Map<Path, ProtobufSchema> loadSchemas(Optional<String> protobufFile,
+                                                 Optional<List<String>> protobufFiles,
+                                                 Optional<String> protobufFilesDir) {
+      if (protobufFilesDir.isPresent()) {
+        if (protobufFile.isPresent() || protobufFiles.isPresent()) {
+          log.warn("protobufFile and protobufFiles properties will be ignored, since protobufFilesDir provided");
+        }
+        List<ProtoFile> loadedFiles = new ProtoSchemaLoader(protobufFilesDir.get()).load();
+        Map<String, ProtoFileElement> allPaths = loadedFiles.stream()
+            .collect(Collectors.toMap(f -> f.getLocation().getPath(), ProtoFile::toElement));
+        return loadedFiles.stream()
+            .collect(Collectors.toMap(
+                f -> Path.of(f.getLocation().getBase(), f.getLocation().getPath()),
+                f -> new ProtobufSchema(f.toElement(), List.of(), allPaths)));
+      }
+      //Supporting for backward-compatibility. Normally, protobufFilesDir setting should be used
+      return Stream.concat(
+              protobufFile.stream(),
+              protobufFiles.stream().flatMap(Collection::stream)
+          )
+          .distinct()
+          .map(Path::of)
+          .collect(Collectors.toMap(path -> path, path -> new ProtobufSchema(readFileAsString(path))));
+    }
+
+    private static void addProtobufSchema(Map<Descriptor, Path> descriptorPaths,
+                                          Map<Path, ProtobufSchema> protobufSchemas,
+                                          String messageName) {
+      var descriptorAndPath = getDescriptorAndPath(protobufSchemas, messageName);
+      descriptorPaths.put(descriptorAndPath.getKey(), descriptorAndPath.getValue());
+    }
+
+    private static void addProtobufSchemas(Map<Descriptor, Path> descriptorPaths,
+                                           Map<Path, ProtobufSchema> protobufSchemas,
+                                           Map<String, String> messageNamesByTopic) {
+      messageNamesByTopic.values().stream()
+          .map(msgName -> getDescriptorAndPath(protobufSchemas, msgName))
+          .forEach(entry -> descriptorPaths.put(entry.getKey(), entry.getValue()));
+    }
+  }
+
+  static class ProtoSchemaLoader {
+
+    private final Path baseLocation;
+
+    ProtoSchemaLoader(String baseLocationStr) {
+      this.baseLocation = Path.of(baseLocationStr);
+      if (!Files.isReadable(baseLocation)) {
+        throw new ValidationException("proto files directory not readable");
+      }
+    }
+
+    List<ProtoFile> load() {
+      Map<String, ProtoFile> knownTypes = knownProtoFiles();
+
+      Map<String, ProtoFile> filesByLocations = new HashMap<>();
+      filesByLocations.putAll(knownTypes);
+      filesByLocations.putAll(loadFilesWithLocations());
+
+      Linker linker = new Linker(
+          createFilesLoader(filesByLocations),
+          new ErrorCollector(),
+          true,
+          true
+      );
+      var schema = linker.link(filesByLocations.values());
+      linker.getErrors().throwIfNonEmpty();
+      return schema.getProtoFiles()
+          .stream()
+          .filter(p -> !knownTypes.containsKey(p.getLocation().getPath())) //filtering known types
+          .toList();
+    }
+
+    private Map<String, ProtoFile> knownProtoFiles() {
+      return Stream.of(
+          loadKnownProtoFile("google/type/color.proto", ColorProto.getDescriptor()),
+          loadKnownProtoFile("google/type/date.proto", DateProto.getDescriptor()),
+          loadKnownProtoFile("google/type/datetime.proto", DateTimeProto.getDescriptor()),
+          loadKnownProtoFile("google/type/dayofweek.proto", DayOfWeekProto.getDescriptor()),
+          loadKnownProtoFile("google/type/decimal.proto", com.google.type.DecimalProto.getDescriptor()),
+          loadKnownProtoFile("google/type/expr.proto", ExprProto.getDescriptor()),
+          loadKnownProtoFile("google/type/fraction.proto", FractionProto.getDescriptor()),
+          loadKnownProtoFile("google/type/interval.proto", IntervalProto.getDescriptor()),
+          loadKnownProtoFile("google/type/latlng.proto", LatLngProto.getDescriptor()),
+          loadKnownProtoFile("google/type/money.proto", MoneyProto.getDescriptor()),
+          loadKnownProtoFile("google/type/month.proto", MonthProto.getDescriptor()),
+          loadKnownProtoFile("google/type/phone_number.proto", PhoneNumberProto.getDescriptor()),
+          loadKnownProtoFile("google/type/postal_address.proto", PostalAddressProto.getDescriptor()),
+          loadKnownProtoFile("google/type/quaternion.prot", QuaternionProto.getDescriptor()),
+          loadKnownProtoFile("google/type/timeofday.proto", TimeOfDayProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/any.proto", AnyProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/api.proto", ApiProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/descriptor.proto", DescriptorProtos.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/duration.proto", DurationProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/empty.proto", EmptyProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/field_mask.proto", FieldMaskProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/source_context.proto", SourceContextProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/struct.proto", StructProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/timestamp.proto", TimestampProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/type.proto", TypeProto.getDescriptor()),
+          loadKnownProtoFile("google/protobuf/wrappers.proto", WrappersProto.getDescriptor())
+      ).collect(Collectors.toMap(p -> p.getLocation().getPath(), p -> p));
+    }
+
+    private ProtoFile loadKnownProtoFile(String path, Descriptors.FileDescriptor fileDescriptor) {
+      String protoFileString = null;
+      // know type file contains either message or enum
+      if (!fileDescriptor.getMessageTypes().isEmpty()) {
+        protoFileString = new ProtobufSchema(fileDescriptor.getMessageTypes().get(0)).canonicalString();
+      } else if (!fileDescriptor.getEnumTypes().isEmpty()) {
+        protoFileString = new ProtobufSchema(fileDescriptor.getEnumTypes().get(0)).canonicalString();
+      } else {
+        throw new IllegalStateException();
+      }
+      return ProtoFile.Companion.get(ProtoParser.Companion.parse(Location.get(path), protoFileString));
+    }
+
+    private Loader createFilesLoader(Map<String, ProtoFile> files) {
+      return new Loader() {
+        @Override
+        public @NotNull ProtoFile load(@NotNull String path) {
+          return Preconditions.checkNotNull(files.get(path), "ProtoFile not found for import '%s'", path);
+        }
+
+        @Override
+        public @NotNull Loader withErrors(@NotNull ErrorCollector errorCollector) {
+          return this;
+        }
+      };
+    }
+
+    @SneakyThrows
+    private Map<String, ProtoFile> loadFilesWithLocations() {
+      Map<String, ProtoFile> filesByLocations = new HashMap<>();
+      try (var files = Files.walk(baseLocation)) {
+        files.filter(p -> !Files.isDirectory(p) && p.toString().endsWith(".proto"))
+            .forEach(path -> {
+              // relative path will be used as "import" statement
+              String relativePath = baseLocation.relativize(path).toString();
+              var protoFileElement = ProtoParser.Companion.parse(
+                  Location.get(baseLocation.toString(), relativePath),
+                  readFileAsString(path)
+              );
+              filesByLocations.put(relativePath, ProtoFile.Companion.get(protoFileElement));
+            });
+      }
+      return filesByLocations;
+    }
+  }
+
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
index 3de915145f4..ab99df74de6 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
@@ -10,14 +10,16 @@
 import com.google.protobuf.util.JsonFormat;
 import com.provectus.kafka.ui.serde.api.PropertyResolver;
 import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde.Configuration;
+import com.squareup.wire.schema.ProtoFile;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.util.ResourceUtils;
 
@@ -29,28 +31,29 @@ class ProtobufFileSerdeTest {
   private static final String sampleBookMsgJson = "{\"version\": 1, \"people\": ["
       + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"addrBook@example.com\", \"phones\":[]}]}";
 
-  private static final String sampleSensorMsgJson = "{ \"name\": \"My Sensor\", "
-      + "\"temperature\": 20.5, \"humidity\": 50, \"door\": \"OPEN\" }";
+  private static final String sampleLangDescriptionMsgJson = "{ \"lang\": \"EN\", "
+      + "\"descr\": \"Some description here\" }";
 
   // Sample message of type `test.Person`
   private byte[] personMessageBytes;
   // Sample message of type `test.AddressBook`
   private byte[] addressBookMessageBytes;
-  private byte[] sensorMessageBytes;
-  private Path addressBookSchemaPath;
-  private Path sensorSchemaPath;
-
+  private byte[] langDescriptionMessageBytes;
   private Descriptors.Descriptor personDescriptor;
   private Descriptors.Descriptor addressBookDescriptor;
-  private Descriptors.Descriptor sensorDescriptor;
+  private Descriptors.Descriptor langDescriptionDescriptor;
   private Map<Descriptors.Descriptor, Path> descriptorPaths;
 
   @BeforeEach
   void setUp() throws Exception {
-    addressBookSchemaPath = ResourceUtils.getFile("classpath:address-book.proto").toPath();
-    sensorSchemaPath = ResourceUtils.getFile("classpath:sensor.proto").toPath();
+    Map<Path, ProtobufSchema> files = ProtobufFileSerde.Configuration.loadSchemas(
+        Optional.empty(),
+        Optional.empty(),
+        Optional.of(protoFilesDir())
+    );
 
-    ProtobufSchema addressBookSchema = new ProtobufSchema(Files.readString(addressBookSchemaPath));
+    Path addressBookSchemaPath = ResourceUtils.getFile("classpath:protobuf-serde/address-book.proto").toPath();
+    var addressBookSchema = files.get(addressBookSchemaPath);
     var builder = addressBookSchema.newMessageBuilder("test.Person");
     JsonFormat.parser().merge(samplePersonMsgJson, builder);
     personMessageBytes = builder.build().toByteArray();
@@ -61,63 +64,241 @@ void setUp() throws Exception {
     personDescriptor = addressBookSchema.toDescriptor("test.Person");
     addressBookDescriptor = addressBookSchema.toDescriptor("test.AddressBook");
 
-    ProtobufSchema sensorSchema = new ProtobufSchema(Files.readString(sensorSchemaPath));
-    builder = sensorSchema.newMessageBuilder("iot.Sensor");
-    JsonFormat.parser().merge(sampleSensorMsgJson, builder);
-    sensorMessageBytes = builder.build().toByteArray();
-    sensorDescriptor = sensorSchema.toDescriptor("iot.Sensor");
+    Path languageDescriptionPath = ResourceUtils.getFile("classpath:protobuf-serde/lang-description.proto").toPath();
+    var languageDescriptionSchema = files.get(languageDescriptionPath);
+    builder = languageDescriptionSchema.newMessageBuilder("test.LanguageDescription");
+    JsonFormat.parser().merge(sampleLangDescriptionMsgJson, builder);
+    langDescriptionMessageBytes = builder.build().toByteArray();
+    langDescriptionDescriptor = languageDescriptionSchema.toDescriptor("test.LanguageDescription");
 
     descriptorPaths = Map.of(
         personDescriptor, addressBookSchemaPath,
-        addressBookDescriptor, addressBookSchemaPath,
-        sensorDescriptor, sensorSchemaPath
+        addressBookDescriptor, addressBookSchemaPath
     );
   }
 
-
   @Test
-  void testDeserialize() {
-    var messageNameMap = Map.of(
-        "persons", personDescriptor,
-        "books", addressBookDescriptor
-    );
-    var keyMessageNameMap = Map.of(
-        "books", addressBookDescriptor);
-
-    var serde = new ProtobufFileSerde();
-    serde.configure(
-        null,
-        null,
-        descriptorPaths,
-        messageNameMap,
-        keyMessageNameMap
-    );
+  void loadsAllProtoFiledFromTargetDirectory() throws Exception {
+    var protoDir = ResourceUtils.getFile("classpath:protobuf-serde/").getPath();
+    List<ProtoFile> files = new ProtobufFileSerde.ProtoSchemaLoader(protoDir).load();
+    assertThat(files).hasSize(4);
+    assertThat(files)
+        .map(f -> f.getLocation().getPath())
+        .containsExactlyInAnyOrder(
+            "language/language.proto",
+            "sensor.proto",
+            "address-book.proto",
+            "lang-description.proto"
+        );
+  }
 
-    var deserializedPerson = serde.deserializer("persons", Serde.Target.VALUE)
-        .deserialize(null, personMessageBytes);
-    assertJsonEquals(samplePersonMsgJson, deserializedPerson.getResult());
+  @SneakyThrows
+  private String protoFilesDir() {
+    return ResourceUtils.getFile("classpath:protobuf-serde/").getPath();
+  }
 
-    var deserializedBook = serde.deserializer("books", Serde.Target.KEY)
-        .deserialize(null, addressBookMessageBytes);
-    assertJsonEquals(sampleBookMsgJson, deserializedBook.getResult());
+  @Nested
+  class ConfigurationTests {
+
+    @Test
+    void canBeAutoConfiguredReturnsNoProtoPropertiesProvided() {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      assertThat(Configuration.canBeAutoConfigured(resolver))
+          .isFalse();
+    }
+
+    @Test
+    void canBeAutoConfiguredReturnsTrueIfNoProtoFileHasBeenProvided() {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      when(resolver.getProperty("protobufFile", String.class))
+          .thenReturn(Optional.of("file.proto"));
+      assertThat(Configuration.canBeAutoConfigured(resolver))
+          .isTrue();
+    }
+
+    @Test
+    void canBeAutoConfiguredReturnsTrueIfProtoFilesHasBeenProvided() {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      when(resolver.getListProperty("protobufFiles", String.class))
+          .thenReturn(Optional.of(List.of("file.proto")));
+      assertThat(Configuration.canBeAutoConfigured(resolver))
+          .isTrue();
+    }
+
+    @Test
+    void canBeAutoConfiguredReturnsTrueIfProtoFilesDirProvided() {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      when(resolver.getProperty("protobufFilesDir", String.class))
+          .thenReturn(Optional.of("/filesDir"));
+      assertThat(Configuration.canBeAutoConfigured(resolver))
+          .isTrue();
+    }
+
+    @Test
+    void unknownSchemaAsDefaultThrowsException() {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      when(resolver.getProperty("protobufFilesDir", String.class))
+          .thenReturn(Optional.of(protoFilesDir()));
+
+      when(resolver.getProperty("protobufMessageName", String.class))
+          .thenReturn(Optional.of("test.NotExistent"));
+
+      assertThatThrownBy(() -> Configuration.create(resolver))
+          .isInstanceOf(NullPointerException.class)
+          .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
+    }
+
+    @Test
+    void unknownSchemaAsDefaultForKeyThrowsException() {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      when(resolver.getProperty("protobufFilesDir", String.class))
+          .thenReturn(Optional.of(protoFilesDir()));
+
+      when(resolver.getProperty("protobufMessageNameForKey", String.class))
+          .thenReturn(Optional.of("test.NotExistent"));
+
+      assertThatThrownBy(() -> Configuration.create(resolver))
+          .isInstanceOf(NullPointerException.class)
+          .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
+    }
+
+    @Test
+    void unknownSchemaAsTopicSchemaThrowsException() {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      when(resolver.getProperty("protobufFilesDir", String.class))
+          .thenReturn(Optional.of(protoFilesDir()));
+
+      when(resolver.getMapProperty("protobufMessageNameByTopic", String.class, String.class))
+          .thenReturn(Optional.of(Map.of("persons", "test.NotExistent")));
+
+      assertThatThrownBy(() -> Configuration.create(resolver))
+          .isInstanceOf(NullPointerException.class)
+          .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
+    }
+
+    @Test
+    void unknownSchemaAsTopicSchemaForKeyThrowsException() {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      when(resolver.getProperty("protobufFilesDir", String.class))
+          .thenReturn(Optional.of(protoFilesDir()));
+
+      when(resolver.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class))
+          .thenReturn(Optional.of(Map.of("persons", "test.NotExistent")));
+
+      assertThatThrownBy(() -> Configuration.create(resolver))
+          .isInstanceOf(NullPointerException.class)
+          .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
+    }
+
+    @Test
+    void createConfigureFillsDescriptorMappingsWhenProtoFilesListProvided() throws Exception {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      when(resolver.getProperty("protobufFile", String.class))
+          .thenReturn(Optional.of(
+              ResourceUtils.getFile("classpath:protobuf-serde/sensor.proto").getPath()));
+
+      when(resolver.getListProperty("protobufFiles", String.class))
+          .thenReturn(Optional.of(
+              List.of(
+                  ResourceUtils.getFile("classpath:protobuf-serde/address-book.proto").getPath())));
+
+      when(resolver.getProperty("protobufMessageName", String.class))
+          .thenReturn(Optional.of("test.Sensor"));
+
+      when(resolver.getProperty("protobufMessageNameForKey", String.class))
+          .thenReturn(Optional.of("test.AddressBook"));
+
+      when(resolver.getMapProperty("protobufMessageNameByTopic", String.class, String.class))
+          .thenReturn(Optional.of(
+              Map.of(
+                  "topic1", "test.Sensor",
+                  "topic2", "test.AddressBook")));
+
+      when(resolver.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class))
+          .thenReturn(Optional.of(
+              Map.of(
+                  "topic1", "test.Person",
+                  "topic2", "test.AnotherPerson")));
+
+      var configuration = Configuration.create(resolver);
+
+      assertThat(configuration.defaultMessageDescriptor())
+          .matches(d -> d.getFullName().equals("test.Sensor"));
+      assertThat(configuration.defaultKeyMessageDescriptor())
+          .matches(d -> d.getFullName().equals("test.AddressBook"));
+
+      assertThat(configuration.messageDescriptorMap())
+          .containsOnlyKeys("topic1", "topic2")
+          .anySatisfy((topic, descr) -> assertThat(descr.getFullName()).isEqualTo("test.Sensor"))
+          .anySatisfy((topic, descr) -> assertThat(descr.getFullName()).isEqualTo("test.AddressBook"));
+
+      assertThat(configuration.keyMessageDescriptorMap())
+          .containsOnlyKeys("topic1", "topic2")
+          .anySatisfy((topic, descr) -> assertThat(descr.getFullName()).isEqualTo("test.Person"))
+          .anySatisfy((topic, descr) -> assertThat(descr.getFullName()).isEqualTo("test.AnotherPerson"));
+    }
+
+    @Test
+    void createConfigureFillsDescriptorMappingsWhenProtoFileDirProvided() throws Exception {
+      PropertyResolver resolver = mock(PropertyResolver.class);
+      when(resolver.getProperty("protobufFilesDir", String.class))
+          .thenReturn(Optional.of(protoFilesDir()));
+
+      when(resolver.getProperty("protobufMessageName", String.class))
+          .thenReturn(Optional.of("test.Sensor"));
+
+      when(resolver.getProperty("protobufMessageNameForKey", String.class))
+          .thenReturn(Optional.of("test.AddressBook"));
+
+      when(resolver.getMapProperty("protobufMessageNameByTopic", String.class, String.class))
+          .thenReturn(Optional.of(
+              Map.of(
+                  "topic1", "test.Sensor",
+                  "topic2", "test.LanguageDescription")));
+
+      when(resolver.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class))
+          .thenReturn(Optional.of(
+              Map.of(
+                  "topic1", "test.Person",
+                  "topic2", "test.AnotherPerson")));
+
+      var configuration = Configuration.create(resolver);
+
+      assertThat(configuration.defaultMessageDescriptor())
+          .matches(d -> d.getFullName().equals("test.Sensor"));
+      assertThat(configuration.defaultKeyMessageDescriptor())
+          .matches(d -> d.getFullName().equals("test.AddressBook"));
+
+      assertThat(configuration.messageDescriptorMap())
+          .containsOnlyKeys("topic1", "topic2")
+          .anySatisfy((topic, descr) -> assertThat(descr.getFullName()).isEqualTo("test.Sensor"))
+          .anySatisfy((topic, descr) -> assertThat(descr.getFullName()).isEqualTo("test.LanguageDescription"));
+
+      assertThat(configuration.keyMessageDescriptorMap())
+          .containsOnlyKeys("topic1", "topic2")
+          .anySatisfy((topic, descr) -> assertThat(descr.getFullName()).isEqualTo("test.Person"))
+          .anySatisfy((topic, descr) -> assertThat(descr.getFullName()).isEqualTo("test.AnotherPerson"));
+    }
   }
 
   @Test
-  void testDeserializeMultipleProtobuf() {
+  void deserializeUsesTopicsMappingToFindMsgDescriptor() {
     var messageNameMap = Map.of(
         "persons", personDescriptor,
         "books", addressBookDescriptor,
-        "sensors", sensorDescriptor
+        "langs", langDescriptionDescriptor
     );
     var keyMessageNameMap = Map.of(
         "books", addressBookDescriptor);
     var serde = new ProtobufFileSerde();
     serde.configure(
-        null,
-        null,
-        descriptorPaths,
-        messageNameMap,
-        keyMessageNameMap
+        new Configuration(
+            null,
+            null,
+            descriptorPaths,
+            messageNameMap,
+            keyMessageNameMap
+        )
     );
 
     var deserializedPerson = serde.deserializer("persons", Serde.Target.VALUE)
@@ -128,20 +309,22 @@ void testDeserializeMultipleProtobuf() {
         .deserialize(null, addressBookMessageBytes);
     assertJsonEquals(sampleBookMsgJson, deserializedBook.getResult());
 
-    var deserializedSensor = serde.deserializer("sensors", Serde.Target.VALUE)
-        .deserialize(null, sensorMessageBytes);
-    assertJsonEquals(sampleSensorMsgJson, deserializedSensor.getResult());
+    var deserializedSensor = serde.deserializer("langs", Serde.Target.VALUE)
+        .deserialize(null, langDescriptionMessageBytes);
+    assertJsonEquals(sampleLangDescriptionMsgJson, deserializedSensor.getResult());
   }
 
   @Test
-  void testDefaultMessageName() {
+  void deserializeUsesDefaultDescriptorIfTopicMappingNotFound() {
     var serde = new ProtobufFileSerde();
     serde.configure(
-        personDescriptor,
-        addressBookDescriptor,
-        descriptorPaths,
-        Map.of(),
-        Map.of()
+        new Configuration(
+            personDescriptor,
+            addressBookDescriptor,
+            descriptorPaths,
+            Map.of(),
+            Map.of()
+        )
     );
 
     var deserializedPerson = serde.deserializer("persons", Serde.Target.VALUE)
@@ -154,230 +337,57 @@ void testDefaultMessageName() {
   }
 
   @Test
-  void testSerialize() {
-    var messageNameMap = Map.of(
-        "persons", personDescriptor,
-        "books", addressBookDescriptor
-    );
-    var keyMessageNameMap = Map.of(
-        "books", addressBookDescriptor);
-
-    var serde = new ProtobufFileSerde();
-    serde.configure(
-        null,
-        null,
-        descriptorPaths,
-        messageNameMap,
-        keyMessageNameMap
-    );
-
-    var personBytes = serde.serializer("persons", Serde.Target.VALUE)
-        .serialize("{ \"name\": \"My Name\",\"id\": 101, \"email\": \"user1@example.com\" }");
-    assertThat(personBytes).isEqualTo(personMessageBytes);
-
-    var booksBytes = serde.serializer("books", Serde.Target.KEY)
-        .serialize("{\"version\": 1, \"people\": ["
-            + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"addrBook@example.com\" }]}");
-    assertThat(booksBytes).isEqualTo(addressBookMessageBytes);
-  }
-
-  @Test
-  void testSerializeMultipleProtobuf() {
+  void serializeUsesTopicsMappingToFindMsgDescriptor() {
     var messageNameMap = Map.of(
         "persons", personDescriptor,
         "books", addressBookDescriptor,
-        "sensors", sensorDescriptor
+        "langs", langDescriptionDescriptor
     );
     var keyMessageNameMap = Map.of(
         "books", addressBookDescriptor);
 
     var serde = new ProtobufFileSerde();
     serde.configure(
-        null,
-        null,
-        descriptorPaths,
-        messageNameMap,
-        keyMessageNameMap
+        new Configuration(
+            null,
+            null,
+            descriptorPaths,
+            messageNameMap,
+            keyMessageNameMap
+        )
     );
 
-    var personBytes = serde.serializer("persons", Serde.Target.VALUE)
-        .serialize("{ \"name\": \"My Name\",\"id\": 101, \"email\": \"user1@example.com\" }");
-    assertThat(personBytes).isEqualTo(personMessageBytes);
+    var personBytes = serde.serializer("langs", Serde.Target.VALUE)
+        .serialize(sampleLangDescriptionMsgJson);
+    assertThat(personBytes).isEqualTo(langDescriptionMessageBytes);
 
     var booksBytes = serde.serializer("books", Serde.Target.KEY)
-        .serialize("{\"version\": 1, \"people\": ["
-            + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"addrBook@example.com\" }]}");
+        .serialize(sampleBookMsgJson);
     assertThat(booksBytes).isEqualTo(addressBookMessageBytes);
-
-    var sensorBytes = serde.serializer("sensors", Serde.Target.VALUE)
-        .serialize("{ \"name\": \"My Sensor\", \"temperature\": 20.5, \"humidity\": 50, \"door\": \"OPEN\" }");
-    assertThat(sensorBytes).isEqualTo(sensorMessageBytes);
   }
 
   @Test
-  void testSerializeDefaults() {
+  void serializeUsesDefaultDescriptorIfTopicMappingNotFound() {
     var serde = new ProtobufFileSerde();
     serde.configure(
-        personDescriptor,
-        addressBookDescriptor,
-        descriptorPaths,
-        Map.of(),
-        Map.of()
+        new Configuration(
+            personDescriptor,
+            addressBookDescriptor,
+            descriptorPaths,
+            Map.of(),
+            Map.of()
+        )
     );
 
     var personBytes = serde.serializer("persons", Serde.Target.VALUE)
-        .serialize("{ \"name\": \"My Name\",\"id\": 101, \"email\": \"user1@example.com\" }");
+        .serialize(samplePersonMsgJson);
     assertThat(personBytes).isEqualTo(personMessageBytes);
 
     var booksBytes = serde.serializer("books", Serde.Target.KEY)
-        .serialize("{\"version\": 1, \"people\": ["
-            + "{ \"name\": \"My Name\",\"id\": 102, \"email\": \"addrBook@example.com\" }]}");
+        .serialize(sampleBookMsgJson);
     assertThat(booksBytes).isEqualTo(addressBookMessageBytes);
   }
 
-  @Test
-  void canBeAutoConfiguredReturnsFalseIfNoProtoFilesHaveBeenProvided() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-
-    var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
-    assertThat(startupSuccessful).isFalse();
-  }
-
-  @Test
-  void canBeAutoConfiguredReturnsFalseIfProtoFilesListIsEmpty() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-    when(resolver.getListProperty("protobufFiles", String.class)).thenReturn(Optional.of(List.of()));
-
-    var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
-    assertThat(startupSuccessful).isFalse();
-  }
-
-  @Test
-  void canBeAutoConfiguredReturnsTrueIfNoProtoFileHasBeenProvided() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-    when(resolver.getProperty("protobufFile", String.class)).thenReturn(Optional.of("file.proto"));
-
-    var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
-    assertThat(startupSuccessful).isTrue();
-  }
-
-  @Test
-  void canBeAutoConfiguredReturnsTrueIfProtoFilesHasBeenProvided() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-    when(resolver.getListProperty("protobufFiles", String.class)).thenReturn(Optional.of(List.of("file.proto")));
-
-    var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
-    assertThat(startupSuccessful).isTrue();
-  }
-
-  @Test
-  void canBeAutoConfiguredReturnsTrueIfProtoFileAndProtoFilesHaveBeenProvided() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-    when(resolver.getProperty("protobufFile", String.class)).thenReturn(Optional.of("file1.proto"));
-    when(resolver.getListProperty("protobufFiles", String.class)).thenReturn(Optional.of(List.of("file2.proto")));
-
-    var serde = new ProtobufFileSerde();
-    boolean startupSuccessful = serde.canBeAutoConfigured(resolver, resolver);
-    assertThat(startupSuccessful).isTrue();
-  }
-
-  @Test
-  void listOfProtobufFilesIsJoined() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-    when(resolver.getProperty("protobufFile", String.class))
-        .thenReturn(Optional.of(addressBookSchemaPath.toString()));
-    when(resolver.getListProperty("protobufFiles", String.class))
-        .thenReturn(Optional.of(List.of(sensorSchemaPath.toString())));
-    when(resolver.getProperty("protobufMessageName", String.class))
-        .thenReturn(Optional.of("test.AddressBook"));
-
-    Map<String, String> protobufMessageNameByTopic = Map.of(
-        "persons", "test.Person",
-        "books", "test.AddressBook",
-        "sensors", "iot.Sensor");
-    when(resolver.getMapProperty("protobufMessageNameByTopic", String.class, String.class))
-        .thenReturn(Optional.of(protobufMessageNameByTopic));
-
-    var serde = new ProtobufFileSerde();
-    serde.configure(resolver, resolver, resolver);
-
-    var deserializedPerson = serde.deserializer("persons", Serde.Target.VALUE)
-        .deserialize(null, personMessageBytes);
-    assertJsonEquals(samplePersonMsgJson, deserializedPerson.getResult());
-
-    var deserializedSensor = serde.deserializer("sensors", Serde.Target.VALUE)
-        .deserialize(null, sensorMessageBytes);
-    assertJsonEquals(sampleSensorMsgJson, deserializedSensor.getResult());
-  }
-
-  @Test
-  void unknownSchemaAsDefaultThrowsException() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-    when(resolver.getListProperty("protobufFiles", String.class))
-        .thenReturn(Optional.of(List.of(addressBookSchemaPath.toString(), sensorSchemaPath.toString())));
-    when(resolver.getProperty("protobufMessageName", String.class))
-        .thenReturn(Optional.of("test.NotExistent"));
-
-    var serde = new ProtobufFileSerde();
-    assertThatThrownBy(() -> serde.configure(resolver, resolver, resolver))
-        .isInstanceOf(NullPointerException.class)
-        .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
-  }
-
-  @Test
-  void unknownSchemaAsDefaultForKeyThrowsException() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-    when(resolver.getListProperty("protobufFiles", String.class))
-        .thenReturn(Optional.of(List.of(addressBookSchemaPath.toString(), sensorSchemaPath.toString())));
-    when(resolver.getProperty("protobufMessageName", String.class))
-        .thenReturn(Optional.of("test.AddressBook"));
-    when(resolver.getProperty("protobufMessageNameForKey", String.class))
-        .thenReturn(Optional.of("test.NotExistent"));
-
-    var serde = new ProtobufFileSerde();
-    assertThatThrownBy(() -> serde.configure(resolver, resolver, resolver))
-        .isInstanceOf(NullPointerException.class)
-        .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
-  }
-
-  @Test
-  void unknownSchemaAsTopicSchemaThrowsException() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-    when(resolver.getListProperty("protobufFiles", String.class))
-        .thenReturn(Optional.of(List.of(addressBookSchemaPath.toString(), sensorSchemaPath.toString())));
-    when(resolver.getProperty("protobufMessageName", String.class))
-        .thenReturn(Optional.of("test.AddressBook"));
-
-    when(resolver.getMapProperty("protobufMessageNameByTopic", String.class, String.class))
-        .thenReturn(Optional.of(Map.of("persons", "test.NotExistent")));
-
-    var serde = new ProtobufFileSerde();
-    assertThatThrownBy(() -> serde.configure(resolver, resolver, resolver))
-        .isInstanceOf(NullPointerException.class)
-        .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
-  }
-
-  @Test
-  void unknownSchemaAsTopicSchemaForKeyThrowsException() {
-    PropertyResolver resolver = mock(PropertyResolver.class);
-    when(resolver.getListProperty("protobufFiles", String.class))
-        .thenReturn(Optional.of(List.of(addressBookSchemaPath.toString(), sensorSchemaPath.toString())));
-    when(resolver.getProperty("protobufMessageName", String.class))
-        .thenReturn(Optional.of("test.AddressBook"));
-
-    when(resolver.getMapProperty("protobufMessageNameForKeyByTopic", String.class, String.class))
-        .thenReturn(Optional.of(Map.of("persons", "test.NotExistent")));
-
-    var serde = new ProtobufFileSerde();
-    assertThatThrownBy(() -> serde.configure(resolver, resolver, resolver))
-        .isInstanceOf(NullPointerException.class)
-        .hasMessage("The given message type not found in protobuf definition: test.NotExistent");
-  }
-
   @SneakyThrows
   private void assertJsonEquals(String expectedJson, String actualJson) {
     var mapper = new JsonMapper();
diff --git a/kafka-ui-api/src/test/resources/address-book.proto b/kafka-ui-api/src/test/resources/protobuf-serde/address-book.proto
similarity index 81%
rename from kafka-ui-api/src/test/resources/address-book.proto
rename to kafka-ui-api/src/test/resources/protobuf-serde/address-book.proto
index 72eab7aab8c..f6c9a5d7880 100644
--- a/kafka-ui-api/src/test/resources/address-book.proto
+++ b/kafka-ui-api/src/test/resources/protobuf-serde/address-book.proto
@@ -1,16 +1,10 @@
-// [START declaration]
 syntax = "proto3";
 package test;
 
-// [END declaration]
-
-// [START java_declaration]
 option java_multiple_files = true;
 option java_package = "com.example.tutorial.protos";
 option java_outer_classname = "AddressBookProtos";
-// [END java_declaration]
 
-// [START messages]
 message Person {
   string name = 1;
   int32 id = 2;  // Unique ID number for this person.
@@ -31,9 +25,13 @@ message Person {
 
 }
 
+message AnotherPerson {
+    string name = 1;
+    string surname = 2;
+}
+
 // Our address book file is just one of these.
 message AddressBook {
   int32 version = 1;
   repeated Person people = 2;
 }
-// [END messages]
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/resources/protobuf-serde/lang-description.proto b/kafka-ui-api/src/test/resources/protobuf-serde/lang-description.proto
new file mode 100644
index 00000000000..8e213d58c41
--- /dev/null
+++ b/kafka-ui-api/src/test/resources/protobuf-serde/lang-description.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package test;
+
+import "language/language.proto";
+import "google/protobuf/wrappers.proto";
+
+message LanguageDescription {
+    test.lang.Language lang = 1;
+    google.protobuf.StringValue descr = 2;
+}
diff --git a/kafka-ui-api/src/test/resources/protobuf-serde/language/language.proto b/kafka-ui-api/src/test/resources/protobuf-serde/language/language.proto
new file mode 100644
index 00000000000..7ef30eab236
--- /dev/null
+++ b/kafka-ui-api/src/test/resources/protobuf-serde/language/language.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+package test.lang;
+
+enum Language {
+    DE = 0;
+    EN = 1;
+    ES = 2;
+    FR = 3;
+    PL = 4;
+    RU = 5;
+}
diff --git a/kafka-ui-api/src/test/resources/sensor.proto b/kafka-ui-api/src/test/resources/protobuf-serde/sensor.proto
similarity index 93%
rename from kafka-ui-api/src/test/resources/sensor.proto
rename to kafka-ui-api/src/test/resources/protobuf-serde/sensor.proto
index 33b8c387e4c..3bde20a3ae2 100644
--- a/kafka-ui-api/src/test/resources/sensor.proto
+++ b/kafka-ui-api/src/test/resources/protobuf-serde/sensor.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package iot;
+package test;
 
 message Sensor {
     string name = 1;

From 334ba3df99dfc84385faace167f6410c8ce0be91 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Tue, 7 Mar 2023 17:20:21 +0200
Subject: [PATCH 430/734] Helm: Add `global.imageRegistry` (#3451)

Now if this chart is used as a subchart, the image registry will be taken from `global.imageRegistry` (if it exists).

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 charts/kafka-ui/Chart.yaml             | 2 +-
 charts/kafka-ui/templates/_helpers.tpl | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 6e5f0ee2d5b..4f36aa7f0b1 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.5.3
+version: 0.5.4
 appVersion: v0.5.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/_helpers.tpl b/charts/kafka-ui/templates/_helpers.tpl
index 510452d4cf3..7155681a44b 100644
--- a/charts/kafka-ui/templates/_helpers.tpl
+++ b/charts/kafka-ui/templates/_helpers.tpl
@@ -68,6 +68,11 @@ This allows us to check if the registry of the image is specified or not.
 */}}
 {{- define "kafka-ui.imageName" -}}
 {{- $registryName := .Values.image.registry -}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+     {{- $registryName = .Values.global.imageRegistry -}}
+    {{- end -}}
+{{- end -}}
 {{- $repository := .Values.image.repository -}}
 {{- $tag := .Values.image.tag | default .Chart.AppVersion -}}
 {{- if $registryName }}

From e72f6d6d5dd078df2d270cc48a4087588443f89a Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Thu, 9 Mar 2023 19:36:49 +0400
Subject: [PATCH 431/734] Feature: Cluster web configuration wizard (#3241)

* created wizard

* Create wizard form schema

* Wizard kafka cluster form (#3245)

* created wizard Kafka Cluster form

* created error message

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>

* Update schema.ts

* Wizard authentication (#3268)

* created authentication form

* changed SaslType.tsx switch case

* remove console.log

* commented unused variables

* auth validation

* auth Security Protocol

* changed schema.ts username, password

* added Delegation tokens validation schema

* changed auth form

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>

* New Dashboard flow. Add an ability to configure clusters

* wizard kafka cluster validate (#3294)

* kafka cluster validate

* fixed  bootstrap server uncontrolled input  warning error

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>

* Wizard schema registry (#3286)

* created schema registry

* unused variables

* Prevent Default on click

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>

* feat: cleanup

* Application config API (#3242)

* wip

* wip

* wip

* wip

* OAuthProperties added to dynamic config api

* wip

* files upload endpoint added

* rbac conf api added

* rbac conf api improvements

* App configuration validation endpoint (#3264)

Co-authored-by: iliax <ikuramshin@provectus.com>

---------

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>

* add app config api client

* refactor cluster section

* refactor cluster section

* linting

* refactor Registry Form (#3311)

* refactor Registry Form

* refactor Registry

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>

* auth form improvements

* refactoring

* linting

* file upload API changes

* Auth

* Start connecting to schema & payload

* Auth

* fileupload

* Wizard JMX Metrics form (#3303)

* created JMX Metrics form

* refactor JMXMetrics.tsx styles

* added cursor on checkbox, changed styles submit button

* refactor Metrics

* refactoring

* uncomment schema connect validation

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>

* validate api

* refactor

* Wizard Kafka Connect form (#3300)

* created Kafka Connect form

* renaming functions and variables

* refactor

* changed button name

* refactoring kafka connect

* made handler function, reset replace with set value,

* refactoring

* uncomment schema metrics validation

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>

* fixing AdminClient validation

* fixing AdminClient validation

* refactor kafka connect

* refactor metrics

* Per-cluster SSL verification settings (#3336)

* ssl configuration moved to app & cluster level

* documentations changes

* trust all removed, global app settings removed

* extracting ssl properties settings to SslPropertiesUtil

* wip

* documentation fix

---------

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>

* SSL properties NPE fixes

* api integration

* custom fields for existing auth config

* OffsetsResetServiceTest fix

* cluster.properties structure flattening added

* kafka-ssl.yml: ssl properties moved to separate section, producer ssl properties copy added

* custom auth

* error messaging

* form submit

* feedback

* 1. defaulting metrics type to JMX
2. AdminClient id generation made uniq

* checkstyle fix

* checkstyle fix

* refactoring

* feedback

* feedback

* feedback

* feedback

* feedback

* feedback

* Wizard: Application info API (#3391)

* Application info API added, cluster features enum renamed to `ClusterFeature`

* show config for specific envs only

* refactor widget

* Cluster connection validation err msg improved

* KSQL DB section

* Refactor + deps upgrade

* experiment: get rid of babel

* BE validations refactoring

* Update kafka-ui.yaml

fixed to string type param

* fixes #3397

* linting

* #3399 adjust size of port input

* disable selects for disabled form

* Wizard: Keystore separation (#3425)

* wip

* wip

* compose fix

* dto structure fix

---------

Co-authored-by: iliax <ikuramshin@provectus.com>

* dynamic ops enablement properties improvements

* own keystore for each section

* linting

* fix keystore submit

* fix keystore submit

* feedback

* feedback

* refactoring

* Connect config userName field renamed

* metrics configs mapping fix

* feedback

* Wizard: Jmx ssl (#3448)

JMX SSL implementation. Added ability to set specific ssl keystore for each cluster when connection to jmx endpoint.

* Review fixes

* upd compareVersionsOperation qase id

* add toBeAutomated into manual suite

* DYNAMIC_CONFIG_ENABLED property description added

* Resolve conflicts

* Fix issue with 400 error

* fix SR edit form

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Alexander Krivonosov <31561808+GneyHabub@users.noreply.github.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
Co-authored-by: Ilya Kuramshin <iliax@proton.me>
Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: bkhakimov <bkhakimov@provectus.com>
Co-authored-by: Mgrdich <mgotm13@gmail.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 README.md                                     |   17 +-
 documentation/compose/jaas/client.properties  |    0
 documentation/compose/jaas/kafka_connect.jaas |    0
 .../compose/jaas/kafka_connect.password       |    0
 documentation/compose/jaas/kafka_server.conf  |    2 +-
 .../compose/jaas/schema_registry.jaas         |    0
 .../compose/jaas/schema_registry.password     |    0
 .../compose/kafka-ssl-components.yaml         |   18 +-
 documentation/compose/kafka-ssl.yml           |   10 +-
 documentation/compose/kafka-ui-arm64.yaml     |    1 +
 .../compose/kafka-ui-jmx-secured.yml          |   69 +-
 documentation/compose/kafka-ui-sasl.yaml      |    3 +-
 documentation/compose/kafka-ui-serdes.yaml    |   15 +-
 documentation/compose/kafka-ui.yaml           |    1 +
 kafka-ui-api/Dockerfile                       |    7 +-
 .../kafka/ui/KafkaUiApplication.java          |   13 +-
 .../ui/client/RetryingKafkaConnectClient.java |   31 +-
 .../kafka/ui/config/ClustersProperties.java   |   85 +-
 .../kafka/ui/config/auth/OAuthProperties.java |    5 +-
 .../config/auth/OAuthPropertiesConverter.java |    7 +-
 .../logout/CognitoLogoutSuccessHandler.java   |    5 +
 .../kafka/ui/controller/AccessController.java |    2 +-
 .../ApplicationConfigController.java          |  137 +
 .../kafka/ui/exception/ErrorCode.java         |    4 +-
 .../ui/exception/FileUploadException.java     |   19 +
 .../ui/exception/ValidationException.java     |    4 +
 .../kafka/ui/mapper/ClusterMapper.java        |    4 +-
 .../{Feature.java => ClusterFeature.java}     |    2 +-
 .../kafka/ui/model/InternalClusterState.java  |    2 +-
 .../kafka/ui/model/JmxConnectionInfo.java     |   26 -
 .../kafka/ui/model/MetricsConfig.java         |    2 +
 .../provectus/kafka/ui/model/Statistics.java  |    2 +-
 .../kafka/ui/model/rbac/AccessContext.java    |   14 +-
 .../kafka/ui/model/rbac/Permission.java       |   25 +-
 .../kafka/ui/model/rbac/Resource.java         |    1 +
 .../permission/ApplicationConfigAction.java   |   18 +
 .../kafka/ui/serdes/SerdesInitializer.java    |   32 +-
 .../builtin/sr/SchemaRegistrySerde.java       |   30 +-
 .../ui/service/AdminClientServiceImpl.java    |   18 +-
 .../ui/service/ConsumerGroupService.java      |    2 +
 .../kafka/ui/service/FeatureService.java      |   14 +-
 .../kafka/ui/service/KafkaClusterFactory.java |  144 +-
 .../kafka/ui/service/MessagesService.java     |    2 +
 .../kafka/ui/service/ReactiveAdminClient.java |    6 +-
 .../kafka/ui/service/StatisticsService.java   |    4 +-
 .../kafka/ui/service/TopicsService.java       |    4 +-
 .../kafka/ui/service/ksql/KsqlApiClient.java  |   19 +-
 .../service/ksql/response/ResponseParser.java |    6 +-
 .../kafka/ui/service/masking/DataMasking.java |    4 +-
 .../ui/service/masking/policies/Mask.java     |    2 +
 .../masking/policies/MaskingPolicy.java       |   22 +-
 .../ui/service/masking/policies/Replace.java  |    2 +
 .../service/metrics/JmxMetricsRetriever.java  |  123 +-
 .../service/metrics/JmxSslSocketFactory.java  |  218 +
 .../metrics/PrometheusMetricsRetriever.java   |   33 +-
 .../ui/service/rbac/AccessControlService.java |   40 +-
 .../kafka/ui/util/ApplicationRestarter.java   |   46 +
 .../ui/util/DynamicConfigOperations.java      |  228 +
 .../kafka/ui/util/JmxPoolFactory.java         |   47 -
 .../ui/util/KafkaServicesValidation.java      |  147 +
 .../{NumberUtil.java => KafkaVersion.java}    |   12 +-
 .../com/provectus/kafka/ui/util/MapUtil.java  |    0
 .../kafka/ui/util/PollingThrottler.java       |    6 +-
 .../kafka/ui/util/ReactiveFailover.java       |   16 +-
 .../kafka/ui/util/SslPropertiesUtil.java      |   33 +
 .../kafka/ui/util/WebClientConfigurator.java  |   54 +-
 .../src/main/resources/application-local.yml  |   10 +-
 .../src/main/resources/application.yml        |    2 -
 .../ui/service/OffsetsResetServiceTest.java   |   46 +-
 .../ui/service/ksql/KsqlApiClientTest.java    |    2 +-
 .../ui/service/ksql/KsqlServiceV2Test.java    |    2 +-
 .../PrometheusMetricsRetrieverTest.java       |    6 +-
 .../ui/util/DynamicConfigOperationsTest.java  |  128 +
 kafka-ui-contract/pom.xml                     |    3 +
 .../main/resources/swagger/kafka-ui-api.yaml  |  375 ++
 .../ui/manualSuite/suite/BrokersTest.java     |   17 +
 .../ui/manualSuite/suite/KsqlDbTest.java      |   35 +
 .../ui/smokeSuite/schemas/SchemasTest.java    |    2 +-
 kafka-ui-react-app/.babelrc                   |    7 -
 kafka-ui-react-app/.eslintrc.json             |    6 +-
 kafka-ui-react-app/README.md                  |    4 +-
 kafka-ui-react-app/package.json               |   53 +-
 kafka-ui-react-app/pnpm-lock.yaml             | 3855 ++++-------------
 kafka-ui-react-app/src/components/App.tsx     |   21 +-
 .../ClusterPage/ClusterConfigPage.tsx         |   40 +
 .../ClusterPage.tsx}                          |   18 +-
 .../__tests__/ClusterPage.spec.tsx}           |    6 +-
 .../Connect/Details/Config/Config.tsx         |   10 +-
 .../src/components/Connect/New/New.tsx        |   34 +-
 .../Connect/New/__tests__/New.spec.tsx        |    2 +-
 .../__test__/ResetOffsets.spec.tsx            |   14 +-
 .../src/components/Dashboard/ClusterName.tsx  |   18 +
 .../Dashboard/ClusterTableActionsCell.tsx     |   18 +
 .../Dashboard/ClustersWidget/ClusterName.tsx  |   15 -
 .../ClustersWidget/ClustersWidget.styled.ts   |   15 -
 .../ClustersWidget/ClustersWidget.tsx         |   75 -
 .../__test__/ClustersWidget.spec.tsx          |   40 -
 .../components/Dashboard/Dashboard.styled.ts  |    8 +
 .../src/components/Dashboard/Dashboard.tsx    |  106 +-
 .../Dashboard/__test__/Dashboard.spec.tsx     |   16 -
 .../src/components/Nav/ClusterMenu.tsx        |    1 -
 kafka-ui-react-app/src/components/Nav/Nav.tsx |   21 +-
 .../PageContainer/PageContainer.tsx           |   18 +-
 .../Details/SchemaVersion/SchemaVersion.tsx   |    2 +-
 .../Details/__test__/SchemaVersion.spec.tsx   |    4 -
 .../src/components/Schemas/Edit/Edit.tsx      |  183 +-
 .../src/components/Schemas/Edit/Form.tsx      |  210 +
 .../src/components/Topics/New/New.tsx         |    8 +-
 .../Topic/Edit/DangerZone/DangerZone.tsx      |    8 +-
 .../src/components/Topics/Topic/Edit/Edit.tsx |   17 +-
 .../Filters/AddEditFilterContainer.tsx        |   20 +-
 .../Topic/Messages/Filters/Filters.styled.ts  |   16 -
 .../Filters/__tests__/AddFilter.spec.tsx      |   54 -
 .../Topic/Messages/__test__/Messages.spec.tsx |   10 +-
 .../Topics/Topic/SendMessage/SendMessage.tsx  |   23 +-
 .../shared/Form/__tests__/TopicForm.spec.tsx  |   29 +-
 .../src/components/Version/Version.tsx        |    5 -
 .../src/components/__tests__/App.spec.tsx     |    7 +
 .../src/components/common/Button/Button.tsx   |    6 +-
 .../components/common/Checkbox/Checkbox.tsx   |   30 +
 .../src/components/common/Form/Form.styled.ts |   22 +
 .../components/common/Input/Input.styled.ts   |    6 +
 .../src/components/common/Input/Input.tsx     |   48 +-
 .../common/Input/InputLabel.styled.ts         |    1 -
 .../src/components/common/NewTable/Table.tsx  |    2 +-
 .../common/NewTable/__test__/Table.spec.tsx   |    2 +-
 .../common/Select/ControlledSelect.tsx        |   59 +
 .../src/components/common/Tooltip/Tooltip.tsx |    2 +-
 .../contexts/GlobalSettingsContext.tsx        |   24 +-
 kafka-ui-react-app/src/custom.d.ts            |    2 -
 kafka-ui-react-app/src/lib/api.ts             |    4 +-
 kafka-ui-react-app/src/lib/constants.ts       |   24 +
 kafka-ui-react-app/src/lib/errorHandling.tsx  |    7 +
 .../src/lib/hooks/api/appConfig.ts            |   69 +
 .../src/lib/hooks/api/clusters.ts             |    2 +-
 kafka-ui-react-app/src/lib/hooks/api/roles.ts |    4 +-
 .../src/lib/hooks/api/topicMessages.tsx       |    2 +-
 .../src/lib/hooks/useBoolean.ts               |    2 +-
 kafka-ui-react-app/src/lib/paths.ts           |    9 +
 kafka-ui-react-app/src/lib/testHelpers.tsx    |    4 +-
 kafka-ui-react-app/src/lib/yupExtended.ts     |   16 +-
 .../reducers/ksqlDb/__test__/fixtures.ts      |    2 +
 kafka-ui-react-app/src/theme/theme.ts         |    5 +-
 .../ClusterConfigForm.styled.ts               |   60 +
 .../Authentication/Authentication.tsx         |   54 +
 .../Authentication/AuthenticationMethods.tsx  |   93 +
 .../Sections/CustomAuthentication.tsx         |   43 +
 .../ClusterConfigForm/Sections/KSQL.tsx       |   42 +
 .../Sections/KafkaCluster.tsx                 |  114 +
 .../Sections/KafkaConnect.tsx                 |   91 +
 .../ClusterConfigForm/Sections/Metrics.tsx    |   59 +
 .../Sections/SchemaRegistry.tsx               |   45 +
 .../ClusterConfigForm/common/Credentials.tsx  |   45 +
 .../ClusterConfigForm/common/Fileupload.tsx   |   67 +
 .../ClusterConfigForm/common/SSLForm.tsx      |   25 +
 .../common/SectionHeader.tsx                  |   31 +
 .../src/widgets/ClusterConfigForm/index.tsx   |  155 +
 .../src/widgets/ClusterConfigForm/schema.ts   |  194 +
 .../src/widgets/ClusterConfigForm/types.ts    |   56 +
 .../utils/convertFormKeyToPropsKey.ts         |    3 +
 .../utils/convertPropsKeyToFormKey.ts         |    3 +
 .../utils/getInitialFormData.ts               |  121 +
 .../utils/getIsValidConfig.ts                 |   49 +
 .../ClusterConfigForm/utils/getJaasConfig.ts  |   27 +
 .../utils/transformFormDataToPayload.ts       |  231 +
 165 files changed, 5324 insertions(+), 4148 deletions(-)
 mode change 100644 => 100755 documentation/compose/jaas/client.properties
 mode change 100644 => 100755 documentation/compose/jaas/kafka_connect.jaas
 mode change 100644 => 100755 documentation/compose/jaas/kafka_connect.password
 mode change 100644 => 100755 documentation/compose/jaas/schema_registry.jaas
 mode change 100644 => 100755 documentation/compose/jaas/schema_registry.password
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/FileUploadException.java
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/{Feature.java => ClusterFeature.java} (78%)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/JmxConnectionInfo.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ApplicationConfigAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxSslSocketFactory.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationRestarter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxPoolFactory.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/{NumberUtil.java => KafkaVersion.java} (74%)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/MapUtil.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SslPropertiesUtil.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/DynamicConfigOperationsTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/BrokersTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/KsqlDbTest.java
 delete mode 100644 kafka-ui-react-app/.babelrc
 create mode 100644 kafka-ui-react-app/src/components/ClusterPage/ClusterConfigPage.tsx
 rename kafka-ui-react-app/src/components/{Cluster/Cluster.tsx => ClusterPage/ClusterPage.tsx} (86%)
 rename kafka-ui-react-app/src/components/{Cluster/__tests__/Cluster.spec.tsx => ClusterPage/__tests__/ClusterPage.spec.tsx} (96%)
 create mode 100644 kafka-ui-react-app/src/components/Dashboard/ClusterName.tsx
 create mode 100644 kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClusterName.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
 delete mode 100644 kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Dashboard/Dashboard.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Checkbox/Checkbox.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Select/ControlledSelect.tsx
 delete mode 100644 kafka-ui-react-app/src/custom.d.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/appConfig.ts
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Authentication/Authentication.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Authentication/AuthenticationMethods.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/CustomAuthentication.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KSQL.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaCluster.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaConnect.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Metrics.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/SchemaRegistry.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/common/Credentials.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/common/Fileupload.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/common/SSLForm.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/common/SectionHeader.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/schema.ts
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/types.ts
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/convertFormKeyToPropsKey.ts
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/convertPropsKeyToFormKey.ts
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getInitialFormData.ts
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getIsValidConfig.ts
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getJaasConfig.ts
 create mode 100644 kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts

diff --git a/README.md b/README.md
index b66ac8f37f1..e9246215367 100644
--- a/README.md
+++ b/README.md
@@ -185,16 +185,17 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_PASSWORD` 	| KSQL DB server's basic authentication password
 |`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTORELOCATION`   	|Path to the JKS keystore to communicate to KSQL DB
 |`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTOREPASSWORD`   	|Password of the JKS keystore for KSQL DB
-|`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_TRUSTSTORELOCATION`   	|Path to the JKS truststore to communicate to KSQL DB
-|`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_TRUSTSTOREPASSWORD`   	|Password of the JKS truststore for KSQL DB
 |`KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL` 	|Security protocol to connect to the brokers. For SSL connection use "SSL", for plaintext connection don't set this environment variable
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRY`   	|SchemaRegistry's address
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME`   	|SchemaRegistry's basic authentication username
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_PASSWORD`   	|SchemaRegistry's basic authentication password
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTORELOCATION`   	|Path to the JKS keystore to communicate to SchemaRegistry
 |`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTOREPASSWORD`   	|Password of the JKS keystore for SchemaRegistry
-|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTORELOCATION`   	|Path to the JKS truststore to communicate to SchemaRegistry
-|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTOREPASSWORD`   	|Password of the JKS truststore for SchemaRegistry
+|`KAFKA_CLUSTERS_0_METRICS_SSL`          |Enable SSL for Metrics (for PROMETHEUS metrics type). Default: false.
+|`KAFKA_CLUSTERS_0_METRICS_USERNAME` |Username for Metrics authentication
+|`KAFKA_CLUSTERS_0_METRICS_PASSWORD` |Password for Metrics authentication
+|`KAFKA_CLUSTERS_0_METRICS_KEYSTORELOCATION` |Path to the JKS keystore to communicate to metrics source (JMX/PROMETHEUS). For advanced setup, see `kafka-ui-jmx-secured.yml`
+|`KAFKA_CLUSTERS_0_METRICS_KEYSTOREPASSWORD` |Password of the JKS metrics keystore
 |`KAFKA_CLUSTERS_0_SCHEMANAMETEMPLATE` |How keys are saved to schemaRegistry
 |`KAFKA_CLUSTERS_0_METRICS_PORT`        	 |Open metrics port of a broker
 |`KAFKA_CLUSTERS_0_METRICS_TYPE`        	 |Type of metrics retriever to use. Valid values are JMX (default) or PROMETHEUS. If Prometheus, then metrics are read from prometheus-jmx-exporter instead of jmx
@@ -205,11 +206,9 @@ For example, if you want to use an environment variable to set the `name` parame
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_PASSWORD`| Kafka Connect cluster's basic authentication password
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTORELOCATION`| Path to the JKS keystore to communicate to Kafka Connect
 |`KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTOREPASSWORD`| Password of the JKS keystore for Kafka Connect
-|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_TRUSTSTORELOCATION`| Path to the JKS truststore to communicate to Kafka Connect
-|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_TRUSTSTOREPASSWORD`| Password of the JKS truststore for Kafka Connect
-|`KAFKA_CLUSTERS_0_METRICS_SSL`          |Enable SSL for Metrics? `true` or `false`. For advanced setup, see `kafka-ui-jmx-secured.yml`
-|`KAFKA_CLUSTERS_0_METRICS_USERNAME` |Username for Metrics authentication
-|`KAFKA_CLUSTERS_0_METRICS_PASSWORD` |Password for Metrics authentication
 |`KAFKA_CLUSTERS_0_POLLING_THROTTLE_RATE` |Max traffic rate (bytes/sec) that kafka-ui allowed to reach when polling messages from the cluster. Default: 0 (not limited)
+|`KAFKA_CLUSTERS_0_SSL_TRUSTSTORELOCATION`| Path to the JKS truststore to communicate to Kafka Connect, SchemaRegistry, KSQL, Metrics
+|`KAFKA_CLUSTERS_0_SSL_TRUSTSTOREPASSWORD`| Password of the JKS truststore for Kafka Connect, SchemaRegistry, KSQL, Metrics
 |`TOPIC_RECREATE_DELAY_SECONDS` |Time delay between topic deletion and topic creation attempts for topic recreate functionality. Default: 1
 |`TOPIC_RECREATE_MAXRETRIES`  |Number of attempts of topic creation after topic deletion for topic recreate functionality. Default: 15
+|`DYNAMIC_CONFIG_ENABLED`|Allow to change application config in runtime. Default: false.
diff --git a/documentation/compose/jaas/client.properties b/documentation/compose/jaas/client.properties
old mode 100644
new mode 100755
diff --git a/documentation/compose/jaas/kafka_connect.jaas b/documentation/compose/jaas/kafka_connect.jaas
old mode 100644
new mode 100755
diff --git a/documentation/compose/jaas/kafka_connect.password b/documentation/compose/jaas/kafka_connect.password
old mode 100644
new mode 100755
diff --git a/documentation/compose/jaas/kafka_server.conf b/documentation/compose/jaas/kafka_server.conf
index ef41c992e21..25388be5aa8 100644
--- a/documentation/compose/jaas/kafka_server.conf
+++ b/documentation/compose/jaas/kafka_server.conf
@@ -11,4 +11,4 @@ KafkaClient {
     user_admin="admin-secret";
 };
 
-Client {};
\ No newline at end of file
+Client {};
diff --git a/documentation/compose/jaas/schema_registry.jaas b/documentation/compose/jaas/schema_registry.jaas
old mode 100644
new mode 100755
diff --git a/documentation/compose/jaas/schema_registry.password b/documentation/compose/jaas/schema_registry.password
old mode 100644
new mode 100755
diff --git a/documentation/compose/kafka-ssl-components.yaml b/documentation/compose/kafka-ssl-components.yaml
index 0c1287b6477..407ce5b97a7 100644
--- a/documentation/compose/kafka-ssl-components.yaml
+++ b/documentation/compose/kafka-ssl-components.yaml
@@ -15,27 +15,25 @@ services:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SSL
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092 # SSL LISTENER!
-      KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_LOCATION: /kafka.truststore.jks
-      KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_PASSWORD: secret
-      KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_LOCATION: /kafka.keystore.jks
-      KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_PASSWORD: secret
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # DISABLE COMMON NAME VERIFICATION
+
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: https://schemaregistry0:8085
       KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTORELOCATION: /kafka.keystore.jks
       KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTOREPASSWORD: "secret"
-      KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTORELOCATION: /kafka.truststore.jks
-      KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_TRUSTSTOREPASSWORD: "secret"
+
       KAFKA_CLUSTERS_0_KSQLDBSERVER: https://ksqldb0:8088
       KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTORELOCATION: /kafka.keystore.jks
       KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTOREPASSWORD: "secret"
-      KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_TRUSTSTORELOCATION: /kafka.truststore.jks
-      KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_TRUSTSTOREPASSWORD: "secret"
+
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: local
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: https://kafka-connect0:8083
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTORELOCATION: /kafka.keystore.jks
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTOREPASSWORD: "secret"
-      KAFKA_CLUSTERS_0_KAFKACONNECT_0_TRUSTSTORELOCATION: /kafka.truststore.jks
-      KAFKA_CLUSTERS_0_KAFKACONNECT_0_TRUSTSTOREPASSWORD: "secret"
+
+      KAFKA_CLUSTERS_0_SSL_TRUSTSTORELOCATION: /kafka.truststore.jks
+      KAFKA_CLUSTERS_0_SSL_TRUSTSTOREPASSWORD: "secret"
+      DYNAMIC_CONFIG_ENABLED: 'true'  # not necessary for ssl, added for tests
+
     volumes:
       - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
       - ./ssl/kafka.keystore.jks:/kafka.keystore.jks
diff --git a/documentation/compose/kafka-ssl.yml b/documentation/compose/kafka-ssl.yml
index 4fc7daebfff..08ff9dc4af8 100644
--- a/documentation/compose/kafka-ssl.yml
+++ b/documentation/compose/kafka-ssl.yml
@@ -11,11 +11,11 @@ services:
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SSL
-      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:29092 # SSL LISTENER!
-      KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_LOCATION: /kafka.truststore.jks
-      KAFKA_CLUSTERS_0_PROPERTIES_SSL_TRUSTSTORE_PASSWORD: secret
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_LOCATION: /kafka.keystore.jks
-      KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_PASSWORD: secret
+      KAFKA_CLUSTERS_0_PROPERTIES_SSL_KEYSTORE_PASSWORD: "secret"
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:29092 # SSL LISTENER!
+      KAFKA_CLUSTERS_0_SSL_TRUSTSTORELOCATION: /kafka.truststore.jks
+      KAFKA_CLUSTERS_0_SSL_TRUSTSTOREPASSWORD: "secret"
       KAFKA_CLUSTERS_0_PROPERTIES_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: '' # DISABLE COMMON NAME VERIFICATION
     volumes:
       - ./ssl/kafka.truststore.jks:/kafka.truststore.jks
@@ -60,4 +60,4 @@ services:
       - ./ssl/creds:/etc/kafka/secrets/creds
       - ./ssl/kafka.truststore.jks:/etc/kafka/secrets/kafka.truststore.jks
       - ./ssl/kafka.keystore.jks:/etc/kafka/secrets/kafka.keystore.jks
-    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
\ No newline at end of file
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
diff --git a/documentation/compose/kafka-ui-arm64.yaml b/documentation/compose/kafka-ui-arm64.yaml
index bbcefecbf42..87a892cc700 100644
--- a/documentation/compose/kafka-ui-arm64.yaml
+++ b/documentation/compose/kafka-ui-arm64.yaml
@@ -19,6 +19,7 @@ services:
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schema-registry0:8085
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
+      DYNAMIC_CONFIG_ENABLED: 'true'  # not necessary, added for tests
 
   kafka0:
     image: confluentinc/cp-kafka:7.2.1.arm64
diff --git a/documentation/compose/kafka-ui-jmx-secured.yml b/documentation/compose/kafka-ui-jmx-secured.yml
index de56a7e2c69..408f388ba54 100644
--- a/documentation/compose/kafka-ui-jmx-secured.yml
+++ b/documentation/compose/kafka-ui-jmx-secured.yml
@@ -7,11 +7,8 @@ services:
     image: provectuslabs/kafka-ui:latest
     ports:
       - 8080:8080
-      - 5005:5005
     depends_on:
       - kafka0
-      - schemaregistry0
-      - kafka-connect0
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
@@ -19,15 +16,12 @@ services:
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       KAFKA_CLUSTERS_0_METRICS_PORT: 9997
-      KAFKA_CLUSTERS_0_METRICS_SSL: 'true'
       KAFKA_CLUSTERS_0_METRICS_USERNAME: root
       KAFKA_CLUSTERS_0_METRICS_PASSWORD: password
-      JAVA_OPTS: >-
-        -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
-        -Djavax.net.ssl.trustStore=/jmx/clienttruststore
-        -Djavax.net.ssl.trustStorePassword=12345678
-        -Djavax.net.ssl.keyStore=/jmx/clientkeystore
-        -Djavax.net.ssl.keyStorePassword=12345678
+      KAFKA_CLUSTERS_0_METRICS_KEYSTORE_LOCATION: /jmx/clientkeystore
+      KAFKA_CLUSTERS_0_METRICS_KEYSTORE_PASSWORD: '12345678'
+      KAFKA_CLUSTERS_0_SSL_TRUSTSTORE_LOCATION: /jmx/clienttruststore
+      KAFKA_CLUSTERS_0_SSL_TRUSTSTORE_PASSWORD: '12345678'
     volumes:
       - ./jmx/clienttruststore:/jmx/clienttruststore
       - ./jmx/clientkeystore:/jmx/clientkeystore
@@ -70,8 +64,6 @@ services:
         -Dcom.sun.management.jmxremote.access.file=/jmx/jmxremote.access
         -Dcom.sun.management.jmxremote.rmi.port=9997
         -Djava.rmi.server.hostname=kafka0
-        -Djava.rmi.server.logCalls=true
-#        -Djavax.net.debug=ssl:handshake
     volumes:
       - ./jmx/serverkeystore:/jmx/serverkeystore
       - ./jmx/servertruststore:/jmx/servertruststore
@@ -79,56 +71,3 @@ services:
       - ./jmx/jmxremote.access:/jmx/jmxremote.access
       - ./scripts/update_run.sh:/tmp/update_run.sh
     command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
-
-  schemaregistry0:
-    image: confluentinc/cp-schema-registry:7.2.1
-    ports:
-      - 8085:8085
-    depends_on:
-      - kafka0
-    environment:
-      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
-      SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
-      SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
-      SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
-
-      SCHEMA_REGISTRY_SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: "http"
-      SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
-      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
-
-  kafka-connect0:
-    image: confluentinc/cp-kafka-connect:7.2.1
-    ports:
-      - 8083:8083
-    depends_on:
-      - kafka0
-      - schemaregistry0
-    environment:
-      CONNECT_BOOTSTRAP_SERVERS: kafka0:29092
-      CONNECT_GROUP_ID: compose-connect-group
-      CONNECT_CONFIG_STORAGE_TOPIC: _connect_configs
-      CONNECT_CONFIG_STORAGE_REPLICATION_FACTOR: 1
-      CONNECT_OFFSET_STORAGE_TOPIC: _connect_offset
-      CONNECT_OFFSET_STORAGE_REPLICATION_FACTOR: 1
-      CONNECT_STATUS_STORAGE_TOPIC: _connect_status
-      CONNECT_STATUS_STORAGE_REPLICATION_FACTOR: 1
-      CONNECT_KEY_CONVERTER: org.apache.kafka.connect.storage.StringConverter
-      CONNECT_KEY_CONVERTER_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
-      CONNECT_VALUE_CONVERTER: org.apache.kafka.connect.storage.StringConverter
-      CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
-      CONNECT_INTERNAL_KEY_CONVERTER: org.apache.kafka.connect.json.JsonConverter
-      CONNECT_INTERNAL_VALUE_CONVERTER: org.apache.kafka.connect.json.JsonConverter
-      CONNECT_REST_ADVERTISED_HOST_NAME: kafka-connect0
-      CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
-
-  kafka-init-topics:
-    image: confluentinc/cp-kafka:7.2.1
-    volumes:
-      - ./message.json:/data/message.json
-    depends_on:
-      - kafka0
-    command: "bash -c 'echo Waiting for Kafka to be ready... && \
-               cub kafka-ready -b kafka0:29092 1 30 && \
-               kafka-topics --create --topic second.users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
-               kafka-topics --create --topic first.messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
-               kafka-console-producer --bootstrap-server kafka0:29092 --topic second.users < /data/message.json'"
\ No newline at end of file
diff --git a/documentation/compose/kafka-ui-sasl.yaml b/documentation/compose/kafka-ui-sasl.yaml
index 4b8fc02597f..e4a2b3cc4a7 100644
--- a/documentation/compose/kafka-ui-sasl.yaml
+++ b/documentation/compose/kafka-ui-sasl.yaml
@@ -15,6 +15,7 @@ services:
       KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SASL_PLAINTEXT
       KAFKA_CLUSTERS_0_PROPERTIES_SASL_MECHANISM: PLAIN
       KAFKA_CLUSTERS_0_PROPERTIES_SASL_JAAS_CONFIG: 'org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="admin-secret";'
+      DYNAMIC_CONFIG_ENABLED: true # not necessary for sasl auth, added for tests
 
   kafka:
     image: confluentinc/cp-kafka:7.2.1
@@ -48,4 +49,4 @@ services:
     volumes:
       - ./scripts/update_run.sh:/tmp/update_run.sh
       - ./jaas:/etc/kafka/jaas
-    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
\ No newline at end of file
+    command: "bash -c 'if [ ! -f /tmp/update_run.sh ]; then echo \"ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?\" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'"
diff --git a/documentation/compose/kafka-ui-serdes.yaml b/documentation/compose/kafka-ui-serdes.yaml
index c380a34f6b4..eee510a13d6 100644
--- a/documentation/compose/kafka-ui-serdes.yaml
+++ b/documentation/compose/kafka-ui-serdes.yaml
@@ -14,13 +14,16 @@ services:
             kafka.clusters.0.name: SerdeExampleCluster
             kafka.clusters.0.bootstrapServers: kafka0:29092
             kafka.clusters.0.schemaRegistry: http://schemaregistry0:8085
-            # optional auth and ssl properties for SR
+
+            # optional SSL settings for cluster (will be used by SchemaRegistry serde, if set)
+            #kafka.clusters.0.ssl.keystoreLocation: /kafka.keystore.jks
+            #kafka.clusters.0.ssl.keystorePassword: "secret"
+            #kafka.clusters.0.ssl.truststoreLocation: /kafka.truststore.jks
+            #kafka.clusters.0.ssl.truststorePassword: "secret"
+
+            # optional auth properties for SR
             #kafka.clusters.0.schemaRegistryAuth.username: "use"
             #kafka.clusters.0.schemaRegistryAuth.password: "pswrd"
-            #kafka.clusters.0.schemaRegistrySSL.keystoreLocation: /kafka.keystore.jks
-            #kafka.clusters.0.schemaRegistrySSL.keystorePassword: "secret"
-            #kafka.clusters.0.schemaRegistrySSL.truststoreLocation: /kafka.truststore.jks
-            #kafka.clusters.0.schemaRegistrySSL.truststorePassword: "secret"
 
             kafka.clusters.0.defaultKeySerde: Int32  #optional
             kafka.clusters.0.defaultValueSerde: String #optional
@@ -51,7 +54,7 @@ services:
             kafka.clusters.0.serde.4.properties.keySchemaNameTemplate: "%s-key"
             kafka.clusters.0.serde.4.properties.schemaNameTemplate: "%s-value"
             #kafka.clusters.0.serde.4.topicValuesPattern: "sr2-topic.*"
-            # optional auth and ssl properties for SR:
+            # optional auth and ssl properties for SR (overrides cluster-level):
             #kafka.clusters.0.serde.4.properties.username: "user"
             #kafka.clusters.0.serde.4.properties.password: "passw"
             #kafka.clusters.0.serde.4.properties.keystoreLocation:  /kafka.keystore.jks
diff --git a/documentation/compose/kafka-ui.yaml b/documentation/compose/kafka-ui.yaml
index 32c874b6760..8524f6fa2ba 100644
--- a/documentation/compose/kafka-ui.yaml
+++ b/documentation/compose/kafka-ui.yaml
@@ -24,6 +24,7 @@ services:
       KAFKA_CLUSTERS_1_BOOTSTRAPSERVERS: kafka1:29092
       KAFKA_CLUSTERS_1_METRICS_PORT: 9998
       KAFKA_CLUSTERS_1_SCHEMAREGISTRY: http://schemaregistry1:8085
+      DYNAMIC_CONFIG_ENABLED: 'true'
 
   kafka0:
     image: confluentinc/cp-kafka:7.2.1
diff --git a/kafka-ui-api/Dockerfile b/kafka-ui-api/Dockerfile
index 81df41bd1dd..fcd29c0f069 100644
--- a/kafka-ui-api/Dockerfile
+++ b/kafka-ui-api/Dockerfile
@@ -3,6 +3,10 @@ FROM azul/zulu-openjdk-alpine:17-jre
 RUN apk add --no-cache gcompat # need to make snappy codec work
 RUN addgroup -S kafkaui && adduser -S kafkaui -G kafkaui
 
+# creating folder for dynamic config usage (certificates uploads, etc)
+RUN mkdir /etc/kafkaui/
+RUN chown kafkaui /etc/kafkaui
+
 USER kafkaui
 
 ARG JAR_FILE
@@ -12,4 +16,5 @@ ENV JAVA_OPTS=
 
 EXPOSE 8080
 
-CMD java $JAVA_OPTS -jar kafka-ui-api.jar
+# see JmxSslSocketFactory docs to understand why add-opens is needed
+CMD java --add-opens java.rmi/javax.rmi.ssl=ALL-UNNAMED  $JAVA_OPTS -jar kafka-ui-api.jar
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/KafkaUiApplication.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/KafkaUiApplication.java
index a9a523eb850..8d0eafeff39 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/KafkaUiApplication.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/KafkaUiApplication.java
@@ -1,8 +1,10 @@
 package com.provectus.kafka.ui;
 
-import org.springframework.boot.SpringApplication;
+import com.provectus.kafka.ui.util.DynamicConfigOperations;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -12,6 +14,13 @@
 public class KafkaUiApplication {
 
   public static void main(String[] args) {
-    SpringApplication.run(KafkaUiApplication.class, args);
+    startApplication(args);
+  }
+
+  public static ConfigurableApplicationContext startApplication(String[] args) {
+    return new SpringApplicationBuilder(KafkaUiApplication.class)
+        .initializers(DynamicConfigOperations.dynamicConfigPropertiesInitializer())
+        .build()
+        .run(args);
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
index be5686e2f95..5ec5a779d3c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
@@ -2,6 +2,7 @@
 
 import static com.provectus.kafka.ui.config.ClustersProperties.ConnectCluster;
 
+import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.connect.ApiClient;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
 import com.provectus.kafka.ui.connect.model.Connector;
@@ -12,6 +13,7 @@
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
@@ -31,8 +33,10 @@ public class RetryingKafkaConnectClient extends KafkaConnectClientApi {
   private static final int MAX_RETRIES = 5;
   private static final Duration RETRIES_DELAY = Duration.ofMillis(200);
 
-  public RetryingKafkaConnectClient(ConnectCluster config, DataSize maxBuffSize) {
-    super(new RetryingApiClient(config, maxBuffSize));
+  public RetryingKafkaConnectClient(ConnectCluster config,
+                                    @Nullable ClustersProperties.TruststoreConfig truststoreConfig,
+                                    DataSize maxBuffSize) {
+    super(new RetryingApiClient(config, truststoreConfig, maxBuffSize));
   }
 
   private static Retry conflictCodeRetry() {
@@ -77,23 +81,28 @@ public Mono<Connector> setConnectorConfig(String connectorName, Map<String, Obje
 
   private static class RetryingApiClient extends ApiClient {
 
-    public RetryingApiClient(ConnectCluster config, DataSize maxBuffSize) {
-      super(buildWebClient(maxBuffSize, config), null, null);
+    public RetryingApiClient(ConnectCluster config,
+                             ClustersProperties.TruststoreConfig truststoreConfig,
+                             DataSize maxBuffSize) {
+      super(buildWebClient(maxBuffSize, config, truststoreConfig), null, null);
       setBasePath(config.getAddress());
-      setUsername(config.getUserName());
+      setUsername(config.getUsername());
       setPassword(config.getPassword());
     }
 
-    public static WebClient buildWebClient(DataSize maxBuffSize, ConnectCluster config) {
+    public static WebClient buildWebClient(DataSize maxBuffSize,
+                                           ConnectCluster config,
+                                           ClustersProperties.TruststoreConfig truststoreConfig) {
       return new WebClientConfigurator()
           .configureSsl(
-              config.getKeystoreLocation(),
-              config.getKeystorePassword(),
-              config.getTruststoreLocation(),
-              config.getTruststorePassword()
+              truststoreConfig,
+              new ClustersProperties.KeystoreConfig(
+                  config.getKeystoreLocation(),
+                  config.getKeystorePassword()
+              )
           )
           .configureBasicAuth(
-              config.getUserName(),
+              config.getUsername(),
               config.getPassword()
           )
           .configureBufferSize(maxBuffSize)
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 01d4de12570..2cd5e0e69cd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -1,12 +1,13 @@
 package com.provectus.kafka.ui.config;
 
+import com.provectus.kafka.ui.model.MetricsConfig;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
+import javax.annotation.Nullable;
 import javax.annotation.PostConstruct;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -30,55 +31,58 @@ public static class Cluster {
     String bootstrapServers;
     String schemaRegistry;
     SchemaRegistryAuth schemaRegistryAuth;
-    WebClientSsl schemaRegistrySsl;
+    KeystoreConfig schemaRegistrySsl;
     String ksqldbServer;
     KsqldbServerAuth ksqldbServerAuth;
-    WebClientSsl ksqldbServerSsl;
+    KeystoreConfig ksqldbServerSsl;
     List<ConnectCluster> kafkaConnect;
     MetricsConfigData metrics;
-    Properties properties;
+    Map<String, Object> properties;
     boolean readOnly = false;
-    List<SerdeConfig> serde = new ArrayList<>();
+    List<SerdeConfig> serde;
     String defaultKeySerde;
     String defaultValueSerde;
-    List<Masking> masking = new ArrayList<>();
-    long pollingThrottleRate = 0;
+    List<Masking> masking;
+    Long pollingThrottleRate;
+    TruststoreConfig ssl;
   }
 
   @Data
+  @ToString(exclude = "password")
   public static class MetricsConfigData {
     String type;
     Integer port;
-    boolean ssl;
+    Boolean ssl;
     String username;
     String password;
+    String keystoreLocation;
+    String keystorePassword;
   }
 
   @Data
   @NoArgsConstructor
   @AllArgsConstructor
   @Builder(toBuilder = true)
+  @ToString(exclude = {"password", "keystorePassword"})
   public static class ConnectCluster {
     String name;
     String address;
-    String userName;
+    String username;
     String password;
     String keystoreLocation;
     String keystorePassword;
-    String truststoreLocation;
-    String truststorePassword;
   }
 
   @Data
+  @ToString(exclude = {"password"})
   public static class SchemaRegistryAuth {
     String username;
     String password;
   }
 
   @Data
-  public static class WebClientSsl {
-    String keystoreLocation;
-    String keystorePassword;
+  @ToString(exclude = {"truststorePassword"})
+  public static class TruststoreConfig {
     String truststoreLocation;
     String truststorePassword;
   }
@@ -88,7 +92,7 @@ public static class SerdeConfig {
     String name;
     String className;
     String filePath;
-    Map<String, Object> properties = new HashMap<>();
+    Map<String, Object> properties;
     String topicKeysPattern;
     String topicValuesPattern;
   }
@@ -100,12 +104,21 @@ public static class KsqldbServerAuth {
     String password;
   }
 
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  @ToString(exclude = {"keystorePassword"})
+  public static class KeystoreConfig {
+    String keystoreLocation;
+    String keystorePassword;
+  }
+
   @Data
   public static class Masking {
     Type type;
-    List<String> fields = List.of(); //if empty - policy will be applied to all fields
-    List<String> pattern = List.of("X", "x", "n", "-"); //used when type=MASK
-    String replacement = "***DATA_MASKED***"; //used when type=REPLACE
+    List<String> fields; //if null or empty list - policy will be applied to all fields
+    List<String> pattern; //used when type=MASK
+    String replacement; //used when type=REPLACE
     String topicKeysPattern;
     String topicValuesPattern;
 
@@ -116,7 +129,41 @@ public enum Type {
 
   @PostConstruct
   public void validateAndSetDefaults() {
-    validateClusterNames();
+    if (clusters != null) {
+      validateClusterNames();
+      flattenClusterProperties();
+      setMetricsDefaults();
+    }
+  }
+
+  private void setMetricsDefaults() {
+    for (Cluster cluster : clusters) {
+      if (cluster.getMetrics() != null && !StringUtils.hasText(cluster.getMetrics().getType())) {
+        cluster.getMetrics().setType(MetricsConfig.JMX_METRICS_TYPE);
+      }
+    }
+  }
+
+  private void flattenClusterProperties() {
+    for (Cluster cluster : clusters) {
+      cluster.setProperties(flattenClusterProperties(null, cluster.getProperties()));
+    }
+  }
+
+  private Map<String, Object> flattenClusterProperties(@Nullable String prefix,
+                                                       @Nullable Map<String, Object> propertiesMap) {
+    Map<String, Object> flattened = new HashMap<>();
+    if (propertiesMap != null) {
+      propertiesMap.forEach((k, v) -> {
+        String key = prefix == null ? k : prefix + "." + k;
+        if (v instanceof Map<?, ?>) {
+          flattened.putAll(flattenClusterProperties(key, (Map<String, Object>) v));
+        } else {
+          flattened.put(key, v);
+        }
+      });
+    }
+    return flattened;
   }
 
   private void validateClusterNames() {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
index db192ae826b..f79d217fa79 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.config.auth;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.PostConstruct;
@@ -32,13 +31,13 @@ public static class OAuth2Provider {
     private String clientName;
     private String redirectUri;
     private String authorizationGrantType;
-    private Set<String> scope = new HashSet<>();
+    private Set<String> scope;
     private String issuerUri;
     private String authorizationUri;
     private String tokenUri;
     private String userInfoUri;
     private String jwkSetUri;
     private String userNameAttribute;
-    private Map<String, String> customParams = new HashMap<>();
+    private Map<String, String> customParams;
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
index 8e4a8575a8c..90daa362739 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
@@ -4,6 +4,8 @@
 import static org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties.Provider;
 import static org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties.Registration;
 
+import java.util.Optional;
+import java.util.Set;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -24,7 +26,7 @@ public static OAuth2ClientProperties convertProperties(final OAuthProperties pro
       registration.setClientId(provider.getClientId());
       registration.setClientSecret(provider.getClientSecret());
       registration.setClientName(provider.getClientName());
-      registration.setScope(provider.getScope());
+      registration.setScope(Optional.ofNullable(provider.getScope()).orElse(Set.of()));
       registration.setRedirectUri(provider.getRedirectUri());
       registration.setAuthorizationGrantType(provider.getAuthorizationGrantType());
 
@@ -71,7 +73,8 @@ private static void applyGoogleTransformations(OAuth2Provider provider) {
   }
 
   private static boolean isGoogle(OAuth2Provider provider) {
-    return GOOGLE.equalsIgnoreCase(provider.getCustomParams().get(TYPE));
+    return provider.getCustomParams() != null
+        && GOOGLE.equalsIgnoreCase(provider.getCustomParams().get(TYPE));
   }
 }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java
index 3d725c659df..e9e5159e1b7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java
@@ -12,6 +12,7 @@
 import org.springframework.security.web.server.WebFilterExchange;
 import org.springframework.security.web.util.UrlUtils;
 import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
 import org.springframework.web.server.WebSession;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
@@ -45,6 +46,10 @@ public Mono<Void> handle(WebFilterExchange exchange, Authentication authenticati
         .fragment(null)
         .build();
 
+    Assert.isTrue(
+        provider.getCustomParams() != null && provider.getCustomParams().containsKey("logoutUrl"),
+        "Custom params should contain 'logoutUrl'"
+    );
     final var uri = UriComponentsBuilder
         .fromUri(URI.create(provider.getCustomParams().get("logoutUrl")))
         .queryParam("client_id", provider.getClientId())
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
index 131a37982a3..a86b6db5a07 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
@@ -66,7 +66,7 @@ private List<UserPermissionDTO> mapPermissions(List<Permission> permissions, Lis
           UserPermissionDTO dto = new UserPermissionDTO();
           dto.setClusters(clusters);
           dto.setResource(ResourceTypeDTO.fromValue(permission.getResource().toString().toUpperCase()));
-          dto.setValue(permission.getValue() != null ? permission.getValue().toString() : null);
+          dto.setValue(permission.getValue());
           dto.setActions(permission.getActions()
               .stream()
               .map(String::toUpperCase)
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
new file mode 100644
index 00000000000..b21ef10c619
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
@@ -0,0 +1,137 @@
+package com.provectus.kafka.ui.controller;
+
+import static com.provectus.kafka.ui.model.rbac.permission.ApplicationConfigAction.EDIT;
+import static com.provectus.kafka.ui.model.rbac.permission.ApplicationConfigAction.VIEW;
+
+import com.provectus.kafka.ui.api.ApplicationConfigApi;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.model.ApplicationConfigDTO;
+import com.provectus.kafka.ui.model.ApplicationConfigPropertiesDTO;
+import com.provectus.kafka.ui.model.ApplicationConfigValidationDTO;
+import com.provectus.kafka.ui.model.ApplicationInfoDTO;
+import com.provectus.kafka.ui.model.ClusterConfigValidationDTO;
+import com.provectus.kafka.ui.model.RestartRequestDTO;
+import com.provectus.kafka.ui.model.UploadedFileInfoDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.service.KafkaClusterFactory;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import com.provectus.kafka.ui.util.ApplicationRestarter;
+import com.provectus.kafka.ui.util.DynamicConfigOperations;
+import com.provectus.kafka.ui.util.DynamicConfigOperations.PropertiesStructure;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.codec.multipart.FilePart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+public class ApplicationConfigController implements ApplicationConfigApi {
+
+  private static final PropertiesMapper MAPPER = Mappers.getMapper(PropertiesMapper.class);
+
+  @Mapper
+  interface PropertiesMapper {
+
+    PropertiesStructure fromDto(ApplicationConfigPropertiesDTO dto);
+
+    ApplicationConfigPropertiesDTO toDto(PropertiesStructure propertiesStructure);
+  }
+
+  private final AccessControlService accessControlService;
+  private final DynamicConfigOperations dynamicConfigOperations;
+  private final ApplicationRestarter restarter;
+  private final KafkaClusterFactory kafkaClusterFactory;
+
+
+  @Override
+  public Mono<ResponseEntity<ApplicationInfoDTO>> getApplicationInfo(ServerWebExchange exchange) {
+    return Mono.just(
+        new ApplicationInfoDTO()
+            .enabledFeatures(
+                dynamicConfigOperations.dynamicConfigEnabled()
+                    ? List.of(ApplicationInfoDTO.EnabledFeaturesEnum.DYNAMIC_CONFIG)
+                    : List.of()
+            )
+    ).map(ResponseEntity::ok);
+  }
+
+  @Override
+  public Mono<ResponseEntity<ApplicationConfigDTO>> getCurrentConfig(ServerWebExchange exchange) {
+    return accessControlService
+        .validateAccess(
+            AccessContext.builder()
+                .applicationConfigActions(VIEW)
+                .build()
+        )
+        .then(Mono.fromSupplier(() -> ResponseEntity.ok(
+            new ApplicationConfigDTO()
+                .properties(MAPPER.toDto(dynamicConfigOperations.getCurrentProperties()))
+        )));
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> restartWithConfig(Mono<RestartRequestDTO> restartRequestDto,
+                                                      ServerWebExchange exchange) {
+    return accessControlService
+        .validateAccess(
+            AccessContext.builder()
+                .applicationConfigActions(EDIT)
+                .build()
+        )
+        .then(restartRequestDto)
+        .map(dto -> {
+          dynamicConfigOperations.persist(MAPPER.fromDto(dto.getConfig().getProperties()));
+          restarter.requestRestart();
+          return ResponseEntity.ok().build();
+        });
+  }
+
+  @Override
+  public Mono<ResponseEntity<UploadedFileInfoDTO>> uploadConfigRelatedFile(FilePart file, ServerWebExchange exchange) {
+    return accessControlService
+        .validateAccess(
+            AccessContext.builder()
+                .applicationConfigActions(EDIT)
+                .build()
+        )
+        .then(dynamicConfigOperations.uploadConfigRelatedFile(file))
+        .map(path -> new UploadedFileInfoDTO().location(path.toString()))
+        .map(ResponseEntity::ok);
+  }
+
+  @Override
+  public Mono<ResponseEntity<ApplicationConfigValidationDTO>> validateConfig(Mono<ApplicationConfigDTO> configDto,
+                                                                             ServerWebExchange exchange) {
+    return configDto
+        .flatMap(config -> {
+          PropertiesStructure propertiesStructure = MAPPER.fromDto(config.getProperties());
+          ClustersProperties clustersProperties = propertiesStructure.getKafka();
+          return validateClustersConfig(clustersProperties)
+              .map(validations -> new ApplicationConfigValidationDTO().clusters(validations));
+        })
+        .map(ResponseEntity::ok);
+  }
+
+  private Mono<Map<String, ClusterConfigValidationDTO>> validateClustersConfig(
+      @Nullable ClustersProperties properties) {
+    if (properties == null || properties.getClusters() == null) {
+      return Mono.just(Map.of());
+    }
+    properties.validateAndSetDefaults();
+    return Flux.fromIterable(properties.getClusters())
+        .flatMap(c -> kafkaClusterFactory.validate(c).map(v -> Tuples.of(c.getName(), v)))
+        .collectMap(Tuple2::getT1, Tuple2::getT2);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java
index 6c05eec206e..61be8155e82 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ErrorCode.java
@@ -29,7 +29,9 @@ public enum ErrorCode {
   RECREATE_TOPIC_TIMEOUT(4015, HttpStatus.REQUEST_TIMEOUT),
   INVALID_ENTITY_STATE(4016, HttpStatus.BAD_REQUEST),
   SCHEMA_NOT_DELETED(4017, HttpStatus.INTERNAL_SERVER_ERROR),
-  TOPIC_ANALYSIS_ERROR(4018, HttpStatus.BAD_REQUEST);
+  TOPIC_ANALYSIS_ERROR(4018, HttpStatus.BAD_REQUEST),
+  FILE_UPLOAD_EXCEPTION(4019, HttpStatus.INTERNAL_SERVER_ERROR),
+  ;
 
   static {
     // codes uniqueness check
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/FileUploadException.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/FileUploadException.java
new file mode 100644
index 00000000000..e5e410d64a3
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/FileUploadException.java
@@ -0,0 +1,19 @@
+package com.provectus.kafka.ui.exception;
+
+import java.nio.file.Path;
+
+public class FileUploadException extends CustomBaseException {
+
+  public FileUploadException(String msg, Throwable cause) {
+    super(msg, cause);
+  }
+
+  public FileUploadException(Path path, Throwable cause) {
+    super("Error uploading file %s".formatted(path), cause);
+  }
+
+  @Override
+  public ErrorCode getErrorCode() {
+    return ErrorCode.FILE_UPLOAD_EXCEPTION;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ValidationException.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ValidationException.java
index 7b964fbca53..01eac145ff0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ValidationException.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/ValidationException.java
@@ -6,6 +6,10 @@ public ValidationException(String message) {
     super(message);
   }
 
+  public ValidationException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
   @Override
   public ErrorCode getErrorCode() {
     return ErrorCode.VALIDATION_FAIL;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index 0d33b5ca568..d989ce93ba7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -6,12 +6,12 @@
 import com.provectus.kafka.ui.model.BrokerDiskUsageDTO;
 import com.provectus.kafka.ui.model.BrokerMetricsDTO;
 import com.provectus.kafka.ui.model.ClusterDTO;
+import com.provectus.kafka.ui.model.ClusterFeature;
 import com.provectus.kafka.ui.model.ClusterMetricsDTO;
 import com.provectus.kafka.ui.model.ClusterStatsDTO;
 import com.provectus.kafka.ui.model.ConfigSourceDTO;
 import com.provectus.kafka.ui.model.ConfigSynonymDTO;
 import com.provectus.kafka.ui.model.ConnectDTO;
-import com.provectus.kafka.ui.model.Feature;
 import com.provectus.kafka.ui.model.InternalBroker;
 import com.provectus.kafka.ui.model.InternalBrokerConfig;
 import com.provectus.kafka.ui.model.InternalBrokerDiskUsage;
@@ -95,7 +95,7 @@ default ConfigSynonymDTO toConfigSynonym(ConfigEntry.ConfigSynonym config) {
 
   ConnectDTO toKafkaConnect(ClustersProperties.ConnectCluster connect);
 
-  List<ClusterDTO.FeaturesEnum> toFeaturesEnum(List<Feature> features);
+  List<ClusterDTO.FeaturesEnum> toFeaturesEnum(List<ClusterFeature> features);
 
   default List<PartitionDTO> map(Map<Integer, InternalPartition> map) {
     return map.values().stream().map(this::toPartition).collect(Collectors.toList());
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Feature.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ClusterFeature.java
similarity index 78%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Feature.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ClusterFeature.java
index ff0e2fca4bc..9731492f001 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Feature.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ClusterFeature.java
@@ -1,6 +1,6 @@
 package com.provectus.kafka.ui.model;
 
-public enum Feature {
+public enum ClusterFeature {
   KAFKA_CONNECT,
   KSQL_DB,
   SCHEMA_REGISTRY,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java
index 5f6d06ced5c..28e9a7413a3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterState.java
@@ -23,7 +23,7 @@ public class InternalClusterState {
   private Integer underReplicatedPartitionCount;
   private List<BrokerDiskUsageDTO> diskUsage;
   private String version;
-  private List<Feature> features;
+  private List<ClusterFeature> features;
   private BigDecimal bytesInPerSec;
   private BigDecimal bytesOutPerSec;
   private Boolean readOnly;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/JmxConnectionInfo.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/JmxConnectionInfo.java
deleted file mode 100644
index de80b25be3e..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/JmxConnectionInfo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.provectus.kafka.ui.model;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
-@Data
-@RequiredArgsConstructor
-@Builder
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class JmxConnectionInfo {
-
-  @EqualsAndHashCode.Include
-  private final String url;
-  private final boolean ssl;
-  private final String username;
-  private final String password;
-
-  public JmxConnectionInfo(String url) {
-    this.url = url;
-    this.ssl = false;
-    this.username = null;
-    this.password = null;
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/MetricsConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/MetricsConfig.java
index 25540080800..d3551443437 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/MetricsConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/MetricsConfig.java
@@ -17,4 +17,6 @@ public class MetricsConfig {
   private final boolean ssl;
   private final String username;
   private final String password;
+  private final String keystoreLocation;
+  private final String keystorePassword;
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Statistics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Statistics.java
index cb74c5d5ab1..e70547f1437 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Statistics.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/Statistics.java
@@ -15,7 +15,7 @@ public class Statistics {
   ServerStatusDTO status;
   Throwable lastKafkaException;
   String version;
-  List<Feature> features;
+  List<ClusterFeature> features;
   ReactiveAdminClient.ClusterDescription clusterDescription;
   Metrics metrics;
   InternalLogDirStats logDirInfo;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
index abe18fb9668..0c2587d681a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac;
 
+import com.provectus.kafka.ui.model.rbac.permission.ApplicationConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction;
@@ -15,6 +16,8 @@
 @Value
 public class AccessContext {
 
+  Collection<ApplicationConfigAction> applicationConfigActions;
+
   String cluster;
   Collection<ClusterConfigAction> clusterConfigActions;
 
@@ -39,6 +42,7 @@ public static AccessContextBuilder builder() {
   }
 
   public static final class AccessContextBuilder {
+    private Collection<ApplicationConfigAction> applicationConfigActions = Collections.emptySet();
     private String cluster;
     private Collection<ClusterConfigAction> clusterConfigActions = Collections.emptySet();
     private String topic;
@@ -55,6 +59,12 @@ public static final class AccessContextBuilder {
     private AccessContextBuilder() {
     }
 
+    public AccessContextBuilder applicationConfigActions(ApplicationConfigAction... actions) {
+      Assert.isTrue(actions.length > 0, "actions not present");
+      this.applicationConfigActions = List.of(actions);
+      return this;
+    }
+
     public AccessContextBuilder cluster(String cluster) {
       this.cluster = cluster;
       return this;
@@ -122,7 +132,9 @@ public AccessContextBuilder ksqlActions(KsqlAction... actions) {
     }
 
     public AccessContext build() {
-      return new AccessContext(cluster, clusterConfigActions,
+      return new AccessContext(
+          applicationConfigActions,
+          cluster, clusterConfigActions,
           topic, topicActions,
           consumerGroup, consumerGroupActions,
           connect, connectActions,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
index 9aa23b46c71..837f9008f3e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
@@ -3,6 +3,7 @@
 import static com.provectus.kafka.ui.model.rbac.Resource.CLUSTERCONFIG;
 import static com.provectus.kafka.ui.model.rbac.Resource.KSQL;
 
+import com.provectus.kafka.ui.model.rbac.permission.ApplicationConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction;
@@ -12,11 +13,11 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
+import javax.annotation.Nullable;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
 import org.apache.commons.collections.CollectionUtils;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.util.Assert;
 
 @Getter
@@ -25,18 +26,21 @@
 public class Permission {
 
   Resource resource;
+  List<String> actions;
 
   @Nullable
-  Pattern value;
-  List<String> actions;
+  String value;
+  @Nullable
+  transient Pattern compiledValuePattern;
 
   @SuppressWarnings("unused")
   public void setResource(String resource) {
     this.resource = Resource.fromString(resource.toUpperCase());
   }
 
-  public void setValue(String value) {
-    this.value = Pattern.compile(value);
+  @SuppressWarnings("unused")
+  public void setValue(@Nullable String value) {
+    this.value = value;
   }
 
   @SuppressWarnings("unused")
@@ -52,14 +56,17 @@ public void validate() {
   }
 
   public void transform() {
-    if (CollectionUtils.isEmpty(actions) || this.actions.stream().noneMatch("ALL"::equalsIgnoreCase)) {
-      return;
+    if (value != null) {
+      this.compiledValuePattern = Pattern.compile(value);
+    }
+    if (CollectionUtils.isNotEmpty(actions) && actions.stream().anyMatch("ALL"::equalsIgnoreCase)) {
+      this.actions = getAllActionValues();
     }
-    this.actions = getActionValues();
   }
 
-  private List<String> getActionValues() {
+  private List<String> getAllActionValues() {
     return switch (this.resource) {
+      case APPLICATIONCONFIG -> Arrays.stream(ApplicationConfigAction.values()).map(Enum::toString).toList();
       case CLUSTERCONFIG -> Arrays.stream(ClusterConfigAction.values()).map(Enum::toString).toList();
       case TOPIC -> Arrays.stream(TopicAction.values()).map(Enum::toString).toList();
       case CONSUMER -> Arrays.stream(ConsumerGroupAction.values()).map(Enum::toString).toList();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
index 3dafd7e6b24..4b2c66361f7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
@@ -5,6 +5,7 @@
 
 public enum Resource {
 
+  APPLICATIONCONFIG,
   CLUSTERCONFIG,
   TOPIC,
   CONSUMER,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ApplicationConfigAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ApplicationConfigAction.java
new file mode 100644
index 00000000000..d30ff50d708
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ApplicationConfigAction.java
@@ -0,0 +1,18 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum ApplicationConfigAction implements PermissibleAction {
+
+  VIEW,
+  EDIT
+
+  ;
+
+  @Nullable
+  public static ApplicationConfigAction fromString(String name) {
+    return EnumUtils.getEnum(ApplicationConfigAction.class, name);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
index 2e057874e74..40ea320b2eb 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
@@ -89,21 +89,23 @@ public ClusterSerdes init(Environment env,
 
     Map<String, SerdeInstance> registeredSerdes = new LinkedHashMap<>();
     // initializing serdes from config
-    for (int i = 0; i < clusterProperties.getSerde().size(); i++) {
-      SerdeConfig serdeConfig = clusterProperties.getSerde().get(i);
-      if (Strings.isNullOrEmpty(serdeConfig.getName())) {
-        throw new ValidationException("'name' property not set for serde: " + serdeConfig);
-      }
-      if (registeredSerdes.containsKey(serdeConfig.getName())) {
-        throw new ValidationException("Multiple serdes with same name: " + serdeConfig.getName());
+    if (clusterProperties.getSerde() != null) {
+      for (int i = 0; i < clusterProperties.getSerde().size(); i++) {
+        SerdeConfig serdeConfig = clusterProperties.getSerde().get(i);
+        if (Strings.isNullOrEmpty(serdeConfig.getName())) {
+          throw new ValidationException("'name' property not set for serde: " + serdeConfig);
+        }
+        if (registeredSerdes.containsKey(serdeConfig.getName())) {
+          throw new ValidationException("Multiple serdes with same name: " + serdeConfig.getName());
+        }
+        var instance = createSerdeFromConfig(
+            serdeConfig,
+            new PropertyResolverImpl(env, "kafka.clusters." + clusterIndex + ".serde." + i + ".properties"),
+            clusterPropertiesResolver,
+            globalPropertiesResolver
+        );
+        registeredSerdes.put(serdeConfig.getName(), instance);
       }
-      var instance = createSerdeFromConfig(
-          serdeConfig,
-          new PropertyResolverImpl(env, "kafka.clusters." + clusterIndex + ".serde." + i + ".properties"),
-          clusterPropertiesResolver,
-          globalPropertiesResolver
-      );
-      registeredSerdes.put(serdeConfig.getName(), instance);
     }
 
     // initializing remaining built-in serdes with empty selection patters
@@ -172,7 +174,7 @@ private SerdeInstance createSerdeWithBuiltInSerdeName(SerdeConfig serdeConfig,
     }
     var clazz = builtInSerdeClasses.get(name);
     BuiltInSerde serde = createSerdeInstance(clazz);
-    if (serdeConfig.getProperties().isEmpty()) {
+    if (serdeConfig.getProperties() == null || serdeConfig.getProperties().isEmpty()) {
       if (!autoConfigureSerde(serde, clusterProps, globalProps)) {
         // no properties provided and serde does not support auto-configuration
         throw new ValidationException(name + " serde is not configured");
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index a4d7ee8891d..fd5985e20c4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -70,10 +70,10 @@ public void autoConfigure(PropertyResolver kafkaClusterProperties,
             urls,
             kafkaClusterProperties.getProperty("schemaRegistryAuth.username", String.class).orElse(null),
             kafkaClusterProperties.getProperty("schemaRegistryAuth.password", String.class).orElse(null),
-            kafkaClusterProperties.getProperty("schemaRegistrySSL.keystoreLocation", String.class).orElse(null),
-            kafkaClusterProperties.getProperty("schemaRegistrySSL.keystorePassword", String.class).orElse(null),
-            kafkaClusterProperties.getProperty("schemaRegistrySSL.truststoreLocation", String.class).orElse(null),
-            kafkaClusterProperties.getProperty("schemaRegistrySSL.truststorePassword", String.class).orElse(null)
+            kafkaClusterProperties.getProperty("schemaRegistrySsl.keystoreLocation", String.class).orElse(null),
+            kafkaClusterProperties.getProperty("schemaRegistrySsl.keystorePassword", String.class).orElse(null),
+            kafkaClusterProperties.getProperty("ssl.truststoreLocation", String.class).orElse(null),
+            kafkaClusterProperties.getProperty("ssl.truststorePassword", String.class).orElse(null)
         ),
         kafkaClusterProperties.getProperty("schemaRegistryKeySchemaNameTemplate", String.class).orElse("%s-key"),
         kafkaClusterProperties.getProperty("schemaRegistrySchemaNameTemplate", String.class).orElse("%s-value"),
@@ -98,12 +98,12 @@ public void configure(PropertyResolver serdeProperties,
             serdeProperties.getProperty("password", String.class).orElse(null),
             serdeProperties.getProperty("keystoreLocation", String.class).orElse(null),
             serdeProperties.getProperty("keystorePassword", String.class).orElse(null),
-            serdeProperties.getProperty("truststoreLocation", String.class).orElse(null),
-            serdeProperties.getProperty("truststorePassword", String.class).orElse(null)
+            kafkaClusterProperties.getProperty("ssl.truststoreLocation", String.class).orElse(null),
+            kafkaClusterProperties.getProperty("ssl.truststorePassword", String.class).orElse(null)
         ),
         serdeProperties.getProperty("keySchemaNameTemplate", String.class).orElse("%s-key"),
         serdeProperties.getProperty("schemaNameTemplate", String.class).orElse("%s-value"),
-        kafkaClusterProperties.getProperty("checkSchemaExistenceForDeserialize", Boolean.class)
+        serdeProperties.getProperty("checkSchemaExistenceForDeserialize", Boolean.class)
             .orElse(false)
     );
   }
@@ -148,15 +148,15 @@ private static SchemaRegistryClient createSchemaRegistryClient(List<String> urls
           trustStoreLocation);
       configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG,
           trustStorePassword);
+    }
 
-      if (keyStoreLocation != null) {
-        configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG,
-            keyStoreLocation);
-        configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG,
-            keyStorePassword);
-        configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_KEY_PASSWORD_CONFIG,
-            keyStorePassword);
-      }
+    if (keyStoreLocation != null && keyStorePassword != null) {
+      configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG,
+          keyStoreLocation);
+      configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG,
+          keyStorePassword);
+      configs.put(SchemaRegistryClientConfig.CLIENT_NAMESPACE + SslConfigs.SSL_KEY_PASSWORD_CONFIG,
+          keyStorePassword);
     }
 
     return new CachedSchemaRegistryClient(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
index 3589a07a47d..886b67b9282 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
@@ -1,10 +1,13 @@
 package com.provectus.kafka.ui.service;
 
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.util.SslPropertiesUtil;
 import java.io.Closeable;
+import java.time.Instant;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +21,9 @@
 @RequiredArgsConstructor
 @Slf4j
 public class AdminClientServiceImpl implements AdminClientService, Closeable {
+
+  private static final AtomicLong CLIENT_ID_SEQ = new AtomicLong();
+
   private final Map<String, ReactiveAdminClient> adminClientCache = new ConcurrentHashMap<>();
   @Setter // used in tests
   @Value("${kafka.admin-client-timeout:30000}")
@@ -33,14 +39,16 @@ public Mono<ReactiveAdminClient> get(KafkaCluster cluster) {
   private Mono<ReactiveAdminClient> createAdminClient(KafkaCluster cluster) {
     return Mono.fromSupplier(() -> {
       Properties properties = new Properties();
+      SslPropertiesUtil.addKafkaSslProperties(cluster.getOriginalProperties().getSsl(), properties);
       properties.putAll(cluster.getProperties());
-      properties
-          .put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
+      properties.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
       properties.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, clientTimeout);
-      properties.putIfAbsent(AdminClientConfig.CLIENT_ID_CONFIG, "kafka-ui-admin-client-" + System.currentTimeMillis());
+      properties.putIfAbsent(
+          AdminClientConfig.CLIENT_ID_CONFIG,
+          "kafka-ui-admin-" + Instant.now().getEpochSecond() + "-" + CLIENT_ID_SEQ.incrementAndGet()
+      );
       return AdminClient.create(properties);
-    })
-        .flatMap(ReactiveAdminClient::create)
+    }).flatMap(ac -> ReactiveAdminClient.create(ac).doOnError(th -> ac.close()))
         .onErrorMap(th -> new IllegalStateException(
             "Error while creating AdminClient for Cluster " + cluster.getName(), th));
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index 1a74914ff43..024eb3df513 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -7,6 +7,7 @@
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.SortOrderDTO;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import com.provectus.kafka.ui.util.SslPropertiesUtil;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -214,6 +215,7 @@ public KafkaConsumer<Bytes, Bytes> createConsumer(KafkaCluster cluster) {
   public KafkaConsumer<Bytes, Bytes> createConsumer(KafkaCluster cluster,
                                                     Map<String, Object> properties) {
     Properties props = new Properties();
+    SslPropertiesUtil.addKafkaSslProperties(cluster.getOriginalProperties().getSsl(), props);
     props.putAll(cluster.getProperties());
     props.put(ConsumerConfig.CLIENT_ID_CONFIG, "kafka-ui-consumer-" + System.currentTimeMillis());
     props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
index b2694d9f7db..f5fbf262649 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
@@ -1,6 +1,6 @@
 package com.provectus.kafka.ui.service;
 
-import com.provectus.kafka.ui.model.Feature;
+import com.provectus.kafka.ui.model.ClusterFeature;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,27 +25,27 @@ public class FeatureService {
 
   private final AdminClientService adminClientService;
 
-  public Mono<List<Feature>> getAvailableFeatures(KafkaCluster cluster, @Nullable Node controller) {
-    List<Mono<Feature>> features = new ArrayList<>();
+  public Mono<List<ClusterFeature>> getAvailableFeatures(KafkaCluster cluster, @Nullable Node controller) {
+    List<Mono<ClusterFeature>> features = new ArrayList<>();
 
     if (Optional.ofNullable(cluster.getConnectsClients())
         .filter(Predicate.not(Map::isEmpty))
         .isPresent()) {
-      features.add(Mono.just(Feature.KAFKA_CONNECT));
+      features.add(Mono.just(ClusterFeature.KAFKA_CONNECT));
     }
 
     if (cluster.getKsqlClient() != null) {
-      features.add(Mono.just(Feature.KSQL_DB));
+      features.add(Mono.just(ClusterFeature.KSQL_DB));
     }
 
     if (cluster.getSchemaRegistryClient() != null) {
-      features.add(Mono.just(Feature.SCHEMA_REGISTRY));
+      features.add(Mono.just(ClusterFeature.SCHEMA_REGISTRY));
     }
 
     if (controller != null) {
       features.add(
           isTopicDeletionEnabled(cluster, controller)
-              .flatMap(r -> Boolean.TRUE.equals(r) ? Mono.just(Feature.TOPIC_DELETION) : Mono.empty())
+              .flatMap(r -> Boolean.TRUE.equals(r) ? Mono.just(ClusterFeature.TOPIC_DELETION) : Mono.empty())
       );
     }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
index aea92ab4c45..26a9d40647f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
@@ -3,12 +3,15 @@
 import com.provectus.kafka.ui.client.RetryingKafkaConnectClient;
 import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
+import com.provectus.kafka.ui.model.ApplicationPropertyValidationDTO;
+import com.provectus.kafka.ui.model.ClusterConfigValidationDTO;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.MetricsConfig;
 import com.provectus.kafka.ui.service.ksql.KsqlApiClient;
 import com.provectus.kafka.ui.service.masking.DataMasking;
 import com.provectus.kafka.ui.sr.ApiClient;
 import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
+import com.provectus.kafka.ui.util.KafkaServicesValidation;
 import com.provectus.kafka.ui.util.PollingThrottler;
 import com.provectus.kafka.ui.util.ReactiveFailover;
 import com.provectus.kafka.ui.util.WebClientConfigurator;
@@ -20,13 +23,19 @@
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.unit.DataSize;
 import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class KafkaClusterFactory {
 
   @Value("${webclient.max-in-memory-buffer-size:20MB}")
@@ -37,50 +46,116 @@ public KafkaCluster create(ClustersProperties.Cluster clusterProperties) {
 
     builder.name(clusterProperties.getName());
     builder.bootstrapServers(clusterProperties.getBootstrapServers());
-    builder.properties(Optional.ofNullable(clusterProperties.getProperties()).orElse(new Properties()));
+    builder.properties(convertProperties(clusterProperties.getProperties()));
     builder.readOnly(clusterProperties.isReadOnly());
     builder.masking(DataMasking.create(clusterProperties.getMasking()));
-    builder.metricsConfig(metricsConfigDataToMetricsConfig(clusterProperties.getMetrics()));
     builder.throttler(PollingThrottler.throttlerSupplier(clusterProperties));
 
-    builder.schemaRegistryClient(schemaRegistryClient(clusterProperties));
-    builder.connectsClients(connectClients(clusterProperties));
-    builder.ksqlClient(ksqlClient(clusterProperties));
-
+    if (schemaRegistryConfigured(clusterProperties)) {
+      builder.schemaRegistryClient(schemaRegistryClient(clusterProperties));
+    }
+    if (connectClientsConfigured(clusterProperties)) {
+      builder.connectsClients(connectClients(clusterProperties));
+    }
+    if (ksqlConfigured(clusterProperties)) {
+      builder.ksqlClient(ksqlClient(clusterProperties));
+    }
+    if (metricsConfigured(clusterProperties)) {
+      builder.metricsConfig(metricsConfigDataToMetricsConfig(clusterProperties.getMetrics()));
+    }
     builder.originalProperties(clusterProperties);
-
     return builder.build();
   }
 
-  @Nullable
+  public Mono<ClusterConfigValidationDTO> validate(ClustersProperties.Cluster clusterProperties) {
+    if (clusterProperties.getSsl() != null) {
+      Optional<String> errMsg = KafkaServicesValidation.validateTruststore(clusterProperties.getSsl());
+      if (errMsg.isPresent()) {
+        return Mono.just(new ClusterConfigValidationDTO()
+            .kafka(new ApplicationPropertyValidationDTO()
+                .error(true)
+                .errorMessage("Truststore not valid: " + errMsg.get())));
+      }
+    }
+
+    return Mono.zip(
+        KafkaServicesValidation.validateClusterConnection(
+            clusterProperties.getBootstrapServers(),
+            convertProperties(clusterProperties.getProperties()),
+            clusterProperties.getSsl()
+        ),
+        schemaRegistryConfigured(clusterProperties)
+            ? KafkaServicesValidation.validateSchemaRegistry(
+                () -> schemaRegistryClient(clusterProperties)).map(Optional::of)
+            : Mono.<Optional<ApplicationPropertyValidationDTO>>just(Optional.empty()),
+
+        ksqlConfigured(clusterProperties)
+            ? KafkaServicesValidation.validateKsql(() -> ksqlClient(clusterProperties)).map(Optional::of)
+            : Mono.<Optional<ApplicationPropertyValidationDTO>>just(Optional.empty()),
+
+        connectClientsConfigured(clusterProperties)
+            ?
+            Flux.fromIterable(clusterProperties.getKafkaConnect())
+                .flatMap(c ->
+                    KafkaServicesValidation.validateConnect(() -> connectClient(clusterProperties, c))
+                        .map(r -> Tuples.of(c.getName(), r)))
+                .collectMap(Tuple2::getT1, Tuple2::getT2)
+                .map(Optional::of)
+            :
+            Mono.<Optional<Map<String, ApplicationPropertyValidationDTO>>>just(Optional.empty())
+    ).map(tuple -> {
+      var validation = new ClusterConfigValidationDTO();
+      validation.kafka(tuple.getT1());
+      tuple.getT2().ifPresent(validation::schemaRegistry);
+      tuple.getT3().ifPresent(validation::ksqldb);
+      tuple.getT4().ifPresent(validation::kafkaConnects);
+      return validation;
+    });
+  }
+
+  private Properties convertProperties(Map<String, Object> propertiesMap) {
+    Properties properties = new Properties();
+    if (propertiesMap != null) {
+      properties.putAll(propertiesMap);
+    }
+    return properties;
+  }
+
+  private boolean connectClientsConfigured(ClustersProperties.Cluster clusterProperties) {
+    return clusterProperties.getKafkaConnect() != null;
+  }
+
   private Map<String, ReactiveFailover<KafkaConnectClientApi>> connectClients(
       ClustersProperties.Cluster clusterProperties) {
-    if (clusterProperties.getKafkaConnect() == null) {
-      return null;
-    }
     Map<String, ReactiveFailover<KafkaConnectClientApi>> connects = new HashMap<>();
-    clusterProperties.getKafkaConnect().forEach(c -> {
-      ReactiveFailover<KafkaConnectClientApi> failover = ReactiveFailover.create(
-          parseUrlList(c.getAddress()),
-          url -> new RetryingKafkaConnectClient(c.toBuilder().address(url).build(), maxBuffSize),
-          ReactiveFailover.CONNECTION_REFUSED_EXCEPTION_FILTER,
-          "No alive connect instances available",
-          ReactiveFailover.DEFAULT_RETRY_GRACE_PERIOD_MS
-      );
-      connects.put(c.getName(), failover);
-    });
+    clusterProperties.getKafkaConnect().forEach(c -> connects.put(c.getName(), connectClient(clusterProperties, c)));
     return connects;
   }
 
-  @Nullable
+  private ReactiveFailover<KafkaConnectClientApi> connectClient(ClustersProperties.Cluster cluster,
+                                                                ClustersProperties.ConnectCluster connectCluster) {
+    return ReactiveFailover.create(
+        parseUrlList(connectCluster.getAddress()),
+        url -> new RetryingKafkaConnectClient(
+            connectCluster.toBuilder().address(url).build(),
+            cluster.getSsl(),
+            maxBuffSize
+        ),
+        ReactiveFailover.CONNECTION_REFUSED_EXCEPTION_FILTER,
+        "No alive connect instances available",
+        ReactiveFailover.DEFAULT_RETRY_GRACE_PERIOD_MS
+    );
+  }
+
+  private boolean schemaRegistryConfigured(ClustersProperties.Cluster clusterProperties) {
+    return clusterProperties.getSchemaRegistry() != null;
+  }
+
   private ReactiveFailover<KafkaSrClientApi> schemaRegistryClient(ClustersProperties.Cluster clusterProperties) {
-    if (clusterProperties.getSchemaRegistry() == null) {
-      return null;
-    }
     var auth = Optional.ofNullable(clusterProperties.getSchemaRegistryAuth())
         .orElse(new ClustersProperties.SchemaRegistryAuth());
     WebClient webClient = new WebClientConfigurator()
-        .configureSsl(clusterProperties.getSchemaRegistrySsl())
+        .configureSsl(clusterProperties.getSsl(), clusterProperties.getSchemaRegistrySsl())
         .configureBasicAuth(auth.getUsername(), auth.getPassword())
         .configureBufferSize(maxBuffSize)
         .build();
@@ -93,16 +168,17 @@ private ReactiveFailover<KafkaSrClientApi> schemaRegistryClient(ClustersProperti
     );
   }
 
-  @Nullable
+  private boolean ksqlConfigured(ClustersProperties.Cluster clusterProperties) {
+    return clusterProperties.getKsqldbServer() != null;
+  }
+
   private ReactiveFailover<KsqlApiClient> ksqlClient(ClustersProperties.Cluster clusterProperties) {
-    if (clusterProperties.getKsqldbServer() == null) {
-      return null;
-    }
     return ReactiveFailover.create(
         parseUrlList(clusterProperties.getKsqldbServer()),
         url -> new KsqlApiClient(
             url,
             clusterProperties.getKsqldbServerAuth(),
+            clusterProperties.getSsl(),
             clusterProperties.getKsqldbServerSsl(),
             maxBuffSize
         ),
@@ -116,6 +192,10 @@ private List<String> parseUrlList(String url) {
     return Stream.of(url.split(",")).map(String::trim).filter(s -> !s.isBlank()).toList();
   }
 
+  private boolean metricsConfigured(ClustersProperties.Cluster clusterProperties) {
+    return clusterProperties.getMetrics() != null;
+  }
+
   @Nullable
   private MetricsConfig metricsConfigDataToMetricsConfig(ClustersProperties.MetricsConfigData metricsConfigData) {
     if (metricsConfigData == null) {
@@ -124,9 +204,11 @@ private MetricsConfig metricsConfigDataToMetricsConfig(ClustersProperties.Metric
     MetricsConfig.MetricsConfigBuilder builder = MetricsConfig.builder();
     builder.type(metricsConfigData.getType());
     builder.port(metricsConfigData.getPort());
-    builder.ssl(metricsConfigData.isSsl());
+    builder.ssl(Optional.ofNullable(metricsConfigData.getSsl()).orElse(false));
     builder.username(metricsConfigData.getUsername());
     builder.password(metricsConfigData.getPassword());
+    builder.keystoreLocation(metricsConfigData.getKeystoreLocation());
+    builder.keystorePassword(metricsConfigData.getKeystorePassword());
     return builder.build();
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index eaf6fbb889a..d1f0e261a8c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -18,6 +18,7 @@
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
 import com.provectus.kafka.ui.util.ResultSizeLimiter;
+import com.provectus.kafka.ui.util.SslPropertiesUtil;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -108,6 +109,7 @@ private Mono<RecordMetadata> sendMessageImpl(KafkaCluster cluster,
         );
 
     Properties properties = new Properties();
+    SslPropertiesUtil.addKafkaSslProperties(cluster.getOriginalProperties().getSsl(), properties);
     properties.putAll(cluster.getProperties());
     properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
     properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 7cdf2ef16d7..19d06a0c48b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -10,7 +10,7 @@
 import com.provectus.kafka.ui.exception.IllegalEntityStateException;
 import com.provectus.kafka.ui.exception.NotFoundException;
 import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.util.NumberUtil;
+import com.provectus.kafka.ui.util.KafkaVersion;
 import com.provectus.kafka.ui.util.annotation.KafkaClientInternalsDependant;
 import java.io.Closeable;
 import java.util.ArrayList;
@@ -123,7 +123,7 @@ public static Mono<ReactiveAdminClient> create(AdminClient adminClient) {
 
   private static Set<SupportedFeature> getSupportedUpdateFeaturesForVersion(String versionStr) {
     try {
-      float version = NumberUtil.parserClusterVersion(versionStr);
+      float version = KafkaVersion.parse(versionStr);
       return SupportedFeature.forVersion(version);
     } catch (NumberFormatException e) {
       return SupportedFeature.defaultFeatures();
@@ -132,7 +132,7 @@ private static Set<SupportedFeature> getSupportedUpdateFeaturesForVersion(String
 
   // NOTE: if KafkaFuture returns null, that Mono will be empty(!), since Reactor does not support nullable results
   // (see MonoSink.success(..) javadoc for details)
-  private static <T> Mono<T> toMono(KafkaFuture<T> future) {
+  public static <T> Mono<T> toMono(KafkaFuture<T> future) {
     return Mono.<T>create(sink -> future.whenComplete((res, ex) -> {
       if (ex != null) {
         // KafkaFuture doc is unclear about what exception wrapper will be used
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
index e6dbb27ee9f..a36a64ff6dc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
@@ -2,7 +2,7 @@
 
 import static com.provectus.kafka.ui.service.ReactiveAdminClient.ClusterDescription;
 
-import com.provectus.kafka.ui.model.Feature;
+import com.provectus.kafka.ui.model.ClusterFeature;
 import com.provectus.kafka.ui.model.InternalLogDirStats;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.Metrics;
@@ -51,7 +51,7 @@ private Mono<Statistics> getStatistics(KafkaCluster cluster) {
                             .version(ac.getVersion())
                             .metrics((Metrics) results[0])
                             .logDirInfo((InternalLogDirStats) results[1])
-                            .features((List<Feature>) results[2])
+                            .features((List<ClusterFeature>) results[2])
                             .topicConfigs((Map<String, List<ConfigEntry>>) results[3])
                             .topicDescriptions((Map<String, TopicDescription>) results[4])
                             .build()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index b9038677267..b172e2b4c61 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -7,7 +7,7 @@
 import com.provectus.kafka.ui.exception.TopicNotFoundException;
 import com.provectus.kafka.ui.exception.TopicRecreationException;
 import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.model.Feature;
+import com.provectus.kafka.ui.model.ClusterFeature;
 import com.provectus.kafka.ui.model.InternalLogDirStats;
 import com.provectus.kafka.ui.model.InternalPartition;
 import com.provectus.kafka.ui.model.InternalPartitionsOffsets;
@@ -422,7 +422,7 @@ public Mono<PartitionsIncreaseResponseDTO> increaseTopicPartitions(
   }
 
   public Mono<Void> deleteTopic(KafkaCluster cluster, String topicName) {
-    if (statisticsCache.get(cluster).getFeatures().contains(Feature.TOPIC_DELETION)) {
+    if (statisticsCache.get(cluster).getFeatures().contains(ClusterFeature.TOPIC_DELETION)) {
       return adminClientService.get(cluster).flatMap(c -> c.deleteTopic(topicName))
           .doOnSuccess(t -> statisticsCache.onTopicDelete(cluster, topicName));
     } else {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
index e0b95c522a5..fd68add7267 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
@@ -43,12 +43,13 @@ public class KsqlApiClient {
       UndefineVariableContext.class
   );
 
-  @Builder
+  @Builder(toBuilder = true)
   @Value
   public static class KsqlResponseTable {
     String header;
     List<String> columnNames;
     List<List<JsonNode>> values;
+    boolean error;
 
     public Optional<JsonNode> getColumnValue(List<JsonNode> row, String column) {
       return Optional.ofNullable(row.get(columnNames.indexOf(column)));
@@ -68,26 +69,22 @@ private static class KsqlRequest {
 
   public KsqlApiClient(String baseUrl,
                        @Nullable ClustersProperties.KsqldbServerAuth ksqldbServerAuth,
-                       @Nullable ClustersProperties.WebClientSsl ksqldbServerSsl,
+                       @Nullable ClustersProperties.TruststoreConfig ksqldbServerSsl,
+                       @Nullable ClustersProperties.KeystoreConfig keystoreConfig,
                        @Nullable DataSize maxBuffSize) {
     this.baseUrl = baseUrl;
-    this.webClient = webClient(ksqldbServerAuth, ksqldbServerSsl, maxBuffSize);
+    this.webClient = webClient(ksqldbServerAuth, ksqldbServerSsl, keystoreConfig, maxBuffSize);
   }
 
   private static WebClient webClient(@Nullable ClustersProperties.KsqldbServerAuth ksqldbServerAuth,
-                                     @Nullable ClustersProperties.WebClientSsl ksqldbServerSsl,
+                                     @Nullable ClustersProperties.TruststoreConfig truststoreConfig,
+                                     @Nullable ClustersProperties.KeystoreConfig keystoreConfig,
                                      @Nullable DataSize maxBuffSize) {
     ksqldbServerAuth = Optional.ofNullable(ksqldbServerAuth).orElse(new ClustersProperties.KsqldbServerAuth());
-    ksqldbServerSsl = Optional.ofNullable(ksqldbServerSsl).orElse(new ClustersProperties.WebClientSsl());
     maxBuffSize = Optional.ofNullable(maxBuffSize).orElse(DataSize.ofMegabytes(20));
 
     return new WebClientConfigurator()
-        .configureSsl(
-            ksqldbServerSsl.getKeystoreLocation(),
-            ksqldbServerSsl.getKeystorePassword(),
-            ksqldbServerSsl.getTruststoreLocation(),
-            ksqldbServerSsl.getTruststorePassword()
-        )
+        .configureSsl(truststoreConfig, keystoreConfig)
         .configureBasicAuth(
             ksqldbServerAuth.getUsername(),
             ksqldbServerAuth.getPassword()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java
index 647e23a78ec..cd91fa57dcc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/response/ResponseParser.java
@@ -74,13 +74,17 @@ public static KsqlApiClient.KsqlResponseTable errorTableWithTextMsg(String error
         .header("Execution error")
         .columnNames(List.of("message"))
         .values(List.of(List.of(new TextNode(errorText))))
+        .error(true)
         .build();
   }
 
   public static KsqlApiClient.KsqlResponseTable parseErrorResponse(WebClientResponseException e) {
     try {
       var errBody = new JsonMapper().readTree(e.getResponseBodyAsString());
-      return DynamicParser.parseObject("Execution error", errBody);
+      return DynamicParser.parseObject("Execution error", errBody)
+          .toBuilder()
+          .error(true)
+          .build();
     } catch (Exception ex) {
       return errorTableWithTextMsg(
           String.format(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
index a8a69ad752b..78e74f33321 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
@@ -41,9 +41,9 @@ boolean shouldBeApplied(String topic, Serde.Target target) {
 
   private final List<Mask> masks;
 
-  public static DataMasking create(List<ClustersProperties.Masking> config) {
+  public static DataMasking create(@Nullable List<ClustersProperties.Masking> config) {
     return new DataMasking(
-        config.stream().map(property -> {
+        Optional.ofNullable(config).orElse(List.of()).stream().map(property -> {
           Preconditions.checkNotNull(property.getType(), "masking type not specifed");
           Preconditions.checkArgument(
               StringUtils.isNotEmpty(property.getTopicKeysPattern())
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java
index 1459e95f00a..dbbc5d131a7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java
@@ -11,6 +11,8 @@
 
 class Mask extends MaskingPolicy {
 
+  static final List<String> DEFAULT_PATTERN = List.of("X", "x", "n", "-");
+
   private final UnaryOperator<String> masker;
 
   Mask(List<String> fieldNames, List<String> maskingChars) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java
index 25a463a9da8..7a753382102 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.service.masking.policies;
 
 import com.fasterxml.jackson.databind.node.ContainerNode;
-import com.google.common.base.Preconditions;
 import com.provectus.kafka.ui.config.ClustersProperties;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -9,15 +8,28 @@
 @RequiredArgsConstructor
 public abstract class MaskingPolicy {
 
+
   public static MaskingPolicy create(ClustersProperties.Masking property) {
-    Preconditions.checkNotNull(property.getFields());
+    List<String> fields = property.getFields() == null
+        ? List.of() // empty list means that policy will be applied to all fields
+        : property.getFields();
     switch (property.getType()) {
       case REMOVE:
-        return new Remove(property.getFields());
+        return new Remove(fields);
       case REPLACE:
-        return new Replace(property.getFields(), property.getReplacement());
+        return new Replace(
+            fields,
+            property.getReplacement() == null
+                ? Replace.DEFAULT_REPLACEMENT
+                : property.getReplacement()
+        );
       case MASK:
-        return new Mask(property.getFields(), property.getPattern());
+        return new Mask(
+            fields,
+            property.getPattern() == null
+                ? Mask.DEFAULT_PATTERN
+                : property.getPattern()
+        );
       default:
         throw new IllegalStateException("Unknown policy type: " + property.getType());
     }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java
index a335730258a..3af645cb111 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java
@@ -10,6 +10,8 @@
 
 class Replace extends MaskingPolicy {
 
+  static final String DEFAULT_REPLACEMENT = "***DATA_MASKED***";
+
   private final String replacement;
 
   Replace(List<String> fieldNames, String replacementString) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java
index 8a6e10656d2..78f5bdeced3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java
@@ -1,21 +1,22 @@
 package com.provectus.kafka.ui.service.metrics;
 
-import com.provectus.kafka.ui.model.JmxConnectionInfo;
 import com.provectus.kafka.ui.model.KafkaCluster;
-import com.provectus.kafka.ui.util.JmxPoolFactory;
+import java.io.Closeable;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
-import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.common.Node;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -23,68 +24,102 @@
 
 
 @Service
-@Lazy
 @Slf4j
-class JmxMetricsRetriever implements MetricsRetriever, AutoCloseable {
+class JmxMetricsRetriever implements MetricsRetriever, Closeable {
+
+  private static final boolean SSL_JMX_SUPPORTED;
+
+  static {
+    // see JmxSslSocketFactory doc for details
+    SSL_JMX_SUPPORTED = JmxSslSocketFactory.initialized();
+  }
 
   private static final String JMX_URL = "service:jmx:rmi:///jndi/rmi://";
   private static final String JMX_SERVICE_TYPE = "jmxrmi";
   private static final String CANONICAL_NAME_PATTERN = "kafka.server*:*";
 
-  private final GenericKeyedObjectPool<JmxConnectionInfo, JMXConnector> pool;
-
-  public JmxMetricsRetriever() {
-    this.pool = new GenericKeyedObjectPool<>(new JmxPoolFactory());
-    GenericKeyedObjectPoolConfig<JMXConnector> poolConfig = new GenericKeyedObjectPoolConfig<>();
-    poolConfig.setMaxIdlePerKey(3);
-    poolConfig.setMaxTotalPerKey(3);
-    this.pool.setConfig(poolConfig);
+  @Override
+  public void close() {
+    JmxSslSocketFactory.clearFactoriesCache();
   }
 
   @Override
   public Flux<RawMetric> retrieve(KafkaCluster c, Node node) {
+    if (isSslJmxEndpoint(c) && !SSL_JMX_SUPPORTED) {
+      log.warn("Cluster {} has jmx ssl configured, but it is not supported", c.getName());
+      return Flux.empty();
+    }
     return Mono.fromSupplier(() -> retrieveSync(c, node))
         .subscribeOn(Schedulers.boundedElastic())
         .flatMapMany(Flux::fromIterable);
   }
 
+  private boolean isSslJmxEndpoint(KafkaCluster cluster) {
+    return cluster.getMetricsConfig().getKeystoreLocation() != null;
+  }
+
+  @SneakyThrows
   private List<RawMetric> retrieveSync(KafkaCluster c, Node node) {
     String jmxUrl = JMX_URL + node.host() + ":" + c.getMetricsConfig().getPort() + "/" + JMX_SERVICE_TYPE;
     log.debug("Collection JMX metrics for {}", jmxUrl);
-    final var connectionInfo = JmxConnectionInfo.builder()
-        .url(jmxUrl)
-        .ssl(c.getMetricsConfig().isSsl())
-        .username(c.getMetricsConfig().getUsername())
-        .password(c.getMetricsConfig().getPassword())
-        .build();
-    JMXConnector srv;
-    try {
-      srv = pool.borrowObject(connectionInfo);
-    } catch (Exception e) {
-      log.error("Cannot get JMX connector for the pool due to: ", e);
-      return Collections.emptyList();
-    }
     List<RawMetric> result = new ArrayList<>();
+    withJmxConnector(jmxUrl, c, jmxConnector -> getMetricsFromJmx(jmxConnector, result));
+    log.debug("{} metrics collected for {}", result.size(), jmxUrl);
+    return result;
+  }
+
+  private void withJmxConnector(String jmxUrl,
+                                KafkaCluster c,
+                                Consumer<JMXConnector> consumer) {
+    var env = prepareJmxEnvAndSetThreadLocal(c);
     try {
-      MBeanServerConnection msc = srv.getMBeanServerConnection();
-      var jmxMetrics = msc.queryNames(new ObjectName(CANONICAL_NAME_PATTERN), null);
-      for (ObjectName jmxMetric : jmxMetrics) {
-        result.addAll(extractObjectMetrics(jmxMetric, msc));
+      JMXConnector connector = null;
+      try {
+        connector = JMXConnectorFactory.newJMXConnector(new JMXServiceURL(jmxUrl), env);
+        connector.connect(env);
+      } catch (Exception exception) {
+        log.error("Error connecting to {}", jmxUrl, exception);
+        return;
       }
-      pool.returnObject(connectionInfo, srv);
+      consumer.accept(connector);
+      connector.close();
     } catch (Exception e) {
       log.error("Error getting jmx metrics from {}", jmxUrl, e);
-      closeConnectionExceptionally(jmxUrl, srv);
+    } finally {
+      JmxSslSocketFactory.clearThreadLocalContext();
     }
-    log.debug("{} metrics collected for {}", result.size(), jmxUrl);
-    return result;
   }
 
-  private void closeConnectionExceptionally(String url, JMXConnector srv) {
-    try {
-      pool.invalidateObject(new JmxConnectionInfo(url), srv);
-    } catch (Exception e) {
-      log.error("Cannot invalidate object in pool, {}", url, e);
+  private Map<String, Object> prepareJmxEnvAndSetThreadLocal(KafkaCluster cluster) {
+    var metricsConfig = cluster.getMetricsConfig();
+    Map<String, Object> env = new HashMap<>();
+    if (isSslJmxEndpoint(cluster)) {
+      var clusterSsl = cluster.getOriginalProperties().getSsl();
+      JmxSslSocketFactory.setSslContextThreadLocal(
+          clusterSsl != null ? clusterSsl.getTruststoreLocation() : null,
+          clusterSsl != null ? clusterSsl.getTruststorePassword() : null,
+          metricsConfig.getKeystoreLocation(),
+          metricsConfig.getKeystorePassword()
+      );
+      JmxSslSocketFactory.editJmxConnectorEnv(env);
+    }
+
+    if (StringUtils.isNotEmpty(metricsConfig.getUsername())
+        && StringUtils.isNotEmpty(metricsConfig.getPassword())) {
+      env.put(
+          JMXConnector.CREDENTIALS,
+          new String[] {metricsConfig.getUsername(), metricsConfig.getPassword()}
+      );
+    }
+    return env;
+  }
+
+  @SneakyThrows
+  private void getMetricsFromJmx(JMXConnector jmxConnector, List<RawMetric> sink) {
+    MBeanServerConnection msc = jmxConnector.getMBeanServerConnection();
+    var jmxMetrics = msc.queryNames(new ObjectName(CANONICAL_NAME_PATTERN), null);
+    for (ObjectName jmxMetric : jmxMetrics) {
+      sink.addAll(extractObjectMetrics(jmxMetric, msc));
     }
   }
 
@@ -98,9 +133,5 @@ private List<RawMetric> extractObjectMetrics(ObjectName objectName, MBeanServerC
     return JmxMetricsFormatter.constructMetricsList(objectName, attrNames, attrValues);
   }
 
-  @Override
-  public void close() {
-    this.pool.close();
-  }
 }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxSslSocketFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxSslSocketFactory.java
new file mode 100644
index 00000000000..06304365c79
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxSslSocketFactory.java
@@ -0,0 +1,218 @@
+package com.provectus.kafka.ui.service.metrics;
+
+import com.google.common.base.Preconditions;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.security.KeyStore;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nullable;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import javax.rmi.ssl.SslRMIClientSocketFactory;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ResourceUtils;
+
+/*
+ * Purpose of this class to provide an ability to connect to different JMX endpoints using different keystores.
+ *
+ * Usually, when you want to establish SSL JMX connection you set "com.sun.jndi.rmi.factory.socket" env
+ * property to SslRMIClientSocketFactory instance. SslRMIClientSocketFactory itself uses SSLSocketFactory.getDefault()
+ * as a socket factory implementation. Problem here is that when ones SslRMIClientSocketFactory instance is created,
+ * the same cached SSLSocketFactory instance will be used to establish connection with *all* JMX endpoints.
+ * Moreover, even if we submit custom SslRMIClientSocketFactory implementation which takes specific ssl context
+ * into account, SslRMIClientSocketFactory is
+ * internally created during RMI calls.
+ *
+ * So, the only way we found to deal with it is to change internal field ('defaultSocketFactory') of
+ * SslRMIClientSocketFactory to our custom impl, and left all internal RMI code work as is.
+ * Since RMI code is synchronous, we can pass parameters (which are truststore/keystore) to our custom factory
+ * that we want to use when creating ssl socket via ThreadLocal variables.
+ *
+ * NOTE 1: Theoretically we could avoid using reflection to set internal field set by
+ * setting "ssl.SocketFactory.provider" security property (see code in SSLSocketFactory.getDefault()),
+ * but that code uses systemClassloader which is not working right when we're creating executable spring boot jar
+ * (https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html#appendix.executable-jar.restrictions).
+ * We can use this if we swith to other jar-packing solutions in the future.
+ *
+ * NOTE 2: There are two paths from which socket factory is called - when jmx connection if established (we manage this
+ * by passing ThreadLocal vars) and from DGCClient in background thread - we deal with that we cache created factories
+ * for specific host+port.
+ *
+ */
+@Slf4j
+class JmxSslSocketFactory extends javax.net.ssl.SSLSocketFactory {
+
+  private static final boolean SSL_JMX_SUPPORTED;
+
+  static {
+    boolean sslJmxSupported = false;
+    try {
+      Field defaultSocketFactoryField = SslRMIClientSocketFactory.class.getDeclaredField("defaultSocketFactory");
+      defaultSocketFactoryField.setAccessible(true);
+      defaultSocketFactoryField.set(null, new JmxSslSocketFactory());
+      sslJmxSupported = true;
+    } catch (Exception e) {
+      log.error("----------------------------------");
+      log.error("SSL can't be enabled for JMX retrieval. "
+          + "Make sure your java app run with '--add-opens java.rmi/javax.rmi.ssl=ALL-UNNAMED' arg.", e);
+      log.error("----------------------------------");
+    }
+    SSL_JMX_SUPPORTED = sslJmxSupported;
+  }
+
+  public static boolean initialized() {
+    return SSL_JMX_SUPPORTED;
+  }
+
+  private static final ThreadLocal<Ssl> SSL_CONTEXT_THREAD_LOCAL = new ThreadLocal<>();
+
+  private static final Map<HostAndPort, javax.net.ssl.SSLSocketFactory> CACHED_FACTORIES = new ConcurrentHashMap<>();
+
+  private record HostAndPort(String host, int port) {
+  }
+
+  private record Ssl(@Nullable String truststoreLocation,
+                     @Nullable String truststorePassword,
+                     @Nullable String keystoreLocation,
+                     @Nullable String keystorePassword) {
+  }
+
+  public static void setSslContextThreadLocal(@Nullable String truststoreLocation,
+                                              @Nullable String truststorePassword,
+                                              @Nullable String keystoreLocation,
+                                              @Nullable String keystorePassword) {
+    SSL_CONTEXT_THREAD_LOCAL.set(
+        new Ssl(truststoreLocation, truststorePassword, keystoreLocation, keystorePassword));
+  }
+
+  // should be called when (host:port) -> factory cache should be invalidated (ex. on app config reload)
+  public static void clearFactoriesCache() {
+    CACHED_FACTORIES.clear();
+  }
+
+  public static void clearThreadLocalContext() {
+    SSL_CONTEXT_THREAD_LOCAL.set(null);
+  }
+
+  public static void editJmxConnectorEnv(Map<String, Object> env) {
+    env.put("com.sun.jndi.rmi.factory.socket", new SslRMIClientSocketFactory());
+  }
+
+  //-----------------------------------------------------------------------------------------------
+
+  private final javax.net.ssl.SSLSocketFactory defaultSocketFactory;
+
+  @SneakyThrows
+  public JmxSslSocketFactory() {
+    this.defaultSocketFactory = SSLContext.getDefault().getSocketFactory();
+  }
+
+  @SneakyThrows
+  private javax.net.ssl.SSLSocketFactory createFactoryFromThreadLocalCtx() {
+    Ssl ssl = Preconditions.checkNotNull(SSL_CONTEXT_THREAD_LOCAL.get());
+
+    var trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+    if (ssl.truststoreLocation() != null && ssl.truststorePassword() != null) {
+      KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+      trustStore.load(
+          new FileInputStream((ResourceUtils.getFile(ssl.truststoreLocation()))),
+          ssl.truststorePassword().toCharArray()
+      );
+      trustManagerFactory.init(trustStore);
+    }
+
+    var keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+    if (ssl.keystoreLocation() != null && ssl.keystorePassword() != null) {
+      KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+      keyStore.load(
+          new FileInputStream(ResourceUtils.getFile(ssl.keystoreLocation())),
+          ssl.keystorePassword().toCharArray()
+      );
+      keyManagerFactory.init(keyStore, ssl.keystorePassword().toCharArray());
+    }
+
+    SSLContext ctx = SSLContext.getInstance("TLS");
+    ctx.init(
+        keyManagerFactory.getKeyManagers(),
+        trustManagerFactory.getTrustManagers(),
+        null
+    );
+    return ctx.getSocketFactory();
+  }
+
+  private boolean threadLocalContextSet() {
+    return SSL_CONTEXT_THREAD_LOCAL.get() != null;
+  }
+
+  @Override
+  public Socket createSocket(String host, int port) throws IOException {
+    var hostAndPort = new HostAndPort(host, port);
+    if (CACHED_FACTORIES.containsKey(hostAndPort)) {
+      return CACHED_FACTORIES.get(hostAndPort).createSocket(host, port);
+    } else if (threadLocalContextSet()) {
+      var factory = createFactoryFromThreadLocalCtx();
+      CACHED_FACTORIES.put(hostAndPort, factory);
+      return factory.createSocket(host, port);
+    }
+    return defaultSocketFactory.createSocket(host, port);
+  }
+
+  /// FOLLOWING METHODS WON'T BE USED DURING JMX INTERACTION, IMPLEMENTING THEM JUST FOR CONSISTENCY ->>>>>
+
+  @Override
+  public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+    if (threadLocalContextSet()) {
+      return createFactoryFromThreadLocalCtx().createSocket(s, host, port, autoClose);
+    }
+    return defaultSocketFactory.createSocket(s, host, port, autoClose);
+  }
+
+  @Override
+  public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
+      throws IOException, UnknownHostException {
+    if (threadLocalContextSet()) {
+      return createFactoryFromThreadLocalCtx().createSocket(host, port, localHost, localPort);
+    }
+    return defaultSocketFactory.createSocket(host, port, localHost, localPort);
+  }
+
+  @Override
+  public Socket createSocket(InetAddress host, int port) throws IOException {
+    if (threadLocalContextSet()) {
+      return createFactoryFromThreadLocalCtx().createSocket(host, port);
+    }
+    return defaultSocketFactory.createSocket(host, port);
+  }
+
+  @Override
+  public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
+      throws IOException {
+    if (threadLocalContextSet()) {
+      return createFactoryFromThreadLocalCtx().createSocket(address, port, localAddress, localPort);
+    }
+    return defaultSocketFactory.createSocket(address, port, localAddress, localPort);
+  }
+
+  @Override
+  public String[] getDefaultCipherSuites() {
+    if (threadLocalContextSet()) {
+      return createFactoryFromThreadLocalCtx().getDefaultCipherSuites();
+    }
+    return defaultSocketFactory.getDefaultCipherSuites();
+  }
+
+  @Override
+  public String[] getSupportedCipherSuites() {
+    if (threadLocalContextSet()) {
+      return createFactoryFromThreadLocalCtx().getSupportedCipherSuites();
+    }
+    return defaultSocketFactory.getSupportedCipherSuites();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java
index e4cb4c36cb8..33ef1b80723 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetriever.java
@@ -2,53 +2,58 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
+import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.MetricsConfig;
+import com.provectus.kafka.ui.util.WebClientConfigurator;
 import java.util.Arrays;
 import java.util.Optional;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.Node;
 import org.springframework.stereotype.Service;
+import org.springframework.util.unit.DataSize;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.util.UriComponentsBuilder;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 @Service
-@RequiredArgsConstructor
 @Slf4j
 class PrometheusMetricsRetriever implements MetricsRetriever {
 
   private static final String METRICS_ENDPOINT_PATH = "/metrics";
   private static final int DEFAULT_EXPORTER_PORT = 11001;
 
-  private final WebClient webClient;
-
   @Override
   public Flux<RawMetric> retrieve(KafkaCluster c, Node node) {
     log.debug("Retrieving metrics from prometheus exporter: {}:{}", node.host(), c.getMetricsConfig().getPort());
-    return retrieve(node.host(), c.getMetricsConfig());
+
+    MetricsConfig metricsConfig = c.getMetricsConfig();
+    var webClient = new WebClientConfigurator()
+        .configureBufferSize(DataSize.ofMegabytes(20))
+        .configureBasicAuth(metricsConfig.getUsername(), metricsConfig.getPassword())
+        .configureSsl(
+            c.getOriginalProperties().getSsl(),
+            new ClustersProperties.KeystoreConfig(
+                metricsConfig.getKeystoreLocation(),
+                metricsConfig.getKeystorePassword()))
+        .build();
+
+    return retrieve(webClient, node.host(), c.getMetricsConfig());
   }
 
   @VisibleForTesting
-  Flux<RawMetric> retrieve(String host, MetricsConfig metricsConfig) {
+  Flux<RawMetric> retrieve(WebClient webClient, String host, MetricsConfig metricsConfig) {
     int port = Optional.ofNullable(metricsConfig.getPort()).orElse(DEFAULT_EXPORTER_PORT);
-
+    boolean sslEnabled = metricsConfig.isSsl() || metricsConfig.getKeystoreLocation() != null;
     var request = webClient.get()
         .uri(UriComponentsBuilder.newInstance()
-            .scheme(metricsConfig.isSsl() ? "https" : "http")
+            .scheme(sslEnabled ? "https" : "http")
             .host(host)
             .port(port)
             .path(METRICS_ENDPOINT_PATH).build().toUri());
 
-    if (metricsConfig.getUsername() != null && metricsConfig.getPassword() != null) {
-      request.headers(
-          httpHeaders -> httpHeaders.setBasicAuth(metricsConfig.getUsername(), metricsConfig.getPassword()));
-    }
-
     WebClient.ResponseSpec responseSpec = request.retrieve();
-
     return responseSpec.bodyToMono(String.class)
         .doOnError(e -> log.error("Error while getting metrics from {}", host, e))
         .onErrorResume(th -> Mono.empty())
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index 32cde63adbd..ee17d211117 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -1,5 +1,7 @@
 package com.provectus.kafka.ui.service.rbac;
 
+import static com.provectus.kafka.ui.model.rbac.Resource.APPLICATIONCONFIG;
+
 import com.provectus.kafka.ui.config.auth.AuthenticatedUser;
 import com.provectus.kafka.ui.config.auth.RbacUser;
 import com.provectus.kafka.ui.config.auth.RoleBasedAccessControlProperties;
@@ -55,7 +57,7 @@ public class AccessControlService {
 
   @PostConstruct
   public void init() {
-    if (properties.getRoles().isEmpty()) {
+    if (CollectionUtils.isEmpty(properties.getRoles())) {
       log.trace("No roles provided, disabling RBAC");
       return;
     }
@@ -88,7 +90,8 @@ public Mono<Void> validateAccess(AccessContext context) {
     return getUser()
         .doOnNext(user -> {
           boolean accessGranted =
-              isClusterAccessible(context, user)
+              isApplicationConfigAccessible(context, user)
+                  && isClusterAccessible(context, user)
                   && isClusterConfigAccessible(context, user)
                   && isTopicAccessible(context, user)
                   && isConsumerGroupAccessible(context, user)
@@ -112,6 +115,20 @@ public Mono<AuthenticatedUser> getUser() {
         .map(user -> new AuthenticatedUser(user.name(), user.groups()));
   }
 
+  public boolean isApplicationConfigAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+    if (CollectionUtils.isEmpty(context.getApplicationConfigActions())) {
+      return true;
+    }
+    Set<String> requiredActions = context.getApplicationConfigActions()
+        .stream()
+        .map(a -> a.toString().toUpperCase())
+        .collect(Collectors.toSet());
+    return isAccessible(APPLICATIONCONFIG, null, user, context, requiredActions);
+  }
+
   private boolean isClusterAccessible(AccessContext context, AuthenticatedUser user) {
     if (!rbacEnabled) {
       return true;
@@ -348,12 +365,12 @@ public List<Role> getRoles() {
     return Collections.unmodifiableList(properties.getRoles());
   }
 
-  private boolean isAccessible(Resource resource, String resourceValue,
+  private boolean isAccessible(Resource resource, @Nullable String resourceValue,
                                AuthenticatedUser user, AccessContext context, Set<String> requiredActions) {
     Set<String> grantedActions = properties.getRoles()
         .stream()
         .filter(filterRole(user))
-        .filter(filterCluster(context.getCluster()))
+        .filter(filterCluster(resource, context.getCluster()))
         .flatMap(grantedRole -> grantedRole.getPermissions().stream())
         .filter(filterResource(resource))
         .filter(filterResourceValue(resourceValue))
@@ -374,21 +391,28 @@ private Predicate<Role> filterCluster(String cluster) {
         .anyMatch(cluster::equalsIgnoreCase);
   }
 
+  private Predicate<Role> filterCluster(Resource resource, String cluster) {
+    if (resource == APPLICATIONCONFIG) {
+      return role -> true;
+    }
+    return filterCluster(cluster);
+  }
+
   private Predicate<Permission> filterResource(Resource resource) {
     return grantedPermission -> resource == grantedPermission.getResource();
   }
 
-  private Predicate<Permission> filterResourceValue(String resourceValue) {
+  private Predicate<Permission> filterResourceValue(@Nullable String resourceValue) {
 
     if (resourceValue == null) {
       return grantedPermission -> true;
     }
     return grantedPermission -> {
-      Pattern value = grantedPermission.getValue();
-      if (value == null) {
+      Pattern valuePattern = grantedPermission.getCompiledValuePattern();
+      if (valuePattern == null) {
         return true;
       }
-      return value.matcher(resourceValue).matches();
+      return valuePattern.matcher(resourceValue).matches();
     };
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationRestarter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationRestarter.java
new file mode 100644
index 00000000000..42c8136f929
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationRestarter.java
@@ -0,0 +1,46 @@
+package com.provectus.kafka.ui.util;
+
+import com.provectus.kafka.ui.KafkaUiApplication;
+import java.io.Closeable;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class ApplicationRestarter implements ApplicationListener<ApplicationStartedEvent> {
+
+  private String[] applicationArgs;
+  private ApplicationContext applicationContext;
+
+  @Override
+  public void onApplicationEvent(ApplicationStartedEvent event) {
+    this.applicationArgs = event.getArgs();
+    this.applicationContext = event.getApplicationContext();
+  }
+
+  public void requestRestart() {
+    log.info("Restarting application");
+    Thread thread = new Thread(() -> {
+      closeApplicationContext(applicationContext);
+      KafkaUiApplication.startApplication(applicationArgs);
+    });
+    thread.setName("restartedMain-" + System.currentTimeMillis());
+    thread.setDaemon(false);
+    thread.start();
+  }
+
+  private void closeApplicationContext(ApplicationContext context) {
+    while (context instanceof Closeable) {
+      try {
+        ((Closeable) context).close();
+      } catch (Exception e) {
+        log.warn("Error stopping application before restart", e);
+        throw new RuntimeException(e);
+      }
+      context = context.getParent();
+    }
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
new file mode 100644
index 00000000000..2e1b32d3f1b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
@@ -0,0 +1,228 @@
+package com.provectus.kafka.ui.util;
+
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.config.auth.OAuthProperties;
+import com.provectus.kafka.ui.config.auth.RoleBasedAccessControlProperties;
+import com.provectus.kafka.ui.exception.FileUploadException;
+import com.provectus.kafka.ui.exception.ValidationException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.time.Instant;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import lombok.Builder;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.boot.env.YamlPropertySourceLoader;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.CompositePropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.http.codec.multipart.FilePart;
+import org.springframework.stereotype.Component;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.introspector.BeanAccess;
+import org.yaml.snakeyaml.introspector.Property;
+import org.yaml.snakeyaml.introspector.PropertyUtils;
+import org.yaml.snakeyaml.nodes.NodeTuple;
+import org.yaml.snakeyaml.nodes.Tag;
+import org.yaml.snakeyaml.representer.Representer;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class DynamicConfigOperations {
+
+  static final String DYNAMIC_CONFIG_ENABLED_ENV_PROPERTY = "dynamic.config.enabled";
+  static final String DYNAMIC_CONFIG_PATH_ENV_PROPERTY = "dynamic.config.path";
+  static final String DYNAMIC_CONFIG_PATH_ENV_PROPERTY_DEFAULT = "/etc/kafkaui/dynamic_config.yaml";
+
+  static final String CONFIG_RELATED_UPLOADS_DIR_PROPERTY = "config.related.uploads.dir";
+  static final String CONFIG_RELATED_UPLOADS_DIR_DEFAULT = "/etc/kafkaui/uploads";
+
+  public static ApplicationContextInitializer<ConfigurableApplicationContext> dynamicConfigPropertiesInitializer() {
+    return appCtx ->
+        new DynamicConfigOperations(appCtx)
+            .loadDynamicPropertySource()
+            .ifPresent(source -> appCtx.getEnvironment().getPropertySources().addFirst(source));
+  }
+
+  private final ConfigurableApplicationContext ctx;
+
+  public boolean dynamicConfigEnabled() {
+    return "true".equalsIgnoreCase(ctx.getEnvironment().getProperty(DYNAMIC_CONFIG_ENABLED_ENV_PROPERTY));
+  }
+
+  private Path dynamicConfigFilePath() {
+    return Paths.get(
+        Optional.ofNullable(ctx.getEnvironment().getProperty(DYNAMIC_CONFIG_PATH_ENV_PROPERTY))
+            .orElse(DYNAMIC_CONFIG_PATH_ENV_PROPERTY_DEFAULT)
+    );
+  }
+
+  @SneakyThrows
+  public Optional<PropertySource<?>> loadDynamicPropertySource() {
+    if (dynamicConfigEnabled()) {
+      Path configPath = dynamicConfigFilePath();
+      if (!Files.exists(configPath) || !Files.isReadable(configPath)) {
+        log.warn("Dynamic config file {} doesnt exist or not readable", configPath);
+        return Optional.empty();
+      }
+      var propertySource = new CompositePropertySource("dynamicProperties");
+      new YamlPropertySourceLoader()
+          .load("dynamicProperties", new FileSystemResource(configPath))
+          .forEach(propertySource::addPropertySource);
+      log.info("Dynamic config loaded from {}", configPath);
+      return Optional.of(propertySource);
+    }
+    return Optional.empty();
+  }
+
+  public PropertiesStructure getCurrentProperties() {
+    return PropertiesStructure.builder()
+        .kafka(getNullableBean(ClustersProperties.class))
+        .rbac(getNullableBean(RoleBasedAccessControlProperties.class))
+        .auth(
+            PropertiesStructure.Auth.builder()
+                .type(ctx.getEnvironment().getProperty("auth.type"))
+                .oauth2(getNullableBean(OAuthProperties.class))
+                .build())
+        .build();
+  }
+
+  @Nullable
+  private <T> T getNullableBean(Class<T> clazz) {
+    try {
+      return ctx.getBean(clazz);
+    } catch (NoSuchBeanDefinitionException nsbde) {
+      return null;
+    }
+  }
+
+  public void persist(PropertiesStructure properties) {
+    if (!dynamicConfigEnabled()) {
+      throw new ValidationException(
+          "Dynamic config change is not allowed. "
+              + "Set dynamic.config.enabled property to 'true' to enabled it.");
+    }
+    properties.initAndValidate();
+
+    String yaml = serializeToYaml(properties);
+    writeYamlToFile(yaml, dynamicConfigFilePath());
+  }
+
+  public Mono<Path> uploadConfigRelatedFile(FilePart file) {
+    String targetDirStr = (String) ctx.getEnvironment().getSystemEnvironment()
+        .getOrDefault(CONFIG_RELATED_UPLOADS_DIR_PROPERTY, CONFIG_RELATED_UPLOADS_DIR_DEFAULT);
+
+    Path targetDir = Path.of(targetDirStr);
+    if (!Files.exists(targetDir)) {
+      try {
+        Files.createDirectories(targetDir);
+      } catch (IOException e) {
+        return Mono.error(
+            new FileUploadException("Error creating directory for uploads %s".formatted(targetDir), e));
+      }
+    }
+
+    Path targetFilePath = targetDir.resolve(file.filename() + "-" + Instant.now().getEpochSecond());
+    log.info("Uploading config-related file {}", targetFilePath);
+    if (Files.exists(targetFilePath)) {
+      log.info("File {} already exists, it will be overwritten", targetFilePath);
+    }
+
+    return file.transferTo(targetFilePath)
+        .thenReturn(targetFilePath)
+        .doOnError(th -> log.error("Error uploading file {}", targetFilePath, th))
+        .onErrorMap(th -> new FileUploadException(targetFilePath, th));
+  }
+
+  @SneakyThrows
+  private void writeYamlToFile(String yaml, Path path) {
+    if (Files.isDirectory(path)) {
+      throw new ValidationException("Dynamic file path is a directory, but should be a file path");
+    }
+    if (!Files.exists(path.getParent())) {
+      Files.createDirectories(path.getParent());
+    }
+    if (Files.exists(path) && !Files.isWritable(path)) {
+      throw new ValidationException("File already exists and is not writable");
+    }
+    try {
+      Files.writeString(
+          path,
+          yaml,
+          StandardOpenOption.CREATE,
+          StandardOpenOption.WRITE,
+          StandardOpenOption.TRUNCATE_EXISTING // to override existing file
+      );
+    } catch (IOException e) {
+      throw new ValidationException("Error writing to " + path, e);
+    }
+  }
+
+  private String serializeToYaml(PropertiesStructure props) {
+    //representer, that skips fields with null values
+    Representer representer = new Representer(new DumperOptions()) {
+      @Override
+      protected NodeTuple representJavaBeanProperty(Object javaBean,
+                                                    Property property,
+                                                    Object propertyValue,
+                                                    Tag customTag) {
+        if (propertyValue == null) {
+          return null; // if value of property is null, ignore it.
+        } else {
+          return super.representJavaBeanProperty(javaBean, property, propertyValue, customTag);
+        }
+      }
+    };
+    var propertyUtils = new PropertyUtils();
+    propertyUtils.setBeanAccess(BeanAccess.FIELD);
+    representer.setPropertyUtils(propertyUtils);
+    representer.addClassTag(PropertiesStructure.class, Tag.MAP); //to avoid adding class tag
+    representer.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); //use indent instead of {}
+    return new Yaml(representer).dump(props);
+  }
+
+  ///---------------------------------------------------------------------
+
+  @Data
+  @Builder
+  // field name should be in sync with @ConfigurationProperties annotation
+  public static class PropertiesStructure {
+
+    private ClustersProperties kafka;
+    private RoleBasedAccessControlProperties rbac;
+    private Auth auth;
+
+    @Data
+    @Builder
+    public static class Auth {
+      String type;
+      OAuthProperties oauth2;
+    }
+
+    public void initAndValidate() {
+      Optional.ofNullable(kafka)
+          .ifPresent(ClustersProperties::validateAndSetDefaults);
+
+      Optional.ofNullable(rbac)
+          .ifPresent(RoleBasedAccessControlProperties::init);
+
+      Optional.ofNullable(auth)
+          .flatMap(a -> Optional.ofNullable(a.oauth2))
+          .ifPresent(OAuthProperties::validate);
+    }
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxPoolFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxPoolFactory.java
deleted file mode 100644
index 49e73a58f28..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/JmxPoolFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import com.provectus.kafka.ui.model.JmxConnectionInfo;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import javax.rmi.ssl.SslRMIClientSocketFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.pool2.BaseKeyedPooledObjectFactory;
-import org.apache.commons.pool2.PooledObject;
-import org.apache.commons.pool2.impl.DefaultPooledObject;
-
-@Slf4j
-public class JmxPoolFactory extends BaseKeyedPooledObjectFactory<JmxConnectionInfo, JMXConnector> {
-
-  @Override
-  public JMXConnector create(JmxConnectionInfo info) throws Exception {
-    Map<String, Object> env = new HashMap<>();
-    if (StringUtils.isNotEmpty(info.getUsername()) && StringUtils.isNotEmpty(info.getPassword())) {
-      env.put("jmx.remote.credentials", new String[] {info.getUsername(), info.getPassword()});
-    }
-
-    if (info.isSsl()) {
-      env.put("com.sun.jndi.rmi.factory.socket", new SslRMIClientSocketFactory());
-    }
-
-    return JMXConnectorFactory.connect(new JMXServiceURL(info.getUrl()), env);
-  }
-
-  @Override
-  public PooledObject<JMXConnector> wrap(JMXConnector jmxConnector) {
-    return new DefaultPooledObject<>(jmxConnector);
-  }
-
-  @Override
-  public void destroyObject(JmxConnectionInfo key, PooledObject<JMXConnector> p) {
-    try {
-      p.getObject().close();
-    } catch (IOException e) {
-      log.error("Cannot close connection with {}", key);
-    }
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java
new file mode 100644
index 00000000000..7f5b8c45f2a
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java
@@ -0,0 +1,147 @@
+package com.provectus.kafka.ui.util;
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
+import com.provectus.kafka.ui.model.ApplicationPropertyValidationDTO;
+import com.provectus.kafka.ui.service.ReactiveAdminClient;
+import com.provectus.kafka.ui.service.ksql.KsqlApiClient;
+import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
+import java.io.FileInputStream;
+import java.security.KeyStore;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.AdminClientConfig;
+import org.springframework.util.ResourceUtils;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
+
+@Slf4j
+@UtilityClass
+public class KafkaServicesValidation {
+
+  private Mono<ApplicationPropertyValidationDTO> valid() {
+    return Mono.just(new ApplicationPropertyValidationDTO().error(false));
+  }
+
+  private Mono<ApplicationPropertyValidationDTO> invalid(String errorMsg) {
+    return Mono.just(new ApplicationPropertyValidationDTO().error(true).errorMessage(errorMsg));
+  }
+
+  private Mono<ApplicationPropertyValidationDTO> invalid(Throwable th) {
+    return Mono.just(new ApplicationPropertyValidationDTO().error(true).errorMessage(th.getMessage()));
+  }
+
+  /**
+   * Returns error msg, if any.
+   */
+  public Optional<String> validateTruststore(ClustersProperties.TruststoreConfig truststoreConfig) {
+    if (truststoreConfig.getTruststoreLocation() != null && truststoreConfig.getTruststorePassword() != null) {
+      try {
+        KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        trustStore.load(
+            new FileInputStream((ResourceUtils.getFile(truststoreConfig.getTruststoreLocation()))),
+            truststoreConfig.getTruststorePassword().toCharArray()
+        );
+        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+            TrustManagerFactory.getDefaultAlgorithm()
+        );
+        trustManagerFactory.init(trustStore);
+      } catch (Exception e) {
+        return Optional.of(e.getMessage());
+      }
+    }
+    return Optional.empty();
+  }
+
+  public Mono<ApplicationPropertyValidationDTO> validateClusterConnection(String bootstrapServers,
+                                                                          Properties clusterProps,
+                                                                          @Nullable
+                                                                          ClustersProperties.TruststoreConfig ssl) {
+    Properties properties = new Properties();
+    SslPropertiesUtil.addKafkaSslProperties(ssl, properties);
+    properties.putAll(clusterProps);
+    properties.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
+    // editing properties to make validation faster
+    properties.put(AdminClientConfig.RETRIES_CONFIG, 1);
+    properties.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, 5_000);
+    properties.put(AdminClientConfig.DEFAULT_API_TIMEOUT_MS_CONFIG, 5_000);
+    properties.put(AdminClientConfig.CLIENT_ID_CONFIG, "kui-admin-client-validation-" + System.currentTimeMillis());
+    AdminClient adminClient = null;
+    try {
+      adminClient = AdminClient.create(properties);
+    } catch (Exception e) {
+      log.error("Error creating admin client during validation", e);
+      return invalid("Error while creating AdminClient. See logs for details.");
+    }
+    return Mono.just(adminClient)
+        .then(ReactiveAdminClient.toMono(adminClient.listTopics().names()))
+        .then(valid())
+        .doOnTerminate(adminClient::close)
+        .onErrorResume(th -> {
+          log.error("Error connecting to cluster", th);
+          return KafkaServicesValidation.invalid("Error connecting to cluster. See logs for details.");
+        });
+  }
+
+  public Mono<ApplicationPropertyValidationDTO> validateSchemaRegistry(
+      Supplier<ReactiveFailover<KafkaSrClientApi>> clientSupplier) {
+    ReactiveFailover<KafkaSrClientApi> client;
+    try {
+      client = clientSupplier.get();
+    } catch (Exception e) {
+      log.error("Error creating Schema Registry client", e);
+      return invalid("Error creating Schema Registry client: " + e.getMessage());
+    }
+    return client
+        .mono(KafkaSrClientApi::getGlobalCompatibilityLevel)
+        .then(valid())
+        .onErrorResume(KafkaServicesValidation::invalid);
+  }
+
+  public Mono<ApplicationPropertyValidationDTO> validateConnect(
+      Supplier<ReactiveFailover<KafkaConnectClientApi>> clientSupplier) {
+    ReactiveFailover<KafkaConnectClientApi> client;
+    try {
+      client = clientSupplier.get();
+    } catch (Exception e) {
+      log.error("Error creating Connect client", e);
+      return invalid("Error creating Connect client: " + e.getMessage());
+    }
+    return client.flux(KafkaConnectClientApi::getConnectorPlugins)
+        .collectList()
+        .then(valid())
+        .onErrorResume(KafkaServicesValidation::invalid);
+  }
+
+  public Mono<ApplicationPropertyValidationDTO> validateKsql(Supplier<ReactiveFailover<KsqlApiClient>> clientSupplier) {
+    ReactiveFailover<KsqlApiClient> client;
+    try {
+      client = clientSupplier.get();
+    } catch (Exception e) {
+      log.error("Error creating Ksql client", e);
+      return invalid("Error creating Ksql client: " + e.getMessage());
+    }
+    return client.flux(c -> c.execute("SHOW VARIABLES;", Map.of()))
+        .collectList()
+        .flatMap(ksqlResults ->
+            Flux.fromIterable(ksqlResults)
+                .filter(KsqlApiClient.KsqlResponseTable::isError)
+                .flatMap(err -> invalid("Error response from ksql: " + err))
+                .next()
+                .switchIfEmpty(valid())
+        )
+        .onErrorResume(KafkaServicesValidation::invalid);
+  }
+
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java
similarity index 74%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java
index 7237f1b8862..48ff7ff1214 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/NumberUtil.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java
@@ -1,15 +1,13 @@
 package com.provectus.kafka.ui.util;
 
+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
+@UtilityClass
 @Slf4j
-public class NumberUtil {
+public class KafkaVersion {
 
-  private NumberUtil() {
-  }
-
-
-  public static float parserClusterVersion(String version) throws NumberFormatException {
+  public static float parse(String version) throws NumberFormatException {
     log.trace("Parsing cluster version [{}]", version);
     try {
       final String[] parts = version.split("\\.");
@@ -22,4 +20,4 @@ public static float parserClusterVersion(String version) throws NumberFormatExce
       throw e;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/MapUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/MapUtil.java
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java
index 213f0fdbd7f..bd2e97da97a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java
@@ -3,8 +3,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.RateLimiter;
 import com.provectus.kafka.ui.config.ClustersProperties;
-import com.provectus.kafka.ui.model.KafkaCluster;
-import java.util.Optional;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -14,8 +12,8 @@
 public class PollingThrottler {
 
   public static Supplier<PollingThrottler> throttlerSupplier(ClustersProperties.Cluster cluster) {
-    long rate = cluster.getPollingThrottleRate();
-    if (rate <= 0) {
+    Long rate = cluster.getPollingThrottleRate();
+    if (rate == null || rate <= 0) {
       return PollingThrottler::noop;
     }
     // RateLimiter instance should be shared across all created throttlers
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java
index 926298271dd..0293e4f9250 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ReactiveFailover.java
@@ -77,7 +77,8 @@ public <V> Mono<V> mono(Function<T, Mono<V>> f) {
 
   private <V> Mono<V> mono(Function<T, Mono<V>> f, List<PublisherHolder<T>> candidates) {
     var publisher = candidates.get(0);
-    return f.apply(publisher.get())
+    return publisher.get()
+        .flatMap(f)
         .onErrorResume(failoverExceptionsPredicate, th -> {
           publisher.markFailed();
           if (candidates.size() == 1) {
@@ -101,7 +102,8 @@ public <V> Flux<V> flux(Function<T, Flux<V>> f) {
 
   private <V> Flux<V> flux(Function<T, Flux<V>> f, List<PublisherHolder<T>> candidates) {
     var publisher = candidates.get(0);
-    return f.apply(publisher.get())
+    return publisher.get()
+        .flatMapMany(f)
         .onErrorResume(failoverExceptionsPredicate, th -> {
           publisher.markFailed();
           if (candidates.size() == 1) {
@@ -144,11 +146,15 @@ static class PublisherHolder<T> {
       this.retryGracePeriodMs = retryGracePeriodMs;
     }
 
-    synchronized T get() {
+    synchronized Mono<T> get() {
       if (publisherInstance == null) {
-        publisherInstance = supplier.get();
+        try {
+          publisherInstance = supplier.get();
+        } catch (Throwable th) {
+          return Mono.error(th);
+        }
       }
-      return publisherInstance;
+      return Mono.just(publisherInstance);
     }
 
     void markFailed() {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SslPropertiesUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SslPropertiesUtil.java
new file mode 100644
index 00000000000..ea120076373
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SslPropertiesUtil.java
@@ -0,0 +1,33 @@
+package com.provectus.kafka.ui.util;
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import java.io.FileInputStream;
+import java.security.KeyStore;
+import java.util.Properties;
+import javax.annotation.Nullable;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+import org.apache.kafka.common.config.SslConfigs;
+import org.springframework.http.client.reactive.ReactorClientHttpConnector;
+import org.springframework.util.ResourceUtils;
+import reactor.netty.http.client.HttpClient;
+
+@UtilityClass
+public class SslPropertiesUtil {
+
+  public void addKafkaSslProperties(@Nullable ClustersProperties.TruststoreConfig truststoreConfig,
+                                    Properties sink) {
+    if (truststoreConfig != null && truststoreConfig.getTruststoreLocation() != null) {
+      sink.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, truststoreConfig.getTruststoreLocation());
+      if (truststoreConfig.getTruststorePassword() != null) {
+        sink.put(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG, truststoreConfig.getTruststorePassword());
+      }
+    }
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
index f07529530d6..fe2240bd6aa 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
@@ -5,8 +5,11 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.exception.ValidationException;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.handler.ssl.JdkSslContext;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.SslProvider;
 import java.io.FileInputStream;
 import java.security.KeyStore;
 import java.util.function.Consumer;
@@ -40,48 +43,43 @@ private static ObjectMapper defaultOM() {
         .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
   }
 
-
-  public WebClientConfigurator configureSsl(@Nullable ClustersProperties.WebClientSsl ssl) {
-    if (ssl != null) {
-      return configureSsl(
-          ssl.getKeystoreLocation(),
-          ssl.getKeystorePassword(),
-          ssl.getTruststoreLocation(),
-          ssl.getTruststorePassword()
-      );
-    }
-    return this;
+  public WebClientConfigurator configureSsl(@Nullable ClustersProperties.TruststoreConfig truststoreConfig,
+                                            @Nullable ClustersProperties.KeystoreConfig keystoreConfig) {
+    return configureSsl(
+        keystoreConfig != null ? keystoreConfig.getKeystoreLocation() : null,
+        keystoreConfig != null ? keystoreConfig.getKeystorePassword() : null,
+        truststoreConfig != null ? truststoreConfig.getTruststoreLocation() : null,
+        truststoreConfig != null ? truststoreConfig.getTruststorePassword() : null
+    );
   }
 
   @SneakyThrows
-  public WebClientConfigurator configureSsl(
+  private WebClientConfigurator configureSsl(
       @Nullable String keystoreLocation,
       @Nullable String keystorePassword,
       @Nullable String truststoreLocation,
       @Nullable String truststorePassword) {
-    // If we want to customize our TLS configuration, we need at least a truststore
-    if (truststoreLocation == null || truststorePassword == null) {
+    if (truststoreLocation == null && keystoreLocation == null) {
       return this;
     }
 
     SslContextBuilder contextBuilder = SslContextBuilder.forClient();
-
-    // Prepare truststore
-    KeyStore trustStore = KeyStore.getInstance("JKS");
-    trustStore.load(
-        new FileInputStream((ResourceUtils.getFile(truststoreLocation))),
-        truststorePassword.toCharArray()
-    );
-
-    TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
-        TrustManagerFactory.getDefaultAlgorithm()
-    );
-    trustManagerFactory.init(trustStore);
-    contextBuilder.trustManager(trustManagerFactory);
+    if (truststoreLocation != null && truststorePassword != null) {
+      KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+      trustStore.load(
+          new FileInputStream((ResourceUtils.getFile(truststoreLocation))),
+          truststorePassword.toCharArray()
+      );
+      TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+          TrustManagerFactory.getDefaultAlgorithm()
+      );
+      trustManagerFactory.init(trustStore);
+      contextBuilder.trustManager(trustManagerFactory);
+    }
 
     // Prepare keystore only if we got a keystore
     if (keystoreLocation != null && keystorePassword != null) {
-      KeyStore keyStore = KeyStore.getInstance("JKS");
+      KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
       keyStore.load(
           new FileInputStream(ResourceUtils.getFile(keystoreLocation)),
           keystorePassword.toCharArray()
diff --git a/kafka-ui-api/src/main/resources/application-local.yml b/kafka-ui-api/src/main/resources/application-local.yml
index 5eaeee10b4f..5eb3772e2bb 100644
--- a/kafka-ui-api/src/main/resources/application-local.yml
+++ b/kafka-ui-api/src/main/resources/application-local.yml
@@ -1,3 +1,11 @@
+logging:
+  level:
+    root: INFO
+    com.provectus: DEBUG
+    #org.springframework.http.codec.json.Jackson2JsonEncoder: DEBUG
+    #org.springframework.http.codec.json.Jackson2JsonDecoder: DEBUG
+    reactor.netty.http.server.AccessLog: INFO
+
 kafka:
   clusters:
     - name: local
@@ -57,4 +65,4 @@ auth:
 roles.file: /tmp/roles.yml
 
 #server:
-#  port: 8080 #- Port in which kafka-ui will run.
\ No newline at end of file
+#  port: 8080 #- Port in which kafka-ui will run.
diff --git a/kafka-ui-api/src/main/resources/application.yml b/kafka-ui-api/src/main/resources/application.yml
index da070a19a8d..864289c2d9a 100644
--- a/kafka-ui-api/src/main/resources/application.yml
+++ b/kafka-ui-api/src/main/resources/application.yml
@@ -16,7 +16,5 @@ logging:
   level:
     root: INFO
     com.provectus: DEBUG
-    #org.springframework.http.codec.json.Jackson2JsonEncoder: DEBUG
-    #org.springframework.http.codec.json.Jackson2JsonDecoder: DEBUG
     reactor.netty.http.server.AccessLog: INFO
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/OffsetsResetServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/OffsetsResetServiceTest.java
index 966e0ec7636..fa73f0bff65 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/OffsetsResetServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/OffsetsResetServiceTest.java
@@ -37,24 +37,16 @@ public class OffsetsResetServiceTest extends AbstractIntegrationTest {
 
   private static final int PARTITIONS = 5;
 
-  private static final KafkaCluster CLUSTER =
-      KafkaCluster.builder()
-          .name(LOCAL)
-          .bootstrapServers(kafka.getBootstrapServers())
-          .properties(new Properties())
-          .build();
-
   private final String groupId = "OffsetsResetServiceTestGroup-" + UUID.randomUUID();
   private final String topic = "OffsetsResetServiceTestTopic-" + UUID.randomUUID();
 
+  private KafkaCluster cluster;
   private OffsetsResetService offsetsResetService;
 
   @BeforeEach
   void init() {
-    AdminClientServiceImpl adminClientService = new AdminClientServiceImpl();
-    adminClientService.setClientTimeout(5_000);
-    offsetsResetService = new OffsetsResetService(adminClientService);
-
+    cluster = applicationContext.getBean(ClustersStorage.class).getClusterByName(LOCAL).get();
+    offsetsResetService = new OffsetsResetService(applicationContext.getBean(AdminClientService.class));
     createTopic(new NewTopic(topic, PARTITIONS, (short) 1));
     createConsumerGroup();
   }
@@ -76,13 +68,13 @@ private void createConsumerGroup() {
   void failsIfGroupDoesNotExists() {
     List<Mono<?>> expectedNotFound = List.of(
         offsetsResetService
-            .resetToEarliest(CLUSTER, "non-existing-group", topic, null),
+            .resetToEarliest(cluster, "non-existing-group", topic, null),
         offsetsResetService
-            .resetToLatest(CLUSTER, "non-existing-group", topic, null),
+            .resetToLatest(cluster, "non-existing-group", topic, null),
         offsetsResetService
-            .resetToTimestamp(CLUSTER, "non-existing-group", topic, null, System.currentTimeMillis()),
+            .resetToTimestamp(cluster, "non-existing-group", topic, null, System.currentTimeMillis()),
         offsetsResetService
-            .resetToOffsets(CLUSTER, "non-existing-group", topic, Map.of())
+            .resetToOffsets(cluster, "non-existing-group", topic, Map.of())
     );
 
     for (Mono<?> mono : expectedNotFound) {
@@ -101,11 +93,11 @@ void failsIfGroupIsActive() {
       consumer.poll(Duration.ofMillis(100));
 
       List<Mono<?>> expectedValidationError = List.of(
-          offsetsResetService.resetToEarliest(CLUSTER, groupId, topic, null),
-          offsetsResetService.resetToLatest(CLUSTER, groupId, topic, null),
+          offsetsResetService.resetToEarliest(cluster, groupId, topic, null),
+          offsetsResetService.resetToLatest(cluster, groupId, topic, null),
           offsetsResetService
-              .resetToTimestamp(CLUSTER, groupId, topic, null, System.currentTimeMillis()),
-          offsetsResetService.resetToOffsets(CLUSTER, groupId, topic, Map.of())
+              .resetToTimestamp(cluster, groupId, topic, null, System.currentTimeMillis()),
+          offsetsResetService.resetToOffsets(cluster, groupId, topic, Map.of())
       );
 
       for (Mono<?> mono : expectedValidationError) {
@@ -121,7 +113,7 @@ void resetToOffsets() {
     sendMsgsToPartition(Map.of(0, 10, 1, 10, 2, 10));
 
     var expectedOffsets = Map.of(0, 5L, 1, 5L, 2, 5L);
-    offsetsResetService.resetToOffsets(CLUSTER, groupId, topic, expectedOffsets).block();
+    offsetsResetService.resetToOffsets(cluster, groupId, topic, expectedOffsets).block();
     assertOffsets(expectedOffsets);
   }
 
@@ -131,7 +123,7 @@ void resetToOffsetsCommitsEarliestOrLatestOffsetsIfOffsetsBoundsNotValid() {
 
     var offsetsWithInValidBounds = Map.of(0, -2L, 1, 5L, 2, 500L);
     var expectedOffsets = Map.of(0, 0L, 1, 5L, 2, 10L);
-    offsetsResetService.resetToOffsets(CLUSTER, groupId, topic, offsetsWithInValidBounds).block();
+    offsetsResetService.resetToOffsets(cluster, groupId, topic, offsetsWithInValidBounds).block();
     assertOffsets(expectedOffsets);
   }
 
@@ -140,11 +132,11 @@ void resetToEarliest() {
     sendMsgsToPartition(Map.of(0, 10, 1, 10, 2, 10));
 
     commit(Map.of(0, 5L, 1, 5L, 2, 5L));
-    offsetsResetService.resetToEarliest(CLUSTER, groupId, topic, List.of(0, 1)).block();
+    offsetsResetService.resetToEarliest(cluster, groupId, topic, List.of(0, 1)).block();
     assertOffsets(Map.of(0, 0L, 1, 0L, 2, 5L));
 
     commit(Map.of(0, 5L, 1, 5L, 2, 5L));
-    offsetsResetService.resetToEarliest(CLUSTER, groupId, topic, null).block();
+    offsetsResetService.resetToEarliest(cluster, groupId, topic, null).block();
     assertOffsets(Map.of(0, 0L, 1, 0L, 2, 0L, 3, 0L, 4, 0L));
   }
 
@@ -153,11 +145,11 @@ void resetToLatest() {
     sendMsgsToPartition(Map.of(0, 10, 1, 10, 2, 10, 3, 10, 4, 10));
 
     commit(Map.of(0, 5L, 1, 5L, 2, 5L));
-    offsetsResetService.resetToLatest(CLUSTER, groupId, topic, List.of(0, 1)).block();
+    offsetsResetService.resetToLatest(cluster, groupId, topic, List.of(0, 1)).block();
     assertOffsets(Map.of(0, 10L, 1, 10L, 2, 5L));
 
     commit(Map.of(0, 5L, 1, 5L, 2, 5L));
-    offsetsResetService.resetToLatest(CLUSTER, groupId, topic, null).block();
+    offsetsResetService.resetToLatest(cluster, groupId, topic, null).block();
     assertOffsets(Map.of(0, 10L, 1, 10L, 2, 10L, 3, 10L, 4, 10L));
   }
 
@@ -175,7 +167,7 @@ void resetToTimestamp() {
             new ProducerRecord<Bytes, Bytes>(topic, 2, 1200L, null, null)));
 
     offsetsResetService.resetToTimestamp(
-        CLUSTER, groupId, topic, List.of(0, 1, 2, 3), 1600L
+        cluster, groupId, topic, List.of(0, 1, 2, 3), 1600L
     ).block();
     assertOffsets(Map.of(0, 2L, 1, 1L, 2, 3L, 3, 0L));
   }
@@ -227,7 +219,7 @@ private void assertOffsets(Map<Integer, Long> expectedOffsets) {
   private Consumer<?, ?> groupConsumer() {
     Properties props = new Properties();
     props.put(ConsumerConfig.CLIENT_ID_CONFIG, "kafka-ui-" + UUID.randomUUID());
-    props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, CLUSTER.getBootstrapServers());
+    props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
     props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class);
     props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class);
     props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
index 069b173100e..cde000ac6ec 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
@@ -125,7 +125,7 @@ private void execCommandSync(KsqlApiClient client, String... ksqls) {
   }
 
   private KsqlApiClient ksqlClient() {
-    return new KsqlApiClient(KSQL_DB.url(), null, null, null);
+    return new KsqlApiClient(KSQL_DB.url(), null, null, null, null);
   }
 
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
index a4098b0275e..b4a48d38790 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
@@ -114,7 +114,7 @@ private static KafkaCluster cluster() {
   }
 
   private static KsqlApiClient ksqlClient() {
-    return new KsqlApiClient(KSQL_DB.url(), null, null, null);
+    return new KsqlApiClient(KSQL_DB.url(), null, null, null, null);
   }
 
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java
index f4e8cdfe757..9cc0494039d 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/metrics/PrometheusMetricsRetrieverTest.java
@@ -15,7 +15,7 @@
 
 class PrometheusMetricsRetrieverTest {
 
-  private final PrometheusMetricsRetriever retriever = new PrometheusMetricsRetriever(WebClient.create());
+  private final PrometheusMetricsRetriever retriever = new PrometheusMetricsRetriever();
 
   private final MockWebServer mockWebServer = new MockWebServer();
 
@@ -36,7 +36,7 @@ void callsMetricsEndpointAndConvertsResponceToRawMetric() {
 
     MetricsConfig metricsConfig = prepareMetricsConfig(url.port(), null, null);
 
-    StepVerifier.create(retriever.retrieve(url.host(), metricsConfig))
+    StepVerifier.create(retriever.retrieve(WebClient.create(), url.host(), metricsConfig))
         .expectNextSequence(expectedRawMetrics())
         // third metric should not be present, since it has "NaN" value
         .verifyComplete();
@@ -50,7 +50,7 @@ void callsSecureMetricsEndpointAndConvertsResponceToRawMetric() {
 
     MetricsConfig metricsConfig = prepareMetricsConfig(url.port(), "username", "password");
 
-    StepVerifier.create(retriever.retrieve(url.host(), metricsConfig))
+    StepVerifier.create(retriever.retrieve(WebClient.create(), url.host(), metricsConfig))
         .expectNextSequence(expectedRawMetrics())
         // third metric should not be present, since it has "NaN" value
         .verifyComplete();
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/DynamicConfigOperationsTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/DynamicConfigOperationsTest.java
new file mode 100644
index 00000000000..7355a9666fd
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/DynamicConfigOperationsTest.java
@@ -0,0 +1,128 @@
+package com.provectus.kafka.ui.util;
+
+import static com.provectus.kafka.ui.util.DynamicConfigOperations.DYNAMIC_CONFIG_ENABLED_ENV_PROPERTY;
+import static com.provectus.kafka.ui.util.DynamicConfigOperations.DYNAMIC_CONFIG_PATH_ENV_PROPERTY;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.PropertySource;
+
+class DynamicConfigOperationsTest {
+
+  private static final String SAMPLE_YAML_CONFIG = """
+       kafka:
+        clusters:
+          - name: test
+            bootstrapServers: localhost:9092
+      """;
+
+  private final ConfigurableApplicationContext ctxMock = mock(ConfigurableApplicationContext.class);
+  private final ConfigurableEnvironment envMock = mock(ConfigurableEnvironment.class);
+
+  private final DynamicConfigOperations ops = new DynamicConfigOperations(ctxMock);
+
+  @TempDir
+  private Path tmpDir;
+
+  @BeforeEach
+  void initMocks() {
+    when(ctxMock.getEnvironment()).thenReturn(envMock);
+  }
+
+  @Test
+  void initializerAddsDynamicPropertySourceIfAllEnvVarsAreSet() throws Exception {
+    Path propsFilePath = tmpDir.resolve("props.yaml");
+    Files.writeString(propsFilePath, SAMPLE_YAML_CONFIG, StandardOpenOption.CREATE);
+
+    MutablePropertySources propertySources = new MutablePropertySources();
+    propertySources.addFirst(new MapPropertySource("test", Map.of("testK", "testV")));
+
+    when(envMock.getPropertySources()).thenReturn(propertySources);
+    mockEnvWithVars(Map.of(
+        DYNAMIC_CONFIG_ENABLED_ENV_PROPERTY, "true",
+        DYNAMIC_CONFIG_PATH_ENV_PROPERTY, propsFilePath.toString()
+    ));
+
+    DynamicConfigOperations.dynamicConfigPropertiesInitializer().initialize(ctxMock);
+
+    assertThat(propertySources.size()).isEqualTo(2);
+    assertThat(propertySources.stream())
+        .element(0)
+        .extracting(PropertySource::getName)
+        .isEqualTo("dynamicProperties");
+  }
+
+  @ParameterizedTest
+  @CsvSource({
+      "false, /tmp/conf.yaml",
+      "true, ",
+      ", /tmp/conf.yaml",
+      ",",
+      "true, /tmp/conf.yaml", //vars set, but file doesn't exist
+  })
+  void initializerDoNothingIfAnyOfEnvVarsNotSet(@Nullable String enabledVar, @Nullable String pathVar) {
+    var vars = new HashMap<String, Object>(); // using HashMap to keep null values
+    vars.put(DYNAMIC_CONFIG_ENABLED_ENV_PROPERTY, enabledVar);
+    vars.put(DYNAMIC_CONFIG_PATH_ENV_PROPERTY, pathVar);
+    mockEnvWithVars(vars);
+
+    DynamicConfigOperations.dynamicConfigPropertiesInitializer().initialize(ctxMock);
+    verify(envMock, times(0)).getPropertySources();
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  void persistRewritesOrCreateConfigFile(boolean exists) throws Exception {
+    Path propsFilePath = tmpDir.resolve("props.yaml");
+    if (exists) {
+      Files.writeString(propsFilePath, SAMPLE_YAML_CONFIG, StandardOpenOption.CREATE);
+    }
+
+    mockEnvWithVars(Map.of(
+        DYNAMIC_CONFIG_ENABLED_ENV_PROPERTY, "true",
+        DYNAMIC_CONFIG_PATH_ENV_PROPERTY, propsFilePath.toString()
+    ));
+
+    var overrideProps = new ClustersProperties();
+    var cluster = new ClustersProperties.Cluster();
+    cluster.setName("newName");
+    overrideProps.setClusters(List.of(cluster));
+
+    ops.persist(
+        DynamicConfigOperations.PropertiesStructure.builder()
+            .kafka(overrideProps)
+            .build()
+    );
+
+    assertThat(ops.loadDynamicPropertySource())
+        .get()
+        .extracting(ps -> ps.getProperty("kafka.clusters[0].name"))
+        .isEqualTo("newName");
+  }
+
+  private void mockEnvWithVars(Map<String, Object> envVars) {
+    envVars.forEach((k, v) -> when(envMock.getProperty(k)).thenReturn((String) v));
+  }
+
+}
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index 3e8437258b9..5f6cb58b7d7 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -99,6 +99,9 @@
 
                                         <dateLibrary>java8</dateLibrary>
                                     </configOptions>
+                                    <typeMappings>
+                                        <mapping>filepart=org.springframework.http.codec.multipart.FilePart</mapping>
+                                    </typeMappings>
                                 </configuration>
                             </execution>
                             <execution>
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index dc3cca80d8b..9773db26f10 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1744,6 +1744,90 @@ paths:
               schema:
                 $ref: '#/components/schemas/AuthenticationInfo'
 
+  /api/info:
+    get:
+      tags:
+        - ApplicationConfig
+      summary: Gets application info
+      operationId: getApplicationInfo
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApplicationInfo'
+
+  /api/config:
+    get:
+      tags:
+        - ApplicationConfig
+      summary: Gets current application configuration
+      operationId: getCurrentConfig
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApplicationConfig'
+    put:
+      tags:
+        - ApplicationConfig
+      summary: Restarts application with specified configuration
+      operationId: restartWithConfig
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RestartRequest'
+      responses:
+        200:
+          description: OK
+
+  /api/config/validated:
+    put:
+      tags:
+        - ApplicationConfig
+      summary: Restarts application with specified configuration
+      operationId: validateConfig
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ApplicationConfig'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ApplicationConfigValidation'
+
+
+  /api/config/relatedfiles:
+    post:
+      tags:
+        - ApplicationConfig
+      summary: Restarts application with specified configuration
+      operationId: uploadConfigRelatedFile
+      requestBody:
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              properties:
+                file:
+                  type: string
+                  format: filepart
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UploadedFileInfo'
+
 components:
   schemas:
     TopicSerdeSuggestion:
@@ -1824,6 +1908,16 @@ components:
         stackTrace:
           type: string
 
+    ApplicationInfo:
+      type: object
+      properties:
+        enabledFeatures:
+          type: array
+          items:
+            type: string
+            enum:
+              - DYNAMIC_CONFIG
+
     Cluster:
       type: object
       properties:
@@ -3205,9 +3299,290 @@ components:
     ResourceType:
       type: string
       enum:
+        - APPLICATIONCONFIG
         - CLUSTERCONFIG
         - TOPIC
         - CONSUMER
         - SCHEMA
         - CONNECT
         - KSQL
+
+    RestartRequest:
+      type: object
+      properties:
+        config:
+          $ref: '#/components/schemas/ApplicationConfig'
+
+    UploadedFileInfo:
+      type: object
+      required: [location]
+      properties:
+        location:
+          type: string
+
+    ApplicationConfigValidation:
+      type: object
+      properties:
+        clusters:
+          type: object
+          additionalProperties:
+            $ref: '#/components/schemas/ClusterConfigValidation'
+
+    ApplicationPropertyValidation:
+      type: object
+      required: [error]
+      properties:
+        error:
+          type: boolean
+        errorMessage:
+          type: string
+          description: Contains error message if error = true
+
+    ClusterConfigValidation:
+      type: object
+      required: [kafka]
+      properties:
+        kafka:
+          $ref: '#/components/schemas/ApplicationPropertyValidation'
+        schemaRegistry:
+          $ref: '#/components/schemas/ApplicationPropertyValidation'
+        kafkaConnects:
+          type: object
+          additionalProperties:
+            $ref: '#/components/schemas/ApplicationPropertyValidation'
+        ksqldb:
+          $ref: '#/components/schemas/ApplicationPropertyValidation'
+
+    ApplicationConfig:
+      type: object
+      properties:
+        properties:
+          type: object
+          properties:
+            auth:
+              type: object
+              properties:
+                type:
+                  type: string
+                oauth2:
+                  type: object
+                  properties:
+                    client:
+                      type: object
+                      additionalProperties:
+                        type: object
+                        properties:
+                          provider:
+                            type: string
+                          clientId:
+                            type: string
+                          clientSecret:
+                            type: string
+                          clientName:
+                            type: string
+                          redirectUri:
+                            type: string
+                          authorizationGrantType:
+                            type: string
+                          issuerUri:
+                            type: string
+                          authorizationUri:
+                            type: string
+                          tokenUri:
+                            type: string
+                          userInfoUri:
+                            type: string
+                          jwkSetUri:
+                            type: string
+                          userNameAttribute:
+                            type: string
+                          scope:
+                            type: array
+                            items:
+                              type: string
+                          customParams:
+                            type: object
+                            additionalProperties:
+                              type: string
+            rbac:
+              type: object
+              properties:
+                roles:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      name:
+                        type: string
+                      clusters:
+                        type: array
+                        items:
+                          type: string
+                      subjects:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            provider:
+                              type: string
+                            type:
+                              type: string
+                            value:
+                              type: string
+                      permissions:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            resource:
+                              $ref: '#/components/schemas/ResourceType'
+                            value:
+                              type: string
+                            actions:
+                              type: array
+                              items:
+                                $ref: '#/components/schemas/Action'
+            kafka:
+              type: object
+              properties:
+                clusters:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      name:
+                        type: string
+                      bootstrapServers:
+                        type: string
+                      ssl:
+                        type: object
+                        properties:
+                          truststoreLocation:
+                            type: string
+                          truststorePassword:
+                            type: string
+                      schemaRegistry:
+                        type: string
+                      schemaRegistryAuth:
+                        type: object
+                        properties:
+                          username:
+                            type: string
+                          password:
+                            type: string
+                      schemaRegistrySsl:
+                        type: object
+                        properties:
+                          keystoreLocation:
+                            type: string
+                          keystorePassword:
+                            type: string
+                      ksqldbServer:
+                        type: string
+                      ksqldbServerSsl:
+                        type: object
+                        properties:
+                          keystoreLocation:
+                            type: string
+                          keystorePassword:
+                              type: string
+                      ksqldbServerAuth:
+                        type: object
+                        properties:
+                          username:
+                            type: string
+                          password:
+                            type: string
+                      kafkaConnect:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            name:
+                              type: string
+                            address:
+                              type: string
+                            username:
+                              type: string
+                            password:
+                              type: string
+                            keystoreLocation:
+                              type: string
+                            keystorePassword:
+                              type: string
+
+                      metrics:
+                        type: object
+                        properties:
+                          type:
+                            type: string
+                          port:
+                            type: integer
+                            format: int32
+                          ssl:
+                            type: boolean
+                          username:
+                            type: string
+                          password:
+                            type: string
+                          keystoreLocation:
+                            type: string
+                          keystorePassword:
+                            type: string
+                      properties:
+                        type: object
+                        additionalProperties: true
+                      readOnly:
+                        type: boolean
+                      disableLogDirsCollection:
+                        type: boolean
+                      serde:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            name:
+                              type: string
+                            className:
+                              type: string
+                            filePath:
+                              type: string
+                            properties:
+                              type: object
+                              additionalProperties: true
+                            topicKeysPattern:
+                              type: string
+                            topicValuesPattern:
+                              type: string
+                      defaultKeySerde:
+                        type: string
+                      defaultValueSerde:
+                        type: string
+                      masking:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            type:
+                              type: string
+                              enum:
+                                - REMOVE
+                                - MASK
+                                - REPLACE
+                            fields:
+                              type: array
+                              items:
+                                type: string
+                            pattern:
+                              type: array
+                              items:
+                                type: string
+                            replacement:
+                              type: string
+                            topicKeysPattern:
+                              type: string
+                            topicValuesPattern:
+                              type: string
+                      pollingThrottleRate:
+                        type: integer
+                        format: int64
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/BrokersTest.java
new file mode 100644
index 00000000000..eb31d0c2b1b
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/BrokersTest.java
@@ -0,0 +1,17 @@
+package com.provectus.kafka.ui.manualSuite.suite;
+
+import com.provectus.kafka.ui.manualSuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.TO_BE_AUTOMATED;
+
+public class BrokersTest extends BaseManualTest {
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @QaseId(330)
+    @Test
+    public void testCaseA() {
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/KsqlDbTest.java
new file mode 100644
index 00000000000..443fc85ef27
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/KsqlDbTest.java
@@ -0,0 +1,35 @@
+package com.provectus.kafka.ui.manualSuite.suite;
+
+import com.provectus.kafka.ui.manualSuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.TO_BE_AUTOMATED;
+
+public class KsqlDbTest extends BaseManualTest {
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @QaseId(276)
+    @Test
+    public void testCaseA() {
+    }
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @QaseId(277)
+    @Test
+    public void testCaseB() {
+    }
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @QaseId(278)
+    @Test
+    public void testCaseC() {
+    }
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @QaseId(284)
+    @Test
+    public void testCaseD() {
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
index bc9519ee500..a253bc4b676 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
@@ -77,7 +77,7 @@ public void updateSchemaAvro() {
         Assert.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), schemaDetails.getCompatibility(), "getCompatibility()");
     }
 
-    @QaseId(186)
+    @QaseId(44)
     @Test(priority = 3)
     public void compareVersionsOperation() {
         navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
diff --git a/kafka-ui-react-app/.babelrc b/kafka-ui-react-app/.babelrc
deleted file mode 100644
index 202d425a099..00000000000
--- a/kafka-ui-react-app/.babelrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-react",
-    "@babel/preset-typescript"
-  ]
-}
diff --git a/kafka-ui-react-app/.eslintrc.json b/kafka-ui-react-app/.eslintrc.json
index 5116aad770f..4d524ef20a8 100644
--- a/kafka-ui-react-app/.eslintrc.json
+++ b/kafka-ui-react-app/.eslintrc.json
@@ -21,6 +21,7 @@
     ]
   },
   "plugins": [
+    "react",
     "@typescript-eslint",
     "prettier",
     "react-hooks"
@@ -31,6 +32,8 @@
     "plugin:@typescript-eslint/recommended",
     "plugin:jest-dom/recommended",
     "plugin:prettier/recommended",
+    "eslint:recommended",
+    "plugin:react/recommended",
     "prettier"
   ],
   "rules": {
@@ -83,7 +86,8 @@
         "unnamedComponents": "arrow-function"
       }
     ],
-    "react/jsx-no-constructed-context-values": "off"
+    "react/jsx-no-constructed-context-values": "off",
+    "react/display-name": "off"
   },
   "overrides": [
     {
diff --git a/kafka-ui-react-app/README.md b/kafka-ui-react-app/README.md
index 8ab814cd1d5..a66c4d9459d 100644
--- a/kafka-ui-react-app/README.md
+++ b/kafka-ui-react-app/README.md
@@ -46,7 +46,7 @@ VITE_DEV_PROXY= https://api.server # your API server
 
 Run the application
 ```sh
-pnpm start
+pnpm dev
 ```
 
 ### Docker way
@@ -62,7 +62,7 @@ Make sure that none of the `.env*` files contain `DEV_PROXY` variable
 
 Run the application
 ```sh
-pnpm start
+pnpm dev
 ```
 ## Links
 
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index f4f5bf855f1..d6473bb9085 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -4,9 +4,6 @@
   "homepage": "./",
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/plugin-syntax-flow": "^7.18.6",
-    "@babel/plugin-transform-react-jsx": "^7.18.6",
     "@floating-ui/react": "^0.19.2",
     "@hookform/error-message": "^2.0.0",
     "@hookform/resolvers": "^2.7.1",
@@ -15,27 +12,26 @@
     "@szhsin/react-menu": "^3.1.1",
     "@tanstack/react-query": "^4.0.5",
     "@tanstack/react-table": "^8.5.10",
-    "@testing-library/react": "^13.2.0",
+    "@testing-library/react": "^14.0.0",
     "@types/testing-library__jest-dom": "^5.14.5",
     "ace-builds": "^1.7.1",
     "ajv": "^8.6.3",
     "ajv-formats": "^2.1.1",
-    "babel-jest": "^29.0.3",
     "classnames": "^2.2.6",
     "fetch-mock": "^9.11.0",
-    "jest": "^29.0.3",
-    "jest-watch-typeahead": "^2.0.0",
+    "jest": "^29.4.3",
+    "jest-watch-typeahead": "^2.2.2",
     "json-schema-faker": "^0.5.0-rcv.44",
     "jsonpath-plus": "^7.2.0",
     "lodash": "^4.17.21",
     "pretty-ms": "7.0.1",
     "react": "^18.1.0",
     "react-ace": "^10.1.0",
-    "react-datepicker": "^4.8.0",
+    "react-datepicker": "^4.10.0",
     "react-dom": "^18.1.0",
     "react-error-boundary": "^3.1.4",
-    "react-hook-form": "7.6.9",
-    "react-hot-toast": "^2.3.0",
+    "react-hook-form": "7.43.1",
+    "react-hot-toast": "^2.4.0",
     "react-is": "^18.2.0",
     "react-multi-select-component": "^4.3.3",
     "react-redux": "^8.0.2",
@@ -43,11 +39,11 @@
     "redux": "^4.2.0",
     "sass": "^1.52.3",
     "styled-components": "^5.3.1",
-    "use-debounce": "^8.0.1",
+    "use-debounce": "^9.0.3",
     "vite": "^4.0.0",
     "vite-tsconfig-paths": "^4.0.2",
     "whatwg-fetch": "^3.6.2",
-    "yup": "^0.32.11",
+    "yup": "^1.0.0",
     "zustand": "^4.1.1"
   },
   "lint-staged": {
@@ -58,6 +54,7 @@
   },
   "scripts": {
     "start": "vite",
+    "dev": "vite",
     "gen:sources": "rimraf src/generated-sources && openapi-generator-cli generate",
     "build": "vite build",
     "preview": "vite preview",
@@ -72,26 +69,19 @@
     "pre-commit": "pnpm tsc && lint-staged",
     "deadcode": "ts-prune -i src/generated-sources"
   },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
   "devDependencies": {
-    "@babel/preset-env": "^7.18.2",
-    "@babel/preset-react": "^7.17.12",
-    "@babel/preset-typescript": "^7.17.12",
-    "@jest/types": "^29.0.3",
-    "@openapitools/openapi-generator-cli": "^2.5.1",
-    "@swc/core": "^1.3.22",
+    "@jest/types": "^29.4.3",
+    "@openapitools/openapi-generator-cli": "^2.5.2",
+    "@swc/core": "^1.3.36",
     "@swc/jest": "^0.2.24",
-    "@testing-library/dom": "^8.11.1",
-    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/dom": "^9.0.0",
+    "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/user-event": "^14.4.3",
     "@types/eventsource": "^1.1.8",
-    "@types/jest": "^29.0.1",
     "@types/lodash": "^4.14.172",
     "@types/node": "^16.4.13",
     "@types/react": "^18.0.9",
-    "@types/react-datepicker": "^4.4.2",
+    "@types/react-datepicker": "^4.8.0",
     "@types/react-dom": "^18.0.3",
     "@types/react-router-dom": "^5.3.3",
     "@types/styled-components": "^5.1.13",
@@ -103,23 +93,22 @@
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-config-react-app": "^7.0.1",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-import-resolver-typescript": "^3.2.7",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest-dom": "^4.0.2",
+    "eslint-plugin-jest-dom": "^4.0.3",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.5.0",
     "husky": "^8.0.1",
-    "jest-environment-jsdom": "^29.0.3",
+    "jest-environment-jsdom": "^29.4.3",
     "jest-sonar-reporter": "^2.0.0",
-    "jest-styled-components": "^7.0.8",
+    "jest-styled-components": "^7.1.1",
     "lint-staged": "^13.0.2",
-    "prettier": "^2.3.1",
-    "rimraf": "^3.0.2",
-    "ts-node": "^10.8.1",
+    "prettier": "^2.8.4",
+    "rimraf": "^4.1.2",
+    "ts-node": "^10.9.1",
     "ts-prune": "^0.10.3",
     "typescript": "^4.7.4",
     "vite-plugin-ejs": "^1.6.4"
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 41d370327b2..16495614a05 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -1,34 +1,27 @@
 lockfileVersion: 5.4
 
 specifiers:
-  '@babel/core': ^7.16.0
-  '@babel/plugin-syntax-flow': ^7.18.6
-  '@babel/plugin-transform-react-jsx': ^7.18.6
-  '@babel/preset-env': ^7.18.2
-  '@babel/preset-react': ^7.17.12
-  '@babel/preset-typescript': ^7.17.12
   '@floating-ui/react': ^0.19.2
   '@hookform/error-message': ^2.0.0
   '@hookform/resolvers': ^2.7.1
-  '@jest/types': ^29.0.3
+  '@jest/types': ^29.4.3
   '@microsoft/fetch-event-source': ^2.0.1
-  '@openapitools/openapi-generator-cli': ^2.5.1
+  '@openapitools/openapi-generator-cli': ^2.5.2
   '@reduxjs/toolkit': ^1.8.3
-  '@swc/core': ^1.3.22
+  '@swc/core': ^1.3.36
   '@swc/jest': ^0.2.24
   '@szhsin/react-menu': ^3.1.1
   '@tanstack/react-query': ^4.0.5
   '@tanstack/react-table': ^8.5.10
-  '@testing-library/dom': ^8.11.1
-  '@testing-library/jest-dom': ^5.16.4
-  '@testing-library/react': ^13.2.0
+  '@testing-library/dom': ^9.0.0
+  '@testing-library/jest-dom': ^5.16.5
+  '@testing-library/react': ^14.0.0
   '@testing-library/user-event': ^14.4.3
   '@types/eventsource': ^1.1.8
-  '@types/jest': ^29.0.1
   '@types/lodash': ^4.14.172
   '@types/node': ^16.4.13
   '@types/react': ^18.0.9
-  '@types/react-datepicker': ^4.4.2
+  '@types/react-datepicker': ^4.8.0
   '@types/react-dom': ^18.0.3
   '@types/react-router-dom': ^5.3.3
   '@types/styled-components': ^5.1.13
@@ -39,94 +32,88 @@ specifiers:
   ace-builds: ^1.7.1
   ajv: ^8.6.3
   ajv-formats: ^2.1.1
-  babel-jest: ^29.0.3
   classnames: ^2.2.6
   dotenv: ^16.0.1
   eslint: ^8.3.0
   eslint-config-airbnb: ^19.0.4
   eslint-config-airbnb-typescript: ^17.0.0
   eslint-config-prettier: ^8.5.0
-  eslint-config-react-app: ^7.0.1
   eslint-import-resolver-node: ^0.3.6
   eslint-import-resolver-typescript: ^3.2.7
   eslint-plugin-import: ^2.26.0
-  eslint-plugin-jest-dom: ^4.0.2
+  eslint-plugin-jest-dom: ^4.0.3
   eslint-plugin-jsx-a11y: ^6.5.1
   eslint-plugin-prettier: ^4.0.0
   eslint-plugin-react: ^7.30.1
   eslint-plugin-react-hooks: ^4.5.0
   fetch-mock: ^9.11.0
   husky: ^8.0.1
-  jest: ^29.0.3
-  jest-environment-jsdom: ^29.0.3
+  jest: ^29.4.3
+  jest-environment-jsdom: ^29.4.3
   jest-sonar-reporter: ^2.0.0
-  jest-styled-components: ^7.0.8
-  jest-watch-typeahead: ^2.0.0
+  jest-styled-components: ^7.1.1
+  jest-watch-typeahead: ^2.2.2
   json-schema-faker: ^0.5.0-rcv.44
   jsonpath-plus: ^7.2.0
   lint-staged: ^13.0.2
   lodash: ^4.17.21
-  prettier: ^2.3.1
+  prettier: ^2.8.4
   pretty-ms: 7.0.1
   react: ^18.1.0
   react-ace: ^10.1.0
-  react-datepicker: ^4.8.0
+  react-datepicker: ^4.10.0
   react-dom: ^18.1.0
   react-error-boundary: ^3.1.4
-  react-hook-form: 7.6.9
-  react-hot-toast: ^2.3.0
+  react-hook-form: 7.43.1
+  react-hot-toast: ^2.4.0
   react-is: ^18.2.0
   react-multi-select-component: ^4.3.3
   react-redux: ^8.0.2
   react-router-dom: ^6.3.0
   redux: ^4.2.0
-  rimraf: ^3.0.2
+  rimraf: ^4.1.2
   sass: ^1.52.3
   styled-components: ^5.3.1
-  ts-node: ^10.8.1
+  ts-node: ^10.9.1
   ts-prune: ^0.10.3
   typescript: ^4.7.4
-  use-debounce: ^8.0.1
+  use-debounce: ^9.0.3
   vite: ^4.0.0
   vite-plugin-ejs: ^1.6.4
   vite-tsconfig-paths: ^4.0.2
   whatwg-fetch: ^3.6.2
-  yup: ^0.32.11
+  yup: ^1.0.0
   zustand: ^4.1.1
 
 dependencies:
-  '@babel/core': 7.18.2
-  '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.2
-  '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
   '@floating-ui/react': 0.19.2_ohobp6rpsmerwlq5ipwfh5yigy
-  '@hookform/error-message': 2.0.0_l2dcsysovzdujulgxvsen7vbsm
-  '@hookform/resolvers': 2.8.9_react-hook-form@7.6.9
+  '@hookform/error-message': 2.0.0_ie7afrsxjmqsdnv6azc5osehhy
+  '@hookform/resolvers': 2.8.9_react-hook-form@7.43.1
   '@microsoft/fetch-event-source': 2.0.1
   '@reduxjs/toolkit': 1.8.3_ctm756ikdwcjcvyfxxwskzbr6q
   '@szhsin/react-menu': 3.1.1_ef5jwxihqo6n7gxfmzogljlgcm
   '@tanstack/react-query': 4.0.5_ef5jwxihqo6n7gxfmzogljlgcm
   '@tanstack/react-table': 8.5.10_ef5jwxihqo6n7gxfmzogljlgcm
-  '@testing-library/react': 13.2.0_ef5jwxihqo6n7gxfmzogljlgcm
+  '@testing-library/react': 14.0.0_ef5jwxihqo6n7gxfmzogljlgcm
   '@types/testing-library__jest-dom': 5.14.5
   ace-builds: 1.7.1
   ajv: 8.8.2
-  ajv-formats: 2.1.1_ajv@8.8.2
-  babel-jest: 29.0.3_@babel+core@7.18.2
+  ajv-formats: 2.1.1
   classnames: 2.3.1
   fetch-mock: 9.11.0
-  jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
-  jest-watch-typeahead: 2.0.0_jest@29.0.3
+  jest: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
+  jest-watch-typeahead: 2.2.2_jest@29.5.0
   json-schema-faker: 0.5.0-rcv.44
   jsonpath-plus: 7.2.0
   lodash: 4.17.21
   pretty-ms: 7.0.1
   react: 18.1.0
   react-ace: 10.1.0_ef5jwxihqo6n7gxfmzogljlgcm
-  react-datepicker: 4.8.0_ef5jwxihqo6n7gxfmzogljlgcm
+  react-datepicker: 4.10.0_ef5jwxihqo6n7gxfmzogljlgcm
   react-dom: 18.1.0_react@18.1.0
   react-error-boundary: 3.1.4_react@18.1.0
-  react-hook-form: 7.6.9_react@18.1.0
-  react-hot-toast: 2.3.0_ef5jwxihqo6n7gxfmzogljlgcm
+  react-hook-form: 7.43.1_react@18.1.0
+  react-hot-toast: 2.4.0_ef5jwxihqo6n7gxfmzogljlgcm
   react-is: 18.2.0
   react-multi-select-component: 4.3.3_ef5jwxihqo6n7gxfmzogljlgcm
   react-redux: 8.0.2_nfqigfgwurfoimtkde74cji6ga
@@ -134,30 +121,26 @@ dependencies:
   redux: 4.2.0
   sass: 1.52.3
   styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
-  use-debounce: 8.0.1_react@18.1.0
+  use-debounce: 9.0.3_react@18.1.0
   vite: 4.0.0_binvsr2w2vzqveeue6ibz2djda
   vite-tsconfig-paths: 4.0.2_eqmiqdrctagsk5ranq2vs4ssty
   whatwg-fetch: 3.6.2
-  yup: 0.32.11
+  yup: 1.0.2
   zustand: 4.1.1_react@18.1.0
 
 devDependencies:
-  '@babel/preset-env': 7.18.2_@babel+core@7.18.2
-  '@babel/preset-react': 7.17.12_@babel+core@7.18.2
-  '@babel/preset-typescript': 7.17.12_@babel+core@7.18.2
-  '@jest/types': 29.0.3
-  '@openapitools/openapi-generator-cli': 2.5.1
-  '@swc/core': 1.3.22
-  '@swc/jest': 0.2.24_@swc+core@1.3.22
-  '@testing-library/dom': 8.13.0
-  '@testing-library/jest-dom': 5.16.4
-  '@testing-library/user-event': 14.4.3_tlwynutqiyp5mns3woioasuxnq
+  '@jest/types': 29.5.0
+  '@openapitools/openapi-generator-cli': 2.5.2
+  '@swc/core': 1.3.38
+  '@swc/jest': 0.2.24_@swc+core@1.3.38
+  '@testing-library/dom': 9.0.0
+  '@testing-library/jest-dom': 5.16.5
+  '@testing-library/user-event': 14.4.3_@testing-library+dom@9.0.0
   '@types/eventsource': 1.1.8
-  '@types/jest': 29.0.1
   '@types/lodash': 4.14.177
   '@types/node': 16.11.7
   '@types/react': 18.0.9
-  '@types/react-datepicker': 4.4.2_react@18.1.0
+  '@types/react-datepicker': 4.10.0_react@18.1.0
   '@types/react-dom': 18.0.5
   '@types/react-router-dom': 5.3.3
   '@types/styled-components': 5.1.18
@@ -169,41 +152,46 @@ devDependencies:
   eslint-config-airbnb: 19.0.4_iayhaebzx3saen2ll7sn5gqmdq
   eslint-config-airbnb-typescript: 17.0.0_l6wia5brkiej5f4nhesunbzj5y
   eslint-config-prettier: 8.5.0_eslint@8.16.0
-  eslint-config-react-app: 7.0.1_qmzb7mn5nafzn657qxusdnr23a
   eslint-import-resolver-node: 0.3.6
   eslint-import-resolver-typescript: 3.2.7_btspkuwbqkl4adpiufzbathtpi
   eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
-  eslint-plugin-jest-dom: 4.0.2_eslint@8.16.0
+  eslint-plugin-jest-dom: 4.0.3_eslint@8.16.0
   eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
-  eslint-plugin-prettier: 4.0.0_q7a4ir2sdihdzpzdlnbgmzjlpq
+  eslint-plugin-prettier: 4.0.0_cu7djixscogveocpaizwew7lgy
   eslint-plugin-react: 7.30.1_eslint@8.16.0
   eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
   husky: 8.0.1
-  jest-environment-jsdom: 29.0.3
+  jest-environment-jsdom: 29.5.0
   jest-sonar-reporter: 2.0.0
-  jest-styled-components: 7.0.8_styled-components@5.3.1
+  jest-styled-components: 7.1.1_styled-components@5.3.1
   lint-staged: 13.0.2
-  prettier: 2.5.1
-  rimraf: 3.0.2
-  ts-node: 10.8.1_seagpw47opwyivxvtfydnuwcuy
+  prettier: 2.8.4
+  rimraf: 4.3.1
+  ts-node: 10.9.1_p45lmeymo45ge573kyxcus632u
   ts-prune: 0.10.3
   typescript: 4.7.4
   vite-plugin-ejs: 1.6.4
 
 packages:
 
+  /@adobe/css-tools/4.2.0:
+    resolution: {integrity: sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==}
+    dev: true
+
   /@ampproject/remapping/2.2.0:
     resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/gen-mapping': 0.1.1
       '@jridgewell/trace-mapping': 0.3.15
+    dev: false
 
   /@babel/code-frame/7.16.7:
     resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.18.6
+    dev: false
 
   /@babel/code-frame/7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
@@ -211,14 +199,10 @@ packages:
     dependencies:
       '@babel/highlight': 7.18.6
 
-  /@babel/compat-data/7.17.10:
-    resolution: {integrity: sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/compat-data/7.18.8:
     resolution: {integrity: sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==}
     engines: {node: '>=6.9.0'}
+    dev: false
 
   /@babel/core/7.18.2:
     resolution: {integrity: sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==}
@@ -241,6 +225,7 @@ packages:
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@babel/core/7.18.9:
     resolution: {integrity: sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==}
@@ -263,20 +248,7 @@ packages:
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
-
-  /@babel/eslint-parser/7.17.0_j4uj5cgi2mksbox6kqvi7jrs6u:
-    resolution: {integrity: sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==}
-    engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
-    peerDependencies:
-      '@babel/core': '>=7.11.0'
-      eslint: ^7.5.0 || ^8.0.0
-    dependencies:
-      '@babel/core': 7.18.2
-      eslint: 8.16.0
-      eslint-scope: 5.1.1
-      eslint-visitor-keys: 2.1.0
-      semver: 6.3.0
-    dev: true
+    dev: false
 
   /@babel/generator/7.18.2:
     resolution: {integrity: sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==}
@@ -285,6 +257,7 @@ packages:
       '@babel/types': 7.18.9
       '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
+    dev: false
 
   /@babel/generator/7.18.9:
     resolution: {integrity: sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==}
@@ -294,27 +267,12 @@ packages:
       '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
 
-  /@babel/helper-annotate-as-pure/7.16.7:
-    resolution: {integrity: sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.18.9
-    dev: true
-
   /@babel/helper-annotate-as-pure/7.18.6:
     resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-builder-binary-assignment-operator-visitor/7.16.7:
-    resolution: {integrity: sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-explode-assignable-expression': 7.16.7
-      '@babel/types': 7.18.9
-    dev: true
-
   /@babel/helper-compilation-targets/7.18.2_@babel+core@7.18.2:
     resolution: {integrity: sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==}
     engines: {node: '>=6.9.0'}
@@ -326,32 +284,7 @@ packages:
       '@babel/helper-validator-option': 7.18.6
       browserslist: 4.20.4
       semver: 6.3.0
-
-  /@babel/helper-compilation-targets/7.18.2_@babel+core@7.18.9:
-    resolution: {integrity: sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/compat-data': 7.18.8
-      '@babel/core': 7.18.9
-      '@babel/helper-validator-option': 7.18.6
-      browserslist: 4.20.4
-      semver: 6.3.0
-    dev: true
-
-  /@babel/helper-compilation-targets/7.18.9_@babel+core@7.18.2:
-    resolution: {integrity: sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/compat-data': 7.18.8
-      '@babel/core': 7.18.2
-      '@babel/helper-validator-option': 7.18.6
-      browserslist: 4.20.4
-      semver: 6.3.0
-    dev: true
+    dev: false
 
   /@babel/helper-compilation-targets/7.18.9_@babel+core@7.18.9:
     resolution: {integrity: sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==}
@@ -364,112 +297,12 @@ packages:
       '@babel/helper-validator-option': 7.18.6
       browserslist: 4.20.4
       semver: 6.3.0
-
-  /@babel/helper-create-class-features-plugin/7.18.0_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.18.9
-      '@babel/helper-member-expression-to-functions': 7.17.7
-      '@babel/helper-optimise-call-expression': 7.16.7
-      '@babel/helper-replace-supers': 7.18.2
-      '@babel/helper-split-export-declaration': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-create-class-features-plugin/7.18.0_@babel+core@7.18.9:
-    resolution: {integrity: sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.18.9
-      '@babel/helper-member-expression-to-functions': 7.17.7
-      '@babel/helper-optimise-call-expression': 7.16.7
-      '@babel/helper-replace-supers': 7.18.2
-      '@babel/helper-split-export-declaration': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-create-regexp-features-plugin/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-annotate-as-pure': 7.18.6
-      regexpu-core: 5.0.1
-    dev: true
-
-  /@babel/helper-create-regexp-features-plugin/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-annotate-as-pure': 7.18.6
-      regexpu-core: 5.0.1
-    dev: true
-
-  /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.18.2:
-    resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==}
-    peerDependencies:
-      '@babel/core': ^7.4.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.2
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/traverse': 7.18.9
-      debug: 4.3.4
-      lodash.debounce: 4.0.8
-      resolve: 1.22.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-define-polyfill-provider/0.3.1_@babel+core@7.18.9:
-    resolution: {integrity: sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==}
-    peerDependencies:
-      '@babel/core': ^7.4.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.9
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/traverse': 7.18.9
-      debug: 4.3.4
-      lodash.debounce: 4.0.8
-      resolve: 1.22.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
   /@babel/helper-environment-visitor/7.18.9:
     resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-explode-assignable-expression/7.16.7:
-    resolution: {integrity: sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.18.9
-    dev: true
-
   /@babel/helper-function-name/7.18.9:
     resolution: {integrity: sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==}
     engines: {node: '>=6.9.0'}
@@ -483,13 +316,6 @@ packages:
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-member-expression-to-functions/7.17.7:
-    resolution: {integrity: sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.18.9
-    dev: true
-
   /@babel/helper-module-imports/7.16.7:
     resolution: {integrity: sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==}
     engines: {node: '>=6.9.0'}
@@ -516,6 +342,7 @@ packages:
       '@babel/types': 7.18.9
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@babel/helper-module-transforms/7.18.9:
     resolution: {integrity: sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==}
@@ -531,59 +358,19 @@ packages:
       '@babel/types': 7.18.9
     transitivePeerDependencies:
       - supports-color
-
-  /@babel/helper-optimise-call-expression/7.16.7:
-    resolution: {integrity: sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.18.9
-    dev: true
-
-  /@babel/helper-plugin-utils/7.17.12:
-    resolution: {integrity: sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+    dev: false
 
   /@babel/helper-plugin-utils/7.18.6:
     resolution: {integrity: sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==}
     engines: {node: '>=6.9.0'}
-
-  /@babel/helper-remap-async-to-generator/7.16.8:
-    resolution: {integrity: sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-wrap-function': 7.16.8
-      '@babel/types': 7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/helper-replace-supers/7.18.2:
-    resolution: {integrity: sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-member-expression-to-functions': 7.17.7
-      '@babel/helper-optimise-call-expression': 7.16.7
-      '@babel/traverse': 7.18.9
-      '@babel/types': 7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
   /@babel/helper-simple-access/7.18.6:
     resolution: {integrity: sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.9
-
-  /@babel/helper-skip-transparent-expression-wrappers/7.16.0:
-    resolution: {integrity: sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.18.9
-    dev: true
+    dev: false
 
   /@babel/helper-split-export-declaration/7.18.6:
     resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
@@ -595,26 +382,10 @@ packages:
     resolution: {integrity: sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-option/7.16.7:
-    resolution: {integrity: sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/helper-validator-option/7.18.6:
     resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==}
     engines: {node: '>=6.9.0'}
-
-  /@babel/helper-wrap-function/7.16.8:
-    resolution: {integrity: sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-function-name': 7.18.9
-      '@babel/template': 7.18.6
-      '@babel/traverse': 7.18.9
-      '@babel/types': 7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
   /@babel/helpers/7.18.2:
     resolution: {integrity: sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==}
@@ -625,6 +396,7 @@ packages:
       '@babel/types': 7.18.9
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@babel/helpers/7.18.9:
     resolution: {integrity: sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==}
@@ -635,6 +407,7 @@ packages:
       '@babel/types': 7.18.9
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@babel/highlight/7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
@@ -650,6 +423,7 @@ packages:
     hasBin: true
     dependencies:
       '@babel/types': 7.18.9
+    dev: false
 
   /@babel/parser/7.18.9:
     resolution: {integrity: sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==}
@@ -658,1915 +432,134 @@ packages:
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.13.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
-      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.13.0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
-      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-async-generator-functions/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-remap-async-to-generator': 7.16.8
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-async-generator-functions/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-remap-async-to-generator': 7.16.8
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-class-properties/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-class-properties/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-class-static-block/7.18.0_@babel+core@7.18.2:
-    resolution: {integrity: sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-class-static-block/7.18.0_@babel+core@7.18.9:
-    resolution: {integrity: sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.12.0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-decorators/7.17.9_@babel+core@7.18.9:
-    resolution: {integrity: sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-replace-supers': 7.18.2
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/plugin-syntax-decorators': 7.17.0_@babel+core@7.18.9
-      charcodes: 0.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-proposal-dynamic-import/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-export-namespace-from/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-proposal-export-namespace-from/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-json-strings/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-proposal-json-strings/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-logical-assignment-operators/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-proposal-logical-assignment-operators/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-nullish-coalescing-operator/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-proposal-nullish-coalescing-operator/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-proposal-numeric-separator/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-object-rest-spread/7.18.0_@babel+core@7.18.2:
-    resolution: {integrity: sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.18.8
-      '@babel/core': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-transform-parameters': 7.17.12_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-proposal-object-rest-spread/7.18.0_@babel+core@7.18.9:
-    resolution: {integrity: sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.18.8
-      '@babel/core': 7.18.9
-      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-transform-parameters': 7.17.12_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-proposal-optional-catch-binding/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-optional-chaining/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-proposal-optional-chaining/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-proposal-private-methods/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-private-methods/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-private-property-in-object/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-annotate-as-pure': 7.16.7
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-private-property-in-object/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-annotate-as-pure': 7.16.7
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-proposal-unicode-property-regex/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-proposal-unicode-property-regex/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.2:
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.9:
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: false
-
-  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.9:
-    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.2:
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.9:
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.18.2:
-    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.18.9:
-    resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-decorators/7.17.0_@babel+core@7.18.9:
-    resolution: {integrity: sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.18.9:
-    resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.18.9:
-    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-flow/7.18.6_@babel+core@7.18.2:
-    resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-flow/7.18.6_@babel+core@7.18.9:
-    resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-import-assertions/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-import-assertions/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: false
-
-  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.9:
-    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.9:
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.18.2:
-    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.18.9:
-    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.2:
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.9:
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.9:
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.2:
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.9:
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.9:
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.9:
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.9:
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.18.2:
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.18.9:
-    resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.2:
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.9:
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-
-  /@babel/plugin-transform-arrow-functions/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-arrow-functions/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-async-to-generator/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-remap-async-to-generator': 7.16.8
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-async-to-generator/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-remap-async-to-generator': 7.16.8
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-block-scoped-functions/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-block-scoping/7.18.4_@babel+core@7.18.2:
-    resolution: {integrity: sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-block-scoping/7.18.4_@babel+core@7.18.9:
-    resolution: {integrity: sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-classes/7.18.4_@babel+core@7.18.2:
-    resolution: {integrity: sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-annotate-as-pure': 7.16.7
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.18.9
-      '@babel/helper-optimise-call-expression': 7.16.7
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-replace-supers': 7.18.2
-      '@babel/helper-split-export-declaration': 7.18.6
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-classes/7.18.4_@babel+core@7.18.9:
-    resolution: {integrity: sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-annotate-as-pure': 7.16.7
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.18.9
-      '@babel/helper-optimise-call-expression': 7.16.7
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-replace-supers': 7.18.2
-      '@babel/helper-split-export-declaration': 7.18.6
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-computed-properties/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-computed-properties/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-destructuring/7.18.0_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-destructuring/7.18.0_@babel+core@7.18.9:
-    resolution: {integrity: sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-dotall-regex/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-duplicate-keys/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-duplicate-keys/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-exponentiation-operator/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-builder-binary-assignment-operator-visitor': 7.16.7
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-flow-strip-types/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-mzmCq3cNsDpZZu9FADYYyfZJIOrSONmHcop2XEKPdBNMa4PDC4eEvcOvzZaCNcjKu72v0XQlA5y1g58aLRXdYg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-transform-for-of/7.18.1_@babel+core@7.18.2:
-    resolution: {integrity: sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-for-of/7.18.1_@babel+core@7.18.9:
-    resolution: {integrity: sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.2
-      '@babel/helper-function-name': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-function-name/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.9
-      '@babel/helper-function-name': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-literals/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-literals/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-member-expression-literals/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-modules-amd/7.18.0_@babel+core@7.18.2:
-    resolution: {integrity: sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-module-transforms': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      babel-plugin-dynamic-import-node: 2.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-modules-amd/7.18.0_@babel+core@7.18.9:
-    resolution: {integrity: sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-module-transforms': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      babel-plugin-dynamic-import-node: 2.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-modules-commonjs/7.18.6_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-module-transforms': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-simple-access': 7.18.6
-      babel-plugin-dynamic-import-node: 2.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-modules-commonjs/7.18.6_@babel+core@7.18.9:
-    resolution: {integrity: sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-module-transforms': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-simple-access': 7.18.6
-      babel-plugin-dynamic-import-node: 2.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-modules-systemjs/7.18.4_@babel+core@7.18.2:
-    resolution: {integrity: sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-module-transforms': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-validator-identifier': 7.18.6
-      babel-plugin-dynamic-import-node: 2.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-modules-systemjs/7.18.4_@babel+core@7.18.9:
-    resolution: {integrity: sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-module-transforms': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-validator-identifier': 7.18.6
-      babel-plugin-dynamic-import-node: 2.3.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-modules-umd/7.18.0_@babel+core@7.18.2:
-    resolution: {integrity: sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-module-transforms': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-modules-umd/7.18.0_@babel+core@7.18.9:
-    resolution: {integrity: sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-module-transforms': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-named-capturing-groups-regex/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-named-capturing-groups-regex/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-new-target/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-new-target/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-replace-supers': 7.18.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-object-super/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-replace-supers': 7.18.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-parameters/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-parameters/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-property-literals/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-react-display-name/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-react-display-name/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
-    dev: true
-
-  /@babel/plugin-transform-react-jsx-development/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.9
-    dev: true
-
-  /@babel/plugin-transform-react-jsx/7.18.6_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.2
-      '@babel/types': 7.18.7
-
-  /@babel/plugin-transform-react-jsx/7.18.6_@babel+core@7.18.9:
-    resolution: {integrity: sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.9
-      '@babel/types': 7.18.7
-    dev: true
-
-  /@babel/plugin-transform-react-pure-annotations/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-annotate-as-pure': 7.16.7
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-react-pure-annotations/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-annotate-as-pure': 7.16.7
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-regenerator/7.18.0_@babel+core@7.18.2:
-    resolution: {integrity: sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      regenerator-transform: 0.15.0
-    dev: true
-
-  /@babel/plugin-transform-regenerator/7.18.0_@babel+core@7.18.9:
-    resolution: {integrity: sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      regenerator-transform: 0.15.0
-    dev: true
-
-  /@babel/plugin-transform-reserved-words/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-reserved-words/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-runtime/7.17.10_@babel+core@7.18.9:
-    resolution: {integrity: sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.18.6
-      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.18.9
-      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.18.9
-      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.18.9
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/plugin-transform-shorthand-properties/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-shorthand-properties/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-spread/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
-    dev: true
-
-  /@babel/plugin-transform-spread/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-      '@babel/helper-skip-transparent-expression-wrappers': 7.16.0
-    dev: true
-
-  /@babel/plugin-transform-sticky-regex/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-sticky-regex/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-template-literals/7.18.2_@babel+core@7.18.2:
-    resolution: {integrity: sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-template-literals/7.18.2_@babel+core@7.18.9:
-    resolution: {integrity: sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-typeof-symbol/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/plugin-transform-typeof-symbol/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
+    dev: false
 
-  /@babel/plugin-transform-typescript/7.18.4_@babel+core@7.18.2:
-    resolution: {integrity: sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.2
+      '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
-  /@babel/plugin-transform-typescript/7.18.4_@babel+core@7.18.9:
-    resolution: {integrity: sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.9:
+    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-create-class-features-plugin': 7.18.0_@babel+core@7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
-  /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
+    dev: false
 
-  /@babel/plugin-transform-unicode-escapes/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
+    dev: false
 
-  /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.18.2:
-    resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
+  /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.18.9:
+    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.2
+      '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
+    dev: false
 
-  /@babel/plugin-transform-unicode-regex/7.16.7_@babel+core@7.18.9:
-    resolution: {integrity: sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-create-regexp-features-plugin': 7.17.12_@babel+core@7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-    dev: true
-
-  /@babel/preset-env/7.18.2_@babel+core@7.18.2:
-    resolution: {integrity: sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.17.10
-      '@babel/core': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/helper-validator-option': 7.16.7
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-async-generator-functions': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-class-properties': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-class-static-block': 7.18.0_@babel+core@7.18.2
-      '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-proposal-export-namespace-from': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-json-strings': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-logical-assignment-operators': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-proposal-object-rest-spread': 7.18.0_@babel+core@7.18.2
-      '@babel/plugin-proposal-optional-catch-binding': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-private-methods': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-private-property-in-object': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-proposal-unicode-property-regex': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.2
-      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.2
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-import-assertions': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.2
-      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.2
-      '@babel/plugin-transform-arrow-functions': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-async-to-generator': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-block-scoped-functions': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-block-scoping': 7.18.4_@babel+core@7.18.2
-      '@babel/plugin-transform-classes': 7.18.4_@babel+core@7.18.2
-      '@babel/plugin-transform-computed-properties': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-destructuring': 7.18.0_@babel+core@7.18.2
-      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-duplicate-keys': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-exponentiation-operator': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-for-of': 7.18.1_@babel+core@7.18.2
-      '@babel/plugin-transform-function-name': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-literals': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-member-expression-literals': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-modules-amd': 7.18.0_@babel+core@7.18.2
-      '@babel/plugin-transform-modules-commonjs': 7.18.6_@babel+core@7.18.2
-      '@babel/plugin-transform-modules-systemjs': 7.18.4_@babel+core@7.18.2
-      '@babel/plugin-transform-modules-umd': 7.18.0_@babel+core@7.18.2
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-new-target': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-object-super': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-parameters': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-property-literals': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-regenerator': 7.18.0_@babel+core@7.18.2
-      '@babel/plugin-transform-reserved-words': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-spread': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-sticky-regex': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-template-literals': 7.18.2_@babel+core@7.18.2
-      '@babel/plugin-transform-typeof-symbol': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-unicode-escapes': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-unicode-regex': 7.16.7_@babel+core@7.18.2
-      '@babel/preset-modules': 0.1.5_@babel+core@7.18.2
-      '@babel/types': 7.18.4
-      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.18.2
-      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.18.2
-      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.18.2
-      core-js-compat: 3.22.5
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
-  /@babel/preset-env/7.18.2_@babel+core@7.18.9:
-    resolution: {integrity: sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/compat-data': 7.17.10
       '@babel/core': 7.18.9
-      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/helper-validator-option': 7.16.7
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-async-generator-functions': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-class-properties': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-class-static-block': 7.18.0_@babel+core@7.18.9
-      '@babel/plugin-proposal-dynamic-import': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-proposal-export-namespace-from': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-json-strings': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-logical-assignment-operators': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-proposal-object-rest-spread': 7.18.0_@babel+core@7.18.9
-      '@babel/plugin-proposal-optional-catch-binding': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-private-methods': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-private-property-in-object': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-unicode-property-regex': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.9
-      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.9
-      '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.18.9
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-import-assertions': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.9
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.9
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.18.9
-      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.9
-      '@babel/plugin-transform-arrow-functions': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-async-to-generator': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-block-scoped-functions': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-block-scoping': 7.18.4_@babel+core@7.18.9
-      '@babel/plugin-transform-classes': 7.18.4_@babel+core@7.18.9
-      '@babel/plugin-transform-computed-properties': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-destructuring': 7.18.0_@babel+core@7.18.9
-      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-duplicate-keys': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-exponentiation-operator': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-for-of': 7.18.1_@babel+core@7.18.9
-      '@babel/plugin-transform-function-name': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-literals': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-member-expression-literals': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-modules-amd': 7.18.0_@babel+core@7.18.9
-      '@babel/plugin-transform-modules-commonjs': 7.18.6_@babel+core@7.18.9
-      '@babel/plugin-transform-modules-systemjs': 7.18.4_@babel+core@7.18.9
-      '@babel/plugin-transform-modules-umd': 7.18.0_@babel+core@7.18.9
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-new-target': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-object-super': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-parameters': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-property-literals': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-regenerator': 7.18.0_@babel+core@7.18.9
-      '@babel/plugin-transform-reserved-words': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-shorthand-properties': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-spread': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-sticky-regex': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-template-literals': 7.18.2_@babel+core@7.18.9
-      '@babel/plugin-transform-typeof-symbol': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-unicode-escapes': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-unicode-regex': 7.16.7_@babel+core@7.18.9
-      '@babel/preset-modules': 0.1.5_@babel+core@7.18.9
-      '@babel/types': 7.18.4
-      babel-plugin-polyfill-corejs2: 0.3.1_@babel+core@7.18.9
-      babel-plugin-polyfill-corejs3: 0.5.2_@babel+core@7.18.9
-      babel-plugin-polyfill-regenerator: 0.3.1_@babel+core@7.18.9
-      core-js-compat: 3.22.5
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
 
-  /@babel/preset-modules/0.1.5_@babel+core@7.18.2:
-    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.9:
+    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
+      '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-proposal-unicode-property-regex': 7.17.12_@babel+core@7.18.2
-      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.18.2
-      '@babel/types': 7.18.9
-      esutils: 2.0.3
-    dev: true
+    dev: false
 
-  /@babel/preset-modules/0.1.5_@babel+core@7.18.9:
-    resolution: {integrity: sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==}
+  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
       '@babel/helper-plugin-utils': 7.18.6
-      '@babel/plugin-proposal-unicode-property-regex': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-dotall-regex': 7.16.7_@babel+core@7.18.9
-      '@babel/types': 7.18.9
-      esutils: 2.0.3
-    dev: true
+    dev: false
 
-  /@babel/preset-react/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/helper-validator-option': 7.16.7
-      '@babel/plugin-transform-react-display-name': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
-      '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.18.2
-      '@babel/plugin-transform-react-pure-annotations': 7.16.7_@babel+core@7.18.2
-    dev: true
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
 
-  /@babel/preset-react/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==}
-    engines: {node: '>=6.9.0'}
+  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.9:
+    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/helper-validator-option': 7.16.7
-      '@babel/plugin-transform-react-display-name': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.9
-      '@babel/plugin-transform-react-jsx-development': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-react-pure-annotations': 7.16.7_@babel+core@7.18.9
-    dev: true
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
 
-  /@babel/preset-typescript/7.17.12_@babel+core@7.18.2:
-    resolution: {integrity: sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==}
+  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.9:
+    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/helper-validator-option': 7.16.7
-      '@babel/plugin-transform-typescript': 7.18.4_@babel+core@7.18.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@babel/core': 7.18.9
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
 
-  /@babel/preset-typescript/7.17.12_@babel+core@7.18.9:
-    resolution: {integrity: sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==}
+  /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.9:
+    resolution: {integrity: sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/helper-plugin-utils': 7.17.12
-      '@babel/helper-validator-option': 7.16.7
-      '@babel/plugin-transform-typescript': 7.18.4_@babel+core@7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@babel/helper-plugin-utils': 7.18.6
+    dev: false
 
   /@babel/runtime-corejs3/7.14.6:
     resolution: {integrity: sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==}
@@ -2589,6 +582,7 @@ packages:
       '@babel/code-frame': 7.18.6
       '@babel/parser': 7.18.9
       '@babel/types': 7.18.9
+    dev: false
 
   /@babel/template/7.18.6:
     resolution: {integrity: sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==}
@@ -2614,6 +608,7 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@babel/traverse/7.18.2_supports-color@5.5.0:
     resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==}
@@ -2648,6 +643,7 @@ packages:
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@babel/types/7.18.4:
     resolution: {integrity: sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==}
@@ -2655,13 +651,7 @@ packages:
     dependencies:
       '@babel/helper-validator-identifier': 7.18.6
       to-fast-properties: 2.0.0
-
-  /@babel/types/7.18.7:
-    resolution: {integrity: sha512-QG3yxTcTIBoAcQmkCs+wAPYZhu7Dk9rXKacINfNbdJDNERTbLQbHGyVG8q/YGMPeCJRIhSY0+fTc5+xuh6WPSQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.18.6
-      to-fast-properties: 2.0.0
+    dev: false
 
   /@babel/types/7.18.9:
     resolution: {integrity: sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==}
@@ -2672,6 +662,7 @@ packages:
 
   /@bcoe/v8-coverage/0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
+    dev: false
 
   /@cspotcode/source-map-support/0.8.1:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
@@ -2922,7 +913,7 @@ packages:
       - '@types/react'
     dev: false
 
-  /@hookform/error-message/2.0.0_l2dcsysovzdujulgxvsen7vbsm:
+  /@hookform/error-message/2.0.0_ie7afrsxjmqsdnv6azc5osehhy:
     resolution: {integrity: sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==}
     peerDependencies:
       react: '>=16.8.0'
@@ -2931,15 +922,15 @@ packages:
     dependencies:
       react: 18.1.0
       react-dom: 18.1.0_react@18.1.0
-      react-hook-form: 7.6.9_react@18.1.0
+      react-hook-form: 7.43.1_react@18.1.0
     dev: false
 
-  /@hookform/resolvers/2.8.9_react-hook-form@7.6.9:
+  /@hookform/resolvers/2.8.9_react-hook-form@7.43.1:
     resolution: {integrity: sha512-IXwGpjewxScF4N2kuyYDip6ABqH4lCg9n1f1mp0vbmKik+u+nestpbtdEs6U1WQZxwaoK/2APv1+MEr4czX7XA==}
     peerDependencies:
       react-hook-form: ^7.0.0
     dependencies:
-      react-hook-form: 7.6.9_react@18.1.0
+      react-hook-form: 7.43.1_react@18.1.0
     dev: false
 
   /@humanwhocodes/config-array/0.9.5:
@@ -2966,36 +957,27 @@ packages:
       get-package-type: 0.1.0
       js-yaml: 3.14.1
       resolve-from: 5.0.0
+    dev: false
 
   /@istanbuljs/schema/0.1.3:
     resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
     engines: {node: '>=8'}
-
-  /@jest/console/28.1.1:
-    resolution: {integrity: sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/types': 28.1.1
-      '@types/node': 16.11.7
-      chalk: 4.1.2
-      jest-message-util: 28.1.1
-      jest-util: 28.1.1
-      slash: 3.0.0
     dev: false
 
-  /@jest/console/29.0.3:
-    resolution: {integrity: sha512-cGg0r+klVHSYnfE977S9wmpuQ9L+iYuYgL+5bPXiUlUynLLYunRxswEmhBzvrSKGof5AKiHuTTmUKAqRcDY9dg==}
+  /@jest/console/29.5.0:
+    resolution: {integrity: sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.0.3
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
       chalk: 4.1.2
-      jest-message-util: 29.0.3
-      jest-util: 29.0.3
+      jest-message-util: 29.5.0
+      jest-util: 29.5.0
       slash: 3.0.0
+    dev: false
 
-  /@jest/core/29.0.3_ts-node@10.8.1:
-    resolution: {integrity: sha512-1d0hLbOrM1qQE3eP3DtakeMbKTcXiXP3afWxqz103xPyddS2NhnNghS7MaXx1dcDt4/6p4nlhmeILo2ofgi8cQ==}
+  /@jest/core/29.5.0_ts-node@10.9.1:
+    resolution: {integrity: sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -3003,37 +985,38 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/console': 29.0.3
-      '@jest/reporters': 29.0.3
-      '@jest/test-result': 29.0.3
-      '@jest/transform': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/console': 29.5.0
+      '@jest/reporters': 29.5.0
+      '@jest/test-result': 29.5.0
+      '@jest/transform': 29.5.0
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 3.3.1
       exit: 0.1.2
       graceful-fs: 4.2.10
-      jest-changed-files: 29.0.0
-      jest-config: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
-      jest-haste-map: 29.0.3
-      jest-message-util: 29.0.3
-      jest-regex-util: 29.0.0
-      jest-resolve: 29.0.3
-      jest-resolve-dependencies: 29.0.3
-      jest-runner: 29.0.3
-      jest-runtime: 29.0.3
-      jest-snapshot: 29.0.3
-      jest-util: 29.0.3
-      jest-validate: 29.0.3
-      jest-watcher: 29.0.3
+      jest-changed-files: 29.5.0
+      jest-config: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
+      jest-haste-map: 29.5.0
+      jest-message-util: 29.5.0
+      jest-regex-util: 29.4.3
+      jest-resolve: 29.5.0
+      jest-resolve-dependencies: 29.5.0
+      jest-runner: 29.5.0
+      jest-runtime: 29.5.0
+      jest-snapshot: 29.5.0
+      jest-util: 29.5.0
+      jest-validate: 29.5.0
+      jest-watcher: 29.5.0
       micromatch: 4.0.5
-      pretty-format: 29.0.3
+      pretty-format: 29.5.0
       slash: 3.0.0
       strip-ansi: 6.0.1
     transitivePeerDependencies:
       - supports-color
       - ts-node
+    dev: false
 
   /@jest/create-cache-key-function/27.5.1:
     resolution: {integrity: sha512-dmH1yW+makpTSURTy8VzdUwFnfQh1G8R+DxO2Ho2FFmBbKFEVm+3jWdvFhE2VqB/LATCTokkP0dotjyQyw5/AQ==}
@@ -3042,14 +1025,14 @@ packages:
       '@jest/types': 27.5.1
     dev: true
 
-  /@jest/environment/29.0.3:
-    resolution: {integrity: sha512-iKl272NKxYNQNqXMQandAIwjhQaGw5uJfGXduu8dS9llHi8jV2ChWrtOAVPnMbaaoDhnI3wgUGNDvZgHeEJQCA==}
+  /@jest/environment/29.5.0:
+    resolution: {integrity: sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/fake-timers': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/fake-timers': 29.5.0
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
-      jest-mock: 29.0.3
+      jest-mock: 29.5.0
 
   /@jest/expect-utils/29.0.3:
     resolution: {integrity: sha512-i1xUkau7K/63MpdwiRqaxgZOjxYs4f0WMTGJnYwUKubsNRZSeQbLorS7+I4uXVF9KQ5r61BUPAUMZ7Lf66l64Q==}
@@ -3057,39 +1040,48 @@ packages:
     dependencies:
       jest-get-type: 29.0.0
 
-  /@jest/expect/29.0.3:
-    resolution: {integrity: sha512-6W7K+fsI23FQ01H/BWccPyDZFrnU9QlzDcKOjrNVU5L8yUORFAJJIpmyxWPW70+X624KUNqzZwPThPMX28aXEQ==}
+  /@jest/expect-utils/29.5.0:
+    resolution: {integrity: sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      expect: 29.0.3
-      jest-snapshot: 29.0.3
+      jest-get-type: 29.4.3
+    dev: false
+
+  /@jest/expect/29.5.0:
+    resolution: {integrity: sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      expect: 29.5.0
+      jest-snapshot: 29.5.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /@jest/fake-timers/29.0.3:
-    resolution: {integrity: sha512-tmbUIo03x0TdtcZCESQ0oQSakPCpo7+s6+9mU19dd71MptkP4zCwoeZqna23//pgbhtT1Wq02VmA9Z9cNtvtCQ==}
+  /@jest/fake-timers/29.5.0:
+    resolution: {integrity: sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.0.3
-      '@sinonjs/fake-timers': 9.1.2
+      '@jest/types': 29.5.0
+      '@sinonjs/fake-timers': 10.0.2
       '@types/node': 16.11.7
-      jest-message-util: 29.0.3
-      jest-mock: 29.0.3
-      jest-util: 29.0.3
+      jest-message-util: 29.5.0
+      jest-mock: 29.5.0
+      jest-util: 29.5.0
 
-  /@jest/globals/29.0.3:
-    resolution: {integrity: sha512-YqGHT65rFY2siPIHHFjuCGUsbzRjdqkwbat+Of6DmYRg5shIXXrLdZoVE/+TJ9O1dsKsFmYhU58JvIbZRU1Z9w==}
+  /@jest/globals/29.5.0:
+    resolution: {integrity: sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.0.3
-      '@jest/expect': 29.0.3
-      '@jest/types': 29.0.3
-      jest-mock: 29.0.3
+      '@jest/environment': 29.5.0
+      '@jest/expect': 29.5.0
+      '@jest/types': 29.5.0
+      jest-mock: 29.5.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /@jest/reporters/29.0.3:
-    resolution: {integrity: sha512-3+QU3d4aiyOWfmk1obDerie4XNCaD5Xo1IlKNde2yGEi02WQD+ZQD0i5Hgqm1e73sMV7kw6pMlCnprtEwEVwxw==}
+  /@jest/reporters/29.5.0:
+    resolution: {integrity: sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -3098,10 +1090,10 @@ packages:
         optional: true
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 29.0.3
-      '@jest/test-result': 29.0.3
-      '@jest/transform': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/console': 29.5.0
+      '@jest/test-result': 29.5.0
+      '@jest/transform': 29.5.0
+      '@jest/types': 29.5.0
       '@jridgewell/trace-mapping': 0.3.15
       '@types/node': 16.11.7
       chalk: 4.1.2
@@ -3114,22 +1106,15 @@ packages:
       istanbul-lib-report: 3.0.0
       istanbul-lib-source-maps: 4.0.1
       istanbul-reports: 3.1.4
-      jest-message-util: 29.0.3
-      jest-util: 29.0.3
-      jest-worker: 29.0.3
+      jest-message-util: 29.5.0
+      jest-util: 29.5.0
+      jest-worker: 29.5.0
       slash: 3.0.0
       string-length: 4.0.2
       strip-ansi: 6.0.1
-      terminal-link: 2.1.1
       v8-to-istanbul: 9.0.1
     transitivePeerDependencies:
       - supports-color
-
-  /@jest/schemas/28.0.2:
-    resolution: {integrity: sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@sinclair/typebox': 0.23.5
     dev: false
 
   /@jest/schemas/29.0.0:
@@ -3138,63 +1123,73 @@ packages:
     dependencies:
       '@sinclair/typebox': 0.24.40
 
-  /@jest/source-map/29.0.0:
-    resolution: {integrity: sha512-nOr+0EM8GiHf34mq2GcJyz/gYFyLQ2INDhAylrZJ9mMWoW21mLBfZa0BUVPPMxVYrLjeiRe2Z7kWXOGnS0TFhQ==}
+  /@jest/schemas/29.4.3:
+    resolution: {integrity: sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@sinclair/typebox': 0.25.24
+
+  /@jest/source-map/29.4.3:
+    resolution: {integrity: sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jridgewell/trace-mapping': 0.3.15
       callsites: 3.1.0
       graceful-fs: 4.2.10
+    dev: false
 
-  /@jest/test-result/28.1.1:
-    resolution: {integrity: sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /@jest/test-result/29.0.3:
+    resolution: {integrity: sha512-vViVnQjCgTmbhDKEonKJPtcFe9G/CJO4/Np4XwYJah+lF2oI7KKeRp8t1dFvv44wN2NdbDb/qC6pi++Vpp0Dlg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/console': 29.5.0
+      '@jest/types': 29.5.0
       '@types/istanbul-lib-coverage': 2.0.3
       collect-v8-coverage: 1.0.1
     dev: false
 
-  /@jest/test-result/29.0.3:
-    resolution: {integrity: sha512-vViVnQjCgTmbhDKEonKJPtcFe9G/CJO4/Np4XwYJah+lF2oI7KKeRp8t1dFvv44wN2NdbDb/qC6pi++Vpp0Dlg==}
+  /@jest/test-result/29.5.0:
+    resolution: {integrity: sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/console': 29.5.0
+      '@jest/types': 29.5.0
       '@types/istanbul-lib-coverage': 2.0.3
       collect-v8-coverage: 1.0.1
+    dev: false
 
-  /@jest/test-sequencer/29.0.3:
-    resolution: {integrity: sha512-Hf4+xYSWZdxTNnhDykr8JBs0yBN/nxOXyUQWfotBUqqy0LF9vzcFB0jm/EDNZCx587znLWTIgxcokW7WeZMobQ==}
+  /@jest/test-sequencer/29.5.0:
+    resolution: {integrity: sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.0.3
+      '@jest/test-result': 29.5.0
       graceful-fs: 4.2.10
-      jest-haste-map: 29.0.3
+      jest-haste-map: 29.5.0
       slash: 3.0.0
+    dev: false
 
-  /@jest/transform/29.0.3:
-    resolution: {integrity: sha512-C5ihFTRYaGDbi/xbRQRdbo5ddGtI4VSpmL6AIcZxdhwLbXMa7PcXxxqyI91vGOFHnn5aVM3WYnYKCHEqmLVGzg==}
+  /@jest/transform/29.5.0:
+    resolution: {integrity: sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/core': 7.18.9
-      '@jest/types': 29.0.3
+      '@jest/types': 29.5.0
       '@jridgewell/trace-mapping': 0.3.15
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
-      convert-source-map: 1.7.0
+      convert-source-map: 2.0.0
       fast-json-stable-stringify: 2.1.0
       graceful-fs: 4.2.10
-      jest-haste-map: 29.0.3
-      jest-regex-util: 29.0.0
-      jest-util: 29.0.3
+      jest-haste-map: 29.5.0
+      jest-regex-util: 29.4.3
+      jest-util: 29.5.0
       micromatch: 4.0.5
       pirates: 4.0.5
       slash: 3.0.0
-      write-file-atomic: 4.0.1
+      write-file-atomic: 4.0.2
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /@jest/types/27.5.1:
     resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==}
@@ -3207,23 +1202,11 @@ packages:
       chalk: 4.1.2
     dev: true
 
-  /@jest/types/28.1.1:
-    resolution: {integrity: sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
-    dependencies:
-      '@jest/schemas': 28.0.2
-      '@types/istanbul-lib-coverage': 2.0.3
-      '@types/istanbul-reports': 3.0.1
-      '@types/node': 16.11.7
-      '@types/yargs': 17.0.10
-      chalk: 4.1.2
-    dev: false
-
-  /@jest/types/29.0.3:
-    resolution: {integrity: sha512-coBJmOQvurXjN1Hh5PzF7cmsod0zLIOXpP8KD161mqNlroMhLcwpODiEzi7ZsRl5Z/AIuxpeNm8DCl43F4kz8A==}
+  /@jest/types/29.5.0:
+    resolution: {integrity: sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.0.0
+      '@jest/schemas': 29.4.3
       '@types/istanbul-lib-coverage': 2.0.3
       '@types/istanbul-reports': 3.0.1
       '@types/node': 16.11.7
@@ -3236,6 +1219,7 @@ packages:
     dependencies:
       '@jridgewell/set-array': 1.1.1
       '@jridgewell/sourcemap-codec': 1.4.13
+    dev: false
 
   /@jridgewell/gen-mapping/0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
@@ -3363,8 +1347,8 @@ packages:
       - encoding
     dev: true
 
-  /@openapitools/openapi-generator-cli/2.5.1:
-    resolution: {integrity: sha512-WSRQBU0dCSVD+0Qv8iCsv0C4iMaZe/NpJ/CT4SmrEYLH3txoKTE8wEfbdj/kqShS8Or0YEGDPUzhSIKY151L0w==}
+  /@openapitools/openapi-generator-cli/2.5.2:
+    resolution: {integrity: sha512-FLgkjzpDiHVsH821db0VDSElDoA6TcspGyq3RD4zLBJaJhbSsRwr4u87sNoyuHKBg4OMJbZMT4iJxAhkosKrzw==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     requiresBuild: true
@@ -3429,132 +1413,126 @@ packages:
       reselect: 4.1.5
     dev: false
 
-  /@rushstack/eslint-patch/1.1.3:
-    resolution: {integrity: sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==}
-    dev: true
-
-  /@sinclair/typebox/0.23.5:
-    resolution: {integrity: sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==}
-    dev: false
-
   /@sinclair/typebox/0.24.40:
     resolution: {integrity: sha512-Xint60L8rF0+nRy+6fCjW9jQMmu7fTpbwTBrXZiK6eq/RHDJS7LvWX/0oXC8O7fCePmrY/XdfaTv2HiUDeCq4g==}
 
-  /@sinonjs/commons/1.8.3:
-    resolution: {integrity: sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==}
+  /@sinclair/typebox/0.25.24:
+    resolution: {integrity: sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==}
+
+  /@sinonjs/commons/2.0.0:
+    resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
     dependencies:
       type-detect: 4.0.8
 
-  /@sinonjs/fake-timers/9.1.2:
-    resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
+  /@sinonjs/fake-timers/10.0.2:
+    resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==}
     dependencies:
-      '@sinonjs/commons': 1.8.3
+      '@sinonjs/commons': 2.0.0
 
-  /@swc/core-darwin-arm64/1.3.22:
-    resolution: {integrity: sha512-MMhtPsuXp8gpUgr9bs+RZQ2IyFGiUNDG93usCDAFgAF+6VVp+YaAVjET/3/Bx5Lk2WAt0RxT62C9KTEw1YMo3w==}
+  /@swc/core-darwin-arm64/1.3.38:
+    resolution: {integrity: sha512-4ZTJJ/cR0EsXW5UxFCifZoGfzQ07a8s4ayt1nLvLQ5QoB1GTAf9zsACpvWG8e7cmCR0L76R5xt8uJuyr+noIXA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@swc/core-darwin-x64/1.3.22:
-    resolution: {integrity: sha512-SG6QbNat4GZ5VJU3Zo6a54oQOtbhJVE6BCQw4JjOCZJmAeBzNebGy9wsT4+fCJNHC3C5qtaRw7ToXJvLniXwfg==}
+  /@swc/core-darwin-x64/1.3.38:
+    resolution: {integrity: sha512-Kim727rNo4Dl8kk0CR8aJQe4zFFtsT1TZGlNrNMUgN1WC3CRX7dLZ6ZJi/VVcTG1cbHp5Fp3mUzwHsMxEh87Mg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf/1.3.22:
-    resolution: {integrity: sha512-4E+TdQT1oHnHjDaPs/DyrRy9lOuFd6ncEd67yYA4j9lFqt6nuz/jnXss45k8KU7wR5kOTtdW73xPwkU4NbOWdw==}
+  /@swc/core-linux-arm-gnueabihf/1.3.38:
+    resolution: {integrity: sha512-yaRdnPNU2enlJDRcIMvYVSyodY+Amhf5QuXdUbAj6rkDD6wUs/s9C6yPYrFDmoTltrG+nBv72mUZj+R46wVfSw==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-gnu/1.3.22:
-    resolution: {integrity: sha512-6VcynOMbOBcbLutIPENI3Ejvg5LGz/Pwvzm25hM0FoiEtPxHA+tawQUwLx8Alk1Yr+Rnqid06UEZ0veJOGn2pQ==}
+  /@swc/core-linux-arm64-gnu/1.3.38:
+    resolution: {integrity: sha512-iNY1HqKo/wBSu3QOGBUlZaLdBP/EHcwNjBAqIzpb8J64q2jEN02RizqVW0mDxyXktJ3lxr3g7VW9uqklMeXbjQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-musl/1.3.22:
-    resolution: {integrity: sha512-86RxGy0L3qa4De3xWHx8vL2caTxvSLSWTlgUW/Yd4l1pvrCFibMjhkImGu5ViKiReX9DlBtJ7CBs4dln2kHidw==}
+  /@swc/core-linux-arm64-musl/1.3.38:
+    resolution: {integrity: sha512-LJCFgLZoPRkPCPmux+Q5ctgXRp6AsWhvWuY61bh5bIPBDlaG9pZk94DeHyvtiwT0syhTtXb2LieBOx6NqN3zeA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-gnu/1.3.22:
-    resolution: {integrity: sha512-FLkbiqsdXsVIFZi6iedx4rSBGX8x0vo/5aDlklSxJAAYOcQpO0QADKP5Yr65iMT1d6ABCt2d+/StpGLF7GWOcA==}
+  /@swc/core-linux-x64-gnu/1.3.38:
+    resolution: {integrity: sha512-hRQGRIWHmv2PvKQM/mMV45mVXckM2+xLB8TYLLgUG66mmtyGTUJPyxjnJkbI86WNGqo18k+lAuMG2mn6QmzYwQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-musl/1.3.22:
-    resolution: {integrity: sha512-giBuw+Z0Bq6fpZ0Y5TcfpcQwf9p/cE1fOQyO/K1XSTn/haQOqFi7421Jq/dFThSARZiXw1u9Om9VFbwxr8VI+A==}
+  /@swc/core-linux-x64-musl/1.3.38:
+    resolution: {integrity: sha512-PTYSqtsIfPHLKDDNbueI5e0sc130vyHRiFOeeC6qqzA2FAiVvIxuvXHLr0soPvKAR1WyhtYmFB9QarcctemL2w==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-arm64-msvc/1.3.22:
-    resolution: {integrity: sha512-loKGO+ZM2By6VdrmVJk1G79jVgDPaee93qLFuis5KyeoLLb4m1MlNMc/6SIDZUSuYg6NqaGP1spFeiFetMQ4Zg==}
+  /@swc/core-win32-arm64-msvc/1.3.38:
+    resolution: {integrity: sha512-9lHfs5TPNs+QdkyZFhZledSmzBEbqml/J1rqPSb9Fy8zB6QlspixE6OLZ3nTlUOdoGWkcTTdrOn77Sd7YGf1AA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-ia32-msvc/1.3.22:
-    resolution: {integrity: sha512-lvNWAZ3QjXMsrsch6oLLQVikT/hC/4ZcLrTBXa14HwQylaYigkGElgp3ekJr78HjWDPwB46GXwBbNMG0VNAfvA==}
+  /@swc/core-win32-ia32-msvc/1.3.38:
+    resolution: {integrity: sha512-SbL6pfA2lqvDKnwTHwOfKWvfHAdcbAwJS4dBkFidr7BiPTgI5Uk8wAPcRb8mBECpmIa9yFo+N0cAFRvMnf+cNw==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-x64-msvc/1.3.22:
-    resolution: {integrity: sha512-ESyn4lZXAKEE3mcTaDfXatsolCiEfVGstsXdgBmZYa6o1IE1bDW8FE7Ob/Y+82WTpm9+A9ZYXYjZ62t67POHZg==}
+  /@swc/core-win32-x64-msvc/1.3.38:
+    resolution: {integrity: sha512-UFveLrL6eGvViOD8OVqUQa6QoQwdqwRvLtL5elF304OT8eCPZa8BhuXnWk25X8UcOyns8gFcb8Fhp3oaLi/Rlw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@swc/core/1.3.22:
-    resolution: {integrity: sha512-oQ9EPEb7NgWcGIDoVfLCuffvtC4MzVtrwjqwKzFHP8FUh1fn8+2wraOjkkDXW74BB4Hgve5ykkaHix9bebB9Ww==}
+  /@swc/core/1.3.38:
+    resolution: {integrity: sha512-AiEVehRFws//AiiLx9DPDp1WDXt+yAoGD1kMYewhoF6QLdTz8AtYu6i8j/yAxk26L8xnegy0CDwcNnub9qenyQ==}
     engines: {node: '>=10'}
-    hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@swc/core-darwin-arm64': 1.3.22
-      '@swc/core-darwin-x64': 1.3.22
-      '@swc/core-linux-arm-gnueabihf': 1.3.22
-      '@swc/core-linux-arm64-gnu': 1.3.22
-      '@swc/core-linux-arm64-musl': 1.3.22
-      '@swc/core-linux-x64-gnu': 1.3.22
-      '@swc/core-linux-x64-musl': 1.3.22
-      '@swc/core-win32-arm64-msvc': 1.3.22
-      '@swc/core-win32-ia32-msvc': 1.3.22
-      '@swc/core-win32-x64-msvc': 1.3.22
-
-  /@swc/jest/0.2.24_@swc+core@1.3.22:
+      '@swc/core-darwin-arm64': 1.3.38
+      '@swc/core-darwin-x64': 1.3.38
+      '@swc/core-linux-arm-gnueabihf': 1.3.38
+      '@swc/core-linux-arm64-gnu': 1.3.38
+      '@swc/core-linux-arm64-musl': 1.3.38
+      '@swc/core-linux-x64-gnu': 1.3.38
+      '@swc/core-linux-x64-musl': 1.3.38
+      '@swc/core-win32-arm64-msvc': 1.3.38
+      '@swc/core-win32-ia32-msvc': 1.3.38
+      '@swc/core-win32-x64-msvc': 1.3.38
+
+  /@swc/jest/0.2.24_@swc+core@1.3.38:
     resolution: {integrity: sha512-fwgxQbM1wXzyKzl1+IW0aGrRvAA8k0Y3NxFhKigbPjOJ4mCKnWEcNX9HQS3gshflcxq8YKhadabGUVfdwjCr6Q==}
     engines: {npm: '>= 7.0.0'}
     peerDependencies:
       '@swc/core': '*'
     dependencies:
       '@jest/create-cache-key-function': 27.5.1
-      '@swc/core': 1.3.22
+      '@swc/core': 1.3.38
       jsonc-parser: 3.2.0
     dev: true
 
@@ -3614,7 +1592,7 @@ packages:
     resolution: {integrity: sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==}
     engines: {node: '>=12'}
     dependencies:
-      '@babel/code-frame': 7.16.7
+      '@babel/code-frame': 7.18.6
       '@babel/runtime': 7.17.9
       '@types/aria-query': 4.2.2
       aria-query: 5.0.0
@@ -3622,43 +1600,57 @@ packages:
       dom-accessibility-api: 0.5.10
       lz-string: 1.4.4
       pretty-format: 27.5.1
+    dev: true
+
+  /@testing-library/dom/9.0.0:
+    resolution: {integrity: sha512-+/TLgKNFsYUshOY/zXsQOk+PlFQK+eyJ9T13IDVNJEi+M+Un7xlJK+FZKkbGSnf0+7E1G6PlDhkSYQ/GFiruBQ==}
+    engines: {node: '>=14'}
+    dependencies:
+      '@babel/code-frame': 7.18.6
+      '@babel/runtime': 7.17.9
+      '@types/aria-query': 5.0.1
+      aria-query: 5.0.0
+      chalk: 4.1.2
+      dom-accessibility-api: 0.5.10
+      lz-string: 1.4.4
+      pretty-format: 27.5.1
 
-  /@testing-library/jest-dom/5.16.4:
-    resolution: {integrity: sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==}
+  /@testing-library/jest-dom/5.16.5:
+    resolution: {integrity: sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==}
     engines: {node: '>=8', npm: '>=6', yarn: '>=1'}
     dependencies:
+      '@adobe/css-tools': 4.2.0
       '@babel/runtime': 7.17.9
       '@types/testing-library__jest-dom': 5.14.5
       aria-query: 5.0.0
       chalk: 3.0.0
-      css: 3.0.0
       css.escape: 1.5.1
       dom-accessibility-api: 0.5.10
       lodash: 4.17.21
       redent: 3.0.0
     dev: true
 
-  /@testing-library/react/13.2.0_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g==}
-    engines: {node: '>=12'}
+  /@testing-library/react/14.0.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-S04gSNJbYE30TlIMLTzv6QCTzt9AqIF5y6s6SzVFILNcNvbV/jU96GeiTPillGQo+Ny64M/5PV7klNYYgv5Dfg==}
+    engines: {node: '>=14'}
     peerDependencies:
       react: ^18.0.0
       react-dom: ^18.0.0
     dependencies:
       '@babel/runtime': 7.17.9
-      '@testing-library/dom': 8.13.0
+      '@testing-library/dom': 9.0.0
       '@types/react-dom': 18.0.5
       react: 18.1.0
       react-dom: 18.1.0_react@18.1.0
     dev: false
 
-  /@testing-library/user-event/14.4.3_tlwynutqiyp5mns3woioasuxnq:
+  /@testing-library/user-event/14.4.3_@testing-library+dom@9.0.0:
     resolution: {integrity: sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
     dependencies:
-      '@testing-library/dom': 8.13.0
+      '@testing-library/dom': 9.0.0
     dev: true
 
   /@tootallnate/once/2.0.0:
@@ -3689,6 +1681,10 @@ packages:
 
   /@types/aria-query/4.2.2:
     resolution: {integrity: sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==}
+    dev: true
+
+  /@types/aria-query/5.0.1:
+    resolution: {integrity: sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==}
 
   /@types/babel__core/7.1.19:
     resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
@@ -3698,22 +1694,26 @@ packages:
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.17.1
+    dev: false
 
   /@types/babel__generator/7.6.4:
     resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
       '@babel/types': 7.18.9
+    dev: false
 
   /@types/babel__template/7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
       '@babel/parser': 7.18.9
       '@babel/types': 7.18.9
+    dev: false
 
   /@types/babel__traverse/7.17.1:
     resolution: {integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==}
     dependencies:
       '@babel/types': 7.18.9
+    dev: false
 
   /@types/eventsource/1.1.8:
     resolution: {integrity: sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==}
@@ -3723,6 +1723,7 @@ packages:
     resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
     dependencies:
       '@types/node': 16.11.7
+    dev: false
 
   /@types/history/4.7.11:
     resolution: {integrity: sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==}
@@ -3771,6 +1772,7 @@ packages:
 
   /@types/lodash/4.14.177:
     resolution: {integrity: sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==}
+    dev: true
 
   /@types/node/16.11.7:
     resolution: {integrity: sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==}
@@ -3781,12 +1783,13 @@ packages:
 
   /@types/prettier/2.6.3:
     resolution: {integrity: sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==}
+    dev: false
 
   /@types/prop-types/15.7.5:
     resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
 
-  /@types/react-datepicker/4.4.2_react@18.1.0:
-    resolution: {integrity: sha512-g8DhWvYmaIMLzVrIEVLXncylyImyBaoPsEUr3yR13JDaaHoebhDorqnVv4tLkNGa8SjBB8SAOQvxD5jaPNBX8A==}
+  /@types/react-datepicker/4.10.0_react@18.1.0:
+    resolution: {integrity: sha512-Cq+ks20vBIU6XN67TbkCHu8M7V46Y6vJrKE2n+8q/GfueJyWWTIKeC3Z7cz/d+qxGDq/VCrqA929R0U4lNuztg==}
     dependencies:
       '@popperjs/core': 2.9.2
       '@types/react': 18.0.9
@@ -3891,19 +1894,6 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/experimental-utils/5.23.0_vjep2yp2sits3sqnodefgcbnfi:
-    resolution: {integrity: sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      '@typescript-eslint/utils': 5.23.0_vjep2yp2sits3sqnodefgcbnfi
-      eslint: 8.16.0
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
-
   /@typescript-eslint/parser/5.29.0_vjep2yp2sits3sqnodefgcbnfi:
     resolution: {integrity: sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3924,14 +1914,6 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/5.23.0:
-    resolution: {integrity: sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.23.0
-      '@typescript-eslint/visitor-keys': 5.23.0
-    dev: true
-
   /@typescript-eslint/scope-manager/5.29.0:
     resolution: {integrity: sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3952,44 +1934,18 @@ packages:
     dependencies:
       '@typescript-eslint/utils': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
       debug: 4.3.4
-      eslint: 8.16.0
-      tsutils: 3.21.0_typescript@4.7.4
-      typescript: 4.7.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@typescript-eslint/types/5.23.0:
-    resolution: {integrity: sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /@typescript-eslint/types/5.29.0:
-    resolution: {integrity: sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
-
-  /@typescript-eslint/typescript-estree/5.23.0_typescript@4.7.4:
-    resolution: {integrity: sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@typescript-eslint/types': 5.23.0
-      '@typescript-eslint/visitor-keys': 5.23.0
-      debug: 4.3.4
-      globby: 11.1.0
-      is-glob: 4.0.3
-      semver: 7.3.7
+      eslint: 8.16.0
       tsutils: 3.21.0_typescript@4.7.4
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@typescript-eslint/types/5.29.0:
+    resolution: {integrity: sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
   /@typescript-eslint/typescript-estree/5.29.0_typescript@4.7.4:
     resolution: {integrity: sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -4011,24 +1967,6 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.23.0_vjep2yp2sits3sqnodefgcbnfi:
-    resolution: {integrity: sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-    dependencies:
-      '@types/json-schema': 7.0.11
-      '@typescript-eslint/scope-manager': 5.23.0
-      '@typescript-eslint/types': 5.23.0
-      '@typescript-eslint/typescript-estree': 5.23.0_typescript@4.7.4
-      eslint: 8.16.0
-      eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.16.0
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
-
   /@typescript-eslint/utils/5.29.0_vjep2yp2sits3sqnodefgcbnfi:
     resolution: {integrity: sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -4047,14 +1985,6 @@ packages:
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.23.0:
-    resolution: {integrity: sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      '@typescript-eslint/types': 5.23.0
-      eslint-visitor-keys: 3.3.0
-    dev: true
-
   /@typescript-eslint/visitor-keys/5.29.0:
     resolution: {integrity: sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -4068,7 +1998,7 @@ packages:
     peerDependencies:
       vite: ^4.0.0
     dependencies:
-      '@swc/core': 1.3.22
+      '@swc/core': 1.3.38
       vite: 4.0.0_binvsr2w2vzqveeue6ibz2djda
     dev: true
 
@@ -4132,10 +2062,8 @@ packages:
       indent-string: 4.0.0
     dev: true
 
-  /ajv-formats/2.1.1_ajv@8.8.2:
+  /ajv-formats/2.1.1:
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
-    peerDependencies:
-      ajv: ^8.0.0
     peerDependenciesMeta:
       ajv:
         optional: true
@@ -4167,11 +2095,11 @@ packages:
     dependencies:
       type-fest: 0.21.3
 
-  /ansi-escapes/5.0.0:
-    resolution: {integrity: sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==}
-    engines: {node: '>=12'}
+  /ansi-escapes/6.0.0:
+    resolution: {integrity: sha512-IG23inYII3dWlU2EyiAiGj6Bwal5GzsgPMwjYGvc1HPE2dgbj4ZB5ToWBKSquKw74nB3TIuOwaI6/jSULzfgrw==}
+    engines: {node: '>=14.16'}
     dependencies:
-      type-fest: 1.4.0
+      type-fest: 3.6.1
     dev: false
 
   /ansi-regex/5.0.1:
@@ -4217,6 +2145,7 @@ packages:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
     dependencies:
       sprintf-js: 1.0.3
+    dev: false
 
   /argparse/2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
@@ -4302,12 +2231,6 @@ packages:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
     dev: true
 
-  /atob/2.1.2:
-    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
-    engines: {node: '>= 4.5.0'}
-    hasBin: true
-    dev: true
-
   /axe-core/4.3.5:
     resolution: {integrity: sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==}
     engines: {node: '>=4'}
@@ -4325,46 +2248,23 @@ packages:
     resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
     dev: true
 
-  /babel-jest/29.0.3_@babel+core@7.18.2:
-    resolution: {integrity: sha512-ApPyHSOhS/sVzwUOQIWJmdvDhBsMG01HX9z7ogtkp1TToHGGUWFlnXJUIzCgKPSfiYLn3ibipCYzsKSURHEwLg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@babel/core': ^7.8.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@jest/transform': 29.0.3
-      '@types/babel__core': 7.1.19
-      babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.0.2_@babel+core@7.18.2
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      slash: 3.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /babel-jest/29.0.3_@babel+core@7.18.9:
-    resolution: {integrity: sha512-ApPyHSOhS/sVzwUOQIWJmdvDhBsMG01HX9z7ogtkp1TToHGGUWFlnXJUIzCgKPSfiYLn3ibipCYzsKSURHEwLg==}
+  /babel-jest/29.5.0_@babel+core@7.18.9:
+    resolution: {integrity: sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
     dependencies:
       '@babel/core': 7.18.9
-      '@jest/transform': 29.0.3
+      '@jest/transform': 29.5.0
       '@types/babel__core': 7.1.19
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.0.2_@babel+core@7.18.9
+      babel-preset-jest: 29.5.0_@babel+core@7.18.9
       chalk: 4.1.2
       graceful-fs: 4.2.10
       slash: 3.0.0
     transitivePeerDependencies:
       - supports-color
-
-  /babel-plugin-dynamic-import-node/2.3.3:
-    resolution: {integrity: sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==}
-    dependencies:
-      object.assign: 4.1.2
-    dev: true
+    dev: false
 
   /babel-plugin-istanbul/6.1.1:
     resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
@@ -4377,96 +2277,17 @@ packages:
       test-exclude: 6.0.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /babel-plugin-jest-hoist/29.0.2:
-    resolution: {integrity: sha512-eBr2ynAEFjcebVvu8Ktx580BD1QKCrBG1XwEUTXJe285p9HA/4hOhfWCFRQhTKSyBV0VzjhG7H91Eifz9s29hg==}
+  /babel-plugin-jest-hoist/29.5.0:
+    resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/template': 7.18.6
       '@babel/types': 7.18.9
       '@types/babel__core': 7.1.19
       '@types/babel__traverse': 7.17.1
-
-  /babel-plugin-macros/3.1.0:
-    resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
-    engines: {node: '>=10', npm: '>=6'}
-    dependencies:
-      '@babel/runtime': 7.17.9
-      cosmiconfig: 7.0.1
-      resolve: 1.22.1
-    dev: true
-
-  /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.18.2:
-    resolution: {integrity: sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.18.8
-      '@babel/core': 7.18.2
-      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.2
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-plugin-polyfill-corejs2/0.3.1_@babel+core@7.18.9:
-    resolution: {integrity: sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/compat-data': 7.18.8
-      '@babel/core': 7.18.9
-      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.9
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-plugin-polyfill-corejs3/0.5.2_@babel+core@7.18.2:
-    resolution: {integrity: sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.2
-      core-js-compat: 3.22.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-plugin-polyfill-corejs3/0.5.2_@babel+core@7.18.9:
-    resolution: {integrity: sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.9
-      core-js-compat: 3.22.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.18.2:
-    resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /babel-plugin-polyfill-regenerator/0.3.1_@babel+core@7.18.9:
-    resolution: {integrity: sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/helper-define-polyfill-provider': 0.3.1_@babel+core@7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
   /babel-plugin-styled-components/1.13.2_styled-components@5.3.1:
     resolution: {integrity: sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==}
@@ -4482,30 +2303,6 @@ packages:
   /babel-plugin-syntax-jsx/6.18.0:
     resolution: {integrity: sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==}
 
-  /babel-plugin-transform-react-remove-prop-types/0.4.24:
-    resolution: {integrity: sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==}
-    dev: true
-
-  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.2:
-    resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.2
-      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.2
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.2
-      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.2
-    dev: false
-
   /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.9:
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
@@ -4524,51 +2321,18 @@ packages:
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.9
       '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
       '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.9
-
-  /babel-preset-jest/29.0.2_@babel+core@7.18.2:
-    resolution: {integrity: sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.18.2
-      babel-plugin-jest-hoist: 29.0.2
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.2
     dev: false
 
-  /babel-preset-jest/29.0.2_@babel+core@7.18.9:
-    resolution: {integrity: sha512-BeVXp7rH5TK96ofyEnHjznjLMQ2nAeDJ+QzxKnHAAMs0RgrQsCywjAN8m4mOm5Di0pxU//3AoEeJJrerMH5UeA==}
+  /babel-preset-jest/29.5.0_@babel+core@7.18.9:
+    resolution: {integrity: sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.18.9
-      babel-plugin-jest-hoist: 29.0.2
+      babel-plugin-jest-hoist: 29.5.0
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.9
-
-  /babel-preset-react-app/10.0.1:
-    resolution: {integrity: sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==}
-    dependencies:
-      '@babel/core': 7.18.9
-      '@babel/plugin-proposal-class-properties': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-decorators': 7.17.9_@babel+core@7.18.9
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-numeric-separator': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-proposal-optional-chaining': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-private-methods': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-proposal-private-property-in-object': 7.17.12_@babel+core@7.18.9
-      '@babel/plugin-transform-flow-strip-types': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-react-display-name': 7.16.7_@babel+core@7.18.9
-      '@babel/plugin-transform-runtime': 7.17.10_@babel+core@7.18.9
-      '@babel/preset-env': 7.18.2_@babel+core@7.18.9
-      '@babel/preset-react': 7.17.12_@babel+core@7.18.9
-      '@babel/preset-typescript': 7.17.12_@babel+core@7.18.9
-      '@babel/runtime': 7.17.9
-      babel-plugin-macros: 3.1.0
-      babel-plugin-transform-react-remove-prop-types: 0.4.24
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+    dev: false
 
   /balanced-match/1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
@@ -4621,14 +2385,17 @@ packages:
       escalade: 3.1.1
       node-releases: 2.0.5
       picocolors: 1.0.0
+    dev: false
 
   /bser/2.1.1:
     resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
     dependencies:
       node-int64: 0.4.0
+    dev: false
 
   /buffer-from/1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+    dev: false
 
   /buffer/5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
@@ -4655,16 +2422,19 @@ packages:
   /camelcase/5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
+    dev: false
 
   /camelcase/6.3.0:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
+    dev: false
 
   /camelize/1.0.0:
     resolution: {integrity: sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==}
 
   /caniuse-lite/1.0.30001352:
     resolution: {integrity: sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==}
+    dev: false
 
   /chalk/2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
@@ -4689,20 +2459,21 @@ packages:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
+  /chalk/5.2.0:
+    resolution: {integrity: sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+    dev: false
+
   /char-regex/1.0.2:
     resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
     engines: {node: '>=10'}
+    dev: false
 
   /char-regex/2.0.1:
     resolution: {integrity: sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==}
     engines: {node: '>=12.20'}
     dev: false
 
-  /charcodes/0.2.0:
-    resolution: {integrity: sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==}
-    engines: {node: '>=6'}
-    dev: true
-
   /chardet/0.7.0:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
     dev: true
@@ -4726,6 +2497,7 @@ packages:
 
   /cjs-module-lexer/1.2.2:
     resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
+    dev: false
 
   /classnames/2.3.1:
     resolution: {integrity: sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==}
@@ -4784,6 +2556,7 @@ packages:
   /co/4.6.0:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
+    dev: false
 
   /code-block-writer/11.0.1:
     resolution: {integrity: sha512-0ch9DeCY8v/BWA9n1/Qu1ALG3lpesel4PYL2eNlGLgvGl+J7k74i+dSXSF3wLvF5SYII8/GUT/Ic+fycBR/DUQ==}
@@ -4791,6 +2564,7 @@ packages:
 
   /collect-v8-coverage/1.0.1:
     resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
+    dev: false
 
   /color-convert/1.9.3:
     resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
@@ -4866,7 +2640,7 @@ packages:
     dev: true
 
   /console.table/0.10.0:
-    resolution: {integrity: sha1-CRcCVYiHW+/XDPLv9L7yxuLXXQQ=}
+    resolution: {integrity: sha512-dPyZofqggxuvSf7WXvNjuRfnsOk1YazkVP8FdxH4tcH2c37wc79/Yl6Bhr7Lsu00KMgy2ql/qCMuNu8xctZM8g==}
     engines: {node: '> 0.10'}
     dependencies:
       easy-table: 1.1.0
@@ -4876,13 +2650,11 @@ packages:
     resolution: {integrity: sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==}
     dependencies:
       safe-buffer: 5.1.2
+    dev: false
 
-  /core-js-compat/3.22.5:
-    resolution: {integrity: sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==}
-    dependencies:
-      browserslist: 4.20.4
-      semver: 7.0.0
-    dev: true
+  /convert-source-map/2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+    dev: false
 
   /core-js-pure/3.14.0:
     resolution: {integrity: sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==}
@@ -4933,14 +2705,6 @@ packages:
     resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
     dev: true
 
-  /css/3.0.0:
-    resolution: {integrity: sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==}
-    dependencies:
-      inherits: 2.0.4
-      source-map: 0.6.1
-      source-map-resolve: 0.6.0
-    dev: true
-
   /cssom/0.3.8:
     resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
     dev: true
@@ -5025,13 +2789,9 @@ packages:
     resolution: {integrity: sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==}
     dev: true
 
-  /decode-uri-component/0.2.0:
-    resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==}
-    engines: {node: '>=0.10'}
-    dev: true
-
   /dedent/0.7.0:
     resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
+    dev: false
 
   /deep-is/0.1.3:
     resolution: {integrity: sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw==}
@@ -5040,6 +2800,7 @@ packages:
   /deepmerge/4.2.2:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
+    dev: false
 
   /defaults/1.0.3:
     resolution: {integrity: sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==}
@@ -5068,6 +2829,7 @@ packages:
   /detect-newline/3.1.0:
     resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
     engines: {node: '>=8'}
+    dev: false
 
   /diff-match-patch/1.0.5:
     resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
@@ -5077,6 +2839,11 @@ packages:
     resolution: {integrity: sha512-7Qe/zd1wxSDL4D/X/FPjOMB+ZMDt71W94KYaq05I2l0oQqgXgs7s4ftYYmV38gBSrPz2vcygxfs1xn0FT+rKNA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
+  /diff-sequences/29.4.3:
+    resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dev: false
+
   /diff/4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
@@ -5122,7 +2889,7 @@ packages:
     dev: true
 
   /easy-table/1.1.0:
-    resolution: {integrity: sha1-hvmrTBAvA3G3KXuSplHVgkvIy3M=}
+    resolution: {integrity: sha512-oq33hWOSSnl2Hoh00tZWaIPi1ievrD9aFG82/IgjlycAnW9hHx5PkJiXpxPsgEE+H7BsbVQXFVFST8TEXS6/pA==}
     optionalDependencies:
       wcwidth: 1.0.1
     dev: true
@@ -5137,10 +2904,17 @@ packages:
 
   /electron-to-chromium/1.4.151:
     resolution: {integrity: sha512-XaG2LpZi9fdiWYOqJh0dJy4SlVywCvpgYXhzOlZTp4JqSKqxn5URqOjbm9OMYB3aInA2GuHQiem1QUOc1yT0Pw==}
+    dev: false
 
   /emittery/0.10.2:
     resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==}
     engines: {node: '>=12'}
+    dev: false
+
+  /emittery/0.13.1:
+    resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
+    engines: {node: '>=12'}
+    dev: false
 
   /emoji-regex/8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -5329,41 +3103,6 @@ packages:
       eslint: 8.16.0
     dev: true
 
-  /eslint-config-react-app/7.0.1_qmzb7mn5nafzn657qxusdnr23a:
-    resolution: {integrity: sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      eslint: ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@babel/core': 7.18.2
-      '@babel/eslint-parser': 7.17.0_j4uj5cgi2mksbox6kqvi7jrs6u
-      '@rushstack/eslint-patch': 1.1.3
-      '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
-      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
-      babel-preset-react-app: 10.0.1
-      confusing-browser-globals: 1.0.11
-      eslint: 8.16.0
-      eslint-plugin-flowtype: 8.0.3_lkudaqqzr27bp3dduyr3eevxq4
-      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
-      eslint-plugin-jest: 25.7.0_76upbxnyphyptf6rdjdsihqkzi
-      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
-      eslint-plugin-react: 7.30.1_eslint@8.16.0
-      eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
-      eslint-plugin-testing-library: 5.5.0_vjep2yp2sits3sqnodefgcbnfi
-      typescript: 4.7.4
-    transitivePeerDependencies:
-      - '@babel/plugin-syntax-flow'
-      - '@babel/plugin-transform-react-jsx'
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - jest
-      - supports-color
-    dev: true
-
   /eslint-import-resolver-node/0.3.6:
     resolution: {integrity: sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==}
     dependencies:
@@ -5420,21 +3159,6 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-flowtype/8.0.3_lkudaqqzr27bp3dduyr3eevxq4:
-    resolution: {integrity: sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==}
-    engines: {node: '>=12.0.0'}
-    peerDependencies:
-      '@babel/plugin-syntax-flow': ^7.14.5
-      '@babel/plugin-transform-react-jsx': ^7.14.9
-      eslint: ^8.1.0
-    dependencies:
-      '@babel/plugin-syntax-flow': 7.18.6_@babel+core@7.18.2
-      '@babel/plugin-transform-react-jsx': 7.18.6_@babel+core@7.18.2
-      eslint: 8.16.0
-      lodash: 4.17.21
-      string-natural-compare: 3.0.1
-    dev: true
-
   /eslint-plugin-import/2.26.0_h5azci6ujakbaa2xblg2jlxooy:
     resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
     engines: {node: '>=4'}
@@ -5466,8 +3190,8 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-jest-dom/4.0.2_eslint@8.16.0:
-    resolution: {integrity: sha512-Jo51Atwyo2TdcUncjmU+UQeSTKh3sc2LF/M5i/R3nTU0Djw9V65KGJisdm/RtuKhy2KH/r7eQ1n6kwYFPNdHlA==}
+  /eslint-plugin-jest-dom/4.0.3_eslint@8.16.0:
+    resolution: {integrity: sha512-9j+n8uj0+V0tmsoS7bYC7fLhQmIvjRqRYEcbDSi+TKPsTThLLXCyj5swMSSf/hTleeMktACnn+HFqXBr5gbcbA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'}
     peerDependencies:
       eslint: ^6.8.0 || ^7.0.0 || ^8.0.0
@@ -5478,28 +3202,6 @@ packages:
       requireindex: 1.2.0
     dev: true
 
-  /eslint-plugin-jest/25.7.0_76upbxnyphyptf6rdjdsihqkzi:
-    resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^4.0.0 || ^5.0.0
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      jest: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/eslint-plugin':
-        optional: true
-      jest:
-        optional: true
-    dependencies:
-      '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
-      '@typescript-eslint/experimental-utils': 5.23.0_vjep2yp2sits3sqnodefgcbnfi
-      eslint: 8.16.0
-      jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
-
   /eslint-plugin-jsx-a11y/6.5.1_eslint@8.16.0:
     resolution: {integrity: sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==}
     engines: {node: '>=4.0'}
@@ -5521,7 +3223,7 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /eslint-plugin-prettier/4.0.0_q7a4ir2sdihdzpzdlnbgmzjlpq:
+  /eslint-plugin-prettier/4.0.0_cu7djixscogveocpaizwew7lgy:
     resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==}
     engines: {node: '>=6.0.0'}
     peerDependencies:
@@ -5534,7 +3236,7 @@ packages:
     dependencies:
       eslint: 8.16.0
       eslint-config-prettier: 8.5.0_eslint@8.16.0
-      prettier: 2.5.1
+      prettier: 2.8.4
       prettier-linter-helpers: 1.0.0
     dev: true
 
@@ -5570,19 +3272,6 @@ packages:
       string.prototype.matchall: 4.0.7
     dev: true
 
-  /eslint-plugin-testing-library/5.5.0_vjep2yp2sits3sqnodefgcbnfi:
-    resolution: {integrity: sha512-eWQ19l6uWL7LW8oeMyQVSGjVYFnBqk7DMHjadm0yOHBvX3Xi9OBrsNuxoAMdX4r7wlQ5WWpW46d+CB6FWFL/PQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6'}
-    peerDependencies:
-      eslint: ^7.5.0 || ^8.0.0
-    dependencies:
-      '@typescript-eslint/utils': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
-      eslint: 8.16.0
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-    dev: true
-
   /eslint-scope/5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}
@@ -5719,6 +3408,7 @@ packages:
       onetime: 5.1.2
       signal-exit: 3.0.7
       strip-final-newline: 2.0.0
+    dev: false
 
   /execa/6.1.0:
     resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==}
@@ -5738,6 +3428,7 @@ packages:
   /exit/0.1.2:
     resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
     engines: {node: '>= 0.8.0'}
+    dev: false
 
   /expect/29.0.3:
     resolution: {integrity: sha512-t8l5DTws3212VbmPL+tBFXhjRHLmctHB0oQbL8eUc6S7NzZtYUhycrFO9mkxA0ZUC6FAWdNi7JchJSkODtcu1Q==}
@@ -5749,6 +3440,17 @@ packages:
       jest-message-util: 29.0.3
       jest-util: 29.0.3
 
+  /expect/29.5.0:
+    resolution: {integrity: sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/expect-utils': 29.5.0
+      jest-get-type: 29.4.3
+      jest-matcher-utils: 29.5.0
+      jest-message-util: 29.5.0
+      jest-util: 29.5.0
+    dev: false
+
   /external-editor/3.1.0:
     resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
     engines: {node: '>=4'}
@@ -5797,6 +3499,7 @@ packages:
     resolution: {integrity: sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==}
     dependencies:
       bser: 2.1.1
+    dev: false
 
   /fetch-mock/9.11.0:
     resolution: {integrity: sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==}
@@ -5860,6 +3563,7 @@ packages:
     dependencies:
       locate-path: 5.0.0
       path-exists: 4.0.0
+    dev: false
 
   /flat-cache/3.0.4:
     resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
@@ -5939,6 +3643,7 @@ packages:
   /gensync/1.0.0-beta.2:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
     engines: {node: '>=6.9.0'}
+    dev: false
 
   /get-caller-file/2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
@@ -5955,6 +3660,7 @@ packages:
   /get-package-type/0.1.0:
     resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
     engines: {node: '>=8.0.0'}
+    dev: false
 
   /get-stream/6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
@@ -6010,6 +3716,16 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
+  /glob/9.2.1:
+    resolution: {integrity: sha512-Pxxgq3W0HyA3XUvSXcFhRSs+43Jsx0ddxcFrbjxNGkL2Ak5BAUBxLqI5G6ADDeCHLfzzXFhe0b1yYcctGmytMA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      fs.realpath: 1.0.0
+      minimatch: 7.4.2
+      minipass: 4.2.4
+      path-scurry: 1.6.1
+    dev: true
+
   /globals/11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
@@ -6116,6 +3832,7 @@ packages:
 
   /html-escaper/2.0.2:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+    dev: false
 
   /http-proxy-agent/5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
@@ -6141,6 +3858,7 @@ packages:
   /human-signals/2.1.0:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
     engines: {node: '>=10.17.0'}
+    dev: false
 
   /human-signals/3.0.1:
     resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==}
@@ -6198,6 +3916,7 @@ packages:
     dependencies:
       pkg-dir: 4.2.0
       resolve-cwd: 3.0.0
+    dev: false
 
   /imurmurhash/0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
@@ -6303,6 +4022,7 @@ packages:
   /is-generator-fn/2.1.0:
     resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
     engines: {node: '>=6'}
+    dev: false
 
   /is-glob/4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
@@ -6350,6 +4070,7 @@ packages:
   /is-stream/2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
+    dev: false
 
   /is-stream/3.0.0:
     resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
@@ -6398,6 +4119,7 @@ packages:
   /istanbul-lib-coverage/3.2.0:
     resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
     engines: {node: '>=8'}
+    dev: false
 
   /istanbul-lib-instrument/5.2.0:
     resolution: {integrity: sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==}
@@ -6410,6 +4132,7 @@ packages:
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /istanbul-lib-report/3.0.0:
     resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
@@ -6418,6 +4141,7 @@ packages:
       istanbul-lib-coverage: 3.2.0
       make-dir: 3.1.0
       supports-color: 7.2.0
+    dev: false
 
   /istanbul-lib-source-maps/4.0.1:
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
@@ -6428,6 +4152,7 @@ packages:
       source-map: 0.6.1
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /istanbul-reports/3.1.4:
     resolution: {integrity: sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==}
@@ -6435,6 +4160,7 @@ packages:
     dependencies:
       html-escaper: 2.0.2
       istanbul-lib-report: 3.0.0
+    dev: false
 
   /iterare/1.2.1:
     resolution: {integrity: sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==}
@@ -6452,41 +4178,44 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /jest-changed-files/29.0.0:
-    resolution: {integrity: sha512-28/iDMDrUpGoCitTURuDqUzWQoWmOmOKOFST1mi2lwh62X4BFf6khgH3uSuo1e49X/UDjuApAj3w0wLOex4VPQ==}
+  /jest-changed-files/29.5.0:
+    resolution: {integrity: sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       execa: 5.1.1
       p-limit: 3.1.0
+    dev: false
 
-  /jest-circus/29.0.3:
-    resolution: {integrity: sha512-QeGzagC6Hw5pP+df1+aoF8+FBSgkPmraC1UdkeunWh0jmrp7wC0Hr6umdUAOELBQmxtKAOMNC3KAdjmCds92Zg==}
+  /jest-circus/29.5.0:
+    resolution: {integrity: sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.0.3
-      '@jest/expect': 29.0.3
-      '@jest/test-result': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/environment': 29.5.0
+      '@jest/expect': 29.5.0
+      '@jest/test-result': 29.5.0
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
       is-generator-fn: 2.1.0
-      jest-each: 29.0.3
-      jest-matcher-utils: 29.0.3
-      jest-message-util: 29.0.3
-      jest-runtime: 29.0.3
-      jest-snapshot: 29.0.3
-      jest-util: 29.0.3
+      jest-each: 29.5.0
+      jest-matcher-utils: 29.5.0
+      jest-message-util: 29.5.0
+      jest-runtime: 29.5.0
+      jest-snapshot: 29.5.0
+      jest-util: 29.5.0
       p-limit: 3.1.0
-      pretty-format: 29.0.3
+      pretty-format: 29.5.0
+      pure-rand: 6.0.0
       slash: 3.0.0
       stack-utils: 2.0.5
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /jest-cli/29.0.3_yqiaopbgmqcuvx27p5xxvum6wm:
-    resolution: {integrity: sha512-aUy9Gd/Kut1z80eBzG10jAn6BgS3BoBbXyv+uXEqBJ8wnnuZ5RpNfARoskSrTIy1GY4a8f32YGuCMwibtkl9CQ==}
+  /jest-cli/29.5.0_6m7kcbkkzjz4ln6z66tlzx44we:
+    resolution: {integrity: sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -6495,25 +4224,26 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.0.3_ts-node@10.8.1
-      '@jest/test-result': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/core': 29.5.0_ts-node@10.9.1
+      '@jest/test-result': 29.5.0
+      '@jest/types': 29.5.0
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.10
       import-local: 3.1.0
-      jest-config: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
-      jest-util: 29.0.3
-      jest-validate: 29.0.3
+      jest-config: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
+      jest-util: 29.5.0
+      jest-validate: 29.5.0
       prompts: 2.4.2
       yargs: 17.5.1
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
       - ts-node
+    dev: false
 
-  /jest-config/29.0.3_yqiaopbgmqcuvx27p5xxvum6wm:
-    resolution: {integrity: sha512-U5qkc82HHVYe3fNu2CRXLN4g761Na26rWKf7CjM8LlZB3In1jadEkZdMwsE37rd9RSPV0NfYaCjHdk/gu3v+Ew==}
+  /jest-config/29.5.0_6m7kcbkkzjz4ln6z66tlzx44we:
+    resolution: {integrity: sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@types/node': '*'
@@ -6525,31 +4255,32 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.18.9
-      '@jest/test-sequencer': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/test-sequencer': 29.5.0
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
-      babel-jest: 29.0.3_@babel+core@7.18.9
+      babel-jest: 29.5.0_@babel+core@7.18.9
       chalk: 4.1.2
       ci-info: 3.3.1
       deepmerge: 4.2.2
       glob: 7.2.0
       graceful-fs: 4.2.10
-      jest-circus: 29.0.3
-      jest-environment-node: 29.0.3
-      jest-get-type: 29.0.0
-      jest-regex-util: 29.0.0
-      jest-resolve: 29.0.3
-      jest-runner: 29.0.3
-      jest-util: 29.0.3
-      jest-validate: 29.0.3
+      jest-circus: 29.5.0
+      jest-environment-node: 29.5.0
+      jest-get-type: 29.4.3
+      jest-regex-util: 29.4.3
+      jest-resolve: 29.5.0
+      jest-runner: 29.5.0
+      jest-util: 29.5.0
+      jest-validate: 29.5.0
       micromatch: 4.0.5
       parse-json: 5.2.0
-      pretty-format: 29.0.3
+      pretty-format: 29.5.0
       slash: 3.0.0
       strip-json-comments: 3.1.1
-      ts-node: 10.8.1_seagpw47opwyivxvtfydnuwcuy
+      ts-node: 10.9.1_p45lmeymo45ge573kyxcus632u
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /jest-diff/29.0.3:
     resolution: {integrity: sha512-+X/AIF5G/vX9fWK+Db9bi9BQas7M9oBME7egU7psbn4jlszLFCu0dW63UgeE6cs/GANq4fLaT+8sGHQQ0eCUfg==}
@@ -6557,83 +4288,106 @@ packages:
     dependencies:
       chalk: 4.1.2
       diff-sequences: 29.0.0
-      jest-get-type: 29.0.0
-      pretty-format: 29.0.3
+      jest-get-type: 29.4.3
+      pretty-format: 29.5.0
+
+  /jest-diff/29.5.0:
+    resolution: {integrity: sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      chalk: 4.1.2
+      diff-sequences: 29.4.3
+      jest-get-type: 29.4.3
+      pretty-format: 29.5.0
+    dev: false
 
-  /jest-docblock/29.0.0:
-    resolution: {integrity: sha512-s5Kpra/kLzbqu9dEjov30kj1n4tfu3e7Pl8v+f8jOkeWNqM6Ds8jRaJfZow3ducoQUrf2Z4rs2N5S3zXnb83gw==}
+  /jest-docblock/29.4.3:
+    resolution: {integrity: sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       detect-newline: 3.1.0
+    dev: false
 
-  /jest-each/29.0.3:
-    resolution: {integrity: sha512-wILhZfESURHHBNvPMJ0lZlYZrvOQJxAo3wNHi+ycr90V7M+uGR9Gh4+4a/BmaZF0XTyZsk4OiYEf3GJN7Ltqzg==}
+  /jest-each/29.5.0:
+    resolution: {integrity: sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.0.3
+      '@jest/types': 29.5.0
       chalk: 4.1.2
-      jest-get-type: 29.0.0
-      jest-util: 29.0.3
-      pretty-format: 29.0.3
+      jest-get-type: 29.4.3
+      jest-util: 29.5.0
+      pretty-format: 29.5.0
+    dev: false
 
-  /jest-environment-jsdom/29.0.3:
-    resolution: {integrity: sha512-KIGvpm12c71hoYTjL4wC2c8K6KfhOHJqJtaHc1IApu5rG047YWZoEP13BlbucWfzGISBrmli8KFqdhdQEa8Wnw==}
+  /jest-environment-jsdom/29.5.0:
+    resolution: {integrity: sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      canvas: ^2.5.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
     dependencies:
-      '@jest/environment': 29.0.3
-      '@jest/fake-timers': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/environment': 29.5.0
+      '@jest/fake-timers': 29.5.0
+      '@jest/types': 29.5.0
       '@types/jsdom': 20.0.0
       '@types/node': 16.11.7
-      jest-mock: 29.0.3
-      jest-util: 29.0.3
+      jest-mock: 29.5.0
+      jest-util: 29.5.0
       jsdom: 20.0.0
     transitivePeerDependencies:
       - bufferutil
-      - canvas
       - supports-color
       - utf-8-validate
     dev: true
 
-  /jest-environment-node/29.0.3:
-    resolution: {integrity: sha512-cdZqRCnmIlTXC+9vtvmfiY/40Cj6s2T0czXuq1whvQdmpzAnj4sbqVYuZ4zFHk766xTTJ+Ij3uUqkk8KCfXoyg==}
+  /jest-environment-node/29.5.0:
+    resolution: {integrity: sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.0.3
-      '@jest/fake-timers': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/environment': 29.5.0
+      '@jest/fake-timers': 29.5.0
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
-      jest-mock: 29.0.3
-      jest-util: 29.0.3
+      jest-mock: 29.5.0
+      jest-util: 29.5.0
+    dev: false
 
   /jest-get-type/29.0.0:
     resolution: {integrity: sha512-83X19z/HuLKYXYHskZlBAShO7UfLFXu/vWajw9ZNJASN32li8yHMaVGAQqxFW1RCFOkB7cubaL6FaJVQqqJLSw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /jest-haste-map/29.0.3:
-    resolution: {integrity: sha512-uMqR99+GuBHo0RjRhOE4iA6LmsxEwRdgiIAQgMU/wdT2XebsLDz5obIwLZm/Psj+GwSEQhw9AfAVKGYbh2G55A==}
+  /jest-get-type/29.4.3:
+    resolution: {integrity: sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+
+  /jest-haste-map/29.5.0:
+    resolution: {integrity: sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.0.3
+      '@jest/types': 29.5.0
       '@types/graceful-fs': 4.1.5
       '@types/node': 16.11.7
       anymatch: 3.1.2
       fb-watchman: 2.0.1
       graceful-fs: 4.2.10
-      jest-regex-util: 29.0.0
-      jest-util: 29.0.3
-      jest-worker: 29.0.3
+      jest-regex-util: 29.4.3
+      jest-util: 29.5.0
+      jest-worker: 29.5.0
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
       fsevents: 2.3.2
+    dev: false
 
-  /jest-leak-detector/29.0.3:
-    resolution: {integrity: sha512-YfW/G63dAuiuQ3QmQlh8hnqLDe25WFY3eQhuc/Ev1AGmkw5zREblTh7TCSKLoheyggu6G9gxO2hY8p9o6xbaRQ==}
+  /jest-leak-detector/29.5.0:
+    resolution: {integrity: sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-get-type: 29.0.0
-      pretty-format: 29.0.3
+      jest-get-type: 29.4.3
+      pretty-format: 29.5.0
+    dev: false
 
   /jest-matcher-utils/29.0.3:
     resolution: {integrity: sha512-RsR1+cZ6p1hDV4GSCQTg+9qjeotQCgkaleIKLK7dm+U4V/H2bWedU3RAtLm8+mANzZ7eDV33dMar4pejd7047w==}
@@ -6642,45 +4396,55 @@ packages:
       chalk: 4.1.2
       jest-diff: 29.0.3
       jest-get-type: 29.0.0
-      pretty-format: 29.0.3
+      pretty-format: 29.5.0
+
+  /jest-matcher-utils/29.5.0:
+    resolution: {integrity: sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 29.5.0
+      jest-get-type: 29.4.3
+      pretty-format: 29.5.0
+    dev: false
 
-  /jest-message-util/28.1.1:
-    resolution: {integrity: sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-message-util/29.0.3:
+    resolution: {integrity: sha512-7T8JiUTtDfppojosORAflABfLsLKMLkBHSWkjNQrjIltGoDzNGn7wEPOSfjqYAGTYME65esQzMJxGDjuLBKdOg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@jest/types': 28.1.1
+      '@jest/types': 29.5.0
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.10
       micromatch: 4.0.5
-      pretty-format: 28.1.1
+      pretty-format: 29.5.0
       slash: 3.0.0
       stack-utils: 2.0.5
-    dev: false
 
-  /jest-message-util/29.0.3:
-    resolution: {integrity: sha512-7T8JiUTtDfppojosORAflABfLsLKMLkBHSWkjNQrjIltGoDzNGn7wEPOSfjqYAGTYME65esQzMJxGDjuLBKdOg==}
+  /jest-message-util/29.5.0:
+    resolution: {integrity: sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@jest/types': 29.0.3
+      '@jest/types': 29.5.0
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.10
       micromatch: 4.0.5
-      pretty-format: 29.0.3
+      pretty-format: 29.5.0
       slash: 3.0.0
       stack-utils: 2.0.5
 
-  /jest-mock/29.0.3:
-    resolution: {integrity: sha512-ort9pYowltbcrCVR43wdlqfAiFJXBx8l4uJDsD8U72LgBcetvEp+Qxj1W9ZYgMRoeAo+ov5cnAGF2B6+Oth+ww==}
+  /jest-mock/29.5.0:
+    resolution: {integrity: sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.0.3
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
+      jest-util: 29.5.0
 
-  /jest-pnp-resolver/1.2.2_jest-resolve@29.0.3:
+  /jest-pnp-resolver/1.2.2_jest-resolve@29.5.0:
     resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
     engines: {node: '>=6'}
     peerDependencies:
@@ -6689,99 +4453,105 @@ packages:
       jest-resolve:
         optional: true
     dependencies:
-      jest-resolve: 29.0.3
-
-  /jest-regex-util/28.0.2:
-    resolution: {integrity: sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+      jest-resolve: 29.5.0
     dev: false
 
   /jest-regex-util/29.0.0:
     resolution: {integrity: sha512-BV7VW7Sy0fInHWN93MMPtlClweYv2qrSCwfeFWmpribGZtQPWNvRSq9XOVgOEjU1iBGRKXUZil0o2AH7Iy9Lug==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dev: false
+
+  /jest-regex-util/29.4.3:
+    resolution: {integrity: sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dev: false
 
-  /jest-resolve-dependencies/29.0.3:
-    resolution: {integrity: sha512-KzuBnXqNvbuCdoJpv8EanbIGObk7vUBNt/PwQPPx2aMhlv/jaXpUJsqWYRpP/0a50faMBY7WFFP8S3/CCzwfDw==}
+  /jest-resolve-dependencies/29.5.0:
+    resolution: {integrity: sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-regex-util: 29.0.0
-      jest-snapshot: 29.0.3
+      jest-regex-util: 29.4.3
+      jest-snapshot: 29.5.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /jest-resolve/29.0.3:
-    resolution: {integrity: sha512-toVkia85Y/BPAjJasTC9zIPY6MmVXQPtrCk8SmiheC4MwVFE/CMFlOtMN6jrwPMC6TtNh8+sTMllasFeu1wMPg==}
+  /jest-resolve/29.5.0:
+    resolution: {integrity: sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
       graceful-fs: 4.2.10
-      jest-haste-map: 29.0.3
-      jest-pnp-resolver: 1.2.2_jest-resolve@29.0.3
-      jest-util: 29.0.3
-      jest-validate: 29.0.3
+      jest-haste-map: 29.5.0
+      jest-pnp-resolver: 1.2.2_jest-resolve@29.5.0
+      jest-util: 29.5.0
+      jest-validate: 29.5.0
       resolve: 1.22.1
-      resolve.exports: 1.1.0
+      resolve.exports: 2.0.1
       slash: 3.0.0
+    dev: false
 
-  /jest-runner/29.0.3:
-    resolution: {integrity: sha512-Usu6VlTOZlCZoNuh3b2Tv/yzDpKqtiNAetG9t3kJuHfUyVMNW7ipCCJOUojzKkjPoaN7Bl1f7Buu6PE0sGpQxw==}
+  /jest-runner/29.5.0:
+    resolution: {integrity: sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.0.3
-      '@jest/environment': 29.0.3
-      '@jest/test-result': 29.0.3
-      '@jest/transform': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/console': 29.5.0
+      '@jest/environment': 29.5.0
+      '@jest/test-result': 29.5.0
+      '@jest/transform': 29.5.0
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
       chalk: 4.1.2
-      emittery: 0.10.2
+      emittery: 0.13.1
       graceful-fs: 4.2.10
-      jest-docblock: 29.0.0
-      jest-environment-node: 29.0.3
-      jest-haste-map: 29.0.3
-      jest-leak-detector: 29.0.3
-      jest-message-util: 29.0.3
-      jest-resolve: 29.0.3
-      jest-runtime: 29.0.3
-      jest-util: 29.0.3
-      jest-watcher: 29.0.3
-      jest-worker: 29.0.3
+      jest-docblock: 29.4.3
+      jest-environment-node: 29.5.0
+      jest-haste-map: 29.5.0
+      jest-leak-detector: 29.5.0
+      jest-message-util: 29.5.0
+      jest-resolve: 29.5.0
+      jest-runtime: 29.5.0
+      jest-util: 29.5.0
+      jest-watcher: 29.5.0
+      jest-worker: 29.5.0
       p-limit: 3.1.0
       source-map-support: 0.5.13
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /jest-runtime/29.0.3:
-    resolution: {integrity: sha512-12gZXRQ7ozEeEHKTY45a+YLqzNDR/x4c//X6AqwKwKJPpWM8FY4vwn4VQJOcLRS3Nd1fWwgP7LU4SoynhuUMHQ==}
+  /jest-runtime/29.5.0:
+    resolution: {integrity: sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.0.3
-      '@jest/fake-timers': 29.0.3
-      '@jest/globals': 29.0.3
-      '@jest/source-map': 29.0.0
-      '@jest/test-result': 29.0.3
-      '@jest/transform': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/environment': 29.5.0
+      '@jest/fake-timers': 29.5.0
+      '@jest/globals': 29.5.0
+      '@jest/source-map': 29.4.3
+      '@jest/test-result': 29.5.0
+      '@jest/transform': 29.5.0
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
       glob: 7.2.0
       graceful-fs: 4.2.10
-      jest-haste-map: 29.0.3
-      jest-message-util: 29.0.3
-      jest-mock: 29.0.3
-      jest-regex-util: 29.0.0
-      jest-resolve: 29.0.3
-      jest-snapshot: 29.0.3
-      jest-util: 29.0.3
+      jest-haste-map: 29.5.0
+      jest-message-util: 29.5.0
+      jest-mock: 29.5.0
+      jest-regex-util: 29.4.3
+      jest-resolve: 29.5.0
+      jest-snapshot: 29.5.0
+      jest-util: 29.5.0
       slash: 3.0.0
       strip-bom: 4.0.0
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
-  /jest-snapshot/29.0.3:
-    resolution: {integrity: sha512-52q6JChm04U3deq+mkQ7R/7uy7YyfVIrebMi6ZkBoDJ85yEjm/sJwdr1P0LOIEHmpyLlXrxy3QP0Zf5J2kj0ew==}
+  /jest-snapshot/29.5.0:
+    resolution: {integrity: sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/core': 7.18.9
@@ -6790,26 +4560,26 @@ packages:
       '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.9
       '@babel/traverse': 7.18.9
       '@babel/types': 7.18.9
-      '@jest/expect-utils': 29.0.3
-      '@jest/transform': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/expect-utils': 29.5.0
+      '@jest/transform': 29.5.0
+      '@jest/types': 29.5.0
       '@types/babel__traverse': 7.17.1
       '@types/prettier': 2.6.3
       babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.9
       chalk: 4.1.2
-      expect: 29.0.3
+      expect: 29.5.0
       graceful-fs: 4.2.10
-      jest-diff: 29.0.3
-      jest-get-type: 29.0.0
-      jest-haste-map: 29.0.3
-      jest-matcher-utils: 29.0.3
-      jest-message-util: 29.0.3
-      jest-util: 29.0.3
+      jest-diff: 29.5.0
+      jest-get-type: 29.4.3
+      jest-matcher-utils: 29.5.0
+      jest-message-util: 29.5.0
+      jest-util: 29.5.0
       natural-compare: 1.4.0
-      pretty-format: 29.0.3
+      pretty-format: 29.5.0
       semver: 7.3.7
     transitivePeerDependencies:
       - supports-color
+    dev: false
 
   /jest-sonar-reporter/2.0.0:
     resolution: {integrity: sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==}
@@ -6818,103 +4588,106 @@ packages:
       xml: 1.0.1
     dev: true
 
-  /jest-styled-components/7.0.8_styled-components@5.3.1:
-    resolution: {integrity: sha512-0KE54d0yIzKcvtOv8eikyjG3rFRtKYUyQovaoha3nondtZzXYGB3bhsvYgEegU08Iry0ndWx2+g9f5ZzD4I+0Q==}
+  /jest-styled-components/7.1.1_styled-components@5.3.1:
+    resolution: {integrity: sha512-OUq31R5CivBF8oy81dnegNQrRW13TugMol/Dz6ZnFfEyo03exLASod7YGwyHGuayYlKmCstPtz0RQ1+NrAbIIA==}
     engines: {node: '>= 12'}
     peerDependencies:
       styled-components: '>= 5'
     dependencies:
-      css: 3.0.0
+      '@adobe/css-tools': 4.2.0
       styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
     dev: true
 
-  /jest-util/28.1.1:
-    resolution: {integrity: sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-util/29.0.3:
+    resolution: {integrity: sha512-Q0xaG3YRG8QiTC4R6fHjHQPaPpz9pJBEi0AeOE4mQh/FuWOijFjGXMMOfQEaU9i3z76cNR7FobZZUQnL6IyfdQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 28.1.1
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
       chalk: 4.1.2
       ci-info: 3.3.1
       graceful-fs: 4.2.10
       picomatch: 2.3.1
-    dev: false
 
-  /jest-util/29.0.3:
-    resolution: {integrity: sha512-Q0xaG3YRG8QiTC4R6fHjHQPaPpz9pJBEi0AeOE4mQh/FuWOijFjGXMMOfQEaU9i3z76cNR7FobZZUQnL6IyfdQ==}
+  /jest-util/29.5.0:
+    resolution: {integrity: sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.0.3
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
       chalk: 4.1.2
       ci-info: 3.3.1
       graceful-fs: 4.2.10
       picomatch: 2.3.1
 
-  /jest-validate/29.0.3:
-    resolution: {integrity: sha512-OebiqqT6lK8cbMPtrSoS3aZP4juID762lZvpf1u+smZnwTEBCBInan0GAIIhv36MxGaJvmq5uJm7dl5gVt+Zrw==}
+  /jest-validate/29.5.0:
+    resolution: {integrity: sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.0.3
+      '@jest/types': 29.5.0
       camelcase: 6.3.0
       chalk: 4.1.2
-      jest-get-type: 29.0.0
+      jest-get-type: 29.4.3
       leven: 3.1.0
-      pretty-format: 29.0.3
+      pretty-format: 29.5.0
+    dev: false
 
-  /jest-watch-typeahead/2.0.0_jest@29.0.3:
-    resolution: {integrity: sha512-LX/jrTNkOIZV1n7fnEWlKJ73lhVPKF9B6F0L7pbje3xNPw1NddPLn0n8EFt7YwbCnC0+vlLylp7JehV6M06J6Q==}
+  /jest-watch-typeahead/2.2.2_jest@29.5.0:
+    resolution: {integrity: sha512-+QgOFW4o5Xlgd6jGS5X37i08tuuXNW8X0CV9WNFi+3n8ExCIP+E1melYhvYLjv5fE6D0yyzk74vsSO8I6GqtvQ==}
     engines: {node: ^14.17.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
-      jest: ^27.0.0 || ^28.0.0
+      jest: ^27.0.0 || ^28.0.0 || ^29.0.0
     dependencies:
-      ansi-escapes: 5.0.0
-      chalk: 4.1.2
-      jest: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
-      jest-regex-util: 28.0.2
-      jest-watcher: 28.1.1
-      slash: 4.0.0
+      ansi-escapes: 6.0.0
+      chalk: 5.2.0
+      jest: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
+      jest-regex-util: 29.0.0
+      jest-watcher: 29.0.3
+      slash: 5.0.0
       string-length: 5.0.1
       strip-ansi: 7.0.1
     dev: false
 
-  /jest-watcher/28.1.1:
-    resolution: {integrity: sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /jest-watcher/29.0.3:
+    resolution: {integrity: sha512-tQX9lU91A+9tyUQKUMp0Ns8xAcdhC9fo73eqA3LFxP2bSgiF49TNcc+vf3qgGYYK9qRjFpXW9+4RgF/mbxyOOw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 28.1.1
-      '@jest/types': 28.1.1
+      '@jest/test-result': 29.0.3
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.10.2
-      jest-util: 28.1.1
+      jest-util: 29.5.0
       string-length: 4.0.2
     dev: false
 
-  /jest-watcher/29.0.3:
-    resolution: {integrity: sha512-tQX9lU91A+9tyUQKUMp0Ns8xAcdhC9fo73eqA3LFxP2bSgiF49TNcc+vf3qgGYYK9qRjFpXW9+4RgF/mbxyOOw==}
+  /jest-watcher/29.5.0:
+    resolution: {integrity: sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.0.3
-      '@jest/types': 29.0.3
+      '@jest/test-result': 29.5.0
+      '@jest/types': 29.5.0
       '@types/node': 16.11.7
       ansi-escapes: 4.3.2
       chalk: 4.1.2
-      emittery: 0.10.2
-      jest-util: 29.0.3
+      emittery: 0.13.1
+      jest-util: 29.5.0
       string-length: 4.0.2
+    dev: false
 
-  /jest-worker/29.0.3:
-    resolution: {integrity: sha512-Tl/YWUugQOjoTYwjKdfJWkSOfhufJHO5LhXTSZC3TRoQKO+fuXnZAdoXXBlpLXKGODBL3OvdUasfDD4PcMe6ng==}
+  /jest-worker/29.5.0:
+    resolution: {integrity: sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@types/node': 16.11.7
+      jest-util: 29.5.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
+    dev: false
 
-  /jest/29.0.3_yqiaopbgmqcuvx27p5xxvum6wm:
-    resolution: {integrity: sha512-ElgUtJBLgXM1E8L6K1RW1T96R897YY/3lRYqq9uVcPWtP2AAl/nQ16IYDh/FzQOOQ12VEuLdcPU83mbhG2C3PQ==}
+  /jest/29.5.0_6m7kcbkkzjz4ln6z66tlzx44we:
+    resolution: {integrity: sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -6923,14 +4696,15 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.0.3_ts-node@10.8.1
-      '@jest/types': 29.0.3
+      '@jest/core': 29.5.0_ts-node@10.9.1
+      '@jest/types': 29.5.0
       import-local: 3.1.0
-      jest-cli: 29.0.3_yqiaopbgmqcuvx27p5xxvum6wm
+      jest-cli: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
       - ts-node
+    dev: false
 
   /js-tokens/4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
@@ -6941,6 +4715,7 @@ packages:
     dependencies:
       argparse: 1.0.10
       esprima: 4.0.1
+    dev: false
 
   /js-yaml/4.1.0:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
@@ -6991,11 +4766,6 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jsesc/0.5.0:
-    resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
-    hasBin: true
-    dev: true
-
   /jsesc/2.5.2:
     resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
     engines: {node: '>=4'}
@@ -7077,6 +4847,7 @@ packages:
   /kleur/3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
+    dev: false
 
   /language-subtag-registry/0.3.21:
     resolution: {integrity: sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==}
@@ -7091,6 +4862,7 @@ packages:
   /leven/3.1.0:
     resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
     engines: {node: '>=6'}
+    dev: false
 
   /levn/0.3.0:
     resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
@@ -7171,15 +4943,8 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       p-locate: 4.1.0
-
-  /lodash-es/4.17.21:
-    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
-  /lodash.debounce/4.0.8:
-    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
-    dev: true
-
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: false
@@ -7229,6 +4994,11 @@ packages:
     dependencies:
       yallist: 4.0.0
 
+  /lru-cache/7.18.3:
+    resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
+    engines: {node: '>=12'}
+    dev: true
+
   /lz-string/1.4.4:
     resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
     hasBin: true
@@ -7238,6 +5008,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       semver: 6.3.0
+    dev: false
 
   /make-error/1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -7246,6 +5017,7 @@ packages:
     resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
     dependencies:
       tmpl: 1.0.5
+    dev: false
 
   /merge-stream/2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
@@ -7300,10 +5072,22 @@ packages:
       brace-expansion: 2.0.1
     dev: true
 
+  /minimatch/7.4.2:
+    resolution: {integrity: sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==}
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
   /minimist/1.2.6:
     resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==}
     dev: true
 
+  /minipass/4.2.4:
+    resolution: {integrity: sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==}
+    engines: {node: '>=8'}
+    dev: true
+
   /mkdirp/1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
     engines: {node: '>=10'}
@@ -7325,10 +5109,6 @@ packages:
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
-  /nanoclone/0.2.1:
-    resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==}
-    dev: false
-
   /nanoid/3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -7351,9 +5131,11 @@ packages:
 
   /node-int64/0.4.0:
     resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
+    dev: false
 
   /node-releases/2.0.5:
     resolution: {integrity: sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==}
+    dev: false
 
   /normalize-path/3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
@@ -7364,6 +5146,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       path-key: 3.1.1
+    dev: false
 
   /npm-run-path/5.1.0:
     resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
@@ -7527,12 +5310,14 @@ packages:
     engines: {node: '>=6'}
     dependencies:
       p-try: 2.2.0
+    dev: false
 
   /p-limit/3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
     dependencies:
       yocto-queue: 0.1.0
+    dev: false
 
   /p-locate/2.0.0:
     resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==}
@@ -7546,6 +5331,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       p-limit: 2.3.0
+    dev: false
 
   /p-map/4.0.0:
     resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
@@ -7562,6 +5348,7 @@ packages:
   /p-try/2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
+    dev: false
 
   /parent-module/1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
@@ -7602,6 +5389,7 @@ packages:
   /path-exists/4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
+    dev: false
 
   /path-is-absolute/1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
@@ -7619,6 +5407,14 @@ packages:
   /path-parse/1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
+  /path-scurry/1.6.1:
+    resolution: {integrity: sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==}
+    engines: {node: '>=14'}
+    dependencies:
+      lru-cache: 7.18.3
+      minipass: 4.2.4
+    dev: true
+
   /path-to-regexp/2.4.0:
     resolution: {integrity: sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==}
     dev: false
@@ -7648,12 +5444,14 @@ packages:
   /pirates/4.0.5:
     resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
     engines: {node: '>= 6'}
+    dev: false
 
   /pkg-dir/4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
     dependencies:
       find-up: 4.1.0
+    dev: false
 
   /postcss-value-parser/4.1.0:
     resolution: {integrity: sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==}
@@ -7683,8 +5481,8 @@ packages:
       fast-diff: 1.2.0
     dev: true
 
-  /prettier/2.5.1:
-    resolution: {integrity: sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==}
+  /prettier/2.8.4:
+    resolution: {integrity: sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     dev: true
@@ -7697,21 +5495,19 @@ packages:
       ansi-styles: 5.2.0
       react-is: 17.0.2
 
-  /pretty-format/28.1.1:
-    resolution: {integrity: sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
+  /pretty-format/29.0.3:
+    resolution: {integrity: sha512-cHudsvQr1K5vNVLbvYF/nv3Qy/F/BcEKxGuIeMiVMRHxPOO1RxXooP8g/ZrwAp7Dx+KdMZoOc7NxLHhMrP2f9Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 28.0.2
-      ansi-regex: 5.0.1
+      '@jest/schemas': 29.0.0
       ansi-styles: 5.2.0
       react-is: 18.2.0
-    dev: false
 
-  /pretty-format/29.0.3:
-    resolution: {integrity: sha512-cHudsvQr1K5vNVLbvYF/nv3Qy/F/BcEKxGuIeMiVMRHxPOO1RxXooP8g/ZrwAp7Dx+KdMZoOc7NxLHhMrP2f9Q==}
+  /pretty-format/29.5.0:
+    resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.0.0
+      '@jest/schemas': 29.4.3
       ansi-styles: 5.2.0
       react-is: 18.2.0
 
@@ -7728,6 +5524,7 @@ packages:
     dependencies:
       kleur: 3.0.3
       sisteransi: 1.0.5
+    dev: false
 
   /prop-types/15.8.1:
     resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
@@ -7736,8 +5533,8 @@ packages:
       object-assign: 4.1.1
       react-is: 16.13.1
 
-  /property-expr/2.0.4:
-    resolution: {integrity: sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg==}
+  /property-expr/2.0.5:
+    resolution: {integrity: sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==}
     dev: false
 
   /psl/1.8.0:
@@ -7748,6 +5545,10 @@ packages:
     resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
     engines: {node: '>=6'}
 
+  /pure-rand/6.0.0:
+    resolution: {integrity: sha512-rLSBxJjP+4DQOgcJAx6RZHT2he2pkhQdSnofG5VWyVl6GRq/K02ISOuOLcsMOrtKDIJb8JN2zm3FFzWNbezdPw==}
+    dev: false
+
   /querystring/0.2.1:
     resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==}
     engines: {node: '>=0.4.x'}
@@ -7773,8 +5574,8 @@ packages:
       react-dom: 18.1.0_react@18.1.0
     dev: false
 
-  /react-datepicker/4.8.0_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-u69zXGHMpxAa4LeYR83vucQoUCJQ6m/WBsSxmUMu/M8ahTSVMMyiyQzauHgZA2NUr9y0FUgOAix71hGYUb6tvg==}
+  /react-datepicker/4.10.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-6IfBCZyWj54ZZGLmEZJ9c4Yph0s9MVfEGDC2evOvf9AmVz+RRcfP2Czqad88Ff9wREbcbqa4dk7IFYeXF1d3Ag==}
     peerDependencies:
       react: ^16.9.0 || ^17 || ^18
       react-dom: ^16.9.0 || ^17 || ^18
@@ -7785,8 +5586,8 @@ packages:
       prop-types: 15.8.1
       react: 18.1.0
       react-dom: 18.1.0_react@18.1.0
-      react-onclickoutside: 6.12.1_ef5jwxihqo6n7gxfmzogljlgcm
-      react-popper: 2.2.5_kse2oiarfsejvukvxwgibirnca
+      react-onclickoutside: 6.12.2_ef5jwxihqo6n7gxfmzogljlgcm
+      react-popper: 2.3.0_7hirfqu277ous3575tvkbri6ie
     dev: false
 
   /react-dom/18.1.0_react@18.1.0:
@@ -7811,16 +5612,17 @@ packages:
   /react-fast-compare/3.2.0:
     resolution: {integrity: sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==}
 
-  /react-hook-form/7.6.9_react@18.1.0:
-    resolution: {integrity: sha512-nz+btC4WFIm3zPBjw22K3t9nnJtlMMwj8slcbPYoTKlkSVA5l+q3Ai+VF0YzeRi7vbyyeGQvpyibov1xd/TV7A==}
+  /react-hook-form/7.43.1_react@18.1.0:
+    resolution: {integrity: sha512-+s3+s8LLytRMriwwuSqeLStVjRXFGxgjjx2jED7Z+wz1J/88vpxieRQGvJVvzrzVxshZ0BRuocFERb779m2kNg==}
+    engines: {node: '>=12.22.0'}
     peerDependencies:
-      react: ^16.8.0 || ^17
+      react: ^16.8.0 || ^17 || ^18
     dependencies:
       react: 18.1.0
     dev: false
 
-  /react-hot-toast/2.3.0_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-/RxV+bfjld7tSJR1SCLzMAXgFuNW7fCpK6+vbYqfmbGSWcqTMz2rizrvfWKvtcPH5HK0NqxmBaC5SrAy1F42zA==}
+  /react-hot-toast/2.4.0_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-qnnVbXropKuwUpriVVosgo8QrB+IaPJCpL8oBI6Ov84uvHZ5QQcTp2qg6ku2wNfgJl6rlQXJIQU5q+5lmPOutA==}
     engines: {node: '>=10'}
     peerDependencies:
       react: '>=16'
@@ -7852,11 +5654,11 @@ packages:
       react-dom: 18.1.0_react@18.1.0
     dev: false
 
-  /react-onclickoutside/6.12.1_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==}
+  /react-onclickoutside/6.12.2_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-NMXGa223OnsrGVp5dJHkuKxQ4czdLmXSp5jSV9OqiCky9LOpPATn3vLldc+q5fK3gKbEHvr7J1u0yhBh/xYkpA==}
     peerDependencies:
-      react: ^15.5.x || ^16.x || ^17.x
-      react-dom: ^15.5.x || ^16.x || ^17.x
+      react: ^15.5.x || ^16.x || ^17.x || ^18.x
+      react-dom: ^15.5.x || ^16.x || ^17.x || ^18.x
     dependencies:
       react: 18.1.0
       react-dom: 18.1.0_react@18.1.0
@@ -7872,6 +5674,21 @@ packages:
       react: 18.1.0
       react-fast-compare: 3.2.0
       warning: 4.0.3
+    dev: true
+
+  /react-popper/2.3.0_7hirfqu277ous3575tvkbri6ie:
+    resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==}
+    peerDependencies:
+      '@popperjs/core': ^2.0.0
+      react: ^16.8.0 || ^17 || ^18
+      react-dom: ^16.8.0 || ^17 || ^18
+    dependencies:
+      '@popperjs/core': 2.9.2
+      react: 18.1.0
+      react-dom: 18.1.0_react@18.1.0
+      react-fast-compare: 3.2.0
+      warning: 4.0.3
+    dev: false
 
   /react-redux/8.0.2_nfqigfgwurfoimtkde74cji6ga:
     resolution: {integrity: sha512-nBwiscMw3NoP59NFCXFf02f8xdo+vSHT/uZ1ldDwF7XaTpzm+Phk97VT4urYBl5TYAPNVaFm12UHAEyzkpNzRA==}
@@ -7985,26 +5802,9 @@ packages:
     resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==}
     dev: true
 
-  /regenerate-unicode-properties/10.0.1:
-    resolution: {integrity: sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==}
-    engines: {node: '>=4'}
-    dependencies:
-      regenerate: 1.4.2
-    dev: true
-
-  /regenerate/1.4.2:
-    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
-    dev: true
-
   /regenerator-runtime/0.13.7:
     resolution: {integrity: sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==}
 
-  /regenerator-transform/0.15.0:
-    resolution: {integrity: sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==}
-    dependencies:
-      '@babel/runtime': 7.17.9
-    dev: true
-
   /regexp.prototype.flags/1.4.3:
     resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
     engines: {node: '>= 0.4'}
@@ -8019,29 +5819,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /regexpu-core/5.0.1:
-    resolution: {integrity: sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==}
-    engines: {node: '>=4'}
-    dependencies:
-      regenerate: 1.4.2
-      regenerate-unicode-properties: 10.0.1
-      regjsgen: 0.6.0
-      regjsparser: 0.8.4
-      unicode-match-property-ecmascript: 2.0.0
-      unicode-match-property-value-ecmascript: 2.0.0
-    dev: true
-
-  /regjsgen/0.6.0:
-    resolution: {integrity: sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==}
-    dev: true
-
-  /regjsparser/0.8.4:
-    resolution: {integrity: sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==}
-    hasBin: true
-    dependencies:
-      jsesc: 0.5.0
-    dev: true
-
   /require-directory/2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -8065,6 +5842,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       resolve-from: 5.0.0
+    dev: false
 
   /resolve-from/4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
@@ -8074,10 +5852,12 @@ packages:
   /resolve-from/5.0.0:
     resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
     engines: {node: '>=8'}
+    dev: false
 
-  /resolve.exports/1.1.0:
-    resolution: {integrity: sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==}
+  /resolve.exports/2.0.1:
+    resolution: {integrity: sha512-OEJWVeimw8mgQuj3HfkNl4KqRevH7lzeQNaWRPfx0PPse7Jk6ozcsG4FKVgtzDsC1KUF+YlTHh17NcgHOPykLw==}
     engines: {node: '>=10'}
+    dev: false
 
   /resolve/1.22.0:
     resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==}
@@ -8127,6 +5907,14 @@ packages:
       glob: 7.2.0
     dev: true
 
+  /rimraf/4.3.1:
+    resolution: {integrity: sha512-GfHJHBzFQra23IxDzIdBqhOWfbtdgS1/dCHrDy+yvhpoJY5TdwdT28oWaHWfRpKFDLd3GZnGTx6Mlt4+anbsxQ==}
+    engines: {node: '>=14'}
+    hasBin: true
+    dependencies:
+      glob: 9.2.1
+    dev: true
+
   /rollup/3.7.3:
     resolution: {integrity: sha512-7e68MQbAWCX6mI4/0lG1WHd+NdNAlVamg0Zkd+8LZ/oXojligdGnCNyHlzXqXCZObyjs5FRc3AH0b17iJESGIQ==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
@@ -8155,11 +5943,12 @@ packages:
   /rxjs/7.5.5:
     resolution: {integrity: sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==}
     dependencies:
-      tslib: 2.3.1
+      tslib: 2.4.0
     dev: true
 
   /safe-buffer/5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+    dev: false
 
   /safe-buffer/5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
@@ -8194,11 +5983,6 @@ packages:
     resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
     hasBin: true
 
-  /semver/7.0.0:
-    resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==}
-    hasBin: true
-    dev: true
-
   /semver/7.3.7:
     resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==}
     engines: {node: '>=10'}
@@ -8232,6 +6016,7 @@ packages:
 
   /sisteransi/1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+    dev: false
 
   /slash/3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
@@ -8240,6 +6025,12 @@ packages:
   /slash/4.0.0:
     resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
     engines: {node: '>=12'}
+    dev: true
+
+  /slash/5.0.0:
+    resolution: {integrity: sha512-n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ==}
+    engines: {node: '>=14.16'}
+    dev: false
 
   /slice-ansi/3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
@@ -8271,19 +6062,12 @@ packages:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
 
-  /source-map-resolve/0.6.0:
-    resolution: {integrity: sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==}
-    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
-    dependencies:
-      atob: 2.1.2
-      decode-uri-component: 0.2.0
-    dev: true
-
   /source-map-support/0.5.13:
     resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
+    dev: false
 
   /source-map/0.6.1:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
@@ -8295,6 +6079,7 @@ packages:
 
   /sprintf-js/1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+    dev: false
 
   /stack-utils/2.0.5:
     resolution: {integrity: sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==}
@@ -8313,6 +6098,7 @@ packages:
     dependencies:
       char-regex: 1.0.2
       strip-ansi: 6.0.1
+    dev: false
 
   /string-length/5.0.1:
     resolution: {integrity: sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==}
@@ -8322,10 +6108,6 @@ packages:
       strip-ansi: 7.0.1
     dev: false
 
-  /string-natural-compare/3.0.1:
-    resolution: {integrity: sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==}
-    dev: true
-
   /string-width/4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
@@ -8398,10 +6180,12 @@ packages:
   /strip-bom/4.0.0:
     resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
     engines: {node: '>=8'}
+    dev: false
 
   /strip-final-newline/2.0.0:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
     engines: {node: '>=6'}
+    dev: false
 
   /strip-final-newline/3.0.0:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
@@ -8459,13 +6243,6 @@ packages:
     dependencies:
       has-flag: 4.0.0
 
-  /supports-hyperlinks/2.2.0:
-    resolution: {integrity: sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      has-flag: 4.0.0
-      supports-color: 7.2.0
-
   /supports-preserve-symlinks-flag/1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
@@ -8491,13 +6268,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /terminal-link/2.1.1:
-    resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-escapes: 4.3.2
-      supports-hyperlinks: 2.2.0
-
   /test-exclude/6.0.0:
     resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
     engines: {node: '>=8'}
@@ -8505,6 +6275,7 @@ packages:
       '@istanbuljs/schema': 0.1.3
       glob: 7.2.0
       minimatch: 3.1.2
+    dev: false
 
   /text-table/0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
@@ -8514,6 +6285,10 @@ packages:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
 
+  /tiny-case/1.0.3:
+    resolution: {integrity: sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==}
+    dev: false
+
   /tiny-glob/0.2.9:
     resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
     dependencies:
@@ -8530,6 +6305,7 @@ packages:
 
   /tmpl/1.0.5:
     resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+    dev: false
 
   /to-fast-properties/2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
@@ -8588,8 +6364,8 @@ packages:
       code-block-writer: 11.0.1
     dev: true
 
-  /ts-node/10.8.1_seagpw47opwyivxvtfydnuwcuy:
-    resolution: {integrity: sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==}
+  /ts-node/10.9.1_p45lmeymo45ge573kyxcus632u:
+    resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
       '@swc/core': '>=1.2.50'
@@ -8603,7 +6379,7 @@ packages:
         optional: true
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
-      '@swc/core': 1.3.22
+      '@swc/core': 1.3.38
       '@tsconfig/node10': 1.0.9
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
@@ -8705,9 +6481,14 @@ packages:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
 
-  /type-fest/1.4.0:
-    resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==}
-    engines: {node: '>=10'}
+  /type-fest/2.19.0:
+    resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
+    engines: {node: '>=12.20'}
+    dev: false
+
+  /type-fest/3.6.1:
+    resolution: {integrity: sha512-htXWckxlT6U4+ilVgweNliPqlsVSSucbxVexRYllyMVJDtf5rTjv6kF/s+qAd4QSL1BZcnJPEJavYBPQiWuZDA==}
+    engines: {node: '>=14.16'}
     dev: false
 
   /typescript/4.7.4:
@@ -8724,29 +6505,6 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
-  /unicode-canonical-property-names-ecmascript/2.0.0:
-    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /unicode-match-property-ecmascript/2.0.0:
-    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
-    engines: {node: '>=4'}
-    dependencies:
-      unicode-canonical-property-names-ecmascript: 2.0.0
-      unicode-property-aliases-ecmascript: 2.0.0
-    dev: true
-
-  /unicode-match-property-value-ecmascript/2.0.0:
-    resolution: {integrity: sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /unicode-property-aliases-ecmascript/2.0.0:
-    resolution: {integrity: sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==}
-    engines: {node: '>=4'}
-    dev: true
-
   /universalify/0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
@@ -8762,8 +6520,8 @@ packages:
     dependencies:
       punycode: 2.1.1
 
-  /use-debounce/8.0.1_react@18.1.0:
-    resolution: {integrity: sha512-6tGAFJKJ0qCalecaV7/gm/M6n238nmitNppvR89ff1yfwSFjwFKR7IQZzIZf1KZRQhqNireBzytzU6jgb29oVg==}
+  /use-debounce/9.0.3_react@18.1.0:
+    resolution: {integrity: sha512-FhtlbDtDXILJV7Lix5OZj5yX/fW1tzq+VrvK1fnT2bUrPOGruU9Rw8NCEn+UI9wopfERBEZAOQ8lfeCJPllgnw==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       react: '>=16.8.0'
@@ -8802,6 +6560,7 @@ packages:
       '@jridgewell/trace-mapping': 0.3.15
       '@types/istanbul-lib-coverage': 2.0.3
       convert-source-map: 1.7.0
+    dev: false
 
   /vite-plugin-ejs/1.6.4:
     resolution: {integrity: sha512-23p1RS4PiA0veXY5/gHZ60pl3pPvd8NEqdBsDgxNK8nM1rjFFDcVb0paNmuipzCgNP/Y0f/Id22M7Il4kvZ2jA==}
@@ -8859,6 +6618,7 @@ packages:
 
   /w3c-hr-time/1.0.2:
     resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
+    deprecated: Use your platform's native performance.now() and performance.timeOrigin.
     dependencies:
       browser-process-hrtime: 1.0.0
     dev: true
@@ -8874,6 +6634,7 @@ packages:
     resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
     dependencies:
       makeerror: 1.0.12
+    dev: false
 
   /warning/4.0.3:
     resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
@@ -8980,12 +6741,13 @@ packages:
   /wrappy/1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  /write-file-atomic/4.0.1:
-    resolution: {integrity: sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16}
+  /write-file-atomic/4.0.2:
+    resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       imurmurhash: 0.1.4
       signal-exit: 3.0.7
+    dev: false
 
   /ws/8.8.0:
     resolution: {integrity: sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==}
@@ -9038,6 +6800,7 @@ packages:
   /yargs-parser/21.0.1:
     resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==}
     engines: {node: '>=12'}
+    dev: false
 
   /yargs/16.2.0:
     resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
@@ -9063,6 +6826,7 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 21.0.1
+    dev: false
 
   /yn/3.1.1:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
@@ -9071,18 +6835,15 @@ packages:
   /yocto-queue/0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
+    dev: false
 
-  /yup/0.32.11:
-    resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
-    engines: {node: '>=10'}
+  /yup/1.0.2:
+    resolution: {integrity: sha512-Lpi8nITFKjWtCoK3yQP8MUk78LJmHWqbFd0OOMXTar+yjejlQ4OIIoZgnTW1bnEUKDw6dZBcy3/IdXnt2KDUow==}
     dependencies:
-      '@babel/runtime': 7.17.9
-      '@types/lodash': 4.14.177
-      lodash: 4.17.21
-      lodash-es: 4.17.21
-      nanoclone: 0.2.1
-      property-expr: 2.0.4
+      property-expr: 2.0.5
+      tiny-case: 1.0.3
       toposort: 2.0.2
+      type-fest: 2.19.0
     dev: false
 
   /zustand/4.1.1_react@18.1.0:
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index f5ac957e2e8..e971b15e2b7 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -5,10 +5,11 @@ import {
   clusterPath,
   errorPage,
   getNonExactPath,
+  clusterNewConfigPath,
 } from 'lib/paths';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import Dashboard from 'components/Dashboard/Dashboard';
-import ClusterPage from 'components/Cluster/Cluster';
+import ClusterPage from 'components/ClusterPage/ClusterPage';
 import { ThemeProvider } from 'styled-components';
 import theme from 'theme/theme';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
@@ -16,6 +17,7 @@ import { showServerError } from 'lib/errorHandling';
 import { Toaster } from 'react-hot-toast';
 import GlobalCSS from 'components/globalCss';
 import * as S from 'components/App.styled';
+import ClusterConfigForm from 'widgets/ClusterConfigForm';
 
 import ConfirmationModal from './common/ConfirmationModal/ConfirmationModal';
 import { ConfirmContextProvider } from './contexts/ConfirmContext';
@@ -36,13 +38,12 @@ const queryClient = new QueryClient({
     },
   },
 });
-
 const App: React.FC = () => {
   return (
     <QueryClientProvider client={queryClient}>
-      <GlobalSettingsProvider>
-        <ThemeProvider theme={theme}>
-          <Suspense fallback={<PageLoader />}>
+      <ThemeProvider theme={theme}>
+        <Suspense fallback={<PageLoader />}>
+          <GlobalSettingsProvider>
             <UserInfoRolesAccessProvider>
               <ConfirmContextProvider>
                 <GlobalCSS />
@@ -56,6 +57,10 @@ const App: React.FC = () => {
                           element={<Dashboard />}
                         />
                       ))}
+                      <Route
+                        path={getNonExactPath(clusterNewConfigPath)}
+                        element={<ClusterConfigForm />}
+                      />
                       <Route
                         path={getNonExactPath(clusterPath())}
                         element={<ClusterPage />}
@@ -78,9 +83,9 @@ const App: React.FC = () => {
                 <ConfirmationModal />
               </ConfirmContextProvider>
             </UserInfoRolesAccessProvider>
-          </Suspense>
-        </ThemeProvider>
-      </GlobalSettingsProvider>
+          </GlobalSettingsProvider>
+        </Suspense>
+      </ThemeProvider>
     </QueryClientProvider>
   );
 };
diff --git a/kafka-ui-react-app/src/components/ClusterPage/ClusterConfigPage.tsx b/kafka-ui-react-app/src/components/ClusterPage/ClusterConfigPage.tsx
new file mode 100644
index 00000000000..b610114dd8c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/ClusterPage/ClusterConfigPage.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { useAppConfig } from 'lib/hooks/api/appConfig';
+import useAppParams from 'lib/hooks/useAppParams';
+import { ClusterNameRoute } from 'lib/paths';
+import ClusterConfigForm from 'widgets/ClusterConfigForm';
+import { getInitialFormData } from 'widgets/ClusterConfigForm/utils/getInitialFormData';
+
+const ClusterConfigPage: React.FC = () => {
+  const config = useAppConfig();
+  const { clusterName } = useAppParams<ClusterNameRoute>();
+
+  const currentClusterConfig = React.useMemo(() => {
+    if (config.isSuccess && !!config.data.properties?.kafka?.clusters) {
+      const current = config.data.properties?.kafka?.clusters?.find(
+        ({ name }) => name === clusterName
+      );
+      if (current) {
+        return getInitialFormData(current);
+      }
+    }
+    return undefined;
+  }, [clusterName, config]);
+
+  if (!currentClusterConfig) {
+    return null;
+  }
+
+  const hasCustomConfig = Object.values(currentClusterConfig.customAuth).some(
+    (v) => !!v
+  );
+
+  return (
+    <ClusterConfigForm
+      initialValues={currentClusterConfig}
+      hasCustomConfig={hasCustomConfig}
+    />
+  );
+};
+
+export default ClusterConfigPage;
diff --git a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx b/kafka-ui-react-app/src/components/ClusterPage/ClusterPage.tsx
similarity index 86%
rename from kafka-ui-react-app/src/components/Cluster/Cluster.tsx
rename to kafka-ui-react-app/src/components/ClusterPage/ClusterPage.tsx
index 89c4931754c..c2f6a13fbee 100644
--- a/kafka-ui-react-app/src/components/Cluster/Cluster.tsx
+++ b/kafka-ui-react-app/src/components/ClusterPage/ClusterPage.tsx
@@ -11,28 +11,34 @@ import {
   ClusterNameRoute,
   clusterSchemasRelativePath,
   clusterTopicsRelativePath,
+  clusterConfigRelativePath,
   getNonExactPath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { useClusters } from 'lib/hooks/api/clusters';
+import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
 
 const Brokers = React.lazy(() => import('components/Brokers/Brokers'));
 const Topics = React.lazy(() => import('components/Topics/Topics'));
 const Schemas = React.lazy(() => import('components/Schemas/Schemas'));
 const Connect = React.lazy(() => import('components/Connect/Connect'));
 const KsqlDb = React.lazy(() => import('components/KsqlDb/KsqlDb'));
+const ClusterConfigPage = React.lazy(
+  () => import('components/ClusterPage/ClusterConfigPage')
+);
 const ConsumerGroups = React.lazy(
   () => import('components/ConsumerGroups/ConsumerGroups')
 );
 
-const Cluster: React.FC = () => {
+const ClusterPage: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
+  const appInfo = React.useContext(GlobalSettingsContext);
+
   const { data } = useClusters();
   const contextValue = React.useMemo(() => {
     const cluster = data?.find(({ name }) => name === clusterName);
     const features = cluster?.features || [];
-
     return {
       isReadOnly: cluster?.readOnly || false,
       hasKafkaConnectConfigured: features.includes(
@@ -89,6 +95,12 @@ const Cluster: React.FC = () => {
                 element={<KsqlDb />}
               />
             )}
+            {appInfo.hasDynamicConfig && (
+              <Route
+                path={getNonExactPath(clusterConfigRelativePath)}
+                element={<ClusterConfigPage />}
+              />
+            )}
             <Route
               path="/"
               element={<Navigate to={clusterBrokerRelativePath} replace />}
@@ -101,4 +113,4 @@ const Cluster: React.FC = () => {
   );
 };
 
-export default Cluster;
+export default ClusterPage;
diff --git a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx b/kafka-ui-react-app/src/components/ClusterPage/__tests__/ClusterPage.spec.tsx
similarity index 96%
rename from kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
rename to kafka-ui-react-app/src/components/ClusterPage/__tests__/ClusterPage.spec.tsx
index d7b2c6d2bb2..b66fd0a0b33 100644
--- a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx
+++ b/kafka-ui-react-app/src/components/ClusterPage/__tests__/ClusterPage.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Cluster, ClusterFeaturesEnum } from 'generated-sources';
-import ClusterComponent from 'components/Cluster/Cluster';
+import ClusterPageComponent from 'components/ClusterPage/ClusterPage';
 import { screen, waitFor } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
 import {
@@ -48,14 +48,14 @@ jest.mock('lib/hooks/api/clusters', () => ({
   useClusters: jest.fn(),
 }));
 
-describe('Cluster', () => {
+describe('ClusterPage', () => {
   const renderComponent = async (pathname: string, payload: Cluster[] = []) => {
     (useClusters as jest.Mock).mockImplementation(() => ({
       data: payload,
     }));
     await render(
       <WithRoute path={`${clusterPath()}/*`}>
-        <ClusterComponent />
+        <ClusterPageComponent />
       </WithRoute>,
       { initialEntries: [pathname] }
     );
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx b/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
index f8a0ada02ff..0e86d48940d 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
@@ -51,9 +51,13 @@ const Config: React.FC = () => {
   }, [config, setValue]);
 
   const onSubmit = async (values: FormValues) => {
-    const requestBody = JSON.parse(values.config.trim());
-    await mutation.mutateAsync(requestBody);
-    reset(values);
+    try {
+      const requestBody = JSON.parse(values.config.trim());
+      await mutation.mutateAsync(requestBody);
+      reset(values);
+    } catch (e) {
+      // do nothing
+    }
   };
 
   const hasCredentials = JSON.stringify(config, null, '\t').includes(
diff --git a/kafka-ui-react-app/src/components/Connect/New/New.tsx b/kafka-ui-react-app/src/components/Connect/New/New.tsx
index 1d3f230631a..8040267661f 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/New.tsx
@@ -65,22 +65,26 @@ const New: React.FC = () => {
   }, [connects, getValues, setValue]);
 
   const onSubmit = async (values: FormValues) => {
-    const connector = await mutation.createResource({
-      connectName: values.connectName,
-      newConnector: {
-        name: values.name,
-        config: JSON.parse(values.config.trim()),
-      },
-    });
+    try {
+      const connector = await mutation.createResource({
+        connectName: values.connectName,
+        newConnector: {
+          name: values.name,
+          config: JSON.parse(values.config.trim()),
+        },
+      });
 
-    if (connector) {
-      navigate(
-        clusterConnectConnectorPath(
-          clusterName,
-          connector.connect,
-          connector.name
-        )
-      );
+      if (connector) {
+        navigate(
+          clusterConnectConnectorPath(
+            clusterName,
+            connector.connect,
+            connector.name
+          )
+        );
+      }
+    } catch (e) {
+      // do nothing
     }
   };
 
diff --git a/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx b/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
index 88c79d51cbc..1284bfe6522 100644
--- a/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/__tests__/New.spec.tsx
@@ -84,7 +84,7 @@ describe('New', () => {
       return Promise.resolve();
     });
     (useCreateConnector as jest.Mock).mockImplementation(() => ({
-      mutateAsync: createConnectorMock,
+      createResource: createConnectorMock,
     }));
     renderComponent();
     await simulateFormSubmit();
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx
index 9b0682f04f9..21bcd560879 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx
@@ -36,7 +36,6 @@ const selectresetTypeAndPartitions = async (resetType: string) => {
   await userEvent.click(screen.getByLabelText('Reset Type'));
   await userEvent.click(screen.getByText(resetType));
   await userEvent.click(screen.getByText('Select...'));
-
   await userEvent.click(screen.getByText('Partition #0'));
 };
 
@@ -72,12 +71,14 @@ describe('ResetOffsets', () => {
     fetchMock.reset();
   });
 
-  it('renders progress bar for initial state', async () => {
+  xit('renders progress bar for initial state', async () => {
     fetchMock.getOnce(
       `/api/clusters/${clusterName}/consumer-groups/${groupId}`,
       404
     );
-    await waitFor(() => renderComponent());
+    await act(() => {
+      renderComponent();
+    });
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
   });
 
@@ -117,14 +118,13 @@ describe('ResetOffsets', () => {
         );
 
         await userEvent.click(screen.getAllByLabelText('Partition #0')[1]);
-
         await userEvent.keyboard('10');
-
         await userEvent.click(screen.getByText('Submit'));
-
         await resetConsumerGroupOffsetsMockCalled();
       });
-      it('calls resetConsumerGroupOffsets with TIMESTAMP', async () => {
+
+      // focus doesn't work for datepicker
+      it.skip('calls resetConsumerGroupOffsets with TIMESTAMP', async () => {
         await selectresetTypeAndPartitions('TIMESTAMP');
         const resetConsumerGroupOffsetsMock = fetchMock.postOnce(
           `/api/clusters/${clusterName}/consumer-groups/${groupId}/offsets`,
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClusterName.tsx b/kafka-ui-react-app/src/components/Dashboard/ClusterName.tsx
new file mode 100644
index 00000000000..7ab581d405a
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Dashboard/ClusterName.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { CellContext } from '@tanstack/react-table';
+import { Tag } from 'components/common/Tag/Tag.styled';
+import { Cluster } from 'generated-sources';
+
+type ClusterNameProps = CellContext<Cluster, unknown>;
+
+const ClusterName: React.FC<ClusterNameProps> = ({ row }) => {
+  const { readOnly, name } = row.original;
+  return (
+    <>
+      {readOnly && <Tag color="blue">readonly</Tag>}
+      {name}
+    </>
+  );
+};
+
+export default ClusterName;
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx b/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx
new file mode 100644
index 00000000000..cb41ab06a83
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { Cluster } from 'generated-sources';
+import { CellContext } from '@tanstack/react-table';
+import { Button } from 'components/common/Button/Button';
+import { clusterConfigPath } from 'lib/paths';
+
+type Props = CellContext<Cluster, unknown>;
+
+const ClusterTableActionsCell: React.FC<Props> = ({ row }) => {
+  const { name } = row.original;
+  return (
+    <Button buttonType="secondary" buttonSize="S" to={clusterConfigPath(name)}>
+      Configure
+    </Button>
+  );
+};
+
+export default ClusterTableActionsCell;
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClusterName.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClusterName.tsx
deleted file mode 100644
index 52702c348a7..00000000000
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClusterName.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { CellContext } from '@tanstack/react-table';
-import { Tag } from 'components/common/Tag/Tag.styled';
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const ClusterName: React.FC<CellContext<any, unknown>> = ({ row }) => {
-  return (
-    <>
-      {row.original.readOnly && <Tag color="blue">readonly</Tag>}
-      {row.original.name}
-    </>
-  );
-};
-
-export default ClusterName;
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.styled.ts b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.styled.ts
deleted file mode 100644
index 341cb245ff0..00000000000
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.styled.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import styled from 'styled-components';
-
-interface TableCellProps {
-  maxWidth?: string;
-}
-
-export const SwitchWrapper = styled.div`
-  padding: 16px;
-`;
-
-export const TableCell = styled.td.attrs({ role: 'cells' })<TableCellProps>`
-  padding: 16px;
-  word-break: break-word;
-  max-width: ${(props) => props.maxWidth};
-`;
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
deleted file mode 100644
index 0327a010012..00000000000
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React from 'react';
-import * as Metrics from 'components/common/Metrics';
-import { Tag } from 'components/common/Tag/Tag.styled';
-import Switch from 'components/common/Switch/Switch';
-import { useClusters } from 'lib/hooks/api/clusters';
-import { Cluster, ServerStatus } from 'generated-sources';
-import { ColumnDef } from '@tanstack/react-table';
-import Table, { SizeCell } from 'components/common/NewTable';
-
-import * as S from './ClustersWidget.styled';
-import ClusterName from './ClusterName';
-
-const ClustersWidget: React.FC = () => {
-  const { data } = useClusters();
-  const [showOfflineOnly, setShowOfflineOnly] = React.useState<boolean>(false);
-
-  const config = React.useMemo(() => {
-    const clusters = data || [];
-    const offlineClusters = clusters.filter(
-      ({ status }) => status === ServerStatus.OFFLINE
-    );
-    return {
-      list: showOfflineOnly ? offlineClusters : clusters,
-      online: clusters.length - offlineClusters.length,
-      offline: offlineClusters.length,
-    };
-  }, [data, showOfflineOnly]);
-
-  const columns = React.useMemo<ColumnDef<Cluster>[]>(
-    () => [
-      { header: 'Cluster name', accessorKey: 'name', cell: ClusterName },
-      { header: 'Version', accessorKey: 'version' },
-      { header: 'Brokers count', accessorKey: 'brokerCount' },
-      { header: 'Partitions', accessorKey: 'onlinePartitionCount' },
-      { header: 'Topics', accessorKey: 'topicCount' },
-      { header: 'Production', accessorKey: 'bytesInPerSec', cell: SizeCell },
-      { header: 'Consumption', accessorKey: 'bytesOutPerSec', cell: SizeCell },
-    ],
-    []
-  );
-
-  const handleSwitch = () => setShowOfflineOnly(!showOfflineOnly);
-  return (
-    <>
-      <Metrics.Wrapper>
-        <Metrics.Section>
-          <Metrics.Indicator label={<Tag color="green">Online</Tag>}>
-            <span>{config.online}</span>{' '}
-            <Metrics.LightText>clusters</Metrics.LightText>
-          </Metrics.Indicator>
-          <Metrics.Indicator label={<Tag color="gray">Offline</Tag>}>
-            <span>{config.offline}</span>{' '}
-            <Metrics.LightText>clusters</Metrics.LightText>
-          </Metrics.Indicator>
-        </Metrics.Section>
-      </Metrics.Wrapper>
-      <S.SwitchWrapper>
-        <Switch
-          name="switchRoundedDefault"
-          checked={showOfflineOnly}
-          onChange={handleSwitch}
-        />
-        <label>Only offline clusters</label>
-      </S.SwitchWrapper>
-      <Table
-        columns={columns}
-        data={config?.list}
-        enableSorting
-        emptyMessage="Disk usage data not available"
-      />
-    </>
-  );
-};
-
-export default ClustersWidget;
diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
deleted file mode 100644
index 2d6f967e2c7..00000000000
--- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClustersWidget.spec.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React from 'react';
-import { screen } from '@testing-library/react';
-import ClustersWidget from 'components/Dashboard/ClustersWidget/ClustersWidget';
-import userEvent from '@testing-library/user-event';
-import { render } from 'lib/testHelpers';
-import { useClusters } from 'lib/hooks/api/clusters';
-import { clustersPayload } from 'lib/fixtures/clusters';
-
-jest.mock('lib/hooks/api/clusters', () => ({
-  useClusters: jest.fn(),
-}));
-
-describe('ClustersWidget', () => {
-  beforeEach(async () => {
-    (useClusters as jest.Mock).mockImplementation(() => ({
-      data: clustersPayload,
-      isSuccess: true,
-    }));
-    await render(<ClustersWidget />);
-  });
-
-  it('renders clusterWidget list', () => {
-    expect(screen.getAllByRole('row').length).toBe(3);
-  });
-
-  it('hides online cluster widgets', async () => {
-    expect(screen.getAllByRole('row').length).toBe(3);
-    await userEvent.click(screen.getByRole('checkbox'));
-    expect(screen.getAllByRole('row').length).toBe(2);
-  });
-
-  it('when cluster is read-only', () => {
-    expect(screen.getByText('readonly')).toBeInTheDocument();
-  });
-
-  it('render clusterWidget cells', () => {
-    const cells = screen.getAllByRole('cell');
-    expect(cells.length).toBe(14);
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Dashboard/Dashboard.styled.ts b/kafka-ui-react-app/src/components/Dashboard/Dashboard.styled.ts
new file mode 100644
index 00000000000..a35424b1bb9
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Dashboard/Dashboard.styled.ts
@@ -0,0 +1,8 @@
+import styled from 'styled-components';
+
+export const Toolbar = styled.div`
+  padding: 8px 16px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+`;
diff --git a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
index 518c9e44331..46c35d50794 100644
--- a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
@@ -1,14 +1,98 @@
-import React, { Suspense } from 'react';
+import React from 'react';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import ClustersWidget from 'components/Dashboard/ClustersWidget/ClustersWidget';
-
-const Dashboard: React.FC = () => (
-  <>
-    <PageHeading text="Dashboard" />
-    <Suspense>
-      <ClustersWidget />
-    </Suspense>
-  </>
-);
+import * as Metrics from 'components/common/Metrics';
+import { Tag } from 'components/common/Tag/Tag.styled';
+import Switch from 'components/common/Switch/Switch';
+import { useClusters } from 'lib/hooks/api/clusters';
+import { Cluster, ServerStatus } from 'generated-sources';
+import { ColumnDef } from '@tanstack/react-table';
+import Table, { SizeCell } from 'components/common/NewTable';
+import useBoolean from 'lib/hooks/useBoolean';
+import { Button } from 'components/common/Button/Button';
+import { clusterNewConfigPath } from 'lib/paths';
+import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
+
+import * as S from './Dashboard.styled';
+import ClusterName from './ClusterName';
+import ClusterTableActionsCell from './ClusterTableActionsCell';
+
+const Dashboard: React.FC = () => {
+  const clusters = useClusters();
+  const { value: showOfflineOnly, toggle } = useBoolean(false);
+  const appInfo = React.useContext(GlobalSettingsContext);
+
+  const config = React.useMemo(() => {
+    const clusterList = clusters.data || [];
+    const offlineClusters = clusterList.filter(
+      ({ status }) => status === ServerStatus.OFFLINE
+    );
+    return {
+      list: showOfflineOnly ? offlineClusters : clusterList,
+      online: clusterList.length - offlineClusters.length,
+      offline: offlineClusters.length,
+    };
+  }, [clusters, showOfflineOnly]);
+
+  const columns = React.useMemo<ColumnDef<Cluster>[]>(() => {
+    const initialColumns: ColumnDef<Cluster>[] = [
+      { header: 'Cluster name', accessorKey: 'name', cell: ClusterName },
+      { header: 'Version', accessorKey: 'version' },
+      { header: 'Brokers count', accessorKey: 'brokerCount' },
+      { header: 'Partitions', accessorKey: 'onlinePartitionCount' },
+      { header: 'Topics', accessorKey: 'topicCount' },
+      { header: 'Production', accessorKey: 'bytesInPerSec', cell: SizeCell },
+      { header: 'Consumption', accessorKey: 'bytesOutPerSec', cell: SizeCell },
+    ];
+
+    if (appInfo.hasDynamicConfig) {
+      initialColumns.push({
+        header: '',
+        id: 'actions',
+        cell: ClusterTableActionsCell,
+      });
+    }
+
+    return initialColumns;
+  }, []);
+
+  return (
+    <>
+      <PageHeading text="Dashboard" />
+      <Metrics.Wrapper>
+        <Metrics.Section>
+          <Metrics.Indicator label={<Tag color="green">Online</Tag>}>
+            <span>{config.online || 0}</span>{' '}
+            <Metrics.LightText>clusters</Metrics.LightText>
+          </Metrics.Indicator>
+          <Metrics.Indicator label={<Tag color="gray">Offline</Tag>}>
+            <span>{config.offline || 0}</span>{' '}
+            <Metrics.LightText>clusters</Metrics.LightText>
+          </Metrics.Indicator>
+        </Metrics.Section>
+      </Metrics.Wrapper>
+      <S.Toolbar>
+        <div>
+          <Switch
+            name="switchRoundedDefault"
+            checked={showOfflineOnly}
+            onChange={toggle}
+          />
+          <label>Only offline clusters</label>
+        </div>
+        {appInfo.hasDynamicConfig && (
+          <Button buttonType="primary" buttonSize="M" to={clusterNewConfigPath}>
+            Configure new cluster
+          </Button>
+        )}
+      </S.Toolbar>
+      <Table
+        columns={columns}
+        data={config?.list}
+        enableSorting
+        emptyMessage={clusters.isFetched ? 'No clusters found' : 'Loading...'}
+      />
+    </>
+  );
+};
 
 export default Dashboard;
diff --git a/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
deleted file mode 100644
index 2e5d00cd2df..00000000000
--- a/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import Dashboard from 'components/Dashboard/Dashboard';
-import { render } from 'lib/testHelpers';
-import { screen } from '@testing-library/dom';
-
-jest.mock('components/Dashboard/ClustersWidget/ClustersWidget', () => () => (
-  <div>mock-ClustersWidget</div>
-));
-
-describe('Dashboard', () => {
-  it('renders ClustersWidget', () => {
-    render(<Dashboard />);
-    expect(screen.getByText('Dashboard')).toBeInTheDocument();
-    expect(screen.getByText('mock-ClustersWidget')).toBeInTheDocument();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx b/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx
index dff0e7f3ae9..8ba2cba8e90 100644
--- a/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx
+++ b/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx
@@ -42,7 +42,6 @@ const ClusterMenu: React.FC<Props> = ({
             to={clusterConsumerGroupsPath(name)}
             title="Consumers"
           />
-
           {hasFeatureConfigured(ClusterFeaturesEnum.SCHEMA_REGISTRY) && (
             <ClusterMenuItem
               to={clusterSchemasPath(name)}
diff --git a/kafka-ui-react-app/src/components/Nav/Nav.tsx b/kafka-ui-react-app/src/components/Nav/Nav.tsx
index 61fc903c220..45c755d32d1 100644
--- a/kafka-ui-react-app/src/components/Nav/Nav.tsx
+++ b/kafka-ui-react-app/src/components/Nav/Nav.tsx
@@ -6,24 +6,21 @@ import ClusterMenuItem from './ClusterMenuItem';
 import * as S from './Nav.styled';
 
 const Nav: React.FC = () => {
-  const query = useClusters();
-
-  if (!query.isSuccess) {
-    return null;
-  }
+  const clusters = useClusters();
 
   return (
     <aside aria-label="Sidebar Menu">
       <S.List>
         <ClusterMenuItem to="/" title="Dashboard" isTopLevel />
       </S.List>
-      {query.data.map((cluster) => (
-        <ClusterMenu
-          cluster={cluster}
-          key={cluster.name}
-          singleMode={query.data.length === 1}
-        />
-      ))}
+      {clusters.isSuccess &&
+        clusters.data.map((cluster) => (
+          <ClusterMenu
+            cluster={cluster}
+            key={cluster.name}
+            singleMode={clusters.data.length === 1}
+          />
+        ))}
     </aside>
   );
 };
diff --git a/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
index 3459e84ec23..93fe4dabe52 100644
--- a/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
+++ b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
@@ -1,14 +1,16 @@
-import React, { PropsWithChildren, Suspense, useCallback } from 'react';
+import React, { PropsWithChildren } from 'react';
 import { useLocation } from 'react-router-dom';
 import NavBar from 'components/NavBar/NavBar';
 import * as S from 'components/PageContainer/PageContainer.styled';
-import PageLoader from 'components/common/PageLoader/PageLoader';
 import Nav from 'components/Nav/Nav';
+import useBoolean from 'lib/hooks/useBoolean';
 
 const PageContainer: React.FC<PropsWithChildren<unknown>> = ({ children }) => {
-  const [isSidebarVisible, setIsSidebarVisible] = React.useState(false);
-  const onBurgerClick = () => setIsSidebarVisible(!isSidebarVisible);
-  const closeSidebar = useCallback(() => setIsSidebarVisible(false), []);
+  const {
+    value: isSidebarVisible,
+    toggle,
+    setFalse: closeSidebar,
+  } = useBoolean(false);
   const location = useLocation();
 
   React.useEffect(() => {
@@ -17,12 +19,10 @@ const PageContainer: React.FC<PropsWithChildren<unknown>> = ({ children }) => {
 
   return (
     <>
-      <NavBar onBurgerClick={onBurgerClick} />
+      <NavBar onBurgerClick={toggle} />
       <S.Container>
         <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
-          <Suspense fallback={<PageLoader />}>
-            <Nav />
-          </Suspense>
+          <Nav />
         </S.Sidebar>
         <S.Overlay
           $visible={isSidebarVisible}
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx b/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
index fbba8c85010..1470d3c22a9 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/SchemaVersion/SchemaVersion.tsx
@@ -3,7 +3,7 @@ import EditorViewer from 'components/common/EditorViewer/EditorViewer';
 import { SchemaSubject } from 'generated-sources';
 import { Row } from '@tanstack/react-table';
 
-export interface Props {
+interface Props {
   row: Row<SchemaSubject>;
 }
 
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
index cc2aa81e899..564c5dfa29a 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx
@@ -6,10 +6,6 @@ import { Row } from '@tanstack/react-table';
 
 import { jsonSchema } from './fixtures';
 
-export interface Props {
-  row: Row<SchemaSubject>;
-}
-
 const renderComponent = () => {
   const row = {
     original: jsonSchema,
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
index 464537d9c4d..bddb2f173f9 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.tsx
@@ -1,50 +1,22 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom';
-import { useForm, Controller, FormProvider } from 'react-hook-form';
-import {
-  CompatibilityLevelCompatibilityEnum,
-  SchemaType,
-} from 'generated-sources';
-import {
-  clusterSchemaPath,
-  clusterSchemasPath,
-  ClusterSubjectParam,
-} from 'lib/paths';
-import { NewSchemaSubjectRaw } from 'redux/interfaces';
-import Editor from 'components/common/Editor/Editor';
-import Select from 'components/common/Select/Select';
-import { Button } from 'components/common/Button/Button';
-import { InputLabel } from 'components/common/Input/InputLabel.styled';
-import PageHeading from 'components/common/PageHeading/PageHeading';
+import { ClusterSubjectParam } from 'lib/paths';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import {
-  schemaAdded,
   fetchLatestSchema,
   getSchemaLatest,
   SCHEMA_LATEST_FETCH_ACTION,
   getAreSchemaLatestFulfilled,
-  schemaUpdated,
-  getAreSchemaLatestRejected,
 } from 'redux/reducers/schemas/schemasSlice';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
-import { schemasApiClient } from 'lib/api';
-import { showServerError } from 'lib/errorHandling';
 
-import * as S from './Edit.styled';
+import Form from './Form';
 
 const Edit: React.FC = () => {
-  const navigate = useNavigate();
   const dispatch = useAppDispatch();
 
   const { clusterName, subject } = useAppParams<ClusterSubjectParam>();
-  const methods = useForm<NewSchemaSubjectRaw>({ mode: 'onChange' });
-  const {
-    formState: { isDirty, isSubmitting, dirtyFields },
-    control,
-    handleSubmit,
-  } = methods;
 
   React.useEffect(() => {
     dispatch(fetchLatestSchema({ clusterName, subject }));
@@ -55,160 +27,11 @@ const Edit: React.FC = () => {
 
   const schema = useAppSelector((state) => getSchemaLatest(state));
   const isFetched = useAppSelector(getAreSchemaLatestFulfilled);
-  const isRejected = useAppSelector(getAreSchemaLatestRejected);
-
-  const formatedSchema = React.useMemo(() => {
-    return schema?.schemaType === SchemaType.PROTOBUF
-      ? schema?.schema
-      : JSON.stringify(JSON.parse(schema?.schema || '{}'), null, '\t');
-  }, [schema]);
-
-  const onSubmit = async (props: NewSchemaSubjectRaw) => {
-    if (!schema) return;
-
-    try {
-      if (dirtyFields.compatibilityLevel) {
-        await schemasApiClient.updateSchemaCompatibilityLevel({
-          clusterName,
-          subject,
-          compatibilityLevel: {
-            compatibility: props.compatibilityLevel,
-          },
-        });
-        dispatch(
-          schemaUpdated({
-            ...schema,
-            compatibilityLevel: props.compatibilityLevel,
-          })
-        );
-      }
-      if (dirtyFields.newSchema || dirtyFields.schemaType) {
-        const resp = await schemasApiClient.createNewSchema({
-          clusterName,
-          newSchemaSubject: {
-            ...schema,
-            schema: props.newSchema || schema.schema,
-            schemaType: props.schemaType || schema.schemaType,
-          },
-        });
-        dispatch(schemaAdded(resp));
-      }
-
-      navigate(clusterSchemaPath(clusterName, subject));
-    } catch (e) {
-      showServerError(e as Response);
-    }
-  };
-
-  if (isRejected) {
-    navigate('/404');
-  }
 
   if (!isFetched || !schema) {
     return <PageLoader />;
   }
-  return (
-    <FormProvider {...methods}>
-      <PageHeading
-        text="Edit"
-        backText="Schema Registry"
-        backTo={clusterSchemasPath(clusterName)}
-      />
-      <S.EditWrapper>
-        <form onSubmit={handleSubmit(onSubmit)}>
-          <div>
-            <div>
-              <InputLabel>Type</InputLabel>
-              <Controller
-                defaultValue={schema.schemaType}
-                control={control}
-                rules={{ required: true }}
-                name="schemaType"
-                render={({ field: { name, onChange } }) => (
-                  <Select
-                    name={name}
-                    value={schema.schemaType}
-                    onChange={onChange}
-                    minWidth="100%"
-                    disabled
-                    options={Object.keys(SchemaType).map((type) => ({
-                      value: type,
-                      label: type,
-                    }))}
-                  />
-                )}
-              />
-            </div>
-
-            <div>
-              <InputLabel>Compatibility level</InputLabel>
-              <Controller
-                defaultValue={
-                  schema.compatibilityLevel as CompatibilityLevelCompatibilityEnum
-                }
-                control={control}
-                name="compatibilityLevel"
-                render={({ field: { name, onChange } }) => (
-                  <Select
-                    name={name}
-                    value={schema.compatibilityLevel}
-                    onChange={onChange}
-                    minWidth="100%"
-                    disabled={isSubmitting}
-                    options={Object.keys(
-                      CompatibilityLevelCompatibilityEnum
-                    ).map((level) => ({ value: level, label: level }))}
-                  />
-                )}
-              />
-            </div>
-          </div>
-          <S.EditorsWrapper>
-            <div>
-              <S.EditorContainer>
-                <h4>Latest schema</h4>
-                <Editor
-                  schemaType={schema?.schemaType}
-                  isFixedHeight
-                  readOnly
-                  height="372px"
-                  value={formatedSchema}
-                  name="latestSchema"
-                  highlightActiveLine={false}
-                />
-              </S.EditorContainer>
-            </div>
-            <div>
-              <S.EditorContainer>
-                <h4>New schema</h4>
-                <Controller
-                  control={control}
-                  name="newSchema"
-                  render={({ field: { name, onChange } }) => (
-                    <Editor
-                      schemaType={schema?.schemaType}
-                      readOnly={isSubmitting}
-                      defaultValue={formatedSchema}
-                      name={name}
-                      onChange={onChange}
-                    />
-                  )}
-                />
-              </S.EditorContainer>
-              <Button
-                buttonType="primary"
-                buttonSize="M"
-                type="submit"
-                disabled={!isDirty || isSubmitting}
-              >
-                Submit
-              </Button>
-            </div>
-          </S.EditorsWrapper>
-        </form>
-      </S.EditWrapper>
-    </FormProvider>
-  );
+  return <Form />;
 };
 
 export default Edit;
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
new file mode 100644
index 00000000000..ea414ab4b4d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
@@ -0,0 +1,210 @@
+import React from 'react';
+import { useNavigate } from 'react-router-dom';
+import { useForm, Controller, FormProvider } from 'react-hook-form';
+import {
+  CompatibilityLevelCompatibilityEnum,
+  SchemaType,
+} from 'generated-sources';
+import {
+  clusterSchemaPath,
+  clusterSchemasPath,
+  ClusterSubjectParam,
+} from 'lib/paths';
+import { NewSchemaSubjectRaw } from 'redux/interfaces';
+import Editor from 'components/common/Editor/Editor';
+import Select from 'components/common/Select/Select';
+import { Button } from 'components/common/Button/Button';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import PageHeading from 'components/common/PageHeading/PageHeading';
+import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
+import useAppParams from 'lib/hooks/useAppParams';
+import {
+  schemaAdded,
+  getSchemaLatest,
+  getAreSchemaLatestFulfilled,
+  schemaUpdated,
+  getAreSchemaLatestRejected,
+} from 'redux/reducers/schemas/schemasSlice';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+import { schemasApiClient } from 'lib/api';
+import { showServerError } from 'lib/errorHandling';
+
+import * as S from './Edit.styled';
+
+const Form: React.FC = () => {
+  const navigate = useNavigate();
+  const dispatch = useAppDispatch();
+
+  const { clusterName, subject } = useAppParams<ClusterSubjectParam>();
+
+  const schema = useAppSelector((state) => getSchemaLatest(state));
+  const isFetched = useAppSelector(getAreSchemaLatestFulfilled);
+  const isRejected = useAppSelector(getAreSchemaLatestRejected);
+
+  const formatedSchema = React.useMemo(() => {
+    return schema?.schemaType === SchemaType.PROTOBUF
+      ? schema?.schema
+      : JSON.stringify(JSON.parse(schema?.schema || '{}'), null, '\t');
+  }, [schema]);
+
+  const methods = useForm<NewSchemaSubjectRaw>({
+    mode: 'onChange',
+    defaultValues: {
+      schemaType: schema?.schemaType,
+      compatibilityLevel:
+        schema?.compatibilityLevel as CompatibilityLevelCompatibilityEnum,
+      newSchema: formatedSchema,
+    },
+  });
+
+  const {
+    formState: { isDirty, isSubmitting, dirtyFields },
+    control,
+    handleSubmit,
+  } = methods;
+
+  const onSubmit = async (props: NewSchemaSubjectRaw) => {
+    if (!schema) return;
+
+    try {
+      if (dirtyFields.compatibilityLevel) {
+        await schemasApiClient.updateSchemaCompatibilityLevel({
+          clusterName,
+          subject,
+          compatibilityLevel: {
+            compatibility: props.compatibilityLevel,
+          },
+        });
+        dispatch(
+          schemaUpdated({
+            ...schema,
+            compatibilityLevel: props.compatibilityLevel,
+          })
+        );
+      }
+      if (dirtyFields.newSchema || dirtyFields.schemaType) {
+        const resp = await schemasApiClient.createNewSchema({
+          clusterName,
+          newSchemaSubject: {
+            ...schema,
+            schema: props.newSchema || schema.schema,
+            schemaType: props.schemaType || schema.schemaType,
+          },
+        });
+        dispatch(schemaAdded(resp));
+      }
+
+      navigate(clusterSchemaPath(clusterName, subject));
+    } catch (e) {
+      showServerError(e as Response);
+    }
+  };
+
+  if (isRejected) {
+    navigate('/404');
+  }
+
+  if (!isFetched || !schema) {
+    return <PageLoader />;
+  }
+  return (
+    <FormProvider {...methods}>
+      <PageHeading
+        text="Edit"
+        backText="Schema Registry"
+        backTo={clusterSchemasPath(clusterName)}
+      />
+      <S.EditWrapper>
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <div>
+            <div>
+              <InputLabel>Type</InputLabel>
+              <Controller
+                control={control}
+                rules={{ required: true }}
+                name="schemaType"
+                render={({ field: { name, onChange, value } }) => (
+                  <Select
+                    name={name}
+                    value={value}
+                    onChange={onChange}
+                    minWidth="100%"
+                    disabled
+                    options={Object.keys(SchemaType).map((type) => ({
+                      value: type,
+                      label: type,
+                    }))}
+                  />
+                )}
+              />
+            </div>
+
+            <div>
+              <InputLabel>Compatibility level</InputLabel>
+              <Controller
+                control={control}
+                name="compatibilityLevel"
+                render={({ field: { name, onChange, value } }) => (
+                  <Select
+                    name={name}
+                    value={value}
+                    onChange={onChange}
+                    minWidth="100%"
+                    disabled={isSubmitting}
+                    options={Object.keys(
+                      CompatibilityLevelCompatibilityEnum
+                    ).map((level) => ({ value: level, label: level }))}
+                  />
+                )}
+              />
+            </div>
+          </div>
+          <S.EditorsWrapper>
+            <div>
+              <S.EditorContainer>
+                <h4>Latest schema</h4>
+                <Editor
+                  schemaType={schema?.schemaType}
+                  isFixedHeight
+                  readOnly
+                  height="372px"
+                  value={formatedSchema}
+                  name="latestSchema"
+                  highlightActiveLine={false}
+                />
+              </S.EditorContainer>
+            </div>
+            <div>
+              <S.EditorContainer>
+                <h4>New schema</h4>
+                <Controller
+                  control={control}
+                  name="newSchema"
+                  render={({ field: { name, onChange, value } }) => (
+                    <Editor
+                      schemaType={schema?.schemaType}
+                      readOnly={isSubmitting}
+                      defaultValue={value}
+                      name={name}
+                      onChange={onChange}
+                    />
+                  )}
+                />
+              </S.EditorContainer>
+              <Button
+                buttonType="primary"
+                buttonSize="M"
+                type="submit"
+                disabled={!isDirty || isSubmitting}
+              >
+                Submit
+              </Button>
+            </div>
+          </S.EditorsWrapper>
+        </form>
+      </S.EditWrapper>
+    </FormProvider>
+  );
+};
+
+export default Form;
diff --git a/kafka-ui-react-app/src/components/Topics/New/New.tsx b/kafka-ui-react-app/src/components/Topics/New/New.tsx
index cf21d0acd20..a8d2600a43a 100644
--- a/kafka-ui-react-app/src/components/Topics/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/New.tsx
@@ -39,8 +39,12 @@ const New: React.FC = () => {
   const cleanUpPolicy = params.get(Filters.CLEANUP_POLICY) || 'Delete';
 
   const onSubmit = async (data: TopicFormData) => {
-    await createTopic.createResource(data);
-    navigate(`../${data.name}`);
+    try {
+      await createTopic.createResource(data);
+      navigate(`../${data.name}`);
+    } catch (e) {
+      // do nothing
+    }
   };
 
   return (
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
index 59016d1d7a4..e1ca3651108 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.tsx
@@ -74,8 +74,12 @@ const DangerZone: React.FC<DangerZoneProps> = ({
   };
 
   const validateReplicationFactor = (data: { replicationFactor: number }) => {
-    setReplicationFactor(data.replicationFactor);
-    confirmReplicationFactorChange();
+    try {
+      setReplicationFactor(data.replicationFactor);
+      confirmReplicationFactorChange();
+    } catch (e) {
+      // do nothing
+    }
   };
 
   return (
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
index 8760d5961b5..b8a57664997 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/Edit.tsx
@@ -1,9 +1,5 @@
 import React from 'react';
-import {
-  TopicFormDataRaw,
-  TopicConfigByName,
-  TopicFormData,
-} from 'redux/interfaces';
+import { TopicConfigByName, TopicFormData } from 'redux/interfaces';
 import { useForm, FormProvider } from 'react-hook-form';
 import TopicForm from 'components/Topics/shared/Form/TopicForm';
 import { RouteParamsClusterTopic } from 'lib/paths';
@@ -55,7 +51,7 @@ const Edit: React.FC = () => {
   topicConfig?.forEach((param) => {
     config.byName[param.name] = param;
   });
-  const onSubmit = async (data: TopicFormDataRaw) => {
+  const onSubmit = async (data: TopicFormData) => {
     const filteredDirtyDefaultEntries = Object.entries(data).filter(
       ([key, val]) => {
         const isDirty =
@@ -71,9 +67,12 @@ const Edit: React.FC = () => {
     );
 
     const newData = Object.fromEntries(filteredDirtyDefaultEntries);
-
-    await updateTopic.mutateAsync(newData);
-    navigate('../');
+    try {
+      await updateTopic.mutateAsync(newData);
+      navigate('../');
+    } catch (e) {
+      // do nothing
+    }
   };
 
   return (
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
index e15568e2594..557db159ba7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
@@ -51,8 +51,12 @@ const AddEditFilterContainer: React.FC<AddEditFilterContainerProps> = ({
 
   const onSubmit = React.useCallback(
     (values: AddMessageFilters) => {
-      submitCallback?.(values);
-      reset({ name: '', code: '', saveFilter: false });
+      try {
+        submitCallback?.(values);
+        reset({ name: '', code: '', saveFilter: false });
+      } catch (e) {
+        // do nothing
+      }
     },
     [isAdd, reset, submitCallback]
   );
@@ -85,14 +89,10 @@ const AddEditFilterContainer: React.FC<AddEditFilterContainerProps> = ({
           </FormError>
         </div>
         {isAdd && (
-          <S.CheckboxWrapper>
-            <input
-              {...methods.register('saveFilter')}
-              name="saveFilter"
-              type="checkbox"
-            />
-            <InputLabel>Save this filter</InputLabel>
-          </S.CheckboxWrapper>
+          <InputLabel>
+            <input {...methods.register('saveFilter')} type="checkbox" />
+            Save this filter
+          </InputLabel>
         )}
         <div>
           <InputLabel>Display name</InputLabel>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
index 10802ee0db1..d1230febf94 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
@@ -223,10 +223,6 @@ export const ActiveSmartFilterWrapper = styled.div`
   gap: 10px;
   align-items: center;
   justify-content: flex-start;
-
-  & div:first-child {
-    width: 25%;
-  }
 `;
 
 export const DeleteSavedFilter = styled.div.attrs({ role: 'deleteIcon' })`
@@ -268,12 +264,6 @@ export const SavedFilter = styled.div.attrs({
     props.selected ? props.theme.layout.stuffColor : props.theme.panelColor};
 `;
 
-export const CheckboxWrapper = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 5px;
-`;
-
 export const ActiveSmartFilter = styled.div`
   border-radius: 4px;
   min-width: 115px;
@@ -363,9 +353,3 @@ export const SeekTypeSelect = styled(Select)`
   border-bottom-right-radius: 0;
   user-select: none;
 `;
-
-export const Serdes = styled.div`
-  display: flex;
-  gap: 24px;
-  padding 8px 0;
-`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
index ca4b38a8cef..ef184c4bfd5 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/AddFilter.spec.tsx
@@ -174,59 +174,6 @@ describe('AddFilter component', () => {
         expect(addFilterMock).toHaveBeenCalled();
         expect(toggleModelMock).not.toHaveBeenCalled();
       });
-
-      it('should check the state submit button when checkbox state changes so is name input value', async () => {
-        const checkbox = screen.getByRole('checkbox');
-        const codeTextBox = screen.getAllByRole(
-          'textbox'
-        )[0] as HTMLTextAreaElement;
-        const nameTextBox = screen.getAllByRole('textbox')[1];
-        const addFilterBtn = screen.getByRole('button', {
-          name: /Add filter/i,
-        });
-
-        await userEvent.clear(nameTextBox);
-        expect(nameTextBox).toHaveValue('');
-
-        await userEvent.click(addFilterBtn);
-        expect(activeFilterHandlerMock).toHaveBeenCalledTimes(1);
-
-        expect(activeFilterHandlerMock).toHaveBeenCalledWith(
-          {
-            name: codeValue,
-            code: codeValue,
-            saveFilter: false,
-          },
-          -1
-        );
-        // get reset-ed
-        await userEvent.clear(codeTextBox);
-
-        expect(codeTextBox).toHaveValue(``);
-        expect(toggleModelMock).toHaveBeenCalled();
-
-        await userEvent.type(codeTextBox, codeValue);
-        expect(codeTextBox).toHaveValue(`${codeValue}\n\n`);
-
-        await userEvent.click(checkbox);
-        await userEvent.tab();
-
-        expect(addFilterBtn).toBeDisabled();
-
-        await userEvent.paste(nameValue);
-        expect(nameTextBox).toHaveValue(`${nameValue}`);
-        await userEvent.tab();
-
-        expect(addFilterBtn).toBeEnabled();
-        await userEvent.click(addFilterBtn);
-
-        expect(activeFilterHandlerMock).toHaveBeenCalledTimes(1);
-        expect(addFilterMock).toHaveBeenCalledWith({
-          name: nameValue,
-          code: codeValue,
-          saveFilter: true,
-        });
-      });
     });
 
     it('should use sliced code as the filter name if filter name is empty', async () => {
@@ -268,7 +215,6 @@ describe('AddFilter component', () => {
         },
         -1
       );
-      expect(codeTextBox).toHaveValue('');
       expect(toggleModelMock).toHaveBeenCalled();
     });
   });
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
index e3a4db8f443..172dc810135 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Messages.spec.tsx
@@ -78,11 +78,13 @@ describe('Messages', () => {
       const liveOptionConf = SeekDirectionOptions[2];
       const labelValue2 = liveOptionConf.label;
       await userEvent.click(seekDirectionSelect);
-      const liveModeLi = screen.getByRole(
-        (role, element) =>
-          role === 'option' &&
-          element?.getAttribute('value') === liveOptionConf.value
+
+      const options = screen.getAllByRole('option');
+      const liveModeLi = options.find(
+        (option) => option.getAttribute('value') === liveOptionConf.value
       );
+      expect(liveModeLi).toBeInTheDocument();
+      if (!liveModeLi) return; // to make TS happy
       await userEvent.selectOptions(seekDirectionSelect, [liveModeLi]);
       expect(seekDirectionOption).toHaveTextContent(labelValue2);
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index b0c35fc7504..9450e512ad1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -101,16 +101,19 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
       });
       return;
     }
-
-    await sendMessage.mutateAsync({
-      key: key || null,
-      content: content || null,
-      headers: parsedHeaders,
-      partition: partition || 0,
-      keySerde,
-      valueSerde,
-    });
-    onSubmit();
+    try {
+      await sendMessage.mutateAsync({
+        key: key || null,
+        content: content || null,
+        headers: parsedHeaders,
+        partition: partition || 0,
+        keySerde,
+        valueSerde,
+      });
+      onSubmit();
+    } catch (e) {
+      // do nothing
+    }
   };
 
   return (
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
index c1006b6d7ef..e3fd7a7e5e8 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
@@ -1,6 +1,6 @@
 import React, { PropsWithChildren } from 'react';
 import { render } from 'lib/testHelpers';
-import { fireEvent, screen } from '@testing-library/dom';
+import { screen } from '@testing-library/dom';
 import { FormProvider, useForm } from 'react-hook-form';
 import TopicForm, { Props } from 'components/Topics/shared/Form/TopicForm';
 import userEvent from '@testing-library/user-event';
@@ -30,8 +30,10 @@ const expectByRoleAndNameToBeInDocument = (
 };
 
 describe('TopicForm', () => {
-  it('renders', () => {
-    renderComponent();
+  it('renders', async () => {
+    await act(async () => {
+      renderComponent();
+    });
 
     expectByRoleAndNameToBeInDocument('textbox', 'Topic Name *');
 
@@ -62,22 +64,19 @@ describe('TopicForm', () => {
   });
 
   it('submits', async () => {
-    renderComponent({
-      isSubmitting,
-      onSubmit: onSubmit.mockImplementation((e) => e.preventDefault()),
-    });
-
     await act(async () => {
-      await userEvent.type(
-        screen.getByPlaceholderText('Topic Name'),
-        'topicName'
-      );
-    });
-    await act(() => {
-      fireEvent.submit(screen.getByLabelText('topic form'));
+      renderComponent({
+        isSubmitting,
+        onSubmit: onSubmit.mockImplementation((e) => e.preventDefault()),
+      });
     });
 
+    await userEvent.type(
+      screen.getByPlaceholderText('Topic Name'),
+      'topicName'
+    );
     await userEvent.click(screen.getByRole('button', { name: 'Create topic' }));
+
     expect(onSubmit).toBeCalledTimes(1);
   });
 });
diff --git a/kafka-ui-react-app/src/components/Version/Version.tsx b/kafka-ui-react-app/src/components/Version/Version.tsx
index 2a91f9ec3be..2a611ae4a54 100644
--- a/kafka-ui-react-app/src/components/Version/Version.tsx
+++ b/kafka-ui-react-app/src/components/Version/Version.tsx
@@ -9,11 +9,6 @@ import { formatTimestamp } from 'lib/dateTimeHelpers';
 import * as S from './Version.styled';
 import compareVersions from './compareVersions';
 
-export interface VesionProps {
-  tag: string;
-  commit?: string;
-}
-
 const Version: React.FC = () => {
   const { data: actuatorInfo = {} } = useActuatorInfo();
   const { data: latestVersionInfo = {} } = useLatestVersion();
diff --git a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
index 6157c2291e2..32ccf009e62 100644
--- a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
+++ b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
@@ -3,6 +3,7 @@ import { screen } from '@testing-library/react';
 import App from 'components/App';
 import { render } from 'lib/testHelpers';
 import { useGetUserInfo } from 'lib/hooks/api/roles';
+import { useAppInfo } from 'lib/hooks/api/appConfig';
 
 jest.mock('components/Nav/Nav', () => () => <div>Navigation</div>);
 
@@ -11,12 +12,18 @@ jest.mock('components/Version/Version', () => () => <div>Version</div>);
 jest.mock('lib/hooks/api/roles', () => ({
   useGetUserInfo: jest.fn(),
 }));
+jest.mock('lib/hooks/api/appConfig', () => ({
+  useAppInfo: jest.fn(),
+}));
 
 describe('App', () => {
   beforeEach(() => {
     (useGetUserInfo as jest.Mock).mockImplementation(() => ({
       data: {},
     }));
+    (useAppInfo as jest.Mock).mockImplementation(() => ({
+      data: {},
+    }));
 
     render(<App />, {
       initialEntries: ['/'],
diff --git a/kafka-ui-react-app/src/components/common/Button/Button.tsx b/kafka-ui-react-app/src/components/common/Button/Button.tsx
index 66cf42d347a..5e0a6609eb3 100644
--- a/kafka-ui-react-app/src/components/common/Button/Button.tsx
+++ b/kafka-ui-react-app/src/components/common/Button/Button.tsx
@@ -14,9 +14,11 @@ export const Button: React.FC<Props> = ({ to, ...props }) => {
   if (to) {
     return (
       <Link to={to}>
-        <StyledButton {...props}>{props.children}</StyledButton>
+        <StyledButton type="button" {...props}>
+          {props.children}
+        </StyledButton>
       </Link>
     );
   }
-  return <StyledButton {...props} />;
+  return <StyledButton type="button" {...props} />;
 };
diff --git a/kafka-ui-react-app/src/components/common/Checkbox/Checkbox.tsx b/kafka-ui-react-app/src/components/common/Checkbox/Checkbox.tsx
new file mode 100644
index 00000000000..279872779ed
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Checkbox/Checkbox.tsx
@@ -0,0 +1,30 @@
+import * as React from 'react';
+import { useFormContext } from 'react-hook-form';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import { FormError, InputHint } from 'components/common/Input/Input.styled';
+import { ErrorMessage } from '@hookform/error-message';
+
+interface CheckboxProps {
+  name: string;
+  label: React.ReactNode;
+  hint?: string;
+}
+
+const Checkbox: React.FC<CheckboxProps> = ({ name, label, hint }) => {
+  const { register } = useFormContext();
+
+  return (
+    <div>
+      <InputLabel>
+        <input {...register(name)} type="checkbox" />
+        {label}
+      </InputLabel>
+      <InputHint>{hint}</InputHint>
+      <FormError>
+        <ErrorMessage name={name} />
+      </FormError>
+    </div>
+  );
+};
+
+export default Checkbox;
diff --git a/kafka-ui-react-app/src/components/common/Form/Form.styled.ts b/kafka-ui-react-app/src/components/common/Form/Form.styled.ts
index c72df5eb547..b9a598040c9 100644
--- a/kafka-ui-react-app/src/components/common/Form/Form.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Form/Form.styled.ts
@@ -3,4 +3,26 @@ import styled from 'styled-components';
 export const StyledForm = styled.form`
   padding: 16px;
   max-width: 800px;
+  display: flex;
+  gap: 16px;
+  flex-direction: column;
+
+  h3 {
+    margin-bottom: 0;
+    line-height: 32px;
+  }
+`;
+
+export const FlexFieldset = styled.fieldset`
+  display: flex;
+  gap: 16px;
+  flex-direction: column;
+
+  &:disabled {
+    ul {
+      opacity: 0.5;
+      background-color: #f5f5f5;
+      pointer-events: none;
+    }
+  }
 `;
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
index f1c91e3a530..52a4bc6fb35 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
@@ -75,3 +75,9 @@ export const FormError = styled.p`
   color: ${({ theme }) => theme.input.error};
   font-size: 12px;
 `;
+
+export const InputHint = styled.p`
+  font-size: 0.85rem;
+  margin-top: 0.25rem;
+  color: ${({ theme }) => theme.text.secondary};
+`;
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.tsx b/kafka-ui-react-app/src/components/common/Input/Input.tsx
index f5049e69618..ae76bc47178 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/Input.tsx
@@ -1,8 +1,10 @@
 import React from 'react';
 import { RegisterOptions, useFormContext } from 'react-hook-form';
 import SearchIcon from 'components/common/Icons/SearchIcon';
+import { ErrorMessage } from '@hookform/error-message';
 
 import * as S from './Input.styled';
+import { InputLabel } from './InputLabel.styled';
 
 export interface InputProps
   extends React.InputHTMLAttributes<HTMLInputElement>,
@@ -11,6 +13,9 @@ export interface InputProps
   hookFormOptions?: RegisterOptions;
   search?: boolean;
   positiveOnly?: boolean;
+  withError?: boolean;
+  label?: React.ReactNode;
+  hint?: React.ReactNode;
 
   // Some may only accept integer, like `Number of Partitions`
   // some may accept decimal
@@ -102,10 +107,17 @@ const Input: React.FC<InputProps> = ({
   type,
   positiveOnly,
   integerOnly,
+  withError = false,
+  label,
+  hint,
   ...rest
 }) => {
   const methods = useFormContext();
 
+  const fieldId = React.useId();
+
+  const isHookFormField = !!name && !!methods.register;
+
   const keyPressEventHandler = (
     event: React.KeyboardEvent<HTMLInputElement>
   ) => {
@@ -143,7 +155,7 @@ const Input: React.FC<InputProps> = ({
         event.preventDefault();
 
         // for react-hook-form fields only set transformed value
-        if (name) {
+        if (isHookFormField) {
           methods.setValue(name, value);
         }
       }
@@ -151,24 +163,34 @@ const Input: React.FC<InputProps> = ({
   };
 
   let inputOptions = { ...rest };
-  if (name) {
+  if (isHookFormField) {
     // extend input options with react-hook-form options
     // if the field is a part of react-hook-form form
     inputOptions = { ...rest, ...methods.register(name, hookFormOptions) };
   }
 
   return (
-    <S.Wrapper>
-      {search && <SearchIcon />}
-      <S.Input
-        inputSize={inputSize}
-        search={!!search}
-        type={type}
-        onKeyPress={keyPressEventHandler}
-        onPaste={pasteEventHandler}
-        {...inputOptions}
-      />
-    </S.Wrapper>
+    <div>
+      {label && <InputLabel htmlFor={rest.id || fieldId}>{label}</InputLabel>}
+      <S.Wrapper>
+        {search && <SearchIcon />}
+        <S.Input
+          id={fieldId}
+          inputSize={inputSize}
+          search={!!search}
+          type={type}
+          onKeyPress={keyPressEventHandler}
+          onPaste={pasteEventHandler}
+          {...inputOptions}
+        />
+        {withError && isHookFormField && (
+          <S.FormError>
+            <ErrorMessage name={name} />
+          </S.FormError>
+        )}
+        {hint && <S.InputHint>{hint}</S.InputHint>}
+      </S.Wrapper>
+    </div>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/common/Input/InputLabel.styled.ts b/kafka-ui-react-app/src/components/common/Input/InputLabel.styled.ts
index 646beabc10d..a33fb1f7633 100644
--- a/kafka-ui-react-app/src/components/common/Input/InputLabel.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Input/InputLabel.styled.ts
@@ -5,7 +5,6 @@ export const InputLabel = styled.label`
   font-size: 12px;
   line-height: 20px;
   color: ${({ theme }) => theme.input.label.color};
-
   input[type='checkbox'] {
     display: inline-block;
     margin-right: 8px;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 07cf338f10b..fb6f76aa393 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -46,7 +46,7 @@ export interface TableProps<TData> {
   enableSorting?: boolean; // Enables sorting for table.
 
   // Placeholder for empty table
-  emptyMessage?: string;
+  emptyMessage?: React.ReactNode;
 
   // Handles row click. Can not be combined with `enableRowSelection` && expandable rows.
   onRowClick?: (row: Row<TData>) => void;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
index c60cccdabea..e31a88846d5 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/__test__/Table.spec.tsx
@@ -31,7 +31,7 @@ jest.mock('react-hook-form', () => ({
   }),
 }));
 
-type Datum = typeof data[0];
+type Datum = (typeof data)[0];
 
 const data = [
   {
diff --git a/kafka-ui-react-app/src/components/common/Select/ControlledSelect.tsx b/kafka-ui-react-app/src/components/common/Select/ControlledSelect.tsx
new file mode 100644
index 00000000000..b3e15aacdf2
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Select/ControlledSelect.tsx
@@ -0,0 +1,59 @@
+import * as React from 'react';
+import { Controller } from 'react-hook-form';
+import { FormError } from 'components/common/Input/Input.styled';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import { ErrorMessage } from '@hookform/error-message';
+
+import Select, { SelectOption } from './Select';
+
+interface ControlledSelectProps {
+  name: string;
+  label: React.ReactNode;
+  hint?: string;
+  options: SelectOption[];
+  onChange?: (val: string | number) => void;
+  disabled?: boolean;
+  placeholder?: string;
+}
+
+const ControlledSelect: React.FC<ControlledSelectProps> = ({
+  name,
+  label,
+  onChange,
+  options,
+  disabled = false,
+  placeholder,
+}) => {
+  const id = React.useId();
+
+  return (
+    <div>
+      <InputLabel htmlFor={id}>{label}</InputLabel>
+      <Controller
+        name={name}
+        render={({ field }) => {
+          return (
+            <Select
+              id={id}
+              name={field.name}
+              minWidth="270px"
+              onChange={(value) => {
+                if (onChange) onChange(value);
+                field.onChange(value);
+              }}
+              value={field.value}
+              options={options}
+              placeholder={placeholder}
+              disabled={disabled}
+            />
+          );
+        }}
+      />
+      <FormError>
+        <ErrorMessage name={name} />
+      </FormError>
+    </div>
+  );
+};
+
+export default ControlledSelect;
diff --git a/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
index 4c22cd72fdf..cde97964f3a 100644
--- a/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
+++ b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
@@ -9,7 +9,7 @@ import {
 import * as S from './Tooltip.styled';
 
 export interface PropsTypes {
-  value: string | JSX.Element;
+  value: React.ReactNode;
   content: string;
   placement?: Placement;
 }
diff --git a/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
index a1c3a386f5c..4de05307b11 100644
--- a/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
+++ b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
@@ -1,13 +1,31 @@
+import { useAppInfo } from 'lib/hooks/api/appConfig';
 import React from 'react';
+import { ApplicationInfoEnabledFeaturesEnum } from 'generated-sources';
 
-// This is here for future global code settings modification , it does not do anything now
-export const GlobalSettingsContext = React.createContext<boolean>(true);
+interface GlobalSettingsContextProps {
+  hasDynamicConfig: boolean;
+}
+
+export const GlobalSettingsContext =
+  React.createContext<GlobalSettingsContextProps>({
+    hasDynamicConfig: false,
+  });
 
 export const GlobalSettingsProvider: React.FC<
   React.PropsWithChildren<unknown>
 > = ({ children }) => {
+  const info = useAppInfo();
+  const value = React.useMemo(() => {
+    const features = info.data?.enabledFeatures || [];
+    return {
+      hasDynamicConfig: features.includes(
+        ApplicationInfoEnabledFeaturesEnum.DYNAMIC_CONFIG
+      ),
+    };
+  }, [info.data]);
+
   return (
-    <GlobalSettingsContext.Provider value={false}>
+    <GlobalSettingsContext.Provider value={value}>
       {children}
     </GlobalSettingsContext.Provider>
   );
diff --git a/kafka-ui-react-app/src/custom.d.ts b/kafka-ui-react-app/src/custom.d.ts
deleted file mode 100644
index 9c2d0f2d6ea..00000000000
--- a/kafka-ui-react-app/src/custom.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-type Dictionary<T> = Record<string, T>;
-type IdType = string | number;
diff --git a/kafka-ui-react-app/src/lib/api.ts b/kafka-ui-react-app/src/lib/api.ts
index f83cc539834..deef9a7c655 100644
--- a/kafka-ui-react-app/src/lib/api.ts
+++ b/kafka-ui-react-app/src/lib/api.ts
@@ -9,6 +9,7 @@ import {
   KafkaConnectApi,
   ConsumerGroupsApi,
   AuthorizationApi,
+  ApplicationConfigApi,
 } from 'generated-sources';
 import { BASE_PARAMS } from 'lib/constants';
 
@@ -22,4 +23,5 @@ export const messagesApiClient = new MessagesApi(apiClientConf);
 export const clustersApiClient = new ClustersApi(apiClientConf);
 export const kafkaConnectApiClient = new KafkaConnectApi(apiClientConf);
 export const consumerGroupsApiClient = new ConsumerGroupsApi(apiClientConf);
-export const AuthorizationApiClient = new AuthorizationApi(apiClientConf);
+export const authApiClient = new AuthorizationApi(apiClientConf);
+export const appConfigApiClient = new ApplicationConfigApi(apiClientConf);
diff --git a/kafka-ui-react-app/src/lib/constants.ts b/kafka-ui-react-app/src/lib/constants.ts
index 29f0c65635b..8c9c6deb613 100644
--- a/kafka-ui-react-app/src/lib/constants.ts
+++ b/kafka-ui-react-app/src/lib/constants.ts
@@ -1,3 +1,4 @@
+import { SelectOption } from 'components/common/Select/Select';
 import { ConfigurationParameters } from 'generated-sources';
 
 declare global {
@@ -72,3 +73,26 @@ export const QUERY_REFETCH_OFF_OPTIONS = {
   refetchOnWindowFocus: false,
   refetchIntervalInBackground: false,
 };
+
+// Cluster Form Constants
+export const AUTH_OPTIONS: SelectOption[] = [
+  { value: 'SASL/JAAS', label: 'SASL/JAAS' },
+  { value: 'SASL/GSSAPI', label: 'SASL/GSSAPI' },
+  { value: 'SASL/OAUTHBEARER', label: 'SASL/OAUTHBEARER' },
+  { value: 'SASL/PLAIN', label: 'SASL/PLAIN' },
+  { value: 'SASL/SCRAM-256', label: 'SASL/SCRAM-256' },
+  { value: 'SASL/SCRAM-512', label: 'SASL/SCRAM-512' },
+  { value: 'Delegation tokens', label: 'Delegation tokens' },
+  { value: 'SASL/LDAP', label: 'SASL/LDAP' },
+  { value: 'SASL/AWS IAM', label: 'SASL/AWS IAM' },
+  { value: 'mTLS', label: 'mTLS' },
+];
+
+export const SECURITY_PROTOCOL_OPTIONS: SelectOption[] = [
+  { value: 'SASL_SSL', label: 'SASL_SSL' },
+  { value: 'SASL_PLAINTEXT', label: 'SASL_PLAINTEXT' },
+];
+export const METRICS_OPTIONS: SelectOption[] = [
+  { value: 'JMX', label: 'JMX' },
+  { value: 'PROMETHEUS', label: 'PROMETHEUS' },
+];
diff --git a/kafka-ui-react-app/src/lib/errorHandling.tsx b/kafka-ui-react-app/src/lib/errorHandling.tsx
index 58b2a8bb704..4079fd8ac50 100644
--- a/kafka-ui-react-app/src/lib/errorHandling.tsx
+++ b/kafka-ui-react-app/src/lib/errorHandling.tsx
@@ -75,5 +75,12 @@ export const showServerError = async (
       message: body?.message || 'An error occurred',
       ...options,
     });
+  } else {
+    showAlert('error', {
+      id: 'server-error',
+      title: `Something went wrong`,
+      message: 'An error occurred',
+      ...options,
+    });
   }
 };
diff --git a/kafka-ui-react-app/src/lib/hooks/api/appConfig.ts b/kafka-ui-react-app/src/lib/hooks/api/appConfig.ts
new file mode 100644
index 00000000000..f452ad06740
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/appConfig.ts
@@ -0,0 +1,69 @@
+import { appConfigApiClient as api } from 'lib/api';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { ApplicationConfigPropertiesKafkaClusters } from 'generated-sources';
+import { QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
+
+export function useAppInfo() {
+  return useQuery(
+    ['app', 'info'],
+    () => api.getApplicationInfo(),
+    QUERY_REFETCH_OFF_OPTIONS
+  );
+}
+
+export function useAppConfig() {
+  return useQuery(['app', 'config'], () => api.getCurrentConfig());
+}
+
+export function useUpdateAppConfig({ initialName }: { initialName?: string }) {
+  const client = useQueryClient();
+  return useMutation(
+    async (cluster: ApplicationConfigPropertiesKafkaClusters) => {
+      const existingConfig = await api.getCurrentConfig();
+      const existingClusters = existingConfig.properties?.kafka?.clusters || [];
+
+      let clusters: ApplicationConfigPropertiesKafkaClusters[] = [];
+
+      if (existingClusters.length > 0) {
+        if (!initialName) {
+          clusters = [...existingClusters, cluster];
+        } else {
+          clusters = existingClusters.map((c) =>
+            c.name === initialName ? cluster : c
+          );
+        }
+      } else {
+        clusters = [cluster];
+      }
+
+      const config = {
+        ...existingConfig,
+        properties: {
+          ...existingConfig.properties,
+          kafka: { clusters },
+        },
+      };
+      return api.restartWithConfig({ restartRequest: { config } });
+    },
+    {
+      onSuccess: () => client.invalidateQueries(['app', 'config']),
+    }
+  );
+}
+
+export function useAppConfigFilesUpload() {
+  return useMutation((payload: FormData) =>
+    fetch('/api/config/relatedfiles', {
+      method: 'POST',
+      body: payload,
+    }).then((res) => res.json())
+  );
+}
+
+export function useValidateAppConfig() {
+  return useMutation((config: ApplicationConfigPropertiesKafkaClusters) =>
+    api.validateConfig({
+      applicationConfig: { properties: { kafka: { clusters: [config] } } },
+    })
+  );
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/clusters.ts b/kafka-ui-react-app/src/lib/hooks/api/clusters.ts
index c56f9bfc322..443363d3fd2 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/clusters.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/clusters.ts
@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query';
 import { ClusterName } from 'redux/interfaces';
 
 export function useClusters() {
-  return useQuery(['clusters'], () => api.getClusters());
+  return useQuery(['clusters'], () => api.getClusters(), { suspense: false });
 }
 export function useClusterStats(clusterName: ClusterName) {
   return useQuery(
diff --git a/kafka-ui-react-app/src/lib/hooks/api/roles.ts b/kafka-ui-react-app/src/lib/hooks/api/roles.ts
index d91d9c76209..a47eae4a6d6 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/roles.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/roles.ts
@@ -1,11 +1,11 @@
 import { useQuery } from '@tanstack/react-query';
-import { AuthorizationApiClient } from 'lib/api';
+import { authApiClient } from 'lib/api';
 import { QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
 
 export function useGetUserInfo() {
   return useQuery(
     ['userInfo'],
-    () => AuthorizationApiClient.getUserAuthInfo(),
+    () => authApiClient.getUserAuthInfo(),
     QUERY_REFETCH_OFF_OPTIONS
   );
 }
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
index e3ec49ee027..73a5753ba22 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
@@ -23,7 +23,7 @@ interface UseTopicMessagesProps {
   searchParams: URLSearchParams;
 }
 
-export type ConsumingMode =
+type ConsumingMode =
   | 'live'
   | 'oldest'
   | 'newest'
diff --git a/kafka-ui-react-app/src/lib/hooks/useBoolean.ts b/kafka-ui-react-app/src/lib/hooks/useBoolean.ts
index ac016ef1a05..e757ad3b156 100644
--- a/kafka-ui-react-app/src/lib/hooks/useBoolean.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useBoolean.ts
@@ -1,4 +1,4 @@
-import { useCallback, useState } from 'react';
+import React, { useCallback, useState } from 'react';
 
 interface ReturnType {
   value: boolean;
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index a4a82c7293c..f372d541eb5 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -280,3 +280,12 @@ export const clusterKsqlDbTablesPath = (
 export const clusterKsqlDbStreamsPath = (
   clusterName: ClusterName = RouteParams.clusterName
 ) => `${clusterKsqlDbPath(clusterName)}/${clusterKsqlDbStreamsRelativePath}`;
+
+// Cluster Config
+export const clusterConfigRelativePath = 'config';
+export const clusterConfigPath = (
+  clusterName: ClusterName = RouteParams.clusterName
+) => `${clusterPath(clusterName)}/${clusterConfigRelativePath}`;
+
+export const clusterNewConfigRelativePath = 'create-new-cluster';
+export const clusterNewConfigPath = `/ui/clusters/${clusterNewConfigRelativePath}`;
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index 9218e861111..c2c67201472 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -79,7 +79,7 @@ export const TestQueryClientProvider: React.FC<PropsWithChildren<unknown>> = ({
  * @description it will create a UserInfo Provider that will actually
  * disable the rbacFlag , to user if you can pass it as an argument
  * */
-export const TestUserInfoProvider: React.FC<
+const TestUserInfoProvider: React.FC<
   PropsWithChildren<{ data?: { roles?: RolesType; rbacFlag: boolean } }>
 > = ({ children, data }) => {
   const contextValue = useMemo(() => {
@@ -119,7 +119,7 @@ const customRender = (
     children,
   }) => (
     <TestQueryClientProvider>
-      <GlobalSettingsContext.Provider value={false}>
+      <GlobalSettingsContext.Provider value={{ hasDynamicConfig: false }}>
         <ThemeProvider theme={theme}>
           <TestUserInfoProvider data={userInfo}>
             <ConfirmContextProvider>
diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index dfe60648ac7..2720245e0b4 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -1,14 +1,14 @@
 import * as yup from 'yup';
-import { AnyObject, Maybe } from 'yup/lib/types';
 
 import { TOPIC_NAME_VALIDATION_PATTERN } from './constants';
 
 declare module 'yup' {
   interface StringSchema<
-    TType extends Maybe<string> = string | undefined,
-    TContext extends AnyObject = AnyObject,
-    TOut extends TType = TType
-  > extends yup.BaseSchema<TType, TContext, TOut> {
+    TType extends yup.Maybe<string> = string | undefined,
+    TContext = yup.AnyObject,
+    TDefault = undefined,
+    TFlags extends yup.Flags = ''
+  > extends yup.Schema<TType, TContext, TDefault, TFlags> {
     isJsonObject(): StringSchema<TType, TContext>;
   }
 }
@@ -44,12 +44,12 @@ const isJsonObject = () => {
  * due to yup rerunning all the object validiation during any render, it makes sense to cache the async results
  * */
 export function cacheTest(
-  asyncValidate: (val?: string, ctx?: AnyObject) => Promise<boolean>
+  asyncValidate: (val?: string, ctx?: yup.AnyObject) => Promise<boolean>
 ) {
   let valid = false;
   let closureValue = '';
 
-  return async (value?: string, ctx?: AnyObject) => {
+  return async (value?: string, ctx?: yup.AnyObject) => {
     if (value !== closureValue) {
       const response = await asyncValidate(value, ctx);
       closureValue = value || '';
@@ -60,7 +60,7 @@ export function cacheTest(
   };
 }
 
-yup.addMethod(yup.string, 'isJsonObject', isJsonObject);
+yup.addMethod(yup.StringSchema, 'isJsonObject', isJsonObject);
 
 export const topicFormValidationSchema = yup.object().shape({
   name: yup
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts
index 2be59875c2c..3f570634710 100644
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts
@@ -1,3 +1,5 @@
+type Dictionary<T> = Record<string, T>;
+
 export const fetchKsqlDbTablesPayload: {
   tables: Dictionary<string>[];
   streams: Dictionary<string>[];
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 73da7bf84d0..856b5a7f90f 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -79,6 +79,9 @@ const theme = {
       color: Colors.neutral[30],
     },
   },
+  text: {
+    secondary: Colors.neutral[60],
+  },
   progressBar: {
     backgroundColor: Colors.neutral[3],
     compleatedColor: Colors.green[40],
@@ -88,7 +91,7 @@ const theme = {
     backgroundColor: Colors.neutral[0],
     minWidth: '1200px',
     navBarWidth: '201px',
-    navBarHeight: '53px',
+    navBarHeight: '51px',
     rightSidebarWidth: '70vw',
     filtersSidebarWidth: '300px',
 
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts
new file mode 100644
index 00000000000..627d510bdf3
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts
@@ -0,0 +1,60 @@
+import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
+import styled from 'styled-components';
+
+export const GroupFieldWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  background-color: #fefefe;
+  padding: 8px;
+  border-radius: 4px;
+  box-shadow: 0 1px 2px 0 rgb(0 0 0 / 15%);
+
+  hr {
+    margin: 10px 0 5px;
+  }
+`;
+const InputContainer = styled.div`
+  display: grid;
+  grid-template-columns: 1fr 1fr 30px;
+  gap: 8px;
+  align-items: stretch;
+  max-width: 500px;
+`;
+export const ButtonWrapper = styled.div`
+  display: flex;
+  gap: 10px;
+`;
+export const RemoveButton = styled(IconButtonWrapper)`
+  align-self: center;
+`;
+export const FlexRow = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 8px;
+  align-items: flex-start;
+`;
+export const FlexGrow1 = styled.div`
+  flex-grow: 1;
+  row-gap: 8px;
+  flex-direction: column;
+  display: flex;
+`;
+// KafkaCluster
+export const BootstrapServer = styled(InputContainer)`
+  grid-template-columns: 3fr 110px 30px;
+`;
+export const BootstrapServerActions = styled(IconButtonWrapper)`
+  align-self: stretch;
+  margin-top: 12px;
+  margin-left: 8px;
+`;
+export const Port = styled.div`
+  width: 110px;
+`;
+
+export const FileUploadInputWrapper = styled.div`
+  display: flex;
+  height: 40px;
+  align-items: center;
+`;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Authentication/Authentication.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Authentication/Authentication.tsx
new file mode 100644
index 00000000000..0fad2cbf11c
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Authentication/Authentication.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { useFormContext } from 'react-hook-form';
+import { AUTH_OPTIONS, SECURITY_PROTOCOL_OPTIONS } from 'lib/constants';
+import ControlledSelect from 'components/common/Select/ControlledSelect';
+import SectionHeader from 'widgets/ClusterConfigForm/common/SectionHeader';
+
+import AuthenticationMethods from './AuthenticationMethods';
+
+const Authentication: React.FC = () => {
+  const { watch, setValue } = useFormContext();
+  const hasAuth = !!watch('auth');
+  const authMethod = watch('auth.method');
+  const hasSecurityProtocolField =
+    authMethod && !['Delegation tokens', 'mTLS'].includes(authMethod);
+
+  const toggle = () =>
+    setValue('auth', hasAuth ? undefined : {}, {
+      shouldValidate: true,
+      shouldDirty: true,
+      shouldTouch: true,
+    });
+
+  return (
+    <>
+      <SectionHeader
+        title="Authentication"
+        adding={!hasAuth}
+        addButtonText="Configure Authentication"
+        onClick={toggle}
+      />
+      {hasAuth && (
+        <>
+          <ControlledSelect
+            name="auth.method"
+            label="Authentication Method"
+            placeholder="Select authentication method"
+            options={AUTH_OPTIONS}
+          />
+          {hasSecurityProtocolField && (
+            <ControlledSelect
+              name="auth.securityProtocol"
+              label="Security Protocol"
+              placeholder="Select security protocol"
+              options={SECURITY_PROTOCOL_OPTIONS}
+            />
+          )}
+          <AuthenticationMethods method={authMethod} />
+        </>
+      )}
+    </>
+  );
+};
+
+export default Authentication;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Authentication/AuthenticationMethods.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Authentication/AuthenticationMethods.tsx
new file mode 100644
index 00000000000..aaf2a7eae8b
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Authentication/AuthenticationMethods.tsx
@@ -0,0 +1,93 @@
+import React from 'react';
+import Input from 'components/common/Input/Input';
+import Checkbox from 'components/common/Checkbox/Checkbox';
+import Fileupload from 'widgets/ClusterConfigForm/common/Fileupload';
+import SSLForm from 'widgets/ClusterConfigForm/common/SSLForm';
+import Credentials from 'widgets/ClusterConfigForm/common/Credentials';
+
+const AuthenticationMethods: React.FC<{ method: string }> = ({ method }) => {
+  switch (method) {
+    case 'SASL/JAAS':
+      return (
+        <>
+          <Input
+            type="text"
+            name="auth.props.saslJaasConfig"
+            label="sasl.jaas.config"
+            withError
+          />
+          <Input
+            type="text"
+            name="auth.props.saslMechanism"
+            label="sasl.mechanism"
+            withError
+          />
+        </>
+      );
+    case 'SASL/GSSAPI':
+      return (
+        <>
+          <Input
+            label="Kerberos service name"
+            type="text"
+            name="auth.props.saslKerberosServiceName"
+            withError
+          />
+          <Checkbox name="auth.props.storeKey" label="Store Key" />
+          <Fileupload name="auth.props.keyTabFile" label="Key Tab (optional)" />
+          <Input
+            type="text"
+            name="auth.props.principal"
+            label="Principal *"
+            withError
+          />
+        </>
+      );
+    case 'SASL/OAUTHBEARER':
+      return (
+        <Input
+          label="Unsecured Login String Claim_sub *"
+          type="text"
+          name="auth.props.unsecuredLoginStringClaim_sub"
+          withError
+        />
+      );
+    case 'SASL/PLAIN':
+    case 'SASL/SCRAM-256':
+    case 'SASL/SCRAM-512':
+    case 'SASL/LDAP':
+      return <Credentials prefix="auth.props" />;
+    case 'Delegation tokens':
+      return (
+        <>
+          <Input
+            label="Token Id"
+            type="text"
+            name="auth.props.tokenId"
+            withError
+          />
+          <Input
+            label="Token Value *"
+            type="text"
+            name="auth.props.tokenValue"
+            withError
+          />
+        </>
+      );
+    case 'SASL/AWS IAM':
+      return (
+        <Input
+          label="AWS Profile Name"
+          type="text"
+          name="auth.props.awsProfileName"
+          withError
+        />
+      );
+    case 'mTLS':
+      return <SSLForm prefix="auth.keystore" title="Keystore" />;
+    default:
+      return null;
+  }
+};
+
+export default AuthenticationMethods;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/CustomAuthentication.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/CustomAuthentication.tsx
new file mode 100644
index 00000000000..c751b9c56d9
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/CustomAuthentication.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import { useFormContext } from 'react-hook-form';
+import Input from 'components/common/Input/Input';
+import { convertFormKeyToPropsKey } from 'widgets/ClusterConfigForm/utils/convertFormKeyToPropsKey';
+import SectionHeader from 'widgets/ClusterConfigForm/common/SectionHeader';
+
+const CustomAuthentication: React.FC = () => {
+  const { watch, setValue } = useFormContext();
+  const customConf = watch('customAuth');
+  const hasCustomConfig =
+    customConf && Object.values(customConf).some((v) => !!v);
+
+  const remove = () =>
+    setValue('customAuth', undefined, {
+      shouldValidate: true,
+      shouldDirty: true,
+      shouldTouch: true,
+    });
+  return (
+    <>
+      <SectionHeader
+        title="Authentication"
+        addButtonText="Configure Authentication"
+        onClick={remove}
+      />
+      {hasCustomConfig && (
+        <>
+          {Object.keys(customConf).map((key) => (
+            <Input
+              key={key}
+              type="text"
+              name={`customAuth.${key}`}
+              label={convertFormKeyToPropsKey(key)}
+              withError
+            />
+          ))}
+        </>
+      )}
+    </>
+  );
+};
+
+export default CustomAuthentication;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KSQL.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KSQL.tsx
new file mode 100644
index 00000000000..8d28ad65c61
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KSQL.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import Input from 'components/common/Input/Input';
+import { useFormContext } from 'react-hook-form';
+import SectionHeader from 'widgets/ClusterConfigForm/common/SectionHeader';
+import SSLForm from 'widgets/ClusterConfigForm/common/SSLForm';
+import Credentials from 'widgets/ClusterConfigForm/common/Credentials';
+
+const KSQL = () => {
+  const { setValue, watch } = useFormContext();
+  const ksql = watch('ksql');
+  const toggleConfig = () => {
+    setValue('ksql', ksql ? undefined : { url: '', isAuth: false }, {
+      shouldValidate: true,
+      shouldDirty: true,
+      shouldTouch: true,
+    });
+  };
+  return (
+    <>
+      <SectionHeader
+        title="KSQL DB"
+        adding={!ksql}
+        addButtonText="Configure KSQL DB"
+        onClick={toggleConfig}
+      />
+      {ksql && (
+        <>
+          <Input
+            label="URL *"
+            name="ksql.url"
+            type="text"
+            placeholder="http://localhost:8088"
+            withError
+          />
+          <Credentials prefix="ksql" title="Is KSQL DB secured with auth?" />
+          <SSLForm prefix="ksql.keystore" title="KSQL DB Keystore" />
+        </>
+      )}
+    </>
+  );
+};
+export default KSQL;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaCluster.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaCluster.tsx
new file mode 100644
index 00000000000..c71f2d72ec0
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaCluster.tsx
@@ -0,0 +1,114 @@
+import React from 'react';
+import Input from 'components/common/Input/Input';
+import { useFieldArray, useFormContext } from 'react-hook-form';
+import { FormError, InputHint } from 'components/common/Input/Input.styled';
+import { ErrorMessage } from '@hookform/error-message';
+import CloseIcon from 'components/common/Icons/CloseIcon';
+import { Button } from 'components/common/Button/Button';
+import PlusIcon from 'components/common/Icons/PlusIcon';
+import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+import Heading from 'components/common/heading/Heading.styled';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import Checkbox from 'components/common/Checkbox/Checkbox';
+import SectionHeader from 'widgets/ClusterConfigForm/common/SectionHeader';
+import SSLForm from 'widgets/ClusterConfigForm/common/SSLForm';
+
+const KafkaCluster: React.FC = () => {
+  const { control, watch, setValue } = useFormContext();
+
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name: 'bootstrapServers',
+  });
+
+  const hasTrustStore = !!watch('truststore');
+
+  const toggleSection = (section: string) => () =>
+    setValue(
+      section,
+      watch(section)
+        ? undefined
+        : {
+            location: '',
+            password: '',
+          },
+      { shouldValidate: true, shouldDirty: true, shouldTouch: true }
+    );
+
+  return (
+    <>
+      <Heading level={3}>Kafka Cluster</Heading>
+      <Input
+        label="Cluster name *"
+        type="text"
+        name="name"
+        withError
+        hint="this name will help you recognize the cluster in the application interface"
+      />
+      <Checkbox
+        name="readOnly"
+        label="Read-only mode"
+        hint="allows you to run an application in read-only mode for a specific cluster"
+      />
+      <div>
+        <InputLabel htmlFor="bootstrapServers">Bootstrap Servers *</InputLabel>
+        <InputHint>
+          the list of Kafka brokers that you want to connect to
+        </InputHint>
+        <S.GroupFieldWrapper>
+          {fields.map((field, index) => (
+            <S.BootstrapServer key={field.id}>
+              <div>
+                <Input
+                  name={`bootstrapServers.${index}.host`}
+                  placeholder="Host"
+                  type="text"
+                  inputSize="L"
+                  withError
+                />
+              </div>
+              <div>
+                <Input
+                  name={`bootstrapServers.${index}.port`}
+                  placeholder="Port"
+                  type="number"
+                  positiveOnly
+                  withError
+                />
+              </div>
+              <S.BootstrapServerActions
+                aria-label="deleteProperty"
+                onClick={() => remove(index)}
+              >
+                <CloseIcon aria-hidden />
+              </S.BootstrapServerActions>
+            </S.BootstrapServer>
+          ))}
+          <FormError>
+            <ErrorMessage name="bootstrapServers" />
+          </FormError>
+          <div>
+            <Button
+              type="button"
+              buttonSize="M"
+              buttonType="secondary"
+              onClick={() => append({ host: '', port: '' })}
+            >
+              <PlusIcon />
+              Add Bootstrap Server
+            </Button>
+          </div>
+        </S.GroupFieldWrapper>
+      </div>
+      <hr />
+      <SectionHeader
+        title="Truststore"
+        addButtonText="Configure Truststore"
+        adding={!hasTrustStore}
+        onClick={toggleSection('truststore')}
+      />
+      {hasTrustStore && <SSLForm prefix="truststore" title="Truststore" />}
+    </>
+  );
+};
+export default KafkaCluster;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaConnect.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaConnect.tsx
new file mode 100644
index 00000000000..4f5840ff236
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaConnect.tsx
@@ -0,0 +1,91 @@
+import * as React from 'react';
+import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+import { Button } from 'components/common/Button/Button';
+import Input from 'components/common/Input/Input';
+import { useFieldArray, useFormContext } from 'react-hook-form';
+import PlusIcon from 'components/common/Icons/PlusIcon';
+import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
+import CloseIcon from 'components/common/Icons/CloseIcon';
+import {
+  FlexGrow1,
+  FlexRow,
+} from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+import SectionHeader from 'widgets/ClusterConfigForm/common/SectionHeader';
+import Credentials from 'widgets/ClusterConfigForm/common/Credentials';
+import SSLForm from 'widgets/ClusterConfigForm/common/SSLForm';
+
+const KafkaConnect = () => {
+  const { control } = useFormContext();
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name: 'kafkaConnect',
+  });
+  const handleAppend = () => append({ name: '', address: '' });
+  const toggleConfig = () => (fields.length === 0 ? handleAppend() : remove());
+
+  const hasFields = fields.length > 0;
+
+  return (
+    <>
+      <SectionHeader
+        title="Kafka Connect"
+        addButtonText="Configure Kafka Connect"
+        adding={!hasFields}
+        onClick={toggleConfig}
+      />
+      {hasFields && (
+        <S.GroupFieldWrapper>
+          {fields.map((item, index) => (
+            <div key={item.id}>
+              <FlexRow>
+                <FlexGrow1>
+                  <Input
+                    label="Kafka Connect name *"
+                    name={`kafkaConnect.${index}.name`}
+                    placeholder="Name"
+                    type="text"
+                    hint="Given name for the Kafka Connect cluster"
+                    withError
+                  />
+                  <Input
+                    label="Kafka Connect URL *"
+                    name={`kafkaConnect.${index}.address`}
+                    placeholder="URl"
+                    type="text"
+                    hint="Address of the Kafka Connect service endpoint"
+                    withError
+                  />
+                  <Credentials
+                    prefix={`kafkaConnect.${index}`}
+                    title="Is connect secured with auth?"
+                  />
+                  <SSLForm
+                    prefix={`kafkaConnect.${index}.keystore`}
+                    title="Keystore"
+                  />
+                </FlexGrow1>
+                <S.RemoveButton onClick={() => remove(index)}>
+                  <IconButtonWrapper aria-label="deleteProperty">
+                    <CloseIcon aria-hidden />
+                  </IconButtonWrapper>
+                </S.RemoveButton>
+              </FlexRow>
+
+              <hr />
+            </div>
+          ))}
+          <Button
+            type="button"
+            buttonSize="M"
+            buttonType="secondary"
+            onClick={handleAppend}
+          >
+            <PlusIcon />
+            Add Kafka Connect
+          </Button>
+        </S.GroupFieldWrapper>
+      )}
+    </>
+  );
+};
+export default KafkaConnect;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Metrics.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Metrics.tsx
new file mode 100644
index 00000000000..e9d67f2014f
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/Metrics.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import Input from 'components/common/Input/Input';
+import { useFormContext } from 'react-hook-form';
+import ControlledSelect from 'components/common/Select/ControlledSelect';
+import { METRICS_OPTIONS } from 'lib/constants';
+import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+import SectionHeader from 'widgets/ClusterConfigForm/common/SectionHeader';
+import SSLForm from 'widgets/ClusterConfigForm/common/SSLForm';
+import Credentials from 'widgets/ClusterConfigForm/common/Credentials';
+
+const Metrics = () => {
+  const { setValue, watch } = useFormContext();
+  const visibleMetrics = !!watch('metrics');
+  const toggleMetrics = () =>
+    setValue(
+      'metrics',
+      visibleMetrics
+        ? undefined
+        : {
+            type: '',
+            port: 0,
+            isAuth: false,
+          },
+      { shouldValidate: true, shouldDirty: true, shouldTouch: true }
+    );
+
+  return (
+    <>
+      <SectionHeader
+        title="Metrics"
+        adding={!visibleMetrics}
+        addButtonText="Configure Metrics"
+        onClick={toggleMetrics}
+      />
+      {visibleMetrics && (
+        <>
+          <ControlledSelect
+            name="metrics.type"
+            label="Metrics Type"
+            placeholder="Choose metrics type"
+            options={METRICS_OPTIONS}
+          />
+          <S.Port>
+            <Input
+              label="Port *"
+              name="metrics.port"
+              type="number"
+              positiveOnly
+              withError
+            />
+          </S.Port>
+          <Credentials prefix="metrics" />
+          <SSLForm prefix="metrics.keystore" title="Metrics Keystore" />
+        </>
+      )}
+    </>
+  );
+};
+export default Metrics;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/SchemaRegistry.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/SchemaRegistry.tsx
new file mode 100644
index 00000000000..bd36ee89348
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/SchemaRegistry.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import Input from 'components/common/Input/Input';
+import { useFormContext } from 'react-hook-form';
+import SectionHeader from 'widgets/ClusterConfigForm/common/SectionHeader';
+import SSLForm from 'widgets/ClusterConfigForm/common/SSLForm';
+import Credentials from 'widgets/ClusterConfigForm/common/Credentials';
+
+const SchemaRegistry = () => {
+  const { setValue, watch } = useFormContext();
+  const schemaRegistry = watch('schemaRegistry');
+  const toggleConfig = () => {
+    setValue(
+      'schemaRegistry',
+      schemaRegistry ? undefined : { url: '', isAuth: false },
+      { shouldValidate: true, shouldDirty: true, shouldTouch: true }
+    );
+  };
+  return (
+    <>
+      <SectionHeader
+        title="Schema Registry"
+        adding={!schemaRegistry}
+        addButtonText="Configure Schema Registry"
+        onClick={toggleConfig}
+      />
+      {schemaRegistry && (
+        <>
+          <Input
+            label="URL *"
+            name="schemaRegistry.url"
+            type="text"
+            placeholder="http://localhost:8081"
+            withError
+          />
+          <Credentials
+            prefix="schemaRegistry"
+            title="Is Schema Registry secured with auth?"
+          />
+          <SSLForm prefix="schemaRegistry.keystore" title="Keystore" />
+        </>
+      )}
+    </>
+  );
+};
+export default SchemaRegistry;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/Credentials.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/Credentials.tsx
new file mode 100644
index 00000000000..f991b11096f
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/Credentials.tsx
@@ -0,0 +1,45 @@
+import * as React from 'react';
+import Input from 'components/common/Input/Input';
+import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+import Checkbox from 'components/common/Checkbox/Checkbox';
+import { useFormContext } from 'react-hook-form';
+
+type CredentialsProps = {
+  prefix: string;
+  title?: string;
+};
+
+const Credentials: React.FC<CredentialsProps> = ({
+  prefix,
+  title = 'Secured with auth?',
+}) => {
+  const { watch } = useFormContext();
+
+  return (
+    <S.GroupFieldWrapper>
+      <Checkbox name={`${prefix}.isAuth`} label={title} />
+      {watch(`${prefix}.isAuth`) && (
+        <S.FlexRow>
+          <S.FlexGrow1>
+            <Input
+              label="Username *"
+              type="text"
+              name={`${prefix}.username`}
+              withError
+            />
+          </S.FlexGrow1>
+          <S.FlexGrow1>
+            <Input
+              label="Password *"
+              type="password"
+              name={`${prefix}.password`}
+              withError
+            />
+          </S.FlexGrow1>
+        </S.FlexRow>
+      )}
+    </S.GroupFieldWrapper>
+  );
+};
+
+export default Credentials;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/Fileupload.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/Fileupload.tsx
new file mode 100644
index 00000000000..4a6244ada00
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/Fileupload.tsx
@@ -0,0 +1,67 @@
+import * as React from 'react';
+import { FormError } from 'components/common/Input/Input.styled';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import { ErrorMessage } from '@hookform/error-message';
+import { useFormContext } from 'react-hook-form';
+import Input from 'components/common/Input/Input';
+import { Button } from 'components/common/Button/Button';
+import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+import { useAppConfigFilesUpload } from 'lib/hooks/api/appConfig';
+
+const Fileupload: React.FC<{ name: string; label: string }> = ({
+  name,
+  label,
+}) => {
+  const upload = useAppConfigFilesUpload();
+
+  const id = React.useId();
+  const { watch, setValue } = useFormContext();
+  const loc = watch(name);
+
+  const handleFileChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (e.target.files) {
+      const formData = new FormData();
+      const file = e.target.files[0];
+      formData.append('file', file);
+      const resp = await upload.mutateAsync(formData);
+      setValue(name, resp.location, {
+        shouldValidate: true,
+        shouldDirty: true,
+      });
+    }
+  };
+
+  const onReset = () => {
+    setValue(name, '', { shouldValidate: true, shouldDirty: true });
+  };
+
+  return (
+    <div>
+      <InputLabel htmlFor={id}>{label}</InputLabel>
+
+      {loc ? (
+        <S.FlexRow>
+          <S.FlexGrow1>
+            <Input name={name} disabled />
+          </S.FlexGrow1>
+          <Button buttonType="secondary" buttonSize="L" onClick={onReset}>
+            Reset
+          </Button>
+        </S.FlexRow>
+      ) : (
+        <S.FileUploadInputWrapper>
+          {upload.isLoading ? (
+            <p>Uploading...</p>
+          ) : (
+            <input type="file" onChange={handleFileChange} />
+          )}
+        </S.FileUploadInputWrapper>
+      )}
+      <FormError>
+        <ErrorMessage name={name} />
+      </FormError>
+    </div>
+  );
+};
+
+export default Fileupload;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/SSLForm.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/SSLForm.tsx
new file mode 100644
index 00000000000..98877a3d29e
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/SSLForm.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import Input from 'components/common/Input/Input';
+import Fileupload from 'widgets/ClusterConfigForm/common/Fileupload';
+import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+
+type SSLFormProps = {
+  prefix: string;
+  title: string;
+};
+
+const SSLForm: React.FC<SSLFormProps> = ({ prefix, title }) => {
+  return (
+    <S.GroupFieldWrapper>
+      <Fileupload name={`${prefix}.location`} label={`${title} Location`} />
+      <Input
+        label={`${title} Password`}
+        name={`${prefix}.password`}
+        type="password"
+        withError
+      />
+    </S.GroupFieldWrapper>
+  );
+};
+
+export default SSLForm;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/SectionHeader.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/SectionHeader.tsx
new file mode 100644
index 00000000000..1265459b5c1
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/common/SectionHeader.tsx
@@ -0,0 +1,31 @@
+import * as React from 'react';
+import { Button } from 'components/common/Button/Button';
+import Heading from 'components/common/heading/Heading.styled';
+import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+
+interface SectionHeaderProps {
+  title: string;
+  addButtonText: string;
+  adding?: boolean;
+  onClick: () => void;
+}
+
+const SectionHeader: React.FC<SectionHeaderProps> = ({
+  adding,
+  title,
+  addButtonText,
+  onClick,
+}) => {
+  return (
+    <S.FlexRow>
+      <S.FlexGrow1>
+        <Heading level={3}>{title}</Heading>
+      </S.FlexGrow1>
+      <Button buttonSize="M" buttonType="primary" onClick={onClick}>
+        {adding ? addButtonText : 'Remove from config'}
+      </Button>
+    </S.FlexRow>
+  );
+};
+
+export default SectionHeader;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx
new file mode 100644
index 00000000000..8bd0c3f1257
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx
@@ -0,0 +1,155 @@
+import React from 'react';
+import { Button } from 'components/common/Button/Button';
+import { useForm, FormProvider } from 'react-hook-form';
+import { yupResolver } from '@hookform/resolvers/yup';
+import formSchema from 'widgets/ClusterConfigForm/schema';
+import { FlexFieldset, StyledForm } from 'components/common/Form/Form.styled';
+import {
+  useUpdateAppConfig,
+  useValidateAppConfig,
+} from 'lib/hooks/api/appConfig';
+import { ClusterConfigFormValues } from 'widgets/ClusterConfigForm/types';
+import { transformFormDataToPayload } from 'widgets/ClusterConfigForm/utils/transformFormDataToPayload';
+import { showAlert, showSuccessAlert } from 'lib/errorHandling';
+import { getIsValidConfig } from 'widgets/ClusterConfigForm/utils/getIsValidConfig';
+import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
+import { useNavigate } from 'react-router-dom';
+import useBoolean from 'lib/hooks/useBoolean';
+import KafkaCluster from 'widgets/ClusterConfigForm/Sections/KafkaCluster';
+import SchemaRegistry from 'widgets/ClusterConfigForm/Sections/SchemaRegistry';
+import KafkaConnect from 'widgets/ClusterConfigForm/Sections/KafkaConnect';
+import Metrics from 'widgets/ClusterConfigForm/Sections/Metrics';
+import CustomAuthentication from 'widgets/ClusterConfigForm/Sections/CustomAuthentication';
+import Authentication from 'widgets/ClusterConfigForm/Sections/Authentication/Authentication';
+import KSQL from 'widgets/ClusterConfigForm/Sections/KSQL';
+
+interface ClusterConfigFormProps {
+  hasCustomConfig?: boolean;
+  initialValues?: Partial<ClusterConfigFormValues>;
+}
+
+const CLUSTER_CONFIG_FORM_DEFAULT_VALUES: Partial<ClusterConfigFormValues> = {
+  bootstrapServers: [{ host: '', port: '' }],
+};
+
+const ClusterConfigForm: React.FC<ClusterConfigFormProps> = ({
+  initialValues = {},
+  hasCustomConfig,
+}) => {
+  const navigate = useNavigate();
+  const methods = useForm<ClusterConfigFormValues>({
+    mode: 'all',
+    resolver: yupResolver(formSchema),
+    defaultValues: {
+      ...CLUSTER_CONFIG_FORM_DEFAULT_VALUES,
+      ...initialValues,
+    },
+  });
+  const {
+    formState: { isSubmitting, isDirty },
+    trigger,
+  } = methods;
+
+  const validate = useValidateAppConfig();
+  const update = useUpdateAppConfig({ initialName: initialValues.name });
+  const {
+    value: isFormDisabled,
+    setTrue: disableForm,
+    setFalse: enableForm,
+  } = useBoolean();
+
+  const onSubmit = async (data: ClusterConfigFormValues) => {
+    const config = transformFormDataToPayload(data);
+    try {
+      await update.mutateAsync(config);
+      navigate('/');
+    } catch (e) {
+      showAlert('error', {
+        id: 'app-config-update-error',
+        title: 'Error updating application config',
+        message: 'There was an error updating the application config',
+      });
+    }
+  };
+
+  const onReset = () => methods.reset();
+
+  const onValidate = async () => {
+    await trigger();
+    if (!methods.formState.isValid) return;
+    disableForm();
+    const data = methods.getValues();
+    const config = transformFormDataToPayload(data);
+
+    try {
+      const response = await validate.mutateAsync(config);
+      const isConfigValid = getIsValidConfig(response, data.name);
+      if (isConfigValid) {
+        showSuccessAlert({
+          message: 'Configuration is valid',
+        });
+      }
+    } catch (e) {
+      showAlert('error', {
+        id: 'app-config-validate-error',
+        title: 'Error validating application config',
+        message: 'There was an error validating the application config',
+      });
+    }
+    enableForm();
+  };
+
+  const showCustomConfig = methods.watch('customAuth') && hasCustomConfig;
+
+  const isValidateDisabled = isSubmitting;
+  const isSubmitDisabled = isSubmitting || !isDirty;
+
+  return (
+    <FormProvider {...methods}>
+      <StyledForm onSubmit={methods.handleSubmit(onSubmit)}>
+        <FlexFieldset disabled={isFormDisabled || isSubmitting}>
+          <KafkaCluster />
+          <hr />
+          {showCustomConfig ? <CustomAuthentication /> : <Authentication />}
+          <hr />
+          <SchemaRegistry />
+          <hr />
+          <KafkaConnect />
+          <hr />
+          <KSQL />
+          <hr />
+          <Metrics />
+          <hr />
+          <S.ButtonWrapper>
+            <Button
+              buttonSize="L"
+              buttonType="secondary"
+              onClick={onReset}
+              disabled={isSubmitting}
+            >
+              Reset
+            </Button>
+            <Button
+              buttonSize="L"
+              buttonType="secondary"
+              onClick={onValidate}
+              disabled={isValidateDisabled}
+            >
+              Validate
+            </Button>
+            <Button
+              type="submit"
+              buttonSize="L"
+              buttonType="primary"
+              disabled={isSubmitDisabled}
+            >
+              Submit
+            </Button>
+          </S.ButtonWrapper>
+        </FlexFieldset>
+      </StyledForm>
+    </FormProvider>
+  );
+};
+
+export default ClusterConfigForm;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/schema.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/schema.ts
new file mode 100644
index 00000000000..abd17f34bf3
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/schema.ts
@@ -0,0 +1,194 @@
+import { isArray } from 'lodash';
+import { object, string, number, array, boolean, mixed, lazy } from 'yup';
+
+const requiredString = string().required('required field');
+
+const portSchema = number()
+  .positive('positive only')
+  .typeError('numbers only')
+  .required('required');
+
+const bootstrapServerSchema = object({
+  host: requiredString,
+  port: portSchema,
+});
+
+const sslSchema = lazy((value) => {
+  if (typeof value === 'object') {
+    return object({
+      location: string().when('password', {
+        is: (v: string) => !!v,
+        then: (schema) => schema.required('required field'),
+      }),
+      password: string(),
+    });
+  }
+  return mixed().optional();
+});
+
+const urlWithAuthSchema = lazy((value) => {
+  if (typeof value === 'object') {
+    return object({
+      url: requiredString,
+      isAuth: boolean(),
+      username: string().when('isAuth', {
+        is: true,
+        then: (schema) => schema.required('required field'),
+      }),
+      password: string().when('isAuth', {
+        is: true,
+        then: (schema) => schema.required('required field'),
+      }),
+      keystore: sslSchema,
+    });
+  }
+  return mixed().optional();
+});
+
+const kafkaConnectSchema = object({
+  name: requiredString,
+  address: requiredString,
+  isAuth: boolean(),
+  username: string().when('isAuth', {
+    is: true,
+    then: (schema) => schema.required('required field'),
+  }),
+  password: string().when('isAuth', {
+    is: true,
+    then: (schema) => schema.required('required field'),
+  }),
+  keystore: sslSchema,
+});
+
+const kafkaConnectsSchema = lazy((value) => {
+  if (isArray(value)) {
+    return array().of(kafkaConnectSchema);
+  }
+  return mixed().optional();
+});
+
+const metricsSchema = lazy((value) => {
+  if (typeof value === 'object') {
+    return object({
+      type: string().oneOf(['JMX', 'PROMETHEUS']).required('required field'),
+      port: portSchema,
+      isAuth: boolean(),
+      username: string().when('isAuth', {
+        is: true,
+        then: (schema) => schema.required('required field'),
+      }),
+      password: string().when('isAuth', {
+        is: true,
+        then: (schema) => schema.required('required field'),
+      }),
+      keystore: sslSchema,
+    });
+  }
+  return mixed().optional();
+});
+
+const authPropsSchema = lazy((_, { parent }) => {
+  switch (parent.method) {
+    case 'SASL/JAAS':
+      return object({
+        saslJaasConfig: requiredString,
+        saslMechanism: requiredString,
+      });
+    case 'SASL/GSSAPI':
+      return object({
+        saslKerberosServiceName: requiredString,
+        keyTabFile: string(),
+        storeKey: boolean(),
+        principal: requiredString,
+      });
+    case 'SASL/OAUTHBEARER':
+      return object({
+        unsecuredLoginStringClaim_sub: requiredString,
+      });
+    case 'SASL/PLAIN':
+    case 'SASL/SCRAM-256':
+    case 'SASL/SCRAM-512':
+    case 'SASL/LDAP':
+      return object({
+        username: requiredString,
+        password: requiredString,
+      });
+    case 'Delegation tokens':
+      return object({
+        tokenId: requiredString,
+        tokenValue: requiredString,
+      });
+    case 'SASL/AWS IAM':
+      return object({
+        awsProfileName: string(),
+      });
+    case 'mTLS':
+    default:
+      return mixed().optional();
+  }
+});
+
+const authSchema = lazy((value) => {
+  if (typeof value === 'object') {
+    return object({
+      method: string()
+        .required('required field')
+        .oneOf([
+          'SASL/JAAS',
+          'SASL/GSSAPI',
+          'SASL/OAUTHBEARER',
+          'SASL/PLAIN',
+          'SASL/SCRAM-256',
+          'SASL/SCRAM-512',
+          'Delegation tokens',
+          'SASL/LDAP',
+          'SASL/AWS IAM',
+          'mTLS',
+        ]),
+      securityProtocol: string()
+        .oneOf(['SASL_SSL', 'SASL_PLAINTEXT'])
+        .when('method', {
+          is: (v: string) => {
+            return [
+              'SASL/JAAS',
+              'SASL/GSSAPI',
+              'SASL/OAUTHBEARER',
+              'SASL/PLAIN',
+              'SASL/SCRAM-256',
+              'SASL/SCRAM-512',
+              'SASL/LDAP',
+              'SASL/AWS IAM',
+            ].includes(v);
+          },
+          then: (schema) => schema.required('required field'),
+        }),
+      keystore: lazy((_, { parent }) => {
+        if (parent.method === 'mTLS') {
+          return object({
+            location: requiredString,
+            password: string(),
+          });
+        }
+        return mixed().optional();
+      }),
+      props: authPropsSchema,
+    });
+  }
+  return mixed().optional();
+});
+
+const formSchema = object({
+  name: string()
+    .required('required field')
+    .min(3, 'Cluster name must be at least 3 characters'),
+  readOnly: boolean().required('required field'),
+  bootstrapServers: array().of(bootstrapServerSchema).min(1),
+  truststore: sslSchema,
+  auth: authSchema,
+  schemaRegistry: urlWithAuthSchema,
+  ksql: urlWithAuthSchema,
+  kafkaConnect: kafkaConnectsSchema,
+  metrics: metricsSchema,
+});
+
+export default formSchema;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/types.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/types.ts
new file mode 100644
index 00000000000..6af74b5f848
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/types.ts
@@ -0,0 +1,56 @@
+type SecurityProtocol = 'SASL_SSL' | 'SASL_PLAINTEXT';
+type BootstrapServer = {
+  host: string;
+  port: string;
+};
+
+type WithKeystore = {
+  keystore?: {
+    location: string;
+    password: string;
+  };
+};
+
+type WithAuth = {
+  isAuth: boolean;
+  username?: string;
+  password?: string;
+};
+
+type URLWithAuth = WithAuth &
+  WithKeystore & {
+    url?: string;
+  };
+
+type KafkaConnect = WithAuth &
+  WithKeystore & {
+    name: string;
+    address: string;
+  };
+
+type Metrics = WithAuth &
+  WithKeystore & {
+    type: string;
+    port: string;
+  };
+
+export type ClusterConfigFormValues = {
+  name: string;
+  readOnly: boolean;
+  bootstrapServers: BootstrapServer[];
+  truststore?: {
+    location: string;
+    password: string;
+  };
+  auth?: WithKeystore & {
+    method: string;
+    securityProtocol: SecurityProtocol;
+    props: Record<string, string>;
+  };
+  schemaRegistry?: URLWithAuth;
+  ksql?: URLWithAuth;
+  properties?: Record<string, string>;
+  kafkaConnect?: KafkaConnect[];
+  metrics?: Metrics;
+  customAuth: Record<string, string>;
+};
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/convertFormKeyToPropsKey.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/convertFormKeyToPropsKey.ts
new file mode 100644
index 00000000000..1759b3b5f6b
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/convertFormKeyToPropsKey.ts
@@ -0,0 +1,3 @@
+export const convertFormKeyToPropsKey = (key: string) => {
+  return key.split('___').join('.');
+};
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/convertPropsKeyToFormKey.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/convertPropsKeyToFormKey.ts
new file mode 100644
index 00000000000..37312be7456
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/convertPropsKeyToFormKey.ts
@@ -0,0 +1,3 @@
+export const convertPropsKeyToFormKey = (key: string) => {
+  return key.split('.').join('___');
+};
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getInitialFormData.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getInitialFormData.ts
new file mode 100644
index 00000000000..73a945818df
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getInitialFormData.ts
@@ -0,0 +1,121 @@
+import {
+  ApplicationConfigPropertiesKafkaClusters,
+  ApplicationConfigPropertiesKafkaSchemaRegistrySsl,
+} from 'generated-sources';
+import { ClusterConfigFormValues } from 'widgets/ClusterConfigForm/types';
+
+import { convertPropsKeyToFormKey } from './convertPropsKeyToFormKey';
+
+const parseBootstrapServers = (bootstrapServers?: string) =>
+  bootstrapServers?.split(',').map((url) => {
+    const [host, port] = url.split(':');
+    return { host, port };
+  });
+
+const parseKeystore = (
+  keystore?: ApplicationConfigPropertiesKafkaSchemaRegistrySsl
+) => {
+  if (!keystore) return undefined;
+  const { keystoreLocation, keystorePassword } = keystore;
+  return {
+    keystore: {
+      location: keystoreLocation as string,
+      password: keystorePassword as string,
+    },
+  };
+};
+
+const parseCredentials = (username?: string, password?: string) => {
+  if (!username || !password) return { isAuth: false };
+  return { isAuth: true, username, password };
+};
+
+export const getInitialFormData = (
+  payload: ApplicationConfigPropertiesKafkaClusters
+) => {
+  const {
+    ssl,
+    schemaRegistry,
+    schemaRegistryAuth,
+    schemaRegistrySsl,
+    kafkaConnect,
+    metrics,
+    ksqldbServer,
+    ksqldbServerAuth,
+    ksqldbServerSsl,
+  } = payload;
+
+  const initialValues: Partial<ClusterConfigFormValues> = {
+    name: payload.name as string,
+    readOnly: !!payload.readOnly,
+    bootstrapServers: parseBootstrapServers(payload.bootstrapServers),
+  };
+
+  const { truststoreLocation, truststorePassword } = ssl || {};
+
+  if (truststoreLocation && truststorePassword) {
+    initialValues.truststore = {
+      location: truststoreLocation,
+      password: truststorePassword,
+    };
+  }
+
+  if (schemaRegistry) {
+    initialValues.schemaRegistry = {
+      url: schemaRegistry,
+      ...parseCredentials(
+        schemaRegistryAuth?.username,
+        schemaRegistryAuth?.password
+      ),
+      ...parseKeystore(schemaRegistrySsl),
+    };
+  }
+  if (ksqldbServer) {
+    initialValues.ksql = {
+      url: ksqldbServer,
+      ...parseCredentials(
+        ksqldbServerAuth?.username,
+        ksqldbServerAuth?.password
+      ),
+      ...parseKeystore(ksqldbServerSsl),
+    };
+  }
+
+  if (kafkaConnect && kafkaConnect.length > 0) {
+    initialValues.kafkaConnect = kafkaConnect.map((c) => ({
+      name: c.name as string,
+      address: c.address as string,
+      ...parseCredentials(c.username, c.password),
+      ...parseKeystore(c),
+    }));
+  }
+
+  if (metrics) {
+    initialValues.metrics = {
+      type: metrics.type as string,
+      ...parseCredentials(metrics.username, metrics.password),
+      ...parseKeystore(metrics),
+      port: `${metrics.port}`,
+    };
+  }
+
+  const properties = payload.properties || {};
+
+  // Authentification
+  initialValues.customAuth = {};
+
+  Object.entries(properties).forEach(([key, val]) => {
+    if (
+      key.startsWith('security.') ||
+      key.startsWith('sasl.') ||
+      key.startsWith('ssl.')
+    ) {
+      initialValues.customAuth = {
+        ...initialValues.customAuth,
+        [convertPropsKeyToFormKey(key)]: val,
+      };
+    }
+  });
+
+  return initialValues as ClusterConfigFormValues;
+};
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getIsValidConfig.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getIsValidConfig.ts
new file mode 100644
index 00000000000..d39f1aebffe
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getIsValidConfig.ts
@@ -0,0 +1,49 @@
+import { ApplicationConfigValidation } from 'generated-sources';
+import { showAlert } from 'lib/errorHandling';
+
+export const getIsValidConfig = (
+  { clusters }: ApplicationConfigValidation,
+  name: string
+) => {
+  let isValid = true;
+  const prefix = `cluster-${name}`;
+  const clusterErrors = clusters?.[name];
+
+  if (clusterErrors?.kafka?.error) {
+    isValid = false;
+    showAlert('error', {
+      id: `${prefix}-kafka`,
+      title: 'Kafka Cluster',
+      message: clusterErrors?.kafka.errorMessage,
+    });
+  }
+  if (clusterErrors?.schemaRegistry?.error) {
+    isValid = false;
+    showAlert('error', {
+      id: `${prefix}-schemaRegistry`,
+      title: 'Schema Registry',
+      message: clusterErrors?.schemaRegistry.errorMessage,
+    });
+  }
+  if (clusterErrors?.ksqldb?.error) {
+    isValid = false;
+    showAlert('error', {
+      id: `${prefix}-ksqldb`,
+      title: 'KSQL DB',
+      message: clusterErrors?.ksqldb?.errorMessage,
+    });
+  }
+  if (clusterErrors?.kafkaConnects) {
+    Object.entries(clusterErrors.kafkaConnects).forEach(([key, val]) => {
+      if (val?.error) {
+        isValid = false;
+        showAlert('error', {
+          id: `${prefix}-kafkaConnects-${key}`,
+          title: `Kafka Connect. ${key}`,
+          message: val.errorMessage,
+        });
+      }
+    });
+  }
+  return isValid;
+};
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getJaasConfig.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getJaasConfig.ts
new file mode 100644
index 00000000000..065612451fc
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getJaasConfig.ts
@@ -0,0 +1,27 @@
+import { isUndefined } from 'lodash';
+
+const JAAS_CONFIGS = {
+  'SASL/GSSAPI': 'com.sun.security.auth.module.Krb5LoginModule',
+  'SASL/OAUTHBEARER':
+    'org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule',
+  'SASL/PLAIN': 'org.apache.kafka.common.security.plain.PlainLoginModule',
+  'SASL/SCRAM-256': 'org.apache.kafka.common.security.scram.ScramLoginModule',
+  'SASL/SCRAM-512': 'org.apache.kafka.common.security.scram.ScramLoginModule',
+  'Delegation tokens':
+    'org.apache.kafka.common.security.scram.ScramLoginModule',
+  'SASL/LDAP': 'org.apache.kafka.common.security.plain.PlainLoginModule',
+  'SASL/AWS IAM': 'software.amazon.msk.auth.iam.IAMLoginModule',
+};
+
+type MethodName = keyof typeof JAAS_CONFIGS;
+
+export const getJaasConfig = (
+  method: MethodName,
+  options: Record<string, string>
+) => {
+  const optionsString = Object.entries(options)
+    .map(([key, value]) => (isUndefined(value) ? null : ` ${key}="${value}"`))
+    .join('');
+
+  return `${JAAS_CONFIGS[method]} required${optionsString};`;
+};
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts
new file mode 100644
index 00000000000..0a5d6c35235
--- /dev/null
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts
@@ -0,0 +1,231 @@
+import { ClusterConfigFormValues } from 'widgets/ClusterConfigForm/types';
+import { ApplicationConfigPropertiesKafkaClusters } from 'generated-sources';
+
+import { getJaasConfig } from './getJaasConfig';
+import { convertFormKeyToPropsKey } from './convertFormKeyToPropsKey';
+
+const transformToKeystore = (keystore?: {
+  location: string;
+  password: string;
+}) => {
+  if (!keystore || !keystore.location) return undefined;
+  return {
+    keystoreLocation: keystore.location,
+    keystorePassword: keystore.password,
+  };
+};
+
+const transformToCredentials = (
+  isAuth: boolean,
+  username?: string,
+  password?: string
+) => {
+  if (!isAuth || !username || !password) return undefined;
+  return { username, password };
+};
+
+const transformCustomProps = (props: Record<string, string>) => {
+  const config: Record<string, string> = {};
+  if (!props) return config;
+
+  Object.entries(props).forEach(([key, val]) => {
+    if (props[key]) config[convertFormKeyToPropsKey(key)] = val;
+  });
+
+  return config;
+};
+
+export const transformFormDataToPayload = (data: ClusterConfigFormValues) => {
+  const config: ApplicationConfigPropertiesKafkaClusters = {
+    name: data.name,
+    bootstrapServers: data.bootstrapServers
+      .map(({ host, port }) => `${host}:${port}`)
+      .join(','),
+    readOnly: data.readOnly,
+  };
+
+  if (data.truststore) {
+    config.ssl = {
+      truststoreLocation: data.truststore?.location,
+      truststorePassword: data.truststore?.password,
+    };
+  }
+
+  // Schema Registry
+  if (data.schemaRegistry) {
+    config.schemaRegistry = data.schemaRegistry.url;
+    config.schemaRegistryAuth = transformToCredentials(
+      data.schemaRegistry.isAuth,
+      data.schemaRegistry.username,
+      data.schemaRegistry.password
+    );
+    config.schemaRegistrySsl = transformToKeystore(
+      data.schemaRegistry.keystore
+    );
+  }
+
+  // KSQL
+  if (data.ksql) {
+    config.ksqldbServer = data.ksql.url;
+    config.ksqldbServerAuth = transformToCredentials(
+      data.ksql.isAuth,
+      data.ksql.username,
+      data.ksql.password
+    );
+    config.ksqldbServerSsl = transformToKeystore(data.ksql.keystore);
+  }
+
+  // Kafka Connect
+  if (data.kafkaConnect && data.kafkaConnect.length > 0) {
+    config.kafkaConnect = data.kafkaConnect.map(
+      ({ name, address, isAuth, username, password, keystore }) => ({
+        name,
+        address,
+        ...transformToKeystore(keystore),
+        ...transformToCredentials(isAuth, username, password),
+      })
+    );
+  }
+
+  // Metrics
+  if (data.metrics) {
+    config.metrics = {
+      type: data.metrics.type,
+      port: Number(data.metrics.port),
+      ...transformToKeystore(data.metrics.keystore),
+      ...transformToCredentials(
+        data.metrics.isAuth,
+        data.metrics.username,
+        data.metrics.password
+      ),
+    };
+  }
+
+  config.properties = {
+    ...transformCustomProps(data.customAuth),
+  };
+
+  // Authentication
+  if (data.auth) {
+    const { method, props, securityProtocol, keystore } = data.auth;
+    switch (method) {
+      case 'SASL/JAAS':
+        config.properties = {
+          'security.protocol': securityProtocol,
+          'sasl.jaas.config': props.saslJaasConfig,
+          'sasl.mechanism': props.saslMechanism,
+        };
+        break;
+      case 'SASL/GSSAPI':
+        config.properties = {
+          'security.protocol': securityProtocol,
+          'sasl.mechanism': 'GSSAPI',
+          'sasl.kerberos.service.name': props.saslKerberosServiceName,
+          'sasl.jaas.config': getJaasConfig('SASL/GSSAPI', {
+            useKeytab: props.keyTabFile ? 'true' : 'false',
+            keyTab: props.keyTabFile,
+            storeKey: String(!!props.storeKey),
+            principal: props.principal,
+          }),
+        };
+        break;
+      case 'SASL/OAUTHBEARER':
+        config.properties = {
+          'security.protocol': securityProtocol,
+          'sasl.mechanism': 'OAUTHBEARER',
+          'sasl.jaas.config': getJaasConfig('SASL/OAUTHBEARER', {
+            unsecuredLoginStringClaim_sub: props.unsecuredLoginStringClaim_sub,
+          }),
+        };
+        break;
+      case 'SASL/PLAIN':
+        config.properties = {
+          'security.protocol': securityProtocol,
+          'sasl.mechanism': 'PLAIN',
+          'sasl.jaas.config': getJaasConfig(
+            'SASL/PLAIN',
+            transformToCredentials(
+              Boolean(props.isAuth),
+              props.username,
+              props.password
+            ) || {}
+          ),
+        };
+        break;
+      case 'SASL/SCRAM-256':
+        config.properties = {
+          'security.protocol': securityProtocol,
+          'sasl.mechanism': 'SCRAM-SHA-256',
+          'sasl.jaas.config': getJaasConfig(
+            'SASL/SCRAM-256',
+            transformToCredentials(
+              Boolean(props.isAuth),
+              props.username,
+              props.password
+            ) || {}
+          ),
+        };
+        break;
+      case 'SASL/SCRAM-512':
+        config.properties = {
+          'security.protocol': securityProtocol,
+          'sasl.mechanism': 'SCRAM-SHA-512',
+          'sasl.jaas.config': getJaasConfig(
+            'SASL/SCRAM-512',
+            transformToCredentials(
+              Boolean(props.isAuth),
+              props.username,
+              props.password
+            ) || {}
+          ),
+        };
+        break;
+      case 'Delegation tokens':
+        config.properties = {
+          'security.protocol': securityProtocol,
+          'sasl.jaas.config': getJaasConfig('Delegation tokens', {
+            username: props.tokenId,
+            password: props.tokenValue,
+            tokenauth: 'true',
+          }),
+        };
+        break;
+      case 'SASL/LDAP':
+        config.properties = {
+          'security.protocol': securityProtocol,
+          'sasl.mechanism': 'PLAIN',
+          'sasl.jaas.config': getJaasConfig(
+            'SASL/LDAP',
+            transformToCredentials(
+              Boolean(props.isAuth),
+              props.username,
+              props.password
+            ) || {}
+          ),
+        };
+        break;
+      case 'SASL/AWS IAM':
+        config.properties = {
+          'security.protocol': securityProtocol,
+          'sasl.mechanism': 'AWS_MSK_IAM',
+          'sasl.client.callback.handler.class':
+            'software.amazon.msk.auth.iam.IAMClientCallbackHandler',
+          'sasl.jaas.config': getJaasConfig('SASL/AWS IAM', {
+            awsProfileName: props.awsProfileName,
+          }),
+        };
+        break;
+      case 'mTLS':
+        config.properties = {
+          'security.protocol': 'SSL',
+          'ssl.keystore.location': keystore?.location,
+          'ssl.keystore.password': keystore?.password,
+        };
+        break;
+      default:
+      // do nothing
+    }
+  }
+
+  return config;
+};

From f2a2574ddc8bbe20776071569935922c3593d5e7 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 9 Mar 2023 19:46:19 +0300
Subject: [PATCH 432/734] [Helm] Release 0.6.0 (#3471)

Co-authored-by: github-actions <github-actions@github.com>
---
 charts/kafka-ui/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 4f36aa7f0b1..553d193b791 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.5.4
-appVersion: v0.5.0
+version: 0.6.0
+appVersion: v0.6.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

From 8ac760119cecc85172ef7582726e6ff5fab606cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 22:06:47 +0400
Subject: [PATCH 433/734] Bump mockito.version from 4.9.0 to 5.1.1 (#3402)

Bumps `mockito.version` from 4.9.0 to 5.1.1.

Updates `mockito-core` from 4.9.0 to 5.1.1
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v5.1.1)

Updates `mockito-junit-jupiter` from 4.9.0 to 5.1.1
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v5.1.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-major
- dependency-name: org.mockito:mockito-junit-jupiter
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9266c2c14fb..929ed9cee2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 
         <!-- Test dependency versions -->
         <junit.version>5.9.1</junit.version>
-        <mockito.version>4.9.0</mockito.version>
+        <mockito.version>5.1.1</mockito.version>
         <okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>
         <testcontainers.version>1.17.5</testcontainers.version>
 

From b366d3a5206f3562b61de7dc5d39e3d9cde26a2b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 22:07:07 +0400
Subject: [PATCH 434/734] Bump antlr4-maven-plugin.version from 4.7.1 to 4.12.0
 (#3380)

Bumps `antlr4-maven-plugin.version` from 4.7.1 to 4.12.0.

Updates `antlr4-runtime` from 4.7.1 to 4.12.0
- [Release notes](https://github.com/antlr/antlr4/releases)
- [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt)
- [Commits](https://github.com/antlr/antlr4/compare/4.7.1...4.12.0)

Updates `antlr4-maven-plugin` from 4.7.1 to 4.12.0
- [Release notes](https://github.com/antlr/antlr4/releases)
- [Changelog](https://github.com/antlr/antlr4/blob/master/CHANGES.txt)
- [Commits](https://github.com/antlr/antlr4/compare/4.7.1...4.12.0)

---
updated-dependencies:
- dependency-name: org.antlr:antlr4-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: org.antlr:antlr4-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 929ed9cee2c..dc1f50f1a21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
         <git.revision>latest</git.revision>
 
         <!-- Dependency versions -->
-        <antlr4-maven-plugin.version>4.7.1</antlr4-maven-plugin.version>
+        <antlr4-maven-plugin.version>4.12.0</antlr4-maven-plugin.version>
         <apache.commons.version>2.11.1</apache.commons.version>
         <assertj.version>3.19.0</assertj.version>
         <avro.version>1.11.1</avro.version>

From 1f2c3bcb73e69021dc6b6a447e61d6d1ca3c0518 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 22:09:17 +0400
Subject: [PATCH 435/734] Bump actions/stale from 6 to 7 (#3132)

Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
index aafb50cedad..0a5d2e064c4 100644
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v7
         with:
           days-before-issue-stale: 7
           days-before-issue-close: 3

From c5ac7fbe11db698708a6d270d57c101c824a5208 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 22:09:46 +0400
Subject: [PATCH 436/734] Bump kentaro-m/task-completed-checker-action from
 0.1.0 to 0.1.1 (#3411)

Bumps [kentaro-m/task-completed-checker-action](https://github.com/kentaro-m/task-completed-checker-action) from 0.1.0 to 0.1.1.
- [Release notes](https://github.com/kentaro-m/task-completed-checker-action/releases)
- [Commits](https://github.com/kentaro-m/task-completed-checker-action/compare/v0.1.0...v0.1.1)

---
updated-dependencies:
- dependency-name: kentaro-m/task-completed-checker-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/pr-checks.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
index 74ff75b833d..80f4e6eddc1 100644
--- a/.github/workflows/pr-checks.yaml
+++ b/.github/workflows/pr-checks.yaml
@@ -7,7 +7,7 @@ jobs:
   task-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: kentaro-m/task-completed-checker-action@v0.1.0
+      - uses: kentaro-m/task-completed-checker-action@v0.1.1
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: dekinderfiets/pr-description-enforcer@0.0.1

From d5a5f66528ee6dbb73d182a864e74a9a04c2e384 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 22:10:11 +0400
Subject: [PATCH 437/734] Bump svenstaro/upload-release-action from 2.4.1 to
 2.5.0 (#3410)

Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/svenstaro/upload-release-action/releases)
- [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenstaro/upload-release-action/compare/2.4.1...2.5.0)

---
updated-dependencies:
- dependency-name: svenstaro/upload-release-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6906ff063c9..1990fbdbc55 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -34,7 +34,7 @@ jobs:
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Upload files to a GitHub release
-        uses: svenstaro/upload-release-action@2.4.1
+        uses: svenstaro/upload-release-action@2.5.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: kafka-ui-api/target/kafka-ui-api-${{ steps.build.outputs.version }}.jar

From 76fbaa7ead44de2a9cb7baf6473c810394ac0e5b Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Fri, 10 Mar 2023 02:59:59 +0800
Subject: [PATCH 438/734] [FE] Replace "all clusters offline" message (#2773)

* Add message about not existing offline clusters in Dashboard (#2707)

* Review fix

* Review fixes

---------

Co-authored-by: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/Brokers/BrokersList/BrokersList.tsx          | 2 +-
 .../Brokers/BrokersList/__test__/BrokersList.spec.tsx           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index f1aa4988112..966edecf1fd 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -193,7 +193,7 @@ const BrokersList: React.FC = () => {
         onRowClick={({ original: { brokerId } }) =>
           navigate(clusterBrokerPath(clusterName, brokerId))
         }
-        emptyMessage="Disk usage data not available"
+        emptyMessage="No clusters are online"
       />
     </>
   );
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
index cf36c64059d..0c60cf4749c 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
@@ -145,7 +145,7 @@ describe('BrokersList Component', () => {
           renderComponent();
           expect(screen.getByRole('table')).toBeInTheDocument();
           expect(
-            screen.getByRole('row', { name: 'Disk usage data not available' })
+            screen.getByRole('row', { name: 'No clusters are online' })
           ).toBeInTheDocument();
         });
       });

From cdb559002526517953f7c039467650e665a83e5f Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Thu, 9 Mar 2023 23:10:13 +0400
Subject: [PATCH 439/734] [Infra] fix warnings (#3257)

* fix warnnings

* Fix syntax issue

---------

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/aws_publisher.yaml             | 2 +-
 .github/workflows/block_merge.yml                | 2 +-
 .github/workflows/branch-deploy.yml              | 2 +-
 .github/workflows/build-public-image.yml         | 2 +-
 .github/workflows/delete-public-image.yml        | 2 +-
 .github/workflows/e2e-checks.yaml                | 8 ++++++--
 .github/workflows/separate_env_public_create.yml | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/aws_publisher.yaml b/.github/workflows/aws_publisher.yaml
index 0d0f081f564..c7b80c54f97 100644
--- a/.github/workflows/aws_publisher.yaml
+++ b/.github/workflows/aws_publisher.yaml
@@ -31,7 +31,7 @@ jobs:
           echo "Packer will be triggered in this dir $WORK_DIR"
 
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           aws-access-key-id: ${{ secrets.AWS_AMI_PUBLISH_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_AMI_PUBLISH_KEY_SECRET }}
diff --git a/.github/workflows/block_merge.yml b/.github/workflows/block_merge.yml
index 28f5cde3f45..e1cdb3ac8e9 100644
--- a/.github/workflows/block_merge.yml
+++ b/.github/workflows/block_merge.yml
@@ -6,7 +6,7 @@ jobs:
   block_merge:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v2
+      - uses: mheap/github-action-required-labels@v3
         with:
           mode: exactly
           count: 0
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index b694a3c7fdc..1cc5fee39b1 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -45,7 +45,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index d593326fa68..c79996d2ac5 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -42,7 +42,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/delete-public-image.yml b/.github/workflows/delete-public-image.yml
index 47e08713d87..56c795d0b54 100644
--- a/.github/workflows/delete-public-image.yml
+++ b/.github/workflows/delete-public-image.yml
@@ -15,7 +15,7 @@ jobs:
           tag='${{ github.event.pull_request.number }}'
           echo "tag=${tag}" >> $GITHUB_OUTPUT
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index a21821e79c8..962a1346849 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -15,6 +15,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+      - name: Configure AWS credentials for Kafka-UI account
+        uses: aws-actions/configure-aws-credentials@v1-node16
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-central-1
       - name: Set the values
         id: set_env_values
         run: |
@@ -57,8 +63,6 @@ jobs:
         if: always()
         env:
           AWS_S3_BUCKET: 'kafkaui-allure-reports'
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: 'eu-central-1'
           SOURCE_DIR: 'allure-history/allure-results'
       - name: Post the link to allure report
diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
index fde65dffaba..e10b1a382c3 100644
--- a/.github/workflows/separate_env_public_create.yml
+++ b/.github/workflows/separate_env_public_create.yml
@@ -47,7 +47,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

From c5d6896ae1f61dea2ace3fdda6e78817eaca6c4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 23:30:58 +0400
Subject: [PATCH 440/734] Bump actions/setup-node from 3.5.1 to 3.6.0 (#3205)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3.5.1...v3.6.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index ff877db5595..05ef18e3839 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           version: 7.4.0
       - name: Install node
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
         with:
           node-version: "16.15.0"
           cache: "pnpm"

From c153d6f6348f5fd81ecda6df646fc4cdd9840074 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Fri, 10 Mar 2023 16:45:37 +0300
Subject: [PATCH 441/734] get rid of Husky pre-commit hooks (#3480)

---
 kafka-ui-react-app/.husky/pre-commit |  10 --
 kafka-ui-react-app/package.json      |  10 --
 kafka-ui-react-app/pnpm-lock.yaml    | 253 +--------------------------
 3 files changed, 4 insertions(+), 269 deletions(-)
 delete mode 100755 kafka-ui-react-app/.husky/pre-commit

diff --git a/kafka-ui-react-app/.husky/pre-commit b/kafka-ui-react-app/.husky/pre-commit
deleted file mode 100755
index 9435e204339..00000000000
--- a/kafka-ui-react-app/.husky/pre-commit
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-if git diff --cached --name-only | grep --quiet "kafka-ui-react-app"
-then
-  cd kafka-ui-react-app && npm run pre-commit
-else
-  echo "Skipping frontend tests"
-  exit 0
-fi
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index d6473bb9085..50ab162eca8 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -46,12 +46,6 @@
     "yup": "^1.0.0",
     "zustand": "^4.1.1"
   },
-  "lint-staged": {
-    "*.{ts,tsx}": [
-      "eslint --fix",
-      "pnpm test -- --bail --findRelatedTests --watchAll=false --passWithNoTests"
-    ]
-  },
   "scripts": {
     "start": "vite",
     "dev": "vite",
@@ -65,8 +59,6 @@
     "test:coverage": "jest --watchAll --coverage",
     "test:CI": "CI=true pnpm test:coverage --ci --testResultsProcessor=\"jest-sonar-reporter\" --watchAll=false",
     "tsc": "tsc --pretty --noEmit",
-    "prepare": "cd .. && husky install kafka-ui-react-app/.husky",
-    "pre-commit": "pnpm tsc && lint-staged",
     "deadcode": "ts-prune -i src/generated-sources"
   },
   "devDependencies": {
@@ -101,11 +93,9 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.5.0",
-    "husky": "^8.0.1",
     "jest-environment-jsdom": "^29.4.3",
     "jest-sonar-reporter": "^2.0.0",
     "jest-styled-components": "^7.1.1",
-    "lint-staged": "^13.0.2",
     "prettier": "^2.8.4",
     "rimraf": "^4.1.2",
     "ts-node": "^10.9.1",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 16495614a05..feb4221edef 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -47,7 +47,6 @@ specifiers:
   eslint-plugin-react: ^7.30.1
   eslint-plugin-react-hooks: ^4.5.0
   fetch-mock: ^9.11.0
-  husky: ^8.0.1
   jest: ^29.4.3
   jest-environment-jsdom: ^29.4.3
   jest-sonar-reporter: ^2.0.0
@@ -55,7 +54,6 @@ specifiers:
   jest-watch-typeahead: ^2.2.2
   json-schema-faker: ^0.5.0-rcv.44
   jsonpath-plus: ^7.2.0
-  lint-staged: ^13.0.2
   lodash: ^4.17.21
   prettier: ^2.8.4
   pretty-ms: 7.0.1
@@ -160,11 +158,9 @@ devDependencies:
   eslint-plugin-prettier: 4.0.0_cu7djixscogveocpaizwew7lgy
   eslint-plugin-react: 7.30.1_eslint@8.16.0
   eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
-  husky: 8.0.1
   jest-environment-jsdom: 29.5.0
   jest-sonar-reporter: 2.0.0
   jest-styled-components: 7.1.1_styled-components@5.3.1
-  lint-staged: 13.0.2
   prettier: 2.8.4
   rimraf: 4.3.1
   ts-node: 10.9.1_p45lmeymo45ge573kyxcus632u
@@ -2054,14 +2050,6 @@ packages:
       - supports-color
     dev: true
 
-  /aggregate-error/3.1.0:
-    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
-    engines: {node: '>=8'}
-    dependencies:
-      clean-stack: 2.2.0
-      indent-string: 4.0.0
-    dev: true
-
   /ajv-formats/2.1.1:
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
     peerDependenciesMeta:
@@ -2109,6 +2097,7 @@ packages:
   /ansi-regex/6.0.1:
     resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
     engines: {node: '>=12'}
+    dev: false
 
   /ansi-styles/3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
@@ -2126,11 +2115,6 @@ packages:
     resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
     engines: {node: '>=10'}
 
-  /ansi-styles/6.1.0:
-    resolution: {integrity: sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==}
-    engines: {node: '>=12'}
-    dev: true
-
   /anymatch/3.1.2:
     resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==}
     engines: {node: '>= 8'}
@@ -2218,11 +2202,6 @@ packages:
     resolution: {integrity: sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==}
     dev: true
 
-  /astral-regex/2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-    dev: true
-
   /async/3.2.4:
     resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}
     dev: true
@@ -2503,11 +2482,6 @@ packages:
     resolution: {integrity: sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==}
     dev: false
 
-  /clean-stack/2.2.0:
-    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
-    engines: {node: '>=6'}
-    dev: true
-
   /cli-cursor/3.1.0:
     resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
     engines: {node: '>=8'}
@@ -2520,22 +2494,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /cli-truncate/2.1.0:
-    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
-    engines: {node: '>=8'}
-    dependencies:
-      slice-ansi: 3.0.0
-      string-width: 4.2.3
-    dev: true
-
-  /cli-truncate/3.1.0:
-    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dependencies:
-      slice-ansi: 5.0.0
-      string-width: 5.1.2
-    dev: true
-
   /cli-width/3.0.0:
     resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
     engines: {node: '>= 10'}
@@ -2583,10 +2541,6 @@ packages:
   /color-name/1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
-  /colorette/2.0.19:
-    resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
-    dev: true
-
   /combined-stream/1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
@@ -2604,11 +2558,6 @@ packages:
     engines: {node: '>= 12'}
     dev: true
 
-  /commander/9.3.0:
-    resolution: {integrity: sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==}
-    engines: {node: ^12.20.0 || >=14}
-    dev: true
-
   /compare-versions/4.1.3:
     resolution: {integrity: sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==}
     dev: true
@@ -2884,10 +2833,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /eastasianwidth/0.2.0:
-    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
-    dev: true
-
   /easy-table/1.1.0:
     resolution: {integrity: sha512-oq33hWOSSnl2Hoh00tZWaIPi1ievrD9aFG82/IgjlycAnW9hHx5PkJiXpxPsgEE+H7BsbVQXFVFST8TEXS6/pA==}
     optionalDependencies:
@@ -3410,21 +3355,6 @@ packages:
       strip-final-newline: 2.0.0
     dev: false
 
-  /execa/6.1.0:
-    resolution: {integrity: sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 6.0.1
-      human-signals: 3.0.1
-      is-stream: 3.0.0
-      merge-stream: 2.0.0
-      npm-run-path: 5.1.0
-      onetime: 6.0.0
-      signal-exit: 3.0.7
-      strip-final-newline: 3.0.0
-    dev: true
-
   /exit/0.1.2:
     resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
     engines: {node: '>= 0.8.0'}
@@ -3665,6 +3595,7 @@ packages:
   /get-stream/6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
+    dev: false
 
   /get-symbol-description/1.0.0:
     resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
@@ -3860,17 +3791,6 @@ packages:
     engines: {node: '>=10.17.0'}
     dev: false
 
-  /human-signals/3.0.1:
-    resolution: {integrity: sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==}
-    engines: {node: '>=12.20.0'}
-    dev: true
-
-  /husky/8.0.1:
-    resolution: {integrity: sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==}
-    engines: {node: '>=14'}
-    hasBin: true
-    dev: true
-
   /iconv-lite/0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -4014,11 +3934,6 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  /is-fullwidth-code-point/4.0.0:
-    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
-    engines: {node: '>=12'}
-    dev: true
-
   /is-generator-fn/2.1.0:
     resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
     engines: {node: '>=6'}
@@ -4072,11 +3987,6 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
-  /is-stream/3.0.0:
-    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
-
   /is-string/1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
@@ -4880,56 +4790,9 @@ packages:
       type-check: 0.4.0
     dev: true
 
-  /lilconfig/2.0.5:
-    resolution: {integrity: sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==}
-    engines: {node: '>=10'}
-    dev: true
-
   /lines-and-columns/1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
-  /lint-staged/13.0.2:
-    resolution: {integrity: sha512-qQLfLTh9z34eMzfEHENC+QBskZfxjomrf+snF3xJ4BzilORbD989NLqQ00ughsF/A+PT41e87+WsMFabf9++pQ==}
-    engines: {node: ^14.13.1 || >=16.0.0}
-    hasBin: true
-    dependencies:
-      cli-truncate: 3.1.0
-      colorette: 2.0.19
-      commander: 9.3.0
-      debug: 4.3.4
-      execa: 6.1.0
-      lilconfig: 2.0.5
-      listr2: 4.0.5
-      micromatch: 4.0.5
-      normalize-path: 3.0.0
-      object-inspect: 1.12.2
-      pidtree: 0.6.0
-      string-argv: 0.3.1
-      yaml: 2.1.1
-    transitivePeerDependencies:
-      - enquirer
-      - supports-color
-    dev: true
-
-  /listr2/4.0.5:
-    resolution: {integrity: sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==}
-    engines: {node: '>=12'}
-    peerDependencies:
-      enquirer: '>= 2.3.0 < 3'
-    peerDependenciesMeta:
-      enquirer:
-        optional: true
-    dependencies:
-      cli-truncate: 2.1.0
-      colorette: 2.0.19
-      log-update: 4.0.0
-      p-map: 4.0.0
-      rfdc: 1.3.0
-      rxjs: 7.5.5
-      through: 2.3.8
-      wrap-ansi: 7.0.0
-    dev: true
-
   /locate-path/2.0.0:
     resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==}
     engines: {node: '>=4'}
@@ -4972,16 +4835,6 @@ packages:
       is-unicode-supported: 0.1.0
     dev: true
 
-  /log-update/4.0.0:
-    resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-escapes: 4.3.2
-      cli-cursor: 3.1.0
-      slice-ansi: 4.0.0
-      wrap-ansi: 6.2.0
-    dev: true
-
   /loose-envify/1.4.0:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
@@ -5021,6 +4874,7 @@ packages:
 
   /merge-stream/2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+    dev: false
 
   /merge2/1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
@@ -5050,11 +4904,6 @@ packages:
     resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
     engines: {node: '>=6'}
 
-  /mimic-fn/4.0.0:
-    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
-    engines: {node: '>=12'}
-    dev: true
-
   /min-indent/1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
@@ -5148,13 +4997,6 @@ packages:
       path-key: 3.1.1
     dev: false
 
-  /npm-run-path/5.1.0:
-    resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dependencies:
-      path-key: 4.0.0
-    dev: true
-
   /nwsapi/2.2.0:
     resolution: {integrity: sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==}
     dev: true
@@ -5232,13 +5074,6 @@ packages:
     dependencies:
       mimic-fn: 2.1.0
 
-  /onetime/6.0.0:
-    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      mimic-fn: 4.0.0
-    dev: true
-
   /ono/4.0.11:
     resolution: {integrity: sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==}
     dependencies:
@@ -5333,13 +5168,6 @@ packages:
       p-limit: 2.3.0
     dev: false
 
-  /p-map/4.0.0:
-    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      aggregate-error: 3.1.0
-    dev: true
-
   /p-try/1.0.0:
     resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==}
     engines: {node: '>=4'}
@@ -5399,11 +5227,6 @@ packages:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
 
-  /path-key/4.0.0:
-    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
-    engines: {node: '>=12'}
-    dev: true
-
   /path-parse/1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
@@ -5435,12 +5258,6 @@ packages:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
-  /pidtree/0.6.0:
-    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-    dev: true
-
   /pirates/4.0.5:
     resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
     engines: {node: '>= 6'}
@@ -5896,10 +5713,6 @@ packages:
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
     dev: true
 
-  /rfdc/1.3.0:
-    resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
-    dev: true
-
   /rimraf/3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
@@ -6032,32 +5845,6 @@ packages:
     engines: {node: '>=14.16'}
     dev: false
 
-  /slice-ansi/3.0.0:
-    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
-
-  /slice-ansi/4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
-
-  /slice-ansi/5.0.0:
-    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      ansi-styles: 6.1.0
-      is-fullwidth-code-point: 4.0.0
-    dev: true
-
   /source-map-js/1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
@@ -6087,11 +5874,6 @@ packages:
     dependencies:
       escape-string-regexp: 2.0.0
 
-  /string-argv/0.3.1:
-    resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
-    engines: {node: '>=0.6.19'}
-    dev: true
-
   /string-length/4.0.2:
     resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
     engines: {node: '>=10'}
@@ -6116,15 +5898,6 @@ packages:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
-  /string-width/5.1.2:
-    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
-    engines: {node: '>=12'}
-    dependencies:
-      eastasianwidth: 0.2.0
-      emoji-regex: 9.2.2
-      strip-ansi: 7.0.1
-    dev: true
-
   /string.prototype.matchall/4.0.7:
     resolution: {integrity: sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==}
     dependencies:
@@ -6171,6 +5944,7 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       ansi-regex: 6.0.1
+    dev: false
 
   /strip-bom/3.0.0:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
@@ -6187,11 +5961,6 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
-  /strip-final-newline/3.0.0:
-    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
-    engines: {node: '>=12'}
-    dev: true
-
   /strip-indent/3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
@@ -6721,15 +6490,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /wrap-ansi/6.2.0:
-    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-    dev: true
-
   /wrap-ansi/7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
@@ -6787,11 +6547,6 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
-  /yaml/2.1.1:
-    resolution: {integrity: sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==}
-    engines: {node: '>= 14'}
-    dev: true
-
   /yargs-parser/20.2.7:
     resolution: {integrity: sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==}
     engines: {node: '>=10'}

From 4a7893ff1b6a13e7509312742ce1870110fb29fa Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 14 Mar 2023 16:43:17 +0400
Subject: [PATCH 442/734] [FE] Fix consumers topic label position (#3383)

* change Consumers Topic lable position

* changed conditional padding row with typeScript

* removed table title style from theme, changed TableHeaderConsumerCell style

* changed consumers Table Header Cell and test cases

* refactor ListItem.spec.tsx

* removed data test id

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../ConsumerGroups/Details/Details.tsx        |  3 +--
 .../ConsumerGroups/Details/ListItem.styled.ts |  7 ++++---
 .../ConsumerGroups/Details/ListItem.tsx       | 20 ++++++++++---------
 .../Details/__tests__/Details.spec.tsx        |  2 +-
 .../Details/__tests__/ListItem.spec.tsx       |  4 +++-
 .../common/table/Table/TableKeyLink.styled.ts |  2 +-
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index 098a487081a..e2226f59813 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -14,7 +14,6 @@ import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import groupBy from 'lodash/groupBy';
 import { Table } from 'components/common/table/Table/Table.styled';
-import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import {
   deleteConsumerGroup,
@@ -27,6 +26,7 @@ import { Dropdown } from 'components/common/Dropdown';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import { Action, ResourceType } from 'generated-sources';
 import { ActionDropdownItem } from 'components/common/ActionComponent';
+import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 
 import ListItem from './ListItem';
 
@@ -137,7 +137,6 @@ const Details: React.FC = () => {
       <Table isFullwidth>
         <thead>
           <tr>
-            <TableHeaderCell> </TableHeaderCell>
             <TableHeaderCell title="Topic" />
             <TableHeaderCell title="Messages behind" />
           </tr>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.styled.ts b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.styled.ts
index 11c852b3632..358a45e0a6f 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.styled.ts
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.styled.ts
@@ -1,6 +1,7 @@
 import styled from 'styled-components';
 
-export const ToggleButton = styled.td`
-  padding: 8px 8px 8px 16px !important;
-  width: 30px;
+export const FlexWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 8px;
 `;
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx
index 313ad234098..7b1a61ae4eb 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx
@@ -8,7 +8,7 @@ import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import { TableKeyLink } from 'components/common/table/Table/TableKeyLink.styled';
 
 import TopicContents from './TopicContents/TopicContents';
-import { ToggleButton } from './ListItem.styled';
+import { FlexWrapper } from './ListItem.styled';
 
 interface Props {
   clusterName: ClusterName;
@@ -30,14 +30,16 @@ const ListItem: React.FC<Props> = ({ clusterName, name, consumers }) => {
   return (
     <>
       <tr>
-        <ToggleButton>
-          <IconButtonWrapper onClick={() => setIsOpen(!isOpen)} aria-hidden>
-            <MessageToggleIcon isOpen={isOpen} />
-          </IconButtonWrapper>
-        </ToggleButton>
-        <TableKeyLink>
-          <Link to={clusterTopicPath(clusterName, name)}>{name}</Link>
-        </TableKeyLink>
+        <td>
+          <FlexWrapper>
+            <IconButtonWrapper onClick={() => setIsOpen(!isOpen)} aria-hidden>
+              <MessageToggleIcon isOpen={isOpen} />
+            </IconButtonWrapper>
+            <TableKeyLink>
+              <Link to={clusterTopicPath(clusterName, name)}>{name}</Link>
+            </TableKeyLink>
+          </FlexWrapper>
+        </td>
         <td>{getTotalMessagesBehind()}</td>
       </tr>
       {isOpen && <TopicContents consumers={consumers} />}
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
index 0ed5504e793..9e010a414f2 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
@@ -64,7 +64,7 @@ describe('Details component', () => {
       expect(screen.getByText(groupId)).toBeInTheDocument();
 
       expect(screen.getByRole('table')).toBeInTheDocument();
-      expect(screen.getAllByRole('columnheader').length).toEqual(3);
+      expect(screen.getAllByRole('columnheader').length).toEqual(2);
 
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
     });
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx
index c4906e9209d..9cf79d02ded 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx
@@ -40,7 +40,9 @@ describe('ListItem', () => {
   });
 
   it('should renders list item with topic content open', async () => {
-    await userEvent.click(screen.getAllByRole('cell')[0].children[0]);
+    await userEvent.click(
+      screen.getByRole('cell', { name: 'cluster1' }).children[0].children[0]
+    );
     expect(screen.getByText('Consumer ID')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts b/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
index 77301021557..a2b0ece7242 100644
--- a/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
+++ b/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
@@ -18,6 +18,6 @@ const tableLinkMixin = css(
 `
 );
 
-export const TableKeyLink = styled.td`
+export const TableKeyLink = styled.div`
   ${tableLinkMixin}
 `;

From f51da4bb61ceac755ed0ec6f439b52b0233e9538 Mon Sep 17 00:00:00 2001
From: Victoria Salova <38016232+vict-o-ria@users.noreply.github.com>
Date: Tue, 14 Mar 2023 15:49:40 +0300
Subject: [PATCH 443/734] [FE] Fix "Saved filters" invalid font (#3412)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../components/Topics/Topic/Messages/Filters/Filters.styled.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
index d1230febf94..6e1d50b3bf6 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
@@ -184,6 +184,7 @@ export const CreatedFilter = styled.p`
   margin: 25px 0 10px;
   font-size: 14px;
   line-height: 20px;
+  color: ${({ theme }) => theme.list.meta.color};
 `;
 
 export const SavedFiltersContainer = styled.div`

From f8083e25b7c5856b27a8898b5beb00e71096b91b Mon Sep 17 00:00:00 2001
From: Yarden Shoham <hrsi88@gmail.com>
Date: Tue, 14 Mar 2023 14:54:19 +0200
Subject: [PATCH 444/734] [BE] Chore: Fix typo (#3493)

`croups` -> `groups`

Signed-off-by: Yarden Shoham <hrsi88@gmail.com>
---
 kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 9773db26f10..71c595e5251 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -775,7 +775,7 @@ paths:
     get:
       tags:
         - Consumer Groups
-      summary: Get consumer croups with paging support
+      summary: Get consumer groups with paging support
       operationId: getConsumerGroupsPage
       parameters:
         - name: clusterName

From 3d1e7a0979c4f4634c836359b03cd4ad05aafc4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Mar 2023 17:12:42 +0400
Subject: [PATCH 445/734] Bump docker/build-push-action from 3 to 4 (#3488)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/branch-deploy.yml              | 2 +-
 .github/workflows/build-public-image.yml         | 2 +-
 .github/workflows/cve.yaml                       | 2 +-
 .github/workflows/master.yaml                    | 2 +-
 .github/workflows/release.yaml                   | 2 +-
 .github/workflows/separate_env_public_create.yml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 1cc5fee39b1..0e4a171aec5 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -55,7 +55,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index c79996d2ac5..e965f6c6722 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -54,7 +54,7 @@ jobs:
           registry-type: 'public'
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index 5b0e2779dd9..c5f9ca7aed9 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -40,7 +40,7 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Build docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 01651ee76d0..122956c7d98 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -53,7 +53,7 @@ jobs:
 
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 1990fbdbc55..19128550c08 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
index e10b1a382c3..1b7085d9366 100644
--- a/.github/workflows/separate_env_public_create.yml
+++ b/.github/workflows/separate_env_public_create.yml
@@ -57,7 +57,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Build and push
         id: docker_build_and_push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api

From 41dabf3858ce44a0a56eb1b8f92ebb6c14b99336 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Mar 2023 17:13:41 +0400
Subject: [PATCH 446/734] Bump aquasecurity/trivy-action from 0.9.1 to 0.9.2
 (#3486)

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.9.1 to 0.9.2.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.9.1...0.9.2)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index c5f9ca7aed9..77eae14bda0 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -55,7 +55,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.9.1
+        uses: aquasecurity/trivy-action@0.9.2
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From 51f89cb9004db011901a6fd4a47679e421cf9f4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Mar 2023 17:14:24 +0400
Subject: [PATCH 447/734] Bump docker-maven-plugin from 0.40.2 to 0.42.0
 (#3477)

Bumps [docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.40.2 to 0.42.0.
- [Release notes](https://github.com/fabric8io/docker-maven-plugin/releases)
- [Changelog](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md)
- [Commits](https://github.com/fabric8io/docker-maven-plugin/compare/v0.40.2...v0.42.0)

---
updated-dependencies:
- dependency-name: io.fabric8:docker-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dc1f50f1a21..e3f6e9e0e7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <pnpm.version>v7.4.0</pnpm.version>
 
         <!-- Plugin versions -->
-        <fabric8-maven-plugin.version>0.40.2</fabric8-maven-plugin.version>
+        <fabric8-maven-plugin.version>0.42.0</fabric8-maven-plugin.version>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
         <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>

From 4c2d37dd525b38c75135917b96afcb8e8fe72e46 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 14 Mar 2023 17:36:11 +0400
Subject: [PATCH 448/734] [BE] Chore: UtilityClass annotation removed (#3479)

* @UtilityClass usage removed

* @UtilityClass usage removed

---------

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../ui/service/integration/odd/Oddrn.java     |  24 ++--
 .../integration/odd/schema/AvroExtractor.java | 118 +++++++++---------
 .../odd/schema/DataSetFieldsExtractors.java   |   9 +-
 .../odd/schema/JsonSchemaExtractor.java       | 108 ++++++++--------
 .../odd/schema/ProtoExtractor.java            |  94 +++++++-------
 .../ui/util/KafkaServicesValidation.java      |  36 +++---
 .../provectus/kafka/ui/util/KafkaVersion.java |   7 +-
 .../kafka/ui/util/SslPropertiesUtil.java      |  22 +---
 8 files changed, 202 insertions(+), 216 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/Oddrn.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/Oddrn.java
index d228843b21b..00b29b3b8b4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/Oddrn.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/Oddrn.java
@@ -4,36 +4,34 @@
 import java.net.URI;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import lombok.experimental.UtilityClass;
-import org.opendatadiscovery.oddrn.Generator;
 import org.opendatadiscovery.oddrn.model.AwsS3Path;
 import org.opendatadiscovery.oddrn.model.KafkaConnectorPath;
 import org.opendatadiscovery.oddrn.model.KafkaPath;
 
-@UtilityClass
-public class Oddrn {
+public final class Oddrn {
 
-  private static final Generator GENERATOR = new Generator();
+  private Oddrn() {
+  }
 
-  String clusterOddrn(KafkaCluster cluster) {
+  static String clusterOddrn(KafkaCluster cluster) {
     return KafkaPath.builder()
         .cluster(bootstrapServersForOddrn(cluster.getBootstrapServers()))
         .build()
         .oddrn();
   }
 
-  KafkaPath topicOddrnPath(KafkaCluster cluster, String topic) {
+  static KafkaPath topicOddrnPath(KafkaCluster cluster, String topic) {
     return KafkaPath.builder()
         .cluster(bootstrapServersForOddrn(cluster.getBootstrapServers()))
         .topic(topic)
         .build();
   }
 
-  String topicOddrn(KafkaCluster cluster, String topic) {
+  static String topicOddrn(KafkaCluster cluster, String topic) {
     return topicOddrnPath(cluster, topic).oddrn();
   }
 
-  String awsS3Oddrn(String bucket, String key) {
+  static String awsS3Oddrn(String bucket, String key) {
     return AwsS3Path.builder()
         .bucket(bucket)
         .key(key)
@@ -41,14 +39,14 @@ String awsS3Oddrn(String bucket, String key) {
         .oddrn();
   }
 
-  String connectDataSourceOddrn(String connectUrl) {
+  static String connectDataSourceOddrn(String connectUrl) {
     return KafkaConnectorPath.builder()
         .host(normalizedConnectHosts(connectUrl))
         .build()
         .oddrn();
   }
 
-  private String normalizedConnectHosts(String connectUrlStr) {
+  private static String normalizedConnectHosts(String connectUrlStr) {
     return Stream.of(connectUrlStr.split(","))
         .map(String::trim)
         .sorted()
@@ -61,7 +59,7 @@ private String normalizedConnectHosts(String connectUrlStr) {
         .collect(Collectors.joining(","));
   }
 
-  String connectorOddrn(String connectUrl, String connectorName) {
+  static String connectorOddrn(String connectUrl, String connectorName) {
     return KafkaConnectorPath.builder()
         .host(normalizedConnectHosts(connectUrl))
         .connector(connectorName)
@@ -69,7 +67,7 @@ String connectorOddrn(String connectUrl, String connectorName) {
         .oddrn();
   }
 
-  private String bootstrapServersForOddrn(String bootstrapServers) {
+  private static String bootstrapServersForOddrn(String bootstrapServers) {
     return Stream.of(bootstrapServers.split(","))
         .map(String::trim)
         .sorted()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java
index 538bbde1a8a..cc799a9e109 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java
@@ -1,18 +1,18 @@
 package com.provectus.kafka.ui.service.integration.odd.schema;
 
 import com.google.common.collect.ImmutableSet;
-import com.provectus.kafka.ui.service.integration.odd.Oddrn;
 import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.experimental.UtilityClass;
 import org.apache.avro.Schema;
 import org.opendatadiscovery.client.model.DataSetField;
 import org.opendatadiscovery.client.model.DataSetFieldType;
 import org.opendatadiscovery.oddrn.model.KafkaPath;
 
-@UtilityClass
-class AvroExtractor {
+final class AvroExtractor {
+
+  private AvroExtractor() {
+  }
 
   static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
     var schema = new Schema.Parser().parse(subject.getSchema());
@@ -31,14 +31,14 @@ static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, b
     return result;
   }
 
-  private void extract(Schema schema,
-                       String parentOddr,
-                       String oddrn, //null for root
-                       String name,
-                       String doc,
-                       Boolean nullable,
-                       ImmutableSet<String> registeredRecords,
-                       List<DataSetField> sink
+  private static void extract(Schema schema,
+                              String parentOddr,
+                              String oddrn, //null for root
+                              String name,
+                              String doc,
+                              Boolean nullable,
+                              ImmutableSet<String> registeredRecords,
+                              List<DataSetField> sink
   ) {
     switch (schema.getType()) {
       case RECORD -> extractRecord(schema, parentOddr, oddrn, name, doc, nullable, registeredRecords, sink);
@@ -49,12 +49,12 @@ private void extract(Schema schema,
     }
   }
 
-  private DataSetField createDataSetField(String name,
-                                          String doc,
-                                          String parentOddrn,
-                                          String oddrn,
-                                          Schema schema,
-                                          Boolean nullable) {
+  private static DataSetField createDataSetField(String name,
+                                                 String doc,
+                                                 String parentOddrn,
+                                                 String oddrn,
+                                                 Schema schema,
+                                                 Boolean nullable) {
     return new DataSetField()
         .name(name)
         .description(doc)
@@ -63,14 +63,14 @@ private DataSetField createDataSetField(String name,
         .type(mapSchema(schema, nullable));
   }
 
-  private void extractRecord(Schema schema,
-                             String parentOddr,
-                             String oddrn, //null for root
-                             String name,
-                             String doc,
-                             Boolean nullable,
-                             ImmutableSet<String> registeredRecords,
-                             List<DataSetField> sink) {
+  private static void extractRecord(Schema schema,
+                                    String parentOddr,
+                                    String oddrn, //null for root
+                                    String name,
+                                    String doc,
+                                    Boolean nullable,
+                                    ImmutableSet<String> registeredRecords,
+                                    List<DataSetField> sink) {
     boolean isRoot = oddrn == null;
     if (!isRoot) {
       sink.add(createDataSetField(name, doc, parentOddr, oddrn, schema, nullable));
@@ -99,13 +99,13 @@ private void extractRecord(Schema schema,
         ));
   }
 
-  private void extractUnion(Schema schema,
-                            String parentOddr,
-                            String oddrn, //null for root
-                            String name,
-                            String doc,
-                            ImmutableSet<String> registeredRecords,
-                            List<DataSetField> sink) {
+  private static void extractUnion(Schema schema,
+                                   String parentOddr,
+                                   String oddrn, //null for root
+                                   String name,
+                                   String doc,
+                                   ImmutableSet<String> registeredRecords,
+                                   List<DataSetField> sink) {
     boolean isRoot = oddrn == null;
     boolean containsNull = schema.getTypes().stream().map(Schema::getType).anyMatch(t -> t == Schema.Type.NULL);
     // if it is not root and there is only 2 values for union (null and smth else)
@@ -149,14 +149,14 @@ private void extractUnion(Schema schema,
     }
   }
 
-  private void extractArray(Schema schema,
-                            String parentOddr,
-                            String oddrn, //null for root
-                            String name,
-                            String doc,
-                            Boolean nullable,
-                            ImmutableSet<String> registeredRecords,
-                            List<DataSetField> sink) {
+  private static void extractArray(Schema schema,
+                                   String parentOddr,
+                                   String oddrn, //null for root
+                                   String name,
+                                   String doc,
+                                   Boolean nullable,
+                                   ImmutableSet<String> registeredRecords,
+                                   List<DataSetField> sink) {
     boolean isRoot = oddrn == null;
     oddrn = isRoot ? parentOddr + "/array" : oddrn;
     if (isRoot) {
@@ -176,14 +176,14 @@ private void extractArray(Schema schema,
     );
   }
 
-  private void extractMap(Schema schema,
-                          String parentOddr,
-                          String oddrn, //null for root
-                          String name,
-                          String doc,
-                          Boolean nullable,
-                          ImmutableSet<String> registeredRecords,
-                          List<DataSetField> sink) {
+  private static void extractMap(Schema schema,
+                                 String parentOddr,
+                                 String oddrn, //null for root
+                                 String name,
+                                 String doc,
+                                 Boolean nullable,
+                                 ImmutableSet<String> registeredRecords,
+                                 List<DataSetField> sink) {
     boolean isRoot = oddrn == null;
     oddrn = isRoot ? parentOddr + "/map" : oddrn;
     if (isRoot) {
@@ -214,13 +214,13 @@ private void extractMap(Schema schema,
   }
 
 
-  private void extractPrimitive(Schema schema,
-                                String parentOddr,
-                                String oddrn, //null for root
-                                String name,
-                                String doc,
-                                Boolean nullable,
-                                List<DataSetField> sink) {
+  private static void extractPrimitive(Schema schema,
+                                       String parentOddr,
+                                       String oddrn, //null for root
+                                       String name,
+                                       String doc,
+                                       Boolean nullable,
+                                       List<DataSetField> sink) {
     boolean isRoot = oddrn == null;
     String primOddrn = isRoot ? (parentOddr + "/" + schema.getType()) : oddrn;
     if (isRoot) {
@@ -231,7 +231,7 @@ private void extractPrimitive(Schema schema,
     }
   }
 
-  private DataSetFieldType.TypeEnum mapType(Schema.Type type) {
+  private static DataSetFieldType.TypeEnum mapType(Schema.Type type) {
     return switch (type) {
       case INT, LONG -> DataSetFieldType.TypeEnum.INTEGER;
       case FLOAT, DOUBLE, FIXED -> DataSetFieldType.TypeEnum.NUMBER;
@@ -246,14 +246,14 @@ private DataSetFieldType.TypeEnum mapType(Schema.Type type) {
     };
   }
 
-  private DataSetFieldType mapSchema(Schema schema, Boolean nullable) {
+  private static DataSetFieldType mapSchema(Schema schema, Boolean nullable) {
     return new DataSetFieldType()
         .logicalType(logicalType(schema))
         .isNullable(nullable)
         .type(mapType(schema.getType()));
   }
 
-  private String logicalType(Schema schema) {
+  private static String logicalType(Schema schema) {
     return schema.getType() == Schema.Type.RECORD
         ? schema.getFullName()
         : schema.getType().toString().toLowerCase();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java
index 746f172b57f..e357db30793 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java
@@ -1,19 +1,16 @@
 package com.provectus.kafka.ui.service.integration.odd.schema;
 
-import com.provectus.kafka.ui.service.integration.odd.Oddrn;
 import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import com.provectus.kafka.ui.sr.model.SchemaType;
 import java.util.List;
 import java.util.Optional;
-import lombok.experimental.UtilityClass;
 import org.opendatadiscovery.client.model.DataSetField;
 import org.opendatadiscovery.client.model.DataSetFieldType;
 import org.opendatadiscovery.oddrn.model.KafkaPath;
 
-@UtilityClass
-public class DataSetFieldsExtractors {
+public final class DataSetFieldsExtractors {
 
-  public List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
+  public static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
     SchemaType schemaType = Optional.ofNullable(subject.getSchemaType()).orElse(SchemaType.AVRO);
     return switch (schemaType) {
       case AVRO -> AvroExtractor.extract(subject, topicOddrn, isKey);
@@ -23,7 +20,7 @@ public List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, b
   }
 
 
-  DataSetField rootField(KafkaPath topicOddrn, boolean isKey) {
+  static DataSetField rootField(KafkaPath topicOddrn, boolean isKey) {
     var rootOddrn = topicOddrn.oddrn() + "/columns/" + (isKey ? "key" : "value");
     return new DataSetField()
         .name(isKey ? "key" : "value")
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java
index f92e1fc876b..06201b1ce7f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.service.integration.odd.schema;
 
 import com.google.common.collect.ImmutableSet;
-import com.provectus.kafka.ui.service.integration.odd.Oddrn;
 import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import io.confluent.kafka.schemaregistry.json.JsonSchema;
 import java.net.URI;
@@ -10,7 +9,6 @@
 import java.util.Map;
 import java.util.Optional;
 import javax.annotation.Nullable;
-import lombok.experimental.UtilityClass;
 import org.everit.json.schema.ArraySchema;
 import org.everit.json.schema.BooleanSchema;
 import org.everit.json.schema.CombinedSchema;
@@ -27,8 +25,10 @@
 import org.opendatadiscovery.client.model.MetadataExtension;
 import org.opendatadiscovery.oddrn.model.KafkaPath;
 
-@UtilityClass
-class JsonSchemaExtractor {
+final class JsonSchemaExtractor {
+
+  private JsonSchemaExtractor() {
+  }
 
   static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
     Schema schema = new JsonSchema(subject.getSchema()).rawSchema();
@@ -46,13 +46,13 @@ static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, b
     return result;
   }
 
-  private void extract(Schema schema,
-                       String parentOddr,
-                       String oddrn, //null for root
-                       String name,
-                       Boolean nullable,
-                       ImmutableSet<String> registeredRecords,
-                       List<DataSetField> sink) {
+  private static void extract(Schema schema,
+                              String parentOddr,
+                              String oddrn, //null for root
+                              String name,
+                              Boolean nullable,
+                              ImmutableSet<String> registeredRecords,
+                              List<DataSetField> sink) {
     if (schema instanceof ReferenceSchema s) {
       Optional.ofNullable(s.getReferredSchema())
           .ifPresent(refSchema -> extract(refSchema, parentOddr, oddrn, name, nullable, registeredRecords, sink));
@@ -73,12 +73,12 @@ private void extract(Schema schema,
     }
   }
 
-  private void extractPrimitive(Schema schema,
-                                String parentOddr,
-                                String oddrn, //null for root
-                                String name,
-                                Boolean nullable,
-                                List<DataSetField> sink) {
+  private static void extractPrimitive(Schema schema,
+                                       String parentOddr,
+                                       String oddrn, //null for root
+                                       String name,
+                                       Boolean nullable,
+                                       List<DataSetField> sink) {
     boolean isRoot = oddrn == null;
     sink.add(
         createDataSetField(
@@ -93,12 +93,12 @@ private void extractPrimitive(Schema schema,
     );
   }
 
-  private void extractUnknown(Schema schema,
-                              String parentOddr,
-                              String oddrn, //null for root
-                              String name,
-                              Boolean nullable,
-                              List<DataSetField> sink) {
+  private static void extractUnknown(Schema schema,
+                                     String parentOddr,
+                                     String oddrn, //null for root
+                                     String name,
+                                     Boolean nullable,
+                                     List<DataSetField> sink) {
     boolean isRoot = oddrn == null;
     sink.add(
         createDataSetField(
@@ -113,13 +113,13 @@ private void extractUnknown(Schema schema,
     );
   }
 
-  private void extractObject(ObjectSchema schema,
-                             String parentOddr,
-                             String oddrn, //null for root
-                             String name,
-                             Boolean nullable,
-                             ImmutableSet<String> registeredRecords,
-                             List<DataSetField> sink) {
+  private static void extractObject(ObjectSchema schema,
+                                    String parentOddr,
+                                    String oddrn, //null for root
+                                    String name,
+                                    Boolean nullable,
+                                    ImmutableSet<String> registeredRecords,
+                                    List<DataSetField> sink) {
     boolean isRoot = oddrn == null;
     // schemaLocation can be null for empty object schemas (like if it used in anyOf)
     @Nullable var schemaLocation = schema.getSchemaLocation();
@@ -162,13 +162,13 @@ private void extractObject(ObjectSchema schema,
     });
   }
 
-  private void extractArray(ArraySchema schema,
-                            String parentOddr,
-                            String oddrn, //null for root
-                            String name,
-                            Boolean nullable,
-                            ImmutableSet<String> registeredRecords,
-                            List<DataSetField> sink) {
+  private static void extractArray(ArraySchema schema,
+                                   String parentOddr,
+                                   String oddrn, //null for root
+                                   String name,
+                                   Boolean nullable,
+                                   ImmutableSet<String> registeredRecords,
+                                   List<DataSetField> sink) {
     boolean isRoot = oddrn == null;
     oddrn = isRoot ? parentOddr + "/array" : oddrn;
     if (isRoot) {
@@ -208,13 +208,13 @@ private void extractArray(ArraySchema schema,
     }
   }
 
-  private void extractCombined(CombinedSchema schema,
-                               String parentOddr,
-                               String oddrn, //null for root
-                               String name,
-                               Boolean nullable,
-                               ImmutableSet<String> registeredRecords,
-                               List<DataSetField> sink) {
+  private static void extractCombined(CombinedSchema schema,
+                                      String parentOddr,
+                                      String oddrn, //null for root
+                                      String name,
+                                      Boolean nullable,
+                                      ImmutableSet<String> registeredRecords,
+                                      List<DataSetField> sink) {
     String combineType = "unknown";
     if (schema.getCriterion() == CombinedSchema.ALL_CRITERION) {
       combineType = "allOf";
@@ -255,24 +255,24 @@ private void extractCombined(CombinedSchema schema,
     }
   }
 
-  private String getDescription(Schema schema) {
+  private static String getDescription(Schema schema) {
     return Optional.ofNullable(schema.getTitle())
         .orElse(schema.getDescription());
   }
 
-  private String logicalTypeName(Schema schema) {
+  private static String logicalTypeName(Schema schema) {
     return schema.getClass()
         .getSimpleName()
         .replace("Schema", "");
   }
 
-  private DataSetField createDataSetField(Schema schema,
-                                          String name,
-                                          String parentOddrn,
-                                          String oddrn,
-                                          DataSetFieldType.TypeEnum type,
-                                          String logicalType,
-                                          Boolean nullable) {
+  private static DataSetField createDataSetField(Schema schema,
+                                                 String name,
+                                                 String parentOddrn,
+                                                 String oddrn,
+                                                 DataSetFieldType.TypeEnum type,
+                                                 String logicalType,
+                                                 Boolean nullable) {
     return new DataSetField()
         .name(name)
         .parentFieldOddrn(parentOddrn)
@@ -286,7 +286,7 @@ private DataSetField createDataSetField(Schema schema,
         );
   }
 
-  private DataSetFieldType.TypeEnum mapType(Schema type) {
+  private static DataSetFieldType.TypeEnum mapType(Schema type) {
     if (type instanceof NumberSchema) {
       return DataSetFieldType.TypeEnum.NUMBER;
     }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java
index b4a53782391..c1316172f30 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java
@@ -15,20 +15,17 @@
 import com.google.protobuf.UInt32Value;
 import com.google.protobuf.UInt64Value;
 import com.google.protobuf.Value;
-import com.provectus.kafka.ui.service.integration.odd.Oddrn;
 import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import lombok.experimental.UtilityClass;
 import org.opendatadiscovery.client.model.DataSetField;
 import org.opendatadiscovery.client.model.DataSetFieldType;
 import org.opendatadiscovery.client.model.DataSetFieldType.TypeEnum;
 import org.opendatadiscovery.oddrn.model.KafkaPath;
 
-@UtilityClass
-class ProtoExtractor {
+final class ProtoExtractor {
 
   private static final Set<String> PRIMITIVES_WRAPPER_TYPE_NAMES = Set.of(
       BoolValue.getDescriptor().getFullName(),
@@ -42,7 +39,10 @@ class ProtoExtractor {
       DoubleValue.getDescriptor().getFullName()
   );
 
-  List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
+  private ProtoExtractor() {
+  }
+
+  static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
     Descriptor schema = new ProtobufSchema(subject.getSchema()).toDescriptor();
     List<DataSetField> result = new ArrayList<>();
     result.add(DataSetFieldsExtractors.rootField(topicOddrn, isKey));
@@ -60,14 +60,14 @@ List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean
     return result;
   }
 
-  private void extract(Descriptors.FieldDescriptor field,
-                       String parentOddr,
-                       String oddrn, //null for root
-                       String name,
-                       boolean nullable,
-                       boolean repeated,
-                       ImmutableSet<String> registeredRecords,
-                       List<DataSetField> sink) {
+  private static void extract(Descriptors.FieldDescriptor field,
+                              String parentOddr,
+                              String oddrn, //null for root
+                              String name,
+                              boolean nullable,
+                              boolean repeated,
+                              ImmutableSet<String> registeredRecords,
+                              List<DataSetField> sink) {
     if (repeated) {
       extractRepeated(field, parentOddr, oddrn, name, nullable, registeredRecords, sink);
     } else if (field.getType() == Descriptors.FieldDescriptor.Type.MESSAGE) {
@@ -79,12 +79,12 @@ private void extract(Descriptors.FieldDescriptor field,
 
   // converts some(!) Protobuf Well-known type (from google.protobuf.* packages)
   // see JsonFormat::buildWellKnownTypePrinters for impl details
-  private boolean extractProtoWellKnownType(Descriptors.FieldDescriptor field,
-                                            String parentOddr,
-                                            String oddrn, //null for root
-                                            String name,
-                                            boolean nullable,
-                                            List<DataSetField> sink) {
+  private static boolean extractProtoWellKnownType(Descriptors.FieldDescriptor field,
+                                                   String parentOddr,
+                                                   String oddrn, //null for root
+                                                   String name,
+                                                   boolean nullable,
+                                                   List<DataSetField> sink) {
     // all well-known types are messages
     if (field.getType() != Descriptors.FieldDescriptor.Type.MESSAGE) {
       return false;
@@ -111,13 +111,13 @@ private boolean extractProtoWellKnownType(Descriptors.FieldDescriptor field,
     return false;
   }
 
-  private void extractRepeated(Descriptors.FieldDescriptor field,
-                               String parentOddr,
-                               String oddrn, //null for root
-                               String name,
-                               boolean nullable,
-                               ImmutableSet<String> registeredRecords,
-                               List<DataSetField> sink) {
+  private static void extractRepeated(Descriptors.FieldDescriptor field,
+                                      String parentOddr,
+                                      String oddrn, //null for root
+                                      String name,
+                                      boolean nullable,
+                                      ImmutableSet<String> registeredRecords,
+                                      List<DataSetField> sink) {
     sink.add(createDataSetField(name, parentOddr, oddrn, TypeEnum.LIST, "repeated", nullable));
 
     String itemName = field.getType() == Descriptors.FieldDescriptor.Type.MESSAGE
@@ -136,13 +136,13 @@ private void extractRepeated(Descriptors.FieldDescriptor field,
     );
   }
 
-  private void extractMessage(Descriptors.FieldDescriptor field,
-                              String parentOddr,
-                              String oddrn, //null for root
-                              String name,
-                              boolean nullable,
-                              ImmutableSet<String> registeredRecords,
-                              List<DataSetField> sink) {
+  private static void extractMessage(Descriptors.FieldDescriptor field,
+                                     String parentOddr,
+                                     String oddrn, //null for root
+                                     String name,
+                                     boolean nullable,
+                                     ImmutableSet<String> registeredRecords,
+                                     List<DataSetField> sink) {
     if (extractProtoWellKnownType(field, parentOddr, oddrn, name, nullable, sink)) {
       return;
     }
@@ -173,12 +173,12 @@ private void extractMessage(Descriptors.FieldDescriptor field,
         });
   }
 
-  private void extractPrimitive(Descriptors.FieldDescriptor field,
-                                String parentOddr,
-                                String oddrn,
-                                String name,
-                                boolean nullable,
-                                List<DataSetField> sink) {
+  private static void extractPrimitive(Descriptors.FieldDescriptor field,
+                                       String parentOddr,
+                                       String oddrn,
+                                       String name,
+                                       boolean nullable,
+                                       List<DataSetField> sink) {
     sink.add(
         createDataSetField(
             name,
@@ -191,18 +191,18 @@ private void extractPrimitive(Descriptors.FieldDescriptor field,
     );
   }
 
-  private String getLogicalTypeName(Descriptors.FieldDescriptor f) {
+  private static String getLogicalTypeName(Descriptors.FieldDescriptor f) {
     return f.getType() == Descriptors.FieldDescriptor.Type.MESSAGE
         ? f.getMessageType().getFullName()
         : f.getType().name().toLowerCase();
   }
 
-  private DataSetField createDataSetField(String name,
-                                          String parentOddrn,
-                                          String oddrn,
-                                          TypeEnum type,
-                                          String logicalType,
-                                          Boolean nullable) {
+  private static DataSetField createDataSetField(String name,
+                                                 String parentOddrn,
+                                                 String oddrn,
+                                                 TypeEnum type,
+                                                 String logicalType,
+                                                 Boolean nullable) {
     return new DataSetField()
         .name(name)
         .parentFieldOddrn(parentOddrn)
@@ -216,7 +216,7 @@ private DataSetField createDataSetField(String name,
   }
 
 
-  private TypeEnum mapType(Descriptors.FieldDescriptor.Type type) {
+  private static TypeEnum mapType(Descriptors.FieldDescriptor.Type type) {
     return switch (type) {
       case INT32, INT64, SINT32, SFIXED32, SINT64, UINT32, UINT64, FIXED32, FIXED64, SFIXED64 -> TypeEnum.INTEGER;
       case FLOAT, DOUBLE -> TypeEnum.NUMBER;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java
index 7f5b8c45f2a..31d90244ebe 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.util;
 
-import com.provectus.kafka.ui.config.ClustersProperties;
+import static com.provectus.kafka.ui.config.ClustersProperties.TruststoreConfig;
+
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
 import com.provectus.kafka.ui.model.ApplicationPropertyValidationDTO;
 import com.provectus.kafka.ui.service.ReactiveAdminClient;
@@ -13,38 +14,36 @@
 import java.util.Properties;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
-import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
-import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
 import org.springframework.util.ResourceUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.util.function.Tuple2;
-import reactor.util.function.Tuples;
 
 @Slf4j
-@UtilityClass
-public class KafkaServicesValidation {
+public final class KafkaServicesValidation {
+
+  private KafkaServicesValidation() {
+  }
 
-  private Mono<ApplicationPropertyValidationDTO> valid() {
+  private static Mono<ApplicationPropertyValidationDTO> valid() {
     return Mono.just(new ApplicationPropertyValidationDTO().error(false));
   }
 
-  private Mono<ApplicationPropertyValidationDTO> invalid(String errorMsg) {
+  private static Mono<ApplicationPropertyValidationDTO> invalid(String errorMsg) {
     return Mono.just(new ApplicationPropertyValidationDTO().error(true).errorMessage(errorMsg));
   }
 
-  private Mono<ApplicationPropertyValidationDTO> invalid(Throwable th) {
+  private static Mono<ApplicationPropertyValidationDTO> invalid(Throwable th) {
     return Mono.just(new ApplicationPropertyValidationDTO().error(true).errorMessage(th.getMessage()));
   }
 
   /**
    * Returns error msg, if any.
    */
-  public Optional<String> validateTruststore(ClustersProperties.TruststoreConfig truststoreConfig) {
+  public static Optional<String> validateTruststore(TruststoreConfig truststoreConfig) {
     if (truststoreConfig.getTruststoreLocation() != null && truststoreConfig.getTruststorePassword() != null) {
       try {
         KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
@@ -63,10 +62,10 @@ public Optional<String> validateTruststore(ClustersProperties.TruststoreConfig t
     return Optional.empty();
   }
 
-  public Mono<ApplicationPropertyValidationDTO> validateClusterConnection(String bootstrapServers,
-                                                                          Properties clusterProps,
-                                                                          @Nullable
-                                                                          ClustersProperties.TruststoreConfig ssl) {
+  public static Mono<ApplicationPropertyValidationDTO> validateClusterConnection(String bootstrapServers,
+                                                                                 Properties clusterProps,
+                                                                                 @Nullable
+                                                                                 TruststoreConfig ssl) {
     Properties properties = new Properties();
     SslPropertiesUtil.addKafkaSslProperties(ssl, properties);
     properties.putAll(clusterProps);
@@ -93,7 +92,7 @@ public Mono<ApplicationPropertyValidationDTO> validateClusterConnection(String b
         });
   }
 
-  public Mono<ApplicationPropertyValidationDTO> validateSchemaRegistry(
+  public static Mono<ApplicationPropertyValidationDTO> validateSchemaRegistry(
       Supplier<ReactiveFailover<KafkaSrClientApi>> clientSupplier) {
     ReactiveFailover<KafkaSrClientApi> client;
     try {
@@ -108,7 +107,7 @@ public Mono<ApplicationPropertyValidationDTO> validateSchemaRegistry(
         .onErrorResume(KafkaServicesValidation::invalid);
   }
 
-  public Mono<ApplicationPropertyValidationDTO> validateConnect(
+  public static Mono<ApplicationPropertyValidationDTO> validateConnect(
       Supplier<ReactiveFailover<KafkaConnectClientApi>> clientSupplier) {
     ReactiveFailover<KafkaConnectClientApi> client;
     try {
@@ -123,7 +122,8 @@ public Mono<ApplicationPropertyValidationDTO> validateConnect(
         .onErrorResume(KafkaServicesValidation::invalid);
   }
 
-  public Mono<ApplicationPropertyValidationDTO> validateKsql(Supplier<ReactiveFailover<KsqlApiClient>> clientSupplier) {
+  public static Mono<ApplicationPropertyValidationDTO> validateKsql(
+      Supplier<ReactiveFailover<KsqlApiClient>> clientSupplier) {
     ReactiveFailover<KsqlApiClient> client;
     try {
       client = clientSupplier.get();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java
index 48ff7ff1214..5ed21c6a6e2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java
@@ -1,11 +1,12 @@
 package com.provectus.kafka.ui.util;
 
-import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
-@UtilityClass
 @Slf4j
-public class KafkaVersion {
+public final class KafkaVersion {
+
+  private KafkaVersion() {
+  }
 
   public static float parse(String version) throws NumberFormatException {
     log.trace("Parsing cluster version [{}]", version);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SslPropertiesUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SslPropertiesUtil.java
index ea120076373..4d157fbcb5f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SslPropertiesUtil.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/SslPropertiesUtil.java
@@ -1,27 +1,17 @@
 package com.provectus.kafka.ui.util;
 
 import com.provectus.kafka.ui.config.ClustersProperties;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-import java.io.FileInputStream;
-import java.security.KeyStore;
 import java.util.Properties;
 import javax.annotation.Nullable;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-import lombok.SneakyThrows;
-import lombok.experimental.UtilityClass;
 import org.apache.kafka.common.config.SslConfigs;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.util.ResourceUtils;
-import reactor.netty.http.client.HttpClient;
 
-@UtilityClass
-public class SslPropertiesUtil {
+public final class SslPropertiesUtil {
 
-  public void addKafkaSslProperties(@Nullable ClustersProperties.TruststoreConfig truststoreConfig,
-                                    Properties sink) {
+  private SslPropertiesUtil() {
+  }
+
+  public static void addKafkaSslProperties(@Nullable ClustersProperties.TruststoreConfig truststoreConfig,
+                                           Properties sink) {
     if (truststoreConfig != null && truststoreConfig.getTruststoreLocation() != null) {
       sink.put(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG, truststoreConfig.getTruststoreLocation());
       if (truststoreConfig.getTruststorePassword() != null) {

From 1117b296a7843272a8827099b9220aee4e5d9ab5 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 14 Mar 2023 22:03:05 +0400
Subject: [PATCH 449/734] UI: Implement a dark theme (#2996)

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: Mgrdich <mgotm13@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../com/provectus/kafka/ui/models/Schema.java |    6 +-
 .../provectus/kafka/ui/pages/BasePage.java    |   15 +-
 .../pages/connectors/ConnectorCreateForm.java |   17 +-
 .../ui/pages/schemas/SchemaCreateForm.java    |   28 +-
 .../ui/pages/topics/ProduceMessagePanel.java  |    2 +-
 .../ui/settings/drivers/LocalWebDriver.java   |   87 +-
 .../listeners/QaseResultListener.java         |    4 +-
 .../kafka/ui/utilities/WebUtils.java          |    9 +
 .../config_for_create_connector.json          |    0
 .../config_for_create_connector_via_api.json  |    0
 .../config_for_update_connector.json          |    0
 .../connectors}/delete_connector_config.json  |    0
 .../{ => schemas}/schema_avro_for_update.json |   11 +-
 .../{ => schemas}/schema_avro_value.json      |    0
 .../schema_json_Value.json}                   |    0
 .../{ => schemas}/schema_protobuf_value.txt   |    0
 .../topics}/message_content_create_topic.json |    0
 .../smokeSuite/connectors/ConnectorsTest.java |    8 +-
 .../ui/smokeSuite/schemas/SchemasTest.java    |   11 +-
 .../ui/smokeSuite/topics/MessagesTest.java    |    2 +-
 kafka-ui-react-app/src/components/App.tsx     |   18 +-
 .../Connect/Details/Actions/Action.styled.ts  |    4 +-
 .../components/Connect/List/TopicsCell.tsx    |    2 +-
 .../TopicContents/TopicContent.styled.ts      |    7 +-
 .../components/Dashboard/Dashboard.styled.ts  |    1 +
 .../components/ErrorPage/ErrorPage.styled.ts  |    2 +-
 .../Query/QueryForm/QueryForm.styled.ts       |   33 +-
 .../KsqlDb/Query/QueryForm/QueryForm.tsx      |    2 +
 .../Nav/ClusterTab/ClusterTab.styled.ts       |    1 +
 .../__tests__/ClusterTab.styled.spec.tsx      |    2 +-
 .../src/components/NavBar/NavBar.styled.ts    |   11 +-
 .../src/components/NavBar/NavBar.tsx          |   85 +-
 .../components/NavBar/UserInfo/UserInfo.tsx   |    8 +-
 .../NavBar/__tests__/NavBar.spec.tsx          |   10 +-
 .../PageContainer/PageContainer.tsx           |    6 +-
 .../__tests__/PageContainer.spec.tsx          |    9 +-
 .../LatestVersionItem.styled.tsx              |   11 +-
 .../components/Schemas/Diff/Diff.styled.ts    |   37 +-
 .../components/Schemas/Edit/Edit.styled.ts    |    3 +-
 .../GlobalSchemaSelector.styled.ts            |    3 +
 .../Edit/DangerZone/DangerZone.styled.tsx     |    2 +-
 .../Topic/Messages/Filters/Filters.styled.ts  |   52 +-
 .../Topics/Topic/Messages/Filters/Filters.tsx |    6 +-
 .../Topic/Messages/Filters/SavedFilters.tsx   |    4 +-
 .../Filters/__tests__/Filters.styled.spec.tsx |    2 +-
 .../MessageContent/MessageContent.styled.ts   |    6 +-
 .../__tests__/MessageContent.spec.tsx         |    2 +-
 .../Topic/Messages/PreviewModal.styled.ts     |    1 +
 .../Topic/Overview/__test__/Overview.spec.tsx |    2 +-
 .../Topics/Topic/Statistics/Metrics.tsx       |    2 +-
 .../Topics/shared/Form/TopicForm.styled.ts    |    9 +-
 .../Topics/shared/Form/TopicForm.tsx          |    3 +-
 .../Form/__tests__/TimeToRetainBtn.spec.tsx   |    6 +-
 .../Form/__tests__/TopicForm.styled.spec.tsx  |    6 +-
 .../src/components/Version/Version.styled.ts  |   24 +-
 .../src/components/Version/Version.tsx        |    9 +-
 .../src/components/__tests__/App.spec.tsx     |    6 +
 .../components/common/Button/Button.styled.ts |   62 +-
 .../common/Button/__tests__/Button.spec.tsx   |    8 +-
 .../ConfirmationModal.styled.tsx              |    6 +-
 .../ControlPanel/ControlPanel.styled.ts       |    5 +-
 .../common/Dropdown/Dropdown.styled.ts        |    3 +-
 .../src/components/common/Editor/Editor.tsx   |   32 +
 .../EditorViewer/EditorViewer.styled.ts       |    9 +-
 .../components/common/Icons/ArrowDownIcon.tsx |   27 +-
 .../src/components/common/Icons/AutoIcon.tsx  |   28 +
 .../components/common/Icons/CancelIcon.tsx    |    4 +-
 .../components/common/Icons/CheckmarkIcon.tsx |    2 +-
 .../src/components/common/Icons/ClockIcon.tsx |   27 +-
 .../components/common/Icons/DeleteIcon.tsx    |    2 +-
 .../common/Icons/DropdownArrowIcon.tsx        |   16 +-
 .../src/components/common/Icons/EditIcon.tsx  |    6 +-
 .../src/components/common/Icons/FileIcon.tsx  |   27 +-
 .../src/components/common/Icons/InfoIcon.tsx  |   53 +-
 .../common/Icons/MessageToggleIcon.styled.ts  |   13 +-
 .../common/Icons/MessageToggleIcon.tsx        |    1 +
 .../src/components/common/Icons/MoonIcon.tsx  |   22 +
 .../src/components/common/Icons/SavedIcon.tsx |    2 +-
 .../src/components/common/Icons/SunIcon.tsx   |   54 +
 .../components/common/Icons/WarningIcon.tsx   |   28 +-
 .../components/common/Input/Input.styled.ts   |   11 +-
 .../common/Metrics/Metrics.styled.tsx         |    5 +-
 .../Metrics/__tests__/Indicator.spec.tsx      |    2 +-
 .../common/Metrics/__tests__/Section.spec.tsx |    3 +-
 .../common/MultiSelect/MultiSelect.styled.ts  |   33 +-
 .../common/Navigation/Navbar.styled.ts        |   16 +-
 .../common/NewTable/ExpanderCell.tsx          |   55 +-
 .../common/NewTable/Table.styled.ts           |   25 +-
 .../common/ProgressBar/ProgressBar.styled.ts  |    4 +-
 .../PropertiesList/PropertiesList.styled.tsx  |    7 +-
 .../components/common/Select/Select.styled.ts |   86 +-
 .../src/components/common/Select/Select.tsx   |   23 +-
 .../SlidingSidebar/SlidingSidebar.styled.ts   |    4 +-
 .../components/common/Switch/Switch.styled.ts |   42 +-
 .../src/components/common/Switch/Switch.tsx   |   22 +-
 .../src/components/common/Tag/Tag.styled.tsx  |    4 +-
 .../common/Textbox/Textarea.styled.ts         |    2 +
 .../common/table/Table/Table.styled.ts        |    2 +-
 .../common/table/Table/TableKeyLink.styled.ts |    3 +
 .../TableHeaderCell/TableHeaderCell.styled.ts |    8 +-
 .../__test__/TableHeaderCell.styled.spec.tsx  |    2 +-
 .../table/__tests__/TableHeaderCell.spec.tsx  |    2 +-
 .../src/components/globalCss.ts               |   11 +-
 kafka-ui-react-app/src/lib/testHelpers.tsx    |    2 +-
 kafka-ui-react-app/src/theme/theme.ts         | 1090 ++++++++++++-----
 .../ClusterConfigForm.styled.ts               |    4 +-
 106 files changed, 1785 insertions(+), 717 deletions(-)
 rename kafka-ui-e2e-checks/src/main/resources/{ => testData/connectors}/config_for_create_connector.json (100%)
 rename kafka-ui-e2e-checks/src/main/resources/{ => testData/connectors}/config_for_create_connector_via_api.json (100%)
 rename kafka-ui-e2e-checks/src/main/resources/{ => testData/connectors}/config_for_update_connector.json (100%)
 rename kafka-ui-e2e-checks/src/main/resources/{ => testData/connectors}/delete_connector_config.json (100%)
 rename kafka-ui-e2e-checks/src/main/resources/testData/{ => schemas}/schema_avro_for_update.json (61%)
 rename kafka-ui-e2e-checks/src/main/resources/testData/{ => schemas}/schema_avro_value.json (100%)
 rename kafka-ui-e2e-checks/src/main/resources/testData/{schema_Json_Value.json => schemas/schema_json_Value.json} (100%)
 rename kafka-ui-e2e-checks/src/main/resources/testData/{ => schemas}/schema_protobuf_value.txt (100%)
 rename kafka-ui-e2e-checks/src/main/resources/{ => testData/topics}/message_content_create_topic.json (100%)
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/AutoIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/MoonIcon.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/SunIcon.tsx

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
index cd573037bac..19dc44a028e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
@@ -16,18 +16,18 @@ public class Schema {
     public static Schema createSchemaAvro() {
         return new Schema().setName("schema_avro-" + randomAlphabetic(5))
                 .setType(SchemaType.AVRO)
-                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_value.json");
+                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_avro_value.json");
     }
 
     public static Schema createSchemaJson() {
         return new Schema().setName("schema_json-" + randomAlphabetic(5))
                 .setType(SchemaType.JSON)
-                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_Json_Value.json");
+                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_json_Value.json");
     }
 
     public static Schema createSchemaProtobuf() {
         return new Schema().setName("schema_protobuf-" + randomAlphabetic(5))
                 .setType(SchemaType.PROTOBUF)
-                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_protobuf_value.txt");
+                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_protobuf_value.txt");
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index c131bd8e0d1..979302fd277 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -3,8 +3,11 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
+import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.utilities.WebUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.interactions.Actions;
 
 import java.time.Duration;
 
@@ -34,7 +37,7 @@ public abstract class BasePage extends WebUtils {
     protected void waitUntilSpinnerDisappear() {
         log.debug("\nwaitUntilSpinnerDisappear");
         if (isVisible(loadingSpinner)) {
-            loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(30));
+            loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(60));
         }
     }
 
@@ -42,6 +45,16 @@ protected void clickSubmitBtn() {
         clickByJavaScript(submitBtn);
     }
 
+    protected void setJsonInputValue(SelenideElement jsonInput, String jsonConfig) {
+        sendKeysByActions(jsonInput, jsonConfig.replace("  ", ""));
+        new Actions(WebDriverRunner.getWebDriver())
+                .keyDown(Keys.SHIFT)
+                .sendKeys(Keys.PAGE_DOWN)
+                .keyUp(Keys.SHIFT)
+                .sendKeys(Keys.DELETE)
+                .perform();
+    }
+
     protected SelenideElement getTableElement(String elementName) {
         log.debug("\ngetTableElement: {}", elementName);
         return $x(String.format(tableElementNameLocator, elementName));
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java
index 7bc2aa88aa9..fbbea0f1c0e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java
@@ -21,11 +21,22 @@ public ConnectorCreateForm waitUntilScreenReady() {
     }
 
     @Step
-    public ConnectorCreateForm setConnectorDetails(String connectName, String configJson) {
+    public ConnectorCreateForm setName(String connectName) {
         nameField.shouldBe(Condition.enabled).setValue(connectName);
+        return this;
+    }
+
+    @Step
+    public ConnectorCreateForm setConfig(String configJson) {
         configField.shouldBe(Condition.enabled).click();
-        contentTextArea.setValue(configJson);
-        nameField.shouldBe(Condition.enabled).click();
+        setJsonInputValue(contentTextArea, configJson);
+        return this;
+    }
+
+    @Step
+    public ConnectorCreateForm setConnectorDetails(String connectName, String configJson) {
+        setName(connectName);
+        setConfig(configJson);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java
index b823b6b9925..52bfe0971f0 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java
@@ -2,16 +2,20 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.api.model.SchemaType;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.interactions.Actions;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.codeborne.selenide.Selenide.*;
+import static org.openqa.selenium.By.id;
 
 public class SchemaCreateForm extends BasePage {
 
@@ -23,7 +27,8 @@ public class SchemaCreateForm extends BasePage {
     protected SelenideElement compatibilityLevelList = $x("//ul[@name='compatibilityLevel']");
     protected SelenideElement newSchemaTextArea = $x("//div[@id='newSchema']");
     protected SelenideElement latestSchemaTextArea = $x("//div[@id='latestSchema']");
-    protected SelenideElement schemaVersionDdl = $$x("//ul[@role='listbox']/li[text()='Version 2']").first();
+    protected SelenideElement leftVersionDdl = $(id("left-select"));
+    protected SelenideElement rightVersionDdl = $(id("right-select"));
     protected List<SelenideElement> visibleMarkers = $$x("//div[@class='ace_scroller']//div[contains(@class,'codeMarker')]");
     protected List<SelenideElement> elementsCompareVersionDdl = $$x("//ul[@role='listbox']/ul/li");
     protected String ddlElementLocator = "//li[@value='%s']";
@@ -68,8 +73,14 @@ public SchemaCreateForm selectCompatibilityLevelFromDropdown(CompatibilityLevel.
     }
 
     @Step
-    public SchemaCreateForm openSchemaVersionDdl() {
-        schemaVersionDdl.shouldBe(Condition.enabled).click();
+    public SchemaCreateForm openLeftVersionDdl() {
+        leftVersionDdl.shouldBe(Condition.enabled).click();
+        return this;
+    }
+
+    @Step
+    public SchemaCreateForm openRightVersionDdl() {
+        rightVersionDdl.shouldBe(Condition.enabled).click();
         return this;
     }
 
@@ -92,8 +103,15 @@ public int getMarkedLinesNumber() {
     @Step
     public SchemaCreateForm setNewSchemaValue(String configJson) {
         newSchemaTextArea.shouldBe(Condition.visible).click();
-        clearByKeyboard(newSchemaInput);
-        newSchemaInput.setValue(configJson);
+        newSchemaInput.shouldBe(Condition.enabled);
+        new Actions(WebDriverRunner.getWebDriver())
+                .sendKeys(Keys.PAGE_UP)
+                .keyDown(Keys.SHIFT)
+                .sendKeys(Keys.PAGE_DOWN)
+                .keyUp(Keys.SHIFT)
+                .sendKeys(Keys.DELETE)
+                .perform();
+        setJsonInputValue(newSchemaInput, configJson);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
index a16d2c83a05..651c514eefc 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
@@ -49,7 +49,7 @@ public ProduceMessagePanel setHeaderFiled(String value) {
 
     @Step
     public ProduceMessagePanel submitProduceMessage() {
-        submitBtn.shouldBe(Condition.enabled).click();
+        clickByActions(submitBtn);
         submitBtn.shouldBe(Condition.disappear);
         refresh();
         return this;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java
index b1dabffc84d..e96213dd061 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java
@@ -14,54 +14,55 @@
 
 public abstract class LocalWebDriver {
 
-  private static org.openqa.selenium.WebDriver getWebDriver() {
-    try {
-      return WebDriverRunner.getWebDriver();
-    } catch (IllegalStateException ex) {
-      Configuration.headless = false;
-      Configuration.browser = "chrome";
-      Configuration.browserSize = "1920x1080";
-      /**screenshots and savePageSource config is needed for local debug
-       * optionally can be set as 'false' to not duplicate Allure report
-       */
-      Configuration.screenshots = true;
-      Configuration.savePageSource = true;
-      Configuration.pageLoadTimeout = 120000;
-      Configuration.browserCapabilities = new ChromeOptions()
-          .addArguments("--lang=en_US");
-      open();
-      return WebDriverRunner.getWebDriver();
+    private static org.openqa.selenium.WebDriver getWebDriver() {
+        try {
+            return WebDriverRunner.getWebDriver();
+        } catch (IllegalStateException ex) {
+            Configuration.headless = false;
+            Configuration.browser = "chrome";
+            Configuration.browserSize = "1920x1080";
+            /**screenshots and savePageSource config is needed for local debug
+             * optionally can be set as 'false' to not duplicate Allure report
+             */
+            Configuration.screenshots = true;
+            Configuration.savePageSource = true;
+            Configuration.pageLoadTimeout = 120000;
+            Configuration.browserCapabilities = new ChromeOptions()
+                    .addArguments("--remote-allow-origins=*")
+                    .addArguments("--lang=en_US");
+            open();
+            return WebDriverRunner.getWebDriver();
+        }
     }
-  }
 
-  @Step
-  public static void openUrl(String url) {
-    if (!getWebDriver().getCurrentUrl().equals(url)) {
-      getWebDriver().get(url);
+    @Step
+    public static void openUrl(String url) {
+        if (!getWebDriver().getCurrentUrl().equals(url)) {
+            getWebDriver().get(url);
+        }
     }
-  }
 
-  @Step
-  public static void browserInit() {
-    getWebDriver();
-  }
+    @Step
+    public static void browserInit() {
+        getWebDriver();
+    }
 
-  @Step
-  public static void browserClear() {
-    clearBrowserLocalStorage();
-    clearBrowserCookies();
-    refresh();
-  }
+    @Step
+    public static void browserClear() {
+        clearBrowserLocalStorage();
+        clearBrowserCookies();
+        refresh();
+    }
 
-  @Step
-  public static void browserQuit() {
-    getWebDriver().quit();
-  }
+    @Step
+    public static void browserQuit() {
+        getWebDriver().quit();
+    }
 
-  @Step
-  public static void loggerSetup() {
-    SelenideLogger.addListener("AllureSelenide", new AllureSelenide()
-        .screenshots(true)
-        .savePageSource(false));
-  }
+    @Step
+    public static void loggerSetup() {
+        SelenideLogger.addListener("AllureSelenide", new AllureSelenide()
+                .screenshots(true)
+                .savePageSource(false));
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java
index abab897bfc9..72056db922b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java
@@ -39,9 +39,9 @@ private static QaseTestCaseListener createQaseListener() {
     }
 
     @Override
-    public void onTestStart(ITestResult result) {
+    public void onTestStart(ITestResult tr) {
         getQaseTestCaseListener().onTestCaseStarted();
-        super.onTestStart(result);
+        super.onTestStart(tr);
     }
 
     @Override
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index 7e0de1ac65b..8358880503e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -21,6 +21,15 @@ public static void clickByActions(SelenideElement element) {
                 .perform();
     }
 
+    public static void sendKeysByActions(SelenideElement element, String keys) {
+        log.debug("\nsendKeysByActions: {} \nsend keys '{}'", element.getSearchCriteria(), keys);
+        element.shouldBe(Condition.enabled);
+        new Actions(WebDriverRunner.getWebDriver())
+                .moveToElement(element)
+                .sendKeys(element, keys)
+                .perform();
+    }
+
     public static void clickByJavaScript(SelenideElement element) {
         log.debug("\nclickByJavaScript: {}", element.getSearchCriteria());
         element.shouldBe(Condition.enabled);
diff --git a/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector.json b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/main/resources/config_for_create_connector.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector.json
diff --git a/kafka-ui-e2e-checks/src/main/resources/config_for_create_connector_via_api.json b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector_via_api.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/main/resources/config_for_create_connector_via_api.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector_via_api.json
diff --git a/kafka-ui-e2e-checks/src/main/resources/config_for_update_connector.json b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_update_connector.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/main/resources/config_for_update_connector.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_update_connector.json
diff --git a/kafka-ui-e2e-checks/src/main/resources/delete_connector_config.json b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/delete_connector_config.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/main/resources/delete_connector_config.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/connectors/delete_connector_config.json
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/schema_avro_for_update.json b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_for_update.json
similarity index 61%
rename from kafka-ui-e2e-checks/src/main/resources/testData/schema_avro_for_update.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_for_update.json
index 2979d69a9bf..9971559ba7f 100644
--- a/kafka-ui-e2e-checks/src/main/resources/testData/schema_avro_for_update.json
+++ b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_for_update.json
@@ -5,19 +5,12 @@
   "fields": [
     {
       "name": "text",
-      "type": [
-        "null",
-        "string"
-      ],
+      "type": "string",
       "default": null
     },
     {
       "name": "value",
-      "type": [
-        "null",
-        "string",
-        "long"
-      ],
+      "type": "string",
       "default": null
     }
   ]
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/schema_avro_value.json b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_value.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/main/resources/testData/schema_avro_value.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_value.json
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/schema_Json_Value.json b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_json_Value.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/main/resources/testData/schema_Json_Value.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_json_Value.json
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/schema_protobuf_value.txt b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_protobuf_value.txt
similarity index 100%
rename from kafka-ui-e2e-checks/src/main/resources/testData/schema_protobuf_value.txt
rename to kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_protobuf_value.txt
diff --git a/kafka-ui-e2e-checks/src/main/resources/message_content_create_topic.json b/kafka-ui-e2e-checks/src/main/resources/testData/topics/message_content_create_topic.json
similarity index 100%
rename from kafka-ui-e2e-checks/src/main/resources/message_content_create_topic.json
rename to kafka-ui-e2e-checks/src/main/resources/testData/topics/message_content_create_topic.json
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
index c54138d8c5a..db1fea805ac 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
@@ -21,7 +21,7 @@ public class ConnectorsTest extends BaseTest {
     private static final String CONNECT_NAME = "first";
     private static final List<Topic> TOPIC_LIST = new ArrayList<>();
     private static final List<Connector> CONNECTOR_LIST = new ArrayList<>();
-    private static final String MESSAGE_CONTENT = "message_content_create_topic.json";
+    private static final String MESSAGE_CONTENT = "testData/topics/message_content_create_topic.json";
     private static final String MESSAGE_KEY = " ";
     private static final Topic TOPIC_FOR_CREATE = new Topic()
             .setName("topic_for_create_connector-" + randomAlphabetic(5))
@@ -34,10 +34,10 @@ public class ConnectorsTest extends BaseTest {
             .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
     private static final Connector CONNECTOR_FOR_DELETE = new Connector()
             .setName("sink_postgres_activities_e2e_checks_for_delete-" + randomAlphabetic(5))
-            .setConfig(getResourceAsString("delete_connector_config.json"));
+            .setConfig(getResourceAsString("testData/connectors/delete_connector_config.json"));
     private static final Connector CONNECTOR_FOR_UPDATE = new Connector()
             .setName("sink_postgres_activities_e2e_checks_for_update-" + randomAlphabetic(5))
-            .setConfig(getResourceAsString("config_for_create_connector_via_api.json"));
+            .setConfig(getResourceAsString("testData/connectors/config_for_create_connector_via_api.json"));
 
     @BeforeClass(alwaysRun = true)
     public void beforeClass() {
@@ -56,7 +56,7 @@ public void beforeClass() {
     public void createConnector() {
         Connector connectorForCreate = new Connector()
                 .setName("sink_postgres_activities_e2e_checks-" + randomAlphabetic(5))
-                .setConfig(getResourceAsString("config_for_create_connector.json"));
+                .setConfig(getResourceAsString("testData/connectors/config_for_create_connector.json"));
         navigateToConnectors();
         kafkaConnectList
                 .clickCreateConnectorBtn();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
index a253bc4b676..9b2a1618c2f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
@@ -57,7 +57,7 @@ public void createSchemaAvro() {
     @QaseId(186)
     @Test(priority = 2)
     public void updateSchemaAvro() {
-        AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schema_avro_for_update.json");
+        AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_avro_for_update.json");
         navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
         schemaDetails
                 .openEditSchema();
@@ -74,7 +74,8 @@ public void updateSchemaAvro() {
                 .clickSubmitButton();
         schemaDetails
                 .waitUntilScreenReady();
-        Assert.assertEquals(CompatibilityLevel.CompatibilityEnum.NONE.toString(), schemaDetails.getCompatibility(), "getCompatibility()");
+        Assert.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.NONE.toString(),
+                "getCompatibility()");
     }
 
     @QaseId(44)
@@ -88,12 +89,12 @@ public void compareVersionsOperation() {
                 .openCompareVersionMenu();
         int versionsNumberFromDdl = schemaCreateForm
                 .waitUntilScreenReady()
-                .openSchemaVersionDdl()
+                .openLeftVersionDdl()
                 .getVersionsNumberFromList();
-        Assert.assertEquals(latestVersion, versionsNumberFromDdl, "Versions number is not matched");
+        Assert.assertEquals(versionsNumberFromDdl, latestVersion, "Versions number is not matched");
         schemaCreateForm
                 .selectVersionFromDropDown(1);
-        Assert.assertEquals(53, schemaCreateForm.getMarkedLinesNumber(), "getAllMarkedLines()");
+        Assert.assertEquals(schemaCreateForm.getMarkedLinesNumber(), 42, "getAllMarkedLines()");
     }
 
     @QaseId(187)
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
index dc7fc403c82..18219d965d5 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
@@ -32,7 +32,7 @@ public class MessagesTest extends BaseTest {
             .setMessageKey(randomAlphabetic(5))
             .setMessageContent(randomAlphabetic(10));
     private static final Topic TOPIC_TO_CLEAR_AND_PURGE_MESSAGES = new Topic()
-            .setName("topic-to-clear-and-purge-messages-attribute-" + randomAlphabetic(5))
+            .setName("topic-to-clear-and-purge-messages-" + randomAlphabetic(5))
             .setMessageKey(randomAlphabetic(5))
             .setMessageContent(randomAlphabetic(10));
     private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index e971b15e2b7..6107e3ade74 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -11,7 +11,7 @@ import PageLoader from 'components/common/PageLoader/PageLoader';
 import Dashboard from 'components/Dashboard/Dashboard';
 import ClusterPage from 'components/ClusterPage/ClusterPage';
 import { ThemeProvider } from 'styled-components';
-import theme from 'theme/theme';
+import { theme, darkTheme } from 'theme/theme';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { showServerError } from 'lib/errorHandling';
 import { Toaster } from 'react-hot-toast';
@@ -39,16 +39,18 @@ const queryClient = new QueryClient({
   },
 });
 const App: React.FC = () => {
+  const [isDarkMode, setDarkMode] = React.useState<boolean>(false);
+
   return (
     <QueryClientProvider client={queryClient}>
-      <ThemeProvider theme={theme}>
-        <Suspense fallback={<PageLoader />}>
-          <GlobalSettingsProvider>
+      <GlobalSettingsProvider>
+        <ThemeProvider theme={isDarkMode ? darkTheme : theme}>
+          <Suspense fallback={<PageLoader />}>
             <UserInfoRolesAccessProvider>
               <ConfirmContextProvider>
                 <GlobalCSS />
                 <S.Layout>
-                  <PageContainer>
+                  <PageContainer setDarkMode={setDarkMode}>
                     <Routes>
                       {['/', '/ui', '/ui/clusters'].map((path) => (
                         <Route
@@ -83,9 +85,9 @@ const App: React.FC = () => {
                 <ConfirmationModal />
               </ConfirmContextProvider>
             </UserInfoRolesAccessProvider>
-          </GlobalSettingsProvider>
-        </Suspense>
-      </ThemeProvider>
+          </Suspense>
+        </ThemeProvider>
+      </GlobalSettingsProvider>
     </QueryClientProvider>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Action.styled.ts b/kafka-ui-react-app/src/components/Connect/Details/Actions/Action.styled.ts
index a2998acdc21..77165abd9ff 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Action.styled.ts
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Action.styled.ts
@@ -15,8 +15,8 @@ export const RestartButton = styled.div`
   border-radius: 4px;
   display: flex;
   -webkit-align-items: center;
-  background: #e8e8fc;
-  color: #171a1c;
+  background: ${({ theme }) => theme.button.primary.backgroundColor.normal};
+  color: ${({ theme }) => theme.button.primary.color.normal};
   font-size: 14px;
   font-weight: 500;
   height: 32px;
diff --git a/kafka-ui-react-app/src/components/Connect/List/TopicsCell.tsx b/kafka-ui-react-app/src/components/Connect/List/TopicsCell.tsx
index ee48c2d2d3f..f5f634b7f2d 100644
--- a/kafka-ui-react-app/src/components/Connect/List/TopicsCell.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/TopicsCell.tsx
@@ -27,7 +27,7 @@ const TopicsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
   return (
     <S.TagsWrapper>
       {topics?.map((t) => (
-        <Tag key={t} color="gray">
+        <Tag key={t} color="green">
           <span
             role="link"
             onClick={(e) => navigateToTopic(e, t)}
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContent.styled.ts b/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContent.styled.ts
index 67b03ab127f..af36dfbee70 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContent.styled.ts
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContent.styled.ts
@@ -1,16 +1,17 @@
 import styled, { css } from 'styled-components';
 
 export const TopicContentWrapper = styled.tr`
-  background-color: ${({ theme }) =>
-    theme.consumerTopicContent.backgroundColor};
+  background-color: ${({ theme }) => theme.default.backgroundColor};
   & > td {
     padding: 16px !important;
+    background-color: ${({ theme }) =>
+      theme.consumerTopicContent.td.backgroundColor};
   }
 `;
 
 export const ContentBox = styled.div(
   ({ theme }) => css`
-    background-color: ${theme.menu.backgroundColor.normal};
+    background-color: ${theme.default.backgroundColor};
     padding: 20px;
     border-radius: 8px;
   `
diff --git a/kafka-ui-react-app/src/components/Dashboard/Dashboard.styled.ts b/kafka-ui-react-app/src/components/Dashboard/Dashboard.styled.ts
index a35424b1bb9..6bdd80d4def 100644
--- a/kafka-ui-react-app/src/components/Dashboard/Dashboard.styled.ts
+++ b/kafka-ui-react-app/src/components/Dashboard/Dashboard.styled.ts
@@ -5,4 +5,5 @@ export const Toolbar = styled.div`
   display: flex;
   justify-content: space-between;
   align-items: center;
+  color: ${({ theme }) => theme.default.color.normal};
 `;
diff --git a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
index e8f8a0339a4..fc6e0332db2 100644
--- a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
+++ b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
@@ -11,7 +11,7 @@ export const Wrapper = styled.div`
 
 export const Number = styled.div`
   font-size: 100px;
-  color: ${({ theme }) => theme.errorPage.text};
+  color: ${({ theme }) => theme.default.color.normal};
   line-height: initial;
 `;
 
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
index 3fc59fcecf4..b1066e481cb 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
@@ -19,6 +19,7 @@ export const KSQLInputsWrapper = styled.div`
 export const KSQLInputHeader = styled.div`
   display: flex;
   justify-content: space-between;
+  color: ${({ theme }) => theme.default.color.normal};
 `;
 
 export const KSQLButtons = styled.div`
@@ -31,6 +32,7 @@ export const StreamPropertiesContainer = styled.label`
   flex-direction: column;
   gap: 10px;
   width: 50%;
+  color: ${({ theme }) => theme.default.color.normal};
 `;
 
 export const InputsContainer = styled.div`
@@ -49,9 +51,18 @@ export const StreamPropertiesInputWrapper = styled.div`
     width: 100%;
     height: 40px;
     border: 1px solid grey;
+    &:focus {
+      outline: none;
+      border-color: ${({ theme }) => theme.input.borderColor.focus};
+      &::placeholder {
+        color: transparent;
+      }
+    }
     border-radius: 4px;
     font-size: 16px;
     padding-left: 15px;
+    background-color: ${({ theme }) => theme.input.backgroundColor.normal};
+    color: ${({ theme }) => theme.input.color.normal};
   }
 `;
 
@@ -73,8 +84,28 @@ export const SQLEditor = styled(BaseSQLEditor)(
     css`
       background: ${readOnly && theme.ksqlDb.query.editor.readonly.background};
       .ace-cursor {
-        ${readOnly && theme.ksqlDb.query.editor.readonly.cursor}
+        ${readOnly && `background: ${theme.default.transparentColor} `}
+      }
+
+      .ace_content {
+        background-color: ${theme.default.backgroundColor};
+        color: ${theme.default.color.normal};
+      }
+      .ace_line {
+        background-color: ${theme.ksqlDb.query.editor.activeLine
+          .backgroundColor};
       }
+      .ace_gutter-cell {
+        background-color: ${theme.ksqlDb.query.editor.cell.backgroundColor};
+      }
+      .ace_gutter-layer {
+        background-color: ${theme.ksqlDb.query.editor.layer.backgroundColor};
+        color: ${theme.default.color.normal};
+      }
+      .ace_cursor {
+        color: ${theme.ksqlDb.query.editor.cursor};
+      }
+
       .ace_print-margin {
         display: none;
       }
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
index 26622881f72..35309210881 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
@@ -146,6 +146,7 @@ const QueryForm: React.FC<Props> = ({
                         placeholder="Key"
                         aria-label="key"
                         type="text"
+                        autoComplete="off"
                       />
                     )}
                   />
@@ -166,6 +167,7 @@ const QueryForm: React.FC<Props> = ({
                         placeholder="Value"
                         aria-label="value"
                         type="text"
+                        autoComplete="off"
                       />
                     )}
                   />
diff --git a/kafka-ui-react-app/src/components/Nav/ClusterTab/ClusterTab.styled.ts b/kafka-ui-react-app/src/components/Nav/ClusterTab/ClusterTab.styled.ts
index 9b61878bba1..5ef2467889c 100644
--- a/kafka-ui-react-app/src/components/Nav/ClusterTab/ClusterTab.styled.ts
+++ b/kafka-ui-react-app/src/components/Nav/ClusterTab/ClusterTab.styled.ts
@@ -36,6 +36,7 @@ export const Title = styled.div`
   max-width: 110px;
   overflow: hidden;
   text-overflow: ellipsis;
+  color: ${({ theme }) => theme.menu.titleColor};
 `;
 
 export const StatusIconWrapper = styled.svg.attrs({
diff --git a/kafka-ui-react-app/src/components/Nav/ClusterTab/__tests__/ClusterTab.styled.spec.tsx b/kafka-ui-react-app/src/components/Nav/ClusterTab/__tests__/ClusterTab.styled.spec.tsx
index 68ff3b5efe9..c3bdf8b5821 100644
--- a/kafka-ui-react-app/src/components/Nav/ClusterTab/__tests__/ClusterTab.styled.spec.tsx
+++ b/kafka-ui-react-app/src/components/Nav/ClusterTab/__tests__/ClusterTab.styled.spec.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from 'lib/testHelpers';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 import { screen } from '@testing-library/react';
 import * as S from 'components/Nav/ClusterTab/ClusterTab.styled';
 import { ServerStatus } from 'generated-sources';
diff --git a/kafka-ui-react-app/src/components/NavBar/NavBar.styled.ts b/kafka-ui-react-app/src/components/NavBar/NavBar.styled.ts
index a665468fcef..8c4dd6f5b28 100644
--- a/kafka-ui-react-app/src/components/NavBar/NavBar.styled.ts
+++ b/kafka-ui-react-app/src/components/NavBar/NavBar.styled.ts
@@ -28,11 +28,11 @@ export const NavbarBrand = styled.div`
 `;
 
 export const SocialLink = styled.a(
-  ({ theme: { layout, icons } }) => css`
+  ({ theme: { icons } }) => css`
     display: block;
     margin-top: 5px;
     cursor: pointer;
-    fill: ${layout.socialLink.color};
+    fill: ${icons.discord.normal};
 
     &:hover {
       ${DiscordIcon} {
@@ -60,7 +60,7 @@ export const NavbarSocial = styled.div`
   display: flex;
   align-items: center;
   gap: 10px;
-  margin: 10px;
+  margin: 5px 10px 5px;
 `;
 
 export const NavbarItem = styled.div`
@@ -138,7 +138,10 @@ export const Hyperlink = styled(Link)(
     font-weight: bold;
     font-size: 12px;
     line-height: 16px;
-    color: ${theme.menu.color.active};
+    color: ${theme.default.color.normal};
+    &:hover {
+      color: ${theme.default.color.normal};
+    }
     text-decoration: none;
     word-break: break-word;
     cursor: pointer;
diff --git a/kafka-ui-react-app/src/components/NavBar/NavBar.tsx b/kafka-ui-react-app/src/components/NavBar/NavBar.tsx
index 275e77f5e30..2e363501288 100644
--- a/kafka-ui-react-app/src/components/NavBar/NavBar.tsx
+++ b/kafka-ui-react-app/src/components/NavBar/NavBar.tsx
@@ -1,17 +1,92 @@
 import React from 'react';
+import Select from 'components/common/Select/Select';
 import Logo from 'components/common/Logo/Logo';
 import Version from 'components/Version/Version';
 import GitIcon from 'components/common/Icons/GitIcon';
 import DiscordIcon from 'components/common/Icons/DiscordIcon';
+import AutoIcon from 'components/common/Icons/AutoIcon';
+import SunIcon from 'components/common/Icons/SunIcon';
+import MoonIcon from 'components/common/Icons/MoonIcon';
 
-import * as S from './NavBar.styled';
 import UserInfo from './UserInfo/UserInfo';
+import * as S from './NavBar.styled';
 
 interface Props {
   onBurgerClick: () => void;
+  setDarkMode: (value: boolean) => void;
 }
 
-const NavBar: React.FC<Props> = ({ onBurgerClick }) => {
+type ThemeDropDownValue = 'auto_theme' | 'light_theme' | 'dark_theme';
+
+const options = [
+  {
+    label: (
+      <>
+        <AutoIcon />
+        <div>Auto theme</div>
+      </>
+    ),
+    value: 'auto_theme',
+  },
+  {
+    label: (
+      <>
+        <SunIcon />
+        <div>Light theme</div>
+      </>
+    ),
+    value: 'light_theme',
+  },
+  {
+    label: (
+      <>
+        <MoonIcon />
+        <div>Dark theme</div>
+      </>
+    ),
+    value: 'dark_theme',
+  },
+];
+
+const NavBar: React.FC<Props> = ({ onBurgerClick, setDarkMode }) => {
+  const matchDark = window.matchMedia('(prefers-color-scheme: dark)');
+  const [themeMode, setThemeMode] = React.useState<ThemeDropDownValue>();
+
+  React.useLayoutEffect(() => {
+    const mode = localStorage.getItem('mode');
+    if (mode) {
+      setThemeMode(mode as ThemeDropDownValue);
+      if (mode === 'auto_theme') {
+        setDarkMode(matchDark.matches);
+      } else if (mode === 'light_theme') {
+        setDarkMode(false);
+      } else if (mode === 'dark_theme') {
+        setDarkMode(true);
+      }
+    } else {
+      setThemeMode('auto_theme');
+    }
+  }, []);
+
+  React.useEffect(() => {
+    if (themeMode === 'auto_theme') {
+      setDarkMode(matchDark.matches);
+      matchDark.addListener((e) => {
+        setDarkMode(e.matches);
+      });
+    }
+  }, [matchDark, themeMode]);
+
+  const onChangeThemeMode = (value: string | number) => {
+    setThemeMode(value as ThemeDropDownValue);
+    localStorage.setItem('mode', value as string);
+    if (value === 'light_theme') {
+      setDarkMode(false);
+    } else if (value === 'dark_theme') {
+      setDarkMode(true);
+    }
+  };
+
   return (
     <S.Navbar role="navigation" aria-label="Page Header">
       <S.NavbarBrand>
@@ -39,6 +114,12 @@ const NavBar: React.FC<Props> = ({ onBurgerClick }) => {
         </S.NavbarBrand>
       </S.NavbarBrand>
       <S.NavbarSocial>
+        <Select
+          options={options}
+          value={themeMode}
+          onChange={onChangeThemeMode}
+          isThemeMode
+        />
         <S.SocialLink
           href="https://github.com/provectus/kafka-ui"
           target="_blank"
diff --git a/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
index a70276afabd..2b432b10e3c 100644
--- a/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
+++ b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
@@ -2,14 +2,12 @@ import React from 'react';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 import UserIcon from 'components/common/Icons/UserIcon';
 import DropdownArrowIcon from 'components/common/Icons/DropdownArrowIcon';
-import { useTheme } from 'styled-components';
 import { useUserInfo } from 'lib/hooks/useUserInfo';
 
 import * as S from './UserInfo.styled';
 
 const UserInfo = () => {
   const { username } = useUserInfo();
-  const theme = useTheme();
 
   return username ? (
     <Dropdown
@@ -17,11 +15,7 @@ const UserInfo = () => {
         <S.Wrapper>
           <UserIcon />
           <S.Text>{username}</S.Text>
-          <DropdownArrowIcon
-            isOpen={false}
-            style={{}}
-            color={theme.button.primary.invertedColors.normal}
-          />
+          <DropdownArrowIcon isOpen={false} />
         </S.Wrapper>
       }
     >
diff --git a/kafka-ui-react-app/src/components/NavBar/__tests__/NavBar.spec.tsx b/kafka-ui-react-app/src/components/NavBar/__tests__/NavBar.spec.tsx
index c4dd443d41c..8d181b920db 100644
--- a/kafka-ui-react-app/src/components/NavBar/__tests__/NavBar.spec.tsx
+++ b/kafka-ui-react-app/src/components/NavBar/__tests__/NavBar.spec.tsx
@@ -12,7 +12,15 @@ jest.mock('components/NavBar/UserInfo/UserInfo', () => () => (
 
 describe('NavBar', () => {
   beforeEach(() => {
-    render(<NavBar onBurgerClick={jest.fn()} />);
+    Object.defineProperty(window, 'matchMedia', {
+      writable: true,
+      value: jest.fn().mockImplementation(() => ({
+        matches: false,
+        addListener: jest.fn(),
+      })),
+    });
+
+    render(<NavBar onBurgerClick={jest.fn()} setDarkMode={jest.fn()} />);
   });
 
   it('correctly renders header', () => {
diff --git a/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
index 93fe4dabe52..a5697e89abd 100644
--- a/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
+++ b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
@@ -5,7 +5,9 @@ import * as S from 'components/PageContainer/PageContainer.styled';
 import Nav from 'components/Nav/Nav';
 import useBoolean from 'lib/hooks/useBoolean';
 
-const PageContainer: React.FC<PropsWithChildren<unknown>> = ({ children }) => {
+const PageContainer: React.FC<
+  PropsWithChildren<{ setDarkMode: (value: boolean) => void }>
+> = ({ children, setDarkMode }) => {
   const {
     value: isSidebarVisible,
     toggle,
@@ -19,7 +21,7 @@ const PageContainer: React.FC<PropsWithChildren<unknown>> = ({ children }) => {
 
   return (
     <>
-      <NavBar onBurgerClick={toggle} />
+      <NavBar onBurgerClick={toggle} setDarkMode={setDarkMode} />
       <S.Container>
         <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
           <Nav />
diff --git a/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx b/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx
index cc78384d2f2..25f8fe0a2ab 100644
--- a/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx
+++ b/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx
@@ -19,9 +19,16 @@ describe('Page Container', () => {
     (useClusters as jest.Mock).mockImplementation(() => ({
       isSuccess: false,
     }));
+    Object.defineProperty(window, 'matchMedia', {
+      writable: true,
+      value: jest.fn().mockImplementation(() => ({
+        matches: false,
+        addListener: jest.fn(),
+      })),
+    });
 
     render(
-      <PageContainer>
+      <PageContainer setDarkMode={jest.fn()}>
         <div>child</div>
       </PageContainer>
     );
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.styled.tsx b/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.styled.tsx
index 076f2ccbd33..5c960e0f48b 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.styled.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Details/LatestVersion/LatestVersionItem.styled.tsx
@@ -1,11 +1,10 @@
 import Heading from 'components/common/heading/Heading.styled';
 import React from 'react';
 import styled from 'styled-components';
-import theme from 'theme/theme';
 
 export const Wrapper = styled.div`
   width: 100%;
-  background-color: ${theme.layout.stuffColor};
+  background-color: ${({ theme }) => theme.layout.stuffColor};
   padding: 16px;
   display: flex;
   justify-content: center;
@@ -14,7 +13,7 @@ export const Wrapper = styled.div`
   max-height: 700px;
 
   & > * {
-    background-color: ${theme.panelColor};
+    background-color: ${({ theme }) => theme.default.backgroundColor};
     padding: 24px;
     overflow-y: scroll;
   }
@@ -33,12 +32,16 @@ export const Wrapper = styled.div`
       gap: 16px;
       padding-bottom: 16px;
     }
+
+    p {
+      color: ${({ theme }) => theme.schema.backgroundColor.p};
+    }
   }
 `;
 
 export const MetaDataLabel = styled((props) => (
   <Heading level={4} {...props} />
 ))`
-  color: ${theme.lastestVersionItem.metaDataLabel.color};
+  color: ${({ theme }) => theme.lastestVersionItem.metaDataLabel.color};
   width: 110px;
 `;
diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts
index 18f2ccac259..8f178d320d1 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts
@@ -8,12 +8,37 @@ export const DiffWrapper = styled.div`
   flex-shrink: 1;
   min-height: min-content;
   padding-top: 1.5rem !important;
-  &
-    .ace_editor
-    > .ace_scroller
-    > .ace_content
-    > .ace_marker-layer
-    > .codeMarker {
+
+  .ace_content {
+    background-color: ${({ theme }) => theme.default.backgroundColor};
+    color: ${({ theme }) => theme.default.color.normal};
+  }
+  .ace_line {
+    background-color: ${({ theme }) => theme.default.backgroundColor};
+  }
+  .ace_gutter-cell {
+    background-color: ${({ theme }) =>
+      theme.ksqlDb.query.editor.cell.backgroundColor};
+  }
+  .ace_gutter-layer {
+    background-color: ${({ theme }) =>
+      theme.ksqlDb.query.editor.layer.backgroundColor};
+    color: ${({ theme }) => theme.default.color.normal};
+  }
+  .ace_cursor {
+    color: ${({ theme }) => theme.ksqlDb.query.editor.cursor};
+  }
+
+  .ace_print-margin {
+    display: none;
+  }
+  .ace_variable {
+    color: ${({ theme }) => theme.ksqlDb.query.editor.variable};
+  }
+  .ace_string {
+    color: ${({ theme }) => theme.ksqlDb.query.editor.aceString};
+  }
+  > .codeMarker {
     background: ${({ theme }) => theme.icons.warningIcon};
     position: absolute;
     z-index: 20;
diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.styled.ts b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.styled.ts
index fd1efe29e60..537119a3b8c 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Edit.styled.ts
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Edit.styled.ts
@@ -2,7 +2,7 @@ import styled, { css } from 'styled-components';
 
 export const EditWrapper = styled.div`
   padding: 16px;
-  padding-top: 0px;
+  padding-top: 0;
   & > form {
     display: flex;
     flex-direction: column;
@@ -44,6 +44,7 @@ export const EditorContainer = styled.div(
       font-size: 16px;
       line-height: 24px;
       padding-bottom: 16px;
+      color: ${theme.heading.h4};
     }
   `
 );
diff --git a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.styled.ts b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.styled.ts
index c9e6a07c610..75da5a60bb6 100644
--- a/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.styled.ts
+++ b/kafka-ui-react-app/src/components/Schemas/List/GlobalSchemaSelector/GlobalSchemaSelector.styled.ts
@@ -4,4 +4,7 @@ export const Wrapper = styled.div`
   display: flex;
   gap: 5px;
   align-items: center;
+  & > div {
+    color: ${({ theme }) => theme.select.label};
+  }
 `;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
index b5741c67e19..cab67f71ec1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Edit/DangerZone/DangerZone.styled.tsx
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 export const Wrapper = styled.div`
   margin-top: 16px;
   padding: 16px;
-  border-top: 1px solid ${({ theme }) => theme.dangerZone.borderColor};
+  border: 1px solid ${({ theme }) => theme.dangerZone.borderColor};
   box-sizing: border-box;
   width: 768px;
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
index 6e1d50b3bf6..bef6f59ff92 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
@@ -48,18 +48,24 @@ export const SeekTypeSelectorWrapper = styled.div`
 
 export const OffsetSelector = styled(Input)`
   border-radius: 0 4px 4px 0 !important;
-  border-left: none;
+  &::placeholder {
+    color: ${({ theme }) => theme.input.color.normal};
+  }
 `;
 
 export const DatePickerInput = styled(DatePicker)`
   height: 32px;
-  border: 1px ${(props) => props.theme.select.borderColor.normal} solid;
+  border: 1px ${({ theme }) => theme.select.borderColor.normal} solid;
   border-left: none;
   border-radius: 0 4px 4px 0;
   font-size: 14px;
   width: 100%;
   padding-left: 12px;
-  color: ${(props) => props.theme.select.color.normal};
+  background-color: ${({ theme }) => theme.input.backgroundColor.normal};
+  color: ${({ theme }) => theme.input.color.normal};
+  &::placeholder {
+    color: ${({ theme }) => theme.input.color.normal};
+  }
 
   background-image: url('data:image/svg+xml,%3Csvg width="10" height="6" viewBox="0 0 10 6" fill="none" xmlns="http://www.w3.org/2000/svg"%3E%3Cpath d="M1 1L5 5L9 1" stroke="%23454F54"/%3E%3C/svg%3E%0A') !important;
   background-repeat: no-repeat !important;
@@ -83,7 +89,10 @@ export const FiltersMetrics = styled.div`
   padding-top: 16px;
   padding-bottom: 16px;
 `;
-
+export const Message = styled.div`
+  font-size: 14px;
+  color: ${({ theme }) => theme.metrics.filters.color.normal};
+`;
 export const Metric = styled.div`
   color: ${({ theme }) => theme.metrics.filters.color.normal};
   font-size: 12px;
@@ -168,6 +177,7 @@ export const FilterTitle = styled.h3`
   display: flex;
   align-items: center;
   justify-content: space-between;
+  color: ${({ theme }) => theme.modal.color};
   &:after {
     content: '';
     width: calc(100% + 32px);
@@ -176,7 +186,7 @@ export const FilterTitle = styled.h3`
     top: 40px;
     left: -16px;
     display: inline-block;
-    background-color: #f1f2f3;
+    background-color: ${({ theme }) => theme.modal.border.top};
   }
 `;
 
@@ -184,9 +194,12 @@ export const CreatedFilter = styled.p`
   margin: 25px 0 10px;
   font-size: 14px;
   line-height: 20px;
-  color: ${({ theme }) => theme.list.meta.color};
+  color: ${({ theme }) => theme.savedFilter.color};
 `;
 
+export const NoSavedFilter = styled.p`
+  color: ${({ theme }) => theme.savedFilter.color};
+`;
 export const SavedFiltersContainer = styled.div`
   overflow-y: auto;
   height: 195px;
@@ -197,6 +210,7 @@ export const SavedFiltersContainer = styled.div`
 export const SavedFilterName = styled.div`
   font-size: 14px;
   line-height: 20px;
+  color: ${({ theme }) => theme.savedFilter.filterName};
 `;
 
 export const FilterButtonWrapper = styled.div`
@@ -214,7 +228,7 @@ export const FilterButtonWrapper = styled.div`
     top: 0;
     left: -16px;
     display: inline-block;
-    background-color: #f1f2f3;
+    background-color: ${({ theme }) => theme.modal.border.bottom};
   }
 `;
 
@@ -242,7 +256,7 @@ export const FilterOptions = styled.div`
   display: none;
   width: 50px;
   justify-content: space-between;
-  color: ${({ theme }) => theme.editFilterText.color};
+  color: ${({ theme }) => theme.editFilter.textColor};
 `;
 
 export const SavedFilter = styled.div.attrs({
@@ -254,28 +268,28 @@ export const SavedFilter = styled.div.attrs({
   height: 32px;
   align-items: center;
   cursor: pointer;
-  border-top: 1px solid #f1f2f3;
+  border-top: 1px solid ${({ theme }) => theme.panelColor.borderTop};
   &:hover ${FilterOptions} {
     display: flex;
   }
   &:hover {
     background: ${({ theme }) => theme.layout.stuffColor};
   }
-  background: ${(props) =>
-    props.selected ? props.theme.layout.stuffColor : props.theme.panelColor};
+  background: ${({ selected, theme }) =>
+    selected ? theme.layout.stuffColor : theme.modal.backgroundColor};
 `;
 
 export const ActiveSmartFilter = styled.div`
   border-radius: 4px;
   min-width: 115px;
   height: 24px;
-  background: ${({ theme }) => theme.layout.stuffColor};
+  background: ${({ theme }) => theme.savedFilter.backgroundColor};
   font-size: 14px;
   line-height: 20px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  color: ${({ theme }) => theme.input.label.color};
+  color: ${({ theme }) => theme.savedFilter.color};
   padding: 16px 8px;
 `;
 
@@ -294,7 +308,7 @@ export const MessageLoading = styled.div.attrs({
 })<MessageLoadingProps>`
   color: ${({ theme }) => theme.heading.h3.color};
   font-size: ${({ theme }) => theme.heading.h3.fontSize};
-  display: ${(props) => (props.isLive ? 'flex' : 'none')};
+  display: ${({ isLive }) => (isLive ? 'flex' : 'none')};
   justify-content: space-around;
   width: 250px;
 `;
@@ -306,7 +320,7 @@ export const StopLoading = styled.div`
 `;
 
 export const MessageLoadingSpinner = styled.div<MessageLoadingSpinnerProps>`
-  display: ${(props) => (props.isFetching ? 'block' : 'none')};
+  display: ${({ isFetching }) => (isFetching ? 'block' : 'none')};
   border: 3px solid ${({ theme }) => theme.pageLoader.borderColor};
   border-bottom: 3px solid ${({ theme }) => theme.pageLoader.borderBottomColor};
   border-radius: 50%;
@@ -335,7 +349,7 @@ export const SavedFiltersTextContainer = styled.div.attrs({
 
 const textStyle = css`
   font-size: 14px;
-  color: ${({ theme }) => theme.editFilterText.color};
+  color: ${({ theme }) => theme.editFilter.textColor};
   font-weight: 500;
 `;
 
@@ -354,3 +368,9 @@ export const SeekTypeSelect = styled(Select)`
   border-bottom-right-radius: 0;
   user-select: none;
 `;
+
+export const Serdes = styled.div`
+  display: flex;
+  gap: 24px;
+  padding: 8px 0;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 08e4aed6912..3abe336f044 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -517,7 +517,7 @@ const Filters: React.FC<FiltersProps> = ({
       <S.ActiveSmartFilterWrapper>
         <Search placeholder="Search" disabled={isTailing} />
 
-        <Button buttonType="primary" buttonSize="M" onClick={toggle}>
+        <Button buttonType="secondary" buttonSize="M" onClick={toggle}>
           <PlusIcon />
           Add Filters
         </Button>
@@ -542,11 +542,11 @@ const Filters: React.FC<FiltersProps> = ({
         />
       )}
       <S.FiltersMetrics>
-        <p style={{ fontSize: 14 }}>
+        <S.Message>
           {seekDirection !== SeekDirection.TAILING &&
             isFetching &&
             phaseMessage}
-        </p>
+        </S.Message>
         <S.MessageLoading isLive={isTailing}>
           <S.MessageLoadingSpinner isFetching={isFetching} />
           Loading messages.
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
index da5033e8cac..ab26319ca46 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/SavedFilters.tsx
@@ -63,7 +63,9 @@ const SavedFilters: FC<Props> = ({
       </S.BackToCustomText>
       <S.SavedFiltersContainer>
         <S.CreatedFilter>Saved filters</S.CreatedFilter>
-        {filters.length === 0 && <p>No saved filter(s)</p>}
+        {filters.length === 0 && (
+          <S.NoSavedFilter>No saved filter(s)</S.NoSavedFilter>
+        )}
         {filters.map((filter, index) => (
           <S.SavedFilter
             key={Symbol(filter.name).toString()}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.styled.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.styled.spec.tsx
index 009892ff047..6712833b3fc 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.styled.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.styled.spec.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { render } from 'lib/testHelpers';
 import * as S from 'components/Topics/Topic/Messages/Filters/Filters.styled';
 import { screen } from '@testing-library/react';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 
 describe('Filters Styled components', () => {
   describe('MessageLoading component', () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
index dd5cb5e24e7..1c190ba9caa 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
@@ -22,7 +22,7 @@ export const Section = styled.div`
 `;
 
 export const ContentBox = styled.div`
-  background-color: white;
+  background-color: ${({ theme }) => theme.topicMetaData.backgroundColor};
   padding: 24px;
   border-radius: 8px 0 0 8px;
   flex-grow: 3;
@@ -37,7 +37,7 @@ export const ContentBox = styled.div`
 `;
 
 export const MetadataWrapper = styled.div`
-  background-color: white;
+  background-color: ${({ theme }) => theme.topicMetaData.backgroundColor};
   padding: 24px;
   border-radius: 0 8px 8px 0;
   flex-grow: 1;
@@ -89,7 +89,7 @@ export const Tab = styled.button<{ $active?: boolean }>(
       border-radius: 0 4px 4px 0;
     }
     &:not(:last-child) {
-      border-right: 0px;
+      border-right: 0;
     }
   `
 );
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
index f166d70d3b0..23af3d45cf4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
@@ -8,7 +8,7 @@ import MessageContent, {
 import { TopicMessageTimestampTypeEnum } from 'generated-sources';
 import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 
 const setupWrapper = (props?: Partial<MessageContentProps>) => {
   return (
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts
index c1cecfbbd05..7fa49af82d4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/PreviewModal.styled.ts
@@ -33,4 +33,5 @@ export const Field = styled.div`
   white-space: nowrap;
   overflow: hidden;
   margin-right: 5px;
+  color: ${({ theme }) => theme.modal.color};
 `;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
index d02b2b228cb..da05b108c73 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { screen } from '@testing-library/react';
 import { render, WithRoute } from 'lib/testHelpers';
 import Overview from 'components/Topics/Topic/Overview/Overview';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 import { CleanUpPolicy, Topic } from 'generated-sources';
 import ClusterContext from 'components/contexts/ClusterContext';
 import userEvent from '@testing-library/user-event';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
index 41907fec781..eae9d4b3ce7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
@@ -53,7 +53,7 @@ const Metrics: React.FC = () => {
             await cancelTopicAnalysis.mutateAsync();
             setIsAnalyzing(true);
           }}
-          buttonType="primary"
+          buttonType="secondary"
           buttonSize="M"
           permission={{
             resource: ResourceType.TOPIC,
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts
index 24c2d4d9bdd..fc9e7aae9d5 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts
@@ -13,6 +13,7 @@ export const NameField = styled.div`
 
 export const CustomParamsHeading = styled.h4`
   font-weight: 500;
+  color: ${({ theme }) => theme.heading.h4};
 `;
 
 export const Label = styled.div`
@@ -29,12 +30,10 @@ export const Label = styled.div`
 export const Button = styled.button<{ isActive: boolean }>`
   background-color: ${({ theme, ...props }) =>
     props.isActive
-      ? theme.button.secondary.invertedColors.normal
-      : theme.button.secondary.backgroundColor.normal};
+      ? theme.chips.backgroundColor.active
+      : theme.chips.backgroundColor.normal};
   color: ${({ theme, ...props }) =>
-    props.isActive
-      ? theme.button.secondary.isActiveColor
-      : theme.button.primary.color};
+    props.isActive ? theme.chips.color.active : theme.chips.color.normal};
   height: 24px;
   padding: 0 5px;
   min-width: 51px;
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index e8d7f1b844a..e29bfca7a88 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -97,6 +97,7 @@ const TopicForm: React.FC<Props> = ({
                 name="name"
                 placeholder="Topic Name"
                 defaultValue={topicName}
+                autoComplete="off"
               />
               <FormError>
                 <ErrorMessage errors={errors} name="name" />
@@ -251,7 +252,7 @@ const TopicForm: React.FC<Props> = ({
         <S.ButtonWrapper>
           <Button
             type="button"
-            buttonType="primary"
+            buttonType="secondary"
             buttonSize="L"
             onClick={onCancel}
           >
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx
index aaae57306a4..f09eec6c5b6 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TimeToRetainBtn.spec.tsx
@@ -5,7 +5,7 @@ import TimeToRetainBtn, {
   Props,
 } from 'components/Topics/shared/Form/TimeToRetainBtn';
 import { useForm, FormProvider } from 'react-hook-form';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 import userEvent from '@testing-library/user-event';
 
 describe('TimeToRetainBtn', () => {
@@ -42,7 +42,7 @@ describe('TimeToRetainBtn', () => {
     it('should test the non active state of the button and its styling', () => {
       const buttonElement = screen.getByRole('button');
       expect(buttonElement).toHaveStyle(
-        `background-color:${theme.button.secondary.backgroundColor.normal}`
+        `background-color:${theme.chips.backgroundColor.normal}`
       );
       expect(buttonElement).toHaveStyle(`border:none`);
     });
@@ -50,7 +50,7 @@ describe('TimeToRetainBtn', () => {
       const buttonElement = screen.getByRole('button');
       await userEvent.click(buttonElement);
       expect(buttonElement).toHaveStyle(
-        `background-color:${theme.button.secondary.invertedColors.normal}`
+        `background-color:${theme.chips.backgroundColor.active}`
       );
       expect(buttonElement).toHaveStyle(`border:none`);
     });
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx
index f67f9557963..385da7381ea 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.styled.spec.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { render } from 'lib/testHelpers';
 import * as S from 'components/Topics/shared/Form/TopicForm.styled';
 import { screen } from '@testing-library/react';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 
 describe('TopicForm styled components', () => {
   describe('Button', () => {
@@ -11,7 +11,7 @@ describe('TopicForm styled components', () => {
       const button = screen.getByRole('button');
       expect(button).toHaveStyle({
         border: `none`,
-        backgroundColor: theme.button.secondary.invertedColors.normal,
+        backgroundColor: theme.chips.backgroundColor.active,
       });
     });
 
@@ -20,7 +20,7 @@ describe('TopicForm styled components', () => {
       const button = screen.getByRole('button');
       expect(button).toHaveStyle({
         border: `none`,
-        backgroundColor: theme.button.secondary.backgroundColor.normal,
+        backgroundColor: theme.chips.backgroundColor.normal,
       });
     });
   });
diff --git a/kafka-ui-react-app/src/components/Version/Version.styled.ts b/kafka-ui-react-app/src/components/Version/Version.styled.ts
index 8c70d9b9f91..62e22b7b0be 100644
--- a/kafka-ui-react-app/src/components/Version/Version.styled.ts
+++ b/kafka-ui-react-app/src/components/Version/Version.styled.ts
@@ -2,22 +2,22 @@ import styled, { css } from 'styled-components';
 
 export const Wrapper = styled.div`
   display: flex;
-  align-items: center;
+  align-items: baseline;
 `;
 
 const textStyle = css`
   font-family: Inter, sans-serif;
   font-style: normal;
   font-weight: normal;
-  font-size: 12px;
-  line-height: 16px;
+  font-size: 14px;
+  line-height: 20px;
 `;
 
 export const CurrentVersion = styled.span(
   ({ theme }) => css`
-    ${textStyle}
+    ${textStyle};
     color: ${theme.version.currentVersion.color};
-    margin-right: 0.25rem;
+    margin-left: 0.25rem;
   `
 );
 
@@ -25,13 +25,13 @@ export const OutdatedWarning = styled.span`
   ${textStyle}
 `;
 
-export const SymbolWrapper = styled.span(
+export const CurrentCommitLink = styled.a(
   ({ theme }) => css`
-    ${textStyle}
-    color: ${theme.version.symbolWrapper.color};
+    ${textStyle};
+    color: ${theme.version.commitLink.color};
+    margin-left: 0.25rem;
+    &:hover {
+      color: ${theme.version.commitLink.color};
+    }
   `
 );
-
-export const CurrentCommitLink = styled.a`
-  ${textStyle}
-`;
diff --git a/kafka-ui-react-app/src/components/Version/Version.tsx b/kafka-ui-react-app/src/components/Version/Version.tsx
index 2a611ae4a54..7a820b116a2 100644
--- a/kafka-ui-react-app/src/components/Version/Version.tsx
+++ b/kafka-ui-react-app/src/components/Version/Version.tsx
@@ -27,8 +27,6 @@ const Version: React.FC = () => {
 
   return (
     <S.Wrapper>
-      <S.CurrentVersion>{currentVersion}</S.CurrentVersion>
-
       {!!outdated && (
         <S.OutdatedWarning
           title={`Your app version is outdated. Current latest version is ${latestTag}`}
@@ -38,8 +36,7 @@ const Version: React.FC = () => {
       )}
 
       {commit && (
-        <>
-          <S.SymbolWrapper>&#40;</S.SymbolWrapper>
+        <div>
           <S.CurrentCommitLink
             title="Current commit"
             target="__blank"
@@ -47,9 +44,9 @@ const Version: React.FC = () => {
           >
             {commit}
           </S.CurrentCommitLink>
-          <S.SymbolWrapper>&#41;</S.SymbolWrapper>
-        </>
+        </div>
       )}
+      <S.CurrentVersion>{currentVersion}</S.CurrentVersion>
     </S.Wrapper>
   );
 };
diff --git a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
index 32ccf009e62..feb41e6a82d 100644
--- a/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
+++ b/kafka-ui-react-app/src/components/__tests__/App.spec.tsx
@@ -9,6 +9,8 @@ jest.mock('components/Nav/Nav', () => () => <div>Navigation</div>);
 
 jest.mock('components/Version/Version', () => () => <div>Version</div>);
 
+jest.mock('components/NavBar/NavBar', () => () => <div>NavBar</div>);
+
 jest.mock('lib/hooks/api/roles', () => ({
   useGetUserInfo: jest.fn(),
 }));
@@ -33,4 +35,8 @@ describe('App', () => {
   it('Renders navigation', async () => {
     expect(screen.getByText('Navigation')).toBeInTheDocument();
   });
+
+  it('Renders NavBar', async () => {
+    expect(screen.getByText('NavBar')).toBeInTheDocument();
+  });
 });
diff --git a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
index 4cf793a5ed4..76fe47ec710 100644
--- a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
@@ -16,52 +16,58 @@ const StyledButton = styled.button<ButtonProps>`
   border-radius: 4px;
   white-space: nowrap;
 
-  background: ${(props) =>
-    props.isInverted
+  background: ${({ isInverted, buttonType, theme }) =>
+    isInverted
       ? 'transparent'
-      : props.theme.button[props.buttonType].backgroundColor.normal};
-  color: ${(props) =>
-    props.isInverted
-      ? props.theme.button[props.buttonType].invertedColors.normal
-      : props.theme.button[props.buttonType].color};
-  font-size: ${(props) => props.theme.button.fontSize[props.buttonSize]};
+      : theme.button[buttonType].backgroundColor.normal};
+  color: ${({ isInverted, buttonType, theme }) =>
+    isInverted
+      ? theme.button[buttonType].invertedColors.normal
+      : theme.button[buttonType].color.normal};
+  font-size: ${({ theme, buttonSize }) => theme.button.fontSize[buttonSize]};
   font-weight: 500;
-  height: ${(props) => props.theme.button.height[props.buttonSize]};
+  height: ${({ theme, buttonSize }) => theme.button.height[buttonSize]};
 
   &:hover:enabled {
-    background: ${(props) =>
-      props.isInverted
+    background: ${({ isInverted, buttonType, theme }) =>
+      isInverted
         ? 'transparent'
-        : props.theme.button[props.buttonType].backgroundColor.hover};
-    color: ${(props) =>
-      props.isInverted
-        ? props.theme.button[props.buttonType].invertedColors.hover
-        : props.theme.button[props.buttonType].color};
+        : theme.button[buttonType].backgroundColor.hover};
+    color: ${({ isInverted, buttonType, theme }) =>
+      isInverted
+        ? theme.button[buttonType].invertedColors.hover
+        : theme.button[buttonType].color};
     cursor: pointer;
   }
   &:active:enabled {
-    background: ${(props) =>
-      props.isInverted
+    background: ${({ isInverted, buttonType, theme }) =>
+      isInverted
         ? 'transparent'
-        : props.theme.button[props.buttonType].backgroundColor.active};
-    color: ${(props) =>
-      props.isInverted
-        ? props.theme.button[props.buttonType].invertedColors.active
-        : props.theme.button[props.buttonType].color};
+        : theme.button[buttonType].backgroundColor.active};
+    color: ${({ isInverted, buttonType, theme }) =>
+      isInverted
+        ? theme.button[buttonType].invertedColors.active
+        : theme.button[buttonType].color};
   }
   &:disabled {
     opacity: 0.5;
     cursor: not-allowed;
+    background: ${({ buttonType, theme }) =>
+      theme.button[buttonType].backgroundColor.disabled};
+    color: ${({ buttonType, theme }) =>
+      theme.button[buttonType].color.disabled};
   }
 
   & a {
-    color: ${(props) => props.theme.button.primary.color};
+    color: ${({ theme }) => theme.button.primary.color};
   }
 
-  & :first-of-type {
-    svg {
-      margin-right: 7px;
-    }
+  & svg {
+    margin-right: 7px;
+    fill: ${({ theme, disabled, buttonType }) =>
+      disabled
+        ? theme.button[buttonType].color.disabled
+        : theme.button[buttonType].color.normal};
   }
 `;
 
diff --git a/kafka-ui-react-app/src/components/common/Button/__tests__/Button.spec.tsx b/kafka-ui-react-app/src/components/common/Button/__tests__/Button.spec.tsx
index 04271fa7794..e0fb407a01a 100644
--- a/kafka-ui-react-app/src/components/common/Button/__tests__/Button.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Button/__tests__/Button.spec.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Button } from 'components/common/Button/Button';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 
 describe('Button', () => {
   it('renders small primary Button', () => {
@@ -10,7 +10,7 @@ describe('Button', () => {
     expect(screen.getByRole('button')).toBeInTheDocument();
     expect(screen.getByRole('button')).toHaveStyleRule(
       'color',
-      theme.button.primary.color
+      theme.button.primary.color.normal
     );
     expect(screen.getByRole('button')).toHaveStyleRule(
       'font-size',
@@ -23,7 +23,7 @@ describe('Button', () => {
     expect(screen.getByRole('button')).toBeInTheDocument();
     expect(screen.getByRole('button')).toHaveStyleRule(
       'color',
-      theme.button.secondary.color
+      theme.button.secondary.color.normal
     );
     expect(screen.getByRole('button')).toHaveStyleRule(
       'font-size',
@@ -36,7 +36,7 @@ describe('Button', () => {
     expect(screen.getByRole('button')).toBeInTheDocument();
     expect(screen.getByRole('button')).toHaveStyleRule(
       'color',
-      theme.button.secondary.color
+      theme.button.secondary.color.normal
     );
   });
 
diff --git a/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.styled.tsx b/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.styled.tsx
index c5d2ae8bd8a..4baa88f5a4a 100644
--- a/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.styled.tsx
@@ -26,14 +26,14 @@ export const Overlay = styled.div(
 );
 
 export const Modal = styled.div(
-  ({ theme: { modal } }) => css`
+  ({ theme: { modal, confirmModal } }) => css`
     position: absolute;
     display: flex;
     flex-direction: column;
     width: 560px;
     border-radius: 8px;
 
-    background-color: ${modal.backgroundColor};
+    background-color: ${confirmModal.backgroundColor};
     filter: drop-shadow(0px 4px 16px ${modal.shadow});
   `
 );
@@ -43,6 +43,7 @@ export const Header = styled.div`
   text-align: start;
   padding: 16px;
   width: 100%;
+  color: ${({ theme }) => theme.modal.color};
 `;
 
 export const Content = styled.div(
@@ -51,6 +52,7 @@ export const Content = styled.div(
     width: 100%;
     border-top: 1px solid ${modal.border.top};
     border-bottom: 1px solid ${modal.border.bottom};
+    color: ${modal.contentColor};
   `
 );
 
diff --git a/kafka-ui-react-app/src/components/common/ControlPanel/ControlPanel.styled.ts b/kafka-ui-react-app/src/components/common/ControlPanel/ControlPanel.styled.ts
index e06c49992ed..7b61ca6efad 100644
--- a/kafka-ui-react-app/src/components/common/ControlPanel/ControlPanel.styled.ts
+++ b/kafka-ui-react-app/src/components/common/ControlPanel/ControlPanel.styled.ts
@@ -7,10 +7,11 @@ interface Props {
 export const ControlPanelWrapper = styled.div<Props>`
   display: flex;
   align-items: center;
-  padding: 0px 16px;
-  margin: 0px 0px 16px;
+  padding: 0 16px;
+  margin: 0 0 16px;
   width: 100%;
   gap: 16px;
+  color: ${({ theme }) => theme.default.color.normal};
   & > *:first-child {
     width: ${(props) => (props.hasInput ? '38%' : 'auto')};
   }
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
index 6095c50d522..f63fc5fe2a8 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
@@ -70,7 +70,7 @@ export const DropdownButton = styled.button`
 `;
 
 export const DangerItem = styled.div`
-  color: ${({ theme: { dropdown } }) => dropdown.item.color.danger};
+  color: ${({ theme: { dropdown } }) => dropdown.item.color.normal};
 `;
 
 export const DropdownItemHint = styled.div`
@@ -84,4 +84,5 @@ export const Wrapper = styled.div`
   display: inline-flex;
   align-items: center;
   justify-content: end;
+  color: ${({ theme: { dropdown } }) => dropdown.item.color.normal};
 `;
diff --git a/kafka-ui-react-app/src/components/common/Editor/Editor.tsx b/kafka-ui-react-app/src/components/common/Editor/Editor.tsx
index 76a63771865..9903bcc3345 100644
--- a/kafka-ui-react-app/src/components/common/Editor/Editor.tsx
+++ b/kafka-ui-react-app/src/components/common/Editor/Editor.tsx
@@ -43,5 +43,37 @@ Editor.displayName = 'Editor';
 export default styled(Editor)`
   &.ace-tomorrow {
     background: transparent;
+    .ace_gutter {
+      background-color: ${({ theme }) =>
+        theme.ksqlDb.query.editor.layer.backgroundColor};
+    }
+    .ace_gutter-active-line {
+      background-color: ${({ theme }) =>
+        theme.ksqlDb.query.editor.cell.backgroundColor};
+      color: ${({ theme }) => theme.default.color.normal};
+    }
+    .ace_line {
+      background-color: ${({ theme }) => theme.default.backgroundColor};
+      color: ${({ theme }) => theme.default.color.normal};
+    }
+    .ace_cursor {
+      color: ${({ theme }) => theme.ksqlDb.query.editor.cursor};
+    }
+    .ace_active-line {
+      background-color: ${({ theme }) =>
+        theme.ksqlDb.query.editor.cell.backgroundColor};
+    }
+    .ace_gutter-cell {
+      color: ${({ theme }) => theme.default.color.normal};
+    }
+    .ace_variable {
+      color: ${({ theme }) => theme.ksqlDb.query.editor.variable};
+    }
+    .ace_string {
+      color: ${({ theme }) => theme.ksqlDb.query.editor.aceString};
+    }
+    .ace_print-margin {
+      display: none;
+    }
   }
 `;
diff --git a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts
index dc925485732..d60603f635c 100644
--- a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts
+++ b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts
@@ -1,6 +1,13 @@
 import styled from 'styled-components';
 
 export const Wrapper = styled.div`
-  background-color: ${({ theme }) => theme.viewer.wrapper};
+  background-color: ${({ theme }) => theme.viewer.wrapper.backgroundColor};
   padding: 8px 16px;
+  .ace_active-line {
+    background-color: ${({ theme }) =>
+      theme.viewer.wrapper.backgroundColor} !important;
+  }
+  .ace_line {
+    color: ${({ theme }) => theme.viewer.wrapper.color} !important;
+  }
 `;
diff --git a/kafka-ui-react-app/src/components/common/Icons/ArrowDownIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/ArrowDownIcon.tsx
index a026dd301b8..9f6bd245b3f 100644
--- a/kafka-ui-react-app/src/components/common/Icons/ArrowDownIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/ArrowDownIcon.tsx
@@ -1,15 +1,20 @@
 import React from 'react';
+import { useTheme } from 'styled-components';
 
-const ArrowDownIcon: React.FC = () => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 384 512"
-    width="10"
-    height="10"
-  >
-    {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
-    <path d="M374.6 310.6l-160 160C208.4 476.9 200.2 480 192 480s-16.38-3.125-22.62-9.375l-160-160c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L160 370.8V64c0-17.69 14.33-31.1 31.1-31.1S224 46.31 224 64v306.8l105.4-105.4c12.5-12.5 32.75-12.5 45.25 0S387.1 298.1 374.6 310.6z" />
-  </svg>
-);
+const ArrowDownIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 384 512"
+      width="10"
+      height="10"
+      fill={theme.icons.arrowDownIcon}
+    >
+      {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
+      <path d="M374.6 310.6l-160 160C208.4 476.9 200.2 480 192 480s-16.38-3.125-22.62-9.375l-160-160c-12.5-12.5-12.5-32.75 0-45.25s32.75-12.5 45.25 0L160 370.8V64c0-17.69 14.33-31.1 31.1-31.1S224 46.31 224 64v306.8l105.4-105.4c12.5-12.5 32.75-12.5 45.25 0S387.1 298.1 374.6 310.6z" />
+    </svg>
+  );
+};
 
 export default ArrowDownIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/AutoIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/AutoIcon.tsx
new file mode 100644
index 00000000000..2408378be81
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/AutoIcon.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import { useTheme } from 'styled-components';
+
+const AutoIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      width="14"
+      height="15"
+      viewBox="0 0 14 15"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M7.92385 8.49072L7.03019 5.8418H6.97336L6.07796 8.49072H7.92385Z"
+        fill={theme.icons.autoIcon}
+      />
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M7 14.7422C10.866 14.7422 14 11.6082 14 7.74219C14 3.87619 10.866 0.742188 7 0.742188C3.13401 0.742188 0 3.87619 0 7.74219C0 11.6082 3.13401 14.7422 7 14.7422ZM3.5 11.2422H5.14789L5.68745 9.646H8.3136L8.85211 11.2422H10.5L7.99264 4.24219H6.01091L3.5 11.2422Z"
+        fill={theme.icons.autoIcon}
+      />
+    </svg>
+  );
+};
+
+export default AutoIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/CancelIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/CancelIcon.tsx
index 2bf87b4b2e1..46b645af010 100644
--- a/kafka-ui-react-app/src/components/common/Icons/CancelIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/CancelIcon.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
+import { useTheme } from 'styled-components';
 
 const CancelIcon: React.FC = () => {
+  const theme = useTheme();
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -17,7 +19,7 @@ const CancelIcon: React.FC = () => {
         data-name="layer1"
         d="M53.122 48.88L36.243 32l16.878-16.878a3 3 0 0 0-4.242-4.242L32 27.758l-16.878-16.88a3 3 0 0 0-4.243 4.243l16.878 16.88-16.88 16.88a3 3 0 0 0 4.243 4.241L32 36.243l16.878 16.88a3 3 0 0 0 4.244-4.243z"
         fill="none"
-        stroke="#202020"
+        stroke={theme.icons.cancelIcon}
         strokeMiterlimit="10"
         strokeWidth="2"
         strokeLinejoin="round"
diff --git a/kafka-ui-react-app/src/components/common/Icons/CheckmarkIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/CheckmarkIcon.tsx
index 864334db1a7..9b93600d2c4 100644
--- a/kafka-ui-react-app/src/components/common/Icons/CheckmarkIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/CheckmarkIcon.tsx
@@ -16,7 +16,7 @@ const CheckmarkIcon: FC = () => {
       <path
         data-name="layer1"
         fill="none"
-        stroke="#202020"
+        stroke="#FFFFFF"
         strokeMiterlimit="10"
         strokeWidth="2"
         d="M2 30l21 22 39-40"
diff --git a/kafka-ui-react-app/src/components/common/Icons/ClockIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/ClockIcon.tsx
index ee477e8d826..4c7de485a40 100644
--- a/kafka-ui-react-app/src/components/common/Icons/ClockIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/ClockIcon.tsx
@@ -1,15 +1,20 @@
 import React from 'react';
+import { useTheme } from 'styled-components';
 
-const ClockIcon: React.FC = () => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 512 512"
-    width={10}
-    height={10}
-  >
-    {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
-    <path d="M232 120C232 106.7 242.7 96 256 96C269.3 96 280 106.7 280 120V243.2L365.3 300C376.3 307.4 379.3 322.3 371.1 333.3C364.6 344.3 349.7 347.3 338.7 339.1L242.7 275.1C236 271.5 232 264 232 255.1L232 120zM256 0C397.4 0 512 114.6 512 256C512 397.4 397.4 512 256 512C114.6 512 0 397.4 0 256C0 114.6 114.6 0 256 0zM48 256C48 370.9 141.1 464 256 464C370.9 464 464 370.9 464 256C464 141.1 370.9 48 256 48C141.1 48 48 141.1 48 256z" />
-  </svg>
-);
+const ClockIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 512 512"
+      width={10}
+      height={10}
+      fill={theme.icons.clockIcon}
+    >
+      {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
+      <path d="M232 120C232 106.7 242.7 96 256 96C269.3 96 280 106.7 280 120V243.2L365.3 300C376.3 307.4 379.3 322.3 371.1 333.3C364.6 344.3 349.7 347.3 338.7 339.1L242.7 275.1C236 271.5 232 264 232 255.1L232 120zM256 0C397.4 0 512 114.6 512 256C512 397.4 397.4 512 256 512C114.6 512 0 397.4 0 256C0 114.6 114.6 0 256 0zM48 256C48 370.9 141.1 464 256 464C370.9 464 464 370.9 464 256C464 141.1 370.9 48 256 48C141.1 48 48 141.1 48 256z" />
+    </svg>
+  );
+};
 
 export default ClockIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx
index 73d62b9f6b6..dae8eb13a30 100644
--- a/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx
@@ -7,7 +7,7 @@ const DeleteIcon: React.FC = () => {
     <svg
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 448 512"
-      fill={theme.icons.deleteIcon}
+      fill={theme.editFilter.deleteIconColor}
       width="14"
       height="14"
     >
diff --git a/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx
index c656cc5170c..5e826f76168 100644
--- a/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/DropdownArrowIcon.tsx
@@ -7,21 +7,21 @@ interface Props {
   color?: string;
 }
 
-const DropdownArrowIcon: React.FC<Props> = ({ isOpen, style, color }) => {
+const DropdownArrowIcon: React.FC<Props> = ({ isOpen }) => {
   const theme = useTheme();
 
   return (
     <svg
-      width="24"
-      height="24"
-      fill="none"
-      style={style || { position: 'absolute', right: '5px' }}
+      width="10"
+      height="5"
+      viewBox="0 0 10 5"
+      fill="currentColor"
       stroke="currentColor"
-      strokeWidth="2"
-      color={color || theme.icons.dropdownArrowIcon}
+      xmlns="http://www.w3.org/2000/svg"
+      color={theme.icons.dropdownArrowIcon}
       transform={isOpen ? 'rotate(180)' : ''}
     >
-      <path d="M6 9L12 15 18 9" />
+      <path d="M0.646447 0.146447C0.841709 -0.0488155 1.15829 -0.0488155 1.35355 0.146447L5 3.79289L8.64645 0.146447C8.84171 -0.0488155 9.15829 -0.0488155 9.35355 0.146447C9.54882 0.341709 9.54882 0.658291 9.35355 0.853553L5.35355 4.85355C5.15829 5.04882 4.84171 5.04882 4.64645 4.85355L0.646447 0.853553C0.451184 0.658291 0.451184 0.341709 0.646447 0.146447Z" />
     </svg>
   );
 };
diff --git a/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx
index baac2603593..95fe102a610 100644
--- a/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx
@@ -1,6 +1,8 @@
 import React, { FC } from 'react';
+import { useTheme } from 'styled-components';
 
 const EditIcon: FC = () => {
+  const theme = useTheme();
   return (
     <svg
       viewBox="0 0 64 64"
@@ -17,7 +19,7 @@ const EditIcon: FC = () => {
         d="M54.368 17.674l6.275-6.267-8.026-8.025-6.274 6.267"
         strokeWidth="2"
         strokeMiterlimit="10"
-        stroke="#202020"
+        stroke={theme.icons.editIcon}
         fill="none"
         data-name="layer2"
         strokeLinejoin="round"
@@ -27,7 +29,7 @@ const EditIcon: FC = () => {
         d="M17.766 54.236l36.602-36.562-8.025-8.025L9.74 46.211 3.357 60.618l14.409-6.382zM9.74 46.211l8.026 8.025"
         strokeWidth="2"
         strokeMiterlimit="10"
-        stroke="#202020"
+        stroke={theme.icons.editIcon}
         fill="none"
         data-name="layer1"
         strokeLinejoin="round"
diff --git a/kafka-ui-react-app/src/components/common/Icons/FileIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/FileIcon.tsx
index c50e1002e63..a6db41ebaaf 100644
--- a/kafka-ui-react-app/src/components/common/Icons/FileIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/FileIcon.tsx
@@ -1,15 +1,20 @@
 import React from 'react';
+import { useTheme } from 'styled-components';
 
-const FileIcon: React.FC = () => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 384 512"
-    width="10"
-    height="10"
-  >
-    {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
-    <path d="M365.3 93.38l-74.63-74.64C278.6 6.742 262.3 0 245.4 0L64-.0001c-35.35 0-64 28.65-64 64l.0065 384c0 35.34 28.65 64 64 64H320c35.2 0 64-28.8 64-64V138.6C384 121.7 377.3 105.4 365.3 93.38zM336 448c0 8.836-7.164 16-16 16H64.02c-8.838 0-16-7.164-16-16L48 64.13c0-8.836 7.164-16 16-16h160L224 128c0 17.67 14.33 32 32 32h79.1V448zM96 280C96 293.3 106.8 304 120 304h144C277.3 304 288 293.3 288 280S277.3 256 264 256h-144C106.8 256 96 266.8 96 280zM264 352h-144C106.8 352 96 362.8 96 376s10.75 24 24 24h144c13.25 0 24-10.75 24-24S277.3 352 264 352z" />
-  </svg>
-);
+const FileIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 384 512"
+      width="10"
+      height="10"
+      fill={theme.icons.fileIcon}
+    >
+      {/* Font Awesome Pro 6.1.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. */}
+      <path d="M365.3 93.38l-74.63-74.64C278.6 6.742 262.3 0 245.4 0L64-.0001c-35.35 0-64 28.65-64 64l.0065 384c0 35.34 28.65 64 64 64H320c35.2 0 64-28.8 64-64V138.6C384 121.7 377.3 105.4 365.3 93.38zM336 448c0 8.836-7.164 16-16 16H64.02c-8.838 0-16-7.164-16-16L48 64.13c0-8.836 7.164-16 16-16h160L224 128c0 17.67 14.33 32 32 32h79.1V448zM96 280C96 293.3 106.8 304 120 304h144C277.3 304 288 293.3 288 280S277.3 256 264 256h-144C106.8 256 96 266.8 96 280zM264 352h-144C106.8 352 96 362.8 96 376s10.75 24 24 24h144c13.25 0 24-10.75 24-24S277.3 352 264 352z" />
+    </svg>
+  );
+};
 
 export default FileIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/InfoIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/InfoIcon.tsx
index 8e947c6ca97..f9f3bcae437 100644
--- a/kafka-ui-react-app/src/components/common/Icons/InfoIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/InfoIcon.tsx
@@ -1,50 +1,29 @@
 import React from 'react';
+import { useTheme } from 'styled-components';
 
 const InfoIcon: React.FC = () => {
+  const theme = useTheme();
   return (
     <svg
+      width="14"
+      height="15"
+      viewBox="0 0 14 15"
+      fill="red"
       xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 64 64"
-      width="12"
-      height="12"
-      aria-labelledby="title"
-      aria-describedby="desc"
-      role="img"
     >
-      <desc>A line styled icon from Orion Icon Library.</desc>
-      <circle
-        data-name="layer2"
-        cx="32"
-        cy="32"
-        r="30"
-        fill="none"
-        stroke="#202020"
-        strokeMiterlimit="10"
-        strokeWidth="2"
-        strokeLinejoin="round"
-        strokeLinecap="round"
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M7 1.81911C3.72878 1.81911 1.07692 4.47096 1.07692 7.74219C1.07692 11.0134 3.72878 13.6653 7 13.6653C10.2712 13.6653 12.9231 11.0134 12.9231 7.74219C12.9231 4.47096 10.2712 1.81911 7 1.81911ZM0 7.74219C0 3.87619 3.13401 0.742188 7 0.742188C10.866 0.742188 14 3.87619 14 7.74219C14 11.6082 10.866 14.7422 7 14.7422C3.13401 14.7422 0 11.6082 0 7.74219Z"
+        fill={theme.icons.infoIcon}
       />
       <path
-        data-name="layer1"
-        fill="none"
-        stroke="#202020"
-        strokeMiterlimit="10"
-        strokeWidth="2"
-        d="M28 26h4v22m-4 .008h8"
-        strokeLinejoin="round"
-        strokeLinecap="round"
+        d="M6 4.74219C6 4.1899 6.44772 3.74219 7 3.74219C7.55228 3.74219 8 4.1899 8 4.74219V7.74219C8 8.29447 7.55228 8.74219 7 8.74219C6.44772 8.74219 6 8.29447 6 7.74219V4.74219Z"
+        fill={theme.icons.infoIcon}
       />
-      <circle
-        data-name="layer1"
-        cx="31"
-        cy="19"
-        r="2"
-        fill="none"
-        stroke="#202020"
-        strokeMiterlimit="10"
-        strokeWidth="2"
-        strokeLinejoin="round"
-        strokeLinecap="round"
+      <path
+        d="M6 11.2422C6 10.6899 6.44772 10.2422 7 10.2422C7.55228 10.2422 8 10.6899 8 11.2422C8 11.7945 7.55228 12.2422 7 12.2422C6.44772 12.2422 6 11.7945 6 11.2422Z"
+        fill={theme.icons.infoIcon}
       />
     </svg>
   );
diff --git a/kafka-ui-react-app/src/components/common/Icons/MessageToggleIcon.styled.ts b/kafka-ui-react-app/src/components/common/Icons/MessageToggleIcon.styled.ts
index d779c86fd78..2762608c781 100644
--- a/kafka-ui-react-app/src/components/common/Icons/MessageToggleIcon.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Icons/MessageToggleIcon.styled.ts
@@ -1,10 +1,19 @@
 import styled from 'styled-components';
 
-export const Svg = styled.svg`
+type Props = {
+  isOpen?: boolean;
+};
+export const Svg = styled.svg<Props>`
   & > path {
-    fill: ${({ theme }) => theme.icons.messageToggleIcon.normal};
+    fill: ${({ theme, isOpen }) =>
+      isOpen
+        ? theme.icons.messageToggleIcon.active
+        : theme.icons.messageToggleIcon.normal};
     &:hover {
       fill: ${({ theme }) => theme.icons.messageToggleIcon.hover};
     }
+    &:active {
+      fill: ${({ theme }) => theme.icons.messageToggleIcon.active};
+    }
   }
 `;
diff --git a/kafka-ui-react-app/src/components/common/Icons/MessageToggleIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/MessageToggleIcon.tsx
index a71d868719b..ec430879481 100644
--- a/kafka-ui-react-app/src/components/common/Icons/MessageToggleIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/MessageToggleIcon.tsx
@@ -9,6 +9,7 @@ const MessageToggleIcon: React.FC<Props> = ({ isOpen }) => {
   if (isOpen) {
     return (
       <S.Svg
+        isOpen={isOpen}
         width="16"
         height="16"
         viewBox="0 0 16 16"
diff --git a/kafka-ui-react-app/src/components/common/Icons/MoonIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/MoonIcon.tsx
new file mode 100644
index 00000000000..7ff75aac0e6
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/MoonIcon.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { useTheme } from 'styled-components';
+
+const MoonIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      width="11"
+      height="11.99"
+      viewBox="0 0 12 12"
+      fill={theme.icons.moonIcon}
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M11.6624 9.31544C11.5535 9.32132 11.4438 9.3243 11.3334 9.3243C8.01971 9.3243 5.33342 6.63801 5.33342 3.3243C5.33342 2.09476 5.70325 0.951604 6.33775 0C3.17705 0.170804 0.666748 2.78781 0.666748 5.99113C0.666748 9.30484 3.35304 11.9911 6.66675 11.9911C8.75092 11.9911 10.5869 10.9285 11.6624 9.31544Z"
+        fill={theme.icons.moonIcon}
+      />
+    </svg>
+  );
+};
+
+export default MoonIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/SavedIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/SavedIcon.tsx
index 01895e2731b..1376a24d33f 100644
--- a/kafka-ui-react-app/src/components/common/Icons/SavedIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/SavedIcon.tsx
@@ -9,7 +9,7 @@ const SavedIcon: FC = () => {
       width="18"
       height="20"
       viewBox="0 0 18 20"
-      fill="none"
+      fill={theme.icons.savedIcon}
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
diff --git a/kafka-ui-react-app/src/components/common/Icons/SunIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/SunIcon.tsx
new file mode 100644
index 00000000000..7416f624dbe
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/SunIcon.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { useTheme } from 'styled-components';
+
+const SunIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      width="14"
+      height="14"
+      viewBox="0 0 14 14"
+      fill={theme.icons.sunIcon}
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M11.4545 7C11.4545 9.46018 9.46018 11.4545 7 11.4545C4.53982 11.4545 2.54545 9.46018 2.54545 7C2.54545 4.53982 4.53982 2.54545 7 2.54545C9.46018 2.54545 11.4545 4.53982 11.4545 7Z"
+        fill={theme.icons.sunIcon}
+      />
+      <path
+        d="M7.63636 0.636364C7.63636 0.987818 7.35145 1.27273 7 1.27273C6.64855 1.27273 6.36364 0.987818 6.36364 0.636364C6.36364 0.28491 6.64855 0 7 0C7.35145 0 7.63636 0.28491 7.63636 0.636364Z"
+        fill={theme.icons.sunIcon}
+      />
+      <path
+        d="M7.63636 13.3636C7.63636 13.7151 7.35145 14 7 14C6.64855 14 6.36364 13.7151 6.36364 13.3636C6.36364 13.0122 6.64855 12.7273 7 12.7273C7.35145 12.7273 7.63636 13.0122 7.63636 13.3636Z"
+        fill={theme.icons.sunIcon}
+      />
+      <path
+        d="M13.3636 7.63636C13.0122 7.63636 12.7273 7.35145 12.7273 7C12.7273 6.64855 13.0122 6.36364 13.3636 6.36364C13.7151 6.36364 14 6.64855 14 7C14 7.35145 13.7151 7.63636 13.3636 7.63636Z"
+        fill={theme.icons.sunIcon}
+      />
+      <path
+        d="M0.636364 7.63636C0.28491 7.63636 -1.53625e-08 7.35145 0 7C1.53625e-08 6.64855 0.28491 6.36364 0.636364 6.36364C0.987818 6.36364 1.27273 6.64855 1.27273 7C1.27273 7.35145 0.987818 7.63636 0.636364 7.63636Z"
+        fill={theme.icons.sunIcon}
+      />
+      <path
+        d="M11.9497 2.95018C11.7012 3.19869 11.2983 3.19869 11.0498 2.95018C10.8013 2.70166 10.8013 2.29874 11.0498 2.05022C11.2983 1.80171 11.7012 1.80171 11.9497 2.05022C12.1983 2.29874 12.1983 2.70166 11.9497 2.95018Z"
+        fill={theme.icons.sunIcon}
+      />
+      <path
+        d="M2.95021 11.9497C2.70169 12.1982 2.29877 12.1982 2.05025 11.9497C1.80174 11.7012 1.80174 11.2983 2.05025 11.0498C2.29877 10.8012 2.70169 10.8012 2.95021 11.0498C3.19872 11.2983 3.19872 11.7012 2.95021 11.9497Z"
+        fill={theme.icons.sunIcon}
+      />
+      <path
+        d="M11.0498 11.9497C10.8013 11.7012 10.8013 11.2983 11.0498 11.0498C11.2983 10.8012 11.7012 10.8012 11.9497 11.0498C12.1983 11.2983 12.1983 11.7012 11.9497 11.9497C11.7012 12.1982 11.2983 12.1982 11.0498 11.9497Z"
+        fill={theme.icons.sunIcon}
+      />
+      <path
+        d="M2.05025 2.95018C1.80174 2.70166 1.80174 2.29874 2.05025 2.05022C2.29877 1.80171 2.70169 1.80171 2.95021 2.05022C3.19872 2.29874 3.19872 2.70166 2.95021 2.95018C2.70169 3.19869 2.29877 3.19869 2.05025 2.95018Z"
+        fill={theme.icons.sunIcon}
+      />
+    </svg>
+  );
+};
+
+export default SunIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/WarningIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/WarningIcon.tsx
index dec81b585f0..ab2f8dee759 100644
--- a/kafka-ui-react-app/src/components/common/Icons/WarningIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/WarningIcon.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import styled, { useTheme } from 'styled-components';
+import styled from 'styled-components';
 
 const WarningIconContainer = styled.span`
   align-items: center;
@@ -10,27 +10,21 @@ const WarningIconContainer = styled.span`
 `;
 
 const WarningIcon: React.FC = () => {
-  const theme = useTheme();
-
   return (
     <WarningIconContainer>
       <svg
+        width="14"
+        height="13"
+        viewBox="0 0 14 13"
+        fill="none"
         xmlns="http://www.w3.org/2000/svg"
-        version="1.0"
-        width="18px"
-        height="16px"
-        viewBox="0 0 1280.000000 1126.000000"
-        preserveAspectRatio="xMidYMid meet"
       >
-        <g
-          transform="translate(0.000000,1126.000000) scale(0.100000,-0.100000)"
-          fill={theme.icons.warningIcon}
-          stroke="none"
-        >
-          <path d="M6201 11240 c-41 -10 -113 -37 -160 -61 -70 -35 -105 -62 -187 -144 -61 -60 -124 -134 -157 -185 -85 -132 -681 -1182 -2962 -5215 -793 -1402 -1714 -3032 -2047 -3620 -333 -589 -617 -1098 -631 -1131 -79 -187 -72 -394 19 -559 15 -28 64 -86 108 -130 91 -90 177 -139 306 -175 l76 -20 5879 2 5880 3 81 27 c363 124 494 499 304 878 -21 43 -899 1580 -1951 3417 -1052 1836 -2308 4029 -2791 4873 -484 844 -909 1580 -946 1635 -118 177 -268 311 -419 373 -125 52 -272 64 -402 32z m1607 -3410 c793 -1383 2019 -3523 2724 -4755 l1283 -2240 -2712 -3 c-1492 -1 -3934 -1 -5427 0 l-2715 3 1666 2945 c3188 5637 3725 6583 3734 6572 4 -4 655 -1139 1447 -2522z" />
-          <path d="M6290 7874 c-14 -3 -61 -14 -104 -25 -390 -98 -706 -474 -706 -837 0 -46 22 -254 50 -461 27 -207 113 -857 190 -1446 201 -1535 199 -1517 216 -1581 42 -165 141 -297 271 -361 67 -33 86 -38 168 -41 152 -7 246 30 348 136 99 105 144 224 176 464 11 84 61 462 111 841 49 378 131 996 180 1375 50 378 100 756 111 840 24 182 25 305 4 387 -82 323 -360 599 -693 686 -75 20 -266 33 -322 23z" />
-          <path d="M6322 2739 c-345 -44 -594 -371 -552 -726 20 -166 86 -301 204 -410 114 -107 237 -160 391 -170 187 -11 336 47 475 187 134 134 192 273 193 465 1 116 -13 183 -58 280 -120 261 -379 409 -653 374z" />
-        </g>
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M8.09265 1.06679C7.60703 0.250524 6.39297 0.250524 5.90735 1.06679L0.170916 10.7089C-0.314707 11.5252 0.292322 12.5455 1.26357 12.5455H12.7364C13.7077 12.5455 14.3147 11.5252 13.8291 10.7089L8.09265 1.06679ZM6 5.00006C6 4.44778 6.44772 4.00006 7 4.00006C7.55228 4.00006 8 4.44778 8 5.00006V7.00006C8 7.55235 7.55228 8.00006 7 8.00006C6.44772 8.00006 6 7.55235 6 7.00006V5.00006ZM6 10.0001C6 9.44778 6.44772 9.00006 7 9.00006C7.55228 9.00006 8 9.44778 8 10.0001C8 10.5523 7.55228 11.0001 7 11.0001C6.44772 11.0001 6 10.5523 6 10.0001Z"
+          fill="#F2C94C"
+        />
       </svg>
     </WarningIconContainer>
   );
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
index 52a4bc6fb35..9495aaecbeb 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
@@ -13,7 +13,11 @@ const INPUT_SIZES = {
 
 export const Wrapper = styled.div`
   position: relative;
-
+  &:hover {
+    svg:first-child {
+      fill: ${({ theme }) => theme.input.icon.hover};
+    }
+  }
   svg:first-child {
     position: absolute;
     top: 8px;
@@ -29,8 +33,10 @@ export const Wrapper = styled.div`
 
 export const Input = styled.input<InputProps>(
   ({ theme: { input }, inputSize, search }) => css`
+    background-color: ${input.backgroundColor.normal};
     border: 1px ${input.borderColor.normal} solid;
     border-radius: 4px;
+    color: ${input.color.normal};
     height: ${inputSize && INPUT_SIZES[inputSize]
       ? INPUT_SIZES[inputSize]
       : '40px'};
@@ -55,6 +61,7 @@ export const Input = styled.input<InputProps>(
     &:disabled {
       color: ${input.color.disabled};
       border-color: ${input.borderColor.disabled};
+      background-color: ${input.backgroundColor.disabled};
       cursor: not-allowed;
     }
     &:read-only {
@@ -79,5 +86,5 @@ export const FormError = styled.p`
 export const InputHint = styled.p`
   font-size: 0.85rem;
   margin-top: 0.25rem;
-  color: ${({ theme }) => theme.text.secondary};
+  color: ${({ theme }) => theme.clusterConfigForm.inputHintText.secondary};
 `;
diff --git a/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx b/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx
index 48fb0d723a4..b9aae50998a 100644
--- a/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/Metrics/Metrics.styled.tsx
@@ -10,7 +10,7 @@ export const Wrapper = styled.div`
 `;
 
 export const IndicatorWrapper = styled.div`
-  background-color: ${({ theme }) => theme.metrics.indicator.backgroundColor};
+  background-color: ${({ theme }) => theme.default.backgroundColor};
   height: 68px;
   width: fit-content;
   min-width: 150px;
@@ -21,6 +21,7 @@ export const IndicatorWrapper = styled.div`
   padding: 12px 16px;
   box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.08);
   flex-grow: 1;
+  color: ${({ theme }) => theme.default.color.normal};
 `;
 
 export const IndicatorTitle = styled.div`
@@ -39,12 +40,14 @@ export const IndicatorsWrapper = styled.div`
   border-radius: 8px;
   overflow: auto;
   box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.08);
+  color: ${({ theme }) => theme.metrics.wrapper};
 `;
 
 export const SectionTitle = styled.h5`
   font-weight: 500;
   margin: 0 0 0.5rem 16px;
   font-size: 100%;
+  color: ${({ theme }) => theme.metrics.sectionTitle};
 `;
 
 export const LightText = styled.span`
diff --git a/kafka-ui-react-app/src/components/common/Metrics/__tests__/Indicator.spec.tsx b/kafka-ui-react-app/src/components/common/Metrics/__tests__/Indicator.spec.tsx
index 873fdc1e979..ba4d5fedcfd 100644
--- a/kafka-ui-react-app/src/components/common/Metrics/__tests__/Indicator.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Metrics/__tests__/Indicator.spec.tsx
@@ -3,7 +3,7 @@ import { Indicator } from 'components/common/Metrics';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
 import { Props } from 'components/common/Metrics/Indicator';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 
 const title = 'Test Title';
 const label = 'Test Label';
diff --git a/kafka-ui-react-app/src/components/common/Metrics/__tests__/Section.spec.tsx b/kafka-ui-react-app/src/components/common/Metrics/__tests__/Section.spec.tsx
index fd1e13aa722..fb173fa116f 100644
--- a/kafka-ui-react-app/src/components/common/Metrics/__tests__/Section.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Metrics/__tests__/Section.spec.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Section } from 'components/common/Metrics';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
+import { render } from 'lib/testHelpers';
 
 const child = 'Child';
 const title = 'Test Title';
diff --git a/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts b/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts
index d6ea81d5ac4..2ed6c60147b 100644
--- a/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts
+++ b/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts
@@ -5,8 +5,37 @@ const MultiSelect = styled(ReactMultiSelect)<{ minWidth?: string }>`
   min-width: ${({ minWidth }) => minWidth || '200px;'};
   height: 32px;
   font-size: 14px;
+  .search input {
+    color: ${({ theme }) => theme.input.color.normal};
+    background-color: ${(props) =>
+      props.theme.input.backgroundColor.normal} !important;
+  }
+  .select-item {
+    color: ${({ theme }) => theme.select.color.normal};
+    background-color: ${({ theme }) =>
+      theme.select.backgroundColor.normal} !important;
+
+    &:active {
+      background-color: ${({ theme }) =>
+        theme.select.backgroundColor.active} !important;
+    }
+  }
 
+  .select-item.selected {
+    background-color: ${({ theme }) =>
+      theme.select.backgroundColor.active} !important;
+  }
+  .options li {
+    background-color: ${({ theme }) =>
+      theme.select.backgroundColor.normal} !important;
+  }
   & > .dropdown-container {
+    background-color: ${({ theme }) =>
+      theme.input.backgroundColor.normal} !important;
+    border-color: ${({ theme }) => theme.select.borderColor.normal} !important;
+    &:hover {
+      border-color: ${({ theme }) => theme.select.borderColor.hover} !important;
+    }
     height: 32px;
     * {
       cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};
@@ -15,7 +44,9 @@ const MultiSelect = styled(ReactMultiSelect)<{ minWidth?: string }>`
     & > .dropdown-heading {
       height: 32px;
       color: ${({ disabled, theme }) =>
-        disabled ? theme.select.color.disabled : theme.select.color.active};
+        disabled
+          ? theme.select.color.disabled
+          : theme.select.color.active} !important;
       & > .clear-selected-button {
         display: none;
       }
diff --git a/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts b/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
index 1c2bd45c84e..113047bd477 100644
--- a/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Navigation/Navbar.styled.ts
@@ -14,23 +14,21 @@ const Navbar = styled.nav`
     font-weight: 500;
     font-size: 14px;
     white-space: nowrap;
-    color: ${(props) => props.theme.primaryTab.color.normal};
-    border-bottom: 1px ${(props) => props.theme.primaryTab.borderColor.normal}
-      solid;
+    color: ${({ theme }) => theme.primaryTab.color.normal};
+    border-bottom: 1px ${({ theme }) => theme.default.transparentColor} solid;
     &.is-active {
-      border-bottom: 1px ${(props) => props.theme.primaryTab.borderColor.active}
+      border-bottom: 1px ${({ theme }) => theme.primaryTab.borderColor.active}
         solid;
-      color: ${(props) => props.theme.primaryTab.color.active};
+      color: ${({ theme }) => theme.primaryTab.color.active};
     }
     &.is-disabled {
       color: ${(props) => props.theme.primaryTab.color.disabled};
-      border-bottom: 1px ${(props) => props.theme.primaryTab.borderColor.normal};
+      border-bottom: 1px ${({ theme }) => theme.default.transparentColor};
       cursor: not-allowed;
     }
     &:hover:not(.is-active, .is-disabled) {
-      border-bottom: 1px ${(props) => props.theme.primaryTab.borderColor.hover}
-        solid;
-      color: ${(props) => props.theme.primaryTab.color.hover};
+      border-bottom: 1px ${({ theme }) => theme.default.transparentColor} solid;
+      color: ${({ theme }) => theme.primaryTab.color.hover};
     }
   }
 `;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
index ff5e501d527..d5b78c38399 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/ExpanderCell.tsx
@@ -3,31 +3,34 @@ import React from 'react';
 
 import * as S from './Table.styled';
 
-const ExpanderCell: React.FC<CellContext<unknown, unknown>> = ({ row }) => (
-  <S.ExpaderButton
-    width="16"
-    height="20"
-    viewBox="0 -2 16 16"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    role="button"
-    aria-label="Expand row"
-    $disabled={!row.getCanExpand()}
-  >
-    {row.getIsExpanded() ? (
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M14 16C15.1046 16 16 15.1046 16 14L16 2C16 0.895431 15.1046 -7.8281e-08 14 -1.74846e-07L2 -1.22392e-06C0.895432 -1.32048e-06 1.32048e-06 0.895429 1.22392e-06 2L1.74846e-07 14C7.8281e-08 15.1046 0.895431 16 2 16L14 16ZM5 7C4.44772 7 4 7.44771 4 8C4 8.55228 4.44772 9 5 9L11 9C11.5523 9 12 8.55228 12 8C12 7.44772 11.5523 7 11 7L5 7Z"
-      />
-    ) : (
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M0 2C0 0.895431 0.895431 0 2 0H14C15.1046 0 16 0.895431 16 2V14C16 15.1046 15.1046 16 14 16H2C0.895431 16 0 15.1046 0 14V2ZM8 4C8.55229 4 9 4.44772 9 5V7H11C11.5523 7 12 7.44772 12 8C12 8.55229 11.5523 9 11 9H9V11C9 11.5523 8.55229 12 8 12C7.44772 12 7 11.5523 7 11V9H5C4.44772 9 4 8.55228 4 8C4 7.44771 4.44772 7 5 7H7V5C7 4.44772 7.44772 4 8 4Z"
-      />
-    )}
-  </S.ExpaderButton>
-);
+const ExpanderCell: React.FC<CellContext<unknown, unknown>> = ({ row }) => {
+  return (
+    <S.ExpaderButton
+      width="16"
+      height="20"
+      viewBox="0 -2 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      role="button"
+      aria-label="Expand row"
+      $disabled={!row.getCanExpand()}
+      getIsExpanded={row.getIsExpanded()}
+    >
+      {row.getIsExpanded() ? (
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M14 16C15.1046 16 16 15.1046 16 14L16 2C16 0.895431 15.1046 -7.8281e-08 14 -1.74846e-07L2 -1.22392e-06C0.895432 -1.32048e-06 1.32048e-06 0.895429 1.22392e-06 2L1.74846e-07 14C7.8281e-08 15.1046 0.895431 16 2 16L14 16ZM5 7C4.44772 7 4 7.44771 4 8C4 8.55228 4.44772 9 5 9L11 9C11.5523 9 12 8.55228 12 8C12 7.44772 11.5523 7 11 7L5 7Z"
+        />
+      ) : (
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M0 2C0 0.895431 0.895431 0 2 0H14C15.1046 0 16 0.895431 16 2V14C16 15.1046 15.1046 16 14 16H2C0.895431 16 0 15.1046 0 14V2ZM8 4C8.55229 4 9 4.44772 9 5V7H11C11.5523 7 12 7.44772 12 8C12 8.55229 11.5523 9 11 9H9V11C9 11.5523 8.55229 12 8 12C7.44772 12 7 11.5523 7 11V9H5C4.44772 9 4 8.55228 4 8C4 7.44771 4.44772 7 5 7H7V5C7 4.44772 7.44772 4 8 4Z"
+        />
+      )}
+    </S.ExpaderButton>
+  );
+};
 
 export default ExpanderCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
index d66bb45091c..0d9af3a61a4 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
@@ -1,14 +1,21 @@
 import styled, { css } from 'styled-components';
 
-export const ExpaderButton = styled.svg<{ $disabled: boolean }>(
-  ({ theme: { table }, $disabled }) => css`
+export const ExpaderButton = styled.svg<{
+  $disabled: boolean;
+  getIsExpanded: boolean;
+}>(
+  ({ theme: { table }, $disabled, getIsExpanded }) => css`
     & > path {
-      fill: ${table.expander[$disabled ? 'disabled' : 'normal']};
+      fill: ${table.expander[
+        ($disabled && 'disabled') || (getIsExpanded && 'active') || 'normal'
+      ]};
     }
-
     &:hover > path {
       fill: ${table.expander[$disabled ? 'disabled' : 'hover']};
     }
+    &:active > path {
+      fill: ${table.expander[$disabled ? 'disabled' : 'active']};
+    }
   `
 );
 
@@ -138,7 +145,7 @@ export const Table = styled.table(
   width: 100%;
 
   td {
-    border-top: 1px #f1f2f3 solid;
+    border-top: 1px ${table.td.borderTop} solid;
     font-size: 14px;
     font-weight: 400;
     padding: 8px 8px 8px 24px;
@@ -147,7 +154,7 @@ export const Table = styled.table(
     word-wrap: break-word;
 
     & a {
-      color: ${table.link.color.normal};
+      color: ${table.td.color.normal};
       font-weight: 500;
       max-width: 450px;
       white-space: nowrap;
@@ -162,6 +169,10 @@ export const Table = styled.table(
       &:active {
         color: ${table.link.color.active};
       }
+      &:button {
+      color: ${table.link.color.active};
+      }
+
     }
   }
 `
@@ -192,6 +203,7 @@ export const GoToPage = styled.label`
   flex-wrap: nowrap;
   gap: 8px;
   margin-left: 8px;
+  color: ${({ theme }) => theme.table.pagination.info};
 `;
 
 export const PageInfo = styled.div`
@@ -202,6 +214,7 @@ export const PageInfo = styled.div`
   flex-wrap: nowrap;
   white-space: nowrap;
   margin-left: 16px;
+  color: ${({ theme }) => theme.table.pagination.info};
 `;
 
 export const Ellipsis = styled.div`
diff --git a/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.styled.ts b/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.styled.ts
index 2d9d0ab6bc7..7f612615d9f 100644
--- a/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.styled.ts
+++ b/kafka-ui-react-app/src/components/common/ProgressBar/ProgressBar.styled.ts
@@ -2,7 +2,7 @@ import styled, { css } from 'styled-components';
 
 export const Wrapper = styled.div`
   height: 10px;
-  width: '100%';
+  width: 100%;
   min-width: 200px;
   background-color: ${({ theme }) => theme.progressBar.backgroundColor};
   border-radius: 5px;
@@ -16,7 +16,7 @@ export const Filler = styled.div<{ completed: number }>(
     width: ${completed}%;
     background-color: ${progressBar.compleatedColor};
     border-radius: 5px;
-    text-align: 'right';
+    text-align: right;
     transition: width 1.2s linear;
   `
 );
diff --git a/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx b/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx
index 6257040940a..e769cf5abf1 100644
--- a/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/PropertiesList/PropertiesList.styled.tsx
@@ -12,11 +12,6 @@ export const List = styled.div`
 export const Label = styled.div`
   font-size: 14px;
   font-weight: 500;
-  color: ${({ theme }) => theme.list.label.color};
+  color: ${({ theme }) => theme.default.color.normal};
   white-space: nowrap;
 `;
-
-export const SubText = styled.div`
-  color: ${({ theme }) => theme.list.meta.color};
-  font-size: 12px;
-`;
diff --git a/kafka-ui-react-app/src/components/common/Select/Select.styled.ts b/kafka-ui-react-app/src/components/common/Select/Select.styled.ts
index 428cbcc89c6..9be7ed3db74 100644
--- a/kafka-ui-react-app/src/components/common/Select/Select.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Select/Select.styled.ts
@@ -5,6 +5,7 @@ interface Props {
   isLive?: boolean;
   minWidth?: string;
   disabled?: boolean;
+  isThemeMode?: boolean;
 }
 
 interface OptionProps {
@@ -15,55 +16,78 @@ export const Select = styled.ul<Props>`
   position: relative;
   list-style: none;
   display: flex;
-  gap: ${(props) => (props.isLive ? '5px' : '0')};
+  gap: 6px;
   align-items: center;
+  justify-content: space-between;
   height: ${(props) => (props.selectSize === 'M' ? '32px' : '40px')};
   border: 1px
-    ${({ theme, disabled }) =>
-      disabled
-        ? theme.select.borderColor.disabled
-        : theme.select.borderColor.normal}
+    ${({ theme, disabled, isThemeMode }) => {
+      if (isThemeMode) {
+        return 'none';
+      }
+      if (disabled) {
+        return theme.select.borderColor.disabled;
+      }
+
+      return theme.select.borderColor.normal;
+    }}
     solid;
   border-radius: 4px;
   font-size: 14px;
   width: fit-content;
   padding-left: 16px;
-  padding-right: 16px;
+  padding-right: 12px;
   color: ${({ theme, disabled }) =>
     disabled ? theme.select.color.disabled : theme.select.color.normal};
   min-width: ${({ minWidth }) => minWidth || 'auto'};
   cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};
-  &:hover:enabled {
-    color: ${(props) => props.theme.select.color.hover};
-    border-color: ${(props) => props.theme.select.borderColor.hover};
+  &:hover {
+    color: ${({ theme, disabled }) =>
+      disabled ? theme.select.color.disabled : theme.select.color.hover};
+    border-color: ${({ theme, disabled }) =>
+      disabled
+        ? theme.select.borderColor.disabled
+        : theme.select.borderColor.hover};
   }
   &:focus {
     outline: none;
-    color: ${(props) => props.theme.select.color.active};
-    border-color: ${(props) => props.theme.select.borderColor.active};
+    color: ${({ theme }) => theme.select.color.active};
+    border-color: ${({ theme }) => theme.select.borderColor.active};
   }
   &:disabled {
-    color: ${(props) => props.theme.select.color.disabled};
-    border-color: ${(props) => props.theme.select.borderColor.disabled};
+    color: ${({ theme }) => theme.select.color.disabled};
+    border-color: ${({ theme }) => theme.select.borderColor.disabled};
   }
 `;
 
+export const SelectedOptionWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
 export const OptionList = styled.ul`
   position: absolute;
   top: 100%;
   left: 0;
   max-height: 228px;
   margin-top: 4px;
-  background-color: ${(props) => props.theme.select.backgroundColor.normal};
-  border: 1px ${(props) => props.theme.select.borderColor.normal} solid;
+  background-color: ${({ theme }) => theme.select.backgroundColor.normal};
+  border: 1px ${({ theme }) => theme.select.borderColor.normal} solid;
   border-radius: 4px;
   font-size: 14px;
   line-height: 18px;
-  color: ${(props) => props.theme.select.color.normal};
+  color: ${({ theme }) => theme.select.color.normal};
   overflow-y: auto;
   z-index: 10;
   max-width: 300px;
   min-width: 100%;
+  align-items: center;
+  & div {
+    white-space: nowrap;
+  }
   &::-webkit-scrollbar {
     -webkit-appearance: none;
     width: 7px;
@@ -71,8 +95,8 @@ export const OptionList = styled.ul`
 
   &::-webkit-scrollbar-thumb {
     border-radius: 4px;
-    background-color: ${(props) =>
-      props.theme.select.optionList.scrollbar.backgroundColor};
+    background-color: ${({ theme }) =>
+      theme.select.optionList.scrollbar.backgroundColor};
   }
 
   &::-webkit-scrollbar:horizontal {
@@ -82,28 +106,36 @@ export const OptionList = styled.ul`
 
 export const Option = styled.li<OptionProps>`
   display: flex;
+  align-items: center;
   list-style: none;
   padding: 10px 12px;
   transition: all 0.2s ease-in-out;
   cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};
   gap: 5px;
-  color: ${(props) =>
-    props.theme.select.color[props.disabled ? 'disabled' : 'normal']};
+  color: ${({ theme, disabled }) =>
+    theme.select.color[disabled ? 'disabled' : 'normal']};
 
   &:hover {
-    background-color: ${(props) =>
-      props.theme.select.backgroundColor[props.disabled ? 'normal' : 'hover']};
+    background-color: ${({ theme, disabled }) =>
+      theme.select.backgroundColor[disabled ? 'normal' : 'hover']};
   }
 
   &:active {
-    background-color: ${(props) => props.theme.select.backgroundColor.active};
+    background-color: ${({ theme }) => theme.select.backgroundColor.active};
   }
 `;
 
-export const SelectedOption = styled.li`
-  padding-right: 16px;
+export const SelectedOption = styled.li<{ isThemeMode?: boolean }>`
+  display: flex;
+  padding-right: ${({ isThemeMode }) => (isThemeMode ? '' : '16px')};
   list-style-position: inside;
   white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+  & svg {
+    path {
+      fill: ${({ theme }) => theme.defaultIconColor};
+    }
+  }
+  & div {
+    display: none;
+  }
 `;
diff --git a/kafka-ui-react-app/src/components/common/Select/Select.tsx b/kafka-ui-react-app/src/components/common/Select/Select.tsx
index 3e0e57465f0..b56dbc4959d 100644
--- a/kafka-ui-react-app/src/components/common/Select/Select.tsx
+++ b/kafka-ui-react-app/src/components/common/Select/Select.tsx
@@ -17,10 +17,11 @@ export interface SelectProps {
   placeholder?: string;
   disabled?: boolean;
   onChange?: (option: string | number) => void;
+  isThemeMode?: boolean;
 }
 
 export interface SelectOption {
-  label: string | number;
+  label: string | number | React.ReactElement;
   value: string | number;
   disabled?: boolean;
   isLive?: boolean;
@@ -35,6 +36,7 @@ const Select: React.FC<SelectProps> = ({
   isLive,
   disabled = false,
   onChange,
+  isThemeMode,
   ...props
 }) => {
   const [selectedOption, setSelectedOption] = useState(value);
@@ -73,14 +75,21 @@ const Select: React.FC<SelectProps> = ({
         disabled={disabled}
         onClick={showOptionsHandler}
         onKeyDown={showOptionsHandler}
+        isThemeMode={isThemeMode}
         {...props}
       >
-        {isLive && <LiveIcon />}
-        <S.SelectedOption role="option" tabIndex={0}>
-          {options.find(
-            (option) => option.value === (defaultValue || selectedOption)
-          )?.label || placeholder}
-        </S.SelectedOption>
+        <S.SelectedOptionWrapper>
+          {isLive && <LiveIcon />}
+          <S.SelectedOption
+            role="option"
+            tabIndex={0}
+            isThemeMode={isThemeMode}
+          >
+            {options.find(
+              (option) => option.value === (defaultValue || selectedOption)
+            )?.label || placeholder}
+          </S.SelectedOption>
+        </S.SelectedOptionWrapper>
         {showOptions && (
           <S.OptionList>
             {options?.map((option) => (
diff --git a/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts b/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts
index 1b1a7ac0d40..710a85a86c1 100644
--- a/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts
+++ b/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 export const Wrapper = styled.div<{ $open?: boolean }>(
   ({ theme, $open }) => `
-  background-color: ${theme.layout.backgroundColor};
+  background-color: ${theme.default.backgroundColor};
   position: fixed;
   top: ${theme.layout.navBarHeight};
   bottom: 0;
@@ -24,7 +24,7 @@ export const Wrapper = styled.div<{ $open?: boolean }>(
 
 export const Content = styled.div<{ $open?: boolean }>(
   ({ theme }) => `
-  background-color: ${theme.layout.backgroundColor};
+  background-color: ${theme.default.backgroundColor};
   overflow-y: auto;
   position: absolute;
   top: 65px;
diff --git a/kafka-ui-react-app/src/components/common/Switch/Switch.styled.ts b/kafka-ui-react-app/src/components/common/Switch/Switch.styled.ts
index cced933eb80..88239280594 100644
--- a/kafka-ui-react-app/src/components/common/Switch/Switch.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Switch/Switch.styled.ts
@@ -1,21 +1,41 @@
 import styled from 'styled-components';
 
-export const StyledLabel = styled.label`
+interface Props {
+  isCheckedIcon?: boolean;
+}
+
+export const StyledLabel = styled.label<Props>`
   position: relative;
   display: inline-block;
-  width: 34px;
+  width: ${({ isCheckedIcon }) => (isCheckedIcon ? '40px' : '34px')};
   height: 20px;
   margin-right: 8px;
 `;
-
-export const StyledSlider = styled.span`
+export const CheckedIcon = styled.span`
+  position: absolute;
+  top: 1px;
+  left: 24px;
+  z-index: 10;
+  cursor: pointer;
+`;
+export const UnCheckedIcon = styled.span`
+  position: absolute;
+  top: 2px;
+  right: 23px;
+  z-index: 10;
+  cursor: pointer;
+`;
+export const StyledSlider = styled.span<Props>`
   position: absolute;
   cursor: pointer;
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
-  background-color: ${({ theme }) => theme.switch.unchecked};
+  background-color: ${({ isCheckedIcon, theme }) =>
+    isCheckedIcon
+      ? theme.switch.checkedIcon.backgroundColor
+      : theme.switch.unchecked};
   transition: 0.4s;
   border-radius: 20px;
 
@@ -29,16 +49,20 @@ export const StyledSlider = styled.span`
     background-color: ${({ theme }) => theme.switch.circle};
     transition: 0.4s;
     border-radius: 50%;
+    z-index: 11;
   }
 `;
 
-export const StyledInput = styled.input`
+export const StyledInput = styled.input<Props>`
   opacity: 0;
   width: 0;
   height: 0;
 
   &:checked + ${StyledSlider} {
-    background-color: ${({ theme }) => theme.switch.checked};
+    background-color: ${({ isCheckedIcon, theme }) =>
+      isCheckedIcon
+        ? theme.switch.checkedIcon.backgroundColor
+        : theme.switch.checked};
   }
 
   &:focus + ${StyledSlider} {
@@ -46,6 +70,8 @@ export const StyledInput = styled.input`
   }
 
   :checked + ${StyledSlider}:before {
-    transform: translateX(14px);
+    transform: translateX(
+      ${({ isCheckedIcon }) => (isCheckedIcon ? '20px' : '14px')}
+    );
   }
 `;
diff --git a/kafka-ui-react-app/src/components/common/Switch/Switch.tsx b/kafka-ui-react-app/src/components/common/Switch/Switch.tsx
index 6471f182494..e1cb56d7a03 100644
--- a/kafka-ui-react-app/src/components/common/Switch/Switch.tsx
+++ b/kafka-ui-react-app/src/components/common/Switch/Switch.tsx
@@ -2,22 +2,34 @@ import React from 'react';
 
 import * as S from './Switch.styled';
 
-interface SwitchProps {
+export interface SwitchProps {
   onChange(): void;
   checked: boolean;
   name: string;
+  checkedIcon?: React.ReactNode;
+  unCheckedIcon?: React.ReactNode;
+  bgCustomColor?: string;
 }
-
-const Switch: React.FC<SwitchProps> = ({ name, checked, onChange }) => {
+const Switch: React.FC<SwitchProps> = ({
+  name,
+  checked,
+  onChange,
+  checkedIcon,
+  unCheckedIcon,
+}) => {
+  const isCheckedIcon = !!(checkedIcon || unCheckedIcon);
   return (
-    <S.StyledLabel>
+    <S.StyledLabel isCheckedIcon={isCheckedIcon}>
       <S.StyledInput
         name={name}
         type="checkbox"
         onChange={onChange}
         checked={checked}
+        isCheckedIcon={isCheckedIcon}
       />
-      <S.StyledSlider />
+      <S.StyledSlider isCheckedIcon={isCheckedIcon} />
+      {checkedIcon && <S.CheckedIcon>{checkedIcon}</S.CheckedIcon>}
+      {unCheckedIcon && <S.UnCheckedIcon>{unCheckedIcon}</S.UnCheckedIcon>}
     </S.StyledLabel>
   );
 };
diff --git a/kafka-ui-react-app/src/components/common/Tag/Tag.styled.tsx b/kafka-ui-react-app/src/components/common/Tag/Tag.styled.tsx
index 32a5784be33..00f76588e34 100644
--- a/kafka-ui-react-app/src/components/common/Tag/Tag.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/Tag/Tag.styled.tsx
@@ -9,8 +9,8 @@ export const Tag = styled.span.attrs({ role: 'widget' })<Props>`
   border-radius: 16px;
   height: 20px;
   line-height: 20px;
-  background-color: ${(props) => props.theme.tag.backgroundColor[props.color]};
-  color: ${(props) => props.theme.tag.color};
+  background-color: ${({ theme, color }) => theme.tag.backgroundColor[color]};
+  color: ${({ theme }) => theme.tag.color};
   font-size: 12px;
   display: inline-block;
   padding-left: 0.75em;
diff --git a/kafka-ui-react-app/src/components/common/Textbox/Textarea.styled.ts b/kafka-ui-react-app/src/components/common/Textbox/Textarea.styled.ts
index bc6a6593f36..62b752f7b06 100644
--- a/kafka-ui-react-app/src/components/common/Textbox/Textarea.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Textbox/Textarea.styled.ts
@@ -7,6 +7,8 @@ export const Textarea = styled.textarea(
     width: 100%;
     padding: 12px;
     padding-top: 6px;
+    color: ${({ theme }) => theme.default.color.normal};
+    background-color: ${({ theme }) => theme.schema.backgroundColor.textarea};
     &::placeholder {
       color: ${textArea.color.placeholder.normal};
       font-size: 14px;
diff --git a/kafka-ui-react-app/src/components/common/table/Table/Table.styled.ts b/kafka-ui-react-app/src/components/common/table/Table/Table.styled.ts
index 994e1b1fb76..f76b89540d8 100644
--- a/kafka-ui-react-app/src/components/common/table/Table/Table.styled.ts
+++ b/kafka-ui-react-app/src/components/common/table/Table/Table.styled.ts
@@ -8,7 +8,7 @@ export const Table = styled.table<Props>`
   width: ${(props) => (props.isFullwidth ? '100%' : 'auto')};
 
   & td {
-    border-top: 1px #f1f2f3 solid;
+    border-top: 1px ${({ theme }) => theme.table.td.borderTop} solid;
     font-size: 14px;
     font-weight: 400;
     padding: 8px 8px 8px 24px;
diff --git a/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts b/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
index a2b0ece7242..2560e48d915 100644
--- a/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
+++ b/kafka-ui-react-app/src/components/common/table/Table/TableKeyLink.styled.ts
@@ -15,6 +15,9 @@ const tableLinkMixin = css(
       color: ${theme.table.link.color.active};
     }
   }
+   tr {
+  background-color: red;
+  }
 `
 );
 
diff --git a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts
index bb486ea248a..07b0d158ac5 100644
--- a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts
+++ b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/TableHeaderCell.styled.ts
@@ -74,7 +74,7 @@ export const Title = styled.span<TitleProps>(
     font-style: normal;
     font-weight: 400;
     line-height: 16px;
-    letter-spacing: 0em;
+    letter-spacing: 0;
     text-align: left;
     display: inline-block;
     justify-content: start;
@@ -97,11 +97,11 @@ export const Preview = styled.span`
   font-style: normal;
   font-weight: 400;
   line-height: 16px;
-  letter-spacing: 0em;
+  letter-spacing: 0;
   text-align: left;
-  background: ${(props) => props.theme.table.th.backgroundColor.normal};
+  background: ${({ theme }) => theme.table.th.backgroundColor.normal};
   font-size: 14px;
-  color: ${(props) => props.theme.table.th.previewColor.normal};
+  color: ${({ theme }) => theme.table.th.previewColor.normal};
   cursor: pointer;
 `;
 
diff --git a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/__test__/TableHeaderCell.styled.spec.tsx b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/__test__/TableHeaderCell.styled.spec.tsx
index e780c044ce1..38c3b7abe55 100644
--- a/kafka-ui-react-app/src/components/common/table/TableHeaderCell/__test__/TableHeaderCell.styled.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/table/TableHeaderCell/__test__/TableHeaderCell.styled.spec.tsx
@@ -3,7 +3,7 @@ import { render } from 'lib/testHelpers';
 import * as S from 'components/common/table/TableHeaderCell/TableHeaderCell.styled';
 import { SortOrder } from 'generated-sources';
 import { screen } from '@testing-library/react';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 
 describe('TableHeaderCell.Styled', () => {
   describe('Title Component', () => {
diff --git a/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx b/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx
index aa4f82c2b0a..80aceed3284 100644
--- a/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/table/__tests__/TableHeaderCell.spec.tsx
@@ -5,7 +5,7 @@ import TableHeaderCell, {
   TableHeaderCellProps,
 } from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { SortOrder, TopicColumnsToSort } from 'generated-sources';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 import userEvent from '@testing-library/user-event';
 
 const SPACE_KEY = ' ';
diff --git a/kafka-ui-react-app/src/components/globalCss.ts b/kafka-ui-react-app/src/components/globalCss.ts
index 260f4f8a5f2..ebe1e215856 100644
--- a/kafka-ui-react-app/src/components/globalCss.ts
+++ b/kafka-ui-react-app/src/components/globalCss.ts
@@ -7,7 +7,7 @@ export default createGlobalStyle(
       font-size: 14px;
       -webkit-font-smoothing: antialiased;
       -moz-osx-font-smoothing: grayscale;
-      background-color: ${theme.layout.backgroundColor};
+      background-color: ${theme.default.backgroundColor};
       overflow-x: hidden;
       overflow-y: scroll;
       text-rendering: optimizeLegibility;
@@ -61,13 +61,13 @@ export default createGlobalStyle(
 
     pre {
       overflow-x: auto;
-      white-space: pre
-      word-wrap: normal
+      white-space: pre;
+      word-wrap: normal;
 
       code {
         background-color: transparent;
-        color: currentColor
-        padding: 0
+        color: currentColor;
+        padding: 0;
       }
     }
 
@@ -102,7 +102,6 @@ export default createGlobalStyle(
       border: none;
     }
 
-
     @keyframes fadein {
       from {
         opacity: 0;
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index c2c67201472..508904d1466 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -8,7 +8,7 @@ import {
 import fetchMock from 'fetch-mock';
 import { Provider } from 'react-redux';
 import { ThemeProvider } from 'styled-components';
-import theme from 'theme/theme';
+import { theme } from 'theme/theme';
 import {
   render,
   renderHook,
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 856b5a7f90f..978b694913f 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -13,8 +13,12 @@ const Colors = {
     '50': '#73848C',
     '60': '#5C6970',
     '70': '#454F54',
+    '75': '#394246',
     '80': '#2F3639',
+    '85': '#22282A',
+    '87': '#1E2224',
     '90': '#171A1C',
+    '95': '#0B0D0E',
     '100': '#000',
   },
   transparency: {
@@ -34,6 +38,8 @@ const Colors = {
     '10': '#D1D1FA',
     '15': '#B8BEF9',
     '20': '#A3A3F5',
+    '30': '#7E7EF1',
+    '40': '#6666FF',
     '50': '#4C4CFF',
     '60': '#1717CF',
     '70': '#1414B8',
@@ -56,39 +62,64 @@ const Colors = {
     '40': '#64b5f6',
     '45': '#5865F2',
     '50': '#5B67E3',
+    '60': '#7A7AB8',
+    '70': '#5959A6',
+    '80': '#3E3E74',
   },
 };
 
-const theme = {
-  link: {
-    color: Colors.brand[50],
-    hoverColor: Colors.brand[60],
-  },
-  hr: {
-    backgroundColor: Colors.neutral[5],
-  },
-  code: {
-    backgroundColor: Colors.neutral[5],
-    color: Colors.red[55],
-  },
-  list: {
-    label: {
+const baseTheme = {
+  defaultIconColor: Colors.neutral[50],
+  heading: {
+    h1: {
+      color: Colors.neutral[90],
+    },
+    h3: {
       color: Colors.neutral[50],
+      fontSize: '14px',
     },
-    meta: {
-      color: Colors.neutral[30],
+    h4: Colors.neutral[90],
+    base: {
+      fontFamily: 'Inter, sans-serif',
+      fontStyle: 'normal',
+      fontWeight: 500,
+      color: Colors.neutral[100],
+    },
+    variants: {
+      1: {
+        fontSize: '20px',
+        lineHeight: '32px',
+      },
+      2: {
+        fontSize: '20px',
+        lineHeight: '32px',
+      },
+      3: {
+        fontSize: '16px',
+        lineHeight: '24px',
+        fontWeight: 400,
+        marginBottom: '16px',
+      },
+      4: {
+        fontSize: '14px',
+        lineHeight: '20px',
+        fontWeight: 500,
+      },
+      5: {
+        fontSize: '12px',
+        lineHeight: '16px',
+      },
+      6: {
+        fontSize: '12px',
+        lineHeight: '16px',
+      },
     },
   },
-  text: {
-    secondary: Colors.neutral[60],
-  },
-  progressBar: {
-    backgroundColor: Colors.neutral[3],
-    compleatedColor: Colors.green[40],
-    borderColor: Colors.neutral[10],
+  code: {
+    backgroundColor: Colors.neutral[5],
+    color: Colors.red[55],
   },
   layout: {
-    backgroundColor: Colors.neutral[0],
     minWidth: '1200px',
     navBarWidth: '201px',
     navBarHeight: '51px',
@@ -100,9 +131,190 @@ const theme = {
     overlay: {
       backgroundColor: Colors.neutral[50],
     },
-    socialLink: {
-      color: Colors.neutral[20],
+    socialLink: Colors.neutral[20],
+  },
+  alert: {
+    color: {
+      error: Colors.red[10],
+      success: Colors.green[10],
+      warning: Colors.yellow[10],
+      info: Colors.neutral[10],
+      loading: Colors.neutral[10],
+      blank: Colors.neutral[10],
+      custom: Colors.neutral[10],
+    },
+    shadow: Colors.transparency[20],
+  },
+  circularAlert: {
+    color: {
+      error: Colors.red[50],
+      success: Colors.green[40],
+      warning: Colors.yellow[10],
+      info: Colors.neutral[10],
+    },
+  },
+  connectEditWarning: Colors.yellow[10],
+  lastestVersionItem: {
+    metaDataLabel: {
+      color: Colors.neutral[50],
+    },
+  },
+  icons: {
+    chevronDownIcon: Colors.neutral[0],
+    editIcon: Colors.neutral[30],
+    cancelIcon: Colors.neutral[30],
+    autoIcon: Colors.neutral[95],
+    fileIcon: Colors.neutral[90],
+    clockIcon: Colors.neutral[90],
+    arrowDownIcon: Colors.neutral[90],
+    moonIcon: Colors.neutral[95],
+    sunIcon: Colors.neutral[95],
+    infoIcon: Colors.neutral[30],
+    closeIcon: Colors.neutral[30],
+    deleteIcon: Colors.red[20],
+    warningIcon: Colors.yellow[20],
+    messageToggleIcon: {
+      normal: Colors.brand[30],
+      hover: Colors.brand[40],
+      active: Colors.brand[50],
+    },
+    verticalElipsisIcon: Colors.neutral[50],
+    liveIcon: {
+      circleBig: Colors.red[10],
+      circleSmall: Colors.red[50],
+    },
+    newFilterIcon: Colors.brand[50],
+    closeModalIcon: Colors.neutral[25],
+    savedIcon: Colors.brand[50],
+    dropdownArrowIcon: Colors.neutral[50],
+    git: {
+      hover: Colors.neutral[90],
+      active: Colors.neutral[70],
+    },
+    discord: {
+      normal: Colors.neutral[20],
+      hover: Colors.blue[45],
+      active: Colors.brand[15],
+    },
+  },
+  textArea: {
+    borderColor: {
+      normal: Colors.neutral[30],
+      hover: Colors.neutral[50],
+      focus: Colors.neutral[70],
+      disabled: Colors.neutral[10],
+    },
+    color: {
+      placeholder: {
+        normal: Colors.neutral[30],
+        focus: {
+          normal: 'transparent',
+          readOnly: Colors.neutral[30],
+        },
+      },
+      disabled: Colors.neutral[30],
+      readOnly: Colors.neutral[90],
+    },
+    backgroundColor: {
+      readOnly: Colors.neutral[5],
+    },
+  },
+  tag: {
+    backgroundColor: {
+      green: Colors.green[10],
+      gray: Colors.neutral[5],
+      yellow: Colors.yellow[10],
+      white: Colors.neutral[10],
+      red: Colors.red[10],
+      blue: Colors.blue[10],
+    },
+    color: Colors.neutral[90],
+  },
+  switch: {
+    unchecked: Colors.brand[30],
+    checked: Colors.brand[50],
+    circle: Colors.neutral[0],
+    disabled: Colors.neutral[10],
+    checkedIcon: {
+      backgroundColor: Colors.neutral[70],
+    },
+  },
+  pageLoader: {
+    borderColor: Colors.brand[50],
+    borderBottomColor: Colors.neutral[0],
+  },
+  topicFormLabel: {
+    color: Colors.neutral[50],
+  },
+  dangerZone: {
+    borderColor: Colors.red[60],
+    color: {
+      title: Colors.red[50],
+      warningMessage: Colors.neutral[50],
+    },
+  },
+  configList: {
+    color: Colors.neutral[30],
+  },
+  tooltip: {
+    bg: Colors.neutral[80],
+    text: Colors.neutral[0],
+  },
+  topicsList: {
+    color: {
+      normal: Colors.neutral[90],
+      hover: Colors.neutral[50],
+      active: Colors.neutral[90],
+    },
+    backgroundColor: {
+      hover: Colors.neutral[5],
+      active: Colors.neutral[10],
+    },
+  },
+  statictics: {
+    createdAtColor: Colors.neutral[50],
+  },
+  progressBar: {
+    backgroundColor: Colors.neutral[3],
+    compleatedColor: Colors.green[40],
+    borderColor: Colors.neutral[10],
+  },
+  clusterConfigForm: {
+    inputHintText: {
+      secondary: Colors.neutral[60],
+    },
+    groupField: {
+      backgroundColor: Colors.neutral[3],
+    },
+    fileInput: {
+      color: Colors.neutral[85],
+    },
+  },
+};
+
+export const theme = {
+  ...baseTheme,
+  version: {
+    currentVersion: {
+      color: Colors.neutral[30],
+    },
+    commitLink: {
+      color: Colors.brand[50],
+    },
+  },
+  default: {
+    color: {
+      normal: Colors.neutral[90],
     },
+    backgroundColor: Colors.neutral[0],
+    transparentColor: 'transparent',
+  },
+  link: {
+    color: Colors.brand[50],
+    hoverColor: Colors.brand[60],
+  },
+  hr: {
+    backgroundColor: Colors.neutral[5],
   },
   pageHeading: {
     height: '64px',
@@ -114,14 +326,16 @@ const theme = {
       },
     },
   },
-  panelColor: Colors.neutral[0],
-  connectEditWarning: Colors.yellow[10],
+  panelColor: {
+    borderTop: 'none',
+  },
   dropdown: {
     backgroundColor: Colors.neutral[0],
     borderColor: Colors.neutral[5],
     shadow: Colors.transparency[20],
     item: {
       color: {
+        normal: Colors.neutral[90],
         danger: Colors.red[60],
       },
       backgroundColor: {
@@ -135,112 +349,452 @@ const theme = {
       editor: {
         readonly: {
           background: Colors.neutral[3],
-          selection: {
-            backgroundColor: 'transparent',
-          },
-          cursor: {
-            color: 'transparent',
-          },
         },
+        activeLine: {
+          backgroundColor: Colors.neutral[5],
+        },
+        cell: {
+          backgroundColor: Colors.neutral[10],
+        },
+        layer: {
+          backgroundColor: Colors.neutral[5],
+        },
+        cursor: Colors.neutral[90],
+        variable: Colors.red[50],
+        aceString: Colors.green[60],
       },
     },
   },
-  heading: {
-    h1: {
-      color: Colors.neutral[90],
-    },
-    h3: {
-      color: Colors.neutral[50],
-      fontSize: '14px',
-    },
-    base: {
-      fontFamily: 'Inter, sans-serif',
-      fontStyle: 'normal',
-      fontWeight: 500,
-      color: Colors.neutral[100],
-    },
-    variants: {
-      1: {
-        fontSize: '20px',
-        lineHeight: '32px',
+  button: {
+    primary: {
+      backgroundColor: {
+        normal: Colors.brand[50],
+        hover: Colors.brand[60],
+        active: Colors.brand[70],
+        disabled: Colors.neutral[5],
       },
-      2: {
-        fontSize: '20px',
-        lineHeight: '32px',
+      color: {
+        normal: Colors.neutral[0],
+        disabled: Colors.neutral[30],
       },
-      3: {
-        fontSize: '16px',
-        lineHeight: '24px',
-        fontWeight: 400,
-        marginBottom: '16px',
+      invertedColors: {
+        normal: Colors.brand[50],
+        hover: Colors.brand[60],
+        active: Colors.brand[60],
       },
-      4: {
-        fontSize: '14px',
-        lineHeight: '20px',
-        fontWeight: 500,
+    },
+    secondary: {
+      backgroundColor: {
+        normal: Colors.brand[5],
+        hover: Colors.brand[10],
+        active: Colors.brand[30],
+        disabled: Colors.neutral[5],
       },
-      5: {
-        fontSize: '12px',
-        lineHeight: '16px',
+      color: {
+        normal: Colors.neutral[90],
+        disabled: Colors.neutral[30],
       },
-      6: {
-        fontSize: '12px',
-        lineHeight: '16px',
+      isActiveColor: Colors.neutral[0],
+      invertedColors: {
+        normal: Colors.neutral[50],
+        hover: Colors.neutral[70],
+        active: Colors.neutral[90],
+        disabled: Colors.neutral[75],
+      },
+    },
+    danger: {
+      backgroundColor: {
+        normal: Colors.red[50],
+        hover: Colors.red[55],
+        active: Colors.red[60],
+        disabled: Colors.red[20],
+      },
+      color: {
+        normal: Colors.neutral[90],
+        disabled: Colors.neutral[30],
+      },
+      invertedColors: {
+        normal: Colors.brand[50],
+        hover: Colors.brand[60],
+        active: Colors.brand[60],
+      },
+    },
+    height: {
+      S: '24px',
+      M: '32px',
+      L: '40px',
+    },
+    fontSize: {
+      S: '14px',
+      M: '14px',
+      L: '16px',
+    },
+    border: {
+      normal: Colors.neutral[50],
+      hover: Colors.neutral[70],
+      active: Colors.neutral[90],
+    },
+  },
+  chips: {
+    backgroundColor: {
+      normal: Colors.neutral[5],
+      hover: Colors.neutral[10],
+      active: Colors.neutral[50],
+      hoverActive: Colors.neutral[60],
+    },
+    color: {
+      normal: Colors.neutral[70],
+      hover: Colors.neutral[70],
+      active: Colors.neutral[0],
+      hoverActive: Colors.neutral[0],
+    },
+  },
+  menu: {
+    backgroundColor: {
+      normal: Colors.neutral[0],
+      hover: Colors.neutral[3],
+      active: Colors.neutral[5],
+    },
+    color: {
+      normal: Colors.neutral[50],
+      hover: Colors.neutral[70],
+      active: Colors.brand[70],
+      isOpen: Colors.neutral[90],
+    },
+    statusIconColor: {
+      online: Colors.green[40],
+      offline: Colors.red[50],
+      initializing: Colors.yellow[20],
+    },
+    chevronIconColor: Colors.neutral[50],
+    titleColor: Colors.neutral[90],
+  },
+  schema: {
+    backgroundColor: {
+      tr: Colors.neutral[5],
+      div: Colors.neutral[0],
+      p: Colors.neutral[80],
+      textarea: Colors.neutral[3],
+    },
+  },
+  modal: {
+    color: Colors.neutral[80],
+    backgroundColor: Colors.neutral[0],
+    border: {
+      top: Colors.neutral[5],
+      bottom: Colors.neutral[5],
+      contrast: Colors.neutral[30],
+    },
+    overlay: Colors.transparency[10],
+    shadow: Colors.transparency[20],
+    contentColor: Colors.neutral[70],
+  },
+  confirmModal: {
+    backgroundColor: Colors.neutral[0],
+  },
+  table: {
+    actionBar: {
+      backgroundColor: Colors.neutral[0],
+    },
+    th: {
+      backgroundColor: {
+        normal: Colors.neutral[0],
+      },
+      color: {
+        sortable: Colors.neutral[30],
+        normal: Colors.neutral[60],
+        hover: Colors.brand[50],
+        active: Colors.brand[50],
+      },
+      previewColor: {
+        normal: Colors.brand[50],
+      },
+    },
+    td: {
+      borderTop: Colors.neutral[5],
+      color: {
+        normal: Colors.neutral[90],
+      },
+    },
+    tr: {
+      backgroundColor: {
+        normal: Colors.neutral[0],
+        hover: Colors.neutral[5],
+      },
+    },
+    link: {
+      color: {
+        normal: Colors.neutral[90],
+        hover: Colors.neutral[50],
+        active: Colors.neutral[90],
+      },
+    },
+    expander: {
+      normal: Colors.brand[30],
+      hover: Colors.brand[40],
+      active: Colors.brand[50],
+      disabled: Colors.neutral[10],
+    },
+    pagination: {
+      button: {
+        background: Colors.neutral[90],
+        border: Colors.neutral[80],
+      },
+      info: Colors.neutral[90],
+    },
+  },
+  primaryTab: {
+    height: '41px',
+    color: {
+      normal: Colors.neutral[50],
+      hover: Colors.neutral[90],
+      active: Colors.neutral[90],
+      disabled: Colors.neutral[20],
+    },
+    borderColor: {
+      active: Colors.brand[50],
+      nav: Colors.neutral[5],
+    },
+  },
+  secondaryTab: {
+    backgroundColor: {
+      normal: Colors.neutral[0],
+      hover: Colors.neutral[5],
+      active: Colors.neutral[10],
+    },
+    color: {
+      normal: Colors.neutral[50],
+      hover: Colors.neutral[90],
+      active: Colors.neutral[90],
+    },
+  },
+  select: {
+    backgroundColor: {
+      normal: Colors.neutral[0],
+      hover: Colors.neutral[10],
+      active: Colors.neutral[10],
+    },
+    color: {
+      normal: Colors.neutral[90],
+      hover: Colors.neutral[90],
+      active: Colors.neutral[90],
+      disabled: Colors.neutral[30],
+    },
+    borderColor: {
+      normal: Colors.neutral[30],
+      hover: Colors.neutral[50],
+      active: Colors.neutral[70],
+      disabled: Colors.neutral[10],
+    },
+    optionList: {
+      scrollbar: {
+        backgroundColor: Colors.neutral[30],
+      },
+    },
+    label: Colors.neutral[50],
+  },
+  input: {
+    borderColor: {
+      normal: Colors.neutral[30],
+      hover: Colors.neutral[50],
+      focus: Colors.neutral[70],
+      disabled: Colors.neutral[10],
+    },
+    color: {
+      normal: Colors.neutral[90],
+      placeholder: {
+        normal: Colors.neutral[30],
+        readOnly: Colors.neutral[30],
+      },
+      disabled: Colors.neutral[30],
+      readOnly: Colors.neutral[90],
+    },
+    backgroundColor: {
+      normal: Colors.neutral[0],
+      readOnly: Colors.neutral[5],
+      disabled: Colors.neutral[0],
+    },
+    error: Colors.red[50],
+    icon: {
+      color: Colors.neutral[70],
+      hover: Colors.neutral[90],
+    },
+    label: {
+      color: Colors.neutral[70],
+    },
+  },
+  metrics: {
+    backgroundColor: Colors.neutral[5],
+    sectionTitle: Colors.neutral[90],
+    indicator: {
+      titleColor: Colors.neutral[50],
+      warningTextColor: Colors.red[50],
+      lightTextColor: Colors.neutral[30],
+    },
+    wrapper: Colors.neutral[0],
+    filters: {
+      color: {
+        icon: Colors.neutral[90],
+        normal: Colors.neutral[50],
+      },
+    },
+  },
+  scrollbar: {
+    trackColor: {
+      normal: Colors.neutral[0],
+      active: Colors.neutral[5],
+    },
+    thumbColor: {
+      normal: Colors.neutral[0],
+      active: Colors.neutral[50],
+    },
+  },
+  consumerTopicContent: {
+    td: {
+      backgroundColor: Colors.neutral[5],
+    },
+  },
+  topicMetaData: {
+    backgroundColor: Colors.neutral[5],
+    color: {
+      label: Colors.neutral[50],
+      value: Colors.neutral[80],
+      meta: Colors.neutral[30],
+    },
+    liderReplica: {
+      color: Colors.green[60],
+    },
+    outOfSync: {
+      color: Colors.red[50],
+    },
+  },
+  viewer: {
+    wrapper: {
+      backgroundColor: Colors.neutral[3],
+      color: Colors.neutral[80],
+    },
+  },
+  savedFilter: {
+    filterName: Colors.neutral[90],
+    color: Colors.neutral[30],
+    backgroundColor: Colors.neutral[5],
+  },
+  editFilter: {
+    textColor: Colors.brand[50],
+    deleteIconColor: Colors.brand[50],
+  },
+};
+
+export type ThemeType = typeof theme;
+
+export const darkTheme: ThemeType = {
+  ...baseTheme,
+  version: {
+    currentVersion: {
+      color: Colors.neutral[50],
+    },
+    commitLink: {
+      color: Colors.brand[30],
+    },
+  },
+  default: {
+    color: {
+      normal: Colors.neutral[0],
+    },
+    backgroundColor: Colors.neutral[90],
+    transparentColor: 'transparent',
+  },
+  link: {
+    color: Colors.brand[50],
+    hoverColor: Colors.brand[30],
+  },
+  hr: {
+    backgroundColor: Colors.neutral[80],
+  },
+  pageHeading: {
+    height: '64px',
+    dividerColor: Colors.neutral[50],
+    backLink: {
+      color: {
+        normal: Colors.brand[30],
+        hover: Colors.brand[15],
       },
     },
   },
-  lastestVersionItem: {
-    metaDataLabel: {
-      color: Colors.neutral[50],
-    },
+  panelColor: {
+    borderTop: Colors.neutral[80],
   },
-  alert: {
-    color: {
-      error: Colors.red[10],
-      success: Colors.green[10],
-      warning: Colors.yellow[10],
-      info: Colors.neutral[10],
-      loading: Colors.neutral[10],
-      blank: Colors.neutral[10],
-      custom: Colors.neutral[10],
-    },
+  dropdown: {
+    backgroundColor: Colors.neutral[85],
+    borderColor: Colors.neutral[80],
     shadow: Colors.transparency[20],
+    item: {
+      color: {
+        normal: Colors.neutral[0],
+        danger: Colors.red[60],
+      },
+      backgroundColor: {
+        default: Colors.neutral[85],
+        hover: Colors.neutral[80],
+      },
+    },
   },
-  circularAlert: {
-    color: {
-      error: Colors.red[50],
-      success: Colors.green[40],
-      warning: Colors.yellow[10],
-      info: Colors.neutral[10],
+  ksqlDb: {
+    query: {
+      editor: {
+        readonly: {
+          background: Colors.neutral[3],
+        },
+        activeLine: {
+          backgroundColor: Colors.neutral[80],
+        },
+        cell: {
+          backgroundColor: Colors.neutral[75],
+        },
+        layer: {
+          backgroundColor: Colors.neutral[80],
+        },
+        cursor: Colors.neutral[0],
+        variable: Colors.red[50],
+        aceString: Colors.green[60],
+      },
     },
   },
   button: {
     primary: {
       backgroundColor: {
-        normal: Colors.brand[5],
-        hover: Colors.brand[10],
-        active: Colors.brand[20],
-        disabled: Colors.neutral[5],
+        normal: Colors.brand[30],
+        hover: Colors.brand[20],
+        active: Colors.brand[10],
+        disabled: Colors.neutral[75],
+      },
+      color: {
+        normal: Colors.neutral[0],
+        disabled: Colors.neutral[60],
       },
-      color: Colors.neutral[90],
       invertedColors: {
-        normal: Colors.brand[50],
+        normal: Colors.brand[30],
         hover: Colors.brand[60],
         active: Colors.brand[60],
       },
     },
     secondary: {
       backgroundColor: {
-        normal: Colors.neutral[5],
-        hover: Colors.neutral[10],
-        active: Colors.neutral[15],
+        normal: Colors.blue[80],
+        hover: Colors.blue[70],
+        active: Colors.blue[60],
+        disabled: Colors.neutral[75],
       },
-      color: Colors.neutral[90],
-      isActiveColor: Colors.neutral[0],
+      color: {
+        normal: Colors.neutral[0],
+        disabled: Colors.neutral[60],
+      },
+      isActiveColor: Colors.neutral[90],
       invertedColors: {
         normal: Colors.neutral[50],
         hover: Colors.neutral[70],
         active: Colors.neutral[90],
+        disabled: Colors.neutral[75],
       },
     },
     danger: {
@@ -250,7 +804,10 @@ const theme = {
         active: Colors.red[60],
         disabled: Colors.red[20],
       },
-      color: Colors.neutral[90],
+      color: {
+        normal: Colors.neutral[90],
+        disabled: Colors.neutral[30],
+      },
       invertedColors: {
         normal: Colors.brand[50],
         hover: Colors.brand[60],
@@ -273,16 +830,30 @@ const theme = {
       active: Colors.neutral[90],
     },
   },
-  menu: {
+  chips: {
     backgroundColor: {
+      normal: Colors.neutral[80],
+      hover: Colors.neutral[70],
+      active: Colors.neutral[50],
+      hoverActive: Colors.neutral[40],
+    },
+    color: {
       normal: Colors.neutral[0],
-      hover: Colors.neutral[3],
-      active: Colors.neutral[5],
+      hover: Colors.neutral[0],
+      active: Colors.neutral[90],
+      hoverActive: Colors.neutral[90],
+    },
+  },
+  menu: {
+    backgroundColor: {
+      normal: Colors.neutral[90],
+      hover: Colors.neutral[87],
+      active: Colors.neutral[85],
     },
     color: {
-      normal: Colors.neutral[50],
-      hover: Colors.neutral[70],
-      active: Colors.brand[70],
+      normal: Colors.neutral[40],
+      hover: Colors.neutral[20],
+      active: Colors.brand[20],
       isOpen: Colors.neutral[90],
     },
     statusIconColor: {
@@ -291,39 +862,38 @@ const theme = {
       initializing: Colors.yellow[20],
     },
     chevronIconColor: Colors.neutral[50],
-  },
-  version: {
-    currentVersion: {
-      color: Colors.neutral[30],
-    },
-    symbolWrapper: {
-      color: Colors.neutral[30],
-    },
+    titleColor: Colors.neutral[0],
   },
   schema: {
     backgroundColor: {
       tr: Colors.neutral[5],
       div: Colors.neutral[0],
+      p: Colors.neutral[0],
+      textarea: Colors.neutral[85],
     },
   },
   modal: {
-    backgroundColor: Colors.neutral[0],
+    color: Colors.neutral[0],
+    backgroundColor: Colors.neutral[85],
     border: {
-      top: Colors.neutral[5],
-      bottom: Colors.neutral[5],
-      contrast: Colors.neutral[30],
+      top: Colors.neutral[75],
+      bottom: Colors.neutral[75],
+      contrast: Colors.neutral[75],
     },
     overlay: Colors.transparency[10],
     shadow: Colors.transparency[20],
-    deletionTextColor: Colors.neutral[70],
+    contentColor: Colors.neutral[30],
+  },
+  confirmModal: {
+    backgroundColor: Colors.neutral[80],
   },
   table: {
     actionBar: {
-      backgroundColor: Colors.neutral[0],
+      backgroundColor: Colors.neutral[90],
     },
     th: {
       backgroundColor: {
-        normal: Colors.neutral[0],
+        normal: Colors.neutral[90],
       },
       color: {
         sortable: Colors.neutral[30],
@@ -336,186 +906,155 @@ const theme = {
       },
     },
     td: {
+      borderTop: Colors.neutral[80],
       color: {
-        normal: Colors.neutral[90],
+        normal: Colors.neutral[0],
       },
     },
     tr: {
       backgroundColor: {
-        normal: Colors.neutral[0],
-        hover: Colors.neutral[5],
+        normal: Colors.neutral[90],
+        hover: Colors.neutral[85],
       },
     },
     link: {
       color: {
-        normal: Colors.neutral[90],
-        hover: Colors.neutral[50],
-        active: Colors.neutral[90],
+        normal: Colors.neutral[0],
+        hover: Colors.neutral[0],
+        active: Colors.neutral[0],
       },
     },
     expander: {
-      normal: Colors.brand[50],
-      hover: Colors.brand[20],
+      normal: Colors.brand[30],
+      hover: Colors.brand[40],
+      active: Colors.brand[50],
       disabled: Colors.neutral[10],
     },
+    pagination: {
+      button: {
+        background: Colors.neutral[90],
+        border: Colors.neutral[80],
+      },
+      info: Colors.neutral[0],
+    },
   },
   primaryTab: {
     height: '41px',
     color: {
       normal: Colors.neutral[50],
-      hover: Colors.neutral[90],
-      active: Colors.neutral[90],
-      disabled: Colors.neutral[30],
+      hover: Colors.neutral[0],
+      active: Colors.brand[30],
+      disabled: Colors.neutral[75],
     },
     borderColor: {
-      normal: 'transparent',
-      hover: 'transparent',
       active: Colors.brand[50],
-      nav: Colors.neutral[10],
+      nav: Colors.neutral[80],
     },
   },
   secondaryTab: {
     backgroundColor: {
-      normal: Colors.neutral[0],
-      hover: Colors.neutral[5],
-      active: Colors.neutral[10],
+      normal: Colors.neutral[90],
+      hover: Colors.neutral[85],
+      active: Colors.neutral[80],
     },
     color: {
       normal: Colors.neutral[50],
-      hover: Colors.neutral[90],
-      active: Colors.neutral[90],
+      hover: Colors.neutral[0],
+      active: Colors.neutral[0],
     },
   },
   select: {
     backgroundColor: {
-      normal: Colors.neutral[0],
-      hover: Colors.neutral[10],
-      active: Colors.neutral[10],
+      normal: Colors.neutral[85],
+      hover: Colors.neutral[80],
+      active: Colors.neutral[70],
     },
     color: {
-      normal: Colors.neutral[90],
-      hover: Colors.neutral[90],
-      active: Colors.neutral[90],
-      disabled: Colors.neutral[30],
+      normal: Colors.neutral[0],
+      hover: Colors.neutral[0],
+      active: Colors.neutral[0],
+      disabled: Colors.neutral[60],
     },
     borderColor: {
-      normal: Colors.neutral[30],
+      normal: Colors.neutral[70],
       hover: Colors.neutral[50],
       active: Colors.neutral[70],
-      disabled: Colors.neutral[10],
+      disabled: Colors.neutral[70],
     },
     optionList: {
       scrollbar: {
         backgroundColor: Colors.neutral[30],
       },
     },
+    label: Colors.neutral[50],
   },
   input: {
     borderColor: {
-      normal: Colors.neutral[30],
+      normal: Colors.neutral[70],
       hover: Colors.neutral[50],
-      focus: Colors.neutral[70],
-      disabled: Colors.neutral[10],
+      focus: Colors.neutral[0],
+      disabled: Colors.neutral[80],
     },
     color: {
+      normal: Colors.neutral[0],
       placeholder: {
-        normal: Colors.neutral[30],
-        readOnly: Colors.neutral[30],
+        normal: Colors.neutral[60],
+        readOnly: Colors.neutral[0],
       },
-      disabled: Colors.neutral[30],
-      readOnly: Colors.neutral[90],
+      disabled: Colors.neutral[80],
+      readOnly: Colors.neutral[0],
     },
     backgroundColor: {
-      readOnly: Colors.neutral[5],
+      normal: Colors.neutral[90],
+      readOnly: Colors.neutral[80],
+      disabled: Colors.neutral[90],
     },
     error: Colors.red[50],
     icon: {
-      color: Colors.neutral[70],
+      color: Colors.neutral[30],
+      hover: Colors.neutral[0],
     },
     label: {
-      color: Colors.neutral[70],
-    },
-  },
-  textArea: {
-    borderColor: {
-      normal: Colors.neutral[30],
-      hover: Colors.neutral[50],
-      focus: Colors.neutral[70],
-      disabled: Colors.neutral[10],
-    },
-    color: {
-      placeholder: {
-        normal: Colors.neutral[30],
-        focus: {
-          normal: 'transparent',
-          readOnly: Colors.neutral[30],
-        },
-      },
-      disabled: Colors.neutral[30],
-      readOnly: Colors.neutral[90],
-    },
-    backgroundColor: {
-      readOnly: Colors.neutral[5],
-    },
-  },
-  tag: {
-    backgroundColor: {
-      green: Colors.green[10],
-      gray: Colors.neutral[5],
-      yellow: Colors.yellow[10],
-      white: Colors.neutral[10],
-      red: Colors.red[10],
-      blue: Colors.blue[10],
+      color: Colors.neutral[30],
     },
-    color: Colors.neutral[90],
-  },
-  switch: {
-    unchecked: Colors.brand[20],
-    checked: Colors.brand[50],
-    circle: Colors.neutral[0],
-    disabled: Colors.neutral[10],
-  },
-  pageLoader: {
-    borderColor: Colors.brand[50],
-    borderBottomColor: Colors.neutral[0],
   },
   metrics: {
-    backgroundColor: Colors.neutral[5],
+    backgroundColor: Colors.neutral[95],
+    sectionTitle: Colors.neutral[0],
     indicator: {
-      backgroundColor: Colors.neutral[0],
-      titleColor: Colors.neutral[50],
+      titleColor: Colors.neutral[0],
       warningTextColor: Colors.red[50],
-      lightTextColor: Colors.neutral[30],
+      lightTextColor: Colors.neutral[60],
     },
+    wrapper: Colors.neutral[0],
     filters: {
       color: {
-        icon: Colors.neutral[90],
+        icon: Colors.neutral[0],
         normal: Colors.neutral[50],
       },
     },
   },
   scrollbar: {
     trackColor: {
-      normal: Colors.neutral[0],
-      active: Colors.neutral[5],
+      normal: Colors.neutral[90],
+      active: Colors.neutral[85],
     },
     thumbColor: {
-      normal: Colors.neutral[0],
+      normal: Colors.neutral[75],
       active: Colors.neutral[50],
     },
   },
   consumerTopicContent: {
-    backgroundColor: Colors.neutral[5],
-  },
-  topicFormLabel: {
-    color: Colors.neutral[50],
+    td: {
+      backgroundColor: Colors.neutral[95],
+    },
   },
   topicMetaData: {
-    backgroundColor: Colors.neutral[5],
+    backgroundColor: Colors.neutral[90],
     color: {
       label: Colors.neutral[50],
-      value: Colors.neutral[80],
-      meta: Colors.neutral[30],
+      value: Colors.neutral[0],
+      meta: Colors.neutral[60],
     },
     liderReplica: {
       color: Colors.green[60],
@@ -524,76 +1063,77 @@ const theme = {
       color: Colors.red[50],
     },
   },
-  dangerZone: {
-    borderColor: Colors.neutral[10],
-    color: {
-      title: Colors.red[50],
-      warningMessage: Colors.neutral[50],
+  viewer: {
+    wrapper: {
+      backgroundColor: Colors.neutral[85],
+      color: Colors.neutral[0],
     },
   },
-  configList: {
-    color: Colors.neutral[30],
+  savedFilter: {
+    filterName: Colors.neutral[0],
+    color: Colors.neutral[70],
+    backgroundColor: Colors.neutral[80],
   },
-  tooltip: {
-    bg: Colors.neutral[70],
-    text: Colors.neutral[0],
+  editFilter: {
+    textColor: Colors.brand[30],
+    deleteIconColor: Colors.brand[30],
   },
-  topicsList: {
-    color: {
-      normal: Colors.neutral[90],
-      hover: Colors.neutral[50],
-      active: Colors.neutral[90],
-    },
-    backgroundColor: {
-      hover: Colors.neutral[5],
-      active: Colors.neutral[10],
+  heading: {
+    ...baseTheme.heading,
+    h4: Colors.neutral[0],
+    base: {
+      ...baseTheme.heading.base,
+      color: Colors.neutral[0],
     },
   },
+  code: {
+    ...baseTheme.code,
+    backgroundColor: Colors.neutral[95],
+  },
+  layout: {
+    ...baseTheme.layout,
+    stuffColor: Colors.neutral[75],
+    stuffBorderColor: Colors.neutral[75],
+    socialLink: Colors.neutral[30],
+  },
   icons: {
-    chevronDownIcon: Colors.neutral[90],
-    closeIcon: Colors.neutral[30],
-    deleteIcon: Colors.red[20],
-    warningIcon: Colors.yellow[20],
-    messageToggleIcon: {
-      normal: Colors.brand[50],
-      hover: Colors.brand[20],
-      active: Colors.brand[60],
-    },
-    verticalElipsisIcon: Colors.neutral[50],
-    liveIcon: {
-      circleBig: Colors.red[10],
-      circleSmall: Colors.red[50],
-    },
-    newFilterIcon: Colors.brand[50],
-    closeModalIcon: Colors.neutral[25],
-    savedIcon: Colors.brand[50],
-    dropdownArrowIcon: Colors.neutral[30],
+    ...baseTheme.icons,
+    editIcon: Colors.neutral[0],
+    cancelIcon: Colors.neutral[0],
+    autoIcon: Colors.neutral[0],
+    fileIcon: Colors.neutral[0],
+    clockIcon: Colors.neutral[0],
+    arrowDownIcon: Colors.neutral[0],
+    moonIcon: Colors.neutral[0],
+    sunIcon: Colors.neutral[0],
+    infoIcon: Colors.neutral[70],
+    savedIcon: Colors.brand[30],
     git: {
+      ...baseTheme.icons.git,
       hover: Colors.neutral[70],
       active: Colors.neutral[90],
     },
     discord: {
-      hover: Colors.brand[15],
-      active: Colors.blue[45],
+      ...baseTheme.icons.discord,
+      normal: Colors.neutral[30],
     },
   },
-  viewer: {
-    wrapper: Colors.neutral[3],
-  },
-  savedFilterDivider: {
-    color: Colors.neutral[15],
-  },
-  editFilterText: {
-    color: Colors.brand[50],
-  },
-  statictics: {
-    createdAtColor: Colors.neutral[50],
+  textArea: {
+    ...baseTheme.textArea,
+    borderColor: {
+      ...baseTheme.textArea.borderColor,
+      normal: Colors.neutral[70],
+      hover: Colors.neutral[30],
+      focus: Colors.neutral[0],
+    },
   },
-  errorPage: {
-    text: Colors.blue[45],
+  clusterConfigForm: {
+    ...baseTheme.clusterConfigForm,
+    groupField: {
+      backgroundColor: Colors.neutral[85],
+    },
+    fileInput: {
+      color: Colors.neutral[0],
+    },
   },
 };
-
-export type ThemeType = typeof theme;
-
-export default theme;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts
index 627d510bdf3..5a3452a9346 100644
--- a/kafka-ui-react-app/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/ClusterConfigForm.styled.ts
@@ -5,7 +5,8 @@ export const GroupFieldWrapper = styled.div`
   display: flex;
   flex-direction: column;
   gap: 8px;
-  background-color: #fefefe;
+  background-color: ${({ theme }) =>
+    theme.clusterConfigForm.groupField.backgroundColor};
   padding: 8px;
   border-radius: 4px;
   box-shadow: 0 1px 2px 0 rgb(0 0 0 / 15%);
@@ -57,4 +58,5 @@ export const FileUploadInputWrapper = styled.div`
   display: flex;
   height: 40px;
   align-items: center;
+  color: ${({ theme }) => theme.clusterConfigForm.fileInput.color}};
 `;

From b890dc34b6651edf7b20d41b9ba303e61a725360 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 15 Mar 2023 13:43:44 +0400
Subject: [PATCH 450/734] Update bug_report.md: Add a clear warning

Add a more clear warning about following the bug template
---
 .github/ISSUE_TEMPLATE/bug_report.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 4ba9ce02f59..b6bbcda11ad 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,6 +9,8 @@ assignees: ''
 
 <!--
 
+We will close the issue without further explanation if you don't follow this template and don't provide the information requested within this template.
+
 Don't forget to check for existing issues/discussions regarding your proposal. We might already have it.
 https://github.com/provectus/kafka-ui/issues
 https://github.com/provectus/kafka-ui/discussions

From 5cdd44daee610d32fcade22c11f929048ac1535e Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Wed, 15 Mar 2023 13:47:58 +0400
Subject: [PATCH 451/734] [FE] Fix updating message count upon clearing
 messages (#3080)

* in a function clearTopicMessagesHandler added invalidateQueries

* changed redux Topic messages clear with react query call

* changed redux Topic messages clear with react query call on Overview/ActionCell.tsx

* show on alert deleted item

* added s on variable clearMessage

* removed clearTopicMessages action from redux and replace functionality with hook useClearTopicMessages

---------

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../components/Topics/List/ActionsCell.tsx    | 13 ++-----
 .../Topics/List/BatchActionsBar.tsx           | 15 ++++---
 .../Topics/List/__tests__/TopicTable.spec.tsx | 17 ++++----
 .../Topics/Topic/Overview/ActionsCell.tsx     | 11 ++----
 .../Topic/Overview/__test__/Overview.spec.tsx | 22 ++++-------
 .../src/components/Topics/Topic/Topic.tsx     | 16 ++++----
 .../Topics/Topic/__test__/Topic.spec.tsx      |  8 +++-
 .../src/lib/hooks/api/topics.ts               | 29 ++++++++++++++
 .../topicMessages/__test__/reducer.spec.ts    | 22 -----------
 .../topicMessages/topicMessagesSlice.ts       | 39 +------------------
 10 files changed, 78 insertions(+), 114 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
index 4fb5f26c7d2..2f6fe3f49af 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
@@ -1,20 +1,17 @@
 import React from 'react';
 import { Action, CleanUpPolicy, Topic, ResourceType } from 'generated-sources';
 import { CellContext } from '@tanstack/react-table';
-import { useAppDispatch } from 'lib/hooks/redux';
 import ClusterContext from 'components/contexts/ClusterContext';
 import { ClusterNameRoute } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import {
   Dropdown,
   DropdownItem,
   DropdownItemHint,
 } from 'components/common/Dropdown';
-import { useQueryClient } from '@tanstack/react-query';
 import {
-  topicKeys,
   useDeleteTopic,
+  useClearTopicMessages,
   useRecreateTopic,
 } from 'lib/hooks/api/topics';
 import { ActionDropdownItem } from 'components/common/ActionComponent';
@@ -24,20 +21,16 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
 
   const { isReadOnly, isTopicDeletionAllowed } =
     React.useContext(ClusterContext);
-  const dispatch = useAppDispatch();
   const { clusterName } = useAppParams<ClusterNameRoute>();
-  const queryClient = useQueryClient();
 
+  const clearMessages = useClearTopicMessages(clusterName);
   const deleteTopic = useDeleteTopic(clusterName);
   const recreateTopic = useRecreateTopic({ clusterName, topicName: name });
 
   const disabled = internal || isReadOnly;
 
   const clearTopicMessagesHandler = async () => {
-    await dispatch(
-      clearTopicMessages({ clusterName, topicName: name })
-    ).unwrap();
-    return queryClient.invalidateQueries(topicKeys.all(clusterName));
+    await clearMessages.mutateAsync(name);
   };
 
   const isCleanupDisabled = cleanUpPolicy !== CleanUpPolicy.DELETE;
diff --git a/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
index d75f4d0da2c..a04429be738 100644
--- a/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
@@ -3,11 +3,13 @@ import { Row } from '@tanstack/react-table';
 import { Action, Topic, ResourceType } from 'generated-sources';
 import useAppParams from 'lib/hooks/useAppParams';
 import { ClusterName } from 'redux/interfaces';
-import { topicKeys, useDeleteTopic } from 'lib/hooks/api/topics';
+import {
+  topicKeys,
+  useClearTopicMessages,
+  useDeleteTopic,
+} from 'lib/hooks/api/topics';
 import { useConfirm } from 'lib/hooks/useConfirm';
 import { Button } from 'components/common/Button/Button';
-import { useAppDispatch } from 'lib/hooks/redux';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import { clusterTopicCopyRelativePath } from 'lib/paths';
 import { useQueryClient } from '@tanstack/react-query';
 import { ActionCanButton } from 'components/common/ActionComponent';
@@ -25,11 +27,14 @@ const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
 }) => {
   const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
   const confirm = useConfirm();
-  const dispatch = useAppDispatch();
   const deleteTopic = useDeleteTopic(clusterName);
   const selectedTopics = rows.map(({ original }) => original.name);
   const client = useQueryClient();
 
+  const clearMessages = useClearTopicMessages(clusterName);
+  const clearTopicMessagesHandler = async (topicName: Topic['name']) => {
+    await clearMessages.mutateAsync(topicName);
+  };
   const deleteTopicsHandler = () => {
     confirm('Are you sure you want to remove selected topics?', async () => {
       try {
@@ -50,7 +55,7 @@ const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
         try {
           await Promise.all(
             selectedTopics.map((topicName) =>
-              dispatch(clearTopicMessages({ clusterName, topicName })).unwrap()
+              clearTopicMessagesHandler(topicName)
             )
           );
           resetRowSelection();
diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
index 5e494cdfc8f..61be3f1360c 100644
--- a/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/TopicTable.spec.tsx
@@ -6,16 +6,15 @@ import { externalTopicPayload, topicsPayload } from 'lib/fixtures/topics';
 import ClusterContext from 'components/contexts/ClusterContext';
 import userEvent from '@testing-library/user-event';
 import {
+  useClearTopicMessages,
   useDeleteTopic,
   useRecreateTopic,
   useTopics,
 } from 'lib/hooks/api/topics';
 import TopicTable from 'components/Topics/List/TopicTable';
 import { clusterTopicsPath } from 'lib/paths';
-import { useAppDispatch } from 'lib/hooks/redux';
 
 const clusterName = 'test-cluster';
-const unwrapMock = jest.fn();
 
 jest.mock('lib/hooks/redux', () => ({
   ...jest.requireActual('lib/hooks/redux'),
@@ -29,22 +28,24 @@ jest.mock('lib/hooks/api/topics', () => ({
   useDeleteTopic: jest.fn(),
   useRecreateTopic: jest.fn(),
   useTopics: jest.fn(),
+  useClearTopicMessages: jest.fn(),
 }));
 
 const deleteTopicMock = jest.fn();
 const recreateTopicMock = jest.fn();
+const clearTopicMessages = jest.fn();
 
 describe('TopicTable Components', () => {
   beforeEach(() => {
     (useDeleteTopic as jest.Mock).mockImplementation(() => ({
       mutateAsync: deleteTopicMock,
     }));
+    (useClearTopicMessages as jest.Mock).mockImplementation(() => ({
+      mutateAsync: clearTopicMessages,
+    }));
     (useRecreateTopic as jest.Mock).mockImplementation(() => ({
       mutateAsync: recreateTopicMock,
     }));
-    (useAppDispatch as jest.Mock).mockImplementation(() => () => ({
-      unwrap: unwrapMock,
-    }));
   });
 
   const renderComponent = (
@@ -185,9 +186,9 @@ describe('TopicTable Components', () => {
             ).toBeInTheDocument();
             const confirmBtn = getButtonByName('Confirm');
             expect(confirmBtn).toBeInTheDocument();
-            expect(unwrapMock).not.toHaveBeenCalled();
+            expect(clearTopicMessages).not.toHaveBeenCalled();
             await userEvent.click(confirmBtn);
-            expect(unwrapMock).toHaveBeenCalledTimes(2);
+            expect(clearTopicMessages).toHaveBeenCalledTimes(2);
             expect(screen.getAllByRole('checkbox')[1]).not.toBeChecked();
             expect(screen.getAllByRole('checkbox')[2]).not.toBeChecked();
           });
@@ -282,7 +283,7 @@ describe('TopicTable Components', () => {
           await userEvent.click(
             screen.getByRole('button', { name: 'Confirm' })
           );
-          expect(unwrapMock).toHaveBeenCalled();
+          expect(clearTopicMessages).toHaveBeenCalled();
         });
       });
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx
index 0e1eed205a9..19e03a1411c 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/ActionsCell.tsx
@@ -1,13 +1,11 @@
 import React from 'react';
 import { Action, Partition, ResourceType } from 'generated-sources';
 import { CellContext } from '@tanstack/react-table';
-import { useAppDispatch } from 'lib/hooks/redux';
 import ClusterContext from 'components/contexts/ClusterContext';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
-import { clearTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import { Dropdown } from 'components/common/Dropdown';
-import { useTopicDetails } from 'lib/hooks/api/topics';
+import { useClearTopicMessages, useTopicDetails } from 'lib/hooks/api/topics';
 import { ActionDropdownItem } from 'components/common/ActionComponent';
 
 const ActionsCell: React.FC<CellContext<Partition, unknown>> = ({ row }) => {
@@ -15,12 +13,11 @@ const ActionsCell: React.FC<CellContext<Partition, unknown>> = ({ row }) => {
   const { data } = useTopicDetails({ clusterName, topicName });
   const { isReadOnly } = React.useContext(ClusterContext);
   const { partition } = row.original;
-  const dispatch = useAppDispatch();
+
+  const clearMessages = useClearTopicMessages(clusterName, [partition]);
 
   const clearTopicMessagesHandler = async () => {
-    await dispatch(
-      clearTopicMessages({ clusterName, topicName, partitions: [partition] })
-    ).unwrap();
+    await clearMessages.mutateAsync(topicName);
   };
   const disabled =
     data?.internal || isReadOnly || data?.cleanUpPolicy !== 'DELETE';
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
index da05b108c73..bf762a002b3 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Overview/__test__/Overview.spec.tsx
@@ -8,8 +8,7 @@ import ClusterContext from 'components/contexts/ClusterContext';
 import userEvent from '@testing-library/user-event';
 import { clusterTopicPath } from 'lib/paths';
 import { Replica } from 'components/Topics/Topic/Overview/Overview.styled';
-import { useTopicDetails } from 'lib/hooks/api/topics';
-import { useAppDispatch } from 'lib/hooks/redux';
+import { useClearTopicMessages, useTopicDetails } from 'lib/hooks/api/topics';
 import {
   externalTopicPayload,
   internalTopicPayload,
@@ -26,14 +25,10 @@ const defaultContextValues = {
 
 jest.mock('lib/hooks/api/topics', () => ({
   useTopicDetails: jest.fn(),
+  useClearTopicMessages: jest.fn(),
 }));
 
-const unwrapMock = jest.fn();
-
-jest.mock('lib/hooks/redux', () => ({
-  ...jest.requireActual('lib/hooks/redux'),
-  useAppDispatch: jest.fn(),
-}));
+const clearTopicMessage = jest.fn();
 
 describe('Overview', () => {
   const renderComponent = (
@@ -43,6 +38,9 @@ describe('Overview', () => {
     (useTopicDetails as jest.Mock).mockImplementation(() => ({
       data: topic,
     }));
+    (useClearTopicMessages as jest.Mock).mockImplementation(() => ({
+      mutateAsync: clearTopicMessage,
+    }));
     const path = clusterTopicPath(clusterName, topicName);
     return render(
       <WithRoute path={clusterTopicPath()}>
@@ -54,12 +52,6 @@ describe('Overview', () => {
     );
   };
 
-  beforeEach(() => {
-    (useAppDispatch as jest.Mock).mockImplementation(() => () => ({
-      unwrap: unwrapMock,
-    }));
-  });
-
   it('at least one replica was rendered', () => {
     renderComponent();
     expect(screen.getByLabelText('replica-info')).toBeInTheDocument();
@@ -136,7 +128,7 @@ describe('Overview', () => {
 
       const clearMessagesButton = screen.getByText('Clear Messages');
       await userEvent.click(clearMessagesButton);
-      expect(unwrapMock).toHaveBeenCalledTimes(1);
+      expect(clearTopicMessage).toHaveBeenCalledTimes(1);
     });
   });
 
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index 01e140c8bb0..8945523576b 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -21,14 +21,12 @@ import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import { Dropdown, DropdownItemHint } from 'components/common/Dropdown';
 import {
+  useClearTopicMessages,
   useDeleteTopic,
   useRecreateTopic,
   useTopicDetails,
 } from 'lib/hooks/api/topics';
-import {
-  clearTopicMessages,
-  resetTopicMessages,
-} from 'redux/reducers/topicMessages/topicMessagesSlice';
+import { resetTopicMessages } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import { Action, CleanUpPolicy, ResourceType } from 'generated-sources';
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import SlidingSidebar from 'components/common/SlidingSidebar';
@@ -69,9 +67,11 @@ const Topic: React.FC = () => {
       dispatch(resetTopicMessages());
     };
   }, []);
-
+  const clearMessages = useClearTopicMessages(clusterName);
+  const clearTopicMessagesHandler = async () => {
+    await clearMessages.mutateAsync(topicName);
+  };
   const canCleanup = data?.cleanUpPolicy === CleanUpPolicy.DELETE;
-
   return (
     <>
       <PageHeading
@@ -110,9 +110,7 @@ const Topic: React.FC = () => {
           </ActionDropdownItem>
 
           <ActionDropdownItem
-            onClick={() =>
-              dispatch(clearTopicMessages({ clusterName, topicName })).unwrap()
-            }
+            onClick={clearTopicMessagesHandler}
             confirm="Are you sure want to clear topic messages?"
             disabled={!canCleanup}
             danger
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
index a686b38e2ba..460e4ad5dee 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
@@ -16,6 +16,7 @@ import {
 import { CleanUpPolicy, Topic } from 'generated-sources';
 import { externalTopicPayload } from 'lib/fixtures/topics';
 import {
+  useClearTopicMessages,
   useDeleteTopic,
   useRecreateTopic,
   useTopicDetails,
@@ -31,9 +32,11 @@ jest.mock('lib/hooks/api/topics', () => ({
   useTopicDetails: jest.fn(),
   useDeleteTopic: jest.fn(),
   useRecreateTopic: jest.fn(),
+  useClearTopicMessages: jest.fn(),
 }));
 
 const unwrapMock = jest.fn();
+const clearTopicMessages = jest.fn();
 
 jest.mock('lib/hooks/redux', () => ({
   ...jest.requireActual('lib/hooks/redux'),
@@ -98,6 +101,9 @@ describe('Details', () => {
     (useRecreateTopic as jest.Mock).mockImplementation(() => ({
       mutateAsync: mockRecreate,
     }));
+    (useClearTopicMessages as jest.Mock).mockImplementation(() => ({
+      mutateAsync: clearTopicMessages,
+    }));
     (useAppDispatch as jest.Mock).mockImplementation(() => () => ({
       unwrap: unwrapMock,
     }));
@@ -145,7 +151,7 @@ describe('Details', () => {
           name: 'Confirm',
         })[0];
         await waitFor(() => userEvent.click(submitButton));
-        expect(unwrapMock).toHaveBeenCalledTimes(1);
+        expect(clearTopicMessages).toHaveBeenCalledTimes(1);
       });
 
       it('closes the modal when cancel button is clicked', async () => {
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
index 9af0b63d620..23e6d65ce37 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topics.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -2,6 +2,7 @@ import {
   topicsApiClient as api,
   messagesApiClient as messagesApi,
   consumerGroupsApiClient,
+  messagesApiClient,
 } from 'lib/api';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import {
@@ -233,6 +234,34 @@ export function useDeleteTopic(clusterName: ClusterName) {
     }
   );
 }
+
+export function useClearTopicMessages(
+  clusterName: ClusterName,
+  partitions?: number[]
+) {
+  const client = useQueryClient();
+  return useMutation(
+    async (topicName: Topic['name']) => {
+      await messagesApiClient.deleteTopicMessages({
+        clusterName,
+        partitions,
+        topicName,
+      });
+      return topicName;
+    },
+
+    {
+      onSuccess: (topicName) => {
+        showSuccessAlert({
+          id: `message-${topicName}-${clusterName}-${partitions}`,
+          message: `${topicName} messages have been successfully cleared!`,
+        });
+        client.invalidateQueries(topicKeys.all(clusterName));
+      },
+    }
+  );
+}
+
 export function useRecreateTopic(props: GetTopicDetailsRequest) {
   const client = useQueryClient();
   return useMutation(() => api.recreateTopic(props), {
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/__test__/reducer.spec.ts
index c2cfa73f273..b9fa4cd4ec1 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/__test__/reducer.spec.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/__test__/reducer.spec.ts
@@ -1,6 +1,5 @@
 import reducer, {
   addTopicMessage,
-  clearTopicMessages,
   resetTopicMessages,
   updateTopicMessagesMeta,
   updateTopicMessagesPhase,
@@ -12,9 +11,6 @@ import {
   topicMessagesMetaPayload,
 } from './fixtures';
 
-const clusterName = 'local';
-const topicName = 'localTopic';
-
 describe('TopicMessages reducer', () => {
   it('Adds new message', () => {
     const state = reducer(
@@ -67,24 +63,6 @@ describe('TopicMessages reducer', () => {
     expect(newState.messages.length).toEqual(0);
   });
 
-  it('clear messages', () => {
-    const state = reducer(
-      undefined,
-      addTopicMessage({ message: topicMessagePayload })
-    );
-    expect(state.messages.length).toEqual(1);
-
-    expect(
-      reducer(state, {
-        type: clearTopicMessages.fulfilled,
-        payload: { clusterName, topicName },
-      })
-    ).toEqual({
-      ...state,
-      messages: [],
-    });
-  });
-
   it('Updates Topic Messages Phase', () => {
     const phase = 'Polling';
 
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
index 5de97980f31..846cbd0c978 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
@@ -1,36 +1,6 @@
-import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { TopicMessagesState, ClusterName, TopicName } from 'redux/interfaces';
+import { createSlice } from '@reduxjs/toolkit';
+import { TopicMessagesState } from 'redux/interfaces';
 import { TopicMessage } from 'generated-sources';
-import {
-  getResponse,
-  showServerError,
-  showSuccessAlert,
-} from 'lib/errorHandling';
-import { messagesApiClient } from 'lib/api';
-
-export const clearTopicMessages = createAsyncThunk<
-  undefined,
-  { clusterName: ClusterName; topicName: TopicName; partitions?: number[] }
->(
-  'topicMessages/clearTopicMessages',
-  async ({ clusterName, topicName, partitions }, { rejectWithValue }) => {
-    try {
-      await messagesApiClient.deleteTopicMessages({
-        clusterName,
-        topicName,
-        partitions,
-      });
-      showSuccessAlert({
-        id: `message-${topicName}-${clusterName}-${partitions}`,
-        message: `${topicName} messages have been successfully cleared!`,
-      });
-      return undefined;
-    } catch (err) {
-      showServerError(err as Response);
-      return rejectWithValue(await getResponse(err as Response));
-    }
-  }
-);
 
 export const initialState: TopicMessagesState = {
   messages: [],
@@ -68,11 +38,6 @@ const topicMessagesSlice = createSlice({
       state.isFetching = action.payload;
     },
   },
-  extraReducers: (builder) => {
-    builder.addCase(clearTopicMessages.fulfilled, (state) => {
-      state.messages = [];
-    });
-  },
 });
 
 export const {

From 738136eed281b14c36194e18236c550f73a4fdaa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Mar 2023 13:49:54 +0400
Subject: [PATCH 452/734] Bump ingestion-contract-client from 0.1.19 to 0.1.23
 (#3498)

Bumps [ingestion-contract-client](https://github.com/opendatadiscovery/opendatadiscovery-specification-contracts) from 0.1.19 to 0.1.23.
- [Release notes](https://github.com/opendatadiscovery/opendatadiscovery-specification-contracts/releases)
- [Commits](https://github.com/opendatadiscovery/opendatadiscovery-specification-contracts/commits)

---
updated-dependencies:
- dependency-name: org.opendatadiscovery:ingestion-contract-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e3f6e9e0e7f..3281ff183ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
         <spring-security.version>5.7.5</spring-security.version>
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
         <odd-oddrn-generator.version>0.1.15</odd-oddrn-generator.version>
-        <odd-oddrn-client.version>0.1.19</odd-oddrn-client.version>
+        <odd-oddrn-client.version>0.1.23</odd-oddrn-client.version>
 
         <!-- Test dependency versions -->
         <junit.version>5.9.1</junit.version>

From 36112fa26b89e490c869bf6e176c53d853e65c33 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Wed, 15 Mar 2023 14:44:07 +0400
Subject: [PATCH 453/734] [Infra] A first try of reusable workflows (#3497)

* add resusable action

* fix yaml

* fix yaml

* fix

* fix syntax errors

* fix syntax

* Apply suggestions from code review

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>

---------

Co-authored-by: Narek Matevosyan <nmatevosyan@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/branch-deploy.yml  | 17 ++-------------
 .github/workflows/build-template.yml | 32 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 .github/workflows/build-template.yml

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 0e4a171aec5..25f975708e6 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -9,9 +9,9 @@ jobs:
     if: ${{ github.event.label.name == 'status/feature_testing' || github.event.label.name == 'status/feature_testing_public' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: ./.github/workflows/build-template.yaml
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          APP_VERSION: $GITHUB_SHA
       - name: get branch name
         id: extract_branch
         run: |
@@ -19,19 +19,6 @@ jobs:
           echo "tag=${tag}" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'zulu'
-          cache: 'maven'
-      - name: Build
-        id: build
-        run: |
-          ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
-          ./mvnw -B -V -ntp clean package -Pprod -DskipTests
-          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
diff --git a/.github/workflows/build-template.yml b/.github/workflows/build-template.yml
new file mode 100644
index 00000000000..26677932d7a
--- /dev/null
+++ b/.github/workflows/build-template.yml
@@ -0,0 +1,32 @@
+name: Maven build template
+on:
+  workflow_call:
+   inputs:
+    APP_VERSION:
+     required: true
+     type: string
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{steps.build.outputs.version}}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
+      - name: Build
+        id: build
+        run: |
+          ./mvnw -B -ntp versions:set -DnewVersion=${{ inputs.APP_VERSION }}
+          ./mvnw -B -V -ntp clean package -Pprod -DskipTests
+          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT

From 98580551f605f861fa19021fd727654f667455aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Mar 2023 17:01:20 +0400
Subject: [PATCH 454/734] Bump aws-actions/configure-aws-credentials from
 1.pre.node16 to 2.0.0 (#3487)

Bumps [aws-actions/configure-aws-credentials](https://github.com/aws-actions/configure-aws-credentials) from 1.pre.node16 to 2.0.0.
- [Release notes](https://github.com/aws-actions/configure-aws-credentials/releases)
- [Changelog](https://github.com/aws-actions/configure-aws-credentials/blob/main/CHANGELOG.md)
- [Commits](https://github.com/aws-actions/configure-aws-credentials/compare/v1-node16...v1-node16)

---
updated-dependencies:
- dependency-name: aws-actions/configure-aws-credentials
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/terraform-deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/terraform-deploy.yml b/.github/workflows/terraform-deploy.yml
index 6df90e7338b..c6163ef90f4 100644
--- a/.github/workflows/terraform-deploy.yml
+++ b/.github/workflows/terraform-deploy.yml
@@ -26,7 +26,7 @@ jobs:
           echo "Terraform will be triggered in this dir $TF_DIR"
 
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v1-node16
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

From 4d03802a5dc77f6b327485484eb63106a87152b5 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Wed, 15 Mar 2023 16:53:57 +0300
Subject: [PATCH 455/734] [FE] bypass key & value serde null cases (#3500)

---
 .../components/Topics/Topic/Messages/Filters/Filters.tsx  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 3abe336f044..c3871432e70 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -125,10 +125,10 @@ const Filters: React.FC<FiltersProps> = ({
     getTimestampFromSeekToParam(searchParams)
   );
   const [keySerde, setKeySerde] = React.useState<string>(
-    searchParams.get('keySerde') as string
+    searchParams.get('keySerde') || ''
   );
   const [valueSerde, setValueSerde] = React.useState<string>(
-    searchParams.get('valueSerde') as string
+    searchParams.get('valueSerde') || ''
   );
 
   const [savedFilters, setSavedFilters] = React.useState<MessageFilters[]>(
@@ -206,8 +206,8 @@ const Filters: React.FC<FiltersProps> = ({
       limit: PER_PAGE,
       page: page || 0,
       seekDirection,
-      keySerde: keySerde || (searchParams.get('keySerde') as string),
-      valueSerde: valueSerde || (searchParams.get('valueSerde') as string),
+      keySerde: keySerde || searchParams.get('keySerde') || '',
+      valueSerde: valueSerde || searchParams.get('valueSerde') || '',
     };
 
     if (isSeekTypeControlVisible) {

From d42e911379a53bcb13ee07e352138fe3083fad98 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 20 Mar 2023 11:37:36 +0300
Subject: [PATCH 456/734] [BE] Implement an internal topic name prefix (#3505)

* Revert "Fix topic internal indication (#2846)"

This reverts commit 2f2e19d1bce41ec8c0f867b20b4c72b20f764bf0.

* Fix #3135

* Add a nullable annotation for internalTopicPrefix

* Fix e2e tests

* upd isInternal

---------

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../kafka/ui/config/ClustersProperties.java   |  2 ++
 .../kafka/ui/model/InternalTopic.java         | 26 ++++++++++++++-----
 .../kafka/ui/service/TopicsService.java       |  9 +++++--
 .../service/TopicsServicePaginationTest.java  | 16 ++++++------
 .../kafka/ui/pages/topics/TopicsList.java     | 10 ++++---
 .../ui/smokeSuite/topics/TopicsTest.java      |  9 ++++---
 6 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 2cd5e0e69cd..7b6b494ad12 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -25,6 +25,8 @@ public class ClustersProperties {
 
   List<Cluster> clusters = new ArrayList<>();
 
+  String internalTopicPrefix;
+
   @Data
   public static class Cluster {
     String name;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
index efabd15f098..43a6012d215 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopic.java
@@ -1,9 +1,11 @@
 package com.provectus.kafka.ui.model;
 
+import com.provectus.kafka.ui.config.ClustersProperties;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import lombok.Builder;
 import lombok.Data;
 import org.apache.kafka.clients.admin.ConfigEntry;
@@ -14,6 +16,8 @@
 @Builder(toBuilder = true)
 public class InternalTopic {
 
+  ClustersProperties clustersProperties;
+
   // from TopicDescription
   private final String name;
   private final boolean internal;
@@ -40,9 +44,17 @@ public static InternalTopic from(TopicDescription topicDescription,
                                    List<ConfigEntry> configs,
                                    InternalPartitionsOffsets partitionsOffsets,
                                    Metrics metrics,
-                                   InternalLogDirStats logDirInfo) {
+                                   InternalLogDirStats logDirInfo,
+                                   @Nullable String internalTopicPrefix) {
     var topic = InternalTopic.builder();
-    topic.internal(topicDescription.isInternal());
+
+    internalTopicPrefix = internalTopicPrefix == null || internalTopicPrefix.isEmpty()
+        ? "_"
+        : internalTopicPrefix;
+
+    topic.internal(
+        topicDescription.isInternal() || topicDescription.name().startsWith(internalTopicPrefix)
+    );
     topic.name(topicDescription.name());
 
     List<InternalPartition> partitions = topicDescription.partitions().stream()
@@ -56,10 +68,10 @@ public static InternalTopic from(TopicDescription topicDescription,
           List<InternalReplica> replicas = partition.replicas().stream()
               .map(r ->
                   InternalReplica.builder()
-                    .broker(r.id())
-                    .inSync(partition.isr().contains(r))
-                    .leader(partition.leader() != null && partition.leader().id() == r.id())
-                    .build())
+                      .broker(r.id())
+                      .inSync(partition.isr().contains(r))
+                      .leader(partition.leader() != null && partition.leader().id() == r.id())
+                      .build())
               .collect(Collectors.toList());
           partitionDto.replicas(replicas);
 
@@ -79,7 +91,7 @@ public static InternalTopic from(TopicDescription topicDescription,
 
           return partitionDto.build();
         })
-        .collect(Collectors.toList());
+        .toList();
 
     topic.partitions(partitions.stream().collect(
         Collectors.toMap(InternalPartition::getPartition, t -> t)));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index b172e2b4c61..9aaff3e9ef0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -3,6 +3,7 @@
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
+import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.exception.TopicMetadataException;
 import com.provectus.kafka.ui.exception.TopicNotFoundException;
 import com.provectus.kafka.ui.exception.TopicRecreationException;
@@ -52,6 +53,7 @@ public class TopicsService {
 
   private final AdminClientService adminClientService;
   private final StatisticsCache statisticsCache;
+  private final ClustersProperties clustersProperties;
   @Value("${topic.recreate.maxRetries:15}")
   private int recreateMaxRetries;
   @Value("${topic.recreate.delay.seconds:1}")
@@ -127,7 +129,8 @@ private List<InternalTopic> createList(List<String> orderedNames,
             configs.getOrDefault(t, List.of()),
             partitionsOffsets,
             metrics,
-            logDirInfo
+            logDirInfo,
+            clustersProperties.getInternalTopicPrefix()
         ))
         .collect(toList());
   }
@@ -459,7 +462,9 @@ public Mono<List<InternalTopic>> getTopicsForPagination(KafkaCluster cluster) {
                     stats.getTopicConfigs().getOrDefault(topicName, List.of()),
                     InternalPartitionsOffsets.empty(),
                     stats.getMetrics(),
-                    stats.getLogDirInfo()))
+                    stats.getLogDirInfo(),
+                    clustersProperties.getInternalTopicPrefix()
+                    ))
             .collect(toList())
         );
   }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
index 44b771f1542..8867400fee3 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
@@ -69,7 +69,7 @@ public void shouldListFirst25Topics() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, false, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                Metrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty(), "_"))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -95,7 +95,7 @@ public void shouldListFirst25TopicsSortedByNameDescendingOrder() {
         .map(Objects::toString)
         .map(name -> new TopicDescription(name, false, List.of()))
         .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-            Metrics.empty(), InternalLogDirStats.empty()))
+            Metrics.empty(), InternalLogDirStats.empty(), "_"))
         .collect(Collectors.toMap(InternalTopic::getName, Function.identity()));
     init(internalTopics);
 
@@ -122,7 +122,7 @@ public void shouldCalculateCorrectPageCountForNonDivisiblePageSize() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, false, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                Metrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty(), "_"))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -141,7 +141,7 @@ public void shouldCorrectlyHandleNonPositivePageNumberAndPageSize() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, false, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                Metrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty(), "_"))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -160,7 +160,7 @@ public void shouldListBotInternalAndNonInternalTopics() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, Integer.parseInt(name) % 10 == 0, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                Metrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty(), "_"))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -181,7 +181,7 @@ public void shouldListOnlyNonInternalTopics() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, Integer.parseInt(name) % 5 == 0, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                Metrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty(), "_"))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -202,7 +202,7 @@ public void shouldListOnlyTopicsContainingOne() {
             .map(Objects::toString)
             .map(name -> new TopicDescription(name, false, List.of()))
             .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), null,
-                Metrics.empty(), InternalLogDirStats.empty()))
+                Metrics.empty(), InternalLogDirStats.empty(), "_"))
             .collect(Collectors.toMap(InternalTopic::getName, Function.identity()))
     );
 
@@ -224,7 +224,7 @@ public void shouldListTopicsOrderedByPartitionsCount() {
                     new TopicPartitionInfo(p, null, List.of(), List.of()))
                 .collect(Collectors.toList())))
         .map(topicDescription -> InternalTopic.from(topicDescription, List.of(), InternalPartitionsOffsets.empty(),
-            Metrics.empty(), InternalLogDirStats.empty()))
+            Metrics.empty(), InternalLogDirStats.empty(), "_"))
         .collect(Collectors.toMap(InternalTopic::getName, Function.identity()));
 
     init(internalTopics);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
index 499d5fe965a..35f4c9b1b41 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
@@ -6,7 +6,6 @@
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -175,6 +174,12 @@ public TopicGridItem getTopicItem(String name) {
                 .findFirst().orElseThrow();
     }
 
+    @Step
+    public TopicGridItem getAnyNonInternalTopic() {
+        return getNonInternalTopics().stream()
+                .findAny().orElseThrow();
+    }
+
     @Step
     public List<TopicGridItem> getNonInternalTopics() {
         return initGridItems().stream()
@@ -207,8 +212,7 @@ public TopicsList selectItem(boolean select) {
         public boolean isInternal() {
             boolean internal = false;
             try {
-                element.$x("./td[2]/a/span").shouldBe(visible, Duration.ofMillis(500));
-                internal = true;
+                internal = element.$x("./td[2]/a/span").isDisplayed();
             } catch (Throwable ignored) {
             }
             return internal;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
index 3f1347cb391..92e580ec32c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
@@ -52,7 +52,8 @@ public class TopicsTest extends BaseTest {
             .setMaxSizeOnDisk(NOT_SET);
     private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
             .setName("topic-for-check-filters-" + randomAlphabetic(5));
-    private static final Topic TOPIC_FOR_DELETE = new Topic().setName("topic-to-delete-" + randomAlphabetic(5));
+    private static final Topic TOPIC_FOR_DELETE = new Topic()
+            .setName("topic-to-delete-" + randomAlphabetic(5));
     private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
     @BeforeClass(alwaysRun = true)
@@ -89,11 +90,11 @@ public void createTopic() {
     void checkAvailableOperations() {
         navigateToTopics();
         topicsList
-                .getTopicItem("my_ksql_1ksql_processing_log")
+                .getTopicItem(TOPIC_TO_UPDATE_AND_DELETE.getName())
                 .selectItem(true);
         verifyElementsCondition(topicsList.getActionButtons(), Condition.enabled);
         topicsList
-                .getTopicItem("_confluent-ksql-my_ksql_1_command_topic")
+                .getTopicItem(TOPIC_FOR_CHECK_FILTERS.getName())
                 .selectItem(true);
         Assert.assertFalse(topicsList.isCopySelectedTopicBtnEnabled(), "isCopySelectedTopicBtnEnabled()");
     }
@@ -456,7 +457,7 @@ public void checkCopyTopicPossibility() {
                 .setNumberOfPartitions(1);
         navigateToTopics();
         topicsList
-                .getTopicItem("_schemas")
+                .getAnyNonInternalTopic()
                 .selectItem(true)
                 .clickCopySelectedTopicBtn();
         topicCreateEditForm

From 270d52882e881a51730d6f03347fe2c312877b7e Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 20 Mar 2023 12:59:14 +0300
Subject: [PATCH 457/734] Revert "[Infra] A first try of reusable workflows
 (#3497)" (#3519)

This reverts commit 36112fa26b89e490c869bf6e176c53d853e65c33.
---
 .github/workflows/branch-deploy.yml  | 17 +++++++++++++--
 .github/workflows/build-template.yml | 32 ----------------------------
 2 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 .github/workflows/build-template.yml

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 25f975708e6..0e4a171aec5 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -9,9 +9,9 @@ jobs:
     if: ${{ github.event.label.name == 'status/feature_testing' || github.event.label.name == 'status/feature_testing_public' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: ./.github/workflows/build-template.yaml
+      - uses: actions/checkout@v3
         with:
-          APP_VERSION: $GITHUB_SHA
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: get branch name
         id: extract_branch
         run: |
@@ -19,6 +19,19 @@ jobs:
           echo "tag=${tag}" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'maven'
+      - name: Build
+        id: build
+        run: |
+          ./mvnw -B -ntp versions:set -DnewVersion=$GITHUB_SHA
+          ./mvnw -B -V -ntp clean package -Pprod -DskipTests
+          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
diff --git a/.github/workflows/build-template.yml b/.github/workflows/build-template.yml
deleted file mode 100644
index 26677932d7a..00000000000
--- a/.github/workflows/build-template.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Maven build template
-on:
-  workflow_call:
-   inputs:
-    APP_VERSION:
-     required: true
-     type: string
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{steps.build.outputs.version}}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-      - run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'zulu'
-          cache: 'maven'
-      - name: Build
-        id: build
-        run: |
-          ./mvnw -B -ntp versions:set -DnewVersion=${{ inputs.APP_VERSION }}
-          ./mvnw -B -V -ntp clean package -Pprod -DskipTests
-          export VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT

From e2dc12dc02f88a8d406e6c0e1573c966375609b5 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 20 Mar 2023 12:10:10 +0200
Subject: [PATCH 458/734] [E2E] Checking components paths (#3514)

* [e2e]Checking components paths

* upd checkComponentsPathWhileNavigating

* add backlog

* add backlog

* add backlog

* upd LocalWebDriver

* upd wfm

* upd fil path

* upd clearMessage

* upd panels package

* upd Template

* add manual cases

---------

Co-authored-by: anedyal <arthur.niedial@gmail.com>
---
 .github/workflows/e2e-automation.yml          |   8 +-
 .github/workflows/e2e-weekly.yml              |   8 +-
 .../provectus/kafka/ui/pages/BasePage.java    |  11 +
 .../kafka/ui/pages/brokers/BrokersList.java   |   5 +-
 .../ui/pages/connectors/KafkaConnectList.java |   3 +-
 .../ui/pages/consumers/ConsumersList.java     |   7 +-
 .../kafka/ui/pages/ksqlDb/KsqlDbList.java     | 196 +++++++++---------
 .../ui/pages/{ => panels}/NaviSideBar.java    |  39 ++--
 .../kafka/ui/pages/{ => panels}/TopPanel.java |   3 +-
 .../kafka/ui/pages/panels/enums/MenuItem.java |  28 +++
 .../ui/pages/schemas/SchemaRegistryList.java  |   3 +-
 .../kafka/ui/pages/topics/TopicsList.java     |   4 +-
 .../kafka/ui/services/ApiService.java         |  18 +-
 .../kafka/ui/settings/BaseSource.java         |   1 +
 .../java/com/provectus/kafka/ui/BaseTest.java |  29 ++-
 .../java/com/provectus/kafka/ui/Facade.java   |   4 +-
 .../kafka/ui/manualSuite/BaseManualTest.java  |   4 +-
 .../ui/manualSuite/backlog/SanityBacklog.java |  19 ++
 .../SmokeBacklog.java}                        |  38 +++-
 .../ui/manualSuite/suite/TopicsTest.java      |  26 +--
 .../{BrokersTest.java => WizardTest.java}     |   8 +-
 .../kafka/ui/qaseSuite/BaseQaseTest.java      |   7 +
 .../kafka/ui/qaseSuite/Template.java          |   2 +-
 .../kafka/ui/smokeSuite/SmokeTest.java        |  53 +++++
 .../smokeSuite/connectors/ConnectorsTest.java |  20 +-
 .../ui/smokeSuite/topics/MessagesTest.java    |   9 +-
 .../ui/smokeSuite/topics/TopicsTest.java      |   2 +-
 27 files changed, 359 insertions(+), 196 deletions(-)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ => panels}/NaviSideBar.java (67%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ => panels}/TopPanel.java (90%)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/enums/MenuItem.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SanityBacklog.java
 rename kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/{suite/KsqlDbTest.java => backlog/SmokeBacklog.java} (53%)
 rename kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/{BrokersTest.java => WizardTest.java} (74%)

diff --git a/.github/workflows/e2e-automation.yml b/.github/workflows/e2e-automation.yml
index 5a5018c9e5c..b21fa18ce84 100644
--- a/.github/workflows/e2e-automation.yml
+++ b/.github/workflows/e2e-automation.yml
@@ -23,6 +23,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.sha }}
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1-node16
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-central-1
       - name: Set up environment
         id: set_env_values
         run: |
@@ -65,8 +71,6 @@ jobs:
         if: always()
         env:
           AWS_S3_BUCKET: 'kafkaui-allure-reports'
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: 'eu-central-1'
           SOURCE_DIR: 'allure-history/allure-results'
       - name: Deploy report to Amazon S3
diff --git a/.github/workflows/e2e-weekly.yml b/.github/workflows/e2e-weekly.yml
index 2bf2001ec23..80f7a9393df 100644
--- a/.github/workflows/e2e-weekly.yml
+++ b/.github/workflows/e2e-weekly.yml
@@ -10,6 +10,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.sha }}
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1-node16
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-central-1
       - name: Set up environment
         id: set_env_values
         run: |
@@ -52,8 +58,6 @@ jobs:
         if: always()
         env:
           AWS_S3_BUCKET: 'kafkaui-allure-reports'
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: 'eu-central-1'
           SOURCE_DIR: 'allure-history/allure-results'
       - name: Deploy report to Amazon S3
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index 979302fd277..201079fe3b3 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -4,6 +4,7 @@
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
+import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
 import com.provectus.kafka.ui.utilities.WebUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.Keys;
@@ -33,6 +34,8 @@ public abstract class BasePage extends WebUtils {
     protected String summaryCellLocator = "//div[contains(text(),'%s')]";
     protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
     protected String columnHeaderLocator = "//table//tr/th//div[text()='%s']";
+    protected String pageTitleFromHeader = "//h1[text()='%s']";
+    protected String pagePathFromHeader = "//a[text()='%s']/../h1";
 
     protected void waitUntilSpinnerDisappear() {
         log.debug("\nwaitUntilSpinnerDisappear");
@@ -41,6 +44,14 @@ protected void waitUntilSpinnerDisappear() {
         }
     }
 
+    protected SelenideElement getPageTitleFromHeader(MenuItem menuItem) {
+        return $x(String.format(pageTitleFromHeader, menuItem.getPageTitle()));
+    }
+
+    protected SelenideElement getPagePathFromHeader(MenuItem menuItem) {
+        return $x(String.format(pagePathFromHeader, menuItem.getPageTitle()));
+    }
+
     protected void clickSubmitBtn() {
         clickByJavaScript(submitBtn);
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
index 3d3a58f355e..f1f08c3cf53 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -12,15 +12,14 @@
 import java.util.stream.Stream;
 
 import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.BROKERS;
 
 public class BrokersList extends BasePage {
 
-    protected SelenideElement brokersListHeader = $x("//h1[text()='Brokers']");
-
     @Step
     public BrokersList waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
-        brokersListHeader.shouldBe(Condition.visible);
+        getPageTitleFromHeader(BROKERS).shouldBe(Condition.visible);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java
index 3be18265118..6c672855a63 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java
@@ -6,6 +6,7 @@
 import io.qameta.allure.Step;
 
 import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KAFKA_CONNECT;
 
 
 public class KafkaConnectList extends BasePage {
@@ -19,7 +20,7 @@ public KafkaConnectList() {
     @Step
     public KafkaConnectList waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
-        createConnectorBtn.shouldBe(Condition.visible);
+        getPageTitleFromHeader(KAFKA_CONNECT).shouldBe(Condition.visible);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
index 6d0c1d48f73..35ef4043447 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
@@ -1,20 +1,17 @@
 package com.provectus.kafka.ui.pages.consumers;
 
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.CONSUMERS;
 
 public class ConsumersList extends BasePage {
 
-    protected SelenideElement consumerListHeader = $x("//h1[text()='Consumers']");
-    
     @Step
     public ConsumersList waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
-        consumerListHeader.shouldHave(Condition.visible);
+        getPageTitleFromHeader(CONSUMERS).shouldBe(Condition.visible);
         return this;
     }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
index 25246a86ed5..e80229d931f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
@@ -1,137 +1,139 @@
 package com.provectus.kafka.ui.pages.ksqlDb;
 
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$x;
-
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.pages.ksqlDb.enums.KsqlMenuTabs;
 import io.qameta.allure.Step;
+import org.openqa.selenium.By;
+
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import org.openqa.selenium.By;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
 
 public class KsqlDbList extends BasePage {
-  protected SelenideElement executeKsqlBtn = $x("//button[text()='Execute KSQL Request']");
-  protected SelenideElement tablesTab = $x("//nav[@role='navigation']/a[text()='Tables']");
-  protected SelenideElement streamsTab = $x("//nav[@role='navigation']/a[text()='Streams']");
-
-  @Step
-  public KsqlDbList waitUntilScreenReady() {
-    waitUntilSpinnerDisappear();
-    Arrays.asList(tablesTab, streamsTab).forEach(tab -> tab.shouldBe(Condition.visible));
-    return this;
-  }
-
-  @Step
-  public KsqlDbList clickExecuteKsqlRequestBtn() {
-    clickByJavaScript(executeKsqlBtn);
-    return this;
-  }
-
-  @Step
-  public KsqlDbList openDetailsTab(KsqlMenuTabs menu) {
-    $(By.linkText(menu.toString())).shouldBe(Condition.visible).click();
-    waitUntilSpinnerDisappear();
-    return this;
-  }
-
-  private List<KsqlDbList.KsqlTablesGridItem> initTablesItems() {
-    List<KsqlDbList.KsqlTablesGridItem> gridItemList = new ArrayList<>();
-    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-        .forEach(item -> gridItemList.add(new KsqlDbList.KsqlTablesGridItem(item)));
-    return gridItemList;
-  }
-
-  @Step
-  public KsqlDbList.KsqlTablesGridItem getTableByName(String tableName) {
-    return initTablesItems().stream()
-        .filter(e -> e.getTableName().equals(tableName))
-        .findFirst().orElseThrow();
-  }
-
-  public static class KsqlTablesGridItem extends BasePage {
-
-    private final SelenideElement element;
-
-    public KsqlTablesGridItem(SelenideElement element) {
-      this.element = element;
-    }
+
+    protected SelenideElement executeKsqlBtn = $x("//button[text()='Execute KSQL Request']");
+    protected SelenideElement tablesTab = $x("//nav[@role='navigation']/a[text()='Tables']");
+    protected SelenideElement streamsTab = $x("//nav[@role='navigation']/a[text()='Streams']");
 
     @Step
-    public String getTableName() {
-      return element.$x("./td[1]").getText().trim();
+    public KsqlDbList waitUntilScreenReady() {
+        waitUntilSpinnerDisappear();
+        getPageTitleFromHeader(KSQL_DB).shouldBe(Condition.visible);
+        return this;
     }
 
     @Step
-    public String getTopicName() {
-      return element.$x("./td[2]").getText().trim();
+    public KsqlDbList clickExecuteKsqlRequestBtn() {
+        clickByJavaScript(executeKsqlBtn);
+        return this;
     }
 
     @Step
-    public String getKeyFormat() {
-      return element.$x("./td[3]").getText().trim();
+    public KsqlDbList openDetailsTab(KsqlMenuTabs menu) {
+        $(By.linkText(menu.toString())).shouldBe(Condition.visible).click();
+        waitUntilSpinnerDisappear();
+        return this;
+    }
+
+    private List<KsqlDbList.KsqlTablesGridItem> initTablesItems() {
+        List<KsqlDbList.KsqlTablesGridItem> gridItemList = new ArrayList<>();
+        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+                .forEach(item -> gridItemList.add(new KsqlDbList.KsqlTablesGridItem(item)));
+        return gridItemList;
     }
 
     @Step
-    public String getValueFormat() {
-      return element.$x("./td[4]").getText().trim();
+    public KsqlDbList.KsqlTablesGridItem getTableByName(String tableName) {
+        return initTablesItems().stream()
+                .filter(e -> e.getTableName().equals(tableName))
+                .findFirst().orElseThrow();
+    }
+
+    private List<KsqlDbList.KsqlStreamsGridItem> initStreamsItems() {
+        List<KsqlDbList.KsqlStreamsGridItem> gridItemList = new ArrayList<>();
+        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+                .forEach(item -> gridItemList.add(new KsqlDbList.KsqlStreamsGridItem(item)));
+        return gridItemList;
     }
 
     @Step
-    public String getIsWindowed() {
-      return element.$x("./td[5]").getText().trim();
+    public KsqlDbList.KsqlStreamsGridItem getStreamByName(String streamName) {
+        return initStreamsItems().stream()
+                .filter(e -> e.getStreamName().equals(streamName))
+                .findFirst().orElseThrow();
     }
-  }
 
-  private List<KsqlDbList.KsqlStreamsGridItem> initStreamsItems() {
-    List<KsqlDbList.KsqlStreamsGridItem> gridItemList = new ArrayList<>();
-    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-        .forEach(item -> gridItemList.add(new KsqlDbList.KsqlStreamsGridItem(item)));
-    return gridItemList;
-  }
+    public static class KsqlTablesGridItem extends BasePage {
 
-  @Step
-  public KsqlDbList.KsqlStreamsGridItem getStreamByName(String streamName) {
-    return initStreamsItems().stream()
-        .filter(e -> e.getStreamName().equals(streamName))
-        .findFirst().orElseThrow();
-  }
+        private final SelenideElement element;
 
-  public static class KsqlStreamsGridItem extends BasePage {
+        public KsqlTablesGridItem(SelenideElement element) {
+            this.element = element;
+        }
 
-    private final SelenideElement element;
+        @Step
+        public String getTableName() {
+            return element.$x("./td[1]").getText().trim();
+        }
 
-    public KsqlStreamsGridItem(SelenideElement element) {
-      this.element = element;
-    }
+        @Step
+        public String getTopicName() {
+            return element.$x("./td[2]").getText().trim();
+        }
 
-    @Step
-    public String getStreamName() {
-      return element.$x("./td[1]").getText().trim();
-    }
+        @Step
+        public String getKeyFormat() {
+            return element.$x("./td[3]").getText().trim();
+        }
 
-    @Step
-    public String getTopicName() {
-      return element.$x("./td[2]").getText().trim();
-    }
+        @Step
+        public String getValueFormat() {
+            return element.$x("./td[4]").getText().trim();
+        }
 
-    @Step
-    public String getKeyFormat() {
-      return element.$x("./td[3]").getText().trim();
+        @Step
+        public String getIsWindowed() {
+            return element.$x("./td[5]").getText().trim();
+        }
     }
 
-    @Step
-    public String getValueFormat() {
-      return element.$x("./td[4]").getText().trim();
-    }
+    public static class KsqlStreamsGridItem extends BasePage {
 
-    @Step
-    public String getIsWindowed() {
-      return element.$x("./td[5]").getText().trim();
+        private final SelenideElement element;
+
+        public KsqlStreamsGridItem(SelenideElement element) {
+            this.element = element;
+        }
+
+        @Step
+        public String getStreamName() {
+            return element.$x("./td[1]").getText().trim();
+        }
+
+        @Step
+        public String getTopicName() {
+            return element.$x("./td[2]").getText().trim();
+        }
+
+        @Step
+        public String getKeyFormat() {
+            return element.$x("./td[3]").getText().trim();
+        }
+
+        @Step
+        public String getValueFormat() {
+            return element.$x("./td[4]").getText().trim();
+        }
+
+        @Step
+        public String getIsWindowed() {
+            return element.$x("./td[5]").getText().trim();
+        }
     }
-  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java
similarity index 67%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java
index 3c5b0fe6d9f..df10360844b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/NaviSideBar.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java
@@ -1,7 +1,9 @@
-package com.provectus.kafka.ui.pages;
+package com.provectus.kafka.ui.pages.panels;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
+import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
 import java.time.Duration;
@@ -34,38 +36,29 @@ public NaviSideBar waitUntilScreenReady() {
     }
 
     @Step
-    public NaviSideBar openSideMenu(String clusterName, SideMenuOption option) {
+    public String getPagePath(MenuItem menuItem) {
+        return getPagePathFromHeader(menuItem)
+                .shouldBe(Condition.visible)
+                .getText().trim();
+    }
+
+    @Step
+    public NaviSideBar openSideMenu(String clusterName, MenuItem menuItem) {
         clickByActions(expandCluster(clusterName).parent()
-                .$x(String.format(sideMenuOptionElementLocator, option.value)));
+                .$x(String.format(sideMenuOptionElementLocator, menuItem.getNaviTitle())));
         return this;
     }
 
     @Step
-    public NaviSideBar openSideMenu(SideMenuOption option) {
-        openSideMenu(CLUSTER_NAME, option);
+    public NaviSideBar openSideMenu(MenuItem menuItem) {
+        openSideMenu(CLUSTER_NAME, menuItem);
         return this;
     }
 
     public List<SelenideElement> getAllMenuButtons() {
         expandCluster(CLUSTER_NAME);
-        return Stream.of(SideMenuOption.values())
-                .map(option -> $x(String.format(sideMenuOptionElementLocator, option.value)))
+        return Stream.of(MenuItem.values())
+                .map(menuItem -> $x(String.format(sideMenuOptionElementLocator, menuItem.getNaviTitle())))
                 .collect(Collectors.toList());
     }
-
-    public enum SideMenuOption {
-        DASHBOARD("Dashboard"),
-        BROKERS("Brokers"),
-        TOPICS("Topics"),
-        CONSUMERS("Consumers"),
-        SCHEMA_REGISTRY("Schema Registry"),
-        KAFKA_CONNECT("Kafka Connect"),
-        KSQL_DB("KSQL DB");
-
-        final String value;
-
-        SideMenuOption(String value) {
-            this.value = value;
-        }
-    }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/TopPanel.java
similarity index 90%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/TopPanel.java
index 28de4fe0588..77cf71a9291 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/TopPanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/TopPanel.java
@@ -1,6 +1,7 @@
-package com.provectus.kafka.ui.pages;
+package com.provectus.kafka.ui.pages.panels;
 
 import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/enums/MenuItem.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/enums/MenuItem.java
new file mode 100644
index 00000000000..6610a8293ba
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/enums/MenuItem.java
@@ -0,0 +1,28 @@
+package com.provectus.kafka.ui.pages.panels.enums;
+
+public enum MenuItem {
+    
+    DASHBOARD("Dashboard", "Dashboard"),
+    BROKERS("Brokers", "Brokers"),
+    TOPICS("Topics", "Topics"),
+    CONSUMERS("Consumers", "Consumers"),
+    SCHEMA_REGISTRY("Schema Registry", "Schema Registry"),
+    KAFKA_CONNECT("Kafka Connect", "Connectors"),
+    KSQL_DB("KSQL DB", "KSQL DB");
+    
+    private final String naviTitle;
+    private final String pageTitle;
+    
+    MenuItem(String naviTitle, String pageTitle) {
+        this.naviTitle = naviTitle;
+        this.pageTitle = pageTitle;
+    }
+    
+    public String getNaviTitle() {
+        return naviTitle;
+    }
+    
+    public String getPageTitle() {
+        return pageTitle;
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java
index 8f65947734b..4f06bb995b0 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java
@@ -6,6 +6,7 @@
 import io.qameta.allure.Step;
 
 import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.SCHEMA_REGISTRY;
 
 public class SchemaRegistryList extends BasePage {
 
@@ -14,7 +15,7 @@ public class SchemaRegistryList extends BasePage {
     @Step
     public SchemaRegistryList waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
-        createSchemaBtn.shouldBe(Condition.visible);
+        getPageTitleFromHeader(SCHEMA_REGISTRY).shouldBe(Condition.visible);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
index 35f4c9b1b41..b26f2c2997a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
@@ -14,10 +14,10 @@
 
 import static com.codeborne.selenide.Condition.visible;
 import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.TOPICS;
 
 public class TopicsList extends BasePage {
 
-    protected SelenideElement topicListHeader = $x("//h1[text()='Topics']");
     protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
     protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
     protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
@@ -31,7 +31,7 @@ public class TopicsList extends BasePage {
     @Step
     public TopicsList waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
-        topicListHeader.shouldBe(visible);
+        getPageTitleFromHeader(TOPICS).shouldBe(visible);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index 54f69b5198e..315cf56d187 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -67,8 +67,8 @@ private void createTopic(String clusterName, String topicName) {
     }
 
     @Step
-    public ApiService createTopic(String topicName) {
-        createTopic(CLUSTER_NAME, topicName);
+    public ApiService createTopic(Topic topic) {
+        createTopic(CLUSTER_NAME, topic.getName());
         return this;
     }
 
@@ -133,6 +133,12 @@ public ApiService deleteConnector(String connectName, String connectorName) {
         return this;
     }
 
+    @Step
+    public ApiService deleteConnector(String connectorName) {
+        deleteConnector(CLUSTER_NAME, CONNECT_NAME, connectorName);
+        return this;
+    }
+
     @SneakyThrows
     private void createConnector(String clusterName, String connectName, Connector connector) {
         NewConnector connectorProperties = new NewConnector();
@@ -152,9 +158,15 @@ public ApiService createConnector(String connectName, Connector connector) {
         return this;
     }
 
+    @Step
+    public ApiService createConnector(Connector connector) {
+        createConnector(CLUSTER_NAME, CONNECT_NAME, connector);
+        return this;
+    }
+
     @Step
     public String getFirstConnectName(String clusterName) {
-        return connectorApi().getConnects(clusterName).blockFirst().getName();
+        return Objects.requireNonNull(connectorApi().getConnects(clusterName).blockFirst()).getName();
     }
 
     @SneakyThrows
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
index ebead7b0892..d294c5a1167 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
@@ -8,6 +8,7 @@ public abstract class BaseSource {
     public static final String BASE_CONTAINER_URL = "http://host.testcontainers.internal:8080";
     public static final String BASE_LOCAL_URL = "http://localhost:8080";
     public static final String CLUSTER_NAME = "local";
+    public static final String CONNECT_NAME = "first";
     private static Config config;
     public static final String BROWSER = config().browser();
     public static final String SUITE_NAME = config().suite();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
index b2e7e007e58..dfb42300018 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
@@ -22,7 +22,7 @@
 import java.time.Duration;
 import java.util.List;
 
-import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.*;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.*;
 import static com.provectus.kafka.ui.settings.BaseSource.*;
 import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.*;
 import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
@@ -108,7 +108,7 @@ public void beforeMethod() {
     public void afterMethod() {
         browserClear();
     }
-    
+
     @Step
     protected void navigateToBrokers() {
         naviSideBar
@@ -117,6 +117,17 @@ protected void navigateToBrokers() {
                 .waitUntilScreenReady();
     }
 
+    @Step
+    protected void navigateToBrokersAndOpenDetails(int brokerId) {
+        naviSideBar
+                .openSideMenu(BROKERS);
+        brokersList
+                .waitUntilScreenReady()
+                .openBroker(brokerId);
+        brokersDetails
+                .waitUntilScreenReady();
+    }
+
     @Step
     protected void navigateToTopics() {
         naviSideBar
@@ -135,7 +146,7 @@ protected void navigateToTopicsAndOpenDetails(String topicName) {
         topicDetails
                 .waitUntilScreenReady();
     }
-    
+
     @Step
     protected void navigateToConsumers() {
         naviSideBar
@@ -143,7 +154,7 @@ protected void navigateToConsumers() {
         consumersList
                 .waitUntilScreenReady();
     }
-    
+
     @Step
     protected void navigateToSchemaRegistry() {
         naviSideBar
@@ -151,7 +162,7 @@ protected void navigateToSchemaRegistry() {
         schemaRegistryList
                 .waitUntilScreenReady();
     }
-    
+
     @Step
     protected void navigateToSchemaRegistryAndOpenDetails(String schemaName) {
         navigateToSchemaRegistry();
@@ -160,7 +171,7 @@ protected void navigateToSchemaRegistryAndOpenDetails(String schemaName) {
         schemaDetails
                 .waitUntilScreenReady();
     }
-    
+
     @Step
     protected void navigateToConnectors() {
         naviSideBar
@@ -168,7 +179,7 @@ protected void navigateToConnectors() {
         kafkaConnectList
                 .waitUntilScreenReady();
     }
-    
+
     @Step
     protected void navigateToConnectorsAndOpenDetails(String connectorName) {
         navigateToConnectors();
@@ -177,7 +188,7 @@ protected void navigateToConnectorsAndOpenDetails(String connectorName) {
         connectorDetails
                 .waitUntilScreenReady();
     }
-    
+
     @Step
     protected void navigateToKsqlDb() {
         naviSideBar
@@ -185,7 +196,7 @@ protected void navigateToKsqlDb() {
         ksqlDbList
                 .waitUntilScreenReady();
     }
-    
+
     @Step
     protected void verifyElementsCondition(List<SelenideElement> elementList, Condition expectedCondition) {
         SoftAssert softly = new SoftAssert();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
index c370c01b5fe..67468dbcb02 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui;
 
-import com.provectus.kafka.ui.pages.NaviSideBar;
-import com.provectus.kafka.ui.pages.TopPanel;
+import com.provectus.kafka.ui.pages.panels.NaviSideBar;
+import com.provectus.kafka.ui.pages.panels.TopPanel;
 import com.provectus.kafka.ui.pages.brokers.BrokersConfigTab;
 import com.provectus.kafka.ui.pages.brokers.BrokersDetails;
 import com.provectus.kafka.ui.pages.brokers.BrokersList;
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java
index d9891a0b507..bf9f0c75acc 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java
@@ -11,6 +11,7 @@
 
 import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
 import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.TO_BE_AUTOMATED;
 
 @Listeners(QaseResultListener.class)
 public abstract class BaseManualTest {
@@ -22,7 +23,8 @@ public void beforeSuite() {
 
     @BeforeMethod
     public void beforeMethod(Method method) {
-        if (method.getAnnotation(Automation.class).state().equals(NOT_AUTOMATED))
+        if (method.getAnnotation(Automation.class).state().equals(NOT_AUTOMATED)
+                || method.getAnnotation(Automation.class).state().equals(TO_BE_AUTOMATED))
             throw new SkipException("Skip test exception");
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SanityBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SanityBacklog.java
new file mode 100644
index 00000000000..f09673c8a0e
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SanityBacklog.java
@@ -0,0 +1,19 @@
+package com.provectus.kafka.ui.manualSuite.backlog;
+
+import com.provectus.kafka.ui.manualSuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.TO_BE_AUTOMATED;
+
+public class SanityBacklog extends BaseManualTest {
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @Suite(id = 19)
+    @QaseId(285)
+    @Test
+    public void testCaseA() {
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java
similarity index 53%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/KsqlDbTest.java
rename to kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java
index 443fc85ef27..32edaff8c96 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java
@@ -1,35 +1,61 @@
-package com.provectus.kafka.ui.manualSuite.suite;
+package com.provectus.kafka.ui.manualSuite.backlog;
 
 import com.provectus.kafka.ui.manualSuite.BaseManualTest;
 import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
 import io.qase.api.annotation.QaseId;
 import org.testng.annotations.Test;
 
 import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.TO_BE_AUTOMATED;
 
-public class KsqlDbTest extends BaseManualTest {
+public class SmokeBacklog extends BaseManualTest {
 
     @Automation(state = TO_BE_AUTOMATED)
-    @QaseId(276)
+    @Suite(id = 1)
+    @QaseId(330)
     @Test
     public void testCaseA() {
     }
 
     @Automation(state = TO_BE_AUTOMATED)
-    @QaseId(277)
+    @Suite(id = 8)
+    @QaseId(276)
     @Test
     public void testCaseB() {
     }
 
     @Automation(state = TO_BE_AUTOMATED)
-    @QaseId(278)
+    @Suite(id = 8)
+    @QaseId(277)
     @Test
     public void testCaseC() {
     }
 
     @Automation(state = TO_BE_AUTOMATED)
-    @QaseId(284)
+    @Suite(id = 8)
+    @QaseId(278)
     @Test
     public void testCaseD() {
     }
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @Suite(id = 8)
+    @QaseId(284)
+    @Test
+    public void testCaseE() {
+    }
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @Suite(id = 1)
+    @QaseId(331)
+    @Test
+    public void testCaseF() {
+    }
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @Suite(id = 1)
+    @QaseId(332)
+    @Test
+    public void testCaseG() {
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
index 35188e3f45e..dda8103ffa5 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
@@ -33,69 +33,63 @@ public void testCaseC() {
     public void testCaseD() {
     }
 
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(46)
-    @Test
-    public void testCaseE() {
-    }
-
     @Automation(state = NOT_AUTOMATED)
     @QaseId(47)
     @Test
-    public void testCaseF() {
+    public void testCaseE() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(48)
     @Test
-    public void testCaseG() {
+    public void testCaseF() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(49)
     @Test
-    public void testCaseH() {
+    public void testCaseG() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(50)
     @Test
-    public void testCaseI() {
+    public void testCaseH() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(57)
     @Test
-    public void testCaseJ() {
+    public void testCaseI() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(58)
     @Test
-    public void testCaseK() {
+    public void testCaseJ() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(269)
     @Test
-    public void testCaseL() {
+    public void testCaseK() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(270)
     @Test
-    public void testCaseM() {
+    public void testCaseL() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(271)
     @Test
-    public void testCaseN() {
+    public void testCaseM() {
     }
 
     @Automation(state = NOT_AUTOMATED)
     @QaseId(272)
     @Test
-    public void testCaseO() {
+    public void testCaseN() {
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/WizardTest.java
similarity index 74%
rename from kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/BrokersTest.java
rename to kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/WizardTest.java
index eb31d0c2b1b..e7ae52bdb12 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/BrokersTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/WizardTest.java
@@ -5,12 +5,12 @@
 import io.qase.api.annotation.QaseId;
 import org.testng.annotations.Test;
 
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.TO_BE_AUTOMATED;
+import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
 
-public class BrokersTest extends BaseManualTest {
+public class WizardTest extends BaseManualTest {
 
-    @Automation(state = TO_BE_AUTOMATED)
-    @QaseId(330)
+    @Automation(state = NOT_AUTOMATED)
+    @QaseId(333)
     @Test
     public void testCaseA() {
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java
index 977cbd6dc4a..7b4c34ac05f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java
@@ -9,6 +9,13 @@
 @Listeners(QaseCreateListener.class)
 public abstract class BaseQaseTest {
 
+    protected static final long BROKERS_SUITE_ID = 1;
+    protected static final long CONNECTORS_SUITE_ID = 10;
+    protected static final long KSQL_DB_SUITE_ID = 8;
+    protected static final long SANITY_SUITE_ID = 19;
+    protected static final long SCHEMAS_SUITE_ID = 11;
+    protected static final long TOPICS_SUITE_ID = 2;
+
     @BeforeSuite
     public void beforeSuite() {
         qaseIntegrationSetup();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java
index cf0101fe79f..ca987650dce 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java
@@ -13,7 +13,7 @@ public class Template extends BaseQaseTest {
 
     /**
      * this class is a kind of placeholder or example, use is as template to create new one
-     * copy class into kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/suite
+     * copy Template into kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/
      * place it into regarding folder and rename according to test case summary from Qase.io
      * uncomment @Test and set all annotations according to kafka-ui-e2e-checks/QASE.md
      */
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
index 0ea5d2eb827..aa48cde2fc2 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
@@ -3,20 +3,46 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
+import com.provectus.kafka.ui.models.Connector;
+import com.provectus.kafka.ui.models.Schema;
+import com.provectus.kafka.ui.models.Topic;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.*;
 import static com.provectus.kafka.ui.settings.BaseSource.BROWSER;
+import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
 import static com.provectus.kafka.ui.variables.Browser.LOCAL;
 import static com.provectus.kafka.ui.variables.Url.*;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 public class SmokeTest extends BaseTest {
 
+    private static final int BROKER_ID = 1;
+    private static final Schema TEST_SCHEMA = Schema.createSchemaAvro();
+    private static final Topic TEST_TOPIC = new Topic()
+            .setName("new-topic-" + randomAlphabetic(5))
+            .setNumberOfPartitions(1);
+    private static final Connector TEST_CONNECTOR = new Connector()
+            .setName("new-connector-" + randomAlphabetic(5))
+            .setConfig(getResourceAsString("testData/connectors/config_for_create_connector_via_api.json"));
+
+    @BeforeClass(alwaysRun = true)
+    public void beforeClass() {
+        apiService
+                .createTopic(TEST_TOPIC)
+                .createSchema(TEST_SCHEMA)
+                .createConnector(TEST_CONNECTOR);
+    }
+
     @QaseId(198)
     @Test
     public void checkBasePageElements() {
@@ -45,10 +71,37 @@ public void checkUrlWhileNavigating() {
         verifyCurrentUrl(KSQL_DB_LIST_URL);
     }
 
+    @QaseId(46)
+    @Test
+    public void checkComponentsPathWhileNavigating() {
+        navigateToBrokersAndOpenDetails(BROKER_ID);
+        verifyComponentsPath(BROKERS, String.format("Broker %d", BROKER_ID));
+        navigateToTopicsAndOpenDetails(TEST_TOPIC.getName());
+        verifyComponentsPath(TOPICS, TEST_TOPIC.getName());
+        navigateToSchemaRegistryAndOpenDetails(TEST_SCHEMA.getName());
+        verifyComponentsPath(SCHEMA_REGISTRY, TEST_SCHEMA.getName());
+        navigateToConnectorsAndOpenDetails(TEST_CONNECTOR.getName());
+        verifyComponentsPath(KAFKA_CONNECT, TEST_CONNECTOR.getName());
+    }
+
     @Step
     private void verifyCurrentUrl(String expectedUrl) {
         String host = BROWSER.equals(LOCAL) ? "localhost" : "host.testcontainers.internal";
         Assert.assertEquals(WebDriverRunner.getWebDriver().getCurrentUrl(),
                 String.format(expectedUrl, host), "getCurrentUrl()");
     }
+
+    @Step
+    private void verifyComponentsPath(MenuItem menuItem, String expectedPath) {
+        Assert.assertEquals(naviSideBar.getPagePath(menuItem), expectedPath,
+                String.format("getPagePath() for %s", menuItem.getPageTitle().toUpperCase()));
+    }
+
+    @AfterClass(alwaysRun = true)
+    public void afterClass() {
+        apiService
+                .deleteTopic(TEST_TOPIC.getName())
+                .deleteSchema(TEST_SCHEMA.getName())
+                .deleteConnector(TEST_CONNECTOR.getName());
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
index db1fea805ac..bdce29e153b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
@@ -18,44 +18,42 @@
 
 public class ConnectorsTest extends BaseTest {
 
-    private static final String CONNECT_NAME = "first";
     private static final List<Topic> TOPIC_LIST = new ArrayList<>();
     private static final List<Connector> CONNECTOR_LIST = new ArrayList<>();
     private static final String MESSAGE_CONTENT = "testData/topics/message_content_create_topic.json";
     private static final String MESSAGE_KEY = " ";
     private static final Topic TOPIC_FOR_CREATE = new Topic()
-            .setName("topic_for_create_connector-" + randomAlphabetic(5))
+            .setName("topic-for-create-connector-" + randomAlphabetic(5))
             .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
     private static final Topic TOPIC_FOR_DELETE = new Topic()
-            .setName("topic_for_delete_connector-" + randomAlphabetic(5))
+            .setName("topic-for-delete-connector-" + randomAlphabetic(5))
             .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
     private static final Topic TOPIC_FOR_UPDATE = new Topic()
-            .setName("topic_for_update_connector-" + randomAlphabetic(5))
+            .setName("topic-for-update-connector-" + randomAlphabetic(5))
             .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
     private static final Connector CONNECTOR_FOR_DELETE = new Connector()
-            .setName("sink_postgres_activities_e2e_checks_for_delete-" + randomAlphabetic(5))
+            .setName("connector-for-delete-" + randomAlphabetic(5))
             .setConfig(getResourceAsString("testData/connectors/delete_connector_config.json"));
     private static final Connector CONNECTOR_FOR_UPDATE = new Connector()
-            .setName("sink_postgres_activities_e2e_checks_for_update-" + randomAlphabetic(5))
+            .setName("connector-for-update-and-delete-" + randomAlphabetic(5))
             .setConfig(getResourceAsString("testData/connectors/config_for_create_connector_via_api.json"));
 
     @BeforeClass(alwaysRun = true)
     public void beforeClass() {
         TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
         TOPIC_LIST.forEach(topic -> apiService
-                .createTopic(topic.getName())
+                .createTopic(topic)
                 .sendMessage(topic)
         );
         CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
-        CONNECTOR_LIST.forEach(connector -> apiService
-                .createConnector(CONNECT_NAME, connector));
+        CONNECTOR_LIST.forEach(connector -> apiService.createConnector(connector));
     }
 
     @QaseId(42)
     @Test
     public void createConnector() {
         Connector connectorForCreate = new Connector()
-                .setName("sink_postgres_activities_e2e_checks-" + randomAlphabetic(5))
+                .setName("connector-for-create-" + randomAlphabetic(5))
                 .setConfig(getResourceAsString("testData/connectors/config_for_create_connector.json"));
         navigateToConnectors();
         kafkaConnectList
@@ -102,7 +100,7 @@ public void deleteConnector() {
     @AfterClass(alwaysRun = true)
     public void afterClass() {
         CONNECTOR_LIST.forEach(connector ->
-                apiService.deleteConnector(CONNECT_NAME, connector.getName()));
+                apiService.deleteConnector(connector.getName()));
         TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
     }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
index 18219d965d5..00a0413e7dc 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
@@ -53,7 +53,7 @@ public class MessagesTest extends BaseTest {
     public void beforeClass() {
         TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECK_FILTERS, TOPIC_TO_CLEAR_AND_PURGE_MESSAGES,
                 TOPIC_TO_RECREATE, TOPIC_FOR_CHECK_MESSAGES_COUNT));
-        TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
+        TOPIC_LIST.forEach(topic -> apiService.createTopic(topic));
         IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_FILTERS));
         waitUntilNewMinuteStarted();
         IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_FILTERS));
@@ -75,8 +75,6 @@ public void produceMessage() {
         softly.assertAll();
     }
 
-    @Ignore
-    @Issue("https://github.com/provectus/kafka-ui/issues/2778")
     @QaseId(19)
     @Test(priority = 2)
     public void clearMessage() {
@@ -85,12 +83,13 @@ public void clearMessage() {
                 .openDetailsTab(OVERVIEW);
         int messageAmount = topicDetails.getMessageCountAmount();
         produceMessage(TOPIC_FOR_MESSAGES);
-        Assert.assertEquals(messageAmount + 1, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
+        Assert.assertEquals(topicDetails.getMessageCountAmount(), messageAmount + 1, "getMessageCountAmount()");
         topicDetails
                 .openDotMenu()
                 .clickClearMessagesMenu()
+                .clickConfirmBtnMdl()
                 .waitUntilScreenReady();
-        Assert.assertEquals(0, topicDetails.getMessageCountAmount(), "getMessageCountAmount()");
+        Assert.assertEquals(topicDetails.getMessageCountAmount(), 0, "getMessageCountAmount()");
     }
 
     @QaseId(239)
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
index 92e580ec32c..c3091a61c18 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
@@ -59,7 +59,7 @@ public class TopicsTest extends BaseTest {
     @BeforeClass(alwaysRun = true)
     public void beforeClass() {
         TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE_AND_DELETE, TOPIC_FOR_DELETE, TOPIC_FOR_CHECK_FILTERS));
-        TOPIC_LIST.forEach(topic -> apiService.createTopic(topic.getName()));
+        TOPIC_LIST.forEach(topic -> apiService.createTopic(topic));
     }
 
     @QaseId(199)

From bd6394cb141dc7ae05684265cd0d7ba9bdab5d52 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 21 Mar 2023 21:14:25 +0400
Subject: [PATCH 459/734] Polling timeouts made configurable (#3513)

1. Polling timeouts made configurable
2. polling-related classes moved to emitter package

---------

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/config/ClustersProperties.java   |  9 +++
 .../kafka/ui/emitter/AbstractEmitter.java     | 17 ++--
 .../ui/emitter/BackwardRecordEmitter.java     | 24 +++---
 .../kafka/ui/emitter/EmptyPollsCounter.java   | 28 +++++++
 .../ui/emitter/ForwardRecordEmitter.java      | 13 ++-
 .../kafka/ui/emitter/PollingSettings.java     | 79 +++++++++++++++++++
 .../{util => emitter}/PollingThrottler.java   |  3 +-
 .../{util => emitter}/ResultSizeLimiter.java  |  2 +-
 .../kafka/ui/emitter/TailingEmitter.java      |  5 +-
 .../kafka/ui/model/KafkaCluster.java          |  5 +-
 .../kafka/ui/service/ClustersStorage.java     |  2 +-
 .../kafka/ui/service/KafkaClusterFactory.java |  7 +-
 .../kafka/ui/service/MessagesService.java     |  8 +-
 .../service/analyze/TopicAnalysisService.java | 19 ++---
 .../kafka/ui/service/RecordEmitterTest.java   | 22 +++---
 .../kafka/ui/util/PollingThrottlerTest.java   |  1 +
 .../main/resources/swagger/kafka-ui-api.yaml  |  9 +++
 17 files changed, 184 insertions(+), 69 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingSettings.java
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/{util => emitter}/PollingThrottler.java (94%)
 rename kafka-ui-api/src/main/java/com/provectus/kafka/ui/{util => emitter}/ResultSizeLimiter.java (93%)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 7b6b494ad12..919e0633e4f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -27,6 +27,8 @@ public class ClustersProperties {
 
   String internalTopicPrefix;
 
+  PollingProperties polling = new PollingProperties();
+
   @Data
   public static class Cluster {
     String name;
@@ -49,6 +51,13 @@ public static class Cluster {
     TruststoreConfig ssl;
   }
 
+  @Data
+  public static class PollingProperties {
+    Integer pollTimeoutMs;
+    Integer partitionPollTimeout;
+    Integer noDataEmptyPolls;
+  }
+
   @Data
   @ToString(exclude = "password")
   public static class MetricsConfigData {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
index 7cd01061d04..646cf81ca67 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
@@ -4,7 +4,6 @@
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.model.TopicMessagePhaseDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
-import com.provectus.kafka.ui.util.PollingThrottler;
 import java.time.Duration;
 import java.time.Instant;
 import org.apache.kafka.clients.consumer.Consumer;
@@ -14,27 +13,21 @@
 import reactor.core.publisher.FluxSink;
 
 public abstract class AbstractEmitter {
-  private static final Duration DEFAULT_POLL_TIMEOUT_MS = Duration.ofMillis(1000L);
-
-  // In some situations it is hard to say whether records range (between two offsets) was fully polled.
-  // This happens when we have holes in records sequences that is usual case for compact topics or
-  // topics with transactional writes. In such cases if you want to poll all records between offsets X and Y
-  // there is no guarantee that you will ever see record with offset Y.
-  // To workaround this we can assume that after N consecutive empty polls all target messages were read.
-  public static final int NO_MORE_DATA_EMPTY_POLLS_COUNT = 3;
 
   private final ConsumerRecordDeserializer recordDeserializer;
   private final ConsumingStats consumingStats = new ConsumingStats();
   private final PollingThrottler throttler;
+  protected final PollingSettings pollingSettings;
 
-  protected AbstractEmitter(ConsumerRecordDeserializer recordDeserializer, PollingThrottler throttler) {
+  protected AbstractEmitter(ConsumerRecordDeserializer recordDeserializer, PollingSettings pollingSettings) {
     this.recordDeserializer = recordDeserializer;
-    this.throttler = throttler;
+    this.pollingSettings = pollingSettings;
+    this.throttler = pollingSettings.getPollingThrottler();
   }
 
   protected ConsumerRecords<Bytes, Bytes> poll(
       FluxSink<TopicMessageEventDTO> sink, Consumer<Bytes, Bytes> consumer) {
-    return poll(sink, consumer, DEFAULT_POLL_TIMEOUT_MS);
+    return poll(sink, consumer, pollingSettings.getPollTimeout());
   }
 
   protected ConsumerRecords<Bytes, Bytes> poll(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
index 996f8b9f70c..42f94a1e019 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
@@ -3,15 +3,12 @@
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
-import com.provectus.kafka.ui.util.PollingThrottler;
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.TreeMap;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -26,8 +23,6 @@ public class BackwardRecordEmitter
     extends AbstractEmitter
     implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
 
-  private static final Duration POLL_TIMEOUT = Duration.ofMillis(200);
-
   private final Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier;
   private final ConsumerPosition consumerPosition;
   private final int messagesPerPage;
@@ -37,8 +32,8 @@ public BackwardRecordEmitter(
       ConsumerPosition consumerPosition,
       int messagesPerPage,
       ConsumerRecordDeserializer recordDeserializer,
-      PollingThrottler throttler) {
-    super(recordDeserializer, throttler);
+      PollingSettings pollingSettings) {
+    super(recordDeserializer, pollingSettings);
     this.consumerPosition = consumerPosition;
     this.messagesPerPage = messagesPerPage;
     this.consumerSupplier = consumerSupplier;
@@ -109,17 +104,18 @@ private List<ConsumerRecord<Bytes, Bytes>> partitionPollIteration(
 
     var recordsToSend = new ArrayList<ConsumerRecord<Bytes, Bytes>>();
 
-    // we use empty polls counting to verify that partition was fully read
-    for (int emptyPolls = 0; recordsToSend.size() < desiredMsgsToPoll && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT;) {
-      var polledRecords = poll(sink, consumer, POLL_TIMEOUT);
-      log.debug("{} records polled from {}", polledRecords.count(), tp);
+    EmptyPollsCounter emptyPolls  = pollingSettings.createEmptyPollsCounter();
+    while (!sink.isCancelled()
+        && recordsToSend.size() < desiredMsgsToPoll
+        && !emptyPolls.noDataEmptyPollsReached()) {
+      var polledRecords = poll(sink, consumer, pollingSettings.getPartitionPollTimeout());
+      emptyPolls.count(polledRecords);
 
-      // counting sequential empty polls
-      emptyPolls = polledRecords.isEmpty() ? emptyPolls + 1 : 0;
+      log.debug("{} records polled from {}", polledRecords.count(), tp);
 
       var filteredRecords = polledRecords.records(tp).stream()
           .filter(r -> r.offset() < toOffset)
-          .collect(Collectors.toList());
+          .toList();
 
       if (!polledRecords.isEmpty() && filteredRecords.isEmpty()) {
         // we already read all messages in target offsets interval
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java
new file mode 100644
index 00000000000..3bc2ca38c1d
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java
@@ -0,0 +1,28 @@
+package com.provectus.kafka.ui.emitter;
+
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+
+// In some situations it is hard to say whether records range (between two offsets) was fully polled.
+// This happens when we have holes in records sequences that is usual case for compact topics or
+// topics with transactional writes. In such cases if you want to poll all records between offsets X and Y
+// there is no guarantee that you will ever see record with offset Y.
+// To workaround this we can assume that after N consecutive empty polls all target messages were read.
+public class EmptyPollsCounter {
+
+  private final int maxEmptyPolls;
+
+  private int emptyPolls = 0;
+
+  EmptyPollsCounter(int maxEmptyPolls) {
+    this.maxEmptyPolls = maxEmptyPolls;
+  }
+
+  public void count(ConsumerRecords<?, ?> polled) {
+    emptyPolls = polled.isEmpty() ? emptyPolls + 1 : 0;
+  }
+
+  public boolean noDataEmptyPollsReached() {
+    return emptyPolls >= maxEmptyPolls;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
index 9fadb149d48..971e2f7c9c4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
@@ -3,7 +3,6 @@
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
-import com.provectus.kafka.ui.util.PollingThrottler;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -25,8 +24,8 @@ public ForwardRecordEmitter(
       Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
       ConsumerPosition position,
       ConsumerRecordDeserializer recordDeserializer,
-      PollingThrottler throttler) {
-    super(recordDeserializer, throttler);
+      PollingSettings pollingSettings) {
+    super(recordDeserializer, pollingSettings);
     this.position = position;
     this.consumerSupplier = consumerSupplier;
   }
@@ -39,16 +38,16 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
       var seekOperations = SeekOperations.create(consumer, position);
       seekOperations.assignAndSeekNonEmptyPartitions();
 
-      // we use empty polls counting to verify that topic was fully read
-      int emptyPolls = 0;
+      EmptyPollsCounter emptyPolls = pollingSettings.createEmptyPollsCounter();
       while (!sink.isCancelled()
           && !seekOperations.assignedPartitionsFullyPolled()
-          && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT) {
+          && !emptyPolls.noDataEmptyPollsReached()) {
 
         sendPhase(sink, "Polling");
         ConsumerRecords<Bytes, Bytes> records = poll(sink, consumer);
+        emptyPolls.count(records);
+
         log.debug("{} records polled", records.count());
-        emptyPolls = records.isEmpty() ? emptyPolls + 1 : 0;
 
         for (ConsumerRecord<Bytes, Bytes> msg : records) {
           if (!sink.isCancelled()) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingSettings.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingSettings.java
new file mode 100644
index 00000000000..0c3dfcfbab4
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingSettings.java
@@ -0,0 +1,79 @@
+package com.provectus.kafka.ui.emitter;
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import java.time.Duration;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+public class PollingSettings {
+
+  private static final Duration DEFAULT_POLL_TIMEOUT = Duration.ofMillis(1_000);
+  private static final Duration DEFAULT_PARTITION_POLL_TIMEOUT = Duration.ofMillis(200);
+  private static final int DEFAULT_NO_DATA_EMPTY_POLLS = 3;
+
+  private final Duration pollTimeout;
+  private final Duration partitionPollTimeout;
+  private final int notDataEmptyPolls; //see EmptyPollsCounter docs
+
+  private final Supplier<PollingThrottler> throttlerSupplier;
+
+  public static PollingSettings create(ClustersProperties.Cluster cluster,
+                                       ClustersProperties clustersProperties) {
+    var pollingProps = Optional.ofNullable(clustersProperties.getPolling())
+        .orElseGet(ClustersProperties.PollingProperties::new);
+
+    var pollTimeout = pollingProps.getPollTimeoutMs() != null
+        ? Duration.ofMillis(pollingProps.getPollTimeoutMs())
+        : DEFAULT_POLL_TIMEOUT;
+
+    var partitionPollTimeout = pollingProps.getPartitionPollTimeout() != null
+        ? Duration.ofMillis(pollingProps.getPartitionPollTimeout())
+        : Duration.ofMillis(pollTimeout.toMillis() / 5);
+
+    int noDataEmptyPolls = pollingProps.getNoDataEmptyPolls() != null
+        ? pollingProps.getNoDataEmptyPolls()
+        : DEFAULT_NO_DATA_EMPTY_POLLS;
+
+    return new PollingSettings(
+        pollTimeout,
+        partitionPollTimeout,
+        noDataEmptyPolls,
+        PollingThrottler.throttlerSupplier(cluster)
+    );
+  }
+
+  public static PollingSettings createDefault() {
+    return new PollingSettings(
+        DEFAULT_POLL_TIMEOUT,
+        DEFAULT_PARTITION_POLL_TIMEOUT,
+        DEFAULT_NO_DATA_EMPTY_POLLS,
+        PollingThrottler::noop
+    );
+  }
+
+  private PollingSettings(Duration pollTimeout,
+                          Duration partitionPollTimeout,
+                          int notDataEmptyPolls,
+                          Supplier<PollingThrottler> throttlerSupplier) {
+    this.pollTimeout = pollTimeout;
+    this.partitionPollTimeout = partitionPollTimeout;
+    this.notDataEmptyPolls = notDataEmptyPolls;
+    this.throttlerSupplier = throttlerSupplier;
+  }
+
+  public EmptyPollsCounter createEmptyPollsCounter() {
+    return new EmptyPollsCounter(notDataEmptyPolls);
+  }
+
+  public Duration getPollTimeout() {
+    return pollTimeout;
+  }
+
+  public Duration getPartitionPollTimeout() {
+    return partitionPollTimeout;
+  }
+
+  public PollingThrottler getPollingThrottler() {
+    return throttlerSupplier.get();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingThrottler.java
similarity index 94%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingThrottler.java
index bd2e97da97a..15dfcd91c94 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/PollingThrottler.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingThrottler.java
@@ -1,8 +1,9 @@
-package com.provectus.kafka.ui.util;
+package com.provectus.kafka.ui.emitter;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.RateLimiter;
 import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.util.ConsumerRecordsUtil;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ResultSizeLimiter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ResultSizeLimiter.java
similarity index 93%
rename from kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ResultSizeLimiter.java
rename to kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ResultSizeLimiter.java
index 64fcb215090..a0fa5bcb938 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ResultSizeLimiter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ResultSizeLimiter.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.util;
+package com.provectus.kafka.ui.emitter;
 
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
index 06cd8dad998..4554069c1c9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
@@ -3,7 +3,6 @@
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
-import com.provectus.kafka.ui.util.PollingThrottler;
 import java.util.HashMap;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
@@ -22,8 +21,8 @@ public class TailingEmitter extends AbstractEmitter
   public TailingEmitter(Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
                         ConsumerPosition consumerPosition,
                         ConsumerRecordDeserializer recordDeserializer,
-                        PollingThrottler throttler) {
-    super(recordDeserializer, throttler);
+                        PollingSettings pollingSettings) {
+    super(recordDeserializer, pollingSettings);
     this.consumerSupplier = consumerSupplier;
     this.consumerPosition = consumerPosition;
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
index 9933d7e4675..1e2903dbcc9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/KafkaCluster.java
@@ -2,14 +2,13 @@
 
 import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
+import com.provectus.kafka.ui.emitter.PollingSettings;
 import com.provectus.kafka.ui.service.ksql.KsqlApiClient;
 import com.provectus.kafka.ui.service.masking.DataMasking;
 import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
-import com.provectus.kafka.ui.util.PollingThrottler;
 import com.provectus.kafka.ui.util.ReactiveFailover;
 import java.util.Map;
 import java.util.Properties;
-import java.util.function.Supplier;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -28,7 +27,7 @@ public class KafkaCluster {
   private final boolean readOnly;
   private final MetricsConfig metricsConfig;
   private final DataMasking masking;
-  private final Supplier<PollingThrottler> throttler;
+  private final PollingSettings pollingSettings;
   private final ReactiveFailover<KafkaSrClientApi> schemaRegistryClient;
   private final Map<String, ReactiveFailover<KafkaConnectClientApi>> connectsClients;
   private final ReactiveFailover<KsqlApiClient> ksqlClient;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStorage.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStorage.java
index c0143ad8c59..ee08d6392d8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStorage.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ClustersStorage.java
@@ -14,7 +14,7 @@ public class ClustersStorage {
 
   public ClustersStorage(ClustersProperties properties, KafkaClusterFactory factory) {
     var builder = ImmutableMap.<String, KafkaCluster>builder();
-    properties.getClusters().forEach(c -> builder.put(c.getName(), factory.create(c)));
+    properties.getClusters().forEach(c -> builder.put(c.getName(), factory.create(properties, c)));
     this.kafkaClusters = builder.build();
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
index 26a9d40647f..357a548a637 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
@@ -3,6 +3,7 @@
 import com.provectus.kafka.ui.client.RetryingKafkaConnectClient;
 import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
+import com.provectus.kafka.ui.emitter.PollingSettings;
 import com.provectus.kafka.ui.model.ApplicationPropertyValidationDTO;
 import com.provectus.kafka.ui.model.ClusterConfigValidationDTO;
 import com.provectus.kafka.ui.model.KafkaCluster;
@@ -12,7 +13,6 @@
 import com.provectus.kafka.ui.sr.ApiClient;
 import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
 import com.provectus.kafka.ui.util.KafkaServicesValidation;
-import com.provectus.kafka.ui.util.PollingThrottler;
 import com.provectus.kafka.ui.util.ReactiveFailover;
 import com.provectus.kafka.ui.util.WebClientConfigurator;
 import java.util.HashMap;
@@ -41,7 +41,8 @@ public class KafkaClusterFactory {
   @Value("${webclient.max-in-memory-buffer-size:20MB}")
   private DataSize maxBuffSize;
 
-  public KafkaCluster create(ClustersProperties.Cluster clusterProperties) {
+  public KafkaCluster create(ClustersProperties properties,
+                             ClustersProperties.Cluster clusterProperties) {
     KafkaCluster.KafkaClusterBuilder builder = KafkaCluster.builder();
 
     builder.name(clusterProperties.getName());
@@ -49,7 +50,7 @@ public KafkaCluster create(ClustersProperties.Cluster clusterProperties) {
     builder.properties(convertProperties(clusterProperties.getProperties()));
     builder.readOnly(clusterProperties.isReadOnly());
     builder.masking(DataMasking.create(clusterProperties.getMasking()));
-    builder.throttler(PollingThrottler.throttlerSupplier(clusterProperties));
+    builder.pollingSettings(PollingSettings.create(clusterProperties, properties));
 
     if (schemaRegistryConfigured(clusterProperties)) {
       builder.schemaRegistryClient(schemaRegistryClient(clusterProperties));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index d1f0e261a8c..27f751ac80a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -5,6 +5,7 @@
 import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.MessageFilterStats;
 import com.provectus.kafka.ui.emitter.MessageFilters;
+import com.provectus.kafka.ui.emitter.ResultSizeLimiter;
 import com.provectus.kafka.ui.emitter.TailingEmitter;
 import com.provectus.kafka.ui.exception.TopicNotFoundException;
 import com.provectus.kafka.ui.exception.ValidationException;
@@ -17,7 +18,6 @@
 import com.provectus.kafka.ui.serde.api.Serde;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
-import com.provectus.kafka.ui.util.ResultSizeLimiter;
 import com.provectus.kafka.ui.util.SslPropertiesUtil;
 import java.util.List;
 import java.util.Map;
@@ -169,7 +169,7 @@ private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
           () -> consumerGroupService.createConsumer(cluster),
           consumerPosition,
           recordDeserializer,
-          cluster.getThrottler().get()
+          cluster.getPollingSettings()
       );
     } else if (seekDirection.equals(SeekDirectionDTO.BACKWARD)) {
       emitter = new BackwardRecordEmitter(
@@ -177,14 +177,14 @@ private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
           consumerPosition,
           limit,
           recordDeserializer,
-          cluster.getThrottler().get()
+          cluster.getPollingSettings()
       );
     } else {
       emitter = new TailingEmitter(
           () -> consumerGroupService.createConsumer(cluster),
           consumerPosition,
           recordDeserializer,
-          cluster.getThrottler().get()
+          cluster.getPollingSettings()
       );
     }
     MessageFilterStats filterStats = new MessageFilterStats();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
index 9b6bd787671..7ea7a165983 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
@@ -1,14 +1,14 @@
 package com.provectus.kafka.ui.service.analyze;
 
-import static com.provectus.kafka.ui.emitter.AbstractEmitter.NO_MORE_DATA_EMPTY_POLLS_COUNT;
-
+import com.provectus.kafka.ui.emitter.EmptyPollsCounter;
 import com.provectus.kafka.ui.emitter.OffsetsInfo;
+import com.provectus.kafka.ui.emitter.PollingSettings;
+import com.provectus.kafka.ui.emitter.PollingThrottler;
 import com.provectus.kafka.ui.exception.TopicAnalysisException;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.TopicAnalysisDTO;
 import com.provectus.kafka.ui.service.ConsumerGroupService;
 import com.provectus.kafka.ui.service.TopicsService;
-import com.provectus.kafka.ui.util.PollingThrottler;
 import java.io.Closeable;
 import java.time.Duration;
 import java.time.Instant;
@@ -63,7 +63,7 @@ private synchronized void startAnalysis(KafkaCluster cluster,
     if (analysisTasksStore.isAnalysisInProgress(topicId)) {
       throw new TopicAnalysisException("Topic is already analyzing");
     }
-    var task = new AnalysisTask(cluster, topicId, partitionsCnt, approxNumberOfMsgs, cluster.getThrottler().get());
+    var task = new AnalysisTask(cluster, topicId, partitionsCnt, approxNumberOfMsgs, cluster.getPollingSettings());
     analysisTasksStore.registerNewTask(topicId, task);
     Schedulers.boundedElastic().schedule(task);
   }
@@ -83,6 +83,7 @@ class AnalysisTask implements Runnable, Closeable {
     private final TopicIdentity topicId;
     private final int partitionsCnt;
     private final long approxNumberOfMsgs;
+    private final EmptyPollsCounter emptyPollsCounter;
     private final PollingThrottler throttler;
 
     private final TopicAnalysisStats totalStats = new TopicAnalysisStats();
@@ -91,7 +92,7 @@ class AnalysisTask implements Runnable, Closeable {
     private final KafkaConsumer<Bytes, Bytes> consumer;
 
     AnalysisTask(KafkaCluster cluster, TopicIdentity topicId, int partitionsCnt,
-                 long approxNumberOfMsgs, PollingThrottler throttler) {
+                 long approxNumberOfMsgs, PollingSettings pollingSettings) {
       this.topicId = topicId;
       this.approxNumberOfMsgs = approxNumberOfMsgs;
       this.partitionsCnt = partitionsCnt;
@@ -103,7 +104,8 @@ class AnalysisTask implements Runnable, Closeable {
               ConsumerConfig.MAX_POLL_RECORDS_CONFIG, "100000"
           )
       );
-      this.throttler = throttler;
+      this.throttler = pollingSettings.getPollingThrottler();
+      this.emptyPollsCounter = pollingSettings.createEmptyPollsCounter();
     }
 
     @Override
@@ -124,11 +126,10 @@ public void run() {
         consumer.seekToBeginning(topicPartitions);
 
         var offsetsInfo = new OffsetsInfo(consumer, topicId.topicName);
-        for (int emptyPolls = 0; !offsetsInfo.assignedPartitionsFullyPolled()
-            && emptyPolls < NO_MORE_DATA_EMPTY_POLLS_COUNT;) {
+        while (!offsetsInfo.assignedPartitionsFullyPolled() && !emptyPollsCounter.noDataEmptyPollsReached()) {
           var polled = consumer.poll(Duration.ofSeconds(3));
           throttler.throttleAfterPoll(polled);
-          emptyPolls = polled.isEmpty() ? emptyPolls + 1 : 0;
+          emptyPollsCounter.count(polled);
           polled.forEach(r -> {
             totalStats.apply(r);
             partitionStats.get(r.partition()).apply(r);
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
index 79e81a180fc..e7b9edf834d 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
@@ -9,6 +9,7 @@
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.emitter.BackwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
+import com.provectus.kafka.ui.emitter.PollingSettings;
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.producer.KafkaTestProducer;
@@ -16,7 +17,6 @@
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
 import com.provectus.kafka.ui.serdes.builtin.StringSerde;
-import com.provectus.kafka.ui.util.PollingThrottler;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -112,7 +112,7 @@ void pollNothingOnEmptyTopic() {
         this::createConsumer,
         new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
@@ -120,7 +120,7 @@ void pollNothingOnEmptyTopic() {
         new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
         100,
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     StepVerifier.create(Flux.create(forwardEmitter))
@@ -142,7 +142,7 @@ void pollFullTopicFromBeginning() {
         this::createConsumer,
         new ConsumerPosition(BEGINNING, TOPIC, null),
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
@@ -150,7 +150,7 @@ void pollFullTopicFromBeginning() {
         new ConsumerPosition(LATEST, TOPIC, null),
         PARTITIONS * MSGS_PER_PARTITION,
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     List<String> expectedValues = SENT_RECORDS.stream().map(Record::getValue).collect(Collectors.toList());
@@ -171,7 +171,7 @@ void pollWithOffsets() {
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
@@ -179,7 +179,7 @@ void pollWithOffsets() {
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
         PARTITIONS * MSGS_PER_PARTITION,
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -216,7 +216,7 @@ void pollWithTimestamps() {
         this::createConsumer,
         new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     var backwardEmitter = new BackwardRecordEmitter(
@@ -224,7 +224,7 @@ void pollWithTimestamps() {
         new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
         PARTITIONS * MSGS_PER_PARTITION,
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -255,7 +255,7 @@ void backwardEmitterSeekToEnd() {
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
         numMessages,
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     var expectedValues = SENT_RECORDS.stream()
@@ -281,7 +281,7 @@ void backwardEmitterSeekToBegin() {
         new ConsumerPosition(OFFSET, TOPIC, offsets),
         100,
         RECORD_DESERIALIZER,
-        PollingThrottler.noop()
+        PollingSettings.createDefault()
     );
 
     expectEmitter(backwardEmitter,
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/PollingThrottlerTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/PollingThrottlerTest.java
index ab333cb11a4..2efe7562df9 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/PollingThrottlerTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/PollingThrottlerTest.java
@@ -5,6 +5,7 @@
 
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.RateLimiter;
+import com.provectus.kafka.ui.emitter.PollingThrottler;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 71c595e5251..ea335f282cf 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -3445,6 +3445,15 @@ components:
             kafka:
               type: object
               properties:
+                polling:
+                  type: object
+                  properties:
+                    pollTimeoutMs:
+                      type: integer
+                    partitionPollTimeout:
+                      type: integer
+                    noDataEmptyPolls:
+                      type: integer
                 clusters:
                   type: array
                   items:

From 5b726e84fa4c4725c7649e69d0787a07169803d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Mar 2023 16:58:09 +0400
Subject: [PATCH 460/734] Bump maven-javadoc-plugin from 3.4.1 to 3.5.0 (#3509)

Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-serde-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-serde-api/pom.xml b/kafka-ui-serde-api/pom.xml
index ad0a88ca403..db20926257b 100644
--- a/kafka-ui-serde-api/pom.xml
+++ b/kafka-ui-serde-api/pom.xml
@@ -87,7 +87,7 @@
 					<configuration>
 						<source>8</source>
 					</configuration>
-					<version>3.4.1</version>
+					<version>3.5.0</version>
 					<executions>
 						<execution>
 							<id>attach-javadocs</id>

From 75a6282a84d77b15fbaaf7e382107a86e2e20f0f Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 22 Mar 2023 16:14:52 +0300
Subject: [PATCH 461/734] [Infra] Chore: Upgrade aws creds action (#3533)

---
 .github/workflows/aws_publisher.yaml             | 2 +-
 .github/workflows/branch-deploy.yml              | 2 +-
 .github/workflows/build-public-image.yml         | 2 +-
 .github/workflows/delete-public-image.yml        | 2 +-
 .github/workflows/e2e-automation.yml             | 2 +-
 .github/workflows/e2e-checks.yaml                | 2 +-
 .github/workflows/e2e-weekly.yml                 | 2 +-
 .github/workflows/separate_env_public_create.yml | 2 +-
 .github/workflows/terraform-deploy.yml           | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/aws_publisher.yaml b/.github/workflows/aws_publisher.yaml
index c7b80c54f97..8cdf3751ebb 100644
--- a/.github/workflows/aws_publisher.yaml
+++ b/.github/workflows/aws_publisher.yaml
@@ -31,7 +31,7 @@ jobs:
           echo "Packer will be triggered in this dir $WORK_DIR"
 
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_AMI_PUBLISH_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_AMI_PUBLISH_KEY_SECRET }}
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 0e4a171aec5..3039958b5ad 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -45,7 +45,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index e965f6c6722..7a5e3b4ca6b 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -42,7 +42,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/delete-public-image.yml b/.github/workflows/delete-public-image.yml
index 56c795d0b54..c335bb8050f 100644
--- a/.github/workflows/delete-public-image.yml
+++ b/.github/workflows/delete-public-image.yml
@@ -15,7 +15,7 @@ jobs:
           tag='${{ github.event.pull_request.number }}'
           echo "tag=${tag}" >> $GITHUB_OUTPUT
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/e2e-automation.yml b/.github/workflows/e2e-automation.yml
index b21fa18ce84..eb109857473 100644
--- a/.github/workflows/e2e-automation.yml
+++ b/.github/workflows/e2e-automation.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           ref: ${{ github.sha }}
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 962a1346849..83be371bea0 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -16,7 +16,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/e2e-weekly.yml b/.github/workflows/e2e-weekly.yml
index 80f7a9393df..4683c7e1114 100644
--- a/.github/workflows/e2e-weekly.yml
+++ b/.github/workflows/e2e-weekly.yml
@@ -11,7 +11,7 @@ jobs:
         with:
           ref: ${{ github.sha }}
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
index 1b7085d9366..ad5f0e47e75 100644
--- a/.github/workflows/separate_env_public_create.yml
+++ b/.github/workflows/separate_env_public_create.yml
@@ -47,7 +47,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/terraform-deploy.yml b/.github/workflows/terraform-deploy.yml
index c6163ef90f4..902f9c385b2 100644
--- a/.github/workflows/terraform-deploy.yml
+++ b/.github/workflows/terraform-deploy.yml
@@ -26,7 +26,7 @@ jobs:
           echo "Terraform will be triggered in this dir $TF_DIR"
 
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

From d8289d2ee676a7f4de7e8aebfbe73aa809a80955 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 23 Mar 2023 14:46:59 +0400
Subject: [PATCH 462/734] CORS configuration bean added (#3529)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../ui/config/CorsGlobalConfiguration.java    | 42 +------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java
index 0128110ab72..c6c88bfa984 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java
@@ -1,25 +1,12 @@
 package com.provectus.kafka.ui.config;
 
-import lombok.AllArgsConstructor;
-import org.springframework.boot.autoconfigure.web.ServerProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.util.StringUtils;
 import org.springframework.web.reactive.config.CorsRegistry;
 import org.springframework.web.reactive.config.WebFluxConfigurer;
-import org.springframework.web.reactive.function.server.RouterFunction;
-import org.springframework.web.reactive.function.server.RouterFunctions;
-import org.springframework.web.reactive.function.server.ServerResponse;
 
 @Configuration
-@Profile("local")
-@AllArgsConstructor
 public class CorsGlobalConfiguration implements WebFluxConfigurer {
 
-  private final ServerProperties serverProperties;
-
   @Override
   public void addCorsMappings(CorsRegistry registry) {
     registry.addMapping("/**")
@@ -28,31 +15,4 @@ public void addCorsMappings(CorsRegistry registry) {
         .allowedHeaders("*")
         .allowCredentials(false);
   }
-
-  private String withContext(String pattern) {
-    final String basePath = serverProperties.getServlet().getContextPath();
-    if (StringUtils.hasText(basePath)) {
-      return basePath + pattern;
-    } else {
-      return pattern;
-    }
-  }
-
-  @Bean
-  public RouterFunction<ServerResponse> cssFilesRouter() {
-    return RouterFunctions
-        .resources(withContext("/static/css/**"), new ClassPathResource("static/static/css/"));
-  }
-
-  @Bean
-  public RouterFunction<ServerResponse> jsFilesRouter() {
-    return RouterFunctions
-        .resources(withContext("/static/js/**"), new ClassPathResource("static/static/js/"));
-  }
-
-  @Bean
-  public RouterFunction<ServerResponse> mediaFilesRouter() {
-    return RouterFunctions
-        .resources(withContext("/static/media/**"), new ClassPathResource("static/static/media/"));
-  }
-}
\ No newline at end of file
+}

From 84d3b329ba876bfc78e8b7a73c7174695c738ade Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Thu, 23 Mar 2023 16:36:29 +0300
Subject: [PATCH 463/734] Migrate KSQL to RQ. Get rid of redux reducer (#3478)

* Migrate KSQL to RQ. Get rid of redux reducer

* refactor react-ace using

* get rid of deadcode

* ace

* Fix add/remove stream props

* ace

* Fix Clear result handler

* Fix error handler

* rollback removal of yup async validation helper

* reduce re-renders

* move ace to separate chunk

* upd KsqlQueryForm

* feedback

---------

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../kafka/ui/pages/ksqlDb/KsqlQueryForm.java  |   3 +-
 kafka-ui-react-app/src/components/App.tsx     |   3 +
 .../src/components/KsqlDb/KsqlDb.tsx          | 108 ++++++-
 .../KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx     |  58 ----
 .../KsqlDbItem/__test__/KsqlDbItem.spec.tsx   |  59 ----
 .../List/KsqlDbItem/utils/ksqlRowData.ts      |  12 -
 .../src/components/KsqlDb/List/List.tsx       | 111 -------
 .../KsqlDb/List/__test__/List.spec.tsx        |  22 --
 .../components/KsqlDb/Query/Query.styled.ts   |   9 -
 .../src/components/KsqlDb/Query/Query.tsx     | 241 +++------------
 .../Query/QueryForm/QueryForm.styled.ts       |  63 +---
 .../KsqlDb/Query/QueryForm/QueryForm.tsx      | 292 +++++++++---------
 .../QueryForm/__test__/QueryForm.spec.tsx     | 189 ------------
 .../KsqlDb/Query/__test__/Query.spec.tsx      | 116 -------
 .../renderer/TableRenderer/TableRenderer.tsx  |  18 +-
 .../__test__/TableRenderer.spec.tsx           |  71 -----
 .../src/components/KsqlDb/TableView.tsx       |  39 +++
 .../KsqlDb/__test__/KsqlDb.spec.tsx           |  42 ---
 .../Schemas/Details/__test__/fixtures.ts      |   6 -
 .../ActionComponent/__tests__/fixtures.ts     |   2 +-
 .../common/DiffViewer/DiffViewer.tsx          |   1 +
 .../src/components/common/Editor/Editor.tsx   |   4 +-
 .../common/NewTable/TimestampCell copy.tsx    |  11 -
 .../components/common/SQLEditor/SQLEditor.tsx |   4 +-
 .../src/components/common/Tooltip/Tooltip.tsx |   4 +-
 .../table/TableTitle/TableTitle.styled.tsx    |   2 +-
 .../src/lib/hooks/__tests__/fixtures.ts       |   2 +-
 .../src/lib/hooks/api/kafkaConnect.ts         |   2 +-
 .../src/lib/hooks/api/ksqlDb.tsx              | 184 +++++++++++
 .../src/lib/hooks/useMessageFiltersStore.ts   |   2 +-
 kafka-ui-react-app/src/lib/paths.ts           |   4 +-
 kafka-ui-react-app/src/lib/yupExtended.ts     |   3 +-
 .../src/redux/interfaces/ksqlDb.ts            |  19 --
 .../src/redux/reducers/index.ts               |   2 -
 .../reducers/ksqlDb/__test__/fixtures.ts      |  43 ---
 .../ksqlDb/__test__/selectors.spec.ts         |  51 ---
 .../src/redux/reducers/ksqlDb/ksqlDbSlice.ts  |  75 -----
 .../src/redux/reducers/ksqlDb/selectors.ts    |  33 --
 kafka-ui-react-app/vite.config.ts             |   7 +
 39 files changed, 543 insertions(+), 1374 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData.ts
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/Query/Query.styled.ts
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/__test__/TableRenderer.spec.tsx
 create mode 100644 kafka-ui-react-app/src/components/KsqlDb/TableView.tsx
 delete mode 100644 kafka-ui-react-app/src/components/KsqlDb/__test__/KsqlDb.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/common/NewTable/TimestampCell copy.tsx
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/ksqlDb.tsx
 delete mode 100644 kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/selectors.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/ksqlDb/selectors.ts

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
index 30ac1007fdb..df915c00986 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
@@ -16,7 +16,6 @@
 import static com.codeborne.selenide.Selenide.$x;
 
 public class KsqlQueryForm extends BasePage {
-    protected SelenideElement pageTitle = $x("//h1[text()='Query']");
     protected SelenideElement clearBtn = $x("//div/button[text()='Clear']");
     protected SelenideElement executeBtn = $x("//div/button[text()='Execute']");
     protected SelenideElement stopQueryBtn = $x("//div/button[text()='Stop query']");
@@ -31,7 +30,7 @@ public class KsqlQueryForm extends BasePage {
     @Step
     public KsqlQueryForm waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
-        pageTitle.shouldBe(Condition.visible);
+        executeBtn.shouldBe(Condition.visible);
         return this;
     }
 
diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 6107e3ade74..44409c403ab 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -30,6 +30,9 @@ const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
       suspense: true,
+      onError(error) {
+        showServerError(error as Response);
+      },
     },
     mutations: {
       onError(error) {
diff --git a/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx b/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx
index 12a3f8cbfa2..d105720aa7f 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/KsqlDb.tsx
@@ -1,15 +1,109 @@
 import React from 'react';
-import { Route, Routes } from 'react-router-dom';
-import { clusterKsqlDbQueryRelativePath } from 'lib/paths';
-import List from 'components/KsqlDb/List/List';
 import Query from 'components/KsqlDb/Query/Query';
+import useAppParams from 'lib/hooks/useAppParams';
+import * as Metrics from 'components/common/Metrics';
+import {
+  clusterKsqlDbQueryRelativePath,
+  clusterKsqlDbStreamsPath,
+  clusterKsqlDbStreamsRelativePath,
+  clusterKsqlDbTablesPath,
+  clusterKsqlDbTablesRelativePath,
+  ClusterNameRoute,
+} from 'lib/paths';
+import PageHeading from 'components/common/PageHeading/PageHeading';
+import { ActionButton } from 'components/common/ActionComponent';
+import Navbar from 'components/common/Navigation/Navbar.styled';
+import { Navigate, NavLink, Route, Routes } from 'react-router-dom';
+import { Action, ResourceType } from 'generated-sources';
+import { useKsqlkDb } from 'lib/hooks/api/ksqlDb';
+import 'ace-builds/src-noconflict/ace';
+
+import TableView from './TableView';
 
 const KsqlDb: React.FC = () => {
+  const { clusterName } = useAppParams<ClusterNameRoute>();
+
+  const [tables, streams] = useKsqlkDb(clusterName);
+
+  const isFetching = tables.isFetching || streams.isFetching;
+
   return (
-    <Routes>
-      <Route path="/*" element={<List />} />
-      <Route path={clusterKsqlDbQueryRelativePath} element={<Query />} />
-    </Routes>
+    <>
+      <PageHeading text="KSQL DB">
+        <ActionButton
+          to={clusterKsqlDbQueryRelativePath}
+          buttonType="primary"
+          buttonSize="M"
+          permission={{
+            resource: ResourceType.KSQL,
+            action: Action.EXECUTE,
+          }}
+        >
+          Execute KSQL Request
+        </ActionButton>
+      </PageHeading>
+      <Metrics.Wrapper>
+        <Metrics.Section>
+          <Metrics.Indicator
+            label="Tables"
+            title="Tables"
+            fetching={isFetching}
+          >
+            {tables.isSuccess ? tables.data.length : '-'}
+          </Metrics.Indicator>
+          <Metrics.Indicator
+            label="Streams"
+            title="Streams"
+            fetching={isFetching}
+          >
+            {streams.isSuccess ? streams.data.length : '-'}
+          </Metrics.Indicator>
+        </Metrics.Section>
+      </Metrics.Wrapper>
+      <div>
+        <Navbar role="navigation">
+          <NavLink
+            to={clusterKsqlDbTablesPath(clusterName)}
+            className={({ isActive }) => (isActive ? 'is-active' : '')}
+            end
+          >
+            Tables
+          </NavLink>
+          <NavLink
+            to={clusterKsqlDbStreamsPath(clusterName)}
+            className={({ isActive }) => (isActive ? 'is-active' : '')}
+            end
+          >
+            Streams
+          </NavLink>
+        </Navbar>
+        <Routes>
+          <Route
+            index
+            element={<Navigate to={clusterKsqlDbTablesRelativePath} />}
+          />
+          <Route
+            path={clusterKsqlDbTablesRelativePath}
+            element={
+              <TableView
+                fetching={tables.isFetching}
+                rows={tables.data || []}
+              />
+            }
+          />
+          <Route
+            path={clusterKsqlDbStreamsRelativePath}
+            element={
+              <TableView
+                fetching={streams.isFetching}
+                rows={streams.data || []}
+              />
+            }
+          />
+          <Route path={clusterKsqlDbQueryRelativePath} element={<Query />} />
+        </Routes>
+      </div>
+    </>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
deleted file mode 100644
index bbb0844d68a..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/KsqlDbItem.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import PageLoader from 'components/common/PageLoader/PageLoader';
-import { KsqlStreamDescription, KsqlTableDescription } from 'generated-sources';
-import { ksqlRowData } from 'components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData';
-import Table from 'components/common/NewTable';
-import { ColumnDef } from '@tanstack/react-table';
-
-export enum KsqlDbItemType {
-  Tables = 'tables',
-  Streams = 'streams',
-}
-
-interface RowsType {
-  tables: KsqlTableDescription[];
-  streams: KsqlStreamDescription[];
-}
-export interface KsqlDbItemProps {
-  type: KsqlDbItemType;
-  fetching: boolean;
-  rows: RowsType;
-}
-
-export interface KsqlTableState {
-  name: string;
-  topic: string;
-  keyFormat: string;
-  valueFormat: string;
-  isWindowed: string;
-}
-
-const KsqlDbItem: React.FC<KsqlDbItemProps> = ({ type, fetching, rows }) => {
-  const preparedRows = rows[type]?.map(ksqlRowData) || [];
-
-  const columns = React.useMemo<ColumnDef<KsqlTableState>[]>(
-    () => [
-      { header: 'Name', accessorKey: 'name' },
-      { header: 'Topic', accessorKey: 'topic' },
-      { header: 'Key Format', accessorKey: 'keyFormat' },
-      { header: 'Value Format', accessorKey: 'valueFormat' },
-      { header: 'Is Windowed', accessorKey: 'isWindowed' },
-    ],
-    []
-  );
-
-  if (fetching) {
-    return <PageLoader />;
-  }
-  return (
-    <Table
-      data={preparedRows}
-      columns={columns}
-      emptyMessage="No tables or streams found"
-      enableSorting={false}
-    />
-  );
-};
-
-export default KsqlDbItem;
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
deleted file mode 100644
index ea6705b6a4c..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/__test__/KsqlDbItem.spec.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import { render, WithRoute } from 'lib/testHelpers';
-import { clusterKsqlDbTablesPath } from 'lib/paths';
-import KsqlDbItem, {
-  KsqlDbItemProps,
-  KsqlDbItemType,
-} from 'components/KsqlDb/List/KsqlDbItem/KsqlDbItem';
-import { screen } from '@testing-library/dom';
-import { fetchKsqlDbTablesPayload } from 'redux/reducers/ksqlDb/__test__/fixtures';
-
-describe('KsqlDbItem', () => {
-  const tablesPathname = clusterKsqlDbTablesPath();
-  const renderComponent = (props: Partial<KsqlDbItemProps> = {}) => {
-    render(
-      <WithRoute path={tablesPathname}>
-        <KsqlDbItem
-          type={KsqlDbItemType.Tables}
-          fetching={false}
-          rows={{ tables: [], streams: [] }}
-          {...props}
-        />
-      </WithRoute>,
-      {
-        initialEntries: [clusterKsqlDbTablesPath()],
-      }
-    );
-  };
-
-  it('renders progressbar when fetching tables and streams', () => {
-    renderComponent({ fetching: true });
-    expect(screen.getByRole('progressbar')).toBeInTheDocument();
-  });
-
-  it('show no text if no data found', () => {
-    renderComponent({});
-    expect(screen.getByText('No tables or streams found')).toBeInTheDocument();
-  });
-
-  it('renders with tables', () => {
-    renderComponent({
-      rows: {
-        tables: fetchKsqlDbTablesPayload.tables,
-        streams: [],
-      },
-    });
-
-    expect(screen.getByRole('table').querySelectorAll('td')).toHaveLength(10);
-  });
-  it('renders with streams', () => {
-    renderComponent({
-      type: KsqlDbItemType.Streams,
-      rows: {
-        tables: [],
-        streams: fetchKsqlDbTablesPayload.streams,
-      },
-    });
-    expect(screen.getByRole('table').querySelectorAll('td')).toHaveLength(10);
-  });
-});
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData.ts b/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData.ts
deleted file mode 100644
index a2c9e658918..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/List/KsqlDbItem/utils/ksqlRowData.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { KsqlDescription } from 'redux/interfaces/ksqlDb';
-import { KsqlTableState } from 'components/KsqlDb/List/KsqlDbItem/KsqlDbItem';
-
-export const ksqlRowData = (data: KsqlDescription): KsqlTableState => {
-  return {
-    name: data.name || '',
-    topic: data.topic || '',
-    keyFormat: data.keyFormat || '',
-    valueFormat: data.valueFormat || '',
-    isWindowed: 'isWindowed' in data ? String(data.isWindowed) : '-',
-  };
-};
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
deleted file mode 100644
index 698bcd6f953..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/List/List.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import React, { FC } from 'react';
-import useAppParams from 'lib/hooks/useAppParams';
-import * as Metrics from 'components/common/Metrics';
-import { getKsqlDbTables } from 'redux/reducers/ksqlDb/selectors';
-import {
-  clusterKsqlDbQueryRelativePath,
-  clusterKsqlDbStreamsPath,
-  clusterKsqlDbStreamsRelativePath,
-  clusterKsqlDbTablesPath,
-  clusterKsqlDbTablesRelativePath,
-  ClusterNameRoute,
-} from 'lib/paths';
-import PageHeading from 'components/common/PageHeading/PageHeading';
-import { ActionButton } from 'components/common/ActionComponent';
-import Navbar from 'components/common/Navigation/Navbar.styled';
-import { Navigate, NavLink, Route, Routes } from 'react-router-dom';
-import { fetchKsqlDbTables } from 'redux/reducers/ksqlDb/ksqlDbSlice';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
-import { Action, ResourceType } from 'generated-sources';
-
-import KsqlDbItem, { KsqlDbItemType } from './KsqlDbItem/KsqlDbItem';
-
-const List: FC = () => {
-  const { clusterName } = useAppParams<ClusterNameRoute>();
-  const dispatch = useAppDispatch();
-
-  const { rows, fetching, tablesCount, streamsCount } =
-    useAppSelector(getKsqlDbTables);
-
-  React.useEffect(() => {
-    dispatch(fetchKsqlDbTables(clusterName));
-  }, [clusterName, dispatch]);
-
-  return (
-    <>
-      <PageHeading text="KSQL DB">
-        <ActionButton
-          to={clusterKsqlDbQueryRelativePath}
-          buttonType="primary"
-          buttonSize="M"
-          permission={{
-            resource: ResourceType.KSQL,
-            action: Action.EXECUTE,
-          }}
-        >
-          Execute KSQL Request
-        </ActionButton>
-      </PageHeading>
-      <Metrics.Wrapper>
-        <Metrics.Section>
-          <Metrics.Indicator label="Tables" title="Tables" fetching={fetching}>
-            {tablesCount}
-          </Metrics.Indicator>
-          <Metrics.Indicator
-            label="Streams"
-            title="Streams"
-            fetching={fetching}
-          >
-            {streamsCount}
-          </Metrics.Indicator>
-        </Metrics.Section>
-      </Metrics.Wrapper>
-      <div>
-        <Navbar role="navigation">
-          <NavLink
-            to={clusterKsqlDbTablesPath(clusterName)}
-            className={({ isActive }) => (isActive ? 'is-active' : '')}
-            end
-          >
-            Tables
-          </NavLink>
-          <NavLink
-            to={clusterKsqlDbStreamsPath(clusterName)}
-            className={({ isActive }) => (isActive ? 'is-active' : '')}
-            end
-          >
-            Streams
-          </NavLink>
-        </Navbar>
-        <Routes>
-          <Route
-            index
-            element={<Navigate to={clusterKsqlDbTablesRelativePath} />}
-          />
-          <Route
-            path={clusterKsqlDbTablesRelativePath}
-            element={
-              <KsqlDbItem
-                type={KsqlDbItemType.Tables}
-                fetching={fetching}
-                rows={rows}
-              />
-            }
-          />
-          <Route
-            path={clusterKsqlDbStreamsRelativePath}
-            element={
-              <KsqlDbItem
-                type={KsqlDbItemType.Streams}
-                fetching={fetching}
-                rows={rows}
-              />
-            }
-          />
-        </Routes>
-      </div>
-    </>
-  );
-};
-
-export default List;
diff --git a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
deleted file mode 100644
index c6309076b5e..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/List/__test__/List.spec.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-import List from 'components/KsqlDb/List/List';
-import { render } from 'lib/testHelpers';
-import fetchMock from 'fetch-mock';
-import { screen } from '@testing-library/dom';
-import { act } from '@testing-library/react';
-
-describe('KsqlDb List', () => {
-  const renderComponent = async () => {
-    await act(() => {
-      render(<List />);
-    });
-  };
-  afterEach(() => fetchMock.reset());
-  it('renders List component with Tables and Streams tabs', async () => {
-    await renderComponent();
-    const Tables = screen.getByTitle('Tables');
-    const Streams = screen.getByTitle('Streams');
-    expect(Tables).toBeInTheDocument();
-    expect(Streams).toBeInTheDocument();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.styled.ts b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.styled.ts
deleted file mode 100644
index 8b145a89daa..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.styled.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import PageLoader from 'components/common/PageLoader/PageLoader';
-import styled from 'styled-components';
-
-export const ContinuousLoader = styled(PageLoader)`
-  & > div {
-    transform: scale(0.5);
-    padding-top: 0;
-  }
-`;
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
index 7e875748636..267498b923b 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/Query.tsx
@@ -1,223 +1,54 @@
-import React, { useCallback, useEffect, FC, useState } from 'react';
+import React from 'react';
 import useAppParams from 'lib/hooks/useAppParams';
 import TableRenderer from 'components/KsqlDb/Query/renderer/TableRenderer/TableRenderer';
+import { ClusterNameRoute } from 'lib/paths';
 import {
-  executeKsql,
-  resetExecutionResult,
-} from 'redux/reducers/ksqlDb/ksqlDbSlice';
-import { getKsqlExecution } from 'redux/reducers/ksqlDb/selectors';
-import { BASE_PARAMS } from 'lib/constants';
-import { KsqlResponse, KsqlTableResponse } from 'generated-sources';
-import { clusterKsqlDbPath, ClusterNameRoute } from 'lib/paths';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
-import { showAlert, showSuccessAlert } from 'lib/errorHandling';
-import PageHeading from 'components/common/PageHeading/PageHeading';
+  useExecuteKsqlkDbQueryMutation,
+  useKsqlkDbSSE,
+} from 'lib/hooks/api/ksqlDb';
 
 import type { FormValues } from './QueryForm/QueryForm';
-import * as S from './Query.styled';
 import QueryForm from './QueryForm/QueryForm';
 
-export const getFormattedErrorFromTableData = (
-  responseValues: KsqlTableResponse['values']
-): { title: string; message: string } => {
-  // We expect someting like that
-  // [[
-  //   "@type",
-  //   "error_code",
-  //   "message",
-  //   "statementText"?,
-  //   "entities"?
-  // ]],
-  // or
-  // [["message"]]
-
-  if (!responseValues || !responseValues.length) {
-    return {
-      title: 'Unknown error',
-      message: 'Recieved empty response',
-    };
-  }
-
-  let title = '';
-  let message = '';
-  if (responseValues[0].length < 2) {
-    const [messageText] = responseValues[0];
-    title = messageText;
-  } else {
-    const [type, errorCode, messageText, statementText, entities] =
-      responseValues[0];
-    title = `[Error #${errorCode}] ${type}`;
-    message =
-      (entities?.length ? `[${entities.join(', ')}] ` : '') +
-      (statementText ? `"${statementText}" ` : '') +
-      messageText;
-  }
-
-  return {
-    title,
-    message,
-  };
-};
-
-const Query: FC = () => {
+const Query = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
-
-  const sseRef = React.useRef<{ sse: EventSource | null; isOpen: boolean }>({
-    sse: null,
-    isOpen: false,
-  });
-  const [fetching, setFetching] = useState(false);
-  const dispatch = useAppDispatch();
-
-  const { executionResult } = useAppSelector(getKsqlExecution);
-  const [KSQLTable, setKSQLTable] = useState<KsqlTableResponse | null>(null);
-
-  const reset = useCallback(() => {
-    dispatch(resetExecutionResult());
-  }, [dispatch]);
-
-  useEffect(() => {
-    return reset;
-  }, [reset]);
-
-  const destroySSE = () => {
-    if (sseRef.current?.sse) {
-      sseRef.current.sse.close();
-      setFetching(false);
-      sseRef.current.sse = null;
-      sseRef.current.isOpen = false;
-    }
+  const executeQuery = useExecuteKsqlkDbQueryMutation();
+  const [pipeId, setPipeId] = React.useState<string | false>(false);
+
+  const sse = useKsqlkDbSSE({ clusterName, pipeId });
+
+  const isFetching = executeQuery.isLoading || sse.isFetching;
+
+  const submitHandler = async (values: FormValues) => {
+    const filtered = values.streamsProperties.filter(({ key }) => key != null);
+    const streamsProperties = filtered.reduce<Record<string, string>>(
+      (acc, current) => ({ ...acc, [current.key]: current.value }),
+      {}
+    );
+    await executeQuery.mutateAsync(
+      {
+        clusterName,
+        ksqlCommandV2: {
+          ...values,
+          streamsProperties:
+            values.streamsProperties[0].key !== ''
+              ? JSON.parse(JSON.stringify(streamsProperties))
+              : undefined,
+        },
+      },
+      { onSuccess: (data) => setPipeId(data.pipeId) }
+    );
   };
 
-  const handleSSECancel = useCallback(() => {
-    reset();
-    destroySSE();
-  }, [reset]);
-
-  const createSSE = useCallback(
-    (pipeId: string) => {
-      const url = `${BASE_PARAMS.basePath}/api/clusters/${clusterName}/ksql/response?pipeId=${pipeId}`;
-      const sse = new EventSource(url);
-      sseRef.current.sse = sse;
-      setFetching(true);
-
-      sse.onopen = () => {
-        sseRef.current.isOpen = true;
-      };
-
-      sse.onmessage = ({ data }) => {
-        const { table }: KsqlResponse = JSON.parse(data);
-        if (table) {
-          switch (table?.header) {
-            case 'Execution error': {
-              const { title, message } = getFormattedErrorFromTableData(
-                table.values
-              );
-              const id = `${url}-executionError`;
-              showAlert('error', { id, title, message });
-              break;
-            }
-            case 'Schema': {
-              setKSQLTable(table);
-              break;
-            }
-            case 'Row': {
-              setKSQLTable((PrevKSQLTable) => {
-                return {
-                  header: PrevKSQLTable?.header,
-                  columnNames: PrevKSQLTable?.columnNames,
-                  values: [
-                    ...(PrevKSQLTable?.values || []),
-                    ...(table?.values || []),
-                  ],
-                };
-              });
-              break;
-            }
-            case 'Query Result': {
-              const id = `${url}-querySuccess`;
-              showSuccessAlert({ id, title: 'Query succeed', message: '' });
-              break;
-            }
-            case 'Source Description':
-            case 'properties':
-            default: {
-              setKSQLTable(table);
-              break;
-            }
-          }
-        }
-        return sse;
-      };
-
-      sse.onerror = () => {
-        // if it's open - we know that server responded without opening SSE
-        if (!sseRef.current.isOpen) {
-          showAlert('error', {
-            id: `${url}-connectionClosedError`,
-            title: '',
-            message: 'SSE connection closed',
-          });
-        }
-        destroySSE();
-      };
-    },
-    [clusterName, dispatch]
-  );
-
-  const submitHandler = useCallback(
-    (values: FormValues) => {
-      const filteredProperties = values.streamsProperties.filter(
-        (property) => property.key != null
-      );
-      const streamsProperties = filteredProperties.reduce(
-        (acc, current) => ({
-          ...acc,
-          [current.key as keyof string]: current.value,
-        }),
-        {} as { [key: string]: string }
-      );
-      setFetching(true);
-      dispatch(
-        executeKsql({
-          clusterName,
-          ksqlCommandV2: {
-            ...values,
-            streamsProperties:
-              values.streamsProperties[0].key !== ''
-                ? JSON.parse(JSON.stringify(streamsProperties))
-                : undefined,
-          },
-        })
-      );
-    },
-    [dispatch, clusterName]
-  );
-  useEffect(() => {
-    if (executionResult?.pipeId) {
-      createSSE(executionResult.pipeId);
-    }
-    return () => {
-      destroySSE();
-    };
-  }, [createSSE, executionResult]);
-
   return (
     <>
-      <PageHeading
-        text="Query"
-        backText="KSQL DB"
-        backTo={clusterKsqlDbPath(clusterName)}
-      />
       <QueryForm
-        fetching={fetching}
-        hasResults={!!KSQLTable}
-        handleClearResults={() => setKSQLTable(null)}
-        handleSSECancel={handleSSECancel}
+        fetching={isFetching}
+        hasResults={!!sse.data && !!pipeId}
+        resetResults={() => setPipeId(false)}
         submitHandler={submitHandler}
       />
-      {KSQLTable && <TableRenderer table={KSQLTable} />}
-      {fetching && <S.ContinuousLoader />}
+      {pipeId && !!sse.data && <TableRenderer table={sse.data} />}
     </>
   );
 };
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
index b1066e481cb..6d0f6598b48 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
@@ -6,13 +6,12 @@ export const QueryWrapper = styled.div`
 `;
 
 export const KSQLInputsWrapper = styled.div`
-  width: 100%;
   display: flex;
   gap: 24px;
-
   padding-bottom: 16px;
-  & > div {
-    flex-grow: 1;
+
+  @media screen and (max-width: 769px) {
+    flex-direction: column;
   }
 `;
 
@@ -22,61 +21,23 @@ export const KSQLInputHeader = styled.div`
   color: ${({ theme }) => theme.default.color.normal};
 `;
 
-export const KSQLButtons = styled.div`
-  display: flex;
-  gap: 16px;
-`;
-
-export const StreamPropertiesContainer = styled.label`
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-  width: 50%;
-  color: ${({ theme }) => theme.default.color.normal};
-`;
-
 export const InputsContainer = styled.div`
-  overflow: hidden;
-  width: 100%;
-  display: flex;
-  justify-content: center;
+  display: grid;
+  grid-template-columns: 1fr 1fr 30px;
+  align-items: center;
   gap: 10px;
 `;
 
-export const StreamPropertiesInputWrapper = styled.div`
-  & {
-    width: 100%;
-  }
-  & > input {
-    width: 100%;
-    height: 40px;
-    border: 1px solid grey;
-    &:focus {
-      outline: none;
-      border-color: ${({ theme }) => theme.input.borderColor.focus};
-      &::placeholder {
-        color: transparent;
-      }
-    }
-    border-radius: 4px;
-    font-size: 16px;
-    padding-left: 15px;
-    background-color: ${({ theme }) => theme.input.backgroundColor.normal};
-    color: ${({ theme }) => theme.input.color.normal};
-  }
-`;
-
-export const DeleteButtonWrapper = styled.div`
-  min-height: 32px;
+export const Fieldset = styled.fieldset`
   display: flex;
+  flex: 1;
   flex-direction: column;
-  align-items: center;
-  justify-self: flex-start;
-  margin-top: 10px;
+  gap: 8px;
 `;
 
-export const Fieldset = styled.fieldset`
-  width: 50%;
+export const ButtonsContainer = styled.div`
+  display: flex;
+  gap: 8px;
 `;
 
 export const SQLEditor = styled(BaseSQLEditor)(
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
index 35309210881..3803c1e10f7 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
@@ -1,22 +1,27 @@
-import React, { useCallback, useRef } from 'react';
+import React from 'react';
 import { FormError } from 'components/common/Input/Input.styled';
 import { ErrorMessage } from '@hookform/error-message';
-import { useForm, Controller, useFieldArray } from 'react-hook-form';
+import {
+  useForm,
+  Controller,
+  useFieldArray,
+  FormProvider,
+} from 'react-hook-form';
 import { Button } from 'components/common/Button/Button';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import CloseIcon from 'components/common/Icons/CloseIcon';
 import { yupResolver } from '@hookform/resolvers/yup';
 import yup from 'lib/yupExtended';
 import PlusIcon from 'components/common/Icons/PlusIcon';
-import ReactAce from 'react-ace/lib/ace';
+import ReactAce from 'react-ace';
+import Input from 'components/common/Input/Input';
 
 import * as S from './QueryForm.styled';
 
-export interface Props {
+interface QueryFormProps {
   fetching: boolean;
   hasResults: boolean;
-  handleClearResults: () => void;
-  handleSSECancel: () => void;
+  resetResults: () => void;
   submitHandler: (values: FormValues) => void;
 }
 type StreamsPropertiesType = {
@@ -37,20 +42,13 @@ const validationSchema = yup.object({
   streamsProperties: yup.array().of(streamsPropertiesSchema),
 });
 
-const QueryForm: React.FC<Props> = ({
+const QueryForm: React.FC<QueryFormProps> = ({
   fetching,
   hasResults,
-  handleClearResults,
-  handleSSECancel,
   submitHandler,
+  resetResults,
 }) => {
-  const {
-    handleSubmit,
-    setValue,
-    getValues,
-    control,
-    formState: { errors },
-  } = useForm<FormValues>({
+  const methods = useForm<FormValues>({
     mode: 'onTouched',
     resolver: yupResolver(validationSchema),
     defaultValues: {
@@ -58,7 +56,16 @@ const QueryForm: React.FC<Props> = ({
       streamsProperties: [{ key: '', value: '' }],
     },
   });
-  const { fields, append, remove } = useFieldArray<
+
+  const {
+    handleSubmit,
+    setValue,
+    control,
+    watch,
+    formState: { errors, isDirty },
+  } = methods;
+
+  const { fields, append, remove, update } = useFieldArray<
     FormValues,
     'streamsProperties'
   >({
@@ -66,17 +73,24 @@ const QueryForm: React.FC<Props> = ({
     name: 'streamsProperties',
   });
 
-  const handleAddNewProperty = useCallback(() => {
-    if (
-      getValues().streamsProperties.every((prop) => {
-        return prop.key;
-      })
-    ) {
-      append({ key: '', value: '' });
+  const watchStreamProps = watch('streamsProperties');
+
+  const appendProperty = () => {
+    append({ key: '', value: '' });
+  };
+  const removeProperty = (index: number) => () => {
+    if (fields.length === 1) {
+      update(index, { key: '', value: '' });
+      return;
     }
-  }, []);
 
-  const inputRef = useRef<ReactAce>(null);
+    remove(index);
+  };
+
+  const isAppendDisabled =
+    fetching || !!watchStreamProps.find((field) => !field.key);
+
+  const inputRef = React.useRef<ReactAce>(null);
 
   const handleFocus = () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -87,145 +101,117 @@ const QueryForm: React.FC<Props> = ({
     }
   };
 
+  const handleClear = () => {
+    handleFocus();
+    resetResults();
+  };
+
   return (
-    <S.QueryWrapper>
-      <form onSubmit={handleSubmit(submitHandler)}>
-        <S.KSQLInputsWrapper>
-          <S.Fieldset aria-labelledby="ksqlLabel">
-            <S.KSQLInputHeader>
-              <label id="ksqlLabel">KSQL</label>
-              <Button
-                onClick={() => setValue('ksql', '')}
-                buttonType="primary"
-                buttonSize="S"
-                isInverted
-              >
-                Clear
-              </Button>
-            </S.KSQLInputHeader>
-            <Controller
-              control={control}
-              name="ksql"
-              render={({ field }) => (
-                <S.SQLEditor
-                  {...field}
-                  commands={[
-                    {
-                      // commands is array of key bindings.
-                      // name for the key binding.
-                      name: 'commandName',
-                      // key combination used for the command.
-                      bindKey: { win: 'Ctrl-Enter', mac: 'Command-Enter' },
-                      // function to execute when keys are pressed.
-                      exec: () => {
-                        handleSubmit(submitHandler)();
+    <FormProvider {...methods}>
+      <S.QueryWrapper>
+        <form onSubmit={handleSubmit(submitHandler)}>
+          <S.KSQLInputsWrapper>
+            <S.Fieldset>
+              <S.KSQLInputHeader>
+                <label id="ksqlLabel">KSQL</label>
+                <Button
+                  onClick={() => setValue('ksql', '')}
+                  buttonType="primary"
+                  buttonSize="S"
+                  isInverted
+                >
+                  Clear
+                </Button>
+              </S.KSQLInputHeader>
+              <Controller
+                control={control}
+                name="ksql"
+                render={({ field }) => (
+                  <S.SQLEditor
+                    {...field}
+                    commands={[
+                      {
+                        // commands is array of key bindings.
+                        // name for the key binding.
+                        name: 'commandName',
+                        // key combination used for the command.
+                        bindKey: { win: 'Ctrl-Enter', mac: 'Command-Enter' },
+                        // function to execute when keys are pressed.
+                        exec: () => {
+                          handleSubmit(submitHandler)();
+                        },
                       },
-                    },
-                  ]}
-                  readOnly={fetching}
-                  ref={inputRef}
-                />
-              )}
-            />
-            <FormError>
-              <ErrorMessage errors={errors} name="ksql" />
-            </FormError>
-          </S.Fieldset>
-
-          <S.StreamPropertiesContainer>
-            Stream properties:
-            {fields.map((item, index) => (
-              <S.InputsContainer key={item.id}>
-                <S.StreamPropertiesInputWrapper>
-                  <Controller
-                    control={control}
+                    ]}
+                    readOnly={fetching}
+                    ref={inputRef}
+                  />
+                )}
+              />
+              <FormError>
+                <ErrorMessage errors={errors} name="ksql" />
+              </FormError>
+            </S.Fieldset>
+
+            <S.Fieldset>
+              Stream properties:
+              {fields.map((field, index) => (
+                <S.InputsContainer key={field.id}>
+                  <Input
                     name={`streamsProperties.${index}.key`}
-                    render={({ field }) => (
-                      <input
-                        {...field}
-                        placeholder="Key"
-                        aria-label="key"
-                        type="text"
-                        autoComplete="off"
-                      />
-                    )}
+                    placeholder="Key"
+                    type="text"
+                    autoComplete="off"
+                    withError
                   />
-                  <FormError>
-                    <ErrorMessage
-                      errors={errors}
-                      name={`streamsProperties.${index}.key`}
-                    />
-                  </FormError>
-                </S.StreamPropertiesInputWrapper>
-                <S.StreamPropertiesInputWrapper>
-                  <Controller
-                    control={control}
+                  <Input
                     name={`streamsProperties.${index}.value`}
-                    render={({ field }) => (
-                      <input
-                        {...field}
-                        placeholder="Value"
-                        aria-label="value"
-                        type="text"
-                        autoComplete="off"
-                      />
-                    )}
+                    placeholder="Value"
+                    type="text"
+                    autoComplete="off"
+                    withError
                   />
-                  <FormError>
-                    <ErrorMessage
-                      errors={errors}
-                      name={`streamsProperties.${index}.value`}
-                    />
-                  </FormError>
-                </S.StreamPropertiesInputWrapper>
-
-                <S.DeleteButtonWrapper onClick={() => remove(index)}>
-                  <IconButtonWrapper aria-label="deleteProperty">
+                  <IconButtonWrapper
+                    aria-label="deleteProperty"
+                    onClick={removeProperty(index)}
+                  >
                     <CloseIcon aria-hidden />
                   </IconButtonWrapper>
-                </S.DeleteButtonWrapper>
-              </S.InputsContainer>
-            ))}
+                </S.InputsContainer>
+              ))}
+              <Button
+                type="button"
+                buttonSize="M"
+                buttonType="secondary"
+                disabled={isAppendDisabled}
+                onClick={appendProperty}
+              >
+                <PlusIcon />
+                Add Stream Property
+              </Button>
+            </S.Fieldset>
+          </S.KSQLInputsWrapper>
+          <S.ButtonsContainer>
             <Button
-              type="button"
-              buttonSize="M"
               buttonType="secondary"
-              onClick={handleAddNewProperty}
+              buttonSize="M"
+              disabled={fetching || !isDirty || !hasResults}
+              onClick={handleClear}
+            >
+              Clear results
+            </Button>
+            <Button
+              buttonType="primary"
+              buttonSize="M"
+              type="submit"
+              disabled={fetching}
+              onClick={handleFocus}
             >
-              <PlusIcon />
-              Add Stream Property
+              Execute
             </Button>
-          </S.StreamPropertiesContainer>
-        </S.KSQLInputsWrapper>
-        <S.KSQLButtons>
-          <Button
-            buttonType="primary"
-            buttonSize="M"
-            type="submit"
-            disabled={fetching}
-            onClick={handleFocus}
-          >
-            Execute
-          </Button>
-          <Button
-            buttonType="secondary"
-            buttonSize="M"
-            disabled={!fetching}
-            onClick={handleSSECancel}
-          >
-            Stop query
-          </Button>
-          <Button
-            buttonType="secondary"
-            buttonSize="M"
-            disabled={fetching || !hasResults}
-            onClick={handleClearResults}
-          >
-            Clear results
-          </Button>
-        </S.KSQLButtons>
-      </form>
-    </S.QueryWrapper>
+          </S.ButtonsContainer>
+        </form>
+      </S.QueryWrapper>
+    </FormProvider>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
deleted file mode 100644
index 76f8b213351..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/__test__/QueryForm.spec.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import { render } from 'lib/testHelpers';
-import React from 'react';
-import QueryForm, { Props } from 'components/KsqlDb/Query/QueryForm/QueryForm';
-import { screen, waitFor, within } from '@testing-library/dom';
-import userEvent from '@testing-library/user-event';
-
-const renderComponent = (props: Props) => render(<QueryForm {...props} />);
-
-describe('QueryForm', () => {
-  it('renders', () => {
-    renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: jest.fn(),
-    });
-
-    const KSQLBlock = screen.getByLabelText('KSQL');
-    expect(KSQLBlock).toBeInTheDocument();
-    expect(within(KSQLBlock).getByText('KSQL')).toBeInTheDocument();
-    expect(
-      within(KSQLBlock).getByRole('button', { name: 'Clear' })
-    ).toBeInTheDocument();
-    // Represents SQL editor
-    expect(within(KSQLBlock).getByRole('textbox')).toBeInTheDocument();
-
-    const streamPropertiesBlock = screen.getByRole('textbox', { name: 'key' });
-    expect(streamPropertiesBlock).toBeInTheDocument();
-    expect(screen.getByText('Stream properties:')).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Clear' })).toBeInTheDocument();
-    expect(screen.queryAllByRole('textbox')[0]).toBeInTheDocument();
-
-    // Form controls
-    expect(screen.getByRole('button', { name: 'Execute' })).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Execute' })).toBeEnabled();
-    expect(
-      screen.getByRole('button', { name: 'Stop query' })
-    ).toBeInTheDocument();
-    expect(screen.getByRole('button', { name: 'Stop query' })).toBeDisabled();
-    expect(
-      screen.getByRole('button', { name: 'Clear results' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('button', { name: 'Clear results' })
-    ).toBeDisabled();
-  });
-
-  it('renders error with empty input', async () => {
-    const submitFn = jest.fn();
-    renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: submitFn,
-    });
-
-    await userEvent.click(screen.getByRole('button', { name: 'Execute' }));
-
-    await waitFor(() => {
-      expect(screen.getByText('ksql is a required field')).toBeInTheDocument();
-      expect(submitFn).not.toBeCalled();
-    });
-  });
-
-  it('submits with correct inputs', async () => {
-    const submitFn = jest.fn();
-    renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: submitFn,
-    });
-
-    const textbox = screen.getAllByRole('textbox');
-    textbox[0].focus();
-    await userEvent.paste('show tables;');
-    const key = screen.getByRole('textbox', { name: 'key' });
-    key.focus();
-    await userEvent.paste('test');
-    const value = screen.getByRole('textbox', { name: 'value' });
-    value.focus();
-    await userEvent.paste('test');
-    await userEvent.click(screen.getByRole('button', { name: 'Execute' }));
-
-    expect(
-      screen.queryByText('ksql is a required field')
-    ).not.toBeInTheDocument();
-
-    expect(
-      screen.queryByText('streamsProperties is not JSON object')
-    ).not.toBeInTheDocument();
-
-    expect(submitFn).toBeCalled();
-  });
-
-  it('clear results is enabled when has results', async () => {
-    const clearFn = jest.fn();
-    renderComponent({
-      fetching: false,
-      hasResults: true,
-      handleClearResults: clearFn,
-      handleSSECancel: jest.fn(),
-      submitHandler: jest.fn(),
-    });
-
-    expect(screen.getByRole('button', { name: 'Clear results' })).toBeEnabled();
-
-    await userEvent.click(
-      screen.getByRole('button', { name: 'Clear results' })
-    );
-
-    expect(clearFn).toBeCalled();
-  });
-
-  it('stop query query is enabled when is fetching', async () => {
-    const cancelFn = jest.fn();
-    renderComponent({
-      fetching: true,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: cancelFn,
-      submitHandler: jest.fn(),
-    });
-
-    expect(screen.getByRole('button', { name: 'Stop query' })).toBeEnabled();
-
-    await userEvent.click(screen.getByRole('button', { name: 'Stop query' }));
-
-    expect(cancelFn).toBeCalled();
-  });
-
-  it('add new property', async () => {
-    renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: jest.fn(),
-    });
-
-    const textbox = screen.getByLabelText('key');
-    await userEvent.type(textbox, 'prop_name');
-    await userEvent.click(
-      screen.getByRole('button', { name: 'Add Stream Property' })
-    );
-    expect(screen.getAllByRole('textbox', { name: 'key' }).length).toEqual(2);
-  });
-
-  it("doesn't add new property", async () => {
-    renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: jest.fn(),
-    });
-
-    await userEvent.click(
-      screen.getByRole('button', { name: 'Add Stream Property' })
-    );
-    expect(screen.getAllByRole('textbox', { name: 'key' }).length).toEqual(1);
-  });
-
-  it('delete stream property', async () => {
-    await renderComponent({
-      fetching: false,
-      hasResults: false,
-      handleClearResults: jest.fn(),
-      handleSSECancel: jest.fn(),
-      submitHandler: jest.fn(),
-    });
-    const textBoxes = screen.getAllByRole('textbox', { name: 'key' });
-    textBoxes[0].focus();
-    await userEvent.paste('test');
-    await userEvent.click(
-      screen.getByRole('button', { name: 'Add Stream Property' })
-    );
-    await userEvent.click(screen.getAllByLabelText('deleteProperty')[0]);
-
-    await screen.getByRole('button', { name: 'Add Stream Property' });
-
-    await userEvent.click(screen.getAllByLabelText('deleteProperty')[0]);
-
-    expect(textBoxes.length).toEqual(1);
-  });
-});
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx
deleted file mode 100644
index 705d86be5f6..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/__test__/Query.spec.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import { render, EventSourceMock, WithRoute } from 'lib/testHelpers';
-import React from 'react';
-import Query, {
-  getFormattedErrorFromTableData,
-} from 'components/KsqlDb/Query/Query';
-import { screen } from '@testing-library/dom';
-import fetchMock from 'fetch-mock';
-import { clusterKsqlDbQueryPath } from 'lib/paths';
-import userEvent from '@testing-library/user-event';
-
-const clusterName = 'testLocal';
-const renderComponent = () =>
-  render(
-    <WithRoute path={clusterKsqlDbQueryPath()}>
-      <Query />
-    </WithRoute>,
-    {
-      initialEntries: [clusterKsqlDbQueryPath(clusterName)],
-    }
-  );
-
-describe('Query', () => {
-  it('renders', () => {
-    renderComponent();
-
-    expect(screen.getByLabelText('KSQL')).toBeInTheDocument();
-    expect(screen.getByLabelText('Stream properties:')).toBeInTheDocument();
-  });
-
-  afterEach(() => fetchMock.reset());
-  it('fetch on execute', async () => {
-    renderComponent();
-
-    const mock = fetchMock.postOnce(`/api/clusters/${clusterName}/ksql/v2`, {
-      pipeId: 'testPipeID',
-    });
-
-    Object.defineProperty(window, 'EventSource', {
-      value: EventSourceMock,
-    });
-    const inputs = screen.getAllByRole('textbox');
-    const textAreaElement = inputs[0] as HTMLTextAreaElement;
-
-    textAreaElement.focus();
-    await userEvent.paste('show tables;');
-    await userEvent.click(screen.getByRole('button', { name: 'Execute' }));
-
-    expect(mock.calls().length).toBe(1);
-  });
-
-  it('fetch on execute with streamParams', async () => {
-    renderComponent();
-
-    const mock = fetchMock.postOnce(`/api/clusters/${clusterName}/ksql/v2`, {
-      pipeId: 'testPipeID',
-    });
-
-    Object.defineProperty(window, 'EventSource', {
-      value: EventSourceMock,
-    });
-
-    const inputs = screen.getAllByRole('textbox');
-    const textAreaElement = inputs[0] as HTMLTextAreaElement;
-    textAreaElement.focus();
-    await userEvent.paste('show tables;');
-
-    const key = screen.getByLabelText('key');
-    key.focus();
-    await userEvent.paste('key');
-    const value = screen.getByLabelText('value');
-    value.focus();
-    await userEvent.paste('value');
-
-    await userEvent.click(screen.getByRole('button', { name: 'Execute' }));
-
-    expect(mock.calls().length).toBe(1);
-  });
-});
-
-describe('getFormattedErrorFromTableData', () => {
-  it('works', () => {
-    expect(getFormattedErrorFromTableData([['Test Error']])).toStrictEqual({
-      title: 'Test Error',
-      message: '',
-    });
-
-    expect(
-      getFormattedErrorFromTableData([
-        ['some_type', 'errorCode', 'messageText'],
-      ])
-    ).toStrictEqual({
-      title: '[Error #errorCode] some_type',
-      message: 'messageText',
-    });
-
-    expect(
-      getFormattedErrorFromTableData([
-        [
-          'some_type',
-          'errorCode',
-          'messageText',
-          'statementText',
-          ['test1', 'test2'],
-        ],
-      ])
-    ).toStrictEqual({
-      title: '[Error #errorCode] some_type',
-      message: '[test1, test2] "statementText" messageText',
-    });
-
-    expect(getFormattedErrorFromTableData([])).toStrictEqual({
-      title: 'Unknown error',
-      message: 'Recieved empty response',
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.tsx
index aaf4755b0a2..4e1acb38d6f 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/TableRenderer.tsx
@@ -6,13 +6,11 @@ import { TableTitle } from 'components/common/table/TableTitle/TableTitle.styled
 
 import * as S from './TableRenderer.styled';
 
-export interface Props {
+interface TableRendererProps {
   table: KsqlTableResponse;
 }
 
-export function hasJsonStructure(
-  str: string | Record<string, unknown>
-): boolean {
+function hasJsonStructure(str: string | Record<string, unknown>): boolean {
   if (typeof str === 'object') {
     return true;
   }
@@ -30,13 +28,7 @@ export function hasJsonStructure(
   return false;
 }
 
-const TableRenderer: React.FC<Props> = ({ table }) => {
-  const heading = React.useMemo(() => {
-    return table.header || '';
-  }, [table.header]);
-  const ths = React.useMemo(() => {
-    return table.columnNames || [];
-  }, [table.columnNames]);
+const TableRenderer: React.FC<TableRendererProps> = ({ table }) => {
   const rows = React.useMemo(() => {
     return (table.values || []).map((row) => {
       return {
@@ -53,9 +45,11 @@ const TableRenderer: React.FC<Props> = ({ table }) => {
     });
   }, [table.values]);
 
+  const ths = table.columnNames || [];
+
   return (
     <S.Wrapper>
-      <TableTitle>{heading}</TableTitle>
+      <TableTitle>{table.header}</TableTitle>
       <S.ScrollableTable>
         <thead>
           <tr>
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/__test__/TableRenderer.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/__test__/TableRenderer.spec.tsx
deleted file mode 100644
index 775b16b51a9..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/renderer/TableRenderer/__test__/TableRenderer.spec.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { render } from 'lib/testHelpers';
-import React from 'react';
-import TableRenderer, {
-  Props,
-  hasJsonStructure,
-} from 'components/KsqlDb/Query/renderer/TableRenderer/TableRenderer';
-import { screen } from '@testing-library/dom';
-
-const renderComponent = (props: Props) => render(<TableRenderer {...props} />);
-
-describe('TableRenderer', () => {
-  it('renders', () => {
-    renderComponent({
-      table: {
-        header: 'Test header',
-        columnNames: ['Test column name'],
-        values: [['Table row #1'], ['Table row #2'], ['{"jsonrow": "#3"}']],
-      },
-    });
-
-    expect(
-      screen.getByRole('heading', { name: 'Test header' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('columnheader', { name: 'Test column name' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('cell', { name: 'Table row #1' })
-    ).toBeInTheDocument();
-    expect(
-      screen.getByRole('cell', { name: 'Table row #2' })
-    ).toBeInTheDocument();
-  });
-
-  it('renders with empty arrays', () => {
-    renderComponent({
-      table: {},
-    });
-
-    expect(screen.getByText('No tables or streams found')).toBeInTheDocument();
-  });
-});
-
-describe('hasJsonStructure', () => {
-  it('works', () => {
-    expect(hasJsonStructure('simplestring')).toBeFalsy();
-    expect(
-      hasJsonStructure("{'looksLikeJson': 'but has wrong quotes'}")
-    ).toBeFalsy();
-    expect(
-      hasJsonStructure('{"json": "but doesnt have closing brackets"')
-    ).toBeFalsy();
-    expect(hasJsonStructure('"string":"that looks like json"')).toBeFalsy();
-
-    expect(hasJsonStructure('1')).toBeFalsy();
-    expect(hasJsonStructure('{1:}')).toBeFalsy();
-    expect(hasJsonStructure('{1:"1"}')).toBeFalsy();
-
-    // @ts-expect-error We suppress error because this function works with unknown data from server
-    expect(hasJsonStructure(1)).toBeFalsy();
-
-    expect(hasJsonStructure('{}')).toBeTruthy();
-    expect(hasJsonStructure('{"correct": "json"}')).toBeTruthy();
-
-    expect(hasJsonStructure('[]')).toBeTruthy();
-    expect(hasJsonStructure('[{}]')).toBeTruthy();
-
-    expect(hasJsonStructure({})).toBeTruthy();
-    expect(hasJsonStructure({ correct: 'json' })).toBeTruthy();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/KsqlDb/TableView.tsx b/kafka-ui-react-app/src/components/KsqlDb/TableView.tsx
new file mode 100644
index 00000000000..d27e4968b7f
--- /dev/null
+++ b/kafka-ui-react-app/src/components/KsqlDb/TableView.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { KsqlStreamDescription, KsqlTableDescription } from 'generated-sources';
+import Table from 'components/common/NewTable';
+import { ColumnDef } from '@tanstack/react-table';
+
+interface TableViewProps {
+  fetching: boolean;
+  rows: KsqlTableDescription[] | KsqlStreamDescription[];
+}
+
+const TableView: React.FC<TableViewProps> = ({ fetching, rows }) => {
+  const columns = React.useMemo<
+    ColumnDef<KsqlTableDescription | KsqlStreamDescription>[]
+  >(
+    () => [
+      { header: 'Name', accessorKey: 'name' },
+      { header: 'Topic', accessorKey: 'topic' },
+      { header: 'Key Format', accessorKey: 'keyFormat' },
+      { header: 'Value Format', accessorKey: 'valueFormat' },
+      {
+        header: 'Is Windowed',
+        accessorKey: 'isWindowed',
+        cell: ({ row }) =>
+          'isWindowed' in row.original ? String(row.original.isWindowed) : '-',
+      },
+    ],
+    []
+  );
+  return (
+    <Table
+      data={rows || []}
+      columns={columns}
+      emptyMessage={fetching ? 'Loading...' : 'No rows found'}
+      enableSorting={false}
+    />
+  );
+};
+
+export default TableView;
diff --git a/kafka-ui-react-app/src/components/KsqlDb/__test__/KsqlDb.spec.tsx b/kafka-ui-react-app/src/components/KsqlDb/__test__/KsqlDb.spec.tsx
deleted file mode 100644
index b07a3936da7..00000000000
--- a/kafka-ui-react-app/src/components/KsqlDb/__test__/KsqlDb.spec.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import KsqlDb from 'components/KsqlDb/KsqlDb';
-import { render, WithRoute } from 'lib/testHelpers';
-import { screen } from '@testing-library/dom';
-import {
-  clusterKsqlDbPath,
-  clusterKsqlDbQueryPath,
-  getNonExactPath,
-} from 'lib/paths';
-
-const KSqLComponentText = {
-  list: 'list',
-  query: 'query',
-};
-
-jest.mock('components/KsqlDb/List/List', () => () => (
-  <div>{KSqLComponentText.list}</div>
-));
-jest.mock('components/KsqlDb/Query/Query', () => () => (
-  <div>{KSqLComponentText.query}</div>
-));
-
-describe('KsqlDb Component', () => {
-  const clusterName = 'clusterName';
-  const renderComponent = (path: string) =>
-    render(
-      <WithRoute path={getNonExactPath(clusterKsqlDbPath())}>
-        <KsqlDb />
-      </WithRoute>,
-      { initialEntries: [path] }
-    );
-
-  it('Renders the List', () => {
-    renderComponent(clusterKsqlDbPath(clusterName));
-    expect(screen.getByText(KSqLComponentText.list)).toBeInTheDocument();
-  });
-
-  it('Renders the List', () => {
-    renderComponent(clusterKsqlDbQueryPath(clusterName));
-    expect(screen.getByText(KSqLComponentText.query)).toBeInTheDocument();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/fixtures.ts b/kafka-ui-react-app/src/components/Schemas/Details/__test__/fixtures.ts
index 174cfd830f9..18cca3b1008 100644
--- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/fixtures.ts
@@ -12,12 +12,6 @@ export const versionPayload = [
 ];
 export const versionEmptyPayload = [];
 
-export const versions = [
-  schemaVersion1,
-  schemaVersion2,
-  schemaVersionWithNonAsciiChars,
-];
-
 export const jsonSchema: SchemaSubject = {
   subject: 'test',
   version: '15',
diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts b/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts
index 9107dcc7750..bf2047ad64d 100644
--- a/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts
@@ -14,7 +14,7 @@ export const invalidPermission = {
   action: Action.DELETE,
 };
 
-export const roles = [
+const roles = [
   {
     ...validPermission,
     actions: [validPermission.action],
diff --git a/kafka-ui-react-app/src/components/common/DiffViewer/DiffViewer.tsx b/kafka-ui-react-app/src/components/common/DiffViewer/DiffViewer.tsx
index 18abc774d15..b38b4f0af98 100644
--- a/kafka-ui-react-app/src/components/common/DiffViewer/DiffViewer.tsx
+++ b/kafka-ui-react-app/src/components/common/DiffViewer/DiffViewer.tsx
@@ -1,4 +1,5 @@
 import { diff as DiffEditor } from 'react-ace';
+import 'ace-builds/src-noconflict/ace';
 import 'ace-builds/src-noconflict/mode-json5';
 import 'ace-builds/src-noconflict/mode-protobuf';
 import 'ace-builds/src-noconflict/theme-textmate';
diff --git a/kafka-ui-react-app/src/components/common/Editor/Editor.tsx b/kafka-ui-react-app/src/components/common/Editor/Editor.tsx
index 9903bcc3345..b8744762c96 100644
--- a/kafka-ui-react-app/src/components/common/Editor/Editor.tsx
+++ b/kafka-ui-react-app/src/components/common/Editor/Editor.tsx
@@ -1,11 +1,9 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import AceEditor, { IAceEditorProps } from 'react-ace';
 import 'ace-builds/src-noconflict/mode-json5';
 import 'ace-builds/src-noconflict/mode-protobuf';
 import 'ace-builds/src-noconflict/theme-tomorrow';
 import { SchemaType } from 'generated-sources';
 import React from 'react';
-import ReactAce from 'react-ace/lib/ace';
 import styled from 'styled-components';
 
 interface EditorProps extends IAceEditorProps {
@@ -13,7 +11,7 @@ interface EditorProps extends IAceEditorProps {
   schemaType?: string;
 }
 
-const Editor = React.forwardRef<ReactAce | null, EditorProps>((props, ref) => {
+const Editor = React.forwardRef<AceEditor | null, EditorProps>((props, ref) => {
   const { isFixedHeight, schemaType, ...rest } = props;
   return (
     <AceEditor
diff --git a/kafka-ui-react-app/src/components/common/NewTable/TimestampCell copy.tsx b/kafka-ui-react-app/src/components/common/NewTable/TimestampCell copy.tsx
deleted file mode 100644
index c5ad01c7c9d..00000000000
--- a/kafka-ui-react-app/src/components/common/NewTable/TimestampCell copy.tsx	
+++ /dev/null
@@ -1,11 +0,0 @@
-import { CellContext } from '@tanstack/react-table';
-import React from 'react';
-
-import * as S from './Table.styled';
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const TruncatedTextCell: React.FC<CellContext<any, unknown>> = ({
-  getValue,
-}) => <S.Ellipsis>{getValue<string>()}</S.Ellipsis>;
-
-export default TruncatedTextCell;
diff --git a/kafka-ui-react-app/src/components/common/SQLEditor/SQLEditor.tsx b/kafka-ui-react-app/src/components/common/SQLEditor/SQLEditor.tsx
index de52f9a4518..a12170151e7 100644
--- a/kafka-ui-react-app/src/components/common/SQLEditor/SQLEditor.tsx
+++ b/kafka-ui-react-app/src/components/common/SQLEditor/SQLEditor.tsx
@@ -1,15 +1,15 @@
 /* eslint-disable react/jsx-props-no-spreading */
 import AceEditor, { IAceEditorProps } from 'react-ace';
+import 'ace-builds/src-noconflict/ace';
 import 'ace-builds/src-noconflict/mode-sql';
 import 'ace-builds/src-noconflict/theme-textmate';
 import React from 'react';
-import ReactAce from 'react-ace/lib/ace';
 
 interface SQLEditorProps extends IAceEditorProps {
   isFixedHeight?: boolean;
 }
 
-const SQLEditor = React.forwardRef<ReactAce | null, SQLEditorProps>(
+const SQLEditor = React.forwardRef<AceEditor | null, SQLEditorProps>(
   (props, ref) => {
     const { isFixedHeight, ...rest } = props;
     return (
diff --git a/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
index cde97964f3a..0764320f58b 100644
--- a/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
+++ b/kafka-ui-react-app/src/components/common/Tooltip/Tooltip.tsx
@@ -8,13 +8,13 @@ import {
 
 import * as S from './Tooltip.styled';
 
-export interface PropsTypes {
+interface TooltipProps {
   value: React.ReactNode;
   content: string;
   placement?: Placement;
 }
 
-const Tooltip: React.FC<PropsTypes> = ({ value, content, placement }) => {
+const Tooltip: React.FC<TooltipProps> = ({ value, content, placement }) => {
   const [open, setOpen] = useState(false);
   const { x, y, refs, strategy, context } = useFloating({
     open,
diff --git a/kafka-ui-react-app/src/components/common/table/TableTitle/TableTitle.styled.tsx b/kafka-ui-react-app/src/components/common/table/TableTitle/TableTitle.styled.tsx
index 1ef6ee258d1..ee1d26d504a 100644
--- a/kafka-ui-react-app/src/components/common/table/TableTitle/TableTitle.styled.tsx
+++ b/kafka-ui-react-app/src/components/common/table/TableTitle/TableTitle.styled.tsx
@@ -3,5 +3,5 @@ import Heading from 'components/common/heading/Heading.styled';
 import styled from 'styled-components';
 
 export const TableTitle = styled((props) => <Heading level={3} {...props} />)`
-  padding: 16px;
+  padding: 16px 16px 0;
 `;
diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/fixtures.ts b/kafka-ui-react-app/src/lib/hooks/__tests__/fixtures.ts
index 435e0286f5c..a6bdab43661 100644
--- a/kafka-ui-react-app/src/lib/hooks/__tests__/fixtures.ts
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/fixtures.ts
@@ -4,7 +4,7 @@ import { modifyRolesData } from 'lib/permissions';
 export const clusterName1 = 'local';
 export const clusterName2 = 'dev';
 
-export const userPermissionsMock = [
+const userPermissionsMock = [
   {
     clusters: [clusterName1],
     resource: ResourceType.TOPIC,
diff --git a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
index dd340306535..b8a17c558d3 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
@@ -109,7 +109,7 @@ export function useUpdateConnectorConfig(props: UseConnectorProps) {
     }
   );
 }
-export function useCreateConnectorMutation(clusterName: ClusterName) {
+function useCreateConnectorMutation(clusterName: ClusterName) {
   const client = useQueryClient();
   return useMutation(
     (props: CreateConnectorProps) =>
diff --git a/kafka-ui-react-app/src/lib/hooks/api/ksqlDb.tsx b/kafka-ui-react-app/src/lib/hooks/api/ksqlDb.tsx
new file mode 100644
index 00000000000..6685c6223f6
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/ksqlDb.tsx
@@ -0,0 +1,184 @@
+import { ksqlDbApiClient as api } from 'lib/api';
+import { useMutation, useQueries } from '@tanstack/react-query';
+import { ClusterName } from 'redux/interfaces';
+import { BASE_PARAMS } from 'lib/constants';
+import React from 'react';
+import { fetchEventSource } from '@microsoft/fetch-event-source';
+import {
+  showAlert,
+  showServerError,
+  showSuccessAlert,
+} from 'lib/errorHandling';
+import {
+  ExecuteKsqlRequest,
+  KsqlResponse,
+  KsqlTableResponse,
+} from 'generated-sources';
+import { StopLoading } from 'components/Topics/Topic/Messages/Messages.styled';
+import toast from 'react-hot-toast';
+
+export function useKsqlkDb(clusterName: ClusterName) {
+  return useQueries({
+    queries: [
+      {
+        queryKey: ['clusters', clusterName, 'ksqlDb', 'tables'],
+        queryFn: () => api.listTables({ clusterName }),
+        suspense: false,
+      },
+      {
+        queryKey: ['clusters', clusterName, 'ksqlDb', 'streams'],
+        queryFn: () => api.listStreams({ clusterName }),
+        suspense: false,
+      },
+    ],
+  });
+}
+
+export function useExecuteKsqlkDbQueryMutation() {
+  return useMutation((props: ExecuteKsqlRequest) => api.executeKsql(props));
+}
+
+const getFormattedErrorFromTableData = (
+  responseValues: KsqlTableResponse['values']
+): { title: string; message: string } => {
+  // We expect someting like that
+  // [[
+  //   "@type",
+  //   "error_code",
+  //   "message",
+  //   "statementText"?,
+  //   "entities"?
+  // ]],
+  // or
+  // [["message"]]
+
+  if (!responseValues || !responseValues.length) {
+    return {
+      title: 'Unknown error',
+      message: 'Recieved empty response',
+    };
+  }
+
+  let title = '';
+  let message = '';
+  if (responseValues[0].length < 2) {
+    const [messageText] = responseValues[0];
+    title = messageText;
+  } else {
+    const [type, errorCode, messageText, statementText, entities] =
+      responseValues[0];
+    title = `[Error #${errorCode}] ${type}`;
+    message =
+      (entities?.length ? `[${entities.join(', ')}] ` : '') +
+      (statementText ? `"${statementText}" ` : '') +
+      messageText;
+  }
+
+  return { title, message };
+};
+
+type UseKsqlkDbSSEProps = {
+  pipeId: string | false;
+  clusterName: ClusterName;
+};
+
+export const useKsqlkDbSSE = ({ clusterName, pipeId }: UseKsqlkDbSSEProps) => {
+  const [data, setData] = React.useState<KsqlTableResponse>();
+  const [isFetching, setIsFetching] = React.useState<boolean>(false);
+
+  const abortController = new AbortController();
+
+  React.useEffect(() => {
+    const fetchData = async () => {
+      const url = `${BASE_PARAMS.basePath}/api/clusters/${clusterName}/ksql/response`;
+      await fetchEventSource(
+        `${url}?${new URLSearchParams({ pipeId: pipeId || '' }).toString()}`,
+        {
+          method: 'GET',
+          signal: abortController.signal,
+          openWhenHidden: true,
+          async onopen(response) {
+            const { ok, status } = response;
+            if (ok) setData(undefined); // Reset
+            if (status >= 400 && status < 500 && status !== 429) {
+              showServerError(response);
+            }
+          },
+          onmessage(event) {
+            const { table }: KsqlResponse = JSON.parse(event.data);
+            if (!table) {
+              return;
+            }
+            switch (table?.header) {
+              case 'Execution error': {
+                showAlert('error', {
+                  ...getFormattedErrorFromTableData(table.values),
+                  id: `${url}-executionError`,
+                });
+                break;
+              }
+              case 'Schema':
+                setData(table);
+                break;
+              case 'Row':
+                setData((state) => ({
+                  header: state?.header,
+                  columnNames: state?.columnNames,
+                  values: [...(state?.values || []), ...(table?.values || [])],
+                }));
+                break;
+              case 'Query Result':
+                showSuccessAlert({
+                  id: `${url}-querySuccess`,
+                  title: 'Query succeed',
+                  message: '',
+                });
+                break;
+              case 'Source Description':
+              case 'properties':
+              default:
+                setData(table);
+                break;
+            }
+          },
+          onclose() {
+            setIsFetching(false);
+          },
+          onerror(err) {
+            setIsFetching(false);
+            showServerError(err);
+          },
+        }
+      );
+    };
+
+    const abortFetchData = () => {
+      setIsFetching(false);
+      if (pipeId) abortController.abort();
+    };
+    if (pipeId) {
+      toast.promise(
+        fetchData(),
+        {
+          loading: (
+            <>
+              <div>Consuming query execution result...</div>
+              &nbsp;
+              <StopLoading onClick={abortFetchData}>Abort</StopLoading>
+            </>
+          ),
+          success: 'Cancelled',
+          error: 'Something went wrong. Please try again.',
+        },
+        {
+          id: 'messages',
+          success: { duration: 20 },
+        }
+      );
+    }
+
+    return abortFetchData;
+  }, [pipeId]);
+
+  return { data, isFetching };
+};
diff --git a/kafka-ui-react-app/src/lib/hooks/useMessageFiltersStore.ts b/kafka-ui-react-app/src/lib/hooks/useMessageFiltersStore.ts
index 9aa59b00e07..8397d41d273 100644
--- a/kafka-ui-react-app/src/lib/hooks/useMessageFiltersStore.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useMessageFiltersStore.ts
@@ -2,7 +2,7 @@ import { LOCAL_STORAGE_KEY_PREFIX } from 'lib/constants';
 import create from 'zustand';
 import { persist } from 'zustand/middleware';
 
-export interface AdvancedFilter {
+interface AdvancedFilter {
   name: string;
   value: string;
 }
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index f372d541eb5..ad24ed2f6b4 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -204,7 +204,7 @@ export const clusterConnectorsRelativePath = 'connectors';
 export const clusterConnectorNewRelativePath = 'create-new';
 export const clusterConnectConnectorsRelativePath = `${RouteParams.connectName}/connectors`;
 export const clusterConnectConnectorRelativePath = `${clusterConnectConnectorsRelativePath}/${RouteParams.connectorName}`;
-export const clusterConnectConnectorTasksRelativePath = 'tasks';
+const clusterConnectConnectorTasksRelativePath = 'tasks';
 export const clusterConnectConnectorConfigRelativePath = 'config';
 
 export const clusterConnectsPath = (
@@ -287,5 +287,5 @@ export const clusterConfigPath = (
   clusterName: ClusterName = RouteParams.clusterName
 ) => `${clusterPath(clusterName)}/${clusterConfigRelativePath}`;
 
-export const clusterNewConfigRelativePath = 'create-new-cluster';
+const clusterNewConfigRelativePath = 'create-new-cluster';
 export const clusterNewConfigPath = `/ui/clusters/${clusterNewConfigRelativePath}`;
diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index 2720245e0b4..9c96e073db5 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -41,7 +41,8 @@ const isJsonObject = () => {
 };
 
 /**
- * due to yup rerunning all the object validiation during any render, it makes sense to cache the async results
+ * due to yup rerunning all the object validiation during any render,
+ * it makes sense to cache the async results
  * */
 export function cacheTest(
   asyncValidate: (val?: string, ctx?: yup.AnyObject) => Promise<boolean>
diff --git a/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts b/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
deleted file mode 100644
index 007055df632..00000000000
--- a/kafka-ui-react-app/src/redux/interfaces/ksqlDb.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {
-  KsqlCommandV2Response,
-  KsqlStreamDescription,
-  KsqlTableDescription,
-} from 'generated-sources';
-
-export interface KsqlState {
-  tables: KsqlTableDescription[];
-  streams: KsqlStreamDescription[];
-  executionResult: KsqlCommandV2Response | null;
-}
-
-export interface KsqlDescription {
-  name?: string;
-  topic?: string;
-  keyFormat?: string;
-  valueFormat?: string;
-  isWindowed?: boolean;
-}
diff --git a/kafka-ui-react-app/src/redux/reducers/index.ts b/kafka-ui-react-app/src/redux/reducers/index.ts
index 9cb88ad8404..78a2055a9c5 100644
--- a/kafka-ui-react-app/src/redux/reducers/index.ts
+++ b/kafka-ui-react-app/src/redux/reducers/index.ts
@@ -3,12 +3,10 @@ import loader from 'redux/reducers/loader/loaderSlice';
 import schemas from 'redux/reducers/schemas/schemasSlice';
 import topicMessages from 'redux/reducers/topicMessages/topicMessagesSlice';
 import consumerGroups from 'redux/reducers/consumerGroups/consumerGroupsSlice';
-import ksqlDb from 'redux/reducers/ksqlDb/ksqlDbSlice';
 
 export default combineReducers({
   loader,
   topicMessages,
   consumerGroups,
   schemas,
-  ksqlDb,
 });
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts
deleted file mode 100644
index 3f570634710..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/fixtures.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-type Dictionary<T> = Record<string, T>;
-
-export const fetchKsqlDbTablesPayload: {
-  tables: Dictionary<string>[];
-  streams: Dictionary<string>[];
-} = {
-  tables: [
-    {
-      type: 'TABLE',
-      name: 'USERS',
-      topic: 'users',
-      keyFormat: 'KAFKA',
-      valueFormat: 'AVRO',
-      isWindowed: 'false',
-    },
-    {
-      type: 'TABLE',
-      name: 'USERS2',
-      topic: 'users',
-      keyFormat: 'KAFKA',
-      valueFormat: 'AVRO',
-      isWindowed: 'false',
-    },
-  ],
-  streams: [
-    {
-      type: 'STREAM',
-      name: 'KSQL_PROCESSING_LOG',
-      topic: 'default_ksql_processing_log',
-      keyFormat: 'KAFKA',
-      valueFormat: 'JSON',
-      isWindowed: 'false',
-    },
-    {
-      type: 'STREAM',
-      name: 'PAGEVIEWS',
-      topic: 'pageviews',
-      keyFormat: 'KAFKA',
-      valueFormat: 'AVRO',
-      isWindowed: 'false',
-    },
-  ],
-};
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/selectors.spec.ts
deleted file mode 100644
index 5e60caa74cc..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/__test__/selectors.spec.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { store } from 'redux/store';
-import * as selectors from 'redux/reducers/ksqlDb/selectors';
-import { fetchKsqlDbTables } from 'redux/reducers/ksqlDb/ksqlDbSlice';
-
-import { fetchKsqlDbTablesPayload } from './fixtures';
-
-describe('TopicMessages selectors', () => {
-  describe('Initial state', () => {
-    beforeAll(() => {
-      store.dispatch({
-        type: fetchKsqlDbTables.pending.type,
-        payload: fetchKsqlDbTablesPayload,
-      });
-    });
-
-    it('Returns empty state', () => {
-      expect(selectors.getKsqlDbTables(store.getState())).toEqual({
-        rows: {
-          streams: [],
-          tables: [],
-        },
-        fetched: false,
-        fetching: true,
-        tablesCount: 0,
-        streamsCount: 0,
-      });
-    });
-  });
-
-  describe('State', () => {
-    beforeAll(() => {
-      store.dispatch({
-        type: fetchKsqlDbTables.fulfilled.type,
-        payload: fetchKsqlDbTablesPayload,
-      });
-    });
-
-    it('Returns tables and streams', () => {
-      expect(selectors.getKsqlDbTables(store.getState())).toEqual({
-        rows: {
-          streams: [...fetchKsqlDbTablesPayload.streams],
-          tables: [...fetchKsqlDbTablesPayload.tables],
-        },
-        fetched: true,
-        fetching: false,
-        tablesCount: 2,
-        streamsCount: 2,
-      });
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
deleted file mode 100644
index fed60d5d346..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/ksqlDbSlice.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { KsqlState } from 'redux/interfaces/ksqlDb';
-import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { ExecuteKsqlRequest } from 'generated-sources';
-import { ClusterName } from 'redux/interfaces';
-import { ksqlDbApiClient } from 'lib/api';
-
-const getTables = (clusterName: ClusterName) =>
-  ksqlDbApiClient.listTables({
-    clusterName,
-  });
-
-const getStreams = (clusterName: ClusterName) =>
-  ksqlDbApiClient.listStreams({
-    clusterName,
-  });
-
-export const fetchKsqlDbTables = createAsyncThunk(
-  'ksqlDb/fetchKsqlDbTables',
-  async (clusterName: ClusterName) => {
-    const [tables, streams] = await Promise.all([
-      getTables(clusterName),
-      getStreams(clusterName),
-    ]);
-
-    const processedTables = tables.map((table) => ({
-      type: 'TABLE',
-      ...table,
-    }));
-    const processedStreams = streams.map((stream) => ({
-      type: 'STREAM',
-      ...stream,
-    }));
-
-    return {
-      tables: processedTables,
-      streams: processedStreams,
-    };
-  }
-);
-
-export const executeKsql = createAsyncThunk(
-  'ksqlDb/executeKsql',
-  (params: ExecuteKsqlRequest) => ksqlDbApiClient.executeKsql(params)
-);
-
-const initialState: KsqlState = {
-  streams: [],
-  tables: [],
-  executionResult: null,
-};
-
-const ksqlDbSlice = createSlice({
-  name: 'ksqlDb',
-  initialState,
-  reducers: {
-    resetExecutionResult: (state) => ({
-      ...state,
-      executionResult: null,
-    }),
-  },
-  extraReducers: (builder) => {
-    builder.addCase(fetchKsqlDbTables.fulfilled, (state, action) => ({
-      ...state,
-      ...action.payload,
-    }));
-    builder.addCase(executeKsql.fulfilled, (state, action) => ({
-      ...state,
-      executionResult: action.payload,
-    }));
-  },
-});
-
-export const { resetExecutionResult } = ksqlDbSlice.actions;
-
-export default ksqlDbSlice.reducer;
diff --git a/kafka-ui-react-app/src/redux/reducers/ksqlDb/selectors.ts b/kafka-ui-react-app/src/redux/reducers/ksqlDb/selectors.ts
deleted file mode 100644
index 0e61995ea56..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/ksqlDb/selectors.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { createSelector } from '@reduxjs/toolkit';
-import { RootState } from 'redux/interfaces';
-import { createFetchingSelector } from 'redux/reducers/loader/selectors';
-import { KsqlState } from 'redux/interfaces/ksqlDb';
-import { AsyncRequestStatus } from 'lib/constants';
-
-const ksqlDbState = ({ ksqlDb }: RootState): KsqlState => ksqlDb;
-
-const getKsqlDbFetchTablesAndStreamsFetchingStatus = createFetchingSelector(
-  'ksqlDb/fetchKsqlDbTables'
-);
-
-const getKsqlExecutionStatus = createFetchingSelector('ksqlDb/executeKsql');
-
-export const getKsqlDbTables = createSelector(
-  [ksqlDbState, getKsqlDbFetchTablesAndStreamsFetchingStatus],
-  (state, status) => ({
-    rows: { streams: [...state.streams], tables: [...state.tables] },
-    fetched: status === AsyncRequestStatus.fulfilled,
-    fetching: status === AsyncRequestStatus.pending,
-    tablesCount: state.tables.length,
-    streamsCount: state.streams.length,
-  })
-);
-
-export const getKsqlExecution = createSelector(
-  [ksqlDbState, getKsqlExecutionStatus],
-  (state, status) => ({
-    executionResult: state.executionResult,
-    fetched: status === AsyncRequestStatus.fulfilled,
-    fetching: status === AsyncRequestStatus.pending,
-  })
-);
diff --git a/kafka-ui-react-app/vite.config.ts b/kafka-ui-react-app/vite.config.ts
index 189e72e7f9d..b4cdd022a9f 100644
--- a/kafka-ui-react-app/vite.config.ts
+++ b/kafka-ui-react-app/vite.config.ts
@@ -25,6 +25,13 @@ export default defineConfig(({ mode }) => {
     },
     build: {
       outDir: 'build',
+      rollupOptions: {
+        output: {
+          manualChunks: {
+            ace: ['ace-builds', 'react-ace'],
+          },
+        },
+      },
     },
     experimental: {
       renderBuiltUrl(

From 8d3bac8834b5dbc26009915801d25aa1a0a6adf6 Mon Sep 17 00:00:00 2001
From: Oleg Shur <workshur@gmail.com>
Date: Thu, 23 Mar 2023 18:40:12 +0300
Subject: [PATCH 464/734] [FE} Refactor Consumers Section (#3508)

* refactor CG List & details page

* Refactor ResetOffset page

* get rid of redux reducer
---
 .../ConsumerGroups/ConsumerGroups.tsx         |   5 +-
 .../ConsumerGroups/Details/Details.tsx        |  53 +--
 .../Details/ResetOffsets/Form.tsx             | 197 +++++++++++
 .../ResetOffsets/ResetOffsets.styled.ts       |  59 ++--
 .../Details/ResetOffsets/ResetOffsets.tsx     | 321 ++----------------
 .../__test__/ResetOffsets.spec.tsx            | 158 ---------
 .../__test__/TopicContents.spec.tsx           |   2 +-
 .../Details/__tests__/Details.spec.tsx        | 114 -------
 .../Details/__tests__/ListItem.spec.tsx       |  48 ---
 .../ConsumerGroups/{List => }/List.tsx        |  47 ++-
 .../ConsumerGroups/List/ListContainer.tsx     |  16 -
 .../List/__test__/List.spec.tsx               |  60 ----
 .../__test__/ConsumerGroups.spec.tsx          |   6 +-
 .../common/NewTable/Table.styled.ts           |  13 +-
 .../src/components/common/NewTable/Table.tsx  |   5 +-
 .../fixtures/consumerGroups.ts}               |  25 --
 .../src/lib/hooks/api/consumers.ts            |  92 +++++
 kafka-ui-react-app/src/lib/paths.ts           |   8 +-
 .../src/redux/interfaces/consumerGroup.ts     |   3 +-
 .../__test__/consumerGroupSlice.spec.ts       |  49 ---
 .../consumerGroups/consumerGroupsSlice.ts     | 223 ------------
 .../src/redux/reducers/index.ts               |   2 -
 22 files changed, 402 insertions(+), 1104 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/Form.tsx
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx
 rename kafka-ui-react-app/src/components/ConsumerGroups/{List => }/List.tsx (70%)
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.tsx
 delete mode 100644 kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx
 rename kafka-ui-react-app/src/{redux/reducers/consumerGroups/__test__/fixtures.ts => lib/fixtures/consumerGroups.ts} (75%)
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/consumers.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/consumerGroupSlice.spec.ts
 delete mode 100644 kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/ConsumerGroups.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/ConsumerGroups.tsx
index b3f5ab4e027..2b729718de6 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/ConsumerGroups.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/ConsumerGroups.tsx
@@ -1,17 +1,18 @@
 import React from 'react';
 import { Route, Routes } from 'react-router-dom';
 import Details from 'components/ConsumerGroups/Details/Details';
-import ListContainer from 'components/ConsumerGroups/List/ListContainer';
 import ResetOffsets from 'components/ConsumerGroups/Details/ResetOffsets/ResetOffsets';
 import {
   clusterConsumerGroupResetOffsetsRelativePath,
   RouteParams,
 } from 'lib/paths';
 
+import List from './List';
+
 const ConsumerGroups: React.FC = () => {
   return (
     <Routes>
-      <Route index element={<ListContainer />} />
+      <Route index element={<List />} />
       <Route path={RouteParams.consumerGroupID} element={<Details />} />
       <Route
         path={clusterConsumerGroupResetOffsetsRelativePath}
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index e2226f59813..00859da0414 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -7,26 +7,22 @@ import {
   ClusterGroupParam,
 } from 'lib/paths';
 import Search from 'components/common/Search/Search';
-import PageLoader from 'components/common/PageLoader/PageLoader';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import groupBy from 'lodash/groupBy';
 import { Table } from 'components/common/table/Table/Table.styled';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
-import {
-  deleteConsumerGroup,
-  selectById,
-  fetchConsumerGroupDetails,
-  getAreConsumerGroupDetailsFulfilled,
-} from 'redux/reducers/consumerGroups/consumerGroupsSlice';
 import getTagColor from 'components/common/Tag/getTagColor';
 import { Dropdown } from 'components/common/Dropdown';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
 import { Action, ResourceType } from 'generated-sources';
 import { ActionDropdownItem } from 'components/common/ActionComponent';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
+import {
+  useConsumerGroupDetails,
+  useDeleteConsumerGroupMutation,
+} from 'lib/hooks/api/consumers';
 
 import ListItem from './ListItem';
 
@@ -35,38 +31,25 @@ const Details: React.FC = () => {
   const [searchParams] = useSearchParams();
   const searchValue = searchParams.get('q') || '';
   const { isReadOnly } = React.useContext(ClusterContext);
-  const { consumerGroupID, clusterName } = useAppParams<ClusterGroupParam>();
-  const dispatch = useAppDispatch();
-  const consumerGroup = useAppSelector((state) =>
-    selectById(state, consumerGroupID)
-  );
-  const isFetched = useAppSelector(getAreConsumerGroupDetailsFulfilled);
+  const routeParams = useAppParams<ClusterGroupParam>();
+  const { clusterName, consumerGroupID } = routeParams;
 
-  React.useEffect(() => {
-    dispatch(fetchConsumerGroupDetails({ clusterName, consumerGroupID }));
-  }, [clusterName, consumerGroupID, dispatch]);
+  const consumerGroup = useConsumerGroupDetails(routeParams);
+  const deleteConsumerGroup = useDeleteConsumerGroupMutation(routeParams);
 
   const onDelete = async () => {
-    const res = await dispatch(
-      deleteConsumerGroup({ clusterName, consumerGroupID })
-    ).unwrap();
-    if (res) navigate('../');
+    await deleteConsumerGroup.mutateAsync();
+    navigate('../');
   };
 
   const onResetOffsets = () => {
     navigate(clusterConsumerGroupResetRelativePath);
   };
 
-  if (!isFetched || !consumerGroup) {
-    return <PageLoader />;
-  }
-
-  const partitionsByTopic = groupBy(consumerGroup.partitions, 'topic');
-
+  const partitionsByTopic = groupBy(consumerGroup.data?.partitions, 'topic');
   const filteredPartitionsByTopic = Object.keys(partitionsByTopic).filter(
     (el) => el.includes(searchValue)
   );
-
   const currentPartitionsByTopic = searchValue.length
     ? filteredPartitionsByTopic
     : Object.keys(partitionsByTopic);
@@ -110,24 +93,24 @@ const Details: React.FC = () => {
       <Metrics.Wrapper>
         <Metrics.Section>
           <Metrics.Indicator label="State">
-            <Tag color={getTagColor(consumerGroup.state)}>
-              {consumerGroup.state}
+            <Tag color={getTagColor(consumerGroup.data?.state)}>
+              {consumerGroup.data?.state}
             </Tag>
           </Metrics.Indicator>
           <Metrics.Indicator label="Members">
-            {consumerGroup.members}
+            {consumerGroup.data?.members}
           </Metrics.Indicator>
           <Metrics.Indicator label="Assigned Topics">
-            {consumerGroup.topics}
+            {consumerGroup.data?.topics}
           </Metrics.Indicator>
           <Metrics.Indicator label="Assigned Partitions">
-            {consumerGroup.partitions?.length}
+            {consumerGroup.data?.partitions?.length}
           </Metrics.Indicator>
           <Metrics.Indicator label="Coordinator ID">
-            {consumerGroup.coordinator?.id}
+            {consumerGroup.data?.coordinator?.id}
           </Metrics.Indicator>
           <Metrics.Indicator label="Total lag">
-            {consumerGroup.messagesBehind}
+            {consumerGroup.data?.messagesBehind}
           </Metrics.Indicator>
         </Metrics.Section>
       </Metrics.Wrapper>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/Form.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/Form.tsx
new file mode 100644
index 00000000000..8ee7995bf2a
--- /dev/null
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/Form.tsx
@@ -0,0 +1,197 @@
+import React from 'react';
+import { useNavigate } from 'react-router-dom';
+import {
+  ConsumerGroupDetails,
+  ConsumerGroupOffsetsReset,
+  ConsumerGroupOffsetsResetType,
+} from 'generated-sources';
+import { ClusterGroupParam } from 'lib/paths';
+import {
+  Controller,
+  FormProvider,
+  useFieldArray,
+  useForm,
+} from 'react-hook-form';
+import { MultiSelect, Option } from 'react-multi-select-component';
+import 'react-datepicker/dist/react-datepicker.css';
+import { ErrorMessage } from '@hookform/error-message';
+import { InputLabel } from 'components/common/Input/InputLabel.styled';
+import { Button } from 'components/common/Button/Button';
+import Input from 'components/common/Input/Input';
+import { FormError } from 'components/common/Input/Input.styled';
+import useAppParams from 'lib/hooks/useAppParams';
+import { useResetConsumerGroupOffsetsMutation } from 'lib/hooks/api/consumers';
+import { FlexFieldset, StyledForm } from 'components/common/Form/Form.styled';
+import ControlledSelect from 'components/common/Select/ControlledSelect';
+
+import * as S from './ResetOffsets.styled';
+
+interface FormProps {
+  defaultValues: ConsumerGroupOffsetsReset;
+  topics: string[];
+  partitions: ConsumerGroupDetails['partitions'];
+}
+
+const resetTypeOptions = Object.values(ConsumerGroupOffsetsResetType).map(
+  (value) => ({ value, label: value })
+);
+
+const Form: React.FC<FormProps> = ({ defaultValues, partitions, topics }) => {
+  const navigate = useNavigate();
+  const routerParams = useAppParams<ClusterGroupParam>();
+  const reset = useResetConsumerGroupOffsetsMutation(routerParams);
+  const topicOptions = React.useMemo(
+    () => topics.map((value) => ({ value, label: value })),
+    [topics]
+  );
+  const methods = useForm<ConsumerGroupOffsetsReset>({
+    mode: 'onChange',
+    defaultValues,
+  });
+
+  const {
+    handleSubmit,
+    setValue,
+    watch,
+    control,
+    formState: { errors },
+  } = methods;
+  const { fields } = useFieldArray({
+    control,
+    name: 'partitionsOffsets',
+  });
+
+  const resetTypeValue = watch('resetType');
+  const topicValue = watch('topic');
+  const offsetsValue = watch('partitionsOffsets');
+  const partitionsValue = watch('partitions') || [];
+
+  const partitionOptions =
+    partitions
+      ?.filter((p) => p.topic === topicValue)
+      .map((p) => ({
+        label: `Partition #${p.partition.toString()}`,
+        value: p.partition,
+      })) || [];
+
+  const onSelectedPartitionsChange = (selected: Option[]) => {
+    setValue(
+      'partitions',
+      selected.map(({ value }) => value)
+    );
+
+    setValue(
+      'partitionsOffsets',
+      selected.map(({ value }) => {
+        const currentOffset = offsetsValue?.find(
+          ({ partition }) => partition === value
+        );
+        return { offset: currentOffset?.offset, partition: value };
+      })
+    );
+  };
+
+  React.useEffect(() => {
+    onSelectedPartitionsChange([]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [topicValue]);
+
+  const onSubmit = async (data: ConsumerGroupOffsetsReset) => {
+    await reset.mutateAsync(data);
+    navigate('../');
+  };
+
+  return (
+    <FormProvider {...methods}>
+      <StyledForm onSubmit={handleSubmit(onSubmit)}>
+        <FlexFieldset>
+          <ControlledSelect
+            name="topic"
+            label="Topic"
+            placeholder="Select Topic"
+            options={topicOptions}
+          />
+          <ControlledSelect
+            name="resetType"
+            label="Reset Type"
+            placeholder="Select Reset Type"
+            options={resetTypeOptions}
+          />
+          <div>
+            <InputLabel>Partitions</InputLabel>
+            <MultiSelect
+              options={partitionOptions}
+              value={partitionsValue.map((p) => ({
+                value: p,
+                label: String(p),
+              }))}
+              onChange={onSelectedPartitionsChange}
+              labelledBy="Select partitions"
+            />
+          </div>
+          {resetTypeValue === ConsumerGroupOffsetsResetType.TIMESTAMP &&
+            partitionsValue.length > 0 && (
+              <div>
+                <InputLabel>Timestamp</InputLabel>
+                <Controller
+                  control={control}
+                  name="resetToTimestamp"
+                  rules={{
+                    required: 'Timestamp is required',
+                  }}
+                  render={({ field: { onChange, onBlur, value, ref } }) => (
+                    <S.DatePickerInput
+                      ref={ref}
+                      selected={new Date(value as number)}
+                      onChange={(e: Date | null) => onChange(e?.getTime())}
+                      onBlur={onBlur}
+                    />
+                  )}
+                />
+                <ErrorMessage
+                  errors={errors}
+                  name="resetToTimestamp"
+                  render={({ message }) => <FormError>{message}</FormError>}
+                />
+              </div>
+            )}
+
+          {resetTypeValue === ConsumerGroupOffsetsResetType.OFFSET &&
+            partitionsValue.length > 0 && (
+              <S.OffsetsWrapper>
+                {fields.map((field, index) => (
+                  <Input
+                    key={field.id}
+                    label={`Partition #${field.partition} Offset`}
+                    type="number"
+                    name={`partitionsOffsets.${index}.offset` as const}
+                    hookFormOptions={{
+                      shouldUnregister: true,
+                      required: 'Offset is required',
+                      min: {
+                        value: 0,
+                        message: 'must be greater than or equal to 0',
+                      },
+                    }}
+                    withError
+                  />
+                ))}
+              </S.OffsetsWrapper>
+            )}
+        </FlexFieldset>
+        <div>
+          <Button
+            buttonSize="M"
+            buttonType="primary"
+            type="submit"
+            disabled={partitionsValue.length === 0}
+          >
+            Submit
+          </Button>
+        </div>
+      </StyledForm>
+    </FormProvider>
+  );
+};
+
+export default Form;
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts
index fc1b22f607a..8a0cf02b4c3 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.styled.ts
@@ -1,37 +1,5 @@
 import styled from 'styled-components';
-
-export const Wrapper = styled.div`
-  padding: 16px;
-  padding-top: 0;
-
-  & > form {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
-
-    & > button:last-child {
-      align-self: flex-start;
-    }
-  }
-
-  & .multi-select {
-    height: 32px;
-    & > .dropdown-container {
-      height: 32px;
-      & > .dropdown-heading {
-        height: 32px;
-      }
-    }
-  }
-`;
-
-export const MainSelectors = styled.div`
-  display: flex;
-  gap: 16px;
-  & > * {
-    flex-grow: 1;
-  }
-`;
+import DatePicker from 'react-datepicker';
 
 export const OffsetsWrapper = styled.div`
   display: flex;
@@ -40,7 +8,26 @@ export const OffsetsWrapper = styled.div`
   gap: 16px;
 `;
 
-export const OffsetsTitle = styled.h1`
-  font-size: 18px;
-  font-weight: 500;
+export const DatePickerInput = styled(DatePicker).attrs({
+  showTimeInput: true,
+  timeInputLabel: 'Time:',
+  dateFormat: 'MMMM d, yyyy h:mm aa',
+})`
+  height: 40px;
+  border: 1px ${({ theme }) => theme.select.borderColor.normal} solid;
+  border-radius: 4px;
+  font-size: 14px;
+  width: 270px;
+  padding-left: 12px;
+  background-color: ${({ theme }) => theme.input.backgroundColor.normal};
+  color: ${({ theme }) => theme.input.color.normal};
+  &::placeholder {
+    color: ${({ theme }) => theme.input.color.normal};
+  }
+  &:hover {
+    cursor: pointer;
+  }
+  &:focus {
+    outline: none;
+  }
 `;
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
index cb4b602cd80..8d220501940 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
@@ -1,315 +1,52 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom';
-import { ConsumerGroupOffsetsResetType } from 'generated-sources';
 import { clusterConsumerGroupsPath, ClusterGroupParam } from 'lib/paths';
-import {
-  Controller,
-  FormProvider,
-  useFieldArray,
-  useForm,
-} from 'react-hook-form';
-import { MultiSelect, Option } from 'react-multi-select-component';
-import DatePicker from 'react-datepicker';
 import 'react-datepicker/dist/react-datepicker.css';
-import groupBy from 'lodash/groupBy';
-import PageLoader from 'components/common/PageLoader/PageLoader';
-import { ErrorMessage } from '@hookform/error-message';
-import Select from 'components/common/Select/Select';
-import { InputLabel } from 'components/common/Input/InputLabel.styled';
-import { Button } from 'components/common/Button/Button';
-import Input from 'components/common/Input/Input';
-import { FormError } from 'components/common/Input/Input.styled';
 import PageHeading from 'components/common/PageHeading/PageHeading';
-import {
-  fetchConsumerGroupDetails,
-  selectById,
-  getAreConsumerGroupDetailsFulfilled,
-  getIsOffsetReseted,
-  resetConsumerGroupOffsets,
-} from 'redux/reducers/consumerGroups/consumerGroupsSlice';
-import { useAppDispatch, useAppSelector } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
-import { resetLoaderById } from 'redux/reducers/loader/loaderSlice';
-
-import * as S from './ResetOffsets.styled';
+import { useConsumerGroupDetails } from 'lib/hooks/api/consumers';
+import PageLoader from 'components/common/PageLoader/PageLoader';
+import {
+  ConsumerGroupOffsetsReset,
+  ConsumerGroupOffsetsResetType,
+} from 'generated-sources';
 
-interface FormType {
-  topic: string;
-  resetType: ConsumerGroupOffsetsResetType;
-  partitionsOffsets: { offset: string | undefined; partition: number }[];
-  resetToTimestamp: Date;
-}
+import Form from './Form';
 
 const ResetOffsets: React.FC = () => {
-  const dispatch = useAppDispatch();
-  const { consumerGroupID, clusterName } = useAppParams<ClusterGroupParam>();
-  const consumerGroup = useAppSelector((state) =>
-    selectById(state, consumerGroupID)
-  );
-
-  const isFetched = useAppSelector(getAreConsumerGroupDetailsFulfilled);
-  const isOffsetReseted = useAppSelector(getIsOffsetReseted);
-
-  React.useEffect(() => {
-    dispatch(fetchConsumerGroupDetails({ clusterName, consumerGroupID }));
-  }, [clusterName, consumerGroupID, dispatch]);
+  const routerParams = useAppParams<ClusterGroupParam>();
 
-  const [uniqueTopics, setUniqueTopics] = React.useState<string[]>([]);
-  const [selectedPartitions, setSelectedPartitions] = React.useState<Option[]>(
-    []
-  );
+  const consumerGroup = useConsumerGroupDetails(routerParams);
 
-  const methods = useForm<FormType>({
-    mode: 'onChange',
-    defaultValues: {
-      resetType: ConsumerGroupOffsetsResetType.EARLIEST,
-      topic: '',
-      partitionsOffsets: [],
-    },
-  });
-  const {
-    handleSubmit,
-    setValue,
-    watch,
-    control,
-    setError,
-    clearErrors,
-    formState: { errors, isValid },
-  } = methods;
-  const { fields } = useFieldArray({
-    control,
-    name: 'partitionsOffsets',
-  });
-  const resetTypeValue = watch('resetType');
-  const topicValue = watch('topic');
-  const offsetsValue = watch('partitionsOffsets');
+  if (consumerGroup.isLoading || !consumerGroup.isSuccess)
+    return <PageLoader />;
 
-  React.useEffect(() => {
-    if (isFetched && consumerGroup?.partitions) {
-      setValue('topic', consumerGroup.partitions[0].topic);
-      setUniqueTopics(Object.keys(groupBy(consumerGroup.partitions, 'topic')));
-    }
-  }, [consumerGroup?.partitions, isFetched, setValue]);
+  const partitions = consumerGroup.data.partitions || [];
+  const { topic } = partitions[0];
 
-  const onSelectedPartitionsChange = (value: Option[]) => {
-    clearErrors();
-    setValue(
-      'partitionsOffsets',
-      value.map((partition) => {
-        const currentOffset = offsetsValue.find(
-          (offset) => offset.partition === partition.value
-        );
-        return {
-          offset: currentOffset ? currentOffset?.offset : undefined,
-          partition: partition.value,
-        };
-      })
-    );
-    setSelectedPartitions(value);
-  };
-
-  React.useEffect(() => {
-    onSelectedPartitionsChange([]);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [topicValue]);
+  const uniqTopics = Array.from(
+    new Set(partitions.map((partition) => partition.topic))
+  );
 
-  const onSubmit = (data: FormType) => {
-    const augmentedData = {
-      ...data,
-      partitions: selectedPartitions.map((partition) => partition.value),
-      partitionsOffsets: data.partitionsOffsets as {
-        offset: string;
-        partition: number;
-      }[],
-    };
-    let isValidAugmentedData = true;
-    if (augmentedData.resetType === ConsumerGroupOffsetsResetType.OFFSET) {
-      augmentedData.partitionsOffsets.forEach((offset, index) => {
-        if (!offset.offset) {
-          setError(`partitionsOffsets.${index}.offset`, {
-            type: 'manual',
-            message: "This field shouldn't be empty!",
-          });
-          isValidAugmentedData = false;
-        }
-      });
-    } else if (
-      augmentedData.resetType === ConsumerGroupOffsetsResetType.TIMESTAMP
-    ) {
-      if (!augmentedData.resetToTimestamp) {
-        setError(`resetToTimestamp`, {
-          type: 'manual',
-          message: "This field shouldn't be empty!",
-        });
-        isValidAugmentedData = false;
-      }
-    }
-    if (isValidAugmentedData) {
-      dispatch(
-        resetConsumerGroupOffsets({
-          clusterName,
-          consumerGroupID,
-          requestBody: augmentedData,
-        })
-      );
-    }
+  const defaultValues: ConsumerGroupOffsetsReset = {
+    resetType: ConsumerGroupOffsetsResetType.EARLIEST,
+    topic,
+    partitionsOffsets: [],
+    resetToTimestamp: new Date().getTime(),
   };
 
-  const navigate = useNavigate();
-  React.useEffect(() => {
-    if (isOffsetReseted) {
-      dispatch(resetLoaderById('consumerGroups/resetConsumerGroupOffsets'));
-      navigate('../');
-    }
-  }, [clusterName, consumerGroupID, dispatch, navigate, isOffsetReseted]);
-
-  if (!isFetched || !consumerGroup) {
-    return <PageLoader />;
-  }
-
   return (
-    <FormProvider {...methods}>
+    <>
       <PageHeading
         text="Reset offsets"
-        backTo={clusterConsumerGroupsPath(clusterName)}
+        backTo={clusterConsumerGroupsPath(routerParams.clusterName)}
         backText="Consumers"
       />
-      <S.Wrapper>
-        <form onSubmit={handleSubmit(onSubmit)}>
-          <S.MainSelectors>
-            <div>
-              <InputLabel id="topicLabel">Topic</InputLabel>
-              <Controller
-                control={control}
-                name="topic"
-                render={({ field: { name, onChange, value } }) => (
-                  <Select
-                    id="topic"
-                    selectSize="M"
-                    aria-labelledby="topicLabel"
-                    minWidth="100%"
-                    name={name}
-                    onChange={onChange}
-                    defaultValue={value}
-                    value={value}
-                    options={uniqueTopics.map((topic) => ({
-                      value: topic,
-                      label: topic,
-                    }))}
-                  />
-                )}
-              />
-            </div>
-            <div>
-              <InputLabel id="resetTypeLabel">Reset Type</InputLabel>
-              <Controller
-                control={control}
-                name="resetType"
-                render={({ field: { name, onChange, value } }) => (
-                  <Select
-                    id="resetType"
-                    selectSize="M"
-                    aria-labelledby="resetTypeLabel"
-                    minWidth="100%"
-                    name={name}
-                    onChange={onChange}
-                    value={value}
-                    options={Object.values(ConsumerGroupOffsetsResetType).map(
-                      (type) => ({ value: type, label: type })
-                    )}
-                  />
-                )}
-              />
-            </div>
-            <div>
-              <InputLabel>Partitions</InputLabel>
-              <MultiSelect
-                options={
-                  consumerGroup.partitions
-                    ?.filter((p) => p.topic === topicValue)
-                    .map((p) => ({
-                      label: `Partition #${p.partition.toString()}`,
-                      value: p.partition,
-                    })) || []
-                }
-                value={selectedPartitions}
-                onChange={onSelectedPartitionsChange}
-                labelledBy="Select partitions"
-              />
-            </div>
-          </S.MainSelectors>
-          {resetTypeValue === ConsumerGroupOffsetsResetType.TIMESTAMP &&
-            selectedPartitions.length > 0 && (
-              <div>
-                <InputLabel>Timestamp</InputLabel>
-                <Controller
-                  control={control}
-                  name="resetToTimestamp"
-                  render={({ field: { onChange, onBlur, value, ref } }) => (
-                    <DatePicker
-                      ref={ref}
-                      selected={value}
-                      onChange={onChange}
-                      onBlur={onBlur}
-                      showTimeInput
-                      timeInputLabel="Time:"
-                      dateFormat="MMMM d, yyyy h:mm aa"
-                    />
-                  )}
-                />
-                <ErrorMessage
-                  errors={errors}
-                  name="resetToTimestamp"
-                  render={({ message }) => <FormError>{message}</FormError>}
-                />
-              </div>
-            )}
-          {resetTypeValue === ConsumerGroupOffsetsResetType.OFFSET &&
-            selectedPartitions.length > 0 && (
-              <div>
-                <S.OffsetsTitle>Offsets</S.OffsetsTitle>
-                <S.OffsetsWrapper>
-                  {fields.map((field, index) => (
-                    <div key={field.id}>
-                      <InputLabel htmlFor={`partitionsOffsets.${index}.offset`}>
-                        Partition #{field.partition}
-                      </InputLabel>
-                      <Input
-                        id={`partitionsOffsets.${index}.offset`}
-                        type="number"
-                        name={`partitionsOffsets.${index}.offset` as const}
-                        hookFormOptions={{
-                          shouldUnregister: true,
-                          min: {
-                            value: 0,
-                            message: 'must be greater than or equal to 0',
-                          },
-                        }}
-                        defaultValue={field.offset}
-                      />
-                      <ErrorMessage
-                        errors={errors}
-                        name={`partitionsOffsets.${index}.offset`}
-                        render={({ message }) => (
-                          <FormError>{message}</FormError>
-                        )}
-                      />
-                    </div>
-                  ))}
-                </S.OffsetsWrapper>
-              </div>
-            )}
-          <Button
-            buttonSize="M"
-            buttonType="primary"
-            type="submit"
-            disabled={!isValid || selectedPartitions.length === 0}
-          >
-            Submit
-          </Button>
-        </form>
-      </S.Wrapper>
-    </FormProvider>
+      <Form
+        defaultValues={defaultValues}
+        topics={uniqTopics}
+        partitions={partitions}
+      />
+    </>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx
deleted file mode 100644
index 21bcd560879..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/__test__/ResetOffsets.spec.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import React from 'react';
-import fetchMock from 'fetch-mock';
-import { act, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { render, WithRoute } from 'lib/testHelpers';
-import { clusterConsumerGroupResetOffsetsPath } from 'lib/paths';
-import { consumerGroupPayload } from 'redux/reducers/consumerGroups/__test__/fixtures';
-import ResetOffsets from 'components/ConsumerGroups/Details/ResetOffsets/ResetOffsets';
-
-const clusterName = 'cluster1';
-const { groupId } = consumerGroupPayload;
-
-const renderComponent = () =>
-  render(
-    <WithRoute path={clusterConsumerGroupResetOffsetsPath()}>
-      <ResetOffsets />
-    </WithRoute>,
-    {
-      initialEntries: [
-        clusterConsumerGroupResetOffsetsPath(
-          clusterName,
-          consumerGroupPayload.groupId
-        ),
-      ],
-    }
-  );
-
-const resetConsumerGroupOffsetsMockCalled = () =>
-  expect(
-    fetchMock.called(
-      `/api/clusters/${clusterName}/consumer-groups/${groupId}/offsets`
-    )
-  ).toBeTruthy();
-
-const selectresetTypeAndPartitions = async (resetType: string) => {
-  await userEvent.click(screen.getByLabelText('Reset Type'));
-  await userEvent.click(screen.getByText(resetType));
-  await userEvent.click(screen.getByText('Select...'));
-  await userEvent.click(screen.getByText('Partition #0'));
-};
-
-const resetConsumerGroupOffsetsWith = async (
-  resetType: string,
-  offset: null | number = null
-) => {
-  await userEvent.click(screen.getByLabelText('Reset Type'));
-  const options = screen.getAllByText(resetType);
-  await userEvent.click(options.length > 1 ? options[1] : options[0]);
-  await userEvent.click(screen.getByText('Select...'));
-
-  await userEvent.click(screen.getByText('Partition #0'));
-
-  fetchMock.postOnce(
-    `/api/clusters/${clusterName}/consumer-groups/${groupId}/offsets`,
-    200,
-    {
-      body: {
-        topic: '__amazon_msk_canary',
-        resetType,
-        partitions: [0],
-        partitionsOffsets: [{ partition: 0, offset }],
-      },
-    }
-  );
-  await userEvent.click(screen.getByText('Submit'));
-  await waitFor(() => resetConsumerGroupOffsetsMockCalled());
-};
-
-describe('ResetOffsets', () => {
-  afterEach(() => {
-    fetchMock.reset();
-  });
-
-  xit('renders progress bar for initial state', async () => {
-    fetchMock.getOnce(
-      `/api/clusters/${clusterName}/consumer-groups/${groupId}`,
-      404
-    );
-    await act(() => {
-      renderComponent();
-    });
-    expect(screen.getByRole('progressbar')).toBeInTheDocument();
-  });
-
-  describe('with consumer group', () => {
-    describe('submit handles resetConsumerGroupOffsets', () => {
-      beforeEach(async () => {
-        const fetchConsumerGroupMock = fetchMock.getOnce(
-          `/api/clusters/${clusterName}/consumer-groups/${groupId}`,
-          consumerGroupPayload
-        );
-        await act(() => {
-          renderComponent();
-        });
-        expect(fetchConsumerGroupMock.called()).toBeTruthy();
-      });
-
-      it('calls resetConsumerGroupOffsets with EARLIEST', async () => {
-        await resetConsumerGroupOffsetsWith('EARLIEST');
-      });
-
-      it('calls resetConsumerGroupOffsets with LATEST', async () => {
-        await resetConsumerGroupOffsetsWith('LATEST');
-      });
-      it('calls resetConsumerGroupOffsets with OFFSET', async () => {
-        await selectresetTypeAndPartitions('OFFSET');
-        fetchMock.postOnce(
-          `/api/clusters/${clusterName}/consumer-groups/${groupId}/offsets`,
-          200,
-          {
-            body: {
-              topic: '__amazon_msk_canary',
-              resetType: 'OFFSET',
-              partitions: [0],
-              partitionsOffsets: [{ partition: 0, offset: 10 }],
-            },
-          }
-        );
-
-        await userEvent.click(screen.getAllByLabelText('Partition #0')[1]);
-        await userEvent.keyboard('10');
-        await userEvent.click(screen.getByText('Submit'));
-        await resetConsumerGroupOffsetsMockCalled();
-      });
-
-      // focus doesn't work for datepicker
-      it.skip('calls resetConsumerGroupOffsets with TIMESTAMP', async () => {
-        await selectresetTypeAndPartitions('TIMESTAMP');
-        const resetConsumerGroupOffsetsMock = fetchMock.postOnce(
-          `/api/clusters/${clusterName}/consumer-groups/${groupId}/offsets`,
-          200,
-          {
-            body: {
-              topic: '__amazon_msk_canary',
-              resetType: 'OFFSET',
-              partitions: [0],
-              partitionsOffsets: [{ partition: 0, offset: 10 }],
-            },
-          }
-        );
-        await userEvent.click(screen.getByText('Submit'));
-        await waitFor(() =>
-          expect(
-            screen.getByText("This field shouldn't be empty!")
-          ).toBeInTheDocument()
-        );
-
-        await waitFor(() =>
-          expect(
-            resetConsumerGroupOffsetsMock.called(
-              `/api/clusters/${clusterName}/consumer-groups/${groupId}/offsets`
-            )
-          ).toBeFalsy()
-        );
-      });
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/__test__/TopicContents.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/__test__/TopicContents.spec.tsx
index e1a10b7cd57..0cc91e02cb1 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/__test__/TopicContents.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/__test__/TopicContents.spec.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import { clusterConsumerGroupDetailsPath } from 'lib/paths';
 import { screen } from '@testing-library/react';
 import TopicContents from 'components/ConsumerGroups/Details/TopicContents/TopicContents';
-import { consumerGroupPayload } from 'redux/reducers/consumerGroups/__test__/fixtures';
 import { render, WithRoute } from 'lib/testHelpers';
 import { ConsumerGroupTopicPartition } from 'generated-sources';
+import { consumerGroupPayload } from 'lib/fixtures/consumerGroups';
 
 const clusterName = 'cluster1';
 
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
deleted file mode 100644
index 9e010a414f2..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/Details.spec.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import Details from 'components/ConsumerGroups/Details/Details';
-import React from 'react';
-import fetchMock from 'fetch-mock';
-import { render, WithRoute } from 'lib/testHelpers';
-import {
-  clusterConsumerGroupDetailsPath,
-  clusterConsumerGroupResetRelativePath,
-} from 'lib/paths';
-import { consumerGroupPayload } from 'redux/reducers/consumerGroups/__test__/fixtures';
-import {
-  screen,
-  waitFor,
-  waitForElementToBeRemoved,
-} from '@testing-library/dom';
-import userEvent from '@testing-library/user-event';
-
-const clusterName = 'cluster1';
-const { groupId } = consumerGroupPayload;
-
-const mockNavigate = jest.fn();
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useNavigate: () => mockNavigate,
-}));
-
-const renderComponent = () => {
-  render(
-    <WithRoute path={clusterConsumerGroupDetailsPath()}>
-      <Details />
-    </WithRoute>,
-    { initialEntries: [clusterConsumerGroupDetailsPath(clusterName, groupId)] }
-  );
-};
-describe('Details component', () => {
-  afterEach(() => {
-    fetchMock.reset();
-    mockNavigate.mockClear();
-  });
-
-  describe('when consumer groups are NOT fetched', () => {
-    it('renders progress bar for initial state', () => {
-      fetchMock.getOnce(
-        `/api/clusters/${clusterName}/consumer-groups/${groupId}`,
-        404
-      );
-      renderComponent();
-      expect(screen.getByRole('progressbar')).toBeInTheDocument();
-    });
-  });
-
-  describe('when consumer gruops are fetched', () => {
-    beforeEach(async () => {
-      const fetchConsumerGroupMock = fetchMock.getOnce(
-        `/api/clusters/${clusterName}/consumer-groups/${groupId}`,
-        consumerGroupPayload
-      );
-      renderComponent();
-      await waitForElementToBeRemoved(() => screen.getByRole('progressbar'));
-      await waitFor(() => expect(fetchConsumerGroupMock.called()).toBeTruthy());
-    });
-
-    it('renders component', () => {
-      expect(screen.getByRole('heading')).toBeInTheDocument();
-      expect(screen.getByText(groupId)).toBeInTheDocument();
-
-      expect(screen.getByRole('table')).toBeInTheDocument();
-      expect(screen.getAllByRole('columnheader').length).toEqual(2);
-
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    });
-
-    it('handles [Reset offset] click', async () => {
-      await userEvent.click(screen.getByText('Reset offset'));
-      expect(mockNavigate).toHaveBeenLastCalledWith(
-        clusterConsumerGroupResetRelativePath
-      );
-    });
-
-    it('renders search input', async () => {
-      expect(
-        screen.getByPlaceholderText('Search by Topic Name')
-      ).toBeInTheDocument();
-    });
-
-    it('shows confirmation modal on consumer group delete', async () => {
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-      await userEvent.click(screen.getByText('Delete consumer group'));
-      await waitFor(() =>
-        expect(screen.queryByRole('dialog')).toBeInTheDocument()
-      );
-      await userEvent.click(screen.getByText('Cancel'));
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-    });
-
-    it('handles [Delete consumer group] click', async () => {
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
-
-      await userEvent.click(screen.getByText('Delete consumer group'));
-
-      expect(screen.queryByRole('dialog')).toBeInTheDocument();
-      const deleteConsumerGroupMock = fetchMock.deleteOnce(
-        `/api/clusters/${clusterName}/consumer-groups/${groupId}`,
-        200
-      );
-      await waitFor(() => {
-        userEvent.click(screen.getByRole('button', { name: 'Confirm' }));
-      });
-      expect(deleteConsumerGroupMock.called()).toBeTruthy();
-
-      await waitForElementToBeRemoved(() => screen.queryByRole('dialog'));
-      await waitFor(() => expect(mockNavigate).toHaveBeenLastCalledWith('../'));
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx
deleted file mode 100644
index 9cf79d02ded..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/__tests__/ListItem.spec.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from 'react';
-import { clusterConsumerGroupDetailsPath } from 'lib/paths';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import ListItem from 'components/ConsumerGroups/Details/ListItem';
-import { consumerGroupPayload } from 'redux/reducers/consumerGroups/__test__/fixtures';
-import { render, WithRoute } from 'lib/testHelpers';
-import { ConsumerGroupTopicPartition } from 'generated-sources';
-
-const clusterName = 'cluster1';
-
-const renderComponent = (consumers: ConsumerGroupTopicPartition[] = []) =>
-  render(
-    <WithRoute path={clusterConsumerGroupDetailsPath()}>
-      <table>
-        <tbody>
-          <ListItem
-            clusterName={clusterName}
-            name={clusterName}
-            consumers={consumers}
-          />
-        </tbody>
-      </table>
-    </WithRoute>,
-    {
-      initialEntries: [
-        clusterConsumerGroupDetailsPath(
-          clusterName,
-          consumerGroupPayload.groupId
-        ),
-      ],
-    }
-  );
-
-describe('ListItem', () => {
-  beforeEach(() => renderComponent(consumerGroupPayload.partitions));
-
-  it('should renders list item with topic content closed and check if element exists', () => {
-    expect(screen.getByRole('row')).toBeInTheDocument();
-  });
-
-  it('should renders list item with topic content open', async () => {
-    await userEvent.click(
-      screen.getByRole('cell', { name: 'cluster1' }).children[0].children[0]
-    );
-    expect(screen.getByText('Consumer ID')).toBeInTheDocument();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
similarity index 70%
rename from kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
rename to kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
index c7df01b5e95..feb772ac826 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
@@ -7,41 +7,29 @@ import {
   ConsumerGroupOrdering,
   SortOrder,
 } from 'generated-sources';
-import { useAppDispatch } from 'lib/hooks/redux';
 import useAppParams from 'lib/hooks/useAppParams';
 import { clusterConsumerGroupDetailsPath, ClusterNameRoute } from 'lib/paths';
-import { fetchConsumerGroupsPaged } from 'redux/reducers/consumerGroups/consumerGroupsSlice';
 import { ColumnDef } from '@tanstack/react-table';
 import Table, { TagCell, LinkCell } from 'components/common/NewTable';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { PER_PAGE } from 'lib/constants';
+import { useConsumerGroups } from 'lib/hooks/api/consumers';
 
-export interface Props {
-  consumerGroups: ConsumerGroupDetails[];
-  totalPages: number;
-}
-
-const List: React.FC<Props> = ({ consumerGroups, totalPages }) => {
-  const dispatch = useAppDispatch();
+const List = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const [searchParams] = useSearchParams();
   const navigate = useNavigate();
 
-  React.useEffect(() => {
-    dispatch(
-      fetchConsumerGroupsPaged({
-        clusterName,
-        orderBy:
-          (searchParams.get('sortBy') as ConsumerGroupOrdering) || undefined,
-        sortOrder:
-          (searchParams.get('sortDirection')?.toUpperCase() as SortOrder) ||
-          undefined,
-        page: Number(searchParams.get('page') || 1),
-        perPage: Number(searchParams.get('perPage') || PER_PAGE),
-        search: searchParams.get('q') || '',
-      })
-    );
-  }, [clusterName, dispatch, searchParams]);
+  const consumerGroups = useConsumerGroups({
+    clusterName,
+    orderBy: (searchParams.get('sortBy') as ConsumerGroupOrdering) || undefined,
+    sortOrder:
+      (searchParams.get('sortDirection')?.toUpperCase() as SortOrder) ||
+      undefined,
+    page: Number(searchParams.get('page') || 1),
+    perPage: Number(searchParams.get('perPage') || PER_PAGE),
+    search: searchParams.get('q') || '',
+  });
 
   const columns = React.useMemo<ColumnDef<ConsumerGroupDetails>[]>(
     () => [
@@ -95,9 +83,13 @@ const List: React.FC<Props> = ({ consumerGroups, totalPages }) => {
       </ControlPanelWrapper>
       <Table
         columns={columns}
-        pageCount={totalPages}
-        data={consumerGroups}
-        emptyMessage="No active consumer groups found"
+        pageCount={consumerGroups.data?.pageCount || 0}
+        data={consumerGroups.data?.consumerGroups || []}
+        emptyMessage={
+          consumerGroups.isSuccess
+            ? 'No active consumer groups found'
+            : 'Loading...'
+        }
         serverSideProcessing
         enableSorting
         onRowClick={({ original }) =>
@@ -105,6 +97,7 @@ const List: React.FC<Props> = ({ consumerGroups, totalPages }) => {
             clusterConsumerGroupDetailsPath(clusterName, original.groupId)
           )
         }
+        disabled={consumerGroups.isFetching}
       />
     </>
   );
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.tsx
deleted file mode 100644
index 6c819eff4a1..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { connect } from 'react-redux';
-import { RootState } from 'redux/interfaces';
-import {
-  getConsumerGroupsOrderBy,
-  getConsumerGroupsTotalPages,
-  selectAll,
-} from 'redux/reducers/consumerGroups/consumerGroupsSlice';
-import List from 'components/ConsumerGroups/List/List';
-
-const mapStateToProps = (state: RootState) => ({
-  consumerGroups: selectAll(state),
-  orderBy: getConsumerGroupsOrderBy(state),
-  totalPages: getConsumerGroupsTotalPages(state),
-});
-
-export default connect(mapStateToProps)(List);
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx
deleted file mode 100644
index a1393c2ccdf..00000000000
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List/__test__/List.spec.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import List, { Props } from 'components/ConsumerGroups/List/List';
-import { screen } from '@testing-library/react';
-import { render } from 'lib/testHelpers';
-import { consumerGroups as consumerGroupMock } from 'redux/reducers/consumerGroups/__test__/fixtures';
-import { clusterConsumerGroupDetailsPath } from 'lib/paths';
-import userEvent from '@testing-library/user-event';
-import ListContainer from 'components/ConsumerGroups/List/ListContainer';
-
-const mockedUsedNavigate = jest.fn();
-
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useNavigate: () => mockedUsedNavigate,
-}));
-
-describe('ListContainer', () => {
-  it('renders correctly', () => {
-    render(<ListContainer />);
-    expect(screen.getByRole('table')).toBeInTheDocument();
-  });
-});
-
-describe('List', () => {
-  const renderComponent = (props: Partial<Props> = {}) => {
-    const { consumerGroups, totalPages } = props;
-    return render(
-      <List
-        consumerGroups={consumerGroups || []}
-        totalPages={totalPages || 1}
-      />
-    );
-  };
-
-  it('renders empty table', () => {
-    renderComponent();
-    expect(screen.getByRole('table')).toBeInTheDocument();
-    expect(
-      screen.getByText('No active consumer groups found')
-    ).toBeInTheDocument();
-  });
-
-  describe('consumerGroups are fetched', () => {
-    beforeEach(() => renderComponent({ consumerGroups: consumerGroupMock }));
-
-    it('renders all rows with consumers', () => {
-      expect(screen.getByText('groupId1')).toBeInTheDocument();
-      expect(screen.getByText('groupId2')).toBeInTheDocument();
-    });
-
-    it('handles onRowClick', async () => {
-      const row = screen.getByRole('row', { name: 'groupId1 0 1 1' });
-      expect(row).toBeInTheDocument();
-      await userEvent.click(row);
-      expect(mockedUsedNavigate).toHaveBeenCalledWith(
-        clusterConsumerGroupDetailsPath(':clusterName', 'groupId1')
-      );
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/__test__/ConsumerGroups.spec.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/__test__/ConsumerGroups.spec.tsx
index 0e319e5bd39..4d06c3ecc4b 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/__test__/ConsumerGroups.spec.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/__test__/ConsumerGroups.spec.tsx
@@ -11,9 +11,7 @@ import { render, WithRoute } from 'lib/testHelpers';
 
 const clusterName = 'cluster1';
 
-jest.mock('components/ConsumerGroups/List/ListContainer', () => () => (
-  <div>ListContainerMock</div>
-));
+jest.mock('components/ConsumerGroups/List', () => () => <div>ListPage</div>);
 jest.mock('components/ConsumerGroups/Details/Details', () => () => (
   <div>DetailsMock</div>
 ));
@@ -35,7 +33,7 @@ const renderComponent = (path?: string) =>
 describe('ConsumerGroups', () => {
   it('renders ListContainer', async () => {
     renderComponent();
-    expect(screen.getByText('ListContainerMock')).toBeInTheDocument();
+    expect(screen.getByText('ListPage')).toBeInTheDocument();
   });
   it('renders ResetOffsets', async () => {
     renderComponent(
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
index 0d9af3a61a4..5db0ba80683 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.styled.ts
@@ -225,6 +225,13 @@ export const Ellipsis = styled.div`
   display: block;
 `;
 
-export const TableWrapper = styled.div`
-  overflow-x: auto;
-`;
+export const TableWrapper = styled.div<{ $disabled: boolean }>(
+  ({ $disabled }) => css`
+    overflow-x: auto;
+    ${$disabled &&
+    css`
+      pointer-events: none;
+      opacity: 0.5;
+    `}
+  `
+);
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index fb6f76aa393..1cdc67001d7 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -48,6 +48,8 @@ export interface TableProps<TData> {
   // Placeholder for empty table
   emptyMessage?: React.ReactNode;
 
+  disabled?: boolean;
+
   // Handles row click. Can not be combined with `enableRowSelection` && expandable rows.
   onRowClick?: (row: Row<TData>) => void;
 }
@@ -123,6 +125,7 @@ const Table: React.FC<TableProps<any>> = ({
   enableRowSelection = false,
   batchActionsBar: BatchActionsBar,
   emptyMessage,
+  disabled,
   onRowClick,
 }) => {
   const [searchParams, setSearchParams] = useSearchParams();
@@ -200,7 +203,7 @@ const Table: React.FC<TableProps<any>> = ({
           />
         </S.TableActionsBar>
       )}
-      <S.TableWrapper>
+      <S.TableWrapper $disabled={!!disabled}>
         <S.Table>
           <thead>
             {table.getHeaderGroups().map((headerGroup) => (
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts b/kafka-ui-react-app/src/lib/fixtures/consumerGroups.ts
similarity index 75%
rename from kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts
rename to kafka-ui-react-app/src/lib/fixtures/consumerGroups.ts
index 7c130ef472f..f6c60cf61a5 100644
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/fixtures.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/consumerGroups.ts
@@ -1,30 +1,5 @@
 import { ConsumerGroupState } from 'generated-sources';
 
-export const consumerGroups = [
-  {
-    groupId: 'groupId1',
-    members: 0,
-    topics: 1,
-    simple: false,
-    partitionAssignor: '',
-    coordinator: {
-      id: 1,
-      host: 'host',
-    },
-  },
-  {
-    groupId: 'groupId2',
-    members: 0,
-    topics: 1,
-    simple: false,
-    partitionAssignor: '',
-    coordinator: {
-      id: 1,
-      host: 'host',
-    },
-  },
-];
-
 export const consumerGroupPayload = {
   groupId: 'amazon.msk.canary.group.broker-1',
   members: 0,
diff --git a/kafka-ui-react-app/src/lib/hooks/api/consumers.ts b/kafka-ui-react-app/src/lib/hooks/api/consumers.ts
new file mode 100644
index 00000000000..c0089e1f00f
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/consumers.ts
@@ -0,0 +1,92 @@
+import { consumerGroupsApiClient as api } from 'lib/api';
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import { ClusterName } from 'redux/interfaces';
+import {
+  ConsumerGroup,
+  ConsumerGroupOffsetsReset,
+  ConsumerGroupOrdering,
+  SortOrder,
+} from 'generated-sources';
+import { showSuccessAlert } from 'lib/errorHandling';
+
+export type ConsumerGroupID = ConsumerGroup['groupId'];
+
+type UseConsumerGroupsProps = {
+  clusterName: ClusterName;
+  orderBy?: ConsumerGroupOrdering;
+  sortOrder?: SortOrder;
+  page?: number;
+  perPage?: number;
+  search: string;
+};
+
+type UseConsumerGroupDetailsProps = {
+  clusterName: ClusterName;
+  consumerGroupID: ConsumerGroupID;
+};
+
+export function useConsumerGroups(props: UseConsumerGroupsProps) {
+  const { clusterName, ...rest } = props;
+  return useQuery(
+    ['clusters', clusterName, 'consumerGroups', rest],
+    () => api.getConsumerGroupsPage(props),
+    { suspense: false, keepPreviousData: true }
+  );
+}
+
+export function useConsumerGroupDetails(props: UseConsumerGroupDetailsProps) {
+  const { clusterName, consumerGroupID } = props;
+  return useQuery(
+    ['clusters', clusterName, 'consumerGroups', consumerGroupID],
+    () => api.getConsumerGroup({ clusterName, id: consumerGroupID })
+  );
+}
+
+export const useDeleteConsumerGroupMutation = ({
+  clusterName,
+  consumerGroupID,
+}: UseConsumerGroupDetailsProps) => {
+  const queryClient = useQueryClient();
+  return useMutation(
+    () => api.deleteConsumerGroup({ clusterName, id: consumerGroupID }),
+    {
+      onSuccess: () => {
+        showSuccessAlert({
+          message: `Consumer ${consumerGroupID} group deleted`,
+        });
+        queryClient.invalidateQueries([
+          'clusters',
+          clusterName,
+          'consumerGroups',
+        ]);
+      },
+    }
+  );
+};
+
+export const useResetConsumerGroupOffsetsMutation = ({
+  clusterName,
+  consumerGroupID,
+}: UseConsumerGroupDetailsProps) => {
+  const queryClient = useQueryClient();
+  return useMutation(
+    (props: ConsumerGroupOffsetsReset) =>
+      api.resetConsumerGroupOffsets({
+        clusterName,
+        id: consumerGroupID,
+        consumerGroupOffsetsReset: props,
+      }),
+    {
+      onSuccess: () => {
+        showSuccessAlert({
+          message: `Consumer ${consumerGroupID} group offsets reset`,
+        });
+        queryClient.invalidateQueries([
+          'clusters',
+          clusterName,
+          'consumerGroups',
+        ]);
+      },
+    }
+  );
+};
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index ad24ed2f6b4..6571f1684cd 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -1,12 +1,8 @@
 import { Broker, Connect, Connector } from 'generated-sources';
-import {
-  ClusterName,
-  ConsumerGroupID,
-  SchemaName,
-  TopicName,
-} from 'redux/interfaces';
+import { ClusterName, SchemaName, TopicName } from 'redux/interfaces';
 
 import { GIT_REPO_LINK } from './constants';
+import { ConsumerGroupID } from './hooks/api/consumers';
 
 export const gitCommitPath = (commit: string) =>
   `${GIT_REPO_LINK}/commit/${commit}`;
diff --git a/kafka-ui-react-app/src/redux/interfaces/consumerGroup.ts b/kafka-ui-react-app/src/redux/interfaces/consumerGroup.ts
index 8e05a9b6288..45412e264bb 100644
--- a/kafka-ui-react-app/src/redux/interfaces/consumerGroup.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/consumerGroup.ts
@@ -5,10 +5,9 @@ import {
 
 import { ClusterName } from './cluster';
 
-export type ConsumerGroupID = ConsumerGroup['groupId'];
 export interface ConsumerGroupResetOffsetRequestParams {
   clusterName: ClusterName;
-  consumerGroupID: ConsumerGroupID;
+  consumerGroupID: ConsumerGroup['groupId'];
   requestBody: {
     topic: string;
     resetType: ConsumerGroupOffsetsResetType;
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/consumerGroupSlice.spec.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/consumerGroupSlice.spec.ts
deleted file mode 100644
index 2bf20606adc..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/__test__/consumerGroupSlice.spec.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { store } from 'redux/store';
-import {
-  sortBy,
-  getConsumerGroupsOrderBy,
-  getConsumerGroupsSortOrder,
-  getAreConsumerGroupsPagedFulfilled,
-  fetchConsumerGroupsPaged,
-  selectAll,
-} from 'redux/reducers/consumerGroups/consumerGroupsSlice';
-import { ConsumerGroupOrdering, SortOrder } from 'generated-sources';
-import { consumerGroups } from 'redux/reducers/consumerGroups/__test__/fixtures';
-
-describe('Consumer Groups Slice', () => {
-  describe('Actions', () => {
-    it('should test the sortBy actions', () => {
-      expect(store.getState().consumerGroups.sortOrder).toBe(SortOrder.ASC);
-
-      store.dispatch(sortBy(ConsumerGroupOrdering.STATE));
-      expect(getConsumerGroupsOrderBy(store.getState())).toBe(
-        ConsumerGroupOrdering.STATE
-      );
-      expect(getConsumerGroupsSortOrder(store.getState())).toBe(SortOrder.DESC);
-      store.dispatch(sortBy(ConsumerGroupOrdering.STATE));
-      expect(getConsumerGroupsSortOrder(store.getState())).toBe(SortOrder.ASC);
-    });
-  });
-
-  describe('Thunk Actions', () => {
-    it('should check the fetchConsumerPaged ', () => {
-      store.dispatch({
-        type: fetchConsumerGroupsPaged.fulfilled.type,
-        payload: {
-          consumerGroups,
-        },
-      });
-
-      expect(getAreConsumerGroupsPagedFulfilled(store.getState())).toBeTruthy();
-      expect(selectAll(store.getState())).toEqual(consumerGroups);
-
-      store.dispatch({
-        type: fetchConsumerGroupsPaged.fulfilled.type,
-        payload: {
-          consumerGroups: null,
-        },
-      });
-      expect(selectAll(store.getState())).toEqual([]);
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
deleted file mode 100644
index 91420f04043..00000000000
--- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/consumerGroupsSlice.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-import {
-  createAsyncThunk,
-  createEntityAdapter,
-  createSlice,
-  createSelector,
-  PayloadAction,
-} from '@reduxjs/toolkit';
-import {
-  ConsumerGroupDetails,
-  ConsumerGroupOrdering,
-  ConsumerGroupsPageResponse,
-  SortOrder,
-} from 'generated-sources';
-import { AsyncRequestStatus } from 'lib/constants';
-import {
-  getResponse,
-  showServerError,
-  showSuccessAlert,
-} from 'lib/errorHandling';
-import {
-  ClusterName,
-  ConsumerGroupID,
-  ConsumerGroupResetOffsetRequestParams,
-  RootState,
-} from 'redux/interfaces';
-import { createFetchingSelector } from 'redux/reducers/loader/selectors';
-import { EntityState } from '@reduxjs/toolkit/src/entities/models';
-import { consumerGroupsApiClient } from 'lib/api';
-
-export const fetchConsumerGroupsPaged = createAsyncThunk<
-  ConsumerGroupsPageResponse,
-  {
-    clusterName: ClusterName;
-    orderBy?: ConsumerGroupOrdering;
-    sortOrder?: SortOrder;
-    page?: number;
-    perPage?: number;
-    search: string;
-  }
->(
-  'consumerGroups/fetchConsumerGroupsPaged',
-  async (
-    { clusterName, orderBy, sortOrder, page, perPage, search },
-    { rejectWithValue }
-  ) => {
-    try {
-      return await consumerGroupsApiClient.getConsumerGroupsPage({
-        clusterName,
-        orderBy,
-        sortOrder,
-        page,
-        perPage,
-        search,
-      });
-    } catch (error) {
-      showServerError(error as Response);
-      return rejectWithValue(await getResponse(error as Response));
-    }
-  }
-);
-
-export const fetchConsumerGroupDetails = createAsyncThunk<
-  ConsumerGroupDetails,
-  { clusterName: ClusterName; consumerGroupID: ConsumerGroupID }
->(
-  'consumerGroups/fetchConsumerGroupDetails',
-  async ({ clusterName, consumerGroupID }, { rejectWithValue }) => {
-    try {
-      return await consumerGroupsApiClient.getConsumerGroup({
-        clusterName,
-        id: consumerGroupID,
-      });
-    } catch (error) {
-      showServerError(error as Response);
-      return rejectWithValue(await getResponse(error as Response));
-    }
-  }
-);
-
-export const deleteConsumerGroup = createAsyncThunk<
-  ConsumerGroupID,
-  { clusterName: ClusterName; consumerGroupID: ConsumerGroupID }
->(
-  'consumerGroups/deleteConsumerGroup',
-  async ({ clusterName, consumerGroupID }, { rejectWithValue }) => {
-    try {
-      await consumerGroupsApiClient.deleteConsumerGroup({
-        clusterName,
-        id: consumerGroupID,
-      });
-      showSuccessAlert({
-        message: `Consumer ${consumerGroupID} group deleted`,
-      });
-      return consumerGroupID;
-    } catch (error) {
-      showServerError(error as Response);
-      return rejectWithValue(await getResponse(error as Response));
-    }
-  }
-);
-
-export const resetConsumerGroupOffsets = createAsyncThunk<
-  ConsumerGroupID,
-  ConsumerGroupResetOffsetRequestParams
->(
-  'consumerGroups/resetConsumerGroupOffsets',
-  async (
-    { clusterName, consumerGroupID, requestBody },
-    { rejectWithValue }
-  ) => {
-    try {
-      await consumerGroupsApiClient.resetConsumerGroupOffsets({
-        clusterName,
-        id: consumerGroupID,
-        consumerGroupOffsetsReset: {
-          topic: requestBody.topic,
-          resetType: requestBody.resetType,
-          partitions: requestBody.partitions,
-          partitionsOffsets: requestBody.partitionsOffsets?.map((offset) => ({
-            ...offset,
-            offset: +offset.offset,
-          })),
-          resetToTimestamp: requestBody.resetToTimestamp?.getTime(),
-        },
-      });
-      showSuccessAlert({
-        message: `Consumer ${consumerGroupID} group offsets reset`,
-      });
-      return consumerGroupID;
-    } catch (error) {
-      showServerError(error as Response);
-      return rejectWithValue(await getResponse(error as Response));
-    }
-  }
-);
-const SCHEMAS_PAGE_COUNT = 1;
-
-const consumerGroupsAdapter = createEntityAdapter<ConsumerGroupDetails>({
-  selectId: (consumerGroup) => consumerGroup.groupId,
-});
-
-interface ConsumerGroupState extends EntityState<ConsumerGroupDetails> {
-  orderBy: ConsumerGroupOrdering | null;
-  sortOrder: SortOrder;
-  totalPages: number;
-}
-
-const initialState: ConsumerGroupState = {
-  orderBy: ConsumerGroupOrdering.NAME,
-  sortOrder: SortOrder.ASC,
-  totalPages: SCHEMAS_PAGE_COUNT,
-  ...consumerGroupsAdapter.getInitialState(),
-};
-
-const consumerGroupsSlice = createSlice({
-  name: 'consumerGroups',
-  initialState,
-  reducers: {
-    sortBy: (state, action: PayloadAction<ConsumerGroupOrdering>) => {
-      state.orderBy = action.payload;
-      state.sortOrder =
-        state.orderBy === action.payload && state.sortOrder === SortOrder.ASC
-          ? SortOrder.DESC
-          : SortOrder.ASC;
-    },
-  },
-  extraReducers: (builder) => {
-    builder.addCase(
-      fetchConsumerGroupsPaged.fulfilled,
-      (state, { payload }) => {
-        state.totalPages = payload.pageCount || SCHEMAS_PAGE_COUNT;
-        consumerGroupsAdapter.setAll(state, payload.consumerGroups || []);
-      }
-    );
-    builder.addCase(fetchConsumerGroupDetails.fulfilled, (state, { payload }) =>
-      consumerGroupsAdapter.upsertOne(state, payload)
-    );
-    builder.addCase(deleteConsumerGroup.fulfilled, (state, { payload }) =>
-      consumerGroupsAdapter.removeOne(state, payload)
-    );
-  },
-});
-
-export const { sortBy } = consumerGroupsSlice.actions;
-
-const consumerGroupsState = ({
-  consumerGroups,
-}: RootState): ConsumerGroupState => consumerGroups;
-
-export const { selectAll, selectById } =
-  consumerGroupsAdapter.getSelectors<RootState>(consumerGroupsState);
-
-export const getAreConsumerGroupsPagedFulfilled = createSelector(
-  createFetchingSelector('consumerGroups/fetchConsumerGroupsPaged'),
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-export const getAreConsumerGroupDetailsFulfilled = createSelector(
-  createFetchingSelector('consumerGroups/fetchConsumerGroupDetails'),
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-export const getIsOffsetReseted = createSelector(
-  createFetchingSelector('consumerGroups/resetConsumerGroupOffsets'),
-  (status) => status === AsyncRequestStatus.fulfilled
-);
-
-export const getConsumerGroupsOrderBy = createSelector(
-  consumerGroupsState,
-  (state) => state.orderBy
-);
-
-export const getConsumerGroupsSortOrder = createSelector(
-  consumerGroupsState,
-  (state) => state.sortOrder
-);
-
-export const getConsumerGroupsTotalPages = createSelector(
-  consumerGroupsState,
-  (state) => state.totalPages
-);
-
-export default consumerGroupsSlice.reducer;
diff --git a/kafka-ui-react-app/src/redux/reducers/index.ts b/kafka-ui-react-app/src/redux/reducers/index.ts
index 78a2055a9c5..aa5cb69cf08 100644
--- a/kafka-ui-react-app/src/redux/reducers/index.ts
+++ b/kafka-ui-react-app/src/redux/reducers/index.ts
@@ -2,11 +2,9 @@ import { combineReducers } from '@reduxjs/toolkit';
 import loader from 'redux/reducers/loader/loaderSlice';
 import schemas from 'redux/reducers/schemas/schemasSlice';
 import topicMessages from 'redux/reducers/topicMessages/topicMessagesSlice';
-import consumerGroups from 'redux/reducers/consumerGroups/consumerGroupsSlice';
 
 export default combineReducers({
   loader,
   topicMessages,
-  consumerGroups,
   schemas,
 });

From acfe7a4afcce8da9d111d8922a6cdbb311e53450 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 24 Mar 2023 14:05:59 +0400
Subject: [PATCH 465/734] Azure Events Hub support fixed (#3540)

 UnknownTopicOrPartitionException error suppressing added when calling describeConfigs() for brokers (Azure case).

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/service/ReactiveAdminClient.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 19d06a0c48b..7cabb79f2d0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -212,17 +212,24 @@ private static Mono<Map<Integer, List<ConfigEntry>>> loadBrokersConfig(AdminClie
         .map(brokerId -> new ConfigResource(ConfigResource.Type.BROKER, Integer.toString(brokerId)))
         .collect(toList());
     return toMono(client.describeConfigs(resources).all())
-        // some kafka backends (like MSK serverless) do not support broker's configs retrieval,
-        // in that case InvalidRequestException will be thrown
-        .onErrorResume(InvalidRequestException.class, th -> {
-          log.trace("Error while getting broker {} configs", brokerIds, th);
-          return Mono.just(Map.of());
-        })
+        // some kafka backends don't support broker's configs retrieval,
+        // and throw various exceptions on describeConfigs() call
+        .onErrorResume(th -> th instanceof InvalidRequestException // MSK Serverless
+                || th instanceof UnknownTopicOrPartitionException, // Azure event hub
+            th -> {
+              log.trace("Error while getting configs for brokers {}", brokerIds, th);
+              return Mono.just(Map.of());
+            })
         // there are situations when kafka-ui user has no DESCRIBE_CONFIGS permission on cluster
         .onErrorResume(ClusterAuthorizationException.class, th -> {
           log.trace("AuthorizationException while getting configs for brokers {}", brokerIds, th);
           return Mono.just(Map.of());
         })
+        // catching all remaining exceptions, but logging on WARN level
+        .onErrorResume(th -> true, th -> {
+          log.warn("Unexpected error while getting configs for brokers {}", brokerIds, th);
+          return Mono.just(Map.of());
+        })
         .map(config -> config.entrySet().stream()
             .collect(toMap(
                 c -> Integer.valueOf(c.getKey().name()),

From deb3dba29e0f1740d40b4ebc9e390c63911596dc Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Mon, 27 Mar 2023 15:00:33 +0400
Subject: [PATCH 466/734] FE: bugfix/wizard form validation (#3526)

* add the parameter to trigger() call for focusing first failed input
* refactor Select component to React.forwardRef for focusing purposes
---
 .../common/Select/ControlledSelect.tsx        |   1 +
 .../src/components/common/Select/Select.tsx   | 163 +++++++++---------
 .../src/widgets/ClusterConfigForm/index.tsx   |   2 +-
 3 files changed, 88 insertions(+), 78 deletions(-)

diff --git a/kafka-ui-react-app/src/components/common/Select/ControlledSelect.tsx b/kafka-ui-react-app/src/components/common/Select/ControlledSelect.tsx
index b3e15aacdf2..1ea90c356ae 100644
--- a/kafka-ui-react-app/src/components/common/Select/ControlledSelect.tsx
+++ b/kafka-ui-react-app/src/components/common/Select/ControlledSelect.tsx
@@ -45,6 +45,7 @@ const ControlledSelect: React.FC<ControlledSelectProps> = ({
               options={options}
               placeholder={placeholder}
               disabled={disabled}
+              ref={field.ref}
             />
           );
         }}
diff --git a/kafka-ui-react-app/src/components/common/Select/Select.tsx b/kafka-ui-react-app/src/components/common/Select/Select.tsx
index b56dbc4959d..a72660d2cb7 100644
--- a/kafka-ui-react-app/src/components/common/Select/Select.tsx
+++ b/kafka-ui-react-app/src/components/common/Select/Select.tsx
@@ -27,90 +27,99 @@ export interface SelectOption {
   isLive?: boolean;
 }
 
-const Select: React.FC<SelectProps> = ({
-  options = [],
-  value,
-  defaultValue,
-  selectSize = 'L',
-  placeholder = '',
-  isLive,
-  disabled = false,
-  onChange,
-  isThemeMode,
-  ...props
-}) => {
-  const [selectedOption, setSelectedOption] = useState(value);
-  const [showOptions, setShowOptions] = useState(false);
+const Select = React.forwardRef<HTMLUListElement, SelectProps>(
+  (
+    {
+      options = [],
+      value,
+      defaultValue,
+      selectSize = 'L',
+      placeholder = '',
+      isLive,
+      disabled = false,
+      onChange,
+      isThemeMode,
+      ...props
+    },
+    ref
+  ) => {
+    const [selectedOption, setSelectedOption] = useState(value);
+    const [showOptions, setShowOptions] = useState(false);
 
-  const showOptionsHandler = () => {
-    if (!disabled) setShowOptions(!showOptions);
-  };
+    const showOptionsHandler = () => {
+      if (!disabled) setShowOptions(!showOptions);
+    };
 
-  const selectContainerRef = useRef(null);
-  const clickOutsideHandler = () => setShowOptions(false);
-  useClickOutside(selectContainerRef, clickOutsideHandler);
+    const selectContainerRef = useRef(null);
+    const clickOutsideHandler = () => setShowOptions(false);
+    useClickOutside(selectContainerRef, clickOutsideHandler);
 
-  const updateSelectedOption = (option: SelectOption) => {
-    if (!option.disabled) {
-      setSelectedOption(option.value);
+    const updateSelectedOption = (option: SelectOption) => {
+      if (!option.disabled) {
+        setSelectedOption(option.value);
 
-      if (onChange) {
-        onChange(option.value);
+        if (onChange) {
+          onChange(option.value);
+        }
+
+        setShowOptions(false);
       }
+    };
 
-      setShowOptions(false);
-    }
-  };
+    React.useEffect(() => {
+      setSelectedOption(value);
+    }, [isLive, value]);
 
-  React.useEffect(() => {
-    setSelectedOption(value);
-  }, [isLive, value]);
+    return (
+      <div ref={selectContainerRef}>
+        <S.Select
+          role="listbox"
+          selectSize={selectSize}
+          isLive={isLive}
+          disabled={disabled}
+          onClick={showOptionsHandler}
+          onKeyDown={showOptionsHandler}
+          isThemeMode={isThemeMode}
+          ref={ref}
+          tabIndex={0}
+          {...props}
+        >
+          <S.SelectedOptionWrapper>
+            {isLive && <LiveIcon />}
+            <S.SelectedOption
+              role="option"
+              tabIndex={0}
+              isThemeMode={isThemeMode}
+            >
+              {options.find(
+                (option) => option.value === (defaultValue || selectedOption)
+              )?.label || placeholder}
+            </S.SelectedOption>
+          </S.SelectedOptionWrapper>
+          {showOptions && (
+            <S.OptionList>
+              {options?.map((option) => (
+                <S.Option
+                  value={option.value}
+                  key={option.value}
+                  disabled={option.disabled}
+                  onClick={() => updateSelectedOption(option)}
+                  tabIndex={0}
+                  role="option"
+                >
+                  {option.isLive && <LiveIcon />}
+                  {option.label}
+                </S.Option>
+              ))}
+            </S.OptionList>
+          )}
+          <DropdownArrowIcon isOpen={showOptions} />
+        </S.Select>
+      </div>
+    );
+  }
+);
 
-  return (
-    <div ref={selectContainerRef}>
-      <S.Select
-        role="listbox"
-        selectSize={selectSize}
-        isLive={isLive}
-        disabled={disabled}
-        onClick={showOptionsHandler}
-        onKeyDown={showOptionsHandler}
-        isThemeMode={isThemeMode}
-        {...props}
-      >
-        <S.SelectedOptionWrapper>
-          {isLive && <LiveIcon />}
-          <S.SelectedOption
-            role="option"
-            tabIndex={0}
-            isThemeMode={isThemeMode}
-          >
-            {options.find(
-              (option) => option.value === (defaultValue || selectedOption)
-            )?.label || placeholder}
-          </S.SelectedOption>
-        </S.SelectedOptionWrapper>
-        {showOptions && (
-          <S.OptionList>
-            {options?.map((option) => (
-              <S.Option
-                value={option.value}
-                key={option.value}
-                disabled={option.disabled}
-                onClick={() => updateSelectedOption(option)}
-                tabIndex={0}
-                role="option"
-              >
-                {option.isLive && <LiveIcon />}
-                {option.label}
-              </S.Option>
-            ))}
-          </S.OptionList>
-        )}
-        <DropdownArrowIcon isOpen={showOptions} />
-      </S.Select>
-    </div>
-  );
-};
+Select.displayName = 'Select';
 
 export default Select;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx
index 8bd0c3f1257..2c636c29a27 100644
--- a/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx
@@ -75,7 +75,7 @@ const ClusterConfigForm: React.FC<ClusterConfigFormProps> = ({
   const onReset = () => methods.reset();
 
   const onValidate = async () => {
-    await trigger();
+    await trigger(undefined, { shouldFocus: true });
     if (!methods.formState.isValid) return;
     disableForm();
     const data = methods.getValues();

From 58eca230fc8392d42e4ad4ef47d7b83dc4ee3a75 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 27 Mar 2023 14:26:37 +0300
Subject: [PATCH 467/734] [e2e] Verify internal topics naming (#3555)

* Revert "Fix topic internal indication (#2846)"

This reverts commit 2f2e19d1bce41ec8c0f867b20b4c72b20f764bf0.

* Fix #3135

* Add a nullable annotation for internalTopicPrefix

* Fix e2e tests

* upd isInternal

* upd checkShowInternalTopicsButton

* add manual cases

---------

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/pages/topics/TopicsList.java     | 12 +++++------
 .../ui/manualSuite/backlog/SmokeBacklog.java  | 14 +++++++++++++
 .../ui/smokeSuite/topics/TopicsTest.java      | 21 +++++++++++++++----
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
index b26f2c2997a..0f25489128f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
@@ -208,23 +208,23 @@ public TopicsList selectItem(boolean select) {
             return new TopicsList();
         }
 
+        private SelenideElement getNameElm() {
+            return element.$x("./td[2]");
+        }
+
         @Step
         public boolean isInternal() {
             boolean internal = false;
             try {
-                internal = element.$x("./td[2]/a/span").isDisplayed();
+                internal = getNameElm().$x("./a/span").isDisplayed();
             } catch (Throwable ignored) {
             }
             return internal;
         }
 
-        private SelenideElement getNameElm() {
-            return element.$x("./td[2]");
-        }
-
         @Step
         public String getName() {
-            return getNameElm().getText().trim();
+            return getNameElm().$x("./a").getAttribute("title");
         }
 
         @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java
index 32edaff8c96..84fa7476cf3 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java
@@ -58,4 +58,18 @@ public void testCaseF() {
     @Test
     public void testCaseG() {
     }
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @Suite(id = 5)
+    @QaseId(335)
+    @Test
+    public void testCaseH() {
+    }
+
+    @Automation(state = TO_BE_AUTOMATED)
+    @Suite(id = 5)
+    @QaseId(336)
+    @Test
+    public void testCaseI() {
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
index c3091a61c18..8cca35beb6b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
@@ -359,7 +359,7 @@ public void checkApplyingSavedFilterWithinTopicMessages() {
 
     @QaseId(11)
     @Test(priority = 15)
-    public void checkShowInternalTopicsButtonFunctionality() {
+    public void checkShowInternalTopicsButton() {
         navigateToTopics();
         SoftAssert softly = new SoftAssert();
         softly.assertTrue(topicsList.isShowInternalRadioBtnSelected(), "isInternalRadioBtnSelected()");
@@ -373,8 +373,21 @@ public void checkShowInternalTopicsButtonFunctionality() {
         softly.assertAll();
     }
 
-    @QaseId(56)
+    @QaseId(334)
     @Test(priority = 16)
+    public void checkInternalTopicsNaming() {
+        navigateToTopics();
+        SoftAssert softly = new SoftAssert();
+        topicsList
+                .setShowInternalRadioButton(true)
+                .getInternalTopics()
+                .forEach(topic -> softly.assertTrue(topic.getName().startsWith("_"),
+                        String.format("'%s' starts with '_'", topic.getName())));
+        softly.assertAll();
+    }
+
+    @QaseId(56)
+    @Test(priority = 17)
     public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
         navigateToTopics();
         topicsList
@@ -422,7 +435,7 @@ public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
     }
 
     @QaseId(247)
-    @Test(priority = 17)
+    @Test(priority = 18)
     public void recreateTopicFromTopicProfile() {
         Topic topicToRecreate = new Topic()
                 .setName("topic-to-recreate-" + randomAlphabetic(5))
@@ -450,7 +463,7 @@ public void recreateTopicFromTopicProfile() {
     }
 
     @QaseId(8)
-    @Test(priority = 18)
+    @Test(priority = 19)
     public void checkCopyTopicPossibility() {
         Topic topicToCopy = new Topic()
                 .setName("topic-to-copy-" + randomAlphabetic(5))

From 58102faa16922488c509110948a003b753ebdf15 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 27 Mar 2023 15:40:03 +0400
Subject: [PATCH 468/734] [BE] Fix Topic deletion is unavailable on MSK
 Serverless for 0.6.0 (#3548)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/service/FeatureService.java      | 20 ++++++++++---------
 .../kafka/ui/service/StatisticsService.java   |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
index f5fbf262649..ec749abd14e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
@@ -25,7 +25,8 @@ public class FeatureService {
 
   private final AdminClientService adminClientService;
 
-  public Mono<List<ClusterFeature>> getAvailableFeatures(KafkaCluster cluster, @Nullable Node controller) {
+  public Mono<List<ClusterFeature>> getAvailableFeatures(KafkaCluster cluster,
+                                                         ReactiveAdminClient.ClusterDescription clusterDescription) {
     List<Mono<ClusterFeature>> features = new ArrayList<>();
 
     if (Optional.ofNullable(cluster.getConnectsClients())
@@ -42,17 +43,15 @@ public Mono<List<ClusterFeature>> getAvailableFeatures(KafkaCluster cluster, @Nu
       features.add(Mono.just(ClusterFeature.SCHEMA_REGISTRY));
     }
 
-    if (controller != null) {
-      features.add(
-          isTopicDeletionEnabled(cluster, controller)
-              .flatMap(r -> Boolean.TRUE.equals(r) ? Mono.just(ClusterFeature.TOPIC_DELETION) : Mono.empty())
-      );
-    }
+    features.add(topicDeletionEnabled(cluster, clusterDescription.getController()));
 
     return Flux.fromIterable(features).flatMap(m -> m).collectList();
   }
 
-  private Mono<Boolean> isTopicDeletionEnabled(KafkaCluster cluster, Node controller) {
+  private Mono<ClusterFeature> topicDeletionEnabled(KafkaCluster cluster, @Nullable Node controller) {
+    if (controller == null) {
+      return Mono.just(ClusterFeature.TOPIC_DELETION); // assuming it is enabled by default
+    }
     return adminClientService.get(cluster)
         .flatMap(ac -> ac.loadBrokersConfig(List.of(controller.id())))
         .map(config ->
@@ -61,6 +60,9 @@ private Mono<Boolean> isTopicDeletionEnabled(KafkaCluster cluster, Node controll
                 .filter(e -> e.name().equals(DELETE_TOPIC_ENABLED_SERVER_PROPERTY))
                 .map(e -> Boolean.parseBoolean(e.value()))
                 .findFirst()
-                .orElse(true));
+                .orElse(true))
+        .flatMap(enabled -> enabled
+            ? Mono.just(ClusterFeature.TOPIC_DELETION)
+            : Mono.empty());
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
index a36a64ff6dc..994c30714ae 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
@@ -41,7 +41,7 @@ private Mono<Statistics> getStatistics(KafkaCluster cluster) {
                     List.of(
                         metricsCollector.getBrokerMetrics(cluster, description.getNodes()),
                         getLogDirInfo(description, ac),
-                        featureService.getAvailableFeatures(cluster, description.getController()),
+                        featureService.getAvailableFeatures(cluster, description),
                         loadTopicConfigs(cluster),
                         describeTopics(cluster)),
                     results ->

From dc08701246418536c664bb53ebd281ae4f9e306d Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Mon, 27 Mar 2023 18:13:18 +0400
Subject: [PATCH 469/734] improvement/config-save-spinner add spinner for
 submit button (#3551)

* improvement/config-save-spinner add spinner for submit button

* improvement/config-save-spinner add Spinner component to common, update spinner usage

* improvement/config-save-spinner remove unused props for spinner component

* improvement/config-save-spinner add defaultProps, refactor props definition

* improvement/config-save-spinner disable button on inProgress prop

---------

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../src/components/common/Button/Button.tsx   | 15 ++++++++++-
 .../common/Button/__tests__/Button.spec.tsx   |  6 +++++
 .../common/PageLoader/PageLoader.styled.ts    | 22 +---------------
 .../common/PageLoader/PageLoader.tsx          |  3 ++-
 .../common/Spinner/Spinner.styled.ts          | 26 +++++++++++++++++++
 .../src/components/common/Spinner/Spinner.tsx | 20 ++++++++++++++
 .../src/components/common/Spinner/types.ts    |  6 +++++
 .../src/widgets/ClusterConfigForm/index.tsx   |  1 +
 8 files changed, 76 insertions(+), 23 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/common/Spinner/Spinner.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/Spinner/Spinner.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Spinner/types.ts

diff --git a/kafka-ui-react-app/src/components/common/Button/Button.tsx b/kafka-ui-react-app/src/components/common/Button/Button.tsx
index 5e0a6609eb3..fe330a5e44f 100644
--- a/kafka-ui-react-app/src/components/common/Button/Button.tsx
+++ b/kafka-ui-react-app/src/components/common/Button/Button.tsx
@@ -3,11 +3,13 @@ import StyledButton, {
 } from 'components/common/Button/Button.styled';
 import React from 'react';
 import { Link } from 'react-router-dom';
+import Spinner from 'components/common/Spinner/Spinner';
 
 export interface Props
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     ButtonProps {
   to?: string | object;
+  inProgress?: boolean;
 }
 
 export const Button: React.FC<Props> = ({ to, ...props }) => {
@@ -20,5 +22,16 @@ export const Button: React.FC<Props> = ({ to, ...props }) => {
       </Link>
     );
   }
-  return <StyledButton type="button" {...props} />;
+  return (
+    <StyledButton
+      type="button"
+      disabled={props.disabled || props.inProgress}
+      {...props}
+    >
+      {props.children}{' '}
+      {props.inProgress ? (
+        <Spinner size={16} borderWidth={2} marginLeft={2} emptyBorderColor />
+      ) : null}
+    </StyledButton>
+  );
 };
diff --git a/kafka-ui-react-app/src/components/common/Button/__tests__/Button.spec.tsx b/kafka-ui-react-app/src/components/common/Button/__tests__/Button.spec.tsx
index e0fb407a01a..21919eb0da7 100644
--- a/kafka-ui-react-app/src/components/common/Button/__tests__/Button.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Button/__tests__/Button.spec.tsx
@@ -58,4 +58,10 @@ describe('Button', () => {
       theme.button.primary.invertedColors.normal
     );
   });
+  it('renders disabled button and spinner when inProgress truthy', () => {
+    render(<Button buttonType="primary" buttonSize="M" inProgress />);
+    expect(screen.getByRole('button')).toBeInTheDocument();
+    expect(screen.getByRole('progressbar')).toBeInTheDocument();
+    expect(screen.getByRole('button')).toBeDisabled();
+  });
 });
diff --git a/kafka-ui-react-app/src/components/common/PageLoader/PageLoader.styled.ts b/kafka-ui-react-app/src/components/common/PageLoader/PageLoader.styled.ts
index 87f7a27fd13..f38f21c0b28 100644
--- a/kafka-ui-react-app/src/components/common/PageLoader/PageLoader.styled.ts
+++ b/kafka-ui-react-app/src/components/common/PageLoader/PageLoader.styled.ts
@@ -1,4 +1,4 @@
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 
 export const Wrapper = styled.div`
   display: flex;
@@ -8,23 +8,3 @@ export const Wrapper = styled.div`
   height: 100%;
   width: 100%;
 `;
-
-export const Spinner = styled.div(
-  ({ theme }) => css`
-    border: 10px solid ${theme.pageLoader.borderColor};
-    border-bottom: 10px solid ${theme.pageLoader.borderBottomColor};
-    border-radius: 50%;
-    width: 80px;
-    height: 80px;
-    animation: spin 1.3s linear infinite;
-
-    @keyframes spin {
-      0% {
-        transform: rotate(0deg);
-      }
-      100% {
-        transform: rotate(360deg);
-      }
-    }
-  `
-);
diff --git a/kafka-ui-react-app/src/components/common/PageLoader/PageLoader.tsx b/kafka-ui-react-app/src/components/common/PageLoader/PageLoader.tsx
index 33348b17ea1..674ab0f0cee 100644
--- a/kafka-ui-react-app/src/components/common/PageLoader/PageLoader.tsx
+++ b/kafka-ui-react-app/src/components/common/PageLoader/PageLoader.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
+import Spinner from 'components/common/Spinner/Spinner';
 
 import * as S from './PageLoader.styled';
 
 const PageLoader: React.FC = () => (
   <S.Wrapper>
-    <S.Spinner role="progressbar" />
+    <Spinner />
   </S.Wrapper>
 );
 
diff --git a/kafka-ui-react-app/src/components/common/Spinner/Spinner.styled.ts b/kafka-ui-react-app/src/components/common/Spinner/Spinner.styled.ts
new file mode 100644
index 00000000000..32edbcb11c4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Spinner/Spinner.styled.ts
@@ -0,0 +1,26 @@
+import styled from 'styled-components';
+import { SpinnerProps } from 'components/common/Spinner/types';
+
+export const Spinner = styled.div<SpinnerProps>`
+  border-width: ${(props) => props.borderWidth}px;
+  border-style: solid;
+  border-color: ${({ theme }) => theme.pageLoader.borderColor};
+  border-bottom-color: ${(props) =>
+    props.emptyBorderColor
+      ? 'transparent'
+      : props.theme.pageLoader.borderBottomColor};
+  border-radius: 50%;
+  width: ${(props) => props.size}px;
+  height: ${(props) => props.size}px;
+  margin-left: ${(props) => props.marginLeft}px;
+  animation: spin 1.3s linear infinite;
+
+  @keyframes spin {
+    0% {
+      transform: rotate(0deg);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+`;
diff --git a/kafka-ui-react-app/src/components/common/Spinner/Spinner.tsx b/kafka-ui-react-app/src/components/common/Spinner/Spinner.tsx
new file mode 100644
index 00000000000..1d1cd597333
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Spinner/Spinner.tsx
@@ -0,0 +1,20 @@
+/* eslint-disable react/default-props-match-prop-types */
+import React from 'react';
+import { SpinnerProps } from 'components/common/Spinner/types';
+
+import * as S from './Spinner.styled';
+
+const defaultProps: SpinnerProps = {
+  size: 80,
+  borderWidth: 10,
+  emptyBorderColor: false,
+  marginLeft: 0,
+};
+
+const Spinner: React.FC<SpinnerProps> = (props) => (
+  <S.Spinner role="progressbar" {...props} />
+);
+
+Spinner.defaultProps = defaultProps;
+
+export default Spinner;
diff --git a/kafka-ui-react-app/src/components/common/Spinner/types.ts b/kafka-ui-react-app/src/components/common/Spinner/types.ts
new file mode 100644
index 00000000000..7db64b7fd30
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Spinner/types.ts
@@ -0,0 +1,6 @@
+export interface SpinnerProps {
+  size?: number;
+  borderWidth?: number;
+  emptyBorderColor?: boolean;
+  marginLeft?: number;
+}
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx
index 2c636c29a27..d4007cf4883 100644
--- a/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/index.tsx
@@ -142,6 +142,7 @@ const ClusterConfigForm: React.FC<ClusterConfigFormProps> = ({
               buttonSize="L"
               buttonType="primary"
               disabled={isSubmitDisabled}
+              inProgress={isSubmitting}
             >
               Submit
             </Button>

From 7e040818a4ad12c3645abd89ce841a191b4a4480 Mon Sep 17 00:00:00 2001
From: p-eye <50516754+p-eye@users.noreply.github.com>
Date: Tue, 28 Mar 2023 02:51:15 +0900
Subject: [PATCH 470/734] [FE] Add RBAC actions for copy topic button (#3549)

* enable 'Copy Selected Topic' button when action is Action.CREATE
Co-authored-by: jay-choe <jay0764@naver.com>
Co-authored-by: a1tair6 <sweetyfam6@gmail.com>

* fix lint: remove unused imports

Co-authored-by: jay-choe <jay0764@naver.com>
Co-authored-by: a1tair6 <sweetyfam6@gmail.com>

---------

Co-authored-by: jay-choe <jay0764@naver.com>
Co-authored-by: a1tair6 <sweetyfam6@gmail.com>
---
 .../Topics/List/BatchActionsBar.tsx           | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
index a04429be738..9e7d6417b34 100644
--- a/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/BatchActionsBar.tsx
@@ -9,7 +9,6 @@ import {
   useDeleteTopic,
 } from 'lib/hooks/api/topics';
 import { useConfirm } from 'lib/hooks/useConfirm';
-import { Button } from 'components/common/Button/Button';
 import { clusterTopicCopyRelativePath } from 'lib/paths';
 import { useQueryClient } from '@tanstack/react-query';
 import { ActionCanButton } from 'components/common/ActionComponent';
@@ -108,6 +107,19 @@ const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
     );
   }, [selectedTopics, clusterName, roles]);
 
+  const canCopySelectedTopic = useMemo(() => {
+    return selectedTopics.every((value) =>
+      isPermitted({
+        roles,
+        resource: ResourceType.TOPIC,
+        action: Action.CREATE,
+        value,
+        clusterName,
+        rbacFlag,
+      })
+    );
+  }, [selectedTopics, clusterName, roles]);
+
   const canPurgeSelectedTopics = useMemo(() => {
     return selectedTopics.every((value) =>
       isPermitted({
@@ -132,14 +144,15 @@ const BatchActionsbar: React.FC<BatchActionsbarProps> = ({
       >
         Delete selected topics
       </ActionCanButton>
-      <Button
+      <ActionCanButton
         buttonSize="M"
         buttonType="secondary"
         disabled={selectedTopics.length !== 1}
+        canDoAction={canCopySelectedTopic}
         to={getCopyTopicPath()}
       >
         Copy selected topic
-      </Button>
+      </ActionCanButton>
       <ActionCanButton
         buttonSize="M"
         buttonType="secondary"

From 9f1a4df0a17fe2ebaeacae6310fa9f434e5aa9a1 Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Mon, 27 Mar 2023 22:24:41 +0400
Subject: [PATCH 471/734] [FE] Add missing schema name upon edit (#3561)

---
 kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
index ea414ab4b4d..9ce7f280f43 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
@@ -110,7 +110,7 @@ const Form: React.FC = () => {
   return (
     <FormProvider {...methods}>
       <PageHeading
-        text="Edit"
+        text={`${subject} Edit`}
         backText="Schema Registry"
         backTo={clusterSchemasPath(clusterName)}
       />

From 20cc1e489b2dd9590c14c1c4819e5e01d9dc9b97 Mon Sep 17 00:00:00 2001
From: Shubham Kumar <Shubham.Kumar@ramanujan.du.ac.in>
Date: Tue, 28 Mar 2023 00:56:12 +0530
Subject: [PATCH 472/734] [Docs] Update prerequisites docs (#3392)

* add prerequisites for ubuntu

* Update prerequisites.md

---------

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../project/contributing/prerequisites.md     | 113 ++++++++++++++++--
 1 file changed, 103 insertions(+), 10 deletions(-)

diff --git a/documentation/project/contributing/prerequisites.md b/documentation/project/contributing/prerequisites.md
index b2469678b0e..f592d368e87 100644
--- a/documentation/project/contributing/prerequisites.md
+++ b/documentation/project/contributing/prerequisites.md
@@ -1,16 +1,71 @@
-### Prerequisites
+## Prerequisites
 
-This page explains how to get the software you need to use a Linux or macOS
-machine for local development.
+This page explains how to get the software you need to use on Linux or macOS for local development.
 
-Before you begin contributing you must have:
+* `java 17` package or newer 
+* `git` installed
+* `docker` installed
 
-* A GitHub account
-* `Java` 17 or newer
-* `Git`
-* `Docker`
+> Note: For contribution, you must have `github` account.
 
-### Installing prerequisites on macOS
+### For Linux
+
+1. Install `OpenJDK 17` package or newer: 
+
+```
+sudo apt update
+sudo apt install openjdk-17-jdk
+```
+
+* Check java version using command `java -version`.
+
+```
+openjdk version "17.0.5" 2022-10-18
+OpenJDK Runtime Environment (build 17.0.5+8-Ubuntu-2ubuntu120.04)
+OpenJDK 64-Bit Server VM (build 17.0.5+8-Ubuntu-2ubuntu120.04, mixed mode, sharing)
+```
+
+Note : In case OpenJDK 17 is not set as your default Java, run `sudo update-alternatives --config java` command to list all installed Java versions.
+
+```
+Selection    Path                                            Priority   Status
+------------------------------------------------------------
+* 0            /usr/lib/jvm/java-11-openjdk-amd64/bin/java      1111      auto mode
+  1            /usr/lib/jvm/java-11-openjdk-amd64/bin/java      1111      manual mode
+  2            /usr/lib/jvm/java-16-openjdk-amd64/bin/java      1051      manual mode
+  3            /usr/lib/jvm/java-17-openjdk-amd64/bin/java      1001      manual mode
+
+Press <enter> to keep the current choice[*], or type selection number:
+```
+
+you can set it as the default by entering the selection number for it in the list and pressing Enter. For example, to set Java 17 as the default, you would enter "3" and press **Enter**.
+
+2. Install `git`:
+
+```
+sudo apt install git
+```
+
+3. Install `docker`:
+
+```
+sudo apt update
+sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+sudo add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable"
+apt-cache policy docker-ce
+sudo apt -y install docker-ce
+```
+
+To execute the `docker` Command without `sudo`:
+
+```
+sudo usermod -aG docker ${USER}
+su - ${USER}
+sudo chmod 666 /var/run/docker.sock
+```
+
+### For macOS
 
 1. Install [brew](https://brew.sh/).
 2. Install brew cask:
@@ -37,6 +92,44 @@ export JAVA_HOME="$(/usr/libexec/java_home -v 17)"
 Consider allocating not less than 4GB of memory for your docker.
 Otherwise, some apps within a stack (e.g. `kafka-ui.yaml`) might crash.
 
+To check how much memory is allocated to docker, use `docker info`.
+
+You will find the total memory and used memory in the output. if you won't find used memory thats mean memory limits are not set for containers.
+
+#### To allocate 4GB of memory for Docker:
+
+#### For Ubuntu
+
+1. Open the Docker configuration file in a text editor using the following command:
+
+```
+sudo nano /etc/default/docker
+```
+
+2. Add the following line to the file to allocate 4GB of memory to Docker:
+
+```
+DOCKER_OPTS="--default-ulimit memlock=-1:-1 --memory=4g --memory-swap=-1"
+```
+
+3. Save the file and exit the text editor.
+
+4. Restart the Docker service using the following command:
+
+```
+sudo service docker restart
+```
+
+5. Verify that the memory limit has been set correctly by running the following command:
+
+```
+docker info | grep -i memory
+```
+
+Note that the warning messages are expected as they relate to the kernel not supporting cgroup memory limits.
+
+Now any containers you run in docker will be limited to this amount of memory. You can also increase the memory limit as your preference.
+
 ## Where to go next
 
-In the next section, you'll [learn how to Build and Run kafka-ui](building.md).
+In the next section, you'll learn [how to Build and Run kafka-ui](building.md).

From 4623f8d7b8a8dddd6b1c0cf3b9a7acd4074eab3c Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 28 Mar 2023 16:13:28 +0400
Subject: [PATCH 473/734] [FE] Update display of key/value serdes in messages
 (#3543)

* added key format and value format

* comented some test cases

* comented some test cases

* changed test cases

* changed test cases

* swapped key Serde and Value Serde
---
 .../Topics/Topic/Messages/Message.tsx         |  4 --
 .../MessageContent/MessageContent.tsx         | 21 +++++----
 .../__tests__/MessageContent.spec.tsx         | 43 +++++++++++++------
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index cb2dbbb3c0c..47b6e49a41e 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -42,8 +42,6 @@ const Message: React.FC<Props> = ({
     key,
     partition,
     content,
-    valueFormat,
-    keyFormat,
     headers,
   },
   keyFilters,
@@ -140,9 +138,7 @@ const Message: React.FC<Props> = ({
       {isOpen && (
         <MessageContent
           messageKey={key}
-          messageKeyFormat={keyFormat}
           messageContent={content}
-          messageContentFormat={valueFormat}
           headers={headers}
           timestamp={timestamp}
           timestampType={timestampType}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
index 6edfdde54c1..fe472ad3b12 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
@@ -3,6 +3,7 @@ import EditorViewer from 'components/common/EditorViewer/EditorViewer';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { SchemaType, TopicMessageTimestampTypeEnum } from 'generated-sources';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
+import { useSearchParams } from 'react-router-dom';
 
 import * as S from './MessageContent.styled';
 
@@ -10,9 +11,7 @@ type Tab = 'key' | 'content' | 'headers';
 
 export interface MessageContentProps {
   messageKey?: string;
-  messageKeyFormat?: string;
   messageContent?: string;
-  messageContentFormat?: string;
   headers?: { [key: string]: string | undefined };
   timestamp?: Date;
   timestampType?: TopicMessageTimestampTypeEnum;
@@ -20,14 +19,15 @@ export interface MessageContentProps {
 
 const MessageContent: React.FC<MessageContentProps> = ({
   messageKey,
-  messageKeyFormat,
   messageContent,
-  messageContentFormat,
   headers,
   timestamp,
   timestampType,
 }) => {
   const [activeTab, setActiveTab] = React.useState<Tab>('content');
+  const [searchParams] = useSearchParams();
+  const keyFormat = searchParams.get('keySerde') || '';
+  const valueFormat = searchParams.get('valueSerde') || '';
 
   const activeTabContent = () => {
     switch (activeTab) {
@@ -54,7 +54,6 @@ const MessageContent: React.FC<MessageContentProps> = ({
     e.preventDefault();
     setActiveTab('headers');
   };
-
   const keySize = new TextEncoder().encode(messageKey).length;
   const contentSize = new TextEncoder().encode(messageContent).length;
   const contentType =
@@ -106,21 +105,21 @@ const MessageContent: React.FC<MessageContentProps> = ({
             </S.Metadata>
 
             <S.Metadata>
-              <S.MetadataLabel>Value</S.MetadataLabel>
+              <S.MetadataLabel>Key Serde</S.MetadataLabel>
               <span>
-                <S.MetadataValue>{messageContentFormat}</S.MetadataValue>
+                <S.MetadataValue>{keyFormat}</S.MetadataValue>
                 <S.MetadataMeta>
-                  Size: <BytesFormatted value={contentSize} />
+                  Size: <BytesFormatted value={keySize} />
                 </S.MetadataMeta>
               </span>
             </S.Metadata>
 
             <S.Metadata>
-              <S.MetadataLabel>Key</S.MetadataLabel>
+              <S.MetadataLabel>Value Serde</S.MetadataLabel>
               <span>
-                <S.MetadataValue>{messageKeyFormat}</S.MetadataValue>
+                <S.MetadataValue>{valueFormat}</S.MetadataValue>
                 <S.MetadataMeta>
-                  Size: <BytesFormatted value={keySize} />
+                  Size: <BytesFormatted value={contentSize} />
                 </S.MetadataMeta>
               </span>
             </S.Metadata>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
index 23af3d45cf4..91310a30e41 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
@@ -16,9 +16,7 @@ const setupWrapper = (props?: Partial<MessageContentProps>) => {
       <tbody>
         <MessageContent
           messageKey='"test-key"'
-          messageKeyFormat="JSON"
           messageContent='{"data": "test"}'
-          messageContentFormat="AVRO"
           headers={{ header: 'test' }}
           timestamp={new Date(0)}
           timestampType={TopicMessageTimestampTypeEnum.CREATE_TIME}
@@ -34,14 +32,33 @@ const proto =
 
 global.TextEncoder = TextEncoder;
 
+const searchParamsContentAVRO = new URLSearchParams({
+  keySerde: 'SchemaRegistry',
+  valueSerde: 'AVRO',
+  limit: '100',
+});
+
+const searchParamsContentJSON = new URLSearchParams({
+  keySerde: 'SchemaRegistry',
+  valueSerde: 'JSON',
+  limit: '100',
+});
+
+const searchParamsContentPROTOBUF = new URLSearchParams({
+  keySerde: 'SchemaRegistry',
+  valueSerde: 'PROTOBUF',
+  limit: '100',
+});
 describe('MessageContent screen', () => {
   beforeEach(() => {
-    render(setupWrapper());
+    render(setupWrapper(), {
+      initialEntries: [`/messages?${searchParamsContentAVRO}`],
+    });
   });
 
   describe('renders', () => {
     it('key format in document', () => {
-      expect(screen.getByText('JSON')).toBeInTheDocument();
+      expect(screen.getByText('SchemaRegistry')).toBeInTheDocument();
     });
 
     it('content format in document', () => {
@@ -86,36 +103,36 @@ describe('checking content type depend on message type', () => {
   it('renders component with message having JSON type', () => {
     render(
       setupWrapper({
-        messageContentFormat: 'JSON',
         messageContent: '{"data": "test"}',
-      })
+      }),
+      { initialEntries: [`/messages?${searchParamsContentJSON}`] }
     );
-    expect(screen.getAllByText('JSON')[1]).toBeInTheDocument();
+    expect(screen.getByText('JSON')).toBeInTheDocument();
   });
   it('renders component with message having AVRO type', () => {
     render(
       setupWrapper({
-        messageContentFormat: 'AVRO',
         messageContent: '{"data": "test"}',
-      })
+      }),
+      { initialEntries: [`/messages?${searchParamsContentAVRO}`] }
     );
     expect(screen.getByText('AVRO')).toBeInTheDocument();
   });
   it('renders component with message having PROTOBUF type', () => {
     render(
       setupWrapper({
-        messageContentFormat: 'PROTOBUF',
         messageContent: proto,
-      })
+      }),
+      { initialEntries: [`/messages?${searchParamsContentPROTOBUF}`] }
     );
     expect(screen.getByText('PROTOBUF')).toBeInTheDocument();
   });
   it('renders component with message having no type which is equal to having PROTOBUF type', () => {
     render(
       setupWrapper({
-        messageContentFormat: 'PROTOBUF',
         messageContent: '',
-      })
+      }),
+      { initialEntries: [`/messages?${searchParamsContentPROTOBUF}`] }
     );
     expect(screen.getByText('PROTOBUF')).toBeInTheDocument();
   });

From ef0dacb0c36a1a180ef8fda670c82854658aab00 Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Tue, 28 Mar 2023 16:45:42 +0400
Subject: [PATCH 474/734] [FE] Fix timestamp filter & partitions selection
 (#3569)

---
 .../src/components/Topics/Topic/Messages/Filters/Filters.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index c3871432e70..ec62f266ed4 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -231,7 +231,10 @@ const Filters: React.FC<FiltersProps> = ({
         props.seekType = SeekType.TIMESTAMP;
       }
 
-      if (selectedPartitions.length !== partitions.length) {
+      if (
+        selectedPartitions.length !== partitions.length ||
+        currentSeekType === SeekType.TIMESTAMP
+      ) {
         // not everything in the partition is selected
         props.seekTo = selectedPartitions.map(({ value }) => {
           const offsetProperty =

From 4a1e987a1d2a958119ab5c936d4b1d82125e14d9 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 28 Mar 2023 17:11:07 +0300
Subject: [PATCH 475/734] Bump helm version

Co-authored-by: github-actions <github-actions@github.com>
---
 charts/kafka-ui/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 553d193b791..9f098c1d92a 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.6.0
-appVersion: v0.6.0
+version: 0.6.1
+appVersion: v0.6.1
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

From 8348241e3d49f3947eb432761dd587c8c19a4c06 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 28 Mar 2023 18:01:19 +0300
Subject: [PATCH 476/734] Fix UserInfoUri usage for Github Enterprise (#3545)

* Fix #3542

* Fix orgs sub url

* Replace a constant with a well-known one

* Remove an unused constant

* Update local run config file
---
 .../extractor/GithubAuthorityExtractor.java   | 21 ++++++-
 .../src/main/resources/application-local.yml  | 60 ++++++++++++-------
 2 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
index 882c727375a..0f66e45917e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
@@ -12,6 +12,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpHeaders;
+import org.springframework.security.config.oauth2.client.CommonOAuth2Provider;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -24,8 +25,7 @@ public class GithubAuthorityExtractor implements ProviderAuthorityExtractor {
   private static final String USERNAME_ATTRIBUTE_NAME = "login";
   private static final String ORGANIZATION_NAME = "login";
   private static final String GITHUB_ACCEPT_HEADER = "application/vnd.github+json";
-
-  private final WebClient webClient = WebClient.create("https://api.github.com");
+  private static final String DUMMY = "dummy";
 
   @Override
   public boolean isApplicable(String provider) {
@@ -64,9 +64,24 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
       return Mono.just(groupsByUsername);
     }
 
+    OAuth2UserRequest req = (OAuth2UserRequest) additionalParams.get("request");
+    String infoEndpoint = req.getClientRegistration().getProviderDetails().getUserInfoEndpoint().getUri();
+
+    if (infoEndpoint == null) {
+      infoEndpoint = CommonOAuth2Provider.GITHUB
+          .getBuilder(DUMMY)
+          .clientId(DUMMY)
+          .build()
+          .getProviderDetails()
+          .getUserInfoEndpoint()
+          .getUri();
+    }
+
+    WebClient webClient = WebClient.create(infoEndpoint);
+
     final Mono<List<Map<String, Object>>> userOrganizations = webClient
         .get()
-        .uri("/user/orgs")
+        .uri("/orgs")
         .headers(headers -> {
           headers.set(HttpHeaders.ACCEPT, GITHUB_ACCEPT_HEADER);
           OAuth2UserRequest request = (OAuth2UserRequest) additionalParams.get("request");
diff --git a/kafka-ui-api/src/main/resources/application-local.yml b/kafka-ui-api/src/main/resources/application-local.yml
index 5eb3772e2bb..5e8fa18f407 100644
--- a/kafka-ui-api/src/main/resources/application-local.yml
+++ b/kafka-ui-api/src/main/resources/application-local.yml
@@ -6,6 +6,9 @@ logging:
     #org.springframework.http.codec.json.Jackson2JsonDecoder: DEBUG
     reactor.netty.http.server.AccessLog: INFO
 
+#server:
+#  port: 8080 #- Port in which kafka-ui will run.
+
 kafka:
   clusters:
     - name: local
@@ -42,27 +45,40 @@ kafka:
 spring:
   jmx:
     enabled: true
-  security:
-    oauth2:
-      client:
-        registration:
-          cognito:
-            clientId: xx
-            clientSecret: yy
-            scope: openid
-            client-name: cognito
-            provider: cognito
-            redirect-uri: http://localhost:8080/login/oauth2/code/cognito
-            authorization-grant-type: authorization_code
-        provider:
-          cognito:
-            issuer-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj
-            jwk-set-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj/.well-known/jwks.json
-            user-name-attribute: username
+
 auth:
   type: DISABLED
-
-roles.file: /tmp/roles.yml
-
-#server:
-#  port: 8080 #- Port in which kafka-ui will run.
+#  type: OAUTH2
+#  oauth2:
+#    client:
+#      cognito:
+#        clientId:
+#        clientSecret:
+#        scope: openid
+#        client-name: cognito
+#        provider: cognito
+#        redirect-uri: http://localhost:8080/login/oauth2/code/cognito
+#        authorization-grant-type: authorization_code
+#        issuer-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj
+#        jwk-set-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj/.well-known/jwks.json
+#        user-name-attribute: username
+#        custom-params:
+#          type: cognito
+#          logoutUrl: https://kafka-ui.auth.eu-central-1.amazoncognito.com/logout
+#      google:
+#        provider: google
+#        clientId:
+#        clientSecret:
+#        user-name-attribute: email
+#        custom-params:
+#          type: google
+#          allowedDomain: provectus.com
+#      github:
+#        provider: github
+#        clientId:
+#        clientSecret:
+#        scope:
+#          - read:org
+#        user-name-attribute: login
+#        custom-params:
+#          type: github

From ff759fa45538b1c37f8110e43c9cc4cba6743614 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 30 Mar 2023 07:37:48 +0300
Subject: [PATCH 477/734] Documentation refactoring

---
 CONTRIBUTING.md                               |   6 +-
 README.md                                     | 185 +++++-------------
 charts/kafka-ui/README.md                     |  35 +---
 documentation/guides/AWS_IAM.md               |  41 ----
 documentation/guides/DataMasking.md           | 123 ------------
 documentation/guides/Protobuf.md              |  55 ------
 documentation/guides/SASL_SCRAM.md            |  58 ------
 documentation/guides/SECURE_BROKER.md         |   7 -
 documentation/guides/SSO.md                   |  71 -------
 documentation/guides/Serialization.md         | 167 ----------------
 documentation/project/ROADMAP.md              |  22 ---
 documentation/project/contributing/README.md  |   8 -
 .../building-and-running-without-docker.md    |  24 ---
 .../project/contributing/building.md          |  63 ------
 .../project/contributing/prerequisites.md     | 135 -------------
 .../project/contributing/set-up-git.md        |   8 -
 documentation/project/contributing/testing.md |  28 ---
 helm_chart.md                                 |  65 ------
 18 files changed, 59 insertions(+), 1042 deletions(-)
 delete mode 100644 documentation/guides/AWS_IAM.md
 delete mode 100644 documentation/guides/DataMasking.md
 delete mode 100644 documentation/guides/Protobuf.md
 delete mode 100644 documentation/guides/SASL_SCRAM.md
 delete mode 100644 documentation/guides/SECURE_BROKER.md
 delete mode 100644 documentation/guides/SSO.md
 delete mode 100644 documentation/guides/Serialization.md
 delete mode 100644 documentation/project/ROADMAP.md
 delete mode 100644 documentation/project/contributing/README.md
 delete mode 100644 documentation/project/contributing/building-and-running-without-docker.md
 delete mode 100644 documentation/project/contributing/building.md
 delete mode 100644 documentation/project/contributing/prerequisites.md
 delete mode 100644 documentation/project/contributing/set-up-git.md
 delete mode 100644 documentation/project/contributing/testing.md
 delete mode 100644 helm_chart.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 582280de661..ab17417cf97 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,5 @@
+This guide is an exact copy of the same documented located [in our official docs](https://docs.kafka-ui.provectus.io/development/contributing). If there are any differences between the documents, the one located in our official docs should prevail.
+
 This guide aims to walk you through the process of working on issues and Pull Requests (PRs).
 
 Bear in mind that you will not be able to complete some steps on your own if you do not have a “write” permission. Feel free to reach out to the maintainers to help you unlock these activities.
@@ -20,7 +22,7 @@ You also need to consider labels. You can sort the issues by scope labels, such
 ## Grabbing the issue
 
 There is a bunch of criteria that make an issue feasible for development. <br/>
-The implementation of any features and/or their enhancements should be reasonable, must be backed by justified requirements (demanded by the community, [roadmap](documentation/project/ROADMAP.md) plans, etc.). The final decision is left for the maintainers' discretion.
+The implementation of any features and/or their enhancements should be reasonable, must be backed by justified requirements (demanded by the community, [roadmap](https://docs.kafka-ui.provectus.io/project/roadmap) plans, etc.). The final decision is left for the maintainers' discretion.
 
 All bugs should be confirmed as such (i.e. the behavior is unintended).
 
@@ -39,7 +41,7 @@ To keep the status of the issue clear to everyone, please keep the card's status
 
 ## Setting up a local development environment
 
-Please refer to [this guide](documentation/project/contributing/README.md).
+Please refer to [this guide](https://docs.kafka-ui.provectus.io/development/contributing).
 
 # Pull Requests
 
diff --git a/README.md b/README.md
index e9246215367..96b59194f3a 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,31 @@
 ![UI for Apache Kafka logo](documentation/images/kafka-ui-logo.png) UI for Apache Kafka&nbsp;
 ------------------
 #### Versatile, fast and lightweight web UI for managing Apache Kafka® clusters. Built by developers, for developers.
+<br/>
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/provectus/kafka-ui/blob/master/LICENSE)
 ![UI for Apache Kafka Price Free](documentation/images/free-open-source.svg)
 [![Release version](https://img.shields.io/github/v/release/provectus/kafka-ui)](https://github.com/provectus/kafka-ui/releases)
 [![Chat with us](https://img.shields.io/discord/897805035122077716)](https://discord.gg/4DWzD7pGE5)
+[![Docker pulls](https://img.shields.io/docker/pulls/provectuslabs/kafka-ui)](https://hub.docker.com/r/provectuslabs/kafka-ui)
 
-### DISCLAIMER
-<em>UI for Apache Kafka is a free tool built and supported by the open-source community. Curated by Provectus, it will remain free and open-source, without any paid features or subscription plans to be added in the future.
-Looking for the help of Kafka experts? Provectus can help you design, build, deploy, and manage Apache Kafka clusters and streaming applications. Discover [Professional Services for Apache Kafka](https://provectus.com/professional-services-apache-kafka/), to unlock the full potential of Kafka in your enterprise! </em>
-
+<p align="center">
+    <a href="https://docs.kafka-ui.provectus.io/">DOCS</a> • 
+    <a href="https://docs.kafka-ui.provectus.io/configuration/quick-start">QUICK START</a> • 
+    <a href="https://discord.gg/4DWzD7pGE5">COMMUNITY DISCORD</a>
+    <br/>
+    <a href="https://aws.amazon.com/marketplace/pp/prodview-ogtt5hfhzkq6a">AWS Marketplace</a>  •
+    <a href="https://discord.gg/4DWzD7pGE5">ProductHunt</a>
+</p>
 
 #### UI for Apache Kafka is a free, open-source web UI to monitor and manage Apache Kafka clusters.
 
 UI for Apache Kafka is a simple tool that makes your data flows observable, helps find and troubleshoot issues faster and deliver optimal performance. Its lightweight dashboard makes it easy to track key metrics of your Kafka clusters - Brokers, Topics, Partitions, Production, and Consumption.
 
+### DISCLAIMER
+<em>UI for Apache Kafka is a free tool built and supported by the open-source community. Curated by Provectus, it will remain free and open-source, without any paid features or subscription plans to be added in the future.
+Looking for the help of Kafka experts? Provectus can help you design, build, deploy, and manage Apache Kafka clusters and streaming applications. Discover [Professional Services for Apache Kafka](https://provectus.com/professional-services-apache-kafka/), to unlock the full potential of Kafka in your enterprise! </em>
+
 Set up UI for Apache Kafka with just a couple of easy commands to visualize your Kafka data in a comprehensible way. You can run the tool locally or in
 the cloud.
 
@@ -29,10 +39,10 @@ the cloud.
 * **View Consumer Groups** — view per-partition parked offsets, combined and per-partition lag
 * **Browse Messages** — browse messages with JSON, plain text, and Avro encoding
 * **Dynamic Topic Configuration** — create and configure new topics with dynamic configuration
-* **Configurable Authentification** — secure your installation with optional Github/Gitlab/Google OAuth 2.0
-* **Custom serialization/deserialization plugins** - use a ready-to-go serde for your data like AWS Glue or Smile, or code your own!
-* **Role based access control** - [manage permissions](https://github.com/provectus/kafka-ui/wiki/RBAC-(role-based-access-control)) to access the UI with granular precision
-* **Data masking** - [obfuscate](https://github.com/provectus/kafka-ui/blob/master/documentation/guides/DataMasking.md) sensitive data in topic messages
+* **Configurable Authentification** — [secure](https://docs.kafka-ui.provectus.io/configuration/authentication) your installation with optional Github/Gitlab/Google OAuth 2.0
+* **Custom serialization/deserialization plugins** - [use](https://docs.kafka-ui.provectus.io/configuration/serialization-serde) a ready-to-go serde for your data like AWS Glue or Smile, or code your own!
+* **Role based access control** - [manage permissions](https://docs.kafka-ui.provectus.io/configuration/rbac-role-based-access-control) to access the UI with granular precision
+* **Data masking** - [obfuscate](https://docs.kafka-ui.provectus.io/configuration/data-masking) sensitive data in topic messages
 
 # The Interface
 UI for Apache Kafka wraps major functions of Apache Kafka with an intuitive user interface.
@@ -60,155 +70,68 @@ There are 3 supported types of schemas: Avro®, JSON Schema, and Protobuf schema
 
 ![Create Schema Registry](documentation/images/Create_schema.gif)
 
-Before producing avro-encoded messages, you have to add an avro schema for the topic in Schema Registry. Now all these steps are easy to do
+Before producing avro/protobuf encoded messages, you have to add a schema for the topic in Schema Registry. Now all these steps are easy to do
 with a few clicks in a user-friendly interface.
 
 ![Avro Schema Topic](documentation/images/Schema_Topic.gif)
 
 # Getting Started
 
-To run UI for Apache Kafka, you can use a pre-built Docker image or build it locally.
-
-## Configuration
-
-We have plenty of [docker-compose files](documentation/compose/DOCKER_COMPOSE.md) as examples. They're built for various configuration stacks.
-
-# Guides
-
-- [SSO configuration](documentation/guides/SSO.md)
-- [AWS IAM configuration](documentation/guides/AWS_IAM.md)
-- [Docker-compose files](documentation/compose/DOCKER_COMPOSE.md)
-- [Connection to a secure broker](documentation/guides/SECURE_BROKER.md)
-- [Configure seriliazation/deserialization plugins or code your own](documentation/guides/Serialization.md)
+To run UI for Apache Kafka, you can use either a pre-built Docker image or build it (or a jar file) yourself.
 
-### Configuration File
-Example of how to configure clusters in the [application-local.yml](https://github.com/provectus/kafka-ui/blob/master/kafka-ui-api/src/main/resources/application-local.yml) configuration file:
+## Quick start (Demo run)
 
-
-```sh
-kafka:
-  clusters:
-    -
-      name: local
-      bootstrapServers: localhost:29091
-      schemaRegistry: http://localhost:8085
-      schemaRegistryAuth:
-        username: username
-        password: password
-#     schemaNameTemplate: "%s-value"
-      metrics:
-        port: 9997
-        type: JMX
-    -
+```
+docker run -it -p 8080:8080 -e DYNAMIC_CONFIG_ENABLED=true provectuslabs/kafka-ui
 ```
 
-* `name`: cluster name
-* `bootstrapServers`: where to connect
-* `schemaRegistry`: schemaRegistry's address
-* `schemaRegistryAuth.username`: schemaRegistry's basic authentication username
-* `schemaRegistryAuth.password`: schemaRegistry's basic authentication password
-* `schemaNameTemplate`: how keys are saved to schemaRegistry
-* `metrics.port`: open JMX port of a broker
-* `metrics.type`: Type of metrics, either JMX or PROMETHEUS. Defaulted to JMX.
-* `readOnly`: enable read only mode
-
-Configure as many clusters as you need by adding their configs below separated with `-`.
-
-## Running a Docker Image
-The official Docker image for UI for Apache Kafka is hosted here: [hub.docker.com/r/provectuslabs/kafka-ui](https://hub.docker.com/r/provectuslabs/kafka-ui).
+Then access the web UI at [http://localhost:8080](http://localhost:8080)
 
-Launch Docker container in the background:
-```sh
+The command is sufficient to try things out. When you're done trying things out, you can proceed with a [persistent installation](https://docs.kafka-ui.provectus.io/configuration/quick-start#persistent-start)
 
-docker run -p 8080:8080 \
-	-e KAFKA_CLUSTERS_0_NAME=local \
-	-e KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092 \
-	-d provectuslabs/kafka-ui:latest
+## Persistent installation
 
 ```
-Then access the web UI at [http://localhost:8080](http://localhost:8080).
-Further configuration with environment variables - [see environment variables](#env_variables)
-
-### Docker Compose
-
-If you prefer to use `docker-compose` please refer to the [documentation](docker-compose.md).
-
-### Helm chart
-Helm chart could be found under [charts/kafka-ui](https://github.com/provectus/kafka-ui/tree/master/charts/kafka-ui) directory
+services:
+  kafka-ui:
+    container_name: kafka-ui
+    image: provectuslabs/kafka-ui:latest
+    ports:
+      - 8080:8080
+    environment:
+      DYNAMIC_CONFIG_ENABLED: true
+    volumes:
+      - ~/kui/config.yml:/etc/kafkaui/dynamic_config.yaml
+```
 
-Quick-start instruction [here](helm_chart.md)
+Please refer to our [configuration](https://docs.kafka-ui.provectus.io/configuration/quick-start) page to proceed with further app configuration.
 
-## Building With Docker
+## Some useful configuration related links
 
-### Prerequisites
+[Web UI Cluster Configuration Wizard](https://docs.kafka-ui.provectus.io/configuration/configuration-wizard)
 
-Check [prerequisites.md](documentation/project/contributing/prerequisites.md)
+[Configuration file explanation](https://docs.kafka-ui.provectus.io/configuration/configuration-file)
 
-### Building and Running
+[Docker Compose examples](https://docs.kafka-ui.provectus.io/configuration/compose-examples)
 
-Check [building.md](documentation/project/contributing/building.md)
+[Misc configuration properties](https://docs.kafka-ui.provectus.io/configuration/misc-configuration-properties)
 
-## Building Without Docker
+## Helm charts
 
-### Prerequisites
+[Quick start](https://docs.kafka-ui.provectus.io/configuration/helm-charts/quick-start)
 
-[Prerequisites](documentation/project/contributing/prerequisites.md) will mostly remain the same with the exception of docker.
+## Building from sources
 
-### Running without Building
+[Quick start](https://docs.kafka-ui.provectus.io/development/building/prerequisites) with building
 
-[How to run quickly without building](documentation/project/contributing/building-and-running-without-docker.md#run_without_docker_quickly)
+## Liveliness and readiness probes
+Liveliness and readiness endpoint is at `/actuator/health`.<br/>
+Info endpoint (build info) is located at `/actuator/info`.
 
-### Building and Running
+# Configuration options
 
-[How to build and run](documentation/project/contributing/building-and-running-without-docker.md#build_and_run_without_docker)
+All of the environment variables/config properties could be found [here](https://docs.kafka-ui.provectus.io/configuration/misc-configuration-properties).
 
-## Liveliness and readiness probes
-Liveliness and readiness endpoint is at `/actuator/health`.
-Info endpoint (build info) is located at `/actuator/info`.
+# Contributing
 
-## <a name="env_variables"></a> Environment Variables
-
-Alternatively, each variable of the .yml file can be set with an environment variable.
-For example, if you want to use an environment variable to set the `name` parameter, you can write it like this: `KAFKA_CLUSTERS_2_NAME`
-
-|Name               	|Description
-|-----------------------|-------------------------------
-|`SERVER_SERVLET_CONTEXT_PATH` | URI basePath
-|`LOGGING_LEVEL_ROOT`        	| Setting log level (trace, debug, info, warn, error). Default: info
-|`LOGGING_LEVEL_COM_PROVECTUS` |Setting log level (trace, debug, info, warn, error). Default: debug
-|`SERVER_PORT` |Port for the embedded server. Default: `8080`
-|`KAFKA_ADMIN-CLIENT-TIMEOUT` | Kafka API timeout in ms. Default: `30000`
-|`KAFKA_CLUSTERS_0_NAME` | Cluster name
-|`KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS` 	|Address where to connect
-|`KAFKA_CLUSTERS_0_KSQLDBSERVER` 	| KSQL DB server address
-|`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_USERNAME` 	| KSQL DB server's basic authentication username
-|`KAFKA_CLUSTERS_0_KSQLDBSERVERAUTH_PASSWORD` 	| KSQL DB server's basic authentication password
-|`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTORELOCATION`   	|Path to the JKS keystore to communicate to KSQL DB
-|`KAFKA_CLUSTERS_0_KSQLDBSERVERSSL_KEYSTOREPASSWORD`   	|Password of the JKS keystore for KSQL DB
-|`KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL` 	|Security protocol to connect to the brokers. For SSL connection use "SSL", for plaintext connection don't set this environment variable
-|`KAFKA_CLUSTERS_0_SCHEMAREGISTRY`   	|SchemaRegistry's address
-|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME`   	|SchemaRegistry's basic authentication username
-|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_PASSWORD`   	|SchemaRegistry's basic authentication password
-|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTORELOCATION`   	|Path to the JKS keystore to communicate to SchemaRegistry
-|`KAFKA_CLUSTERS_0_SCHEMAREGISTRYSSL_KEYSTOREPASSWORD`   	|Password of the JKS keystore for SchemaRegistry
-|`KAFKA_CLUSTERS_0_METRICS_SSL`          |Enable SSL for Metrics (for PROMETHEUS metrics type). Default: false.
-|`KAFKA_CLUSTERS_0_METRICS_USERNAME` |Username for Metrics authentication
-|`KAFKA_CLUSTERS_0_METRICS_PASSWORD` |Password for Metrics authentication
-|`KAFKA_CLUSTERS_0_METRICS_KEYSTORELOCATION` |Path to the JKS keystore to communicate to metrics source (JMX/PROMETHEUS). For advanced setup, see `kafka-ui-jmx-secured.yml`
-|`KAFKA_CLUSTERS_0_METRICS_KEYSTOREPASSWORD` |Password of the JKS metrics keystore
-|`KAFKA_CLUSTERS_0_SCHEMANAMETEMPLATE` |How keys are saved to schemaRegistry
-|`KAFKA_CLUSTERS_0_METRICS_PORT`        	 |Open metrics port of a broker
-|`KAFKA_CLUSTERS_0_METRICS_TYPE`        	 |Type of metrics retriever to use. Valid values are JMX (default) or PROMETHEUS. If Prometheus, then metrics are read from prometheus-jmx-exporter instead of jmx
-|`KAFKA_CLUSTERS_0_READONLY`        	|Enable read-only mode. Default: false
-|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME` |Given name for the Kafka Connect cluster
-|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS` |Address of the Kafka Connect service endpoint
-|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_USERNAME`| Kafka Connect cluster's basic authentication username
-|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_PASSWORD`| Kafka Connect cluster's basic authentication password
-|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTORELOCATION`| Path to the JKS keystore to communicate to Kafka Connect
-|`KAFKA_CLUSTERS_0_KAFKACONNECT_0_KEYSTOREPASSWORD`| Password of the JKS keystore for Kafka Connect
-|`KAFKA_CLUSTERS_0_POLLING_THROTTLE_RATE` |Max traffic rate (bytes/sec) that kafka-ui allowed to reach when polling messages from the cluster. Default: 0 (not limited)
-|`KAFKA_CLUSTERS_0_SSL_TRUSTSTORELOCATION`| Path to the JKS truststore to communicate to Kafka Connect, SchemaRegistry, KSQL, Metrics
-|`KAFKA_CLUSTERS_0_SSL_TRUSTSTOREPASSWORD`| Password of the JKS truststore for Kafka Connect, SchemaRegistry, KSQL, Metrics
-|`TOPIC_RECREATE_DELAY_SECONDS` |Time delay between topic deletion and topic creation attempts for topic recreate functionality. Default: 1
-|`TOPIC_RECREATE_MAXRETRIES`  |Number of attempts of topic creation after topic deletion for topic recreate functionality. Default: 15
-|`DYNAMIC_CONFIG_ENABLED`|Allow to change application config in runtime. Default: false.
+Please refer to [contributing guide](https://docs.kafka-ui.provectus.io/development/contributing), we'll guide you from there.
\ No newline at end of file
diff --git a/charts/kafka-ui/README.md b/charts/kafka-ui/README.md
index 5d08629dcb5..e57755e1d86 100644
--- a/charts/kafka-ui/README.md
+++ b/charts/kafka-ui/README.md
@@ -1,34 +1 @@
-# Kafka-UI Helm Chart
-
-## Configuration
-
-Most of the Helm charts parameters are common, follow table describe unique parameters related to application configuration.
-
-### Kafka-UI parameters
-
-| Parameter                                | Description                                                                                                                                    | Default |
-| ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| `existingConfigMap`                      | Name of the existing ConfigMap with Kafka-UI environment variables                                                                             | `nil`   |
-| `existingSecret`                         | Name of the existing Secret with Kafka-UI environment variables                                                                                | `nil`   |
-| `envs.secret`                            | Set of the sensitive environment variables to pass to Kafka-UI                                                                                 | `{}`    |
-| `envs.config`                            | Set of the environment variables to pass to Kafka-UI                                                                                           | `{}`    |
-| `yamlApplicationConfigConfigMap`         | Map with name and keyName keys, name refers to the existing ConfigMap, keyName refers to the ConfigMap key with Kafka-UI config in Yaml format | `{}`    |
-| `yamlApplicationConfig`                  | Kafka-UI config in Yaml format                                                                                                                 | `{}`    |
-| `networkPolicy.enabled`                  | Enable network policies                                                                                                                        | `false` |
-| `networkPolicy.egressRules.customRules`  | Custom network egress policy rules                                                                                                             | `[]`    |
-| `networkPolicy.ingressRules.customRules` | Custom network ingress policy rules                                                                                                            | `[]`    |
-| `podLabels`                              | Extra labels for Kafka-UI pod                                                                                                                  | `{}`    |
-
-
-## Example
-
-To install Kafka-UI need to execute follow:
-``` bash
-helm repo add kafka-ui https://provectus.github.io/kafka-ui
-helm install kafka-ui kafka-ui/kafka-ui --set envs.config.KAFKA_CLUSTERS_0_NAME=local --set envs.config.KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092
-```
-To connect to Kafka-UI web application need to execute:
-``` bash
-kubectl port-forward svc/kafka-ui 8080:80
-```
-Open the `http://127.0.0.1:8080` on the browser to access Kafka-UI.
+Please refer to our [documentation](https://docs.kafka-ui.provectus.io/configuration/helm-charts) to get some info on our helm charts.
\ No newline at end of file
diff --git a/documentation/guides/AWS_IAM.md b/documentation/guides/AWS_IAM.md
deleted file mode 100644
index 80bfab205bc..00000000000
--- a/documentation/guides/AWS_IAM.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# How to configure AWS IAM Authentication
-
-UI for Apache Kafka comes with built-in [aws-msk-iam-auth](https://github.com/aws/aws-msk-iam-auth) library.
-
-You could pass sasl configs in properties section for each cluster.
-
-More details could be found here: [aws-msk-iam-auth](https://github.com/aws/aws-msk-iam-auth)
- 
-## Examples: 
-
-Please replace 
-* <KAFKA_URL> with broker list
-* <PROFILE_NAME> with your aws profile
-
-
-### Running From Docker Image
-
-```sh
-docker run -p 8080:8080 \
-    -e KAFKA_CLUSTERS_0_NAME=local \
-    -e KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=<KAFKA_URL> \
-    -e KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL=SASL_SSL \
-    -e KAFKA_CLUSTERS_0_PROPERTIES_SASL_MECHANISM=AWS_MSK_IAM \
-    -e KAFKA_CLUSTERS_0_PROPERTIES_SASL_CLIENT_CALLBACK_HANDLER_CLASS=software.amazon.msk.auth.iam.IAMClientCallbackHandler \
-    -e KAFKA_CLUSTERS_0_PROPERTIES_SASL_JAAS_CONFIG=software.amazon.msk.auth.iam.IAMLoginModule required awsProfileName="<PROFILE_NAME>"; \
-    -d provectuslabs/kafka-ui:latest 
-```
-
-### Configuring by application.yaml
-
-```yaml
-kafka:
-  clusters:
-    - name: local
-      bootstrapServers: <KAFKA_URL>
-      properties:
-        security.protocol: SASL_SSL
-        sasl.mechanism: AWS_MSK_IAM
-        sasl.client.callback.handler.class: software.amazon.msk.auth.iam.IAMClientCallbackHandler
-        sasl.jaas.config: software.amazon.msk.auth.iam.IAMLoginModule required awsProfileName="<PROFILE_NAME>";
-```
\ No newline at end of file
diff --git a/documentation/guides/DataMasking.md b/documentation/guides/DataMasking.md
deleted file mode 100644
index a50f5013dba..00000000000
--- a/documentation/guides/DataMasking.md
+++ /dev/null
@@ -1,123 +0,0 @@
-# Topics data masking
-
-You can configure kafka-ui to mask sensitive data shown in Messages page.
-
-Several masking policies supported:
-
-### REMOVE
-For json objects - remove target fields, otherwise - return "null" string.
-```yaml
-- type: REMOVE
-  fields: [ "id", "name" ]
-  ...
-```
-
-Apply examples:
-```
-{ "id": 1234, "name": { "first": "James" }, "age": 30 } 
- ->
-{ "age": 30 } 
-```
-```
-non-json string -> null
-```
-
-### REPLACE
-For json objects - replace target field's values with specified replacement string (by default with `***DATA_MASKED***`). Note: if target field's value is object, then replacement applied to all its fields recursively (see example). 
-
-```yaml
-- type: REPLACE
-  fields: [ "id", "name" ]
-  replacement: "***"  #optional, "***DATA_MASKED***" by default
-  ...
-```
-
-Apply examples:
-```
-{ "id": 1234, "name": { "first": "James", "last": "Bond" }, "age": 30 } 
- ->
-{ "id": "***", "name": { "first": "***", "last": "***" }, "age": 30 } 
-```
-```
-non-json string -> ***
-```
-
-### MASK
-Mask target field's values with specified masking characters, recursively (spaces and line separators will be kept as-is).
-`pattern` array specifies what symbols will be used to replace upper-case chars, lower-case chars, digits and other symbols correspondingly.
-
-```yaml
-- type: MASK
-  fields: [ "id", "name" ]
-  pattern: ["A", "a", "N", "_"]   # optional, default is ["X", "x", "n", "-"]
-  ...
-```
-
-Apply examples:
-```
-{ "id": 1234, "name": { "first": "James", "last": "Bond!" }, "age": 30 } 
- ->
-{ "id": "NNNN", "name": { "first": "Aaaaa", "last": "Aaaa_" }, "age": 30 } 
-```
-```
-Some string! -> Aaaa aaaaaa_
-```
-
-----
-
-For each policy, if `fields` not specified, then policy will be applied to all object's fields or whole string if it is not a json-object.
-
-You can specify which masks will be applied to topic's keys/values. Multiple policies will be applied if topic matches both policy's patterns.
-
-Yaml configuration example:
-```yaml
-kafka:
-  clusters:
-    - name: ClusterName
-      # Other Cluster configuration omitted ... 
-      masking:
-        - type: REMOVE
-          fields: [ "id" ]
-          topicKeysPattern: "events-with-ids-.*"
-          topicValuesPattern: "events-with-ids-.*"
-          
-        - type: REPLACE
-          fields: [ "companyName", "organizationName" ]
-          replacement: "***MASKED_ORG_NAME***"   #optional
-          topicValuesPattern: "org-events-.*"
-        
-        - type: MASK
-          fields: [ "name", "surname" ]
-          pattern: ["A", "a", "N", "_"]  #optional
-          topicValuesPattern: "user-states"
-
-        - type: MASK
-          topicValuesPattern: "very-secured-topic"
-```
-
-Same configuration in env-vars fashion:
-```
-...
-KAFKA_CLUSTERS_0_MASKING_0_TYPE: REMOVE
-KAFKA_CLUSTERS_0_MASKING_0_FIELDS_0: "id"
-KAFKA_CLUSTERS_0_MASKING_0_TOPICKEYSPATTERN: "events-with-ids-.*"
-KAFKA_CLUSTERS_0_MASKING_0_TOPICVALUESPATTERN: "events-with-ids-.*"
-
-KAFKA_CLUSTERS_0_MASKING_1_TYPE: REPLACE
-KAFKA_CLUSTERS_0_MASKING_1_FIELDS_0: "companyName"
-KAFKA_CLUSTERS_0_MASKING_1_FIELDS_1: "organizationName"
-KAFKA_CLUSTERS_0_MASKING_1_REPLACEMENT: "***MASKED_ORG_NAME***"
-KAFKA_CLUSTERS_0_MASKING_1_TOPICVALUESPATTERN: "org-events-.*"
-
-KAFKA_CLUSTERS_0_MASKING_2_TYPE: MASK
-KAFKA_CLUSTERS_0_MASKING_2_FIELDS_0: "name"
-KAFKA_CLUSTERS_0_MASKING_2_FIELDS_1: "surname"
-KAFKA_CLUSTERS_0_MASKING_2_PATTERN_0: 'A'
-KAFKA_CLUSTERS_0_MASKING_2_PATTERN_1: 'a'
-KAFKA_CLUSTERS_0_MASKING_2_PATTERN_2: 'N'
-KAFKA_CLUSTERS_0_MASKING_2_PATTERN_3: '_'
-KAFKA_CLUSTERS_0_MASKING_2_TOPICVALUESPATTERN: "user-states"
-
-KAFKA_CLUSTERS_0_MASKING_3_TYPE: MASK
-KAFKA_CLUSTERS_0_MASKING_3_TOPICVALUESPATTERN: "very-secured-topic"
-```
\ No newline at end of file
diff --git a/documentation/guides/Protobuf.md b/documentation/guides/Protobuf.md
deleted file mode 100644
index 12f92448c81..00000000000
--- a/documentation/guides/Protobuf.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Kafkaui Protobuf Support
-
-### This document is deprecated, please see examples in [Serialization document](Serialization.md).
-
-Kafkaui supports deserializing protobuf messages in two ways:
-1. Using Confluent Schema Registry's [protobuf support](https://docs.confluent.io/platform/current/schema-registry/serdes-develop/serdes-protobuf.html).
-2. Supplying a protobuf file as well as a configuration that maps topic names to protobuf types.
-
-## Configuring Kafkaui with a Protobuf File
-
-To configure Kafkaui to deserialize protobuf messages using a supplied protobuf schema add the following to the config:
-```yaml
-kafka:
-  clusters:
-    - # Cluster configuration omitted...
-      # protobufFilesDir specifies root location for proto files (will be scanned recursively)
-      # NOTE: if 'protobufFilesDir' specified, then 'protobufFile' and 'protobufFiles' settings will be ignored
-      protobufFilesDir: "/path/to/my-protobufs"
-      # (DEPRECATED) protobufFile is the path to the protobuf schema. (deprecated: please use "protobufFiles")
-      protobufFile: path/to/my.proto
-      # (DEPRECATED) protobufFiles is the location of one or more protobuf schemas
-      protobufFiles:
-        - /path/to/my-protobufs/my.proto
-        - /path/to/my-protobufs/another.proto
-        - /path/to/my-protobufs:test/test.proto
-      # protobufMessageName is the default protobuf type that is used to deserialize
-      # the message's value if the topic is not found in protobufMessageNameByTopic.    
-      protobufMessageName: my.DefaultValType
-      # protobufMessageNameByTopic is a mapping of topic names to protobuf types.
-      # This mapping is required and is used to deserialize the Kafka message's value.
-      protobufMessageNameByTopic:
-        topic1: my.Type1
-        topic2: my.Type2
-      # protobufMessageNameForKey is the default protobuf type that is used to deserialize
-      # the message's key if the topic is not found in protobufMessageNameForKeyByTopic.
-      protobufMessageNameForKey: my.DefaultKeyType
-      # protobufMessageNameForKeyByTopic is a mapping of topic names to protobuf types.
-      # This mapping is optional and is used to deserialize the Kafka message's key.
-      # If a protobuf type is not found for a topic's key, the key is deserialized as a string,
-      # unless protobufMessageNameForKey is specified.
-      protobufMessageNameForKeyByTopic:
-        topic1: my.KeyType1
-```
-
-Same config with flattened config (for docker-compose):
-
-```text
-kafka.clusters.0.protobufFiles.0: /path/to/my.proto
-kafka.clusters.0.protobufFiles.1: /path/to/another.proto
-kafka.clusters.0.protobufMessageName: my.DefaultValType
-kafka.clusters.0.protobufMessageNameByTopic.topic1: my.Type1
-kafka.clusters.0.protobufMessageNameByTopic.topic2: my.Type2
-kafka.clusters.0.protobufMessageNameForKey: my.DefaultKeyType
-kafka.clusters.0.protobufMessageNameForKeyByTopic.topic1: my.KeyType1
-```
\ No newline at end of file
diff --git a/documentation/guides/SASL_SCRAM.md b/documentation/guides/SASL_SCRAM.md
deleted file mode 100644
index be360cd0aec..00000000000
--- a/documentation/guides/SASL_SCRAM.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# How to configure SASL SCRAM Authentication
-
-You could pass sasl configs in properties section for each cluster.
- 
-## Examples: 
-
-Please replace 
-- <KAFKA_NAME> with cluster name
-- <KAFKA_URL> with broker list
-- <KAFKA_USERNAME> with username
-- <KAFKA_PASSWORD> with password
-
-### Running From Docker Image
-
-```sh
-docker run -p 8080:8080 \
-    -e KAFKA_CLUSTERS_0_NAME=<KAFKA_NAME> \
-    -e KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=<KAFKA_URL> \
-    -e KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL=SASL_SSL \
-    -e KAFKA_CLUSTERS_0_PROPERTIES_SASL_MECHANISM=SCRAM-SHA-512 \     
-    -e KAFKA_CLUSTERS_0_PROPERTIES_SASL_JAAS_CONFIG=org.apache.kafka.common.security.scram.ScramLoginModule required username="<KAFKA_USERNAME>" password="<KAFKA_PASSWORD>"; \
-    -d provectuslabs/kafka-ui:latest 
-```
-
-### Running From Docker-compose file
-
-```yaml
-
-version: '3.4'
-services:
-  
-  kafka-ui:
-    image: provectuslabs/kafka-ui
-    container_name: kafka-ui
-    ports:
-      - "888:8080"
-    restart: always
-    environment:
-      - KAFKA_CLUSTERS_0_NAME=<KAFKA_NAME>
-      - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=<KAFKA_URL>
-      - KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL=SASL_SSL
-      - KAFKA_CLUSTERS_0_PROPERTIES_SASL_MECHANISM=SCRAM-SHA-512
-      - KAFKA_CLUSTERS_0_PROPERTIES_SASL_JAAS_CONFIG=org.apache.kafka.common.security.scram.ScramLoginModule required username="<KAFKA_USERNAME>" password="<KAFKA_PASSWORD>";
-      - KAFKA_CLUSTERS_0_PROPERTIES_PROTOCOL=SASL
-```
-
-### Configuring by application.yaml
-
-```yaml
-kafka:
-  clusters:
-    - name: local
-      bootstrapServers: <KAFKA_URL>
-      properties:
-        security.protocol: SASL_SSL
-        sasl.mechanism: SCRAM-SHA-512        
-        sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="<KAFKA_USERNAME>" password="<KAFKA_PASSWORD>";
-```
diff --git a/documentation/guides/SECURE_BROKER.md b/documentation/guides/SECURE_BROKER.md
deleted file mode 100644
index ab15bb63ab3..00000000000
--- a/documentation/guides/SECURE_BROKER.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Connecting to a Secure Broker
-
-The app supports TLS (SSL) and SASL connections for [encryption and authentication](http://kafka.apache.org/090/documentation.html#security). <br/>
-
-### Running From Docker-compose file
-
-See [this](/documentation/compose/kafka-ssl.yml) docker-compose file reference for ssl-enabled kafka
diff --git a/documentation/guides/SSO.md b/documentation/guides/SSO.md
deleted file mode 100644
index f0fae959bd8..00000000000
--- a/documentation/guides/SSO.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# How to configure SSO
-SSO require additionaly to configure TLS for application, in that example we will use self-signed certificate, in case of use legal certificates please skip step 1.
-## Step 1
-At this step we will generate self-signed PKCS12 keypair.
-``` bash
-mkdir cert
-keytool -genkeypair -alias ui-for-apache-kafka -keyalg RSA -keysize 2048 \
-  -storetype PKCS12 -keystore cert/ui-for-apache-kafka.p12 -validity 3650
-```
-## Step 2
-Create new application in any SSO provider, we will continue with [Auth0](https://auth0.com).
-
-<img src="https://github.com/provectus/kafka-ui/raw/images/images/sso-new-app.png" width="70%"/>
-
-After that need to provide callback URLs, in our case we will use `https://127.0.0.1:8080/login/oauth2/code/auth0`
-
-<img src="https://github.com/provectus/kafka-ui/raw/images/images/sso-configuration.png" width="70%"/>
-
-This is a main parameters required for enabling SSO
-
-<img src="https://github.com/provectus/kafka-ui/raw/images/images/sso-parameters.png" width="70%"/>
-
-## Step 3
-To launch UI for Apache Kafka with enabled TLS and SSO run following:
-``` bash
-docker run -p 8080:8080 -v `pwd`/cert:/opt/cert -e AUTH_TYPE=LOGIN_FORM \
-  -e SECURITY_BASIC_ENABLED=true \
-  -e SERVER_SSL_KEY_STORE_TYPE=PKCS12 \
-  -e SERVER_SSL_KEY_STORE=/opt/cert/ui-for-apache-kafka.p12 \
-  -e SERVER_SSL_KEY_STORE_PASSWORD=123456 \
-  -e SERVER_SSL_KEY_ALIAS=ui-for-apache-kafka \
-  -e SERVER_SSL_ENABLED=true \
-  -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_CLIENTID=uhvaPKIHU4ZF8Ne4B6PGvF0hWW6OcUSB \
-  -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_CLIENTSECRET=YXfRjmodifiedTujnkVr7zuW9ECCAK4TcnCio-i \
-  -e SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_AUTH0_ISSUER_URI=https://dev-a63ggcut.auth0.com/ \
-  -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_SCOPE=openid \
-  -e TRUST_STORE=/opt/cert/ui-for-apache-kafka.p12 \
-  -e TRUST_STORE_PASSWORD=123456 \
-provectuslabs/kafka-ui:latest
-```
-In the case with trusted CA-signed SSL certificate and SSL termination somewhere outside of application we can pass only SSO related environment variables:
-``` bash
-docker run -p 8080:8080 -v `pwd`/cert:/opt/cert -e AUTH_TYPE=OAUTH2 \
-  -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_CLIENTID=uhvaPKIHU4ZF8Ne4B6PGvF0hWW6OcUSB \
-  -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_CLIENTSECRET=YXfRjmodifiedTujnkVr7zuW9ECCAK4TcnCio-i \
-  -e SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_AUTH0_ISSUER_URI=https://dev-a63ggcut.auth0.com/ \
-  -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_SCOPE=openid \
-provectuslabs/kafka-ui:latest
-```
-
-## Step 4 (Load Balancer HTTP) (optional)
-If you're using load balancer/proxy and use HTTP between the proxy and the app, you might want to set `server_forward-headers-strategy` to `native` as well (`SERVER_FORWARDHEADERSSTRATEGY=native`), for more info refer to [this issue](https://github.com/provectus/kafka-ui/issues/1017).
-
-## Step 5 (Azure) (optional)
-For Azure AD (Office365) OAUTH2 you'll want to add additional environment variables:
-
-```bash
-docker run -p 8080:8080 \
-        -e KAFKA_CLUSTERS_0_NAME="${cluster_name}"\
-        -e KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS="${kafka_listeners}" \
-        -e KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS="${kafka_connect_servers}"
-        -e AUTH_TYPE=OAUTH2 \
-        -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_CLIENTID=uhvaPKIHU4ZF8Ne4B6PGvF0hWW6OcUSB \
-        -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_CLIENTSECRET=YXfRjmodifiedTujnkVr7zuW9ECCAK4TcnCio-i \
-        -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_AUTH0_SCOPE="https://graph.microsoft.com/User.Read" \
-        -e SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_AUTH0_ISSUER_URI="https://login.microsoftonline.com/{tenant-id}/v2.0" \
-        -d provectuslabs/kafka-ui:latest"
-```
-
-Note that scope is created by default when Application registration is done in Azure portal.
-You'll need to update application registration manifest to include `"accessTokenAcceptedVersion": 2`
diff --git a/documentation/guides/Serialization.md b/documentation/guides/Serialization.md
deleted file mode 100644
index b9690f2cba1..00000000000
--- a/documentation/guides/Serialization.md
+++ /dev/null
@@ -1,167 +0,0 @@
-## Serialization and deserialization and custom plugins
-
-Kafka-ui supports multiple ways to serialize/deserialize data.
-
-
-### Int32, Int64, UInt32, UInt64
-Big-endian 4/8 bytes representation of signed/unsigned integers.
-
-### Base64
-Base64 (RFC4648) binary data representation. Can be useful in case if the actual data is not important, but exactly the same (byte-wise) key/value should be send.
-
-### String 
-Treats binary data as a string in specified encoding. Default encoding is UTF-8.
-
-Class name: `com.provectus.kafka.ui.serdes.builtin.StringSerde`
-
-Sample configuration (if you want to overwrite default configuration):
-```yaml
-kafka:
-  clusters:
-    - name: Cluster1
-      # Other Cluster configuration omitted ... 
-      serde:
-          # registering String serde with custom config
-        - name: AsciiString
-          className: com.provectus.kafka.ui.serdes.builtin.StringSerde
-          properties:
-            encoding: "ASCII"
-        
-          # overriding build-it String serde config   
-        - name: String 
-          properties:
-            encoding: "UTF-16"
-```
-
-### Protobuf
-
-Class name: `com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde`
-
-Sample configuration:
-```yaml
-kafka:
-  clusters:
-    - name: Cluster1
-      # Other Cluster configuration omitted ... 
-      serde:
-        - name: ProtobufFile
-          properties:
-            # path to the protobuf schema files directory
-            protobufFilesDir: "path/to/protofiles"
-            # default protobuf type that is used for KEY serialization/deserialization
-            # optional
-            protobufMessageNameForKey: my.Type1
-            # mapping of topic names to protobuf types, that will be used for KEYS  serialization/deserialization
-            # optional
-            protobufMessageNameForKeyByTopic:
-              topic1: my.KeyType1
-              topic2: my.KeyType2
-            # default protobuf type that is used for VALUE serialization/deserialization
-            # optional, if not set - first type in file will be used as default
-            protobufMessageName: my.Type1
-            # mapping of topic names to protobuf types, that will be used for VALUES  serialization/deserialization
-            # optional
-            protobufMessageNameByTopic:
-              topic1: my.Type1
-              "topic.2": my.Type2
-```
-Docker-compose sample for Protobuf serialization is [here](../compose/kafka-ui-serdes.yaml).
-
-Legacy configuration for protobuf is [here](Protobuf.md).
-
-### SchemaRegistry
-SchemaRegistry serde is automatically configured if schema registry properties set on cluster level.
-But you can add new SchemaRegistry-typed serdes that will connect to another schema-registry instance. 
-
-Class name: `com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde`
-
-Sample configuration:
-```yaml
-kafka:
-  clusters:
-    - name: Cluster1
-      # this url will be used by "SchemaRegistry" by default
-      schemaRegistry: http://main-schema-registry:8081
-      serde:
-        - name: AnotherSchemaRegistry
-          className: com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde
-          properties:
-            url:  http://another-schema-registry:8081
-            # auth properties, optional
-            username: nameForAuth
-            password: P@ssW0RdForAuth
-        
-          # and also add another SchemaRegistry serde
-        - name: ThirdSchemaRegistry
-          className: com.provectus.kafka.ui.serdes.builtin.sr.SchemaRegistrySerde
-          properties:
-            url:  http://another-yet-schema-registry:8081
-```
-
-## Setting serdes for specific topics
-You can specify preferable serde for topics key/value. This serde will be chosen by default in UI on topic's view/produce pages. 
-To do so, set `topicValuesPattern/topicValuesPattern` properties for the selected serde. Kafka-ui will choose a first serde that matches specified pattern.
-
-Sample configuration:
-```yaml
-kafka:
-  clusters:
-    - name: Cluster1
-      serde:
-        - name: String
-          topicKeysPattern: click-events|imp-events
-        
-        - name: Int64
-          topicKeysPattern: ".*-events"
-        
-        - name: SchemaRegistry
-          topicValuesPattern: click-events|imp-events
-```
-
-
-## Default serdes
-You can specify which serde will be chosen in UI by default if no other serdes selected via `topicKeysPattern/topicValuesPattern` settings.
-
-Sample configuration:
-```yaml
-kafka:
-  clusters:
-    - name: Cluster1
-      defaultKeySerde: Int32
-      defaultValueSerde: String
-      serde:
-        - name: Int32
-          topicKeysPattern: click-events|imp-events
-```
-
-## Fallback
-If selected serde couldn't be applied (exception was thrown), then fallback (String serde with UTF-8 encoding) serde will be applied. Such messages will be specially highlighted in UI.
-
-## Custom pluggable serde registration
-You can implement your own serde and register it in kafka-ui application.
-To do so:
-1. Add `kafka-ui-serde-api` dependency (should be downloadable via maven central)
-2. Implement `com.provectus.kafka.ui.serde.api.Serde` interface. See javadoc for implementation requirements.
-3. Pack your serde into uber jar, or provide directory with no-dependency jar and it's dependencies jars
-
-
-Example pluggable serdes :
-https://github.com/provectus/kafkaui-smile-serde
-https://github.com/provectus/kafkaui-glue-sr-serde
-
-Sample configuration:
-```yaml
-kafka:
-  clusters:
-    - name: Cluster1
-      serde:
-        - name: MyCustomSerde
-          className: my.lovely.org.KafkaUiSerde
-          filePath: /var/lib/kui-serde/my-kui-serde.jar
-          
-        - name: MyCustomSerde2
-          className: my.lovely.org.KafkaUiSerde2
-          filePath: /var/lib/kui-serde2
-          properties:
-            prop1: v1
-```
diff --git a/documentation/project/ROADMAP.md b/documentation/project/ROADMAP.md
deleted file mode 100644
index 407dab725a1..00000000000
--- a/documentation/project/ROADMAP.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Kafka-UI Project Roadmap
-====================
-
-Roadmap exists in a form of a github project board and is located [here](https://github.com/provectus/kafka-ui/projects/8).
-
-### How to use this document
-
-The roadmap provides a list of features we decided to prioritize in project development. It should serve as a reference point to understand projects' goals.
-
-We do prioritize them based on the feedback from the community, our own vision and other conditions and circumstances. 
-
-The roadmap sets the general way of development. The roadmap is mostly about long-term features. All the features could be re-prioritized, rescheduled or canceled.
-
-If there's no feature `X`, that **doesn't** mean we're **not** going to implement it. Feel free to raise the issue for the consideration. <br/>
-If a feature you want to see live is not present on roadmap, but there's an issue for the feature, feel free to vote for it using reactions in the issue.
-
-
-### How to contribute
-
-Since the roadmap consists mostly of big long-term features, implementing them might be not easy for a beginner outside collaborator.
-
-A good starting point is checking the [CONTRIBUTING.md](https://github.com/provectus/kafka-ui/blob/master/CONTRIBUTING.md) document.
\ No newline at end of file
diff --git a/documentation/project/contributing/README.md b/documentation/project/contributing/README.md
deleted file mode 100644
index 4c88e40c348..00000000000
--- a/documentation/project/contributing/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Contributing guidelines
-
-### Set up the local environment for development
-
-* [Prerequisites](prerequisites.md)
-<!--* [Setting up git](set-up-git.md)-->
-* [Building the app](building.md)
-* [Writing tests](testing.md)
\ No newline at end of file
diff --git a/documentation/project/contributing/building-and-running-without-docker.md b/documentation/project/contributing/building-and-running-without-docker.md
deleted file mode 100644
index b5221b2dc6e..00000000000
--- a/documentation/project/contributing/building-and-running-without-docker.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Build & Run Without Docker
-
-Once you installed the prerequisites and cloned the repository, run the following steps in your project directory:
-
-## <a name="run_without_docker_quickly"></a> Running Without Docker Quickly
-
-- [Download the latest kafka-ui jar file](https://github.com/provectus/kafka-ui/releases)
-#### <a name="run_kafkaui_jar_file"></a> Execute the jar
-```sh
-java -Dspring.config.additional-location=<path-to-application-local.yml> -jar <path-to-kafka-ui-jar>
-```
-- Example of how to configure clusters in the [application-local.yml](https://github.com/provectus/kafka-ui/blob/master/kafka-ui-api/src/main/resources/application-local.yml) configuration file.
-
-## <a name="build_and_run_without_docker"></a> Building And Running Without Docker
-
-> **_NOTE:_**  If you want to get kafka-ui up and running locally quickly without building the jar file manually, then just follow [Running Without Docker Quickly](#run_without_docker_quickly)
-
-> Comment out `docker-maven-plugin` plugin in `kafka-ui-api` pom.xml
-
-- [Command to build the jar](./building.md#cmd_to_build_kafkaui_without_docker)
-
-> Once your build is successful and the jar file named kafka-ui-api-0.0.1-SNAPSHOT.jar is generated inside `kafka-ui-api/target`.
-
-- [Execute the jar](#run_kafkaui_jar_file)
diff --git a/documentation/project/contributing/building.md b/documentation/project/contributing/building.md
deleted file mode 100644
index 55ea2dc2cc1..00000000000
--- a/documentation/project/contributing/building.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# Build & Run
-
-Once you installed the prerequisites and cloned the repository, run the following steps in your project directory:
-
-## Step 1 : Build
-> **_NOTE:_**  If you are an macOS M1 User then please keep in mind below things
-
-> Make sure you have ARM supported java installed
-
-> Skip the maven tests as they might not be successful
-
-- Build a docker image with the app
-```sh
-./mvnw clean install -Pprod
-```
-- if you need to build the frontend `kafka-ui-react-app`, go here
-     - [kafka-ui-react-app-build-documentation](../../../kafka-ui-react-app/README.md)
-
-<a name="cmd_to_build_kafkaui_without_docker"></a>
-- In case you want to build `kafka-ui-api` by skipping the tests
-```sh
-./mvnw clean install -Dmaven.test.skip=true -Pprod
-```
-
-- To build only the `kafka-ui-api` you can use this command:
-```sh
-./mvnw -f kafka-ui-api/pom.xml clean install -Pprod -DskipUIBuild=true
-```
-
-If this step is successful, it should create a docker image named `provectuslabs/kafka-ui` with `latest` tag on your local machine except macOS M1.
-
-## Step 2 : Run
-#### Using Docker Compose
-> **_NOTE:_**  If you are an macOS M1 User then you can use arm64 supported docker compose script `./documentation/compose/kafka-ui-arm64.yaml`
- - Start the `kafka-ui` app using docker image built in step 1 along with Kafka clusters:
-```sh
-docker-compose -f ./documentation/compose/kafka-ui.yaml up -d
-```
-
-#### Using Spring Boot Run
- - If you want to start only kafka clusters (to run the `kafka-ui` app via `spring-boot:run`):
-```sh
-docker-compose -f ./documentation/compose/kafka-clusters-only.yaml up -d
-```
-- Then start the app.
-```sh
-./mvnw spring-boot:run -Pprod
-
-# or
-
-./mvnw spring-boot:run -Pprod -Dspring.config.location=file:///path/to/conf.yaml
-```
-
-#### Running in kubernetes
-- Using Helm Charts
-```sh bash
-helm repo add kafka-ui https://provectus.github.io/kafka-ui
-helm install kafka-ui kafka-ui/kafka-ui
-```
-To read more please follow to [chart documentation](../../../charts/kafka-ui/README.md).
-
-## Step 3 : Access Kafka-UI
- - To see the `kafka-ui` app running, navigate to http://localhost:8080.
\ No newline at end of file
diff --git a/documentation/project/contributing/prerequisites.md b/documentation/project/contributing/prerequisites.md
deleted file mode 100644
index f592d368e87..00000000000
--- a/documentation/project/contributing/prerequisites.md
+++ /dev/null
@@ -1,135 +0,0 @@
-## Prerequisites
-
-This page explains how to get the software you need to use on Linux or macOS for local development.
-
-* `java 17` package or newer 
-* `git` installed
-* `docker` installed
-
-> Note: For contribution, you must have `github` account.
-
-### For Linux
-
-1. Install `OpenJDK 17` package or newer: 
-
-```
-sudo apt update
-sudo apt install openjdk-17-jdk
-```
-
-* Check java version using command `java -version`.
-
-```
-openjdk version "17.0.5" 2022-10-18
-OpenJDK Runtime Environment (build 17.0.5+8-Ubuntu-2ubuntu120.04)
-OpenJDK 64-Bit Server VM (build 17.0.5+8-Ubuntu-2ubuntu120.04, mixed mode, sharing)
-```
-
-Note : In case OpenJDK 17 is not set as your default Java, run `sudo update-alternatives --config java` command to list all installed Java versions.
-
-```
-Selection    Path                                            Priority   Status
-------------------------------------------------------------
-* 0            /usr/lib/jvm/java-11-openjdk-amd64/bin/java      1111      auto mode
-  1            /usr/lib/jvm/java-11-openjdk-amd64/bin/java      1111      manual mode
-  2            /usr/lib/jvm/java-16-openjdk-amd64/bin/java      1051      manual mode
-  3            /usr/lib/jvm/java-17-openjdk-amd64/bin/java      1001      manual mode
-
-Press <enter> to keep the current choice[*], or type selection number:
-```
-
-you can set it as the default by entering the selection number for it in the list and pressing Enter. For example, to set Java 17 as the default, you would enter "3" and press **Enter**.
-
-2. Install `git`:
-
-```
-sudo apt install git
-```
-
-3. Install `docker`:
-
-```
-sudo apt update
-sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/ubuntu focal stable"
-apt-cache policy docker-ce
-sudo apt -y install docker-ce
-```
-
-To execute the `docker` Command without `sudo`:
-
-```
-sudo usermod -aG docker ${USER}
-su - ${USER}
-sudo chmod 666 /var/run/docker.sock
-```
-
-### For macOS
-
-1. Install [brew](https://brew.sh/).
-2. Install brew cask:
-```sh
-brew cask
-```
-3. Install Eclipse Temurin 17 via Homebrew cask:
-```sh
-brew tap homebrew/cask-versions
-brew install temurin17
-```
-4. Verify Installation
-```sh
-java -version
-```
-Note : In case OpenJDK 17 is not set as your default Java, you can consider to include it in your `$PATH` after installation
-```sh
-export PATH="$(/usr/libexec/java_home -v 17)/bin:$PATH"
-export JAVA_HOME="$(/usr/libexec/java_home -v 17)"
-```
-
-## Tips
-
-Consider allocating not less than 4GB of memory for your docker.
-Otherwise, some apps within a stack (e.g. `kafka-ui.yaml`) might crash.
-
-To check how much memory is allocated to docker, use `docker info`.
-
-You will find the total memory and used memory in the output. if you won't find used memory thats mean memory limits are not set for containers.
-
-#### To allocate 4GB of memory for Docker:
-
-#### For Ubuntu
-
-1. Open the Docker configuration file in a text editor using the following command:
-
-```
-sudo nano /etc/default/docker
-```
-
-2. Add the following line to the file to allocate 4GB of memory to Docker:
-
-```
-DOCKER_OPTS="--default-ulimit memlock=-1:-1 --memory=4g --memory-swap=-1"
-```
-
-3. Save the file and exit the text editor.
-
-4. Restart the Docker service using the following command:
-
-```
-sudo service docker restart
-```
-
-5. Verify that the memory limit has been set correctly by running the following command:
-
-```
-docker info | grep -i memory
-```
-
-Note that the warning messages are expected as they relate to the kernel not supporting cgroup memory limits.
-
-Now any containers you run in docker will be limited to this amount of memory. You can also increase the memory limit as your preference.
-
-## Where to go next
-
-In the next section, you'll learn [how to Build and Run kafka-ui](building.md).
diff --git a/documentation/project/contributing/set-up-git.md b/documentation/project/contributing/set-up-git.md
deleted file mode 100644
index 2400b8b509d..00000000000
--- a/documentation/project/contributing/set-up-git.md
+++ /dev/null
@@ -1,8 +0,0 @@
-### Nothing special here yet.
-<!--
-TODO:
-
-1. Cloning
-2. Credentials set up (git user.name & email)
-3. Signing off (DCO)
--->
\ No newline at end of file
diff --git a/documentation/project/contributing/testing.md b/documentation/project/contributing/testing.md
deleted file mode 100644
index 98c90f8a54d..00000000000
--- a/documentation/project/contributing/testing.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Testing
-
-
-
-## Test suites
-
-
-## Writing new tests
-
-
-### Writing tests for new features
-
-
-### Writing tests for bug fixes
-
-
-### Writing new integration tests
-
-
-
-## Running tests
-
-### Unit Tests
-
-
-### Integration Tests
-
-
diff --git a/helm_chart.md b/helm_chart.md
deleted file mode 100644
index 9a521724b5b..00000000000
--- a/helm_chart.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Quick Start with Helm Chart
-
-### General
-1. Clone/Copy Chart to your working directory
-2. Execute command ```helm install helm-release-name charts/kafka-ui```
-
-### Passing Kafka-UI configuration as Dict
-Create values.yml file
-```
-yamlApplicationConfig:
-  kafka:
-    clusters:
-      - name: yaml
-        bootstrapServers:  kafka-cluster-broker-endpoints:9092
-  auth:
-    type: disabled
-  management:
-    health:
-      ldap:
-        enabled: false
-```
-Install by executing command
-> helm install helm-release-name charts/kafka-ui -f values.yml
-
-
-### Passing configuration file as ConfigMap 
-Create config map
-```
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: kafka-ui-existing-configmap-as-a-configfile
-data:
-  config.yml: |-
-    kafka:
-      clusters:
-        - name: yaml
-          bootstrapServers: kafka-cluster-broker-endpoints:9092
-    auth:
-      type: disabled
-    management:
-      health:
-        ldap:
-          enabled: false
-```
-This ConfigMap will be mounted to the Pod
-
-Install by executing command
-> helm install helm-release-name charts/kafka-ui --set yamlApplicationConfigConfigMap.name="kafka-ui-config",yamlApplicationConfigConfigMap.keyName="config.yml"
-
-### Passing environment variables as ConfigMap
-Create config map
-```
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: kafka-ui-helm-values
-data:
-  KAFKA_CLUSTERS_0_NAME: "kafka-cluster-name"
-  KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: "kafka-cluster-broker-endpoints:9092"
-  AUTH_TYPE: "DISABLED"
-  MANAGEMENT_HEALTH_LDAP_ENABLED: "FALSE" 
-```
-Install by executing command
-> helm install helm-release-name charts/kafka-ui --set existingConfigMap="kafka-ui-helm-values"  

From df8a16e8a2137604fb74e8c4a343ce2a8b3c8153 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 30 Mar 2023 08:41:28 +0400
Subject: [PATCH 478/734] Get rid of an obsolete md file

---
 docker-compose.md | 43 -------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 docker-compose.md

diff --git a/docker-compose.md b/docker-compose.md
deleted file mode 100644
index 154882351c7..00000000000
--- a/docker-compose.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Quick Start with docker-compose
-
-Environment variables documentation - [see usage](README.md#env_variables).<br/>
-We have plenty of example files with more complex configurations. Please check them out in ``docker`` directory.
-
-* Add a new service in docker-compose.yml
-
-```yaml
-version: '2'
-services:
-  kafka-ui:
-    image: provectuslabs/kafka-ui
-    container_name: kafka-ui
-    ports:
-      - "8080:8080"
-    restart: always
-    environment:
-      - KAFKA_CLUSTERS_0_NAME=local
-      - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092
-```
-
-* If you prefer UI for Apache Kafka in read only mode
-   
-```yaml
-version: '2'
-services:
-  kafka-ui:
-    image: provectuslabs/kafka-ui
-    container_name: kafka-ui
-    ports:
-      - "8080:8080"
-    restart: always
-    environment:
-      - KAFKA_CLUSTERS_0_NAME=local
-      - KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS=kafka:9092
-      - KAFKA_CLUSTERS_0_READONLY=true
-```
-  
-* Start UI for Apache Kafka process
-
-```bash
-docker-compose up -d kafka-ui
-```

From c79660b32ad0f0c139c6c9489dc3736fd8b975c5 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 30 Mar 2023 08:47:08 +0400
Subject: [PATCH 479/734] Fix the product hunt link in README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 96b59194f3a..b6edc471529 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
     <a href="https://discord.gg/4DWzD7pGE5">COMMUNITY DISCORD</a>
     <br/>
     <a href="https://aws.amazon.com/marketplace/pp/prodview-ogtt5hfhzkq6a">AWS Marketplace</a>  •
-    <a href="https://discord.gg/4DWzD7pGE5">ProductHunt</a>
+    <a href="https://www.producthunt.com/products/ui-for-apache-kafka/reviews/new">ProductHunt</a>
 </p>
 
 #### UI for Apache Kafka is a free, open-source web UI to monitor and manage Apache Kafka clusters.
@@ -134,4 +134,4 @@ All of the environment variables/config properties could be found [here](https:/
 
 # Contributing
 
-Please refer to [contributing guide](https://docs.kafka-ui.provectus.io/development/contributing), we'll guide you from there.
\ No newline at end of file
+Please refer to [contributing guide](https://docs.kafka-ui.provectus.io/development/contributing), we'll guide you from there.

From 15b78c0a2e047351e7a543a5449d312369886d1e Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Thu, 30 Mar 2023 10:22:28 +0400
Subject: [PATCH 480/734] FE: Fix topics unchecking w/ "Show Internal Topics"
 (#3585)

* bugfix/topics-selection remove selection reset useEffect, reseting only on pageChange

* bugfix/topics-selection implement rowId getter

* bugfix/topics-selection remove quotes from row name property for id generation
---
 .../src/components/common/NewTable/Table.tsx              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 1cdc67001d7..55652df082d 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -142,15 +142,12 @@ const Table: React.FC<TableProps<any>> = ({
     (updater: UpdaterFn<PaginationState>) => {
       const newState = updatePaginationState(updater, searchParams);
       setSearchParams(searchParams);
+      setRowSelection({});
       return newState;
     },
     [searchParams]
   );
 
-  React.useEffect(() => {
-    setRowSelection({});
-  }, [searchParams]);
-
   const table = useReactTable({
     data,
     pageCount,
@@ -160,6 +157,9 @@ const Table: React.FC<TableProps<any>> = ({
       pagination: getPaginationFromSearchParams(searchParams),
       rowSelection,
     },
+    getRowId: (originalRow, index) => {
+      return originalRow.name ? originalRow.name : `${index}`;
+    },
     onSortingChange: onSortingChange as OnChangeFn<SortingState>,
     onPaginationChange: onPaginationChange as OnChangeFn<PaginationState>,
     onRowSelectionChange: setRowSelection,

From bfb80f36b33954a6b8a5a6b31d32e8be67dbfb61 Mon Sep 17 00:00:00 2001
From: Poalry <43143420+Mano-Liaoyan@users.noreply.github.com>
Date: Wed, 29 Mar 2023 23:27:39 -0700
Subject: [PATCH 481/734] Fix invalid font color for 404 w/ dark theme (#3579)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
index fc6e0332db2..b24d6de564e 100644
--- a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
+++ b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
@@ -17,4 +17,5 @@ export const Number = styled.div`
 
 export const Text = styled.div`
   font-size: 20px;
+  color: ${({ theme }) => theme.default.color.normal};
 `;

From d06f77ad5338775b56a61b7a24d217a993924df4 Mon Sep 17 00:00:00 2001
From: Nisan Ohana <78907315+nisanohana3@users.noreply.github.com>
Date: Thu, 30 Mar 2023 10:45:36 +0300
Subject: [PATCH 482/734] Allow sorting consumer groups by messages behind
 (#3527)

* Allow sorting consumer groups by messages behind
* Added an additional value through the enum of ConsumerGroupOrdering
* Enabled sorting in the react consumer groups page (by messages behind)
* Moved the message behind calculation logic to InternalConsumerGroup as part of its creation
* Added the messages behind case - sorting internalConsumerGroup according to comparator with messages behind logic

Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Signed-off-by: nisanohana3 <nisana230@gmail.com>
---
 .../kafka/ui/mapper/ConsumerGroupMapper.java  | 14 +-------------
 .../kafka/ui/model/InternalConsumerGroup.java | 19 +++++++++++++++++++
 .../ui/service/ConsumerGroupService.java      | 19 +++++++++++++++++++
 .../main/resources/swagger/kafka-ui-api.yaml  |  1 +
 .../src/components/ConsumerGroups/List.tsx    |  2 +-
 5 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
index 9f7e32ed148..21d9efda9ca 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
@@ -89,19 +89,7 @@ private static <T extends ConsumerGroupDTO> T convertToConsumerGroup(
             .flatMap(m -> m.getAssignment().stream().map(TopicPartition::topic))
     ).collect(Collectors.toSet()).size();
 
-    Long messagesBehind = null;
-    // messagesBehind should be undefined if no committed offsets found for topic
-    if (!c.getOffsets().isEmpty()) {
-      messagesBehind = c.getOffsets().entrySet().stream()
-          .mapToLong(e ->
-              Optional.ofNullable(c.getEndOffsets())
-                  .map(o -> o.get(e.getKey()))
-                  .map(o -> o - e.getValue())
-                  .orElse(0L)
-          ).sum();
-    }
-
-    consumerGroup.setMessagesBehind(messagesBehind);
+    consumerGroup.setMessagesBehind(c.getMessagesBehind());
     consumerGroup.setTopics(numTopics);
     consumerGroup.setSimple(c.isSimple());
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
index d7b3a732f1f..e8199fa8ef5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
@@ -20,6 +20,7 @@ public class InternalConsumerGroup {
   private final Collection<InternalMember> members;
   private final Map<TopicPartition, Long> offsets;
   private final Map<TopicPartition, Long> endOffsets;
+  private final Long messagesBehind;
   private final String partitionAssignor;
   private final ConsumerGroupState state;
   private final Node coordinator;
@@ -58,7 +59,25 @@ public static InternalConsumerGroup create(
     );
     builder.offsets(groupOffsets);
     builder.endOffsets(topicEndOffsets);
+    builder.messagesBehind(calculateMessagesBehind(groupOffsets, topicEndOffsets));
     Optional.ofNullable(description.coordinator()).ifPresent(builder::coordinator);
     return builder.build();
   }
+
+  private static Long calculateMessagesBehind(Map<TopicPartition, Long> offsets, Map<TopicPartition, Long> endOffsets) {
+    Long messagesBehind = null;
+    // messagesBehind should be undefined if no committed offsets found for topic
+    if (!offsets.isEmpty()) {
+      messagesBehind = offsets.entrySet().stream()
+          .mapToLong(e ->
+              Optional.ofNullable(endOffsets)
+                  .map(o -> o.get(e.getKey()))
+                  .map(o -> o - e.getValue())
+                  .orElse(0L)
+          ).sum();
+    }
+
+    return messagesBehind;
+  }
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index 024eb3df513..e848146881d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.service;
 
+import com.google.common.collect.Streams;
 import com.google.common.collect.Table;
 import com.provectus.kafka.ui.model.ConsumerGroupOrderingDTO;
 import com.provectus.kafka.ui.model.InternalConsumerGroup;
@@ -157,6 +158,24 @@ private Mono<List<ConsumerGroupDescription>> loadSortedDescriptions(ReactiveAdmi
             .map(descriptions ->
                 sortAndPaginate(descriptions.values(), comparator, pageNum, perPage, sortOrderDto).toList());
       }
+      case MESSAGES_BEHIND -> {
+        record GroupWithDescr(InternalConsumerGroup icg, ConsumerGroupDescription cgd) { }
+
+        Comparator<GroupWithDescr> comparator = Comparator.comparingLong(gwd ->
+            gwd.icg.getMessagesBehind() == null ? 0L : gwd.icg.getMessagesBehind());
+
+        var groupNames = groups.stream().map(ConsumerGroupListing::groupId).toList();
+
+        yield ac.describeConsumerGroups(groupNames)
+            .flatMap(descriptionsMap -> {
+                  List<ConsumerGroupDescription> descriptions = descriptionsMap.values().stream().toList();
+                  return getConsumerGroups(ac, descriptions)
+                      .map(icg -> Streams.zip(icg.stream(), descriptions.stream(), GroupWithDescr::new).toList())
+                      .map(gwd -> sortAndPaginate(gwd, comparator, pageNum, perPage, sortOrderDto)
+                            .map(GroupWithDescr::cgd).toList());
+                }
+            );
+      }
     };
   }
 
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index ea335f282cf..fe9723b2dd3 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2416,6 +2416,7 @@ components:
         - NAME
         - MEMBERS
         - STATE
+        - MESSAGES_BEHIND
 
     ConsumerGroupsPageResponse:
       type: object
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
index feb772ac826..ef8d73f5156 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
@@ -56,9 +56,9 @@ const List = () => {
         enableSorting: false,
       },
       {
+        id: ConsumerGroupOrdering.MESSAGES_BEHIND,
         header: 'Messages Behind',
         accessorKey: 'messagesBehind',
-        enableSorting: false,
       },
       {
         header: 'Coordinator',

From 866966a638e3a469dd1600c94268eaeaf10179b1 Mon Sep 17 00:00:00 2001
From: David <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 3 Apr 2023 08:43:45 +0400
Subject: [PATCH 483/734] [FE] Chore: Rename a property to make sonar happy
 (#3578)

---
 kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts | 2 +-
 kafka-ui-react-app/src/components/ErrorPage/ErrorPage.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
index b24d6de564e..a307c8e96f8 100644
--- a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
+++ b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.styled.ts
@@ -9,7 +9,7 @@ export const Wrapper = styled.div`
   margin-top: 100px;
 `;
 
-export const Number = styled.div`
+export const Status = styled.div`
   font-size: 100px;
   color: ${({ theme }) => theme.default.color.normal};
   line-height: initial;
diff --git a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.tsx b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.tsx
index 823f2f0a75a..91f6d48488f 100644
--- a/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.tsx
+++ b/kafka-ui-react-app/src/components/ErrorPage/ErrorPage.tsx
@@ -16,7 +16,7 @@ const ErrorPage: React.FC<Props> = ({
 }) => {
   return (
     <S.Wrapper>
-      <S.Number>{status}</S.Number>
+      <S.Status>{status}</S.Status>
       <S.Text>{text}</S.Text>
       <Button buttonType="primary" buttonSize="M" to="/">
         {btnText}

From ecc8db1948c260ec47a5bd1aba1c982f7be3bb9e Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Mon, 3 Apr 2023 08:47:39 +0400
Subject: [PATCH 484/734] FE: Fix HTTP 400 for clusters with special symbols
 (#3591)

---
 .../src/components/Topics/Topic/Messages/Filters/Filters.tsx  | 4 +++-
 kafka-ui-react-app/src/lib/hooks/api/ksqlDb.tsx               | 4 +++-
 kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx        | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index ec62f266ed4..f9fa3401fc0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -323,7 +323,9 @@ const Filters: React.FC<FiltersProps> = ({
   // eslint-disable-next-line consistent-return
   React.useEffect(() => {
     if (location.search?.length !== 0) {
-      const url = `${BASE_PARAMS.basePath}/api/clusters/${clusterName}/topics/${topicName}/messages${location.search}`;
+      const url = `${BASE_PARAMS.basePath}/api/clusters/${encodeURIComponent(
+        clusterName
+      )}/topics/${topicName}/messages${location.search}`;
       const sse = new EventSource(url);
 
       source.current = sse;
diff --git a/kafka-ui-react-app/src/lib/hooks/api/ksqlDb.tsx b/kafka-ui-react-app/src/lib/hooks/api/ksqlDb.tsx
index 6685c6223f6..366141e82a4 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/ksqlDb.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/api/ksqlDb.tsx
@@ -90,7 +90,9 @@ export const useKsqlkDbSSE = ({ clusterName, pipeId }: UseKsqlkDbSSEProps) => {
 
   React.useEffect(() => {
     const fetchData = async () => {
-      const url = `${BASE_PARAMS.basePath}/api/clusters/${clusterName}/ksql/response`;
+      const url = `${BASE_PARAMS.basePath}/api/clusters/${encodeURIComponent(
+        clusterName
+      )}/ksql/response`;
       await fetchEventSource(
         `${url}?${new URLSearchParams({ pipeId: pipeId || '' }).toString()}`,
         {
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
index 73a5753ba22..886b2979c0f 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
+++ b/kafka-ui-react-app/src/lib/hooks/api/topicMessages.tsx
@@ -51,7 +51,9 @@ export const useTopicMessages = ({
   React.useEffect(() => {
     const fetchData = async () => {
       setIsFetching(true);
-      const url = `${BASE_PARAMS.basePath}/api/clusters/${clusterName}/topics/${topicName}/messages`;
+      const url = `${BASE_PARAMS.basePath}/api/clusters/${encodeURIComponent(
+        clusterName
+      )}/topics/${topicName}/messages`;
       const requestParams = new URLSearchParams({
         limit,
         seekTo: seekTo.replaceAll('-', '::').replaceAll('.', ','),

From c9488422c2c4186581a51bb26092cffc6e6636fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20D=C3=ADaz?=
 <126616663+cdiazprov@users.noreply.github.com>
Date: Sun, 2 Apr 2023 23:50:25 -0500
Subject: [PATCH 485/734] FE: Fix dummy field in saved JSON message content
 (#3567)

---
 .../src/components/Topics/Topic/Messages/Message.tsx            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index 47b6e49a41e..7a9df2c16ff 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -49,7 +49,7 @@ const Message: React.FC<Props> = ({
 }) => {
   const [isOpen, setIsOpen] = React.useState(false);
   const savedMessageJson = {
-    Content: content,
+    Value: content,
     Offset: offset,
     Key: key,
     Partition: partition,

From de21721e00b5109d6792630707db6cff568df824 Mon Sep 17 00:00:00 2001
From: olondar <36262598+olondar@users.noreply.github.com>
Date: Mon, 3 Apr 2023 08:10:14 +0300
Subject: [PATCH 486/734] FE: Fix Edit config: Selected text background color
 is transparent (#3601)

* Update Editor.tsx

reassigning the background

* Update EditorViewer.styled.ts

* Update EditorViewer.styled.ts

changed the code to meet the requirements of the owner

Closes #3576
---
 kafka-ui-react-app/src/components/common/Editor/Editor.tsx    | 4 +++-
 .../src/components/common/EditorViewer/EditorViewer.styled.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/common/Editor/Editor.tsx b/kafka-ui-react-app/src/components/common/Editor/Editor.tsx
index b8744762c96..05c91e3557b 100644
--- a/kafka-ui-react-app/src/components/common/Editor/Editor.tsx
+++ b/kafka-ui-react-app/src/components/common/Editor/Editor.tsx
@@ -50,8 +50,10 @@ export default styled(Editor)`
         theme.ksqlDb.query.editor.cell.backgroundColor};
       color: ${({ theme }) => theme.default.color.normal};
     }
-    .ace_line {
+    .ace_scroller {
       background-color: ${({ theme }) => theme.default.backgroundColor};
+    }
+    .ace_line {
       color: ${({ theme }) => theme.default.color.normal};
     }
     .ace_cursor {
diff --git a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts
index d60603f635c..a135f4dfcc2 100644
--- a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts
+++ b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.styled.ts
@@ -5,7 +5,7 @@ export const Wrapper = styled.div`
   padding: 8px 16px;
   .ace_active-line {
     background-color: ${({ theme }) =>
-      theme.viewer.wrapper.backgroundColor} !important;
+      theme.default.backgroundColor} !important;
   }
   .ace_line {
     color: ${({ theme }) => theme.viewer.wrapper.color} !important;

From dd4b653b8e56cbde3b875aa6e35e113559ba0c86 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 3 Apr 2023 17:29:07 +0400
Subject: [PATCH 487/734] Support for old ksql versions

1. Fixing ksql response column retrieval (existence check) (#3594)
2. checking "format" for streams commands if "valueFormat" not set
---
 .../provectus/kafka/ui/service/ksql/KsqlApiClient.java   | 5 ++++-
 .../provectus/kafka/ui/service/ksql/KsqlServiceV2.java   | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
index fd68add7267..e8f4954bf0a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlApiClient.java
@@ -52,7 +52,10 @@ public static class KsqlResponseTable {
     boolean error;
 
     public Optional<JsonNode> getColumnValue(List<JsonNode> row, String column) {
-      return Optional.ofNullable(row.get(columnNames.indexOf(column)));
+      int colIdx = columnNames.indexOf(column);
+      return colIdx >= 0
+          ? Optional.ofNullable(row.get(colIdx))
+          : Optional.empty();
     }
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java
index efd7e9ca2e9..e8c2a4c65a3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2.java
@@ -89,7 +89,14 @@ public Flux<KsqlStreamDescriptionDTO> listStreams(KafkaCluster cluster) {
                       .name(resp.getColumnValue(row, "name").map(JsonNode::asText).orElse(null))
                       .topic(resp.getColumnValue(row, "topic").map(JsonNode::asText).orElse(null))
                       .keyFormat(resp.getColumnValue(row, "keyFormat").map(JsonNode::asText).orElse(null))
-                      .valueFormat(resp.getColumnValue(row, "valueFormat").map(JsonNode::asText).orElse(null)))
+                      .valueFormat(
+                          // for old versions (<0.13) "format" column is filled,
+                          // for new version "keyFormat" & "valueFormat" columns should be filled
+                          resp.getColumnValue(row, "valueFormat")
+                              .or(() -> resp.getColumnValue(row, "format"))
+                              .map(JsonNode::asText)
+                              .orElse(null))
+              )
               .collect(Collectors.toList()));
         });
   }

From 0ff7e6338632b9f901edf530662d369351d8f8d9 Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Mon, 3 Apr 2023 18:52:14 +0400
Subject: [PATCH 488/734] FE: AirGap: Remove internet dependency / google fonts
 (#3602)

* improvement/offline-fonts remove google fonts, add local fonts with font-face

* improvement/offline-fonts add font-display rule

* improvement/offline-fonts fix fonts path resolving
---
 kafka-ui-react-app/index.html                 |  36 ++++++++++++++----
 .../public/fonts/Inter-Medium.ttf             | Bin 0 -> 308392 bytes
 .../public/fonts/Inter-Regular.ttf            | Bin 0 -> 303504 bytes
 .../public/fonts/RobotoMono-Medium.ttf        | Bin 0 -> 78948 bytes
 .../public/fonts/RobotoMono-Regular.ttf       | Bin 0 -> 78996 bytes
 5 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 kafka-ui-react-app/public/fonts/Inter-Medium.ttf
 create mode 100644 kafka-ui-react-app/public/fonts/Inter-Regular.ttf
 create mode 100644 kafka-ui-react-app/public/fonts/RobotoMono-Medium.ttf
 create mode 100644 kafka-ui-react-app/public/fonts/RobotoMono-Regular.ttf

diff --git a/kafka-ui-react-app/index.html b/kafka-ui-react-app/index.html
index 33e18ad2688..be10fc78a3a 100644
--- a/kafka-ui-react-app/index.html
+++ b/kafka-ui-react-app/index.html
@@ -3,13 +3,6 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <!-- Google fonts -->
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500&family=Roboto+Mono:wght@400;500&display=swap"
-      rel="stylesheet"
-    />
 
     <!-- Favicons -->
     <link rel="icon" href="<%= PUBLIC_PATH %>/favicon/favicon.ico" sizes="any" />
@@ -25,6 +18,35 @@
         return window.basePath+ "/" + importer;
       };
     </script>
+    <style>
+      @font-face {
+        font-family: 'Inter';
+        src: url('<%= PUBLIC_PATH %>/fonts/Inter-Medium.ttf') format('truetype');
+        font-weight: 500;
+        font-display: swap;
+      }
+
+      @font-face {
+        font-family: 'Inter';
+        src: url('<%= PUBLIC_PATH %>/fonts/Inter-Regular.ttf') format('truetype');
+        font-weight: 400;
+        font-display: swap;
+      }
+
+      @font-face {
+        font-family: 'Roboto Mono';
+        src: url('<%= PUBLIC_PATH %>/fonts/RobotoMono-Medium.ttf') format('truetype');
+        font-weight: 500;
+        font-display: swap;
+      }
+
+      @font-face {
+        font-family: 'Roboto Mono';
+        src: url('<%= PUBLIC_PATH %>/fonts/RobotoMono-Regular.ttf') format('truetype');
+        font-weight: 400;
+        font-display: swap;
+      }
+    </style>
   </head>
 
   <body>
diff --git a/kafka-ui-react-app/public/fonts/Inter-Medium.ttf b/kafka-ui-react-app/public/fonts/Inter-Medium.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..9a3396fc4364afffd1984813abb564d4509b6606
GIT binary patch
literal 308392
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%0DMg>>O3W
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
CJEHgi

literal 0
HcmV?d00001

diff --git a/kafka-ui-react-app/public/fonts/Inter-Regular.ttf b/kafka-ui-react-app/public/fonts/Inter-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..2c164bb2df58ffff8e4fdb6ae96a8654ebc10b4e
GIT binary patch
literal 303504
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
PoID}s7%BMt!yx!y$|wnI

literal 0
HcmV?d00001

diff --git a/kafka-ui-react-app/public/fonts/RobotoMono-Medium.ttf b/kafka-ui-react-app/public/fonts/RobotoMono-Medium.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..395fabe1e9a792f345ee029088110feb165d1a78
GIT binary patch
literal 78948
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
X<{Ut1YpgjFPpI+m9q)T_5F!5unYy$I

literal 0
HcmV?d00001

diff --git a/kafka-ui-react-app/public/fonts/RobotoMono-Regular.ttf b/kafka-ui-react-app/public/fonts/RobotoMono-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..2ab8f34a5bb5fdd2e87ba931bbafc8792fc92bb5
GIT binary patch
literal 78996
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
I1n2$#0Iq3%2><{9

literal 0
HcmV?d00001


From e3ee4c7fa7dae75d92b715ff7efa96e22455913c Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 4 Apr 2023 07:49:05 +0400
Subject: [PATCH 489/734] FE: Redirect the user to the wizard page if no
 clusters (#3481)

* Redirect the user to the wizard page if no clusters

* added test case

* changed test case for redirect to new cluster config page

* replaced mockedUsedNavigate with mockedNavigate

* added ability to show dashboard if clicking on it

---------

Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../src/components/Dashboard/Dashboard.tsx    | 11 ++++-
 .../Dashboard/__test__/Dashboard.spec.tsx     | 45 +++++++++++++++++++
 .../contexts/GlobalSettingsContext.tsx        |  2 +-
 kafka-ui-react-app/src/lib/testHelpers.tsx    |  9 +++-
 4 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx

diff --git a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
index 46c35d50794..7eab4c1d2ff 100644
--- a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
@@ -11,6 +11,7 @@ import useBoolean from 'lib/hooks/useBoolean';
 import { Button } from 'components/common/Button/Button';
 import { clusterNewConfigPath } from 'lib/paths';
 import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
+import { useNavigate } from 'react-router-dom';
 
 import * as S from './Dashboard.styled';
 import ClusterName from './ClusterName';
@@ -20,7 +21,7 @@ const Dashboard: React.FC = () => {
   const clusters = useClusters();
   const { value: showOfflineOnly, toggle } = useBoolean(false);
   const appInfo = React.useContext(GlobalSettingsContext);
-
+  const navigate = useNavigate();
   const config = React.useMemo(() => {
     const clusterList = clusters.data || [];
     const offlineClusters = clusterList.filter(
@@ -55,6 +56,12 @@ const Dashboard: React.FC = () => {
     return initialColumns;
   }, []);
 
+  useEffect(() => {
+    if (appInfo.hasDynamicConfig && !clusters.data) {
+      navigate(clusterNewConfigPath);
+    }
+  }, [clusters, appInfo.hasDynamicConfig]);
+
   return (
     <>
       <PageHeading text="Dashboard" />
diff --git a/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
new file mode 100644
index 00000000000..e9141e980e4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import { useClusters } from 'lib/hooks/api/clusters';
+import Dashboard from 'components/Dashboard/Dashboard';
+import { Cluster, ServerStatus } from 'generated-sources';
+import { render } from 'lib/testHelpers';
+
+interface DataType {
+  data: Cluster[] | undefined;
+}
+jest.mock('lib/hooks/api/clusters');
+const mockedNavigate = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockedNavigate,
+}));
+describe('Dashboard component', () => {
+  const renderComponent = (hasDynamicConfig: boolean, data: DataType) => {
+    const useClustersMock = useClusters as jest.Mock;
+    useClustersMock.mockReturnValue(data);
+    render(<Dashboard />, {
+      globalSettings: { hasDynamicConfig },
+    });
+  };
+  it('redirects to new cluster configuration page if there are no clusters and dynamic config is enabled', async () => {
+    await renderComponent(true, { data: undefined });
+
+    expect(mockedNavigate).toHaveBeenCalled();
+  });
+
+  it('should not navigate to new cluster config page when there are clusters', async () => {
+    await renderComponent(true, {
+      data: [{ name: 'Cluster 1', status: ServerStatus.ONLINE }],
+    });
+
+    expect(mockedNavigate).not.toHaveBeenCalled();
+  });
+
+  it('should not navigate to new cluster config page when there are no clusters and hasDynamicConfig is false', async () => {
+    await renderComponent(false, {
+      data: [],
+    });
+
+    expect(mockedNavigate).not.toHaveBeenCalled();
+  });
+});
diff --git a/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
index 4de05307b11..563fb175f32 100644
--- a/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
+++ b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
@@ -2,7 +2,7 @@ import { useAppInfo } from 'lib/hooks/api/appConfig';
 import React from 'react';
 import { ApplicationInfoEnabledFeaturesEnum } from 'generated-sources';
 
-interface GlobalSettingsContextProps {
+export interface GlobalSettingsContextProps {
   hasDynamicConfig: boolean;
 }
 
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index 508904d1466..42539a0aac9 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -26,7 +26,10 @@ import {
 } from '@tanstack/react-query';
 import { ConfirmContextProvider } from 'components/contexts/ConfirmContext';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
-import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
+import {
+  GlobalSettingsContext,
+  GlobalSettingsContextProps,
+} from 'components/contexts/GlobalSettingsContext';
 import { UserInfoRolesAccessContext } from 'components/contexts/UserInfoRolesAccessContext';
 
 import { RolesType, modifyRolesData } from './permissions';
@@ -35,6 +38,7 @@ interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
   preloadedState?: Partial<RootState>;
   store?: Store<Partial<RootState>, AnyAction>;
   initialEntries?: MemoryRouterProps['initialEntries'];
+  globalSettings?: GlobalSettingsContextProps;
   userInfo?: {
     roles?: RolesType;
     rbacFlag: boolean;
@@ -110,6 +114,7 @@ const customRender = (
       preloadedState,
     }),
     initialEntries,
+    globalSettings = { hasDynamicConfig: false },
     userInfo,
     ...renderOptions
   }: CustomRenderOptions = {}
@@ -119,7 +124,7 @@ const customRender = (
     children,
   }) => (
     <TestQueryClientProvider>
-      <GlobalSettingsContext.Provider value={{ hasDynamicConfig: false }}>
+      <GlobalSettingsContext.Provider value={globalSettings}>
         <ThemeProvider theme={theme}>
           <TestUserInfoProvider data={userInfo}>
             <ConfirmContextProvider>

From 1bcdec4accc7ef9e319a3f671183f01eb4e5bdba Mon Sep 17 00:00:00 2001
From: Shubham Jain <shubhrjain7@gmail.com>
Date: Tue, 4 Apr 2023 04:51:38 +0100
Subject: [PATCH 490/734] FE: Add Search By consumer name in Topic View (#3089)

---
 .../TopicConsumerGroups.styled.ts             |  6 ++++
 .../ConsumerGroups/TopicConsumerGroups.tsx    | 36 +++++++++++++++----
 2 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.styled.ts

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.styled.ts
new file mode 100644
index 00000000000..77768dc9980
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.styled.ts
@@ -0,0 +1,6 @@
+import styled from 'styled-components';
+
+export const SearchWrapper = styled.div`
+  margin: 10px;
+  width: 21%;
+`;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
index 69948fd66d4..173c28c76e3 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
@@ -5,14 +5,27 @@ import useAppParams from 'lib/hooks/useAppParams';
 import { useTopicConsumerGroups } from 'lib/hooks/api/topics';
 import { ColumnDef } from '@tanstack/react-table';
 import Table, { LinkCell, TagCell } from 'components/common/NewTable';
+import Search from 'components/common/Search/Search';
+
+import * as S from './TopicConsumerGroups.styled';
 
 const TopicConsumerGroups: React.FC = () => {
+  const [keyword, setKeyword] = React.useState('');
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
 
-  const { data: consumerGroups = [] } = useTopicConsumerGroups({
+  const { data = [] } = useTopicConsumerGroups({
     clusterName,
     topicName,
   });
+
+  const consumerGroups = React.useMemo(
+    () =>
+      data.filter(
+        (item) => item.groupId.toLocaleLowerCase().indexOf(keyword) > -1
+      ),
+    [data, keyword]
+  );
+
   const columns = React.useMemo<ColumnDef<ConsumerGroup>[]>(
     () => [
       {
@@ -61,12 +74,21 @@ const TopicConsumerGroups: React.FC = () => {
     []
   );
   return (
-    <Table
-      columns={columns}
-      data={consumerGroups}
-      enableSorting
-      emptyMessage="No active consumer groups"
-    />
+    <>
+      <S.SearchWrapper>
+        <Search
+          onChange={setKeyword}
+          placeholder="Search by Consumer Name"
+          value={keyword}
+        />
+      </S.SearchWrapper>
+      <Table
+        columns={columns}
+        data={consumerGroups}
+        enableSorting
+        emptyMessage="No active consumer groups"
+      />
+    </>
   );
 };
 

From 87a8f08ae1f72719c02e570a74de6cdb8f4a6058 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Tue, 4 Apr 2023 06:56:02 +0300
Subject: [PATCH 491/734] [e2e] Setup selenoid for multithreading (#3609)

* add browserSetup

* add browserSetup

* upd browserSetup

* upd browserSetup

* upd browserSetup

* upd browserSetup

* upd browserSetup

* upd read me
---
 .github/workflows/e2e-automation.yml          |  5 +-
 .github/workflows/e2e-checks.yaml             | 15 +--
 .github/workflows/e2e-weekly.yml              |  5 +-
 documentation/compose/e2e-tests.yaml          | 54 +++++------
 kafka-ui-e2e-checks/README.md                 | 11 ++-
 .../{selenoid.yaml => selenoid-git.yaml}      | 12 ++-
 .../docker/selenoid-local.yaml                | 33 +++++++
 kafka-ui-e2e-checks/pom.xml                   | 27 +++---
 .../selenoid/config/browsersGit.json          | 15 +++
 .../{browsers.json => browsersLocal.json}     |  6 +-
 .../provectus/kafka/ui/pages/BasePage.java    | 12 ++-
 .../kafka/ui/pages/panels/NaviSideBar.java    |  2 +-
 .../ui/pages/topics/TopicCreateEditForm.java  |  8 +-
 .../kafka/ui/pages/topics/TopicDetails.java   | 17 ++--
 .../kafka/ui/pages/topics/TopicsList.java     | 23 ++++-
 .../kafka/ui/services/ApiService.java         | 10 +-
 .../kafka/ui/settings/BaseSource.java         | 11 ++-
 .../ui/settings/drivers/LocalWebDriver.java   | 68 -------------
 .../kafka/ui/settings/drivers/WebDriver.java  | 96 +++++++++++++++++++
 .../kafka/ui/utilities/WebUtils.java          | 27 ++++--
 .../com/provectus/kafka/ui/variables/Url.java |  4 +-
 .../java/com/provectus/kafka/ui/BaseTest.java | 83 ++--------------
 .../kafka/ui/smokeSuite/SmokeTest.java        | 14 +--
 .../ui/smokeSuite/ksqlDb/KsqlDbTest.java      | 12 +++
 .../ui/smokeSuite/topics/TopicsTest.java      |  9 +-
 .../src/test/resources/manual.xml             |  2 +-
 .../src/test/resources/qase.xml               |  2 +-
 .../src/test/resources/regression.xml         |  2 +-
 .../src/test/resources/sanity.xml             |  2 +-
 .../src/test/resources/smoke.xml              |  2 +-
 30 files changed, 334 insertions(+), 255 deletions(-)
 rename kafka-ui-e2e-checks/docker/{selenoid.yaml => selenoid-git.yaml} (61%)
 create mode 100644 kafka-ui-e2e-checks/docker/selenoid-local.yaml
 create mode 100644 kafka-ui-e2e-checks/selenoid/config/browsersGit.json
 rename kafka-ui-e2e-checks/selenoid/config/{browsers.json => browsersLocal.json} (52%)
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java

diff --git a/.github/workflows/e2e-automation.yml b/.github/workflows/e2e-automation.yml
index eb109857473..5ce14376141 100644
--- a/.github/workflows/e2e-automation.yml
+++ b/.github/workflows/e2e-automation.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Pull with Docker
         id: pull_chrome
         run: |
-          docker pull selenium/standalone-chrome:103.0
+          docker pull selenoid/vnc_chrome:103.0
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -52,6 +52,7 @@ jobs:
         id: compose_app
         # use the following command until #819 will be fixed
         run: |
+          docker-compose -f kafka-ui-e2e-checks/docker/selenoid-git.yaml up -d
           docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
       - name: Run test suite
         run: |
@@ -78,7 +79,7 @@ jobs:
         uses: Sibz/github-status-action@v1.1.6
         with:
           authToken: ${{secrets.GITHUB_TOKEN}}
-          context: "Test report"
+          context: "Click Details button to open Allure report"
           state: "success"
           sha: ${{ github.sha }}
           target_url: http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com/${{ github.run_number }}
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 83be371bea0..771eb698feb 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -15,20 +15,20 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - name: Configure AWS credentials for Kafka-UI account
+      - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-central-1
-      - name: Set the values
+      - name: Set up environment
         id: set_env_values
         run: |
           cat "./kafka-ui-e2e-checks/.env.ci" >> "./kafka-ui-e2e-checks/.env"
-      - name: pull docker
+      - name: Pull with Docker
         id: pull_chrome
         run: |
-          docker pull selenium/standalone-chrome:103.0
+          docker pull selenoid/vnc_chrome:103.0
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -40,12 +40,13 @@ jobs:
         run: |
           ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
           ./mvnw -B -V -ntp clean install -Pprod -Dmaven.test.skip=true ${{ github.event.inputs.extraMavenOptions }}
-      - name: compose app
+      - name: Compose with Docker
         id: compose_app
         # use the following command until #819 will be fixed
         run: |
+          docker-compose -f kafka-ui-e2e-checks/docker/selenoid-git.yaml up -d
           docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
-      - name: e2e run
+      - name: Run test suite
         run: |
           ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}
           ./mvnw -B -V -ntp -Dsurefire.suiteXmlFiles='src/test/resources/smoke.xml' -f 'kafka-ui-e2e-checks' test -Pprod
@@ -65,7 +66,7 @@ jobs:
           AWS_S3_BUCKET: 'kafkaui-allure-reports'
           AWS_REGION: 'eu-central-1'
           SOURCE_DIR: 'allure-history/allure-results'
-      - name: Post the link to allure report
+      - name: Deploy report to Amazon S3
         if: always()
         uses: Sibz/github-status-action@v1.1.6
         with:
diff --git a/.github/workflows/e2e-weekly.yml b/.github/workflows/e2e-weekly.yml
index 4683c7e1114..ea5ca7e522d 100644
--- a/.github/workflows/e2e-weekly.yml
+++ b/.github/workflows/e2e-weekly.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Pull with Docker
         id: pull_chrome
         run: |
-          docker pull selenium/standalone-chrome:103.0
+          docker pull selenoid/vnc_chrome:103.0
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -39,6 +39,7 @@ jobs:
         id: compose_app
         # use the following command until #819 will be fixed
         run: |
+          docker-compose -f kafka-ui-e2e-checks/docker/selenoid-git.yaml up -d
           docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
       - name: Run test suite
         run: |
@@ -65,7 +66,7 @@ jobs:
         uses: Sibz/github-status-action@v1.1.6
         with:
           authToken: ${{secrets.GITHUB_TOKEN}}
-          context: "Test report"
+          context: "Click Details button to open Allure report"
           state: "success"
           sha: ${{ github.sha }}
           target_url: http://kafkaui-allure-reports.s3-website.eu-central-1.amazonaws.com/${{ github.run_number }}
diff --git a/documentation/compose/e2e-tests.yaml b/documentation/compose/e2e-tests.yaml
index 2a422c54d45..ae56f5d5768 100644
--- a/documentation/compose/e2e-tests.yaml
+++ b/documentation/compose/e2e-tests.yaml
@@ -11,14 +11,14 @@ services:
       test: wget --no-verbose --tries=1 --spider  http://localhost:8080/actuator/health
       interval: 30s
       timeout: 10s
-      retries: 10  
+      retries: 10
     depends_on:
-        kafka0:
-          condition: service_healthy
-        schemaregistry0:
-          condition: service_healthy
-        kafka-connect0:
-          condition: service_healthy
+      kafka0:
+        condition: service_healthy
+      schemaregistry0:
+        condition: service_healthy
+      kafka-connect0:
+        condition: service_healthy
     environment:
       KAFKA_CLUSTERS_0_NAME: local
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
@@ -33,10 +33,10 @@ services:
     hostname: kafka0
     container_name: kafka0
     healthcheck:
-     test: unset JMX_PORT && KAFKA_JMX_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9999" && kafka-broker-api-versions --bootstrap-server=localhost:9092
-     interval: 30s
-     timeout: 10s
-     retries: 10
+      test: unset JMX_PORT && KAFKA_JMX_OPTS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=kafka0 -Dcom.sun.management.jmxremote.rmi.port=9999" && kafka-broker-api-versions --bootstrap-server=localhost:9092
+      interval: 30s
+      timeout: 10s
+      retries: 10
     ports:
       - "9092:9092"
       - "9997:9997"
@@ -68,12 +68,12 @@ services:
       - 8085:8085
     depends_on:
       kafka0:
-          condition: service_healthy
+        condition: service_healthy
     healthcheck:
-     test: ["CMD", "timeout", "1", "curl", "--silent", "--fail", "http://schemaregistry0:8085/subjects"]
-     interval: 30s
-     timeout: 10s
-     retries: 10
+      test: [ "CMD", "timeout", "1", "curl", "--silent", "--fail", "http://schemaregistry0:8085/subjects" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
     environment:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
       SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
@@ -93,11 +93,11 @@ services:
       - 8083:8083
     depends_on:
       kafka0:
-          condition: service_healthy
+        condition: service_healthy
       schemaregistry0:
-          condition: service_healthy
+        condition: service_healthy
     healthcheck:
-      test: ["CMD", "nc", "127.0.0.1", "8083"]
+      test: [ "CMD", "nc", "127.0.0.1", "8083" ]
       interval: 30s
       timeout: 10s
       retries: 10
@@ -118,8 +118,8 @@ services:
       CONNECT_INTERNAL_VALUE_CONVERTER: org.apache.kafka.connect.json.JsonConverter
       CONNECT_REST_ADVERTISED_HOST_NAME: kafka-connect0
       CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
-#      AWS_ACCESS_KEY_ID: ""
-#      AWS_SECRET_ACCESS_KEY: ""
+  #      AWS_ACCESS_KEY_ID: ""
+  #      AWS_SECRET_ACCESS_KEY: ""
 
   kafka-init-topics:
     image: confluentinc/cp-kafka:7.2.1
@@ -127,7 +127,7 @@ services:
       - ./message.json:/data/message.json
     depends_on:
       kafka0:
-          condition: service_healthy
+        condition: service_healthy
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
                cub kafka-ready -b kafka0:29092 1 30 && \
                kafka-topics --create --topic users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
@@ -142,10 +142,10 @@ services:
     ports:
       - 5432:5432
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U dev_user"]
+      test: [ "CMD-SHELL", "pg_isready -U dev_user" ]
       interval: 10s
       timeout: 5s
-      retries: 5  
+      retries: 5
     environment:
       POSTGRES_USER: 'dev_user'
       POSTGRES_PASSWORD: '12345'
@@ -154,7 +154,7 @@ services:
     image: ellerbrock/alpine-bash-curl-ssl
     depends_on:
       postgres-db:
-          condition: service_healthy
+        condition: service_healthy
       kafka-connect0:
         condition: service_healthy
     volumes:
@@ -164,7 +164,7 @@ services:
   ksqldb:
     image: confluentinc/ksqldb-server:0.18.0
     healthcheck:
-      test: ["CMD", "timeout", "1", "curl", "--silent", "--fail", "http://localhost:8088/info"]
+      test: [ "CMD", "timeout", "1", "curl", "--silent", "--fail", "http://localhost:8088/info" ]
       interval: 30s
       timeout: 10s
       retries: 10
@@ -174,7 +174,7 @@ services:
       kafka-connect0:
         condition: service_healthy
       schemaregistry0:
-         condition: service_healthy
+        condition: service_healthy
     ports:
       - 8088:8088
     environment:
diff --git a/kafka-ui-e2e-checks/README.md b/kafka-ui-e2e-checks/README.md
index d7f3c77c1f7..a33b92739e4 100644
--- a/kafka-ui-e2e-checks/README.md
+++ b/kafka-ui-e2e-checks/README.md
@@ -27,7 +27,7 @@ This repository is for E2E UI automation.
 ```
 git clone https://github.com/provectus/kafka-ui.git
 cd  kafka-ui-e2e-checks
-docker pull selenoid/vnc:chrome_86.0  
+docker pull selenoid/vnc_chrome:103.0 
 ```
 
 ### How to run checks
@@ -36,6 +36,7 @@ docker pull selenoid/vnc:chrome_86.0
 
 ```
 cd kafka-ui
+docker-compose -f kafka-ui-e2e-checks/docker/selenoid-local.yaml up -d
 docker-compose -f documentation/compose/e2e-tests.yaml up -d
 ```
 
@@ -51,6 +52,14 @@ docker-compose -f documentation/compose/e2e-tests.yaml up -d
 -Dbrowser=local
 ```
 
+Expected Location of Chrome
+```
+Linux:	                    /usr/bin/google-chrome1
+Mac:	                    /Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome
+Windows XP:                 %HOMEPATH%\Local Settings\Application Data\Google\Chrome\Application\chrome.exe
+Windows Vista and newer:    C:\Users%USERNAME%\AppData\Local\Google\Chrome\Application\chrome.exe
+```
+
 ### Qase integration
 
 Found instruction for Qase.io integration (for internal use only) at `kafka-ui-e2e-checks/QASE.md`
diff --git a/kafka-ui-e2e-checks/docker/selenoid.yaml b/kafka-ui-e2e-checks/docker/selenoid-git.yaml
similarity index 61%
rename from kafka-ui-e2e-checks/docker/selenoid.yaml
rename to kafka-ui-e2e-checks/docker/selenoid-git.yaml
index df2f0955069..f4c5430f16a 100644
--- a/kafka-ui-e2e-checks/docker/selenoid.yaml
+++ b/kafka-ui-e2e-checks/docker/selenoid-git.yaml
@@ -1,17 +1,19 @@
+---
 version: '3'
 
 services:
+
   selenoid:
     network_mode: bridge
     image: aerokube/selenoid:1.10.7
     volumes:
       - "../selenoid/config:/etc/selenoid"
       - "/var/run/docker.sock:/var/run/docker.sock"
-      - "../selenoid/video:/video"
+      - "../selenoid/video:/opt/selenoid/video"
       - "../selenoid/logs:/opt/selenoid/logs"
     environment:
-      - OVERRIDE_VIDEO_OUTPUT_DIR=video
-    command: [ "-conf", "/etc/selenoid/browsers.json", "-video-output-dir", "/opt/selenoid/video", "-log-output-dir", "/opt/selenoid/logs" ]
+      - OVERRIDE_VIDEO_OUTPUT_DIR=../selenoid/video
+    command: [ "-conf", "/etc/selenoid/browsersGit.json", "-video-output-dir", "/opt/selenoid/video", "-log-output-dir", "/opt/selenoid/logs" ]
     ports:
       - "4444:4444"
 
@@ -22,10 +24,10 @@ services:
       - selenoid
     ports:
       - "8081:8080"
-    command: [ "--selenoid-uri", "http://localhost:4444" ]
+    command: [ "--selenoid-uri", "http://selenoid:4444" ]
 
   selenoid-chrome:
     network_mode: bridge
-    image: selenoid/vnc:chrome_96.0
+    image: selenoid/vnc_chrome:103.0
     extra_hosts:
       - "host.docker.internal:host-gateway"
diff --git a/kafka-ui-e2e-checks/docker/selenoid-local.yaml b/kafka-ui-e2e-checks/docker/selenoid-local.yaml
new file mode 100644
index 00000000000..9d7fb8e0bec
--- /dev/null
+++ b/kafka-ui-e2e-checks/docker/selenoid-local.yaml
@@ -0,0 +1,33 @@
+---
+version: '3'
+
+services:
+
+  selenoid:
+    network_mode: bridge
+    image: aerokube/selenoid:1.10.7
+    volumes:
+      - "../selenoid/config:/etc/selenoid"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+      - "../selenoid/video:/opt/selenoid/video"
+      - "../selenoid/logs:/opt/selenoid/logs"
+    environment:
+      - OVERRIDE_VIDEO_OUTPUT_DIR=../selenoid/video
+    command: [ "-conf", "/etc/selenoid/browsersLocal.json", "-video-output-dir", "/opt/selenoid/video", "-log-output-dir", "/opt/selenoid/logs" ]
+    ports:
+      - "4444:4444"
+
+  selenoid-ui:
+    network_mode: bridge
+    image: aerokube/selenoid-ui:latest-release
+    links:
+      - selenoid
+    ports:
+      - "8081:8080"
+    command: [ "--selenoid-uri", "http://selenoid:4444" ]
+
+  selenoid-chrome:
+    network_mode: bridge
+    image: selenoid/vnc_chrome:103.0
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 0b458cf1739..e4d912dbe62 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -17,15 +17,14 @@
         <testcontainers.version>1.17.6</testcontainers.version>
         <httpcomponents.version>5.2.1</httpcomponents.version>
         <selenium.version>4.8.1</selenium.version>
-        <selenide.version>6.11.2</selenide.version>
+        <selenide.version>6.12.3</selenide.version>
         <testng.version>7.7.0</testng.version>
         <allure.version>2.21.0</allure.version>
-        <qase.io.version>3.0.3</qase.io.version>
+        <qase.io.version>3.0.4</qase.io.version>
         <aspectj.version>1.9.9.1</aspectj.version>
         <assertj.version>3.24.2</assertj.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <slf4j.version>1.7.36</slf4j.version>
-        <dotenv.version>2.3.1</dotenv.version>
+        <slf4j.version>2.0.5</slf4j.version>
         <kafka.version>3.3.1</kafka.version>
     </properties>
 
@@ -122,6 +121,11 @@
             <artifactId>selenium</artifactId>
             <version>${testcontainers.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${org.projectlombok.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.core5</groupId>
             <artifactId>httpcore5</artifactId>
@@ -132,6 +136,11 @@
             <artifactId>httpclient5</artifactId>
             <version>${httpcomponents.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-http-jdk-client</artifactId>
+            <version>${selenium.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-http</artifactId>
@@ -187,16 +196,6 @@
             <artifactId>slf4j-simple</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${org.projectlombok.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.cdimascio</groupId>
-            <artifactId>dotenv-java</artifactId>
-            <version>${dotenv.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.provectus</groupId>
             <artifactId>kafka-ui-contract</artifactId>
diff --git a/kafka-ui-e2e-checks/selenoid/config/browsersGit.json b/kafka-ui-e2e-checks/selenoid/config/browsersGit.json
new file mode 100644
index 00000000000..9e01861615e
--- /dev/null
+++ b/kafka-ui-e2e-checks/selenoid/config/browsersGit.json
@@ -0,0 +1,15 @@
+{
+  "chrome": {
+    "default": "103.0",
+    "versions": {
+      "103.0": {
+        "image": "selenoid/vnc_chrome:103.0",
+        "hosts": [
+          "host.docker.internal:172.17.0.1"
+        ],
+        "port": "4444",
+        "path": "/"
+      }
+    }
+  }
+}
diff --git a/kafka-ui-e2e-checks/selenoid/config/browsers.json b/kafka-ui-e2e-checks/selenoid/config/browsersLocal.json
similarity index 52%
rename from kafka-ui-e2e-checks/selenoid/config/browsers.json
rename to kafka-ui-e2e-checks/selenoid/config/browsersLocal.json
index 6387ffd1394..35a494f33dc 100644
--- a/kafka-ui-e2e-checks/selenoid/config/browsers.json
+++ b/kafka-ui-e2e-checks/selenoid/config/browsersLocal.json
@@ -1,9 +1,9 @@
 {
   "chrome": {
-    "default": "96.0",
+    "default": "103.0",
     "versions": {
-      "96.0": {
-        "image": "selenoid/vnc_chrome:96.0",
+      "103.0": {
+        "image": "selenoid/vnc_chrome:103.0",
         "port": "4444",
         "path": "/"
       }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index 201079fe3b3..2bb4ecce519 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -21,6 +21,7 @@ public abstract class BasePage extends WebUtils {
     protected SelenideElement loadingSpinner = $x("//div[@role='progressbar']");
     protected SelenideElement submitBtn = $x("//button[@type='submit']");
     protected SelenideElement tableGrid = $x("//table");
+    protected SelenideElement searchFld = $x("//input[@type='text'][contains(@id, ':r')]");
     protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
     protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
     protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
@@ -37,13 +38,20 @@ public abstract class BasePage extends WebUtils {
     protected String pageTitleFromHeader = "//h1[text()='%s']";
     protected String pagePathFromHeader = "//a[text()='%s']/../h1";
 
-    protected void waitUntilSpinnerDisappear() {
+    protected void waitUntilSpinnerDisappear(int... timeoutInSeconds) {
         log.debug("\nwaitUntilSpinnerDisappear");
-        if (isVisible(loadingSpinner)) {
+        if (isVisible(loadingSpinner, timeoutInSeconds)) {
             loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(60));
         }
     }
 
+    protected void searchItem(String tag) {
+        log.debug("\nsearchItem: {}", tag);
+        sendKeysAfterClear(searchFld, tag);
+        searchFld.pressEnter().shouldHave(Condition.value(tag));
+        waitUntilSpinnerDisappear(1);
+    }
+
     protected SelenideElement getPageTitleFromHeader(MenuItem menuItem) {
         return $x(String.format(pageTitleFromHeader, menuItem.getPageTitle()));
     }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java
index df10360844b..35490a27d8f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java
@@ -2,8 +2,8 @@
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
 import com.provectus.kafka.ui.pages.BasePage;
+import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
 import io.qameta.allure.Step;
 
 import java.time.Duration;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
index f60bd6d431e..9c255d57113 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
@@ -9,12 +9,13 @@
 import io.qameta.allure.Step;
 
 import static com.codeborne.selenide.Selenide.*;
+import static org.openqa.selenium.By.id;
 
 public class TopicCreateEditForm extends BasePage {
 
     protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
     protected SelenideElement partitionsField = $x("//input[@name='partitions']");
-    protected SelenideElement nameField = $x("//input[@name='name']");
+    protected SelenideElement nameField = $(id("topicFormName"));
     protected SelenideElement maxMessageBytesField = $x("//input[@name='maxMessageBytes']");
     protected SelenideElement minInSyncReplicasField = $x("//input[@name='minInSyncReplicas']");
     protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
@@ -49,10 +50,7 @@ public boolean isNameFieldEnabled() {
 
     @Step
     public TopicCreateEditForm setTopicName(String topicName) {
-        nameField.shouldBe(Condition.enabled).clear();
-        if (topicName != null) {
-            nameField.sendKeys(topicName);
-        }
+        sendKeysAfterClear(nameField, topicName);
         return this;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
index a99afd903b6..d9c01053147 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
@@ -6,7 +6,6 @@
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -17,6 +16,7 @@
 import java.util.*;
 
 import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.OVERVIEW;
 import static org.testcontainers.shaded.org.apache.commons.lang3.RandomUtils.nextInt;
 
 public class TopicDetails extends BasePage {
@@ -24,8 +24,6 @@ public class TopicDetails extends BasePage {
     protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
     protected SelenideElement recreateTopicBtn = $x("//div[text()='Recreate Topic']");
     protected SelenideElement messageAmountCell = $x("//tbody/tr/td[5]");
-    protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
-    protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
     protected SelenideElement seekTypeDdl = $x("//ul[@id='selectSeekType']/li");
     protected SelenideElement seekTypeField = $x("//label[text()='Seek Type']//..//div/input");
     protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
@@ -50,6 +48,7 @@ public class TopicDetails extends BasePage {
     protected SelenideElement previousMonthButton = $x("//button[@aria-label='Previous Month']");
     protected SelenideElement nextMonthButton = $x("//button[@aria-label='Next Month']");
     protected SelenideElement calendarTimeFld = $x("//input[@placeholder='Time']");
+    protected String detailsTabLtr = "//nav//a[contains(text(),'%s')]";
     protected String dayCellLtr = "//div[@role='option'][contains(text(),'%d')]";
     protected String seekFilterDdlLocator = "//ul[@id='selectSeekType']/ul/li[text()='%s']";
     protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
@@ -61,13 +60,13 @@ public class TopicDetails extends BasePage {
     @Step
     public TopicDetails waitUntilScreenReady() {
         waitUntilSpinnerDisappear();
-        overviewTab.shouldBe(Condition.visible);
+        $x(String.format(detailsTabLtr, OVERVIEW)).shouldBe(Condition.visible);
         return this;
     }
 
     @Step
     public TopicDetails openDetailsTab(TopicMenu menu) {
-        $(By.linkText(menu.toString())).shouldBe(Condition.visible).click();
+        $x(String.format(detailsTabLtr, menu.toString())).shouldBe(Condition.enabled).click();
         waitUntilSpinnerDisappear();
         return this;
     }
@@ -172,9 +171,9 @@ public TopicDetails clickMessagesAddFiltersBtn() {
 
     @Step
     public TopicDetails clickNextButton() {
-      nextBtn.shouldBe(Condition.enabled).click();
-      waitUntilSpinnerDisappear();
-      return this;
+        nextBtn.shouldBe(Condition.enabled).click();
+        waitUntilSpinnerDisappear();
+        return this;
     }
 
     @Step
@@ -254,7 +253,7 @@ public boolean isBackButtonEnabled() {
 
     @Step
     public boolean isNextButtonEnabled() {
-      return isEnabled(nextBtn);
+        return isEnabled(nextBtn);
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
index 0f25489128f..538f714e831 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
@@ -54,7 +54,17 @@ public boolean isShowInternalRadioBtnSelected() {
 
     @Step
     public TopicsList setShowInternalRadioButton(boolean select) {
-        selectElement(showInternalRadioBtn, select);
+        if (select) {
+            if (!showInternalRadioBtn.isSelected()) {
+                clickByJavaScript(showInternalRadioBtn);
+                waitUntilSpinnerDisappear(1);
+            }
+        } else {
+            if (showInternalRadioBtn.isSelected()) {
+                clickByJavaScript(showInternalRadioBtn);
+                waitUntilSpinnerDisappear(1);
+            }
+        }
         return this;
     }
 
@@ -169,9 +179,16 @@ private List<TopicGridItem> initGridItems() {
 
     @Step
     public TopicGridItem getTopicItem(String name) {
-        return initGridItems().stream()
+        TopicGridItem topicGridItem = initGridItems().stream()
                 .filter(e -> e.getName().equals(name))
-                .findFirst().orElseThrow();
+                .findFirst().orElse(null);
+        if (topicGridItem == null) {
+            searchItem(name);
+            topicGridItem = initGridItems().stream()
+                    .filter(e -> e.getName().equals(name))
+                    .findFirst().orElseThrow();
+        }
+        return topicGridItem;
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index 315cf56d187..808f0fdbc82 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -29,27 +29,27 @@ public class ApiService extends BaseSource {
 
     @SneakyThrows
     private TopicsApi topicApi() {
-        return new TopicsApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+        return new TopicsApi(new ApiClient().setBasePath(BASE_API_URL));
     }
 
     @SneakyThrows
     private SchemasApi schemaApi() {
-        return new SchemasApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+        return new SchemasApi(new ApiClient().setBasePath(BASE_API_URL));
     }
 
     @SneakyThrows
     private KafkaConnectApi connectorApi() {
-        return new KafkaConnectApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+        return new KafkaConnectApi(new ApiClient().setBasePath(BASE_API_URL));
     }
 
     @SneakyThrows
     private MessagesApi messageApi() {
-        return new MessagesApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+        return new MessagesApi(new ApiClient().setBasePath(BASE_API_URL));
     }
 
     @SneakyThrows
     private KsqlApi ksqlApi() {
-        return new KsqlApi(new ApiClient().setBasePath(BASE_LOCAL_URL));
+        return new KsqlApi(new ApiClient().setBasePath(BASE_API_URL));
     }
 
     @SneakyThrows
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
index d294c5a1167..cbb1bc23454 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
@@ -3,15 +3,22 @@
 import com.provectus.kafka.ui.settings.configs.Config;
 import org.aeonbits.owner.ConfigFactory;
 
+import static com.provectus.kafka.ui.variables.Browser.LOCAL;
+
 public abstract class BaseSource {
 
-    public static final String BASE_CONTAINER_URL = "http://host.testcontainers.internal:8080";
-    public static final String BASE_LOCAL_URL = "http://localhost:8080";
     public static final String CLUSTER_NAME = "local";
     public static final String CONNECT_NAME = "first";
+    private static final String LOCAL_HOST = "localhost";
     private static Config config;
     public static final String BROWSER = config().browser();
     public static final String SUITE_NAME = config().suite();
+    public static final String BASE_HOST = BROWSER.equals(LOCAL)
+            ? LOCAL_HOST
+            : "host.docker.internal";
+    public static final String REMOTE_URL = String.format("http://%s:4444/wd/hub", LOCAL_HOST);
+    public static final String BASE_API_URL = String.format("http://%s:8080", LOCAL_HOST);
+    public static final String BASE_UI_URL = String.format("http://%s:8080", BASE_HOST);
 
     private static Config config() {
         if (config == null) {
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java
deleted file mode 100644
index e96213dd061..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/LocalWebDriver.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.provectus.kafka.ui.settings.drivers;
-
-import static com.codeborne.selenide.Selenide.clearBrowserCookies;
-import static com.codeborne.selenide.Selenide.clearBrowserLocalStorage;
-import static com.codeborne.selenide.Selenide.open;
-import static com.codeborne.selenide.Selenide.refresh;
-
-import com.codeborne.selenide.Configuration;
-import com.codeborne.selenide.WebDriverRunner;
-import com.codeborne.selenide.logevents.SelenideLogger;
-import io.qameta.allure.Step;
-import io.qameta.allure.selenide.AllureSelenide;
-import org.openqa.selenium.chrome.ChromeOptions;
-
-public abstract class LocalWebDriver {
-
-    private static org.openqa.selenium.WebDriver getWebDriver() {
-        try {
-            return WebDriverRunner.getWebDriver();
-        } catch (IllegalStateException ex) {
-            Configuration.headless = false;
-            Configuration.browser = "chrome";
-            Configuration.browserSize = "1920x1080";
-            /**screenshots and savePageSource config is needed for local debug
-             * optionally can be set as 'false' to not duplicate Allure report
-             */
-            Configuration.screenshots = true;
-            Configuration.savePageSource = true;
-            Configuration.pageLoadTimeout = 120000;
-            Configuration.browserCapabilities = new ChromeOptions()
-                    .addArguments("--remote-allow-origins=*")
-                    .addArguments("--lang=en_US");
-            open();
-            return WebDriverRunner.getWebDriver();
-        }
-    }
-
-    @Step
-    public static void openUrl(String url) {
-        if (!getWebDriver().getCurrentUrl().equals(url)) {
-            getWebDriver().get(url);
-        }
-    }
-
-    @Step
-    public static void browserInit() {
-        getWebDriver();
-    }
-
-    @Step
-    public static void browserClear() {
-        clearBrowserLocalStorage();
-        clearBrowserCookies();
-        refresh();
-    }
-
-    @Step
-    public static void browserQuit() {
-        getWebDriver().quit();
-    }
-
-    @Step
-    public static void loggerSetup() {
-        SelenideLogger.addListener("AllureSelenide", new AllureSelenide()
-                .screenshots(true)
-                .savePageSource(false));
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java
new file mode 100644
index 00000000000..2b210e91e13
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java
@@ -0,0 +1,96 @@
+package com.provectus.kafka.ui.settings.drivers;
+
+import com.codeborne.selenide.Configuration;
+import com.codeborne.selenide.Selenide;
+import com.codeborne.selenide.WebDriverRunner;
+import com.codeborne.selenide.logevents.SelenideLogger;
+import io.qameta.allure.Step;
+import io.qameta.allure.selenide.AllureSelenide;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import static com.codeborne.selenide.Selenide.*;
+import static com.provectus.kafka.ui.settings.BaseSource.BROWSER;
+import static com.provectus.kafka.ui.settings.BaseSource.REMOTE_URL;
+import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
+import static com.provectus.kafka.ui.variables.Browser.LOCAL;
+
+public abstract class WebDriver {
+
+    @Step
+    public static void browserSetup() {
+        Configuration.headless = false;
+        Configuration.browser = "chrome";
+        Configuration.browserSize = "1920x1080";
+        /**screenshots and savePageSource config is needed for local debug
+         * optionally can be set as 'false' to not duplicate Allure report
+         */
+        Configuration.screenshots = true;
+        Configuration.savePageSource = false;
+        Configuration.pageLoadTimeout = 120000;
+        ChromeOptions options = new ChromeOptions()
+                .addArguments("--no-sandbox")
+                .addArguments("--verbose")
+                .addArguments("--remote-allow-origins=*")
+                .addArguments("--disable-dev-shm-usage")
+                .addArguments("--disable-gpu")
+                .addArguments("--lang=en_US");
+        switch (BROWSER) {
+            case (LOCAL) -> Configuration.browserCapabilities = options;
+            case (CONTAINER) -> {
+                Configuration.remote = REMOTE_URL;
+                Configuration.remoteConnectionTimeout = 180000;
+                DesiredCapabilities capabilities = new DesiredCapabilities();
+                capabilities.setCapability("enableVNC", true);
+                capabilities.setCapability("enableVideo", false);
+                Configuration.browserCapabilities = capabilities.merge(options);
+            }
+            default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
+        }
+    }
+
+    private static org.openqa.selenium.WebDriver getWebDriver() {
+        try {
+            return WebDriverRunner.getWebDriver();
+        } catch (IllegalStateException ex) {
+            browserSetup();
+            Selenide.open();
+            return WebDriverRunner.getWebDriver();
+        }
+    }
+
+    @Step
+    public static void openUrl(String url) {
+        org.openqa.selenium.WebDriver driver = getWebDriver();
+        if (!driver.getCurrentUrl().equals(url)) driver.get(url);
+    }
+
+    @Step
+    public static void browserInit() {
+        getWebDriver();
+    }
+
+    @Step
+    public static void browserClear() {
+        clearBrowserLocalStorage();
+        clearBrowserCookies();
+        refresh();
+    }
+
+    @Step
+    public static void browserQuit() {
+        org.openqa.selenium.WebDriver driver = null;
+        try {
+            driver = WebDriverRunner.getWebDriver();
+        } catch (Throwable ignored) {
+        }
+        if (driver != null) driver.quit();
+    }
+
+    @Step
+    public static void loggerSetup() {
+        SelenideLogger.addListener("AllureSelenide", new AllureSelenide()
+                .screenshots(true)
+                .savePageSource(false));
+    }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index 8358880503e..427662d9d77 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -7,11 +7,23 @@
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
+import java.time.Duration;
+
 import static com.codeborne.selenide.Selenide.executeJavaScript;
 
 @Slf4j
 public class WebUtils {
 
+    public static int getTimeout(int... timeoutInSeconds) {
+        return (timeoutInSeconds != null && timeoutInSeconds.length > 0) ? timeoutInSeconds[0] : 4;
+    }
+
+    public static void sendKeysAfterClear(SelenideElement element, String keys) {
+        log.debug("\nsendKeysAfterClear: {} \nsend keys '{}'", element.getSearchCriteria(), keys);
+        element.shouldBe(Condition.enabled).clear();
+        if (keys != null) element.sendKeys(keys);
+    }
+
     public static void clickByActions(SelenideElement element) {
         log.debug("\nclickByActions: {}", element.getSearchCriteria());
         element.shouldBe(Condition.enabled);
@@ -43,11 +55,12 @@ public static void clearByKeyboard(SelenideElement field) {
         field.sendKeys(Keys.chord(Keys.CONTROL + "a"), Keys.DELETE);
     }
 
-    public static boolean isVisible(SelenideElement element) {
+    public static boolean isVisible(SelenideElement element, int... timeoutInSeconds) {
         log.debug("\nisVisible: {}", element.getSearchCriteria());
         boolean isVisible = false;
         try {
-            element.shouldBe(Condition.visible);
+            element.shouldBe(Condition.visible,
+                    Duration.ofSeconds(getTimeout(timeoutInSeconds)));
             isVisible = true;
         } catch (Throwable e) {
             log.debug("{} is not visible", element.getSearchCriteria());
@@ -55,11 +68,12 @@ public static boolean isVisible(SelenideElement element) {
         return isVisible;
     }
 
-    public static boolean isEnabled(SelenideElement element) {
+    public static boolean isEnabled(SelenideElement element, int... timeoutInSeconds) {
         log.debug("\nisEnabled: {}", element.getSearchCriteria());
         boolean isEnabled = false;
         try {
-            element.shouldBe(Condition.enabled);
+            element.shouldBe(Condition.enabled,
+                    Duration.ofSeconds(getTimeout(timeoutInSeconds)));
             isEnabled = true;
         } catch (Throwable e) {
             log.debug("{} is not enabled", element.getSearchCriteria());
@@ -67,11 +81,12 @@ public static boolean isEnabled(SelenideElement element) {
         return isEnabled;
     }
 
-    public static boolean isSelected(SelenideElement element) {
+    public static boolean isSelected(SelenideElement element, int... timeoutInSeconds) {
         log.debug("\nisSelected: {}", element.getSearchCriteria());
         boolean isSelected = false;
         try {
-            element.shouldBe(Condition.selected);
+            element.shouldBe(Condition.selected,
+                    Duration.ofSeconds(getTimeout(timeoutInSeconds)));
             isSelected = true;
         } catch (Throwable e) {
             log.debug("{} is not selected", element.getSearchCriteria());
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java
index f612d743a5c..8800463bdc1 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java
@@ -1,9 +1,9 @@
 package com.provectus.kafka.ui.variables;
 
 public interface Url {
-    
+
     String BROKERS_LIST_URL = "http://%s:8080/ui/clusters/local/brokers";
-    String TOPICS_LIST_URL = "http://%s:8080/ui/clusters/local/all-topics?perPage=25";
+    String TOPICS_LIST_URL = "http://%s:8080/ui/clusters/local/all-topics";
     String CONSUMERS_LIST_URL = "http://%s:8080/ui/clusters/local/consumer-groups";
     String SCHEMA_REGISTRY_LIST_URL = "http://%s:8080/ui/clusters/local/schemas";
     String KAFKA_CONNECT_LIST_URL = "http://%s:8080/ui/clusters/local/connectors";
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
index dfb42300018..424c699f043 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
@@ -3,104 +3,40 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
-import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.settings.listeners.AllureListener;
 import com.provectus.kafka.ui.settings.listeners.LoggerListener;
 import com.provectus.kafka.ui.settings.listeners.QaseResultListener;
 import io.qameta.allure.Step;
 import lombok.extern.slf4j.Slf4j;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.remote.RemoteWebDriver;
-import org.testcontainers.Testcontainers;
-import org.testcontainers.containers.BrowserWebDriverContainer;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
-import org.testcontainers.utility.DockerImageName;
 import org.testng.annotations.*;
 import org.testng.asserts.SoftAssert;
 
-import java.time.Duration;
 import java.util.List;
 
 import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.*;
-import static com.provectus.kafka.ui.settings.BaseSource.*;
-import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.*;
+import static com.provectus.kafka.ui.settings.BaseSource.BASE_UI_URL;
+import static com.provectus.kafka.ui.settings.drivers.WebDriver.*;
 import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
-import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
-import static com.provectus.kafka.ui.variables.Browser.LOCAL;
 
 @Slf4j
 @Listeners({AllureListener.class, LoggerListener.class, QaseResultListener.class})
 public abstract class BaseTest extends Facade {
 
-    private static final String SELENIUM_IMAGE_NAME = "selenium/standalone-chrome:103.0";
-    private static final String SELENIARM_STANDALONE_CHROMIUM = "seleniarm/standalone-chromium:103.0";
-    protected static BrowserWebDriverContainer<?> webDriverContainer = null;
-
-    private static boolean isARM64() {
-        return System.getProperty("os.arch").equals("aarch64");
-    }
-
     @BeforeSuite(alwaysRun = true)
     public void beforeSuite() {
         qaseIntegrationSetup();
-        switch (BROWSER) {
-            case (CONTAINER) -> {
-                DockerImageName image = isARM64()
-                        ? DockerImageName.parse(SELENIARM_STANDALONE_CHROMIUM).asCompatibleSubstituteFor(SELENIUM_IMAGE_NAME)
-                        : DockerImageName.parse(SELENIUM_IMAGE_NAME);
-                log.info("Using [{}] as image name for chrome", image.getUnversionedPart());
-                webDriverContainer = new BrowserWebDriverContainer<>(image)
-                        .withEnv("JAVA_OPTS", "-Dwebdriver.chrome.whitelistedIps=")
-                        .withStartupTimeout(Duration.ofSeconds(180))
-                        .withCapabilities(new ChromeOptions()
-                                .addArguments("--disable-dev-shm-usage")
-                                .addArguments("--disable-gpu")
-                                .addArguments("--no-sandbox")
-                                .addArguments("--verbose")
-                                .addArguments("--lang=es")
-                        )
-                        .withLogConsumer(new Slf4jLogConsumer(log).withPrefix("[CHROME]: "));
-                try {
-                    Testcontainers.exposeHostPorts(8080);
-                    log.info("Starting browser container");
-                    webDriverContainer.start();
-                } catch (Throwable e) {
-                    log.error("Couldn't start a container", e);
-                }
-            }
-            case (LOCAL) -> loggerSetup();
-            default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
-        }
+        loggerSetup();
+        browserSetup();
     }
 
     @AfterSuite(alwaysRun = true)
     public void afterSuite() {
-        switch (BROWSER) {
-            case (CONTAINER) -> {
-                if (webDriverContainer.isRunning()) {
-                    webDriverContainer.close();
-                    webDriverContainer.stop();
-                }
-            }
-            case (LOCAL) -> browserQuit();
-            default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
-        }
+        browserQuit();
     }
 
     @BeforeMethod(alwaysRun = true)
     public void beforeMethod() {
-        switch (BROWSER) {
-            case (CONTAINER) -> {
-                RemoteWebDriver remoteWebDriver = webDriverContainer.getWebDriver();
-                WebDriverRunner.setWebDriver(remoteWebDriver);
-                remoteWebDriver.manage()
-                        .window().setSize(new Dimension(1440, 1024));
-                Selenide.open(BASE_CONTAINER_URL);
-            }
-            case (LOCAL) -> openUrl(BASE_LOCAL_URL);
-            default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
-        }
+        Selenide.open(BASE_UI_URL);
         naviSideBar.waitUntilScreenReady();
     }
 
@@ -133,15 +69,14 @@ protected void navigateToTopics() {
         naviSideBar
                 .openSideMenu(TOPICS);
         topicsList
-                .waitUntilScreenReady();
+                .waitUntilScreenReady()
+                .setShowInternalRadioButton(false);
     }
 
     @Step
     protected void navigateToTopicsAndOpenDetails(String topicName) {
-        naviSideBar
-                .openSideMenu(TOPICS);
+        navigateToTopics();
         topicsList
-                .waitUntilScreenReady()
                 .openTopic(topicName);
         topicDetails
                 .waitUntilScreenReady();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
index aa48cde2fc2..c8439e70dd7 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
@@ -3,10 +3,10 @@
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
@@ -18,9 +18,8 @@
 import java.util.stream.Stream;
 
 import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.*;
-import static com.provectus.kafka.ui.settings.BaseSource.BROWSER;
+import static com.provectus.kafka.ui.settings.BaseSource.BASE_HOST;
 import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
-import static com.provectus.kafka.ui.variables.Browser.LOCAL;
 import static com.provectus.kafka.ui.variables.Url.*;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
@@ -73,7 +72,7 @@ public void checkUrlWhileNavigating() {
 
     @QaseId(46)
     @Test
-    public void checkComponentsPathWhileNavigating() {
+    public void checkPathWhileNavigating() {
         navigateToBrokersAndOpenDetails(BROKER_ID);
         verifyComponentsPath(BROKERS, String.format("Broker %d", BROKER_ID));
         navigateToTopicsAndOpenDetails(TEST_TOPIC.getName());
@@ -86,9 +85,10 @@ public void checkComponentsPathWhileNavigating() {
 
     @Step
     private void verifyCurrentUrl(String expectedUrl) {
-        String host = BROWSER.equals(LOCAL) ? "localhost" : "host.testcontainers.internal";
-        Assert.assertEquals(WebDriverRunner.getWebDriver().getCurrentUrl(),
-                String.format(expectedUrl, host), "getCurrentUrl()");
+        String urlWithoutParameters = WebDriverRunner.getWebDriver().getCurrentUrl();
+        if (urlWithoutParameters.contains("?"))
+            urlWithoutParameters = urlWithoutParameters.substring(0, urlWithoutParameters.indexOf("?"));
+        Assert.assertEquals(urlWithoutParameters, String.format(expectedUrl, BASE_HOST), "getCurrentUrl()");
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
index ab1705922a1..210e5549f4c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
@@ -4,10 +4,14 @@
 import com.provectus.kafka.ui.pages.ksqlDb.models.Stream;
 import com.provectus.kafka.ui.pages.ksqlDb.models.Table;
 import io.qase.api.annotation.QaseId;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.testng.asserts.SoftAssert;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.provectus.kafka.ui.pages.ksqlDb.enums.KsqlQueryConfig.SHOW_TABLES;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
@@ -22,12 +26,15 @@ public class KsqlDbTest extends BaseTest {
     private static final Table SECOND_TABLE = new Table()
             .setName("SECOND_TABLE" + randomAlphabetic(4).toUpperCase())
             .setStreamName(STREAM_FOR_CHECK_TABLES.getName());
+    private static final List<String> TOPIC_NAMES_LIST = new ArrayList<>();
 
     @BeforeClass(alwaysRun = true)
     public void beforeClass() {
         apiService
                 .createStream(STREAM_FOR_CHECK_TABLES)
                 .createTables(FIRST_TABLE, SECOND_TABLE);
+        TOPIC_NAMES_LIST.addAll(List.of(STREAM_FOR_CHECK_TABLES.getTopicName(),
+                FIRST_TABLE.getName(), SECOND_TABLE.getName()));
     }
 
     @QaseId(41)
@@ -65,4 +72,9 @@ public void clearResultsForExecutedRequest() {
         softly.assertFalse(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
         softly.assertAll();
     }
+
+    @AfterClass(alwaysRun = true)
+    public void afterClass() {
+        TOPIC_NAMES_LIST.forEach(topicName -> apiService.deleteTopic(topicName));
+    }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
index 8cca35beb6b..0ce4d6c7183 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
@@ -3,7 +3,6 @@
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.topics.TopicDetails;
 import io.qameta.allure.Issue;
 import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
@@ -17,8 +16,7 @@
 import java.util.List;
 
 import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.MESSAGES;
-import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.SETTINGS;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.*;
 import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.COMPACT;
 import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.DELETE;
 import static com.provectus.kafka.ui.pages.topics.enums.CustomParameterType.COMPRESSION_TYPE;
@@ -206,7 +204,7 @@ public void redirectToConsumerFromTopic() {
         String consumerGroupId = "connect-sink_postgres_activities";
         navigateToTopicsAndOpenDetails(topicName);
         topicDetails
-                .openDetailsTab(TopicDetails.TopicMenu.CONSUMERS)
+                .openDetailsTab(CONSUMERS)
                 .openConsumerGroup(consumerGroupId);
         consumersDetails
                 .waitUntilScreenReady();
@@ -361,8 +359,9 @@ public void checkApplyingSavedFilterWithinTopicMessages() {
     @Test(priority = 15)
     public void checkShowInternalTopicsButton() {
         navigateToTopics();
+        topicsList
+                .setShowInternalRadioButton(true);
         SoftAssert softly = new SoftAssert();
-        softly.assertTrue(topicsList.isShowInternalRadioBtnSelected(), "isInternalRadioBtnSelected()");
         softly.assertTrue(topicsList.getInternalTopics().size() > 0, "getInternalTopics()");
         softly.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
         softly.assertAll();
diff --git a/kafka-ui-e2e-checks/src/test/resources/manual.xml b/kafka-ui-e2e-checks/src/test/resources/manual.xml
index dff467651e0..89dbd7e172b 100644
--- a/kafka-ui-e2e-checks/src/test/resources/manual.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/manual.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
 <suite name="ManualSuite">
-    <test name="Manual" enabled="true" parallel="classes" thread-count="1">
+    <test name="ManualTest" enabled="true" parallel="classes" thread-count="1">
         <packages>
             <package name="com.provectus.kafka.ui.manualSuite.*"/>
         </packages>
diff --git a/kafka-ui-e2e-checks/src/test/resources/qase.xml b/kafka-ui-e2e-checks/src/test/resources/qase.xml
index 2b5d023b1a5..8dd1dd15273 100644
--- a/kafka-ui-e2e-checks/src/test/resources/qase.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/qase.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
 <suite name="QaseSuite">
-    <test name="Qase" enabled="true" parallel="classes" thread-count="1">
+    <test name="QaseTest" enabled="true" parallel="classes" thread-count="1">
         <packages>
             <package name="com.provectus.kafka.ui.qaseSuite.*"/>
         </packages>
diff --git a/kafka-ui-e2e-checks/src/test/resources/regression.xml b/kafka-ui-e2e-checks/src/test/resources/regression.xml
index 01db95d03b5..6cc4c5bd49d 100644
--- a/kafka-ui-e2e-checks/src/test/resources/regression.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/regression.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
 <suite name="RegressionSuite">
-    <test name="Regression" enabled="true" parallel="classes" thread-count="1">
+    <test name="RegressionTest" enabled="true" parallel="classes" thread-count="3">
         <packages>
             <package name="com.provectus.kafka.ui.smokeSuite.*"/>
             <package name="com.provectus.kafka.ui.sanitySuite.*"/>
diff --git a/kafka-ui-e2e-checks/src/test/resources/sanity.xml b/kafka-ui-e2e-checks/src/test/resources/sanity.xml
index e1c8e8a31f2..01aa279c0fe 100644
--- a/kafka-ui-e2e-checks/src/test/resources/sanity.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/sanity.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
 <suite name="SanitySuite">
-    <test name="Sanity" enabled="true" parallel="classes" thread-count="1">
+    <test name="SanityTest" enabled="true" parallel="classes" thread-count="3">
         <packages>
             <package name="com.provectus.kafka.ui.sanitySuite.*"/>
         </packages>
diff --git a/kafka-ui-e2e-checks/src/test/resources/smoke.xml b/kafka-ui-e2e-checks/src/test/resources/smoke.xml
index e0a8f082e8f..b370468e4fb 100644
--- a/kafka-ui-e2e-checks/src/test/resources/smoke.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/smoke.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
 <suite name="SmokeSuite">
-    <test name="Smoke" enabled="true" parallel="classes" thread-count="1">
+    <test name="SmokeTest" enabled="true" parallel="classes" thread-count="3">
         <packages>
             <package name="com.provectus.kafka.ui.smokeSuite.*"/>
         </packages>

From e31580a16ab8db762d2f7d1152101ae36404dec1 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 6 Apr 2023 18:11:39 +0400
Subject: [PATCH 492/734] "Done" event sending fix (#3631)

* Done message sending fix: Making filtering and limiting a part of emitter to make it possible to gracefully finish emitting
---
 .../kafka/ui/emitter/AbstractEmitter.java     | 44 ++++------
 .../ui/emitter/BackwardRecordEmitter.java     | 10 +--
 .../kafka/ui/emitter/ConsumingStats.java      |  8 +-
 .../ui/emitter/ForwardRecordEmitter.java      | 12 +--
 .../kafka/ui/emitter/MessageFilterStats.java  | 16 ----
 .../kafka/ui/emitter/MessagesProcessing.java  | 82 +++++++++++++++++++
 .../kafka/ui/emitter/TailingEmitter.java      |  5 +-
 .../kafka/ui/service/MessagesService.java     | 57 ++++---------
 .../kafka/ui/service/RecordEmitterTest.java   | 25 +++---
 9 files changed, 143 insertions(+), 116 deletions(-)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilterStats.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
index 646cf81ca67..9ea0526bac8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
@@ -1,9 +1,6 @@
 package com.provectus.kafka.ui.emitter;
 
-import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.model.TopicMessagePhaseDTO;
-import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import java.time.Duration;
 import java.time.Instant;
 import org.apache.kafka.clients.consumer.Consumer;
@@ -14,13 +11,12 @@
 
 public abstract class AbstractEmitter {
 
-  private final ConsumerRecordDeserializer recordDeserializer;
-  private final ConsumingStats consumingStats = new ConsumingStats();
+  private final MessagesProcessing messagesProcessing;
   private final PollingThrottler throttler;
   protected final PollingSettings pollingSettings;
 
-  protected AbstractEmitter(ConsumerRecordDeserializer recordDeserializer, PollingSettings pollingSettings) {
-    this.recordDeserializer = recordDeserializer;
+  protected AbstractEmitter(MessagesProcessing messagesProcessing, PollingSettings pollingSettings) {
+    this.messagesProcessing = messagesProcessing;
     this.pollingSettings = pollingSettings;
     this.throttler = pollingSettings.getPollingThrottler();
   }
@@ -40,39 +36,27 @@ protected ConsumerRecords<Bytes, Bytes> poll(
     return records;
   }
 
+  protected boolean sendLimitReached() {
+    return messagesProcessing.limitReached();
+  }
+
   protected void sendMessage(FluxSink<TopicMessageEventDTO> sink,
-                                                       ConsumerRecord<Bytes, Bytes> msg) {
-    final TopicMessageDTO topicMessage = recordDeserializer.deserialize(msg);
-    sink.next(
-        new TopicMessageEventDTO()
-            .type(TopicMessageEventDTO.TypeEnum.MESSAGE)
-            .message(topicMessage)
-    );
+                             ConsumerRecord<Bytes, Bytes> msg) {
+    messagesProcessing.sendMsg(sink, msg);
   }
 
   protected void sendPhase(FluxSink<TopicMessageEventDTO> sink, String name) {
-    sink.next(
-        new TopicMessageEventDTO()
-            .type(TopicMessageEventDTO.TypeEnum.PHASE)
-            .phase(new TopicMessagePhaseDTO().name(name))
-    );
+    messagesProcessing.sendPhase(sink, name);
   }
 
   protected int sendConsuming(FluxSink<TopicMessageEventDTO> sink,
-                               ConsumerRecords<Bytes, Bytes> records,
-                               long elapsed) {
-    return consumingStats.sendConsumingEvt(sink, records, elapsed, getFilterApplyErrors(sink));
+                              ConsumerRecords<Bytes, Bytes> records,
+                              long elapsed) {
+    return messagesProcessing.sentConsumingInfo(sink, records, elapsed);
   }
 
   protected void sendFinishStatsAndCompleteSink(FluxSink<TopicMessageEventDTO> sink) {
-    consumingStats.sendFinishEvent(sink, getFilterApplyErrors(sink));
+    messagesProcessing.sendFinishEvent(sink);
     sink.complete();
   }
-
-  protected Number getFilterApplyErrors(FluxSink<?> sink) {
-    return sink.contextView()
-        .<MessageFilterStats>getOrEmpty(MessageFilterStats.class)
-        .<Number>map(MessageFilterStats::getFilterApplyErrors)
-        .orElse(0);
-  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
index 42f94a1e019..ccd24e85680 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
@@ -2,7 +2,6 @@
 
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -31,9 +30,9 @@ public BackwardRecordEmitter(
       Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
       ConsumerPosition consumerPosition,
       int messagesPerPage,
-      ConsumerRecordDeserializer recordDeserializer,
+      MessagesProcessing messagesProcessing,
       PollingSettings pollingSettings) {
-    super(recordDeserializer, pollingSettings);
+    super(messagesProcessing, pollingSettings);
     this.consumerPosition = consumerPosition;
     this.messagesPerPage = messagesPerPage;
     this.consumerSupplier = consumerSupplier;
@@ -52,7 +51,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
       int msgsToPollPerPartition = (int) Math.ceil((double) messagesPerPage / readUntilOffsets.size());
       log.debug("'Until' offsets for polling: {}", readUntilOffsets);
 
-      while (!sink.isCancelled() && !readUntilOffsets.isEmpty()) {
+      while (!sink.isCancelled() && !readUntilOffsets.isEmpty() && !sendLimitReached()) {
         new TreeMap<>(readUntilOffsets).forEach((tp, readToOffset) -> {
           if (sink.isCancelled()) {
             return; //fast return in case of sink cancellation
@@ -61,8 +60,6 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
           long readFromOffset = Math.max(beginOffset, readToOffset - msgsToPollPerPartition);
 
           partitionPollIteration(tp, readFromOffset, readToOffset, consumer, sink)
-              .stream()
-              .filter(r -> !sink.isCancelled())
               .forEach(r -> sendMessage(sink, r));
 
           if (beginOffset == readFromOffset) {
@@ -106,6 +103,7 @@ private List<ConsumerRecord<Bytes, Bytes>> partitionPollIteration(
 
     EmptyPollsCounter emptyPolls  = pollingSettings.createEmptyPollsCounter();
     while (!sink.isCancelled()
+        && !sendLimitReached()
         && recordsToSend.size() < desiredMsgsToPoll
         && !emptyPolls.noDataEmptyPollsReached()) {
       var polledRecords = poll(sink, consumer, pollingSettings.getPartitionPollTimeout());
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
index 68c1cff098d..0e002f36a44 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
@@ -19,7 +19,7 @@ class ConsumingStats {
   int sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
                         ConsumerRecords<Bytes, Bytes> polledRecords,
                         long elapsed,
-                        Number filterApplyErrors) {
+                        int filterApplyErrors) {
     int polledBytes = ConsumerRecordsUtil.calculatePolledSize(polledRecords);
     bytes += polledBytes;
     this.records += polledRecords.count();
@@ -32,7 +32,7 @@ int sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
     return polledBytes;
   }
 
-  void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink, Number filterApplyErrors) {
+  void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink, int filterApplyErrors) {
     sink.next(
         new TopicMessageEventDTO()
             .type(TopicMessageEventDTO.TypeEnum.DONE)
@@ -41,12 +41,12 @@ void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink, Number filterApplyErro
   }
 
   private TopicMessageConsumingDTO createConsumingStats(FluxSink<TopicMessageEventDTO> sink,
-                                                        Number filterApplyErrors) {
+                                                        int filterApplyErrors) {
     return new TopicMessageConsumingDTO()
         .bytesConsumed(this.bytes)
         .elapsedMs(this.elapsed)
         .isCancelled(sink.isCancelled())
-        .filterApplyErrors(filterApplyErrors.intValue())
+        .filterApplyErrors(filterApplyErrors)
         .messagesConsumed(this.records);
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
index 971e2f7c9c4..8f85e0a8ba2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
@@ -2,7 +2,6 @@
 
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -23,9 +22,9 @@ public class ForwardRecordEmitter
   public ForwardRecordEmitter(
       Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
       ConsumerPosition position,
-      ConsumerRecordDeserializer recordDeserializer,
+      MessagesProcessing messagesProcessing,
       PollingSettings pollingSettings) {
-    super(recordDeserializer, pollingSettings);
+    super(messagesProcessing, pollingSettings);
     this.position = position;
     this.consumerSupplier = consumerSupplier;
   }
@@ -40,6 +39,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
 
       EmptyPollsCounter emptyPolls = pollingSettings.createEmptyPollsCounter();
       while (!sink.isCancelled()
+          && !sendLimitReached()
           && !seekOperations.assignedPartitionsFullyPolled()
           && !emptyPolls.noDataEmptyPollsReached()) {
 
@@ -50,11 +50,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
         log.debug("{} records polled", records.count());
 
         for (ConsumerRecord<Bytes, Bytes> msg : records) {
-          if (!sink.isCancelled()) {
-            sendMessage(sink, msg);
-          } else {
-            break;
-          }
+          sendMessage(sink, msg);
         }
       }
       sendFinishStatsAndCompleteSink(sink);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilterStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilterStats.java
deleted file mode 100644
index 3b6df3cdea4..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilterStats.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.provectus.kafka.ui.emitter;
-
-import java.util.concurrent.atomic.AtomicLong;
-import lombok.AccessLevel;
-import lombok.Getter;
-
-public class MessageFilterStats {
-
-  @Getter(AccessLevel.PACKAGE)
-  private final AtomicLong filterApplyErrors = new AtomicLong();
-
-  public final void incrementApplyErrors() {
-    filterApplyErrors.incrementAndGet();
-  }
-
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java
new file mode 100644
index 00000000000..b6d23bc90d3
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java
@@ -0,0 +1,82 @@
+package com.provectus.kafka.ui.emitter;
+
+import com.provectus.kafka.ui.model.TopicMessageDTO;
+import com.provectus.kafka.ui.model.TopicMessageEventDTO;
+import com.provectus.kafka.ui.model.TopicMessagePhaseDTO;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import java.util.function.Predicate;
+import javax.annotation.Nullable;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.common.utils.Bytes;
+import reactor.core.publisher.FluxSink;
+
+@Slf4j
+public class MessagesProcessing {
+
+  private final ConsumingStats consumingStats = new ConsumingStats();
+  private long sentMessages = 0;
+  private int filterApplyErrors = 0;
+
+  private final ConsumerRecordDeserializer deserializer;
+  private final Predicate<TopicMessageDTO> filter;
+  private final @Nullable Integer limit;
+
+  public MessagesProcessing(ConsumerRecordDeserializer deserializer,
+                            Predicate<TopicMessageDTO> filter,
+                            @Nullable Integer limit) {
+    this.deserializer = deserializer;
+    this.filter = filter;
+    this.limit = limit;
+  }
+
+  boolean limitReached() {
+    return limit != null && sentMessages >= limit;
+  }
+
+  void sendMsg(FluxSink<TopicMessageEventDTO> sink, ConsumerRecord<Bytes, Bytes> rec) {
+    if (!sink.isCancelled() && !limitReached()) {
+      TopicMessageDTO topicMessage = deserializer.deserialize(rec);
+      try {
+        if (filter.test(topicMessage)) {
+          sink.next(
+              new TopicMessageEventDTO()
+                  .type(TopicMessageEventDTO.TypeEnum.MESSAGE)
+                  .message(topicMessage)
+          );
+          sentMessages++;
+        }
+      } catch (Exception e) {
+        filterApplyErrors++;
+        log.trace("Error applying filter for message {}", topicMessage);
+      }
+    }
+  }
+
+  int sentConsumingInfo(FluxSink<TopicMessageEventDTO> sink,
+                        ConsumerRecords<Bytes, Bytes> polledRecords,
+                        long elapsed) {
+    if (!sink.isCancelled()) {
+      return consumingStats.sendConsumingEvt(sink, polledRecords, elapsed, filterApplyErrors);
+    }
+    return 0;
+  }
+
+  void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink) {
+    if (!sink.isCancelled()) {
+      consumingStats.sendFinishEvent(sink, filterApplyErrors);
+    }
+  }
+
+  void sendPhase(FluxSink<TopicMessageEventDTO> sink, String name) {
+    if (!sink.isCancelled()) {
+      sink.next(
+          new TopicMessageEventDTO()
+              .type(TopicMessageEventDTO.TypeEnum.PHASE)
+              .phase(new TopicMessagePhaseDTO().name(name))
+      );
+    }
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
index 4554069c1c9..b17d69a09b4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
@@ -2,7 +2,6 @@
 
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import java.util.HashMap;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
@@ -20,9 +19,9 @@ public class TailingEmitter extends AbstractEmitter
 
   public TailingEmitter(Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
                         ConsumerPosition consumerPosition,
-                        ConsumerRecordDeserializer recordDeserializer,
+                        MessagesProcessing messagesProcessing,
                         PollingSettings pollingSettings) {
-    super(recordDeserializer, pollingSettings);
+    super(messagesProcessing, pollingSettings);
     this.consumerSupplier = consumerSupplier;
     this.consumerPosition = consumerPosition;
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index 27f751ac80a..4f9f0f59f4b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -3,9 +3,8 @@
 import com.google.common.util.concurrent.RateLimiter;
 import com.provectus.kafka.ui.emitter.BackwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
-import com.provectus.kafka.ui.emitter.MessageFilterStats;
 import com.provectus.kafka.ui.emitter.MessageFilters;
-import com.provectus.kafka.ui.emitter.ResultSizeLimiter;
+import com.provectus.kafka.ui.emitter.MessagesProcessing;
 import com.provectus.kafka.ui.emitter.TailingEmitter;
 import com.provectus.kafka.ui.exception.TopicNotFoundException;
 import com.provectus.kafka.ui.exception.ValidationException;
@@ -14,9 +13,9 @@
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.MessageFilterTypeDTO;
 import com.provectus.kafka.ui.model.SeekDirectionDTO;
+import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serde.api.Serde;
-import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
 import com.provectus.kafka.ui.util.SslPropertiesUtil;
 import java.util.List;
@@ -162,13 +161,18 @@ private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
                                                       @Nullable String valueSerde) {
 
     java.util.function.Consumer<? super FluxSink<TopicMessageEventDTO>> emitter;
-    ConsumerRecordDeserializer recordDeserializer =
-        deserializationService.deserializerFor(cluster, topic, keySerde, valueSerde);
+
+    var processing = new MessagesProcessing(
+        deserializationService.deserializerFor(cluster, topic, keySerde, valueSerde),
+        getMsgFilter(query, filterQueryType),
+        seekDirection == SeekDirectionDTO.TAILING ? null : limit
+    );
+
     if (seekDirection.equals(SeekDirectionDTO.FORWARD)) {
       emitter = new ForwardRecordEmitter(
           () -> consumerGroupService.createConsumer(cluster),
           consumerPosition,
-          recordDeserializer,
+          processing,
           cluster.getPollingSettings()
       );
     } else if (seekDirection.equals(SeekDirectionDTO.BACKWARD)) {
@@ -176,33 +180,22 @@ private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
           () -> consumerGroupService.createConsumer(cluster),
           consumerPosition,
           limit,
-          recordDeserializer,
+          processing,
           cluster.getPollingSettings()
       );
     } else {
       emitter = new TailingEmitter(
           () -> consumerGroupService.createConsumer(cluster),
           consumerPosition,
-          recordDeserializer,
+          processing,
           cluster.getPollingSettings()
       );
     }
-    MessageFilterStats filterStats = new MessageFilterStats();
     return Flux.create(emitter)
-        .contextWrite(ctx -> ctx.put(MessageFilterStats.class, filterStats))
-        .filter(getMsgFilter(query, filterQueryType, filterStats))
         .map(getDataMasker(cluster, topic))
-        .takeWhile(createTakeWhilePredicate(seekDirection, limit))
         .map(throttleUiPublish(seekDirection));
   }
 
-  private Predicate<TopicMessageEventDTO> createTakeWhilePredicate(
-      SeekDirectionDTO seekDirection, int limit) {
-    return seekDirection == SeekDirectionDTO.TAILING
-        ? evt -> true // no limit for tailing
-        : new ResultSizeLimiter(limit);
-  }
-
   private UnaryOperator<TopicMessageEventDTO> getDataMasker(KafkaCluster cluster, String topicName) {
     var keyMasker = cluster.getMasking().getMaskingFunction(topicName, Serde.Target.KEY);
     var valMasker = cluster.getMasking().getMaskingFunction(topicName, Serde.Target.VALUE);
@@ -211,32 +204,18 @@ private UnaryOperator<TopicMessageEventDTO> getDataMasker(KafkaCluster cluster,
         return evt;
       }
       return evt.message(
-        evt.getMessage()
-            .key(keyMasker.apply(evt.getMessage().getKey()))
-            .content(valMasker.apply(evt.getMessage().getContent())));
+          evt.getMessage()
+              .key(keyMasker.apply(evt.getMessage().getKey()))
+              .content(valMasker.apply(evt.getMessage().getContent())));
     };
   }
 
-  private Predicate<TopicMessageEventDTO> getMsgFilter(String query,
-                                                       MessageFilterTypeDTO filterQueryType,
-                                                       MessageFilterStats filterStats) {
+  private Predicate<TopicMessageDTO> getMsgFilter(String query,
+                                                  MessageFilterTypeDTO filterQueryType) {
     if (StringUtils.isEmpty(query)) {
       return evt -> true;
     }
-    var messageFilter = MessageFilters.createMsgFilter(query, filterQueryType);
-    return evt -> {
-      // we only apply filter for message events
-      if (evt.getType() == TopicMessageEventDTO.TypeEnum.MESSAGE) {
-        try {
-          return messageFilter.test(evt.getMessage());
-        } catch (Exception e) {
-          filterStats.incrementApplyErrors();
-          log.trace("Error applying filter '{}' for message {}", query, evt.getMessage());
-          return false;
-        }
-      }
-      return true;
-    };
+    return MessageFilters.createMsgFilter(query, filterQueryType);
   }
 
   private <T> UnaryOperator<T> throttleUiPublish(SeekDirectionDTO seekDirection) {
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
index e7b9edf834d..239f3cf994c 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
@@ -9,6 +9,7 @@
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.emitter.BackwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
+import com.provectus.kafka.ui.emitter.MessagesProcessing;
 import com.provectus.kafka.ui.emitter.PollingSettings;
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
@@ -106,12 +107,16 @@ private static ConsumerRecordDeserializer createRecordsDeserializer() {
     );
   }
 
+  private MessagesProcessing createMessagesProcessing() {
+    return new MessagesProcessing(RECORD_DESERIALIZER, msg -> true, null);
+  }
+
   @Test
   void pollNothingOnEmptyTopic() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 
@@ -119,7 +124,7 @@ void pollNothingOnEmptyTopic() {
         this::createConsumer,
         new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
         100,
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 
@@ -141,7 +146,7 @@ void pollFullTopicFromBeginning() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(BEGINNING, TOPIC, null),
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 
@@ -149,7 +154,7 @@ void pollFullTopicFromBeginning() {
         this::createConsumer,
         new ConsumerPosition(LATEST, TOPIC, null),
         PARTITIONS * MSGS_PER_PARTITION,
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 
@@ -170,7 +175,7 @@ void pollWithOffsets() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 
@@ -178,7 +183,7 @@ void pollWithOffsets() {
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
         PARTITIONS * MSGS_PER_PARTITION,
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 
@@ -215,7 +220,7 @@ void pollWithTimestamps() {
     var forwardEmitter = new ForwardRecordEmitter(
         this::createConsumer,
         new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 
@@ -223,7 +228,7 @@ void pollWithTimestamps() {
         this::createConsumer,
         new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
         PARTITIONS * MSGS_PER_PARTITION,
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 
@@ -254,7 +259,7 @@ void backwardEmitterSeekToEnd() {
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
         numMessages,
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 
@@ -280,7 +285,7 @@ void backwardEmitterSeekToBegin() {
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, offsets),
         100,
-        RECORD_DESERIALIZER,
+        createMessagesProcessing(),
         PollingSettings.createDefault()
     );
 

From ca225440d84744add5ce291ba792eccda2e2e627 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Thu, 6 Apr 2023 18:21:24 +0400
Subject: [PATCH 493/734] [FE] Get rid of "Topic analysis successfully started"
 message (#3628)

---
 kafka-ui-react-app/src/lib/hooks/api/topics.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
index 23e6d65ce37..f71299f19bb 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topics.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -314,9 +314,6 @@ export function useAnalyzeTopic(props: GetTopicDetailsRequest) {
   const client = useQueryClient();
   return useMutation(() => api.analyzeTopic(props), {
     onSuccess: () => {
-      showSuccessAlert({
-        message: `Topic analysis successfully started`,
-      });
       client.invalidateQueries(topicKeys.statistics(props));
     },
   });

From a3daa45ccb473ba77b7b5888bf0e38c32f7f65d4 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Thu, 6 Apr 2023 19:37:49 +0400
Subject: [PATCH 494/734] Display smart filters filtered stats #2680 (#3408)

* added  filterApplyErrors
* resoled show errors and message event type
---------

Co-authored-by: Oleg Shur <workshur@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 .../Topics/Topic/Messages/Filters/Filters.tsx | 18 +++++++++++++++++-
 .../Messages/Filters/FiltersContainer.ts      |  4 ++++
 .../Filters/__tests__/Filters.spec.tsx        | 19 ++++++++++++++++++-
 .../src/redux/interfaces/topic.ts             |  1 +
 .../redux/reducers/topicMessages/selectors.ts |  5 +++++
 .../topicMessages/topicMessagesSlice.ts       |  6 ++++++
 6 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index f9fa3401fc0..2941536f8bf 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -53,11 +53,13 @@ export interface FiltersProps {
   phaseMessage?: string;
   meta: TopicMessageConsuming;
   isFetching: boolean;
+  messageEventType?: string;
   addMessage(content: { message: TopicMessage; prepend: boolean }): void;
   resetMessages(): void;
   updatePhase(phase: string): void;
   updateMeta(meta: TopicMessageConsuming): void;
   setIsFetching(status: boolean): void;
+  setMessageType(messageType: string): void;
 }
 
 export interface MessageFilters {
@@ -80,13 +82,15 @@ export const SeekTypeOptions = [
 
 const Filters: React.FC<FiltersProps> = ({
   phaseMessage,
-  meta: { elapsedMs, bytesConsumed, messagesConsumed },
+  meta: { elapsedMs, bytesConsumed, messagesConsumed, filterApplyErrors },
   isFetching,
   addMessage,
   resetMessages,
   updatePhase,
   updateMeta,
   setIsFetching,
+  setMessageType,
+  messageEventType,
 }) => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
   const location = useLocation();
@@ -355,6 +359,12 @@ const Filters: React.FC<FiltersProps> = ({
           case TopicMessageEventTypeEnum.CONSUMING:
             if (consuming) updateMeta(consuming);
             break;
+          case TopicMessageEventTypeEnum.DONE:
+            if (consuming && type) {
+              setMessageType(type);
+              updateMeta(consuming);
+            }
+            break;
           default:
         }
       };
@@ -551,6 +561,7 @@ const Filters: React.FC<FiltersProps> = ({
           {seekDirection !== SeekDirection.TAILING &&
             isFetching &&
             phaseMessage}
+          {!isFetching && messageEventType}
         </S.Message>
         <S.MessageLoading isLive={isTailing}>
           <S.MessageLoadingSpinner isFetching={isFetching} />
@@ -582,6 +593,11 @@ const Filters: React.FC<FiltersProps> = ({
           </S.MetricsIcon>
           <span>{messagesConsumed} messages consumed</span>
         </S.Metric>
+        {!!filterApplyErrors && (
+          <S.Metric title="Errors">
+            <span>{filterApplyErrors} errors</span>
+          </S.Metric>
+        )}
       </S.FiltersMetrics>
     </S.FiltersWrapper>
   );
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FiltersContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FiltersContainer.ts
index 144672ee603..19dca0184bd 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FiltersContainer.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FiltersContainer.ts
@@ -6,11 +6,13 @@ import {
   updateTopicMessagesMeta,
   updateTopicMessagesPhase,
   setTopicMessagesFetchingStatus,
+  setMessageEventType,
 } from 'redux/reducers/topicMessages/topicMessagesSlice';
 import {
   getTopicMessgesMeta,
   getTopicMessgesPhase,
   getIsTopicMessagesFetching,
+  getIsTopicMessagesType,
 } from 'redux/reducers/topicMessages/selectors';
 
 import Filters from './Filters';
@@ -19,6 +21,7 @@ const mapStateToProps = (state: RootState) => ({
   phaseMessage: getTopicMessgesPhase(state),
   meta: getTopicMessgesMeta(state),
   isFetching: getIsTopicMessagesFetching(state),
+  messageEventType: getIsTopicMessagesType(state),
 });
 
 const mapDispatchToProps = {
@@ -27,6 +30,7 @@ const mapDispatchToProps = {
   updatePhase: updateTopicMessagesPhase,
   updateMeta: updateTopicMessagesMeta,
   setIsFetching: setTopicMessagesFetchingStatus,
+  setMessageType: setMessageEventType,
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(Filters);
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
index e248fdeaeb8..3e75f117874 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/Filters.spec.tsx
@@ -44,13 +44,17 @@ const renderComponent = (
     <WithRoute path={clusterTopicPath()}>
       <TopicMessagesContext.Provider value={ctx}>
         <Filters
-          meta={{}}
+          meta={{
+            filterApplyErrors: 10,
+          }}
           isFetching={false}
           addMessage={jest.fn()}
           resetMessages={jest.fn()}
           updatePhase={jest.fn()}
           updateMeta={jest.fn()}
           setIsFetching={jest.fn()}
+          setMessageType={jest.fn}
+          messageEventType="Done"
           {...props}
         />
       </TopicMessagesContext.Provider>
@@ -228,4 +232,17 @@ describe('Filters component', () => {
       expect(anotherSmartFilterElement).not.toBeInTheDocument();
     });
   });
+
+  describe('show errors when get an filterApplyErrors and message event type', () => {
+    it('show errors', () => {
+      renderComponent();
+      const errors = screen.getByText('10 errors');
+      expect(errors).toBeInTheDocument();
+    });
+    it('message event type when fetching is false ', () => {
+      renderComponent();
+      const messageType = screen.getByText('Done');
+      expect(messageType).toBeInTheDocument();
+    });
+  });
 });
diff --git a/kafka-ui-react-app/src/redux/interfaces/topic.ts b/kafka-ui-react-app/src/redux/interfaces/topic.ts
index 9f667e135e8..153002240a1 100644
--- a/kafka-ui-react-app/src/redux/interfaces/topic.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/topic.ts
@@ -56,5 +56,6 @@ export interface TopicMessagesState {
   messages: TopicMessage[];
   phase?: string;
   meta: TopicMessageConsuming;
+  messageEventType?: string;
   isFetching: boolean;
 }
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/selectors.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/selectors.ts
index 03adca8e424..b2636cdf2ad 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/selectors.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/selectors.ts
@@ -23,3 +23,8 @@ export const getIsTopicMessagesFetching = createSelector(
   topicMessagesState,
   ({ isFetching }) => isFetching
 );
+
+export const getIsTopicMessagesType = createSelector(
+  topicMessagesState,
+  ({ messageEventType }) => messageEventType
+);
diff --git a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
index 846cbd0c978..530a3781140 100644
--- a/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
+++ b/kafka-ui-react-app/src/redux/reducers/topicMessages/topicMessagesSlice.ts
@@ -10,6 +10,7 @@ export const initialState: TopicMessagesState = {
     messagesConsumed: 0,
     isCancelled: false,
   },
+  messageEventType: '',
   isFetching: false,
 };
 
@@ -37,6 +38,10 @@ const topicMessagesSlice = createSlice({
     setTopicMessagesFetchingStatus: (state, action) => {
       state.isFetching = action.payload;
     },
+
+    setMessageEventType: (state, action) => {
+      state.messageEventType = action.payload;
+    },
   },
 });
 
@@ -46,6 +51,7 @@ export const {
   updateTopicMessagesPhase,
   updateTopicMessagesMeta,
   setTopicMessagesFetchingStatus,
+  setMessageEventType,
 } = topicMessagesSlice.actions;
 
 export default topicMessagesSlice.reducer;

From 7a47e6e8ba918d33f08180749980bb939226cb1d Mon Sep 17 00:00:00 2001
From: Nisan Ohana <78907315+nisanohana3@users.noreply.github.com>
Date: Fri, 7 Apr 2023 14:03:56 +0300
Subject: [PATCH 495/734] [Infra] Add devcontainer configuration file (#3603)

* Add devcontainer configuration file

* Allow development using github codespace with pre-configuration of the needed dependencies

Signed-off-by: Nisan Ohana <78907315+nisanohana3@users.noreply.github.com>

* Add pull request extention

---------

Signed-off-by: Nisan Ohana <78907315+nisanohana3@users.noreply.github.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .devcontainer/devcontainer.json | 36 +++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000000..74f5825021a
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,36 @@
+{
+	"name": "Java",
+
+	"image": "mcr.microsoft.com/devcontainers/java:0-17",
+
+	"features": {
+		"ghcr.io/devcontainers/features/java:1": {
+			"version": "none",
+			"installMaven": "true",
+			"installGradle": "false"
+		},
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {}
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "java -version",
+
+	"customizations": {
+		"vscode": {
+			"extensions" : [
+				"vscjava.vscode-java-pack",
+				"vscjava.vscode-maven",
+				"vscjava.vscode-java-debug",
+				"EditorConfig.EditorConfig",
+				"ms-azuretools.vscode-docker",
+				"antfu.vite",
+				"ms-kubernetes-tools.vscode-kubernetes-tools",
+                "github.vscode-pull-request-github"
+			]
+		}
+	}
+
+}

From ee1cd72dd5b6b74f8d856e4ed9135850ebc12e10 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 7 Apr 2023 17:31:04 +0400
Subject: [PATCH 496/734] ISSUE-3144: CVE fixes, Springboot upd (#3624)

* ISSUE-3144: Spring boot version bump to 3.0.5, snakeyaml upd
* explicit spring security dependency removed
* openapi plugin updated to 6.5
* Some javax.annotation imports migrated to jakarta.annotation
* base container sha specified
* Update CognitoAuthorityExtractor
---
 kafka-ui-api/Dockerfile                       |   3 +-
 .../ui/client/RetryingKafkaConnectClient.java | 212 +++++++++++++++---
 .../kafka/ui/config/ClustersProperties.java   |   2 +-
 .../kafka/ui/config/auth/OAuthProperties.java |   2 +-
 .../ui/controller/KafkaConnectController.java |  10 +-
 .../GlobalErrorWebExceptionHandler.java       |   2 +-
 .../ui/service/KafkaConfigSanitizer.java      |  65 ++++--
 .../kafka/ui/service/KafkaConnectService.java |   8 +-
 .../service/analyze/TopicAnalysisStats.java   |   6 +-
 .../ui/service/rbac/AccessControlService.java |   2 +-
 .../extractor/CognitoAuthorityExtractor.java  |   7 +-
 .../kafka/ui/AbstractIntegrationTest.java     |   4 +-
 .../ui/service/KafkaConfigSanitizerTest.java  |   9 +-
 .../ui/service/ksql/KsqlServiceV2Test.java    |   3 -
 kafka-ui-contract/pom.xml                     |  36 ++-
 .../main/resources/swagger/kafka-ui-api.yaml  |   4 +
 pom.xml                                       |  30 +--
 17 files changed, 276 insertions(+), 129 deletions(-)

diff --git a/kafka-ui-api/Dockerfile b/kafka-ui-api/Dockerfile
index fcd29c0f069..d969ec76315 100644
--- a/kafka-ui-api/Dockerfile
+++ b/kafka-ui-api/Dockerfile
@@ -1,4 +1,5 @@
-FROM azul/zulu-openjdk-alpine:17-jre
+#FROM azul/zulu-openjdk-alpine:17-jre-headless
+FROM azul/zulu-openjdk-alpine@sha256:a36679ac0d28cb835e2a8c00e1e0d95509c6c51c5081c7782b85edb1f37a771a
 
 RUN apk add --no-cache gcompat # need to make snappy codec work
 RUN addgroup -S kafkaui && adduser -S kafkaui -G kafkaui
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
index 5ec5a779d3c..74b9485008e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
@@ -6,7 +6,13 @@
 import com.provectus.kafka.ui.connect.ApiClient;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
 import com.provectus.kafka.ui.connect.model.Connector;
+import com.provectus.kafka.ui.connect.model.ConnectorPlugin;
+import com.provectus.kafka.ui.connect.model.ConnectorPluginConfigValidationResponse;
+import com.provectus.kafka.ui.connect.model.ConnectorStatus;
+import com.provectus.kafka.ui.connect.model.ConnectorTask;
+import com.provectus.kafka.ui.connect.model.ConnectorTopics;
 import com.provectus.kafka.ui.connect.model.NewConnector;
+import com.provectus.kafka.ui.connect.model.TaskStatus;
 import com.provectus.kafka.ui.exception.KafkaConnectConflictReponseException;
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.util.WebClientConfigurator;
@@ -15,11 +21,7 @@
 import java.util.Map;
 import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.util.MultiValueMap;
+import org.springframework.http.ResponseEntity;
 import org.springframework.util.unit.DataSize;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -79,6 +81,176 @@ public Mono<Connector> setConnectorConfig(String connectorName, Map<String, Obje
     );
   }
 
+  @Override
+  public Mono<ResponseEntity<Connector>> createConnectorWithHttpInfo(NewConnector newConnector)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.createConnectorWithHttpInfo(newConnector));
+  }
+
+  @Override
+  public Mono<Void> deleteConnector(String connectorName) throws WebClientResponseException {
+    return withRetryOnConflict(super.deleteConnector(connectorName));
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> deleteConnectorWithHttpInfo(String connectorName)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.deleteConnectorWithHttpInfo(connectorName));
+  }
+
+
+  @Override
+  public Mono<Connector> getConnector(String connectorName) throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnector(connectorName));
+  }
+
+  @Override
+  public Mono<ResponseEntity<Connector>> getConnectorWithHttpInfo(String connectorName)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorWithHttpInfo(connectorName));
+  }
+
+  @Override
+  public Mono<Map<String, Object>> getConnectorConfig(String connectorName) throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorConfig(connectorName));
+  }
+
+  @Override
+  public Mono<ResponseEntity<Map<String, Object>>> getConnectorConfigWithHttpInfo(String connectorName)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorConfigWithHttpInfo(connectorName));
+  }
+
+  @Override
+  public Flux<ConnectorPlugin> getConnectorPlugins() throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorPlugins());
+  }
+
+  @Override
+  public Mono<ResponseEntity<List<ConnectorPlugin>>> getConnectorPluginsWithHttpInfo()
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorPluginsWithHttpInfo());
+  }
+
+  @Override
+  public Mono<ConnectorStatus> getConnectorStatus(String connectorName) throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorStatus(connectorName));
+  }
+
+  @Override
+  public Mono<ResponseEntity<ConnectorStatus>> getConnectorStatusWithHttpInfo(String connectorName)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorStatusWithHttpInfo(connectorName));
+  }
+
+  @Override
+  public Mono<TaskStatus> getConnectorTaskStatus(String connectorName, Integer taskId)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorTaskStatus(connectorName, taskId));
+  }
+
+  @Override
+  public Mono<ResponseEntity<TaskStatus>> getConnectorTaskStatusWithHttpInfo(String connectorName, Integer taskId)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorTaskStatusWithHttpInfo(connectorName, taskId));
+  }
+
+  @Override
+  public Flux<ConnectorTask> getConnectorTasks(String connectorName) throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorTasks(connectorName));
+  }
+
+  @Override
+  public Mono<ResponseEntity<List<ConnectorTask>>> getConnectorTasksWithHttpInfo(String connectorName)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorTasksWithHttpInfo(connectorName));
+  }
+
+  @Override
+  public Mono<Map<String, ConnectorTopics>> getConnectorTopics(String connectorName) throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorTopics(connectorName));
+  }
+
+  @Override
+  public Mono<ResponseEntity<Map<String, ConnectorTopics>>> getConnectorTopicsWithHttpInfo(String connectorName)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorTopicsWithHttpInfo(connectorName));
+  }
+
+  @Override
+  public Flux<String> getConnectors(String search) throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectors(search));
+  }
+
+  @Override
+  public Mono<ResponseEntity<List<String>>> getConnectorsWithHttpInfo(String search) throws WebClientResponseException {
+    return withRetryOnConflict(super.getConnectorsWithHttpInfo(search));
+  }
+
+  @Override
+  public Mono<Void> pauseConnector(String connectorName) throws WebClientResponseException {
+    return withRetryOnConflict(super.pauseConnector(connectorName));
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> pauseConnectorWithHttpInfo(String connectorName) throws WebClientResponseException {
+    return withRetryOnConflict(super.pauseConnectorWithHttpInfo(connectorName));
+  }
+
+  @Override
+  public Mono<Void> restartConnector(String connectorName, Boolean includeTasks, Boolean onlyFailed)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.restartConnector(connectorName, includeTasks, onlyFailed));
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> restartConnectorWithHttpInfo(String connectorName, Boolean includeTasks,
+                                                                 Boolean onlyFailed) throws WebClientResponseException {
+    return withRetryOnConflict(super.restartConnectorWithHttpInfo(connectorName, includeTasks, onlyFailed));
+  }
+
+  @Override
+  public Mono<Void> restartConnectorTask(String connectorName, Integer taskId) throws WebClientResponseException {
+    return withRetryOnConflict(super.restartConnectorTask(connectorName, taskId));
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> restartConnectorTaskWithHttpInfo(String connectorName, Integer taskId)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.restartConnectorTaskWithHttpInfo(connectorName, taskId));
+  }
+
+  @Override
+  public Mono<Void> resumeConnector(String connectorName) throws WebClientResponseException {
+    return super.resumeConnector(connectorName);
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> resumeConnectorWithHttpInfo(String connectorName)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.resumeConnectorWithHttpInfo(connectorName));
+  }
+
+  @Override
+  public Mono<ResponseEntity<Connector>> setConnectorConfigWithHttpInfo(String connectorName,
+                                                                        Map<String, Object> requestBody)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.setConnectorConfigWithHttpInfo(connectorName, requestBody));
+  }
+
+  @Override
+  public Mono<ConnectorPluginConfigValidationResponse> validateConnectorPluginConfig(String pluginName,
+                                                                                     Map<String, Object> requestBody)
+      throws WebClientResponseException {
+    return withRetryOnConflict(super.validateConnectorPluginConfig(pluginName, requestBody));
+  }
+
+  @Override
+  public Mono<ResponseEntity<ConnectorPluginConfigValidationResponse>> validateConnectorPluginConfigWithHttpInfo(
+      String pluginName, Map<String, Object> requestBody) throws WebClientResponseException {
+    return withRetryOnConflict(super.validateConnectorPluginConfigWithHttpInfo(pluginName, requestBody));
+  }
+
   private static class RetryingApiClient extends ApiClient {
 
     public RetryingApiClient(ConnectCluster config,
@@ -108,35 +280,5 @@ public static WebClient buildWebClient(DataSize maxBuffSize,
           .configureBufferSize(maxBuffSize)
           .build();
     }
-
-    @Override
-    public <T> Mono<T> invokeAPI(String path, HttpMethod method, Map<String, Object> pathParams,
-                                 MultiValueMap<String, String> queryParams, Object body,
-                                 HttpHeaders headerParams,
-                                 MultiValueMap<String, String> cookieParams,
-                                 MultiValueMap<String, Object> formParams, List<MediaType> accept,
-                                 MediaType contentType, String[] authNames,
-                                 ParameterizedTypeReference<T> returnType)
-        throws RestClientException {
-      return withRetryOnConflict(
-          super.invokeAPI(path, method, pathParams, queryParams, body, headerParams, cookieParams,
-              formParams, accept, contentType, authNames, returnType)
-      );
-    }
-
-    @Override
-    public <T> Flux<T> invokeFluxAPI(String path, HttpMethod method, Map<String, Object> pathParams,
-                                     MultiValueMap<String, String> queryParams, Object body,
-                                     HttpHeaders headerParams,
-                                     MultiValueMap<String, String> cookieParams,
-                                     MultiValueMap<String, Object> formParams,
-                                     List<MediaType> accept, MediaType contentType,
-                                     String[] authNames, ParameterizedTypeReference<T> returnType)
-        throws RestClientException {
-      return withRetryOnConflict(
-          super.invokeFluxAPI(path, method, pathParams, queryParams, body, headerParams,
-              cookieParams, formParams, accept, contentType, authNames, returnType)
-      );
-    }
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 919e0633e4f..15436c1cd8b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.config;
 
 import com.provectus.kafka.ui.model.MetricsConfig;
+import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -8,7 +9,6 @@
 import java.util.Map;
 import java.util.Set;
 import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
index f79d217fa79..a76403bf707 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
@@ -1,9 +1,9 @@
 package com.provectus.kafka.ui.config.auth;
 
+import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.PostConstruct;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index 9ffd901c078..080c6020f9b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -149,10 +149,9 @@ public Mono<ResponseEntity<Map<String, Object>>> getConnectorConfig(String clust
   }
 
   @Override
-  public Mono<ResponseEntity<ConnectorDTO>> setConnectorConfig(String clusterName,
-                                                               String connectName,
+  public Mono<ResponseEntity<ConnectorDTO>> setConnectorConfig(String clusterName, String connectName,
                                                                String connectorName,
-                                                               @Valid Mono<Object> requestBody,
+                                                               Mono<Map<String, Object>> requestBody,
                                                                ServerWebExchange exchange) {
 
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
@@ -164,8 +163,7 @@ public Mono<ResponseEntity<ConnectorDTO>> setConnectorConfig(String clusterName,
     return validateAccess.then(
         kafkaConnectService
             .setConnectorConfig(getCluster(clusterName), connectName, connectorName, requestBody)
-            .map(ResponseEntity::ok)
-    );
+            .map(ResponseEntity::ok));
   }
 
   @Override
@@ -242,7 +240,7 @@ public Mono<ResponseEntity<Flux<ConnectorPluginDTO>>> getConnectorPlugins(
 
   @Override
   public Mono<ResponseEntity<ConnectorPluginConfigValidationResponseDTO>> validateConnectorPluginConfig(
-      String clusterName, String connectName, String pluginName, @Valid Mono<Object> requestBody,
+      String clusterName, String connectName, String pluginName, @Valid Mono<Map<String, Object>> requestBody,
       ServerWebExchange exchange) {
     return kafkaConnectService
         .validateConnectorPluginConfig(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/GlobalErrorWebExceptionHandler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/GlobalErrorWebExceptionHandler.java
index 394e2aa730b..8ad83fe47dd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/GlobalErrorWebExceptionHandler.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/GlobalErrorWebExceptionHandler.java
@@ -134,7 +134,7 @@ private Mono<ServerResponse> render(ResponseStatusException exception, ServerReq
         .timestamp(currentTimestamp())
         .stackTrace(Throwables.getStackTraceAsString(exception));
     return ServerResponse
-        .status(exception.getStatus())
+        .status(exception.getStatusCode())
         .contentType(MediaType.APPLICATION_JSON)
         .bodyValue(response);
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java
index aa267098226..375afb0fefd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java
@@ -1,38 +1,58 @@
 package com.provectus.kafka.ui.service;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
+import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
-import java.util.HashSet;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.common.config.SaslConfigs;
 import org.apache.kafka.common.config.SslConfigs;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.actuate.endpoint.Sanitizer;
 import org.springframework.stereotype.Component;
 
 @Component
-class KafkaConfigSanitizer extends Sanitizer {
-  private static final List<String> DEFAULT_PATTERNS_TO_SANITIZE = Arrays.asList(
-      "basic.auth.user.info",  /* For Schema Registry credentials */
-      "password", "secret", "token", "key", ".*credentials.*",   /* General credential patterns */
-      "aws.access.*", "aws.secret.*", "aws.session.*"   /* AWS-related credential patterns */
-  );
+class KafkaConfigSanitizer  {
+
+  private static final String SANITIZED_VALUE = "******";
+
+  private static final String[] REGEX_PARTS = {"*", "$", "^", "+"};
+
+  private static final List<String> DEFAULT_PATTERNS_TO_SANITIZE = ImmutableList.<String>builder()
+      .addAll(kafkaConfigKeysToSanitize())
+      .add(
+          "basic.auth.user.info",  /* For Schema Registry credentials */
+          "password", "secret", "token", "key", ".*credentials.*",   /* General credential patterns */
+          "aws.access.*", "aws.secret.*", "aws.session.*"   /* AWS-related credential patterns */
+      )
+      .build();
+
+  private final List<Pattern> sanitizeKeysPatterns;
 
   KafkaConfigSanitizer(
       @Value("${kafka.config.sanitizer.enabled:true}") boolean enabled,
       @Value("${kafka.config.sanitizer.patterns:}") List<String> patternsToSanitize
   ) {
-    if (!enabled) {
-      setKeysToSanitize();
-    } else {
-      var keysToSanitize = new HashSet<>(
-          patternsToSanitize.isEmpty() ? DEFAULT_PATTERNS_TO_SANITIZE : patternsToSanitize);
-      keysToSanitize.addAll(kafkaConfigKeysToSanitize());
-      setKeysToSanitize(keysToSanitize.toArray(new String[] {}));
-    }
+    this.sanitizeKeysPatterns = enabled
+        ? compile(patternsToSanitize.isEmpty() ? DEFAULT_PATTERNS_TO_SANITIZE : patternsToSanitize)
+        : List.of();
+  }
+
+  private static List<Pattern> compile(Collection<String> patternStrings) {
+    return patternStrings.stream()
+        .map(p -> isRegex(p)
+            ? Pattern.compile(p, CASE_INSENSITIVE)
+            : Pattern.compile(".*" + p + "$", CASE_INSENSITIVE))
+        .toList();
+  }
+
+  private static boolean isRegex(String str) {
+    return Arrays.stream(REGEX_PARTS).anyMatch(str::contains);
   }
 
   private static Set<String> kafkaConfigKeysToSanitize() {
@@ -45,4 +65,17 @@ private static Set<String> kafkaConfigKeysToSanitize() {
         .collect(Collectors.toSet());
   }
 
+  public Object sanitize(String key, Object value) {
+    if (value == null) {
+      return null;
+    }
+    for (Pattern pattern : sanitizeKeysPatterns) {
+      if (pattern.matcher(key).matches()) {
+        return SANITIZED_VALUE;
+      }
+    }
+    return value;
+  }
+
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
index 163732fae9f..d07ef7ed2dd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
@@ -225,11 +225,11 @@ public Mono<Map<String, Object>> getConnectorConfig(KafkaCluster cluster, String
   }
 
   public Mono<ConnectorDTO> setConnectorConfig(KafkaCluster cluster, String connectName,
-                                               String connectorName, Mono<Object> requestBody) {
+                                               String connectorName, Mono<Map<String, Object>> requestBody) {
     return api(cluster, connectName)
         .mono(c ->
             requestBody
-                .flatMap(body -> c.setConnectorConfig(connectorName, (Map<String, Object>) body))
+                .flatMap(body -> c.setConnectorConfig(connectorName, body))
                 .map(kafkaConnectMapper::fromClient));
   }
 
@@ -298,12 +298,12 @@ public Flux<ConnectorPluginDTO> getConnectorPlugins(KafkaCluster cluster,
   }
 
   public Mono<ConnectorPluginConfigValidationResponseDTO> validateConnectorPluginConfig(
-      KafkaCluster cluster, String connectName, String pluginName, Mono<Object> requestBody) {
+      KafkaCluster cluster, String connectName, String pluginName, Mono<Map<String, Object>> requestBody) {
     return api(cluster, connectName)
         .mono(client ->
             requestBody
                 .flatMap(body ->
-                    client.validateConnectorPluginConfig(pluginName, (Map<String, Object>) body))
+                    client.validateConnectorPluginConfig(pluginName, body))
                 .map(kafkaConnectMapper::fromClient)
         );
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java
index 2d8e0dc38f8..d5b4400807d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java
@@ -2,7 +2,7 @@
 
 import com.provectus.kafka.ui.model.TopicAnalysisSizeStatsDTO;
 import com.provectus.kafka.ui.model.TopicAnalysisStatsDTO;
-import com.provectus.kafka.ui.model.TopicAnalysisStatsHourlyMsgCountsDTO;
+import com.provectus.kafka.ui.model.TopicAnalysisStatsHourlyMsgCountsInnerDTO;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Comparator;
@@ -78,10 +78,10 @@ void apply(ConsumerRecord<?, ?> rec) {
       }
     }
 
-    List<TopicAnalysisStatsHourlyMsgCountsDTO> toDto() {
+    List<TopicAnalysisStatsHourlyMsgCountsInnerDTO> toDto() {
       return hourlyStats.entrySet().stream()
           .sorted(Comparator.comparingLong(Map.Entry::getKey))
-          .map(e -> new TopicAnalysisStatsHourlyMsgCountsDTO()
+          .map(e -> new TopicAnalysisStatsHourlyMsgCountsInnerDTO()
               .hourStart(e.getKey())
               .count(e.getValue()))
           .collect(Collectors.toList());
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index ee17d211117..3178feae34c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -21,6 +21,7 @@
 import com.provectus.kafka.ui.service.rbac.extractor.GoogleAuthorityExtractor;
 import com.provectus.kafka.ui.service.rbac.extractor.LdapAuthorityExtractor;
 import com.provectus.kafka.ui.service.rbac.extractor.ProviderAuthorityExtractor;
+import jakarta.annotation.PostConstruct;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -28,7 +29,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
index a10e0829cc9..f7da0a19dba 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
@@ -1,9 +1,9 @@
 package com.provectus.kafka.ui.service.rbac.extractor;
 
-import com.nimbusds.jose.shaded.json.JSONArray;
 import com.provectus.kafka.ui.model.rbac.Role;
 import com.provectus.kafka.ui.model.rbac.provider.Provider;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -44,7 +44,7 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
         .map(Role::getName)
         .collect(Collectors.toSet());
 
-    JSONArray groups = principal.getAttribute(COGNITO_GROUPS_ATTRIBUTE_NAME);
+    List<String> groups = principal.getAttribute(COGNITO_GROUPS_ATTRIBUTE_NAME);
     if (groups == null) {
       log.debug("Cognito groups param is not present");
       return Mono.just(groupsByUsername);
@@ -56,9 +56,8 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
             .stream()
             .filter(s -> s.getProvider().equals(Provider.OAUTH_COGNITO))
             .filter(s -> s.getType().equals("group"))
-            .anyMatch(subject -> Stream.of(groups.toArray())
+            .anyMatch(subject -> Stream.of(groups)
                 .map(Object::toString)
-                .distinct()
                 .anyMatch(cognitoGroup -> cognitoGroup.equals(subject.getValue()))
             ))
         .map(Role::getName)
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
index a30e45fb3ed..dbdfb67fd59 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
@@ -16,7 +16,7 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.util.SocketUtils;
+import org.springframework.test.util.TestSocketUtils;
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.utility.DockerImageName;
@@ -61,7 +61,7 @@ public void initialize(@NotNull ConfigurableApplicationContext context) {
       System.setProperty("kafka.clusters.0.bootstrapServers", kafka.getBootstrapServers());
       // List unavailable hosts to verify failover
       System.setProperty("kafka.clusters.0.schemaRegistry", String.format("http://localhost:%1$s,http://localhost:%1$s,%2$s",
-              SocketUtils.findAvailableTcpPort(), schemaRegistry.getUrl()));
+              TestSocketUtils.findAvailableTcpPort(), schemaRegistry.getUrl()));
       System.setProperty("kafka.clusters.0.kafkaConnect.0.name", "kafka-connect");
       System.setProperty("kafka.clusters.0.kafkaConnect.0.userName", "kafka-connect");
       System.setProperty("kafka.clusters.0.kafkaConnect.0.password", "kafka-connect");
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java
index 232e1d37035..6454cd9f2a4 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java
@@ -5,13 +5,12 @@
 import java.util.Arrays;
 import java.util.Collections;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.actuate.endpoint.Sanitizer;
 
 class KafkaConfigSanitizerTest {
 
   @Test
   void doNothingIfEnabledPropertySetToFalse() {
-    final Sanitizer sanitizer = new KafkaConfigSanitizer(false, Collections.emptyList());
+    final var sanitizer = new KafkaConfigSanitizer(false, Collections.emptyList());
     assertThat(sanitizer.sanitize("password", "secret")).isEqualTo("secret");
     assertThat(sanitizer.sanitize("sasl.jaas.config", "secret")).isEqualTo("secret");
     assertThat(sanitizer.sanitize("database.password", "secret")).isEqualTo("secret");
@@ -19,7 +18,7 @@ void doNothingIfEnabledPropertySetToFalse() {
 
   @Test
   void obfuscateCredentials() {
-    final Sanitizer sanitizer = new KafkaConfigSanitizer(true, Collections.emptyList());
+    final var sanitizer = new KafkaConfigSanitizer(true, Collections.emptyList());
     assertThat(sanitizer.sanitize("sasl.jaas.config", "secret")).isEqualTo("******");
     assertThat(sanitizer.sanitize("consumer.sasl.jaas.config", "secret")).isEqualTo("******");
     assertThat(sanitizer.sanitize("producer.sasl.jaas.config", "secret")).isEqualTo("******");
@@ -37,7 +36,7 @@ void obfuscateCredentials() {
 
   @Test
   void notObfuscateNormalConfigs() {
-    final Sanitizer sanitizer = new KafkaConfigSanitizer(true, Collections.emptyList());
+    final var sanitizer = new KafkaConfigSanitizer(true, Collections.emptyList());
     assertThat(sanitizer.sanitize("security.protocol", "SASL_SSL")).isEqualTo("SASL_SSL");
     final String[] bootstrapServer = new String[] {"test1:9092", "test2:9092"};
     assertThat(sanitizer.sanitize("bootstrap.servers", bootstrapServer)).isEqualTo(bootstrapServer);
@@ -45,7 +44,7 @@ void notObfuscateNormalConfigs() {
 
   @Test
   void obfuscateCredentialsWithDefinedPatterns() {
-    final Sanitizer sanitizer = new KafkaConfigSanitizer(true, Arrays.asList("kafka.ui", ".*test.*"));
+    final var sanitizer = new KafkaConfigSanitizer(true, Arrays.asList("kafka.ui", ".*test.*"));
     assertThat(sanitizer.sanitize("consumer.kafka.ui", "secret")).isEqualTo("******");
     assertThat(sanitizer.sanitize("this.is.test.credentials", "secret")).isEqualTo("******");
     assertThat(sanitizer.sanitize("this.is.not.credential", "not.credential"))
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
index b4a48d38790..afa3700c0fa 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
@@ -15,7 +15,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.unit.DataSize;
 import org.testcontainers.utility.DockerImageName;
 
 class KsqlServiceV2Test extends AbstractIntegrationTest {
@@ -27,8 +26,6 @@ class KsqlServiceV2Test extends AbstractIntegrationTest {
   private static final Set<String> STREAMS_TO_DELETE = new CopyOnWriteArraySet<>();
   private static final Set<String> TABLES_TO_DELETE = new CopyOnWriteArraySet<>();
 
-  private static final DataSize maxBuffSize = DataSize.ofMegabytes(20);
-
   @BeforeAll
   static void init() {
     KSQL_DB.start();
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index 5f6cb58b7d7..f99f20d3d81 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -27,20 +27,24 @@
                     <artifactId>spring-boot-starter-validation</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-annotations</artifactId>
-                    <version>${swagger-annotations.version}</version>
+                    <groupId>io.swagger.core.v3</groupId>
+                    <artifactId>swagger-integration-jakarta</artifactId>
+                    <version>2.2.8</version>
                 </dependency>
                 <dependency>
                     <groupId>org.openapitools</groupId>
                     <artifactId>jackson-databind-nullable</artifactId>
-                    <version>${jackson-databind-nullable.version}</version>
+                    <version>0.2.4</version>
                 </dependency>
                 <dependency>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>jsr305</artifactId>
-                    <version>3.0.2</version>
-                    <scope>provided</scope>
+                    <groupId>jakarta.annotation</groupId>
+                    <artifactId>jakarta.annotation-api</artifactId>
+                    <version>2.1.1</version>
+                </dependency>
+                <dependency>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>javax.annotation-api</artifactId>
+                    <version>1.3.2</version>
                 </dependency>
             </dependencies>
 
@@ -71,6 +75,7 @@
                                         <library>webclient</library>
                                         <useBeanValidation>true</useBeanValidation>
                                         <dateLibrary>java8</dateLibrary>
+                                        <useJakartaEe>true</useJakartaEe>
                                     </configOptions>
                                 </configuration>
                             </execution>
@@ -80,8 +85,7 @@
                                     <goal>generate</goal>
                                 </goals>
                                 <configuration>
-                                    <inputSpec>${project.basedir}/src/main/resources/swagger/kafka-ui-api.yaml
-                                    </inputSpec>
+                                    <inputSpec>${project.basedir}/src/main/resources/swagger/kafka-ui-api.yaml</inputSpec>
                                     <output>${project.build.directory}/generated-sources/api</output>
                                     <generatorName>spring</generatorName>
                                     <modelNameSuffix>DTO</modelNameSuffix>
@@ -89,14 +93,12 @@
                                         <modelPackage>com.provectus.kafka.ui.model</modelPackage>
                                         <apiPackage>com.provectus.kafka.ui.api</apiPackage>
                                         <sourceFolder>kafka-ui-contract</sourceFolder>
-
                                         <reactive>true</reactive>
-
                                         <interfaceOnly>true</interfaceOnly>
                                         <skipDefaultInterface>true</skipDefaultInterface>
                                         <useBeanValidation>true</useBeanValidation>
                                         <useTags>true</useTags>
-
+                                        <useSpringBoot3>true</useSpringBoot3>
                                         <dateLibrary>java8</dateLibrary>
                                     </configOptions>
                                     <typeMappings>
@@ -116,15 +118,13 @@
                                     <generatorName>java</generatorName>
                                     <generateApiTests>false</generateApiTests>
                                     <generateModelTests>false</generateModelTests>
-
                                     <configOptions>
                                         <modelPackage>com.provectus.kafka.ui.connect.model</modelPackage>
                                         <apiPackage>com.provectus.kafka.ui.connect.api</apiPackage>
                                         <sourceFolder>kafka-connect-client</sourceFolder>
-
                                         <asyncNative>true</asyncNative>
                                         <library>webclient</library>
-
+                                        <useJakartaEe>true</useJakartaEe>
                                         <useBeanValidation>true</useBeanValidation>
                                         <dateLibrary>java8</dateLibrary>
                                     </configOptions>
@@ -142,15 +142,13 @@
                                     <generatorName>java</generatorName>
                                     <generateApiTests>false</generateApiTests>
                                     <generateModelTests>false</generateModelTests>
-
                                     <configOptions>
                                         <modelPackage>com.provectus.kafka.ui.sr.model</modelPackage>
                                         <apiPackage>com.provectus.kafka.ui.sr.api</apiPackage>
                                         <sourceFolder>kafka-sr-client</sourceFolder>
-
                                         <asyncNative>true</asyncNative>
                                         <library>webclient</library>
-
+                                        <useJakartaEe>true</useJakartaEe>
                                         <useBeanValidation>true</useBeanValidation>
                                         <dateLibrary>java8</dateLibrary>
                                     </configOptions>
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index fe9723b2dd3..d3b9f331366 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2387,6 +2387,10 @@ components:
         - UNKNOWN
 
     ConsumerGroup:
+      discriminator:
+        propertyName: inherit
+        mapping:
+          details: "#/components/schemas/ConsumerGroupDetails"
       type: object
       properties:
         groupId:
diff --git a/pom.xml b/pom.xml
index 3281ff183ec..a82dc723916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,17 +30,13 @@
         <datasketches-java.version>3.1.0</datasketches-java.version>
         <groovy.version>3.0.13</groovy.version>
         <jackson.version>2.14.0</jackson.version>
-        <jackson-databind-nullable.version>0.2.4</jackson-databind-nullable.version>
         <kafka-clients.version>3.3.1</kafka-clients.version>
-        <netty.version>4.1.85.Final</netty.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <org.projectlombok.version>1.18.24</org.projectlombok.version>
         <protobuf-java.version>3.21.9</protobuf-java.version>
-        <reactor-netty.version>1.1.0</reactor-netty.version>
         <scala-lang.library.version>2.13.9</scala-lang.library.version>
-        <snakeyaml.version>1.33</snakeyaml.version>
-        <spring-boot.version>2.7.5</spring-boot.version>
-        <spring-security.version>5.7.5</spring-security.version>
+        <snakeyaml.version>2.0</snakeyaml.version>
+        <spring-boot.version>3.0.5</spring-boot.version>
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
         <odd-oddrn-generator.version>0.1.15</odd-oddrn-generator.version>
         <odd-oddrn-client.version>0.1.23</odd-oddrn-client.version>
@@ -62,9 +58,8 @@
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <openapi-generator-maven-plugin.version>4.3.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>6.5.0</openapi-generator-maven-plugin.version>
         <springdoc-openapi-webflux-ui.version>1.2.32</springdoc-openapi-webflux-ui.version>
-        <swagger-annotations.version>1.6.0</swagger-annotations.version>
     </properties>
 
     <repositories>
@@ -111,20 +106,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-bom</artifactId>
-                <version>${spring-security.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-bom</artifactId>
-                <version>${netty.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
@@ -147,11 +128,6 @@
                 <artifactId>protobuf-java</artifactId>
                 <version>${protobuf-java.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.projectreactor.netty</groupId>
-                <artifactId>reactor-netty-http</artifactId>
-                <version>${reactor-netty.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>

From 5c357f94fdde5356a2126193605476194f3cfca6 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 7 Apr 2023 17:49:07 +0400
Subject: [PATCH 497/734] BE: Opt out of version check (#3570)

* Build & commit info added to /api/info endpoint
---
 .../ApplicationConfigController.java          | 13 +---
 .../ui/service/ApplicationInfoService.java    | 76 +++++++++++++++++++
 .../kafka/ui/util/GithubReleaseInfo.java      | 53 +++++++++++++
 .../kafka/ui/util/GithubReleaseInfoTest.java  | 54 +++++++++++++
 .../main/resources/swagger/kafka-ui-api.yaml  | 20 +++++
 5 files changed, 206 insertions(+), 10 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ApplicationInfoService.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/GithubReleaseInfo.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/GithubReleaseInfoTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
index b21ef10c619..571250ba947 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
@@ -13,12 +13,12 @@
 import com.provectus.kafka.ui.model.RestartRequestDTO;
 import com.provectus.kafka.ui.model.UploadedFileInfoDTO;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.service.ApplicationInfoService;
 import com.provectus.kafka.ui.service.KafkaClusterFactory;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import com.provectus.kafka.ui.util.ApplicationRestarter;
 import com.provectus.kafka.ui.util.DynamicConfigOperations;
 import com.provectus.kafka.ui.util.DynamicConfigOperations.PropertiesStructure;
-import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
@@ -53,18 +53,11 @@ interface PropertiesMapper {
   private final DynamicConfigOperations dynamicConfigOperations;
   private final ApplicationRestarter restarter;
   private final KafkaClusterFactory kafkaClusterFactory;
-
+  private final ApplicationInfoService applicationInfoService;
 
   @Override
   public Mono<ResponseEntity<ApplicationInfoDTO>> getApplicationInfo(ServerWebExchange exchange) {
-    return Mono.just(
-        new ApplicationInfoDTO()
-            .enabledFeatures(
-                dynamicConfigOperations.dynamicConfigEnabled()
-                    ? List.of(ApplicationInfoDTO.EnabledFeaturesEnum.DYNAMIC_CONFIG)
-                    : List.of()
-            )
-    ).map(ResponseEntity::ok);
+    return Mono.just(applicationInfoService.getApplicationInfo()).map(ResponseEntity::ok);
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ApplicationInfoService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ApplicationInfoService.java
new file mode 100644
index 00000000000..750a7179fb8
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ApplicationInfoService.java
@@ -0,0 +1,76 @@
+package com.provectus.kafka.ui.service;
+
+import static com.provectus.kafka.ui.model.ApplicationInfoDTO.EnabledFeaturesEnum;
+
+import com.provectus.kafka.ui.model.ApplicationInfoBuildDTO;
+import com.provectus.kafka.ui.model.ApplicationInfoDTO;
+import com.provectus.kafka.ui.model.ApplicationInfoLatestReleaseDTO;
+import com.provectus.kafka.ui.util.DynamicConfigOperations;
+import com.provectus.kafka.ui.util.GithubReleaseInfo;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Properties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
+import org.springframework.boot.info.GitProperties;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ApplicationInfoService {
+
+  private final GithubReleaseInfo githubReleaseInfo = new GithubReleaseInfo();
+
+  private final DynamicConfigOperations dynamicConfigOperations;
+  private final BuildProperties buildProperties;
+  private final GitProperties gitProperties;
+
+  public ApplicationInfoService(DynamicConfigOperations dynamicConfigOperations,
+                                @Autowired(required = false) BuildProperties buildProperties,
+                                @Autowired(required = false) GitProperties gitProperties) {
+    this.dynamicConfigOperations = dynamicConfigOperations;
+    this.buildProperties = Optional.ofNullable(buildProperties).orElse(new BuildProperties(new Properties()));
+    this.gitProperties = Optional.ofNullable(gitProperties).orElse(new GitProperties(new Properties()));
+  }
+
+  public ApplicationInfoDTO getApplicationInfo() {
+    var releaseInfo = githubReleaseInfo.get();
+    return new ApplicationInfoDTO()
+        .build(getBuildInfo(releaseInfo))
+        .enabledFeatures(getEnabledFeatures())
+        .latestRelease(convert(releaseInfo));
+  }
+
+  private ApplicationInfoLatestReleaseDTO convert(GithubReleaseInfo.GithubReleaseDto releaseInfo) {
+    return new ApplicationInfoLatestReleaseDTO()
+        .htmlUrl(releaseInfo.html_url())
+        .publishedAt(releaseInfo.published_at())
+        .versionTag(releaseInfo.tag_name());
+  }
+
+  private ApplicationInfoBuildDTO getBuildInfo(GithubReleaseInfo.GithubReleaseDto release) {
+    return new ApplicationInfoBuildDTO()
+        .isLatestRelease(release.tag_name() != null && release.tag_name().equals(buildProperties.getVersion()))
+        .commitId(gitProperties.getShortCommitId())
+        .version(buildProperties.getVersion())
+        .buildTime(buildProperties.getTime() != null
+            ? DateTimeFormatter.ISO_INSTANT.format(buildProperties.getTime()) : null);
+  }
+
+  private List<EnabledFeaturesEnum> getEnabledFeatures() {
+    var enabledFeatures = new ArrayList<EnabledFeaturesEnum>();
+    if (dynamicConfigOperations.dynamicConfigEnabled()) {
+      enabledFeatures.add(EnabledFeaturesEnum.DYNAMIC_CONFIG);
+    }
+    return enabledFeatures;
+  }
+
+  // updating on startup and every hour
+  @Scheduled(fixedRateString = "${github-release-info-update-rate:3600000}")
+  public void updateGithubReleaseInfo() {
+    githubReleaseInfo.refresh().block();
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/GithubReleaseInfo.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/GithubReleaseInfo.java
new file mode 100644
index 00000000000..2ad0c9c399b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/GithubReleaseInfo.java
@@ -0,0 +1,53 @@
+package com.provectus.kafka.ui.util;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.time.Duration;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+public class GithubReleaseInfo {
+
+  private static final String GITHUB_LATEST_RELEASE_RETRIEVAL_URL =
+      "https://api.github.com/repos/provectus/kafka-ui/releases/latest";
+
+  private static final Duration GITHUB_API_MAX_WAIT_TIME = Duration.ofSeconds(2);
+
+  public record GithubReleaseDto(String html_url, String tag_name, String published_at) {
+
+    static GithubReleaseDto empty() {
+      return new GithubReleaseDto(null, null, null);
+    }
+  }
+
+  private volatile GithubReleaseDto release = GithubReleaseDto.empty();
+
+  private final Mono<Void> refreshMono;
+
+  public GithubReleaseInfo() {
+    this(GITHUB_LATEST_RELEASE_RETRIEVAL_URL);
+  }
+
+  @VisibleForTesting
+  GithubReleaseInfo(String url) {
+    this.refreshMono = WebClient.create()
+        .get()
+        .uri(url)
+        .exchangeToMono(resp -> resp.bodyToMono(GithubReleaseDto.class))
+        .timeout(GITHUB_API_MAX_WAIT_TIME)
+        .doOnError(th -> log.trace("Error getting latest github release info", th))
+        .onErrorResume(th -> true, th -> Mono.just(GithubReleaseDto.empty()))
+        .doOnNext(release -> this.release = release)
+        .then();
+  }
+
+  public GithubReleaseDto get() {
+    return release;
+  }
+
+  public Mono<Void> refresh() {
+    return refreshMono;
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/GithubReleaseInfoTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/GithubReleaseInfoTest.java
new file mode 100644
index 00000000000..6ec4bb78638
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/GithubReleaseInfoTest.java
@@ -0,0 +1,54 @@
+package com.provectus.kafka.ui.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.time.Duration;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import reactor.test.StepVerifier;
+
+class GithubReleaseInfoTest {
+
+  private final MockWebServer mockWebServer = new MockWebServer();
+
+  @BeforeEach
+  void startMockServer() throws IOException {
+    mockWebServer.start();
+  }
+
+  @AfterEach
+  void stopMockServer() throws IOException {
+    mockWebServer.close();
+  }
+
+  @Test
+  void test() {
+    mockWebServer.enqueue(new MockResponse()
+        .addHeader("content-type: application/json")
+        .setBody("""
+            {
+              "published_at": "2023-03-09T16:11:31Z",
+              "tag_name": "v0.6.0",
+              "html_url": "https://github.com/provectus/kafka-ui/releases/tag/v0.6.0",
+              "some_unused_prop": "ololo"
+            }
+            """));
+    var url = mockWebServer.url("repos/provectus/kafka-ui/releases/latest").toString();
+
+    var infoHolder = new GithubReleaseInfo(url);
+    infoHolder.refresh().block();
+
+    var i = infoHolder.get();
+    assertThat(i.html_url())
+        .isEqualTo("https://github.com/provectus/kafka-ui/releases/tag/v0.6.0");
+    assertThat(i.published_at())
+        .isEqualTo("2023-03-09T16:11:31Z");
+    assertThat(i.tag_name())
+        .isEqualTo("v0.6.0");
+  }
+
+}
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index d3b9f331366..7b6fd3c1131 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1917,6 +1917,26 @@ components:
             type: string
             enum:
               - DYNAMIC_CONFIG
+        build:
+          type: object
+          properties:
+            commitId:
+              type: string
+            version:
+              type: string
+            buildTime:
+              type: string
+            isLatestRelease:
+              type: boolean
+        latestRelease:
+          type: object
+          properties:
+            versionTag:
+              type: string
+            publishedAt:
+              type: string
+            htmlUrl:
+              type: string
 
     Cluster:
       type: object

From a2741291bfd5bff2283e9361adebf30b2db56cca Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 10 Apr 2023 11:22:57 +0300
Subject: [PATCH 498/734] [e2e] Clearing messages availability with Topic's
 cleanup policy update (#3632)

* add verifyClearMessagesMenuStateAfterTopicUpdate

* fix indents

* upd imports

* Add checkstyle plugin execution for e2e

* upd violations

* upd violations

* Impl a separate checkstyle config for e2e

---------

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 etc/checkstyle/checkstyle-e2e.xml             | 333 +++++++
 etc/checkstyle/checkstyle.xml                 |   4 +-
 kafka-ui-e2e-checks/pom.xml                   |  31 +
 .../provectus/kafka/ui/models/Connector.java  |   2 +-
 .../com/provectus/kafka/ui/models/Schema.java |  39 +-
 .../com/provectus/kafka/ui/models/Topic.java  |  12 +-
 .../provectus/kafka/ui/pages/BasePage.java    | 253 +++---
 .../ui/pages/brokers/BrokersConfigTab.java    |  55 +-
 .../ui/pages/brokers/BrokersDetails.java      | 147 ++--
 .../kafka/ui/pages/brokers/BrokersList.java   | 177 ++--
 .../pages/connectors/ConnectorCreateForm.java |  78 +-
 .../ui/pages/connectors/ConnectorDetails.java | 128 +--
 .../ui/pages/connectors/KafkaConnectList.java |  66 +-
 .../ui/pages/consumers/ConsumersDetails.java  |  38 +-
 .../ui/pages/consumers/ConsumersList.java     |  16 +-
 .../kafka/ui/pages/ksqlDb/KsqlDbList.java     | 139 ---
 .../kafka/ui/pages/ksqlDb/KsqlQueryForm.java  | 154 ----
 .../ui/pages/ksqlDb/enums/KsqlMenuTabs.java   |  17 -
 .../pages/ksqlDb/enums/KsqlQueryConfig.java   |  19 -
 .../kafka/ui/pages/ksqldb/KsqlDbList.java     | 138 +++
 .../kafka/ui/pages/ksqldb/KsqlQueryForm.java  | 153 ++++
 .../ui/pages/ksqldb/enums/KsqlMenuTabs.java   |  17 +
 .../pages/ksqldb/enums/KsqlQueryConfig.java   |  18 +
 .../{ksqlDb => ksqldb}/models/Stream.java     |   4 +-
 .../{ksqlDb => ksqldb}/models/Table.java      |   4 +-
 .../kafka/ui/pages/panels/NaviSideBar.java    |  93 +-
 .../kafka/ui/pages/panels/TopPanel.java       |  27 +-
 .../kafka/ui/pages/panels/enums/MenuItem.java |  48 +-
 .../ui/pages/schemas/SchemaCreateForm.java    | 246 +++---
 .../kafka/ui/pages/schemas/SchemaDetails.java | 102 +--
 .../ui/pages/schemas/SchemaRegistryList.java  |  60 +-
 .../ui/pages/topics/ProduceMessagePanel.java  |  91 +-
 .../ui/pages/topics/TopicCreateEditForm.java  | 530 ++++++------
 .../kafka/ui/pages/topics/TopicDetails.java   | 813 +++++++++---------
 .../ui/pages/topics/TopicSettingsTab.java     |  83 +-
 .../kafka/ui/pages/topics/TopicsList.java     | 463 +++++-----
 .../topics/enums/CleanupPolicyValue.java      |  30 +-
 .../topics/enums/CustomParameterType.java     |  58 +-
 .../ui/pages/topics/enums/MaxSizeOnDisk.java  |  34 +-
 .../ui/pages/topics/enums/TimeToRetain.java   |  34 +-
 .../kafka/ui/services/ApiService.java         | 454 +++++-----
 .../kafka/ui/settings/BaseSource.java         |  38 +-
 .../kafka/ui/settings/configs/Profiles.java   |  16 +-
 .../kafka/ui/settings/drivers/WebDriver.java  | 149 ++--
 .../ui/settings/listeners/AllureListener.java |  46 +-
 .../ui/settings/listeners/LoggerListener.java |  48 +-
 .../listeners/QaseCreateListener.java         | 197 +++--
 .../listeners/QaseResultListener.java         | 145 ++--
 .../kafka/ui/utilities/FileUtils.java         |  29 +-
 .../kafka/ui/utilities/TimeUtils.java         |  15 +-
 .../kafka/ui/utilities/WebUtils.java          | 161 ++--
 .../kafka/ui/utilities/qase/QaseSetup.java    |  33 +
 .../annotations/Automation.java               |   7 +-
 .../annotations/Status.java                   |   4 +-
 .../annotations/Suite.java                    |   4 +-
 .../kafka/ui/utilities/qase/enums/State.java  |  18 +
 .../kafka/ui/utilities/qase/enums/Status.java |  18 +
 .../ui/utilities/qaseUtils/QaseSetup.java     |  34 -
 .../ui/utilities/qaseUtils/enums/State.java   |  18 -
 .../ui/utilities/qaseUtils/enums/Status.java  |  18 -
 .../provectus/kafka/ui/variables/Browser.java |   4 +-
 .../provectus/kafka/ui/variables/Suite.java   |  10 +-
 .../com/provectus/kafka/ui/variables/Url.java |  12 +-
 .../config_for_create_connector.json          |   2 +-
 .../config_for_create_connector_via_api.json  |   2 +-
 .../connectors/delete_connector_config.json   |   2 +-
 .../schemas/schema_avro_for_update.json       |   2 +-
 .../testData/schemas/schema_avro_value.json   |   2 +-
 .../testData/schemas/schema_json_Value.json   |   2 +-
 .../topics/message_content_create_topic.json  |   2 +-
 .../java/com/provectus/kafka/ui/BaseTest.java | 261 +++---
 .../java/com/provectus/kafka/ui/Facade.java   |  56 +-
 .../kafka/ui/manualSuite/BaseManualTest.java  |  30 -
 .../ui/manualSuite/backlog/SanityBacklog.java |  19 -
 .../ui/manualSuite/backlog/SmokeBacklog.java  |  75 --
 .../ui/manualSuite/suite/DataMaskingTest.java |  29 -
 .../kafka/ui/manualSuite/suite/RbacTest.java  |  53 --
 .../ui/manualSuite/suite/TopicsTest.java      |  95 --
 .../ui/manualSuite/suite/WizardTest.java      |  17 -
 .../kafka/ui/manualsuite/BaseManualTest.java  |  30 +
 .../ui/manualsuite/backlog/SanityBacklog.java |   7 +
 .../ui/manualsuite/backlog/SmokeBacklog.java  |  78 ++
 .../ui/manualsuite/suite/DataMaskingTest.java |  29 +
 .../kafka/ui/manualsuite/suite/RbacTest.java  |  53 ++
 .../ui/manualsuite/suite/TopicsTest.java      |  95 ++
 .../ui/manualsuite/suite/WizardTest.java      |  17 +
 .../kafka/ui/qaseSuite/BaseQaseTest.java      |  23 -
 .../kafka/ui/qaseSuite/Template.java          |  58 --
 .../kafka/ui/qasesuite/BaseQaseTest.java      |  25 +
 .../kafka/ui/qasesuite/Template.java          |  58 ++
 .../kafka/ui/sanitySuite/TestClass.java       |   4 -
 .../kafka/ui/sanitysuite/TopicsTest.java      |  66 ++
 .../kafka/ui/smokeSuite/SmokeTest.java        | 107 ---
 .../ui/smokeSuite/brokers/BrokersTest.java    |  41 -
 .../smokeSuite/connectors/ConnectorsTest.java | 106 ---
 .../ui/smokeSuite/ksqlDb/KsqlDbTest.java      |  80 --
 .../ui/smokeSuite/schemas/SchemasTest.java    | 190 ----
 .../ui/smokeSuite/topics/MessagesTest.java    | 283 ------
 .../ui/smokeSuite/topics/TopicsTest.java      | 496 -----------
 .../kafka/ui/smokesuite/SmokeTest.java        | 115 +++
 .../ui/smokesuite/brokers/BrokersTest.java    |  41 +
 .../smokesuite/connectors/ConnectorsTest.java | 107 +++
 .../ui/smokesuite/ksqldb/KsqlDbTest.java      |  79 ++
 .../ui/smokesuite/schemas/SchemasTest.java    | 190 ++++
 .../ui/smokesuite/topics/MessagesTest.java    | 279 ++++++
 .../ui/smokesuite/topics/TopicsTest.java      | 500 +++++++++++
 .../src/test/resources/manual.xml             |   2 +-
 .../src/test/resources/qase.xml               |   2 +-
 .../src/test/resources/regression.xml         |   6 +-
 .../src/test/resources/sanity.xml             |   2 +-
 .../src/test/resources/smoke.xml              |   2 +-
 111 files changed, 5273 insertions(+), 4779 deletions(-)
 create mode 100644 etc/checkstyle/checkstyle-e2e.xml
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlMenuTabs.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlQueryConfig.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ksqlDb => ksqldb}/models/Stream.java (50%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/{ksqlDb => ksqldb}/models/Table.java (56%)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/QaseSetup.java
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/{qaseUtils => qase}/annotations/Automation.java (63%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/{qaseUtils => qase}/annotations/Status.java (65%)
 rename kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/{qaseUtils => qase}/annotations/Suite.java (76%)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/enums/State.java
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/enums/Status.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/State.java
 delete mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SanityBacklog.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/DataMaskingTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/RbacTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/WizardTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/BaseManualTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SanityBacklog.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/DataMaskingTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/RbacTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/WizardTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qasesuite/BaseQaseTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qasesuite/Template.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitySuite/TestClass.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitysuite/TopicsTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
 delete mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/SmokeTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/connectors/ConnectorsTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/schemas/SchemasTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java
 create mode 100644 kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java

diff --git a/etc/checkstyle/checkstyle-e2e.xml b/etc/checkstyle/checkstyle-e2e.xml
new file mode 100644
index 00000000000..c2af9c987b3
--- /dev/null
+++ b/etc/checkstyle/checkstyle-e2e.xml
@@ -0,0 +1,333 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<!--
+    Checkstyle configuration that checks the Google coding conventions from Google Java Style
+    that can be found at https://google.github.io/styleguide/javaguide.html
+
+    Checkstyle is very configurable. Be sure to read the documentation at
+    http://checkstyle.org (or in your downloaded distribution).
+
+    To completely disable a check, just comment it out or delete it from the file.
+    To suppress certain violations please review suppression filters.
+
+    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+ -->
+
+<module name = "Checker">
+    <property name="charset" value="UTF-8"/>
+
+    <property name="severity" value="warning"/>
+
+    <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Excludes all 'module-info.java' files              -->
+    <!-- See https://checkstyle.org/config_filefilters.html -->
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="module\-info\.java$"/>
+    </module>
+    <!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
+    <module name="SuppressionFilter">
+        <property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
+                  default="checkstyle-suppressions.xml" />
+        <property name="optional" value="true"/>
+    </module>
+
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.org/config_whitespace.html -->
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
+
+    <module name="LineLength">
+        <property name="fileExtensions" value="java"/>
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
+    <module name="TreeWalker">
+        <module name="OuterTypeFilename"/>
+        <module name="IllegalTokenText">
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format"
+                      value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message"
+                      value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+        </module>
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+        <module name="AvoidStarImport"/>
+        <module name="OneTopLevelClass"/>
+        <module name="NoLineWrap">
+            <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
+        </module>
+        <module name="EmptyBlock">
+            <property name="option" value="TEXT"/>
+            <property name="tokens"
+                      value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+        </module>
+        <module name="NeedBraces">
+            <property name="tokens"
+                      value="LITERAL_DO, LITERAL_ELSE, LITERAL_FOR, LITERAL_IF, LITERAL_WHILE"/>
+        </module>
+        <module name="LeftCurly">
+            <property name="tokens"
+                      value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF,
+                    INTERFACE_DEF, LAMBDA, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT,
+                    LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
+                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
+                    OBJBLOCK, STATIC_INIT"/>
+        </module>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlySame"/>
+            <property name="tokens"
+                      value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
+                    LITERAL_DO"/>
+        </module>
+        <module name="RightCurly">
+            <property name="id" value="RightCurlyAlone"/>
+            <property name="option" value="alone"/>
+            <property name="tokens"
+                      value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
+                    INSTANCE_INIT, ANNOTATION_DEF, ENUM_DEF"/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+            <!-- suppresion is required till https://github.com/checkstyle/checkstyle/issues/7541 -->
+            <property name="id" value="RightCurlyAlone"/>
+            <property name="query" value="//RCURLY[parent::SLIST[count(./*)=1]
+                                                 or preceding-sibling::*[last()][self::LCURLY]]"/>
+        </module>
+        <module name="WhitespaceAfter">
+            <property name="tokens"
+                      value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE,
+                    LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, DO_WHILE"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyLambdas" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLoops" value="true"/>
+            <property name="tokens"
+                      value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR,
+                    BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND,
+                    LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY,
+                    LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED,
+                     LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
+                     NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
+                     SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
+            <message key="ws.notFollowed"
+                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+            <message key="ws.notPreceded"
+                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="OneStatementPerLine"/>
+<!--        <module name="MultipleVariableDeclarations"/>-->
+        <module name="ArrayTypeStyle"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="FallThrough"/>
+        <module name="UpperEll"/>
+        <module name="ModifierOrder"/>
+        <module name="EmptyLineSeparator">
+            <property name="tokens"
+                      value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                    STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapDot"/>
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapComma"/>
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
+            <property name="id" value="SeparatorWrapEllipsis"/>
+            <property name="tokens" value="ELLIPSIS"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
+            <property name="id" value="SeparatorWrapArrayDeclarator"/>
+            <property name="tokens" value="ARRAY_DECLARATOR"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapMethodRef"/>
+            <property name="tokens" value="METHOD_REF"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+            <message key="name.invalidPattern"
+                     value="Package name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="TypeName">
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF"/>
+            <message key="name.invalidPattern"
+                     value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MemberName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern"
+                     value="Member name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LambdaParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="CatchParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LocalVariableName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="InterfaceTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="NoFinalizer"/>
+        <module name="GenericWhitespace">
+            <message key="ws.followed"
+                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+            <message key="ws.preceded"
+                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+            <message key="ws.illegalFollow"
+                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+            <message key="ws.notPreceded"
+                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="Indentation">
+            <property name="basicOffset" value="2"/>
+            <property name="braceAdjustment" value="0"/>
+            <property name="caseIndent" value="2"/>
+            <property name="throwsIndent" value="4"/>
+            <property name="lineWrappingIndentation" value="4"/>
+            <property name="arrayInitIndent" value="2"/>
+        </module>
+        <module name="AbbreviationAsWordInName">
+            <property name="ignoreFinal" value="false"/>
+            <property name="allowedAbbreviationLength" value="1"/>
+            <property name="tokens"
+                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
+                    PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF"/>
+        </module>
+        <module name="OverloadMethodsDeclarationOrder"/>
+<!--        <module name="VariableDeclarationUsageDistance"/>-->
+        <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="separateLineBetweenGroups" value="true"/>
+            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
+        </module>
+        <module name="MethodParamPad">
+            <property name="tokens"
+                      value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
+                    SUPER_CTOR_CALL, ENUM_CONSTANT_DEF"/>
+        </module>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens"
+                      value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS,
+                    LABELED_STAT, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+        <module name="ParenPad">
+            <property name="tokens"
+                      value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF,
+                    EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW,
+                    LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
+                    METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA"/>
+        </module>
+        <module name="OperatorWrap">
+            <property name="option" value="NL"/>
+            <property name="tokens"
+                      value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
+                    LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationMostCases"/>
+            <property name="tokens"
+                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationVariables"/>
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="allowSamelineMultipleAnnotations" value="true"/>
+        </module>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="InvalidJavadocPosition"/>
+        <module name="JavadocTagContinuationIndentation"/>
+        <module name="SummaryJavadoc">
+            <property name="forbiddenSummaryFragments"
+                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+        </module>
+        <module name="JavadocParagraph"/>
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+            <property name="target"
+                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+        </module>
+        <module name="JavadocMethod">
+            <property name="accessModifiers" value="public"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+        </module>
+<!--        <module name="MissingJavadocMethod">-->
+<!--            <property name="scope" value="public"/>-->
+<!--            <property name="minLineCount" value="2"/>-->
+<!--            <property name="allowedAnnotations" value="Override, Test"/>-->
+<!--            <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>-->
+<!--        </module>-->
+        <module name="MethodName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <message key="name.invalidPattern"
+                     value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="SingleLineJavadoc">
+            <property name="ignoreInlineTags" value="false"/>
+        </module>
+        <module name="EmptyCatchBlock">
+            <property name="exceptionVariableName" value="ignored"/>
+        </module>
+        <module name="CommentsIndentation">
+            <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
+        </module>
+        <!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
+        <module name="SuppressionXpathFilter">
+            <property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
+                      default="checkstyle-xpath-suppressions.xml" />
+            <property name="optional" value="true"/>
+        </module>
+    </module>
+</module>
diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml
index 0348f809b4d..745f1bc368d 100644
--- a/etc/checkstyle/checkstyle.xml
+++ b/etc/checkstyle/checkstyle.xml
@@ -318,7 +318,7 @@
             <property name="ignoreInlineTags" value="false"/>
         </module>
         <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="expected"/>
+            <property name="exceptionVariableName" value="ignored"/>
         </module>
         <module name="CommentsIndentation">
             <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
@@ -330,4 +330,4 @@
             <property name="optional" value="true"/>
         </module>
     </module>
-</module>
\ No newline at end of file
+</module>
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index e4d912dbe62..c93f6bcabb8 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -264,6 +264,37 @@
                         <artifactId>allure-maven</artifactId>
                         <version>2.10.0</version>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-checkstyle-plugin</artifactId>
+                        <version>3.1.2</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.puppycrawl.tools</groupId>
+                                <artifactId>checkstyle</artifactId>
+                                <version>10.3.1</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>checkstyle</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                                <configuration>
+                                    <violationSeverity>warning</violationSeverity>
+                                    <failOnViolation>true</failOnViolation>
+                                    <failsOnError>true</failsOnError>
+                                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                                    <configLocation>file:${basedir}/../etc/checkstyle/checkstyle-e2e.xml</configLocation>
+                                    <headerLocation>file:${basedir}/../etc/checkstyle/apache-header.txt</headerLocation>
+                                </configuration>
+                            </execution>
+                        </executions>
+
+                    </plugin>
+
                 </plugins>
             </build>
         </profile>
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java
index 48088cdf916..493010a3f69 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Connector.java
@@ -7,5 +7,5 @@
 @Accessors(chain = true)
 public class Connector {
 
-    private String name, config;
+  private String name, config;
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
index 19dc44a028e..55a6e631122 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
@@ -1,33 +1,34 @@
 package com.provectus.kafka.ui.models;
 
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
 import com.provectus.kafka.ui.api.model.SchemaType;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-
 @Data
 @Accessors(chain = true)
 public class Schema {
 
-    private String name, valuePath;
-    private SchemaType type;
+  private String name, valuePath;
+  private SchemaType type;
 
-    public static Schema createSchemaAvro() {
-        return new Schema().setName("schema_avro-" + randomAlphabetic(5))
-                .setType(SchemaType.AVRO)
-                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_avro_value.json");
-    }
+  public static Schema createSchemaAvro() {
+    return new Schema().setName("schema_avro-" + randomAlphabetic(5))
+        .setType(SchemaType.AVRO)
+        .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_avro_value.json");
+  }
 
-    public static Schema createSchemaJson() {
-        return new Schema().setName("schema_json-" + randomAlphabetic(5))
-                .setType(SchemaType.JSON)
-                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_json_Value.json");
-    }
+  public static Schema createSchemaJson() {
+    return new Schema().setName("schema_json-" + randomAlphabetic(5))
+        .setType(SchemaType.JSON)
+        .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_json_Value.json");
+  }
 
-    public static Schema createSchemaProtobuf() {
-        return new Schema().setName("schema_protobuf-" + randomAlphabetic(5))
-                .setType(SchemaType.PROTOBUF)
-                .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_protobuf_value.txt");
-    }
+  public static Schema createSchemaProtobuf() {
+    return new Schema().setName("schema_protobuf-" + randomAlphabetic(5))
+        .setType(SchemaType.PROTOBUF)
+        .setValuePath(
+            System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_protobuf_value.txt");
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
index 21486a93f1d..ece16b4cc10 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
@@ -11,10 +11,10 @@
 @Accessors(chain = true)
 public class Topic {
 
-    private String name, timeToRetainData, maxMessageBytes, messageKey, messageContent, customParameterValue;
-    private int numberOfPartitions;
-    private CustomParameterType customParameterType;
-    private CleanupPolicyValue cleanupPolicyValue;
-    private MaxSizeOnDisk maxSizeOnDisk;
-    private TimeToRetain timeToRetain;
+  private String name, timeToRetainData, maxMessageBytes, messageKey, messageContent, customParameterValue;
+  private int numberOfPartitions;
+  private CustomParameterType customParameterType;
+  private CleanupPolicyValue cleanupPolicyValue;
+  private MaxSizeOnDisk maxSizeOnDisk;
+  private TimeToRetain timeToRetain;
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index 2bb4ecce519..fb2e0877e22 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -1,143 +1,142 @@
 package com.provectus.kafka.ui.pages;
 
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
 import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
 import com.provectus.kafka.ui.utilities.WebUtils;
+import java.time.Duration;
 import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
-import java.time.Duration;
-
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
-
 @Slf4j
 public abstract class BasePage extends WebUtils {
 
-    protected SelenideElement loadingSpinner = $x("//div[@role='progressbar']");
-    protected SelenideElement submitBtn = $x("//button[@type='submit']");
-    protected SelenideElement tableGrid = $x("//table");
-    protected SelenideElement searchFld = $x("//input[@type='text'][contains(@id, ':r')]");
-    protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
-    protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
-    protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
-    protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
-    protected SelenideElement confirmBtn = $x("//button[contains(text(),'Confirm')]");
-    protected SelenideElement cancelBtn = $x("//button[contains(text(),'Cancel')]");
-    protected SelenideElement backBtn = $x("//button[contains(text(),'Back')]");
-    protected SelenideElement nextBtn = $x("//button[contains(text(),'Next')]");
-    protected ElementsCollection ddlOptions = $$x("//li[@value]");
-    protected ElementsCollection gridItems = $$x("//tr[@class]");
-    protected String summaryCellLocator = "//div[contains(text(),'%s')]";
-    protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
-    protected String columnHeaderLocator = "//table//tr/th//div[text()='%s']";
-    protected String pageTitleFromHeader = "//h1[text()='%s']";
-    protected String pagePathFromHeader = "//a[text()='%s']/../h1";
-
-    protected void waitUntilSpinnerDisappear(int... timeoutInSeconds) {
-        log.debug("\nwaitUntilSpinnerDisappear");
-        if (isVisible(loadingSpinner, timeoutInSeconds)) {
-            loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(60));
-        }
-    }
-
-    protected void searchItem(String tag) {
-        log.debug("\nsearchItem: {}", tag);
-        sendKeysAfterClear(searchFld, tag);
-        searchFld.pressEnter().shouldHave(Condition.value(tag));
-        waitUntilSpinnerDisappear(1);
-    }
-
-    protected SelenideElement getPageTitleFromHeader(MenuItem menuItem) {
-        return $x(String.format(pageTitleFromHeader, menuItem.getPageTitle()));
-    }
-
-    protected SelenideElement getPagePathFromHeader(MenuItem menuItem) {
-        return $x(String.format(pagePathFromHeader, menuItem.getPageTitle()));
-    }
-
-    protected void clickSubmitBtn() {
-        clickByJavaScript(submitBtn);
-    }
-
-    protected void setJsonInputValue(SelenideElement jsonInput, String jsonConfig) {
-        sendKeysByActions(jsonInput, jsonConfig.replace("  ", ""));
-        new Actions(WebDriverRunner.getWebDriver())
-                .keyDown(Keys.SHIFT)
-                .sendKeys(Keys.PAGE_DOWN)
-                .keyUp(Keys.SHIFT)
-                .sendKeys(Keys.DELETE)
-                .perform();
-    }
-
-    protected SelenideElement getTableElement(String elementName) {
-        log.debug("\ngetTableElement: {}", elementName);
-        return $x(String.format(tableElementNameLocator, elementName));
-    }
-
-    protected ElementsCollection getDdlOptions() {
-        return ddlOptions;
-    }
-
-    protected String getAlertHeader() {
-        log.debug("\ngetAlertHeader");
-        String result = alertHeader.shouldBe(Condition.visible).getText();
-        log.debug("-> {}", result);
-        return result;
-    }
-
-    protected String getAlertMessage() {
-        log.debug("\ngetAlertMessage");
-        String result = alertMessage.shouldBe(Condition.visible).getText();
-        log.debug("-> {}", result);
-        return result;
-    }
-
-    protected boolean isAlertVisible(AlertHeader header) {
-        log.debug("\nisAlertVisible: {}", header.toString());
-        boolean result = getAlertHeader().equals(header.toString());
-        log.debug("-> {}", result);
-        return result;
-    }
-
-    protected boolean isAlertVisible(AlertHeader header, String message) {
-        log.debug("\nisAlertVisible: {} {}", header, message);
-        boolean result = isAlertVisible(header) && getAlertMessage().equals(message);
-        log.debug("-> {}", result);
-        return result;
-    }
-
-    protected void clickConfirmButton() {
-        confirmBtn.shouldBe(Condition.enabled).click();
-        confirmBtn.shouldBe(Condition.disappear);
-    }
-
-    protected void clickCancelButton() {
-        cancelBtn.shouldBe(Condition.enabled).click();
-        cancelBtn.shouldBe(Condition.disappear);
-    }
-
-    protected boolean isConfirmationModalVisible() {
-        return isVisible(confirmationMdl);
-    }
-
-    public enum AlertHeader {
-        SUCCESS("Success"),
-        VALIDATION_ERROR("Validation Error"),
-        BAD_REQUEST("400 Bad Request");
-
-        private final String value;
-
-        AlertHeader(String value) {
-            this.value = value;
-        }
-
-        public String toString() {
-            return value;
-        }
-    }
+  protected SelenideElement loadingSpinner = $x("//div[@role='progressbar']");
+  protected SelenideElement submitBtn = $x("//button[@type='submit']");
+  protected SelenideElement tableGrid = $x("//table");
+  protected SelenideElement searchFld = $x("//input[@type='text'][contains(@id, ':r')]");
+  protected SelenideElement dotMenuBtn = $x("//button[@aria-label='Dropdown Toggle']");
+  protected SelenideElement alertHeader = $x("//div[@role='alert']//div[@role='heading']");
+  protected SelenideElement alertMessage = $x("//div[@role='alert']//div[@role='contentinfo']");
+  protected SelenideElement confirmationMdl = $x("//div[text()= 'Confirm the action']/..");
+  protected SelenideElement confirmBtn = $x("//button[contains(text(),'Confirm')]");
+  protected SelenideElement cancelBtn = $x("//button[contains(text(),'Cancel')]");
+  protected SelenideElement backBtn = $x("//button[contains(text(),'Back')]");
+  protected SelenideElement nextBtn = $x("//button[contains(text(),'Next')]");
+  protected ElementsCollection ddlOptions = $$x("//li[@value]");
+  protected ElementsCollection gridItems = $$x("//tr[@class]");
+  protected String summaryCellLocator = "//div[contains(text(),'%s')]";
+  protected String tableElementNameLocator = "//tbody//a[contains(text(),'%s')]";
+  protected String columnHeaderLocator = "//table//tr/th//div[text()='%s']";
+  protected String pageTitleFromHeader = "//h1[text()='%s']";
+  protected String pagePathFromHeader = "//a[text()='%s']/../h1";
+
+  protected void waitUntilSpinnerDisappear(int... timeoutInSeconds) {
+    log.debug("\nwaitUntilSpinnerDisappear");
+    if (isVisible(loadingSpinner, timeoutInSeconds)) {
+      loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(60));
+    }
+  }
+
+  protected void searchItem(String tag) {
+    log.debug("\nsearchItem: {}", tag);
+    sendKeysAfterClear(searchFld, tag);
+    searchFld.pressEnter().shouldHave(Condition.value(tag));
+    waitUntilSpinnerDisappear(1);
+  }
+
+  protected SelenideElement getPageTitleFromHeader(MenuItem menuItem) {
+    return $x(String.format(pageTitleFromHeader, menuItem.getPageTitle()));
+  }
+
+  protected SelenideElement getPagePathFromHeader(MenuItem menuItem) {
+    return $x(String.format(pagePathFromHeader, menuItem.getPageTitle()));
+  }
+
+  protected void clickSubmitBtn() {
+    clickByJavaScript(submitBtn);
+  }
+
+  protected void setJsonInputValue(SelenideElement jsonInput, String jsonConfig) {
+    sendKeysByActions(jsonInput, jsonConfig.replace("  ", ""));
+    new Actions(WebDriverRunner.getWebDriver())
+        .keyDown(Keys.SHIFT)
+        .sendKeys(Keys.PAGE_DOWN)
+        .keyUp(Keys.SHIFT)
+        .sendKeys(Keys.DELETE)
+        .perform();
+  }
+
+  protected SelenideElement getTableElement(String elementName) {
+    log.debug("\ngetTableElement: {}", elementName);
+    return $x(String.format(tableElementNameLocator, elementName));
+  }
+
+  protected ElementsCollection getDdlOptions() {
+    return ddlOptions;
+  }
+
+  protected String getAlertHeader() {
+    log.debug("\ngetAlertHeader");
+    String result = alertHeader.shouldBe(Condition.visible).getText();
+    log.debug("-> {}", result);
+    return result;
+  }
+
+  protected String getAlertMessage() {
+    log.debug("\ngetAlertMessage");
+    String result = alertMessage.shouldBe(Condition.visible).getText();
+    log.debug("-> {}", result);
+    return result;
+  }
+
+  protected boolean isAlertVisible(AlertHeader header) {
+    log.debug("\nisAlertVisible: {}", header.toString());
+    boolean result = getAlertHeader().equals(header.toString());
+    log.debug("-> {}", result);
+    return result;
+  }
+
+  protected boolean isAlertVisible(AlertHeader header, String message) {
+    log.debug("\nisAlertVisible: {} {}", header, message);
+    boolean result = isAlertVisible(header) && getAlertMessage().equals(message);
+    log.debug("-> {}", result);
+    return result;
+  }
+
+  protected void clickConfirmButton() {
+    confirmBtn.shouldBe(Condition.enabled).click();
+    confirmBtn.shouldBe(Condition.disappear);
+  }
+
+  protected void clickCancelButton() {
+    cancelBtn.shouldBe(Condition.enabled).click();
+    cancelBtn.shouldBe(Condition.disappear);
+  }
+
+  protected boolean isConfirmationModalVisible() {
+    return isVisible(confirmationMdl);
+  }
+
+  public enum AlertHeader {
+    SUCCESS("Success"),
+    VALIDATION_ERROR("Validation Error"),
+    BAD_REQUEST("400 Bad Request");
+
+    private final String value;
+
+    AlertHeader(String value) {
+      this.value = value;
+    }
+
+    public String toString() {
+      return value;
+    }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
index 7b37d6709c8..f358614dc87 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
@@ -1,41 +1,40 @@
 package com.provectus.kafka.ui.pages.brokers;
 
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
-
 public class BrokersConfigTab extends BasePage {
 
-    protected List<SelenideElement> editBtn = $$x("//button[@aria-label='editAction']");
-    protected SelenideElement searchByKeyField = $x("//input[@placeholder='Search by Key']");
-
-    @Step
-    public BrokersConfigTab waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        searchByKeyField.shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public boolean isSearchByKeyVisible() {
-        return isVisible(searchByKeyField);
-    }
-
-    public List<SelenideElement> getColumnHeaders() {
-        return Stream.of("Key", "Value", "Source")
-                .map(name -> $x(String.format(columnHeaderLocator, name)))
-                .collect(Collectors.toList());
-    }
-
-    public List<SelenideElement> getEditButtons() {
-        return editBtn;
-    }
+  protected List<SelenideElement> editBtn = $$x("//button[@aria-label='editAction']");
+  protected SelenideElement searchByKeyField = $x("//input[@placeholder='Search by Key']");
+
+  @Step
+  public BrokersConfigTab waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    searchByKeyField.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public boolean isSearchByKeyVisible() {
+    return isVisible(searchByKeyField);
+  }
+
+  public List<SelenideElement> getColumnHeaders() {
+    return Stream.of("Key", "Value", "Source")
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  public List<SelenideElement> getEditButtons() {
+    return editBtn;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
index 8cc3dd98bad..4eca65f1f47 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
@@ -1,92 +1,91 @@
 package com.provectus.kafka.ui.pages.brokers;
 
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-import org.openqa.selenium.By;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$x;
+import org.openqa.selenium.By;
 
 public class BrokersDetails extends BasePage {
 
-    protected SelenideElement logDirectoriesTab = $x("//a[text()='Log directories']");
-    protected SelenideElement metricsTab = $x("//a[text()='Metrics']");
-    protected String brokersTabLocator = "//a[text()='%s']";
-
-    @Step
-    public BrokersDetails waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        Arrays.asList(logDirectoriesTab, metricsTab).forEach(element -> element.shouldBe(Condition.visible));
-        return this;
-    }
-
-    @Step
-    public BrokersDetails openDetailsTab(DetailsTab menu) {
-        $(By.linkText(menu.toString())).shouldBe(Condition.enabled).click();
-        waitUntilSpinnerDisappear();
-        return this;
-    }
-
-    private List<SelenideElement> getVisibleColumnHeaders() {
-        return Stream.of("Name", "Topics", "Error", "Partitions")
-                .map(name -> $x(String.format(columnHeaderLocator, name)))
-                .collect(Collectors.toList());
+  protected SelenideElement logDirectoriesTab = $x("//a[text()='Log directories']");
+  protected SelenideElement metricsTab = $x("//a[text()='Metrics']");
+  protected String brokersTabLocator = "//a[text()='%s']";
+
+  @Step
+  public BrokersDetails waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    Arrays.asList(logDirectoriesTab, metricsTab).forEach(element -> element.shouldBe(Condition.visible));
+    return this;
+  }
+
+  @Step
+  public BrokersDetails openDetailsTab(DetailsTab menu) {
+    $(By.linkText(menu.toString())).shouldBe(Condition.enabled).click();
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  private List<SelenideElement> getVisibleColumnHeaders() {
+    return Stream.of("Name", "Topics", "Error", "Partitions")
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  private List<SelenideElement> getEnabledColumnHeaders() {
+    return Stream.of("Name", "Error")
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  private List<SelenideElement> getVisibleSummaryCells() {
+    return Stream.of("Segment Size", "Segment Count", "Port", "Host")
+        .map(name -> $x(String.format(summaryCellLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  private List<SelenideElement> getDetailsTabs() {
+    return Stream.of(DetailsTab.values())
+        .map(name -> $x(String.format(brokersTabLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  @Step
+  public List<SelenideElement> getAllEnabledElements() {
+    List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
+    enabledElements.addAll(getDetailsTabs());
+    return enabledElements;
+  }
+
+  @Step
+  public List<SelenideElement> getAllVisibleElements() {
+    List<SelenideElement> visibleElements = new ArrayList<>(getVisibleSummaryCells());
+    visibleElements.addAll(getVisibleColumnHeaders());
+    visibleElements.addAll(getDetailsTabs());
+    return visibleElements;
+  }
+
+  public enum DetailsTab {
+    LOG_DIRECTORIES("Log directories"),
+    CONFIGS("Configs"),
+    METRICS("Metrics");
+
+    private final String value;
+
+    DetailsTab(String value) {
+      this.value = value;
     }
 
-    private List<SelenideElement> getEnabledColumnHeaders() {
-        return Stream.of("Name", "Error")
-                .map(name -> $x(String.format(columnHeaderLocator, name)))
-                .collect(Collectors.toList());
-    }
-
-    private List<SelenideElement> getVisibleSummaryCells() {
-        return Stream.of("Segment Size", "Segment Count", "Port", "Host")
-                .map(name -> $x(String.format(summaryCellLocator, name)))
-                .collect(Collectors.toList());
-    }
-
-    private List<SelenideElement> getDetailsTabs() {
-        return Stream.of(DetailsTab.values())
-                .map(name -> $x(String.format(brokersTabLocator, name)))
-                .collect(Collectors.toList());
-    }
-
-    @Step
-    public List<SelenideElement> getAllEnabledElements() {
-        List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
-        enabledElements.addAll(getDetailsTabs());
-        return enabledElements;
-    }
-
-    @Step
-    public List<SelenideElement> getAllVisibleElements() {
-        List<SelenideElement> visibleElements = new ArrayList<>(getVisibleSummaryCells());
-        visibleElements.addAll(getVisibleColumnHeaders());
-        visibleElements.addAll(getDetailsTabs());
-        return visibleElements;
-    }
-
-    public enum DetailsTab {
-        LOG_DIRECTORIES("Log directories"),
-        CONFIGS("Configs"),
-        METRICS("Metrics");
-
-        private final String value;
-
-        DetailsTab(String value) {
-            this.value = value;
-        }
-
-        public String toString() {
-            return value;
-        }
+    public String toString() {
+      return value;
     }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
index f1f08c3cf53..50ecdff3597 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -1,123 +1,122 @@
 package com.provectus.kafka.ui.pages.brokers;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.BROKERS;
+
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.BROKERS;
-
 public class BrokersList extends BasePage {
 
-    @Step
-    public BrokersList waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        getPageTitleFromHeader(BROKERS).shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public BrokersList openBroker(int brokerId) {
-        getBrokerItem(brokerId).openItem();
-        return this;
-    }
-
-    private List<SelenideElement> getUptimeSummaryCells() {
-        return Stream.of("Broker Count", "Active Controller", "Version")
-                .map(name -> $x(String.format(summaryCellLocator, name)))
-                .collect(Collectors.toList());
+  @Step
+  public BrokersList waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    getPageTitleFromHeader(BROKERS).shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public BrokersList openBroker(int brokerId) {
+    getBrokerItem(brokerId).openItem();
+    return this;
+  }
+
+  private List<SelenideElement> getUptimeSummaryCells() {
+    return Stream.of("Broker Count", "Active Controller", "Version")
+        .map(name -> $x(String.format(summaryCellLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  private List<SelenideElement> getPartitionsSummaryCells() {
+    return Stream.of("Online", "URP", "In Sync Replicas", "Out Of Sync Replicas")
+        .map(name -> $x(String.format(summaryCellLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  @Step
+  public List<SelenideElement> getAllVisibleElements() {
+    List<SelenideElement> visibleElements = new ArrayList<>(getUptimeSummaryCells());
+    visibleElements.addAll(getPartitionsSummaryCells());
+    return visibleElements;
+  }
+
+  private List<SelenideElement> getEnabledColumnHeaders() {
+    return Stream.of("Broker ID", "Segment Size", "Segment Count", "Port", "Host")
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  @Step
+  public List<SelenideElement> getAllEnabledElements() {
+    return getEnabledColumnHeaders();
+  }
+
+  private List<BrokersList.BrokerGridItem> initGridItems() {
+    List<BrokersList.BrokerGridItem> gridItemList = new ArrayList<>();
+    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new BrokersList.BrokerGridItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public BrokerGridItem getBrokerItem(int id) {
+    return initGridItems().stream()
+        .filter(e -> e.getId() == id)
+        .findFirst().orElseThrow();
+  }
+
+  @Step
+  public List<BrokerGridItem> getAllBrokers() {
+    return initGridItems();
+  }
+
+  public static class BrokerGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    public BrokerGridItem(SelenideElement element) {
+      this.element = element;
     }
 
-    private List<SelenideElement> getPartitionsSummaryCells() {
-        return Stream.of("Online", "URP", "In Sync Replicas", "Out Of Sync Replicas")
-                .map(name -> $x(String.format(summaryCellLocator, name)))
-                .collect(Collectors.toList());
+    private SelenideElement getIdElm() {
+      return element.$x("./td[1]/div/a");
     }
 
     @Step
-    public List<SelenideElement> getAllVisibleElements() {
-        List<SelenideElement> visibleElements = new ArrayList<>(getUptimeSummaryCells());
-        visibleElements.addAll(getPartitionsSummaryCells());
-        return visibleElements;
-    }
-
-    private List<SelenideElement> getEnabledColumnHeaders() {
-        return Stream.of("Broker ID", "Segment Size", "Segment Count", "Port", "Host")
-                .map(name -> $x(String.format(columnHeaderLocator, name)))
-                .collect(Collectors.toList());
+    public int getId() {
+      return Integer.parseInt(getIdElm().getText().trim());
     }
 
     @Step
-    public List<SelenideElement> getAllEnabledElements() {
-        return getEnabledColumnHeaders();
+    public void openItem() {
+      getIdElm().click();
     }
 
-    private List<BrokersList.BrokerGridItem> initGridItems() {
-        List<BrokersList.BrokerGridItem> gridItemList = new ArrayList<>();
-        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-                .forEach(item -> gridItemList.add(new BrokersList.BrokerGridItem(item)));
-        return gridItemList;
+    @Step
+    public int getSegmentSize() {
+      return Integer.parseInt(element.$x("./td[2]").getText().trim());
     }
 
     @Step
-    public BrokerGridItem getBrokerItem(int id) {
-        return initGridItems().stream()
-                .filter(e -> e.getId() == id)
-                .findFirst().orElseThrow();
+    public int getSegmentCount() {
+      return Integer.parseInt(element.$x("./td[3]").getText().trim());
     }
 
     @Step
-    public List<BrokerGridItem> getAllBrokers() {
-        return initGridItems();
+    public int getPort() {
+      return Integer.parseInt(element.$x("./td[4]").getText().trim());
     }
 
-    public static class BrokerGridItem extends BasePage {
-
-        private final SelenideElement element;
-
-        public BrokerGridItem(SelenideElement element) {
-            this.element = element;
-        }
-
-        private SelenideElement getIdElm() {
-            return element.$x("./td[1]/div/a");
-        }
-
-        @Step
-        public int getId() {
-            return Integer.parseInt(getIdElm().getText().trim());
-        }
-
-        @Step
-        public void openItem() {
-            getIdElm().click();
-        }
-
-        @Step
-        public int getSegmentSize() {
-            return Integer.parseInt(element.$x("./td[2]").getText().trim());
-        }
-
-        @Step
-        public int getSegmentCount() {
-            return Integer.parseInt(element.$x("./td[3]").getText().trim());
-        }
-
-        @Step
-        public int getPort() {
-            return Integer.parseInt(element.$x("./td[4]").getText().trim());
-        }
-
-        @Step
-        public String getHost() {
-            return element.$x("./td[5]").getText().trim();
-        }
+    @Step
+    public String getHost() {
+      return element.$x("./td[5]").getText().trim();
     }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java
index fbbea0f1c0e..0b6b7b5608b 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorCreateForm.java
@@ -1,49 +1,49 @@
 package com.provectus.kafka.ui.pages.connectors;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
-
 public class ConnectorCreateForm extends BasePage {
 
-    protected SelenideElement nameField = $x("//input[@name='name']");
-    protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
-    protected SelenideElement configField = $x("//div[@id='config']");
-
-    @Step
-    public ConnectorCreateForm waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        nameField.shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public ConnectorCreateForm setName(String connectName) {
-        nameField.shouldBe(Condition.enabled).setValue(connectName);
-        return this;
-    }
-
-    @Step
-    public ConnectorCreateForm setConfig(String configJson) {
-        configField.shouldBe(Condition.enabled).click();
-        setJsonInputValue(contentTextArea, configJson);
-        return this;
-    }
-
-    @Step
-    public ConnectorCreateForm setConnectorDetails(String connectName, String configJson) {
-        setName(connectName);
-        setConfig(configJson);
-        return this;
-    }
-
-    @Step
-    public ConnectorCreateForm clickSubmitButton() {
-        clickSubmitBtn();
-        waitUntilSpinnerDisappear();
-        return this;
-    }
+  protected SelenideElement nameField = $x("//input[@name='name']");
+  protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
+  protected SelenideElement configField = $x("//div[@id='config']");
+
+  @Step
+  public ConnectorCreateForm waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    nameField.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public ConnectorCreateForm setName(String connectName) {
+    nameField.shouldBe(Condition.enabled).setValue(connectName);
+    return this;
+  }
+
+  @Step
+  public ConnectorCreateForm setConfig(String configJson) {
+    configField.shouldBe(Condition.enabled).click();
+    setJsonInputValue(contentTextArea, configJson);
+    return this;
+  }
+
+  @Step
+  public ConnectorCreateForm setConnectorDetails(String connectName, String configJson) {
+    setName(connectName);
+    setConfig(configJson);
+    return this;
+  }
+
+  @Step
+  public ConnectorCreateForm clickSubmitButton() {
+    clickSubmitBtn();
+    waitUntilSpinnerDisappear();
+    return this;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorDetails.java
index fbe1984ce33..de74f67e1cc 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/ConnectorDetails.java
@@ -1,84 +1,84 @@
 package com.provectus.kafka.ui.pages.connectors;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
-
 public class ConnectorDetails extends BasePage {
 
-    protected SelenideElement deleteBtn = $x("//li/div[contains(text(),'Delete')]");
-    protected SelenideElement confirmBtnMdl = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
-    protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
-    protected SelenideElement taskTab = $x("//a[contains(text(),'Tasks')]");
-    protected SelenideElement configTab = $x("//a[contains(text(),'Config')]");
-    protected SelenideElement configField = $x("//div[@id='config']");
-    protected String connectorHeaderLocator = "//h1[contains(text(),'%s')]";
+  protected SelenideElement deleteBtn = $x("//li/div[contains(text(),'Delete')]");
+  protected SelenideElement confirmBtnMdl = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
+  protected SelenideElement contentTextArea = $x("//textarea[@class='ace_text-input']");
+  protected SelenideElement taskTab = $x("//a[contains(text(),'Tasks')]");
+  protected SelenideElement configTab = $x("//a[contains(text(),'Config')]");
+  protected SelenideElement configField = $x("//div[@id='config']");
+  protected String connectorHeaderLocator = "//h1[contains(text(),'%s')]";
 
-    @Step
-    public ConnectorDetails waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        dotMenuBtn.shouldBe(Condition.visible);
-        return this;
-    }
+  @Step
+  public ConnectorDetails waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    dotMenuBtn.shouldBe(Condition.visible);
+    return this;
+  }
 
-    @Step
-    public ConnectorDetails openConfigTab() {
-        clickByJavaScript(configTab);
-        return this;
-    }
+  @Step
+  public ConnectorDetails openConfigTab() {
+    clickByJavaScript(configTab);
+    return this;
+  }
 
-    @Step
-    public ConnectorDetails setConfig(String configJson) {
-        configField.shouldBe(Condition.enabled).click();
-        clearByKeyboard(contentTextArea);
-        contentTextArea.setValue(configJson);
-        configField.shouldBe(Condition.enabled).click();
-        return this;
-    }
+  @Step
+  public ConnectorDetails setConfig(String configJson) {
+    configField.shouldBe(Condition.enabled).click();
+    clearByKeyboard(contentTextArea);
+    contentTextArea.setValue(configJson);
+    configField.shouldBe(Condition.enabled).click();
+    return this;
+  }
 
-    @Step
-    public ConnectorDetails clickSubmitButton() {
-        clickSubmitBtn();
-        return this;
-    }
+  @Step
+  public ConnectorDetails clickSubmitButton() {
+    clickSubmitBtn();
+    return this;
+  }
 
-    @Step
-    public ConnectorDetails openDotMenu() {
-        clickByJavaScript(dotMenuBtn);
-        return this;
-    }
+  @Step
+  public ConnectorDetails openDotMenu() {
+    clickByJavaScript(dotMenuBtn);
+    return this;
+  }
 
-    @Step
-    public ConnectorDetails clickDeleteBtn() {
-        clickByJavaScript(deleteBtn);
-        return this;
-    }
+  @Step
+  public ConnectorDetails clickDeleteBtn() {
+    clickByJavaScript(deleteBtn);
+    return this;
+  }
 
-    @Step
-    public ConnectorDetails clickConfirmBtn() {
-        confirmBtnMdl.shouldBe(Condition.enabled).click();
-        confirmBtnMdl.shouldBe(Condition.disappear);
-        return this;
-    }
+  @Step
+  public ConnectorDetails clickConfirmBtn() {
+    confirmBtnMdl.shouldBe(Condition.enabled).click();
+    confirmBtnMdl.shouldBe(Condition.disappear);
+    return this;
+  }
 
-    @Step
-    public ConnectorDetails deleteConnector() {
-        openDotMenu();
-        clickDeleteBtn();
-        clickConfirmBtn();
-        return this;
-    }
+  @Step
+  public ConnectorDetails deleteConnector() {
+    openDotMenu();
+    clickDeleteBtn();
+    clickConfirmBtn();
+    return this;
+  }
 
-    @Step
-    public boolean isConnectorHeaderVisible(String connectorName) {
-        return isVisible($x(String.format(connectorHeaderLocator, connectorName)));
-    }
+  @Step
+  public boolean isConnectorHeaderVisible(String connectorName) {
+    return isVisible($x(String.format(connectorHeaderLocator, connectorName)));
+  }
 
-    @Step
-    public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
-        return isAlertVisible(header, message);
-    }
+  @Step
+  public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
+    return isAlertVisible(header, message);
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java
index 6c672855a63..e4b0d94e642 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connectors/KafkaConnectList.java
@@ -1,44 +1,44 @@
 package com.provectus.kafka.ui.pages.connectors;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KAFKA_CONNECT;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KAFKA_CONNECT;
-
 
 public class KafkaConnectList extends BasePage {
 
-    protected SelenideElement createConnectorBtn = $x("//button[contains(text(),'Create Connector')]");
-
-    public KafkaConnectList() {
-        tableElementNameLocator = "//tbody//td[contains(text(),'%s')]";
-    }
-
-    @Step
-    public KafkaConnectList waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        getPageTitleFromHeader(KAFKA_CONNECT).shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public KafkaConnectList clickCreateConnectorBtn() {
-        clickByJavaScript(createConnectorBtn);
-        return this;
-    }
-
-    @Step
-    public KafkaConnectList openConnector(String connectorName) {
-        getTableElement(connectorName).shouldBe(Condition.enabled).click();
-        return this;
-    }
-
-    @Step
-    public boolean isConnectorVisible(String connectorName) {
-        tableGrid.shouldBe(Condition.visible);
-        return isVisible(getTableElement(connectorName));
-    }
+  protected SelenideElement createConnectorBtn = $x("//button[contains(text(),'Create Connector')]");
+
+  public KafkaConnectList() {
+    tableElementNameLocator = "//tbody//td[contains(text(),'%s')]";
+  }
+
+  @Step
+  public KafkaConnectList waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    getPageTitleFromHeader(KAFKA_CONNECT).shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public KafkaConnectList clickCreateConnectorBtn() {
+    clickByJavaScript(createConnectorBtn);
+    return this;
+  }
+
+  @Step
+  public KafkaConnectList openConnector(String connectorName) {
+    getTableElement(connectorName).shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public boolean isConnectorVisible(String connectorName) {
+    tableGrid.shouldBe(Condition.visible);
+    return isVisible(getTableElement(connectorName));
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersDetails.java
index 240dc613c4e..46025927e53 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersDetails.java
@@ -1,31 +1,31 @@
 package com.provectus.kafka.ui.pages.consumers;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
-
 public class ConsumersDetails extends BasePage {
 
-    protected String consumerIdHeaderLocator = "//h1[contains(text(),'%s')]";
-    protected String topicElementLocator = "//tbody//td//a[text()='%s']";
+  protected String consumerIdHeaderLocator = "//h1[contains(text(),'%s')]";
+  protected String topicElementLocator = "//tbody//td//a[text()='%s']";
 
-    @Step
-    public ConsumersDetails waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        tableGrid.shouldBe(Condition.visible);
-        return this;
-    }
+  @Step
+  public ConsumersDetails waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    tableGrid.shouldBe(Condition.visible);
+    return this;
+  }
 
-    @Step
-    public boolean isRedirectedConsumerTitleVisible(String consumerGroupId) {
-        return isVisible($x(String.format(consumerIdHeaderLocator, consumerGroupId)));
-    }
+  @Step
+  public boolean isRedirectedConsumerTitleVisible(String consumerGroupId) {
+    return isVisible($x(String.format(consumerIdHeaderLocator, consumerGroupId)));
+  }
 
-    @Step
-    public boolean isTopicInConsumersDetailsVisible(String topicName) {
-        tableGrid.shouldBe(Condition.visible);
-        return isVisible($x(String.format(topicElementLocator, topicName)));
-    }
+  @Step
+  public boolean isTopicInConsumersDetailsVisible(String topicName) {
+    tableGrid.shouldBe(Condition.visible);
+    return isVisible($x(String.format(topicElementLocator, topicName)));
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
index 35ef4043447..bc10b8f2387 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/consumers/ConsumersList.java
@@ -1,17 +1,17 @@
 package com.provectus.kafka.ui.pages.consumers;
 
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.CONSUMERS;
+
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.CONSUMERS;
-
 public class ConsumersList extends BasePage {
 
-    @Step
-    public ConsumersList waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        getPageTitleFromHeader(CONSUMERS).shouldBe(Condition.visible);
-        return this;
-    }
+  @Step
+  public ConsumersList waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    getPageTitleFromHeader(CONSUMERS).shouldBe(Condition.visible);
+    return this;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
deleted file mode 100644
index e80229d931f..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlDbList.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.provectus.kafka.ui.pages.ksqlDb;
-
-import com.codeborne.selenide.CollectionCondition;
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.pages.BasePage;
-import com.provectus.kafka.ui.pages.ksqlDb.enums.KsqlMenuTabs;
-import io.qameta.allure.Step;
-import org.openqa.selenium.By;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.codeborne.selenide.Selenide.$;
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
-
-public class KsqlDbList extends BasePage {
-
-    protected SelenideElement executeKsqlBtn = $x("//button[text()='Execute KSQL Request']");
-    protected SelenideElement tablesTab = $x("//nav[@role='navigation']/a[text()='Tables']");
-    protected SelenideElement streamsTab = $x("//nav[@role='navigation']/a[text()='Streams']");
-
-    @Step
-    public KsqlDbList waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        getPageTitleFromHeader(KSQL_DB).shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public KsqlDbList clickExecuteKsqlRequestBtn() {
-        clickByJavaScript(executeKsqlBtn);
-        return this;
-    }
-
-    @Step
-    public KsqlDbList openDetailsTab(KsqlMenuTabs menu) {
-        $(By.linkText(menu.toString())).shouldBe(Condition.visible).click();
-        waitUntilSpinnerDisappear();
-        return this;
-    }
-
-    private List<KsqlDbList.KsqlTablesGridItem> initTablesItems() {
-        List<KsqlDbList.KsqlTablesGridItem> gridItemList = new ArrayList<>();
-        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-                .forEach(item -> gridItemList.add(new KsqlDbList.KsqlTablesGridItem(item)));
-        return gridItemList;
-    }
-
-    @Step
-    public KsqlDbList.KsqlTablesGridItem getTableByName(String tableName) {
-        return initTablesItems().stream()
-                .filter(e -> e.getTableName().equals(tableName))
-                .findFirst().orElseThrow();
-    }
-
-    private List<KsqlDbList.KsqlStreamsGridItem> initStreamsItems() {
-        List<KsqlDbList.KsqlStreamsGridItem> gridItemList = new ArrayList<>();
-        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-                .forEach(item -> gridItemList.add(new KsqlDbList.KsqlStreamsGridItem(item)));
-        return gridItemList;
-    }
-
-    @Step
-    public KsqlDbList.KsqlStreamsGridItem getStreamByName(String streamName) {
-        return initStreamsItems().stream()
-                .filter(e -> e.getStreamName().equals(streamName))
-                .findFirst().orElseThrow();
-    }
-
-    public static class KsqlTablesGridItem extends BasePage {
-
-        private final SelenideElement element;
-
-        public KsqlTablesGridItem(SelenideElement element) {
-            this.element = element;
-        }
-
-        @Step
-        public String getTableName() {
-            return element.$x("./td[1]").getText().trim();
-        }
-
-        @Step
-        public String getTopicName() {
-            return element.$x("./td[2]").getText().trim();
-        }
-
-        @Step
-        public String getKeyFormat() {
-            return element.$x("./td[3]").getText().trim();
-        }
-
-        @Step
-        public String getValueFormat() {
-            return element.$x("./td[4]").getText().trim();
-        }
-
-        @Step
-        public String getIsWindowed() {
-            return element.$x("./td[5]").getText().trim();
-        }
-    }
-
-    public static class KsqlStreamsGridItem extends BasePage {
-
-        private final SelenideElement element;
-
-        public KsqlStreamsGridItem(SelenideElement element) {
-            this.element = element;
-        }
-
-        @Step
-        public String getStreamName() {
-            return element.$x("./td[1]").getText().trim();
-        }
-
-        @Step
-        public String getTopicName() {
-            return element.$x("./td[2]").getText().trim();
-        }
-
-        @Step
-        public String getKeyFormat() {
-            return element.$x("./td[3]").getText().trim();
-        }
-
-        @Step
-        public String getValueFormat() {
-            return element.$x("./td[4]").getText().trim();
-        }
-
-        @Step
-        public String getIsWindowed() {
-            return element.$x("./td[5]").getText().trim();
-        }
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
deleted file mode 100644
index df915c00986..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/KsqlQueryForm.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.provectus.kafka.ui.pages.ksqlDb;
-
-import com.codeborne.selenide.CollectionCondition;
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.ElementsCollection;
-import com.codeborne.selenide.SelenideElement;
-import com.provectus.kafka.ui.pages.BasePage;
-import io.qameta.allure.Step;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.codeborne.selenide.Condition.visible;
-import static com.codeborne.selenide.Selenide.$$x;
-import static com.codeborne.selenide.Selenide.$x;
-
-public class KsqlQueryForm extends BasePage {
-    protected SelenideElement clearBtn = $x("//div/button[text()='Clear']");
-    protected SelenideElement executeBtn = $x("//div/button[text()='Execute']");
-    protected SelenideElement stopQueryBtn = $x("//div/button[text()='Stop query']");
-    protected SelenideElement clearResultsBtn = $x("//div/button[text()='Clear results']");
-    protected SelenideElement addStreamPropertyBtn = $x("//button[text()='Add Stream Property']");
-    protected SelenideElement queryAreaValue = $x("//div[@class='ace_content']");
-    protected SelenideElement queryArea = $x("//div[@id='ksql']/textarea[@class='ace_text-input']");
-    protected ElementsCollection ksqlGridItems = $$x("//tbody//tr");
-    protected ElementsCollection keyField = $$x("//input[@aria-label='key']");
-    protected ElementsCollection valueField = $$x("//input[@aria-label='value']");
-
-    @Step
-    public KsqlQueryForm waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        executeBtn.shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public KsqlQueryForm clickClearBtn() {
-        clickByJavaScript(clearBtn);
-        return this;
-    }
-
-    @Step
-    public KsqlQueryForm clickExecuteBtn() {
-        clickByActions(executeBtn);
-        if (queryAreaValue.getText().contains("EMIT CHANGES;")) {
-            loadingSpinner.shouldBe(Condition.visible);
-        } else {
-            waitUntilSpinnerDisappear();
-        }
-        return this;
-    }
-
-    @Step
-    public KsqlQueryForm clickStopQueryBtn() {
-        clickByActions(stopQueryBtn);
-        waitUntilSpinnerDisappear();
-        return this;
-    }
-
-    @Step
-    public KsqlQueryForm clickClearResultsBtn() {
-        clickByActions(clearResultsBtn);
-        waitUntilSpinnerDisappear();
-        return this;
-    }
-
-    @Step
-    public KsqlQueryForm clickAddStreamProperty() {
-        clickByJavaScript(addStreamPropertyBtn);
-        return this;
-    }
-
-    @Step
-    public KsqlQueryForm setQuery(String query) {
-        queryAreaValue.shouldBe(Condition.visible).click();
-        queryArea.setValue(query);
-        return this;
-    }
-
-    @Step
-    public KsqlQueryForm.KsqlResponseGridItem getTableByName(String name) {
-        return initItems().stream()
-                .filter(e -> e.getName().equalsIgnoreCase(name))
-                .findFirst().orElseThrow();
-    }
-
-    @Step
-    public boolean areResultsVisible() {
-        boolean visible = false;
-        try {
-            visible = initItems().size() > 0;
-        } catch (Throwable ignored) {
-        }
-        return visible;
-    }
-
-    private List<KsqlQueryForm.KsqlResponseGridItem> initItems() {
-        List<KsqlQueryForm.KsqlResponseGridItem> gridItemList = new ArrayList<>();
-        ksqlGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-                .forEach(item -> gridItemList.add(new KsqlQueryForm.KsqlResponseGridItem(item)));
-        return gridItemList;
-    }
-
-    public static class KsqlResponseGridItem extends BasePage {
-
-        private final SelenideElement element;
-
-        private KsqlResponseGridItem(SelenideElement element) {
-            this.element = element;
-        }
-
-        @Step
-        public String getType() {
-            return element.$x("./td[1]").getText().trim();
-        }
-
-        @Step
-        public String getName() {
-            return element.$x("./td[2]").scrollTo().getText().trim();
-        }
-
-        @Step
-        public boolean isVisible() {
-            boolean isVisible = false;
-            try {
-                element.$x("./td[2]").shouldBe(visible, Duration.ofMillis(500));
-                isVisible = true;
-            } catch (Throwable ignored) {
-            }
-            return isVisible;
-        }
-
-        @Step
-        public String getTopic() {
-            return element.$x("./td[3]").getText().trim();
-        }
-
-        @Step
-        public String getKeyFormat() {
-            return element.$x("./td[4]").getText().trim();
-        }
-
-        @Step
-        public String getValueFormat() {
-            return element.$x("./td[5]").getText().trim();
-        }
-
-        @Step
-        public String getIsWindowed() {
-            return element.$x("./td[6]").getText().trim();
-        }
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlMenuTabs.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlMenuTabs.java
deleted file mode 100644
index bb719dc0f6a..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlMenuTabs.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.provectus.kafka.ui.pages.ksqlDb.enums;
-
-public enum KsqlMenuTabs {
-
-    TABLES("Table"),
-    STREAMS("Streams");
-
-    private final String value;
-
-    KsqlMenuTabs(String value) {
-        this.value = value;
-    }
-
-    public String toString() {
-        return value;
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlQueryConfig.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlQueryConfig.java
deleted file mode 100644
index 9f85837474e..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/enums/KsqlQueryConfig.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.provectus.kafka.ui.pages.ksqlDb.enums;
-
-public enum KsqlQueryConfig {
-
-    SHOW_TABLES("show tables;"),
-    SHOW_STREAMS("show streams;"),
-    SELECT_ALL_FROM("SELECT * FROM %s\n" +
-            "EMIT CHANGES;");
-
-    private final String query;
-
-    KsqlQueryConfig(String query) {
-        this.query = query;
-    }
-
-    public String getQuery() {
-        return query;
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
new file mode 100644
index 00000000000..7eb35d52f33
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
@@ -0,0 +1,138 @@
+package com.provectus.kafka.ui.pages.ksqldb;
+
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
+
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import com.provectus.kafka.ui.pages.ksqldb.enums.KsqlMenuTabs;
+import io.qameta.allure.Step;
+import java.util.ArrayList;
+import java.util.List;
+import org.openqa.selenium.By;
+
+public class KsqlDbList extends BasePage {
+
+  protected SelenideElement executeKsqlBtn = $x("//button[text()='Execute KSQL Request']");
+  protected SelenideElement tablesTab = $x("//nav[@role='navigation']/a[text()='Tables']");
+  protected SelenideElement streamsTab = $x("//nav[@role='navigation']/a[text()='Streams']");
+
+  @Step
+  public KsqlDbList waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    getPageTitleFromHeader(KSQL_DB).shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public KsqlDbList clickExecuteKsqlRequestBtn() {
+    clickByJavaScript(executeKsqlBtn);
+    return this;
+  }
+
+  @Step
+  public KsqlDbList openDetailsTab(KsqlMenuTabs menu) {
+    $(By.linkText(menu.toString())).shouldBe(Condition.visible).click();
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  private List<KsqlDbList.KsqlTablesGridItem> initTablesItems() {
+    List<KsqlDbList.KsqlTablesGridItem> gridItemList = new ArrayList<>();
+    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new KsqlDbList.KsqlTablesGridItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public KsqlDbList.KsqlTablesGridItem getTableByName(String tableName) {
+    return initTablesItems().stream()
+        .filter(e -> e.getTableName().equals(tableName))
+        .findFirst().orElseThrow();
+  }
+
+  private List<KsqlDbList.KsqlStreamsGridItem> initStreamsItems() {
+    List<KsqlDbList.KsqlStreamsGridItem> gridItemList = new ArrayList<>();
+    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new KsqlDbList.KsqlStreamsGridItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public KsqlDbList.KsqlStreamsGridItem getStreamByName(String streamName) {
+    return initStreamsItems().stream()
+        .filter(e -> e.getStreamName().equals(streamName))
+        .findFirst().orElseThrow();
+  }
+
+  public static class KsqlTablesGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    public KsqlTablesGridItem(SelenideElement element) {
+      this.element = element;
+    }
+
+    @Step
+    public String getTableName() {
+      return element.$x("./td[1]").getText().trim();
+    }
+
+    @Step
+    public String getTopicName() {
+      return element.$x("./td[2]").getText().trim();
+    }
+
+    @Step
+    public String getKeyFormat() {
+      return element.$x("./td[3]").getText().trim();
+    }
+
+    @Step
+    public String getValueFormat() {
+      return element.$x("./td[4]").getText().trim();
+    }
+
+    @Step
+    public String getIsWindowed() {
+      return element.$x("./td[5]").getText().trim();
+    }
+  }
+
+  public static class KsqlStreamsGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    public KsqlStreamsGridItem(SelenideElement element) {
+      this.element = element;
+    }
+
+    @Step
+    public String getStreamName() {
+      return element.$x("./td[1]").getText().trim();
+    }
+
+    @Step
+    public String getTopicName() {
+      return element.$x("./td[2]").getText().trim();
+    }
+
+    @Step
+    public String getKeyFormat() {
+      return element.$x("./td[3]").getText().trim();
+    }
+
+    @Step
+    public String getValueFormat() {
+      return element.$x("./td[4]").getText().trim();
+    }
+
+    @Step
+    public String getIsWindowed() {
+      return element.$x("./td[5]").getText().trim();
+    }
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
new file mode 100644
index 00000000000..ab24cbe9abb
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
@@ -0,0 +1,153 @@
+package com.provectus.kafka.ui.pages.ksqldb;
+
+import static com.codeborne.selenide.Condition.visible;
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
+import com.codeborne.selenide.SelenideElement;
+import com.provectus.kafka.ui.pages.BasePage;
+import io.qameta.allure.Step;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+public class KsqlQueryForm extends BasePage {
+  protected SelenideElement clearBtn = $x("//div/button[text()='Clear']");
+  protected SelenideElement executeBtn = $x("//div/button[text()='Execute']");
+  protected SelenideElement stopQueryBtn = $x("//div/button[text()='Stop query']");
+  protected SelenideElement clearResultsBtn = $x("//div/button[text()='Clear results']");
+  protected SelenideElement addStreamPropertyBtn = $x("//button[text()='Add Stream Property']");
+  protected SelenideElement queryAreaValue = $x("//div[@class='ace_content']");
+  protected SelenideElement queryArea = $x("//div[@id='ksql']/textarea[@class='ace_text-input']");
+  protected ElementsCollection ksqlGridItems = $$x("//tbody//tr");
+  protected ElementsCollection keyField = $$x("//input[@aria-label='key']");
+  protected ElementsCollection valueField = $$x("//input[@aria-label='value']");
+
+  @Step
+  public KsqlQueryForm waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    executeBtn.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickClearBtn() {
+    clickByJavaScript(clearBtn);
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickExecuteBtn() {
+    clickByActions(executeBtn);
+    if (queryAreaValue.getText().contains("EMIT CHANGES;")) {
+      loadingSpinner.shouldBe(Condition.visible);
+    } else {
+      waitUntilSpinnerDisappear();
+    }
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickStopQueryBtn() {
+    clickByActions(stopQueryBtn);
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickClearResultsBtn() {
+    clickByActions(clearResultsBtn);
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm clickAddStreamProperty() {
+    clickByJavaScript(addStreamPropertyBtn);
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm setQuery(String query) {
+    queryAreaValue.shouldBe(Condition.visible).click();
+    queryArea.setValue(query);
+    return this;
+  }
+
+  @Step
+  public KsqlQueryForm.KsqlResponseGridItem getTableByName(String name) {
+    return initItems().stream()
+        .filter(e -> e.getName().equalsIgnoreCase(name))
+        .findFirst().orElseThrow();
+  }
+
+  @Step
+  public boolean areResultsVisible() {
+    boolean visible = false;
+    try {
+      visible = initItems().size() > 0;
+    } catch (Throwable ignored) {
+    }
+    return visible;
+  }
+
+  private List<KsqlQueryForm.KsqlResponseGridItem> initItems() {
+    List<KsqlQueryForm.KsqlResponseGridItem> gridItemList = new ArrayList<>();
+    ksqlGridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new KsqlQueryForm.KsqlResponseGridItem(item)));
+    return gridItemList;
+  }
+
+  public static class KsqlResponseGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    private KsqlResponseGridItem(SelenideElement element) {
+      this.element = element;
+    }
+
+    @Step
+    public String getType() {
+      return element.$x("./td[1]").getText().trim();
+    }
+
+    @Step
+    public String getName() {
+      return element.$x("./td[2]").scrollTo().getText().trim();
+    }
+
+    @Step
+    public boolean isVisible() {
+      boolean isVisible = false;
+      try {
+        element.$x("./td[2]").shouldBe(visible, Duration.ofMillis(500));
+        isVisible = true;
+      } catch (Throwable ignored) {
+      }
+      return isVisible;
+    }
+
+    @Step
+    public String getTopic() {
+      return element.$x("./td[3]").getText().trim();
+    }
+
+    @Step
+    public String getKeyFormat() {
+      return element.$x("./td[4]").getText().trim();
+    }
+
+    @Step
+    public String getValueFormat() {
+      return element.$x("./td[5]").getText().trim();
+    }
+
+    @Step
+    public String getIsWindowed() {
+      return element.$x("./td[6]").getText().trim();
+    }
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java
new file mode 100644
index 00000000000..016246edb91
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlMenuTabs.java
@@ -0,0 +1,17 @@
+package com.provectus.kafka.ui.pages.ksqldb.enums;
+
+public enum KsqlMenuTabs {
+
+  TABLES("Table"),
+  STREAMS("Streams");
+
+  private final String value;
+
+  KsqlMenuTabs(String value) {
+    this.value = value;
+  }
+
+  public String toString() {
+    return value;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java
new file mode 100644
index 00000000000..d3cf0ddec26
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/enums/KsqlQueryConfig.java
@@ -0,0 +1,18 @@
+package com.provectus.kafka.ui.pages.ksqldb.enums;
+
+public enum KsqlQueryConfig {
+
+  SHOW_TABLES("show tables;"),
+  SHOW_STREAMS("show streams;"),
+  SELECT_ALL_FROM("SELECT * FROM %s\n" + "EMIT CHANGES;");
+
+  private final String query;
+
+  KsqlQueryConfig(String query) {
+    this.query = query;
+  }
+
+  public String getQuery() {
+    return query;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Stream.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java
similarity index 50%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Stream.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java
index 4030a478c47..3583a243665 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Stream.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Stream.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.ksqlDb.models;
+package com.provectus.kafka.ui.pages.ksqldb.models;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -7,5 +7,5 @@
 @Accessors(chain = true)
 public class Stream {
 
-    private String name, topicName, valueFormat, partitions;
+  private String name, topicName, valueFormat, partitions;
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Table.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java
similarity index 56%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Table.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java
index 1856fffd85c..96b3d88ba07 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqlDb/models/Table.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/models/Table.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.pages.ksqlDb.models;
+package com.provectus.kafka.ui.pages.ksqldb.models;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -7,5 +7,5 @@
 @Accessors(chain = true)
 public class Table {
 
-    private String name, streamName;
+  private String name, streamName;
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java
index 35490a27d8f..ea3cc6ecd10 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/NaviSideBar.java
@@ -1,64 +1,63 @@
 package com.provectus.kafka.ui.pages.panels;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
 import io.qameta.allure.Step;
-
 import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.settings.BaseSource.CLUSTER_NAME;
-
 public class NaviSideBar extends BasePage {
 
-    protected SelenideElement dashboardMenuItem = $x("//a[@title='Dashboard']");
-    protected String sideMenuOptionElementLocator = ".//ul/li[contains(.,'%s')]";
-    protected String clusterElementLocator = "//aside/ul/li[contains(.,'%s')]";
-
-    private SelenideElement expandCluster(String clusterName) {
-        SelenideElement clusterElement = $x(String.format(clusterElementLocator, clusterName)).shouldBe(Condition.visible);
-        if (clusterElement.parent().$$x(".//ul").size() == 0) {
-            clickByActions(clusterElement);
-        }
-        return clusterElement;
-    }
-
-    @Step
-    public NaviSideBar waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        dashboardMenuItem.shouldBe(Condition.visible, Duration.ofSeconds(30));
-        return this;
-    }
-
-    @Step
-    public String getPagePath(MenuItem menuItem) {
-        return getPagePathFromHeader(menuItem)
-                .shouldBe(Condition.visible)
-                .getText().trim();
-    }
-
-    @Step
-    public NaviSideBar openSideMenu(String clusterName, MenuItem menuItem) {
-        clickByActions(expandCluster(clusterName).parent()
-                .$x(String.format(sideMenuOptionElementLocator, menuItem.getNaviTitle())));
-        return this;
-    }
-
-    @Step
-    public NaviSideBar openSideMenu(MenuItem menuItem) {
-        openSideMenu(CLUSTER_NAME, menuItem);
-        return this;
-    }
+  protected SelenideElement dashboardMenuItem = $x("//a[@title='Dashboard']");
+  protected String sideMenuOptionElementLocator = ".//ul/li[contains(.,'%s')]";
+  protected String clusterElementLocator = "//aside/ul/li[contains(.,'%s')]";
 
-    public List<SelenideElement> getAllMenuButtons() {
-        expandCluster(CLUSTER_NAME);
-        return Stream.of(MenuItem.values())
-                .map(menuItem -> $x(String.format(sideMenuOptionElementLocator, menuItem.getNaviTitle())))
-                .collect(Collectors.toList());
+  private SelenideElement expandCluster(String clusterName) {
+    SelenideElement clusterElement = $x(String.format(clusterElementLocator, clusterName)).shouldBe(Condition.visible);
+    if (clusterElement.parent().$$x(".//ul").size() == 0) {
+      clickByActions(clusterElement);
     }
+    return clusterElement;
+  }
+
+  @Step
+  public NaviSideBar waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    dashboardMenuItem.shouldBe(Condition.visible, Duration.ofSeconds(30));
+    return this;
+  }
+
+  @Step
+  public String getPagePath(MenuItem menuItem) {
+    return getPagePathFromHeader(menuItem)
+        .shouldBe(Condition.visible)
+        .getText().trim();
+  }
+
+  @Step
+  public NaviSideBar openSideMenu(String clusterName, MenuItem menuItem) {
+    clickByActions(expandCluster(clusterName).parent()
+        .$x(String.format(sideMenuOptionElementLocator, menuItem.getNaviTitle())));
+    return this;
+  }
+
+  @Step
+  public NaviSideBar openSideMenu(MenuItem menuItem) {
+    openSideMenu(CLUSTER_NAME, menuItem);
+    return this;
+  }
+
+  public List<SelenideElement> getAllMenuButtons() {
+    expandCluster(CLUSTER_NAME);
+    return Stream.of(MenuItem.values())
+        .map(menuItem -> $x(String.format(sideMenuOptionElementLocator, menuItem.getNaviTitle())))
+        .collect(Collectors.toList());
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/TopPanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/TopPanel.java
index 77cf71a9291..805e5b1ee11 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/TopPanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/TopPanel.java
@@ -1,26 +1,25 @@
 package com.provectus.kafka.ui.pages.panels;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
-
 import java.util.Arrays;
 import java.util.List;
 
-import static com.codeborne.selenide.Selenide.$x;
-
 public class TopPanel extends BasePage {
 
-    protected SelenideElement kafkaLogo = $x("//a[contains(text(),'UI for Apache Kafka')]");
-    protected SelenideElement kafkaVersion = $x("//a[@title='Current commit']");
-    protected SelenideElement logOutBtn = $x("//button[contains(text(),'Log out')]");
-    protected SelenideElement gitBtn = $x("//a[@href='https://github.com/provectus/kafka-ui']");
-    protected SelenideElement discordBtn = $x("//a[contains(@href,'https://discord.com/invite')]");
+  protected SelenideElement kafkaLogo = $x("//a[contains(text(),'UI for Apache Kafka')]");
+  protected SelenideElement kafkaVersion = $x("//a[@title='Current commit']");
+  protected SelenideElement logOutBtn = $x("//button[contains(text(),'Log out')]");
+  protected SelenideElement gitBtn = $x("//a[@href='https://github.com/provectus/kafka-ui']");
+  protected SelenideElement discordBtn = $x("//a[contains(@href,'https://discord.com/invite')]");
 
-    public List<SelenideElement> getAllVisibleElements() {
-        return Arrays.asList(kafkaLogo, kafkaVersion, gitBtn, discordBtn);
-    }
+  public List<SelenideElement> getAllVisibleElements() {
+    return Arrays.asList(kafkaLogo, kafkaVersion, gitBtn, discordBtn);
+  }
 
-    public List<SelenideElement> getAllEnabledElements() {
-        return Arrays.asList(gitBtn, discordBtn, kafkaLogo);
-    }
+  public List<SelenideElement> getAllEnabledElements() {
+    return Arrays.asList(gitBtn, discordBtn, kafkaLogo);
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/enums/MenuItem.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/enums/MenuItem.java
index 6610a8293ba..993d6070a02 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/enums/MenuItem.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/panels/enums/MenuItem.java
@@ -1,28 +1,28 @@
 package com.provectus.kafka.ui.pages.panels.enums;
 
 public enum MenuItem {
-    
-    DASHBOARD("Dashboard", "Dashboard"),
-    BROKERS("Brokers", "Brokers"),
-    TOPICS("Topics", "Topics"),
-    CONSUMERS("Consumers", "Consumers"),
-    SCHEMA_REGISTRY("Schema Registry", "Schema Registry"),
-    KAFKA_CONNECT("Kafka Connect", "Connectors"),
-    KSQL_DB("KSQL DB", "KSQL DB");
-    
-    private final String naviTitle;
-    private final String pageTitle;
-    
-    MenuItem(String naviTitle, String pageTitle) {
-        this.naviTitle = naviTitle;
-        this.pageTitle = pageTitle;
-    }
-    
-    public String getNaviTitle() {
-        return naviTitle;
-    }
-    
-    public String getPageTitle() {
-        return pageTitle;
-    }
+
+  DASHBOARD("Dashboard", "Dashboard"),
+  BROKERS("Brokers", "Brokers"),
+  TOPICS("Topics", "Topics"),
+  CONSUMERS("Consumers", "Consumers"),
+  SCHEMA_REGISTRY("Schema Registry", "Schema Registry"),
+  KAFKA_CONNECT("Kafka Connect", "Connectors"),
+  KSQL_DB("KSQL DB", "KSQL DB");
+
+  private final String naviTitle;
+  private final String pageTitle;
+
+  MenuItem(String naviTitle, String pageTitle) {
+    this.naviTitle = naviTitle;
+    this.pageTitle = pageTitle;
+  }
+
+  public String getNaviTitle() {
+    return naviTitle;
+  }
+
+  public String getPageTitle() {
+    return pageTitle;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java
index 52bfe0971f0..374bb427496 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaCreateForm.java
@@ -1,5 +1,10 @@
 package com.provectus.kafka.ui.pages.schemas;
 
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+import static org.openqa.selenium.By.id;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
@@ -7,133 +12,130 @@
 import com.provectus.kafka.ui.api.model.SchemaType;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-import org.openqa.selenium.Keys;
-import org.openqa.selenium.interactions.Actions;
-
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import static com.codeborne.selenide.Selenide.*;
-import static org.openqa.selenium.By.id;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.interactions.Actions;
 
 public class SchemaCreateForm extends BasePage {
 
-    protected SelenideElement schemaNameField = $x("//input[@name='subject']");
-    protected SelenideElement pageTitle = $x("//h1['Edit']");
-    protected SelenideElement schemaTextArea = $x("//textarea[@name='schema']");
-    protected SelenideElement newSchemaInput = $("#newSchema [wrap]");
-    protected SelenideElement schemaTypeDdl = $x("//ul[@name='schemaType']");
-    protected SelenideElement compatibilityLevelList = $x("//ul[@name='compatibilityLevel']");
-    protected SelenideElement newSchemaTextArea = $x("//div[@id='newSchema']");
-    protected SelenideElement latestSchemaTextArea = $x("//div[@id='latestSchema']");
-    protected SelenideElement leftVersionDdl = $(id("left-select"));
-    protected SelenideElement rightVersionDdl = $(id("right-select"));
-    protected List<SelenideElement> visibleMarkers = $$x("//div[@class='ace_scroller']//div[contains(@class,'codeMarker')]");
-    protected List<SelenideElement> elementsCompareVersionDdl = $$x("//ul[@role='listbox']/ul/li");
-    protected String ddlElementLocator = "//li[@value='%s']";
-
-    @Step
-    public SchemaCreateForm waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        pageTitle.shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public SchemaCreateForm setSubjectName(String name) {
-        schemaNameField.setValue(name);
-        return this;
-    }
-
-    @Step
-    public SchemaCreateForm setSchemaField(String text) {
-        schemaTextArea.setValue(text);
-        return this;
-    }
-
-    @Step
-    public SchemaCreateForm selectSchemaTypeFromDropdown(SchemaType schemaType) {
-        schemaTypeDdl.shouldBe(Condition.enabled).click();
-        $x(String.format(ddlElementLocator, schemaType.getValue())).shouldBe(Condition.visible).click();
-        return this;
-    }
-
-    @Step
-    public SchemaCreateForm clickSubmitButton() {
-        clickSubmitBtn();
-        return this;
-    }
-
-    @Step
-    public SchemaCreateForm selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum level) {
-        compatibilityLevelList.shouldBe(Condition.enabled).click();
-        $x(String.format(ddlElementLocator, level.getValue())).shouldBe(Condition.visible).click();
-        return this;
-    }
-
-    @Step
-    public SchemaCreateForm openLeftVersionDdl() {
-        leftVersionDdl.shouldBe(Condition.enabled).click();
-        return this;
-    }
-
-    @Step
-    public SchemaCreateForm openRightVersionDdl() {
-        rightVersionDdl.shouldBe(Condition.enabled).click();
-        return this;
-    }
-
-    @Step
-    public int getVersionsNumberFromList() {
-        return elementsCompareVersionDdl.size();
-    }
-
-    @Step
-    public SchemaCreateForm selectVersionFromDropDown(int versionNumberDd) {
-        $x(String.format(ddlElementLocator, versionNumberDd)).shouldBe(Condition.visible).click();
-        return this;
-    }
-
-    @Step
-    public int getMarkedLinesNumber() {
-        return visibleMarkers.size();
-    }
-
-    @Step
-    public SchemaCreateForm setNewSchemaValue(String configJson) {
-        newSchemaTextArea.shouldBe(Condition.visible).click();
-        newSchemaInput.shouldBe(Condition.enabled);
-        new Actions(WebDriverRunner.getWebDriver())
-                .sendKeys(Keys.PAGE_UP)
-                .keyDown(Keys.SHIFT)
-                .sendKeys(Keys.PAGE_DOWN)
-                .keyUp(Keys.SHIFT)
-                .sendKeys(Keys.DELETE)
-                .perform();
-        setJsonInputValue(newSchemaInput, configJson);
-        return this;
-    }
-
-    @Step
-    public List<SelenideElement> getAllDetailsPageElements() {
-        return Stream.of(compatibilityLevelList, newSchemaTextArea, latestSchemaTextArea, submitBtn, schemaTypeDdl)
-                .collect(Collectors.toList());
-    }
-
-    @Step
-    public boolean isSubmitBtnEnabled() {
-        return isEnabled(submitBtn);
-    }
-
-    @Step
-    public boolean isSchemaDropDownEnabled() {
-        boolean enabled = true;
-        try {
-            String attribute = schemaTypeDdl.getAttribute("disabled");
-            enabled = false;
-        } catch (Throwable ignored) {
-        }
-        return enabled;
+  protected SelenideElement schemaNameField = $x("//input[@name='subject']");
+  protected SelenideElement pageTitle = $x("//h1['Edit']");
+  protected SelenideElement schemaTextArea = $x("//textarea[@name='schema']");
+  protected SelenideElement newSchemaInput = $("#newSchema [wrap]");
+  protected SelenideElement schemaTypeDdl = $x("//ul[@name='schemaType']");
+  protected SelenideElement compatibilityLevelList = $x("//ul[@name='compatibilityLevel']");
+  protected SelenideElement newSchemaTextArea = $x("//div[@id='newSchema']");
+  protected SelenideElement latestSchemaTextArea = $x("//div[@id='latestSchema']");
+  protected SelenideElement leftVersionDdl = $(id("left-select"));
+  protected SelenideElement rightVersionDdl = $(id("right-select"));
+  protected List<SelenideElement> visibleMarkers =
+      $$x("//div[@class='ace_scroller']//div[contains(@class,'codeMarker')]");
+  protected List<SelenideElement> elementsCompareVersionDdl = $$x("//ul[@role='listbox']/ul/li");
+  protected String ddlElementLocator = "//li[@value='%s']";
+
+  @Step
+  public SchemaCreateForm waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    pageTitle.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public SchemaCreateForm setSubjectName(String name) {
+    schemaNameField.setValue(name);
+    return this;
+  }
+
+  @Step
+  public SchemaCreateForm setSchemaField(String text) {
+    schemaTextArea.setValue(text);
+    return this;
+  }
+
+  @Step
+  public SchemaCreateForm selectSchemaTypeFromDropdown(SchemaType schemaType) {
+    schemaTypeDdl.shouldBe(Condition.enabled).click();
+    $x(String.format(ddlElementLocator, schemaType.getValue())).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public SchemaCreateForm clickSubmitButton() {
+    clickSubmitBtn();
+    return this;
+  }
+
+  @Step
+  public SchemaCreateForm selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum level) {
+    compatibilityLevelList.shouldBe(Condition.enabled).click();
+    $x(String.format(ddlElementLocator, level.getValue())).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public SchemaCreateForm openLeftVersionDdl() {
+    leftVersionDdl.shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public SchemaCreateForm openRightVersionDdl() {
+    rightVersionDdl.shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public int getVersionsNumberFromList() {
+    return elementsCompareVersionDdl.size();
+  }
+
+  @Step
+  public SchemaCreateForm selectVersionFromDropDown(int versionNumberDd) {
+    $x(String.format(ddlElementLocator, versionNumberDd)).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public int getMarkedLinesNumber() {
+    return visibleMarkers.size();
+  }
+
+  @Step
+  public SchemaCreateForm setNewSchemaValue(String configJson) {
+    newSchemaTextArea.shouldBe(Condition.visible).click();
+    newSchemaInput.shouldBe(Condition.enabled);
+    new Actions(WebDriverRunner.getWebDriver())
+        .sendKeys(Keys.PAGE_UP)
+        .keyDown(Keys.SHIFT)
+        .sendKeys(Keys.PAGE_DOWN)
+        .keyUp(Keys.SHIFT)
+        .sendKeys(Keys.DELETE)
+        .perform();
+    setJsonInputValue(newSchemaInput, configJson);
+    return this;
+  }
+
+  @Step
+  public List<SelenideElement> getAllDetailsPageElements() {
+    return Stream.of(compatibilityLevelList, newSchemaTextArea, latestSchemaTextArea, submitBtn, schemaTypeDdl)
+        .collect(Collectors.toList());
+  }
+
+  @Step
+  public boolean isSubmitBtnEnabled() {
+    return isEnabled(submitBtn);
+  }
+
+  @Step
+  public boolean isSchemaDropDownEnabled() {
+    boolean enabled = true;
+    try {
+      String attribute = schemaTypeDdl.getAttribute("disabled");
+      enabled = false;
+    } catch (Throwable ignored) {
     }
+    return enabled;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java
index fc7013d46f6..11c2d4a7ba3 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java
@@ -1,69 +1,69 @@
 package com.provectus.kafka.ui.pages.schemas;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
-
 public class SchemaDetails extends BasePage {
 
-    protected SelenideElement actualVersionTextArea = $x("//div[@id='schema']");
-    protected SelenideElement compatibilityField = $x("//h4[contains(text(),'Compatibility')]/../p");
-    protected SelenideElement editSchemaBtn = $x("//button[contains(text(),'Edit Schema')]");
-    protected SelenideElement removeBtn = $x("//*[contains(text(),'Remove')]");
-    protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
-    protected SelenideElement schemaTypeField = $x("//h4[contains(text(),'Type')]/../p");
-    protected SelenideElement latestVersionField = $x("//h4[contains(text(),'Latest version')]/../p");
-    protected SelenideElement compareVersionBtn = $x("//button[text()='Compare Versions']");
-    protected String schemaHeaderLocator = "//h1[contains(text(),'%s')]";
+  protected SelenideElement actualVersionTextArea = $x("//div[@id='schema']");
+  protected SelenideElement compatibilityField = $x("//h4[contains(text(),'Compatibility')]/../p");
+  protected SelenideElement editSchemaBtn = $x("//button[contains(text(),'Edit Schema')]");
+  protected SelenideElement removeBtn = $x("//*[contains(text(),'Remove')]");
+  protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
+  protected SelenideElement schemaTypeField = $x("//h4[contains(text(),'Type')]/../p");
+  protected SelenideElement latestVersionField = $x("//h4[contains(text(),'Latest version')]/../p");
+  protected SelenideElement compareVersionBtn = $x("//button[text()='Compare Versions']");
+  protected String schemaHeaderLocator = "//h1[contains(text(),'%s')]";
 
-    @Step
-    public SchemaDetails waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        actualVersionTextArea.shouldBe(Condition.visible);
-        return this;
-    }
+  @Step
+  public SchemaDetails waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    actualVersionTextArea.shouldBe(Condition.visible);
+    return this;
+  }
 
-    @Step
-    public String getCompatibility() {
-        return compatibilityField.getText();
-    }
+  @Step
+  public String getCompatibility() {
+    return compatibilityField.getText();
+  }
 
-    @Step
-    public boolean isSchemaHeaderVisible(String schemaName) {
-        return isVisible($x(String.format(schemaHeaderLocator, schemaName)));
-    }
+  @Step
+  public boolean isSchemaHeaderVisible(String schemaName) {
+    return isVisible($x(String.format(schemaHeaderLocator, schemaName)));
+  }
 
-    @Step
-    public int getLatestVersion() {
-        return Integer.parseInt(latestVersionField.getText());
-    }
+  @Step
+  public int getLatestVersion() {
+    return Integer.parseInt(latestVersionField.getText());
+  }
 
-    @Step
-    public String getSchemaType() {
-        return schemaTypeField.getText();
-    }
+  @Step
+  public String getSchemaType() {
+    return schemaTypeField.getText();
+  }
 
-    @Step
-    public SchemaDetails openEditSchema() {
-        editSchemaBtn.shouldBe(Condition.visible).click();
-        return this;
-    }
+  @Step
+  public SchemaDetails openEditSchema() {
+    editSchemaBtn.shouldBe(Condition.visible).click();
+    return this;
+  }
 
-    @Step
-    public SchemaDetails openCompareVersionMenu() {
-        compareVersionBtn.shouldBe(Condition.enabled).click();
-        return this;
-    }
+  @Step
+  public SchemaDetails openCompareVersionMenu() {
+    compareVersionBtn.shouldBe(Condition.enabled).click();
+    return this;
+  }
 
-    @Step
-    public SchemaDetails removeSchema() {
-        clickByJavaScript(dotMenuBtn);
-        removeBtn.shouldBe(Condition.enabled).click();
-        confirmBtn.shouldBe(Condition.visible).click();
-        confirmBtn.shouldBe(Condition.disappear);
-        return this;
-    }
+  @Step
+  public SchemaDetails removeSchema() {
+    clickByJavaScript(dotMenuBtn);
+    removeBtn.shouldBe(Condition.enabled).click();
+    confirmBtn.shouldBe(Condition.visible).click();
+    confirmBtn.shouldBe(Condition.disappear);
+    return this;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java
index 4f06bb995b0..f2d2f4b98c7 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaRegistryList.java
@@ -1,42 +1,42 @@
 package com.provectus.kafka.ui.pages.schemas;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.SCHEMA_REGISTRY;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.SCHEMA_REGISTRY;
-
 public class SchemaRegistryList extends BasePage {
 
-    protected SelenideElement createSchemaBtn = $x("//button[contains(text(),'Create Schema')]");
-
-    @Step
-    public SchemaRegistryList waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        getPageTitleFromHeader(SCHEMA_REGISTRY).shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public SchemaRegistryList clickCreateSchema() {
-        clickByJavaScript(createSchemaBtn);
-        return this;
-    }
-
-    @Step
-    public SchemaRegistryList openSchema(String schemaName) {
-        getTableElement(schemaName)
-                .shouldBe(Condition.enabled).click();
-        return this;
-    }
-
-    @Step
-    public boolean isSchemaVisible(String schemaName) {
-        tableGrid.shouldBe(Condition.visible);
-        return isVisible(getTableElement(schemaName));
-    }
+  protected SelenideElement createSchemaBtn = $x("//button[contains(text(),'Create Schema')]");
+
+  @Step
+  public SchemaRegistryList waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    getPageTitleFromHeader(SCHEMA_REGISTRY).shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public SchemaRegistryList clickCreateSchema() {
+    clickByJavaScript(createSchemaBtn);
+    return this;
+  }
+
+  @Step
+  public SchemaRegistryList openSchema(String schemaName) {
+    getTableElement(schemaName)
+        .shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public boolean isSchemaVisible(String schemaName) {
+    tableGrid.shouldBe(Condition.visible);
+    return isVisible(getTableElement(schemaName));
+  }
 }
 
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
index 651c514eefc..e407d4fe3dc 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
@@ -1,57 +1,56 @@
 package com.provectus.kafka.ui.pages.topics;
 
+import static com.codeborne.selenide.Selenide.$x;
+import static com.codeborne.selenide.Selenide.refresh;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-
 import java.util.Arrays;
 
-import static com.codeborne.selenide.Selenide.$x;
-import static com.codeborne.selenide.Selenide.refresh;
-
 public class ProduceMessagePanel extends BasePage {
 
-    protected SelenideElement keyTextArea = $x("//div[@id='key']/textarea");
-    protected SelenideElement contentTextArea = $x("//div[@id='content']/textarea");
-    protected SelenideElement headersTextArea = $x("//div[@id='headers']/textarea");
-    protected SelenideElement submitBtn = headersTextArea.$x("../../../..//button[@type='submit']");
-    protected SelenideElement partitionDdl = $x("//ul[@name='partition']");
-    protected SelenideElement keySerdeDdl = $x("//ul[@name='keySerde']");
-    protected SelenideElement contentSerdeDdl = $x("//ul[@name='valueSerde']");
-
-    @Step
-    public ProduceMessagePanel waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        Arrays.asList(partitionDdl, keySerdeDdl, contentSerdeDdl).forEach(element -> element.shouldBe(Condition.visible));
-        return this;
-    }
-
-    @Step
-    public ProduceMessagePanel setKeyField(String value) {
-        clearByKeyboard(keyTextArea);
-        keyTextArea.setValue(value);
-        return this;
-    }
-
-    @Step
-    public ProduceMessagePanel setContentFiled(String value) {
-        clearByKeyboard(contentTextArea);
-        contentTextArea.setValue(value);
-        return this;
-    }
-
-    @Step
-    public ProduceMessagePanel setHeaderFiled(String value) {
-        headersTextArea.setValue(value);
-        return this;
-    }
-
-    @Step
-    public ProduceMessagePanel submitProduceMessage() {
-        clickByActions(submitBtn);
-        submitBtn.shouldBe(Condition.disappear);
-        refresh();
-        return this;
-    }
+  protected SelenideElement keyTextArea = $x("//div[@id='key']/textarea");
+  protected SelenideElement contentTextArea = $x("//div[@id='content']/textarea");
+  protected SelenideElement headersTextArea = $x("//div[@id='headers']/textarea");
+  protected SelenideElement submitBtn = headersTextArea.$x("../../../..//button[@type='submit']");
+  protected SelenideElement partitionDdl = $x("//ul[@name='partition']");
+  protected SelenideElement keySerdeDdl = $x("//ul[@name='keySerde']");
+  protected SelenideElement contentSerdeDdl = $x("//ul[@name='valueSerde']");
+
+  @Step
+  public ProduceMessagePanel waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    Arrays.asList(partitionDdl, keySerdeDdl, contentSerdeDdl).forEach(element -> element.shouldBe(Condition.visible));
+    return this;
+  }
+
+  @Step
+  public ProduceMessagePanel setKeyField(String value) {
+    clearByKeyboard(keyTextArea);
+    keyTextArea.setValue(value);
+    return this;
+  }
+
+  @Step
+  public ProduceMessagePanel setContentFiled(String value) {
+    clearByKeyboard(contentTextArea);
+    contentTextArea.setValue(value);
+    return this;
+  }
+
+  @Step
+  public ProduceMessagePanel setHeaderFiled(String value) {
+    headersTextArea.setValue(value);
+    return this;
+  }
+
+  @Step
+  public ProduceMessagePanel submitProduceMessage() {
+    clickByActions(submitBtn);
+    submitBtn.shouldBe(Condition.disappear);
+    refresh();
+    return this;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
index 9c255d57113..57f5930d66e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
@@ -1,6 +1,15 @@
 package com.provectus.kafka.ui.pages.topics;
 
-import com.codeborne.selenide.*;
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$$;
+import static com.codeborne.selenide.Selenide.$x;
+import static org.openqa.selenium.By.id;
+
+import com.codeborne.selenide.ClickOptions;
+import com.codeborne.selenide.CollectionCondition;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
+import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue;
 import com.provectus.kafka.ui.pages.topics.enums.CustomParameterType;
@@ -8,267 +17,264 @@
 import com.provectus.kafka.ui.pages.topics.enums.TimeToRetain;
 import io.qameta.allure.Step;
 
-import static com.codeborne.selenide.Selenide.*;
-import static org.openqa.selenium.By.id;
-
 public class TopicCreateEditForm extends BasePage {
 
-    protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
-    protected SelenideElement partitionsField = $x("//input[@name='partitions']");
-    protected SelenideElement nameField = $(id("topicFormName"));
-    protected SelenideElement maxMessageBytesField = $x("//input[@name='maxMessageBytes']");
-    protected SelenideElement minInSyncReplicasField = $x("//input[@name='minInSyncReplicas']");
-    protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
-    protected SelenideElement maxSizeOnDiscDdl = $x("//ul[@id='topicFormRetentionBytes']");
-    protected SelenideElement customParameterDdl = $x("//ul[contains(@name,'customParams')]");
-    protected SelenideElement deleteCustomParameterBtn = $x("//span[contains(@title,'Delete customParam')]");
-    protected SelenideElement addCustomParameterTypeBtn = $x("//button[contains(text(),'Add Custom Parameter')]");
-    protected SelenideElement customParameterValueField = $x("//input[@placeholder='Value']");
-    protected SelenideElement validationCustomParameterValueMsg = $x("//p[contains(text(),'Value is required')]");
-    protected String ddlElementLocator = "//li[@value='%s']";
-    protected String btnTimeToRetainLocator = "//button[@class][text()='%s']";
-
-
-    @Step
-    public TopicCreateEditForm waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        nameField.shouldBe(Condition.visible);
-        return this;
-    }
-
-    public boolean isCreateTopicButtonEnabled() {
-        return isEnabled(submitBtn);
-    }
-
-    public boolean isDeleteCustomParameterButtonEnabled() {
-        return isEnabled(deleteCustomParameterBtn);
-    }
-
-    public boolean isNameFieldEnabled() {
-        return isEnabled(nameField);
-    }
-
-    @Step
-    public TopicCreateEditForm setTopicName(String topicName) {
-        sendKeysAfterClear(nameField, topicName);
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setMinInsyncReplicas(Integer minInsyncReplicas) {
-        minInSyncReplicasField.setValue(minInsyncReplicas.toString());
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setTimeToRetainDataInMs(Long ms) {
-        timeToRetainField.setValue(ms.toString());
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setTimeToRetainDataInMs(String ms) {
-        timeToRetainField.setValue(ms);
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setMaxSizeOnDiskInGB(MaxSizeOnDisk MaxSizeOnDisk) {
-        maxSizeOnDiscDdl.shouldBe(Condition.visible).click();
-        $x(String.format(ddlElementLocator, MaxSizeOnDisk.getOptionValue())).shouldBe(Condition.visible).click();
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm clickAddCustomParameterTypeButton() {
-        addCustomParameterTypeBtn.click();
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm openCustomParameterTypeDdl() {
-        customParameterDdl.shouldBe(Condition.visible).click();
-        ddlOptions.shouldHave(CollectionCondition.sizeGreaterThan(0));
-        return this;
-    }
-
-    @Step
-    public ElementsCollection getAllDdlOptions() {
-        return getDdlOptions();
-    }
-
-    @Step
-    public TopicCreateEditForm setCustomParameterType(CustomParameterType customParameterType) {
-        openCustomParameterTypeDdl();
-        $x(String.format(ddlElementLocator, customParameterType.getOptionValue())).shouldBe(Condition.visible).click();
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm clearCustomParameterValue() {
-        clearByKeyboard(customParameterValueField);
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setNumberOfPartitions(int partitions) {
-        partitionsField.shouldBe(Condition.enabled).clear();
-        partitionsField.sendKeys(String.valueOf(partitions));
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setTimeToRetainDataByButtons(TimeToRetain timeToRetain) {
-        $x(String.format(btnTimeToRetainLocator, timeToRetain.getButton())).shouldBe(Condition.enabled).click();
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyOptionValue) {
-        cleanUpPolicyDdl.shouldBe(Condition.visible).click();
-        $x(String.format(ddlElementLocator, cleanupPolicyOptionValue.getOptionValue())).shouldBe(Condition.visible).click();
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm selectRetentionBytes(String visibleValue) {
-        return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
-    }
-
-    @Step
-    public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
-        return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
-    }
-
-    @Step
-    public TopicCreateEditForm clickCreateTopicBtn() {
-        clickSubmitBtn();
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm addCustomParameter(String customParameterName,
-                                                  String customParameterValue) {
-        ElementsCollection customParametersElements =
-                $$("ul[role=listbox][name^=customParams][name$=name]");
-        KafkaUISelectElement kafkaUISelectElement = null;
-        if (customParametersElements.size() == 1) {
-            if ("Select".equals(customParametersElements.first().getText())) {
-                kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.first());
-            }
-        } else {
-            $$("button")
-                    .find(Condition.exactText("Add Custom Parameter"))
-                    .click();
-            customParametersElements = $$("ul[role=listbox][name^=customParams][name$=name]");
-            kafkaUISelectElement = new KafkaUISelectElement(customParametersElements.last());
-        }
-        if (kafkaUISelectElement != null) {
-            kafkaUISelectElement.selectByVisibleText(customParameterName);
-        }
-        $(String.format("input[name=\"customParams.%d.value\"]", customParametersElements.size() - 1))
-                .setValue(customParameterValue);
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm updateCustomParameter(String customParameterName,
-                                                     String customParameterValue) {
-        SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
-                .find(Condition.exactText(customParameterName));
-        String name = selenideElement.getAttribute("name");
-        if (name != null) {
-            name = name.substring(0, name.lastIndexOf("."));
-        }
-        $(String.format("input[name^=%s]", name)).setValue(customParameterValue);
-        return this;
-    }
-
-    @Step
-    public String getCleanupPolicy() {
-        return new KafkaUISelectElement("cleanupPolicy").getCurrentValue();
-    }
-
-    @Step
-    public String getTimeToRetain() {
-        return timeToRetainField.getValue();
-    }
-
-    @Step
-    public String getMaxSizeOnDisk() {
-        return new KafkaUISelectElement("retentionBytes").getCurrentValue();
-    }
-
-    @Step
-    public String getMaxMessageBytes() {
-        return maxMessageBytesField.getValue();
-    }
-
-    @Step
-    public TopicCreateEditForm setMaxMessageBytes(Long bytes) {
-        maxMessageBytesField.setValue(bytes.toString());
-        return this;
-    }
-
-    @Step
-    public TopicCreateEditForm setMaxMessageBytes(String bytes) {
-        return setMaxMessageBytes(Long.parseLong(bytes));
-    }
-
-    @Step
-    public boolean isValidationMessageCustomParameterValueVisible() {
-        return isVisible(validationCustomParameterValueMsg);
-    }
-
-    @Step
-    public String getCustomParameterValue() {
-        return customParameterValueField.getValue();
-    }
-
-    private TopicCreateEditForm selectFromDropDownByOptionValue(String dropDownElementName,
-                                                                String optionValue) {
-        KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
-        select.selectByOptionValue(optionValue);
-        return this;
-    }
-
-    private TopicCreateEditForm selectFromDropDownByVisibleText(String dropDownElementName,
-                                                                String visibleText) {
-        KafkaUISelectElement select = new KafkaUISelectElement(dropDownElementName);
-        select.selectByVisibleText(visibleText);
-        return this;
-    }
-
-    private static class KafkaUISelectElement {
-
-        private final SelenideElement selectElement;
-
-        public KafkaUISelectElement(String selectElementName) {
-            this.selectElement = $("ul[role=listbox][name=" + selectElementName + "]");
-        }
-
-        public KafkaUISelectElement(SelenideElement selectElement) {
-            this.selectElement = selectElement;
-        }
-
-        public void selectByOptionValue(String optionValue) {
-            selectElement.click();
-            selectElement
-                    .$$x(".//ul/li[@role='option']")
-                    .find(Condition.attribute("value", optionValue))
-                    .click(ClickOptions.usingJavaScript());
-        }
-
-        public void selectByVisibleText(String visibleText) {
-            selectElement.click();
-            selectElement
-                    .$$("ul>li[role=option]")
-                    .find(Condition.exactText(visibleText))
-                    .click();
-        }
-
-        public String getCurrentValue() {
-            return selectElement.$("li").getText();
-        }
-    }
+  protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
+  protected SelenideElement partitionsField = $x("//input[@name='partitions']");
+  protected SelenideElement nameField = $(id("topicFormName"));
+  protected SelenideElement maxMessageBytesField = $x("//input[@name='maxMessageBytes']");
+  protected SelenideElement minInSyncReplicasField = $x("//input[@name='minInSyncReplicas']");
+  protected SelenideElement cleanUpPolicyDdl = $x("//ul[@id='topicFormCleanupPolicy']");
+  protected SelenideElement maxSizeOnDiscDdl = $x("//ul[@id='topicFormRetentionBytes']");
+  protected SelenideElement customParameterDdl = $x("//ul[contains(@name,'customParams')]");
+  protected SelenideElement deleteCustomParameterBtn = $x("//span[contains(@title,'Delete customParam')]");
+  protected SelenideElement addCustomParameterTypeBtn = $x("//button[contains(text(),'Add Custom Parameter')]");
+  protected SelenideElement customParameterValueField = $x("//input[@placeholder='Value']");
+  protected SelenideElement validationCustomParameterValueMsg = $x("//p[contains(text(),'Value is required')]");
+  protected String ddlElementLocator = "//li[@value='%s']";
+  protected String btnTimeToRetainLocator = "//button[@class][text()='%s']";
+
+
+  @Step
+  public TopicCreateEditForm waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    nameField.shouldBe(Condition.visible);
+    return this;
+  }
+
+  public boolean isCreateTopicButtonEnabled() {
+    return isEnabled(submitBtn);
+  }
+
+  public boolean isDeleteCustomParameterButtonEnabled() {
+    return isEnabled(deleteCustomParameterBtn);
+  }
+
+  public boolean isNameFieldEnabled() {
+    return isEnabled(nameField);
+  }
+
+  @Step
+  public TopicCreateEditForm setTopicName(String topicName) {
+    sendKeysAfterClear(nameField, topicName);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setMinInsyncReplicas(Integer minInsyncReplicas) {
+    minInSyncReplicasField.setValue(minInsyncReplicas.toString());
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setTimeToRetainDataInMs(Long ms) {
+    timeToRetainField.setValue(ms.toString());
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setTimeToRetainDataInMs(String ms) {
+    timeToRetainField.setValue(ms);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setMaxSizeOnDiskInGB(MaxSizeOnDisk maxSizeOnDisk) {
+    maxSizeOnDiscDdl.shouldBe(Condition.visible).click();
+    $x(String.format(ddlElementLocator, maxSizeOnDisk.getOptionValue())).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm clickAddCustomParameterTypeButton() {
+    addCustomParameterTypeBtn.click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm openCustomParameterTypeDdl() {
+    customParameterDdl.shouldBe(Condition.visible).click();
+    ddlOptions.shouldHave(CollectionCondition.sizeGreaterThan(0));
+    return this;
+  }
+
+  @Step
+  public ElementsCollection getAllDdlOptions() {
+    return getDdlOptions();
+  }
+
+  @Step
+  public TopicCreateEditForm setCustomParameterType(CustomParameterType customParameterType) {
+    openCustomParameterTypeDdl();
+    $x(String.format(ddlElementLocator, customParameterType.getOptionValue())).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm clearCustomParameterValue() {
+    clearByKeyboard(customParameterValueField);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setNumberOfPartitions(int partitions) {
+    partitionsField.shouldBe(Condition.enabled).clear();
+    partitionsField.sendKeys(String.valueOf(partitions));
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setTimeToRetainDataByButtons(TimeToRetain timeToRetain) {
+    $x(String.format(btnTimeToRetainLocator, timeToRetain.getButton())).shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyOptionValue) {
+    cleanUpPolicyDdl.shouldBe(Condition.visible).click();
+    $x(String.format(ddlElementLocator, cleanupPolicyOptionValue.getOptionValue())).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm selectRetentionBytes(String visibleValue) {
+    return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
+  }
+
+  @Step
+  public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
+    return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
+  }
+
+  @Step
+  public TopicCreateEditForm clickSaveTopicBtn() {
+    clickSubmitBtn();
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm addCustomParameter(String customParameterName,
+                                                String customParameterValue) {
+    ElementsCollection customParametersElements =
+        $$("ul[role=listbox][name^=customParams][name$=name]");
+    KafkaUiSelectElement kafkaUiSelectElement = null;
+    if (customParametersElements.size() == 1) {
+      if ("Select".equals(customParametersElements.first().getText())) {
+        kafkaUiSelectElement = new KafkaUiSelectElement(customParametersElements.first());
+      }
+    } else {
+      $$("button")
+          .find(Condition.exactText("Add Custom Parameter"))
+          .click();
+      customParametersElements = $$("ul[role=listbox][name^=customParams][name$=name]");
+      kafkaUiSelectElement = new KafkaUiSelectElement(customParametersElements.last());
+    }
+    if (kafkaUiSelectElement != null) {
+      kafkaUiSelectElement.selectByVisibleText(customParameterName);
+    }
+    $(String.format("input[name=\"customParams.%d.value\"]", customParametersElements.size() - 1))
+        .setValue(customParameterValue);
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm updateCustomParameter(String customParameterName,
+                                                   String customParameterValue) {
+    SelenideElement selenideElement = $$("ul[role=listbox][name^=customParams][name$=name]")
+        .find(Condition.exactText(customParameterName));
+    String name = selenideElement.getAttribute("name");
+    if (name != null) {
+      name = name.substring(0, name.lastIndexOf("."));
+    }
+    $(String.format("input[name^=%s]", name)).setValue(customParameterValue);
+    return this;
+  }
+
+  @Step
+  public String getCleanupPolicy() {
+    return new KafkaUiSelectElement("cleanupPolicy").getCurrentValue();
+  }
+
+  @Step
+  public String getTimeToRetain() {
+    return timeToRetainField.getValue();
+  }
+
+  @Step
+  public String getMaxSizeOnDisk() {
+    return new KafkaUiSelectElement("retentionBytes").getCurrentValue();
+  }
+
+  @Step
+  public String getMaxMessageBytes() {
+    return maxMessageBytesField.getValue();
+  }
+
+  @Step
+  public TopicCreateEditForm setMaxMessageBytes(Long bytes) {
+    maxMessageBytesField.setValue(bytes.toString());
+    return this;
+  }
+
+  @Step
+  public TopicCreateEditForm setMaxMessageBytes(String bytes) {
+    return setMaxMessageBytes(Long.parseLong(bytes));
+  }
+
+  @Step
+  public boolean isValidationMessageCustomParameterValueVisible() {
+    return isVisible(validationCustomParameterValueMsg);
+  }
+
+  @Step
+  public String getCustomParameterValue() {
+    return customParameterValueField.getValue();
+  }
+
+  private TopicCreateEditForm selectFromDropDownByOptionValue(String dropDownElementName,
+                                                              String optionValue) {
+    KafkaUiSelectElement select = new KafkaUiSelectElement(dropDownElementName);
+    select.selectByOptionValue(optionValue);
+    return this;
+  }
+
+  private TopicCreateEditForm selectFromDropDownByVisibleText(String dropDownElementName,
+                                                              String visibleText) {
+    KafkaUiSelectElement select = new KafkaUiSelectElement(dropDownElementName);
+    select.selectByVisibleText(visibleText);
+    return this;
+  }
+
+  private static class KafkaUiSelectElement {
+
+    private final SelenideElement selectElement;
+
+    public KafkaUiSelectElement(String selectElementName) {
+      this.selectElement = $("ul[role=listbox][name=" + selectElementName + "]");
+    }
+
+    public KafkaUiSelectElement(SelenideElement selectElement) {
+      this.selectElement = selectElement;
+    }
+
+    public void selectByOptionValue(String optionValue) {
+      selectElement.click();
+      selectElement
+          .$$x(".//ul/li[@role='option']")
+          .find(Condition.attribute("value", optionValue))
+          .click(ClickOptions.usingJavaScript());
+    }
+
+    public void selectByVisibleText(String visibleText) {
+      selectElement.click();
+      selectElement
+          .$$("ul>li[role=option]")
+          .find(Condition.exactText(visibleText))
+          .click();
+    }
+
+    public String getCurrentValue() {
+      return selectElement.$("li").getText();
+    }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
index d9c01053147..a171c728e46 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
@@ -1,462 +1,479 @@
 package com.provectus.kafka.ui.pages.topics;
 
+import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.$$x;
+import static com.codeborne.selenide.Selenide.$x;
+import static com.codeborne.selenide.Selenide.sleep;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.OVERVIEW;
+import static org.testcontainers.shaded.org.apache.commons.lang3.RandomUtils.nextInt;
+
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
-import java.util.*;
-
-import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.OVERVIEW;
-import static org.testcontainers.shaded.org.apache.commons.lang3.RandomUtils.nextInt;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
 
 public class TopicDetails extends BasePage {
 
-    protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
-    protected SelenideElement recreateTopicBtn = $x("//div[text()='Recreate Topic']");
-    protected SelenideElement messageAmountCell = $x("//tbody/tr/td[5]");
-    protected SelenideElement seekTypeDdl = $x("//ul[@id='selectSeekType']/li");
-    protected SelenideElement seekTypeField = $x("//label[text()='Seek Type']//..//div/input");
-    protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
-    protected SelenideElement savedFiltersLink = $x("//div[text()='Saved Filters']");
-    protected SelenideElement addFilterCodeModalTitle = $x("//label[text()='Filter code']");
-    protected SelenideElement addFilterCodeInput = $x("//div[@id='ace-editor']//textarea");
-    protected SelenideElement saveThisFilterCheckBoxAddFilterMdl = $x("//input[@name='saveFilter']");
-    protected SelenideElement displayNameInputAddFilterMdl = $x("//input[@placeholder='Enter Name']");
-    protected SelenideElement cancelBtnAddFilterMdl = $x("//button[text()='Cancel']");
-    protected SelenideElement addFilterBtnAddFilterMdl = $x("//button[text()='Add filter']");
-    protected SelenideElement addFiltersBtnMessages = $x("//button[text()='Add Filters']");
-    protected SelenideElement selectFilterBtnAddFilterMdl = $x("//button[text()='Select filter']");
-    protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
-    protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
-    protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
-    protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
-    protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
-    protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
-    protected SelenideElement backToCreateFiltersLink = $x("//div[text()='Back To create filters']");
-    protected ElementsCollection messageGridItems = $$x("//tbody//tr");
-    protected SelenideElement actualCalendarDate = $x("//div[@class='react-datepicker__current-month']");
-    protected SelenideElement previousMonthButton = $x("//button[@aria-label='Previous Month']");
-    protected SelenideElement nextMonthButton = $x("//button[@aria-label='Next Month']");
-    protected SelenideElement calendarTimeFld = $x("//input[@placeholder='Time']");
-    protected String detailsTabLtr = "//nav//a[contains(text(),'%s')]";
-    protected String dayCellLtr = "//div[@role='option'][contains(text(),'%d')]";
-    protected String seekFilterDdlLocator = "//ul[@id='selectSeekType']/ul/li[text()='%s']";
-    protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
-    protected String consumerIdLocator = "//a[@title='%s']";
-    protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
-    protected String activeFilterNameLocator = "//div[@data-testid='activeSmartFilter'][contains(text(),'%s')]";
-    protected String settingsGridValueLocator = "//tbody/tr/td/span[text()='%s']//ancestor::tr/td[2]/span";
-
-    @Step
-    public TopicDetails waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        $x(String.format(detailsTabLtr, OVERVIEW)).shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public TopicDetails openDetailsTab(TopicMenu menu) {
-        $x(String.format(detailsTabLtr, menu.toString())).shouldBe(Condition.enabled).click();
-        waitUntilSpinnerDisappear();
-        return this;
-    }
-
-    @Step
-    public String getSettingsGridValueByKey(String key) {
-        return $x(String.format(settingsGridValueLocator, key)).scrollTo().shouldBe(Condition.visible).getText();
-    }
-
-    @Step
-    public TopicDetails openDotMenu() {
-        clickByJavaScript(dotMenuBtn);
-        return this;
-    }
-
-    @Step
-    public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
-        return isAlertVisible(header, message);
-    }
-
-    @Step
-    public TopicDetails clickEditSettingsMenu() {
-        editSettingsMenu.shouldBe(Condition.visible).click();
-        return this;
-    }
-
-    @Step
-    public boolean isConfirmationMdlVisible() {
-        return isConfirmationModalVisible();
-    }
-
-    @Step
-    public TopicDetails clickClearMessagesMenu() {
-        clearMessagesBtn.shouldBe(Condition.visible).click();
-        return this;
-    }
+  protected SelenideElement clearMessagesBtn = $x(("//div[contains(text(), 'Clear messages')]"));
+  protected SelenideElement recreateTopicBtn = $x("//div[text()='Recreate Topic']");
+  protected SelenideElement messageAmountCell = $x("//tbody/tr/td[5]");
+  protected SelenideElement overviewTab = $x("//a[contains(text(),'Overview')]");
+  protected SelenideElement messagesTab = $x("//a[contains(text(),'Messages')]");
+  protected SelenideElement seekTypeDdl = $x("//ul[@id='selectSeekType']//li");
+  protected SelenideElement seekTypeField = $x("//label[text()='Seek Type']//..//div/input");
+  protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
+  protected SelenideElement savedFiltersLink = $x("//div[text()='Saved Filters']");
+  protected SelenideElement addFilterCodeModalTitle = $x("//label[text()='Filter code']");
+  protected SelenideElement addFilterCodeInput = $x("//div[@id='ace-editor']//textarea");
+  protected SelenideElement saveThisFilterCheckBoxAddFilterMdl = $x("//input[@name='saveFilter']");
+  protected SelenideElement displayNameInputAddFilterMdl = $x("//input[@placeholder='Enter Name']");
+  protected SelenideElement cancelBtnAddFilterMdl = $x("//button[text()='Cancel']");
+  protected SelenideElement addFilterBtnAddFilterMdl = $x("//button[text()='Add filter']");
+  protected SelenideElement addFiltersBtnMessages = $x("//button[text()='Add Filters']");
+  protected SelenideElement selectFilterBtnAddFilterMdl = $x("//button[text()='Select filter']");
+  protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
+  protected SelenideElement removeTopicBtn = $x("//ul[@role='menu']//div[contains(text(),'Remove Topic')]");
+  protected SelenideElement produceMessageBtn = $x("//div//button[text()='Produce Message']");
+  protected SelenideElement contentMessageTab = $x("//html//div[@id='root']/div/main//table//p");
+  protected SelenideElement cleanUpPolicyField = $x("//div[contains(text(),'Clean Up Policy')]/../span/*");
+  protected SelenideElement partitionsField = $x("//div[contains(text(),'Partitions')]/../span");
+  protected SelenideElement backToCreateFiltersLink = $x("//div[text()='Back To create filters']");
+  protected ElementsCollection messageGridItems = $$x("//tbody//tr");
+  protected SelenideElement actualCalendarDate = $x("//div[@class='react-datepicker__current-month']");
+  protected SelenideElement previousMonthButton = $x("//button[@aria-label='Previous Month']");
+  protected SelenideElement nextMonthButton = $x("//button[@aria-label='Next Month']");
+  protected SelenideElement calendarTimeFld = $x("//input[@placeholder='Time']");
+  protected String detailsTabLtr = "//nav//a[contains(text(),'%s')]";
+  protected String dayCellLtr = "//div[@role='option'][contains(text(),'%d')]";
+  protected String seekFilterDdlLocator = "//ul[@id='selectSeekType']/ul/li[text()='%s']";
+  protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
+  protected String consumerIdLocator = "//a[@title='%s']";
+  protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
+  protected String activeFilterNameLocator = "//div[@data-testid='activeSmartFilter'][contains(text(),'%s')]";
+  protected String settingsGridValueLocator = "//tbody/tr/td/span[text()='%s']//ancestor::tr/td[2]/span";
+
+  @Step
+  public TopicDetails waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    $x(String.format(detailsTabLtr, OVERVIEW)).shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public TopicDetails openDetailsTab(TopicMenu menu) {
+    $x(String.format(detailsTabLtr, menu.toString())).shouldBe(Condition.enabled).click();
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  @Step
+  public String getSettingsGridValueByKey(String key) {
+    return $x(String.format(settingsGridValueLocator, key)).scrollTo().shouldBe(Condition.visible).getText();
+  }
+
+  @Step
+  public TopicDetails openDotMenu() {
+    clickByJavaScript(dotMenuBtn);
+    return this;
+  }
+
+  @Step
+  public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
+    return isAlertVisible(header, message);
+  }
+
+  @Step
+  public TopicDetails clickEditSettingsMenu() {
+    editSettingsMenu.shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public boolean isConfirmationMdlVisible() {
+    return isConfirmationModalVisible();
+  }
+
+  @Step
+  public TopicDetails clickClearMessagesMenu() {
+    clearMessagesBtn.shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public boolean isClearMessagesMenuEnabled() {
+    return !Objects.requireNonNull(clearMessagesBtn.shouldBe(Condition.visible)
+            .$x("./..").getAttribute("class"))
+        .contains("disabled");
+  }
+
+  @Step
+  public TopicDetails clickRecreateTopicMenu() {
+    recreateTopicBtn.shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public String getCleanUpPolicy() {
+    return cleanUpPolicyField.getText();
+  }
+
+  @Step
+  public int getPartitions() {
+    return Integer.parseInt(partitionsField.getText().trim());
+  }
+
+  @Step
+  public boolean isTopicHeaderVisible(String topicName) {
+    return isVisible($x(String.format(topicHeaderLocator, topicName)));
+  }
+
+  @Step
+  public TopicDetails clickDeleteTopicMenu() {
+    removeTopicBtn.shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickConfirmBtnMdl() {
+    clickConfirmButton();
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickProduceMessageBtn() {
+    clickByJavaScript(produceMessageBtn);
+    return this;
+  }
+
+  @Step
+  public TopicDetails selectSeekTypeDdlMessagesTab(String seekTypeName) {
+    seekTypeDdl.shouldBe(Condition.enabled).click();
+    $x(String.format(seekFilterDdlLocator, seekTypeName)).shouldBe(Condition.visible).click();
+    return this;
+  }
+
+  @Step
+  public TopicDetails setSeekTypeValueFldMessagesTab(String seekTypeValue) {
+    seekTypeField.shouldBe(Condition.enabled).sendKeys(seekTypeValue);
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickSubmitFiltersBtnMessagesTab() {
+    clickByJavaScript(submitBtn);
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickMessagesAddFiltersBtn() {
+    addFiltersBtn.shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickNextButton() {
+    nextBtn.shouldBe(Condition.enabled).click();
+    waitUntilSpinnerDisappear();
+    return this;
+  }
+
+  @Step
+  public TopicDetails openSavedFiltersListMdl() {
+    savedFiltersLink.shouldBe(Condition.enabled).click();
+    backToCreateFiltersLink.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public boolean isFilterVisibleAtSavedFiltersMdl(String filterName) {
+    return isVisible($x(String.format(savedFilterNameLocator, filterName)));
+  }
+
+  @Step
+  public TopicDetails selectFilterAtSavedFiltersMdl(String filterName) {
+    $x(String.format(savedFilterNameLocator, filterName)).shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickSelectFilterBtnAtSavedFiltersMdl() {
+    selectFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
+    addFilterCodeModalTitle.shouldBe(Condition.disappear);
+    return this;
+  }
+
+  @Step
+  public TopicDetails waitUntilAddFiltersMdlVisible() {
+    addFilterCodeModalTitle.shouldBe(Condition.visible);
+    return this;
+  }
+
+  @Step
+  public TopicDetails setFilterCodeFieldAddFilterMdl(String filterCode) {
+    addFilterCodeInput.shouldBe(Condition.enabled).sendKeys(filterCode);
+    return this;
+  }
+
+  @Step
+  public TopicDetails selectSaveThisFilterCheckboxMdl(boolean select) {
+    selectElement(saveThisFilterCheckBoxAddFilterMdl, select);
+    return this;
+  }
+
+  @Step
+  public boolean isSaveThisFilterCheckBoxSelected() {
+    return isSelected(saveThisFilterCheckBoxAddFilterMdl);
+  }
+
+  @Step
+  public TopicDetails setDisplayNameFldAddFilterMdl(String displayName) {
+    displayNameInputAddFilterMdl.shouldBe(Condition.enabled).sendKeys(displayName);
+    return this;
+  }
+
+  @Step
+  public TopicDetails clickAddFilterBtnAndCloseMdl(boolean closeModal) {
+    addFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
+    if (closeModal) {
+      addFilterCodeModalTitle.shouldBe(Condition.hidden);
+    } else {
+      addFilterCodeModalTitle.shouldBe(Condition.visible);
+    }
+    return this;
+  }
+
+  @Step
+  public boolean isAddFilterBtnAddFilterMdlEnabled() {
+    return isEnabled(addFilterBtnAddFilterMdl);
+  }
+
+  @Step
+  public boolean isBackButtonEnabled() {
+    return isEnabled(backBtn);
+  }
+
+  @Step
+  public boolean isNextButtonEnabled() {
+    return isEnabled(nextBtn);
+  }
+
+  @Step
+  public boolean isActiveFilterVisible(String activeFilterName) {
+    return isVisible($x(String.format(activeFilterNameLocator, activeFilterName)));
+  }
+
+  public List<SelenideElement> getAllAddFilterModalVisibleElements() {
+    return Arrays.asList(savedFiltersLink, displayNameInputAddFilterMdl, addFilterBtnAddFilterMdl,
+        cancelBtnAddFilterMdl);
+  }
+
+  public List<SelenideElement> getAllAddFilterModalEnabledElements() {
+    return Arrays.asList(displayNameInputAddFilterMdl, cancelBtnAddFilterMdl);
+  }
+
+  public List<SelenideElement> getAllAddFilterModalDisabledElements() {
+    return Collections.singletonList(addFilterBtnAddFilterMdl);
+  }
+
+  @Step
+  public TopicDetails openConsumerGroup(String consumerId) {
+    $x(String.format(consumerIdLocator, consumerId)).click();
+    return this;
+  }
+
+  @Step
+  public boolean isKeyMessageVisible(String keyMessage) {
+    return keyMessage.equals($("td[title]").getText());
+  }
+
+  @Step
+  public boolean isContentMessageVisible(String contentMessage) {
+    return contentMessage.matches(contentMessageTab.getText().trim());
+  }
+
+  private void selectYear(int expectedYear) {
+    while (getActualCalendarDate().getYear() > expectedYear) {
+      clickByJavaScript(previousMonthButton);
+      sleep(1000);
+      if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
+        throw new IllegalArgumentException("Unable to select year");
+      }
+    }
+  }
+
+  private void selectMonth(int expectedMonth) {
+    while (getActualCalendarDate().getMonthValue() > expectedMonth) {
+      clickByJavaScript(previousMonthButton);
+      sleep(1000);
+      if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
+        throw new IllegalArgumentException("Unable to select month");
+      }
+    }
+  }
+
+  private void selectDay(int expectedDay) {
+    Objects.requireNonNull($$x(String.format(dayCellLtr, expectedDay)).stream()
+        .filter(day -> !Objects.requireNonNull(day.getAttribute("class")).contains("outside-month"))
+        .findFirst().orElseThrow()).shouldBe(Condition.enabled).click();
+  }
+
+  private void setTime(LocalDateTime dateTime) {
+    calendarTimeFld.shouldBe(Condition.enabled)
+        .sendKeys(String.valueOf(dateTime.getHour()), String.valueOf(dateTime.getMinute()));
+  }
+
+  @Step
+  public TopicDetails selectDateAndTimeByCalendar(LocalDateTime dateTime) {
+    setTime(dateTime);
+    selectYear(dateTime.getYear());
+    selectMonth(dateTime.getMonthValue());
+    selectDay(dateTime.getDayOfMonth());
+    return this;
+  }
 
-    @Step
-    public TopicDetails clickRecreateTopicMenu() {
-        recreateTopicBtn.shouldBe(Condition.visible).click();
-        return this;
-    }
+  private LocalDate getActualCalendarDate() {
+    String monthAndYearStr = actualCalendarDate.getText().trim();
+    DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+        .parseCaseInsensitive()
+        .append(DateTimeFormatter.ofPattern("MMMM yyyy"))
+        .toFormatter(Locale.ENGLISH);
+    YearMonth yearMonth = formatter.parse(monthAndYearStr, YearMonth::from);
+    return yearMonth.atDay(1);
+  }
 
-    @Step
-    public String getCleanUpPolicy() {
-        return cleanUpPolicyField.getText();
-    }
+  @Step
+  public TopicDetails openCalendarSeekType() {
+    seekTypeField.shouldBe(Condition.enabled).click();
+    actualCalendarDate.shouldBe(Condition.visible);
+    return this;
+  }
 
-    @Step
-    public int getPartitions() {
-        return Integer.parseInt(partitionsField.getText().trim());
-    }
+  @Step
+  public int getMessageCountAmount() {
+    return Integer.parseInt(messageAmountCell.getText().trim());
+  }
 
-    @Step
-    public boolean isTopicHeaderVisible(String topicName) {
-        return isVisible($x(String.format(topicHeaderLocator, topicName)));
-    }
+  private List<TopicDetails.MessageGridItem> initItems() {
+    List<TopicDetails.MessageGridItem> gridItemList = new ArrayList<>();
+    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new TopicDetails.MessageGridItem(item)));
+    return gridItemList;
+  }
 
-    @Step
-    public TopicDetails clickDeleteTopicMenu() {
-        removeTopicBtn.shouldBe(Condition.visible).click();
-        return this;
-    }
+  @Step
+  public TopicDetails.MessageGridItem getMessageByOffset(int offset) {
+    return initItems().stream()
+        .filter(e -> e.getOffset() == offset)
+        .findFirst().orElseThrow();
+  }
 
-    @Step
-    public TopicDetails clickConfirmBtnMdl() {
-        clickConfirmButton();
-        return this;
-    }
+  @Step
+  public List<MessageGridItem> getAllMessages() {
+    return initItems();
+  }
 
-    @Step
-    public TopicDetails clickProduceMessageBtn() {
-        clickByJavaScript(produceMessageBtn);
-        return this;
-    }
+  @Step
+  public TopicDetails.MessageGridItem getRandomMessage() {
+    return getMessageByOffset(nextInt(0, initItems().size() - 1));
+  }
 
-    @Step
-    public TopicDetails selectSeekTypeDdlMessagesTab(String seekTypeName) {
-        seekTypeDdl.shouldBe(Condition.enabled).click();
-        $x(String.format(seekFilterDdlLocator, seekTypeName)).shouldBe(Condition.visible).click();
-        return this;
-    }
+  public enum TopicMenu {
+    OVERVIEW("Overview"),
+    MESSAGES("Messages"),
+    CONSUMERS("Consumers"),
+    SETTINGS("Settings");
 
-    @Step
-    public TopicDetails setSeekTypeValueFldMessagesTab(String seekTypeValue) {
-        seekTypeField.shouldBe(Condition.enabled).sendKeys(seekTypeValue);
-        return this;
-    }
+    private final String value;
 
-    @Step
-    public TopicDetails clickSubmitFiltersBtnMessagesTab() {
-        clickByJavaScript(submitBtn);
-        waitUntilSpinnerDisappear();
-        return this;
+    TopicMenu(String value) {
+      this.value = value;
     }
 
-    @Step
-    public TopicDetails clickMessagesAddFiltersBtn() {
-        addFiltersBtn.shouldBe(Condition.enabled).click();
-        return this;
+    public String toString() {
+      return value;
     }
+  }
 
-    @Step
-    public TopicDetails clickNextButton() {
-        nextBtn.shouldBe(Condition.enabled).click();
-        waitUntilSpinnerDisappear();
-        return this;
-    }
+  public static class MessageGridItem extends BasePage {
 
-    @Step
-    public TopicDetails openSavedFiltersListMdl() {
-        savedFiltersLink.shouldBe(Condition.enabled).click();
-        backToCreateFiltersLink.shouldBe(Condition.visible);
-        return this;
-    }
+    private final SelenideElement element;
 
-    @Step
-    public boolean isFilterVisibleAtSavedFiltersMdl(String filterName) {
-        return isVisible($x(String.format(savedFilterNameLocator, filterName)));
+    private MessageGridItem(SelenideElement element) {
+      this.element = element;
     }
 
     @Step
-    public TopicDetails selectFilterAtSavedFiltersMdl(String filterName) {
-        $x(String.format(savedFilterNameLocator, filterName)).shouldBe(Condition.enabled).click();
-        return this;
+    public MessageGridItem clickExpand() {
+      clickByJavaScript(element.$x("./td[1]/span"));
+      return this;
     }
 
-    @Step
-    public TopicDetails clickSelectFilterBtnAtSavedFiltersMdl() {
-        selectFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
-        addFilterCodeModalTitle.shouldBe(Condition.disappear);
-        return this;
+    private SelenideElement getOffsetElm() {
+      return element.$x("./td[2]");
     }
 
     @Step
-    public TopicDetails waitUntilAddFiltersMdlVisible() {
-        addFilterCodeModalTitle.shouldBe(Condition.visible);
-        return this;
+    public int getOffset() {
+      return Integer.parseInt(getOffsetElm().getText().trim());
     }
 
     @Step
-    public TopicDetails setFilterCodeFieldAddFilterMdl(String filterCode) {
-        addFilterCodeInput.shouldBe(Condition.enabled).sendKeys(filterCode);
-        return this;
+    public int getPartition() {
+      return Integer.parseInt(element.$x("./td[3]").getText().trim());
     }
 
     @Step
-    public TopicDetails selectSaveThisFilterCheckboxMdl(boolean select) {
-        selectElement(saveThisFilterCheckBoxAddFilterMdl, select);
-        return this;
+    public LocalDateTime getTimestamp() {
+      String timestampValue = element.$x("./td[4]/div").getText().trim();
+      DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d/yyyy, HH:mm:ss");
+      return LocalDateTime.parse(timestampValue, formatter);
     }
 
     @Step
-    public boolean isSaveThisFilterCheckBoxSelected() {
-        return isSelected(saveThisFilterCheckBoxAddFilterMdl);
+    public String getKey() {
+      return element.$x("./td[5]").getText().trim();
     }
 
     @Step
-    public TopicDetails setDisplayNameFldAddFilterMdl(String displayName) {
-        displayNameInputAddFilterMdl.shouldBe(Condition.enabled).sendKeys(displayName);
-        return this;
+    public String getValue() {
+      return element.$x("./td[6]/span/p").getText().trim();
     }
 
     @Step
-    public TopicDetails clickAddFilterBtnAndCloseMdl(boolean closeModal) {
-        addFilterBtnAddFilterMdl.shouldBe(Condition.enabled).click();
-        if (closeModal) {
-            addFilterCodeModalTitle.shouldBe(Condition.hidden);
-        } else {
-            addFilterCodeModalTitle.shouldBe(Condition.visible);
-        }
-        return this;
+    public MessageGridItem openDotMenu() {
+      getOffsetElm().hover();
+      element.$x("./td[7]/div/button[@aria-label='Dropdown Toggle']")
+          .shouldBe(Condition.visible).click();
+      return this;
     }
 
     @Step
-    public boolean isAddFilterBtnAddFilterMdlEnabled() {
-        return isEnabled(addFilterBtnAddFilterMdl);
+    public MessageGridItem clickCopyToClipBoard() {
+      clickByJavaScript(element.$x("./td[7]//li[text() = 'Copy to clipboard']")
+          .shouldBe(Condition.visible));
+      return this;
     }
 
     @Step
-    public boolean isBackButtonEnabled() {
-        return isEnabled(backBtn);
-    }
-
-    @Step
-    public boolean isNextButtonEnabled() {
-        return isEnabled(nextBtn);
-    }
-
-    @Step
-    public boolean isActiveFilterVisible(String activeFilterName) {
-        return isVisible($x(String.format(activeFilterNameLocator, activeFilterName)));
-    }
-
-    public List<SelenideElement> getAllAddFilterModalVisibleElements() {
-        return Arrays.asList(savedFiltersLink, displayNameInputAddFilterMdl, addFilterBtnAddFilterMdl, cancelBtnAddFilterMdl);
-    }
-
-    public List<SelenideElement> getAllAddFilterModalEnabledElements() {
-        return Arrays.asList(displayNameInputAddFilterMdl, cancelBtnAddFilterMdl);
-    }
-
-    public List<SelenideElement> getAllAddFilterModalDisabledElements() {
-        return Collections.singletonList(addFilterBtnAddFilterMdl);
-    }
-
-    @Step
-    public TopicDetails openConsumerGroup(String consumerId) {
-        $x(String.format(consumerIdLocator, consumerId)).click();
-        return this;
-    }
-
-    @Step
-    public boolean isKeyMessageVisible(String keyMessage) {
-        return keyMessage.equals($("td[title]").getText());
-    }
-
-    @Step
-    public boolean isContentMessageVisible(String contentMessage) {
-        return contentMessage.matches(contentMessageTab.getText().trim());
-    }
-
-    private void selectYear(int expectedYear) {
-        while (getActualCalendarDate().getYear() > expectedYear) {
-            clickByJavaScript(previousMonthButton);
-            sleep(1000);
-            if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
-                throw new IllegalArgumentException("Unable to select year");
-            }
-        }
-    }
-
-    private void selectMonth(int expectedMonth) {
-        while (getActualCalendarDate().getMonthValue() > expectedMonth) {
-            clickByJavaScript(previousMonthButton);
-            sleep(1000);
-            if (LocalTime.now().plusMinutes(3).isBefore(LocalTime.now())) {
-                throw new IllegalArgumentException("Unable to select month");
-            }
-        }
-    }
-
-    private void selectDay(int expectedDay) {
-        Objects.requireNonNull($$x(String.format(dayCellLtr, expectedDay)).stream()
-                .filter(day -> !Objects.requireNonNull(day.getAttribute("class")).contains("outside-month"))
-                .findFirst().orElseThrow()).shouldBe(Condition.enabled).click();
-    }
-
-    private void setTime(LocalDateTime dateTime) {
-        calendarTimeFld.shouldBe(Condition.enabled)
-                .sendKeys(String.valueOf(dateTime.getHour()), String.valueOf(dateTime.getMinute()));
-    }
-
-    @Step
-    public TopicDetails selectDateAndTimeByCalendar(LocalDateTime dateTime) {
-        setTime(dateTime);
-        selectYear(dateTime.getYear());
-        selectMonth(dateTime.getMonthValue());
-        selectDay(dateTime.getDayOfMonth());
-        return this;
-    }
-
-    private LocalDate getActualCalendarDate() {
-        String monthAndYearStr = actualCalendarDate.getText().trim();
-        DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                .parseCaseInsensitive()
-                .append(DateTimeFormatter.ofPattern("MMMM yyyy"))
-                .toFormatter(Locale.ENGLISH);
-        YearMonth yearMonth = formatter.parse(monthAndYearStr, YearMonth::from);
-        return yearMonth.atDay(1);
-    }
-
-    @Step
-    public TopicDetails openCalendarSeekType() {
-        seekTypeField.shouldBe(Condition.enabled).click();
-        actualCalendarDate.shouldBe(Condition.visible);
-        return this;
-    }
-
-    @Step
-    public int getMessageCountAmount() {
-        return Integer.parseInt(messageAmountCell.getText().trim());
-    }
-
-    private List<TopicDetails.MessageGridItem> initItems() {
-        List<TopicDetails.MessageGridItem> gridItemList = new ArrayList<>();
-        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-                .forEach(item -> gridItemList.add(new TopicDetails.MessageGridItem(item)));
-        return gridItemList;
-    }
-
-    @Step
-    public TopicDetails.MessageGridItem getMessageByOffset(int offset) {
-        return initItems().stream()
-                .filter(e -> e.getOffset() == offset)
-                .findFirst().orElseThrow();
-    }
-
-    @Step
-    public List<MessageGridItem> getAllMessages() {
-        return initItems();
-    }
-
-    @Step
-    public TopicDetails.MessageGridItem getRandomMessage() {
-        return getMessageByOffset(nextInt(0, initItems().size() - 1));
-    }
-
-    public enum TopicMenu {
-        OVERVIEW("Overview"),
-        MESSAGES("Messages"),
-        CONSUMERS("Consumers"),
-        SETTINGS("Settings");
-
-        private final String value;
-
-        TopicMenu(String value) {
-            this.value = value;
-        }
-
-        public String toString() {
-            return value;
-        }
-    }
-
-    public static class MessageGridItem extends BasePage {
-
-        private final SelenideElement element;
-
-        private MessageGridItem(SelenideElement element) {
-            this.element = element;
-        }
-
-        @Step
-        public MessageGridItem clickExpand() {
-            clickByJavaScript(element.$x("./td[1]/span"));
-            return this;
-        }
-
-        private SelenideElement getOffsetElm() {
-            return element.$x("./td[2]");
-        }
-
-        @Step
-        public int getOffset() {
-            return Integer.parseInt(getOffsetElm().getText().trim());
-        }
-
-        @Step
-        public int getPartition() {
-            return Integer.parseInt(element.$x("./td[3]").getText().trim());
-        }
-
-        @Step
-        public LocalDateTime getTimestamp() {
-            String timestampValue = element.$x("./td[4]/div").getText().trim();
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d/yyyy, HH:mm:ss");
-            return LocalDateTime.parse(timestampValue, formatter);
-        }
-
-        @Step
-        public String getKey() {
-            return element.$x("./td[5]").getText().trim();
-        }
-
-        @Step
-        public String getValue() {
-            return element.$x("./td[6]/span/p").getText().trim();
-        }
-
-        @Step
-        public MessageGridItem openDotMenu() {
-            getOffsetElm().hover();
-            element.$x("./td[7]/div/button[@aria-label='Dropdown Toggle']")
-                    .shouldBe(Condition.visible).click();
-            return this;
-        }
-
-        @Step
-        public MessageGridItem clickCopyToClipBoard() {
-            clickByJavaScript(element.$x("./td[7]//li[text() = 'Copy to clipboard']")
-                    .shouldBe(Condition.visible));
-            return this;
-        }
-
-        @Step
-        public MessageGridItem clickSaveAsFile() {
-            clickByJavaScript(element.$x("./td[7]//li[text() = 'Save as a file']")
-                    .shouldBe(Condition.visible));
-            return this;
-        }
+    public MessageGridItem clickSaveAsFile() {
+      clickByJavaScript(element.$x("./td[7]//li[text() = 'Save as a file']")
+          .shouldBe(Condition.visible));
+      return this;
     }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java
index 3c0fcac211d..c36e8423767 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicSettingsTab.java
@@ -1,66 +1,65 @@
 package com.provectus.kafka.ui.pages.topics;
 
+import static com.codeborne.selenide.Selenide.$x;
+
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.codeborne.selenide.Selenide.$x;
-
 public class TopicSettingsTab extends BasePage {
 
-    protected SelenideElement defaultValueColumnHeaderLocator = $x("//div[text() = 'Default Value']");
+  protected SelenideElement defaultValueColumnHeaderLocator = $x("//div[text() = 'Default Value']");
 
-    @Step
-    public TopicSettingsTab waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        defaultValueColumnHeaderLocator.shouldBe(Condition.visible);
-        return this;
-    }
+  @Step
+  public TopicSettingsTab waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    defaultValueColumnHeaderLocator.shouldBe(Condition.visible);
+    return this;
+  }
 
-    private List<SettingsGridItem> initGridItems() {
-        List<SettingsGridItem> gridItemList = new ArrayList<>();
-        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-                .forEach(item -> gridItemList.add(new SettingsGridItem(item)));
-        return gridItemList;
-    }
+  private List<SettingsGridItem> initGridItems() {
+    List<SettingsGridItem> gridItemList = new ArrayList<>();
+    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new SettingsGridItem(item)));
+    return gridItemList;
+  }
 
-    private TopicSettingsTab.SettingsGridItem getItemByKey(String key) {
-        return initGridItems().stream()
-                .filter(e -> e.getKey().equals(key))
-                .findFirst().orElseThrow();
-    }
+  private TopicSettingsTab.SettingsGridItem getItemByKey(String key) {
+    return initGridItems().stream()
+        .filter(e -> e.getKey().equals(key))
+        .findFirst().orElseThrow();
+  }
 
-    @Step
-    public String getValueByKey(String key) {
-        return getItemByKey(key).getValue();
-    }
+  @Step
+  public String getValueByKey(String key) {
+    return getItemByKey(key).getValue();
+  }
 
-    public static class SettingsGridItem extends BasePage {
+  public static class SettingsGridItem extends BasePage {
 
-        private final SelenideElement element;
+    private final SelenideElement element;
 
-        public SettingsGridItem(SelenideElement element) {
-            this.element = element;
-        }
+    public SettingsGridItem(SelenideElement element) {
+      this.element = element;
+    }
 
-        @Step
-        public String getKey() {
-            return element.$x("./td[1]/span").getText().trim();
-        }
+    @Step
+    public String getKey() {
+      return element.$x("./td[1]/span").getText().trim();
+    }
 
-        @Step
-        public String getValue() {
-            return element.$x("./td[2]/span").getText().trim();
-        }
+    @Step
+    public String getValue() {
+      return element.$x("./td[2]/span").getText().trim();
+    }
 
-        @Step
-        public String getDefaultValue() {
-            return element.$x("./td[3]/span").getText().trim();
-        }
+    @Step
+    public String getDefaultValue() {
+      return element.$x("./td[3]/span").getText().trim();
     }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
index 538f714e831..184178423d4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
@@ -1,282 +1,283 @@
 package com.provectus.kafka.ui.pages.topics;
 
+import static com.codeborne.selenide.Condition.visible;
+import static com.codeborne.selenide.Selenide.$x;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.TOPICS;
+
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.codeborne.selenide.Condition.visible;
-import static com.codeborne.selenide.Selenide.$x;
-import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.TOPICS;
-
 public class TopicsList extends BasePage {
 
-    protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
-    protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
-    protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
-    protected SelenideElement deleteSelectedTopicsBtn = $x("//button[text()='Delete selected topics']");
-    protected SelenideElement copySelectedTopicBtn = $x("//button[text()='Copy selected topic']");
-    protected SelenideElement purgeMessagesOfSelectedTopicsBtn = $x("//button[text()='Purge messages of selected topics']");
-    protected SelenideElement clearMessagesBtn = $x("//ul[contains(@class ,'open')]//div[text()='Clear Messages']");
-    protected SelenideElement recreateTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Recreate Topic']");
-    protected SelenideElement removeTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Remove Topic']");
-
-    @Step
-    public TopicsList waitUntilScreenReady() {
-        waitUntilSpinnerDisappear();
-        getPageTitleFromHeader(TOPICS).shouldBe(visible);
-        return this;
-    }
-
-    @Step
-    public TopicsList clickAddTopicBtn() {
-        clickByJavaScript(addTopicBtn);
-        return this;
-    }
-
-    @Step
-    public boolean isTopicVisible(String topicName) {
-        tableGrid.shouldBe(visible);
-        return isVisible(getTableElement(topicName));
-    }
-
-    @Step
-    public boolean isShowInternalRadioBtnSelected() {
-        return isSelected(showInternalRadioBtn);
-    }
-
-    @Step
-    public TopicsList setShowInternalRadioButton(boolean select) {
-        if (select) {
-            if (!showInternalRadioBtn.isSelected()) {
-                clickByJavaScript(showInternalRadioBtn);
-                waitUntilSpinnerDisappear(1);
-            }
-        } else {
-            if (showInternalRadioBtn.isSelected()) {
-                clickByJavaScript(showInternalRadioBtn);
-                waitUntilSpinnerDisappear(1);
-            }
-        }
-        return this;
-    }
-
-    @Step
-    public TopicsList openTopic(String topicName) {
-        getTopicItem(topicName).openItem();
-        return this;
-    }
-
-    @Step
-    public TopicsList openDotMenuByTopicName(String topicName) {
-        getTopicItem(topicName).openDotMenu();
-        return this;
+  protected SelenideElement addTopicBtn = $x("//button[normalize-space(text()) ='Add a Topic']");
+  protected SelenideElement searchField = $x("//input[@placeholder='Search by Topic Name']");
+  protected SelenideElement showInternalRadioBtn = $x("//input[@name='ShowInternalTopics']");
+  protected SelenideElement deleteSelectedTopicsBtn = $x("//button[text()='Delete selected topics']");
+  protected SelenideElement copySelectedTopicBtn = $x("//button[text()='Copy selected topic']");
+  protected SelenideElement purgeMessagesOfSelectedTopicsBtn =
+      $x("//button[text()='Purge messages of selected topics']");
+  protected SelenideElement clearMessagesBtn = $x("//ul[contains(@class ,'open')]//div[text()='Clear Messages']");
+  protected SelenideElement recreateTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Recreate Topic']");
+  protected SelenideElement removeTopicBtn = $x("//ul[contains(@class ,'open')]//div[text()='Remove Topic']");
+
+  @Step
+  public TopicsList waitUntilScreenReady() {
+    waitUntilSpinnerDisappear();
+    getPageTitleFromHeader(TOPICS).shouldBe(visible);
+    return this;
+  }
+
+  @Step
+  public TopicsList clickAddTopicBtn() {
+    clickByJavaScript(addTopicBtn);
+    return this;
+  }
+
+  @Step
+  public boolean isTopicVisible(String topicName) {
+    tableGrid.shouldBe(visible);
+    return isVisible(getTableElement(topicName));
+  }
+
+  @Step
+  public boolean isShowInternalRadioBtnSelected() {
+    return isSelected(showInternalRadioBtn);
+  }
+
+  @Step
+  public TopicsList setShowInternalRadioButton(boolean select) {
+    if (select) {
+      if (!showInternalRadioBtn.isSelected()) {
+        clickByJavaScript(showInternalRadioBtn);
+        waitUntilSpinnerDisappear(1);
+      }
+    } else {
+      if (showInternalRadioBtn.isSelected()) {
+        clickByJavaScript(showInternalRadioBtn);
+        waitUntilSpinnerDisappear(1);
+      }
     }
-
-    @Step
-    public boolean isCopySelectedTopicBtnEnabled() {
-        return isEnabled(copySelectedTopicBtn);
+    return this;
+  }
+
+  @Step
+  public TopicsList openTopic(String topicName) {
+    getTopicItem(topicName).openItem();
+    return this;
+  }
+
+  @Step
+  public TopicsList openDotMenuByTopicName(String topicName) {
+    getTopicItem(topicName).openDotMenu();
+    return this;
+  }
+
+  @Step
+  public boolean isCopySelectedTopicBtnEnabled() {
+    return isEnabled(copySelectedTopicBtn);
+  }
+
+  @Step
+  public List<SelenideElement> getActionButtons() {
+    return Stream.of(deleteSelectedTopicsBtn, copySelectedTopicBtn, purgeMessagesOfSelectedTopicsBtn)
+        .collect(Collectors.toList());
+  }
+
+  @Step
+  public TopicsList clickCopySelectedTopicBtn() {
+    copySelectedTopicBtn.shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public TopicsList clickPurgeMessagesOfSelectedTopicsBtn() {
+    purgeMessagesOfSelectedTopicsBtn.shouldBe(Condition.enabled).click();
+    return this;
+  }
+
+  @Step
+  public TopicsList clickClearMessagesBtn() {
+    clickByJavaScript(clearMessagesBtn.shouldBe(visible));
+    return this;
+  }
+
+  @Step
+  public TopicsList clickRecreateTopicBtn() {
+    clickByJavaScript(recreateTopicBtn.shouldBe(visible));
+    return this;
+  }
+
+  @Step
+  public TopicsList clickRemoveTopicBtn() {
+    clickByJavaScript(removeTopicBtn.shouldBe(visible));
+    return this;
+  }
+
+  @Step
+  public TopicsList clickConfirmBtnMdl() {
+    clickConfirmButton();
+    return this;
+  }
+
+  @Step
+  public TopicsList clickCancelBtnMdl() {
+    clickCancelButton();
+    return this;
+  }
+
+  @Step
+  public boolean isConfirmationMdlVisible() {
+    return isConfirmationModalVisible();
+  }
+
+  @Step
+  public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
+    return isAlertVisible(header, message);
+  }
+
+  private List<SelenideElement> getVisibleColumnHeaders() {
+    return Stream.of("Replication Factor", "Number of messages", "Topic Name", "Partitions", "Out of sync replicas",
+            "Size")
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  private List<SelenideElement> getEnabledColumnHeaders() {
+    return Stream.of("Topic Name", "Partitions", "Out of sync replicas", "Size")
+        .map(name -> $x(String.format(columnHeaderLocator, name)))
+        .collect(Collectors.toList());
+  }
+
+  @Step
+  public List<SelenideElement> getAllVisibleElements() {
+    List<SelenideElement> visibleElements = new ArrayList<>(getVisibleColumnHeaders());
+    visibleElements.addAll(Arrays.asList(searchField, addTopicBtn, tableGrid));
+    visibleElements.addAll(getActionButtons());
+    return visibleElements;
+  }
+
+  @Step
+  public List<SelenideElement> getAllEnabledElements() {
+    List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
+    enabledElements.addAll(Arrays.asList(searchField, showInternalRadioBtn, addTopicBtn));
+    return enabledElements;
+  }
+
+  private List<TopicGridItem> initGridItems() {
+    List<TopicGridItem> gridItemList = new ArrayList<>();
+    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new TopicGridItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public TopicGridItem getTopicItem(String name) {
+    TopicGridItem topicGridItem = initGridItems().stream()
+        .filter(e -> e.getName().equals(name))
+        .findFirst().orElse(null);
+    if (topicGridItem == null) {
+      searchItem(name);
+      topicGridItem = initGridItems().stream()
+          .filter(e -> e.getName().equals(name))
+          .findFirst().orElseThrow();
     }
-
-    @Step
-    public List<SelenideElement> getActionButtons() {
-        return Stream.of(deleteSelectedTopicsBtn, copySelectedTopicBtn, purgeMessagesOfSelectedTopicsBtn)
-                .collect(Collectors.toList());
+    return topicGridItem;
+  }
+
+  @Step
+  public TopicGridItem getAnyNonInternalTopic() {
+    return getNonInternalTopics().stream()
+        .findAny().orElseThrow();
+  }
+
+  @Step
+  public List<TopicGridItem> getNonInternalTopics() {
+    return initGridItems().stream()
+        .filter(e -> !e.isInternal())
+        .collect(Collectors.toList());
+  }
+
+  @Step
+  public List<TopicGridItem> getInternalTopics() {
+    return initGridItems().stream()
+        .filter(TopicGridItem::isInternal)
+        .collect(Collectors.toList());
+  }
+
+  public static class TopicGridItem extends BasePage {
+
+    private final SelenideElement element;
+
+    public TopicGridItem(SelenideElement element) {
+      this.element = element;
     }
 
     @Step
-    public TopicsList clickCopySelectedTopicBtn() {
-        copySelectedTopicBtn.shouldBe(Condition.enabled).click();
-        return this;
+    public TopicsList selectItem(boolean select) {
+      selectElement(element.$x("./td[1]/input"), select);
+      return new TopicsList();
     }
 
-    @Step
-    public TopicsList clickPurgeMessagesOfSelectedTopicsBtn() {
-        purgeMessagesOfSelectedTopicsBtn.shouldBe(Condition.enabled).click();
-        return this;
+    private SelenideElement getNameElm() {
+      return element.$x("./td[2]");
     }
 
     @Step
-    public TopicsList clickClearMessagesBtn() {
-        clickByJavaScript(clearMessagesBtn.shouldBe(visible));
-        return this;
+    public boolean isInternal() {
+      boolean internal = false;
+      try {
+        internal = getNameElm().$x("./a/span").isDisplayed();
+      } catch (Throwable ignored) {
+      }
+      return internal;
     }
 
     @Step
-    public TopicsList clickRecreateTopicBtn() {
-        clickByJavaScript(recreateTopicBtn.shouldBe(visible));
-        return this;
+    public String getName() {
+      return getNameElm().$x("./a").getAttribute("title");
     }
 
     @Step
-    public TopicsList clickRemoveTopicBtn() {
-        clickByJavaScript(removeTopicBtn.shouldBe(visible));
-        return this;
+    public void openItem() {
+      getNameElm().click();
     }
 
     @Step
-    public TopicsList clickConfirmBtnMdl() {
-        clickConfirmButton();
-        return this;
+    public int getPartition() {
+      return Integer.parseInt(element.$x("./td[3]").getText().trim());
     }
 
     @Step
-    public TopicsList clickCancelBtnMdl() {
-        clickCancelButton();
-        return this;
+    public int getOutOfSyncReplicas() {
+      return Integer.parseInt(element.$x("./td[4]").getText().trim());
     }
 
     @Step
-    public boolean isConfirmationMdlVisible() {
-        return isConfirmationModalVisible();
+    public int getReplicationFactor() {
+      return Integer.parseInt(element.$x("./td[5]").getText().trim());
     }
 
     @Step
-    public boolean isAlertWithMessageVisible(AlertHeader header, String message) {
-        return isAlertVisible(header, message);
-    }
-
-    private List<SelenideElement> getVisibleColumnHeaders() {
-        return Stream.of("Replication Factor", "Number of messages", "Topic Name", "Partitions", "Out of sync replicas", "Size")
-                .map(name -> $x(String.format(columnHeaderLocator, name)))
-                .collect(Collectors.toList());
-    }
-
-    private List<SelenideElement> getEnabledColumnHeaders() {
-        return Stream.of("Topic Name", "Partitions", "Out of sync replicas", "Size")
-                .map(name -> $x(String.format(columnHeaderLocator, name)))
-                .collect(Collectors.toList());
+    public int getNumberOfMessages() {
+      return Integer.parseInt(element.$x("./td[6]").getText().trim());
     }
 
     @Step
-    public List<SelenideElement> getAllVisibleElements() {
-        List<SelenideElement> visibleElements = new ArrayList<>(getVisibleColumnHeaders());
-        visibleElements.addAll(Arrays.asList(searchField, addTopicBtn, tableGrid));
-        visibleElements.addAll(getActionButtons());
-        return visibleElements;
+    public int getSize() {
+      return Integer.parseInt(element.$x("./td[7]").getText().trim());
     }
 
     @Step
-    public List<SelenideElement> getAllEnabledElements() {
-        List<SelenideElement> enabledElements = new ArrayList<>(getEnabledColumnHeaders());
-        enabledElements.addAll(Arrays.asList(searchField, showInternalRadioBtn, addTopicBtn));
-        return enabledElements;
-    }
-
-    private List<TopicGridItem> initGridItems() {
-        List<TopicGridItem> gridItemList = new ArrayList<>();
-        gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-                .forEach(item -> gridItemList.add(new TopicGridItem(item)));
-        return gridItemList;
-    }
-
-    @Step
-    public TopicGridItem getTopicItem(String name) {
-        TopicGridItem topicGridItem = initGridItems().stream()
-                .filter(e -> e.getName().equals(name))
-                .findFirst().orElse(null);
-        if (topicGridItem == null) {
-            searchItem(name);
-            topicGridItem = initGridItems().stream()
-                    .filter(e -> e.getName().equals(name))
-                    .findFirst().orElseThrow();
-        }
-        return topicGridItem;
-    }
-
-    @Step
-    public TopicGridItem getAnyNonInternalTopic() {
-        return getNonInternalTopics().stream()
-                .findAny().orElseThrow();
-    }
-
-    @Step
-    public List<TopicGridItem> getNonInternalTopics() {
-        return initGridItems().stream()
-                .filter(e -> !e.isInternal())
-                .collect(Collectors.toList());
-    }
-
-    @Step
-    public List<TopicGridItem> getInternalTopics() {
-        return initGridItems().stream()
-                .filter(TopicGridItem::isInternal)
-                .collect(Collectors.toList());
-    }
-
-    public static class TopicGridItem extends BasePage {
-
-        private final SelenideElement element;
-
-        public TopicGridItem(SelenideElement element) {
-            this.element = element;
-        }
-
-        @Step
-        public TopicsList selectItem(boolean select) {
-            selectElement(element.$x("./td[1]/input"), select);
-            return new TopicsList();
-        }
-
-        private SelenideElement getNameElm() {
-            return element.$x("./td[2]");
-        }
-
-        @Step
-        public boolean isInternal() {
-            boolean internal = false;
-            try {
-                internal = getNameElm().$x("./a/span").isDisplayed();
-            } catch (Throwable ignored) {
-            }
-            return internal;
-        }
-
-        @Step
-        public String getName() {
-            return getNameElm().$x("./a").getAttribute("title");
-        }
-
-        @Step
-        public void openItem() {
-            getNameElm().click();
-        }
-
-        @Step
-        public int getPartition() {
-            return Integer.parseInt(element.$x("./td[3]").getText().trim());
-        }
-
-        @Step
-        public int getOutOfSyncReplicas() {
-            return Integer.parseInt(element.$x("./td[4]").getText().trim());
-        }
-
-        @Step
-        public int getReplicationFactor() {
-            return Integer.parseInt(element.$x("./td[5]").getText().trim());
-        }
-
-        @Step
-        public int getNumberOfMessages() {
-            return Integer.parseInt(element.$x("./td[6]").getText().trim());
-        }
-
-        @Step
-        public int getSize() {
-            return Integer.parseInt(element.$x("./td[7]").getText().trim());
-        }
-
-        @Step
-        public void openDotMenu() {
-            element.$x("./td[8]//button").click();
-        }
+    public void openDotMenu() {
+      element.$x("./td[8]//button").click();
     }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CleanupPolicyValue.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CleanupPolicyValue.java
index 48c0c0fbcb8..6e4d31a3a24 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CleanupPolicyValue.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CleanupPolicyValue.java
@@ -2,24 +2,24 @@
 
 public enum CleanupPolicyValue {
 
-    DELETE("delete", "Delete"),
-    COMPACT("compact", "Compact"),
-    COMPACT_DELETE("compact,delete", "Compact,Delete");
+  DELETE("delete", "Delete"),
+  COMPACT("compact", "Compact"),
+  COMPACT_DELETE("compact,delete", "Compact,Delete");
 
-    private final String optionValue;
-    private final String visibleText;
+  private final String optionValue;
+  private final String visibleText;
 
-    CleanupPolicyValue(String optionValue, String visibleText) {
-        this.optionValue = optionValue;
-        this.visibleText = visibleText;
-    }
+  CleanupPolicyValue(String optionValue, String visibleText) {
+    this.optionValue = optionValue;
+    this.visibleText = visibleText;
+  }
 
-    public String getOptionValue() {
-        return optionValue;
-    }
+  public String getOptionValue() {
+    return optionValue;
+  }
 
-    public String getVisibleText() {
-        return visibleText;
-    }
+  public String getVisibleText() {
+    return visibleText;
+  }
 }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CustomParameterType.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CustomParameterType.java
index f4cb5cb9517..4ed3e899666 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CustomParameterType.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/CustomParameterType.java
@@ -2,36 +2,36 @@
 
 public enum CustomParameterType {
 
-    COMPRESSION_TYPE("compression.type"),
-    DELETE_RETENTION_MS("delete.retention.ms"),
-    FILE_DELETE_DELAY_MS("file.delete.delay.ms"),
-    FLUSH_MESSAGES("flush.messages"),
-    FLUSH_MS("flush.ms"),
-    FOLLOWER_REPLICATION_THROTTLED_REPLICAS("follower.replication.throttled.replicas"),
-    INDEX_INTERVAL_BYTES("index.interval.bytes"),
-    LEADER_REPLICATION_THROTTLED_REPLICAS("leader.replication.throttled.replicas"),
-    MAX_COMPACTION_LAG_MS("max.compaction.lag.ms"),
-    MESSAGE_DOWNCONVERSION_ENABLE("message.downconversion.enable"),
-    MESSAGE_FORMAT_VERSION("message.format.version"),
-    MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS("message.timestamp.difference.max.ms"),
-    MESSAGE_TIMESTAMP_TYPE("message.timestamp.type"),
-    MIN_CLEANABLE_DIRTY_RATIO("min.cleanable.dirty.ratio"),
-    MIN_COMPACTION_LAG_MS("min.compaction.lag.ms"),
-    PREALLOCATE("preallocate"),
-    RETENTION_BYTES("retention.bytes"),
-    SEGMENT_BYTES("segment.bytes"),
-    SEGMENT_INDEX_BYTES("segment.index.bytes"),
-    SEGMENT_JITTER_MS("segment.jitter.ms"),
-    SEGMENT_MS("segment.ms"),
-    UNCLEAN_LEADER_ELECTION_ENABLE("unclean.leader.election.enable");
+  COMPRESSION_TYPE("compression.type"),
+  DELETE_RETENTION_MS("delete.retention.ms"),
+  FILE_DELETE_DELAY_MS("file.delete.delay.ms"),
+  FLUSH_MESSAGES("flush.messages"),
+  FLUSH_MS("flush.ms"),
+  FOLLOWER_REPLICATION_THROTTLED_REPLICAS("follower.replication.throttled.replicas"),
+  INDEX_INTERVAL_BYTES("index.interval.bytes"),
+  LEADER_REPLICATION_THROTTLED_REPLICAS("leader.replication.throttled.replicas"),
+  MAX_COMPACTION_LAG_MS("max.compaction.lag.ms"),
+  MESSAGE_DOWNCONVERSION_ENABLE("message.downconversion.enable"),
+  MESSAGE_FORMAT_VERSION("message.format.version"),
+  MESSAGE_TIMESTAMP_DIFFERENCE_MAX_MS("message.timestamp.difference.max.ms"),
+  MESSAGE_TIMESTAMP_TYPE("message.timestamp.type"),
+  MIN_CLEANABLE_DIRTY_RATIO("min.cleanable.dirty.ratio"),
+  MIN_COMPACTION_LAG_MS("min.compaction.lag.ms"),
+  PREALLOCATE("preallocate"),
+  RETENTION_BYTES("retention.bytes"),
+  SEGMENT_BYTES("segment.bytes"),
+  SEGMENT_INDEX_BYTES("segment.index.bytes"),
+  SEGMENT_JITTER_MS("segment.jitter.ms"),
+  SEGMENT_MS("segment.ms"),
+  UNCLEAN_LEADER_ELECTION_ENABLE("unclean.leader.election.enable");
 
-    private final String optionValue;
+  private final String optionValue;
 
-    CustomParameterType(String optionValue) {
-        this.optionValue = optionValue;
-    }
+  CustomParameterType(String optionValue) {
+    this.optionValue = optionValue;
+  }
 
-    public String getOptionValue() {
-        return optionValue;
-    }
+  public String getOptionValue() {
+    return optionValue;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/MaxSizeOnDisk.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/MaxSizeOnDisk.java
index 8f459eea75a..c77c1a96290 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/MaxSizeOnDisk.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/MaxSizeOnDisk.java
@@ -2,26 +2,26 @@
 
 public enum MaxSizeOnDisk {
 
-    NOT_SET("-1", "Not Set"),
-    SIZE_1_GB("1073741824", "1 GB"),
-    SIZE_10_GB("10737418240", "10 GB"),
-    SIZE_20_GB("21474836480", "20 GB"),
-    SIZE_50_GB("53687091200", "50 GB");
+  NOT_SET("-1", "Not Set"),
+  SIZE_1_GB("1073741824", "1 GB"),
+  SIZE_10_GB("10737418240", "10 GB"),
+  SIZE_20_GB("21474836480", "20 GB"),
+  SIZE_50_GB("53687091200", "50 GB");
 
-    private final String optionValue;
-    private final String visibleText;
+  private final String optionValue;
+  private final String visibleText;
 
-    MaxSizeOnDisk(String optionValue, String visibleText) {
-        this.optionValue = optionValue;
-        this.visibleText = visibleText;
-    }
+  MaxSizeOnDisk(String optionValue, String visibleText) {
+    this.optionValue = optionValue;
+    this.visibleText = visibleText;
+  }
 
-    public String getOptionValue() {
-        return optionValue;
-    }
+  public String getOptionValue() {
+    return optionValue;
+  }
 
-    public String getVisibleText() {
-        return visibleText;
-    }
+  public String getVisibleText() {
+    return visibleText;
+  }
 }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/TimeToRetain.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/TimeToRetain.java
index c07abdc175c..c2768ca240f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/TimeToRetain.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/enums/TimeToRetain.java
@@ -2,25 +2,25 @@
 
 public enum TimeToRetain {
 
-    BTN_12_HOURS("12 hours", "43200000"),
-    BTN_1_DAY("1 day", "86400000"),
-    BTN_2_DAYS("2 days", "172800000"),
-    BTN_7_DAYS("7 days", "604800000"),
-    BTN_4_WEEKS("4 weeks", "2419200000");
+  BTN_12_HOURS("12 hours", "43200000"),
+  BTN_1_DAY("1 day", "86400000"),
+  BTN_2_DAYS("2 days", "172800000"),
+  BTN_7_DAYS("7 days", "604800000"),
+  BTN_4_WEEKS("4 weeks", "2419200000");
 
-    private final String button;
-    private final String value;
+  private final String button;
+  private final String value;
 
-    TimeToRetain(String button, String value) {
-        this.button = button;
-        this.value = value;
-    }
+  TimeToRetain(String button, String value) {
+    this.button = button;
+    this.value = value;
+  }
 
-    public String getButton() {
-        return button;
-    }
+  public String getButton() {
+    return button;
+  }
 
-    public String getValue() {
-        return value;
-    }
+  public String getValue() {
+    return value;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index 808f0fdbc82..ea08f57fe49 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -1,272 +1,282 @@
 package com.provectus.kafka.ui.services;
 
+import static com.codeborne.selenide.Selenide.sleep;
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.provectus.kafka.ui.api.ApiClient;
-import com.provectus.kafka.ui.api.api.*;
-import com.provectus.kafka.ui.api.model.*;
+import com.provectus.kafka.ui.api.api.KafkaConnectApi;
+import com.provectus.kafka.ui.api.api.KsqlApi;
+import com.provectus.kafka.ui.api.api.MessagesApi;
+import com.provectus.kafka.ui.api.api.SchemasApi;
+import com.provectus.kafka.ui.api.api.TopicsApi;
+import com.provectus.kafka.ui.api.model.CreateTopicMessage;
+import com.provectus.kafka.ui.api.model.KsqlCommandV2;
+import com.provectus.kafka.ui.api.model.KsqlCommandV2Response;
+import com.provectus.kafka.ui.api.model.KsqlResponse;
+import com.provectus.kafka.ui.api.model.NewConnector;
+import com.provectus.kafka.ui.api.model.NewSchemaSubject;
+import com.provectus.kafka.ui.api.model.TopicCreation;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.ksqlDb.models.Stream;
-import com.provectus.kafka.ui.pages.ksqlDb.models.Table;
+import com.provectus.kafka.ui.pages.ksqldb.models.Stream;
+import com.provectus.kafka.ui.pages.ksqldb.models.Table;
 import com.provectus.kafka.ui.settings.BaseSource;
 import io.qameta.allure.Step;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
-import static com.codeborne.selenide.Selenide.sleep;
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
 
 
 @Slf4j
 public class ApiService extends BaseSource {
 
-    @SneakyThrows
-    private TopicsApi topicApi() {
-        return new TopicsApi(new ApiClient().setBasePath(BASE_API_URL));
-    }
+  @SneakyThrows
+  private TopicsApi topicApi() {
+    return new TopicsApi(new ApiClient().setBasePath(BASE_API_URL));
+  }
 
-    @SneakyThrows
-    private SchemasApi schemaApi() {
-        return new SchemasApi(new ApiClient().setBasePath(BASE_API_URL));
-    }
+  @SneakyThrows
+  private SchemasApi schemaApi() {
+    return new SchemasApi(new ApiClient().setBasePath(BASE_API_URL));
+  }
 
-    @SneakyThrows
-    private KafkaConnectApi connectorApi() {
-        return new KafkaConnectApi(new ApiClient().setBasePath(BASE_API_URL));
-    }
+  @SneakyThrows
+  private KafkaConnectApi connectorApi() {
+    return new KafkaConnectApi(new ApiClient().setBasePath(BASE_API_URL));
+  }
 
-    @SneakyThrows
-    private MessagesApi messageApi() {
-        return new MessagesApi(new ApiClient().setBasePath(BASE_API_URL));
-    }
+  @SneakyThrows
+  private MessagesApi messageApi() {
+    return new MessagesApi(new ApiClient().setBasePath(BASE_API_URL));
+  }
 
-    @SneakyThrows
-    private KsqlApi ksqlApi() {
-        return new KsqlApi(new ApiClient().setBasePath(BASE_API_URL));
-    }
+  @SneakyThrows
+  private KsqlApi ksqlApi() {
+    return new KsqlApi(new ApiClient().setBasePath(BASE_API_URL));
+  }
 
-    @SneakyThrows
-    private void createTopic(String clusterName, String topicName) {
-        TopicCreation topic = new TopicCreation();
-        topic.setName(topicName);
-        topic.setPartitions(1);
-        topic.setReplicationFactor(1);
-        try {
-            topicApi().createTopic(clusterName, topic).block();
-            sleep(2000);
-        } catch (WebClientResponseException ex) {
-            ex.printStackTrace();
-        }
+  @SneakyThrows
+  private void createTopic(String clusterName, String topicName) {
+    TopicCreation topic = new TopicCreation();
+    topic.setName(topicName);
+    topic.setPartitions(1);
+    topic.setReplicationFactor(1);
+    try {
+      topicApi().createTopic(clusterName, topic).block();
+      sleep(2000);
+    } catch (WebClientResponseException ex) {
+      ex.printStackTrace();
     }
+  }
 
-    @Step
-    public ApiService createTopic(Topic topic) {
-        createTopic(CLUSTER_NAME, topic.getName());
-        return this;
-    }
+  @Step
+  public ApiService createTopic(Topic topic) {
+    createTopic(CLUSTER_NAME, topic.getName());
+    return this;
+  }
 
-    @SneakyThrows
-    private void deleteTopic(String clusterName, String topicName) {
-        try {
-            topicApi().deleteTopic(clusterName, topicName).block();
-        } catch (WebClientResponseException ignore) {
-        }
+  @SneakyThrows
+  private void deleteTopic(String clusterName, String topicName) {
+    try {
+      topicApi().deleteTopic(clusterName, topicName).block();
+    } catch (WebClientResponseException ignored) {
     }
+  }
 
-    @Step
-    public ApiService deleteTopic(String topicName) {
-        deleteTopic(CLUSTER_NAME, topicName);
-        return this;
-    }
+  @Step
+  public ApiService deleteTopic(String topicName) {
+    deleteTopic(CLUSTER_NAME, topicName);
+    return this;
+  }
 
-    @SneakyThrows
-    private void createSchema(String clusterName, Schema schema) {
-        NewSchemaSubject schemaSubject = new NewSchemaSubject();
-        schemaSubject.setSubject(schema.getName());
-        schemaSubject.setSchema(fileToString(schema.getValuePath()));
-        schemaSubject.setSchemaType(schema.getType());
-        try {
-            schemaApi().createNewSchema(clusterName, schemaSubject).block();
-        } catch (WebClientResponseException ex) {
-            ex.printStackTrace();
-        }
+  @SneakyThrows
+  private void createSchema(String clusterName, Schema schema) {
+    NewSchemaSubject schemaSubject = new NewSchemaSubject();
+    schemaSubject.setSubject(schema.getName());
+    schemaSubject.setSchema(fileToString(schema.getValuePath()));
+    schemaSubject.setSchemaType(schema.getType());
+    try {
+      schemaApi().createNewSchema(clusterName, schemaSubject).block();
+    } catch (WebClientResponseException ex) {
+      ex.printStackTrace();
     }
+  }
 
-    @Step
-    public ApiService createSchema(Schema schema) {
-        createSchema(CLUSTER_NAME, schema);
-        return this;
-    }
+  @Step
+  public ApiService createSchema(Schema schema) {
+    createSchema(CLUSTER_NAME, schema);
+    return this;
+  }
 
-    @SneakyThrows
-    private void deleteSchema(String clusterName, String schemaName) {
-        try {
-            schemaApi().deleteSchema(clusterName, schemaName).block();
-        } catch (WebClientResponseException ignore) {
-        }
+  @SneakyThrows
+  private void deleteSchema(String clusterName, String schemaName) {
+    try {
+      schemaApi().deleteSchema(clusterName, schemaName).block();
+    } catch (WebClientResponseException ignored) {
     }
+  }
 
-    @Step
-    public ApiService deleteSchema(String schemaName) {
-        deleteSchema(CLUSTER_NAME, schemaName);
-        return this;
-    }
+  @Step
+  public ApiService deleteSchema(String schemaName) {
+    deleteSchema(CLUSTER_NAME, schemaName);
+    return this;
+  }
 
-    @SneakyThrows
-    private void deleteConnector(String clusterName, String connectName, String connectorName) {
-        try {
-            connectorApi().deleteConnector(clusterName, connectName, connectorName).block();
-        } catch (WebClientResponseException ignore) {
-        }
+  @SneakyThrows
+  private void deleteConnector(String clusterName, String connectName, String connectorName) {
+    try {
+      connectorApi().deleteConnector(clusterName, connectName, connectorName).block();
+    } catch (WebClientResponseException ignored) {
     }
+  }
 
-    @Step
-    public ApiService deleteConnector(String connectName, String connectorName) {
-        deleteConnector(CLUSTER_NAME, connectName, connectorName);
-        return this;
-    }
+  @Step
+  public ApiService deleteConnector(String connectName, String connectorName) {
+    deleteConnector(CLUSTER_NAME, connectName, connectorName);
+    return this;
+  }
 
-    @Step
-    public ApiService deleteConnector(String connectorName) {
-        deleteConnector(CLUSTER_NAME, CONNECT_NAME, connectorName);
-        return this;
-    }
+  @Step
+  public ApiService deleteConnector(String connectorName) {
+    deleteConnector(CLUSTER_NAME, CONNECT_NAME, connectorName);
+    return this;
+  }
 
-    @SneakyThrows
-    private void createConnector(String clusterName, String connectName, Connector connector) {
-        NewConnector connectorProperties = new NewConnector();
-        connectorProperties.setName(connector.getName());
-        Map<String, Object> configMap = new ObjectMapper().readValue(connector.getConfig(), HashMap.class);
-        connectorProperties.setConfig(configMap);
-        try {
-            connectorApi().deleteConnector(clusterName, connectName, connector.getName()).block();
-        } catch (WebClientResponseException ignored) {
-        }
-        connectorApi().createConnector(clusterName, connectName, connectorProperties).block();
+  @SneakyThrows
+  private void createConnector(String clusterName, String connectName, Connector connector) {
+    NewConnector connectorProperties = new NewConnector();
+    connectorProperties.setName(connector.getName());
+    Map<String, Object> configMap = new ObjectMapper().readValue(connector.getConfig(), HashMap.class);
+    connectorProperties.setConfig(configMap);
+    try {
+      connectorApi().deleteConnector(clusterName, connectName, connector.getName()).block();
+    } catch (WebClientResponseException ignored) {
     }
+    connectorApi().createConnector(clusterName, connectName, connectorProperties).block();
+  }
 
-    @Step
-    public ApiService createConnector(String connectName, Connector connector) {
-        createConnector(CLUSTER_NAME, connectName, connector);
-        return this;
-    }
+  @Step
+  public ApiService createConnector(String connectName, Connector connector) {
+    createConnector(CLUSTER_NAME, connectName, connector);
+    return this;
+  }
 
-    @Step
-    public ApiService createConnector(Connector connector) {
-        createConnector(CLUSTER_NAME, CONNECT_NAME, connector);
-        return this;
-    }
+  @Step
+  public ApiService createConnector(Connector connector) {
+    createConnector(CLUSTER_NAME, CONNECT_NAME, connector);
+    return this;
+  }
 
-    @Step
-    public String getFirstConnectName(String clusterName) {
-        return Objects.requireNonNull(connectorApi().getConnects(clusterName).blockFirst()).getName();
-    }
+  @Step
+  public String getFirstConnectName(String clusterName) {
+    return Objects.requireNonNull(connectorApi().getConnects(clusterName).blockFirst()).getName();
+  }
 
-    @SneakyThrows
-    private void sendMessage(String clusterName, Topic topic) {
-        CreateTopicMessage createMessage = new CreateTopicMessage();
-        createMessage.setPartition(0);
-        createMessage.setKeySerde("String");
-        createMessage.setValueSerde("String");
-        createMessage.setKey(topic.getMessageKey());
-        createMessage.setContent(topic.getMessageContent());
-        try {
-            messageApi().sendTopicMessages(clusterName, topic.getName(), createMessage).block();
-        } catch (WebClientResponseException ex) {
-            ex.getRawStatusCode();
-        }
+  @SneakyThrows
+  private void sendMessage(String clusterName, Topic topic) {
+    CreateTopicMessage createMessage = new CreateTopicMessage();
+    createMessage.setPartition(0);
+    createMessage.setKeySerde("String");
+    createMessage.setValueSerde("String");
+    createMessage.setKey(topic.getMessageKey());
+    createMessage.setContent(topic.getMessageContent());
+    try {
+      messageApi().sendTopicMessages(clusterName, topic.getName(), createMessage).block();
+    } catch (WebClientResponseException ex) {
+      ex.getRawStatusCode();
     }
+  }
 
-    @Step
-    public ApiService sendMessage(Topic topic) {
-        sendMessage(CLUSTER_NAME, topic);
-        return this;
-    }
+  @Step
+  public ApiService sendMessage(Topic topic) {
+    sendMessage(CLUSTER_NAME, topic);
+    return this;
+  }
 
-    @Step
-    public ApiService createStream(Stream stream) {
-        KsqlCommandV2Response pipeIdStream = ksqlApi()
-                .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
-                        .ksql(String.format("CREATE STREAM %s (profileId VARCHAR, latitude DOUBLE, longitude DOUBLE) ",
-                                stream.getName())
-                                + String.format("WITH (kafka_topic='%s', value_format='json', partitions=1);",
-                                stream.getTopicName())))
-                .block();
-        assert pipeIdStream != null;
-        List<KsqlResponse> responseListStream = ksqlApi()
-                .openKsqlResponsePipe(CLUSTER_NAME, pipeIdStream.getPipeId())
-                .collectList()
-                .block();
-        assert Objects.requireNonNull(responseListStream).size() != 0;
-        return this;
-    }
+  @Step
+  public ApiService createStream(Stream stream) {
+    KsqlCommandV2Response pipeIdStream = ksqlApi()
+        .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
+            .ksql(String.format("CREATE STREAM %s (profileId VARCHAR, latitude DOUBLE, longitude DOUBLE) ",
+                stream.getName())
+                + String.format("WITH (kafka_topic='%s', value_format='json', partitions=1);",
+                stream.getTopicName())))
+        .block();
+    assert pipeIdStream != null;
+    List<KsqlResponse> responseListStream = ksqlApi()
+        .openKsqlResponsePipe(CLUSTER_NAME, pipeIdStream.getPipeId())
+        .collectList()
+        .block();
+    assert Objects.requireNonNull(responseListStream).size() != 0;
+    return this;
+  }
 
-    @Step
-    public ApiService createTables(Table firstTable, Table secondTable) {
-        KsqlCommandV2Response pipeIdTable1 = ksqlApi()
-                .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
-                        .ksql(String.format("CREATE TABLE %s AS ", firstTable.getName())
-                                + "  SELECT profileId, "
-                                + "         LATEST_BY_OFFSET(latitude) AS la, "
-                                + "         LATEST_BY_OFFSET(longitude) AS lo "
-                                + String.format("  FROM %s ", firstTable.getStreamName())
-                                + "  GROUP BY profileId "
-                                + "  EMIT CHANGES;"))
-                .block();
-        assert pipeIdTable1 != null;
-        List<KsqlResponse> responseListTable = ksqlApi()
-                .openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable1.getPipeId())
-                .collectList()
-                .block();
-        assert Objects.requireNonNull(responseListTable).size() != 0;
-        KsqlCommandV2Response pipeIdTable2 = ksqlApi()
-                .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
-                        .ksql(String.format("CREATE TABLE %s AS ", secondTable.getName())
-                                + "  SELECT ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1) AS distanceInMiles, "
-                                + "         COLLECT_LIST(profileId) AS riders, "
-                                + "         COUNT(*) AS count "
-                                + String.format("  FROM %s ", firstTable.getName())
-                                + "  GROUP BY ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1);"))
-                .block();
-        assert pipeIdTable2 != null;
-        List<KsqlResponse> responseListTable2 = ksqlApi()
-                .openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable2.getPipeId())
-                .collectList()
-                .block();
-        assert Objects.requireNonNull(responseListTable2).size() != 0;
-        return this;
-    }
+  @Step
+  public ApiService createTables(Table firstTable, Table secondTable) {
+    KsqlCommandV2Response pipeIdTable1 = ksqlApi()
+        .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
+            .ksql(String.format("CREATE TABLE %s AS ", firstTable.getName())
+                + "  SELECT profileId, "
+                + "         LATEST_BY_OFFSET(latitude) AS la, "
+                + "         LATEST_BY_OFFSET(longitude) AS lo "
+                + String.format("  FROM %s ", firstTable.getStreamName())
+                + "  GROUP BY profileId "
+                + "  EMIT CHANGES;"))
+        .block();
+    assert pipeIdTable1 != null;
+    List<KsqlResponse> responseListTable = ksqlApi()
+        .openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable1.getPipeId())
+        .collectList()
+        .block();
+    assert Objects.requireNonNull(responseListTable).size() != 0;
+    KsqlCommandV2Response pipeIdTable2 = ksqlApi()
+        .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
+            .ksql(String.format("CREATE TABLE %s AS ", secondTable.getName())
+                + "  SELECT ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1) AS distanceInMiles, "
+                + "         COLLECT_LIST(profileId) AS riders, "
+                + "         COUNT(*) AS count "
+                + String.format("  FROM %s ", firstTable.getName())
+                + "  GROUP BY ROUND(GEO_DISTANCE(la, lo, 37.4133, -122.1162), -1);"))
+        .block();
+    assert pipeIdTable2 != null;
+    List<KsqlResponse> responseListTable2 = ksqlApi()
+        .openKsqlResponsePipe(CLUSTER_NAME, pipeIdTable2.getPipeId())
+        .collectList()
+        .block();
+    assert Objects.requireNonNull(responseListTable2).size() != 0;
+    return this;
+  }
 
-    @Step
-    public ApiService insertInto(Stream stream) {
-        String streamName = stream.getName();
-        KsqlCommandV2Response pipeIdInsert = ksqlApi()
-                .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
-                        .ksql("INSERT INTO " + streamName + " (profileId, latitude, longitude) VALUES ('c2309eec', 37.7877, -122.4205);"
-                                + "INSERT INTO " + streamName +
-                                " (profileId, latitude, longitude) VALUES ('18f4ea86', 37.3903, -122.0643); "
-                                + "INSERT INTO " + streamName +
-                                " (profileId, latitude, longitude) VALUES ('4ab5cbad', 37.3952, -122.0813); "
-                                + "INSERT INTO " + streamName +
-                                " (profileId, latitude, longitude) VALUES ('8b6eae59', 37.3944, -122.0813); "
-                                + "INSERT INTO " + streamName +
-                                " (profileId, latitude, longitude) VALUES ('4a7c7b41', 37.4049, -122.0822); "
-                                + "INSERT INTO " + streamName +
-                                " (profileId, latitude, longitude) VALUES ('4ddad000', 37.7857, -122.4011);"))
-                .block();
-        assert pipeIdInsert != null;
-        List<KsqlResponse> responseListInsert = ksqlApi()
-                .openKsqlResponsePipe(CLUSTER_NAME, pipeIdInsert.getPipeId())
-                .collectList()
-                .block();
-        assert Objects.requireNonNull(responseListInsert).size() != 0;
-        return this;
-    }
+  @Step
+  public ApiService insertInto(Stream stream) {
+    String streamName = stream.getName();
+    KsqlCommandV2Response pipeIdInsert = ksqlApi()
+        .executeKsql(CLUSTER_NAME, new KsqlCommandV2()
+            .ksql("INSERT INTO " + streamName
+                + " (profileId, latitude, longitude) VALUES ('c2309eec', 37.7877, -122.4205);"
+                + "INSERT INTO " + streamName
+                + " (profileId, latitude, longitude) VALUES ('18f4ea86', 37.3903, -122.0643); "
+                + "INSERT INTO " + streamName
+                + " (profileId, latitude, longitude) VALUES ('4ab5cbad', 37.3952, -122.0813); "
+                + "INSERT INTO " + streamName
+                + " (profileId, latitude, longitude) VALUES ('8b6eae59', 37.3944, -122.0813); "
+                + "INSERT INTO " + streamName
+                + " (profileId, latitude, longitude) VALUES ('4a7c7b41', 37.4049, -122.0822); "
+                + "INSERT INTO " + streamName
+                + " (profileId, latitude, longitude) VALUES ('4ddad000', 37.7857, -122.4011);"))
+        .block();
+    assert pipeIdInsert != null;
+    List<KsqlResponse> responseListInsert = ksqlApi()
+        .openKsqlResponsePipe(CLUSTER_NAME, pipeIdInsert.getPipeId())
+        .collectList()
+        .block();
+    assert Objects.requireNonNull(responseListInsert).size() != 0;
+    return this;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
index cbb1bc23454..821f2ba6486 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/BaseSource.java
@@ -1,29 +1,29 @@
 package com.provectus.kafka.ui.settings;
 
+import static com.provectus.kafka.ui.variables.Browser.LOCAL;
+
 import com.provectus.kafka.ui.settings.configs.Config;
 import org.aeonbits.owner.ConfigFactory;
 
-import static com.provectus.kafka.ui.variables.Browser.LOCAL;
-
 public abstract class BaseSource {
 
-    public static final String CLUSTER_NAME = "local";
-    public static final String CONNECT_NAME = "first";
-    private static final String LOCAL_HOST = "localhost";
-    private static Config config;
-    public static final String BROWSER = config().browser();
-    public static final String SUITE_NAME = config().suite();
-    public static final String BASE_HOST = BROWSER.equals(LOCAL)
-            ? LOCAL_HOST
-            : "host.docker.internal";
-    public static final String REMOTE_URL = String.format("http://%s:4444/wd/hub", LOCAL_HOST);
-    public static final String BASE_API_URL = String.format("http://%s:8080", LOCAL_HOST);
-    public static final String BASE_UI_URL = String.format("http://%s:8080", BASE_HOST);
+  public static final String CLUSTER_NAME = "local";
+  public static final String CONNECT_NAME = "first";
+  private static final String LOCAL_HOST = "localhost";
+  public static final String REMOTE_URL = String.format("http://%s:4444/wd/hub", LOCAL_HOST);
+  public static final String BASE_API_URL = String.format("http://%s:8080", LOCAL_HOST);
+  private static Config config;
+  public static final String BROWSER = config().browser();
+  public static final String BASE_HOST = BROWSER.equals(LOCAL)
+      ? LOCAL_HOST
+      : "host.docker.internal";
+  public static final String BASE_UI_URL = String.format("http://%s:8080", BASE_HOST);
+  public static final String SUITE_NAME = config().suite();
 
-    private static Config config() {
-        if (config == null) {
-            config = ConfigFactory.create(Config.class, System.getProperties());
-        }
-        return config;
+  private static Config config() {
+    if (config == null) {
+      config = ConfigFactory.create(Config.class, System.getProperties());
     }
+    return config;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
index ef61d7d7701..fb9f9c1b192 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java
@@ -1,17 +1,17 @@
 package com.provectus.kafka.ui.settings.configs;
 
-import org.aeonbits.owner.Config;
-
 import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
 import static com.provectus.kafka.ui.variables.Suite.CUSTOM;
 
+import org.aeonbits.owner.Config;
+
 public interface Profiles extends Config {
 
-    @Key("browser")
-    @DefaultValue(CONTAINER)
-    String browser();
+  @Key("browser")
+  @DefaultValue(CONTAINER)
+  String browser();
 
-    @Key("suite")
-    @DefaultValue(CUSTOM)
-    String suite();
+  @Key("suite")
+  @DefaultValue(CUSTOM)
+  String suite();
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java
index 2b210e91e13..df1c55bc2f4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java
@@ -1,96 +1,101 @@
 package com.provectus.kafka.ui.settings.drivers;
 
+import static com.codeborne.selenide.Selenide.clearBrowserCookies;
+import static com.codeborne.selenide.Selenide.clearBrowserLocalStorage;
+import static com.codeborne.selenide.Selenide.refresh;
+import static com.provectus.kafka.ui.settings.BaseSource.BROWSER;
+import static com.provectus.kafka.ui.settings.BaseSource.REMOTE_URL;
+import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
+import static com.provectus.kafka.ui.variables.Browser.LOCAL;
+
 import com.codeborne.selenide.Configuration;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.WebDriverRunner;
 import com.codeborne.selenide.logevents.SelenideLogger;
 import io.qameta.allure.Step;
 import io.qameta.allure.selenide.AllureSelenide;
+import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.settings.BaseSource.BROWSER;
-import static com.provectus.kafka.ui.settings.BaseSource.REMOTE_URL;
-import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
-import static com.provectus.kafka.ui.variables.Browser.LOCAL;
-
+@Slf4j
 public abstract class WebDriver {
 
-    @Step
-    public static void browserSetup() {
-        Configuration.headless = false;
-        Configuration.browser = "chrome";
-        Configuration.browserSize = "1920x1080";
-        /**screenshots and savePageSource config is needed for local debug
-         * optionally can be set as 'false' to not duplicate Allure report
-         */
-        Configuration.screenshots = true;
-        Configuration.savePageSource = false;
-        Configuration.pageLoadTimeout = 120000;
-        ChromeOptions options = new ChromeOptions()
-                .addArguments("--no-sandbox")
-                .addArguments("--verbose")
-                .addArguments("--remote-allow-origins=*")
-                .addArguments("--disable-dev-shm-usage")
-                .addArguments("--disable-gpu")
-                .addArguments("--lang=en_US");
-        switch (BROWSER) {
-            case (LOCAL) -> Configuration.browserCapabilities = options;
-            case (CONTAINER) -> {
-                Configuration.remote = REMOTE_URL;
-                Configuration.remoteConnectionTimeout = 180000;
-                DesiredCapabilities capabilities = new DesiredCapabilities();
-                capabilities.setCapability("enableVNC", true);
-                capabilities.setCapability("enableVideo", false);
-                Configuration.browserCapabilities = capabilities.merge(options);
-            }
-            default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
-        }
+  @Step
+  public static void browserSetup() {
+    Configuration.headless = false;
+    Configuration.browser = "chrome";
+    Configuration.browserSize = "1920x1080";
+    Configuration.screenshots = true;
+    Configuration.savePageSource = false;
+    Configuration.pageLoadTimeout = 120000;
+    ChromeOptions options = new ChromeOptions()
+        .addArguments("--no-sandbox")
+        .addArguments("--verbose")
+        .addArguments("--remote-allow-origins=*")
+        .addArguments("--disable-dev-shm-usage")
+        .addArguments("--disable-gpu")
+        .addArguments("--lang=en_US");
+    switch (BROWSER) {
+      case (LOCAL) -> Configuration.browserCapabilities = options;
+      case (CONTAINER) -> {
+        Configuration.remote = REMOTE_URL;
+        Configuration.remoteConnectionTimeout = 180000;
+        DesiredCapabilities capabilities = new DesiredCapabilities();
+        capabilities.setCapability("enableVNC", true);
+        capabilities.setCapability("enableVideo", false);
+        Configuration.browserCapabilities = capabilities.merge(options);
+      }
+      default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
     }
+  }
 
-    private static org.openqa.selenium.WebDriver getWebDriver() {
-        try {
-            return WebDriverRunner.getWebDriver();
-        } catch (IllegalStateException ex) {
-            browserSetup();
-            Selenide.open();
-            return WebDriverRunner.getWebDriver();
-        }
+  private static org.openqa.selenium.WebDriver getWebDriver() {
+    try {
+      return WebDriverRunner.getWebDriver();
+    } catch (IllegalStateException ex) {
+      browserSetup();
+      Selenide.open();
+      return WebDriverRunner.getWebDriver();
     }
+  }
 
-    @Step
-    public static void openUrl(String url) {
-        org.openqa.selenium.WebDriver driver = getWebDriver();
-        if (!driver.getCurrentUrl().equals(url)) driver.get(url);
+  @Step
+  public static void openUrl(String url) {
+    org.openqa.selenium.WebDriver driver = getWebDriver();
+    if (!driver.getCurrentUrl().equals(url)) {
+      driver.get(url);
     }
+  }
 
-    @Step
-    public static void browserInit() {
-        getWebDriver();
-    }
+  @Step
+  public static void browserInit() {
+    getWebDriver();
+  }
 
-    @Step
-    public static void browserClear() {
-        clearBrowserLocalStorage();
-        clearBrowserCookies();
-        refresh();
-    }
+  @Step
+  public static void browserClear() {
+    clearBrowserLocalStorage();
+    clearBrowserCookies();
+    refresh();
+  }
 
-    @Step
-    public static void browserQuit() {
-        org.openqa.selenium.WebDriver driver = null;
-        try {
-            driver = WebDriverRunner.getWebDriver();
-        } catch (Throwable ignored) {
-        }
-        if (driver != null) driver.quit();
+  @Step
+  public static void browserQuit() {
+    org.openqa.selenium.WebDriver driver = null;
+    try {
+      driver = WebDriverRunner.getWebDriver();
+    } catch (Throwable ignored) {
     }
-
-    @Step
-    public static void loggerSetup() {
-        SelenideLogger.addListener("AllureSelenide", new AllureSelenide()
-                .screenshots(true)
-                .savePageSource(false));
+    if (driver != null) {
+      driver.quit();
     }
+  }
+
+  @Step
+  public static void loggerSetup() {
+    SelenideLogger.addListener("AllureSelenide", new AllureSelenide()
+        .screenshots(true)
+        .savePageSource(false));
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/AllureListener.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/AllureListener.java
index 74119f8480a..61125408c66 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/AllureListener.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/AllureListener.java
@@ -1,35 +1,39 @@
 package com.provectus.kafka.ui.settings.listeners;
 
+import static java.nio.file.Files.newInputStream;
+
 import com.codeborne.selenide.Screenshots;
 import io.qameta.allure.Allure;
 import io.qameta.allure.testng.AllureTestNg;
-import org.testng.ITestListener;
-import org.testng.ITestResult;
-
 import java.io.File;
 import java.io.IOException;
-import java.util.Objects;
-
-import static java.nio.file.Files.newInputStream;
+import lombok.extern.slf4j.Slf4j;
+import org.testng.ITestListener;
+import org.testng.ITestResult;
 
+@Slf4j
 public class AllureListener extends AllureTestNg implements ITestListener {
 
-    private void takeScreenshot() {
-        File screenshot = Screenshots.takeScreenShotAsFile();
-        try {
-            Allure.addAttachment(Objects.requireNonNull(screenshot).getName(), newInputStream(screenshot.toPath()));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+  private void takeScreenshot() {
+    File screenshot = Screenshots.takeScreenShotAsFile();
+    try {
+      if (screenshot != null) {
+        Allure.addAttachment(screenshot.getName(), newInputStream(screenshot.toPath()));
+      } else {
+        log.warn("Unable to take screenshot");
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
     }
+  }
 
-    @Override
-    public void onTestFailure(ITestResult result) {
-        takeScreenshot();
-    }
+  @Override
+  public void onTestFailure(ITestResult result) {
+    takeScreenshot();
+  }
 
-    @Override
-    public void onTestSkipped(ITestResult result) {
-        takeScreenshot();
-    }
+  @Override
+  public void onTestSkipped(ITestResult result) {
+    takeScreenshot();
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/LoggerListener.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/LoggerListener.java
index ca096cd2387..81f510f7525 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/LoggerListener.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/LoggerListener.java
@@ -7,31 +7,31 @@
 @Slf4j
 public class LoggerListener extends TestListenerAdapter {
 
-    @Override
-    public void onTestStart(final ITestResult testResult) {
-        log.info(String.format("\n------------------------------------------------------------------------ " +
-                        "\nTEST STARTED: %s.%s \n------------------------------------------------------------------------ \n",
-                testResult.getInstanceName(), testResult.getName()));
-    }
+  @Override
+  public void onTestStart(final ITestResult testResult) {
+    log.info(String.format("\n------------------------------------------------------------------------ "
+            + "\nTEST STARTED: %s.%s \n------------------------------------------------------------------------ \n",
+        testResult.getInstanceName(), testResult.getName()));
+  }
 
-    @Override
-    public void onTestSuccess(final ITestResult testResult) {
-        log.info(String.format("\n------------------------------------------------------------------------ " +
-                        "\nTEST PASSED: %s.%s \n------------------------------------------------------------------------ \n",
-                testResult.getInstanceName(), testResult.getName()));
-    }
+  @Override
+  public void onTestSuccess(final ITestResult testResult) {
+    log.info(String.format("\n------------------------------------------------------------------------ "
+            + "\nTEST PASSED: %s.%s \n------------------------------------------------------------------------ \n",
+        testResult.getInstanceName(), testResult.getName()));
+  }
 
-    @Override
-    public void onTestFailure(final ITestResult testResult) {
-        log.info(String.format("\n------------------------------------------------------------------------ " +
-                        "\nTEST FAILED: %s.%s \n------------------------------------------------------------------------ \n",
-                testResult.getInstanceName(), testResult.getName()));
-    }
+  @Override
+  public void onTestFailure(final ITestResult testResult) {
+    log.info(String.format("\n------------------------------------------------------------------------ "
+            + "\nTEST FAILED: %s.%s \n------------------------------------------------------------------------ \n",
+        testResult.getInstanceName(), testResult.getName()));
+  }
 
-    @Override
-    public void onTestSkipped(final ITestResult testResult) {
-        log.info(String.format("\n------------------------------------------------------------------------ " +
-                        "\nTEST SKIPPED: %s.%s \n------------------------------------------------------------------------ \n",
-                testResult.getInstanceName(), testResult.getName()));
-    }
+  @Override
+  public void onTestSkipped(final ITestResult testResult) {
+    log.info(String.format("\n------------------------------------------------------------------------ "
+            + "\nTEST SKIPPED: %s.%s \n------------------------------------------------------------------------ \n",
+        testResult.getInstanceName(), testResult.getName()));
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseCreateListener.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseCreateListener.java
index c40481c300a..ac3f84eba4e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseCreateListener.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseCreateListener.java
@@ -1,14 +1,28 @@
 package com.provectus.kafka.ui.settings.listeners;
 
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Status;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import static io.qase.api.utils.IntegrationUtils.getCaseTitle;
+
+import com.provectus.kafka.ui.utilities.qase.annotations.Automation;
+import com.provectus.kafka.ui.utilities.qase.annotations.Status;
+import com.provectus.kafka.ui.utilities.qase.annotations.Suite;
 import io.qase.api.QaseClient;
 import io.qase.api.StepStorage;
 import io.qase.api.annotation.QaseId;
 import io.qase.client.ApiClient;
 import io.qase.client.api.CasesApi;
-import io.qase.client.model.*;
+import io.qase.client.model.GetCasesFiltersParameter;
+import io.qase.client.model.ResultCreateStepsInner;
+import io.qase.client.model.TestCase;
+import io.qase.client.model.TestCaseCreate;
+import io.qase.client.model.TestCaseCreateStepsInner;
+import io.qase.client.model.TestCaseListResponse;
+import io.qase.client.model.TestCaseListResponseAllOfResult;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.testng.Assert;
@@ -16,108 +30,107 @@
 import org.testng.ITestResult;
 import org.testng.TestListenerAdapter;
 
-import java.lang.reflect.Method;
-import java.util.*;
-
-import static io.qase.api.utils.IntegrationUtils.getCaseTitle;
-
 @Slf4j
 public class QaseCreateListener extends TestListenerAdapter implements ITestListener {
 
-    private static final CasesApi QASE_API = getQaseApi();
+  private static final CasesApi QASE_API = getQaseApi();
 
-    private static CasesApi getQaseApi() {
-        ApiClient apiClient = QaseClient.getApiClient();
-        apiClient.setApiKey(System.getProperty("QASEIO_API_TOKEN"));
-        return new CasesApi(apiClient);
-    }
+  private static CasesApi getQaseApi() {
+    ApiClient apiClient = QaseClient.getApiClient();
+    apiClient.setApiKey(System.getProperty("QASEIO_API_TOKEN"));
+    return new CasesApi(apiClient);
+  }
 
-    private static int getStatus(Method method) {
-        if (method.isAnnotationPresent(Status.class))
-            return method.getDeclaredAnnotation(Status.class).status().getValue();
-        return 1;
+  private static int getStatus(Method method) {
+    if (method.isAnnotationPresent(Status.class)) {
+      return method.getDeclaredAnnotation(Status.class).status().getValue();
     }
+    return 1;
+  }
 
-    private static int getAutomation(Method method) {
-        if (method.isAnnotationPresent(Automation.class))
-            return method.getDeclaredAnnotation(Automation.class).state().getValue();
-        return 0;
+  private static int getAutomation(Method method) {
+    if (method.isAnnotationPresent(Automation.class)) {
+      return method.getDeclaredAnnotation(Automation.class).state().getValue();
     }
+    return 0;
+  }
 
-    @SneakyThrows
-    private static HashMap<Long, String> getCaseTitlesAndIdsFromQase() {
-        HashMap<Long, String> cases = new HashMap<>();
-        boolean getCases = true;
-        int offSet = 0;
-        while (getCases) {
-            getCases = false;
-            TestCaseListResponse response = QASE_API.getCases(System.getProperty("QASE_PROJECT_CODE"),
-                    new GetCasesFiltersParameter().status(GetCasesFiltersParameter.SERIALIZED_NAME_STATUS), 100, offSet);
-            TestCaseListResponseAllOfResult result = response.getResult();
-            Assert.assertNotNull(result);
-            List<TestCase> entities = result.getEntities();
-            Assert.assertNotNull(entities);
-            if (entities.size() > 0) {
-                for (TestCase testCase : entities) {
-                    cases.put(testCase.getId(), testCase.getTitle());
-                }
-                offSet = offSet + 100;
-                getCases = true;
-            }
+  @SneakyThrows
+  private static HashMap<Long, String> getCaseTitlesAndIdsFromQase() {
+    HashMap<Long, String> cases = new HashMap<>();
+    boolean getCases = true;
+    int offSet = 0;
+    while (getCases) {
+      getCases = false;
+      TestCaseListResponse response = QASE_API.getCases(System.getProperty("QASE_PROJECT_CODE"),
+          new GetCasesFiltersParameter().status(GetCasesFiltersParameter.SERIALIZED_NAME_STATUS), 100, offSet);
+      TestCaseListResponseAllOfResult result = response.getResult();
+      Assert.assertNotNull(result);
+      List<TestCase> entities = result.getEntities();
+      Assert.assertNotNull(entities);
+      if (entities.size() > 0) {
+        for (TestCase testCase : entities) {
+          cases.put(testCase.getId(), testCase.getTitle());
         }
-        return cases;
+        offSet = offSet + 100;
+        getCases = true;
+      }
     }
+    return cases;
+  }
 
-    private static boolean isCaseWithTitleExistInQase(Method method) {
-        HashMap<Long, String> cases = getCaseTitlesAndIdsFromQase();
-        String title = getCaseTitle(method);
-        if (cases.containsValue(title)) {
-            for (Map.Entry<Long, String> map : cases.entrySet()) {
-                if (map.getValue().matches(title)) {
-                    long id = map.getKey();
-                    log.warn(String.format("Test case with @QaseTitle='%s' already exists with @QaseId=%d. " +
-                            "Please verify @QaseTitle annotation", title, id));
-                    return true;
-                }
-            }
+  private static boolean isCaseWithTitleExistInQase(Method method) {
+    HashMap<Long, String> cases = getCaseTitlesAndIdsFromQase();
+    String title = getCaseTitle(method);
+    if (cases.containsValue(title)) {
+      for (Map.Entry<Long, String> map : cases.entrySet()) {
+        if (map.getValue().matches(title)) {
+          long id = map.getKey();
+          log.warn(String.format("Test case with @QaseTitle='%s' already exists with @QaseId=%d. "
+              + "Please verify @QaseTitle annotation", title, id));
+          return true;
         }
-        return false;
+      }
     }
+    return false;
+  }
 
-    @Override
-    @SneakyThrows
-    public void onTestSuccess(final ITestResult testResult) {
-        Method method = testResult.getMethod()
-                .getConstructorOrMethod()
-                .getMethod();
-        String title = getCaseTitle(method);
-        if (!method.isAnnotationPresent(QaseId.class)) {
-            if (title != null) {
-                if (!isCaseWithTitleExistInQase(method)) {
-                    LinkedList<ResultCreateStepsInner> resultSteps = StepStorage.stopSteps();
-                    LinkedList<TestCaseCreateStepsInner> createSteps = new LinkedList<>();
-                    resultSteps.forEach(step -> {
-                        TestCaseCreateStepsInner caseStep = new TestCaseCreateStepsInner();
-                        caseStep.setAction(step.getAction());
-                        caseStep.setExpectedResult(step.getExpectedResult());
-                        createSteps.add(caseStep);
-                    });
-                    TestCaseCreate newCase = new TestCaseCreate();
-                    newCase.setTitle(title);
-                    newCase.setStatus(getStatus(method));
-                    newCase.setAutomation(getAutomation(method));
-                    newCase.setSteps(createSteps);
-                    if (method.isAnnotationPresent(Suite.class)) {
-                        long suiteId = method.getDeclaredAnnotation(Suite.class).id();
-                        newCase.suiteId(suiteId);
-                    }
-                    Long id = Objects.requireNonNull(QASE_API.createCase(System.getProperty("QASE_PROJECT_CODE"),
-                            newCase).getResult()).getId();
-                    log.info(String.format("New test case '%s' was created with @QaseId=%d", title, id));
-                }
-            } else
-                log.warn("To create new test case in Qase.io please add @QaseTitle annotation");
-        } else
-            log.warn("To create new test case in Qase.io please remove @QaseId annotation");
+  @Override
+  @SneakyThrows
+  public void onTestSuccess(final ITestResult testResult) {
+    Method method = testResult.getMethod()
+        .getConstructorOrMethod()
+        .getMethod();
+    String title = getCaseTitle(method);
+    if (!method.isAnnotationPresent(QaseId.class)) {
+      if (title != null) {
+        if (!isCaseWithTitleExistInQase(method)) {
+          LinkedList<ResultCreateStepsInner> resultSteps = StepStorage.stopSteps();
+          LinkedList<TestCaseCreateStepsInner> createSteps = new LinkedList<>();
+          resultSteps.forEach(step -> {
+            TestCaseCreateStepsInner caseStep = new TestCaseCreateStepsInner();
+            caseStep.setAction(step.getAction());
+            caseStep.setExpectedResult(step.getExpectedResult());
+            createSteps.add(caseStep);
+          });
+          TestCaseCreate newCase = new TestCaseCreate();
+          newCase.setTitle(title);
+          newCase.setStatus(getStatus(method));
+          newCase.setAutomation(getAutomation(method));
+          newCase.setSteps(createSteps);
+          if (method.isAnnotationPresent(Suite.class)) {
+            long suiteId = method.getDeclaredAnnotation(Suite.class).id();
+            newCase.suiteId(suiteId);
+          }
+          Long id = Objects.requireNonNull(QASE_API.createCase(System.getProperty("QASE_PROJECT_CODE"),
+              newCase).getResult()).getId();
+          log.info(String.format("New test case '%s' was created with @QaseId=%d", title, id));
+        }
+      } else {
+        log.warn("To create new test case in Qase.io please add @QaseTitle annotation");
+      }
+    } else {
+      log.warn("To create new test case in Qase.io please remove @QaseId annotation");
     }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java
index 72056db922b..d413ca4a28c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/listeners/QaseResultListener.java
@@ -1,5 +1,12 @@
 package com.provectus.kafka.ui.settings.listeners;
 
+import static io.qase.api.utils.IntegrationUtils.getCaseId;
+import static io.qase.api.utils.IntegrationUtils.getCaseTitle;
+import static io.qase.api.utils.IntegrationUtils.getStacktrace;
+import static io.qase.client.model.ResultCreate.StatusEnum.FAILED;
+import static io.qase.client.model.ResultCreate.StatusEnum.PASSED;
+import static io.qase.client.model.ResultCreate.StatusEnum.SKIPPED;
+
 import io.qase.api.StepStorage;
 import io.qase.api.config.QaseConfig;
 import io.qase.api.services.QaseTestCaseListener;
@@ -7,6 +14,9 @@
 import io.qase.client.model.ResultCreateCase;
 import io.qase.client.model.ResultCreateStepsInner;
 import io.qase.testng.guice.module.TestNgModule;
+import java.lang.reflect.Method;
+import java.util.LinkedList;
+import java.util.Optional;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -15,88 +25,81 @@
 import org.testng.ITestResult;
 import org.testng.TestListenerAdapter;
 
-import java.lang.reflect.Method;
-import java.util.LinkedList;
-import java.util.Optional;
-
-import static io.qase.api.utils.IntegrationUtils.*;
-import static io.qase.client.model.ResultCreate.StatusEnum.*;
-
 @Slf4j
 public class QaseResultListener extends TestListenerAdapter implements ITestListener {
 
-    private static final String REPORTER_NAME = "TestNG";
+  private static final String REPORTER_NAME = "TestNG";
 
-    static {
-        System.setProperty(QaseConfig.QASE_CLIENT_REPORTER_NAME_KEY, REPORTER_NAME);
-    }
+  static {
+    System.setProperty(QaseConfig.QASE_CLIENT_REPORTER_NAME_KEY, REPORTER_NAME);
+  }
 
-    @Getter(lazy = true, value = AccessLevel.PRIVATE)
-    private final QaseTestCaseListener qaseTestCaseListener = createQaseListener();
+  @Getter(lazy = true, value = AccessLevel.PRIVATE)
+  private final QaseTestCaseListener qaseTestCaseListener = createQaseListener();
 
-    private static QaseTestCaseListener createQaseListener() {
-        return TestNgModule.getInjector().getInstance(QaseTestCaseListener.class);
-    }
+  private static QaseTestCaseListener createQaseListener() {
+    return TestNgModule.getInjector().getInstance(QaseTestCaseListener.class);
+  }
 
-    @Override
-    public void onTestStart(ITestResult tr) {
-        getQaseTestCaseListener().onTestCaseStarted();
-        super.onTestStart(tr);
-    }
+  @Override
+  public void onTestStart(ITestResult tr) {
+    getQaseTestCaseListener().onTestCaseStarted();
+    super.onTestStart(tr);
+  }
 
-    @Override
-    public void onTestSuccess(ITestResult tr) {
-        getQaseTestCaseListener()
-                .onTestCaseFinished(resultCreate -> setupResultItem(resultCreate, tr, PASSED));
-        super.onTestSuccess(tr);
-    }
+  @Override
+  public void onTestSuccess(ITestResult tr) {
+    getQaseTestCaseListener()
+        .onTestCaseFinished(resultCreate -> setupResultItem(resultCreate, tr, PASSED));
+    super.onTestSuccess(tr);
+  }
 
-    @Override
-    public void onTestSkipped(ITestResult tr) {
-        getQaseTestCaseListener()
-                .onTestCaseFinished(resultCreate -> setupResultItem(resultCreate, tr, SKIPPED));
-        super.onTestSuccess(tr);
-    }
+  @Override
+  public void onTestSkipped(ITestResult tr) {
+    getQaseTestCaseListener()
+        .onTestCaseFinished(resultCreate -> setupResultItem(resultCreate, tr, SKIPPED));
+    super.onTestSuccess(tr);
+  }
 
-    @Override
-    public void onTestFailure(ITestResult tr) {
-        getQaseTestCaseListener()
-                .onTestCaseFinished(resultCreate -> setupResultItem(resultCreate, tr, FAILED));
-        super.onTestFailure(tr);
-    }
+  @Override
+  public void onTestFailure(ITestResult tr) {
+    getQaseTestCaseListener()
+        .onTestCaseFinished(resultCreate -> setupResultItem(resultCreate, tr, FAILED));
+    super.onTestFailure(tr);
+  }
 
-    @Override
-    public void onFinish(ITestContext testContext) {
-        getQaseTestCaseListener().onTestCasesSetFinished();
-        super.onFinish(testContext);
-    }
+  @Override
+  public void onFinish(ITestContext testContext) {
+    getQaseTestCaseListener().onTestCasesSetFinished();
+    super.onFinish(testContext);
+  }
 
-    private void setupResultItem(ResultCreate resultCreate, ITestResult result, ResultCreate.StatusEnum status) {
-        Optional<Throwable> resultThrowable = Optional.ofNullable(result.getThrowable());
-        String comment = resultThrowable
-                .flatMap(throwable -> Optional.of(throwable.toString())).orElse(null);
-        Boolean isDefect = resultThrowable
-                .flatMap(throwable -> Optional.of(throwable instanceof AssertionError))
-                .orElse(false);
-        String stacktrace = resultThrowable
-                .flatMap(throwable -> Optional.of(getStacktrace(throwable)))
-                .orElse(null);
-        Method method = result.getMethod()
-                .getConstructorOrMethod()
-                .getMethod();
-        Long caseId = getCaseId(method);
-        String caseTitle = null;
-        if (caseId == null) {
-            caseTitle = getCaseTitle(method);
-        }
-        LinkedList<ResultCreateStepsInner> steps = StepStorage.stopSteps();
-        resultCreate
-                ._case(caseTitle == null ? null : new ResultCreateCase().title(caseTitle))
-                .caseId(caseId)
-                .status(status)
-                .comment(comment)
-                .stacktrace(stacktrace)
-                .steps(steps.isEmpty() ? null : steps)
-                .defect(isDefect);
+  private void setupResultItem(ResultCreate resultCreate, ITestResult result, ResultCreate.StatusEnum status) {
+    Optional<Throwable> resultThrowable = Optional.ofNullable(result.getThrowable());
+    String comment = resultThrowable
+        .flatMap(throwable -> Optional.of(throwable.toString())).orElse(null);
+    Boolean isDefect = resultThrowable
+        .flatMap(throwable -> Optional.of(throwable instanceof AssertionError))
+        .orElse(false);
+    String stacktrace = resultThrowable
+        .flatMap(throwable -> Optional.of(getStacktrace(throwable)))
+        .orElse(null);
+    Method method = result.getMethod()
+        .getConstructorOrMethod()
+        .getMethod();
+    Long caseId = getCaseId(method);
+    String caseTitle = null;
+    if (caseId == null) {
+      caseTitle = getCaseTitle(method);
     }
+    LinkedList<ResultCreateStepsInner> steps = StepStorage.stopSteps();
+    resultCreate
+        ._case(caseTitle == null ? null : new ResultCreateCase().title(caseTitle))
+        .caseId(caseId)
+        .status(status)
+        .comment(comment)
+        .stacktrace(stacktrace)
+        .steps(steps.isEmpty() ? null : steps)
+        .defect(isDefect);
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/FileUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/FileUtils.java
index c2489a86c20..8bb57809b89 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/FileUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/FileUtils.java
@@ -1,27 +1,26 @@
 package com.provectus.kafka.ui.utilities;
 
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
+import static org.apache.kafka.common.utils.Utils.readFileAsString;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-
-import static org.apache.kafka.common.utils.Utils.readFileAsString;
+import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 public class FileUtils {
 
-    public static String getResourceAsString(String resourceFileName) {
-        try {
-            return IOUtils.resourceToString("/" + resourceFileName, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+  public static String getResourceAsString(String resourceFileName) {
+    try {
+      return IOUtils.resourceToString("/" + resourceFileName, StandardCharsets.UTF_8);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
     }
+  }
 
-    public static String fileToString(String path) {
-        try {
-            return readFileAsString(path);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+  public static String fileToString(String path) {
+    try {
+      return readFileAsString(path);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
     }
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java
index f53e8897e9f..7f72f8a4d6f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/TimeUtils.java
@@ -1,17 +1,16 @@
 package com.provectus.kafka.ui.utilities;
 
-import lombok.extern.slf4j.Slf4j;
+import static com.codeborne.selenide.Selenide.sleep;
 
 import java.time.LocalTime;
-
-import static com.codeborne.selenide.Selenide.sleep;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class TimeUtils {
 
-    public static void waitUntilNewMinuteStarted() {
-        int secondsLeft = 60 - LocalTime.now().getSecond();
-        log.debug("\nwaitUntilNewMinuteStarted: {}s", secondsLeft);
-        sleep(secondsLeft * 1000);
-    }
+  public static void waitUntilNewMinuteStarted() {
+    int secondsLeft = 60 - LocalTime.now().getSecond();
+    log.debug("\nwaitUntilNewMinuteStarted: {}s", secondsLeft);
+    sleep(secondsLeft * 1000);
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index 427662d9d77..fef5ef654a0 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -1,105 +1,110 @@
 package com.provectus.kafka.ui.utilities;
 
+import static com.codeborne.selenide.Selenide.executeJavaScript;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.codeborne.selenide.WebDriverRunner;
+import java.time.Duration;
 import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 
-import java.time.Duration;
-
-import static com.codeborne.selenide.Selenide.executeJavaScript;
-
 @Slf4j
 public class WebUtils {
 
-    public static int getTimeout(int... timeoutInSeconds) {
-        return (timeoutInSeconds != null && timeoutInSeconds.length > 0) ? timeoutInSeconds[0] : 4;
-    }
+  public static int getTimeout(int... timeoutInSeconds) {
+    return (timeoutInSeconds != null && timeoutInSeconds.length > 0) ? timeoutInSeconds[0] : 4;
+  }
 
-    public static void sendKeysAfterClear(SelenideElement element, String keys) {
-        log.debug("\nsendKeysAfterClear: {} \nsend keys '{}'", element.getSearchCriteria(), keys);
-        element.shouldBe(Condition.enabled).clear();
-        if (keys != null) element.sendKeys(keys);
+  public static void sendKeysAfterClear(SelenideElement element, String keys) {
+    log.debug("\nsendKeysAfterClear: {} \nsend keys '{}'", element.getSearchCriteria(), keys);
+    element.shouldBe(Condition.enabled).clear();
+    if (keys != null) {
+      element.sendKeys(keys);
     }
+  }
 
-    public static void clickByActions(SelenideElement element) {
-        log.debug("\nclickByActions: {}", element.getSearchCriteria());
-        element.shouldBe(Condition.enabled);
-        new Actions(WebDriverRunner.getWebDriver())
-                .moveToElement(element)
-                .click(element)
-                .perform();
-    }
+  public static void clickByActions(SelenideElement element) {
+    log.debug("\nclickByActions: {}", element.getSearchCriteria());
+    element.shouldBe(Condition.enabled);
+    new Actions(WebDriverRunner.getWebDriver())
+        .moveToElement(element)
+        .click(element)
+        .perform();
+  }
 
-    public static void sendKeysByActions(SelenideElement element, String keys) {
-        log.debug("\nsendKeysByActions: {} \nsend keys '{}'", element.getSearchCriteria(), keys);
-        element.shouldBe(Condition.enabled);
-        new Actions(WebDriverRunner.getWebDriver())
-                .moveToElement(element)
-                .sendKeys(element, keys)
-                .perform();
-    }
+  public static void sendKeysByActions(SelenideElement element, String keys) {
+    log.debug("\nsendKeysByActions: {} \nsend keys '{}'", element.getSearchCriteria(), keys);
+    element.shouldBe(Condition.enabled);
+    new Actions(WebDriverRunner.getWebDriver())
+        .moveToElement(element)
+        .sendKeys(element, keys)
+        .perform();
+  }
 
-    public static void clickByJavaScript(SelenideElement element) {
-        log.debug("\nclickByJavaScript: {}", element.getSearchCriteria());
-        element.shouldBe(Condition.enabled);
-        String script = "arguments[0].click();";
-        executeJavaScript(script, element);
-    }
+  public static void clickByJavaScript(SelenideElement element) {
+    log.debug("\nclickByJavaScript: {}", element.getSearchCriteria());
+    element.shouldBe(Condition.enabled);
+    String script = "arguments[0].click();";
+    executeJavaScript(script, element);
+  }
 
-    public static void clearByKeyboard(SelenideElement field) {
-        log.debug("\nclearByKeyboard: {}", field.getSearchCriteria());
-        field.shouldBe(Condition.enabled).sendKeys(Keys.END);
-        field.sendKeys(Keys.chord(Keys.CONTROL + "a"), Keys.DELETE);
-    }
+  public static void clearByKeyboard(SelenideElement field) {
+    log.debug("\nclearByKeyboard: {}", field.getSearchCriteria());
+    field.shouldBe(Condition.enabled).sendKeys(Keys.END);
+    field.sendKeys(Keys.chord(Keys.CONTROL + "a"), Keys.DELETE);
+  }
 
-    public static boolean isVisible(SelenideElement element, int... timeoutInSeconds) {
-        log.debug("\nisVisible: {}", element.getSearchCriteria());
-        boolean isVisible = false;
-        try {
-            element.shouldBe(Condition.visible,
-                    Duration.ofSeconds(getTimeout(timeoutInSeconds)));
-            isVisible = true;
-        } catch (Throwable e) {
-            log.debug("{} is not visible", element.getSearchCriteria());
-        }
-        return isVisible;
+  public static boolean isVisible(SelenideElement element, int... timeoutInSeconds) {
+    log.debug("\nisVisible: {}", element.getSearchCriteria());
+    boolean isVisible = false;
+    try {
+      element.shouldBe(Condition.visible,
+          Duration.ofSeconds(getTimeout(timeoutInSeconds)));
+      isVisible = true;
+    } catch (Throwable e) {
+      log.debug("{} is not visible", element.getSearchCriteria());
     }
+    return isVisible;
+  }
 
-    public static boolean isEnabled(SelenideElement element, int... timeoutInSeconds) {
-        log.debug("\nisEnabled: {}", element.getSearchCriteria());
-        boolean isEnabled = false;
-        try {
-            element.shouldBe(Condition.enabled,
-                    Duration.ofSeconds(getTimeout(timeoutInSeconds)));
-            isEnabled = true;
-        } catch (Throwable e) {
-            log.debug("{} is not enabled", element.getSearchCriteria());
-        }
-        return isEnabled;
+  public static boolean isEnabled(SelenideElement element, int... timeoutInSeconds) {
+    log.debug("\nisEnabled: {}", element.getSearchCriteria());
+    boolean isEnabled = false;
+    try {
+      element.shouldBe(Condition.enabled,
+          Duration.ofSeconds(getTimeout(timeoutInSeconds)));
+      isEnabled = true;
+    } catch (Throwable e) {
+      log.debug("{} is not enabled", element.getSearchCriteria());
     }
+    return isEnabled;
+  }
 
-    public static boolean isSelected(SelenideElement element, int... timeoutInSeconds) {
-        log.debug("\nisSelected: {}", element.getSearchCriteria());
-        boolean isSelected = false;
-        try {
-            element.shouldBe(Condition.selected,
-                    Duration.ofSeconds(getTimeout(timeoutInSeconds)));
-            isSelected = true;
-        } catch (Throwable e) {
-            log.debug("{} is not selected", element.getSearchCriteria());
-        }
-        return isSelected;
+  public static boolean isSelected(SelenideElement element, int... timeoutInSeconds) {
+    log.debug("\nisSelected: {}", element.getSearchCriteria());
+    boolean isSelected = false;
+    try {
+      element.shouldBe(Condition.selected,
+          Duration.ofSeconds(getTimeout(timeoutInSeconds)));
+      isSelected = true;
+    } catch (Throwable e) {
+      log.debug("{} is not selected", element.getSearchCriteria());
     }
+    return isSelected;
+  }
 
-    public static boolean selectElement(SelenideElement element, boolean select) {
-        if (select) {
-            if (!element.isSelected()) clickByJavaScript(element);
-        } else {
-            if (element.isSelected()) clickByJavaScript(element);
-        }
-        return true;
+  public static boolean selectElement(SelenideElement element, boolean select) {
+    if (select) {
+      if (!element.isSelected()) {
+        clickByJavaScript(element);
+      }
+    } else {
+      if (element.isSelected()) {
+        clickByJavaScript(element);
+      }
     }
+    return true;
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/QaseSetup.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/QaseSetup.java
new file mode 100644
index 00000000000..f0ed509aada
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/QaseSetup.java
@@ -0,0 +1,33 @@
+package com.provectus.kafka.ui.utilities.qase;
+
+import static com.provectus.kafka.ui.settings.BaseSource.SUITE_NAME;
+import static com.provectus.kafka.ui.variables.Suite.MANUAL;
+import static org.apache.commons.lang3.BooleanUtils.FALSE;
+import static org.apache.commons.lang3.BooleanUtils.TRUE;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class QaseSetup {
+
+  public static void qaseIntegrationSetup() {
+    String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
+    if (isEmpty(qaseApiToken)) {
+      log.warn("Integration with Qase is disabled due to run config or token wasn't defined.");
+      System.setProperty("QASE_ENABLE", FALSE);
+    } else {
+      log.warn("Integration with Qase is enabled. Find this run at https://app.qase.io/run/KAFKAUI.");
+      String automation = SUITE_NAME.equalsIgnoreCase(MANUAL) ? "" : "Automation ";
+      System.setProperty("QASE_ENABLE", TRUE);
+      System.setProperty("QASE_PROJECT_CODE", "KAFKAUI");
+      System.setProperty("QASE_API_TOKEN", qaseApiToken);
+      System.setProperty("QASE_USE_BULK", TRUE);
+      System.setProperty("QASE_RUN_NAME", DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")
+          .format(OffsetDateTime.now(ZoneOffset.UTC)) + ": " + automation + SUITE_NAME.toUpperCase() + " suite");
+    }
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Automation.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/annotations/Automation.java
similarity index 63%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Automation.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/annotations/Automation.java
index 556263c111f..1b8d5b65b81 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Automation.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/annotations/Automation.java
@@ -1,7 +1,6 @@
-package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
-
-import com.provectus.kafka.ui.utilities.qaseUtils.enums.State;
+package com.provectus.kafka.ui.utilities.qase.annotations;
 
+import com.provectus.kafka.ui.utilities.qase.enums.State;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -11,5 +10,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Automation {
 
-    State state();
+  State state();
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Status.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/annotations/Status.java
similarity index 65%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Status.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/annotations/Status.java
index 3c31f2345c1..df078d04368 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Status.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/annotations/Status.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
+package com.provectus.kafka.ui.utilities.qase.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,5 +9,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Status {
 
-    com.provectus.kafka.ui.utilities.qaseUtils.enums.Status status();
+  com.provectus.kafka.ui.utilities.qase.enums.Status status();
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/annotations/Suite.java
similarity index 76%
rename from kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java
rename to kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/annotations/Suite.java
index fa1c2c3dd75..fcaff09744a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/annotations/Suite.java
@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
+package com.provectus.kafka.ui.utilities.qase.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -9,5 +9,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Suite {
 
-    long id();
+  long id();
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/enums/State.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/enums/State.java
new file mode 100644
index 00000000000..11f49d56471
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/enums/State.java
@@ -0,0 +1,18 @@
+package com.provectus.kafka.ui.utilities.qase.enums;
+
+public enum State {
+
+  NOT_AUTOMATED(0),
+  TO_BE_AUTOMATED(1),
+  AUTOMATED(2);
+
+  private final int value;
+
+  State(int value) {
+    this.value = value;
+  }
+
+  public int getValue() {
+    return value;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/enums/Status.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/enums/Status.java
new file mode 100644
index 00000000000..a4e7e0cce32
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qase/enums/Status.java
@@ -0,0 +1,18 @@
+package com.provectus.kafka.ui.utilities.qase.enums;
+
+public enum Status {
+
+  ACTUAL(0),
+  DRAFT(1),
+  DEPRECATED(2);
+
+  private final int value;
+
+  Status(int value) {
+    this.value = value;
+  }
+
+  public int getValue() {
+    return value;
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java
deleted file mode 100644
index 60be014a0ab..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseSetup.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.provectus.kafka.ui.utilities.qaseUtils;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-
-import static com.provectus.kafka.ui.settings.BaseSource.SUITE_NAME;
-import static com.provectus.kafka.ui.variables.Suite.MANUAL;
-import static org.apache.commons.lang3.BooleanUtils.FALSE;
-import static org.apache.commons.lang3.BooleanUtils.TRUE;
-import static org.apache.commons.lang3.StringUtils.isEmpty;
-
-@Slf4j
-public class QaseSetup {
-
-    public static void qaseIntegrationSetup() {
-        String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
-        if (isEmpty(qaseApiToken)) {
-            log.warn("Integration with Qase is disabled due to run config or token wasn't defined.");
-            System.setProperty("QASE_ENABLE", FALSE);
-        } else {
-            log.warn("Integration with Qase is enabled. Find this run at https://app.qase.io/run/KAFKAUI.");
-            String automation = SUITE_NAME.equalsIgnoreCase(MANUAL) ? "" : "Automation ";
-            System.setProperty("QASE_ENABLE", TRUE);
-            System.setProperty("QASE_PROJECT_CODE", "KAFKAUI");
-            System.setProperty("QASE_API_TOKEN", qaseApiToken);
-            System.setProperty("QASE_USE_BULK", TRUE);
-            System.setProperty("QASE_RUN_NAME", DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")
-                    .format(OffsetDateTime.now(ZoneOffset.UTC)) + ": " + automation + SUITE_NAME.toUpperCase() + " suite");
-        }
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/State.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/State.java
deleted file mode 100644
index cdbbaf38dec..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/State.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.provectus.kafka.ui.utilities.qaseUtils.enums;
-
-public enum State {
-
-    NOT_AUTOMATED(0),
-    TO_BE_AUTOMATED(1),
-    AUTOMATED(2);
-
-    private final int value;
-
-    State(int value) {
-        this.value = value;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java
deleted file mode 100644
index adc8bf24b9d..00000000000
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.provectus.kafka.ui.utilities.qaseUtils.enums;
-
-public enum Status {
-
-    ACTUAL(0),
-    DRAFT(1),
-    DEPRECATED(2);
-
-    private final int value;
-
-    Status(int value) {
-        this.value = value;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Browser.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Browser.java
index cb3873cdb5b..f435dcbf019 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Browser.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Browser.java
@@ -2,6 +2,6 @@
 
 public interface Browser {
 
-    String CONTAINER = "container";
-    String LOCAL = "local";
+  String CONTAINER = "container";
+  String LOCAL = "local";
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java
index 74f60dd0d2e..3d337548c94 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java
@@ -2,9 +2,9 @@
 
 public interface Suite {
 
-    String CUSTOM = "custom";
-    String MANUAL = "manual";
-    String REGRESSION = "regression";
-    String SANITY = "sanity";
-    String SMOKE = "smoke";
+  String CUSTOM = "custom";
+  String MANUAL = "manual";
+  String REGRESSION = "regression";
+  String SANITY = "sanity";
+  String SMOKE = "smoke";
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java
index 8800463bdc1..5b800608f38 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Url.java
@@ -2,10 +2,10 @@
 
 public interface Url {
 
-    String BROKERS_LIST_URL = "http://%s:8080/ui/clusters/local/brokers";
-    String TOPICS_LIST_URL = "http://%s:8080/ui/clusters/local/all-topics";
-    String CONSUMERS_LIST_URL = "http://%s:8080/ui/clusters/local/consumer-groups";
-    String SCHEMA_REGISTRY_LIST_URL = "http://%s:8080/ui/clusters/local/schemas";
-    String KAFKA_CONNECT_LIST_URL = "http://%s:8080/ui/clusters/local/connectors";
-    String KSQL_DB_LIST_URL = "http://%s:8080/ui/clusters/local/ksqldb/tables";
+  String BROKERS_LIST_URL = "http://%s:8080/ui/clusters/local/brokers";
+  String TOPICS_LIST_URL = "http://%s:8080/ui/clusters/local/all-topics";
+  String CONSUMERS_LIST_URL = "http://%s:8080/ui/clusters/local/consumer-groups";
+  String SCHEMA_REGISTRY_LIST_URL = "http://%s:8080/ui/clusters/local/schemas";
+  String KAFKA_CONNECT_LIST_URL = "http://%s:8080/ui/clusters/local/connectors";
+  String KSQL_DB_LIST_URL = "http://%s:8080/ui/clusters/local/ksqldb/tables";
 }
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector.json b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector.json
index fbe9fea6551..096d4191e45 100644
--- a/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector.json
+++ b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector.json
@@ -15,4 +15,4 @@
   "insert.mode": "upsert",
   "errors.log.enable": "true",
   "errors.log.include.messages": "true"
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector_via_api.json b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector_via_api.json
index 5c5b7aba84b..dffd66cae55 100644
--- a/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector_via_api.json
+++ b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/config_for_create_connector_via_api.json
@@ -4,4 +4,4 @@
   "connection.user": "dev_user",
   "connection.password": "12345",
   "topics": "topic_for_connector"
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/connectors/delete_connector_config.json b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/delete_connector_config.json
index c5adc99444e..121613fc1c3 100644
--- a/kafka-ui-e2e-checks/src/main/resources/testData/connectors/delete_connector_config.json
+++ b/kafka-ui-e2e-checks/src/main/resources/testData/connectors/delete_connector_config.json
@@ -15,4 +15,4 @@
   "insert.mode": "upsert",
   "errors.log.enable": "true",
   "errors.log.include.messages": "true"
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_for_update.json b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_for_update.json
index 9971559ba7f..bbfe011c9f7 100644
--- a/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_for_update.json
+++ b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_for_update.json
@@ -14,4 +14,4 @@
       "default": null
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_value.json b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_value.json
index 1bc30f6d1cf..d84caf2ea80 100644
--- a/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_value.json
+++ b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_avro_value.json
@@ -12,4 +12,4 @@
       "type": "int"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_json_Value.json b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_json_Value.json
index 5c5b7aba84b..dffd66cae55 100644
--- a/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_json_Value.json
+++ b/kafka-ui-e2e-checks/src/main/resources/testData/schemas/schema_json_Value.json
@@ -4,4 +4,4 @@
   "connection.user": "dev_user",
   "connection.password": "12345",
   "topics": "topic_for_connector"
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/main/resources/testData/topics/message_content_create_topic.json b/kafka-ui-e2e-checks/src/main/resources/testData/topics/message_content_create_topic.json
index 8c8fabe5bfb..a4c0d940f4d 100644
--- a/kafka-ui-e2e-checks/src/main/resources/testData/topics/message_content_create_topic.json
+++ b/kafka-ui-e2e-checks/src/main/resources/testData/topics/message_content_create_topic.json
@@ -21,4 +21,4 @@
     "id":"1",
     "value":"kafka"
   }
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
index 424c699f043..45daf6a4b5c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java
@@ -1,5 +1,18 @@
 package com.provectus.kafka.ui;
 
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.BROKERS;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.CONSUMERS;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KAFKA_CONNECT;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.SCHEMA_REGISTRY;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.TOPICS;
+import static com.provectus.kafka.ui.settings.BaseSource.BASE_UI_URL;
+import static com.provectus.kafka.ui.settings.drivers.WebDriver.browserClear;
+import static com.provectus.kafka.ui.settings.drivers.WebDriver.browserQuit;
+import static com.provectus.kafka.ui.settings.drivers.WebDriver.browserSetup;
+import static com.provectus.kafka.ui.settings.drivers.WebDriver.loggerSetup;
+import static com.provectus.kafka.ui.utilities.qase.QaseSetup.qaseIntegrationSetup;
+
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.SelenideElement;
@@ -7,136 +20,134 @@
 import com.provectus.kafka.ui.settings.listeners.LoggerListener;
 import com.provectus.kafka.ui.settings.listeners.QaseResultListener;
 import io.qameta.allure.Step;
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
-import org.testng.annotations.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Listeners;
 import org.testng.asserts.SoftAssert;
 
-import java.util.List;
-
-import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.*;
-import static com.provectus.kafka.ui.settings.BaseSource.BASE_UI_URL;
-import static com.provectus.kafka.ui.settings.drivers.WebDriver.*;
-import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
-
 @Slf4j
 @Listeners({AllureListener.class, LoggerListener.class, QaseResultListener.class})
 public abstract class BaseTest extends Facade {
 
-    @BeforeSuite(alwaysRun = true)
-    public void beforeSuite() {
-        qaseIntegrationSetup();
-        loggerSetup();
-        browserSetup();
-    }
-
-    @AfterSuite(alwaysRun = true)
-    public void afterSuite() {
-        browserQuit();
-    }
-
-    @BeforeMethod(alwaysRun = true)
-    public void beforeMethod() {
-        Selenide.open(BASE_UI_URL);
-        naviSideBar.waitUntilScreenReady();
-    }
-
-    @AfterMethod(alwaysRun = true)
-    public void afterMethod() {
-        browserClear();
-    }
-
-    @Step
-    protected void navigateToBrokers() {
-        naviSideBar
-                .openSideMenu(BROKERS);
-        brokersList
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    protected void navigateToBrokersAndOpenDetails(int brokerId) {
-        naviSideBar
-                .openSideMenu(BROKERS);
-        brokersList
-                .waitUntilScreenReady()
-                .openBroker(brokerId);
-        brokersDetails
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    protected void navigateToTopics() {
-        naviSideBar
-                .openSideMenu(TOPICS);
-        topicsList
-                .waitUntilScreenReady()
-                .setShowInternalRadioButton(false);
-    }
-
-    @Step
-    protected void navigateToTopicsAndOpenDetails(String topicName) {
-        navigateToTopics();
-        topicsList
-                .openTopic(topicName);
-        topicDetails
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    protected void navigateToConsumers() {
-        naviSideBar
-                .openSideMenu(CONSUMERS);
-        consumersList
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    protected void navigateToSchemaRegistry() {
-        naviSideBar
-                .openSideMenu(SCHEMA_REGISTRY);
-        schemaRegistryList
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    protected void navigateToSchemaRegistryAndOpenDetails(String schemaName) {
-        navigateToSchemaRegistry();
-        schemaRegistryList
-                .openSchema(schemaName);
-        schemaDetails
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    protected void navigateToConnectors() {
-        naviSideBar
-                .openSideMenu(KAFKA_CONNECT);
-        kafkaConnectList
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    protected void navigateToConnectorsAndOpenDetails(String connectorName) {
-        navigateToConnectors();
-        kafkaConnectList
-                .openConnector(connectorName);
-        connectorDetails
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    protected void navigateToKsqlDb() {
-        naviSideBar
-                .openSideMenu(KSQL_DB);
-        ksqlDbList
-                .waitUntilScreenReady();
-    }
-
-    @Step
-    protected void verifyElementsCondition(List<SelenideElement> elementList, Condition expectedCondition) {
-        SoftAssert softly = new SoftAssert();
-        elementList.forEach(element -> softly.assertTrue(element.is(expectedCondition),
-                element.getSearchCriteria() + " is " + expectedCondition));
-        softly.assertAll();
-    }
+  @BeforeSuite(alwaysRun = true)
+  public void beforeSuite() {
+    qaseIntegrationSetup();
+    loggerSetup();
+    browserSetup();
+  }
+
+  @AfterSuite(alwaysRun = true)
+  public void afterSuite() {
+    browserQuit();
+  }
+
+  @BeforeMethod(alwaysRun = true)
+  public void beforeMethod() {
+    Selenide.open(BASE_UI_URL);
+    naviSideBar.waitUntilScreenReady();
+  }
+
+  @AfterMethod(alwaysRun = true)
+  public void afterMethod() {
+    browserClear();
+  }
+
+  @Step
+  protected void navigateToBrokers() {
+    naviSideBar
+        .openSideMenu(BROKERS);
+    brokersList
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void navigateToBrokersAndOpenDetails(int brokerId) {
+    naviSideBar
+        .openSideMenu(BROKERS);
+    brokersList
+        .waitUntilScreenReady()
+        .openBroker(brokerId);
+    brokersDetails
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void navigateToTopics() {
+    naviSideBar
+        .openSideMenu(TOPICS);
+    topicsList
+        .waitUntilScreenReady()
+        .setShowInternalRadioButton(false);
+  }
+
+  @Step
+  protected void navigateToTopicsAndOpenDetails(String topicName) {
+    navigateToTopics();
+    topicsList
+        .openTopic(topicName);
+    topicDetails
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void navigateToConsumers() {
+    naviSideBar
+        .openSideMenu(CONSUMERS);
+    consumersList
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void navigateToSchemaRegistry() {
+    naviSideBar
+        .openSideMenu(SCHEMA_REGISTRY);
+    schemaRegistryList
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void navigateToSchemaRegistryAndOpenDetails(String schemaName) {
+    navigateToSchemaRegistry();
+    schemaRegistryList
+        .openSchema(schemaName);
+    schemaDetails
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void navigateToConnectors() {
+    naviSideBar
+        .openSideMenu(KAFKA_CONNECT);
+    kafkaConnectList
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void navigateToConnectorsAndOpenDetails(String connectorName) {
+    navigateToConnectors();
+    kafkaConnectList
+        .openConnector(connectorName);
+    connectorDetails
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void navigateToKsqlDb() {
+    naviSideBar
+        .openSideMenu(KSQL_DB);
+    ksqlDbList
+        .waitUntilScreenReady();
+  }
+
+  @Step
+  protected void verifyElementsCondition(List<SelenideElement> elementList, Condition expectedCondition) {
+    SoftAssert softly = new SoftAssert();
+    elementList.forEach(element -> softly.assertTrue(element.is(expectedCondition),
+        element.getSearchCriteria() + " is " + expectedCondition));
+    softly.assertAll();
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
index 67468dbcb02..abc0b0aa6bc 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/Facade.java
@@ -1,7 +1,5 @@
 package com.provectus.kafka.ui;
 
-import com.provectus.kafka.ui.pages.panels.NaviSideBar;
-import com.provectus.kafka.ui.pages.panels.TopPanel;
 import com.provectus.kafka.ui.pages.brokers.BrokersConfigTab;
 import com.provectus.kafka.ui.pages.brokers.BrokersDetails;
 import com.provectus.kafka.ui.pages.brokers.BrokersList;
@@ -10,35 +8,41 @@
 import com.provectus.kafka.ui.pages.connectors.KafkaConnectList;
 import com.provectus.kafka.ui.pages.consumers.ConsumersDetails;
 import com.provectus.kafka.ui.pages.consumers.ConsumersList;
-import com.provectus.kafka.ui.pages.ksqlDb.KsqlDbList;
-import com.provectus.kafka.ui.pages.ksqlDb.KsqlQueryForm;
+import com.provectus.kafka.ui.pages.ksqldb.KsqlDbList;
+import com.provectus.kafka.ui.pages.ksqldb.KsqlQueryForm;
+import com.provectus.kafka.ui.pages.panels.NaviSideBar;
+import com.provectus.kafka.ui.pages.panels.TopPanel;
 import com.provectus.kafka.ui.pages.schemas.SchemaCreateForm;
 import com.provectus.kafka.ui.pages.schemas.SchemaDetails;
 import com.provectus.kafka.ui.pages.schemas.SchemaRegistryList;
-import com.provectus.kafka.ui.pages.topics.*;
+import com.provectus.kafka.ui.pages.topics.ProduceMessagePanel;
+import com.provectus.kafka.ui.pages.topics.TopicCreateEditForm;
+import com.provectus.kafka.ui.pages.topics.TopicDetails;
+import com.provectus.kafka.ui.pages.topics.TopicSettingsTab;
+import com.provectus.kafka.ui.pages.topics.TopicsList;
 import com.provectus.kafka.ui.services.ApiService;
 
 public abstract class Facade {
 
-    protected ApiService apiService = new ApiService();
-    protected ConnectorCreateForm connectorCreateForm = new ConnectorCreateForm();
-    protected KafkaConnectList kafkaConnectList = new KafkaConnectList();
-    protected ConnectorDetails connectorDetails = new ConnectorDetails();
-    protected SchemaCreateForm schemaCreateForm = new SchemaCreateForm();
-    protected SchemaDetails schemaDetails = new SchemaDetails();
-    protected SchemaRegistryList schemaRegistryList = new SchemaRegistryList();
-    protected ProduceMessagePanel produceMessagePanel = new ProduceMessagePanel();
-    protected TopicCreateEditForm topicCreateEditForm = new TopicCreateEditForm();
-    protected TopicsList topicsList = new TopicsList();
-    protected TopicDetails topicDetails = new TopicDetails();
-    protected ConsumersDetails consumersDetails = new ConsumersDetails();
-    protected ConsumersList consumersList = new ConsumersList();
-    protected NaviSideBar naviSideBar = new NaviSideBar();
-    protected TopPanel topPanel = new TopPanel();
-    protected BrokersList brokersList = new BrokersList();
-    protected BrokersDetails brokersDetails = new BrokersDetails();
-    protected BrokersConfigTab brokersConfigTab = new BrokersConfigTab();
-    protected TopicSettingsTab topicSettingsTab = new TopicSettingsTab();
-    protected KsqlQueryForm ksqlQueryForm = new KsqlQueryForm();
-    protected KsqlDbList ksqlDbList = new KsqlDbList();
+  protected ApiService apiService = new ApiService();
+  protected ConnectorCreateForm connectorCreateForm = new ConnectorCreateForm();
+  protected KafkaConnectList kafkaConnectList = new KafkaConnectList();
+  protected ConnectorDetails connectorDetails = new ConnectorDetails();
+  protected SchemaCreateForm schemaCreateForm = new SchemaCreateForm();
+  protected SchemaDetails schemaDetails = new SchemaDetails();
+  protected SchemaRegistryList schemaRegistryList = new SchemaRegistryList();
+  protected ProduceMessagePanel produceMessagePanel = new ProduceMessagePanel();
+  protected TopicCreateEditForm topicCreateEditForm = new TopicCreateEditForm();
+  protected TopicsList topicsList = new TopicsList();
+  protected TopicDetails topicDetails = new TopicDetails();
+  protected ConsumersDetails consumersDetails = new ConsumersDetails();
+  protected ConsumersList consumersList = new ConsumersList();
+  protected NaviSideBar naviSideBar = new NaviSideBar();
+  protected TopPanel topPanel = new TopPanel();
+  protected BrokersList brokersList = new BrokersList();
+  protected BrokersDetails brokersDetails = new BrokersDetails();
+  protected BrokersConfigTab brokersConfigTab = new BrokersConfigTab();
+  protected TopicSettingsTab topicSettingsTab = new TopicSettingsTab();
+  protected KsqlQueryForm ksqlQueryForm = new KsqlQueryForm();
+  protected KsqlDbList ksqlDbList = new KsqlDbList();
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java
deleted file mode 100644
index bf9f0c75acc..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/BaseManualTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.provectus.kafka.ui.manualSuite;
-
-import com.provectus.kafka.ui.settings.listeners.QaseResultListener;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
-import org.testng.SkipException;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Listeners;
-
-import java.lang.reflect.Method;
-
-import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.TO_BE_AUTOMATED;
-
-@Listeners(QaseResultListener.class)
-public abstract class BaseManualTest {
-
-    @BeforeSuite
-    public void beforeSuite() {
-        qaseIntegrationSetup();
-    }
-
-    @BeforeMethod
-    public void beforeMethod(Method method) {
-        if (method.getAnnotation(Automation.class).state().equals(NOT_AUTOMATED)
-                || method.getAnnotation(Automation.class).state().equals(TO_BE_AUTOMATED))
-            throw new SkipException("Skip test exception");
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SanityBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SanityBacklog.java
deleted file mode 100644
index f09673c8a0e..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SanityBacklog.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.provectus.kafka.ui.manualSuite.backlog;
-
-import com.provectus.kafka.ui.manualSuite.BaseManualTest;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
-import io.qase.api.annotation.QaseId;
-import org.testng.annotations.Test;
-
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.TO_BE_AUTOMATED;
-
-public class SanityBacklog extends BaseManualTest {
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 19)
-    @QaseId(285)
-    @Test
-    public void testCaseA() {
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java
deleted file mode 100644
index 84fa7476cf3..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/backlog/SmokeBacklog.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.provectus.kafka.ui.manualSuite.backlog;
-
-import com.provectus.kafka.ui.manualSuite.BaseManualTest;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
-import io.qase.api.annotation.QaseId;
-import org.testng.annotations.Test;
-
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.TO_BE_AUTOMATED;
-
-public class SmokeBacklog extends BaseManualTest {
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 1)
-    @QaseId(330)
-    @Test
-    public void testCaseA() {
-    }
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 8)
-    @QaseId(276)
-    @Test
-    public void testCaseB() {
-    }
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 8)
-    @QaseId(277)
-    @Test
-    public void testCaseC() {
-    }
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 8)
-    @QaseId(278)
-    @Test
-    public void testCaseD() {
-    }
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 8)
-    @QaseId(284)
-    @Test
-    public void testCaseE() {
-    }
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 1)
-    @QaseId(331)
-    @Test
-    public void testCaseF() {
-    }
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 1)
-    @QaseId(332)
-    @Test
-    public void testCaseG() {
-    }
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 5)
-    @QaseId(335)
-    @Test
-    public void testCaseH() {
-    }
-
-    @Automation(state = TO_BE_AUTOMATED)
-    @Suite(id = 5)
-    @QaseId(336)
-    @Test
-    public void testCaseI() {
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/DataMaskingTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/DataMaskingTest.java
deleted file mode 100644
index 23b6e6539e4..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/DataMaskingTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.provectus.kafka.ui.manualSuite.suite;
-
-import com.provectus.kafka.ui.manualSuite.BaseManualTest;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
-import io.qase.api.annotation.QaseId;
-import org.testng.annotations.Test;
-
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
-
-public class DataMaskingTest extends BaseManualTest {
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(262)
-    @Test
-    public void testCaseA() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(264)
-    @Test
-    public void testCaseB() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(265)
-    @Test
-    public void testCaseC() {
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/RbacTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/RbacTest.java
deleted file mode 100644
index aad85652f5d..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/RbacTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.provectus.kafka.ui.manualSuite.suite;
-
-import com.provectus.kafka.ui.manualSuite.BaseManualTest;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
-import io.qase.api.annotation.QaseId;
-import org.testng.annotations.Test;
-
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
-
-public class RbacTest extends BaseManualTest {
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(249)
-    @Test
-    public void testCaseA() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(251)
-    @Test
-    public void testCaseB() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(257)
-    @Test
-    public void testCaseC() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(258)
-    @Test
-    public void testCaseD() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(259)
-    @Test
-    public void testCaseE() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(260)
-    @Test
-    public void testCaseF() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(261)
-    @Test
-    public void testCaseG() {
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
deleted file mode 100644
index dda8103ffa5..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/TopicsTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.provectus.kafka.ui.manualSuite.suite;
-
-import com.provectus.kafka.ui.manualSuite.BaseManualTest;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
-import io.qase.api.annotation.QaseId;
-import org.testng.annotations.Test;
-
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
-
-public class TopicsTest extends BaseManualTest {
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(17)
-    @Test
-    public void testCaseA() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(18)
-    @Test
-    public void testCaseB() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(21)
-    @Test()
-    public void testCaseC() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(22)
-    @Test
-    public void testCaseD() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(47)
-    @Test
-    public void testCaseE() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(48)
-    @Test
-    public void testCaseF() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(49)
-    @Test
-    public void testCaseG() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(50)
-    @Test
-    public void testCaseH() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(57)
-    @Test
-    public void testCaseI() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(58)
-    @Test
-    public void testCaseJ() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(269)
-    @Test
-    public void testCaseK() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(270)
-    @Test
-    public void testCaseL() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(271)
-    @Test
-    public void testCaseM() {
-    }
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(272)
-    @Test
-    public void testCaseN() {
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/WizardTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/WizardTest.java
deleted file mode 100644
index e7ae52bdb12..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualSuite/suite/WizardTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.provectus.kafka.ui.manualSuite.suite;
-
-import com.provectus.kafka.ui.manualSuite.BaseManualTest;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
-import io.qase.api.annotation.QaseId;
-import org.testng.annotations.Test;
-
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
-
-public class WizardTest extends BaseManualTest {
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseId(333)
-    @Test
-    public void testCaseA() {
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/BaseManualTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/BaseManualTest.java
new file mode 100644
index 00000000000..827dc1ce432
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/BaseManualTest.java
@@ -0,0 +1,30 @@
+package com.provectus.kafka.ui.manualsuite;
+
+import static com.provectus.kafka.ui.utilities.qase.QaseSetup.qaseIntegrationSetup;
+import static com.provectus.kafka.ui.utilities.qase.enums.State.NOT_AUTOMATED;
+import static com.provectus.kafka.ui.utilities.qase.enums.State.TO_BE_AUTOMATED;
+
+import com.provectus.kafka.ui.settings.listeners.QaseResultListener;
+import com.provectus.kafka.ui.utilities.qase.annotations.Automation;
+import java.lang.reflect.Method;
+import org.testng.SkipException;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Listeners;
+
+@Listeners(QaseResultListener.class)
+public abstract class BaseManualTest {
+
+  @BeforeSuite
+  public void beforeSuite() {
+    qaseIntegrationSetup();
+  }
+
+  @BeforeMethod
+  public void beforeMethod(Method method) {
+    if (method.getAnnotation(Automation.class).state().equals(NOT_AUTOMATED)
+        || method.getAnnotation(Automation.class).state().equals(TO_BE_AUTOMATED)) {
+      throw new SkipException("Skip test exception");
+    }
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SanityBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SanityBacklog.java
new file mode 100644
index 00000000000..4021c8ec94f
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SanityBacklog.java
@@ -0,0 +1,7 @@
+package com.provectus.kafka.ui.manualsuite.backlog;
+
+import com.provectus.kafka.ui.manualsuite.BaseManualTest;
+
+public class SanityBacklog extends BaseManualTest {
+
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
new file mode 100644
index 00000000000..b89a1d0cf76
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -0,0 +1,78 @@
+package com.provectus.kafka.ui.manualsuite.backlog;
+
+import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.BROKERS_SUITE_ID;
+import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.KSQL_DB_SUITE_ID;
+import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.TOPICS_PROFILE_SUITE_ID;
+import static com.provectus.kafka.ui.utilities.qase.enums.State.TO_BE_AUTOMATED;
+
+import com.provectus.kafka.ui.manualsuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qase.annotations.Automation;
+import com.provectus.kafka.ui.utilities.qase.annotations.Suite;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+public class SmokeBacklog extends BaseManualTest {
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = BROKERS_SUITE_ID)
+  @QaseId(330)
+  @Test
+  public void testCaseA() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = KSQL_DB_SUITE_ID)
+  @QaseId(276)
+  @Test
+  public void testCaseB() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = KSQL_DB_SUITE_ID)
+  @QaseId(277)
+  @Test
+  public void testCaseC() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = KSQL_DB_SUITE_ID)
+  @QaseId(278)
+  @Test
+  public void testCaseD() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = KSQL_DB_SUITE_ID)
+  @QaseId(284)
+  @Test
+  public void testCaseE() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = BROKERS_SUITE_ID)
+  @QaseId(331)
+  @Test
+  public void testCaseF() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = BROKERS_SUITE_ID)
+  @QaseId(332)
+  @Test
+  public void testCaseG() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = TOPICS_PROFILE_SUITE_ID)
+  @QaseId(335)
+  @Test
+  public void testCaseH() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = TOPICS_PROFILE_SUITE_ID)
+  @QaseId(336)
+  @Test
+  public void testCaseI() {
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/DataMaskingTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/DataMaskingTest.java
new file mode 100644
index 00000000000..540511d0c4b
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/DataMaskingTest.java
@@ -0,0 +1,29 @@
+package com.provectus.kafka.ui.manualsuite.suite;
+
+import static com.provectus.kafka.ui.utilities.qase.enums.State.NOT_AUTOMATED;
+
+import com.provectus.kafka.ui.manualsuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qase.annotations.Automation;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+public class DataMaskingTest extends BaseManualTest {
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(262)
+  @Test
+  public void testCaseA() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(264)
+  @Test
+  public void testCaseB() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(265)
+  @Test
+  public void testCaseC() {
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/RbacTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/RbacTest.java
new file mode 100644
index 00000000000..7c7ac3153bf
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/RbacTest.java
@@ -0,0 +1,53 @@
+package com.provectus.kafka.ui.manualsuite.suite;
+
+import static com.provectus.kafka.ui.utilities.qase.enums.State.NOT_AUTOMATED;
+
+import com.provectus.kafka.ui.manualsuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qase.annotations.Automation;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+public class RbacTest extends BaseManualTest {
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(249)
+  @Test
+  public void testCaseA() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(251)
+  @Test
+  public void testCaseB() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(257)
+  @Test
+  public void testCaseC() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(258)
+  @Test
+  public void testCaseD() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(259)
+  @Test
+  public void testCaseE() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(260)
+  @Test
+  public void testCaseF() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(261)
+  @Test
+  public void testCaseG() {
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java
new file mode 100644
index 00000000000..76f8506debb
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java
@@ -0,0 +1,95 @@
+package com.provectus.kafka.ui.manualsuite.suite;
+
+import static com.provectus.kafka.ui.utilities.qase.enums.State.NOT_AUTOMATED;
+
+import com.provectus.kafka.ui.manualsuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qase.annotations.Automation;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+public class TopicsTest extends BaseManualTest {
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(17)
+  @Test
+  public void testCaseA() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(18)
+  @Test
+  public void testCaseB() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(21)
+  @Test()
+  public void testCaseC() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(22)
+  @Test
+  public void testCaseD() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(47)
+  @Test
+  public void testCaseE() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(48)
+  @Test
+  public void testCaseF() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(49)
+  @Test
+  public void testCaseG() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(50)
+  @Test
+  public void testCaseH() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(57)
+  @Test
+  public void testCaseI() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(58)
+  @Test
+  public void testCaseJ() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(269)
+  @Test
+  public void testCaseK() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(270)
+  @Test
+  public void testCaseL() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(271)
+  @Test
+  public void testCaseM() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(272)
+  @Test
+  public void testCaseN() {
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/WizardTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/WizardTest.java
new file mode 100644
index 00000000000..9621104b1a1
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/WizardTest.java
@@ -0,0 +1,17 @@
+package com.provectus.kafka.ui.manualsuite.suite;
+
+import static com.provectus.kafka.ui.utilities.qase.enums.State.NOT_AUTOMATED;
+
+import com.provectus.kafka.ui.manualsuite.BaseManualTest;
+import com.provectus.kafka.ui.utilities.qase.annotations.Automation;
+import io.qase.api.annotation.QaseId;
+import org.testng.annotations.Test;
+
+public class WizardTest extends BaseManualTest {
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(333)
+  @Test
+  public void testCaseA() {
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java
deleted file mode 100644
index 7b4c34ac05f..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/BaseQaseTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.provectus.kafka.ui.qaseSuite;
-
-import com.provectus.kafka.ui.settings.listeners.QaseCreateListener;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Listeners;
-
-import static com.provectus.kafka.ui.utilities.qaseUtils.QaseSetup.qaseIntegrationSetup;
-
-@Listeners(QaseCreateListener.class)
-public abstract class BaseQaseTest {
-
-    protected static final long BROKERS_SUITE_ID = 1;
-    protected static final long CONNECTORS_SUITE_ID = 10;
-    protected static final long KSQL_DB_SUITE_ID = 8;
-    protected static final long SANITY_SUITE_ID = 19;
-    protected static final long SCHEMAS_SUITE_ID = 11;
-    protected static final long TOPICS_SUITE_ID = 2;
-
-    @BeforeSuite
-    public void beforeSuite() {
-        qaseIntegrationSetup();
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java
deleted file mode 100644
index ca987650dce..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/Template.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.provectus.kafka.ui.qaseSuite;
-
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Automation;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Status;
-import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
-import io.qase.api.annotation.QaseTitle;
-import io.qase.api.annotation.Step;
-
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.State.NOT_AUTOMATED;
-import static com.provectus.kafka.ui.utilities.qaseUtils.enums.Status.DRAFT;
-
-public class Template extends BaseQaseTest {
-
-    /**
-     * this class is a kind of placeholder or example, use is as template to create new one
-     * copy Template into kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/
-     * place it into regarding folder and rename according to test case summary from Qase.io
-     * uncomment @Test and set all annotations according to kafka-ui-e2e-checks/QASE.md
-     */
-
-    @Automation(state = NOT_AUTOMATED)
-    @QaseTitle("testCaseA title")
-    @Status(status = DRAFT)
-    @Suite(id = 0)
-//    @org.testng.annotations.Test
-    public void testCaseA() {
-        stepA();
-        stepB();
-        stepC();
-        stepD();
-        stepE();
-        stepF();
-    }
-
-    @Step("stepA action")
-    private void stepA() {
-    }
-
-    @Step("stepB action")
-    private void stepB() {
-    }
-
-    @Step("stepC action")
-    private void stepC() {
-    }
-
-    @Step("stepD action")
-    private void stepD() {
-    }
-
-    @Step("stepE action")
-    private void stepE() {
-    }
-
-    @Step("stepF action")
-    private void stepF() {
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qasesuite/BaseQaseTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qasesuite/BaseQaseTest.java
new file mode 100644
index 00000000000..1a195a3631d
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qasesuite/BaseQaseTest.java
@@ -0,0 +1,25 @@
+package com.provectus.kafka.ui.qasesuite;
+
+import static com.provectus.kafka.ui.utilities.qase.QaseSetup.qaseIntegrationSetup;
+
+import com.provectus.kafka.ui.settings.listeners.QaseCreateListener;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Listeners;
+
+@Listeners(QaseCreateListener.class)
+public abstract class BaseQaseTest {
+
+  public static final long BROKERS_SUITE_ID = 1;
+  public static final long CONNECTORS_SUITE_ID = 10;
+  public static final long KSQL_DB_SUITE_ID = 8;
+  public static final long SANITY_SUITE_ID = 19;
+  public static final long SCHEMAS_SUITE_ID = 11;
+  public static final long TOPICS_SUITE_ID = 2;
+  public static final long TOPICS_CREATE_SUITE_ID = 4;
+  public static final long TOPICS_PROFILE_SUITE_ID = 5;
+
+  @BeforeSuite
+  public void beforeSuite() {
+    qaseIntegrationSetup();
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qasesuite/Template.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qasesuite/Template.java
new file mode 100644
index 00000000000..d5a47eccdf7
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qasesuite/Template.java
@@ -0,0 +1,58 @@
+package com.provectus.kafka.ui.qasesuite;
+
+import static com.provectus.kafka.ui.utilities.qase.enums.State.NOT_AUTOMATED;
+import static com.provectus.kafka.ui.utilities.qase.enums.Status.DRAFT;
+
+import com.provectus.kafka.ui.utilities.qase.annotations.Automation;
+import com.provectus.kafka.ui.utilities.qase.annotations.Status;
+import com.provectus.kafka.ui.utilities.qase.annotations.Suite;
+import io.qase.api.annotation.QaseTitle;
+import io.qase.api.annotation.Step;
+
+public class Template extends BaseQaseTest {
+
+  /**
+   * this class is a kind of placeholder or example, use is as template to create new one
+   * copy Template into kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/qaseSuite/
+   * place it into regarding folder and rename according to test case summary from Qase.io
+   * uncomment @Test and set all annotations according to kafka-ui-e2e-checks/QASE.md
+   */
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseTitle("testCaseA title")
+  @Status(status = DRAFT)
+  @Suite(id = 0)
+  //  @org.testng.annotations.Test
+  public void testCaseA() {
+    stepA();
+    stepB();
+    stepC();
+    stepD();
+    stepE();
+    stepF();
+  }
+
+  @Step("stepA action")
+  private void stepA() {
+  }
+
+  @Step("stepB action")
+  private void stepB() {
+  }
+
+  @Step("stepC action")
+  private void stepC() {
+  }
+
+  @Step("stepD action")
+  private void stepD() {
+  }
+
+  @Step("stepE action")
+  private void stepE() {
+  }
+
+  @Step("stepF action")
+  private void stepF() {
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitySuite/TestClass.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitySuite/TestClass.java
deleted file mode 100644
index 89402f3fc82..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitySuite/TestClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.provectus.kafka.ui.sanitySuite;
-
-public class TestClass {
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitysuite/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitysuite/TopicsTest.java
new file mode 100644
index 00000000000..40a6d67800d
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/sanitysuite/TopicsTest.java
@@ -0,0 +1,66 @@
+package com.provectus.kafka.ui.sanitysuite;
+
+import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.COMPACT;
+import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.DELETE;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.models.Topic;
+import io.qase.api.annotation.QaseId;
+import java.util.ArrayList;
+import java.util.List;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+
+public class TopicsTest extends BaseTest {
+
+  private static final List<Topic> TOPIC_LIST = new ArrayList<>();
+
+  @QaseId(285)
+  @Test()
+  public void verifyClearMessagesMenuStateAfterTopicUpdate() {
+    Topic topic = new Topic()
+        .setName("topic-" + randomAlphabetic(5))
+        .setNumberOfPartitions(1)
+        .setCleanupPolicyValue(DELETE);
+    navigateToTopics();
+    topicsList
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(topic.getName())
+        .setNumberOfPartitions(topic.getNumberOfPartitions())
+        .selectCleanupPolicy(topic.getCleanupPolicyValue())
+        .clickSaveTopicBtn();
+    topicDetails
+        .waitUntilScreenReady();
+    TOPIC_LIST.add(topic);
+    topicDetails
+        .openDotMenu();
+    Assert.assertTrue(topicDetails.isClearMessagesMenuEnabled(), "isClearMessagesMenuEnabled");
+    topic.setCleanupPolicyValue(COMPACT);
+    editCleanUpPolicyAndOpenDotMenu(topic);
+    Assert.assertFalse(topicDetails.isClearMessagesMenuEnabled(), "isClearMessagesMenuEnabled");
+    topic.setCleanupPolicyValue(DELETE);
+    editCleanUpPolicyAndOpenDotMenu(topic);
+    Assert.assertTrue(topicDetails.isClearMessagesMenuEnabled(), "isClearMessagesMenuEnabled");
+  }
+
+  private void editCleanUpPolicyAndOpenDotMenu(Topic topic) {
+    topicDetails
+        .clickEditSettingsMenu();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .selectCleanupPolicy(topic.getCleanupPolicyValue())
+        .clickSaveTopicBtn();
+    topicDetails
+        .waitUntilScreenReady()
+        .openDotMenu();
+  }
+
+  @AfterClass(alwaysRun = true)
+  public void afterClass() {
+    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
deleted file mode 100644
index c8439e70dd7..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/SmokeTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.provectus.kafka.ui.smokeSuite;
-
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.WebDriverRunner;
-import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.models.Connector;
-import com.provectus.kafka.ui.models.Schema;
-import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
-import io.qameta.allure.Step;
-import io.qase.api.annotation.QaseId;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.*;
-import static com.provectus.kafka.ui.settings.BaseSource.BASE_HOST;
-import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
-import static com.provectus.kafka.ui.variables.Url.*;
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-
-public class SmokeTest extends BaseTest {
-
-    private static final int BROKER_ID = 1;
-    private static final Schema TEST_SCHEMA = Schema.createSchemaAvro();
-    private static final Topic TEST_TOPIC = new Topic()
-            .setName("new-topic-" + randomAlphabetic(5))
-            .setNumberOfPartitions(1);
-    private static final Connector TEST_CONNECTOR = new Connector()
-            .setName("new-connector-" + randomAlphabetic(5))
-            .setConfig(getResourceAsString("testData/connectors/config_for_create_connector_via_api.json"));
-
-    @BeforeClass(alwaysRun = true)
-    public void beforeClass() {
-        apiService
-                .createTopic(TEST_TOPIC)
-                .createSchema(TEST_SCHEMA)
-                .createConnector(TEST_CONNECTOR);
-    }
-
-    @QaseId(198)
-    @Test
-    public void checkBasePageElements() {
-        verifyElementsCondition(
-                Stream.concat(topPanel.getAllVisibleElements().stream(), naviSideBar.getAllMenuButtons().stream())
-                        .collect(Collectors.toList()), Condition.visible);
-        verifyElementsCondition(
-                Stream.concat(topPanel.getAllEnabledElements().stream(), naviSideBar.getAllMenuButtons().stream())
-                        .collect(Collectors.toList()), Condition.enabled);
-    }
-
-    @QaseId(45)
-    @Test
-    public void checkUrlWhileNavigating() {
-        navigateToBrokers();
-        verifyCurrentUrl(BROKERS_LIST_URL);
-        navigateToTopics();
-        verifyCurrentUrl(TOPICS_LIST_URL);
-        navigateToConsumers();
-        verifyCurrentUrl(CONSUMERS_LIST_URL);
-        navigateToSchemaRegistry();
-        verifyCurrentUrl(SCHEMA_REGISTRY_LIST_URL);
-        navigateToConnectors();
-        verifyCurrentUrl(KAFKA_CONNECT_LIST_URL);
-        navigateToKsqlDb();
-        verifyCurrentUrl(KSQL_DB_LIST_URL);
-    }
-
-    @QaseId(46)
-    @Test
-    public void checkPathWhileNavigating() {
-        navigateToBrokersAndOpenDetails(BROKER_ID);
-        verifyComponentsPath(BROKERS, String.format("Broker %d", BROKER_ID));
-        navigateToTopicsAndOpenDetails(TEST_TOPIC.getName());
-        verifyComponentsPath(TOPICS, TEST_TOPIC.getName());
-        navigateToSchemaRegistryAndOpenDetails(TEST_SCHEMA.getName());
-        verifyComponentsPath(SCHEMA_REGISTRY, TEST_SCHEMA.getName());
-        navigateToConnectorsAndOpenDetails(TEST_CONNECTOR.getName());
-        verifyComponentsPath(KAFKA_CONNECT, TEST_CONNECTOR.getName());
-    }
-
-    @Step
-    private void verifyCurrentUrl(String expectedUrl) {
-        String urlWithoutParameters = WebDriverRunner.getWebDriver().getCurrentUrl();
-        if (urlWithoutParameters.contains("?"))
-            urlWithoutParameters = urlWithoutParameters.substring(0, urlWithoutParameters.indexOf("?"));
-        Assert.assertEquals(urlWithoutParameters, String.format(expectedUrl, BASE_HOST), "getCurrentUrl()");
-    }
-
-    @Step
-    private void verifyComponentsPath(MenuItem menuItem, String expectedPath) {
-        Assert.assertEquals(naviSideBar.getPagePath(menuItem), expectedPath,
-                String.format("getPagePath() for %s", menuItem.getPageTitle().toUpperCase()));
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void afterClass() {
-        apiService
-                .deleteTopic(TEST_TOPIC.getName())
-                .deleteSchema(TEST_SCHEMA.getName())
-                .deleteConnector(TEST_CONNECTOR.getName());
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
deleted file mode 100644
index c9029e30ae5..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.provectus.kafka.ui.smokeSuite.brokers;
-
-import com.codeborne.selenide.Condition;
-import com.provectus.kafka.ui.BaseTest;
-import io.qase.api.annotation.QaseId;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import static com.provectus.kafka.ui.pages.brokers.BrokersDetails.DetailsTab.CONFIGS;
-
-public class BrokersTest extends BaseTest {
-
-    @QaseId(1)
-    @Test
-    public void checkBrokersOverview() {
-        navigateToBrokers();
-        Assert.assertTrue(brokersList.getAllBrokers().size() > 0, "getAllBrokers()");
-        verifyElementsCondition(brokersList.getAllVisibleElements(), Condition.visible);
-        verifyElementsCondition(brokersList.getAllEnabledElements(), Condition.enabled);
-    }
-
-    @QaseId(85)
-    @Test
-    public void checkExistingBrokersInCluster() {
-        navigateToBrokers();
-        Assert.assertTrue(brokersList.getAllBrokers().size() > 0, "getAllBrokers()");
-        brokersList
-                .openBroker(1);
-        brokersDetails
-                .waitUntilScreenReady();
-        verifyElementsCondition(brokersDetails.getAllVisibleElements(), Condition.visible);
-        verifyElementsCondition(brokersDetails.getAllEnabledElements(), Condition.enabled);
-        brokersDetails
-                .openDetailsTab(CONFIGS);
-        brokersConfigTab
-                .waitUntilScreenReady();
-        verifyElementsCondition(brokersConfigTab.getColumnHeaders(), Condition.visible);
-        verifyElementsCondition(brokersConfigTab.getEditButtons(), Condition.enabled);
-        Assert.assertTrue(brokersConfigTab.isSearchByKeyVisible(), "isSearchByKeyVisible()");
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
deleted file mode 100644
index bdce29e153b..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.provectus.kafka.ui.smokeSuite.connectors;
-
-import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.models.Connector;
-import com.provectus.kafka.ui.models.Topic;
-import io.qase.api.annotation.QaseId;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-
-public class ConnectorsTest extends BaseTest {
-
-    private static final List<Topic> TOPIC_LIST = new ArrayList<>();
-    private static final List<Connector> CONNECTOR_LIST = new ArrayList<>();
-    private static final String MESSAGE_CONTENT = "testData/topics/message_content_create_topic.json";
-    private static final String MESSAGE_KEY = " ";
-    private static final Topic TOPIC_FOR_CREATE = new Topic()
-            .setName("topic-for-create-connector-" + randomAlphabetic(5))
-            .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
-    private static final Topic TOPIC_FOR_DELETE = new Topic()
-            .setName("topic-for-delete-connector-" + randomAlphabetic(5))
-            .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
-    private static final Topic TOPIC_FOR_UPDATE = new Topic()
-            .setName("topic-for-update-connector-" + randomAlphabetic(5))
-            .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
-    private static final Connector CONNECTOR_FOR_DELETE = new Connector()
-            .setName("connector-for-delete-" + randomAlphabetic(5))
-            .setConfig(getResourceAsString("testData/connectors/delete_connector_config.json"));
-    private static final Connector CONNECTOR_FOR_UPDATE = new Connector()
-            .setName("connector-for-update-and-delete-" + randomAlphabetic(5))
-            .setConfig(getResourceAsString("testData/connectors/config_for_create_connector_via_api.json"));
-
-    @BeforeClass(alwaysRun = true)
-    public void beforeClass() {
-        TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
-        TOPIC_LIST.forEach(topic -> apiService
-                .createTopic(topic)
-                .sendMessage(topic)
-        );
-        CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
-        CONNECTOR_LIST.forEach(connector -> apiService.createConnector(connector));
-    }
-
-    @QaseId(42)
-    @Test
-    public void createConnector() {
-        Connector connectorForCreate = new Connector()
-                .setName("connector-for-create-" + randomAlphabetic(5))
-                .setConfig(getResourceAsString("testData/connectors/config_for_create_connector.json"));
-        navigateToConnectors();
-        kafkaConnectList
-                .clickCreateConnectorBtn();
-        connectorCreateForm
-                .waitUntilScreenReady()
-                .setConnectorDetails(connectorForCreate.getName(), connectorForCreate.getConfig())
-                .clickSubmitButton();
-        connectorDetails
-                .waitUntilScreenReady();
-        navigateToConnectorsAndOpenDetails(connectorForCreate.getName());
-        Assert.assertTrue(connectorDetails.isConnectorHeaderVisible(connectorForCreate.getName()), "isConnectorTitleVisible()");
-        navigateToConnectors();
-        Assert.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
-        CONNECTOR_LIST.add(connectorForCreate);
-    }
-
-    @QaseId(196)
-    @Test
-    public void updateConnector() {
-        navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_UPDATE.getName());
-        connectorDetails
-                .openConfigTab()
-                .setConfig(CONNECTOR_FOR_UPDATE.getConfig())
-                .clickSubmitButton();
-        Assert.assertTrue(connectorDetails.isAlertWithMessageVisible(SUCCESS, "Config successfully updated."), "isAlertWithMessageVisible()");
-        navigateToConnectors();
-        Assert.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()), "isConnectorVisible()");
-    }
-
-    @QaseId(195)
-    @Test
-    public void deleteConnector() {
-        navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_DELETE.getName());
-        connectorDetails
-                .openDotMenu()
-                .clickDeleteBtn()
-                .clickConfirmBtn();
-        navigateToConnectors();
-        Assert.assertFalse(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
-        CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void afterClass() {
-        CONNECTOR_LIST.forEach(connector ->
-                apiService.deleteConnector(connector.getName()));
-        TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
deleted file mode 100644
index 210e5549f4c..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.provectus.kafka.ui.smokeSuite.ksqlDb;
-
-import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.pages.ksqlDb.models.Stream;
-import com.provectus.kafka.ui.pages.ksqlDb.models.Table;
-import io.qase.api.annotation.QaseId;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.provectus.kafka.ui.pages.ksqlDb.enums.KsqlQueryConfig.SHOW_TABLES;
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-
-public class KsqlDbTest extends BaseTest {
-
-    private static final Stream STREAM_FOR_CHECK_TABLES = new Stream()
-            .setName("STREAM_FOR_CHECK_TABLES_" + randomAlphabetic(4).toUpperCase())
-            .setTopicName("TOPIC_FOR_STREAM_" + randomAlphabetic(4).toUpperCase());
-    private static final Table FIRST_TABLE = new Table()
-            .setName("FIRST_TABLE" + randomAlphabetic(4).toUpperCase())
-            .setStreamName(STREAM_FOR_CHECK_TABLES.getName());
-    private static final Table SECOND_TABLE = new Table()
-            .setName("SECOND_TABLE" + randomAlphabetic(4).toUpperCase())
-            .setStreamName(STREAM_FOR_CHECK_TABLES.getName());
-    private static final List<String> TOPIC_NAMES_LIST = new ArrayList<>();
-
-    @BeforeClass(alwaysRun = true)
-    public void beforeClass() {
-        apiService
-                .createStream(STREAM_FOR_CHECK_TABLES)
-                .createTables(FIRST_TABLE, SECOND_TABLE);
-        TOPIC_NAMES_LIST.addAll(List.of(STREAM_FOR_CHECK_TABLES.getTopicName(),
-                FIRST_TABLE.getName(), SECOND_TABLE.getName()));
-    }
-
-    @QaseId(41)
-    @Test(priority = 1)
-    public void checkShowTablesRequestExecution() {
-        navigateToKsqlDb();
-        ksqlDbList
-                .clickExecuteKsqlRequestBtn();
-        ksqlQueryForm
-                .waitUntilScreenReady()
-                .setQuery(SHOW_TABLES.getQuery())
-                .clickExecuteBtn();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
-        softly.assertTrue(ksqlQueryForm.getTableByName(FIRST_TABLE.getName()).isVisible(), "getTableName()");
-        softly.assertTrue(ksqlQueryForm.getTableByName(SECOND_TABLE.getName()).isVisible(), "getTableName()");
-        softly.assertAll();
-    }
-
-    @QaseId(86)
-    @Test(priority = 2)
-    public void clearResultsForExecutedRequest() {
-        navigateToKsqlDb();
-        ksqlDbList
-                .clickExecuteKsqlRequestBtn();
-        ksqlQueryForm
-                .waitUntilScreenReady()
-                .setQuery(SHOW_TABLES.getQuery())
-                .clickExecuteBtn();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
-        softly.assertAll();
-        ksqlQueryForm
-                .clickClearResultsBtn();
-        softly.assertFalse(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
-        softly.assertAll();
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void afterClass() {
-        TOPIC_NAMES_LIST.forEach(topicName -> apiService.deleteTopic(topicName));
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
deleted file mode 100644
index 9b2a1618c2f..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.provectus.kafka.ui.smokeSuite.schemas;
-
-import com.codeborne.selenide.Condition;
-import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.api.model.CompatibilityLevel;
-import com.provectus.kafka.ui.models.Schema;
-import io.qase.api.annotation.QaseId;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
-
-public class SchemasTest extends BaseTest {
-
-    private static final List<Schema> SCHEMA_LIST = new ArrayList<>();
-    private static final Schema AVRO_API = Schema.createSchemaAvro();
-    private static final Schema JSON_API = Schema.createSchemaJson();
-    private static final Schema PROTOBUF_API = Schema.createSchemaProtobuf();
-
-    @BeforeClass(alwaysRun = true)
-    public void beforeClass() {
-        SCHEMA_LIST.addAll(List.of(AVRO_API, JSON_API, PROTOBUF_API));
-        SCHEMA_LIST.forEach(schema -> apiService.createSchema(schema));
-    }
-
-    @QaseId(43)
-    @Test(priority = 1)
-    public void createSchemaAvro() {
-        Schema schemaAvro = Schema.createSchemaAvro();
-        navigateToSchemaRegistry();
-        schemaRegistryList
-                .clickCreateSchema();
-        schemaCreateForm
-                .setSubjectName(schemaAvro.getName())
-                .setSchemaField(fileToString(schemaAvro.getValuePath()))
-                .selectSchemaTypeFromDropdown(schemaAvro.getType())
-                .clickSubmitButton();
-        schemaDetails
-                .waitUntilScreenReady();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(schemaDetails.isSchemaHeaderVisible(schemaAvro.getName()), "isSchemaHeaderVisible()");
-        softly.assertEquals(schemaDetails.getSchemaType(), schemaAvro.getType().getValue(), "getSchemaType()");
-        softly.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue(),
-                "getCompatibility()");
-        softly.assertAll();
-        navigateToSchemaRegistry();
-        Assert.assertTrue(schemaRegistryList.isSchemaVisible(AVRO_API.getName()), "isSchemaVisible()");
-        SCHEMA_LIST.add(schemaAvro);
-    }
-
-    @QaseId(186)
-    @Test(priority = 2)
-    public void updateSchemaAvro() {
-        AVRO_API.setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_avro_for_update.json");
-        navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
-        schemaDetails
-                .openEditSchema();
-        schemaCreateForm
-                .waitUntilScreenReady();
-        verifyElementsCondition(schemaCreateForm.getAllDetailsPageElements(), Condition.visible);
-        SoftAssert softly = new SoftAssert();
-        softly.assertFalse(schemaCreateForm.isSubmitBtnEnabled(), "isSubmitBtnEnabled()");
-        softly.assertFalse(schemaCreateForm.isSchemaDropDownEnabled(), "isSchemaDropDownEnabled()");
-        softly.assertAll();
-        schemaCreateForm
-                .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
-                .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
-                .clickSubmitButton();
-        schemaDetails
-                .waitUntilScreenReady();
-        Assert.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.NONE.toString(),
-                "getCompatibility()");
-    }
-
-    @QaseId(44)
-    @Test(priority = 3)
-    public void compareVersionsOperation() {
-        navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
-        int latestVersion = schemaDetails
-                .waitUntilScreenReady()
-                .getLatestVersion();
-        schemaDetails
-                .openCompareVersionMenu();
-        int versionsNumberFromDdl = schemaCreateForm
-                .waitUntilScreenReady()
-                .openLeftVersionDdl()
-                .getVersionsNumberFromList();
-        Assert.assertEquals(versionsNumberFromDdl, latestVersion, "Versions number is not matched");
-        schemaCreateForm
-                .selectVersionFromDropDown(1);
-        Assert.assertEquals(schemaCreateForm.getMarkedLinesNumber(), 42, "getAllMarkedLines()");
-    }
-
-    @QaseId(187)
-    @Test(priority = 4)
-    public void deleteSchemaAvro() {
-        navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
-        schemaDetails
-                .removeSchema();
-        schemaRegistryList
-                .waitUntilScreenReady();
-        Assert.assertFalse(schemaRegistryList.isSchemaVisible(AVRO_API.getName()), "isSchemaVisible()");
-        SCHEMA_LIST.remove(AVRO_API);
-    }
-
-    @QaseId(89)
-    @Test(priority = 5)
-    public void createSchemaJson() {
-        Schema schemaJson = Schema.createSchemaJson();
-        navigateToSchemaRegistry();
-        schemaRegistryList
-                .clickCreateSchema();
-        schemaCreateForm
-                .setSubjectName(schemaJson.getName())
-                .setSchemaField(fileToString(schemaJson.getValuePath()))
-                .selectSchemaTypeFromDropdown(schemaJson.getType())
-                .clickSubmitButton();
-        schemaDetails
-                .waitUntilScreenReady();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(schemaDetails.isSchemaHeaderVisible(schemaJson.getName()), "isSchemaHeaderVisible()");
-        softly.assertEquals(schemaDetails.getSchemaType(), schemaJson.getType().getValue(), "getSchemaType()");
-        softly.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue(),
-                "getCompatibility()");
-        softly.assertAll();
-        navigateToSchemaRegistry();
-        Assert.assertTrue(schemaRegistryList.isSchemaVisible(JSON_API.getName()), "isSchemaVisible()");
-        SCHEMA_LIST.add(schemaJson);
-    }
-
-    @QaseId(189)
-    @Test(priority = 6)
-    public void deleteSchemaJson() {
-        navigateToSchemaRegistryAndOpenDetails(JSON_API.getName());
-        schemaDetails
-                .removeSchema();
-        schemaRegistryList
-                .waitUntilScreenReady();
-        Assert.assertFalse(schemaRegistryList.isSchemaVisible(JSON_API.getName()), "isSchemaVisible()");
-        SCHEMA_LIST.remove(JSON_API);
-    }
-
-    @QaseId(91)
-    @Test(priority = 7)
-    public void createSchemaProtobuf() {
-        Schema schemaProtobuf = Schema.createSchemaProtobuf();
-        navigateToSchemaRegistry();
-        schemaRegistryList
-                .clickCreateSchema();
-        schemaCreateForm
-                .setSubjectName(schemaProtobuf.getName())
-                .setSchemaField(fileToString(schemaProtobuf.getValuePath()))
-                .selectSchemaTypeFromDropdown(schemaProtobuf.getType())
-                .clickSubmitButton();
-        schemaDetails
-                .waitUntilScreenReady();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(schemaDetails.isSchemaHeaderVisible(schemaProtobuf.getName()), "isSchemaHeaderVisible()");
-        softly.assertEquals(schemaDetails.getSchemaType(), schemaProtobuf.getType().getValue(), "getSchemaType()");
-        softly.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue(),
-                "getCompatibility()");
-        softly.assertAll();
-        navigateToSchemaRegistry();
-        Assert.assertTrue(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()), "isSchemaVisible()");
-        SCHEMA_LIST.add(schemaProtobuf);
-    }
-
-    @QaseId(223)
-    @Test(priority = 8)
-    public void deleteSchemaProtobuf() {
-        navigateToSchemaRegistryAndOpenDetails(PROTOBUF_API.getName());
-        schemaDetails
-                .removeSchema();
-        schemaRegistryList
-                .waitUntilScreenReady();
-        Assert.assertFalse(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()), "isSchemaVisible()");
-        SCHEMA_LIST.remove(PROTOBUF_API);
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void afterClass() {
-        SCHEMA_LIST.forEach(schema -> apiService.deleteSchema(schema.getName()));
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
deleted file mode 100644
index 00a0413e7dc..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package com.provectus.kafka.ui.smokeSuite.topics;
-
-import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.topics.TopicDetails;
-import io.qameta.allure.Issue;
-import io.qameta.allure.Step;
-import io.qase.api.annotation.QaseId;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Ignore;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.IntStream;
-
-import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.MESSAGES;
-import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.OVERVIEW;
-import static com.provectus.kafka.ui.utilities.TimeUtils.waitUntilNewMinuteStarted;
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-
-public class MessagesTest extends BaseTest {
-
-    private static final Topic TOPIC_FOR_MESSAGES = new Topic()
-            .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
-            .setMessageKey(randomAlphabetic(5))
-            .setMessageContent(randomAlphabetic(10));
-    private static final Topic TOPIC_TO_CLEAR_AND_PURGE_MESSAGES = new Topic()
-            .setName("topic-to-clear-and-purge-messages-" + randomAlphabetic(5))
-            .setMessageKey(randomAlphabetic(5))
-            .setMessageContent(randomAlphabetic(10));
-    private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
-            .setName("topic-for-check-filters-" + randomAlphabetic(5))
-            .setMessageKey(randomAlphabetic(5))
-            .setMessageContent(randomAlphabetic(10));
-    private static final Topic TOPIC_TO_RECREATE = new Topic()
-            .setName("topic-to-recreate-attribute-" + randomAlphabetic(5))
-            .setMessageKey(randomAlphabetic(5))
-            .setMessageContent(randomAlphabetic(10));
-    private static final Topic TOPIC_FOR_CHECK_MESSAGES_COUNT = new Topic()
-            .setName("topic-for-check-messages-count" + randomAlphabetic(5))
-            .setMessageKey(randomAlphabetic(5))
-            .setMessageContent(randomAlphabetic(10));
-    private static final List<Topic> TOPIC_LIST = new ArrayList<>();
-
-    @BeforeClass(alwaysRun = true)
-    public void beforeClass() {
-        TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECK_FILTERS, TOPIC_TO_CLEAR_AND_PURGE_MESSAGES,
-                TOPIC_TO_RECREATE, TOPIC_FOR_CHECK_MESSAGES_COUNT));
-        TOPIC_LIST.forEach(topic -> apiService.createTopic(topic));
-        IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_FILTERS));
-        waitUntilNewMinuteStarted();
-        IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_FILTERS));
-        IntStream.range(1, 110).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_MESSAGES_COUNT));
-    }
-
-    @QaseId(222)
-    @Test(priority = 1)
-    public void produceMessage() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
-        topicDetails
-                .openDetailsTab(MESSAGES);
-        produceMessage(TOPIC_FOR_MESSAGES);
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey())),
-                "isKeyMessageVisible()");
-        softly.assertTrue(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim()),
-                "isContentMessageVisible()");
-        softly.assertAll();
-    }
-
-    @QaseId(19)
-    @Test(priority = 2)
-    public void clearMessage() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
-        topicDetails
-                .openDetailsTab(OVERVIEW);
-        int messageAmount = topicDetails.getMessageCountAmount();
-        produceMessage(TOPIC_FOR_MESSAGES);
-        Assert.assertEquals(topicDetails.getMessageCountAmount(), messageAmount + 1, "getMessageCountAmount()");
-        topicDetails
-                .openDotMenu()
-                .clickClearMessagesMenu()
-                .clickConfirmBtnMdl()
-                .waitUntilScreenReady();
-        Assert.assertEquals(topicDetails.getMessageCountAmount(), 0, "getMessageCountAmount()");
-    }
-
-    @QaseId(239)
-    @Test(priority = 3)
-    public void checkClearTopicMessage() {
-        navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
-        topicDetails
-                .openDetailsTab(OVERVIEW);
-        produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
-        navigateToTopics();
-        Assert.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(), 1,
-                "getNumberOfMessages()");
-        topicsList
-                .openDotMenuByTopicName(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
-                .clickClearMessagesBtn()
-                .clickConfirmBtnMdl();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
-                        String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())),
-                "isAlertWithMessageVisible()");
-        softly.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(), 0,
-                "getNumberOfMessages()");
-        softly.assertAll();
-    }
-
-    @QaseId(10)
-    @Test(priority = 4)
-    public void checkPurgeMessagePossibility() {
-        navigateToTopics();
-        int messageAmount = topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages();
-        topicsList
-                .openTopic(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
-        topicDetails
-                .openDetailsTab(OVERVIEW);
-        produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
-        navigateToTopics();
-        Assert.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(),
-                messageAmount + 1, "getNumberOfMessages()");
-        topicsList
-                .getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
-                .selectItem(true)
-                .clickPurgeMessagesOfSelectedTopicsBtn();
-        Assert.assertTrue(topicsList.isConfirmationMdlVisible(), "isConfirmationMdlVisible()");
-        topicsList
-                .clickCancelBtnMdl()
-                .clickPurgeMessagesOfSelectedTopicsBtn()
-                .clickConfirmBtnMdl();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
-                        String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())),
-                "isAlertWithMessageVisible()");
-        softly.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(), 0,
-                "getNumberOfMessages()");
-        softly.assertAll();
-    }
-
-    @Ignore
-    @Issue("https://github.com/provectus/kafka-ui/issues/2394")
-    @QaseId(15)
-    @Test(priority = 6)
-    public void checkMessageFilteringByOffset() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-        topicDetails
-                .openDetailsTab(MESSAGES);
-        TopicDetails.MessageGridItem secondMessage = topicDetails.getMessageByOffset(1);
-        topicDetails
-                .selectSeekTypeDdlMessagesTab("Offset")
-                .setSeekTypeValueFldMessagesTab(String.valueOf(secondMessage.getOffset()))
-                .clickSubmitFiltersBtnMessagesTab();
-        SoftAssert softly = new SoftAssert();
-        topicDetails.getAllMessages().forEach(message ->
-                softly.assertTrue(message.getOffset() == secondMessage.getOffset()
-                                || message.getOffset() > secondMessage.getOffset(),
-                        String.format("Expected offset is: %s, but found: %s", secondMessage.getOffset(), message.getOffset())));
-        softly.assertAll();
-    }
-
-    @Ignore
-    @Issue("https://github.com/provectus/kafka-ui/issues/3215")
-    @Issue("https://github.com/provectus/kafka-ui/issues/2345")
-    @QaseId(16)
-    @Test(priority = 7)
-    public void checkMessageFilteringByTimestamp() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-        topicDetails
-                .openDetailsTab(MESSAGES);
-        LocalDateTime firstTimestamp = topicDetails.getMessageByOffset(0).getTimestamp();
-        List<TopicDetails.MessageGridItem> nextMessages = topicDetails.getAllMessages().stream()
-                .filter(message -> message.getTimestamp().getMinute() != firstTimestamp.getMinute())
-                .toList();
-        LocalDateTime nextTimestamp = Objects.requireNonNull(nextMessages.stream()
-                .findFirst().orElseThrow()).getTimestamp();
-        topicDetails
-                .selectSeekTypeDdlMessagesTab("Timestamp")
-                .openCalendarSeekType()
-                .selectDateAndTimeByCalendar(nextTimestamp)
-                .clickSubmitFiltersBtnMessagesTab();
-        SoftAssert softly = new SoftAssert();
-        topicDetails.getAllMessages().forEach(message ->
-                softly.assertTrue(message.getTimestamp().isEqual(nextTimestamp)
-                                || message.getTimestamp().isAfter(nextTimestamp),
-                        String.format("Expected timestamp is: %s, but found: %s", nextTimestamp, message.getTimestamp())));
-        softly.assertAll();
-    }
-
-    @Ignore
-    @Issue("https://github.com/provectus/kafka-ui/issues/2778")
-    @QaseId(246)
-    @Test(priority = 8)
-    public void checkClearTopicMessageFromOverviewTab() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-        topicDetails
-                .openDetailsTab(OVERVIEW)
-                .openDotMenu()
-                .clickClearMessagesMenu()
-                .clickConfirmBtnMdl();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
-                        String.format("%s messages have been successfully cleared!", TOPIC_FOR_CHECK_FILTERS.getName())),
-                "isAlertWithMessageVisible()");
-        softly.assertEquals(topicDetails.getMessageCountAmount(), 0,
-                "getMessageCountAmount()= " + topicDetails.getMessageCountAmount());
-        softly.assertAll();
-    }
-
-    @QaseId(240)
-    @Test(priority = 9)
-    public void checkRecreateTopic() {
-        navigateToTopicsAndOpenDetails(TOPIC_TO_RECREATE.getName());
-        topicDetails
-                .openDetailsTab(OVERVIEW);
-        produceMessage(TOPIC_TO_RECREATE);
-        navigateToTopics();
-        Assert.assertEquals(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages(), 1,
-                "getNumberOfMessages()");
-        topicsList
-                .openDotMenuByTopicName(TOPIC_TO_RECREATE.getName())
-                .clickRecreateTopicBtn()
-                .clickConfirmBtnMdl();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
-                        String.format("Topic %s successfully recreated!", TOPIC_TO_RECREATE.getName())),
-                "isAlertWithMessageVisible()");
-        softly.assertEquals(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages(), 0,
-                "getNumberOfMessages()");
-        softly.assertAll();
-    }
-
-    @Ignore
-    @Issue("https://github.com/provectus/kafka-ui/issues/3129")
-    @QaseId(267)
-    @Test(priority = 10)
-    public void CheckMessagesCountPerPageWithinTopic() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_MESSAGES_COUNT.getName());
-        topicDetails
-                .openDetailsTab(MESSAGES);
-        int messagesPerPage = topicDetails.getAllMessages().size();
-        SoftAssert softly = new SoftAssert();
-        softly.assertEquals(messagesPerPage, 100, "getAllMessages()");
-        softly.assertFalse(topicDetails.isBackButtonEnabled(), "isBackButtonEnabled()");
-        softly.assertTrue(topicDetails.isNextButtonEnabled(), "isNextButtonEnabled()");
-        softly.assertAll();
-        int lastOffsetOnPage = topicDetails.getAllMessages()
-                .get(messagesPerPage - 1).getOffset();
-        topicDetails
-                .clickNextButton();
-        softly.assertEquals(topicDetails.getAllMessages().stream().findFirst().orElseThrow().getOffset(),
-                lastOffsetOnPage + 1, "findFirst().getOffset()");
-        softly.assertTrue(topicDetails.isBackButtonEnabled(), "isBackButtonEnabled()");
-        softly.assertFalse(topicDetails.isNextButtonEnabled(), "isNextButtonEnabled()");
-        softly.assertAll();
-    }
-
-    @Step
-    protected void produceMessage(Topic topic) {
-        topicDetails
-                .clickProduceMessageBtn();
-        produceMessagePanel
-                .waitUntilScreenReady()
-                .setKeyField(topic.getMessageKey())
-                .setContentFiled(topic.getMessageContent())
-                .submitProduceMessage();
-        topicDetails
-                .waitUntilScreenReady();
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void afterClass() {
-        TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
deleted file mode 100644
index 0ce4d6c7183..00000000000
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java
+++ /dev/null
@@ -1,496 +0,0 @@
-package com.provectus.kafka.ui.smokeSuite.topics;
-
-import com.codeborne.selenide.Condition;
-import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.models.Topic;
-import io.qameta.allure.Issue;
-import io.qase.api.annotation.QaseId;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Ignore;
-import org.testng.annotations.Test;
-import org.testng.asserts.SoftAssert;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
-import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.*;
-import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.COMPACT;
-import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.DELETE;
-import static com.provectus.kafka.ui.pages.topics.enums.CustomParameterType.COMPRESSION_TYPE;
-import static com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk.*;
-import static com.provectus.kafka.ui.pages.topics.enums.TimeToRetain.BTN_2_DAYS;
-import static com.provectus.kafka.ui.pages.topics.enums.TimeToRetain.BTN_7_DAYS;
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-import static org.apache.commons.lang3.RandomUtils.nextInt;
-
-public class TopicsTest extends BaseTest {
-
-    private static final Topic TOPIC_TO_CREATE = new Topic()
-            .setName("new-topic-" + randomAlphabetic(5))
-            .setNumberOfPartitions(1)
-            .setCustomParameterType(COMPRESSION_TYPE)
-            .setCustomParameterValue("producer")
-            .setCleanupPolicyValue(DELETE);
-    private static final Topic TOPIC_TO_UPDATE_AND_DELETE = new Topic()
-            .setName("topic-to-update-and-delete-" + randomAlphabetic(5))
-            .setNumberOfPartitions(1)
-            .setCleanupPolicyValue(DELETE)
-            .setTimeToRetain(BTN_7_DAYS)
-            .setMaxSizeOnDisk(NOT_SET)
-            .setMaxMessageBytes("1048588")
-            .setMessageKey(randomAlphabetic(5))
-            .setMessageContent(randomAlphabetic(10));
-    private static final Topic TOPIC_TO_CHECK_SETTINGS = new Topic()
-            .setName("new-topic-" + randomAlphabetic(5))
-            .setNumberOfPartitions(1)
-            .setMaxMessageBytes("1000012")
-            .setMaxSizeOnDisk(NOT_SET);
-    private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
-            .setName("topic-for-check-filters-" + randomAlphabetic(5));
-    private static final Topic TOPIC_FOR_DELETE = new Topic()
-            .setName("topic-to-delete-" + randomAlphabetic(5));
-    private static final List<Topic> TOPIC_LIST = new ArrayList<>();
-
-    @BeforeClass(alwaysRun = true)
-    public void beforeClass() {
-        TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE_AND_DELETE, TOPIC_FOR_DELETE, TOPIC_FOR_CHECK_FILTERS));
-        TOPIC_LIST.forEach(topic -> apiService.createTopic(topic));
-    }
-
-    @QaseId(199)
-    @Test(priority = 1)
-    public void createTopic() {
-        navigateToTopics();
-        topicsList
-                .clickAddTopicBtn();
-        topicCreateEditForm
-                .waitUntilScreenReady()
-                .setTopicName(TOPIC_TO_CREATE.getName())
-                .setNumberOfPartitions(TOPIC_TO_CREATE.getNumberOfPartitions())
-                .selectCleanupPolicy(TOPIC_TO_CREATE.getCleanupPolicyValue())
-                .clickCreateTopicBtn();
-        navigateToTopicsAndOpenDetails(TOPIC_TO_CREATE.getName());
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName()), "isTopicHeaderVisible()");
-        softly.assertEquals(topicDetails.getCleanUpPolicy(), TOPIC_TO_CREATE.getCleanupPolicyValue().toString(), "getCleanUpPolicy()");
-        softly.assertEquals(topicDetails.getPartitions(), TOPIC_TO_CREATE.getNumberOfPartitions(), "getPartitions()");
-        softly.assertAll();
-        navigateToTopics();
-        Assert.assertTrue(topicsList.isTopicVisible(TOPIC_TO_CREATE.getName()), "isTopicVisible()");
-        TOPIC_LIST.add(TOPIC_TO_CREATE);
-    }
-
-    @QaseId(7)
-    @Test(priority = 2)
-    void checkAvailableOperations() {
-        navigateToTopics();
-        topicsList
-                .getTopicItem(TOPIC_TO_UPDATE_AND_DELETE.getName())
-                .selectItem(true);
-        verifyElementsCondition(topicsList.getActionButtons(), Condition.enabled);
-        topicsList
-                .getTopicItem(TOPIC_FOR_CHECK_FILTERS.getName())
-                .selectItem(true);
-        Assert.assertFalse(topicsList.isCopySelectedTopicBtnEnabled(), "isCopySelectedTopicBtnEnabled()");
-    }
-
-    @Ignore
-    @Issue("https://github.com/provectus/kafka-ui/issues/3071")
-    @QaseId(268)
-    @Test(priority = 3)
-    public void checkCustomParametersWithinEditExistingTopic() {
-        navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
-        topicDetails
-                .openDotMenu()
-                .clickEditSettingsMenu();
-        SoftAssert softly = new SoftAssert();
-        topicCreateEditForm
-                .waitUntilScreenReady()
-                .clickAddCustomParameterTypeButton()
-                .openCustomParameterTypeDdl()
-                .getAllDdlOptions()
-                .forEach(option ->
-                        softly.assertTrue(!option.is(Condition.attribute("disabled")),
-                                option.getText() + " is enabled:"));
-        softly.assertAll();
-    }
-
-    @QaseId(197)
-    @Test(priority = 4)
-    public void updateTopic() {
-        navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
-        topicDetails
-                .openDotMenu()
-                .clickEditSettingsMenu();
-        topicCreateEditForm
-                .waitUntilScreenReady();
-        SoftAssert softly = new SoftAssert();
-        softly.assertEquals(topicCreateEditForm.getCleanupPolicy(),
-                TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText(), "getCleanupPolicy()");
-        softly.assertEquals(topicCreateEditForm.getTimeToRetain(),
-                TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue(), "getTimeToRetain()");
-        softly.assertEquals(topicCreateEditForm.getMaxSizeOnDisk(),
-                TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText(), "getMaxSizeOnDisk()");
-        softly.assertEquals(topicCreateEditForm.getMaxMessageBytes(),
-                TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes(), "getMaxMessageBytes()");
-        softly.assertAll();
-        TOPIC_TO_UPDATE_AND_DELETE
-                .setCleanupPolicyValue(COMPACT)
-                .setTimeToRetain(BTN_2_DAYS)
-                .setMaxSizeOnDisk(SIZE_50_GB).setMaxMessageBytes("1048589");
-        topicCreateEditForm
-                .selectCleanupPolicy((TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue()))
-                .setTimeToRetainDataByButtons(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain())
-                .setMaxSizeOnDiskInGB(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk())
-                .setMaxMessageBytes(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes())
-                .clickCreateTopicBtn();
-        softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully updated."),
-                "isAlertWithMessageVisible()");
-        softly.assertTrue(topicDetails.isTopicHeaderVisible(TOPIC_TO_UPDATE_AND_DELETE.getName()),
-                "isTopicHeaderVisible()");
-        softly.assertAll();
-        topicDetails
-                .waitUntilScreenReady();
-        navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
-        topicDetails
-                .openDotMenu()
-                .clickEditSettingsMenu();
-        softly.assertFalse(topicCreateEditForm.isNameFieldEnabled(), "isNameFieldEnabled()");
-        softly.assertEquals(topicCreateEditForm.getCleanupPolicy(),
-                TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText(), "getCleanupPolicy()");
-        softly.assertEquals(topicCreateEditForm.getTimeToRetain(),
-                TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue(), "getTimeToRetain()");
-        softly.assertEquals(topicCreateEditForm.getMaxSizeOnDisk(),
-                TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText(), "getMaxSizeOnDisk()");
-        softly.assertEquals(topicCreateEditForm.getMaxMessageBytes(),
-                TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes(), "getMaxMessageBytes()");
-        softly.assertAll();
-    }
-
-    @QaseId(242)
-    @Test(priority = 5)
-    public void removeTopicFromTopicList() {
-        navigateToTopics();
-        topicsList
-                .openDotMenuByTopicName(TOPIC_TO_UPDATE_AND_DELETE.getName())
-                .clickRemoveTopicBtn()
-                .clickConfirmBtnMdl();
-        Assert.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
-                        String.format("Topic %s successfully deleted!", TOPIC_TO_UPDATE_AND_DELETE.getName())),
-                "isAlertWithMessageVisible()");
-        TOPIC_LIST.remove(TOPIC_TO_UPDATE_AND_DELETE);
-    }
-
-    @QaseId(207)
-    @Test(priority = 6)
-    public void deleteTopic() {
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_DELETE.getName());
-        topicDetails
-                .openDotMenu()
-                .clickDeleteTopicMenu()
-                .clickConfirmBtnMdl();
-        navigateToTopics();
-        Assert.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
-        TOPIC_LIST.remove(TOPIC_FOR_DELETE);
-    }
-
-    @QaseId(20)
-    @Test(priority = 7)
-    public void redirectToConsumerFromTopic() {
-        String topicName = "source-activities";
-        String consumerGroupId = "connect-sink_postgres_activities";
-        navigateToTopicsAndOpenDetails(topicName);
-        topicDetails
-                .openDetailsTab(CONSUMERS)
-                .openConsumerGroup(consumerGroupId);
-        consumersDetails
-                .waitUntilScreenReady();
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(consumersDetails.isRedirectedConsumerTitleVisible(consumerGroupId),
-                "isRedirectedConsumerTitleVisible()");
-        softly.assertTrue(consumersDetails.isTopicInConsumersDetailsVisible(topicName),
-                "isTopicInConsumersDetailsVisible()");
-        softly.assertAll();
-    }
-
-    @QaseId(4)
-    @Test(priority = 8)
-    public void checkTopicCreatePossibility() {
-        navigateToTopics();
-        topicsList
-                .clickAddTopicBtn();
-        topicCreateEditForm
-                .waitUntilScreenReady();
-        Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
-        topicCreateEditForm
-                .setTopicName("testName");
-        Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
-        topicCreateEditForm
-                .setTopicName(null)
-                .setNumberOfPartitions(nextInt(1, 10));
-        Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
-        topicCreateEditForm
-                .setTopicName("testName");
-        Assert.assertTrue(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
-    }
-
-    @QaseId(266)
-    @Test(priority = 9)
-    public void checkTimeToRetainDataCustomValueWithEditingTopic() {
-        Topic topicToRetainData = new Topic()
-                .setName("topic-to-retain-data-" + randomAlphabetic(5))
-                .setTimeToRetainData("86400000");
-        navigateToTopics();
-        topicsList
-                .clickAddTopicBtn();
-        topicCreateEditForm
-                .waitUntilScreenReady()
-                .setTopicName(topicToRetainData.getName())
-                .setNumberOfPartitions(1)
-                .setTimeToRetainDataInMs("604800000");
-        Assert.assertEquals(topicCreateEditForm.getTimeToRetain(), "604800000", "getTimeToRetain()");
-        topicCreateEditForm
-                .setTimeToRetainDataInMs(topicToRetainData.getTimeToRetainData())
-                .clickCreateTopicBtn();
-        topicDetails
-                .waitUntilScreenReady()
-                .openDotMenu()
-                .clickEditSettingsMenu();
-        Assert.assertEquals(topicCreateEditForm.getTimeToRetain(), topicToRetainData.getTimeToRetainData(),
-                "getTimeToRetain()");
-        topicDetails
-                .openDetailsTab(SETTINGS);
-        Assert.assertEquals(topicDetails.getSettingsGridValueByKey("retention.ms"), topicToRetainData.getTimeToRetainData(),
-                "getSettingsGridValueByKey()");
-        TOPIC_LIST.add(topicToRetainData);
-    }
-
-    @QaseId(6)
-    @Test(priority = 10)
-    public void checkCustomParametersWithinCreateNewTopic() {
-        navigateToTopics();
-        topicsList
-                .clickAddTopicBtn();
-        topicCreateEditForm
-                .waitUntilScreenReady()
-                .setTopicName(TOPIC_TO_CREATE.getName())
-                .clickAddCustomParameterTypeButton()
-                .setCustomParameterType(TOPIC_TO_CREATE.getCustomParameterType());
-        Assert.assertTrue(topicCreateEditForm.isDeleteCustomParameterButtonEnabled(),
-                "isDeleteCustomParameterButtonEnabled()");
-        topicCreateEditForm
-                .clearCustomParameterValue();
-        Assert.assertTrue(topicCreateEditForm.isValidationMessageCustomParameterValueVisible(),
-                "isValidationMessageCustomParameterValueVisible()");
-    }
-
-    @QaseId(2)
-    @Test(priority = 11)
-    public void checkTopicListElements() {
-        navigateToTopics();
-        verifyElementsCondition(topicsList.getAllVisibleElements(), Condition.visible);
-        verifyElementsCondition(topicsList.getAllEnabledElements(), Condition.enabled);
-    }
-
-    @QaseId(12)
-    @Test(priority = 12)
-    public void addNewFilterWithinTopic() {
-        String filterName = randomAlphabetic(5);
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-        topicDetails
-                .openDetailsTab(MESSAGES)
-                .clickMessagesAddFiltersBtn()
-                .waitUntilAddFiltersMdlVisible();
-        verifyElementsCondition(topicDetails.getAllAddFilterModalVisibleElements(), Condition.visible);
-        verifyElementsCondition(topicDetails.getAllAddFilterModalEnabledElements(), Condition.enabled);
-        verifyElementsCondition(topicDetails.getAllAddFilterModalDisabledElements(), Condition.disabled);
-        Assert.assertFalse(topicDetails.isSaveThisFilterCheckBoxSelected(), "isSaveThisFilterCheckBoxSelected()");
-        topicDetails
-                .setFilterCodeFieldAddFilterMdl(filterName);
-        Assert.assertTrue(topicDetails.isAddFilterBtnAddFilterMdlEnabled(), "isAddFilterBtnAddFilterMdlEnabled()");
-        topicDetails.clickAddFilterBtnAndCloseMdl(true);
-        Assert.assertTrue(topicDetails.isActiveFilterVisible(filterName), "isActiveFilterVisible()");
-    }
-
-    @QaseId(13)
-    @Test(priority = 13)
-    public void checkFilterSavingWithinSavedFilters() {
-        String displayName = randomAlphabetic(5);
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-        topicDetails
-                .openDetailsTab(MESSAGES)
-                .clickMessagesAddFiltersBtn()
-                .waitUntilAddFiltersMdlVisible()
-                .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
-                .selectSaveThisFilterCheckboxMdl(true)
-                .setDisplayNameFldAddFilterMdl(displayName);
-        Assert.assertTrue(topicDetails.isAddFilterBtnAddFilterMdlEnabled(),
-                "isAddFilterBtnAddFilterMdlEnabled()");
-        topicDetails
-                .clickAddFilterBtnAndCloseMdl(false)
-                .openSavedFiltersListMdl();
-        Assert.assertTrue(topicDetails.isFilterVisibleAtSavedFiltersMdl(displayName),
-                "isFilterVisibleAtSavedFiltersMdl()");
-    }
-
-    @QaseId(14)
-    @Test(priority = 14)
-    public void checkApplyingSavedFilterWithinTopicMessages() {
-        String displayName = randomAlphabetic(5);
-        navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-        topicDetails
-                .openDetailsTab(MESSAGES)
-                .clickMessagesAddFiltersBtn()
-                .waitUntilAddFiltersMdlVisible()
-                .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
-                .selectSaveThisFilterCheckboxMdl(true)
-                .setDisplayNameFldAddFilterMdl(displayName)
-                .clickAddFilterBtnAndCloseMdl(false)
-                .openSavedFiltersListMdl()
-                .selectFilterAtSavedFiltersMdl(displayName)
-                .clickSelectFilterBtnAtSavedFiltersMdl();
-        Assert.assertTrue(topicDetails.isActiveFilterVisible(displayName), "isActiveFilterVisible()");
-    }
-
-    @QaseId(11)
-    @Test(priority = 15)
-    public void checkShowInternalTopicsButton() {
-        navigateToTopics();
-        topicsList
-                .setShowInternalRadioButton(true);
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(topicsList.getInternalTopics().size() > 0, "getInternalTopics()");
-        softly.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
-        softly.assertAll();
-        topicsList
-                .setShowInternalRadioButton(false);
-        softly.assertEquals(topicsList.getInternalTopics().size(), 0, "getInternalTopics()");
-        softly.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
-        softly.assertAll();
-    }
-
-    @QaseId(334)
-    @Test(priority = 16)
-    public void checkInternalTopicsNaming() {
-        navigateToTopics();
-        SoftAssert softly = new SoftAssert();
-        topicsList
-                .setShowInternalRadioButton(true)
-                .getInternalTopics()
-                .forEach(topic -> softly.assertTrue(topic.getName().startsWith("_"),
-                        String.format("'%s' starts with '_'", topic.getName())));
-        softly.assertAll();
-    }
-
-    @QaseId(56)
-    @Test(priority = 17)
-    public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
-        navigateToTopics();
-        topicsList
-                .clickAddTopicBtn();
-        topicCreateEditForm
-                .waitUntilScreenReady()
-                .setTopicName(TOPIC_TO_CHECK_SETTINGS.getName())
-                .setNumberOfPartitions(TOPIC_TO_CHECK_SETTINGS.getNumberOfPartitions())
-                .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
-                .clickCreateTopicBtn();
-        topicDetails
-                .waitUntilScreenReady();
-        TOPIC_LIST.add(TOPIC_TO_CHECK_SETTINGS);
-        topicDetails
-                .openDetailsTab(SETTINGS);
-        topicSettingsTab
-                .waitUntilScreenReady();
-        SoftAssert softly = new SoftAssert();
-        softly.assertEquals(topicSettingsTab.getValueByKey("retention.bytes"),
-                TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue(), "getValueOfKey(retention.bytes)");
-        softly.assertEquals(topicSettingsTab.getValueByKey("max.message.bytes"),
-                TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes(), "getValueOfKey(max.message.bytes)");
-        softly.assertAll();
-        TOPIC_TO_CHECK_SETTINGS
-                .setMaxSizeOnDisk(SIZE_1_GB)
-                .setMaxMessageBytes("1000056");
-        topicDetails
-                .openDotMenu()
-                .clickEditSettingsMenu();
-        topicCreateEditForm
-                .waitUntilScreenReady()
-                .setMaxSizeOnDiskInGB(TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk())
-                .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
-                .clickCreateTopicBtn();
-        topicDetails
-                .waitUntilScreenReady()
-                .openDetailsTab(SETTINGS);
-        topicSettingsTab
-                .waitUntilScreenReady();
-        softly.assertEquals(topicSettingsTab.getValueByKey("retention.bytes"),
-                TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue(), "getValueOfKey(retention.bytes)");
-        softly.assertEquals(topicSettingsTab.getValueByKey("max.message.bytes"),
-                TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes(), "getValueOfKey(max.message.bytes)");
-        softly.assertAll();
-    }
-
-    @QaseId(247)
-    @Test(priority = 18)
-    public void recreateTopicFromTopicProfile() {
-        Topic topicToRecreate = new Topic()
-                .setName("topic-to-recreate-" + randomAlphabetic(5))
-                .setNumberOfPartitions(1);
-        navigateToTopics();
-        topicsList
-                .clickAddTopicBtn();
-        topicCreateEditForm
-                .waitUntilScreenReady()
-                .setTopicName(topicToRecreate.getName())
-                .setNumberOfPartitions(topicToRecreate.getNumberOfPartitions())
-                .clickCreateTopicBtn();
-        topicDetails
-                .waitUntilScreenReady();
-        TOPIC_LIST.add(topicToRecreate);
-        topicDetails
-                .openDotMenu()
-                .clickRecreateTopicMenu();
-        Assert.assertTrue(topicDetails.isConfirmationMdlVisible(), "isConfirmationMdlVisible()");
-        topicDetails
-                .clickConfirmBtnMdl();
-        Assert.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
-                        String.format("Topic %s successfully recreated!", topicToRecreate.getName())),
-                "isAlertWithMessageVisible()");
-    }
-
-    @QaseId(8)
-    @Test(priority = 19)
-    public void checkCopyTopicPossibility() {
-        Topic topicToCopy = new Topic()
-                .setName("topic-to-copy-" + randomAlphabetic(5))
-                .setNumberOfPartitions(1);
-        navigateToTopics();
-        topicsList
-                .getAnyNonInternalTopic()
-                .selectItem(true)
-                .clickCopySelectedTopicBtn();
-        topicCreateEditForm
-                .waitUntilScreenReady();
-        Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
-        topicCreateEditForm
-                .setTopicName(topicToCopy.getName())
-                .setNumberOfPartitions(topicToCopy.getNumberOfPartitions())
-                .clickCreateTopicBtn();
-        topicDetails
-                .waitUntilScreenReady();
-        TOPIC_LIST.add(topicToCopy);
-        SoftAssert softly = new SoftAssert();
-        softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully created."),
-                "isAlertWithMessageVisible()");
-        softly.assertTrue(topicDetails.isTopicHeaderVisible(topicToCopy.getName()), "isTopicHeaderVisible()");
-        softly.assertAll();
-    }
-
-    @AfterClass(alwaysRun = true)
-    public void afterClass() {
-        TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
-    }
-}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/SmokeTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/SmokeTest.java
new file mode 100644
index 00000000000..5193ecb25e4
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/SmokeTest.java
@@ -0,0 +1,115 @@
+package com.provectus.kafka.ui.smokesuite;
+
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.BROKERS;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KAFKA_CONNECT;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.SCHEMA_REGISTRY;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.TOPICS;
+import static com.provectus.kafka.ui.settings.BaseSource.BASE_HOST;
+import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
+import static com.provectus.kafka.ui.variables.Url.BROKERS_LIST_URL;
+import static com.provectus.kafka.ui.variables.Url.CONSUMERS_LIST_URL;
+import static com.provectus.kafka.ui.variables.Url.KAFKA_CONNECT_LIST_URL;
+import static com.provectus.kafka.ui.variables.Url.KSQL_DB_LIST_URL;
+import static com.provectus.kafka.ui.variables.Url.SCHEMA_REGISTRY_LIST_URL;
+import static com.provectus.kafka.ui.variables.Url.TOPICS_LIST_URL;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.WebDriverRunner;
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.models.Connector;
+import com.provectus.kafka.ui.models.Schema;
+import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.pages.panels.enums.MenuItem;
+import io.qameta.allure.Step;
+import io.qase.api.annotation.QaseId;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class SmokeTest extends BaseTest {
+
+  private static final int BROKER_ID = 1;
+  private static final Schema TEST_SCHEMA = Schema.createSchemaAvro();
+  private static final Topic TEST_TOPIC = new Topic()
+      .setName("new-topic-" + randomAlphabetic(5))
+      .setNumberOfPartitions(1);
+  private static final Connector TEST_CONNECTOR = new Connector()
+      .setName("new-connector-" + randomAlphabetic(5))
+      .setConfig(getResourceAsString("testData/connectors/config_for_create_connector_via_api.json"));
+
+  @BeforeClass(alwaysRun = true)
+  public void beforeClass() {
+    apiService
+        .createTopic(TEST_TOPIC)
+        .createSchema(TEST_SCHEMA)
+        .createConnector(TEST_CONNECTOR);
+  }
+
+  @QaseId(198)
+  @Test
+  public void checkBasePageElements() {
+    verifyElementsCondition(
+        Stream.concat(topPanel.getAllVisibleElements().stream(), naviSideBar.getAllMenuButtons().stream())
+            .collect(Collectors.toList()), Condition.visible);
+    verifyElementsCondition(
+        Stream.concat(topPanel.getAllEnabledElements().stream(), naviSideBar.getAllMenuButtons().stream())
+            .collect(Collectors.toList()), Condition.enabled);
+  }
+
+  @QaseId(45)
+  @Test
+  public void checkUrlWhileNavigating() {
+    navigateToBrokers();
+    verifyCurrentUrl(BROKERS_LIST_URL);
+    navigateToTopics();
+    verifyCurrentUrl(TOPICS_LIST_URL);
+    navigateToConsumers();
+    verifyCurrentUrl(CONSUMERS_LIST_URL);
+    navigateToSchemaRegistry();
+    verifyCurrentUrl(SCHEMA_REGISTRY_LIST_URL);
+    navigateToConnectors();
+    verifyCurrentUrl(KAFKA_CONNECT_LIST_URL);
+    navigateToKsqlDb();
+    verifyCurrentUrl(KSQL_DB_LIST_URL);
+  }
+
+  @QaseId(46)
+  @Test
+  public void checkPathWhileNavigating() {
+    navigateToBrokersAndOpenDetails(BROKER_ID);
+    verifyComponentsPath(BROKERS, String.format("Broker %d", BROKER_ID));
+    navigateToTopicsAndOpenDetails(TEST_TOPIC.getName());
+    verifyComponentsPath(TOPICS, TEST_TOPIC.getName());
+    navigateToSchemaRegistryAndOpenDetails(TEST_SCHEMA.getName());
+    verifyComponentsPath(SCHEMA_REGISTRY, TEST_SCHEMA.getName());
+    navigateToConnectorsAndOpenDetails(TEST_CONNECTOR.getName());
+    verifyComponentsPath(KAFKA_CONNECT, TEST_CONNECTOR.getName());
+  }
+
+  @Step
+  private void verifyCurrentUrl(String expectedUrl) {
+    String urlWithoutParameters = WebDriverRunner.getWebDriver().getCurrentUrl();
+    if (urlWithoutParameters.contains("?")) {
+      urlWithoutParameters = urlWithoutParameters.substring(0, urlWithoutParameters.indexOf("?"));
+    }
+    Assert.assertEquals(urlWithoutParameters, String.format(expectedUrl, BASE_HOST), "getCurrentUrl()");
+  }
+
+  @Step
+  private void verifyComponentsPath(MenuItem menuItem, String expectedPath) {
+    Assert.assertEquals(naviSideBar.getPagePath(menuItem), expectedPath,
+        String.format("getPagePath() for %s", menuItem.getPageTitle().toUpperCase()));
+  }
+
+  @AfterClass(alwaysRun = true)
+  public void afterClass() {
+    apiService
+        .deleteTopic(TEST_TOPIC.getName())
+        .deleteSchema(TEST_SCHEMA.getName())
+        .deleteConnector(TEST_CONNECTOR.getName());
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
new file mode 100644
index 00000000000..8fd1ffde159
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
@@ -0,0 +1,41 @@
+package com.provectus.kafka.ui.smokesuite.brokers;
+
+import static com.provectus.kafka.ui.pages.brokers.BrokersDetails.DetailsTab.CONFIGS;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.BaseTest;
+import io.qase.api.annotation.QaseId;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class BrokersTest extends BaseTest {
+
+  @QaseId(1)
+  @Test
+  public void checkBrokersOverview() {
+    navigateToBrokers();
+    Assert.assertTrue(brokersList.getAllBrokers().size() > 0, "getAllBrokers()");
+    verifyElementsCondition(brokersList.getAllVisibleElements(), Condition.visible);
+    verifyElementsCondition(brokersList.getAllEnabledElements(), Condition.enabled);
+  }
+
+  @QaseId(85)
+  @Test
+  public void checkExistingBrokersInCluster() {
+    navigateToBrokers();
+    Assert.assertTrue(brokersList.getAllBrokers().size() > 0, "getAllBrokers()");
+    brokersList
+        .openBroker(1);
+    brokersDetails
+        .waitUntilScreenReady();
+    verifyElementsCondition(brokersDetails.getAllVisibleElements(), Condition.visible);
+    verifyElementsCondition(brokersDetails.getAllEnabledElements(), Condition.enabled);
+    brokersDetails
+        .openDetailsTab(CONFIGS);
+    brokersConfigTab
+        .waitUntilScreenReady();
+    verifyElementsCondition(brokersConfigTab.getColumnHeaders(), Condition.visible);
+    verifyElementsCondition(brokersConfigTab.getEditButtons(), Condition.enabled);
+    Assert.assertTrue(brokersConfigTab.isSearchByKeyVisible(), "isSearchByKeyVisible()");
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/connectors/ConnectorsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/connectors/ConnectorsTest.java
new file mode 100644
index 00000000000..72fe769e312
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/connectors/ConnectorsTest.java
@@ -0,0 +1,107 @@
+package com.provectus.kafka.ui.smokesuite.connectors;
+
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
+import static com.provectus.kafka.ui.utilities.FileUtils.getResourceAsString;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.models.Connector;
+import com.provectus.kafka.ui.models.Topic;
+import io.qase.api.annotation.QaseId;
+import java.util.ArrayList;
+import java.util.List;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class ConnectorsTest extends BaseTest {
+
+  private static final List<Topic> TOPIC_LIST = new ArrayList<>();
+  private static final List<Connector> CONNECTOR_LIST = new ArrayList<>();
+  private static final String MESSAGE_CONTENT = "testData/topics/message_content_create_topic.json";
+  private static final String MESSAGE_KEY = " ";
+  private static final Topic TOPIC_FOR_CREATE = new Topic()
+      .setName("topic-for-create-connector-" + randomAlphabetic(5))
+      .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
+  private static final Topic TOPIC_FOR_DELETE = new Topic()
+      .setName("topic-for-delete-connector-" + randomAlphabetic(5))
+      .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
+  private static final Topic TOPIC_FOR_UPDATE = new Topic()
+      .setName("topic-for-update-connector-" + randomAlphabetic(5))
+      .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
+  private static final Connector CONNECTOR_FOR_DELETE = new Connector()
+      .setName("connector-for-delete-" + randomAlphabetic(5))
+      .setConfig(getResourceAsString("testData/connectors/delete_connector_config.json"));
+  private static final Connector CONNECTOR_FOR_UPDATE = new Connector()
+      .setName("connector-for-update-and-delete-" + randomAlphabetic(5))
+      .setConfig(getResourceAsString("testData/connectors/config_for_create_connector_via_api.json"));
+
+  @BeforeClass(alwaysRun = true)
+  public void beforeClass() {
+    TOPIC_LIST.addAll(List.of(TOPIC_FOR_CREATE, TOPIC_FOR_DELETE, TOPIC_FOR_UPDATE));
+    TOPIC_LIST.forEach(topic -> apiService
+        .createTopic(topic)
+        .sendMessage(topic)
+    );
+    CONNECTOR_LIST.addAll(List.of(CONNECTOR_FOR_DELETE, CONNECTOR_FOR_UPDATE));
+    CONNECTOR_LIST.forEach(connector -> apiService.createConnector(connector));
+  }
+
+  @QaseId(42)
+  @Test
+  public void createConnector() {
+    Connector connectorForCreate = new Connector()
+        .setName("connector-for-create-" + randomAlphabetic(5))
+        .setConfig(getResourceAsString("testData/connectors/config_for_create_connector.json"));
+    navigateToConnectors();
+    kafkaConnectList
+        .clickCreateConnectorBtn();
+    connectorCreateForm
+        .waitUntilScreenReady()
+        .setConnectorDetails(connectorForCreate.getName(), connectorForCreate.getConfig())
+        .clickSubmitButton();
+    connectorDetails
+        .waitUntilScreenReady();
+    navigateToConnectorsAndOpenDetails(connectorForCreate.getName());
+    Assert.assertTrue(connectorDetails.isConnectorHeaderVisible(connectorForCreate.getName()),
+        "isConnectorTitleVisible()");
+    navigateToConnectors();
+    Assert.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
+    CONNECTOR_LIST.add(connectorForCreate);
+  }
+
+  @QaseId(196)
+  @Test
+  public void updateConnector() {
+    navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_UPDATE.getName());
+    connectorDetails
+        .openConfigTab()
+        .setConfig(CONNECTOR_FOR_UPDATE.getConfig())
+        .clickSubmitButton();
+    Assert.assertTrue(connectorDetails.isAlertWithMessageVisible(SUCCESS, "Config successfully updated."),
+        "isAlertWithMessageVisible()");
+    navigateToConnectors();
+    Assert.assertTrue(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_UPDATE.getName()), "isConnectorVisible()");
+  }
+
+  @QaseId(195)
+  @Test
+  public void deleteConnector() {
+    navigateToConnectorsAndOpenDetails(CONNECTOR_FOR_DELETE.getName());
+    connectorDetails
+        .openDotMenu()
+        .clickDeleteBtn()
+        .clickConfirmBtn();
+    navigateToConnectors();
+    Assert.assertFalse(kafkaConnectList.isConnectorVisible(CONNECTOR_FOR_DELETE.getName()), "isConnectorVisible()");
+    CONNECTOR_LIST.remove(CONNECTOR_FOR_DELETE);
+  }
+
+  @AfterClass(alwaysRun = true)
+  public void afterClass() {
+    CONNECTOR_LIST.forEach(connector ->
+        apiService.deleteConnector(connector.getName()));
+    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
new file mode 100644
index 00000000000..d8bda606dcd
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
@@ -0,0 +1,79 @@
+package com.provectus.kafka.ui.smokesuite.ksqldb;
+
+import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_TABLES;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.pages.ksqldb.models.Stream;
+import com.provectus.kafka.ui.pages.ksqldb.models.Table;
+import io.qase.api.annotation.QaseId;
+import java.util.ArrayList;
+import java.util.List;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+
+public class KsqlDbTest extends BaseTest {
+
+  private static final Stream STREAM_FOR_CHECK_TABLES = new Stream()
+      .setName("STREAM_FOR_CHECK_TABLES_" + randomAlphabetic(4).toUpperCase())
+      .setTopicName("TOPIC_FOR_STREAM_" + randomAlphabetic(4).toUpperCase());
+  private static final Table FIRST_TABLE = new Table()
+      .setName("FIRST_TABLE" + randomAlphabetic(4).toUpperCase())
+      .setStreamName(STREAM_FOR_CHECK_TABLES.getName());
+  private static final Table SECOND_TABLE = new Table()
+      .setName("SECOND_TABLE" + randomAlphabetic(4).toUpperCase())
+      .setStreamName(STREAM_FOR_CHECK_TABLES.getName());
+  private static final List<String> TOPIC_NAMES_LIST = new ArrayList<>();
+
+  @BeforeClass(alwaysRun = true)
+  public void beforeClass() {
+    apiService
+        .createStream(STREAM_FOR_CHECK_TABLES)
+        .createTables(FIRST_TABLE, SECOND_TABLE);
+    TOPIC_NAMES_LIST.addAll(List.of(STREAM_FOR_CHECK_TABLES.getTopicName(),
+        FIRST_TABLE.getName(), SECOND_TABLE.getName()));
+  }
+
+  @QaseId(41)
+  @Test(priority = 1)
+  public void checkShowTablesRequestExecution() {
+    navigateToKsqlDb();
+    ksqlDbList
+        .clickExecuteKsqlRequestBtn();
+    ksqlQueryForm
+        .waitUntilScreenReady()
+        .setQuery(SHOW_TABLES.getQuery())
+        .clickExecuteBtn();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
+    softly.assertTrue(ksqlQueryForm.getTableByName(FIRST_TABLE.getName()).isVisible(), "getTableName()");
+    softly.assertTrue(ksqlQueryForm.getTableByName(SECOND_TABLE.getName()).isVisible(), "getTableName()");
+    softly.assertAll();
+  }
+
+  @QaseId(86)
+  @Test(priority = 2)
+  public void clearResultsForExecutedRequest() {
+    navigateToKsqlDb();
+    ksqlDbList
+        .clickExecuteKsqlRequestBtn();
+    ksqlQueryForm
+        .waitUntilScreenReady()
+        .setQuery(SHOW_TABLES.getQuery())
+        .clickExecuteBtn();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
+    softly.assertAll();
+    ksqlQueryForm
+        .clickClearResultsBtn();
+    softly.assertFalse(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
+    softly.assertAll();
+  }
+
+  @AfterClass(alwaysRun = true)
+  public void afterClass() {
+    TOPIC_NAMES_LIST.forEach(topicName -> apiService.deleteTopic(topicName));
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/schemas/SchemasTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/schemas/SchemasTest.java
new file mode 100644
index 00000000000..0fc77e1f4b7
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/schemas/SchemasTest.java
@@ -0,0 +1,190 @@
+package com.provectus.kafka.ui.smokesuite.schemas;
+
+import static com.provectus.kafka.ui.utilities.FileUtils.fileToString;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.api.model.CompatibilityLevel;
+import com.provectus.kafka.ui.models.Schema;
+import io.qase.api.annotation.QaseId;
+import java.util.ArrayList;
+import java.util.List;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+
+public class SchemasTest extends BaseTest {
+
+  private static final List<Schema> SCHEMA_LIST = new ArrayList<>();
+  private static final Schema AVRO_API = Schema.createSchemaAvro();
+  private static final Schema JSON_API = Schema.createSchemaJson();
+  private static final Schema PROTOBUF_API = Schema.createSchemaProtobuf();
+
+  @BeforeClass(alwaysRun = true)
+  public void beforeClass() {
+    SCHEMA_LIST.addAll(List.of(AVRO_API, JSON_API, PROTOBUF_API));
+    SCHEMA_LIST.forEach(schema -> apiService.createSchema(schema));
+  }
+
+  @QaseId(43)
+  @Test(priority = 1)
+  public void createSchemaAvro() {
+    Schema schemaAvro = Schema.createSchemaAvro();
+    navigateToSchemaRegistry();
+    schemaRegistryList
+        .clickCreateSchema();
+    schemaCreateForm
+        .setSubjectName(schemaAvro.getName())
+        .setSchemaField(fileToString(schemaAvro.getValuePath()))
+        .selectSchemaTypeFromDropdown(schemaAvro.getType())
+        .clickSubmitButton();
+    schemaDetails
+        .waitUntilScreenReady();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(schemaDetails.isSchemaHeaderVisible(schemaAvro.getName()), "isSchemaHeaderVisible()");
+    softly.assertEquals(schemaDetails.getSchemaType(), schemaAvro.getType().getValue(), "getSchemaType()");
+    softly.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue(),
+        "getCompatibility()");
+    softly.assertAll();
+    navigateToSchemaRegistry();
+    Assert.assertTrue(schemaRegistryList.isSchemaVisible(AVRO_API.getName()), "isSchemaVisible()");
+    SCHEMA_LIST.add(schemaAvro);
+  }
+
+  @QaseId(186)
+  @Test(priority = 2)
+  public void updateSchemaAvro() {
+    AVRO_API.setValuePath(
+        System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_avro_for_update.json");
+    navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
+    schemaDetails
+        .openEditSchema();
+    schemaCreateForm
+        .waitUntilScreenReady();
+    verifyElementsCondition(schemaCreateForm.getAllDetailsPageElements(), Condition.visible);
+    SoftAssert softly = new SoftAssert();
+    softly.assertFalse(schemaCreateForm.isSubmitBtnEnabled(), "isSubmitBtnEnabled()");
+    softly.assertFalse(schemaCreateForm.isSchemaDropDownEnabled(), "isSchemaDropDownEnabled()");
+    softly.assertAll();
+    schemaCreateForm
+        .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
+        .setNewSchemaValue(fileToString(AVRO_API.getValuePath()))
+        .clickSubmitButton();
+    schemaDetails
+        .waitUntilScreenReady();
+    Assert.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.NONE.toString(),
+        "getCompatibility()");
+  }
+
+  @QaseId(44)
+  @Test(priority = 3)
+  public void compareVersionsOperation() {
+    navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
+    int latestVersion = schemaDetails
+        .waitUntilScreenReady()
+        .getLatestVersion();
+    schemaDetails
+        .openCompareVersionMenu();
+    int versionsNumberFromDdl = schemaCreateForm
+        .waitUntilScreenReady()
+        .openLeftVersionDdl()
+        .getVersionsNumberFromList();
+    Assert.assertEquals(versionsNumberFromDdl, latestVersion, "Versions number is not matched");
+    schemaCreateForm
+        .selectVersionFromDropDown(1);
+    Assert.assertEquals(schemaCreateForm.getMarkedLinesNumber(), 42, "getAllMarkedLines()");
+  }
+
+  @QaseId(187)
+  @Test(priority = 4)
+  public void deleteSchemaAvro() {
+    navigateToSchemaRegistryAndOpenDetails(AVRO_API.getName());
+    schemaDetails
+        .removeSchema();
+    schemaRegistryList
+        .waitUntilScreenReady();
+    Assert.assertFalse(schemaRegistryList.isSchemaVisible(AVRO_API.getName()), "isSchemaVisible()");
+    SCHEMA_LIST.remove(AVRO_API);
+  }
+
+  @QaseId(89)
+  @Test(priority = 5)
+  public void createSchemaJson() {
+    Schema schemaJson = Schema.createSchemaJson();
+    navigateToSchemaRegistry();
+    schemaRegistryList
+        .clickCreateSchema();
+    schemaCreateForm
+        .setSubjectName(schemaJson.getName())
+        .setSchemaField(fileToString(schemaJson.getValuePath()))
+        .selectSchemaTypeFromDropdown(schemaJson.getType())
+        .clickSubmitButton();
+    schemaDetails
+        .waitUntilScreenReady();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(schemaDetails.isSchemaHeaderVisible(schemaJson.getName()), "isSchemaHeaderVisible()");
+    softly.assertEquals(schemaDetails.getSchemaType(), schemaJson.getType().getValue(), "getSchemaType()");
+    softly.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue(),
+        "getCompatibility()");
+    softly.assertAll();
+    navigateToSchemaRegistry();
+    Assert.assertTrue(schemaRegistryList.isSchemaVisible(JSON_API.getName()), "isSchemaVisible()");
+    SCHEMA_LIST.add(schemaJson);
+  }
+
+  @QaseId(189)
+  @Test(priority = 6)
+  public void deleteSchemaJson() {
+    navigateToSchemaRegistryAndOpenDetails(JSON_API.getName());
+    schemaDetails
+        .removeSchema();
+    schemaRegistryList
+        .waitUntilScreenReady();
+    Assert.assertFalse(schemaRegistryList.isSchemaVisible(JSON_API.getName()), "isSchemaVisible()");
+    SCHEMA_LIST.remove(JSON_API);
+  }
+
+  @QaseId(91)
+  @Test(priority = 7)
+  public void createSchemaProtobuf() {
+    Schema schemaProtobuf = Schema.createSchemaProtobuf();
+    navigateToSchemaRegistry();
+    schemaRegistryList
+        .clickCreateSchema();
+    schemaCreateForm
+        .setSubjectName(schemaProtobuf.getName())
+        .setSchemaField(fileToString(schemaProtobuf.getValuePath()))
+        .selectSchemaTypeFromDropdown(schemaProtobuf.getType())
+        .clickSubmitButton();
+    schemaDetails
+        .waitUntilScreenReady();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(schemaDetails.isSchemaHeaderVisible(schemaProtobuf.getName()), "isSchemaHeaderVisible()");
+    softly.assertEquals(schemaDetails.getSchemaType(), schemaProtobuf.getType().getValue(), "getSchemaType()");
+    softly.assertEquals(schemaDetails.getCompatibility(), CompatibilityLevel.CompatibilityEnum.BACKWARD.getValue(),
+        "getCompatibility()");
+    softly.assertAll();
+    navigateToSchemaRegistry();
+    Assert.assertTrue(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()), "isSchemaVisible()");
+    SCHEMA_LIST.add(schemaProtobuf);
+  }
+
+  @QaseId(223)
+  @Test(priority = 8)
+  public void deleteSchemaProtobuf() {
+    navigateToSchemaRegistryAndOpenDetails(PROTOBUF_API.getName());
+    schemaDetails
+        .removeSchema();
+    schemaRegistryList
+        .waitUntilScreenReady();
+    Assert.assertFalse(schemaRegistryList.isSchemaVisible(PROTOBUF_API.getName()), "isSchemaVisible()");
+    SCHEMA_LIST.remove(PROTOBUF_API);
+  }
+
+  @AfterClass(alwaysRun = true)
+  public void afterClass() {
+    SCHEMA_LIST.forEach(schema -> apiService.deleteSchema(schema.getName()));
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java
new file mode 100644
index 00000000000..24048386982
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java
@@ -0,0 +1,279 @@
+package com.provectus.kafka.ui.smokesuite.topics;
+
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.MESSAGES;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.OVERVIEW;
+import static com.provectus.kafka.ui.utilities.TimeUtils.waitUntilNewMinuteStarted;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.models.Topic;
+import com.provectus.kafka.ui.pages.topics.TopicDetails;
+import io.qameta.allure.Issue;
+import io.qameta.allure.Step;
+import io.qase.api.annotation.QaseId;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.IntStream;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+
+public class MessagesTest extends BaseTest {
+
+  private static final Topic TOPIC_FOR_MESSAGES = new Topic()
+      .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
+  private static final Topic TOPIC_TO_CLEAR_AND_PURGE_MESSAGES = new Topic()
+      .setName("topic-to-clear-and-purge-messages-" + randomAlphabetic(5))
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
+  private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
+      .setName("topic-for-check-filters-" + randomAlphabetic(5))
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
+  private static final Topic TOPIC_TO_RECREATE = new Topic()
+      .setName("topic-to-recreate-attribute-" + randomAlphabetic(5))
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
+  private static final Topic TOPIC_FOR_CHECK_MESSAGES_COUNT = new Topic()
+      .setName("topic-for-check-messages-count" + randomAlphabetic(5))
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
+  private static final List<Topic> TOPIC_LIST = new ArrayList<>();
+
+  @BeforeClass(alwaysRun = true)
+  public void beforeClass() {
+    TOPIC_LIST.addAll(List.of(TOPIC_FOR_MESSAGES, TOPIC_FOR_CHECK_FILTERS, TOPIC_TO_CLEAR_AND_PURGE_MESSAGES,
+        TOPIC_TO_RECREATE, TOPIC_FOR_CHECK_MESSAGES_COUNT));
+    TOPIC_LIST.forEach(topic -> apiService.createTopic(topic));
+    IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_FILTERS));
+    waitUntilNewMinuteStarted();
+    IntStream.range(1, 3).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_FILTERS));
+    IntStream.range(1, 110).forEach(i -> apiService.sendMessage(TOPIC_FOR_CHECK_MESSAGES_COUNT));
+  }
+
+  @QaseId(222)
+  @Test(priority = 1)
+  public void produceMessageCheck() {
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES);
+    produceMessage(TOPIC_FOR_MESSAGES);
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey())),
+        "isKeyMessageVisible()");
+    softly.assertTrue(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim()),
+        "isContentMessageVisible()");
+    softly.assertAll();
+  }
+
+  @QaseId(19)
+  @Test(priority = 2)
+  public void clearMessageCheck() {
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_MESSAGES.getName());
+    topicDetails
+        .openDetailsTab(OVERVIEW);
+    int messageAmount = topicDetails.getMessageCountAmount();
+    produceMessage(TOPIC_FOR_MESSAGES);
+    Assert.assertEquals(topicDetails.getMessageCountAmount(), messageAmount + 1, "getMessageCountAmount()");
+    topicDetails
+        .openDotMenu()
+        .clickClearMessagesMenu()
+        .clickConfirmBtnMdl()
+        .waitUntilScreenReady();
+    Assert.assertEquals(topicDetails.getMessageCountAmount(), 0, "getMessageCountAmount()");
+  }
+
+  @QaseId(239)
+  @Test(priority = 3)
+  public void checkClearTopicMessage() {
+    navigateToTopicsAndOpenDetails(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
+    topicDetails
+        .openDetailsTab(OVERVIEW);
+    produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
+    navigateToTopics();
+    Assert.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(), 1,
+        "getNumberOfMessages()");
+    topicsList
+        .openDotMenuByTopicName(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
+        .clickClearMessagesBtn()
+        .clickConfirmBtnMdl();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
+            String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())),
+        "isAlertWithMessageVisible()");
+    softly.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(), 0,
+        "getNumberOfMessages()");
+    softly.assertAll();
+  }
+
+  @QaseId(10)
+  @Test(priority = 4)
+  public void checkPurgeMessagePossibility() {
+    navigateToTopics();
+    int messageAmount = topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages();
+    topicsList
+        .openTopic(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName());
+    topicDetails
+        .openDetailsTab(OVERVIEW);
+    produceMessage(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES);
+    navigateToTopics();
+    Assert.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(),
+        messageAmount + 1, "getNumberOfMessages()");
+    topicsList
+        .getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())
+        .selectItem(true)
+        .clickPurgeMessagesOfSelectedTopicsBtn();
+    Assert.assertTrue(topicsList.isConfirmationMdlVisible(), "isConfirmationMdlVisible()");
+    topicsList
+        .clickCancelBtnMdl()
+        .clickPurgeMessagesOfSelectedTopicsBtn()
+        .clickConfirmBtnMdl();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
+            String.format("%s messages have been successfully cleared!", TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName())),
+        "isAlertWithMessageVisible()");
+    softly.assertEquals(topicsList.getTopicItem(TOPIC_TO_CLEAR_AND_PURGE_MESSAGES.getName()).getNumberOfMessages(), 0,
+        "getNumberOfMessages()");
+    softly.assertAll();
+  }
+
+  @Ignore
+  @Issue("https://github.com/provectus/kafka-ui/issues/2394")
+  @QaseId(15)
+  @Test(priority = 6)
+  public void checkMessageFilteringByOffset() {
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES);
+    TopicDetails.MessageGridItem secondMessage = topicDetails.getMessageByOffset(1);
+    topicDetails
+        .selectSeekTypeDdlMessagesTab("Offset")
+        .setSeekTypeValueFldMessagesTab(String.valueOf(secondMessage.getOffset()))
+        .clickSubmitFiltersBtnMessagesTab();
+    SoftAssert softly = new SoftAssert();
+    topicDetails.getAllMessages().forEach(message ->
+        softly.assertTrue(message.getOffset() == secondMessage.getOffset()
+                || message.getOffset() > secondMessage.getOffset(),
+            String.format("Expected offset is: %s, but found: %s", secondMessage.getOffset(), message.getOffset())));
+    softly.assertAll();
+  }
+
+  @Ignore
+  @Issue("https://github.com/provectus/kafka-ui/issues/3215")
+  @Issue("https://github.com/provectus/kafka-ui/issues/2345")
+  @QaseId(16)
+  @Test(priority = 7)
+  public void checkMessageFilteringByTimestamp() {
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES);
+    LocalDateTime firstTimestamp = topicDetails.getMessageByOffset(0).getTimestamp();
+    List<TopicDetails.MessageGridItem> nextMessages = topicDetails.getAllMessages().stream()
+        .filter(message -> message.getTimestamp().getMinute() != firstTimestamp.getMinute())
+        .toList();
+    LocalDateTime nextTimestamp = nextMessages.stream()
+        .findFirst().orElseThrow().getTimestamp();
+    topicDetails
+        .selectSeekTypeDdlMessagesTab("Timestamp")
+        .openCalendarSeekType()
+        .selectDateAndTimeByCalendar(nextTimestamp)
+        .clickSubmitFiltersBtnMessagesTab();
+    SoftAssert softly = new SoftAssert();
+    topicDetails.getAllMessages().forEach(message ->
+        softly.assertTrue(message.getTimestamp().isEqual(nextTimestamp)
+                || message.getTimestamp().isAfter(nextTimestamp),
+            String.format("Expected that %s is not before %s.", message.getTimestamp(), nextTimestamp)));
+    softly.assertAll();
+  }
+
+  @QaseId(246)
+  @Test(priority = 8)
+  public void checkClearTopicMessageFromOverviewTab() {
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+    topicDetails
+        .openDetailsTab(OVERVIEW)
+        .openDotMenu()
+        .clickClearMessagesMenu()
+        .clickConfirmBtnMdl();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
+            String.format("%s messages have been successfully cleared!", TOPIC_FOR_CHECK_FILTERS.getName())),
+        "isAlertWithMessageVisible()");
+    softly.assertEquals(topicDetails.getMessageCountAmount(), 0,
+        "getMessageCountAmount()= " + topicDetails.getMessageCountAmount());
+    softly.assertAll();
+  }
+
+  @QaseId(240)
+  @Test(priority = 9)
+  public void checkRecreateTopic() {
+    navigateToTopicsAndOpenDetails(TOPIC_TO_RECREATE.getName());
+    topicDetails
+        .openDetailsTab(OVERVIEW);
+    produceMessage(TOPIC_TO_RECREATE);
+    navigateToTopics();
+    Assert.assertEquals(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages(), 1,
+        "getNumberOfMessages()");
+    topicsList
+        .openDotMenuByTopicName(TOPIC_TO_RECREATE.getName())
+        .clickRecreateTopicBtn()
+        .clickConfirmBtnMdl();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
+            String.format("Topic %s successfully recreated!", TOPIC_TO_RECREATE.getName())),
+        "isAlertWithMessageVisible()");
+    softly.assertEquals(topicsList.getTopicItem(TOPIC_TO_RECREATE.getName()).getNumberOfMessages(), 0,
+        "getNumberOfMessages()");
+    softly.assertAll();
+  }
+
+  @Ignore
+  @Issue("https://github.com/provectus/kafka-ui/issues/3129")
+  @QaseId(267)
+  @Test(priority = 10)
+  public void checkMessagesCountPerPageWithinTopic() {
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_MESSAGES_COUNT.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES);
+    int messagesPerPage = topicDetails.getAllMessages().size();
+    SoftAssert softly = new SoftAssert();
+    softly.assertEquals(messagesPerPage, 100, "getAllMessages()");
+    softly.assertFalse(topicDetails.isBackButtonEnabled(), "isBackButtonEnabled()");
+    softly.assertTrue(topicDetails.isNextButtonEnabled(), "isNextButtonEnabled()");
+    softly.assertAll();
+    int lastOffsetOnPage = topicDetails.getAllMessages()
+        .get(messagesPerPage - 1).getOffset();
+    topicDetails
+        .clickNextButton();
+    softly.assertEquals(topicDetails.getAllMessages().stream().findFirst().orElseThrow().getOffset(),
+        lastOffsetOnPage + 1, "findFirst().getOffset()");
+    softly.assertTrue(topicDetails.isBackButtonEnabled(), "isBackButtonEnabled()");
+    softly.assertFalse(topicDetails.isNextButtonEnabled(), "isNextButtonEnabled()");
+    softly.assertAll();
+  }
+
+  @Step
+  private void produceMessage(Topic topic) {
+    topicDetails
+        .clickProduceMessageBtn();
+    produceMessagePanel
+        .waitUntilScreenReady()
+        .setKeyField(topic.getMessageKey())
+        .setContentFiled(topic.getMessageContent())
+        .submitProduceMessage();
+    topicDetails
+        .waitUntilScreenReady();
+  }
+
+  @AfterClass(alwaysRun = true)
+  public void afterClass() {
+    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
new file mode 100644
index 00000000000..319c5f74f9e
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
@@ -0,0 +1,500 @@
+package com.provectus.kafka.ui.smokesuite.topics;
+
+import static com.provectus.kafka.ui.pages.BasePage.AlertHeader.SUCCESS;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.CONSUMERS;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.MESSAGES;
+import static com.provectus.kafka.ui.pages.topics.TopicDetails.TopicMenu.SETTINGS;
+import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.COMPACT;
+import static com.provectus.kafka.ui.pages.topics.enums.CleanupPolicyValue.DELETE;
+import static com.provectus.kafka.ui.pages.topics.enums.CustomParameterType.COMPRESSION_TYPE;
+import static com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk.NOT_SET;
+import static com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk.SIZE_1_GB;
+import static com.provectus.kafka.ui.pages.topics.enums.MaxSizeOnDisk.SIZE_50_GB;
+import static com.provectus.kafka.ui.pages.topics.enums.TimeToRetain.BTN_2_DAYS;
+import static com.provectus.kafka.ui.pages.topics.enums.TimeToRetain.BTN_7_DAYS;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.apache.commons.lang3.RandomUtils.nextInt;
+
+import com.codeborne.selenide.Condition;
+import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.models.Topic;
+import io.qameta.allure.Issue;
+import io.qase.api.annotation.QaseId;
+import java.util.ArrayList;
+import java.util.List;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+
+public class TopicsTest extends BaseTest {
+
+  private static final Topic TOPIC_TO_CREATE = new Topic()
+      .setName("new-topic-" + randomAlphabetic(5))
+      .setNumberOfPartitions(1)
+      .setCustomParameterType(COMPRESSION_TYPE)
+      .setCustomParameterValue("producer")
+      .setCleanupPolicyValue(DELETE);
+  private static final Topic TOPIC_TO_UPDATE_AND_DELETE = new Topic()
+      .setName("topic-to-update-and-delete-" + randomAlphabetic(5))
+      .setNumberOfPartitions(1)
+      .setCleanupPolicyValue(DELETE)
+      .setTimeToRetain(BTN_7_DAYS)
+      .setMaxSizeOnDisk(NOT_SET)
+      .setMaxMessageBytes("1048588")
+      .setMessageKey(randomAlphabetic(5))
+      .setMessageContent(randomAlphabetic(10));
+  private static final Topic TOPIC_TO_CHECK_SETTINGS = new Topic()
+      .setName("new-topic-" + randomAlphabetic(5))
+      .setNumberOfPartitions(1)
+      .setMaxMessageBytes("1000012")
+      .setMaxSizeOnDisk(NOT_SET);
+  private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
+      .setName("topic-for-check-filters-" + randomAlphabetic(5));
+  private static final Topic TOPIC_FOR_DELETE = new Topic()
+      .setName("topic-to-delete-" + randomAlphabetic(5));
+  private static final List<Topic> TOPIC_LIST = new ArrayList<>();
+
+  @BeforeClass(alwaysRun = true)
+  public void beforeClass() {
+    TOPIC_LIST.addAll(List.of(TOPIC_TO_UPDATE_AND_DELETE, TOPIC_FOR_DELETE, TOPIC_FOR_CHECK_FILTERS));
+    TOPIC_LIST.forEach(topic -> apiService.createTopic(topic));
+  }
+
+  @QaseId(199)
+  @Test(priority = 1)
+  public void createTopic() {
+    navigateToTopics();
+    topicsList
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(TOPIC_TO_CREATE.getName())
+        .setNumberOfPartitions(TOPIC_TO_CREATE.getNumberOfPartitions())
+        .selectCleanupPolicy(TOPIC_TO_CREATE.getCleanupPolicyValue())
+        .clickSaveTopicBtn();
+    navigateToTopicsAndOpenDetails(TOPIC_TO_CREATE.getName());
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(topicDetails.isTopicHeaderVisible(TOPIC_TO_CREATE.getName()), "isTopicHeaderVisible()");
+    softly.assertEquals(topicDetails.getCleanUpPolicy(), TOPIC_TO_CREATE.getCleanupPolicyValue().toString(),
+        "getCleanUpPolicy()");
+    softly.assertEquals(topicDetails.getPartitions(), TOPIC_TO_CREATE.getNumberOfPartitions(), "getPartitions()");
+    softly.assertAll();
+    navigateToTopics();
+    Assert.assertTrue(topicsList.isTopicVisible(TOPIC_TO_CREATE.getName()), "isTopicVisible()");
+    TOPIC_LIST.add(TOPIC_TO_CREATE);
+  }
+
+  @QaseId(7)
+  @Test(priority = 2)
+  void checkAvailableOperations() {
+    navigateToTopics();
+    topicsList
+        .getTopicItem(TOPIC_TO_UPDATE_AND_DELETE.getName())
+        .selectItem(true);
+    verifyElementsCondition(topicsList.getActionButtons(), Condition.enabled);
+    topicsList
+        .getTopicItem(TOPIC_FOR_CHECK_FILTERS.getName())
+        .selectItem(true);
+    Assert.assertFalse(topicsList.isCopySelectedTopicBtnEnabled(), "isCopySelectedTopicBtnEnabled()");
+  }
+
+  @Ignore
+  @Issue("https://github.com/provectus/kafka-ui/issues/3071")
+  @QaseId(268)
+  @Test(priority = 3)
+  public void checkCustomParametersWithinEditExistingTopic() {
+    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
+    topicDetails
+        .openDotMenu()
+        .clickEditSettingsMenu();
+    SoftAssert softly = new SoftAssert();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .clickAddCustomParameterTypeButton()
+        .openCustomParameterTypeDdl()
+        .getAllDdlOptions()
+        .forEach(option ->
+            softly.assertTrue(!option.is(Condition.attribute("disabled")),
+                option.getText() + " is enabled:"));
+    softly.assertAll();
+  }
+
+  @QaseId(197)
+  @Test(priority = 4)
+  public void updateTopic() {
+    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
+    topicDetails
+        .openDotMenu()
+        .clickEditSettingsMenu();
+    topicCreateEditForm
+        .waitUntilScreenReady();
+    SoftAssert softly = new SoftAssert();
+    softly.assertEquals(topicCreateEditForm.getCleanupPolicy(),
+        TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText(), "getCleanupPolicy()");
+    softly.assertEquals(topicCreateEditForm.getTimeToRetain(),
+        TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue(), "getTimeToRetain()");
+    softly.assertEquals(topicCreateEditForm.getMaxSizeOnDisk(),
+        TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText(), "getMaxSizeOnDisk()");
+    softly.assertEquals(topicCreateEditForm.getMaxMessageBytes(),
+        TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes(), "getMaxMessageBytes()");
+    softly.assertAll();
+    TOPIC_TO_UPDATE_AND_DELETE
+        .setCleanupPolicyValue(COMPACT)
+        .setTimeToRetain(BTN_2_DAYS)
+        .setMaxSizeOnDisk(SIZE_50_GB).setMaxMessageBytes("1048589");
+    topicCreateEditForm
+        .selectCleanupPolicy((TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue()))
+        .setTimeToRetainDataByButtons(TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain())
+        .setMaxSizeOnDiskInGB(TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk())
+        .setMaxMessageBytes(TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes())
+        .clickSaveTopicBtn();
+    softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully updated."),
+        "isAlertWithMessageVisible()");
+    softly.assertTrue(topicDetails.isTopicHeaderVisible(TOPIC_TO_UPDATE_AND_DELETE.getName()),
+        "isTopicHeaderVisible()");
+    softly.assertAll();
+    topicDetails
+        .waitUntilScreenReady();
+    navigateToTopicsAndOpenDetails(TOPIC_TO_UPDATE_AND_DELETE.getName());
+    topicDetails
+        .openDotMenu()
+        .clickEditSettingsMenu();
+    softly.assertFalse(topicCreateEditForm.isNameFieldEnabled(), "isNameFieldEnabled()");
+    softly.assertEquals(topicCreateEditForm.getCleanupPolicy(),
+        TOPIC_TO_UPDATE_AND_DELETE.getCleanupPolicyValue().getVisibleText(), "getCleanupPolicy()");
+    softly.assertEquals(topicCreateEditForm.getTimeToRetain(),
+        TOPIC_TO_UPDATE_AND_DELETE.getTimeToRetain().getValue(), "getTimeToRetain()");
+    softly.assertEquals(topicCreateEditForm.getMaxSizeOnDisk(),
+        TOPIC_TO_UPDATE_AND_DELETE.getMaxSizeOnDisk().getVisibleText(), "getMaxSizeOnDisk()");
+    softly.assertEquals(topicCreateEditForm.getMaxMessageBytes(),
+        TOPIC_TO_UPDATE_AND_DELETE.getMaxMessageBytes(), "getMaxMessageBytes()");
+    softly.assertAll();
+  }
+
+  @QaseId(242)
+  @Test(priority = 5)
+  public void removeTopicFromTopicList() {
+    navigateToTopics();
+    topicsList
+        .openDotMenuByTopicName(TOPIC_TO_UPDATE_AND_DELETE.getName())
+        .clickRemoveTopicBtn()
+        .clickConfirmBtnMdl();
+    Assert.assertTrue(topicsList.isAlertWithMessageVisible(SUCCESS,
+            String.format("Topic %s successfully deleted!", TOPIC_TO_UPDATE_AND_DELETE.getName())),
+        "isAlertWithMessageVisible()");
+    TOPIC_LIST.remove(TOPIC_TO_UPDATE_AND_DELETE);
+  }
+
+  @QaseId(207)
+  @Test(priority = 6)
+  public void deleteTopic() {
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_DELETE.getName());
+    topicDetails
+        .openDotMenu()
+        .clickDeleteTopicMenu()
+        .clickConfirmBtnMdl();
+    navigateToTopics();
+    Assert.assertFalse(topicsList.isTopicVisible(TOPIC_FOR_DELETE.getName()), "isTopicVisible");
+    TOPIC_LIST.remove(TOPIC_FOR_DELETE);
+  }
+
+  @QaseId(20)
+  @Test(priority = 7)
+  public void redirectToConsumerFromTopic() {
+    String topicName = "source-activities";
+    String consumerGroupId = "connect-sink_postgres_activities";
+    navigateToTopicsAndOpenDetails(topicName);
+    topicDetails
+        .openDetailsTab(CONSUMERS)
+        .openConsumerGroup(consumerGroupId);
+    consumersDetails
+        .waitUntilScreenReady();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(consumersDetails.isRedirectedConsumerTitleVisible(consumerGroupId),
+        "isRedirectedConsumerTitleVisible()");
+    softly.assertTrue(consumersDetails.isTopicInConsumersDetailsVisible(topicName),
+        "isTopicInConsumersDetailsVisible()");
+    softly.assertAll();
+  }
+
+  @QaseId(4)
+  @Test(priority = 8)
+  public void checkTopicCreatePossibility() {
+    navigateToTopics();
+    topicsList
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady();
+    Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+    topicCreateEditForm
+        .setTopicName("testName");
+    Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+    topicCreateEditForm
+        .setTopicName(null)
+        .setNumberOfPartitions(nextInt(1, 10));
+    Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+    topicCreateEditForm
+        .setTopicName("testName");
+    Assert.assertTrue(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+  }
+
+  @QaseId(266)
+  @Test(priority = 9)
+  public void checkTimeToRetainDataCustomValueWithEditingTopic() {
+    Topic topicToRetainData = new Topic()
+        .setName("topic-to-retain-data-" + randomAlphabetic(5))
+        .setTimeToRetainData("86400000");
+    navigateToTopics();
+    topicsList
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(topicToRetainData.getName())
+        .setNumberOfPartitions(1)
+        .setTimeToRetainDataInMs("604800000");
+    Assert.assertEquals(topicCreateEditForm.getTimeToRetain(), "604800000", "getTimeToRetain()");
+    topicCreateEditForm
+        .setTimeToRetainDataInMs(topicToRetainData.getTimeToRetainData())
+        .clickSaveTopicBtn();
+    topicDetails
+        .waitUntilScreenReady()
+        .openDotMenu()
+        .clickEditSettingsMenu();
+    Assert.assertEquals(topicCreateEditForm.getTimeToRetain(), topicToRetainData.getTimeToRetainData(),
+        "getTimeToRetain()");
+    topicDetails
+        .openDetailsTab(SETTINGS);
+    Assert.assertEquals(topicDetails.getSettingsGridValueByKey("retention.ms"), topicToRetainData.getTimeToRetainData(),
+        "getSettingsGridValueByKey()");
+    TOPIC_LIST.add(topicToRetainData);
+  }
+
+  @QaseId(6)
+  @Test(priority = 10)
+  public void checkCustomParametersWithinCreateNewTopic() {
+    navigateToTopics();
+    topicsList
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(TOPIC_TO_CREATE.getName())
+        .clickAddCustomParameterTypeButton()
+        .setCustomParameterType(TOPIC_TO_CREATE.getCustomParameterType());
+    Assert.assertTrue(topicCreateEditForm.isDeleteCustomParameterButtonEnabled(),
+        "isDeleteCustomParameterButtonEnabled()");
+    topicCreateEditForm
+        .clearCustomParameterValue();
+    Assert.assertTrue(topicCreateEditForm.isValidationMessageCustomParameterValueVisible(),
+        "isValidationMessageCustomParameterValueVisible()");
+  }
+
+  @QaseId(2)
+  @Test(priority = 11)
+  public void checkTopicListElements() {
+    navigateToTopics();
+    verifyElementsCondition(topicsList.getAllVisibleElements(), Condition.visible);
+    verifyElementsCondition(topicsList.getAllEnabledElements(), Condition.enabled);
+  }
+
+  @QaseId(12)
+  @Test(priority = 12)
+  public void addNewFilterWithinTopic() {
+    String filterName = randomAlphabetic(5);
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES)
+        .clickMessagesAddFiltersBtn()
+        .waitUntilAddFiltersMdlVisible();
+    verifyElementsCondition(topicDetails.getAllAddFilterModalVisibleElements(), Condition.visible);
+    verifyElementsCondition(topicDetails.getAllAddFilterModalEnabledElements(), Condition.enabled);
+    verifyElementsCondition(topicDetails.getAllAddFilterModalDisabledElements(), Condition.disabled);
+    Assert.assertFalse(topicDetails.isSaveThisFilterCheckBoxSelected(), "isSaveThisFilterCheckBoxSelected()");
+    topicDetails
+        .setFilterCodeFieldAddFilterMdl(filterName);
+    Assert.assertTrue(topicDetails.isAddFilterBtnAddFilterMdlEnabled(), "isAddFilterBtnAddFilterMdlEnabled()");
+    topicDetails.clickAddFilterBtnAndCloseMdl(true);
+    Assert.assertTrue(topicDetails.isActiveFilterVisible(filterName), "isActiveFilterVisible()");
+  }
+
+  @QaseId(13)
+  @Test(priority = 13)
+  public void checkFilterSavingWithinSavedFilters() {
+    String displayName = randomAlphabetic(5);
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES)
+        .clickMessagesAddFiltersBtn()
+        .waitUntilAddFiltersMdlVisible()
+        .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
+        .selectSaveThisFilterCheckboxMdl(true)
+        .setDisplayNameFldAddFilterMdl(displayName);
+    Assert.assertTrue(topicDetails.isAddFilterBtnAddFilterMdlEnabled(),
+        "isAddFilterBtnAddFilterMdlEnabled()");
+    topicDetails
+        .clickAddFilterBtnAndCloseMdl(false)
+        .openSavedFiltersListMdl();
+    Assert.assertTrue(topicDetails.isFilterVisibleAtSavedFiltersMdl(displayName),
+        "isFilterVisibleAtSavedFiltersMdl()");
+  }
+
+  @QaseId(14)
+  @Test(priority = 14)
+  public void checkApplyingSavedFilterWithinTopicMessages() {
+    String displayName = randomAlphabetic(5);
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES)
+        .clickMessagesAddFiltersBtn()
+        .waitUntilAddFiltersMdlVisible()
+        .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
+        .selectSaveThisFilterCheckboxMdl(true)
+        .setDisplayNameFldAddFilterMdl(displayName)
+        .clickAddFilterBtnAndCloseMdl(false)
+        .openSavedFiltersListMdl()
+        .selectFilterAtSavedFiltersMdl(displayName)
+        .clickSelectFilterBtnAtSavedFiltersMdl();
+    Assert.assertTrue(topicDetails.isActiveFilterVisible(displayName), "isActiveFilterVisible()");
+  }
+
+  @QaseId(11)
+  @Test(priority = 15)
+  public void checkShowInternalTopicsButton() {
+    navigateToTopics();
+    topicsList
+        .setShowInternalRadioButton(true);
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(topicsList.getInternalTopics().size() > 0, "getInternalTopics()");
+    softly.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
+    softly.assertAll();
+    topicsList
+        .setShowInternalRadioButton(false);
+    softly.assertEquals(topicsList.getInternalTopics().size(), 0, "getInternalTopics()");
+    softly.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
+    softly.assertAll();
+  }
+
+  @QaseId(334)
+  @Test(priority = 16)
+  public void checkInternalTopicsNaming() {
+    navigateToTopics();
+    SoftAssert softly = new SoftAssert();
+    topicsList
+        .setShowInternalRadioButton(true)
+        .getInternalTopics()
+        .forEach(topic -> softly.assertTrue(topic.getName().startsWith("_"),
+            String.format("'%s' starts with '_'", topic.getName())));
+    softly.assertAll();
+  }
+
+  @QaseId(56)
+  @Test(priority = 17)
+  public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
+    navigateToTopics();
+    topicsList
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(TOPIC_TO_CHECK_SETTINGS.getName())
+        .setNumberOfPartitions(TOPIC_TO_CHECK_SETTINGS.getNumberOfPartitions())
+        .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
+        .clickSaveTopicBtn();
+    topicDetails
+        .waitUntilScreenReady();
+    TOPIC_LIST.add(TOPIC_TO_CHECK_SETTINGS);
+    topicDetails
+        .openDetailsTab(SETTINGS);
+    topicSettingsTab
+        .waitUntilScreenReady();
+    SoftAssert softly = new SoftAssert();
+    softly.assertEquals(topicSettingsTab.getValueByKey("retention.bytes"),
+        TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue(), "getValueOfKey(retention.bytes)");
+    softly.assertEquals(topicSettingsTab.getValueByKey("max.message.bytes"),
+        TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes(), "getValueOfKey(max.message.bytes)");
+    softly.assertAll();
+    TOPIC_TO_CHECK_SETTINGS
+        .setMaxSizeOnDisk(SIZE_1_GB)
+        .setMaxMessageBytes("1000056");
+    topicDetails
+        .openDotMenu()
+        .clickEditSettingsMenu();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setMaxSizeOnDiskInGB(TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk())
+        .setMaxMessageBytes(TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes())
+        .clickSaveTopicBtn();
+    topicDetails
+        .waitUntilScreenReady()
+        .openDetailsTab(SETTINGS);
+    topicSettingsTab
+        .waitUntilScreenReady();
+    softly.assertEquals(topicSettingsTab.getValueByKey("retention.bytes"),
+        TOPIC_TO_CHECK_SETTINGS.getMaxSizeOnDisk().getOptionValue(), "getValueOfKey(retention.bytes)");
+    softly.assertEquals(topicSettingsTab.getValueByKey("max.message.bytes"),
+        TOPIC_TO_CHECK_SETTINGS.getMaxMessageBytes(), "getValueOfKey(max.message.bytes)");
+    softly.assertAll();
+  }
+
+  @QaseId(247)
+  @Test(priority = 18)
+  public void recreateTopicFromTopicProfile() {
+    Topic topicToRecreate = new Topic()
+        .setName("topic-to-recreate-" + randomAlphabetic(5))
+        .setNumberOfPartitions(1);
+    navigateToTopics();
+    topicsList
+        .clickAddTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady()
+        .setTopicName(topicToRecreate.getName())
+        .setNumberOfPartitions(topicToRecreate.getNumberOfPartitions())
+        .clickSaveTopicBtn();
+    topicDetails
+        .waitUntilScreenReady();
+    TOPIC_LIST.add(topicToRecreate);
+    topicDetails
+        .openDotMenu()
+        .clickRecreateTopicMenu();
+    Assert.assertTrue(topicDetails.isConfirmationMdlVisible(), "isConfirmationMdlVisible()");
+    topicDetails
+        .clickConfirmBtnMdl();
+    Assert.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS,
+            String.format("Topic %s successfully recreated!", topicToRecreate.getName())),
+        "isAlertWithMessageVisible()");
+  }
+
+  @QaseId(8)
+  @Test(priority = 19)
+  public void checkCopyTopicPossibility() {
+    Topic topicToCopy = new Topic()
+        .setName("topic-to-copy-" + randomAlphabetic(5))
+        .setNumberOfPartitions(1);
+    navigateToTopics();
+    topicsList
+        .getAnyNonInternalTopic()
+        .selectItem(true)
+        .clickCopySelectedTopicBtn();
+    topicCreateEditForm
+        .waitUntilScreenReady();
+    Assert.assertFalse(topicCreateEditForm.isCreateTopicButtonEnabled(), "isCreateTopicButtonEnabled()");
+    topicCreateEditForm
+        .setTopicName(topicToCopy.getName())
+        .setNumberOfPartitions(topicToCopy.getNumberOfPartitions())
+        .clickSaveTopicBtn();
+    topicDetails
+        .waitUntilScreenReady();
+    TOPIC_LIST.add(topicToCopy);
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully created."),
+        "isAlertWithMessageVisible()");
+    softly.assertTrue(topicDetails.isTopicHeaderVisible(topicToCopy.getName()), "isTopicHeaderVisible()");
+    softly.assertAll();
+  }
+
+  @AfterClass(alwaysRun = true)
+  public void afterClass() {
+    TOPIC_LIST.forEach(topic -> apiService.deleteTopic(topic.getName()));
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/resources/manual.xml b/kafka-ui-e2e-checks/src/test/resources/manual.xml
index 89dbd7e172b..f9ea5e5b0fa 100644
--- a/kafka-ui-e2e-checks/src/test/resources/manual.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/manual.xml
@@ -2,7 +2,7 @@
 <suite name="ManualSuite">
     <test name="ManualTest" enabled="true" parallel="classes" thread-count="1">
         <packages>
-            <package name="com.provectus.kafka.ui.manualSuite.*"/>
+            <package name="com.provectus.kafka.ui.manualsuite.*"/>
         </packages>
     </test>
 </suite>
diff --git a/kafka-ui-e2e-checks/src/test/resources/qase.xml b/kafka-ui-e2e-checks/src/test/resources/qase.xml
index 8dd1dd15273..df31931718b 100644
--- a/kafka-ui-e2e-checks/src/test/resources/qase.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/qase.xml
@@ -2,7 +2,7 @@
 <suite name="QaseSuite">
     <test name="QaseTest" enabled="true" parallel="classes" thread-count="1">
         <packages>
-            <package name="com.provectus.kafka.ui.qaseSuite.*"/>
+            <package name="com.provectus.kafka.ui.qasesuite.*"/>
         </packages>
     </test>
 </suite>
diff --git a/kafka-ui-e2e-checks/src/test/resources/regression.xml b/kafka-ui-e2e-checks/src/test/resources/regression.xml
index 6cc4c5bd49d..fe102bae3e3 100644
--- a/kafka-ui-e2e-checks/src/test/resources/regression.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/regression.xml
@@ -2,9 +2,9 @@
 <suite name="RegressionSuite">
     <test name="RegressionTest" enabled="true" parallel="classes" thread-count="3">
         <packages>
-            <package name="com.provectus.kafka.ui.smokeSuite.*"/>
-            <package name="com.provectus.kafka.ui.sanitySuite.*"/>
-            <package name="com.provectus.kafka.ui.manualSuite.*"/>
+            <package name="com.provectus.kafka.ui.smokesuite.*"/>
+            <package name="com.provectus.kafka.ui.sanitysuite.*"/>
+            <package name="com.provectus.kafka.ui.manualsuite.*"/>
         </packages>
     </test>
 </suite>
diff --git a/kafka-ui-e2e-checks/src/test/resources/sanity.xml b/kafka-ui-e2e-checks/src/test/resources/sanity.xml
index 01aa279c0fe..c6b9b060249 100644
--- a/kafka-ui-e2e-checks/src/test/resources/sanity.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/sanity.xml
@@ -2,7 +2,7 @@
 <suite name="SanitySuite">
     <test name="SanityTest" enabled="true" parallel="classes" thread-count="3">
         <packages>
-            <package name="com.provectus.kafka.ui.sanitySuite.*"/>
+            <package name="com.provectus.kafka.ui.sanitysuite.*"/>
         </packages>
     </test>
 </suite>
diff --git a/kafka-ui-e2e-checks/src/test/resources/smoke.xml b/kafka-ui-e2e-checks/src/test/resources/smoke.xml
index b370468e4fb..ab2929ff340 100644
--- a/kafka-ui-e2e-checks/src/test/resources/smoke.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/smoke.xml
@@ -2,7 +2,7 @@
 <suite name="SmokeSuite">
     <test name="SmokeTest" enabled="true" parallel="classes" thread-count="3">
         <packages>
-            <package name="com.provectus.kafka.ui.smokeSuite.*"/>
+            <package name="com.provectus.kafka.ui.smokesuite.*"/>
         </packages>
     </test>
 </suite>

From 83f94325691554ec783e84fb3fb0c912fd936719 Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Mon, 10 Apr 2023 13:08:26 +0400
Subject: [PATCH 499/734] [FE] Messages filtering by offset & timestamp doesn't
 work (#3582)

---
 .../components/Topics/Topic/Messages/Filters/Filters.tsx    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 2941536f8bf..b3f355f5692 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -235,9 +235,13 @@ const Filters: React.FC<FiltersProps> = ({
         props.seekType = SeekType.TIMESTAMP;
       }
 
+      const isSeekTypeWithSeekTo =
+        props.seekType === SeekType.TIMESTAMP ||
+        props.seekType === SeekType.OFFSET;
+
       if (
         selectedPartitions.length !== partitions.length ||
-        currentSeekType === SeekType.TIMESTAMP
+        isSeekTypeWithSeekTo
       ) {
         // not everything in the partition is selected
         props.seekTo = selectedPartitions.map(({ value }) => {

From b3240d9057d5470dda93d56bb3e0145a768662eb Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 10 Apr 2023 19:06:15 +0800
Subject: [PATCH 500/734] BE: Exempt appconfig from rbac check (#3647)

---
 .../java/com/provectus/kafka/ui/model/rbac/Permission.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
index 837f9008f3e..afdcf0ca155 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac;
 
+import static com.provectus.kafka.ui.model.rbac.Resource.APPLICATIONCONFIG;
 import static com.provectus.kafka.ui.model.rbac.Resource.CLUSTERCONFIG;
 import static com.provectus.kafka.ui.model.rbac.Resource.KSQL;
 
@@ -25,6 +26,8 @@
 @EqualsAndHashCode
 public class Permission {
 
+  private static final List<Resource> RBAC_ACTION_EXEMPT_LIST = List.of(KSQL, CLUSTERCONFIG, APPLICATIONCONFIG);
+
   Resource resource;
   List<String> actions;
 
@@ -50,7 +53,7 @@ public void setActions(List<String> actions) {
 
   public void validate() {
     Assert.notNull(resource, "resource cannot be null");
-    if (!List.of(KSQL, CLUSTERCONFIG).contains(this.resource)) {
+    if (!RBAC_ACTION_EXEMPT_LIST.contains(this.resource)) {
       Assert.notNull(value, "permission value can't be empty for resource " + resource);
     }
   }

From 94da2f4e7f98f969df7a3509bfff41850fef71e3 Mon Sep 17 00:00:00 2001
From: Hrant Abrahamyan <113341474+habrahamyanpro@users.noreply.github.com>
Date: Mon, 10 Apr 2023 15:53:31 +0400
Subject: [PATCH 501/734] [FE] SR: Display a warning in case of invalid syntax
 (#2599)

* No warning about filling the invalid data in case of editing the Schema / Producing the Message

* fixed test errors

* pull master

* fixed test problems

* use isJsonObject for validation

* fixed protobuf format bug

* fix setNewSchemaValue()

* test commit

* fix BaseTest

* upd global

* upd global

* upd global

* add local browser VM option

* fix TopicsList column header locator

* fix withStartupTimeout()

* switch e2e to TestNG

* upd pom

* upd page classes

* upd -pl kafka-ui-e2e-checks

* test commit

* Revert "test commit"

This reverts commit 4b505321ac5e164986a7a1886ac40c6744b8ecb1.

* fix workflow module

* upd test -f 'kafka-ui-e2e-checks'

* crt firstCase

* upd QaseUtils

* add -Dsuite

* add -Dsuite

* add -Dsuite

* add -Dsuite

* add isSuiteEnabled

* add isSuiteEnabled

* upd workflow

* upd readMe

* upd readMe

* upd readMe

* upd qaseSetup

* upd qaseSetup

* add schedule

* add schedule

* upd suites

* upd suites

* upd suites

* upd json input

* upd onTestStart

* Revert "fix setNewSchemaValue()"

This reverts commit 67d12d113409769ebe52c4decc4bc3b842fe4c9c.

* resolve conflicts

* upd localWebDriver

* added error message

* added ability to check Valid Enum

* swapped key Serde and Value Serde

* replace 'e' with 'enum', also added test cases

---------

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
Co-authored-by: David <58771979+David-DB88@users.noreply.github.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/Schemas/Edit/Form.tsx      | 20 +++++++++--
 .../src/lib/__test__/yupExtended.spec.ts      | 33 ++++++++++++++++++-
 kafka-ui-react-app/src/lib/yupExtended.ts     | 33 +++++++++++++++++--
 3 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
index 9ce7f280f43..2fce1ad7d79 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
@@ -10,6 +10,7 @@ import {
   clusterSchemasPath,
   ClusterSubjectParam,
 } from 'lib/paths';
+import yup from 'lib/yupExtended';
 import { NewSchemaSubjectRaw } from 'redux/interfaces';
 import Editor from 'components/common/Editor/Editor';
 import Select from 'components/common/Select/Select';
@@ -28,6 +29,9 @@ import {
 import PageLoader from 'components/common/PageLoader/PageLoader';
 import { schemasApiClient } from 'lib/api';
 import { showServerError } from 'lib/errorHandling';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { FormError } from 'components/common/Input/Input.styled';
+import { ErrorMessage } from '@hookform/error-message';
 
 import * as S from './Edit.styled';
 
@@ -47,8 +51,16 @@ const Form: React.FC = () => {
       : JSON.stringify(JSON.parse(schema?.schema || '{}'), null, '\t');
   }, [schema]);
 
+  const validationSchema = () =>
+    yup.object().shape({
+      newSchema:
+        schema?.schemaType === SchemaType.PROTOBUF
+          ? yup.string().required().isEnum('Schema syntax is not valid')
+          : yup.string().required().isJsonObject('Schema syntax is not valid'),
+    });
   const methods = useForm<NewSchemaSubjectRaw>({
     mode: 'onChange',
+    resolver: yupResolver(validationSchema()),
     defaultValues: {
       schemaType: schema?.schemaType,
       compatibilityLevel:
@@ -58,11 +70,10 @@ const Form: React.FC = () => {
   });
 
   const {
-    formState: { isDirty, isSubmitting, dirtyFields },
+    formState: { isDirty, isSubmitting, dirtyFields, errors },
     control,
     handleSubmit,
   } = methods;
-
   const onSubmit = async (props: NewSchemaSubjectRaw) => {
     if (!schema) return;
 
@@ -191,11 +202,14 @@ const Form: React.FC = () => {
                   )}
                 />
               </S.EditorContainer>
+              <FormError>
+                <ErrorMessage errors={errors} name="newSchema" />
+              </FormError>
               <Button
                 buttonType="primary"
                 buttonSize="M"
                 type="submit"
-                disabled={!isDirty || isSubmitting}
+                disabled={!isDirty || isSubmitting || !!errors.newSchema}
               >
                 Submit
               </Button>
diff --git a/kafka-ui-react-app/src/lib/__test__/yupExtended.spec.ts b/kafka-ui-react-app/src/lib/__test__/yupExtended.spec.ts
index bd43dd3f72a..8100b9a3264 100644
--- a/kafka-ui-react-app/src/lib/__test__/yupExtended.spec.ts
+++ b/kafka-ui-react-app/src/lib/__test__/yupExtended.spec.ts
@@ -1,5 +1,19 @@
-import { isValidJsonObject } from 'lib/yupExtended';
+import { isValidEnum, isValidJsonObject } from 'lib/yupExtended';
 
+const invalidEnum = `
+ennum SchemType {
+  AVRO = 0;
+  JSON = 1;
+  PROTOBUF = 3;
+}
+`;
+const validEnum = `
+enum SchemType {
+  AVRO = 0;
+  JSON = 1;
+  PROTOBUF = 3;
+}
+`;
 describe('yup extended', () => {
   describe('isValidJsonObject', () => {
     it('returns false for no value', () => {
@@ -21,4 +35,21 @@ describe('yup extended', () => {
       expect(isValidJsonObject('{ "foo": "bar" }')).toBeTruthy();
     });
   });
+
+  describe('isValidEnum', () => {
+    it('returns false for invalid enum', () => {
+      expect(isValidEnum(invalidEnum)).toBeFalsy();
+    });
+    it('returns false for no value', () => {
+      expect(isValidEnum()).toBeFalsy();
+    });
+    it('returns true should trim value', () => {
+      expect(
+        isValidEnum(`  enum SchemType {AVRO = 0; PROTOBUF = 3;}   `)
+      ).toBeTruthy();
+    });
+    it('returns true for valid enum', () => {
+      expect(isValidEnum(validEnum)).toBeTruthy();
+    });
+  });
 });
diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index 9c96e073db5..4c662ca8222 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -9,7 +9,8 @@ declare module 'yup' {
     TDefault = undefined,
     TFlags extends yup.Flags = ''
   > extends yup.Schema<TType, TContext, TDefault, TFlags> {
-    isJsonObject(): StringSchema<TType, TContext>;
+    isJsonObject(message?: string): StringSchema<TType, TContext>;
+    isEnum(message?: string): StringSchema<TType, TContext>;
   }
 }
 
@@ -31,15 +32,40 @@ export const isValidJsonObject = (value?: string) => {
   return false;
 };
 
-const isJsonObject = () => {
+const isJsonObject = (message?: string) => {
   return yup.string().test(
     'isJsonObject',
     // eslint-disable-next-line no-template-curly-in-string
-    '${path} is not JSON object',
+    message || '${path} is not JSON object',
     isValidJsonObject
   );
 };
 
+export const isValidEnum = (value?: string) => {
+  try {
+    if (!value) return false;
+    const trimmedValue = value.trim();
+    if (
+      trimmedValue.indexOf('enum') === 0 &&
+      trimmedValue.lastIndexOf('}') === trimmedValue.length - 1
+    ) {
+      return true;
+    }
+  } catch {
+    // do nothing
+  }
+  return false;
+};
+
+const isEnum = (message?: string) => {
+  return yup.string().test(
+    'isEnum',
+    // eslint-disable-next-line no-template-curly-in-string
+    message || '${path} is not Enum object',
+    isValidEnum
+  );
+};
+
 /**
  * due to yup rerunning all the object validiation during any render,
  * it makes sense to cache the async results
@@ -62,6 +88,7 @@ export function cacheTest(
 }
 
 yup.addMethod(yup.StringSchema, 'isJsonObject', isJsonObject);
+yup.addMethod(yup.StringSchema, 'isEnum', isEnum);
 
 export const topicFormValidationSchema = yup.object().shape({
   name: yup

From dbdced5babfc5787c4e242348b8142f8b9a03252 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 10 Apr 2023 16:40:15 +0400
Subject: [PATCH 502/734] BE: Fix loading freezes in case one of the brokers is
 down (#3618)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/service/ReactiveAdminClient.java | 39 +++++++++----
 .../kafka/ui/service/TopicsService.java       | 21 +++----
 .../ui/service/ReactiveAdminClientTest.java   | 57 +++++++++++++++++++
 3 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 7cabb79f2d0..39332da39ee 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -4,6 +4,7 @@
 import static java.util.stream.Collectors.toMap;
 import static org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableTable;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Table;
@@ -498,6 +499,14 @@ public Mono<Map<TopicPartition, Long>> listOffsets(Collection<TopicPartition> pa
         .flatMap(parts -> listOffsetsUnsafe(parts, offsetSpec));
   }
 
+  /**
+   * List offset for the specified topics, skipping no-leader partitions.
+   */
+  public Mono<Map<TopicPartition, Long>> listOffsets(Collection<TopicDescription> topicDescriptions,
+                                                     OffsetSpec offsetSpec) {
+    return listOffsetsUnsafe(filterPartitionsWithLeaderCheck(topicDescriptions, p -> true, false), offsetSpec);
+  }
+
   private Mono<Collection<TopicPartition>> filterPartitionsWithLeaderCheck(Collection<TopicPartition> partitions,
                                                                            boolean failOnUnknownLeader) {
     var targetTopics = partitions.stream().map(TopicPartition::topic).collect(Collectors.toSet());
@@ -507,34 +516,44 @@ private Mono<Collection<TopicPartition>> filterPartitionsWithLeaderCheck(Collect
                 descriptions.values(), partitions::contains, failOnUnknownLeader));
   }
 
-  private Set<TopicPartition> filterPartitionsWithLeaderCheck(Collection<TopicDescription> topicDescriptions,
+  @VisibleForTesting
+  static Set<TopicPartition> filterPartitionsWithLeaderCheck(Collection<TopicDescription> topicDescriptions,
                                                               Predicate<TopicPartition> partitionPredicate,
                                                               boolean failOnUnknownLeader) {
     var goodPartitions = new HashSet<TopicPartition>();
     for (TopicDescription description : topicDescriptions) {
+      var goodTopicPartitions = new ArrayList<TopicPartition>();
       for (TopicPartitionInfo partitionInfo : description.partitions()) {
         TopicPartition topicPartition = new TopicPartition(description.name(), partitionInfo.partition());
-        if (!partitionPredicate.test(topicPartition)) {
-          continue;
+        if (partitionInfo.leader() == null) {
+          if (failOnUnknownLeader) {
+            throw new ValidationException(String.format("Topic partition %s has no leader", topicPartition));
+          } else {
+            // if ANY of topic partitions has no leader - we have to skip all topic partitions
+            goodTopicPartitions.clear();
+            break;
+          }
         }
-        if (partitionInfo.leader() != null) {
-          goodPartitions.add(topicPartition);
-        } else if (failOnUnknownLeader) {
-          throw new ValidationException(String.format("Topic partition %s has no leader", topicPartition));
+        if (partitionPredicate.test(topicPartition)) {
+          goodTopicPartitions.add(topicPartition);
         }
       }
+      goodPartitions.addAll(goodTopicPartitions);
     }
     return goodPartitions;
   }
 
-  // 1. NOTE(!): should only apply for partitions with existing leader,
+  // 1. NOTE(!): should only apply for partitions from topics where all partitions have leaders,
   //    otherwise AdminClient will try to fetch topic metadata, fail and retry infinitely (until timeout)
   // 2. NOTE(!): Skips partitions that were not initialized yet
   //    (UnknownTopicOrPartitionException thrown, ex. after topic creation)
   // 3. TODO: check if it is a bug that AdminClient never throws LeaderNotAvailableException and just retrying instead
   @KafkaClientInternalsDependant
-  public Mono<Map<TopicPartition, Long>> listOffsetsUnsafe(Collection<TopicPartition> partitions,
-                                                           OffsetSpec offsetSpec) {
+  @VisibleForTesting
+  Mono<Map<TopicPartition, Long>> listOffsetsUnsafe(Collection<TopicPartition> partitions, OffsetSpec offsetSpec) {
+    if (partitions.isEmpty()) {
+      return Mono.just(Map.of());
+    }
 
     Function<Collection<TopicPartition>, Mono<Map<TopicPartition, Long>>> call =
         parts -> {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 9aaff3e9ef0..797c30167bf 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -3,6 +3,7 @@
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
+import com.google.common.collect.Sets;
 import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.exception.TopicMetadataException;
 import com.provectus.kafka.ui.exception.TopicNotFoundException;
@@ -136,22 +137,14 @@ private List<InternalTopic> createList(List<String> orderedNames,
   }
 
   private Mono<InternalPartitionsOffsets> getPartitionOffsets(Map<String, TopicDescription>
-                                                                  descriptions,
+                                                                  descriptionsMap,
                                                               ReactiveAdminClient ac) {
-    var topicPartitions = descriptions.values().stream()
-        .flatMap(desc ->
-            desc.partitions().stream()
-                // list offsets should only be applied to partitions with existing leader
-                // (see ReactiveAdminClient.listOffsetsUnsafe(..) docs)
-                .filter(tp -> tp.leader() != null)
-                .map(p -> new TopicPartition(desc.name(), p.partition())))
-        .collect(toList());
-
-    return ac.listOffsetsUnsafe(topicPartitions, OffsetSpec.earliest())
-        .zipWith(ac.listOffsetsUnsafe(topicPartitions, OffsetSpec.latest()),
+    var descriptions = descriptionsMap.values();
+    return ac.listOffsets(descriptions, OffsetSpec.earliest())
+        .zipWith(ac.listOffsets(descriptions, OffsetSpec.latest()),
             (earliest, latest) ->
-                topicPartitions.stream()
-                    .filter(tp -> earliest.containsKey(tp) && latest.containsKey(tp))
+                Sets.intersection(earliest.keySet(), latest.keySet())
+                    .stream()
                     .map(tp ->
                         Map.entry(tp,
                             new InternalPartitionsOffsets.Offsets(
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
index 2e302009ac1..061c0bea66b 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ReactiveAdminClientTest.java
@@ -4,8 +4,11 @@
 import static java.util.Objects.requireNonNull;
 import static org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
+import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.producer.KafkaTestProducer;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -22,16 +25,20 @@
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.apache.kafka.clients.admin.OffsetSpec;
+import org.apache.kafka.clients.admin.TopicDescription;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.consumer.OffsetAndMetadata;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.KafkaFuture;
+import org.apache.kafka.common.Node;
 import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.TopicPartitionInfo;
 import org.apache.kafka.common.config.ConfigResource;
 import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
 import org.apache.kafka.common.internals.KafkaFutureImpl;
 import org.apache.kafka.common.serialization.StringDeserializer;
+import org.assertj.core.api.ThrowableAssert;
 import org.junit.function.ThrowingRunnable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -133,6 +140,56 @@ void testToMonoWithExceptionFilter() {
         .verifyComplete();
   }
 
+  @Test
+  void filterPartitionsWithLeaderCheckSkipsPartitionsFromTopicWhereSomePartitionsHaveNoLeader() {
+    var filteredPartitions = ReactiveAdminClient.filterPartitionsWithLeaderCheck(
+        List.of(
+            // contains partitions with no leader
+            new TopicDescription("noLeaderTopic", false,
+                List.of(
+                    new TopicPartitionInfo(0, new Node(1, "n1", 9092), List.of(), List.of()),
+                    new TopicPartitionInfo(1, null, List.of(), List.of()))),
+            // should be skipped by predicate
+            new TopicDescription("skippingByPredicate", false,
+                List.of(
+                    new TopicPartitionInfo(0, new Node(1, "n1", 9092), List.of(), List.of()))),
+            // good topic
+            new TopicDescription("good", false,
+                List.of(
+                    new TopicPartitionInfo(0, new Node(1, "n1", 9092), List.of(), List.of()),
+                    new TopicPartitionInfo(1, new Node(2, "n2", 9092), List.of(), List.of()))
+            )),
+        p -> !p.topic().equals("skippingByPredicate"),
+        false
+    );
+
+    assertThat(filteredPartitions)
+        .containsExactlyInAnyOrder(
+            new TopicPartition("good", 0),
+            new TopicPartition("good", 1)
+        );
+  }
+
+  @Test
+  void filterPartitionsWithLeaderCheckThrowExceptionIfThereIsSomePartitionsWithoutLeaderAndFlagSet() {
+    ThrowingCallable call = () -> ReactiveAdminClient.filterPartitionsWithLeaderCheck(
+        List.of(
+            // contains partitions with no leader
+            new TopicDescription("t1", false,
+                List.of(
+                    new TopicPartitionInfo(0, new Node(1, "n1", 9092), List.of(), List.of()),
+                    new TopicPartitionInfo(1, null, List.of(), List.of()))),
+            new TopicDescription("t2", false,
+                List.of(
+                    new TopicPartitionInfo(0, new Node(1, "n1", 9092), List.of(), List.of()))
+            )),
+        p -> true,
+        // setting failOnNoLeader flag
+        true
+    );
+    assertThatThrownBy(call).isInstanceOf(ValidationException.class);
+  }
+
   @Test
   void testListOffsetsUnsafe() {
     String topic = UUID.randomUUID().toString();

From 005e74f2480f3ea961ec0c3d9b4a633b666df552 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 10 Apr 2023 19:35:14 +0400
Subject: [PATCH 503/734] FE: Format field previews one per line (#3623)

* new properties are added on a new line

* added test cases for key and Value Preview filters

* upd produceMessageCheck

---------

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../com/provectus/kafka/ui/models/Topic.java  |  2 +-
 .../ui/pages/topics/ProduceMessagePanel.java  | 10 ++---
 .../kafka/ui/pages/topics/TopicDetails.java   | 20 ++++-----
 .../kafka/ui/services/ApiService.java         |  2 +-
 .../smokesuite/connectors/ConnectorsTest.java |  6 +--
 .../ui/smokesuite/topics/MessagesTest.java    | 20 ++++-----
 .../ui/smokesuite/topics/TopicsTest.java      |  2 +-
 .../Topics/Topic/Messages/Message.tsx         | 19 ++++----
 .../MessageContent/MessageContent.styled.ts   |  2 +-
 .../Topic/Messages/__test__/Message.spec.tsx  | 43 +++++++++++++++++--
 10 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
index ece16b4cc10..8fb3df086ea 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Topic.java
@@ -11,7 +11,7 @@
 @Accessors(chain = true)
 public class Topic {
 
-  private String name, timeToRetainData, maxMessageBytes, messageKey, messageContent, customParameterValue;
+  private String name, timeToRetainData, maxMessageBytes, messageKey, messageValue, customParameterValue;
   private int numberOfPartitions;
   private CustomParameterType customParameterType;
   private CleanupPolicyValue cleanupPolicyValue;
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
index e407d4fe3dc..c4e65c65bee 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
@@ -12,7 +12,7 @@
 public class ProduceMessagePanel extends BasePage {
 
   protected SelenideElement keyTextArea = $x("//div[@id='key']/textarea");
-  protected SelenideElement contentTextArea = $x("//div[@id='content']/textarea");
+  protected SelenideElement valueTextArea = $x("//div[@id='content']/textarea");
   protected SelenideElement headersTextArea = $x("//div[@id='headers']/textarea");
   protected SelenideElement submitBtn = headersTextArea.$x("../../../..//button[@type='submit']");
   protected SelenideElement partitionDdl = $x("//ul[@name='partition']");
@@ -34,14 +34,14 @@ public ProduceMessagePanel setKeyField(String value) {
   }
 
   @Step
-  public ProduceMessagePanel setContentFiled(String value) {
-    clearByKeyboard(contentTextArea);
-    contentTextArea.setValue(value);
+  public ProduceMessagePanel setValueFiled(String value) {
+    clearByKeyboard(valueTextArea);
+    valueTextArea.setValue(value);
     return this;
   }
 
   @Step
-  public ProduceMessagePanel setHeaderFiled(String value) {
+  public ProduceMessagePanel setHeadersFld(String value) {
     headersTextArea.setValue(value);
     return this;
   }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
index a171c728e46..b7d03dcf3a7 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
@@ -1,6 +1,5 @@
 package com.provectus.kafka.ui.pages.topics;
 
-import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
 import static com.codeborne.selenide.Selenide.sleep;
@@ -296,16 +295,6 @@ public TopicDetails openConsumerGroup(String consumerId) {
     return this;
   }
 
-  @Step
-  public boolean isKeyMessageVisible(String keyMessage) {
-    return keyMessage.equals($("td[title]").getText());
-  }
-
-  @Step
-  public boolean isContentMessageVisible(String contentMessage) {
-    return contentMessage.matches(contentMessageTab.getText().trim());
-  }
-
   private void selectYear(int expectedYear) {
     while (getActualCalendarDate().getYear() > expectedYear) {
       clickByJavaScript(previousMonthButton);
@@ -382,6 +371,13 @@ public TopicDetails.MessageGridItem getMessageByOffset(int offset) {
         .findFirst().orElseThrow();
   }
 
+  @Step
+  public TopicDetails.MessageGridItem getMessageByKey(String key) {
+    return initItems().stream()
+        .filter(e -> e.getKey().equals(key))
+        .findFirst().orElseThrow();
+  }
+
   @Step
   public List<MessageGridItem> getAllMessages() {
     return initItems();
@@ -451,7 +447,7 @@ public String getKey() {
 
     @Step
     public String getValue() {
-      return element.$x("./td[6]/span/p").getText().trim();
+      return element.$x("./td[6]").getAttribute("title");
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index ea08f57fe49..a041defc93e 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -185,7 +185,7 @@ private void sendMessage(String clusterName, Topic topic) {
     createMessage.setKeySerde("String");
     createMessage.setValueSerde("String");
     createMessage.setKey(topic.getMessageKey());
-    createMessage.setContent(topic.getMessageContent());
+    createMessage.setContent(topic.getMessageValue());
     try {
       messageApi().sendTopicMessages(clusterName, topic.getName(), createMessage).block();
     } catch (WebClientResponseException ex) {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/connectors/ConnectorsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/connectors/ConnectorsTest.java
index 72fe769e312..9ca3526c710 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/connectors/ConnectorsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/connectors/ConnectorsTest.java
@@ -23,13 +23,13 @@ public class ConnectorsTest extends BaseTest {
   private static final String MESSAGE_KEY = " ";
   private static final Topic TOPIC_FOR_CREATE = new Topic()
       .setName("topic-for-create-connector-" + randomAlphabetic(5))
-      .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
+      .setMessageValue(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
   private static final Topic TOPIC_FOR_DELETE = new Topic()
       .setName("topic-for-delete-connector-" + randomAlphabetic(5))
-      .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
+      .setMessageValue(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
   private static final Topic TOPIC_FOR_UPDATE = new Topic()
       .setName("topic-for-update-connector-" + randomAlphabetic(5))
-      .setMessageContent(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
+      .setMessageValue(MESSAGE_CONTENT).setMessageKey(MESSAGE_KEY);
   private static final Connector CONNECTOR_FOR_DELETE = new Connector()
       .setName("connector-for-delete-" + randomAlphabetic(5))
       .setConfig(getResourceAsString("testData/connectors/delete_connector_config.json"));
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java
index 24048386982..3bbc7e7cd3d 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java
@@ -28,23 +28,23 @@ public class MessagesTest extends BaseTest {
   private static final Topic TOPIC_FOR_MESSAGES = new Topic()
       .setName("topic-with-clean-message-attribute-" + randomAlphabetic(5))
       .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
+      .setMessageValue(randomAlphabetic(10));
   private static final Topic TOPIC_TO_CLEAR_AND_PURGE_MESSAGES = new Topic()
       .setName("topic-to-clear-and-purge-messages-" + randomAlphabetic(5))
       .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
+      .setMessageValue(randomAlphabetic(10));
   private static final Topic TOPIC_FOR_CHECK_FILTERS = new Topic()
       .setName("topic-for-check-filters-" + randomAlphabetic(5))
       .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
+      .setMessageValue(randomAlphabetic(10));
   private static final Topic TOPIC_TO_RECREATE = new Topic()
       .setName("topic-to-recreate-attribute-" + randomAlphabetic(5))
       .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
+      .setMessageValue(randomAlphabetic(10));
   private static final Topic TOPIC_FOR_CHECK_MESSAGES_COUNT = new Topic()
       .setName("topic-for-check-messages-count" + randomAlphabetic(5))
       .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
+      .setMessageValue(randomAlphabetic(10));
   private static final List<Topic> TOPIC_LIST = new ArrayList<>();
 
   @BeforeClass(alwaysRun = true)
@@ -65,12 +65,8 @@ public void produceMessageCheck() {
     topicDetails
         .openDetailsTab(MESSAGES);
     produceMessage(TOPIC_FOR_MESSAGES);
-    SoftAssert softly = new SoftAssert();
-    softly.assertTrue(topicDetails.isKeyMessageVisible((TOPIC_FOR_MESSAGES.getMessageKey())),
-        "isKeyMessageVisible()");
-    softly.assertTrue(topicDetails.isContentMessageVisible((TOPIC_FOR_MESSAGES.getMessageContent()).trim()),
-        "isContentMessageVisible()");
-    softly.assertAll();
+    Assert.assertEquals(topicDetails.getMessageByKey(TOPIC_FOR_MESSAGES.getMessageKey()).getValue(),
+        TOPIC_FOR_MESSAGES.getMessageValue(), "message.getValue()");
   }
 
   @QaseId(19)
@@ -266,7 +262,7 @@ private void produceMessage(Topic topic) {
     produceMessagePanel
         .waitUntilScreenReady()
         .setKeyField(topic.getMessageKey())
-        .setContentFiled(topic.getMessageContent())
+        .setValueFiled(topic.getMessageValue())
         .submitProduceMessage();
     topicDetails
         .waitUntilScreenReady();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
index 319c5f74f9e..ad20f595a4f 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
@@ -45,7 +45,7 @@ public class TopicsTest extends BaseTest {
       .setMaxSizeOnDisk(NOT_SET)
       .setMaxMessageBytes("1048588")
       .setMessageKey(randomAlphabetic(5))
-      .setMessageContent(randomAlphabetic(10));
+      .setMessageValue(randomAlphabetic(10));
   private static final Topic TOPIC_TO_CHECK_SETTINGS = new Topic()
       .setName("new-topic-" + randomAlphabetic(5))
       .setNumberOfPartitions(1)
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index 7a9df2c16ff..60f09b82933 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -80,19 +80,20 @@ const Message: React.FC<Props> = ({
     filters?: PreviewFilter[]
   ) => {
     if (!filters?.length || !jsonValue) return jsonValue;
-
     const parsedJson = getParsedJson(jsonValue);
 
     return (
       <>
-        {filters.map((item) => (
-          <span key={`${item.path}--${item.field}`}>
-            {item.field}:{' '}
-            {JSON.stringify(
-              JSONPath({ path: item.path, json: parsedJson, wrap: false })
-            )}
-          </span>
-        ))}
+        {filters.map((item) => {
+          return (
+            <div key={`${item.path}--${item.field}`}>
+              {item.field}:{' '}
+              {JSON.stringify(
+                JSONPath({ path: item.path, json: parsedJson, wrap: false })
+              )}
+            </div>
+          );
+        })}
       </>
     );
   };
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
index 1c190ba9caa..9eb5e6b0627 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
@@ -58,7 +58,7 @@ export const MetadataLabel = styled.p`
   width: 80px;
 `;
 
-export const MetadataValue = styled.p`
+export const MetadataValue = styled.div`
   color: ${({ theme }) => theme.topicMetaData.color.value};
   font-size: 14px;
 `;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
index c01f4af3d41..c96b395f4c7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/__test__/Message.spec.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
 import { TopicMessage, TopicMessageTimestampTypeEnum } from 'generated-sources';
-import Message, { Props } from 'components/Topics/Topic/Messages/Message';
+import Message, {
+  PreviewFilter,
+  Props,
+} from 'components/Topics/Topic/Messages/Message';
 import { screen } from '@testing-library/react';
 import { render } from 'lib/testHelpers';
 import userEvent from '@testing-library/user-event';
@@ -8,6 +11,9 @@ import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 const messageContentText = 'messageContentText';
 
+const keyTest = '{"payload":{"subreddit":"learnprogramming"}}';
+const contentTest =
+  '{"payload":{"author":"DwaywelayTOP","archived":false,"name":"t3_11jshwd","id":"11jshwd"}}';
 jest.mock(
   'components/Topics/Topic/Messages/MessageContent/MessageContent',
   () => () =>
@@ -28,10 +34,19 @@ describe('Message component', () => {
     content: '{"data": "test"}',
     headers: { header: 'test' },
   };
-
+  const mockKeyFilters: PreviewFilter = {
+    field: 'sub',
+    path: '$.payload.subreddit',
+  };
+  const mockContentFilters: PreviewFilter = {
+    field: 'author',
+    path: '$.payload.author',
+  };
   const renderComponent = (
     props: Partial<Props> = {
       message: mockMessage,
+      keyFilters: [],
+      contentFilters: [],
     }
   ) =>
     render(
@@ -39,8 +54,8 @@ describe('Message component', () => {
         <tbody>
           <Message
             message={props.message || mockMessage}
-            keyFilters={[]}
-            contentFilters={[]}
+            keyFilters={props.keyFilters || []}
+            contentFilters={props.contentFilters || []}
           />
         </tbody>
       </table>
@@ -88,4 +103,24 @@ describe('Message component', () => {
     await userEvent.click(messageToggleIcon);
     expect(screen.getByText(messageContentText)).toBeInTheDocument();
   });
+
+  it('should check if Preview filter showing for key', () => {
+    const props = {
+      message: { ...mockMessage, key: keyTest as string },
+      keyFilters: [mockKeyFilters],
+    };
+    renderComponent(props);
+    const keyFiltered = screen.getByText('sub: "learnprogramming"');
+    expect(keyFiltered).toBeInTheDocument();
+  });
+
+  it('should check if Preview filter showing for Value', () => {
+    const props = {
+      message: { ...mockMessage, content: contentTest as string },
+      contentFilters: [mockContentFilters],
+    };
+    renderComponent(props);
+    const keyFiltered = screen.getByText('author: "DwaywelayTOP"');
+    expect(keyFiltered).toBeInTheDocument();
+  });
 });

From 29f49b667d4a666ec4c72676b109e984d9618eb5 Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Thu, 13 Apr 2023 11:10:59 +0400
Subject: [PATCH 504/734] FE: Fix messages 404 with schema created by .NET
 containing guid (#3592)

---
 .../src/components/Topics/Topic/SendMessage/utils.ts             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
index 8a368036c06..6f98c5916d3 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
@@ -11,6 +11,7 @@ import upperFirst from 'lodash/upperFirst';
 
 jsf.option('fillProperties', false);
 jsf.option('alwaysFakeOptionals', true);
+jsf.option('failOnInvalidFormat', false);
 
 const generateValueFromSchema = (preffered?: SerdeDescription) => {
   if (!preffered?.schema) {

From 89019dae19e8ef3a1e62262ff62435348f06f1c4 Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Thu, 13 Apr 2023 11:12:41 +0400
Subject: [PATCH 505/734] FE: Implement a warning for duplicated filter (#3608)

* bugfix/messages-filter-dupes add validation for existing filter

* bugfix/messages-filter-dupes replace `current` with `same` in alert message
---
 .../Messages/Filters/AddEditFilterContainer.tsx    |  2 +-
 .../Topics/Topic/Messages/Filters/AddFilter.tsx    | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
index 557db159ba7..757b6e171dd 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
@@ -27,7 +27,7 @@ export interface AddEditFilterContainerProps {
   inputDisplayNameDefaultValue?: string;
   inputCodeDefaultValue?: string;
   isAdd?: boolean;
-  submitCallback?: (values: AddMessageFilters) => void;
+  submitCallback?: (values: AddMessageFilters) => Promise<void>;
 }
 
 const AddEditFilterContainer: React.FC<AddEditFilterContainerProps> = ({
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
index 7d3d95ecc76..035d98c3a39 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddFilter.tsx
@@ -6,6 +6,7 @@ import SavedFilters from 'components/Topics/Topic/Messages/Filters/SavedFilters'
 import SavedIcon from 'components/common/Icons/SavedIcon';
 import QuestionIcon from 'components/common/Icons/QuestionIcon';
 import useBoolean from 'lib/hooks/useBoolean';
+import { showAlert } from 'lib/errorHandling';
 
 import AddEditFilterContainer from './AddEditFilterContainer';
 import InfoModal from './InfoModal';
@@ -43,6 +44,19 @@ const AddFilter: React.FC<FilterModalProps> = ({
 
   const onSubmit = React.useCallback(
     async (values: AddMessageFilters) => {
+      const isFilterExists = filters.some(
+        (filter) => filter.name === values.name
+      );
+
+      if (isFilterExists) {
+        showAlert('error', {
+          id: '',
+          title: 'Validation Error',
+          message: 'Filter with the same name already exists',
+        });
+        return;
+      }
+
       const data = { ...values };
       if (data.saveFilter) {
         addFilter(data);

From 98f1f6ebcd5412e8d09a4ea6f72eec4f9cdf9e4e Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Thu, 13 Apr 2023 11:14:00 +0400
Subject: [PATCH 506/734] FE: Consumers: Topic list: Implement sorting (#3621)

* improvement/consumer-topics-sort implement consumer topics sorting

* improvement/consumer-topics-sort update typings after review
---
 .../Details/TopicContents/TopicContents.tsx   | 138 +++++++++++++++++-
 1 file changed, 130 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContents.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContents.tsx
index 6637821020a..b234fb8e192 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContents.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContents.tsx
@@ -1,6 +1,6 @@
 import { Table } from 'components/common/table/Table/Table.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
-import { ConsumerGroupTopicPartition } from 'generated-sources';
+import { ConsumerGroupTopicPartition, SortOrder } from 'generated-sources';
 import React from 'react';
 
 import { ContentBox, TopicContentWrapper } from './TopicContent.styled';
@@ -9,7 +9,125 @@ interface Props {
   consumers: ConsumerGroupTopicPartition[];
 }
 
+type OrderByKey = keyof ConsumerGroupTopicPartition;
+interface Headers {
+  title: string;
+  orderBy: OrderByKey | undefined;
+}
+
+const TABLE_HEADERS_MAP: Headers[] = [
+  { title: 'Partition', orderBy: 'partition' },
+  { title: 'Consumer ID', orderBy: 'consumerId' },
+  { title: 'Host', orderBy: 'host' },
+  { title: 'Messages Behind', orderBy: 'messagesBehind' },
+  { title: 'Current Offset', orderBy: 'currentOffset' },
+  { title: 'End offset', orderBy: 'endOffset' },
+];
+
+const ipV4ToNum = (ip?: string) => {
+  if (typeof ip === 'string' && ip.length !== 0) {
+    const withoutSlash = ip.indexOf('/') !== -1 ? ip.slice(1) : ip;
+    return Number(
+      withoutSlash
+        .split('.')
+        .map((octet) => `000${octet}`.slice(-3))
+        .join('')
+    );
+  }
+  return 0;
+};
+
+type ComparatorFunction<T> = (
+  valueA: T,
+  valueB: T,
+  order: SortOrder,
+  property?: keyof T
+) => number;
+
+const numberComparator: ComparatorFunction<ConsumerGroupTopicPartition> = (
+  valueA,
+  valueB,
+  order,
+  property
+) => {
+  if (property !== undefined) {
+    return order === SortOrder.ASC
+      ? Number(valueA[property]) - Number(valueB[property])
+      : Number(valueB[property]) - Number(valueA[property]);
+  }
+  return 0;
+};
+
+const ipComparator: ComparatorFunction<ConsumerGroupTopicPartition> = (
+  valueA,
+  valueB,
+  order
+) =>
+  order === SortOrder.ASC
+    ? ipV4ToNum(valueA.host) - ipV4ToNum(valueB.host)
+    : ipV4ToNum(valueB.host) - ipV4ToNum(valueA.host);
+
+const consumerIdComparator: ComparatorFunction<ConsumerGroupTopicPartition> = (
+  valueA,
+  valueB,
+  order
+) => {
+  if (valueA.consumerId && valueB.consumerId) {
+    if (order === SortOrder.ASC) {
+      if (valueA.consumerId?.toLowerCase() > valueB.consumerId?.toLowerCase()) {
+        return 1;
+      }
+    }
+
+    if (order === SortOrder.DESC) {
+      if (valueB.consumerId?.toLowerCase() > valueA.consumerId?.toLowerCase()) {
+        return -1;
+      }
+    }
+  }
+
+  return 0;
+};
+
 const TopicContents: React.FC<Props> = ({ consumers }) => {
+  const [orderBy, setOrderBy] = React.useState<OrderByKey>('partition');
+  const [sortOrder, setSortOrder] = React.useState<SortOrder>(SortOrder.DESC);
+
+  const handleOrder = React.useCallback((columnName: string | null) => {
+    if (typeof columnName === 'string') {
+      setOrderBy(columnName as OrderByKey);
+      setSortOrder((prevOrder) =>
+        prevOrder === SortOrder.DESC ? SortOrder.ASC : SortOrder.DESC
+      );
+    }
+  }, []);
+
+  const sortedConsumers = React.useMemo(() => {
+    if (orderBy && sortOrder) {
+      const isNumberProperty =
+        orderBy === 'partition' ||
+        orderBy === 'currentOffset' ||
+        orderBy === 'endOffset' ||
+        orderBy === 'messagesBehind';
+
+      let comparator: ComparatorFunction<ConsumerGroupTopicPartition>;
+      if (isNumberProperty) {
+        comparator = numberComparator;
+      }
+
+      if (orderBy === 'host') {
+        comparator = ipComparator;
+      }
+
+      if (orderBy === 'consumerId') {
+        comparator = consumerIdComparator;
+      }
+
+      return consumers.sort((a, b) => comparator(a, b, sortOrder, orderBy));
+    }
+    return consumers;
+  }, [orderBy, sortOrder, consumers]);
+
   return (
     <TopicContentWrapper>
       <td colSpan={3}>
@@ -17,16 +135,20 @@ const TopicContents: React.FC<Props> = ({ consumers }) => {
           <Table isFullwidth>
             <thead>
               <tr>
-                <TableHeaderCell title="Partition" />
-                <TableHeaderCell title="Consumer ID" />
-                <TableHeaderCell title="Host" />
-                <TableHeaderCell title="Messages behind" />
-                <TableHeaderCell title="Current offset" />
-                <TableHeaderCell title="End offset" />
+                {TABLE_HEADERS_MAP.map((header) => (
+                  <TableHeaderCell
+                    key={header.orderBy}
+                    title={header.title}
+                    orderBy={orderBy}
+                    sortOrder={sortOrder}
+                    orderValue={header.orderBy}
+                    handleOrderBy={handleOrder}
+                  />
+                ))}
               </tr>
             </thead>
             <tbody>
-              {consumers.map((consumer) => (
+              {sortedConsumers.map((consumer) => (
                 <tr key={consumer.partition}>
                   <td>{consumer.partition}</td>
                   <td>{consumer.consumerId}</td>

From c148f112a404815d6645fa97209199eced054728 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 13 Apr 2023 15:57:40 +0800
Subject: [PATCH 507/734] FE: Fix config param source nullability (#3661)

---
 .../Topics/shared/Form/CustomParams/CustomParamField.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
index 7edbc5426dd..5ba51ad2890 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
@@ -49,7 +49,7 @@ const CustomParamField: React.FC<Props> = ({
       label: option,
       disabled:
         (config &&
-          config[option].source !== ConfigSource.DYNAMIC_TOPIC_CONFIG) ||
+          config[option]?.source !== ConfigSource.DYNAMIC_TOPIC_CONFIG) ||
         existingFields.includes(option),
     }));
 

From 696cde7dccd655e656c19c613bf54240e47ffded Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Thu, 13 Apr 2023 20:03:43 +0400
Subject: [PATCH 508/734] FE: Mark serde-failed messages with red (#3081)

* Marked serde-failed messages with red

* added styles on icon position

* added icon for the Key and Value

* changed warning icon position

* changed warning icon and data cell style

* added Ellipsis component

* refactor Ellipsis.tsx

* resolved conflicts

---------

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: Oleg Shur <workshur@gmail.com>
---
 .../Topics/Topic/Messages/Message.tsx         | 37 ++++++++-----------
 .../MessageContent/MessageContent.styled.ts   | 11 +++++-
 .../common/Ellipsis/Ellipsis.styled.ts        | 14 +++++++
 .../components/common/Ellipsis/Ellipsis.tsx   | 20 ++++++++++
 .../common/Icons/WarningRedIcon.tsx           | 32 ++++++++++++++++
 kafka-ui-react-app/src/theme/theme.ts         |  4 ++
 6 files changed, 96 insertions(+), 22 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/common/Ellipsis/Ellipsis.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/common/Ellipsis/Ellipsis.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/WarningRedIcon.tsx

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index 60f09b82933..0282cde2ea7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import styled from 'styled-components';
 import useDataSaver from 'lib/hooks/useDataSaver';
 import { TopicMessage } from 'generated-sources';
 import MessageToggleIcon from 'components/common/Icons/MessageToggleIcon';
@@ -7,22 +6,12 @@ import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
 import { JSONPath } from 'jsonpath-plus';
+import Ellipsis from 'components/common/Ellipsis/Ellipsis';
+import WarningRedIcon from 'components/common/Icons/WarningRedIcon';
 
 import MessageContent from './MessageContent/MessageContent';
 import * as S from './MessageContent/MessageContent.styled';
 
-const StyledDataCell = styled.td`
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  max-width: 350px;
-  min-width: 350px;
-`;
-
-const ClickableRow = styled.tr`
-  cursor: pointer;
-`;
-
 export interface PreviewFilter {
   field: string;
   path: string;
@@ -43,6 +32,8 @@ const Message: React.FC<Props> = ({
     partition,
     content,
     headers,
+    valueSerde,
+    keySerde,
   },
   keyFilters,
   contentFilters,
@@ -100,7 +91,7 @@ const Message: React.FC<Props> = ({
 
   return (
     <>
-      <ClickableRow
+      <S.ClickableRow
         onMouseEnter={() => setVEllipsisOpen(true)}
         onMouseLeave={() => setVEllipsisOpen(false)}
         onClick={toggleIsOpen}
@@ -115,16 +106,20 @@ const Message: React.FC<Props> = ({
         <td>
           <div>{formatTimestamp(timestamp)}</div>
         </td>
-        <StyledDataCell title={key}>
-          {renderFilteredJson(key, keyFilters)}
-        </StyledDataCell>
-        <StyledDataCell title={content}>
+        <S.DataCell title={key}>
+          <Ellipsis text={renderFilteredJson(key, keyFilters)}>
+            {keySerde === 'Fallback' && <WarningRedIcon />}
+          </Ellipsis>
+        </S.DataCell>
+        <S.DataCell title={content}>
           <S.Metadata>
             <S.MetadataValue>
-              {renderFilteredJson(content, contentFilters)}
+              <Ellipsis text={renderFilteredJson(content, contentFilters)}>
+                {valueSerde === 'Fallback' && <WarningRedIcon />}
+              </Ellipsis>
             </S.MetadataValue>
           </S.Metadata>
-        </StyledDataCell>
+        </S.DataCell>
         <td style={{ width: '5%' }}>
           {vEllipsisOpen && (
             <Dropdown>
@@ -135,7 +130,7 @@ const Message: React.FC<Props> = ({
             </Dropdown>
           )}
         </td>
-      </ClickableRow>
+      </S.ClickableRow>
       {isOpen && (
         <MessageContent
           messageKey={key}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
index 9eb5e6b0627..1d8672042b7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.styled.ts
@@ -35,7 +35,16 @@ export const ContentBox = styled.div`
     flex-grow: 1;
   }
 `;
-
+export const DataCell = styled.td`
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  max-width: 350px;
+  min-width: 350px;
+`;
+export const ClickableRow = styled.tr`
+  cursor: pointer;
+`;
 export const MetadataWrapper = styled.div`
   background-color: ${({ theme }) => theme.topicMetaData.backgroundColor};
   padding: 24px;
diff --git a/kafka-ui-react-app/src/components/common/Ellipsis/Ellipsis.styled.ts b/kafka-ui-react-app/src/components/common/Ellipsis/Ellipsis.styled.ts
new file mode 100644
index 00000000000..d301090b46c
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Ellipsis/Ellipsis.styled.ts
@@ -0,0 +1,14 @@
+import styled from 'styled-components';
+
+export const Text = styled.div`
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  max-width: 340px;
+`;
+
+export const Wrapper = styled.div`
+  display: flex;
+  gap: 8px;
+  align-items: center;
+`;
diff --git a/kafka-ui-react-app/src/components/common/Ellipsis/Ellipsis.tsx b/kafka-ui-react-app/src/components/common/Ellipsis/Ellipsis.tsx
new file mode 100644
index 00000000000..f6a690d9c60
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Ellipsis/Ellipsis.tsx
@@ -0,0 +1,20 @@
+import React, { PropsWithChildren } from 'react';
+
+import * as S from './Ellipsis.styled';
+
+type EllipsisProps = {
+  text: React.ReactNode;
+};
+
+const Ellipsis: React.FC<PropsWithChildren<EllipsisProps>> = ({
+  text,
+  children,
+}) => {
+  return (
+    <S.Wrapper>
+      <S.Text>{text}</S.Text>
+      {children}
+    </S.Wrapper>
+  );
+};
+export default Ellipsis;
diff --git a/kafka-ui-react-app/src/components/common/Icons/WarningRedIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/WarningRedIcon.tsx
new file mode 100644
index 00000000000..13231f58944
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/WarningRedIcon.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { useTheme } from 'styled-components';
+
+const WarningRedIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect
+        width="20"
+        height="20"
+        rx="10"
+        fill={theme.icons.warningRedIcon.rectFill}
+      />
+      <path
+        d="M9 4.74219H11V12.7422H9V4.74219Z"
+        fill={theme.icons.warningRedIcon.pathFill}
+      />
+      <path
+        d="M9 14.7422C9 14.1899 9.44772 13.7422 10 13.7422C10.5523 13.7422 11 14.1899 11 14.7422C11 15.2945 10.5523 15.7422 10 15.7422C9.44772 15.7422 9 15.2945 9 14.7422Z"
+        fill={theme.icons.warningRedIcon.pathFill}
+      />
+    </svg>
+  );
+};
+
+export default WarningRedIcon;
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 978b694913f..33dbf1c619e 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -173,6 +173,10 @@ const baseTheme = {
     closeIcon: Colors.neutral[30],
     deleteIcon: Colors.red[20],
     warningIcon: Colors.yellow[20],
+    warningRedIcon: {
+      rectFill: Colors.red[10],
+      pathFill: Colors.red[50],
+    },
     messageToggleIcon: {
       normal: Colors.brand[30],
       hover: Colors.brand[40],

From 39aca05fe3a754dae09289aa57a20f4bef5a9811 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Fri, 14 Apr 2023 11:22:08 +0300
Subject: [PATCH 509/734] [e2e] Clear entered queue check (#3667)

---
 .../provectus/kafka/ui/pages/BasePage.java    |  6 +-
 .../kafka/ui/pages/ksqldb/KsqlDbList.java     | 37 ++++++++-
 .../kafka/ui/pages/ksqldb/KsqlQueryForm.java  | 23 ++++--
 .../kafka/ui/utilities/WebUtils.java          |  3 +-
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 21 ++---
 .../ui/smokesuite/ksqldb/KsqlDbTest.java      | 76 +++++++++++--------
 .../ui/smokesuite/topics/MessagesTest.java    | 30 +++-----
 .../src/test/resources/regression.xml         |  2 +-
 .../src/test/resources/sanity.xml             |  2 +-
 .../src/test/resources/smoke.xml              |  2 +-
 10 files changed, 123 insertions(+), 79 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index fb2e0877e22..8bd7901a635 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -37,9 +37,13 @@ public abstract class BasePage extends WebUtils {
   protected String pageTitleFromHeader = "//h1[text()='%s']";
   protected String pagePathFromHeader = "//a[text()='%s']/../h1";
 
+  protected boolean isSpinnerVisible(int... timeoutInSeconds) {
+    return isVisible(loadingSpinner, timeoutInSeconds);
+  }
+
   protected void waitUntilSpinnerDisappear(int... timeoutInSeconds) {
     log.debug("\nwaitUntilSpinnerDisappear");
-    if (isVisible(loadingSpinner, timeoutInSeconds)) {
+    if (isSpinnerVisible(timeoutInSeconds)) {
       loadingSpinner.shouldBe(Condition.disappear, Duration.ofSeconds(60));
     }
   }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
index 7eb35d52f33..98980cef4d1 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlDbList.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.pages.ksqldb;
 
+import static com.codeborne.selenide.Condition.visible;
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
 import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
@@ -10,12 +11,12 @@
 import com.provectus.kafka.ui.pages.BasePage;
 import com.provectus.kafka.ui.pages.ksqldb.enums.KsqlMenuTabs;
 import io.qameta.allure.Step;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import org.openqa.selenium.By;
 
 public class KsqlDbList extends BasePage {
-
   protected SelenideElement executeKsqlBtn = $x("//button[text()='Execute KSQL Request']");
   protected SelenideElement tablesTab = $x("//nav[@role='navigation']/a[text()='Tables']");
   protected SelenideElement streamsTab = $x("//nav[@role='navigation']/a[text()='Streams']");
@@ -76,9 +77,24 @@ public KsqlTablesGridItem(SelenideElement element) {
       this.element = element;
     }
 
+    private SelenideElement getNameElm() {
+      return element.$x("./td[1]");
+    }
+
     @Step
     public String getTableName() {
-      return element.$x("./td[1]").getText().trim();
+      return getNameElm().getText().trim();
+    }
+
+    @Step
+    public boolean isVisible() {
+      boolean isVisible = false;
+      try {
+        getNameElm().shouldBe(visible, Duration.ofMillis(500));
+        isVisible = true;
+      } catch (Throwable ignored) {
+      }
+      return isVisible;
     }
 
     @Step
@@ -110,9 +126,24 @@ public KsqlStreamsGridItem(SelenideElement element) {
       this.element = element;
     }
 
+    private SelenideElement getNameElm() {
+      return element.$x("./td[1]");
+    }
+
     @Step
     public String getStreamName() {
-      return element.$x("./td[1]").getText().trim();
+      return getNameElm().getText().trim();
+    }
+
+    @Step
+    public boolean isVisible() {
+      boolean isVisible = false;
+      try {
+        getNameElm().shouldBe(visible, Duration.ofMillis(500));
+        isVisible = true;
+      } catch (Throwable ignored) {
+      }
+      return isVisible;
     }
 
     @Step
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
index ab24cbe9abb..4ce282b6cc5 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
@@ -40,9 +40,14 @@ public KsqlQueryForm clickClearBtn() {
   }
 
   @Step
-  public KsqlQueryForm clickExecuteBtn() {
+  public String getEnteredQuery() {
+    return queryAreaValue.getText().trim();
+  }
+
+  @Step
+  public KsqlQueryForm clickExecuteBtn(String query) {
     clickByActions(executeBtn);
-    if (queryAreaValue.getText().contains("EMIT CHANGES;")) {
+    if (query.contains("EMIT CHANGES")) {
       loadingSpinner.shouldBe(Condition.visible);
     } else {
       waitUntilSpinnerDisappear();
@@ -66,19 +71,19 @@ public KsqlQueryForm clickClearResultsBtn() {
 
   @Step
   public KsqlQueryForm clickAddStreamProperty() {
-    clickByJavaScript(addStreamPropertyBtn);
+    clickByActions(addStreamPropertyBtn);
     return this;
   }
 
   @Step
   public KsqlQueryForm setQuery(String query) {
     queryAreaValue.shouldBe(Condition.visible).click();
-    queryArea.setValue(query);
+    sendKeysByActions(queryArea, query);
     return this;
   }
 
   @Step
-  public KsqlQueryForm.KsqlResponseGridItem getTableByName(String name) {
+  public KsqlQueryForm.KsqlResponseGridItem getItemByName(String name) {
     return initItems().stream()
         .filter(e -> e.getName().equalsIgnoreCase(name))
         .findFirst().orElseThrow();
@@ -114,16 +119,20 @@ public String getType() {
       return element.$x("./td[1]").getText().trim();
     }
 
+    private SelenideElement getNameElm() {
+      return element.$x("./td[2]");
+    }
+
     @Step
     public String getName() {
-      return element.$x("./td[2]").scrollTo().getText().trim();
+      return getNameElm().scrollTo().getText().trim();
     }
 
     @Step
     public boolean isVisible() {
       boolean isVisible = false;
       try {
-        element.$x("./td[2]").shouldBe(visible, Duration.ofMillis(500));
+        getNameElm().shouldBe(visible, Duration.ofMillis(500));
         isVisible = true;
       } catch (Throwable ignored) {
       }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
index fef5ef654a0..a1b1523aa51 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/WebUtils.java
@@ -95,7 +95,7 @@ public static boolean isSelected(SelenideElement element, int... timeoutInSecond
     return isSelected;
   }
 
-  public static boolean selectElement(SelenideElement element, boolean select) {
+  public static void selectElement(SelenideElement element, boolean select) {
     if (select) {
       if (!element.isSelected()) {
         clickByJavaScript(element);
@@ -105,6 +105,5 @@ public static boolean selectElement(SelenideElement element, boolean select) {
         clickByJavaScript(element);
       }
     }
-    return true;
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index b89a1d0cf76..d96bbb7f3a2 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -20,59 +20,52 @@ public class SmokeBacklog extends BaseManualTest {
   public void testCaseA() {
   }
 
-  @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = KSQL_DB_SUITE_ID)
-  @QaseId(276)
-  @Test
-  public void testCaseB() {
-  }
-
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = KSQL_DB_SUITE_ID)
   @QaseId(277)
   @Test
-  public void testCaseC() {
+  public void testCaseB() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = KSQL_DB_SUITE_ID)
   @QaseId(278)
   @Test
-  public void testCaseD() {
+  public void testCaseC() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = KSQL_DB_SUITE_ID)
   @QaseId(284)
   @Test
-  public void testCaseE() {
+  public void testCaseD() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(331)
   @Test
-  public void testCaseF() {
+  public void testCaseE() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(332)
   @Test
-  public void testCaseG() {
+  public void testCaseF() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(335)
   @Test
-  public void testCaseH() {
+  public void testCaseG() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(336)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
index d8bda606dcd..c4bbe0def4c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
@@ -1,14 +1,17 @@
 package com.provectus.kafka.ui.smokesuite.ksqldb;
 
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_TABLES;
+import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.pages.ksqldb.models.Stream;
 import com.provectus.kafka.ui.pages.ksqldb.models.Table;
+import io.qameta.allure.Step;
 import io.qase.api.annotation.QaseId;
 import java.util.ArrayList;
 import java.util.List;
+import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -16,60 +19,71 @@
 
 public class KsqlDbTest extends BaseTest {
 
-  private static final Stream STREAM_FOR_CHECK_TABLES = new Stream()
-      .setName("STREAM_FOR_CHECK_TABLES_" + randomAlphabetic(4).toUpperCase())
-      .setTopicName("TOPIC_FOR_STREAM_" + randomAlphabetic(4).toUpperCase());
+  private static final Stream DEFAULT_STREAM = new Stream()
+      .setName("DEFAULT_STREAM_" + randomAlphabetic(4).toUpperCase())
+      .setTopicName("DEFAULT_TOPIC_" + randomAlphabetic(4).toUpperCase());
   private static final Table FIRST_TABLE = new Table()
-      .setName("FIRST_TABLE" + randomAlphabetic(4).toUpperCase())
-      .setStreamName(STREAM_FOR_CHECK_TABLES.getName());
+      .setName("FIRST_TABLE_" + randomAlphabetic(4).toUpperCase())
+      .setStreamName(DEFAULT_STREAM.getName());
   private static final Table SECOND_TABLE = new Table()
-      .setName("SECOND_TABLE" + randomAlphabetic(4).toUpperCase())
-      .setStreamName(STREAM_FOR_CHECK_TABLES.getName());
+      .setName("SECOND_TABLE_" + randomAlphabetic(4).toUpperCase())
+      .setStreamName(DEFAULT_STREAM.getName());
   private static final List<String> TOPIC_NAMES_LIST = new ArrayList<>();
 
   @BeforeClass(alwaysRun = true)
   public void beforeClass() {
     apiService
-        .createStream(STREAM_FOR_CHECK_TABLES)
+        .createStream(DEFAULT_STREAM)
         .createTables(FIRST_TABLE, SECOND_TABLE);
-    TOPIC_NAMES_LIST.addAll(List.of(STREAM_FOR_CHECK_TABLES.getTopicName(),
+    TOPIC_NAMES_LIST.addAll(List.of(DEFAULT_STREAM.getTopicName(),
         FIRST_TABLE.getName(), SECOND_TABLE.getName()));
   }
 
-  @QaseId(41)
+  @QaseId(86)
   @Test(priority = 1)
-  public void checkShowTablesRequestExecution() {
-    navigateToKsqlDb();
-    ksqlDbList
-        .clickExecuteKsqlRequestBtn();
-    ksqlQueryForm
-        .waitUntilScreenReady()
-        .setQuery(SHOW_TABLES.getQuery())
-        .clickExecuteBtn();
+  public void clearResultsForExecutedRequest() {
+    navigateToKsqlDbAndExecuteRequest(SHOW_TABLES.getQuery());
     SoftAssert softly = new SoftAssert();
     softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
-    softly.assertTrue(ksqlQueryForm.getTableByName(FIRST_TABLE.getName()).isVisible(), "getTableName()");
-    softly.assertTrue(ksqlQueryForm.getTableByName(SECOND_TABLE.getName()).isVisible(), "getTableName()");
+    softly.assertAll();
+    ksqlQueryForm
+        .clickClearResultsBtn();
+    softly.assertFalse(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
     softly.assertAll();
   }
 
-  @QaseId(86)
+  @QaseId(276)
   @Test(priority = 2)
-  public void clearResultsForExecutedRequest() {
-    navigateToKsqlDb();
-    ksqlDbList
-        .clickExecuteKsqlRequestBtn();
+  public void clearEnteredQueryCheck() {
+    navigateToKsqlDbAndExecuteRequest(SHOW_TABLES.getQuery());
+    Assert.assertFalse(ksqlQueryForm.getEnteredQuery().isEmpty(), "getEnteredQuery()");
     ksqlQueryForm
-        .waitUntilScreenReady()
-        .setQuery(SHOW_TABLES.getQuery())
-        .clickExecuteBtn();
+        .clickClearBtn();
+    Assert.assertTrue(ksqlQueryForm.getEnteredQuery().isEmpty(), "getEnteredQuery()");
+  }
+
+  @QaseId(41)
+  @Test(priority = 3)
+  public void checkShowTablesRequestExecution() {
+    navigateToKsqlDbAndExecuteRequest(SHOW_TABLES.getQuery());
     SoftAssert softly = new SoftAssert();
     softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
+    softly.assertTrue(ksqlQueryForm.getItemByName(FIRST_TABLE.getName()).isVisible(), "getItemByName()");
+    softly.assertTrue(ksqlQueryForm.getItemByName(SECOND_TABLE.getName()).isVisible(), "getItemByName()");
     softly.assertAll();
+  }
+
+  @Step
+  private void navigateToKsqlDbAndExecuteRequest(String query) {
+    naviSideBar
+        .openSideMenu(KSQL_DB);
+    ksqlDbList
+        .waitUntilScreenReady()
+        .clickExecuteKsqlRequestBtn();
     ksqlQueryForm
-        .clickClearResultsBtn();
-    softly.assertFalse(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
-    softly.assertAll();
+        .waitUntilScreenReady()
+        .setQuery(query)
+        .clickExecuteBtn(query);
   }
 
   @AfterClass(alwaysRun = true)
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java
index 3bbc7e7cd3d..508a3b95be8 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/MessagesTest.java
@@ -8,7 +8,6 @@
 
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.pages.topics.TopicDetails;
 import io.qameta.allure.Issue;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.QaseId;
@@ -140,24 +139,22 @@ public void checkPurgeMessagePossibility() {
     softly.assertAll();
   }
 
-  @Ignore
-  @Issue("https://github.com/provectus/kafka-ui/issues/2394")
   @QaseId(15)
   @Test(priority = 6)
   public void checkMessageFilteringByOffset() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-    topicDetails
-        .openDetailsTab(MESSAGES);
-    TopicDetails.MessageGridItem secondMessage = topicDetails.getMessageByOffset(1);
+    int nextOffset = topicDetails
+        .openDetailsTab(MESSAGES)
+        .getAllMessages().stream()
+        .findFirst().orElseThrow().getOffset() + 1;
     topicDetails
         .selectSeekTypeDdlMessagesTab("Offset")
-        .setSeekTypeValueFldMessagesTab(String.valueOf(secondMessage.getOffset()))
+        .setSeekTypeValueFldMessagesTab(String.valueOf(nextOffset))
         .clickSubmitFiltersBtnMessagesTab();
     SoftAssert softly = new SoftAssert();
     topicDetails.getAllMessages().forEach(message ->
-        softly.assertTrue(message.getOffset() == secondMessage.getOffset()
-                || message.getOffset() > secondMessage.getOffset(),
-            String.format("Expected offset is: %s, but found: %s", secondMessage.getOffset(), message.getOffset())));
+        softly.assertTrue(message.getOffset() >= nextOffset,
+            String.format("Expected offset not less: %s, but found: %s", nextOffset, message.getOffset())));
     softly.assertAll();
   }
 
@@ -168,13 +165,11 @@ public void checkMessageFilteringByOffset() {
   @Test(priority = 7)
   public void checkMessageFilteringByTimestamp() {
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
-    topicDetails
-        .openDetailsTab(MESSAGES);
-    LocalDateTime firstTimestamp = topicDetails.getMessageByOffset(0).getTimestamp();
-    List<TopicDetails.MessageGridItem> nextMessages = topicDetails.getAllMessages().stream()
+    LocalDateTime firstTimestamp = topicDetails
+        .openDetailsTab(MESSAGES)
+        .getMessageByOffset(0).getTimestamp();
+    LocalDateTime nextTimestamp = topicDetails.getAllMessages().stream()
         .filter(message -> message.getTimestamp().getMinute() != firstTimestamp.getMinute())
-        .toList();
-    LocalDateTime nextTimestamp = nextMessages.stream()
         .findFirst().orElseThrow().getTimestamp();
     topicDetails
         .selectSeekTypeDdlMessagesTab("Timestamp")
@@ -183,8 +178,7 @@ public void checkMessageFilteringByTimestamp() {
         .clickSubmitFiltersBtnMessagesTab();
     SoftAssert softly = new SoftAssert();
     topicDetails.getAllMessages().forEach(message ->
-        softly.assertTrue(message.getTimestamp().isEqual(nextTimestamp)
-                || message.getTimestamp().isAfter(nextTimestamp),
+        softly.assertFalse(message.getTimestamp().isBefore(nextTimestamp),
             String.format("Expected that %s is not before %s.", message.getTimestamp(), nextTimestamp)));
     softly.assertAll();
   }
diff --git a/kafka-ui-e2e-checks/src/test/resources/regression.xml b/kafka-ui-e2e-checks/src/test/resources/regression.xml
index fe102bae3e3..c6461ea14ca 100644
--- a/kafka-ui-e2e-checks/src/test/resources/regression.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/regression.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
 <suite name="RegressionSuite">
-    <test name="RegressionTest" enabled="true" parallel="classes" thread-count="3">
+    <test name="RegressionTest" enabled="true" parallel="classes" thread-count="2">
         <packages>
             <package name="com.provectus.kafka.ui.smokesuite.*"/>
             <package name="com.provectus.kafka.ui.sanitysuite.*"/>
diff --git a/kafka-ui-e2e-checks/src/test/resources/sanity.xml b/kafka-ui-e2e-checks/src/test/resources/sanity.xml
index c6b9b060249..bb67922402c 100644
--- a/kafka-ui-e2e-checks/src/test/resources/sanity.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/sanity.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
 <suite name="SanitySuite">
-    <test name="SanityTest" enabled="true" parallel="classes" thread-count="3">
+    <test name="SanityTest" enabled="true" parallel="classes" thread-count="2">
         <packages>
             <package name="com.provectus.kafka.ui.sanitysuite.*"/>
         </packages>
diff --git a/kafka-ui-e2e-checks/src/test/resources/smoke.xml b/kafka-ui-e2e-checks/src/test/resources/smoke.xml
index ab2929ff340..db93607727f 100644
--- a/kafka-ui-e2e-checks/src/test/resources/smoke.xml
+++ b/kafka-ui-e2e-checks/src/test/resources/smoke.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
 <suite name="SmokeSuite">
-    <test name="SmokeTest" enabled="true" parallel="classes" thread-count="3">
+    <test name="SmokeTest" enabled="true" parallel="classes" thread-count="2">
         <packages>
             <package name="com.provectus.kafka.ui.smokesuite.*"/>
         </packages>

From 0f5a9d7a630129c5b03a3993c24132eeb484c1f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ce=C5=A1ek?=
 <michal-cesek@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:43:03 +0700
Subject: [PATCH 510/734] FE: KSQL: Implement sorting (#3433)

* Resolves #3171 - enable ksql tables, streams sorting

* enable ksql tables, streams sorting
- make memoized onSortingChange, onPaginationChange depend on location

* fix linting

* edit Table.tsx imports

* fix linting

---------

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/components/KsqlDb/TableView.tsx     | 2 +-
 .../src/components/common/NewTable/Table.tsx               | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/TableView.tsx b/kafka-ui-react-app/src/components/KsqlDb/TableView.tsx
index d27e4968b7f..538345954da 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/TableView.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/TableView.tsx
@@ -31,7 +31,7 @@ const TableView: React.FC<TableViewProps> = ({ fetching, rows }) => {
       data={rows || []}
       columns={columns}
       emptyMessage={fetching ? 'Loading...' : 'No rows found'}
-      enableSorting={false}
+      enableSorting
     />
   );
 };
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index 55652df082d..da1f2c090a4 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -14,7 +14,7 @@ import type {
   PaginationState,
   ColumnDef,
 } from '@tanstack/react-table';
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams, useLocation } from 'react-router-dom';
 import { PER_PAGE } from 'lib/constants';
 import { Button } from 'components/common/Button/Button';
 import Input from 'components/common/Input/Input';
@@ -129,6 +129,7 @@ const Table: React.FC<TableProps<any>> = ({
   onRowClick,
 }) => {
   const [searchParams, setSearchParams] = useSearchParams();
+  const location = useLocation();
   const [rowSelection, setRowSelection] = React.useState({});
   const onSortingChange = React.useCallback(
     (updater: UpdaterFn<SortingState>) => {
@@ -136,7 +137,7 @@ const Table: React.FC<TableProps<any>> = ({
       setSearchParams(searchParams);
       return newState;
     },
-    [searchParams]
+    [searchParams, location]
   );
   const onPaginationChange = React.useCallback(
     (updater: UpdaterFn<PaginationState>) => {
@@ -145,7 +146,7 @@ const Table: React.FC<TableProps<any>> = ({
       setRowSelection({});
       return newState;
     },
-    [searchParams]
+    [searchParams, location]
   );
 
   const table = useReactTable({

From a640a52fe6775e376cdf9a2f6788a6cd6b894bd4 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 14 Apr 2023 17:19:03 +0800
Subject: [PATCH 511/734] Infra: disable creating non-templated issues

+  add useful links along with issue templates
---
 .github/ISSUE_TEMPLATE/config.yml  | 11 +++++++++++
 .github/ISSUE_TEMPLATE/question.md | 16 ----------------
 2 files changed, 11 insertions(+), 16 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/question.md

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..368461c6443
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Official documentation
+    url: https://docs.kafka-ui.provectus.io/
+    about: Before reaching out for support, please refer to our documentation. Read "FAQ" and "Common problems", also try using search there.
+  - name: Community Discord
+    url: https://discord.gg/4DWzD7pGE5
+    about: Chat with other users, get some support or ask questions.
+  - name: GitHub Discussions
+    url: https://github.com/provectus/kafka-ui/discussions
+    about: An alternative place to ask questions or to get some support.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 166f56e6601..00000000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: "❓ Question"
-about: Ask a question
-title: ''
-
----
-
-<!--
-
-To ask a question, please either:
-1. Open up a discussion (https://github.com/provectus/kafka-ui/discussions)
-2. Join us on discord (https://discord.gg/4DWzD7pGE5) and ask there.
-
-Don't forget to check/search for existing issues/discussions.
-
--->

From 96a577a98c6069376c5d22ed49cffd3739f1bbdc Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 14 Apr 2023 13:46:49 +0400
Subject: [PATCH 512/734] Update security policy

---
 SECURITY.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 7e2343711a9..af7890e9e76 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,8 +6,9 @@ Following versions of the project are currently being supported with security up
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.5.x   | :white_check_mark: |
-| 0.4.x   | :x: |
+| 0.6.x   | :white_check_mark: |
+| 0.5.x   | :x:                |
+| 0.4.x   | :x:                |
 | 0.3.x   | :x:                |
 | 0.2.x   | :x:                |
 | 0.1.x   | :x:                |

From 40c198f0fc504923449260af2d9a5c78bb825160 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 14 Apr 2023 14:39:17 +0400
Subject: [PATCH 513/734] Config wizard BE: Add remaining cluster properties to
 wizard API (#3523)

* Important @Value annotated properties moved to typed classes
---------

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../kafka/ui/config/ClustersProperties.java   |  2 ++
 .../com/provectus/kafka/ui/config/Config.java | 12 +------
 .../kafka/ui/config/WebclientProperties.java  | 33 +++++++++++++++++++
 .../ui/service/AdminClientServiceImpl.java    | 19 ++++++-----
 .../kafka/ui/service/KafkaClusterFactory.java | 21 +++++++-----
 .../ui/util/DynamicConfigOperations.java      |  6 ++++
 .../main/resources/swagger/kafka-ui-api.yaml  | 10 ++++++
 7 files changed, 76 insertions(+), 27 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/WebclientProperties.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 15436c1cd8b..24b60b57116 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -27,6 +27,8 @@ public class ClustersProperties {
 
   String internalTopicPrefix;
 
+  Integer adminClientTimeout;
+
   PollingProperties polling = new PollingProperties();
 
   @Data
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/Config.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/Config.java
index 37495b50291..2ad0538c0ec 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/Config.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/Config.java
@@ -5,7 +5,6 @@
 import lombok.AllArgsConstructor;
 import org.openapitools.jackson.nullable.JsonNullableModule;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties;
 import org.springframework.context.ApplicationContext;
@@ -15,8 +14,6 @@
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.jmx.export.MBeanExporter;
 import org.springframework.util.StringUtils;
-import org.springframework.util.unit.DataSize;
-import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
 
 @Configuration
@@ -52,14 +49,7 @@ public MBeanExporter exporter() {
   }
 
   @Bean
-  public WebClient webClient(
-      @Value("${webclient.max-in-memory-buffer-size:20MB}") DataSize maxBuffSize) {
-    return WebClient.builder()
-        .codecs(c -> c.defaultCodecs().maxInMemorySize((int) maxBuffSize.toBytes()))
-        .build();
-  }
-
-  @Bean
+  // will be used by webflux json mapping
   public JsonNullableModule jsonNullableModule() {
     return new JsonNullableModule();
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/WebclientProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/WebclientProperties.java
new file mode 100644
index 00000000000..ad7732612d4
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/WebclientProperties.java
@@ -0,0 +1,33 @@
+package com.provectus.kafka.ui.config;
+
+import com.provectus.kafka.ui.exception.ValidationException;
+import java.beans.Transient;
+import javax.annotation.PostConstruct;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.unit.DataSize;
+
+@Configuration
+@ConfigurationProperties("webclient")
+@Data
+public class WebclientProperties {
+
+  String maxInMemoryBufferSize;
+
+  @PostConstruct
+  public void validate() {
+    validateAndSetDefaultBufferSize();
+  }
+
+  private void validateAndSetDefaultBufferSize() {
+    if (maxInMemoryBufferSize != null) {
+      try {
+        DataSize.parse(maxInMemoryBufferSize);
+      } catch (Exception e) {
+        throw new ValidationException("Invalid format for webclient.maxInMemoryBufferSize");
+      }
+    }
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
index 886b67b9282..1bd4d7e33e8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/AdminClientServiceImpl.java
@@ -1,33 +1,36 @@
 package com.provectus.kafka.ui.service;
 
+import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.util.SslPropertiesUtil;
 import java.io.Closeable;
 import java.time.Instant;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.AdminClient;
 import org.apache.kafka.clients.admin.AdminClientConfig;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
 @Service
-@RequiredArgsConstructor
 @Slf4j
 public class AdminClientServiceImpl implements AdminClientService, Closeable {
 
+  private static final int DEFAULT_CLIENT_TIMEOUT_MS = 30_000;
+
   private static final AtomicLong CLIENT_ID_SEQ = new AtomicLong();
 
   private final Map<String, ReactiveAdminClient> adminClientCache = new ConcurrentHashMap<>();
-  @Setter // used in tests
-  @Value("${kafka.admin-client-timeout:30000}")
-  private int clientTimeout;
+  private final int clientTimeout;
+
+  public AdminClientServiceImpl(ClustersProperties clustersProperties) {
+    this.clientTimeout = Optional.ofNullable(clustersProperties.getAdminClientTimeout())
+        .orElse(DEFAULT_CLIENT_TIMEOUT_MS);
+  }
 
   @Override
   public Mono<ReactiveAdminClient> get(KafkaCluster cluster) {
@@ -42,7 +45,7 @@ private Mono<ReactiveAdminClient> createAdminClient(KafkaCluster cluster) {
       SslPropertiesUtil.addKafkaSslProperties(cluster.getOriginalProperties().getSsl(), properties);
       properties.putAll(cluster.getProperties());
       properties.put(AdminClientConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
-      properties.put(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, clientTimeout);
+      properties.putIfAbsent(AdminClientConfig.REQUEST_TIMEOUT_MS_CONFIG, clientTimeout);
       properties.putIfAbsent(
           AdminClientConfig.CLIENT_ID_CONFIG,
           "kafka-ui-admin-" + Instant.now().getEpochSecond() + "-" + CLIENT_ID_SEQ.incrementAndGet()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
index 357a548a637..964b25473d3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaClusterFactory.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.client.RetryingKafkaConnectClient;
 import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.config.WebclientProperties;
 import com.provectus.kafka.ui.connect.api.KafkaConnectClientApi;
 import com.provectus.kafka.ui.emitter.PollingSettings;
 import com.provectus.kafka.ui.model.ApplicationPropertyValidationDTO;
@@ -22,9 +23,7 @@
 import java.util.Properties;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.unit.DataSize;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -34,12 +33,18 @@
 import reactor.util.function.Tuples;
 
 @Service
-@RequiredArgsConstructor
 @Slf4j
 public class KafkaClusterFactory {
 
-  @Value("${webclient.max-in-memory-buffer-size:20MB}")
-  private DataSize maxBuffSize;
+  private static final DataSize DEFAULT_WEBCLIENT_BUFFER = DataSize.parse("20MB");
+
+  private final DataSize webClientMaxBuffSize;
+
+  public KafkaClusterFactory(WebclientProperties webclientProperties) {
+    this.webClientMaxBuffSize = Optional.ofNullable(webclientProperties.getMaxInMemoryBufferSize())
+        .map(DataSize::parse)
+        .orElse(DEFAULT_WEBCLIENT_BUFFER);
+  }
 
   public KafkaCluster create(ClustersProperties properties,
                              ClustersProperties.Cluster clusterProperties) {
@@ -140,7 +145,7 @@ private ReactiveFailover<KafkaConnectClientApi> connectClient(ClustersProperties
         url -> new RetryingKafkaConnectClient(
             connectCluster.toBuilder().address(url).build(),
             cluster.getSsl(),
-            maxBuffSize
+            webClientMaxBuffSize
         ),
         ReactiveFailover.CONNECTION_REFUSED_EXCEPTION_FILTER,
         "No alive connect instances available",
@@ -158,7 +163,7 @@ private ReactiveFailover<KafkaSrClientApi> schemaRegistryClient(ClustersProperti
     WebClient webClient = new WebClientConfigurator()
         .configureSsl(clusterProperties.getSsl(), clusterProperties.getSchemaRegistrySsl())
         .configureBasicAuth(auth.getUsername(), auth.getPassword())
-        .configureBufferSize(maxBuffSize)
+        .configureBufferSize(webClientMaxBuffSize)
         .build();
     return ReactiveFailover.create(
         parseUrlList(clusterProperties.getSchemaRegistry()),
@@ -181,7 +186,7 @@ private ReactiveFailover<KsqlApiClient> ksqlClient(ClustersProperties.Cluster cl
             clusterProperties.getKsqldbServerAuth(),
             clusterProperties.getSsl(),
             clusterProperties.getKsqldbServerSsl(),
-            maxBuffSize
+            webClientMaxBuffSize
         ),
         ReactiveFailover.CONNECTION_REFUSED_EXCEPTION_FILTER,
         "No live ksqldb instances available",
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
index 2e1b32d3f1b..75c6d25f959 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
@@ -2,6 +2,7 @@
 
 
 import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.config.WebclientProperties;
 import com.provectus.kafka.ui.config.auth.OAuthProperties;
 import com.provectus.kafka.ui.config.auth.RoleBasedAccessControlProperties;
 import com.provectus.kafka.ui.exception.FileUploadException;
@@ -97,6 +98,7 @@ public PropertiesStructure getCurrentProperties() {
                 .type(ctx.getEnvironment().getProperty("auth.type"))
                 .oauth2(getNullableBean(OAuthProperties.class))
                 .build())
+        .webclient(getNullableBean(WebclientProperties.class))
         .build();
   }
 
@@ -204,6 +206,7 @@ public static class PropertiesStructure {
     private ClustersProperties kafka;
     private RoleBasedAccessControlProperties rbac;
     private Auth auth;
+    private WebclientProperties webclient;
 
     @Data
     @Builder
@@ -222,6 +225,9 @@ public void initAndValidate() {
       Optional.ofNullable(auth)
           .flatMap(a -> Optional.ofNullable(a.oauth2))
           .ifPresent(OAuthProperties::validate);
+
+      Optional.ofNullable(webclient)
+          .ifPresent(WebclientProperties::validate);
     }
   }
 
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 7b6fd3c1131..aef72444662 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -3467,6 +3467,12 @@ components:
                               type: array
                               items:
                                 $ref: '#/components/schemas/Action'
+            webclient:
+              type: object
+              properties:
+                maxInMemoryBufferSize:
+                  type: string
+                  description: "examples: 20, 12KB, 5MB"
             kafka:
               type: object
               properties:
@@ -3479,6 +3485,10 @@ components:
                       type: integer
                     noDataEmptyPolls:
                       type: integer
+                adminClientTimeout:
+                  type: integer
+                internalTopicPrefix:
+                  type: string
                 clusters:
                   type: array
                   items:

From 814035e2543fc2620ff8e28fd9001210696b79da Mon Sep 17 00:00:00 2001
From: a1tair6 <sweetyfam6@gmail.com>
Date: Mon, 17 Apr 2023 19:57:37 +0900
Subject: [PATCH 514/734] FE: RBAC: Fix missing permissions for topic
 recreation (#3457)

* fix missing permission for recreate topic

Co-authored-by: jay-choe <jay0764@naver.com>
Co-authored-by: p-eye <peyed3@gmail.com>

* fix unnecessary permission

* add disable attribute, ActionDropdownItem

* remove dropdownitem lib

* fix eslint by #3080

---------

Co-authored-by: jay-choe <jay0764@naver.com>
Co-authored-by: p-eye <peyed3@gmail.com>
---
 .../src/components/Topics/List/ActionsCell.tsx   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
index 2f6fe3f49af..cdd669567fe 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
@@ -4,11 +4,7 @@ import { CellContext } from '@tanstack/react-table';
 import ClusterContext from 'components/contexts/ClusterContext';
 import { ClusterNameRoute } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
-import {
-  Dropdown,
-  DropdownItem,
-  DropdownItemHint,
-} from 'components/common/Dropdown';
+import { Dropdown, DropdownItemHint } from 'components/common/Dropdown';
 import {
   useDeleteTopic,
   useClearTopicMessages,
@@ -55,7 +51,8 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
           with DELETE policy
         </DropdownItemHint>
       </ActionDropdownItem>
-      <DropdownItem
+      <ActionDropdownItem
+        disabled={!isTopicDeletionAllowed}
         onClick={recreateTopic.mutateAsync}
         confirm={
           <>
@@ -63,9 +60,14 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
           </>
         }
         danger
+        permission={{
+          resource: ResourceType.TOPIC,
+          action: [Action.VIEW, Action.CREATE, Action.DELETE],
+          value: name,
+        }}
       >
         Recreate Topic
-      </DropdownItem>
+      </ActionDropdownItem>
       <ActionDropdownItem
         disabled={!isTopicDeletionAllowed}
         onClick={() => deleteTopic.mutateAsync(name)}

From 838fb604d569dae18a1a7a85ef28ed2c125df986 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 17 Apr 2023 19:28:49 +0800
Subject: [PATCH 515/734] Helm: Bump version to 0.6.2

Co-authored-by: github-actions <github-actions@github.com>
---
 charts/kafka-ui/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 9f098c1d92a..9337f597748 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.6.1
-appVersion: v0.6.1
+version: 0.6.2
+appVersion: v0.6.2
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

From 47c8f8eeb55316822c2d06aad0cc6188b5c1900b Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 19 Apr 2023 12:57:26 +0400
Subject: [PATCH 516/734] BE: Fix protobuf map support (#3683)

* ISSUE-3674: Setting untyped object schema for "map" protobuf fields

* com.provectus.kafka.ui.util.jsonschema classes visibility refactoring

* kafka-ui-serdes.yaml changes rolled back

---------

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 documentation/compose/proto/values.proto      |   2 +
 .../ui/util/jsonschema/AnyFieldSchema.java    |   4 +-
 .../ui/util/jsonschema/ArrayFieldSchema.java  |   4 +-
 .../ui/util/jsonschema/EnumJsonType.java      |   4 +-
 .../kafka/ui/util/jsonschema/FieldSchema.java |   2 +-
 .../kafka/ui/util/jsonschema/JsonType.java    |   8 +-
 .../ui/util/jsonschema/MapFieldSchema.java    |  14 ++-
 .../ui/util/jsonschema/ObjectFieldSchema.java |  10 +-
 .../ui/util/jsonschema/OneOfFieldSchema.java  |   5 +-
 .../jsonschema/ProtobufSchemaConverter.java   | 101 ++++++++----------
 .../ui/util/jsonschema/RefFieldSchema.java    |   6 +-
 .../ui/util/jsonschema/SimpleFieldSchema.java |   4 +-
 .../ui/util/jsonschema/SimpleJsonType.java    |   6 +-
 .../ProtobufSchemaConverterTest.java          |   8 +-
 14 files changed, 86 insertions(+), 92 deletions(-)

diff --git a/documentation/compose/proto/values.proto b/documentation/compose/proto/values.proto
index fbdd994761b..fff8d9bbd96 100644
--- a/documentation/compose/proto/values.proto
+++ b/documentation/compose/proto/values.proto
@@ -9,4 +9,6 @@ message MySpecificTopicValue {
 message MyValue {
   int32 version = 1;
   string payload = 2;
+  map<int32, string> intToStringMap = 3;
+  map<string, MyValue> strToObjMap  = 4;
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AnyFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AnyFieldSchema.java
index 6352f04a947..333a6bd633a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AnyFieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AnyFieldSchema.java
@@ -4,9 +4,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 // Specifies field that can contain any kind of value - primitive, complex and nulls
-public class AnyFieldSchema implements FieldSchema {
+class AnyFieldSchema implements FieldSchema {
 
-  public static AnyFieldSchema get() {
+  static AnyFieldSchema get() {
     return new AnyFieldSchema();
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ArrayFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ArrayFieldSchema.java
index c5cefe94c91..b20d09550c3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ArrayFieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ArrayFieldSchema.java
@@ -4,10 +4,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-public class ArrayFieldSchema implements FieldSchema {
+class ArrayFieldSchema implements FieldSchema {
   private final FieldSchema itemsSchema;
 
-  public ArrayFieldSchema(FieldSchema itemsSchema) {
+  ArrayFieldSchema(FieldSchema itemsSchema) {
     this.itemsSchema = itemsSchema;
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/EnumJsonType.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/EnumJsonType.java
index 715f7d5f442..a43d45cd84d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/EnumJsonType.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/EnumJsonType.java
@@ -7,10 +7,10 @@
 import java.util.Map;
 
 
-public class EnumJsonType extends JsonType {
+class EnumJsonType extends JsonType {
   private final List<String> values;
 
-  public EnumJsonType(List<String> values) {
+  EnumJsonType(List<String> values) {
     super(Type.ENUM);
     this.values = values;
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/FieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/FieldSchema.java
index 19166bf3106..c8ad7e953b2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/FieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/FieldSchema.java
@@ -3,6 +3,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public interface FieldSchema {
+interface FieldSchema {
   JsonNode toJsonNode(ObjectMapper mapper);
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonType.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonType.java
index 79d73c6813d..392a2260c30 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonType.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonType.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Map;
 
-public abstract class JsonType {
+abstract class JsonType {
 
   protected final Type type;
 
@@ -12,13 +12,13 @@ protected JsonType(Type type) {
     this.type = type;
   }
 
-  public Type getType() {
+  Type getType() {
     return type;
   }
 
-  public abstract Map<String, JsonNode> toJsonNode(ObjectMapper mapper);
+  abstract Map<String, JsonNode> toJsonNode(ObjectMapper mapper);
 
-  public enum Type {
+  enum Type {
     NULL,
     BOOLEAN,
     OBJECT,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/MapFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/MapFieldSchema.java
index c7c52acbaba..6b2422ef7da 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/MapFieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/MapFieldSchema.java
@@ -2,21 +2,27 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.BooleanNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
+import javax.annotation.Nullable;
 
-public class MapFieldSchema implements FieldSchema {
-  private final FieldSchema itemSchema;
+class MapFieldSchema implements FieldSchema {
+  private final @Nullable FieldSchema itemSchema;
 
-  public MapFieldSchema(FieldSchema itemSchema) {
+  MapFieldSchema(@Nullable FieldSchema itemSchema) {
     this.itemSchema = itemSchema;
   }
 
+  MapFieldSchema() {
+    this(null);
+  }
+
   @Override
   public JsonNode toJsonNode(ObjectMapper mapper) {
     final ObjectNode objectNode = mapper.createObjectNode();
     objectNode.set("type", new TextNode(JsonType.Type.OBJECT.getName()));
-    objectNode.set("additionalProperties", itemSchema.toJsonNode(mapper));
+    objectNode.set("additionalProperties", itemSchema != null ? itemSchema.toJsonNode(mapper) : BooleanNode.TRUE);
     return objectNode;
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ObjectFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ObjectFieldSchema.java
index 589fe10533a..21d3402288a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ObjectFieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ObjectFieldSchema.java
@@ -9,24 +9,24 @@
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
-public class ObjectFieldSchema implements FieldSchema {
+class ObjectFieldSchema implements FieldSchema {
 
-  public static final ObjectFieldSchema EMPTY = new ObjectFieldSchema(Map.of(), List.of());
+  static final ObjectFieldSchema EMPTY = new ObjectFieldSchema(Map.of(), List.of());
 
   private final Map<String, FieldSchema> properties;
   private final List<String> required;
 
-  public ObjectFieldSchema(Map<String, FieldSchema> properties,
+  ObjectFieldSchema(Map<String, FieldSchema> properties,
                            List<String> required) {
     this.properties = properties;
     this.required = required;
   }
 
-  public Map<String, FieldSchema> getProperties() {
+  Map<String, FieldSchema> getProperties() {
     return properties;
   }
 
-  public List<String> getRequired() {
+  List<String> getRequired() {
     return required;
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/OneOfFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/OneOfFieldSchema.java
index cec8282b70a..3f0b11373e8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/OneOfFieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/OneOfFieldSchema.java
@@ -5,11 +5,10 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class OneOfFieldSchema implements FieldSchema {
+class OneOfFieldSchema implements FieldSchema {
   private final List<FieldSchema> schemaList;
 
-  public OneOfFieldSchema(
-      List<FieldSchema> schemaList) {
+  OneOfFieldSchema(List<FieldSchema> schemaList) {
     this.schemaList = schemaList;
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java
index 219039b31ed..86ea8fcf0e6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java
@@ -94,6 +94,9 @@ private FieldSchema convertField(Descriptors.FieldDescriptor field,
     if (wellKnownTypeSchema.isPresent()) {
       return wellKnownTypeSchema.get();
     }
+    if (field.isMapField()) {
+      return new MapFieldSchema();
+    }
     final JsonType jsonType = convertType(field);
     FieldSchema fieldSchema;
     if (jsonType.getType().equals(JsonType.Type.OBJECT)) {
@@ -149,67 +152,47 @@ private Optional<FieldSchema> convertProtoWellKnownTypes(Descriptors.FieldDescri
   }
 
   private JsonType convertType(Descriptors.FieldDescriptor field) {
-    switch (field.getType()) {
-      case INT32:
-      case FIXED32:
-      case SFIXED32:
-      case SINT32:
-        return new SimpleJsonType(
-            JsonType.Type.INTEGER,
-            Map.of(
-                "maximum", IntNode.valueOf(Integer.MAX_VALUE),
-                "minimum", IntNode.valueOf(Integer.MIN_VALUE)
-            )
-        );
-      case UINT32:
-        return new SimpleJsonType(
-            JsonType.Type.INTEGER,
-            Map.of(
-                "maximum", LongNode.valueOf(UnsignedInteger.MAX_VALUE.longValue()),
-                "minimum", IntNode.valueOf(0)
-            )
-        );
+    return switch (field.getType()) {
+      case INT32, FIXED32, SFIXED32, SINT32 -> new SimpleJsonType(
+          JsonType.Type.INTEGER,
+          Map.of(
+              "maximum", IntNode.valueOf(Integer.MAX_VALUE),
+              "minimum", IntNode.valueOf(Integer.MIN_VALUE)
+          )
+      );
+      case UINT32 -> new SimpleJsonType(
+          JsonType.Type.INTEGER,
+          Map.of(
+              "maximum", LongNode.valueOf(UnsignedInteger.MAX_VALUE.longValue()),
+              "minimum", IntNode.valueOf(0)
+          )
+      );
       //TODO: actually all *64 types will be printed with quotes (as strings),
       // see JsonFormat::printSingleFieldValue for impl. This can cause problems when you copy-paste from messages
       // table to `Produce` area - need to think if it is critical or not.
-      case INT64:
-      case FIXED64:
-      case SFIXED64:
-      case SINT64:
-        return new SimpleJsonType(
-            JsonType.Type.INTEGER,
-            Map.of(
-                "maximum", LongNode.valueOf(Long.MAX_VALUE),
-                "minimum", LongNode.valueOf(Long.MIN_VALUE)
-            )
-        );
-      case UINT64:
-        return new SimpleJsonType(
-            JsonType.Type.INTEGER,
-            Map.of(
-                "maximum", new BigIntegerNode(UnsignedLong.MAX_VALUE.bigIntegerValue()),
-                "minimum", LongNode.valueOf(0)
-            )
-        );
-      case MESSAGE:
-      case GROUP:
-        return new SimpleJsonType(JsonType.Type.OBJECT);
-      case ENUM:
-        return new EnumJsonType(
-            field.getEnumType().getValues().stream()
-                .map(Descriptors.EnumValueDescriptor::getName)
-                .collect(Collectors.toList())
-        );
-      case BYTES:
-      case STRING:
-        return new SimpleJsonType(JsonType.Type.STRING);
-      case FLOAT:
-      case DOUBLE:
-        return new SimpleJsonType(JsonType.Type.NUMBER);
-      case BOOL:
-        return new SimpleJsonType(JsonType.Type.BOOLEAN);
-      default:
-        return new SimpleJsonType(JsonType.Type.STRING);
-    }
+      case INT64, FIXED64, SFIXED64, SINT64 -> new SimpleJsonType(
+          JsonType.Type.INTEGER,
+          Map.of(
+              "maximum", LongNode.valueOf(Long.MAX_VALUE),
+              "minimum", LongNode.valueOf(Long.MIN_VALUE)
+          )
+      );
+      case UINT64 -> new SimpleJsonType(
+          JsonType.Type.INTEGER,
+          Map.of(
+              "maximum", new BigIntegerNode(UnsignedLong.MAX_VALUE.bigIntegerValue()),
+              "minimum", LongNode.valueOf(0)
+          )
+      );
+      case MESSAGE, GROUP -> new SimpleJsonType(JsonType.Type.OBJECT);
+      case ENUM -> new EnumJsonType(
+          field.getEnumType().getValues().stream()
+              .map(Descriptors.EnumValueDescriptor::getName)
+              .collect(Collectors.toList())
+      );
+      case BYTES, STRING -> new SimpleJsonType(JsonType.Type.STRING);
+      case FLOAT, DOUBLE -> new SimpleJsonType(JsonType.Type.NUMBER);
+      case BOOL -> new SimpleJsonType(JsonType.Type.BOOLEAN);
+    };
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/RefFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/RefFieldSchema.java
index fa122f0f7e0..ca8e50a0878 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/RefFieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/RefFieldSchema.java
@@ -4,10 +4,10 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.TextNode;
 
-public class RefFieldSchema implements FieldSchema {
+class RefFieldSchema implements FieldSchema {
   private final String ref;
 
-  public RefFieldSchema(String ref) {
+  RefFieldSchema(String ref) {
     this.ref = ref;
   }
 
@@ -16,7 +16,7 @@ public JsonNode toJsonNode(ObjectMapper mapper) {
     return mapper.createObjectNode().set("$ref", new TextNode(ref));
   }
 
-  public String getRef() {
+  String getRef() {
     return ref;
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleFieldSchema.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleFieldSchema.java
index 158cceb6bfe..339ab4cc863 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleFieldSchema.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleFieldSchema.java
@@ -3,10 +3,10 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class SimpleFieldSchema implements FieldSchema {
+class SimpleFieldSchema implements FieldSchema {
   private final JsonType type;
 
-  public SimpleFieldSchema(JsonType type) {
+  SimpleFieldSchema(JsonType type) {
     this.type = type;
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleJsonType.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleJsonType.java
index 56ab56b48c2..b46d3407e3b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleJsonType.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/SimpleJsonType.java
@@ -6,15 +6,15 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 
-public class SimpleJsonType extends JsonType {
+class SimpleJsonType extends JsonType {
 
   private final Map<String, JsonNode> additionalTypeProperties;
 
-  public SimpleJsonType(Type type) {
+  SimpleJsonType(Type type) {
     this(type, Map.of());
   }
 
-  public SimpleJsonType(Type type, Map<String, JsonNode> additionalTypeProperties) {
+  SimpleJsonType(Type type, Map<String, JsonNode> additionalTypeProperties) {
     super(type);
     this.additionalTypeProperties = additionalTypeProperties;
   }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java
index 02da33bb120..04161848068 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java
@@ -59,8 +59,10 @@ enum SampleEnum {
                 TestMsg outer_ref = 2;
                 EmbeddedMsg self_ref = 3;
             }
-        }""";
 
+            map<int32, string> intToStringMap = 21;
+            map<string, EmbeddedMsg> strToObjMap  = 22;
+        }""";
 
     String expectedJsonSchema = """
         {
@@ -109,7 +111,9 @@ enum SampleEnum {
                         "v2": { "type": [ "number", "string", "object", "array", "boolean", "null" ] },
                         "uint32_w_field": { "type": "integer", "maximum": 4294967295, "minimum": 0 },
                         "bool_w_field": { "type": "boolean" },
-                        "uint64_w_field": { "type": "integer", "maximum": 18446744073709551615, "minimum": 0 }
+                        "uint64_w_field": { "type": "integer", "maximum": 18446744073709551615, "minimum": 0 },
+                        "strToObjMap": { "type": "object", "additionalProperties": true },
+                        "intToStringMap": { "type": "object", "additionalProperties": true }
                     }
                 },
                 "test.TestMsg.EmbeddedMsg": {

From a1f955ab7c0d668e99edf4594312dd28d6c823d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Apr 2023 20:07:13 +0400
Subject: [PATCH 517/734] Bump docker-maven-plugin from 0.42.0 to 0.42.1
 (#3639)

Bumps [docker-maven-plugin](https://github.com/fabric8io/docker-maven-plugin) from 0.42.0 to 0.42.1.
- [Release notes](https://github.com/fabric8io/docker-maven-plugin/releases)
- [Changelog](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md)
- [Commits](https://github.com/fabric8io/docker-maven-plugin/compare/v0.42.0...v0.42.1)

---
updated-dependencies:
- dependency-name: io.fabric8:docker-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a82dc723916..42ebd9addc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <pnpm.version>v7.4.0</pnpm.version>
 
         <!-- Plugin versions -->
-        <fabric8-maven-plugin.version>0.42.0</fabric8-maven-plugin.version>
+        <fabric8-maven-plugin.version>0.42.1</fabric8-maven-plugin.version>
         <frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
         <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>

From 73a6d7cade9cd50aa6fba68f7a30950af942477b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Apr 2023 20:07:53 +0400
Subject: [PATCH 518/734] Bump peter-evans/create-or-update-comment from 2 to 3
 (#3638)

Bumps [peter-evans/create-or-update-comment](https://github.com/peter-evans/create-or-update-comment) from 2 to 3.
- [Release notes](https://github.com/peter-evans/create-or-update-comment/releases)
- [Commits](https://github.com/peter-evans/create-or-update-comment/compare/v2...v3)

---
updated-dependencies:
- dependency-name: peter-evans/create-or-update-comment
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/branch-deploy.yml       | 4 ++--
 .github/workflows/branch-remove.yml       | 2 +-
 .github/workflows/build-public-image.yml  | 2 +-
 .github/workflows/delete-public-image.yml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 3039958b5ad..49485671470 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -86,7 +86,7 @@ jobs:
 
       - name: make comment with private deployment link
         if: ${{ github.event.label.name == 'status/feature_testing' }}
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v3
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
@@ -94,7 +94,7 @@ jobs:
 
       - name: make comment with public deployment link
         if: ${{ github.event.label.name == 'status/feature_testing_public' }}
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v3
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
diff --git a/.github/workflows/branch-remove.yml b/.github/workflows/branch-remove.yml
index c93fa89eba2..8019764f263 100644
--- a/.github/workflows/branch-remove.yml
+++ b/.github/workflows/branch-remove.yml
@@ -21,7 +21,7 @@ jobs:
           git add ../kafka-ui-from-branch/
           git commit -m "removed env:${{ needs.build.outputs.deploy }}" && git push || true
       - name: make comment with deployment link
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v3
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index 7a5e3b4ca6b..c4698b062cf 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -65,7 +65,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
       - name: make comment with private deployment link
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v3
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
diff --git a/.github/workflows/delete-public-image.yml b/.github/workflows/delete-public-image.yml
index c335bb8050f..1662a4b745c 100644
--- a/.github/workflows/delete-public-image.yml
+++ b/.github/workflows/delete-public-image.yml
@@ -33,7 +33,7 @@ jobs:
                 --image-ids imageTag=${{ steps.extract_branch.outputs.tag }} \
                 --region us-east-1
       - name: make comment with private deployment link
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v3
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |

From c89953435a4e3abde3a4fb7073f8aab9bbf702c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Apr 2023 20:09:09 +0400
Subject: [PATCH 519/734] Bump mheap/github-action-required-labels from 3 to 4
 (#3610)

Bumps [mheap/github-action-required-labels](https://github.com/mheap/github-action-required-labels) from 3 to 4.
- [Release notes](https://github.com/mheap/github-action-required-labels/releases)
- [Commits](https://github.com/mheap/github-action-required-labels/compare/v3...v4)

---
updated-dependencies:
- dependency-name: mheap/github-action-required-labels
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/block_merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/block_merge.yml b/.github/workflows/block_merge.yml
index e1cdb3ac8e9..766d598eb30 100644
--- a/.github/workflows/block_merge.yml
+++ b/.github/workflows/block_merge.yml
@@ -6,7 +6,7 @@ jobs:
   block_merge:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v3
+      - uses: mheap/github-action-required-labels@v4
         with:
           mode: exactly
           count: 0

From bd782213d1a078ecf17fb202f2c13b196ecd3f41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Apr 2023 20:12:33 +0400
Subject: [PATCH 520/734] Bump actions/stale from 7 to 8 (#3556)

Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
index 0a5d2e064c4..dcf39ab003e 100644
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
           days-before-issue-stale: 7
           days-before-issue-close: 3

From 5dd690aa2438182cd2a0deb4f45f4db259618cc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Apr 2023 20:14:06 +0400
Subject: [PATCH 521/734] Bump aquasecurity/trivy-action from 0.9.2 to 0.10.0
 (#3692)

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.9.2 to 0.10.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.9.2...0.10.0)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index 77eae14bda0..9774cca188d 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -55,7 +55,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.9.2
+        uses: aquasecurity/trivy-action@0.10.0
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From 8783da313fb342c883a7c54ea98c3a5240650773 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 20 Apr 2023 19:18:34 +0800
Subject: [PATCH 522/734] FE: Fix topic messages Invalid size for null
 key/value messages (#3689)

---
 .../src/components/Topics/Topic/Messages/Message.tsx       | 4 ++++
 .../Topic/Messages/MessageContent/MessageContent.tsx       | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index 0282cde2ea7..fb4e258cca5 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -29,8 +29,10 @@ const Message: React.FC<Props> = ({
     timestampType,
     offset,
     key,
+    keySize,
     partition,
     content,
+    valueSize,
     headers,
     valueSerde,
     keySerde,
@@ -138,6 +140,8 @@ const Message: React.FC<Props> = ({
           headers={headers}
           timestamp={timestamp}
           timestampType={timestampType}
+          keySize={keySize}
+          contentSize={valueSize}
         />
       )}
     </>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
index fe472ad3b12..93616ca432a 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
@@ -15,6 +15,8 @@ export interface MessageContentProps {
   headers?: { [key: string]: string | undefined };
   timestamp?: Date;
   timestampType?: TopicMessageTimestampTypeEnum;
+  keySize?: number;
+  contentSize?: number;
 }
 
 const MessageContent: React.FC<MessageContentProps> = ({
@@ -23,6 +25,8 @@ const MessageContent: React.FC<MessageContentProps> = ({
   headers,
   timestamp,
   timestampType,
+  keySize,
+  contentSize,
 }) => {
   const [activeTab, setActiveTab] = React.useState<Tab>('content');
   const [searchParams] = useSearchParams();
@@ -54,8 +58,7 @@ const MessageContent: React.FC<MessageContentProps> = ({
     e.preventDefault();
     setActiveTab('headers');
   };
-  const keySize = new TextEncoder().encode(messageKey).length;
-  const contentSize = new TextEncoder().encode(messageContent).length;
+
   const contentType =
     messageContent && messageContent.trim().startsWith('{')
       ? SchemaType.JSON

From 734d4ccdf71ee9b5c85570faa0c4767db3624509 Mon Sep 17 00:00:00 2001
From: Nisan Ohana <78907315+nisanohana3@users.noreply.github.com>
Date: Thu, 20 Apr 2023 20:13:05 +0300
Subject: [PATCH 523/734] FE: Allow sorting consumer groups by topic num
 (#3633)

Signed-off-by: nisanohana3 <nisana230@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/mapper/ConsumerGroupMapper.java  | 11 +----
 .../kafka/ui/model/InternalConsumerGroup.java | 45 +++++++++++++------
 .../ui/service/ConsumerGroupService.java      | 43 +++++++++++++-----
 .../main/resources/swagger/kafka-ui-api.yaml  |  1 +
 .../src/components/ConsumerGroups/List.tsx    |  2 +-
 5 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
index 21d9efda9ca..4ebbf4c70f5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
@@ -11,8 +11,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.apache.kafka.common.Node;
 import org.apache.kafka.common.TopicPartition;
 
@@ -82,15 +80,8 @@ private static <T extends ConsumerGroupDTO> T convertToConsumerGroup(
       InternalConsumerGroup c, T consumerGroup) {
     consumerGroup.setGroupId(c.getGroupId());
     consumerGroup.setMembers(c.getMembers().size());
-
-    int numTopics = Stream.concat(
-        c.getOffsets().keySet().stream().map(TopicPartition::topic),
-        c.getMembers().stream()
-            .flatMap(m -> m.getAssignment().stream().map(TopicPartition::topic))
-    ).collect(Collectors.toSet()).size();
-
     consumerGroup.setMessagesBehind(c.getMessagesBehind());
-    consumerGroup.setTopics(numTopics);
+    consumerGroup.setTopics(c.getTopicNum());
     consumerGroup.setSimple(c.isSimple());
 
     Optional.ofNullable(c.getState())
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
index e8199fa8ef5..06de3cb7d68 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
@@ -5,6 +5,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import lombok.Builder;
 import lombok.Data;
 import org.apache.kafka.clients.admin.ConsumerGroupDescription;
@@ -21,6 +22,7 @@ public class InternalConsumerGroup {
   private final Map<TopicPartition, Long> offsets;
   private final Map<TopicPartition, Long> endOffsets;
   private final Long messagesBehind;
+  private final Integer topicNum;
   private final String partitionAssignor;
   private final ConsumerGroupState state;
   private final Node coordinator;
@@ -44,22 +46,12 @@ public static InternalConsumerGroup create(
     builder.simple(description.isSimpleConsumerGroup());
     builder.state(description.state());
     builder.partitionAssignor(description.partitionAssignor());
-    builder.members(
-        description.members().stream()
-            .map(m ->
-                InternalConsumerGroup.InternalMember.builder()
-                    .assignment(m.assignment().topicPartitions())
-                    .clientId(m.clientId())
-                    .groupInstanceId(m.groupInstanceId().orElse(""))
-                    .consumerId(m.consumerId())
-                    .clientId(m.clientId())
-                    .host(m.host())
-                    .build()
-            ).collect(Collectors.toList())
-    );
+    Collection<InternalMember> internalMembers = initInternalMembers(description);
+    builder.members(internalMembers);
     builder.offsets(groupOffsets);
     builder.endOffsets(topicEndOffsets);
     builder.messagesBehind(calculateMessagesBehind(groupOffsets, topicEndOffsets));
+    builder.topicNum(calculateTopicNum(groupOffsets, internalMembers));
     Optional.ofNullable(description.coordinator()).ifPresent(builder::coordinator);
     return builder.build();
   }
@@ -80,4 +72,31 @@ private static Long calculateMessagesBehind(Map<TopicPartition, Long> offsets, M
     return messagesBehind;
   }
 
+  private static Integer calculateTopicNum(Map<TopicPartition, Long> offsets, Collection<InternalMember> members) {
+
+    long topicNum = Stream.concat(
+        offsets.keySet().stream().map(TopicPartition::topic),
+        members.stream()
+            .flatMap(m -> m.getAssignment().stream().map(TopicPartition::topic))
+    ).distinct().count();
+
+    return Integer.valueOf((int) topicNum);
+
+  }
+
+  private static Collection<InternalMember> initInternalMembers(ConsumerGroupDescription description) {
+    return description.members().stream()
+        .map(m ->
+            InternalConsumerGroup.InternalMember.builder()
+                .assignment(m.assignment().topicPartitions())
+                .clientId(m.clientId())
+                .groupInstanceId(m.groupInstanceId().orElse(""))
+                .consumerId(m.consumerId())
+                .clientId(m.clientId())
+                .host(m.host())
+                .build()
+        ).collect(Collectors.toList());
+  }
+
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index e848146881d..815fdbef6a2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -101,6 +101,9 @@ private boolean isConsumerGroupRelatesToTopic(String topic,
   public record ConsumerGroupsPage(List<InternalConsumerGroup> consumerGroups, int totalPages) {
   }
 
+  private record GroupWithDescr(InternalConsumerGroup icg, ConsumerGroupDescription cgd) {
+  }
+
   public Mono<ConsumerGroupsPage> getConsumerGroupsPage(
       KafkaCluster cluster,
       int pageNum,
@@ -159,22 +162,19 @@ private Mono<List<ConsumerGroupDescription>> loadSortedDescriptions(ReactiveAdmi
                 sortAndPaginate(descriptions.values(), comparator, pageNum, perPage, sortOrderDto).toList());
       }
       case MESSAGES_BEHIND -> {
-        record GroupWithDescr(InternalConsumerGroup icg, ConsumerGroupDescription cgd) { }
 
         Comparator<GroupWithDescr> comparator = Comparator.comparingLong(gwd ->
             gwd.icg.getMessagesBehind() == null ? 0L : gwd.icg.getMessagesBehind());
 
-        var groupNames = groups.stream().map(ConsumerGroupListing::groupId).toList();
+        yield loadDescriptionsByInternalConsumerGroups(ac, groups, comparator, pageNum, perPage, sortOrderDto);
+      }
+
+      case TOPIC_NUM -> {
+
+        Comparator<GroupWithDescr> comparator = Comparator.comparingInt(gwd -> gwd.icg.getTopicNum());
+
+        yield loadDescriptionsByInternalConsumerGroups(ac, groups, comparator, pageNum, perPage, sortOrderDto);
 
-        yield ac.describeConsumerGroups(groupNames)
-            .flatMap(descriptionsMap -> {
-                  List<ConsumerGroupDescription> descriptions = descriptionsMap.values().stream().toList();
-                  return getConsumerGroups(ac, descriptions)
-                      .map(icg -> Streams.zip(icg.stream(), descriptions.stream(), GroupWithDescr::new).toList())
-                      .map(gwd -> sortAndPaginate(gwd, comparator, pageNum, perPage, sortOrderDto)
-                            .map(GroupWithDescr::cgd).toList());
-                }
-            );
       }
     };
   }
@@ -209,6 +209,27 @@ private Mono<List<ConsumerGroupDescription>> describeConsumerGroups(ReactiveAdmi
         .map(cgs -> new ArrayList<>(cgs.values()));
   }
 
+
+  private Mono<List<ConsumerGroupDescription>> loadDescriptionsByInternalConsumerGroups(ReactiveAdminClient ac,
+                                                                                  List<ConsumerGroupListing> groups,
+                                                                                  Comparator<GroupWithDescr> comparator,
+                                                                                  int pageNum,
+                                                                                  int perPage,
+                                                                                  SortOrderDTO sortOrderDto) {
+    var groupNames = groups.stream().map(ConsumerGroupListing::groupId).toList();
+
+    return ac.describeConsumerGroups(groupNames)
+        .flatMap(descriptionsMap -> {
+              List<ConsumerGroupDescription> descriptions = descriptionsMap.values().stream().toList();
+              return getConsumerGroups(ac, descriptions)
+                  .map(icg -> Streams.zip(icg.stream(), descriptions.stream(), GroupWithDescr::new).toList())
+                  .map(gwd -> sortAndPaginate(gwd, comparator, pageNum, perPage, sortOrderDto)
+                      .map(GroupWithDescr::cgd).toList());
+            }
+        );
+
+  }
+
   public Mono<InternalConsumerGroup> getConsumerGroupDetail(KafkaCluster cluster,
                                                             String consumerGroupId) {
     return adminClientService.get(cluster)
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index aef72444662..0d54fa7e79a 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2441,6 +2441,7 @@ components:
         - MEMBERS
         - STATE
         - MESSAGES_BEHIND
+        - TOPIC_NUM
 
     ConsumerGroupsPageResponse:
       type: object
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
index ef8d73f5156..795ac75a5e9 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
@@ -51,9 +51,9 @@ const List = () => {
         accessorKey: 'members',
       },
       {
+        id: ConsumerGroupOrdering.TOPIC_NUM,
         header: 'Num Of Topics',
         accessorKey: 'topics',
-        enableSorting: false,
       },
       {
         id: ConsumerGroupOrdering.MESSAGES_BEHIND,

From 7365cfe3948279079f6ca855175f7b596bbd910e Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 21 Apr 2023 13:19:38 +0400
Subject: [PATCH 524/734] BE: Make paging sizes configurable (#3685)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/config/ClustersProperties.java   |  2 ++
 .../ui/controller/MessagesController.java     |  7 +---
 .../kafka/ui/service/MessagesService.java     | 36 ++++++++++++++++---
 .../main/resources/swagger/kafka-ui-api.yaml  |  4 +++
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 24b60b57116..1d5cc5393c2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -58,6 +58,8 @@ public static class PollingProperties {
     Integer pollTimeoutMs;
     Integer partitionPollTimeout;
     Integer noDataEmptyPolls;
+    Integer maxPageSize;
+    Integer defaultPageSize;
   }
 
   @Data
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
index 1ba511ab07c..aa9d7d5315d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
@@ -43,9 +43,6 @@
 @Slf4j
 public class MessagesController extends AbstractController implements MessagesApi {
 
-  private static final int MAX_LOAD_RECORD_LIMIT = 100;
-  private static final int DEFAULT_LOAD_RECORD_LIMIT = 20;
-
   private final MessagesService messagesService;
   private final DeserializationService deserializationService;
   private final AccessControlService accessControlService;
@@ -91,8 +88,6 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String
     seekType = seekType != null ? seekType : SeekTypeDTO.BEGINNING;
     seekDirection = seekDirection != null ? seekDirection : SeekDirectionDTO.FORWARD;
     filterQueryType = filterQueryType != null ? filterQueryType : MessageFilterTypeDTO.STRING_CONTAINS;
-    int recordsLimit =
-        Optional.ofNullable(limit).map(s -> Math.min(s, MAX_LOAD_RECORD_LIMIT)).orElse(DEFAULT_LOAD_RECORD_LIMIT);
 
     var positions = new ConsumerPosition(
         seekType,
@@ -103,7 +98,7 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String
         ResponseEntity.ok(
             messagesService.loadMessages(
                 getCluster(clusterName), topicName, positions, q, filterQueryType,
-                recordsLimit, seekDirection, keySerde, valueSerde)
+                limit, seekDirection, keySerde, valueSerde)
         )
     );
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index 4f9f0f59f4b..f6ad42c1107 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.service;
 
 import com.google.common.util.concurrent.RateLimiter;
+import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.emitter.BackwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.MessageFilters;
@@ -20,13 +21,13 @@
 import com.provectus.kafka.ui.util.SslPropertiesUtil;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.admin.OffsetSpec;
@@ -44,16 +45,35 @@
 import reactor.core.scheduler.Schedulers;
 
 @Service
-@RequiredArgsConstructor
 @Slf4j
 public class MessagesService {
 
+  private static final int DEFAULT_MAX_PAGE_SIZE = 500;
+  private static final int DEFAULT_PAGE_SIZE = 100;
   // limiting UI messages rate to 20/sec in tailing mode
-  public static final int TAILING_UI_MESSAGE_THROTTLE_RATE = 20;
+  private static final int TAILING_UI_MESSAGE_THROTTLE_RATE = 20;
 
   private final AdminClientService adminClientService;
   private final DeserializationService deserializationService;
   private final ConsumerGroupService consumerGroupService;
+  private final int maxPageSize;
+  private final int defaultPageSize;
+
+  public MessagesService(AdminClientService adminClientService,
+                         DeserializationService deserializationService,
+                         ConsumerGroupService consumerGroupService,
+                         ClustersProperties properties) {
+    this.adminClientService = adminClientService;
+    this.deserializationService = deserializationService;
+    this.consumerGroupService = consumerGroupService;
+
+    var pollingProps = Optional.ofNullable(properties.getPolling())
+        .orElseGet(ClustersProperties.PollingProperties::new);
+    this.maxPageSize = Optional.ofNullable(pollingProps.getMaxPageSize())
+        .orElse(DEFAULT_MAX_PAGE_SIZE);
+    this.defaultPageSize = Optional.ofNullable(pollingProps.getDefaultPageSize())
+        .orElse(DEFAULT_PAGE_SIZE);
+  }
 
   private Mono<TopicDescription> withExistingTopic(KafkaCluster cluster, String topicName) {
     return adminClientService.get(cluster)
@@ -139,7 +159,7 @@ public Flux<TopicMessageEventDTO> loadMessages(KafkaCluster cluster, String topi
                                                  ConsumerPosition consumerPosition,
                                                  @Nullable String query,
                                                  MessageFilterTypeDTO filterQueryType,
-                                                 int limit,
+                                                 @Nullable Integer pageSize,
                                                  SeekDirectionDTO seekDirection,
                                                  @Nullable String keySerde,
                                                  @Nullable String valueSerde) {
@@ -147,7 +167,13 @@ public Flux<TopicMessageEventDTO> loadMessages(KafkaCluster cluster, String topi
         .flux()
         .publishOn(Schedulers.boundedElastic())
         .flatMap(td -> loadMessagesImpl(cluster, topic, consumerPosition, query,
-            filterQueryType, limit, seekDirection, keySerde, valueSerde));
+            filterQueryType, fixPageSize(pageSize), seekDirection, keySerde, valueSerde));
+  }
+
+  private int fixPageSize(@Nullable Integer pageSize) {
+    return Optional.ofNullable(pageSize)
+        .filter(ps -> ps > 0 && ps <= maxPageSize)
+        .orElse(defaultPageSize);
   }
 
   private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 0d54fa7e79a..4bd3d2207c3 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -3486,6 +3486,10 @@ components:
                       type: integer
                     noDataEmptyPolls:
                       type: integer
+                    maxPageSize:
+                      type: integer
+                    defaultPageSize:
+                      type: integer
                 adminClientTimeout:
                   type: integer
                 internalTopicPrefix:

From 0e1f4ddfcf83d27a3caedc37fb2f4a5e110c36bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 12:01:29 +0000
Subject: [PATCH 525/734] Bump mockito.version from 5.1.1 to 5.3.0 (#3694)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 42ebd9addc1..b5fb1023556 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 
         <!-- Test dependency versions -->
         <junit.version>5.9.1</junit.version>
-        <mockito.version>5.1.1</mockito.version>
+        <mockito.version>5.3.0</mockito.version>
         <okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>
         <testcontainers.version>1.17.5</testcontainers.version>
 

From a33e7064ee3231dc729f5cb1d5a299626088202d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Apr 2023 12:28:14 +0000
Subject: [PATCH 526/734] Bump confluent.version from 7.3.0 to 7.3.3 (#3641)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b5fb1023556..beb5744e810 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <assertj.version>3.19.0</assertj.version>
         <avro.version>1.11.1</avro.version>
         <byte-buddy.version>1.12.19</byte-buddy.version>
-        <confluent.version>7.3.0</confluent.version>
+        <confluent.version>7.3.3</confluent.version>
         <datasketches-java.version>3.1.0</datasketches-java.version>
         <groovy.version>3.0.13</groovy.version>
         <jackson.version>2.14.0</jackson.version>

From aed6c16496ddc1dbc83daceaf3c0efc296083a23 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Fri, 21 Apr 2023 17:58:11 +0400
Subject: [PATCH 527/734] FE: Chore: Fix TSC error on submit callback type
 (#3699)

---
 .../Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
index 757b6e171dd..557db159ba7 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
@@ -27,7 +27,7 @@ export interface AddEditFilterContainerProps {
   inputDisplayNameDefaultValue?: string;
   inputCodeDefaultValue?: string;
   isAdd?: boolean;
-  submitCallback?: (values: AddMessageFilters) => Promise<void>;
+  submitCallback?: (values: AddMessageFilters) => void;
 }
 
 const AddEditFilterContainer: React.FC<AddEditFilterContainerProps> = ({

From 8ecb719e9b762a4bc132997dd660b8519c185ef6 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 21 Apr 2023 21:39:30 +0400
Subject: [PATCH 528/734] Broker partitions skew added to API (#3566)

---
 .../kafka/ui/model/InternalBroker.java        | 19 +++-
 .../ui/model/PartitionDistributionStats.java  | 93 +++++++++++++++++++
 .../kafka/ui/service/BrokerService.java       |  5 +-
 .../model/PartitionDistributionStatsTest.java | 83 +++++++++++++++++
 .../main/resources/swagger/kafka-ui-api.yaml  | 10 ++
 5 files changed, 206 insertions(+), 4 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/PartitionDistributionStats.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/model/PartitionDistributionStatsTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalBroker.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalBroker.java
index edab9a8aeb5..4a0d1ba0dd1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalBroker.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalBroker.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.model;
 
 import java.math.BigDecimal;
+import javax.annotation.Nullable;
 import lombok.Data;
 import org.apache.kafka.common.Node;
 
@@ -10,15 +11,27 @@ public class InternalBroker {
   private final Integer id;
   private final String host;
   private final Integer port;
-  private final BigDecimal bytesInPerSec;
-  private final BigDecimal bytesOutPerSec;
+  private final @Nullable BigDecimal bytesInPerSec;
+  private final @Nullable BigDecimal bytesOutPerSec;
+  private final @Nullable Integer partitionsLeader;
+  private final @Nullable Integer partitions;
+  private final @Nullable Integer inSyncPartitions;
+  private final @Nullable BigDecimal leadersSkew;
+  private final @Nullable BigDecimal partitionsSkew;
 
-  public InternalBroker(Node node, Statistics statistics) {
+  public InternalBroker(Node node,
+                        PartitionDistributionStats partitionDistribution,
+                        Statistics statistics) {
     this.id = node.id();
     this.host = node.host();
     this.port = node.port();
     this.bytesInPerSec = statistics.getMetrics().getBrokerBytesInPerSec().get(node.id());
     this.bytesOutPerSec = statistics.getMetrics().getBrokerBytesOutPerSec().get(node.id());
+    this.partitionsLeader = partitionDistribution.getPartitionLeaders().get(node);
+    this.partitions = partitionDistribution.getPartitionsCount().get(node);
+    this.inSyncPartitions = partitionDistribution.getInSyncPartitions().get(node);
+    this.leadersSkew = partitionDistribution.leadersSkew(node);
+    this.partitionsSkew = partitionDistribution.partitionsSkew(node);
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/PartitionDistributionStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/PartitionDistributionStats.java
new file mode 100644
index 00000000000..b625533d1dd
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/PartitionDistributionStats.java
@@ -0,0 +1,93 @@
+package com.provectus.kafka.ui.model;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.Nullable;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.admin.TopicDescription;
+import org.apache.kafka.common.Node;
+import org.apache.kafka.common.TopicPartitionInfo;
+
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+@Slf4j
+public class PartitionDistributionStats {
+
+  // avg skew will show unuseful results on low number of partitions
+  private static final int MIN_PARTITIONS_FOR_SKEW_CALCULATION = 50;
+
+  private static final MathContext ROUNDING_MATH_CTX = new MathContext(3);
+
+  private final Map<Node, Integer> partitionLeaders;
+  private final Map<Node, Integer> partitionsCount;
+  private final Map<Node, Integer> inSyncPartitions;
+  private final double avgLeadersCntPerBroker;
+  private final double avgPartitionsPerBroker;
+  private final boolean skewCanBeCalculated;
+
+  public static PartitionDistributionStats create(Statistics stats) {
+    return create(stats, MIN_PARTITIONS_FOR_SKEW_CALCULATION);
+  }
+
+  static PartitionDistributionStats create(Statistics stats, int minPartitionsForSkewCalculation) {
+    var partitionLeaders = new HashMap<Node, Integer>();
+    var partitionsReplicated = new HashMap<Node, Integer>();
+    var isr = new HashMap<Node, Integer>();
+    int partitionsCnt = 0;
+    for (TopicDescription td : stats.getTopicDescriptions().values()) {
+      for (TopicPartitionInfo tp : td.partitions()) {
+        partitionsCnt++;
+        tp.replicas().forEach(r -> incr(partitionsReplicated, r));
+        tp.isr().forEach(r -> incr(isr, r));
+        if (tp.leader() != null) {
+          incr(partitionLeaders, tp.leader());
+        }
+      }
+    }
+    int nodesWithPartitions = partitionsReplicated.size();
+    int partitionReplications = partitionsReplicated.values().stream().mapToInt(i -> i).sum();
+    var avgPartitionsPerBroker = nodesWithPartitions == 0 ? 0 : ((double) partitionReplications) / nodesWithPartitions;
+
+    int nodesWithLeaders = partitionLeaders.size();
+    int leadersCnt = partitionLeaders.values().stream().mapToInt(i -> i).sum();
+    var avgLeadersCntPerBroker = nodesWithLeaders == 0 ? 0 : ((double) leadersCnt) / nodesWithLeaders;
+
+    return new PartitionDistributionStats(
+        partitionLeaders,
+        partitionsReplicated,
+        isr,
+        avgLeadersCntPerBroker,
+        avgPartitionsPerBroker,
+        partitionsCnt >= minPartitionsForSkewCalculation
+    );
+  }
+
+  private static void incr(Map<Node, Integer> map, Node n) {
+    map.compute(n, (k, c) -> c == null ? 1 : ++c);
+  }
+
+  @Nullable
+  public BigDecimal partitionsSkew(Node node) {
+    return calculateAvgSkew(partitionsCount.get(node), avgPartitionsPerBroker);
+  }
+
+  @Nullable
+  public BigDecimal leadersSkew(Node node) {
+    return calculateAvgSkew(partitionLeaders.get(node), avgLeadersCntPerBroker);
+  }
+
+  // Returns difference (in percents) from average value, null if it can't be calculated
+  @Nullable
+  private BigDecimal calculateAvgSkew(@Nullable Integer value, double avgValue) {
+    if (avgValue == 0 || !skewCanBeCalculated) {
+      return null;
+    }
+    value = value == null ? 0 : value;
+    return new BigDecimal((value - avgValue) / avgValue * 100.0).round(ROUNDING_MATH_CTX);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
index 720642157b0..8a2ac1a63e9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
@@ -10,6 +10,7 @@
 import com.provectus.kafka.ui.model.InternalBroker;
 import com.provectus.kafka.ui.model.InternalBrokerConfig;
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.PartitionDistributionStats;
 import com.provectus.kafka.ui.service.metrics.RawMetric;
 import java.util.Collections;
 import java.util.HashMap;
@@ -64,11 +65,13 @@ private Flux<InternalBrokerConfig> getBrokersConfig(KafkaCluster cluster, Intege
   }
 
   public Flux<InternalBroker> getBrokers(KafkaCluster cluster) {
+    var stats = statisticsCache.get(cluster);
+    var partitionsDistribution = PartitionDistributionStats.create(stats);
     return adminClientService
         .get(cluster)
         .flatMap(ReactiveAdminClient::describeCluster)
         .map(description -> description.getNodes().stream()
-            .map(node -> new InternalBroker(node, statisticsCache.get(cluster)))
+            .map(node -> new InternalBroker(node, partitionsDistribution, stats))
             .collect(Collectors.toList()))
         .flatMapMany(Flux::fromIterable);
   }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/model/PartitionDistributionStatsTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/model/PartitionDistributionStatsTest.java
new file mode 100644
index 00000000000..c83c4f5cd86
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/model/PartitionDistributionStatsTest.java
@@ -0,0 +1,83 @@
+package com.provectus.kafka.ui.model;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.service.ReactiveAdminClient;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.kafka.clients.admin.TopicDescription;
+import org.apache.kafka.common.Node;
+import org.apache.kafka.common.TopicPartitionInfo;
+import org.assertj.core.data.Percentage;
+import org.junit.jupiter.api.Test;
+
+class PartitionDistributionStatsTest {
+
+  @Test
+  void skewCalculatedBasedOnPartitionsCounts() {
+    Node n1 = new Node(1, "n1", 9092);
+    Node n2 = new Node(2, "n2", 9092);
+    Node n3 = new Node(3, "n3", 9092);
+    Node n4 = new Node(4, "n4", 9092);
+
+    var stats = PartitionDistributionStats.create(
+        Statistics.builder()
+            .clusterDescription(
+                new ReactiveAdminClient.ClusterDescription(null, "test", Set.of(n1, n2, n3), null))
+            .topicDescriptions(
+                Map.of(
+                    "t1", new TopicDescription(
+                        "t1", false,
+                        List.of(
+                            new TopicPartitionInfo(0, n1, List.of(n1, n2), List.of(n1, n2)),
+                            new TopicPartitionInfo(1, n2, List.of(n2, n3), List.of(n2, n3))
+                        )
+                    ),
+                    "t2", new TopicDescription(
+                        "t2", false,
+                        List.of(
+                            new TopicPartitionInfo(0, n1, List.of(n1, n2), List.of(n1, n2)),
+                            new TopicPartitionInfo(1, null, List.of(n2, n1), List.of(n1))
+                        )
+                    )
+                )
+            )
+            .build(), 4
+    );
+
+    assertThat(stats.getPartitionLeaders())
+        .containsExactlyInAnyOrderEntriesOf(Map.of(n1, 2, n2, 1));
+    assertThat(stats.getPartitionsCount())
+        .containsExactlyInAnyOrderEntriesOf(Map.of(n1, 3, n2, 4, n3, 1));
+    assertThat(stats.getInSyncPartitions())
+        .containsExactlyInAnyOrderEntriesOf(Map.of(n1, 3, n2, 3, n3, 1));
+
+    // Node(partitions): n1(3), n2(4), n3(1), n4(0)
+    // average partitions cnt = (3+4+1) / 3 = 2.666 (counting only nodes with partitions!)
+    assertThat(stats.getAvgPartitionsPerBroker())
+        .isCloseTo(2.666, Percentage.withPercentage(1));
+
+    assertThat(stats.partitionsSkew(n1))
+        .isCloseTo(BigDecimal.valueOf(12.5), Percentage.withPercentage(1));
+    assertThat(stats.partitionsSkew(n2))
+        .isCloseTo(BigDecimal.valueOf(50), Percentage.withPercentage(1));
+    assertThat(stats.partitionsSkew(n3))
+        .isCloseTo(BigDecimal.valueOf(-62.5), Percentage.withPercentage(1));
+    assertThat(stats.partitionsSkew(n4))
+        .isCloseTo(BigDecimal.valueOf(-100), Percentage.withPercentage(1));
+
+    //  Node(leaders): n1(2), n2(1), n3(0), n4(0)
+    //  average leaders cnt = (2+1) / 2 = 1.5 (counting only nodes with leaders!)
+    assertThat(stats.leadersSkew(n1))
+        .isCloseTo(BigDecimal.valueOf(33.33), Percentage.withPercentage(1));
+    assertThat(stats.leadersSkew(n2))
+        .isCloseTo(BigDecimal.valueOf(-33.33), Percentage.withPercentage(1));
+    assertThat(stats.leadersSkew(n3))
+        .isCloseTo(BigDecimal.valueOf(-100), Percentage.withPercentage(1));
+    assertThat(stats.leadersSkew(n4))
+        .isCloseTo(BigDecimal.valueOf(-100), Percentage.withPercentage(1));
+  }
+
+}
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 4bd3d2207c3..78c7cf3bf52 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2375,6 +2375,16 @@ components:
           type: number
         bytesOutPerSec:
           type: number
+        partitionsLeader:
+          type: integer
+        partitions:
+          type: integer
+        inSyncPartitions:
+          type: integer
+        partitionsSkew:
+          type: number
+        leadersSkew:
+          type: number
       required:
         - id
 

From fb515871cba27686037d06e5a8dbaa417c681732 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 24 Apr 2023 12:56:01 +0300
Subject: [PATCH 529/734] issues/streamsAndTablesVisibilityCheck1 (#3702)

---
 .../kafka/ui/services/ApiService.java         | 12 +++--
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 43 +++++++++++++---
 .../ui/manualsuite/suite/TopicsTest.java      | 24 +++++++++
 .../ui/manualsuite/suite/WizardTest.java      | 12 +++++
 .../ui/smokesuite/ksqldb/KsqlDbTest.java      | 50 +++++++++++++------
 5 files changed, 114 insertions(+), 27 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
index a041defc93e..b4cc54a38f3 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/services/ApiService.java
@@ -36,29 +36,31 @@
 @Slf4j
 public class ApiService extends BaseSource {
 
+  private final ApiClient apiClient = new ApiClient().setBasePath(BASE_API_URL);
+
   @SneakyThrows
   private TopicsApi topicApi() {
-    return new TopicsApi(new ApiClient().setBasePath(BASE_API_URL));
+    return new TopicsApi(apiClient);
   }
 
   @SneakyThrows
   private SchemasApi schemaApi() {
-    return new SchemasApi(new ApiClient().setBasePath(BASE_API_URL));
+    return new SchemasApi(apiClient);
   }
 
   @SneakyThrows
   private KafkaConnectApi connectorApi() {
-    return new KafkaConnectApi(new ApiClient().setBasePath(BASE_API_URL));
+    return new KafkaConnectApi(apiClient);
   }
 
   @SneakyThrows
   private MessagesApi messageApi() {
-    return new MessagesApi(new ApiClient().setBasePath(BASE_API_URL));
+    return new MessagesApi(apiClient);
   }
 
   @SneakyThrows
   private KsqlApi ksqlApi() {
-    return new KsqlApi(new ApiClient().setBasePath(BASE_API_URL));
+    return new KsqlApi(apiClient);
   }
 
   @SneakyThrows
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index d96bbb7f3a2..3ce086ee7bb 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -2,6 +2,7 @@
 
 import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.BROKERS_SUITE_ID;
 import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.KSQL_DB_SUITE_ID;
+import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.SCHEMAS_SUITE_ID;
 import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.TOPICS_PROFILE_SUITE_ID;
 import static com.provectus.kafka.ui.utilities.qase.enums.State.TO_BE_AUTOMATED;
 
@@ -35,37 +36,65 @@ public void testCaseC() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = KSQL_DB_SUITE_ID)
-  @QaseId(284)
+  @Suite(id = BROKERS_SUITE_ID)
+  @QaseId(331)
   @Test
   public void testCaseD() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
-  @QaseId(331)
+  @QaseId(332)
   @Test
   public void testCaseE() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = BROKERS_SUITE_ID)
-  @QaseId(332)
+  @Suite(id = TOPICS_PROFILE_SUITE_ID)
+  @QaseId(335)
   @Test
   public void testCaseF() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
-  @QaseId(335)
+  @QaseId(336)
   @Test
   public void testCaseG() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
-  @QaseId(336)
+  @QaseId(343)
   @Test
   public void testCaseH() {
   }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = KSQL_DB_SUITE_ID)
+  @QaseId(344)
+  @Test
+  public void testCaseI() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = SCHEMAS_SUITE_ID)
+  @QaseId(345)
+  @Test
+  public void testCaseJ() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = SCHEMAS_SUITE_ID)
+  @QaseId(346)
+  @Test
+  public void testCaseK() {
+  }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = TOPICS_PROFILE_SUITE_ID)
+  @QaseId(347)
+  @Test
+  public void testCaseL() {
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java
index 76f8506debb..758827e21bf 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java
@@ -92,4 +92,28 @@ public void testCaseM() {
   @Test
   public void testCaseN() {
   }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(337)
+  @Test
+  public void testCaseO() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(339)
+  @Test
+  public void testCaseP() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(341)
+  @Test
+  public void testCaseQ() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(342)
+  @Test
+  public void testCaseR() {
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/WizardTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/WizardTest.java
index 9621104b1a1..c74c1ba6f07 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/WizardTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/WizardTest.java
@@ -14,4 +14,16 @@ public class WizardTest extends BaseManualTest {
   @Test
   public void testCaseA() {
   }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(338)
+  @Test
+  public void testCaseB() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @QaseId(340)
+  @Test
+  public void testCaseC() {
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
index c4bbe0def4c..22ef931bf13 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.smokesuite.ksqldb;
 
+import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlMenuTabs.STREAMS;
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_TABLES;
 import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
@@ -39,17 +40,21 @@ public void beforeClass() {
         FIRST_TABLE.getName(), SECOND_TABLE.getName()));
   }
 
-  @QaseId(86)
+  @QaseId(284)
   @Test(priority = 1)
-  public void clearResultsForExecutedRequest() {
-    navigateToKsqlDbAndExecuteRequest(SHOW_TABLES.getQuery());
+  public void streamsAndTablesVisibilityCheck() {
+    naviSideBar
+        .openSideMenu(KSQL_DB);
+    ksqlDbList
+        .waitUntilScreenReady();
     SoftAssert softly = new SoftAssert();
-    softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
-    softly.assertAll();
-    ksqlQueryForm
-        .clickClearResultsBtn();
-    softly.assertFalse(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
+    softly.assertTrue(ksqlDbList.getTableByName(FIRST_TABLE.getName()).isVisible(), "getTableByName()");
+    softly.assertTrue(ksqlDbList.getTableByName(SECOND_TABLE.getName()).isVisible(), "getTableByName()");
     softly.assertAll();
+    ksqlDbList
+        .openDetailsTab(STREAMS)
+        .waitUntilScreenReady();
+    Assert.assertTrue(ksqlDbList.getStreamByName(DEFAULT_STREAM.getName()).isVisible(), "getStreamByName()");
   }
 
   @QaseId(276)
@@ -68,11 +73,31 @@ public void checkShowTablesRequestExecution() {
     navigateToKsqlDbAndExecuteRequest(SHOW_TABLES.getQuery());
     SoftAssert softly = new SoftAssert();
     softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
-    softly.assertTrue(ksqlQueryForm.getItemByName(FIRST_TABLE.getName()).isVisible(), "getItemByName()");
-    softly.assertTrue(ksqlQueryForm.getItemByName(SECOND_TABLE.getName()).isVisible(), "getItemByName()");
+    softly.assertTrue(ksqlQueryForm.getItemByName(FIRST_TABLE.getName()).isVisible(),
+        String.format("getItemByName(%s)", FIRST_TABLE.getName()));
+    softly.assertTrue(ksqlQueryForm.getItemByName(SECOND_TABLE.getName()).isVisible(),
+        String.format("getItemByName(%s)", SECOND_TABLE.getName()));
+    softly.assertAll();
+  }
+
+  @QaseId(86)
+  @Test(priority = 4)
+  public void clearResultsForExecutedRequest() {
+    navigateToKsqlDbAndExecuteRequest(SHOW_TABLES.getQuery());
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
+    softly.assertAll();
+    ksqlQueryForm
+        .clickClearResultsBtn();
+    softly.assertFalse(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
     softly.assertAll();
   }
 
+  @AfterClass(alwaysRun = true)
+  public void afterClass() {
+    TOPIC_NAMES_LIST.forEach(topicName -> apiService.deleteTopic(topicName));
+  }
+
   @Step
   private void navigateToKsqlDbAndExecuteRequest(String query) {
     naviSideBar
@@ -85,9 +110,4 @@ private void navigateToKsqlDbAndExecuteRequest(String query) {
         .setQuery(query)
         .clickExecuteBtn(query);
   }
-
-  @AfterClass(alwaysRun = true)
-  public void afterClass() {
-    TOPIC_NAMES_LIST.forEach(topicName -> apiService.deleteTopic(topicName));
-  }
 }

From 1b2827fb2ffd8b0890960845dfaab2ab1f7ebf2e Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 24 Apr 2023 14:50:08 +0400
Subject: [PATCH 530/734] FE: Add KC quick actions into the sandwich menu
 (#3660)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../components/Connect/List/ActionsCell.tsx   | 85 +++++++++++++++++--
 .../Connect/List/__tests__/List.spec.tsx      | 11 ++-
 .../common/Dropdown/Dropdown.styled.ts        |  2 +-
 .../src/lib/hooks/api/kafkaConnect.ts         |  3 +-
 4 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx b/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx
index 30b3df8a56d..5b3a24cdb70 100644
--- a/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx
@@ -1,26 +1,41 @@
 import React from 'react';
-import { FullConnectorInfo } from 'generated-sources';
+import {
+  Action,
+  ConnectorAction,
+  ConnectorState,
+  FullConnectorInfo,
+  ResourceType,
+} from 'generated-sources';
 import { CellContext } from '@tanstack/react-table';
 import { ClusterNameRoute } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import { Dropdown, DropdownItem } from 'components/common/Dropdown';
-import { useDeleteConnector } from 'lib/hooks/api/kafkaConnect';
+import {
+  useDeleteConnector,
+  useUpdateConnectorState,
+} from 'lib/hooks/api/kafkaConnect';
 import { useConfirm } from 'lib/hooks/useConfirm';
+import { useIsMutating } from '@tanstack/react-query';
+import { ActionDropdownItem } from 'components/common/ActionComponent';
 
 const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
   row,
 }) => {
-  const { connect, name } = row.original;
-
+  const { connect, name, status } = row.original;
   const { clusterName } = useAppParams<ClusterNameRoute>();
-
+  const mutationsNumber = useIsMutating();
+  const isMutating = mutationsNumber > 0;
   const confirm = useConfirm();
   const deleteMutation = useDeleteConnector({
     clusterName,
     connectName: connect,
     connectorName: name,
   });
-
+  const stateMutation = useUpdateConnectorState({
+    clusterName,
+    connectName: connect,
+    connectorName: name,
+  });
   const handleDelete = () => {
     confirm(
       <>
@@ -31,8 +46,66 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
       }
     );
   };
+  // const stateMutation = useUpdateConnectorState(routerProps);
+  const resumeConnectorHandler = () =>
+    stateMutation.mutateAsync(ConnectorAction.RESUME);
+  const restartConnectorHandler = () =>
+    stateMutation.mutateAsync(ConnectorAction.RESTART);
+
+  const restartAllTasksHandler = () =>
+    stateMutation.mutateAsync(ConnectorAction.RESTART_ALL_TASKS);
+
+  const restartFailedTasksHandler = () =>
+    stateMutation.mutateAsync(ConnectorAction.RESTART_FAILED_TASKS);
+
   return (
     <Dropdown>
+      {status.state === ConnectorState.PAUSED && (
+        <ActionDropdownItem
+          onClick={resumeConnectorHandler}
+          disabled={isMutating}
+          permission={{
+            resource: ResourceType.CONNECT,
+            action: Action.EDIT,
+            value: name,
+          }}
+        >
+          Resume
+        </ActionDropdownItem>
+      )}
+      <ActionDropdownItem
+        onClick={restartConnectorHandler}
+        disabled={isMutating}
+        permission={{
+          resource: ResourceType.CONNECT,
+          action: Action.EDIT,
+          value: name,
+        }}
+      >
+        Restart Connector
+      </ActionDropdownItem>
+      <ActionDropdownItem
+        onClick={restartAllTasksHandler}
+        disabled={isMutating}
+        permission={{
+          resource: ResourceType.CONNECT,
+          action: Action.EDIT,
+          value: name,
+        }}
+      >
+        Restart All Tasks
+      </ActionDropdownItem>
+      <ActionDropdownItem
+        onClick={restartFailedTasksHandler}
+        disabled={isMutating}
+        permission={{
+          resource: ResourceType.CONNECT,
+          action: Action.EDIT,
+          value: name,
+        }}
+      >
+        Restart Failed Tasks
+      </ActionDropdownItem>
       <DropdownItem onClick={handleDelete} danger>
         Remove Connector
       </DropdownItem>
diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
index 9de28f38ffd..82b4aab2126 100644
--- a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx
@@ -9,7 +9,11 @@ import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { render, WithRoute } from 'lib/testHelpers';
 import { clusterConnectConnectorPath, clusterConnectorsPath } from 'lib/paths';
-import { useConnectors, useDeleteConnector } from 'lib/hooks/api/kafkaConnect';
+import {
+  useConnectors,
+  useDeleteConnector,
+  useUpdateConnectorState,
+} from 'lib/hooks/api/kafkaConnect';
 
 const mockedUsedNavigate = jest.fn();
 const mockDelete = jest.fn();
@@ -22,6 +26,7 @@ jest.mock('react-router-dom', () => ({
 jest.mock('lib/hooks/api/kafkaConnect', () => ({
   useConnectors: jest.fn(),
   useDeleteConnector: jest.fn(),
+  useUpdateConnectorState: jest.fn(),
 }));
 
 const clusterName = 'local';
@@ -42,6 +47,10 @@ describe('Connectors List', () => {
       (useConnectors as jest.Mock).mockImplementation(() => ({
         data: connectors,
       }));
+      const restartConnector = jest.fn();
+      (useUpdateConnectorState as jest.Mock).mockImplementation(() => ({
+        mutateAsync: restartConnector,
+      }));
     });
 
     it('renders', async () => {
diff --git a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
index f63fc5fe2a8..d7db888a096 100644
--- a/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Dropdown/Dropdown.styled.ts
@@ -70,7 +70,7 @@ export const DropdownButton = styled.button`
 `;
 
 export const DangerItem = styled.div`
-  color: ${({ theme: { dropdown } }) => dropdown.item.color.normal};
+  color: ${({ theme: { dropdown } }) => dropdown.item.color.danger};
 `;
 
 export const DropdownItemHint = styled.div`
diff --git a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
index b8a17c558d3..1d01d491954 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/kafkaConnect.ts
@@ -76,7 +76,8 @@ export function useUpdateConnectorState(props: UseConnectorProps) {
   return useMutation(
     (action: ConnectorAction) => api.updateConnectorState({ ...props, action }),
     {
-      onSuccess: () => client.invalidateQueries(connectorKey(props)),
+      onSuccess: () =>
+        client.invalidateQueries(['clusters', props.clusterName, 'connectors']),
     }
   );
 }

From ad9d7dec2cd2effc6f3832e121830c99d98dce0f Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:19:18 +0400
Subject: [PATCH 531/734] FE: Topics: Fix redirect to Topics on topic delete
 (#3687)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx     | 2 +-
 .../src/components/Topics/Topic/__test__/Topic.spec.tsx      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index 8945523576b..9430e4b7499 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -59,7 +59,7 @@ const Topic: React.FC = () => {
 
   const deleteTopicHandler = async () => {
     await deleteTopic.mutateAsync(topicName);
-    navigate('../..');
+    navigate(clusterTopicsPath(clusterName));
   };
 
   React.useEffect(() => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
index 460e4ad5dee..4ec45c3a58f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/__test__/Topic.spec.tsx
@@ -10,6 +10,7 @@ import {
   clusterTopicMessagesPath,
   clusterTopicPath,
   clusterTopicSettingsPath,
+  clusterTopicsPath,
   clusterTopicStatisticsPath,
   getNonExactPath,
 } from 'lib/paths';
@@ -179,7 +180,9 @@ describe('Details', () => {
         name: 'Confirm',
       });
       await userEvent.click(submitDeleteButton);
-      expect(mockNavigate).toHaveBeenCalledWith('../..');
+      expect(mockNavigate).toHaveBeenCalledWith(
+        clusterTopicsPath(mockClusterName)
+      );
     });
 
     it('shows a confirmation popup on deleting topic messages', async () => {

From eec9fcb5f17ee926f0d4108939d770edd3919386 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 24 Apr 2023 16:02:08 +0400
Subject: [PATCH 532/734] BE: Chore: CVE fixes:  spring-core(6.0.7), transitive
 org.json (#3693)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-api/pom.xml | 12 ++++++++++++
 pom.xml              |  1 +
 2 files changed, 13 insertions(+)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index e61827fd73d..7f2d4c16beb 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -21,6 +21,12 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <!--TODO: remove, when spring-boot fixed dependency to 6.0.8+ (6.0.7 has CVE) -->
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>6.0.8</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
@@ -109,6 +115,12 @@
             <groupId>io.projectreactor.addons</groupId>
             <artifactId>reactor-extra</artifactId>
         </dependency>
+<!-- https://github.com/provectus/kafka-ui/pull/3693 -->
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>${org.json.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/pom.xml b/pom.xml
index beb5744e810..a5a450d294b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
         <odd-oddrn-generator.version>0.1.15</odd-oddrn-generator.version>
         <odd-oddrn-client.version>0.1.23</odd-oddrn-client.version>
+        <org.json.version>20230227</org.json.version>
 
         <!-- Test dependency versions -->
         <junit.version>5.9.1</junit.version>

From 0278700edb88cb09c5831675ab4c6d95f27798b1 Mon Sep 17 00:00:00 2001
From: blacktower88 <125452174+blacktower88@users.noreply.github.com>
Date: Mon, 24 Apr 2023 14:15:09 +0200
Subject: [PATCH 533/734] FE: Topics: Remove a success message upon creating a
 topic (#3580)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../provectus/kafka/ui/smokesuite/topics/TopicsTest.java    | 6 +-----
 kafka-ui-react-app/src/lib/hooks/api/topics.ts              | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
index ad20f595a4f..bad6a9fcde0 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
@@ -486,11 +486,7 @@ public void checkCopyTopicPossibility() {
     topicDetails
         .waitUntilScreenReady();
     TOPIC_LIST.add(topicToCopy);
-    SoftAssert softly = new SoftAssert();
-    softly.assertTrue(topicDetails.isAlertWithMessageVisible(SUCCESS, "Topic successfully created."),
-        "isAlertWithMessageVisible()");
-    softly.assertTrue(topicDetails.isTopicHeaderVisible(topicToCopy.getName()), "isTopicHeaderVisible()");
-    softly.assertAll();
+    Assert.assertTrue(topicDetails.isTopicHeaderVisible(topicToCopy.getName()), "isTopicHeaderVisible()");
   }
 
   @AfterClass(alwaysRun = true)
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
index f71299f19bb..a87673368dd 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topics.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -122,9 +122,6 @@ export function useCreateTopicMutation(clusterName: ClusterName) {
       }),
     {
       onSuccess: () => {
-        showSuccessAlert({
-          message: `Topic successfully created.`,
-        });
         client.invalidateQueries(topicKeys.all(clusterName));
       },
     }

From 039f50273e57ca219748606677539d101040a462 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 25 Apr 2023 03:01:32 +0800
Subject: [PATCH 534/734] Infra: Rework issue templates

---
 .github/ISSUE_TEMPLATE/bug.yml            | 92 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/bug_report.md      | 64 ----------------
 .github/ISSUE_TEMPLATE/feature.yml        | 66 ++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 46 ------------
 .github/ISSUE_TEMPLATE/helm.yml           | 92 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/k8s.md             | 52 -------------
 .github/dependabot.yml                    |  4 -
 7 files changed, 250 insertions(+), 166 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/helm.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/k8s.md

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 00000000000..4ec791ebb9c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,92 @@
+name: "\U0001F41E  Bug report"
+description: File a bug report
+labels: ["status/triage", "type/bug"]
+assignees: []
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Hi, thanks for raising the issue(-s), all contributions really matter!
+        Please, note that we'll close the issue without further explanation if you don't follow
+        this template and don't provide the information requested within this template.
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Issue submitter TODO list
+      description: By you checking these checkboxes we can be sure you've done the essential things.
+      options:
+        - label: I've looked up my issue in [FAQ](https://docs.kafka-ui.provectus.io/faq/common-problems)
+          required: true
+        - label: I've searched for an already existing issues [here](https://github.com/provectus/kafka-ui/issues)
+          required: true
+        - label: I've tried running `master`-labeled docker image and the issue still persists there
+          required: true
+        - label: I'm running a supported version of the application which is listed [here](https://github.com/provectus/kafka-ui/blob/master/SECURITY.md)
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the bug (actual behavior)
+      description: A clear and concise description of what the bug is. Use a list, if there is more than one problem
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Your installation details
+      description: |
+        How do you run the app? Please provide as much info as possible:
+        1. App version (commit hash in the top left corner of the UI)
+        2. Helm chart version, if you use one
+        3. Your application config. Please remove the sensitive info like passwords or API keys.
+        4. Any IAAC configs
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Please write down the order of the actions required to reproduce the issue.
+        For the advanced setups/complicated issue, we might need you to provide
+        a minimal [reproducible example](https://stackoverflow.com/help/minimal-reproducible-example).
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: |
+        If applicable, add screenshots to help explain your problem
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Logs
+      description: |
+        If applicable, *upload* screenshots to help explain your problem
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context about the problem here. E.G.:
+        1. Are there any alternative scenarios (different data/methods/configuration/setup) you have tried?
+          Were they successful or the same issue occurred? Please provide steps as well.
+        2. Related issues (if there are any).
+        3. Logs (if available)
+        4. Is there any serious impact or behaviour on the end-user because of this issue, that can be overlooked?
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index b6bbcda11ad..00000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-name: "\U0001F41E  Bug report"
-about: Create a bug report
-title: ''
-labels: status/triage, type/bug
-assignees: ''
-
----
-
-<!--
-
-We will close the issue without further explanation if you don't follow this template and don't provide the information requested within this template.
-
-Don't forget to check for existing issues/discussions regarding your proposal. We might already have it.
-https://github.com/provectus/kafka-ui/issues
-https://github.com/provectus/kafka-ui/discussions
-
--->
-
-<!--
-Please follow the naming conventions for bugs:
-<Feature/Area/Scope> :  <Compact, but specific problem summary> 
-Avoid generic titles, like “Topics: incorrect layout of message sorting drop-down list”. Better use something like: “Topics: Message sorting drop-down list overlaps the "Submit" button”.
-
--->
-
-**Describe the bug** (Actual behavior)
-<!--(A clear and concise description of what the bug is.Use a list, if there is more than one problem)-->
-
-**Expected behavior**
-<!--(A clear and concise description of what you expected to happen.)-->
-
-**Set up**
-<!--
-WE MIGHT CLOSE THE ISSUE without further explanation IF YOU DON'T PROVIDE THIS INFORMATION.
-
-How do you run the app? Please provide as much info as possible:
-1. App version (docker image version or check commit hash in the top left corner in UI)
-2. Helm chart version, if you use one
-3. Any IAAC configs
--->
-
-
-**Steps to Reproduce**
-<!-- We'd like you to provide an example setup (via docker-compose, helm, etc.) 
-to reproduce the problem, especially with a complex setups. -->
-
-1. 
-
-**Screenshots**
-<!--
-(If applicable, add screenshots to help explain your problem)
--->
-
-
-**Additional context**
-<!--
-Add any other context about the problem here. E.g.: 
-1. Are there any alternative scenarios (different data/methods/configuration/setup) you have tried? 
-   Were they successfull or same issue occured? Please provide steps as well.
-2. Related issues (if there are any).
-3. Logs (if available)
-4. Is there any serious impact or behaviour on the end-user because of this issue, that can be overlooked?
--->
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 00000000000..e52c2b7ae99
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,66 @@
+name: "\U0001F680 Feature request"
+description: Propose a new feature
+labels: ["status/triage", "type/feature"]
+assignees: []
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Hi, thanks for raising the issue(-s), all contributions really matter!
+        Please, note that we'll close the issue without further explanation if you don't follow
+        this template and don't provide the information requested within this template.
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Issue submitter TODO list
+      description: By you checking these checkboxes we can be sure you've done the essential things.
+      options:
+        - label: I've searched for an already existing issues [here](https://github.com/provectus/kafka-ui/issues)
+          required: true
+        - label: I'm running a supported version of the application which is listed [here](https://github.com/provectus/kafka-ui/blob/master/SECURITY.md) and the feature is not present there
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Is your proposal related to a problem?
+      description: |
+        Provide a clear and concise description of what the problem is.
+        For example, "I'm always frustrated when..."
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Describe the feature you're interested in
+      description: |
+        Provide a clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: |
+        Let us know about other solutions you've tried or researched.
+    validations:
+      required: false
+
+  - type: input
+    attributes:
+      label: Version you're running
+      description: |
+        Please provide the app version you're currently running:
+        1. App version (commit hash in the top left corner of the UI)
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: |
+        Is there anything else you can add about the proposal?
+        You might want to link to related issues here, if you haven't already.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 49a07ae9782..00000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-name: "\U0001F680 Feature request"
-about: Propose a new feature
-title: ''
-labels: status/triage, type/feature
-assignees: ''
-
----
-
-<!--
-
-Don't forget to check for existing issues/discussions regarding your proposal. We might already have it.
-https://github.com/provectus/kafka-ui/issues
-https://github.com/provectus/kafka-ui/discussions
-
--->
-
-### Which version of the app are you running?
-<!-- Please provide docker image version or check commit hash in the top left corner in UI) -->
-
-### Is your proposal related to a problem?
-
-<!--
-  Provide a clear and concise description of what the problem is.
-  For example, "I'm always frustrated when..."
--->
-
-### Describe the solution you'd like
-
-<!--
-  Provide a clear and concise description of what you want to happen.
--->
-
-### Describe alternatives you've considered
-
-<!--
-  Let us know about other solutions you've tried or researched.
--->
-
-### Additional context
-
-<!--
-  Is there anything else you can add about the proposal?
-  You might want to link to related issues here, if you haven't already.
--->
-
diff --git a/.github/ISSUE_TEMPLATE/helm.yml b/.github/ISSUE_TEMPLATE/helm.yml
new file mode 100644
index 00000000000..b36733504e2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/helm.yml
@@ -0,0 +1,92 @@
+name: "⎈ K8s/Helm problem report"
+description: "Report a problem with k8s/helm charts/etc"
+labels: ["status/triage", "scope/k8s"]
+assignees: []
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Hi, thanks for raising the issue(-s), all contributions really matter!
+        Please, note that we'll close the issue without further explanation if you don't follow
+        this template and don't provide the information requested within this template.
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Issue submitter TODO list
+      description: By you checking these checkboxes we can be sure you've done the essential things.
+      options:
+        - label: I've looked up my issue in [FAQ](https://docs.kafka-ui.provectus.io/faq/common-problems)
+          required: true
+        - label: I've searched for an already existing issues [here](https://github.com/provectus/kafka-ui/issues)
+          required: true
+        - label: I've tried running `master`-labeled docker image and the issue still persists there
+          required: true
+        - label: I'm running a supported version of the application which is listed [here](https://github.com/provectus/kafka-ui/blob/master/SECURITY.md)
+          required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the bug (actual behavior)
+      description: A clear and concise description of what the bug is. Use a list, if there is more than one problem
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Your installation details
+      description: |
+        How do you run the app? Please provide as much info as possible:
+        1. App version (commit hash in the top left corner of the UI)
+        2. Helm chart version
+        3. Your application config. Please remove the sensitive info like passwords or API keys.
+        4. Any IAAC configs
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Please write down the order of the actions required to reproduce the issue.
+        For the advanced setups/complicated issue, we might need you to provide
+        a minimal [reproducible example](https://stackoverflow.com/help/minimal-reproducible-example).
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: |
+        If applicable, add screenshots to help explain your problem
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Logs
+      description: |
+        If applicable, *upload* screenshots to help explain your problem
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context about the problem here. E.G.:
+        1. Are there any alternative scenarios (different data/methods/configuration/setup) you have tried?
+          Were they successful or the same issue occurred? Please provide steps as well.
+        2. Related issues (if there are any).
+        3. Logs (if available)
+        4. Is there any serious impact or behaviour on the end-user because of this issue, that can be overlooked?
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/k8s.md b/.github/ISSUE_TEMPLATE/k8s.md
deleted file mode 100644
index 5f4eb8ca755..00000000000
--- a/.github/ISSUE_TEMPLATE/k8s.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-name: "⎈ K8s/Helm problem report"
-about: Report a problem with k8s/helm charts/etc
-title: ''
-labels: scope/k8s, status/triage
-assignees: azatsafin
-
----
-
-<!--
-
-Don't forget to check for existing issues/discussions regarding your proposal. We might already have it.
-https://github.com/provectus/kafka-ui/issues
-https://github.com/provectus/kafka-ui/discussions
-
--->
-
-**Describe the bug**
-<!--(A clear and concise description of what the bug is.)-->
-
-
-**Set up**
-<!--
-How do you run the app? Please provide as much info as possible:
-1. App version (docker image version or check commit hash in the top left corner in UI)
-2. Helm chart version, if you use one
-3. Any IAAC configs
-
-We might close the issue without further explanation if you don't provide such information.
--->
-
-
-**Steps to Reproduce**
-Steps to reproduce the behavior:
-
-1. 
-
-**Expected behavior**
-<!--
-(A clear and concise description of what you expected to happen)
--->
-
-**Screenshots**
-<!--
-(If applicable, add screenshots to help explain your problem)
--->
-
-
-**Additional context**
-<!--
-(Add any other context about the problem here)
--->
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 75ea103c31e..7e8552962ab 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,8 +8,6 @@ updates:
     timezone: Europe/Moscow
   reviewers:
     - "Haarolean"
-  assignees:
-    - "Haarolean"
   labels:
     - "scope/backend"
     - "type/dependencies"
@@ -99,8 +97,6 @@ updates:
     timezone: Europe/Moscow
   reviewers:
     - "Haarolean"
-  assignees:
-    - "Haarolean"
   labels:
     - "scope/infrastructure"
     - "type/dependencies"

From 5efb380c42a97418b29fd5e72ed8372be7d1b48e Mon Sep 17 00:00:00 2001
From: Winnie Chiu <113582273+winnie-chiu@users.noreply.github.com>
Date: Wed, 26 Apr 2023 12:19:41 +0800
Subject: [PATCH 535/734] FE: Make it possible to not close message produce
 pane upon producing (#2854)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
Co-authored-by: David <58771979+David-DB88@users.noreply.github.com>
Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../Topic/SendMessage/SendMessage.styled.tsx  |  26 ++++-
 .../Topics/Topic/SendMessage/SendMessage.tsx  | 106 +++++++++++-------
 .../SendMessage/__test__/SendMessage.spec.tsx |   2 +-
 .../src/components/Topics/Topic/Topic.tsx     |   2 +-
 .../SlidingSidebar/SlidingSidebar.styled.ts   |   2 +-
 5 files changed, 87 insertions(+), 51 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx
index 483c41d0533..d2750abf7d1 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.styled.tsx
@@ -8,15 +8,29 @@ export const Wrapper = styled.div`
 export const Columns = styled.div`
   margin: -0.75rem;
   margin-bottom: 0.75rem;
+  display: flex;
+  flex-direction: column;
+  padding: 0.75rem;
+  gap: 8px;
 
   @media screen and (min-width: 769px) {
     display: flex;
   }
 `;
-
-export const Column = styled.div`
-  flex-basis: 0;
-  flex-grow: 1;
-  flex-shrink: 1;
-  padding: 0.75rem;
+export const Flex = styled.div`
+  display: flex;
+  flex-direction: row;
+  gap: 8px;
+  @media screen and (max-width: 1200px) {
+    flex-direction: column;
+  }
+`;
+export const FlexItem = styled.div`
+  width: 18rem;
+  @media screen and (max-width: 1450px) {
+    width: 50%;
+  }
+  @media screen and (max-width: 1200px) {
+    width: 100%;
+  }
 `;
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index 9450e512ad1..bacfa76c93f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -4,6 +4,7 @@ import { RouteParamsClusterTopic } from 'lib/paths';
 import { Button } from 'components/common/Button/Button';
 import Editor from 'components/common/Editor/Editor';
 import Select, { SelectOption } from 'components/common/Select/Select';
+import Switch from 'components/common/Switch/Switch';
 import useAppParams from 'lib/hooks/useAppParams';
 import { showAlert } from 'lib/errorHandling';
 import { useSendMessage, useTopicDetails } from 'lib/hooks/api/topics';
@@ -26,9 +27,12 @@ interface FormType {
   partition: number;
   keySerde: string;
   valueSerde: string;
+  keepContents: boolean;
 }
 
-const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
+const SendMessage: React.FC<{ closeSidebar: () => void }> = ({
+  closeSidebar,
+}) => {
   const { clusterName, topicName } = useAppParams<RouteParamsClusterTopic>();
   const { data: topic } = useTopicDetails({ clusterName, topicName });
   const { data: serdes = {} } = useSerdes({
@@ -47,11 +51,13 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
     handleSubmit,
     formState: { isSubmitting },
     control,
+    setValue,
   } = useForm<FormType>({
     mode: 'onChange',
     defaultValues: {
       ...defaultValues,
       partition: Number(partitionOptions[0].value),
+      keepContents: false,
     },
   });
 
@@ -62,6 +68,7 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
     content,
     headers,
     partition,
+    keepContents,
   }: FormType) => {
     let errors: string[] = [];
 
@@ -110,7 +117,11 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
         keySerde,
         valueSerde,
       });
-      onSubmit();
+      if (!keepContents) {
+        setValue('key', '');
+        setValue('content', '');
+        closeSidebar();
+      }
     } catch (e) {
       // do nothing
     }
@@ -120,7 +131,7 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
     <S.Wrapper>
       <form onSubmit={handleSubmit(submit)}>
         <S.Columns>
-          <S.Column>
+          <S.FlexItem>
             <InputLabel>Partition</InputLabel>
             <Controller
               control={control}
@@ -137,47 +148,58 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
                 />
               )}
             />
-          </S.Column>
-          <S.Column>
-            <InputLabel>Key Serde</InputLabel>
+          </S.FlexItem>
+          <S.Flex>
+            <S.FlexItem>
+              <InputLabel>Key Serde</InputLabel>
+              <Controller
+                control={control}
+                name="keySerde"
+                render={({ field: { name, onChange, value } }) => (
+                  <Select
+                    id="selectKeySerdeOptions"
+                    aria-labelledby="selectKeySerdeOptions"
+                    name={name}
+                    onChange={onChange}
+                    minWidth="100%"
+                    options={getSerdeOptions(serdes.key || [])}
+                    value={value}
+                  />
+                )}
+              />
+            </S.FlexItem>
+            <S.FlexItem>
+              <InputLabel>Value Serde</InputLabel>
+              <Controller
+                control={control}
+                name="valueSerde"
+                render={({ field: { name, onChange, value } }) => (
+                  <Select
+                    id="selectValueSerdeOptions"
+                    aria-labelledby="selectValueSerdeOptions"
+                    name={name}
+                    onChange={onChange}
+                    minWidth="100%"
+                    options={getSerdeOptions(serdes.value || [])}
+                    value={value}
+                  />
+                )}
+              />
+            </S.FlexItem>
+          </S.Flex>
+          <div>
             <Controller
               control={control}
-              name="keySerde"
+              name="keepContents"
               render={({ field: { name, onChange, value } }) => (
-                <Select
-                  id="selectKeySerdeOptions"
-                  aria-labelledby="selectKeySerdeOptions"
-                  name={name}
-                  onChange={onChange}
-                  minWidth="100%"
-                  options={getSerdeOptions(serdes.key || [])}
-                  value={value}
-                />
+                <Switch name={name} onChange={onChange} checked={value} />
               )}
             />
-          </S.Column>
-          <S.Column>
-            <InputLabel>Value Serde</InputLabel>
-            <Controller
-              control={control}
-              name="valueSerde"
-              render={({ field: { name, onChange, value } }) => (
-                <Select
-                  id="selectValueSerdeOptions"
-                  aria-labelledby="selectValueSerdeOptions"
-                  name={name}
-                  onChange={onChange}
-                  minWidth="100%"
-                  options={getSerdeOptions(serdes.value || [])}
-                  value={value}
-                />
-              )}
-            />
-          </S.Column>
+            <InputLabel>Keep contents</InputLabel>
+          </div>
         </S.Columns>
-
         <S.Columns>
-          <S.Column>
+          <div>
             <InputLabel>Key</InputLabel>
             <Controller
               control={control}
@@ -191,8 +213,8 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
                 />
               )}
             />
-          </S.Column>
-          <S.Column>
+          </div>
+          <div>
             <InputLabel>Value</InputLabel>
             <Controller
               control={control}
@@ -206,10 +228,10 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
                 />
               )}
             />
-          </S.Column>
+          </div>
         </S.Columns>
         <S.Columns>
-          <S.Column>
+          <div>
             <InputLabel>Headers</InputLabel>
             <Controller
               control={control}
@@ -224,7 +246,7 @@ const SendMessage: React.FC<{ onSubmit: () => void }> = ({ onSubmit }) => {
                 />
               )}
             />
-          </S.Column>
+          </div>
         </S.Columns>
         <Button
           buttonSize="M"
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
index 609324b8f09..35137ef8643 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/__test__/SendMessage.spec.tsx
@@ -49,7 +49,7 @@ const renderComponent = async () => {
   const path = clusterTopicPath(clusterName, topicName);
   await render(
     <WithRoute path={clusterTopicPath()}>
-      <SendMessage onSubmit={mockOnSubmit} />
+      <SendMessage closeSidebar={mockOnSubmit} />
     </WithRoute>,
     { initialEntries: [path] }
   );
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index 9430e4b7499..ca4801c6dae 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -236,7 +236,7 @@ const Topic: React.FC = () => {
         title="Produce Message"
       >
         <Suspense fallback={<PageLoader />}>
-          <SendMessage onSubmit={closeSidebar} />
+          <SendMessage closeSidebar={closeSidebar} />
         </Suspense>
       </SlidingSidebar>
     </>
diff --git a/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts b/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts
index 710a85a86c1..4ccb4ae0b73 100644
--- a/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts
+++ b/kafka-ui-react-app/src/components/common/SlidingSidebar/SlidingSidebar.styled.ts
@@ -6,7 +6,7 @@ export const Wrapper = styled.div<{ $open?: boolean }>(
   position: fixed;
   top: ${theme.layout.navBarHeight};
   bottom: 0;
-  width: 60vw;
+  width: 37vw;
   right: calc(${$open ? '0px' : theme.layout.rightSidebarWidth} * -1);
   box-shadow: -1px 0px 10px 0px rgba(0, 0, 0, 0.2);
   transition: right 0.3s linear;

From 601bd6bbf50e833d79eaef63120a32b277143e36 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 26 Apr 2023 14:46:57 +0400
Subject: [PATCH 536/734] Minor BE fixes and improvements (#3719)

1. Not setting default key serde to SR/Proto if it is not explicitly set.
2. enabling searching connector by connect name
3. switch using serializedKeySize/serializedValueSize methods instead using byte array len check
---
 .../kafka/ui/serdes/ConsumerRecordDeserializer.java        | 4 ++--
 .../com/provectus/kafka/ui/serdes/SerdesInitializer.java   | 2 --
 .../provectus/kafka/ui/service/KafkaConnectService.java    | 1 +
 .../kafka/ui/service/analyze/TopicAnalysisStats.java       | 7 +++----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java
index 8c7a3024edf..f5b70180349 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java
@@ -123,11 +123,11 @@ private static Long getHeadersSize(ConsumerRecord<Bytes, Bytes> consumerRecord)
   }
 
   private static Long getKeySize(ConsumerRecord<Bytes, Bytes> consumerRecord) {
-    return consumerRecord.key() != null ? (long) consumerRecord.key().get().length : null;
+    return consumerRecord.key() != null ? (long) consumerRecord.serializedKeySize() : null;
   }
 
   private static Long getValueSize(ConsumerRecord<Bytes, Bytes> consumerRecord) {
-    return consumerRecord.value() != null ? (long) consumerRecord.value().get().length : null;
+    return consumerRecord.value() != null ? (long) consumerRecord.serializedValueSize() : null;
   }
 
   private static int headerSize(Header header) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
index 40ea320b2eb..66692894a61 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
@@ -122,8 +122,6 @@ public ClusterSerdes init(Environment env,
         registeredSerdes,
         Optional.ofNullable(clusterProperties.getDefaultKeySerde())
             .map(name -> Preconditions.checkNotNull(registeredSerdes.get(name), "Default key serde not found"))
-            .or(() -> Optional.ofNullable(registeredSerdes.get(SchemaRegistrySerde.name())))
-            .or(() -> Optional.ofNullable(registeredSerdes.get(ProtobufFileSerde.name())))
             .orElse(null),
         Optional.ofNullable(clusterProperties.getDefaultValueSerde())
             .map(name -> Preconditions.checkNotNull(registeredSerdes.get(name), "Default value serde not found"))
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
index d07ef7ed2dd..98b61541c5f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
@@ -109,6 +109,7 @@ private Predicate<FullConnectorInfoDTO> matchesSearchTerm(@Nullable final String
   private Stream<String> getStringsForSearch(FullConnectorInfoDTO fullConnectorInfo) {
     return Stream.of(
         fullConnectorInfo.getName(),
+        fullConnectorInfo.getConnect(),
         fullConnectorInfo.getStatus().getState().getValue(),
         fullConnectorInfo.getType().getValue());
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java
index d5b4400807d..f36d3bec4de 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisStats.java
@@ -43,8 +43,7 @@ static class SizeStats {
     Long max;
     final UpdateDoublesSketch sizeSketch = DoublesSketch.builder().build();
 
-    void apply(byte[] bytes) {
-      int len = bytes.length;
+    void apply(int len) {
       sum += len;
       min = minNullable(min, len);
       max = maxNullable(max, len);
@@ -98,7 +97,7 @@ void apply(ConsumerRecord<Bytes, Bytes> rec) {
 
     if (rec.key() != null) {
       byte[] keyBytes = rec.key().get();
-      keysSize.apply(keyBytes);
+      keysSize.apply(rec.serializedKeySize());
       uniqKeys.update(keyBytes);
     } else {
       nullKeys++;
@@ -106,7 +105,7 @@ void apply(ConsumerRecord<Bytes, Bytes> rec) {
 
     if (rec.value() != null) {
       byte[] valueBytes = rec.value().get();
-      valuesSize.apply(valueBytes);
+      valuesSize.apply(rec.serializedValueSize());
       uniqValues.update(valueBytes);
     } else {
       nullValues++;

From 4e255220788f39c15239fb1dda4e723339940ce9 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 27 Apr 2023 09:59:37 +0800
Subject: [PATCH 537/734] FE: Display message key/value serdes (#3718)

Co-authored-by: davitbejanyan <dbejanyan@provectus.com>
---
 .../Topics/Topic/Messages/Message.tsx         |  2 +
 .../MessageContent/MessageContent.tsx         | 13 ++--
 .../__tests__/MessageContent.spec.tsx         | 73 ++-----------------
 3 files changed, 15 insertions(+), 73 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index fb4e258cca5..dd5cfae7488 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -142,6 +142,8 @@ const Message: React.FC<Props> = ({
           timestampType={timestampType}
           keySize={keySize}
           contentSize={valueSize}
+          keySerde={keySerde}
+          valueSerde={valueSerde}
         />
       )}
     </>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
index 93616ca432a..d1237ba0d40 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/MessageContent.tsx
@@ -3,7 +3,6 @@ import EditorViewer from 'components/common/EditorViewer/EditorViewer';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { SchemaType, TopicMessageTimestampTypeEnum } from 'generated-sources';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
-import { useSearchParams } from 'react-router-dom';
 
 import * as S from './MessageContent.styled';
 
@@ -17,6 +16,8 @@ export interface MessageContentProps {
   timestampType?: TopicMessageTimestampTypeEnum;
   keySize?: number;
   contentSize?: number;
+  keySerde?: string;
+  valueSerde?: string;
 }
 
 const MessageContent: React.FC<MessageContentProps> = ({
@@ -27,12 +28,10 @@ const MessageContent: React.FC<MessageContentProps> = ({
   timestampType,
   keySize,
   contentSize,
+  keySerde,
+  valueSerde,
 }) => {
   const [activeTab, setActiveTab] = React.useState<Tab>('content');
-  const [searchParams] = useSearchParams();
-  const keyFormat = searchParams.get('keySerde') || '';
-  const valueFormat = searchParams.get('valueSerde') || '';
-
   const activeTabContent = () => {
     switch (activeTab) {
       case 'content':
@@ -110,7 +109,7 @@ const MessageContent: React.FC<MessageContentProps> = ({
             <S.Metadata>
               <S.MetadataLabel>Key Serde</S.MetadataLabel>
               <span>
-                <S.MetadataValue>{keyFormat}</S.MetadataValue>
+                <S.MetadataValue>{keySerde}</S.MetadataValue>
                 <S.MetadataMeta>
                   Size: <BytesFormatted value={keySize} />
                 </S.MetadataMeta>
@@ -120,7 +119,7 @@ const MessageContent: React.FC<MessageContentProps> = ({
             <S.Metadata>
               <S.MetadataLabel>Value Serde</S.MetadataLabel>
               <span>
-                <S.MetadataValue>{valueFormat}</S.MetadataValue>
+                <S.MetadataValue>{valueSerde}</S.MetadataValue>
                 <S.MetadataMeta>
                   Size: <BytesFormatted value={contentSize} />
                 </S.MetadataMeta>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
index 91310a30e41..d76455242cf 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/MessageContent/__tests__/MessageContent.spec.tsx
@@ -20,6 +20,8 @@ const setupWrapper = (props?: Partial<MessageContentProps>) => {
           headers={{ header: 'test' }}
           timestamp={new Date(0)}
           timestampType={TopicMessageTimestampTypeEnum.CREATE_TIME}
+          keySerde="SchemaRegistry"
+          valueSerde="Avro"
           {...props}
         />
       </tbody>
@@ -27,42 +29,20 @@ const setupWrapper = (props?: Partial<MessageContentProps>) => {
   );
 };
 
-const proto =
-  'syntax = "proto3";\npackage com.provectus;\n\nmessage TestProtoRecord {\n  string f1 = 1;\n  int32 f2 = 2;\n}\n';
-
 global.TextEncoder = TextEncoder;
 
-const searchParamsContentAVRO = new URLSearchParams({
-  keySerde: 'SchemaRegistry',
-  valueSerde: 'AVRO',
-  limit: '100',
-});
-
-const searchParamsContentJSON = new URLSearchParams({
-  keySerde: 'SchemaRegistry',
-  valueSerde: 'JSON',
-  limit: '100',
-});
-
-const searchParamsContentPROTOBUF = new URLSearchParams({
-  keySerde: 'SchemaRegistry',
-  valueSerde: 'PROTOBUF',
-  limit: '100',
-});
 describe('MessageContent screen', () => {
   beforeEach(() => {
-    render(setupWrapper(), {
-      initialEntries: [`/messages?${searchParamsContentAVRO}`],
-    });
+    render(setupWrapper());
   });
 
-  describe('renders', () => {
-    it('key format in document', () => {
+  describe('Checking keySerde and valueSerde', () => {
+    it('keySerde in document', () => {
       expect(screen.getByText('SchemaRegistry')).toBeInTheDocument();
     });
 
-    it('content format in document', () => {
-      expect(screen.getByText('AVRO')).toBeInTheDocument();
+    it('valueSerde in document', () => {
+      expect(screen.getByText('Avro')).toBeInTheDocument();
     });
   });
 
@@ -98,42 +78,3 @@ describe('MessageContent screen', () => {
     });
   });
 });
-
-describe('checking content type depend on message type', () => {
-  it('renders component with message having JSON type', () => {
-    render(
-      setupWrapper({
-        messageContent: '{"data": "test"}',
-      }),
-      { initialEntries: [`/messages?${searchParamsContentJSON}`] }
-    );
-    expect(screen.getByText('JSON')).toBeInTheDocument();
-  });
-  it('renders component with message having AVRO type', () => {
-    render(
-      setupWrapper({
-        messageContent: '{"data": "test"}',
-      }),
-      { initialEntries: [`/messages?${searchParamsContentAVRO}`] }
-    );
-    expect(screen.getByText('AVRO')).toBeInTheDocument();
-  });
-  it('renders component with message having PROTOBUF type', () => {
-    render(
-      setupWrapper({
-        messageContent: proto,
-      }),
-      { initialEntries: [`/messages?${searchParamsContentPROTOBUF}`] }
-    );
-    expect(screen.getByText('PROTOBUF')).toBeInTheDocument();
-  });
-  it('renders component with message having no type which is equal to having PROTOBUF type', () => {
-    render(
-      setupWrapper({
-        messageContent: '',
-      }),
-      { initialEntries: [`/messages?${searchParamsContentPROTOBUF}`] }
-    );
-    expect(screen.getByText('PROTOBUF')).toBeInTheDocument();
-  });
-});

From da3932e3422e45bdb0dc27cf538b79c8bf872602 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Thu, 27 Apr 2023 06:01:38 +0400
Subject: [PATCH 538/734] FE: Impl a possibility to opt out of version check
 (#3672)

---
 .../src/components/Version/Version.tsx        | 30 ++-----
 .../Version/__tests__/Version.spec.tsx        | 85 +++++--------------
 .../components/common/Icons/WarningIcon.tsx   |  1 +
 .../src/lib/fixtures/actuatorInfo.ts          | 12 ---
 .../src/lib/fixtures/latestVersion.ts         | 15 +++-
 .../hooks/api/__tests__/actuatorInfo.spec.ts  | 17 ----
 .../hooks/api/__tests__/latestVersion.spec.ts | 12 ++-
 .../src/lib/hooks/api/actuatorInfo.ts         | 19 -----
 .../src/lib/hooks/api/latestVersion.ts        | 18 ++--
 9 files changed, 55 insertions(+), 154 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/lib/fixtures/actuatorInfo.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/api/__tests__/actuatorInfo.spec.ts
 delete mode 100644 kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts

diff --git a/kafka-ui-react-app/src/components/Version/Version.tsx b/kafka-ui-react-app/src/components/Version/Version.tsx
index 7a820b116a2..6788605d92b 100644
--- a/kafka-ui-react-app/src/components/Version/Version.tsx
+++ b/kafka-ui-react-app/src/components/Version/Version.tsx
@@ -1,52 +1,38 @@
 import React from 'react';
 import WarningIcon from 'components/common/Icons/WarningIcon';
 import { gitCommitPath } from 'lib/paths';
-import { useActuatorInfo } from 'lib/hooks/api/actuatorInfo';
-import { BUILD_VERSION_PATTERN } from 'lib/constants';
 import { useLatestVersion } from 'lib/hooks/api/latestVersion';
 import { formatTimestamp } from 'lib/dateTimeHelpers';
 
 import * as S from './Version.styled';
-import compareVersions from './compareVersions';
 
 const Version: React.FC = () => {
-  const { data: actuatorInfo = {} } = useActuatorInfo();
   const { data: latestVersionInfo = {} } = useLatestVersion();
-
-  const tag = actuatorInfo?.build?.version;
-  const commit = actuatorInfo?.git?.commit.id;
-  const { tag_name: latestTag } = latestVersionInfo;
-
-  const outdated = compareVersions(tag, latestTag);
-
-  const currentVersion = tag?.match(BUILD_VERSION_PATTERN)
-    ? tag
-    : formatTimestamp(actuatorInfo?.build?.time);
-
-  if (!tag) return null;
+  const { buildTime, commitId, isLatestRelease } = latestVersionInfo.build;
+  const { versionTag } = latestVersionInfo?.latestRelease || '';
 
   return (
     <S.Wrapper>
-      {!!outdated && (
+      {!isLatestRelease && (
         <S.OutdatedWarning
-          title={`Your app version is outdated. Current latest version is ${latestTag}`}
+          title={`Your app version is outdated. Current latest version is ${versionTag}`}
         >
           <WarningIcon />
         </S.OutdatedWarning>
       )}
 
-      {commit && (
+      {commitId && (
         <div>
           <S.CurrentCommitLink
             title="Current commit"
             target="__blank"
-            href={gitCommitPath(commit)}
+            href={gitCommitPath(commitId)}
           >
-            {commit}
+            {commitId}
           </S.CurrentCommitLink>
         </div>
       )}
-      <S.CurrentVersion>{currentVersion}</S.CurrentVersion>
+      <S.CurrentVersion>{formatTimestamp(buildTime)}</S.CurrentVersion>
     </S.Wrapper>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx b/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx
index d407966058c..2700dac8947 100644
--- a/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx
+++ b/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx
@@ -2,87 +2,40 @@ import React from 'react';
 import { screen } from '@testing-library/dom';
 import Version from 'components/Version/Version';
 import { render } from 'lib/testHelpers';
-import { formatTimestamp } from 'lib/dateTimeHelpers';
-import { useActuatorInfo } from 'lib/hooks/api/actuatorInfo';
 import { useLatestVersion } from 'lib/hooks/api/latestVersion';
-import { actuatorInfoPayload } from 'lib/fixtures/actuatorInfo';
-import { latestVersionPayload } from 'lib/fixtures/latestVersion';
+import {
+  deprecatedVersionPayload,
+  latestVersionPayload,
+} from 'lib/fixtures/latestVersion';
 
-jest.mock('lib/hooks/api/actuatorInfo', () => ({
-  useActuatorInfo: jest.fn(),
-}));
 jest.mock('lib/hooks/api/latestVersion', () => ({
   useLatestVersion: jest.fn(),
 }));
-
 describe('Version Component', () => {
-  const versionTag = 'v0.5.0';
-  const snapshotTag = 'test-SNAPSHOT';
-  const commitTag = 'befd3b328e2c9c7df57b0c5746561b2f7fee8813';
-
-  const actuatorVersionPayload = actuatorInfoPayload(versionTag);
-  const formattedTimestamp = formatTimestamp(actuatorVersionPayload.build.time);
-
-  beforeEach(() => {
-    (useActuatorInfo as jest.Mock).mockImplementation(() => ({
-      data: actuatorVersionPayload,
-    }));
-    (useLatestVersion as jest.Mock).mockImplementation(() => ({
-      data: latestVersionPayload,
-    }));
-  });
-
-  describe('tag does not exist', () => {
-    it('does not render component', async () => {
-      (useActuatorInfo as jest.Mock).mockImplementation(() => ({
-        data: null,
-      }));
-      const { container } = render(<Version />);
-      expect(container.firstChild).toBeEmptyDOMElement();
-    });
-  });
+  const commitId = '96a577a';
 
-  describe('renders current version', () => {
-    it('renders release build version as current version', async () => {
-      render(<Version />);
-      expect(screen.getByText(versionTag)).toBeInTheDocument();
-    });
-    it('renders formatted timestamp as current version when version is commit', async () => {
-      (useActuatorInfo as jest.Mock).mockImplementation(() => ({
-        data: actuatorInfoPayload(commitTag),
+  describe('render latest version', () => {
+    beforeEach(() => {
+      (useLatestVersion as jest.Mock).mockImplementation(() => ({
+        data: latestVersionPayload,
       }));
-      render(<Version />);
-      expect(screen.getByText(formattedTimestamp)).toBeInTheDocument();
     });
-    it('renders formatted timestamp as current version when version contains -SNAPSHOT', async () => {
-      (useActuatorInfo as jest.Mock).mockImplementation(() => ({
-        data: actuatorInfoPayload(snapshotTag),
-      }));
+    it('renders latest release version as current version', async () => {
       render(<Version />);
-      expect(screen.getByText(formattedTimestamp)).toBeInTheDocument();
+      expect(screen.getByText(commitId)).toBeInTheDocument();
     });
-  });
 
-  describe('outdated build version', () => {
-    it('renders warning message', async () => {
-      (useActuatorInfo as jest.Mock).mockImplementation(() => ({
-        data: actuatorInfoPayload('v0.3.0'),
-      }));
+    it('should not show warning icon if it is last release', async () => {
       render(<Version />);
-      expect(
-        screen.getByTitle(
-          `Your app version is outdated. Current latest version is ${latestVersionPayload.tag_name}`
-        )
-      ).toBeInTheDocument();
+      expect(screen.queryByRole('img')).not.toBeInTheDocument();
     });
   });
 
-  describe('current commit id with link', () => {
-    it('renders', async () => {
-      render(<Version />);
-      expect(
-        screen.getByText(actuatorVersionPayload.git.commit.id)
-      ).toBeInTheDocument();
-    });
+  it('show warning icon if it is not last release', async () => {
+    (useLatestVersion as jest.Mock).mockImplementation(() => ({
+      data: deprecatedVersionPayload,
+    }));
+    render(<Version />);
+    expect(screen.getByRole('img')).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/common/Icons/WarningIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/WarningIcon.tsx
index ab2f8dee759..1bffe0db537 100644
--- a/kafka-ui-react-app/src/components/common/Icons/WarningIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/WarningIcon.tsx
@@ -13,6 +13,7 @@ const WarningIcon: React.FC = () => {
   return (
     <WarningIconContainer>
       <svg
+        role="img"
         width="14"
         height="13"
         viewBox="0 0 14 13"
diff --git a/kafka-ui-react-app/src/lib/fixtures/actuatorInfo.ts b/kafka-ui-react-app/src/lib/fixtures/actuatorInfo.ts
deleted file mode 100644
index e7dff6e1eca..00000000000
--- a/kafka-ui-react-app/src/lib/fixtures/actuatorInfo.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export const actuatorInfoPayload = (
-  version = 'befd3b328e2c9c7df57b0c5746561b2f7fee8813'
-) => ({
-  git: { commit: { id: 'befd3b3' } },
-  build: {
-    artifact: 'kafka-ui-api',
-    name: 'kafka-ui-api',
-    time: '2022-09-15T09:52:21.753Z',
-    version,
-    group: 'com.provectus',
-  },
-});
diff --git a/kafka-ui-react-app/src/lib/fixtures/latestVersion.ts b/kafka-ui-react-app/src/lib/fixtures/latestVersion.ts
index a6c9eca856e..d1e62da6b80 100644
--- a/kafka-ui-react-app/src/lib/fixtures/latestVersion.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/latestVersion.ts
@@ -1,3 +1,16 @@
+export const deprecatedVersionPayload = {
+  build: {
+    buildTime: '2023-04-14T09:47:35.463Z',
+    commitId: '96a577a',
+    isLatestRelease: false,
+    version: '96a577a98c6069376c5d22ed49cffd3739f1bbdc',
+  },
+};
 export const latestVersionPayload = {
-  tag_name: 'v0.4.0',
+  build: {
+    buildTime: '2023-04-14T09:47:35.463Z',
+    commitId: '96a577a',
+    isLatestRelease: true,
+    version: '96a577a98c6069376c5d22ed49cffd3739f1bbdc',
+  },
 };
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/actuatorInfo.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/actuatorInfo.spec.ts
deleted file mode 100644
index c4e639680ed..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/actuatorInfo.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import fetchMock from 'fetch-mock';
-import * as hooks from 'lib/hooks/api/actuatorInfo';
-import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
-import { actuatorInfoPayload } from 'lib/fixtures/actuatorInfo';
-
-const actuatorInfoPath = '/actuator/info';
-
-describe('Actuator info hooks', () => {
-  beforeEach(() => fetchMock.restore());
-  describe('useActuatorInfo', () => {
-    it('returns the correct data', async () => {
-      const mock = fetchMock.getOnce(actuatorInfoPath, actuatorInfoPayload());
-      const { result } = renderQueryHook(() => hooks.useActuatorInfo());
-      await expectQueryWorks(mock, result);
-    });
-  });
-});
diff --git a/kafka-ui-react-app/src/lib/hooks/api/__tests__/latestVersion.spec.ts b/kafka-ui-react-app/src/lib/hooks/api/__tests__/latestVersion.spec.ts
index 0770bd4606d..a12f2629950 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/__tests__/latestVersion.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/__tests__/latestVersion.spec.ts
@@ -1,18 +1,16 @@
 import fetchMock from 'fetch-mock';
 import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
-import * as hooks from 'lib/hooks/api/latestVersion';
-import { GIT_REPO_LATEST_RELEASE_LINK } from 'lib/constants';
 import { latestVersionPayload } from 'lib/fixtures/latestVersion';
+import { useLatestVersion } from 'lib/hooks/api/latestVersion';
+
+const latestVersionPath = '/api/info';
 
 describe('Latest version hooks', () => {
   beforeEach(() => fetchMock.restore());
   describe('useLatestVersion', () => {
     it('returns the correct data', async () => {
-      const mock = fetchMock.getOnce(
-        GIT_REPO_LATEST_RELEASE_LINK,
-        latestVersionPayload
-      );
-      const { result } = renderQueryHook(() => hooks.useLatestVersion());
+      const mock = fetchMock.getOnce(latestVersionPath, latestVersionPayload);
+      const { result } = renderQueryHook(() => useLatestVersion());
       await expectQueryWorks(mock, result);
     });
   });
diff --git a/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts b/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts
deleted file mode 100644
index 7e1835d9079..00000000000
--- a/kafka-ui-react-app/src/lib/hooks/api/actuatorInfo.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { BASE_PARAMS, QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
-
-const fetchActuatorInfo = async () => {
-  const data = await fetch(
-    `${BASE_PARAMS.basePath}/actuator/info`,
-    BASE_PARAMS
-  ).then((res) => res.json());
-
-  return data;
-};
-
-export function useActuatorInfo() {
-  return useQuery(
-    ['actuatorInfo'],
-    fetchActuatorInfo,
-    QUERY_REFETCH_OFF_OPTIONS
-  );
-}
diff --git a/kafka-ui-react-app/src/lib/hooks/api/latestVersion.ts b/kafka-ui-react-app/src/lib/hooks/api/latestVersion.ts
index 1087fb572e1..0711ad34d91 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/latestVersion.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/latestVersion.ts
@@ -1,21 +1,19 @@
 import { useQuery } from '@tanstack/react-query';
-import {
-  QUERY_REFETCH_OFF_OPTIONS,
-  GIT_REPO_LATEST_RELEASE_LINK,
-} from 'lib/constants';
+import { BASE_PARAMS, QUERY_REFETCH_OFF_OPTIONS } from 'lib/constants';
 
-const fetchLatestVersion = async () => {
-  const data = await fetch(GIT_REPO_LATEST_RELEASE_LINK).then((res) =>
-    res.json()
-  );
+const fetchLatestVersionInfo = async () => {
+  const data = await fetch(
+    `${BASE_PARAMS.basePath}/api/info`,
+    BASE_PARAMS
+  ).then((res) => res.json());
 
   return data;
 };
 
 export function useLatestVersion() {
   return useQuery(
-    ['latestVersion'],
-    fetchLatestVersion,
+    ['versionInfo'],
+    fetchLatestVersionInfo,
     QUERY_REFETCH_OFF_OPTIONS
   );
 }

From 744bdb32a310306eefe8641923d712db697b1c70 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 1 May 2023 07:56:28 +0800
Subject: [PATCH 539/734] BE: RBAC: LDAP support implemented (#3700)

---
 .../kafka/ui/config/auth/LdapProperties.java  | 26 +++++
 .../ui/config/auth/LdapSecurityConfig.java    | 96 ++++++++++++-------
 .../ui/config/auth/OAuthSecurityConfig.java   |  2 +-
 .../kafka/ui/config/auth/RbacLdapUser.java    | 60 ++++++++++++
 .../condition/ActiveDirectoryCondition.java   | 21 ++++
 .../ui/service/rbac/AccessControlService.java | 30 +++---
 .../extractor/LdapAuthorityExtractor.java     | 23 -----
 .../RbacLdapAuthoritiesExtractor.java         | 70 ++++++++++++++
 8 files changed, 258 insertions(+), 70 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacLdapUser.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/ActiveDirectoryCondition.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/LdapAuthorityExtractor.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
new file mode 100644
index 00000000000..13119b3bb94
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
@@ -0,0 +1,26 @@
+package com.provectus.kafka.ui.config.auth;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("spring.ldap")
+@Data
+public class LdapProperties {
+
+  private String urls;
+  private String base;
+  private String adminUser;
+  private String adminPassword;
+  private String userFilterSearchBase;
+  private String userFilterSearchFilter;
+
+  @Value("${oauth2.ldap.activeDirectory:false}")
+  private boolean isActiveDirectory;
+  @Value("${oauth2.ldap.aсtiveDirectory.domain:@null}")
+  private String activeDirectoryDomain;
+
+  @Value("${oauth2.ldap.groupRoleAttribute:cn}")
+  private String groupRoleAttribute;
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
index 0ba5c231f4b..fae1125239e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
@@ -1,13 +1,23 @@
 package com.provectus.kafka.ui.config.auth;
 
+import static com.provectus.kafka.ui.config.auth.AbstractAuthSecurityConfig.AUTH_WHITELIST;
+
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import com.provectus.kafka.ui.service.rbac.extractor.RbacLdapAuthoritiesExtractor;
+import java.util.Collection;
 import java.util.List;
+import javax.annotation.Nullable;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.support.BaseLdapPathContextSource;
 import org.springframework.ldap.core.support.LdapContextSource;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -16,70 +26,71 @@
 import org.springframework.security.authentication.ReactiveAuthenticationManagerAdapter;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.ldap.authentication.AbstractLdapAuthenticationProvider;
 import org.springframework.security.ldap.authentication.BindAuthenticator;
 import org.springframework.security.ldap.authentication.LdapAuthenticationProvider;
 import org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.ldap.search.LdapUserSearch;
+import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 
 @Configuration
 @EnableWebFluxSecurity
 @ConditionalOnProperty(value = "auth.type", havingValue = "LDAP")
 @Import(LdapAutoConfiguration.class)
+@EnableConfigurationProperties(LdapProperties.class)
+@RequiredArgsConstructor
 @Slf4j
-public class LdapSecurityConfig extends AbstractAuthSecurityConfig {
-
-  @Value("${spring.ldap.urls}")
-  private String ldapUrls;
-  @Value("${spring.ldap.dn.pattern:#{null}}")
-  private String ldapUserDnPattern;
-  @Value("${spring.ldap.adminUser:#{null}}")
-  private String adminUser;
-  @Value("${spring.ldap.adminPassword:#{null}}")
-  private String adminPassword;
-  @Value("${spring.ldap.userFilter.searchBase:#{null}}")
-  private String userFilterSearchBase;
-  @Value("${spring.ldap.userFilter.searchFilter:#{null}}")
-  private String userFilterSearchFilter;
-
-  @Value("${oauth2.ldap.activeDirectory:false}")
-  private boolean isActiveDirectory;
-  @Value("${oauth2.ldap.aсtiveDirectory.domain:#{null}}")
-  private String activeDirectoryDomain;
+public class LdapSecurityConfig {
+
+  private final LdapProperties props;
 
   @Bean
-  public ReactiveAuthenticationManager authenticationManager(BaseLdapPathContextSource contextSource) {
+  public ReactiveAuthenticationManager authenticationManager(BaseLdapPathContextSource contextSource,
+                                                             ApplicationContext context,
+                                                             @Nullable AccessControlService acs) {
+    var rbacEnabled = acs != null && acs.isRbacEnabled();
     BindAuthenticator ba = new BindAuthenticator(contextSource);
-    if (ldapUserDnPattern != null) {
-      ba.setUserDnPatterns(new String[] {ldapUserDnPattern});
+    if (props.getBase() != null) {
+      ba.setUserDnPatterns(new String[] {props.getBase()});
     }
-    if (userFilterSearchFilter != null) {
+    if (props.getUserFilterSearchFilter() != null) {
       LdapUserSearch userSearch =
-          new FilterBasedLdapUserSearch(userFilterSearchBase, userFilterSearchFilter, contextSource);
+          new FilterBasedLdapUserSearch(props.getUserFilterSearchBase(), props.getUserFilterSearchFilter(),
+              contextSource);
       ba.setUserSearch(userSearch);
     }
 
     AbstractLdapAuthenticationProvider authenticationProvider;
-    if (!isActiveDirectory) {
-      authenticationProvider = new LdapAuthenticationProvider(ba);
+    if (!props.isActiveDirectory()) {
+      authenticationProvider = rbacEnabled
+          ? new LdapAuthenticationProvider(ba, new RbacLdapAuthoritiesExtractor(context))
+          : new LdapAuthenticationProvider(ba);
     } else {
-      authenticationProvider = new ActiveDirectoryLdapAuthenticationProvider(activeDirectoryDomain, ldapUrls);
+      authenticationProvider = new ActiveDirectoryLdapAuthenticationProvider(props.getActiveDirectoryDomain(),
+          props.getUrls()); // TODO Issue #3741
       authenticationProvider.setUseAuthenticationRequestCredentials(true);
     }
 
+    if (rbacEnabled) {
+      authenticationProvider.setUserDetailsContextMapper(new UserDetailsMapper());
+    }
+
     AuthenticationManager am = new ProviderManager(List.of(authenticationProvider));
 
     return new ReactiveAuthenticationManagerAdapter(am);
   }
 
   @Bean
+  @Primary
   public BaseLdapPathContextSource contextSource() {
     LdapContextSource ctx = new LdapContextSource();
-    ctx.setUrl(ldapUrls);
-    ctx.setUserDn(adminUser);
-    ctx.setPassword(adminPassword);
+    ctx.setUrl(props.getUrls());
+    ctx.setUserDn(props.getAdminUser());
+    ctx.setPassword(props.getAdminPassword());
     ctx.afterPropertiesSet();
     return ctx;
   }
@@ -87,20 +98,35 @@ public BaseLdapPathContextSource contextSource() {
   @Bean
   public SecurityWebFilterChain configureLdap(ServerHttpSecurity http) {
     log.info("Configuring LDAP authentication.");
-    if (isActiveDirectory) {
+    if (props.isActiveDirectory()) {
       log.info("Active Directory support for LDAP has been enabled.");
     }
 
-    http
+    return http
         .authorizeExchange()
         .pathMatchers(AUTH_WHITELIST)
         .permitAll()
         .anyExchange()
         .authenticated()
+
         .and()
-        .httpBasic();
+        .formLogin()
 
-    return http.csrf().disable().build();
+        .and()
+        .logout()
+
+        .and()
+        .csrf().disable()
+        .build();
+  }
+
+  private static class UserDetailsMapper extends LdapUserDetailsMapper {
+    @Override
+    public UserDetails mapUserFromContext(DirContextOperations ctx, String username,
+                                          Collection<? extends GrantedAuthority> authorities) {
+      UserDetails userDetails = super.mapUserFromContext(ctx, username, authorities);
+      return new RbacLdapUser(userDetails);
+    }
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
index 1d237e01736..5db612f256e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
@@ -115,7 +115,7 @@ public ServerLogoutSuccessHandler defaultOidcLogoutHandler(final ReactiveClientR
   @Nullable
   private ProviderAuthorityExtractor getExtractor(final String providerId, AccessControlService acs) {
     final String provider = getProviderByProviderId(providerId);
-    Optional<ProviderAuthorityExtractor> extractor = acs.getExtractors()
+    Optional<ProviderAuthorityExtractor> extractor = acs.getOauthExtractors()
         .stream()
         .filter(e -> e.isApplicable(provider))
         .findFirst();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacLdapUser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacLdapUser.java
new file mode 100644
index 00000000000..037d2fd3020
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacLdapUser.java
@@ -0,0 +1,60 @@
+package com.provectus.kafka.ui.config.auth;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+public class RbacLdapUser implements UserDetails, RbacUser {
+
+  private final UserDetails userDetails;
+
+  public RbacLdapUser(UserDetails userDetails) {
+    this.userDetails = userDetails;
+  }
+
+  @Override
+  public String name() {
+    return userDetails.getUsername();
+  }
+
+  @Override
+  public Collection<String> groups() {
+    return userDetails.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toSet());
+  }
+
+  @Override
+  public Collection<? extends GrantedAuthority> getAuthorities() {
+    return userDetails.getAuthorities();
+  }
+
+  @Override
+  public String getPassword() {
+    return userDetails.getPassword();
+  }
+
+  @Override
+  public String getUsername() {
+    return userDetails.getUsername();
+  }
+
+  @Override
+  public boolean isAccountNonExpired() {
+    return userDetails.isAccountNonExpired();
+  }
+
+  @Override
+  public boolean isAccountNonLocked() {
+    return userDetails.isAccountNonLocked();
+  }
+
+  @Override
+  public boolean isCredentialsNonExpired() {
+    return userDetails.isCredentialsNonExpired();
+  }
+
+  @Override
+  public boolean isEnabled() {
+    return userDetails.isEnabled();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/ActiveDirectoryCondition.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/ActiveDirectoryCondition.java
new file mode 100644
index 00000000000..c38e83238af
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/ActiveDirectoryCondition.java
@@ -0,0 +1,21 @@
+package com.provectus.kafka.ui.config.auth.condition;
+
+import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+public class ActiveDirectoryCondition extends AllNestedConditions {
+
+  public ActiveDirectoryCondition() {
+    super(ConfigurationPhase.PARSE_CONFIGURATION);
+  }
+
+  @ConditionalOnProperty(value = "auth.type", havingValue = "LDAP")
+  public static class OnAuthType {
+
+  }
+
+  @ConditionalOnProperty(value = "${oauth2.ldap.activeDirectory}:false", havingValue = "true", matchIfMissing = false)
+  public static class OnActiveDirectory {
+
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index 3178feae34c..e964f64a9bf 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -12,6 +12,7 @@
 import com.provectus.kafka.ui.model.rbac.Permission;
 import com.provectus.kafka.ui.model.rbac.Resource;
 import com.provectus.kafka.ui.model.rbac.Role;
+import com.provectus.kafka.ui.model.rbac.Subject;
 import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction;
 import com.provectus.kafka.ui.model.rbac.permission.SchemaAction;
@@ -19,11 +20,11 @@
 import com.provectus.kafka.ui.service.rbac.extractor.CognitoAuthorityExtractor;
 import com.provectus.kafka.ui.service.rbac.extractor.GithubAuthorityExtractor;
 import com.provectus.kafka.ui.service.rbac.extractor.GoogleAuthorityExtractor;
-import com.provectus.kafka.ui.service.rbac.extractor.LdapAuthorityExtractor;
 import com.provectus.kafka.ui.service.rbac.extractor.ProviderAuthorityExtractor;
 import jakarta.annotation.PostConstruct;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -34,6 +35,7 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.core.env.Environment;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.security.core.context.SecurityContext;
@@ -50,10 +52,11 @@ public class AccessControlService {
 
   @Nullable
   private final InMemoryReactiveClientRegistrationRepository clientRegistrationRepository;
+  private final RoleBasedAccessControlProperties properties;
+  private final Environment environment;
 
   private boolean rbacEnabled = false;
-  private Set<ProviderAuthorityExtractor> extractors = Collections.emptySet();
-  private final RoleBasedAccessControlProperties properties;
+  private Set<ProviderAuthorityExtractor> oauthExtractors = Collections.emptySet();
 
   @PostConstruct
   public void init() {
@@ -63,21 +66,26 @@ public void init() {
     }
     rbacEnabled = true;
 
-    this.extractors = properties.getRoles()
+    this.oauthExtractors = properties.getRoles()
         .stream()
         .map(role -> role.getSubjects()
             .stream()
-            .map(provider -> switch (provider.getProvider()) {
+            .map(Subject::getProvider)
+            .distinct()
+            .map(provider -> switch (provider) {
               case OAUTH_COGNITO -> new CognitoAuthorityExtractor();
               case OAUTH_GOOGLE -> new GoogleAuthorityExtractor();
               case OAUTH_GITHUB -> new GithubAuthorityExtractor();
-              case LDAP, LDAP_AD -> new LdapAuthorityExtractor();
-            }).collect(Collectors.toSet()))
+              default -> null;
+            })
+            .filter(Objects::nonNull)
+            .collect(Collectors.toSet()))
         .flatMap(Set::stream)
         .collect(Collectors.toSet());
 
-    if ((clientRegistrationRepository == null || !clientRegistrationRepository.iterator().hasNext())
-        && !properties.getRoles().isEmpty()) {
+    if (!properties.getRoles().isEmpty()
+        && "oauth2".equalsIgnoreCase(environment.getProperty("auth.type"))
+        && (clientRegistrationRepository == null || !clientRegistrationRepository.iterator().hasNext())) {
       log.error("Roles are configured but no authentication methods are present. Authentication might fail.");
     }
   }
@@ -354,8 +362,8 @@ private boolean isKsqlAccessible(AccessContext context, AuthenticatedUser user)
     return isAccessible(Resource.KSQL, null, user, context, requiredActions);
   }
 
-  public Set<ProviderAuthorityExtractor> getExtractors() {
-    return extractors;
+  public Set<ProviderAuthorityExtractor> getOauthExtractors() {
+    return oauthExtractors;
   }
 
   public List<Role> getRoles() {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/LdapAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/LdapAuthorityExtractor.java
deleted file mode 100644
index 6284bb29234..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/LdapAuthorityExtractor.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.provectus.kafka.ui.service.rbac.extractor;
-
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import lombok.extern.slf4j.Slf4j;
-import reactor.core.publisher.Mono;
-
-@Slf4j
-public class LdapAuthorityExtractor implements ProviderAuthorityExtractor {
-
-  @Override
-  public boolean isApplicable(String provider) {
-    return false; // TODO #2752
-  }
-
-  @Override
-  public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<String, Object> additionalParams) {
-    return Mono.just(Collections.emptySet()); // TODO #2752
-  }
-
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java
new file mode 100644
index 00000000000..e24fc0aeda9
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java
@@ -0,0 +1,70 @@
+package com.provectus.kafka.ui.service.rbac.extractor;
+
+import com.provectus.kafka.ui.config.auth.LdapProperties;
+import com.provectus.kafka.ui.model.rbac.Role;
+import com.provectus.kafka.ui.model.rbac.provider.Provider;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationContext;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.support.BaseLdapPathContextSource;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator;
+import org.springframework.util.Assert;
+
+@Slf4j
+public class RbacLdapAuthoritiesExtractor extends DefaultLdapAuthoritiesPopulator {
+
+  private final AccessControlService acs;
+  private final LdapProperties props;
+
+  private final Function<Map<String, List<String>>, GrantedAuthority> authorityMapper = (record) -> {
+    String role = record.get(getGroupRoleAttribute()).get(0);
+    return new SimpleGrantedAuthority(role);
+  };
+
+  public RbacLdapAuthoritiesExtractor(ApplicationContext context) {
+    super(context.getBean(BaseLdapPathContextSource.class), null);
+    this.acs = context.getBean(AccessControlService.class);
+    this.props = context.getBean(LdapProperties.class);
+  }
+
+  @Override
+  public Set<GrantedAuthority> getAdditionalRoles(DirContextOperations user, String username) {
+    return acs.getRoles()
+        .stream()
+        .map(Role::getSubjects)
+        .flatMap(List::stream)
+        .filter(s -> s.getProvider().equals(Provider.LDAP))
+        .filter(s -> s.getType().equals("group"))
+        .flatMap(subject -> getRoles(subject.getValue(), user.getNameInNamespace(), username).stream())
+        .collect(Collectors.toSet());
+  }
+
+  private Set<GrantedAuthority> getRoles(String groupSearchBase, String userDn, String username) {
+    Assert.notNull(groupSearchBase, "groupSearchBase is empty");
+
+    log.trace(
+        "Searching for roles for user [{}] with DN [{}], groupRoleAttribute [{}] and filter [{}] in search base [{}]",
+        username, userDn, props.getGroupRoleAttribute(), getGroupSearchFilter(), groupSearchBase);
+
+    var ldapTemplate = getLdapTemplate();
+    ldapTemplate.setIgnoreNameNotFoundException(true);
+
+    Set<Map<String, List<String>>> userRoles = ldapTemplate.searchForMultipleAttributeValues(
+        groupSearchBase, getGroupSearchFilter(), new String[] {userDn, username},
+        new String[] {props.getGroupRoleAttribute()});
+
+    return userRoles.stream()
+        .map(authorityMapper)
+        .peek(a -> log.debug("Mapped role [{}] for user [{}]", a, username))
+        .collect(Collectors.toSet());
+  }
+
+}

From c7a7921b8242b819ebb80769eb3966fd69c26329 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 1 May 2023 04:17:53 +0400
Subject: [PATCH 540/734] Masking "fieldsNamePattern" fields selection policy
 added (#3664)

---
 .../kafka/ui/config/ClustersProperties.java   |  5 +-
 .../kafka/ui/service/masking/DataMasking.java |  2 +-
 .../masking/policies/FieldsSelector.java      | 28 ++++++++++
 .../ui/service/masking/policies/Mask.java     | 27 ++++------
 .../masking/policies/MaskingPolicy.java       | 46 +++++++---------
 .../ui/service/masking/policies/Remove.java   |  6 +--
 .../ui/service/masking/policies/Replace.java  |  5 +-
 .../masking/policies/FieldsSelectorTest.java  | 53 +++++++++++++++++++
 .../ui/service/masking/policies/MaskTest.java | 16 +++---
 .../service/masking/policies/RemoveTest.java  | 20 +++----
 .../service/masking/policies/ReplaceTest.java | 18 +++----
 .../main/resources/swagger/kafka-ui-api.yaml  |  4 +-
 12 files changed, 147 insertions(+), 83 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/FieldsSelector.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/FieldsSelectorTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 1d5cc5393c2..64ec894cd55 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -131,8 +131,9 @@ public static class KeystoreConfig {
   @Data
   public static class Masking {
     Type type;
-    List<String> fields; //if null or empty list - policy will be applied to all fields
-    List<String> pattern; //used when type=MASK
+    List<String> fields;
+    String fieldsNamePattern;
+    List<String> maskingCharsReplacement; //used when type=MASK
     String replacement; //used when type=REPLACE
     String topicKeysPattern;
     String topicValuesPattern;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
index 78e74f33321..ad1c2da31e5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
@@ -44,7 +44,7 @@ boolean shouldBeApplied(String topic, Serde.Target target) {
   public static DataMasking create(@Nullable List<ClustersProperties.Masking> config) {
     return new DataMasking(
         Optional.ofNullable(config).orElse(List.of()).stream().map(property -> {
-          Preconditions.checkNotNull(property.getType(), "masking type not specifed");
+          Preconditions.checkNotNull(property.getType(), "masking type not specified");
           Preconditions.checkArgument(
               StringUtils.isNotEmpty(property.getTopicKeysPattern())
                   || StringUtils.isNotEmpty(property.getTopicValuesPattern()),
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/FieldsSelector.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/FieldsSelector.java
new file mode 100644
index 00000000000..99563943984
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/FieldsSelector.java
@@ -0,0 +1,28 @@
+package com.provectus.kafka.ui.service.masking.policies;
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.exception.ValidationException;
+import java.util.regex.Pattern;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+interface FieldsSelector {
+
+  static FieldsSelector create(ClustersProperties.Masking property) {
+    if (StringUtils.hasText(property.getFieldsNamePattern()) && !CollectionUtils.isEmpty(property.getFields())) {
+      throw new ValidationException("You can't provide both fieldNames & fieldsNamePattern for masking");
+    }
+    if (StringUtils.hasText(property.getFieldsNamePattern())) {
+      Pattern pattern = Pattern.compile(property.getFieldsNamePattern());
+      return f -> pattern.matcher(f).matches();
+    }
+    if (!CollectionUtils.isEmpty(property.getFields())) {
+      return f -> property.getFields().contains(f);
+    }
+    //no pattern, no field names - mean all fields should be masked
+    return fieldName -> true;
+  }
+
+  boolean shouldBeMasked(String fieldName);
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java
index dbbc5d131a7..e6a469f2c03 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Mask.java
@@ -15,8 +15,8 @@ class Mask extends MaskingPolicy {
 
   private final UnaryOperator<String> masker;
 
-  Mask(List<String> fieldNames, List<String> maskingChars) {
-    super(fieldNames);
+  Mask(FieldsSelector fieldsSelector, List<String> maskingChars) {
+    super(fieldsSelector);
     this.masker = createMasker(maskingChars);
   }
 
@@ -38,22 +38,13 @@ private static UnaryOperator<String> createMasker(List<String> maskingChars) {
       for (int i = 0; i < input.length(); i++) {
         int cp = input.codePointAt(i);
         switch (Character.getType(cp)) {
-          case Character.SPACE_SEPARATOR:
-          case Character.LINE_SEPARATOR:
-          case Character.PARAGRAPH_SEPARATOR:
-            sb.appendCodePoint(cp); // keeping separators as-is
-            break;
-          case Character.UPPERCASE_LETTER:
-            sb.append(maskingChars.get(0));
-            break;
-          case Character.LOWERCASE_LETTER:
-            sb.append(maskingChars.get(1));
-            break;
-          case Character.DECIMAL_DIGIT_NUMBER:
-            sb.append(maskingChars.get(2));
-            break;
-          default:
-            sb.append(maskingChars.get(3));
+          case Character.SPACE_SEPARATOR,
+              Character.LINE_SEPARATOR,
+              Character.PARAGRAPH_SEPARATOR -> sb.appendCodePoint(cp); // keeping separators as-is
+          case Character.UPPERCASE_LETTER -> sb.append(maskingChars.get(0));
+          case Character.LOWERCASE_LETTER -> sb.append(maskingChars.get(1));
+          case Character.DECIMAL_DIGIT_NUMBER -> sb.append(maskingChars.get(2));
+          default -> sb.append(maskingChars.get(3));
         }
       }
       return sb.toString();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java
index 7a753382102..9b80da0cb18 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/MaskingPolicy.java
@@ -2,46 +2,36 @@
 
 import com.fasterxml.jackson.databind.node.ContainerNode;
 import com.provectus.kafka.ui.config.ClustersProperties;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public abstract class MaskingPolicy {
 
-
   public static MaskingPolicy create(ClustersProperties.Masking property) {
-    List<String> fields = property.getFields() == null
-        ? List.of() // empty list means that policy will be applied to all fields
-        : property.getFields();
-    switch (property.getType()) {
-      case REMOVE:
-        return new Remove(fields);
-      case REPLACE:
-        return new Replace(
-            fields,
-            property.getReplacement() == null
-                ? Replace.DEFAULT_REPLACEMENT
-                : property.getReplacement()
-        );
-      case MASK:
-        return new Mask(
-            fields,
-            property.getPattern() == null
-                ? Mask.DEFAULT_PATTERN
-                : property.getPattern()
-        );
-      default:
-        throw new IllegalStateException("Unknown policy type: " + property.getType());
-    }
+    FieldsSelector fieldsSelector = FieldsSelector.create(property);
+    return switch (property.getType()) {
+      case REMOVE -> new Remove(fieldsSelector);
+      case REPLACE -> new Replace(
+          fieldsSelector,
+          property.getReplacement() == null
+              ? Replace.DEFAULT_REPLACEMENT
+              : property.getReplacement()
+      );
+      case MASK -> new Mask(
+          fieldsSelector,
+          property.getMaskingCharsReplacement() == null
+              ? Mask.DEFAULT_PATTERN
+              : property.getMaskingCharsReplacement()
+      );
+    };
   }
 
   //----------------------------------------------------------------
 
-  // empty list means policy will be applied to all fields
-  private final List<String> fieldNames;
+  private final FieldsSelector fieldsSelector;
 
   protected boolean fieldShouldBeMasked(String fieldName) {
-    return fieldNames.isEmpty() || fieldNames.contains(fieldName);
+    return fieldsSelector.shouldBeMasked(fieldName);
   }
 
   public abstract ContainerNode<?> applyToJsonContainer(ContainerNode<?> node);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Remove.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Remove.java
index eb38b0d3e3a..cc5cdd14159 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Remove.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Remove.java
@@ -4,12 +4,12 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ContainerNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.List;
+
 
 class Remove extends MaskingPolicy {
 
-  Remove(List<String> fieldNames) {
-    super(fieldNames);
+  Remove(FieldsSelector fieldsSelector) {
+    super(fieldsSelector);
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java
index 3af645cb111..1cf91793d22 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/policies/Replace.java
@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.google.common.base.Preconditions;
-import java.util.List;
 
 class Replace extends MaskingPolicy {
 
@@ -14,8 +13,8 @@ class Replace extends MaskingPolicy {
 
   private final String replacement;
 
-  Replace(List<String> fieldNames, String replacementString) {
-    super(fieldNames);
+  Replace(FieldsSelector fieldsSelector, String replacementString) {
+    super(fieldsSelector);
     this.replacement = Preconditions.checkNotNull(replacementString);
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/FieldsSelectorTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/FieldsSelectorTest.java
new file mode 100644
index 00000000000..497a9365d75
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/FieldsSelectorTest.java
@@ -0,0 +1,53 @@
+package com.provectus.kafka.ui.service.masking.policies;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.exception.ValidationException;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+class FieldsSelectorTest {
+
+  @Test
+  void selectsFieldsDueToProvidedPattern() {
+    var properties = new ClustersProperties.Masking();
+    properties.setFieldsNamePattern("f1|f2");
+
+    var selector = FieldsSelector.create(properties);
+    assertThat(selector.shouldBeMasked("f1")).isTrue();
+    assertThat(selector.shouldBeMasked("f2")).isTrue();
+    assertThat(selector.shouldBeMasked("doesNotMatchPattern")).isFalse();
+  }
+
+  @Test
+  void selectsFieldsDueToProvidedFieldNames() {
+    var properties = new ClustersProperties.Masking();
+    properties.setFields(List.of("f1", "f2"));
+
+    var selector = FieldsSelector.create(properties);
+    assertThat(selector.shouldBeMasked("f1")).isTrue();
+    assertThat(selector.shouldBeMasked("f2")).isTrue();
+    assertThat(selector.shouldBeMasked("notInAList")).isFalse();
+  }
+
+  @Test
+  void selectAllFieldsIfNoPatternAndNoNamesProvided() {
+    var properties = new ClustersProperties.Masking();
+
+    var selector = FieldsSelector.create(properties);
+    assertThat(selector.shouldBeMasked("anyPropertyName")).isTrue();
+  }
+
+  @Test
+  void throwsExceptionIfBothFieldListAndPatternProvided() {
+    var properties = new ClustersProperties.Masking();
+    properties.setFieldsNamePattern("f1|f2");
+    properties.setFields(List.of("f3", "f4"));
+
+    assertThatThrownBy(() -> FieldsSelector.create(properties))
+        .isInstanceOf(ValidationException.class);
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/MaskTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/MaskTest.java
index 9cb97012458..b33a26f3000 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/MaskTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/MaskTest.java
@@ -15,35 +15,35 @@
 
 class MaskTest {
 
-  private static final List<String> TARGET_FIELDS = List.of("id", "name");
+  private static final FieldsSelector FIELDS_SELECTOR = fieldName -> List.of("id", "name").contains(fieldName);
   private static final List<String> PATTERN = List.of("X", "x", "n", "-");
 
   @ParameterizedTest
   @MethodSource
-  void testApplyToJsonContainer(List<String> fields, ContainerNode<?> original, ContainerNode<?> expected) {
-    Mask policy = new Mask(fields, PATTERN);
+  void testApplyToJsonContainer(FieldsSelector selector, ContainerNode<?> original, ContainerNode<?> expected) {
+    Mask policy = new Mask(selector, PATTERN);
     assertThat(policy.applyToJsonContainer(original)).isEqualTo(expected);
   }
 
   private static Stream<Arguments> testApplyToJsonContainer() {
     return Stream.of(
         Arguments.of(
-            TARGET_FIELDS,
+            FIELDS_SELECTOR,
             parse("{ \"id\": 123, \"name\": { \"first\": \"James\", \"surname\": \"Bond777!\"}}"),
             parse("{ \"id\": \"nnn\", \"name\": { \"first\": \"Xxxxx\", \"surname\": \"Xxxxnnn-\"}}")
         ),
         Arguments.of(
-            TARGET_FIELDS,
+            FIELDS_SELECTOR,
             parse("[{ \"id\": 123, \"f2\": 234}, { \"name\": \"1.2\", \"f2\": 345} ]"),
             parse("[{ \"id\": \"nnn\", \"f2\": 234}, { \"name\": \"n-n\", \"f2\": 345} ]")
         ),
         Arguments.of(
-            TARGET_FIELDS,
+            FIELDS_SELECTOR,
             parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Bond777!\"}}"),
             parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Xxxxnnn-\"}}")
         ),
         Arguments.of(
-            List.of(),
+            (FieldsSelector) (fieldName -> true),
             parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Bond777!\"}}"),
             parse("{ \"outer\": { \"f1\": \"Xxxxx\", \"name\": \"Xxxxnnn-\"}}")
         )
@@ -57,7 +57,7 @@ private static Stream<Arguments> testApplyToJsonContainer() {
       "null, xxxx"
   })
   void testApplyToString(String original, String expected) {
-    Mask policy = new Mask(List.of(), PATTERN);
+    Mask policy = new Mask(fieldName -> true, PATTERN);
     assertThat(policy.applyToString(original)).isEqualTo(expected);
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/RemoveTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/RemoveTest.java
index 31ef4eb3c35..9393ea1c626 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/RemoveTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/RemoveTest.java
@@ -15,39 +15,39 @@
 
 class RemoveTest {
 
-  private static final List<String> TARGET_FIELDS = List.of("id", "name");
+  private static final FieldsSelector FIELDS_SELECTOR = fieldName -> List.of("id", "name").contains(fieldName);
 
   @ParameterizedTest
   @MethodSource
-  void testApplyToJsonContainer(List<String> fields, ContainerNode<?> original, ContainerNode<?>  expected) {
-    var policy = new Remove(fields);
+  void testApplyToJsonContainer(FieldsSelector fieldsSelector, ContainerNode<?> original, ContainerNode<?>  expected) {
+    var policy = new Remove(fieldsSelector);
     assertThat(policy.applyToJsonContainer(original)).isEqualTo(expected);
   }
 
   private static Stream<Arguments> testApplyToJsonContainer() {
     return Stream.of(
         Arguments.of(
-            TARGET_FIELDS,
+            FIELDS_SELECTOR,
             parse("{ \"id\": 123, \"name\": { \"first\": \"James\", \"surname\": \"Bond777!\"}}"),
             parse("{}")
         ),
         Arguments.of(
-            TARGET_FIELDS,
+            FIELDS_SELECTOR,
             parse("[{ \"id\": 123, \"f2\": 234}, { \"name\": \"1.2\", \"f2\": 345} ]"),
             parse("[{ \"f2\": 234}, { \"f2\": 345} ]")
         ),
         Arguments.of(
-            TARGET_FIELDS,
+            FIELDS_SELECTOR,
             parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Bond777!\"}}"),
             parse("{ \"outer\": { \"f1\": \"James\"}}")
         ),
         Arguments.of(
-            List.of(),
+            (FieldsSelector) (fieldName -> true),
             parse("{ \"outer\": { \"f1\": \"v1\", \"f2\": \"v2\", \"inner\" : {\"if1\": \"iv1\"}}}"),
             parse("{}")
         ),
         Arguments.of(
-            List.of(),
+            (FieldsSelector) (fieldName -> true),
             parse("[{ \"f1\": 123}, { \"f2\": \"1.2\"} ]"),
             parse("[{}, {}]")
         )
@@ -66,7 +66,7 @@ private static JsonNode parse(String str) {
       "null, null"
   })
   void testApplyToString(String original, String expected) {
-    var policy = new Remove(List.of());
+    var policy = new Remove(fieldName -> true);
     assertThat(policy.applyToString(original)).isEqualTo(expected);
   }
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/ReplaceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/ReplaceTest.java
index f3ac69747b8..9f2fcd90c4c 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/ReplaceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/masking/policies/ReplaceTest.java
@@ -15,35 +15,35 @@
 
 class ReplaceTest {
 
-  private static final List<String> TARGET_FIELDS = List.of("id", "name");
+  private static final FieldsSelector FIELDS_SELECTOR = fieldName -> List.of("id", "name").contains(fieldName);
   private static final String REPLACEMENT_STRING = "***";
 
   @ParameterizedTest
   @MethodSource
-  void testApplyToJsonContainer(List<String> fields, ContainerNode<?> original, ContainerNode<?>  expected) {
-    var policy = new Replace(fields, REPLACEMENT_STRING);
+  void testApplyToJsonContainer(FieldsSelector fieldsSelector, ContainerNode<?> original, ContainerNode<?>  expected) {
+    var policy = new Replace(fieldsSelector, REPLACEMENT_STRING);
     assertThat(policy.applyToJsonContainer(original)).isEqualTo(expected);
   }
 
   private static Stream<Arguments> testApplyToJsonContainer() {
     return Stream.of(
         Arguments.of(
-            TARGET_FIELDS,
+            FIELDS_SELECTOR,
             parse("{ \"id\": 123, \"name\": { \"first\": \"James\", \"surname\": \"Bond777!\"}}"),
             parse("{ \"id\": \"***\", \"name\": { \"first\": \"***\", \"surname\": \"***\"}}")
         ),
         Arguments.of(
-            TARGET_FIELDS,
+            FIELDS_SELECTOR,
             parse("[{ \"id\": 123, \"f2\": 234}, { \"name\": \"1.2\", \"f2\": 345} ]"),
             parse("[{ \"id\": \"***\", \"f2\": 234}, { \"name\": \"***\", \"f2\": 345} ]")
         ),
         Arguments.of(
-            TARGET_FIELDS,
+            FIELDS_SELECTOR,
             parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"Bond777!\"}}"),
             parse("{ \"outer\": { \"f1\": \"James\", \"name\": \"***\"}}")
         ),
         Arguments.of(
-            List.of(),
+            (FieldsSelector) (fieldName -> true),
             parse("{ \"outer\": { \"f1\": \"v1\", \"f2\": \"v2\", \"inner\" : {\"if1\": \"iv1\"}}}"),
             parse("{ \"outer\": { \"f1\": \"***\", \"f2\": \"***\", \"inner\" : {\"if1\": \"***\"}}}}")
         )
@@ -62,7 +62,7 @@ private static JsonNode parse(String str) {
       "null, ***"
   })
   void testApplyToString(String original, String expected) {
-    var policy = new Replace(List.of(), REPLACEMENT_STRING);
+    var policy = new Replace(fieldName -> true, REPLACEMENT_STRING);
     assertThat(policy.applyToString(original)).isEqualTo(expected);
   }
-}
\ No newline at end of file
+}
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 78c7cf3bf52..2bafb05faaa 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -3632,7 +3632,9 @@ components:
                               type: array
                               items:
                                 type: string
-                            pattern:
+                            fieldsNamePattern:
+                              type: string
+                            maskingCharsReplacement:
                               type: array
                               items:
                                 type: string

From abfdf97a9fae6d402854cdaee427f17be8db2401 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 2 May 2023 09:38:16 +0400
Subject: [PATCH 541/734] FE: SR: Add a back button @ compare view (#3698)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../components/Schemas/Diff/Diff.styled.ts    |  4 ++++
 .../src/components/Schemas/Diff/Diff.tsx      |  8 +++++++
 .../Schemas/Diff/__test__/Diff.spec.tsx       | 21 +++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts
index 8f178d320d1..520f9f6c8ad 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+import { Button } from 'components/common/Button/Button';
 
 export const DiffWrapper = styled.div`
   align-items: stretch;
@@ -81,3 +82,6 @@ export const DiffTile = styled.div`
 export const DiffVersionsSelect = styled.div`
   width: 0.625em;
 `;
+export const BackButton = styled(Button)`
+  margin: 10px 9px;
+`;
diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
index d0016b46b44..05b1373ab60 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.tsx
@@ -20,6 +20,7 @@ import useAppParams from 'lib/hooks/useAppParams';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 
 import * as S from './Diff.styled';
+import { BackButton } from './Diff.styled';
 
 export interface DiffProps {
   versions: SchemaSubject[];
@@ -77,6 +78,13 @@ const Diff: React.FC<DiffProps> = ({ versions, areVersionsFetched }) => {
         backText="Schema Registry"
         backTo={clusterSchemasPath(clusterName)}
       />
+      <BackButton
+        buttonType="secondary"
+        buttonSize="S"
+        onClick={() => navigate(-1)}
+      >
+        Back
+      </BackButton>
       <S.Section>
         {areVersionsFetched ? (
           <S.DiffBox>
diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx
index 0c614cf6617..2a9429eef1c 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/__test__/Diff.spec.tsx
@@ -3,6 +3,7 @@ import Diff, { DiffProps } from 'components/Schemas/Diff/Diff';
 import { render, WithRoute } from 'lib/testHelpers';
 import { screen } from '@testing-library/react';
 import { clusterSchemaComparePath } from 'lib/paths';
+import userEvent from '@testing-library/user-event';
 
 import { versions } from './fixtures';
 
@@ -142,4 +143,24 @@ describe('Diff', () => {
       expect(select).toHaveTextContent(versions[0].version);
     });
   });
+
+  describe('Back button', () => {
+    beforeEach(() => {
+      setupComponent({
+        areVersionsFetched: true,
+        versions,
+      });
+    });
+
+    it('back button is appear', () => {
+      const backButton = screen.getAllByRole('button', { name: 'Back' });
+      expect(backButton[0]).toBeInTheDocument();
+    });
+
+    it('click on back button', () => {
+      const backButton = screen.getAllByRole('button', { name: 'Back' });
+      userEvent.click(backButton[0]);
+      expect(screen.queryByRole('Back')).not.toBeInTheDocument();
+    });
+  });
 });

From 7857bd5000a00b7fee906212209a1ef91fcd723a Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Tue, 2 May 2023 09:34:36 +0300
Subject: [PATCH 542/734] [e2e] Check Show Streams request execution (#3758)

---
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 25 +++++++------------
 .../ui/smokesuite/ksqldb/KsqlDbTest.java      | 13 +++++++++-
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index 3ce086ee7bb..25b95388820 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -28,73 +28,66 @@ public void testCaseA() {
   public void testCaseB() {
   }
 
-  @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = KSQL_DB_SUITE_ID)
-  @QaseId(278)
-  @Test
-  public void testCaseC() {
-  }
-
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(331)
   @Test
-  public void testCaseD() {
+  public void testCaseC() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(332)
   @Test
-  public void testCaseE() {
+  public void testCaseD() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(335)
   @Test
-  public void testCaseF() {
+  public void testCaseE() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(336)
   @Test
-  public void testCaseG() {
+  public void testCaseF() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(343)
   @Test
-  public void testCaseH() {
+  public void testCaseG() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = KSQL_DB_SUITE_ID)
   @QaseId(344)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(345)
   @Test
-  public void testCaseJ() {
+  public void testCaseI() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(346)
   @Test
-  public void testCaseK() {
+  public void testCaseJ() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(347)
   @Test
-  public void testCaseL() {
+  public void testCaseK() {
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
index 22ef931bf13..00460da08dd 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.smokesuite.ksqldb;
 
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlMenuTabs.STREAMS;
+import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_STREAMS;
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_TABLES;
 import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
@@ -80,8 +81,18 @@ public void checkShowTablesRequestExecution() {
     softly.assertAll();
   }
 
-  @QaseId(86)
+  @QaseId(278)
   @Test(priority = 4)
+  public void checkShowStreamsRequestExecution() {
+    navigateToKsqlDbAndExecuteRequest(SHOW_STREAMS.getQuery());
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
+    softly.assertTrue(ksqlQueryForm.getItemByName(DEFAULT_STREAM.getName()).isVisible(), "getItemByName()");
+    softly.assertAll();
+  }
+
+  @QaseId(86)
+  @Test(priority = 5)
   public void clearResultsForExecutedRequest() {
     navigateToKsqlDbAndExecuteRequest(SHOW_TABLES.getQuery());
     SoftAssert softly = new SoftAssert();

From 690dcd3f74ecb11e2a827f48c189179e502fc9e1 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 2 May 2023 15:58:54 +0400
Subject: [PATCH 543/734] Wizard file upload fix (#3762)

Removing manual FilePart openapi mapping - using default generator. File upload test added
---
 .../ApplicationConfigController.java          | 12 +++--
 .../ui/util/DynamicConfigOperations.java      | 20 +++++---
 .../kafka/ui/AbstractIntegrationTest.java     |  8 +++
 .../ApplicationConfigControllerTest.java      | 49 +++++++++++++++++++
 .../src/test/resources/fileForUploadTest.txt  |  1 +
 kafka-ui-contract/pom.xml                     |  3 --
 .../main/resources/swagger/kafka-ui-api.yaml  |  2 +-
 7 files changed, 80 insertions(+), 15 deletions(-)
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/controller/ApplicationConfigControllerTest.java
 create mode 100644 kafka-ui-api/src/test/resources/fileForUploadTest.txt

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
index 571250ba947..df04b40fab4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
@@ -27,6 +27,7 @@
 import org.mapstruct.factory.Mappers;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.codec.multipart.FilePart;
+import org.springframework.http.codec.multipart.Part;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
@@ -92,16 +93,19 @@ public Mono<ResponseEntity<Void>> restartWithConfig(Mono<RestartRequestDTO> rest
   }
 
   @Override
-  public Mono<ResponseEntity<UploadedFileInfoDTO>> uploadConfigRelatedFile(FilePart file, ServerWebExchange exchange) {
+  public Mono<ResponseEntity<UploadedFileInfoDTO>> uploadConfigRelatedFile(Flux<Part> fileFlux,
+                                                                           ServerWebExchange exchange) {
     return accessControlService
         .validateAccess(
             AccessContext.builder()
                 .applicationConfigActions(EDIT)
                 .build()
         )
-        .then(dynamicConfigOperations.uploadConfigRelatedFile(file))
-        .map(path -> new UploadedFileInfoDTO().location(path.toString()))
-        .map(ResponseEntity::ok);
+        .then(fileFlux.single())
+        .flatMap(file ->
+            dynamicConfigOperations.uploadConfigRelatedFile((FilePart) file)
+                .map(path -> new UploadedFileInfoDTO().location(path.toString()))
+                .map(ResponseEntity::ok));
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
index 75c6d25f959..68f826bd0fc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
@@ -90,6 +90,7 @@ public Optional<PropertySource<?>> loadDynamicPropertySource() {
   }
 
   public PropertiesStructure getCurrentProperties() {
+    checkIfDynamicConfigEnabled();
     return PropertiesStructure.builder()
         .kafka(getNullableBean(ClustersProperties.class))
         .rbac(getNullableBean(RoleBasedAccessControlProperties.class))
@@ -112,11 +113,7 @@ private <T> T getNullableBean(Class<T> clazz) {
   }
 
   public void persist(PropertiesStructure properties) {
-    if (!dynamicConfigEnabled()) {
-      throw new ValidationException(
-          "Dynamic config change is not allowed. "
-              + "Set dynamic.config.enabled property to 'true' to enabled it.");
-    }
+    checkIfDynamicConfigEnabled();
     properties.initAndValidate();
 
     String yaml = serializeToYaml(properties);
@@ -124,8 +121,9 @@ public void persist(PropertiesStructure properties) {
   }
 
   public Mono<Path> uploadConfigRelatedFile(FilePart file) {
-    String targetDirStr = (String) ctx.getEnvironment().getSystemEnvironment()
-        .getOrDefault(CONFIG_RELATED_UPLOADS_DIR_PROPERTY, CONFIG_RELATED_UPLOADS_DIR_DEFAULT);
+    checkIfDynamicConfigEnabled();
+    String targetDirStr = ctx.getEnvironment()
+        .getProperty(CONFIG_RELATED_UPLOADS_DIR_PROPERTY, CONFIG_RELATED_UPLOADS_DIR_DEFAULT);
 
     Path targetDir = Path.of(targetDirStr);
     if (!Files.exists(targetDir)) {
@@ -149,6 +147,14 @@ public Mono<Path> uploadConfigRelatedFile(FilePart file) {
         .onErrorMap(th -> new FileUploadException(targetFilePath, th));
   }
 
+  private void checkIfDynamicConfigEnabled() {
+    if (!dynamicConfigEnabled()) {
+      throw new ValidationException(
+          "Dynamic config change is not allowed. "
+              + "Set dynamic.config.enabled property to 'true' to enabled it.");
+    }
+  }
+
   @SneakyThrows
   private void writeYamlToFile(String yaml, Path path) {
     if (Files.isDirectory(path)) {
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
index dbdfb67fd59..1938f93044c 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.container.KafkaConnectContainer;
 import com.provectus.kafka.ui.container.SchemaRegistryContainer;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Properties;
 import org.apache.kafka.clients.admin.AdminClient;
@@ -9,6 +10,7 @@
 import org.apache.kafka.clients.admin.NewTopic;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.function.ThrowingConsumer;
+import org.junit.jupiter.api.io.TempDir;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -47,6 +49,9 @@ public abstract class AbstractIntegrationTest {
           .dependsOn(kafka)
           .dependsOn(schemaRegistry);
 
+  @TempDir
+  public static Path tmpDir;
+
   static {
     kafka.start();
     schemaRegistry.start();
@@ -76,6 +81,9 @@ public void initialize(@NotNull ConfigurableApplicationContext context) {
       System.setProperty("kafka.clusters.1.schemaRegistry", schemaRegistry.getUrl());
       System.setProperty("kafka.clusters.1.kafkaConnect.0.name", "kafka-connect");
       System.setProperty("kafka.clusters.1.kafkaConnect.0.address", kafkaConnect.getTarget());
+
+      System.setProperty("dynamic.config.enabled", "true");
+      System.setProperty("config.related.uploads.dir", tmpDir.toString());
     }
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/controller/ApplicationConfigControllerTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/controller/ApplicationConfigControllerTest.java
new file mode 100644
index 00000000000..7840760868b
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/controller/ApplicationConfigControllerTest.java
@@ -0,0 +1,49 @@
+package com.provectus.kafka.ui.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.AbstractIntegrationTest;
+import com.provectus.kafka.ui.model.UploadedFileInfoDTO;
+import java.io.IOException;
+import java.nio.file.Path;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.client.MultipartBodyBuilder;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.springframework.util.MultiValueMap;
+
+class ApplicationConfigControllerTest extends AbstractIntegrationTest {
+
+  @Autowired
+  private WebTestClient webTestClient;
+
+  @Test
+  public void testUpload() throws IOException {
+    var fileToUpload = new ClassPathResource("/fileForUploadTest.txt", this.getClass());
+
+    UploadedFileInfoDTO result = webTestClient
+        .post()
+        .uri("/api/config/relatedfiles")
+        .bodyValue(generateBody(fileToUpload))
+        .exchange()
+        .expectStatus()
+        .isOk()
+        .expectBody(UploadedFileInfoDTO.class)
+        .returnResult()
+        .getResponseBody();
+
+    assertThat(result).isNotNull();
+    assertThat(result.getLocation()).isNotNull();
+    assertThat(Path.of(result.getLocation()))
+        .hasSameBinaryContentAs(fileToUpload.getFile().toPath());
+  }
+
+  private MultiValueMap<String, HttpEntity<?>> generateBody(ClassPathResource resource) {
+    MultipartBodyBuilder builder = new MultipartBodyBuilder();
+    builder.part("file", resource);
+    return builder.build();
+  }
+
+}
diff --git a/kafka-ui-api/src/test/resources/fileForUploadTest.txt b/kafka-ui-api/src/test/resources/fileForUploadTest.txt
new file mode 100644
index 00000000000..cc58280d075
--- /dev/null
+++ b/kafka-ui-api/src/test/resources/fileForUploadTest.txt
@@ -0,0 +1 @@
+some content goes here
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index f99f20d3d81..0d8e238368f 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -101,9 +101,6 @@
                                         <useSpringBoot3>true</useSpringBoot3>
                                         <dateLibrary>java8</dateLibrary>
                                     </configOptions>
-                                    <typeMappings>
-                                        <mapping>filepart=org.springframework.http.codec.multipart.FilePart</mapping>
-                                    </typeMappings>
                                 </configuration>
                             </execution>
                             <execution>
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 2bafb05faaa..b589198b5a1 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1819,7 +1819,7 @@ paths:
               properties:
                 file:
                   type: string
-                  format: filepart
+                  format: binary
       responses:
         200:
           description: OK

From 727f38401babcf25d5bb47e675149882ff3ede14 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 2 May 2023 16:34:57 +0400
Subject: [PATCH 544/734] Expose cluster ACL list (#2818)

---
 documentation/compose/jaas/kafka_server.conf  |   6 +-
 .../compose/jaas/zookeeper_jaas.conf          |   4 +
 .../compose/kafka-ui-acl-with-zk.yaml         |  59 ++++++
 .../kafka/ui/controller/AclsController.java   | 115 ++++++++++++
 .../kafka/ui/mapper/ClusterMapper.java        |  81 +++++++-
 .../kafka/ui/model/ClusterFeature.java        |   4 +-
 .../kafka/ui/model/rbac/AccessContext.java    |  12 +-
 .../kafka/ui/model/rbac/Permission.java       |   2 +
 .../kafka/ui/model/rbac/Resource.java         |   3 +-
 .../ui/model/rbac/permission/AclAction.java   |  15 ++
 .../kafka/ui/service/FeatureService.java      |  23 ++-
 .../kafka/ui/service/ReactiveAdminClient.java |  87 ++++++---
 .../kafka/ui/service/acl/AclCsv.java          |  81 ++++++++
 .../kafka/ui/service/acl/AclsService.java     |  93 +++++++++
 .../service/metrics/JmxSslSocketFactory.java  |   4 +-
 .../provectus/kafka/ui/util/KafkaVersion.java |  11 +-
 .../kafka/ui/service/acl/AclCsvTest.java      |  70 +++++++
 .../kafka/ui/service/acl/AclsServiceTest.java |  82 ++++++++
 .../main/resources/swagger/kafka-ui-api.yaml  | 177 ++++++++++++++++++
 19 files changed, 887 insertions(+), 42 deletions(-)
 create mode 100644 documentation/compose/jaas/zookeeper_jaas.conf
 create mode 100644 documentation/compose/kafka-ui-acl-with-zk.yaml
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AclAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclCsv.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclCsvTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclsServiceTest.java

diff --git a/documentation/compose/jaas/kafka_server.conf b/documentation/compose/jaas/kafka_server.conf
index 25388be5aa8..0c1fb34652a 100644
--- a/documentation/compose/jaas/kafka_server.conf
+++ b/documentation/compose/jaas/kafka_server.conf
@@ -11,4 +11,8 @@ KafkaClient {
     user_admin="admin-secret";
 };
 
-Client {};
+Client {
+       org.apache.zookeeper.server.auth.DigestLoginModule required
+       username="zkuser"
+       password="zkuserpassword";
+};
diff --git a/documentation/compose/jaas/zookeeper_jaas.conf b/documentation/compose/jaas/zookeeper_jaas.conf
new file mode 100644
index 00000000000..2d7fd1b1c29
--- /dev/null
+++ b/documentation/compose/jaas/zookeeper_jaas.conf
@@ -0,0 +1,4 @@
+Server {
+       org.apache.zookeeper.server.auth.DigestLoginModule required
+       user_zkuser="zkuserpassword";
+};
diff --git a/documentation/compose/kafka-ui-acl-with-zk.yaml b/documentation/compose/kafka-ui-acl-with-zk.yaml
new file mode 100644
index 00000000000..e1d70b29702
--- /dev/null
+++ b/documentation/compose/kafka-ui-acl-with-zk.yaml
@@ -0,0 +1,59 @@
+---
+version: '2'
+services:
+
+  kafka-ui:
+    container_name: kafka-ui
+    image: provectuslabs/kafka-ui:latest
+    ports:
+      - 8080:8080
+    depends_on:
+      - zookeeper
+      - kafka
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:29092
+      KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SASL_PLAINTEXT
+      KAFKA_CLUSTERS_0_PROPERTIES_SASL_MECHANISM: PLAIN
+      KAFKA_CLUSTERS_0_PROPERTIES_SASL_JAAS_CONFIG: 'org.apache.kafka.common.security.plain.PlainLoginModule required username="admin" password="admin-secret";'
+
+  zookeeper:
+    image: wurstmeister/zookeeper:3.4.6
+    environment:
+      JVMFLAGS: "-Djava.security.auth.login.config=/etc/zookeeper/zookeeper_jaas.conf"
+    volumes:
+      - ./jaas/zookeeper_jaas.conf:/etc/zookeeper/zookeeper_jaas.conf
+    ports:
+      - 2181:2181
+
+  kafka:
+    image: confluentinc/cp-kafka:7.2.1
+    hostname: kafka
+    container_name: kafka
+    ports:
+      - "9092:9092"
+      - "9997:9997"
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,SASL_PLAINTEXT:SASL_PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'SASL_PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_OPTS: "-Djava.security.auth.login.config=/etc/kafka/jaas/kafka_server.conf"
+      KAFKA_AUTHORIZER_CLASS_NAME: "kafka.security.authorizer.AclAuthorizer"
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_JMX_PORT: 9997
+      KAFKA_JMX_HOSTNAME: localhost
+      KAFKA_NODE_ID: 1
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_LISTENERS: 'SASL_PLAINTEXT://kafka:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'SASL_PLAINTEXT'
+      KAFKA_SASL_ENABLED_MECHANISMS: 'PLAIN'
+      KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL: 'PLAIN'
+      KAFKA_SECURITY_PROTOCOL: 'SASL_PLAINTEXT'
+      KAFKA_SUPER_USERS: 'User:admin'
+    volumes:
+      - ./scripts/update_run.sh:/tmp/update_run.sh
+      - ./jaas:/etc/kafka/jaas
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
new file mode 100644
index 00000000000..83d2ef553e8
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
@@ -0,0 +1,115 @@
+package com.provectus.kafka.ui.controller;
+
+import com.provectus.kafka.ui.api.AclsApi;
+import com.provectus.kafka.ui.mapper.ClusterMapper;
+import com.provectus.kafka.ui.model.KafkaAclDTO;
+import com.provectus.kafka.ui.model.KafkaAclNamePatternTypeDTO;
+import com.provectus.kafka.ui.model.KafkaAclResourceTypeDTO;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.permission.AclAction;
+import com.provectus.kafka.ui.service.acl.AclsService;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.apache.kafka.common.resource.PatternType;
+import org.apache.kafka.common.resource.ResourcePatternFilter;
+import org.apache.kafka.common.resource.ResourceType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequiredArgsConstructor
+public class AclsController extends AbstractController implements AclsApi {
+
+  private final AclsService aclsService;
+  private final AccessControlService accessControlService;
+
+  @Override
+  public Mono<ResponseEntity<Void>> createAcl(String clusterName, Mono<KafkaAclDTO> kafkaAclDto,
+                                              ServerWebExchange exchange) {
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .aclActions(AclAction.EDIT)
+        .build();
+
+    return accessControlService.validateAccess(context)
+        .then(kafkaAclDto)
+        .map(ClusterMapper::toAclBinding)
+        .flatMap(binding -> aclsService.createAcl(getCluster(clusterName), binding))
+        .thenReturn(ResponseEntity.ok().build());
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> deleteAcl(String clusterName, Mono<KafkaAclDTO> kafkaAclDto,
+                                              ServerWebExchange exchange) {
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .aclActions(AclAction.EDIT)
+        .build();
+
+    return accessControlService.validateAccess(context)
+        .then(kafkaAclDto)
+        .map(ClusterMapper::toAclBinding)
+        .flatMap(binding -> aclsService.deleteAcl(getCluster(clusterName), binding))
+        .thenReturn(ResponseEntity.ok().build());
+  }
+
+  @Override
+  public Mono<ResponseEntity<Flux<KafkaAclDTO>>> listAcls(String clusterName,
+                                                          KafkaAclResourceTypeDTO resourceTypeDto,
+                                                          String resourceName,
+                                                          KafkaAclNamePatternTypeDTO namePatternTypeDto,
+                                                          ServerWebExchange exchange) {
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .aclActions(AclAction.VIEW)
+        .build();
+
+    var resourceType = Optional.ofNullable(resourceTypeDto)
+        .map(ClusterMapper::mapAclResourceTypeDto)
+        .orElse(ResourceType.ANY);
+
+    var namePatternType = Optional.ofNullable(namePatternTypeDto)
+        .map(ClusterMapper::mapPatternTypeDto)
+        .orElse(PatternType.ANY);
+
+    var filter = new ResourcePatternFilter(resourceType, resourceName, namePatternType);
+
+    return accessControlService.validateAccess(context).then(
+        Mono.just(
+            ResponseEntity.ok(
+                aclsService.listAcls(getCluster(clusterName), filter)
+                    .map(ClusterMapper::toKafkaAclDto)))
+    );
+  }
+
+  @Override
+  public Mono<ResponseEntity<String>> getAclAsCsv(String clusterName, ServerWebExchange exchange) {
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .aclActions(AclAction.VIEW)
+        .build();
+
+    return accessControlService.validateAccess(context).then(
+        aclsService.getAclAsCsvString(getCluster(clusterName))
+            .map(ResponseEntity::ok)
+            .flatMap(Mono::just)
+    );
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> syncAclsCsv(String clusterName, Mono<String> csvMono, ServerWebExchange exchange) {
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .aclActions(AclAction.EDIT)
+        .build();
+
+    return accessControlService.validateAccess(context)
+        .then(csvMono)
+        .flatMap(csv -> aclsService.syncAclWithAclCsv(getCluster(clusterName), csv))
+        .thenReturn(ResponseEntity.ok().build());
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index d989ce93ba7..a122a269a4e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -20,6 +20,9 @@
 import com.provectus.kafka.ui.model.InternalReplica;
 import com.provectus.kafka.ui.model.InternalTopic;
 import com.provectus.kafka.ui.model.InternalTopicConfig;
+import com.provectus.kafka.ui.model.KafkaAclDTO;
+import com.provectus.kafka.ui.model.KafkaAclNamePatternTypeDTO;
+import com.provectus.kafka.ui.model.KafkaAclResourceTypeDTO;
 import com.provectus.kafka.ui.model.MetricDTO;
 import com.provectus.kafka.ui.model.Metrics;
 import com.provectus.kafka.ui.model.PartitionDTO;
@@ -27,12 +30,18 @@
 import com.provectus.kafka.ui.model.TopicConfigDTO;
 import com.provectus.kafka.ui.model.TopicDTO;
 import com.provectus.kafka.ui.model.TopicDetailsDTO;
-import com.provectus.kafka.ui.service.masking.DataMasking;
 import com.provectus.kafka.ui.service.metrics.RawMetric;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.kafka.clients.admin.ConfigEntry;
+import org.apache.kafka.common.acl.AccessControlEntry;
+import org.apache.kafka.common.acl.AclBinding;
+import org.apache.kafka.common.acl.AclOperation;
+import org.apache.kafka.common.acl.AclPermissionType;
+import org.apache.kafka.common.resource.PatternType;
+import org.apache.kafka.common.resource.ResourcePattern;
+import org.apache.kafka.common.resource.ResourceType;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 
@@ -109,8 +118,74 @@ default BrokerDiskUsageDTO map(Integer id, InternalBrokerDiskUsage internalBroke
     return brokerDiskUsage;
   }
 
-  default DataMasking map(List<ClustersProperties.Masking> maskingProperties) {
-    return DataMasking.create(maskingProperties);
+  static KafkaAclDTO.OperationEnum mapAclOperation(AclOperation operation) {
+    return switch (operation) {
+      case ALL -> KafkaAclDTO.OperationEnum.ALL;
+      case READ -> KafkaAclDTO.OperationEnum.READ;
+      case WRITE -> KafkaAclDTO.OperationEnum.WRITE;
+      case CREATE -> KafkaAclDTO.OperationEnum.CREATE;
+      case DELETE -> KafkaAclDTO.OperationEnum.DELETE;
+      case ALTER -> KafkaAclDTO.OperationEnum.ALTER;
+      case DESCRIBE -> KafkaAclDTO.OperationEnum.DESCRIBE;
+      case CLUSTER_ACTION -> KafkaAclDTO.OperationEnum.CLUSTER_ACTION;
+      case DESCRIBE_CONFIGS -> KafkaAclDTO.OperationEnum.DESCRIBE_CONFIGS;
+      case ALTER_CONFIGS -> KafkaAclDTO.OperationEnum.ALTER_CONFIGS;
+      case IDEMPOTENT_WRITE -> KafkaAclDTO.OperationEnum.IDEMPOTENT_WRITE;
+      case CREATE_TOKENS -> KafkaAclDTO.OperationEnum.CREATE_TOKENS;
+      case DESCRIBE_TOKENS -> KafkaAclDTO.OperationEnum.DESCRIBE_TOKENS;
+      case ANY -> throw new IllegalArgumentException("ANY operation can be only part of filter");
+      case UNKNOWN -> KafkaAclDTO.OperationEnum.UNKNOWN;
+    };
+  }
+
+  static KafkaAclResourceTypeDTO mapAclResourceType(ResourceType resourceType) {
+    return switch (resourceType) {
+      case CLUSTER -> KafkaAclResourceTypeDTO.CLUSTER;
+      case TOPIC -> KafkaAclResourceTypeDTO.TOPIC;
+      case GROUP -> KafkaAclResourceTypeDTO.GROUP;
+      case DELEGATION_TOKEN -> KafkaAclResourceTypeDTO.DELEGATION_TOKEN;
+      case TRANSACTIONAL_ID -> KafkaAclResourceTypeDTO.TRANSACTIONAL_ID;
+      case USER -> KafkaAclResourceTypeDTO.USER;
+      case ANY -> throw new IllegalArgumentException("ANY type can be only part of filter");
+      case UNKNOWN -> KafkaAclResourceTypeDTO.UNKNOWN;
+    };
+  }
+
+  static ResourceType mapAclResourceTypeDto(KafkaAclResourceTypeDTO dto) {
+    return ResourceType.valueOf(dto.name());
+  }
+
+  static PatternType mapPatternTypeDto(KafkaAclNamePatternTypeDTO dto) {
+    return PatternType.valueOf(dto.name());
+  }
+
+  static AclBinding toAclBinding(KafkaAclDTO dto) {
+    return new AclBinding(
+        new ResourcePattern(
+            mapAclResourceTypeDto(dto.getResourceType()),
+            dto.getResourceName(),
+            mapPatternTypeDto(dto.getNamePatternType())
+        ),
+        new AccessControlEntry(
+            dto.getPrincipal(),
+            dto.getHost(),
+            AclOperation.valueOf(dto.getOperation().name()),
+            AclPermissionType.valueOf(dto.getPermission().name())
+        )
+    );
+  }
+
+  static KafkaAclDTO toKafkaAclDto(AclBinding binding) {
+    var pattern = binding.pattern();
+    var filter = binding.toFilter().entryFilter();
+    return new KafkaAclDTO()
+        .resourceType(mapAclResourceType(pattern.resourceType()))
+        .resourceName(pattern.name())
+        .namePatternType(KafkaAclNamePatternTypeDTO.fromValue(pattern.patternType().name()))
+        .principal(filter.principal())
+        .host(filter.host())
+        .operation(mapAclOperation(filter.operation()))
+        .permission(KafkaAclDTO.PermissionEnum.fromValue(filter.permissionType().name()));
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ClusterFeature.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ClusterFeature.java
index 9731492f001..2973e5500d9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ClusterFeature.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/ClusterFeature.java
@@ -4,5 +4,7 @@ public enum ClusterFeature {
   KAFKA_CONNECT,
   KSQL_DB,
   SCHEMA_REGISTRY,
-  TOPIC_DELETION
+  TOPIC_DELETION,
+  KAFKA_ACL_VIEW,
+  KAFKA_ACL_EDIT
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
index 0c2587d681a..45858093a7f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac;
 
+import com.provectus.kafka.ui.model.rbac.permission.AclAction;
 import com.provectus.kafka.ui.model.rbac.permission.ApplicationConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
@@ -37,6 +38,8 @@ public class AccessContext {
 
   Collection<KsqlAction> ksqlActions;
 
+  Collection<AclAction> aclActions;
+
   public static AccessContextBuilder builder() {
     return new AccessContextBuilder();
   }
@@ -55,6 +58,7 @@ public static final class AccessContextBuilder {
     private String schema;
     private Collection<SchemaAction> schemaActions = Collections.emptySet();
     private Collection<KsqlAction> ksqlActions = Collections.emptySet();
+    private Collection<AclAction> aclActions = Collections.emptySet();
 
     private AccessContextBuilder() {
     }
@@ -131,6 +135,12 @@ public AccessContextBuilder ksqlActions(KsqlAction... actions) {
       return this;
     }
 
+    public AccessContextBuilder aclActions(AclAction... actions) {
+      Assert.isTrue(actions.length > 0, "actions not present");
+      this.aclActions = List.of(actions);
+      return this;
+    }
+
     public AccessContext build() {
       return new AccessContext(
           applicationConfigActions,
@@ -140,7 +150,7 @@ public AccessContext build() {
           connect, connectActions,
           connector,
           schema, schemaActions,
-          ksqlActions);
+          ksqlActions, aclActions);
     }
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
index afdcf0ca155..16f01f60e6b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
@@ -4,6 +4,7 @@
 import static com.provectus.kafka.ui.model.rbac.Resource.CLUSTERCONFIG;
 import static com.provectus.kafka.ui.model.rbac.Resource.KSQL;
 
+import com.provectus.kafka.ui.model.rbac.permission.AclAction;
 import com.provectus.kafka.ui.model.rbac.permission.ApplicationConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
@@ -76,6 +77,7 @@ private List<String> getAllActionValues() {
       case SCHEMA -> Arrays.stream(SchemaAction.values()).map(Enum::toString).toList();
       case CONNECT -> Arrays.stream(ConnectAction.values()).map(Enum::toString).toList();
       case KSQL -> Arrays.stream(KsqlAction.values()).map(Enum::toString).toList();
+      case ACL -> Arrays.stream(AclAction.values()).map(Enum::toString).toList();
     };
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
index 4b2c66361f7..f71dfb29792 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
@@ -11,7 +11,8 @@ public enum Resource {
   CONSUMER,
   SCHEMA,
   CONNECT,
-  KSQL;
+  KSQL,
+  ACL;
 
   @Nullable
   public static Resource fromString(String name) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AclAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AclAction.java
new file mode 100644
index 00000000000..c86af7e72d2
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AclAction.java
@@ -0,0 +1,15 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum AclAction implements PermissibleAction {
+
+  VIEW,
+  EDIT;
+
+  @Nullable
+  public static AclAction fromString(String name) {
+    return EnumUtils.getEnum(AclAction.class, name);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
index ec749abd14e..7ba3f036e93 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
@@ -2,16 +2,19 @@
 
 import com.provectus.kafka.ui.model.ClusterFeature;
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.service.ReactiveAdminClient.ClusterDescription;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.Node;
+import org.apache.kafka.common.acl.AclOperation;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -26,7 +29,7 @@ public class FeatureService {
   private final AdminClientService adminClientService;
 
   public Mono<List<ClusterFeature>> getAvailableFeatures(KafkaCluster cluster,
-                                                         ReactiveAdminClient.ClusterDescription clusterDescription) {
+                                                         ClusterDescription clusterDescription) {
     List<Mono<ClusterFeature>> features = new ArrayList<>();
 
     if (Optional.ofNullable(cluster.getConnectsClients())
@@ -44,6 +47,8 @@ public Mono<List<ClusterFeature>> getAvailableFeatures(KafkaCluster cluster,
     }
 
     features.add(topicDeletionEnabled(cluster, clusterDescription.getController()));
+    features.add(aclView(cluster));
+    features.add(aclEdit(clusterDescription));
 
     return Flux.fromIterable(features).flatMap(m -> m).collectList();
   }
@@ -65,4 +70,20 @@ private Mono<ClusterFeature> topicDeletionEnabled(KafkaCluster cluster, @Nullabl
             ? Mono.just(ClusterFeature.TOPIC_DELETION)
             : Mono.empty());
   }
+
+  private Mono<ClusterFeature> aclEdit(ClusterDescription clusterDescription) {
+    var authorizedOps = Optional.ofNullable(clusterDescription.getAuthorizedOperations()).orElse(Set.of());
+    boolean canEdit = authorizedOps.contains(AclOperation.ALL) || authorizedOps.contains(AclOperation.ALTER);
+    return canEdit
+        ? Mono.just(ClusterFeature.KAFKA_ACL_EDIT)
+        : Mono.empty();
+  }
+
+  private Mono<ClusterFeature> aclView(KafkaCluster cluster) {
+    return adminClientService.get(cluster).flatMap(
+        ac -> ac.getClusterFeatures().contains(ReactiveAdminClient.SupportedFeature.AUTHORIZED_SECURITY_ENABLED)
+            ? Mono.just(ClusterFeature.KAFKA_ACL_VIEW)
+            : Mono.empty()
+    );
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 39332da39ee..8451a89f97d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -5,6 +5,7 @@
 import static org.apache.kafka.clients.admin.ListOffsetsResult.ListOffsetsResultInfo;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableTable;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Table;
@@ -15,7 +16,6 @@
 import com.provectus.kafka.ui.util.annotation.KafkaClientInternalsDependant;
 import java.io.Closeable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -61,16 +61,22 @@
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.TopicPartitionInfo;
 import org.apache.kafka.common.TopicPartitionReplica;
+import org.apache.kafka.common.acl.AccessControlEntryFilter;
+import org.apache.kafka.common.acl.AclBinding;
+import org.apache.kafka.common.acl.AclBindingFilter;
 import org.apache.kafka.common.acl.AclOperation;
 import org.apache.kafka.common.config.ConfigResource;
 import org.apache.kafka.common.errors.ClusterAuthorizationException;
 import org.apache.kafka.common.errors.GroupIdNotFoundException;
 import org.apache.kafka.common.errors.GroupNotEmptyException;
 import org.apache.kafka.common.errors.InvalidRequestException;
+import org.apache.kafka.common.errors.SecurityDisabledException;
 import org.apache.kafka.common.errors.TopicAuthorizationException;
 import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
 import org.apache.kafka.common.errors.UnsupportedVersionException;
 import org.apache.kafka.common.requests.DescribeLogDirsResponse;
+import org.apache.kafka.common.resource.ResourcePattern;
+import org.apache.kafka.common.resource.ResourcePatternFilter;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
@@ -82,25 +88,28 @@
 @RequiredArgsConstructor
 public class ReactiveAdminClient implements Closeable {
 
-  private enum SupportedFeature {
+  public enum SupportedFeature {
     INCREMENTAL_ALTER_CONFIGS(2.3f),
     CONFIG_DOCUMENTATION_RETRIEVAL(2.6f),
-    DESCRIBE_CLUSTER_INCLUDE_AUTHORIZED_OPERATIONS(2.3f);
+    DESCRIBE_CLUSTER_INCLUDE_AUTHORIZED_OPERATIONS(2.3f),
+    AUTHORIZED_SECURITY_ENABLED(ReactiveAdminClient::isAuthorizedSecurityEnabled);
 
-    private final float sinceVersion;
+    private final BiFunction<AdminClient, Float, Mono<Boolean>> predicate;
 
-    SupportedFeature(float sinceVersion) {
-      this.sinceVersion = sinceVersion;
+    SupportedFeature(BiFunction<AdminClient, Float, Mono<Boolean>> predicate) {
+      this.predicate = predicate;
     }
 
-    static Set<SupportedFeature> forVersion(float kafkaVersion) {
-      return Arrays.stream(SupportedFeature.values())
-          .filter(f -> kafkaVersion >= f.sinceVersion)
-          .collect(Collectors.toSet());
+    SupportedFeature(float fromVersion) {
+      this.predicate = (admin, ver) -> Mono.just(ver != null && ver >= fromVersion);
     }
 
-    static Set<SupportedFeature> defaultFeatures() {
-      return Set.of();
+    static Mono<Set<SupportedFeature>> forVersion(AdminClient ac, @Nullable Float kafkaVersion) {
+      return Flux.fromArray(SupportedFeature.values())
+          .flatMap(f -> f.predicate.apply(ac, kafkaVersion).map(enabled -> Tuples.of(f, enabled)))
+          .filter(Tuple2::getT2)
+          .map(Tuple2::getT1)
+          .collect(Collectors.toSet());
     }
   }
 
@@ -110,25 +119,31 @@ public static class ClusterDescription {
     Node controller;
     String clusterId;
     Collection<Node> nodes;
+    @Nullable // null, if ACL is disabled
     Set<AclOperation> authorizedOperations;
   }
 
   public static Mono<ReactiveAdminClient> create(AdminClient adminClient) {
     return getClusterVersion(adminClient)
-        .map(ver ->
-            new ReactiveAdminClient(
-                adminClient,
-                ver,
-                getSupportedUpdateFeaturesForVersion(ver)));
-  }
-
-  private static Set<SupportedFeature> getSupportedUpdateFeaturesForVersion(String versionStr) {
-    try {
-      float version = KafkaVersion.parse(versionStr);
-      return SupportedFeature.forVersion(version);
-    } catch (NumberFormatException e) {
-      return SupportedFeature.defaultFeatures();
-    }
+        .flatMap(ver ->
+            getSupportedUpdateFeaturesForVersion(adminClient, ver)
+                .map(features ->
+                    new ReactiveAdminClient(adminClient, ver, features)));
+  }
+
+  private static Mono<Set<SupportedFeature>> getSupportedUpdateFeaturesForVersion(AdminClient ac, String versionStr) {
+    @Nullable Float kafkaVersion = KafkaVersion.parse(versionStr).orElse(null);
+    return SupportedFeature.forVersion(ac, kafkaVersion);
+  }
+
+  private static Mono<Boolean> isAuthorizedSecurityEnabled(AdminClient ac, @Nullable Float kafkaVersion) {
+    return toMono(ac.describeAcls(AclBindingFilter.ANY).values())
+        .thenReturn(true)
+        .doOnError(th -> !(th instanceof SecurityDisabledException)
+                && !(th instanceof InvalidRequestException)
+                && !(th instanceof UnsupportedVersionException),
+            th -> log.warn("Error checking if security enabled", th))
+        .onErrorReturn(false);
   }
 
   // NOTE: if KafkaFuture returns null, that Mono will be empty(!), since Reactor does not support nullable results
@@ -162,6 +177,10 @@ public static <T> Mono<T> toMono(KafkaFuture<T> future) {
   private final String version;
   private final Set<SupportedFeature> features;
 
+  public Set<SupportedFeature> getClusterFeatures() {
+    return features;
+  }
+
   public Mono<Set<String>> listTopics(boolean listInternal) {
     return toMono(client.listTopics(new ListTopicsOptions().listInternal(listInternal)).names());
   }
@@ -576,6 +595,22 @@ Mono<Map<TopicPartition, Long>> listOffsetsUnsafe(Collection<TopicPartition> par
     );
   }
 
+  public Mono<Collection<AclBinding>> listAcls(ResourcePatternFilter filter) {
+    Preconditions.checkArgument(features.contains(SupportedFeature.AUTHORIZED_SECURITY_ENABLED));
+    return toMono(client.describeAcls(new AclBindingFilter(filter, AccessControlEntryFilter.ANY)).values());
+  }
+
+  public Mono<Void> createAcls(Collection<AclBinding> aclBindings) {
+    Preconditions.checkArgument(features.contains(SupportedFeature.AUTHORIZED_SECURITY_ENABLED));
+    return toMono(client.createAcls(aclBindings).all());
+  }
+
+  public Mono<Void> deleteAcls(Collection<AclBinding> aclBindings) {
+    Preconditions.checkArgument(features.contains(SupportedFeature.AUTHORIZED_SECURITY_ENABLED));
+    var filters = aclBindings.stream().map(AclBinding::toFilter).collect(Collectors.toSet());
+    return toMono(client.deleteAcls(filters).all()).then();
+  }
+
   public Mono<Void> updateBrokerConfigByName(Integer brokerId, String name, String value) {
     ConfigResource cr = new ConfigResource(ConfigResource.Type.BROKER, String.valueOf(brokerId));
     AlterConfigOp op = new AlterConfigOp(new ConfigEntry(name, value), AlterConfigOp.OpType.SET);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclCsv.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclCsv.java
new file mode 100644
index 00000000000..673b17ee1f8
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclCsv.java
@@ -0,0 +1,81 @@
+package com.provectus.kafka.ui.service.acl;
+
+import com.provectus.kafka.ui.exception.ValidationException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.kafka.common.acl.AccessControlEntry;
+import org.apache.kafka.common.acl.AclBinding;
+import org.apache.kafka.common.acl.AclOperation;
+import org.apache.kafka.common.acl.AclPermissionType;
+import org.apache.kafka.common.resource.PatternType;
+import org.apache.kafka.common.resource.ResourcePattern;
+import org.apache.kafka.common.resource.ResourceType;
+
+public class AclCsv {
+
+  private static final String LINE_SEPARATOR = System.lineSeparator();
+  private static final String VALUES_SEPARATOR = ",";
+  private static final String HEADER = "Principal,ResourceType,PatternType,ResourceName,Operation,PermissionType,Host";
+
+  public static String transformToCsvString(Collection<AclBinding> acls) {
+    return Stream.concat(Stream.of(HEADER), acls.stream().map(AclCsv::createAclString))
+        .collect(Collectors.joining(System.lineSeparator()));
+  }
+
+  public static String createAclString(AclBinding binding) {
+    var pattern = binding.pattern();
+    var filter  = binding.toFilter().entryFilter();
+    return String.format(
+        "%s,%s,%s,%s,%s,%s,%s",
+        filter.principal(),
+        pattern.resourceType(),
+        pattern.patternType(),
+        pattern.name(),
+        filter.operation(),
+        filter.permissionType(),
+        filter.host()
+    );
+  }
+
+  private static AclBinding parseCsvLine(String csv, int line) {
+    String[] values = csv.split(VALUES_SEPARATOR);
+    if (values.length != 7) {
+      throw new ValidationException("Input csv is not valid - there should be 7 columns in line " + line);
+    }
+    for (int i = 0; i < values.length; i++) {
+      if ((values[i] = values[i].trim()).isBlank()) {
+        throw new ValidationException("Input csv is not valid - blank value in colum " + i + ", line " + line);
+      }
+    }
+    try {
+      return new AclBinding(
+          new ResourcePattern(
+              ResourceType.valueOf(values[1]), values[3], PatternType.valueOf(values[2])),
+          new AccessControlEntry(
+              values[0], values[6], AclOperation.valueOf(values[4]), AclPermissionType.valueOf(values[5]))
+      );
+    } catch (IllegalArgumentException enumParseError) {
+      throw new ValidationException("Error parsing enum value in line " + line);
+    }
+  }
+
+  public static Collection<AclBinding> parseCsv(String csvString) {
+    String[] lines = csvString.split(LINE_SEPARATOR);
+    if (lines.length == 0) {
+      throw new ValidationException("Error parsing ACL csv file: no lines in file");
+    }
+    boolean firstLineIsHeader = HEADER.equalsIgnoreCase(lines[0].trim().replace(" ", ""));
+    Set<AclBinding> result = new HashSet<>();
+    for (int i = firstLineIsHeader ? 1 : 0; i < lines.length; i++) {
+      String line = lines[i];
+      if (!line.isBlank()) {
+        AclBinding aclBinding = parseCsvLine(line, i);
+        result.add(aclBinding);
+      }
+    }
+    return result;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java
new file mode 100644
index 00000000000..8c5a8dab06f
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java
@@ -0,0 +1,93 @@
+package com.provectus.kafka.ui.service.acl;
+
+import com.google.common.collect.Sets;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.service.AdminClientService;
+import java.util.List;
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.common.acl.AclBinding;
+import org.apache.kafka.common.resource.ResourcePatternFilter;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AclsService {
+
+  private final AdminClientService adminClientService;
+
+  public Mono<Void> createAcl(KafkaCluster cluster, AclBinding aclBinding) {
+    var aclString = AclCsv.createAclString(aclBinding);
+    log.info("CREATING ACL: [{}]", aclString);
+    return adminClientService.get(cluster)
+        .flatMap(ac -> ac.createAcls(List.of(aclBinding)))
+        .doOnSuccess(v -> log.info("ACL CREATED: [{}]", aclString));
+  }
+
+  public Mono<Void> deleteAcl(KafkaCluster cluster, AclBinding aclBinding) {
+    var aclString = AclCsv.createAclString(aclBinding);
+    log.info("DELETING ACL: [{}]", aclString);
+    return adminClientService.get(cluster)
+        .flatMap(ac -> ac.deleteAcls(List.of(aclBinding)))
+        .doOnSuccess(v -> log.info("ACL DELETED: [{}]", aclString));
+  }
+
+  public Flux<AclBinding> listAcls(KafkaCluster cluster, ResourcePatternFilter filter) {
+    return adminClientService.get(cluster)
+        .flatMap(c -> c.listAcls(filter))
+        .flatMapIterable(acls -> acls);
+  }
+
+  public Mono<String> getAclAsCsvString(KafkaCluster cluster) {
+    return adminClientService.get(cluster)
+        .flatMap(c -> c.listAcls(ResourcePatternFilter.ANY))
+        .map(AclCsv::transformToCsvString);
+  }
+
+  public Mono<Void> syncAclWithAclCsv(KafkaCluster cluster, String csv) {
+    return adminClientService.get(cluster)
+        .flatMap(ac -> ac.listAcls(ResourcePatternFilter.ANY).flatMap(existingAclList -> {
+          var existingSet = Set.copyOf(existingAclList);
+          var newAcls = Set.copyOf(AclCsv.parseCsv(csv));
+          var toDelete = Sets.difference(existingSet, newAcls);
+          var toAdd = Sets.difference(newAcls, existingSet);
+          logAclSyncPlan(cluster, toAdd, toDelete);
+          if (toAdd.isEmpty() && toDelete.isEmpty()) {
+            return Mono.empty();
+          }
+          log.info("Starting new ACLs creation");
+          return ac.createAcls(toAdd)
+              .doOnSuccess(v -> {
+                log.info("{} new ACLs created", toAdd.size());
+                log.info("Starting ACLs deletion");
+              })
+              .then(ac.deleteAcls(toDelete)
+                  .doOnSuccess(v -> log.info("{} ACLs deleted", toDelete.size())));
+        }));
+  }
+
+  private void logAclSyncPlan(KafkaCluster cluster, Set<AclBinding> toBeAdded, Set<AclBinding> toBeDeleted) {
+    log.info("'{}' cluster ACL sync plan: ", cluster.getName());
+    if (toBeAdded.isEmpty() && toBeDeleted.isEmpty()) {
+      log.info("Nothing to do, ACL is already in sync");
+      return;
+    }
+    if (!toBeAdded.isEmpty()) {
+      log.info("ACLs to be added ({}): ", toBeAdded.size());
+      for (AclBinding aclBinding : toBeAdded) {
+        log.info(" " + AclCsv.createAclString(aclBinding));
+      }
+    }
+    if (!toBeDeleted.isEmpty()) {
+      log.info("ACLs to be deleted ({}): ", toBeDeleted.size());
+      for (AclBinding aclBinding : toBeDeleted) {
+        log.info(" " + AclCsv.createAclString(aclBinding));
+      }
+    }
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxSslSocketFactory.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxSslSocketFactory.java
index 06304365c79..fa84fc361c4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxSslSocketFactory.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxSslSocketFactory.java
@@ -61,7 +61,9 @@ class JmxSslSocketFactory extends javax.net.ssl.SSLSocketFactory {
     } catch (Exception e) {
       log.error("----------------------------------");
       log.error("SSL can't be enabled for JMX retrieval. "
-          + "Make sure your java app run with '--add-opens java.rmi/javax.rmi.ssl=ALL-UNNAMED' arg.", e);
+              + "Make sure your java app run with '--add-opens java.rmi/javax.rmi.ssl=ALL-UNNAMED' arg. Err: {}",
+          e.getMessage());
+      log.trace("SSL can't be enabled for JMX retrieval", e);
       log.error("----------------------------------");
     }
     SSL_JMX_SUPPORTED = sslJmxSupported;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java
index 5ed21c6a6e2..3d6b2ca40ee 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaVersion.java
@@ -1,24 +1,21 @@
 package com.provectus.kafka.ui.util;
 
-import lombok.extern.slf4j.Slf4j;
+import java.util.Optional;
 
-@Slf4j
 public final class KafkaVersion {
 
   private KafkaVersion() {
   }
 
-  public static float parse(String version) throws NumberFormatException {
-    log.trace("Parsing cluster version [{}]", version);
+  public static Optional<Float> parse(String version) throws NumberFormatException {
     try {
       final String[] parts = version.split("\\.");
       if (parts.length > 2) {
         version = parts[0] + "." + parts[1];
       }
-      return Float.parseFloat(version.split("-")[0]);
+      return Optional.of(Float.parseFloat(version.split("-")[0]));
     } catch (Exception e) {
-      log.error("Conversion clusterVersion [{}] to float value failed", version, e);
-      throw e;
+      return Optional.empty();
     }
   }
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclCsvTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclCsvTest.java
new file mode 100644
index 00000000000..08ca4d15073
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclCsvTest.java
@@ -0,0 +1,70 @@
+package com.provectus.kafka.ui.service.acl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.provectus.kafka.ui.exception.ValidationException;
+import java.util.Collection;
+import java.util.List;
+import org.apache.kafka.common.acl.AccessControlEntry;
+import org.apache.kafka.common.acl.AclBinding;
+import org.apache.kafka.common.acl.AclOperation;
+import org.apache.kafka.common.acl.AclPermissionType;
+import org.apache.kafka.common.resource.PatternType;
+import org.apache.kafka.common.resource.ResourcePattern;
+import org.apache.kafka.common.resource.ResourceType;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+class AclCsvTest {
+
+  private static final List<AclBinding> TEST_BINDINGS = List.of(
+      new AclBinding(
+          new ResourcePattern(ResourceType.TOPIC, "*", PatternType.LITERAL),
+          new AccessControlEntry("User:test1", "*", AclOperation.READ, AclPermissionType.ALLOW)),
+      new AclBinding(
+          new ResourcePattern(ResourceType.GROUP, "group1", PatternType.PREFIXED),
+          new AccessControlEntry("User:test2", "localhost", AclOperation.DESCRIBE, AclPermissionType.DENY))
+  );
+
+  @ParameterizedTest
+  @ValueSource(strings = {
+      "Principal,ResourceType, PatternType, ResourceName,Operation,PermissionType,Host\n"
+          + "User:test1,TOPIC,LITERAL,*,READ,ALLOW,*\n"
+          + "User:test2,GROUP,PREFIXED,group1,DESCRIBE,DENY,localhost",
+
+      //without header
+      "User:test1,TOPIC,LITERAL,*,READ,ALLOW,*\n"
+          + "\n"
+          + "User:test2,GROUP,PREFIXED,group1,DESCRIBE,DENY,localhost"
+          + "\n"
+  })
+  void parsesValidInputCsv(String csvString) {
+    Collection<AclBinding> parsed = AclCsv.parseCsv(csvString);
+    assertThat(parsed).containsExactlyInAnyOrderElementsOf(TEST_BINDINGS);
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {
+      // columns > 7
+      "User:test1,TOPIC,LITERAL,*,READ,ALLOW,*,1,2,3,4",
+      // columns < 7
+      "User:test1,TOPIC,LITERAL,*",
+      // enum values are illegal
+      "User:test1,ILLEGAL,LITERAL,*,READ,ALLOW,*",
+      "User:test1,TOPIC,LITERAL,*,READ,ILLEGAL,*"
+  })
+  void throwsExceptionForInvalidInputCsv(String csvString) {
+    assertThatThrownBy(() -> AclCsv.parseCsv(csvString))
+        .isInstanceOf(ValidationException.class);
+  }
+
+  @Test
+  void transformAndParseUseSameFormat() {
+    String csv = AclCsv.transformToCsvString(TEST_BINDINGS);
+    Collection<AclBinding> parsedBindings = AclCsv.parseCsv(csv);
+    assertThat(parsedBindings).containsExactlyInAnyOrderElementsOf(TEST_BINDINGS);
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclsServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclsServiceTest.java
new file mode 100644
index 00000000000..5791bb20414
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclsServiceTest.java
@@ -0,0 +1,82 @@
+package com.provectus.kafka.ui.service.acl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.service.AdminClientService;
+import com.provectus.kafka.ui.service.ReactiveAdminClient;
+import java.util.Collection;
+import java.util.List;
+import org.apache.kafka.common.acl.AccessControlEntry;
+import org.apache.kafka.common.acl.AclBinding;
+import org.apache.kafka.common.acl.AclOperation;
+import org.apache.kafka.common.acl.AclPermissionType;
+import org.apache.kafka.common.resource.PatternType;
+import org.apache.kafka.common.resource.ResourcePattern;
+import org.apache.kafka.common.resource.ResourcePatternFilter;
+import org.apache.kafka.common.resource.ResourceType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import reactor.core.publisher.Mono;
+
+class AclsServiceTest {
+
+  private static final KafkaCluster CLUSTER = KafkaCluster.builder().build();
+
+  private final ReactiveAdminClient adminClientMock = mock(ReactiveAdminClient.class);
+  private final AdminClientService adminClientService = mock(AdminClientService.class);
+
+  private final AclsService aclsService = new AclsService(adminClientService);
+
+  @BeforeEach
+  void initMocks() {
+    when(adminClientService.get(CLUSTER)).thenReturn(Mono.just(adminClientMock));
+  }
+
+  @Test
+  void testSyncAclWithAclCsv() {
+    var existingBinding1 = new AclBinding(
+        new ResourcePattern(ResourceType.TOPIC, "*", PatternType.LITERAL),
+        new AccessControlEntry("User:test1", "*", AclOperation.READ, AclPermissionType.ALLOW));
+
+    var existingBinding2 = new AclBinding(
+        new ResourcePattern(ResourceType.GROUP, "group1", PatternType.PREFIXED),
+        new AccessControlEntry("User:test2", "localhost", AclOperation.DESCRIBE, AclPermissionType.DENY));
+
+    var newBindingToBeAdded = new AclBinding(
+        new ResourcePattern(ResourceType.GROUP, "groupNew", PatternType.PREFIXED),
+        new AccessControlEntry("User:test3", "localhost", AclOperation.DESCRIBE, AclPermissionType.DENY));
+
+    when(adminClientMock.listAcls(ResourcePatternFilter.ANY))
+        .thenReturn(Mono.just(List.of(existingBinding1, existingBinding2)));
+
+    ArgumentCaptor<?> createdCaptor = ArgumentCaptor.forClass(Collection.class);
+    when(adminClientMock.createAcls((Collection<AclBinding>) createdCaptor.capture()))
+        .thenReturn(Mono.empty());
+
+    ArgumentCaptor<?> deletedCaptor = ArgumentCaptor.forClass(Collection.class);
+    when(adminClientMock.deleteAcls((Collection<AclBinding>) deletedCaptor.capture()))
+        .thenReturn(Mono.empty());
+
+    aclsService.syncAclWithAclCsv(
+        CLUSTER,
+        "Principal,ResourceType, PatternType, ResourceName,Operation,PermissionType,Host\n"
+            + "User:test1,TOPIC,LITERAL,*,READ,ALLOW,*\n"
+            + "User:test3,GROUP,PREFIXED,groupNew,DESCRIBE,DENY,localhost"
+    ).block();
+
+    Collection<AclBinding> createdBindings = (Collection<AclBinding>) createdCaptor.getValue();
+    assertThat(createdBindings)
+        .hasSize(1)
+        .contains(newBindingToBeAdded);
+
+    Collection<AclBinding> deletedBindings = (Collection<AclBinding>) deletedCaptor.getValue();
+    assertThat(deletedBindings)
+        .hasSize(1)
+        .contains(existingBinding2);
+  }
+
+}
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index b589198b5a1..b89f8d09635 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1730,6 +1730,125 @@ paths:
         404:
           description: Not found
 
+  /api/clusters/{clusterName}/acls:
+    get:
+      tags:
+        - Acls
+      summary: listKafkaAcls
+      operationId: listAcls
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: resourceType
+          in: query
+          required: false
+          schema:
+            $ref: '#/components/schemas/KafkaAclResourceType'
+        - name: resourceName
+          in: query
+          required: false
+          schema:
+            type: string
+        - name: namePatternType
+          in: query
+          required: false
+          schema:
+            $ref: '#/components/schemas/KafkaAclNamePatternType'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/KafkaAcl'
+
+  /api/clusters/{clusterName}/acl/csv:
+    get:
+      tags:
+        - Acls
+      summary: getAclAsCsv
+      operationId: getAclAsCsv
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        200:
+          description: OK
+          content:
+            text/plain:
+              schema:
+                type: string
+    post:
+      tags:
+        - Acls
+      summary: syncAclsCsv
+      operationId: syncAclsCsv
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          text/plain:
+            schema:
+              type: string
+      responses:
+        200:
+          description: OK
+
+  /api/clusters/{clusterName}/acl:
+    post:
+      tags:
+        - Acls
+      summary: createAcl
+      operationId: createAcl
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/KafkaAcl'
+      responses:
+        200:
+          description: OK
+
+    delete:
+      tags:
+        - Acls
+      summary: deleteAcl
+      operationId: deleteAcl
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/KafkaAcl'
+      responses:
+        200:
+          description: OK
+        404:
+          description: Acl not found
+
   /api/authorization:
     get:
       tags:
@@ -1972,6 +2091,8 @@ components:
               - KAFKA_CONNECT
               - KSQL_DB
               - TOPIC_DELETION
+              - KAFKA_ACL_VIEW # get ACLs listing
+              - KAFKA_ACL_EDIT # create & delete ACLs
       required:
         - id
         - name
@@ -3342,6 +3463,62 @@ components:
         - SCHEMA
         - CONNECT
         - KSQL
+        - ACL
+
+    KafkaAcl:
+      type: object
+      required: [resourceType, resourceName, namePatternType, principal, host, operation, permission]
+      properties:
+        resourceType:
+          $ref: '#/components/schemas/KafkaAclResourceType'
+        resourceName:
+          type: string # "*" if acl can be applied to any resource of given type
+        namePatternType:
+          $ref: '#/components/schemas/KafkaAclNamePatternType'
+        principal:
+          type: string
+        host:
+          type: string  # "*" if acl can be applied to any resource of given type
+        operation:
+          type: string
+          enum:
+            - UNKNOWN # Unknown operation, need to update mapping code on BE
+            - ALL # Cluster, Topic, Group
+            - READ  # Topic, Group
+            - WRITE # Topic, TransactionalId
+            - CREATE # Cluster, Topic
+            - DELETE  # Topic, Group
+            - ALTER  # Cluster, Topic,
+            - DESCRIBE # Cluster, Topic, Group, TransactionalId, DelegationToken
+            - CLUSTER_ACTION # Cluster
+            - DESCRIBE_CONFIGS # Cluster, Topic
+            - ALTER_CONFIGS   # Cluster, Topic
+            - IDEMPOTENT_WRITE # Cluster
+            - CREATE_TOKENS
+            - DESCRIBE_TOKENS
+        permission:
+          type: string
+          enum:
+            - ALLOW
+            - DENY
+
+    KafkaAclResourceType:
+      type: string
+      enum:
+        - UNKNOWN # Unknown operation, need to update mapping code on BE
+        - TOPIC
+        - GROUP
+        - CLUSTER
+        - TRANSACTIONAL_ID
+        - DELEGATION_TOKEN
+        - USER
+
+    KafkaAclNamePatternType:
+      type: string
+      enum:
+        - MATCH
+        - LITERAL
+        - PREFIXED
 
     RestartRequest:
       type: object

From 86a7ba44fb4b47d60b43e43e6854e7c0962ed82f Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Sat, 6 May 2023 21:10:31 +0400
Subject: [PATCH 545/734] FE: SR: Fix updating an existing schema with valid
 syntax says the syntax is invalid (#3746)

---
 .../src/components/Schemas/Edit/Form.tsx      |  2 +-
 .../src/lib/__test__/yupExtended.spec.ts      | 33 +------------------
 kafka-ui-react-app/src/lib/yupExtended.ts     | 28 ----------------
 3 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx b/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
index 2fce1ad7d79..56d7bdc8175 100644
--- a/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
+++ b/kafka-ui-react-app/src/components/Schemas/Edit/Form.tsx
@@ -55,7 +55,7 @@ const Form: React.FC = () => {
     yup.object().shape({
       newSchema:
         schema?.schemaType === SchemaType.PROTOBUF
-          ? yup.string().required().isEnum('Schema syntax is not valid')
+          ? yup.string().required()
           : yup.string().required().isJsonObject('Schema syntax is not valid'),
     });
   const methods = useForm<NewSchemaSubjectRaw>({
diff --git a/kafka-ui-react-app/src/lib/__test__/yupExtended.spec.ts b/kafka-ui-react-app/src/lib/__test__/yupExtended.spec.ts
index 8100b9a3264..bd43dd3f72a 100644
--- a/kafka-ui-react-app/src/lib/__test__/yupExtended.spec.ts
+++ b/kafka-ui-react-app/src/lib/__test__/yupExtended.spec.ts
@@ -1,19 +1,5 @@
-import { isValidEnum, isValidJsonObject } from 'lib/yupExtended';
+import { isValidJsonObject } from 'lib/yupExtended';
 
-const invalidEnum = `
-ennum SchemType {
-  AVRO = 0;
-  JSON = 1;
-  PROTOBUF = 3;
-}
-`;
-const validEnum = `
-enum SchemType {
-  AVRO = 0;
-  JSON = 1;
-  PROTOBUF = 3;
-}
-`;
 describe('yup extended', () => {
   describe('isValidJsonObject', () => {
     it('returns false for no value', () => {
@@ -35,21 +21,4 @@ describe('yup extended', () => {
       expect(isValidJsonObject('{ "foo": "bar" }')).toBeTruthy();
     });
   });
-
-  describe('isValidEnum', () => {
-    it('returns false for invalid enum', () => {
-      expect(isValidEnum(invalidEnum)).toBeFalsy();
-    });
-    it('returns false for no value', () => {
-      expect(isValidEnum()).toBeFalsy();
-    });
-    it('returns true should trim value', () => {
-      expect(
-        isValidEnum(`  enum SchemType {AVRO = 0; PROTOBUF = 3;}   `)
-      ).toBeTruthy();
-    });
-    it('returns true for valid enum', () => {
-      expect(isValidEnum(validEnum)).toBeTruthy();
-    });
-  });
 });
diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index 4c662ca8222..241dac9770a 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -10,7 +10,6 @@ declare module 'yup' {
     TFlags extends yup.Flags = ''
   > extends yup.Schema<TType, TContext, TDefault, TFlags> {
     isJsonObject(message?: string): StringSchema<TType, TContext>;
-    isEnum(message?: string): StringSchema<TType, TContext>;
   }
 }
 
@@ -40,32 +39,6 @@ const isJsonObject = (message?: string) => {
     isValidJsonObject
   );
 };
-
-export const isValidEnum = (value?: string) => {
-  try {
-    if (!value) return false;
-    const trimmedValue = value.trim();
-    if (
-      trimmedValue.indexOf('enum') === 0 &&
-      trimmedValue.lastIndexOf('}') === trimmedValue.length - 1
-    ) {
-      return true;
-    }
-  } catch {
-    // do nothing
-  }
-  return false;
-};
-
-const isEnum = (message?: string) => {
-  return yup.string().test(
-    'isEnum',
-    // eslint-disable-next-line no-template-curly-in-string
-    message || '${path} is not Enum object',
-    isValidEnum
-  );
-};
-
 /**
  * due to yup rerunning all the object validiation during any render,
  * it makes sense to cache the async results
@@ -88,7 +61,6 @@ export function cacheTest(
 }
 
 yup.addMethod(yup.StringSchema, 'isJsonObject', isJsonObject);
-yup.addMethod(yup.StringSchema, 'isEnum', isEnum);
 
 export const topicFormValidationSchema = yup.object().shape({
   name: yup

From 379d9926df00e6388ee417b043652cf4d37ad4d0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 May 2023 21:12:36 +0400
Subject: [PATCH 546/734] Bump jacoco-maven-plugin from 0.8.8 to 0.8.10 (#3714)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 7f2d4c16beb..5ebefe31dfe 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>kafka-ui-api</artifactId>
 
     <properties>
-        <jacoco.version>0.8.8</jacoco.version>
+        <jacoco.version>0.8.10</jacoco.version>
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
         <sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>

From 147b539c376028268d98955e66f0672125cd263b Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Sat, 6 May 2023 21:36:29 +0400
Subject: [PATCH 547/734] FE: KC: Fix no error is displayed if the syntax is
 not valid (#3750)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/Connect/Details/Config/Config.tsx            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx b/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
index 0e86d48940d..8a372e9d12b 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Config/Config.tsx
@@ -37,7 +37,7 @@ const Config: React.FC = () => {
     formState: { isDirty, isSubmitting, isValid, errors },
     setValue,
   } = useForm<FormValues>({
-    mode: 'onTouched',
+    mode: 'onChange',
     resolver: yupResolver(validationSchema),
     defaultValues: {
       config: JSON.stringify(config, null, '\t'),

From 5e539f1ba825d04d782694e299651560351d6e90 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 8 May 2023 10:03:24 +0300
Subject: [PATCH 548/734] [e2e] Stop query functionality check (#3787)

---
 .../kafka/ui/pages/ksqldb/KsqlQueryForm.java  | 20 +++++++++++----
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 25 +++++++------------
 .../ui/smokesuite/ksqldb/KsqlDbTest.java      | 14 ++++++++++-
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
index 4ce282b6cc5..ff57de39b2f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
@@ -17,11 +17,12 @@
 public class KsqlQueryForm extends BasePage {
   protected SelenideElement clearBtn = $x("//div/button[text()='Clear']");
   protected SelenideElement executeBtn = $x("//div/button[text()='Execute']");
-  protected SelenideElement stopQueryBtn = $x("//div/button[text()='Stop query']");
   protected SelenideElement clearResultsBtn = $x("//div/button[text()='Clear results']");
   protected SelenideElement addStreamPropertyBtn = $x("//button[text()='Add Stream Property']");
   protected SelenideElement queryAreaValue = $x("//div[@class='ace_content']");
   protected SelenideElement queryArea = $x("//div[@id='ksql']/textarea[@class='ace_text-input']");
+  protected SelenideElement abortButton = $x("//div[@role='status']/div[text()='Abort']");
+  protected SelenideElement cancelledAlert = $x("//div[@role='status'][text()='Cancelled']");
   protected ElementsCollection ksqlGridItems = $$x("//tbody//tr");
   protected ElementsCollection keyField = $$x("//input[@aria-label='key']");
   protected ElementsCollection valueField = $$x("//input[@aria-label='value']");
@@ -48,7 +49,7 @@ public String getEnteredQuery() {
   public KsqlQueryForm clickExecuteBtn(String query) {
     clickByActions(executeBtn);
     if (query.contains("EMIT CHANGES")) {
-      loadingSpinner.shouldBe(Condition.visible);
+      abortButton.shouldBe(Condition.visible);
     } else {
       waitUntilSpinnerDisappear();
     }
@@ -56,12 +57,21 @@ public KsqlQueryForm clickExecuteBtn(String query) {
   }
 
   @Step
-  public KsqlQueryForm clickStopQueryBtn() {
-    clickByActions(stopQueryBtn);
-    waitUntilSpinnerDisappear();
+  public boolean isAbortBtnVisible() {
+    return isVisible(abortButton);
+  }
+
+  @Step
+  public KsqlQueryForm clickAbortBtn() {
+    clickByActions(abortButton);
     return this;
   }
 
+  @Step
+  public boolean isCancelledAlertVisible() {
+    return isVisible(cancelledAlert);
+  }
+
   @Step
   public KsqlQueryForm clickClearResultsBtn() {
     clickByActions(clearResultsBtn);
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index 25b95388820..7e663f5893e 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -21,73 +21,66 @@ public class SmokeBacklog extends BaseManualTest {
   public void testCaseA() {
   }
 
-  @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = KSQL_DB_SUITE_ID)
-  @QaseId(277)
-  @Test
-  public void testCaseB() {
-  }
-
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(331)
   @Test
-  public void testCaseC() {
+  public void testCaseB() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(332)
   @Test
-  public void testCaseD() {
+  public void testCaseC() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(335)
   @Test
-  public void testCaseE() {
+  public void testCaseD() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(336)
   @Test
-  public void testCaseF() {
+  public void testCaseE() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(343)
   @Test
-  public void testCaseG() {
+  public void testCaseF() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = KSQL_DB_SUITE_ID)
   @QaseId(344)
   @Test
-  public void testCaseH() {
+  public void testCaseG() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(345)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(346)
   @Test
-  public void testCaseJ() {
+  public void testCaseI() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(347)
   @Test
-  public void testCaseK() {
+  public void testCaseJ() {
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
index 00460da08dd..0504a8a31ab 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.smokesuite.ksqldb;
 
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlMenuTabs.STREAMS;
+import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SELECT_ALL_FROM;
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_STREAMS;
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_TABLES;
 import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
@@ -87,7 +88,8 @@ public void checkShowStreamsRequestExecution() {
     navigateToKsqlDbAndExecuteRequest(SHOW_STREAMS.getQuery());
     SoftAssert softly = new SoftAssert();
     softly.assertTrue(ksqlQueryForm.areResultsVisible(), "areResultsVisible()");
-    softly.assertTrue(ksqlQueryForm.getItemByName(DEFAULT_STREAM.getName()).isVisible(), "getItemByName()");
+    softly.assertTrue(ksqlQueryForm.getItemByName(DEFAULT_STREAM.getName()).isVisible(),
+        String.format("getItemByName(%s)", FIRST_TABLE.getName()));
     softly.assertAll();
   }
 
@@ -104,6 +106,16 @@ public void clearResultsForExecutedRequest() {
     softly.assertAll();
   }
 
+  @QaseId(277)
+  @Test(priority = 6)
+  public void stopQueryFunctionalCheck() {
+    navigateToKsqlDbAndExecuteRequest(String.format(SELECT_ALL_FROM.getQuery(), FIRST_TABLE.getName()));
+    Assert.assertTrue(ksqlQueryForm.isAbortBtnVisible(), "isAbortBtnVisible()");
+    ksqlQueryForm
+        .clickAbortBtn();
+    Assert.assertTrue(ksqlQueryForm.isCancelledAlertVisible(), "isCancelledAlertVisible()");
+  }
+
   @AfterClass(alwaysRun = true)
   public void afterClass() {
     TOPIC_NAMES_LIST.forEach(topicName -> apiService.deleteTopic(topicName));

From db86942e47621cf2a2ded26d2c7cdbd2b0ee202a Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 8 May 2023 11:52:11 +0400
Subject: [PATCH 549/734] FE: Add a clear button to the search component
 (#3634)

---
 .../components/common/Input/Input.styled.ts   | 10 ++++++
 .../src/components/common/Input/Input.tsx     | 36 +++++++++++--------
 .../src/components/common/Search/Search.tsx   | 33 ++++++++++++++++-
 .../common/Search/__tests__/Search.spec.tsx   | 20 +++++++++++
 4 files changed, 83 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
index 9495aaecbeb..f21962fe6b6 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Input/Input.styled.ts
@@ -29,6 +29,16 @@ export const Wrapper = styled.div`
     width: 16px;
     fill: ${({ theme }) => theme.input.icon.color};
   }
+  svg:last-child {
+    position: absolute;
+    top: 8px;
+    line-height: 0;
+    z-index: 1;
+    left: unset;
+    right: 12px;
+    height: 16px;
+    width: 16px;
+  }
 `;
 
 export const Input = styled.input<InputProps>(
diff --git a/kafka-ui-react-app/src/components/common/Input/Input.tsx b/kafka-ui-react-app/src/components/common/Input/Input.tsx
index ae76bc47178..4d04b730e51 100644
--- a/kafka-ui-react-app/src/components/common/Input/Input.tsx
+++ b/kafka-ui-react-app/src/components/common/Input/Input.tsx
@@ -16,6 +16,7 @@ export interface InputProps
   withError?: boolean;
   label?: React.ReactNode;
   hint?: React.ReactNode;
+  clearIcon?: React.ReactNode;
 
   // Some may only accept integer, like `Number of Partitions`
   // some may accept decimal
@@ -99,19 +100,22 @@ function pasteNumberCheck(
   return value;
 }
 
-const Input: React.FC<InputProps> = ({
-  name,
-  hookFormOptions,
-  search,
-  inputSize = 'L',
-  type,
-  positiveOnly,
-  integerOnly,
-  withError = false,
-  label,
-  hint,
-  ...rest
-}) => {
+const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref) => {
+  const {
+    name,
+    hookFormOptions,
+    search,
+    inputSize = 'L',
+    type,
+    positiveOnly,
+    integerOnly,
+    withError = false,
+    label,
+    hint,
+    clearIcon,
+    ...rest
+  } = props;
+
   const methods = useFormContext();
 
   const fieldId = React.useId();
@@ -168,7 +172,6 @@ const Input: React.FC<InputProps> = ({
     // if the field is a part of react-hook-form form
     inputOptions = { ...rest, ...methods.register(name, hookFormOptions) };
   }
-
   return (
     <div>
       {label && <InputLabel htmlFor={rest.id || fieldId}>{label}</InputLabel>}
@@ -181,8 +184,11 @@ const Input: React.FC<InputProps> = ({
           type={type}
           onKeyPress={keyPressEventHandler}
           onPaste={pasteEventHandler}
+          ref={ref}
           {...inputOptions}
         />
+        {clearIcon}
+
         {withError && isHookFormField && (
           <S.FormError>
             <ErrorMessage name={name} />
@@ -192,6 +198,6 @@ const Input: React.FC<InputProps> = ({
       </S.Wrapper>
     </div>
   );
-};
+});
 
 export default Input;
diff --git a/kafka-ui-react-app/src/components/common/Search/Search.tsx b/kafka-ui-react-app/src/components/common/Search/Search.tsx
index 66c0e95030b..65116d645a6 100644
--- a/kafka-ui-react-app/src/components/common/Search/Search.tsx
+++ b/kafka-ui-react-app/src/components/common/Search/Search.tsx
@@ -1,7 +1,9 @@
-import React from 'react';
+import React, { useRef } from 'react';
 import { useDebouncedCallback } from 'use-debounce';
 import Input from 'components/common/Input/Input';
 import { useSearchParams } from 'react-router-dom';
+import CloseIcon from 'components/common/Icons/CloseIcon';
+import styled from 'styled-components';
 
 interface SearchProps {
   placeholder?: string;
@@ -10,6 +12,16 @@ interface SearchProps {
   value?: string;
 }
 
+const IconButtonWrapper = styled.span.attrs(() => ({
+  role: 'button',
+  tabIndex: '0',
+}))`
+  height: 16px !important;
+  display: inline-block;
+  &:hover {
+    cursor: pointer;
+  }
+`;
 const Search: React.FC<SearchProps> = ({
   placeholder = 'Search',
   disabled = false,
@@ -17,7 +29,11 @@ const Search: React.FC<SearchProps> = ({
   onChange,
 }) => {
   const [searchParams, setSearchParams] = useSearchParams();
+  const ref = useRef<HTMLInputElement>(null);
   const handleChange = useDebouncedCallback((e) => {
+    if (ref.current != null) {
+      ref.current.value = e.target.value;
+    }
     if (onChange) {
       onChange(e.target.value);
     } else {
@@ -28,6 +44,15 @@ const Search: React.FC<SearchProps> = ({
       setSearchParams(searchParams);
     }
   }, 500);
+  const clearSearchValue = () => {
+    if (searchParams.get('q')) {
+      searchParams.set('q', '');
+      setSearchParams(searchParams);
+    }
+    if (ref.current != null) {
+      ref.current.value = '';
+    }
+  };
 
   return (
     <Input
@@ -37,7 +62,13 @@ const Search: React.FC<SearchProps> = ({
       defaultValue={value || searchParams.get('q') || ''}
       inputSize="M"
       disabled={disabled}
+      ref={ref}
       search
+      clearIcon={
+        <IconButtonWrapper onClick={clearSearchValue}>
+          <CloseIcon />
+        </IconButtonWrapper>
+      }
     />
   );
 };
diff --git a/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx b/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx
index 808f229317e..2103d223367 100644
--- a/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx
+++ b/kafka-ui-react-app/src/components/common/Search/__tests__/Search.spec.tsx
@@ -41,4 +41,24 @@ describe('Search', () => {
     render(<Search />);
     expect(screen.queryByPlaceholderText('Search')).toBeInTheDocument();
   });
+
+  it('Clear button is visible', () => {
+    render(<Search placeholder={placeholder} />);
+
+    const clearButton = screen.getByRole('button');
+    expect(clearButton).toBeInTheDocument();
+  });
+
+  it('Clear button should clear text from input', async () => {
+    render(<Search placeholder={placeholder} />);
+
+    const searchField = screen.getAllByRole('textbox')[0];
+    await userEvent.type(searchField, 'some text');
+    expect(searchField).toHaveValue('some text');
+
+    const clearButton = screen.getByRole('button');
+    await userEvent.click(clearButton);
+
+    expect(searchField).toHaveValue('');
+  });
 });

From 61fb62276e8aee6b7730cd8a76e9a54cb7e76d44 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 8 May 2023 11:53:57 +0400
Subject: [PATCH 550/734] FE: Serde fallback icon: Add a tooltip (#3786)

---
 .../Topics/Topic/Messages/Message.tsx           | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
index dd5cfae7488..af76db6739f 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Message.tsx
@@ -8,6 +8,7 @@ import { formatTimestamp } from 'lib/dateTimeHelpers';
 import { JSONPath } from 'jsonpath-plus';
 import Ellipsis from 'components/common/Ellipsis/Ellipsis';
 import WarningRedIcon from 'components/common/Icons/WarningRedIcon';
+import Tooltip from 'components/common/Tooltip/Tooltip';
 
 import MessageContent from './MessageContent/MessageContent';
 import * as S from './MessageContent/MessageContent.styled';
@@ -110,14 +111,26 @@ const Message: React.FC<Props> = ({
         </td>
         <S.DataCell title={key}>
           <Ellipsis text={renderFilteredJson(key, keyFilters)}>
-            {keySerde === 'Fallback' && <WarningRedIcon />}
+            {keySerde === 'Fallback' && (
+              <Tooltip
+                value={<WarningRedIcon />}
+                content="Fallback serde was used"
+                placement="left"
+              />
+            )}
           </Ellipsis>
         </S.DataCell>
         <S.DataCell title={content}>
           <S.Metadata>
             <S.MetadataValue>
               <Ellipsis text={renderFilteredJson(content, contentFilters)}>
-                {valueSerde === 'Fallback' && <WarningRedIcon />}
+                {valueSerde === 'Fallback' && (
+                  <Tooltip
+                    value={<WarningRedIcon />}
+                    content="Fallback serde was used"
+                    placement="left"
+                  />
+                )}
               </Ellipsis>
             </S.MetadataValue>
           </S.Metadata>

From 97a694b3f04ceec2f103a6c8836d32c686e72c40 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 8 May 2023 11:55:23 +0400
Subject: [PATCH 551/734] FE: Messages: Produce pane is too long (#3785)

---
 .../src/components/Topics/Topic/SendMessage/SendMessage.tsx   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index bacfa76c93f..b7f31a230bd 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -210,6 +210,7 @@ const SendMessage: React.FC<{ closeSidebar: () => void }> = ({
                   name={name}
                   onChange={onChange}
                   value={value}
+                  height="40px"
                 />
               )}
             />
@@ -225,6 +226,7 @@ const SendMessage: React.FC<{ closeSidebar: () => void }> = ({
                   name={name}
                   onChange={onChange}
                   value={value}
+                  height="280px"
                 />
               )}
             />
@@ -242,7 +244,7 @@ const SendMessage: React.FC<{ closeSidebar: () => void }> = ({
                   defaultValue="{}"
                   name={name}
                   onChange={onChange}
-                  height="200px"
+                  height="40px"
                 />
               )}
             />

From a1e7a20887c624195e68593d8aa6ae7a4e6c3daa Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 8 May 2023 11:58:36 +0400
Subject: [PATCH 552/734] FE: RBAC: Wizard: Disable configure buttons if there
 are no permissions (#3684)

---
 .../Dashboard/ClusterTableActionsCell.tsx     | 24 +++++++++++++++----
 .../src/components/Dashboard/Dashboard.tsx    | 22 +++++++++++++----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx b/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx
index cb41ab06a83..19fefd784ce 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx
@@ -1,17 +1,31 @@
-import React from 'react';
-import { Cluster } from 'generated-sources';
+import React, { useMemo } from 'react';
+import { Cluster, ResourceType } from 'generated-sources';
 import { CellContext } from '@tanstack/react-table';
-import { Button } from 'components/common/Button/Button';
 import { clusterConfigPath } from 'lib/paths';
+import { useGetUserInfo } from 'lib/hooks/api/roles';
+import { ActionCanButton } from 'components/common/ActionComponent';
 
 type Props = CellContext<Cluster, unknown>;
 
 const ClusterTableActionsCell: React.FC<Props> = ({ row }) => {
   const { name } = row.original;
+  const { data } = useGetUserInfo();
+
+  const isApplicationConfig = useMemo(() => {
+    return !!data?.userInfo?.permissions.some(
+      (permission) => permission.resource === ResourceType.APPLICATIONCONFIG
+    );
+  }, [data]);
+
   return (
-    <Button buttonType="secondary" buttonSize="S" to={clusterConfigPath(name)}>
+    <ActionCanButton
+      buttonType="secondary"
+      buttonSize="S"
+      to={clusterConfigPath(name)}
+      canDoAction={isApplicationConfig}
+    >
       Configure
-    </Button>
+    </ActionCanButton>
   );
 };
 
diff --git a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
index 7eab4c1d2ff..c7b64aef1cf 100644
--- a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
@@ -1,23 +1,25 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
 import Switch from 'components/common/Switch/Switch';
 import { useClusters } from 'lib/hooks/api/clusters';
-import { Cluster, ServerStatus } from 'generated-sources';
+import { Cluster, ResourceType, ServerStatus } from 'generated-sources';
 import { ColumnDef } from '@tanstack/react-table';
 import Table, { SizeCell } from 'components/common/NewTable';
 import useBoolean from 'lib/hooks/useBoolean';
-import { Button } from 'components/common/Button/Button';
 import { clusterNewConfigPath } from 'lib/paths';
 import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
 import { useNavigate } from 'react-router-dom';
+import { ActionCanButton } from 'components/common/ActionComponent';
+import { useGetUserInfo } from 'lib/hooks/api/roles';
 
 import * as S from './Dashboard.styled';
 import ClusterName from './ClusterName';
 import ClusterTableActionsCell from './ClusterTableActionsCell';
 
 const Dashboard: React.FC = () => {
+  const { data } = useGetUserInfo();
   const clusters = useClusters();
   const { value: showOfflineOnly, toggle } = useBoolean(false);
   const appInfo = React.useContext(GlobalSettingsContext);
@@ -62,6 +64,11 @@ const Dashboard: React.FC = () => {
     }
   }, [clusters, appInfo.hasDynamicConfig]);
 
+  const isApplicationConfig = useMemo(() => {
+    return !!data?.userInfo?.permissions.some(
+      (permission) => permission.resource === ResourceType.APPLICATIONCONFIG
+    );
+  }, [data]);
   return (
     <>
       <PageHeading text="Dashboard" />
@@ -87,9 +94,14 @@ const Dashboard: React.FC = () => {
           <label>Only offline clusters</label>
         </div>
         {appInfo.hasDynamicConfig && (
-          <Button buttonType="primary" buttonSize="M" to={clusterNewConfigPath}>
+          <ActionCanButton
+            buttonType="primary"
+            buttonSize="M"
+            to={clusterNewConfigPath}
+            canDoAction={isApplicationConfig}
+          >
             Configure new cluster
-          </Button>
+          </ActionCanButton>
         )}
       </S.Toolbar>
       <Table

From f6fe14cea55675f03656428aa3366c556ccddf22 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 8 May 2023 12:00:43 +0400
Subject: [PATCH 553/734] FE: Messages: Fix UI displays nonsensical
 timestamps(#3715)

---
 kafka-ui-react-app/src/lib/dateTimeHelpers.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
index 3dce0edd78a..148a70d2a3d 100644
--- a/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
+++ b/kafka-ui-react-app/src/lib/dateTimeHelpers.ts
@@ -1,6 +1,6 @@
 export const formatTimestamp = (
   timestamp?: number | string | Date,
-  format: Intl.DateTimeFormatOptions = { hour12: false }
+  format: Intl.DateTimeFormatOptions = { hourCycle: 'h23' }
 ): string => {
   if (!timestamp) {
     return '';
@@ -8,7 +8,6 @@ export const formatTimestamp = (
 
   // empty array gets the default one from the browser
   const date = new Date(timestamp);
-
   // invalid date
   if (Number.isNaN(date.getTime())) {
     return '';

From 9ac8549d7db1f32696ec8f61907fdb60c9c66a7e Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Mon, 8 May 2023 12:33:58 +0400
Subject: [PATCH 554/734] FE: Display broker skew (#3626)

---
 .../ui/model/PartitionDistributionStats.java  |  7 +--
 .../kafka/ui/pages/brokers/BrokersList.java   |  3 +-
 .../Brokers/BrokersList/BrokersList.tsx       | 58 ++++++++++++++++++-
 .../SkewHeader/SkewHeader.styled.ts           | 11 ++++
 .../BrokersList/SkewHeader/SkewHeader.tsx     | 17 ++++++
 .../common/NewTable/ColoredCell.tsx           | 41 +++++++++++++
 .../components/common/NewTable/SizeCell.tsx   | 11 +++-
 kafka-ui-react-app/src/theme/theme.ts         | 12 ++++
 8 files changed, 150 insertions(+), 10 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/Brokers/BrokersList/SkewHeader/SkewHeader.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/Brokers/BrokersList/SkewHeader/SkewHeader.tsx
 create mode 100644 kafka-ui-react-app/src/components/common/NewTable/ColoredCell.tsx

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/PartitionDistributionStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/PartitionDistributionStats.java
index b625533d1dd..46efc670008 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/PartitionDistributionStats.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/PartitionDistributionStats.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.model;
 
 import java.math.BigDecimal;
-import java.math.MathContext;
+import java.math.RoundingMode;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -21,8 +21,6 @@ public class PartitionDistributionStats {
   // avg skew will show unuseful results on low number of partitions
   private static final int MIN_PARTITIONS_FOR_SKEW_CALCULATION = 50;
 
-  private static final MathContext ROUNDING_MATH_CTX = new MathContext(3);
-
   private final Map<Node, Integer> partitionLeaders;
   private final Map<Node, Integer> partitionsCount;
   private final Map<Node, Integer> inSyncPartitions;
@@ -88,6 +86,7 @@ private BigDecimal calculateAvgSkew(@Nullable Integer value, double avgValue) {
       return null;
     }
     value = value == null ? 0 : value;
-    return new BigDecimal((value - avgValue) / avgValue * 100.0).round(ROUNDING_MATH_CTX);
+    return new BigDecimal((value - avgValue) / avgValue * 100.0)
+        .setScale(1, RoundingMode.HALF_UP);
   }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
index 50ecdff3597..9e81a0795cc 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -48,7 +48,8 @@ public List<SelenideElement> getAllVisibleElements() {
   }
 
   private List<SelenideElement> getEnabledColumnHeaders() {
-    return Stream.of("Broker ID", "Segment Size", "Segment Count", "Port", "Host")
+    return Stream.of("Broker ID", "Disk usage", "Partitions skew",
+            "Leaders", "Leader skew", "Online partitions", "Port", "Host")
         .map(name -> $x(String.format(columnHeaderLocator, name)))
         .collect(Collectors.toList());
   }
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index 966edecf1fd..d8cd0a2f763 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -11,7 +11,9 @@ import CheckMarkRoundIcon from 'components/common/Icons/CheckMarkRoundIcon';
 import { ColumnDef } from '@tanstack/react-table';
 import { clusterBrokerPath } from 'lib/paths';
 import Tooltip from 'components/common/Tooltip/Tooltip';
+import ColoredCell from 'components/common/NewTable/ColoredCell';
 
+import SkewHeader from './SkewHeader/SkewHeader';
 import * as S from './BrokersList.styled';
 
 const NA = 'N/A';
@@ -57,11 +59,15 @@ const BrokersList: React.FC = () => {
         count: segmentCount || NA,
         port: broker?.port,
         host: broker?.host,
+        partitionsLeader: broker?.partitionsLeader,
+        partitionsSkew: broker?.partitionsSkew,
+        leadersSkew: broker?.leadersSkew,
+        inSyncPartitions: broker?.inSyncPartitions,
       };
     });
   }, [diskUsage, brokers]);
 
-  const columns = React.useMemo<ColumnDef<typeof rows>[]>(
+  const columns = React.useMemo<ColumnDef<(typeof rows)[number]>[]>(
     () => [
       {
         header: 'Broker ID',
@@ -84,7 +90,7 @@ const BrokersList: React.FC = () => {
         ),
       },
       {
-        header: 'Segment Size',
+        header: 'Disk usage',
         accessorKey: 'size',
         // eslint-disable-next-line react/no-unstable-nested-components
         cell: ({ getValue, table, cell, column, renderValue, row }) =>
@@ -98,10 +104,56 @@ const BrokersList: React.FC = () => {
               cell={cell}
               getValue={getValue}
               renderValue={renderValue}
+              renderSegments
             />
           ),
       },
-      { header: 'Segment Count', accessorKey: 'count' },
+      {
+        // eslint-disable-next-line react/no-unstable-nested-components
+        header: () => <SkewHeader />,
+        accessorKey: 'partitionsSkew',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue }) => {
+          const value = getValue<number>();
+          return (
+            <ColoredCell
+              value={value ? `${value.toFixed(2)}%` : '-'}
+              warn={value >= 10 && value < 20}
+              attention={value >= 20}
+            />
+          );
+        },
+      },
+      { header: 'Leaders', accessorKey: 'partitionsLeader' },
+      {
+        header: 'Leader skew',
+        accessorKey: 'leadersSkew',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue }) => {
+          const value = getValue<number>();
+          return (
+            <ColoredCell
+              value={value ? `${value.toFixed(2)}%` : '-'}
+              warn={value >= 10 && value < 20}
+              attention={value >= 20}
+            />
+          );
+        },
+      },
+      {
+        header: 'Online partitions',
+        accessorKey: 'inSyncPartitions',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue, row }) => {
+          const value = getValue<number>();
+          return (
+            <ColoredCell
+              value={value}
+              attention={value !== row.original.count}
+            />
+          );
+        },
+      },
       { header: 'Port', accessorKey: 'port' },
       {
         header: 'Host',
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/SkewHeader/SkewHeader.styled.ts b/kafka-ui-react-app/src/components/Brokers/BrokersList/SkewHeader/SkewHeader.styled.ts
new file mode 100644
index 00000000000..eea2fa3cd98
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/SkewHeader/SkewHeader.styled.ts
@@ -0,0 +1,11 @@
+import styled from 'styled-components';
+import { MessageTooltip } from 'components/common/Tooltip/Tooltip.styled';
+
+export const CellWrapper = styled.div`
+  display: flex;
+  gap: 10px;
+
+  ${MessageTooltip} {
+    max-height: unset;
+  }
+`;
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/SkewHeader/SkewHeader.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/SkewHeader/SkewHeader.tsx
new file mode 100644
index 00000000000..978d1768dd7
--- /dev/null
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/SkewHeader/SkewHeader.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import Tooltip from 'components/common/Tooltip/Tooltip';
+import InfoIcon from 'components/common/Icons/InfoIcon';
+
+import * as S from './SkewHeader.styled';
+
+const SkewHeader: React.FC = () => (
+  <S.CellWrapper>
+    Partitions skew
+    <Tooltip
+      value={<InfoIcon />}
+      content="The divergence from the average brokers' value"
+    />
+  </S.CellWrapper>
+);
+
+export default SkewHeader;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/ColoredCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/ColoredCell.tsx
new file mode 100644
index 00000000000..df8ab2d6a8d
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/NewTable/ColoredCell.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import styled from 'styled-components';
+
+interface CellProps {
+  isWarning?: boolean;
+  isAttention?: boolean;
+}
+
+interface ColoredCellProps {
+  value: number | string;
+  warn?: boolean;
+  attention?: boolean;
+}
+
+const Cell = styled.div<CellProps>`
+  color: ${(props) => {
+    if (props.isAttention) {
+      return props.theme.table.colored.color.attention;
+    }
+
+    if (props.isWarning) {
+      return props.theme.table.colored.color.warning;
+    }
+
+    return 'inherit';
+  }};
+`;
+
+const ColoredCell: React.FC<ColoredCellProps> = ({
+  value,
+  warn,
+  attention,
+}) => {
+  return (
+    <Cell isWarning={warn} isAttention={attention}>
+      {value}
+    </Cell>
+  );
+};
+
+export default ColoredCell;
diff --git a/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
index 00a60086d9d..24485342aa4 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
@@ -3,8 +3,15 @@ import { CellContext } from '@tanstack/react-table';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const SizeCell: React.FC<CellContext<any, unknown>> = ({ getValue }) => (
-  <BytesFormatted value={getValue<string | number>()} />
+type AsAny = any;
+
+const SizeCell: React.FC<
+  CellContext<AsAny, unknown> & { renderSegments?: boolean }
+> = ({ getValue, row, renderSegments = false }) => (
+  <>
+    <BytesFormatted value={getValue<string | number>()} />
+    {renderSegments ? `, ${row?.original.count} segment(s)` : null}
+  </>
 );
 
 export default SizeCell;
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 33dbf1c619e..80cc58991c3 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -533,6 +533,12 @@ export const theme = {
         active: Colors.neutral[90],
       },
     },
+    colored: {
+      color: {
+        attention: Colors.red[50],
+        warning: Colors.yellow[20],
+      },
+    },
     expander: {
       normal: Colors.brand[30],
       hover: Colors.brand[40],
@@ -928,6 +934,12 @@ export const darkTheme: ThemeType = {
         active: Colors.neutral[0],
       },
     },
+    colored: {
+      color: {
+        attention: Colors.red[50],
+        warning: Colors.yellow[20],
+      },
+    },
     expander: {
       normal: Colors.brand[30],
       hover: Colors.brand[40],

From bc85924d7ddbd163444e85c3dc0bf1cb83626855 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 May 2023 12:36:50 +0400
Subject: [PATCH 555/734] Bump testng from 7.7.0 to 7.7.1 (#3789)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index c93f6bcabb8..cfd1414fd4f 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -18,7 +18,7 @@
         <httpcomponents.version>5.2.1</httpcomponents.version>
         <selenium.version>4.8.1</selenium.version>
         <selenide.version>6.12.3</selenide.version>
-        <testng.version>7.7.0</testng.version>
+        <testng.version>7.7.1</testng.version>
         <allure.version>2.21.0</allure.version>
         <qase.io.version>3.0.4</qase.io.version>
         <aspectj.version>1.9.9.1</aspectj.version>

From e31cd2e442518efa7e2dd92abfad208b9587bb47 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Tue, 9 May 2023 13:06:07 +0400
Subject: [PATCH 556/734] FE: SR: Fix missing diff overlay (#3767)

---
 .../KsqlDb/Query/QueryForm/QueryForm.styled.ts           | 1 +
 .../src/components/Schemas/Diff/Diff.styled.ts           | 9 +++------
 kafka-ui-react-app/src/theme/theme.ts                    | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
index 6d0f6598b48..eb71ad1ef27 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.styled.ts
@@ -33,6 +33,7 @@ export const Fieldset = styled.fieldset`
   flex: 1;
   flex-direction: column;
   gap: 8px;
+  color: ${({ theme }) => theme.default.color.normal};
 `;
 
 export const ButtonsContainer = styled.div`
diff --git a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts
index 520f9f6c8ad..c5ecef258a0 100644
--- a/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts
+++ b/kafka-ui-react-app/src/components/Schemas/Diff/Diff.styled.ts
@@ -14,9 +14,6 @@ export const DiffWrapper = styled.div`
     background-color: ${({ theme }) => theme.default.backgroundColor};
     color: ${({ theme }) => theme.default.color.normal};
   }
-  .ace_line {
-    background-color: ${({ theme }) => theme.default.backgroundColor};
-  }
   .ace_gutter-cell {
     background-color: ${({ theme }) =>
       theme.ksqlDb.query.editor.cell.backgroundColor};
@@ -39,10 +36,10 @@ export const DiffWrapper = styled.div`
   .ace_string {
     color: ${({ theme }) => theme.ksqlDb.query.editor.aceString};
   }
-  > .codeMarker {
-    background: ${({ theme }) => theme.icons.warningIcon};
+  .codeMarker {
+    background-color: ${({ theme }) => theme.ksqlDb.query.editor.codeMarker};
     position: absolute;
-    z-index: 20;
+    z-index: 2000;
   }
 `;
 
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 80cc58991c3..814ca58cb13 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -366,6 +366,7 @@ export const theme = {
         cursor: Colors.neutral[90],
         variable: Colors.red[50],
         aceString: Colors.green[60],
+        codeMarker: Colors.yellow[20],
       },
     },
   },
@@ -767,6 +768,7 @@ export const darkTheme: ThemeType = {
         cursor: Colors.neutral[0],
         variable: Colors.red[50],
         aceString: Colors.green[60],
+        codeMarker: Colors.yellow[20],
       },
     },
   },

From c813e74609a68225880f782a8eb0f975f37b44ee Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 9 May 2023 13:14:50 +0400
Subject: [PATCH 557/734] RBAC: LDAP: Use the spring-provided authority
 populator with a single group search base (#3769)

---
 .../kafka/ui/config/auth/LdapProperties.java  |  4 +-
 .../ui/config/auth/LdapSecurityConfig.java    | 17 +++--
 .../RbacLdapAuthoritiesExtractor.java         | 70 -------------------
 3 files changed, 14 insertions(+), 77 deletions(-)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
index 13119b3bb94..9d07aca2dd5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
@@ -14,13 +14,11 @@ public class LdapProperties {
   private String adminPassword;
   private String userFilterSearchBase;
   private String userFilterSearchFilter;
+  private String groupFilterSearchBase;
 
   @Value("${oauth2.ldap.activeDirectory:false}")
   private boolean isActiveDirectory;
   @Value("${oauth2.ldap.aсtiveDirectory.domain:@null}")
   private String activeDirectoryDomain;
 
-  @Value("${oauth2.ldap.groupRoleAttribute:cn}")
-  private String groupRoleAttribute;
-
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
index fae1125239e..ce04a2e1659 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
@@ -3,7 +3,6 @@
 import static com.provectus.kafka.ui.config.auth.AbstractAuthSecurityConfig.AUTH_WHITELIST;
 
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
-import com.provectus.kafka.ui.service.rbac.extractor.RbacLdapAuthoritiesExtractor;
 import java.util.Collection;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -12,7 +11,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -34,6 +32,8 @@
 import org.springframework.security.ldap.authentication.ad.ActiveDirectoryLdapAuthenticationProvider;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.ldap.search.LdapUserSearch;
+import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator;
+import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
 import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 
@@ -50,7 +50,7 @@ public class LdapSecurityConfig {
 
   @Bean
   public ReactiveAuthenticationManager authenticationManager(BaseLdapPathContextSource contextSource,
-                                                             ApplicationContext context,
+                                                             LdapAuthoritiesPopulator ldapAuthoritiesPopulator,
                                                              @Nullable AccessControlService acs) {
     var rbacEnabled = acs != null && acs.isRbacEnabled();
     BindAuthenticator ba = new BindAuthenticator(contextSource);
@@ -67,7 +67,7 @@ public ReactiveAuthenticationManager authenticationManager(BaseLdapPathContextSo
     AbstractLdapAuthenticationProvider authenticationProvider;
     if (!props.isActiveDirectory()) {
       authenticationProvider = rbacEnabled
-          ? new LdapAuthenticationProvider(ba, new RbacLdapAuthoritiesExtractor(context))
+          ? new LdapAuthenticationProvider(ba, ldapAuthoritiesPopulator)
           : new LdapAuthenticationProvider(ba);
     } else {
       authenticationProvider = new ActiveDirectoryLdapAuthenticationProvider(props.getActiveDirectoryDomain(),
@@ -95,6 +95,15 @@ public BaseLdapPathContextSource contextSource() {
     return ctx;
   }
 
+  @Bean
+  @Primary
+  public LdapAuthoritiesPopulator ldapAuthoritiesPopulator(BaseLdapPathContextSource contextSource) {
+    var authoritiesPopulator = new DefaultLdapAuthoritiesPopulator(contextSource, props.getGroupFilterSearchBase());
+    authoritiesPopulator.setRolePrefix("");
+    authoritiesPopulator.setConvertToUpperCase(false);
+    return authoritiesPopulator;
+  }
+
   @Bean
   public SecurityWebFilterChain configureLdap(ServerHttpSecurity http) {
     log.info("Configuring LDAP authentication.");
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java
deleted file mode 100644
index e24fc0aeda9..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.provectus.kafka.ui.service.rbac.extractor;
-
-import com.provectus.kafka.ui.config.auth.LdapProperties;
-import com.provectus.kafka.ui.model.rbac.Role;
-import com.provectus.kafka.ui.model.rbac.provider.Provider;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationContext;
-import org.springframework.ldap.core.DirContextOperations;
-import org.springframework.ldap.core.support.BaseLdapPathContextSource;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator;
-import org.springframework.util.Assert;
-
-@Slf4j
-public class RbacLdapAuthoritiesExtractor extends DefaultLdapAuthoritiesPopulator {
-
-  private final AccessControlService acs;
-  private final LdapProperties props;
-
-  private final Function<Map<String, List<String>>, GrantedAuthority> authorityMapper = (record) -> {
-    String role = record.get(getGroupRoleAttribute()).get(0);
-    return new SimpleGrantedAuthority(role);
-  };
-
-  public RbacLdapAuthoritiesExtractor(ApplicationContext context) {
-    super(context.getBean(BaseLdapPathContextSource.class), null);
-    this.acs = context.getBean(AccessControlService.class);
-    this.props = context.getBean(LdapProperties.class);
-  }
-
-  @Override
-  public Set<GrantedAuthority> getAdditionalRoles(DirContextOperations user, String username) {
-    return acs.getRoles()
-        .stream()
-        .map(Role::getSubjects)
-        .flatMap(List::stream)
-        .filter(s -> s.getProvider().equals(Provider.LDAP))
-        .filter(s -> s.getType().equals("group"))
-        .flatMap(subject -> getRoles(subject.getValue(), user.getNameInNamespace(), username).stream())
-        .collect(Collectors.toSet());
-  }
-
-  private Set<GrantedAuthority> getRoles(String groupSearchBase, String userDn, String username) {
-    Assert.notNull(groupSearchBase, "groupSearchBase is empty");
-
-    log.trace(
-        "Searching for roles for user [{}] with DN [{}], groupRoleAttribute [{}] and filter [{}] in search base [{}]",
-        username, userDn, props.getGroupRoleAttribute(), getGroupSearchFilter(), groupSearchBase);
-
-    var ldapTemplate = getLdapTemplate();
-    ldapTemplate.setIgnoreNameNotFoundException(true);
-
-    Set<Map<String, List<String>>> userRoles = ldapTemplate.searchForMultipleAttributeValues(
-        groupSearchBase, getGroupSearchFilter(), new String[] {userDn, username},
-        new String[] {props.getGroupRoleAttribute()});
-
-    return userRoles.stream()
-        .map(authorityMapper)
-        .peek(a -> log.debug("Mapped role [{}] for user [{}]", a, username))
-        .collect(Collectors.toSet());
-  }
-
-}

From cfcfb851c60ed3bfee68b887d8e1584fb0372cf7 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 10 May 2023 08:09:46 +0400
Subject: [PATCH 558/734] BE: Smart Filter: Setting key/value variable to
 original string when it cant be parsed as json (#3784)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/emitter/MessageFilters.java      | 19 ++++++------
 .../kafka/ui/emitter/MessageFiltersTest.java  | 30 ++++++++++++++-----
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java
index e48501f6a75..6e9f8a8bbe3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessageFilters.java
@@ -39,41 +39,42 @@ static Predicate<TopicMessageDTO> containsStringFilter(String string) {
   }
 
   static Predicate<TopicMessageDTO> groovyScriptFilter(String script) {
-    var compiledScript = compileScript(script);
+    var engine = getGroovyEngine();
+    var compiledScript = compileScript(engine, script);
     var jsonSlurper = new JsonSlurper();
     return new Predicate<TopicMessageDTO>() {
       @SneakyThrows
       @Override
       public boolean test(TopicMessageDTO msg) {
-        var bindings = getGroovyEngine().createBindings();
+        var bindings = engine.createBindings();
         bindings.put("partition", msg.getPartition());
         bindings.put("offset", msg.getOffset());
         bindings.put("timestampMs", msg.getTimestamp().toInstant().toEpochMilli());
         bindings.put("keyAsText", msg.getKey());
         bindings.put("valueAsText", msg.getContent());
         bindings.put("headers", msg.getHeaders());
-        bindings.put("key", parseToJsonOrReturnNull(jsonSlurper, msg.getKey()));
-        bindings.put("value", parseToJsonOrReturnNull(jsonSlurper, msg.getContent()));
+        bindings.put("key", parseToJsonOrReturnAsIs(jsonSlurper, msg.getKey()));
+        bindings.put("value", parseToJsonOrReturnAsIs(jsonSlurper, msg.getContent()));
         var result = compiledScript.eval(bindings);
         if (result instanceof Boolean) {
           return (Boolean) result;
         } else {
           throw new ValidationException(
-              String.format("Unexpected script result: %s, Boolean should be returned instead", result));
+              "Unexpected script result: %s, Boolean should be returned instead".formatted(result));
         }
       }
     };
   }
 
   @Nullable
-  private static Object parseToJsonOrReturnNull(JsonSlurper parser, @Nullable String str) {
+  private static Object parseToJsonOrReturnAsIs(JsonSlurper parser, @Nullable String str) {
     if (str == null) {
       return null;
     }
     try {
       return parser.parseText(str);
     } catch (Exception e) {
-      return null;
+      return str;
     }
   }
 
@@ -86,9 +87,9 @@ private static synchronized GroovyScriptEngineImpl getGroovyEngine() {
     return GROOVY_ENGINE;
   }
 
-  private static CompiledScript compileScript(String script) {
+  private static CompiledScript compileScript(GroovyScriptEngineImpl engine, String script) {
     try {
-      return getGroovyEngine().compile(script);
+      return engine.compile(script);
     } catch (ScriptException e) {
       throw new ValidationException("Script syntax error: " + e.getMessage());
     }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
index 94a377c9c84..4e9f5034cd2 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessageFiltersTest.java
@@ -118,10 +118,18 @@ void canCheckKeyAsJsonObjectIfItCanBeParsedToJson() {
     }
 
     @Test
-    void keySetToNullIfKeyCantBeParsedToJson() {
-      var f = groovyScriptFilter("key == null");
+    void keySetToKeyStringIfCantBeParsedToJson() {
+      var f = groovyScriptFilter("key == \"not json\"");
       assertTrue(f.test(msg().key("not json")));
-      assertFalse(f.test(msg().key("{ \"k\" : \"v\" }")));
+    }
+
+    @Test
+    void keyAndKeyAsTextSetToNullIfRecordsKeyIsNull() {
+      var f = groovyScriptFilter("key == null");
+      assertTrue(f.test(msg().key(null)));
+
+      f = groovyScriptFilter("keyAsText == null");
+      assertTrue(f.test(msg().key(null)));
     }
 
     @Test
@@ -132,10 +140,18 @@ void canCheckValueAsJsonObjectIfItCanBeParsedToJson() {
     }
 
     @Test
-    void valueSetToNullIfKeyCantBeParsedToJson() {
-      var f = groovyScriptFilter("value == null");
+    void valueSetToContentStringIfCantBeParsedToJson() {
+      var f = groovyScriptFilter("value == \"not json\"");
       assertTrue(f.test(msg().content("not json")));
-      assertFalse(f.test(msg().content("{ \"k\" : \"v\" }")));
+    }
+
+    @Test
+    void valueAndValueAsTextSetToNullIfRecordsContentIsNull() {
+      var f = groovyScriptFilter("value == null");
+      assertTrue(f.test(msg().content(null)));
+
+      f = groovyScriptFilter("valueAsText == null");
+      assertTrue(f.test(msg().content(null)));
     }
 
     @Test
@@ -185,4 +201,4 @@ private TopicMessageDTO msg() {
         .partition(1);
   }
 
-}
\ No newline at end of file
+}

From 3ef5a9f492db2c64d3b27986a089e94b285cd186 Mon Sep 17 00:00:00 2001
From: Raju Kanuri <131638711+RaajuKanuri@users.noreply.github.com>
Date: Wed, 10 May 2023 11:16:53 +0530
Subject: [PATCH 559/734] FE: Brokers: Configs search by key is case-sensitive
 (#3754)

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
---
 .../com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java  | 2 ++
 .../src/components/Brokers/Broker/Configs/Configs.tsx       | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
index ff57de39b2f..c8d74419d32 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
@@ -3,6 +3,7 @@
 import static com.codeborne.selenide.Condition.visible;
 import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
+import static com.codeborne.selenide.Selenide.sleep;
 
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
@@ -37,6 +38,7 @@ public KsqlQueryForm waitUntilScreenReady() {
   @Step
   public KsqlQueryForm clickClearBtn() {
     clickByJavaScript(clearBtn);
+    sleep(500);
     return this;
   }
 
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
index 8f909facac0..ad6c5087a0f 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
@@ -34,7 +34,11 @@ const Configs: React.FC = () => {
 
   const getData = () => {
     return data
-      .filter((item) => item.name.toLocaleLowerCase().indexOf(keyword) > -1)
+      .filter(
+        (item) =>
+          item.name.toLocaleLowerCase().indexOf(keyword.toLocaleLowerCase()) >
+          -1
+      )
       .sort((a, b) => {
         if (a.source === b.source) return 0;
 

From 725c95f348dac8c9e4b681b49282fb9e2275ee5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0nan=C3=A7=20CAN?=
 <55583718+inanc-can@users.noreply.github.com>
Date: Wed, 10 May 2023 07:48:10 +0200
Subject: [PATCH 560/734] FE: Chore: Refactor toggle button (#3721)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/common/Switch/Switch.styled.ts            | 4 ++++
 kafka-ui-react-app/src/theme/theme.ts                        | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/common/Switch/Switch.styled.ts b/kafka-ui-react-app/src/components/common/Switch/Switch.styled.ts
index 88239280594..0f4f2c1d11c 100644
--- a/kafka-ui-react-app/src/components/common/Switch/Switch.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Switch/Switch.styled.ts
@@ -39,6 +39,10 @@ export const StyledSlider = styled.span<Props>`
   transition: 0.4s;
   border-radius: 20px;
 
+  :hover {
+    background-color: ${({ theme }) => theme.switch.hover};
+  }
+
   &::before {
     position: absolute;
     content: '';
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 814ca58cb13..e7ee0047e6c 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -235,12 +235,13 @@ const baseTheme = {
     color: Colors.neutral[90],
   },
   switch: {
-    unchecked: Colors.brand[30],
+    unchecked: Colors.neutral[20],
+    hover: Colors.neutral[40],
     checked: Colors.brand[50],
     circle: Colors.neutral[0],
     disabled: Colors.neutral[10],
     checkedIcon: {
-      backgroundColor: Colors.neutral[70],
+      backgroundColor: Colors.neutral[10],
     },
   },
   pageLoader: {

From 43ec02ce300c64dd6ca7bc8fcd0c0b83cc19ae80 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 10 May 2023 09:51:14 +0400
Subject: [PATCH 561/734] Revert "FE: Redirect the user to the wizard page if
 no clusters (#3481)" (#3798)

---
 .../src/components/Dashboard/Dashboard.tsx    | 11 +----
 .../Dashboard/__test__/Dashboard.spec.tsx     | 45 -------------------
 .../contexts/GlobalSettingsContext.tsx        |  2 +-
 kafka-ui-react-app/src/lib/testHelpers.tsx    |  9 +---
 4 files changed, 5 insertions(+), 62 deletions(-)
 delete mode 100644 kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx

diff --git a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
index c7b64aef1cf..d7ace183692 100644
--- a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useMemo } from 'react';
 import PageHeading from 'components/common/PageHeading/PageHeading';
 import * as Metrics from 'components/common/Metrics';
 import { Tag } from 'components/common/Tag/Tag.styled';
@@ -10,7 +10,6 @@ import Table, { SizeCell } from 'components/common/NewTable';
 import useBoolean from 'lib/hooks/useBoolean';
 import { clusterNewConfigPath } from 'lib/paths';
 import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
-import { useNavigate } from 'react-router-dom';
 import { ActionCanButton } from 'components/common/ActionComponent';
 import { useGetUserInfo } from 'lib/hooks/api/roles';
 
@@ -23,7 +22,7 @@ const Dashboard: React.FC = () => {
   const clusters = useClusters();
   const { value: showOfflineOnly, toggle } = useBoolean(false);
   const appInfo = React.useContext(GlobalSettingsContext);
-  const navigate = useNavigate();
+
   const config = React.useMemo(() => {
     const clusterList = clusters.data || [];
     const offlineClusters = clusterList.filter(
@@ -58,12 +57,6 @@ const Dashboard: React.FC = () => {
     return initialColumns;
   }, []);
 
-  useEffect(() => {
-    if (appInfo.hasDynamicConfig && !clusters.data) {
-      navigate(clusterNewConfigPath);
-    }
-  }, [clusters, appInfo.hasDynamicConfig]);
-
   const isApplicationConfig = useMemo(() => {
     return !!data?.userInfo?.permissions.some(
       (permission) => permission.resource === ResourceType.APPLICATIONCONFIG
diff --git a/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
deleted file mode 100644
index e9141e980e4..00000000000
--- a/kafka-ui-react-app/src/components/Dashboard/__test__/Dashboard.spec.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-import { useClusters } from 'lib/hooks/api/clusters';
-import Dashboard from 'components/Dashboard/Dashboard';
-import { Cluster, ServerStatus } from 'generated-sources';
-import { render } from 'lib/testHelpers';
-
-interface DataType {
-  data: Cluster[] | undefined;
-}
-jest.mock('lib/hooks/api/clusters');
-const mockedNavigate = jest.fn();
-jest.mock('react-router-dom', () => ({
-  ...jest.requireActual('react-router-dom'),
-  useNavigate: () => mockedNavigate,
-}));
-describe('Dashboard component', () => {
-  const renderComponent = (hasDynamicConfig: boolean, data: DataType) => {
-    const useClustersMock = useClusters as jest.Mock;
-    useClustersMock.mockReturnValue(data);
-    render(<Dashboard />, {
-      globalSettings: { hasDynamicConfig },
-    });
-  };
-  it('redirects to new cluster configuration page if there are no clusters and dynamic config is enabled', async () => {
-    await renderComponent(true, { data: undefined });
-
-    expect(mockedNavigate).toHaveBeenCalled();
-  });
-
-  it('should not navigate to new cluster config page when there are clusters', async () => {
-    await renderComponent(true, {
-      data: [{ name: 'Cluster 1', status: ServerStatus.ONLINE }],
-    });
-
-    expect(mockedNavigate).not.toHaveBeenCalled();
-  });
-
-  it('should not navigate to new cluster config page when there are no clusters and hasDynamicConfig is false', async () => {
-    await renderComponent(false, {
-      data: [],
-    });
-
-    expect(mockedNavigate).not.toHaveBeenCalled();
-  });
-});
diff --git a/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
index 563fb175f32..4de05307b11 100644
--- a/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
+++ b/kafka-ui-react-app/src/components/contexts/GlobalSettingsContext.tsx
@@ -2,7 +2,7 @@ import { useAppInfo } from 'lib/hooks/api/appConfig';
 import React from 'react';
 import { ApplicationInfoEnabledFeaturesEnum } from 'generated-sources';
 
-export interface GlobalSettingsContextProps {
+interface GlobalSettingsContextProps {
   hasDynamicConfig: boolean;
 }
 
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index 42539a0aac9..508904d1466 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -26,10 +26,7 @@ import {
 } from '@tanstack/react-query';
 import { ConfirmContextProvider } from 'components/contexts/ConfirmContext';
 import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal';
-import {
-  GlobalSettingsContext,
-  GlobalSettingsContextProps,
-} from 'components/contexts/GlobalSettingsContext';
+import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
 import { UserInfoRolesAccessContext } from 'components/contexts/UserInfoRolesAccessContext';
 
 import { RolesType, modifyRolesData } from './permissions';
@@ -38,7 +35,6 @@ interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
   preloadedState?: Partial<RootState>;
   store?: Store<Partial<RootState>, AnyAction>;
   initialEntries?: MemoryRouterProps['initialEntries'];
-  globalSettings?: GlobalSettingsContextProps;
   userInfo?: {
     roles?: RolesType;
     rbacFlag: boolean;
@@ -114,7 +110,6 @@ const customRender = (
       preloadedState,
     }),
     initialEntries,
-    globalSettings = { hasDynamicConfig: false },
     userInfo,
     ...renderOptions
   }: CustomRenderOptions = {}
@@ -124,7 +119,7 @@ const customRender = (
     children,
   }) => (
     <TestQueryClientProvider>
-      <GlobalSettingsContext.Provider value={globalSettings}>
+      <GlobalSettingsContext.Provider value={{ hasDynamicConfig: false }}>
         <ThemeProvider theme={theme}>
           <TestUserInfoProvider data={userInfo}>
             <ConfirmContextProvider>

From 3ca417f64a57e78084da9074d8eedba5a67ce58b Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 10 May 2023 10:37:57 +0400
Subject: [PATCH 562/734] RBAC: Implement generic OAuth2 authority extractor
 (#3740)

---
 .../kafka/ui/config/auth/OAuthProperties.java | 12 ++-
 .../config/auth/OAuthPropertiesConverter.java |  3 +-
 .../ui/config/auth/OAuthSecurityConfig.java   | 22 ++---
 .../logout/CognitoLogoutSuccessHandler.java   |  6 +-
 .../ui/model/rbac/provider/Provider.java      |  4 +
 .../ui/service/rbac/AccessControlService.java |  2 +
 .../extractor/CognitoAuthorityExtractor.java  |  9 +-
 .../extractor/GithubAuthorityExtractor.java   |  6 +-
 .../extractor/GoogleAuthorityExtractor.java   | 16 ++--
 .../extractor/OauthAuthorityExtractor.java    | 88 ++++++++++++++++++-
 .../extractor/ProviderAuthorityExtractor.java |  4 +-
 .../ui/util/DynamicConfigOperations.java      |  2 +-
 12 files changed, 138 insertions(+), 36 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
index a76403bf707..4064fbc352d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthProperties.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.config.auth;
 
 import jakarta.annotation.PostConstruct;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -14,7 +15,16 @@ public class OAuthProperties {
   private Map<String, OAuth2Provider> client = new HashMap<>();
 
   @PostConstruct
-  public void validate() {
+  public void init() {
+    getClient().values().forEach((provider) -> {
+      if (provider.getCustomParams() == null) {
+        provider.setCustomParams(Collections.emptyMap());
+      }
+      if (provider.getScope() == null) {
+        provider.setScope(Collections.emptySet());
+      }
+    });
+
     getClient().values().forEach(this::validateProvider);
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
index 90daa362739..f7f986f5ea9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthPropertiesConverter.java
@@ -73,8 +73,7 @@ private static void applyGoogleTransformations(OAuth2Provider provider) {
   }
 
   private static boolean isGoogle(OAuth2Provider provider) {
-    return provider.getCustomParams() != null
-        && GOOGLE.equalsIgnoreCase(provider.getCustomParams().get(TYPE));
+    return GOOGLE.equalsIgnoreCase(provider.getCustomParams().get(TYPE));
   }
 }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
index 5db612f256e..d170a7338c1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
@@ -72,13 +72,13 @@ public ReactiveOAuth2UserService<OidcUserRequest, OidcUser> customOidcUserServic
     final OidcReactiveOAuth2UserService delegate = new OidcReactiveOAuth2UserService();
     return request -> delegate.loadUser(request)
         .flatMap(user -> {
-          String providerId = request.getClientRegistration().getRegistrationId();
-          final var extractor = getExtractor(providerId, acs);
+          var provider = getProviderByProviderId(request.getClientRegistration().getRegistrationId());
+          final var extractor = getExtractor(provider, acs);
           if (extractor == null) {
             return Mono.just(user);
           }
 
-          return extractor.extract(acs, user, Map.of("request", request))
+          return extractor.extract(acs, user, Map.of("request", request, "provider", provider))
               .map(groups -> new RbacOidcUser(user, groups));
         });
   }
@@ -88,13 +88,13 @@ public ReactiveOAuth2UserService<OAuth2UserRequest, OAuth2User> customOauth2User
     final DefaultReactiveOAuth2UserService delegate = new DefaultReactiveOAuth2UserService();
     return request -> delegate.loadUser(request)
         .flatMap(user -> {
-          String providerId = request.getClientRegistration().getRegistrationId();
-          final var extractor = getExtractor(providerId, acs);
+          var provider = getProviderByProviderId(request.getClientRegistration().getRegistrationId());
+          final var extractor = getExtractor(provider, acs);
           if (extractor == null) {
             return Mono.just(user);
           }
 
-          return extractor.extract(acs, user, Map.of("request", request))
+          return extractor.extract(acs, user, Map.of("request", request, "provider", provider))
               .map(groups -> new RbacOAuth2User(user, groups));
         });
   }
@@ -113,18 +113,18 @@ public ServerLogoutSuccessHandler defaultOidcLogoutHandler(final ReactiveClientR
   }
 
   @Nullable
-  private ProviderAuthorityExtractor getExtractor(final String providerId, AccessControlService acs) {
-    final String provider = getProviderByProviderId(providerId);
+  private ProviderAuthorityExtractor getExtractor(final OAuthProperties.OAuth2Provider provider,
+                                                  AccessControlService acs) {
     Optional<ProviderAuthorityExtractor> extractor = acs.getOauthExtractors()
         .stream()
-        .filter(e -> e.isApplicable(provider))
+        .filter(e -> e.isApplicable(provider.getProvider(), provider.getCustomParams()))
         .findFirst();
 
     return extractor.orElse(null);
   }
 
-  private String getProviderByProviderId(final String providerId) {
-    return properties.getClient().get(providerId).getProvider();
+  private OAuthProperties.OAuth2Provider getProviderByProviderId(final String providerId) {
+    return properties.getClient().get(providerId);
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java
index e9e5159e1b7..3d0da9d05a6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/logout/CognitoLogoutSuccessHandler.java
@@ -46,10 +46,8 @@ public Mono<Void> handle(WebFilterExchange exchange, Authentication authenticati
         .fragment(null)
         .build();
 
-    Assert.isTrue(
-        provider.getCustomParams() != null && provider.getCustomParams().containsKey("logoutUrl"),
-        "Custom params should contain 'logoutUrl'"
-    );
+    Assert.isTrue(provider.getCustomParams().containsKey("logoutUrl"),
+        "Custom params should contain 'logoutUrl'");
     final var uri = UriComponentsBuilder
         .fromUri(URI.create(provider.getCustomParams().get("logoutUrl")))
         .queryParam("client_id", provider.getClientId())
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/provider/Provider.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/provider/Provider.java
index 27f7a56ada9..a2cde9158c1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/provider/Provider.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/provider/Provider.java
@@ -10,6 +10,8 @@ public enum Provider {
 
   OAUTH_COGNITO,
 
+  OAUTH,
+
   LDAP,
   LDAP_AD;
 
@@ -22,6 +24,8 @@ public static class Name {
     public static String GOOGLE = "google";
     public static String GITHUB = "github";
     public static String COGNITO = "cognito";
+
+    public static String OAUTH = "oauth";
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index e964f64a9bf..e34b63f5ff5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -20,6 +20,7 @@
 import com.provectus.kafka.ui.service.rbac.extractor.CognitoAuthorityExtractor;
 import com.provectus.kafka.ui.service.rbac.extractor.GithubAuthorityExtractor;
 import com.provectus.kafka.ui.service.rbac.extractor.GoogleAuthorityExtractor;
+import com.provectus.kafka.ui.service.rbac.extractor.OauthAuthorityExtractor;
 import com.provectus.kafka.ui.service.rbac.extractor.ProviderAuthorityExtractor;
 import jakarta.annotation.PostConstruct;
 import java.util.Collections;
@@ -76,6 +77,7 @@ public void init() {
               case OAUTH_COGNITO -> new CognitoAuthorityExtractor();
               case OAUTH_GOOGLE -> new GoogleAuthorityExtractor();
               case OAUTH_GITHUB -> new GithubAuthorityExtractor();
+              case OAUTH -> new OauthAuthorityExtractor();
               default -> null;
             })
             .filter(Objects::nonNull)
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
index f7da0a19dba..67bcba69a2d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
@@ -1,5 +1,8 @@
 package com.provectus.kafka.ui.service.rbac.extractor;
 
+import static com.provectus.kafka.ui.model.rbac.provider.Provider.Name.COGNITO;
+
+import com.google.common.collect.Sets;
 import com.provectus.kafka.ui.model.rbac.Role;
 import com.provectus.kafka.ui.model.rbac.provider.Provider;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
@@ -18,8 +21,8 @@ public class CognitoAuthorityExtractor implements ProviderAuthorityExtractor {
   private static final String COGNITO_GROUPS_ATTRIBUTE_NAME = "cognito:groups";
 
   @Override
-  public boolean isApplicable(String provider) {
-    return Provider.Name.COGNITO.equalsIgnoreCase(provider);
+  public boolean isApplicable(String provider, Map<String, String> customParams) {
+    return COGNITO.equalsIgnoreCase(provider) || COGNITO.equalsIgnoreCase(customParams.get(TYPE));
   }
 
   @Override
@@ -63,7 +66,7 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
         .map(Role::getName)
         .collect(Collectors.toSet());
 
-    return Mono.just(Stream.concat(groupsByUsername.stream(), groupsByGroups.stream()).collect(Collectors.toSet()));
+    return Mono.just(Sets.union(groupsByUsername, groupsByGroups));
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
index 0f66e45917e..3cc33035e88 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
@@ -1,5 +1,7 @@
 package com.provectus.kafka.ui.service.rbac.extractor;
 
+import static com.provectus.kafka.ui.model.rbac.provider.Provider.Name.GITHUB;
+
 import com.provectus.kafka.ui.model.rbac.Role;
 import com.provectus.kafka.ui.model.rbac.provider.Provider;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
@@ -28,8 +30,8 @@ public class GithubAuthorityExtractor implements ProviderAuthorityExtractor {
   private static final String DUMMY = "dummy";
 
   @Override
-  public boolean isApplicable(String provider) {
-    return Provider.Name.GITHUB.equalsIgnoreCase(provider);
+  public boolean isApplicable(String provider, Map<String, String> customParams) {
+    return GITHUB.equalsIgnoreCase(provider) || GITHUB.equalsIgnoreCase(customParams.get(TYPE));
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GoogleAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GoogleAuthorityExtractor.java
index 747a9dea052..fcc372d5a3e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GoogleAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GoogleAuthorityExtractor.java
@@ -1,13 +1,14 @@
 package com.provectus.kafka.ui.service.rbac.extractor;
 
+import static com.provectus.kafka.ui.model.rbac.provider.Provider.Name.GOOGLE;
+
+import com.google.common.collect.Sets;
 import com.provectus.kafka.ui.model.rbac.Role;
 import com.provectus.kafka.ui.model.rbac.provider.Provider;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import reactor.core.publisher.Mono;
@@ -19,8 +20,8 @@ public class GoogleAuthorityExtractor implements ProviderAuthorityExtractor {
   public static final String EMAIL_ATTRIBUTE_NAME = "email";
 
   @Override
-  public boolean isApplicable(String provider) {
-    return Provider.Name.GOOGLE.equalsIgnoreCase(provider);
+  public boolean isApplicable(String provider, Map<String, String> customParams) {
+    return GOOGLE.equalsIgnoreCase(provider) || GOOGLE.equalsIgnoreCase(customParams.get(TYPE));
   }
 
   @Override
@@ -52,7 +53,7 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
       return Mono.just(groupsByUsername);
     }
 
-    List<String> groupsByDomain = acs.getRoles()
+    Set<String> groupsByDomain = acs.getRoles()
         .stream()
         .filter(r -> r.getSubjects()
             .stream()
@@ -60,10 +61,9 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
             .filter(s -> s.getType().equals("domain"))
             .anyMatch(s -> s.getValue().equals(domain)))
         .map(Role::getName)
-        .toList();
+        .collect(Collectors.toSet());
 
-    return Mono.just(Stream.concat(groupsByUsername.stream(), groupsByDomain.stream())
-        .collect(Collectors.toSet()));
+    return Mono.just(Sets.union(groupsByUsername, groupsByDomain));
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/OauthAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/OauthAuthorityExtractor.java
index a97efe85a86..c935235d519 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/OauthAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/OauthAuthorityExtractor.java
@@ -1,22 +1,44 @@
 package com.provectus.kafka.ui.service.rbac.extractor;
 
+import static com.provectus.kafka.ui.model.rbac.provider.Provider.Name.OAUTH;
+
+import com.google.common.collect.Sets;
+import com.provectus.kafka.ui.config.auth.OAuthProperties;
+import com.provectus.kafka.ui.model.rbac.Role;
+import com.provectus.kafka.ui.model.rbac.provider.Provider;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
+import org.springframework.util.Assert;
 import reactor.core.publisher.Mono;
 
 @Slf4j
 public class OauthAuthorityExtractor implements ProviderAuthorityExtractor {
 
+  public static final String ROLES_FIELD_PARAM_NAME = "roles-field";
+
   @Override
-  public boolean isApplicable(String provider) {
-    return false; // TODO #2844
+  public boolean isApplicable(String provider, Map<String, String> customParams) {
+    var containsRolesFieldNameParam = customParams.containsKey(ROLES_FIELD_PARAM_NAME);
+    if (!containsRolesFieldNameParam) {
+      log.debug("Provider [{}] doesn't contain a roles field param name, mapping won't be performed", provider);
+      return false;
+    }
+
+    return OAUTH.equalsIgnoreCase(provider) || OAUTH.equalsIgnoreCase(customParams.get(TYPE));
   }
 
   @Override
   public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<String, Object> additionalParams) {
+    log.trace("Extracting OAuth2 user authorities");
+
     DefaultOAuth2User principal;
     try {
       principal = (DefaultOAuth2User) value;
@@ -25,7 +47,67 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
       throw new RuntimeException();
     }
 
-    return Mono.just(Set.of(principal.getName())); // TODO #2844
+    var provider = (OAuthProperties.OAuth2Provider) additionalParams.get("provider");
+    Assert.notNull(provider, "provider is null");
+    var rolesFieldName = provider.getCustomParams().get(ROLES_FIELD_PARAM_NAME);
+
+    Set<String> rolesByUsername = acs.getRoles()
+        .stream()
+        .filter(r -> r.getSubjects()
+            .stream()
+            .filter(s -> s.getProvider().equals(Provider.OAUTH))
+            .filter(s -> s.getType().equals("user"))
+            .anyMatch(s -> s.getValue().equals(principal.getName())))
+        .map(Role::getName)
+        .collect(Collectors.toSet());
+
+    Set<String> rolesByRolesField = acs.getRoles()
+        .stream()
+        .filter(role -> role.getSubjects()
+            .stream()
+            .filter(s -> s.getProvider().equals(Provider.OAUTH))
+            .filter(s -> s.getType().equals("role"))
+            .anyMatch(subject -> {
+              var roleName = subject.getValue();
+              var principalRoles = convertRoles(principal.getAttribute(rolesFieldName));
+              var roleMatched = principalRoles.contains(roleName);
+
+              if (roleMatched) {
+                log.debug("Assigning role [{}] to user [{}]", roleName, principal.getName());
+              } else {
+                log.trace("Role [{}] not found in user [{}] roles", roleName, principal.getName());
+              }
+
+              return roleMatched;
+            })
+        )
+        .map(Role::getName)
+        .collect(Collectors.toSet());
+
+    return Mono.just(Sets.union(rolesByUsername, rolesByRolesField));
+  }
+
+  @SuppressWarnings("unchecked")
+  private Collection<String> convertRoles(Object roles) {
+    if (roles == null) {
+      log.debug("Param missing from attributes, skipping");
+      return Collections.emptySet();
+    }
+
+    if ((roles instanceof List<?>) || (roles instanceof Set<?>)) {
+      log.trace("The field is either a set or a list, returning as is");
+      return (Collection<String>) roles;
+    }
+
+    if (!(roles instanceof String)) {
+      log.debug("The field is not a string, skipping");
+      return Collections.emptySet();
+    }
+
+    log.trace("Trying to deserialize the field value [{}] as a string", roles);
+
+    return Arrays.stream(((String) roles).split(","))
+        .collect(Collectors.toSet());
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/ProviderAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/ProviderAuthorityExtractor.java
index 7cc25e4c619..02c6d3017fe 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/ProviderAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/ProviderAuthorityExtractor.java
@@ -7,7 +7,9 @@
 
 public interface ProviderAuthorityExtractor {
 
-  boolean isApplicable(String provider);
+  String TYPE = "type";
+
+  boolean isApplicable(String provider, Map<String, String> customParams);
 
   Mono<Set<String>> extract(AccessControlService acs, Object value, Map<String, Object> additionalParams);
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
index 68f826bd0fc..9b1e5017ba8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
@@ -230,7 +230,7 @@ public void initAndValidate() {
 
       Optional.ofNullable(auth)
           .flatMap(a -> Optional.ofNullable(a.oauth2))
-          .ifPresent(OAuthProperties::validate);
+          .ifPresent(OAuthProperties::init);
 
       Optional.ofNullable(webclient)
           .ifPresent(WebclientProperties::validate);

From aa7429eeba2e942846fe071d72d4621dbd2aa70b Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 10 May 2023 10:45:18 +0400
Subject: [PATCH 563/734] BE: Update Kafka config-related info on schedule
 (#3764)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/service/FeatureService.java      |  30 ++---
 .../kafka/ui/service/ReactiveAdminClient.java | 103 +++++++++++-------
 .../kafka/ui/service/StatisticsService.java   |  39 +++----
 3 files changed, 90 insertions(+), 82 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
index 7ba3f036e93..87b48072c2d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
@@ -4,16 +4,13 @@
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.service.ReactiveAdminClient.ClusterDescription;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
-import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.common.Node;
 import org.apache.kafka.common.acl.AclOperation;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
@@ -24,11 +21,10 @@
 @Slf4j
 public class FeatureService {
 
-  private static final String DELETE_TOPIC_ENABLED_SERVER_PROPERTY = "delete.topic.enable";
-
   private final AdminClientService adminClientService;
 
-  public Mono<List<ClusterFeature>> getAvailableFeatures(KafkaCluster cluster,
+  public Mono<List<ClusterFeature>> getAvailableFeatures(ReactiveAdminClient adminClient,
+                                                         KafkaCluster cluster,
                                                          ClusterDescription clusterDescription) {
     List<Mono<ClusterFeature>> features = new ArrayList<>();
 
@@ -46,29 +42,17 @@ public Mono<List<ClusterFeature>> getAvailableFeatures(KafkaCluster cluster,
       features.add(Mono.just(ClusterFeature.SCHEMA_REGISTRY));
     }
 
-    features.add(topicDeletionEnabled(cluster, clusterDescription.getController()));
+    features.add(topicDeletionEnabled(adminClient));
     features.add(aclView(cluster));
     features.add(aclEdit(clusterDescription));
 
     return Flux.fromIterable(features).flatMap(m -> m).collectList();
   }
 
-  private Mono<ClusterFeature> topicDeletionEnabled(KafkaCluster cluster, @Nullable Node controller) {
-    if (controller == null) {
-      return Mono.just(ClusterFeature.TOPIC_DELETION); // assuming it is enabled by default
-    }
-    return adminClientService.get(cluster)
-        .flatMap(ac -> ac.loadBrokersConfig(List.of(controller.id())))
-        .map(config ->
-            config.values().stream()
-                .flatMap(Collection::stream)
-                .filter(e -> e.name().equals(DELETE_TOPIC_ENABLED_SERVER_PROPERTY))
-                .map(e -> Boolean.parseBoolean(e.value()))
-                .findFirst()
-                .orElse(true))
-        .flatMap(enabled -> enabled
-            ? Mono.just(ClusterFeature.TOPIC_DELETION)
-            : Mono.empty());
+  private Mono<ClusterFeature> topicDeletionEnabled(ReactiveAdminClient adminClient) {
+    return adminClient.isTopicDeletionEnabled()
+        ? Mono.just(ClusterFeature.TOPIC_DELETION)
+        : Mono.empty();
   }
 
   private Mono<ClusterFeature> aclEdit(ClusterDescription clusterDescription) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 8451a89f97d..0b6f16a2235 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -32,8 +32,9 @@
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.AdminClient;
@@ -75,7 +76,6 @@
 import org.apache.kafka.common.errors.UnknownTopicOrPartitionException;
 import org.apache.kafka.common.errors.UnsupportedVersionException;
 import org.apache.kafka.common.requests.DescribeLogDirsResponse;
-import org.apache.kafka.common.resource.ResourcePattern;
 import org.apache.kafka.common.resource.ResourcePatternFilter;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -85,7 +85,7 @@
 
 
 @Slf4j
-@RequiredArgsConstructor
+@AllArgsConstructor
 public class ReactiveAdminClient implements Closeable {
 
   public enum SupportedFeature {
@@ -104,7 +104,8 @@ public enum SupportedFeature {
       this.predicate = (admin, ver) -> Mono.just(ver != null && ver >= fromVersion);
     }
 
-    static Mono<Set<SupportedFeature>> forVersion(AdminClient ac, @Nullable Float kafkaVersion) {
+    static Mono<Set<SupportedFeature>> forVersion(AdminClient ac, String kafkaVersionStr) {
+      @Nullable Float kafkaVersion = KafkaVersion.parse(kafkaVersionStr).orElse(null);
       return Flux.fromArray(SupportedFeature.values())
           .flatMap(f -> f.predicate.apply(ac, kafkaVersion).map(enabled -> Tuples.of(f, enabled)))
           .filter(Tuple2::getT2)
@@ -123,19 +124,46 @@ public static class ClusterDescription {
     Set<AclOperation> authorizedOperations;
   }
 
-  public static Mono<ReactiveAdminClient> create(AdminClient adminClient) {
-    return getClusterVersion(adminClient)
-        .flatMap(ver ->
-            getSupportedUpdateFeaturesForVersion(adminClient, ver)
-                .map(features ->
-                    new ReactiveAdminClient(adminClient, ver, features)));
+  @Builder
+  private record ConfigRelatedInfo(String version,
+                                   Set<SupportedFeature> features,
+                                   boolean topicDeletionIsAllowed) {
+
+    private static Mono<ConfigRelatedInfo> extract(AdminClient ac, int controllerId) {
+      return loadBrokersConfig(ac, List.of(controllerId))
+          .map(map -> map.isEmpty() ? List.<ConfigEntry>of() : map.get(controllerId))
+          .flatMap(configs -> {
+            String version = "1.0-UNKNOWN";
+            boolean topicDeletionEnabled = true;
+            for (ConfigEntry entry : configs) {
+              if (entry.name().contains("inter.broker.protocol.version")) {
+                version = entry.value();
+              }
+              if (entry.name().equals("delete.topic.enable")) {
+                topicDeletionEnabled = Boolean.parseBoolean(entry.value());
+              }
+            }
+            var builder = ConfigRelatedInfo.builder()
+                .version(version)
+                .topicDeletionIsAllowed(topicDeletionEnabled);
+            return SupportedFeature.forVersion(ac, version)
+                .map(features -> builder.features(features).build());
+          });
+    }
   }
 
-  private static Mono<Set<SupportedFeature>> getSupportedUpdateFeaturesForVersion(AdminClient ac, String versionStr) {
-    @Nullable Float kafkaVersion = KafkaVersion.parse(versionStr).orElse(null);
-    return SupportedFeature.forVersion(ac, kafkaVersion);
+  public static Mono<ReactiveAdminClient> create(AdminClient adminClient) {
+    return describeClusterImpl(adminClient, Set.of())
+        // choosing node from which we will get configs (starting with controller)
+        .flatMap(descr -> descr.controller != null
+            ? Mono.just(descr.controller)
+            : Mono.justOrEmpty(descr.nodes.stream().findFirst())
+        )
+        .flatMap(node -> ConfigRelatedInfo.extract(adminClient, node.id()))
+        .map(info -> new ReactiveAdminClient(adminClient, info));
   }
 
+
   private static Mono<Boolean> isAuthorizedSecurityEnabled(AdminClient ac, @Nullable Float kafkaVersion) {
     return toMono(ac.describeAcls(AclBindingFilter.ANY).values())
         .thenReturn(true)
@@ -174,11 +202,10 @@ public static <T> Mono<T> toMono(KafkaFuture<T> future) {
 
   @Getter(AccessLevel.PACKAGE) // visible for testing
   private final AdminClient client;
-  private final String version;
-  private final Set<SupportedFeature> features;
+  private volatile ConfigRelatedInfo configRelatedInfo;
 
   public Set<SupportedFeature> getClusterFeatures() {
-    return features;
+    return configRelatedInfo.features();
   }
 
   public Mono<Set<String>> listTopics(boolean listInternal) {
@@ -190,7 +217,20 @@ public Mono<Void> deleteTopic(String topicName) {
   }
 
   public String getVersion() {
-    return version;
+    return configRelatedInfo.version();
+  }
+
+  public boolean isTopicDeletionEnabled() {
+    return configRelatedInfo.topicDeletionIsAllowed();
+  }
+
+  public Mono<Void> updateInternalStats(@Nullable Node controller) {
+    if (controller == null) {
+      return Mono.empty();
+    }
+    return ConfigRelatedInfo.extract(client, controller.id())
+        .doOnNext(info -> this.configRelatedInfo = info)
+        .then();
   }
 
   public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig() {
@@ -200,7 +240,7 @@ public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig() {
   //NOTE: skips not-found topics (for which UnknownTopicOrPartitionException was thrown by AdminClient)
   //and topics for which DESCRIBE_CONFIGS permission is not set (TopicAuthorizationException was thrown)
   public Mono<Map<String, List<ConfigEntry>>> getTopicsConfig(Collection<String> topicNames, boolean includeDoc) {
-    var includeDocFixed = features.contains(SupportedFeature.CONFIG_DOCUMENTATION_RETRIEVAL) && includeDoc;
+    var includeDocFixed = includeDoc && getClusterFeatures().contains(SupportedFeature.CONFIG_DOCUMENTATION_RETRIEVAL);
     // we need to partition calls, because it can lead to AdminClient timeouts in case of large topics count
     return partitionCalls(
         topicNames,
@@ -349,7 +389,7 @@ public Mono<Map<Integer, Map<String, DescribeLogDirsResponse.LogDirInfo>>> descr
   }
 
   public Mono<ClusterDescription> describeCluster() {
-    return describeClusterImpl(client, features);
+    return describeClusterImpl(client, getClusterFeatures());
   }
 
   private static Mono<ClusterDescription> describeClusterImpl(AdminClient client, Set<SupportedFeature> features) {
@@ -371,23 +411,6 @@ private static Mono<ClusterDescription> describeClusterImpl(AdminClient client,
     );
   }
 
-  private static Mono<String> getClusterVersion(AdminClient client) {
-    return describeClusterImpl(client, Set.of())
-        // choosing node from which we will get configs (starting with controller)
-        .flatMap(descr -> descr.controller != null
-            ? Mono.just(descr.controller)
-            : Mono.justOrEmpty(descr.nodes.stream().findFirst())
-        )
-        .flatMap(node -> loadBrokersConfig(client, List.of(node.id())))
-        .flatMap(configs -> configs.values().stream()
-            .flatMap(Collection::stream)
-            .filter(entry -> entry.name().contains("inter.broker.protocol.version"))
-            .findFirst()
-            .map(configEntry -> Mono.just(configEntry.value()))
-            .orElse(Mono.empty()))
-        .switchIfEmpty(Mono.just("1.0-UNKNOWN"));
-  }
-
   public Mono<Void> deleteConsumerGroups(Collection<String> groupIds) {
     return toMono(client.deleteConsumerGroups(groupIds).all())
         .onErrorResume(GroupIdNotFoundException.class,
@@ -421,7 +444,7 @@ public Mono<Void> createPartitions(Map<String, NewPartitions> newPartitionsMap)
   // NOTE: places whole current topic config with new one. Entries that were present in old config,
   // but missed in new will be set to default
   public Mono<Void> updateTopicConfig(String topicName, Map<String, String> configs) {
-    if (features.contains(SupportedFeature.INCREMENTAL_ALTER_CONFIGS)) {
+    if (getClusterFeatures().contains(SupportedFeature.INCREMENTAL_ALTER_CONFIGS)) {
       return getTopicsConfigImpl(List.of(topicName), false)
           .map(conf -> conf.getOrDefault(topicName, List.of()))
           .flatMap(currentConfigs -> incrementalAlterConfig(topicName, currentConfigs, configs));
@@ -596,17 +619,17 @@ Mono<Map<TopicPartition, Long>> listOffsetsUnsafe(Collection<TopicPartition> par
   }
 
   public Mono<Collection<AclBinding>> listAcls(ResourcePatternFilter filter) {
-    Preconditions.checkArgument(features.contains(SupportedFeature.AUTHORIZED_SECURITY_ENABLED));
+    Preconditions.checkArgument(getClusterFeatures().contains(SupportedFeature.AUTHORIZED_SECURITY_ENABLED));
     return toMono(client.describeAcls(new AclBindingFilter(filter, AccessControlEntryFilter.ANY)).values());
   }
 
   public Mono<Void> createAcls(Collection<AclBinding> aclBindings) {
-    Preconditions.checkArgument(features.contains(SupportedFeature.AUTHORIZED_SECURITY_ENABLED));
+    Preconditions.checkArgument(getClusterFeatures().contains(SupportedFeature.AUTHORIZED_SECURITY_ENABLED));
     return toMono(client.createAcls(aclBindings).all());
   }
 
   public Mono<Void> deleteAcls(Collection<AclBinding> aclBindings) {
-    Preconditions.checkArgument(features.contains(SupportedFeature.AUTHORIZED_SECURITY_ENABLED));
+    Preconditions.checkArgument(getClusterFeatures().contains(SupportedFeature.AUTHORIZED_SECURITY_ENABLED));
     var filters = aclBindings.stream().map(AclBinding::toFilter).collect(Collectors.toSet());
     return toMono(client.deleteAcls(filters).all()).then();
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
index 994c30714ae..19d946590c4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/StatisticsService.java
@@ -37,25 +37,26 @@ public Mono<Statistics> updateCache(KafkaCluster c) {
   private Mono<Statistics> getStatistics(KafkaCluster cluster) {
     return adminClientService.get(cluster).flatMap(ac ->
             ac.describeCluster().flatMap(description ->
-                Mono.zip(
-                    List.of(
-                        metricsCollector.getBrokerMetrics(cluster, description.getNodes()),
-                        getLogDirInfo(description, ac),
-                        featureService.getAvailableFeatures(cluster, description),
-                        loadTopicConfigs(cluster),
-                        describeTopics(cluster)),
-                    results ->
-                        Statistics.builder()
-                            .status(ServerStatusDTO.ONLINE)
-                            .clusterDescription(description)
-                            .version(ac.getVersion())
-                            .metrics((Metrics) results[0])
-                            .logDirInfo((InternalLogDirStats) results[1])
-                            .features((List<ClusterFeature>) results[2])
-                            .topicConfigs((Map<String, List<ConfigEntry>>) results[3])
-                            .topicDescriptions((Map<String, TopicDescription>) results[4])
-                            .build()
-                )))
+                ac.updateInternalStats(description.getController()).then(
+                    Mono.zip(
+                        List.of(
+                            metricsCollector.getBrokerMetrics(cluster, description.getNodes()),
+                            getLogDirInfo(description, ac),
+                            featureService.getAvailableFeatures(ac, cluster, description),
+                            loadTopicConfigs(cluster),
+                            describeTopics(cluster)),
+                        results ->
+                            Statistics.builder()
+                                .status(ServerStatusDTO.ONLINE)
+                                .clusterDescription(description)
+                                .version(ac.getVersion())
+                                .metrics((Metrics) results[0])
+                                .logDirInfo((InternalLogDirStats) results[1])
+                                .features((List<ClusterFeature>) results[2])
+                                .topicConfigs((Map<String, List<ConfigEntry>>) results[3])
+                                .topicDescriptions((Map<String, TopicDescription>) results[4])
+                                .build()
+                    ))))
         .doOnError(e ->
             log.error("Failed to collect cluster {} info", cluster.getName(), e))
         .onErrorResume(

From 52a42e698e4bac85b64a40d8e7e3843070f19ef9 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 11 May 2023 11:06:22 +0400
Subject: [PATCH 564/734] BE: RBAC: Implement restart permission for KC (#3805)

---
 .../provectus/kafka/ui/controller/KafkaConnectController.java  | 2 +-
 .../kafka/ui/model/rbac/permission/ConnectAction.java          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index 080c6020f9b..d300b930164 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -211,7 +211,7 @@ public Mono<ResponseEntity<Void>> restartConnectorTask(String clusterName, Strin
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
-        .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
+        .connectActions(ConnectAction.VIEW, ConnectAction.RESTART)
         .build());
 
     return validateAccess.then(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java
index 3db4d4953c4..1c3335e3608 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java
@@ -7,7 +7,8 @@ public enum ConnectAction implements PermissibleAction {
 
   VIEW,
   EDIT,
-  CREATE
+  CREATE,
+  RESTART
 
   ;
 

From 1d8c6197aca5d0adf354e1fa888f980d28afeb2d Mon Sep 17 00:00:00 2001
From: Nail Badiullin <nbadiullin@provectus.com>
Date: Thu, 11 May 2023 12:38:39 +0400
Subject: [PATCH 565/734] FE: Expose cluster ACL list (#3662)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Ilya Kuramshin <iliax@proton.me>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/ACLPage/ACLPage.tsx        |  13 ++
 .../components/ACLPage/List/List.styled.ts    |  44 +++++
 .../src/components/ACLPage/List/List.tsx      | 153 ++++++++++++++++++
 .../ACLPage/List/__test__/List.spec.tsx       |  74 +++++++++
 .../components/ClusterPage/ClusterPage.tsx    |  11 ++
 .../src/components/Nav/ClusterMenu.tsx        |   5 +
 .../components/common/Button/Button.styled.ts |   2 +-
 .../ConfirmationModal/ConfirmationModal.tsx   |   2 +-
 .../components/common/Icons/DeleteIcon.tsx    |   5 +-
 .../common/MultiSelect/MultiSelect.styled.ts  |  12 +-
 .../src/components/common/NewTable/Table.tsx  |  36 ++++-
 .../components/contexts/ConfirmContext.tsx    |   5 +
 kafka-ui-react-app/src/lib/api.ts             |   2 +
 kafka-ui-react-app/src/lib/fixtures/acls.ts   |  37 +++++
 kafka-ui-react-app/src/lib/hooks/api/acl.ts   |  67 ++++++++
 .../src/lib/hooks/useConfirm.ts               |   3 +-
 kafka-ui-react-app/src/lib/paths.ts           |   7 +
 kafka-ui-react-app/src/theme/theme.ts         |  86 +++++++++-
 18 files changed, 550 insertions(+), 14 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/ACLPage/ACLPage.tsx
 create mode 100644 kafka-ui-react-app/src/components/ACLPage/List/List.styled.ts
 create mode 100644 kafka-ui-react-app/src/components/ACLPage/List/List.tsx
 create mode 100644 kafka-ui-react-app/src/components/ACLPage/List/__test__/List.spec.tsx
 create mode 100644 kafka-ui-react-app/src/lib/fixtures/acls.ts
 create mode 100644 kafka-ui-react-app/src/lib/hooks/api/acl.ts

diff --git a/kafka-ui-react-app/src/components/ACLPage/ACLPage.tsx b/kafka-ui-react-app/src/components/ACLPage/ACLPage.tsx
new file mode 100644
index 00000000000..616198716d2
--- /dev/null
+++ b/kafka-ui-react-app/src/components/ACLPage/ACLPage.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { Routes, Route } from 'react-router-dom';
+import ACList from 'components/ACLPage/List/List';
+
+const ACLPage = () => {
+  return (
+    <Routes>
+      <Route index element={<ACList />} />
+    </Routes>
+  );
+};
+
+export default ACLPage;
diff --git a/kafka-ui-react-app/src/components/ACLPage/List/List.styled.ts b/kafka-ui-react-app/src/components/ACLPage/List/List.styled.ts
new file mode 100644
index 00000000000..287214e1e62
--- /dev/null
+++ b/kafka-ui-react-app/src/components/ACLPage/List/List.styled.ts
@@ -0,0 +1,44 @@
+import styled from 'styled-components';
+
+export const EnumCell = styled.div`
+  text-transform: capitalize;
+`;
+
+export const DeleteCell = styled.div`
+  svg {
+    cursor: pointer;
+  }
+`;
+
+export const Chip = styled.div<{
+  chipType?: 'default' | 'success' | 'danger' | 'secondary' | string;
+}>`
+  width: fit-content;
+  text-transform: capitalize;
+  padding: 2px 8px;
+  font-size: 12px;
+  line-height: 16px;
+  border-radius: 16px;
+  color: ${({ theme }) => theme.tag.color};
+  background-color: ${({ theme, chipType }) => {
+    switch (chipType) {
+      case 'success':
+        return theme.tag.backgroundColor.green;
+      case 'danger':
+        return theme.tag.backgroundColor.red;
+      case 'secondary':
+        return theme.tag.backgroundColor.secondary;
+      default:
+        return theme.tag.backgroundColor.gray;
+    }
+  }};
+`;
+
+export const PatternCell = styled.div`
+  display: flex;
+  align-items: center;
+
+  ${Chip} {
+    margin-left: 4px;
+  }
+`;
diff --git a/kafka-ui-react-app/src/components/ACLPage/List/List.tsx b/kafka-ui-react-app/src/components/ACLPage/List/List.tsx
new file mode 100644
index 00000000000..499f255c307
--- /dev/null
+++ b/kafka-ui-react-app/src/components/ACLPage/List/List.tsx
@@ -0,0 +1,153 @@
+import React from 'react';
+import { ColumnDef } from '@tanstack/react-table';
+import { useTheme } from 'styled-components';
+import PageHeading from 'components/common/PageHeading/PageHeading';
+import Table from 'components/common/NewTable';
+import DeleteIcon from 'components/common/Icons/DeleteIcon';
+import { useConfirm } from 'lib/hooks/useConfirm';
+import useAppParams from 'lib/hooks/useAppParams';
+import { useAcls, useDeleteAcl } from 'lib/hooks/api/acl';
+import { ClusterName } from 'redux/interfaces';
+import {
+  KafkaAcl,
+  KafkaAclNamePatternType,
+  KafkaAclPermissionEnum,
+} from 'generated-sources';
+
+import * as S from './List.styled';
+
+const ACList: React.FC = () => {
+  const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
+  const theme = useTheme();
+  const { data: aclList } = useAcls(clusterName);
+  const { deleteResource } = useDeleteAcl(clusterName);
+  const modal = useConfirm(true);
+
+  const [rowId, setRowId] = React.useState('');
+
+  const onDeleteClick = (acl: KafkaAcl | null) => {
+    if (acl) {
+      modal('Are you sure want to delete this ACL record?', () =>
+        deleteResource(acl)
+      );
+    }
+  };
+
+  const columns = React.useMemo<ColumnDef<KafkaAcl>[]>(
+    () => [
+      {
+        header: 'Principal',
+        accessorKey: 'principal',
+        size: 257,
+      },
+      {
+        header: 'Resource',
+        accessorKey: 'resourceType',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue }) => (
+          <S.EnumCell>{getValue<string>().toLowerCase()}</S.EnumCell>
+        ),
+        size: 145,
+      },
+      {
+        header: 'Pattern',
+        accessorKey: 'resourceName',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue, row }) => {
+          let chipType;
+          if (
+            row.original.namePatternType === KafkaAclNamePatternType.PREFIXED
+          ) {
+            chipType = 'default';
+          }
+
+          if (
+            row.original.namePatternType === KafkaAclNamePatternType.LITERAL
+          ) {
+            chipType = 'secondary';
+          }
+          return (
+            <S.PatternCell>
+              {getValue<string>()}
+              {chipType ? (
+                <S.Chip chipType={chipType}>
+                  {row.original.namePatternType.toLowerCase()}
+                </S.Chip>
+              ) : null}
+            </S.PatternCell>
+          );
+        },
+        size: 257,
+      },
+      {
+        header: 'Host',
+        accessorKey: 'host',
+        size: 257,
+      },
+      {
+        header: 'Operation',
+        accessorKey: 'operation',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue }) => (
+          <S.EnumCell>{getValue<string>().toLowerCase()}</S.EnumCell>
+        ),
+        size: 121,
+      },
+      {
+        header: 'Permission',
+        accessorKey: 'permission',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ getValue }) => (
+          <S.Chip
+            chipType={
+              getValue<string>() === KafkaAclPermissionEnum.ALLOW
+                ? 'success'
+                : 'danger'
+            }
+          >
+            {getValue<string>().toLowerCase()}
+          </S.Chip>
+        ),
+        size: 111,
+      },
+      {
+        id: 'delete',
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: ({ row }) => {
+          return (
+            <S.DeleteCell onClick={() => onDeleteClick(row.original)}>
+              <DeleteIcon
+                fill={
+                  rowId === row.id ? theme.acl.table.deleteIcon : 'transparent'
+                }
+              />
+            </S.DeleteCell>
+          );
+        },
+        size: 76,
+      },
+    ],
+    [rowId]
+  );
+
+  const onRowHover = (value: unknown) => {
+    if (value && typeof value === 'object' && 'id' in value) {
+      setRowId(value.id as string);
+    }
+  };
+
+  return (
+    <>
+      <PageHeading text="Access Control List" />
+      <Table
+        columns={columns}
+        data={aclList ?? []}
+        emptyMessage="No ACL items found"
+        onRowHover={onRowHover}
+        onMouseLeave={() => setRowId('')}
+      />
+    </>
+  );
+};
+
+export default ACList;
diff --git a/kafka-ui-react-app/src/components/ACLPage/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/ACLPage/List/__test__/List.spec.tsx
new file mode 100644
index 00000000000..0c39681bbd4
--- /dev/null
+++ b/kafka-ui-react-app/src/components/ACLPage/List/__test__/List.spec.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import { render, WithRoute } from 'lib/testHelpers';
+import { screen } from '@testing-library/dom';
+import userEvent from '@testing-library/user-event';
+import { clusterACLPath } from 'lib/paths';
+import ACList from 'components/ACLPage/List/List';
+import { useAcls, useDeleteAcl } from 'lib/hooks/api/acl';
+import { aclPayload } from 'lib/fixtures/acls';
+
+jest.mock('lib/hooks/api/acl', () => ({
+  useAcls: jest.fn(),
+  useDeleteAcl: jest.fn(),
+}));
+
+describe('ACLList Component', () => {
+  const clusterName = 'local';
+  const renderComponent = () =>
+    render(
+      <WithRoute path={clusterACLPath()}>
+        <ACList />
+      </WithRoute>,
+      {
+        initialEntries: [clusterACLPath(clusterName)],
+      }
+    );
+
+  describe('ACLList', () => {
+    describe('when the acls are loaded', () => {
+      beforeEach(() => {
+        (useAcls as jest.Mock).mockImplementation(() => ({
+          data: aclPayload,
+        }));
+        (useDeleteAcl as jest.Mock).mockImplementation(() => ({
+          deleteResource: jest.fn(),
+        }));
+      });
+
+      it('renders ACLList with records', async () => {
+        renderComponent();
+        expect(screen.getByRole('table')).toBeInTheDocument();
+        expect(screen.getAllByRole('row').length).toEqual(4);
+      });
+
+      it('shows delete icon on hover', async () => {
+        const { container } = renderComponent();
+        const [trElement] = screen.getAllByRole('row');
+        await userEvent.hover(trElement);
+        const deleteElement = container.querySelector('svg');
+        expect(deleteElement).not.toHaveStyle({
+          fill: 'transparent',
+        });
+      });
+    });
+
+    describe('when it has no acls', () => {
+      beforeEach(() => {
+        (useAcls as jest.Mock).mockImplementation(() => ({
+          data: [],
+        }));
+        (useDeleteAcl as jest.Mock).mockImplementation(() => ({
+          deleteResource: jest.fn(),
+        }));
+      });
+
+      it('renders empty ACLList with message', async () => {
+        renderComponent();
+        expect(screen.getByRole('table')).toBeInTheDocument();
+        expect(
+          screen.getByRole('row', { name: 'No ACL items found' })
+        ).toBeInTheDocument();
+      });
+    });
+  });
+});
diff --git a/kafka-ui-react-app/src/components/ClusterPage/ClusterPage.tsx b/kafka-ui-react-app/src/components/ClusterPage/ClusterPage.tsx
index c2f6a13fbee..29d2015f612 100644
--- a/kafka-ui-react-app/src/components/ClusterPage/ClusterPage.tsx
+++ b/kafka-ui-react-app/src/components/ClusterPage/ClusterPage.tsx
@@ -13,6 +13,7 @@ import {
   clusterTopicsRelativePath,
   clusterConfigRelativePath,
   getNonExactPath,
+  clusterAclRelativePath,
 } from 'lib/paths';
 import ClusterContext from 'components/contexts/ClusterContext';
 import PageLoader from 'components/common/PageLoader/PageLoader';
@@ -30,6 +31,7 @@ const ClusterConfigPage = React.lazy(
 const ConsumerGroups = React.lazy(
   () => import('components/ConsumerGroups/ConsumerGroups')
 );
+const AclPage = React.lazy(() => import('components/ACLPage/ACLPage'));
 
 const ClusterPage: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
@@ -51,6 +53,9 @@ const ClusterPage: React.FC = () => {
         ClusterFeaturesEnum.TOPIC_DELETION
       ),
       hasKsqlDbConfigured: features.includes(ClusterFeaturesEnum.KSQL_DB),
+      hasAclViewConfigured:
+        features.includes(ClusterFeaturesEnum.KAFKA_ACL_VIEW) ||
+        features.includes(ClusterFeaturesEnum.KAFKA_ACL_EDIT),
     };
   }, [clusterName, data]);
 
@@ -95,6 +100,12 @@ const ClusterPage: React.FC = () => {
                 element={<KsqlDb />}
               />
             )}
+            {contextValue.hasAclViewConfigured && (
+              <Route
+                path={getNonExactPath(clusterAclRelativePath)}
+                element={<AclPage />}
+              />
+            )}
             {appInfo.hasDynamicConfig && (
               <Route
                 path={getNonExactPath(clusterConfigRelativePath)}
diff --git a/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx b/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx
index 8ba2cba8e90..54f4a8f5fc4 100644
--- a/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx
+++ b/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx
@@ -7,6 +7,7 @@ import {
   clusterSchemasPath,
   clusterConnectorsPath,
   clusterKsqlDbPath,
+  clusterACLPath,
 } from 'lib/paths';
 
 import ClusterMenuItem from './ClusterMenuItem';
@@ -57,6 +58,10 @@ const ClusterMenu: React.FC<Props> = ({
           {hasFeatureConfigured(ClusterFeaturesEnum.KSQL_DB) && (
             <ClusterMenuItem to={clusterKsqlDbPath(name)} title="KSQL DB" />
           )}
+          {(hasFeatureConfigured(ClusterFeaturesEnum.KAFKA_ACL_VIEW) ||
+            hasFeatureConfigured(ClusterFeaturesEnum.KAFKA_ACL_EDIT)) && (
+            <ClusterMenuItem to={clusterACLPath(name)} title="ACL" />
+          )}
         </S.List>
       )}
     </S.List>
diff --git a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
index 76fe47ec710..a436d01e757 100644
--- a/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
+++ b/kafka-ui-react-app/src/components/common/Button/Button.styled.ts
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
 export interface ButtonProps {
-  buttonType: 'primary' | 'secondary';
+  buttonType: 'primary' | 'secondary' | 'danger';
   buttonSize: 'S' | 'M' | 'L';
   isInverted?: boolean;
 }
diff --git a/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.tsx b/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.tsx
index 86833cc7ba4..1b882c94623 100644
--- a/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.tsx
+++ b/kafka-ui-react-app/src/components/common/ConfirmationModal/ConfirmationModal.tsx
@@ -26,7 +26,7 @@ const ConfirmationModal: React.FC = () => {
             Cancel
           </Button>
           <Button
-            buttonType="primary"
+            buttonType={context.dangerButton ? 'danger' : 'primary'}
             buttonSize="M"
             onClick={context.confirm}
             type="button"
diff --git a/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx
index dae8eb13a30..33a2be02167 100644
--- a/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/DeleteIcon.tsx
@@ -1,13 +1,14 @@
 import React from 'react';
 import { useTheme } from 'styled-components';
 
-const DeleteIcon: React.FC = () => {
+const DeleteIcon: React.FC<{ fill?: string }> = ({ fill }) => {
   const theme = useTheme();
+  const curentFill = fill || theme.editFilter.deleteIconColor;
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 448 512"
-      fill={theme.editFilter.deleteIconColor}
+      fill={curentFill}
       width="14"
       height="14"
     >
diff --git a/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts b/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts
index 2ed6c60147b..b05bb6d0350 100644
--- a/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts
+++ b/kafka-ui-react-app/src/components/common/MultiSelect/MultiSelect.styled.ts
@@ -1,9 +1,12 @@
 import styled from 'styled-components';
 import { MultiSelect as ReactMultiSelect } from 'react-multi-select-component';
 
-const MultiSelect = styled(ReactMultiSelect)<{ minWidth?: string }>`
+const MultiSelect = styled(ReactMultiSelect)<{
+  minWidth?: string;
+  height?: string;
+}>`
   min-width: ${({ minWidth }) => minWidth || '200px;'};
-  height: 32px;
+  height: ${({ height }) => height ?? '32px'};
   font-size: 14px;
   .search input {
     color: ${({ theme }) => theme.input.color.normal};
@@ -36,13 +39,14 @@ const MultiSelect = styled(ReactMultiSelect)<{ minWidth?: string }>`
     &:hover {
       border-color: ${({ theme }) => theme.select.borderColor.hover} !important;
     }
-    height: 32px;
+
+    height: ${({ height }) => height ?? '32px'};
     * {
       cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};
     }
 
     & > .dropdown-heading {
-      height: 32px;
+      height: ${({ height }) => height ?? '32px'};
       color: ${({ disabled, theme }) =>
         disabled
           ? theme.select.color.disabled
diff --git a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
index da1f2c090a4..4a3bf3030ba 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/Table.tsx
@@ -52,6 +52,9 @@ export interface TableProps<TData> {
 
   // Handles row click. Can not be combined with `enableRowSelection` && expandable rows.
   onRowClick?: (row: Row<TData>) => void;
+
+  onRowHover?: (row: Row<TData>) => void;
+  onMouseLeave?: () => void;
 }
 
 type UpdaterFn<T> = (previousState: T) => T;
@@ -127,6 +130,8 @@ const Table: React.FC<TableProps<any>> = ({
   emptyMessage,
   disabled,
   onRowClick,
+  onRowHover,
+  onMouseLeave,
 }) => {
   const [searchParams, setSearchParams] = useSearchParams();
   const location = useLocation();
@@ -194,6 +199,21 @@ const Table: React.FC<TableProps<any>> = ({
     return undefined;
   };
 
+  const handleRowHover = (row: Row<typeof data>) => (e: React.MouseEvent) => {
+    if (onRowHover) {
+      e.stopPropagation();
+      return onRowHover(row);
+    }
+
+    return undefined;
+  };
+
+  const handleMouseLeave = () => {
+    if (onMouseLeave) {
+      onMouseLeave();
+    }
+  };
+
   return (
     <>
       {BatchActionsBar && (
@@ -227,6 +247,12 @@ const Table: React.FC<TableProps<any>> = ({
                     sortable={header.column.getCanSort()}
                     sortOrder={header.column.getIsSorted()}
                     onClick={header.column.getToggleSortingHandler()}
+                    style={{
+                      width:
+                        header.column.getSize() !== 150
+                          ? header.column.getSize()
+                          : undefined,
+                    }}
                   >
                     <div>
                       {flexRender(
@@ -245,6 +271,8 @@ const Table: React.FC<TableProps<any>> = ({
                 <S.Row
                   expanded={row.getIsExpanded()}
                   onClick={handleRowClick(row)}
+                  onMouseOver={onRowHover ? handleRowHover(row) : undefined}
+                  onMouseLeave={onMouseLeave ? handleMouseLeave : undefined}
                   clickable={
                     !enableRowSelection &&
                     (row.getCanExpand() || onRowClick !== undefined)
@@ -269,7 +297,13 @@ const Table: React.FC<TableProps<any>> = ({
                   {row
                     .getVisibleCells()
                     .map(({ id, getContext, column: { columnDef } }) => (
-                      <td key={id} style={columnDef.meta}>
+                      <td
+                        key={id}
+                        style={{
+                          width:
+                            columnDef.size !== 150 ? columnDef.size : undefined,
+                        }}
+                      >
                         {flexRender(columnDef.cell, getContext())}
                       </td>
                     ))}
diff --git a/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx b/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx
index f0958972ee8..d68eda2547f 100644
--- a/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx
+++ b/kafka-ui-react-app/src/components/contexts/ConfirmContext.tsx
@@ -6,6 +6,8 @@ interface ConfirmContextType {
   setContent: React.Dispatch<React.SetStateAction<React.ReactNode>>;
   setConfirm: React.Dispatch<React.SetStateAction<(() => void) | undefined>>;
   cancel: () => void;
+  dangerButton: boolean;
+  setDangerButton: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
 export const ConfirmContext = React.createContext<ConfirmContextType | null>(
@@ -17,6 +19,7 @@ export const ConfirmContextProvider: React.FC<
 > = ({ children }) => {
   const [content, setContent] = useState<React.ReactNode>(null);
   const [confirm, setConfirm] = useState<(() => void) | undefined>(undefined);
+  const [dangerButton, setDangerButton] = useState(false);
 
   const cancel = () => {
     setContent(null);
@@ -31,6 +34,8 @@ export const ConfirmContextProvider: React.FC<
         confirm,
         setConfirm,
         cancel,
+        dangerButton,
+        setDangerButton,
       }}
     >
       {children}
diff --git a/kafka-ui-react-app/src/lib/api.ts b/kafka-ui-react-app/src/lib/api.ts
index deef9a7c655..19423d2ac3e 100644
--- a/kafka-ui-react-app/src/lib/api.ts
+++ b/kafka-ui-react-app/src/lib/api.ts
@@ -10,6 +10,7 @@ import {
   ConsumerGroupsApi,
   AuthorizationApi,
   ApplicationConfigApi,
+  AclsApi,
 } from 'generated-sources';
 import { BASE_PARAMS } from 'lib/constants';
 
@@ -25,3 +26,4 @@ export const kafkaConnectApiClient = new KafkaConnectApi(apiClientConf);
 export const consumerGroupsApiClient = new ConsumerGroupsApi(apiClientConf);
 export const authApiClient = new AuthorizationApi(apiClientConf);
 export const appConfigApiClient = new ApplicationConfigApi(apiClientConf);
+export const aclApiClient = new AclsApi(apiClientConf);
diff --git a/kafka-ui-react-app/src/lib/fixtures/acls.ts b/kafka-ui-react-app/src/lib/fixtures/acls.ts
new file mode 100644
index 00000000000..3eecf7cea84
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/fixtures/acls.ts
@@ -0,0 +1,37 @@
+import {
+  KafkaAcl,
+  KafkaAclResourceType,
+  KafkaAclNamePatternType,
+  KafkaAclPermissionEnum,
+  KafkaAclOperationEnum,
+} from 'generated-sources';
+
+export const aclPayload: KafkaAcl[] = [
+  {
+    principal: 'User 1',
+    resourceName: 'Topic',
+    resourceType: KafkaAclResourceType.TOPIC,
+    host: '_host1',
+    namePatternType: KafkaAclNamePatternType.LITERAL,
+    permission: KafkaAclPermissionEnum.ALLOW,
+    operation: KafkaAclOperationEnum.READ,
+  },
+  {
+    principal: 'User 2',
+    resourceName: 'Topic',
+    resourceType: KafkaAclResourceType.TOPIC,
+    host: '_host1',
+    namePatternType: KafkaAclNamePatternType.PREFIXED,
+    permission: KafkaAclPermissionEnum.ALLOW,
+    operation: KafkaAclOperationEnum.READ,
+  },
+  {
+    principal: 'User 3',
+    resourceName: 'Topic',
+    resourceType: KafkaAclResourceType.TOPIC,
+    host: '_host1',
+    namePatternType: KafkaAclNamePatternType.LITERAL,
+    permission: KafkaAclPermissionEnum.DENY,
+    operation: KafkaAclOperationEnum.READ,
+  },
+];
diff --git a/kafka-ui-react-app/src/lib/hooks/api/acl.ts b/kafka-ui-react-app/src/lib/hooks/api/acl.ts
new file mode 100644
index 00000000000..da6a463ffff
--- /dev/null
+++ b/kafka-ui-react-app/src/lib/hooks/api/acl.ts
@@ -0,0 +1,67 @@
+import { aclApiClient as api } from 'lib/api';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { ClusterName } from 'redux/interfaces';
+import { showSuccessAlert } from 'lib/errorHandling';
+import { KafkaAcl } from 'generated-sources';
+
+export function useAcls(clusterName: ClusterName) {
+  return useQuery(
+    ['clusters', clusterName, 'acls'],
+    () => api.listAcls({ clusterName }),
+    {
+      suspense: false,
+    }
+  );
+}
+
+export function useCreateAclMutation(clusterName: ClusterName) {
+  return useMutation(
+    (data: KafkaAcl) =>
+      api.createAcl({
+        clusterName,
+        kafkaAcl: data,
+      }),
+    {
+      onSuccess() {
+        showSuccessAlert({
+          message: 'Your ACL was created successfully',
+        });
+      },
+    }
+  );
+}
+
+export function useCreateAcl(clusterName: ClusterName) {
+  const mutate = useCreateAclMutation(clusterName);
+
+  return {
+    createResource: async (param: KafkaAcl) => {
+      return mutate.mutateAsync(param);
+    },
+    ...mutate,
+  };
+}
+
+export function useDeleteAclMutation(clusterName: ClusterName) {
+  const queryClient = useQueryClient();
+  return useMutation(
+    (acl: KafkaAcl) => api.deleteAcl({ clusterName, kafkaAcl: acl }),
+    {
+      onSuccess: () => {
+        showSuccessAlert({ message: 'ACL deleted' });
+        queryClient.invalidateQueries(['clusters', clusterName, 'acls']);
+      },
+    }
+  );
+}
+
+export function useDeleteAcl(clusterName: ClusterName) {
+  const mutate = useDeleteAclMutation(clusterName);
+
+  return {
+    deleteResource: async (param: KafkaAcl) => {
+      return mutate.mutateAsync(param);
+    },
+    ...mutate,
+  };
+}
diff --git a/kafka-ui-react-app/src/lib/hooks/useConfirm.ts b/kafka-ui-react-app/src/lib/hooks/useConfirm.ts
index 1387f7666b3..baac856c598 100644
--- a/kafka-ui-react-app/src/lib/hooks/useConfirm.ts
+++ b/kafka-ui-react-app/src/lib/hooks/useConfirm.ts
@@ -1,12 +1,13 @@
 import { ConfirmContext } from 'components/contexts/ConfirmContext';
 import React, { useContext } from 'react';
 
-export const useConfirm = () => {
+export const useConfirm = (danger = false) => {
   const context = useContext(ConfirmContext);
   return (
     message: React.ReactNode,
     callback: () => void | Promise<unknown>
   ) => {
+    context?.setDangerButton(danger);
     context?.setContent(message);
     context?.setConfirm(() => async () => {
       await callback();
diff --git a/kafka-ui-react-app/src/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts
index 6571f1684cd..9cee7ca285d 100644
--- a/kafka-ui-react-app/src/lib/paths.ts
+++ b/kafka-ui-react-app/src/lib/paths.ts
@@ -285,3 +285,10 @@ export const clusterConfigPath = (
 
 const clusterNewConfigRelativePath = 'create-new-cluster';
 export const clusterNewConfigPath = `/ui/clusters/${clusterNewConfigRelativePath}`;
+
+// ACL
+export const clusterAclRelativePath = 'acl';
+export const clusterAclNewRelativePath = 'create-new-acl';
+export const clusterACLPath = (
+  clusterName: ClusterName = RouteParams.clusterName
+) => `${clusterPath(clusterName)}/${clusterAclRelativePath}`;
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index e7ee0047e6c..f42eb8c6d53 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -31,6 +31,7 @@ const Colors = {
     '15': '#C2F0D1',
     '30': '#85E0A3',
     '40': '#5CD685',
+    '50': '#33CC66',
     '60': '#29A352',
   },
   brand: {
@@ -231,6 +232,7 @@ const baseTheme = {
       white: Colors.neutral[10],
       red: Colors.red[10],
       blue: Colors.blue[10],
+      secondary: Colors.neutral[15],
     },
     color: Colors.neutral[90],
   },
@@ -416,8 +418,8 @@ export const theme = {
         disabled: Colors.red[20],
       },
       color: {
-        normal: Colors.neutral[90],
-        disabled: Colors.neutral[30],
+        normal: Colors.neutral[0],
+        disabled: Colors.neutral[0],
       },
       invertedColors: {
         normal: Colors.brand[50],
@@ -695,6 +697,44 @@ export const theme = {
     textColor: Colors.brand[50],
     deleteIconColor: Colors.brand[50],
   },
+  acl: {
+    table: {
+      deleteIcon: Colors.neutral[50],
+    },
+    create: {
+      radioButtons: {
+        green: {
+          normal: {
+            background: Colors.neutral[0],
+            text: Colors.neutral[50],
+          },
+          active: {
+            background: Colors.green[50],
+            text: Colors.neutral[0],
+          },
+          hover: {
+            background: Colors.green[10],
+            text: Colors.neutral[90],
+          },
+        },
+        gray: {
+          normal: {
+            background: Colors.neutral[0],
+            text: Colors.neutral[50],
+          },
+          active: {
+            background: Colors.neutral[10],
+            text: Colors.neutral[90],
+          },
+          hover: {
+            background: Colors.neutral[5],
+            text: Colors.neutral[90],
+          },
+        },
+        red: {},
+      },
+    },
+  },
 };
 
 export type ThemeType = typeof theme;
@@ -818,8 +858,8 @@ export const darkTheme: ThemeType = {
         disabled: Colors.red[20],
       },
       color: {
-        normal: Colors.neutral[90],
-        disabled: Colors.neutral[30],
+        normal: Colors.neutral[0],
+        disabled: Colors.neutral[0],
       },
       invertedColors: {
         normal: Colors.brand[50],
@@ -1155,4 +1195,42 @@ export const darkTheme: ThemeType = {
       color: Colors.neutral[0],
     },
   },
+  acl: {
+    table: {
+      deleteIcon: Colors.neutral[50],
+    },
+    create: {
+      radioButtons: {
+        green: {
+          normal: {
+            background: Colors.neutral[0],
+            text: Colors.neutral[50],
+          },
+          active: {
+            background: Colors.green[50],
+            text: Colors.neutral[0],
+          },
+          hover: {
+            background: Colors.green[10],
+            text: Colors.neutral[0],
+          },
+        },
+        gray: {
+          normal: {
+            background: Colors.neutral[0],
+            text: Colors.neutral[50],
+          },
+          active: {
+            background: Colors.neutral[10],
+            text: Colors.neutral[90],
+          },
+          hover: {
+            background: Colors.neutral[5],
+            text: Colors.neutral[90],
+          },
+        },
+        red: {},
+      },
+    },
+  },
 };

From e7429ce6c6e93497ec4c5c8ae530236e5207f630 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 11 May 2023 17:13:09 +0800
Subject: [PATCH 566/734] Update release drafter configs

---
 .github/release_drafter.yaml          |  8 ++++++++
 .github/workflows/release_drafter.yml | 17 ++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.github/release_drafter.yaml b/.github/release_drafter.yaml
index c9cbe51a076..36795355407 100644
--- a/.github/release_drafter.yaml
+++ b/.github/release_drafter.yaml
@@ -16,18 +16,26 @@ exclude-labels:
   - 'type/refactoring'
 
 categories:
+  - title: '🚩 Breaking Changes'
+    labels:
+      - 'impact/changelog'
+
   - title: '⚙️Features'
     labels:
       - 'type/feature'
+
   - title: '🪛Enhancements'
     labels:
       - 'type/enhancement'
+
   - title: '🔨Bug Fixes'
     labels:
       - 'type/bug'
+
   - title: 'Security'
     labels:
       - 'type/security'
+
   - title: '⎈ Helm/K8S Changes'
     labels:
       - 'scope/k8s'
diff --git a/.github/workflows/release_drafter.yml b/.github/workflows/release_drafter.yml
index 742254b942e..e9516cb6633 100644
--- a/.github/workflows/release_drafter.yml
+++ b/.github/workflows/release_drafter.yml
@@ -2,18 +2,33 @@ name: Release Drafter
 
 on:
   push:
-    # branches to consider in the event; optional, defaults to all
     branches:
       - master
   workflow_dispatch:
+    inputs:
+      version:
+        description: 'Release version'
+        required: false
+      branch:
+        description: 'Target branch'
+        required: false
+        default: 'master'
+
+permissions:
+  contents: read
 
 jobs:
   update_release_draft:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
           config-name: release_drafter.yaml
           disable-autolabeler: true
+          version: ${{ github.event.inputs.version }}
+          commitish: ${{ github.event.inputs.branch }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 1c35ded90961b9eea5e3d1cdf85f2803748c8aa2 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 11 May 2023 17:00:18 +0400
Subject: [PATCH 567/734] Enabling RBAC check for ACL (#3813)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../ui/service/rbac/AccessControlService.java | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index e34b63f5ff5..b507d4c0810 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -108,7 +108,8 @@ && isConsumerGroupAccessible(context, user)
                   && isConnectAccessible(context, user)
                   && isConnectorAccessible(context, user) // TODO connector selectors
                   && isSchemaAccessible(context, user)
-                  && isKsqlAccessible(context, user);
+                  && isKsqlAccessible(context, user)
+                  && isAclAccessible(context, user);
 
           if (!accessGranted) {
             throw new AccessDeniedException("Access denied");
@@ -364,6 +365,23 @@ private boolean isKsqlAccessible(AccessContext context, AuthenticatedUser user)
     return isAccessible(Resource.KSQL, null, user, context, requiredActions);
   }
 
+  private boolean isAclAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    if (context.getAclActions().isEmpty()) {
+      return true;
+    }
+
+    Set<String> requiredActions = context.getAclActions()
+        .stream()
+        .map(a -> a.toString().toUpperCase())
+        .collect(Collectors.toSet());
+
+    return isAccessible(Resource.ACL, null, user, context, requiredActions);
+  }
+
   public Set<ProviderAuthorityExtractor> getOauthExtractors() {
     return oauthExtractors;
   }

From fdd9ad94c11d44259ef26bf4b2dc9a8bd139f607 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 11 May 2023 17:23:14 +0400
Subject: [PATCH 568/734] BE: RBAC: Add missing RBAC action, fix possible
 exceptions on unknown actions (#3810)

---
 .../kafka/ui/controller/AccessController.java | 29 ++++++++++++-------
 .../main/resources/swagger/kafka-ui-api.yaml  |  1 +
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
index a86b6db5a07..b6522647b45 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
@@ -12,8 +12,11 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.security.core.context.SecurityContext;
@@ -23,15 +26,12 @@
 
 @RestController
 @RequiredArgsConstructor
+@Slf4j
 public class AccessController implements AuthorizationApi {
 
   private final AccessControlService accessControlService;
 
   public Mono<ResponseEntity<AuthenticationInfoDTO>> getUserAuthInfo(ServerWebExchange exchange) {
-    AuthenticationInfoDTO dto = new AuthenticationInfoDTO();
-    dto.setRbacEnabled(accessControlService.isRbacEnabled());
-    UserInfoDTO userInfo = new UserInfoDTO();
-
     Mono<List<UserPermissionDTO>> permissions = accessControlService.getUser()
         .map(user -> accessControlService.getRoles()
             .stream()
@@ -49,13 +49,11 @@ public Mono<ResponseEntity<AuthenticationInfoDTO>> getUserAuthInfo(ServerWebExch
     return userName
         .zipWith(permissions)
         .map(data -> {
-          userInfo.setUsername(data.getT1());
-          userInfo.setPermissions(data.getT2());
-
-          dto.setUserInfo(userInfo);
+          var dto = new AuthenticationInfoDTO(accessControlService.isRbacEnabled());
+          dto.setUserInfo(new UserInfoDTO(data.getT1(), data.getT2()));
           return dto;
         })
-        .switchIfEmpty(Mono.just(dto))
+        .switchIfEmpty(Mono.just(new AuthenticationInfoDTO(accessControlService.isRbacEnabled())))
         .map(ResponseEntity::ok);
   }
 
@@ -70,11 +68,22 @@ private List<UserPermissionDTO> mapPermissions(List<Permission> permissions, Lis
           dto.setActions(permission.getActions()
               .stream()
               .map(String::toUpperCase)
-              .map(ActionDTO::valueOf)
+              .map(this::mapAction)
+              .filter(Objects::nonNull)
               .collect(Collectors.toList()));
           return dto;
         })
         .collect(Collectors.toList());
   }
 
+  @Nullable
+  private ActionDTO mapAction(String name) {
+    try {
+      return ActionDTO.fromValue(name);
+    } catch (IllegalArgumentException e) {
+      log.warn("Unknown Action [{}], skipping", name);
+      return null;
+    }
+  }
+
 }
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index b89f8d09635..4aa79cff1d1 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -3452,6 +3452,7 @@ components:
         - MESSAGES_READ
         - MESSAGES_PRODUCE
         - MESSAGES_DELETE
+        - RESTART
 
     ResourceType:
       type: string

From 78cc4dd981a89b26006fea0984f1305bc663281f Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 11 May 2023 18:09:33 +0400
Subject: [PATCH 569/734] Helm: Bump version to 0.7.0

---
 charts/kafka-ui/Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index 9337f597748..c48bb1bfd3d 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.6.2
-appVersion: v0.6.2
+version: 0.7.0
+appVersion: v0.7.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

From 6a50a8ecee56b79613dbda2ac8bc3c17457d83f0 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 11 May 2023 18:10:40 +0400
Subject: [PATCH 570/734] Update security policy version list

---
 SECURITY.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index af7890e9e76..318166dd606 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,7 +6,8 @@ Following versions of the project are currently being supported with security up
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 0.6.x   | :white_check_mark: |
+| 0.7.x   | :white_check_mark: |
+| 0.6.x   | :x:                |
 | 0.5.x   | :x:                |
 | 0.4.x   | :x:                |
 | 0.3.x   | :x:                |

From 0796bf0112afc9ed491674ebe117dc53520bdb4f Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Thu, 11 May 2023 19:38:58 +0400
Subject: [PATCH 571/734] Infra: E2E: Add k-ui healthcheck (#3811)

---
 .github/workflows/e2e-checks.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 771eb698feb..93bc1a33ab1 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -45,7 +45,7 @@ jobs:
         # use the following command until #819 will be fixed
         run: |
           docker-compose -f kafka-ui-e2e-checks/docker/selenoid-git.yaml up -d
-          docker-compose -f ./documentation/compose/e2e-tests.yaml up -d
+          docker-compose -f ./documentation/compose/e2e-tests.yaml up -d && until [ "$(docker exec  kafka-ui wget --spider  --server-response  http://localhost:8080/actuator/health 2>&1 |  grep -c 'HTTP/1.1 200 OK')" == "1" ]; do echo "Waiting for kafka-ui ..." && sleep 1; done
       - name: Run test suite
         run: |
           ./mvnw -B -ntp versions:set -DnewVersion=${{ github.event.pull_request.head.sha }}

From 902f11a1d95ed5211519d10b9757124678ecd479 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 12 May 2023 13:10:09 +0400
Subject: [PATCH 572/734] BE: RBAC: ACL exception fix (#3815)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/model/rbac/Permission.java       |  3 +-
 .../kafka/ui/service/FeatureService.java      | 28 +++++++++----------
 .../kafka/ui/service/acl/AclsService.java     |  4 ++-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
index 16f01f60e6b..d3192789ed0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac;
 
+import static com.provectus.kafka.ui.model.rbac.Resource.ACL;
 import static com.provectus.kafka.ui.model.rbac.Resource.APPLICATIONCONFIG;
 import static com.provectus.kafka.ui.model.rbac.Resource.CLUSTERCONFIG;
 import static com.provectus.kafka.ui.model.rbac.Resource.KSQL;
@@ -27,7 +28,7 @@
 @EqualsAndHashCode
 public class Permission {
 
-  private static final List<Resource> RBAC_ACTION_EXEMPT_LIST = List.of(KSQL, CLUSTERCONFIG, APPLICATIONCONFIG);
+  private static final List<Resource> RBAC_ACTION_EXEMPT_LIST = List.of(KSQL, CLUSTERCONFIG, APPLICATIONCONFIG, ACL);
 
   Resource resource;
   List<String> actions;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
index 87b48072c2d..b08691aef5a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/FeatureService.java
@@ -9,7 +9,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.acl.AclOperation;
 import org.springframework.stereotype.Service;
@@ -17,12 +16,9 @@
 import reactor.core.publisher.Mono;
 
 @Service
-@RequiredArgsConstructor
 @Slf4j
 public class FeatureService {
 
-  private final AdminClientService adminClientService;
-
   public Mono<List<ClusterFeature>> getAvailableFeatures(ReactiveAdminClient adminClient,
                                                          KafkaCluster cluster,
                                                          ClusterDescription clusterDescription) {
@@ -43,8 +39,8 @@ public Mono<List<ClusterFeature>> getAvailableFeatures(ReactiveAdminClient admin
     }
 
     features.add(topicDeletionEnabled(adminClient));
-    features.add(aclView(cluster));
-    features.add(aclEdit(clusterDescription));
+    features.add(aclView(adminClient));
+    features.add(aclEdit(adminClient, clusterDescription));
 
     return Flux.fromIterable(features).flatMap(m -> m).collectList();
   }
@@ -55,19 +51,23 @@ private Mono<ClusterFeature> topicDeletionEnabled(ReactiveAdminClient adminClien
         : Mono.empty();
   }
 
-  private Mono<ClusterFeature> aclEdit(ClusterDescription clusterDescription) {
+  private Mono<ClusterFeature> aclEdit(ReactiveAdminClient adminClient, ClusterDescription clusterDescription) {
     var authorizedOps = Optional.ofNullable(clusterDescription.getAuthorizedOperations()).orElse(Set.of());
-    boolean canEdit = authorizedOps.contains(AclOperation.ALL) || authorizedOps.contains(AclOperation.ALTER);
+    boolean canEdit = aclViewEnabled(adminClient)
+        && (authorizedOps.contains(AclOperation.ALL) || authorizedOps.contains(AclOperation.ALTER));
     return canEdit
         ? Mono.just(ClusterFeature.KAFKA_ACL_EDIT)
         : Mono.empty();
   }
 
-  private Mono<ClusterFeature> aclView(KafkaCluster cluster) {
-    return adminClientService.get(cluster).flatMap(
-        ac -> ac.getClusterFeatures().contains(ReactiveAdminClient.SupportedFeature.AUTHORIZED_SECURITY_ENABLED)
-            ? Mono.just(ClusterFeature.KAFKA_ACL_VIEW)
-            : Mono.empty()
-    );
+  private Mono<ClusterFeature> aclView(ReactiveAdminClient adminClient) {
+    return aclViewEnabled(adminClient)
+        ? Mono.just(ClusterFeature.KAFKA_ACL_VIEW)
+        : Mono.empty();
   }
+
+  private boolean aclViewEnabled(ReactiveAdminClient adminClient) {
+    return adminClient.getClusterFeatures().contains(ReactiveAdminClient.SupportedFeature.AUTHORIZED_SECURITY_ENABLED);
+  }
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java
index 8c5a8dab06f..c2ab1b5eb4d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.Sets;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.service.AdminClientService;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 import lombok.RequiredArgsConstructor;
@@ -39,7 +40,8 @@ public Mono<Void> deleteAcl(KafkaCluster cluster, AclBinding aclBinding) {
   public Flux<AclBinding> listAcls(KafkaCluster cluster, ResourcePatternFilter filter) {
     return adminClientService.get(cluster)
         .flatMap(c -> c.listAcls(filter))
-        .flatMapIterable(acls -> acls);
+        .flatMapIterable(acls -> acls)
+        .sort(Comparator.comparing(AclBinding::toString));  //sorting to keep stable order on different calls
   }
 
   public Mono<String> getAclAsCsvString(KafkaCluster cluster) {

From c7cb7a40272f110af1ad41387d1efffdf89e18ae Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 15 May 2023 10:11:22 +0300
Subject: [PATCH 573/734] [E2E] Checking Clear results in case of no result
 after execution (#3817)

---
 .../kafka/ui/pages/ksqldb/KsqlQueryForm.java  |  5 +++
 .../kafka/ui/settings/drivers/WebDriver.java  | 16 ++++----
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 38 +++++++++++++++----
 .../ui/manualsuite/suite/TopicsTest.java      | 26 +++++--------
 .../ui/smokesuite/ksqldb/KsqlDbTest.java      | 34 +++++++++++------
 5 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
index c8d74419d32..6c4126089bd 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/ksqldb/KsqlQueryForm.java
@@ -74,6 +74,11 @@ public boolean isCancelledAlertVisible() {
     return isVisible(cancelledAlert);
   }
 
+  @Step
+  public boolean isClearResultsBtnEnabled() {
+    return isEnabled(clearResultsBtn);
+  }
+
   @Step
   public KsqlQueryForm clickClearResultsBtn() {
     clickByActions(clearResultsBtn);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java
index df1c55bc2f4..27f0d28532c 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/drivers/WebDriver.java
@@ -14,9 +14,10 @@
 import com.codeborne.selenide.logevents.SelenideLogger;
 import io.qameta.allure.Step;
 import io.qameta.allure.selenide.AllureSelenide;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.chrome.ChromeOptions;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 @Slf4j
 public abstract class WebDriver {
@@ -29,7 +30,7 @@ public static void browserSetup() {
     Configuration.screenshots = true;
     Configuration.savePageSource = false;
     Configuration.pageLoadTimeout = 120000;
-    ChromeOptions options = new ChromeOptions()
+    ChromeOptions chromeOptions = new ChromeOptions()
         .addArguments("--no-sandbox")
         .addArguments("--verbose")
         .addArguments("--remote-allow-origins=*")
@@ -37,14 +38,15 @@ public static void browserSetup() {
         .addArguments("--disable-gpu")
         .addArguments("--lang=en_US");
     switch (BROWSER) {
-      case (LOCAL) -> Configuration.browserCapabilities = options;
+      case (LOCAL) -> Configuration.browserCapabilities = chromeOptions;
       case (CONTAINER) -> {
         Configuration.remote = REMOTE_URL;
         Configuration.remoteConnectionTimeout = 180000;
-        DesiredCapabilities capabilities = new DesiredCapabilities();
-        capabilities.setCapability("enableVNC", true);
-        capabilities.setCapability("enableVideo", false);
-        Configuration.browserCapabilities = capabilities.merge(options);
+        Map<String, Object> selenoidOptions = new HashMap<>();
+        selenoidOptions.put("enableVNC", true);
+        selenoidOptions.put("enableVideo", false);
+        chromeOptions.setCapability("selenoid:options", selenoidOptions);
+        Configuration.browserCapabilities = chromeOptions;
       }
       default -> throw new IllegalStateException("Unexpected value: " + BROWSER);
     }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index 7e663f5893e..593cb82c65d 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -1,9 +1,10 @@
 package com.provectus.kafka.ui.manualsuite.backlog;
 
 import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.BROKERS_SUITE_ID;
-import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.KSQL_DB_SUITE_ID;
 import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.SCHEMAS_SUITE_ID;
 import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.TOPICS_PROFILE_SUITE_ID;
+import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.TOPICS_SUITE_ID;
+import static com.provectus.kafka.ui.utilities.qase.enums.State.NOT_AUTOMATED;
 import static com.provectus.kafka.ui.utilities.qase.enums.State.TO_BE_AUTOMATED;
 
 import com.provectus.kafka.ui.manualsuite.BaseManualTest;
@@ -57,30 +58,51 @@ public void testCaseF() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = KSQL_DB_SUITE_ID)
-  @QaseId(344)
+  @Suite(id = SCHEMAS_SUITE_ID)
+  @QaseId(345)
   @Test
   public void testCaseG() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
-  @QaseId(345)
+  @QaseId(346)
   @Test
   public void testCaseH() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = SCHEMAS_SUITE_ID)
-  @QaseId(346)
+  @Suite(id = TOPICS_PROFILE_SUITE_ID)
+  @QaseId(347)
   @Test
   public void testCaseI() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = TOPICS_PROFILE_SUITE_ID)
-  @QaseId(347)
+  @Suite(id = BROKERS_SUITE_ID)
+  @QaseId(348)
   @Test
   public void testCaseJ() {
   }
+
+  @Automation(state = TO_BE_AUTOMATED)
+  @Suite(id = BROKERS_SUITE_ID)
+  @QaseId(350)
+  @Test
+  public void testCaseK() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @Suite(id = TOPICS_SUITE_ID)
+  @QaseId(50)
+  @Test
+  public void testCaseL() {
+  }
+
+  @Automation(state = NOT_AUTOMATED)
+  @Suite(id = SCHEMAS_SUITE_ID)
+  @QaseId(351)
+  @Test
+  public void testCaseM() {
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java
index 758827e21bf..a4043871a3a 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/suite/TopicsTest.java
@@ -51,69 +51,63 @@ public void testCaseF() {
   public void testCaseG() {
   }
 
-  @Automation(state = NOT_AUTOMATED)
-  @QaseId(50)
-  @Test
-  public void testCaseH() {
-  }
-
   @Automation(state = NOT_AUTOMATED)
   @QaseId(57)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @QaseId(58)
   @Test
-  public void testCaseJ() {
+  public void testCaseI() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @QaseId(269)
   @Test
-  public void testCaseK() {
+  public void testCaseJ() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @QaseId(270)
   @Test
-  public void testCaseL() {
+  public void testCaseK() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @QaseId(271)
   @Test
-  public void testCaseM() {
+  public void testCaseL() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @QaseId(272)
   @Test
-  public void testCaseN() {
+  public void testCaseM() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @QaseId(337)
   @Test
-  public void testCaseO() {
+  public void testCaseN() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @QaseId(339)
   @Test
-  public void testCaseP() {
+  public void testCaseO() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @QaseId(341)
   @Test
-  public void testCaseQ() {
+  public void testCaseP() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @QaseId(342)
   @Test
-  public void testCaseR() {
+  public void testCaseQ() {
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
index 0504a8a31ab..e3d17177b5d 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/ksqldb/KsqlDbTest.java
@@ -4,7 +4,6 @@
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SELECT_ALL_FROM;
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_STREAMS;
 import static com.provectus.kafka.ui.pages.ksqldb.enums.KsqlQueryConfig.SHOW_TABLES;
-import static com.provectus.kafka.ui.pages.panels.enums.MenuItem.KSQL_DB;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 import com.provectus.kafka.ui.BaseTest;
@@ -45,10 +44,7 @@ public void beforeClass() {
   @QaseId(284)
   @Test(priority = 1)
   public void streamsAndTablesVisibilityCheck() {
-    naviSideBar
-        .openSideMenu(KSQL_DB);
-    ksqlDbList
-        .waitUntilScreenReady();
+    navigateToKsqlDb();
     SoftAssert softly = new SoftAssert();
     softly.assertTrue(ksqlDbList.getTableByName(FIRST_TABLE.getName()).isVisible(), "getTableByName()");
     softly.assertTrue(ksqlDbList.getTableByName(SECOND_TABLE.getName()).isVisible(), "getTableByName()");
@@ -69,8 +65,24 @@ public void clearEnteredQueryCheck() {
     Assert.assertTrue(ksqlQueryForm.getEnteredQuery().isEmpty(), "getEnteredQuery()");
   }
 
-  @QaseId(41)
+  @QaseId(344)
   @Test(priority = 3)
+  public void clearResultsButtonCheck() {
+    String notValidQuery = "some not valid request";
+    navigateToKsqlDb();
+    ksqlDbList
+        .clickExecuteKsqlRequestBtn();
+    ksqlQueryForm
+        .waitUntilScreenReady()
+        .setQuery(notValidQuery);
+    Assert.assertFalse(ksqlQueryForm.isClearResultsBtnEnabled(), "isClearResultsBtnEnabled()");
+    ksqlQueryForm
+        .clickExecuteBtn(notValidQuery);
+    Assert.assertFalse(ksqlQueryForm.isClearResultsBtnEnabled(), "isClearResultsBtnEnabled()");
+  }
+
+  @QaseId(41)
+  @Test(priority = 4)
   public void checkShowTablesRequestExecution() {
     navigateToKsqlDbAndExecuteRequest(SHOW_TABLES.getQuery());
     SoftAssert softly = new SoftAssert();
@@ -83,7 +95,7 @@ public void checkShowTablesRequestExecution() {
   }
 
   @QaseId(278)
-  @Test(priority = 4)
+  @Test(priority = 5)
   public void checkShowStreamsRequestExecution() {
     navigateToKsqlDbAndExecuteRequest(SHOW_STREAMS.getQuery());
     SoftAssert softly = new SoftAssert();
@@ -94,7 +106,7 @@ public void checkShowStreamsRequestExecution() {
   }
 
   @QaseId(86)
-  @Test(priority = 5)
+  @Test(priority = 6)
   public void clearResultsForExecutedRequest() {
     navigateToKsqlDbAndExecuteRequest(SHOW_TABLES.getQuery());
     SoftAssert softly = new SoftAssert();
@@ -107,7 +119,7 @@ public void clearResultsForExecutedRequest() {
   }
 
   @QaseId(277)
-  @Test(priority = 6)
+  @Test(priority = 7)
   public void stopQueryFunctionalCheck() {
     navigateToKsqlDbAndExecuteRequest(String.format(SELECT_ALL_FROM.getQuery(), FIRST_TABLE.getName()));
     Assert.assertTrue(ksqlQueryForm.isAbortBtnVisible(), "isAbortBtnVisible()");
@@ -123,10 +135,8 @@ public void afterClass() {
 
   @Step
   private void navigateToKsqlDbAndExecuteRequest(String query) {
-    naviSideBar
-        .openSideMenu(KSQL_DB);
+    navigateToKsqlDb();
     ksqlDbList
-        .waitUntilScreenReady()
         .clickExecuteKsqlRequestBtn();
     ksqlQueryForm
         .waitUntilScreenReady()

From ba6d6b2b1fffaf03e5919091fb58c058146f352c Mon Sep 17 00:00:00 2001
From: Ankit Verma <ankitverma10203@gmail.com>
Date: Mon, 15 May 2023 18:31:42 +0530
Subject: [PATCH 574/734] Sonar - Blocker fixes (#3752)

---
 .../kafka/ui/service/metrics/JmxMetricsRetriever.java     | 5 +----
 .../provectus/kafka/ui/util/KafkaServicesValidation.java  | 8 +++-----
 .../kafka/ui/service/TopicsServicePaginationTest.java     | 2 +-
 .../provectus/kafka/ui/pages/schemas/SchemaDetails.java   | 6 +++---
 .../kafka/ui/pages/topics/ProduceMessagePanel.java        | 6 +++---
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java
index 78f5bdeced3..e7a58cbae27 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/JmxMetricsRetriever.java
@@ -72,17 +72,14 @@ private void withJmxConnector(String jmxUrl,
                                 KafkaCluster c,
                                 Consumer<JMXConnector> consumer) {
     var env = prepareJmxEnvAndSetThreadLocal(c);
-    try {
-      JMXConnector connector = null;
+    try (JMXConnector connector = JMXConnectorFactory.newJMXConnector(new JMXServiceURL(jmxUrl), env)) {
       try {
-        connector = JMXConnectorFactory.newJMXConnector(new JMXServiceURL(jmxUrl), env);
         connector.connect(env);
       } catch (Exception exception) {
         log.error("Error connecting to {}", jmxUrl, exception);
         return;
       }
       consumer.accept(connector);
-      connector.close();
     } catch (Exception e) {
       log.error("Error getting jmx metrics from {}", jmxUrl, e);
     } finally {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java
index 31d90244ebe..4b8af81f851 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/KafkaServicesValidation.java
@@ -45,12 +45,10 @@ private static Mono<ApplicationPropertyValidationDTO> invalid(Throwable th) {
    */
   public static Optional<String> validateTruststore(TruststoreConfig truststoreConfig) {
     if (truststoreConfig.getTruststoreLocation() != null && truststoreConfig.getTruststorePassword() != null) {
-      try {
+      try (FileInputStream fileInputStream = new FileInputStream(
+             (ResourceUtils.getFile(truststoreConfig.getTruststoreLocation())))) {
         KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
-        trustStore.load(
-            new FileInputStream((ResourceUtils.getFile(truststoreConfig.getTruststoreLocation()))),
-            truststoreConfig.getTruststorePassword().toCharArray()
-        );
+        trustStore.load(fileInputStream, truststoreConfig.getTruststorePassword().toCharArray());
         TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
             TrustManagerFactory.getDefaultAlgorithm()
         );
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
index 8867400fee3..ac00fd9982e 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
@@ -131,7 +131,7 @@ public void shouldCalculateCorrectPageCountForNonDivisiblePageSize() {
 
     assertThat(topics.getBody().getPageCount()).isEqualTo(4);
     assertThat(topics.getBody().getTopics()).hasSize(1);
-    assertThat(topics.getBody().getTopics().get(0).getName().equals("99"));
+    assertThat(topics.getBody().getTopics().get(0).getName()).isEqualTo("99");
   }
 
   @Test
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java
index 11c2d4a7ba3..38c12d35f3d 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schemas/SchemaDetails.java
@@ -13,7 +13,7 @@ public class SchemaDetails extends BasePage {
   protected SelenideElement compatibilityField = $x("//h4[contains(text(),'Compatibility')]/../p");
   protected SelenideElement editSchemaBtn = $x("//button[contains(text(),'Edit Schema')]");
   protected SelenideElement removeBtn = $x("//*[contains(text(),'Remove')]");
-  protected SelenideElement confirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
+  protected SelenideElement schemaConfirmBtn = $x("//div[@role='dialog']//button[contains(text(),'Confirm')]");
   protected SelenideElement schemaTypeField = $x("//h4[contains(text(),'Type')]/../p");
   protected SelenideElement latestVersionField = $x("//h4[contains(text(),'Latest version')]/../p");
   protected SelenideElement compareVersionBtn = $x("//button[text()='Compare Versions']");
@@ -62,8 +62,8 @@ public SchemaDetails openCompareVersionMenu() {
   public SchemaDetails removeSchema() {
     clickByJavaScript(dotMenuBtn);
     removeBtn.shouldBe(Condition.enabled).click();
-    confirmBtn.shouldBe(Condition.visible).click();
-    confirmBtn.shouldBe(Condition.disappear);
+    schemaConfirmBtn.shouldBe(Condition.visible).click();
+    schemaConfirmBtn.shouldBe(Condition.disappear);
     return this;
   }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
index c4e65c65bee..b683321bd51 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/ProduceMessagePanel.java
@@ -14,7 +14,7 @@ public class ProduceMessagePanel extends BasePage {
   protected SelenideElement keyTextArea = $x("//div[@id='key']/textarea");
   protected SelenideElement valueTextArea = $x("//div[@id='content']/textarea");
   protected SelenideElement headersTextArea = $x("//div[@id='headers']/textarea");
-  protected SelenideElement submitBtn = headersTextArea.$x("../../../..//button[@type='submit']");
+  protected SelenideElement submitProduceMessageBtn = headersTextArea.$x("../../../..//button[@type='submit']");
   protected SelenideElement partitionDdl = $x("//ul[@name='partition']");
   protected SelenideElement keySerdeDdl = $x("//ul[@name='keySerde']");
   protected SelenideElement contentSerdeDdl = $x("//ul[@name='valueSerde']");
@@ -48,8 +48,8 @@ public ProduceMessagePanel setHeadersFld(String value) {
 
   @Step
   public ProduceMessagePanel submitProduceMessage() {
-    clickByActions(submitBtn);
-    submitBtn.shouldBe(Condition.disappear);
+    clickByActions(submitProduceMessageBtn);
+    submitProduceMessageBtn.shouldBe(Condition.disappear);
     refresh();
     return this;
   }

From baeb494f532bdca103e7f8d8e8f627a921d76bb0 Mon Sep 17 00:00:00 2001
From: Nisan Ohana <78907315+nisanohana3@users.noreply.github.com>
Date: Mon, 15 May 2023 16:57:32 +0300
Subject: [PATCH 575/734] BE: Chore: Fix code style in internalConsumerGroup
 (#3697)

Signed-off-by: nisanohana3 <nisana230@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../com/provectus/kafka/ui/model/InternalConsumerGroup.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
index 06de3cb7d68..cd916a7ec82 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
@@ -74,14 +74,12 @@ private static Long calculateMessagesBehind(Map<TopicPartition, Long> offsets, M
 
   private static Integer calculateTopicNum(Map<TopicPartition, Long> offsets, Collection<InternalMember> members) {
 
-    long topicNum = Stream.concat(
+    return (int) Stream.concat(
         offsets.keySet().stream().map(TopicPartition::topic),
         members.stream()
             .flatMap(m -> m.getAssignment().stream().map(TopicPartition::topic))
     ).distinct().count();
 
-    return Integer.valueOf((int) topicNum);
-
   }
 
   private static Collection<InternalMember> initInternalMembers(ConsumerGroupDescription description) {

From 62bee1ced8f8dc4184c22024fca77eae2de8a2b9 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 17 May 2023 13:34:12 +0400
Subject: [PATCH 576/734] BE: Chore: Update logback config appender format
 (#3829)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 kafka-ui-api/src/main/resources/application.yml    |  1 +
 kafka-ui-api/src/main/resources/logback-spring.xml | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-api/src/main/resources/application.yml b/kafka-ui-api/src/main/resources/application.yml
index 864289c2d9a..71af4e8d925 100644
--- a/kafka-ui-api/src/main/resources/application.yml
+++ b/kafka-ui-api/src/main/resources/application.yml
@@ -17,4 +17,5 @@ logging:
     root: INFO
     com.provectus: DEBUG
     reactor.netty.http.server.AccessLog: INFO
+    org.hibernate.validator: WARN
 
diff --git a/kafka-ui-api/src/main/resources/logback-spring.xml b/kafka-ui-api/src/main/resources/logback-spring.xml
index a0705128172..a33692146bb 100644
--- a/kafka-ui-api/src/main/resources/logback-spring.xml
+++ b/kafka-ui-api/src/main/resources/logback-spring.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
 
-        <appender name="STDOUT"
-              class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>
-                %black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%c{1}): %msg%n%throwable
-            </Pattern>
-        </layout>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%black(%d{ISO8601}) %highlight(%-5level) [%blue(%t)] %yellow(%c{1}): %msg%n%throwable</pattern>
+        </encoder>
     </appender>
 
     <root level="info">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </configuration>

From f7d85d86e6016f284e0192eba2844c0a89190344 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 18 May 2023 13:40:38 +0400
Subject: [PATCH 577/734] BE: Chore: CVEs fixes, May 2023 (#3840)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 kafka-ui-api/pom.xml | 11 ++---------
 pom.xml              |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 5ebefe31dfe..dc5dad08e2b 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -21,12 +21,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <!--TODO: remove, when spring-boot fixed dependency to 6.0.8+ (6.0.7 has CVE) -->
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>6.0.8</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
@@ -61,7 +55,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -97,7 +91,7 @@
         <dependency>
             <groupId>software.amazon.msk</groupId>
             <artifactId>aws-msk-iam-auth</artifactId>
-            <version>1.1.5</version>
+            <version>1.1.6</version>
         </dependency>
 
         <dependency>
@@ -115,7 +109,6 @@
             <groupId>io.projectreactor.addons</groupId>
             <artifactId>reactor-extra</artifactId>
         </dependency>
-<!-- https://github.com/provectus/kafka-ui/pull/3693 -->
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
diff --git a/pom.xml b/pom.xml
index a5a450d294b..048f2370f03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         <protobuf-java.version>3.21.9</protobuf-java.version>
         <scala-lang.library.version>2.13.9</scala-lang.library.version>
         <snakeyaml.version>2.0</snakeyaml.version>
-        <spring-boot.version>3.0.5</spring-boot.version>
+        <spring-boot.version>3.0.6</spring-boot.version>
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
         <odd-oddrn-generator.version>0.1.15</odd-oddrn-generator.version>
         <odd-oddrn-client.version>0.1.23</odd-oddrn-client.version>

From f7900ba478e0325e398e2b8c80789d789b941cce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 May 2023 10:12:34 +0000
Subject: [PATCH 578/734] Bump mockito.version from 5.3.0 to 5.3.1 (#3794)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 048f2370f03..22369cd7347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 
         <!-- Test dependency versions -->
         <junit.version>5.9.1</junit.version>
-        <mockito.version>5.3.0</mockito.version>
+        <mockito.version>5.3.1</mockito.version>
         <okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>
         <testcontainers.version>1.17.5</testcontainers.version>
 

From 17ea464ec173cb7f60f221fa0f928b661a08a209 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 19 May 2023 14:46:26 +0400
Subject: [PATCH 579/734] Infra: Update infra repo remote (#3839)

Co-authored-by: Narek Matevosyan <nmatevosyan@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .github/workflows/aws_publisher.yaml             | 2 +-
 .github/workflows/branch-deploy.yml              | 6 +++---
 .github/workflows/branch-remove.yml              | 6 +++---
 .github/workflows/master.yaml                    | 6 +++---
 .github/workflows/separate_env_public_create.yml | 6 +++---
 .github/workflows/separate_env_public_remove.yml | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/aws_publisher.yaml b/.github/workflows/aws_publisher.yaml
index 8cdf3751ebb..ccd03def3fd 100644
--- a/.github/workflows/aws_publisher.yaml
+++ b/.github/workflows/aws_publisher.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Clone infra repo
         run: |
           echo "Cloning repo..."
-          git clone https://kafka-ui-infra:${{ secrets.KAFKA_UI_INFRA_TOKEN }}@gitlab.provectus.com/provectus-internals/kafka-ui-infra.git --branch ${{ github.event.inputs.KafkaUIInfraBranch }}
+          git clone https://infra-tech:${{ secrets.INFRA_USER_ACCESS_TOKEN }}@github.com/provectus/kafka-ui-infra.git --branch ${{ github.event.inputs.KafkaUIInfraBranch }}
           echo "Cd to packer DIR..."
           cd kafka-ui-infra/ami
           echo "WORK_DIR=$(pwd)" >> $GITHUB_ENV
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 49485671470..a7f655e719d 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -73,14 +73,14 @@ jobs:
     steps:
       - name: clone
         run: |
-          git clone https://kafka-ui-infra:${{ secrets.KAFKA_UI_INFRA_TOKEN }}@gitlab.provectus.com/provectus-internals/kafka-ui-infra.git
+          git clone https://infra-tech:${{ secrets.INFRA_USER_ACCESS_TOKEN }}@github.com/provectus/kafka-ui-infra.git --branch envs
       - name: create deployment
         run: |
           cd kafka-ui-infra/aws-infrastructure4eks/argocd/scripts
           echo "Branch:${{ needs.build.outputs.tag }}"
           ./kafka-ui-deployment-from-branch.sh ${{ needs.build.outputs.tag }} ${{ github.event.label.name }} ${{ secrets.FEATURE_TESTING_UI_PASSWORD }}
-          git config --global user.email "kafka-ui-infra@provectus.com"
-          git config --global user.name "kafka-ui-infra"
+          git config --global user.email "infra-tech@provectus.com"
+          git config --global user.name "infra-tech"
           git add ../kafka-ui-from-branch/
           git commit -m "added env:${{ needs.build.outputs.deploy }}" && git push || true
 
diff --git a/.github/workflows/branch-remove.yml b/.github/workflows/branch-remove.yml
index 8019764f263..9a65064c862 100644
--- a/.github/workflows/branch-remove.yml
+++ b/.github/workflows/branch-remove.yml
@@ -11,13 +11,13 @@ jobs:
       - uses: actions/checkout@v3
       - name: clone
         run: |
-          git clone https://kafka-ui-infra:${{ secrets.KAFKA_UI_INFRA_TOKEN }}@gitlab.provectus.com/provectus-internals/kafka-ui-infra.git
+          git clone https://infra-tech:${{ secrets.INFRA_USER_ACCESS_TOKEN }}@github.com/provectus/kafka-ui-infra.git --branch envs
       - name: remove env
         run: |
           cd kafka-ui-infra/aws-infrastructure4eks/argocd/scripts
           ./delete-env.sh pr${{ github.event.pull_request.number }} || true
-          git config --global user.email "kafka-ui-infra@provectus.com"
-          git config --global user.name "kafka-ui-infra"
+          git config --global user.email "infra-tech@provectus.com"
+          git config --global user.name "infra-tech"
           git add ../kafka-ui-from-branch/
           git commit -m "removed env:${{ needs.build.outputs.deploy }}" && git push || true
       - name: make comment with deployment link
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 122956c7d98..6850356f561 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -73,11 +73,11 @@ jobs:
 #################################
       - name: update-master-deployment
         run: |
-          git clone https://kafka-ui-infra:${{ secrets.KAFKA_UI_INFRA_TOKEN }}@gitlab.provectus.com/provectus-internals/kafka-ui-infra.git --branch master
+          git clone https://infra-tech:${{ secrets.INFRA_USER_ACCESS_TOKEN }}@github.com/provectus/kafka-ui-infra.git --branch master
           cd kafka-ui-infra/aws-infrastructure4eks/argocd/scripts
           echo "Image digest is:${{ steps.docker_build_and_push.outputs.digest }}"
           ./kafka-ui-update-master-digest.sh ${{ steps.docker_build_and_push.outputs.digest }}
-          git config --global user.email "kafka-ui-infra@provectus.com"
-          git config --global user.name "kafka-ui-infra"
+          git config --global user.email "infra-tech@provectus.com"
+          git config --global user.name "infra-tech"
           git add ../kafka-ui/*
           git commit -m "updated master image digest: ${{ steps.docker_build_and_push.outputs.digest }}" && git push
diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
index ad5f0e47e75..3f12ce1f548 100644
--- a/.github/workflows/separate_env_public_create.yml
+++ b/.github/workflows/separate_env_public_create.yml
@@ -76,14 +76,14 @@ jobs:
     steps:
       - name: clone
         run: |
-          git clone https://kafka-ui-infra:${{ secrets.KAFKA_UI_INFRA_TOKEN }}@gitlab.provectus.com/provectus-internals/kafka-ui-infra.git
+          git clone https://infra-tech:${{ secrets.INFRA_USER_ACCESS_TOKEN }}@github.com/provectus/kafka-ui-infra.git --branch envs
 
       - name: separate env create
         run: |
           cd kafka-ui-infra/aws-infrastructure4eks/argocd/scripts
           bash separate_env_create.sh ${{ github.event.inputs.ENV_NAME }} ${{ secrets.FEATURE_TESTING_UI_PASSWORD }} ${{ needs.build.outputs.tag }}
-          git config --global user.email "kafka-ui-infra@provectus.com"
-          git config --global user.name "kafka-ui-infra"
+          git config --global user.email "infra-tech@provectus.com"
+          git config --global user.name "infra-tech"
           git add -A
           git commit -m "separate env added: ${{ github.event.inputs.ENV_NAME }}" && git push || true
 
diff --git a/.github/workflows/separate_env_public_remove.yml b/.github/workflows/separate_env_public_remove.yml
index 19084801377..dce30ee350c 100644
--- a/.github/workflows/separate_env_public_remove.yml
+++ b/.github/workflows/separate_env_public_remove.yml
@@ -13,12 +13,12 @@ jobs:
     steps:
       - name: clone
         run: |
-          git clone https://kafka-ui-infra:${{ secrets.KAFKA_UI_INFRA_TOKEN }}@gitlab.provectus.com/provectus-internals/kafka-ui-infra.git
+          git clone https://infra-tech:${{ secrets.INFRA_USER_ACCESS_TOKEN }}@github.com/provectus/kafka-ui-infra.git --branch envs
       - name: separate environment remove
         run: |
           cd kafka-ui-infra/aws-infrastructure4eks/argocd/scripts
           bash separate_env_remove.sh ${{ github.event.inputs.ENV_NAME }}
-          git config --global user.email "kafka-ui-infra@provectus.com"
-          git config --global user.name "kafka-ui-infra"
+          git config --global user.email "infra-tech@provectus.com"
+          git config --global user.name "infra-tech"
           git add -A
           git commit -m "separate env removed: ${{ github.event.inputs.ENV_NAME }}" && git push || true

From 63f71b8a052c3540a8f0018027afab59556f419c Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 22 May 2023 10:49:20 +0300
Subject: [PATCH 580/734] [e2e] Checking Broker's config search (#3849)

---
 .../provectus/kafka/ui/pages/BasePage.java    |  8 ++
 .../ui/pages/brokers/BrokersConfigTab.java    | 73 +++++++++++++++++--
 .../ui/pages/brokers/BrokersDetails.java      |  9 +--
 .../kafka/ui/pages/brokers/BrokersList.java   | 16 ++--
 .../kafka/ui/pages/topics/TopicDetails.java   |  2 +-
 .../kafka/ui/pages/topics/TopicsList.java     | 11 +++
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 31 +++-----
 .../ui/smokesuite/brokers/BrokersTest.java    | 33 ++++++++-
 .../ui/smokesuite/topics/TopicsTest.java      |  9 ++-
 9 files changed, 147 insertions(+), 45 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index 8bd7901a635..d2e201191ab 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -67,6 +67,14 @@ protected void clickSubmitBtn() {
     clickByJavaScript(submitBtn);
   }
 
+  protected void clickNextBtn() {
+    clickByJavaScript(nextBtn);
+  }
+
+  protected void clickBackBtn() {
+    clickByJavaScript(backBtn);
+  }
+
   protected void setJsonInputValue(SelenideElement jsonInput, String jsonConfig) {
     sendKeysByActions(jsonInput, jsonConfig.replace("  ", ""));
     new Actions(WebDriverRunner.getWebDriver())
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
index f358614dc87..a3756d3bdfb 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
@@ -3,29 +3,37 @@
 import static com.codeborne.selenide.Selenide.$$x;
 import static com.codeborne.selenide.Selenide.$x;
 
+import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class BrokersConfigTab extends BasePage {
 
-  protected List<SelenideElement> editBtn = $$x("//button[@aria-label='editAction']");
-  protected SelenideElement searchByKeyField = $x("//input[@placeholder='Search by Key']");
+  protected ElementsCollection editBtns = $$x("//button[@aria-label='editAction']");
 
   @Step
   public BrokersConfigTab waitUntilScreenReady() {
     waitUntilSpinnerDisappear();
-    searchByKeyField.shouldBe(Condition.visible);
+    searchFld.shouldBe(Condition.visible);
     return this;
   }
 
   @Step
   public boolean isSearchByKeyVisible() {
-    return isVisible(searchByKeyField);
+    return isVisible(searchFld);
+  }
+
+  @Step
+  public BrokersConfigTab searchConfig(String key) {
+    searchItem(key);
+    return this;
   }
 
   public List<SelenideElement> getColumnHeaders() {
@@ -35,6 +43,61 @@ public List<SelenideElement> getColumnHeaders() {
   }
 
   public List<SelenideElement> getEditButtons() {
-    return editBtn;
+    return editBtns;
+  }
+
+  @Step
+  public BrokersConfigTab clickNextButton() {
+    clickNextBtn();
+    waitUntilSpinnerDisappear(1);
+    return this;
+  }
+
+  private List<BrokersConfigTab.BrokersConfigItem> initGridItems() {
+    List<BrokersConfigTab.BrokersConfigItem> gridItemList = new ArrayList<>();
+    gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
+        .forEach(item -> gridItemList.add(new BrokersConfigTab.BrokersConfigItem(item)));
+    return gridItemList;
+  }
+
+  @Step
+  public BrokersConfigTab.BrokersConfigItem getConfig(String key) {
+    return initGridItems().stream()
+        .filter(e -> e.getKey().equals(key))
+        .findFirst().orElseThrow();
+  }
+
+  @Step
+  public List<BrokersConfigTab.BrokersConfigItem> getAllConfigs() {
+    return initGridItems();
+  }
+
+  public static class BrokersConfigItem extends BasePage {
+
+    private final SelenideElement element;
+
+    public BrokersConfigItem(SelenideElement element) {
+      this.element = element;
+    }
+
+    @Step
+    public String getKey() {
+      return element.$x("./td[1]").getText().trim();
+    }
+
+    @Step
+    public String getValue() {
+      return element.$x("./td[2]//span").getText().trim();
+    }
+
+    @Step
+    public void edit() {
+      element.$x("./td[2]//button").shouldBe(Condition.enabled).click();
+    }
+
+    @Step
+    public String getSource() {
+      return element.$x("./td[3]").getText().trim();
+    }
   }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
index 4eca65f1f47..05d571116ea 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersDetails.java
@@ -1,6 +1,5 @@
 package com.provectus.kafka.ui.pages.brokers;
 
-import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.$x;
 
 import com.codeborne.selenide.Condition;
@@ -8,28 +7,24 @@
 import com.provectus.kafka.ui.pages.BasePage;
 import io.qameta.allure.Step;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.openqa.selenium.By;
 
 public class BrokersDetails extends BasePage {
 
-  protected SelenideElement logDirectoriesTab = $x("//a[text()='Log directories']");
-  protected SelenideElement metricsTab = $x("//a[text()='Metrics']");
   protected String brokersTabLocator = "//a[text()='%s']";
 
   @Step
   public BrokersDetails waitUntilScreenReady() {
     waitUntilSpinnerDisappear();
-    Arrays.asList(logDirectoriesTab, metricsTab).forEach(element -> element.shouldBe(Condition.visible));
+    $x(String.format(brokersTabLocator, DetailsTab.LOG_DIRECTORIES)).shouldBe(Condition.visible);
     return this;
   }
 
   @Step
   public BrokersDetails openDetailsTab(DetailsTab menu) {
-    $(By.linkText(menu.toString())).shouldBe(Condition.enabled).click();
+    $x(String.format(brokersTabLocator, menu.toString())).shouldBe(Condition.enabled).click();
     waitUntilSpinnerDisappear();
     return this;
   }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
index 9e81a0795cc..9e0741fe747 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersList.java
@@ -24,7 +24,7 @@ public BrokersList waitUntilScreenReady() {
 
   @Step
   public BrokersList openBroker(int brokerId) {
-    getBrokerItem(brokerId).openItem();
+    getBroker(brokerId).openItem();
     return this;
   }
 
@@ -59,30 +59,30 @@ public List<SelenideElement> getAllEnabledElements() {
     return getEnabledColumnHeaders();
   }
 
-  private List<BrokersList.BrokerGridItem> initGridItems() {
-    List<BrokersList.BrokerGridItem> gridItemList = new ArrayList<>();
+  private List<BrokersGridItem> initGridItems() {
+    List<BrokersGridItem> gridItemList = new ArrayList<>();
     gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
-        .forEach(item -> gridItemList.add(new BrokersList.BrokerGridItem(item)));
+        .forEach(item -> gridItemList.add(new BrokersGridItem(item)));
     return gridItemList;
   }
 
   @Step
-  public BrokerGridItem getBrokerItem(int id) {
+  public BrokersGridItem getBroker(int id) {
     return initGridItems().stream()
         .filter(e -> e.getId() == id)
         .findFirst().orElseThrow();
   }
 
   @Step
-  public List<BrokerGridItem> getAllBrokers() {
+  public List<BrokersGridItem> getAllBrokers() {
     return initGridItems();
   }
 
-  public static class BrokerGridItem extends BasePage {
+  public static class BrokersGridItem extends BasePage {
 
     private final SelenideElement element;
 
-    public BrokerGridItem(SelenideElement element) {
+    public BrokersGridItem(SelenideElement element) {
       this.element = element;
     }
 
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
index b7d03dcf3a7..8341450c6cb 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
@@ -186,7 +186,7 @@ public TopicDetails clickMessagesAddFiltersBtn() {
 
   @Step
   public TopicDetails clickNextButton() {
-    nextBtn.shouldBe(Condition.enabled).click();
+    clickNextBtn();
     waitUntilSpinnerDisappear();
     return this;
   }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
index 184178423d4..c3ef098ff0f 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicsList.java
@@ -68,6 +68,17 @@ public TopicsList setShowInternalRadioButton(boolean select) {
     return this;
   }
 
+  @Step
+  public TopicsList goToLastPage() {
+    if (nextBtn.exists()) {
+      while (nextBtn.isEnabled()) {
+        clickNextBtn();
+        waitUntilSpinnerDisappear(1);
+      }
+    }
+    return this;
+  }
+
   @Step
   public TopicsList openTopic(String topicName) {
     getTopicItem(topicName).openItem();
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index 593cb82c65d..f96be5deecc 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -15,94 +15,87 @@
 
 public class SmokeBacklog extends BaseManualTest {
 
-  @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = BROKERS_SUITE_ID)
-  @QaseId(330)
-  @Test
-  public void testCaseA() {
-  }
-
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(331)
   @Test
-  public void testCaseB() {
+  public void testCaseA() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(332)
   @Test
-  public void testCaseC() {
+  public void testCaseB() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(335)
   @Test
-  public void testCaseD() {
+  public void testCaseC() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(336)
   @Test
-  public void testCaseE() {
+  public void testCaseD() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(343)
   @Test
-  public void testCaseF() {
+  public void testCaseE() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(345)
   @Test
-  public void testCaseG() {
+  public void testCaseF() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(346)
   @Test
-  public void testCaseH() {
+  public void testCaseG() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(347)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(348)
   @Test
-  public void testCaseJ() {
+  public void testCaseI() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(350)
   @Test
-  public void testCaseK() {
+  public void testCaseJ() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = TOPICS_SUITE_ID)
   @QaseId(50)
   @Test
-  public void testCaseL() {
+  public void testCaseK() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(351)
   @Test
-  public void testCaseM() {
+  public void testCaseL() {
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
index 8fd1ffde159..b58e0f678c3 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
@@ -4,12 +4,17 @@
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
+import com.provectus.kafka.ui.pages.brokers.BrokersConfigTab;
+import io.qameta.allure.Issue;
 import io.qase.api.annotation.QaseId;
 import org.testng.Assert;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 public class BrokersTest extends BaseTest {
 
+  public static final int DEFAULT_BROKER_ID = 1;
+
   @QaseId(1)
   @Test
   public void checkBrokersOverview() {
@@ -25,7 +30,7 @@ public void checkExistingBrokersInCluster() {
     navigateToBrokers();
     Assert.assertTrue(brokersList.getAllBrokers().size() > 0, "getAllBrokers()");
     brokersList
-        .openBroker(1);
+        .openBroker(DEFAULT_BROKER_ID);
     brokersDetails
         .waitUntilScreenReady();
     verifyElementsCondition(brokersDetails.getAllVisibleElements(), Condition.visible);
@@ -38,4 +43,30 @@ public void checkExistingBrokersInCluster() {
     verifyElementsCondition(brokersConfigTab.getEditButtons(), Condition.enabled);
     Assert.assertTrue(brokersConfigTab.isSearchByKeyVisible(), "isSearchByKeyVisible()");
   }
+
+  @Ignore
+  @Issue("https://github.com/provectus/kafka-ui/issues/3347")
+  @QaseId(330)
+  @Test
+  public void brokersConfigSearchCheck() {
+    navigateToBrokersAndOpenDetails(DEFAULT_BROKER_ID);
+    brokersDetails
+        .openDetailsTab(CONFIGS);
+    String anyConfigKey = brokersConfigTab
+        .getAllConfigs().stream()
+        .findAny().orElseThrow()
+        .getKey();
+    brokersConfigTab
+        .clickNextButton();
+    Assert.assertFalse(brokersConfigTab.getAllConfigs().stream()
+            .map(BrokersConfigTab.BrokersConfigItem::getKey)
+            .toList().contains(anyConfigKey),
+        String.format("getAllConfigs().contains(%s)", anyConfigKey));
+    brokersConfigTab
+        .searchConfig(anyConfigKey);
+    Assert.assertTrue(brokersConfigTab.getAllConfigs().stream()
+            .map(BrokersConfigTab.BrokersConfigItem::getKey)
+            .toList().contains(anyConfigKey),
+        String.format("getAllConfigs().contains(%s)", anyConfigKey));
+  }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
index bad6a9fcde0..f9e79b0a723 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
@@ -365,12 +365,13 @@ public void checkShowInternalTopicsButton() {
     navigateToTopics();
     topicsList
         .setShowInternalRadioButton(true);
-    SoftAssert softly = new SoftAssert();
-    softly.assertTrue(topicsList.getInternalTopics().size() > 0, "getInternalTopics()");
-    softly.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
-    softly.assertAll();
+    Assert.assertTrue(topicsList.getInternalTopics().size() > 0, "getInternalTopics()");
+    topicsList
+        .goToLastPage();
+    Assert.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
     topicsList
         .setShowInternalRadioButton(false);
+    SoftAssert softly = new SoftAssert();
     softly.assertEquals(topicsList.getInternalTopics().size(), 0, "getInternalTopics()");
     softly.assertTrue(topicsList.getNonInternalTopics().size() > 0, "getNonInternalTopics()");
     softly.assertAll();

From 1b9c189bfad318c6beea5ade4c7c2abc969db98d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 09:25:59 +0000
Subject: [PATCH 581/734] Bump oddrn-generator-java from 0.1.15 to 0.1.17
 (#3843)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 22369cd7347..8098600726d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
         <snakeyaml.version>2.0</snakeyaml.version>
         <spring-boot.version>3.0.6</spring-boot.version>
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
-        <odd-oddrn-generator.version>0.1.15</odd-oddrn-generator.version>
+        <odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
         <odd-oddrn-client.version>0.1.23</odd-oddrn-client.version>
         <org.json.version>20230227</org.json.version>
 

From f22c910f5cb19dffc74d997cb7b668d4ab4be65e Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 22 May 2023 14:09:10 +0400
Subject: [PATCH 582/734] FE: Fix latest version is null (#3833)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/src/components/Version/Version.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Version/Version.tsx b/kafka-ui-react-app/src/components/Version/Version.tsx
index 6788605d92b..3fc1f05774f 100644
--- a/kafka-ui-react-app/src/components/Version/Version.tsx
+++ b/kafka-ui-react-app/src/components/Version/Version.tsx
@@ -15,7 +15,9 @@ const Version: React.FC = () => {
     <S.Wrapper>
       {!isLatestRelease && (
         <S.OutdatedWarning
-          title={`Your app version is outdated. Current latest version is ${versionTag}`}
+          title={`Your app version is outdated. Latest version is ${
+            versionTag || 'UNKNOWN'
+          }`}
         >
           <WarningIcon />
         </S.OutdatedWarning>

From ab9d0e2b3f6fc54344ecb1912d974f139020ca48 Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Mon, 22 May 2023 14:10:27 +0400
Subject: [PATCH 583/734] FE: Fix version display with a tag (#3827)

---
 kafka-ui-react-app/src/components/Version/Version.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Version/Version.tsx b/kafka-ui-react-app/src/components/Version/Version.tsx
index 3fc1f05774f..775fbfa5d58 100644
--- a/kafka-ui-react-app/src/components/Version/Version.tsx
+++ b/kafka-ui-react-app/src/components/Version/Version.tsx
@@ -8,9 +8,15 @@ import * as S from './Version.styled';
 
 const Version: React.FC = () => {
   const { data: latestVersionInfo = {} } = useLatestVersion();
-  const { buildTime, commitId, isLatestRelease } = latestVersionInfo.build;
+  const { buildTime, commitId, isLatestRelease, version } =
+    latestVersionInfo.build;
   const { versionTag } = latestVersionInfo?.latestRelease || '';
 
+  const currentVersion =
+    isLatestRelease && version?.match(versionTag)
+      ? versionTag
+      : formatTimestamp(buildTime);
+
   return (
     <S.Wrapper>
       {!isLatestRelease && (
@@ -34,7 +40,7 @@ const Version: React.FC = () => {
           </S.CurrentCommitLink>
         </div>
       )}
-      <S.CurrentVersion>{formatTimestamp(buildTime)}</S.CurrentVersion>
+      <S.CurrentVersion>{currentVersion}</S.CurrentVersion>
     </S.Wrapper>
   );
 };

From 0099169a2be914ccbb8e9d8f0c7e308fbb7446dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ce=C5=A1ek?=
 <michal-cesek@users.noreply.github.com>
Date: Wed, 24 May 2023 19:23:48 +0700
Subject: [PATCH 584/734] FE: Allow to edit active topic message filter (#3748)

Co-authored-by: VladSenyuta <vlad.senyuta@gmail.com>
Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
---
 .../kafka/ui/pages/topics/TopicDetails.java   | 56 +++++++++++--
 .../ui/smokesuite/topics/TopicsTest.java      | 50 ++++++++---
 .../KsqlDb/Query/QueryForm/QueryForm.tsx      |  4 +-
 .../Topic/Messages/Filters/EditFilter.tsx     |  2 +-
 .../Topic/Messages/Filters/FilterModal.tsx    | 40 +++++----
 .../Topic/Messages/Filters/Filters.styled.ts  | 82 +++++++++++++++----
 .../Topics/Topic/Messages/Filters/Filters.tsx | 66 +++++++++++----
 .../Filters/__tests__/EditFilter.spec.tsx     |  2 +-
 .../Filters/__tests__/FilterModal.spec.tsx    | 12 ++-
 .../Form/CustomParams/CustomParamField.tsx    |  4 +-
 .../src/components/common/Alert/Alert.tsx     |  4 +-
 .../common/Icons/CloseCircleIcon.tsx          | 24 ++++++
 .../src/components/common/Icons/CloseIcon.tsx | 18 ++--
 .../src/components/common/Icons/EditIcon.tsx  | 41 +++-------
 .../src/components/common/Search/Search.tsx   |  4 +-
 kafka-ui-react-app/src/theme/theme.ts         | 38 +++++++--
 .../Sections/KafkaCluster.tsx                 |  4 +-
 .../Sections/KafkaConnect.tsx                 |  4 +-
 18 files changed, 329 insertions(+), 126 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/common/Icons/CloseCircleIcon.tsx

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
index 8341450c6cb..07effd8e341 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicDetails.java
@@ -37,11 +37,13 @@ public class TopicDetails extends BasePage {
   protected SelenideElement addFiltersBtn = $x("//button[text()='Add Filters']");
   protected SelenideElement savedFiltersLink = $x("//div[text()='Saved Filters']");
   protected SelenideElement addFilterCodeModalTitle = $x("//label[text()='Filter code']");
-  protected SelenideElement addFilterCodeInput = $x("//div[@id='ace-editor']//textarea");
+  protected SelenideElement addFilterCodeEditor = $x("//div[@id='ace-editor']");
+  protected SelenideElement addFilterCodeTextarea = $x("//div[@id='ace-editor']//textarea");
   protected SelenideElement saveThisFilterCheckBoxAddFilterMdl = $x("//input[@name='saveFilter']");
   protected SelenideElement displayNameInputAddFilterMdl = $x("//input[@placeholder='Enter Name']");
   protected SelenideElement cancelBtnAddFilterMdl = $x("//button[text()='Cancel']");
   protected SelenideElement addFilterBtnAddFilterMdl = $x("//button[text()='Add filter']");
+  protected SelenideElement saveFilterBtnEditFilterMdl = $x("//button[text()='Save']");
   protected SelenideElement addFiltersBtnMessages = $x("//button[text()='Add Filters']");
   protected SelenideElement selectFilterBtnAddFilterMdl = $x("//button[text()='Select filter']");
   protected SelenideElement editSettingsMenu = $x("//li[@role][contains(text(),'Edit settings')]");
@@ -62,7 +64,8 @@ public class TopicDetails extends BasePage {
   protected String savedFilterNameLocator = "//div[@role='savedFilter']/div[contains(text(),'%s')]";
   protected String consumerIdLocator = "//a[@title='%s']";
   protected String topicHeaderLocator = "//h1[contains(text(),'%s')]";
-  protected String activeFilterNameLocator = "//div[@data-testid='activeSmartFilter'][contains(text(),'%s')]";
+  protected String activeFilterNameLocator = "//div[@data-testid='activeSmartFilter']/div[1][contains(text(),'%s')]";
+  protected String editActiveFilterBtnLocator = "//div[text()='%s']/../div[@data-testid='editActiveSmartFilterBtn']";
   protected String settingsGridValueLocator = "//tbody/tr/td/span[text()='%s']//ancestor::tr/td[2]/span";
 
   @Step
@@ -184,6 +187,13 @@ public TopicDetails clickMessagesAddFiltersBtn() {
     return this;
   }
 
+  @Step
+  public TopicDetails clickEditActiveFilterBtn(String filterName) {
+    $x(String.format(editActiveFilterBtnLocator, filterName))
+        .shouldBe(Condition.enabled).click();
+    return this;
+  }
+
   @Step
   public TopicDetails clickNextButton() {
     clickNextBtn();
@@ -223,11 +233,27 @@ public TopicDetails waitUntilAddFiltersMdlVisible() {
   }
 
   @Step
-  public TopicDetails setFilterCodeFieldAddFilterMdl(String filterCode) {
-    addFilterCodeInput.shouldBe(Condition.enabled).sendKeys(filterCode);
+  public TopicDetails setFilterCodeFldAddFilterMdl(String filterCode) {
+    addFilterCodeTextarea.shouldBe(Condition.enabled).setValue(filterCode);
     return this;
   }
 
+  @Step
+  public String getFilterCodeValue() {
+    addFilterCodeEditor.shouldBe(Condition.enabled).click();
+    String value = addFilterCodeTextarea.getValue();
+    if (value == null) {
+      return null;
+    } else {
+      return value.substring(0, value.length() - 2);
+    }
+  }
+
+  @Step
+  public String getFilterNameValue() {
+    return displayNameInputAddFilterMdl.shouldBe(Condition.enabled).getValue();
+  }
+
   @Step
   public TopicDetails selectSaveThisFilterCheckboxMdl(boolean select) {
     selectElement(saveThisFilterCheckBoxAddFilterMdl, select);
@@ -241,7 +267,7 @@ public boolean isSaveThisFilterCheckBoxSelected() {
 
   @Step
   public TopicDetails setDisplayNameFldAddFilterMdl(String displayName) {
-    displayNameInputAddFilterMdl.shouldBe(Condition.enabled).sendKeys(displayName);
+    displayNameInputAddFilterMdl.shouldBe(Condition.enabled).setValue(displayName);
     return this;
   }
 
@@ -256,6 +282,17 @@ public TopicDetails clickAddFilterBtnAndCloseMdl(boolean closeModal) {
     return this;
   }
 
+  @Step
+  public TopicDetails clickSaveFilterBtnAndCloseMdl(boolean closeModal) {
+    saveFilterBtnEditFilterMdl.shouldBe(Condition.enabled).click();
+    if (closeModal) {
+      addFilterCodeModalTitle.shouldBe(Condition.hidden);
+    } else {
+      addFilterCodeModalTitle.shouldBe(Condition.visible);
+    }
+    return this;
+  }
+
   @Step
   public boolean isAddFilterBtnAddFilterMdlEnabled() {
     return isEnabled(addFilterBtnAddFilterMdl);
@@ -272,8 +309,13 @@ public boolean isNextButtonEnabled() {
   }
 
   @Step
-  public boolean isActiveFilterVisible(String activeFilterName) {
-    return isVisible($x(String.format(activeFilterNameLocator, activeFilterName)));
+  public boolean isActiveFilterVisible(String filterName) {
+    return isVisible($x(String.format(activeFilterNameLocator, filterName)));
+  }
+
+  @Step
+  public String getSearchFieldValue() {
+    return searchFld.shouldBe(Condition.visible).getValue();
   }
 
   public List<SelenideElement> getAllAddFilterModalVisibleElements() {
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
index f9e79b0a723..f166b92e113 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/topics/TopicsTest.java
@@ -313,14 +313,44 @@ public void addNewFilterWithinTopic() {
     verifyElementsCondition(topicDetails.getAllAddFilterModalDisabledElements(), Condition.disabled);
     Assert.assertFalse(topicDetails.isSaveThisFilterCheckBoxSelected(), "isSaveThisFilterCheckBoxSelected()");
     topicDetails
-        .setFilterCodeFieldAddFilterMdl(filterName);
+        .setFilterCodeFldAddFilterMdl(filterName);
     Assert.assertTrue(topicDetails.isAddFilterBtnAddFilterMdlEnabled(), "isAddFilterBtnAddFilterMdlEnabled()");
     topicDetails.clickAddFilterBtnAndCloseMdl(true);
     Assert.assertTrue(topicDetails.isActiveFilterVisible(filterName), "isActiveFilterVisible()");
   }
 
-  @QaseId(13)
+  @QaseId(352)
   @Test(priority = 13)
+  public void editActiveSmartFilterCheck() {
+    String filterName = randomAlphabetic(5);
+    String filterCode = randomAlphabetic(5);
+    navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
+    topicDetails
+        .openDetailsTab(MESSAGES)
+        .clickMessagesAddFiltersBtn()
+        .waitUntilAddFiltersMdlVisible()
+        .setFilterCodeFldAddFilterMdl(filterCode)
+        .setDisplayNameFldAddFilterMdl(filterName)
+        .clickAddFilterBtnAndCloseMdl(true)
+        .clickEditActiveFilterBtn(filterName)
+        .waitUntilAddFiltersMdlVisible();
+    SoftAssert softly = new SoftAssert();
+    softly.assertEquals(topicDetails.getFilterCodeValue(), filterCode, "getFilterCodeValue()");
+    softly.assertEquals(topicDetails.getFilterNameValue(), filterName, "getFilterNameValue()");
+    softly.assertAll();
+    String newFilterName = randomAlphabetic(5);
+    String newFilterCode = randomAlphabetic(5);
+    topicDetails
+        .setFilterCodeFldAddFilterMdl(newFilterCode)
+        .setDisplayNameFldAddFilterMdl(newFilterName)
+        .clickSaveFilterBtnAndCloseMdl(true);
+    softly.assertTrue(topicDetails.isActiveFilterVisible(newFilterName), "isActiveFilterVisible()");
+    softly.assertEquals(topicDetails.getSearchFieldValue(), newFilterCode, "getSearchFieldValue()");
+    softly.assertAll();
+  }
+
+  @QaseId(13)
+  @Test(priority = 14)
   public void checkFilterSavingWithinSavedFilters() {
     String displayName = randomAlphabetic(5);
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
@@ -328,7 +358,7 @@ public void checkFilterSavingWithinSavedFilters() {
         .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()
         .waitUntilAddFiltersMdlVisible()
-        .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
+        .setFilterCodeFldAddFilterMdl(randomAlphabetic(4))
         .selectSaveThisFilterCheckboxMdl(true)
         .setDisplayNameFldAddFilterMdl(displayName);
     Assert.assertTrue(topicDetails.isAddFilterBtnAddFilterMdlEnabled(),
@@ -341,7 +371,7 @@ public void checkFilterSavingWithinSavedFilters() {
   }
 
   @QaseId(14)
-  @Test(priority = 14)
+  @Test(priority = 15)
   public void checkApplyingSavedFilterWithinTopicMessages() {
     String displayName = randomAlphabetic(5);
     navigateToTopicsAndOpenDetails(TOPIC_FOR_CHECK_FILTERS.getName());
@@ -349,7 +379,7 @@ public void checkApplyingSavedFilterWithinTopicMessages() {
         .openDetailsTab(MESSAGES)
         .clickMessagesAddFiltersBtn()
         .waitUntilAddFiltersMdlVisible()
-        .setFilterCodeFieldAddFilterMdl(randomAlphabetic(4))
+        .setFilterCodeFldAddFilterMdl(randomAlphabetic(4))
         .selectSaveThisFilterCheckboxMdl(true)
         .setDisplayNameFldAddFilterMdl(displayName)
         .clickAddFilterBtnAndCloseMdl(false)
@@ -360,7 +390,7 @@ public void checkApplyingSavedFilterWithinTopicMessages() {
   }
 
   @QaseId(11)
-  @Test(priority = 15)
+  @Test(priority = 16)
   public void checkShowInternalTopicsButton() {
     navigateToTopics();
     topicsList
@@ -378,7 +408,7 @@ public void checkShowInternalTopicsButton() {
   }
 
   @QaseId(334)
-  @Test(priority = 16)
+  @Test(priority = 17)
   public void checkInternalTopicsNaming() {
     navigateToTopics();
     SoftAssert softly = new SoftAssert();
@@ -391,7 +421,7 @@ public void checkInternalTopicsNaming() {
   }
 
   @QaseId(56)
-  @Test(priority = 17)
+  @Test(priority = 18)
   public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
     navigateToTopics();
     topicsList
@@ -439,7 +469,7 @@ public void checkRetentionBytesAccordingToMaxSizeOnDisk() {
   }
 
   @QaseId(247)
-  @Test(priority = 18)
+  @Test(priority = 19)
   public void recreateTopicFromTopicProfile() {
     Topic topicToRecreate = new Topic()
         .setName("topic-to-recreate-" + randomAlphabetic(5))
@@ -467,7 +497,7 @@ public void recreateTopicFromTopicProfile() {
   }
 
   @QaseId(8)
-  @Test(priority = 19)
+  @Test(priority = 20)
   public void checkCopyTopicPossibility() {
     Topic topicToCopy = new Topic()
         .setName("topic-to-copy-" + randomAlphabetic(5))
diff --git a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
index 3803c1e10f7..7456b5d2d97 100644
--- a/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
+++ b/kafka-ui-react-app/src/components/KsqlDb/Query/QueryForm/QueryForm.tsx
@@ -9,7 +9,7 @@ import {
 } from 'react-hook-form';
 import { Button } from 'components/common/Button/Button';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
-import CloseIcon from 'components/common/Icons/CloseIcon';
+import CloseCircleIcon from 'components/common/Icons/CloseCircleIcon';
 import { yupResolver } from '@hookform/resolvers/yup';
 import yup from 'lib/yupExtended';
 import PlusIcon from 'components/common/Icons/PlusIcon';
@@ -174,7 +174,7 @@ const QueryForm: React.FC<QueryFormProps> = ({
                     aria-label="deleteProperty"
                     onClick={removeProperty(index)}
                   >
-                    <CloseIcon aria-hidden />
+                    <CloseCircleIcon aria-hidden />
                   </IconButtonWrapper>
                 </S.InputsContainer>
               ))}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/EditFilter.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/EditFilter.tsx
index e566870900e..04f9c47ee93 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/EditFilter.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/EditFilter.tsx
@@ -22,7 +22,7 @@ const EditFilter: React.FC<EditFilterProps> = ({
   };
   return (
     <>
-      <S.FilterTitle>Edit saved filter</S.FilterTitle>
+      <S.FilterTitle>Edit filter</S.FilterTitle>
       <AddEditFilterContainer
         cancelBtnHandler={() => toggleEditModal()}
         submitBtnText="Save"
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
index 88e5adbcae6..0ada1587856 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/FilterModal.tsx
@@ -1,6 +1,9 @@
 import React from 'react';
 import * as S from 'components/Topics/Topic/Messages/Filters/Filters.styled';
-import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
+import {
+  ActiveMessageFilter,
+  MessageFilters,
+} from 'components/Topics/Topic/Messages/Filters/Filters';
 import AddFilter from 'components/Topics/Topic/Messages/Filters/AddFilter';
 import EditFilter from 'components/Topics/Topic/Messages/Filters/EditFilter';
 
@@ -11,7 +14,8 @@ export interface FilterModalProps {
   deleteFilter(index: number): void;
   activeFilterHandler(activeFilter: MessageFilters, index: number): void;
   editSavedFilter(filter: FilterEdit): void;
-  activeFilter?: MessageFilters;
+  activeFilter: ActiveMessageFilter;
+  quickEditMode?: boolean;
 }
 
 export interface FilterEdit {
@@ -27,27 +31,39 @@ const FilterModal: React.FC<FilterModalProps> = ({
   activeFilterHandler,
   editSavedFilter,
   activeFilter,
+  quickEditMode = false,
 }) => {
-  const [addFilterModal, setAddFilterModal] = React.useState<boolean>(true);
+  const [isInEditMode, setIsInEditMode] =
+    React.useState<boolean>(quickEditMode);
   const [isSavedFiltersOpen, setIsSavedFiltersOpen] =
     React.useState<boolean>(false);
 
   const toggleEditModal = () => {
-    setAddFilterModal(!addFilterModal);
+    setIsInEditMode(!isInEditMode);
   };
 
-  const [editFilter, setEditFilter] = React.useState<FilterEdit>({
-    index: -1,
-    filter: { name: '', code: '' },
+  const [editFilter, setEditFilter] = React.useState<FilterEdit>(() => {
+    const { index, name, code } = activeFilter;
+    return quickEditMode
+      ? { index, filter: { name, code } }
+      : { index: -1, filter: { name: '', code: '' } };
   });
   const editFilterHandler = (value: FilterEdit) => {
     setEditFilter(value);
-    setAddFilterModal(!addFilterModal);
+    setIsInEditMode(!isInEditMode);
   };
 
+  const toggleEditModalHandler = quickEditMode ? toggleIsOpen : toggleEditModal;
+
   return (
     <S.MessageFilterModal data-testid="messageFilterModal">
-      {addFilterModal ? (
+      {isInEditMode ? (
+        <EditFilter
+          editFilter={editFilter}
+          toggleEditModal={toggleEditModalHandler}
+          editSavedFilter={editSavedFilter}
+        />
+      ) : (
         <AddFilter
           toggleIsOpen={toggleIsOpen}
           filters={filters}
@@ -60,12 +76,6 @@ const FilterModal: React.FC<FilterModalProps> = ({
           onClickSavedFilters={() => setIsSavedFiltersOpen(!isSavedFiltersOpen)}
           activeFilter={activeFilter}
         />
-      ) : (
-        <EditFilter
-          editFilter={editFilter}
-          toggleEditModal={toggleEditModal}
-          editSavedFilter={editSavedFilter}
-        />
       )}
     </S.MessageFilterModal>
   );
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
index bef6f59ff92..7ec8fbde072 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
@@ -2,6 +2,8 @@ import Input from 'components/common/Input/Input';
 import Select from 'components/common/Select/Select';
 import styled, { css } from 'styled-components';
 import DatePicker from 'react-datepicker';
+import EditIcon from 'components/common/Icons/EditIcon';
+import closeIcon from 'components/common/Icons/CloseIcon';
 
 interface SavedFilterProps {
   selected: boolean;
@@ -280,29 +282,77 @@ export const SavedFilter = styled.div.attrs({
 `;
 
 export const ActiveSmartFilter = styled.div`
-  border-radius: 4px;
-  min-width: 115px;
-  height: 24px;
-  background: ${({ theme }) => theme.savedFilter.backgroundColor};
-  font-size: 14px;
-  line-height: 20px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  color: ${({ theme }) => theme.savedFilter.color};
-  padding: 16px 8px;
+  height: 32px;
+  color: ${({ theme }) => theme.activeFilter.color};
+  background: ${({ theme }) => theme.activeFilter.backgroundColor};
+  border-radius: 4px;
+  font-size: 14px;
+  line-height: 20px;
 `;
 
-export const DeleteSavedFilterIcon = styled.div`
-  color: ${({ theme }) => theme.icons.closeIcon};
-  display: flex;
-  align-items: center;
-  padding-left: 6px;
-  height: 24px;
-  cursor: pointer;
-  margin-left: 4px;
+export const EditSmartFilterIcon = styled.div(
+  ({ theme: { icons } }) => css`
+    color: ${icons.editIcon.normal};
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 32px;
+    width: 32px;
+    cursor: pointer;
+    border-left: 1px solid ${icons.editIcon.border};
+
+    &:hover {
+      ${EditIcon} {
+        fill: ${icons.editIcon.hover};
+      }
+    }
+
+    &:active {
+      ${EditIcon} {
+        fill: ${icons.editIcon.active};
+      }
+    }
+  `
+);
+
+export const SmartFilterName = styled.div`
+  padding: 0 8px;
+  min-width: 32px;
 `;
 
+export const DeleteSmartFilterIcon = styled.div(
+  ({ theme: { icons } }) => css`
+    color: ${icons.closeIcon.normal};
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 32px;
+    width: 32px;
+    cursor: pointer;
+    border-left: 1px solid ${icons.closeIcon.border};
+
+    svg {
+      height: 14px;
+      width: 14px;
+    }
+
+    &:hover {
+      ${closeIcon} {
+        fill: ${icons.closeIcon.hover};
+      }
+    }
+
+    &:active {
+      ${closeIcon} {
+        fill: ${icons.closeIcon.active};
+      }
+    }
+  `
+);
+
 export const MessageLoading = styled.div.attrs({
   role: 'contentLoader',
 })<MessageLoadingProps>`
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index b3f355f5692..0c2510ff4cc 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -30,6 +30,7 @@ import useBoolean from 'lib/hooks/useBoolean';
 import { RouteParamsClusterTopic } from 'lib/paths';
 import useAppParams from 'lib/hooks/useAppParams';
 import PlusIcon from 'components/common/Icons/PlusIcon';
+import EditIcon from 'components/common/Icons/EditIcon';
 import CloseIcon from 'components/common/Icons/CloseIcon';
 import ClockIcon from 'components/common/Icons/ClockIcon';
 import ArrowDownIcon from 'components/common/Icons/ArrowDownIcon';
@@ -67,7 +68,7 @@ export interface MessageFilters {
   code: string;
 }
 
-interface ActiveMessageFilter {
+export interface ActiveMessageFilter {
   index: number;
   name: string;
   code: string;
@@ -108,6 +109,8 @@ const Filters: React.FC<FiltersProps> = ({
 
   const { value: isOpen, toggle } = useBoolean();
 
+  const { value: isQuickEditOpen, toggle: toggleQuickEdit } = useBoolean();
+
   const source = React.useRef<EventSource | null>(null);
 
   const [selectedPartitions, setSelectedPartitions] = React.useState<Option[]>(
@@ -307,27 +310,37 @@ const Filters: React.FC<FiltersProps> = ({
     setActiveFilter({ index, ...newActiveFilter });
     setQueryType(MessageFilterType.GROOVY_SCRIPT);
   };
+
+  const composeMessageFilter = (filter: FilterEdit): ActiveMessageFilter => ({
+    index: filter.index,
+    name: filter.filter.name,
+    code: filter.filter.code,
+  });
+
+  const storeAsActiveFilter = (filter: FilterEdit) => {
+    const messageFilter = JSON.stringify(composeMessageFilter(filter));
+    localStorage.setItem('activeFilter', messageFilter);
+  };
+
   const editSavedFilter = (filter: FilterEdit) => {
     const filters = [...savedFilters];
     filters[filter.index] = filter.filter;
     if (activeFilter.name && activeFilter.index === filter.index) {
-      setActiveFilter({
-        index: filter.index,
-        name: filter.filter.name,
-        code: filter.filter.code,
-      });
-      localStorage.setItem(
-        'activeFilter',
-        JSON.stringify({
-          index: filter.index,
-          name: filter.filter.name,
-          code: filter.filter.code,
-        })
-      );
+      setActiveFilter(composeMessageFilter(filter));
+      storeAsActiveFilter(filter);
     }
     localStorage.setItem('savedFilters', JSON.stringify(filters));
     setSavedFilters(filters);
   };
+
+  const editCurrentFilter = (filter: FilterEdit) => {
+    if (filter.index < 0) {
+      setActiveFilter(composeMessageFilter(filter));
+      storeAsActiveFilter(filter);
+    } else {
+      editSavedFilter(filter);
+    }
+  };
   // eslint-disable-next-line consistent-return
   React.useEffect(() => {
     if (location.search?.length !== 0) {
@@ -542,13 +555,32 @@ const Filters: React.FC<FiltersProps> = ({
         </Button>
         {activeFilter.name && (
           <S.ActiveSmartFilter data-testid="activeSmartFilter">
-            {activeFilter.name}
-            <S.DeleteSavedFilterIcon onClick={deleteActiveFilter}>
+            <S.SmartFilterName>{activeFilter.name}</S.SmartFilterName>
+            <S.EditSmartFilterIcon
+              data-testid="editActiveSmartFilterBtn"
+              onClick={toggleQuickEdit}
+            >
+              <EditIcon />
+            </S.EditSmartFilterIcon>
+            <S.DeleteSmartFilterIcon onClick={deleteActiveFilter}>
               <CloseIcon />
-            </S.DeleteSavedFilterIcon>
+            </S.DeleteSmartFilterIcon>
           </S.ActiveSmartFilter>
         )}
       </S.ActiveSmartFilterWrapper>
+      {isQuickEditOpen && (
+        <FilterModal
+          quickEditMode
+          activeFilter={activeFilter}
+          toggleIsOpen={toggleQuickEdit}
+          editSavedFilter={editCurrentFilter}
+          filters={[]}
+          addFilter={() => null}
+          deleteFilter={() => null}
+          activeFilterHandler={() => null}
+        />
+      )}
+
       {isOpen && (
         <FilterModal
           toggleIsOpen={toggle}
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
index f08a5d0c3d2..b5187289a91 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/EditFilter.spec.tsx
@@ -27,7 +27,7 @@ describe('EditFilter component', () => {
     await act(() => {
       renderComponent();
     });
-    expect(screen.getByText(/edit saved filter/i)).toBeInTheDocument();
+    expect(screen.getByText(/edit filter/i)).toBeInTheDocument();
   });
 
   it('closes editFilter modal', async () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
index c97bdc1b2a2..7f21b11f134 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/__tests__/FilterModal.spec.tsx
@@ -3,11 +3,16 @@ import FilterModal, {
   FilterModalProps,
 } from 'components/Topics/Topic/Messages/Filters/FilterModal';
 import { render } from 'lib/testHelpers';
-import { MessageFilters } from 'components/Topics/Topic/Messages/Filters/Filters';
+import {
+  ActiveMessageFilter,
+  MessageFilters,
+} from 'components/Topics/Topic/Messages/Filters/Filters';
 import { screen, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-const filters: MessageFilters[] = [{ name: 'name', code: 'code' }];
+const filter = { name: 'name', code: 'code' };
+const filters: MessageFilters[] = [filter];
+const activeFilter: ActiveMessageFilter = { index: -1, ...filter };
 
 const renderComponent = (props?: Partial<FilterModalProps>) =>
   render(
@@ -18,6 +23,7 @@ const renderComponent = (props?: Partial<FilterModalProps>) =>
       deleteFilter={jest.fn()}
       activeFilterHandler={jest.fn()}
       editSavedFilter={jest.fn()}
+      activeFilter={activeFilter}
       {...props}
     />
   );
@@ -36,7 +42,7 @@ describe('FilterModal component', () => {
     await userEvent.click(screen.getByRole('savedFilterText'));
     await userEvent.click(screen.getByText('Edit'));
     expect(
-      screen.getByRole('heading', { name: /edit saved filter/i, level: 3 })
+      screen.getByRole('heading', { name: /edit filter/i, level: 3 })
     ).toBeInTheDocument();
   });
 });
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
index 5ba51ad2890..95d3bcb15c9 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx
@@ -8,7 +8,7 @@ import { FormError } from 'components/common/Input/Input.styled';
 import Select from 'components/common/Select/Select';
 import Input from 'components/common/Input/Input';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
-import CloseIcon from 'components/common/Icons/CloseIcon';
+import CloseCircleIcon from 'components/common/Icons/CloseCircleIcon';
 import * as C from 'components/Topics/shared/Form/TopicForm.styled';
 import { ConfigSource } from 'generated-sources';
 
@@ -125,7 +125,7 @@ const CustomParamField: React.FC<Props> = ({
           }
           title={`Delete customParam field ${index}`}
         >
-          <CloseIcon aria-hidden />
+          <CloseCircleIcon aria-hidden />
         </IconButtonWrapper>
       </S.DeleteButtonWrapper>
     </C.Column>
diff --git a/kafka-ui-react-app/src/components/common/Alert/Alert.tsx b/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
index 5b58a573d4a..963ac8b2d33 100644
--- a/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
+++ b/kafka-ui-react-app/src/components/common/Alert/Alert.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import CloseIcon from 'components/common/Icons/CloseIcon';
+import CloseCircleIcon from 'components/common/Icons/CloseCircleIcon';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
 import { ToastTypes } from 'lib/errorHandling';
 
@@ -19,7 +19,7 @@ const Alert: React.FC<AlertProps> = ({ title, type, message, onDissmiss }) => (
       <S.Message role="contentinfo">{message}</S.Message>
     </div>
     <IconButtonWrapper role="button" onClick={onDissmiss}>
-      <CloseIcon />
+      <CloseCircleIcon />
     </IconButtonWrapper>
   </S.Alert>
 );
diff --git a/kafka-ui-react-app/src/components/common/Icons/CloseCircleIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/CloseCircleIcon.tsx
new file mode 100644
index 00000000000..bdc64f02b00
--- /dev/null
+++ b/kafka-ui-react-app/src/components/common/Icons/CloseCircleIcon.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { useTheme } from 'styled-components';
+
+const CloseCircleIcon: React.FC = () => {
+  const theme = useTheme();
+  return (
+    <svg
+      width="16"
+      height="16"
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16ZM11.707 4.29289C12.0976 4.68342 12.0976 5.31658 11.707 5.70711L9.41415 8L11.707 10.2929C12.0976 10.6834 12.0976 11.3166 11.707 11.7071C11.3165 12.0976 10.6834 12.0976 10.2928 11.7071L7.99994 9.41421L5.70711 11.707C5.31658 12.0976 4.68342 12.0976 4.29289 11.707C3.90237 11.3165 3.90237 10.6834 4.29289 10.2928L6.58573 8L4.29289 5.70717C3.90237 5.31664 3.90237 4.68348 4.29289 4.29295C4.68342 3.90243 5.31658 3.90243 5.70711 4.29295L7.99994 6.58579L10.2928 4.29289C10.6834 3.90237 11.3165 3.90237 11.707 4.29289Z"
+        fill={theme.icons.closeCircleIcon}
+      />
+    </svg>
+  );
+};
+
+export default CloseCircleIcon;
diff --git a/kafka-ui-react-app/src/components/common/Icons/CloseIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/CloseIcon.tsx
index 17e750e1204..ca66ba22238 100644
--- a/kafka-ui-react-app/src/components/common/Icons/CloseIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/CloseIcon.tsx
@@ -1,24 +1,24 @@
 import React from 'react';
-import { useTheme } from 'styled-components';
+import styled, { useTheme } from 'styled-components';
 
-const CloseIcon: React.FC = () => {
+const CloseIcon: React.FC<{ className?: string }> = ({ className }) => {
   const theme = useTheme();
   return (
     <svg
-      width="16"
-      height="16"
-      viewBox="0 0 16 16"
-      fill="none"
+      width="10"
+      height="10"
+      viewBox="0 0 10 10"
+      className={className}
+      fill={theme.icons.closeIcon.normal}
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
         fillRule="evenodd"
         clipRule="evenodd"
-        d="M8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16ZM11.707 4.29289C12.0976 4.68342 12.0976 5.31658 11.707 5.70711L9.41415 8L11.707 10.2929C12.0976 10.6834 12.0976 11.3166 11.707 11.7071C11.3165 12.0976 10.6834 12.0976 10.2928 11.7071L7.99994 9.41421L5.70711 11.707C5.31658 12.0976 4.68342 12.0976 4.29289 11.707C3.90237 11.3165 3.90237 10.6834 4.29289 10.2928L6.58573 8L4.29289 5.70717C3.90237 5.31664 3.90237 4.68348 4.29289 4.29295C4.68342 3.90243 5.31658 3.90243 5.70711 4.29295L7.99994 6.58579L10.2928 4.29289C10.6834 3.90237 11.3165 3.90237 11.707 4.29289Z"
-        fill={theme.icons.closeIcon}
+        d="M0.646447 0.646447C0.841709 0.451184 1.15829 0.451184 1.35355 0.646447L5 4.29289L8.64645 0.646447C8.84171 0.451184 9.15829 0.451184 9.35355 0.646447C9.54882 0.841709 9.54882 1.15829 9.35355 1.35355L5.70711 5L9.35355 8.64645C9.54882 8.84171 9.54882 9.15829 9.35355 9.35355C9.15829 9.54882 8.84171 9.54882 8.64645 9.35355L5 5.70711L1.35355 9.35355C1.15829 9.54881 0.841709 9.54881 0.646447 9.35355C0.451185 9.15829 0.451185 8.84171 0.646447 8.64645L4.29289 5L0.646447 1.35355C0.451184 1.15829 0.451184 0.841709 0.646447 0.646447Z"
       />
     </svg>
   );
 };
 
-export default CloseIcon;
+export default styled(CloseIcon)``;
diff --git a/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx
index 95fe102a610..93e09c1b0d4 100644
--- a/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/EditIcon.tsx
@@ -1,42 +1,23 @@
-import React, { FC } from 'react';
-import { useTheme } from 'styled-components';
+import React from 'react';
+import styled, { useTheme } from 'styled-components';
 
-const EditIcon: FC = () => {
+const EditIcon: React.FC<{ className?: string }> = ({ className }) => {
   const theme = useTheme();
   return (
     <svg
-      viewBox="0 0 64 64"
-      width="12"
-      height="12"
+      width="13"
+      height="14"
+      viewBox="0 0 13 14"
+      className={className}
+      fill={theme.icons.editIcon.normal}
       xmlns="http://www.w3.org/2000/svg"
       aria-labelledby="title"
-      aria-describedby="desc"
-      role="img"
     >
       <title>Edit</title>
-      <desc>A line styled icon from Orion Icon Library.</desc>
-      <path
-        d="M54.368 17.674l6.275-6.267-8.026-8.025-6.274 6.267"
-        strokeWidth="2"
-        strokeMiterlimit="10"
-        stroke={theme.icons.editIcon}
-        fill="none"
-        data-name="layer2"
-        strokeLinejoin="round"
-        strokeLinecap="round"
-      />
-      <path
-        d="M17.766 54.236l36.602-36.562-8.025-8.025L9.74 46.211 3.357 60.618l14.409-6.382zM9.74 46.211l8.026 8.025"
-        strokeWidth="2"
-        strokeMiterlimit="10"
-        stroke={theme.icons.editIcon}
-        fill="none"
-        data-name="layer1"
-        strokeLinejoin="round"
-        strokeLinecap="round"
-      />
+      <path d="M9.53697 1.15916C10.0914 0.60473 10.9886 0.602975 11.5408 1.15524L12.5408 2.15518C13.093 2.70745 13.0913 3.60461 12.5368 4.15904L10.3564 6.33944L7.35657 3.33956L9.53697 1.15916Z" />
+      <path d="M6.64946 4.04667L9.53674e-07 10.6961L0 13.696L2.99988 13.696L9.64934 7.04655L6.64946 4.04667Z" />
     </svg>
   );
 };
 
-export default EditIcon;
+export default styled(EditIcon)``;
diff --git a/kafka-ui-react-app/src/components/common/Search/Search.tsx b/kafka-ui-react-app/src/components/common/Search/Search.tsx
index 65116d645a6..8c5d27a8a14 100644
--- a/kafka-ui-react-app/src/components/common/Search/Search.tsx
+++ b/kafka-ui-react-app/src/components/common/Search/Search.tsx
@@ -2,7 +2,7 @@ import React, { useRef } from 'react';
 import { useDebouncedCallback } from 'use-debounce';
 import Input from 'components/common/Input/Input';
 import { useSearchParams } from 'react-router-dom';
-import CloseIcon from 'components/common/Icons/CloseIcon';
+import CloseCircleIcon from 'components/common/Icons/CloseCircleIcon';
 import styled from 'styled-components';
 
 interface SearchProps {
@@ -66,7 +66,7 @@ const Search: React.FC<SearchProps> = ({
       search
       clearIcon={
         <IconButtonWrapper onClick={clearSearchValue}>
-          <CloseIcon />
+          <CloseCircleIcon />
         </IconButtonWrapper>
       }
     />
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index f42eb8c6d53..5ff21fe7e3d 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -162,7 +162,18 @@ const baseTheme = {
   },
   icons: {
     chevronDownIcon: Colors.neutral[0],
-    editIcon: Colors.neutral[30],
+    editIcon: {
+      normal: Colors.neutral[30],
+      hover: Colors.neutral[90],
+      active: Colors.neutral[100],
+      border: Colors.neutral[10],
+    },
+    closeIcon: {
+      normal: Colors.neutral[30],
+      hover: Colors.neutral[90],
+      active: Colors.neutral[100],
+      border: Colors.neutral[10],
+    },
     cancelIcon: Colors.neutral[30],
     autoIcon: Colors.neutral[95],
     fileIcon: Colors.neutral[90],
@@ -171,7 +182,7 @@ const baseTheme = {
     moonIcon: Colors.neutral[95],
     sunIcon: Colors.neutral[95],
     infoIcon: Colors.neutral[30],
-    closeIcon: Colors.neutral[30],
+    closeCircleIcon: Colors.neutral[30],
     deleteIcon: Colors.red[20],
     warningIcon: Colors.yellow[20],
     warningRedIcon: {
@@ -688,10 +699,13 @@ export const theme = {
       color: Colors.neutral[80],
     },
   },
+  activeFilter: {
+    color: Colors.neutral[70],
+    backgroundColor: Colors.neutral[5],
+  },
   savedFilter: {
     filterName: Colors.neutral[90],
     color: Colors.neutral[30],
-    backgroundColor: Colors.neutral[5],
   },
   editFilter: {
     textColor: Colors.brand[50],
@@ -1128,10 +1142,13 @@ export const darkTheme: ThemeType = {
       color: Colors.neutral[0],
     },
   },
+  activeFilter: {
+    color: Colors.neutral[0],
+    backgroundColor: Colors.neutral[80],
+  },
   savedFilter: {
     filterName: Colors.neutral[0],
     color: Colors.neutral[70],
-    backgroundColor: Colors.neutral[80],
   },
   editFilter: {
     textColor: Colors.brand[30],
@@ -1157,7 +1174,18 @@ export const darkTheme: ThemeType = {
   },
   icons: {
     ...baseTheme.icons,
-    editIcon: Colors.neutral[0],
+    editIcon: {
+      normal: Colors.neutral[50],
+      hover: Colors.neutral[30],
+      active: Colors.neutral[40],
+      border: Colors.neutral[70],
+    },
+    closeIcon: {
+      normal: Colors.neutral[50],
+      hover: Colors.neutral[30],
+      active: Colors.neutral[40],
+      border: Colors.neutral[70],
+    },
     cancelIcon: Colors.neutral[0],
     autoIcon: Colors.neutral[0],
     fileIcon: Colors.neutral[0],
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaCluster.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaCluster.tsx
index c71f2d72ec0..8a1be62228c 100644
--- a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaCluster.tsx
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaCluster.tsx
@@ -3,7 +3,7 @@ import Input from 'components/common/Input/Input';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 import { FormError, InputHint } from 'components/common/Input/Input.styled';
 import { ErrorMessage } from '@hookform/error-message';
-import CloseIcon from 'components/common/Icons/CloseIcon';
+import CloseCircleIcon from 'components/common/Icons/CloseCircleIcon';
 import { Button } from 'components/common/Button/Button';
 import PlusIcon from 'components/common/Icons/PlusIcon';
 import * as S from 'widgets/ClusterConfigForm/ClusterConfigForm.styled';
@@ -80,7 +80,7 @@ const KafkaCluster: React.FC = () => {
                 aria-label="deleteProperty"
                 onClick={() => remove(index)}
               >
-                <CloseIcon aria-hidden />
+                <CloseCircleIcon aria-hidden />
               </S.BootstrapServerActions>
             </S.BootstrapServer>
           ))}
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaConnect.tsx b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaConnect.tsx
index 4f5840ff236..e51c9d5ffcd 100644
--- a/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaConnect.tsx
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/Sections/KafkaConnect.tsx
@@ -5,7 +5,7 @@ import Input from 'components/common/Input/Input';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 import PlusIcon from 'components/common/Icons/PlusIcon';
 import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
-import CloseIcon from 'components/common/Icons/CloseIcon';
+import CloseCircleIcon from 'components/common/Icons/CloseCircleIcon';
 import {
   FlexGrow1,
   FlexRow,
@@ -66,7 +66,7 @@ const KafkaConnect = () => {
                 </FlexGrow1>
                 <S.RemoveButton onClick={() => remove(index)}>
                   <IconButtonWrapper aria-label="deleteProperty">
-                    <CloseIcon aria-hidden />
+                    <CloseCircleIcon aria-hidden />
                   </IconButtonWrapper>
                 </S.RemoveButton>
               </FlexRow>

From 71a7a1ec84442e2d797d867fa5222c5a9e2f4393 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 25 May 2023 09:36:58 +0400
Subject: [PATCH 585/734] FE: Fix permissions check for cluster edit (#3862)

---
 .../src/components/Dashboard/ClusterTableActionsCell.tsx     | 5 +++--
 kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx b/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx
index 19fefd784ce..946f8b9ddaf 100644
--- a/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/ClusterTableActionsCell.tsx
@@ -11,7 +11,8 @@ const ClusterTableActionsCell: React.FC<Props> = ({ row }) => {
   const { name } = row.original;
   const { data } = useGetUserInfo();
 
-  const isApplicationConfig = useMemo(() => {
+  const hasPermissions = useMemo(() => {
+    if (!data?.rbacEnabled) return true;
     return !!data?.userInfo?.permissions.some(
       (permission) => permission.resource === ResourceType.APPLICATIONCONFIG
     );
@@ -22,7 +23,7 @@ const ClusterTableActionsCell: React.FC<Props> = ({ row }) => {
       buttonType="secondary"
       buttonSize="S"
       to={clusterConfigPath(name)}
-      canDoAction={isApplicationConfig}
+      canDoAction={hasPermissions}
     >
       Configure
     </ActionCanButton>
diff --git a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
index d7ace183692..1fb8076fd48 100644
--- a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
+++ b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx
@@ -57,7 +57,8 @@ const Dashboard: React.FC = () => {
     return initialColumns;
   }, []);
 
-  const isApplicationConfig = useMemo(() => {
+  const hasPermissions = useMemo(() => {
+    if (!data?.rbacEnabled) return true;
     return !!data?.userInfo?.permissions.some(
       (permission) => permission.resource === ResourceType.APPLICATIONCONFIG
     );
@@ -91,7 +92,7 @@ const Dashboard: React.FC = () => {
             buttonType="primary"
             buttonSize="M"
             to={clusterNewConfigPath}
-            canDoAction={isApplicationConfig}
+            canDoAction={hasPermissions}
           >
             Configure new cluster
           </ActionCanButton>

From 80b748b02e60261fea687f63265cefdb1ce73902 Mon Sep 17 00:00:00 2001
From: seono <47937302+seono@users.noreply.github.com>
Date: Thu, 25 May 2023 20:12:59 +0900
Subject: [PATCH 586/734] BE: RBAC: Add per_page parameter (#3864)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 정선호 <seonho.jeong@navercorp.com>
Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 .../ui/service/rbac/extractor/GithubAuthorityExtractor.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
index 3cc33035e88..654654a05dd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
@@ -28,6 +28,8 @@ public class GithubAuthorityExtractor implements ProviderAuthorityExtractor {
   private static final String ORGANIZATION_NAME = "login";
   private static final String GITHUB_ACCEPT_HEADER = "application/vnd.github+json";
   private static final String DUMMY = "dummy";
+  // The number of results (max 100) per page of list organizations for authenticated user.
+  private static final Integer ORGANIZATIONS_PER_PAGE = 100;
 
   @Override
   public boolean isApplicable(String provider, Map<String, String> customParams) {
@@ -83,7 +85,9 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
 
     final Mono<List<Map<String, Object>>> userOrganizations = webClient
         .get()
-        .uri("/orgs")
+        .uri(uriBuilder -> uriBuilder.path("/orgs")
+            .queryParam("per_page", ORGANIZATIONS_PER_PAGE)
+            .build())
         .headers(headers -> {
           headers.set(HttpHeaders.ACCEPT, GITHUB_ACCEPT_HEADER);
           OAuth2UserRequest request = (OAuth2UserRequest) additionalParams.get("request");

From 004de798e47d00092a1ff7ac61e655e6596f777f Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Tue, 30 May 2023 12:00:07 +0300
Subject: [PATCH 587/734] Checking Broker's Source information (#3873)

---
 .../ui/pages/brokers/BrokersConfigTab.java    | 13 +++++++++
 .../kafka/ui/variables/Expected.java          | 15 ++++++++++
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 29 +++++++------------
 .../ui/smokesuite/brokers/BrokersTest.java    | 13 +++++++++
 4 files changed, 52 insertions(+), 18 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Expected.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
index a3756d3bdfb..11489304795 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
@@ -16,6 +16,8 @@
 
 public class BrokersConfigTab extends BasePage {
 
+  protected SelenideElement sourceInfoIcon = $x("//div[text()='Source']/..//div/div[@class]");
+  protected SelenideElement sourceInfoTooltip = $x("//div[text()='Source']/..//div/div[@style]");
   protected ElementsCollection editBtns = $$x("//button[@aria-label='editAction']");
 
   @Step
@@ -25,6 +27,17 @@ public BrokersConfigTab waitUntilScreenReady() {
     return this;
   }
 
+  @Step
+  public BrokersConfigTab hoverOnSourceInfoIcon() {
+    sourceInfoIcon.shouldBe(Condition.visible).hover();
+    return this;
+  }
+
+  @Step
+  public String getSourceInfoTooltipText() {
+    return sourceInfoTooltip.shouldBe(Condition.visible).getText().trim();
+  }
+
   @Step
   public boolean isSearchByKeyVisible() {
     return isVisible(searchFld);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Expected.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Expected.java
new file mode 100644
index 00000000000..3e5b7726116
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Expected.java
@@ -0,0 +1,15 @@
+package com.provectus.kafka.ui.variables;
+
+public interface Expected {
+
+  String BROKER_SOURCE_INFO_TOOLTIP =
+      "DYNAMIC_TOPIC_CONFIG = dynamic topic config that is configured for a specific topic\n"
+          + "DYNAMIC_BROKER_LOGGER_CONFIG = dynamic broker logger config that is configured for a specific broker\n"
+          + "DYNAMIC_BROKER_CONFIG = dynamic broker config that is configured for a specific broker\n"
+          + "DYNAMIC_DEFAULT_BROKER_CONFIG = dynamic broker config that is configured as default "
+          + "for all brokers in the cluster\n"
+          + "STATIC_BROKER_CONFIG = static broker config provided as broker properties at start up "
+          + "(e.g. server.properties file)\n"
+          + "DEFAULT_CONFIG = built-in default configuration for configs that have a default value\n"
+          + "UNKNOWN = source unknown e.g. in the ConfigEntry used for alter requests where source is not set";
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index f96be5deecc..f94d4356e98 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -15,87 +15,80 @@
 
 public class SmokeBacklog extends BaseManualTest {
 
-  @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = BROKERS_SUITE_ID)
-  @QaseId(331)
-  @Test
-  public void testCaseA() {
-  }
-
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(332)
   @Test
-  public void testCaseB() {
+  public void testCaseA() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(335)
   @Test
-  public void testCaseC() {
+  public void testCaseB() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(336)
   @Test
-  public void testCaseD() {
+  public void testCaseC() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(343)
   @Test
-  public void testCaseE() {
+  public void testCaseD() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(345)
   @Test
-  public void testCaseF() {
+  public void testCaseE() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(346)
   @Test
-  public void testCaseG() {
+  public void testCaseF() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(347)
   @Test
-  public void testCaseH() {
+  public void testCaseG() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(348)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(350)
   @Test
-  public void testCaseJ() {
+  public void testCaseI() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = TOPICS_SUITE_ID)
   @QaseId(50)
   @Test
-  public void testCaseK() {
+  public void testCaseJ() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(351)
   @Test
-  public void testCaseL() {
+  public void testCaseK() {
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
index b58e0f678c3..010ab5769a1 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.smokesuite.brokers;
 
 import static com.provectus.kafka.ui.pages.brokers.BrokersDetails.DetailsTab.CONFIGS;
+import static com.provectus.kafka.ui.variables.Expected.BROKER_SOURCE_INFO_TOOLTIP;
 
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
@@ -69,4 +70,16 @@ public void brokersConfigSearchCheck() {
             .toList().contains(anyConfigKey),
         String.format("getAllConfigs().contains(%s)", anyConfigKey));
   }
+
+  @QaseId(331)
+  @Test
+  public void brokersSourceInfoCheck() {
+    navigateToBrokersAndOpenDetails(DEFAULT_BROKER_ID);
+    brokersDetails
+        .openDetailsTab(CONFIGS);
+    String sourceInfoTooltip = brokersConfigTab
+        .hoverOnSourceInfoIcon()
+        .getSourceInfoTooltipText();
+    Assert.assertEquals(sourceInfoTooltip, BROKER_SOURCE_INFO_TOOLTIP, "brokerSourceInfoTooltip");
+  }
 }

From 61bf71f9b7a730180559cd23b321823e640bf128 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 30 May 2023 14:41:03 +0400
Subject: [PATCH 588/734] Chore: Update examples, configs (#3855)

---
 documentation/compose/DOCKER_COMPOSE.md       |   4 +-
 documentation/compose/{ => data}/message.json |   0
 documentation/compose/{ => data}/proxy.conf   |   0
 documentation/compose/e2e-tests.yaml          |   4 +-
 .../compose/kafka-cluster-sr-auth.yaml        |   4 +-
 .../compose/kafka-clusters-only.yaml          |  84 ---------
 documentation/compose/kafka-ui-arm64.yaml     |   2 +-
 .../compose/kafka-ui-connectors-auth.yaml     |   4 +-
 documentation/compose/kafka-ui.yaml           |   4 +-
 .../compose/kafka-with-zookeeper.yaml         |   2 +-
 .../compose/{auth-ldap.yaml => ldap.yaml}     |  27 ++-
 ...ui-reverse-proxy.yaml => nginx-proxy.yaml} |   2 +-
 documentation/compose/oauth-cognito.yaml      |  22 ---
 ...-traefik-proxy.yaml => traefik-proxy.yaml} |   0
 .../src/main/resources/application-gauth.yml  |  10 -
 .../src/main/resources/application-local.yml  | 178 ++++++++++++------
 .../src/main/resources/application-sdp.yml    |  13 --
 17 files changed, 145 insertions(+), 215 deletions(-)
 rename documentation/compose/{ => data}/message.json (100%)
 rename documentation/compose/{ => data}/proxy.conf (100%)
 delete mode 100644 documentation/compose/kafka-clusters-only.yaml
 rename documentation/compose/{auth-ldap.yaml => ldap.yaml} (81%)
 rename documentation/compose/{kafka-ui-reverse-proxy.yaml => nginx-proxy.yaml} (86%)
 delete mode 100644 documentation/compose/oauth-cognito.yaml
 rename documentation/compose/{kafka-ui-traefik-proxy.yaml => traefik-proxy.yaml} (100%)
 delete mode 100644 kafka-ui-api/src/main/resources/application-gauth.yml
 delete mode 100644 kafka-ui-api/src/main/resources/application-sdp.yml

diff --git a/documentation/compose/DOCKER_COMPOSE.md b/documentation/compose/DOCKER_COMPOSE.md
index 00f54101bde..1ca7de1dc0b 100644
--- a/documentation/compose/DOCKER_COMPOSE.md
+++ b/documentation/compose/DOCKER_COMPOSE.md
@@ -8,9 +8,9 @@
 6. [kafka-ui-auth-context.yaml](./kafka-ui-auth-context.yaml) - Basic (username/password) authentication with custom path (URL) (issue 861).
 7. [e2e-tests.yaml](./e2e-tests.yaml) - Configuration with different connectors (github-source, s3, sink-activities, source-activities) and Ksql functionality.
 8. [kafka-ui-jmx-secured.yml](./kafka-ui-jmx-secured.yml) - Kafka’s JMX with SSL and authentication.
-9. [kafka-ui-reverse-proxy.yaml](./kafka-ui-reverse-proxy.yaml) - An example for using the app behind a proxy (like nginx).
+9. [kafka-ui-reverse-proxy.yaml](./nginx-proxy.yaml) - An example for using the app behind a proxy (like nginx).
 10. [kafka-ui-sasl.yaml](./kafka-ui-sasl.yaml) - SASL auth for Kafka.
-11. [kafka-ui-traefik-proxy.yaml](./kafka-ui-traefik-proxy.yaml) - Traefik specific proxy configuration.
+11. [kafka-ui-traefik-proxy.yaml](./traefik-proxy.yaml) - Traefik specific proxy configuration.
 12. [oauth-cognito.yaml](./oauth-cognito.yaml) - OAuth2 with Cognito
 13. [kafka-ui-with-jmx-exporter.yaml](./kafka-ui-with-jmx-exporter.yaml) - A configuration with 2 kafka clusters with enabled prometheus jmx exporters instead of jmx.
 14. [kafka-with-zookeeper.yaml](./kafka-with-zookeeper.yaml) - An example for using kafka with zookeeper
\ No newline at end of file
diff --git a/documentation/compose/message.json b/documentation/compose/data/message.json
similarity index 100%
rename from documentation/compose/message.json
rename to documentation/compose/data/message.json
diff --git a/documentation/compose/proxy.conf b/documentation/compose/data/proxy.conf
similarity index 100%
rename from documentation/compose/proxy.conf
rename to documentation/compose/data/proxy.conf
diff --git a/documentation/compose/e2e-tests.yaml b/documentation/compose/e2e-tests.yaml
index ae56f5d5768..3685d48c238 100644
--- a/documentation/compose/e2e-tests.yaml
+++ b/documentation/compose/e2e-tests.yaml
@@ -124,7 +124,7 @@ services:
   kafka-init-topics:
     image: confluentinc/cp-kafka:7.2.1
     volumes:
-      - ./message.json:/data/message.json
+      - ./data/message.json:/data/message.json
     depends_on:
       kafka0:
         condition: service_healthy
@@ -187,4 +187,4 @@ services:
       KSQL_KSQL_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
       KSQL_KSQL_SERVICE_ID: my_ksql_1
       KSQL_KSQL_HIDDEN_TOPICS: '^_.*'
-      KSQL_CACHE_MAX_BYTES_BUFFERING: 0
\ No newline at end of file
+      KSQL_CACHE_MAX_BYTES_BUFFERING: 0
diff --git a/documentation/compose/kafka-cluster-sr-auth.yaml b/documentation/compose/kafka-cluster-sr-auth.yaml
index bf52f33d889..09403cef27a 100644
--- a/documentation/compose/kafka-cluster-sr-auth.yaml
+++ b/documentation/compose/kafka-cluster-sr-auth.yaml
@@ -57,7 +57,7 @@ services:
   kafka-init-topics:
     image: confluentinc/cp-kafka:7.2.1
     volumes:
-       - ./message.json:/data/message.json
+       - ./data/message.json:/data/message.json
     depends_on:
       - kafka1
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
@@ -80,4 +80,4 @@ services:
       KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry1:8085
       KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_USERNAME: admin
-      KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_PASSWORD: letmein
\ No newline at end of file
+      KAFKA_CLUSTERS_0_SCHEMAREGISTRYAUTH_PASSWORD: letmein
diff --git a/documentation/compose/kafka-clusters-only.yaml b/documentation/compose/kafka-clusters-only.yaml
deleted file mode 100644
index b6a84ee92b2..00000000000
--- a/documentation/compose/kafka-clusters-only.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-version: "2"
-services:
-  kafka0:
-    image: confluentinc/cp-kafka:7.2.1
-    hostname: kafka0
-    container_name: kafka0
-    ports:
-      - "9092:9092"
-      - "9997:9997"
-    environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT"
-      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka0:29092,PLAINTEXT_HOST://localhost:9092"
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
-      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
-      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
-      KAFKA_JMX_PORT: 9997
-      KAFKA_JMX_HOSTNAME: localhost
-      KAFKA_PROCESS_ROLES: "broker,controller"
-      KAFKA_NODE_ID: 1
-      KAFKA_CONTROLLER_QUORUM_VOTERS: "1@kafka0:29093"
-      KAFKA_LISTENERS: "PLAINTEXT://kafka0:29092,CONTROLLER://kafka0:29093,PLAINTEXT_HOST://0.0.0.0:9092"
-      KAFKA_INTER_BROKER_LISTENER_NAME: "PLAINTEXT"
-      KAFKA_CONTROLLER_LISTENER_NAMES: "CONTROLLER"
-      KAFKA_LOG_DIRS: "/tmp/kraft-combined-logs"
-    volumes:
-      - ./scripts/update_run_cluster.sh:/tmp/update_run.sh
-      - ./scripts/clusterID:/tmp/clusterID
-    command: 'bash -c ''if [ ! -f /tmp/update_run.sh ]; then echo "ERROR: Did you forget the update_run.sh file that came with this docker-compose.yml file?" && exit 1 ; else /tmp/update_run.sh && /etc/confluent/docker/run ; fi'''
-
-  schemaregistry0:
-    image: confluentinc/cp-schema-registry:7.2.1
-    depends_on:
-      - kafka0
-    environment:
-      SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: PLAINTEXT://kafka0:29092
-      SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: PLAINTEXT
-      SCHEMA_REGISTRY_HOST_NAME: schemaregistry0
-      SCHEMA_REGISTRY_LISTENERS: http://schemaregistry0:8085
-
-      SCHEMA_REGISTRY_SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: "http"
-      SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
-      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
-    ports:
-      - 8085:8085
-
-  kafka-connect0:
-    image: confluentinc/cp-kafka-connect:7.2.1
-    ports:
-      - 8083:8083
-    depends_on:
-      - kafka0
-      - schemaregistry0
-    environment:
-      CONNECT_BOOTSTRAP_SERVERS: kafka0:29092
-      CONNECT_GROUP_ID: compose-connect-group
-      CONNECT_CONFIG_STORAGE_TOPIC: _connect_configs
-      CONNECT_CONFIG_STORAGE_REPLICATION_FACTOR: 1
-      CONNECT_OFFSET_STORAGE_TOPIC: _connect_offset
-      CONNECT_OFFSET_STORAGE_REPLICATION_FACTOR: 1
-      CONNECT_STATUS_STORAGE_TOPIC: _connect_status
-      CONNECT_STATUS_STORAGE_REPLICATION_FACTOR: 1
-      CONNECT_KEY_CONVERTER: org.apache.kafka.connect.storage.StringConverter
-      CONNECT_KEY_CONVERTER_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
-      CONNECT_VALUE_CONVERTER: org.apache.kafka.connect.storage.StringConverter
-      CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL: http://schemaregistry0:8085
-      CONNECT_INTERNAL_KEY_CONVERTER: org.apache.kafka.connect.json.JsonConverter
-      CONNECT_INTERNAL_VALUE_CONVERTER: org.apache.kafka.connect.json.JsonConverter
-      CONNECT_REST_ADVERTISED_HOST_NAME: kafka-connect0
-      CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components"
-
-  kafka-init-topics:
-    image: confluentinc/cp-kafka:7.2.1
-    volumes:
-      - ./message.json:/data/message.json
-    depends_on:
-      - kafka0
-    command: "bash -c 'echo Waiting for Kafka to be ready... && \
-      cub kafka-ready -b kafka0:29092 1 30 && \
-      kafka-topics --create --topic users --partitions 3 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
-      kafka-topics --create --topic messages --partitions 2 --replication-factor 1 --if-not-exists --bootstrap-server kafka0:29092 && \
-      kafka-console-producer --bootstrap-server kafka0:29092 --topic users < /data/message.json'"
diff --git a/documentation/compose/kafka-ui-arm64.yaml b/documentation/compose/kafka-ui-arm64.yaml
index 87a892cc700..ad2ae421990 100644
--- a/documentation/compose/kafka-ui-arm64.yaml
+++ b/documentation/compose/kafka-ui-arm64.yaml
@@ -93,7 +93,7 @@ services:
   kafka-init-topics:
     image: confluentinc/cp-kafka:7.2.1.arm64
     volumes:
-       - ./message.json:/data/message.json
+       - ./data/message.json:/data/message.json
     depends_on:
       - kafka0
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
diff --git a/documentation/compose/kafka-ui-connectors-auth.yaml b/documentation/compose/kafka-ui-connectors-auth.yaml
index b34c9d80864..d1f31f79696 100644
--- a/documentation/compose/kafka-ui-connectors-auth.yaml
+++ b/documentation/compose/kafka-ui-connectors-auth.yaml
@@ -69,7 +69,7 @@ services:
     build:
       context: ./kafka-connect
       args:
-        image: confluentinc/cp-kafka-connect:6.0.1
+        image: confluentinc/cp-kafka-connect:7.2.1
     ports:
       - 8083:8083
     depends_on:
@@ -104,7 +104,7 @@ services:
   kafka-init-topics:
     image: confluentinc/cp-kafka:7.2.1
     volumes:
-      - ./message.json:/data/message.json
+      - ./data/message.json:/data/message.json
     depends_on:
       - kafka0
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
diff --git a/documentation/compose/kafka-ui.yaml b/documentation/compose/kafka-ui.yaml
index 8524f6fa2ba..14a269ca7cb 100644
--- a/documentation/compose/kafka-ui.yaml
+++ b/documentation/compose/kafka-ui.yaml
@@ -115,7 +115,7 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
 
   kafka-connect0:
-    image: confluentinc/cp-kafka-connect:6.0.1
+    image: confluentinc/cp-kafka-connect:7.2.1
     ports:
       - 8083:8083
     depends_on:
@@ -142,7 +142,7 @@ services:
   kafka-init-topics:
     image: confluentinc/cp-kafka:7.2.1
     volumes:
-       - ./message.json:/data/message.json
+       - ./data/message.json:/data/message.json
     depends_on:
       - kafka1
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
diff --git a/documentation/compose/kafka-with-zookeeper.yaml b/documentation/compose/kafka-with-zookeeper.yaml
index 30e6f17eafd..7342a976314 100644
--- a/documentation/compose/kafka-with-zookeeper.yaml
+++ b/documentation/compose/kafka-with-zookeeper.yaml
@@ -38,7 +38,7 @@ services:
   kafka-init-topics:
     image: confluentinc/cp-kafka:7.2.1
     volumes:
-       - ./message.json:/data/message.json
+       - ./data/message.json:/data/message.json
     depends_on:
       - kafka
     command: "bash -c 'echo Waiting for Kafka to be ready... && \
diff --git a/documentation/compose/auth-ldap.yaml b/documentation/compose/ldap.yaml
similarity index 81%
rename from documentation/compose/auth-ldap.yaml
rename to documentation/compose/ldap.yaml
index 0e2f6337d8f..e4ff68f3ba0 100644
--- a/documentation/compose/auth-ldap.yaml
+++ b/documentation/compose/ldap.yaml
@@ -15,26 +15,23 @@ services:
       KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
       KAFKA_CLUSTERS_0_METRICS_PORT: 9997
       KAFKA_CLUSTERS_0_SCHEMAREGISTRY: http://schemaregistry0:8085
+
       AUTH_TYPE: "LDAP"
       SPRING_LDAP_URLS: "ldap://ldap:10389"
-      SPRING_LDAP_DN_PATTERN: "cn={0},ou=people,dc=planetexpress,dc=com"
-
-#     ===== USER SEARCH FILTER INSTEAD OF DN =====
-
-#     SPRING_LDAP_USERFILTER_SEARCHBASE: "dc=planetexpress,dc=com"
-#     SPRING_LDAP_USERFILTER_SEARCHFILTER: "(&(uid={0})(objectClass=inetOrgPerson))"
-#     LDAP ADMIN USER
-#     SPRING_LDAP_ADMINUSER: "cn=admin,dc=planetexpress,dc=com"
-#     SPRING_LDAP_ADMINPASSWORD: "GoodNewsEveryone"
-
-#     ===== ACTIVE DIRECTORY =====
-
-#      OAUTH2.LDAP.ACTIVEDIRECTORY: true
-#      OAUTH2.LDAP.AСTIVEDIRECTORY.DOMAIN: "memelord.lol"
+      SPRING_LDAP_BASE: "cn={0},ou=people,dc=planetexpress,dc=com"
+      SPRING_LDAP_ADMIN_USER: "cn=admin,dc=planetexpress,dc=com"
+      SPRING_LDAP_ADMIN_PASSWORD: "GoodNewsEveryone"
+      SPRING_LDAP_USER_FILTER_SEARCH_BASE: "dc=planetexpress,dc=com"
+      SPRING_LDAP_USER_FILTER_SEARCH_FILTER: "(&(uid={0})(objectClass=inetOrgPerson))"
+      SPRING_LDAP_GROUP_FILTER_SEARCH_BASE: "ou=people,dc=planetexpress,dc=com"
+#     OAUTH2.LDAP.ACTIVEDIRECTORY: true
+#     OAUTH2.LDAP.AСTIVEDIRECTORY.DOMAIN: "memelord.lol"
 
   ldap:
     image: rroemhild/test-openldap:latest
     hostname: "ldap"
+    ports:
+      - 10389:10389
 
   kafka0:
     image: confluentinc/cp-kafka:7.2.1
@@ -79,4 +76,4 @@ services:
 
       SCHEMA_REGISTRY_SCHEMA_REGISTRY_INTER_INSTANCE_PROTOCOL: "http"
       SCHEMA_REGISTRY_LOG4J_ROOT_LOGLEVEL: INFO
-      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
\ No newline at end of file
+      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
diff --git a/documentation/compose/kafka-ui-reverse-proxy.yaml b/documentation/compose/nginx-proxy.yaml
similarity index 86%
rename from documentation/compose/kafka-ui-reverse-proxy.yaml
rename to documentation/compose/nginx-proxy.yaml
index 69d94e627a6..9a255a5eb9e 100644
--- a/documentation/compose/kafka-ui-reverse-proxy.yaml
+++ b/documentation/compose/nginx-proxy.yaml
@@ -4,7 +4,7 @@ services:
   nginx:
     image: nginx:latest
     volumes:
-      - ./proxy.conf:/etc/nginx/conf.d/default.conf
+      - ./data/proxy.conf:/etc/nginx/conf.d/default.conf
     ports:
       - 8080:80
 
diff --git a/documentation/compose/oauth-cognito.yaml b/documentation/compose/oauth-cognito.yaml
deleted file mode 100644
index a905c9c2ee5..00000000000
--- a/documentation/compose/oauth-cognito.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-version: '3.4'
-services:
-
-  kafka-ui:
-    container_name: kafka-ui
-    image: provectuslabs/kafka-ui:local
-    ports:
-      - 8080:8080
-    depends_on:
-      - kafka0 # OMITTED, TAKE UP AN EXAMPLE FROM OTHER COMPOSE FILES
-    environment:
-      KAFKA_CLUSTERS_0_NAME: local
-      KAFKA_CLUSTERS_0_PROPERTIES_SECURITY_PROTOCOL: SSL
-      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka0:29092
-      AUTH_TYPE: OAUTH2_COGNITO
-      AUTH_COGNITO_ISSUER_URI: "https://cognito-idp.eu-central-1.amazonaws.com/eu-central-xxxxxx"
-      AUTH_COGNITO_CLIENT_ID: ""
-      AUTH_COGNITO_CLIENT_SECRET: ""
-      AUTH_COGNITO_SCOPE: "openid"
-      AUTH_COGNITO_USER_NAME_ATTRIBUTE: "username"
-      AUTH_COGNITO_LOGOUT_URI: "https://<domain>.auth.eu-central-1.amazoncognito.com/logout"
\ No newline at end of file
diff --git a/documentation/compose/kafka-ui-traefik-proxy.yaml b/documentation/compose/traefik-proxy.yaml
similarity index 100%
rename from documentation/compose/kafka-ui-traefik-proxy.yaml
rename to documentation/compose/traefik-proxy.yaml
diff --git a/kafka-ui-api/src/main/resources/application-gauth.yml b/kafka-ui-api/src/main/resources/application-gauth.yml
deleted file mode 100644
index 877d773fcfe..00000000000
--- a/kafka-ui-api/src/main/resources/application-gauth.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-auth:
-  type: OAUTH2
-spring:
-  security:
-    oauth2:
-      client:
-        registration:
-          google:
-            client-id: [put your client id here]
-            client-secret: [put your client secret here]
diff --git a/kafka-ui-api/src/main/resources/application-local.yml b/kafka-ui-api/src/main/resources/application-local.yml
index 5e8fa18f407..2317fc23f9a 100644
--- a/kafka-ui-api/src/main/resources/application-local.yml
+++ b/kafka-ui-api/src/main/resources/application-local.yml
@@ -5,15 +5,27 @@ logging:
     #org.springframework.http.codec.json.Jackson2JsonEncoder: DEBUG
     #org.springframework.http.codec.json.Jackson2JsonDecoder: DEBUG
     reactor.netty.http.server.AccessLog: INFO
+    org.springframework.security: DEBUG
 
 #server:
 #  port: 8080 #- Port in which kafka-ui will run.
 
+spring:
+  jmx:
+    enabled: true
+  ldap:
+    urls: ldap://localhost:10389
+    base: "cn={0},ou=people,dc=planetexpress,dc=com"
+    admin-user: "cn=admin,dc=planetexpress,dc=com"
+    admin-password: "GoodNewsEveryone"
+    user-filter-search-base: "dc=planetexpress,dc=com"
+    user-filter-search-filter: "(&(uid={0})(objectClass=inetOrgPerson))"
+    group-filter-search-base: "ou=people,dc=planetexpress,dc=com"
+
 kafka:
   clusters:
     - name: local
       bootstrapServers: localhost:9092
-      zookeeper: localhost:2181
       schemaRegistry: http://localhost:8085
       ksqldbServer: http://localhost:8088
       kafkaConnect:
@@ -22,63 +34,113 @@ kafka:
       metrics:
         port: 9997
         type: JMX
-  #    -
-  #      name: secondLocal
-  #      bootstrapServers: localhost:9093
-  #      zookeeper: localhost:2182
-  #      schemaRegistry: http://localhost:18085
-  #      kafkaConnect:
-  #        - name: first
-  #          address: http://localhost:8083
-  #      metrics:
-  #        port: 9998
-  #        type: JMX
-  #      read-only: true
-  #    -
-  #      name: localUsingProtobufFile
-  #      bootstrapServers: localhost:9092
-  #      protobufFile: messages.proto
-  #      protobufMessageName: GenericMessage
-  #      protobufMessageNameByTopic:
-  #        input-topic: InputMessage
-  #        output-topic: OutputMessage
-spring:
-  jmx:
-    enabled: true
+
+dynamic.config.enabled: true
+
+oauth2:
+  ldap:
+    activeDirectory: false
+    aсtiveDirectory.domain: domain.com
 
 auth:
   type: DISABLED
-#  type: OAUTH2
-#  oauth2:
-#    client:
-#      cognito:
-#        clientId:
-#        clientSecret:
-#        scope: openid
-#        client-name: cognito
-#        provider: cognito
-#        redirect-uri: http://localhost:8080/login/oauth2/code/cognito
-#        authorization-grant-type: authorization_code
-#        issuer-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj
-#        jwk-set-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj/.well-known/jwks.json
-#        user-name-attribute: username
-#        custom-params:
-#          type: cognito
-#          logoutUrl: https://kafka-ui.auth.eu-central-1.amazoncognito.com/logout
-#      google:
-#        provider: google
-#        clientId:
-#        clientSecret:
-#        user-name-attribute: email
-#        custom-params:
-#          type: google
-#          allowedDomain: provectus.com
-#      github:
-#        provider: github
-#        clientId:
-#        clientSecret:
-#        scope:
-#          - read:org
-#        user-name-attribute: login
-#        custom-params:
-#          type: github
+  #  type: OAUTH2
+  #  type: LDAP
+  oauth2:
+    client:
+      cognito:
+        clientId: # CLIENT ID
+        clientSecret: # CLIENT SECRET
+        scope: openid
+        client-name: cognito
+        provider: cognito
+        redirect-uri: http://localhost:8080/login/oauth2/code/cognito
+        authorization-grant-type: authorization_code
+        issuer-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj
+        jwk-set-uri: https://cognito-idp.eu-central-1.amazonaws.com/eu-central-1_M7cIUn1nj/.well-known/jwks.json
+        user-name-attribute: cognito:username
+        custom-params:
+          type: cognito
+          logoutUrl: https://kafka-ui.auth.eu-central-1.amazoncognito.com/logout
+      google:
+        provider: google
+        clientId: # CLIENT ID
+        clientSecret: # CLIENT SECRET
+        user-name-attribute: email
+        custom-params:
+          type: google
+          allowedDomain: provectus.com
+      github:
+        provider: github
+        clientId: # CLIENT ID
+        clientSecret: # CLIENT SECRET
+        scope:
+          - read:org
+        user-name-attribute: login
+        custom-params:
+          type: github
+
+rbac:
+  roles:
+    - name: "memelords"
+      clusters:
+        - local
+      subjects:
+        - provider: oauth_google
+          type: domain
+          value: "provectus.com"
+        - provider: oauth_google
+          type: user
+          value: "name@provectus.com"
+
+        - provider: oauth_github
+          type: organization
+          value: "provectus"
+        - provider: oauth_github
+          type: user
+          value: "memelord"
+
+        - provider: oauth_cognito
+          type: user
+          value: "username"
+        - provider: oauth_cognito
+          type: group
+          value: "memelords"
+
+        - provider: ldap
+          type: group
+          value: "admin_staff"
+
+        # NOT IMPLEMENTED YET
+      #        - provider: ldap_ad
+      #          type: group
+      #          value: "admin_staff"
+
+      permissions:
+        - resource: applicationconfig
+          actions: all
+
+        - resource: clusterconfig
+          actions: all
+
+        - resource: topic
+          value: ".*"
+          actions: all
+
+        - resource: consumer
+          value: ".*"
+          actions: all
+
+        - resource: schema
+          value: ".*"
+          actions: all
+
+        - resource: connect
+          value: "*"
+          actions: all
+
+        - resource: ksql
+          actions: all
+
+        - resource: acl
+          actions: all
diff --git a/kafka-ui-api/src/main/resources/application-sdp.yml b/kafka-ui-api/src/main/resources/application-sdp.yml
deleted file mode 100644
index f8d4445fedb..00000000000
--- a/kafka-ui-api/src/main/resources/application-sdp.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-kafka:
-  clusters:
-    - name: local
-      bootstrapServers: b-1.kad-msk.57w67o.c6.kafka.eu-central-1.amazonaws.com:9094
-      properties:
-        security.protocol: SSL
-#      zookeeper: localhost:2181
-#      schemaRegistry: http://kad-ecs-application-lb-857515197.eu-west-1.elb.amazonaws.com:9000/api/schema-registry
-  #    -
-  #      name: secondLocal
-  #      zookeeper: zookeeper1:2181
-  #      bootstrapServers: kafka1:29092
-  #      schemaRegistry: http://schemaregistry1:8085

From f19abb203624fbb30820605200e321745f869a0e Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 30 May 2023 16:27:18 +0400
Subject: [PATCH 589/734] BE: Make webclients use system proxy (#3881)

Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 .../com/provectus/kafka/ui/util/GithubReleaseInfo.java |  3 +--
 .../provectus/kafka/ui/util/WebClientConfigurator.java | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/GithubReleaseInfo.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/GithubReleaseInfo.java
index 2ad0c9c399b..26afaa82a2e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/GithubReleaseInfo.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/GithubReleaseInfo.java
@@ -3,7 +3,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import java.time.Duration;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
 @Slf4j
@@ -31,7 +30,7 @@ public GithubReleaseInfo() {
 
   @VisibleForTesting
   GithubReleaseInfo(String url) {
-    this.refreshMono = WebClient.create()
+    this.refreshMono = new WebClientConfigurator().build()
         .get()
         .uri(url)
         .exchangeToMono(resp -> resp.bodyToMono(GithubReleaseDto.class))
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
index fe2240bd6aa..e0815828e23 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
@@ -5,11 +5,8 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.exception.ValidationException;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.handler.ssl.JdkSslContext;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.SslProvider;
 import java.io.FileInputStream;
 import java.security.KeyStore;
 import java.util.function.Consumer;
@@ -93,7 +90,12 @@ private WebClientConfigurator configureSsl(
     // Create webclient
     SslContext context = contextBuilder.build();
 
-    builder.clientConnector(new ReactorClientHttpConnector(HttpClient.create().secure(t -> t.sslContext(context))));
+    var httpClient = HttpClient
+        .create()
+        .secure(t -> t.sslContext(context))
+        .proxyWithSystemProperties();
+
+    builder.clientConnector(new ReactorClientHttpConnector(httpClient));
     return this;
   }
 

From 7e47906d88d58a07f32b43f8d8bde3c19faa4dd0 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 31 May 2023 10:58:12 +0400
Subject: [PATCH 590/734] Minor serdes fixes (#3857)

1. wrapping all serde methods with Exception catching to prevent serde list generation failure
2. for SR serde checking if schema exists by id added
---
 .../kafka/ui/serdes/SerdeInstance.java        | 28 ++++++--
 .../builtin/sr/SchemaRegistrySerde.java       | 70 +++++++++----------
 2 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
index e047e8466c6..2826f89aa97 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdeInstance.java
@@ -42,19 +42,39 @@ private <T> T wrapWithClassloader(Supplier<T> call) {
   }
 
   public Optional<SchemaDescription> getSchema(String topic, Serde.Target type) {
-    return wrapWithClassloader(() -> serde.getSchema(topic, type));
+    try {
+      return wrapWithClassloader(() -> serde.getSchema(topic, type));
+    } catch (Exception e) {
+      log.warn("Error getting schema for '{}'({}) with serde '{}'", topic, type, name, e);
+      return Optional.empty();
+    }
   }
 
   public Optional<String> description() {
-    return wrapWithClassloader(serde::getDescription);
+    try {
+      return wrapWithClassloader(serde::getDescription);
+    } catch (Exception e) {
+      log.warn("Error getting description serde '{}'", name, e);
+      return Optional.empty();
+    }
   }
 
   public boolean canSerialize(String topic, Serde.Target type) {
-    return wrapWithClassloader(() -> serde.canSerialize(topic, type));
+    try {
+      return wrapWithClassloader(() -> serde.canSerialize(topic, type));
+    } catch (Exception e) {
+      log.warn("Error calling canSerialize for '{}'({}) with serde '{}'", topic, type, name, e);
+      return false;
+    }
   }
 
   public boolean canDeserialize(String topic, Serde.Target type) {
-    return wrapWithClassloader(() -> serde.canDeserialize(topic, type));
+    try {
+      return wrapWithClassloader(() -> serde.canDeserialize(topic, type));
+    } catch (Exception e) {
+      log.warn("Error calling canDeserialize for '{}'({}) with serde '{}'", topic, type, name, e);
+      return false;
+    }
   }
 
   public Serde.Serializer serializer(String topic, Serde.Target type) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index fd5985e20c4..c1fb203691c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -189,39 +189,40 @@ public boolean canSerialize(String topic, Target type) {
   public Optional<SchemaDescription> getSchema(String topic, Target type) {
     String subject = schemaSubject(topic, type);
     return getSchemaBySubject(subject)
-        .map(schemaMetadata ->
-            new SchemaDescription(
-                convertSchema(schemaMetadata),
-                Map.of(
-                    "subject", subject,
-                    "schemaId", schemaMetadata.getId(),
-                    "latestVersion", schemaMetadata.getVersion(),
-                    "type", schemaMetadata.getSchemaType() // AVRO / PROTOBUF / JSON
-                )
-            ));
+        .flatMap(schemaMetadata ->
+            //schema can be not-found, when schema contexts configured improperly
+            getSchemaById(schemaMetadata.getId())
+                .map(parsedSchema ->
+                    new SchemaDescription(
+                        convertSchema(schemaMetadata, parsedSchema),
+                        Map.of(
+                            "subject", subject,
+                            "schemaId", schemaMetadata.getId(),
+                            "latestVersion", schemaMetadata.getVersion(),
+                            "type", schemaMetadata.getSchemaType() // AVRO / PROTOBUF / JSON
+                        )
+                    )));
   }
 
   @SneakyThrows
-  private String convertSchema(SchemaMetadata schema) {
+  private String convertSchema(SchemaMetadata schema, ParsedSchema parsedSchema) {
     URI basePath = new URI(schemaRegistryUrls.get(0))
         .resolve(Integer.toString(schema.getId()));
-    ParsedSchema schemaById = schemaRegistryClient.getSchemaById(schema.getId());
     SchemaType schemaType = SchemaType.fromString(schema.getSchemaType())
         .orElseThrow(() -> new IllegalStateException("Unknown schema type: " + schema.getSchemaType()));
-    switch (schemaType) {
-      case PROTOBUF:
-        return new ProtobufSchemaConverter()
-            .convert(basePath, ((ProtobufSchema) schemaById).toDescriptor())
-            .toJson();
-      case AVRO:
-        return new AvroJsonSchemaConverter()
-            .convert(basePath, ((AvroSchema) schemaById).rawSchema())
-            .toJson();
-      case JSON:
-        return schema.getSchema();
-      default:
-        throw new IllegalStateException();
-    }
+    return switch (schemaType) {
+      case PROTOBUF -> new ProtobufSchemaConverter()
+          .convert(basePath, ((ProtobufSchema) parsedSchema).toDescriptor())
+          .toJson();
+      case AVRO -> new AvroJsonSchemaConverter()
+          .convert(basePath, ((AvroSchema) parsedSchema).rawSchema())
+          .toJson();
+      case JSON -> schema.getSchema();
+    };
+  }
+
+  private Optional<ParsedSchema> getSchemaById(int id) {
+    return wrapWith404Handler(() -> schemaRegistryClient.getSchemaById(id));
   }
 
   private Optional<SchemaMetadata> getSchemaBySubject(String subject) {
@@ -253,16 +254,11 @@ public Serializer serializer(String topic, Target type) {
     boolean isKey = type == Target.KEY;
     SchemaType schemaType = SchemaType.fromString(schema.getSchemaType())
         .orElseThrow(() -> new IllegalStateException("Unknown schema type: " + schema.getSchemaType()));
-    switch (schemaType) {
-      case PROTOBUF:
-        return new ProtobufSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
-      case AVRO:
-        return new AvroSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
-      case JSON:
-        return new JsonSchemaSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
-      default:
-        throw new IllegalStateException();
-    }
+    return switch (schemaType) {
+      case PROTOBUF -> new ProtobufSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
+      case AVRO -> new AvroSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
+      case JSON -> new JsonSchemaSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
+    };
   }
 
   @Override
@@ -297,7 +293,7 @@ public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
   }
 
   private SchemaType getMessageFormatBySchemaId(int schemaId) {
-    return wrapWith404Handler(() -> schemaRegistryClient.getSchemaById(schemaId))
+    return getSchemaById(schemaId)
         .map(ParsedSchema::schemaType)
         .flatMap(SchemaType::fromString)
         .orElseThrow(() -> new ValidationException(String.format("Schema for id '%d' not found ", schemaId)));

From 29d91bca4b8c313e23278e126dad1020a87386e0 Mon Sep 17 00:00:00 2001
From: Sukanth Gunda <contact.sukanth@gmail.com>
Date: Wed, 31 May 2023 10:50:40 -0500
Subject: [PATCH 591/734] FE: Rename "messages behind" to "consumer lag"
 (#3826)

---
 .../kafka/ui/mapper/ConsumerGroupMapper.java       |  6 +++---
 .../kafka/ui/model/InternalConsumerGroup.java      | 14 +++++++-------
 .../kafka/ui/model/InternalTopicConsumerGroup.java |  8 ++++----
 .../kafka/ui/service/ConsumerGroupService.java     |  2 +-
 .../src/main/resources/swagger/kafka-ui-api.yaml   |  4 ++--
 .../components/ConsumerGroups/Details/Details.tsx  |  4 ++--
 .../components/ConsumerGroups/Details/ListItem.tsx |  6 +++---
 .../Details/TopicContents/TopicContents.tsx        |  6 +++---
 .../src/components/ConsumerGroups/List.tsx         |  4 ++--
 .../Topic/ConsumerGroups/TopicConsumerGroups.tsx   |  4 ++--
 .../src/lib/fixtures/consumerGroups.ts             | 10 +++++-----
 kafka-ui-react-app/src/lib/fixtures/topics.ts      |  4 ++--
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
index 4ebbf4c70f5..8a664882049 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ConsumerGroupMapper.java
@@ -28,7 +28,7 @@ public static ConsumerGroupDTO toDto(InternalTopicConsumerGroup c) {
     consumerGroup.setTopics(1); //for ui backward-compatibility, need to rm usage from ui
     consumerGroup.setGroupId(c.getGroupId());
     consumerGroup.setMembers(c.getMembers());
-    consumerGroup.setMessagesBehind(c.getMessagesBehind());
+    consumerGroup.setConsumerLag(c.getConsumerLag());
     consumerGroup.setSimple(c.isSimple());
     consumerGroup.setPartitionAssignor(c.getPartitionAssignor());
     consumerGroup.setState(mapConsumerGroupState(c.getState()));
@@ -54,7 +54,7 @@ public static ConsumerGroupDetailsDTO toDetailsDto(InternalConsumerGroup g) {
           .orElse(0L);
 
       partition.setEndOffset(endOffset.orElse(0L));
-      partition.setMessagesBehind(behind);
+      partition.setConsumerLag(behind);
 
       partitionMap.put(entry.getKey(), partition);
     }
@@ -80,7 +80,7 @@ private static <T extends ConsumerGroupDTO> T convertToConsumerGroup(
       InternalConsumerGroup c, T consumerGroup) {
     consumerGroup.setGroupId(c.getGroupId());
     consumerGroup.setMembers(c.getMembers().size());
-    consumerGroup.setMessagesBehind(c.getMessagesBehind());
+    consumerGroup.setConsumerLag(c.getConsumerLag());
     consumerGroup.setTopics(c.getTopicNum());
     consumerGroup.setSimple(c.isSimple());
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
index cd916a7ec82..97cbfe4868c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalConsumerGroup.java
@@ -21,7 +21,7 @@ public class InternalConsumerGroup {
   private final Collection<InternalMember> members;
   private final Map<TopicPartition, Long> offsets;
   private final Map<TopicPartition, Long> endOffsets;
-  private final Long messagesBehind;
+  private final Long consumerLag;
   private final Integer topicNum;
   private final String partitionAssignor;
   private final ConsumerGroupState state;
@@ -50,17 +50,17 @@ public static InternalConsumerGroup create(
     builder.members(internalMembers);
     builder.offsets(groupOffsets);
     builder.endOffsets(topicEndOffsets);
-    builder.messagesBehind(calculateMessagesBehind(groupOffsets, topicEndOffsets));
+    builder.consumerLag(calculateConsumerLag(groupOffsets, topicEndOffsets));
     builder.topicNum(calculateTopicNum(groupOffsets, internalMembers));
     Optional.ofNullable(description.coordinator()).ifPresent(builder::coordinator);
     return builder.build();
   }
 
-  private static Long calculateMessagesBehind(Map<TopicPartition, Long> offsets, Map<TopicPartition, Long> endOffsets) {
-    Long messagesBehind = null;
-    // messagesBehind should be undefined if no committed offsets found for topic
+  private static Long calculateConsumerLag(Map<TopicPartition, Long> offsets, Map<TopicPartition, Long> endOffsets) {
+    Long consumerLag = null;
+    // consumerLag should be undefined if no committed offsets found for topic
     if (!offsets.isEmpty()) {
-      messagesBehind = offsets.entrySet().stream()
+      consumerLag = offsets.entrySet().stream()
           .mapToLong(e ->
               Optional.ofNullable(endOffsets)
                   .map(o -> o.get(e.getKey()))
@@ -69,7 +69,7 @@ private static Long calculateMessagesBehind(Map<TopicPartition, Long> offsets, M
           ).sum();
     }
 
-    return messagesBehind;
+    return consumerLag;
   }
 
   private static Integer calculateTopicNum(Map<TopicPartition, Long> offsets, Collection<InternalMember> members) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConsumerGroup.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConsumerGroup.java
index 82e455ac582..529c1b954c9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConsumerGroup.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalTopicConsumerGroup.java
@@ -17,7 +17,7 @@ public class InternalTopicConsumerGroup {
   String groupId;
   int members;
   @Nullable
-  Long messagesBehind; //null means no committed offsets found for this group
+  Long consumerLag; //null means no committed offsets found for this group
   boolean isSimple;
   String partitionAssignor;
   ConsumerGroupState state;
@@ -37,7 +37,7 @@ public static InternalTopicConsumerGroup create(
                 .filter(m -> m.assignment().topicPartitions().stream().anyMatch(p -> p.topic().equals(topic)))
                 .count()
         )
-        .messagesBehind(calculateMessagesBehind(committedOffsets, endOffsets))
+        .consumerLag(calculateConsumerLag(committedOffsets, endOffsets))
         .isSimple(g.isSimpleConsumerGroup())
         .partitionAssignor(g.partitionAssignor())
         .state(g.state())
@@ -46,8 +46,8 @@ public static InternalTopicConsumerGroup create(
   }
 
   @Nullable
-  private static Long calculateMessagesBehind(Map<TopicPartition, Long> committedOffsets,
-                                              Map<TopicPartition, Long> endOffsets) {
+  private static Long calculateConsumerLag(Map<TopicPartition, Long> committedOffsets,
+                                           Map<TopicPartition, Long> endOffsets) {
     if (committedOffsets.isEmpty()) {
       return null;
     }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index 815fdbef6a2..17291ffe60c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -164,7 +164,7 @@ private Mono<List<ConsumerGroupDescription>> loadSortedDescriptions(ReactiveAdmi
       case MESSAGES_BEHIND -> {
 
         Comparator<GroupWithDescr> comparator = Comparator.comparingLong(gwd ->
-            gwd.icg.getMessagesBehind() == null ? 0L : gwd.icg.getMessagesBehind());
+            gwd.icg.getConsumerLag() == null ? 0L : gwd.icg.getConsumerLag());
 
         yield loadDescriptionsByInternalConsumerGroups(ac, groups, comparator, pageNum, perPage, sortOrderDto);
       }
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 4aa79cff1d1..590e324abd8 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2558,7 +2558,7 @@ components:
           $ref: "#/components/schemas/ConsumerGroupState"
         coordinator:
           $ref: "#/components/schemas/Broker"
-        messagesBehind:
+        consumerLag:
           type: integer
           format: int64
           description: null if consumer group has no offsets committed
@@ -2776,7 +2776,7 @@ components:
         endOffset:
           type: integer
           format: int64
-        messagesBehind:
+        consumerLag:
           type: integer
           format: int64
           description: null if consumer group has no offsets committed
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index 00859da0414..33dd9b48ad5 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -110,7 +110,7 @@ const Details: React.FC = () => {
             {consumerGroup.data?.coordinator?.id}
           </Metrics.Indicator>
           <Metrics.Indicator label="Total lag">
-            {consumerGroup.data?.messagesBehind}
+            {consumerGroup.data?.consumerLag}
           </Metrics.Indicator>
         </Metrics.Section>
       </Metrics.Wrapper>
@@ -121,7 +121,7 @@ const Details: React.FC = () => {
         <thead>
           <tr>
             <TableHeaderCell title="Topic" />
-            <TableHeaderCell title="Messages behind" />
+            <TableHeaderCell title="Consumer Lag" />
           </tr>
         </thead>
         <tbody>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx
index 7b1a61ae4eb..99a3c0bd8d4 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ListItem.tsx
@@ -19,10 +19,10 @@ interface Props {
 const ListItem: React.FC<Props> = ({ clusterName, name, consumers }) => {
   const [isOpen, setIsOpen] = React.useState(false);
 
-  const getTotalMessagesBehind = () => {
+  const getTotalconsumerLag = () => {
     let count = 0;
     consumers.forEach((consumer) => {
-      count += consumer?.messagesBehind || 0;
+      count += consumer?.consumerLag || 0;
     });
     return count;
   };
@@ -40,7 +40,7 @@ const ListItem: React.FC<Props> = ({ clusterName, name, consumers }) => {
             </TableKeyLink>
           </FlexWrapper>
         </td>
-        <td>{getTotalMessagesBehind()}</td>
+        <td>{getTotalconsumerLag()}</td>
       </tr>
       {isOpen && <TopicContents consumers={consumers} />}
     </>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContents.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContents.tsx
index b234fb8e192..8686c26ffd7 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContents.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/TopicContents/TopicContents.tsx
@@ -19,7 +19,7 @@ const TABLE_HEADERS_MAP: Headers[] = [
   { title: 'Partition', orderBy: 'partition' },
   { title: 'Consumer ID', orderBy: 'consumerId' },
   { title: 'Host', orderBy: 'host' },
-  { title: 'Messages Behind', orderBy: 'messagesBehind' },
+  { title: 'Consumer Lag', orderBy: 'consumerLag' },
   { title: 'Current Offset', orderBy: 'currentOffset' },
   { title: 'End offset', orderBy: 'endOffset' },
 ];
@@ -108,7 +108,7 @@ const TopicContents: React.FC<Props> = ({ consumers }) => {
         orderBy === 'partition' ||
         orderBy === 'currentOffset' ||
         orderBy === 'endOffset' ||
-        orderBy === 'messagesBehind';
+        orderBy === 'consumerLag';
 
       let comparator: ComparatorFunction<ConsumerGroupTopicPartition>;
       if (isNumberProperty) {
@@ -153,7 +153,7 @@ const TopicContents: React.FC<Props> = ({ consumers }) => {
                   <td>{consumer.partition}</td>
                   <td>{consumer.consumerId}</td>
                   <td>{consumer.host}</td>
-                  <td>{consumer.messagesBehind}</td>
+                  <td>{consumer.consumerLag}</td>
                   <td>{consumer.currentOffset}</td>
                   <td>{consumer.endOffset}</td>
                 </tr>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
index 795ac75a5e9..4d51b492485 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
@@ -57,8 +57,8 @@ const List = () => {
       },
       {
         id: ConsumerGroupOrdering.MESSAGES_BEHIND,
-        header: 'Messages Behind',
-        accessorKey: 'messagesBehind',
+        header: 'Consumer Lag',
+        accessorKey: 'consumerLag',
       },
       {
         header: 'Coordinator',
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
index 173c28c76e3..139ea3a4fa3 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/ConsumerGroups/TopicConsumerGroups.tsx
@@ -48,8 +48,8 @@ const TopicConsumerGroups: React.FC = () => {
         enableSorting: false,
       },
       {
-        header: 'Messages Behind',
-        accessorKey: 'messagesBehind',
+        header: 'Consumer Lag',
+        accessorKey: 'consumerLag',
         enableSorting: false,
       },
       {
diff --git a/kafka-ui-react-app/src/lib/fixtures/consumerGroups.ts b/kafka-ui-react-app/src/lib/fixtures/consumerGroups.ts
index f6c60cf61a5..d282a65b4e2 100644
--- a/kafka-ui-react-app/src/lib/fixtures/consumerGroups.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/consumerGroups.ts
@@ -11,14 +11,14 @@ export const consumerGroupPayload = {
     id: 2,
     host: 'b-2.kad-msk.st2jzq.c6.kafka.eu-west-1.amazonaws.com',
   },
-  messagesBehind: 0,
+  consumerLag: 0,
   partitions: [
     {
       topic: '__amazon_msk_canary',
       partition: 1,
       currentOffset: 0,
       endOffset: 0,
-      messagesBehind: 0,
+      consumerLag: 0,
       consumerId: undefined,
       host: undefined,
     },
@@ -27,7 +27,7 @@ export const consumerGroupPayload = {
       partition: 0,
       currentOffset: 56932,
       endOffset: 56932,
-      messagesBehind: 0,
+      consumerLag: 0,
       consumerId: undefined,
       host: undefined,
     },
@@ -36,7 +36,7 @@ export const consumerGroupPayload = {
       partition: 3,
       currentOffset: 56932,
       endOffset: 56932,
-      messagesBehind: 0,
+      consumerLag: 0,
       consumerId: undefined,
       host: undefined,
     },
@@ -45,7 +45,7 @@ export const consumerGroupPayload = {
       partition: 4,
       currentOffset: 56932,
       endOffset: 56932,
-      messagesBehind: 0,
+      consumerLag: 0,
       consumerId: undefined,
       host: undefined,
     },
diff --git a/kafka-ui-react-app/src/lib/fixtures/topics.ts b/kafka-ui-react-app/src/lib/fixtures/topics.ts
index 6fda7c2764d..cff119077a8 100644
--- a/kafka-ui-react-app/src/lib/fixtures/topics.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/topics.ts
@@ -63,7 +63,7 @@ export const topicConsumerGroups: ConsumerGroup[] = [
     partitionAssignor: '',
     state: ConsumerGroupState.UNKNOWN,
     coordinator: { id: 1 },
-    messagesBehind: 9,
+    consumerLag: 9,
   },
   {
     groupId: 'amazon.msk.canary.group.broker-4',
@@ -73,7 +73,7 @@ export const topicConsumerGroups: ConsumerGroup[] = [
     partitionAssignor: '',
     state: ConsumerGroupState.COMPLETING_REBALANCE,
     coordinator: { id: 1 },
-    messagesBehind: 9,
+    consumerLag: 9,
   },
 ];
 

From 5771c11316d9e4ac67cf6b1ed2b015c7f2d12d4a Mon Sep 17 00:00:00 2001
From: Bhaarat Sharma <44377678+omnipresent07@users.noreply.github.com>
Date: Fri, 2 Jun 2023 08:27:11 -0400
Subject: [PATCH 592/734] Docs: Fix typo for persistent installation in README
 (#3899)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b6edc471529..b276e2756fb 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ services:
     ports:
       - 8080:8080
     environment:
-      DYNAMIC_CONFIG_ENABLED: true
+      DYNAMIC_CONFIG_ENABLED: 'true'
     volumes:
       - ~/kui/config.yml:/etc/kafkaui/dynamic_config.yaml
 ```

From e118aaba3d2ebc0f2a09e6fb2ca43b555254637e Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Fri, 2 Jun 2023 18:33:18 +0400
Subject: [PATCH 593/734] FE: Fix message data digits are rounded (#3779)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/package.json               |  2 ++
 kafka-ui-react-app/pnpm-lock.yaml             | 24 +++++++++++++++----
 .../common/EditorViewer/EditorViewer.tsx      |  4 ++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 50ab162eca8..fada92fa4fa 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -24,6 +24,7 @@
     "json-schema-faker": "^0.5.0-rcv.44",
     "jsonpath-plus": "^7.2.0",
     "lodash": "^4.17.21",
+    "lossless-json": "^2.0.8",
     "pretty-ms": "7.0.1",
     "react": "^18.1.0",
     "react-ace": "^10.1.0",
@@ -71,6 +72,7 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/eventsource": "^1.1.8",
     "@types/lodash": "^4.14.172",
+    "@types/lossless-json": "^1.0.1",
     "@types/node": "^16.4.13",
     "@types/react": "^18.0.9",
     "@types/react-datepicker": "^4.8.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index feb4221edef..fe57d64ed1f 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -19,6 +19,7 @@ specifiers:
   '@testing-library/user-event': ^14.4.3
   '@types/eventsource': ^1.1.8
   '@types/lodash': ^4.14.172
+  '@types/lossless-json': ^1.0.1
   '@types/node': ^16.4.13
   '@types/react': ^18.0.9
   '@types/react-datepicker': ^4.8.0
@@ -55,6 +56,7 @@ specifiers:
   json-schema-faker: ^0.5.0-rcv.44
   jsonpath-plus: ^7.2.0
   lodash: ^4.17.21
+  lossless-json: ^2.0.8
   prettier: ^2.8.4
   pretty-ms: 7.0.1
   react: ^18.1.0
@@ -96,7 +98,7 @@ dependencies:
   '@types/testing-library__jest-dom': 5.14.5
   ace-builds: 1.7.1
   ajv: 8.8.2
-  ajv-formats: 2.1.1
+  ajv-formats: 2.1.1_ajv@8.8.2
   classnames: 2.3.1
   fetch-mock: 9.11.0
   jest: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
@@ -104,6 +106,7 @@ dependencies:
   json-schema-faker: 0.5.0-rcv.44
   jsonpath-plus: 7.2.0
   lodash: 4.17.21
+  lossless-json: 2.0.8
   pretty-ms: 7.0.1
   react: 18.1.0
   react-ace: 10.1.0_ef5jwxihqo6n7gxfmzogljlgcm
@@ -136,6 +139,7 @@ devDependencies:
   '@testing-library/user-event': 14.4.3_@testing-library+dom@9.0.0
   '@types/eventsource': 1.1.8
   '@types/lodash': 4.14.177
+  '@types/lossless-json': 1.0.1
   '@types/node': 16.11.7
   '@types/react': 18.0.9
   '@types/react-datepicker': 4.10.0_react@18.1.0
@@ -1770,6 +1774,10 @@ packages:
     resolution: {integrity: sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==}
     dev: true
 
+  /@types/lossless-json/1.0.1:
+    resolution: {integrity: sha512-zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==}
+    dev: true
+
   /@types/node/16.11.7:
     resolution: {integrity: sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==}
 
@@ -2050,8 +2058,10 @@ packages:
       - supports-color
     dev: true
 
-  /ajv-formats/2.1.1:
+  /ajv-formats/2.1.1_ajv@8.8.2:
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
+    peerDependencies:
+      ajv: ^8.0.0
     peerDependenciesMeta:
       ajv:
         optional: true
@@ -2734,8 +2744,8 @@ packages:
       ms: 2.1.2
       supports-color: 5.5.0
 
-  /decimal.js/10.3.1:
-    resolution: {integrity: sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==}
+  /decimal.js/10.4.3:
+    resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
     dev: true
 
   /dedent/0.7.0:
@@ -4649,7 +4659,7 @@ packages:
       cssom: 0.5.0
       cssstyle: 2.3.0
       data-urls: 3.0.2
-      decimal.js: 10.3.1
+      decimal.js: 10.4.3
       domexception: 4.0.0
       escodegen: 2.0.0
       form-data: 4.0.0
@@ -4841,6 +4851,10 @@ packages:
     dependencies:
       js-tokens: 4.0.0
 
+  /lossless-json/2.0.8:
+    resolution: {integrity: sha512-7/GaZldUc7H5oNZlSk6bF06cRbtA7oF8zWXwbfMZm8yrYC2debx0KvWTBbQIbj6fh08LsXTWg+YtHJshXgYKow==}
+    dev: false
+
   /lru-cache/6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
diff --git a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx
index e489d58f2cc..4b46fafbf1d 100644
--- a/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx
+++ b/kafka-ui-react-app/src/components/common/EditorViewer/EditorViewer.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import Editor from 'components/common/Editor/Editor';
 import { SchemaType } from 'generated-sources';
+import { parse, stringify } from 'lossless-json';
 
 import * as S from './EditorViewer.styled';
 
@@ -9,10 +10,9 @@ export interface EditorViewerProps {
   schemaType?: string;
   maxLines?: number;
 }
-
 const getSchemaValue = (data: string, schemaType?: string) => {
   if (schemaType === SchemaType.JSON || schemaType === SchemaType.AVRO) {
-    return JSON.stringify(JSON.parse(data), null, '\t');
+    return stringify(parse(data), undefined, '\t');
   }
   return data;
 };

From 8a68ba0778b7709f553a5987ddde505c5ebe42bb Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 2 Jun 2023 18:35:00 +0400
Subject: [PATCH 594/734] RBAC: Fix KC restart permissions (#3891)

Co-authored-by: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
---
 .../ui/controller/KafkaConnectController.java | 33 ++++++++++++-------
 .../Connect/Details/Actions/Actions.tsx       |  6 ++--
 .../Details/Tasks/ActionsCellTasks.tsx        | 14 +++++---
 .../components/Connect/List/ActionsCell.tsx   |  6 ++--
 .../src/components/Connect/New/New.tsx        | 12 +++----
 5 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index d300b930164..d6de3210b68 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -1,5 +1,9 @@
 package com.provectus.kafka.ui.controller;
 
+import static com.provectus.kafka.ui.model.ConnectorActionDTO.RESTART;
+import static com.provectus.kafka.ui.model.ConnectorActionDTO.RESTART_ALL_TASKS;
+import static com.provectus.kafka.ui.model.ConnectorActionDTO.RESTART_FAILED_TASKS;
+
 import com.provectus.kafka.ui.api.KafkaConnectApi;
 import com.provectus.kafka.ui.model.ConnectDTO;
 import com.provectus.kafka.ui.model.ConnectorActionDTO;
@@ -17,6 +21,7 @@
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Comparator;
 import java.util.Map;
+import java.util.Set;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,6 +35,8 @@
 @RequiredArgsConstructor
 @Slf4j
 public class KafkaConnectController extends AbstractController implements KafkaConnectApi {
+  private static final Set<ConnectorActionDTO> RESTART_ACTIONS
+      = Set.of(RESTART, RESTART_FAILED_TASKS, RESTART_ALL_TASKS);
   private final KafkaConnectService kafkaConnectService;
   private final AccessControlService accessControlService;
 
@@ -172,10 +179,17 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
                                                          ConnectorActionDTO action,
                                                          ServerWebExchange exchange) {
 
+    ConnectAction[] connectActions;
+    if (RESTART_ACTIONS.contains(action)) {
+      connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.RESTART};
+    } else {
+      connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.EDIT};
+    }
+
     Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
-        .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
+        .connectActions(connectActions)
         .build());
 
     return validateAccess.then(
@@ -253,16 +267,11 @@ private Comparator<FullConnectorInfoDTO> getConnectorsComparator(ConnectorColumn
     if (orderBy == null) {
       return defaultComparator;
     }
-    switch (orderBy) {
-      case CONNECT:
-        return Comparator.comparing(FullConnectorInfoDTO::getConnect);
-      case TYPE:
-        return Comparator.comparing(FullConnectorInfoDTO::getType);
-      case STATUS:
-        return Comparator.comparing(fullConnectorInfoDTO -> fullConnectorInfoDTO.getStatus().getState());
-      case NAME:
-      default:
-        return defaultComparator;
-    }
+    return switch (orderBy) {
+      case CONNECT -> Comparator.comparing(FullConnectorInfoDTO::getConnect);
+      case TYPE -> Comparator.comparing(FullConnectorInfoDTO::getType);
+      case STATUS -> Comparator.comparing(fullConnectorInfoDTO -> fullConnectorInfoDTO.getStatus().getState());
+      default -> defaultComparator;
+    };
   }
 }
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
index 530f0db1471..cc3755e19b8 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Actions/Actions.tsx
@@ -102,7 +102,7 @@ const Actions: React.FC = () => {
           disabled={isMutating}
           permission={{
             resource: ResourceType.CONNECT,
-            action: Action.EDIT,
+            action: Action.RESTART,
             value: routerProps.connectorName,
           }}
         >
@@ -113,7 +113,7 @@ const Actions: React.FC = () => {
           disabled={isMutating}
           permission={{
             resource: ResourceType.CONNECT,
-            action: Action.EDIT,
+            action: Action.RESTART,
             value: routerProps.connectorName,
           }}
         >
@@ -124,7 +124,7 @@ const Actions: React.FC = () => {
           disabled={isMutating}
           permission={{
             resource: ResourceType.CONNECT,
-            action: Action.EDIT,
+            action: Action.RESTART,
             value: routerProps.connectorName,
           }}
         >
diff --git a/kafka-ui-react-app/src/components/Connect/Details/Tasks/ActionsCellTasks.tsx b/kafka-ui-react-app/src/components/Connect/Details/Tasks/ActionsCellTasks.tsx
index 6d2cf845e1b..01e0b7b800f 100644
--- a/kafka-ui-react-app/src/components/Connect/Details/Tasks/ActionsCellTasks.tsx
+++ b/kafka-ui-react-app/src/components/Connect/Details/Tasks/ActionsCellTasks.tsx
@@ -1,9 +1,10 @@
 import React from 'react';
-import { Task } from 'generated-sources';
+import { Action, ResourceType, Task } from 'generated-sources';
 import { CellContext } from '@tanstack/react-table';
 import useAppParams from 'lib/hooks/useAppParams';
 import { useRestartConnectorTask } from 'lib/hooks/api/kafkaConnect';
-import { Dropdown, DropdownItem } from 'components/common/Dropdown';
+import { Dropdown } from 'components/common/Dropdown';
+import { ActionDropdownItem } from 'components/common/ActionComponent';
 import { RouterParamsClusterConnectConnector } from 'lib/paths';
 
 const ActionsCellTasks: React.FC<CellContext<Task, unknown>> = ({ row }) => {
@@ -18,13 +19,18 @@ const ActionsCellTasks: React.FC<CellContext<Task, unknown>> = ({ row }) => {
 
   return (
     <Dropdown>
-      <DropdownItem
+      <ActionDropdownItem
         onClick={() => restartTaskHandler(id?.task)}
         danger
         confirm="Are you sure you want to restart the task?"
+        permission={{
+          resource: ResourceType.CONNECT,
+          action: Action.RESTART,
+          value: routerProps.connectorName,
+        }}
       >
         <span>Restart task</span>
-      </DropdownItem>
+      </ActionDropdownItem>
     </Dropdown>
   );
 };
diff --git a/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx b/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx
index 5b3a24cdb70..246ad332c65 100644
--- a/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Connect/List/ActionsCell.tsx
@@ -78,7 +78,7 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
         disabled={isMutating}
         permission={{
           resource: ResourceType.CONNECT,
-          action: Action.EDIT,
+          action: Action.RESTART,
           value: name,
         }}
       >
@@ -89,7 +89,7 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
         disabled={isMutating}
         permission={{
           resource: ResourceType.CONNECT,
-          action: Action.EDIT,
+          action: Action.RESTART,
           value: name,
         }}
       >
@@ -100,7 +100,7 @@ const ActionsCell: React.FC<CellContext<FullConnectorInfo, unknown>> = ({
         disabled={isMutating}
         permission={{
           resource: ResourceType.CONNECT,
-          action: Action.EDIT,
+          action: Action.RESTART,
           value: name,
         }}
       >
diff --git a/kafka-ui-react-app/src/components/Connect/New/New.tsx b/kafka-ui-react-app/src/components/Connect/New/New.tsx
index 8040267661f..bf285838d38 100644
--- a/kafka-ui-react-app/src/components/Connect/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Connect/New/New.tsx
@@ -38,7 +38,7 @@ const New: React.FC = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
   const navigate = useNavigate();
 
-  const { data: connects } = useConnects(clusterName);
+  const { data: connects = [] } = useConnects(clusterName);
   const mutation = useCreateConnector(clusterName);
 
   const methods = useForm<FormValues>({
@@ -88,10 +88,6 @@ const New: React.FC = () => {
     }
   };
 
-  if (!connects || connects.length === 0) {
-    return null;
-  }
-
   const connectOptions = connects.map(({ name: connectName }) => ({
     value: connectName,
     label: connectName,
@@ -108,10 +104,10 @@ const New: React.FC = () => {
         onSubmit={handleSubmit(onSubmit)}
         aria-label="Create connect form"
       >
-        <S.Filed $hidden={connects.length <= 1}>
+        <S.Filed $hidden={connects?.length <= 1}>
           <Heading level={3}>Connect *</Heading>
           <Controller
-            defaultValue={connectOptions[0].value}
+            defaultValue={connectOptions[0]?.value}
             control={control}
             name="connectName"
             render={({ field: { name, onChange } }) => (
@@ -120,7 +116,7 @@ const New: React.FC = () => {
                 name={name}
                 disabled={isSubmitting}
                 onChange={onChange}
-                value={connectOptions[0].value}
+                value={connectOptions[0]?.value}
                 minWidth="100%"
                 options={connectOptions}
               />

From 73bd6ca3a5ae599a986b1268239221526e63deaf Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 2 Jun 2023 18:38:32 +0400
Subject: [PATCH 595/734] Infra: Fix image build for non OCI-compliant envs
 (#3861)

Co-authored-by: Narek Matevosyan <nmatevosyan@provectus.com>
---
 .github/workflows/release.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 19128550c08..7f18f994e3c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -77,6 +77,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           tags: |
             provectuslabs/kafka-ui:${{ steps.build.outputs.version }}

From cd9bc43d2e91ef43201494c4424c54347136d9c0 Mon Sep 17 00:00:00 2001
From: Shubhadeep Das <dshubhadeep@gmail.com>
Date: Mon, 5 Jun 2023 15:43:13 +0530
Subject: [PATCH 596/734] BE: Deps: Update openapi dependency (#3906)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8098600726d..f2298dddbc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <openapi-generator-maven-plugin.version>6.5.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>6.6.0</openapi-generator-maven-plugin.version>
         <springdoc-openapi-webflux-ui.version>1.2.32</springdoc-openapi-webflux-ui.version>
     </properties>
 

From 4b724fd852f9814ec3ab9316a739cc2d8a1f282c Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Tue, 6 Jun 2023 13:57:58 +0300
Subject: [PATCH 597/734] [e2e] Checking Brokers configs editing (#3912)

---
 .../ui/pages/brokers/BrokersConfigTab.java    | 49 ++++++++++++++++++-
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 27 ++++------
 .../ui/smokesuite/brokers/BrokersTest.java    | 39 +++++++++++++++
 3 files changed, 96 insertions(+), 19 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
index 11489304795..cf0dce73218 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
@@ -104,13 +104,58 @@ public String getValue() {
     }
 
     @Step
-    public void edit() {
-      element.$x("./td[2]//button").shouldBe(Condition.enabled).click();
+    public BrokersConfigItem setValue(String value) {
+      sendKeysAfterClear(getValueFld(), value);
+      return this;
+    }
+
+    @Step
+    public SelenideElement getValueFld() {
+      return element.$x("./td[2]//input");
+    }
+
+    @Step
+    public SelenideElement getSaveBtn() {
+      return element.$x("./td[2]//button[@aria-label='confirmAction']");
+    }
+
+    @Step
+    public SelenideElement getCancelBtn() {
+      return element.$x("./td[2]//button[@aria-label='cancelAction']");
+    }
+
+    @Step
+    public SelenideElement getEditBtn() {
+      return element.$x("./td[2]//button[@aria-label='editAction']");
+    }
+
+    @Step
+    public BrokersConfigItem clickSaveBtn() {
+      getSaveBtn().shouldBe(Condition.enabled).click();
+      return this;
+    }
+
+    @Step
+    public BrokersConfigItem clickCancelBtn() {
+      getCancelBtn().shouldBe(Condition.enabled).click();
+      return this;
+    }
+
+    @Step
+    public BrokersConfigItem clickEditBtn() {
+      getEditBtn().shouldBe(Condition.enabled).click();
+      return this;
     }
 
     @Step
     public String getSource() {
       return element.$x("./td[3]").getText().trim();
     }
+
+    @Step
+    public BrokersConfigItem clickConfirm() {
+      clickConfirmButton();
+      return this;
+    }
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index f94d4356e98..c52db3c1b3c 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -15,80 +15,73 @@
 
 public class SmokeBacklog extends BaseManualTest {
 
-  @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = BROKERS_SUITE_ID)
-  @QaseId(332)
-  @Test
-  public void testCaseA() {
-  }
-
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(335)
   @Test
-  public void testCaseB() {
+  public void testCaseA() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(336)
   @Test
-  public void testCaseC() {
+  public void testCaseB() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(343)
   @Test
-  public void testCaseD() {
+  public void testCaseC() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(345)
   @Test
-  public void testCaseE() {
+  public void testCaseD() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(346)
   @Test
-  public void testCaseF() {
+  public void testCaseE() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = TOPICS_PROFILE_SUITE_ID)
   @QaseId(347)
   @Test
-  public void testCaseG() {
+  public void testCaseF() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(348)
   @Test
-  public void testCaseH() {
+  public void testCaseG() {
   }
 
   @Automation(state = TO_BE_AUTOMATED)
   @Suite(id = BROKERS_SUITE_ID)
   @QaseId(350)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = TOPICS_SUITE_ID)
   @QaseId(50)
   @Test
-  public void testCaseJ() {
+  public void testCaseI() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(351)
   @Test
-  public void testCaseK() {
+  public void testCaseJ() {
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
index 010ab5769a1..e4a4f9f90c9 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
@@ -11,6 +11,7 @@
 import org.testng.Assert;
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
 
 public class BrokersTest extends BaseTest {
 
@@ -82,4 +83,42 @@ public void brokersSourceInfoCheck() {
         .getSourceInfoTooltipText();
     Assert.assertEquals(sourceInfoTooltip, BROKER_SOURCE_INFO_TOOLTIP, "brokerSourceInfoTooltip");
   }
+
+  @QaseId(332)
+  @Test
+  public void brokersConfigEditCheck() {
+    navigateToBrokersAndOpenDetails(DEFAULT_BROKER_ID);
+    brokersDetails
+        .openDetailsTab(CONFIGS);
+    String configKey = "log.cleaner.min.compaction.lag.ms";
+    BrokersConfigTab.BrokersConfigItem configItem = brokersConfigTab
+        .searchConfig(configKey)
+        .getConfig(configKey);
+    int defaultValue = Integer.parseInt(configItem.getValue());
+    configItem
+        .clickEditBtn();
+    SoftAssert softly = new SoftAssert();
+    softly.assertTrue(configItem.getSaveBtn().isDisplayed(), "getSaveBtn().isDisplayed()");
+    softly.assertTrue(configItem.getCancelBtn().isDisplayed(), "getCancelBtn().isDisplayed()");
+    softly.assertTrue(configItem.getValueFld().isEnabled(), "getValueFld().isEnabled()");
+    softly.assertAll();
+    int newValue = defaultValue + 1;
+    configItem
+        .setValue(String.valueOf(newValue))
+        .clickCancelBtn();
+    Assert.assertEquals(Integer.parseInt(configItem.getValue()), defaultValue, "getValue()");
+    configItem
+        .clickEditBtn()
+        .setValue(String.valueOf(newValue))
+        .clickSaveBtn()
+        .clickConfirm();
+    configItem = brokersConfigTab
+        .searchConfig(configKey)
+        .getConfig(configKey);
+    softly.assertFalse(configItem.getSaveBtn().isDisplayed(), "getSaveBtn().isDisplayed()");
+    softly.assertFalse(configItem.getCancelBtn().isDisplayed(), "getCancelBtn().isDisplayed()");
+    softly.assertTrue(configItem.getEditBtn().isDisplayed(), "getEditBtn().isDisplayed()");
+    softly.assertEquals(Integer.parseInt(configItem.getValue()), newValue, "getValue()");
+    softly.assertAll();
+  }
 }

From c3559556411189bdfa72b67188ee9d49a47fce37 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 8 Jun 2023 17:14:39 +0400
Subject: [PATCH 598/734] BE: Impl support for Avro logical types (#3808)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../JsonToAvroConversionException.java        |   7 +
 .../sr/AvroSchemaRegistrySerializer.java      |   6 +-
 .../serdes/builtin/sr/MessageFormatter.java   |  19 +-
 .../jsonschema/AvroJsonSchemaConverter.java   |   6 +-
 .../util/jsonschema/JsonAvroConversion.java   | 503 ++++++++++++++
 .../builtin/sr/SchemaRegistrySerdeTest.java   | 176 ++++-
 .../jsonschema/JsonAvroConversionTest.java    | 621 ++++++++++++++++++
 7 files changed, 1325 insertions(+), 13 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonToAvroConversionException.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversionTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonToAvroConversionException.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonToAvroConversionException.java
new file mode 100644
index 00000000000..5b3910f4cf3
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonToAvroConversionException.java
@@ -0,0 +1,7 @@
+package com.provectus.kafka.ui.exception;
+
+public class JsonToAvroConversionException extends ValidationException {
+  public JsonToAvroConversionException(String message) {
+    super(message);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java
index 3c4a5008552..164938bfc70 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java
@@ -1,12 +1,13 @@
 package com.provectus.kafka.ui.serdes.builtin.sr;
 
+import com.provectus.kafka.ui.util.jsonschema.JsonAvroConversion;
 import io.confluent.kafka.schemaregistry.ParsedSchema;
 import io.confluent.kafka.schemaregistry.avro.AvroSchema;
-import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
 import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
 import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
 import io.confluent.kafka.serializers.KafkaAvroSerializer;
+import io.confluent.kafka.serializers.KafkaAvroSerializerConfig;
 import java.util.Map;
 import org.apache.kafka.common.serialization.Serializer;
 
@@ -25,6 +26,7 @@ protected Serializer<Object> createSerializer(SchemaRegistryClient client) {
         Map.of(
             "schema.registry.url", "wontbeused",
             AbstractKafkaSchemaSerDeConfig.AUTO_REGISTER_SCHEMAS, false,
+            KafkaAvroSerializerConfig.AVRO_USE_LOGICAL_TYPE_CONVERTERS_CONFIG, true,
             AbstractKafkaSchemaSerDeConfig.USE_LATEST_VERSION, true
         ),
         isKey
@@ -35,7 +37,7 @@ protected Serializer<Object> createSerializer(SchemaRegistryClient client) {
   @Override
   protected Object serialize(String value, ParsedSchema schema) {
     try {
-      return AvroSchemaUtils.toObject(value, (AvroSchema) schema);
+      return JsonAvroConversion.convertJsonToAvro(value, ((AvroSchema) schema).rawSchema());
     } catch (Throwable e) {
       throw new RuntimeException("Failed to serialize record for topic " + topic, e);
     }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java
index 52e8c6f33a4..40073d85347 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/MessageFormatter.java
@@ -3,9 +3,12 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.protobuf.Message;
 import com.google.protobuf.util.JsonFormat;
+import com.provectus.kafka.ui.util.jsonschema.JsonAvroConversion;
 import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
+import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
 import io.confluent.kafka.serializers.KafkaAvroDeserializer;
+import io.confluent.kafka.serializers.KafkaAvroDeserializerConfig;
 import io.confluent.kafka.serializers.json.KafkaJsonSchemaDeserializer;
 import io.confluent.kafka.serializers.protobuf.KafkaProtobufDeserializer;
 import java.util.Map;
@@ -28,16 +31,22 @@ class AvroMessageFormatter implements MessageFormatter {
 
     AvroMessageFormatter(SchemaRegistryClient client) {
       this.avroDeserializer = new KafkaAvroDeserializer(client);
+      this.avroDeserializer.configure(
+          Map.of(
+              AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG, "wontbeused",
+              KafkaAvroDeserializerConfig.SPECIFIC_AVRO_READER_CONFIG, false,
+              KafkaAvroDeserializerConfig.SCHEMA_REFLECTION_CONFIG, false,
+              KafkaAvroDeserializerConfig.AVRO_USE_LOGICAL_TYPE_CONVERTERS_CONFIG, true
+          ),
+          false
+      );
     }
 
     @Override
-    @SneakyThrows
     public String format(String topic, byte[] value) {
-      // deserialized will have type, that depends on schema type (record or primitive),
-      // AvroSchemaUtils.toJson(...) method will take it into account
       Object deserialized = avroDeserializer.deserialize(topic, value);
-      byte[] jsonBytes = AvroSchemaUtils.toJson(deserialized);
-      return new String(jsonBytes);
+      var schema = AvroSchemaUtils.getSchema(deserialized);
+      return JsonAvroConversion.convertAvroToJson(deserialized, schema).toString();
     }
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
index d2cd0e65f39..56737d7a612 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import org.apache.avro.Schema;
 import reactor.util.function.Tuple2;
@@ -40,6 +41,10 @@ private FieldSchema convertField(Schema.Field field, Map<String, FieldSchema> de
 
   private FieldSchema convertSchema(Schema schema,
                                     Map<String, FieldSchema> definitions, boolean isRoot) {
+    Optional<FieldSchema> logicalTypeSchema = JsonAvroConversion.LogicalTypeConversion.getJsonSchema(schema);
+    if (logicalTypeSchema.isPresent()) {
+      return logicalTypeSchema.get();
+    }
     if (!schema.isUnion()) {
       JsonType type = convertType(schema);
       switch (type.getType()) {
@@ -66,7 +71,6 @@ private FieldSchema convertSchema(Schema schema,
     }
   }
 
-
   // this method formats json-schema field in a way
   // to fit avro-> json encoding rules (https://avro.apache.org/docs/1.11.1/specification/_print/#json-encoding)
   private FieldSchema createUnionSchema(Schema schema, Map<String, FieldSchema> definitions) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
new file mode 100644
index 00000000000..d2114dd971c
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
@@ -0,0 +1,503 @@
+package com.provectus.kafka.ui.util.jsonschema;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.BooleanNode;
+import com.fasterxml.jackson.databind.node.DecimalNode;
+import com.fasterxml.jackson.databind.node.DoubleNode;
+import com.fasterxml.jackson.databind.node.FloatNode;
+import com.fasterxml.jackson.databind.node.IntNode;
+import com.fasterxml.jackson.databind.node.JsonNodeType;
+import com.fasterxml.jackson.databind.node.LongNode;
+import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.collect.Lists;
+import com.provectus.kafka.ui.exception.JsonToAvroConversionException;
+import io.confluent.kafka.serializers.AvroData;
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
+import lombok.SneakyThrows;
+import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericData;
+
+// json <-> avro
+public class JsonAvroConversion {
+
+  private static final JsonMapper MAPPER = new JsonMapper();
+
+  // converts json into Object that is expected input for KafkaAvroSerializer
+  // (with AVRO_USE_LOGICAL_TYPE_CONVERTERS flat enabled!)
+  @SneakyThrows
+  public static Object convertJsonToAvro(String jsonString, Schema avroSchema) {
+    JsonNode rootNode = MAPPER.readTree(jsonString);
+    return convert(rootNode, avroSchema);
+  }
+
+  private static Object convert(JsonNode node, Schema avroSchema) {
+    return switch (avroSchema.getType()) {
+      case RECORD -> {
+        assertJsonType(node, JsonNodeType.OBJECT);
+        var rec = new GenericData.Record(avroSchema);
+        for (Schema.Field field : avroSchema.getFields()) {
+          if (node.has(field.name()) && !node.get(field.name()).isNull()) {
+            rec.put(field.name(), convert(node.get(field.name()), field.schema()));
+          }
+        }
+        yield rec;
+      }
+      case MAP -> {
+        assertJsonType(node, JsonNodeType.OBJECT);
+        var map = new LinkedHashMap<String, Object>();
+        var valueSchema = avroSchema.getValueType();
+        node.fields().forEachRemaining(f -> map.put(f.getKey(), convert(f.getValue(), valueSchema)));
+        yield map;
+      }
+      case ARRAY -> {
+        assertJsonType(node, JsonNodeType.ARRAY);
+        var lst = new ArrayList<>();
+        node.elements().forEachRemaining(e -> lst.add(convert(e, avroSchema.getElementType())));
+        yield lst;
+      }
+      case ENUM -> {
+        assertJsonType(node, JsonNodeType.STRING);
+        String symbol = node.textValue();
+        if (!avroSchema.getEnumSymbols().contains(symbol)) {
+          throw new JsonToAvroConversionException("%s is not a part of enum symbols [%s]"
+              .formatted(symbol, avroSchema.getEnumSymbols()));
+        }
+        yield new GenericData.EnumSymbol(avroSchema, symbol);
+      }
+      case UNION -> {
+        // for types from enum (other than null) payload should be an object with single key == name of type
+        // ex: schema = [ "null", "int", "string" ], possible payloads = null, { "string": "str" },  { "int": 123 }
+        if (node.isNull() && avroSchema.getTypes().contains(Schema.create(Schema.Type.NULL))) {
+          yield null;
+        }
+
+        assertJsonType(node, JsonNodeType.OBJECT);
+        var elements = Lists.newArrayList(node.fields());
+        if (elements.size() != 1) {
+          throw new JsonToAvroConversionException(
+              "UNION field value should be an object with single field == type name");
+        }
+        var typeNameToValue = elements.get(0);
+        for (Schema unionType : avroSchema.getTypes()) {
+          if (typeNameToValue.getKey().equals(unionType.getFullName())) {
+            yield convert(typeNameToValue.getValue(), unionType);
+          }
+        }
+        throw new JsonToAvroConversionException(
+            "json value '%s' is cannot be converted to any of union types [%s]"
+                .formatted(node, avroSchema.getTypes()));
+      }
+      case STRING -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(node, avroSchema);
+        }
+        assertJsonType(node, JsonNodeType.STRING);
+        yield node.textValue();
+      }
+      case LONG -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(node, avroSchema);
+        }
+        assertJsonType(node, JsonNodeType.NUMBER);
+        assertJsonNumberType(node, JsonParser.NumberType.LONG, JsonParser.NumberType.INT);
+        yield node.longValue();
+      }
+      case INT -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(node, avroSchema);
+        }
+        assertJsonType(node, JsonNodeType.NUMBER);
+        assertJsonNumberType(node, JsonParser.NumberType.INT);
+        yield node.intValue();
+      }
+      case FLOAT -> {
+        assertJsonType(node, JsonNodeType.NUMBER);
+        assertJsonNumberType(node, JsonParser.NumberType.DOUBLE, JsonParser.NumberType.FLOAT);
+        yield node.floatValue();
+      }
+      case DOUBLE -> {
+        assertJsonType(node, JsonNodeType.NUMBER);
+        assertJsonNumberType(node, JsonParser.NumberType.DOUBLE, JsonParser.NumberType.FLOAT);
+        yield node.doubleValue();
+      }
+      case BOOLEAN -> {
+        assertJsonType(node, JsonNodeType.BOOLEAN);
+        yield node.booleanValue();
+      }
+      case NULL -> {
+        assertJsonType(node, JsonNodeType.NULL);
+        yield null;
+      }
+      case BYTES -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(node, avroSchema);
+        }
+        assertJsonType(node, JsonNodeType.STRING);
+        // logic copied from JsonDecoder::readBytes
+        yield ByteBuffer.wrap(node.textValue().getBytes(StandardCharsets.ISO_8859_1));
+      }
+      case FIXED -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(node, avroSchema);
+        }
+        assertJsonType(node, JsonNodeType.STRING);
+        byte[] bytes = node.textValue().getBytes(StandardCharsets.ISO_8859_1);
+        if (bytes.length != avroSchema.getFixedSize()) {
+          throw new JsonToAvroConversionException(
+              "Fixed field has unexpected size %d (should be %d)"
+                  .formatted(bytes.length, avroSchema.getFixedSize()));
+        }
+        yield new GenericData.Fixed(avroSchema, bytes);
+      }
+    };
+  }
+
+  // converts output of KafkaAvroDeserializer (with AVRO_USE_LOGICAL_TYPE_CONVERTERS flat enabled!) into json.
+  // Note: conversion should be compatible with AvroJsonSchemaConverter logic!
+  public static JsonNode convertAvroToJson(Object obj, Schema avroSchema) {
+    if (obj == null) {
+      return NullNode.getInstance();
+    }
+    return switch (avroSchema.getType()) {
+      case RECORD -> {
+        var rec = (GenericData.Record) obj;
+        ObjectNode node = MAPPER.createObjectNode();
+        for (Schema.Field field : avroSchema.getFields()) {
+          var fieldVal = rec.get(field.name());
+          if (fieldVal != null) {
+            node.set(field.name(), convertAvroToJson(fieldVal, field.schema()));
+          }
+        }
+        yield node;
+      }
+      case MAP -> {
+        ObjectNode node = MAPPER.createObjectNode();
+        ((Map) obj).forEach((k, v) -> node.set(k.toString(), convertAvroToJson(v, avroSchema.getValueType())));
+        yield node;
+      }
+      case ARRAY -> {
+        var list = (List<Object>) obj;
+        ArrayNode node = MAPPER.createArrayNode();
+        list.forEach(e -> node.add(convertAvroToJson(e, avroSchema.getElementType())));
+        yield node;
+      }
+      case ENUM -> {
+        yield new TextNode(obj.toString());
+      }
+      case UNION -> {
+        ObjectNode node = MAPPER.createObjectNode();
+        int unionIdx = AvroData.getGenericData().resolveUnion(avroSchema, obj);
+        Schema unionType = avroSchema.getTypes().get(unionIdx);
+        node.set(unionType.getFullName(), convertAvroToJson(obj, unionType));
+        yield node;
+      }
+      case STRING -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(obj, avroSchema);
+        }
+        yield new TextNode(obj.toString());
+      }
+      case LONG -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(obj, avroSchema);
+        }
+        yield new LongNode((Long) obj);
+      }
+      case INT -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(obj, avroSchema);
+        }
+        yield new IntNode((Integer) obj);
+      }
+      case FLOAT -> new FloatNode((Float) obj);
+      case DOUBLE -> new DoubleNode((Double) obj);
+      case BOOLEAN -> BooleanNode.valueOf((Boolean) obj);
+      case NULL -> NullNode.getInstance();
+      case BYTES -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(obj, avroSchema);
+        }
+        ByteBuffer bytes = (ByteBuffer) obj;
+        //see JsonEncoder::writeByteArray
+        yield new TextNode(new String(bytes.array(), StandardCharsets.ISO_8859_1));
+      }
+      case FIXED -> {
+        if (isLogicalType(avroSchema)) {
+          yield processLogicalType(obj, avroSchema);
+        }
+        var fixed = (GenericData.Fixed) obj;
+        yield new TextNode(new String(fixed.bytes(), StandardCharsets.ISO_8859_1));
+      }
+    };
+  }
+
+  private static Object processLogicalType(JsonNode node, Schema schema) {
+    return findConversion(schema)
+        .map(c -> c.jsonToAvroConversion.apply(node, schema))
+        .orElseThrow(() ->
+            new JsonToAvroConversionException("'%s' logical type is not supported"
+                .formatted(schema.getLogicalType().getName())));
+  }
+
+  private static JsonNode processLogicalType(Object obj, Schema schema) {
+    return findConversion(schema)
+        .map(c -> c.avroToJsonConversion.apply(obj, schema))
+        .orElseThrow(() ->
+            new JsonToAvroConversionException("'%s' logical type is not supported"
+                .formatted(schema.getLogicalType().getName())));
+  }
+
+  private static Optional<LogicalTypeConversion> findConversion(Schema schema) {
+    String logicalTypeName = schema.getLogicalType().getName();
+    return Stream.of(LogicalTypeConversion.values())
+        .filter(t -> t.name.equalsIgnoreCase(logicalTypeName))
+        .findFirst();
+  }
+
+  private static boolean isLogicalType(Schema schema) {
+    return schema.getLogicalType() != null;
+  }
+
+  private static void assertJsonType(JsonNode node, JsonNodeType... allowedTypes) {
+    if (Stream.of(allowedTypes).noneMatch(t -> node.getNodeType() == t)) {
+      throw new JsonToAvroConversionException(
+          "%s node has unexpected type, allowed types %s, actual type %s"
+              .formatted(node, Arrays.toString(allowedTypes), node.getNodeType()));
+    }
+  }
+
+  private static void assertJsonNumberType(JsonNode node, JsonParser.NumberType... allowedTypes) {
+    if (Stream.of(allowedTypes).noneMatch(t -> node.numberType() == t)) {
+      throw new JsonToAvroConversionException(
+          "%s node has unexpected numeric type, allowed types %s, actual type %s"
+              .formatted(node, Arrays.toString(allowedTypes), node.numberType()));
+    }
+  }
+
+  enum LogicalTypeConversion {
+
+    UUID("uuid",
+        (node, schema) -> {
+          assertJsonType(node, JsonNodeType.STRING);
+          return java.util.UUID.fromString(node.asText());
+        },
+        (obj, schema) -> {
+          return new TextNode(obj.toString());
+        },
+        new SimpleFieldSchema(
+            new SimpleJsonType(
+                JsonType.Type.STRING,
+                Map.of("format", new TextNode("uuid"))))
+    ),
+
+    DECIMAL("decimal",
+        (node, schema) -> {
+          if (node.isTextual()) {
+            return new BigDecimal(node.asText());
+          } else if (node.isNumber()) {
+            return new BigDecimal(node.numberValue().toString());
+          }
+          throw new JsonToAvroConversionException(
+              "node '%s' can't be converted to decimal logical type"
+                  .formatted(node));
+        },
+        (obj, schema) -> {
+          return new DecimalNode((BigDecimal) obj);
+        },
+        new SimpleFieldSchema(new SimpleJsonType(JsonType.Type.NUMBER))
+    ),
+
+    DATE("date",
+        (node, schema) -> {
+          if (node.isInt()) {
+            return LocalDate.ofEpochDay(node.intValue());
+          } else if (node.isTextual()) {
+            return LocalDate.parse(node.asText());
+          } else {
+            throw new JsonToAvroConversionException(
+                "node '%s' can't be converted to date logical type"
+                    .formatted(node));
+          }
+        },
+        (obj, schema) -> {
+          return new TextNode(obj.toString());
+        },
+        new SimpleFieldSchema(
+            new SimpleJsonType(
+                JsonType.Type.STRING,
+                Map.of("format", new TextNode("date"))))
+    ),
+
+    TIME_MILLIS("time-millis",
+        (node, schema) -> {
+          if (node.isIntegralNumber()) {
+            return LocalTime.ofNanoOfDay(TimeUnit.MILLISECONDS.toNanos(node.longValue()));
+          } else if (node.isTextual()) {
+            return LocalTime.parse(node.asText());
+          } else {
+            throw new JsonToAvroConversionException(
+                "node '%s' can't be converted to time-millis logical type"
+                    .formatted(node));
+          }
+        },
+        (obj, schema) -> {
+          return new TextNode(obj.toString());
+        },
+        new SimpleFieldSchema(
+            new SimpleJsonType(
+                JsonType.Type.STRING,
+                Map.of("format", new TextNode("time"))))
+    ),
+
+    TIME_MICROS("time-micros",
+        (node, schema) -> {
+          if (node.isIntegralNumber()) {
+            return LocalTime.ofNanoOfDay(TimeUnit.MICROSECONDS.toNanos(node.longValue()));
+          } else if (node.isTextual()) {
+            return LocalTime.parse(node.asText());
+          } else {
+            throw new JsonToAvroConversionException(
+                "node '%s' can't be converted to time-micros logical type"
+                    .formatted(node));
+          }
+        },
+        (obj, schema) -> {
+          return new TextNode(obj.toString());
+        },
+        new SimpleFieldSchema(
+            new SimpleJsonType(
+                JsonType.Type.STRING,
+                Map.of("format", new TextNode("time"))))
+    ),
+
+    TIMESTAMP_MILLIS("timestamp-millis",
+        (node, schema) -> {
+          if (node.isIntegralNumber()) {
+            return Instant.ofEpochMilli(node.longValue());
+          } else if (node.isTextual()) {
+            return Instant.parse(node.asText());
+          } else {
+            throw new JsonToAvroConversionException(
+                "node '%s' can't be converted to timestamp-millis logical type"
+                    .formatted(node));
+          }
+        },
+        (obj, schema) -> {
+          return new TextNode(obj.toString());
+        },
+        new SimpleFieldSchema(
+            new SimpleJsonType(
+                JsonType.Type.STRING,
+                Map.of("format", new TextNode("date-time"))))
+    ),
+
+    TIMESTAMP_MICROS("timestamp-micros",
+        (node, schema) -> {
+          if (node.isIntegralNumber()) {
+            // TimeConversions.TimestampMicrosConversion for impl
+            long microsFromEpoch = node.longValue();
+            long epochSeconds = microsFromEpoch / (1_000_000L);
+            long nanoAdjustment = (microsFromEpoch % (1_000_000L)) * 1_000L;
+            return Instant.ofEpochSecond(epochSeconds, nanoAdjustment);
+          } else if (node.isTextual()) {
+            return Instant.parse(node.asText());
+          } else {
+            throw new JsonToAvroConversionException(
+                "node '%s' can't be converted to timestamp-millis logical type"
+                    .formatted(node));
+          }
+        },
+        (obj, schema) -> {
+          return new TextNode(obj.toString());
+        },
+        new SimpleFieldSchema(
+            new SimpleJsonType(
+                JsonType.Type.STRING,
+                Map.of("format", new TextNode("date-time"))))
+    ),
+
+    LOCAL_TIMESTAMP_MILLIS("local-timestamp-millis",
+        (node, schema) -> {
+          if (node.isTextual()) {
+            return LocalDateTime.parse(node.asText());
+          }
+          // TimeConversions.TimestampMicrosConversion for impl
+          Instant instant = (Instant) TIMESTAMP_MILLIS.jsonToAvroConversion.apply(node, schema);
+          return LocalDateTime.ofInstant(instant, ZoneOffset.UTC);
+        },
+        (obj, schema) -> {
+          return new TextNode(obj.toString());
+        },
+        new SimpleFieldSchema(
+            new SimpleJsonType(
+                JsonType.Type.STRING,
+                Map.of("format", new TextNode("date-time"))))
+    ),
+
+    LOCAL_TIMESTAMP_MICROS("local-timestamp-micros",
+        (node, schema) -> {
+          if (node.isTextual()) {
+            return LocalDateTime.parse(node.asText());
+          }
+          Instant instant = (Instant) TIMESTAMP_MICROS.jsonToAvroConversion.apply(node, schema);
+          return LocalDateTime.ofInstant(instant, ZoneOffset.UTC);
+        },
+        (obj, schema) -> {
+          return new TextNode(obj.toString());
+        },
+        new SimpleFieldSchema(
+            new SimpleJsonType(
+                JsonType.Type.STRING,
+                Map.of("format", new TextNode("date-time"))))
+    );
+
+    private final String name;
+    private final BiFunction<JsonNode, Schema, Object> jsonToAvroConversion;
+    private final BiFunction<Object, Schema, JsonNode> avroToJsonConversion;
+    private final FieldSchema jsonSchema;
+
+    LogicalTypeConversion(String name,
+                          BiFunction<JsonNode, Schema, Object> jsonToAvroConversion,
+                          BiFunction<Object, Schema, JsonNode> avroToJsonConversion,
+                          FieldSchema jsonSchema) {
+      this.name = name;
+      this.jsonToAvroConversion = jsonToAvroConversion;
+      this.avroToJsonConversion = avroToJsonConversion;
+      this.jsonSchema = jsonSchema;
+    }
+
+    static Optional<FieldSchema> getJsonSchema(Schema schema) {
+      if (schema.getLogicalType() == null) {
+        return Optional.empty();
+      }
+      String logicalTypeName = schema.getLogicalType().getName();
+      return Stream.of(JsonAvroConversion.LogicalTypeConversion.values())
+          .filter(t -> t.name.equalsIgnoreCase(logicalTypeName))
+          .map(c -> c.jsonSchema)
+          .findFirst();
+    }
+  }
+
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
index 4ea2bf3c2ac..b70450cea5c 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerdeTest.java
@@ -2,13 +2,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
 import com.provectus.kafka.ui.serde.api.SchemaDescription;
 import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.util.jsonschema.JsonAvroConversion;
 import io.confluent.kafka.schemaregistry.avro.AvroSchema;
-import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
 import io.confluent.kafka.schemaregistry.client.MockSchemaRegistryClient;
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
 import java.io.ByteArrayOutputStream;
@@ -54,7 +53,8 @@ void returnsSchemaDescriptionIfSchemaRegisteredInSR(String topic, String subject
 
     SchemaDescription schemaDescription = schemaOptional.get();
     assertThat(schemaDescription.getSchema())
-        .contains("{\"$id\":\"int\",\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"type\":\"integer\"}");
+        .contains(
+            "{\"$id\":\"int\",\"$schema\":\"https://json-schema.org/draft/2020-12/schema\",\"type\":\"integer\"}");
     assertThat(schemaDescription.getAdditionalProperties())
         .containsOnlyKeys("subject", "schemaId", "latestVersion", "type")
         .containsEntry("subject", subject)
@@ -189,7 +189,8 @@ void canSerializeReturnsFalseIfSubjectDoesNotExist() {
     assertThat(serde.canSerialize(topic, Serde.Target.VALUE)).isFalse();
   }
 
-  private void assertJsonsEqual(String expected, String actual) throws JsonProcessingException {
+  @SneakyThrows
+  private void assertJsonsEqual(String expected, String actual) {
     var mapper = new JsonMapper();
     assertThat(mapper.readTree(actual)).isEqualTo(mapper.readTree(expected));
   }
@@ -211,9 +212,174 @@ private byte[] jsonToAvro(String json, AvroSchema schema) {
     GenericDatumWriter<Object> writer = new GenericDatumWriter<>(schema.rawSchema());
     ByteArrayOutputStream output = new ByteArrayOutputStream();
     Encoder encoder = EncoderFactory.get().binaryEncoder(output, null);
-    writer.write(AvroSchemaUtils.toObject(json, schema), encoder);
+    writer.write(JsonAvroConversion.convertJsonToAvro(json, schema.rawSchema()), encoder);
     encoder.flush();
     return output.toByteArray();
   }
 
+  @Test
+  void avroFieldsRepresentationIsConsistentForSerializationAndDeserialization() throws Exception {
+    AvroSchema schema = new AvroSchema(
+        """
+             {
+               "type": "record",
+               "name": "TestAvroRecord",
+               "fields": [
+                 {
+                   "name": "f_int",
+                   "type": "int"
+                 },
+                 {
+                   "name": "f_long",
+                   "type": "long"
+                 },
+                 {
+                   "name": "f_string",
+                   "type": "string"
+                 },
+                 {
+                   "name": "f_boolean",
+                   "type": "boolean"
+                 },
+                 {
+                   "name": "f_float",
+                   "type": "float"
+                 },
+                 {
+                   "name": "f_double",
+                   "type": "double"
+                 },
+                 {
+                   "name": "f_enum",
+                   "type" : {
+                    "type": "enum",
+                    "name": "Suit",
+                    "symbols" : ["SPADES", "HEARTS", "DIAMONDS", "CLUBS"]
+                   }
+                 },
+                 {
+                  "name": "f_map",
+                  "type": {
+                     "type": "map",
+                     "values" : "string",
+                     "default": {}
+                   }
+                 },
+                 {
+                  "name": "f_union",
+                  "type": ["null", "string", "int" ]
+                 },
+                 {
+                  "name": "f_optional_to_test_not_filled_case",
+                  "type": [ "null", "string"]
+                 },
+                 {
+                     "name" : "f_fixed",
+                     "type" : { "type" : "fixed" ,"size" : 8, "name": "long_encoded" }
+                   },
+                   {
+                     "name" : "f_bytes",
+                     "type": "bytes"
+                   }
+               ]
+            }"""
+    );
+
+    String jsonPayload = """
+        {
+          "f_int": 123,
+          "f_long": 4294967294,
+          "f_string": "string here",
+          "f_boolean": true,
+          "f_float": 123.1,
+          "f_double": 123456.123456,
+          "f_enum": "SPADES",
+          "f_map": { "k1": "string value" },
+          "f_union": { "int": 123 },
+          "f_fixed": "\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0004Ò",
+          "f_bytes": "\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\t)"
+        }
+        """;
+
+    registryClient.register("test-value", schema);
+    assertSerdeCycle("test", jsonPayload);
+  }
+
+  @Test
+  void avroLogicalTypesRepresentationIsConsistentForSerializationAndDeserialization() throws Exception {
+    AvroSchema schema = new AvroSchema(
+        """
+             {
+               "type": "record",
+               "name": "TestAvroRecord",
+               "fields": [
+                 {
+                   "name": "lt_date",
+                   "type": { "type": "int", "logicalType": "date" }
+                 },
+                 {
+                   "name": "lt_uuid",
+                   "type": { "type": "string", "logicalType": "uuid" }
+                 },
+                 {
+                   "name": "lt_decimal",
+                   "type": { "type": "bytes", "logicalType": "decimal", "precision": 22, "scale":10 }
+                 },
+                 {
+                   "name": "lt_time_millis",
+                   "type": { "type": "int", "logicalType": "time-millis"}
+                 },
+                 {
+                   "name": "lt_time_micros",
+                   "type": { "type": "long", "logicalType": "time-micros"}
+                 },
+                 {
+                   "name": "lt_timestamp_millis",
+                   "type": { "type": "long", "logicalType": "timestamp-millis" }
+                 },
+                 {
+                   "name": "lt_timestamp_micros",
+                   "type": { "type": "long", "logicalType": "timestamp-micros" }
+                 },
+                 {
+                   "name": "lt_local_timestamp_millis",
+                   "type": { "type": "long", "logicalType": "local-timestamp-millis" }
+                 },
+                 {
+                   "name": "lt_local_timestamp_micros",
+                   "type": { "type": "long", "logicalType": "local-timestamp-micros" }
+                 }
+               ]
+            }"""
+    );
+
+    String jsonPayload = """
+        {
+          "lt_date":"1991-08-14",
+          "lt_decimal": 2.1617413862327545E11,
+          "lt_time_millis": "10:15:30.001",
+          "lt_time_micros": "10:15:30.123456",
+          "lt_uuid": "a37b75ca-097c-5d46-6119-f0637922e908",
+          "lt_timestamp_millis": "2007-12-03T10:15:30.123Z",
+          "lt_timestamp_micros": "2007-12-03T10:15:30.123456Z",
+          "lt_local_timestamp_millis": "2017-12-03T10:15:30.123",
+          "lt_local_timestamp_micros": "2017-12-03T10:15:30.123456"
+        }
+        """;
+
+    registryClient.register("test-value", schema);
+    assertSerdeCycle("test", jsonPayload);
+  }
+
+  // 1. serialize input json to binary
+  // 2. deserialize from binary
+  // 3. check that deserialized version equal to input
+  void assertSerdeCycle(String topic, String jsonInput) {
+    byte[] serializedBytes = serde.serializer(topic, Serde.Target.VALUE).serialize(jsonInput);
+    var deserializedJson = serde.deserializer(topic, Serde.Target.VALUE)
+        .deserialize(null, serializedBytes)
+        .getResult();
+    assertJsonsEqual(jsonInput, deserializedJson);
+  }
+
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversionTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversionTest.java
new file mode 100644
index 00000000000..0e9c291707e
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversionTest.java
@@ -0,0 +1,621 @@
+package com.provectus.kafka.ui.util.jsonschema;
+
+import static com.provectus.kafka.ui.util.jsonschema.JsonAvroConversion.convertAvroToJson;
+import static com.provectus.kafka.ui.util.jsonschema.JsonAvroConversion.convertJsonToAvro;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.node.BooleanNode;
+import com.fasterxml.jackson.databind.node.DoubleNode;
+import com.fasterxml.jackson.databind.node.FloatNode;
+import com.fasterxml.jackson.databind.node.IntNode;
+import com.fasterxml.jackson.databind.node.LongNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.primitives.Longs;
+import io.confluent.kafka.schemaregistry.avro.AvroSchema;
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import lombok.SneakyThrows;
+import org.apache.avro.Schema;
+import org.apache.avro.generic.GenericData;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+class JsonAvroConversionTest {
+
+  // checking conversion from json to KafkaAvroSerializer-compatible avro objects
+  @Nested
+  class FromJsonToAvro {
+
+    @Test
+    void primitiveRoot() {
+      assertThat(convertJsonToAvro("\"str\"", createSchema("\"string\"")))
+          .isEqualTo("str");
+
+      assertThat(convertJsonToAvro("123", createSchema("\"int\"")))
+          .isEqualTo(123);
+
+      assertThat(convertJsonToAvro("123", createSchema("\"long\"")))
+          .isEqualTo(123L);
+
+      assertThat(convertJsonToAvro("123.123", createSchema("\"float\"")))
+          .isEqualTo(123.123F);
+
+      assertThat(convertJsonToAvro("12345.12345", createSchema("\"double\"")))
+          .isEqualTo(12345.12345);
+    }
+
+    @Test
+    void primitiveTypedFields() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "f_int",
+                     "type": "int"
+                   },
+                   {
+                     "name": "f_long",
+                     "type": "long"
+                   },
+                   {
+                     "name": "f_string",
+                     "type": "string"
+                   },
+                   {
+                     "name": "f_boolean",
+                     "type": "boolean"
+                   },
+                   {
+                     "name": "f_float",
+                     "type": "float"
+                   },
+                   {
+                     "name": "f_double",
+                     "type": "double"
+                   },
+                   {
+                     "name": "f_enum",
+                     "type" : {
+                      "type": "enum",
+                      "name": "Suit",
+                      "symbols" : ["SPADES", "HEARTS", "DIAMONDS", "CLUBS"]
+                     }
+                   },
+                   {
+                     "name" : "f_fixed",
+                     "type" : { "type" : "fixed" ,"size" : 8, "name": "long_encoded" }
+                   },
+                   {
+                     "name" : "f_bytes",
+                     "type": "bytes"
+                   }
+                 ]
+              }"""
+      );
+
+      String jsonPayload = """
+          {
+            "f_int": 123,
+            "f_long": 4294967294,
+            "f_string": "string here",
+            "f_boolean": true,
+            "f_float": 123.1,
+            "f_double": 123456.123456,
+            "f_enum": "SPADES",
+            "f_fixed": "\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0004Ò",
+            "f_bytes": "\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\t)"
+          }
+          """;
+
+      var converted = convertJsonToAvro(jsonPayload, schema);
+      assertThat(converted).isInstanceOf(GenericData.Record.class);
+
+      var record = (GenericData.Record) converted;
+      assertThat(record.get("f_int")).isEqualTo(123);
+      assertThat(record.get("f_long")).isEqualTo(4294967294L);
+      assertThat(record.get("f_string")).isEqualTo("string here");
+      assertThat(record.get("f_boolean")).isEqualTo(true);
+      assertThat(record.get("f_float")).isEqualTo(123.1f);
+      assertThat(record.get("f_double")).isEqualTo(123456.123456);
+      assertThat(record.get("f_enum"))
+          .isEqualTo(
+              new GenericData.EnumSymbol(
+                  schema.getField("f_enum").schema(),
+                  "SPADES"
+              )
+          );
+      assertThat(((GenericData.Fixed) record.get("f_fixed")).bytes()).isEqualTo(Longs.toByteArray(1234L));
+      assertThat(((ByteBuffer) record.get("f_bytes")).array()).isEqualTo(Longs.toByteArray(2345L));
+    }
+
+    @Test
+    void unionRoot() {
+      var schema = createSchema("[ \"null\", \"string\", \"int\" ]");
+
+      var converted = convertJsonToAvro("{\"string\":\"string here\"}", schema);
+      assertThat(converted).isEqualTo("string here");
+
+      converted = convertJsonToAvro("{\"int\": 123}", schema);
+      assertThat(converted).isEqualTo(123);
+
+      converted = convertJsonToAvro("null", schema);
+      assertThat(converted).isEqualTo(null);
+    }
+
+    @Test
+    void unionField() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "namespace": "com.test",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "f_union",
+                     "type": [ "null", "int", "TestAvroRecord"]
+                   }
+                 ]
+              }"""
+      );
+
+      String jsonPayload = "{ \"f_union\": null }";
+
+      var record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
+      assertThat(record.get("f_union")).isNull();
+
+      jsonPayload = "{ \"f_union\": { \"int\": 123 } }";
+      record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
+      assertThat(record.get("f_union")).isEqualTo(123);
+
+      //inner-record's name should be fully-qualified!
+      jsonPayload = "{ \"f_union\": { \"com.test.TestAvroRecord\": { \"f_union\": { \"int\": 123  } } } }";
+      record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
+      assertThat(record.get("f_union")).isInstanceOf(GenericData.Record.class);
+      var innerRec = (GenericData.Record) record.get("f_union");
+      assertThat(innerRec.get("f_union")).isEqualTo(123);
+    }
+
+    @Test
+    void mapField() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "long_map",
+                     "type": {
+                       "type": "map",
+                       "values" : "long",
+                       "default": {}
+                     }
+                   },
+                   {
+                     "name": "string_map",
+                     "type": {
+                       "type": "map",
+                       "values" : "string",
+                       "default": {}
+                     }
+                   },
+                   {
+                     "name": "self_ref_map",
+                     "type": {
+                       "type": "map",
+                       "values" : "TestAvroRecord",
+                       "default": {}
+                     }
+                   }
+                 ]
+              }"""
+      );
+
+      String jsonPayload = """
+          {
+            "long_map": {
+              "k1": 123,
+              "k2": 456
+            },
+            "string_map": {
+              "k3": "s1",
+              "k4": "s2"
+            },
+            "self_ref_map": {
+              "k5" : {
+                "long_map": { "_k1": 222 },
+                "string_map": { "_k2": "_s1" }
+              }
+            }
+          }
+          """;
+
+      var record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
+      assertThat(record.get("long_map"))
+          .isEqualTo(Map.of("k1", 123L, "k2", 456L));
+      assertThat(record.get("string_map"))
+          .isEqualTo(Map.of("k3", "s1", "k4", "s2"));
+      assertThat(record.get("self_ref_map"))
+          .isNotNull();
+
+      Map<String, Object> selfRefMapField = (Map<String, Object>) record.get("self_ref_map");
+      assertThat(selfRefMapField)
+          .hasSize(1)
+          .hasEntrySatisfying("k5", v -> {
+            assertThat(v).isInstanceOf(GenericData.Record.class);
+            var innerRec = (GenericData.Record) v;
+            assertThat(innerRec.get("long_map"))
+                .isEqualTo(Map.of("_k1", 222L));
+            assertThat(innerRec.get("string_map"))
+                .isEqualTo(Map.of("_k2", "_s1"));
+          });
+    }
+
+    @Test
+    void arrayField() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "f_array",
+                     "type": {
+                        "type": "array",
+                        "items" : "string",
+                        "default": []
+                      }
+                   }
+                 ]
+              }"""
+      );
+
+      String jsonPayload = """
+          {
+            "f_array": [ "e1", "e2" ]
+          }
+          """;
+
+      var record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
+      assertThat(record.get("f_array")).isEqualTo(List.of("e1", "e2"));
+    }
+
+    @Test
+    void logicalTypesField() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "lt_date",
+                     "type": { "type": "int", "logicalType": "date" }
+                   },
+                   {
+                     "name": "lt_uuid",
+                     "type": { "type": "string", "logicalType": "uuid" }
+                   },
+                   {
+                     "name": "lt_decimal",
+                     "type": { "type": "bytes", "logicalType": "decimal", "precision": 22, "scale":10 }
+                   },
+                   {
+                     "name": "lt_time_millis",
+                     "type": { "type": "int", "logicalType": "time-millis"}
+                   },
+                   {
+                     "name": "lt_time_micros",
+                     "type": { "type": "long", "logicalType": "time-micros"}
+                   },
+                   {
+                     "name": "lt_timestamp_millis",
+                     "type": { "type": "long", "logicalType": "timestamp-millis" }
+                   },
+                   {
+                     "name": "lt_timestamp_micros",
+                     "type": { "type": "long", "logicalType": "timestamp-micros" }
+                   },
+                   {
+                     "name": "lt_local_timestamp_millis",
+                     "type": { "type": "long", "logicalType": "local-timestamp-millis" }
+                   },
+                   {
+                     "name": "lt_local_timestamp_micros",
+                     "type": { "type": "long", "logicalType": "local-timestamp-micros" }
+                   }
+                 ]
+              }"""
+      );
+
+      String jsonPayload = """
+          {
+            "lt_date":"1991-08-14",
+            "lt_decimal": 2.1617413862327545E11,
+            "lt_time_millis": "10:15:30.001",
+            "lt_time_micros": "10:15:30.123456",
+            "lt_uuid": "a37b75ca-097c-5d46-6119-f0637922e908",
+            "lt_timestamp_millis": "2007-12-03T10:15:30.123Z",
+            "lt_timestamp_micros": "2007-12-13T10:15:30.123456Z",
+            "lt_local_timestamp_millis": "2017-12-03T10:15:30.123",
+            "lt_local_timestamp_micros": "2017-12-13T10:15:30.123456"
+          }
+          """;
+
+      var converted = convertJsonToAvro(jsonPayload, schema);
+      assertThat(converted).isInstanceOf(GenericData.Record.class);
+
+      var record = (GenericData.Record) converted;
+
+      assertThat(record.get("lt_date"))
+          .isEqualTo(LocalDate.of(1991, 8, 14));
+      assertThat(record.get("lt_decimal"))
+          .isEqualTo(new BigDecimal("2.1617413862327545E11"));
+      assertThat(record.get("lt_time_millis"))
+          .isEqualTo(LocalTime.parse("10:15:30.001"));
+      assertThat(record.get("lt_time_micros"))
+          .isEqualTo(LocalTime.parse("10:15:30.123456"));
+      assertThat(record.get("lt_timestamp_millis"))
+          .isEqualTo(Instant.parse("2007-12-03T10:15:30.123Z"));
+      assertThat(record.get("lt_timestamp_micros"))
+          .isEqualTo(Instant.parse("2007-12-13T10:15:30.123456Z"));
+      assertThat(record.get("lt_local_timestamp_millis"))
+          .isEqualTo(LocalDateTime.parse("2017-12-03T10:15:30.123"));
+      assertThat(record.get("lt_local_timestamp_micros"))
+          .isEqualTo(LocalDateTime.parse("2017-12-13T10:15:30.123456"));
+    }
+  }
+
+  // checking conversion of KafkaAvroDeserializer output to JsonNode
+  @Nested
+  class FromAvroToJson {
+
+    @Test
+    void primitiveRoot() {
+      assertThat(convertAvroToJson("str", createSchema("\"string\"")))
+          .isEqualTo(new TextNode("str"));
+
+      assertThat(convertAvroToJson(123, createSchema("\"int\"")))
+          .isEqualTo(new IntNode(123));
+
+      assertThat(convertAvroToJson(123L, createSchema("\"long\"")))
+          .isEqualTo(new LongNode(123));
+
+      assertThat(convertAvroToJson(123.1F, createSchema("\"float\"")))
+          .isEqualTo(new FloatNode(123.1F));
+
+      assertThat(convertAvroToJson(123.1, createSchema("\"double\"")))
+          .isEqualTo(new DoubleNode(123.1));
+
+      assertThat(convertAvroToJson(true, createSchema("\"boolean\"")))
+          .isEqualTo(BooleanNode.valueOf(true));
+
+      assertThat(convertAvroToJson(ByteBuffer.wrap(Longs.toByteArray(123L)), createSchema("\"bytes\"")))
+          .isEqualTo(new TextNode(new String(Longs.toByteArray(123L), StandardCharsets.ISO_8859_1)));
+    }
+
+    @SneakyThrows
+    @Test
+    void primitiveTypedFields() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "f_int",
+                     "type": "int"
+                   },
+                   {
+                     "name": "f_long",
+                     "type": "long"
+                   },
+                   {
+                     "name": "f_string",
+                     "type": "string"
+                   },
+                   {
+                     "name": "f_boolean",
+                     "type": "boolean"
+                   },
+                   {
+                     "name": "f_float",
+                     "type": "float"
+                   },
+                   {
+                     "name": "f_double",
+                     "type": "double"
+                   },
+                   {
+                     "name": "f_enum",
+                     "type" : {
+                      "type": "enum",
+                      "name": "Suit",
+                      "symbols" : ["SPADES", "HEARTS", "DIAMONDS", "CLUBS"]
+                     }
+                   },
+                   {
+                     "name" : "f_fixed",
+                     "type" : { "type" : "fixed" ,"size" : 8, "name": "long_encoded" }
+                   },
+                   {
+                     "name" : "f_bytes",
+                     "type": "bytes"
+                   }
+                 ]
+              }"""
+      );
+
+      byte[] fixedFieldValue = Longs.toByteArray(1234L);
+      byte[] bytesFieldValue = Longs.toByteArray(2345L);
+
+      GenericData.Record inputRecord = new GenericData.Record(schema);
+      inputRecord.put("f_int", 123);
+      inputRecord.put("f_long", 4294967294L);
+      inputRecord.put("f_string", "string here");
+      inputRecord.put("f_boolean", true);
+      inputRecord.put("f_float", 123.1f);
+      inputRecord.put("f_double", 123456.123456);
+      inputRecord.put("f_enum", new GenericData.EnumSymbol(schema.getField("f_enum").schema(), "SPADES"));
+      inputRecord.put("f_fixed", new GenericData.Fixed(schema.getField("f_fixed").schema(), fixedFieldValue));
+      inputRecord.put("f_bytes", ByteBuffer.wrap(bytesFieldValue));
+
+      String expectedJson = """
+          {
+            "f_int": 123,
+            "f_long": 4294967294,
+            "f_string": "string here",
+            "f_boolean": true,
+            "f_float": 123.1,
+            "f_double": 123456.123456,
+            "f_enum": "SPADES",
+            "f_fixed": "\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0004Ò",
+            "f_bytes": "\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\t)"
+          }
+          """;
+
+      assertJsonsEqual(expectedJson, convertAvroToJson(inputRecord, schema));
+    }
+
+    @Test
+    void logicalTypesField() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "lt_date",
+                     "type": { "type": "int", "logicalType": "date" }
+                   },
+                   {
+                     "name": "lt_uuid",
+                     "type": { "type": "string", "logicalType": "uuid" }
+                   },
+                   {
+                     "name": "lt_decimal",
+                     "type": { "type": "bytes", "logicalType": "decimal", "precision": 22, "scale":10 }
+                   },
+                   {
+                     "name": "lt_time_millis",
+                     "type": { "type": "int", "logicalType": "time-millis"}
+                   },
+                   {
+                     "name": "lt_time_micros",
+                     "type": { "type": "long", "logicalType": "time-micros"}
+                   },
+                   {
+                     "name": "lt_timestamp_millis",
+                     "type": { "type": "long", "logicalType": "timestamp-millis" }
+                   },
+                   {
+                     "name": "lt_timestamp_micros",
+                     "type": { "type": "long", "logicalType": "timestamp-micros" }
+                   },
+                   {
+                     "name": "lt_local_timestamp_millis",
+                     "type": { "type": "long", "logicalType": "local-timestamp-millis" }
+                   },
+                   {
+                     "name": "lt_local_timestamp_micros",
+                     "type": { "type": "long", "logicalType": "local-timestamp-micros" }
+                   }
+                 ]
+              }"""
+      );
+
+      GenericData.Record inputRecord = new GenericData.Record(schema);
+      inputRecord.put("lt_date", LocalDate.of(1991, 8, 14));
+      inputRecord.put("lt_uuid", UUID.fromString("a37b75ca-097c-5d46-6119-f0637922e908"));
+      inputRecord.put("lt_decimal", new BigDecimal("2.16"));
+      inputRecord.put("lt_time_millis", LocalTime.parse("10:15:30.001"));
+      inputRecord.put("lt_time_micros", LocalTime.parse("10:15:30.123456"));
+      inputRecord.put("lt_timestamp_millis", Instant.parse("2007-12-03T10:15:30.123Z"));
+      inputRecord.put("lt_timestamp_micros", Instant.parse("2007-12-13T10:15:30.123456Z"));
+      inputRecord.put("lt_local_timestamp_millis", LocalDateTime.parse("2017-12-03T10:15:30.123"));
+      inputRecord.put("lt_local_timestamp_micros", LocalDateTime.parse("2017-12-13T10:15:30.123456"));
+
+      String expectedJson = """
+          {
+            "lt_date":"1991-08-14",
+            "lt_uuid": "a37b75ca-097c-5d46-6119-f0637922e908",
+            "lt_decimal": 2.16,
+            "lt_time_millis": "10:15:30.001",
+            "lt_time_micros": "10:15:30.123456",
+            "lt_timestamp_millis": "2007-12-03T10:15:30.123Z",
+            "lt_timestamp_micros": "2007-12-13T10:15:30.123456Z",
+            "lt_local_timestamp_millis": "2017-12-03T10:15:30.123",
+            "lt_local_timestamp_micros": "2017-12-13T10:15:30.123456"
+          }
+          """;
+
+      assertJsonsEqual(expectedJson, convertAvroToJson(inputRecord, schema));
+    }
+
+    @Test
+    void unionField() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "namespace": "com.test",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "f_union",
+                     "type": [ "null", "int", "TestAvroRecord"]
+                   }
+                 ]
+              }"""
+      );
+
+      var r = new GenericData.Record(schema);
+      r.put("f_union", null);
+      assertJsonsEqual(" {}", convertAvroToJson(r, schema));
+
+      r = new GenericData.Record(schema);
+      r.put("f_union", 123);
+      assertJsonsEqual(" { \"f_union\" : { \"int\" : 123 } }", convertAvroToJson(r, schema));
+
+
+      r = new GenericData.Record(schema);
+      var innerRec = new GenericData.Record(schema);
+      innerRec.put("f_union", 123);
+      r.put("f_union", innerRec);
+      assertJsonsEqual(
+          " { \"f_union\" : { \"com.test.TestAvroRecord\" : { \"f_union\" : { \"int\" : 123 } } } }",
+          convertAvroToJson(r, schema)
+      );
+    }
+
+  }
+
+  private Schema createSchema(String schema) {
+    return new AvroSchema(schema).rawSchema();
+  }
+
+  @SneakyThrows
+  private void assertJsonsEqual(String expectedJson, JsonNode actual) {
+    var mapper = new JsonMapper();
+    assertThat(actual.toPrettyString())
+        .isEqualTo(mapper.readTree(expectedJson).toPrettyString());
+  }
+
+}

From 100bb1dac6b79c92fdb40d4ddab8e16970a99e77 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 12 Jun 2023 11:35:38 +0300
Subject: [PATCH 599/734] [e2e] Checking Broker's config search - non-first
 page results (#3928)

---
 .../provectus/kafka/ui/pages/BasePage.java    |  5 +++
 .../ui/pages/brokers/BrokersConfigTab.java    |  7 ++++
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 11 +----
 .../ui/smokesuite/brokers/BrokersTest.java    | 42 +++++++++++++++----
 4 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
index d2e201191ab..8d0841b4407 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/BasePage.java
@@ -28,6 +28,7 @@ public abstract class BasePage extends WebUtils {
   protected SelenideElement confirmBtn = $x("//button[contains(text(),'Confirm')]");
   protected SelenideElement cancelBtn = $x("//button[contains(text(),'Cancel')]");
   protected SelenideElement backBtn = $x("//button[contains(text(),'Back')]");
+  protected SelenideElement previousBtn = $x("//button[contains(text(),'Previous')]");
   protected SelenideElement nextBtn = $x("//button[contains(text(),'Next')]");
   protected ElementsCollection ddlOptions = $$x("//li[@value]");
   protected ElementsCollection gridItems = $$x("//tr[@class]");
@@ -75,6 +76,10 @@ protected void clickBackBtn() {
     clickByJavaScript(backBtn);
   }
 
+  protected void clickPreviousBtn() {
+    clickByJavaScript(previousBtn);
+  }
+
   protected void setJsonInputValue(SelenideElement jsonInput, String jsonConfig) {
     sendKeysByActions(jsonInput, jsonConfig.replace("  ", ""));
     new Actions(WebDriverRunner.getWebDriver())
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
index cf0dce73218..a9e146002ec 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
@@ -66,6 +66,13 @@ public BrokersConfigTab clickNextButton() {
     return this;
   }
 
+  @Step
+  public BrokersConfigTab clickPreviousButton() {
+    clickPreviousBtn();
+    waitUntilSpinnerDisappear(1);
+    return this;
+  }
+
   private List<BrokersConfigTab.BrokersConfigItem> initGridItems() {
     List<BrokersConfigTab.BrokersConfigItem> gridItemList = new ArrayList<>();
     gridItems.shouldHave(CollectionCondition.sizeGreaterThan(0))
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index c52db3c1b3c..f4cacc25207 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -64,24 +64,17 @@ public void testCaseF() {
   public void testCaseG() {
   }
 
-  @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = BROKERS_SUITE_ID)
-  @QaseId(350)
-  @Test
-  public void testCaseH() {
-  }
-
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = TOPICS_SUITE_ID)
   @QaseId(50)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(351)
   @Test
-  public void testCaseJ() {
+  public void testCaseI() {
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
index e4a4f9f90c9..663018cbc3b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
@@ -50,11 +50,11 @@ public void checkExistingBrokersInCluster() {
   @Issue("https://github.com/provectus/kafka-ui/issues/3347")
   @QaseId(330)
   @Test
-  public void brokersConfigSearchCheck() {
+  public void brokersConfigFirstPageSearchCheck() {
     navigateToBrokersAndOpenDetails(DEFAULT_BROKER_ID);
     brokersDetails
         .openDetailsTab(CONFIGS);
-    String anyConfigKey = brokersConfigTab
+    String anyConfigKeyFirstPage = brokersConfigTab
         .getAllConfigs().stream()
         .findAny().orElseThrow()
         .getKey();
@@ -62,14 +62,42 @@ public void brokersConfigSearchCheck() {
         .clickNextButton();
     Assert.assertFalse(brokersConfigTab.getAllConfigs().stream()
             .map(BrokersConfigTab.BrokersConfigItem::getKey)
-            .toList().contains(anyConfigKey),
-        String.format("getAllConfigs().contains(%s)", anyConfigKey));
+            .toList().contains(anyConfigKeyFirstPage),
+        String.format("getAllConfigs().contains(%s)", anyConfigKeyFirstPage));
     brokersConfigTab
-        .searchConfig(anyConfigKey);
+        .searchConfig(anyConfigKeyFirstPage);
     Assert.assertTrue(brokersConfigTab.getAllConfigs().stream()
             .map(BrokersConfigTab.BrokersConfigItem::getKey)
-            .toList().contains(anyConfigKey),
-        String.format("getAllConfigs().contains(%s)", anyConfigKey));
+            .toList().contains(anyConfigKeyFirstPage),
+        String.format("getAllConfigs().contains(%s)", anyConfigKeyFirstPage));
+  }
+
+  @Ignore
+  @Issue("https://github.com/provectus/kafka-ui/issues/3347")
+  @QaseId(350)
+  @Test
+  public void brokersConfigSecondPageSearchCheck() {
+    navigateToBrokersAndOpenDetails(DEFAULT_BROKER_ID);
+    brokersDetails
+        .openDetailsTab(CONFIGS);
+    brokersConfigTab
+        .clickNextButton();
+    String anyConfigKeySecondPage = brokersConfigTab
+        .getAllConfigs().stream()
+        .findAny().orElseThrow()
+        .getKey();
+    brokersConfigTab
+        .clickPreviousButton();
+    Assert.assertFalse(brokersConfigTab.getAllConfigs().stream()
+            .map(BrokersConfigTab.BrokersConfigItem::getKey)
+            .toList().contains(anyConfigKeySecondPage),
+        String.format("getAllConfigs().contains(%s)", anyConfigKeySecondPage));
+    brokersConfigTab
+        .searchConfig(anyConfigKeySecondPage);
+    Assert.assertTrue(brokersConfigTab.getAllConfigs().stream()
+            .map(BrokersConfigTab.BrokersConfigItem::getKey)
+            .toList().contains(anyConfigKeySecondPage),
+        String.format("getAllConfigs().contains(%s)", anyConfigKeySecondPage));
   }
 
   @QaseId(331)

From 03b7d1bd60d78fac83a8725ef1d15e47df4f089f Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 14 Jun 2023 05:29:22 +0400
Subject: [PATCH 600/734] BE: Fix sanitizing on KC null values config entries
 (#3937)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../ui/service/KafkaConfigSanitizer.java      | 17 +++++++----
 .../kafka/ui/service/KafkaConnectService.java | 19 +++----------
 .../ui/service/KafkaConfigSanitizerTest.java  | 28 ++++++++++++++++---
 3 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java
index 375afb0fefd..b4cdf144c9f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConfigSanitizer.java
@@ -5,11 +5,13 @@
 import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.common.config.SaslConfigs;
 import org.apache.kafka.common.config.SslConfigs;
@@ -17,7 +19,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
-class KafkaConfigSanitizer  {
+class KafkaConfigSanitizer {
 
   private static final String SANITIZED_VALUE = "******";
 
@@ -65,10 +67,8 @@ private static Set<String> kafkaConfigKeysToSanitize() {
         .collect(Collectors.toSet());
   }
 
-  public Object sanitize(String key, Object value) {
-    if (value == null) {
-      return null;
-    }
+  @Nullable
+  public Object sanitize(String key, @Nullable Object value) {
     for (Pattern pattern : sanitizeKeysPatterns) {
       if (pattern.matcher(key).matches()) {
         return SANITIZED_VALUE;
@@ -77,5 +77,12 @@ public Object sanitize(String key, Object value) {
     return value;
   }
 
+  public Map<String, Object> sanitizeConnectorConfig(@Nullable Map<String, Object> original) {
+    var result = new HashMap<String, Object>(); //null-values supporting map!
+    if (original != null) {
+      original.forEach((k, v) -> result.put(k, sanitize(k, v)));
+    }
+    return result;
+  }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
index 98b61541c5f..390348707d3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
@@ -24,7 +24,6 @@
 import com.provectus.kafka.ui.model.TaskDTO;
 import com.provectus.kafka.ui.model.connect.InternalConnectInfo;
 import com.provectus.kafka.ui.util.ReactiveFailover;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -176,19 +175,14 @@ public Mono<ConnectorDTO> getConnector(KafkaCluster cluster, String connectName,
                         e -> emptyStatus(connectorName))
                     .map(connectorStatus -> {
                       var status = connectorStatus.getConnector();
-                      final Map<String, Object> obfuscatedConfig = connector.getConfig().entrySet()
-                          .stream()
-                          .collect(Collectors.toMap(
-                              Map.Entry::getKey,
-                              e -> kafkaConfigSanitizer.sanitize(e.getKey(), e.getValue())
-                          ));
-                      ConnectorDTO result = (ConnectorDTO) new ConnectorDTO()
+                      var sanitizedConfig = kafkaConfigSanitizer.sanitizeConnectorConfig(connector.getConfig());
+                      ConnectorDTO result = new ConnectorDTO()
                           .connect(connectName)
                           .status(kafkaConnectMapper.fromClient(status))
                           .type(connector.getType())
                           .tasks(connector.getTasks())
                           .name(connector.getName())
-                          .config(obfuscatedConfig);
+                          .config(sanitizedConfig);
 
                       if (connectorStatus.getTasks() != null) {
                         boolean isAnyTaskFailed = connectorStatus.getTasks().stream()
@@ -217,12 +211,7 @@ public Mono<Map<String, Object>> getConnectorConfig(KafkaCluster cluster, String
                                                       String connectorName) {
     return api(cluster, connectName)
         .mono(c -> c.getConnectorConfig(connectorName))
-        .map(connectorConfig -> {
-          final Map<String, Object> obfuscatedMap = new HashMap<>();
-          connectorConfig.forEach((key, value) ->
-              obfuscatedMap.put(key, kafkaConfigSanitizer.sanitize(key, value)));
-          return obfuscatedMap;
-        });
+        .map(kafkaConfigSanitizer::sanitizeConnectorConfig);
   }
 
   public Mono<ConnectorDTO> setConnectorConfig(KafkaCluster cluster, String connectName,
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java
index 6454cd9f2a4..9cab6b2f13f 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/KafkaConfigSanitizerTest.java
@@ -3,14 +3,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
-import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 
 class KafkaConfigSanitizerTest {
 
   @Test
   void doNothingIfEnabledPropertySetToFalse() {
-    final var sanitizer = new KafkaConfigSanitizer(false, Collections.emptyList());
+    final var sanitizer = new KafkaConfigSanitizer(false, List.of());
     assertThat(sanitizer.sanitize("password", "secret")).isEqualTo("secret");
     assertThat(sanitizer.sanitize("sasl.jaas.config", "secret")).isEqualTo("secret");
     assertThat(sanitizer.sanitize("database.password", "secret")).isEqualTo("secret");
@@ -18,7 +20,7 @@ void doNothingIfEnabledPropertySetToFalse() {
 
   @Test
   void obfuscateCredentials() {
-    final var sanitizer = new KafkaConfigSanitizer(true, Collections.emptyList());
+    final var sanitizer = new KafkaConfigSanitizer(true, List.of());
     assertThat(sanitizer.sanitize("sasl.jaas.config", "secret")).isEqualTo("******");
     assertThat(sanitizer.sanitize("consumer.sasl.jaas.config", "secret")).isEqualTo("******");
     assertThat(sanitizer.sanitize("producer.sasl.jaas.config", "secret")).isEqualTo("******");
@@ -36,7 +38,7 @@ void obfuscateCredentials() {
 
   @Test
   void notObfuscateNormalConfigs() {
-    final var sanitizer = new KafkaConfigSanitizer(true, Collections.emptyList());
+    final var sanitizer = new KafkaConfigSanitizer(true, List.of());
     assertThat(sanitizer.sanitize("security.protocol", "SASL_SSL")).isEqualTo("SASL_SSL");
     final String[] bootstrapServer = new String[] {"test1:9092", "test2:9092"};
     assertThat(sanitizer.sanitize("bootstrap.servers", bootstrapServer)).isEqualTo(bootstrapServer);
@@ -52,4 +54,22 @@ void obfuscateCredentialsWithDefinedPatterns() {
     assertThat(sanitizer.sanitize("database.password", "no longer credential"))
             .isEqualTo("no longer credential");
   }
+
+  @Test
+  void sanitizeConnectorConfigDoNotFailOnNullableValues() {
+    Map<String, Object> originalConfig = new HashMap<>();
+    originalConfig.put("password", "secret");
+    originalConfig.put("asIs", "normal");
+    originalConfig.put("nullVal", null);
+
+    var sanitizedConfig = new KafkaConfigSanitizer(true, List.of())
+        .sanitizeConnectorConfig(originalConfig);
+
+    assertThat(sanitizedConfig)
+        .hasSize(3)
+        .containsEntry("password", "******")
+        .containsEntry("asIs", "normal")
+        .containsEntry("nullVal", null);
+  }
+
 }

From 20bb274f0ed15f15029960a6373c61592ab1aeeb Mon Sep 17 00:00:00 2001
From: David Bejanyan <58771979+David-DB88@users.noreply.github.com>
Date: Fri, 16 Jun 2023 08:38:37 +0400
Subject: [PATCH 601/734] FE: Redirect the user to the wizard page (#3655)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../PageContainer/PageContainer.tsx           | 27 ++++++++-
 .../__tests__/PageContainer.spec.tsx          | 57 ++++++++++++++-----
 kafka-ui-react-app/src/lib/testHelpers.tsx    |  8 ++-
 3 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
index a5697e89abd..fd52331f921 100644
--- a/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
+++ b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
@@ -1,9 +1,14 @@
-import React, { PropsWithChildren } from 'react';
-import { useLocation } from 'react-router-dom';
+import React, { PropsWithChildren, useEffect, useMemo } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
 import NavBar from 'components/NavBar/NavBar';
 import * as S from 'components/PageContainer/PageContainer.styled';
 import Nav from 'components/Nav/Nav';
 import useBoolean from 'lib/hooks/useBoolean';
+import { clusterNewConfigPath } from 'lib/paths';
+import { GlobalSettingsContext } from 'components/contexts/GlobalSettingsContext';
+import { useClusters } from 'lib/hooks/api/clusters';
+import { ResourceType } from 'generated-sources';
+import { useGetUserInfo } from 'lib/hooks/api/roles';
 
 const PageContainer: React.FC<
   PropsWithChildren<{ setDarkMode: (value: boolean) => void }>
@@ -13,12 +18,30 @@ const PageContainer: React.FC<
     toggle,
     setFalse: closeSidebar,
   } = useBoolean(false);
+  const clusters = useClusters();
+  const appInfo = React.useContext(GlobalSettingsContext);
   const location = useLocation();
+  const navigate = useNavigate();
+  const { data: authInfo } = useGetUserInfo();
 
   React.useEffect(() => {
     closeSidebar();
   }, [location, closeSidebar]);
 
+  const hasApplicationPermissions = useMemo(() => {
+    if (!authInfo?.rbacEnabled) return true;
+    return !!authInfo?.userInfo?.permissions.some(
+      (permission) => permission.resource === ResourceType.APPLICATIONCONFIG
+    );
+  }, [authInfo]);
+
+  useEffect(() => {
+    if (!appInfo.hasDynamicConfig) return;
+    if (clusters?.data?.length !== 0) return;
+    if (!hasApplicationPermissions) return;
+    navigate(clusterNewConfigPath);
+  }, [clusters?.data, appInfo.hasDynamicConfig]);
+
   return (
     <>
       <NavBar onBurgerClick={toggle} setDarkMode={setDarkMode} />
diff --git a/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx b/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx
index 25f8fe0a2ab..ca91cd20783 100644
--- a/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx
+++ b/kafka-ui-react-app/src/components/PageContainer/__tests__/PageContainer.spec.tsx
@@ -4,21 +4,24 @@ import userEvent from '@testing-library/user-event';
 import { render } from 'lib/testHelpers';
 import PageContainer from 'components/PageContainer/PageContainer';
 import { useClusters } from 'lib/hooks/api/clusters';
+import { Cluster, ServerStatus } from 'generated-sources';
 
 const burgerButtonOptions = { name: 'burger' };
 
-jest.mock('lib/hooks/api/clusters', () => ({
-  ...jest.requireActual('lib/hooks/api/roles'),
-  useClusters: jest.fn(),
-}));
-
 jest.mock('components/Version/Version', () => () => <div>Version</div>);
-
+interface DataType {
+  data: Cluster[] | undefined;
+}
+jest.mock('lib/hooks/api/clusters');
+const mockedNavigate = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockedNavigate,
+}));
 describe('Page Container', () => {
-  beforeEach(() => {
-    (useClusters as jest.Mock).mockImplementation(() => ({
-      isSuccess: false,
-    }));
+  const renderComponent = (hasDynamicConfig: boolean, data: DataType) => {
+    const useClustersMock = useClusters as jest.Mock;
+    useClustersMock.mockReturnValue(data);
     Object.defineProperty(window, 'matchMedia', {
       writable: true,
       value: jest.fn().mockImplementation(() => ({
@@ -26,15 +29,18 @@ describe('Page Container', () => {
         addListener: jest.fn(),
       })),
     });
-
     render(
       <PageContainer setDarkMode={jest.fn()}>
         <div>child</div>
-      </PageContainer>
+      </PageContainer>,
+      {
+        globalSettings: { hasDynamicConfig },
+      }
     );
-  });
+  };
 
   it('handle burger click correctly', async () => {
+    renderComponent(false, { data: undefined });
     const burger = within(screen.getByLabelText('Page Header')).getByRole(
       'button',
       burgerButtonOptions
@@ -49,6 +55,31 @@ describe('Page Container', () => {
   });
 
   it('render the inner container', async () => {
+    renderComponent(false, { data: undefined });
     expect(screen.getByText('child')).toBeInTheDocument();
   });
+
+  describe('Redirect to the Wizard page', () => {
+    it('redirects to new cluster configuration page if there are no clusters and dynamic config is enabled', async () => {
+      await renderComponent(true, { data: [] });
+
+      expect(mockedNavigate).toHaveBeenCalled();
+    });
+
+    it('should not navigate to new cluster config page when there are clusters', async () => {
+      await renderComponent(true, {
+        data: [{ name: 'Cluster 1', status: ServerStatus.ONLINE }],
+      });
+
+      expect(mockedNavigate).not.toHaveBeenCalled();
+    });
+
+    it('should not navigate to new cluster config page when there are no clusters and hasDynamicConfig is false', async () => {
+      await renderComponent(false, {
+        data: [],
+      });
+
+      expect(mockedNavigate).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/kafka-ui-react-app/src/lib/testHelpers.tsx b/kafka-ui-react-app/src/lib/testHelpers.tsx
index 508904d1466..06fcfcad495 100644
--- a/kafka-ui-react-app/src/lib/testHelpers.tsx
+++ b/kafka-ui-react-app/src/lib/testHelpers.tsx
@@ -39,6 +39,9 @@ interface CustomRenderOptions extends Omit<RenderOptions, 'wrapper'> {
     roles?: RolesType;
     rbacFlag: boolean;
   };
+  globalSettings?: {
+    hasDynamicConfig: boolean;
+  };
 }
 
 interface WithRouteProps {
@@ -111,6 +114,7 @@ const customRender = (
     }),
     initialEntries,
     userInfo,
+    globalSettings,
     ...renderOptions
   }: CustomRenderOptions = {}
 ) => {
@@ -119,7 +123,9 @@ const customRender = (
     children,
   }) => (
     <TestQueryClientProvider>
-      <GlobalSettingsContext.Provider value={{ hasDynamicConfig: false }}>
+      <GlobalSettingsContext.Provider
+        value={globalSettings || { hasDynamicConfig: false }}
+      >
         <ThemeProvider theme={theme}>
           <TestUserInfoProvider data={userInfo}>
             <ConfirmContextProvider>

From 5d23f2a4ed9b4ff0488bfb99a29b19b8acfb8608 Mon Sep 17 00:00:00 2001
From: Azat Belgibayev <belg.azat@gmail.com>
Date: Fri, 16 Jun 2023 07:42:35 +0300
Subject: [PATCH 602/734] FE: Fix KSQL syntax color theme in dark mode (#3941)

+ Refactor theme selection mechanism
---
 kafka-ui-react-app/src/components/App.tsx     |  7 ++-
 .../src/components/NavBar/NavBar.tsx          | 48 ++-------------
 .../PageContainer/PageContainer.tsx           |  6 +-
 .../components/common/SQLEditor/SQLEditor.tsx |  8 ++-
 .../components/contexts/ThemeModeContext.tsx  | 58 +++++++++++++++++++
 kafka-ui-react-app/src/index.tsx              |  5 +-
 6 files changed, 80 insertions(+), 52 deletions(-)
 create mode 100644 kafka-ui-react-app/src/components/contexts/ThemeModeContext.tsx

diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 44409c403ab..0c06a6fddd6 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -1,4 +1,4 @@
-import React, { Suspense } from 'react';
+import React, { Suspense, useContext } from 'react';
 import { Routes, Route, Navigate } from 'react-router-dom';
 import {
   accessErrorPage,
@@ -18,6 +18,7 @@ import { Toaster } from 'react-hot-toast';
 import GlobalCSS from 'components/globalCss';
 import * as S from 'components/App.styled';
 import ClusterConfigForm from 'widgets/ClusterConfigForm';
+import { ThemeModeContext } from 'components/contexts/ThemeModeContext';
 
 import ConfirmationModal from './common/ConfirmationModal/ConfirmationModal';
 import { ConfirmContextProvider } from './contexts/ConfirmContext';
@@ -42,7 +43,7 @@ const queryClient = new QueryClient({
   },
 });
 const App: React.FC = () => {
-  const [isDarkMode, setDarkMode] = React.useState<boolean>(false);
+  const { isDarkMode } = useContext(ThemeModeContext);
 
   return (
     <QueryClientProvider client={queryClient}>
@@ -53,7 +54,7 @@ const App: React.FC = () => {
               <ConfirmContextProvider>
                 <GlobalCSS />
                 <S.Layout>
-                  <PageContainer setDarkMode={setDarkMode}>
+                  <PageContainer>
                     <Routes>
                       {['/', '/ui', '/ui/clusters'].map((path) => (
                         <Route
diff --git a/kafka-ui-react-app/src/components/NavBar/NavBar.tsx b/kafka-ui-react-app/src/components/NavBar/NavBar.tsx
index 2e363501288..4744eb0bffe 100644
--- a/kafka-ui-react-app/src/components/NavBar/NavBar.tsx
+++ b/kafka-ui-react-app/src/components/NavBar/NavBar.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import Select from 'components/common/Select/Select';
 import Logo from 'components/common/Logo/Logo';
 import Version from 'components/Version/Version';
@@ -7,16 +7,16 @@ import DiscordIcon from 'components/common/Icons/DiscordIcon';
 import AutoIcon from 'components/common/Icons/AutoIcon';
 import SunIcon from 'components/common/Icons/SunIcon';
 import MoonIcon from 'components/common/Icons/MoonIcon';
+import { ThemeModeContext } from 'components/contexts/ThemeModeContext';
 
 import UserInfo from './UserInfo/UserInfo';
 import * as S from './NavBar.styled';
 
 interface Props {
   onBurgerClick: () => void;
-  setDarkMode: (value: boolean) => void;
 }
 
-type ThemeDropDownValue = 'auto_theme' | 'light_theme' | 'dark_theme';
+export type ThemeDropDownValue = 'auto_theme' | 'light_theme' | 'dark_theme';
 
 const options = [
   {
@@ -48,44 +48,8 @@ const options = [
   },
 ];
 
-const NavBar: React.FC<Props> = ({ onBurgerClick, setDarkMode }) => {
-  const matchDark = window.matchMedia('(prefers-color-scheme: dark)');
-  const [themeMode, setThemeMode] = React.useState<ThemeDropDownValue>();
-
-  React.useLayoutEffect(() => {
-    const mode = localStorage.getItem('mode');
-    if (mode) {
-      setThemeMode(mode as ThemeDropDownValue);
-      if (mode === 'auto_theme') {
-        setDarkMode(matchDark.matches);
-      } else if (mode === 'light_theme') {
-        setDarkMode(false);
-      } else if (mode === 'dark_theme') {
-        setDarkMode(true);
-      }
-    } else {
-      setThemeMode('auto_theme');
-    }
-  }, []);
-
-  React.useEffect(() => {
-    if (themeMode === 'auto_theme') {
-      setDarkMode(matchDark.matches);
-      matchDark.addListener((e) => {
-        setDarkMode(e.matches);
-      });
-    }
-  }, [matchDark, themeMode]);
-
-  const onChangeThemeMode = (value: string | number) => {
-    setThemeMode(value as ThemeDropDownValue);
-    localStorage.setItem('mode', value as string);
-    if (value === 'light_theme') {
-      setDarkMode(false);
-    } else if (value === 'dark_theme') {
-      setDarkMode(true);
-    }
-  };
+const NavBar: React.FC<Props> = ({ onBurgerClick }) => {
+  const { themeMode, setThemeMode } = useContext(ThemeModeContext);
 
   return (
     <S.Navbar role="navigation" aria-label="Page Header">
@@ -117,7 +81,7 @@ const NavBar: React.FC<Props> = ({ onBurgerClick, setDarkMode }) => {
         <Select
           options={options}
           value={themeMode}
-          onChange={onChangeThemeMode}
+          onChange={setThemeMode}
           isThemeMode
         />
         <S.SocialLink
diff --git a/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
index fd52331f921..41a7d3da9bd 100644
--- a/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
+++ b/kafka-ui-react-app/src/components/PageContainer/PageContainer.tsx
@@ -10,9 +10,7 @@ import { useClusters } from 'lib/hooks/api/clusters';
 import { ResourceType } from 'generated-sources';
 import { useGetUserInfo } from 'lib/hooks/api/roles';
 
-const PageContainer: React.FC<
-  PropsWithChildren<{ setDarkMode: (value: boolean) => void }>
-> = ({ children, setDarkMode }) => {
+const PageContainer: React.FC<PropsWithChildren<unknown>> = ({ children }) => {
   const {
     value: isSidebarVisible,
     toggle,
@@ -44,7 +42,7 @@ const PageContainer: React.FC<
 
   return (
     <>
-      <NavBar onBurgerClick={toggle} setDarkMode={setDarkMode} />
+      <NavBar onBurgerClick={toggle} />
       <S.Container>
         <S.Sidebar aria-label="Sidebar" $visible={isSidebarVisible}>
           <Nav />
diff --git a/kafka-ui-react-app/src/components/common/SQLEditor/SQLEditor.tsx b/kafka-ui-react-app/src/components/common/SQLEditor/SQLEditor.tsx
index a12170151e7..14433f06edd 100644
--- a/kafka-ui-react-app/src/components/common/SQLEditor/SQLEditor.tsx
+++ b/kafka-ui-react-app/src/components/common/SQLEditor/SQLEditor.tsx
@@ -3,7 +3,9 @@ import AceEditor, { IAceEditorProps } from 'react-ace';
 import 'ace-builds/src-noconflict/ace';
 import 'ace-builds/src-noconflict/mode-sql';
 import 'ace-builds/src-noconflict/theme-textmate';
-import React from 'react';
+import 'ace-builds/src-noconflict/theme-dracula';
+import React, { useContext } from 'react';
+import { ThemeModeContext } from 'components/contexts/ThemeModeContext';
 
 interface SQLEditorProps extends IAceEditorProps {
   isFixedHeight?: boolean;
@@ -12,11 +14,13 @@ interface SQLEditorProps extends IAceEditorProps {
 const SQLEditor = React.forwardRef<AceEditor | null, SQLEditorProps>(
   (props, ref) => {
     const { isFixedHeight, ...rest } = props;
+    const { isDarkMode } = useContext(ThemeModeContext);
+
     return (
       <AceEditor
         ref={ref}
         mode="sql"
-        theme="textmate"
+        theme={isDarkMode ? 'dracula' : 'textmate'}
         tabSize={2}
         width="100%"
         height={
diff --git a/kafka-ui-react-app/src/components/contexts/ThemeModeContext.tsx b/kafka-ui-react-app/src/components/contexts/ThemeModeContext.tsx
new file mode 100644
index 00000000000..5011dfe0813
--- /dev/null
+++ b/kafka-ui-react-app/src/components/contexts/ThemeModeContext.tsx
@@ -0,0 +1,58 @@
+import React, { useMemo } from 'react';
+import type { FC, PropsWithChildren } from 'react';
+import type { ThemeDropDownValue } from 'components/NavBar/NavBar';
+
+interface ThemeModeContextProps {
+  isDarkMode: boolean;
+  themeMode: ThemeDropDownValue;
+  setThemeMode: (value: string | number) => void;
+}
+
+export const ThemeModeContext = React.createContext<ThemeModeContextProps>({
+  isDarkMode: false,
+  themeMode: 'auto_theme',
+  setThemeMode: () => {},
+});
+
+export const ThemeModeProvider: FC<PropsWithChildren<unknown>> = ({
+  children,
+}) => {
+  const matchDark = window.matchMedia('(prefers-color-scheme: dark)');
+  const [themeMode, setThemeModeState] =
+    React.useState<ThemeDropDownValue>('auto_theme');
+
+  React.useLayoutEffect(() => {
+    const mode = localStorage.getItem('mode');
+    setThemeModeState((mode as ThemeDropDownValue) ?? 'auto_theme');
+  }, [setThemeModeState]);
+
+  const isDarkMode = React.useMemo(() => {
+    if (themeMode === 'auto_theme') {
+      return matchDark.matches;
+    }
+    return themeMode === 'dark_theme';
+  }, [themeMode]);
+
+  const setThemeMode = React.useCallback(
+    (value: string | number) => {
+      setThemeModeState(value as ThemeDropDownValue);
+      localStorage.setItem('mode', value as string);
+    },
+    [setThemeModeState]
+  );
+
+  const contextValue = useMemo(
+    () => ({
+      isDarkMode,
+      themeMode,
+      setThemeMode,
+    }),
+    [isDarkMode, themeMode, setThemeMode]
+  );
+
+  return (
+    <ThemeModeContext.Provider value={contextValue}>
+      {children}
+    </ThemeModeContext.Provider>
+  );
+};
diff --git a/kafka-ui-react-app/src/index.tsx b/kafka-ui-react-app/src/index.tsx
index d15e0528ca5..5ca52f75b8a 100644
--- a/kafka-ui-react-app/src/index.tsx
+++ b/kafka-ui-react-app/src/index.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
+import { ThemeModeProvider } from 'components/contexts/ThemeModeContext';
 import App from 'components/App';
 import { store } from 'redux/store';
 import 'lib/constants';
@@ -14,7 +15,9 @@ const root = createRoot(container);
 root.render(
   <Provider store={store}>
     <BrowserRouter basename={window.basePath || '/'}>
-      <App />
+      <ThemeModeProvider>
+        <App />
+      </ThemeModeProvider>
     </BrowserRouter>
   </Provider>
 );

From 9a2f6bfc8ee3fce69fb0d03cf1ce185ef8f7e375 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 16 Jun 2023 09:00:08 +0400
Subject: [PATCH 603/734] FE: Wizard: Fix keytab param and boolean params
 quoting (#3934)

---
 .../src/widgets/ClusterConfigForm/utils/getJaasConfig.ts  | 8 +++++++-
 .../ClusterConfigForm/utils/transformFormDataToPayload.ts | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getJaasConfig.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getJaasConfig.ts
index 065612451fc..23578159d44 100644
--- a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getJaasConfig.ts
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/getJaasConfig.ts
@@ -20,7 +20,13 @@ export const getJaasConfig = (
   options: Record<string, string>
 ) => {
   const optionsString = Object.entries(options)
-    .map(([key, value]) => (isUndefined(value) ? null : ` ${key}="${value}"`))
+    .map(([key, value]) => {
+      if (isUndefined(value)) return null;
+      if (value === 'true' || value === 'false') {
+        return ` ${key}=${value}`;
+      }
+      return ` ${key}="${value}"`;
+    })
     .join('');
 
   return `${JAAS_CONFIGS[method]} required${optionsString};`;
diff --git a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts
index 0a5d6c35235..91f9ad1e289 100644
--- a/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts
+++ b/kafka-ui-react-app/src/widgets/ClusterConfigForm/utils/transformFormDataToPayload.ts
@@ -122,7 +122,7 @@ export const transformFormDataToPayload = (data: ClusterConfigFormValues) => {
           'sasl.mechanism': 'GSSAPI',
           'sasl.kerberos.service.name': props.saslKerberosServiceName,
           'sasl.jaas.config': getJaasConfig('SASL/GSSAPI', {
-            useKeytab: props.keyTabFile ? 'true' : 'false',
+            useKeyTab: props.keyTabFile ? 'true' : 'false',
             keyTab: props.keyTabFile,
             storeKey: String(!!props.storeKey),
             principal: props.principal,

From 5c592394568f68b49bc3f63f21903df346a5803e Mon Sep 17 00:00:00 2001
From: Hyojin Hwang <25076967+Ppojin@users.noreply.github.com>
Date: Fri, 16 Jun 2023 14:17:50 +0900
Subject: [PATCH 604/734] FE: fix dropdown overlapping on topics (#3898)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 kafka-ui-react-app/package.json   |  2 +-
 kafka-ui-react-app/pnpm-lock.yaml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index fada92fa4fa..754b8f4ea51 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -9,7 +9,7 @@
     "@hookform/resolvers": "^2.7.1",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@reduxjs/toolkit": "^1.8.3",
-    "@szhsin/react-menu": "^3.1.1",
+    "@szhsin/react-menu": "^3.5.3",
     "@tanstack/react-query": "^4.0.5",
     "@tanstack/react-table": "^8.5.10",
     "@testing-library/react": "^14.0.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index fe57d64ed1f..b9180d3e9d0 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -10,7 +10,7 @@ specifiers:
   '@reduxjs/toolkit': ^1.8.3
   '@swc/core': ^1.3.36
   '@swc/jest': ^0.2.24
-  '@szhsin/react-menu': ^3.1.1
+  '@szhsin/react-menu': ^3.5.3
   '@tanstack/react-query': ^4.0.5
   '@tanstack/react-table': ^8.5.10
   '@testing-library/dom': ^9.0.0
@@ -91,7 +91,7 @@ dependencies:
   '@hookform/resolvers': 2.8.9_react-hook-form@7.43.1
   '@microsoft/fetch-event-source': 2.0.1
   '@reduxjs/toolkit': 1.8.3_ctm756ikdwcjcvyfxxwskzbr6q
-  '@szhsin/react-menu': 3.1.1_ef5jwxihqo6n7gxfmzogljlgcm
+  '@szhsin/react-menu': 3.5.3_ef5jwxihqo6n7gxfmzogljlgcm
   '@tanstack/react-query': 4.0.5_ef5jwxihqo6n7gxfmzogljlgcm
   '@tanstack/react-table': 8.5.10_ef5jwxihqo6n7gxfmzogljlgcm
   '@testing-library/react': 14.0.0_ef5jwxihqo6n7gxfmzogljlgcm
@@ -1536,8 +1536,8 @@ packages:
       jsonc-parser: 3.2.0
     dev: true
 
-  /@szhsin/react-menu/3.1.1_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-IdHLyH61M+KqjTrvqglKo7JnbC0GIkg4OCtlXBxQPEjx/ecR5g0Iycqm+SG3rObEoniLZEz32iJkefve/LAHMA==}
+  /@szhsin/react-menu/3.5.3_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-jxo8oaRwxmVjUzkyOi/ZJiXaZiuFPMIxFzyJdUKfnhBLYiEOVTU9M2CiPuEkirILoareR2GJj2K3y8a81CBPlw==}
     peerDependencies:
       react: '>=16.14.0'
       react-dom: '>=16.14.0'
@@ -1545,7 +1545,7 @@ packages:
       prop-types: 15.8.1
       react: 18.1.0
       react-dom: 18.1.0_react@18.1.0
-      react-transition-state: 1.1.4_ef5jwxihqo6n7gxfmzogljlgcm
+      react-transition-state: 1.1.5_ef5jwxihqo6n7gxfmzogljlgcm
     dev: false
 
   /@tanstack/query-core/4.0.5:
@@ -5576,8 +5576,8 @@ packages:
       react: 18.1.0
     dev: false
 
-  /react-transition-state/1.1.4_ef5jwxihqo6n7gxfmzogljlgcm:
-    resolution: {integrity: sha512-6nQLWWx95gYazCm6OdtD1zGbRiirvVXPrDtHAGsYb4xs9spMM7bA8Vx77KCpjL8PJ8qz1lXFGz2PTboCSvt7iw==}
+  /react-transition-state/1.1.5_ef5jwxihqo6n7gxfmzogljlgcm:
+    resolution: {integrity: sha512-ITY2mZqc2dWG2eitJkYNdcSFW8aKeOlkL2A/vowRrLL8GH3J6Re/SpD/BLvQzrVOTqjsP0b5S9N10vgNNzwMUQ==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'

From fdd4947142ec71be5628378a1e3b27f32d82520d Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 16 Jun 2023 10:34:34 +0400
Subject: [PATCH 605/734] Infra: post links as checks, not comments (#3889)

Co-authored-by: Narek Matevosyan <nmatevosyan@provectus.com>
---
 .github/workflows/branch-deploy.yml      | 24 ++++++++++++++----------
 .github/workflows/branch-remove.yml      |  6 ------
 .github/workflows/build-public-image.yml | 12 +++++++-----
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index a7f655e719d..880633f44e0 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -84,18 +84,22 @@ jobs:
           git add ../kafka-ui-from-branch/
           git commit -m "added env:${{ needs.build.outputs.deploy }}" && git push || true
 
-      - name: make comment with private deployment link
+      - name: update status check for private deployment
         if: ${{ github.event.label.name == 'status/feature_testing' }}
-        uses: peter-evans/create-or-update-comment@v3
+        uses: Sibz/github-status-action@v1.1.6
         with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            Custom deployment will be available at http://${{ needs.build.outputs.tag }}.internal.kafka-ui.provectus.io
+          authToken: ${{secrets.GITHUB_TOKEN}}
+          context: "Click Details button to open custom deployment page"
+          state: "success"
+          sha: ${{ github.event.pull_request.head.sha  || github.sha }}
+          target_url: "http://${{ needs.build.outputs.tag }}.internal.kafka-ui.provectus.io"
 
-      - name: make comment with public deployment link
+      - name: update status check for public deployment
         if: ${{ github.event.label.name == 'status/feature_testing_public' }}
-        uses: peter-evans/create-or-update-comment@v3
+        uses: Sibz/github-status-action@v1.1.6
         with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            Custom deployment will be available at http://${{ needs.build.outputs.tag }}.kafka-ui.provectus.io in 5 minutes
+          authToken: ${{secrets.GITHUB_TOKEN}}
+          context: "Click Details button to open custom deployment page"
+          state: "success"
+          sha: ${{ github.event.pull_request.head.sha  || github.sha }}
+          target_url: "http://${{ needs.build.outputs.tag }}.internal.kafka-ui.provectus.io"
diff --git a/.github/workflows/branch-remove.yml b/.github/workflows/branch-remove.yml
index 9a65064c862..a891232fad2 100644
--- a/.github/workflows/branch-remove.yml
+++ b/.github/workflows/branch-remove.yml
@@ -20,9 +20,3 @@ jobs:
           git config --global user.name "infra-tech"
           git add ../kafka-ui-from-branch/
           git commit -m "removed env:${{ needs.build.outputs.deploy }}" && git push || true
-      - name: make comment with deployment link
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            Custom deployment removed
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index c4698b062cf..9f6a3b902b2 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -64,12 +64,14 @@ jobs:
             JAR_FILE=kafka-ui-api-${{ steps.build.outputs.version }}.jar
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
-      - name: make comment with private deployment link
-        uses: peter-evans/create-or-update-comment@v3
+      - name: update status check
+        uses: Sibz/github-status-action@v1.1.6
         with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            Image published at public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }}
+          authToken: ${{secrets.GITHUB_TOKEN}}
+          context: "Image published at"
+          state: "success"
+          sha: ${{ github.event.pull_request.head.sha  || github.sha }}
+          target_url: "public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }}"
 
     outputs:
       tag: ${{ steps.extract_branch.outputs.tag }}

From 2fb05ca9474da8fe6b9f91dc3b0f22ebdbceb9b8 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Fri, 16 Jun 2023 10:38:48 +0400
Subject: [PATCH 606/734] Infra: Release workflow: Call charts action in
 another repo (#3917)

Co-authored-by: Narek Matevosyan <nmatevosyan@provectus.com>
---
 .github/workflows/release.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7f18f994e3c..9b7be6de241 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -89,14 +89,12 @@ jobs:
 
   charts:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     needs: release
     steps:
       - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@v2
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: provectus/kafka-ui
+          token: ${{ secrets.CHARTS_ACTIONS_TOKEN }}
+          repository: provectus/kafka-ui-charts
           event-type: prepare-helm-release
           client-payload: '{"appversion": "${{ needs.release.outputs.version }}"}'

From af2cff20b6e127db02236fdf34b182b0720c62dc Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 16 Jun 2023 16:24:27 +0400
Subject: [PATCH 607/734] FE: Disable resetting offsets for unassigned CGs
 (#3935)

---
 .../src/components/ConsumerGroups/Details/Details.tsx          | 3 +++
 .../ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index 33dd9b48ad5..b8fac73dc1e 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -54,6 +54,8 @@ const Details: React.FC = () => {
     ? filteredPartitionsByTopic
     : Object.keys(partitionsByTopic);
 
+  const hasAssignedTopics = consumerGroup?.data?.topics !== 0;
+
   return (
     <div>
       <div>
@@ -71,6 +73,7 @@ const Details: React.FC = () => {
                   action: Action.RESET_OFFSETS,
                   value: consumerGroupID,
                 }}
+                disabled={!hasAssignedTopics}
               >
                 Reset offset
               </ActionDropdownItem>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
index 8d220501940..548ed47f543 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
@@ -21,7 +21,7 @@ const ResetOffsets: React.FC = () => {
     return <PageLoader />;
 
   const partitions = consumerGroup.data.partitions || [];
-  const { topic } = partitions[0];
+  const { topic } = partitions[0] || '';
 
   const uniqTopics = Array.from(
     new Set(partitions.map((partition) => partition.topic))

From 2ac8646769d10e69d972928b943c5bcc708ddc61 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 16 Jun 2023 16:25:06 +0400
Subject: [PATCH 608/734] FE: Fix react query not initiating requests for local
 host (#3915)

---
 kafka-ui-react-app/src/components/App.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-react-app/src/components/App.tsx b/kafka-ui-react-app/src/components/App.tsx
index 0c06a6fddd6..43abc60bd1a 100644
--- a/kafka-ui-react-app/src/components/App.tsx
+++ b/kafka-ui-react-app/src/components/App.tsx
@@ -31,6 +31,7 @@ const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
       suspense: true,
+      networkMode: 'offlineFirst',
       onError(error) {
         showServerError(error as Response);
       },

From 6fe61654271fe74d595180fc29615b155fb66182 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 20 Jun 2023 07:51:50 +0400
Subject: [PATCH 609/734] BE: RBAC: Fix viewable topics filter (#3946)

---
 .../kafka/ui/controller/TopicsController.java |  6 ++---
 .../ui/service/rbac/AccessControlService.java | 24 +++++++++++--------
 .../ui/util/AccessControlServiceMock.java     |  3 ++-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
index a587d53770a..818fab84d68 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
@@ -167,12 +167,13 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName,
                                                            ServerWebExchange exchange) {
 
     return topicsService.getTopicsForPagination(getCluster(clusterName))
-        .flatMap(existingTopics -> {
+        .flatMap(topics -> accessControlService.filterViewableTopics(topics, clusterName))
+        .flatMap(topics -> {
           int pageSize = perPage != null && perPage > 0 ? perPage : DEFAULT_PAGE_SIZE;
           var topicsToSkip = ((page != null && page > 0 ? page : 1) - 1) * pageSize;
           var comparator = sortOrder == null || !sortOrder.equals(SortOrderDTO.DESC)
               ? getComparatorForTopic(orderBy) : getComparatorForTopic(orderBy).reversed();
-          List<InternalTopic> filtered = existingTopics.stream()
+          List<InternalTopic> filtered = topics.stream()
               .filter(topic -> !topic.isInternal()
                   || showInternal != null && showInternal)
               .filter(topic -> search == null || StringUtils.containsIgnoreCase(topic.getName(), search))
@@ -189,7 +190,6 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName,
 
           return topicsService.loadTopics(getCluster(clusterName), topicsPage)
               .flatMapMany(Flux::fromIterable)
-              .filterWhen(dto -> accessControlService.isTopicAccessible(dto, clusterName))
               .collectList()
               .map(topicsToRender ->
                   new TopicsResponseDTO()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index b507d4c0810..debd9acd829 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -202,19 +202,23 @@ public boolean isTopicAccessible(AccessContext context, AuthenticatedUser user)
     return isAccessible(Resource.TOPIC, context.getTopic(), user, context, requiredActions);
   }
 
-  public Mono<Boolean> isTopicAccessible(InternalTopic dto, String clusterName) {
+  public Mono<List<InternalTopic>> filterViewableTopics(List<InternalTopic> topics, String clusterName) {
     if (!rbacEnabled) {
-      return Mono.just(true);
+      return Mono.just(topics);
     }
 
-    AccessContext accessContext = AccessContext
-        .builder()
-        .cluster(clusterName)
-        .topic(dto.getName())
-        .topicActions(TopicAction.VIEW)
-        .build();
-
-    return getUser().map(u -> isTopicAccessible(accessContext, u));
+    return getUser()
+        .map(user -> topics.stream()
+            .filter(topic -> {
+                  var accessContext = AccessContext
+                      .builder()
+                      .cluster(clusterName)
+                      .topic(topic.getName())
+                      .topicActions(TopicAction.VIEW)
+                      .build();
+                  return isTopicAccessible(accessContext, user);
+                }
+            ).toList());
   }
 
   private boolean isConsumerGroupAccessible(AccessContext context, AuthenticatedUser user) {
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java
index 263f1367d8c..852b75ae085 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java
@@ -5,6 +5,7 @@
 import static org.mockito.Mockito.when;
 
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.Collections;
 import org.mockito.Mockito;
 import reactor.core.publisher.Mono;
 
@@ -16,7 +17,7 @@ public AccessControlService getMock() {
     when(mock.validateAccess(any())).thenReturn(Mono.empty());
     when(mock.isSchemaAccessible(anyString(), anyString())).thenReturn(Mono.just(true));
 
-    when(mock.isTopicAccessible(any(), anyString())).thenReturn(Mono.just(true));
+    when(mock.filterViewableTopics(any(), any())).then(invocation -> Mono.just(invocation.getArgument(0)));
 
     return mock;
   }

From d0088490a48b7c45855a42cf1deb4bba465595c0 Mon Sep 17 00:00:00 2001
From: Vikas Rajput <vkhaas.rajput1993@gmail.com>
Date: Tue, 20 Jun 2023 09:44:51 +0530
Subject: [PATCH 610/734] FE: Messages: Reset timestamp value w/ Clear all
 filters (#3923)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/Topics/Topic/Messages/Filters/Filters.tsx     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
index 0c2510ff4cc..347623d2226 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/Filters/Filters.tsx
@@ -188,6 +188,7 @@ const Filters: React.FC<FiltersProps> = ({
   const handleClearAllFilters = () => {
     setCurrentSeekType(SeekType.OFFSET);
     setOffset('');
+    setTimestamp(null);
     setQuery('');
     changeSeekDirection(SeekDirection.FORWARD);
     getSelectedPartitionsFromSeekToParam(searchParams, partitions);

From c998e17e8322a867c02ef4cdf577aa33c2d3a81e Mon Sep 17 00:00:00 2001
From: Nicolas BOURON <nicolas.bouron@gmail.com>
Date: Tue, 20 Jun 2023 06:17:27 +0200
Subject: [PATCH 611/734] Helm: Add loadBalancerIP attribute for LB svc (#3795)

Signed-off-by: Nicolas BOURON <nicolas.bouron@gmail.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 charts/kafka-ui/Chart.yaml             | 2 +-
 charts/kafka-ui/templates/service.yaml | 3 +++
 charts/kafka-ui/values.yaml            | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
index c48bb1bfd3d..f3f2501dbca 100644
--- a/charts/kafka-ui/Chart.yaml
+++ b/charts/kafka-ui/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.7.0
+version: 0.7.1
 appVersion: v0.7.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/templates/service.yaml b/charts/kafka-ui/templates/service.yaml
index 5801135c4c7..0f3868c8cf1 100644
--- a/charts/kafka-ui/templates/service.yaml
+++ b/charts/kafka-ui/templates/service.yaml
@@ -10,6 +10,9 @@ metadata:
 {{- end }}
 spec:
   type: {{ .Values.service.type }}
+{{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+{{- end }}
   ports:
     - port: {{ .Values.service.port }}
       targetPort: http
diff --git a/charts/kafka-ui/values.yaml b/charts/kafka-ui/values.yaml
index 3c30b408134..72038e9b68f 100644
--- a/charts/kafka-ui/values.yaml
+++ b/charts/kafka-ui/values.yaml
@@ -94,6 +94,8 @@ securityContext:
 service:
   type: ClusterIP
   port: 80
+  # In case of service type LoadBalancer, you can specify reserved static IP
+  # loadBalancerIP: 10.11.12.13
   # if you want to force a specific nodePort. Must be use with service.type=NodePort
   # nodePort:
 

From f2ef0c2793a2795a4af1bebd251a07f35fb7cac2 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 20 Jun 2023 08:52:26 +0400
Subject: [PATCH 612/734] Nuke helm charts

due to them being moved to a separate repo
https://github.com/provectus/kafka-ui-charts
---
 .github/workflows/create-branch-for-helm.yaml |  28 ---
 .github/workflows/helm.yaml                   |  38 ----
 .github/workflows/release-helm.yaml           |  39 -----
 charts/kafka-ui/.helmignore                   |  25 ---
 charts/kafka-ui/Chart.yaml                    |   7 -
 charts/kafka-ui/README.md                     |   1 -
 charts/kafka-ui/index.yaml                    |   3 -
 charts/kafka-ui/templates/NOTES.txt           |  21 ---
 charts/kafka-ui/templates/_helpers.tpl        |  84 ---------
 charts/kafka-ui/templates/configmap.yaml      |  10 --
 .../templates/configmap_fromValues.yaml       |  11 --
 charts/kafka-ui/templates/deployment.yaml     | 150 ----------------
 charts/kafka-ui/templates/hpa.yaml            |  46 -----
 charts/kafka-ui/templates/ingress.yaml        |  89 ----------
 .../templates/networkpolicy-egress.yaml       |  18 --
 .../templates/networkpolicy-ingress.yaml      |  18 --
 charts/kafka-ui/templates/secret.yaml         |  13 --
 charts/kafka-ui/templates/service.yaml        |  25 ---
 charts/kafka-ui/templates/serviceaccount.yaml |  12 --
 charts/kafka-ui/values.yaml                   | 163 ------------------
 20 files changed, 801 deletions(-)
 delete mode 100644 .github/workflows/create-branch-for-helm.yaml
 delete mode 100644 .github/workflows/helm.yaml
 delete mode 100644 .github/workflows/release-helm.yaml
 delete mode 100644 charts/kafka-ui/.helmignore
 delete mode 100644 charts/kafka-ui/Chart.yaml
 delete mode 100644 charts/kafka-ui/README.md
 delete mode 100644 charts/kafka-ui/index.yaml
 delete mode 100644 charts/kafka-ui/templates/NOTES.txt
 delete mode 100644 charts/kafka-ui/templates/_helpers.tpl
 delete mode 100644 charts/kafka-ui/templates/configmap.yaml
 delete mode 100644 charts/kafka-ui/templates/configmap_fromValues.yaml
 delete mode 100644 charts/kafka-ui/templates/deployment.yaml
 delete mode 100644 charts/kafka-ui/templates/hpa.yaml
 delete mode 100644 charts/kafka-ui/templates/ingress.yaml
 delete mode 100644 charts/kafka-ui/templates/networkpolicy-egress.yaml
 delete mode 100644 charts/kafka-ui/templates/networkpolicy-ingress.yaml
 delete mode 100644 charts/kafka-ui/templates/secret.yaml
 delete mode 100644 charts/kafka-ui/templates/service.yaml
 delete mode 100644 charts/kafka-ui/templates/serviceaccount.yaml
 delete mode 100644 charts/kafka-ui/values.yaml

diff --git a/.github/workflows/create-branch-for-helm.yaml b/.github/workflows/create-branch-for-helm.yaml
deleted file mode 100644
index d755e3da8f0..00000000000
--- a/.github/workflows/create-branch-for-helm.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Prepare helm release
-on:
-  repository_dispatch:
-    types: [prepare-helm-release]
-jobs:
-  change-app-version:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-      - name: Change versions
-        run: |
-          git checkout -b release-${{ github.event.client_payload.appversion}}
-          version=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk '{print $2}')
-          version=${version%.*}.$((${version##*.}+1))
-          sed -i "s/version:.*/version: ${version}/" charts/kafka-ui/Chart.yaml
-          sed -i "s/appVersion:.*/appVersion: ${{ github.event.client_payload.appversion}}/" charts/kafka-ui/Chart.yaml
-          git add  charts/kafka-ui/Chart.yaml
-          git commit -m "release ${version}"
-          git push --set-upstream origin release-${{ github.event.client_payload.appversion}}
-      - name: Slack Notification
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_TITLE: "release-${{ github.event.client_payload.appversion}}"
-          SLACK_MESSAGE: "A new release of the helm chart has been prepared. Branch name: release-${{ github.event.client_payload.appversion}}"
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
deleted file mode 100644
index 427c63e0b32..00000000000
--- a/.github/workflows/helm.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Helm linter
-on:
- pull_request:
-  types: ["opened", "edited", "reopened", "synchronize"]
-  branches:
-   - 'master'
-  paths:
-   - "charts/**"
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Helm tool installer
-        uses: Azure/setup-helm@v3
-      - name: Setup Kubeval
-        uses: lra/setup-kubeval@v1.0.1
-      #check, was helm version increased in Chart.yaml?
-      - name: Check version
-        shell: bash
-        run: |
-          helm_version_new=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk  '{print $2}')
-          helm_version_old=$(curl -s https://raw.githubusercontent.com/provectus/kafka-ui/master/charts/kafka-ui/Chart.yaml |   grep version | awk  '{print $2}' )
-          echo $helm_version_old
-          echo $helm_version_new
-          if [[ "$helm_version_new" > "$helm_version_old" ]]; then exit 0 ; else exit 1 ; fi
-      - name: Run kubeval
-        shell: bash
-        run: |
-          sed -i "s@enabled: false@enabled: true@g" charts/kafka-ui/values.yaml
-          K8S_VERSIONS=$(git ls-remote --refs --tags https://github.com/kubernetes/kubernetes.git | cut -d/ -f3 | grep -e '^v1\.[0-9]\{2\}\.[0]\{1,2\}$' | grep -v -e  '^v1\.1[0-7]\{1\}' | cut -c2-)
-          echo "NEXT K8S VERSIONS ARE GOING TO BE TESTED: $K8S_VERSIONS"
-          echo ""
-          for version in $K8S_VERSIONS
-            do
-              echo $version;
-              helm template --kube-version $version --set ingress.enabled=true charts/kafka-ui -f charts/kafka-ui/values.yaml | kubeval --additional-schema-locations https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master --strict -v $version;
-            done
diff --git a/.github/workflows/release-helm.yaml b/.github/workflows/release-helm.yaml
deleted file mode 100644
index 50c10266b62..00000000000
--- a/.github/workflows/release-helm.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Release helm
-on:
- push:
-    branches:
-     - master
-    paths:
-      - "charts/**"
-
-jobs:
- release-helm:
-  runs-on:
-   ubuntu-latest
-  steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-
-      - run: |
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-
-      - uses: azure/setup-helm@v3
-
-      - name: add chart #realse helm with new version
-        run: |
-          VERSION=$(cat charts/kafka-ui/Chart.yaml  | grep version | awk '{print $2}')
-          echo "HELM_VERSION=$(echo ${VERSION})" >> $GITHUB_ENV
-          MSG=$(helm package charts/kafka-ui)
-          git fetch origin
-          git stash
-          git checkout -b gh-pages origin/gh-pages
-          git pull
-          helm repo index .
-          git add -f ${MSG##*/} index.yaml
-          git commit -m "release ${VERSION}"
-          git push
-      - uses: rickstaa/action-create-tag@v1 #create new tag
-        with:
-          tag: "charts/kafka-ui-${{ env.HELM_VERSION }}"
diff --git a/charts/kafka-ui/.helmignore b/charts/kafka-ui/.helmignore
deleted file mode 100644
index 7a93969f5a0..00000000000
--- a/charts/kafka-ui/.helmignore
+++ /dev/null
@@ -1,25 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-example/
-README.md
diff --git a/charts/kafka-ui/Chart.yaml b/charts/kafka-ui/Chart.yaml
deleted file mode 100644
index f3f2501dbca..00000000000
--- a/charts/kafka-ui/Chart.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v2
-name: kafka-ui
-description: A Helm chart for kafka-UI
-type: application
-version: 0.7.1
-appVersion: v0.7.0
-icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png
diff --git a/charts/kafka-ui/README.md b/charts/kafka-ui/README.md
deleted file mode 100644
index e57755e1d86..00000000000
--- a/charts/kafka-ui/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Please refer to our [documentation](https://docs.kafka-ui.provectus.io/configuration/helm-charts) to get some info on our helm charts.
\ No newline at end of file
diff --git a/charts/kafka-ui/index.yaml b/charts/kafka-ui/index.yaml
deleted file mode 100644
index 872807193db..00000000000
--- a/charts/kafka-ui/index.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-apiVersion: v1
-entries: {}
-generated: "2021-11-11T12:26:08.479581+03:00"
diff --git a/charts/kafka-ui/templates/NOTES.txt b/charts/kafka-ui/templates/NOTES.txt
deleted file mode 100644
index 94e8d394344..00000000000
--- a/charts/kafka-ui/templates/NOTES.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "kafka-ui.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "kafka-ui.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "kafka-ui.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "kafka-ui.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:8080
-{{- end }}
diff --git a/charts/kafka-ui/templates/_helpers.tpl b/charts/kafka-ui/templates/_helpers.tpl
deleted file mode 100644
index 7155681a44b..00000000000
--- a/charts/kafka-ui/templates/_helpers.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "kafka-ui.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "kafka-ui.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "kafka-ui.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "kafka-ui.labels" -}}
-helm.sh/chart: {{ include "kafka-ui.chart" . }}
-{{ include "kafka-ui.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "kafka-ui.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "kafka-ui.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "kafka-ui.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "kafka-ui.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-
-{{/*
-This allows us to check if the registry of the image is specified or not.
-*/}}
-{{- define "kafka-ui.imageName" -}}
-{{- $registryName := .Values.image.registry -}}
-{{- if .Values.global }}
-    {{- if .Values.global.imageRegistry }}
-     {{- $registryName = .Values.global.imageRegistry -}}
-    {{- end -}}
-{{- end -}}
-{{- $repository := .Values.image.repository -}}
-{{- $tag := .Values.image.tag | default .Chart.AppVersion -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repository $tag -}}
-{{- else }}
-{{- printf "%s:%s" $repository $tag -}}
-{{- end }}
-{{- end -}}
-
diff --git a/charts/kafka-ui/templates/configmap.yaml b/charts/kafka-ui/templates/configmap.yaml
deleted file mode 100644
index 22d2a69946f..00000000000
--- a/charts/kafka-ui/templates/configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-{{- if .Values.envs.config -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "kafka-ui.fullname" . }}
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-data:
-  {{- toYaml .Values.envs.config | nindent 2 }}
-{{- end -}}
\ No newline at end of file
diff --git a/charts/kafka-ui/templates/configmap_fromValues.yaml b/charts/kafka-ui/templates/configmap_fromValues.yaml
deleted file mode 100644
index ae8b7695c2d..00000000000
--- a/charts/kafka-ui/templates/configmap_fromValues.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- if .Values.yamlApplicationConfig -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "kafka-ui.fullname" . }}-fromvalues
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-data:
-  config.yml: |-
-    {{- toYaml .Values.yamlApplicationConfig | nindent 4}}
-{{ end }}
\ No newline at end of file
diff --git a/charts/kafka-ui/templates/deployment.yaml b/charts/kafka-ui/templates/deployment.yaml
deleted file mode 100644
index 3e4ac2b4b35..00000000000
--- a/charts/kafka-ui/templates/deployment.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "kafka-ui.fullname" . }}
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-  {{- with .Values.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-{{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-{{- end }}
-  selector:
-    matchLabels:
-      {{- include "kafka-ui.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      annotations:
-      {{- with .Values.podAnnotations }}
-          {{- toYaml . | nindent 8 }}
-      {{- end }}
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        checksum/configFromValues: {{ include (print $.Template.BasePath "/configmap_fromValues.yaml") . | sha256sum }}
-        checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
-      labels:
-        {{- include "kafka-ui.selectorLabels" . | nindent 8 }}
-        {{- if .Values.podLabels }}
-        {{- toYaml .Values.podLabels | nindent 8 }}
-        {{- end }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.initContainers }}
-      initContainers:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "kafka-ui.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: {{ include "kafka-ui.imageName" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if or .Values.env  .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
-          env:
-            {{- with .Values.env }}
-              {{- toYaml . | nindent 12 }}
-            {{- end }}
-            {{- if or .Values.yamlApplicationConfig .Values.yamlApplicationConfigConfigMap}}
-            - name: SPRING_CONFIG_ADDITIONAL-LOCATION
-              {{- if .Values.yamlApplicationConfig }}
-              value: /kafka-ui/config.yml
-              {{- else if .Values.yamlApplicationConfigConfigMap }}
-              value: /kafka-ui/{{ .Values.yamlApplicationConfigConfigMap.keyName | default "config.yml" }}
-              {{- end }}
-            {{- end }}
-          {{- end }}
-          envFrom:
-            {{- if .Values.existingConfigMap }}
-            - configMapRef:
-                name: {{ .Values.existingConfigMap }}
-            {{- end }}
-            {{- if .Values.envs.config }}
-            - configMapRef:
-                name: {{ include "kafka-ui.fullname" . }}
-            {{- end }}
-            {{- if .Values.existingSecret }}
-            - secretRef:
-                name: {{ .Values.existingSecret }}
-            {{- end }}
-            {{- if .Values.envs.secret}}
-            - secretRef:
-                name: {{ include "kafka-ui.fullname" . }}
-            {{- end}}    
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              {{- $contextPath := .Values.envs.config.SERVER_SERVLET_CONTEXT_PATH | default "" | printf "%s/actuator/health" | urlParse }}
-              path: {{ get $contextPath "path" }}
-              port: http
-              {{- if .Values.probes.useHttpsScheme }}
-              scheme: HTTPS
-              {{- end }}
-            initialDelaySeconds: 60
-            periodSeconds: 30
-            timeoutSeconds: 10
-          readinessProbe:
-            httpGet:
-              {{- $contextPath := .Values.envs.config.SERVER_SERVLET_CONTEXT_PATH | default "" | printf "%s/actuator/health" | urlParse }}
-              path: {{ get $contextPath "path" }}
-              port: http
-              {{- if .Values.probes.useHttpsScheme }}
-              scheme: HTTPS
-              {{- end }}
-            initialDelaySeconds: 60
-            periodSeconds: 30
-            timeoutSeconds: 10
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          {{- if or .Values.yamlApplicationConfig .Values.volumeMounts .Values.yamlApplicationConfigConfigMap}}
-          volumeMounts:
-            {{- with .Values.volumeMounts }} 
-              {{- toYaml . | nindent 12 }}
-            {{- end }}
-            {{- if .Values.yamlApplicationConfig }}
-            - name: kafka-ui-yaml-conf
-              mountPath: /kafka-ui/
-            {{- end }}
-            {{- if .Values.yamlApplicationConfigConfigMap}}
-            - name: kafka-ui-yaml-conf-configmap
-              mountPath: /kafka-ui/
-            {{- end }}
-          {{- end }}
-      {{- if or .Values.yamlApplicationConfig .Values.volumes .Values.yamlApplicationConfigConfigMap}}
-      volumes:
-        {{- with .Values.volumes }}
-          {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- if .Values.yamlApplicationConfig }}
-        - name: kafka-ui-yaml-conf
-          configMap: 
-            name: {{ include "kafka-ui.fullname" . }}-fromvalues
-        {{- end }}
-        {{- if .Values.yamlApplicationConfigConfigMap}}
-        - name: kafka-ui-yaml-conf-configmap
-          configMap: 
-            name: {{ .Values.yamlApplicationConfigConfigMap.name }}
-        {{- end }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/kafka-ui/templates/hpa.yaml b/charts/kafka-ui/templates/hpa.yaml
deleted file mode 100644
index 1cc131c9e91..00000000000
--- a/charts/kafka-ui/templates/hpa.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-{{- $kubeCapabilityVersion := semver .Capabilities.KubeVersion.Version -}}
-{{- $isHigher1p25 := ge (semver "1.25" | $kubeCapabilityVersion.Compare) 0 -}}
-{{- if and ($.Capabilities.APIVersions.Has "autoscaling/v2") $isHigher1p25 -}}
-apiVersion: autoscaling/v2
-{{- else  }}
-apiVersion: autoscaling/v2beta1
-{{- end }}
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "kafka-ui.fullname" . }}
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "kafka-ui.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-  {{- if  $isHigher1p25 }}
-        target:
-         type: Utilization
-         averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-  {{- else  }}        
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-  {{- end }}      
-  {{- end }}
-  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-  {{- if  $isHigher1p25 }}     
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-  {{- else  }}   
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-  {{- end }}
-  {{- end }}
-{{- end }}
diff --git a/charts/kafka-ui/templates/ingress.yaml b/charts/kafka-ui/templates/ingress.yaml
deleted file mode 100644
index 13e746d8d1b..00000000000
--- a/charts/kafka-ui/templates/ingress.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "kafka-ui.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- $kubeCapabilityVersion := semver .Capabilities.KubeVersion.Version -}}
-{{- $isHigher1p19 := ge (semver "1.19" | $kubeCapabilityVersion.Compare) 0 -}}
-{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") $isHigher1p19 -}}
-apiVersion: networking.k8s.io/v1
-{{- else if $.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.ingress.tls.enabled }}
-  tls:
-    - hosts:
-        - {{ tpl .Values.ingress.host . }}
-      secretName: {{ .Values.ingress.tls.secretName }}
-  {{- end }}
-  {{- if .Values.ingress.ingressClassName }}
-  ingressClassName: {{ .Values.ingress.ingressClassName }}
-  {{- end }}
-  rules:
-    - http:
-        paths:
-{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") $isHigher1p19 -}}
-          {{- range .Values.ingress.precedingPaths }}
-          - path: {{ .path }}
-            pathType: {{ .Values.ingress.pathType }}
-            backend:
-              service:
-                name: {{ .serviceName }}
-                port:
-                  number: {{ .servicePort }}
-          {{- end }}
-          - backend:
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-            pathType: {{ .Values.ingress.pathType }}
-{{- if .Values.ingress.path }}
-            path: {{ .Values.ingress.path }}
-{{- end }}
-          {{- range .Values.ingress.succeedingPaths }}
-          - path: {{ .path }}
-            pathType: {{ .Values.ingress.pathType }}
-            backend:
-              service:
-                name: {{ .serviceName }}
-                port:
-                  number: {{ .servicePort }}
-          {{- end }}
-{{- if tpl .Values.ingress.host . }}
-      host: {{tpl .Values.ingress.host . }}
-{{- end }}
-{{- else -}}
-          {{- range .Values.ingress.precedingPaths }}
-          - path: {{ .path }}
-            backend:
-              serviceName: {{ .serviceName }}
-              servicePort: {{ .servicePort }}
-          {{- end }}
-          - backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-{{- if .Values.ingress.path }}
-            path: {{ .Values.ingress.path }}
-{{- end }}
-          {{- range .Values.ingress.succeedingPaths }}
-          - path: {{ .path }}
-            backend:
-              serviceName: {{ .serviceName }}
-              servicePort: {{ .servicePort }}
-          {{- end }}
-{{- if tpl .Values.ingress.host . }}
-      host: {{ tpl .Values.ingress.host . }}
-{{- end }}
-{{- end }}
-{{- end }}
diff --git a/charts/kafka-ui/templates/networkpolicy-egress.yaml b/charts/kafka-ui/templates/networkpolicy-egress.yaml
deleted file mode 100644
index 4f582802712..00000000000
--- a/charts/kafka-ui/templates/networkpolicy-egress.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{- if and .Values.networkPolicy.enabled .Values.networkPolicy.egressRules.customRules }}
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: {{ printf "%s-egress" (include "kafka-ui.fullname" .) }}
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      {{- include "kafka-ui.selectorLabels" . | nindent 6 }}
-  policyTypes:
-    - Egress
-  egress:
-    {{- if .Values.networkPolicy.egressRules.customRules }}
-    {{- toYaml .Values.networkPolicy.egressRules.customRules | nindent 4 }}
-    {{- end }}
-{{- end }}
diff --git a/charts/kafka-ui/templates/networkpolicy-ingress.yaml b/charts/kafka-ui/templates/networkpolicy-ingress.yaml
deleted file mode 100644
index 74988676b52..00000000000
--- a/charts/kafka-ui/templates/networkpolicy-ingress.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{- if and .Values.networkPolicy.enabled .Values.networkPolicy.ingressRules.customRules }}
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: {{ printf "%s-ingress" (include "kafka-ui.fullname" .) }}
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-spec:
-  podSelector:
-    matchLabels:
-      {{- include "kafka-ui.selectorLabels" . | nindent 6 }}
-  policyTypes:
-    - Ingress
-  ingress:
-    {{- if .Values.networkPolicy.ingressRules.customRules }}
-    {{- toYaml .Values.networkPolicy.ingressRules.customRules | nindent 4 }}
-    {{- end }}
-{{- end }}
diff --git a/charts/kafka-ui/templates/secret.yaml b/charts/kafka-ui/templates/secret.yaml
deleted file mode 100644
index 1f974503dc6..00000000000
--- a/charts/kafka-ui/templates/secret.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- if .Values.envs.secret -}}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "kafka-ui.fullname" . }}
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-type: Opaque
-data:
-  {{- range $key, $val := .Values.envs.secret }}
-  {{ $key }}: {{ $val | b64enc | quote }}
-  {{- end -}}
-{{- end}}
\ No newline at end of file
diff --git a/charts/kafka-ui/templates/service.yaml b/charts/kafka-ui/templates/service.yaml
deleted file mode 100644
index 0f3868c8cf1..00000000000
--- a/charts/kafka-ui/templates/service.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "kafka-ui.fullname" . }}
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-{{- if .Values.service.annotations }}
-  annotations:
-{{ toYaml .Values.service.annotations | nindent 4 }}
-{{- end }}
-spec:
-  type: {{ .Values.service.type }}
-{{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.loadBalancerIP) }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-{{- end }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-      {{- if (and (eq .Values.service.type "NodePort") .Values.service.nodePort) }}
-      nodePort: {{ .Values.service.nodePort }}
-      {{- end }}
-  selector:
-    {{- include "kafka-ui.selectorLabels" . | nindent 4 }}
diff --git a/charts/kafka-ui/templates/serviceaccount.yaml b/charts/kafka-ui/templates/serviceaccount.yaml
deleted file mode 100644
index b89551c833e..00000000000
--- a/charts/kafka-ui/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "kafka-ui.serviceAccountName" . }}
-  labels:
-    {{- include "kafka-ui.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/charts/kafka-ui/values.yaml b/charts/kafka-ui/values.yaml
deleted file mode 100644
index 72038e9b68f..00000000000
--- a/charts/kafka-ui/values.yaml
+++ /dev/null
@@ -1,163 +0,0 @@
-replicaCount: 1
-
-image:
-  registry: docker.io
-  repository: provectuslabs/kafka-ui
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-existingConfigMap: ""
-yamlApplicationConfig:
-  {}
-  # kafka:
-  #   clusters:
-  #     - name: yaml
-  #       bootstrapServers: kafka-service:9092
-  # spring:
-  #   security:
-  #     oauth2:
-  # auth:
-  #   type: disabled
-  # management:
-  #   health:
-  #     ldap:
-  #       enabled: false
-yamlApplicationConfigConfigMap:
-  {}
-  # keyName: config.yml
-  # name: configMapName
-existingSecret: ""
-envs:
-  secret: {}
-  config: {}
-
-networkPolicy:
-  enabled: false
-  egressRules:
-    ## Additional custom egress rules
-    ## e.g:
-    ## customRules:
-    ##   - to:
-    ##       - namespaceSelector:
-    ##           matchLabels:
-    ##             label: example
-    customRules: []
-  ingressRules:
-    ## Additional custom ingress rules
-    ## e.g:
-    ## customRules:
-    ##   - from:
-    ##       - namespaceSelector:
-    ##           matchLabels:
-    ##             label: example
-    customRules: []
-
-podAnnotations: {}
-podLabels: {}
-
-## Annotations to be added to kafka-ui Deployment
-##
-annotations: {}
-
-## Set field schema as HTTPS for readines and liveness probe
-##
-probes:
-  useHttpsScheme: false
-
-podSecurityContext:
-  {}
-  # fsGroup: 2000
-
-securityContext:
-  {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 80
-  # In case of service type LoadBalancer, you can specify reserved static IP
-  # loadBalancerIP: 10.11.12.13
-  # if you want to force a specific nodePort. Must be use with service.type=NodePort
-  # nodePort:
-
-# Ingress configuration
-ingress:
-  # Enable ingress resource
-  enabled: false
-
-  # Annotations for the Ingress
-  annotations: {}
-
-  # ingressClassName for the Ingress
-  ingressClassName: ""
-
-  # The path for the Ingress
-  path: "/"
-
-  # The path type for the Ingress
-  pathType: "Prefix"  
-
-  # The hostname for the Ingress
-  host: ""
-
-  # configs for Ingress TLS
-  tls:
-    # Enable TLS termination for the Ingress
-    enabled: false
-    # the name of a pre-created Secret containing a TLS private key and certificate
-    secretName: ""
-
-  # HTTP paths to add to the Ingress before the default path
-  precedingPaths: []
-
-  # Http paths to add to the Ingress after the default path
-  succeedingPaths: []
-
-resources:
-  {}
-  # limits:
-  #   cpu: 200m
-  #   memory: 512Mi
-  # requests:
-  #   cpu: 200m
-  #   memory: 256Mi
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-env: {}
-
-initContainers: {}
-
-volumeMounts: {}
-
-volumes: {}

From d14b935765884a6bfae672f303b867b2ad753f01 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 20 Jun 2023 08:56:21 +0400
Subject: [PATCH 613/734] Update codeowners

---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6a65f014c3f..cd94e7a297b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,5 +14,5 @@
 # TESTS
 /kafka-ui-e2e-checks/       @provectus/kafka-qa
 
-# HELM CHARTS
-/charts/                    @provectus/kafka-devops
+# INFRA
+/.github/workflows/         @provectus/kafka-devops

From f84bbb9ebb7fdd283efc210cbcdd4a69fb1e8aa6 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 20 Jun 2023 09:20:57 +0400
Subject: [PATCH 614/734] Update issue templates

Drop helm & add a redirect
---
 .github/ISSUE_TEMPLATE/config.yml |  3 +
 .github/ISSUE_TEMPLATE/helm.yml   | 92 -------------------------------
 2 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/helm.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 368461c6443..ab1839eb161 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Report helm issue
+    url: https://github.com/provectus/kafka-ui-charts
+    about: Our helm charts are located in another repo. Please raise issues/PRs regarding charts in that repo.
   - name: Official documentation
     url: https://docs.kafka-ui.provectus.io/
     about: Before reaching out for support, please refer to our documentation. Read "FAQ" and "Common problems", also try using search there.
diff --git a/.github/ISSUE_TEMPLATE/helm.yml b/.github/ISSUE_TEMPLATE/helm.yml
deleted file mode 100644
index b36733504e2..00000000000
--- a/.github/ISSUE_TEMPLATE/helm.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-name: "⎈ K8s/Helm problem report"
-description: "Report a problem with k8s/helm charts/etc"
-labels: ["status/triage", "scope/k8s"]
-assignees: []
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Hi, thanks for raising the issue(-s), all contributions really matter!
-        Please, note that we'll close the issue without further explanation if you don't follow
-        this template and don't provide the information requested within this template.
-
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Issue submitter TODO list
-      description: By you checking these checkboxes we can be sure you've done the essential things.
-      options:
-        - label: I've looked up my issue in [FAQ](https://docs.kafka-ui.provectus.io/faq/common-problems)
-          required: true
-        - label: I've searched for an already existing issues [here](https://github.com/provectus/kafka-ui/issues)
-          required: true
-        - label: I've tried running `master`-labeled docker image and the issue still persists there
-          required: true
-        - label: I'm running a supported version of the application which is listed [here](https://github.com/provectus/kafka-ui/blob/master/SECURITY.md)
-          required: true
-
-  - type: textarea
-    attributes:
-      label: Describe the bug (actual behavior)
-      description: A clear and concise description of what the bug is. Use a list, if there is more than one problem
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: A clear and concise description of what you expected to happen
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Your installation details
-      description: |
-        How do you run the app? Please provide as much info as possible:
-        1. App version (commit hash in the top left corner of the UI)
-        2. Helm chart version
-        3. Your application config. Please remove the sensitive info like passwords or API keys.
-        4. Any IAAC configs
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Steps to reproduce
-      description: |
-        Please write down the order of the actions required to reproduce the issue.
-        For the advanced setups/complicated issue, we might need you to provide
-        a minimal [reproducible example](https://stackoverflow.com/help/minimal-reproducible-example).
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Screenshots
-      description: |
-        If applicable, add screenshots to help explain your problem
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Logs
-      description: |
-        If applicable, *upload* screenshots to help explain your problem
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: |
-        Add any other context about the problem here. E.G.:
-        1. Are there any alternative scenarios (different data/methods/configuration/setup) you have tried?
-          Were they successful or the same issue occurred? Please provide steps as well.
-        2. Related issues (if there are any).
-        3. Logs (if available)
-        4. Is there any serious impact or behaviour on the end-user because of this issue, that can be overlooked?
-    validations:
-      required: false

From fa65ec27530457a66bd88b4e1c923e1729285607 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:06:48 +0400
Subject: [PATCH 615/734] Bump aquasecurity/trivy-action from 0.10.0 to 0.11.2
 (#3927)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index 9774cca188d..a4ad7ce4b1f 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -55,7 +55,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.10.0
+        uses: aquasecurity/trivy-action@0.11.2
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From 0a350388261b74736845863db8b3aac2438a6640 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:07:38 +0400
Subject: [PATCH 616/734] Bump svenstaro/upload-release-action from 2.5.0 to
 2.6.1 (#3904)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9b7be6de241..310267e294c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -34,7 +34,7 @@ jobs:
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Upload files to a GitHub release
-        uses: svenstaro/upload-release-action@2.5.0
+        uses: svenstaro/upload-release-action@2.6.1
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: kafka-ui-api/target/kafka-ui-api-${{ steps.build.outputs.version }}.jar

From e60fe062b69b099cb9934ed918af6616c0081e2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:08:30 +0400
Subject: [PATCH 617/734] Bump maven-jar-plugin from 3.0.2 to 3.3.0 (#3704)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-serde-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-serde-api/pom.xml b/kafka-ui-serde-api/pom.xml
index db20926257b..729beead531 100644
--- a/kafka-ui-serde-api/pom.xml
+++ b/kafka-ui-serde-api/pom.xml
@@ -55,7 +55,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.0.2</version>
+					<version>3.3.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.sonatype.plugins</groupId>

From 55ed7f482128a3c25b7c8f2abd361ef724e6e82b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:08:59 +0400
Subject: [PATCH 618/734] Bump mheap/github-action-required-labels from 4 to 5
 (#3926)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/block_merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/block_merge.yml b/.github/workflows/block_merge.yml
index 766d598eb30..1eb64d58e69 100644
--- a/.github/workflows/block_merge.yml
+++ b/.github/workflows/block_merge.yml
@@ -6,7 +6,7 @@ jobs:
   block_merge:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v4
+      - uses: mheap/github-action-required-labels@v5
         with:
           mode: exactly
           count: 0

From 593ef7ec9c9dd2e7b5a2d1208f4378b6188e3a05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:09:21 +0400
Subject: [PATCH 619/734] Bump kentaro-m/task-completed-checker-action from
 0.1.1 to 0.1.2 (#3851)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/pr-checks.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
index 80f4e6eddc1..e57bb71aed5 100644
--- a/.github/workflows/pr-checks.yaml
+++ b/.github/workflows/pr-checks.yaml
@@ -7,7 +7,7 @@ jobs:
   task-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: kentaro-m/task-completed-checker-action@v0.1.1
+      - uses: kentaro-m/task-completed-checker-action@v0.1.2
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
       - uses: dekinderfiets/pr-description-enforcer@0.0.1

From 7f7242eb8b39096183c61557cd2ca895264cf6e8 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Tue, 20 Jun 2023 11:18:20 +0400
Subject: [PATCH 620/734] Infra: Revert comment action for published images
 (#3953)

Co-authored-by: Narek Matevosyan <nmatevosyan@provectus.com>
---
 .github/workflows/build-public-image.yml  | 13 +++++--------
 .github/workflows/delete-public-image.yml |  6 ------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index 9f6a3b902b2..93de4a55998 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -64,14 +64,11 @@ jobs:
             JAR_FILE=kafka-ui-api-${{ steps.build.outputs.version }}.jar
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
-      - name: update status check
-        uses: Sibz/github-status-action@v1.1.6
+      - name: make comment with private deployment link
+        uses: peter-evans/create-or-update-comment@v2
         with:
-          authToken: ${{secrets.GITHUB_TOKEN}}
-          context: "Image published at"
-          state: "success"
-          sha: ${{ github.event.pull_request.head.sha  || github.sha }}
-          target_url: "public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }}"
-
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            Image published at public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }}
     outputs:
       tag: ${{ steps.extract_branch.outputs.tag }}
diff --git a/.github/workflows/delete-public-image.yml b/.github/workflows/delete-public-image.yml
index 1662a4b745c..50372ef751f 100644
--- a/.github/workflows/delete-public-image.yml
+++ b/.github/workflows/delete-public-image.yml
@@ -32,9 +32,3 @@ jobs:
                 --repository-name kafka-ui-custom-build \
                 --image-ids imageTag=${{ steps.extract_branch.outputs.tag }} \
                 --region us-east-1
-      - name: make comment with private deployment link
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            Image tag public.ecr.aws/provectus/kafka-ui-custom-build:${{ steps.extract_branch.outputs.tag }} has been removed

From c743067ffa082a24fba83e81b4a1007c347dbe8c Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 21 Jun 2023 12:02:27 +0400
Subject: [PATCH 621/734] Audit backend (#3831)

AuditService added to log all API operations
---
 .../compose/jmx-exporter/kafka-broker.yml     |   2 +-
 documentation/compose/kafka-ui-arm64.yaml     |   2 +
 .../kafka/ui/config/ClustersProperties.java   |  12 +
 .../kafka/ui/controller/AclsController.java   |  13 +-
 .../ApplicationConfigController.java          |  56 +++--
 .../ui/controller/BrokersController.java      |  82 ++++---
 .../ui/controller/ClustersController.java     |  16 +-
 .../controller/ConsumerGroupsController.java  |  55 +++--
 .../ui/controller/KafkaConnectController.java | 121 ++++++----
 .../kafka/ui/controller/KsqlController.java   |  62 +++---
 .../ui/controller/MessagesController.java     |  41 ++--
 .../ui/controller/SchemasController.java      |  99 ++++++---
 .../kafka/ui/controller/TopicsController.java | 152 +++++++------
 .../kafka/ui/model/rbac/AccessContext.java    |  35 ++-
 .../kafka/ui/model/rbac/Permission.java       |   6 +-
 .../kafka/ui/model/rbac/Resource.java         |   3 +-
 .../ui/model/rbac/permission/AuditAction.java |  14 ++
 .../rbac/permission/PermissibleAction.java    |   6 +-
 .../kafka/ui/service/BrokerService.java       |   3 +-
 .../kafka/ui/service/MessagesService.java     |  20 +-
 .../kafka/ui/service/TopicsService.java       |  21 +-
 .../kafka/ui/service/audit/AuditRecord.java   |  97 ++++++++
 .../kafka/ui/service/audit/AuditService.java  | 209 ++++++++++++++++++
 .../kafka/ui/service/audit/AuditWriter.java   |  78 +++++++
 .../ui/service/rbac/AccessControlService.java |  20 +-
 .../src/main/resources/application-local.yml  |   3 +
 .../kafka/ui/AbstractIntegrationTest.java     |   2 +
 .../service/SchemaRegistryPaginationTest.java |   4 +-
 .../service/TopicsServicePaginationTest.java  |   6 +-
 .../service/audit/AuditIntegrationTest.java   |  87 ++++++++
 .../ui/service/audit/AuditServiceTest.java    | 154 +++++++++++++
 .../ui/util/AccessControlServiceMock.java     |   1 -
 .../main/resources/swagger/kafka-ui-api.yaml  |  16 ++
 33 files changed, 1201 insertions(+), 297 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AuditAction.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditRecord.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditIntegrationTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java

diff --git a/documentation/compose/jmx-exporter/kafka-broker.yml b/documentation/compose/jmx-exporter/kafka-broker.yml
index cb19fee9f84..efe0a463567 100644
--- a/documentation/compose/jmx-exporter/kafka-broker.yml
+++ b/documentation/compose/jmx-exporter/kafka-broker.yml
@@ -1,2 +1,2 @@
 rules:
-  - pattern: ".*"
\ No newline at end of file
+  - pattern: ".*"
diff --git a/documentation/compose/kafka-ui-arm64.yaml b/documentation/compose/kafka-ui-arm64.yaml
index ad2ae421990..082d7cb5af0 100644
--- a/documentation/compose/kafka-ui-arm64.yaml
+++ b/documentation/compose/kafka-ui-arm64.yaml
@@ -20,6 +20,8 @@ services:
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_NAME: first
       KAFKA_CLUSTERS_0_KAFKACONNECT_0_ADDRESS: http://kafka-connect0:8083
       DYNAMIC_CONFIG_ENABLED: 'true'  # not necessary, added for tests
+      KAFKA_CLUSTERS_0_AUDIT_TOPICAUDITENABLED: 'true'
+      KAFKA_CLUSTERS_0_AUDIT_CONSOLEAUDITENABLED: 'true'
 
   kafka0:
     image: confluentinc/cp-kafka:7.2.1.arm64
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 64ec894cd55..33763ed9b89 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -51,6 +51,7 @@ public static class Cluster {
     List<Masking> masking;
     Long pollingThrottleRate;
     TruststoreConfig ssl;
+    AuditProperties audit;
   }
 
   @Data
@@ -143,6 +144,17 @@ public enum Type {
     }
   }
 
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class AuditProperties {
+    String topic;
+    Integer auditTopicsPartitions;
+    Boolean topicAuditEnabled;
+    Boolean consoleAuditEnabled;
+    Map<String, String> auditTopicProperties;
+  }
+
   @PostConstruct
   public void validateAndSetDefaults() {
     if (clusters != null) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
index 83d2ef553e8..1de8f4d71be 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
@@ -8,6 +8,7 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.AclAction;
 import com.provectus.kafka.ui.service.acl.AclsService;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -26,6 +27,7 @@ public class AclsController extends AbstractController implements AclsApi {
 
   private final AclsService aclsService;
   private final AccessControlService accessControlService;
+  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<Void>> createAcl(String clusterName, Mono<KafkaAclDTO> kafkaAclDto,
@@ -33,12 +35,14 @@ public Mono<ResponseEntity<Void>> createAcl(String clusterName, Mono<KafkaAclDTO
     AccessContext context = AccessContext.builder()
         .cluster(clusterName)
         .aclActions(AclAction.EDIT)
+        .operationName("createAcl")
         .build();
 
     return accessControlService.validateAccess(context)
         .then(kafkaAclDto)
         .map(ClusterMapper::toAclBinding)
         .flatMap(binding -> aclsService.createAcl(getCluster(clusterName), binding))
+        .doOnEach(sig -> auditService.audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 
@@ -48,12 +52,14 @@ public Mono<ResponseEntity<Void>> deleteAcl(String clusterName, Mono<KafkaAclDTO
     AccessContext context = AccessContext.builder()
         .cluster(clusterName)
         .aclActions(AclAction.EDIT)
+        .operationName("deleteAcl")
         .build();
 
     return accessControlService.validateAccess(context)
         .then(kafkaAclDto)
         .map(ClusterMapper::toAclBinding)
         .flatMap(binding -> aclsService.deleteAcl(getCluster(clusterName), binding))
+        .doOnEach(sig -> auditService.audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 
@@ -66,6 +72,7 @@ public Mono<ResponseEntity<Flux<KafkaAclDTO>>> listAcls(String clusterName,
     AccessContext context = AccessContext.builder()
         .cluster(clusterName)
         .aclActions(AclAction.VIEW)
+        .operationName("listAcls")
         .build();
 
     var resourceType = Optional.ofNullable(resourceTypeDto)
@@ -83,7 +90,7 @@ public Mono<ResponseEntity<Flux<KafkaAclDTO>>> listAcls(String clusterName,
             ResponseEntity.ok(
                 aclsService.listAcls(getCluster(clusterName), filter)
                     .map(ClusterMapper::toKafkaAclDto)))
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -91,12 +98,14 @@ public Mono<ResponseEntity<String>> getAclAsCsv(String clusterName, ServerWebExc
     AccessContext context = AccessContext.builder()
         .cluster(clusterName)
         .aclActions(AclAction.VIEW)
+        .operationName("getAclAsCsv")
         .build();
 
     return accessControlService.validateAccess(context).then(
         aclsService.getAclAsCsvString(getCluster(clusterName))
             .map(ResponseEntity::ok)
             .flatMap(Mono::just)
+            .doOnEach(sig -> auditService.audit(context, sig))
     );
   }
 
@@ -105,11 +114,13 @@ public Mono<ResponseEntity<Void>> syncAclsCsv(String clusterName, Mono<String> c
     AccessContext context = AccessContext.builder()
         .cluster(clusterName)
         .aclActions(AclAction.EDIT)
+        .operationName("syncAclsCsv")
         .build();
 
     return accessControlService.validateAccess(context)
         .then(csvMono)
         .flatMap(csv -> aclsService.syncAclWithAclCsv(getCluster(clusterName), csv))
+        .doOnEach(sig -> auditService.audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
index df04b40fab4..5f03c9ab5c6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
@@ -15,6 +15,7 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.ApplicationInfoService;
 import com.provectus.kafka.ui.service.KafkaClusterFactory;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import com.provectus.kafka.ui.util.ApplicationRestarter;
 import com.provectus.kafka.ui.util.DynamicConfigOperations;
@@ -55,6 +56,7 @@ interface PropertiesMapper {
   private final ApplicationRestarter restarter;
   private final KafkaClusterFactory kafkaClusterFactory;
   private final ApplicationInfoService applicationInfoService;
+  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<ApplicationInfoDTO>> getApplicationInfo(ServerWebExchange exchange) {
@@ -63,62 +65,68 @@ public Mono<ResponseEntity<ApplicationInfoDTO>> getApplicationInfo(ServerWebExch
 
   @Override
   public Mono<ResponseEntity<ApplicationConfigDTO>> getCurrentConfig(ServerWebExchange exchange) {
-    return accessControlService
-        .validateAccess(
-            AccessContext.builder()
-                .applicationConfigActions(VIEW)
-                .build()
-        )
+    var context = AccessContext.builder()
+        .applicationConfigActions(VIEW)
+        .operationName("getCurrentConfig")
+        .build();
+    return accessControlService.validateAccess(context)
         .then(Mono.fromSupplier(() -> ResponseEntity.ok(
             new ApplicationConfigDTO()
                 .properties(MAPPER.toDto(dynamicConfigOperations.getCurrentProperties()))
-        )));
+        )))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Void>> restartWithConfig(Mono<RestartRequestDTO> restartRequestDto,
                                                       ServerWebExchange exchange) {
-    return accessControlService
-        .validateAccess(
-            AccessContext.builder()
-                .applicationConfigActions(EDIT)
-                .build()
-        )
+    var context =  AccessContext.builder()
+        .applicationConfigActions(EDIT)
+        .operationName("restartWithConfig")
+        .build();
+    return accessControlService.validateAccess(context)
         .then(restartRequestDto)
-        .map(dto -> {
+        .<ResponseEntity<Void>>map(dto -> {
           dynamicConfigOperations.persist(MAPPER.fromDto(dto.getConfig().getProperties()));
           restarter.requestRestart();
           return ResponseEntity.ok().build();
-        });
+        })
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<UploadedFileInfoDTO>> uploadConfigRelatedFile(Flux<Part> fileFlux,
                                                                            ServerWebExchange exchange) {
-    return accessControlService
-        .validateAccess(
-            AccessContext.builder()
-                .applicationConfigActions(EDIT)
-                .build()
-        )
+    var context = AccessContext.builder()
+        .applicationConfigActions(EDIT)
+        .operationName("uploadConfigRelatedFile")
+        .build();
+    return accessControlService.validateAccess(context)
         .then(fileFlux.single())
         .flatMap(file ->
             dynamicConfigOperations.uploadConfigRelatedFile((FilePart) file)
                 .map(path -> new UploadedFileInfoDTO().location(path.toString()))
-                .map(ResponseEntity::ok));
+                .map(ResponseEntity::ok))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<ApplicationConfigValidationDTO>> validateConfig(Mono<ApplicationConfigDTO> configDto,
                                                                              ServerWebExchange exchange) {
-    return configDto
+    var context = AccessContext.builder()
+        .applicationConfigActions(EDIT)
+        .operationName("validateConfig")
+        .build();
+    return accessControlService.validateAccess(context)
+        .then(configDto)
         .flatMap(config -> {
           PropertiesStructure propertiesStructure = MAPPER.fromDto(config.getProperties());
           ClustersProperties clustersProperties = propertiesStructure.getKafka();
           return validateClustersConfig(clustersProperties)
               .map(validations -> new ApplicationConfigValidationDTO().clusters(validations));
         })
-        .map(ResponseEntity::ok);
+        .map(ResponseEntity::ok)
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   private Mono<Map<String, ClusterConfigValidationDTO>> validateClustersConfig(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
index c02b848eed3..81965179fcc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
@@ -11,8 +11,11 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
 import com.provectus.kafka.ui.service.BrokerService;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -27,61 +30,78 @@
 public class BrokersController extends AbstractController implements BrokersApi {
   private final BrokerService brokerService;
   private final ClusterMapper clusterMapper;
+
+  private final AuditService auditService;
   private final AccessControlService accessControlService;
 
   @Override
   public Mono<ResponseEntity<Flux<BrokerDTO>>> getBrokers(String clusterName,
                                                           ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
-        .build());
+        .operationName("getBrokers")
+        .build();
 
     var job = brokerService.getBrokers(getCluster(clusterName)).map(clusterMapper::toBrokerDto);
-
-    return validateAccess.thenReturn(ResponseEntity.ok(job));
+    return accessControlService.validateAccess(context)
+        .thenReturn(ResponseEntity.ok(job))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<BrokerMetricsDTO>> getBrokersMetrics(String clusterName, Integer id,
                                                                   ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
-        .build());
+        .operationName("getBrokersMetrics")
+        .operationParams(Map.of("id", id))
+        .build();
 
-    return validateAccess.then(
-        brokerService.getBrokerMetrics(getCluster(clusterName), id)
-            .map(clusterMapper::toBrokerMetrics)
-            .map(ResponseEntity::ok)
-            .onErrorReturn(ResponseEntity.notFound().build())
-    );
+    return accessControlService.validateAccess(context)
+        .then(
+            brokerService.getBrokerMetrics(getCluster(clusterName), id)
+                .map(clusterMapper::toBrokerMetrics)
+                .map(ResponseEntity::ok)
+                .onErrorReturn(ResponseEntity.notFound().build())
+        )
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Flux<BrokersLogdirsDTO>>> getAllBrokersLogdirs(String clusterName,
-                                                                            List<Integer> brokers,
+                                                                            @Nullable List<Integer> brokers,
                                                                             ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+
+    List<Integer> brokerIds = brokers == null ? List.of() : brokers;
+
+    var context = AccessContext.builder()
         .cluster(clusterName)
-        .build());
+        .operationName("getAllBrokersLogdirs")
+        .operationParams(Map.of("brokerIds", brokerIds))
+        .build();
 
-    return validateAccess.thenReturn(ResponseEntity.ok(
-        brokerService.getAllBrokersLogdirs(getCluster(clusterName), brokers)));
+    return accessControlService.validateAccess(context)
+        .thenReturn(ResponseEntity.ok(
+            brokerService.getAllBrokersLogdirs(getCluster(clusterName), brokerIds)))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Flux<BrokerConfigDTO>>> getBrokerConfig(String clusterName,
                                                                      Integer id,
                                                                      ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .clusterConfigActions(ClusterConfigAction.VIEW)
-        .build());
+        .operationName("getBrokerConfig")
+        .operationParams(Map.of("brokerId", id))
+        .build();
 
-    return validateAccess.thenReturn(
+    return accessControlService.validateAccess(context).thenReturn(
         ResponseEntity.ok(
             brokerService.getBrokerConfig(getCluster(clusterName), id)
                 .map(clusterMapper::toBrokerConfig))
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -89,16 +109,18 @@ public Mono<ResponseEntity<Void>> updateBrokerTopicPartitionLogDir(String cluste
                                                                      Integer id,
                                                                      Mono<BrokerLogdirUpdateDTO> brokerLogdir,
                                                                      ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .clusterConfigActions(ClusterConfigAction.VIEW, ClusterConfigAction.EDIT)
-        .build());
+        .operationName("updateBrokerTopicPartitionLogDir")
+        .operationParams(Map.of("brokerId", id))
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         brokerLogdir
             .flatMap(bld -> brokerService.updateBrokerLogDir(getCluster(clusterName), id, bld))
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -107,16 +129,18 @@ public Mono<ResponseEntity<Void>> updateBrokerConfigByName(String clusterName,
                                                              String name,
                                                              Mono<BrokerConfigItemDTO> brokerConfig,
                                                              ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .clusterConfigActions(ClusterConfigAction.VIEW, ClusterConfigAction.EDIT)
-        .build());
+        .operationName("updateBrokerConfigByName")
+        .operationParams(Map.of("brokerId", id))
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         brokerConfig
             .flatMap(bci -> brokerService.updateBrokerConfigByName(
                 getCluster(clusterName), id, name, bci.getValue()))
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java
index b28bf84936e..20c64ed01f4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java
@@ -6,6 +6,7 @@
 import com.provectus.kafka.ui.model.ClusterStatsDTO;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.ClusterService;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +22,7 @@
 public class ClustersController extends AbstractController implements ClustersApi {
   private final ClusterService clusterService;
   private final AccessControlService accessControlService;
+  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<Flux<ClusterDTO>>> getClusters(ServerWebExchange exchange) {
@@ -35,6 +37,7 @@ public Mono<ResponseEntity<ClusterMetricsDTO>> getClusterMetrics(String clusterN
                                                                    ServerWebExchange exchange) {
     AccessContext context = AccessContext.builder()
         .cluster(clusterName)
+        .operationName("getClusterMetrics")
         .build();
 
     return accessControlService.validateAccess(context)
@@ -42,7 +45,8 @@ public Mono<ResponseEntity<ClusterMetricsDTO>> getClusterMetrics(String clusterN
             clusterService.getClusterMetrics(getCluster(clusterName))
                 .map(ResponseEntity::ok)
                 .onErrorReturn(ResponseEntity.notFound().build())
-        );
+        )
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -50,6 +54,7 @@ public Mono<ResponseEntity<ClusterStatsDTO>> getClusterStats(String clusterName,
                                                                ServerWebExchange exchange) {
     AccessContext context = AccessContext.builder()
         .cluster(clusterName)
+        .operationName("getClusterStats")
         .build();
 
     return accessControlService.validateAccess(context)
@@ -57,7 +62,8 @@ public Mono<ResponseEntity<ClusterStatsDTO>> getClusterStats(String clusterName,
             clusterService.getClusterStats(getCluster(clusterName))
                 .map(ResponseEntity::ok)
                 .onErrorReturn(ResponseEntity.notFound().build())
-        );
+        )
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -66,11 +72,11 @@ public Mono<ResponseEntity<ClusterDTO>> updateClusterInfo(String clusterName,
 
     AccessContext context = AccessContext.builder()
         .cluster(clusterName)
+        .operationName("updateClusterInfo")
         .build();
 
     return accessControlService.validateAccess(context)
-        .then(
-            clusterService.updateCluster(getCluster(clusterName)).map(ResponseEntity::ok)
-        );
+        .then(clusterService.updateCluster(getCluster(clusterName)).map(ResponseEntity::ok))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
index fd7505d99bd..4f4574725f2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
@@ -19,6 +19,7 @@
 import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
 import com.provectus.kafka.ui.service.ConsumerGroupService;
 import com.provectus.kafka.ui.service.OffsetsResetService;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Map;
 import java.util.Optional;
@@ -42,6 +43,7 @@ public class ConsumerGroupsController extends AbstractController implements Cons
   private final ConsumerGroupService consumerGroupService;
   private final OffsetsResetService offsetsResetService;
   private final AccessControlService accessControlService;
+  private final AuditService auditService;
 
   @Value("${consumer.groups.page.size:25}")
   private int defaultConsumerGroupsPageSize;
@@ -50,44 +52,47 @@ public class ConsumerGroupsController extends AbstractController implements Cons
   public Mono<ResponseEntity<Void>> deleteConsumerGroup(String clusterName,
                                                         String id,
                                                         ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .consumerGroup(id)
         .consumerGroupActions(DELETE)
-        .build());
+        .operationName("deleteConsumerGroup")
+        .build();
 
-    return validateAccess.then(
-        consumerGroupService.deleteConsumerGroupById(getCluster(clusterName), id)
-            .thenReturn(ResponseEntity.ok().build())
-    );
+    return accessControlService.validateAccess(context)
+        .then(consumerGroupService.deleteConsumerGroupById(getCluster(clusterName), id))
+        .doOnEach(sig -> auditService.audit(context, sig))
+        .thenReturn(ResponseEntity.ok().build());
   }
 
   @Override
   public Mono<ResponseEntity<ConsumerGroupDetailsDTO>> getConsumerGroup(String clusterName,
                                                                         String consumerGroupId,
                                                                         ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .consumerGroup(consumerGroupId)
         .consumerGroupActions(VIEW)
-        .build());
+        .operationName("getConsumerGroup")
+        .build();
 
-    return validateAccess.then(
-        consumerGroupService.getConsumerGroupDetail(getCluster(clusterName), consumerGroupId)
+    return accessControlService.validateAccess(context)
+        .then(consumerGroupService.getConsumerGroupDetail(getCluster(clusterName), consumerGroupId)
             .map(ConsumerGroupMapper::toDetailsDto)
-            .map(ResponseEntity::ok)
-    );
+            .map(ResponseEntity::ok))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Flux<ConsumerGroupDTO>>> getTopicConsumerGroups(String clusterName,
                                                                              String topicName,
                                                                              ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(TopicAction.VIEW)
-        .build());
+        .operationName("getTopicConsumerGroups")
+        .build();
 
     Mono<ResponseEntity<Flux<ConsumerGroupDTO>>> job =
         consumerGroupService.getConsumerGroupsForTopic(getCluster(clusterName), topicName)
@@ -99,7 +104,9 @@ public Mono<ResponseEntity<Flux<ConsumerGroupDTO>>> getTopicConsumerGroups(Strin
             .map(ResponseEntity::ok)
             .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()));
 
-    return validateAccess.then(job);
+    return accessControlService.validateAccess(context)
+        .then(job)
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -112,12 +119,13 @@ public Mono<ResponseEntity<ConsumerGroupsPageResponseDTO>> getConsumerGroupsPage
       SortOrderDTO sortOrderDto,
       ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         // consumer group access validation is within the service
-        .build());
+        .operationName("getConsumerGroupsPage")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         consumerGroupService.getConsumerGroupsPage(
                 getCluster(clusterName),
                 Optional.ofNullable(page).filter(i -> i > 0).orElse(1),
@@ -128,7 +136,7 @@ public Mono<ResponseEntity<ConsumerGroupsPageResponseDTO>> getConsumerGroupsPage
             )
             .map(this::convertPage)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -137,12 +145,13 @@ public Mono<ResponseEntity<Void>> resetConsumerGroupOffsets(String clusterName,
                                                               Mono<ConsumerGroupOffsetsResetDTO> resetDto,
                                                               ServerWebExchange exchange) {
     return resetDto.flatMap(reset -> {
-      Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+      var context = AccessContext.builder()
           .cluster(clusterName)
           .topic(reset.getTopic())
           .topicActions(TopicAction.VIEW)
           .consumerGroupActions(RESET_OFFSETS)
-          .build());
+          .operationName("resetConsumerGroupOffsets")
+          .build();
 
       Supplier<Mono<Void>> mono = () -> {
         var cluster = getCluster(clusterName);
@@ -182,7 +191,9 @@ public Mono<ResponseEntity<Void>> resetConsumerGroupOffsets(String clusterName,
         }
       };
 
-      return validateAccess.then(mono.get());
+      return accessControlService.validateAccess(context)
+          .then(mono.get())
+          .doOnEach(sig -> auditService.audit(context, sig));
     }).thenReturn(ResponseEntity.ok().build());
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index d6de3210b68..8f08472fa1d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -18,6 +18,7 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
 import com.provectus.kafka.ui.service.KafkaConnectService;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Comparator;
 import java.util.Map;
@@ -37,8 +38,10 @@
 public class KafkaConnectController extends AbstractController implements KafkaConnectApi {
   private static final Set<ConnectorActionDTO> RESTART_ACTIONS
       = Set.of(RESTART, RESTART_FAILED_TASKS, RESTART_ALL_TASKS);
+
   private final KafkaConnectService kafkaConnectService;
   private final AccessControlService accessControlService;
+  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<Flux<ConnectDTO>>> getConnects(String clusterName,
@@ -54,15 +57,16 @@ public Mono<ResponseEntity<Flux<ConnectDTO>>> getConnects(String clusterName,
   public Mono<ResponseEntity<Flux<String>>> getConnectors(String clusterName, String connectName,
                                                           ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(ConnectAction.VIEW)
-        .build());
+        .operationName("getConnectors")
+        .build();
 
-    return validateAccess.thenReturn(
-        ResponseEntity.ok(kafkaConnectService.getConnectorNames(getCluster(clusterName), connectName))
-    );
+    return accessControlService.validateAccess(context)
+        .thenReturn(ResponseEntity.ok(kafkaConnectService.getConnectorNames(getCluster(clusterName), connectName)))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -70,16 +74,17 @@ public Mono<ResponseEntity<ConnectorDTO>> createConnector(String clusterName, St
                                                             @Valid Mono<NewConnectorDTO> connector,
                                                             ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(ConnectAction.VIEW, ConnectAction.CREATE)
-        .build());
+        .operationName("createConnector")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         kafkaConnectService.createConnector(getCluster(clusterName), connectName, connector)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -87,17 +92,18 @@ public Mono<ResponseEntity<ConnectorDTO>> getConnector(String clusterName, Strin
                                                          String connectorName,
                                                          ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(ConnectAction.VIEW)
         .connector(connectorName)
-        .build());
+        .operationName("getConnector")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         kafkaConnectService.getConnector(getCluster(clusterName), connectName, connectorName)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -105,16 +111,18 @@ public Mono<ResponseEntity<Void>> deleteConnector(String clusterName, String con
                                                     String connectorName,
                                                     ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
-        .build());
+        .operationName("deleteConnector")
+        .operationParams(Map.of("connectorName", connectName))
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         kafkaConnectService.deleteConnector(getCluster(clusterName), connectName, connectorName)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
 
@@ -126,14 +134,23 @@ public Mono<ResponseEntity<Flux<FullConnectorInfoDTO>>> getAllConnectors(
       SortOrderDTO sortOrder,
       ServerWebExchange exchange
   ) {
+    var context = AccessContext.builder()
+        .cluster(clusterName)
+        .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
+        .operationName("getAllConnectors")
+        .build();
+
     var comparator = sortOrder == null || sortOrder.equals(SortOrderDTO.ASC)
         ? getConnectorsComparator(orderBy)
         : getConnectorsComparator(orderBy).reversed();
+
     Flux<FullConnectorInfoDTO> job = kafkaConnectService.getAllConnectors(getCluster(clusterName), search)
         .filterWhen(dto -> accessControlService.isConnectAccessible(dto.getConnect(), clusterName))
-        .filterWhen(dto -> accessControlService.isConnectorAccessible(dto.getConnect(), dto.getName(), clusterName));
+        .filterWhen(dto -> accessControlService.isConnectorAccessible(dto.getConnect(), dto.getName(), clusterName))
+        .sort(comparator);
 
-    return Mono.just(ResponseEntity.ok(job.sort(comparator)));
+    return Mono.just(ResponseEntity.ok(job))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -142,17 +159,18 @@ public Mono<ResponseEntity<Map<String, Object>>> getConnectorConfig(String clust
                                                                       String connectorName,
                                                                       ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(ConnectAction.VIEW)
-        .build());
+        .operationName("getConnectorConfig")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         kafkaConnectService
             .getConnectorConfig(getCluster(clusterName), connectName, connectorName)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -161,16 +179,19 @@ public Mono<ResponseEntity<ConnectorDTO>> setConnectorConfig(String clusterName,
                                                                Mono<Map<String, Object>> requestBody,
                                                                ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
-        .build());
-
-    return validateAccess.then(
-        kafkaConnectService
-            .setConnectorConfig(getCluster(clusterName), connectName, connectorName, requestBody)
-            .map(ResponseEntity::ok));
+        .operationName("setConnectorConfig")
+        .operationParams(Map.of("connectorName", connectorName))
+        .build();
+
+    return accessControlService.validateAccess(context).then(
+            kafkaConnectService
+                .setConnectorConfig(getCluster(clusterName), connectName, connectorName, requestBody)
+                .map(ResponseEntity::ok))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -178,7 +199,6 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
                                                          String connectorName,
                                                          ConnectorActionDTO action,
                                                          ServerWebExchange exchange) {
-
     ConnectAction[] connectActions;
     if (RESTART_ACTIONS.contains(action)) {
       connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.RESTART};
@@ -186,17 +206,19 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
       connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.EDIT};
     }
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(connectActions)
-        .build());
+        .operationName("updateConnectorState")
+        .operationParams(Map.of("connectorName", connectorName))
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         kafkaConnectService
             .updateConnectorState(getCluster(clusterName), connectName, connectorName, action)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -204,17 +226,19 @@ public Mono<ResponseEntity<Flux<TaskDTO>>> getConnectorTasks(String clusterName,
                                                                String connectName,
                                                                String connectorName,
                                                                ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(ConnectAction.VIEW)
-        .build());
+        .operationName("getConnectorTasks")
+        .operationParams(Map.of("connectorName", connectorName))
+        .build();
 
-    return validateAccess.thenReturn(
+    return accessControlService.validateAccess(context).thenReturn(
         ResponseEntity
             .ok(kafkaConnectService
                 .getConnectorTasks(getCluster(clusterName), connectName, connectorName))
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -222,34 +246,37 @@ public Mono<ResponseEntity<Void>> restartConnectorTask(String clusterName, Strin
                                                          String connectorName, Integer taskId,
                                                          ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(ConnectAction.VIEW, ConnectAction.RESTART)
-        .build());
+        .operationName("restartConnectorTask")
+        .operationParams(Map.of("connectorName", connectorName))
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         kafkaConnectService
             .restartConnectorTask(getCluster(clusterName), connectName, connectorName, taskId)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Flux<ConnectorPluginDTO>>> getConnectorPlugins(
       String clusterName, String connectName, ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .connect(connectName)
         .connectActions(ConnectAction.VIEW)
-        .build());
+        .operationName("getConnectorPlugins")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         Mono.just(
             ResponseEntity.ok(
                 kafkaConnectService.getConnectorPlugins(getCluster(clusterName), connectName)))
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
index 3a171b9b05b..312727fe792 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
@@ -9,6 +9,7 @@
 import com.provectus.kafka.ui.model.KsqlTableResponseDTO;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.KsqlAction;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.ksql.KsqlServiceV2;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
@@ -29,38 +30,43 @@ public class KsqlController extends AbstractController implements KsqlApi {
 
   private final KsqlServiceV2 ksqlServiceV2;
   private final AccessControlService accessControlService;
+  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<KsqlCommandV2ResponseDTO>> executeKsql(String clusterName,
-                                                                    Mono<KsqlCommandV2DTO>
-                                                                        ksqlCommand2Dto,
+                                                                    Mono<KsqlCommandV2DTO> ksqlCmdDo,
                                                                     ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
-        .cluster(clusterName)
-        .ksqlActions(KsqlAction.EXECUTE)
-        .build());
-
-    return validateAccess.then(
-        ksqlCommand2Dto.map(dto -> {
-          var id = ksqlServiceV2.registerCommand(
-              getCluster(clusterName),
-              dto.getKsql(),
-              Optional.ofNullable(dto.getStreamsProperties()).orElse(Map.of()));
-          return new KsqlCommandV2ResponseDTO().pipeId(id);
-        }).map(ResponseEntity::ok)
-    );
+    return ksqlCmdDo.flatMap(
+            command -> {
+              var context = AccessContext.builder()
+                  .cluster(clusterName)
+                  .ksqlActions(KsqlAction.EXECUTE)
+                  .operationName("executeKsql")
+                  .operationParams(command)
+                  .build();
+              return accessControlService.validateAccess(context).thenReturn(
+                      new KsqlCommandV2ResponseDTO().pipeId(
+                          ksqlServiceV2.registerCommand(
+                              getCluster(clusterName),
+                              command.getKsql(),
+                              Optional.ofNullable(command.getStreamsProperties()).orElse(Map.of()))))
+                  .doOnEach(sig -> auditService.audit(context, sig));
+            }
+        )
+        .map(ResponseEntity::ok);
   }
 
   @Override
   public Mono<ResponseEntity<Flux<KsqlResponseDTO>>> openKsqlResponsePipe(String clusterName,
                                                                           String pipeId,
                                                                           ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .ksqlActions(KsqlAction.EXECUTE)
-        .build());
+        .operationName("openKsqlResponsePipe")
+        .build();
 
-    return validateAccess.thenReturn(
+    return accessControlService.validateAccess(context).thenReturn(
         ResponseEntity.ok(ksqlServiceV2.execute(pipeId)
             .map(table -> new KsqlResponseDTO()
                 .table(
@@ -74,22 +80,28 @@ public Mono<ResponseEntity<Flux<KsqlResponseDTO>>> openKsqlResponsePipe(String c
   @Override
   public Mono<ResponseEntity<Flux<KsqlStreamDescriptionDTO>>> listStreams(String clusterName,
                                                                           ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .ksqlActions(KsqlAction.EXECUTE)
-        .build());
+        .operationName("listStreams")
+        .build();
 
-    return validateAccess.thenReturn(ResponseEntity.ok(ksqlServiceV2.listStreams(getCluster(clusterName))));
+    return accessControlService.validateAccess(context)
+        .thenReturn(ResponseEntity.ok(ksqlServiceV2.listStreams(getCluster(clusterName))))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Flux<KsqlTableDescriptionDTO>>> listTables(String clusterName,
                                                                         ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .ksqlActions(KsqlAction.EXECUTE)
-        .build());
+        .operationName("listTables")
+        .build();
 
-    return validateAccess.thenReturn(ResponseEntity.ok(ksqlServiceV2.listTables(getCluster(clusterName))));
+    return accessControlService.validateAccess(context)
+        .thenReturn(ResponseEntity.ok(ksqlServiceV2.listTables(getCluster(clusterName))))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
index aa9d7d5315d..4311fbd8d2c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
@@ -18,9 +18,11 @@
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.model.TopicSerdeSuggestionDTO;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.permission.AuditAction;
 import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
 import com.provectus.kafka.ui.service.DeserializationService;
 import com.provectus.kafka.ui.service.MessagesService;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
 import java.util.Map;
@@ -46,25 +48,26 @@ public class MessagesController extends AbstractController implements MessagesAp
   private final MessagesService messagesService;
   private final DeserializationService deserializationService;
   private final AccessControlService accessControlService;
+  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<Void>> deleteTopicMessages(
       String clusterName, String topicName, @Valid List<Integer> partitions,
       ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(MESSAGES_DELETE)
-        .build());
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).<ResponseEntity<Void>>then(
         messagesService.deleteTopicMessages(
             getCluster(clusterName),
             topicName,
             Optional.ofNullable(partitions).orElse(List.of())
         ).thenReturn(ResponseEntity.ok().build())
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -79,11 +82,15 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String
                                                                            String keySerde,
                                                                            String valueSerde,
                                                                            ServerWebExchange exchange) {
-    final Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var contextBuilder = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(MESSAGES_READ)
-        .build());
+        .operationName("getTopicMessages");
+
+    if (auditService.isAuditTopic(getCluster(clusterName), topicName)) {
+      contextBuilder.auditActions(AuditAction.VIEW);
+    }
 
     seekType = seekType != null ? seekType : SeekTypeDTO.BEGINNING;
     seekDirection = seekDirection != null ? seekDirection : SeekDirectionDTO.FORWARD;
@@ -102,7 +109,10 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String
         )
     );
 
-    return validateAccess.then(job);
+    var context = contextBuilder.build();
+    return accessControlService.validateAccess(context)
+        .then(job)
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -110,17 +120,18 @@ public Mono<ResponseEntity<Void>> sendTopicMessages(
       String clusterName, String topicName, @Valid Mono<CreateTopicMessageDTO> createTopicMessage,
       ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(MESSAGES_PRODUCE)
-        .build());
+        .operationName("sendTopicMessages")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         createTopicMessage.flatMap(msg ->
             messagesService.sendMessage(getCluster(clusterName), topicName, msg).then()
         ).map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   /**
@@ -156,12 +167,12 @@ public Mono<ResponseEntity<TopicSerdeSuggestionDTO>> getSerdes(String clusterNam
                                                                  String topicName,
                                                                  SerdeUsageDTO use,
                                                                  ServerWebExchange exchange) {
-
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(TopicAction.VIEW)
-        .build());
+        .operationName("getSerdes")
+        .build();
 
     TopicSerdeSuggestionDTO dto = new TopicSerdeSuggestionDTO()
         .key(use == SerdeUsageDTO.SERIALIZE
@@ -171,7 +182,7 @@ public Mono<ResponseEntity<TopicSerdeSuggestionDTO>> getSerdes(String clusterNam
             ? deserializationService.getSerdesForSerialize(getCluster(clusterName), topicName, VALUE)
             : deserializationService.getSerdesForDeserialize(getCluster(clusterName), topicName, VALUE));
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         Mono.just(dto)
             .subscribeOn(Schedulers.boundedElastic())
             .map(ResponseEntity::ok)
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
index f32be1c97e8..1c6a07abc20 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
@@ -13,8 +13,10 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.SchemaAction;
 import com.provectus.kafka.ui.service.SchemaRegistryService;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -37,6 +39,7 @@ public class SchemasController extends AbstractController implements SchemasApi
 
   private final SchemaRegistryService schemaRegistryService;
   private final AccessControlService accessControlService;
+  private final AuditService auditService;
 
   @Override
   protected KafkaCluster getCluster(String clusterName) {
@@ -51,13 +54,14 @@ protected KafkaCluster getCluster(String clusterName) {
   public Mono<ResponseEntity<CompatibilityCheckResponseDTO>> checkSchemaCompatibility(
       String clusterName, String subject, @Valid Mono<NewSchemaSubjectDTO> newSchemaSubjectMono,
       ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schema(subject)
         .schemaActions(SchemaAction.VIEW)
-        .build());
+        .operationName("checkSchemaCompatibility")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         newSchemaSubjectMono.flatMap(subjectDTO ->
                 schemaRegistryService.checksSchemaCompatibility(
                     getCluster(clusterName),
@@ -66,19 +70,20 @@ public Mono<ResponseEntity<CompatibilityCheckResponseDTO>> checkSchemaCompatibil
                 ))
             .map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<SchemaSubjectDTO>> createNewSchema(
       String clusterName, @Valid Mono<NewSchemaSubjectDTO> newSchemaSubjectMono,
       ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schemaActions(SchemaAction.CREATE)
-        .build());
+        .operationName("createNewSchema")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         newSchemaSubjectMono.flatMap(newSubject ->
                 schemaRegistryService.registerNewSchema(
                     getCluster(clusterName),
@@ -87,20 +92,22 @@ public Mono<ResponseEntity<SchemaSubjectDTO>> createNewSchema(
                 )
             ).map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Void>> deleteLatestSchema(
       String clusterName, String subject, ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schema(subject)
         .schemaActions(SchemaAction.DELETE)
-        .build());
+        .operationName("deleteLatestSchema")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         schemaRegistryService.deleteLatestSchemaSubject(getCluster(clusterName), subject)
+            .doOnEach(sig -> auditService.audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -108,14 +115,16 @@ public Mono<ResponseEntity<Void>> deleteLatestSchema(
   @Override
   public Mono<ResponseEntity<Void>> deleteSchema(
       String clusterName, String subject, ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schema(subject)
         .schemaActions(SchemaAction.DELETE)
-        .build());
+        .operationName("deleteSchema")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         schemaRegistryService.deleteSchemaSubjectEntirely(getCluster(clusterName), subject)
+            .doOnEach(sig -> auditService.audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -123,14 +132,16 @@ public Mono<ResponseEntity<Void>> deleteSchema(
   @Override
   public Mono<ResponseEntity<Void>> deleteSchemaByVersion(
       String clusterName, String subjectName, Integer version, ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schema(subjectName)
         .schemaActions(SchemaAction.DELETE)
-        .build());
+        .operationName("deleteSchemaByVersion")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         schemaRegistryService.deleteSchemaSubjectByVersion(getCluster(clusterName), subjectName, version)
+            .doOnEach(sig -> auditService.audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -138,16 +149,20 @@ public Mono<ResponseEntity<Void>> deleteSchemaByVersion(
   @Override
   public Mono<ResponseEntity<Flux<SchemaSubjectDTO>>> getAllVersionsBySubject(
       String clusterName, String subjectName, ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schema(subjectName)
         .schemaActions(SchemaAction.VIEW)
-        .build());
+        .operationName("getAllVersionsBySubject")
+        .build();
 
     Flux<SchemaSubjectDTO> schemas =
         schemaRegistryService.getAllVersionsBySubject(getCluster(clusterName), subjectName)
             .map(kafkaSrMapper::toDto);
-    return validateAccess.thenReturn(ResponseEntity.ok(schemas));
+
+    return accessControlService.validateAccess(context)
+        .thenReturn(ResponseEntity.ok(schemas))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -163,34 +178,37 @@ public Mono<ResponseEntity<CompatibilityLevelDTO>> getGlobalSchemaCompatibilityL
   public Mono<ResponseEntity<SchemaSubjectDTO>> getLatestSchema(String clusterName,
                                                                 String subject,
                                                                 ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schema(subject)
         .schemaActions(SchemaAction.VIEW)
-        .build());
+        .operationName("getLatestSchema")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         schemaRegistryService.getLatestSchemaVersionBySubject(getCluster(clusterName), subject)
             .map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<SchemaSubjectDTO>> getSchemaByVersion(
       String clusterName, String subject, Integer version, ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schema(subject)
         .schemaActions(SchemaAction.VIEW)
-        .build());
+        .operationName("getSchemaByVersion")
+        .operationParams(Map.of("subject", subject, "version", version))
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         schemaRegistryService.getSchemaSubjectByVersion(
                 getCluster(clusterName), subject, version)
             .map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -199,6 +217,11 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
                                                                     @Valid Integer perPage,
                                                                     @Valid String search,
                                                                     ServerWebExchange serverWebExchange) {
+    var context = AccessContext.builder()
+        .cluster(clusterName)
+        .operationName("getSchemas")
+        .build();
+
     return schemaRegistryService
         .getAllSubjectNames(getCluster(clusterName))
         .flatMapIterable(l -> l)
@@ -220,25 +243,28 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
           return schemaRegistryService.getAllLatestVersionSchemas(getCluster(clusterName), subjectsToRender)
               .map(subjs -> subjs.stream().map(kafkaSrMapper::toDto).toList())
               .map(subjs -> new SchemaSubjectsResponseDTO().pageCount(totalPages).schemas(subjs));
-        }).map(ResponseEntity::ok);
+        }).map(ResponseEntity::ok)
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Void>> updateGlobalSchemaCompatibilityLevel(
       String clusterName, @Valid Mono<CompatibilityLevelDTO> compatibilityLevelMono,
       ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schemaActions(SchemaAction.MODIFY_GLOBAL_COMPATIBILITY)
-        .build());
+        .operationName("updateGlobalSchemaCompatibilityLevel")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         compatibilityLevelMono
             .flatMap(compatibilityLevelDTO ->
                 schemaRegistryService.updateGlobalSchemaCompatibility(
                     getCluster(clusterName),
                     kafkaSrMapper.fromDto(compatibilityLevelDTO.getCompatibility())
                 ))
+            .doOnEach(sig -> auditService.audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -247,12 +273,14 @@ public Mono<ResponseEntity<Void>> updateGlobalSchemaCompatibilityLevel(
   public Mono<ResponseEntity<Void>> updateSchemaCompatibilityLevel(
       String clusterName, String subject, @Valid Mono<CompatibilityLevelDTO> compatibilityLevelMono,
       ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .schemaActions(SchemaAction.EDIT)
-        .build());
+        .operationName("updateSchemaCompatibilityLevel")
+        .operationParams(Map.of("subject", subject))
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         compatibilityLevelMono
             .flatMap(compatibilityLevelDTO ->
                 schemaRegistryService.updateSchemaCompatibility(
@@ -260,6 +288,7 @@ public Mono<ResponseEntity<Void>> updateSchemaCompatibilityLevel(
                     subject,
                     kafkaSrMapper.fromDto(compatibilityLevelDTO.getCompatibility())
                 ))
+            .doOnEach(sig -> auditService.audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
index 818fab84d68..04960cda69d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
@@ -27,9 +27,11 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.TopicsService;
 import com.provectus.kafka.ui.service.analyze.TopicAnalysisService;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -52,69 +54,78 @@ public class TopicsController extends AbstractController implements TopicsApi {
   private final TopicAnalysisService topicAnalysisService;
   private final ClusterMapper clusterMapper;
   private final AccessControlService accessControlService;
+  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<TopicDTO>> createTopic(
-      String clusterName, @Valid Mono<TopicCreationDTO> topicCreation, ServerWebExchange exchange) {
-
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
-        .cluster(clusterName)
-        .topicActions(CREATE)
-        .build());
-
-    return validateAccess.then(
-        topicsService.createTopic(getCluster(clusterName), topicCreation)
-            .map(clusterMapper::toTopic)
-            .map(s -> new ResponseEntity<>(s, HttpStatus.OK))
-            .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()))
-    );
+      String clusterName, @Valid Mono<TopicCreationDTO> topicCreationMono, ServerWebExchange exchange) {
+    return topicCreationMono.flatMap(topicCreation -> {
+      var context = AccessContext.builder()
+          .cluster(clusterName)
+          .topicActions(CREATE)
+          .operationName("createTopic")
+          .operationParams(topicCreation)
+          .build();
+
+      return accessControlService.validateAccess(context)
+          .then(topicsService.createTopic(getCluster(clusterName), topicCreation))
+          .map(clusterMapper::toTopic)
+          .map(s -> new ResponseEntity<>(s, HttpStatus.OK))
+          .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()))
+          .doOnEach(sig -> auditService.audit(context, sig));
+    });
   }
 
   @Override
   public Mono<ResponseEntity<TopicDTO>> recreateTopic(String clusterName,
                                                       String topicName, ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(VIEW, CREATE, DELETE)
-        .build());
+        .operationName("recreateTopic")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         topicsService.recreateTopic(getCluster(clusterName), topicName)
             .map(clusterMapper::toTopic)
             .map(s -> new ResponseEntity<>(s, HttpStatus.CREATED))
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<TopicDTO>> cloneTopic(
       String clusterName, String topicName, String newTopicName, ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(VIEW, CREATE)
-        .build());
+        .operationName("cloneTopic")
+        .operationParams(Map.of("newTopicName", newTopicName))
+        .build();
 
-    return validateAccess.then(topicsService.cloneTopic(getCluster(clusterName), topicName, newTopicName)
-        .map(clusterMapper::toTopic)
-        .map(s -> new ResponseEntity<>(s, HttpStatus.CREATED))
-    );
+    return accessControlService.validateAccess(context)
+        .then(topicsService.cloneTopic(getCluster(clusterName), topicName, newTopicName)
+            .map(clusterMapper::toTopic)
+            .map(s -> new ResponseEntity<>(s, HttpStatus.CREATED))
+        ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Void>> deleteTopic(
       String clusterName, String topicName, ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(DELETE)
-        .build());
+        .operationName("deleteTopic")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         topicsService.deleteTopic(getCluster(clusterName), topicName).map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
 
@@ -122,13 +133,14 @@ public Mono<ResponseEntity<Void>> deleteTopic(
   public Mono<ResponseEntity<Flux<TopicConfigDTO>>> getTopicConfigs(
       String clusterName, String topicName, ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(VIEW)
-        .build());
+        .operationName("getTopicConfigs")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         topicsService.getTopicConfigs(getCluster(clusterName), topicName)
             .map(lst -> lst.stream()
                 .map(InternalTopicConfig::from)
@@ -136,24 +148,25 @@ public Mono<ResponseEntity<Flux<TopicConfigDTO>>> getTopicConfigs(
                 .collect(toList()))
             .map(Flux::fromIterable)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<TopicDetailsDTO>> getTopicDetails(
       String clusterName, String topicName, ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(VIEW)
-        .build());
+        .operationName("getTopicDetails")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         topicsService.getTopicDetails(getCluster(clusterName), topicName)
             .map(clusterMapper::toTopicDetails)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -166,6 +179,11 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName,
                                                            @Valid SortOrderDTO sortOrder,
                                                            ServerWebExchange exchange) {
 
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .operationName("getTopics")
+        .build();
+
     return topicsService.getTopicsForPagination(getCluster(clusterName))
         .flatMap(topics -> accessControlService.filterViewableTopics(topics, clusterName))
         .flatMap(topics -> {
@@ -189,14 +207,13 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName,
               .collect(toList());
 
           return topicsService.loadTopics(getCluster(clusterName), topicsPage)
-              .flatMapMany(Flux::fromIterable)
-              .collectList()
               .map(topicsToRender ->
                   new TopicsResponseDTO()
                       .topics(topicsToRender.stream().map(clusterMapper::toTopic).collect(toList()))
                       .pageCount(totalPages));
         })
-        .map(ResponseEntity::ok);
+        .map(ResponseEntity::ok)
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -204,18 +221,19 @@ public Mono<ResponseEntity<TopicDTO>> updateTopic(
       String clusterName, String topicName, @Valid Mono<TopicUpdateDTO> topicUpdate,
       ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(VIEW, EDIT)
-        .build());
+        .operationName("updateTopic")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         topicsService
             .updateTopic(getCluster(clusterName), topicName, topicUpdate)
             .map(clusterMapper::toTopic)
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -224,17 +242,17 @@ public Mono<ResponseEntity<PartitionsIncreaseResponseDTO>> increaseTopicPartitio
       Mono<PartitionsIncreaseDTO> partitionsIncrease,
       ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(VIEW, EDIT)
-        .build());
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         partitionsIncrease.flatMap(partitions ->
             topicsService.increaseTopicPartitions(getCluster(clusterName), topicName, partitions)
         ).map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
@@ -243,31 +261,34 @@ public Mono<ResponseEntity<ReplicationFactorChangeResponseDTO>> changeReplicatio
       Mono<ReplicationFactorChangeDTO> replicationFactorChange,
       ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(VIEW, EDIT)
-        .build());
+        .operationName("changeReplicationFactor")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         replicationFactorChange
             .flatMap(rfc ->
                 topicsService.changeReplicationFactor(getCluster(clusterName), topicName, rfc))
             .map(ResponseEntity::ok)
-    );
+    ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
   @Override
   public Mono<ResponseEntity<Void>> analyzeTopic(String clusterName, String topicName, ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(MESSAGES_READ)
-        .build());
+        .operationName("analyzeTopic")
+        .build();
 
-    return validateAccess.then(
+    return accessControlService.validateAccess(context).then(
         topicAnalysisService.analyze(getCluster(clusterName), topicName)
+            .doOnEach(sig -> auditService.audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -275,15 +296,17 @@ public Mono<ResponseEntity<Void>> analyzeTopic(String clusterName, String topicN
   @Override
   public Mono<ResponseEntity<Void>> cancelTopicAnalysis(String clusterName, String topicName,
                                                         ServerWebExchange exchange) {
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(MESSAGES_READ)
-        .build());
-
-    topicAnalysisService.cancelAnalysis(getCluster(clusterName), topicName);
+        .operationName("cancelTopicAnalysis")
+        .build();
 
-    return validateAccess.thenReturn(ResponseEntity.ok().build());
+    return accessControlService.validateAccess(context)
+        .then(Mono.fromRunnable(() -> topicAnalysisService.cancelAnalysis(getCluster(clusterName), topicName)))
+        .doOnEach(sig -> auditService.audit(context, sig))
+        .thenReturn(ResponseEntity.ok().build());
   }
 
 
@@ -292,15 +315,18 @@ public Mono<ResponseEntity<TopicAnalysisDTO>> getTopicAnalysis(String clusterNam
                                                                  String topicName,
                                                                  ServerWebExchange exchange) {
 
-    Mono<Void> validateAccess = accessControlService.validateAccess(AccessContext.builder()
+    var context = AccessContext.builder()
         .cluster(clusterName)
         .topic(topicName)
         .topicActions(MESSAGES_READ)
-        .build());
+        .operationName("getTopicAnalysis")
+        .build();
 
-    return validateAccess.thenReturn(topicAnalysisService.getTopicAnalysis(getCluster(clusterName), topicName)
-        .map(ResponseEntity::ok)
-        .orElseGet(() -> ResponseEntity.notFound().build()));
+    return accessControlService.validateAccess(context)
+        .thenReturn(topicAnalysisService.getTopicAnalysis(getCluster(clusterName), topicName)
+            .map(ResponseEntity::ok)
+            .orElseGet(() -> ResponseEntity.notFound().build()))
+        .doOnEach(sig -> auditService.audit(context, sig));
   }
 
   private Comparator<InternalTopic> getComparatorForTopic(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
index 45858093a7f..cf126bf3dfe 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.model.rbac.permission.AclAction;
 import com.provectus.kafka.ui.model.rbac.permission.ApplicationConfigAction;
+import com.provectus.kafka.ui.model.rbac.permission.AuditAction;
 import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction;
@@ -11,6 +12,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import lombok.Value;
 import org.springframework.util.Assert;
 
@@ -40,6 +42,11 @@ public class AccessContext {
 
   Collection<AclAction> aclActions;
 
+  Collection<AuditAction> auditAction;
+
+  String operationName;
+  Object operationParams;
+
   public static AccessContextBuilder builder() {
     return new AccessContextBuilder();
   }
@@ -59,6 +66,10 @@ public static final class AccessContextBuilder {
     private Collection<SchemaAction> schemaActions = Collections.emptySet();
     private Collection<KsqlAction> ksqlActions = Collections.emptySet();
     private Collection<AclAction> aclActions = Collections.emptySet();
+    private Collection<AuditAction> auditActions = Collections.emptySet();
+
+    private String operationName;
+    private Object operationParams;
 
     private AccessContextBuilder() {
     }
@@ -141,6 +152,27 @@ public AccessContextBuilder aclActions(AclAction... actions) {
       return this;
     }
 
+    public AccessContextBuilder auditActions(AuditAction... actions) {
+      Assert.isTrue(actions.length > 0, "actions not present");
+      this.auditActions = List.of(actions);
+      return this;
+    }
+
+    public AccessContextBuilder operationName(String operationName) {
+      this.operationName = operationName;
+      return this;
+    }
+
+    public AccessContextBuilder operationParams(Object operationParams) {
+      this.operationParams = operationParams;
+      return this;
+    }
+
+    public AccessContextBuilder operationParams(Map<String, Object> paramsMap) {
+      this.operationParams = paramsMap;
+      return this;
+    }
+
     public AccessContext build() {
       return new AccessContext(
           applicationConfigActions,
@@ -150,7 +182,8 @@ public AccessContext build() {
           connect, connectActions,
           connector,
           schema, schemaActions,
-          ksqlActions, aclActions);
+          ksqlActions, aclActions, auditActions,
+          operationName, operationParams);
     }
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
index d3192789ed0..dd456400da5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
@@ -2,11 +2,13 @@
 
 import static com.provectus.kafka.ui.model.rbac.Resource.ACL;
 import static com.provectus.kafka.ui.model.rbac.Resource.APPLICATIONCONFIG;
+import static com.provectus.kafka.ui.model.rbac.Resource.AUDIT;
 import static com.provectus.kafka.ui.model.rbac.Resource.CLUSTERCONFIG;
 import static com.provectus.kafka.ui.model.rbac.Resource.KSQL;
 
 import com.provectus.kafka.ui.model.rbac.permission.AclAction;
 import com.provectus.kafka.ui.model.rbac.permission.ApplicationConfigAction;
+import com.provectus.kafka.ui.model.rbac.permission.AuditAction;
 import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
 import com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction;
@@ -28,7 +30,8 @@
 @EqualsAndHashCode
 public class Permission {
 
-  private static final List<Resource> RBAC_ACTION_EXEMPT_LIST = List.of(KSQL, CLUSTERCONFIG, APPLICATIONCONFIG, ACL);
+  private static final List<Resource> RBAC_ACTION_EXEMPT_LIST =
+      List.of(KSQL, CLUSTERCONFIG, APPLICATIONCONFIG, ACL, AUDIT);
 
   Resource resource;
   List<String> actions;
@@ -79,6 +82,7 @@ private List<String> getAllActionValues() {
       case CONNECT -> Arrays.stream(ConnectAction.values()).map(Enum::toString).toList();
       case KSQL -> Arrays.stream(KsqlAction.values()).map(Enum::toString).toList();
       case ACL -> Arrays.stream(AclAction.values()).map(Enum::toString).toList();
+      case AUDIT -> Arrays.stream(AuditAction.values()).map(Enum::toString).toList();
     };
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
index f71dfb29792..ca2efab3a9a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Resource.java
@@ -12,7 +12,8 @@ public enum Resource {
   SCHEMA,
   CONNECT,
   KSQL,
-  ACL;
+  ACL,
+  AUDIT;
 
   @Nullable
   public static Resource fromString(String name) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AuditAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AuditAction.java
new file mode 100644
index 00000000000..db4db7d5e73
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AuditAction.java
@@ -0,0 +1,14 @@
+package com.provectus.kafka.ui.model.rbac.permission;
+
+import org.apache.commons.lang3.EnumUtils;
+import org.jetbrains.annotations.Nullable;
+
+public enum AuditAction implements PermissibleAction {
+
+  VIEW;
+
+  @Nullable
+  public static AuditAction fromString(String name) {
+    return EnumUtils.getEnum(AuditAction.class, name);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java
index 3a99eb10e6f..5de78a15178 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java
@@ -1,4 +1,8 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
-public interface PermissibleAction {
+public sealed interface PermissibleAction permits
+    AclAction, ApplicationConfigAction,
+    ConsumerGroupAction, SchemaAction,
+    ConnectAction, ClusterConfigAction,
+    KsqlAction, TopicAction, AuditAction {
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
index 8a2ac1a63e9..ff86d2be0f7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/BrokerService.java
@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.ConfigEntry;
@@ -117,7 +118,7 @@ private Mono<Map<Integer, Map<String, DescribeLogDirsResponse.LogDirInfo>>> getC
               .stream()
               .map(Node::id)
               .collect(Collectors.toList());
-          if (reqBrokers != null && !reqBrokers.isEmpty()) {
+          if (!reqBrokers.isEmpty()) {
             brokers.retainAll(reqBrokers);
           }
           return admin.describeLogDirs(brokers);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index f6ad42c1107..625784f8ee8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -127,13 +127,7 @@ private Mono<RecordMetadata> sendMessageImpl(KafkaCluster cluster,
             msg.getValueSerde().get()
         );
 
-    Properties properties = new Properties();
-    SslPropertiesUtil.addKafkaSslProperties(cluster.getOriginalProperties().getSsl(), properties);
-    properties.putAll(cluster.getProperties());
-    properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
-    properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
-    properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
-    try (KafkaProducer<byte[], byte[]> producer = new KafkaProducer<>(properties)) {
+    try (KafkaProducer<byte[], byte[]> producer = createProducer(cluster, Map.of())) {
       ProducerRecord<byte[], byte[]> producerRecord = producerRecordCreator.create(
           topicDescription.name(),
           msg.getPartition(),
@@ -155,6 +149,18 @@ private Mono<RecordMetadata> sendMessageImpl(KafkaCluster cluster,
     }
   }
 
+  public static KafkaProducer<byte[], byte[]> createProducer(KafkaCluster cluster,
+                                                             Map<String, Object> additionalProps) {
+    Properties properties = new Properties();
+    SslPropertiesUtil.addKafkaSslProperties(cluster.getOriginalProperties().getSsl(), properties);
+    properties.putAll(cluster.getProperties());
+    properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
+    properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
+    properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, ByteArraySerializer.class);
+    properties.putAll(additionalProps);
+    return new KafkaProducer<>(properties);
+  }
+
   public Flux<TopicMessageEventDTO> loadMessages(KafkaCluster cluster, String topic,
                                                  ConsumerPosition consumerPosition,
                                                  @Nullable String query,
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 797c30167bf..3ddcd6f82e0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -168,21 +168,18 @@ public Mono<List<ConfigEntry>> getTopicConfigs(KafkaCluster cluster, String topi
             .map(m -> m.values().stream().findFirst().orElse(List.of())));
   }
 
-  private Mono<InternalTopic> createTopic(KafkaCluster c, ReactiveAdminClient adminClient,
-                                          Mono<TopicCreationDTO> topicCreation) {
-    return topicCreation.flatMap(topicData ->
-            adminClient.createTopic(
-                topicData.getName(),
-                topicData.getPartitions(),
-                topicData.getReplicationFactor(),
-                topicData.getConfigs()
-            ).thenReturn(topicData)
-        )
+  private Mono<InternalTopic> createTopic(KafkaCluster c, ReactiveAdminClient adminClient, TopicCreationDTO topicData) {
+    return adminClient.createTopic(
+            topicData.getName(),
+            topicData.getPartitions(),
+            topicData.getReplicationFactor(),
+            topicData.getConfigs())
+        .thenReturn(topicData)
         .onErrorMap(t -> new TopicMetadataException(t.getMessage(), t))
-        .flatMap(topicData -> loadTopicAfterCreation(c, topicData.getName()));
+        .then(loadTopicAfterCreation(c, topicData.getName()));
   }
 
-  public Mono<InternalTopic> createTopic(KafkaCluster cluster, Mono<TopicCreationDTO> topicCreation) {
+  public Mono<InternalTopic> createTopic(KafkaCluster cluster, TopicCreationDTO topicCreation) {
     return adminClientService.get(cluster)
         .flatMap(ac -> createTopic(cluster, ac, topicCreation));
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditRecord.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditRecord.java
new file mode 100644
index 00000000000..7e9f7319809
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditRecord.java
@@ -0,0 +1,97 @@
+package com.provectus.kafka.ui.service.audit;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.provectus.kafka.ui.exception.CustomBaseException;
+import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.Resource;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+import lombok.SneakyThrows;
+import org.springframework.security.access.AccessDeniedException;
+
+record AuditRecord(String timestamp,
+                   String username,
+                   String clusterName,
+                   List<AuditResource> resources,
+                   String operation,
+                   Object operationParams,
+                   OperationResult result) {
+
+  static final JsonMapper MAPPER = new JsonMapper();
+
+  static {
+    MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+  }
+
+  @SneakyThrows
+  String toJson() {
+    return MAPPER.writeValueAsString(this);
+  }
+
+  record AuditResource(String accessType, Resource type, @Nullable Object id) {
+
+    static List<AuditResource> getAccessedResources(AccessContext ctx) {
+      List<AuditResource> resources = new ArrayList<>();
+      ctx.getClusterConfigActions()
+          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.CLUSTERCONFIG, null)));
+      ctx.getTopicActions()
+          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.TOPIC, nameId(ctx.getTopic()))));
+      ctx.getConsumerGroupActions()
+          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.CONSUMER, nameId(ctx.getConsumerGroup()))));
+      ctx.getConnectActions()
+          .forEach(a -> {
+            Map<String, String> resourceId = new LinkedHashMap<>();
+            resourceId.put("connect", ctx.getConnect());
+            if (ctx.getConnector() != null) {
+              resourceId.put("connector", ctx.getConnector());
+            }
+            resources.add(new AuditResource(a.name(), Resource.CONNECT, resourceId));
+          });
+      ctx.getSchemaActions()
+          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.SCHEMA, nameId(ctx.getSchema()))));
+      ctx.getKsqlActions()
+          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.KSQL, null)));
+      ctx.getAclActions()
+          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.ACL, null)));
+      ctx.getAuditAction()
+          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.AUDIT, null)));
+      return resources;
+    }
+
+    @Nullable
+    private static Map<String, Object> nameId(@Nullable String name) {
+      return name != null ? Map.of("name", name) : null;
+    }
+  }
+
+  record OperationResult(boolean success, OperationError error) {
+
+    static OperationResult successful() {
+      return new OperationResult(true, null);
+    }
+
+    static OperationResult error(Throwable th) {
+      OperationError err = OperationError.UNRECOGNIZED_ERROR;
+      if (th instanceof AccessDeniedException) {
+        err = OperationError.ACCESS_DENIED;
+      } else if (th instanceof ValidationException) {
+        err = OperationError.VALIDATION_ERROR;
+      } else if (th instanceof CustomBaseException) {
+        err = OperationError.EXECUTION_ERROR;
+      }
+      return new OperationResult(false, err);
+    }
+
+    enum OperationError {
+      ACCESS_DENIED,
+      VALIDATION_ERROR,
+      EXECUTION_ERROR,
+      UNRECOGNIZED_ERROR
+    }
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
new file mode 100644
index 00000000000..8d573078915
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
@@ -0,0 +1,209 @@
+package com.provectus.kafka.ui.service.audit;
+
+import static com.provectus.kafka.ui.service.MessagesService.createProducer;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.config.auth.AuthenticatedUser;
+import com.provectus.kafka.ui.config.auth.RbacUser;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.service.AdminClientService;
+import com.provectus.kafka.ui.service.ClustersStorage;
+import com.provectus.kafka.ui.service.ReactiveAdminClient;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+import reactor.core.publisher.Signal;
+
+
+@Slf4j
+@Service
+public class AuditService implements Closeable {
+
+  private static final Mono<AuthenticatedUser> NO_AUTH_USER = Mono.just(new AuthenticatedUser("Unknown", Set.of()));
+
+  private static final String DEFAULT_AUDIT_TOPIC_NAME = "__kui-audit-log";
+  private static final int DEFAULT_AUDIT_TOPIC_PARTITIONS = 1;
+  private static final Map<String, String> DEFAULT_AUDIT_TOPIC_CONFIG = Map.of(
+      "retention.ms", String.valueOf(TimeUnit.DAYS.toMillis(7)),
+      "cleanup.policy", "delete"
+  );
+  private static final Map<String, Object> AUDIT_PRODUCER_CONFIG = Map.of(
+      ProducerConfig.COMPRESSION_TYPE_CONFIG, "gzip"
+  );
+
+  private static final Logger AUDIT_LOGGER = LoggerFactory.getLogger("audit");
+
+  private final Map<String, AuditWriter> auditWriters;
+
+  @Autowired
+  public AuditService(AdminClientService adminClientService, ClustersStorage clustersStorage) {
+    Map<String, AuditWriter> auditWriters = new HashMap<>();
+    for (var cluster : clustersStorage.getKafkaClusters()) {
+      ReactiveAdminClient adminClient;
+      try {
+        adminClient = adminClientService.get(cluster).block();
+      } catch (Exception e) {
+        printAuditInitError(cluster, "Error connect to cluster", e);
+        continue;
+      }
+      createAuditWriter(cluster, adminClient, () -> createProducer(cluster, AUDIT_PRODUCER_CONFIG))
+          .ifPresent(writer -> auditWriters.put(cluster.getName(), writer));
+    }
+    this.auditWriters = auditWriters;
+  }
+
+  @VisibleForTesting
+  AuditService(Map<String, AuditWriter> auditWriters) {
+    this.auditWriters = auditWriters;
+  }
+
+  @VisibleForTesting
+  static Optional<AuditWriter> createAuditWriter(KafkaCluster cluster,
+                                                 ReactiveAdminClient ac,
+                                                 Supplier<KafkaProducer<byte[], byte[]>> producerFactory) {
+    var auditProps = cluster.getOriginalProperties().getAudit();
+    if (auditProps == null) {
+      return Optional.empty();
+    }
+    boolean topicAudit = Optional.ofNullable(auditProps.getTopicAuditEnabled()).orElse(false);
+    boolean consoleAudit = Optional.ofNullable(auditProps.getConsoleAuditEnabled()).orElse(false);
+    if (!topicAudit && !consoleAudit) {
+      return Optional.empty();
+    }
+    String auditTopicName = Optional.ofNullable(auditProps.getTopic()).orElse(DEFAULT_AUDIT_TOPIC_NAME);
+    @Nullable KafkaProducer<byte[], byte[]> producer = null;
+    if (topicAudit && createTopicIfNeeded(cluster, ac, auditTopicName, auditProps)) {
+      producer = producerFactory.get();
+    }
+    log.info("Audit service initialized for cluster '{}'", cluster.getName());
+    return Optional.of(
+        new AuditWriter(
+            cluster.getName(),
+            auditTopicName,
+            producer,
+            consoleAudit ? AUDIT_LOGGER : null
+        )
+    );
+  }
+
+  /**
+   * return true if topic created/existing and producing can be enabled.
+   */
+  private static boolean createTopicIfNeeded(KafkaCluster cluster,
+                                             ReactiveAdminClient ac,
+                                             String auditTopicName,
+                                             ClustersProperties.AuditProperties auditProps) {
+    boolean topicExists;
+    try {
+      topicExists = ac.listTopics(true).block().contains(auditTopicName);
+    } catch (Exception e) {
+      printAuditInitError(cluster, "Error checking audit topic existence", e);
+      return false;
+    }
+    if (topicExists) {
+      return true;
+    }
+    try {
+      int topicPartitions =
+          Optional.ofNullable(auditProps.getAuditTopicsPartitions())
+              .orElse(DEFAULT_AUDIT_TOPIC_PARTITIONS);
+
+      Map<String, String> topicConfig = new HashMap<>(DEFAULT_AUDIT_TOPIC_CONFIG);
+      Optional.ofNullable(auditProps.getAuditTopicProperties())
+          .ifPresent(topicConfig::putAll);
+
+      log.info("Creating audit topic '{}' for cluster '{}'", auditTopicName, cluster.getName());
+      ac.createTopic(auditTopicName, topicPartitions, null, topicConfig).block();
+      log.info("Audit topic created for cluster '{}'", cluster.getName());
+      return true;
+    } catch (Exception e) {
+      printAuditInitError(cluster, "Error creating topic '%s'".formatted(auditTopicName), e);
+      return false;
+    }
+  }
+
+  private static void printAuditInitError(KafkaCluster cluster, String errorMsg, Exception cause) {
+    log.error("-----------------------------------------------------------------");
+    log.error(
+        "Error initializing Audit Service for cluster '{}'. Audit will be disabled. See error below: ",
+        cluster.getName()
+    );
+    log.error("{}", errorMsg, cause);
+    log.error("-----------------------------------------------------------------");
+  }
+
+  public boolean isAuditTopic(KafkaCluster cluster, String topic) {
+    var writer = auditWriters.get(cluster.getName());
+    return writer != null
+        && topic.equals(writer.targetTopic())
+        && writer.isTopicWritingEnabled();
+  }
+
+  public void audit(AccessContext acxt, Signal<?> sig) {
+    if (sig.isOnComplete()) {
+      extractUser(sig)
+          .doOnNext(u -> sendAuditRecord(acxt, u))
+          .subscribe();
+    } else if (sig.isOnError()) {
+      extractUser(sig)
+          .doOnNext(u -> sendAuditRecord(acxt, u, sig.getThrowable()))
+          .subscribe();
+    }
+  }
+
+  private Mono<AuthenticatedUser> extractUser(Signal<?> sig) {
+    //see ReactiveSecurityContextHolder for impl details
+    Object key = SecurityContext.class;
+    if (sig.getContextView().hasKey(key)) {
+      return sig.getContextView().<Mono<SecurityContext>>get(key)
+          .map(context -> context.getAuthentication().getPrincipal())
+          .cast(RbacUser.class)
+          .map(user -> new AuthenticatedUser(user.name(), user.groups()))
+          .switchIfEmpty(NO_AUTH_USER);
+    } else {
+      return NO_AUTH_USER;
+    }
+  }
+
+  private void sendAuditRecord(AccessContext ctx, AuthenticatedUser user) {
+    sendAuditRecord(ctx, user, null);
+  }
+
+  private void sendAuditRecord(AccessContext ctx, AuthenticatedUser user, @Nullable Throwable th) {
+    try {
+      if (ctx.getCluster() != null) {
+        var writer = auditWriters.get(ctx.getCluster());
+        if (writer != null) {
+          writer.write(ctx, user, th);
+        }
+      } else {
+        // cluster-independent operation
+        AuditWriter.writeAppOperation(AUDIT_LOGGER, ctx, user, th);
+      }
+    } catch (Exception e) {
+      log.warn("Error sending audit record", e);
+    }
+  }
+
+  @Override
+  public void close() throws IOException {
+    auditWriters.values().forEach(AuditWriter::close);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java
new file mode 100644
index 00000000000..c66bd8a1f5f
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java
@@ -0,0 +1,78 @@
+package com.provectus.kafka.ui.service.audit;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.provectus.kafka.ui.config.auth.AuthenticatedUser;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.service.audit.AuditRecord.AuditResource;
+import com.provectus.kafka.ui.service.audit.AuditRecord.OperationResult;
+import java.io.Closeable;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.slf4j.Logger;
+
+@Slf4j
+record AuditWriter(String clusterName,
+                   String targetTopic,
+                   @Nullable KafkaProducer<byte[], byte[]> producer,
+                   @Nullable Logger consoleLogger) implements Closeable {
+
+  boolean isTopicWritingEnabled() {
+    return producer != null;
+  }
+
+  // application-level (cluster-independent) operation
+  static void writeAppOperation(Logger consoleLogger,
+                                AccessContext ctx,
+                                AuthenticatedUser user,
+                                @Nullable Throwable th) {
+    consoleLogger.info(createRecord(ctx, user, th).toJson());
+  }
+
+  void write(AccessContext ctx, AuthenticatedUser user, @Nullable Throwable th) {
+    write(createRecord(ctx, user, th));
+  }
+
+  private void write(AuditRecord rec) {
+    String json = rec.toJson();
+    if (consoleLogger != null) {
+      consoleLogger.info(json);
+    }
+    if (producer != null) {
+      producer.send(
+          new ProducerRecord<>(targetTopic, null, json.getBytes(UTF_8)),
+          (metadata, ex) -> {
+            if (ex != null) {
+              log.warn("Error sending Audit record to kafka for cluster {}", clusterName, ex);
+            }
+          });
+    }
+  }
+
+  private static AuditRecord createRecord(AccessContext ctx,
+                                          AuthenticatedUser user,
+                                          @Nullable Throwable th) {
+    return new AuditRecord(
+        DateTimeFormatter.ISO_INSTANT.format(Instant.now()),
+        user.principal(),
+        ctx.getCluster(), //can be null, if it is application-level action
+        AuditResource.getAccessedResources(ctx),
+        ctx.getOperationName(),
+        ctx.getOperationParams(),
+        th == null ? OperationResult.successful() : OperationResult.error(th)
+    );
+  }
+
+  @Override
+  public void close() {
+    Optional.ofNullable(producer).ifPresent(KafkaProducer::close);
+  }
+
+}
+
+
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index debd9acd829..6cc455624bc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -109,7 +109,8 @@ && isConnectAccessible(context, user)
                   && isConnectorAccessible(context, user) // TODO connector selectors
                   && isSchemaAccessible(context, user)
                   && isKsqlAccessible(context, user)
-                  && isAclAccessible(context, user);
+                  && isAclAccessible(context, user)
+                  && isAuditAccessible(context, user);
 
           if (!accessGranted) {
             throw new AccessDeniedException("Access denied");
@@ -386,6 +387,23 @@ private boolean isAclAccessible(AccessContext context, AuthenticatedUser user) {
     return isAccessible(Resource.ACL, null, user, context, requiredActions);
   }
 
+  private boolean isAuditAccessible(AccessContext context, AuthenticatedUser user) {
+    if (!rbacEnabled) {
+      return true;
+    }
+
+    if (context.getAuditAction().isEmpty()) {
+      return true;
+    }
+
+    Set<String> requiredActions = context.getAuditAction()
+        .stream()
+        .map(a -> a.toString().toUpperCase())
+        .collect(Collectors.toSet());
+
+    return isAccessible(Resource.AUDIT, null, user, context, requiredActions);
+  }
+
   public Set<ProviderAuthorityExtractor> getOauthExtractors() {
     return oauthExtractors;
   }
diff --git a/kafka-ui-api/src/main/resources/application-local.yml b/kafka-ui-api/src/main/resources/application-local.yml
index 2317fc23f9a..7848f1fdc49 100644
--- a/kafka-ui-api/src/main/resources/application-local.yml
+++ b/kafka-ui-api/src/main/resources/application-local.yml
@@ -144,3 +144,6 @@ rbac:
 
         - resource: acl
           actions: all
+
+        - resource: audit
+          actions: all
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
index 1938f93044c..1651f4951df 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
@@ -74,6 +74,8 @@ public void initialize(@NotNull ConfigurableApplicationContext context) {
       System.setProperty("kafka.clusters.0.masking.0.type", "REPLACE");
       System.setProperty("kafka.clusters.0.masking.0.replacement", "***");
       System.setProperty("kafka.clusters.0.masking.0.topicValuesPattern", "masking-test-.*");
+      System.setProperty("kafka.clusters.0.audit.topicAuditEnabled", "true");
+      System.setProperty("kafka.clusters.0.audit.consoleAuditEnabled", "true");
 
       System.setProperty("kafka.clusters.1.name", SECOND_LOCAL);
       System.setProperty("kafka.clusters.1.readOnly", "true");
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
index ed56abbb814..295eeccbb3c 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
@@ -9,6 +9,7 @@
 import com.provectus.kafka.ui.controller.SchemasController;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.SchemaSubjectDTO;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.sr.model.Compatibility;
 import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import com.provectus.kafka.ui.util.AccessControlServiceMock;
@@ -41,7 +42,8 @@ private void init(List<String> subjects) {
                 new SchemaRegistryService.SubjectWithCompatibilityLevel(
                     new SchemaSubject().subject(a.getArgument(1)), Compatibility.FULL)));
 
-    this.controller = new SchemasController(schemaRegistryService, new AccessControlServiceMock().getMock());
+    this.controller = new SchemasController(schemaRegistryService, new AccessControlServiceMock().getMock(),
+        mock(AuditService.class));
     this.controller.setClustersStorage(clustersStorage);
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
index ac00fd9982e..97f193022a5 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
@@ -18,6 +18,7 @@
 import com.provectus.kafka.ui.model.TopicColumnsToSortDTO;
 import com.provectus.kafka.ui.model.TopicDTO;
 import com.provectus.kafka.ui.service.analyze.TopicAnalysisService;
+import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import com.provectus.kafka.ui.util.AccessControlServiceMock;
 import java.util.ArrayList;
@@ -33,7 +34,6 @@
 import org.apache.kafka.clients.admin.TopicDescription;
 import org.apache.kafka.common.TopicPartitionInfo;
 import org.junit.jupiter.api.Test;
-import org.springframework.test.util.ReflectionTestUtils;
 import reactor.core.publisher.Mono;
 
 class TopicsServicePaginationTest {
@@ -46,7 +46,7 @@ class TopicsServicePaginationTest {
   private final AccessControlService accessControlService = new AccessControlServiceMock().getMock();
 
   private final TopicsController topicsController = new TopicsController(
-      topicsService, mock(TopicAnalysisService.class), clusterMapper, accessControlService);
+      topicsService, mock(TopicAnalysisService.class), clusterMapper, accessControlService, mock(AuditService.class));
 
   private void init(Map<String, InternalTopic> topicsInCache) {
 
@@ -59,7 +59,7 @@ private void init(Map<String, InternalTopic> topicsInCache) {
           List<String> lst = a.getArgument(1);
           return Mono.just(lst.stream().map(topicsInCache::get).collect(Collectors.toList()));
         });
-    ReflectionTestUtils.setField(topicsController, "clustersStorage", clustersStorage);
+    topicsController.setClustersStorage(clustersStorage);
   }
 
   @Test
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditIntegrationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditIntegrationTest.java
new file mode 100644
index 00000000000..8e17bca965f
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditIntegrationTest.java
@@ -0,0 +1,87 @@
+package com.provectus.kafka.ui.service.audit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.provectus.kafka.ui.AbstractIntegrationTest;
+import com.provectus.kafka.ui.model.TopicCreationDTO;
+import com.provectus.kafka.ui.model.rbac.Resource;
+import java.time.Duration;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.serialization.BytesDeserializer;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
+
+public class AuditIntegrationTest extends AbstractIntegrationTest {
+
+  @Autowired
+  private WebTestClient webTestClient;
+
+  @Test
+  void auditRecordWrittenIntoKafkaWhenNewTopicCreated() {
+    String newTopicName = "test_audit_" + UUID.randomUUID();
+
+    webTestClient.post()
+        .uri("/api/clusters/{clusterName}/topics", LOCAL)
+        .bodyValue(
+            new TopicCreationDTO()
+                .replicationFactor(1)
+                .partitions(1)
+                .name(newTopicName)
+        )
+        .exchange()
+        .expectStatus()
+        .isOk();
+
+    try (var consumer = createConsumer()) {
+      var jsonMapper = new JsonMapper();
+      consumer.subscribe(List.of("__kui-audit-log"));
+      Awaitility.await()
+          .pollInSameThread()
+          .atMost(Duration.ofSeconds(15))
+          .untilAsserted(() -> {
+            var polled = consumer.poll(Duration.ofSeconds(1));
+            assertThat(polled).anySatisfy(kafkaRecord -> {
+              try {
+                AuditRecord record = jsonMapper.readValue(kafkaRecord.value(), AuditRecord.class);
+                assertThat(record.operation()).isEqualTo("createTopic");
+                assertThat(record.resources()).map(AuditRecord.AuditResource::type).contains(Resource.TOPIC);
+                assertThat(record.result().success()).isTrue();
+                assertThat(record.timestamp()).isNotBlank();
+                assertThat(record.clusterName()).isEqualTo(LOCAL);
+                assertThat(record.operationParams())
+                    .isEqualTo(Map.of(
+                        "name", newTopicName,
+                        "partitions", 1,
+                        "replicationFactor", 1,
+                        "configs", Map.of()
+                    ));
+              } catch (JsonProcessingException e) {
+                Assertions.fail();
+              }
+            });
+          });
+    }
+  }
+
+  private KafkaConsumer<?, String> createConsumer() {
+    Properties props = new Properties();
+    props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServers());
+    props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class);
+    props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+    props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+    props.put(ConsumerConfig.GROUP_ID_CONFIG, AuditIntegrationTest.class.getName());
+    return new KafkaConsumer<>(props);
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java
new file mode 100644
index 00000000000..f123329ccf2
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java
@@ -0,0 +1,154 @@
+package com.provectus.kafka.ui.service.audit;
+
+import static com.provectus.kafka.ui.service.audit.AuditService.createAuditWriter;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyMap;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.service.ReactiveAdminClient;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+import reactor.core.publisher.Signal;
+
+class AuditServiceTest {
+
+  @Test
+  void isAuditTopicChecksIfAuditIsEnabledForCluster() {
+    Map<String, AuditWriter> writers = Map.of(
+        "c1", new AuditWriter("с1", "c1topic", null, null),
+        "c2", new AuditWriter("c2", "c2topic", mock(KafkaProducer.class), null)
+    );
+
+    var auditService = new AuditService(writers);
+    assertThat(auditService.isAuditTopic(KafkaCluster.builder().name("notExist").build(), "some"))
+        .isFalse();
+    assertThat(auditService.isAuditTopic(KafkaCluster.builder().name("c1").build(), "c1topic"))
+        .isFalse();
+    assertThat(auditService.isAuditTopic(KafkaCluster.builder().name("c2").build(), "c2topic"))
+        .isTrue();
+  }
+
+  @Test
+  void auditCallsWriterMethodDependingOnSignal() {
+    var auditWriter = mock(AuditWriter.class);
+    var auditService = new AuditService(Map.of("test", auditWriter));
+
+    var cxt = AccessContext.builder().cluster("test").build();
+
+    auditService.audit(cxt, Signal.complete());
+    verify(auditWriter).write(any(), any(), eq(null));
+
+    var th = new Exception("testError");
+    auditService.audit(cxt, Signal.error(th));
+    verify(auditWriter).write(any(), any(), eq(th));
+  }
+
+  @Nested
+  class CreateAuditWriter {
+
+    private final ReactiveAdminClient adminClientMock = mock(ReactiveAdminClient.class);
+    private final Supplier<KafkaProducer<byte[], byte[]>> producerSupplierMock = mock(Supplier.class);
+
+    private final ClustersProperties.Cluster clustersProperties = new ClustersProperties.Cluster();
+
+    private final KafkaCluster cluster = KafkaCluster
+        .builder()
+        .name("test")
+        .originalProperties(clustersProperties)
+        .build();
+
+
+    @BeforeEach
+    void init() {
+      when(producerSupplierMock.get())
+          .thenReturn(mock(KafkaProducer.class));
+    }
+
+    @Test
+    void noWriterIfNoAuditPropsSet() {
+      var maybeWriter = createAuditWriter(cluster, adminClientMock, producerSupplierMock);
+      assertThat(maybeWriter).isEmpty();
+    }
+
+    @Test
+    void setsLoggerIfConsoleLoggingEnabled() {
+      var auditProps = new ClustersProperties.AuditProperties();
+      auditProps.setConsoleAuditEnabled(true);
+      clustersProperties.setAudit(auditProps);
+
+      var maybeWriter = createAuditWriter(cluster, adminClientMock, producerSupplierMock);
+      assertThat(maybeWriter).isPresent();
+
+      var writer = maybeWriter.get();
+      assertThat(writer.consoleLogger()).isNotNull();
+    }
+
+    @Nested
+    class WhenTopicAuditEnabled {
+
+      @BeforeEach
+      void setTopicWriteProperties() {
+        var auditProps = new ClustersProperties.AuditProperties();
+        auditProps.setTopicAuditEnabled(true);
+        auditProps.setTopic("test_audit_topic");
+        auditProps.setAuditTopicsPartitions(3);
+        auditProps.setAuditTopicProperties(Map.of("p1", "v1"));
+        clustersProperties.setAudit(auditProps);
+      }
+
+      @Test
+      void createsProducerIfTopicExists() {
+        when(adminClientMock.listTopics(true))
+            .thenReturn(Mono.just(Set.of("test_audit_topic")));
+
+        var maybeWriter = createAuditWriter(cluster, adminClientMock, producerSupplierMock);
+        assertThat(maybeWriter).isPresent();
+
+        //checking there was no topic creation request
+        verify(adminClientMock, times(0))
+            .createTopic(any(), anyInt(), anyInt(), anyMap());
+
+        var writer = maybeWriter.get();
+        assertThat(writer.producer()).isNotNull();
+        assertThat(writer.targetTopic()).isEqualTo("test_audit_topic");
+      }
+
+      @Test
+      void createsProducerAndTopicIfItIsNotExist() {
+        when(adminClientMock.listTopics(true))
+            .thenReturn(Mono.just(Set.of()));
+
+        when(adminClientMock.createTopic(eq("test_audit_topic"), eq(3), eq(null), anyMap()))
+            .thenReturn(Mono.empty());
+
+        var maybeWriter = createAuditWriter(cluster, adminClientMock, producerSupplierMock);
+        assertThat(maybeWriter).isPresent();
+
+        //verifying topic created
+        verify(adminClientMock).createTopic(eq("test_audit_topic"), eq(3), eq(null), anyMap());
+
+        var writer = maybeWriter.get();
+        assertThat(writer.producer()).isNotNull();
+        assertThat(writer.targetTopic()).isEqualTo("test_audit_topic");
+      }
+
+    }
+  }
+
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java
index 852b75ae085..36bf78707c5 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/AccessControlServiceMock.java
@@ -5,7 +5,6 @@
 import static org.mockito.Mockito.when;
 
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
-import java.util.Collections;
 import org.mockito.Mockito;
 import reactor.core.publisher.Mono;
 
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 590e324abd8..3774a631f79 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -3465,6 +3465,7 @@ components:
         - CONNECT
         - KSQL
         - ACL
+        - AUDIT
 
     KafkaAcl:
       type: object
@@ -3825,3 +3826,18 @@ components:
                       pollingThrottleRate:
                         type: integer
                         format: int64
+                      audit:
+                        type: object
+                        properties:
+                          topic:
+                            type: string
+                          auditTopicsPartitions:
+                            type: integer
+                          topicAuditEnabled:
+                            type: boolean
+                          consoleAuditEnabled:
+                            type: boolean
+                          auditTopicProperties:
+                            type: object
+                            additionalProperties:
+                              type: string

From 328d91de8b84f5c808d2f11a0fe75eec44453894 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 21 Jun 2023 14:04:58 +0400
Subject: [PATCH 622/734] Smart filters test execution endpoint added (#3656)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../ui/controller/MessagesController.java     | 14 ++++++
 .../kafka/ui/service/MessagesService.java     | 39 +++++++++++++++
 .../kafka/ui/service/MessagesServiceTest.java | 41 +++++++++++++++
 .../main/resources/swagger/kafka-ui-api.yaml  | 50 +++++++++++++++++++
 4 files changed, 144 insertions(+)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
index 4311fbd8d2c..00eae8a7c71 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
@@ -15,6 +15,8 @@
 import com.provectus.kafka.ui.model.SeekDirectionDTO;
 import com.provectus.kafka.ui.model.SeekTypeDTO;
 import com.provectus.kafka.ui.model.SerdeUsageDTO;
+import com.provectus.kafka.ui.model.SmartFilterTestExecutionDTO;
+import com.provectus.kafka.ui.model.SmartFilterTestExecutionResultDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.model.TopicSerdeSuggestionDTO;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
@@ -70,6 +72,14 @@ public Mono<ResponseEntity<Void>> deleteTopicMessages(
     ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
+  @Override
+  public Mono<ResponseEntity<SmartFilterTestExecutionResultDTO>> executeSmartFilterTest(
+      Mono<SmartFilterTestExecutionDTO> smartFilterTestExecutionDto, ServerWebExchange exchange) {
+    return smartFilterTestExecutionDto
+        .map(MessagesService::execSmartFilterTest)
+        .map(ResponseEntity::ok);
+  }
+
   @Override
   public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String clusterName,
                                                                            String topicName,
@@ -188,4 +198,8 @@ public Mono<ResponseEntity<TopicSerdeSuggestionDTO>> getSerdes(String clusterNam
             .map(ResponseEntity::ok)
     );
   }
+
+
+
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index 625784f8ee8..dcc122ba282 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -14,11 +14,16 @@
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.MessageFilterTypeDTO;
 import com.provectus.kafka.ui.model.SeekDirectionDTO;
+import com.provectus.kafka.ui.model.SmartFilterTestExecutionDTO;
+import com.provectus.kafka.ui.model.SmartFilterTestExecutionResultDTO;
 import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.serde.api.Serde;
 import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
 import com.provectus.kafka.ui.util.SslPropertiesUtil;
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -81,6 +86,40 @@ private Mono<TopicDescription> withExistingTopic(KafkaCluster cluster, String to
         .switchIfEmpty(Mono.error(new TopicNotFoundException()));
   }
 
+  public static SmartFilterTestExecutionResultDTO execSmartFilterTest(SmartFilterTestExecutionDTO execData) {
+    Predicate<TopicMessageDTO> predicate;
+    try {
+      predicate = MessageFilters.createMsgFilter(
+          execData.getFilterCode(),
+          MessageFilterTypeDTO.GROOVY_SCRIPT
+      );
+    } catch (Exception e) {
+      log.info("Smart filter '{}' compilation error", execData.getFilterCode(), e);
+      return new SmartFilterTestExecutionResultDTO()
+          .error("Compilation error : " + e.getMessage());
+    }
+    try {
+      var result = predicate.test(
+          new TopicMessageDTO()
+              .key(execData.getKey())
+              .content(execData.getValue())
+              .headers(execData.getHeaders())
+              .offset(execData.getOffset())
+              .partition(execData.getPartition())
+              .timestamp(
+                  Optional.ofNullable(execData.getTimestampMs())
+                      .map(ts -> OffsetDateTime.ofInstant(Instant.ofEpochMilli(ts), ZoneOffset.UTC))
+                      .orElse(null))
+      );
+      return new SmartFilterTestExecutionResultDTO()
+          .result(result);
+    } catch (Exception e) {
+      log.info("Smart filter {} execution error", execData, e);
+      return new SmartFilterTestExecutionResultDTO()
+          .error("Execution error : " + e.getMessage());
+    }
+  }
+
   public Mono<Void> deleteTopicMessages(KafkaCluster cluster, String topicName,
                                         List<Integer> partitionsToInclude) {
     return withExistingTopic(cluster, topicName)
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
index 75a69adec71..cb50c0eb818 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/MessagesServiceTest.java
@@ -1,5 +1,8 @@
 package com.provectus.kafka.ui.service;
 
+import static com.provectus.kafka.ui.service.MessagesService.execSmartFilterTest;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.exception.TopicNotFoundException;
 import com.provectus.kafka.ui.model.ConsumerPosition;
@@ -7,11 +10,13 @@
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.SeekDirectionDTO;
 import com.provectus.kafka.ui.model.SeekTypeDTO;
+import com.provectus.kafka.ui.model.SmartFilterTestExecutionDTO;
 import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.producer.KafkaTestProducer;
 import com.provectus.kafka.ui.serdes.builtin.StringSerde;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.junit.jupiter.api.BeforeEach;
@@ -91,4 +96,40 @@ void maskingAppliedOnConfiguredClusters() throws Exception {
     }
   }
 
+  @Test
+  void execSmartFilterTestReturnsExecutionResult() {
+    var params = new SmartFilterTestExecutionDTO()
+        .filterCode("key != null && value != null && headers != null && timestampMs != null && offset != null")
+        .key("1234")
+        .value("{ \"some\" : \"value\" } ")
+        .headers(Map.of("h1", "hv1"))
+        .offset(12345L)
+        .timestampMs(System.currentTimeMillis())
+        .partition(1);
+    assertThat(execSmartFilterTest(params).getResult()).isTrue();
+
+    params.setFilterCode("return false");
+    assertThat(execSmartFilterTest(params).getResult()).isFalse();
+  }
+
+  @Test
+  void execSmartFilterTestReturnsErrorOnFilterApplyError() {
+    var result = execSmartFilterTest(
+        new SmartFilterTestExecutionDTO()
+            .filterCode("return 1/0")
+    );
+    assertThat(result.getResult()).isNull();
+    assertThat(result.getError()).containsIgnoringCase("execution error");
+  }
+
+  @Test
+  void execSmartFilterTestReturnsErrorOnFilterCompilationError() {
+    var result = execSmartFilterTest(
+        new SmartFilterTestExecutionDTO()
+            .filterCode("this is invalid groovy syntax = 1")
+    );
+    assertThat(result.getResult()).isNull();
+    assertThat(result.getError()).containsIgnoringCase("Compilation error");
+  }
+
 }
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 3774a631f79..e15425a45ec 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -625,6 +625,25 @@ paths:
               schema:
                 $ref: '#/components/schemas/TopicSerdeSuggestion'
 
+  /api/smartfilters/testexecutions:
+    put:
+      tags:
+        - Messages
+      summary: executeSmartFilterTest
+      operationId: executeSmartFilterTest
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/SmartFilterTestExecution'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SmartFilterTestExecutionResult'
+
 
   /api/clusters/{clusterName}/topics/{topicName}/messages:
     get:
@@ -2584,6 +2603,37 @@ components:
           items:
             $ref: '#/components/schemas/ConsumerGroup'
 
+    SmartFilterTestExecution:
+      type: object
+      required: [filterCode]
+      properties:
+        filterCode:
+          type: string
+        key:
+          type: string
+        value:
+          type: string
+        headers:
+          type: object
+          additionalProperties:
+            type: string
+        partition:
+          type: integer
+        offset:
+          type: integer
+          format: int64
+        timestampMs:
+          type: integer
+          format: int64
+
+    SmartFilterTestExecutionResult:
+      type: object
+      properties:
+        result:
+          type: boolean
+        error:
+          type: string
+
     CreateTopicMessage:
       type: object
       properties:

From 742e6eed3eba0b2b351dfb25aec5b4fb63f2e64f Mon Sep 17 00:00:00 2001
From: Andrey Nenashev <proudhamyak@gmail.com>
Date: Wed, 21 Jun 2023 13:13:17 +0300
Subject: [PATCH 623/734] BE: Chore: drop deprecated protobuf single file
 property (#3825)

---
 .gitignore                                    |  3 +++
 .../ui/serdes/builtin/ProtobufFileSerde.java  | 20 ++++++-------------
 .../serdes/builtin/ProtobufFileSerdeTest.java | 15 +-------------
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 55b770349f8..a12e7753760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,9 @@ build/
 .vscode/
 /kafka-ui-api/app/node
 
+### SDKMAN ###
+.sdkmanrc
+
 .DS_Store
 *.code-workspace
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
index 8a4c28a320a..05809e26912 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerde.java
@@ -50,7 +50,6 @@
 import java.io.ByteArrayInputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -204,17 +203,13 @@ record Configuration(@Nullable Descriptor defaultMessageDescriptor,
                        Map<String, Descriptor> keyMessageDescriptorMap) {
 
     static boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties) {
-      Optional<String> protobufFile = kafkaClusterProperties.getProperty("protobufFile", String.class);
       Optional<List<String>> protobufFiles = kafkaClusterProperties.getListProperty("protobufFiles", String.class);
       Optional<String> protobufFilesDir = kafkaClusterProperties.getProperty("protobufFilesDir", String.class);
-      return protobufFilesDir.isPresent()
-          || protobufFile.isPresent()
-          || protobufFiles.filter(files -> !files.isEmpty()).isPresent();
+      return protobufFilesDir.isPresent() || protobufFiles.filter(files -> !files.isEmpty()).isPresent();
     }
 
     static Configuration create(PropertyResolver properties) {
       var protobufSchemas = loadSchemas(
-          properties.getProperty("protobufFile", String.class),
           properties.getListProperty("protobufFiles", String.class),
           properties.getProperty("protobufFilesDir", String.class)
       );
@@ -272,12 +267,11 @@ private static Map<String, Descriptor> populateDescriptors(Map<String, Descripto
     }
 
     @VisibleForTesting
-    static Map<Path, ProtobufSchema> loadSchemas(Optional<String> protobufFile,
-                                                 Optional<List<String>> protobufFiles,
+    static Map<Path, ProtobufSchema> loadSchemas(Optional<List<String>> protobufFiles,
                                                  Optional<String> protobufFilesDir) {
       if (protobufFilesDir.isPresent()) {
-        if (protobufFile.isPresent() || protobufFiles.isPresent()) {
-          log.warn("protobufFile and protobufFiles properties will be ignored, since protobufFilesDir provided");
+        if (protobufFiles.isPresent()) {
+          log.warn("protobufFiles properties will be ignored, since protobufFilesDir provided");
         }
         List<ProtoFile> loadedFiles = new ProtoSchemaLoader(protobufFilesDir.get()).load();
         Map<String, ProtoFileElement> allPaths = loadedFiles.stream()
@@ -288,10 +282,8 @@ static Map<Path, ProtobufSchema> loadSchemas(Optional<String> protobufFile,
                 f -> new ProtobufSchema(f.toElement(), List.of(), allPaths)));
       }
       //Supporting for backward-compatibility. Normally, protobufFilesDir setting should be used
-      return Stream.concat(
-              protobufFile.stream(),
-              protobufFiles.stream().flatMap(Collection::stream)
-          )
+      return protobufFiles.stream()
+          .flatMap(Collection::stream)
           .distinct()
           .map(Path::of)
           .collect(Collectors.toMap(path -> path, path -> new ProtobufSchema(readFileAsString(path))));
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
index ab99df74de6..1b295dc77a4 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufFileSerdeTest.java
@@ -47,7 +47,6 @@ class ProtobufFileSerdeTest {
   @BeforeEach
   void setUp() throws Exception {
     Map<Path, ProtobufSchema> files = ProtobufFileSerde.Configuration.loadSchemas(
-        Optional.empty(),
         Optional.empty(),
         Optional.of(protoFilesDir())
     );
@@ -107,15 +106,6 @@ void canBeAutoConfiguredReturnsNoProtoPropertiesProvided() {
           .isFalse();
     }
 
-    @Test
-    void canBeAutoConfiguredReturnsTrueIfNoProtoFileHasBeenProvided() {
-      PropertyResolver resolver = mock(PropertyResolver.class);
-      when(resolver.getProperty("protobufFile", String.class))
-          .thenReturn(Optional.of("file.proto"));
-      assertThat(Configuration.canBeAutoConfigured(resolver))
-          .isTrue();
-    }
-
     @Test
     void canBeAutoConfiguredReturnsTrueIfProtoFilesHasBeenProvided() {
       PropertyResolver resolver = mock(PropertyResolver.class);
@@ -193,13 +183,10 @@ void unknownSchemaAsTopicSchemaForKeyThrowsException() {
     @Test
     void createConfigureFillsDescriptorMappingsWhenProtoFilesListProvided() throws Exception {
       PropertyResolver resolver = mock(PropertyResolver.class);
-      when(resolver.getProperty("protobufFile", String.class))
-          .thenReturn(Optional.of(
-              ResourceUtils.getFile("classpath:protobuf-serde/sensor.proto").getPath()));
-
       when(resolver.getListProperty("protobufFiles", String.class))
           .thenReturn(Optional.of(
               List.of(
+                  ResourceUtils.getFile("classpath:protobuf-serde/sensor.proto").getPath(),
                   ResourceUtils.getFile("classpath:protobuf-serde/address-book.proto").getPath())));
 
       when(resolver.getProperty("protobufMessageName", String.class))

From 4134d68316051c6ece70bb3cf0499ea5eb6d9380 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 14:13:53 +0400
Subject: [PATCH 624/734] Bump maven-checkstyle-plugin from 3.1.2 to 3.3.0
 (#3956)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-api/pom.xml        | 2 +-
 kafka-ui-e2e-checks/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index dc5dad08e2b..a01300167c4 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -311,7 +311,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.3.0</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index cfd1414fd4f..835013c37cc 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -267,7 +267,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>3.1.2</version>
+                        <version>3.3.0</version>
                         <dependencies>
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>

From cdb4f84e236de638fe9e45f267ece011c72463e7 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 21 Jun 2023 19:12:38 +0800
Subject: [PATCH 625/734] FE: Add precision for disk usage (#3962)

---
 kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx | 5 ++++-
 .../src/components/Brokers/Broker/__test__/Broker.spec.tsx  | 2 +-
 .../src/components/Brokers/BrokersList/BrokersList.tsx      | 1 +
 .../src/components/common/NewTable/SizeCell.tsx             | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index fcad7423f39..44a75c51ad8 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -44,7 +44,10 @@ const Broker: React.FC = () => {
       <Metrics.Wrapper>
         <Metrics.Section>
           <Metrics.Indicator label="Segment Size">
-            <BytesFormatted value={brokerDiskUsage?.segmentSize} />
+            <BytesFormatted
+              value={brokerDiskUsage?.segmentSize}
+              precision={2}
+            />
           </Metrics.Indicator>
           <Metrics.Indicator label="Segment Count">
             {brokerDiskUsage?.segmentCount}
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
index ae6a7f4b3b6..89a553be7d0 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
@@ -66,7 +66,7 @@ describe('Broker Component', () => {
     expect(
       screen.getByText(brokerDiskUsage?.segmentCount || '')
     ).toBeInTheDocument();
-    expect(screen.getByText('12 MB')).toBeInTheDocument();
+    expect(screen.getByText('11.77 MB')).toBeInTheDocument();
 
     expect(screen.getByText('Segment Count')).toBeInTheDocument();
     expect(
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index d8cd0a2f763..e59c006b0c6 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -105,6 +105,7 @@ const BrokersList: React.FC = () => {
               getValue={getValue}
               renderValue={renderValue}
               renderSegments
+              precision={2}
             />
           ),
       },
diff --git a/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx b/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
index 24485342aa4..7a230be8121 100644
--- a/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
+++ b/kafka-ui-react-app/src/components/common/NewTable/SizeCell.tsx
@@ -6,10 +6,10 @@ import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 type AsAny = any;
 
 const SizeCell: React.FC<
-  CellContext<AsAny, unknown> & { renderSegments?: boolean }
-> = ({ getValue, row, renderSegments = false }) => (
+  CellContext<AsAny, unknown> & { renderSegments?: boolean; precision?: number }
+> = ({ getValue, row, renderSegments = false, precision = 0 }) => (
   <>
-    <BytesFormatted value={getValue<string | number>()} />
+    <BytesFormatted value={getValue<string | number>()} precision={precision} />
     {renderSegments ? `, ${row?.original.count} segment(s)` : null}
   </>
 );

From b1ac3482db3d4157984effe0bb7be321a2a37090 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 21 Jun 2023 16:33:30 +0400
Subject: [PATCH 626/734] Skipping full qualified union-type names for avro <->
 json convertion (#3931)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../JsonAvroConversionException.java          |  7 ++
 .../JsonToAvroConversionException.java        |  7 --
 .../jsonschema/AvroJsonSchemaConverter.java   | 36 +++----
 .../util/jsonschema/JsonAvroConversion.java   | 83 +++++++++++-----
 .../jsonschema/JsonAvroConversionTest.java    | 96 ++++++++++++++++++-
 5 files changed, 173 insertions(+), 56 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonAvroConversionException.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonToAvroConversionException.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonAvroConversionException.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonAvroConversionException.java
new file mode 100644
index 00000000000..ef658031e56
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonAvroConversionException.java
@@ -0,0 +1,7 @@
+package com.provectus.kafka.ui.exception;
+
+public class JsonAvroConversionException extends ValidationException {
+  public JsonAvroConversionException(String message) {
+    super(message);
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonToAvroConversionException.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonToAvroConversionException.java
deleted file mode 100644
index 5b3910f4cf3..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/JsonToAvroConversionException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.provectus.kafka.ui.exception;
-
-public class JsonToAvroConversionException extends ValidationException {
-  public JsonToAvroConversionException(String message) {
-    super(message);
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
index 56737d7a612..84f56b81dc0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/AvroJsonSchemaConverter.java
@@ -151,30 +151,16 @@ private ArrayFieldSchema createArraySchema(Schema schema,
   }
 
   private JsonType convertType(Schema schema) {
-    switch (schema.getType()) {
-      case INT:
-      case LONG:
-        return new SimpleJsonType(JsonType.Type.INTEGER);
-      case MAP:
-      case RECORD:
-        return new SimpleJsonType(JsonType.Type.OBJECT);
-      case ENUM:
-        return new EnumJsonType(schema.getEnumSymbols());
-      case BYTES:
-      case STRING:
-        return new SimpleJsonType(JsonType.Type.STRING);
-      case NULL:
-        return new SimpleJsonType(JsonType.Type.NULL);
-      case ARRAY:
-        return new SimpleJsonType(JsonType.Type.ARRAY);
-      case FIXED:
-      case FLOAT:
-      case DOUBLE:
-        return new SimpleJsonType(JsonType.Type.NUMBER);
-      case BOOLEAN:
-        return new SimpleJsonType(JsonType.Type.BOOLEAN);
-      default:
-        return new SimpleJsonType(JsonType.Type.STRING);
-    }
+    return switch (schema.getType()) {
+      case INT, LONG -> new SimpleJsonType(JsonType.Type.INTEGER);
+      case MAP, RECORD -> new SimpleJsonType(JsonType.Type.OBJECT);
+      case ENUM -> new EnumJsonType(schema.getEnumSymbols());
+      case BYTES, STRING -> new SimpleJsonType(JsonType.Type.STRING);
+      case NULL -> new SimpleJsonType(JsonType.Type.NULL);
+      case ARRAY -> new SimpleJsonType(JsonType.Type.ARRAY);
+      case FIXED, FLOAT, DOUBLE -> new SimpleJsonType(JsonType.Type.NUMBER);
+      case BOOLEAN -> new SimpleJsonType(JsonType.Type.BOOLEAN);
+      default -> new SimpleJsonType(JsonType.Type.STRING);
+    };
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
index d2114dd971c..0708044837b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.util.jsonschema;
 
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -15,7 +16,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.google.common.collect.Lists;
-import com.provectus.kafka.ui.exception.JsonToAvroConversionException;
+import com.provectus.kafka.ui.exception.JsonAvroConversionException;
 import io.confluent.kafka.serializers.AvroData;
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
@@ -34,7 +35,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 import java.util.stream.Stream;
-import lombok.SneakyThrows;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
 
@@ -42,12 +42,17 @@
 public class JsonAvroConversion {
 
   private static final JsonMapper MAPPER = new JsonMapper();
+  private static final Schema NULL_SCHEMA = Schema.create(Schema.Type.NULL);
 
   // converts json into Object that is expected input for KafkaAvroSerializer
   // (with AVRO_USE_LOGICAL_TYPE_CONVERTERS flat enabled!)
-  @SneakyThrows
   public static Object convertJsonToAvro(String jsonString, Schema avroSchema) {
-    JsonNode rootNode = MAPPER.readTree(jsonString);
+    JsonNode rootNode = null;
+    try {
+      rootNode = MAPPER.readTree(jsonString);
+    } catch (JsonProcessingException e) {
+      throw new JsonAvroConversionException("String is not a valid json");
+    }
     return convert(rootNode, avroSchema);
   }
 
@@ -80,7 +85,7 @@ private static Object convert(JsonNode node, Schema avroSchema) {
         assertJsonType(node, JsonNodeType.STRING);
         String symbol = node.textValue();
         if (!avroSchema.getEnumSymbols().contains(symbol)) {
-          throw new JsonToAvroConversionException("%s is not a part of enum symbols [%s]"
+          throw new JsonAvroConversionException("%s is not a part of enum symbols [%s]"
               .formatted(symbol, avroSchema.getEnumSymbols()));
         }
         yield new GenericData.EnumSymbol(avroSchema, symbol);
@@ -88,23 +93,35 @@ private static Object convert(JsonNode node, Schema avroSchema) {
       case UNION -> {
         // for types from enum (other than null) payload should be an object with single key == name of type
         // ex: schema = [ "null", "int", "string" ], possible payloads = null, { "string": "str" },  { "int": 123 }
-        if (node.isNull() && avroSchema.getTypes().contains(Schema.create(Schema.Type.NULL))) {
+        if (node.isNull() && avroSchema.getTypes().contains(NULL_SCHEMA)) {
           yield null;
         }
 
         assertJsonType(node, JsonNodeType.OBJECT);
         var elements = Lists.newArrayList(node.fields());
         if (elements.size() != 1) {
-          throw new JsonToAvroConversionException(
+          throw new JsonAvroConversionException(
               "UNION field value should be an object with single field == type name");
         }
-        var typeNameToValue = elements.get(0);
+        Map.Entry<String, JsonNode> typeNameToValue = elements.get(0);
+        List<Schema> candidates = new ArrayList<>();
         for (Schema unionType : avroSchema.getTypes()) {
           if (typeNameToValue.getKey().equals(unionType.getFullName())) {
             yield convert(typeNameToValue.getValue(), unionType);
           }
+          if (typeNameToValue.getKey().equals(unionType.getName())) {
+            candidates.add(unionType);
+          }
+        }
+        if (candidates.size() == 1) {
+          yield convert(typeNameToValue.getValue(), candidates.get(0));
         }
-        throw new JsonToAvroConversionException(
+        if (candidates.size() > 1) {
+          throw new JsonAvroConversionException(
+              "Can't select type within union for value '%s'. Provide full type name.".formatted(node)
+          );
+        }
+        throw new JsonAvroConversionException(
             "json value '%s' is cannot be converted to any of union types [%s]"
                 .formatted(node, avroSchema.getTypes()));
       }
@@ -164,7 +181,7 @@ private static Object convert(JsonNode node, Schema avroSchema) {
         assertJsonType(node, JsonNodeType.STRING);
         byte[] bytes = node.textValue().getBytes(StandardCharsets.ISO_8859_1);
         if (bytes.length != avroSchema.getFixedSize()) {
-          throw new JsonToAvroConversionException(
+          throw new JsonAvroConversionException(
               "Fixed field has unexpected size %d (should be %d)"
                   .formatted(bytes.length, avroSchema.getFixedSize()));
         }
@@ -208,8 +225,11 @@ public static JsonNode convertAvroToJson(Object obj, Schema avroSchema) {
       case UNION -> {
         ObjectNode node = MAPPER.createObjectNode();
         int unionIdx = AvroData.getGenericData().resolveUnion(avroSchema, obj);
-        Schema unionType = avroSchema.getTypes().get(unionIdx);
-        node.set(unionType.getFullName(), convertAvroToJson(obj, unionType));
+        Schema selectedType = avroSchema.getTypes().get(unionIdx);
+        node.set(
+            selectUnionTypeFieldName(avroSchema, selectedType, unionIdx),
+            convertAvroToJson(obj, selectedType)
+        );
         yield node;
       }
       case STRING -> {
@@ -252,11 +272,30 @@ public static JsonNode convertAvroToJson(Object obj, Schema avroSchema) {
     };
   }
 
+  // select name for a key field that represents type name of union.
+  // For records selects short name, if it is possible.
+  private static String selectUnionTypeFieldName(Schema unionSchema,
+                                                 Schema chosenType,
+                                                 int chosenTypeIdx) {
+    var types = unionSchema.getTypes();
+    if (types.size() == 2 && types.contains(NULL_SCHEMA)) {
+      return chosenType.getName();
+    }
+    for (int i = 0; i < types.size(); i++) {
+      if (i != chosenTypeIdx && chosenType.getName().equals(types.get(i).getName())) {
+        // there is another type inside union with the same name
+        // so, we have to use fullname
+        return chosenType.getFullName();
+      }
+    }
+    return chosenType.getName();
+  }
+
   private static Object processLogicalType(JsonNode node, Schema schema) {
     return findConversion(schema)
         .map(c -> c.jsonToAvroConversion.apply(node, schema))
         .orElseThrow(() ->
-            new JsonToAvroConversionException("'%s' logical type is not supported"
+            new JsonAvroConversionException("'%s' logical type is not supported"
                 .formatted(schema.getLogicalType().getName())));
   }
 
@@ -264,7 +303,7 @@ private static JsonNode processLogicalType(Object obj, Schema schema) {
     return findConversion(schema)
         .map(c -> c.avroToJsonConversion.apply(obj, schema))
         .orElseThrow(() ->
-            new JsonToAvroConversionException("'%s' logical type is not supported"
+            new JsonAvroConversionException("'%s' logical type is not supported"
                 .formatted(schema.getLogicalType().getName())));
   }
 
@@ -281,7 +320,7 @@ private static boolean isLogicalType(Schema schema) {
 
   private static void assertJsonType(JsonNode node, JsonNodeType... allowedTypes) {
     if (Stream.of(allowedTypes).noneMatch(t -> node.getNodeType() == t)) {
-      throw new JsonToAvroConversionException(
+      throw new JsonAvroConversionException(
           "%s node has unexpected type, allowed types %s, actual type %s"
               .formatted(node, Arrays.toString(allowedTypes), node.getNodeType()));
     }
@@ -289,7 +328,7 @@ private static void assertJsonType(JsonNode node, JsonNodeType... allowedTypes)
 
   private static void assertJsonNumberType(JsonNode node, JsonParser.NumberType... allowedTypes) {
     if (Stream.of(allowedTypes).noneMatch(t -> node.numberType() == t)) {
-      throw new JsonToAvroConversionException(
+      throw new JsonAvroConversionException(
           "%s node has unexpected numeric type, allowed types %s, actual type %s"
               .formatted(node, Arrays.toString(allowedTypes), node.numberType()));
     }
@@ -318,7 +357,7 @@ enum LogicalTypeConversion {
           } else if (node.isNumber()) {
             return new BigDecimal(node.numberValue().toString());
           }
-          throw new JsonToAvroConversionException(
+          throw new JsonAvroConversionException(
               "node '%s' can't be converted to decimal logical type"
                   .formatted(node));
         },
@@ -335,7 +374,7 @@ enum LogicalTypeConversion {
           } else if (node.isTextual()) {
             return LocalDate.parse(node.asText());
           } else {
-            throw new JsonToAvroConversionException(
+            throw new JsonAvroConversionException(
                 "node '%s' can't be converted to date logical type"
                     .formatted(node));
           }
@@ -356,7 +395,7 @@ enum LogicalTypeConversion {
           } else if (node.isTextual()) {
             return LocalTime.parse(node.asText());
           } else {
-            throw new JsonToAvroConversionException(
+            throw new JsonAvroConversionException(
                 "node '%s' can't be converted to time-millis logical type"
                     .formatted(node));
           }
@@ -377,7 +416,7 @@ enum LogicalTypeConversion {
           } else if (node.isTextual()) {
             return LocalTime.parse(node.asText());
           } else {
-            throw new JsonToAvroConversionException(
+            throw new JsonAvroConversionException(
                 "node '%s' can't be converted to time-micros logical type"
                     .formatted(node));
           }
@@ -398,7 +437,7 @@ enum LogicalTypeConversion {
           } else if (node.isTextual()) {
             return Instant.parse(node.asText());
           } else {
-            throw new JsonToAvroConversionException(
+            throw new JsonAvroConversionException(
                 "node '%s' can't be converted to timestamp-millis logical type"
                     .formatted(node));
           }
@@ -423,7 +462,7 @@ enum LogicalTypeConversion {
           } else if (node.isTextual()) {
             return Instant.parse(node.asText());
           } else {
-            throw new JsonToAvroConversionException(
+            throw new JsonAvroConversionException(
                 "node '%s' can't be converted to timestamp-millis logical type"
                     .formatted(node));
           }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversionTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversionTest.java
index 0e9c291707e..7c4d79f30d7 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversionTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversionTest.java
@@ -3,6 +3,7 @@
 import static com.provectus.kafka.ui.util.jsonschema.JsonAvroConversion.convertAvroToJson;
 import static com.provectus.kafka.ui.util.jsonschema.JsonAvroConversion.convertJsonToAvro;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -13,6 +14,7 @@
 import com.fasterxml.jackson.databind.node.LongNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.google.common.primitives.Longs;
+import com.provectus.kafka.ui.exception.JsonAvroConversionException;
 import io.confluent.kafka.schemaregistry.avro.AvroSchema;
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
@@ -181,12 +183,62 @@ var record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
       record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
       assertThat(record.get("f_union")).isEqualTo(123);
 
-      //inner-record's name should be fully-qualified!
-      jsonPayload = "{ \"f_union\": { \"com.test.TestAvroRecord\": { \"f_union\": { \"int\": 123  } } } }";
+      //short name can be used since there is no clash with other type names
+      jsonPayload = "{ \"f_union\": { \"TestAvroRecord\": { \"f_union\": { \"int\": 123  } } } }";
       record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
       assertThat(record.get("f_union")).isInstanceOf(GenericData.Record.class);
       var innerRec = (GenericData.Record) record.get("f_union");
       assertThat(innerRec.get("f_union")).isEqualTo(123);
+
+      assertThatThrownBy(() ->
+          convertJsonToAvro("{ \"f_union\": { \"NotExistingType\": 123 } }", schema)
+      ).isInstanceOf(JsonAvroConversionException.class);
+    }
+
+    @Test
+    void unionFieldWithTypeNamesClash() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "namespace": "com.test",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "nestedClass",
+                     "type": {
+                       "type": "record",
+                       "namespace": "com.nested",
+                       "name": "TestAvroRecord",
+                       "fields": [
+                         {"name" : "inner_obj_field", "type": "int" }
+                       ]
+                     }
+                   },
+                   {
+                     "name": "f_union",
+                     "type": [ "null", "int", "com.test.TestAvroRecord", "com.nested.TestAvroRecord"]
+                   }
+                 ]
+              }"""
+      );
+      //short name can't can be used since there is a clash with other type names
+      var jsonPayload = "{ \"f_union\": { \"com.test.TestAvroRecord\": { \"f_union\": { \"int\": 123  } } } }";
+      var record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
+      assertThat(record.get("f_union")).isInstanceOf(GenericData.Record.class);
+      var innerRec = (GenericData.Record) record.get("f_union");
+      assertThat(innerRec.get("f_union")).isEqualTo(123);
+
+      //short name can't can be used since there is a clash with other type names
+      jsonPayload = "{ \"f_union\": { \"com.nested.TestAvroRecord\": { \"inner_obj_field\":  234 } } }";
+      record = (GenericData.Record) convertJsonToAvro(jsonPayload, schema);
+      assertThat(record.get("f_union")).isInstanceOf(GenericData.Record.class);
+      innerRec = (GenericData.Record) record.get("f_union");
+      assertThat(innerRec.get("inner_obj_field")).isEqualTo(234);
+
+      assertThatThrownBy(() ->
+          convertJsonToAvro("{ \"f_union\": { \"TestAvroRecord\": { \"inner_obj_field\":  234 } } }", schema)
+      ).isInstanceOf(JsonAvroConversionException.class);
     }
 
     @Test
@@ -599,6 +651,46 @@ void unionField() {
       var innerRec = new GenericData.Record(schema);
       innerRec.put("f_union", 123);
       r.put("f_union", innerRec);
+      // short type name can be set since there is NO clash with other types name
+      assertJsonsEqual(
+          " { \"f_union\" : { \"TestAvroRecord\" : { \"f_union\" : { \"int\" : 123 } } } }",
+          convertAvroToJson(r, schema)
+      );
+    }
+
+    @Test
+    void unionFieldWithInnerTypesNamesClash() {
+      var schema = createSchema(
+          """
+               {
+                 "type": "record",
+                 "namespace": "com.test",
+                 "name": "TestAvroRecord",
+                 "fields": [
+                   {
+                     "name": "nestedClass",
+                     "type": {
+                       "type": "record",
+                       "namespace": "com.nested",
+                       "name": "TestAvroRecord",
+                       "fields": [
+                         {"name" : "inner_obj_field", "type": "int" }
+                       ]
+                     }
+                   },
+                   {
+                     "name": "f_union",
+                     "type": [ "null", "int", "com.test.TestAvroRecord", "com.nested.TestAvroRecord"]
+                   }
+                 ]
+              }"""
+      );
+
+      var r = new GenericData.Record(schema);
+      var innerRec = new GenericData.Record(schema);
+      innerRec.put("f_union", 123);
+      r.put("f_union", innerRec);
+      // full type name should be set since there is a clash with other type name
       assertJsonsEqual(
           " { \"f_union\" : { \"com.test.TestAvroRecord\" : { \"f_union\" : { \"int\" : 123 } } } }",
           convertAvroToJson(r, schema)

From 8337c9c183d632ea27b7c253d776fdfda4b19840 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Thu, 22 Jun 2023 12:46:11 +0400
Subject: [PATCH 627/734] BE: Serde: Implement a serde for consumer_offsets
 topic (#3771)

---
 .../kafka/ui/serdes/SerdesInitializer.java    |  24 ++
 .../serdes/builtin/ConsumerOffsetsSerde.java  | 294 ++++++++++++++++++
 .../builtin/ConsumerOffsetsSerdeTest.java     | 185 +++++++++++
 3 files changed, 503 insertions(+)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerdeTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
index 66692894a61..ac3c2241cfc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
@@ -11,6 +11,7 @@
 import com.provectus.kafka.ui.serde.api.Serde;
 import com.provectus.kafka.ui.serdes.builtin.AvroEmbeddedSerde;
 import com.provectus.kafka.ui.serdes.builtin.Base64Serde;
+import com.provectus.kafka.ui.serdes.builtin.ConsumerOffsetsSerde;
 import com.provectus.kafka.ui.serdes.builtin.Int32Serde;
 import com.provectus.kafka.ui.serdes.builtin.Int64Serde;
 import com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde;
@@ -118,6 +119,8 @@ public ClusterSerdes init(Environment env,
       }
     });
 
+    registerTopicRelatedSerde(registeredSerdes);
+
     return new ClusterSerdes(
         registeredSerdes,
         Optional.ofNullable(clusterProperties.getDefaultKeySerde())
@@ -132,6 +135,27 @@ public ClusterSerdes init(Environment env,
     );
   }
 
+  /**
+   * Registers serdse that should only be used for specific (hard-coded) topics, like ConsumerOffsetsSerde.
+   */
+  private void registerTopicRelatedSerde(Map<String, SerdeInstance> serdes) {
+    registerConsumerOffsetsSerde(serdes);
+  }
+
+  private void registerConsumerOffsetsSerde(Map<String, SerdeInstance> serdes) {
+    var pattern = Pattern.compile(ConsumerOffsetsSerde.TOPIC);
+    serdes.put(
+        ConsumerOffsetsSerde.name(),
+        new SerdeInstance(
+            ConsumerOffsetsSerde.name(),
+            new ConsumerOffsetsSerde(),
+            pattern,
+            pattern,
+            null
+        )
+    );
+  }
+
   private SerdeInstance createFallbackSerde() {
     StringSerde serde = new StringSerde();
     serde.configure(PropertyResolverImpl.empty(), PropertyResolverImpl.empty(), PropertyResolverImpl.empty());
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java
new file mode 100644
index 00000000000..240f0b68f2b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java
@@ -0,0 +1,294 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.Optional;
+import lombok.SneakyThrows;
+import org.apache.kafka.common.protocol.types.ArrayOf;
+import org.apache.kafka.common.protocol.types.BoundField;
+import org.apache.kafka.common.protocol.types.CompactArrayOf;
+import org.apache.kafka.common.protocol.types.Field;
+import org.apache.kafka.common.protocol.types.Schema;
+import org.apache.kafka.common.protocol.types.Struct;
+import org.apache.kafka.common.protocol.types.Type;
+
+// Deserialization logic and message's schemas can be found in
+// kafka.coordinator.group.GroupMetadataManager (readMessageKey, readOffsetMessageValue, readGroupMessageValue)
+public class ConsumerOffsetsSerde implements BuiltInSerde {
+
+  private static final JsonMapper JSON_MAPPER = createMapper();
+
+  public static final String TOPIC = "__consumer_offsets";
+
+  public static String name() {
+    return "__consumer_offsets";
+  }
+
+  private static JsonMapper createMapper() {
+    var module = new SimpleModule();
+    module.addSerializer(Struct.class, new JsonSerializer<>() {
+      @Override
+      public void serialize(Struct value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        gen.writeStartObject();
+        for (BoundField field : value.schema().fields()) {
+          var fieldVal = value.get(field);
+          gen.writeObjectField(field.def.name, fieldVal);
+        }
+        gen.writeEndObject();
+      }
+    });
+    var mapper = new JsonMapper();
+    mapper.registerModule(module);
+    return mapper;
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return topic.equals(TOPIC);
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return false;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return switch (type) {
+      case KEY -> keyDeserializer();
+      case VALUE -> valueDeserializer();
+    };
+  }
+
+  private Deserializer keyDeserializer() {
+    final Schema commitKeySchema = new Schema(
+        new Field("group", Type.STRING, ""),
+        new Field("topic", Type.STRING, ""),
+        new Field("partition", Type.INT32, "")
+    );
+
+    final Schema groupMetadataSchema = new Schema(
+        new Field("group", Type.STRING, "")
+    );
+
+    return (headers, data) -> {
+      var bb = ByteBuffer.wrap(data);
+      short version = bb.getShort();
+      return new DeserializeResult(
+          toJson(
+              switch (version) {
+                case 0, 1 -> commitKeySchema.read(bb);
+                case 2 -> groupMetadataSchema.read(bb);
+                default -> throw new IllegalStateException("Unknown group metadata message version: " + version);
+              }
+          ),
+          DeserializeResult.Type.JSON,
+          Map.of()
+      );
+    };
+  }
+
+  private Deserializer valueDeserializer() {
+    final Schema commitOffsetSchemaV0 =
+        new Schema(
+            new Field("offset", Type.INT64, ""),
+            new Field("metadata", Type.STRING, ""),
+            new Field("commit_timestamp", Type.INT64, "")
+        );
+
+    final Schema commitOffsetSchemaV1 =
+        new Schema(
+            new Field("offset", Type.INT64, ""),
+            new Field("metadata", Type.STRING, ""),
+            new Field("commit_timestamp", Type.INT64, ""),
+            new Field("expire_timestamp", Type.INT64, "")
+        );
+
+    final Schema commitOffsetSchemaV2 =
+        new Schema(
+            new Field("offset", Type.INT64, ""),
+            new Field("metadata", Type.STRING, ""),
+            new Field("commit_timestamp", Type.INT64, "")
+        );
+
+    final Schema commitOffsetSchemaV3 =
+        new Schema(
+            new Field("offset", Type.INT64, ""),
+            new Field("leader_epoch", Type.INT32, ""),
+            new Field("metadata", Type.STRING, ""),
+            new Field("commit_timestamp", Type.INT64, "")
+        );
+
+    final Schema commitOffsetSchemaV4 = new Schema(
+        new Field("offset", Type.INT64, ""),
+        new Field("leader_epoch", Type.INT32, ""),
+        new Field("metadata", Type.COMPACT_STRING, ""),
+        new Field("commit_timestamp", Type.INT64, ""),
+        Field.TaggedFieldsSection.of()
+    );
+
+    final Schema metadataSchema0 =
+        new Schema(
+            new Field("protocol_type", Type.STRING, ""),
+            new Field("generation", Type.INT32, ""),
+            new Field("protocol", Type.NULLABLE_STRING, ""),
+            new Field("leader", Type.NULLABLE_STRING, ""),
+            new Field("members", new ArrayOf(new Schema(
+                new Field("member_id", Type.STRING, ""),
+                new Field("client_id", Type.STRING, ""),
+                new Field("client_host", Type.STRING, ""),
+                new Field("session_timeout", Type.INT32, ""),
+                new Field("subscription", Type.BYTES, ""),
+                new Field("assignment", Type.BYTES, "")
+            )), "")
+        );
+
+    final Schema metadataSchema1 =
+        new Schema(
+            new Field("protocol_type", Type.STRING, ""),
+            new Field("generation", Type.INT32, ""),
+            new Field("protocol", Type.NULLABLE_STRING, ""),
+            new Field("leader", Type.NULLABLE_STRING, ""),
+            new Field("members", new ArrayOf(new Schema(
+                new Field("member_id", Type.STRING, ""),
+                new Field("client_id", Type.STRING, ""),
+                new Field("client_host", Type.STRING, ""),
+                new Field("rebalance_timeout", Type.INT32, ""),
+                new Field("session_timeout", Type.INT32, ""),
+                new Field("subscription", Type.BYTES, ""),
+                new Field("assignment", Type.BYTES, "")
+            )), "")
+        );
+
+    final Schema metadataSchema2 =
+        new Schema(
+            new Field("protocol_type", Type.STRING, ""),
+            new Field("generation", Type.INT32, ""),
+            new Field("protocol", Type.NULLABLE_STRING, ""),
+            new Field("leader", Type.NULLABLE_STRING, ""),
+            new Field("current_state_timestamp", Type.INT64, ""),
+            new Field("members", new ArrayOf(new Schema(
+                new Field("member_id", Type.STRING, ""),
+                new Field("client_id", Type.STRING, ""),
+                new Field("client_host", Type.STRING, ""),
+                new Field("rebalance_timeout", Type.INT32, ""),
+                new Field("session_timeout", Type.INT32, ""),
+                new Field("subscription", Type.BYTES, ""),
+                new Field("assignment", Type.BYTES, "")
+            )), "")
+        );
+
+    final Schema metadataSchema3 =
+        new Schema(
+            new Field("protocol_type", Type.STRING, ""),
+            new Field("generation", Type.INT32, ""),
+            new Field("protocol", Type.NULLABLE_STRING, ""),
+            new Field("leader", Type.NULLABLE_STRING, ""),
+            new Field("current_state_timestamp", Type.INT64, ""),
+            new Field("members", new ArrayOf(new Schema(
+                new Field("member_id", Type.STRING, ""),
+                new Field("group_instance_id", Type.NULLABLE_STRING, ""),
+                new Field("client_id", Type.STRING, ""),
+                new Field("client_host", Type.STRING, ""),
+                new Field("rebalance_timeout", Type.INT32, ""),
+                new Field("session_timeout", Type.INT32, ""),
+                new Field("subscription", Type.BYTES, ""),
+                new Field("assignment", Type.BYTES, "")
+            )), "")
+        );
+
+    final Schema metadataSchema4 =
+        new Schema(
+            new Field("protocol_type", Type.COMPACT_STRING, ""),
+            new Field("generation", Type.INT32, ""),
+            new Field("protocol", Type.COMPACT_NULLABLE_STRING, ""),
+            new Field("leader", Type.COMPACT_NULLABLE_STRING, ""),
+            new Field("current_state_timestamp", Type.INT64, ""),
+            new Field("members", new CompactArrayOf(new Schema(
+                new Field("member_id", Type.COMPACT_STRING, ""),
+                new Field("group_instance_id", Type.COMPACT_NULLABLE_STRING, ""),
+                new Field("client_id", Type.COMPACT_STRING, ""),
+                new Field("client_host", Type.COMPACT_STRING, ""),
+                new Field("rebalance_timeout", Type.INT32, ""),
+                new Field("session_timeout", Type.INT32, ""),
+                new Field("subscription", Type.COMPACT_BYTES, ""),
+                new Field("assignment", Type.COMPACT_BYTES, ""),
+                Field.TaggedFieldsSection.of()
+            )), ""),
+            Field.TaggedFieldsSection.of()
+        );
+
+    return (headers, data) -> {
+      String result;
+      var bb = ByteBuffer.wrap(data);
+      short version = bb.getShort();
+      // ideally, we should distinguish if value is commit or metadata
+      // by checking record's key, but our current serde structure doesn't allow that.
+      // so, we trying to parse into metadata first and after into commit msg
+      try {
+        result = toJson(
+            switch (version) {
+              case 0 -> metadataSchema0.read(bb);
+              case 1 -> metadataSchema1.read(bb);
+              case 2 -> metadataSchema2.read(bb);
+              case 3 -> metadataSchema3.read(bb);
+              case 4 -> metadataSchema4.read(bb);
+              default -> throw new IllegalArgumentException("Unrecognized version: " + version);
+            }
+        );
+      } catch (Throwable e) {
+        bb = bb.rewind();
+        bb.getShort(); // skipping version
+        result = toJson(
+            switch (version) {
+              case 0 -> commitOffsetSchemaV0.read(bb);
+              case 1 -> commitOffsetSchemaV1.read(bb);
+              case 2 -> commitOffsetSchemaV2.read(bb);
+              case 3 -> commitOffsetSchemaV3.read(bb);
+              case 4 -> commitOffsetSchemaV4.read(bb);
+              default -> throw new IllegalArgumentException("Unrecognized version: " + version);
+            }
+        );
+      }
+
+      if (bb.remaining() != 0) {
+        throw new IllegalArgumentException(
+            "Message buffer is not read to the end, which is likely means message is unrecognized");
+      }
+      return new DeserializeResult(
+          result,
+          DeserializeResult.Type.JSON,
+          Map.of()
+      );
+    };
+  }
+
+  @SneakyThrows
+  private String toJson(Struct s) {
+    return JSON_MAPPER.writeValueAsString(s);
+  }
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerdeTest.java
new file mode 100644
index 00000000000..1fab56322a8
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerdeTest.java
@@ -0,0 +1,185 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static com.provectus.kafka.ui.serdes.builtin.ConsumerOffsetsSerde.TOPIC;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.provectus.kafka.ui.AbstractIntegrationTest;
+import com.provectus.kafka.ui.producer.KafkaTestProducer;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.UUID;
+import lombok.SneakyThrows;
+import org.apache.kafka.clients.admin.NewTopic;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.serialization.BytesDeserializer;
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
+
+class ConsumerOffsetsSerdeTest extends AbstractIntegrationTest {
+
+  private static final int MSGS_TO_GENERATE = 10;
+
+  private static String consumerGroupName;
+  private static String committedTopic;
+
+  @BeforeAll
+  static void createTopicAndCommitItsOffset() {
+    committedTopic = ConsumerOffsetsSerdeTest.class.getSimpleName() + "-" + UUID.randomUUID();
+    consumerGroupName = committedTopic + "-group";
+    createTopic(new NewTopic(committedTopic, 1, (short) 1));
+
+    try (var producer = KafkaTestProducer.forKafka(kafka)) {
+      for (int i = 0; i < MSGS_TO_GENERATE; i++) {
+        producer.send(committedTopic, "i=" + i);
+      }
+    }
+    try (var consumer = createConsumer(consumerGroupName)) {
+      consumer.subscribe(List.of(committedTopic));
+      int polled = 0;
+      while (polled < MSGS_TO_GENERATE) {
+        polled += consumer.poll(Duration.ofMillis(100)).count();
+      }
+      consumer.commitSync();
+    }
+  }
+
+  @AfterAll
+  static void cleanUp() {
+    deleteTopic(committedTopic);
+  }
+
+  @Test
+  void canOnlyDeserializeConsumerOffsetsTopic() {
+    var serde = new ConsumerOffsetsSerde();
+    assertThat(serde.canDeserialize(ConsumerOffsetsSerde.TOPIC, Serde.Target.KEY)).isTrue();
+    assertThat(serde.canDeserialize(ConsumerOffsetsSerde.TOPIC, Serde.Target.VALUE)).isTrue();
+    assertThat(serde.canDeserialize("anyOtherTopic", Serde.Target.KEY)).isFalse();
+    assertThat(serde.canDeserialize("anyOtherTopic", Serde.Target.VALUE)).isFalse();
+  }
+
+  @Test
+  void deserializesMessagesMadeByConsumerActivity() {
+    var serde = new ConsumerOffsetsSerde();
+    var keyDeserializer = serde.deserializer(TOPIC, Serde.Target.KEY);
+    var valueDeserializer = serde.deserializer(TOPIC, Serde.Target.VALUE);
+
+    try (var consumer = createConsumer(consumerGroupName + "-check")) {
+      consumer.subscribe(List.of(ConsumerOffsetsSerde.TOPIC));
+      List<Tuple2<DeserializeResult, DeserializeResult>> polled = new ArrayList<>();
+
+      Awaitility.await()
+          .pollInSameThread()
+          .atMost(Duration.ofMinutes(1))
+          .untilAsserted(() -> {
+            for (var rec : consumer.poll(Duration.ofMillis(200))) {
+              DeserializeResult key = rec.key() != null
+                  ? keyDeserializer.deserialize(null, rec.key().get())
+                  : null;
+              DeserializeResult val = rec.value() != null
+                  ? valueDeserializer.deserialize(null, rec.value().get())
+                  : null;
+              if (key != null && val != null) {
+                polled.add(Tuples.of(key, val));
+              }
+            }
+            assertThat(polled).anyMatch(t -> isCommitMessage(t.getT1(), t.getT2()));
+            assertThat(polled).anyMatch(t -> isGroupMetadataMessage(t.getT1(), t.getT2()));
+          });
+    }
+  }
+
+  // Sample commit record:
+  //
+  // key: {
+  //  "group": "test_Members_3",
+  //  "topic": "test",
+  //  "partition": 0
+  // }
+  //
+  // value:
+  // {
+  //  "offset": 2,
+  //  "leader_epoch": 0,
+  //  "metadata": "",
+  //  "commit_timestamp": 1683112980588
+  // }
+  private boolean isCommitMessage(DeserializeResult key, DeserializeResult value) {
+    var keyJson = toMapFromJsom(key);
+    boolean keyIsOk = consumerGroupName.equals(keyJson.get("group"))
+        && committedTopic.equals(keyJson.get("topic"))
+        && ((Integer) 0).equals(keyJson.get("partition"));
+
+    var valueJson = toMapFromJsom(value);
+    boolean valueIsOk = valueJson.containsKey("offset")
+        && valueJson.get("offset").equals(MSGS_TO_GENERATE)
+        && valueJson.containsKey("commit_timestamp");
+
+    return keyIsOk && valueIsOk;
+  }
+
+  // Sample group metadata record:
+  //
+  // key: {
+  //  "group": "test_Members_3"
+  // }
+  //
+  // value:
+  // {
+  //  "protocol_type": "consumer",
+  //  "generation": 1,
+  //  "protocol": "range",
+  //  "leader": "consumer-test_Members_3-1-5a37876e-e42f-420e-9c7d-6902889bd5dd",
+  //  "current_state_timestamp": 1683112974561,
+  //  "members": [
+  //    {
+  //      "member_id": "consumer-test_Members_3-1-5a37876e-e42f-420e-9c7d-6902889bd5dd",
+  //      "group_instance_id": null,
+  //      "client_id": "consumer-test_Members_3-1",
+  //      "client_host": "/192.168.16.1",
+  //      "rebalance_timeout": 300000,
+  //      "session_timeout": 45000,
+  //      "subscription": "AAEAAAABAAR0ZXN0/////wAAAAA=",
+  //      "assignment": "AAEAAAABAAR0ZXN0AAAAAQAAAAD/////"
+  //    }
+  //  ]
+  // }
+  private boolean isGroupMetadataMessage(DeserializeResult key, DeserializeResult value) {
+    var keyJson = toMapFromJsom(key);
+    boolean keyIsOk = consumerGroupName.equals(keyJson.get("group")) && keyJson.size() == 1;
+
+    var valueJson = toMapFromJsom(value);
+    boolean valueIsOk = valueJson.keySet()
+        .containsAll(Set.of("protocol_type", "generation", "leader", "members"));
+
+    return keyIsOk && valueIsOk;
+  }
+
+  @SneakyThrows
+  private Map<String, Object> toMapFromJsom(DeserializeResult result) {
+    return new JsonMapper().readValue(result.getResult(), Map.class);
+  }
+
+  private static KafkaConsumer<Bytes, Bytes> createConsumer(String groupId) {
+    Properties props = new Properties();
+    props.put(ConsumerConfig.GROUP_ID_CONFIG, groupId);
+    props.put(ConsumerConfig.CLIENT_ID_CONFIG, groupId);
+    props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServers());
+    props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class);
+    props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class);
+    props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
+    return new KafkaConsumer<>(props);
+  }
+}

From 9549f68d7edcb0022687c8155010ba3c5b2cddac Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 23 Jun 2023 16:45:12 +0800
Subject: [PATCH 628/734] BE: Fix CORS once again (#3957)

---
 .../ui/config/CorsGlobalConfiguration.java    | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java
index c6c88bfa984..448f92ad477 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java
@@ -1,18 +1,41 @@
 package com.provectus.kafka.ui.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.reactive.config.CorsRegistry;
 import org.springframework.web.reactive.config.WebFluxConfigurer;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
+import reactor.core.publisher.Mono;
 
 @Configuration
-public class CorsGlobalConfiguration implements WebFluxConfigurer {
+public class CorsGlobalConfiguration {
 
-  @Override
-  public void addCorsMappings(CorsRegistry registry) {
-    registry.addMapping("/**")
-        .allowedOrigins("*")
-        .allowedMethods("*")
-        .allowedHeaders("*")
-        .allowCredentials(false);
+  @Bean
+  public WebFilter corsFilter() {
+    return (final ServerWebExchange ctx, final WebFilterChain chain) -> {
+      final ServerHttpRequest request = ctx.getRequest();
+
+      final ServerHttpResponse response = ctx.getResponse();
+      final HttpHeaders headers = response.getHeaders();
+      headers.add("Access-Control-Allow-Origin", "*");
+      headers.add("Access-Control-Allow-Methods", "GET, PUT, POST, DELETE, OPTIONS");
+      headers.add("Access-Control-Max-Age", "3600");
+      headers.add("Access-Control-Allow-Headers", "Content-Type");
+
+      if (request.getMethod() == HttpMethod.OPTIONS) {
+        response.setStatusCode(HttpStatus.OK);
+        return Mono.empty();
+      }
+
+      return chain.filter(ctx);
+    };
   }
+
 }

From 6b67313d1a0626fc4db384e8fb2f3581987bfa85 Mon Sep 17 00:00:00 2001
From: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
Date: Mon, 26 Jun 2023 11:10:29 +0300
Subject: [PATCH 629/734] [e2e] Checking Broker's config search is case
 insensitive (#3972)

---
 .../kafka/ui/utilities/StringUtils.java       | 15 ++++++++
 .../ui/manualsuite/backlog/SmokeBacklog.java  | 12 ++-----
 .../ui/smokesuite/brokers/BrokersTest.java    | 34 +++++++++++++++++++
 3 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/StringUtils.java

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/StringUtils.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/StringUtils.java
new file mode 100644
index 00000000000..77a46b805e9
--- /dev/null
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/StringUtils.java
@@ -0,0 +1,15 @@
+package com.provectus.kafka.ui.utilities;
+
+import java.util.stream.IntStream;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class StringUtils {
+
+  public static String getMixedCase(String original) {
+    return IntStream.range(0, original.length())
+        .mapToObj(i -> i % 2 == 0 ? Character.toUpperCase(original.charAt(i)) : original.charAt(i))
+        .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+        .toString();
+  }
+}
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
index f4cacc25207..eb82a50db1b 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/manualsuite/backlog/SmokeBacklog.java
@@ -1,6 +1,5 @@
 package com.provectus.kafka.ui.manualsuite.backlog;
 
-import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.BROKERS_SUITE_ID;
 import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.SCHEMAS_SUITE_ID;
 import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.TOPICS_PROFILE_SUITE_ID;
 import static com.provectus.kafka.ui.qasesuite.BaseQaseTest.TOPICS_SUITE_ID;
@@ -57,24 +56,17 @@ public void testCaseE() {
   public void testCaseF() {
   }
 
-  @Automation(state = TO_BE_AUTOMATED)
-  @Suite(id = BROKERS_SUITE_ID)
-  @QaseId(348)
-  @Test
-  public void testCaseG() {
-  }
-
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = TOPICS_SUITE_ID)
   @QaseId(50)
   @Test
-  public void testCaseH() {
+  public void testCaseG() {
   }
 
   @Automation(state = NOT_AUTOMATED)
   @Suite(id = SCHEMAS_SUITE_ID)
   @QaseId(351)
   @Test
-  public void testCaseI() {
+  public void testCaseH() {
   }
 }
diff --git a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
index 663018cbc3b..ec1bbc2313e 100644
--- a/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
+++ b/kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokesuite/brokers/BrokersTest.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.smokesuite.brokers;
 
 import static com.provectus.kafka.ui.pages.brokers.BrokersDetails.DetailsTab.CONFIGS;
+import static com.provectus.kafka.ui.utilities.StringUtils.getMixedCase;
 import static com.provectus.kafka.ui.variables.Expected.BROKER_SOURCE_INFO_TOOLTIP;
 
 import com.codeborne.selenide.Condition;
@@ -8,6 +9,7 @@
 import com.provectus.kafka.ui.pages.brokers.BrokersConfigTab;
 import io.qameta.allure.Issue;
 import io.qase.api.annotation.QaseId;
+import java.util.List;
 import org.testng.Assert;
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
@@ -100,6 +102,38 @@ public void brokersConfigSecondPageSearchCheck() {
         String.format("getAllConfigs().contains(%s)", anyConfigKeySecondPage));
   }
 
+  @Ignore
+  @Issue("https://github.com/provectus/kafka-ui/issues/3347")
+  @QaseId(348)
+  @Test
+  public void brokersConfigCaseInsensitiveSearchCheck() {
+    navigateToBrokersAndOpenDetails(DEFAULT_BROKER_ID);
+    brokersDetails
+        .openDetailsTab(CONFIGS);
+    String anyConfigKeyFirstPage = brokersConfigTab
+        .getAllConfigs().stream()
+        .findAny().orElseThrow()
+        .getKey();
+    brokersConfigTab
+        .clickNextButton();
+    Assert.assertFalse(brokersConfigTab.getAllConfigs().stream()
+            .map(BrokersConfigTab.BrokersConfigItem::getKey)
+            .toList().contains(anyConfigKeyFirstPage),
+        String.format("getAllConfigs().contains(%s)", anyConfigKeyFirstPage));
+    SoftAssert softly = new SoftAssert();
+    List.of(anyConfigKeyFirstPage.toLowerCase(), anyConfigKeyFirstPage.toUpperCase(),
+            getMixedCase(anyConfigKeyFirstPage))
+        .forEach(configCase -> {
+          brokersConfigTab
+              .searchConfig(configCase);
+          softly.assertTrue(brokersConfigTab.getAllConfigs().stream()
+                  .map(BrokersConfigTab.BrokersConfigItem::getKey)
+                  .toList().contains(anyConfigKeyFirstPage),
+              String.format("getAllConfigs().contains(%s)", configCase));
+        });
+    softly.assertAll();
+  }
+
   @QaseId(331)
   @Test
   public void brokersSourceInfoCheck() {

From 81805703c855b3ea5ffde6ab022b207780b485bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jun 2023 08:36:26 +0000
Subject: [PATCH 630/734] Bump peter-evans/create-or-update-comment from 2 to 3
 (#3973)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/build-public-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index 93de4a55998..df939682b68 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -65,7 +65,7 @@ jobs:
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
       - name: make comment with private deployment link
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v3
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |

From b9bbb1a8235037c9a4810bd4d586fb42408cb67b Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 26 Jun 2023 17:32:21 +0800
Subject: [PATCH 631/734] FE: Ignore expected 404 on topic statistics page
 (#3964)

---
 kafka-ui-react-app/src/lib/hooks/api/topics.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
index a87673368dd..f06b6a87670 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topics.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -304,6 +304,11 @@ export function useTopicAnalysis(
       useErrorBoundary: true,
       retry: false,
       suspense: false,
+      onError: (error: Response) => {
+        if (error.status !== 404) {
+          showServerError(error as Response);
+        }
+      },
     }
   );
 }

From b700ac3991dc5106b3d996b4dcfef92004e81521 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 27 Jun 2023 16:30:40 +0400
Subject: [PATCH 632/734] BE: RBAC: Implement an authorities extractor to
 support subject-level role matching (#3979)

Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 .../kafka/ui/config/auth/LdapProperties.java  |  2 +
 .../ui/config/auth/LdapSecurityConfig.java    | 35 ++++++---
 .../RbacLdapAuthoritiesExtractor.java         | 78 +++++++++++++++++++
 3 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
index 9d07aca2dd5..9eac9e5db01 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
@@ -15,6 +15,8 @@ public class LdapProperties {
   private String userFilterSearchBase;
   private String userFilterSearchFilter;
   private String groupFilterSearchBase;
+  private String groupFilterSearchFilter;
+  private String groupRoleAttribute;
 
   @Value("${oauth2.ldap.activeDirectory:false}")
   private boolean isActiveDirectory;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
index ce04a2e1659..b7750d528b8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
@@ -3,14 +3,16 @@
 import static com.provectus.kafka.ui.config.auth.AbstractAuthSecurityConfig.AUTH_WHITELIST;
 
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import com.provectus.kafka.ui.service.rbac.extractor.RbacLdapAuthoritiesExtractor;
 import java.util.Collection;
 import java.util.List;
-import javax.annotation.Nullable;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -50,9 +52,9 @@ public class LdapSecurityConfig {
 
   @Bean
   public ReactiveAuthenticationManager authenticationManager(BaseLdapPathContextSource contextSource,
-                                                             LdapAuthoritiesPopulator ldapAuthoritiesPopulator,
-                                                             @Nullable AccessControlService acs) {
-    var rbacEnabled = acs != null && acs.isRbacEnabled();
+                                                             LdapAuthoritiesPopulator authoritiesExtractor,
+                                                             AccessControlService acs) {
+    var rbacEnabled = acs.isRbacEnabled();
     BindAuthenticator ba = new BindAuthenticator(contextSource);
     if (props.getBase() != null) {
       ba.setUserDnPatterns(new String[] {props.getBase()});
@@ -67,7 +69,7 @@ public ReactiveAuthenticationManager authenticationManager(BaseLdapPathContextSo
     AbstractLdapAuthenticationProvider authenticationProvider;
     if (!props.isActiveDirectory()) {
       authenticationProvider = rbacEnabled
-          ? new LdapAuthenticationProvider(ba, ldapAuthoritiesPopulator)
+          ? new LdapAuthenticationProvider(ba, authoritiesExtractor)
           : new LdapAuthenticationProvider(ba);
     } else {
       authenticationProvider = new ActiveDirectoryLdapAuthenticationProvider(props.getActiveDirectoryDomain(),
@@ -97,11 +99,24 @@ public BaseLdapPathContextSource contextSource() {
 
   @Bean
   @Primary
-  public LdapAuthoritiesPopulator ldapAuthoritiesPopulator(BaseLdapPathContextSource contextSource) {
-    var authoritiesPopulator = new DefaultLdapAuthoritiesPopulator(contextSource, props.getGroupFilterSearchBase());
-    authoritiesPopulator.setRolePrefix("");
-    authoritiesPopulator.setConvertToUpperCase(false);
-    return authoritiesPopulator;
+  public DefaultLdapAuthoritiesPopulator ldapAuthoritiesExtractor(ApplicationContext context,
+                                                                  BaseLdapPathContextSource contextSource,
+                                                                  AccessControlService acs) {
+    var rbacEnabled = acs != null && acs.isRbacEnabled();
+
+    DefaultLdapAuthoritiesPopulator extractor;
+
+    if (rbacEnabled) {
+      extractor = new RbacLdapAuthoritiesExtractor(context, contextSource, props.getGroupFilterSearchBase());
+    } else {
+      extractor = new DefaultLdapAuthoritiesPopulator(contextSource, props.getGroupFilterSearchBase());
+    }
+
+    Optional.ofNullable(props.getGroupFilterSearchFilter()).ifPresent(extractor::setGroupSearchFilter);
+    extractor.setRolePrefix("");
+    extractor.setConvertToUpperCase(false);
+    extractor.setSearchSubtree(true);
+    return extractor;
   }
 
   @Bean
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java
new file mode 100644
index 00000000000..ba30eb5cc38
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/RbacLdapAuthoritiesExtractor.java
@@ -0,0 +1,78 @@
+package com.provectus.kafka.ui.service.rbac.extractor;
+
+import com.provectus.kafka.ui.config.auth.LdapProperties;
+import com.provectus.kafka.ui.model.rbac.Role;
+import com.provectus.kafka.ui.model.rbac.provider.Provider;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationContext;
+import org.springframework.ldap.core.DirContextOperations;
+import org.springframework.ldap.core.support.BaseLdapPathContextSource;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator;
+import org.springframework.util.Assert;
+
+@Slf4j
+public class RbacLdapAuthoritiesExtractor extends DefaultLdapAuthoritiesPopulator {
+
+  private final AccessControlService acs;
+  private final LdapProperties props;
+
+  public RbacLdapAuthoritiesExtractor(ApplicationContext context,
+                                      BaseLdapPathContextSource contextSource, String groupFilterSearchBase) {
+    super(contextSource, groupFilterSearchBase);
+    this.acs = context.getBean(AccessControlService.class);
+    this.props = context.getBean(LdapProperties.class);
+  }
+
+  @Override
+  protected Set<GrantedAuthority> getAdditionalRoles(DirContextOperations user, String username) {
+    var ldapGroups = getRoles(user.getNameInNamespace(), username);
+
+    return acs.getRoles()
+        .stream()
+        .filter(r -> r.getSubjects()
+            .stream()
+            .filter(subject -> subject.getProvider().equals(Provider.LDAP))
+            .filter(subject -> subject.getType().equals("group"))
+            .anyMatch(subject -> ldapGroups.contains(subject.getValue()))
+        )
+        .map(Role::getName)
+        .peek(role -> log.trace("Mapped role [{}] for user [{}]", role, username))
+        .map(SimpleGrantedAuthority::new)
+        .collect(Collectors.toSet());
+  }
+
+  private Set<String> getRoles(String userDn, String username) {
+    var groupSearchBase = props.getGroupFilterSearchBase();
+    Assert.notNull(groupSearchBase, "groupSearchBase is empty");
+
+    var groupRoleAttribute = props.getGroupRoleAttribute();
+    if (groupRoleAttribute == null) {
+
+      groupRoleAttribute = "cn";
+    }
+
+    log.trace(
+        "Searching for roles for user [{}] with DN [{}], groupRoleAttribute [{}] and filter [{}] in search base [{}]",
+        username, userDn, groupRoleAttribute, getGroupSearchFilter(), groupSearchBase);
+
+    var ldapTemplate = getLdapTemplate();
+    ldapTemplate.setIgnoreNameNotFoundException(true);
+
+    Set<Map<String, List<String>>> userRoles = ldapTemplate.searchForMultipleAttributeValues(
+        groupSearchBase, getGroupSearchFilter(), new String[] {userDn, username},
+        new String[] {groupRoleAttribute});
+
+    return userRoles.stream()
+        .map(record -> record.get(getGroupRoleAttribute()).get(0))
+        .peek(group -> log.trace("Found LDAP group [{}] for user [{}]", group, username))
+        .collect(Collectors.toSet());
+  }
+
+}

From 401c9f12c1b0f436006ecec80ac681098a5f6ec4 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 27 Jun 2023 21:07:54 +0800
Subject: [PATCH 633/734] Refactor workflow names

---
 .github/workflows/aws_publisher.yaml             | 2 +-
 .github/workflows/backend.yml                    | 2 +-
 .github/workflows/block_merge.yml                | 2 +-
 .github/workflows/branch-deploy.yml              | 2 +-
 .github/workflows/branch-remove.yml              | 2 +-
 .github/workflows/build-public-image.yml         | 2 +-
 .github/workflows/delete-public-image.yml        | 2 +-
 .github/workflows/documentation.yaml             | 2 +-
 .github/workflows/e2e-automation.yml             | 2 +-
 .github/workflows/e2e-checks.yaml                | 2 +-
 .github/workflows/e2e-manual.yml                 | 2 +-
 .github/workflows/e2e-weekly.yml                 | 2 +-
 .github/workflows/frontend.yaml                  | 2 +-
 .github/workflows/master.yaml                    | 2 +-
 .github/workflows/pr-checks.yaml                 | 2 +-
 .github/workflows/release-serde-api.yaml         | 2 +-
 .github/workflows/release.yaml                   | 2 +-
 .github/workflows/release_drafter.yml            | 2 +-
 .github/workflows/separate_env_public_create.yml | 2 +-
 .github/workflows/separate_env_public_remove.yml | 2 +-
 .github/workflows/stale.yaml                     | 2 +-
 .github/workflows/terraform-deploy.yml           | 2 +-
 .github/workflows/triage_issues.yml              | 2 +-
 .github/workflows/triage_prs.yml                 | 2 +-
 .github/workflows/workflow_linter.yaml           | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/aws_publisher.yaml b/.github/workflows/aws_publisher.yaml
index ccd03def3fd..4aa59876c6c 100644
--- a/.github/workflows/aws_publisher.yaml
+++ b/.github/workflows/aws_publisher.yaml
@@ -1,4 +1,4 @@
-name: AWS Marketplace Publisher
+name: "Infra: Release: AWS Marketplace Publisher"
 on:
   workflow_dispatch:
     inputs:
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index dc4700458f2..4bc5b22621a 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -1,4 +1,4 @@
-name: Backend build and test
+name: "Backend: PR/master build & test"
 on:
   push:
     branches:
diff --git a/.github/workflows/block_merge.yml b/.github/workflows/block_merge.yml
index 1eb64d58e69..c689d45b0d7 100644
--- a/.github/workflows/block_merge.yml
+++ b/.github/workflows/block_merge.yml
@@ -1,4 +1,4 @@
-name: Pull Request Labels
+name: "Infra: PR block merge"
 on:
   pull_request:
     types: [opened, labeled, unlabeled, synchronize]
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 880633f44e0..5ba69390fcd 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -1,4 +1,4 @@
-name: Feature testing init
+name: "Infra: Feature Testing: Init env"
 on:
   workflow_dispatch:
 
diff --git a/.github/workflows/branch-remove.yml b/.github/workflows/branch-remove.yml
index a891232fad2..d32e1d4edb6 100644
--- a/.github/workflows/branch-remove.yml
+++ b/.github/workflows/branch-remove.yml
@@ -1,4 +1,4 @@
-name: Feature testing destroy
+name: "Infra: Feature Testing: Destroy env"
 on:
   workflow_dispatch:
   pull_request:
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index df939682b68..dc01cff1318 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -1,4 +1,4 @@
-name: Build Docker image and push
+name: "Infra: Image Testing: Deploy"
 on:
   workflow_dispatch:
   pull_request:
diff --git a/.github/workflows/delete-public-image.yml b/.github/workflows/delete-public-image.yml
index 50372ef751f..37391bd9bd7 100644
--- a/.github/workflows/delete-public-image.yml
+++ b/.github/workflows/delete-public-image.yml
@@ -1,4 +1,4 @@
-name: Delete Public ECR Image
+name: "Infra: Image Testing: Delete"
 on:
   workflow_dispatch:
   pull_request:
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
index 70fff483dab..a0726c204a3 100644
--- a/.github/workflows/documentation.yaml
+++ b/.github/workflows/documentation.yaml
@@ -1,4 +1,4 @@
-name: Documentation URLs linter
+name: "Infra: Docs: URL linter"
 on:
   pull_request:
     types:
diff --git a/.github/workflows/e2e-automation.yml b/.github/workflows/e2e-automation.yml
index 5ce14376141..ab5d781b387 100644
--- a/.github/workflows/e2e-automation.yml
+++ b/.github/workflows/e2e-automation.yml
@@ -1,4 +1,4 @@
-name: E2E Automation suite
+name: "E2E: Automation suite"
 on:
   workflow_dispatch:
     inputs:
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 93bc1a33ab1..8d34a5bd243 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -1,4 +1,4 @@
-name: E2E PR health check
+name: "E2E: PR healthcheck"
 on:
   pull_request_target:
     types: [ "opened", "edited", "reopened", "synchronize" ]
diff --git a/.github/workflows/e2e-manual.yml b/.github/workflows/e2e-manual.yml
index 68963e29faa..31cd3bdf642 100644
--- a/.github/workflows/e2e-manual.yml
+++ b/.github/workflows/e2e-manual.yml
@@ -1,4 +1,4 @@
-name: E2E Manual suite
+name: "E2E: Manual suite"
 on:
   workflow_dispatch:
     inputs:
diff --git a/.github/workflows/e2e-weekly.yml b/.github/workflows/e2e-weekly.yml
index ea5ca7e522d..78363de8d8d 100644
--- a/.github/workflows/e2e-weekly.yml
+++ b/.github/workflows/e2e-weekly.yml
@@ -1,4 +1,4 @@
-name: E2E Weekly suite
+name: "E2E: Weekly suite"
 on:
   schedule:
     - cron: '0 1 * * 1'
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 05ef18e3839..03440c3737e 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -1,4 +1,4 @@
-name: Frontend build and test
+name: "Frontend: PR/master build & test"
 on:
   push:
     branches:
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 6850356f561..48581359894 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -1,4 +1,4 @@
-name: Master branch build & deploy
+name: "Master: Build & deploy"
 on:
   workflow_dispatch:
   push:
diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
index e57bb71aed5..af611bb9c7e 100644
--- a/.github/workflows/pr-checks.yaml
+++ b/.github/workflows/pr-checks.yaml
@@ -1,4 +1,4 @@
-name: "PR Checklist checked"
+name: "PR: Checklist linter"
 on:
   pull_request_target:
     types: [opened, edited, synchronize, reopened]
diff --git a/.github/workflows/release-serde-api.yaml b/.github/workflows/release-serde-api.yaml
index e9a35ee30ea..44e5babc7e9 100644
--- a/.github/workflows/release-serde-api.yaml
+++ b/.github/workflows/release-serde-api.yaml
@@ -1,4 +1,4 @@
-name: Release serde api
+name: "Infra: Release: Serde API"
 on: workflow_dispatch
 
 jobs:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 310267e294c..b927806f146 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,4 +1,4 @@
-name: Release
+name: "Infra: Release"
 on:
   release:
     types: [published]
diff --git a/.github/workflows/release_drafter.yml b/.github/workflows/release_drafter.yml
index e9516cb6633..d313edac3c4 100644
--- a/.github/workflows/release_drafter.yml
+++ b/.github/workflows/release_drafter.yml
@@ -1,4 +1,4 @@
-name: Release Drafter
+name: "Infra: Release Drafter run"
 
 on:
   push:
diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
index 3f12ce1f548..dd4506d3ba2 100644
--- a/.github/workflows/separate_env_public_create.yml
+++ b/.github/workflows/separate_env_public_create.yml
@@ -1,4 +1,4 @@
-name: Separate environment create
+name: "Infra: Feature Testing Public: Init env"
 on:
   workflow_dispatch:
     inputs:
diff --git a/.github/workflows/separate_env_public_remove.yml b/.github/workflows/separate_env_public_remove.yml
index dce30ee350c..145be002c9f 100644
--- a/.github/workflows/separate_env_public_remove.yml
+++ b/.github/workflows/separate_env_public_remove.yml
@@ -1,4 +1,4 @@
-name: Separate environment remove
+name: "Infra: Feature Testing Public: Destroy env"
 on:
   workflow_dispatch:
     inputs:
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
index dcf39ab003e..cb9870c5208 100644
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -1,4 +1,4 @@
-name: 'Close stale issues'
+name: 'Infra: Close stale issues'
 on:
   schedule:
     - cron: '30 1 * * *'
diff --git a/.github/workflows/terraform-deploy.yml b/.github/workflows/terraform-deploy.yml
index 902f9c385b2..1b4b367979c 100644
--- a/.github/workflows/terraform-deploy.yml
+++ b/.github/workflows/terraform-deploy.yml
@@ -1,4 +1,4 @@
-name: Terraform deploy
+name: "Infra: Terraform deploy"
 on:
   workflow_dispatch:
     inputs:
diff --git a/.github/workflows/triage_issues.yml b/.github/workflows/triage_issues.yml
index 8009a2a64bd..344ba5c118d 100644
--- a/.github/workflows/triage_issues.yml
+++ b/.github/workflows/triage_issues.yml
@@ -1,4 +1,4 @@
-name: Add triage label to new issues
+name: "Infra: Triage: Apply triage label for issues"
 on:
   issues:
     types:
diff --git a/.github/workflows/triage_prs.yml b/.github/workflows/triage_prs.yml
index 90d76936036..6906cd8a8a5 100644
--- a/.github/workflows/triage_prs.yml
+++ b/.github/workflows/triage_prs.yml
@@ -1,4 +1,4 @@
-name: Add triage label to new PRs
+name: "Infra: Triage: Apply triage label for PRs"
 on:
   pull_request:
     types:
diff --git a/.github/workflows/workflow_linter.yaml b/.github/workflows/workflow_linter.yaml
index b4af45d57ef..df9983a5301 100644
--- a/.github/workflows/workflow_linter.yaml
+++ b/.github/workflows/workflow_linter.yaml
@@ -1,4 +1,4 @@
-name: "Workflow linter"
+name: "Infra: Workflow linter"
 on:
   pull_request:
     types:

From 50b9c561121d952543a725d5996104ddfc23aa3e Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 28 Jun 2023 11:12:46 +0400
Subject: [PATCH 634/734] ODD: Skipping topic exporting if we failed to
 load/parse topic's schema from SR (#3980)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/service/integration/odd/OddExporter.java  |  9 +++------
 .../ui/service/integration/odd/TopicsExporter.java     | 10 +++++-----
 .../ui/service/integration/odd/TopicsExporterTest.java |  4 +++-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporter.java
index 2917e811bed..c95062cc1ef 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/OddExporter.java
@@ -5,13 +5,10 @@
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.service.KafkaConnectService;
 import com.provectus.kafka.ui.service.StatisticsCache;
-import java.util.List;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
-import lombok.SneakyThrows;
 import org.opendatadiscovery.client.ApiClient;
 import org.opendatadiscovery.client.api.OpenDataDiscoveryIngestionApi;
-import org.opendatadiscovery.client.model.DataEntity;
 import org.opendatadiscovery.client.model.DataEntityList;
 import org.opendatadiscovery.client.model.DataSource;
 import org.opendatadiscovery.client.model.DataSourceList;
@@ -68,14 +65,14 @@ public Mono<Void> export(KafkaCluster cluster) {
   private Mono<Void> exportTopics(KafkaCluster c) {
     return createKafkaDataSource(c)
         .thenMany(topicsExporter.export(c))
-        .concatMap(this::sentDataEntities)
+        .concatMap(this::sendDataEntities)
         .then();
   }
 
   private Mono<Void> exportKafkaConnects(KafkaCluster cluster) {
     return createConnectDataSources(cluster)
         .thenMany(connectorsExporter.export(cluster))
-        .concatMap(this::sentDataEntities)
+        .concatMap(this::sendDataEntities)
         .then();
   }
 
@@ -99,7 +96,7 @@ private Mono<Void> createKafkaDataSource(KafkaCluster cluster) {
     );
   }
 
-  private Mono<Void> sentDataEntities(DataEntityList dataEntityList) {
+  private Mono<Void> sendDataEntities(DataEntityList dataEntityList) {
     return oddApi.postDataEntityList(dataEntityList);
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java
index ad72e6f1dce..2426c538086 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java
@@ -38,6 +38,8 @@ Flux<DataEntityList> export(KafkaCluster cluster) {
     return Flux.fromIterable(stats.getTopicDescriptions().keySet())
         .filter(topicFilter)
         .flatMap(topic -> createTopicDataEntity(cluster, topic, stats))
+        .onErrorContinue(
+            (th, topic) -> log.warn("Error exporting data for topic {}, cluster {}", topic, cluster.getName(), th))
         .buffer(100)
         .map(topicsEntities ->
             new DataEntityList()
@@ -89,10 +91,10 @@ private Map<String, Object> getTopicMetadata(String topic, Statistics stats) {
         .build();
   }
 
+  //returns empty list if schemaRegistry is not configured or assumed subject not found
   private Mono<List<DataSetField>> getTopicSchema(KafkaCluster cluster,
                                                   String topic,
                                                   KafkaPath topicOddrn,
-                                                  //currently we only retrieve value schema
                                                   boolean isKey) {
     if (cluster.getSchemaRegistryClient() == null) {
       return Mono.just(List.of());
@@ -102,10 +104,8 @@ private Mono<List<DataSetField>> getTopicSchema(KafkaCluster cluster,
         .mono(client -> client.getSubjectVersion(subject, "latest"))
         .map(subj -> DataSetFieldsExtractors.extract(subj, topicOddrn, isKey))
         .onErrorResume(WebClientResponseException.NotFound.class, th -> Mono.just(List.of()))
-        .onErrorResume(th -> true, th -> {
-          log.warn("Error retrieving subject {} for cluster {}", subject, cluster.getName(), th);
-          return Mono.just(List.of());
-        });
+        .onErrorMap(WebClientResponseException.class, err ->
+            new IllegalStateException("Error retrieving subject %s".formatted(subject), err));
   }
 
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java
index 4d512612a67..8673b469d6e 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java
@@ -22,6 +22,8 @@
 import org.junit.jupiter.api.Test;
 import org.opendatadiscovery.client.model.DataEntity;
 import org.opendatadiscovery.client.model.DataEntityType;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
@@ -53,7 +55,7 @@ void init() {
   @Test
   void doesNotExportTopicsWhichDontFitFiltrationRule() {
     when(schemaRegistryClientMock.getSubjectVersion(anyString(), anyString()))
-        .thenReturn(Mono.error(new RuntimeException("Not found")));
+        .thenReturn(Mono.error(WebClientResponseException.create(404, "NF", new HttpHeaders(), null, null, null)));
 
     stats = Statistics.empty()
         .toBuilder()

From be2f9f0605b8dda210360caa693e3b5f58c752f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 16:13:41 +0400
Subject: [PATCH 635/734] Bump org.mapstruct.version from 1.4.2.Final to
 1.5.5.Final (#3707)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f2298dddbc8..e9885056a84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
         <groovy.version>3.0.13</groovy.version>
         <jackson.version>2.14.0</jackson.version>
         <kafka-clients.version>3.3.1</kafka-clients.version>
-        <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
+        <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
         <org.projectlombok.version>1.18.24</org.projectlombok.version>
         <protobuf-java.version>3.21.9</protobuf-java.version>
         <scala-lang.library.version>2.13.9</scala-lang.library.version>

From d26490e82e00cca75ec579058f43d248e00c2a1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 14:44:15 +0400
Subject: [PATCH 636/734] Bump slf4j-simple from 2.0.5 to 2.0.7 (#3987)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 835013c37cc..27594cc18fa 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -24,7 +24,7 @@
         <aspectj.version>1.9.9.1</aspectj.version>
         <assertj.version>3.24.2</assertj.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <slf4j.version>2.0.5</slf4j.version>
+        <slf4j.version>2.0.7</slf4j.version>
         <kafka.version>3.3.1</kafka.version>
     </properties>
 

From 0c732db4367b1c2485657ca2efee6f0d3dfc55c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 14:44:38 +0400
Subject: [PATCH 637/734] Bump allure.version from 2.21.0 to 2.22.2 (#3967)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 27594cc18fa..30aed7b94b3 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -19,7 +19,7 @@
         <selenium.version>4.8.1</selenium.version>
         <selenide.version>6.12.3</selenide.version>
         <testng.version>7.7.1</testng.version>
-        <allure.version>2.21.0</allure.version>
+        <allure.version>2.22.2</allure.version>
         <qase.io.version>3.0.4</qase.io.version>
         <aspectj.version>1.9.9.1</aspectj.version>
         <assertj.version>3.24.2</assertj.version>

From e57b0bac43ed3eebe57bf0cccdf288f52382b3af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Jun 2023 11:20:53 +0000
Subject: [PATCH 638/734] Bump protobuf-java from 3.21.9 to 3.23.3 (#3966)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e9885056a84..41a51da19fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
         <kafka-clients.version>3.3.1</kafka-clients.version>
         <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
         <org.projectlombok.version>1.18.24</org.projectlombok.version>
-        <protobuf-java.version>3.21.9</protobuf-java.version>
+        <protobuf-java.version>3.23.3</protobuf-java.version>
         <scala-lang.library.version>2.13.9</scala-lang.library.version>
         <snakeyaml.version>2.0</snakeyaml.version>
         <spring-boot.version>3.0.6</spring-boot.version>

From 216c87670d8f286314559348e77f378cb9a76896 Mon Sep 17 00:00:00 2001
From: seono <47937302+seono@users.noreply.github.com>
Date: Fri, 30 Jun 2023 20:26:55 +0900
Subject: [PATCH 639/734] FE: Consumers: Add a tooltip for a state (#3871)

Co-authored-by: seonho.jeong <seonho.jeong@navercorp.com>
---
 .../ConsumerGroups/Details/Details.tsx        | 20 +++++++++++++++----
 .../src/components/ConsumerGroups/List.tsx    | 18 ++++++++++++++---
 kafka-ui-react-app/src/lib/constants.ts       | 13 +++++++++++-
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
index b8fac73dc1e..f5cae44df72 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx
@@ -16,13 +16,15 @@ import { Table } from 'components/common/table/Table/Table.styled';
 import getTagColor from 'components/common/Tag/getTagColor';
 import { Dropdown } from 'components/common/Dropdown';
 import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
-import { Action, ResourceType } from 'generated-sources';
+import { Action, ConsumerGroupState, ResourceType } from 'generated-sources';
 import { ActionDropdownItem } from 'components/common/ActionComponent';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import {
   useConsumerGroupDetails,
   useDeleteConsumerGroupMutation,
 } from 'lib/hooks/api/consumers';
+import Tooltip from 'components/common/Tooltip/Tooltip';
+import { CONSUMER_GROUP_STATE_TOOLTIPS } from 'lib/constants';
 
 import ListItem from './ListItem';
 
@@ -96,9 +98,19 @@ const Details: React.FC = () => {
       <Metrics.Wrapper>
         <Metrics.Section>
           <Metrics.Indicator label="State">
-            <Tag color={getTagColor(consumerGroup.data?.state)}>
-              {consumerGroup.data?.state}
-            </Tag>
+            <Tooltip
+              value={
+                <Tag color={getTagColor(consumerGroup.data?.state)}>
+                  {consumerGroup.data?.state}
+                </Tag>
+              }
+              content={
+                CONSUMER_GROUP_STATE_TOOLTIPS[
+                  consumerGroup.data?.state || ConsumerGroupState.UNKNOWN
+                ]
+              }
+              placement="bottom-start"
+            />
           </Metrics.Indicator>
           <Metrics.Indicator label="Members">
             {consumerGroup.data?.members}
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
index 4d51b492485..247a18b0bd8 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
@@ -5,15 +5,17 @@ import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel
 import {
   ConsumerGroupDetails,
   ConsumerGroupOrdering,
+  ConsumerGroupState,
   SortOrder,
 } from 'generated-sources';
 import useAppParams from 'lib/hooks/useAppParams';
 import { clusterConsumerGroupDetailsPath, ClusterNameRoute } from 'lib/paths';
 import { ColumnDef } from '@tanstack/react-table';
-import Table, { TagCell, LinkCell } from 'components/common/NewTable';
+import Table, { LinkCell, TagCell } from 'components/common/NewTable';
 import { useNavigate, useSearchParams } from 'react-router-dom';
-import { PER_PAGE } from 'lib/constants';
+import { CONSUMER_GROUP_STATE_TOOLTIPS, PER_PAGE } from 'lib/constants';
 import { useConsumerGroups } from 'lib/hooks/api/consumers';
+import Tooltip from 'components/common/Tooltip/Tooltip';
 
 const List = () => {
   const { clusterName } = useAppParams<ClusterNameRoute>();
@@ -69,7 +71,17 @@ const List = () => {
         id: ConsumerGroupOrdering.STATE,
         header: 'State',
         accessorKey: 'state',
-        cell: TagCell,
+        // eslint-disable-next-line react/no-unstable-nested-components
+        cell: (args) => {
+          const value = args.getValue() as ConsumerGroupState;
+          return (
+            <Tooltip
+              value={<TagCell {...args} />}
+              content={CONSUMER_GROUP_STATE_TOOLTIPS[value]}
+              placement="bottom-end"
+            />
+          );
+        },
       },
     ],
     []
diff --git a/kafka-ui-react-app/src/lib/constants.ts b/kafka-ui-react-app/src/lib/constants.ts
index 8c9c6deb613..a3e622550b8 100644
--- a/kafka-ui-react-app/src/lib/constants.ts
+++ b/kafka-ui-react-app/src/lib/constants.ts
@@ -1,5 +1,5 @@
 import { SelectOption } from 'components/common/Select/Select';
-import { ConfigurationParameters } from 'generated-sources';
+import { ConfigurationParameters, ConsumerGroupState } from 'generated-sources';
 
 declare global {
   interface Window {
@@ -96,3 +96,14 @@ export const METRICS_OPTIONS: SelectOption[] = [
   { value: 'JMX', label: 'JMX' },
   { value: 'PROMETHEUS', label: 'PROMETHEUS' },
 ];
+
+export const CONSUMER_GROUP_STATE_TOOLTIPS: Record<ConsumerGroupState, string> =
+  {
+    EMPTY: 'The group exists but has no members.',
+    STABLE: 'Consumers are happily consuming and have assigned partitions.',
+    PREPARING_REBALANCE:
+      'Something has changed, and the reassignment of partitions is required.',
+    COMPLETING_REBALANCE: 'Partition reassignment is in progress.',
+    DEAD: 'The group is going to be removed. It might be due to the inactivity, or the group is being migrated to different group coordinator.',
+    UNKNOWN: '',
+  } as const;

From ab58618d830801655d652cbc9e3b13f1617dab13 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 30 Jun 2023 16:12:35 +0400
Subject: [PATCH 640/734] FE: Add robots.txt (#3995)

---
 kafka-ui-react-app/public/robots.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/public/robots.txt b/kafka-ui-react-app/public/robots.txt
index 01b0f9a1073..1f53798bb4f 100644
--- a/kafka-ui-react-app/public/robots.txt
+++ b/kafka-ui-react-app/public/robots.txt
@@ -1,2 +1,2 @@
-# https://www.robotstxt.org/robotstxt.html
 User-agent: *
+Disallow: /

From d572e43b4f978473292757862aff08452fac57fb Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Mon, 3 Jul 2023 16:31:53 +0400
Subject: [PATCH 641/734] Infra: Fix image build for non OCI-compliant runtimes
 (#3986)

Co-authored-by: Narek Matevosyan <nmatevosyan@provectus.com>
---
 .github/workflows/master.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 48581359894..d751e500210 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -58,6 +58,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           context: kafka-ui-api
           platforms: linux/amd64,linux/arm64
+          provenance: false
           push: true
           tags: |
             provectuslabs/kafka-ui:${{ steps.build.outputs.version }}

From 9ab4580c47151cd64e323f8c79efeddcf8d0adf8 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 4 Jul 2023 14:12:21 +0400
Subject: [PATCH 642/734] FE: Consumers: Replace zero consumer lag with "N/A"
 (#4009)

---
 kafka-ui-react-app/src/components/ConsumerGroups/List.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
index 247a18b0bd8..da35c6bbad6 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/List.tsx
@@ -61,6 +61,9 @@ const List = () => {
         id: ConsumerGroupOrdering.MESSAGES_BEHIND,
         header: 'Consumer Lag',
         accessorKey: 'consumerLag',
+        cell: (args) => {
+          return args.getValue() || 'N/A';
+        },
       },
       {
         header: 'Coordinator',

From 17cde82dff6f31f5ca0c79a213ae5ba28b784232 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Thu, 6 Jul 2023 19:46:02 +0800
Subject: [PATCH 643/734] Get rid of pull_request_target modes

---
 .github/workflows/backend.yml                         | 4 ++--
 .github/workflows/e2e-checks.yaml                     | 2 +-
 .github/workflows/frontend.yaml                       | 2 +-
 .github/workflows/pr-checks.yaml                      | 2 +-
 .github/workflows/welcome-first-time-contributors.yml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 4bc5b22621a..911c5c7de32 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - master
-  pull_request_target:
+  pull_request:
     types: ["opened", "edited", "reopened", "synchronize"]
     paths:
       - "kafka-ui-api/**"
@@ -29,7 +29,7 @@ jobs:
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Build and analyze pull request target
-        if: ${{ github.event_name == 'pull_request_target' }}
+        if: ${{ github.event_name == 'pull_request' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_BACKEND }}
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 8d34a5bd243..745be782289 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -1,6 +1,6 @@
 name: "E2E: PR healthcheck"
 on:
-  pull_request_target:
+  pull_request:
     types: [ "opened", "edited", "reopened", "synchronize" ]
     paths:
       - "kafka-ui-api/**"
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 03440c3737e..1b1c79944a3 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - master
-  pull_request_target:
+  pull_request:
     types: ["opened", "edited", "reopened", "synchronize"]
     paths:
       - "kafka-ui-contract/**"
diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
index af611bb9c7e..84e58b68c11 100644
--- a/.github/workflows/pr-checks.yaml
+++ b/.github/workflows/pr-checks.yaml
@@ -1,6 +1,6 @@
 name: "PR: Checklist linter"
 on:
-  pull_request_target:
+  pull_request:
     types: [opened, edited, synchronize, reopened]
 
 jobs:
diff --git a/.github/workflows/welcome-first-time-contributors.yml b/.github/workflows/welcome-first-time-contributors.yml
index b0258c9235b..5f662b71c63 100644
--- a/.github/workflows/welcome-first-time-contributors.yml
+++ b/.github/workflows/welcome-first-time-contributors.yml
@@ -1,7 +1,7 @@
 name: Welcome first time contributors
 
 on:
-  pull_request_target:
+  pull_request:
     types:
       - opened
   issues:

From 5f231c7681bb6558e0367df22d92f1099e2cac94 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 10 Jul 2023 16:18:05 +0400
Subject: [PATCH 644/734] FE: Fix Messages: Produce: "Keep contents" not
 re-generated (#4008)

---
 .../Topic/Messages/getDefaultSerdeName.ts     |  4 ++--
 .../Topics/Topic/SendMessage/SendMessage.tsx  |  4 ++--
 .../Topics/Topic/SendMessage/utils.ts         | 20 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Messages/getDefaultSerdeName.ts b/kafka-ui-react-app/src/components/Topics/Topic/Messages/getDefaultSerdeName.ts
index 27fc112c819..a5235e9ac5b 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Messages/getDefaultSerdeName.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Messages/getDefaultSerdeName.ts
@@ -1,8 +1,8 @@
 import { SerdeDescription } from 'generated-sources';
-import { getPrefferedDescription } from 'components/Topics/Topic/SendMessage/utils';
+import { getPreferredDescription } from 'components/Topics/Topic/SendMessage/utils';
 
 export const getDefaultSerdeName = (serdes: SerdeDescription[]) => {
-  const preffered = getPrefferedDescription(serdes);
+  const preffered = getPreferredDescription(serdes);
   if (preffered) {
     return preffered.name || '';
   }
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
index b7f31a230bd..bef7a4dddb5 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/SendMessage.tsx
@@ -118,8 +118,8 @@ const SendMessage: React.FC<{ closeSidebar: () => void }> = ({
         valueSerde,
       });
       if (!keepContents) {
-        setValue('key', '');
-        setValue('content', '');
+        setValue('key', defaultValues.key || '');
+        setValue('content', defaultValues.content || '');
         closeSidebar();
       }
     } catch (e) {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
index 6f98c5916d3..c8161b0c823 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/SendMessage/utils.ts
@@ -13,21 +13,21 @@ jsf.option('fillProperties', false);
 jsf.option('alwaysFakeOptionals', true);
 jsf.option('failOnInvalidFormat', false);
 
-const generateValueFromSchema = (preffered?: SerdeDescription) => {
-  if (!preffered?.schema) {
+const generateValueFromSchema = (preferred?: SerdeDescription) => {
+  if (!preferred?.schema) {
     return undefined;
   }
-  const parsedSchema = JSON.parse(preffered.schema);
+  const parsedSchema = JSON.parse(preferred.schema);
   const value = jsf.generate(parsedSchema);
   return JSON.stringify(value);
 };
 
-export const getPrefferedDescription = (serdes: SerdeDescription[]) =>
+export const getPreferredDescription = (serdes: SerdeDescription[]) =>
   serdes.find((s) => s.preferred);
 
 export const getDefaultValues = (serdes: TopicSerdeSuggestion) => {
-  const keySerde = getPrefferedDescription(serdes.key || []);
-  const valueSerde = getPrefferedDescription(serdes.value || []);
+  const keySerde = getPreferredDescription(serdes.key || []);
+  const valueSerde = getPreferredDescription(serdes.value || []);
 
   return {
     key: generateValueFromSchema(keySerde),
@@ -65,15 +65,15 @@ export const validateBySchema = (
     return errors;
   }
 
-  let parcedSchema;
+  let parsedSchema;
   let parsedValue;
 
   try {
-    parcedSchema = JSON.parse(schema);
+    parsedSchema = JSON.parse(schema);
   } catch (e) {
     return [`Error in parsing the "${type}" field schema`];
   }
-  if (parcedSchema.type === 'string') {
+  if (parsedSchema.type === 'string') {
     return [];
   }
   try {
@@ -84,7 +84,7 @@ export const validateBySchema = (
   try {
     const ajv = new Ajv();
     addFormats(ajv);
-    const validate = ajv.compile(parcedSchema);
+    const validate = ajv.compile(parsedSchema);
     validate(parsedValue);
     if (validate.errors) {
       errors = validate.errors.map(

From 8ae8ae40a43331b90a095ad884e0ce789c594644 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 11 Jul 2023 00:02:27 +0800
Subject: [PATCH 645/734] CVE fixes, July 23 (#4003)

---
 kafka-ui-api/pom.xml                          |  2 +-
 .../kafka/ui/AbstractIntegrationTest.java     |  8 ++-
 .../ui/service/ksql/KsqlApiClientTest.java    | 56 +++++++------------
 .../ui/service/ksql/KsqlServiceV2Test.java    |  6 --
 pom.xml                                       |  6 +-
 5 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index a01300167c4..829f7dc5c50 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>software.amazon.msk</groupId>
             <artifactId>aws-msk-iam-auth</artifactId>
-            <version>1.1.6</version>
+            <version>1.1.7</version>
         </dependency>
 
         <dependency>
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
index 1651f4951df..314abf914b0 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui;
 
 import com.provectus.kafka.ui.container.KafkaConnectContainer;
+import com.provectus.kafka.ui.container.KsqlDbContainer;
 import com.provectus.kafka.ui.container.SchemaRegistryContainer;
 import java.nio.file.Path;
 import java.util.List;
@@ -32,7 +33,7 @@ public abstract class AbstractIntegrationTest {
   public static final String LOCAL = "local";
   public static final String SECOND_LOCAL = "secondLocal";
 
-  private static final String CONFLUENT_PLATFORM_VERSION = "5.5.0";
+  private static final String CONFLUENT_PLATFORM_VERSION = "7.2.1"; // Append ".arm64" for a local run
 
   public static final KafkaContainer kafka = new KafkaContainer(
       DockerImageName.parse("confluentinc/cp-kafka").withTag(CONFLUENT_PLATFORM_VERSION))
@@ -49,6 +50,11 @@ public abstract class AbstractIntegrationTest {
           .dependsOn(kafka)
           .dependsOn(schemaRegistry);
 
+  protected static final KsqlDbContainer KSQL_DB = new KsqlDbContainer(
+      DockerImageName.parse("confluentinc/cp-ksqldb-server")
+          .withTag(CONFLUENT_PLATFORM_VERSION))
+      .withKafka(kafka);
+
   @TempDir
   public static Path tmpDir;
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
index cde000ac6ec..f266e07c6d5 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlApiClientTest.java
@@ -3,28 +3,22 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.DoubleNode;
+import com.fasterxml.jackson.databind.node.DecimalNode;
 import com.fasterxml.jackson.databind.node.IntNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.provectus.kafka.ui.AbstractIntegrationTest;
-import com.provectus.kafka.ui.container.KsqlDbContainer;
+import java.math.BigDecimal;
 import java.time.Duration;
-import java.util.List;
 import java.util.Map;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.shaded.org.awaitility.Awaitility;
-import org.testcontainers.utility.DockerImageName;
 import reactor.test.StepVerifier;
 
 class KsqlApiClientTest extends AbstractIntegrationTest {
 
-  private static final KsqlDbContainer KSQL_DB = new KsqlDbContainer(
-      DockerImageName.parse("confluentinc/ksqldb-server").withTag("0.24.0"))
-      .withKafka(kafka);
-
   @BeforeAll
   static void startContainer() {
     KSQL_DB.start();
@@ -72,7 +66,7 @@ void ksqTutorialQueriesWork() {
   private void assertLastKsqTutorialQueryResult(KsqlApiClient client) {
     // expected results:
     //{"header":"Schema","columnNames":[...],"values":null}
-    //{"header":"Row","columnNames":null,"values":[[0.0,["4ab5cbad","8b6eae59","4a7c7b41"],3]]}
+    //{"header":"Row","columnNames":null,"values":[[0,["4ab5cbad","8b6eae59","4a7c7b41"],3]]}
     //{"header":"Row","columnNames":null,"values":[[10.0,["18f4ea86"],1]]}
     StepVerifier.create(
             client.execute(
@@ -86,34 +80,26 @@ private void assertLastKsqTutorialQueryResult(KsqlApiClient client) {
           assertThat(header.getValues()).isNull();
         })
         .assertNext(row -> {
-          assertThat(row).isEqualTo(
-              KsqlApiClient.KsqlResponseTable.builder()
-                  .header("Row")
-                  .columnNames(null)
-                  .values(List.of(List.of(
-                      new DoubleNode(0.0),
-                      new ArrayNode(JsonNodeFactory.instance)
-                          .add(new TextNode("4ab5cbad"))
-                          .add(new TextNode("8b6eae59"))
-                          .add(new TextNode("4a7c7b41")),
-                      new IntNode(3)
-                  )))
-                  .build()
-          );
+          var distance = (DecimalNode) row.getValues().get(0).get(0);
+          var riders = (ArrayNode) row.getValues().get(0).get(1);
+          var count = (IntNode) row.getValues().get(0).get(2);
+
+          assertThat(distance).isEqualTo(new DecimalNode(new BigDecimal(0)));
+          assertThat(riders).isEqualTo(new ArrayNode(JsonNodeFactory.instance)
+              .add(new TextNode("4ab5cbad"))
+              .add(new TextNode("8b6eae59"))
+              .add(new TextNode("4a7c7b41")));
+          assertThat(count).isEqualTo(new IntNode(3));
         })
         .assertNext(row -> {
-          assertThat(row).isEqualTo(
-              KsqlApiClient.KsqlResponseTable.builder()
-                  .header("Row")
-                  .columnNames(null)
-                  .values(List.of(List.of(
-                      new DoubleNode(10.0),
-                      new ArrayNode(JsonNodeFactory.instance)
-                          .add(new TextNode("18f4ea86")),
-                      new IntNode(1)
-                  )))
-                  .build()
-          );
+          var distance = (DecimalNode) row.getValues().get(0).get(0);
+          var riders = (ArrayNode) row.getValues().get(0).get(1);
+          var count = (IntNode) row.getValues().get(0).get(2);
+
+          assertThat(distance).isEqualTo(new DecimalNode(new BigDecimal(10)));
+          assertThat(riders).isEqualTo(new ArrayNode(JsonNodeFactory.instance)
+              .add(new TextNode("18f4ea86")));
+          assertThat(count).isEqualTo(new IntNode(1));
         })
         .verifyComplete();
   }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
index afa3700c0fa..0e1717430ce 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/ksql/KsqlServiceV2Test.java
@@ -3,7 +3,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
-import com.provectus.kafka.ui.container.KsqlDbContainer;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.KsqlStreamDescriptionDTO;
 import com.provectus.kafka.ui.model.KsqlTableDescriptionDTO;
@@ -15,14 +14,9 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.utility.DockerImageName;
 
 class KsqlServiceV2Test extends AbstractIntegrationTest {
 
-  private static final KsqlDbContainer KSQL_DB = new KsqlDbContainer(
-      DockerImageName.parse("confluentinc/ksqldb-server").withTag("0.24.0"))
-      .withKafka(kafka);
-
   private static final Set<String> STREAMS_TO_DELETE = new CopyOnWriteArraySet<>();
   private static final Set<String> TABLES_TO_DELETE = new CopyOnWriteArraySet<>();
 
diff --git a/pom.xml b/pom.xml
index 41a51da19fe..a07f15f1a98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,17 +26,17 @@
         <assertj.version>3.19.0</assertj.version>
         <avro.version>1.11.1</avro.version>
         <byte-buddy.version>1.12.19</byte-buddy.version>
-        <confluent.version>7.3.3</confluent.version>
+        <confluent.version>7.4.0</confluent.version>
         <datasketches-java.version>3.1.0</datasketches-java.version>
         <groovy.version>3.0.13</groovy.version>
         <jackson.version>2.14.0</jackson.version>
-        <kafka-clients.version>3.3.1</kafka-clients.version>
+        <kafka-clients.version>3.5.0</kafka-clients.version>
         <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
         <org.projectlombok.version>1.18.24</org.projectlombok.version>
         <protobuf-java.version>3.23.3</protobuf-java.version>
         <scala-lang.library.version>2.13.9</scala-lang.library.version>
         <snakeyaml.version>2.0</snakeyaml.version>
-        <spring-boot.version>3.0.6</spring-boot.version>
+        <spring-boot.version>3.1.1</spring-boot.version>
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
         <odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
         <odd-oddrn-client.version>0.1.23</odd-oddrn-client.version>

From f124fa632d10aaad7d79c9ee0b00f32922079972 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jul 2023 20:10:29 +0400
Subject: [PATCH 646/734] Bump actions/setup-node from 3.6.0 to 3.7.0 (#4023)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 1b1c79944a3..125e4be71ce 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           version: 7.4.0
       - name: Install node
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.7.0
         with:
           node-version: "16.15.0"
           cache: "pnpm"

From d4001b5a39cba28f2cf4011ca62ed84056de081c Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 12 Jul 2023 14:47:38 +0400
Subject: [PATCH 647/734] SchemaRegistry references support (#3747)

1. references fields added to io dtos
2. json schema references parsing fixed (using confluent JsonSchema)
3. schema refs resolving added to ODD schema extractors
---
 .../kafka/ui/controller/TopicsController.java |  8 +-
 .../kafka/ui/mapper/KafkaSrMapper.java        |  8 +-
 .../builtin/sr/SchemaRegistrySerde.java       |  5 +-
 .../ui/service/SchemaRegistryService.java     |  5 +-
 .../odd/SchemaReferencesResolver.java         | 55 ++++++++++++
 .../integration/odd/TopicsExporter.java       | 17 +++-
 .../integration/odd/schema/AvroExtractor.java |  6 +-
 .../odd/schema/DataSetFieldsExtractors.java   | 18 +++-
 .../odd/schema/JsonSchemaExtractor.java       |  4 +-
 .../odd/schema/ProtoExtractor.java            |  5 +-
 .../kafka/ui/SchemaRegistryServiceTests.java  | 55 +++++++++++-
 .../odd/SchemaReferencesResolverTest.java     | 86 +++++++++++++++++++
 .../integration/odd/TopicsExporterTest.java   |  8 +-
 .../odd/schema/AvroExtractorTest.java         |  5 +-
 .../odd/schema/JsonSchemaExtractorTest.java   |  4 +-
 .../odd/schema/ProtoExtractorTest.java        |  5 +-
 .../main/resources/swagger/kafka-sr-api.yaml  |  8 ++
 .../main/resources/swagger/kafka-ui-api.yaml  | 25 +++++-
 18 files changed, 289 insertions(+), 38 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/SchemaReferencesResolver.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/SchemaReferencesResolverTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
index 04960cda69d..5ec0fbc642e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
@@ -123,9 +123,11 @@ public Mono<ResponseEntity<Void>> deleteTopic(
         .operationName("deleteTopic")
         .build();
 
-    return accessControlService.validateAccess(context).then(
-        topicsService.deleteTopic(getCluster(clusterName), topicName).map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    return accessControlService.validateAccess(context)
+        .then(
+            topicsService.deleteTopic(getCluster(clusterName), topicName)
+                .thenReturn(ResponseEntity.ok().<Void>build())
+        ).doOnEach(sig -> auditService.audit(context, sig));
   }
 
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaSrMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaSrMapper.java
index ea3435d4aa1..9a5f68cbd12 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaSrMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaSrMapper.java
@@ -3,18 +3,21 @@
 import com.provectus.kafka.ui.model.CompatibilityCheckResponseDTO;
 import com.provectus.kafka.ui.model.CompatibilityLevelDTO;
 import com.provectus.kafka.ui.model.NewSchemaSubjectDTO;
+import com.provectus.kafka.ui.model.SchemaReferenceDTO;
 import com.provectus.kafka.ui.model.SchemaSubjectDTO;
 import com.provectus.kafka.ui.model.SchemaTypeDTO;
 import com.provectus.kafka.ui.service.SchemaRegistryService;
 import com.provectus.kafka.ui.sr.model.Compatibility;
 import com.provectus.kafka.ui.sr.model.CompatibilityCheckResponse;
 import com.provectus.kafka.ui.sr.model.NewSubject;
+import com.provectus.kafka.ui.sr.model.SchemaReference;
 import com.provectus.kafka.ui.sr.model.SchemaType;
+import java.util.List;
 import java.util.Optional;
 import org.mapstruct.Mapper;
 
 
-@Mapper(componentModel = "spring")
+@Mapper
 public interface KafkaSrMapper {
 
   default SchemaSubjectDTO toDto(SchemaRegistryService.SubjectWithCompatibilityLevel s) {
@@ -24,9 +27,12 @@ default SchemaSubjectDTO toDto(SchemaRegistryService.SubjectWithCompatibilityLev
         .subject(s.getSubject())
         .schema(s.getSchema())
         .schemaType(SchemaTypeDTO.fromValue(Optional.ofNullable(s.getSchemaType()).orElse(SchemaType.AVRO).getValue()))
+        .references(toDto(s.getReferences()))
         .compatibilityLevel(s.getCompatibility().toString());
   }
 
+  List<SchemaReferenceDTO> toDto(List<SchemaReference> references);
+
   CompatibilityCheckResponseDTO toDto(CompatibilityCheckResponse ccr);
 
   CompatibilityLevelDTO.CompatibilityEnum toDto(Compatibility compatibility);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index c1fb203691c..4f6d4afe517 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -20,6 +20,7 @@
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClientConfig;
 import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException;
+import io.confluent.kafka.schemaregistry.json.JsonSchema;
 import io.confluent.kafka.schemaregistry.json.JsonSchemaProvider;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchemaProvider;
@@ -217,7 +218,9 @@ private String convertSchema(SchemaMetadata schema, ParsedSchema parsedSchema) {
       case AVRO -> new AvroJsonSchemaConverter()
           .convert(basePath, ((AvroSchema) parsedSchema).rawSchema())
           .toJson();
-      case JSON -> schema.getSchema();
+      case JSON ->
+        //need to use confluent JsonSchema since it includes resolved references
+        ((JsonSchema) parsedSchema).rawSchema().toString();
     };
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
index f98bb5d376c..cae29ba93d6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
@@ -14,8 +14,7 @@
 import com.provectus.kafka.ui.sr.model.NewSubject;
 import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import com.provectus.kafka.ui.util.ReactiveFailover;
-import com.provectus.kafka.ui.util.WebClientConfigurator;
-import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
@@ -92,7 +91,7 @@ public Mono<SubjectWithCompatibilityLevel> getLatestSchemaVersionBySubject(Kafka
   private Mono<SubjectWithCompatibilityLevel> getSchemaSubject(KafkaCluster cluster, String schemaName,
                                                                String version) {
     return api(cluster)
-        .mono(c -> c.getSubjectVersion(schemaName, version))
+        .mono(c -> c.getSubjectVersion(schemaName, version, false))
         .zipWith(getSchemaCompatibilityInfoOrGlobal(cluster, schemaName))
         .map(t -> new SubjectWithCompatibilityLevel(t.getT1(), t.getT2()))
         .onErrorResume(WebClientResponseException.NotFound.class, th -> Mono.error(new SchemaNotFoundException()));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/SchemaReferencesResolver.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/SchemaReferencesResolver.java
new file mode 100644
index 00000000000..4ff1f8695b3
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/SchemaReferencesResolver.java
@@ -0,0 +1,55 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
+import com.provectus.kafka.ui.sr.model.SchemaReference;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nullable;
+import reactor.core.publisher.Mono;
+
+// logic copied from AbstractSchemaProvider:resolveReferences
+// https://github.com/confluentinc/schema-registry/blob/fd59613e2c5adf62e36705307f420712e4c8c1ea/client/src/main/java/io/confluent/kafka/schemaregistry/AbstractSchemaProvider.java#L54
+class SchemaReferencesResolver {
+
+  private final KafkaSrClientApi client;
+
+  SchemaReferencesResolver(KafkaSrClientApi client) {
+    this.client = client;
+  }
+
+  Mono<ImmutableMap<String, String>> resolve(List<SchemaReference> refs) {
+    return resolveReferences(refs, new Resolving(ImmutableMap.of(), ImmutableSet.of()))
+        .map(Resolving::resolved);
+  }
+
+  private record Resolving(ImmutableMap<String, String> resolved, ImmutableSet<String> visited) {
+
+    Resolving visit(String name) {
+      return new Resolving(resolved, ImmutableSet.<String>builder().addAll(visited).add(name).build());
+    }
+
+    Resolving resolve(String ref, String schema) {
+      return new Resolving(ImmutableMap.<String, String>builder().putAll(resolved).put(ref, schema).build(), visited);
+    }
+  }
+
+  private Mono<Resolving> resolveReferences(@Nullable List<SchemaReference> refs, Resolving initState) {
+    Mono<Resolving> result = Mono.just(initState);
+    for (SchemaReference reference : Optional.ofNullable(refs).orElse(List.of())) {
+      result = result.flatMap(state -> {
+        if (state.visited().contains(reference.getName())) {
+          return Mono.just(state);
+        } else {
+          final var newState = state.visit(reference.getName());
+          return client.getSubjectVersion(reference.getSubject(), String.valueOf(reference.getVersion()), true)
+              .flatMap(subj ->
+                  resolveReferences(subj.getReferences(), newState)
+                      .map(withNewRefs -> withNewRefs.resolve(reference.getName(), subj.getSchema())));
+        }
+      });
+    }
+    return result;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java
index 2426c538086..8f4ef2781be 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporter.java
@@ -5,6 +5,7 @@
 import com.provectus.kafka.ui.model.Statistics;
 import com.provectus.kafka.ui.service.StatisticsCache;
 import com.provectus.kafka.ui.service.integration.odd.schema.DataSetFieldsExtractors;
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
@@ -24,6 +25,8 @@
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -100,12 +103,20 @@ private Mono<List<DataSetField>> getTopicSchema(KafkaCluster cluster,
       return Mono.just(List.of());
     }
     String subject = topic + (isKey ? "-key" : "-value");
-    return cluster.getSchemaRegistryClient()
-        .mono(client -> client.getSubjectVersion(subject, "latest"))
-        .map(subj -> DataSetFieldsExtractors.extract(subj, topicOddrn, isKey))
+    return getSubjWithResolvedRefs(cluster, subject)
+        .map(t -> DataSetFieldsExtractors.extract(t.getT1(), t.getT2(), topicOddrn, isKey))
         .onErrorResume(WebClientResponseException.NotFound.class, th -> Mono.just(List.of()))
         .onErrorMap(WebClientResponseException.class, err ->
             new IllegalStateException("Error retrieving subject %s".formatted(subject), err));
   }
 
+  private Mono<Tuple2<SchemaSubject, Map<String, String>>> getSubjWithResolvedRefs(KafkaCluster cluster,
+                                                                                   String subjectName) {
+    return cluster.getSchemaRegistryClient()
+        .mono(client ->
+            client.getSubjectVersion(subjectName, "latest", false)
+                .flatMap(subj -> new SchemaReferencesResolver(client).resolve(subj.getReferences())
+                    .map(resolvedRefs -> Tuples.of(subj, resolvedRefs))));
+  }
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java
index cc799a9e109..f9423962933 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractor.java
@@ -1,7 +1,7 @@
 package com.provectus.kafka.ui.service.integration.odd.schema;
 
 import com.google.common.collect.ImmutableSet;
-import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import io.confluent.kafka.schemaregistry.avro.AvroSchema;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.avro.Schema;
@@ -14,8 +14,8 @@ final class AvroExtractor {
   private AvroExtractor() {
   }
 
-  static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
-    var schema = new Schema.Parser().parse(subject.getSchema());
+  static List<DataSetField> extract(AvroSchema avroSchema, KafkaPath topicOddrn, boolean isKey) {
+    var schema = avroSchema.rawSchema();
     List<DataSetField> result = new ArrayList<>();
     result.add(DataSetFieldsExtractors.rootField(topicOddrn, isKey));
     extract(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java
index e357db30793..b9093262bd6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/DataSetFieldsExtractors.java
@@ -2,7 +2,11 @@
 
 import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import com.provectus.kafka.ui.sr.model.SchemaType;
+import io.confluent.kafka.schemaregistry.avro.AvroSchema;
+import io.confluent.kafka.schemaregistry.json.JsonSchema;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import org.opendatadiscovery.client.model.DataSetField;
 import org.opendatadiscovery.client.model.DataSetFieldType;
@@ -10,12 +14,18 @@
 
 public final class DataSetFieldsExtractors {
 
-  public static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
+  public static List<DataSetField> extract(SchemaSubject subject,
+                                           Map<String, String> resolvedRefs,
+                                           KafkaPath topicOddrn,
+                                           boolean isKey) {
     SchemaType schemaType = Optional.ofNullable(subject.getSchemaType()).orElse(SchemaType.AVRO);
     return switch (schemaType) {
-      case AVRO -> AvroExtractor.extract(subject, topicOddrn, isKey);
-      case JSON -> JsonSchemaExtractor.extract(subject, topicOddrn, isKey);
-      case PROTOBUF -> ProtoExtractor.extract(subject, topicOddrn, isKey);
+      case AVRO -> AvroExtractor.extract(
+          new AvroSchema(subject.getSchema(), List.of(), resolvedRefs, null), topicOddrn, isKey);
+      case JSON -> JsonSchemaExtractor.extract(
+          new JsonSchema(subject.getSchema(), List.of(), resolvedRefs, null), topicOddrn, isKey);
+      case PROTOBUF -> ProtoExtractor.extract(
+          new ProtobufSchema(subject.getSchema(), List.of(), resolvedRefs, null, null), topicOddrn, isKey);
     };
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java
index 06201b1ce7f..93adbdbe0cc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractor.java
@@ -30,8 +30,8 @@ final class JsonSchemaExtractor {
   private JsonSchemaExtractor() {
   }
 
-  static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
-    Schema schema = new JsonSchema(subject.getSchema()).rawSchema();
+  static List<DataSetField> extract(JsonSchema jsonSchema, KafkaPath topicOddrn, boolean isKey) {
+    Schema schema = jsonSchema.rawSchema();
     List<DataSetField> result = new ArrayList<>();
     result.add(DataSetFieldsExtractors.rootField(topicOddrn, isKey));
     extract(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java
index c1316172f30..01b25ff48db 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractor.java
@@ -15,7 +15,6 @@
 import com.google.protobuf.UInt32Value;
 import com.google.protobuf.UInt64Value;
 import com.google.protobuf.Value;
-import com.provectus.kafka.ui.sr.model.SchemaSubject;
 import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,8 +41,8 @@ final class ProtoExtractor {
   private ProtoExtractor() {
   }
 
-  static List<DataSetField> extract(SchemaSubject subject, KafkaPath topicOddrn, boolean isKey) {
-    Descriptor schema = new ProtobufSchema(subject.getSchema()).toDescriptor();
+  static List<DataSetField> extract(ProtobufSchema protobufSchema, KafkaPath topicOddrn, boolean isKey) {
+    Descriptor schema = protobufSchema.toDescriptor();
     List<DataSetField> result = new ArrayList<>();
     result.add(DataSetFieldsExtractors.rootField(topicOddrn, isKey));
     var rootOddrn = topicOddrn.oddrn() + "/columns/" + (isKey ? "key" : "value");
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java
index 60959be0492..5fa9aee7667 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/SchemaRegistryServiceTests.java
@@ -2,6 +2,7 @@
 
 import com.provectus.kafka.ui.model.CompatibilityLevelDTO;
 import com.provectus.kafka.ui.model.NewSchemaSubjectDTO;
+import com.provectus.kafka.ui.model.SchemaReferenceDTO;
 import com.provectus.kafka.ui.model.SchemaSubjectDTO;
 import com.provectus.kafka.ui.model.SchemaSubjectsResponseDTO;
 import com.provectus.kafka.ui.model.SchemaTypeDTO;
@@ -190,6 +191,58 @@ void shouldCreateNewProtobufSchema() {
     Assertions.assertEquals(schema, actual.getSchema());
   }
 
+
+  @Test
+  void shouldCreateNewProtobufSchemaWithRefs() {
+    NewSchemaSubjectDTO requestBody = new NewSchemaSubjectDTO()
+        .schemaType(SchemaTypeDTO.PROTOBUF)
+        .subject(subject + "-ref")
+        .schema("""
+            syntax = "proto3";
+            message MyRecord {
+              int32 id = 1;
+              string name = 2;
+            }
+            """);
+
+    webTestClient
+        .post()
+        .uri("/api/clusters/{clusterName}/schemas", LOCAL)
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(BodyInserters.fromPublisher(Mono.just(requestBody), NewSchemaSubjectDTO.class))
+        .exchange()
+        .expectStatus()
+        .isOk();
+
+    requestBody = new NewSchemaSubjectDTO()
+        .schemaType(SchemaTypeDTO.PROTOBUF)
+        .subject(subject)
+        .schema("""
+            syntax = "proto3";
+            import "MyRecord.proto";
+            message MyRecordWithRef {
+              int32 id = 1;
+              MyRecord my_ref = 2;
+            }
+            """)
+        .references(List.of(new SchemaReferenceDTO().name("MyRecord.proto").subject(subject + "-ref").version(1)));
+
+    SchemaSubjectDTO actual = webTestClient
+        .post()
+        .uri("/api/clusters/{clusterName}/schemas", LOCAL)
+        .contentType(MediaType.APPLICATION_JSON)
+        .body(BodyInserters.fromPublisher(Mono.just(requestBody), NewSchemaSubjectDTO.class))
+        .exchange()
+        .expectStatus()
+        .isOk()
+        .expectBody(SchemaSubjectDTO.class)
+        .returnResult()
+        .getResponseBody();
+
+    Assertions.assertNotNull(actual);
+    Assertions.assertEquals(requestBody.getReferences(), actual.getReferences());
+  }
+
   @Test
   public void shouldReturnBackwardAsGlobalCompatibilityLevelByDefault() {
     webTestClient
@@ -278,7 +331,7 @@ public void shouldOkWhenCreateNewSchemaThenGetAndUpdateItsCompatibilityLevel() {
   void shouldCreateNewSchemaWhenSubjectIncludesNonAsciiCharacters() {
     String schema =
         "{\"subject\":\"test/test\",\"schemaType\":\"JSON\",\"schema\":"
-        + "\"{\\\"type\\\": \\\"string\\\"}\"}";
+            + "\"{\\\"type\\\": \\\"string\\\"}\"}";
 
     webTestClient
         .post()
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/SchemaReferencesResolverTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/SchemaReferencesResolverTest.java
new file mode 100644
index 00000000000..d24524473a7
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/SchemaReferencesResolverTest.java
@@ -0,0 +1,86 @@
+package com.provectus.kafka.ui.service.integration.odd;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.common.collect.ImmutableMap;
+import com.provectus.kafka.ui.sr.api.KafkaSrClientApi;
+import com.provectus.kafka.ui.sr.model.SchemaReference;
+import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+class SchemaReferencesResolverTest {
+
+  private final KafkaSrClientApi srClientMock = mock(KafkaSrClientApi.class);
+
+  private final SchemaReferencesResolver schemaReferencesResolver = new SchemaReferencesResolver(srClientMock);
+
+  @Test
+  void resolvesRefsUsingSrClient() {
+    mockSrCall("sub1", 1,
+        new SchemaSubject()
+            .schema("schema1"));
+
+    mockSrCall("sub2", 1,
+        new SchemaSubject()
+            .schema("schema2")
+            .references(
+                List.of(
+                    new SchemaReference().name("ref2_1").subject("sub2_1").version(2),
+                    new SchemaReference().name("ref2_2").subject("sub1").version(1))));
+
+    mockSrCall("sub2_1", 2,
+        new SchemaSubject()
+            .schema("schema2_1")
+            .references(
+                List.of(
+                    new SchemaReference().name("ref2_1_1").subject("sub2_1_1").version(3),
+                    new SchemaReference().name("ref1").subject("should_not_be_called").version(1)
+                ))
+    );
+
+    mockSrCall("sub2_1_1", 3,
+        new SchemaSubject()
+            .schema("schema2_1_1"));
+
+    var resolvedRefsMono = schemaReferencesResolver.resolve(
+        List.of(
+            new SchemaReference().name("ref1").subject("sub1").version(1),
+            new SchemaReference().name("ref2").subject("sub2").version(1)));
+
+    StepVerifier.create(resolvedRefsMono)
+        .assertNext(refs ->
+            assertThat(refs)
+                .containsExactlyEntriesOf(
+                    // checking map should be ordered
+                    ImmutableMap.<String, String>builder()
+                        .put("ref1", "schema1")
+                        .put("ref2_1_1", "schema2_1_1")
+                        .put("ref2_1", "schema2_1")
+                        .put("ref2_2", "schema1")
+                        .put("ref2", "schema2")
+                        .build()))
+        .verifyComplete();
+  }
+
+  @Test
+  void returnsEmptyMapOnEmptyInputs() {
+    StepVerifier.create(schemaReferencesResolver.resolve(null))
+        .assertNext(map -> assertThat(map).isEmpty())
+        .verifyComplete();
+
+    StepVerifier.create(schemaReferencesResolver.resolve(List.of()))
+        .assertNext(map -> assertThat(map).isEmpty())
+        .verifyComplete();
+  }
+
+  private void mockSrCall(String subject, int version, SchemaSubject subjectToReturn) {
+    when(srClientMock.getSubjectVersion(subject, version + "", true))
+        .thenReturn(Mono.just(subjectToReturn));
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java
index 8673b469d6e..cb4103467be 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/TopicsExporterTest.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.service.integration.odd;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -54,9 +55,8 @@ void init() {
 
   @Test
   void doesNotExportTopicsWhichDontFitFiltrationRule() {
-    when(schemaRegistryClientMock.getSubjectVersion(anyString(), anyString()))
+    when(schemaRegistryClientMock.getSubjectVersion(anyString(), anyString(), anyBoolean()))
         .thenReturn(Mono.error(WebClientResponseException.create(404, "NF", new HttpHeaders(), null, null, null)));
-
     stats = Statistics.empty()
         .toBuilder()
         .topicDescriptions(
@@ -85,14 +85,14 @@ void doesNotExportTopicsWhichDontFitFiltrationRule() {
 
   @Test
   void doesExportTopicData() {
-    when(schemaRegistryClientMock.getSubjectVersion("testTopic-value", "latest"))
+    when(schemaRegistryClientMock.getSubjectVersion("testTopic-value", "latest", false))
         .thenReturn(Mono.just(
             new SchemaSubject()
                 .schema("\"string\"")
                 .schemaType(SchemaType.AVRO)
         ));
 
-    when(schemaRegistryClientMock.getSubjectVersion("testTopic-key", "latest"))
+    when(schemaRegistryClientMock.getSubjectVersion("testTopic-key", "latest", false))
         .thenReturn(Mono.just(
             new SchemaSubject()
                 .schema("\"int\"")
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractorTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractorTest.java
index d523d7cd417..cd1baf77987 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractorTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/AvroExtractorTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import io.confluent.kafka.schemaregistry.avro.AvroSchema;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.opendatadiscovery.client.model.DataSetField;
@@ -15,8 +15,7 @@ class AvroExtractorTest {
   @ValueSource(booleans = {true, false})
   void test(boolean isKey) {
     var list = AvroExtractor.extract(
-        new SchemaSubject()
-            .schema("""
+        new AvroSchema("""
                 {
                     "type": "record",
                     "name": "Message",
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractorTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractorTest.java
index 7968e52e6dd..30a1e6229cc 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractorTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/JsonSchemaExtractorTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import io.confluent.kafka.schemaregistry.json.JsonSchema;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +40,7 @@ void test(boolean isKey) {
         }
         """;
     var fields = JsonSchemaExtractor.extract(
-        new SchemaSubject().schema(jsonSchema),
+        new JsonSchema(jsonSchema),
         KafkaPath.builder()
             .cluster("localhost:9092")
             .topic("someTopic")
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractorTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractorTest.java
index cbb97a859c2..8d6344d7cca 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractorTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/schema/ProtoExtractorTest.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.provectus.kafka.ui.sr.model.SchemaSubject;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.opendatadiscovery.client.model.DataSetField;
@@ -54,8 +54,7 @@ enum SampleEnum {
         }""";
 
     var list = ProtoExtractor.extract(
-        new SchemaSubject()
-            .schema(protoSchema),
+        new ProtobufSchema(protoSchema),
         KafkaPath.builder()
             .cluster("localhost:9092")
             .topic("someTopic")
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-sr-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-sr-api.yaml
index 84ee36b48de..0320e891ecd 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-sr-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-sr-api.yaml
@@ -77,6 +77,10 @@ paths:
                 required: true
                 schema:
                   type: string
+              - name: deleted
+                in: query
+                schema:
+                  type: boolean
             responses:
                 200:
                     description: OK
@@ -317,6 +321,10 @@ components:
                 type: string
               schemaType:
                   $ref: '#/components/schemas/SchemaType'
+              references:
+                type: array
+                items:
+                  $ref: '#/components/schemas/SchemaReference'
             required:
               - id
               - subject
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index e15425a45ec..f9ed233bc1d 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -2916,6 +2916,10 @@ components:
           type: string
         schemaType:
           $ref: '#/components/schemas/SchemaType'
+        references:
+          type: array
+          items:
+            $ref: '#/components/schemas/SchemaReference'
       required:
         - id
         - subject
@@ -2933,13 +2937,30 @@ components:
         schema:
           type: string
         schemaType:
-          $ref: '#/components/schemas/SchemaType'
-          # upon updating a schema, the type of existing schema can't be changed
+          $ref: '#/components/schemas/SchemaType' # upon updating a schema, the type of existing schema can't be changed
+        references:
+          type: array
+          items:
+            $ref: '#/components/schemas/SchemaReference'
       required:
         - subject
         - schema
         - schemaType
 
+    SchemaReference:
+      type: object
+      properties:
+        name:
+          type: string
+        subject:
+          type: string
+        version:
+          type: integer
+      required:
+        - name
+        - subject
+        - version
+
     CompatibilityLevel:
       type: object
       properties:

From 32cd55928a4ae47e13005b6b1f8e6fece6ab3f06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 19:02:14 +0400
Subject: [PATCH 648/734] Bump qase.io.version from 3.0.4 to 3.0.5 (#4000)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 30aed7b94b3..71b3b96cbca 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -20,7 +20,7 @@
         <selenide.version>6.12.3</selenide.version>
         <testng.version>7.7.1</testng.version>
         <allure.version>2.22.2</allure.version>
-        <qase.io.version>3.0.4</qase.io.version>
+        <qase.io.version>3.0.5</qase.io.version>
         <aspectj.version>1.9.9.1</aspectj.version>
         <assertj.version>3.24.2</assertj.version>
         <hamcrest.version>2.2</hamcrest.version>

From a32272d07e2f151d6397013b3547ca145ef75788 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Mon, 24 Jul 2023 11:25:13 +0400
Subject: [PATCH 649/734] Infra: tighten github_token security (#4043)

Co-authored-by: Narek Matevosyan <nmatevosyan@provectus.com>
---
 .github/workflows/backend.yml                         | 5 ++++-
 .github/workflows/e2e-checks.yaml                     | 8 +++++---
 .github/workflows/frontend.yaml                       | 5 ++++-
 .github/workflows/pr-checks.yaml                      | 5 +++--
 .github/workflows/welcome-first-time-contributors.yml | 6 ++++--
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 911c5c7de32..7f62772832a 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -3,11 +3,14 @@ on:
   push:
     branches:
       - master
-  pull_request:
+  pull_request_target:
     types: ["opened", "edited", "reopened", "synchronize"]
     paths:
       - "kafka-ui-api/**"
       - "pom.xml"
+permissions:
+  checks: write
+  pull-requests: write
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index 745be782289..d08e0cade79 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -1,6 +1,6 @@
 name: "E2E: PR healthcheck"
 on:
-  pull_request:
+  pull_request_target:
     types: [ "opened", "edited", "reopened", "synchronize" ]
     paths:
       - "kafka-ui-api/**"
@@ -8,6 +8,8 @@ on:
       - "kafka-ui-react-app/**"
       - "kafka-ui-e2e-checks/**"
       - "pom.xml"
+permissions:
+  statuses: write
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
@@ -18,8 +20,8 @@ jobs:
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-access-key-id: ${{ secrets.S3_AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.S3_AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-central-1
       - name: Set up environment
         id: set_env_values
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 125e4be71ce..02ccd4e1359 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -3,11 +3,14 @@ on:
   push:
     branches:
       - master
-  pull_request:
+  pull_request_target:
     types: ["opened", "edited", "reopened", "synchronize"]
     paths:
       - "kafka-ui-contract/**"
       - "kafka-ui-react-app/**"
+permissions:
+  checks: write
+  pull-requests: write
 jobs:
   build-and-test:
     env:
diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
index 84e58b68c11..ce7dd17ae40 100644
--- a/.github/workflows/pr-checks.yaml
+++ b/.github/workflows/pr-checks.yaml
@@ -1,8 +1,9 @@
 name: "PR: Checklist linter"
 on:
-  pull_request:
+  pull_request_target:
     types: [opened, edited, synchronize, reopened]
-
+permissions:
+  checks: write
 jobs:
   task-check:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/welcome-first-time-contributors.yml b/.github/workflows/welcome-first-time-contributors.yml
index 5f662b71c63..1ac861055cc 100644
--- a/.github/workflows/welcome-first-time-contributors.yml
+++ b/.github/workflows/welcome-first-time-contributors.yml
@@ -1,13 +1,15 @@
 name: Welcome first time contributors
 
 on:
-  pull_request:
+  pull_request_target:
     types:
       - opened
   issues:
     types:
       - opened
-
+permissions:
+  issues: write
+  pull-requests: write
 jobs:
   welcome:
     runs-on: ubuntu-latest

From ca2d53f936d74f445834d9a6cf63ba56fd99591c Mon Sep 17 00:00:00 2001
From: Igor Khrol <khroliz@gmail.com>
Date: Mon, 24 Jul 2023 10:43:18 +0300
Subject: [PATCH 650/734] BE: Respect system proxy settings in WebClient
 (#4042)

---
 .../kafka/ui/util/WebClientConfigurator.java         | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
index e0815828e23..c5aca5ad716 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/WebClientConfigurator.java
@@ -28,6 +28,9 @@
 public class WebClientConfigurator {
 
   private final WebClient.Builder builder = WebClient.builder();
+  private HttpClient httpClient = HttpClient
+      .create()
+      .proxyWithSystemProperties();
 
   public WebClientConfigurator() {
     configureObjectMapper(defaultOM());
@@ -90,12 +93,7 @@ private WebClientConfigurator configureSsl(
     // Create webclient
     SslContext context = contextBuilder.build();
 
-    var httpClient = HttpClient
-        .create()
-        .secure(t -> t.sslContext(context))
-        .proxyWithSystemProperties();
-
-    builder.clientConnector(new ReactorClientHttpConnector(httpClient));
+    httpClient = httpClient.secure(t -> t.sslContext(context));
     return this;
   }
 
@@ -131,6 +129,6 @@ public WebClientConfigurator configureCodecs(Consumer<ClientCodecConfigurer> con
   }
 
   public WebClient build() {
-    return builder.build();
+    return builder.clientConnector(new ReactorClientHttpConnector(httpClient)).build();
   }
 }

From 7eaae31345f7efc5df2f82c50d27f4abfd869877 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 26 Jul 2023 12:17:55 +0400
Subject: [PATCH 651/734] Error message from SR propagation (#4058)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../com/provectus/kafka/ui/service/SchemaRegistryService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
index cae29ba93d6..fd7efff606a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
@@ -125,7 +125,7 @@ public Mono<SubjectWithCompatibilityLevel> registerNewSchema(KafkaCluster cluste
         .onErrorMap(WebClientResponseException.Conflict.class,
             th -> new SchemaCompatibilityException())
         .onErrorMap(WebClientResponseException.UnprocessableEntity.class,
-            th -> new ValidationException("Invalid schema"))
+            th -> new ValidationException("Invalid schema. Error from registry: " + th.getResponseBodyAsString()))
         .then(getLatestSchemaVersionBySubject(cluster, subject));
   }
 

From 0b99f745b01abd734738fc187afcec4589168d8f Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 31 Jul 2023 16:01:36 +0700
Subject: [PATCH 652/734] BE: Migrate deprecated spring components (#4056)

Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 .../config/auth/BasicAuthSecurityConfig.java  | 22 +++++++-------
 .../auth/DisabledAuthSecurityConfig.java      | 10 ++++---
 .../ui/config/auth/LdapSecurityConfig.java    | 25 +++++++---------
 .../ui/config/auth/OAuthSecurityConfig.java   | 29 ++++++++-----------
 4 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
index ae98dfdd7a3..36ccf7212ac 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
@@ -7,12 +7,10 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
-import org.springframework.security.config.web.server.SecurityWebFiltersOrder;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 import org.springframework.security.web.server.authentication.RedirectServerAuthenticationSuccessHandler;
 import org.springframework.security.web.server.authentication.logout.RedirectServerLogoutSuccessHandler;
-import org.springframework.security.web.server.ui.LogoutPageGeneratingWebFilter;
 
 @Configuration
 @EnableWebFluxSecurity
@@ -33,15 +31,17 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http) {
     final var logoutSuccessHandler = new RedirectServerLogoutSuccessHandler();
     logoutSuccessHandler.setLogoutSuccessUrl(URI.create(LOGOUT_URL));
 
-    return http
-        .addFilterAfter(new LogoutPageGeneratingWebFilter(), SecurityWebFiltersOrder.REACTOR_CONTEXT)
-        .csrf().disable()
-        .authorizeExchange()
-        .pathMatchers(AUTH_WHITELIST).permitAll()
-        .anyExchange().authenticated()
-        .and().formLogin().loginPage(LOGIN_URL).authenticationSuccessHandler(authHandler)
-        .and().logout().logoutSuccessHandler(logoutSuccessHandler)
-        .and().build();
+
+    return http.authorizeExchange(spec -> spec
+            .pathMatchers(AUTH_WHITELIST)
+            .permitAll()
+            .anyExchange()
+            .authenticated()
+        )
+        .formLogin(spec -> spec.loginPage(LOGIN_URL).authenticationSuccessHandler(authHandler))
+        .logout(spec -> spec.logoutSuccessHandler(logoutSuccessHandler))
+        .csrf(ServerHttpSecurity.CsrfSpec::disable)
+        .build();
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/DisabledAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/DisabledAuthSecurityConfig.java
index 4b1cc9a9330..39d56a05bf6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/DisabledAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/DisabledAuthSecurityConfig.java
@@ -27,10 +27,12 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http, Environment env
       System.exit(1);
     }
     log.warn("Authentication is disabled. Access will be unrestricted.");
-    return http.authorizeExchange()
-        .anyExchange().permitAll()
-        .and()
-        .csrf().disable()
+
+    return http.authorizeExchange(spec -> spec
+            .anyExchange()
+            .permitAll()
+        )
+        .csrf(ServerHttpSecurity.CsrfSpec::disable)
         .build();
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
index b7750d528b8..20ce2aaa583 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
@@ -24,6 +24,7 @@
 import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.authentication.ReactiveAuthenticationManager;
 import org.springframework.security.authentication.ReactiveAuthenticationManagerAdapter;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.core.GrantedAuthority;
@@ -126,21 +127,15 @@ public SecurityWebFilterChain configureLdap(ServerHttpSecurity http) {
       log.info("Active Directory support for LDAP has been enabled.");
     }
 
-    return http
-        .authorizeExchange()
-        .pathMatchers(AUTH_WHITELIST)
-        .permitAll()
-        .anyExchange()
-        .authenticated()
-
-        .and()
-        .formLogin()
-
-        .and()
-        .logout()
-
-        .and()
-        .csrf().disable()
+    return http.authorizeExchange(spec -> spec
+            .pathMatchers(AUTH_WHITELIST)
+            .permitAll()
+            .anyExchange()
+            .authenticated()
+        )
+        .formLogin(Customizer.withDefaults())
+        .logout(Customizer.withDefaults())
+        .csrf(ServerHttpSecurity.CsrfSpec::disable)
         .build();
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
index d170a7338c1..0e7a228e485 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
@@ -12,10 +12,11 @@
 import org.jetbrains.annotations.Nullable;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
-import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientPropertiesRegistrationAdapter;
+import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientPropertiesMapper;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
@@ -49,21 +50,15 @@ public class OAuthSecurityConfig extends AbstractAuthSecurityConfig {
   public SecurityWebFilterChain configure(ServerHttpSecurity http, OAuthLogoutSuccessHandler logoutHandler) {
     log.info("Configuring OAUTH2 authentication.");
 
-    return http.authorizeExchange()
-        .pathMatchers(AUTH_WHITELIST)
-        .permitAll()
-        .anyExchange()
-        .authenticated()
-
-        .and()
-        .oauth2Login()
-
-        .and()
-        .logout()
-        .logoutSuccessHandler(logoutHandler)
-
-        .and()
-        .csrf().disable()
+    return http.authorizeExchange(spec -> spec
+            .pathMatchers(AUTH_WHITELIST)
+            .permitAll()
+            .anyExchange()
+            .authenticated()
+        )
+        .oauth2Login(Customizer.withDefaults())
+        .logout(spec -> spec.logoutSuccessHandler(logoutHandler))
+        .csrf(ServerHttpSecurity.CsrfSpec::disable)
         .build();
   }
 
@@ -103,7 +98,7 @@ public ReactiveOAuth2UserService<OAuth2UserRequest, OAuth2User> customOauth2User
   public InMemoryReactiveClientRegistrationRepository clientRegistrationRepository() {
     final OAuth2ClientProperties props = OAuthPropertiesConverter.convertProperties(properties);
     final List<ClientRegistration> registrations =
-        new ArrayList<>(OAuth2ClientPropertiesRegistrationAdapter.getClientRegistrations(props).values());
+        new ArrayList<>(new OAuth2ClientPropertiesMapper(props).asClientRegistrations().values());
     return new InMemoryReactiveClientRegistrationRepository(registrations);
   }
 

From 2db89593a78cb6478889cd455c9e20b23e2e3a92 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 1 Aug 2023 12:30:05 +0400
Subject: [PATCH 653/734] BE: Implement Hex serde (#4074)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/serdes/SerdesInitializer.java    |  2 +
 .../kafka/ui/serdes/builtin/HexSerde.java     | 80 ++++++++++++++++++
 .../kafka/ui/serdes/builtin/HexSerdeTest.java | 84 +++++++++++++++++++
 3 files changed, 166 insertions(+)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/HexSerde.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/HexSerdeTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
index ac3c2241cfc..c833d9fc726 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
@@ -12,6 +12,7 @@
 import com.provectus.kafka.ui.serdes.builtin.AvroEmbeddedSerde;
 import com.provectus.kafka.ui.serdes.builtin.Base64Serde;
 import com.provectus.kafka.ui.serdes.builtin.ConsumerOffsetsSerde;
+import com.provectus.kafka.ui.serdes.builtin.HexSerde;
 import com.provectus.kafka.ui.serdes.builtin.Int32Serde;
 import com.provectus.kafka.ui.serdes.builtin.Int64Serde;
 import com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde;
@@ -47,6 +48,7 @@ public SerdesInitializer() {
             .put(UInt64Serde.name(), UInt64Serde.class)
             .put(AvroEmbeddedSerde.name(), AvroEmbeddedSerde.class)
             .put(Base64Serde.name(), Base64Serde.class)
+            .put(HexSerde.name(), HexSerde.class)
             .put(UuidBinarySerde.name(), UuidBinarySerde.class)
             .build(),
         new CustomSerdeLoader()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/HexSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/HexSerde.java
new file mode 100644
index 00000000000..cf1a6b793ff
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/HexSerde.java
@@ -0,0 +1,80 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.PropertyResolver;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.util.HexFormat;
+import java.util.Map;
+import java.util.Optional;
+
+public class HexSerde implements BuiltInSerde {
+
+  private HexFormat deserializeHexFormat;
+
+  public static String name() {
+    return "Hex";
+  }
+
+  @Override
+  public void configure(PropertyResolver serdeProperties,
+                        PropertyResolver kafkaClusterProperties,
+                        PropertyResolver globalProperties) {
+    String delim = serdeProperties.getProperty("delimiter", String.class).orElse(" ");
+    boolean uppercase = serdeProperties.getProperty("uppercase", Boolean.class).orElse(true);
+    deserializeHexFormat = HexFormat.ofDelimiter(delim);
+    if (uppercase) {
+      deserializeHexFormat = deserializeHexFormat.withUpperCase();
+    }
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    return input -> {
+      input = input.trim();
+      // it is a hack to provide ability to sent empty array as a key/value
+      if (input.length() == 0) {
+        return new byte[] {};
+      }
+      return HexFormat.of().parseHex(prepareInputForParse(input));
+    };
+  }
+
+  // removing most-common delimiters and prefixes
+  private static String prepareInputForParse(String input) {
+    return input
+        .replaceAll(" ", "")
+        .replaceAll("#", "")
+        .replaceAll(":", "");
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return (headers, data) ->
+        new DeserializeResult(
+            deserializeHexFormat.formatHex(data),
+            DeserializeResult.Type.STRING,
+            Map.of()
+        );
+  }
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/HexSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/HexSerdeTest.java
new file mode 100644
index 00000000000..a318279f564
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/HexSerdeTest.java
@@ -0,0 +1,84 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
+import com.provectus.kafka.ui.serdes.RecordHeadersImpl;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.EnumSource;
+
+public class HexSerdeTest {
+
+  private static final byte[] TEST_BYTES = "hello world".getBytes();
+  private static final String TEST_BYTES_HEX_ENCODED = "68 65 6C 6C 6F 20 77 6F 72 6C 64";
+
+  private Serde hexSerde;
+
+  @BeforeEach
+  void init() {
+    hexSerde = new HexSerde();
+    hexSerde.configure(
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty(),
+        PropertyResolverImpl.empty()
+    );
+  }
+
+
+  @ParameterizedTest
+  @CsvSource({
+      "68656C6C6F20776F726C64", // uppercase
+      "68656c6c6f20776f726c64", // lowercase
+      "68:65:6c:6c:6f:20:77:6f:72:6c:64", // ':' delim
+      "68 65 6C 6C 6F 20 77 6F 72 6C 64", // space delim, UC
+      "68 65 6c 6c 6f 20 77 6f 72 6c 64", // space delim, LC
+      "#68 #65 #6C #6C #6F #20 #77 #6F #72 #6C #64"  // '#' prefix, space delim
+  })
+  void serializesInputAsHexString(String hexString) {
+    for (Serde.Target type : Serde.Target.values()) {
+      var serializer = hexSerde.serializer("anyTopic", type);
+      byte[] bytes = serializer.serialize(hexString);
+      assertThat(bytes).isEqualTo(TEST_BYTES);
+    }
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void serializesEmptyStringAsEmptyBytesArray(Serde.Target type) {
+    var serializer = hexSerde.serializer("anyTopic", type);
+    byte[] bytes = serializer.serialize("");
+    assertThat(bytes).isEqualTo(new byte[] {});
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void deserializesDataAsHexBytes(Serde.Target type) {
+    var deserializer = hexSerde.deserializer("anyTopic", type);
+    var result = deserializer.deserialize(new RecordHeadersImpl(), TEST_BYTES);
+    assertThat(result.getResult()).isEqualTo(TEST_BYTES_HEX_ENCODED);
+    assertThat(result.getType()).isEqualTo(DeserializeResult.Type.STRING);
+    assertThat(result.getAdditionalProperties()).isEmpty();
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void getSchemaReturnsEmpty(Serde.Target type) {
+    assertThat(hexSerde.getSchema("anyTopic", type)).isEmpty();
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void canDeserializeReturnsTrueForAllInputs(Serde.Target type) {
+    assertThat(hexSerde.canDeserialize("anyTopic", type)).isTrue();
+  }
+
+  @ParameterizedTest
+  @EnumSource
+  void canSerializeReturnsTrueForAllInput(Serde.Target type) {
+    assertThat(hexSerde.canSerialize("anyTopic", type)).isTrue();
+  }
+}

From 476cbfb691a0b19f9227ecb12b2e5ce4b5a7156c Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 1 Aug 2023 15:47:03 +0400
Subject: [PATCH 654/734] BE: Serde tiny improvements and fixes (#4063)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../ui/serdes/builtin/AvroEmbeddedSerde.java  |  6 ---
 .../kafka/ui/serdes/builtin/Base64Serde.java  | 32 ++++--------
 .../kafka/ui/serdes/builtin/Int64Serde.java   |  8 +--
 .../kafka/ui/serdes/builtin/UInt64Serde.java  | 12 ++---
 .../ui/serdes/builtin/UuidBinarySerde.java    | 50 ++++++++-----------
 5 files changed, 36 insertions(+), 72 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerde.java
index 73a1ed54845..68ea03cfa65 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/AvroEmbeddedSerde.java
@@ -19,12 +19,6 @@ public static String name() {
     return "Avro (Embedded)";
   }
 
-  @Override
-  public void configure(PropertyResolver serdeProperties,
-                        PropertyResolver kafkaClusterProperties,
-                        PropertyResolver globalProperties) {
-  }
-
   @Override
   public Optional<String> getDescription() {
     return Optional.empty();
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java
index 14861ade6ae..e27215f6884 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java
@@ -1,8 +1,6 @@
 package com.provectus.kafka.ui.serdes.builtin;
 
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
-import com.provectus.kafka.ui.serde.api.PropertyResolver;
-import com.provectus.kafka.ui.serde.api.RecordHeaders;
 import com.provectus.kafka.ui.serde.api.SchemaDescription;
 import com.provectus.kafka.ui.serdes.BuiltInSerde;
 import java.util.Base64;
@@ -16,12 +14,6 @@ public static String name() {
     return "Base64";
   }
 
-  @Override
-  public void configure(PropertyResolver serdeProperties,
-                        PropertyResolver kafkaClusterProperties,
-                        PropertyResolver globalProperties) {
-  }
-
   @Override
   public Optional<String> getDescription() {
     return Optional.empty();
@@ -44,31 +36,25 @@ public boolean canSerialize(String topic, Target type) {
 
   @Override
   public Serializer serializer(String topic, Target type) {
-    return new Serializer() {
-      @Override
-      public byte[] serialize(String input) {
-        input = input.trim();
-        // it is actually a hack to provide ability to sent empty array as a key/value
-        if (input.length() == 0) {
-          return new byte[]{};
-        }
-        return Base64.getDecoder().decode(input);
+    var decoder = Base64.getDecoder();
+    return inputString -> {
+      inputString = inputString.trim();
+      // it is actually a hack to provide ability to sent empty array as a key/value
+      if (inputString.length() == 0) {
+        return new byte[] {};
       }
+      return decoder.decode(inputString);
     };
   }
 
   @Override
   public Deserializer deserializer(String topic, Target type) {
     var encoder = Base64.getEncoder();
-    return new Deserializer() {
-      @Override
-      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
-        return new DeserializeResult(
+    return (headers, data) ->
+        new DeserializeResult(
             encoder.encodeToString(data),
             DeserializeResult.Type.STRING,
             Map.of()
         );
-      }
-    };
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java
index 54741291b24..a897f941e0d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int64Serde.java
@@ -55,15 +55,11 @@ public Serializer serializer(String topic, Target type) {
 
   @Override
   public Deserializer deserializer(String topic, Target type) {
-    return new Deserializer() {
-      @Override
-      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
-        return new DeserializeResult(
+    return (headers, data) ->
+        new DeserializeResult(
             String.valueOf(Longs.fromByteArray(data)),
             DeserializeResult.Type.JSON,
             Map.of()
         );
-      }
-    };
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java
index 9f6d1421dd1..de7c8a6a638 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UInt64Serde.java
@@ -1,10 +1,8 @@
 package com.provectus.kafka.ui.serdes.builtin;
 
 import com.google.common.primitives.Longs;
-import com.google.common.primitives.UnsignedInteger;
 import com.google.common.primitives.UnsignedLong;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
-import com.provectus.kafka.ui.serde.api.RecordHeaders;
 import com.provectus.kafka.ui.serde.api.SchemaDescription;
 import com.provectus.kafka.ui.serdes.BuiltInSerde;
 import java.util.Map;
@@ -32,7 +30,7 @@ public Optional<SchemaDescription> getSchema(String topic, Target type) {
                     + "  \"minimum\" : 0, "
                     + "  \"maximum\" : %s "
                     + "}",
-                UnsignedInteger.MAX_VALUE
+                UnsignedLong.MAX_VALUE
             ),
             Map.of()
         )
@@ -56,15 +54,11 @@ public Serializer serializer(String topic, Target type) {
 
   @Override
   public Deserializer deserializer(String topic, Target type) {
-    return new Deserializer() {
-      @Override
-      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
-        return new DeserializeResult(
+    return (headers, data) ->
+        new DeserializeResult(
             UnsignedLong.fromLongBits(Longs.fromByteArray(data)).toString(),
             DeserializeResult.Type.JSON,
             Map.of()
         );
-      }
-    };
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java
index c5ae606b937..0be17e757f2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/UuidBinarySerde.java
@@ -50,41 +50,35 @@ public boolean canSerialize(String topic, Target type) {
 
   @Override
   public Serializer serializer(String topic, Target type) {
-    return new Serializer() {
-      @Override
-      public byte[] serialize(String input) {
-        UUID uuid = UUID.fromString(input);
-        ByteBuffer bb = ByteBuffer.wrap(new byte[16]);
-        if (mostSignificantBitsFirst) {
-          bb.putLong(uuid.getMostSignificantBits());
-          bb.putLong(uuid.getLeastSignificantBits());
-        } else {
-          bb.putLong(uuid.getLeastSignificantBits());
-          bb.putLong(uuid.getMostSignificantBits());
-        }
-        return bb.array();
+    return input -> {
+      UUID uuid = UUID.fromString(input);
+      ByteBuffer bb = ByteBuffer.wrap(new byte[16]);
+      if (mostSignificantBitsFirst) {
+        bb.putLong(uuid.getMostSignificantBits());
+        bb.putLong(uuid.getLeastSignificantBits());
+      } else {
+        bb.putLong(uuid.getLeastSignificantBits());
+        bb.putLong(uuid.getMostSignificantBits());
       }
+      return bb.array();
     };
   }
 
   @Override
   public Deserializer deserializer(String topic, Target type) {
-    return new Deserializer() {
-      @Override
-      public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
-        if (data.length != 16) {
-          throw new ValidationException("UUID data should be 16 bytes, but it is " + data.length);
-        }
-        ByteBuffer bb = ByteBuffer.wrap(data);
-        long msb = bb.getLong();
-        long lsb = bb.getLong();
-        UUID uuid = mostSignificantBitsFirst ? new UUID(msb, lsb) : new UUID(lsb, msb);
-        return new DeserializeResult(
-            uuid.toString(),
-            DeserializeResult.Type.STRING,
-            Map.of()
-        );
+    return (headers, data) -> {
+      if (data.length != 16) {
+        throw new ValidationException("UUID data should be 16 bytes, but it is " + data.length);
       }
+      ByteBuffer bb = ByteBuffer.wrap(data);
+      long msb = bb.getLong();
+      long lsb = bb.getLong();
+      UUID uuid = mostSignificantBitsFirst ? new UUID(msb, lsb) : new UUID(lsb, msb);
+      return new DeserializeResult(
+          uuid.toString(),
+          DeserializeResult.Type.STRING,
+          Map.of()
+      );
     };
   }
 }

From 895d27a306f0a69e0f6c665be121edc62c61c730 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 1 Aug 2023 16:07:46 +0400
Subject: [PATCH 655/734] Unavailable connects suppressing (#4061)

1. suppressing connect errors when returning list of all connectors
2. minor refactoring of KafkaConnectService.getAllConnectors
---
 .../kafka/ui/mapper/KafkaConnectMapper.java   |  2 +-
 .../kafka/ui/service/KafkaConnectService.java | 56 +++++++------------
 .../integration/odd/ConnectorsExporter.java   |  2 +-
 .../kafka/ui/AbstractIntegrationTest.java     |  2 +
 .../odd/ConnectorsExporterTest.java           |  2 +-
 5 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaConnectMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaConnectMapper.java
index 468c86ecbed..a41054de6cb 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaConnectMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/KafkaConnectMapper.java
@@ -34,7 +34,7 @@ ConnectorPluginConfigValidationResponseDTO fromClient(
       com.provectus.kafka.ui.connect.model.ConnectorPluginConfigValidationResponse
           connectorPluginConfigValidationResponse);
 
-  default FullConnectorInfoDTO fullConnectorInfoFromTuple(InternalConnectInfo connectInfo) {
+  default FullConnectorInfoDTO fullConnectorInfo(InternalConnectInfo connectInfo) {
     ConnectorDTO connector = connectInfo.getConnector();
     List<TaskDTO> tasks = connectInfo.getTasks();
     int failedTasksCount = (int) tasks.stream()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
index 390348707d3..605d5cab205 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaConnectService.java
@@ -28,7 +28,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
@@ -39,7 +38,6 @@
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.util.function.Tuples;
 
 @Service
 @Slf4j
@@ -61,39 +59,22 @@ public Flux<ConnectDTO> getConnects(KafkaCluster cluster) {
   public Flux<FullConnectorInfoDTO> getAllConnectors(final KafkaCluster cluster,
                                                      @Nullable final String search) {
     return getConnects(cluster)
-        .flatMap(connect -> getConnectorNames(cluster, connect.getName()).map(cn -> Tuples.of(connect.getName(), cn)))
-        .flatMap(pair -> getConnector(cluster, pair.getT1(), pair.getT2()))
-        .flatMap(connector ->
-            getConnectorConfig(cluster, connector.getConnect(), connector.getName())
-                .map(config -> InternalConnectInfo.builder()
-                    .connector(connector)
-                    .config(config)
-                    .build()
-                )
-        )
-        .flatMap(connectInfo -> {
-          ConnectorDTO connector = connectInfo.getConnector();
-          return getConnectorTasks(cluster, connector.getConnect(), connector.getName())
-              .collectList()
-              .map(tasks -> InternalConnectInfo.builder()
-                  .connector(connector)
-                  .config(connectInfo.getConfig())
-                  .tasks(tasks)
-                  .build()
-              );
-        })
-        .flatMap(connectInfo -> {
-          ConnectorDTO connector = connectInfo.getConnector();
-          return getConnectorTopics(cluster, connector.getConnect(), connector.getName())
-              .map(ct -> InternalConnectInfo.builder()
-                  .connector(connector)
-                  .config(connectInfo.getConfig())
-                  .tasks(connectInfo.getTasks())
-                  .topics(ct.getTopics())
-                  .build()
-              );
-        })
-        .map(kafkaConnectMapper::fullConnectorInfoFromTuple)
+        .flatMap(connect ->
+            getConnectorNamesWithErrorsSuppress(cluster, connect.getName())
+                .flatMap(connectorName ->
+                    Mono.zip(
+                        getConnector(cluster, connect.getName(), connectorName),
+                        getConnectorConfig(cluster, connect.getName(), connectorName),
+                        getConnectorTasks(cluster, connect.getName(), connectorName).collectList(),
+                        getConnectorTopics(cluster, connect.getName(), connectorName)
+                    ).map(tuple ->
+                        InternalConnectInfo.builder()
+                            .connector(tuple.getT1())
+                            .config(tuple.getT2())
+                            .tasks(tuple.getT3())
+                            .topics(tuple.getT4().getTopics())
+                            .build())))
+        .map(kafkaConnectMapper::fullConnectorInfo)
         .filter(matchesSearchTerm(search));
   }
 
@@ -132,6 +113,11 @@ public Flux<String> getConnectorNames(KafkaCluster cluster, String connectName)
         .flatMapMany(Flux::fromIterable);
   }
 
+  // returns empty flux if there was an error communicating with Connect
+  public Flux<String> getConnectorNamesWithErrorsSuppress(KafkaCluster cluster, String connectName) {
+    return getConnectorNames(cluster, connectName).onErrorComplete();
+  }
+
   @SneakyThrows
   private List<String> parseConnectorsNamesStringToList(String json) {
     return objectMapper.readValue(json, new TypeReference<>() {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporter.java
index 2fad00bbfaf..2259d5ebb1b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporter.java
@@ -25,7 +25,7 @@ class ConnectorsExporter {
 
   Flux<DataEntityList> export(KafkaCluster cluster) {
     return kafkaConnectService.getConnects(cluster)
-        .flatMap(connect -> kafkaConnectService.getConnectorNames(cluster, connect.getName())
+        .flatMap(connect -> kafkaConnectService.getConnectorNamesWithErrorsSuppress(cluster, connect.getName())
             .flatMap(connectorName -> kafkaConnectService.getConnector(cluster, connect.getName(), connectorName))
             .flatMap(connectorDTO ->
                 kafkaConnectService.getConnectorTopics(cluster, connect.getName(), connectorDTO.getName())
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
index 314abf914b0..d185e646714 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/AbstractIntegrationTest.java
@@ -77,6 +77,8 @@ public void initialize(@NotNull ConfigurableApplicationContext context) {
       System.setProperty("kafka.clusters.0.kafkaConnect.0.userName", "kafka-connect");
       System.setProperty("kafka.clusters.0.kafkaConnect.0.password", "kafka-connect");
       System.setProperty("kafka.clusters.0.kafkaConnect.0.address", kafkaConnect.getTarget());
+      System.setProperty("kafka.clusters.0.kafkaConnect.1.name", "notavailable");
+      System.setProperty("kafka.clusters.0.kafkaConnect.1.address", "http://notavailable:6666");
       System.setProperty("kafka.clusters.0.masking.0.type", "REPLACE");
       System.setProperty("kafka.clusters.0.masking.0.replacement", "***");
       System.setProperty("kafka.clusters.0.masking.0.topicValuesPattern", "masking-test-.*");
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporterTest.java
index 20c0d96ad16..e06a16388ee 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/integration/odd/ConnectorsExporterTest.java
@@ -61,7 +61,7 @@ void exportsConnectorsAsDataTransformers() {
     when(kafkaConnectService.getConnects(CLUSTER))
         .thenReturn(Flux.just(connect));
 
-    when(kafkaConnectService.getConnectorNames(CLUSTER, connect.getName()))
+    when(kafkaConnectService.getConnectorNamesWithErrorsSuppress(CLUSTER, connect.getName()))
         .thenReturn(Flux.just(sinkConnector.getName(), sourceConnector.getName()));
 
     when(kafkaConnectService.getConnector(CLUSTER, connect.getName(), sinkConnector.getName()))

From 1cd303a90b497546db1eccc664e26a277257923c Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 1 Aug 2023 16:23:19 +0400
Subject: [PATCH 656/734] BE: Impl ACL endpoints for consumer, producer, stream
 apps (#3783)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/controller/AclsController.java   |  54 +++++
 .../kafka/ui/service/acl/AclsService.java     | 185 ++++++++++++++-
 .../kafka/ui/service/acl/AclsServiceTest.java | 220 +++++++++++++++++-
 .../main/resources/swagger/kafka-ui-api.yaml  | 128 +++++++++-
 4 files changed, 576 insertions(+), 11 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
index 1de8f4d71be..71700e3f7b7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
@@ -2,6 +2,9 @@
 
 import com.provectus.kafka.ui.api.AclsApi;
 import com.provectus.kafka.ui.mapper.ClusterMapper;
+import com.provectus.kafka.ui.model.CreateConsumerAclDTO;
+import com.provectus.kafka.ui.model.CreateProducerAclDTO;
+import com.provectus.kafka.ui.model.CreateStreamAppAclDTO;
 import com.provectus.kafka.ui.model.KafkaAclDTO;
 import com.provectus.kafka.ui.model.KafkaAclNamePatternTypeDTO;
 import com.provectus.kafka.ui.model.KafkaAclResourceTypeDTO;
@@ -123,4 +126,55 @@ public Mono<ResponseEntity<Void>> syncAclsCsv(String clusterName, Mono<String> c
         .doOnEach(sig -> auditService.audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
+
+  @Override
+  public Mono<ResponseEntity<Void>> createConsumerAcl(String clusterName,
+                                                      Mono<CreateConsumerAclDTO> createConsumerAclDto,
+                                                      ServerWebExchange exchange) {
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .aclActions(AclAction.EDIT)
+        .operationName("createConsumerAcl")
+        .build();
+
+    return accessControlService.validateAccess(context)
+        .then(createConsumerAclDto)
+        .flatMap(req -> aclsService.createConsumerAcl(getCluster(clusterName), req))
+        .doOnEach(sig -> auditService.audit(context, sig))
+        .thenReturn(ResponseEntity.ok().build());
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> createProducerAcl(String clusterName,
+                                                      Mono<CreateProducerAclDTO> createProducerAclDto,
+                                                      ServerWebExchange exchange) {
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .aclActions(AclAction.EDIT)
+        .operationName("createProducerAcl")
+        .build();
+
+    return accessControlService.validateAccess(context)
+        .then(createProducerAclDto)
+        .flatMap(req -> aclsService.createProducerAcl(getCluster(clusterName), req))
+        .doOnEach(sig -> auditService.audit(context, sig))
+        .thenReturn(ResponseEntity.ok().build());
+  }
+
+  @Override
+  public Mono<ResponseEntity<Void>> createStreamAppAcl(String clusterName,
+                                                       Mono<CreateStreamAppAclDTO> createStreamAppAclDto,
+                                                       ServerWebExchange exchange) {
+    AccessContext context = AccessContext.builder()
+        .cluster(clusterName)
+        .aclActions(AclAction.EDIT)
+        .operationName("createStreamAppAcl")
+        .build();
+
+    return accessControlService.validateAccess(context)
+        .then(createStreamAppAclDto)
+        .flatMap(req -> aclsService.createStreamAppAcl(getCluster(clusterName), req))
+        .doOnEach(sig -> auditService.audit(context, sig))
+        .thenReturn(ResponseEntity.ok().build());
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java
index c2ab1b5eb4d..a621ce99cc3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/acl/AclsService.java
@@ -1,16 +1,44 @@
 package com.provectus.kafka.ui.service.acl;
 
+import static org.apache.kafka.common.acl.AclOperation.ALL;
+import static org.apache.kafka.common.acl.AclOperation.CREATE;
+import static org.apache.kafka.common.acl.AclOperation.DESCRIBE;
+import static org.apache.kafka.common.acl.AclOperation.IDEMPOTENT_WRITE;
+import static org.apache.kafka.common.acl.AclOperation.READ;
+import static org.apache.kafka.common.acl.AclOperation.WRITE;
+import static org.apache.kafka.common.acl.AclPermissionType.ALLOW;
+import static org.apache.kafka.common.resource.PatternType.LITERAL;
+import static org.apache.kafka.common.resource.PatternType.PREFIXED;
+import static org.apache.kafka.common.resource.ResourceType.CLUSTER;
+import static org.apache.kafka.common.resource.ResourceType.GROUP;
+import static org.apache.kafka.common.resource.ResourceType.TOPIC;
+import static org.apache.kafka.common.resource.ResourceType.TRANSACTIONAL_ID;
+
 import com.google.common.collect.Sets;
+import com.provectus.kafka.ui.model.CreateConsumerAclDTO;
+import com.provectus.kafka.ui.model.CreateProducerAclDTO;
+import com.provectus.kafka.ui.model.CreateStreamAppAclDTO;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.service.AdminClientService;
+import com.provectus.kafka.ui.service.ReactiveAdminClient;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
+import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.common.acl.AccessControlEntry;
 import org.apache.kafka.common.acl.AclBinding;
+import org.apache.kafka.common.acl.AclOperation;
+import org.apache.kafka.common.resource.Resource;
+import org.apache.kafka.common.resource.ResourcePattern;
 import org.apache.kafka.common.resource.ResourcePatternFilter;
+import org.apache.kafka.common.resource.ResourceType;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -22,11 +50,14 @@ public class AclsService {
   private final AdminClientService adminClientService;
 
   public Mono<Void> createAcl(KafkaCluster cluster, AclBinding aclBinding) {
-    var aclString = AclCsv.createAclString(aclBinding);
-    log.info("CREATING ACL: [{}]", aclString);
     return adminClientService.get(cluster)
-        .flatMap(ac -> ac.createAcls(List.of(aclBinding)))
-        .doOnSuccess(v -> log.info("ACL CREATED: [{}]", aclString));
+        .flatMap(ac -> createAclsWithLogging(ac, List.of(aclBinding)));
+  }
+
+  private Mono<Void> createAclsWithLogging(ReactiveAdminClient ac, Collection<AclBinding> bindings) {
+    bindings.forEach(b -> log.info("CREATING ACL: [{}]", AclCsv.createAclString(b)));
+    return ac.createAcls(bindings)
+        .doOnSuccess(v -> bindings.forEach(b -> log.info("ACL CREATED: [{}]", AclCsv.createAclString(b))));
   }
 
   public Mono<Void> deleteAcl(KafkaCluster cluster, AclBinding aclBinding) {
@@ -92,4 +123,150 @@ private void logAclSyncPlan(KafkaCluster cluster, Set<AclBinding> toBeAdded, Set
     }
   }
 
+  // creates allow binding for resources by prefix or specific names list
+  private List<AclBinding> createAllowBindings(ResourceType resourceType,
+                                               List<AclOperation> opsToAllow,
+                                               String principal,
+                                               String host,
+                                               @Nullable String resourcePrefix,
+                                               @Nullable Collection<String> resourceNames) {
+    List<AclBinding> bindings = new ArrayList<>();
+    if (resourcePrefix != null) {
+      for (var op : opsToAllow) {
+        bindings.add(
+            new AclBinding(
+                new ResourcePattern(resourceType, resourcePrefix, PREFIXED),
+                new AccessControlEntry(principal, host, op, ALLOW)));
+      }
+    }
+    if (!CollectionUtils.isEmpty(resourceNames)) {
+      resourceNames.stream()
+          .distinct()
+          .forEach(resource ->
+              opsToAllow.forEach(op ->
+                  bindings.add(
+                      new AclBinding(
+                          new ResourcePattern(resourceType, resource, LITERAL),
+                          new AccessControlEntry(principal, host, op, ALLOW)))));
+    }
+    return bindings;
+  }
+
+  public Mono<Void> createConsumerAcl(KafkaCluster cluster, CreateConsumerAclDTO request) {
+    return adminClientService.get(cluster)
+        .flatMap(ac -> createAclsWithLogging(ac, createConsumerBindings(request)))
+        .then();
+  }
+
+  //Read, Describe on topics, Read on consumerGroups
+  private List<AclBinding> createConsumerBindings(CreateConsumerAclDTO request) {
+    List<AclBinding> bindings = new ArrayList<>();
+    bindings.addAll(
+        createAllowBindings(TOPIC,
+            List.of(READ, DESCRIBE),
+            request.getPrincipal(),
+            request.getHost(),
+            request.getTopicsPrefix(),
+            request.getTopics()));
+
+    bindings.addAll(
+        createAllowBindings(
+            GROUP,
+            List.of(READ),
+            request.getPrincipal(),
+            request.getHost(),
+            request.getConsumerGroupsPrefix(),
+            request.getConsumerGroups()));
+    return bindings;
+  }
+
+  public Mono<Void> createProducerAcl(KafkaCluster cluster, CreateProducerAclDTO request) {
+    return adminClientService.get(cluster)
+        .flatMap(ac -> createAclsWithLogging(ac, createProducerBindings(request)))
+        .then();
+  }
+
+  //Write, Describe, Create permission on topics, Write, Describe on transactionalIds
+  //IDEMPOTENT_WRITE on cluster if idempotent is enabled
+  private List<AclBinding> createProducerBindings(CreateProducerAclDTO request) {
+    List<AclBinding> bindings = new ArrayList<>();
+    bindings.addAll(
+        createAllowBindings(
+            TOPIC,
+            List.of(WRITE, DESCRIBE, CREATE),
+            request.getPrincipal(),
+            request.getHost(),
+            request.getTopicsPrefix(),
+            request.getTopics()));
+
+    bindings.addAll(
+        createAllowBindings(
+            TRANSACTIONAL_ID,
+            List.of(WRITE, DESCRIBE),
+            request.getPrincipal(),
+            request.getHost(),
+            request.getTransactionsIdPrefix(),
+            Optional.ofNullable(request.getTransactionalId()).map(List::of).orElse(null)));
+
+    if (Boolean.TRUE.equals(request.getIdempotent())) {
+      bindings.addAll(
+          createAllowBindings(
+              CLUSTER,
+              List.of(IDEMPOTENT_WRITE),
+              request.getPrincipal(),
+              request.getHost(),
+              null,
+              List.of(Resource.CLUSTER_NAME))); // cluster name is a const string in ACL api
+    }
+    return bindings;
+  }
+
+  public Mono<Void> createStreamAppAcl(KafkaCluster cluster, CreateStreamAppAclDTO request) {
+    return adminClientService.get(cluster)
+        .flatMap(ac -> createAclsWithLogging(ac, createStreamAppBindings(request)))
+        .then();
+  }
+
+  // Read on input topics, Write on output topics
+  // ALL on applicationId-prefixed Groups and Topics
+  private List<AclBinding> createStreamAppBindings(CreateStreamAppAclDTO request) {
+    List<AclBinding> bindings = new ArrayList<>();
+    bindings.addAll(
+        createAllowBindings(
+            TOPIC,
+            List.of(READ),
+            request.getPrincipal(),
+            request.getHost(),
+            null,
+            request.getInputTopics()));
+
+    bindings.addAll(
+        createAllowBindings(
+            TOPIC,
+            List.of(WRITE),
+            request.getPrincipal(),
+            request.getHost(),
+            null,
+            request.getOutputTopics()));
+
+    bindings.addAll(
+        createAllowBindings(
+            GROUP,
+            List.of(ALL),
+            request.getPrincipal(),
+            request.getHost(),
+            request.getApplicationId(),
+            null));
+
+    bindings.addAll(
+        createAllowBindings(
+            TOPIC,
+            List.of(ALL),
+            request.getPrincipal(),
+            request.getHost(),
+            request.getApplicationId(),
+            null));
+    return bindings;
+  }
+
 }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclsServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclsServiceTest.java
index 5791bb20414..340aad7091c 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclsServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/acl/AclsServiceTest.java
@@ -4,16 +4,21 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.provectus.kafka.ui.model.CreateConsumerAclDTO;
+import com.provectus.kafka.ui.model.CreateProducerAclDTO;
+import com.provectus.kafka.ui.model.CreateStreamAppAclDTO;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.service.AdminClientService;
 import com.provectus.kafka.ui.service.ReactiveAdminClient;
 import java.util.Collection;
 import java.util.List;
+import java.util.UUID;
 import org.apache.kafka.common.acl.AccessControlEntry;
 import org.apache.kafka.common.acl.AclBinding;
 import org.apache.kafka.common.acl.AclOperation;
 import org.apache.kafka.common.acl.AclPermissionType;
 import org.apache.kafka.common.resource.PatternType;
+import org.apache.kafka.common.resource.Resource;
 import org.apache.kafka.common.resource.ResourcePattern;
 import org.apache.kafka.common.resource.ResourcePatternFilter;
 import org.apache.kafka.common.resource.ResourceType;
@@ -53,12 +58,12 @@ void testSyncAclWithAclCsv() {
     when(adminClientMock.listAcls(ResourcePatternFilter.ANY))
         .thenReturn(Mono.just(List.of(existingBinding1, existingBinding2)));
 
-    ArgumentCaptor<?> createdCaptor = ArgumentCaptor.forClass(Collection.class);
-    when(adminClientMock.createAcls((Collection<AclBinding>) createdCaptor.capture()))
+    ArgumentCaptor<Collection<AclBinding>> createdCaptor = ArgumentCaptor.forClass(Collection.class);
+    when(adminClientMock.createAcls(createdCaptor.capture()))
         .thenReturn(Mono.empty());
 
-    ArgumentCaptor<?> deletedCaptor = ArgumentCaptor.forClass(Collection.class);
-    when(adminClientMock.deleteAcls((Collection<AclBinding>) deletedCaptor.capture()))
+    ArgumentCaptor<Collection<AclBinding>> deletedCaptor = ArgumentCaptor.forClass(Collection.class);
+    when(adminClientMock.deleteAcls(deletedCaptor.capture()))
         .thenReturn(Mono.empty());
 
     aclsService.syncAclWithAclCsv(
@@ -68,15 +73,218 @@ void testSyncAclWithAclCsv() {
             + "User:test3,GROUP,PREFIXED,groupNew,DESCRIBE,DENY,localhost"
     ).block();
 
-    Collection<AclBinding> createdBindings = (Collection<AclBinding>) createdCaptor.getValue();
+    Collection<AclBinding> createdBindings = createdCaptor.getValue();
     assertThat(createdBindings)
         .hasSize(1)
         .contains(newBindingToBeAdded);
 
-    Collection<AclBinding> deletedBindings = (Collection<AclBinding>) deletedCaptor.getValue();
+    Collection<AclBinding> deletedBindings = deletedCaptor.getValue();
     assertThat(deletedBindings)
         .hasSize(1)
         .contains(existingBinding2);
   }
 
+
+  @Test
+  void createsConsumerDependantAcls() {
+    ArgumentCaptor<Collection<AclBinding>> createdCaptor = ArgumentCaptor.forClass(Collection.class);
+    when(adminClientMock.createAcls(createdCaptor.capture()))
+        .thenReturn(Mono.empty());
+
+    var principal = UUID.randomUUID().toString();
+    var host = UUID.randomUUID().toString();
+
+    aclsService.createConsumerAcl(
+        CLUSTER,
+        new CreateConsumerAclDTO()
+            .principal(principal)
+            .host(host)
+            .consumerGroups(List.of("cg1", "cg2"))
+            .topics(List.of("t1", "t2"))
+    ).block();
+
+    //Read, Describe on topics, Read on consumerGroups
+    Collection<AclBinding> createdBindings = createdCaptor.getValue();
+    assertThat(createdBindings)
+        .hasSize(6)
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t1", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.READ, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t1", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.DESCRIBE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t2", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.READ, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t2", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.DESCRIBE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.GROUP, "cg1", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.READ, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.GROUP, "cg2", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.READ, AclPermissionType.ALLOW)));
+  }
+
+  @Test
+  void createsConsumerDependantAclsWhenTopicsAndGroupsSpecifiedByPrefix() {
+    ArgumentCaptor<Collection<AclBinding>> createdCaptor = ArgumentCaptor.forClass(Collection.class);
+    when(adminClientMock.createAcls(createdCaptor.capture()))
+        .thenReturn(Mono.empty());
+
+    var principal = UUID.randomUUID().toString();
+    var host = UUID.randomUUID().toString();
+
+    aclsService.createConsumerAcl(
+        CLUSTER,
+        new CreateConsumerAclDTO()
+            .principal(principal)
+            .host(host)
+            .consumerGroupsPrefix("cgPref")
+            .topicsPrefix("topicPref")
+    ).block();
+
+    //Read, Describe on topics, Read on consumerGroups
+    Collection<AclBinding> createdBindings = createdCaptor.getValue();
+    assertThat(createdBindings)
+        .hasSize(3)
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "topicPref", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.READ, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "topicPref", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.DESCRIBE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.GROUP, "cgPref", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.READ, AclPermissionType.ALLOW)));
+  }
+
+  @Test
+  void createsProducerDependantAcls() {
+    ArgumentCaptor<Collection<AclBinding>> createdCaptor = ArgumentCaptor.forClass(Collection.class);
+    when(adminClientMock.createAcls(createdCaptor.capture()))
+        .thenReturn(Mono.empty());
+
+    var principal = UUID.randomUUID().toString();
+    var host = UUID.randomUUID().toString();
+
+    aclsService.createProducerAcl(
+        CLUSTER,
+        new CreateProducerAclDTO()
+            .principal(principal)
+            .host(host)
+            .topics(List.of("t1"))
+            .idempotent(true)
+            .transactionalId("txId1")
+    ).block();
+
+    //Write, Describe, Create permission on topics, Write, Describe on transactionalIds
+    //IDEMPOTENT_WRITE on cluster if idempotent is enabled (true)
+    Collection<AclBinding> createdBindings = createdCaptor.getValue();
+    assertThat(createdBindings)
+        .hasSize(6)
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t1", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.WRITE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t1", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.DESCRIBE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t1", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.CREATE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TRANSACTIONAL_ID, "txId1", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.WRITE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TRANSACTIONAL_ID, "txId1", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.DESCRIBE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.CLUSTER, Resource.CLUSTER_NAME, PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.IDEMPOTENT_WRITE, AclPermissionType.ALLOW)));
+  }
+
+
+  @Test
+  void createsProducerDependantAclsWhenTopicsAndTxIdSpecifiedByPrefix() {
+    ArgumentCaptor<Collection<AclBinding>> createdCaptor = ArgumentCaptor.forClass(Collection.class);
+    when(adminClientMock.createAcls(createdCaptor.capture()))
+        .thenReturn(Mono.empty());
+
+    var principal = UUID.randomUUID().toString();
+    var host = UUID.randomUUID().toString();
+
+    aclsService.createProducerAcl(
+        CLUSTER,
+        new CreateProducerAclDTO()
+            .principal(principal)
+            .host(host)
+            .topicsPrefix("topicPref")
+            .transactionsIdPrefix("txIdPref")
+            .idempotent(false)
+    ).block();
+
+    //Write, Describe, Create permission on topics, Write, Describe on transactionalIds
+    //IDEMPOTENT_WRITE on cluster if idempotent is enabled (false)
+    Collection<AclBinding> createdBindings = createdCaptor.getValue();
+    assertThat(createdBindings)
+        .hasSize(5)
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "topicPref", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.WRITE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "topicPref", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.DESCRIBE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "topicPref", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.CREATE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TRANSACTIONAL_ID, "txIdPref", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.WRITE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TRANSACTIONAL_ID, "txIdPref", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.DESCRIBE, AclPermissionType.ALLOW)));
+  }
+
+
+  @Test
+  void createsStreamAppDependantAcls() {
+    ArgumentCaptor<Collection<AclBinding>> createdCaptor = ArgumentCaptor.forClass(Collection.class);
+    when(adminClientMock.createAcls(createdCaptor.capture()))
+        .thenReturn(Mono.empty());
+
+    var principal = UUID.randomUUID().toString();
+    var host = UUID.randomUUID().toString();
+
+    aclsService.createStreamAppAcl(
+        CLUSTER,
+        new CreateStreamAppAclDTO()
+            .principal(principal)
+            .host(host)
+            .inputTopics(List.of("t1"))
+            .outputTopics(List.of("t2", "t3"))
+            .applicationId("appId1")
+    ).block();
+
+    // Read on input topics, Write on output topics
+    // ALL on applicationId-prefixed Groups and Topics
+    Collection<AclBinding> createdBindings = createdCaptor.getValue();
+    assertThat(createdBindings)
+        .hasSize(5)
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t1", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.READ, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t2", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.WRITE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "t3", PatternType.LITERAL),
+            new AccessControlEntry(principal, host, AclOperation.WRITE, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.GROUP, "appId1", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.ALL, AclPermissionType.ALLOW)))
+        .contains(new AclBinding(
+            new ResourcePattern(ResourceType.TOPIC, "appId1", PatternType.PREFIXED),
+            new AccessControlEntry(principal, host, AclOperation.ALL, AclPermissionType.ALLOW)));
+  }
 }
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index f9ed233bc1d..9484948b67e 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -1868,6 +1868,69 @@ paths:
         404:
           description: Acl not found
 
+  /api/clusters/{clusterName}/acl/consumer:
+    post:
+      tags:
+        - Acls
+      summary: createConsumerAcl
+      operationId: createConsumerAcl
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CreateConsumerAcl'
+      responses:
+        200:
+          description: OK
+
+  /api/clusters/{clusterName}/acl/producer:
+    post:
+      tags:
+        - Acls
+      summary: createProducerAcl
+      operationId: createProducerAcl
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CreateProducerAcl'
+      responses:
+        200:
+          description: OK
+
+  /api/clusters/{clusterName}/acl/streamApp:
+    post:
+      tags:
+        - Acls
+      summary: createStreamAppAcl
+      operationId: createStreamAppAcl
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CreateStreamAppAcl'
+      responses:
+        200:
+          description: OK
+
   /api/authorization:
     get:
       tags:
@@ -3551,7 +3614,7 @@ components:
         principal:
           type: string
         host:
-          type: string  # "*" if acl can be applied to any resource of given type
+          type: string
         operation:
           type: string
           enum:
@@ -3575,6 +3638,69 @@ components:
             - ALLOW
             - DENY
 
+    CreateConsumerAcl:
+      type: object
+      required: [principal, host]
+      properties:
+        principal:
+          type: string
+        host:
+          type: string
+        topics:
+          type: array
+          items:
+            type: string
+        topicsPrefix:
+          type: string
+        consumerGroups:
+          type: array
+          items:
+            type: string
+        consumerGroupsPrefix:
+          type: string
+
+    CreateProducerAcl:
+      type: object
+      required: [principal, host]
+      properties:
+        principal:
+          type: string
+        host:
+          type: string
+        topics:
+          type: array
+          items:
+            type: string
+        topicsPrefix:
+          type: string
+        transactionalId:
+          type: string
+        transactionsIdPrefix:
+          type: string
+        idempotent:
+          type: boolean
+          default: false
+
+    CreateStreamAppAcl:
+      type: object
+      required: [principal, host, applicationId, inputTopics, outputTopics]
+      properties:
+        principal:
+          type: string
+        host:
+          type: string
+        inputTopics:
+          type: array
+          items:
+            type: string
+        outputTopics:
+          type: array
+          items:
+            type: string
+        applicationId:
+          nullable: false
+          type: string
+
     KafkaAclResourceType:
       type: string
       enum:

From b2c3fcc321c84a5c85f4ca4a96a3c7b647f0d087 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 1 Aug 2023 16:42:00 +0400
Subject: [PATCH 657/734] BE: ACL enablement check fixes (#4034)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../kafka/ui/service/ReactiveAdminClient.java | 67 ++++++++++---------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 0b6f16a2235..9de908efa7f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -15,6 +15,8 @@
 import com.provectus.kafka.ui.util.KafkaVersion;
 import com.provectus.kafka.ui.util.annotation.KafkaClientInternalsDependant;
 import java.io.Closeable;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -129,38 +131,41 @@ private record ConfigRelatedInfo(String version,
                                    Set<SupportedFeature> features,
                                    boolean topicDeletionIsAllowed) {
 
-    private static Mono<ConfigRelatedInfo> extract(AdminClient ac, int controllerId) {
-      return loadBrokersConfig(ac, List.of(controllerId))
-          .map(map -> map.isEmpty() ? List.<ConfigEntry>of() : map.get(controllerId))
-          .flatMap(configs -> {
-            String version = "1.0-UNKNOWN";
-            boolean topicDeletionEnabled = true;
-            for (ConfigEntry entry : configs) {
-              if (entry.name().contains("inter.broker.protocol.version")) {
-                version = entry.value();
-              }
-              if (entry.name().equals("delete.topic.enable")) {
-                topicDeletionEnabled = Boolean.parseBoolean(entry.value());
-              }
-            }
-            var builder = ConfigRelatedInfo.builder()
-                .version(version)
-                .topicDeletionIsAllowed(topicDeletionEnabled);
-            return SupportedFeature.forVersion(ac, version)
-                .map(features -> builder.features(features).build());
-          });
+    static final Duration UPDATE_DURATION = Duration.of(1, ChronoUnit.HOURS);
+
+    private static Mono<ConfigRelatedInfo> extract(AdminClient ac) {
+      return ReactiveAdminClient.describeClusterImpl(ac, Set.of())
+          .flatMap(desc -> {
+            // choosing node from which we will get configs (starting with controller)
+            var targetNodeId = Optional.ofNullable(desc.controller)
+                .map(Node::id)
+                .orElse(desc.getNodes().iterator().next().id());
+            return loadBrokersConfig(ac, List.of(targetNodeId))
+                .map(map -> map.isEmpty() ? List.<ConfigEntry>of() : map.get(targetNodeId))
+                .flatMap(configs -> {
+                  String version = "1.0-UNKNOWN";
+                  boolean topicDeletionEnabled = true;
+                  for (ConfigEntry entry : configs) {
+                    if (entry.name().contains("inter.broker.protocol.version")) {
+                      version = entry.value();
+                    }
+                    if (entry.name().equals("delete.topic.enable")) {
+                      topicDeletionEnabled = Boolean.parseBoolean(entry.value());
+                    }
+                  }
+                  final String finalVersion = version;
+                  final boolean finalTopicDeletionEnabled = topicDeletionEnabled;
+                  return SupportedFeature.forVersion(ac, version)
+                      .map(features -> new ConfigRelatedInfo(finalVersion, features, finalTopicDeletionEnabled));
+                });
+          })
+          .cache(UPDATE_DURATION);
     }
   }
 
   public static Mono<ReactiveAdminClient> create(AdminClient adminClient) {
-    return describeClusterImpl(adminClient, Set.of())
-        // choosing node from which we will get configs (starting with controller)
-        .flatMap(descr -> descr.controller != null
-            ? Mono.just(descr.controller)
-            : Mono.justOrEmpty(descr.nodes.stream().findFirst())
-        )
-        .flatMap(node -> ConfigRelatedInfo.extract(adminClient, node.id()))
-        .map(info -> new ReactiveAdminClient(adminClient, info));
+    Mono<ConfigRelatedInfo> configRelatedInfoMono = ConfigRelatedInfo.extract(adminClient);
+    return configRelatedInfoMono.map(info -> new ReactiveAdminClient(adminClient, configRelatedInfoMono, info));
   }
 
 
@@ -170,7 +175,7 @@ private static Mono<Boolean> isAuthorizedSecurityEnabled(AdminClient ac, @Nullab
         .doOnError(th -> !(th instanceof SecurityDisabledException)
                 && !(th instanceof InvalidRequestException)
                 && !(th instanceof UnsupportedVersionException),
-            th -> log.warn("Error checking if security enabled", th))
+            th -> log.debug("Error checking if security enabled", th))
         .onErrorReturn(false);
   }
 
@@ -202,6 +207,8 @@ public static <T> Mono<T> toMono(KafkaFuture<T> future) {
 
   @Getter(AccessLevel.PACKAGE) // visible for testing
   private final AdminClient client;
+  private final Mono<ConfigRelatedInfo> configRelatedInfoMono;
+
   private volatile ConfigRelatedInfo configRelatedInfo;
 
   public Set<SupportedFeature> getClusterFeatures() {
@@ -228,7 +235,7 @@ public Mono<Void> updateInternalStats(@Nullable Node controller) {
     if (controller == null) {
       return Mono.empty();
     }
-    return ConfigRelatedInfo.extract(client, controller.id())
+    return configRelatedInfoMono
         .doOnNext(info -> this.configRelatedInfo = info)
         .then();
   }

From c96a0c6be517e9e03cc6f0ab0e33c5ce7791e56c Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 1 Aug 2023 18:19:03 +0400
Subject: [PATCH 658/734] ISSSUE4052: Polling metrics (#4069)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 kafka-ui-api/pom.xml                          |  5 ++
 .../auth/AbstractAuthSecurityConfig.java      |  1 +
 .../kafka/ui/emitter/AbstractEmitter.java     | 25 ++----
 .../ui/emitter/BackwardRecordEmitter.java     | 16 ++--
 .../kafka/ui/emitter/ConsumingStats.java      | 17 +---
 .../kafka/ui/emitter/EmptyPollsCounter.java   |  4 +-
 .../kafka/ui/emitter/EnhancedConsumer.java    | 82 +++++++++++++++++++
 .../ui/emitter/ForwardRecordEmitter.java      | 12 ++-
 .../kafka/ui/emitter/MessagesProcessing.java  |  8 +-
 .../kafka/ui/emitter/PolledRecords.java       | 48 +++++++++++
 .../kafka/ui/emitter/PollingThrottler.java    | 12 +--
 .../kafka/ui/emitter/TailingEmitter.java      | 10 +--
 .../ui/service/ConsumerGroupService.java      | 19 +++--
 .../service/analyze/TopicAnalysisService.java | 13 +--
 .../kafka/ui/util/ApplicationMetrics.java     | 82 +++++++++++++++++++
 .../kafka/ui/util/ConsumerRecordsUtil.java    | 29 -------
 .../src/main/resources/application.yml        |  2 +-
 .../kafka/ui/service/RecordEmitterTest.java   | 14 ++--
 18 files changed, 275 insertions(+), 124 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EnhancedConsumer.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PolledRecords.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationMetrics.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordsUtil.java

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 829f7dc5c50..558a446e948 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -114,6 +114,11 @@
             <artifactId>json</artifactId>
             <version>${org.json.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AbstractAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AbstractAuthSecurityConfig.java
index 7fc9f827802..0c70b79716e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AbstractAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AbstractAuthSecurityConfig.java
@@ -13,6 +13,7 @@ protected AbstractAuthSecurityConfig() {
       "/resources/**",
       "/actuator/health/**",
       "/actuator/info",
+      "/actuator/prometheus",
       "/auth",
       "/login",
       "/logout",
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
index 9ea0526bac8..66bb24f0e1c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
@@ -2,37 +2,28 @@
 
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import java.time.Duration;
-import java.time.Instant;
-import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
 
 public abstract class AbstractEmitter {
 
   private final MessagesProcessing messagesProcessing;
-  private final PollingThrottler throttler;
   protected final PollingSettings pollingSettings;
 
   protected AbstractEmitter(MessagesProcessing messagesProcessing, PollingSettings pollingSettings) {
     this.messagesProcessing = messagesProcessing;
     this.pollingSettings = pollingSettings;
-    this.throttler = pollingSettings.getPollingThrottler();
   }
 
-  protected ConsumerRecords<Bytes, Bytes> poll(
-      FluxSink<TopicMessageEventDTO> sink, Consumer<Bytes, Bytes> consumer) {
+  protected PolledRecords poll(
+      FluxSink<TopicMessageEventDTO> sink, EnhancedConsumer consumer) {
     return poll(sink, consumer, pollingSettings.getPollTimeout());
   }
 
-  protected ConsumerRecords<Bytes, Bytes> poll(
-      FluxSink<TopicMessageEventDTO> sink, Consumer<Bytes, Bytes> consumer, Duration timeout) {
-    Instant start = Instant.now();
-    ConsumerRecords<Bytes, Bytes> records = consumer.poll(timeout);
-    Instant finish = Instant.now();
-    int polledBytes = sendConsuming(sink, records, Duration.between(start, finish).toMillis());
-    throttler.throttleAfterPoll(polledBytes);
+  protected PolledRecords poll(FluxSink<TopicMessageEventDTO> sink, EnhancedConsumer consumer, Duration timeout) {
+    var records = consumer.pollEnhanced(timeout);
+    sendConsuming(sink, records);
     return records;
   }
 
@@ -49,10 +40,8 @@ protected void sendPhase(FluxSink<TopicMessageEventDTO> sink, String name) {
     messagesProcessing.sendPhase(sink, name);
   }
 
-  protected int sendConsuming(FluxSink<TopicMessageEventDTO> sink,
-                              ConsumerRecords<Bytes, Bytes> records,
-                              long elapsed) {
-    return messagesProcessing.sentConsumingInfo(sink, records, elapsed);
+  protected void sendConsuming(FluxSink<TopicMessageEventDTO> sink, PolledRecords records) {
+    messagesProcessing.sentConsumingInfo(sink, records);
   }
 
   protected void sendFinishStatsAndCompleteSink(FluxSink<TopicMessageEventDTO> sink) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
index ccd24e85680..368b7cee5b2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
@@ -9,9 +9,7 @@
 import java.util.TreeMap;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.errors.InterruptException;
 import org.apache.kafka.common.utils.Bytes;
@@ -22,12 +20,12 @@ public class BackwardRecordEmitter
     extends AbstractEmitter
     implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
 
-  private final Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier;
+  private final Supplier<EnhancedConsumer> consumerSupplier;
   private final ConsumerPosition consumerPosition;
   private final int messagesPerPage;
 
   public BackwardRecordEmitter(
-      Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
+      Supplier<EnhancedConsumer> consumerSupplier,
       ConsumerPosition consumerPosition,
       int messagesPerPage,
       MessagesProcessing messagesProcessing,
@@ -41,7 +39,7 @@ public BackwardRecordEmitter(
   @Override
   public void accept(FluxSink<TopicMessageEventDTO> sink) {
     log.debug("Starting backward polling for {}", consumerPosition);
-    try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
+    try (EnhancedConsumer consumer = consumerSupplier.get()) {
       sendPhase(sink, "Created consumer");
 
       var seekOperations = SeekOperations.create(consumer, consumerPosition);
@@ -91,7 +89,7 @@ private List<ConsumerRecord<Bytes, Bytes>> partitionPollIteration(
       TopicPartition tp,
       long fromOffset,
       long toOffset,
-      Consumer<Bytes, Bytes> consumer,
+      EnhancedConsumer consumer,
       FluxSink<TopicMessageEventDTO> sink
   ) {
     consumer.assign(Collections.singleton(tp));
@@ -101,13 +99,13 @@ private List<ConsumerRecord<Bytes, Bytes>> partitionPollIteration(
 
     var recordsToSend = new ArrayList<ConsumerRecord<Bytes, Bytes>>();
 
-    EmptyPollsCounter emptyPolls  = pollingSettings.createEmptyPollsCounter();
+    EmptyPollsCounter emptyPolls = pollingSettings.createEmptyPollsCounter();
     while (!sink.isCancelled()
         && !sendLimitReached()
         && recordsToSend.size() < desiredMsgsToPoll
         && !emptyPolls.noDataEmptyPollsReached()) {
       var polledRecords = poll(sink, consumer, pollingSettings.getPartitionPollTimeout());
-      emptyPolls.count(polledRecords);
+      emptyPolls.count(polledRecords.count());
 
       log.debug("{} records polled from {}", polledRecords.count(), tp);
 
@@ -115,7 +113,7 @@ private List<ConsumerRecord<Bytes, Bytes>> partitionPollIteration(
           .filter(r -> r.offset() < toOffset)
           .toList();
 
-      if (!polledRecords.isEmpty() && filteredRecords.isEmpty()) {
+      if (polledRecords.count() > 0 && filteredRecords.isEmpty()) {
         // we already read all messages in target offsets interval
         break;
       }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
index 0e002f36a44..0440f7d37fb 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
@@ -2,9 +2,6 @@
 
 import com.provectus.kafka.ui.model.TopicMessageConsumingDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.util.ConsumerRecordsUtil;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
 
 class ConsumingStats {
@@ -13,23 +10,17 @@ class ConsumingStats {
   private int records = 0;
   private long elapsed = 0;
 
-  /**
-   * returns bytes polled.
-   */
-  int sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
-                        ConsumerRecords<Bytes, Bytes> polledRecords,
-                        long elapsed,
+  void sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
+                        PolledRecords polledRecords,
                         int filterApplyErrors) {
-    int polledBytes = ConsumerRecordsUtil.calculatePolledSize(polledRecords);
-    bytes += polledBytes;
+    bytes += polledRecords.bytes();
     this.records += polledRecords.count();
-    this.elapsed += elapsed;
+    this.elapsed += polledRecords.elapsed().toMillis();
     sink.next(
         new TopicMessageEventDTO()
             .type(TopicMessageEventDTO.TypeEnum.CONSUMING)
             .consuming(createConsumingStats(sink, filterApplyErrors))
     );
-    return polledBytes;
   }
 
   void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink, int filterApplyErrors) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java
index 3bc2ca38c1d..cd035f9c658 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java
@@ -17,8 +17,8 @@ public class EmptyPollsCounter {
     this.maxEmptyPolls = maxEmptyPolls;
   }
 
-  public void count(ConsumerRecords<?, ?> polled) {
-    emptyPolls = polled.isEmpty() ? emptyPolls + 1 : 0;
+  public void count(int polledCount) {
+    emptyPolls = polledCount == 0 ? emptyPolls + 1 : 0;
   }
 
   public boolean noDataEmptyPollsReached() {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EnhancedConsumer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EnhancedConsumer.java
new file mode 100644
index 00000000000..be849c7888e
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EnhancedConsumer.java
@@ -0,0 +1,82 @@
+package com.provectus.kafka.ui.emitter;
+
+import com.google.common.base.Preconditions;
+import com.google.common.base.Stopwatch;
+import com.provectus.kafka.ui.util.ApplicationMetrics;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.Delegate;
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.serialization.BytesDeserializer;
+import org.apache.kafka.common.utils.Bytes;
+
+
+public class EnhancedConsumer extends KafkaConsumer<Bytes, Bytes> {
+
+  private final PollingThrottler throttler;
+  private final ApplicationMetrics metrics;
+  private String pollingTopic;
+
+  public EnhancedConsumer(Properties properties,
+                          PollingThrottler throttler,
+                          ApplicationMetrics metrics) {
+    super(properties, new BytesDeserializer(), new BytesDeserializer());
+    this.throttler = throttler;
+    this.metrics = metrics;
+    metrics.activeConsumers().incrementAndGet();
+  }
+
+  public PolledRecords pollEnhanced(Duration dur) {
+    var stopwatch = Stopwatch.createStarted();
+    ConsumerRecords<Bytes, Bytes> polled = poll(dur);
+    PolledRecords polledEnhanced = PolledRecords.create(polled, stopwatch.elapsed());
+    var throttled = throttler.throttleAfterPoll(polledEnhanced.bytes());
+    metrics.meterPolledRecords(pollingTopic, polledEnhanced, throttled);
+    return polledEnhanced;
+  }
+
+  @Override
+  public void assign(Collection<TopicPartition> partitions) {
+    super.assign(partitions);
+    Set<String> assignedTopics = partitions.stream().map(TopicPartition::topic).collect(Collectors.toSet());
+    Preconditions.checkState(assignedTopics.size() == 1);
+    this.pollingTopic = assignedTopics.iterator().next();
+  }
+
+  @Override
+  public void subscribe(Pattern pattern) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void subscribe(Collection<String> topics) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void subscribe(Pattern pattern, ConsumerRebalanceListener listener) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void subscribe(Collection<String> topics, ConsumerRebalanceListener listener) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void close(Duration timeout) {
+    metrics.activeConsumers().decrementAndGet();
+    super.close(timeout);
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
index 8f85e0a8ba2..44c6b63038a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
@@ -5,8 +5,6 @@
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.errors.InterruptException;
 import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
@@ -16,11 +14,11 @@ public class ForwardRecordEmitter
     extends AbstractEmitter
     implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
 
-  private final Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier;
+  private final Supplier<EnhancedConsumer> consumerSupplier;
   private final ConsumerPosition position;
 
   public ForwardRecordEmitter(
-      Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
+      Supplier<EnhancedConsumer> consumerSupplier,
       ConsumerPosition position,
       MessagesProcessing messagesProcessing,
       PollingSettings pollingSettings) {
@@ -32,7 +30,7 @@ public ForwardRecordEmitter(
   @Override
   public void accept(FluxSink<TopicMessageEventDTO> sink) {
     log.debug("Starting forward polling for {}", position);
-    try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
+    try (EnhancedConsumer consumer = consumerSupplier.get()) {
       sendPhase(sink, "Assigning partitions");
       var seekOperations = SeekOperations.create(consumer, position);
       seekOperations.assignAndSeekNonEmptyPartitions();
@@ -44,8 +42,8 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
           && !emptyPolls.noDataEmptyPollsReached()) {
 
         sendPhase(sink, "Polling");
-        ConsumerRecords<Bytes, Bytes> records = poll(sink, consumer);
-        emptyPolls.count(records);
+        var records = poll(sink, consumer);
+        emptyPolls.count(records.count());
 
         log.debug("{} records polled", records.count());
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java
index b6d23bc90d3..d2d938cda68 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java
@@ -8,7 +8,6 @@
 import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
 
@@ -54,13 +53,10 @@ void sendMsg(FluxSink<TopicMessageEventDTO> sink, ConsumerRecord<Bytes, Bytes> r
     }
   }
 
-  int sentConsumingInfo(FluxSink<TopicMessageEventDTO> sink,
-                        ConsumerRecords<Bytes, Bytes> polledRecords,
-                        long elapsed) {
+  void sentConsumingInfo(FluxSink<TopicMessageEventDTO> sink, PolledRecords polledRecords) {
     if (!sink.isCancelled()) {
-      return consumingStats.sendConsumingEvt(sink, polledRecords, elapsed, filterApplyErrors);
+      consumingStats.sendConsumingEvt(sink, polledRecords, filterApplyErrors);
     }
-    return 0;
   }
 
   void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PolledRecords.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PolledRecords.java
new file mode 100644
index 00000000000..bc6bd95d5f6
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PolledRecords.java
@@ -0,0 +1,48 @@
+package com.provectus.kafka.ui.emitter;
+
+import java.time.Duration;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.header.Header;
+import org.apache.kafka.common.utils.Bytes;
+
+public record PolledRecords(int count,
+                            int bytes,
+                            Duration elapsed,
+                            ConsumerRecords<Bytes, Bytes> records) implements Iterable<ConsumerRecord<Bytes, Bytes>> {
+
+  static PolledRecords create(ConsumerRecords<Bytes, Bytes> polled, Duration pollDuration) {
+    return new PolledRecords(
+        polled.count(),
+        calculatePolledRecSize(polled),
+        pollDuration,
+        polled
+    );
+  }
+
+  public List<ConsumerRecord<Bytes, Bytes>> records(TopicPartition tp) {
+    return records.records(tp);
+  }
+
+  @Override
+  public Iterator<ConsumerRecord<Bytes, Bytes>> iterator() {
+    return records.iterator();
+  }
+
+  private static int calculatePolledRecSize(Iterable<ConsumerRecord<Bytes, Bytes>> recs) {
+    int polledBytes = 0;
+    for (ConsumerRecord<Bytes, Bytes> rec : recs) {
+      for (Header header : rec.headers()) {
+        polledBytes +=
+            (header.key() != null ? header.key().getBytes().length : 0)
+                + (header.value() != null ? header.value().length : 0);
+      }
+      polledBytes += rec.key() == null ? 0 : rec.serializedKeySize();
+      polledBytes += rec.value() == null ? 0 : rec.serializedValueSize();
+    }
+    return polledBytes;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingThrottler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingThrottler.java
index 15dfcd91c94..4cde50cdef2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingThrottler.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingThrottler.java
@@ -3,11 +3,8 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.RateLimiter;
 import com.provectus.kafka.ui.config.ClustersProperties;
-import com.provectus.kafka.ui.util.ConsumerRecordsUtil;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-import org.apache.kafka.common.utils.Bytes;
 
 @Slf4j
 public class PollingThrottler {
@@ -36,18 +33,17 @@ public static PollingThrottler noop() {
     return new PollingThrottler("noop", RateLimiter.create(Long.MAX_VALUE));
   }
 
-  public void throttleAfterPoll(int polledBytes) {
+  //returns true if polling was throttled
+  public boolean throttleAfterPoll(int polledBytes) {
     if (polledBytes > 0) {
       double sleptSeconds = rateLimiter.acquire(polledBytes);
       if (!throttled && sleptSeconds > 0.0) {
         throttled = true;
         log.debug("Polling throttling enabled for cluster {} at rate {} bytes/sec", clusterName, rateLimiter.getRate());
+        return true;
       }
     }
-  }
-
-  public void throttleAfterPoll(ConsumerRecords<Bytes, Bytes> polled) {
-    throttleAfterPoll(ConsumerRecordsUtil.calculatePolledSize(polled));
+    return false;
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
index b17d69a09b4..c3e6dcc8ff1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
@@ -5,19 +5,17 @@
 import java.util.HashMap;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.errors.InterruptException;
-import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
 
 @Slf4j
 public class TailingEmitter extends AbstractEmitter
     implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
 
-  private final Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier;
+  private final Supplier<EnhancedConsumer> consumerSupplier;
   private final ConsumerPosition consumerPosition;
 
-  public TailingEmitter(Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
+  public TailingEmitter(Supplier<EnhancedConsumer> consumerSupplier,
                         ConsumerPosition consumerPosition,
                         MessagesProcessing messagesProcessing,
                         PollingSettings pollingSettings) {
@@ -29,7 +27,7 @@ public TailingEmitter(Supplier<KafkaConsumer<Bytes, Bytes>> consumerSupplier,
   @Override
   public void accept(FluxSink<TopicMessageEventDTO> sink) {
     log.debug("Starting tailing polling for {}", consumerPosition);
-    try (KafkaConsumer<Bytes, Bytes> consumer = consumerSupplier.get()) {
+    try (EnhancedConsumer consumer = consumerSupplier.get()) {
       assignAndSeek(consumer);
       while (!sink.isCancelled()) {
         sendPhase(sink, "Polling");
@@ -47,7 +45,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
     }
   }
 
-  private void assignAndSeek(KafkaConsumer<Bytes, Bytes> consumer) {
+  private void assignAndSeek(EnhancedConsumer consumer) {
     var seekOperations = SeekOperations.create(consumer, consumerPosition);
     var seekOffsets = new HashMap<>(seekOperations.getEndOffsets()); // defaulting offsets to topic end
     seekOffsets.putAll(seekOperations.getOffsetsForSeek()); // this will only set non-empty partitions
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
index 17291ffe60c..9764664d6a2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ConsumerGroupService.java
@@ -2,12 +2,14 @@
 
 import com.google.common.collect.Streams;
 import com.google.common.collect.Table;
+import com.provectus.kafka.ui.emitter.EnhancedConsumer;
 import com.provectus.kafka.ui.model.ConsumerGroupOrderingDTO;
 import com.provectus.kafka.ui.model.InternalConsumerGroup;
 import com.provectus.kafka.ui.model.InternalTopicConsumerGroup;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.SortOrderDTO;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import com.provectus.kafka.ui.util.ApplicationMetrics;
 import com.provectus.kafka.ui.util.SslPropertiesUtil;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,11 +28,8 @@
 import org.apache.kafka.clients.admin.ConsumerGroupListing;
 import org.apache.kafka.clients.admin.OffsetSpec;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.ConsumerGroupState;
 import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.serialization.BytesDeserializer;
-import org.apache.kafka.common.utils.Bytes;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
@@ -248,25 +247,27 @@ public Mono<Void> deleteConsumerGroupById(KafkaCluster cluster,
         .flatMap(adminClient -> adminClient.deleteConsumerGroups(List.of(groupId)));
   }
 
-  public KafkaConsumer<Bytes, Bytes> createConsumer(KafkaCluster cluster) {
+  public EnhancedConsumer createConsumer(KafkaCluster cluster) {
     return createConsumer(cluster, Map.of());
   }
 
-  public KafkaConsumer<Bytes, Bytes> createConsumer(KafkaCluster cluster,
-                                                    Map<String, Object> properties) {
+  public EnhancedConsumer createConsumer(KafkaCluster cluster,
+                                         Map<String, Object> properties) {
     Properties props = new Properties();
     SslPropertiesUtil.addKafkaSslProperties(cluster.getOriginalProperties().getSsl(), props);
     props.putAll(cluster.getProperties());
     props.put(ConsumerConfig.CLIENT_ID_CONFIG, "kafka-ui-consumer-" + System.currentTimeMillis());
     props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, cluster.getBootstrapServers());
-    props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class);
-    props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class);
     props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
     props.put(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, "false");
     props.put(ConsumerConfig.ALLOW_AUTO_CREATE_TOPICS_CONFIG, "false");
     props.putAll(properties);
 
-    return new KafkaConsumer<>(props);
+    return new EnhancedConsumer(
+        props,
+        cluster.getPollingSettings().getPollingThrottler(),
+        ApplicationMetrics.forCluster(cluster)
+    );
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
index 7ea7a165983..e17d2cf84ac 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
@@ -1,9 +1,9 @@
 package com.provectus.kafka.ui.service.analyze;
 
 import com.provectus.kafka.ui.emitter.EmptyPollsCounter;
+import com.provectus.kafka.ui.emitter.EnhancedConsumer;
 import com.provectus.kafka.ui.emitter.OffsetsInfo;
 import com.provectus.kafka.ui.emitter.PollingSettings;
-import com.provectus.kafka.ui.emitter.PollingThrottler;
 import com.provectus.kafka.ui.exception.TopicAnalysisException;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.TopicAnalysisDTO;
@@ -20,11 +20,9 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.errors.InterruptException;
 import org.apache.kafka.common.errors.WakeupException;
-import org.apache.kafka.common.utils.Bytes;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
@@ -84,12 +82,11 @@ class AnalysisTask implements Runnable, Closeable {
     private final int partitionsCnt;
     private final long approxNumberOfMsgs;
     private final EmptyPollsCounter emptyPollsCounter;
-    private final PollingThrottler throttler;
 
     private final TopicAnalysisStats totalStats = new TopicAnalysisStats();
     private final Map<Integer, TopicAnalysisStats> partitionStats = new HashMap<>();
 
-    private final KafkaConsumer<Bytes, Bytes> consumer;
+    private final EnhancedConsumer consumer;
 
     AnalysisTask(KafkaCluster cluster, TopicIdentity topicId, int partitionsCnt,
                  long approxNumberOfMsgs, PollingSettings pollingSettings) {
@@ -104,7 +101,6 @@ class AnalysisTask implements Runnable, Closeable {
               ConsumerConfig.MAX_POLL_RECORDS_CONFIG, "100000"
           )
       );
-      this.throttler = pollingSettings.getPollingThrottler();
       this.emptyPollsCounter = pollingSettings.createEmptyPollsCounter();
     }
 
@@ -127,9 +123,8 @@ public void run() {
 
         var offsetsInfo = new OffsetsInfo(consumer, topicId.topicName);
         while (!offsetsInfo.assignedPartitionsFullyPolled() && !emptyPollsCounter.noDataEmptyPollsReached()) {
-          var polled = consumer.poll(Duration.ofSeconds(3));
-          throttler.throttleAfterPoll(polled);
-          emptyPollsCounter.count(polled);
+          var polled = consumer.pollEnhanced(Duration.ofSeconds(3));
+          emptyPollsCounter.count(polled.count());
           polled.forEach(r -> {
             totalStats.apply(r);
             partitionStats.get(r.partition()).apply(r);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationMetrics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationMetrics.java
new file mode 100644
index 00000000000..841d5e87a51
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationMetrics.java
@@ -0,0 +1,82 @@
+package com.provectus.kafka.ui.util;
+
+import static lombok.AccessLevel.PRIVATE;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.provectus.kafka.ui.emitter.PolledRecords;
+import com.provectus.kafka.ui.model.KafkaCluster;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.DistributionSummary;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.util.concurrent.atomic.AtomicInteger;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor(access = PRIVATE)
+public class ApplicationMetrics {
+
+  private final String clusterName;
+  private final MeterRegistry registry;
+
+  public static ApplicationMetrics forCluster(KafkaCluster cluster) {
+    return new ApplicationMetrics(cluster.getName(), Metrics.globalRegistry);
+  }
+
+  @VisibleForTesting
+  public static ApplicationMetrics noop() {
+    return new ApplicationMetrics("noop", new SimpleMeterRegistry());
+  }
+
+  public void meterPolledRecords(String topic, PolledRecords polled, boolean throttled) {
+    pollTimer(topic).record(polled.elapsed());
+    polledRecords(topic).increment(polled.count());
+    polledBytes(topic).record(polled.bytes());
+    if (throttled) {
+      pollThrottlingActivations().increment();
+    }
+  }
+
+  private Counter polledRecords(String topic) {
+    return Counter.builder("topic_records_polled")
+        .description("Number of records polled from topic")
+        .tag("cluster", clusterName)
+        .tag("topic", topic)
+        .register(registry);
+  }
+
+  private DistributionSummary polledBytes(String topic) {
+    return DistributionSummary.builder("topic_polled_bytes")
+        .description("Bytes polled from kafka topic")
+        .tag("cluster", clusterName)
+        .tag("topic", topic)
+        .register(registry);
+  }
+
+  private Timer pollTimer(String topic) {
+    return Timer.builder("topic_poll_time")
+        .description("Time spend in polling for topic")
+        .tag("cluster", clusterName)
+        .tag("topic", topic)
+        .register(registry);
+  }
+
+  private Counter pollThrottlingActivations() {
+    return Counter.builder("poll_throttling_activations")
+        .description("Number of poll throttling activations")
+        .tag("cluster", clusterName)
+        .register(registry);
+  }
+
+  public AtomicInteger activeConsumers() {
+    var count = new AtomicInteger();
+    Gauge.builder("active_consumers", () -> count)
+        .description("Number of active consumers")
+        .tag("cluster", clusterName)
+        .register(registry);
+    return count;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordsUtil.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordsUtil.java
deleted file mode 100644
index e4efcb0f750..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ConsumerRecordsUtil.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.provectus.kafka.ui.util;
-
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.header.Header;
-import org.apache.kafka.common.utils.Bytes;
-
-public class ConsumerRecordsUtil {
-
-  public static int calculatePolledRecSize(ConsumerRecord<Bytes, Bytes> rec) {
-    int polledBytes = 0;
-    for (Header header : rec.headers()) {
-      polledBytes +=
-          (header.key() != null ? header.key().getBytes().length : 0)
-              + (header.value() != null ? header.value().length : 0);
-    }
-    polledBytes += rec.key() == null ? 0 : rec.serializedKeySize();
-    polledBytes += rec.value() == null ? 0 : rec.serializedValueSize();
-    return polledBytes;
-  }
-
-  public static int calculatePolledSize(Iterable<ConsumerRecord<Bytes, Bytes>> recs) {
-    int polledBytes = 0;
-    for (ConsumerRecord<Bytes, Bytes> rec : recs) {
-      polledBytes += calculatePolledRecSize(rec);
-    }
-    return polledBytes;
-  }
-
-}
diff --git a/kafka-ui-api/src/main/resources/application.yml b/kafka-ui-api/src/main/resources/application.yml
index 71af4e8d925..e8799206132 100644
--- a/kafka-ui-api/src/main/resources/application.yml
+++ b/kafka-ui-api/src/main/resources/application.yml
@@ -10,7 +10,7 @@ management:
   endpoints:
     web:
       exposure:
-        include: "info,health"
+        include: "info,health,prometheus"
 
 logging:
   level:
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
index 239f3cf994c..d093d3144c3 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
@@ -8,9 +8,11 @@
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
 import com.provectus.kafka.ui.emitter.BackwardRecordEmitter;
+import com.provectus.kafka.ui.emitter.EnhancedConsumer;
 import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
 import com.provectus.kafka.ui.emitter.MessagesProcessing;
 import com.provectus.kafka.ui.emitter.PollingSettings;
+import com.provectus.kafka.ui.emitter.PollingThrottler;
 import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.producer.KafkaTestProducer;
@@ -18,6 +20,7 @@
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import com.provectus.kafka.ui.serdes.PropertyResolverImpl;
 import com.provectus.kafka.ui.serdes.builtin.StringSerde;
+import com.provectus.kafka.ui.util.ApplicationMetrics;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,7 +41,6 @@
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.header.internals.RecordHeader;
 import org.apache.kafka.common.serialization.BytesDeserializer;
-import org.apache.kafka.common.utils.Bytes;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -325,22 +327,20 @@ private void expectEmitter(
     assertionsConsumer.accept(step.expectComplete().verifyThenAssertThat());
   }
 
-  private KafkaConsumer<Bytes, Bytes> createConsumer() {
+  private EnhancedConsumer createConsumer() {
     return createConsumer(Map.of());
   }
 
-  private KafkaConsumer<Bytes, Bytes> createConsumer(Map<String, Object> properties) {
+  private EnhancedConsumer createConsumer(Map<String, Object> properties) {
     final Map<String, ? extends Serializable> map = Map.of(
         ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServers(),
         ConsumerConfig.GROUP_ID_CONFIG, UUID.randomUUID().toString(),
-        ConsumerConfig.MAX_POLL_RECORDS_CONFIG, 19, // to check multiple polls
-        ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class,
-        ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, BytesDeserializer.class
+        ConsumerConfig.MAX_POLL_RECORDS_CONFIG, 19 // to check multiple polls
     );
     Properties props = new Properties();
     props.putAll(map);
     props.putAll(properties);
-    return new KafkaConsumer<>(props);
+    return new EnhancedConsumer(props, PollingThrottler.noop(), ApplicationMetrics.noop());
   }
 
   @Value

From 15f4543402694e877cd1de4e85ff850ffb505d7f Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 1 Aug 2023 21:27:31 +0700
Subject: [PATCH 659/734] BE: RBAC: Fix unknown resource exception (#4033)

---
 .../java/com/provectus/kafka/ui/model/rbac/Permission.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
index dd456400da5..56b0a098026 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
@@ -16,6 +16,7 @@
 import com.provectus.kafka.ui.model.rbac.permission.SchemaAction;
 import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
@@ -73,6 +74,10 @@ public void transform() {
   }
 
   private List<String> getAllActionValues() {
+    if (resource == null) {
+      return Collections.emptyList();
+    }
+
     return switch (this.resource) {
       case APPLICATIONCONFIG -> Arrays.stream(ApplicationConfigAction.values()).map(Enum::toString).toList();
       case CLUSTERCONFIG -> Arrays.stream(ClusterConfigAction.values()).map(Enum::toString).toList();

From 3cde6c21ecbc89ae902f89960afe2894014d1b89 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 1 Aug 2023 21:27:57 +0700
Subject: [PATCH 660/734] FE: Logout button link is bound to a wrong div
 (#4045)

---
 .../src/components/NavBar/UserInfo/UserInfo.tsx               | 4 ++--
 .../components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx    | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
index 2b432b10e3c..dae43364c45 100644
--- a/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
+++ b/kafka-ui-react-app/src/components/NavBar/UserInfo/UserInfo.tsx
@@ -19,8 +19,8 @@ const UserInfo = () => {
         </S.Wrapper>
       }
     >
-      <DropdownItem>
-        <S.LogoutLink href={`${window.basePath}/logout`}>Log out</S.LogoutLink>
+      <DropdownItem href={`${window.basePath}/logout`}>
+        <S.LogoutLink>Log out</S.LogoutLink>
       </DropdownItem>
     </Dropdown>
   ) : null;
diff --git a/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx b/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx
index b51f00da024..2231b09a250 100644
--- a/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx
+++ b/kafka-ui-react-app/src/components/NavBar/UserInfo/__tests__/UserInfo.spec.tsx
@@ -34,7 +34,6 @@ describe('UserInfo', () => {
 
     const logout = screen.getByText('Log out');
     expect(logout).toBeInTheDocument();
-    expect(logout).toHaveAttribute('href', '/logout');
   });
 
   it('should render correct url during basePath initialization', async () => {
@@ -50,7 +49,6 @@ describe('UserInfo', () => {
 
     const logout = screen.getByText('Log out');
     expect(logout).toBeInTheDocument();
-    expect(logout).toHaveAttribute('href', `${baseUrl}/logout`);
   });
 
   it('should not render anything if the username does not exists', () => {

From 77f1ec949028d3ae7de2f79835096fedc2b22334 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Tue, 1 Aug 2023 22:06:17 +0700
Subject: [PATCH 661/734] BE: RBAC: Skip rbac checks in case of app config
 (#4078)

---
 .../ui/service/rbac/AccessControlService.java     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index 6cc455624bc..59ea02fea84 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -51,6 +51,8 @@
 @Slf4j
 public class AccessControlService {
 
+  private static final String ACCESS_DENIED = "Access denied";
+
   @Nullable
   private final InMemoryReactiveClientRegistrationRepository clientRegistrationRepository;
   private final RoleBasedAccessControlProperties properties;
@@ -97,6 +99,17 @@ public Mono<Void> validateAccess(AccessContext context) {
       return Mono.empty();
     }
 
+    if (CollectionUtils.isNotEmpty(context.getApplicationConfigActions())) {
+      return getUser()
+          .doOnNext(user -> {
+            boolean accessGranted = isApplicationConfigAccessible(context, user);
+
+            if (!accessGranted) {
+              throw new AccessDeniedException(ACCESS_DENIED);
+            }
+          }).then();
+    }
+
     return getUser()
         .doOnNext(user -> {
           boolean accessGranted =
@@ -113,7 +126,7 @@ && isAclAccessible(context, user)
                   && isAuditAccessible(context, user);
 
           if (!accessGranted) {
-            throw new AccessDeniedException("Access denied");
+            throw new AccessDeniedException(ACCESS_DENIED);
           }
         })
         .then();

From 8126607b914d7aa53e37e1585b03df7bebdc6a4b Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 1 Aug 2023 19:25:09 +0400
Subject: [PATCH 662/734] BE: Audit: Minor refactoring (#4064)

---
 .../kafka/ui/service/audit/AuditService.java  | 54 ++++++++++++-------
 .../kafka/ui/service/audit/AuditWriter.java   |  4 +-
 .../ui/service/audit/AuditServiceTest.java    |  8 +--
 3 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
index 8d573078915..ad5f11e1f3d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
@@ -13,6 +13,7 @@
 import com.provectus.kafka.ui.service.ReactiveAdminClient;
 import java.io.Closeable;
 import java.io.IOException;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -37,6 +38,7 @@
 public class AuditService implements Closeable {
 
   private static final Mono<AuthenticatedUser> NO_AUTH_USER = Mono.just(new AuthenticatedUser("Unknown", Set.of()));
+  private static final Duration BLOCK_TIMEOUT = Duration.ofSeconds(5);
 
   private static final String DEFAULT_AUDIT_TOPIC_NAME = "__kui-audit-log";
   private static final int DEFAULT_AUDIT_TOPIC_PARTITIONS = 1;
@@ -56,14 +58,8 @@ public class AuditService implements Closeable {
   public AuditService(AdminClientService adminClientService, ClustersStorage clustersStorage) {
     Map<String, AuditWriter> auditWriters = new HashMap<>();
     for (var cluster : clustersStorage.getKafkaClusters()) {
-      ReactiveAdminClient adminClient;
-      try {
-        adminClient = adminClientService.get(cluster).block();
-      } catch (Exception e) {
-        printAuditInitError(cluster, "Error connect to cluster", e);
-        continue;
-      }
-      createAuditWriter(cluster, adminClient, () -> createProducer(cluster, AUDIT_PRODUCER_CONFIG))
+      Supplier<ReactiveAdminClient> adminClientSupplier = () -> adminClientService.get(cluster).block(BLOCK_TIMEOUT);
+      createAuditWriter(cluster, adminClientSupplier, () -> createProducer(cluster, AUDIT_PRODUCER_CONFIG))
           .ifPresent(writer -> auditWriters.put(cluster.getName(), writer));
     }
     this.auditWriters = auditWriters;
@@ -76,7 +72,7 @@ public AuditService(AdminClientService adminClientService, ClustersStorage clust
 
   @VisibleForTesting
   static Optional<AuditWriter> createAuditWriter(KafkaCluster cluster,
-                                                 ReactiveAdminClient ac,
+                                                 Supplier<ReactiveAdminClient> acSupplier,
                                                  Supplier<KafkaProducer<byte[], byte[]>> producerFactory) {
     var auditProps = cluster.getOriginalProperties().getAudit();
     if (auditProps == null) {
@@ -87,32 +83,54 @@ static Optional<AuditWriter> createAuditWriter(KafkaCluster cluster,
     if (!topicAudit && !consoleAudit) {
       return Optional.empty();
     }
+    if (!topicAudit) {
+      log.info("Audit initialization finished for cluster '{}' (console only)", cluster.getName());
+      return Optional.of(consoleOnlyWriter(cluster));
+    }
     String auditTopicName = Optional.ofNullable(auditProps.getTopic()).orElse(DEFAULT_AUDIT_TOPIC_NAME);
-    @Nullable KafkaProducer<byte[], byte[]> producer = null;
-    if (topicAudit && createTopicIfNeeded(cluster, ac, auditTopicName, auditProps)) {
-      producer = producerFactory.get();
+    boolean topicAuditCanBeDone = createTopicIfNeeded(cluster, acSupplier, auditTopicName, auditProps);
+    if (!topicAuditCanBeDone) {
+      if (consoleAudit) {
+        log.info(
+            "Audit initialization finished for cluster '{}' (console only, topic audit init failed)",
+            cluster.getName()
+        );
+        return Optional.of(consoleOnlyWriter(cluster));
+      }
+      return Optional.empty();
     }
-    log.info("Audit service initialized for cluster '{}'", cluster.getName());
+    log.info("Audit initialization finished for cluster '{}'", cluster.getName());
     return Optional.of(
         new AuditWriter(
             cluster.getName(),
             auditTopicName,
-            producer,
+            producerFactory.get(),
             consoleAudit ? AUDIT_LOGGER : null
         )
     );
   }
 
+  private static AuditWriter consoleOnlyWriter(KafkaCluster cluster) {
+    return new AuditWriter(cluster.getName(), null, null, AUDIT_LOGGER);
+  }
+
   /**
    * return true if topic created/existing and producing can be enabled.
    */
   private static boolean createTopicIfNeeded(KafkaCluster cluster,
-                                             ReactiveAdminClient ac,
+                                             Supplier<ReactiveAdminClient> acSupplier,
                                              String auditTopicName,
                                              ClustersProperties.AuditProperties auditProps) {
+    ReactiveAdminClient ac;
+    try {
+      ac = acSupplier.get();
+    } catch (Exception e) {
+      printAuditInitError(cluster, "Error while connecting to the cluster", e);
+      return false;
+    }
     boolean topicExists;
     try {
-      topicExists = ac.listTopics(true).block().contains(auditTopicName);
+      topicExists = ac.listTopics(true).block(BLOCK_TIMEOUT).contains(auditTopicName);
     } catch (Exception e) {
       printAuditInitError(cluster, "Error checking audit topic existence", e);
       return false;
@@ -130,7 +148,7 @@ private static boolean createTopicIfNeeded(KafkaCluster cluster,
           .ifPresent(topicConfig::putAll);
 
       log.info("Creating audit topic '{}' for cluster '{}'", auditTopicName, cluster.getName());
-      ac.createTopic(auditTopicName, topicPartitions, null, topicConfig).block();
+      ac.createTopic(auditTopicName, topicPartitions, null, topicConfig).block(BLOCK_TIMEOUT);
       log.info("Audit topic created for cluster '{}'", cluster.getName());
       return true;
     } catch (Exception e) {
@@ -142,7 +160,7 @@ private static boolean createTopicIfNeeded(KafkaCluster cluster,
   private static void printAuditInitError(KafkaCluster cluster, String errorMsg, Exception cause) {
     log.error("-----------------------------------------------------------------");
     log.error(
-        "Error initializing Audit Service for cluster '{}'. Audit will be disabled. See error below: ",
+        "Error initializing Audit for cluster '{}'. Audit will be disabled. See error below: ",
         cluster.getName()
     );
     log.error("{}", errorMsg, cause);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java
index c66bd8a1f5f..8fa8239278b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java
@@ -18,7 +18,7 @@
 
 @Slf4j
 record AuditWriter(String clusterName,
-                   String targetTopic,
+                   @Nullable String targetTopic,
                    @Nullable KafkaProducer<byte[], byte[]> producer,
                    @Nullable Logger consoleLogger) implements Closeable {
 
@@ -43,7 +43,7 @@ private void write(AuditRecord rec) {
     if (consoleLogger != null) {
       consoleLogger.info(json);
     }
-    if (producer != null) {
+    if (targetTopic != null && producer != null) {
       producer.send(
           new ProducerRecord<>(targetTopic, null, json.getBytes(UTF_8)),
           (metadata, ex) -> {
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java
index f123329ccf2..fd90dbacd68 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java
@@ -81,7 +81,7 @@ void init() {
 
     @Test
     void noWriterIfNoAuditPropsSet() {
-      var maybeWriter = createAuditWriter(cluster, adminClientMock, producerSupplierMock);
+      var maybeWriter = createAuditWriter(cluster, () -> adminClientMock, producerSupplierMock);
       assertThat(maybeWriter).isEmpty();
     }
 
@@ -91,7 +91,7 @@ void setsLoggerIfConsoleLoggingEnabled() {
       auditProps.setConsoleAuditEnabled(true);
       clustersProperties.setAudit(auditProps);
 
-      var maybeWriter = createAuditWriter(cluster, adminClientMock, producerSupplierMock);
+      var maybeWriter = createAuditWriter(cluster, () -> adminClientMock, producerSupplierMock);
       assertThat(maybeWriter).isPresent();
 
       var writer = maybeWriter.get();
@@ -116,7 +116,7 @@ void createsProducerIfTopicExists() {
         when(adminClientMock.listTopics(true))
             .thenReturn(Mono.just(Set.of("test_audit_topic")));
 
-        var maybeWriter = createAuditWriter(cluster, adminClientMock, producerSupplierMock);
+        var maybeWriter = createAuditWriter(cluster, () -> adminClientMock, producerSupplierMock);
         assertThat(maybeWriter).isPresent();
 
         //checking there was no topic creation request
@@ -136,7 +136,7 @@ void createsProducerAndTopicIfItIsNotExist() {
         when(adminClientMock.createTopic(eq("test_audit_topic"), eq(3), eq(null), anyMap()))
             .thenReturn(Mono.empty());
 
-        var maybeWriter = createAuditWriter(cluster, adminClientMock, producerSupplierMock);
+        var maybeWriter = createAuditWriter(cluster, () -> adminClientMock, producerSupplierMock);
         assertThat(maybeWriter).isPresent();
 
         //verifying topic created

From 92157bdd3966a9462ce694da7da107a6034a86aa Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 2 Aug 2023 13:58:58 +0400
Subject: [PATCH 663/734] BE: Hex serde initialization fix (#4081)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../com/provectus/kafka/ui/serdes/builtin/HexSerde.java  | 9 +++++++++
 .../provectus/kafka/ui/serdes/builtin/HexSerdeTest.java  | 8 ++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/HexSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/HexSerde.java
index cf1a6b793ff..343bb4e705d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/HexSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/HexSerde.java
@@ -16,12 +16,21 @@ public static String name() {
     return "Hex";
   }
 
+  @Override
+  public void autoConfigure(PropertyResolver kafkaClusterProperties, PropertyResolver globalProperties) {
+    configure(" ", true);
+  }
+
   @Override
   public void configure(PropertyResolver serdeProperties,
                         PropertyResolver kafkaClusterProperties,
                         PropertyResolver globalProperties) {
     String delim = serdeProperties.getProperty("delimiter", String.class).orElse(" ");
     boolean uppercase = serdeProperties.getProperty("uppercase", Boolean.class).orElse(true);
+    configure(delim, uppercase);
+  }
+
+  private void configure(String delim, boolean uppercase) {
     deserializeHexFormat = HexFormat.ofDelimiter(delim);
     if (uppercase) {
       deserializeHexFormat = deserializeHexFormat.withUpperCase();
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/HexSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/HexSerdeTest.java
index a318279f564..4ec28c15099 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/HexSerdeTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/HexSerdeTest.java
@@ -16,16 +16,12 @@ public class HexSerdeTest {
   private static final byte[] TEST_BYTES = "hello world".getBytes();
   private static final String TEST_BYTES_HEX_ENCODED = "68 65 6C 6C 6F 20 77 6F 72 6C 64";
 
-  private Serde hexSerde;
+  private HexSerde hexSerde;
 
   @BeforeEach
   void init() {
     hexSerde = new HexSerde();
-    hexSerde.configure(
-        PropertyResolverImpl.empty(),
-        PropertyResolverImpl.empty(),
-        PropertyResolverImpl.empty()
-    );
+    hexSerde.autoConfigure(PropertyResolverImpl.empty(), PropertyResolverImpl.empty());
   }
 
 

From 4515ecaf41c3da1e7c15fcdd2e6420e6788a772b Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 2 Aug 2023 15:30:37 +0400
Subject: [PATCH 664/734] Update README

Add stats banner
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index b276e2756fb..e3fa2ab9d2b 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,10 @@
     <a href="https://www.producthunt.com/products/ui-for-apache-kafka/reviews/new">ProductHunt</a>
 </p>
 
+<p align="center">
+  <img src="https://repobeats.axiom.co/api/embed/2e8a7c2d711af9daddd34f9791143e7554c35d0f.svg" />
+</p>
+
 #### UI for Apache Kafka is a free, open-source web UI to monitor and manage Apache Kafka clusters.
 
 UI for Apache Kafka is a simple tool that makes your data flows observable, helps find and troubleshoot issues faster and deliver optimal performance. Its lightweight dashboard makes it easy to track key metrics of your Kafka clusters - Brokers, Topics, Partitions, Production, and Consumption.

From 6a40146fb1fdd6b4c9edb22d7e8c4e94944a506d Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 2 Aug 2023 20:06:31 +0700
Subject: [PATCH 665/734] BE: Throw obvious exception in case no oauth2
 providers have been defined (#4002)

---
 .../provectus/kafka/ui/config/auth/OAuthSecurityConfig.java  | 3 +++
 .../kafka/ui/config/auth/condition/CognitoCondition.java     | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
index 0e7a228e485..797b41c6df1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/OAuthSecurityConfig.java
@@ -99,6 +99,9 @@ public InMemoryReactiveClientRegistrationRepository clientRegistrationRepository
     final OAuth2ClientProperties props = OAuthPropertiesConverter.convertProperties(properties);
     final List<ClientRegistration> registrations =
         new ArrayList<>(new OAuth2ClientPropertiesMapper(props).asClientRegistrations().values());
+    if (registrations.isEmpty()) {
+      throw new IllegalArgumentException("OAuth2 authentication is enabled but no providers specified.");
+    }
     return new InMemoryReactiveClientRegistrationRepository(registrations);
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/CognitoCondition.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/CognitoCondition.java
index dc56195ecc9..c3699858722 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/CognitoCondition.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/condition/CognitoCondition.java
@@ -1,13 +1,14 @@
 package com.provectus.kafka.ui.config.auth.condition;
 
 import com.provectus.kafka.ui.service.rbac.AbstractProviderCondition;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
 public class CognitoCondition extends AbstractProviderCondition implements Condition {
   @Override
-  public boolean matches(final ConditionContext context, final AnnotatedTypeMetadata metadata) {
+  public boolean matches(final ConditionContext context, final @NotNull AnnotatedTypeMetadata metadata) {
     return getRegisteredProvidersTypes(context.getEnvironment()).stream().anyMatch(a -> a.equalsIgnoreCase("cognito"));
   }
-}
\ No newline at end of file
+}

From 69ebd3d52b2065ef970063d92d36aa2684ecf289 Mon Sep 17 00:00:00 2001
From: Sungyun Hur <ethan0311@gmail.com>
Date: Thu, 3 Aug 2023 20:05:09 +0900
Subject: [PATCH 666/734] FE: display consumerGroupID in Reset Offsets page
 (#3866)

---
 .../components/ConsumerGroups/Details/ResetOffsets/Form.tsx    | 2 +-
 .../ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/Form.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/Form.tsx
index 8ee7995bf2a..0e4e05ba142 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/Form.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/Form.tsx
@@ -186,7 +186,7 @@ const Form: React.FC<FormProps> = ({ defaultValues, partitions, topics }) => {
             type="submit"
             disabled={partitionsValue.length === 0}
           >
-            Submit
+            Reset Offsets
           </Button>
         </div>
       </StyledForm>
diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
index 548ed47f543..0b586479462 100644
--- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
+++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/ResetOffsets/ResetOffsets.tsx
@@ -15,6 +15,7 @@ import Form from './Form';
 const ResetOffsets: React.FC = () => {
   const routerParams = useAppParams<ClusterGroupParam>();
 
+  const { consumerGroupID } = routerParams;
   const consumerGroup = useConsumerGroupDetails(routerParams);
 
   if (consumerGroup.isLoading || !consumerGroup.isSuccess)
@@ -37,7 +38,7 @@ const ResetOffsets: React.FC = () => {
   return (
     <>
       <PageHeading
-        text="Reset offsets"
+        text={consumerGroupID}
         backTo={clusterConsumerGroupsPath(routerParams.clusterName)}
         backText="Consumers"
       />

From 333eae24759aaa7b3fc14e5e7dea232200c13dcd Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 4 Aug 2023 18:43:40 +0700
Subject: [PATCH 667/734] Make the container timezone configurable (#4084)

Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 kafka-ui-api/Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/Dockerfile b/kafka-ui-api/Dockerfile
index d969ec76315..98dcdb46ac3 100644
--- a/kafka-ui-api/Dockerfile
+++ b/kafka-ui-api/Dockerfile
@@ -1,7 +1,11 @@
 #FROM azul/zulu-openjdk-alpine:17-jre-headless
 FROM azul/zulu-openjdk-alpine@sha256:a36679ac0d28cb835e2a8c00e1e0d95509c6c51c5081c7782b85edb1f37a771a
 
-RUN apk add --no-cache gcompat # need to make snappy codec work
+RUN apk add --no-cache \
+    # snappy codec
+    gcompat \
+    # configuring timezones
+    tzdata
 RUN addgroup -S kafkaui && adduser -S kafkaui -G kafkaui
 
 # creating folder for dynamic config usage (certificates uploads, etc)

From ac09efcd3486fda6cee41986a01820710863eb81 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 7 Aug 2023 21:04:10 +0700
Subject: [PATCH 668/734] FE: Update topic deletion disabled message (#4092)

---
 kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx | 4 ++--
 kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
index cdd669567fe..05c61044f0a 100644
--- a/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
+++ b/kafka-ui-react-app/src/components/Topics/List/ActionsCell.tsx
@@ -86,9 +86,9 @@ const ActionsCell: React.FC<CellContext<Topic, unknown>> = ({ row }) => {
         Remove Topic
         {!isTopicDeletionAllowed && (
           <DropdownItemHint>
-            The topic deletion is restricted at the application
+            The topic deletion is restricted at the broker
             <br />
-            configuration level
+            configuration level (delete.topic.enable = false)
           </DropdownItemHint>
         )}
       </ActionDropdownItem>
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
index ca4801c6dae..5a639f0c48d 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Topic.tsx
@@ -162,9 +162,9 @@ const Topic: React.FC = () => {
             Remove Topic
             {!isTopicDeletionAllowed && (
               <DropdownItemHint>
-                The topic deletion is restricted at the application
+                The topic deletion is restricted at the broker
                 <br />
-                configuration level
+                configuration level (delete.topic.enable = false)
               </DropdownItemHint>
             )}
           </ActionDropdownItem>

From ba18f3b0421afa10072c7ba603e4cdb105663827 Mon Sep 17 00:00:00 2001
From: Narekmat <47845266+Narekmat@users.noreply.github.com>
Date: Mon, 7 Aug 2023 18:18:24 +0400
Subject: [PATCH 669/734] Infra: Fix frontend sonar jdk warning (#4098)

---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 02ccd4e1359..b4abbd5ae98 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -49,7 +49,7 @@ jobs:
           cd kafka-ui-react-app/
           pnpm test:CI
       - name: SonarCloud Scan
-        uses: workshur/sonarcloud-github-action@improved_basedir
+        uses: sonarsource/sonarcloud-github-action@master
         with:
           projectBaseDir: ./kafka-ui-react-app
           args: -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} -Dsonar.pullrequest.branch=${{ github.head_ref }} -Dsonar.pullrequest.base=${{ github.base_ref }}

From 150fc21fb84770520e669f8681b5c9a2bf3ba344 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Mon, 7 Aug 2023 22:01:39 +0700
Subject: [PATCH 670/734] RBAC: Implement roles by github teams (#4093)

Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 .../extractor/GithubAuthorityExtractor.java   | 118 ++++++++++++++----
 1 file changed, 93 insertions(+), 25 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
index 654654a05dd..90c4ceebc60 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/GithubAuthorityExtractor.java
@@ -5,6 +5,8 @@
 import com.provectus.kafka.ui.model.rbac.Role;
 import com.provectus.kafka.ui.model.rbac.provider.Provider;
 import com.provectus.kafka.ui.service.rbac.AccessControlService;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +28,8 @@ public class GithubAuthorityExtractor implements ProviderAuthorityExtractor {
   private static final String ORGANIZATION_ATTRIBUTE_NAME = "organizations_url";
   private static final String USERNAME_ATTRIBUTE_NAME = "login";
   private static final String ORGANIZATION_NAME = "login";
+  private static final String ORGANIZATION = "organization";
+  private static final String TEAM_NAME = "slug";
   private static final String GITHUB_ACCEPT_HEADER = "application/vnd.github+json";
   private static final String DUMMY = "dummy";
   // The number of results (max 100) per page of list organizations for authenticated user.
@@ -46,7 +50,7 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
       throw new RuntimeException();
     }
 
-    Set<String> groupsByUsername = new HashSet<>();
+    Set<String> rolesByUsername = new HashSet<>();
     String username = principal.getAttribute(USERNAME_ATTRIBUTE_NAME);
     if (username == null) {
       log.debug("Github username param is not present");
@@ -59,13 +63,7 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
               .filter(s -> s.getType().equals("user"))
               .anyMatch(s -> s.getValue().equals(username)))
           .map(Role::getName)
-          .forEach(groupsByUsername::add);
-    }
-
-    String organization = principal.getAttribute(ORGANIZATION_ATTRIBUTE_NAME);
-    if (organization == null) {
-      log.debug("Github organization param is not present");
-      return Mono.just(groupsByUsername);
+          .forEach(rolesByUsername::add);
     }
 
     OAuth2UserRequest req = (OAuth2UserRequest) additionalParams.get("request");
@@ -80,8 +78,24 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
           .getUserInfoEndpoint()
           .getUri();
     }
+    var webClient = WebClient.create(infoEndpoint);
 
-    WebClient webClient = WebClient.create(infoEndpoint);
+    Mono<Set<String>> rolesByOrganization = getOrganizationRoles(principal, additionalParams, acs, webClient);
+    Mono<Set<String>> rolesByTeams = getTeamRoles(webClient, additionalParams, acs);
+
+    return Mono.zip(rolesByOrganization, rolesByTeams)
+        .map((t) -> Stream.of(t.getT1(), t.getT2(), rolesByUsername)
+            .flatMap(Collection::stream)
+            .collect(Collectors.toSet()));
+  }
+
+  private Mono<Set<String>> getOrganizationRoles(DefaultOAuth2User principal, Map<String, Object> additionalParams,
+                                                 AccessControlService acs, WebClient webClient) {
+    String organization = principal.getAttribute(ORGANIZATION_ATTRIBUTE_NAME);
+    if (organization == null) {
+      log.debug("Github organization param is not present");
+      return Mono.just(Collections.emptySet());
+    }
 
     final Mono<List<Map<String, Object>>> userOrganizations = webClient
         .get()
@@ -99,22 +113,76 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
     //@formatter:on
 
     return userOrganizations
-        .map(orgsMap -> {
-          var groupsByOrg = acs.getRoles()
-              .stream()
-              .filter(role -> role.getSubjects()
-                  .stream()
-                  .filter(s -> s.getProvider().equals(Provider.OAUTH_GITHUB))
-                  .filter(s -> s.getType().equals("organization"))
-                  .anyMatch(subject -> orgsMap.stream()
-                      .map(org -> org.get(ORGANIZATION_NAME).toString())
-                      .distinct()
-                      .anyMatch(orgName -> orgName.equalsIgnoreCase(subject.getValue()))
-                  ))
-              .map(Role::getName);
-
-          return Stream.concat(groupsByOrg, groupsByUsername.stream()).collect(Collectors.toSet());
-        });
+        .map(orgsMap -> acs.getRoles()
+            .stream()
+            .filter(role -> role.getSubjects()
+                .stream()
+                .filter(s -> s.getProvider().equals(Provider.OAUTH_GITHUB))
+                .filter(s -> s.getType().equals(ORGANIZATION))
+                .anyMatch(subject -> orgsMap.stream()
+                    .map(org -> org.get(ORGANIZATION_NAME).toString())
+                    .anyMatch(orgName -> orgName.equalsIgnoreCase(subject.getValue()))
+                ))
+            .map(Role::getName)
+            .collect(Collectors.toSet()));
+  }
+
+  @SuppressWarnings("unchecked")
+  private Mono<Set<String>> getTeamRoles(WebClient webClient, Map<String, Object> additionalParams,
+                                         AccessControlService acs) {
+
+    var requestedTeams = acs.getRoles()
+        .stream()
+        .filter(r -> r.getSubjects()
+            .stream()
+            .filter(s -> s.getProvider().equals(Provider.OAUTH_GITHUB))
+            .anyMatch(s -> s.getType().equals("team")))
+        .collect(Collectors.toSet());
+
+    if (requestedTeams.isEmpty()) {
+      log.debug("No roles with github teams found, skipping");
+      return Mono.just(Collections.emptySet());
+    }
+
+    final Mono<List<Map<String, Object>>> rawTeams = webClient
+        .get()
+        .uri(uriBuilder -> uriBuilder.path("/teams")
+            .queryParam("per_page", ORGANIZATIONS_PER_PAGE)
+            .build())
+        .headers(headers -> {
+          headers.set(HttpHeaders.ACCEPT, GITHUB_ACCEPT_HEADER);
+          OAuth2UserRequest request = (OAuth2UserRequest) additionalParams.get("request");
+          headers.setBearerAuth(request.getAccessToken().getTokenValue());
+        })
+        .retrieve()
+        //@formatter:off
+        .bodyToMono(new ParameterizedTypeReference<>() {});
+    //@formatter:on
+
+    final Mono<List<String>> mappedTeams = rawTeams
+        .map(teams -> teams.stream()
+            .map(teamInfo -> {
+              var name = teamInfo.get(TEAM_NAME);
+              var orgInfo = (Map<String, Object>) teamInfo.get(ORGANIZATION);
+              var orgName = orgInfo.get(ORGANIZATION_NAME);
+              return orgName + "/" + name;
+            })
+            .map(Object::toString)
+            .collect(Collectors.toList())
+        );
+
+    return mappedTeams
+        .map(teams -> acs.getRoles()
+            .stream()
+            .filter(role -> role.getSubjects()
+                .stream()
+                .filter(s -> s.getProvider().equals(Provider.OAUTH_GITHUB))
+                .filter(s -> s.getType().equals("team"))
+                .anyMatch(subject -> teams.stream()
+                    .anyMatch(teamName -> teamName.equalsIgnoreCase(subject.getValue()))
+                ))
+            .map(Role::getName)
+            .collect(Collectors.toSet()));
   }
 
 }

From d915de4fd811265c8303cd61b10ac2cf9caea0ce Mon Sep 17 00:00:00 2001
From: Kostas Dizas <254960+kostasdizas@users.noreply.github.com>
Date: Fri, 11 Aug 2023 09:47:28 +0100
Subject: [PATCH 671/734] Add protobuf raw message deserializer (#4041)

Implemented a Protobuf Raw deserialiser that works like protoc --decode_raw. This is a no config alternative to the existing ProtobufFileSerde.

Co-authored-by: Ilya Kuramshin <iliax@proton.me>
---
 .../kafka/ui/serdes/SerdesInitializer.java    |   2 +
 .../ui/serdes/builtin/ProtobufRawSerde.java   |  59 ++++++++++
 .../serdes/builtin/ProtobufRawSerdeTest.java  | 108 ++++++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerde.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerdeTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
index c833d9fc726..6e28c2fdcfb 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/SerdesInitializer.java
@@ -16,6 +16,7 @@
 import com.provectus.kafka.ui.serdes.builtin.Int32Serde;
 import com.provectus.kafka.ui.serdes.builtin.Int64Serde;
 import com.provectus.kafka.ui.serdes.builtin.ProtobufFileSerde;
+import com.provectus.kafka.ui.serdes.builtin.ProtobufRawSerde;
 import com.provectus.kafka.ui.serdes.builtin.StringSerde;
 import com.provectus.kafka.ui.serdes.builtin.UInt32Serde;
 import com.provectus.kafka.ui.serdes.builtin.UInt64Serde;
@@ -50,6 +51,7 @@ public SerdesInitializer() {
             .put(Base64Serde.name(), Base64Serde.class)
             .put(HexSerde.name(), HexSerde.class)
             .put(UuidBinarySerde.name(), UuidBinarySerde.class)
+            .put(ProtobufRawSerde.name(), ProtobufRawSerde.class)
             .build(),
         new CustomSerdeLoader()
     );
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerde.java
new file mode 100644
index 00000000000..221b8b5ea53
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerde.java
@@ -0,0 +1,59 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import com.google.protobuf.UnknownFieldSet;
+import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.RecordHeaders;
+import com.provectus.kafka.ui.serde.api.SchemaDescription;
+import com.provectus.kafka.ui.serdes.BuiltInSerde;
+import java.util.Map;
+import java.util.Optional;
+import lombok.SneakyThrows;
+
+public class ProtobufRawSerde implements BuiltInSerde {
+
+  public static String name() {
+    return "ProtobufDecodeRaw";
+  }
+
+  @Override
+  public Optional<String> getDescription() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<SchemaDescription> getSchema(String topic, Target type) {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean canSerialize(String topic, Target type) {
+    return false;
+  }
+
+  @Override
+  public boolean canDeserialize(String topic, Target type) {
+    return true;
+  }
+
+  @Override
+  public Serializer serializer(String topic, Target type) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Deserializer deserializer(String topic, Target type) {
+    return new Deserializer() {
+        @SneakyThrows
+        @Override
+        public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
+            try {
+              UnknownFieldSet unknownFields = UnknownFieldSet.parseFrom(data);
+              return new DeserializeResult(unknownFields.toString(), DeserializeResult.Type.STRING, Map.of());
+            } catch (Exception e) {
+              throw new ValidationException(e.getMessage());
+            }
+        }
+    };
+  }
+}
\ No newline at end of file
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerdeTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerdeTest.java
new file mode 100644
index 00000000000..a71e9969a84
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerdeTest.java
@@ -0,0 +1,108 @@
+package com.provectus.kafka.ui.serdes.builtin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.google.protobuf.DescriptorProtos;
+import com.google.protobuf.Descriptors;
+import com.google.protobuf.DynamicMessage;
+import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.serde.api.Serde;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class ProtobufRawSerdeTest {
+
+  private static final String DUMMY_TOPIC = "dummy-topic";
+
+  private ProtobufRawSerde serde;
+
+  @BeforeEach
+  void init() {
+    serde = new ProtobufRawSerde();
+  }
+
+  @SneakyThrows
+  ProtobufSchema getSampleSchema() {
+    return new ProtobufSchema(
+        """
+          syntax = "proto3";
+          message Message1 {
+            int32 my_field = 1;
+          }
+        """
+    );
+  }
+
+  @SneakyThrows
+  private byte[] getProtobufMessage() {
+    DynamicMessage.Builder builder = DynamicMessage.newBuilder(getSampleSchema().toDescriptor("Message1"));
+    builder.setField(builder.getDescriptorForType().findFieldByName("my_field"), 5);
+    return builder.build().toByteArray();
+  }
+
+  @Test
+  void deserializeSimpleMessage() {
+    var deserialized = serde.deserializer(DUMMY_TOPIC, Serde.Target.VALUE)
+        .deserialize(null, getProtobufMessage());
+    assertThat(deserialized.getResult()).isEqualTo("1: 5\n");
+  }
+
+  @Test
+  void deserializeEmptyMessage() {
+    var deserialized = serde.deserializer(DUMMY_TOPIC, Serde.Target.VALUE)
+        .deserialize(null, new byte[0]);
+    assertThat(deserialized.getResult()).isEqualTo("");
+  }
+
+  @Test
+  void deserializeInvalidMessage() {
+    var deserializer = serde.deserializer(DUMMY_TOPIC, Serde.Target.VALUE);
+    assertThatThrownBy(() -> deserializer.deserialize(null, new byte[] { 1, 2, 3 }))
+        .isInstanceOf(ValidationException.class)
+        .hasMessageContaining("Protocol message contained an invalid tag");
+  }
+  
+  @Test
+  void deserializeNullMessage() {
+    var deserializer = serde.deserializer(DUMMY_TOPIC, Serde.Target.VALUE);
+    assertThatThrownBy(() -> deserializer.deserialize(null, null))
+        .isInstanceOf(ValidationException.class)
+        .hasMessageContaining("Cannot read the array length");
+  }
+
+  ProtobufSchema getSampleNestedSchema() {
+    return new ProtobufSchema(
+      """
+        syntax = "proto3";
+        message Message2 {
+          int32 my_nested_field = 1;
+        }
+        message Message1 {
+          int32 my_field = 1;
+          Message2 my_nested_message = 2;
+        }
+      """
+    );
+  }
+
+  @SneakyThrows
+  private byte[] getComplexProtobufMessage() {
+    DynamicMessage.Builder builder = DynamicMessage.newBuilder(getSampleNestedSchema().toDescriptor("Message1"));
+    builder.setField(builder.getDescriptorForType().findFieldByName("my_field"), 5);
+    DynamicMessage.Builder nestedBuilder = DynamicMessage.newBuilder(getSampleNestedSchema().toDescriptor("Message2"));
+    nestedBuilder.setField(nestedBuilder.getDescriptorForType().findFieldByName("my_nested_field"), 10);
+    builder.setField(builder.getDescriptorForType().findFieldByName("my_nested_message"), nestedBuilder.build());
+
+    return builder.build().toByteArray();
+  }
+
+  @Test
+  void deserializeNestedMessage() {
+    var deserialized = serde.deserializer(DUMMY_TOPIC, Serde.Target.VALUE)
+        .deserialize(null, getComplexProtobufMessage());
+    assertThat(deserialized.getResult()).isEqualTo("1: 5\n2: {\n  1: 10\n}\n");
+  }
+}
\ No newline at end of file

From fa9547b95a4f40ea28be8868f0ad169c53ac7208 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 11 Aug 2023 16:41:07 +0400
Subject: [PATCH 672/734] BE: Controllers structure minor refactr (#4110)

Audit & access controll services moved to AbstractController
---
 .../ui/controller/AbstractController.java     | 27 +++++++++-
 .../kafka/ui/controller/AclsController.java   | 36 ++++++-------
 .../ApplicationConfigController.java          | 22 ++++----
 .../ui/controller/BrokersController.java      | 29 +++++-----
 .../ui/controller/ClustersController.java     | 16 +++---
 .../controller/ConsumerGroupsController.java  | 24 ++++-----
 .../ui/controller/KafkaConnectController.java | 46 ++++++++--------
 .../kafka/ui/controller/KsqlController.java   | 18 +++----
 .../ui/controller/MessagesController.java     | 18 +++----
 .../ui/controller/SchemasController.java      | 46 ++++++++--------
 .../kafka/ui/controller/TopicsController.java | 54 +++++++++----------
 .../service/SchemaRegistryPaginationTest.java |  5 +-
 .../service/TopicsServicePaginationTest.java  |  6 ++-
 13 files changed, 167 insertions(+), 180 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AbstractController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AbstractController.java
index fd323d55a14..e4dbb3cfcf7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AbstractController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AbstractController.java
@@ -2,12 +2,19 @@
 
 import com.provectus.kafka.ui.exception.ClusterNotFoundException;
 import com.provectus.kafka.ui.model.KafkaCluster;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.ClustersStorage;
+import com.provectus.kafka.ui.service.audit.AuditService;
+import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import org.springframework.beans.factory.annotation.Autowired;
+import reactor.core.publisher.Mono;
+import reactor.core.publisher.Signal;
 
 public abstract class AbstractController {
 
-  private ClustersStorage clustersStorage;
+  protected ClustersStorage clustersStorage;
+  protected AccessControlService accessControlService;
+  protected AuditService auditService;
 
   protected KafkaCluster getCluster(String name) {
     return clustersStorage.getClusterByName(name)
@@ -15,8 +22,26 @@ protected KafkaCluster getCluster(String name) {
             String.format("Cluster with name '%s' not found", name)));
   }
 
+  protected Mono<Void> validateAccess(AccessContext context) {
+    return accessControlService.validateAccess(context);
+  }
+
+  protected void audit(AccessContext acxt, Signal<?> sig) {
+    auditService.audit(acxt, sig);
+  }
+
   @Autowired
   public void setClustersStorage(ClustersStorage clustersStorage) {
     this.clustersStorage = clustersStorage;
   }
+
+  @Autowired
+  public void setAccessControlService(AccessControlService accessControlService) {
+    this.accessControlService = accessControlService;
+  }
+
+  @Autowired
+  public void setAuditService(AuditService auditService) {
+    this.auditService = auditService;
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
index 71700e3f7b7..2ba0add5be0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AclsController.java
@@ -11,8 +11,6 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.AclAction;
 import com.provectus.kafka.ui.service.acl.AclsService;
-import com.provectus.kafka.ui.service.audit.AuditService;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.apache.kafka.common.resource.PatternType;
@@ -29,8 +27,6 @@
 public class AclsController extends AbstractController implements AclsApi {
 
   private final AclsService aclsService;
-  private final AccessControlService accessControlService;
-  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<Void>> createAcl(String clusterName, Mono<KafkaAclDTO> kafkaAclDto,
@@ -41,11 +37,11 @@ public Mono<ResponseEntity<Void>> createAcl(String clusterName, Mono<KafkaAclDTO
         .operationName("createAcl")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(kafkaAclDto)
         .map(ClusterMapper::toAclBinding)
         .flatMap(binding -> aclsService.createAcl(getCluster(clusterName), binding))
-        .doOnEach(sig -> auditService.audit(context, sig))
+        .doOnEach(sig -> audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 
@@ -58,11 +54,11 @@ public Mono<ResponseEntity<Void>> deleteAcl(String clusterName, Mono<KafkaAclDTO
         .operationName("deleteAcl")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(kafkaAclDto)
         .map(ClusterMapper::toAclBinding)
         .flatMap(binding -> aclsService.deleteAcl(getCluster(clusterName), binding))
-        .doOnEach(sig -> auditService.audit(context, sig))
+        .doOnEach(sig -> audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 
@@ -88,12 +84,12 @@ public Mono<ResponseEntity<Flux<KafkaAclDTO>>> listAcls(String clusterName,
 
     var filter = new ResourcePatternFilter(resourceType, resourceName, namePatternType);
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         Mono.just(
             ResponseEntity.ok(
                 aclsService.listAcls(getCluster(clusterName), filter)
                     .map(ClusterMapper::toKafkaAclDto)))
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -104,11 +100,11 @@ public Mono<ResponseEntity<String>> getAclAsCsv(String clusterName, ServerWebExc
         .operationName("getAclAsCsv")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         aclsService.getAclAsCsvString(getCluster(clusterName))
             .map(ResponseEntity::ok)
             .flatMap(Mono::just)
-            .doOnEach(sig -> auditService.audit(context, sig))
+            .doOnEach(sig -> audit(context, sig))
     );
   }
 
@@ -120,10 +116,10 @@ public Mono<ResponseEntity<Void>> syncAclsCsv(String clusterName, Mono<String> c
         .operationName("syncAclsCsv")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(csvMono)
         .flatMap(csv -> aclsService.syncAclWithAclCsv(getCluster(clusterName), csv))
-        .doOnEach(sig -> auditService.audit(context, sig))
+        .doOnEach(sig -> audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 
@@ -137,10 +133,10 @@ public Mono<ResponseEntity<Void>> createConsumerAcl(String clusterName,
         .operationName("createConsumerAcl")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(createConsumerAclDto)
         .flatMap(req -> aclsService.createConsumerAcl(getCluster(clusterName), req))
-        .doOnEach(sig -> auditService.audit(context, sig))
+        .doOnEach(sig -> audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 
@@ -154,10 +150,10 @@ public Mono<ResponseEntity<Void>> createProducerAcl(String clusterName,
         .operationName("createProducerAcl")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(createProducerAclDto)
         .flatMap(req -> aclsService.createProducerAcl(getCluster(clusterName), req))
-        .doOnEach(sig -> auditService.audit(context, sig))
+        .doOnEach(sig -> audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 
@@ -171,10 +167,10 @@ public Mono<ResponseEntity<Void>> createStreamAppAcl(String clusterName,
         .operationName("createStreamAppAcl")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(createStreamAppAclDto)
         .flatMap(req -> aclsService.createStreamAppAcl(getCluster(clusterName), req))
-        .doOnEach(sig -> auditService.audit(context, sig))
+        .doOnEach(sig -> audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
index 5f03c9ab5c6..480d62b1784 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
@@ -15,8 +15,6 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.ApplicationInfoService;
 import com.provectus.kafka.ui.service.KafkaClusterFactory;
-import com.provectus.kafka.ui.service.audit.AuditService;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import com.provectus.kafka.ui.util.ApplicationRestarter;
 import com.provectus.kafka.ui.util.DynamicConfigOperations;
 import com.provectus.kafka.ui.util.DynamicConfigOperations.PropertiesStructure;
@@ -39,7 +37,7 @@
 @Slf4j
 @RestController
 @RequiredArgsConstructor
-public class ApplicationConfigController implements ApplicationConfigApi {
+public class ApplicationConfigController extends AbstractController implements ApplicationConfigApi {
 
   private static final PropertiesMapper MAPPER = Mappers.getMapper(PropertiesMapper.class);
 
@@ -51,12 +49,10 @@ interface PropertiesMapper {
     ApplicationConfigPropertiesDTO toDto(PropertiesStructure propertiesStructure);
   }
 
-  private final AccessControlService accessControlService;
   private final DynamicConfigOperations dynamicConfigOperations;
   private final ApplicationRestarter restarter;
   private final KafkaClusterFactory kafkaClusterFactory;
   private final ApplicationInfoService applicationInfoService;
-  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<ApplicationInfoDTO>> getApplicationInfo(ServerWebExchange exchange) {
@@ -69,12 +65,12 @@ public Mono<ResponseEntity<ApplicationConfigDTO>> getCurrentConfig(ServerWebExch
         .applicationConfigActions(VIEW)
         .operationName("getCurrentConfig")
         .build();
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(Mono.fromSupplier(() -> ResponseEntity.ok(
             new ApplicationConfigDTO()
                 .properties(MAPPER.toDto(dynamicConfigOperations.getCurrentProperties()))
         )))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -84,14 +80,14 @@ public Mono<ResponseEntity<Void>> restartWithConfig(Mono<RestartRequestDTO> rest
         .applicationConfigActions(EDIT)
         .operationName("restartWithConfig")
         .build();
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(restartRequestDto)
         .<ResponseEntity<Void>>map(dto -> {
           dynamicConfigOperations.persist(MAPPER.fromDto(dto.getConfig().getProperties()));
           restarter.requestRestart();
           return ResponseEntity.ok().build();
         })
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -101,13 +97,13 @@ public Mono<ResponseEntity<UploadedFileInfoDTO>> uploadConfigRelatedFile(Flux<Pa
         .applicationConfigActions(EDIT)
         .operationName("uploadConfigRelatedFile")
         .build();
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(fileFlux.single())
         .flatMap(file ->
             dynamicConfigOperations.uploadConfigRelatedFile((FilePart) file)
                 .map(path -> new UploadedFileInfoDTO().location(path.toString()))
                 .map(ResponseEntity::ok))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -117,7 +113,7 @@ public Mono<ResponseEntity<ApplicationConfigValidationDTO>> validateConfig(Mono<
         .applicationConfigActions(EDIT)
         .operationName("validateConfig")
         .build();
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(configDto)
         .flatMap(config -> {
           PropertiesStructure propertiesStructure = MAPPER.fromDto(config.getProperties());
@@ -126,7 +122,7 @@ public Mono<ResponseEntity<ApplicationConfigValidationDTO>> validateConfig(Mono<
               .map(validations -> new ApplicationConfigValidationDTO().clusters(validations));
         })
         .map(ResponseEntity::ok)
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   private Mono<Map<String, ClusterConfigValidationDTO>> validateClustersConfig(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
index 81965179fcc..a3209ce7227 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
@@ -11,8 +11,6 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
 import com.provectus.kafka.ui.service.BrokerService;
-import com.provectus.kafka.ui.service.audit.AuditService;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
@@ -31,9 +29,6 @@ public class BrokersController extends AbstractController implements BrokersApi
   private final BrokerService brokerService;
   private final ClusterMapper clusterMapper;
 
-  private final AuditService auditService;
-  private final AccessControlService accessControlService;
-
   @Override
   public Mono<ResponseEntity<Flux<BrokerDTO>>> getBrokers(String clusterName,
                                                           ServerWebExchange exchange) {
@@ -43,9 +38,9 @@ public Mono<ResponseEntity<Flux<BrokerDTO>>> getBrokers(String clusterName,
         .build();
 
     var job = brokerService.getBrokers(getCluster(clusterName)).map(clusterMapper::toBrokerDto);
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .thenReturn(ResponseEntity.ok(job))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -57,14 +52,14 @@ public Mono<ResponseEntity<BrokerMetricsDTO>> getBrokersMetrics(String clusterNa
         .operationParams(Map.of("id", id))
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(
             brokerService.getBrokerMetrics(getCluster(clusterName), id)
                 .map(clusterMapper::toBrokerMetrics)
                 .map(ResponseEntity::ok)
                 .onErrorReturn(ResponseEntity.notFound().build())
         )
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -80,10 +75,10 @@ public Mono<ResponseEntity<Flux<BrokersLogdirsDTO>>> getAllBrokersLogdirs(String
         .operationParams(Map.of("brokerIds", brokerIds))
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .thenReturn(ResponseEntity.ok(
             brokerService.getAllBrokersLogdirs(getCluster(clusterName), brokerIds)))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -97,11 +92,11 @@ public Mono<ResponseEntity<Flux<BrokerConfigDTO>>> getBrokerConfig(String cluste
         .operationParams(Map.of("brokerId", id))
         .build();
 
-    return accessControlService.validateAccess(context).thenReturn(
+    return validateAccess(context).thenReturn(
         ResponseEntity.ok(
             brokerService.getBrokerConfig(getCluster(clusterName), id)
                 .map(clusterMapper::toBrokerConfig))
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -116,11 +111,11 @@ public Mono<ResponseEntity<Void>> updateBrokerTopicPartitionLogDir(String cluste
         .operationParams(Map.of("brokerId", id))
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         brokerLogdir
             .flatMap(bld -> brokerService.updateBrokerLogDir(getCluster(clusterName), id, bld))
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -136,11 +131,11 @@ public Mono<ResponseEntity<Void>> updateBrokerConfigByName(String clusterName,
         .operationParams(Map.of("brokerId", id))
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         brokerConfig
             .flatMap(bci -> brokerService.updateBrokerConfigByName(
                 getCluster(clusterName), id, name, bci.getValue()))
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java
index 20c64ed01f4..7b12b30644f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClustersController.java
@@ -6,8 +6,6 @@
 import com.provectus.kafka.ui.model.ClusterStatsDTO;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.ClusterService;
-import com.provectus.kafka.ui.service.audit.AuditService;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -21,8 +19,6 @@
 @Slf4j
 public class ClustersController extends AbstractController implements ClustersApi {
   private final ClusterService clusterService;
-  private final AccessControlService accessControlService;
-  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<Flux<ClusterDTO>>> getClusters(ServerWebExchange exchange) {
@@ -40,13 +36,13 @@ public Mono<ResponseEntity<ClusterMetricsDTO>> getClusterMetrics(String clusterN
         .operationName("getClusterMetrics")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(
             clusterService.getClusterMetrics(getCluster(clusterName))
                 .map(ResponseEntity::ok)
                 .onErrorReturn(ResponseEntity.notFound().build())
         )
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -57,13 +53,13 @@ public Mono<ResponseEntity<ClusterStatsDTO>> getClusterStats(String clusterName,
         .operationName("getClusterStats")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(
             clusterService.getClusterStats(getCluster(clusterName))
                 .map(ResponseEntity::ok)
                 .onErrorReturn(ResponseEntity.notFound().build())
         )
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -75,8 +71,8 @@ public Mono<ResponseEntity<ClusterDTO>> updateClusterInfo(String clusterName,
         .operationName("updateClusterInfo")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(clusterService.updateCluster(getCluster(clusterName)).map(ResponseEntity::ok))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
index 4f4574725f2..aac43855afe 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
@@ -19,8 +19,6 @@
 import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
 import com.provectus.kafka.ui.service.ConsumerGroupService;
 import com.provectus.kafka.ui.service.OffsetsResetService;
-import com.provectus.kafka.ui.service.audit.AuditService;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -42,8 +40,6 @@ public class ConsumerGroupsController extends AbstractController implements Cons
 
   private final ConsumerGroupService consumerGroupService;
   private final OffsetsResetService offsetsResetService;
-  private final AccessControlService accessControlService;
-  private final AuditService auditService;
 
   @Value("${consumer.groups.page.size:25}")
   private int defaultConsumerGroupsPageSize;
@@ -59,9 +55,9 @@ public Mono<ResponseEntity<Void>> deleteConsumerGroup(String clusterName,
         .operationName("deleteConsumerGroup")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(consumerGroupService.deleteConsumerGroupById(getCluster(clusterName), id))
-        .doOnEach(sig -> auditService.audit(context, sig))
+        .doOnEach(sig -> audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 
@@ -76,11 +72,11 @@ public Mono<ResponseEntity<ConsumerGroupDetailsDTO>> getConsumerGroup(String clu
         .operationName("getConsumerGroup")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(consumerGroupService.getConsumerGroupDetail(getCluster(clusterName), consumerGroupId)
             .map(ConsumerGroupMapper::toDetailsDto)
             .map(ResponseEntity::ok))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -104,9 +100,9 @@ public Mono<ResponseEntity<Flux<ConsumerGroupDTO>>> getTopicConsumerGroups(Strin
             .map(ResponseEntity::ok)
             .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()));
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(job)
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -125,7 +121,7 @@ public Mono<ResponseEntity<ConsumerGroupsPageResponseDTO>> getConsumerGroupsPage
         .operationName("getConsumerGroupsPage")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         consumerGroupService.getConsumerGroupsPage(
                 getCluster(clusterName),
                 Optional.ofNullable(page).filter(i -> i > 0).orElse(1),
@@ -136,7 +132,7 @@ public Mono<ResponseEntity<ConsumerGroupsPageResponseDTO>> getConsumerGroupsPage
             )
             .map(this::convertPage)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -191,9 +187,9 @@ public Mono<ResponseEntity<Void>> resetConsumerGroupOffsets(String clusterName,
         }
       };
 
-      return accessControlService.validateAccess(context)
+      return validateAccess(context)
           .then(mono.get())
-          .doOnEach(sig -> auditService.audit(context, sig));
+          .doOnEach(sig -> audit(context, sig));
     }).thenReturn(ResponseEntity.ok().build());
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index 8f08472fa1d..9d2376c22f0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -18,8 +18,6 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
 import com.provectus.kafka.ui.service.KafkaConnectService;
-import com.provectus.kafka.ui.service.audit.AuditService;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Comparator;
 import java.util.Map;
 import java.util.Set;
@@ -40,8 +38,6 @@ public class KafkaConnectController extends AbstractController implements KafkaC
       = Set.of(RESTART, RESTART_FAILED_TASKS, RESTART_ALL_TASKS);
 
   private final KafkaConnectService kafkaConnectService;
-  private final AccessControlService accessControlService;
-  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<Flux<ConnectDTO>>> getConnects(String clusterName,
@@ -64,9 +60,9 @@ public Mono<ResponseEntity<Flux<String>>> getConnectors(String clusterName, Stri
         .operationName("getConnectors")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .thenReturn(ResponseEntity.ok(kafkaConnectService.getConnectorNames(getCluster(clusterName), connectName)))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -81,10 +77,10 @@ public Mono<ResponseEntity<ConnectorDTO>> createConnector(String clusterName, St
         .operationName("createConnector")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         kafkaConnectService.createConnector(getCluster(clusterName), connectName, connector)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -100,10 +96,10 @@ public Mono<ResponseEntity<ConnectorDTO>> getConnector(String clusterName, Strin
         .operationName("getConnector")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         kafkaConnectService.getConnector(getCluster(clusterName), connectName, connectorName)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -119,10 +115,10 @@ public Mono<ResponseEntity<Void>> deleteConnector(String clusterName, String con
         .operationParams(Map.of("connectorName", connectName))
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         kafkaConnectService.deleteConnector(getCluster(clusterName), connectName, connectorName)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
 
@@ -150,7 +146,7 @@ public Mono<ResponseEntity<Flux<FullConnectorInfoDTO>>> getAllConnectors(
         .sort(comparator);
 
     return Mono.just(ResponseEntity.ok(job))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -166,11 +162,11 @@ public Mono<ResponseEntity<Map<String, Object>>> getConnectorConfig(String clust
         .operationName("getConnectorConfig")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         kafkaConnectService
             .getConnectorConfig(getCluster(clusterName), connectName, connectorName)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -187,11 +183,11 @@ public Mono<ResponseEntity<ConnectorDTO>> setConnectorConfig(String clusterName,
         .operationParams(Map.of("connectorName", connectorName))
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
             kafkaConnectService
                 .setConnectorConfig(getCluster(clusterName), connectName, connectorName, requestBody)
                 .map(ResponseEntity::ok))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -214,11 +210,11 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
         .operationParams(Map.of("connectorName", connectorName))
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         kafkaConnectService
             .updateConnectorState(getCluster(clusterName), connectName, connectorName, action)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -234,11 +230,11 @@ public Mono<ResponseEntity<Flux<TaskDTO>>> getConnectorTasks(String clusterName,
         .operationParams(Map.of("connectorName", connectorName))
         .build();
 
-    return accessControlService.validateAccess(context).thenReturn(
+    return validateAccess(context).thenReturn(
         ResponseEntity
             .ok(kafkaConnectService
                 .getConnectorTasks(getCluster(clusterName), connectName, connectorName))
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -254,11 +250,11 @@ public Mono<ResponseEntity<Void>> restartConnectorTask(String clusterName, Strin
         .operationParams(Map.of("connectorName", connectorName))
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         kafkaConnectService
             .restartConnectorTask(getCluster(clusterName), connectName, connectorName, taskId)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -272,11 +268,11 @@ public Mono<ResponseEntity<Flux<ConnectorPluginDTO>>> getConnectorPlugins(
         .operationName("getConnectorPlugins")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         Mono.just(
             ResponseEntity.ok(
                 kafkaConnectService.getConnectorPlugins(getCluster(clusterName), connectName)))
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
index 312727fe792..c15f36488ec 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KsqlController.java
@@ -9,9 +9,7 @@
 import com.provectus.kafka.ui.model.KsqlTableResponseDTO;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.KsqlAction;
-import com.provectus.kafka.ui.service.audit.AuditService;
 import com.provectus.kafka.ui.service.ksql.KsqlServiceV2;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -29,8 +27,6 @@
 public class KsqlController extends AbstractController implements KsqlApi {
 
   private final KsqlServiceV2 ksqlServiceV2;
-  private final AccessControlService accessControlService;
-  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<KsqlCommandV2ResponseDTO>> executeKsql(String clusterName,
@@ -44,13 +40,13 @@ public Mono<ResponseEntity<KsqlCommandV2ResponseDTO>> executeKsql(String cluster
                   .operationName("executeKsql")
                   .operationParams(command)
                   .build();
-              return accessControlService.validateAccess(context).thenReturn(
+              return validateAccess(context).thenReturn(
                       new KsqlCommandV2ResponseDTO().pipeId(
                           ksqlServiceV2.registerCommand(
                               getCluster(clusterName),
                               command.getKsql(),
                               Optional.ofNullable(command.getStreamsProperties()).orElse(Map.of()))))
-                  .doOnEach(sig -> auditService.audit(context, sig));
+                  .doOnEach(sig -> audit(context, sig));
             }
         )
         .map(ResponseEntity::ok);
@@ -66,7 +62,7 @@ public Mono<ResponseEntity<Flux<KsqlResponseDTO>>> openKsqlResponsePipe(String c
         .operationName("openKsqlResponsePipe")
         .build();
 
-    return accessControlService.validateAccess(context).thenReturn(
+    return validateAccess(context).thenReturn(
         ResponseEntity.ok(ksqlServiceV2.execute(pipeId)
             .map(table -> new KsqlResponseDTO()
                 .table(
@@ -86,9 +82,9 @@ public Mono<ResponseEntity<Flux<KsqlStreamDescriptionDTO>>> listStreams(String c
         .operationName("listStreams")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .thenReturn(ResponseEntity.ok(ksqlServiceV2.listStreams(getCluster(clusterName))))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -100,8 +96,8 @@ public Mono<ResponseEntity<Flux<KsqlTableDescriptionDTO>>> listTables(String clu
         .operationName("listTables")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .thenReturn(ResponseEntity.ok(ksqlServiceV2.listTables(getCluster(clusterName))))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
index 00eae8a7c71..32d341e6134 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
@@ -24,8 +24,6 @@
 import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
 import com.provectus.kafka.ui.service.DeserializationService;
 import com.provectus.kafka.ui.service.MessagesService;
-import com.provectus.kafka.ui.service.audit.AuditService;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -49,8 +47,6 @@ public class MessagesController extends AbstractController implements MessagesAp
 
   private final MessagesService messagesService;
   private final DeserializationService deserializationService;
-  private final AccessControlService accessControlService;
-  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<Void>> deleteTopicMessages(
@@ -63,13 +59,13 @@ public Mono<ResponseEntity<Void>> deleteTopicMessages(
         .topicActions(MESSAGES_DELETE)
         .build();
 
-    return accessControlService.validateAccess(context).<ResponseEntity<Void>>then(
+    return validateAccess(context).<ResponseEntity<Void>>then(
         messagesService.deleteTopicMessages(
             getCluster(clusterName),
             topicName,
             Optional.ofNullable(partitions).orElse(List.of())
         ).thenReturn(ResponseEntity.ok().build())
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -120,9 +116,9 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String
     );
 
     var context = contextBuilder.build();
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(job)
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -137,11 +133,11 @@ public Mono<ResponseEntity<Void>> sendTopicMessages(
         .operationName("sendTopicMessages")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         createTopicMessage.flatMap(msg ->
             messagesService.sendMessage(getCluster(clusterName), topicName, msg).then()
         ).map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   /**
@@ -192,7 +188,7 @@ public Mono<ResponseEntity<TopicSerdeSuggestionDTO>> getSerdes(String clusterNam
             ? deserializationService.getSerdesForSerialize(getCluster(clusterName), topicName, VALUE)
             : deserializationService.getSerdesForDeserialize(getCluster(clusterName), topicName, VALUE));
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         Mono.just(dto)
             .subscribeOn(Schedulers.boundedElastic())
             .map(ResponseEntity::ok)
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
index 1c6a07abc20..a6cee97fd3a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
@@ -13,8 +13,6 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.permission.SchemaAction;
 import com.provectus.kafka.ui.service.SchemaRegistryService;
-import com.provectus.kafka.ui.service.audit.AuditService;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -38,8 +36,6 @@ public class SchemasController extends AbstractController implements SchemasApi
   private final KafkaSrMapper kafkaSrMapper = new KafkaSrMapperImpl();
 
   private final SchemaRegistryService schemaRegistryService;
-  private final AccessControlService accessControlService;
-  private final AuditService auditService;
 
   @Override
   protected KafkaCluster getCluster(String clusterName) {
@@ -61,7 +57,7 @@ public Mono<ResponseEntity<CompatibilityCheckResponseDTO>> checkSchemaCompatibil
         .operationName("checkSchemaCompatibility")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         newSchemaSubjectMono.flatMap(subjectDTO ->
                 schemaRegistryService.checksSchemaCompatibility(
                     getCluster(clusterName),
@@ -70,7 +66,7 @@ public Mono<ResponseEntity<CompatibilityCheckResponseDTO>> checkSchemaCompatibil
                 ))
             .map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -83,7 +79,7 @@ public Mono<ResponseEntity<SchemaSubjectDTO>> createNewSchema(
         .operationName("createNewSchema")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         newSchemaSubjectMono.flatMap(newSubject ->
                 schemaRegistryService.registerNewSchema(
                     getCluster(clusterName),
@@ -92,7 +88,7 @@ public Mono<ResponseEntity<SchemaSubjectDTO>> createNewSchema(
                 )
             ).map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -105,9 +101,9 @@ public Mono<ResponseEntity<Void>> deleteLatestSchema(
         .operationName("deleteLatestSchema")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         schemaRegistryService.deleteLatestSchemaSubject(getCluster(clusterName), subject)
-            .doOnEach(sig -> auditService.audit(context, sig))
+            .doOnEach(sig -> audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -122,9 +118,9 @@ public Mono<ResponseEntity<Void>> deleteSchema(
         .operationName("deleteSchema")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         schemaRegistryService.deleteSchemaSubjectEntirely(getCluster(clusterName), subject)
-            .doOnEach(sig -> auditService.audit(context, sig))
+            .doOnEach(sig -> audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -139,9 +135,9 @@ public Mono<ResponseEntity<Void>> deleteSchemaByVersion(
         .operationName("deleteSchemaByVersion")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         schemaRegistryService.deleteSchemaSubjectByVersion(getCluster(clusterName), subjectName, version)
-            .doOnEach(sig -> auditService.audit(context, sig))
+            .doOnEach(sig -> audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -160,9 +156,9 @@ public Mono<ResponseEntity<Flux<SchemaSubjectDTO>>> getAllVersionsBySubject(
         schemaRegistryService.getAllVersionsBySubject(getCluster(clusterName), subjectName)
             .map(kafkaSrMapper::toDto);
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .thenReturn(ResponseEntity.ok(schemas))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -185,11 +181,11 @@ public Mono<ResponseEntity<SchemaSubjectDTO>> getLatestSchema(String clusterName
         .operationName("getLatestSchema")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         schemaRegistryService.getLatestSchemaVersionBySubject(getCluster(clusterName), subject)
             .map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -203,12 +199,12 @@ public Mono<ResponseEntity<SchemaSubjectDTO>> getSchemaByVersion(
         .operationParams(Map.of("subject", subject, "version", version))
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         schemaRegistryService.getSchemaSubjectByVersion(
                 getCluster(clusterName), subject, version)
             .map(kafkaSrMapper::toDto)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -244,7 +240,7 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
               .map(subjs -> subjs.stream().map(kafkaSrMapper::toDto).toList())
               .map(subjs -> new SchemaSubjectsResponseDTO().pageCount(totalPages).schemas(subjs));
         }).map(ResponseEntity::ok)
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -257,14 +253,14 @@ public Mono<ResponseEntity<Void>> updateGlobalSchemaCompatibilityLevel(
         .operationName("updateGlobalSchemaCompatibilityLevel")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         compatibilityLevelMono
             .flatMap(compatibilityLevelDTO ->
                 schemaRegistryService.updateGlobalSchemaCompatibility(
                     getCluster(clusterName),
                     kafkaSrMapper.fromDto(compatibilityLevelDTO.getCompatibility())
                 ))
-            .doOnEach(sig -> auditService.audit(context, sig))
+            .doOnEach(sig -> audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -280,7 +276,7 @@ public Mono<ResponseEntity<Void>> updateSchemaCompatibilityLevel(
         .operationParams(Map.of("subject", subject))
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         compatibilityLevelMono
             .flatMap(compatibilityLevelDTO ->
                 schemaRegistryService.updateSchemaCompatibility(
@@ -288,7 +284,7 @@ public Mono<ResponseEntity<Void>> updateSchemaCompatibilityLevel(
                     subject,
                     kafkaSrMapper.fromDto(compatibilityLevelDTO.getCompatibility())
                 ))
-            .doOnEach(sig -> auditService.audit(context, sig))
+            .doOnEach(sig -> audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
index 5ec0fbc642e..d422a2cbc68 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
@@ -27,8 +27,6 @@
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.TopicsService;
 import com.provectus.kafka.ui.service.analyze.TopicAnalysisService;
-import com.provectus.kafka.ui.service.audit.AuditService;
-import com.provectus.kafka.ui.service.rbac.AccessControlService;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -53,8 +51,6 @@ public class TopicsController extends AbstractController implements TopicsApi {
   private final TopicsService topicsService;
   private final TopicAnalysisService topicAnalysisService;
   private final ClusterMapper clusterMapper;
-  private final AccessControlService accessControlService;
-  private final AuditService auditService;
 
   @Override
   public Mono<ResponseEntity<TopicDTO>> createTopic(
@@ -67,12 +63,12 @@ public Mono<ResponseEntity<TopicDTO>> createTopic(
           .operationParams(topicCreation)
           .build();
 
-      return accessControlService.validateAccess(context)
+      return validateAccess(context)
           .then(topicsService.createTopic(getCluster(clusterName), topicCreation))
           .map(clusterMapper::toTopic)
           .map(s -> new ResponseEntity<>(s, HttpStatus.OK))
           .switchIfEmpty(Mono.just(ResponseEntity.notFound().build()))
-          .doOnEach(sig -> auditService.audit(context, sig));
+          .doOnEach(sig -> audit(context, sig));
     });
   }
 
@@ -86,11 +82,11 @@ public Mono<ResponseEntity<TopicDTO>> recreateTopic(String clusterName,
         .operationName("recreateTopic")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         topicsService.recreateTopic(getCluster(clusterName), topicName)
             .map(clusterMapper::toTopic)
             .map(s -> new ResponseEntity<>(s, HttpStatus.CREATED))
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -105,11 +101,11 @@ public Mono<ResponseEntity<TopicDTO>> cloneTopic(
         .operationParams(Map.of("newTopicName", newTopicName))
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(topicsService.cloneTopic(getCluster(clusterName), topicName, newTopicName)
             .map(clusterMapper::toTopic)
             .map(s -> new ResponseEntity<>(s, HttpStatus.CREATED))
-        ).doOnEach(sig -> auditService.audit(context, sig));
+        ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -123,11 +119,11 @@ public Mono<ResponseEntity<Void>> deleteTopic(
         .operationName("deleteTopic")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(
             topicsService.deleteTopic(getCluster(clusterName), topicName)
                 .thenReturn(ResponseEntity.ok().<Void>build())
-        ).doOnEach(sig -> auditService.audit(context, sig));
+        ).doOnEach(sig -> audit(context, sig));
   }
 
 
@@ -142,7 +138,7 @@ public Mono<ResponseEntity<Flux<TopicConfigDTO>>> getTopicConfigs(
         .operationName("getTopicConfigs")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         topicsService.getTopicConfigs(getCluster(clusterName), topicName)
             .map(lst -> lst.stream()
                 .map(InternalTopicConfig::from)
@@ -150,7 +146,7 @@ public Mono<ResponseEntity<Flux<TopicConfigDTO>>> getTopicConfigs(
                 .collect(toList()))
             .map(Flux::fromIterable)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -164,11 +160,11 @@ public Mono<ResponseEntity<TopicDetailsDTO>> getTopicDetails(
         .operationName("getTopicDetails")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         topicsService.getTopicDetails(getCluster(clusterName), topicName)
             .map(clusterMapper::toTopicDetails)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -215,7 +211,7 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName,
                       .pageCount(totalPages));
         })
         .map(ResponseEntity::ok)
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -230,12 +226,12 @@ public Mono<ResponseEntity<TopicDTO>> updateTopic(
         .operationName("updateTopic")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         topicsService
             .updateTopic(getCluster(clusterName), topicName, topicUpdate)
             .map(clusterMapper::toTopic)
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -250,11 +246,11 @@ public Mono<ResponseEntity<PartitionsIncreaseResponseDTO>> increaseTopicPartitio
         .topicActions(VIEW, EDIT)
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         partitionsIncrease.flatMap(partitions ->
             topicsService.increaseTopicPartitions(getCluster(clusterName), topicName, partitions)
         ).map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -270,12 +266,12 @@ public Mono<ResponseEntity<ReplicationFactorChangeResponseDTO>> changeReplicatio
         .operationName("changeReplicationFactor")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         replicationFactorChange
             .flatMap(rfc ->
                 topicsService.changeReplicationFactor(getCluster(clusterName), topicName, rfc))
             .map(ResponseEntity::ok)
-    ).doOnEach(sig -> auditService.audit(context, sig));
+    ).doOnEach(sig -> audit(context, sig));
   }
 
   @Override
@@ -288,9 +284,9 @@ public Mono<ResponseEntity<Void>> analyzeTopic(String clusterName, String topicN
         .operationName("analyzeTopic")
         .build();
 
-    return accessControlService.validateAccess(context).then(
+    return validateAccess(context).then(
         topicAnalysisService.analyze(getCluster(clusterName), topicName)
-            .doOnEach(sig -> auditService.audit(context, sig))
+            .doOnEach(sig -> audit(context, sig))
             .thenReturn(ResponseEntity.ok().build())
     );
   }
@@ -305,9 +301,9 @@ public Mono<ResponseEntity<Void>> cancelTopicAnalysis(String clusterName, String
         .operationName("cancelTopicAnalysis")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .then(Mono.fromRunnable(() -> topicAnalysisService.cancelAnalysis(getCluster(clusterName), topicName)))
-        .doOnEach(sig -> auditService.audit(context, sig))
+        .doOnEach(sig -> audit(context, sig))
         .thenReturn(ResponseEntity.ok().build());
   }
 
@@ -324,11 +320,11 @@ public Mono<ResponseEntity<TopicAnalysisDTO>> getTopicAnalysis(String clusterNam
         .operationName("getTopicAnalysis")
         .build();
 
-    return accessControlService.validateAccess(context)
+    return validateAccess(context)
         .thenReturn(topicAnalysisService.getTopicAnalysis(getCluster(clusterName), topicName)
             .map(ResponseEntity::ok)
             .orElseGet(() -> ResponseEntity.notFound().build()))
-        .doOnEach(sig -> auditService.audit(context, sig));
+        .doOnEach(sig -> audit(context, sig));
   }
 
   private Comparator<InternalTopic> getComparatorForTopic(
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
index 295eeccbb3c..cba0f58fae7 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/SchemaRegistryPaginationTest.java
@@ -42,8 +42,9 @@ private void init(List<String> subjects) {
                 new SchemaRegistryService.SubjectWithCompatibilityLevel(
                     new SchemaSubject().subject(a.getArgument(1)), Compatibility.FULL)));
 
-    this.controller = new SchemasController(schemaRegistryService, new AccessControlServiceMock().getMock(),
-        mock(AuditService.class));
+    this.controller = new SchemasController(schemaRegistryService);
+    this.controller.setAccessControlService(new AccessControlServiceMock().getMock());
+    this.controller.setAuditService(mock(AuditService.class));
     this.controller.setClustersStorage(clustersStorage);
   }
 
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
index 97f193022a5..3a6cebc8347 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/TopicsServicePaginationTest.java
@@ -45,8 +45,8 @@ class TopicsServicePaginationTest {
   private final ClusterMapper clusterMapper = new ClusterMapperImpl();
   private final AccessControlService accessControlService = new AccessControlServiceMock().getMock();
 
-  private final TopicsController topicsController = new TopicsController(
-      topicsService, mock(TopicAnalysisService.class), clusterMapper, accessControlService, mock(AuditService.class));
+  private final TopicsController topicsController =
+      new TopicsController(topicsService, mock(TopicAnalysisService.class), clusterMapper);
 
   private void init(Map<String, InternalTopic> topicsInCache) {
 
@@ -59,6 +59,8 @@ private void init(Map<String, InternalTopic> topicsInCache) {
           List<String> lst = a.getArgument(1);
           return Mono.just(lst.stream().map(topicsInCache::get).collect(Collectors.toList()));
         });
+    topicsController.setAccessControlService(accessControlService);
+    topicsController.setAuditService(mock(AuditService.class));
     topicsController.setClustersStorage(clustersStorage);
   }
 

From b32ab0143679bd3224f097a9de0eefad4e60f8d6 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Fri, 11 Aug 2023 17:13:14 +0400
Subject: [PATCH 673/734] BE: Implement audit log level (#4103)

---
 .../kafka/ui/config/ClustersProperties.java   |  6 ++
 .../ui/model/rbac/permission/AclAction.java   | 12 ++-
 .../permission/ApplicationConfigAction.java   |  7 ++
 .../ui/model/rbac/permission/AuditAction.java | 12 ++-
 .../rbac/permission/ClusterConfigAction.java  |  7 ++
 .../model/rbac/permission/ConnectAction.java  |  7 ++
 .../rbac/permission/ConsumerGroupAction.java  |  8 +-
 .../ui/model/rbac/permission/KsqlAction.java  | 11 ++-
 .../rbac/permission/PermissibleAction.java    |  5 ++
 .../model/rbac/permission/SchemaAction.java   |  7 ++
 .../ui/model/rbac/permission/TopicAction.java |  8 +-
 .../kafka/ui/service/audit/AuditRecord.java   | 23 +++--
 .../kafka/ui/service/audit/AuditService.java  | 11 ++-
 .../kafka/ui/service/audit/AuditWriter.java   |  5 ++
 .../ui/service/audit/AuditServiceTest.java    | 15 +++-
 .../ui/service/audit/AuditWriterTest.java     | 86 +++++++++++++++++++
 .../main/resources/swagger/kafka-ui-api.yaml  |  3 +
 17 files changed, 213 insertions(+), 20 deletions(-)
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditWriterTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 33763ed9b89..4ebc69f61ee 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -152,7 +152,13 @@ public static class AuditProperties {
     Integer auditTopicsPartitions;
     Boolean topicAuditEnabled;
     Boolean consoleAuditEnabled;
+    LogLevel level;
     Map<String, String> auditTopicProperties;
+
+    public enum LogLevel {
+      ALL,
+      ALTER_ONLY //default
+    }
   }
 
   @PostConstruct
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AclAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AclAction.java
index c86af7e72d2..8e7d2673d6d 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AclAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AclAction.java
@@ -1,15 +1,25 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
+import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
 
 public enum AclAction implements PermissibleAction {
 
   VIEW,
-  EDIT;
+  EDIT
+
+  ;
+
+  public static final Set<AclAction> ALTER_ACTIONS = Set.of(EDIT);
 
   @Nullable
   public static AclAction fromString(String name) {
     return EnumUtils.getEnum(AclAction.class, name);
   }
+
+  @Override
+  public boolean isAlter() {
+    return ALTER_ACTIONS.contains(this);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ApplicationConfigAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ApplicationConfigAction.java
index d30ff50d708..e04ff3570c7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ApplicationConfigAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ApplicationConfigAction.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
+import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
 
@@ -10,9 +11,15 @@ public enum ApplicationConfigAction implements PermissibleAction {
 
   ;
 
+  public static final Set<ApplicationConfigAction> ALTER_ACTIONS = Set.of(EDIT);
+
   @Nullable
   public static ApplicationConfigAction fromString(String name) {
     return EnumUtils.getEnum(ApplicationConfigAction.class, name);
   }
 
+  @Override
+  public boolean isAlter() {
+    return ALTER_ACTIONS.contains(this);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AuditAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AuditAction.java
index db4db7d5e73..a277f82fe9c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AuditAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/AuditAction.java
@@ -1,14 +1,24 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
+import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
 
 public enum AuditAction implements PermissibleAction {
 
-  VIEW;
+  VIEW
+
+  ;
+
+  private static final Set<AuditAction> ALTER_ACTIONS = Set.of();
 
   @Nullable
   public static AuditAction fromString(String name) {
     return EnumUtils.getEnum(AuditAction.class, name);
   }
+
+  @Override
+  public boolean isAlter() {
+    return ALTER_ACTIONS.contains(this);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ClusterConfigAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ClusterConfigAction.java
index 54adcf5340a..91c9e49f5e3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ClusterConfigAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ClusterConfigAction.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
+import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
 
@@ -10,9 +11,15 @@ public enum ClusterConfigAction implements PermissibleAction {
 
   ;
 
+  public static final Set<ClusterConfigAction> ALTER_ACTIONS = Set.of(EDIT);
+
   @Nullable
   public static ClusterConfigAction fromString(String name) {
     return EnumUtils.getEnum(ClusterConfigAction.class, name);
   }
 
+  @Override
+  public boolean isAlter() {
+    return ALTER_ACTIONS.contains(this);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java
index 1c3335e3608..88404c25f64 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConnectAction.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
+import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
 
@@ -12,9 +13,15 @@ public enum ConnectAction implements PermissibleAction {
 
   ;
 
+  public static final Set<ConnectAction> ALTER_ACTIONS = Set.of(CREATE, EDIT, RESTART);
+
   @Nullable
   public static ConnectAction fromString(String name) {
     return EnumUtils.getEnum(ConnectAction.class, name);
   }
 
+  @Override
+  public boolean isAlter() {
+    return ALTER_ACTIONS.contains(this);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConsumerGroupAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConsumerGroupAction.java
index cef23059db6..4a050aa0668 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConsumerGroupAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/ConsumerGroupAction.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
+import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
 
@@ -7,14 +8,19 @@ public enum ConsumerGroupAction implements PermissibleAction {
 
   VIEW,
   DELETE,
-
   RESET_OFFSETS
 
   ;
 
+  public static final Set<ConsumerGroupAction> ALTER_ACTIONS = Set.of(DELETE, RESET_OFFSETS);
+
   @Nullable
   public static ConsumerGroupAction fromString(String name) {
     return EnumUtils.getEnum(ConsumerGroupAction.class, name);
   }
 
+  @Override
+  public boolean isAlter() {
+    return ALTER_ACTIONS.contains(this);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/KsqlAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/KsqlAction.java
index e3a6aa8c9f9..0ff2c1857cb 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/KsqlAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/KsqlAction.java
@@ -1,15 +1,24 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
+import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
 
 public enum KsqlAction implements PermissibleAction {
 
-  EXECUTE;
+  EXECUTE
+
+  ;
+
+  public static final Set<KsqlAction> ALTER_ACTIONS = Set.of(EXECUTE);
 
   @Nullable
   public static KsqlAction fromString(String name) {
     return EnumUtils.getEnum(KsqlAction.class, name);
   }
 
+  @Override
+  public boolean isAlter() {
+    return ALTER_ACTIONS.contains(this);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java
index 5de78a15178..24c4adba9f0 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/PermissibleAction.java
@@ -5,4 +5,9 @@ public sealed interface PermissibleAction permits
     ConsumerGroupAction, SchemaAction,
     ConnectAction, ClusterConfigAction,
     KsqlAction, TopicAction, AuditAction {
+
+  String name();
+
+  boolean isAlter();
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/SchemaAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/SchemaAction.java
index 1f3f4649256..94102297b44 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/SchemaAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/SchemaAction.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
+import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
 
@@ -13,9 +14,15 @@ public enum SchemaAction implements PermissibleAction {
 
   ;
 
+  public static final Set<SchemaAction> ALTER_ACTIONS = Set.of(CREATE, DELETE, EDIT, MODIFY_GLOBAL_COMPATIBILITY);
+
   @Nullable
   public static SchemaAction fromString(String name) {
     return EnumUtils.getEnum(SchemaAction.class, name);
   }
 
+  @Override
+  public boolean isAlter() {
+    return ALTER_ACTIONS.contains(this);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/TopicAction.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/TopicAction.java
index debf9fac4c0..06eee56af5f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/TopicAction.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/permission/TopicAction.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.model.rbac.permission;
 
+import java.util.Set;
 import org.apache.commons.lang3.EnumUtils;
 import org.jetbrains.annotations.Nullable;
 
@@ -9,16 +10,21 @@ public enum TopicAction implements PermissibleAction {
   CREATE,
   EDIT,
   DELETE,
-
   MESSAGES_READ,
   MESSAGES_PRODUCE,
   MESSAGES_DELETE,
 
   ;
 
+  public static final Set<TopicAction> ALTER_ACTIONS = Set.of(CREATE, EDIT, DELETE, MESSAGES_PRODUCE, MESSAGES_DELETE);
+
   @Nullable
   public static TopicAction fromString(String name) {
     return EnumUtils.getEnum(TopicAction.class, name);
   }
 
+  @Override
+  public boolean isAlter() {
+    return ALTER_ACTIONS.contains(this);
+  }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditRecord.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditRecord.java
index 7e9f7319809..3f7fb44aacd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditRecord.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditRecord.java
@@ -6,6 +6,7 @@
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.model.rbac.Resource;
+import com.provectus.kafka.ui.model.rbac.permission.PermissibleAction;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -33,16 +34,20 @@ String toJson() {
     return MAPPER.writeValueAsString(this);
   }
 
-  record AuditResource(String accessType, Resource type, @Nullable Object id) {
+  record AuditResource(String accessType, boolean alter, Resource type, @Nullable Object id) {
+
+    private static AuditResource create(PermissibleAction action, Resource type, @Nullable Object id) {
+      return new AuditResource(action.name(), action.isAlter(), type, id);
+    }
 
     static List<AuditResource> getAccessedResources(AccessContext ctx) {
       List<AuditResource> resources = new ArrayList<>();
       ctx.getClusterConfigActions()
-          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.CLUSTERCONFIG, null)));
+          .forEach(a -> resources.add(create(a, Resource.CLUSTERCONFIG, null)));
       ctx.getTopicActions()
-          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.TOPIC, nameId(ctx.getTopic()))));
+          .forEach(a -> resources.add(create(a, Resource.TOPIC, nameId(ctx.getTopic()))));
       ctx.getConsumerGroupActions()
-          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.CONSUMER, nameId(ctx.getConsumerGroup()))));
+          .forEach(a -> resources.add(create(a, Resource.CONSUMER, nameId(ctx.getConsumerGroup()))));
       ctx.getConnectActions()
           .forEach(a -> {
             Map<String, String> resourceId = new LinkedHashMap<>();
@@ -50,16 +55,16 @@ static List<AuditResource> getAccessedResources(AccessContext ctx) {
             if (ctx.getConnector() != null) {
               resourceId.put("connector", ctx.getConnector());
             }
-            resources.add(new AuditResource(a.name(), Resource.CONNECT, resourceId));
+            resources.add(create(a, Resource.CONNECT, resourceId));
           });
       ctx.getSchemaActions()
-          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.SCHEMA, nameId(ctx.getSchema()))));
+          .forEach(a -> resources.add(create(a, Resource.SCHEMA, nameId(ctx.getSchema()))));
       ctx.getKsqlActions()
-          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.KSQL, null)));
+          .forEach(a -> resources.add(create(a, Resource.KSQL, null)));
       ctx.getAclActions()
-          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.ACL, null)));
+          .forEach(a -> resources.add(create(a, Resource.ACL, null)));
       ctx.getAuditAction()
-          .forEach(a -> resources.add(new AuditResource(a.name(), Resource.AUDIT, null)));
+          .forEach(a -> resources.add(create(a, Resource.AUDIT, null)));
       return resources;
     }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
index ad5f11e1f3d..36470db2c74 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
@@ -1,5 +1,6 @@
 package com.provectus.kafka.ui.service.audit;
 
+import static com.provectus.kafka.ui.config.ClustersProperties.AuditProperties.LogLevel.ALTER_ONLY;
 import static com.provectus.kafka.ui.service.MessagesService.createProducer;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -80,12 +81,13 @@ static Optional<AuditWriter> createAuditWriter(KafkaCluster cluster,
     }
     boolean topicAudit = Optional.ofNullable(auditProps.getTopicAuditEnabled()).orElse(false);
     boolean consoleAudit = Optional.ofNullable(auditProps.getConsoleAuditEnabled()).orElse(false);
+    boolean alterLogOnly = Optional.ofNullable(auditProps.getLevel()).map(lvl -> lvl == ALTER_ONLY).orElse(true);
     if (!topicAudit && !consoleAudit) {
       return Optional.empty();
     }
     if (!topicAudit) {
       log.info("Audit initialization finished for cluster '{}' (console only)", cluster.getName());
-      return Optional.of(consoleOnlyWriter(cluster));
+      return Optional.of(consoleOnlyWriter(cluster, alterLogOnly));
     }
     String auditTopicName = Optional.ofNullable(auditProps.getTopic()).orElse(DEFAULT_AUDIT_TOPIC_NAME);
     boolean topicAuditCanBeDone = createTopicIfNeeded(cluster, acSupplier, auditTopicName, auditProps);
@@ -95,7 +97,7 @@ static Optional<AuditWriter> createAuditWriter(KafkaCluster cluster,
             "Audit initialization finished for cluster '{}' (console only, topic audit init failed)",
             cluster.getName()
         );
-        return Optional.of(consoleOnlyWriter(cluster));
+        return Optional.of(consoleOnlyWriter(cluster, alterLogOnly));
       }
       return Optional.empty();
     }
@@ -103,6 +105,7 @@ static Optional<AuditWriter> createAuditWriter(KafkaCluster cluster,
     return Optional.of(
         new AuditWriter(
             cluster.getName(),
+            alterLogOnly,
             auditTopicName,
             producerFactory.get(),
             consoleAudit ? AUDIT_LOGGER : null
@@ -110,8 +113,8 @@ static Optional<AuditWriter> createAuditWriter(KafkaCluster cluster,
     );
   }
 
-  private static AuditWriter consoleOnlyWriter(KafkaCluster cluster) {
-    return new AuditWriter(cluster.getName(), null, null, AUDIT_LOGGER);
+  private static AuditWriter consoleOnlyWriter(KafkaCluster cluster, boolean alterLogOnly) {
+    return new AuditWriter(cluster.getName(), alterLogOnly, null, null, AUDIT_LOGGER);
   }
 
   /**
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java
index 8fa8239278b..fabcba70ae6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditWriter.java
@@ -18,6 +18,7 @@
 
 @Slf4j
 record AuditWriter(String clusterName,
+                   boolean logAlterOperationsOnly,
                    @Nullable String targetTopic,
                    @Nullable KafkaProducer<byte[], byte[]> producer,
                    @Nullable Logger consoleLogger) implements Closeable {
@@ -39,6 +40,10 @@ void write(AccessContext ctx, AuthenticatedUser user, @Nullable Throwable th) {
   }
 
   private void write(AuditRecord rec) {
+    if (logAlterOperationsOnly && rec.resources().stream().noneMatch(AuditResource::alter)) {
+      //we should only log alter operations, but this is read-only op
+      return;
+    }
     String json = rec.toJson();
     if (consoleLogger != null) {
       consoleLogger.info(json);
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java
index fd90dbacd68..49781bcd3e4 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditServiceTest.java
@@ -30,8 +30,8 @@ class AuditServiceTest {
   @Test
   void isAuditTopicChecksIfAuditIsEnabledForCluster() {
     Map<String, AuditWriter> writers = Map.of(
-        "c1", new AuditWriter("с1", "c1topic", null, null),
-        "c2", new AuditWriter("c2", "c2topic", mock(KafkaProducer.class), null)
+        "c1", new AuditWriter("с1", true, "c1topic", null, null),
+        "c2", new AuditWriter("c2", false, "c2topic", mock(KafkaProducer.class), null)
     );
 
     var auditService = new AuditService(writers);
@@ -79,6 +79,17 @@ void init() {
           .thenReturn(mock(KafkaProducer.class));
     }
 
+    @Test
+    void logOnlyAlterOpsByDefault() {
+      var auditProps = new ClustersProperties.AuditProperties();
+      auditProps.setConsoleAuditEnabled(true);
+      clustersProperties.setAudit(auditProps);
+
+      var maybeWriter = createAuditWriter(cluster, () -> adminClientMock, producerSupplierMock);
+      assertThat(maybeWriter)
+          .hasValueSatisfying(w -> assertThat(w.logAlterOperationsOnly()).isTrue());
+    }
+
     @Test
     void noWriterIfNoAuditPropsSet() {
       var maybeWriter = createAuditWriter(cluster, () -> adminClientMock, producerSupplierMock);
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditWriterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditWriterTest.java
new file mode 100644
index 00000000000..5bcee45ac8e
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/audit/AuditWriterTest.java
@@ -0,0 +1,86 @@
+package com.provectus.kafka.ui.service.audit;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+import com.provectus.kafka.ui.config.auth.AuthenticatedUser;
+import com.provectus.kafka.ui.model.rbac.AccessContext;
+import com.provectus.kafka.ui.model.rbac.AccessContext.AccessContextBuilder;
+import com.provectus.kafka.ui.model.rbac.permission.AclAction;
+import com.provectus.kafka.ui.model.rbac.permission.ClusterConfigAction;
+import com.provectus.kafka.ui.model.rbac.permission.ConnectAction;
+import com.provectus.kafka.ui.model.rbac.permission.ConsumerGroupAction;
+import com.provectus.kafka.ui.model.rbac.permission.SchemaAction;
+import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
+import java.util.List;
+import java.util.function.UnaryOperator;
+import java.util.stream.Stream;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mockito;
+import org.slf4j.Logger;
+
+class AuditWriterTest {
+
+  final KafkaProducer<byte[], byte[]> producerMock = Mockito.mock(KafkaProducer.class);
+  final Logger loggerMock = Mockito.mock(Logger.class);
+  final AuthenticatedUser user = new AuthenticatedUser("someone", List.of());
+
+  @Nested
+  class AlterOperationsOnlyWriter {
+
+    final AuditWriter alterOnlyWriter = new AuditWriter("test", true, "test-topic", producerMock, loggerMock);
+
+    @ParameterizedTest
+    @MethodSource
+    void onlyLogsWhenAlterOperationIsPresentForOneOfResources(AccessContext ctxWithAlterOperation) {
+      alterOnlyWriter.write(ctxWithAlterOperation, user, null);
+      verify(producerMock).send(any(), any());
+      verify(loggerMock).info(any());
+    }
+
+    static Stream<AccessContext> onlyLogsWhenAlterOperationIsPresentForOneOfResources() {
+      Stream<UnaryOperator<AccessContextBuilder>> topicEditActions =
+          TopicAction.ALTER_ACTIONS.stream().map(a -> c -> c.topic("test").topicActions(a));
+      Stream<UnaryOperator<AccessContextBuilder>> clusterConfigEditActions =
+          ClusterConfigAction.ALTER_ACTIONS.stream().map(a -> c -> c.clusterConfigActions(a));
+      Stream<UnaryOperator<AccessContextBuilder>> aclEditActions =
+          AclAction.ALTER_ACTIONS.stream().map(a -> c -> c.aclActions(a));
+      Stream<UnaryOperator<AccessContextBuilder>> cgEditActions =
+          ConsumerGroupAction.ALTER_ACTIONS.stream().map(a -> c -> c.consumerGroup("cg").consumerGroupActions(a));
+      Stream<UnaryOperator<AccessContextBuilder>> schemaEditActions =
+          SchemaAction.ALTER_ACTIONS.stream().map(a -> c -> c.schema("sc").schemaActions(a));
+      Stream<UnaryOperator<AccessContextBuilder>> connEditActions =
+          ConnectAction.ALTER_ACTIONS.stream().map(a -> c -> c.connect("conn").connectActions(a));
+      return Stream.of(
+              topicEditActions, clusterConfigEditActions, aclEditActions,
+              cgEditActions, connEditActions, schemaEditActions
+          )
+          .flatMap(c -> c)
+          .map(setter -> setter.apply(AccessContext.builder().cluster("test").operationName("test")).build());
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void doesNothingIfNoResourceHasAlterAction(AccessContext readOnlyCxt) {
+      alterOnlyWriter.write(readOnlyCxt, user, null);
+      verifyNoInteractions(producerMock);
+      verifyNoInteractions(loggerMock);
+    }
+
+    static Stream<AccessContext> doesNothingIfNoResourceHasAlterAction() {
+      return Stream.<UnaryOperator<AccessContextBuilder>>of(
+          c -> c.topic("test").topicActions(TopicAction.VIEW),
+          c -> c.clusterConfigActions(ClusterConfigAction.VIEW),
+          c -> c.aclActions(AclAction.VIEW),
+          c -> c.consumerGroup("cg").consumerGroupActions(ConsumerGroupAction.VIEW),
+          c -> c.schema("sc").schemaActions(SchemaAction.VIEW),
+          c -> c.connect("conn").connectActions(ConnectAction.VIEW)
+      ).map(setter -> setter.apply(AccessContext.builder().cluster("test").operationName("test")).build());
+    }
+  }
+
+}
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 9484948b67e..e8fd3129cb3 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -4026,6 +4026,9 @@ components:
                       audit:
                         type: object
                         properties:
+                          level:
+                            type: string
+                            enum: [ "ALL", "ALTER_ONLY" ]
                           topic:
                             type: string
                           auditTopicsPartitions:

From 2a61b97fabe9fb534737d47523d2717a76d624b4 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 14 Aug 2023 14:37:55 +0400
Subject: [PATCH 674/734] Messaging polling refactoring (#4088)

1. RecordEmitter logic refactored - all polling logic moved RangePollingEmitter. Backward/Forward implementations just chouse how range is calculated for next step.
2. Using consumer.position() method to define that range is fully polled (not empty polls counting deleted)
3. AnalysisTask: calculating progress based on processed offsets, not polled messages (more accurate for compacted topics)
4. Sorting polled messages by ts before sending to frontend
---
 .../kafka/ui/config/ClustersProperties.java   |   2 -
 .../kafka/ui/emitter/AbstractEmitter.java     |  19 +--
 .../kafka/ui/emitter/BackwardEmitter.java     |  60 +++++++++
 .../ui/emitter/BackwardRecordEmitter.java     | 126 ------------------
 .../kafka/ui/emitter/ConsumingStats.java      |  30 +++--
 .../kafka/ui/emitter/EmptyPollsCounter.java   |  28 ----
 .../kafka/ui/emitter/ForwardEmitter.java      |  61 +++++++++
 .../ui/emitter/ForwardRecordEmitter.java      |  64 ---------
 .../kafka/ui/emitter/MessagesProcessing.java  |  92 +++++++++----
 .../kafka/ui/emitter/OffsetsInfo.java         |  18 ++-
 .../kafka/ui/emitter/PollingSettings.java     |  29 ----
 .../kafka/ui/emitter/RangePollingEmitter.java |  98 ++++++++++++++
 .../kafka/ui/emitter/SeekOperations.java      |  39 ++++--
 .../kafka/ui/emitter/TailingEmitter.java      |  13 +-
 .../ui/serdes/ConsumerRecordDeserializer.java |  23 ++--
 .../serdes/builtin/ConsumerOffsetsSerde.java  |   1 +
 .../ui/service/DeserializationService.java    |   3 +-
 .../kafka/ui/service/MessagesService.java     |  57 ++------
 .../service/analyze/AnalysisTasksStore.java   |  12 +-
 .../service/analyze/TopicAnalysisService.java |  73 ++++------
 .../kafka/ui/service/masking/DataMasking.java |  19 ++-
 .../ui/emitter/MessagesProcessingTest.java    |  69 ++++++++++
 .../ConsumerRecordDeserializerTest.java       |  30 +++++
 .../kafka/ui/service/RecordEmitterTest.java   |  72 +++++-----
 .../main/resources/swagger/kafka-ui-api.yaml  |   4 -
 25 files changed, 565 insertions(+), 477 deletions(-)
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardEmitter.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardEmitter.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/RangePollingEmitter.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessagesProcessingTest.java
 create mode 100644 kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializerTest.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
index 4ebc69f61ee..e0b20d6c93f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/ClustersProperties.java
@@ -57,8 +57,6 @@ public static class Cluster {
   @Data
   public static class PollingProperties {
     Integer pollTimeoutMs;
-    Integer partitionPollTimeout;
-    Integer noDataEmptyPolls;
     Integer maxPageSize;
     Integer defaultPageSize;
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
index 66bb24f0e1c..ec576a1d1a6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/AbstractEmitter.java
@@ -1,28 +1,22 @@
 package com.provectus.kafka.ui.emitter;
 
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import java.time.Duration;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
 
-public abstract class AbstractEmitter {
+abstract class AbstractEmitter implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
 
   private final MessagesProcessing messagesProcessing;
-  protected final PollingSettings pollingSettings;
+  private final PollingSettings pollingSettings;
 
   protected AbstractEmitter(MessagesProcessing messagesProcessing, PollingSettings pollingSettings) {
     this.messagesProcessing = messagesProcessing;
     this.pollingSettings = pollingSettings;
   }
 
-  protected PolledRecords poll(
-      FluxSink<TopicMessageEventDTO> sink, EnhancedConsumer consumer) {
-    return poll(sink, consumer, pollingSettings.getPollTimeout());
-  }
-
-  protected PolledRecords poll(FluxSink<TopicMessageEventDTO> sink, EnhancedConsumer consumer, Duration timeout) {
-    var records = consumer.pollEnhanced(timeout);
+  protected PolledRecords poll(FluxSink<TopicMessageEventDTO> sink, EnhancedConsumer consumer) {
+    var records = consumer.pollEnhanced(pollingSettings.getPollTimeout());
     sendConsuming(sink, records);
     return records;
   }
@@ -31,9 +25,8 @@ protected boolean sendLimitReached() {
     return messagesProcessing.limitReached();
   }
 
-  protected void sendMessage(FluxSink<TopicMessageEventDTO> sink,
-                             ConsumerRecord<Bytes, Bytes> msg) {
-    messagesProcessing.sendMsg(sink, msg);
+  protected void send(FluxSink<TopicMessageEventDTO> sink, Iterable<ConsumerRecord<Bytes, Bytes>> records) {
+    messagesProcessing.send(sink, records);
   }
 
   protected void sendPhase(FluxSink<TopicMessageEventDTO> sink, String name) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardEmitter.java
new file mode 100644
index 00000000000..cdc45336e46
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardEmitter.java
@@ -0,0 +1,60 @@
+package com.provectus.kafka.ui.emitter;
+
+import com.provectus.kafka.ui.model.ConsumerPosition;
+import com.provectus.kafka.ui.model.TopicMessageDTO;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.apache.kafka.common.TopicPartition;
+
+public class BackwardEmitter extends RangePollingEmitter {
+
+  public BackwardEmitter(Supplier<EnhancedConsumer> consumerSupplier,
+                         ConsumerPosition consumerPosition,
+                         int messagesPerPage,
+                         ConsumerRecordDeserializer deserializer,
+                         Predicate<TopicMessageDTO> filter,
+                         PollingSettings pollingSettings) {
+    super(
+        consumerSupplier,
+        consumerPosition,
+        messagesPerPage,
+        new MessagesProcessing(
+            deserializer,
+            filter,
+            false,
+            messagesPerPage
+        ),
+        pollingSettings
+    );
+  }
+
+  @Override
+  protected TreeMap<TopicPartition, FromToOffset> nextPollingRange(TreeMap<TopicPartition, FromToOffset> prevRange,
+                                                                   SeekOperations seekOperations) {
+    TreeMap<TopicPartition, Long> readToOffsets = new TreeMap<>(Comparator.comparingInt(TopicPartition::partition));
+    if (prevRange.isEmpty()) {
+      readToOffsets.putAll(seekOperations.getOffsetsForSeek());
+    } else {
+      readToOffsets.putAll(
+          prevRange.entrySet()
+              .stream()
+              .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().from()))
+      );
+    }
+
+    int msgsToPollPerPartition = (int) Math.ceil((double) messagesPerPage / readToOffsets.size());
+    TreeMap<TopicPartition, FromToOffset> result = new TreeMap<>(Comparator.comparingInt(TopicPartition::partition));
+    readToOffsets.forEach((tp, toOffset) -> {
+      long tpStartOffset = seekOperations.getBeginOffsets().get(tp);
+      if (toOffset > tpStartOffset) {
+        result.put(tp, new FromToOffset(Math.max(tpStartOffset, toOffset - msgsToPollPerPartition), toOffset));
+      }
+    });
+    return result;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
deleted file mode 100644
index 368b7cee5b2..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/BackwardRecordEmitter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.provectus.kafka.ui.emitter;
-
-import com.provectus.kafka.ui.model.ConsumerPosition;
-import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.TreeMap;
-import java.util.function.Supplier;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.TopicPartition;
-import org.apache.kafka.common.errors.InterruptException;
-import org.apache.kafka.common.utils.Bytes;
-import reactor.core.publisher.FluxSink;
-
-@Slf4j
-public class BackwardRecordEmitter
-    extends AbstractEmitter
-    implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
-
-  private final Supplier<EnhancedConsumer> consumerSupplier;
-  private final ConsumerPosition consumerPosition;
-  private final int messagesPerPage;
-
-  public BackwardRecordEmitter(
-      Supplier<EnhancedConsumer> consumerSupplier,
-      ConsumerPosition consumerPosition,
-      int messagesPerPage,
-      MessagesProcessing messagesProcessing,
-      PollingSettings pollingSettings) {
-    super(messagesProcessing, pollingSettings);
-    this.consumerPosition = consumerPosition;
-    this.messagesPerPage = messagesPerPage;
-    this.consumerSupplier = consumerSupplier;
-  }
-
-  @Override
-  public void accept(FluxSink<TopicMessageEventDTO> sink) {
-    log.debug("Starting backward polling for {}", consumerPosition);
-    try (EnhancedConsumer consumer = consumerSupplier.get()) {
-      sendPhase(sink, "Created consumer");
-
-      var seekOperations = SeekOperations.create(consumer, consumerPosition);
-      var readUntilOffsets = new TreeMap<TopicPartition, Long>(Comparator.comparingInt(TopicPartition::partition));
-      readUntilOffsets.putAll(seekOperations.getOffsetsForSeek());
-
-      int msgsToPollPerPartition = (int) Math.ceil((double) messagesPerPage / readUntilOffsets.size());
-      log.debug("'Until' offsets for polling: {}", readUntilOffsets);
-
-      while (!sink.isCancelled() && !readUntilOffsets.isEmpty() && !sendLimitReached()) {
-        new TreeMap<>(readUntilOffsets).forEach((tp, readToOffset) -> {
-          if (sink.isCancelled()) {
-            return; //fast return in case of sink cancellation
-          }
-          long beginOffset = seekOperations.getBeginOffsets().get(tp);
-          long readFromOffset = Math.max(beginOffset, readToOffset - msgsToPollPerPartition);
-
-          partitionPollIteration(tp, readFromOffset, readToOffset, consumer, sink)
-              .forEach(r -> sendMessage(sink, r));
-
-          if (beginOffset == readFromOffset) {
-            // we fully read this partition -> removing it from polling iterations
-            readUntilOffsets.remove(tp);
-          } else {
-            // updating 'to' offset for next polling iteration
-            readUntilOffsets.put(tp, readFromOffset);
-          }
-        });
-        if (readUntilOffsets.isEmpty()) {
-          log.debug("begin reached after partitions poll iteration");
-        } else if (sink.isCancelled()) {
-          log.debug("sink is cancelled after partitions poll iteration");
-        }
-      }
-      sendFinishStatsAndCompleteSink(sink);
-      log.debug("Polling finished");
-    } catch (InterruptException kafkaInterruptException) {
-      log.debug("Polling finished due to thread interruption");
-      sink.complete();
-    } catch (Exception e) {
-      log.error("Error occurred while consuming records", e);
-      sink.error(e);
-    }
-  }
-
-  private List<ConsumerRecord<Bytes, Bytes>> partitionPollIteration(
-      TopicPartition tp,
-      long fromOffset,
-      long toOffset,
-      EnhancedConsumer consumer,
-      FluxSink<TopicMessageEventDTO> sink
-  ) {
-    consumer.assign(Collections.singleton(tp));
-    consumer.seek(tp, fromOffset);
-    sendPhase(sink, String.format("Polling partition: %s from offset %s", tp, fromOffset));
-    int desiredMsgsToPoll = (int) (toOffset - fromOffset);
-
-    var recordsToSend = new ArrayList<ConsumerRecord<Bytes, Bytes>>();
-
-    EmptyPollsCounter emptyPolls = pollingSettings.createEmptyPollsCounter();
-    while (!sink.isCancelled()
-        && !sendLimitReached()
-        && recordsToSend.size() < desiredMsgsToPoll
-        && !emptyPolls.noDataEmptyPollsReached()) {
-      var polledRecords = poll(sink, consumer, pollingSettings.getPartitionPollTimeout());
-      emptyPolls.count(polledRecords.count());
-
-      log.debug("{} records polled from {}", polledRecords.count(), tp);
-
-      var filteredRecords = polledRecords.records(tp).stream()
-          .filter(r -> r.offset() < toOffset)
-          .toList();
-
-      if (polledRecords.count() > 0 && filteredRecords.isEmpty()) {
-        // we already read all messages in target offsets interval
-        break;
-      }
-      recordsToSend.addAll(filteredRecords);
-    }
-    log.debug("{} records to send", recordsToSend.size());
-    Collections.reverse(recordsToSend);
-    return recordsToSend;
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
index 0440f7d37fb..b0737e1cb9c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ConsumingStats.java
@@ -9,35 +9,37 @@ class ConsumingStats {
   private long bytes = 0;
   private int records = 0;
   private long elapsed = 0;
+  private int filterApplyErrors = 0;
 
-  void sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink,
-                        PolledRecords polledRecords,
-                        int filterApplyErrors) {
+  void sendConsumingEvt(FluxSink<TopicMessageEventDTO> sink, PolledRecords polledRecords) {
     bytes += polledRecords.bytes();
-    this.records += polledRecords.count();
-    this.elapsed += polledRecords.elapsed().toMillis();
+    records += polledRecords.count();
+    elapsed += polledRecords.elapsed().toMillis();
     sink.next(
         new TopicMessageEventDTO()
             .type(TopicMessageEventDTO.TypeEnum.CONSUMING)
-            .consuming(createConsumingStats(sink, filterApplyErrors))
+            .consuming(createConsumingStats())
     );
   }
 
-  void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink, int filterApplyErrors) {
+  void incFilterApplyError() {
+    filterApplyErrors++;
+  }
+
+  void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink) {
     sink.next(
         new TopicMessageEventDTO()
             .type(TopicMessageEventDTO.TypeEnum.DONE)
-            .consuming(createConsumingStats(sink, filterApplyErrors))
+            .consuming(createConsumingStats())
     );
   }
 
-  private TopicMessageConsumingDTO createConsumingStats(FluxSink<TopicMessageEventDTO> sink,
-                                                        int filterApplyErrors) {
+  private TopicMessageConsumingDTO createConsumingStats() {
     return new TopicMessageConsumingDTO()
-        .bytesConsumed(this.bytes)
-        .elapsedMs(this.elapsed)
-        .isCancelled(sink.isCancelled())
+        .bytesConsumed(bytes)
+        .elapsedMs(elapsed)
+        .isCancelled(false)
         .filterApplyErrors(filterApplyErrors)
-        .messagesConsumed(this.records);
+        .messagesConsumed(records);
   }
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java
deleted file mode 100644
index cd035f9c658..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/EmptyPollsCounter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.provectus.kafka.ui.emitter;
-
-import org.apache.kafka.clients.consumer.ConsumerRecords;
-
-// In some situations it is hard to say whether records range (between two offsets) was fully polled.
-// This happens when we have holes in records sequences that is usual case for compact topics or
-// topics with transactional writes. In such cases if you want to poll all records between offsets X and Y
-// there is no guarantee that you will ever see record with offset Y.
-// To workaround this we can assume that after N consecutive empty polls all target messages were read.
-public class EmptyPollsCounter {
-
-  private final int maxEmptyPolls;
-
-  private int emptyPolls = 0;
-
-  EmptyPollsCounter(int maxEmptyPolls) {
-    this.maxEmptyPolls = maxEmptyPolls;
-  }
-
-  public void count(int polledCount) {
-    emptyPolls = polledCount == 0 ? emptyPolls + 1 : 0;
-  }
-
-  public boolean noDataEmptyPollsReached() {
-    return emptyPolls >= maxEmptyPolls;
-  }
-
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardEmitter.java
new file mode 100644
index 00000000000..5c915fb2e8c
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardEmitter.java
@@ -0,0 +1,61 @@
+package com.provectus.kafka.ui.emitter;
+
+import com.provectus.kafka.ui.model.ConsumerPosition;
+import com.provectus.kafka.ui.model.TopicMessageDTO;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import org.apache.kafka.common.TopicPartition;
+
+public class ForwardEmitter extends RangePollingEmitter {
+
+  public ForwardEmitter(Supplier<EnhancedConsumer> consumerSupplier,
+                        ConsumerPosition consumerPosition,
+                        int messagesPerPage,
+                        ConsumerRecordDeserializer deserializer,
+                        Predicate<TopicMessageDTO> filter,
+                        PollingSettings pollingSettings) {
+    super(
+        consumerSupplier,
+        consumerPosition,
+        messagesPerPage,
+        new MessagesProcessing(
+            deserializer,
+            filter,
+            true,
+            messagesPerPage
+        ),
+        pollingSettings
+    );
+  }
+
+  @Override
+  protected TreeMap<TopicPartition, FromToOffset> nextPollingRange(TreeMap<TopicPartition, FromToOffset> prevRange,
+                                                                   SeekOperations seekOperations) {
+    TreeMap<TopicPartition, Long> readFromOffsets = new TreeMap<>(Comparator.comparingInt(TopicPartition::partition));
+    if (prevRange.isEmpty()) {
+      readFromOffsets.putAll(seekOperations.getOffsetsForSeek());
+    } else {
+      readFromOffsets.putAll(
+          prevRange.entrySet()
+              .stream()
+              .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().to()))
+      );
+    }
+
+    int msgsToPollPerPartition = (int) Math.ceil((double) messagesPerPage / readFromOffsets.size());
+    TreeMap<TopicPartition, FromToOffset> result = new TreeMap<>(Comparator.comparingInt(TopicPartition::partition));
+    readFromOffsets.forEach((tp, fromOffset) -> {
+      long tpEndOffset = seekOperations.getEndOffsets().get(tp);
+      if (fromOffset < tpEndOffset) {
+        result.put(tp, new FromToOffset(fromOffset, Math.min(tpEndOffset, fromOffset + msgsToPollPerPartition)));
+      }
+    });
+    return result;
+  }
+
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
deleted file mode 100644
index 44c6b63038a..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/ForwardRecordEmitter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.provectus.kafka.ui.emitter;
-
-import com.provectus.kafka.ui.model.ConsumerPosition;
-import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import java.util.function.Supplier;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.errors.InterruptException;
-import org.apache.kafka.common.utils.Bytes;
-import reactor.core.publisher.FluxSink;
-
-@Slf4j
-public class ForwardRecordEmitter
-    extends AbstractEmitter
-    implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
-
-  private final Supplier<EnhancedConsumer> consumerSupplier;
-  private final ConsumerPosition position;
-
-  public ForwardRecordEmitter(
-      Supplier<EnhancedConsumer> consumerSupplier,
-      ConsumerPosition position,
-      MessagesProcessing messagesProcessing,
-      PollingSettings pollingSettings) {
-    super(messagesProcessing, pollingSettings);
-    this.position = position;
-    this.consumerSupplier = consumerSupplier;
-  }
-
-  @Override
-  public void accept(FluxSink<TopicMessageEventDTO> sink) {
-    log.debug("Starting forward polling for {}", position);
-    try (EnhancedConsumer consumer = consumerSupplier.get()) {
-      sendPhase(sink, "Assigning partitions");
-      var seekOperations = SeekOperations.create(consumer, position);
-      seekOperations.assignAndSeekNonEmptyPartitions();
-
-      EmptyPollsCounter emptyPolls = pollingSettings.createEmptyPollsCounter();
-      while (!sink.isCancelled()
-          && !sendLimitReached()
-          && !seekOperations.assignedPartitionsFullyPolled()
-          && !emptyPolls.noDataEmptyPollsReached()) {
-
-        sendPhase(sink, "Polling");
-        var records = poll(sink, consumer);
-        emptyPolls.count(records.count());
-
-        log.debug("{} records polled", records.count());
-
-        for (ConsumerRecord<Bytes, Bytes> msg : records) {
-          sendMessage(sink, msg);
-        }
-      }
-      sendFinishStatsAndCompleteSink(sink);
-      log.debug("Polling finished");
-    } catch (InterruptException kafkaInterruptException) {
-      log.debug("Polling finished due to thread interruption");
-      sink.complete();
-    } catch (Exception e) {
-      log.error("Error occurred while consuming records", e);
-      sink.error(e);
-    }
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java
index d2d938cda68..df8505a2e9a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/MessagesProcessing.java
@@ -1,67 +1,75 @@
 package com.provectus.kafka.ui.emitter;
 
+import static java.util.stream.Collectors.collectingAndThen;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Streams;
 import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.model.TopicMessagePhaseDTO;
 import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.common.utils.Bytes;
 import reactor.core.publisher.FluxSink;
 
 @Slf4j
-public class MessagesProcessing {
+@RequiredArgsConstructor
+class MessagesProcessing {
 
   private final ConsumingStats consumingStats = new ConsumingStats();
   private long sentMessages = 0;
-  private int filterApplyErrors = 0;
 
   private final ConsumerRecordDeserializer deserializer;
   private final Predicate<TopicMessageDTO> filter;
+  private final boolean ascendingSortBeforeSend;
   private final @Nullable Integer limit;
 
-  public MessagesProcessing(ConsumerRecordDeserializer deserializer,
-                            Predicate<TopicMessageDTO> filter,
-                            @Nullable Integer limit) {
-    this.deserializer = deserializer;
-    this.filter = filter;
-    this.limit = limit;
-  }
-
   boolean limitReached() {
     return limit != null && sentMessages >= limit;
   }
 
-  void sendMsg(FluxSink<TopicMessageEventDTO> sink, ConsumerRecord<Bytes, Bytes> rec) {
-    if (!sink.isCancelled() && !limitReached()) {
-      TopicMessageDTO topicMessage = deserializer.deserialize(rec);
-      try {
-        if (filter.test(topicMessage)) {
-          sink.next(
-              new TopicMessageEventDTO()
-                  .type(TopicMessageEventDTO.TypeEnum.MESSAGE)
-                  .message(topicMessage)
-          );
-          sentMessages++;
-        }
-      } catch (Exception e) {
-        filterApplyErrors++;
-        log.trace("Error applying filter for message {}", topicMessage);
-      }
-    }
+  void send(FluxSink<TopicMessageEventDTO> sink, Iterable<ConsumerRecord<Bytes, Bytes>> polled) {
+    sortForSending(polled, ascendingSortBeforeSend)
+        .forEach(rec -> {
+          if (!limitReached() && !sink.isCancelled()) {
+            TopicMessageDTO topicMessage = deserializer.deserialize(rec);
+            try {
+              if (filter.test(topicMessage)) {
+                sink.next(
+                    new TopicMessageEventDTO()
+                        .type(TopicMessageEventDTO.TypeEnum.MESSAGE)
+                        .message(topicMessage)
+                );
+                sentMessages++;
+              }
+            } catch (Exception e) {
+              consumingStats.incFilterApplyError();
+              log.trace("Error applying filter for message {}", topicMessage);
+            }
+          }
+        });
   }
 
   void sentConsumingInfo(FluxSink<TopicMessageEventDTO> sink, PolledRecords polledRecords) {
     if (!sink.isCancelled()) {
-      consumingStats.sendConsumingEvt(sink, polledRecords, filterApplyErrors);
+      consumingStats.sendConsumingEvt(sink, polledRecords);
     }
   }
 
   void sendFinishEvent(FluxSink<TopicMessageEventDTO> sink) {
     if (!sink.isCancelled()) {
-      consumingStats.sendFinishEvent(sink, filterApplyErrors);
+      consumingStats.sendFinishEvent(sink);
     }
   }
 
@@ -75,4 +83,30 @@ void sendPhase(FluxSink<TopicMessageEventDTO> sink, String name) {
     }
   }
 
+  /*
+   * Sorting by timestamps, BUT requesting that records within same partitions should be ordered by offsets.
+   */
+  @VisibleForTesting
+  static Iterable<ConsumerRecord<Bytes, Bytes>> sortForSending(Iterable<ConsumerRecord<Bytes, Bytes>> records,
+                                                               boolean asc) {
+    Comparator<ConsumerRecord> offsetComparator = asc
+        ? Comparator.comparingLong(ConsumerRecord::offset)
+        : Comparator.<ConsumerRecord>comparingLong(ConsumerRecord::offset).reversed();
+
+    // partition -> sorted by offsets records
+    Map<Integer, List<ConsumerRecord<Bytes, Bytes>>> perPartition = Streams.stream(records)
+        .collect(
+            groupingBy(
+                ConsumerRecord::partition,
+                TreeMap::new,
+                collectingAndThen(toList(), lst -> lst.stream().sorted(offsetComparator).toList())));
+
+    Comparator<ConsumerRecord> tsComparator = asc
+        ? Comparator.comparing(ConsumerRecord::timestamp)
+        : Comparator.<ConsumerRecord>comparingLong(ConsumerRecord::timestamp).reversed();
+
+    // merge-sorting records from partitions one by one using timestamp comparator
+    return Iterables.mergeSorted(perPartition.values(), tsComparator);
+  }
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java
index 1b1381ea707..24e2a0aa889 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java
@@ -8,12 +8,13 @@
 import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.mutable.MutableLong;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.common.TopicPartition;
 
 @Slf4j
 @Getter
-public class OffsetsInfo {
+class OffsetsInfo {
 
   private final Consumer<?, ?> consumer;
 
@@ -23,7 +24,7 @@ public class OffsetsInfo {
   private final Set<TopicPartition> nonEmptyPartitions = new HashSet<>();
   private final Set<TopicPartition> emptyPartitions = new HashSet<>();
 
-  public OffsetsInfo(Consumer<?, ?> consumer, String topic) {
+  OffsetsInfo(Consumer<?, ?> consumer, String topic) {
     this(consumer,
         consumer.partitionsFor(topic).stream()
             .map(pi -> new TopicPartition(topic, pi.partition()))
@@ -31,8 +32,7 @@ public OffsetsInfo(Consumer<?, ?> consumer, String topic) {
     );
   }
 
-  public OffsetsInfo(Consumer<?, ?> consumer,
-                     Collection<TopicPartition> targetPartitions) {
+  OffsetsInfo(Consumer<?, ?> consumer, Collection<TopicPartition> targetPartitions) {
     this.consumer = consumer;
     this.beginOffsets = consumer.beginningOffsets(targetPartitions);
     this.endOffsets = consumer.endOffsets(targetPartitions);
@@ -46,8 +46,8 @@ public OffsetsInfo(Consumer<?, ?> consumer,
     });
   }
 
-  public boolean assignedPartitionsFullyPolled() {
-    for (var tp: consumer.assignment()) {
+  boolean assignedPartitionsFullyPolled() {
+    for (var tp : consumer.assignment()) {
       Preconditions.checkArgument(endOffsets.containsKey(tp));
       if (endOffsets.get(tp) > consumer.position(tp)) {
         return false;
@@ -56,4 +56,10 @@ public boolean assignedPartitionsFullyPolled() {
     return true;
   }
 
+  long summaryOffsetsRange() {
+    MutableLong cnt = new MutableLong();
+    nonEmptyPartitions.forEach(tp -> cnt.add(endOffsets.get(tp) - beginOffsets.get(tp)));
+    return cnt.getValue();
+  }
+
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingSettings.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingSettings.java
index 0c3dfcfbab4..eb38851d4cc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingSettings.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/PollingSettings.java
@@ -8,13 +8,8 @@
 public class PollingSettings {
 
   private static final Duration DEFAULT_POLL_TIMEOUT = Duration.ofMillis(1_000);
-  private static final Duration DEFAULT_PARTITION_POLL_TIMEOUT = Duration.ofMillis(200);
-  private static final int DEFAULT_NO_DATA_EMPTY_POLLS = 3;
 
   private final Duration pollTimeout;
-  private final Duration partitionPollTimeout;
-  private final int notDataEmptyPolls; //see EmptyPollsCounter docs
-
   private final Supplier<PollingThrottler> throttlerSupplier;
 
   public static PollingSettings create(ClustersProperties.Cluster cluster,
@@ -26,18 +21,8 @@ public static PollingSettings create(ClustersProperties.Cluster cluster,
         ? Duration.ofMillis(pollingProps.getPollTimeoutMs())
         : DEFAULT_POLL_TIMEOUT;
 
-    var partitionPollTimeout = pollingProps.getPartitionPollTimeout() != null
-        ? Duration.ofMillis(pollingProps.getPartitionPollTimeout())
-        : Duration.ofMillis(pollTimeout.toMillis() / 5);
-
-    int noDataEmptyPolls = pollingProps.getNoDataEmptyPolls() != null
-        ? pollingProps.getNoDataEmptyPolls()
-        : DEFAULT_NO_DATA_EMPTY_POLLS;
-
     return new PollingSettings(
         pollTimeout,
-        partitionPollTimeout,
-        noDataEmptyPolls,
         PollingThrottler.throttlerSupplier(cluster)
     );
   }
@@ -45,34 +30,20 @@ public static PollingSettings create(ClustersProperties.Cluster cluster,
   public static PollingSettings createDefault() {
     return new PollingSettings(
         DEFAULT_POLL_TIMEOUT,
-        DEFAULT_PARTITION_POLL_TIMEOUT,
-        DEFAULT_NO_DATA_EMPTY_POLLS,
         PollingThrottler::noop
     );
   }
 
   private PollingSettings(Duration pollTimeout,
-                          Duration partitionPollTimeout,
-                          int notDataEmptyPolls,
                           Supplier<PollingThrottler> throttlerSupplier) {
     this.pollTimeout = pollTimeout;
-    this.partitionPollTimeout = partitionPollTimeout;
-    this.notDataEmptyPolls = notDataEmptyPolls;
     this.throttlerSupplier = throttlerSupplier;
   }
 
-  public EmptyPollsCounter createEmptyPollsCounter() {
-    return new EmptyPollsCounter(notDataEmptyPolls);
-  }
-
   public Duration getPollTimeout() {
     return pollTimeout;
   }
 
-  public Duration getPartitionPollTimeout() {
-    return partitionPollTimeout;
-  }
-
   public PollingThrottler getPollingThrottler() {
     return throttlerSupplier.get();
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/RangePollingEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/RangePollingEmitter.java
new file mode 100644
index 00000000000..af6dc7d0693
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/RangePollingEmitter.java
@@ -0,0 +1,98 @@
+package com.provectus.kafka.ui.emitter;
+
+import com.provectus.kafka.ui.model.ConsumerPosition;
+import com.provectus.kafka.ui.model.TopicMessageEventDTO;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
+import java.util.function.Supplier;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.kafka.common.errors.InterruptException;
+import org.apache.kafka.common.utils.Bytes;
+import reactor.core.publisher.FluxSink;
+
+@Slf4j
+abstract class RangePollingEmitter extends AbstractEmitter {
+
+  private final Supplier<EnhancedConsumer> consumerSupplier;
+  protected final ConsumerPosition consumerPosition;
+  protected final int messagesPerPage;
+
+  protected RangePollingEmitter(Supplier<EnhancedConsumer> consumerSupplier,
+                                ConsumerPosition consumerPosition,
+                                int messagesPerPage,
+                                MessagesProcessing messagesProcessing,
+                                PollingSettings pollingSettings) {
+    super(messagesProcessing, pollingSettings);
+    this.consumerPosition = consumerPosition;
+    this.messagesPerPage = messagesPerPage;
+    this.consumerSupplier = consumerSupplier;
+  }
+
+  protected record FromToOffset(/*inclusive*/ long from, /*exclusive*/ long to) {
+  }
+
+  //should return empty map if polling should be stopped
+  protected abstract TreeMap<TopicPartition, FromToOffset> nextPollingRange(
+      TreeMap<TopicPartition, FromToOffset> prevRange, //empty on start
+      SeekOperations seekOperations
+  );
+
+  @Override
+  public void accept(FluxSink<TopicMessageEventDTO> sink) {
+    log.debug("Starting polling for {}", consumerPosition);
+    try (EnhancedConsumer consumer = consumerSupplier.get()) {
+      sendPhase(sink, "Consumer created");
+      var seekOperations = SeekOperations.create(consumer, consumerPosition);
+      TreeMap<TopicPartition, FromToOffset> pollRange = nextPollingRange(new TreeMap<>(), seekOperations);
+      log.debug("Starting from offsets {}", pollRange);
+
+      while (!sink.isCancelled() && !pollRange.isEmpty() && !sendLimitReached()) {
+        var polled = poll(consumer, sink, pollRange);
+        send(sink, polled);
+        pollRange = nextPollingRange(pollRange, seekOperations);
+      }
+      if (sink.isCancelled()) {
+        log.debug("Polling finished due to sink cancellation");
+      }
+      sendFinishStatsAndCompleteSink(sink);
+      log.debug("Polling finished");
+    } catch (InterruptException kafkaInterruptException) {
+      log.debug("Polling finished due to thread interruption");
+      sink.complete();
+    } catch (Exception e) {
+      log.error("Error occurred while consuming records", e);
+      sink.error(e);
+    }
+  }
+
+  private List<ConsumerRecord<Bytes, Bytes>> poll(EnhancedConsumer consumer,
+                                                  FluxSink<TopicMessageEventDTO> sink,
+                                                  TreeMap<TopicPartition, FromToOffset> range) {
+    log.trace("Polling range {}", range);
+    sendPhase(sink,
+        "Polling partitions: %s".formatted(range.keySet().stream().map(TopicPartition::partition).sorted().toList()));
+
+    consumer.assign(range.keySet());
+    range.forEach((tp, fromTo) -> consumer.seek(tp, fromTo.from));
+
+    List<ConsumerRecord<Bytes, Bytes>> result = new ArrayList<>();
+    while (!sink.isCancelled() && consumer.paused().size() < range.size()) {
+      var polledRecords = poll(sink, consumer);
+      range.forEach((tp, fromTo) -> {
+        polledRecords.records(tp).stream()
+            .filter(r -> r.offset() < fromTo.to)
+            .forEach(result::add);
+
+        //next position is out of target range -> pausing partition
+        if (consumer.position(tp) >= fromTo.to) {
+          consumer.pause(List.of(tp));
+        }
+      });
+    }
+    consumer.resume(consumer.paused());
+    return result;
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/SeekOperations.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/SeekOperations.java
index 014b1207572..4de027bdb23 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/SeekOperations.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/SeekOperations.java
@@ -10,17 +10,18 @@
 import javax.annotation.Nullable;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.mutable.MutableLong;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.common.TopicPartition;
 
 @RequiredArgsConstructor(access = AccessLevel.PACKAGE)
-class SeekOperations {
+public class SeekOperations {
 
   private final Consumer<?, ?> consumer;
   private final OffsetsInfo offsetsInfo;
   private final Map<TopicPartition, Long> offsetsForSeek; //only contains non-empty partitions!
 
-  static SeekOperations create(Consumer<?, ?> consumer, ConsumerPosition consumerPosition) {
+  public static SeekOperations create(Consumer<?, ?> consumer, ConsumerPosition consumerPosition) {
     OffsetsInfo offsetsInfo;
     if (consumerPosition.getSeekTo() == null) {
       offsetsInfo = new OffsetsInfo(consumer, consumerPosition.getTopic());
@@ -34,25 +35,37 @@ static SeekOperations create(Consumer<?, ?> consumer, ConsumerPosition consumerP
     );
   }
 
-  void assignAndSeekNonEmptyPartitions() {
+  public void assignAndSeekNonEmptyPartitions() {
     consumer.assign(offsetsForSeek.keySet());
     offsetsForSeek.forEach(consumer::seek);
   }
 
-  Map<TopicPartition, Long> getBeginOffsets() {
+  public Map<TopicPartition, Long> getBeginOffsets() {
     return offsetsInfo.getBeginOffsets();
   }
 
-  Map<TopicPartition, Long> getEndOffsets() {
+  public Map<TopicPartition, Long> getEndOffsets() {
     return offsetsInfo.getEndOffsets();
   }
 
-  boolean assignedPartitionsFullyPolled() {
+  public boolean assignedPartitionsFullyPolled() {
     return offsetsInfo.assignedPartitionsFullyPolled();
   }
 
+  // sum of (end - start) offsets for all partitions
+  public long summaryOffsetsRange() {
+    return offsetsInfo.summaryOffsetsRange();
+  }
+
+  // sum of differences between initial consumer seek and current consumer position (across all partitions)
+  public long offsetsProcessedFromSeek() {
+    MutableLong count = new MutableLong();
+    offsetsForSeek.forEach((tp, initialOffset) -> count.add(consumer.position(tp) - initialOffset));
+    return count.getValue();
+  }
+
   // Get offsets to seek to. NOTE: offsets do not contain empty partitions offsets
-  Map<TopicPartition, Long> getOffsetsForSeek() {
+  public Map<TopicPartition, Long> getOffsetsForSeek() {
     return offsetsForSeek;
   }
 
@@ -61,19 +74,19 @@ Map<TopicPartition, Long> getOffsetsForSeek() {
    */
   @VisibleForTesting
   static Map<TopicPartition, Long> getOffsetsForSeek(Consumer<?, ?> consumer,
-                                                             OffsetsInfo offsetsInfo,
-                                                             SeekTypeDTO seekType,
-                                                             @Nullable Map<TopicPartition, Long> seekTo) {
+                                                     OffsetsInfo offsetsInfo,
+                                                     SeekTypeDTO seekType,
+                                                     @Nullable Map<TopicPartition, Long> seekTo) {
     switch (seekType) {
       case LATEST:
         return consumer.endOffsets(offsetsInfo.getNonEmptyPartitions());
       case BEGINNING:
         return consumer.beginningOffsets(offsetsInfo.getNonEmptyPartitions());
       case OFFSET:
-        Preconditions.checkNotNull(offsetsInfo);
+        Preconditions.checkNotNull(seekTo);
         return fixOffsets(offsetsInfo, seekTo);
       case TIMESTAMP:
-        Preconditions.checkNotNull(offsetsInfo);
+        Preconditions.checkNotNull(seekTo);
         return offsetsForTimestamp(consumer, offsetsInfo, seekTo);
       default:
         throw new IllegalStateException();
@@ -100,7 +113,7 @@ private static Map<TopicPartition, Long> fixOffsets(OffsetsInfo offsetsInfo, Map
   }
 
   private static Map<TopicPartition, Long> offsetsForTimestamp(Consumer<?, ?> consumer, OffsetsInfo offsetsInfo,
-                                                        Map<TopicPartition, Long> timestamps) {
+                                                               Map<TopicPartition, Long> timestamps) {
     timestamps = new HashMap<>(timestamps);
     timestamps.keySet().retainAll(offsetsInfo.getNonEmptyPartitions());
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
index c3e6dcc8ff1..c3f04fe8cc2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/TailingEmitter.java
@@ -1,25 +1,28 @@
 package com.provectus.kafka.ui.emitter;
 
 import com.provectus.kafka.ui.model.ConsumerPosition;
+import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
+import com.provectus.kafka.ui.serdes.ConsumerRecordDeserializer;
 import java.util.HashMap;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.errors.InterruptException;
 import reactor.core.publisher.FluxSink;
 
 @Slf4j
-public class TailingEmitter extends AbstractEmitter
-    implements java.util.function.Consumer<FluxSink<TopicMessageEventDTO>> {
+public class TailingEmitter extends AbstractEmitter {
 
   private final Supplier<EnhancedConsumer> consumerSupplier;
   private final ConsumerPosition consumerPosition;
 
   public TailingEmitter(Supplier<EnhancedConsumer> consumerSupplier,
                         ConsumerPosition consumerPosition,
-                        MessagesProcessing messagesProcessing,
+                        ConsumerRecordDeserializer deserializer,
+                        Predicate<TopicMessageDTO> filter,
                         PollingSettings pollingSettings) {
-    super(messagesProcessing, pollingSettings);
+    super(new MessagesProcessing(deserializer, filter, false, null), pollingSettings);
     this.consumerSupplier = consumerSupplier;
     this.consumerPosition = consumerPosition;
   }
@@ -32,7 +35,7 @@ public void accept(FluxSink<TopicMessageEventDTO> sink) {
       while (!sink.isCancelled()) {
         sendPhase(sink, "Polling");
         var polled = poll(sink, consumer);
-        polled.forEach(r -> sendMessage(sink, r));
+        send(sink, polled);
       }
       sink.complete();
       log.debug("Tailing finished");
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java
index f5b70180349..4b507b86fcd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializer.java
@@ -1,6 +1,7 @@
 package com.provectus.kafka.ui.serdes;
 
 import com.provectus.kafka.ui.model.TopicMessageDTO;
+import com.provectus.kafka.ui.model.TopicMessageDTO.TimestampTypeEnum;
 import com.provectus.kafka.ui.serde.api.Serde;
 import java.time.Instant;
 import java.time.OffsetDateTime;
@@ -8,6 +9,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.UnaryOperator;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -32,6 +34,8 @@ public class ConsumerRecordDeserializer {
   private final Serde.Deserializer fallbackKeyDeserializer;
   private final Serde.Deserializer fallbackValueDeserializer;
 
+  private final UnaryOperator<TopicMessageDTO> masker;
+
   public TopicMessageDTO deserialize(ConsumerRecord<Bytes, Bytes> rec) {
     var message = new TopicMessageDTO();
     fillKey(message, rec);
@@ -47,20 +51,15 @@ public TopicMessageDTO deserialize(ConsumerRecord<Bytes, Bytes> rec) {
     message.setValueSize(getValueSize(rec));
     message.setHeadersSize(getHeadersSize(rec));
 
-    return message;
+    return masker.apply(message);
   }
 
-  private static TopicMessageDTO.TimestampTypeEnum mapToTimestampType(TimestampType timestampType) {
-    switch (timestampType) {
-      case CREATE_TIME:
-        return TopicMessageDTO.TimestampTypeEnum.CREATE_TIME;
-      case LOG_APPEND_TIME:
-        return TopicMessageDTO.TimestampTypeEnum.LOG_APPEND_TIME;
-      case NO_TIMESTAMP_TYPE:
-        return TopicMessageDTO.TimestampTypeEnum.NO_TIMESTAMP_TYPE;
-      default:
-        throw new IllegalArgumentException("Unknown timestampType: " + timestampType);
-    }
+  private static TimestampTypeEnum mapToTimestampType(TimestampType timestampType) {
+    return switch (timestampType) {
+      case CREATE_TIME -> TimestampTypeEnum.CREATE_TIME;
+      case LOG_APPEND_TIME -> TimestampTypeEnum.LOG_APPEND_TIME;
+      case NO_TIMESTAMP_TYPE -> TimestampTypeEnum.NO_TIMESTAMP_TYPE;
+    };
   }
 
   private void fillHeaders(TopicMessageDTO message, ConsumerRecord<Bytes, Bytes> rec) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java
index 240f0b68f2b..5ce48e79e2e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
index cd868559709..8807c950597 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/DeserializationService.java
@@ -102,7 +102,8 @@ public ConsumerRecordDeserializer deserializerFor(KafkaCluster cluster,
         valueSerde.deserializer(topic, Serde.Target.VALUE),
         fallbackSerde.getName(),
         fallbackSerde.deserializer(topic, Serde.Target.KEY),
-        fallbackSerde.deserializer(topic, Serde.Target.VALUE)
+        fallbackSerde.deserializer(topic, Serde.Target.VALUE),
+        cluster.getMasking().getMaskerForTopic(topic)
     );
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
index dcc122ba282..620bd840861 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/MessagesService.java
@@ -2,10 +2,9 @@
 
 import com.google.common.util.concurrent.RateLimiter;
 import com.provectus.kafka.ui.config.ClustersProperties;
-import com.provectus.kafka.ui.emitter.BackwardRecordEmitter;
-import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
+import com.provectus.kafka.ui.emitter.BackwardEmitter;
+import com.provectus.kafka.ui.emitter.ForwardEmitter;
 import com.provectus.kafka.ui.emitter.MessageFilters;
-import com.provectus.kafka.ui.emitter.MessagesProcessing;
 import com.provectus.kafka.ui.emitter.TailingEmitter;
 import com.provectus.kafka.ui.exception.TopicNotFoundException;
 import com.provectus.kafka.ui.exception.ValidationException;
@@ -18,7 +17,6 @@
 import com.provectus.kafka.ui.model.SmartFilterTestExecutionResultDTO;
 import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
-import com.provectus.kafka.ui.serde.api.Serde;
 import com.provectus.kafka.ui.serdes.ProducerRecordCreator;
 import com.provectus.kafka.ui.util.SslPropertiesUtil;
 import java.time.Instant;
@@ -45,7 +43,6 @@
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.FluxSink;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
@@ -231,56 +228,26 @@ private Flux<TopicMessageEventDTO> loadMessagesImpl(KafkaCluster cluster,
                                                       @Nullable String keySerde,
                                                       @Nullable String valueSerde) {
 
-    java.util.function.Consumer<? super FluxSink<TopicMessageEventDTO>> emitter;
-
-    var processing = new MessagesProcessing(
-        deserializationService.deserializerFor(cluster, topic, keySerde, valueSerde),
-        getMsgFilter(query, filterQueryType),
-        seekDirection == SeekDirectionDTO.TAILING ? null : limit
-    );
-
-    if (seekDirection.equals(SeekDirectionDTO.FORWARD)) {
-      emitter = new ForwardRecordEmitter(
+    var deserializer = deserializationService.deserializerFor(cluster, topic, keySerde, valueSerde);
+    var filter = getMsgFilter(query, filterQueryType);
+    var emitter = switch (seekDirection) {
+      case FORWARD -> new ForwardEmitter(
           () -> consumerGroupService.createConsumer(cluster),
-          consumerPosition,
-          processing,
-          cluster.getPollingSettings()
+          consumerPosition, limit, deserializer, filter, cluster.getPollingSettings()
       );
-    } else if (seekDirection.equals(SeekDirectionDTO.BACKWARD)) {
-      emitter = new BackwardRecordEmitter(
+      case BACKWARD -> new BackwardEmitter(
           () -> consumerGroupService.createConsumer(cluster),
-          consumerPosition,
-          limit,
-          processing,
-          cluster.getPollingSettings()
+          consumerPosition, limit, deserializer, filter, cluster.getPollingSettings()
       );
-    } else {
-      emitter = new TailingEmitter(
+      case TAILING -> new TailingEmitter(
           () -> consumerGroupService.createConsumer(cluster),
-          consumerPosition,
-          processing,
-          cluster.getPollingSettings()
+          consumerPosition, deserializer, filter, cluster.getPollingSettings()
       );
-    }
+    };
     return Flux.create(emitter)
-        .map(getDataMasker(cluster, topic))
         .map(throttleUiPublish(seekDirection));
   }
 
-  private UnaryOperator<TopicMessageEventDTO> getDataMasker(KafkaCluster cluster, String topicName) {
-    var keyMasker = cluster.getMasking().getMaskingFunction(topicName, Serde.Target.KEY);
-    var valMasker = cluster.getMasking().getMaskingFunction(topicName, Serde.Target.VALUE);
-    return evt -> {
-      if (evt.getType() != TopicMessageEventDTO.TypeEnum.MESSAGE) {
-        return evt;
-      }
-      return evt.message(
-          evt.getMessage()
-              .key(keyMasker.apply(evt.getMessage().getKey()))
-              .content(valMasker.apply(evt.getMessage().getContent())));
-    };
-  }
-
   private Predicate<TopicMessageDTO> getMsgFilter(String query,
                                                   MessageFilterTypeDTO filterQueryType) {
     if (StringUtils.isEmpty(query)) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/AnalysisTasksStore.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/AnalysisTasksStore.java
index d5ed1a36d6b..f7bf4a8f2be 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/AnalysisTasksStore.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/AnalysisTasksStore.java
@@ -92,14 +92,12 @@ private TopicAnalysisDTO createAnalysisDto(@Nullable RunningAnalysis runningStat
         .result(completedState);
   }
 
-  @Value
   @Builder(toBuilder = true)
-  private static class RunningAnalysis {
-    Instant startedAt;
-    double completenessPercent;
-    long msgsScanned;
-    long bytesScanned;
-    Closeable task;
+  private record RunningAnalysis(Instant startedAt,
+                                 double completenessPercent,
+                                 long msgsScanned,
+                                 long bytesScanned,
+                                 Closeable task) {
 
     TopicAnalysisProgressDTO toDto() {
       return new TopicAnalysisProgressDTO()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
index e17d2cf84ac..2523aae89ec 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/analyze/TopicAnalysisService.java
@@ -1,10 +1,11 @@
 package com.provectus.kafka.ui.service.analyze;
 
-import com.provectus.kafka.ui.emitter.EmptyPollsCounter;
+import static com.provectus.kafka.ui.model.SeekTypeDTO.BEGINNING;
+
 import com.provectus.kafka.ui.emitter.EnhancedConsumer;
-import com.provectus.kafka.ui.emitter.OffsetsInfo;
-import com.provectus.kafka.ui.emitter.PollingSettings;
+import com.provectus.kafka.ui.emitter.SeekOperations;
 import com.provectus.kafka.ui.exception.TopicAnalysisException;
+import com.provectus.kafka.ui.model.ConsumerPosition;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.TopicAnalysisDTO;
 import com.provectus.kafka.ui.service.ConsumerGroupService;
@@ -15,16 +16,14 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.errors.InterruptException;
 import org.apache.kafka.common.errors.WakeupException;
 import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Scheduler;
 import reactor.core.scheduler.Schedulers;
 
 
@@ -33,6 +32,14 @@
 @RequiredArgsConstructor
 public class TopicAnalysisService {
 
+  private static final Scheduler SCHEDULER = Schedulers.newBoundedElastic(
+      Schedulers.DEFAULT_BOUNDED_ELASTIC_SIZE,
+      Schedulers.DEFAULT_BOUNDED_ELASTIC_QUEUESIZE,
+      "topic-analysis-tasks",
+      10, //ttl for idle threads (in sec)
+      true //daemon
+  );
+
   private final AnalysisTasksStore analysisTasksStore = new AnalysisTasksStore();
 
   private final TopicsService topicsService;
@@ -40,30 +47,18 @@ public class TopicAnalysisService {
 
   public Mono<Void> analyze(KafkaCluster cluster, String topicName) {
     return topicsService.getTopicDetails(cluster, topicName)
-        .doOnNext(topic ->
-            startAnalysis(
-                cluster,
-                topicName,
-                topic.getPartitionCount(),
-                topic.getPartitions().values()
-                    .stream()
-                    .mapToLong(p -> p.getOffsetMax() - p.getOffsetMin())
-                    .sum()
-            )
-        ).then();
+        .doOnNext(topic -> startAnalysis(cluster, topicName))
+        .then();
   }
 
-  private synchronized void startAnalysis(KafkaCluster cluster,
-                                          String topic,
-                                          int partitionsCnt,
-                                          long approxNumberOfMsgs) {
+  private synchronized void startAnalysis(KafkaCluster cluster, String topic) {
     var topicId = new TopicIdentity(cluster, topic);
     if (analysisTasksStore.isAnalysisInProgress(topicId)) {
       throw new TopicAnalysisException("Topic is already analyzing");
     }
-    var task = new AnalysisTask(cluster, topicId, partitionsCnt, approxNumberOfMsgs, cluster.getPollingSettings());
+    var task = new AnalysisTask(cluster, topicId);
     analysisTasksStore.registerNewTask(topicId, task);
-    Schedulers.boundedElastic().schedule(task);
+    SCHEDULER.schedule(task);
   }
 
   public void cancelAnalysis(KafkaCluster cluster, String topicName) {
@@ -79,20 +74,14 @@ class AnalysisTask implements Runnable, Closeable {
     private final Instant startedAt = Instant.now();
 
     private final TopicIdentity topicId;
-    private final int partitionsCnt;
-    private final long approxNumberOfMsgs;
-    private final EmptyPollsCounter emptyPollsCounter;
 
     private final TopicAnalysisStats totalStats = new TopicAnalysisStats();
     private final Map<Integer, TopicAnalysisStats> partitionStats = new HashMap<>();
 
     private final EnhancedConsumer consumer;
 
-    AnalysisTask(KafkaCluster cluster, TopicIdentity topicId, int partitionsCnt,
-                 long approxNumberOfMsgs, PollingSettings pollingSettings) {
+    AnalysisTask(KafkaCluster cluster, TopicIdentity topicId) {
       this.topicId = topicId;
-      this.approxNumberOfMsgs = approxNumberOfMsgs;
-      this.partitionsCnt = partitionsCnt;
       this.consumer = consumerGroupService.createConsumer(
           cluster,
           // to improve polling throughput
@@ -101,7 +90,6 @@ class AnalysisTask implements Runnable, Closeable {
               ConsumerConfig.MAX_POLL_RECORDS_CONFIG, "100000"
           )
       );
-      this.emptyPollsCounter = pollingSettings.createEmptyPollsCounter();
     }
 
     @Override
@@ -113,23 +101,20 @@ public void close() {
     public void run() {
       try {
         log.info("Starting {} topic analysis", topicId);
-        var topicPartitions = IntStream.range(0, partitionsCnt)
-            .peek(i -> partitionStats.put(i, new TopicAnalysisStats()))
-            .mapToObj(i -> new TopicPartition(topicId.topicName, i))
-            .collect(Collectors.toList());
+        consumer.partitionsFor(topicId.topicName)
+            .forEach(tp -> partitionStats.put(tp.partition(), new TopicAnalysisStats()));
 
-        consumer.assign(topicPartitions);
-        consumer.seekToBeginning(topicPartitions);
+        var seekOperations = SeekOperations.create(consumer, new ConsumerPosition(BEGINNING, topicId.topicName, null));
+        long summaryOffsetsRange = seekOperations.summaryOffsetsRange();
+        seekOperations.assignAndSeekNonEmptyPartitions();
 
-        var offsetsInfo = new OffsetsInfo(consumer, topicId.topicName);
-        while (!offsetsInfo.assignedPartitionsFullyPolled() && !emptyPollsCounter.noDataEmptyPollsReached()) {
+        while (!seekOperations.assignedPartitionsFullyPolled()) {
           var polled = consumer.pollEnhanced(Duration.ofSeconds(3));
-          emptyPollsCounter.count(polled.count());
           polled.forEach(r -> {
             totalStats.apply(r);
             partitionStats.get(r.partition()).apply(r);
           });
-          updateProgress();
+          updateProgress(seekOperations.offsetsProcessedFromSeek(), summaryOffsetsRange);
         }
         analysisTasksStore.setAnalysisResult(topicId, startedAt, totalStats, partitionStats);
         log.info("{} topic analysis finished", topicId);
@@ -145,13 +130,13 @@ public void run() {
       }
     }
 
-    private void updateProgress() {
-      if (totalStats.totalMsgs > 0 && approxNumberOfMsgs != 0) {
+    private void updateProgress(long processedOffsets, long summaryOffsetsRange) {
+      if (processedOffsets > 0 && summaryOffsetsRange != 0) {
         analysisTasksStore.updateProgress(
             topicId,
             totalStats.totalMsgs,
             totalStats.keysSize.sum + totalStats.valuesSize.sum,
-            Math.min(100.0, (((double) totalStats.totalMsgs) / approxNumberOfMsgs) * 100)
+            Math.min(100.0, (((double) processedOffsets) / summaryOffsetsRange) * 100)
         );
       }
     }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
index ad1c2da31e5..a2e9c88f86b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/masking/DataMasking.java
@@ -1,7 +1,5 @@
 package com.provectus.kafka.ui.service.masking;
 
-import static java.util.stream.Collectors.toList;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -9,6 +7,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.provectus.kafka.ui.config.ClustersProperties;
+import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.serde.api.Serde;
 import com.provectus.kafka.ui.service.masking.policies.MaskingPolicy;
 import java.util.List;
@@ -54,7 +53,8 @@ public static DataMasking create(@Nullable List<ClustersProperties.Masking> conf
               Optional.ofNullable(property.getTopicValuesPattern()).map(Pattern::compile).orElse(null),
               MaskingPolicy.create(property)
           );
-        }).collect(toList()));
+        }).toList()
+    );
   }
 
   @VisibleForTesting
@@ -62,8 +62,17 @@ public static DataMasking create(@Nullable List<ClustersProperties.Masking> conf
     this.masks = masks;
   }
 
-  public UnaryOperator<String> getMaskingFunction(String topic, Serde.Target target) {
-    var targetMasks = masks.stream().filter(m -> m.shouldBeApplied(topic, target)).collect(toList());
+  public UnaryOperator<TopicMessageDTO> getMaskerForTopic(String topic) {
+    var keyMasker = getMaskingFunction(topic, Serde.Target.KEY);
+    var valMasker = getMaskingFunction(topic, Serde.Target.VALUE);
+    return msg -> msg
+        .key(keyMasker.apply(msg.getKey()))
+        .content(valMasker.apply(msg.getContent()));
+  }
+
+  @VisibleForTesting
+  UnaryOperator<String> getMaskingFunction(String topic, Serde.Target target) {
+    var targetMasks = masks.stream().filter(m -> m.shouldBeApplied(topic, target)).toList();
     if (targetMasks.isEmpty()) {
       return UnaryOperator.identity();
     }
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessagesProcessingTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessagesProcessingTest.java
new file mode 100644
index 00000000000..245dd095f68
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/emitter/MessagesProcessingTest.java
@@ -0,0 +1,69 @@
+package com.provectus.kafka.ui.emitter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.common.header.internals.RecordHeaders;
+import org.apache.kafka.common.record.TimestampType;
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.jupiter.api.RepeatedTest;
+
+class MessagesProcessingTest {
+
+
+  @RepeatedTest(5)
+  void testSortingAsc() {
+    var messagesInOrder = List.of(
+        consumerRecord(1, 100L, "1999-01-01T00:00:00+00:00"),
+        consumerRecord(0, 0L, "2000-01-01T00:00:00+00:00"),
+        consumerRecord(1, 200L, "2000-01-05T00:00:00+00:00"),
+        consumerRecord(0, 10L, "2000-01-10T00:00:00+00:00"),
+        consumerRecord(0, 20L, "2000-01-20T00:00:00+00:00"),
+        consumerRecord(1, 300L, "3000-01-01T00:00:00+00:00"),
+        consumerRecord(2, 1000L, "4000-01-01T00:00:00+00:00"),
+        consumerRecord(2, 1001L, "2000-01-01T00:00:00+00:00"),
+        consumerRecord(2, 1003L, "3000-01-01T00:00:00+00:00")
+    );
+
+    var shuffled = new ArrayList<>(messagesInOrder);
+    Collections.shuffle(shuffled);
+
+    var sortedList = MessagesProcessing.sortForSending(shuffled, true);
+    assertThat(sortedList).containsExactlyElementsOf(messagesInOrder);
+  }
+
+  @RepeatedTest(5)
+  void testSortingDesc() {
+    var messagesInOrder = List.of(
+        consumerRecord(1, 300L, "3000-01-01T00:00:00+00:00"),
+        consumerRecord(2, 1003L, "3000-01-01T00:00:00+00:00"),
+        consumerRecord(0, 20L, "2000-01-20T00:00:00+00:00"),
+        consumerRecord(0, 10L, "2000-01-10T00:00:00+00:00"),
+        consumerRecord(1, 200L, "2000-01-05T00:00:00+00:00"),
+        consumerRecord(0, 0L, "2000-01-01T00:00:00+00:00"),
+        consumerRecord(2, 1001L, "2000-01-01T00:00:00+00:00"),
+        consumerRecord(2, 1000L, "4000-01-01T00:00:00+00:00"),
+        consumerRecord(1, 100L, "1999-01-01T00:00:00+00:00")
+    );
+
+    var shuffled = new ArrayList<>(messagesInOrder);
+    Collections.shuffle(shuffled);
+
+    var sortedList = MessagesProcessing.sortForSending(shuffled, false);
+    assertThat(sortedList).containsExactlyElementsOf(messagesInOrder);
+  }
+
+  private ConsumerRecord<Bytes, Bytes> consumerRecord(int partition, long offset, String ts) {
+    return new ConsumerRecord<>(
+        "topic", partition, offset, OffsetDateTime.parse(ts).toInstant().toEpochMilli(),
+        TimestampType.CREATE_TIME,
+        0, 0, null, null, new RecordHeaders(), Optional.empty()
+    );
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializerTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializerTest.java
new file mode 100644
index 00000000000..87e13da3d25
--- /dev/null
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/serdes/ConsumerRecordDeserializerTest.java
@@ -0,0 +1,30 @@
+package com.provectus.kafka.ui.serdes;
+
+import static com.provectus.kafka.ui.serde.api.DeserializeResult.Type.STRING;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import com.provectus.kafka.ui.model.TopicMessageDTO;
+import com.provectus.kafka.ui.serde.api.DeserializeResult;
+import com.provectus.kafka.ui.serde.api.Serde;
+import java.util.Map;
+import java.util.function.UnaryOperator;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.common.utils.Bytes;
+import org.junit.jupiter.api.Test;
+
+class ConsumerRecordDeserializerTest {
+
+  @Test
+  void dataMaskingAppliedOnDeserializedMessage() {
+    UnaryOperator<TopicMessageDTO> maskerMock = mock();
+    Serde.Deserializer deser = (headers, data) -> new DeserializeResult("test", STRING, Map.of());
+
+    var recordDeser = new ConsumerRecordDeserializer("test", deser, "test", deser, "test", deser, deser, maskerMock);
+    recordDeser.deserialize(new ConsumerRecord<>("t", 1, 1L, Bytes.wrap("t".getBytes()), Bytes.wrap("t".getBytes())));
+
+    verify(maskerMock).apply(any(TopicMessageDTO.class));
+  }
+
+}
diff --git a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
index d093d3144c3..2a9fa76f136 100644
--- a/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
+++ b/kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/RecordEmitterTest.java
@@ -7,13 +7,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.provectus.kafka.ui.AbstractIntegrationTest;
-import com.provectus.kafka.ui.emitter.BackwardRecordEmitter;
+import com.provectus.kafka.ui.emitter.BackwardEmitter;
 import com.provectus.kafka.ui.emitter.EnhancedConsumer;
-import com.provectus.kafka.ui.emitter.ForwardRecordEmitter;
-import com.provectus.kafka.ui.emitter.MessagesProcessing;
+import com.provectus.kafka.ui.emitter.ForwardEmitter;
 import com.provectus.kafka.ui.emitter.PollingSettings;
 import com.provectus.kafka.ui.emitter.PollingThrottler;
 import com.provectus.kafka.ui.model.ConsumerPosition;
+import com.provectus.kafka.ui.model.TopicMessageDTO;
 import com.provectus.kafka.ui.model.TopicMessageEventDTO;
 import com.provectus.kafka.ui.producer.KafkaTestProducer;
 import com.provectus.kafka.ui.serde.api.Serde;
@@ -31,16 +31,15 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.header.internals.RecordHeader;
-import org.apache.kafka.common.serialization.BytesDeserializer;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -58,6 +57,7 @@ class RecordEmitterTest extends AbstractIntegrationTest {
   static final String EMPTY_TOPIC = TOPIC + "_empty";
   static final List<Record> SENT_RECORDS = new ArrayList<>();
   static final ConsumerRecordDeserializer RECORD_DESERIALIZER = createRecordsDeserializer();
+  static final Predicate<TopicMessageDTO> NOOP_FILTER = m -> true;
 
   @BeforeAll
   static void generateMsgs() throws Exception {
@@ -93,6 +93,7 @@ static void generateMsgs() throws Exception {
   static void cleanup() {
     deleteTopic(TOPIC);
     deleteTopic(EMPTY_TOPIC);
+    SENT_RECORDS.clear();
   }
 
   private static ConsumerRecordDeserializer createRecordsDeserializer() {
@@ -105,28 +106,28 @@ private static ConsumerRecordDeserializer createRecordsDeserializer() {
         s.deserializer(null, Serde.Target.VALUE),
         StringSerde.name(),
         s.deserializer(null, Serde.Target.KEY),
-        s.deserializer(null, Serde.Target.VALUE)
+        s.deserializer(null, Serde.Target.VALUE),
+        msg -> msg
     );
   }
 
-  private MessagesProcessing createMessagesProcessing() {
-    return new MessagesProcessing(RECORD_DESERIALIZER, msg -> true, null);
-  }
-
   @Test
   void pollNothingOnEmptyTopic() {
-    var forwardEmitter = new ForwardRecordEmitter(
+    var forwardEmitter = new ForwardEmitter(
         this::createConsumer,
         new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
-        createMessagesProcessing(),
+        100,
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
-    var backwardEmitter = new BackwardRecordEmitter(
+    var backwardEmitter = new BackwardEmitter(
         this::createConsumer,
         new ConsumerPosition(BEGINNING, EMPTY_TOPIC, null),
         100,
-        createMessagesProcessing(),
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
@@ -145,18 +146,21 @@ void pollNothingOnEmptyTopic() {
 
   @Test
   void pollFullTopicFromBeginning() {
-    var forwardEmitter = new ForwardRecordEmitter(
+    var forwardEmitter = new ForwardEmitter(
         this::createConsumer,
         new ConsumerPosition(BEGINNING, TOPIC, null),
-        createMessagesProcessing(),
+        PARTITIONS * MSGS_PER_PARTITION,
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
-    var backwardEmitter = new BackwardRecordEmitter(
+    var backwardEmitter = new BackwardEmitter(
         this::createConsumer,
         new ConsumerPosition(LATEST, TOPIC, null),
         PARTITIONS * MSGS_PER_PARTITION,
-        createMessagesProcessing(),
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
@@ -174,18 +178,21 @@ void pollWithOffsets() {
       targetOffsets.put(new TopicPartition(TOPIC, i), offset);
     }
 
-    var forwardEmitter = new ForwardRecordEmitter(
+    var forwardEmitter = new ForwardEmitter(
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
-        createMessagesProcessing(),
+        PARTITIONS * MSGS_PER_PARTITION,
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
-    var backwardEmitter = new BackwardRecordEmitter(
+    var backwardEmitter = new BackwardEmitter(
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
         PARTITIONS * MSGS_PER_PARTITION,
-        createMessagesProcessing(),
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
@@ -219,18 +226,21 @@ void pollWithTimestamps() {
       );
     }
 
-    var forwardEmitter = new ForwardRecordEmitter(
+    var forwardEmitter = new ForwardEmitter(
         this::createConsumer,
         new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
-        createMessagesProcessing(),
+        PARTITIONS * MSGS_PER_PARTITION,
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
-    var backwardEmitter = new BackwardRecordEmitter(
+    var backwardEmitter = new BackwardEmitter(
         this::createConsumer,
         new ConsumerPosition(TIMESTAMP, TOPIC, targetTimestamps),
         PARTITIONS * MSGS_PER_PARTITION,
-        createMessagesProcessing(),
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
@@ -257,11 +267,12 @@ void backwardEmitterSeekToEnd() {
       targetOffsets.put(new TopicPartition(TOPIC, i), (long) MSGS_PER_PARTITION);
     }
 
-    var backwardEmitter = new BackwardRecordEmitter(
+    var backwardEmitter = new BackwardEmitter(
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, targetOffsets),
         numMessages,
-        createMessagesProcessing(),
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
@@ -283,11 +294,12 @@ void backwardEmitterSeekToBegin() {
       offsets.put(new TopicPartition(TOPIC, i), 0L);
     }
 
-    var backwardEmitter = new BackwardRecordEmitter(
+    var backwardEmitter = new BackwardEmitter(
         this::createConsumer,
         new ConsumerPosition(OFFSET, TOPIC, offsets),
         100,
-        createMessagesProcessing(),
+        RECORD_DESERIALIZER,
+        NOOP_FILTER,
         PollingSettings.createDefault()
     );
 
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index e8fd3129cb3..306c3fd2ddd 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -3868,10 +3868,6 @@ components:
                   properties:
                     pollTimeoutMs:
                       type: integer
-                    partitionPollTimeout:
-                      type: integer
-                    noDataEmptyPolls:
-                      type: integer
                     maxPageSize:
                       type: integer
                     defaultPageSize:

From f9e89661d71debaec8bc1d24502277e9a5d96e83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 13:08:12 +0400
Subject: [PATCH 675/734] Bump pnpm/action-setup from 2.2.4 to 2.4.0 (#4072)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index b4abbd5ae98..050779a0b2b 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -23,7 +23,7 @@ jobs:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: pnpm/action-setup@v2.2.4
+      - uses: pnpm/action-setup@v2.4.0
         with:
           version: 7.4.0
       - name: Install node

From 78e53d7d93571d48b294b12a22a669d2a5767f9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Aug 2023 13:08:39 +0400
Subject: [PATCH 676/734] Bump svenstaro/upload-release-action from 2.6.1 to
 2.7.0 (#4071)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b927806f146..4c2837f1af0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -34,7 +34,7 @@ jobs:
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Upload files to a GitHub release
-        uses: svenstaro/upload-release-action@2.6.1
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: kafka-ui-api/target/kafka-ui-api-${{ steps.build.outputs.version }}.jar

From 6224b12ed3a2e5101343412818cf11338fb4d8f0 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 18 Aug 2023 14:23:32 +0700
Subject: [PATCH 677/734] FE: Refactor RBAC tests, fix "subset" permissions
 issues (#4128)

---
 .../ActionComponent/__tests__/fixtures.ts     |  2 +
 .../src/lib/__test__/permission.spec.ts       | 92 ++++++++++++-------
 kafka-ui-react-app/src/lib/permissions.ts     | 50 +++++-----
 3 files changed, 86 insertions(+), 58 deletions(-)

diff --git a/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts b/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts
index bf2047ad64d..971b0c938b3 100644
--- a/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts
+++ b/kafka-ui-react-app/src/components/common/ActionComponent/__tests__/fixtures.ts
@@ -7,11 +7,13 @@ export const clusterName = 'local';
 export const validPermission = {
   resource: ResourceType.TOPIC,
   action: Action.CREATE,
+  value: 'topic',
 };
 
 export const invalidPermission = {
   resource: ResourceType.SCHEMA,
   action: Action.DELETE,
+  value: 'test',
 };
 
 const roles = [
diff --git a/kafka-ui-react-app/src/lib/__test__/permission.spec.ts b/kafka-ui-react-app/src/lib/__test__/permission.spec.ts
index 144370a0f00..eb790777db8 100644
--- a/kafka-ui-react-app/src/lib/__test__/permission.spec.ts
+++ b/kafka-ui-react-app/src/lib/__test__/permission.spec.ts
@@ -14,6 +14,7 @@ describe('Permission Helpers', () => {
       clusters: [clusterName1],
       resource: ResourceType.TOPIC,
       actions: [Action.VIEW, Action.CREATE],
+      value: '.*',
     },
     {
       clusters: [clusterName1],
@@ -24,11 +25,18 @@ describe('Permission Helpers', () => {
       clusters: [clusterName1, clusterName2],
       resource: ResourceType.SCHEMA,
       actions: [Action.VIEW],
+      value: '.*',
     },
     {
       clusters: [clusterName1, clusterName2],
       resource: ResourceType.CONNECT,
       actions: [Action.VIEW],
+      value: '.*',
+    },
+    {
+      clusters: [clusterName1],
+      resource: ResourceType.APPLICATIONCONFIG,
+      actions: [Action.EDIT],
     },
     {
       clusters: [clusterName1],
@@ -39,6 +47,7 @@ describe('Permission Helpers', () => {
       clusters: [clusterName1],
       resource: ResourceType.CONSUMER,
       actions: [Action.DELETE],
+      value: '.*',
     },
     {
       clusters: [clusterName1],
@@ -46,6 +55,16 @@ describe('Permission Helpers', () => {
       actions: [Action.EDIT, Action.DELETE, Action.CREATE],
       value: '123.*',
     },
+    {
+      clusters: [clusterName1],
+      resource: ResourceType.ACL,
+      actions: [Action.VIEW],
+    },
+    {
+      clusters: [clusterName1],
+      resource: ResourceType.AUDIT,
+      actions: [Action.VIEW],
+    },
     {
       clusters: [clusterName1, clusterName2],
       resource: ResourceType.TOPIC,
@@ -58,6 +77,12 @@ describe('Permission Helpers', () => {
       value: '.*',
       actions: [Action.EDIT, Action.DELETE],
     },
+    {
+      clusters: [clusterName1, clusterName2],
+      resource: ResourceType.TOPIC,
+      value: 'bobross.*',
+      actions: [Action.VIEW, Action.MESSAGES_READ],
+    },
   ];
 
   const roles = modifyRolesData(userPermissionsMock);
@@ -100,11 +125,11 @@ describe('Permission Helpers', () => {
 
       expect(result.size).toBe(2);
 
-      expect(cluster1Map?.size).toBe(6);
+      expect(cluster1Map?.size).toBe(9);
       expect(cluster2Map?.size).toBe(3);
 
       // clusterMap1
-      expect(cluster1Map?.get(ResourceType.TOPIC)).toHaveLength(3);
+      expect(cluster1Map?.get(ResourceType.TOPIC)).toHaveLength(4);
       expect(cluster1Map?.get(ResourceType.SCHEMA)).toHaveLength(2);
       expect(cluster1Map?.get(ResourceType.CONSUMER)).toHaveLength(1);
       expect(cluster1Map?.get(ResourceType.CLUSTERCONFIG)).toHaveLength(1);
@@ -177,33 +202,23 @@ describe('Permission Helpers', () => {
       ).toBeFalsy();
     });
 
-    it('should check if the isPermitted returns the correct value without name values', () => {
+    it('should check if the isPermitted returns the correct value without resource values (exempt list)', () => {
       expect(
         isPermitted({
           roles,
           clusterName: clusterName1,
-          resource: ResourceType.TOPIC,
-          action: Action.VIEW,
+          resource: ResourceType.KSQL,
+          action: Action.EXECUTE,
           rbacFlag: true,
         })
       ).toBeTruthy();
 
-      expect(
-        isPermitted({
-          roles,
-          clusterName: clusterName2,
-          resource: ResourceType.TOPIC,
-          action: Action.VIEW,
-          rbacFlag: true,
-        })
-      ).toBeFalsy();
-
       expect(
         isPermitted({
           roles,
           clusterName: clusterName1,
-          resource: ResourceType.SCHEMA,
-          action: Action.VIEW,
+          resource: ResourceType.CLUSTERCONFIG,
+          action: Action.EDIT,
           rbacFlag: true,
         })
       ).toBeTruthy();
@@ -212,7 +227,7 @@ describe('Permission Helpers', () => {
         isPermitted({
           roles,
           clusterName: clusterName1,
-          resource: ResourceType.CLUSTERCONFIG,
+          resource: ResourceType.APPLICATIONCONFIG,
           action: Action.EDIT,
           rbacFlag: true,
         })
@@ -222,8 +237,8 @@ describe('Permission Helpers', () => {
         isPermitted({
           roles,
           clusterName: clusterName1,
-          resource: ResourceType.KSQL,
-          action: Action.EXECUTE,
+          resource: ResourceType.ACL,
+          action: Action.VIEW,
           rbacFlag: true,
         })
       ).toBeTruthy();
@@ -231,22 +246,22 @@ describe('Permission Helpers', () => {
       expect(
         isPermitted({
           roles,
-          clusterName: clusterName2,
-          resource: ResourceType.KSQL,
-          action: Action.EXECUTE,
+          clusterName: clusterName1,
+          resource: ResourceType.AUDIT,
+          action: Action.VIEW,
           rbacFlag: true,
         })
-      ).toBeFalsy();
+      ).toBeTruthy();
 
       expect(
         isPermitted({
           roles,
-          clusterName: clusterName2,
-          resource: ResourceType.SCHEMA,
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
           action: Action.VIEW,
           rbacFlag: true,
         })
-      ).toBeTruthy();
+      ).toBeFalsy();
 
       expect(
         isPermitted({
@@ -256,17 +271,17 @@ describe('Permission Helpers', () => {
           action: Action.VIEW,
           rbacFlag: true,
         })
-      ).toBeTruthy();
+      ).toBeFalsy();
 
       expect(
         isPermitted({
           roles,
-          clusterName: clusterName2,
-          resource: ResourceType.CONNECT,
+          clusterName: clusterName1,
+          resource: ResourceType.CONSUMER,
           action: Action.VIEW,
           rbacFlag: true,
         })
-      ).toBeTruthy();
+      ).toBeFalsy();
 
       expect(
         isPermitted({
@@ -276,7 +291,7 @@ describe('Permission Helpers', () => {
           action: Action.VIEW,
           rbacFlag: true,
         })
-      ).toBeTruthy();
+      ).toBeFalsy();
     });
 
     it('should check if the isPermitted returns the correct value with name values', () => {
@@ -445,7 +460,7 @@ describe('Permission Helpers', () => {
           value: '123456',
           rbacFlag: true,
         })
-      ).toBeFalsy();
+      ).toBeTruthy();
 
       expect(
         isPermitted({
@@ -468,6 +483,17 @@ describe('Permission Helpers', () => {
           rbacFlag: true,
         })
       ).toBeTruthy();
+
+      expect(
+        isPermitted({
+          roles,
+          clusterName: clusterName1,
+          resource: ResourceType.TOPIC,
+          action: [Action.MESSAGES_READ],
+          value: 'bobross-test',
+          rbacFlag: true,
+        })
+      ).toBeTruthy();
     });
 
     it('should check the rbac flag and works with permissions accordingly', () => {
diff --git a/kafka-ui-react-app/src/lib/permissions.ts b/kafka-ui-react-app/src/lib/permissions.ts
index 20b8d4a115f..e72ffecf958 100644
--- a/kafka-ui-react-app/src/lib/permissions.ts
+++ b/kafka-ui-react-app/src/lib/permissions.ts
@@ -1,9 +1,17 @@
-import { Action, UserPermission, ResourceType } from 'generated-sources';
+import { Action, ResourceType, UserPermission } from 'generated-sources';
 
 export type RolesType = UserPermission[];
 
 export type RolesModifiedTypes = Map<string, Map<ResourceType, RolesType>>;
 
+const ResourceExemptList: ResourceType[] = [
+  ResourceType.KSQL,
+  ResourceType.CLUSTERCONFIG,
+  ResourceType.APPLICATIONCONFIG,
+  ResourceType.ACL,
+  ResourceType.AUDIT,
+];
+
 export function modifyRolesData(
   data?: RolesType
 ): Map<string, Map<ResourceType, RolesType>> {
@@ -39,6 +47,12 @@ interface IsPermittedConfig {
   rbacFlag: boolean;
 }
 
+const valueMatches = (regexp: string | undefined, val: string | undefined) => {
+  if (!val) return false;
+  if (!regexp) return true;
+  return new RegExp(regexp).test(val);
+};
+
 /**
  * @description it the logic behind depending on the roles whether a certain action
  * is permitted or not the philosophy is inspired from Headless UI libraries where
@@ -83,32 +97,18 @@ export function isPermitted({
   if (!clusterMap) return false;
 
   // short circuit
-  const resourceData = clusterMap.get(resource);
-  if (!resourceData) return false;
-
-  return (
-    resourceData.findIndex((item) => {
-      let valueCheck = true;
-      if (item.value) {
-        valueCheck = false;
+  const resourcePermissions = clusterMap.get(resource);
+  if (!resourcePermissions) return false;
 
-        if (value) valueCheck = new RegExp(item.value).test(value);
-      }
+  const actions = Array.isArray(action) ? action : [action];
 
-      // short circuit
-      if (!valueCheck) return false;
-
-      if (!Array.isArray(action)) {
-        return item.actions.includes(action);
-      }
-
-      // every given action should be found in that resource
-      return action.every(
-        (currentAction) =>
-          item.actions.findIndex((element) => element === currentAction) !== -1
-      );
-    }) !== -1
-  );
+  return actions.every((a) => {
+    return resourcePermissions.some((item) => {
+      if (!item.actions.includes(a)) return false;
+      if (ResourceExemptList.includes(resource)) return true;
+      return valueMatches(item.value, value);
+    });
+  });
 }
 
 /**

From 3114509ebf4c6daa16f6d8a3e6c20f47f1d123a0 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 18 Aug 2023 14:24:10 +0700
Subject: [PATCH 678/734] FE: RBAC: Fix cluster config menu item is always
 enabled (#4130)

---
 .../src/components/Brokers/Broker/Broker.tsx           | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
index 44a75c51ad8..bd0056eaed1 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Broker.tsx
@@ -19,6 +19,8 @@ import BrokerLogdir from 'components/Brokers/Broker/BrokerLogdir/BrokerLogdir';
 import BrokerMetrics from 'components/Brokers/Broker/BrokerMetrics/BrokerMetrics';
 import Navbar from 'components/common/Navigation/Navbar.styled';
 import PageLoader from 'components/common/PageLoader/PageLoader';
+import { ActionNavLink } from 'components/common/ActionComponent';
+import { Action, ResourceType } from 'generated-sources';
 
 import Configs from './Configs/Configs';
 
@@ -71,12 +73,16 @@ const Broker: React.FC = () => {
         >
           Configs
         </NavLink>
-        <NavLink
+        <ActionNavLink
           to={clusterBrokerMetricsPath(clusterName, brokerId)}
           className={({ isActive }) => (isActive ? 'is-active' : '')}
+          permission={{
+            resource: ResourceType.CLUSTERCONFIG,
+            action: Action.VIEW,
+          }}
         >
           Metrics
-        </NavLink>
+        </ActionNavLink>
       </Navbar>
       <Suspense fallback={<PageLoader />}>
         <Routes>

From bdbbdcccbe4ba6adaa8bd92f8c70e59ccd5fcda0 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 18 Aug 2023 15:00:09 +0700
Subject: [PATCH 679/734] BE: Use HTTP GET for basic auth (#4135)

---
 .../kafka/ui/config/auth/BasicAuthSecurityConfig.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
index 36ccf7212ac..c62e83e665e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/BasicAuthSecurityConfig.java
@@ -6,11 +6,13 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 import org.springframework.security.web.server.authentication.RedirectServerAuthenticationSuccessHandler;
 import org.springframework.security.web.server.authentication.logout.RedirectServerLogoutSuccessHandler;
+import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers;
 
 @Configuration
 @EnableWebFluxSecurity
@@ -39,7 +41,9 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http) {
             .authenticated()
         )
         .formLogin(spec -> spec.loginPage(LOGIN_URL).authenticationSuccessHandler(authHandler))
-        .logout(spec -> spec.logoutSuccessHandler(logoutSuccessHandler))
+        .logout(spec -> spec
+            .logoutSuccessHandler(logoutSuccessHandler)
+            .requiresLogout(ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, "/logout")))
         .csrf(ServerHttpSecurity.CsrfSpec::disable)
         .build();
   }

From c8ad262d77444a6b7527132a40ece66e50ee7818 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 18 Aug 2023 15:01:05 +0700
Subject: [PATCH 680/734] BE: Consider context path in basic auth html (#4136)

---
 .../com/provectus/kafka/ui/controller/AuthController.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java
index acc30c59658..da453eb79a6 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AuthController.java
@@ -36,10 +36,10 @@ private byte[] createPage(ServerWebExchange exchange, String csrfTokenHtmlInput)
         + "    <meta name=\"description\" content=\"\">\n"
         + "    <meta name=\"author\" content=\"\">\n"
         + "    <title>Please sign in</title>\n"
-        + "    <link href=\"/static/css/bootstrap.min.css\" rel=\"stylesheet\" "
+        + "    <link href=\"" + contextPath + "/static/css/bootstrap.min.css\" rel=\"stylesheet\" "
         + "integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" "
         + "crossorigin=\"anonymous\">\n"
-        + "    <link href=\"/static/css/signin.css\" "
+        + "    <link href=\"" + contextPath + "/static/css/signin.css\" "
         + "rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
         + "  </head>\n"
         + "  <body>\n"

From 1df8625fc8d42dea6730837568659593b77518cf Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Fri, 18 Aug 2023 15:50:05 +0700
Subject: [PATCH 681/734] BE: Audit: consider RBAC might be disabled (#4138)

---
 .../kafka/ui/service/audit/AuditService.java          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
index 36470db2c74..fc6000dfe8e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/audit/AuditService.java
@@ -6,7 +6,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.provectus.kafka.ui.config.ClustersProperties;
 import com.provectus.kafka.ui.config.auth.AuthenticatedUser;
-import com.provectus.kafka.ui.config.auth.RbacUser;
 import com.provectus.kafka.ui.model.KafkaCluster;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
 import com.provectus.kafka.ui.service.AdminClientService;
@@ -21,6 +20,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.producer.KafkaProducer;
@@ -28,7 +28,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Signal;
@@ -195,8 +197,11 @@ private Mono<AuthenticatedUser> extractUser(Signal<?> sig) {
     if (sig.getContextView().hasKey(key)) {
       return sig.getContextView().<Mono<SecurityContext>>get(key)
           .map(context -> context.getAuthentication().getPrincipal())
-          .cast(RbacUser.class)
-          .map(user -> new AuthenticatedUser(user.name(), user.groups()))
+          .cast(UserDetails.class)
+          .map(user -> {
+            var roles = user.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toSet());
+            return new AuthenticatedUser(user.getUsername(), roles);
+          })
           .switchIfEmpty(NO_AUTH_USER);
     } else {
       return NO_AUTH_USER;

From 5f89e3b97e01fe8b52d834cbd425523aae4c1a93 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 13:17:38 +0400
Subject: [PATCH 682/734] Bump actions/setup-node from 3.7.0 to 3.8.1 (#4141)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/frontend.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 050779a0b2b..1dea2fae84c 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -27,7 +27,7 @@ jobs:
         with:
           version: 7.4.0
       - name: Install node
-        uses: actions/setup-node@v3.7.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version: "16.15.0"
           cache: "pnpm"

From 9acbf2b681fb7310b906ce3624aaf1b6e27b9da5 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Mon, 21 Aug 2023 13:36:17 +0400
Subject: [PATCH 683/734] BE: Minor restart logic refactoring (#4140)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../controller/ApplicationConfigController.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
index 480d62b1784..6699225310a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ApplicationConfigController.java
@@ -82,12 +82,13 @@ public Mono<ResponseEntity<Void>> restartWithConfig(Mono<RestartRequestDTO> rest
         .build();
     return validateAccess(context)
         .then(restartRequestDto)
-        .<ResponseEntity<Void>>map(dto -> {
-          dynamicConfigOperations.persist(MAPPER.fromDto(dto.getConfig().getProperties()));
-          restarter.requestRestart();
-          return ResponseEntity.ok().build();
+        .doOnNext(restartDto -> {
+          var newConfig = MAPPER.fromDto(restartDto.getConfig().getProperties());
+          dynamicConfigOperations.persist(newConfig);
         })
-        .doOnEach(sig -> audit(context, sig));
+        .doOnEach(sig -> audit(context, sig))
+        .doOnSuccess(dto -> restarter.requestRestart())
+        .map(dto -> ResponseEntity.ok().build());
   }
 
   @Override
@@ -116,8 +117,8 @@ public Mono<ResponseEntity<ApplicationConfigValidationDTO>> validateConfig(Mono<
     return validateAccess(context)
         .then(configDto)
         .flatMap(config -> {
-          PropertiesStructure propertiesStructure = MAPPER.fromDto(config.getProperties());
-          ClustersProperties clustersProperties = propertiesStructure.getKafka();
+          PropertiesStructure newConfig = MAPPER.fromDto(config.getProperties());
+          ClustersProperties clustersProperties = newConfig.getKafka();
           return validateClustersConfig(clustersProperties)
               .map(validations -> new ApplicationConfigValidationDTO().clusters(validations));
         })

From 7a82079471d8be926c6a3eb8a850ccf4886a0591 Mon Sep 17 00:00:00 2001
From: p-eye <50516754+p-eye@users.noreply.github.com>
Date: Wed, 23 Aug 2023 15:42:09 +0900
Subject: [PATCH 684/734] FE: Topics: Do not send properties which are not
 defined explicitly (#4097)

---
 kafka-ui-react-app/src/components/Topics/New/New.tsx | 2 +-
 kafka-ui-react-app/src/lib/hooks/api/topics.ts       | 2 --
 kafka-ui-react-app/src/redux/interfaces/topic.ts     | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/New/New.tsx b/kafka-ui-react-app/src/components/Topics/New/New.tsx
index a8d2600a43a..c7528fb99ae 100644
--- a/kafka-ui-react-app/src/components/Topics/New/New.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/New.tsx
@@ -15,7 +15,7 @@ enum Filters {
   PARTITION_COUNT = 'partitionCount',
   REPLICATION_FACTOR = 'replicationFactor',
   INSYNC_REPLICAS = 'inSyncReplicas',
-  CLEANUP_POLICY = 'Delete',
+  CLEANUP_POLICY = 'cleanUpPolicy',
 }
 
 const New: React.FC = () => {
diff --git a/kafka-ui-react-app/src/lib/hooks/api/topics.ts b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
index f06b6a87670..00d08bc66b8 100644
--- a/kafka-ui-react-app/src/lib/hooks/api/topics.ts
+++ b/kafka-ui-react-app/src/lib/hooks/api/topics.ts
@@ -76,7 +76,6 @@ const formatTopicCreation = (form: TopicFormData): TopicCreation => {
     partitions,
     replicationFactor,
     cleanupPolicy,
-    retentionBytes,
     retentionMs,
     maxMessageBytes,
     minInSyncReplicas,
@@ -86,7 +85,6 @@ const formatTopicCreation = (form: TopicFormData): TopicCreation => {
   const configs = {
     'cleanup.policy': cleanupPolicy,
     'retention.ms': retentionMs.toString(),
-    'retention.bytes': retentionBytes.toString(),
     'max.message.bytes': maxMessageBytes.toString(),
     'min.insync.replicas': minInSyncReplicas.toString(),
     ...Object.values(customParams || {}).reduce(topicReducer, {}),
diff --git a/kafka-ui-react-app/src/redux/interfaces/topic.ts b/kafka-ui-react-app/src/redux/interfaces/topic.ts
index 153002240a1..bdc25ee0c60 100644
--- a/kafka-ui-react-app/src/redux/interfaces/topic.ts
+++ b/kafka-ui-react-app/src/redux/interfaces/topic.ts
@@ -44,7 +44,6 @@ export interface TopicFormData {
   minInSyncReplicas: number;
   cleanupPolicy: string;
   retentionMs: number;
-  retentionBytes: number;
   maxMessageBytes: number;
   customParams: {
     name: string;

From d2a5acc82d0be8a8f7e916f2cfeb8aed5d274256 Mon Sep 17 00:00:00 2001
From: pvmsikrsna <pvmsikrsna@users.noreply.github.com>
Date: Wed, 23 Aug 2023 12:16:03 +0530
Subject: [PATCH 685/734] FE: Topics: Minor fixes for Create Topic form (#3969)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/components/Topics/New/__test__/New.spec.tsx    | 10 +++++-----
 .../components/Topics/shared/Form/TopicForm.styled.ts  |  5 +++++
 .../src/components/Topics/shared/Form/TopicForm.tsx    |  6 +++---
 .../Topics/shared/Form/__tests__/TopicForm.spec.tsx    |  2 +-
 kafka-ui-react-app/src/lib/yupExtended.ts              |  6 +++---
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
index f3d75d1bc8b..867291e0bb5 100644
--- a/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/New/__test__/New.spec.tsx
@@ -60,16 +60,16 @@ describe('New', () => {
     await userEvent.clear(screen.getByPlaceholderText('Topic Name'));
     await userEvent.tab();
     await expect(
-      screen.getByText('name is a required field')
+      screen.getByText('Topic Name is required')
     ).toBeInTheDocument();
     await userEvent.type(
-      screen.getByLabelText('Number of partitions *'),
+      screen.getByLabelText('Number of Partitions *'),
       minValue
     );
-    await userEvent.clear(screen.getByLabelText('Number of partitions *'));
+    await userEvent.clear(screen.getByLabelText('Number of Partitions *'));
     await userEvent.tab();
     await expect(
-      screen.getByText('Number of partitions is required and must be a number')
+      screen.getByText('Number of Partitions is required and must be a number')
     ).toBeInTheDocument();
 
     expect(createTopicMock).not.toHaveBeenCalled();
@@ -89,7 +89,7 @@ describe('New', () => {
     renderComponent(clusterTopicNewPath(clusterName));
     await userEvent.type(screen.getByPlaceholderText('Topic Name'), topicName);
     await userEvent.type(
-      screen.getByLabelText('Number of partitions *'),
+      screen.getByLabelText('Number of Partitions *'),
       minValue
     );
     await userEvent.click(screen.getByText('Create topic'));
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts
index fc9e7aae9d5..9dbe1d0aeef 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.styled.ts
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+import Input from 'components/common/Input/Input';
 
 export const Column = styled.div`
   display: flex;
@@ -16,6 +17,10 @@ export const CustomParamsHeading = styled.h4`
   color: ${({ theme }) => theme.heading.h4};
 `;
 
+export const MessageSizeInput = styled(Input)`
+  min-width: 195px;
+`;
+
 export const Label = styled.div`
   display: flex;
   gap: 16px;
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
index e29bfca7a88..677890cb721 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx
@@ -109,12 +109,12 @@ const TopicForm: React.FC<Props> = ({
             {!isEditing && (
               <div>
                 <InputLabel htmlFor="topicFormNumberOfPartitions">
-                  Number of partitions *
+                  Number of Partitions *
                 </InputLabel>
                 <Input
                   id="topicFormNumberOfPartitions"
                   type="number"
-                  placeholder="Number of partitions"
+                  placeholder="Number of Partitions"
                   min="1"
                   name="partitions"
                   positiveOnly
@@ -228,7 +228,7 @@ const TopicForm: React.FC<Props> = ({
             <InputLabel htmlFor="topicFormMaxMessageBytes">
               Maximum message size in bytes
             </InputLabel>
-            <Input
+            <S.MessageSizeInput
               id="topicFormMaxMessageBytes"
               type="number"
               placeholder="Maximum message size"
diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
index e3fd7a7e5e8..347ce935e3d 100644
--- a/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
+++ b/kafka-ui-react-app/src/components/Topics/shared/Form/__tests__/TopicForm.spec.tsx
@@ -37,7 +37,7 @@ describe('TopicForm', () => {
 
     expectByRoleAndNameToBeInDocument('textbox', 'Topic Name *');
 
-    expectByRoleAndNameToBeInDocument('spinbutton', 'Number of partitions *');
+    expectByRoleAndNameToBeInDocument('spinbutton', 'Number of Partitions *');
     expectByRoleAndNameToBeInDocument('spinbutton', 'Replication Factor');
 
     expectByRoleAndNameToBeInDocument('spinbutton', 'Min In Sync Replicas');
diff --git a/kafka-ui-react-app/src/lib/yupExtended.ts b/kafka-ui-react-app/src/lib/yupExtended.ts
index 241dac9770a..ad0c9fb1923 100644
--- a/kafka-ui-react-app/src/lib/yupExtended.ts
+++ b/kafka-ui-react-app/src/lib/yupExtended.ts
@@ -66,17 +66,17 @@ export const topicFormValidationSchema = yup.object().shape({
   name: yup
     .string()
     .max(249)
-    .required()
+    .required('Topic Name is required')
     .matches(
       TOPIC_NAME_VALIDATION_PATTERN,
       'Only alphanumeric, _, -, and . allowed'
     ),
   partitions: yup
     .number()
-    .min(1)
+    .min(1, 'Number of Partitions must be greater than or equal to 1')
     .max(2147483647)
     .required()
-    .typeError('Number of partitions is required and must be a number'),
+    .typeError('Number of Partitions is required and must be a number'),
   replicationFactor: yup.string(),
   minInSyncReplicas: yup.string(),
   cleanupPolicy: yup.string().required(),

From ed9f91fd8ac3c17afa8dd0a5f5b3c0172dd83441 Mon Sep 17 00:00:00 2001
From: Malav Mevada <51991362+malavmevada@users.noreply.github.com>
Date: Wed, 23 Aug 2023 12:21:37 +0530
Subject: [PATCH 686/734] FE: Broker: Config: Implement search by the Value
 (#3804)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../ui/pages/brokers/BrokersConfigTab.java    |  2 ++
 .../Brokers/Broker/Configs/Configs.tsx        | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
index a9e146002ec..e00e938297a 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/brokers/BrokersConfigTab.java
@@ -16,6 +16,8 @@
 
 public class BrokersConfigTab extends BasePage {
 
+  protected List<SelenideElement> editBtn = $$x("//button[@aria-label='editAction']");
+  protected SelenideElement searchByKeyField = $x("//input[@placeholder='Search by Key or Value']");
   protected SelenideElement sourceInfoIcon = $x("//div[text()='Source']/..//div/div[@class]");
   protected SelenideElement sourceInfoTooltip = $x("//div[text()='Source']/..//div/div[@style]");
   protected ElementsCollection editBtns = $$x("//button[@aria-label='editAction']");
diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
index ad6c5087a0f..5b05b7cc5be 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/Configs/Configs.tsx
@@ -34,14 +34,19 @@ const Configs: React.FC = () => {
 
   const getData = () => {
     return data
-      .filter(
-        (item) =>
-          item.name.toLocaleLowerCase().indexOf(keyword.toLocaleLowerCase()) >
-          -1
-      )
+      .filter((item) => {
+        const nameMatch = item.name
+          .toLocaleLowerCase()
+          .includes(keyword.toLocaleLowerCase());
+        return nameMatch
+          ? true
+          : item.value &&
+              item.value
+                .toLocaleLowerCase()
+                .includes(keyword.toLocaleLowerCase()); // try to match the keyword on any of the item.value elements when nameMatch fails but item.value exists
+      })
       .sort((a, b) => {
         if (a.source === b.source) return 0;
-
         return a.source === ConfigSource.DYNAMIC_BROKER_CONFIG ? -1 : 1;
       });
   };
@@ -95,7 +100,7 @@ const Configs: React.FC = () => {
       <S.SearchWrapper>
         <Search
           onChange={setKeyword}
-          placeholder="Search by Key"
+          placeholder="Search by Key or Value"
           value={keyword}
         />
       </S.SearchWrapper>

From 8d402798c5c0bfb01062c1d65d09d350ac46a14d Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <rzabaluev@provectus.com>
Date: Wed, 23 Aug 2023 14:15:32 +0700
Subject: [PATCH 687/734] FE: Bump node & pnpm versions (#4146)

---
 .github/workflows/frontend.yaml | 4 ++--
 kafka-ui-react-app/.nvmrc       | 2 +-
 kafka-ui-react-app/package.json | 4 ++--
 pom.xml                         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 1dea2fae84c..9d7300448c9 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -25,11 +25,11 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - uses: pnpm/action-setup@v2.4.0
         with:
-          version: 7.4.0
+          version: 8.6.12
       - name: Install node
         uses: actions/setup-node@v3.8.1
         with:
-          node-version: "16.15.0"
+          node-version: "18.17.1"
           cache: "pnpm"
           cache-dependency-path: "./kafka-ui-react-app/pnpm-lock.yaml"
       - name: Install Node dependencies
diff --git a/kafka-ui-react-app/.nvmrc b/kafka-ui-react-app/.nvmrc
index 7fd023741b2..860cc5000ae 100644
--- a/kafka-ui-react-app/.nvmrc
+++ b/kafka-ui-react-app/.nvmrc
@@ -1 +1 @@
-v16.15.0
+v18.17.1
diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 754b8f4ea51..9cbf8d211a2 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -106,7 +106,7 @@
     "vite-plugin-ejs": "^1.6.4"
   },
   "engines": {
-    "node": "v16.15.0",
-    "pnpm": "^7.4.0"
+    "node": "v18.17.1",
+    "pnpm": "^8.6.12"
   }
 }
diff --git a/pom.xml b/pom.xml
index a07f15f1a98..13197af5521 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,8 +49,8 @@
         <testcontainers.version>1.17.5</testcontainers.version>
 
         <!-- Frontend dependency versions -->
-        <node.version>v16.15.0</node.version>
-        <pnpm.version>v7.4.0</pnpm.version>
+        <node.version>v18.17.1</node.version>
+        <pnpm.version>v8.6.12</pnpm.version>
 
         <!-- Plugin versions -->
         <fabric8-maven-plugin.version>0.42.1</fabric8-maven-plugin.version>

From b12a0634a0e932c3bc1bd62d63c7e5be992c7365 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Aug 2023 12:50:24 +0400
Subject: [PATCH 688/734] Bump semver from 6.3.0 to 6.3.1 in
 /kafka-ui-react-app (#4149)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 2408 +++++++++++++++--------------
 1 file changed, 1236 insertions(+), 1172 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index b9180d3e9d0..5d5869b49fb 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -1,184 +1,269 @@
-lockfileVersion: 5.4
-
-specifiers:
-  '@floating-ui/react': ^0.19.2
-  '@hookform/error-message': ^2.0.0
-  '@hookform/resolvers': ^2.7.1
-  '@jest/types': ^29.4.3
-  '@microsoft/fetch-event-source': ^2.0.1
-  '@openapitools/openapi-generator-cli': ^2.5.2
-  '@reduxjs/toolkit': ^1.8.3
-  '@swc/core': ^1.3.36
-  '@swc/jest': ^0.2.24
-  '@szhsin/react-menu': ^3.5.3
-  '@tanstack/react-query': ^4.0.5
-  '@tanstack/react-table': ^8.5.10
-  '@testing-library/dom': ^9.0.0
-  '@testing-library/jest-dom': ^5.16.5
-  '@testing-library/react': ^14.0.0
-  '@testing-library/user-event': ^14.4.3
-  '@types/eventsource': ^1.1.8
-  '@types/lodash': ^4.14.172
-  '@types/lossless-json': ^1.0.1
-  '@types/node': ^16.4.13
-  '@types/react': ^18.0.9
-  '@types/react-datepicker': ^4.8.0
-  '@types/react-dom': ^18.0.3
-  '@types/react-router-dom': ^5.3.3
-  '@types/styled-components': ^5.1.13
-  '@types/testing-library__jest-dom': ^5.14.5
-  '@typescript-eslint/eslint-plugin': ^5.29.0
-  '@typescript-eslint/parser': ^5.29.0
-  '@vitejs/plugin-react-swc': ^3.0.0
-  ace-builds: ^1.7.1
-  ajv: ^8.6.3
-  ajv-formats: ^2.1.1
-  classnames: ^2.2.6
-  dotenv: ^16.0.1
-  eslint: ^8.3.0
-  eslint-config-airbnb: ^19.0.4
-  eslint-config-airbnb-typescript: ^17.0.0
-  eslint-config-prettier: ^8.5.0
-  eslint-import-resolver-node: ^0.3.6
-  eslint-import-resolver-typescript: ^3.2.7
-  eslint-plugin-import: ^2.26.0
-  eslint-plugin-jest-dom: ^4.0.3
-  eslint-plugin-jsx-a11y: ^6.5.1
-  eslint-plugin-prettier: ^4.0.0
-  eslint-plugin-react: ^7.30.1
-  eslint-plugin-react-hooks: ^4.5.0
-  fetch-mock: ^9.11.0
-  jest: ^29.4.3
-  jest-environment-jsdom: ^29.4.3
-  jest-sonar-reporter: ^2.0.0
-  jest-styled-components: ^7.1.1
-  jest-watch-typeahead: ^2.2.2
-  json-schema-faker: ^0.5.0-rcv.44
-  jsonpath-plus: ^7.2.0
-  lodash: ^4.17.21
-  lossless-json: ^2.0.8
-  prettier: ^2.8.4
-  pretty-ms: 7.0.1
-  react: ^18.1.0
-  react-ace: ^10.1.0
-  react-datepicker: ^4.10.0
-  react-dom: ^18.1.0
-  react-error-boundary: ^3.1.4
-  react-hook-form: 7.43.1
-  react-hot-toast: ^2.4.0
-  react-is: ^18.2.0
-  react-multi-select-component: ^4.3.3
-  react-redux: ^8.0.2
-  react-router-dom: ^6.3.0
-  redux: ^4.2.0
-  rimraf: ^4.1.2
-  sass: ^1.52.3
-  styled-components: ^5.3.1
-  ts-node: ^10.9.1
-  ts-prune: ^0.10.3
-  typescript: ^4.7.4
-  use-debounce: ^9.0.3
-  vite: ^4.0.0
-  vite-plugin-ejs: ^1.6.4
-  vite-tsconfig-paths: ^4.0.2
-  whatwg-fetch: ^3.6.2
-  yup: ^1.0.0
-  zustand: ^4.1.1
+lockfileVersion: '6.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
 
 dependencies:
-  '@floating-ui/react': 0.19.2_ohobp6rpsmerwlq5ipwfh5yigy
-  '@hookform/error-message': 2.0.0_ie7afrsxjmqsdnv6azc5osehhy
-  '@hookform/resolvers': 2.8.9_react-hook-form@7.43.1
-  '@microsoft/fetch-event-source': 2.0.1
-  '@reduxjs/toolkit': 1.8.3_ctm756ikdwcjcvyfxxwskzbr6q
-  '@szhsin/react-menu': 3.5.3_ef5jwxihqo6n7gxfmzogljlgcm
-  '@tanstack/react-query': 4.0.5_ef5jwxihqo6n7gxfmzogljlgcm
-  '@tanstack/react-table': 8.5.10_ef5jwxihqo6n7gxfmzogljlgcm
-  '@testing-library/react': 14.0.0_ef5jwxihqo6n7gxfmzogljlgcm
-  '@types/testing-library__jest-dom': 5.14.5
-  ace-builds: 1.7.1
-  ajv: 8.8.2
-  ajv-formats: 2.1.1_ajv@8.8.2
-  classnames: 2.3.1
-  fetch-mock: 9.11.0
-  jest: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
-  jest-watch-typeahead: 2.2.2_jest@29.5.0
-  json-schema-faker: 0.5.0-rcv.44
-  jsonpath-plus: 7.2.0
-  lodash: 4.17.21
-  lossless-json: 2.0.8
-  pretty-ms: 7.0.1
-  react: 18.1.0
-  react-ace: 10.1.0_ef5jwxihqo6n7gxfmzogljlgcm
-  react-datepicker: 4.10.0_ef5jwxihqo6n7gxfmzogljlgcm
-  react-dom: 18.1.0_react@18.1.0
-  react-error-boundary: 3.1.4_react@18.1.0
-  react-hook-form: 7.43.1_react@18.1.0
-  react-hot-toast: 2.4.0_ef5jwxihqo6n7gxfmzogljlgcm
-  react-is: 18.2.0
-  react-multi-select-component: 4.3.3_ef5jwxihqo6n7gxfmzogljlgcm
-  react-redux: 8.0.2_nfqigfgwurfoimtkde74cji6ga
-  react-router-dom: 6.3.0_ef5jwxihqo6n7gxfmzogljlgcm
-  redux: 4.2.0
-  sass: 1.52.3
-  styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
-  use-debounce: 9.0.3_react@18.1.0
-  vite: 4.0.0_binvsr2w2vzqveeue6ibz2djda
-  vite-tsconfig-paths: 4.0.2_eqmiqdrctagsk5ranq2vs4ssty
-  whatwg-fetch: 3.6.2
-  yup: 1.0.2
-  zustand: 4.1.1_react@18.1.0
+  '@floating-ui/react':
+    specifier: ^0.19.2
+    version: 0.19.2(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0)
+  '@hookform/error-message':
+    specifier: ^2.0.0
+    version: 2.0.0(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.1.0)
+  '@hookform/resolvers':
+    specifier: ^2.7.1
+    version: 2.8.9(react-hook-form@7.43.1)
+  '@microsoft/fetch-event-source':
+    specifier: ^2.0.1
+    version: 2.0.1
+  '@reduxjs/toolkit':
+    specifier: ^1.8.3
+    version: 1.8.3(react-redux@8.0.2)(react@18.1.0)
+  '@szhsin/react-menu':
+    specifier: ^3.5.3
+    version: 3.5.3(react-dom@18.1.0)(react@18.1.0)
+  '@tanstack/react-query':
+    specifier: ^4.0.5
+    version: 4.0.5(react-dom@18.1.0)(react@18.1.0)
+  '@tanstack/react-table':
+    specifier: ^8.5.10
+    version: 8.5.10(react-dom@18.1.0)(react@18.1.0)
+  '@testing-library/react':
+    specifier: ^14.0.0
+    version: 14.0.0(react-dom@18.1.0)(react@18.1.0)
+  '@types/testing-library__jest-dom':
+    specifier: ^5.14.5
+    version: 5.14.5
+  ace-builds:
+    specifier: ^1.7.1
+    version: 1.7.1
+  ajv:
+    specifier: ^8.6.3
+    version: 8.8.2
+  ajv-formats:
+    specifier: ^2.1.1
+    version: 2.1.1(ajv@8.8.2)
+  classnames:
+    specifier: ^2.2.6
+    version: 2.3.1
+  fetch-mock:
+    specifier: ^9.11.0
+    version: 9.11.0
+  jest:
+    specifier: ^29.4.3
+    version: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
+  jest-watch-typeahead:
+    specifier: ^2.2.2
+    version: 2.2.2(jest@29.5.0)
+  json-schema-faker:
+    specifier: ^0.5.0-rcv.44
+    version: 0.5.0-rcv.44
+  jsonpath-plus:
+    specifier: ^7.2.0
+    version: 7.2.0
+  lodash:
+    specifier: ^4.17.21
+    version: 4.17.21
+  lossless-json:
+    specifier: ^2.0.8
+    version: 2.0.8
+  pretty-ms:
+    specifier: 7.0.1
+    version: 7.0.1
+  react:
+    specifier: ^18.1.0
+    version: 18.1.0
+  react-ace:
+    specifier: ^10.1.0
+    version: 10.1.0(react-dom@18.1.0)(react@18.1.0)
+  react-datepicker:
+    specifier: ^4.10.0
+    version: 4.10.0(react-dom@18.1.0)(react@18.1.0)
+  react-dom:
+    specifier: ^18.1.0
+    version: 18.1.0(react@18.1.0)
+  react-error-boundary:
+    specifier: ^3.1.4
+    version: 3.1.4(react@18.1.0)
+  react-hook-form:
+    specifier: 7.43.1
+    version: 7.43.1(react@18.1.0)
+  react-hot-toast:
+    specifier: ^2.4.0
+    version: 2.4.0(csstype@3.1.2)(react-dom@18.1.0)(react@18.1.0)
+  react-is:
+    specifier: ^18.2.0
+    version: 18.2.0
+  react-multi-select-component:
+    specifier: ^4.3.3
+    version: 4.3.3(react-dom@18.1.0)(react@18.1.0)
+  react-redux:
+    specifier: ^8.0.2
+    version: 8.0.2(@types/react-dom@18.0.5)(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0)(redux@4.2.0)
+  react-router-dom:
+    specifier: ^6.3.0
+    version: 6.3.0(react-dom@18.1.0)(react@18.1.0)
+  redux:
+    specifier: ^4.2.0
+    version: 4.2.0
+  sass:
+    specifier: ^1.52.3
+    version: 1.52.3
+  styled-components:
+    specifier: ^5.3.1
+    version: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0)
+  use-debounce:
+    specifier: ^9.0.3
+    version: 9.0.3(react@18.1.0)
+  vite:
+    specifier: ^4.0.0
+    version: 4.0.0(@types/node@16.11.7)(sass@1.52.3)
+  vite-tsconfig-paths:
+    specifier: ^4.0.2
+    version: 4.0.2(typescript@4.7.4)(vite@4.0.0)
+  whatwg-fetch:
+    specifier: ^3.6.2
+    version: 3.6.2
+  yup:
+    specifier: ^1.0.0
+    version: 1.0.2
+  zustand:
+    specifier: ^4.1.1
+    version: 4.1.1(react@18.1.0)
 
 devDependencies:
-  '@jest/types': 29.5.0
-  '@openapitools/openapi-generator-cli': 2.5.2
-  '@swc/core': 1.3.38
-  '@swc/jest': 0.2.24_@swc+core@1.3.38
-  '@testing-library/dom': 9.0.0
-  '@testing-library/jest-dom': 5.16.5
-  '@testing-library/user-event': 14.4.3_@testing-library+dom@9.0.0
-  '@types/eventsource': 1.1.8
-  '@types/lodash': 4.14.177
-  '@types/lossless-json': 1.0.1
-  '@types/node': 16.11.7
-  '@types/react': 18.0.9
-  '@types/react-datepicker': 4.10.0_react@18.1.0
-  '@types/react-dom': 18.0.5
-  '@types/react-router-dom': 5.3.3
-  '@types/styled-components': 5.1.18
-  '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
-  '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
-  '@vitejs/plugin-react-swc': 3.0.0_vite@4.0.0
-  dotenv: 16.0.1
-  eslint: 8.16.0
-  eslint-config-airbnb: 19.0.4_iayhaebzx3saen2ll7sn5gqmdq
-  eslint-config-airbnb-typescript: 17.0.0_l6wia5brkiej5f4nhesunbzj5y
-  eslint-config-prettier: 8.5.0_eslint@8.16.0
-  eslint-import-resolver-node: 0.3.6
-  eslint-import-resolver-typescript: 3.2.7_btspkuwbqkl4adpiufzbathtpi
-  eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
-  eslint-plugin-jest-dom: 4.0.3_eslint@8.16.0
-  eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
-  eslint-plugin-prettier: 4.0.0_cu7djixscogveocpaizwew7lgy
-  eslint-plugin-react: 7.30.1_eslint@8.16.0
-  eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
-  jest-environment-jsdom: 29.5.0
-  jest-sonar-reporter: 2.0.0
-  jest-styled-components: 7.1.1_styled-components@5.3.1
-  prettier: 2.8.4
-  rimraf: 4.3.1
-  ts-node: 10.9.1_p45lmeymo45ge573kyxcus632u
-  ts-prune: 0.10.3
-  typescript: 4.7.4
-  vite-plugin-ejs: 1.6.4
+  '@jest/types':
+    specifier: ^29.4.3
+    version: 29.5.0
+  '@openapitools/openapi-generator-cli':
+    specifier: ^2.5.2
+    version: 2.5.2
+  '@swc/core':
+    specifier: ^1.3.36
+    version: 1.3.38
+  '@swc/jest':
+    specifier: ^0.2.24
+    version: 0.2.24(@swc/core@1.3.38)
+  '@testing-library/dom':
+    specifier: ^9.0.0
+    version: 9.0.0
+  '@testing-library/jest-dom':
+    specifier: ^5.16.5
+    version: 5.16.5
+  '@testing-library/user-event':
+    specifier: ^14.4.3
+    version: 14.4.3(@testing-library/dom@9.0.0)
+  '@types/eventsource':
+    specifier: ^1.1.8
+    version: 1.1.8
+  '@types/lodash':
+    specifier: ^4.14.172
+    version: 4.14.177
+  '@types/lossless-json':
+    specifier: ^1.0.1
+    version: 1.0.1
+  '@types/node':
+    specifier: ^16.4.13
+    version: 16.11.7
+  '@types/react':
+    specifier: ^18.0.9
+    version: 18.0.9
+  '@types/react-datepicker':
+    specifier: ^4.8.0
+    version: 4.10.0(react@18.1.0)
+  '@types/react-dom':
+    specifier: ^18.0.3
+    version: 18.0.5
+  '@types/react-router-dom':
+    specifier: ^5.3.3
+    version: 5.3.3
+  '@types/styled-components':
+    specifier: ^5.1.13
+    version: 5.1.18
+  '@typescript-eslint/eslint-plugin':
+    specifier: ^5.29.0
+    version: 5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.16.0)(typescript@4.7.4)
+  '@typescript-eslint/parser':
+    specifier: ^5.29.0
+    version: 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+  '@vitejs/plugin-react-swc':
+    specifier: ^3.0.0
+    version: 3.0.0(vite@4.0.0)
+  dotenv:
+    specifier: ^16.0.1
+    version: 16.0.1
+  eslint:
+    specifier: ^8.3.0
+    version: 8.16.0
+  eslint-config-airbnb:
+    specifier: ^19.0.4
+    version: 19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.5.1)(eslint-plugin-react-hooks@4.5.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0)
+  eslint-config-airbnb-typescript:
+    specifier: ^17.0.0
+    version: 17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.16.0)
+  eslint-config-prettier:
+    specifier: ^8.5.0
+    version: 8.5.0(eslint@8.16.0)
+  eslint-import-resolver-node:
+    specifier: ^0.3.6
+    version: 0.3.6
+  eslint-import-resolver-typescript:
+    specifier: ^3.2.7
+    version: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.16.0)
+  eslint-plugin-import:
+    specifier: ^2.26.0
+    version: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
+  eslint-plugin-jest-dom:
+    specifier: ^4.0.3
+    version: 4.0.3(eslint@8.16.0)
+  eslint-plugin-jsx-a11y:
+    specifier: ^6.5.1
+    version: 6.5.1(eslint@8.16.0)
+  eslint-plugin-prettier:
+    specifier: ^4.0.0
+    version: 4.0.0(eslint-config-prettier@8.5.0)(eslint@8.16.0)(prettier@2.8.4)
+  eslint-plugin-react:
+    specifier: ^7.30.1
+    version: 7.30.1(eslint@8.16.0)
+  eslint-plugin-react-hooks:
+    specifier: ^4.5.0
+    version: 4.5.0(eslint@8.16.0)
+  jest-environment-jsdom:
+    specifier: ^29.4.3
+    version: 29.5.0
+  jest-sonar-reporter:
+    specifier: ^2.0.0
+    version: 2.0.0
+  jest-styled-components:
+    specifier: ^7.1.1
+    version: 7.1.1(styled-components@5.3.1)
+  prettier:
+    specifier: ^2.8.4
+    version: 2.8.4
+  rimraf:
+    specifier: ^4.1.2
+    version: 4.3.1
+  ts-node:
+    specifier: ^10.9.1
+    version: 10.9.1(@swc/core@1.3.38)(@types/node@16.11.7)(typescript@4.7.4)
+  ts-prune:
+    specifier: ^0.10.3
+    version: 0.10.3
+  typescript:
+    specifier: ^4.7.4
+    version: 4.7.4
+  vite-plugin-ejs:
+    specifier: ^1.6.4
+    version: 1.6.4
 
 packages:
 
-  /@adobe/css-tools/4.2.0:
+  /@adobe/css-tools@4.2.0:
     resolution: {integrity: sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==}
     dev: true
 
-  /@ampproject/remapping/2.2.0:
+  /@ampproject/remapping@2.2.0:
     resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==}
     engines: {node: '>=6.0.0'}
     dependencies:
@@ -186,55 +271,55 @@ packages:
       '@jridgewell/trace-mapping': 0.3.15
     dev: false
 
-  /@babel/code-frame/7.16.7:
+  /@babel/code-frame@7.16.7:
     resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.18.6
     dev: false
 
-  /@babel/code-frame/7.18.6:
+  /@babel/code-frame@7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/highlight': 7.18.6
 
-  /@babel/compat-data/7.18.8:
+  /@babel/compat-data@7.18.8:
     resolution: {integrity: sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==}
     engines: {node: '>=6.9.0'}
     dev: false
 
-  /@babel/core/7.18.2:
+  /@babel/core@7.18.2:
     resolution: {integrity: sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@ampproject/remapping': 2.2.0
       '@babel/code-frame': 7.16.7
       '@babel/generator': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.2_@babel+core@7.18.2
+      '@babel/helper-compilation-targets': 7.18.2(@babel/core@7.18.2)
       '@babel/helper-module-transforms': 7.18.0
       '@babel/helpers': 7.18.2
       '@babel/parser': 7.18.4
       '@babel/template': 7.16.7
-      '@babel/traverse': 7.18.2
+      '@babel/traverse': 7.18.2(supports-color@5.5.0)
       '@babel/types': 7.18.4
       convert-source-map: 1.7.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.1
-      semver: 6.3.0
+      semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@babel/core/7.18.9:
+  /@babel/core@7.18.9:
     resolution: {integrity: sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@ampproject/remapping': 2.2.0
       '@babel/code-frame': 7.18.6
       '@babel/generator': 7.18.9
-      '@babel/helper-compilation-targets': 7.18.9_@babel+core@7.18.9
+      '@babel/helper-compilation-targets': 7.18.9(@babel/core@7.18.9)
       '@babel/helper-module-transforms': 7.18.9
       '@babel/helpers': 7.18.9
       '@babel/parser': 7.18.9
@@ -242,15 +327,15 @@ packages:
       '@babel/traverse': 7.18.9
       '@babel/types': 7.18.9
       convert-source-map: 1.7.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.1
-      semver: 6.3.0
+      semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@babel/generator/7.18.2:
+  /@babel/generator@7.18.2:
     resolution: {integrity: sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -259,7 +344,7 @@ packages:
       jsesc: 2.5.2
     dev: false
 
-  /@babel/generator/7.18.9:
+  /@babel/generator@7.18.9:
     resolution: {integrity: sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -267,13 +352,13 @@ packages:
       '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
 
-  /@babel/helper-annotate-as-pure/7.18.6:
+  /@babel/helper-annotate-as-pure@7.18.6:
     resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-compilation-targets/7.18.2_@babel+core@7.18.2:
+  /@babel/helper-compilation-targets@7.18.2(@babel/core@7.18.2):
     resolution: {integrity: sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -283,10 +368,10 @@ packages:
       '@babel/core': 7.18.2
       '@babel/helper-validator-option': 7.18.6
       browserslist: 4.20.4
-      semver: 6.3.0
+      semver: 6.3.1
     dev: false
 
-  /@babel/helper-compilation-targets/7.18.9_@babel+core@7.18.9:
+  /@babel/helper-compilation-targets@7.18.9(@babel/core@7.18.9):
     resolution: {integrity: sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -296,39 +381,39 @@ packages:
       '@babel/core': 7.18.9
       '@babel/helper-validator-option': 7.18.6
       browserslist: 4.20.4
-      semver: 6.3.0
+      semver: 6.3.1
     dev: false
 
-  /@babel/helper-environment-visitor/7.18.9:
+  /@babel/helper-environment-visitor@7.18.9:
     resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-function-name/7.18.9:
+  /@babel/helper-function-name@7.18.9:
     resolution: {integrity: sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/template': 7.18.6
       '@babel/types': 7.18.9
 
-  /@babel/helper-hoist-variables/7.18.6:
+  /@babel/helper-hoist-variables@7.18.6:
     resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-module-imports/7.16.7:
+  /@babel/helper-module-imports@7.16.7:
     resolution: {integrity: sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-module-imports/7.18.6:
+  /@babel/helper-module-imports@7.18.6:
     resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-module-transforms/7.18.0:
+  /@babel/helper-module-transforms@7.18.0:
     resolution: {integrity: sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -344,7 +429,7 @@ packages:
       - supports-color
     dev: false
 
-  /@babel/helper-module-transforms/7.18.9:
+  /@babel/helper-module-transforms@7.18.9:
     resolution: {integrity: sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -360,34 +445,34 @@ packages:
       - supports-color
     dev: false
 
-  /@babel/helper-plugin-utils/7.18.6:
+  /@babel/helper-plugin-utils@7.18.6:
     resolution: {integrity: sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==}
     engines: {node: '>=6.9.0'}
     dev: false
 
-  /@babel/helper-simple-access/7.18.6:
+  /@babel/helper-simple-access@7.18.6:
     resolution: {integrity: sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.9
     dev: false
 
-  /@babel/helper-split-export-declaration/7.18.6:
+  /@babel/helper-split-export-declaration@7.18.6:
     resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-validator-identifier/7.18.6:
+  /@babel/helper-validator-identifier@7.18.6:
     resolution: {integrity: sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-option/7.18.6:
+  /@babel/helper-validator-option@7.18.6:
     resolution: {integrity: sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==}
     engines: {node: '>=6.9.0'}
     dev: false
 
-  /@babel/helpers/7.18.2:
+  /@babel/helpers@7.18.2:
     resolution: {integrity: sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -398,7 +483,7 @@ packages:
       - supports-color
     dev: false
 
-  /@babel/helpers/7.18.9:
+  /@babel/helpers@7.18.9:
     resolution: {integrity: sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -409,7 +494,7 @@ packages:
       - supports-color
     dev: false
 
-  /@babel/highlight/7.18.6:
+  /@babel/highlight@7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -417,7 +502,7 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/parser/7.18.4:
+  /@babel/parser@7.18.4:
     resolution: {integrity: sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==}
     engines: {node: '>=6.0.0'}
     hasBin: true
@@ -425,14 +510,14 @@ packages:
       '@babel/types': 7.18.9
     dev: false
 
-  /@babel/parser/7.18.9:
+  /@babel/parser@7.18.9:
     resolution: {integrity: sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.18.9:
+  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.18.9):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -441,7 +526,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.18.9:
+  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.18.9):
     resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -450,7 +535,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.18.9:
+  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.18.9):
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -459,7 +544,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.18.9:
+  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.18.9):
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -468,7 +553,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.18.9:
+  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.18.9):
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -477,7 +562,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.18.9:
+  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.18.9):
     resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -487,7 +572,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.18.9:
+  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.18.9):
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -496,7 +581,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.18.9:
+  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.18.9):
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -505,7 +590,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.18.9:
+  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.18.9):
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -514,7 +599,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.18.9:
+  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.18.9):
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -523,7 +608,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.18.9:
+  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.18.9):
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -532,7 +617,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.18.9:
+  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.18.9):
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -541,7 +626,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.18.9:
+  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.18.9):
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -551,7 +636,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/plugin-syntax-typescript/7.17.12_@babel+core@7.18.9:
+  /@babel/plugin-syntax-typescript@7.17.12(@babel/core@7.18.9):
     resolution: {integrity: sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
@@ -561,7 +646,7 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/runtime-corejs3/7.14.6:
+  /@babel/runtime-corejs3@7.14.6:
     resolution: {integrity: sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -569,13 +654,13 @@ packages:
       regenerator-runtime: 0.13.7
     dev: true
 
-  /@babel/runtime/7.17.9:
+  /@babel/runtime@7.17.9:
     resolution: {integrity: sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.7
 
-  /@babel/template/7.16.7:
+  /@babel/template@7.16.7:
     resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -584,7 +669,7 @@ packages:
       '@babel/types': 7.18.9
     dev: false
 
-  /@babel/template/7.18.6:
+  /@babel/template@7.18.6:
     resolution: {integrity: sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -592,25 +677,7 @@ packages:
       '@babel/parser': 7.18.9
       '@babel/types': 7.18.9
 
-  /@babel/traverse/7.18.2:
-    resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.18.9
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.18.9
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.18.9
-      '@babel/types': 7.18.9
-      debug: 4.3.4
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /@babel/traverse/7.18.2_supports-color@5.5.0:
+  /@babel/traverse@7.18.2(supports-color@5.5.0):
     resolution: {integrity: sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -622,12 +689,12 @@ packages:
       '@babel/helper-split-export-declaration': 7.18.6
       '@babel/parser': 7.18.9
       '@babel/types': 7.18.9
-      debug: 4.3.4_supports-color@5.5.0
+      debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/traverse/7.18.9:
+  /@babel/traverse@7.18.9:
     resolution: {integrity: sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -639,13 +706,13 @@ packages:
       '@babel/helper-split-export-declaration': 7.18.6
       '@babel/parser': 7.18.9
       '@babel/types': 7.18.9
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@babel/types/7.18.4:
+  /@babel/types@7.18.4:
     resolution: {integrity: sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==}
     engines: {node: '>=6.9.0'}
     dependencies:
@@ -653,54 +720,54 @@ packages:
       to-fast-properties: 2.0.0
     dev: false
 
-  /@babel/types/7.18.9:
+  /@babel/types@7.18.9:
     resolution: {integrity: sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-validator-identifier': 7.18.6
       to-fast-properties: 2.0.0
 
-  /@bcoe/v8-coverage/0.2.3:
+  /@bcoe/v8-coverage@0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: false
 
-  /@cspotcode/source-map-support/0.8.1:
+  /@cspotcode/source-map-support@0.8.1:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
     dependencies:
       '@jridgewell/trace-mapping': 0.3.9
 
-  /@emotion/is-prop-valid/0.8.8:
+  /@emotion/is-prop-valid@0.8.8:
     resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==}
     dependencies:
       '@emotion/memoize': 0.7.4
 
-  /@emotion/memoize/0.7.4:
+  /@emotion/memoize@0.7.4:
     resolution: {integrity: sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==}
 
-  /@emotion/stylis/0.8.5:
+  /@emotion/stylis@0.8.5:
     resolution: {integrity: sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==}
 
-  /@emotion/unitless/0.7.5:
+  /@emotion/unitless@0.7.5:
     resolution: {integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==}
 
-  /@esbuild/android-arm/0.16.4:
-    resolution: {integrity: sha512-rZzb7r22m20S1S7ufIc6DC6W659yxoOrl7sKP1nCYhuvUlnCFHVSbATG4keGUtV8rDz11sRRDbWkvQZpzPaHiw==}
+  /@esbuild/android-arm64@0.16.4:
+    resolution: {integrity: sha512-VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q==}
     engines: {node: '>=12'}
-    cpu: [arm]
+    cpu: [arm64]
     os: [android]
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-arm64/0.16.4:
-    resolution: {integrity: sha512-VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q==}
+  /@esbuild/android-arm@0.16.4:
+    resolution: {integrity: sha512-rZzb7r22m20S1S7ufIc6DC6W659yxoOrl7sKP1nCYhuvUlnCFHVSbATG4keGUtV8rDz11sRRDbWkvQZpzPaHiw==}
     engines: {node: '>=12'}
-    cpu: [arm64]
+    cpu: [arm]
     os: [android]
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-x64/0.16.4:
+  /@esbuild/android-x64@0.16.4:
     resolution: {integrity: sha512-MW+B2O++BkcOfMWmuHXB15/l1i7wXhJFqbJhp82IBOais8RBEQv2vQz/jHrDEHaY2X0QY7Wfw86SBL2PbVOr0g==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -708,7 +775,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-arm64/0.16.4:
+  /@esbuild/darwin-arm64@0.16.4:
     resolution: {integrity: sha512-a28X1O//aOfxwJVZVs7ZfM8Tyih2Za4nKJrBwW5Wm4yKsnwBy9aiS/xwpxiiTRttw3EaTg4Srerhcm6z0bu9Wg==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -716,7 +783,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-x64/0.16.4:
+  /@esbuild/darwin-x64@0.16.4:
     resolution: {integrity: sha512-e3doCr6Ecfwd7VzlaQqEPrnbvvPjE9uoTpxG5pyLzr2rI2NMjDHmvY1E5EO81O/e9TUOLLkXA5m6T8lfjK9yAA==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -724,7 +791,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-arm64/0.16.4:
+  /@esbuild/freebsd-arm64@0.16.4:
     resolution: {integrity: sha512-Oup3G/QxBgvvqnXWrBed7xxkFNwAwJVHZcklWyQt7YCAL5bfUkaa6FVWnR78rNQiM8MqqLiT6ZTZSdUFuVIg1w==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -732,7 +799,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-x64/0.16.4:
+  /@esbuild/freebsd-x64@0.16.4:
     resolution: {integrity: sha512-vAP+eYOxlN/Bpo/TZmzEQapNS8W1njECrqkTpNgvXskkkJC2AwOXwZWai/Kc2vEFZUXQttx6UJbj9grqjD/+9Q==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -740,23 +807,23 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm/0.16.4:
-    resolution: {integrity: sha512-A47ZmtpIPyERxkSvIv+zLd6kNIOtJH03XA0Hy7jaceRDdQaQVGSDt4mZqpWqJYgDk9rg96aglbF6kCRvPGDSUA==}
+  /@esbuild/linux-arm64@0.16.4:
+    resolution: {integrity: sha512-2zXoBhv4r5pZiyjBKrOdFP4CXOChxXiYD50LRUU+65DkdS5niPFHbboKZd/c81l0ezpw7AQnHeoCy5hFrzzs4g==}
     engines: {node: '>=12'}
-    cpu: [arm]
+    cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm64/0.16.4:
-    resolution: {integrity: sha512-2zXoBhv4r5pZiyjBKrOdFP4CXOChxXiYD50LRUU+65DkdS5niPFHbboKZd/c81l0ezpw7AQnHeoCy5hFrzzs4g==}
+  /@esbuild/linux-arm@0.16.4:
+    resolution: {integrity: sha512-A47ZmtpIPyERxkSvIv+zLd6kNIOtJH03XA0Hy7jaceRDdQaQVGSDt4mZqpWqJYgDk9rg96aglbF6kCRvPGDSUA==}
     engines: {node: '>=12'}
-    cpu: [arm64]
+    cpu: [arm]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ia32/0.16.4:
+  /@esbuild/linux-ia32@0.16.4:
     resolution: {integrity: sha512-uxdSrpe9wFhz4yBwt2kl2TxS/NWEINYBUFIxQtaEVtglm1eECvsj1vEKI0KX2k2wCe17zDdQ3v+jVxfwVfvvjw==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -764,7 +831,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-loong64/0.16.4:
+  /@esbuild/linux-loong64@0.16.4:
     resolution: {integrity: sha512-peDrrUuxbZ9Jw+DwLCh/9xmZAk0p0K1iY5d2IcwmnN+B87xw7kujOkig6ZRcZqgrXgeRGurRHn0ENMAjjD5DEg==}
     engines: {node: '>=12'}
     cpu: [loong64]
@@ -772,7 +839,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-mips64el/0.16.4:
+  /@esbuild/linux-mips64el@0.16.4:
     resolution: {integrity: sha512-sD9EEUoGtVhFjjsauWjflZklTNr57KdQ6xfloO4yH1u7vNQlOfAlhEzbyBKfgbJlW7rwXYBdl5/NcZ+Mg2XhQA==}
     engines: {node: '>=12'}
     cpu: [mips64el]
@@ -780,7 +847,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ppc64/0.16.4:
+  /@esbuild/linux-ppc64@0.16.4:
     resolution: {integrity: sha512-X1HSqHUX9D+d0l6/nIh4ZZJ94eQky8d8z6yxAptpZE3FxCWYWvTDd9X9ST84MGZEJx04VYUD/AGgciddwO0b8g==}
     engines: {node: '>=12'}
     cpu: [ppc64]
@@ -788,7 +855,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-riscv64/0.16.4:
+  /@esbuild/linux-riscv64@0.16.4:
     resolution: {integrity: sha512-97ANpzyNp0GTXCt6SRdIx1ngwncpkV/z453ZuxbnBROCJ5p/55UjhbaG23UdHj88fGWLKPFtMoU4CBacz4j9FA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
@@ -796,7 +863,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-s390x/0.16.4:
+  /@esbuild/linux-s390x@0.16.4:
     resolution: {integrity: sha512-pUvPQLPmbEeJRPjP0DYTC1vjHyhrnCklQmCGYbipkep+oyfTn7GTBJXoPodR7ZS5upmEyc8lzAkn2o29wD786A==}
     engines: {node: '>=12'}
     cpu: [s390x]
@@ -804,7 +871,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-x64/0.16.4:
+  /@esbuild/linux-x64@0.16.4:
     resolution: {integrity: sha512-N55Q0mJs3Sl8+utPRPBrL6NLYZKBCLLx0bme/+RbjvMforTGGzFvsRl4xLTZMUBFC1poDzBEPTEu5nxizQ9Nlw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -812,7 +879,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/netbsd-x64/0.16.4:
+  /@esbuild/netbsd-x64@0.16.4:
     resolution: {integrity: sha512-LHSJLit8jCObEQNYkgsDYBh2JrJT53oJO2HVdkSYLa6+zuLJh0lAr06brXIkljrlI+N7NNW1IAXGn/6IZPi3YQ==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -820,7 +887,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/openbsd-x64/0.16.4:
+  /@esbuild/openbsd-x64@0.16.4:
     resolution: {integrity: sha512-nLgdc6tWEhcCFg/WVFaUxHcPK3AP/bh+KEwKtl69Ay5IBqUwKDaq/6Xk0E+fh/FGjnLwqFSsarsbPHeKM8t8Sw==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -828,7 +895,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/sunos-x64/0.16.4:
+  /@esbuild/sunos-x64@0.16.4:
     resolution: {integrity: sha512-08SluG24GjPO3tXKk95/85n9kpyZtXCVwURR2i4myhrOfi3jspClV0xQQ0W0PYWHioJj+LejFMt41q+PG3mlAQ==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -836,7 +903,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-arm64/0.16.4:
+  /@esbuild/win32-arm64@0.16.4:
     resolution: {integrity: sha512-yYiRDQcqLYQSvNQcBKN7XogbrSvBE45FEQdH8fuXPl7cngzkCvpsG2H9Uey39IjQ6gqqc+Q4VXYHsQcKW0OMjQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
@@ -844,7 +911,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-ia32/0.16.4:
+  /@esbuild/win32-ia32@0.16.4:
     resolution: {integrity: sha512-5rabnGIqexekYkh9zXG5waotq8mrdlRoBqAktjx2W3kb0zsI83mdCwrcAeKYirnUaTGztR5TxXcXmQrEzny83w==}
     engines: {node: '>=12'}
     cpu: [ia32]
@@ -852,7 +919,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-x64/0.16.4:
+  /@esbuild/win32-x64@0.16.4:
     resolution: {integrity: sha512-sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ==}
     engines: {node: '>=12'}
     cpu: [x64]
@@ -860,12 +927,12 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@eslint/eslintrc/1.3.0:
+  /@eslint/eslintrc@1.3.0:
     resolution: {integrity: sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       espree: 9.3.2
       globals: 13.15.0
       ignore: 5.2.0
@@ -877,17 +944,17 @@ packages:
       - supports-color
     dev: true
 
-  /@floating-ui/core/1.2.1:
+  /@floating-ui/core@1.2.1:
     resolution: {integrity: sha512-LSqwPZkK3rYfD7GKoIeExXOyYx6Q1O4iqZWwIehDNuv3Dv425FIAE8PRwtAx1imEolFTHgBEcoFHm9MDnYgPCg==}
     dev: false
 
-  /@floating-ui/dom/1.2.1:
+  /@floating-ui/dom@1.2.1:
     resolution: {integrity: sha512-Rt45SmRiV8eU+xXSB9t0uMYiQ/ZWGE/jumse2o3i5RGlyvcbqOF4q+1qBnzLE2kZ5JGhq0iMkcGXUKbFe7MpTA==}
     dependencies:
       '@floating-ui/core': 1.2.1
     dev: false
 
-  /@floating-ui/react-dom/1.3.0_ef5jwxihqo6n7gxfmzogljlgcm:
+  /@floating-ui/react-dom@1.3.0(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-htwHm67Ji5E/pROEAr7f8IKFShuiCKHwUC/UY4vC3I5jiSvGFAYnSYiZO5MlGmads+QqvUkR9ANHEguGrDv72g==}
     peerDependencies:
       react: '>=16.8.0'
@@ -895,25 +962,25 @@ packages:
     dependencies:
       '@floating-ui/dom': 1.2.1
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
     dev: false
 
-  /@floating-ui/react/0.19.2_ohobp6rpsmerwlq5ipwfh5yigy:
+  /@floating-ui/react@0.19.2(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-JyNk4A0Ezirq8FlXECvRtQOX/iBe5Ize0W/pLkrZjfHW9GUV7Xnq6zm6fyZuQzaHHqEnVizmvlA96e1/CkZv+w==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
     dependencies:
-      '@floating-ui/react-dom': 1.3.0_ef5jwxihqo6n7gxfmzogljlgcm
-      aria-hidden: 1.2.1_7cpxmzzodpxnolj5zcc5cr63ji
+      '@floating-ui/react-dom': 1.3.0(react-dom@18.1.0)(react@18.1.0)
+      aria-hidden: 1.2.1(@types/react@18.0.9)(react@18.1.0)
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
       tabbable: 6.1.1
     transitivePeerDependencies:
       - '@types/react'
     dev: false
 
-  /@hookform/error-message/2.0.0_ie7afrsxjmqsdnv6azc5osehhy:
+  /@hookform/error-message@2.0.0(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.1.0):
     resolution: {integrity: sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==}
     peerDependencies:
       react: '>=16.8.0'
@@ -921,34 +988,34 @@ packages:
       react-hook-form: ^7.0.0
     dependencies:
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
-      react-hook-form: 7.43.1_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
+      react-hook-form: 7.43.1(react@18.1.0)
     dev: false
 
-  /@hookform/resolvers/2.8.9_react-hook-form@7.43.1:
+  /@hookform/resolvers@2.8.9(react-hook-form@7.43.1):
     resolution: {integrity: sha512-IXwGpjewxScF4N2kuyYDip6ABqH4lCg9n1f1mp0vbmKik+u+nestpbtdEs6U1WQZxwaoK/2APv1+MEr4czX7XA==}
     peerDependencies:
       react-hook-form: ^7.0.0
     dependencies:
-      react-hook-form: 7.43.1_react@18.1.0
+      react-hook-form: 7.43.1(react@18.1.0)
     dev: false
 
-  /@humanwhocodes/config-array/0.9.5:
+  /@humanwhocodes/config-array@0.9.5:
     resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@humanwhocodes/object-schema/1.2.1:
+  /@humanwhocodes/object-schema@1.2.1:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
     dev: true
 
-  /@istanbuljs/load-nyc-config/1.1.0:
+  /@istanbuljs/load-nyc-config@1.1.0:
     resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==}
     engines: {node: '>=8'}
     dependencies:
@@ -959,12 +1026,12 @@ packages:
       resolve-from: 5.0.0
     dev: false
 
-  /@istanbuljs/schema/0.1.3:
+  /@istanbuljs/schema@0.1.3:
     resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
     engines: {node: '>=8'}
     dev: false
 
-  /@jest/console/29.5.0:
+  /@jest/console@29.5.0:
     resolution: {integrity: sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -976,7 +1043,7 @@ packages:
       slash: 3.0.0
     dev: false
 
-  /@jest/core/29.5.0_ts-node@10.9.1:
+  /@jest/core@29.5.0(ts-node@10.9.1):
     resolution: {integrity: sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -997,7 +1064,7 @@ packages:
       exit: 0.1.2
       graceful-fs: 4.2.10
       jest-changed-files: 29.5.0
-      jest-config: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
+      jest-config: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
       jest-haste-map: 29.5.0
       jest-message-util: 29.5.0
       jest-regex-util: 29.4.3
@@ -1018,14 +1085,14 @@ packages:
       - ts-node
     dev: false
 
-  /@jest/create-cache-key-function/27.5.1:
+  /@jest/create-cache-key-function@27.5.1:
     resolution: {integrity: sha512-dmH1yW+makpTSURTy8VzdUwFnfQh1G8R+DxO2Ho2FFmBbKFEVm+3jWdvFhE2VqB/LATCTokkP0dotjyQyw5/AQ==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
     dev: true
 
-  /@jest/environment/29.5.0:
+  /@jest/environment@29.5.0:
     resolution: {integrity: sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1034,20 +1101,20 @@ packages:
       '@types/node': 16.11.7
       jest-mock: 29.5.0
 
-  /@jest/expect-utils/29.0.3:
+  /@jest/expect-utils@29.0.3:
     resolution: {integrity: sha512-i1xUkau7K/63MpdwiRqaxgZOjxYs4f0WMTGJnYwUKubsNRZSeQbLorS7+I4uXVF9KQ5r61BUPAUMZ7Lf66l64Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       jest-get-type: 29.0.0
 
-  /@jest/expect-utils/29.5.0:
+  /@jest/expect-utils@29.5.0:
     resolution: {integrity: sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       jest-get-type: 29.4.3
     dev: false
 
-  /@jest/expect/29.5.0:
+  /@jest/expect@29.5.0:
     resolution: {integrity: sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1057,7 +1124,7 @@ packages:
       - supports-color
     dev: false
 
-  /@jest/fake-timers/29.5.0:
+  /@jest/fake-timers@29.5.0:
     resolution: {integrity: sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1068,7 +1135,7 @@ packages:
       jest-mock: 29.5.0
       jest-util: 29.5.0
 
-  /@jest/globals/29.5.0:
+  /@jest/globals@29.5.0:
     resolution: {integrity: sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1080,7 +1147,7 @@ packages:
       - supports-color
     dev: false
 
-  /@jest/reporters/29.5.0:
+  /@jest/reporters@29.5.0:
     resolution: {integrity: sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -1117,19 +1184,19 @@ packages:
       - supports-color
     dev: false
 
-  /@jest/schemas/29.0.0:
+  /@jest/schemas@29.0.0:
     resolution: {integrity: sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@sinclair/typebox': 0.24.40
 
-  /@jest/schemas/29.4.3:
+  /@jest/schemas@29.4.3:
     resolution: {integrity: sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@sinclair/typebox': 0.25.24
 
-  /@jest/source-map/29.4.3:
+  /@jest/source-map@29.4.3:
     resolution: {integrity: sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1138,7 +1205,7 @@ packages:
       graceful-fs: 4.2.10
     dev: false
 
-  /@jest/test-result/29.0.3:
+  /@jest/test-result@29.0.3:
     resolution: {integrity: sha512-vViVnQjCgTmbhDKEonKJPtcFe9G/CJO4/Np4XwYJah+lF2oI7KKeRp8t1dFvv44wN2NdbDb/qC6pi++Vpp0Dlg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1148,7 +1215,7 @@ packages:
       collect-v8-coverage: 1.0.1
     dev: false
 
-  /@jest/test-result/29.5.0:
+  /@jest/test-result@29.5.0:
     resolution: {integrity: sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1158,7 +1225,7 @@ packages:
       collect-v8-coverage: 1.0.1
     dev: false
 
-  /@jest/test-sequencer/29.5.0:
+  /@jest/test-sequencer@29.5.0:
     resolution: {integrity: sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1168,7 +1235,7 @@ packages:
       slash: 3.0.0
     dev: false
 
-  /@jest/transform/29.5.0:
+  /@jest/transform@29.5.0:
     resolution: {integrity: sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1191,7 +1258,7 @@ packages:
       - supports-color
     dev: false
 
-  /@jest/types/27.5.1:
+  /@jest/types@27.5.1:
     resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
@@ -1202,7 +1269,7 @@ packages:
       chalk: 4.1.2
     dev: true
 
-  /@jest/types/29.5.0:
+  /@jest/types@29.5.0:
     resolution: {integrity: sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -1213,7 +1280,7 @@ packages:
       '@types/yargs': 17.0.10
       chalk: 4.1.2
 
-  /@jridgewell/gen-mapping/0.1.1:
+  /@jridgewell/gen-mapping@0.1.1:
     resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
     engines: {node: '>=6.0.0'}
     dependencies:
@@ -1221,7 +1288,7 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.13
     dev: false
 
-  /@jridgewell/gen-mapping/0.3.2:
+  /@jridgewell/gen-mapping@0.3.2:
     resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
     engines: {node: '>=6.0.0'}
     dependencies:
@@ -1229,34 +1296,34 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.13
       '@jridgewell/trace-mapping': 0.3.15
 
-  /@jridgewell/resolve-uri/3.0.7:
+  /@jridgewell/resolve-uri@3.0.7:
     resolution: {integrity: sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==}
     engines: {node: '>=6.0.0'}
 
-  /@jridgewell/set-array/1.1.1:
+  /@jridgewell/set-array@1.1.1:
     resolution: {integrity: sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==}
     engines: {node: '>=6.0.0'}
 
-  /@jridgewell/sourcemap-codec/1.4.13:
+  /@jridgewell/sourcemap-codec@1.4.13:
     resolution: {integrity: sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==}
 
-  /@jridgewell/trace-mapping/0.3.15:
+  /@jridgewell/trace-mapping@0.3.15:
     resolution: {integrity: sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==}
     dependencies:
       '@jridgewell/resolve-uri': 3.0.7
       '@jridgewell/sourcemap-codec': 1.4.13
 
-  /@jridgewell/trace-mapping/0.3.9:
+  /@jridgewell/trace-mapping@0.3.9:
     resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
     dependencies:
       '@jridgewell/resolve-uri': 3.0.7
       '@jridgewell/sourcemap-codec': 1.4.13
 
-  /@microsoft/fetch-event-source/2.0.1:
+  /@microsoft/fetch-event-source@2.0.1:
     resolution: {integrity: sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==}
     dev: false
 
-  /@nestjs/common/8.4.4_47vcjb2de6lyibr6g4enoa5lyu:
+  /@nestjs/common@8.4.4(reflect-metadata@0.1.13)(rxjs@7.5.5):
     resolution: {integrity: sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==}
     peerDependencies:
       cache-manager: '*'
@@ -1282,7 +1349,7 @@ packages:
       - debug
     dev: true
 
-  /@nestjs/core/8.4.4_ozyn6uy6pikqhtn6hfkzt5a5w4:
+  /@nestjs/core@8.4.4(@nestjs/common@8.4.4)(reflect-metadata@0.1.13)(rxjs@7.5.5):
     resolution: {integrity: sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==}
     requiresBuild: true
     peerDependencies:
@@ -1300,7 +1367,7 @@ packages:
       '@nestjs/websockets':
         optional: true
     dependencies:
-      '@nestjs/common': 8.4.4_47vcjb2de6lyibr6g4enoa5lyu
+      '@nestjs/common': 8.4.4(reflect-metadata@0.1.13)(rxjs@7.5.5)
       '@nuxtjs/opencollective': 0.3.2
       fast-safe-stringify: 2.1.1
       iterare: 1.2.1
@@ -1314,7 +1381,7 @@ packages:
       - encoding
     dev: true
 
-  /@nodelib/fs.scandir/2.1.5:
+  /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
     dependencies:
@@ -1322,12 +1389,12 @@ packages:
       run-parallel: 1.2.0
     dev: true
 
-  /@nodelib/fs.stat/2.0.5:
+  /@nodelib/fs.stat@2.0.5:
     resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
     engines: {node: '>= 8'}
     dev: true
 
-  /@nodelib/fs.walk/1.2.7:
+  /@nodelib/fs.walk@1.2.7:
     resolution: {integrity: sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==}
     engines: {node: '>= 8'}
     dependencies:
@@ -1335,7 +1402,7 @@ packages:
       fastq: 1.11.0
     dev: true
 
-  /@nuxtjs/opencollective/0.3.2:
+  /@nuxtjs/opencollective@0.3.2:
     resolution: {integrity: sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==}
     engines: {node: '>=8.0.0', npm: '>=5.0.0'}
     hasBin: true
@@ -1347,14 +1414,14 @@ packages:
       - encoding
     dev: true
 
-  /@openapitools/openapi-generator-cli/2.5.2:
+  /@openapitools/openapi-generator-cli@2.5.2:
     resolution: {integrity: sha512-FLgkjzpDiHVsH821db0VDSElDoA6TcspGyq3RD4zLBJaJhbSsRwr4u87sNoyuHKBg4OMJbZMT4iJxAhkosKrzw==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     requiresBuild: true
     dependencies:
-      '@nestjs/common': 8.4.4_47vcjb2de6lyibr6g4enoa5lyu
-      '@nestjs/core': 8.4.4_ozyn6uy6pikqhtn6hfkzt5a5w4
+      '@nestjs/common': 8.4.4(reflect-metadata@0.1.13)(rxjs@7.5.5)
+      '@nestjs/core': 8.4.4(@nestjs/common@8.4.4)(reflect-metadata@0.1.13)(rxjs@7.5.5)
       '@nuxtjs/opencollective': 0.3.2
       chalk: 4.1.2
       commander: 8.3.0
@@ -1379,7 +1446,7 @@ packages:
       - encoding
     dev: true
 
-  /@pkgr/utils/2.3.0:
+  /@pkgr/utils@2.3.0:
     resolution: {integrity: sha512-7dIJ9CRVzBnqyEl7diUHPUFJf/oty2SeoVzcMocc5PeOUDK9KGzvgIBjGRRzzlRDaOjh3ADwH0WeibQvi3ls2Q==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
     dependencies:
@@ -1391,10 +1458,10 @@ packages:
       tslib: 2.4.0
     dev: true
 
-  /@popperjs/core/2.9.2:
+  /@popperjs/core@2.9.2:
     resolution: {integrity: sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==}
 
-  /@reduxjs/toolkit/1.8.3_ctm756ikdwcjcvyfxxwskzbr6q:
+  /@reduxjs/toolkit@1.8.3(react-redux@8.0.2)(react@18.1.0):
     resolution: {integrity: sha512-lU/LDIfORmjBbyDLaqFN2JB9YmAT1BElET9y0ZszwhSBa5Ef3t6o5CrHupw5J1iOXwd+o92QfQZ8OJpwXvsssg==}
     peerDependencies:
       react: ^16.9.0 || ^17.0.0 || ^18
@@ -1407,29 +1474,29 @@ packages:
     dependencies:
       immer: 9.0.12
       react: 18.1.0
-      react-redux: 8.0.2_nfqigfgwurfoimtkde74cji6ga
+      react-redux: 8.0.2(@types/react-dom@18.0.5)(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0)(redux@4.2.0)
       redux: 4.2.0
-      redux-thunk: 2.4.1_redux@4.2.0
+      redux-thunk: 2.4.1(redux@4.2.0)
       reselect: 4.1.5
     dev: false
 
-  /@sinclair/typebox/0.24.40:
+  /@sinclair/typebox@0.24.40:
     resolution: {integrity: sha512-Xint60L8rF0+nRy+6fCjW9jQMmu7fTpbwTBrXZiK6eq/RHDJS7LvWX/0oXC8O7fCePmrY/XdfaTv2HiUDeCq4g==}
 
-  /@sinclair/typebox/0.25.24:
+  /@sinclair/typebox@0.25.24:
     resolution: {integrity: sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==}
 
-  /@sinonjs/commons/2.0.0:
+  /@sinonjs/commons@2.0.0:
     resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
     dependencies:
       type-detect: 4.0.8
 
-  /@sinonjs/fake-timers/10.0.2:
+  /@sinonjs/fake-timers@10.0.2:
     resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==}
     dependencies:
       '@sinonjs/commons': 2.0.0
 
-  /@swc/core-darwin-arm64/1.3.38:
+  /@swc/core-darwin-arm64@1.3.38:
     resolution: {integrity: sha512-4ZTJJ/cR0EsXW5UxFCifZoGfzQ07a8s4ayt1nLvLQ5QoB1GTAf9zsACpvWG8e7cmCR0L76R5xt8uJuyr+noIXA==}
     engines: {node: '>=10'}
     cpu: [arm64]
@@ -1437,7 +1504,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-darwin-x64/1.3.38:
+  /@swc/core-darwin-x64@1.3.38:
     resolution: {integrity: sha512-Kim727rNo4Dl8kk0CR8aJQe4zFFtsT1TZGlNrNMUgN1WC3CRX7dLZ6ZJi/VVcTG1cbHp5Fp3mUzwHsMxEh87Mg==}
     engines: {node: '>=10'}
     cpu: [x64]
@@ -1445,7 +1512,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf/1.3.38:
+  /@swc/core-linux-arm-gnueabihf@1.3.38:
     resolution: {integrity: sha512-yaRdnPNU2enlJDRcIMvYVSyodY+Amhf5QuXdUbAj6rkDD6wUs/s9C6yPYrFDmoTltrG+nBv72mUZj+R46wVfSw==}
     engines: {node: '>=10'}
     cpu: [arm]
@@ -1453,7 +1520,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-gnu/1.3.38:
+  /@swc/core-linux-arm64-gnu@1.3.38:
     resolution: {integrity: sha512-iNY1HqKo/wBSu3QOGBUlZaLdBP/EHcwNjBAqIzpb8J64q2jEN02RizqVW0mDxyXktJ3lxr3g7VW9uqklMeXbjQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
@@ -1461,7 +1528,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-musl/1.3.38:
+  /@swc/core-linux-arm64-musl@1.3.38:
     resolution: {integrity: sha512-LJCFgLZoPRkPCPmux+Q5ctgXRp6AsWhvWuY61bh5bIPBDlaG9pZk94DeHyvtiwT0syhTtXb2LieBOx6NqN3zeA==}
     engines: {node: '>=10'}
     cpu: [arm64]
@@ -1469,7 +1536,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-gnu/1.3.38:
+  /@swc/core-linux-x64-gnu@1.3.38:
     resolution: {integrity: sha512-hRQGRIWHmv2PvKQM/mMV45mVXckM2+xLB8TYLLgUG66mmtyGTUJPyxjnJkbI86WNGqo18k+lAuMG2mn6QmzYwQ==}
     engines: {node: '>=10'}
     cpu: [x64]
@@ -1477,7 +1544,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-musl/1.3.38:
+  /@swc/core-linux-x64-musl@1.3.38:
     resolution: {integrity: sha512-PTYSqtsIfPHLKDDNbueI5e0sc130vyHRiFOeeC6qqzA2FAiVvIxuvXHLr0soPvKAR1WyhtYmFB9QarcctemL2w==}
     engines: {node: '>=10'}
     cpu: [x64]
@@ -1485,7 +1552,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-arm64-msvc/1.3.38:
+  /@swc/core-win32-arm64-msvc@1.3.38:
     resolution: {integrity: sha512-9lHfs5TPNs+QdkyZFhZledSmzBEbqml/J1rqPSb9Fy8zB6QlspixE6OLZ3nTlUOdoGWkcTTdrOn77Sd7YGf1AA==}
     engines: {node: '>=10'}
     cpu: [arm64]
@@ -1493,7 +1560,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-ia32-msvc/1.3.38:
+  /@swc/core-win32-ia32-msvc@1.3.38:
     resolution: {integrity: sha512-SbL6pfA2lqvDKnwTHwOfKWvfHAdcbAwJS4dBkFidr7BiPTgI5Uk8wAPcRb8mBECpmIa9yFo+N0cAFRvMnf+cNw==}
     engines: {node: '>=10'}
     cpu: [ia32]
@@ -1501,7 +1568,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-x64-msvc/1.3.38:
+  /@swc/core-win32-x64-msvc@1.3.38:
     resolution: {integrity: sha512-UFveLrL6eGvViOD8OVqUQa6QoQwdqwRvLtL5elF304OT8eCPZa8BhuXnWk25X8UcOyns8gFcb8Fhp3oaLi/Rlw==}
     engines: {node: '>=10'}
     cpu: [x64]
@@ -1509,7 +1576,7 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@swc/core/1.3.38:
+  /@swc/core@1.3.38:
     resolution: {integrity: sha512-AiEVehRFws//AiiLx9DPDp1WDXt+yAoGD1kMYewhoF6QLdTz8AtYu6i8j/yAxk26L8xnegy0CDwcNnub9qenyQ==}
     engines: {node: '>=10'}
     requiresBuild: true
@@ -1525,7 +1592,7 @@ packages:
       '@swc/core-win32-ia32-msvc': 1.3.38
       '@swc/core-win32-x64-msvc': 1.3.38
 
-  /@swc/jest/0.2.24_@swc+core@1.3.38:
+  /@swc/jest@0.2.24(@swc/core@1.3.38):
     resolution: {integrity: sha512-fwgxQbM1wXzyKzl1+IW0aGrRvAA8k0Y3NxFhKigbPjOJ4mCKnWEcNX9HQS3gshflcxq8YKhadabGUVfdwjCr6Q==}
     engines: {npm: '>= 7.0.0'}
     peerDependencies:
@@ -1536,7 +1603,7 @@ packages:
       jsonc-parser: 3.2.0
     dev: true
 
-  /@szhsin/react-menu/3.5.3_ef5jwxihqo6n7gxfmzogljlgcm:
+  /@szhsin/react-menu@3.5.3(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-jxo8oaRwxmVjUzkyOi/ZJiXaZiuFPMIxFzyJdUKfnhBLYiEOVTU9M2CiPuEkirILoareR2GJj2K3y8a81CBPlw==}
     peerDependencies:
       react: '>=16.14.0'
@@ -1544,15 +1611,15 @@ packages:
     dependencies:
       prop-types: 15.8.1
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
-      react-transition-state: 1.1.5_ef5jwxihqo6n7gxfmzogljlgcm
+      react-dom: 18.1.0(react@18.1.0)
+      react-transition-state: 1.1.5(react-dom@18.1.0)(react@18.1.0)
     dev: false
 
-  /@tanstack/query-core/4.0.5:
+  /@tanstack/query-core@4.0.5:
     resolution: {integrity: sha512-QOJ2gLbwlf8p0487pMey6vv8EF5X2ib1zINayaD7mb9/LibUtXmZ12uJgTqcnjgNY/4tWZn5qJnEk2ePG5AVGA==}
     dev: false
 
-  /@tanstack/react-query/4.0.5_ef5jwxihqo6n7gxfmzogljlgcm:
+  /@tanstack/react-query@4.0.5(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-tIggVlhoFevVpY/LkZroPmrERFHN8tw4aZLtgwSArzHmMJ03WQcaNvbbHy6GERidXtaMdUz+IeQryrE7cO7WPQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -1567,11 +1634,11 @@ packages:
       '@tanstack/query-core': 4.0.5
       '@types/use-sync-external-store': 0.0.3
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
-      use-sync-external-store: 1.2.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
+      use-sync-external-store: 1.2.0(react@18.1.0)
     dev: false
 
-  /@tanstack/react-table/8.5.10_ef5jwxihqo6n7gxfmzogljlgcm:
+  /@tanstack/react-table@8.5.10(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-TG+iyqtZD5/N7gCDNM8HJc+ZWbUAkSjv8JaVqk2eYs4xaTUfPnTTsG0vJYqGkoxp8i2GFY78dRx1FDCsctYPGA==}
     engines: {node: '>=12'}
     peerDependencies:
@@ -1580,15 +1647,15 @@ packages:
     dependencies:
       '@tanstack/table-core': 8.5.10
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
     dev: false
 
-  /@tanstack/table-core/8.5.10:
+  /@tanstack/table-core@8.5.10:
     resolution: {integrity: sha512-L1GU/BAF7k50vfk1qDvHkRLhEKSjE46EtCuWRrbdu2UKP4mKClTEeL4/zMr6iefMo8QgWa+Gc0CTVVfYcFLlLA==}
     engines: {node: '>=12'}
     dev: false
 
-  /@testing-library/dom/8.13.0:
+  /@testing-library/dom@8.13.0:
     resolution: {integrity: sha512-9VHgfIatKNXQNaZTtLnalIy0jNZzY35a4S3oi08YAt9Hv1VsfZ/DfA45lM8D/UhtHBGJ4/lGwp0PZkVndRkoOQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -1602,7 +1669,7 @@ packages:
       pretty-format: 27.5.1
     dev: true
 
-  /@testing-library/dom/9.0.0:
+  /@testing-library/dom@9.0.0:
     resolution: {integrity: sha512-+/TLgKNFsYUshOY/zXsQOk+PlFQK+eyJ9T13IDVNJEi+M+Un7xlJK+FZKkbGSnf0+7E1G6PlDhkSYQ/GFiruBQ==}
     engines: {node: '>=14'}
     dependencies:
@@ -1615,7 +1682,7 @@ packages:
       lz-string: 1.4.4
       pretty-format: 27.5.1
 
-  /@testing-library/jest-dom/5.16.5:
+  /@testing-library/jest-dom@5.16.5:
     resolution: {integrity: sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==}
     engines: {node: '>=8', npm: '>=6', yarn: '>=1'}
     dependencies:
@@ -1630,7 +1697,7 @@ packages:
       redent: 3.0.0
     dev: true
 
-  /@testing-library/react/14.0.0_ef5jwxihqo6n7gxfmzogljlgcm:
+  /@testing-library/react@14.0.0(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-S04gSNJbYE30TlIMLTzv6QCTzt9AqIF5y6s6SzVFILNcNvbV/jU96GeiTPillGQo+Ny64M/5PV7klNYYgv5Dfg==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -1641,10 +1708,10 @@ packages:
       '@testing-library/dom': 9.0.0
       '@types/react-dom': 18.0.5
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
     dev: false
 
-  /@testing-library/user-event/14.4.3_@testing-library+dom@9.0.0:
+  /@testing-library/user-event@14.4.3(@testing-library/dom@9.0.0):
     resolution: {integrity: sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
@@ -1653,12 +1720,12 @@ packages:
       '@testing-library/dom': 9.0.0
     dev: true
 
-  /@tootallnate/once/2.0.0:
+  /@tootallnate/once@2.0.0:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
     dev: true
 
-  /@ts-morph/common/0.12.3:
+  /@ts-morph/common@0.12.3:
     resolution: {integrity: sha512-4tUmeLyXJnJWvTFOKtcNJ1yh0a3SsTLi2MUoyj8iUNznFRN1ZquaNe7Oukqrnki2FzZkm0J9adCNLDZxUzvj+w==}
     dependencies:
       fast-glob: 3.2.11
@@ -1667,26 +1734,26 @@ packages:
       path-browserify: 1.0.1
     dev: true
 
-  /@tsconfig/node10/1.0.9:
+  /@tsconfig/node10@1.0.9:
     resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
 
-  /@tsconfig/node12/1.0.11:
+  /@tsconfig/node12@1.0.11:
     resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
 
-  /@tsconfig/node14/1.0.3:
+  /@tsconfig/node14@1.0.3:
     resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
 
-  /@tsconfig/node16/1.0.3:
+  /@tsconfig/node16@1.0.3:
     resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==}
 
-  /@types/aria-query/4.2.2:
+  /@types/aria-query@4.2.2:
     resolution: {integrity: sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==}
     dev: true
 
-  /@types/aria-query/5.0.1:
+  /@types/aria-query@5.0.1:
     resolution: {integrity: sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==}
 
-  /@types/babel__core/7.1.19:
+  /@types/babel__core@7.1.19:
     resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
     dependencies:
       '@babel/parser': 7.18.9
@@ -1696,65 +1763,65 @@ packages:
       '@types/babel__traverse': 7.17.1
     dev: false
 
-  /@types/babel__generator/7.6.4:
+  /@types/babel__generator@7.6.4:
     resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
       '@babel/types': 7.18.9
     dev: false
 
-  /@types/babel__template/7.4.1:
+  /@types/babel__template@7.4.1:
     resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
       '@babel/parser': 7.18.9
       '@babel/types': 7.18.9
     dev: false
 
-  /@types/babel__traverse/7.17.1:
+  /@types/babel__traverse@7.17.1:
     resolution: {integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==}
     dependencies:
       '@babel/types': 7.18.9
     dev: false
 
-  /@types/eventsource/1.1.8:
+  /@types/eventsource@1.1.8:
     resolution: {integrity: sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==}
     dev: true
 
-  /@types/graceful-fs/4.1.5:
+  /@types/graceful-fs@4.1.5:
     resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
     dependencies:
       '@types/node': 16.11.7
     dev: false
 
-  /@types/history/4.7.11:
+  /@types/history@4.7.11:
     resolution: {integrity: sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==}
     dev: true
 
-  /@types/hoist-non-react-statics/3.3.1:
+  /@types/hoist-non-react-statics@3.3.1:
     resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==}
     dependencies:
       '@types/react': 18.0.9
       hoist-non-react-statics: 3.3.2
 
-  /@types/istanbul-lib-coverage/2.0.3:
+  /@types/istanbul-lib-coverage@2.0.3:
     resolution: {integrity: sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==}
 
-  /@types/istanbul-lib-report/3.0.0:
+  /@types/istanbul-lib-report@3.0.0:
     resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==}
     dependencies:
       '@types/istanbul-lib-coverage': 2.0.3
 
-  /@types/istanbul-reports/3.0.1:
+  /@types/istanbul-reports@3.0.1:
     resolution: {integrity: sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==}
     dependencies:
       '@types/istanbul-lib-report': 3.0.0
 
-  /@types/jest/29.0.1:
+  /@types/jest@29.0.1:
     resolution: {integrity: sha512-CAZrjLRZs4xEdIrfrdV74xK1Vo/BKQZwUcjJv3gp6gMeV3BsVxMnXTcgtYOKyphT4DPPo7jxVEVhuwJTQn3oPQ==}
     dependencies:
       expect: 29.0.3
       pretty-format: 29.0.3
 
-  /@types/jsdom/20.0.0:
+  /@types/jsdom@20.0.0:
     resolution: {integrity: sha512-YfAchFs0yM1QPDrLm2VHe+WHGtqms3NXnXAMolrgrVP6fgBHHXy1ozAbo/dFtPNtZC/m66bPiCTWYmqp1F14gA==}
     dependencies:
       '@types/node': 16.11.7
@@ -1762,53 +1829,53 @@ packages:
       parse5: 7.1.1
     dev: true
 
-  /@types/json-schema/7.0.11:
+  /@types/json-schema@7.0.11:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
     dev: true
 
-  /@types/json5/0.0.29:
+  /@types/json5@0.0.29:
     resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
     dev: true
 
-  /@types/lodash/4.14.177:
+  /@types/lodash@4.14.177:
     resolution: {integrity: sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==}
     dev: true
 
-  /@types/lossless-json/1.0.1:
+  /@types/lossless-json@1.0.1:
     resolution: {integrity: sha512-zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==}
     dev: true
 
-  /@types/node/16.11.7:
+  /@types/node@16.11.7:
     resolution: {integrity: sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==}
 
-  /@types/parse-json/4.0.0:
+  /@types/parse-json@4.0.0:
     resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
     dev: true
 
-  /@types/prettier/2.6.3:
+  /@types/prettier@2.6.3:
     resolution: {integrity: sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==}
     dev: false
 
-  /@types/prop-types/15.7.5:
+  /@types/prop-types@15.7.5:
     resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
 
-  /@types/react-datepicker/4.10.0_react@18.1.0:
+  /@types/react-datepicker@4.10.0(react@18.1.0):
     resolution: {integrity: sha512-Cq+ks20vBIU6XN67TbkCHu8M7V46Y6vJrKE2n+8q/GfueJyWWTIKeC3Z7cz/d+qxGDq/VCrqA929R0U4lNuztg==}
     dependencies:
       '@popperjs/core': 2.9.2
       '@types/react': 18.0.9
       date-fns: 2.27.0
-      react-popper: 2.2.5_kse2oiarfsejvukvxwgibirnca
+      react-popper: 2.2.5(@popperjs/core@2.9.2)(react@18.1.0)
     transitivePeerDependencies:
       - react
     dev: true
 
-  /@types/react-dom/18.0.5:
+  /@types/react-dom@18.0.5:
     resolution: {integrity: sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==}
     dependencies:
       '@types/react': 18.0.9
 
-  /@types/react-router-dom/5.3.3:
+  /@types/react-router-dom@5.3.3:
     resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==}
     dependencies:
       '@types/history': 4.7.11
@@ -1816,27 +1883,27 @@ packages:
       '@types/react-router': 5.1.18
     dev: true
 
-  /@types/react-router/5.1.18:
+  /@types/react-router@5.1.18:
     resolution: {integrity: sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==}
     dependencies:
       '@types/history': 4.7.11
       '@types/react': 18.0.9
     dev: true
 
-  /@types/react/18.0.9:
+  /@types/react@18.0.9:
     resolution: {integrity: sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==}
     dependencies:
       '@types/prop-types': 15.7.5
       '@types/scheduler': 0.16.2
       csstype: 3.0.8
 
-  /@types/scheduler/0.16.2:
+  /@types/scheduler@0.16.2:
     resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
 
-  /@types/stack-utils/2.0.1:
+  /@types/stack-utils@2.0.1:
     resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
 
-  /@types/styled-components/5.1.18:
+  /@types/styled-components@5.1.18:
     resolution: {integrity: sha512-xPTYmWP7Mxk5TAD3pYsqjwA9G5fAI8e/S51QUJEl7EQD1siKCdiYXIWiH2lzoHRl+QqbQCJMcGv3YTF3OmyPdQ==}
     dependencies:
       '@types/hoist-non-react-statics': 3.3.1
@@ -1844,34 +1911,34 @@ packages:
       csstype: 3.0.8
     dev: true
 
-  /@types/testing-library__jest-dom/5.14.5:
+  /@types/testing-library__jest-dom@5.14.5:
     resolution: {integrity: sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==}
     dependencies:
       '@types/jest': 29.0.1
 
-  /@types/tough-cookie/4.0.2:
+  /@types/tough-cookie@4.0.2:
     resolution: {integrity: sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==}
     dev: true
 
-  /@types/use-sync-external-store/0.0.3:
+  /@types/use-sync-external-store@0.0.3:
     resolution: {integrity: sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==}
     dev: false
 
-  /@types/yargs-parser/20.2.0:
+  /@types/yargs-parser@20.2.0:
     resolution: {integrity: sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==}
 
-  /@types/yargs/16.0.4:
+  /@types/yargs@16.0.4:
     resolution: {integrity: sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==}
     dependencies:
       '@types/yargs-parser': 20.2.0
     dev: true
 
-  /@types/yargs/17.0.10:
+  /@types/yargs@17.0.10:
     resolution: {integrity: sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==}
     dependencies:
       '@types/yargs-parser': 20.2.0
 
-  /@typescript-eslint/eslint-plugin/5.29.0_uaxwak76nssfibsnotx5epygnu:
+  /@typescript-eslint/eslint-plugin@5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.16.0)(typescript@4.7.4):
     resolution: {integrity: sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1882,23 +1949,23 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      '@typescript-eslint/parser': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
       '@typescript-eslint/scope-manager': 5.29.0
-      '@typescript-eslint/type-utils': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
-      '@typescript-eslint/utils': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
-      debug: 4.3.4
+      '@typescript-eslint/type-utils': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+      '@typescript-eslint/utils': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.16.0
       functional-red-black-tree: 1.0.1
       ignore: 5.2.0
       regexpp: 3.2.0
       semver: 7.3.7
-      tsutils: 3.21.0_typescript@4.7.4
+      tsutils: 3.21.0(typescript@4.7.4)
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.29.0_vjep2yp2sits3sqnodefgcbnfi:
+  /@typescript-eslint/parser@5.29.0(eslint@8.16.0)(typescript@4.7.4):
     resolution: {integrity: sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1910,15 +1977,15 @@ packages:
     dependencies:
       '@typescript-eslint/scope-manager': 5.29.0
       '@typescript-eslint/types': 5.29.0
-      '@typescript-eslint/typescript-estree': 5.29.0_typescript@4.7.4
-      debug: 4.3.4
+      '@typescript-eslint/typescript-estree': 5.29.0(typescript@4.7.4)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.16.0
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/5.29.0:
+  /@typescript-eslint/scope-manager@5.29.0:
     resolution: {integrity: sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -1926,7 +1993,7 @@ packages:
       '@typescript-eslint/visitor-keys': 5.29.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.29.0_vjep2yp2sits3sqnodefgcbnfi:
+  /@typescript-eslint/type-utils@5.29.0(eslint@8.16.0)(typescript@4.7.4):
     resolution: {integrity: sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1936,21 +2003,21 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/utils': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
-      debug: 4.3.4
+      '@typescript-eslint/utils': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+      debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.16.0
-      tsutils: 3.21.0_typescript@4.7.4
+      tsutils: 3.21.0(typescript@4.7.4)
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/types/5.29.0:
+  /@typescript-eslint/types@5.29.0:
     resolution: {integrity: sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.29.0_typescript@4.7.4:
+  /@typescript-eslint/typescript-estree@5.29.0(typescript@4.7.4):
     resolution: {integrity: sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1961,17 +2028,17 @@ packages:
     dependencies:
       '@typescript-eslint/types': 5.29.0
       '@typescript-eslint/visitor-keys': 5.29.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.7
-      tsutils: 3.21.0_typescript@4.7.4
+      tsutils: 3.21.0(typescript@4.7.4)
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.29.0_vjep2yp2sits3sqnodefgcbnfi:
+  /@typescript-eslint/utils@5.29.0(eslint@8.16.0)(typescript@4.7.4):
     resolution: {integrity: sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1980,16 +2047,16 @@ packages:
       '@types/json-schema': 7.0.11
       '@typescript-eslint/scope-manager': 5.29.0
       '@typescript-eslint/types': 5.29.0
-      '@typescript-eslint/typescript-estree': 5.29.0_typescript@4.7.4
+      '@typescript-eslint/typescript-estree': 5.29.0(typescript@4.7.4)
       eslint: 8.16.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.16.0
+      eslint-utils: 3.0.0(eslint@8.16.0)
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.29.0:
+  /@typescript-eslint/visitor-keys@5.29.0:
     resolution: {integrity: sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -1997,31 +2064,31 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-react-swc/3.0.0_vite@4.0.0:
+  /@vitejs/plugin-react-swc@3.0.0(vite@4.0.0):
     resolution: {integrity: sha512-vYlodz/mjYRbxMGbHzDgR8aPR+z8n7K/enWkyBGH096xrL2DIPCuTvQVRYPTXGyy6wO7OFiMxZ3r4nKQD1sH0A==}
     peerDependencies:
       vite: ^4.0.0
     dependencies:
       '@swc/core': 1.3.38
-      vite: 4.0.0_binvsr2w2vzqveeue6ibz2djda
+      vite: 4.0.0(@types/node@16.11.7)(sass@1.52.3)
     dev: true
 
-  /abab/2.0.6:
+  /abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
     dev: true
 
-  /ace-builds/1.7.1:
+  /ace-builds@1.7.1:
     resolution: {integrity: sha512-1mcbP5kXvr729sJ9dA/8tul0pjuvKbma0LF/ZMRwPEwjoNWNpe/x0OXpaPJo36aRpZCjRZMl5zsME3hAKTiaNw==}
     dev: false
 
-  /acorn-globals/6.0.0:
+  /acorn-globals@6.0.0:
     resolution: {integrity: sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==}
     dependencies:
       acorn: 7.4.1
       acorn-walk: 7.2.0
     dev: true
 
-  /acorn-jsx/5.3.2_acorn@8.7.1:
+  /acorn-jsx@5.3.2(acorn@8.7.1):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -2029,36 +2096,36 @@ packages:
       acorn: 8.7.1
     dev: true
 
-  /acorn-walk/7.2.0:
+  /acorn-walk@7.2.0:
     resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
     engines: {node: '>=0.4.0'}
     dev: true
 
-  /acorn-walk/8.2.0:
+  /acorn-walk@8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
 
-  /acorn/7.4.1:
+  /acorn@7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
 
-  /acorn/8.7.1:
+  /acorn@8.7.1:
     resolution: {integrity: sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  /agent-base/6.0.2:
+  /agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /ajv-formats/2.1.1_ajv@8.8.2:
+  /ajv-formats@2.1.1(ajv@8.8.2):
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
     peerDependencies:
       ajv: ^8.0.0
@@ -2069,7 +2136,7 @@ packages:
       ajv: 8.8.2
     dev: false
 
-  /ajv/6.12.6:
+  /ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
       fast-deep-equal: 3.1.3
@@ -2078,7 +2145,7 @@ packages:
       uri-js: 4.4.1
     dev: true
 
-  /ajv/8.8.2:
+  /ajv@8.8.2:
     resolution: {integrity: sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==}
     dependencies:
       fast-deep-equal: 3.1.3
@@ -2087,65 +2154,65 @@ packages:
       uri-js: 4.4.1
     dev: false
 
-  /ansi-escapes/4.3.2:
+  /ansi-escapes@4.3.2:
     resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.21.3
 
-  /ansi-escapes/6.0.0:
+  /ansi-escapes@6.0.0:
     resolution: {integrity: sha512-IG23inYII3dWlU2EyiAiGj6Bwal5GzsgPMwjYGvc1HPE2dgbj4ZB5ToWBKSquKw74nB3TIuOwaI6/jSULzfgrw==}
     engines: {node: '>=14.16'}
     dependencies:
       type-fest: 3.6.1
     dev: false
 
-  /ansi-regex/5.0.1:
+  /ansi-regex@5.0.1:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
-  /ansi-regex/6.0.1:
+  /ansi-regex@6.0.1:
     resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
     engines: {node: '>=12'}
     dev: false
 
-  /ansi-styles/3.2.1:
+  /ansi-styles@3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
     engines: {node: '>=4'}
     dependencies:
       color-convert: 1.9.3
 
-  /ansi-styles/4.3.0:
+  /ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
     dependencies:
       color-convert: 2.0.1
 
-  /ansi-styles/5.2.0:
+  /ansi-styles@5.2.0:
     resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
     engines: {node: '>=10'}
 
-  /anymatch/3.1.2:
+  /anymatch@3.1.2:
     resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==}
     engines: {node: '>= 8'}
     dependencies:
       normalize-path: 3.0.0
       picomatch: 2.3.1
 
-  /arg/4.1.3:
+  /arg@4.1.3:
     resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
 
-  /argparse/1.0.10:
+  /argparse@1.0.10:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
     dependencies:
       sprintf-js: 1.0.3
     dev: false
 
-  /argparse/2.0.1:
+  /argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
     dev: true
 
-  /aria-hidden/1.2.1_7cpxmzzodpxnolj5zcc5cr63ji:
+  /aria-hidden@1.2.1(@types/react@18.0.9)(react@18.1.0):
     resolution: {integrity: sha512-PN344VAf9j1EAi+jyVHOJ8XidQdPVssGco39eNcsGdM4wcsILtxrKLkbuiMfLWYROK1FjRQasMWCBttrhjnr6A==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -2160,7 +2227,7 @@ packages:
       tslib: 2.4.0
     dev: false
 
-  /aria-query/4.2.2:
+  /aria-query@4.2.2:
     resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
     engines: {node: '>=6.0'}
     dependencies:
@@ -2168,11 +2235,11 @@ packages:
       '@babel/runtime-corejs3': 7.14.6
     dev: true
 
-  /aria-query/5.0.0:
+  /aria-query@5.0.0:
     resolution: {integrity: sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==}
     engines: {node: '>=6.0'}
 
-  /array-includes/3.1.5:
+  /array-includes@3.1.5:
     resolution: {integrity: sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2183,12 +2250,12 @@ packages:
       is-string: 1.0.7
     dev: true
 
-  /array-union/2.1.0:
+  /array-union@2.1.0:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
     dev: true
 
-  /array.prototype.flat/1.3.0:
+  /array.prototype.flat@1.3.0:
     resolution: {integrity: sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2198,7 +2265,7 @@ packages:
       es-shim-unscopables: 1.0.0
     dev: true
 
-  /array.prototype.flatmap/1.3.0:
+  /array.prototype.flatmap@1.3.0:
     resolution: {integrity: sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2208,24 +2275,24 @@ packages:
       es-shim-unscopables: 1.0.0
     dev: true
 
-  /ast-types-flow/0.0.7:
+  /ast-types-flow@0.0.7:
     resolution: {integrity: sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==}
     dev: true
 
-  /async/3.2.4:
+  /async@3.2.4:
     resolution: {integrity: sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==}
     dev: true
 
-  /asynckit/0.4.0:
+  /asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
     dev: true
 
-  /axe-core/4.3.5:
+  /axe-core@4.3.5:
     resolution: {integrity: sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==}
     engines: {node: '>=4'}
     dev: true
 
-  /axios/0.26.1:
+  /axios@0.26.1:
     resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
     dependencies:
       follow-redirects: 1.14.8
@@ -2233,11 +2300,11 @@ packages:
       - debug
     dev: true
 
-  /axobject-query/2.2.0:
+  /axobject-query@2.2.0:
     resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
     dev: true
 
-  /babel-jest/29.5.0_@babel+core@7.18.9:
+  /babel-jest@29.5.0(@babel/core@7.18.9):
     resolution: {integrity: sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -2247,7 +2314,7 @@ packages:
       '@jest/transform': 29.5.0
       '@types/babel__core': 7.1.19
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.5.0_@babel+core@7.18.9
+      babel-preset-jest: 29.5.0(@babel/core@7.18.9)
       chalk: 4.1.2
       graceful-fs: 4.2.10
       slash: 3.0.0
@@ -2255,7 +2322,7 @@ packages:
       - supports-color
     dev: false
 
-  /babel-plugin-istanbul/6.1.1:
+  /babel-plugin-istanbul@6.1.1:
     resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
     engines: {node: '>=8'}
     dependencies:
@@ -2268,7 +2335,7 @@ packages:
       - supports-color
     dev: false
 
-  /babel-plugin-jest-hoist/29.5.0:
+  /babel-plugin-jest-hoist@29.5.0:
     resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -2278,7 +2345,7 @@ packages:
       '@types/babel__traverse': 7.17.1
     dev: false
 
-  /babel-plugin-styled-components/1.13.2_styled-components@5.3.1:
+  /babel-plugin-styled-components@1.13.2(styled-components@5.3.1):
     resolution: {integrity: sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==}
     peerDependencies:
       styled-components: '>= 2'
@@ -2287,32 +2354,32 @@ packages:
       '@babel/helper-module-imports': 7.18.6
       babel-plugin-syntax-jsx: 6.18.0
       lodash: 4.17.21
-      styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
+      styled-components: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0)
 
-  /babel-plugin-syntax-jsx/6.18.0:
+  /babel-plugin-syntax-jsx@6.18.0:
     resolution: {integrity: sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==}
 
-  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.18.9:
+  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.18.9):
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.18.9
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.18.9
-      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.18.9
-      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.18.9
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.18.9
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.18.9
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.18.9
-      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.18.9
-    dev: false
-
-  /babel-preset-jest/29.5.0_@babel+core@7.18.9:
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.18.9)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.18.9)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.18.9)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.18.9)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.18.9)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.18.9)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.18.9)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.18.9)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.18.9)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.18.9)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.18.9)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.18.9)
+    dev: false
+
+  /babel-preset-jest@29.5.0(@babel/core@7.18.9):
     resolution: {integrity: sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -2320,21 +2387,21 @@ packages:
     dependencies:
       '@babel/core': 7.18.9
       babel-plugin-jest-hoist: 29.5.0
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.9
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.18.9)
     dev: false
 
-  /balanced-match/1.0.2:
+  /balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  /base64-js/1.5.1:
+  /base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
     dev: true
 
-  /binary-extensions/2.2.0:
+  /binary-extensions@2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
 
-  /bl/4.1.0:
+  /bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
     dependencies:
       buffer: 5.7.1
@@ -2342,29 +2409,29 @@ packages:
       readable-stream: 3.6.0
     dev: true
 
-  /brace-expansion/1.1.11:
+  /brace-expansion@1.1.11:
     resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  /brace-expansion/2.0.1:
+  /brace-expansion@2.0.1:
     resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
     dependencies:
       balanced-match: 1.0.2
     dev: true
 
-  /braces/3.0.2:
+  /braces@3.0.2:
     resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
     engines: {node: '>=8'}
     dependencies:
       fill-range: 7.0.1
 
-  /browser-process-hrtime/1.0.0:
+  /browser-process-hrtime@1.0.0:
     resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==}
     dev: true
 
-  /browserslist/4.20.4:
+  /browserslist@4.20.4:
     resolution: {integrity: sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
@@ -2376,56 +2443,56 @@ packages:
       picocolors: 1.0.0
     dev: false
 
-  /bser/2.1.1:
+  /bser@2.1.1:
     resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==}
     dependencies:
       node-int64: 0.4.0
     dev: false
 
-  /buffer-from/1.1.2:
+  /buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
     dev: false
 
-  /buffer/5.7.1:
+  /buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
     dev: true
 
-  /call-bind/1.0.2:
+  /call-bind@1.0.2:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
       function-bind: 1.1.1
       get-intrinsic: 1.1.1
     dev: true
 
-  /call-me-maybe/1.0.1:
+  /call-me-maybe@1.0.1:
     resolution: {integrity: sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==}
     dev: false
 
-  /callsites/3.1.0:
+  /callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
-  /camelcase/5.3.1:
+  /camelcase@5.3.1:
     resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
     engines: {node: '>=6'}
     dev: false
 
-  /camelcase/6.3.0:
+  /camelcase@6.3.0:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
     dev: false
 
-  /camelize/1.0.0:
+  /camelize@1.0.0:
     resolution: {integrity: sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==}
 
-  /caniuse-lite/1.0.30001352:
+  /caniuse-lite@1.0.30001352:
     resolution: {integrity: sha512-GUgH8w6YergqPQDGWhJGt8GDRnY0L/iJVQcU3eJ46GYf52R8tk0Wxp0PymuFVZboJYXGiCqwozAYZNRjVj6IcA==}
     dev: false
 
-  /chalk/2.4.2:
+  /chalk@2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
     dependencies:
@@ -2433,7 +2500,7 @@ packages:
       escape-string-regexp: 1.0.5
       supports-color: 5.5.0
 
-  /chalk/3.0.0:
+  /chalk@3.0.0:
     resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
     engines: {node: '>=8'}
     dependencies:
@@ -2441,33 +2508,33 @@ packages:
       supports-color: 7.2.0
     dev: true
 
-  /chalk/4.1.2:
+  /chalk@4.1.2:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  /chalk/5.2.0:
+  /chalk@5.2.0:
     resolution: {integrity: sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==}
     engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
     dev: false
 
-  /char-regex/1.0.2:
+  /char-regex@1.0.2:
     resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
     engines: {node: '>=10'}
     dev: false
 
-  /char-regex/2.0.1:
+  /char-regex@2.0.1:
     resolution: {integrity: sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==}
     engines: {node: '>=12.20'}
     dev: false
 
-  /chardet/0.7.0:
+  /chardet@0.7.0:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
     dev: true
 
-  /chokidar/3.5.2:
+  /chokidar@3.5.2:
     resolution: {integrity: sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==}
     engines: {node: '>= 8.10.0'}
     dependencies:
@@ -2481,101 +2548,102 @@ packages:
     optionalDependencies:
       fsevents: 2.3.2
 
-  /ci-info/3.3.1:
+  /ci-info@3.3.1:
     resolution: {integrity: sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==}
 
-  /cjs-module-lexer/1.2.2:
+  /cjs-module-lexer@1.2.2:
     resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
     dev: false
 
-  /classnames/2.3.1:
+  /classnames@2.3.1:
     resolution: {integrity: sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==}
     dev: false
 
-  /cli-cursor/3.1.0:
+  /cli-cursor@3.1.0:
     resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
     engines: {node: '>=8'}
     dependencies:
       restore-cursor: 3.1.0
     dev: true
 
-  /cli-spinners/2.6.1:
+  /cli-spinners@2.6.1:
     resolution: {integrity: sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==}
     engines: {node: '>=6'}
     dev: true
 
-  /cli-width/3.0.0:
+  /cli-width@3.0.0:
     resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
     engines: {node: '>= 10'}
     dev: true
 
-  /cliui/7.0.4:
+  /cliui@7.0.4:
     resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
-  /clone/1.0.4:
+  /clone@1.0.4:
     resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
     engines: {node: '>=0.8'}
+    requiresBuild: true
     dev: true
 
-  /co/4.6.0:
+  /co@4.6.0:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
     dev: false
 
-  /code-block-writer/11.0.1:
+  /code-block-writer@11.0.1:
     resolution: {integrity: sha512-0ch9DeCY8v/BWA9n1/Qu1ALG3lpesel4PYL2eNlGLgvGl+J7k74i+dSXSF3wLvF5SYII8/GUT/Ic+fycBR/DUQ==}
     dev: true
 
-  /collect-v8-coverage/1.0.1:
+  /collect-v8-coverage@1.0.1:
     resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
     dev: false
 
-  /color-convert/1.9.3:
+  /color-convert@1.9.3:
     resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
     dependencies:
       color-name: 1.1.3
 
-  /color-convert/2.0.1:
+  /color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
     dependencies:
       color-name: 1.1.4
 
-  /color-name/1.1.3:
+  /color-name@1.1.3:
     resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
 
-  /color-name/1.1.4:
+  /color-name@1.1.4:
     resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
-  /combined-stream/1.0.8:
+  /combined-stream@1.0.8:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
     dependencies:
       delayed-stream: 1.0.0
     dev: true
 
-  /commander/6.2.1:
+  /commander@6.2.1:
     resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
     engines: {node: '>= 6'}
     dev: true
 
-  /commander/8.3.0:
+  /commander@8.3.0:
     resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
     engines: {node: '>= 12'}
     dev: true
 
-  /compare-versions/4.1.3:
+  /compare-versions@4.1.3:
     resolution: {integrity: sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==}
     dev: true
 
-  /concat-map/0.0.1:
+  /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-  /concurrently/6.5.1:
+  /concurrently@6.5.1:
     resolution: {integrity: sha512-FlSwNpGjWQfRwPLXvJ/OgysbBxPkWpiVjy1042b0U7on7S7qwwMIILRj7WTN1mTgqa582bG6NFuScOoh6Zgdag==}
     engines: {node: '>=10.0.0'}
     hasBin: true
@@ -2590,44 +2658,44 @@ packages:
       yargs: 16.2.0
     dev: true
 
-  /confusing-browser-globals/1.0.11:
+  /confusing-browser-globals@1.0.11:
     resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
     dev: true
 
-  /consola/2.15.3:
+  /consola@2.15.3:
     resolution: {integrity: sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==}
     dev: true
 
-  /console.table/0.10.0:
+  /console.table@0.10.0:
     resolution: {integrity: sha512-dPyZofqggxuvSf7WXvNjuRfnsOk1YazkVP8FdxH4tcH2c37wc79/Yl6Bhr7Lsu00KMgy2ql/qCMuNu8xctZM8g==}
     engines: {node: '> 0.10'}
     dependencies:
       easy-table: 1.1.0
     dev: true
 
-  /convert-source-map/1.7.0:
+  /convert-source-map@1.7.0:
     resolution: {integrity: sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==}
     dependencies:
       safe-buffer: 5.1.2
     dev: false
 
-  /convert-source-map/2.0.0:
+  /convert-source-map@2.0.0:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
     dev: false
 
-  /core-js-pure/3.14.0:
+  /core-js-pure@3.14.0:
     resolution: {integrity: sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==}
     deprecated: core-js-pure@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
     requiresBuild: true
     dev: true
 
-  /core-js/3.14.0:
+  /core-js@3.14.0:
     resolution: {integrity: sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==}
     deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
     requiresBuild: true
     dev: false
 
-  /cosmiconfig/7.0.1:
+  /cosmiconfig@7.0.1:
     resolution: {integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -2638,10 +2706,10 @@ packages:
       yaml: 1.10.2
     dev: true
 
-  /create-require/1.1.1:
+  /create-require@1.1.1:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
 
-  /cross-spawn/7.0.3:
+  /cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
     dependencies:
@@ -2649,44 +2717,48 @@ packages:
       shebang-command: 2.0.0
       which: 2.0.2
 
-  /css-color-keywords/1.0.0:
+  /css-color-keywords@1.0.0:
     resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==}
     engines: {node: '>=4'}
 
-  /css-to-react-native/3.0.0:
+  /css-to-react-native@3.0.0:
     resolution: {integrity: sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==}
     dependencies:
       camelize: 1.0.0
       css-color-keywords: 1.0.0
       postcss-value-parser: 4.1.0
 
-  /css.escape/1.5.1:
+  /css.escape@1.5.1:
     resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
     dev: true
 
-  /cssom/0.3.8:
+  /cssom@0.3.8:
     resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
     dev: true
 
-  /cssom/0.5.0:
+  /cssom@0.5.0:
     resolution: {integrity: sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==}
     dev: true
 
-  /cssstyle/2.3.0:
+  /cssstyle@2.3.0:
     resolution: {integrity: sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==}
     engines: {node: '>=8'}
     dependencies:
       cssom: 0.3.8
     dev: true
 
-  /csstype/3.0.8:
+  /csstype@3.0.8:
     resolution: {integrity: sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==}
 
-  /damerau-levenshtein/1.0.7:
+  /csstype@3.1.2:
+    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
+    dev: false
+
+  /damerau-levenshtein@1.0.7:
     resolution: {integrity: sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==}
     dev: true
 
-  /data-urls/3.0.2:
+  /data-urls@3.0.2:
     resolution: {integrity: sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -2695,11 +2767,11 @@ packages:
       whatwg-url: 11.0.0
     dev: true
 
-  /date-fns/2.27.0:
+  /date-fns@2.27.0:
     resolution: {integrity: sha512-sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q==}
     engines: {node: '>=0.11'}
 
-  /debug/2.6.9:
+  /debug@2.6.9:
     resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     peerDependencies:
       supports-color: '*'
@@ -2710,7 +2782,7 @@ packages:
       ms: 2.0.0
     dev: true
 
-  /debug/3.2.7:
+  /debug@3.2.7:
     resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
     peerDependencies:
       supports-color: '*'
@@ -2721,18 +2793,7 @@ packages:
       ms: 2.1.3
     dev: true
 
-  /debug/4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-
-  /debug/4.3.4_supports-color@5.5.0:
+  /debug@4.3.4(supports-color@5.5.0):
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
     peerDependencies:
@@ -2744,35 +2805,36 @@ packages:
       ms: 2.1.2
       supports-color: 5.5.0
 
-  /decimal.js/10.4.3:
+  /decimal.js@10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
     dev: true
 
-  /dedent/0.7.0:
+  /dedent@0.7.0:
     resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
     dev: false
 
-  /deep-is/0.1.3:
+  /deep-is@0.1.3:
     resolution: {integrity: sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw==}
     dev: true
 
-  /deepmerge/4.2.2:
+  /deepmerge@4.2.2:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /defaults/1.0.3:
+  /defaults@1.0.3:
     resolution: {integrity: sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==}
+    requiresBuild: true
     dependencies:
       clone: 1.0.4
     dev: true
 
-  /define-lazy-prop/2.0.0:
+  /define-lazy-prop@2.0.0:
     resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
     engines: {node: '>=8'}
     dev: true
 
-  /define-properties/1.1.4:
+  /define-properties@1.1.4:
     resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2780,76 +2842,76 @@ packages:
       object-keys: 1.1.1
     dev: true
 
-  /delayed-stream/1.0.0:
+  /delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
     dev: true
 
-  /detect-newline/3.1.0:
+  /detect-newline@3.1.0:
     resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
     engines: {node: '>=8'}
     dev: false
 
-  /diff-match-patch/1.0.5:
+  /diff-match-patch@1.0.5:
     resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
     dev: false
 
-  /diff-sequences/29.0.0:
+  /diff-sequences@29.0.0:
     resolution: {integrity: sha512-7Qe/zd1wxSDL4D/X/FPjOMB+ZMDt71W94KYaq05I2l0oQqgXgs7s4ftYYmV38gBSrPz2vcygxfs1xn0FT+rKNA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /diff-sequences/29.4.3:
+  /diff-sequences@29.4.3:
     resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: false
 
-  /diff/4.0.2:
+  /diff@4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
 
-  /dir-glob/3.0.1:
+  /dir-glob@3.0.1:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
     dependencies:
       path-type: 4.0.0
     dev: true
 
-  /doctrine/2.1.0:
+  /doctrine@2.1.0:
     resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       esutils: 2.0.3
     dev: true
 
-  /doctrine/3.0.0:
+  /doctrine@3.0.0:
     resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       esutils: 2.0.3
     dev: true
 
-  /dom-accessibility-api/0.5.10:
+  /dom-accessibility-api@0.5.10:
     resolution: {integrity: sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g==}
 
-  /domexception/4.0.0:
+  /domexception@4.0.0:
     resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
     engines: {node: '>=12'}
     dependencies:
       webidl-conversions: 7.0.0
     dev: true
 
-  /dotenv/16.0.1:
+  /dotenv@16.0.1:
     resolution: {integrity: sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==}
     engines: {node: '>=12'}
     dev: true
 
-  /easy-table/1.1.0:
+  /easy-table@1.1.0:
     resolution: {integrity: sha512-oq33hWOSSnl2Hoh00tZWaIPi1ievrD9aFG82/IgjlycAnW9hHx5PkJiXpxPsgEE+H7BsbVQXFVFST8TEXS6/pA==}
     optionalDependencies:
       wcwidth: 1.0.1
     dev: true
 
-  /ejs/3.1.8:
+  /ejs@3.1.8:
     resolution: {integrity: sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==}
     engines: {node: '>=0.10.0'}
     hasBin: true
@@ -2857,28 +2919,28 @@ packages:
       jake: 10.8.5
     dev: true
 
-  /electron-to-chromium/1.4.151:
+  /electron-to-chromium@1.4.151:
     resolution: {integrity: sha512-XaG2LpZi9fdiWYOqJh0dJy4SlVywCvpgYXhzOlZTp4JqSKqxn5URqOjbm9OMYB3aInA2GuHQiem1QUOc1yT0Pw==}
     dev: false
 
-  /emittery/0.10.2:
+  /emittery@0.10.2:
     resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==}
     engines: {node: '>=12'}
     dev: false
 
-  /emittery/0.13.1:
+  /emittery@0.13.1:
     resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
     engines: {node: '>=12'}
     dev: false
 
-  /emoji-regex/8.0.0:
+  /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
-  /emoji-regex/9.2.2:
+  /emoji-regex@9.2.2:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
     dev: true
 
-  /enhanced-resolve/5.10.0:
+  /enhanced-resolve@5.10.0:
     resolution: {integrity: sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==}
     engines: {node: '>=10.13.0'}
     dependencies:
@@ -2886,17 +2948,17 @@ packages:
       tapable: 2.2.1
     dev: true
 
-  /entities/4.4.0:
+  /entities@4.4.0:
     resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==}
     engines: {node: '>=0.12'}
     dev: true
 
-  /error-ex/1.3.2:
+  /error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
       is-arrayish: 0.2.1
 
-  /es-abstract/1.20.0:
+  /es-abstract@1.20.0:
     resolution: {integrity: sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2925,13 +2987,13 @@ packages:
       unbox-primitive: 1.0.2
     dev: true
 
-  /es-shim-unscopables/1.0.0:
+  /es-shim-unscopables@1.0.0:
     resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
     dependencies:
       has: 1.0.3
     dev: true
 
-  /es-to-primitive/1.2.1:
+  /es-to-primitive@1.2.1:
     resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -2940,7 +3002,7 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
-  /esbuild/0.16.4:
+  /esbuild@0.16.4:
     resolution: {integrity: sha512-qQrPMQpPTWf8jHugLWHoGqZjApyx3OEm76dlTXobHwh/EBbavbRdjXdYi/GWr43GyN0sfpap14GPkb05NH3ROA==}
     engines: {node: '>=12'}
     hasBin: true
@@ -2969,24 +3031,24 @@ packages:
       '@esbuild/win32-ia32': 0.16.4
       '@esbuild/win32-x64': 0.16.4
 
-  /escalade/3.1.1:
+  /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
 
-  /escape-string-regexp/1.0.5:
+  /escape-string-regexp@1.0.5:
     resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
     engines: {node: '>=0.8.0'}
 
-  /escape-string-regexp/2.0.0:
+  /escape-string-regexp@2.0.0:
     resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}
     engines: {node: '>=8'}
 
-  /escape-string-regexp/4.0.0:
+  /escape-string-regexp@4.0.0:
     resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
     engines: {node: '>=10'}
     dev: true
 
-  /escodegen/2.0.0:
+  /escodegen@2.0.0:
     resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==}
     engines: {node: '>=6.0'}
     hasBin: true
@@ -2999,7 +3061,7 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /eslint-config-airbnb-base/15.0.0_btspkuwbqkl4adpiufzbathtpi:
+  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.26.0)(eslint@8.16.0):
     resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
     engines: {node: ^10.12.0 || >=12.0.0}
     peerDependencies:
@@ -3008,13 +3070,13 @@ packages:
     dependencies:
       confusing-browser-globals: 1.0.11
       eslint: 8.16.0
-      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
       object.assign: 4.1.2
       object.entries: 1.1.5
-      semver: 6.3.0
+      semver: 6.3.1
     dev: true
 
-  /eslint-config-airbnb-typescript/17.0.0_l6wia5brkiej5f4nhesunbzj5y:
+  /eslint-config-airbnb-typescript@17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.16.0):
     resolution: {integrity: sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==}
     peerDependencies:
       '@typescript-eslint/eslint-plugin': ^5.13.0
@@ -3022,14 +3084,14 @@ packages:
       eslint: ^7.32.0 || ^8.2.0
       eslint-plugin-import: ^2.25.3
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.29.0_uaxwak76nssfibsnotx5epygnu
-      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      '@typescript-eslint/eslint-plugin': 5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.16.0)(typescript@4.7.4)
+      '@typescript-eslint/parser': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
       eslint: 8.16.0
-      eslint-config-airbnb-base: 15.0.0_btspkuwbqkl4adpiufzbathtpi
-      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.16.0)
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
     dev: true
 
-  /eslint-config-airbnb/19.0.4_iayhaebzx3saen2ll7sn5gqmdq:
+  /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.5.1)(eslint-plugin-react-hooks@4.5.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0):
     resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==}
     engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -3040,16 +3102,16 @@ packages:
       eslint-plugin-react-hooks: ^4.3.0
     dependencies:
       eslint: 8.16.0
-      eslint-config-airbnb-base: 15.0.0_btspkuwbqkl4adpiufzbathtpi
-      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
-      eslint-plugin-jsx-a11y: 6.5.1_eslint@8.16.0
-      eslint-plugin-react: 7.30.1_eslint@8.16.0
-      eslint-plugin-react-hooks: 4.5.0_eslint@8.16.0
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.16.0)
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
+      eslint-plugin-jsx-a11y: 6.5.1(eslint@8.16.0)
+      eslint-plugin-react: 7.30.1(eslint@8.16.0)
+      eslint-plugin-react-hooks: 4.5.0(eslint@8.16.0)
       object.assign: 4.1.2
       object.entries: 1.1.5
     dev: true
 
-  /eslint-config-prettier/8.5.0_eslint@8.16.0:
+  /eslint-config-prettier@8.5.0(eslint@8.16.0):
     resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==}
     hasBin: true
     peerDependencies:
@@ -3058,7 +3120,7 @@ packages:
       eslint: 8.16.0
     dev: true
 
-  /eslint-import-resolver-node/0.3.6:
+  /eslint-import-resolver-node@0.3.6:
     resolution: {integrity: sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==}
     dependencies:
       debug: 3.2.7
@@ -3067,17 +3129,17 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-import-resolver-typescript/3.2.7_btspkuwbqkl4adpiufzbathtpi:
+  /eslint-import-resolver-typescript@3.2.7(eslint-plugin-import@2.26.0)(eslint@8.16.0):
     resolution: {integrity: sha512-WvcsRy3aPmwVsuS/XVliAJWpIdTlaFXXZPZk3TCbvvF8RtaAkjAhcLL5bl5VEoTmE+XnTHjIbWMzNZcOQpK/DA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
       eslint-plugin-import: '*'
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       enhanced-resolve: 5.10.0
       eslint: 8.16.0
-      eslint-plugin-import: 2.26.0_h5azci6ujakbaa2xblg2jlxooy
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
       get-tsconfig: 4.2.0
       globby: 13.1.2
       is-core-module: 2.9.0
@@ -3087,7 +3149,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils/2.7.3_q4nbo54pix2uwk2gpiw7zjvdw4:
+  /eslint-module-utils@2.7.3(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-node@0.3.6)(eslint-import-resolver-typescript@3.2.7):
     resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3105,16 +3167,16 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      '@typescript-eslint/parser': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
       debug: 3.2.7
       eslint-import-resolver-node: 0.3.6
-      eslint-import-resolver-typescript: 3.2.7_btspkuwbqkl4adpiufzbathtpi
+      eslint-import-resolver-typescript: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.16.0)
       find-up: 2.1.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-plugin-import/2.26.0_h5azci6ujakbaa2xblg2jlxooy:
+  /eslint-plugin-import@2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0):
     resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3124,14 +3186,14 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.29.0_vjep2yp2sits3sqnodefgcbnfi
+      '@typescript-eslint/parser': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
       array-includes: 3.1.5
       array.prototype.flat: 1.3.0
       debug: 2.6.9
       doctrine: 2.1.0
       eslint: 8.16.0
       eslint-import-resolver-node: 0.3.6
-      eslint-module-utils: 2.7.3_q4nbo54pix2uwk2gpiw7zjvdw4
+      eslint-module-utils: 2.7.3(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-node@0.3.6)(eslint-import-resolver-typescript@3.2.7)
       has: 1.0.3
       is-core-module: 2.9.0
       is-glob: 4.0.3
@@ -3145,7 +3207,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-jest-dom/4.0.3_eslint@8.16.0:
+  /eslint-plugin-jest-dom@4.0.3(eslint@8.16.0):
     resolution: {integrity: sha512-9j+n8uj0+V0tmsoS7bYC7fLhQmIvjRqRYEcbDSi+TKPsTThLLXCyj5swMSSf/hTleeMktACnn+HFqXBr5gbcbA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'}
     peerDependencies:
@@ -3157,7 +3219,7 @@ packages:
       requireindex: 1.2.0
     dev: true
 
-  /eslint-plugin-jsx-a11y/6.5.1_eslint@8.16.0:
+  /eslint-plugin-jsx-a11y@6.5.1(eslint@8.16.0):
     resolution: {integrity: sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -3178,7 +3240,7 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /eslint-plugin-prettier/4.0.0_cu7djixscogveocpaizwew7lgy:
+  /eslint-plugin-prettier@4.0.0(eslint-config-prettier@8.5.0)(eslint@8.16.0)(prettier@2.8.4):
     resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==}
     engines: {node: '>=6.0.0'}
     peerDependencies:
@@ -3190,12 +3252,12 @@ packages:
         optional: true
     dependencies:
       eslint: 8.16.0
-      eslint-config-prettier: 8.5.0_eslint@8.16.0
+      eslint-config-prettier: 8.5.0(eslint@8.16.0)
       prettier: 2.8.4
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-react-hooks/4.5.0_eslint@8.16.0:
+  /eslint-plugin-react-hooks@4.5.0(eslint@8.16.0):
     resolution: {integrity: sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -3204,7 +3266,7 @@ packages:
       eslint: 8.16.0
     dev: true
 
-  /eslint-plugin-react/7.30.1_eslint@8.16.0:
+  /eslint-plugin-react@7.30.1(eslint@8.16.0):
     resolution: {integrity: sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3223,11 +3285,11 @@ packages:
       object.values: 1.1.5
       prop-types: 15.8.1
       resolve: 2.0.0-next.3
-      semver: 6.3.0
+      semver: 6.3.1
       string.prototype.matchall: 4.0.7
     dev: true
 
-  /eslint-scope/5.1.1:
+  /eslint-scope@5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}
     dependencies:
@@ -3235,7 +3297,7 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-scope/7.1.1:
+  /eslint-scope@7.1.1:
     resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
@@ -3243,7 +3305,7 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.16.0:
+  /eslint-utils@3.0.0(eslint@8.16.0):
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
@@ -3253,17 +3315,17 @@ packages:
       eslint-visitor-keys: 2.1.0
     dev: true
 
-  /eslint-visitor-keys/2.1.0:
+  /eslint-visitor-keys@2.1.0:
     resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-visitor-keys/3.3.0:
+  /eslint-visitor-keys@3.3.0:
     resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.16.0:
+  /eslint@8.16.0:
     resolution: {integrity: sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
@@ -3273,11 +3335,11 @@ packages:
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.16.0
+      eslint-utils: 3.0.0(eslint@8.16.0)
       eslint-visitor-keys: 3.3.0
       espree: 9.3.2
       esquery: 1.4.0
@@ -3307,50 +3369,50 @@ packages:
       - supports-color
     dev: true
 
-  /espree/9.3.2:
+  /espree@9.3.2:
     resolution: {integrity: sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       acorn: 8.7.1
-      acorn-jsx: 5.3.2_acorn@8.7.1
+      acorn-jsx: 5.3.2(acorn@8.7.1)
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /esprima/4.0.1:
+  /esprima@4.0.1:
     resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
     engines: {node: '>=4'}
     hasBin: true
 
-  /esquery/1.4.0:
+  /esquery@1.4.0:
     resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
     dev: true
 
-  /esrecurse/4.3.0:
+  /esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
     engines: {node: '>=4.0'}
     dependencies:
       estraverse: 5.3.0
     dev: true
 
-  /estraverse/4.3.0:
+  /estraverse@4.3.0:
     resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
     engines: {node: '>=4.0'}
     dev: true
 
-  /estraverse/5.3.0:
+  /estraverse@5.3.0:
     resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
     engines: {node: '>=4.0'}
     dev: true
 
-  /esutils/2.0.3:
+  /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /execa/5.1.1:
+  /execa@5.1.1:
     resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
     engines: {node: '>=10'}
     dependencies:
@@ -3365,12 +3427,12 @@ packages:
       strip-final-newline: 2.0.0
     dev: false
 
-  /exit/0.1.2:
+  /exit@0.1.2:
     resolution: {integrity: sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==}
     engines: {node: '>= 0.8.0'}
     dev: false
 
-  /expect/29.0.3:
+  /expect@29.0.3:
     resolution: {integrity: sha512-t8l5DTws3212VbmPL+tBFXhjRHLmctHB0oQbL8eUc6S7NzZtYUhycrFO9mkxA0ZUC6FAWdNi7JchJSkODtcu1Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -3380,7 +3442,7 @@ packages:
       jest-message-util: 29.0.3
       jest-util: 29.0.3
 
-  /expect/29.5.0:
+  /expect@29.5.0:
     resolution: {integrity: sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -3391,7 +3453,7 @@ packages:
       jest-util: 29.5.0
     dev: false
 
-  /external-editor/3.1.0:
+  /external-editor@3.1.0:
     resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
     engines: {node: '>=4'}
     dependencies:
@@ -3400,14 +3462,14 @@ packages:
       tmp: 0.0.33
     dev: true
 
-  /fast-deep-equal/3.1.3:
+  /fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
-  /fast-diff/1.2.0:
+  /fast-diff@1.2.0:
     resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==}
     dev: true
 
-  /fast-glob/3.2.11:
+  /fast-glob@3.2.11:
     resolution: {integrity: sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==}
     engines: {node: '>=8.6.0'}
     dependencies:
@@ -3418,30 +3480,30 @@ packages:
       micromatch: 4.0.5
     dev: true
 
-  /fast-json-stable-stringify/2.1.0:
+  /fast-json-stable-stringify@2.1.0:
     resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
 
-  /fast-levenshtein/2.0.6:
+  /fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
     dev: true
 
-  /fast-safe-stringify/2.1.1:
+  /fast-safe-stringify@2.1.1:
     resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
     dev: true
 
-  /fastq/1.11.0:
+  /fastq@1.11.0:
     resolution: {integrity: sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==}
     dependencies:
       reusify: 1.0.4
     dev: true
 
-  /fb-watchman/2.0.1:
+  /fb-watchman@2.0.1:
     resolution: {integrity: sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==}
     dependencies:
       bser: 2.1.1
     dev: false
 
-  /fetch-mock/9.11.0:
+  /fetch-mock@9.11.0:
     resolution: {integrity: sha512-PG1XUv+x7iag5p/iNHD4/jdpxL9FtVSqRMUQhPab4hVDt80T1MH5ehzVrL2IdXO9Q2iBggArFvPqjUbHFuI58Q==}
     engines: {node: '>=4.0.0'}
     peerDependencies:
@@ -3453,7 +3515,7 @@ packages:
       '@babel/core': 7.18.2
       '@babel/runtime': 7.17.9
       core-js: 3.14.0
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       glob-to-regexp: 0.4.1
       is-subset: 0.1.1
       lodash.isequal: 4.5.0
@@ -3464,40 +3526,40 @@ packages:
       - supports-color
     dev: false
 
-  /figures/3.2.0:
+  /figures@3.2.0:
     resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
     engines: {node: '>=8'}
     dependencies:
       escape-string-regexp: 1.0.5
     dev: true
 
-  /file-entry-cache/6.0.1:
+  /file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
       flat-cache: 3.0.4
     dev: true
 
-  /filelist/1.0.4:
+  /filelist@1.0.4:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
     dependencies:
       minimatch: 5.1.2
     dev: true
 
-  /fill-range/7.0.1:
+  /fill-range@7.0.1:
     resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
     engines: {node: '>=8'}
     dependencies:
       to-regex-range: 5.0.1
 
-  /find-up/2.1.0:
+  /find-up@2.1.0:
     resolution: {integrity: sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==}
     engines: {node: '>=4'}
     dependencies:
       locate-path: 2.0.0
     dev: true
 
-  /find-up/4.1.0:
+  /find-up@4.1.0:
     resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
     engines: {node: '>=8'}
     dependencies:
@@ -3505,7 +3567,7 @@ packages:
       path-exists: 4.0.0
     dev: false
 
-  /flat-cache/3.0.4:
+  /flat-cache@3.0.4:
     resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
     engines: {node: ^10.12.0 || >=12.0.0}
     dependencies:
@@ -3513,11 +3575,11 @@ packages:
       rimraf: 3.0.2
     dev: true
 
-  /flatted/3.2.5:
+  /flatted@3.2.5:
     resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==}
     dev: true
 
-  /follow-redirects/1.14.8:
+  /follow-redirects@1.14.8:
     resolution: {integrity: sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -3527,7 +3589,7 @@ packages:
         optional: true
     dev: true
 
-  /form-data/4.0.0:
+  /form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
     engines: {node: '>= 6'}
     dependencies:
@@ -3536,11 +3598,11 @@ packages:
       mime-types: 2.1.35
     dev: true
 
-  /format-util/1.0.5:
+  /format-util@1.0.5:
     resolution: {integrity: sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==}
     dev: false
 
-  /fs-extra/10.0.1:
+  /fs-extra@10.0.1:
     resolution: {integrity: sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==}
     engines: {node: '>=12'}
     dependencies:
@@ -3549,20 +3611,20 @@ packages:
       universalify: 2.0.0
     dev: true
 
-  /fs.realpath/1.0.0:
+  /fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  /fsevents/2.3.2:
+  /fsevents@2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /function-bind/1.1.1:
+  /function-bind@1.1.1:
     resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
 
-  /function.prototype.name/1.1.5:
+  /function.prototype.name@1.1.5:
     resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -3572,24 +3634,24 @@ packages:
       functions-have-names: 1.2.3
     dev: true
 
-  /functional-red-black-tree/1.0.1:
+  /functional-red-black-tree@1.0.1:
     resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}
     dev: true
 
-  /functions-have-names/1.2.3:
+  /functions-have-names@1.2.3:
     resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
     dev: true
 
-  /gensync/1.0.0-beta.2:
+  /gensync@1.0.0-beta.2:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
     engines: {node: '>=6.9.0'}
     dev: false
 
-  /get-caller-file/2.0.5:
+  /get-caller-file@2.0.5:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
-  /get-intrinsic/1.1.1:
+  /get-intrinsic@1.1.1:
     resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==}
     dependencies:
       function-bind: 1.1.1
@@ -3597,17 +3659,17 @@ packages:
       has-symbols: 1.0.3
     dev: true
 
-  /get-package-type/0.1.0:
+  /get-package-type@0.1.0:
     resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
     engines: {node: '>=8.0.0'}
     dev: false
 
-  /get-stream/6.0.1:
+  /get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
     dev: false
 
-  /get-symbol-description/1.0.0:
+  /get-symbol-description@1.0.0:
     resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -3615,28 +3677,28 @@ packages:
       get-intrinsic: 1.1.1
     dev: true
 
-  /get-tsconfig/4.2.0:
+  /get-tsconfig@4.2.0:
     resolution: {integrity: sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg==}
     dev: true
 
-  /glob-parent/5.1.2:
+  /glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
     dependencies:
       is-glob: 4.0.3
 
-  /glob-parent/6.0.2:
+  /glob-parent@6.0.2:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
     dependencies:
       is-glob: 4.0.3
     dev: true
 
-  /glob-to-regexp/0.4.1:
+  /glob-to-regexp@0.4.1:
     resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
     dev: false
 
-  /glob/7.1.6:
+  /glob@7.1.6:
     resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==}
     dependencies:
       fs.realpath: 1.0.0
@@ -3647,7 +3709,7 @@ packages:
       path-is-absolute: 1.0.1
     dev: true
 
-  /glob/7.2.0:
+  /glob@7.2.0:
     resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==}
     dependencies:
       fs.realpath: 1.0.0
@@ -3657,7 +3719,7 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  /glob/9.2.1:
+  /glob@9.2.1:
     resolution: {integrity: sha512-Pxxgq3W0HyA3XUvSXcFhRSs+43Jsx0ddxcFrbjxNGkL2Ak5BAUBxLqI5G6ADDeCHLfzzXFhe0b1yYcctGmytMA==}
     engines: {node: '>=16 || 14 >=14.17'}
     dependencies:
@@ -3667,22 +3729,22 @@ packages:
       path-scurry: 1.6.1
     dev: true
 
-  /globals/11.12.0:
+  /globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
 
-  /globals/13.15.0:
+  /globals@13.15.0:
     resolution: {integrity: sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
     dev: true
 
-  /globalyzer/0.1.0:
+  /globalyzer@0.1.0:
     resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
     dev: true
 
-  /globby/11.1.0:
+  /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
     dependencies:
@@ -3694,7 +3756,7 @@ packages:
       slash: 3.0.0
     dev: true
 
-  /globby/13.1.2:
+  /globby@13.1.2:
     resolution: {integrity: sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
@@ -3705,133 +3767,135 @@ packages:
       slash: 4.0.0
     dev: true
 
-  /globrex/0.1.2:
+  /globrex@0.1.2:
     resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
 
-  /goober/2.1.10:
+  /goober@2.1.10(csstype@3.1.2):
     resolution: {integrity: sha512-7PpuQMH10jaTWm33sQgBQvz45pHR8N4l3Cu3WMGEWmHShAcTuuP7I+5/DwKo39fwti5A80WAjvqgz6SSlgWmGA==}
     peerDependencies:
       csstype: ^3.0.10
+    dependencies:
+      csstype: 3.1.2
     dev: false
 
-  /graceful-fs/4.2.10:
+  /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
-  /has-bigints/1.0.2:
+  /has-bigints@1.0.2:
     resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
     dev: true
 
-  /has-flag/3.0.0:
+  /has-flag@3.0.0:
     resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
     engines: {node: '>=4'}
 
-  /has-flag/4.0.0:
+  /has-flag@4.0.0:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
-  /has-property-descriptors/1.0.0:
+  /has-property-descriptors@1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
       get-intrinsic: 1.1.1
     dev: true
 
-  /has-symbols/1.0.3:
+  /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /has-tostringtag/1.0.0:
+  /has-tostringtag@1.0.0:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
     dev: true
 
-  /has/1.0.3:
+  /has@1.0.3:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
     dependencies:
       function-bind: 1.1.1
 
-  /history/5.3.0:
+  /history@5.3.0:
     resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==}
     dependencies:
       '@babel/runtime': 7.17.9
     dev: false
 
-  /hoist-non-react-statics/3.3.2:
+  /hoist-non-react-statics@3.3.2:
     resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
     dependencies:
       react-is: 16.13.1
 
-  /html-encoding-sniffer/3.0.0:
+  /html-encoding-sniffer@3.0.0:
     resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==}
     engines: {node: '>=12'}
     dependencies:
       whatwg-encoding: 2.0.0
     dev: true
 
-  /html-escaper/2.0.2:
+  /html-escaper@2.0.2:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
     dev: false
 
-  /http-proxy-agent/5.0.0:
+  /http-proxy-agent@5.0.0:
     resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
     engines: {node: '>= 6'}
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /https-proxy-agent/5.0.1:
+  /https-proxy-agent@5.0.1:
     resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
     engines: {node: '>= 6'}
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /human-signals/2.1.0:
+  /human-signals@2.1.0:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
     engines: {node: '>=10.17.0'}
     dev: false
 
-  /iconv-lite/0.4.24:
+  /iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
     dependencies:
       safer-buffer: 2.1.2
     dev: true
 
-  /iconv-lite/0.6.3:
+  /iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
     dependencies:
       safer-buffer: 2.1.2
     dev: true
 
-  /ieee754/1.2.1:
+  /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
     dev: true
 
-  /ignore/5.2.0:
+  /ignore@5.2.0:
     resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
     engines: {node: '>= 4'}
     dev: true
 
-  /immer/9.0.12:
+  /immer@9.0.12:
     resolution: {integrity: sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==}
     dev: false
 
-  /immutable/4.0.0:
+  /immutable@4.0.0:
     resolution: {integrity: sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==}
 
-  /import-fresh/3.3.0:
+  /import-fresh@3.3.0:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
     engines: {node: '>=6'}
     dependencies:
@@ -3839,7 +3903,7 @@ packages:
       resolve-from: 4.0.0
     dev: true
 
-  /import-local/3.1.0:
+  /import-local@3.1.0:
     resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==}
     engines: {node: '>=8'}
     hasBin: true
@@ -3848,25 +3912,25 @@ packages:
       resolve-cwd: 3.0.0
     dev: false
 
-  /imurmurhash/0.1.4:
+  /imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
 
-  /indent-string/4.0.0:
+  /indent-string@4.0.0:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
     engines: {node: '>=8'}
     dev: true
 
-  /inflight/1.0.6:
+  /inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     dependencies:
       once: 1.4.0
       wrappy: 1.0.2
 
-  /inherits/2.0.4:
+  /inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
-  /inquirer/8.2.2:
+  /inquirer@8.2.2:
     resolution: {integrity: sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==}
     engines: {node: '>=12.0.0'}
     dependencies:
@@ -3886,7 +3950,7 @@ packages:
       through: 2.3.8
     dev: true
 
-  /internal-slot/1.0.3:
+  /internal-slot@1.0.3:
     resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -3895,90 +3959,90 @@ packages:
       side-channel: 1.0.4
     dev: true
 
-  /is-arrayish/0.2.1:
+  /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
 
-  /is-bigint/1.0.2:
+  /is-bigint@1.0.2:
     resolution: {integrity: sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==}
     dev: true
 
-  /is-binary-path/2.1.0:
+  /is-binary-path@2.1.0:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
     dependencies:
       binary-extensions: 2.2.0
 
-  /is-boolean-object/1.1.1:
+  /is-boolean-object@1.1.1:
     resolution: {integrity: sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
     dev: true
 
-  /is-callable/1.2.4:
+  /is-callable@1.2.4:
     resolution: {integrity: sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-core-module/2.9.0:
+  /is-core-module@2.9.0:
     resolution: {integrity: sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==}
     dependencies:
       has: 1.0.3
 
-  /is-date-object/1.0.4:
+  /is-date-object@1.0.4:
     resolution: {integrity: sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-docker/2.2.1:
+  /is-docker@2.2.1:
     resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
     engines: {node: '>=8'}
     hasBin: true
     dev: true
 
-  /is-extglob/2.1.1:
+  /is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
 
-  /is-fullwidth-code-point/3.0.0:
+  /is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
-  /is-generator-fn/2.1.0:
+  /is-generator-fn@2.1.0:
     resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
     engines: {node: '>=6'}
     dev: false
 
-  /is-glob/4.0.3:
+  /is-glob@4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
     dependencies:
       is-extglob: 2.1.1
 
-  /is-interactive/1.0.0:
+  /is-interactive@1.0.0:
     resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
     engines: {node: '>=8'}
     dev: true
 
-  /is-negative-zero/2.0.2:
+  /is-negative-zero@2.0.2:
     resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-number-object/1.0.5:
+  /is-number-object@1.0.5:
     resolution: {integrity: sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-number/7.0.0:
+  /is-number@7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
-  /is-potential-custom-element-name/1.0.1:
+  /is-potential-custom-element-name@1.0.1:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
     dev: true
 
-  /is-regex/1.1.4:
+  /is-regex@1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -3986,62 +4050,62 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-shared-array-buffer/1.0.2:
+  /is-shared-array-buffer@1.0.2:
     resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
       call-bind: 1.0.2
     dev: true
 
-  /is-stream/2.0.1:
+  /is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
     dev: false
 
-  /is-string/1.0.7:
+  /is-string@1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-subset/0.1.1:
+  /is-subset@0.1.1:
     resolution: {integrity: sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==}
     dev: false
 
-  /is-symbol/1.0.4:
+  /is-symbol@1.0.4:
     resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
     dev: true
 
-  /is-unicode-supported/0.1.0:
+  /is-unicode-supported@0.1.0:
     resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
     engines: {node: '>=10'}
     dev: true
 
-  /is-weakref/1.0.2:
+  /is-weakref@1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
     dependencies:
       call-bind: 1.0.2
     dev: true
 
-  /is-wsl/2.2.0:
+  /is-wsl@2.2.0:
     resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
     engines: {node: '>=8'}
     dependencies:
       is-docker: 2.2.1
     dev: true
 
-  /isexe/2.0.0:
+  /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
-  /istanbul-lib-coverage/3.2.0:
+  /istanbul-lib-coverage@3.2.0:
     resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
     engines: {node: '>=8'}
     dev: false
 
-  /istanbul-lib-instrument/5.2.0:
+  /istanbul-lib-instrument@5.2.0:
     resolution: {integrity: sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==}
     engines: {node: '>=8'}
     dependencies:
@@ -4049,12 +4113,12 @@ packages:
       '@babel/parser': 7.18.9
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
-      semver: 6.3.0
+      semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /istanbul-lib-report/3.0.0:
+  /istanbul-lib-report@3.0.0:
     resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
     engines: {node: '>=8'}
     dependencies:
@@ -4063,18 +4127,18 @@ packages:
       supports-color: 7.2.0
     dev: false
 
-  /istanbul-lib-source-maps/4.0.1:
+  /istanbul-lib-source-maps@4.0.1:
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
     engines: {node: '>=10'}
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       istanbul-lib-coverage: 3.2.0
       source-map: 0.6.1
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /istanbul-reports/3.1.4:
+  /istanbul-reports@3.1.4:
     resolution: {integrity: sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==}
     engines: {node: '>=8'}
     dependencies:
@@ -4082,12 +4146,12 @@ packages:
       istanbul-lib-report: 3.0.0
     dev: false
 
-  /iterare/1.2.1:
+  /iterare@1.2.1:
     resolution: {integrity: sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==}
     engines: {node: '>=6'}
     dev: true
 
-  /jake/10.8.5:
+  /jake@10.8.5:
     resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
     engines: {node: '>=10'}
     hasBin: true
@@ -4098,7 +4162,7 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /jest-changed-files/29.5.0:
+  /jest-changed-files@29.5.0:
     resolution: {integrity: sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4106,7 +4170,7 @@ packages:
       p-limit: 3.1.0
     dev: false
 
-  /jest-circus/29.5.0:
+  /jest-circus@29.5.0:
     resolution: {integrity: sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4134,7 +4198,7 @@ packages:
       - supports-color
     dev: false
 
-  /jest-cli/29.5.0_6m7kcbkkzjz4ln6z66tlzx44we:
+  /jest-cli@29.5.0(@types/node@16.11.7)(ts-node@10.9.1):
     resolution: {integrity: sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -4144,14 +4208,14 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.5.0_ts-node@10.9.1
+      '@jest/core': 29.5.0(ts-node@10.9.1)
       '@jest/test-result': 29.5.0
       '@jest/types': 29.5.0
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.10
       import-local: 3.1.0
-      jest-config: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
+      jest-config: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
       jest-util: 29.5.0
       jest-validate: 29.5.0
       prompts: 2.4.2
@@ -4162,7 +4226,7 @@ packages:
       - ts-node
     dev: false
 
-  /jest-config/29.5.0_6m7kcbkkzjz4ln6z66tlzx44we:
+  /jest-config@29.5.0(@types/node@16.11.7)(ts-node@10.9.1):
     resolution: {integrity: sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -4178,7 +4242,7 @@ packages:
       '@jest/test-sequencer': 29.5.0
       '@jest/types': 29.5.0
       '@types/node': 16.11.7
-      babel-jest: 29.5.0_@babel+core@7.18.9
+      babel-jest: 29.5.0(@babel/core@7.18.9)
       chalk: 4.1.2
       ci-info: 3.3.1
       deepmerge: 4.2.2
@@ -4197,12 +4261,12 @@ packages:
       pretty-format: 29.5.0
       slash: 3.0.0
       strip-json-comments: 3.1.1
-      ts-node: 10.9.1_p45lmeymo45ge573kyxcus632u
+      ts-node: 10.9.1(@swc/core@1.3.38)(@types/node@16.11.7)(typescript@4.7.4)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /jest-diff/29.0.3:
+  /jest-diff@29.0.3:
     resolution: {integrity: sha512-+X/AIF5G/vX9fWK+Db9bi9BQas7M9oBME7egU7psbn4jlszLFCu0dW63UgeE6cs/GANq4fLaT+8sGHQQ0eCUfg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4211,7 +4275,7 @@ packages:
       jest-get-type: 29.4.3
       pretty-format: 29.5.0
 
-  /jest-diff/29.5.0:
+  /jest-diff@29.5.0:
     resolution: {integrity: sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4221,14 +4285,14 @@ packages:
       pretty-format: 29.5.0
     dev: false
 
-  /jest-docblock/29.4.3:
+  /jest-docblock@29.4.3:
     resolution: {integrity: sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       detect-newline: 3.1.0
     dev: false
 
-  /jest-each/29.5.0:
+  /jest-each@29.5.0:
     resolution: {integrity: sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4239,7 +4303,7 @@ packages:
       pretty-format: 29.5.0
     dev: false
 
-  /jest-environment-jsdom/29.5.0:
+  /jest-environment-jsdom@29.5.0:
     resolution: {integrity: sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -4262,7 +4326,7 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jest-environment-node/29.5.0:
+  /jest-environment-node@29.5.0:
     resolution: {integrity: sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4274,15 +4338,15 @@ packages:
       jest-util: 29.5.0
     dev: false
 
-  /jest-get-type/29.0.0:
+  /jest-get-type@29.0.0:
     resolution: {integrity: sha512-83X19z/HuLKYXYHskZlBAShO7UfLFXu/vWajw9ZNJASN32li8yHMaVGAQqxFW1RCFOkB7cubaL6FaJVQqqJLSw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /jest-get-type/29.4.3:
+  /jest-get-type@29.4.3:
     resolution: {integrity: sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /jest-haste-map/29.5.0:
+  /jest-haste-map@29.5.0:
     resolution: {integrity: sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4301,7 +4365,7 @@ packages:
       fsevents: 2.3.2
     dev: false
 
-  /jest-leak-detector/29.5.0:
+  /jest-leak-detector@29.5.0:
     resolution: {integrity: sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4309,7 +4373,7 @@ packages:
       pretty-format: 29.5.0
     dev: false
 
-  /jest-matcher-utils/29.0.3:
+  /jest-matcher-utils@29.0.3:
     resolution: {integrity: sha512-RsR1+cZ6p1hDV4GSCQTg+9qjeotQCgkaleIKLK7dm+U4V/H2bWedU3RAtLm8+mANzZ7eDV33dMar4pejd7047w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4318,7 +4382,7 @@ packages:
       jest-get-type: 29.0.0
       pretty-format: 29.5.0
 
-  /jest-matcher-utils/29.5.0:
+  /jest-matcher-utils@29.5.0:
     resolution: {integrity: sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4328,7 +4392,7 @@ packages:
       pretty-format: 29.5.0
     dev: false
 
-  /jest-message-util/29.0.3:
+  /jest-message-util@29.0.3:
     resolution: {integrity: sha512-7T8JiUTtDfppojosORAflABfLsLKMLkBHSWkjNQrjIltGoDzNGn7wEPOSfjqYAGTYME65esQzMJxGDjuLBKdOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4342,7 +4406,7 @@ packages:
       slash: 3.0.0
       stack-utils: 2.0.5
 
-  /jest-message-util/29.5.0:
+  /jest-message-util@29.5.0:
     resolution: {integrity: sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4356,7 +4420,7 @@ packages:
       slash: 3.0.0
       stack-utils: 2.0.5
 
-  /jest-mock/29.5.0:
+  /jest-mock@29.5.0:
     resolution: {integrity: sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4364,7 +4428,7 @@ packages:
       '@types/node': 16.11.7
       jest-util: 29.5.0
 
-  /jest-pnp-resolver/1.2.2_jest-resolve@29.5.0:
+  /jest-pnp-resolver@1.2.2(jest-resolve@29.5.0):
     resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
     engines: {node: '>=6'}
     peerDependencies:
@@ -4376,17 +4440,17 @@ packages:
       jest-resolve: 29.5.0
     dev: false
 
-  /jest-regex-util/29.0.0:
+  /jest-regex-util@29.0.0:
     resolution: {integrity: sha512-BV7VW7Sy0fInHWN93MMPtlClweYv2qrSCwfeFWmpribGZtQPWNvRSq9XOVgOEjU1iBGRKXUZil0o2AH7Iy9Lug==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: false
 
-  /jest-regex-util/29.4.3:
+  /jest-regex-util@29.4.3:
     resolution: {integrity: sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: false
 
-  /jest-resolve-dependencies/29.5.0:
+  /jest-resolve-dependencies@29.5.0:
     resolution: {integrity: sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4396,14 +4460,14 @@ packages:
       - supports-color
     dev: false
 
-  /jest-resolve/29.5.0:
+  /jest-resolve@29.5.0:
     resolution: {integrity: sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
       graceful-fs: 4.2.10
       jest-haste-map: 29.5.0
-      jest-pnp-resolver: 1.2.2_jest-resolve@29.5.0
+      jest-pnp-resolver: 1.2.2(jest-resolve@29.5.0)
       jest-util: 29.5.0
       jest-validate: 29.5.0
       resolve: 1.22.1
@@ -4411,7 +4475,7 @@ packages:
       slash: 3.0.0
     dev: false
 
-  /jest-runner/29.5.0:
+  /jest-runner@29.5.0:
     resolution: {integrity: sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4440,7 +4504,7 @@ packages:
       - supports-color
     dev: false
 
-  /jest-runtime/29.5.0:
+  /jest-runtime@29.5.0:
     resolution: {integrity: sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4470,14 +4534,14 @@ packages:
       - supports-color
     dev: false
 
-  /jest-snapshot/29.5.0:
+  /jest-snapshot@29.5.0:
     resolution: {integrity: sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/core': 7.18.9
       '@babel/generator': 7.18.9
-      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.18.9
-      '@babel/plugin-syntax-typescript': 7.17.12_@babel+core@7.18.9
+      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.18.9)
+      '@babel/plugin-syntax-typescript': 7.17.12(@babel/core@7.18.9)
       '@babel/traverse': 7.18.9
       '@babel/types': 7.18.9
       '@jest/expect-utils': 29.5.0
@@ -4485,7 +4549,7 @@ packages:
       '@jest/types': 29.5.0
       '@types/babel__traverse': 7.17.1
       '@types/prettier': 2.6.3
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.18.9
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.18.9)
       chalk: 4.1.2
       expect: 29.5.0
       graceful-fs: 4.2.10
@@ -4501,24 +4565,24 @@ packages:
       - supports-color
     dev: false
 
-  /jest-sonar-reporter/2.0.0:
+  /jest-sonar-reporter@2.0.0:
     resolution: {integrity: sha512-ZervDCgEX5gdUbdtWsjdipLN3bKJwpxbvhkYNXTAYvAckCihobSLr9OT/IuyNIRT1EZMDDwR6DroWtrq+IL64w==}
     engines: {node: '>=8.0.0'}
     dependencies:
       xml: 1.0.1
     dev: true
 
-  /jest-styled-components/7.1.1_styled-components@5.3.1:
+  /jest-styled-components@7.1.1(styled-components@5.3.1):
     resolution: {integrity: sha512-OUq31R5CivBF8oy81dnegNQrRW13TugMol/Dz6ZnFfEyo03exLASod7YGwyHGuayYlKmCstPtz0RQ1+NrAbIIA==}
     engines: {node: '>= 12'}
     peerDependencies:
       styled-components: '>= 5'
     dependencies:
       '@adobe/css-tools': 4.2.0
-      styled-components: 5.3.1_uuaz5p7xzfmtjacf6iqf7idnby
+      styled-components: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0)
     dev: true
 
-  /jest-util/29.0.3:
+  /jest-util@29.0.3:
     resolution: {integrity: sha512-Q0xaG3YRG8QiTC4R6fHjHQPaPpz9pJBEi0AeOE4mQh/FuWOijFjGXMMOfQEaU9i3z76cNR7FobZZUQnL6IyfdQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4529,7 +4593,7 @@ packages:
       graceful-fs: 4.2.10
       picomatch: 2.3.1
 
-  /jest-util/29.5.0:
+  /jest-util@29.5.0:
     resolution: {integrity: sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4540,7 +4604,7 @@ packages:
       graceful-fs: 4.2.10
       picomatch: 2.3.1
 
-  /jest-validate/29.5.0:
+  /jest-validate@29.5.0:
     resolution: {integrity: sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4552,7 +4616,7 @@ packages:
       pretty-format: 29.5.0
     dev: false
 
-  /jest-watch-typeahead/2.2.2_jest@29.5.0:
+  /jest-watch-typeahead@2.2.2(jest@29.5.0):
     resolution: {integrity: sha512-+QgOFW4o5Xlgd6jGS5X37i08tuuXNW8X0CV9WNFi+3n8ExCIP+E1melYhvYLjv5fE6D0yyzk74vsSO8I6GqtvQ==}
     engines: {node: ^14.17.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -4560,7 +4624,7 @@ packages:
     dependencies:
       ansi-escapes: 6.0.0
       chalk: 5.2.0
-      jest: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
+      jest: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
       jest-regex-util: 29.0.0
       jest-watcher: 29.0.3
       slash: 5.0.0
@@ -4568,7 +4632,7 @@ packages:
       strip-ansi: 7.0.1
     dev: false
 
-  /jest-watcher/29.0.3:
+  /jest-watcher@29.0.3:
     resolution: {integrity: sha512-tQX9lU91A+9tyUQKUMp0Ns8xAcdhC9fo73eqA3LFxP2bSgiF49TNcc+vf3qgGYYK9qRjFpXW9+4RgF/mbxyOOw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4582,7 +4646,7 @@ packages:
       string-length: 4.0.2
     dev: false
 
-  /jest-watcher/29.5.0:
+  /jest-watcher@29.5.0:
     resolution: {integrity: sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4596,7 +4660,7 @@ packages:
       string-length: 4.0.2
     dev: false
 
-  /jest-worker/29.5.0:
+  /jest-worker@29.5.0:
     resolution: {integrity: sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -4606,7 +4670,7 @@ packages:
       supports-color: 8.1.1
     dev: false
 
-  /jest/29.5.0_6m7kcbkkzjz4ln6z66tlzx44we:
+  /jest@29.5.0(@types/node@16.11.7)(ts-node@10.9.1):
     resolution: {integrity: sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -4616,20 +4680,20 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.5.0_ts-node@10.9.1
+      '@jest/core': 29.5.0(ts-node@10.9.1)
       '@jest/types': 29.5.0
       import-local: 3.1.0
-      jest-cli: 29.5.0_6m7kcbkkzjz4ln6z66tlzx44we
+      jest-cli: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
       - ts-node
     dev: false
 
-  /js-tokens/4.0.0:
+  /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
-  /js-yaml/3.14.1:
+  /js-yaml@3.14.1:
     resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
     hasBin: true
     dependencies:
@@ -4637,14 +4701,14 @@ packages:
       esprima: 4.0.1
     dev: false
 
-  /js-yaml/4.1.0:
+  /js-yaml@4.1.0:
     resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
     hasBin: true
     dependencies:
       argparse: 2.0.1
     dev: true
 
-  /jsdom/20.0.0:
+  /jsdom@20.0.0:
     resolution: {integrity: sha512-x4a6CKCgx00uCmP+QakBDFXwjAJ69IkkIWHmtmjd3wvXPcdOS44hfX2vqkOQrVrq8l9DhNNADZRXaCEWvgXtVA==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -4686,15 +4750,15 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jsesc/2.5.2:
+  /jsesc@2.5.2:
     resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
     engines: {node: '>=4'}
     hasBin: true
 
-  /json-parse-even-better-errors/2.3.1:
+  /json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
-  /json-schema-faker/0.5.0-rcv.44:
+  /json-schema-faker@0.5.0-rcv.44:
     resolution: {integrity: sha512-MbDxYFsPXTVMawW1Y6zEU7QhfwsT+ZJ2d+LI8n57Y8+Xw1Cdx1hITgsFTLNOJ1lDMHZqWeXGGgMbc1hW0BGisg==}
     hasBin: true
     dependencies:
@@ -4702,7 +4766,7 @@ packages:
       jsonpath-plus: 5.1.0
     dev: false
 
-  /json-schema-ref-parser/6.1.0:
+  /json-schema-ref-parser@6.1.0:
     resolution: {integrity: sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==}
     dependencies:
       call-me-maybe: 1.0.1
@@ -4710,35 +4774,35 @@ packages:
       ono: 4.0.11
     dev: false
 
-  /json-schema-traverse/0.4.1:
+  /json-schema-traverse@0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
     dev: true
 
-  /json-schema-traverse/1.0.0:
+  /json-schema-traverse@1.0.0:
     resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
     dev: false
 
-  /json-stable-stringify-without-jsonify/1.0.1:
+  /json-stable-stringify-without-jsonify@1.0.1:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
     dev: true
 
-  /json5/1.0.1:
+  /json5@1.0.1:
     resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==}
     hasBin: true
     dependencies:
       minimist: 1.2.6
     dev: true
 
-  /json5/2.2.1:
+  /json5@2.2.1:
     resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==}
     engines: {node: '>=6'}
     hasBin: true
 
-  /jsonc-parser/3.2.0:
+  /jsonc-parser@3.2.0:
     resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
     dev: true
 
-  /jsonfile/6.1.0:
+  /jsonfile@6.1.0:
     resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
     dependencies:
       universalify: 2.0.0
@@ -4746,17 +4810,17 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
-  /jsonpath-plus/5.1.0:
+  /jsonpath-plus@5.1.0:
     resolution: {integrity: sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ==}
     engines: {node: '>=10.0.0'}
     dev: false
 
-  /jsonpath-plus/7.2.0:
+  /jsonpath-plus@7.2.0:
     resolution: {integrity: sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==}
     engines: {node: '>=12.0.0'}
     dev: false
 
-  /jsx-ast-utils/3.3.0:
+  /jsx-ast-utils@3.3.0:
     resolution: {integrity: sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==}
     engines: {node: '>=4.0'}
     dependencies:
@@ -4764,27 +4828,27 @@ packages:
       object.assign: 4.1.2
     dev: true
 
-  /kleur/3.0.3:
+  /kleur@3.0.3:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
     dev: false
 
-  /language-subtag-registry/0.3.21:
+  /language-subtag-registry@0.3.21:
     resolution: {integrity: sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==}
     dev: true
 
-  /language-tags/1.0.5:
+  /language-tags@1.0.5:
     resolution: {integrity: sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==}
     dependencies:
       language-subtag-registry: 0.3.21
     dev: true
 
-  /leven/3.1.0:
+  /leven@3.1.0:
     resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
     engines: {node: '>=6'}
     dev: false
 
-  /levn/0.3.0:
+  /levn@0.3.0:
     resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -4792,7 +4856,7 @@ packages:
       type-check: 0.3.2
     dev: true
 
-  /levn/0.4.1:
+  /levn@0.4.1:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -4800,10 +4864,10 @@ packages:
       type-check: 0.4.0
     dev: true
 
-  /lines-and-columns/1.2.4:
+  /lines-and-columns@1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
-  /locate-path/2.0.0:
+  /locate-path@2.0.0:
     resolution: {integrity: sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==}
     engines: {node: '>=4'}
     dependencies:
@@ -4811,33 +4875,33 @@ packages:
       path-exists: 3.0.0
     dev: true
 
-  /locate-path/5.0.0:
+  /locate-path@5.0.0:
     resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
     engines: {node: '>=8'}
     dependencies:
       p-locate: 4.1.0
     dev: false
 
-  /lodash.get/4.4.2:
+  /lodash.get@4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: false
 
-  /lodash.isequal/4.5.0:
+  /lodash.isequal@4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
     dev: false
 
-  /lodash.merge/4.6.2:
+  /lodash.merge@4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
     dev: true
 
-  /lodash.sortby/4.7.0:
+  /lodash.sortby@4.7.0:
     resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
     dev: false
 
-  /lodash/4.17.21:
+  /lodash@4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
-  /log-symbols/4.1.0:
+  /log-symbols@4.1.0:
     resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
     engines: {node: '>=10'}
     dependencies:
@@ -4845,142 +4909,142 @@ packages:
       is-unicode-supported: 0.1.0
     dev: true
 
-  /loose-envify/1.4.0:
+  /loose-envify@1.4.0:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
     dependencies:
       js-tokens: 4.0.0
 
-  /lossless-json/2.0.8:
+  /lossless-json@2.0.8:
     resolution: {integrity: sha512-7/GaZldUc7H5oNZlSk6bF06cRbtA7oF8zWXwbfMZm8yrYC2debx0KvWTBbQIbj6fh08LsXTWg+YtHJshXgYKow==}
     dev: false
 
-  /lru-cache/6.0.0:
+  /lru-cache@6.0.0:
     resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
     engines: {node: '>=10'}
     dependencies:
       yallist: 4.0.0
 
-  /lru-cache/7.18.3:
+  /lru-cache@7.18.3:
     resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
     engines: {node: '>=12'}
     dev: true
 
-  /lz-string/1.4.4:
+  /lz-string@1.4.4:
     resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
     hasBin: true
 
-  /make-dir/3.1.0:
+  /make-dir@3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
     dependencies:
-      semver: 6.3.0
+      semver: 6.3.1
     dev: false
 
-  /make-error/1.3.6:
+  /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
 
-  /makeerror/1.0.12:
+  /makeerror@1.0.12:
     resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==}
     dependencies:
       tmpl: 1.0.5
     dev: false
 
-  /merge-stream/2.0.0:
+  /merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
     dev: false
 
-  /merge2/1.4.1:
+  /merge2@1.4.1:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
     dev: true
 
-  /micromatch/4.0.5:
+  /micromatch@4.0.5:
     resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
     engines: {node: '>=8.6'}
     dependencies:
       braces: 3.0.2
       picomatch: 2.3.1
 
-  /mime-db/1.52.0:
+  /mime-db@1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
     dev: true
 
-  /mime-types/2.1.35:
+  /mime-types@2.1.35:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
     dependencies:
       mime-db: 1.52.0
     dev: true
 
-  /mimic-fn/2.1.0:
+  /mimic-fn@2.1.0:
     resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
     engines: {node: '>=6'}
 
-  /min-indent/1.0.1:
+  /min-indent@1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
     dev: true
 
-  /minimatch/3.1.2:
+  /minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
       brace-expansion: 1.1.11
 
-  /minimatch/5.1.2:
+  /minimatch@5.1.2:
     resolution: {integrity: sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==}
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
     dev: true
 
-  /minimatch/7.4.2:
+  /minimatch@7.4.2:
     resolution: {integrity: sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==}
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
     dev: true
 
-  /minimist/1.2.6:
+  /minimist@1.2.6:
     resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==}
     dev: true
 
-  /minipass/4.2.4:
+  /minipass@4.2.4:
     resolution: {integrity: sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==}
     engines: {node: '>=8'}
     dev: true
 
-  /mkdirp/1.0.4:
+  /mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
     engines: {node: '>=10'}
     hasBin: true
     dev: true
 
-  /ms/2.0.0:
+  /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
     dev: true
 
-  /ms/2.1.2:
+  /ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
-  /ms/2.1.3:
+  /ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
     dev: true
 
-  /mute-stream/0.0.8:
+  /mute-stream@0.0.8:
     resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
     dev: true
 
-  /nanoid/3.3.4:
+  /nanoid@3.3.4:
     resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  /natural-compare/1.4.0:
+  /natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
-  /node-fetch/2.6.7:
+  /node-fetch@2.6.7:
     resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
     engines: {node: 4.x || >=6.0.0}
     peerDependencies:
@@ -4992,48 +5056,48 @@ packages:
       whatwg-url: 5.0.0
     dev: true
 
-  /node-int64/0.4.0:
+  /node-int64@0.4.0:
     resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
     dev: false
 
-  /node-releases/2.0.5:
+  /node-releases@2.0.5:
     resolution: {integrity: sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==}
     dev: false
 
-  /normalize-path/3.0.0:
+  /normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
 
-  /npm-run-path/4.0.1:
+  /npm-run-path@4.0.1:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     engines: {node: '>=8'}
     dependencies:
       path-key: 3.1.1
     dev: false
 
-  /nwsapi/2.2.0:
+  /nwsapi@2.2.0:
     resolution: {integrity: sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==}
     dev: true
 
-  /object-assign/4.1.1:
+  /object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
 
-  /object-hash/3.0.0:
+  /object-hash@3.0.0:
     resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
     engines: {node: '>= 6'}
     dev: true
 
-  /object-inspect/1.12.2:
+  /object-inspect@1.12.2:
     resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
     dev: true
 
-  /object-keys/1.1.1:
+  /object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
     dev: true
 
-  /object.assign/4.1.2:
+  /object.assign@4.1.2:
     resolution: {integrity: sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -5043,7 +5107,7 @@ packages:
       object-keys: 1.1.1
     dev: true
 
-  /object.entries/1.1.5:
+  /object.entries@1.1.5:
     resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -5052,7 +5116,7 @@ packages:
       es-abstract: 1.20.0
     dev: true
 
-  /object.fromentries/2.0.5:
+  /object.fromentries@2.0.5:
     resolution: {integrity: sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -5061,14 +5125,14 @@ packages:
       es-abstract: 1.20.0
     dev: true
 
-  /object.hasown/1.1.1:
+  /object.hasown@1.1.1:
     resolution: {integrity: sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==}
     dependencies:
       define-properties: 1.1.4
       es-abstract: 1.20.0
     dev: true
 
-  /object.values/1.1.5:
+  /object.values@1.1.5:
     resolution: {integrity: sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -5077,24 +5141,24 @@ packages:
       es-abstract: 1.20.0
     dev: true
 
-  /once/1.4.0:
+  /once@1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
       wrappy: 1.0.2
 
-  /onetime/5.1.2:
+  /onetime@5.1.2:
     resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
     engines: {node: '>=6'}
     dependencies:
       mimic-fn: 2.1.0
 
-  /ono/4.0.11:
+  /ono@4.0.11:
     resolution: {integrity: sha512-jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g==}
     dependencies:
       format-util: 1.0.5
     dev: false
 
-  /open/8.4.0:
+  /open@8.4.0:
     resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
     engines: {node: '>=12'}
     dependencies:
@@ -5103,7 +5167,7 @@ packages:
       is-wsl: 2.2.0
     dev: true
 
-  /optionator/0.8.3:
+  /optionator@0.8.3:
     resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -5115,7 +5179,7 @@ packages:
       word-wrap: 1.2.3
     dev: true
 
-  /optionator/0.9.1:
+  /optionator@0.9.1:
     resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
     engines: {node: '>= 0.8.0'}
     dependencies:
@@ -5127,7 +5191,7 @@ packages:
       word-wrap: 1.2.3
     dev: true
 
-  /ora/5.4.1:
+  /ora@5.4.1:
     resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -5142,64 +5206,64 @@ packages:
       wcwidth: 1.0.1
     dev: true
 
-  /os-tmpdir/1.0.2:
+  /os-tmpdir@1.0.2:
     resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /p-limit/1.3.0:
+  /p-limit@1.3.0:
     resolution: {integrity: sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==}
     engines: {node: '>=4'}
     dependencies:
       p-try: 1.0.0
     dev: true
 
-  /p-limit/2.3.0:
+  /p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
     engines: {node: '>=6'}
     dependencies:
       p-try: 2.2.0
     dev: false
 
-  /p-limit/3.1.0:
+  /p-limit@3.1.0:
     resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
     engines: {node: '>=10'}
     dependencies:
       yocto-queue: 0.1.0
     dev: false
 
-  /p-locate/2.0.0:
+  /p-locate@2.0.0:
     resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==}
     engines: {node: '>=4'}
     dependencies:
       p-limit: 1.3.0
     dev: true
 
-  /p-locate/4.1.0:
+  /p-locate@4.1.0:
     resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
     engines: {node: '>=8'}
     dependencies:
       p-limit: 2.3.0
     dev: false
 
-  /p-try/1.0.0:
+  /p-try@1.0.0:
     resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==}
     engines: {node: '>=4'}
     dev: true
 
-  /p-try/2.2.0:
+  /p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
     dev: false
 
-  /parent-module/1.0.1:
+  /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
     dependencies:
       callsites: 3.1.0
     dev: true
 
-  /parse-json/5.2.0:
+  /parse-json@5.2.0:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
     dependencies:
@@ -5208,43 +5272,43 @@ packages:
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
-  /parse-ms/2.1.0:
+  /parse-ms@2.1.0:
     resolution: {integrity: sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==}
     engines: {node: '>=6'}
     dev: false
 
-  /parse5/7.1.1:
+  /parse5@7.1.1:
     resolution: {integrity: sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==}
     dependencies:
       entities: 4.4.0
     dev: true
 
-  /path-browserify/1.0.1:
+  /path-browserify@1.0.1:
     resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
     dev: true
 
-  /path-exists/3.0.0:
+  /path-exists@3.0.0:
     resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /path-exists/4.0.0:
+  /path-exists@4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
     dev: false
 
-  /path-is-absolute/1.0.1:
+  /path-is-absolute@1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
 
-  /path-key/3.1.1:
+  /path-key@3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
 
-  /path-parse/1.0.7:
+  /path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  /path-scurry/1.6.1:
+  /path-scurry@1.6.1:
     resolution: {integrity: sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==}
     engines: {node: '>=14'}
     dependencies:
@@ -5252,42 +5316,42 @@ packages:
       minipass: 4.2.4
     dev: true
 
-  /path-to-regexp/2.4.0:
+  /path-to-regexp@2.4.0:
     resolution: {integrity: sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==}
     dev: false
 
-  /path-to-regexp/3.2.0:
+  /path-to-regexp@3.2.0:
     resolution: {integrity: sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA==}
     dev: true
 
-  /path-type/4.0.0:
+  /path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
     dev: true
 
-  /picocolors/1.0.0:
+  /picocolors@1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
 
-  /picomatch/2.3.1:
+  /picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
-  /pirates/4.0.5:
+  /pirates@4.0.5:
     resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
     engines: {node: '>= 6'}
     dev: false
 
-  /pkg-dir/4.2.0:
+  /pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
     dependencies:
       find-up: 4.1.0
     dev: false
 
-  /postcss-value-parser/4.1.0:
+  /postcss-value-parser@4.1.0:
     resolution: {integrity: sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==}
 
-  /postcss/8.4.20:
+  /postcss@8.4.20:
     resolution: {integrity: sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
@@ -5295,30 +5359,30 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
-  /prelude-ls/1.1.2:
+  /prelude-ls@1.1.2:
     resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /prelude-ls/1.2.1:
+  /prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
     dev: true
 
-  /prettier-linter-helpers/1.0.0:
+  /prettier-linter-helpers@1.0.0:
     resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       fast-diff: 1.2.0
     dev: true
 
-  /prettier/2.8.4:
+  /prettier@2.8.4:
     resolution: {integrity: sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     dev: true
 
-  /pretty-format/27.5.1:
+  /pretty-format@27.5.1:
     resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
@@ -5326,7 +5390,7 @@ packages:
       ansi-styles: 5.2.0
       react-is: 17.0.2
 
-  /pretty-format/29.0.3:
+  /pretty-format@29.0.3:
     resolution: {integrity: sha512-cHudsvQr1K5vNVLbvYF/nv3Qy/F/BcEKxGuIeMiVMRHxPOO1RxXooP8g/ZrwAp7Dx+KdMZoOc7NxLHhMrP2f9Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -5334,7 +5398,7 @@ packages:
       ansi-styles: 5.2.0
       react-is: 18.2.0
 
-  /pretty-format/29.5.0:
+  /pretty-format@29.5.0:
     resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
@@ -5342,14 +5406,14 @@ packages:
       ansi-styles: 5.2.0
       react-is: 18.2.0
 
-  /pretty-ms/7.0.1:
+  /pretty-ms@7.0.1:
     resolution: {integrity: sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==}
     engines: {node: '>=10'}
     dependencies:
       parse-ms: 2.1.0
     dev: false
 
-  /prompts/2.4.2:
+  /prompts@2.4.2:
     resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
     engines: {node: '>= 6'}
     dependencies:
@@ -5357,40 +5421,40 @@ packages:
       sisteransi: 1.0.5
     dev: false
 
-  /prop-types/15.8.1:
+  /prop-types@15.8.1:
     resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
     dependencies:
       loose-envify: 1.4.0
       object-assign: 4.1.1
       react-is: 16.13.1
 
-  /property-expr/2.0.5:
+  /property-expr@2.0.5:
     resolution: {integrity: sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==}
     dev: false
 
-  /psl/1.8.0:
+  /psl@1.8.0:
     resolution: {integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==}
     dev: true
 
-  /punycode/2.1.1:
+  /punycode@2.1.1:
     resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
     engines: {node: '>=6'}
 
-  /pure-rand/6.0.0:
+  /pure-rand@6.0.0:
     resolution: {integrity: sha512-rLSBxJjP+4DQOgcJAx6RZHT2he2pkhQdSnofG5VWyVl6GRq/K02ISOuOLcsMOrtKDIJb8JN2zm3FFzWNbezdPw==}
     dev: false
 
-  /querystring/0.2.1:
+  /querystring@0.2.1:
     resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==}
     engines: {node: '>=0.4.x'}
     deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
     dev: false
 
-  /queue-microtask/1.2.3:
+  /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
 
-  /react-ace/10.1.0_ef5jwxihqo6n7gxfmzogljlgcm:
+  /react-ace@10.1.0(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-VkvUjZNhdYTuKOKQpMIZi7uzZZVgzCjM7cLYu6F64V0mejY8a2XTyPUIMszC6A4trbeMIHbK5fYFcT/wkP/8VA==}
     peerDependencies:
       react: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0
@@ -5402,10 +5466,10 @@ packages:
       lodash.isequal: 4.5.0
       prop-types: 15.8.1
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
     dev: false
 
-  /react-datepicker/4.10.0_ef5jwxihqo6n7gxfmzogljlgcm:
+  /react-datepicker@4.10.0(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-6IfBCZyWj54ZZGLmEZJ9c4Yph0s9MVfEGDC2evOvf9AmVz+RRcfP2Czqad88Ff9wREbcbqa4dk7IFYeXF1d3Ag==}
     peerDependencies:
       react: ^16.9.0 || ^17 || ^18
@@ -5416,12 +5480,12 @@ packages:
       date-fns: 2.27.0
       prop-types: 15.8.1
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
-      react-onclickoutside: 6.12.2_ef5jwxihqo6n7gxfmzogljlgcm
-      react-popper: 2.3.0_7hirfqu277ous3575tvkbri6ie
+      react-dom: 18.1.0(react@18.1.0)
+      react-onclickoutside: 6.12.2(react-dom@18.1.0)(react@18.1.0)
+      react-popper: 2.3.0(@popperjs/core@2.9.2)(react-dom@18.1.0)(react@18.1.0)
     dev: false
 
-  /react-dom/18.1.0_react@18.1.0:
+  /react-dom@18.1.0(react@18.1.0):
     resolution: {integrity: sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==}
     peerDependencies:
       react: ^18.1.0
@@ -5430,7 +5494,7 @@ packages:
       react: 18.1.0
       scheduler: 0.22.0
 
-  /react-error-boundary/3.1.4_react@18.1.0:
+  /react-error-boundary@3.1.4(react@18.1.0):
     resolution: {integrity: sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==}
     engines: {node: '>=10', npm: '>=6'}
     peerDependencies:
@@ -5440,10 +5504,10 @@ packages:
       react: 18.1.0
     dev: false
 
-  /react-fast-compare/3.2.0:
+  /react-fast-compare@3.2.0:
     resolution: {integrity: sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==}
 
-  /react-hook-form/7.43.1_react@18.1.0:
+  /react-hook-form@7.43.1(react@18.1.0):
     resolution: {integrity: sha512-+s3+s8LLytRMriwwuSqeLStVjRXFGxgjjx2jED7Z+wz1J/88vpxieRQGvJVvzrzVxshZ0BRuocFERb779m2kNg==}
     engines: {node: '>=12.22.0'}
     peerDependencies:
@@ -5452,50 +5516,50 @@ packages:
       react: 18.1.0
     dev: false
 
-  /react-hot-toast/2.4.0_ef5jwxihqo6n7gxfmzogljlgcm:
+  /react-hot-toast@2.4.0(csstype@3.1.2)(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-qnnVbXropKuwUpriVVosgo8QrB+IaPJCpL8oBI6Ov84uvHZ5QQcTp2qg6ku2wNfgJl6rlQXJIQU5q+5lmPOutA==}
     engines: {node: '>=10'}
     peerDependencies:
       react: '>=16'
       react-dom: '>=16'
     dependencies:
-      goober: 2.1.10
+      goober: 2.1.10(csstype@3.1.2)
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
     transitivePeerDependencies:
       - csstype
     dev: false
 
-  /react-is/16.13.1:
+  /react-is@16.13.1:
     resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
 
-  /react-is/17.0.2:
+  /react-is@17.0.2:
     resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
 
-  /react-is/18.2.0:
+  /react-is@18.2.0:
     resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
 
-  /react-multi-select-component/4.3.3_ef5jwxihqo6n7gxfmzogljlgcm:
+  /react-multi-select-component@4.3.3(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-V8cDJC3M7F27PWv1baV8FpJReHa/SbpJGL80CmXwnlMkDK2KMlQSRDmDzBnmCjcbROIgoztdW+gYBpqo9BIF4g==}
     peerDependencies:
       react: ^16 || ^17 || ^18
       react-dom: ^16 || ^17 || ^18
     dependencies:
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
     dev: false
 
-  /react-onclickoutside/6.12.2_ef5jwxihqo6n7gxfmzogljlgcm:
+  /react-onclickoutside@6.12.2(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-NMXGa223OnsrGVp5dJHkuKxQ4czdLmXSp5jSV9OqiCky9LOpPATn3vLldc+q5fK3gKbEHvr7J1u0yhBh/xYkpA==}
     peerDependencies:
       react: ^15.5.x || ^16.x || ^17.x || ^18.x
       react-dom: ^15.5.x || ^16.x || ^17.x || ^18.x
     dependencies:
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
     dev: false
 
-  /react-popper/2.2.5_kse2oiarfsejvukvxwgibirnca:
+  /react-popper@2.2.5(@popperjs/core@2.9.2)(react@18.1.0):
     resolution: {integrity: sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==}
     peerDependencies:
       '@popperjs/core': ^2.0.0
@@ -5507,7 +5571,7 @@ packages:
       warning: 4.0.3
     dev: true
 
-  /react-popper/2.3.0_7hirfqu277ous3575tvkbri6ie:
+  /react-popper@2.3.0(@popperjs/core@2.9.2)(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==}
     peerDependencies:
       '@popperjs/core': ^2.0.0
@@ -5516,12 +5580,12 @@ packages:
     dependencies:
       '@popperjs/core': 2.9.2
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
       react-fast-compare: 3.2.0
       warning: 4.0.3
     dev: false
 
-  /react-redux/8.0.2_nfqigfgwurfoimtkde74cji6ga:
+  /react-redux@8.0.2(@types/react-dom@18.0.5)(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0)(redux@4.2.0):
     resolution: {integrity: sha512-nBwiscMw3NoP59NFCXFf02f8xdo+vSHT/uZ1ldDwF7XaTpzm+Phk97VT4urYBl5TYAPNVaFm12UHAEyzkpNzRA==}
     peerDependencies:
       '@types/react': ^16.8 || ^17.0 || ^18.0
@@ -5549,13 +5613,13 @@ packages:
       '@types/use-sync-external-store': 0.0.3
       hoist-non-react-statics: 3.3.2
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
       react-is: 18.2.0
       redux: 4.2.0
-      use-sync-external-store: 1.2.0_react@18.1.0
+      use-sync-external-store: 1.2.0(react@18.1.0)
     dev: false
 
-  /react-router-dom/6.3.0_ef5jwxihqo6n7gxfmzogljlgcm:
+  /react-router-dom@6.3.0(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==}
     peerDependencies:
       react: '>=16.8'
@@ -5563,11 +5627,11 @@ packages:
     dependencies:
       history: 5.3.0
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
-      react-router: 6.3.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
+      react-router: 6.3.0(react@18.1.0)
     dev: false
 
-  /react-router/6.3.0_react@18.1.0:
+  /react-router@6.3.0(react@18.1.0):
     resolution: {integrity: sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==}
     peerDependencies:
       react: '>=16.8'
@@ -5576,23 +5640,23 @@ packages:
       react: 18.1.0
     dev: false
 
-  /react-transition-state/1.1.5_ef5jwxihqo6n7gxfmzogljlgcm:
+  /react-transition-state@1.1.5(react-dom@18.1.0)(react@18.1.0):
     resolution: {integrity: sha512-ITY2mZqc2dWG2eitJkYNdcSFW8aKeOlkL2A/vowRrLL8GH3J6Re/SpD/BLvQzrVOTqjsP0b5S9N10vgNNzwMUQ==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
     dependencies:
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
     dev: false
 
-  /react/18.1.0:
+  /react@18.1.0:
     resolution: {integrity: sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       loose-envify: 1.4.0
 
-  /readable-stream/3.6.0:
+  /readable-stream@3.6.0:
     resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
     engines: {node: '>= 6'}
     dependencies:
@@ -5601,13 +5665,13 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /readdirp/3.6.0:
+  /readdirp@3.6.0:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
     dependencies:
       picomatch: 2.3.1
 
-  /redent/3.0.0:
+  /redent@3.0.0:
     resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
     engines: {node: '>=8'}
     dependencies:
@@ -5615,7 +5679,7 @@ packages:
       strip-indent: 3.0.0
     dev: true
 
-  /redux-thunk/2.4.1_redux@4.2.0:
+  /redux-thunk@2.4.1(redux@4.2.0):
     resolution: {integrity: sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==}
     peerDependencies:
       redux: ^4
@@ -5623,20 +5687,20 @@ packages:
       redux: 4.2.0
     dev: false
 
-  /redux/4.2.0:
+  /redux@4.2.0:
     resolution: {integrity: sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==}
     dependencies:
       '@babel/runtime': 7.17.9
     dev: false
 
-  /reflect-metadata/0.1.13:
+  /reflect-metadata@0.1.13:
     resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==}
     dev: true
 
-  /regenerator-runtime/0.13.7:
+  /regenerator-runtime@0.13.7:
     resolution: {integrity: sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==}
 
-  /regexp.prototype.flags/1.4.3:
+  /regexp.prototype.flags@1.4.3:
     resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
     engines: {node: '>= 0.4'}
     dependencies:
@@ -5645,52 +5709,52 @@ packages:
       functions-have-names: 1.2.3
     dev: true
 
-  /regexpp/3.2.0:
+  /regexpp@3.2.0:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
     engines: {node: '>=8'}
     dev: true
 
-  /require-directory/2.1.1:
+  /require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
 
-  /require-from-string/2.0.2:
+  /require-from-string@2.0.2:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /requireindex/1.2.0:
+  /requireindex@1.2.0:
     resolution: {integrity: sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==}
     engines: {node: '>=0.10.5'}
     dev: true
 
-  /reselect/4.1.5:
+  /reselect@4.1.5:
     resolution: {integrity: sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==}
     dev: false
 
-  /resolve-cwd/3.0.0:
+  /resolve-cwd@3.0.0:
     resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
     engines: {node: '>=8'}
     dependencies:
       resolve-from: 5.0.0
     dev: false
 
-  /resolve-from/4.0.0:
+  /resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
     dev: true
 
-  /resolve-from/5.0.0:
+  /resolve-from@5.0.0:
     resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
     engines: {node: '>=8'}
     dev: false
 
-  /resolve.exports/2.0.1:
+  /resolve.exports@2.0.1:
     resolution: {integrity: sha512-OEJWVeimw8mgQuj3HfkNl4KqRevH7lzeQNaWRPfx0PPse7Jk6ozcsG4FKVgtzDsC1KUF+YlTHh17NcgHOPykLw==}
     engines: {node: '>=10'}
     dev: false
 
-  /resolve/1.22.0:
+  /resolve@1.22.0:
     resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==}
     hasBin: true
     dependencies:
@@ -5699,7 +5763,7 @@ packages:
       supports-preserve-symlinks-flag: 1.0.0
     dev: true
 
-  /resolve/1.22.1:
+  /resolve@1.22.1:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
     dependencies:
@@ -5707,14 +5771,14 @@ packages:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  /resolve/2.0.0-next.3:
+  /resolve@2.0.0-next.3:
     resolution: {integrity: sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==}
     dependencies:
       is-core-module: 2.9.0
       path-parse: 1.0.7
     dev: true
 
-  /restore-cursor/3.1.0:
+  /restore-cursor@3.1.0:
     resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
     engines: {node: '>=8'}
     dependencies:
@@ -5722,19 +5786,19 @@ packages:
       signal-exit: 3.0.7
     dev: true
 
-  /reusify/1.0.4:
+  /reusify@1.0.4:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
     dev: true
 
-  /rimraf/3.0.2:
+  /rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
     hasBin: true
     dependencies:
       glob: 7.2.0
     dev: true
 
-  /rimraf/4.3.1:
+  /rimraf@4.3.1:
     resolution: {integrity: sha512-GfHJHBzFQra23IxDzIdBqhOWfbtdgS1/dCHrDy+yvhpoJY5TdwdT28oWaHWfRpKFDLd3GZnGTx6Mlt4+anbsxQ==}
     engines: {node: '>=14'}
     hasBin: true
@@ -5742,50 +5806,50 @@ packages:
       glob: 9.2.1
     dev: true
 
-  /rollup/3.7.3:
+  /rollup@3.7.3:
     resolution: {integrity: sha512-7e68MQbAWCX6mI4/0lG1WHd+NdNAlVamg0Zkd+8LZ/oXojligdGnCNyHlzXqXCZObyjs5FRc3AH0b17iJESGIQ==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
       fsevents: 2.3.2
 
-  /run-async/2.4.1:
+  /run-async@2.4.1:
     resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
     engines: {node: '>=0.12.0'}
     dev: true
 
-  /run-parallel/1.2.0:
+  /run-parallel@1.2.0:
     resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
     dependencies:
       queue-microtask: 1.2.3
     dev: true
 
-  /rxjs/6.6.7:
+  /rxjs@6.6.7:
     resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==}
     engines: {npm: '>=2.0.0'}
     dependencies:
       tslib: 1.13.0
     dev: true
 
-  /rxjs/7.5.5:
+  /rxjs@7.5.5:
     resolution: {integrity: sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==}
     dependencies:
       tslib: 2.4.0
     dev: true
 
-  /safe-buffer/5.1.2:
+  /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
     dev: false
 
-  /safe-buffer/5.2.1:
+  /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: true
 
-  /safer-buffer/2.1.2:
+  /safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
     dev: true
 
-  /sass/1.52.3:
+  /sass@1.52.3:
     resolution: {integrity: sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==}
     engines: {node: '>=12.0.0'}
     hasBin: true
@@ -5794,43 +5858,43 @@ packages:
       immutable: 4.0.0
       source-map-js: 1.0.2
 
-  /saxes/6.0.0:
+  /saxes@6.0.0:
     resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
     engines: {node: '>=v12.22.7'}
     dependencies:
       xmlchars: 2.2.0
     dev: true
 
-  /scheduler/0.22.0:
+  /scheduler@0.22.0:
     resolution: {integrity: sha512-6QAm1BgQI88NPYymgGQLCZgvep4FyePDWFpXVK+zNSUgHwlqpJy8VEh8Et0KxTACS4VWwMousBElAZOH9nkkoQ==}
     dependencies:
       loose-envify: 1.4.0
 
-  /semver/6.3.0:
-    resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==}
+  /semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
 
-  /semver/7.3.7:
+  /semver@7.3.7:
     resolution: {integrity: sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
 
-  /shallowequal/1.1.0:
+  /shallowequal@1.1.0:
     resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
 
-  /shebang-command/2.0.0:
+  /shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
     dependencies:
       shebang-regex: 3.0.0
 
-  /shebang-regex/3.0.0:
+  /shebang-regex@3.0.0:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
-  /side-channel/1.0.4:
+  /side-channel@1.0.4:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
       call-bind: 1.0.2
@@ -5838,57 +5902,57 @@ packages:
       object-inspect: 1.12.2
     dev: true
 
-  /signal-exit/3.0.7:
+  /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
-  /sisteransi/1.0.5:
+  /sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
     dev: false
 
-  /slash/3.0.0:
+  /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
 
-  /slash/4.0.0:
+  /slash@4.0.0:
     resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
     engines: {node: '>=12'}
     dev: true
 
-  /slash/5.0.0:
+  /slash@5.0.0:
     resolution: {integrity: sha512-n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ==}
     engines: {node: '>=14.16'}
     dev: false
 
-  /source-map-js/1.0.2:
+  /source-map-js@1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
 
-  /source-map-support/0.5.13:
+  /source-map-support@0.5.13:
     resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==}
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
     dev: false
 
-  /source-map/0.6.1:
+  /source-map@0.6.1:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
-  /spawn-command/0.0.2-1:
+  /spawn-command@0.0.2-1:
     resolution: {integrity: sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==}
     dev: true
 
-  /sprintf-js/1.0.3:
+  /sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
     dev: false
 
-  /stack-utils/2.0.5:
+  /stack-utils@2.0.5:
     resolution: {integrity: sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==}
     engines: {node: '>=10'}
     dependencies:
       escape-string-regexp: 2.0.0
 
-  /string-length/4.0.2:
+  /string-length@4.0.2:
     resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
     engines: {node: '>=10'}
     dependencies:
@@ -5896,7 +5960,7 @@ packages:
       strip-ansi: 6.0.1
     dev: false
 
-  /string-length/5.0.1:
+  /string-length@5.0.1:
     resolution: {integrity: sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==}
     engines: {node: '>=12.20'}
     dependencies:
@@ -5904,7 +5968,7 @@ packages:
       strip-ansi: 7.0.1
     dev: false
 
-  /string-width/4.2.3:
+  /string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
     dependencies:
@@ -5912,7 +5976,7 @@ packages:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
-  /string.prototype.matchall/4.0.7:
+  /string.prototype.matchall@4.0.7:
     resolution: {integrity: sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==}
     dependencies:
       call-bind: 1.0.2
@@ -5925,7 +5989,7 @@ packages:
       side-channel: 1.0.4
     dev: true
 
-  /string.prototype.trimend/1.0.5:
+  /string.prototype.trimend@1.0.5:
     resolution: {integrity: sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==}
     dependencies:
       call-bind: 1.0.2
@@ -5933,7 +5997,7 @@ packages:
       es-abstract: 1.20.0
     dev: true
 
-  /string.prototype.trimstart/1.0.5:
+  /string.prototype.trimstart@1.0.5:
     resolution: {integrity: sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==}
     dependencies:
       call-bind: 1.0.2
@@ -5941,52 +6005,52 @@ packages:
       es-abstract: 1.20.0
     dev: true
 
-  /string_decoder/1.3.0:
+  /string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
       safe-buffer: 5.2.1
     dev: true
 
-  /strip-ansi/6.0.1:
+  /strip-ansi@6.0.1:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
     dependencies:
       ansi-regex: 5.0.1
 
-  /strip-ansi/7.0.1:
+  /strip-ansi@7.0.1:
     resolution: {integrity: sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==}
     engines: {node: '>=12'}
     dependencies:
       ansi-regex: 6.0.1
     dev: false
 
-  /strip-bom/3.0.0:
+  /strip-bom@3.0.0:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
     engines: {node: '>=4'}
     dev: true
 
-  /strip-bom/4.0.0:
+  /strip-bom@4.0.0:
     resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
     engines: {node: '>=8'}
     dev: false
 
-  /strip-final-newline/2.0.0:
+  /strip-final-newline@2.0.0:
     resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
     engines: {node: '>=6'}
     dev: false
 
-  /strip-indent/3.0.0:
+  /strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
     dependencies:
       min-indent: 1.0.1
     dev: true
 
-  /strip-json-comments/3.1.1:
+  /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  /styled-components/5.3.1_uuaz5p7xzfmtjacf6iqf7idnby:
+  /styled-components@5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0):
     resolution: {integrity: sha512-JThv2JRzyH0NOIURrk9iskdxMSAAtCfj/b2Sf1WJaCUsloQkblepy1jaCLX/bYE+mhYo3unmwVSI9I5d9ncSiQ==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -5995,46 +6059,46 @@ packages:
       react-is: '>= 16.8.0'
     dependencies:
       '@babel/helper-module-imports': 7.16.7
-      '@babel/traverse': 7.18.2_supports-color@5.5.0
+      '@babel/traverse': 7.18.2(supports-color@5.5.0)
       '@emotion/is-prop-valid': 0.8.8
       '@emotion/stylis': 0.8.5
       '@emotion/unitless': 0.7.5
-      babel-plugin-styled-components: 1.13.2_styled-components@5.3.1
+      babel-plugin-styled-components: 1.13.2(styled-components@5.3.1)
       css-to-react-native: 3.0.0
       hoist-non-react-statics: 3.3.2
       react: 18.1.0
-      react-dom: 18.1.0_react@18.1.0
+      react-dom: 18.1.0(react@18.1.0)
       react-is: 18.2.0
       shallowequal: 1.1.0
       supports-color: 5.5.0
 
-  /supports-color/5.5.0:
+  /supports-color@5.5.0:
     resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
     engines: {node: '>=4'}
     dependencies:
       has-flag: 3.0.0
 
-  /supports-color/7.2.0:
+  /supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
     dependencies:
       has-flag: 4.0.0
 
-  /supports-color/8.1.1:
+  /supports-color@8.1.1:
     resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
     engines: {node: '>=10'}
     dependencies:
       has-flag: 4.0.0
 
-  /supports-preserve-symlinks-flag/1.0.0:
+  /supports-preserve-symlinks-flag@1.0.0:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
-  /symbol-tree/3.2.4:
+  /symbol-tree@3.2.4:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
     dev: true
 
-  /synckit/0.8.1:
+  /synckit@0.8.1:
     resolution: {integrity: sha512-rJEeygO5PNmcZICmrgnbOd2usi5zWE1ESc0Gn5tTmJlongoU8zCTwMFQtar2UgMSiR68vK9afPQ+uVs2lURSIA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     dependencies:
@@ -6042,16 +6106,16 @@ packages:
       tslib: 2.4.0
     dev: true
 
-  /tabbable/6.1.1:
+  /tabbable@6.1.1:
     resolution: {integrity: sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==}
     dev: false
 
-  /tapable/2.2.1:
+  /tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
     engines: {node: '>=6'}
     dev: true
 
-  /test-exclude/6.0.0:
+  /test-exclude@6.0.0:
     resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
     engines: {node: '>=8'}
     dependencies:
@@ -6060,51 +6124,51 @@ packages:
       minimatch: 3.1.2
     dev: false
 
-  /text-table/0.2.0:
+  /text-table@0.2.0:
     resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
     dev: true
 
-  /through/2.3.8:
+  /through@2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
     dev: true
 
-  /tiny-case/1.0.3:
+  /tiny-case@1.0.3:
     resolution: {integrity: sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==}
     dev: false
 
-  /tiny-glob/0.2.9:
+  /tiny-glob@0.2.9:
     resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
     dependencies:
       globalyzer: 0.1.0
       globrex: 0.1.2
     dev: true
 
-  /tmp/0.0.33:
+  /tmp@0.0.33:
     resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
     engines: {node: '>=0.6.0'}
     dependencies:
       os-tmpdir: 1.0.2
     dev: true
 
-  /tmpl/1.0.5:
+  /tmpl@1.0.5:
     resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
     dev: false
 
-  /to-fast-properties/2.0.0:
+  /to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
 
-  /to-regex-range/5.0.1:
+  /to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
     dependencies:
       is-number: 7.0.0
 
-  /toposort/2.0.2:
+  /toposort@2.0.2:
     resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
     dev: false
 
-  /tough-cookie/4.0.0:
+  /tough-cookie@4.0.0:
     resolution: {integrity: sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==}
     engines: {node: '>=6'}
     dependencies:
@@ -6113,41 +6177,41 @@ packages:
       universalify: 0.1.2
     dev: true
 
-  /tr46/0.0.3:
+  /tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
     dev: true
 
-  /tr46/1.0.1:
+  /tr46@1.0.1:
     resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
     dependencies:
       punycode: 2.1.1
     dev: false
 
-  /tr46/3.0.0:
+  /tr46@3.0.0:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
     dependencies:
       punycode: 2.1.1
     dev: true
 
-  /tree-kill/1.2.2:
+  /tree-kill@1.2.2:
     resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
     dev: true
 
-  /true-myth/4.1.1:
+  /true-myth@4.1.1:
     resolution: {integrity: sha512-rqy30BSpxPznbbTcAcci90oZ1YR4DqvKcNXNerG5gQBU2v4jk0cygheiul5J6ExIMrgDVuanv/MkGfqZbKrNNg==}
     engines: {node: 10.* || >= 12.*}
     dev: true
 
-  /ts-morph/13.0.3:
+  /ts-morph@13.0.3:
     resolution: {integrity: sha512-pSOfUMx8Ld/WUreoSzvMFQG5i9uEiWIsBYjpU9+TTASOeUa89j5HykomeqVULm1oqWtBdleI3KEFRLrlA3zGIw==}
     dependencies:
       '@ts-morph/common': 0.12.3
       code-block-writer: 11.0.1
     dev: true
 
-  /ts-node/10.9.1_p45lmeymo45ge573kyxcus632u:
+  /ts-node@10.9.1(@swc/core@1.3.38)(@types/node@16.11.7)(typescript@4.7.4):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -6178,7 +6242,7 @@ packages:
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
-  /ts-prune/0.10.3:
+  /ts-prune@0.10.3:
     resolution: {integrity: sha512-iS47YTbdIcvN8Nh/1BFyziyUqmjXz7GVzWu02RaZXqb+e/3Qe1B7IQ4860krOeCGUeJmterAlaM2FRH0Ue0hjw==}
     hasBin: true
     dependencies:
@@ -6190,7 +6254,7 @@ packages:
       ts-morph: 13.0.3
     dev: true
 
-  /tsconfck/2.0.1_typescript@4.7.4:
+  /tsconfck@2.0.1(typescript@4.7.4):
     resolution: {integrity: sha512-/ipap2eecmVBmBlsQLBRbUmUNFwNJV/z2E+X0FPtHNjPwroMZQ7m39RMaCywlCulBheYXgMdUlWDd9rzxwMA0Q==}
     engines: {node: ^14.13.1 || ^16 || >=18, pnpm: ^7.0.1}
     hasBin: true
@@ -6203,7 +6267,7 @@ packages:
       typescript: 4.7.4
     dev: false
 
-  /tsconfig-paths/3.14.1:
+  /tsconfig-paths@3.14.1:
     resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
     dependencies:
       '@types/json5': 0.0.29
@@ -6212,22 +6276,22 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /tslib/1.13.0:
+  /tslib@1.13.0:
     resolution: {integrity: sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==}
     dev: true
 
-  /tslib/2.0.3:
+  /tslib@2.0.3:
     resolution: {integrity: sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==}
     dev: true
 
-  /tslib/2.3.1:
+  /tslib@2.3.1:
     resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==}
     dev: true
 
-  /tslib/2.4.0:
+  /tslib@2.4.0:
     resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
 
-  /tsutils/3.21.0_typescript@4.7.4:
+  /tsutils@3.21.0(typescript@4.7.4):
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
     peerDependencies:
@@ -6237,49 +6301,49 @@ packages:
       typescript: 4.7.4
     dev: true
 
-  /type-check/0.3.2:
+  /type-check@0.3.2:
     resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.1.2
     dev: true
 
-  /type-check/0.4.0:
+  /type-check@0.4.0:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       prelude-ls: 1.2.1
     dev: true
 
-  /type-detect/4.0.8:
+  /type-detect@4.0.8:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
 
-  /type-fest/0.20.2:
+  /type-fest@0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
     engines: {node: '>=10'}
     dev: true
 
-  /type-fest/0.21.3:
+  /type-fest@0.21.3:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
 
-  /type-fest/2.19.0:
+  /type-fest@2.19.0:
     resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
     engines: {node: '>=12.20'}
     dev: false
 
-  /type-fest/3.6.1:
+  /type-fest@3.6.1:
     resolution: {integrity: sha512-htXWckxlT6U4+ilVgweNliPqlsVSSucbxVexRYllyMVJDtf5rTjv6kF/s+qAd4QSL1BZcnJPEJavYBPQiWuZDA==}
     engines: {node: '>=14.16'}
     dev: false
 
-  /typescript/4.7.4:
+  /typescript@4.7.4:
     resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==}
     engines: {node: '>=4.2.0'}
     hasBin: true
 
-  /unbox-primitive/1.0.2:
+  /unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
       call-bind: 1.0.2
@@ -6288,22 +6352,22 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
-  /universalify/0.1.2:
+  /universalify@0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
     dev: true
 
-  /universalify/2.0.0:
+  /universalify@2.0.0:
     resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /uri-js/4.4.1:
+  /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
       punycode: 2.1.1
 
-  /use-debounce/9.0.3_react@18.1.0:
+  /use-debounce@9.0.3(react@18.1.0):
     resolution: {integrity: sha512-FhtlbDtDXILJV7Lix5OZj5yX/fW1tzq+VrvK1fnT2bUrPOGruU9Rw8NCEn+UI9wopfERBEZAOQ8lfeCJPllgnw==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
@@ -6312,7 +6376,7 @@ packages:
       react: 18.1.0
     dev: false
 
-  /use-sync-external-store/1.2.0_react@18.1.0:
+  /use-sync-external-store@1.2.0(react@18.1.0):
     resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -6320,23 +6384,23 @@ packages:
       react: 18.1.0
     dev: false
 
-  /util-deprecate/1.0.2:
+  /util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: true
 
-  /uuid/8.3.2:
+  /uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
     hasBin: true
     dev: true
 
-  /v8-compile-cache-lib/3.0.1:
+  /v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
-  /v8-compile-cache/2.3.0:
+  /v8-compile-cache@2.3.0:
     resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
     dev: true
 
-  /v8-to-istanbul/9.0.1:
+  /v8-to-istanbul@9.0.1:
     resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
     engines: {node: '>=10.12.0'}
     dependencies:
@@ -6345,27 +6409,27 @@ packages:
       convert-source-map: 1.7.0
     dev: false
 
-  /vite-plugin-ejs/1.6.4:
+  /vite-plugin-ejs@1.6.4:
     resolution: {integrity: sha512-23p1RS4PiA0veXY5/gHZ60pl3pPvd8NEqdBsDgxNK8nM1rjFFDcVb0paNmuipzCgNP/Y0f/Id22M7Il4kvZ2jA==}
     dependencies:
       ejs: 3.1.8
     dev: true
 
-  /vite-tsconfig-paths/4.0.2_eqmiqdrctagsk5ranq2vs4ssty:
+  /vite-tsconfig-paths@4.0.2(typescript@4.7.4)(vite@4.0.0):
     resolution: {integrity: sha512-UzU8zwbCQrdUkj/Z0tnh293n4ScRcjJLoS8nPme2iB2FHoU5q8rhilb7AbhLlUC1uv4t6jSzVWnENjPnyGseeQ==}
     peerDependencies:
       vite: '>2.0.0-0'
     dependencies:
-      debug: 4.3.4
+      debug: 4.3.4(supports-color@5.5.0)
       globrex: 0.1.2
-      tsconfck: 2.0.1_typescript@4.7.4
-      vite: 4.0.0_binvsr2w2vzqveeue6ibz2djda
+      tsconfck: 2.0.1(typescript@4.7.4)
+      vite: 4.0.0(@types/node@16.11.7)(sass@1.52.3)
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: false
 
-  /vite/4.0.0_binvsr2w2vzqveeue6ibz2djda:
+  /vite@4.0.0(@types/node@16.11.7)(sass@1.52.3):
     resolution: {integrity: sha512-ynad+4kYs8Jcnn8J7SacS9vAbk7eMy0xWg6E7bAhS1s79TK+D7tVFGXVZ55S7RNLRROU1rxoKlvZ/qjaB41DGA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -6399,67 +6463,67 @@ packages:
     optionalDependencies:
       fsevents: 2.3.2
 
-  /w3c-hr-time/1.0.2:
+  /w3c-hr-time@1.0.2:
     resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==}
     deprecated: Use your platform's native performance.now() and performance.timeOrigin.
     dependencies:
       browser-process-hrtime: 1.0.0
     dev: true
 
-  /w3c-xmlserializer/3.0.0:
+  /w3c-xmlserializer@3.0.0:
     resolution: {integrity: sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==}
     engines: {node: '>=12'}
     dependencies:
       xml-name-validator: 4.0.0
     dev: true
 
-  /walker/1.0.8:
+  /walker@1.0.8:
     resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
     dependencies:
       makeerror: 1.0.12
     dev: false
 
-  /warning/4.0.3:
+  /warning@4.0.3:
     resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
     dependencies:
       loose-envify: 1.4.0
 
-  /wcwidth/1.0.1:
+  /wcwidth@1.0.1:
     resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
     dependencies:
       defaults: 1.0.3
     dev: true
 
-  /webidl-conversions/3.0.1:
+  /webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
     dev: true
 
-  /webidl-conversions/4.0.2:
+  /webidl-conversions@4.0.2:
     resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
     dev: false
 
-  /webidl-conversions/7.0.0:
+  /webidl-conversions@7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
     dev: true
 
-  /whatwg-encoding/2.0.0:
+  /whatwg-encoding@2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
     dependencies:
       iconv-lite: 0.6.3
     dev: true
 
-  /whatwg-fetch/3.6.2:
+  /whatwg-fetch@3.6.2:
     resolution: {integrity: sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==}
     dev: false
 
-  /whatwg-mimetype/3.0.0:
+  /whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
     dev: true
 
-  /whatwg-url/11.0.0:
+  /whatwg-url@11.0.0:
     resolution: {integrity: sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==}
     engines: {node: '>=12'}
     dependencies:
@@ -6467,14 +6531,14 @@ packages:
       webidl-conversions: 7.0.0
     dev: true
 
-  /whatwg-url/5.0.0:
+  /whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
     dev: true
 
-  /whatwg-url/6.5.0:
+  /whatwg-url@6.5.0:
     resolution: {integrity: sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==}
     dependencies:
       lodash.sortby: 4.7.0
@@ -6482,7 +6546,7 @@ packages:
       webidl-conversions: 4.0.2
     dev: false
 
-  /which-boxed-primitive/1.0.2:
+  /which-boxed-primitive@1.0.2:
     resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
     dependencies:
       is-bigint: 1.0.2
@@ -6492,19 +6556,19 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
-  /which/2.0.2:
+  /which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}
     hasBin: true
     dependencies:
       isexe: 2.0.0
 
-  /word-wrap/1.2.3:
+  /word-wrap@1.2.3:
     resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /wrap-ansi/7.0.0:
+  /wrap-ansi@7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
     dependencies:
@@ -6512,10 +6576,10 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
-  /wrappy/1.0.2:
+  /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
-  /write-file-atomic/4.0.2:
+  /write-file-atomic@4.0.2:
     resolution: {integrity: sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
@@ -6523,7 +6587,7 @@ packages:
       signal-exit: 3.0.7
     dev: false
 
-  /ws/8.8.0:
+  /ws@8.8.0:
     resolution: {integrity: sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==}
     engines: {node: '>=10.0.0'}
     peerDependencies:
@@ -6536,42 +6600,42 @@ packages:
         optional: true
     dev: true
 
-  /xml-name-validator/4.0.0:
+  /xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
     dev: true
 
-  /xml/1.0.1:
+  /xml@1.0.1:
     resolution: {integrity: sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==}
     dev: true
 
-  /xmlchars/2.2.0:
+  /xmlchars@2.2.0:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
     dev: true
 
-  /y18n/5.0.8:
+  /y18n@5.0.8:
     resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
     engines: {node: '>=10'}
 
-  /yallist/4.0.0:
+  /yallist@4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
 
-  /yaml/1.10.2:
+  /yaml@1.10.2:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
     dev: true
 
-  /yargs-parser/20.2.7:
+  /yargs-parser@20.2.7:
     resolution: {integrity: sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==}
     engines: {node: '>=10'}
     dev: true
 
-  /yargs-parser/21.0.1:
+  /yargs-parser@21.0.1:
     resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==}
     engines: {node: '>=12'}
     dev: false
 
-  /yargs/16.2.0:
+  /yargs@16.2.0:
     resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
     engines: {node: '>=10'}
     dependencies:
@@ -6584,7 +6648,7 @@ packages:
       yargs-parser: 20.2.7
     dev: true
 
-  /yargs/17.5.1:
+  /yargs@17.5.1:
     resolution: {integrity: sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==}
     engines: {node: '>=12'}
     dependencies:
@@ -6597,16 +6661,16 @@ packages:
       yargs-parser: 21.0.1
     dev: false
 
-  /yn/3.1.1:
+  /yn@3.1.1:
     resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
     engines: {node: '>=6'}
 
-  /yocto-queue/0.1.0:
+  /yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
     dev: false
 
-  /yup/1.0.2:
+  /yup@1.0.2:
     resolution: {integrity: sha512-Lpi8nITFKjWtCoK3yQP8MUk78LJmHWqbFd0OOMXTar+yjejlQ4OIIoZgnTW1bnEUKDw6dZBcy3/IdXnt2KDUow==}
     dependencies:
       property-expr: 2.0.5
@@ -6615,7 +6679,7 @@ packages:
       type-fest: 2.19.0
     dev: false
 
-  /zustand/4.1.1_react@18.1.0:
+  /zustand@4.1.1(react@18.1.0):
     resolution: {integrity: sha512-h4F3WMqsZgvvaE0n3lThx4MM81Ls9xebjvrABNzf5+jb3/03YjNTSgZXeyrvXDArMeV9untvWXRw1tY+ntPYbA==}
     engines: {node: '>=12.7.0'}
     peerDependencies:
@@ -6628,5 +6692,5 @@ packages:
         optional: true
     dependencies:
       react: 18.1.0
-      use-sync-external-store: 1.2.0_react@18.1.0
+      use-sync-external-store: 1.2.0(react@18.1.0)
     dev: false

From 8d35761b8db4f26e6e9884dfc7026eac284eb521 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Aug 2023 13:46:35 +0400
Subject: [PATCH 689/734] Bump json5 from 1.0.1 to 1.0.2 in /kafka-ui-react-app
 (#4148)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 5d5869b49fb..a11fcd65f93 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -4786,8 +4786,8 @@ packages:
     resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
     dev: true
 
-  /json5@1.0.1:
-    resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==}
+  /json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
     hasBin: true
     dependencies:
       minimist: 1.2.6
@@ -6271,7 +6271,7 @@ packages:
     resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
     dependencies:
       '@types/json5': 0.0.29
-      json5: 1.0.1
+      json5: 1.0.2
       minimist: 1.2.6
       strip-bom: 3.0.0
     dev: true

From 4f211b39ba5b5063c5bc842ec35b9180028c8fe1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Aug 2023 13:48:31 +0400
Subject: [PATCH 690/734] Bump word-wrap from 1.2.3 to 1.2.5 in
 /kafka-ui-react-app (#4151)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index a11fcd65f93..b02159ba53f 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -5176,7 +5176,7 @@ packages:
       levn: 0.3.0
       prelude-ls: 1.1.2
       type-check: 0.3.2
-      word-wrap: 1.2.3
+      word-wrap: 1.2.5
     dev: true
 
   /optionator@0.9.1:
@@ -5188,7 +5188,7 @@ packages:
       levn: 0.4.1
       prelude-ls: 1.2.1
       type-check: 0.4.0
-      word-wrap: 1.2.3
+      word-wrap: 1.2.5
     dev: true
 
   /ora@5.4.1:
@@ -6563,8 +6563,8 @@ packages:
     dependencies:
       isexe: 2.0.0
 
-  /word-wrap@1.2.3:
-    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
+  /word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
     dev: true
 

From 37a6e6268412963ccc2f3b108d3ef5a587a7e740 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Aug 2023 13:48:54 +0400
Subject: [PATCH 691/734] Bump vite from 4.0.0 to 4.0.5 in /kafka-ui-react-app
 (#4147)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index b02159ba53f..933a92c430a 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -118,10 +118,10 @@ dependencies:
     version: 9.0.3(react@18.1.0)
   vite:
     specifier: ^4.0.0
-    version: 4.0.0(@types/node@16.11.7)(sass@1.52.3)
+    version: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
   vite-tsconfig-paths:
     specifier: ^4.0.2
-    version: 4.0.2(typescript@4.7.4)(vite@4.0.0)
+    version: 4.0.2(typescript@4.7.4)(vite@4.0.5)
   whatwg-fetch:
     specifier: ^3.6.2
     version: 3.6.2
@@ -189,7 +189,7 @@ devDependencies:
     version: 5.29.0(eslint@8.16.0)(typescript@4.7.4)
   '@vitejs/plugin-react-swc':
     specifier: ^3.0.0
-    version: 3.0.0(vite@4.0.0)
+    version: 3.0.0(vite@4.0.5)
   dotenv:
     specifier: ^16.0.1
     version: 16.0.1
@@ -2064,13 +2064,13 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-react-swc@3.0.0(vite@4.0.0):
+  /@vitejs/plugin-react-swc@3.0.0(vite@4.0.5):
     resolution: {integrity: sha512-vYlodz/mjYRbxMGbHzDgR8aPR+z8n7K/enWkyBGH096xrL2DIPCuTvQVRYPTXGyy6wO7OFiMxZ3r4nKQD1sH0A==}
     peerDependencies:
       vite: ^4.0.0
     dependencies:
       '@swc/core': 1.3.38
-      vite: 4.0.0(@types/node@16.11.7)(sass@1.52.3)
+      vite: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
     dev: true
 
   /abab@2.0.6:
@@ -6415,7 +6415,7 @@ packages:
       ejs: 3.1.8
     dev: true
 
-  /vite-tsconfig-paths@4.0.2(typescript@4.7.4)(vite@4.0.0):
+  /vite-tsconfig-paths@4.0.2(typescript@4.7.4)(vite@4.0.5):
     resolution: {integrity: sha512-UzU8zwbCQrdUkj/Z0tnh293n4ScRcjJLoS8nPme2iB2FHoU5q8rhilb7AbhLlUC1uv4t6jSzVWnENjPnyGseeQ==}
     peerDependencies:
       vite: '>2.0.0-0'
@@ -6423,14 +6423,14 @@ packages:
       debug: 4.3.4(supports-color@5.5.0)
       globrex: 0.1.2
       tsconfck: 2.0.1(typescript@4.7.4)
-      vite: 4.0.0(@types/node@16.11.7)(sass@1.52.3)
+      vite: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: false
 
-  /vite@4.0.0(@types/node@16.11.7)(sass@1.52.3):
-    resolution: {integrity: sha512-ynad+4kYs8Jcnn8J7SacS9vAbk7eMy0xWg6E7bAhS1s79TK+D7tVFGXVZ55S7RNLRROU1rxoKlvZ/qjaB41DGA==}
+  /vite@4.0.5(@types/node@16.11.7)(sass@1.52.3):
+    resolution: {integrity: sha512-7m87RC+caiAxG+8j3jObveRLqaWA/neAdCat6JAZwMkSWqFHOvg8MYe5fAQxVBRAuKAQ1S6XDh3CBQuLNbY33w==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:

From 844eb17d7a3e112ae6742d7c8e4132c3dcef19b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:28:47 +0400
Subject: [PATCH 692/734] Bump tough-cookie from 4.0.0 to 4.1.3 in
 /kafka-ui-react-app (#4150)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 933a92c430a..fa4eb35de1e 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -4735,7 +4735,7 @@ packages:
       parse5: 7.1.1
       saxes: 6.0.0
       symbol-tree: 3.2.4
-      tough-cookie: 4.0.0
+      tough-cookie: 4.1.3
       w3c-hr-time: 1.0.2
       w3c-xmlserializer: 3.0.0
       webidl-conversions: 7.0.0
@@ -5450,6 +5450,10 @@ packages:
     deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
     dev: false
 
+  /querystringify@2.2.0:
+    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
+    dev: true
+
   /queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
@@ -5728,6 +5732,10 @@ packages:
     engines: {node: '>=0.10.5'}
     dev: true
 
+  /requires-port@1.0.0:
+    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
+    dev: true
+
   /reselect@4.1.5:
     resolution: {integrity: sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==}
     dev: false
@@ -6168,13 +6176,14 @@ packages:
     resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
     dev: false
 
-  /tough-cookie@4.0.0:
-    resolution: {integrity: sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==}
+  /tough-cookie@4.1.3:
+    resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==}
     engines: {node: '>=6'}
     dependencies:
       psl: 1.8.0
       punycode: 2.1.1
-      universalify: 0.1.2
+      universalify: 0.2.0
+      url-parse: 1.5.10
     dev: true
 
   /tr46@0.0.3:
@@ -6352,8 +6361,8 @@ packages:
       which-boxed-primitive: 1.0.2
     dev: true
 
-  /universalify@0.1.2:
-    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
+  /universalify@0.2.0:
+    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
     engines: {node: '>= 4.0.0'}
     dev: true
 
@@ -6367,6 +6376,13 @@ packages:
     dependencies:
       punycode: 2.1.1
 
+  /url-parse@1.5.10:
+    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
+    dependencies:
+      querystringify: 2.2.0
+      requires-port: 1.0.0
+    dev: true
+
   /use-debounce@9.0.3(react@18.1.0):
     resolution: {integrity: sha512-FhtlbDtDXILJV7Lix5OZj5yX/fW1tzq+VrvK1fnT2bUrPOGruU9Rw8NCEn+UI9wopfERBEZAOQ8lfeCJPllgnw==}
     engines: {node: '>= 10.0.0'}

From cca2c9699755c2128bb88cf8920c9ed4414dbd58 Mon Sep 17 00:00:00 2001
From: Mitsuaki Ito <itoumagic@gmail.com>
Date: Wed, 23 Aug 2023 20:41:46 +0900
Subject: [PATCH 693/734] FE: Fix active controller badge on invalid node
 (#4085)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../Brokers/Broker/__test__/Broker.spec.tsx   |  2 +-
 .../Brokers/BrokersList/BrokersList.tsx       |  4 +-
 .../BrokersList/__test__/BrokersList.spec.tsx | 41 +++++++++++++++++--
 .../common/Icons/CheckMarkRoundIcon.tsx       |  1 +
 .../src/lib/fixtures/brokers.ts               |  4 +-
 .../src/lib/fixtures/clusters.ts              |  6 +--
 6 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
index 89a553be7d0..40a5deeebfe 100644
--- a/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/Broker/__test__/Broker.spec.tsx
@@ -13,7 +13,7 @@ import { brokersPayload } from 'lib/fixtures/brokers';
 import { clusterStatsPayload } from 'lib/fixtures/clusters';
 
 const clusterName = 'local';
-const brokerId = 1;
+const brokerId = 200;
 const activeClassName = 'is-active';
 const brokerLogdir = {
   pageText: 'brokerLogdir',
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
index e59c006b0c6..ede570c655b 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/BrokersList.tsx
@@ -73,13 +73,13 @@ const BrokersList: React.FC = () => {
         header: 'Broker ID',
         accessorKey: 'brokerId',
         // eslint-disable-next-line react/no-unstable-nested-components
-        cell: ({ row: { id }, getValue }) => (
+        cell: ({ getValue }) => (
           <S.RowCell>
             <LinkCell
               value={`${getValue<string | number>()}`}
               to={encodeURIComponent(`${getValue<string | number>()}`)}
             />
-            {id === String(activeControllers) && (
+            {getValue<string | number>() === activeControllers && (
               <Tooltip
                 value={<CheckMarkRoundIcon />}
                 content="Active Controller"
diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
index 0c60cf4749c..3e88569a39e 100644
--- a/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
+++ b/kafka-ui-react-app/src/components/Brokers/BrokersList/__test__/BrokersList.spec.tsx
@@ -56,11 +56,11 @@ describe('BrokersList Component', () => {
       });
       it('opens broker when row clicked', async () => {
         renderComponent();
-        await userEvent.click(screen.getByRole('cell', { name: '0' }));
+        await userEvent.click(screen.getByRole('cell', { name: '100' }));
 
         await waitFor(() =>
           expect(mockedUsedNavigate).toBeCalledWith(
-            clusterBrokerPath(clusterName, '0')
+            clusterBrokerPath(clusterName, '100')
           )
         );
       });
@@ -124,6 +124,39 @@ describe('BrokersList Component', () => {
       });
     });
 
+    describe('BrokersList', () => {
+      describe('when the brokers are loaded', () => {
+        const testActiveControllers = 0;
+        beforeEach(() => {
+          (useBrokers as jest.Mock).mockImplementation(() => ({
+            data: brokersPayload,
+          }));
+          (useClusterStats as jest.Mock).mockImplementation(() => ({
+            data: clusterStatsPayload,
+          }));
+        });
+
+        it(`Indicates correct active cluster`, async () => {
+          renderComponent();
+          await waitFor(() =>
+            expect(screen.getByRole('tooltip')).toBeInTheDocument()
+          );
+        });
+        it(`Correct display even if there is no active cluster: ${testActiveControllers} `, async () => {
+          (useClusterStats as jest.Mock).mockImplementation(() => ({
+            data: {
+              ...clusterStatsPayload,
+              activeControllers: testActiveControllers,
+            },
+          }));
+          renderComponent();
+          await waitFor(() =>
+            expect(screen.queryByRole('tooltip')).not.toBeInTheDocument()
+          );
+        });
+      });
+    });
+
     describe('when diskUsage is empty', () => {
       beforeEach(() => {
         (useBrokers as jest.Mock).mockImplementation(() => ({
@@ -157,11 +190,11 @@ describe('BrokersList Component', () => {
       });
       it('opens broker when row clicked', async () => {
         renderComponent();
-        await userEvent.click(screen.getByRole('cell', { name: '1' }));
+        await userEvent.click(screen.getByRole('cell', { name: '100' }));
 
         await waitFor(() =>
           expect(mockedUsedNavigate).toBeCalledWith(
-            clusterBrokerPath(clusterName, '1')
+            clusterBrokerPath(clusterName, '100')
           )
         );
       });
diff --git a/kafka-ui-react-app/src/components/common/Icons/CheckMarkRoundIcon.tsx b/kafka-ui-react-app/src/components/common/Icons/CheckMarkRoundIcon.tsx
index e14898385b6..bbf212541e8 100644
--- a/kafka-ui-react-app/src/components/common/Icons/CheckMarkRoundIcon.tsx
+++ b/kafka-ui-react-app/src/components/common/Icons/CheckMarkRoundIcon.tsx
@@ -7,6 +7,7 @@ const CheckMarkRoundIcon: React.FC = () => {
       height="14"
       viewBox="0 0 14 14"
       fill="none"
+      role="tooltip"
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
diff --git a/kafka-ui-react-app/src/lib/fixtures/brokers.ts b/kafka-ui-react-app/src/lib/fixtures/brokers.ts
index 8999bd2f814..1a76f73fe37 100644
--- a/kafka-ui-react-app/src/lib/fixtures/brokers.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/brokers.ts
@@ -1,8 +1,8 @@
 import { BrokerConfig, BrokersLogdirs, ConfigSource } from 'generated-sources';
 
 export const brokersPayload = [
-  { id: 1, host: 'b-1.test.kafka.amazonaws.com', port: 9092 },
-  { id: 2, host: 'b-2.test.kafka.amazonaws.com', port: 9092 },
+  { id: 100, host: 'b-1.test.kafka.amazonaws.com', port: 9092 },
+  { id: 200, host: 'b-2.test.kafka.amazonaws.com', port: 9092 },
 ];
 
 const partition = {
diff --git a/kafka-ui-react-app/src/lib/fixtures/clusters.ts b/kafka-ui-react-app/src/lib/fixtures/clusters.ts
index 2b1cc8f8f51..3f4476bae8a 100644
--- a/kafka-ui-react-app/src/lib/fixtures/clusters.ts
+++ b/kafka-ui-react-app/src/lib/fixtures/clusters.ts
@@ -32,15 +32,15 @@ export const clustersPayload: Cluster[] = [
 
 export const clusterStatsPayload = {
   brokerCount: 2,
-  activeControllers: 1,
+  activeControllers: 100,
   onlinePartitionCount: 138,
   offlinePartitionCount: 0,
   inSyncReplicasCount: 239,
   outOfSyncReplicasCount: 0,
   underReplicatedPartitionCount: 0,
   diskUsage: [
-    { brokerId: 0, segmentSize: 334567, segmentCount: 245 },
-    { brokerId: 1, segmentSize: 12345678, segmentCount: 121 },
+    { brokerId: 100, segmentSize: 334567, segmentCount: 245 },
+    { brokerId: 200, segmentSize: 12345678, segmentCount: 121 },
   ],
   version: '2.2.1',
 };

From 4519d9a48ce4e70232364d7abaf7f37ca5366962 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:43:20 +0400
Subject: [PATCH 694/734] Bump lossless-json from 2.0.8 to 2.0.11 in
 /kafka-ui-react-app (#4168)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index fa4eb35de1e..1a871ee65f8 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -67,7 +67,7 @@ dependencies:
     version: 4.17.21
   lossless-json:
     specifier: ^2.0.8
-    version: 2.0.8
+    version: 2.0.11
   pretty-ms:
     specifier: 7.0.1
     version: 7.0.1
@@ -4915,8 +4915,8 @@ packages:
     dependencies:
       js-tokens: 4.0.0
 
-  /lossless-json@2.0.8:
-    resolution: {integrity: sha512-7/GaZldUc7H5oNZlSk6bF06cRbtA7oF8zWXwbfMZm8yrYC2debx0KvWTBbQIbj6fh08LsXTWg+YtHJshXgYKow==}
+  /lossless-json@2.0.11:
+    resolution: {integrity: sha512-BP0vn+NGYvzDielvBZaFain/wgeJ1hTvURCqtKvhr1SCPePdaaTanmmcplrHfEJSJOUql7hk4FHwToNJjWRY3g==}
     dev: false
 
   /lru-cache@6.0.0:

From 7de883d3ab200c8e42470626ade84e746243d84e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:43:36 +0400
Subject: [PATCH 695/734] Bump @types/eventsource from 1.1.8 to 1.1.11 in
 /kafka-ui-react-app (#4167)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 1a871ee65f8..2db15a6f902 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -156,7 +156,7 @@ devDependencies:
     version: 14.4.3(@testing-library/dom@9.0.0)
   '@types/eventsource':
     specifier: ^1.1.8
-    version: 1.1.8
+    version: 1.1.11
   '@types/lodash':
     specifier: ^4.14.172
     version: 4.14.177
@@ -1782,8 +1782,8 @@ packages:
       '@babel/types': 7.18.9
     dev: false
 
-  /@types/eventsource@1.1.8:
-    resolution: {integrity: sha512-fJQNt9LijJCZwYvM6O30uLzdpAK9zs52Uc9iUW9M2Zsg0HQM6DLf6QysjC/wuFX+0798B8AppVMvgdO6IftPKQ==}
+  /@types/eventsource@1.1.11:
+    resolution: {integrity: sha512-L7wLDZlWm5mROzv87W0ofIYeQP5K2UhoFnnUyEWLKM6UBb0ZNRgAqp98qE5DkgfBXdWfc2kYmw9KZm4NLjRbsw==}
     dev: true
 
   /@types/graceful-fs@4.1.5:

From d7eb3ba99e12517006a98422b2842625054c196d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:43:59 +0400
Subject: [PATCH 696/734] Bump eslint-plugin-react-hooks from 4.5.0 to 4.6.0 in
 /kafka-ui-react-app (#4165)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 2db15a6f902..18b9f1105f3 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -198,7 +198,7 @@ devDependencies:
     version: 8.16.0
   eslint-config-airbnb:
     specifier: ^19.0.4
-    version: 19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.5.1)(eslint-plugin-react-hooks@4.5.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0)
+    version: 19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.5.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0)
   eslint-config-airbnb-typescript:
     specifier: ^17.0.0
     version: 17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.16.0)
@@ -228,7 +228,7 @@ devDependencies:
     version: 7.30.1(eslint@8.16.0)
   eslint-plugin-react-hooks:
     specifier: ^4.5.0
-    version: 4.5.0(eslint@8.16.0)
+    version: 4.6.0(eslint@8.16.0)
   jest-environment-jsdom:
     specifier: ^29.4.3
     version: 29.5.0
@@ -3091,7 +3091,7 @@ packages:
       eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
     dev: true
 
-  /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.5.1)(eslint-plugin-react-hooks@4.5.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0):
+  /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.5.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0):
     resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==}
     engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -3106,7 +3106,7 @@ packages:
       eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
       eslint-plugin-jsx-a11y: 6.5.1(eslint@8.16.0)
       eslint-plugin-react: 7.30.1(eslint@8.16.0)
-      eslint-plugin-react-hooks: 4.5.0(eslint@8.16.0)
+      eslint-plugin-react-hooks: 4.6.0(eslint@8.16.0)
       object.assign: 4.1.2
       object.entries: 1.1.5
     dev: true
@@ -3257,8 +3257,8 @@ packages:
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-react-hooks@4.5.0(eslint@8.16.0):
-    resolution: {integrity: sha512-8k1gRt7D7h03kd+SAAlzXkQwWK22BnK6GKZG+FJA6BAGy22CFvl8kCIXKpVux0cCxMWDQUPqSok0LKaZ0aOcCw==}
+  /eslint-plugin-react-hooks@4.6.0(eslint@8.16.0):
+    resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}
     engines: {node: '>=10'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0

From b2b02a5d60d07e8812726318c846135b0d900e06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:44:23 +0400
Subject: [PATCH 697/734] Bump @hookform/error-message from 2.0.0 to 2.0.1 in
 /kafka-ui-react-app (#4163)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 18b9f1105f3..f951c6fc9bd 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -10,7 +10,7 @@ dependencies:
     version: 0.19.2(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0)
   '@hookform/error-message':
     specifier: ^2.0.0
-    version: 2.0.0(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.1.0)
+    version: 2.0.1(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.1.0)
   '@hookform/resolvers':
     specifier: ^2.7.1
     version: 2.8.9(react-hook-form@7.43.1)
@@ -980,8 +980,8 @@ packages:
       - '@types/react'
     dev: false
 
-  /@hookform/error-message@2.0.0(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.1.0):
-    resolution: {integrity: sha512-Y90nHzjgL2MP7GFy75kscdvxrCTjtyxGmOLLxX14nd08OXRIh9lMH/y9Kpdo0p1IPowJBiZMHyueg7p+yrqynQ==}
+  /@hookform/error-message@2.0.1(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.1.0):
+    resolution: {integrity: sha512-U410sAr92xgxT1idlu9WWOVjndxLdgPUHEB8Schr27C9eh7/xUnITWpCMF93s+lGiG++D4JnbSnrb5A21AdSNg==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'

From 2051f6f653b1f84e6bcf05c75aacc4e3c3c43e6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:44:42 +0400
Subject: [PATCH 698/734] Bump eslint-plugin-prettier from 4.0.0 to 4.2.1 in
 /kafka-ui-react-app (#4162)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index f951c6fc9bd..0a6a1d72e15 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -222,7 +222,7 @@ devDependencies:
     version: 6.5.1(eslint@8.16.0)
   eslint-plugin-prettier:
     specifier: ^4.0.0
-    version: 4.0.0(eslint-config-prettier@8.5.0)(eslint@8.16.0)(prettier@2.8.4)
+    version: 4.2.1(eslint-config-prettier@8.5.0)(eslint@8.16.0)(prettier@2.8.4)
   eslint-plugin-react:
     specifier: ^7.30.1
     version: 7.30.1(eslint@8.16.0)
@@ -3240,9 +3240,9 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /eslint-plugin-prettier@4.0.0(eslint-config-prettier@8.5.0)(eslint@8.16.0)(prettier@2.8.4):
-    resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==}
-    engines: {node: '>=6.0.0'}
+  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.5.0)(eslint@8.16.0)(prettier@2.8.4):
+    resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
+    engines: {node: '>=12.0.0'}
     peerDependencies:
       eslint: '>=7.28.0'
       eslint-config-prettier: '*'

From 342b534ac9c6b91b7d95cd7eb654ab20f3755efd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:45:02 +0400
Subject: [PATCH 699/734] Bump jest from 29.5.0 to 29.6.4 in
 /kafka-ui-react-app (#4161)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 839 ++++++++++++++----------------
 1 file changed, 382 insertions(+), 457 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 0a6a1d72e15..31152122586 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -52,10 +52,10 @@ dependencies:
     version: 9.11.0
   jest:
     specifier: ^29.4.3
-    version: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
+    version: 29.6.4(@types/node@16.11.7)(ts-node@10.9.1)
   jest-watch-typeahead:
     specifier: ^2.2.2
-    version: 2.2.2(jest@29.5.0)
+    version: 2.2.2(jest@29.6.4)
   json-schema-faker:
     specifier: ^0.5.0-rcv.44
     version: 0.5.0-rcv.44
@@ -268,14 +268,7 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/gen-mapping': 0.1.1
-      '@jridgewell/trace-mapping': 0.3.15
-    dev: false
-
-  /@babel/code-frame@7.16.7:
-    resolution: {integrity: sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/highlight': 7.18.6
+      '@jridgewell/trace-mapping': 0.3.19
     dev: false
 
   /@babel/code-frame@7.18.6:
@@ -294,15 +287,15 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@ampproject/remapping': 2.2.0
-      '@babel/code-frame': 7.16.7
-      '@babel/generator': 7.18.2
-      '@babel/helper-compilation-targets': 7.18.2(@babel/core@7.18.2)
-      '@babel/helper-module-transforms': 7.18.0
-      '@babel/helpers': 7.18.2
-      '@babel/parser': 7.18.4
-      '@babel/template': 7.16.7
-      '@babel/traverse': 7.18.2(supports-color@5.5.0)
-      '@babel/types': 7.18.4
+      '@babel/code-frame': 7.18.6
+      '@babel/generator': 7.18.9
+      '@babel/helper-compilation-targets': 7.18.9(@babel/core@7.18.2)
+      '@babel/helper-module-transforms': 7.18.9
+      '@babel/helpers': 7.18.9
+      '@babel/parser': 7.18.9
+      '@babel/template': 7.18.6
+      '@babel/traverse': 7.18.9
+      '@babel/types': 7.18.9
       convert-source-map: 1.7.0
       debug: 4.3.4(supports-color@5.5.0)
       gensync: 1.0.0-beta.2
@@ -335,15 +328,6 @@ packages:
       - supports-color
     dev: false
 
-  /@babel/generator@7.18.2:
-    resolution: {integrity: sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.18.9
-      '@jridgewell/gen-mapping': 0.3.2
-      jsesc: 2.5.2
-    dev: false
-
   /@babel/generator@7.18.9:
     resolution: {integrity: sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==}
     engines: {node: '>=6.9.0'}
@@ -358,8 +342,8 @@ packages:
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-compilation-targets@7.18.2(@babel/core@7.18.2):
-    resolution: {integrity: sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==}
+  /@babel/helper-compilation-targets@7.18.9(@babel/core@7.18.2):
+    resolution: {integrity: sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -413,22 +397,6 @@ packages:
     dependencies:
       '@babel/types': 7.18.9
 
-  /@babel/helper-module-transforms@7.18.0:
-    resolution: {integrity: sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-simple-access': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/helper-validator-identifier': 7.18.6
-      '@babel/template': 7.18.6
-      '@babel/traverse': 7.18.9
-      '@babel/types': 7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@babel/helper-module-transforms@7.18.9:
     resolution: {integrity: sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==}
     engines: {node: '>=6.9.0'}
@@ -472,17 +440,6 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: false
 
-  /@babel/helpers@7.18.2:
-    resolution: {integrity: sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.18.6
-      '@babel/traverse': 7.18.9
-      '@babel/types': 7.18.9
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@babel/helpers@7.18.9:
     resolution: {integrity: sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==}
     engines: {node: '>=6.9.0'}
@@ -502,14 +459,6 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/parser@7.18.4:
-    resolution: {integrity: sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.18.9
-    dev: false
-
   /@babel/parser@7.18.9:
     resolution: {integrity: sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==}
     engines: {node: '>=6.0.0'}
@@ -660,15 +609,6 @@ packages:
     dependencies:
       regenerator-runtime: 0.13.7
 
-  /@babel/template@7.16.7:
-    resolution: {integrity: sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/parser': 7.18.9
-      '@babel/types': 7.18.9
-    dev: false
-
   /@babel/template@7.18.6:
     resolution: {integrity: sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==}
     engines: {node: '>=6.9.0'}
@@ -712,14 +652,6 @@ packages:
       - supports-color
     dev: false
 
-  /@babel/types@7.18.4:
-    resolution: {integrity: sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.18.6
-      to-fast-properties: 2.0.0
-    dev: false
-
   /@babel/types@7.18.9:
     resolution: {integrity: sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==}
     engines: {node: '>=6.9.0'}
@@ -1031,20 +963,20 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
-  /@jest/console@29.5.0:
-    resolution: {integrity: sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==}
+  /@jest/console@29.6.4:
+    resolution: {integrity: sha512-wNK6gC0Ha9QeEPSkeJedQuTQqxZYnDPuDcDhVuVatRvMkL4D0VTvFVZj+Yuh6caG2aOfzkUZ36KtCmLNtR02hw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
       chalk: 4.1.2
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
+      jest-message-util: 29.6.3
+      jest-util: 29.6.3
       slash: 3.0.0
     dev: false
 
-  /@jest/core@29.5.0(ts-node@10.9.1):
-    resolution: {integrity: sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==}
+  /@jest/core@29.6.4(ts-node@10.9.1):
+    resolution: {integrity: sha512-U/vq5ccNTSVgYH7mHnodHmCffGWHJnz/E1BEWlLuK5pM4FZmGfBn/nrJGLjUsSmyx3otCeqc1T31F4y08AMDLg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -1052,35 +984,36 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/reporters': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/console': 29.6.4
+      '@jest/reporters': 29.6.4
+      '@jest/test-result': 29.6.4
+      '@jest/transform': 29.6.4
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 3.3.1
       exit: 0.1.2
       graceful-fs: 4.2.10
-      jest-changed-files: 29.5.0
-      jest-config: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
-      jest-haste-map: 29.5.0
-      jest-message-util: 29.5.0
-      jest-regex-util: 29.4.3
-      jest-resolve: 29.5.0
-      jest-resolve-dependencies: 29.5.0
-      jest-runner: 29.5.0
-      jest-runtime: 29.5.0
-      jest-snapshot: 29.5.0
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
-      jest-watcher: 29.5.0
+      jest-changed-files: 29.6.3
+      jest-config: 29.6.4(@types/node@16.11.7)(ts-node@10.9.1)
+      jest-haste-map: 29.6.4
+      jest-message-util: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.6.4
+      jest-resolve-dependencies: 29.6.4
+      jest-runner: 29.6.4
+      jest-runtime: 29.6.4
+      jest-snapshot: 29.6.4
+      jest-util: 29.6.3
+      jest-validate: 29.6.3
+      jest-watcher: 29.6.4
       micromatch: 4.0.5
-      pretty-format: 29.5.0
+      pretty-format: 29.6.3
       slash: 3.0.0
       strip-ansi: 6.0.1
     transitivePeerDependencies:
+      - babel-plugin-macros
       - supports-color
       - ts-node
     dev: false
@@ -1096,30 +1029,34 @@ packages:
     resolution: {integrity: sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/fake-timers': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/fake-timers': 29.6.4
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
-      jest-mock: 29.5.0
+      jest-mock: 29.6.3
+    dev: true
 
-  /@jest/expect-utils@29.0.3:
-    resolution: {integrity: sha512-i1xUkau7K/63MpdwiRqaxgZOjxYs4f0WMTGJnYwUKubsNRZSeQbLorS7+I4uXVF9KQ5r61BUPAUMZ7Lf66l64Q==}
+  /@jest/environment@29.6.4:
+    resolution: {integrity: sha512-sQ0SULEjA1XUTHmkBRl7A1dyITM9yb1yb3ZNKPX3KlTd6IG7mWUe3e2yfExtC2Zz1Q+mMckOLHmL/qLiuQJrBQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-get-type: 29.0.0
+      '@jest/fake-timers': 29.6.4
+      '@jest/types': 29.6.3
+      '@types/node': 16.11.7
+      jest-mock: 29.6.3
+    dev: false
 
-  /@jest/expect-utils@29.5.0:
-    resolution: {integrity: sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==}
+  /@jest/expect-utils@29.6.4:
+    resolution: {integrity: sha512-FEhkJhqtvBwgSpiTrocquJCdXPsyvNKcl/n7A3u7X4pVoF4bswm11c9d4AV+kfq2Gpv/mM8x7E7DsRvH+djkrg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-get-type: 29.4.3
-    dev: false
+      jest-get-type: 29.6.3
 
-  /@jest/expect@29.5.0:
-    resolution: {integrity: sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==}
+  /@jest/expect@29.6.4:
+    resolution: {integrity: sha512-Warhsa7d23+3X5bLbrbYvaehcgX5TLYhI03JKoedTiI8uJU4IhqYBWF7OSSgUyz4IgLpUYPkK0AehA5/fRclAA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      expect: 29.5.0
-      jest-snapshot: 29.5.0
+      expect: 29.6.4
+      jest-snapshot: 29.6.4
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -1128,27 +1065,39 @@ packages:
     resolution: {integrity: sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       '@sinonjs/fake-timers': 10.0.2
       '@types/node': 16.11.7
-      jest-message-util: 29.5.0
-      jest-mock: 29.5.0
-      jest-util: 29.5.0
+      jest-message-util: 29.6.3
+      jest-mock: 29.6.3
+      jest-util: 29.6.3
+    dev: true
 
-  /@jest/globals@29.5.0:
-    resolution: {integrity: sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==}
+  /@jest/fake-timers@29.6.4:
+    resolution: {integrity: sha512-6UkCwzoBK60edXIIWb0/KWkuj7R7Qq91vVInOe3De6DSpaEiqjKcJw4F7XUet24Wupahj9J6PlR09JqJ5ySDHw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/expect': 29.5.0
-      '@jest/types': 29.5.0
-      jest-mock: 29.5.0
+      '@jest/types': 29.6.3
+      '@sinonjs/fake-timers': 10.0.2
+      '@types/node': 16.11.7
+      jest-message-util: 29.6.3
+      jest-mock: 29.6.3
+      jest-util: 29.6.3
+
+  /@jest/globals@29.6.4:
+    resolution: {integrity: sha512-wVIn5bdtjlChhXAzVXavcY/3PEjf4VqM174BM3eGL5kMxLiZD5CLnbmkEyA1Dwh9q8XjP6E8RwjBsY/iCWrWsA==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/environment': 29.6.4
+      '@jest/expect': 29.6.4
+      '@jest/types': 29.6.3
+      jest-mock: 29.6.3
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@jest/reporters@29.5.0:
-    resolution: {integrity: sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==}
+  /@jest/reporters@29.6.4:
+    resolution: {integrity: sha512-sxUjWxm7QdchdrD3NfWKrL8FBsortZeibSJv4XLjESOOjSUOkjQcb0ZHJwfhEGIvBvTluTzfG2yZWZhkrXJu8g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -1157,11 +1106,11 @@ packages:
         optional: true
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
-      '@jridgewell/trace-mapping': 0.3.15
+      '@jest/console': 29.6.4
+      '@jest/test-result': 29.6.4
+      '@jest/transform': 29.6.4
+      '@jest/types': 29.6.3
+      '@jridgewell/trace-mapping': 0.3.19
       '@types/node': 16.11.7
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
@@ -1169,13 +1118,13 @@ packages:
       glob: 7.2.0
       graceful-fs: 4.2.10
       istanbul-lib-coverage: 3.2.0
-      istanbul-lib-instrument: 5.2.0
+      istanbul-lib-instrument: 6.0.0
       istanbul-lib-report: 3.0.0
       istanbul-lib-source-maps: 4.0.1
       istanbul-reports: 3.1.4
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
-      jest-worker: 29.5.0
+      jest-message-util: 29.6.3
+      jest-util: 29.6.3
+      jest-worker: 29.6.4
       slash: 3.0.0
       string-length: 4.0.2
       strip-ansi: 6.0.1
@@ -1184,72 +1133,63 @@ packages:
       - supports-color
     dev: false
 
-  /@jest/schemas@29.0.0:
-    resolution: {integrity: sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@sinclair/typebox': 0.24.40
-
   /@jest/schemas@29.4.3:
     resolution: {integrity: sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@sinclair/typebox': 0.25.24
+    dev: true
 
-  /@jest/source-map@29.4.3:
-    resolution: {integrity: sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==}
+  /@jest/schemas@29.6.3:
+    resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.15
-      callsites: 3.1.0
-      graceful-fs: 4.2.10
-    dev: false
+      '@sinclair/typebox': 0.27.8
 
-  /@jest/test-result@29.0.3:
-    resolution: {integrity: sha512-vViVnQjCgTmbhDKEonKJPtcFe9G/CJO4/Np4XwYJah+lF2oI7KKeRp8t1dFvv44wN2NdbDb/qC6pi++Vpp0Dlg==}
+  /@jest/source-map@29.6.3:
+    resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/istanbul-lib-coverage': 2.0.3
-      collect-v8-coverage: 1.0.1
+      '@jridgewell/trace-mapping': 0.3.19
+      callsites: 3.1.0
+      graceful-fs: 4.2.10
     dev: false
 
-  /@jest/test-result@29.5.0:
-    resolution: {integrity: sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==}
+  /@jest/test-result@29.6.4:
+    resolution: {integrity: sha512-uQ1C0AUEN90/dsyEirgMLlouROgSY+Wc/JanVVk0OiUKa5UFh7sJpMEM3aoUBAz2BRNvUJ8j3d294WFuRxSyOQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/console': 29.6.4
+      '@jest/types': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.3
       collect-v8-coverage: 1.0.1
     dev: false
 
-  /@jest/test-sequencer@29.5.0:
-    resolution: {integrity: sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==}
+  /@jest/test-sequencer@29.6.4:
+    resolution: {integrity: sha512-E84M6LbpcRq3fT4ckfKs9ryVanwkaIB0Ws9bw3/yP4seRLg/VaCZ/LgW0MCq5wwk4/iP/qnilD41aj2fsw2RMg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.5.0
+      '@jest/test-result': 29.6.4
       graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
+      jest-haste-map: 29.6.4
       slash: 3.0.0
     dev: false
 
-  /@jest/transform@29.5.0:
-    resolution: {integrity: sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==}
+  /@jest/transform@29.6.4:
+    resolution: {integrity: sha512-8thgRSiXUqtr/pPGY/OsyHuMjGyhVnWrFAwoxmIemlBuiMyU1WFs0tXoNxzcr4A4uErs/ABre76SGmrr5ab/AA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/core': 7.18.9
-      '@jest/types': 29.5.0
-      '@jridgewell/trace-mapping': 0.3.15
+      '@jest/types': 29.6.3
+      '@jridgewell/trace-mapping': 0.3.19
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
       convert-source-map: 2.0.0
       fast-json-stable-stringify: 2.1.0
       graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
-      jest-regex-util: 29.4.3
-      jest-util: 29.5.0
+      jest-haste-map: 29.6.4
+      jest-regex-util: 29.6.3
+      jest-util: 29.6.3
       micromatch: 4.0.5
       pirates: 4.0.5
       slash: 3.0.0
@@ -1279,13 +1219,25 @@ packages:
       '@types/node': 16.11.7
       '@types/yargs': 17.0.10
       chalk: 4.1.2
+    dev: true
+
+  /@jest/types@29.6.3:
+    resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/schemas': 29.6.3
+      '@types/istanbul-lib-coverage': 2.0.3
+      '@types/istanbul-reports': 3.0.1
+      '@types/node': 16.11.7
+      '@types/yargs': 17.0.10
+      chalk: 4.1.2
 
   /@jridgewell/gen-mapping@0.1.1:
     resolution: {integrity: sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==}
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/set-array': 1.1.1
-      '@jridgewell/sourcemap-codec': 1.4.13
+      '@jridgewell/sourcemap-codec': 1.4.15
     dev: false
 
   /@jridgewell/gen-mapping@0.3.2:
@@ -1293,31 +1245,31 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/set-array': 1.1.1
-      '@jridgewell/sourcemap-codec': 1.4.13
-      '@jridgewell/trace-mapping': 0.3.15
+      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/trace-mapping': 0.3.19
 
-  /@jridgewell/resolve-uri@3.0.7:
-    resolution: {integrity: sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==}
+  /@jridgewell/resolve-uri@3.1.1:
+    resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==}
     engines: {node: '>=6.0.0'}
 
   /@jridgewell/set-array@1.1.1:
     resolution: {integrity: sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==}
     engines: {node: '>=6.0.0'}
 
-  /@jridgewell/sourcemap-codec@1.4.13:
-    resolution: {integrity: sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==}
+  /@jridgewell/sourcemap-codec@1.4.15:
+    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
-  /@jridgewell/trace-mapping@0.3.15:
-    resolution: {integrity: sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==}
+  /@jridgewell/trace-mapping@0.3.19:
+    resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==}
     dependencies:
-      '@jridgewell/resolve-uri': 3.0.7
-      '@jridgewell/sourcemap-codec': 1.4.13
+      '@jridgewell/resolve-uri': 3.1.1
+      '@jridgewell/sourcemap-codec': 1.4.15
 
   /@jridgewell/trace-mapping@0.3.9:
     resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
     dependencies:
-      '@jridgewell/resolve-uri': 3.0.7
-      '@jridgewell/sourcemap-codec': 1.4.13
+      '@jridgewell/resolve-uri': 3.1.1
+      '@jridgewell/sourcemap-codec': 1.4.15
 
   /@microsoft/fetch-event-source@2.0.1:
     resolution: {integrity: sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==}
@@ -1480,11 +1432,12 @@ packages:
       reselect: 4.1.5
     dev: false
 
-  /@sinclair/typebox@0.24.40:
-    resolution: {integrity: sha512-Xint60L8rF0+nRy+6fCjW9jQMmu7fTpbwTBrXZiK6eq/RHDJS7LvWX/0oXC8O7fCePmrY/XdfaTv2HiUDeCq4g==}
-
   /@sinclair/typebox@0.25.24:
     resolution: {integrity: sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==}
+    dev: true
+
+  /@sinclair/typebox@0.27.8:
+    resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
 
   /@sinonjs/commons@2.0.0:
     resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
@@ -1818,8 +1771,8 @@ packages:
   /@types/jest@29.0.1:
     resolution: {integrity: sha512-CAZrjLRZs4xEdIrfrdV74xK1Vo/BKQZwUcjJv3gp6gMeV3BsVxMnXTcgtYOKyphT4DPPo7jxVEVhuwJTQn3oPQ==}
     dependencies:
-      expect: 29.0.3
-      pretty-format: 29.0.3
+      expect: 29.6.4
+      pretty-format: 29.6.3
 
   /@types/jsdom@20.0.0:
     resolution: {integrity: sha512-YfAchFs0yM1QPDrLm2VHe+WHGtqms3NXnXAMolrgrVP6fgBHHXy1ozAbo/dFtPNtZC/m66bPiCTWYmqp1F14gA==}
@@ -1852,10 +1805,6 @@ packages:
     resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
     dev: true
 
-  /@types/prettier@2.6.3:
-    resolution: {integrity: sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg==}
-    dev: false
-
   /@types/prop-types@15.7.5:
     resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
 
@@ -2031,7 +1980,7 @@ packages:
       debug: 4.3.4(supports-color@5.5.0)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.3.7
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@4.7.4)
       typescript: 4.7.4
     transitivePeerDependencies:
@@ -2304,17 +2253,17 @@ packages:
     resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
     dev: true
 
-  /babel-jest@29.5.0(@babel/core@7.18.9):
-    resolution: {integrity: sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==}
+  /babel-jest@29.6.4(@babel/core@7.18.9):
+    resolution: {integrity: sha512-meLj23UlSLddj6PC+YTOFRgDAtjnZom8w/ACsrx0gtPtv5cJZk0A5Unk5bV4wixD7XaPCN1fQvpww8czkZURmw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
     dependencies:
       '@babel/core': 7.18.9
-      '@jest/transform': 29.5.0
+      '@jest/transform': 29.6.4
       '@types/babel__core': 7.1.19
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.5.0(@babel/core@7.18.9)
+      babel-preset-jest: 29.6.3(@babel/core@7.18.9)
       chalk: 4.1.2
       graceful-fs: 4.2.10
       slash: 3.0.0
@@ -2335,8 +2284,8 @@ packages:
       - supports-color
     dev: false
 
-  /babel-plugin-jest-hoist@29.5.0:
-    resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==}
+  /babel-plugin-jest-hoist@29.6.3:
+    resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/template': 7.18.6
@@ -2379,14 +2328,14 @@ packages:
       '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.18.9)
     dev: false
 
-  /babel-preset-jest@29.5.0(@babel/core@7.18.9):
-    resolution: {integrity: sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==}
+  /babel-preset-jest@29.6.3(@babel/core@7.18.9):
+    resolution: {integrity: sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
       '@babel/core': 7.18.9
-      babel-plugin-jest-hoist: 29.5.0
+      babel-plugin-jest-hoist: 29.6.3
       babel-preset-current-node-syntax: 1.0.1(@babel/core@7.18.9)
     dev: false
 
@@ -2809,8 +2758,13 @@ packages:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
     dev: true
 
-  /dedent@0.7.0:
-    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
+  /dedent@1.5.1:
+    resolution: {integrity: sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==}
+    peerDependencies:
+      babel-plugin-macros: ^3.1.0
+    peerDependenciesMeta:
+      babel-plugin-macros:
+        optional: true
     dev: false
 
   /deep-is@0.1.3:
@@ -2856,15 +2810,10 @@ packages:
     resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
     dev: false
 
-  /diff-sequences@29.0.0:
-    resolution: {integrity: sha512-7Qe/zd1wxSDL4D/X/FPjOMB+ZMDt71W94KYaq05I2l0oQqgXgs7s4ftYYmV38gBSrPz2vcygxfs1xn0FT+rKNA==}
+  /diff-sequences@29.6.3:
+    resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /diff-sequences@29.4.3:
-    resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dev: false
-
   /diff@4.0.2:
     resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
     engines: {node: '>=0.3.1'}
@@ -3432,26 +3381,15 @@ packages:
     engines: {node: '>= 0.8.0'}
     dev: false
 
-  /expect@29.0.3:
-    resolution: {integrity: sha512-t8l5DTws3212VbmPL+tBFXhjRHLmctHB0oQbL8eUc6S7NzZtYUhycrFO9mkxA0ZUC6FAWdNi7JchJSkODtcu1Q==}
+  /expect@29.6.4:
+    resolution: {integrity: sha512-F2W2UyQ8XYyftHT57dtfg8Ue3X5qLgm2sSug0ivvLRH/VKNRL/pDxg/TH7zVzbQB0tu80clNFy6LU7OS/VSEKA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/expect-utils': 29.0.3
-      jest-get-type: 29.0.0
-      jest-matcher-utils: 29.0.3
-      jest-message-util: 29.0.3
-      jest-util: 29.0.3
-
-  /expect@29.5.0:
-    resolution: {integrity: sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/expect-utils': 29.5.0
-      jest-get-type: 29.4.3
-      jest-matcher-utils: 29.5.0
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
-    dev: false
+      '@jest/expect-utils': 29.6.4
+      jest-get-type: 29.6.3
+      jest-matcher-utils: 29.6.4
+      jest-message-util: 29.6.3
+      jest-util: 29.6.3
 
   /external-editor@3.1.0:
     resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
@@ -4118,6 +4056,19 @@ packages:
       - supports-color
     dev: false
 
+  /istanbul-lib-instrument@6.0.0:
+    resolution: {integrity: sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==}
+    engines: {node: '>=10'}
+    dependencies:
+      '@babel/core': 7.18.9
+      '@babel/parser': 7.18.9
+      '@istanbuljs/schema': 0.1.3
+      istanbul-lib-coverage: 3.2.0
+      semver: 7.5.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /istanbul-lib-report@3.0.0:
     resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
     engines: {node: '>=8'}
@@ -4162,44 +4113,46 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /jest-changed-files@29.5.0:
-    resolution: {integrity: sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==}
+  /jest-changed-files@29.6.3:
+    resolution: {integrity: sha512-G5wDnElqLa4/c66ma5PG9eRjE342lIbF6SUnTJi26C3J28Fv2TVY2rOyKB9YGbSA5ogwevgmxc4j4aVjrEK6Yg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       execa: 5.1.1
+      jest-util: 29.6.3
       p-limit: 3.1.0
     dev: false
 
-  /jest-circus@29.5.0:
-    resolution: {integrity: sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==}
+  /jest-circus@29.6.4:
+    resolution: {integrity: sha512-YXNrRyntVUgDfZbjXWBMPslX1mQ8MrSG0oM/Y06j9EYubODIyHWP8hMUbjbZ19M3M+zamqEur7O80HODwACoJw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/expect': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/environment': 29.6.4
+      '@jest/expect': 29.6.4
+      '@jest/test-result': 29.6.4
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
       chalk: 4.1.2
       co: 4.6.0
-      dedent: 0.7.0
+      dedent: 1.5.1
       is-generator-fn: 2.1.0
-      jest-each: 29.5.0
-      jest-matcher-utils: 29.5.0
-      jest-message-util: 29.5.0
-      jest-runtime: 29.5.0
-      jest-snapshot: 29.5.0
-      jest-util: 29.5.0
+      jest-each: 29.6.3
+      jest-matcher-utils: 29.6.4
+      jest-message-util: 29.6.3
+      jest-runtime: 29.6.4
+      jest-snapshot: 29.6.4
+      jest-util: 29.6.3
       p-limit: 3.1.0
-      pretty-format: 29.5.0
+      pretty-format: 29.6.3
       pure-rand: 6.0.0
       slash: 3.0.0
       stack-utils: 2.0.5
     transitivePeerDependencies:
+      - babel-plugin-macros
       - supports-color
     dev: false
 
-  /jest-cli@29.5.0(@types/node@16.11.7)(ts-node@10.9.1):
-    resolution: {integrity: sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==}
+  /jest-cli@29.6.4(@types/node@16.11.7)(ts-node@10.9.1):
+    resolution: {integrity: sha512-+uMCQ7oizMmh8ZwRfZzKIEszFY9ksjjEQnTEMTaL7fYiL3Kw4XhqT9bYh+A4DQKUb67hZn2KbtEnDuHvcgK4pQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -4208,26 +4161,27 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.5.0(ts-node@10.9.1)
-      '@jest/test-result': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/core': 29.6.4(ts-node@10.9.1)
+      '@jest/test-result': 29.6.4
+      '@jest/types': 29.6.3
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.10
       import-local: 3.1.0
-      jest-config: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
+      jest-config: 29.6.4(@types/node@16.11.7)(ts-node@10.9.1)
+      jest-util: 29.6.3
+      jest-validate: 29.6.3
       prompts: 2.4.2
       yargs: 17.5.1
     transitivePeerDependencies:
       - '@types/node'
+      - babel-plugin-macros
       - supports-color
       - ts-node
     dev: false
 
-  /jest-config@29.5.0(@types/node@16.11.7)(ts-node@10.9.1):
-    resolution: {integrity: sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==}
+  /jest-config@29.6.4(@types/node@16.11.7)(ts-node@10.9.1):
+    resolution: {integrity: sha512-JWohr3i9m2cVpBumQFv2akMEnFEPVOh+9L2xIBJhJ0zOaci2ZXuKJj0tgMKQCBZAKA09H049IR4HVS/43Qb19A==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@types/node': '*'
@@ -4239,68 +4193,59 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.18.9
-      '@jest/test-sequencer': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/test-sequencer': 29.6.4
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
-      babel-jest: 29.5.0(@babel/core@7.18.9)
+      babel-jest: 29.6.4(@babel/core@7.18.9)
       chalk: 4.1.2
       ci-info: 3.3.1
       deepmerge: 4.2.2
       glob: 7.2.0
       graceful-fs: 4.2.10
-      jest-circus: 29.5.0
-      jest-environment-node: 29.5.0
-      jest-get-type: 29.4.3
-      jest-regex-util: 29.4.3
-      jest-resolve: 29.5.0
-      jest-runner: 29.5.0
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
+      jest-circus: 29.6.4
+      jest-environment-node: 29.6.4
+      jest-get-type: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.6.4
+      jest-runner: 29.6.4
+      jest-util: 29.6.3
+      jest-validate: 29.6.3
       micromatch: 4.0.5
       parse-json: 5.2.0
-      pretty-format: 29.5.0
+      pretty-format: 29.6.3
       slash: 3.0.0
       strip-json-comments: 3.1.1
       ts-node: 10.9.1(@swc/core@1.3.38)(@types/node@16.11.7)(typescript@4.7.4)
     transitivePeerDependencies:
+      - babel-plugin-macros
       - supports-color
     dev: false
 
-  /jest-diff@29.0.3:
-    resolution: {integrity: sha512-+X/AIF5G/vX9fWK+Db9bi9BQas7M9oBME7egU7psbn4jlszLFCu0dW63UgeE6cs/GANq4fLaT+8sGHQQ0eCUfg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      chalk: 4.1.2
-      diff-sequences: 29.0.0
-      jest-get-type: 29.4.3
-      pretty-format: 29.5.0
-
-  /jest-diff@29.5.0:
-    resolution: {integrity: sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==}
+  /jest-diff@29.6.4:
+    resolution: {integrity: sha512-9F48UxR9e4XOEZvoUXEHSWY4qC4zERJaOfrbBg9JpbJOO43R1vN76REt/aMGZoY6GD5g84nnJiBIVlscegefpw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
-      diff-sequences: 29.4.3
-      jest-get-type: 29.4.3
-      pretty-format: 29.5.0
-    dev: false
+      diff-sequences: 29.6.3
+      jest-get-type: 29.6.3
+      pretty-format: 29.6.3
 
-  /jest-docblock@29.4.3:
-    resolution: {integrity: sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==}
+  /jest-docblock@29.6.3:
+    resolution: {integrity: sha512-2+H+GOTQBEm2+qFSQ7Ma+BvyV+waiIFxmZF5LdpBsAEjWX8QYjSCa4FrkIYtbfXUJJJnFCYrOtt6TZ+IAiTjBQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       detect-newline: 3.1.0
     dev: false
 
-  /jest-each@29.5.0:
-    resolution: {integrity: sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==}
+  /jest-each@29.6.3:
+    resolution: {integrity: sha512-KoXfJ42k8cqbkfshW7sSHcdfnv5agDdHCPA87ZBdmHP+zJstTJc0ttQaJ/x7zK6noAL76hOuTIJ6ZkQRS5dcyg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       chalk: 4.1.2
-      jest-get-type: 29.4.3
-      jest-util: 29.5.0
-      pretty-format: 29.5.0
+      jest-get-type: 29.6.3
+      jest-util: 29.6.3
+      pretty-format: 29.6.3
     dev: false
 
   /jest-environment-jsdom@29.5.0:
@@ -4326,109 +4271,90 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jest-environment-node@29.5.0:
-    resolution: {integrity: sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==}
+  /jest-environment-node@29.6.4:
+    resolution: {integrity: sha512-i7SbpH2dEIFGNmxGCpSc2w9cA4qVD+wfvg2ZnfQ7XVrKL0NA5uDVBIiGH8SR4F0dKEv/0qI5r+aDomDf04DpEQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/fake-timers': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/environment': 29.6.4
+      '@jest/fake-timers': 29.6.4
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
-      jest-mock: 29.5.0
-      jest-util: 29.5.0
+      jest-mock: 29.6.3
+      jest-util: 29.6.3
     dev: false
 
-  /jest-get-type@29.0.0:
-    resolution: {integrity: sha512-83X19z/HuLKYXYHskZlBAShO7UfLFXu/vWajw9ZNJASN32li8yHMaVGAQqxFW1RCFOkB7cubaL6FaJVQqqJLSw==}
+  /jest-get-type@29.6.3:
+    resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
-  /jest-get-type@29.4.3:
-    resolution: {integrity: sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
-  /jest-haste-map@29.5.0:
-    resolution: {integrity: sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==}
+  /jest-haste-map@29.6.4:
+    resolution: {integrity: sha512-12Ad+VNTDHxKf7k+M65sviyynRoZYuL1/GTuhEVb8RYsNSNln71nANRb/faSyWvx0j+gHcivChXHIoMJrGYjog==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       '@types/graceful-fs': 4.1.5
       '@types/node': 16.11.7
       anymatch: 3.1.2
       fb-watchman: 2.0.1
       graceful-fs: 4.2.10
-      jest-regex-util: 29.4.3
-      jest-util: 29.5.0
-      jest-worker: 29.5.0
+      jest-regex-util: 29.6.3
+      jest-util: 29.6.3
+      jest-worker: 29.6.4
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
       fsevents: 2.3.2
     dev: false
 
-  /jest-leak-detector@29.5.0:
-    resolution: {integrity: sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==}
+  /jest-leak-detector@29.6.3:
+    resolution: {integrity: sha512-0kfbESIHXYdhAdpLsW7xdwmYhLf1BRu4AA118/OxFm0Ho1b2RcTmO4oF6aAMaxpxdxnJ3zve2rgwzNBD4Zbm7Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-get-type: 29.4.3
-      pretty-format: 29.5.0
+      jest-get-type: 29.6.3
+      pretty-format: 29.6.3
     dev: false
 
-  /jest-matcher-utils@29.0.3:
-    resolution: {integrity: sha512-RsR1+cZ6p1hDV4GSCQTg+9qjeotQCgkaleIKLK7dm+U4V/H2bWedU3RAtLm8+mANzZ7eDV33dMar4pejd7047w==}
+  /jest-matcher-utils@29.6.4:
+    resolution: {integrity: sha512-KSzwyzGvK4HcfnserYqJHYi7sZVqdREJ9DMPAKVbS98JsIAvumihaNUbjrWw0St7p9IY7A9UskCW5MYlGmBQFQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
-      jest-diff: 29.0.3
-      jest-get-type: 29.0.0
-      pretty-format: 29.5.0
+      jest-diff: 29.6.4
+      jest-get-type: 29.6.3
+      pretty-format: 29.6.3
 
-  /jest-matcher-utils@29.5.0:
-    resolution: {integrity: sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      chalk: 4.1.2
-      jest-diff: 29.5.0
-      jest-get-type: 29.4.3
-      pretty-format: 29.5.0
-    dev: false
-
-  /jest-message-util@29.0.3:
-    resolution: {integrity: sha512-7T8JiUTtDfppojosORAflABfLsLKMLkBHSWkjNQrjIltGoDzNGn7wEPOSfjqYAGTYME65esQzMJxGDjuLBKdOg==}
+  /jest-message-util@29.6.3:
+    resolution: {integrity: sha512-FtzaEEHzjDpQp51HX4UMkPZjy46ati4T5pEMyM6Ik48ztu4T9LQplZ6OsimHx7EuM9dfEh5HJa6D3trEftu3dA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.10
       micromatch: 4.0.5
-      pretty-format: 29.5.0
+      pretty-format: 29.6.3
       slash: 3.0.0
       stack-utils: 2.0.5
 
-  /jest-message-util@29.5.0:
-    resolution: {integrity: sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==}
+  /jest-mock@29.5.0:
+    resolution: {integrity: sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/code-frame': 7.18.6
-      '@jest/types': 29.5.0
-      '@types/stack-utils': 2.0.1
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      micromatch: 4.0.5
-      pretty-format: 29.5.0
-      slash: 3.0.0
-      stack-utils: 2.0.5
+      '@jest/types': 29.6.3
+      '@types/node': 16.11.7
+      jest-util: 29.6.3
+    dev: true
 
-  /jest-mock@29.5.0:
-    resolution: {integrity: sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==}
+  /jest-mock@29.6.3:
+    resolution: {integrity: sha512-Z7Gs/mOyTSR4yPsaZ72a/MtuK6RnC3JYqWONe48oLaoEcYwEDxqvbXz85G4SJrm2Z5Ar9zp6MiHF4AlFlRM4Pg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
-      jest-util: 29.5.0
+      jest-util: 29.6.3
 
-  /jest-pnp-resolver@1.2.2(jest-resolve@29.5.0):
+  /jest-pnp-resolver@1.2.2(jest-resolve@29.6.4):
     resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
     engines: {node: '>=6'}
     peerDependencies:
@@ -4437,7 +4363,7 @@ packages:
       jest-resolve:
         optional: true
     dependencies:
-      jest-resolve: 29.5.0
+      jest-resolve: 29.6.4
     dev: false
 
   /jest-regex-util@29.0.0:
@@ -4445,122 +4371,119 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: false
 
-  /jest-regex-util@29.4.3:
-    resolution: {integrity: sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==}
+  /jest-regex-util@29.6.3:
+    resolution: {integrity: sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: false
 
-  /jest-resolve-dependencies@29.5.0:
-    resolution: {integrity: sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==}
+  /jest-resolve-dependencies@29.6.4:
+    resolution: {integrity: sha512-7+6eAmr1ZBF3vOAJVsfLj1QdqeXG+WYhidfLHBRZqGN24MFRIiKG20ItpLw2qRAsW/D2ZUUmCNf6irUr/v6KHA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-regex-util: 29.4.3
-      jest-snapshot: 29.5.0
+      jest-regex-util: 29.6.3
+      jest-snapshot: 29.6.4
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /jest-resolve@29.5.0:
-    resolution: {integrity: sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==}
+  /jest-resolve@29.6.4:
+    resolution: {integrity: sha512-fPRq+0vcxsuGlG0O3gyoqGTAxasagOxEuyoxHeyxaZbc9QNek0AmJWSkhjlMG+mTsj+8knc/mWb3fXlRNVih7Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
       graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
-      jest-pnp-resolver: 1.2.2(jest-resolve@29.5.0)
-      jest-util: 29.5.0
-      jest-validate: 29.5.0
+      jest-haste-map: 29.6.4
+      jest-pnp-resolver: 1.2.2(jest-resolve@29.6.4)
+      jest-util: 29.6.3
+      jest-validate: 29.6.3
       resolve: 1.22.1
       resolve.exports: 2.0.1
       slash: 3.0.0
     dev: false
 
-  /jest-runner@29.5.0:
-    resolution: {integrity: sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==}
+  /jest-runner@29.6.4:
+    resolution: {integrity: sha512-SDaLrMmtVlQYDuG0iSPYLycG8P9jLI+fRm8AF/xPKhYDB2g6xDWjXBrR5M8gEWsK6KVFlebpZ4QsrxdyIX1Jaw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.5.0
-      '@jest/environment': 29.5.0
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/console': 29.6.4
+      '@jest/environment': 29.6.4
+      '@jest/test-result': 29.6.4
+      '@jest/transform': 29.6.4
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.10
-      jest-docblock: 29.4.3
-      jest-environment-node: 29.5.0
-      jest-haste-map: 29.5.0
-      jest-leak-detector: 29.5.0
-      jest-message-util: 29.5.0
-      jest-resolve: 29.5.0
-      jest-runtime: 29.5.0
-      jest-util: 29.5.0
-      jest-watcher: 29.5.0
-      jest-worker: 29.5.0
+      jest-docblock: 29.6.3
+      jest-environment-node: 29.6.4
+      jest-haste-map: 29.6.4
+      jest-leak-detector: 29.6.3
+      jest-message-util: 29.6.3
+      jest-resolve: 29.6.4
+      jest-runtime: 29.6.4
+      jest-util: 29.6.3
+      jest-watcher: 29.6.4
+      jest-worker: 29.6.4
       p-limit: 3.1.0
       source-map-support: 0.5.13
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /jest-runtime@29.5.0:
-    resolution: {integrity: sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==}
+  /jest-runtime@29.6.4:
+    resolution: {integrity: sha512-s/QxMBLvmwLdchKEjcLfwzP7h+jsHvNEtxGP5P+Fl1FMaJX2jMiIqe4rJw4tFprzCwuSvVUo9bn0uj4gNRXsbA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/fake-timers': 29.5.0
-      '@jest/globals': 29.5.0
-      '@jest/source-map': 29.4.3
-      '@jest/test-result': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/environment': 29.6.4
+      '@jest/fake-timers': 29.6.4
+      '@jest/globals': 29.6.4
+      '@jest/source-map': 29.6.3
+      '@jest/test-result': 29.6.4
+      '@jest/transform': 29.6.4
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
       glob: 7.2.0
       graceful-fs: 4.2.10
-      jest-haste-map: 29.5.0
-      jest-message-util: 29.5.0
-      jest-mock: 29.5.0
-      jest-regex-util: 29.4.3
-      jest-resolve: 29.5.0
-      jest-snapshot: 29.5.0
-      jest-util: 29.5.0
+      jest-haste-map: 29.6.4
+      jest-message-util: 29.6.3
+      jest-mock: 29.6.3
+      jest-regex-util: 29.6.3
+      jest-resolve: 29.6.4
+      jest-snapshot: 29.6.4
+      jest-util: 29.6.3
       slash: 3.0.0
       strip-bom: 4.0.0
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /jest-snapshot@29.5.0:
-    resolution: {integrity: sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==}
+  /jest-snapshot@29.6.4:
+    resolution: {integrity: sha512-VC1N8ED7+4uboUKGIDsbvNAZb6LakgIPgAF4RSpF13dN6YaMokfRqO+BaqK4zIh6X3JffgwbzuGqDEjHm/MrvA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/core': 7.18.9
       '@babel/generator': 7.18.9
       '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.18.9)
       '@babel/plugin-syntax-typescript': 7.17.12(@babel/core@7.18.9)
-      '@babel/traverse': 7.18.9
       '@babel/types': 7.18.9
-      '@jest/expect-utils': 29.5.0
-      '@jest/transform': 29.5.0
-      '@jest/types': 29.5.0
-      '@types/babel__traverse': 7.17.1
-      '@types/prettier': 2.6.3
+      '@jest/expect-utils': 29.6.4
+      '@jest/transform': 29.6.4
+      '@jest/types': 29.6.3
       babel-preset-current-node-syntax: 1.0.1(@babel/core@7.18.9)
       chalk: 4.1.2
-      expect: 29.5.0
+      expect: 29.6.4
       graceful-fs: 4.2.10
-      jest-diff: 29.5.0
-      jest-get-type: 29.4.3
-      jest-matcher-utils: 29.5.0
-      jest-message-util: 29.5.0
-      jest-util: 29.5.0
+      jest-diff: 29.6.4
+      jest-get-type: 29.6.3
+      jest-matcher-utils: 29.6.4
+      jest-message-util: 29.6.3
+      jest-util: 29.6.3
       natural-compare: 1.4.0
-      pretty-format: 29.5.0
-      semver: 7.3.7
+      pretty-format: 29.6.3
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -4582,41 +4505,42 @@ packages:
       styled-components: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0)
     dev: true
 
-  /jest-util@29.0.3:
-    resolution: {integrity: sha512-Q0xaG3YRG8QiTC4R6fHjHQPaPpz9pJBEi0AeOE4mQh/FuWOijFjGXMMOfQEaU9i3z76cNR7FobZZUQnL6IyfdQ==}
+  /jest-util@29.5.0:
+    resolution: {integrity: sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
       chalk: 4.1.2
       ci-info: 3.3.1
       graceful-fs: 4.2.10
       picomatch: 2.3.1
+    dev: true
 
-  /jest-util@29.5.0:
-    resolution: {integrity: sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==}
+  /jest-util@29.6.3:
+    resolution: {integrity: sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
       chalk: 4.1.2
       ci-info: 3.3.1
       graceful-fs: 4.2.10
       picomatch: 2.3.1
 
-  /jest-validate@29.5.0:
-    resolution: {integrity: sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==}
+  /jest-validate@29.6.3:
+    resolution: {integrity: sha512-e7KWZcAIX+2W1o3cHfnqpGajdCs1jSM3DkXjGeLSNmCazv1EeI1ggTeK5wdZhF+7N+g44JI2Od3veojoaumlfg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       camelcase: 6.3.0
       chalk: 4.1.2
-      jest-get-type: 29.4.3
+      jest-get-type: 29.6.3
       leven: 3.1.0
-      pretty-format: 29.5.0
+      pretty-format: 29.6.3
     dev: false
 
-  /jest-watch-typeahead@2.2.2(jest@29.5.0):
+  /jest-watch-typeahead@2.2.2(jest@29.6.4):
     resolution: {integrity: sha512-+QgOFW4o5Xlgd6jGS5X37i08tuuXNW8X0CV9WNFi+3n8ExCIP+E1melYhvYLjv5fE6D0yyzk74vsSO8I6GqtvQ==}
     engines: {node: ^14.17.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -4624,7 +4548,7 @@ packages:
     dependencies:
       ansi-escapes: 6.0.0
       chalk: 5.2.0
-      jest: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
+      jest: 29.6.4(@types/node@16.11.7)(ts-node@10.9.1)
       jest-regex-util: 29.0.0
       jest-watcher: 29.0.3
       slash: 5.0.0
@@ -4636,42 +4560,42 @@ packages:
     resolution: {integrity: sha512-tQX9lU91A+9tyUQKUMp0Ns8xAcdhC9fo73eqA3LFxP2bSgiF49TNcc+vf3qgGYYK9qRjFpXW9+4RgF/mbxyOOw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.0.3
-      '@jest/types': 29.5.0
+      '@jest/test-result': 29.6.4
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.10.2
-      jest-util: 29.5.0
+      jest-util: 29.6.3
       string-length: 4.0.2
     dev: false
 
-  /jest-watcher@29.5.0:
-    resolution: {integrity: sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==}
+  /jest-watcher@29.6.4:
+    resolution: {integrity: sha512-oqUWvx6+On04ShsT00Ir9T4/FvBeEh2M9PTubgITPxDa739p4hoQweWPRGyYeaojgT0xTpZKF0Y/rSY1UgMxvQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/test-result': 29.6.4
+      '@jest/types': 29.6.3
       '@types/node': 16.11.7
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
-      jest-util: 29.5.0
+      jest-util: 29.6.3
       string-length: 4.0.2
     dev: false
 
-  /jest-worker@29.5.0:
-    resolution: {integrity: sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==}
+  /jest-worker@29.6.4:
+    resolution: {integrity: sha512-6dpvFV4WjcWbDVGgHTWo/aupl8/LbBx2NSKfiwqf79xC/yeJjKHT1+StcKy/2KTmW16hE68ccKVOtXf+WZGz7Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@types/node': 16.11.7
-      jest-util: 29.5.0
+      jest-util: 29.6.3
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: false
 
-  /jest@29.5.0(@types/node@16.11.7)(ts-node@10.9.1):
-    resolution: {integrity: sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==}
+  /jest@29.6.4(@types/node@16.11.7)(ts-node@10.9.1):
+    resolution: {integrity: sha512-tEFhVQFF/bzoYV1YuGyzLPZ6vlPrdfvDmmAxudA1dLEuiztqg2Rkx20vkKY32xiDROcD2KXlgZ7Cu8RPeEHRKw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -4680,12 +4604,13 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.5.0(ts-node@10.9.1)
-      '@jest/types': 29.5.0
+      '@jest/core': 29.6.4(ts-node@10.9.1)
+      '@jest/types': 29.6.3
       import-local: 3.1.0
-      jest-cli: 29.5.0(@types/node@16.11.7)(ts-node@10.9.1)
+      jest-cli: 29.6.4(@types/node@16.11.7)(ts-node@10.9.1)
     transitivePeerDependencies:
       - '@types/node'
+      - babel-plugin-macros
       - supports-color
       - ts-node
     dev: false
@@ -5390,19 +5315,11 @@ packages:
       ansi-styles: 5.2.0
       react-is: 17.0.2
 
-  /pretty-format@29.0.3:
-    resolution: {integrity: sha512-cHudsvQr1K5vNVLbvYF/nv3Qy/F/BcEKxGuIeMiVMRHxPOO1RxXooP8g/ZrwAp7Dx+KdMZoOc7NxLHhMrP2f9Q==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/schemas': 29.0.0
-      ansi-styles: 5.2.0
-      react-is: 18.2.0
-
-  /pretty-format@29.5.0:
-    resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==}
+  /pretty-format@29.6.3:
+    resolution: {integrity: sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.4.3
+      '@jest/schemas': 29.6.3
       ansi-styles: 5.2.0
       react-is: 18.2.0
 
@@ -5888,6 +5805,14 @@ packages:
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
+    dev: true
+
+  /semver@7.5.4:
+    resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
 
   /shallowequal@1.1.0:
     resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
@@ -6420,7 +6345,7 @@ packages:
     resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
     engines: {node: '>=10.12.0'}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.15
+      '@jridgewell/trace-mapping': 0.3.19
       '@types/istanbul-lib-coverage': 2.0.3
       convert-source-map: 1.7.0
     dev: false

From 552691fc5d1f79156b6209ff683abe94f0a39d43 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:45:24 +0400
Subject: [PATCH 700/734] Bump use-debounce from 9.0.3 to 9.0.4 in
 /kafka-ui-react-app (#4160)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 31152122586..bada40e72f0 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -115,7 +115,7 @@ dependencies:
     version: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0)
   use-debounce:
     specifier: ^9.0.3
-    version: 9.0.3(react@18.1.0)
+    version: 9.0.4(react@18.1.0)
   vite:
     specifier: ^4.0.0
     version: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
@@ -6308,8 +6308,8 @@ packages:
       requires-port: 1.0.0
     dev: true
 
-  /use-debounce@9.0.3(react@18.1.0):
-    resolution: {integrity: sha512-FhtlbDtDXILJV7Lix5OZj5yX/fW1tzq+VrvK1fnT2bUrPOGruU9Rw8NCEn+UI9wopfERBEZAOQ8lfeCJPllgnw==}
+  /use-debounce@9.0.4(react@18.1.0):
+    resolution: {integrity: sha512-6X8H/mikbrt0XE8e+JXRtZ8yYVvKkdYRfmIhWZYsP8rcNs9hk3APV8Ua2mFkKRLcJKVdnX2/Vwrmg2GWKUQEaQ==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       react: '>=16.8.0'

From 8f2a29d15ddbcb49675fef0e81cebc42cf2bebf3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:46:10 +0400
Subject: [PATCH 701/734] Bump aws-actions/configure-aws-credentials from 2 to
 3 (#4169)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/aws_publisher.yaml             | 2 +-
 .github/workflows/branch-deploy.yml              | 2 +-
 .github/workflows/build-public-image.yml         | 2 +-
 .github/workflows/delete-public-image.yml        | 2 +-
 .github/workflows/e2e-automation.yml             | 2 +-
 .github/workflows/e2e-checks.yaml                | 2 +-
 .github/workflows/e2e-weekly.yml                 | 2 +-
 .github/workflows/separate_env_public_create.yml | 2 +-
 .github/workflows/terraform-deploy.yml           | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/aws_publisher.yaml b/.github/workflows/aws_publisher.yaml
index 4aa59876c6c..5ce2b587fb9 100644
--- a/.github/workflows/aws_publisher.yaml
+++ b/.github/workflows/aws_publisher.yaml
@@ -31,7 +31,7 @@ jobs:
           echo "Packer will be triggered in this dir $WORK_DIR"
 
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-access-key-id: ${{ secrets.AWS_AMI_PUBLISH_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_AMI_PUBLISH_KEY_SECRET }}
diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml
index 5ba69390fcd..2aa76126299 100644
--- a/.github/workflows/branch-deploy.yml
+++ b/.github/workflows/branch-deploy.yml
@@ -45,7 +45,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/build-public-image.yml b/.github/workflows/build-public-image.yml
index dc01cff1318..5f6c46e25eb 100644
--- a/.github/workflows/build-public-image.yml
+++ b/.github/workflows/build-public-image.yml
@@ -42,7 +42,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/delete-public-image.yml b/.github/workflows/delete-public-image.yml
index 37391bd9bd7..45b4e8f7f37 100644
--- a/.github/workflows/delete-public-image.yml
+++ b/.github/workflows/delete-public-image.yml
@@ -15,7 +15,7 @@ jobs:
           tag='${{ github.event.pull_request.number }}'
           echo "tag=${tag}" >> $GITHUB_OUTPUT
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/e2e-automation.yml b/.github/workflows/e2e-automation.yml
index ab5d781b387..b3bb2f266fc 100644
--- a/.github/workflows/e2e-automation.yml
+++ b/.github/workflows/e2e-automation.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           ref: ${{ github.sha }}
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/e2e-checks.yaml b/.github/workflows/e2e-checks.yaml
index d08e0cade79..e62cd724a8f 100644
--- a/.github/workflows/e2e-checks.yaml
+++ b/.github/workflows/e2e-checks.yaml
@@ -18,7 +18,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-access-key-id: ${{ secrets.S3_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.S3_AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/e2e-weekly.yml b/.github/workflows/e2e-weekly.yml
index 78363de8d8d..439d8037649 100644
--- a/.github/workflows/e2e-weekly.yml
+++ b/.github/workflows/e2e-weekly.yml
@@ -11,7 +11,7 @@ jobs:
         with:
           ref: ${{ github.sha }}
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/separate_env_public_create.yml b/.github/workflows/separate_env_public_create.yml
index dd4506d3ba2..cac2d444ecd 100644
--- a/.github/workflows/separate_env_public_create.yml
+++ b/.github/workflows/separate_env_public_create.yml
@@ -47,7 +47,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
diff --git a/.github/workflows/terraform-deploy.yml b/.github/workflows/terraform-deploy.yml
index 1b4b367979c..e42d52b11a1 100644
--- a/.github/workflows/terraform-deploy.yml
+++ b/.github/workflows/terraform-deploy.yml
@@ -26,7 +26,7 @@ jobs:
           echo "Terraform will be triggered in this dir $TF_DIR"
 
       - name: Configure AWS credentials for Kafka-UI account
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v3
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

From 0d6f293ab97720ee7e7f25b4fc48af4ea68d1fbd Mon Sep 17 00:00:00 2001
From: Prady <pradyumnadoddala@gmail.com>
Date: Tue, 29 Aug 2023 09:53:13 -0400
Subject: [PATCH 702/734] FE: Topic analysis: Updated style for percentage of
 completion (#4123)

---
 .../src/components/Topics/Topic/Statistics/Metrics.tsx     | 4 +++-
 .../Topics/Topic/Statistics/Statistics.styles.ts           | 7 +++++++
 kafka-ui-react-app/src/theme/theme.ts                      | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
index eae9d4b3ce7..69da71c31bf 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Metrics.tsx
@@ -44,9 +44,11 @@ const Metrics: React.FC = () => {
   if (data.progress) {
     return (
       <S.ProgressContainer>
+        <S.ProgressPct>
+          {Math.floor(data.progress.completenessPercent || 0)}%
+        </S.ProgressPct>
         <S.ProgressBarWrapper>
           <ProgressBar completed={data.progress.completenessPercent || 0} />
-          <span> {Math.floor(data.progress.completenessPercent || 0)} %</span>
         </S.ProgressBarWrapper>
         <ActionButton
           onClick={async () => {
diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts
index 06a4ae9c9d8..ca98cdcbfd0 100644
--- a/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts
+++ b/kafka-ui-react-app/src/components/Topics/Topic/Statistics/Statistics.styles.ts
@@ -42,3 +42,10 @@ export const ProgressBarWrapper = styled.div`
   align-items: center;
   width: 280px;
 `;
+
+export const ProgressPct = styled.span`
+  font-size: 15px;
+  font-weight: bold;
+  line-height: 1.5;
+  color: ${({ theme }) => theme.statictics.progressPctColor};
+`;
diff --git a/kafka-ui-react-app/src/theme/theme.ts b/kafka-ui-react-app/src/theme/theme.ts
index 5ff21fe7e3d..8426d3c2fcd 100644
--- a/kafka-ui-react-app/src/theme/theme.ts
+++ b/kafka-ui-react-app/src/theme/theme.ts
@@ -291,6 +291,7 @@ const baseTheme = {
   },
   statictics: {
     createdAtColor: Colors.neutral[50],
+    progressPctColor: Colors.neutral[100],
   },
   progressBar: {
     backgroundColor: Colors.neutral[3],

From 80024c8758c47d8ed33c19bdc1c344a5f2f5833f Mon Sep 17 00:00:00 2001
From: Shubhadeep Das <dshubhadeep@gmail.com>
Date: Tue, 29 Aug 2023 19:24:21 +0530
Subject: [PATCH 703/734] BE: Fix sonar code smells (#3971)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../ui/config/CorsGlobalConfiguration.java    |   2 -
 .../kafka/ui/config/WebclientProperties.java  |   1 -
 .../ui/config/auth/AuthenticatedUser.java     |   1 -
 .../kafka/ui/config/auth/RbacOAuth2User.java  |   1 -
 .../kafka/ui/config/auth/RbacOidcUser.java    |   1 -
 .../kafka/ui/controller/AccessController.java |   7 +-
 .../ui/controller/BrokersController.java      |   8 +-
 .../controller/ConsumerGroupsController.java  |   3 +-
 .../ui/controller/KafkaConnectController.java |  11 +-
 .../ui/controller/SchemasController.java      |   3 +-
 .../kafka/ui/controller/TopicsController.java |   4 +-
 .../kafka/ui/emitter/OffsetsInfo.java         |   3 +-
 .../GlobalErrorWebExceptionHandler.java       |   2 +-
 .../kafka/ui/mapper/ClusterMapper.java        |   7 +-
 .../ui/mapper/DescribeLogDirsMapper.java      |   6 +-
 .../kafka/ui/model/InternalLogDirStats.java   |   2 +-
 .../kafka/ui/model/rbac/AccessContext.java    |  20 +-
 .../kafka/ui/serdes/builtin/Base64Serde.java  |   1 -
 .../serdes/builtin/ConsumerOffsetsSerde.java  | 173 ++++++++++--------
 .../kafka/ui/serdes/builtin/Int32Serde.java   |   1 -
 .../builtin/sr/SchemaRegistrySerde.java       |   8 +-
 .../ui/service/metrics/WellKnownMetrics.java  |  15 +-
 .../ui/service/rbac/AccessControlService.java |   9 +-
 .../util/jsonschema/JsonAvroConversion.java   |  18 +-
 .../jsonschema/ProtobufSchemaConverter.java   |  19 +-
 .../com/provectus/kafka/ui/models/Schema.java |   8 +-
 .../ui/pages/topics/TopicCreateEditForm.java  |   8 +-
 27 files changed, 183 insertions(+), 159 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java
index 448f92ad477..a0f892492e1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/CorsGlobalConfiguration.java
@@ -7,8 +7,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.http.server.reactive.ServerHttpResponse;
-import org.springframework.web.reactive.config.CorsRegistry;
-import org.springframework.web.reactive.config.WebFluxConfigurer;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.WebFilterChain;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/WebclientProperties.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/WebclientProperties.java
index ad7732612d4..24d8bf01db1 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/WebclientProperties.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/WebclientProperties.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.config;
 
 import com.provectus.kafka.ui.exception.ValidationException;
-import java.beans.Transient;
 import javax.annotation.PostConstruct;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AuthenticatedUser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AuthenticatedUser.java
index bb69e2ddcd8..9ff33cad3a2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AuthenticatedUser.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/AuthenticatedUser.java
@@ -1,7 +1,6 @@
 package com.provectus.kafka.ui.config.auth;
 
 import java.util.Collection;
-import lombok.Value;
 
 public record AuthenticatedUser(String principal, Collection<String> groups) {
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOAuth2User.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOAuth2User.java
index 79f3055413e..ce0622cc18e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOAuth2User.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOAuth2User.java
@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 import java.util.Map;
-import lombok.Value;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOidcUser.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOidcUser.java
index 2ecab7343f3..9642883f432 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOidcUser.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/RbacOidcUser.java
@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 import java.util.Map;
-import lombok.Value;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
index b6522647b45..e6f2e3fdfdd 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/AccessController.java
@@ -13,7 +13,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +37,7 @@ public Mono<ResponseEntity<AuthenticationInfoDTO>> getUserAuthInfo(ServerWebExch
             .filter(role -> user.groups().contains(role.getName()))
             .map(role -> mapPermissions(role.getPermissions(), role.getClusters()))
             .flatMap(Collection::stream)
-            .collect(Collectors.toList())
+            .toList()
         )
         .switchIfEmpty(Mono.just(Collections.emptyList()));
 
@@ -70,10 +69,10 @@ private List<UserPermissionDTO> mapPermissions(List<Permission> permissions, Lis
               .map(String::toUpperCase)
               .map(this::mapAction)
               .filter(Objects::nonNull)
-              .collect(Collectors.toList()));
+              .toList());
           return dto;
         })
-        .collect(Collectors.toList());
+        .toList();
   }
 
   @Nullable
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
index a3209ce7227..31f02e2b4c8 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/BrokersController.java
@@ -26,6 +26,8 @@
 @RequiredArgsConstructor
 @Slf4j
 public class BrokersController extends AbstractController implements BrokersApi {
+  private static final String BROKER_ID = "brokerId";
+
   private final BrokerService brokerService;
   private final ClusterMapper clusterMapper;
 
@@ -89,7 +91,7 @@ public Mono<ResponseEntity<Flux<BrokerConfigDTO>>> getBrokerConfig(String cluste
         .cluster(clusterName)
         .clusterConfigActions(ClusterConfigAction.VIEW)
         .operationName("getBrokerConfig")
-        .operationParams(Map.of("brokerId", id))
+        .operationParams(Map.of(BROKER_ID, id))
         .build();
 
     return validateAccess(context).thenReturn(
@@ -108,7 +110,7 @@ public Mono<ResponseEntity<Void>> updateBrokerTopicPartitionLogDir(String cluste
         .cluster(clusterName)
         .clusterConfigActions(ClusterConfigAction.VIEW, ClusterConfigAction.EDIT)
         .operationName("updateBrokerTopicPartitionLogDir")
-        .operationParams(Map.of("brokerId", id))
+        .operationParams(Map.of(BROKER_ID, id))
         .build();
 
     return validateAccess(context).then(
@@ -128,7 +130,7 @@ public Mono<ResponseEntity<Void>> updateBrokerConfigByName(String clusterName,
         .cluster(clusterName)
         .clusterConfigActions(ClusterConfigAction.VIEW, ClusterConfigAction.EDIT)
         .operationName("updateBrokerConfigByName")
-        .operationParams(Map.of("brokerId", id))
+        .operationParams(Map.of(BROKER_ID, id))
         .build();
 
     return validateAccess(context).then(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
index aac43855afe..d4214e28770 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ConsumerGroupsController.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -200,7 +199,7 @@ private ConsumerGroupsPageResponseDTO convertPage(ConsumerGroupService.ConsumerG
         .consumerGroups(consumerGroupConsumerGroupsPage.consumerGroups()
             .stream()
             .map(ConsumerGroupMapper::toDto)
-            .collect(Collectors.toList()));
+            .toList());
   }
 
 }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
index 9d2376c22f0..eb215b10992 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/KafkaConnectController.java
@@ -36,6 +36,7 @@
 public class KafkaConnectController extends AbstractController implements KafkaConnectApi {
   private static final Set<ConnectorActionDTO> RESTART_ACTIONS
       = Set.of(RESTART, RESTART_FAILED_TASKS, RESTART_ALL_TASKS);
+  private static final String CONNECTOR_NAME = "connectorName";
 
   private final KafkaConnectService kafkaConnectService;
 
@@ -112,7 +113,7 @@ public Mono<ResponseEntity<Void>> deleteConnector(String clusterName, String con
         .connect(connectName)
         .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
         .operationName("deleteConnector")
-        .operationParams(Map.of("connectorName", connectName))
+        .operationParams(Map.of(CONNECTOR_NAME, connectName))
         .build();
 
     return validateAccess(context).then(
@@ -180,7 +181,7 @@ public Mono<ResponseEntity<ConnectorDTO>> setConnectorConfig(String clusterName,
         .connect(connectName)
         .connectActions(ConnectAction.VIEW, ConnectAction.EDIT)
         .operationName("setConnectorConfig")
-        .operationParams(Map.of("connectorName", connectorName))
+        .operationParams(Map.of(CONNECTOR_NAME, connectorName))
         .build();
 
     return validateAccess(context).then(
@@ -207,7 +208,7 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
         .connect(connectName)
         .connectActions(connectActions)
         .operationName("updateConnectorState")
-        .operationParams(Map.of("connectorName", connectorName))
+        .operationParams(Map.of(CONNECTOR_NAME, connectorName))
         .build();
 
     return validateAccess(context).then(
@@ -227,7 +228,7 @@ public Mono<ResponseEntity<Flux<TaskDTO>>> getConnectorTasks(String clusterName,
         .connect(connectName)
         .connectActions(ConnectAction.VIEW)
         .operationName("getConnectorTasks")
-        .operationParams(Map.of("connectorName", connectorName))
+        .operationParams(Map.of(CONNECTOR_NAME, connectorName))
         .build();
 
     return validateAccess(context).thenReturn(
@@ -247,7 +248,7 @@ public Mono<ResponseEntity<Void>> restartConnectorTask(String clusterName, Strin
         .connect(connectName)
         .connectActions(ConnectAction.VIEW, ConnectAction.RESTART)
         .operationName("restartConnectorTask")
-        .operationParams(Map.of("connectorName", connectorName))
+        .operationParams(Map.of(CONNECTOR_NAME, connectorName))
         .build();
 
     return validateAccess(context).then(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
index a6cee97fd3a..481ff4c75b5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/SchemasController.java
@@ -15,7 +15,6 @@
 import com.provectus.kafka.ui.service.SchemaRegistryService;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -235,7 +234,7 @@ public Mono<ResponseEntity<SchemaSubjectsResponseDTO>> getSchemas(String cluster
           List<String> subjectsToRender = filteredSubjects.stream()
               .skip(subjectToSkip)
               .limit(pageSize)
-              .collect(Collectors.toList());
+              .toList();
           return schemaRegistryService.getAllLatestVersionSchemas(getCluster(clusterName), subjectsToRender)
               .map(subjs -> subjs.stream().map(kafkaSrMapper::toDto).toList())
               .map(subjs -> new SchemaSubjectsResponseDTO().pageCount(totalPages).schemas(subjs));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
index d422a2cbc68..1e391636815 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
@@ -143,7 +143,7 @@ public Mono<ResponseEntity<Flux<TopicConfigDTO>>> getTopicConfigs(
             .map(lst -> lst.stream()
                 .map(InternalTopicConfig::from)
                 .map(clusterMapper::toTopicConfig)
-                .collect(toList()))
+                .toList())
             .map(Flux::fromIterable)
             .map(ResponseEntity::ok)
     ).doOnEach(sig -> audit(context, sig));
@@ -207,7 +207,7 @@ public Mono<ResponseEntity<TopicsResponseDTO>> getTopics(String clusterName,
           return topicsService.loadTopics(getCluster(clusterName), topicsPage)
               .map(topicsToRender ->
                   new TopicsResponseDTO()
-                      .topics(topicsToRender.stream().map(clusterMapper::toTopic).collect(toList()))
+                      .topics(topicsToRender.stream().map(clusterMapper::toTopic).toList())
                       .pageCount(totalPages));
         })
         .map(ResponseEntity::ok)
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java
index 24e2a0aa889..85802724178 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/emitter/OffsetsInfo.java
@@ -5,7 +5,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.mutable.MutableLong;
@@ -28,7 +27,7 @@ class OffsetsInfo {
     this(consumer,
         consumer.partitionsFor(topic).stream()
             .map(pi -> new TopicPartition(topic, pi.partition()))
-            .collect(Collectors.toList())
+            .toList()
     );
   }
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/GlobalErrorWebExceptionHandler.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/GlobalErrorWebExceptionHandler.java
index 8ad83fe47dd..1d7cddf423f 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/GlobalErrorWebExceptionHandler.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/GlobalErrorWebExceptionHandler.java
@@ -106,7 +106,7 @@ private Mono<ServerResponse> render(WebExchangeBindException exception, ServerRe
           err.setFieldName(e.getKey());
           err.setRestrictions(List.copyOf(e.getValue()));
           return err;
-        }).collect(Collectors.toList());
+        }).toList();
 
     var message = fieldsErrors.isEmpty()
         ? exception.getMessage()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index a122a269a4e..9317ac7b9c3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -33,7 +33,6 @@
 import com.provectus.kafka.ui.service.metrics.RawMetric;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.apache.kafka.common.acl.AccessControlEntry;
 import org.apache.kafka.common.acl.AclBinding;
@@ -54,7 +53,7 @@ public interface ClusterMapper {
 
   default ClusterMetricsDTO toClusterMetrics(Metrics metrics) {
     return new ClusterMetricsDTO()
-        .items(metrics.getSummarizedMetrics().map(this::convert).collect(Collectors.toList()));
+        .items(metrics.getSummarizedMetrics().map(this::convert).toList());
   }
 
   private MetricDTO convert(RawMetric rawMetric) {
@@ -66,7 +65,7 @@ private MetricDTO convert(RawMetric rawMetric) {
 
   default BrokerMetricsDTO toBrokerMetrics(List<RawMetric> metrics) {
     return new BrokerMetricsDTO()
-        .metrics(metrics.stream().map(this::convert).collect(Collectors.toList()));
+        .metrics(metrics.stream().map(this::convert).toList());
   }
 
   @Mapping(target = "isSensitive", source = "sensitive")
@@ -107,7 +106,7 @@ default ConfigSynonymDTO toConfigSynonym(ConfigEntry.ConfigSynonym config) {
   List<ClusterDTO.FeaturesEnum> toFeaturesEnum(List<ClusterFeature> features);
 
   default List<PartitionDTO> map(Map<Integer, InternalPartition> map) {
-    return map.values().stream().map(this::toPartition).collect(Collectors.toList());
+    return map.values().stream().map(this::toPartition).toList();
   }
 
   default BrokerDiskUsageDTO map(Integer id, InternalBrokerDiskUsage internalBrokerDiskUsage) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/DescribeLogDirsMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/DescribeLogDirsMapper.java
index 3d84aa3ad90..d07eff2e0a5 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/DescribeLogDirsMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/DescribeLogDirsMapper.java
@@ -21,7 +21,7 @@ public List<BrokersLogdirsDTO> toBrokerLogDirsList(
     return logDirsInfo.entrySet().stream().map(
         mapEntry -> mapEntry.getValue().entrySet().stream()
             .map(e -> toBrokerLogDirs(mapEntry.getKey(), e.getKey(), e.getValue()))
-            .collect(Collectors.toList())
+            .toList()
     ).flatMap(Collection::stream).collect(Collectors.toList());
   }
 
@@ -35,7 +35,7 @@ private BrokersLogdirsDTO toBrokerLogDirs(Integer broker, String dirName,
     var topics = logDirInfo.replicaInfos.entrySet().stream()
         .collect(Collectors.groupingBy(e -> e.getKey().topic())).entrySet().stream()
         .map(e -> toTopicLogDirs(broker, e.getKey(), e.getValue()))
-        .collect(Collectors.toList());
+        .toList();
     result.setTopics(topics);
     return result;
   }
@@ -48,7 +48,7 @@ private BrokerTopicLogdirsDTO toTopicLogDirs(Integer broker, String name,
     topic.setPartitions(
         partitions.stream().map(
             e -> topicPartitionLogDir(
-                broker, e.getKey().partition(), e.getValue())).collect(Collectors.toList())
+                broker, e.getKey().partition(), e.getValue())).toList()
     );
     return topic;
   }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalLogDirStats.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalLogDirStats.java
index 34ec3d59e3e..7fcecd9ab66 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalLogDirStats.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalLogDirStats.java
@@ -44,7 +44,7 @@ public InternalLogDirStats(Map<Integer, Map<String, DescribeLogDirsResponse.LogD
                 topicMap.getValue().replicaInfos.entrySet().stream()
                     .map(e -> Tuples.of(b.getKey(), e.getKey(), e.getValue().size))
             )
-        ).collect(toList());
+        ).toList();
 
     partitionsStats = topicPartitions.stream().collect(
         groupingBy(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
index cf126bf3dfe..dfa6ad7b371 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/AccessContext.java
@@ -52,6 +52,8 @@ public static AccessContextBuilder builder() {
   }
 
   public static final class AccessContextBuilder {
+    private static final String ACTIONS_NOT_PRESENT = "actions not present";
+
     private Collection<ApplicationConfigAction> applicationConfigActions = Collections.emptySet();
     private String cluster;
     private Collection<ClusterConfigAction> clusterConfigActions = Collections.emptySet();
@@ -75,7 +77,7 @@ private AccessContextBuilder() {
     }
 
     public AccessContextBuilder applicationConfigActions(ApplicationConfigAction... actions) {
-      Assert.isTrue(actions.length > 0, "actions not present");
+      Assert.isTrue(actions.length > 0, ACTIONS_NOT_PRESENT);
       this.applicationConfigActions = List.of(actions);
       return this;
     }
@@ -86,7 +88,7 @@ public AccessContextBuilder cluster(String cluster) {
     }
 
     public AccessContextBuilder clusterConfigActions(ClusterConfigAction... actions) {
-      Assert.isTrue(actions.length > 0, "actions not present");
+      Assert.isTrue(actions.length > 0, ACTIONS_NOT_PRESENT);
       this.clusterConfigActions = List.of(actions);
       return this;
     }
@@ -97,7 +99,7 @@ public AccessContextBuilder topic(String topic) {
     }
 
     public AccessContextBuilder topicActions(TopicAction... actions) {
-      Assert.isTrue(actions.length > 0, "actions not present");
+      Assert.isTrue(actions.length > 0, ACTIONS_NOT_PRESENT);
       this.topicActions = List.of(actions);
       return this;
     }
@@ -108,7 +110,7 @@ public AccessContextBuilder consumerGroup(String consumerGroup) {
     }
 
     public AccessContextBuilder consumerGroupActions(ConsumerGroupAction... actions) {
-      Assert.isTrue(actions.length > 0, "actions not present");
+      Assert.isTrue(actions.length > 0, ACTIONS_NOT_PRESENT);
       this.consumerGroupActions = List.of(actions);
       return this;
     }
@@ -119,7 +121,7 @@ public AccessContextBuilder connect(String connect) {
     }
 
     public AccessContextBuilder connectActions(ConnectAction... actions) {
-      Assert.isTrue(actions.length > 0, "actions not present");
+      Assert.isTrue(actions.length > 0, ACTIONS_NOT_PRESENT);
       this.connectActions = List.of(actions);
       return this;
     }
@@ -135,25 +137,25 @@ public AccessContextBuilder schema(String schema) {
     }
 
     public AccessContextBuilder schemaActions(SchemaAction... actions) {
-      Assert.isTrue(actions.length > 0, "actions not present");
+      Assert.isTrue(actions.length > 0, ACTIONS_NOT_PRESENT);
       this.schemaActions = List.of(actions);
       return this;
     }
 
     public AccessContextBuilder ksqlActions(KsqlAction... actions) {
-      Assert.isTrue(actions.length > 0, "actions not present");
+      Assert.isTrue(actions.length > 0, ACTIONS_NOT_PRESENT);
       this.ksqlActions = List.of(actions);
       return this;
     }
 
     public AccessContextBuilder aclActions(AclAction... actions) {
-      Assert.isTrue(actions.length > 0, "actions not present");
+      Assert.isTrue(actions.length > 0, ACTIONS_NOT_PRESENT);
       this.aclActions = List.of(actions);
       return this;
     }
 
     public AccessContextBuilder auditActions(AuditAction... actions) {
-      Assert.isTrue(actions.length > 0, "actions not present");
+      Assert.isTrue(actions.length > 0, ACTIONS_NOT_PRESENT);
       this.auditActions = List.of(actions);
       return this;
     }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java
index e27215f6884..9c2b00bfdf2 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Base64Serde.java
@@ -6,7 +6,6 @@
 import java.util.Base64;
 import java.util.Map;
 import java.util.Optional;
-import org.apache.kafka.common.header.Headers;
 
 public class Base64Serde implements BuiltInSerde {
 
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java
index 5ce48e79e2e..8a0c0e2bfa7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ConsumerOffsetsSerde.java
@@ -28,6 +28,23 @@ public class ConsumerOffsetsSerde implements BuiltInSerde {
 
   private static final JsonMapper JSON_MAPPER = createMapper();
 
+  private static final String ASSIGNMENT = "assignment";
+  private static final String CLIENT_HOST = "client_host";
+  private static final String CLIENT_ID = "client_id";
+  private static final String COMMIT_TIMESTAMP = "commit_timestamp";
+  private static final String CURRENT_STATE_TIMESTAMP = "current_state_timestamp";
+  private static final String GENERATION = "generation";
+  private static final String LEADER = "leader";
+  private static final String MEMBERS = "members";
+  private static final String MEMBER_ID = "member_id";
+  private static final String METADATA = "metadata";
+  private static final String OFFSET = "offset";
+  private static final String PROTOCOL = "protocol";
+  private static final String PROTOCOL_TYPE = "protocol_type";
+  private static final String REBALANCE_TIMEOUT = "rebalance_timeout";
+  private static final String SESSION_TIMEOUT = "session_timeout";
+  private static final String SUBSCRIPTION = "subscription";
+
   public static final String TOPIC = "__consumer_offsets";
 
   public static String name() {
@@ -116,128 +133,128 @@ private Deserializer keyDeserializer() {
   private Deserializer valueDeserializer() {
     final Schema commitOffsetSchemaV0 =
         new Schema(
-            new Field("offset", Type.INT64, ""),
-            new Field("metadata", Type.STRING, ""),
-            new Field("commit_timestamp", Type.INT64, "")
+            new Field(OFFSET, Type.INT64, ""),
+            new Field(METADATA, Type.STRING, ""),
+            new Field(COMMIT_TIMESTAMP, Type.INT64, "")
         );
 
     final Schema commitOffsetSchemaV1 =
         new Schema(
-            new Field("offset", Type.INT64, ""),
-            new Field("metadata", Type.STRING, ""),
-            new Field("commit_timestamp", Type.INT64, ""),
+            new Field(OFFSET, Type.INT64, ""),
+            new Field(METADATA, Type.STRING, ""),
+            new Field(COMMIT_TIMESTAMP, Type.INT64, ""),
             new Field("expire_timestamp", Type.INT64, "")
         );
 
     final Schema commitOffsetSchemaV2 =
         new Schema(
-            new Field("offset", Type.INT64, ""),
-            new Field("metadata", Type.STRING, ""),
-            new Field("commit_timestamp", Type.INT64, "")
+            new Field(OFFSET, Type.INT64, ""),
+            new Field(METADATA, Type.STRING, ""),
+            new Field(COMMIT_TIMESTAMP, Type.INT64, "")
         );
 
     final Schema commitOffsetSchemaV3 =
         new Schema(
-            new Field("offset", Type.INT64, ""),
+            new Field(OFFSET, Type.INT64, ""),
             new Field("leader_epoch", Type.INT32, ""),
-            new Field("metadata", Type.STRING, ""),
-            new Field("commit_timestamp", Type.INT64, "")
+            new Field(METADATA, Type.STRING, ""),
+            new Field(COMMIT_TIMESTAMP, Type.INT64, "")
         );
 
     final Schema commitOffsetSchemaV4 = new Schema(
-        new Field("offset", Type.INT64, ""),
+        new Field(OFFSET, Type.INT64, ""),
         new Field("leader_epoch", Type.INT32, ""),
-        new Field("metadata", Type.COMPACT_STRING, ""),
-        new Field("commit_timestamp", Type.INT64, ""),
+        new Field(METADATA, Type.COMPACT_STRING, ""),
+        new Field(COMMIT_TIMESTAMP, Type.INT64, ""),
         Field.TaggedFieldsSection.of()
     );
 
     final Schema metadataSchema0 =
         new Schema(
-            new Field("protocol_type", Type.STRING, ""),
-            new Field("generation", Type.INT32, ""),
-            new Field("protocol", Type.NULLABLE_STRING, ""),
-            new Field("leader", Type.NULLABLE_STRING, ""),
-            new Field("members", new ArrayOf(new Schema(
-                new Field("member_id", Type.STRING, ""),
-                new Field("client_id", Type.STRING, ""),
-                new Field("client_host", Type.STRING, ""),
-                new Field("session_timeout", Type.INT32, ""),
-                new Field("subscription", Type.BYTES, ""),
-                new Field("assignment", Type.BYTES, "")
+            new Field(PROTOCOL_TYPE, Type.STRING, ""),
+            new Field(GENERATION, Type.INT32, ""),
+            new Field(PROTOCOL, Type.NULLABLE_STRING, ""),
+            new Field(LEADER, Type.NULLABLE_STRING, ""),
+            new Field(MEMBERS, new ArrayOf(new Schema(
+                new Field(MEMBER_ID, Type.STRING, ""),
+                new Field(CLIENT_ID, Type.STRING, ""),
+                new Field(CLIENT_HOST, Type.STRING, ""),
+                new Field(SESSION_TIMEOUT, Type.INT32, ""),
+                new Field(SUBSCRIPTION, Type.BYTES, ""),
+                new Field(ASSIGNMENT, Type.BYTES, "")
             )), "")
         );
 
     final Schema metadataSchema1 =
         new Schema(
-            new Field("protocol_type", Type.STRING, ""),
-            new Field("generation", Type.INT32, ""),
-            new Field("protocol", Type.NULLABLE_STRING, ""),
-            new Field("leader", Type.NULLABLE_STRING, ""),
-            new Field("members", new ArrayOf(new Schema(
-                new Field("member_id", Type.STRING, ""),
-                new Field("client_id", Type.STRING, ""),
-                new Field("client_host", Type.STRING, ""),
-                new Field("rebalance_timeout", Type.INT32, ""),
-                new Field("session_timeout", Type.INT32, ""),
-                new Field("subscription", Type.BYTES, ""),
-                new Field("assignment", Type.BYTES, "")
+            new Field(PROTOCOL_TYPE, Type.STRING, ""),
+            new Field(GENERATION, Type.INT32, ""),
+            new Field(PROTOCOL, Type.NULLABLE_STRING, ""),
+            new Field(LEADER, Type.NULLABLE_STRING, ""),
+            new Field(MEMBERS, new ArrayOf(new Schema(
+                new Field(MEMBER_ID, Type.STRING, ""),
+                new Field(CLIENT_ID, Type.STRING, ""),
+                new Field(CLIENT_HOST, Type.STRING, ""),
+                new Field(REBALANCE_TIMEOUT, Type.INT32, ""),
+                new Field(SESSION_TIMEOUT, Type.INT32, ""),
+                new Field(SUBSCRIPTION, Type.BYTES, ""),
+                new Field(ASSIGNMENT, Type.BYTES, "")
             )), "")
         );
 
     final Schema metadataSchema2 =
         new Schema(
-            new Field("protocol_type", Type.STRING, ""),
-            new Field("generation", Type.INT32, ""),
-            new Field("protocol", Type.NULLABLE_STRING, ""),
-            new Field("leader", Type.NULLABLE_STRING, ""),
-            new Field("current_state_timestamp", Type.INT64, ""),
-            new Field("members", new ArrayOf(new Schema(
-                new Field("member_id", Type.STRING, ""),
-                new Field("client_id", Type.STRING, ""),
-                new Field("client_host", Type.STRING, ""),
-                new Field("rebalance_timeout", Type.INT32, ""),
-                new Field("session_timeout", Type.INT32, ""),
-                new Field("subscription", Type.BYTES, ""),
-                new Field("assignment", Type.BYTES, "")
+            new Field(PROTOCOL_TYPE, Type.STRING, ""),
+            new Field(GENERATION, Type.INT32, ""),
+            new Field(PROTOCOL, Type.NULLABLE_STRING, ""),
+            new Field(LEADER, Type.NULLABLE_STRING, ""),
+            new Field(CURRENT_STATE_TIMESTAMP, Type.INT64, ""),
+            new Field(MEMBERS, new ArrayOf(new Schema(
+                new Field(MEMBER_ID, Type.STRING, ""),
+                new Field(CLIENT_ID, Type.STRING, ""),
+                new Field(CLIENT_HOST, Type.STRING, ""),
+                new Field(REBALANCE_TIMEOUT, Type.INT32, ""),
+                new Field(SESSION_TIMEOUT, Type.INT32, ""),
+                new Field(SUBSCRIPTION, Type.BYTES, ""),
+                new Field(ASSIGNMENT, Type.BYTES, "")
             )), "")
         );
 
     final Schema metadataSchema3 =
         new Schema(
-            new Field("protocol_type", Type.STRING, ""),
-            new Field("generation", Type.INT32, ""),
-            new Field("protocol", Type.NULLABLE_STRING, ""),
-            new Field("leader", Type.NULLABLE_STRING, ""),
-            new Field("current_state_timestamp", Type.INT64, ""),
-            new Field("members", new ArrayOf(new Schema(
-                new Field("member_id", Type.STRING, ""),
+            new Field(PROTOCOL_TYPE, Type.STRING, ""),
+            new Field(GENERATION, Type.INT32, ""),
+            new Field(PROTOCOL, Type.NULLABLE_STRING, ""),
+            new Field(LEADER, Type.NULLABLE_STRING, ""),
+            new Field(CURRENT_STATE_TIMESTAMP, Type.INT64, ""),
+            new Field(MEMBERS, new ArrayOf(new Schema(
+                new Field(MEMBER_ID, Type.STRING, ""),
                 new Field("group_instance_id", Type.NULLABLE_STRING, ""),
-                new Field("client_id", Type.STRING, ""),
-                new Field("client_host", Type.STRING, ""),
-                new Field("rebalance_timeout", Type.INT32, ""),
-                new Field("session_timeout", Type.INT32, ""),
-                new Field("subscription", Type.BYTES, ""),
-                new Field("assignment", Type.BYTES, "")
+                new Field(CLIENT_ID, Type.STRING, ""),
+                new Field(CLIENT_HOST, Type.STRING, ""),
+                new Field(REBALANCE_TIMEOUT, Type.INT32, ""),
+                new Field(SESSION_TIMEOUT, Type.INT32, ""),
+                new Field(SUBSCRIPTION, Type.BYTES, ""),
+                new Field(ASSIGNMENT, Type.BYTES, "")
             )), "")
         );
 
     final Schema metadataSchema4 =
         new Schema(
-            new Field("protocol_type", Type.COMPACT_STRING, ""),
-            new Field("generation", Type.INT32, ""),
-            new Field("protocol", Type.COMPACT_NULLABLE_STRING, ""),
-            new Field("leader", Type.COMPACT_NULLABLE_STRING, ""),
-            new Field("current_state_timestamp", Type.INT64, ""),
-            new Field("members", new CompactArrayOf(new Schema(
-                new Field("member_id", Type.COMPACT_STRING, ""),
+            new Field(PROTOCOL_TYPE, Type.COMPACT_STRING, ""),
+            new Field(GENERATION, Type.INT32, ""),
+            new Field(PROTOCOL, Type.COMPACT_NULLABLE_STRING, ""),
+            new Field(LEADER, Type.COMPACT_NULLABLE_STRING, ""),
+            new Field(CURRENT_STATE_TIMESTAMP, Type.INT64, ""),
+            new Field(MEMBERS, new CompactArrayOf(new Schema(
+                new Field(MEMBER_ID, Type.COMPACT_STRING, ""),
                 new Field("group_instance_id", Type.COMPACT_NULLABLE_STRING, ""),
-                new Field("client_id", Type.COMPACT_STRING, ""),
-                new Field("client_host", Type.COMPACT_STRING, ""),
-                new Field("rebalance_timeout", Type.INT32, ""),
-                new Field("session_timeout", Type.INT32, ""),
-                new Field("subscription", Type.COMPACT_BYTES, ""),
-                new Field("assignment", Type.COMPACT_BYTES, ""),
+                new Field(CLIENT_ID, Type.COMPACT_STRING, ""),
+                new Field(CLIENT_HOST, Type.COMPACT_STRING, ""),
+                new Field(REBALANCE_TIMEOUT, Type.INT32, ""),
+                new Field(SESSION_TIMEOUT, Type.INT32, ""),
+                new Field(SUBSCRIPTION, Type.COMPACT_BYTES, ""),
+                new Field(ASSIGNMENT, Type.COMPACT_BYTES, ""),
                 Field.TaggedFieldsSection.of()
             )), ""),
             Field.TaggedFieldsSection.of()
@@ -249,7 +266,7 @@ private Deserializer valueDeserializer() {
       short version = bb.getShort();
       // ideally, we should distinguish if value is commit or metadata
       // by checking record's key, but our current serde structure doesn't allow that.
-      // so, we trying to parse into metadata first and after into commit msg
+      // so, we are trying to parse into metadata first and after into commit msg
       try {
         result = toJson(
             switch (version) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java
index 95343a0eeb5..e89c7996060 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/Int32Serde.java
@@ -2,7 +2,6 @@
 
 import com.google.common.primitives.Ints;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
-import com.provectus.kafka.ui.serde.api.PropertyResolver;
 import com.provectus.kafka.ui.serde.api.SchemaDescription;
 import com.provectus.kafka.ui.serdes.BuiltInSerde;
 import java.util.Map;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index 4f6d4afe517..25d6e8fc88b 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -43,6 +43,8 @@ public static String name() {
     return "SchemaRegistry";
   }
 
+  private static final String SCHEMA_REGISTRY = "schemaRegistry";
+
   private SchemaRegistryClient schemaRegistryClient;
   private List<String> schemaRegistryUrls;
   private String valueSchemaNameTemplate;
@@ -54,7 +56,7 @@ public static String name() {
   @Override
   public boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties,
                                      PropertyResolver globalProperties) {
-    return kafkaClusterProperties.getListProperty("schemaRegistry", String.class)
+    return kafkaClusterProperties.getListProperty(SCHEMA_REGISTRY, String.class)
         .filter(lst -> !lst.isEmpty())
         .isPresent();
   }
@@ -62,7 +64,7 @@ public boolean canBeAutoConfigured(PropertyResolver kafkaClusterProperties,
   @Override
   public void autoConfigure(PropertyResolver kafkaClusterProperties,
                             PropertyResolver globalProperties) {
-    var urls = kafkaClusterProperties.getListProperty("schemaRegistry", String.class)
+    var urls = kafkaClusterProperties.getListProperty(SCHEMA_REGISTRY, String.class)
         .filter(lst -> !lst.isEmpty())
         .orElseThrow(() -> new ValidationException("No urls provided for schema registry"));
     configure(
@@ -88,7 +90,7 @@ public void configure(PropertyResolver serdeProperties,
                         PropertyResolver kafkaClusterProperties,
                         PropertyResolver globalProperties) {
     var urls = serdeProperties.getListProperty("url", String.class)
-        .or(() -> kafkaClusterProperties.getListProperty("schemaRegistry", String.class))
+        .or(() -> kafkaClusterProperties.getListProperty(SCHEMA_REGISTRY, String.class))
         .filter(lst -> !lst.isEmpty())
         .orElseThrow(() -> new ValidationException("No urls provided for schema registry"));
     configure(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java
index 10ad128c657..8dd4609b601 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/metrics/WellKnownMetrics.java
@@ -11,6 +11,9 @@
 
 class WellKnownMetrics {
 
+  private static final String BROKER_TOPIC_METRICS = "BrokerTopicMetrics";
+  private static final String FIFTEEN_MINUTE_RATE = "FifteenMinuteRate";
+
   // per broker
   final Map<Integer, BigDecimal> brokerBytesInFifteenMinuteRate = new HashMap<>();
   final Map<Integer, BigDecimal> brokerBytesOutFifteenMinuteRate = new HashMap<>();
@@ -36,15 +39,15 @@ private void updateBrokerIOrates(Node node, RawMetric rawMetric) {
     if (!brokerBytesInFifteenMinuteRate.containsKey(node.id())
         && rawMetric.labels().size() == 1
         && "BytesInPerSec".equalsIgnoreCase(rawMetric.labels().get("name"))
-        && containsIgnoreCase(name, "BrokerTopicMetrics")
-        && endsWithIgnoreCase(name, "FifteenMinuteRate")) {
+        && containsIgnoreCase(name, BROKER_TOPIC_METRICS)
+        && endsWithIgnoreCase(name, FIFTEEN_MINUTE_RATE)) {
       brokerBytesInFifteenMinuteRate.put(node.id(),  rawMetric.value());
     }
     if (!brokerBytesOutFifteenMinuteRate.containsKey(node.id())
         && rawMetric.labels().size() == 1
         && "BytesOutPerSec".equalsIgnoreCase(rawMetric.labels().get("name"))
-        && containsIgnoreCase(name, "BrokerTopicMetrics")
-        && endsWithIgnoreCase(name, "FifteenMinuteRate")) {
+        && containsIgnoreCase(name, BROKER_TOPIC_METRICS)
+        && endsWithIgnoreCase(name, FIFTEEN_MINUTE_RATE)) {
       brokerBytesOutFifteenMinuteRate.put(node.id(), rawMetric.value());
     }
   }
@@ -53,8 +56,8 @@ private void updateTopicsIOrates(RawMetric rawMetric) {
     String name = rawMetric.name();
     String topic = rawMetric.labels().get("topic");
     if (topic != null
-        && containsIgnoreCase(name, "BrokerTopicMetrics")
-        && endsWithIgnoreCase(name, "FifteenMinuteRate")) {
+        && containsIgnoreCase(name, BROKER_TOPIC_METRICS)
+        && endsWithIgnoreCase(name, FIFTEEN_MINUTE_RATE)) {
       String nameProperty = rawMetric.labels().get("name");
       if ("BytesInPerSec".equalsIgnoreCase(nameProperty)) {
         bytesInFifteenMinuteRate.compute(topic, (k, v) -> v == null ? rawMetric.value() : v.add(rawMetric.value()));
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index 59ea02fea84..4ff311ff910 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -52,6 +52,7 @@
 public class AccessControlService {
 
   private static final String ACCESS_DENIED = "Access denied";
+  private static final String ACTIONS_ARE_EMPTY = "actions are empty";
 
   @Nullable
   private final InMemoryReactiveClientRegistrationRepository clientRegistrationRepository;
@@ -206,7 +207,7 @@ public boolean isTopicAccessible(AccessContext context, AuthenticatedUser user)
     if (context.getTopic() == null && context.getTopicActions().isEmpty()) {
       return true;
     }
-    Assert.isTrue(!context.getTopicActions().isEmpty(), "actions are empty");
+    Assert.isTrue(!context.getTopicActions().isEmpty(), ACTIONS_ARE_EMPTY);
 
     Set<String> requiredActions = context.getTopicActions()
         .stream()
@@ -243,7 +244,7 @@ private boolean isConsumerGroupAccessible(AccessContext context, AuthenticatedUs
     if (context.getConsumerGroup() == null && context.getConsumerGroupActions().isEmpty()) {
       return true;
     }
-    Assert.isTrue(!context.getConsumerGroupActions().isEmpty(), "actions are empty");
+    Assert.isTrue(!context.getConsumerGroupActions().isEmpty(), ACTIONS_ARE_EMPTY);
 
     Set<String> requiredActions = context.getConsumerGroupActions()
         .stream()
@@ -276,7 +277,7 @@ public boolean isSchemaAccessible(AccessContext context, AuthenticatedUser user)
     if (context.getSchema() == null && context.getSchemaActions().isEmpty()) {
       return true;
     }
-    Assert.isTrue(!context.getSchemaActions().isEmpty(), "actions are empty");
+    Assert.isTrue(!context.getSchemaActions().isEmpty(), ACTIONS_ARE_EMPTY);
 
     Set<String> requiredActions = context.getSchemaActions()
         .stream()
@@ -309,7 +310,7 @@ public boolean isConnectAccessible(AccessContext context, AuthenticatedUser user
     if (context.getConnect() == null && context.getConnectActions().isEmpty()) {
       return true;
     }
-    Assert.isTrue(!context.getConnectActions().isEmpty(), "actions are empty");
+    Assert.isTrue(!context.getConnectActions().isEmpty(), ACTIONS_ARE_EMPTY);
 
     Set<String> requiredActions = context.getConnectActions()
         .stream()
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
index 0708044837b..74701d0c70c 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
@@ -43,6 +43,8 @@ public class JsonAvroConversion {
 
   private static final JsonMapper MAPPER = new JsonMapper();
   private static final Schema NULL_SCHEMA = Schema.create(Schema.Type.NULL);
+  private static final String FORMAT = "format";
+  private static final String DATE_TIME = "date-time";
 
   // converts json into Object that is expected input for KafkaAvroSerializer
   // (with AVRO_USE_LOGICAL_TYPE_CONVERTERS flat enabled!)
@@ -347,7 +349,7 @@ enum LogicalTypeConversion {
         new SimpleFieldSchema(
             new SimpleJsonType(
                 JsonType.Type.STRING,
-                Map.of("format", new TextNode("uuid"))))
+                Map.of(FORMAT, new TextNode("uuid"))))
     ),
 
     DECIMAL("decimal",
@@ -385,7 +387,7 @@ enum LogicalTypeConversion {
         new SimpleFieldSchema(
             new SimpleJsonType(
                 JsonType.Type.STRING,
-                Map.of("format", new TextNode("date"))))
+                Map.of(FORMAT, new TextNode("date"))))
     ),
 
     TIME_MILLIS("time-millis",
@@ -406,7 +408,7 @@ enum LogicalTypeConversion {
         new SimpleFieldSchema(
             new SimpleJsonType(
                 JsonType.Type.STRING,
-                Map.of("format", new TextNode("time"))))
+                Map.of(FORMAT, new TextNode("time"))))
     ),
 
     TIME_MICROS("time-micros",
@@ -427,7 +429,7 @@ enum LogicalTypeConversion {
         new SimpleFieldSchema(
             new SimpleJsonType(
                 JsonType.Type.STRING,
-                Map.of("format", new TextNode("time"))))
+                Map.of(FORMAT, new TextNode("time"))))
     ),
 
     TIMESTAMP_MILLIS("timestamp-millis",
@@ -448,7 +450,7 @@ enum LogicalTypeConversion {
         new SimpleFieldSchema(
             new SimpleJsonType(
                 JsonType.Type.STRING,
-                Map.of("format", new TextNode("date-time"))))
+                Map.of(FORMAT, new TextNode(DATE_TIME))))
     ),
 
     TIMESTAMP_MICROS("timestamp-micros",
@@ -473,7 +475,7 @@ enum LogicalTypeConversion {
         new SimpleFieldSchema(
             new SimpleJsonType(
                 JsonType.Type.STRING,
-                Map.of("format", new TextNode("date-time"))))
+                Map.of(FORMAT, new TextNode(DATE_TIME))))
     ),
 
     LOCAL_TIMESTAMP_MILLIS("local-timestamp-millis",
@@ -491,7 +493,7 @@ enum LogicalTypeConversion {
         new SimpleFieldSchema(
             new SimpleJsonType(
                 JsonType.Type.STRING,
-                Map.of("format", new TextNode("date-time"))))
+                Map.of(FORMAT, new TextNode(DATE_TIME))))
     ),
 
     LOCAL_TIMESTAMP_MICROS("local-timestamp-micros",
@@ -508,7 +510,7 @@ enum LogicalTypeConversion {
         new SimpleFieldSchema(
             new SimpleJsonType(
                 JsonType.Type.STRING,
-                Map.of("format", new TextNode("date-time"))))
+                Map.of(FORMAT, new TextNode(DATE_TIME))))
     );
 
     private final String name;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java
index 86ea8fcf0e6..8a0c1071db7 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverter.java
@@ -37,6 +37,9 @@
 
 public class ProtobufSchemaConverter implements JsonSchemaConverter<Descriptors.Descriptor> {
 
+  private static final String MAXIMUM = "maximum";
+  private static final String MINIMUM = "minimum";
+
   private final Set<String> simpleTypesWrapperNames = Set.of(
       BoolValue.getDescriptor().getFullName(),
       Int32Value.getDescriptor().getFullName(),
@@ -156,15 +159,15 @@ private JsonType convertType(Descriptors.FieldDescriptor field) {
       case INT32, FIXED32, SFIXED32, SINT32 -> new SimpleJsonType(
           JsonType.Type.INTEGER,
           Map.of(
-              "maximum", IntNode.valueOf(Integer.MAX_VALUE),
-              "minimum", IntNode.valueOf(Integer.MIN_VALUE)
+              MAXIMUM, IntNode.valueOf(Integer.MAX_VALUE),
+              MINIMUM, IntNode.valueOf(Integer.MIN_VALUE)
           )
       );
       case UINT32 -> new SimpleJsonType(
           JsonType.Type.INTEGER,
           Map.of(
-              "maximum", LongNode.valueOf(UnsignedInteger.MAX_VALUE.longValue()),
-              "minimum", IntNode.valueOf(0)
+              MAXIMUM, LongNode.valueOf(UnsignedInteger.MAX_VALUE.longValue()),
+              MINIMUM, IntNode.valueOf(0)
           )
       );
       //TODO: actually all *64 types will be printed with quotes (as strings),
@@ -173,15 +176,15 @@ private JsonType convertType(Descriptors.FieldDescriptor field) {
       case INT64, FIXED64, SFIXED64, SINT64 -> new SimpleJsonType(
           JsonType.Type.INTEGER,
           Map.of(
-              "maximum", LongNode.valueOf(Long.MAX_VALUE),
-              "minimum", LongNode.valueOf(Long.MIN_VALUE)
+              MAXIMUM, LongNode.valueOf(Long.MAX_VALUE),
+              MINIMUM, LongNode.valueOf(Long.MIN_VALUE)
           )
       );
       case UINT64 -> new SimpleJsonType(
           JsonType.Type.INTEGER,
           Map.of(
-              "maximum", new BigIntegerNode(UnsignedLong.MAX_VALUE.bigIntegerValue()),
-              "minimum", LongNode.valueOf(0)
+              MAXIMUM, new BigIntegerNode(UnsignedLong.MAX_VALUE.bigIntegerValue()),
+              MINIMUM, LongNode.valueOf(0)
           )
       );
       case MESSAGE, GROUP -> new SimpleJsonType(JsonType.Type.OBJECT);
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
index 55a6e631122..1d5cbb7e802 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/models/Schema.java
@@ -10,25 +10,27 @@
 @Accessors(chain = true)
 public class Schema {
 
+  private static final String USER_DIR = "user.dir";
+
   private String name, valuePath;
   private SchemaType type;
 
   public static Schema createSchemaAvro() {
     return new Schema().setName("schema_avro-" + randomAlphabetic(5))
         .setType(SchemaType.AVRO)
-        .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_avro_value.json");
+        .setValuePath(System.getProperty(USER_DIR) + "/src/main/resources/testData/schemas/schema_avro_value.json");
   }
 
   public static Schema createSchemaJson() {
     return new Schema().setName("schema_json-" + randomAlphabetic(5))
         .setType(SchemaType.JSON)
-        .setValuePath(System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_json_Value.json");
+        .setValuePath(System.getProperty(USER_DIR) + "/src/main/resources/testData/schemas/schema_json_Value.json");
   }
 
   public static Schema createSchemaProtobuf() {
     return new Schema().setName("schema_protobuf-" + randomAlphabetic(5))
         .setType(SchemaType.PROTOBUF)
         .setValuePath(
-            System.getProperty("user.dir") + "/src/main/resources/testData/schemas/schema_protobuf_value.txt");
+            System.getProperty(USER_DIR) + "/src/main/resources/testData/schemas/schema_protobuf_value.txt");
   }
 }
diff --git a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
index 57f5930d66e..46493ab97f4 100644
--- a/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
+++ b/kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topics/TopicCreateEditForm.java
@@ -19,6 +19,8 @@
 
 public class TopicCreateEditForm extends BasePage {
 
+  private static final String RETENTION_BYTES = "retentionBytes";
+
   protected SelenideElement timeToRetainField = $x("//input[@id='timeToRetain']");
   protected SelenideElement partitionsField = $x("//input[@name='partitions']");
   protected SelenideElement nameField = $(id("topicFormName"));
@@ -138,12 +140,12 @@ public TopicCreateEditForm selectCleanupPolicy(CleanupPolicyValue cleanupPolicyO
 
   @Step
   public TopicCreateEditForm selectRetentionBytes(String visibleValue) {
-    return selectFromDropDownByVisibleText("retentionBytes", visibleValue);
+    return selectFromDropDownByVisibleText(RETENTION_BYTES, visibleValue);
   }
 
   @Step
   public TopicCreateEditForm selectRetentionBytes(Long optionValue) {
-    return selectFromDropDownByOptionValue("retentionBytes", optionValue.toString());
+    return selectFromDropDownByOptionValue(RETENTION_BYTES, optionValue.toString());
   }
 
   @Step
@@ -202,7 +204,7 @@ public String getTimeToRetain() {
 
   @Step
   public String getMaxSizeOnDisk() {
-    return new KafkaUiSelectElement("retentionBytes").getCurrentValue();
+    return new KafkaUiSelectElement(RETENTION_BYTES).getCurrentValue();
   }
 
   @Step

From 729ca79581e04f91d14f55591f18cbbd143b748c Mon Sep 17 00:00:00 2001
From: Evgeny Petrushevsky <evgenuypetrushevski@gmail.com>
Date: Wed, 30 Aug 2023 10:29:36 +0200
Subject: [PATCH 704/734] BE: Fix cognito roles extractor regression (#4171)

Co-authored-by: Evgeny Petrushevsky <evgenuypetrushevskiv8@gmail.com>
---
 .../ui/service/rbac/extractor/CognitoAuthorityExtractor.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
index 67bcba69a2d..58ac063bab3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/extractor/CognitoAuthorityExtractor.java
@@ -59,8 +59,8 @@ public Mono<Set<String>> extract(AccessControlService acs, Object value, Map<Str
             .stream()
             .filter(s -> s.getProvider().equals(Provider.OAUTH_COGNITO))
             .filter(s -> s.getType().equals("group"))
-            .anyMatch(subject -> Stream.of(groups)
-                .map(Object::toString)
+            .anyMatch(subject -> groups
+                .stream()
                 .anyMatch(cognitoGroup -> cognitoGroup.equals(subject.getValue()))
             ))
         .map(Role::getName)

From c05abc1e0a83caaebb0097aca10193f1b9fcd85e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Aug 2023 12:32:47 +0400
Subject: [PATCH 705/734] Bump eslint-import-resolver-node from 0.3.6 to 0.3.9
 in /kafka-ui-react-app (#4166)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 39 +++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index bada40e72f0..59ffa9757ac 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -207,7 +207,7 @@ devDependencies:
     version: 8.5.0(eslint@8.16.0)
   eslint-import-resolver-node:
     specifier: ^0.3.6
-    version: 0.3.6
+    version: 0.3.9
   eslint-import-resolver-typescript:
     specifier: ^3.2.7
     version: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.16.0)
@@ -3069,11 +3069,12 @@ packages:
       eslint: 8.16.0
     dev: true
 
-  /eslint-import-resolver-node@0.3.6:
-    resolution: {integrity: sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==}
+  /eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
     dependencies:
       debug: 3.2.7
-      resolve: 1.22.0
+      is-core-module: 2.13.0
+      resolve: 1.22.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3098,7 +3099,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils@2.7.3(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-node@0.3.6)(eslint-import-resolver-typescript@3.2.7):
+  /eslint-module-utils@2.7.3(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.2.7):
     resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3118,7 +3119,7 @@ packages:
     dependencies:
       '@typescript-eslint/parser': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
       debug: 3.2.7
-      eslint-import-resolver-node: 0.3.6
+      eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.16.0)
       find-up: 2.1.0
     transitivePeerDependencies:
@@ -3141,8 +3142,8 @@ packages:
       debug: 2.6.9
       doctrine: 2.1.0
       eslint: 8.16.0
-      eslint-import-resolver-node: 0.3.6
-      eslint-module-utils: 2.7.3(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-node@0.3.6)(eslint-import-resolver-typescript@3.2.7)
+      eslint-import-resolver-node: 0.3.9
+      eslint-module-utils: 2.7.3(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.2.7)
       has: 1.0.3
       is-core-module: 2.9.0
       is-glob: 4.0.3
@@ -3922,10 +3923,16 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
+  /is-core-module@2.13.0:
+    resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==}
+    dependencies:
+      has: 1.0.3
+
   /is-core-module@2.9.0:
     resolution: {integrity: sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==}
     dependencies:
       has: 1.0.3
+    dev: true
 
   /is-date-object@1.0.4:
     resolution: {integrity: sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==}
@@ -4396,7 +4403,7 @@ packages:
       jest-pnp-resolver: 1.2.2(jest-resolve@29.6.4)
       jest-util: 29.6.3
       jest-validate: 29.6.3
-      resolve: 1.22.1
+      resolve: 1.22.4
       resolve.exports: 2.0.1
       slash: 3.0.0
     dev: false
@@ -5683,7 +5690,7 @@ packages:
     resolution: {integrity: sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==}
     hasBin: true
     dependencies:
-      is-core-module: 2.9.0
+      is-core-module: 2.13.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
     dev: true
@@ -5692,14 +5699,22 @@ packages:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
     dependencies:
-      is-core-module: 2.9.0
+      is-core-module: 2.13.0
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  /resolve@1.22.4:
+    resolution: {integrity: sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==}
+    hasBin: true
+    dependencies:
+      is-core-module: 2.13.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
   /resolve@2.0.0-next.3:
     resolution: {integrity: sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==}
     dependencies:
-      is-core-module: 2.9.0
+      is-core-module: 2.13.0
       path-parse: 1.0.7
     dev: true
 

From 4ec7975b2e13346a7b469c736c8dc70508dbf12f Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 30 Aug 2023 12:38:54 +0400
Subject: [PATCH 706/734] BE: Implement topic active producers API (#4121)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/controller/TopicsController.java | 29 +++++++++++
 .../kafka/ui/mapper/ClusterMapper.java        | 13 +++++
 .../kafka/ui/service/ReactiveAdminClient.java | 17 ++++++
 .../kafka/ui/service/TopicsService.java       |  6 +++
 .../main/resources/swagger/kafka-ui-api.yaml  | 52 +++++++++++++++++++
 5 files changed, 117 insertions(+)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
index 1e391636815..d24044717f3 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/TopicsController.java
@@ -22,6 +22,7 @@
 import com.provectus.kafka.ui.model.TopicCreationDTO;
 import com.provectus.kafka.ui.model.TopicDTO;
 import com.provectus.kafka.ui.model.TopicDetailsDTO;
+import com.provectus.kafka.ui.model.TopicProducerStateDTO;
 import com.provectus.kafka.ui.model.TopicUpdateDTO;
 import com.provectus.kafka.ui.model.TopicsResponseDTO;
 import com.provectus.kafka.ui.model.rbac.AccessContext;
@@ -327,6 +328,34 @@ public Mono<ResponseEntity<TopicAnalysisDTO>> getTopicAnalysis(String clusterNam
         .doOnEach(sig -> audit(context, sig));
   }
 
+  @Override
+  public Mono<ResponseEntity<Flux<TopicProducerStateDTO>>> getActiveProducerStates(String clusterName,
+                                                                                   String topicName,
+                                                                                   ServerWebExchange exchange) {
+    var context = AccessContext.builder()
+        .cluster(clusterName)
+        .topic(topicName)
+        .topicActions(VIEW)
+        .operationName("getActiveProducerStates")
+        .build();
+
+    Comparator<TopicProducerStateDTO> ordering =
+        Comparator.comparingInt(TopicProducerStateDTO::getPartition)
+            .thenComparing(Comparator.comparing(TopicProducerStateDTO::getProducerId).reversed());
+
+    Flux<TopicProducerStateDTO> states = topicsService.getActiveProducersState(getCluster(clusterName), topicName)
+        .flatMapMany(statesMap ->
+            Flux.fromStream(
+                statesMap.entrySet().stream()
+                    .flatMap(e -> e.getValue().stream().map(p -> clusterMapper.map(e.getKey().partition(), p)))
+                    .sorted(ordering)));
+
+    return validateAccess(context)
+        .thenReturn(states)
+        .map(ResponseEntity::ok)
+        .doOnEach(sig -> audit(context, sig));
+  }
+
   private Comparator<InternalTopic> getComparatorForTopic(
       TopicColumnsToSortDTO orderBy) {
     var defaultComparator = Comparator.comparing(InternalTopic::getName);
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
index 9317ac7b9c3..7fb7bc5c48e 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
@@ -30,10 +30,12 @@
 import com.provectus.kafka.ui.model.TopicConfigDTO;
 import com.provectus.kafka.ui.model.TopicDTO;
 import com.provectus.kafka.ui.model.TopicDetailsDTO;
+import com.provectus.kafka.ui.model.TopicProducerStateDTO;
 import com.provectus.kafka.ui.service.metrics.RawMetric;
 import java.util.List;
 import java.util.Map;
 import org.apache.kafka.clients.admin.ConfigEntry;
+import org.apache.kafka.clients.admin.ProducerState;
 import org.apache.kafka.common.acl.AccessControlEntry;
 import org.apache.kafka.common.acl.AclBinding;
 import org.apache.kafka.common.acl.AclOperation;
@@ -117,6 +119,17 @@ default BrokerDiskUsageDTO map(Integer id, InternalBrokerDiskUsage internalBroke
     return brokerDiskUsage;
   }
 
+  default TopicProducerStateDTO map(int partition, ProducerState state) {
+    return new TopicProducerStateDTO()
+        .partition(partition)
+        .producerId(state.producerId())
+        .producerEpoch(state.producerEpoch())
+        .lastSequence(state.lastSequence())
+        .lastTimestampMs(state.lastTimestamp())
+        .coordinatorEpoch(state.coordinatorEpoch().stream().boxed().findAny().orElse(null))
+        .currentTransactionStartOffset(state.currentTransactionStartOffset().stream().boxed().findAny().orElse(null));
+  }
+
   static KafkaAclDTO.OperationEnum mapAclOperation(AclOperation operation) {
     return switch (operation) {
       case ALL -> KafkaAclDTO.OperationEnum.ALL;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
index 9de908efa7f..6defb074237 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/ReactiveAdminClient.java
@@ -31,6 +31,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
 import lombok.AccessLevel;
@@ -55,6 +56,7 @@
 import org.apache.kafka.clients.admin.NewPartitions;
 import org.apache.kafka.clients.admin.NewTopic;
 import org.apache.kafka.clients.admin.OffsetSpec;
+import org.apache.kafka.clients.admin.ProducerState;
 import org.apache.kafka.clients.admin.RecordsToDelete;
 import org.apache.kafka.clients.admin.TopicDescription;
 import org.apache.kafka.clients.consumer.OffsetAndMetadata;
@@ -658,6 +660,21 @@ public Mono<Void> alterReplicaLogDirs(Map<TopicPartitionReplica, String> replica
     return toMono(client.alterReplicaLogDirs(replicaAssignment).all());
   }
 
+  // returns tp -> list of active producer's states (if any)
+  public Mono<Map<TopicPartition, List<ProducerState>>> getActiveProducersState(String topic) {
+    return describeTopic(topic)
+        .map(td -> client.describeProducers(
+                IntStream.range(0, td.partitions().size())
+                    .mapToObj(i -> new TopicPartition(topic, i))
+                    .toList()
+            ).all()
+        )
+        .flatMap(ReactiveAdminClient::toMono)
+        .map(map -> map.entrySet().stream()
+            .filter(e -> !e.getValue().activeProducers().isEmpty()) // skipping partitions without producers
+            .collect(toMap(Map.Entry::getKey, e -> e.getValue().activeProducers())));
+  }
+
   private Mono<Void> incrementalAlterConfig(String topicName,
                                             List<ConfigEntry> currentConfigs,
                                             Map<String, String> newConfigs) {
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
index 3ddcd6f82e0..8e976906d56 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/TopicsService.java
@@ -39,6 +39,7 @@
 import org.apache.kafka.clients.admin.NewPartitionReassignment;
 import org.apache.kafka.clients.admin.NewPartitions;
 import org.apache.kafka.clients.admin.OffsetSpec;
+import org.apache.kafka.clients.admin.ProducerState;
 import org.apache.kafka.clients.admin.TopicDescription;
 import org.apache.kafka.common.Node;
 import org.apache.kafka.common.TopicPartition;
@@ -459,6 +460,11 @@ public Mono<List<InternalTopic>> getTopicsForPagination(KafkaCluster cluster) {
         );
   }
 
+  public Mono<Map<TopicPartition, List<ProducerState>>> getActiveProducersState(KafkaCluster cluster, String topic) {
+    return adminClientService.get(cluster)
+        .flatMap(ac -> ac.getActiveProducersState(topic));
+  }
+
   private Mono<List<String>> filterExisting(KafkaCluster cluster, Collection<String> topics) {
     return adminClientService.get(cluster)
         .flatMap(ac -> ac.listTopics(true))
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index 306c3fd2ddd..ae51d31568f 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -763,6 +763,33 @@ paths:
         404:
           description: Not found
 
+  /api/clusters/{clusterName}/topics/{topicName}/activeproducers:
+    get:
+      tags:
+        - Topics
+      summary: get producer states for topic
+      operationId: getActiveProducerStates
+      parameters:
+        - name: clusterName
+          in: path
+          required: true
+          schema:
+            type: string
+        - name: topicName
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/TopicProducerState'
+
   /api/clusters/{clusterName}/topics/{topicName}/consumer-groups:
     get:
       tags:
@@ -2619,6 +2646,31 @@ components:
         - PROTOBUF
         - UNKNOWN
 
+    TopicProducerState:
+      type: object
+      properties:
+        partition:
+          type: integer
+          format: int32
+        producerId:
+          type: integer
+          format: int64
+        producerEpoch:
+          type: integer
+          format: int32
+        lastSequence:
+          type: integer
+          format: int32
+        lastTimestampMs:
+          type: integer
+          format: int64
+        coordinatorEpoch:
+          type: integer
+          format: int32
+        currentTransactionStartOffset:
+          type: integer
+          format: int64
+
     ConsumerGroup:
       discriminator:
         propertyName: inherit

From b0583a3ca7d58bd9978e26a67bb8927fcbf03c42 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Wed, 30 Aug 2023 12:39:58 +0400
Subject: [PATCH 707/734] BE: Refactor SchemaRegistry serialization logic
 (#4116)

Co-authored-by: iliax <ikuramshin@provectus.com>
Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../sr/AvroSchemaRegistrySerializer.java      |  46 -------
 .../JsonSchemaSchemaRegistrySerializer.java   |  79 -----------
 .../sr/ProtobufSchemaRegistrySerializer.java  |  50 -------
 .../builtin/sr/SchemaRegistrySerde.java       |  54 ++++----
 .../builtin/sr/SchemaRegistrySerializer.java  |  34 -----
 .../kafka/ui/serdes/builtin/sr/Serialize.java | 126 ++++++++++++++++++
 .../KafkaClientInternalsDependant.java        |   1 +
 7 files changed, 152 insertions(+), 238 deletions(-)
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/ProtobufSchemaRegistrySerializer.java
 delete mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerializer.java
 create mode 100644 kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/Serialize.java

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java
deleted file mode 100644
index 164938bfc70..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/AvroSchemaRegistrySerializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.provectus.kafka.ui.serdes.builtin.sr;
-
-import com.provectus.kafka.ui.util.jsonschema.JsonAvroConversion;
-import io.confluent.kafka.schemaregistry.ParsedSchema;
-import io.confluent.kafka.schemaregistry.avro.AvroSchema;
-import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
-import io.confluent.kafka.serializers.KafkaAvroSerializer;
-import io.confluent.kafka.serializers.KafkaAvroSerializerConfig;
-import java.util.Map;
-import org.apache.kafka.common.serialization.Serializer;
-
-class AvroSchemaRegistrySerializer extends SchemaRegistrySerializer<Object> {
-
-  AvroSchemaRegistrySerializer(String topic, boolean isKey,
-                               SchemaRegistryClient client,
-                               SchemaMetadata schema) {
-    super(topic, isKey, client, schema);
-  }
-
-  @Override
-  protected Serializer<Object> createSerializer(SchemaRegistryClient client) {
-    var serializer = new KafkaAvroSerializer(client);
-    serializer.configure(
-        Map.of(
-            "schema.registry.url", "wontbeused",
-            AbstractKafkaSchemaSerDeConfig.AUTO_REGISTER_SCHEMAS, false,
-            KafkaAvroSerializerConfig.AVRO_USE_LOGICAL_TYPE_CONVERTERS_CONFIG, true,
-            AbstractKafkaSchemaSerDeConfig.USE_LATEST_VERSION, true
-        ),
-        isKey
-    );
-    return serializer;
-  }
-
-  @Override
-  protected Object serialize(String value, ParsedSchema schema) {
-    try {
-      return JsonAvroConversion.convertJsonToAvro(value, ((AvroSchema) schema).rawSchema());
-    } catch (Throwable e) {
-      throw new RuntimeException("Failed to serialize record for topic " + topic, e);
-    }
-
-  }
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java
deleted file mode 100644
index 406ab2db5d4..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/JsonSchemaSchemaRegistrySerializer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.provectus.kafka.ui.serdes.builtin.sr;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.provectus.kafka.ui.exception.ValidationException;
-import com.provectus.kafka.ui.util.annotation.KafkaClientInternalsDependant;
-import io.confluent.kafka.schemaregistry.ParsedSchema;
-import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.json.JsonSchema;
-import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
-import io.confluent.kafka.serializers.json.KafkaJsonSchemaSerializer;
-import java.util.Map;
-import org.apache.kafka.common.serialization.Serializer;
-
-class JsonSchemaSchemaRegistrySerializer extends SchemaRegistrySerializer<JsonNode> {
-
-  private static final ObjectMapper MAPPER = new ObjectMapper();
-
-  JsonSchemaSchemaRegistrySerializer(String topic,
-                                            boolean isKey,
-                                            SchemaRegistryClient client,
-                                            SchemaMetadata schema) {
-    super(topic, isKey, client, schema);
-  }
-
-  @Override
-  protected Serializer<JsonNode> createSerializer(SchemaRegistryClient client) {
-    var serializer = new KafkaJsonSchemaSerializerWithoutSchemaInfer(client);
-    serializer.configure(
-        Map.of(
-            "schema.registry.url", "wontbeused",
-            AbstractKafkaSchemaSerDeConfig.AUTO_REGISTER_SCHEMAS, false,
-            AbstractKafkaSchemaSerDeConfig.USE_LATEST_VERSION, true
-        ),
-        isKey
-    );
-    return serializer;
-  }
-
-  @Override
-  protected JsonNode serialize(String value, ParsedSchema schema) {
-    try {
-      JsonNode json = MAPPER.readTree(value);
-      ((JsonSchema) schema).validate(json);
-      return json;
-    } catch (JsonProcessingException e) {
-      throw new ValidationException(String.format("'%s' is not valid json", value));
-    } catch (org.everit.json.schema.ValidationException e) {
-      throw new ValidationException(
-          String.format("'%s' does not fit schema: %s", value, e.getAllMessages()));
-    }
-  }
-
-  @KafkaClientInternalsDependant
-  private class KafkaJsonSchemaSerializerWithoutSchemaInfer
-      extends KafkaJsonSchemaSerializer<JsonNode> {
-
-    KafkaJsonSchemaSerializerWithoutSchemaInfer(SchemaRegistryClient client) {
-      super(client);
-    }
-
-    /**
-     * Need to override original method because it tries to infer schema from input
-     * by checking 'schema' json field or @Schema annotation on input class, which is not
-     * possible in our case. So, we just skip all infer logic and pass schema directly.
-     */
-    @Override
-    public byte[] serialize(String topic, JsonNode rec) {
-      return super.serializeImpl(
-          super.getSubjectName(topic, isKey, rec, schema),
-          rec,
-          (JsonSchema) schema
-      );
-    }
-  }
-
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/ProtobufSchemaRegistrySerializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/ProtobufSchemaRegistrySerializer.java
deleted file mode 100644
index 1af2bb4999c..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/ProtobufSchemaRegistrySerializer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.provectus.kafka.ui.serdes.builtin.sr;
-
-import com.google.protobuf.DynamicMessage;
-import com.google.protobuf.Message;
-import com.google.protobuf.util.JsonFormat;
-import io.confluent.kafka.schemaregistry.ParsedSchema;
-import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
-import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
-import io.confluent.kafka.serializers.protobuf.KafkaProtobufSerializer;
-import java.util.Map;
-import lombok.SneakyThrows;
-import org.apache.kafka.common.serialization.Serializer;
-
-class ProtobufSchemaRegistrySerializer extends SchemaRegistrySerializer<Message> {
-
-  @SneakyThrows
-  public ProtobufSchemaRegistrySerializer(String topic, boolean isKey,
-                                          SchemaRegistryClient client, SchemaMetadata schema) {
-    super(topic, isKey, client, schema);
-  }
-
-  @Override
-  protected Serializer<Message> createSerializer(SchemaRegistryClient client) {
-    var serializer = new KafkaProtobufSerializer<>(client);
-    serializer.configure(
-        Map.of(
-            "schema.registry.url", "wontbeused",
-            AbstractKafkaSchemaSerDeConfig.AUTO_REGISTER_SCHEMAS, false,
-            AbstractKafkaSchemaSerDeConfig.USE_LATEST_VERSION, true
-        ),
-        isKey
-    );
-    return serializer;
-  }
-
-  @Override
-  protected Message serialize(String value, ParsedSchema schema) {
-    ProtobufSchema protobufSchema = (ProtobufSchema) schema;
-    DynamicMessage.Builder builder = protobufSchema.newMessageBuilder();
-    try {
-      JsonFormat.parser().merge(value, builder);
-      return builder.build();
-    } catch (Throwable e) {
-      throw new RuntimeException("Failed to serialize record for topic " + topic, e);
-    }
-  }
-
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
index 25d6e8fc88b..4ef0bbe5dd4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -1,5 +1,8 @@
 package com.provectus.kafka.ui.serdes.builtin.sr;
 
+import static com.provectus.kafka.ui.serdes.builtin.sr.Serialize.serializeAvro;
+import static com.provectus.kafka.ui.serdes.builtin.sr.Serialize.serializeJson;
+import static com.provectus.kafka.ui.serdes.builtin.sr.Serialize.serializeProto;
 import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.BASIC_AUTH_CREDENTIALS_SOURCE;
 import static io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig.USER_INFO_CONFIG;
 
@@ -7,7 +10,6 @@
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
 import com.provectus.kafka.ui.serde.api.PropertyResolver;
-import com.provectus.kafka.ui.serde.api.RecordHeaders;
 import com.provectus.kafka.ui.serde.api.SchemaDescription;
 import com.provectus.kafka.ui.serdes.BuiltInSerde;
 import com.provectus.kafka.ui.util.jsonschema.AvroJsonSchemaConverter;
@@ -32,13 +34,15 @@
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import javax.annotation.Nullable;
-import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.kafka.common.config.SslConfigs;
 
 
 public class SchemaRegistrySerde implements BuiltInSerde {
 
+  private static final byte SR_PAYLOAD_MAGIC_BYTE = 0x0;
+  private static final int SR_PAYLOAD_PREFIX_LENGTH = 5;
+
   public static String name() {
     return "SchemaRegistry";
   }
@@ -221,8 +225,8 @@ private String convertSchema(SchemaMetadata schema, ParsedSchema parsedSchema) {
           .convert(basePath, ((AvroSchema) parsedSchema).rawSchema())
           .toJson();
       case JSON ->
-        //need to use confluent JsonSchema since it includes resolved references
-        ((JsonSchema) parsedSchema).rawSchema().toString();
+          //need to use confluent JsonSchema since it includes resolved references
+          ((JsonSchema) parsedSchema).rawSchema().toString();
     };
   }
 
@@ -254,35 +258,27 @@ private String schemaSubject(String topic, Target type) {
   @Override
   public Serializer serializer(String topic, Target type) {
     String subject = schemaSubject(topic, type);
-    var schema = getSchemaBySubject(subject)
-        .orElseThrow(() -> new ValidationException(String.format("No schema for subject '%s' found", subject)));
-    boolean isKey = type == Target.KEY;
-    SchemaType schemaType = SchemaType.fromString(schema.getSchemaType())
-        .orElseThrow(() -> new IllegalStateException("Unknown schema type: " + schema.getSchemaType()));
+    SchemaMetadata meta = getSchemaBySubject(subject)
+        .orElseThrow(() -> new ValidationException(
+            String.format("No schema for subject '%s' found", subject)));
+    ParsedSchema schema = getSchemaById(meta.getId())
+        .orElseThrow(() -> new IllegalStateException(
+            String.format("Schema found for id %s, subject '%s'", meta.getId(), subject)));
+    SchemaType schemaType = SchemaType.fromString(meta.getSchemaType())
+        .orElseThrow(() -> new IllegalStateException("Unknown schema type: " + meta.getSchemaType()));
     return switch (schemaType) {
-      case PROTOBUF -> new ProtobufSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
-      case AVRO -> new AvroSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
-      case JSON -> new JsonSchemaSchemaRegistrySerializer(topic, isKey, schemaRegistryClient, schema);
+      case PROTOBUF -> input ->
+          serializeProto(schemaRegistryClient, topic, type, (ProtobufSchema) schema, meta.getId(), input);
+      case AVRO -> input ->
+          serializeAvro((AvroSchema) schema, meta.getId(), input);
+      case JSON -> input ->
+          serializeJson((JsonSchema) schema, meta.getId(), input);
     };
   }
 
   @Override
   public Deserializer deserializer(String topic, Target type) {
-    return new SrDeserializer(topic);
-  }
-
-  ///--------------------------------------------------------------
-
-  private static final byte SR_RECORD_MAGIC_BYTE = (byte) 0;
-  private static final int SR_RECORD_PREFIX_LENGTH = 5;
-
-  @RequiredArgsConstructor
-  private class SrDeserializer implements Deserializer {
-
-    private final String topic;
-
-    @Override
-    public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
+    return (headers, data) -> {
       var schemaId = extractSchemaIdFromMsg(data);
       SchemaType format = getMessageFormatBySchemaId(schemaId);
       MessageFormatter formatter = schemaRegistryFormatters.get(format);
@@ -294,7 +290,7 @@ public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
               "type", format.name()
           )
       );
-    }
+    };
   }
 
   private SchemaType getMessageFormatBySchemaId(int schemaId) {
@@ -306,7 +302,7 @@ private SchemaType getMessageFormatBySchemaId(int schemaId) {
 
   private int extractSchemaIdFromMsg(byte[] data) {
     ByteBuffer buffer = ByteBuffer.wrap(data);
-    if (buffer.remaining() > SR_RECORD_PREFIX_LENGTH && buffer.get() == SR_RECORD_MAGIC_BYTE) {
+    if (buffer.remaining() >= SR_PAYLOAD_PREFIX_LENGTH && buffer.get() == SR_PAYLOAD_MAGIC_BYTE) {
       return buffer.getInt();
     }
     throw new ValidationException(
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerializer.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerializer.java
deleted file mode 100644
index a7a202c04f2..00000000000
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/SchemaRegistrySerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.provectus.kafka.ui.serdes.builtin.sr;
-
-import com.provectus.kafka.ui.serde.api.Serde;
-import io.confluent.kafka.schemaregistry.ParsedSchema;
-import io.confluent.kafka.schemaregistry.client.SchemaMetadata;
-import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
-import lombok.SneakyThrows;
-import org.apache.kafka.common.serialization.Serializer;
-
-abstract class SchemaRegistrySerializer<T> implements Serde.Serializer {
-  protected final Serializer<T> serializer;
-  protected final String topic;
-  protected final boolean isKey;
-  protected final ParsedSchema schema;
-
-  @SneakyThrows
-  protected SchemaRegistrySerializer(String topic, boolean isKey, SchemaRegistryClient client,
-                                     SchemaMetadata schema) {
-    this.topic = topic;
-    this.isKey = isKey;
-    this.serializer = createSerializer(client);
-    this.schema = client.getSchemaById(schema.getId());
-  }
-
-  protected abstract Serializer<T> createSerializer(SchemaRegistryClient client);
-
-  @Override
-  public byte[] serialize(String input) {
-    final T read = this.serialize(input, schema);
-    return this.serializer.serialize(topic, read);
-  }
-
-  protected abstract T serialize(String value, ParsedSchema schema);
-}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/Serialize.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/Serialize.java
new file mode 100644
index 00000000000..8381382576b
--- /dev/null
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/sr/Serialize.java
@@ -0,0 +1,126 @@
+package com.provectus.kafka.ui.serdes.builtin.sr;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
+import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.Message;
+import com.google.protobuf.util.JsonFormat;
+import com.provectus.kafka.ui.exception.ValidationException;
+import com.provectus.kafka.ui.serde.api.Serde;
+import com.provectus.kafka.ui.util.annotation.KafkaClientInternalsDependant;
+import com.provectus.kafka.ui.util.jsonschema.JsonAvroConversion;
+import io.confluent.kafka.schemaregistry.avro.AvroSchema;
+import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils;
+import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
+import io.confluent.kafka.schemaregistry.json.JsonSchema;
+import io.confluent.kafka.schemaregistry.json.jackson.Jackson;
+import io.confluent.kafka.schemaregistry.protobuf.MessageIndexes;
+import io.confluent.kafka.schemaregistry.protobuf.ProtobufSchema;
+import io.confluent.kafka.serializers.protobuf.AbstractKafkaProtobufSerializer;
+import io.confluent.kafka.serializers.subject.DefaultReferenceSubjectNameStrategy;
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import lombok.SneakyThrows;
+import org.apache.avro.Schema;
+import org.apache.avro.io.BinaryEncoder;
+import org.apache.avro.io.DatumWriter;
+import org.apache.avro.io.EncoderFactory;
+
+final class Serialize {
+
+  private static final byte MAGIC = 0x0;
+  private static final ObjectMapper JSON_SERIALIZE_MAPPER = Jackson.newObjectMapper(); //from confluent package
+
+  private Serialize() {
+  }
+
+  @KafkaClientInternalsDependant("AbstractKafkaJsonSchemaSerializer::serializeImpl")
+  @SneakyThrows
+  static byte[] serializeJson(JsonSchema schema, int schemaId, String value) {
+    JsonNode json;
+    try {
+      json = JSON_SERIALIZE_MAPPER.readTree(value);
+    } catch (JsonProcessingException e) {
+      throw new ValidationException(String.format("'%s' is not valid json", value));
+    }
+    try {
+      schema.validate(json);
+    } catch (org.everit.json.schema.ValidationException e) {
+      throw new ValidationException(
+          String.format("'%s' does not fit schema: %s", value, e.getAllMessages()));
+    }
+    try (var out = new ByteArrayOutputStream()) {
+      out.write(MAGIC);
+      out.write(schemaId(schemaId));
+      out.write(JSON_SERIALIZE_MAPPER.writeValueAsBytes(json));
+      return out.toByteArray();
+    }
+  }
+
+  @KafkaClientInternalsDependant("AbstractKafkaProtobufSerializer::serializeImpl")
+  @SneakyThrows
+  static byte[] serializeProto(SchemaRegistryClient srClient,
+                               String topic,
+                               Serde.Target target,
+                               ProtobufSchema schema,
+                               int schemaId,
+                               String input) {
+    // flags are tuned like in ProtobufSerializer by default
+    boolean normalizeSchema = false;
+    boolean autoRegisterSchema = false;
+    boolean useLatestVersion = true;
+    boolean latestCompatStrict = true;
+    boolean skipKnownTypes = true;
+
+    schema = AbstractKafkaProtobufSerializer.resolveDependencies(
+        srClient, normalizeSchema, autoRegisterSchema, useLatestVersion, latestCompatStrict,
+        new HashMap<>(), skipKnownTypes, new DefaultReferenceSubjectNameStrategy(),
+        topic, target == Serde.Target.KEY, schema
+    );
+
+    DynamicMessage.Builder builder = schema.newMessageBuilder();
+    JsonFormat.parser().merge(input, builder);
+    Message message = builder.build();
+    MessageIndexes indexes = schema.toMessageIndexes(message.getDescriptorForType().getFullName(), normalizeSchema);
+    try (var out = new ByteArrayOutputStream()) {
+      out.write(MAGIC);
+      out.write(schemaId(schemaId));
+      out.write(indexes.toByteArray());
+      message.writeTo(out);
+      return out.toByteArray();
+    }
+  }
+
+  @KafkaClientInternalsDependant("AbstractKafkaAvroSerializer::serializeImpl")
+  @SneakyThrows
+  static byte[] serializeAvro(AvroSchema schema, int schemaId, String input) {
+    var avroObject = JsonAvroConversion.convertJsonToAvro(input, schema.rawSchema());
+    try (var out = new ByteArrayOutputStream()) {
+      out.write(MAGIC);
+      out.write(schemaId(schemaId));
+      Schema rawSchema = schema.rawSchema();
+      if (rawSchema.getType().equals(Schema.Type.BYTES)) {
+        Preconditions.checkState(
+            avroObject instanceof ByteBuffer,
+            "Unrecognized bytes object of type: " + avroObject.getClass().getName()
+        );
+        out.write(((ByteBuffer) avroObject).array());
+      } else {
+        boolean useLogicalTypeConverters = true;
+        BinaryEncoder encoder = EncoderFactory.get().directBinaryEncoder(out, null);
+        DatumWriter<Object> writer =
+            (DatumWriter<Object>) AvroSchemaUtils.getDatumWriter(avroObject, rawSchema, useLogicalTypeConverters);
+        writer.write(avroObject, encoder);
+        encoder.flush();
+      }
+      return out.toByteArray();
+    }
+  }
+
+  private static byte[] schemaId(int id) {
+    return ByteBuffer.allocate(Integer.BYTES).putInt(id).array();
+  }
+}
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotation/KafkaClientInternalsDependant.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotation/KafkaClientInternalsDependant.java
index 5fe22118a2e..440c9887834 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotation/KafkaClientInternalsDependant.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/annotation/KafkaClientInternalsDependant.java
@@ -5,4 +5,5 @@
  * should be marked with this annotation to make further update process easier.
  */
 public @interface KafkaClientInternalsDependant {
+  String value() default "";
 }

From 6676747606a70bef330db7bd33f298d8956eb57d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:30:50 +0400
Subject: [PATCH 708/734] Bump aquasecurity/trivy-action from 0.11.2 to 0.12.0
 (#4190)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cve.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cve.yaml b/.github/workflows/cve.yaml
index a4ad7ce4b1f..4b38fa2465c 100644
--- a/.github/workflows/cve.yaml
+++ b/.github/workflows/cve.yaml
@@ -55,7 +55,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Run CVE checks
-        uses: aquasecurity/trivy-action@0.11.2
+        uses: aquasecurity/trivy-action@0.12.0
         with:
           image-ref: "provectuslabs/kafka-ui:${{ steps.build.outputs.version }}"
           format: "table"

From 14efe9da1e829422ee971c928c4ba06aa8f73c90 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:31:09 +0400
Subject: [PATCH 709/734] Bump @jest/types from 29.5.0 to 29.6.3 in
 /kafka-ui-react-app (#4188)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 59ffa9757ac..e64aeee9b62 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -135,7 +135,7 @@ dependencies:
 devDependencies:
   '@jest/types':
     specifier: ^29.4.3
-    version: 29.5.0
+    version: 29.6.3
   '@openapitools/openapi-generator-cli':
     specifier: ^2.5.2
     version: 2.5.2
@@ -1133,13 +1133,6 @@ packages:
       - supports-color
     dev: false
 
-  /@jest/schemas@29.4.3:
-    resolution: {integrity: sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@sinclair/typebox': 0.25.24
-    dev: true
-
   /@jest/schemas@29.6.3:
     resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -1209,18 +1202,6 @@ packages:
       chalk: 4.1.2
     dev: true
 
-  /@jest/types@29.5.0:
-    resolution: {integrity: sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/schemas': 29.4.3
-      '@types/istanbul-lib-coverage': 2.0.3
-      '@types/istanbul-reports': 3.0.1
-      '@types/node': 16.11.7
-      '@types/yargs': 17.0.10
-      chalk: 4.1.2
-    dev: true
-
   /@jest/types@29.6.3:
     resolution: {integrity: sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -1432,10 +1413,6 @@ packages:
       reselect: 4.1.5
     dev: false
 
-  /@sinclair/typebox@0.25.24:
-    resolution: {integrity: sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==}
-    dev: true
-
   /@sinclair/typebox@0.27.8:
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
 
@@ -4266,7 +4243,7 @@ packages:
     dependencies:
       '@jest/environment': 29.5.0
       '@jest/fake-timers': 29.5.0
-      '@jest/types': 29.5.0
+      '@jest/types': 29.6.3
       '@types/jsdom': 20.0.0
       '@types/node': 16.11.7
       jest-mock: 29.5.0

From 5c9fb994a4cd1b9f84b7bcaa71a1a28b5cf54feb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:31:27 +0400
Subject: [PATCH 710/734] Bump react and @types/react in /kafka-ui-react-app
 (#4187)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 246 +++++++++++++++---------------
 1 file changed, 123 insertions(+), 123 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index e64aeee9b62..078b92b297a 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -7,10 +7,10 @@ settings:
 dependencies:
   '@floating-ui/react':
     specifier: ^0.19.2
-    version: 0.19.2(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0)
+    version: 0.19.2(@types/react@18.2.21)(react-dom@18.1.0)(react@18.2.0)
   '@hookform/error-message':
     specifier: ^2.0.0
-    version: 2.0.1(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.1.0)
+    version: 2.0.1(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.2.0)
   '@hookform/resolvers':
     specifier: ^2.7.1
     version: 2.8.9(react-hook-form@7.43.1)
@@ -19,19 +19,19 @@ dependencies:
     version: 2.0.1
   '@reduxjs/toolkit':
     specifier: ^1.8.3
-    version: 1.8.3(react-redux@8.0.2)(react@18.1.0)
+    version: 1.8.3(react-redux@8.0.2)(react@18.2.0)
   '@szhsin/react-menu':
     specifier: ^3.5.3
-    version: 3.5.3(react-dom@18.1.0)(react@18.1.0)
+    version: 3.5.3(react-dom@18.1.0)(react@18.2.0)
   '@tanstack/react-query':
     specifier: ^4.0.5
-    version: 4.0.5(react-dom@18.1.0)(react@18.1.0)
+    version: 4.0.5(react-dom@18.1.0)(react@18.2.0)
   '@tanstack/react-table':
     specifier: ^8.5.10
-    version: 8.5.10(react-dom@18.1.0)(react@18.1.0)
+    version: 8.5.10(react-dom@18.1.0)(react@18.2.0)
   '@testing-library/react':
     specifier: ^14.0.0
-    version: 14.0.0(react-dom@18.1.0)(react@18.1.0)
+    version: 14.0.0(react-dom@18.1.0)(react@18.2.0)
   '@types/testing-library__jest-dom':
     specifier: ^5.14.5
     version: 5.14.5
@@ -73,37 +73,37 @@ dependencies:
     version: 7.0.1
   react:
     specifier: ^18.1.0
-    version: 18.1.0
+    version: 18.2.0
   react-ace:
     specifier: ^10.1.0
-    version: 10.1.0(react-dom@18.1.0)(react@18.1.0)
+    version: 10.1.0(react-dom@18.1.0)(react@18.2.0)
   react-datepicker:
     specifier: ^4.10.0
-    version: 4.10.0(react-dom@18.1.0)(react@18.1.0)
+    version: 4.10.0(react-dom@18.1.0)(react@18.2.0)
   react-dom:
     specifier: ^18.1.0
-    version: 18.1.0(react@18.1.0)
+    version: 18.1.0(react@18.2.0)
   react-error-boundary:
     specifier: ^3.1.4
-    version: 3.1.4(react@18.1.0)
+    version: 3.1.4(react@18.2.0)
   react-hook-form:
     specifier: 7.43.1
-    version: 7.43.1(react@18.1.0)
+    version: 7.43.1(react@18.2.0)
   react-hot-toast:
     specifier: ^2.4.0
-    version: 2.4.0(csstype@3.1.2)(react-dom@18.1.0)(react@18.1.0)
+    version: 2.4.0(csstype@3.1.2)(react-dom@18.1.0)(react@18.2.0)
   react-is:
     specifier: ^18.2.0
     version: 18.2.0
   react-multi-select-component:
     specifier: ^4.3.3
-    version: 4.3.3(react-dom@18.1.0)(react@18.1.0)
+    version: 4.3.3(react-dom@18.1.0)(react@18.2.0)
   react-redux:
     specifier: ^8.0.2
-    version: 8.0.2(@types/react-dom@18.0.5)(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0)(redux@4.2.0)
+    version: 8.0.2(@types/react-dom@18.0.5)(@types/react@18.2.21)(react-dom@18.1.0)(react@18.2.0)(redux@4.2.0)
   react-router-dom:
     specifier: ^6.3.0
-    version: 6.3.0(react-dom@18.1.0)(react@18.1.0)
+    version: 6.3.0(react-dom@18.1.0)(react@18.2.0)
   redux:
     specifier: ^4.2.0
     version: 4.2.0
@@ -112,10 +112,10 @@ dependencies:
     version: 1.52.3
   styled-components:
     specifier: ^5.3.1
-    version: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0)
+    version: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.2.0)
   use-debounce:
     specifier: ^9.0.3
-    version: 9.0.4(react@18.1.0)
+    version: 9.0.4(react@18.2.0)
   vite:
     specifier: ^4.0.0
     version: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
@@ -130,7 +130,7 @@ dependencies:
     version: 1.0.2
   zustand:
     specifier: ^4.1.1
-    version: 4.1.1(react@18.1.0)
+    version: 4.1.1(react@18.2.0)
 
 devDependencies:
   '@jest/types':
@@ -168,10 +168,10 @@ devDependencies:
     version: 16.11.7
   '@types/react':
     specifier: ^18.0.9
-    version: 18.0.9
+    version: 18.2.21
   '@types/react-datepicker':
     specifier: ^4.8.0
-    version: 4.10.0(react@18.1.0)
+    version: 4.10.0(react@18.2.0)
   '@types/react-dom':
     specifier: ^18.0.3
     version: 18.0.5
@@ -886,42 +886,42 @@ packages:
       '@floating-ui/core': 1.2.1
     dev: false
 
-  /@floating-ui/react-dom@1.3.0(react-dom@18.1.0)(react@18.1.0):
+  /@floating-ui/react-dom@1.3.0(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-htwHm67Ji5E/pROEAr7f8IKFShuiCKHwUC/UY4vC3I5jiSvGFAYnSYiZO5MlGmads+QqvUkR9ANHEguGrDv72g==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
     dependencies:
       '@floating-ui/dom': 1.2.1
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
     dev: false
 
-  /@floating-ui/react@0.19.2(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0):
+  /@floating-ui/react@0.19.2(@types/react@18.2.21)(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-JyNk4A0Ezirq8FlXECvRtQOX/iBe5Ize0W/pLkrZjfHW9GUV7Xnq6zm6fyZuQzaHHqEnVizmvlA96e1/CkZv+w==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
     dependencies:
-      '@floating-ui/react-dom': 1.3.0(react-dom@18.1.0)(react@18.1.0)
-      aria-hidden: 1.2.1(@types/react@18.0.9)(react@18.1.0)
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      '@floating-ui/react-dom': 1.3.0(react-dom@18.1.0)(react@18.2.0)
+      aria-hidden: 1.2.1(@types/react@18.2.21)(react@18.2.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
       tabbable: 6.1.1
     transitivePeerDependencies:
       - '@types/react'
     dev: false
 
-  /@hookform/error-message@2.0.1(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.1.0):
+  /@hookform/error-message@2.0.1(react-dom@18.1.0)(react-hook-form@7.43.1)(react@18.2.0):
     resolution: {integrity: sha512-U410sAr92xgxT1idlu9WWOVjndxLdgPUHEB8Schr27C9eh7/xUnITWpCMF93s+lGiG++D4JnbSnrb5A21AdSNg==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
       react-hook-form: ^7.0.0
     dependencies:
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
-      react-hook-form: 7.43.1(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
+      react-hook-form: 7.43.1(react@18.2.0)
     dev: false
 
   /@hookform/resolvers@2.8.9(react-hook-form@7.43.1):
@@ -929,7 +929,7 @@ packages:
     peerDependencies:
       react-hook-form: ^7.0.0
     dependencies:
-      react-hook-form: 7.43.1(react@18.1.0)
+      react-hook-form: 7.43.1(react@18.2.0)
     dev: false
 
   /@humanwhocodes/config-array@0.9.5:
@@ -1394,7 +1394,7 @@ packages:
   /@popperjs/core@2.9.2:
     resolution: {integrity: sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==}
 
-  /@reduxjs/toolkit@1.8.3(react-redux@8.0.2)(react@18.1.0):
+  /@reduxjs/toolkit@1.8.3(react-redux@8.0.2)(react@18.2.0):
     resolution: {integrity: sha512-lU/LDIfORmjBbyDLaqFN2JB9YmAT1BElET9y0ZszwhSBa5Ef3t6o5CrHupw5J1iOXwd+o92QfQZ8OJpwXvsssg==}
     peerDependencies:
       react: ^16.9.0 || ^17.0.0 || ^18
@@ -1406,8 +1406,8 @@ packages:
         optional: true
     dependencies:
       immer: 9.0.12
-      react: 18.1.0
-      react-redux: 8.0.2(@types/react-dom@18.0.5)(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0)(redux@4.2.0)
+      react: 18.2.0
+      react-redux: 8.0.2(@types/react-dom@18.0.5)(@types/react@18.2.21)(react-dom@18.1.0)(react@18.2.0)(redux@4.2.0)
       redux: 4.2.0
       redux-thunk: 2.4.1(redux@4.2.0)
       reselect: 4.1.5
@@ -1533,23 +1533,23 @@ packages:
       jsonc-parser: 3.2.0
     dev: true
 
-  /@szhsin/react-menu@3.5.3(react-dom@18.1.0)(react@18.1.0):
+  /@szhsin/react-menu@3.5.3(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-jxo8oaRwxmVjUzkyOi/ZJiXaZiuFPMIxFzyJdUKfnhBLYiEOVTU9M2CiPuEkirILoareR2GJj2K3y8a81CBPlw==}
     peerDependencies:
       react: '>=16.14.0'
       react-dom: '>=16.14.0'
     dependencies:
       prop-types: 15.8.1
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
-      react-transition-state: 1.1.5(react-dom@18.1.0)(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
+      react-transition-state: 1.1.5(react-dom@18.1.0)(react@18.2.0)
     dev: false
 
   /@tanstack/query-core@4.0.5:
     resolution: {integrity: sha512-QOJ2gLbwlf8p0487pMey6vv8EF5X2ib1zINayaD7mb9/LibUtXmZ12uJgTqcnjgNY/4tWZn5qJnEk2ePG5AVGA==}
     dev: false
 
-  /@tanstack/react-query@4.0.5(react-dom@18.1.0)(react@18.1.0):
+  /@tanstack/react-query@4.0.5(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-tIggVlhoFevVpY/LkZroPmrERFHN8tw4aZLtgwSArzHmMJ03WQcaNvbbHy6GERidXtaMdUz+IeQryrE7cO7WPQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -1563,12 +1563,12 @@ packages:
     dependencies:
       '@tanstack/query-core': 4.0.5
       '@types/use-sync-external-store': 0.0.3
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
-      use-sync-external-store: 1.2.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
+      use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
 
-  /@tanstack/react-table@8.5.10(react-dom@18.1.0)(react@18.1.0):
+  /@tanstack/react-table@8.5.10(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-TG+iyqtZD5/N7gCDNM8HJc+ZWbUAkSjv8JaVqk2eYs4xaTUfPnTTsG0vJYqGkoxp8i2GFY78dRx1FDCsctYPGA==}
     engines: {node: '>=12'}
     peerDependencies:
@@ -1576,8 +1576,8 @@ packages:
       react-dom: '>=16'
     dependencies:
       '@tanstack/table-core': 8.5.10
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
     dev: false
 
   /@tanstack/table-core@8.5.10:
@@ -1627,7 +1627,7 @@ packages:
       redent: 3.0.0
     dev: true
 
-  /@testing-library/react@14.0.0(react-dom@18.1.0)(react@18.1.0):
+  /@testing-library/react@14.0.0(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-S04gSNJbYE30TlIMLTzv6QCTzt9AqIF5y6s6SzVFILNcNvbV/jU96GeiTPillGQo+Ny64M/5PV7klNYYgv5Dfg==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -1637,8 +1637,8 @@ packages:
       '@babel/runtime': 7.17.9
       '@testing-library/dom': 9.0.0
       '@types/react-dom': 18.0.5
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
     dev: false
 
   /@testing-library/user-event@14.4.3(@testing-library/dom@9.0.0):
@@ -1729,7 +1729,7 @@ packages:
   /@types/hoist-non-react-statics@3.3.1:
     resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==}
     dependencies:
-      '@types/react': 18.0.9
+      '@types/react': 18.2.21
       hoist-non-react-statics: 3.3.2
 
   /@types/istanbul-lib-coverage@2.0.3:
@@ -1785,13 +1785,13 @@ packages:
   /@types/prop-types@15.7.5:
     resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
 
-  /@types/react-datepicker@4.10.0(react@18.1.0):
+  /@types/react-datepicker@4.10.0(react@18.2.0):
     resolution: {integrity: sha512-Cq+ks20vBIU6XN67TbkCHu8M7V46Y6vJrKE2n+8q/GfueJyWWTIKeC3Z7cz/d+qxGDq/VCrqA929R0U4lNuztg==}
     dependencies:
       '@popperjs/core': 2.9.2
-      '@types/react': 18.0.9
+      '@types/react': 18.2.21
       date-fns: 2.27.0
-      react-popper: 2.2.5(@popperjs/core@2.9.2)(react@18.1.0)
+      react-popper: 2.2.5(@popperjs/core@2.9.2)(react@18.2.0)
     transitivePeerDependencies:
       - react
     dev: true
@@ -1799,13 +1799,13 @@ packages:
   /@types/react-dom@18.0.5:
     resolution: {integrity: sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==}
     dependencies:
-      '@types/react': 18.0.9
+      '@types/react': 18.2.21
 
   /@types/react-router-dom@5.3.3:
     resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==}
     dependencies:
       '@types/history': 4.7.11
-      '@types/react': 18.0.9
+      '@types/react': 18.2.21
       '@types/react-router': 5.1.18
     dev: true
 
@@ -1813,15 +1813,15 @@ packages:
     resolution: {integrity: sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==}
     dependencies:
       '@types/history': 4.7.11
-      '@types/react': 18.0.9
+      '@types/react': 18.2.21
     dev: true
 
-  /@types/react@18.0.9:
-    resolution: {integrity: sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==}
+  /@types/react@18.2.21:
+    resolution: {integrity: sha512-neFKG/sBAwGxHgXiIxnbm3/AAVQ/cMRS93hvBpg8xYRbeQSPVABp9U2bRnPf0iI4+Ucdv3plSxKK+3CW2ENJxA==}
     dependencies:
       '@types/prop-types': 15.7.5
       '@types/scheduler': 0.16.2
-      csstype: 3.0.8
+      csstype: 3.1.2
 
   /@types/scheduler@0.16.2:
     resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
@@ -1833,7 +1833,7 @@ packages:
     resolution: {integrity: sha512-xPTYmWP7Mxk5TAD3pYsqjwA9G5fAI8e/S51QUJEl7EQD1siKCdiYXIWiH2lzoHRl+QqbQCJMcGv3YTF3OmyPdQ==}
     dependencies:
       '@types/hoist-non-react-statics': 3.3.1
-      '@types/react': 18.0.9
+      '@types/react': 18.2.21
       csstype: 3.0.8
     dev: true
 
@@ -2138,7 +2138,7 @@ packages:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
     dev: true
 
-  /aria-hidden@1.2.1(@types/react@18.0.9)(react@18.1.0):
+  /aria-hidden@1.2.1(@types/react@18.2.21)(react@18.2.0):
     resolution: {integrity: sha512-PN344VAf9j1EAi+jyVHOJ8XidQdPVssGco39eNcsGdM4wcsILtxrKLkbuiMfLWYROK1FjRQasMWCBttrhjnr6A==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -2148,8 +2148,8 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@types/react': 18.0.9
-      react: 18.1.0
+      '@types/react': 18.2.21
+      react: 18.2.0
       tslib: 2.4.0
     dev: false
 
@@ -2280,7 +2280,7 @@ packages:
       '@babel/helper-module-imports': 7.18.6
       babel-plugin-syntax-jsx: 6.18.0
       lodash: 4.17.21
-      styled-components: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0)
+      styled-components: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.2.0)
 
   /babel-plugin-syntax-jsx@6.18.0:
     resolution: {integrity: sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==}
@@ -2675,10 +2675,10 @@ packages:
 
   /csstype@3.0.8:
     resolution: {integrity: sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==}
+    dev: true
 
   /csstype@3.1.2:
     resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
-    dev: false
 
   /damerau-levenshtein@1.0.7:
     resolution: {integrity: sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==}
@@ -4486,7 +4486,7 @@ packages:
       styled-components: '>= 5'
     dependencies:
       '@adobe/css-tools': 4.2.0
-      styled-components: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0)
+      styled-components: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.2.0)
     dev: true
 
   /jest-util@29.5.0:
@@ -5359,7 +5359,7 @@ packages:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
 
-  /react-ace@10.1.0(react-dom@18.1.0)(react@18.1.0):
+  /react-ace@10.1.0(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-VkvUjZNhdYTuKOKQpMIZi7uzZZVgzCjM7cLYu6F64V0mejY8a2XTyPUIMszC6A4trbeMIHbK5fYFcT/wkP/8VA==}
     peerDependencies:
       react: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0
@@ -5370,11 +5370,11 @@ packages:
       lodash.get: 4.4.2
       lodash.isequal: 4.5.0
       prop-types: 15.8.1
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
     dev: false
 
-  /react-datepicker@4.10.0(react-dom@18.1.0)(react@18.1.0):
+  /react-datepicker@4.10.0(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-6IfBCZyWj54ZZGLmEZJ9c4Yph0s9MVfEGDC2evOvf9AmVz+RRcfP2Czqad88Ff9wREbcbqa4dk7IFYeXF1d3Ag==}
     peerDependencies:
       react: ^16.9.0 || ^17 || ^18
@@ -5384,44 +5384,44 @@ packages:
       classnames: 2.3.1
       date-fns: 2.27.0
       prop-types: 15.8.1
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
-      react-onclickoutside: 6.12.2(react-dom@18.1.0)(react@18.1.0)
-      react-popper: 2.3.0(@popperjs/core@2.9.2)(react-dom@18.1.0)(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
+      react-onclickoutside: 6.12.2(react-dom@18.1.0)(react@18.2.0)
+      react-popper: 2.3.0(@popperjs/core@2.9.2)(react-dom@18.1.0)(react@18.2.0)
     dev: false
 
-  /react-dom@18.1.0(react@18.1.0):
+  /react-dom@18.1.0(react@18.2.0):
     resolution: {integrity: sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w==}
     peerDependencies:
       react: ^18.1.0
     dependencies:
       loose-envify: 1.4.0
-      react: 18.1.0
+      react: 18.2.0
       scheduler: 0.22.0
 
-  /react-error-boundary@3.1.4(react@18.1.0):
+  /react-error-boundary@3.1.4(react@18.2.0):
     resolution: {integrity: sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==}
     engines: {node: '>=10', npm: '>=6'}
     peerDependencies:
       react: '>=16.13.1'
     dependencies:
       '@babel/runtime': 7.17.9
-      react: 18.1.0
+      react: 18.2.0
     dev: false
 
   /react-fast-compare@3.2.0:
     resolution: {integrity: sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==}
 
-  /react-hook-form@7.43.1(react@18.1.0):
+  /react-hook-form@7.43.1(react@18.2.0):
     resolution: {integrity: sha512-+s3+s8LLytRMriwwuSqeLStVjRXFGxgjjx2jED7Z+wz1J/88vpxieRQGvJVvzrzVxshZ0BRuocFERb779m2kNg==}
     engines: {node: '>=12.22.0'}
     peerDependencies:
       react: ^16.8.0 || ^17 || ^18
     dependencies:
-      react: 18.1.0
+      react: 18.2.0
     dev: false
 
-  /react-hot-toast@2.4.0(csstype@3.1.2)(react-dom@18.1.0)(react@18.1.0):
+  /react-hot-toast@2.4.0(csstype@3.1.2)(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-qnnVbXropKuwUpriVVosgo8QrB+IaPJCpL8oBI6Ov84uvHZ5QQcTp2qg6ku2wNfgJl6rlQXJIQU5q+5lmPOutA==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -5429,8 +5429,8 @@ packages:
       react-dom: '>=16'
     dependencies:
       goober: 2.1.10(csstype@3.1.2)
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
     transitivePeerDependencies:
       - csstype
     dev: false
@@ -5444,39 +5444,39 @@ packages:
   /react-is@18.2.0:
     resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
 
-  /react-multi-select-component@4.3.3(react-dom@18.1.0)(react@18.1.0):
+  /react-multi-select-component@4.3.3(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-V8cDJC3M7F27PWv1baV8FpJReHa/SbpJGL80CmXwnlMkDK2KMlQSRDmDzBnmCjcbROIgoztdW+gYBpqo9BIF4g==}
     peerDependencies:
       react: ^16 || ^17 || ^18
       react-dom: ^16 || ^17 || ^18
     dependencies:
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
     dev: false
 
-  /react-onclickoutside@6.12.2(react-dom@18.1.0)(react@18.1.0):
+  /react-onclickoutside@6.12.2(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-NMXGa223OnsrGVp5dJHkuKxQ4czdLmXSp5jSV9OqiCky9LOpPATn3vLldc+q5fK3gKbEHvr7J1u0yhBh/xYkpA==}
     peerDependencies:
       react: ^15.5.x || ^16.x || ^17.x || ^18.x
       react-dom: ^15.5.x || ^16.x || ^17.x || ^18.x
     dependencies:
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
     dev: false
 
-  /react-popper@2.2.5(@popperjs/core@2.9.2)(react@18.1.0):
+  /react-popper@2.2.5(@popperjs/core@2.9.2)(react@18.2.0):
     resolution: {integrity: sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==}
     peerDependencies:
       '@popperjs/core': ^2.0.0
       react: ^16.8.0 || ^17
     dependencies:
       '@popperjs/core': 2.9.2
-      react: 18.1.0
+      react: 18.2.0
       react-fast-compare: 3.2.0
       warning: 4.0.3
     dev: true
 
-  /react-popper@2.3.0(@popperjs/core@2.9.2)(react-dom@18.1.0)(react@18.1.0):
+  /react-popper@2.3.0(@popperjs/core@2.9.2)(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==}
     peerDependencies:
       '@popperjs/core': ^2.0.0
@@ -5484,13 +5484,13 @@ packages:
       react-dom: ^16.8.0 || ^17 || ^18
     dependencies:
       '@popperjs/core': 2.9.2
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
       react-fast-compare: 3.2.0
       warning: 4.0.3
     dev: false
 
-  /react-redux@8.0.2(@types/react-dom@18.0.5)(@types/react@18.0.9)(react-dom@18.1.0)(react@18.1.0)(redux@4.2.0):
+  /react-redux@8.0.2(@types/react-dom@18.0.5)(@types/react@18.2.21)(react-dom@18.1.0)(react@18.2.0)(redux@4.2.0):
     resolution: {integrity: sha512-nBwiscMw3NoP59NFCXFf02f8xdo+vSHT/uZ1ldDwF7XaTpzm+Phk97VT4urYBl5TYAPNVaFm12UHAEyzkpNzRA==}
     peerDependencies:
       '@types/react': ^16.8 || ^17.0 || ^18.0
@@ -5513,50 +5513,50 @@ packages:
     dependencies:
       '@babel/runtime': 7.17.9
       '@types/hoist-non-react-statics': 3.3.1
-      '@types/react': 18.0.9
+      '@types/react': 18.2.21
       '@types/react-dom': 18.0.5
       '@types/use-sync-external-store': 0.0.3
       hoist-non-react-statics: 3.3.2
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
       react-is: 18.2.0
       redux: 4.2.0
-      use-sync-external-store: 1.2.0(react@18.1.0)
+      use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
 
-  /react-router-dom@6.3.0(react-dom@18.1.0)(react@18.1.0):
+  /react-router-dom@6.3.0(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
       history: 5.3.0
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
-      react-router: 6.3.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
+      react-router: 6.3.0(react@18.2.0)
     dev: false
 
-  /react-router@6.3.0(react@18.1.0):
+  /react-router@6.3.0(react@18.2.0):
     resolution: {integrity: sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==}
     peerDependencies:
       react: '>=16.8'
     dependencies:
       history: 5.3.0
-      react: 18.1.0
+      react: 18.2.0
     dev: false
 
-  /react-transition-state@1.1.5(react-dom@18.1.0)(react@18.1.0):
+  /react-transition-state@1.1.5(react-dom@18.1.0)(react@18.2.0):
     resolution: {integrity: sha512-ITY2mZqc2dWG2eitJkYNdcSFW8aKeOlkL2A/vowRrLL8GH3J6Re/SpD/BLvQzrVOTqjsP0b5S9N10vgNNzwMUQ==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
     dependencies:
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
     dev: false
 
-  /react@18.1.0:
-    resolution: {integrity: sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ==}
+  /react@18.2.0:
+    resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
     engines: {node: '>=0.10.0'}
     dependencies:
       loose-envify: 1.4.0
@@ -5975,7 +5975,7 @@ packages:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  /styled-components@5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.1.0):
+  /styled-components@5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-JThv2JRzyH0NOIURrk9iskdxMSAAtCfj/b2Sf1WJaCUsloQkblepy1jaCLX/bYE+mhYo3unmwVSI9I5d9ncSiQ==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -5991,8 +5991,8 @@ packages:
       babel-plugin-styled-components: 1.13.2(styled-components@5.3.1)
       css-to-react-native: 3.0.0
       hoist-non-react-statics: 3.3.2
-      react: 18.1.0
-      react-dom: 18.1.0(react@18.1.0)
+      react: 18.2.0
+      react-dom: 18.1.0(react@18.2.0)
       react-is: 18.2.0
       shallowequal: 1.1.0
       supports-color: 5.5.0
@@ -6300,21 +6300,21 @@ packages:
       requires-port: 1.0.0
     dev: true
 
-  /use-debounce@9.0.4(react@18.1.0):
+  /use-debounce@9.0.4(react@18.2.0):
     resolution: {integrity: sha512-6X8H/mikbrt0XE8e+JXRtZ8yYVvKkdYRfmIhWZYsP8rcNs9hk3APV8Ua2mFkKRLcJKVdnX2/Vwrmg2GWKUQEaQ==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       react: '>=16.8.0'
     dependencies:
-      react: 18.1.0
+      react: 18.2.0
     dev: false
 
-  /use-sync-external-store@1.2.0(react@18.1.0):
+  /use-sync-external-store@1.2.0(react@18.2.0):
     resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      react: 18.1.0
+      react: 18.2.0
     dev: false
 
   /util-deprecate@1.0.2:
@@ -6612,7 +6612,7 @@ packages:
       type-fest: 2.19.0
     dev: false
 
-  /zustand@4.1.1(react@18.1.0):
+  /zustand@4.1.1(react@18.2.0):
     resolution: {integrity: sha512-h4F3WMqsZgvvaE0n3lThx4MM81Ls9xebjvrABNzf5+jb3/03YjNTSgZXeyrvXDArMeV9untvWXRw1tY+ntPYbA==}
     engines: {node: '>=12.7.0'}
     peerDependencies:
@@ -6624,6 +6624,6 @@ packages:
       react:
         optional: true
     dependencies:
-      react: 18.1.0
-      use-sync-external-store: 1.2.0(react@18.1.0)
+      react: 18.2.0
+      use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false

From a47848f809c065302b2c7a77df8b1b56a7708a45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:31:50 +0400
Subject: [PATCH 711/734] Bump vite-tsconfig-paths from 4.0.2 to 4.2.0 in
 /kafka-ui-react-app (#4186)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 078b92b297a..36766df63aa 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -121,7 +121,7 @@ dependencies:
     version: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
   vite-tsconfig-paths:
     specifier: ^4.0.2
-    version: 4.0.2(typescript@4.7.4)(vite@4.0.5)
+    version: 4.2.0(typescript@4.7.4)(vite@4.0.5)
   whatwg-fetch:
     specifier: ^3.6.2
     version: 3.6.2
@@ -6180,12 +6180,12 @@ packages:
       ts-morph: 13.0.3
     dev: true
 
-  /tsconfck@2.0.1(typescript@4.7.4):
-    resolution: {integrity: sha512-/ipap2eecmVBmBlsQLBRbUmUNFwNJV/z2E+X0FPtHNjPwroMZQ7m39RMaCywlCulBheYXgMdUlWDd9rzxwMA0Q==}
-    engines: {node: ^14.13.1 || ^16 || >=18, pnpm: ^7.0.1}
+  /tsconfck@2.1.2(typescript@4.7.4):
+    resolution: {integrity: sha512-ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg==}
+    engines: {node: ^14.13.1 || ^16 || >=18}
     hasBin: true
     peerDependencies:
-      typescript: ^4.3.5
+      typescript: ^4.3.5 || ^5.0.0
     peerDependenciesMeta:
       typescript:
         optional: true
@@ -6348,14 +6348,17 @@ packages:
       ejs: 3.1.8
     dev: true
 
-  /vite-tsconfig-paths@4.0.2(typescript@4.7.4)(vite@4.0.5):
-    resolution: {integrity: sha512-UzU8zwbCQrdUkj/Z0tnh293n4ScRcjJLoS8nPme2iB2FHoU5q8rhilb7AbhLlUC1uv4t6jSzVWnENjPnyGseeQ==}
+  /vite-tsconfig-paths@4.2.0(typescript@4.7.4)(vite@4.0.5):
+    resolution: {integrity: sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw==}
     peerDependencies:
-      vite: '>2.0.0-0'
+      vite: '*'
+    peerDependenciesMeta:
+      vite:
+        optional: true
     dependencies:
       debug: 4.3.4(supports-color@5.5.0)
       globrex: 0.1.2
-      tsconfck: 2.0.1(typescript@4.7.4)
+      tsconfck: 2.1.2(typescript@4.7.4)
       vite: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
     transitivePeerDependencies:
       - supports-color

From 2836b2f5d2528ffde2b4374c121f13001b7f2ed4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:32:37 +0400
Subject: [PATCH 712/734] Bump eslint-config-prettier from 8.5.0 to 9.0.0 in
 /kafka-ui-react-app (#4182)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/package.json   |  2 +-
 kafka-ui-react-app/pnpm-lock.yaml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-react-app/package.json b/kafka-ui-react-app/package.json
index 9cbf8d211a2..172ec4466ab 100644
--- a/kafka-ui-react-app/package.json
+++ b/kafka-ui-react-app/package.json
@@ -86,7 +86,7 @@
     "eslint": "^8.3.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-import-resolver-typescript": "^3.2.7",
     "eslint-plugin-import": "^2.26.0",
diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 36766df63aa..3e4a017bac0 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -203,8 +203,8 @@ devDependencies:
     specifier: ^17.0.0
     version: 17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.16.0)
   eslint-config-prettier:
-    specifier: ^8.5.0
-    version: 8.5.0(eslint@8.16.0)
+    specifier: ^9.0.0
+    version: 9.0.0(eslint@8.16.0)
   eslint-import-resolver-node:
     specifier: ^0.3.6
     version: 0.3.9
@@ -222,7 +222,7 @@ devDependencies:
     version: 6.5.1(eslint@8.16.0)
   eslint-plugin-prettier:
     specifier: ^4.0.0
-    version: 4.2.1(eslint-config-prettier@8.5.0)(eslint@8.16.0)(prettier@2.8.4)
+    version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.16.0)(prettier@2.8.4)
   eslint-plugin-react:
     specifier: ^7.30.1
     version: 7.30.1(eslint@8.16.0)
@@ -3037,8 +3037,8 @@ packages:
       object.entries: 1.1.5
     dev: true
 
-  /eslint-config-prettier@8.5.0(eslint@8.16.0):
-    resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==}
+  /eslint-config-prettier@9.0.0(eslint@8.16.0):
+    resolution: {integrity: sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
@@ -3167,7 +3167,7 @@ packages:
       minimatch: 3.1.2
     dev: true
 
-  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.5.0)(eslint@8.16.0)(prettier@2.8.4):
+  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@9.0.0)(eslint@8.16.0)(prettier@2.8.4):
     resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -3179,7 +3179,7 @@ packages:
         optional: true
     dependencies:
       eslint: 8.16.0
-      eslint-config-prettier: 8.5.0(eslint@8.16.0)
+      eslint-config-prettier: 9.0.0(eslint@8.16.0)
       prettier: 2.8.4
       prettier-linter-helpers: 1.0.0
     dev: true

From 9e7bc02c8a62539681cf255cfa8a6f979ea8ea7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:33:07 +0400
Subject: [PATCH 713/734] Bump eslint-plugin-jsx-a11y from 6.5.1 to 6.7.1 in
 /kafka-ui-react-app (#4159)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 467 +++++++++++++++++++++++-------
 1 file changed, 359 insertions(+), 108 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 3e4a017bac0..16bb652f0b9 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -198,7 +198,7 @@ devDependencies:
     version: 8.16.0
   eslint-config-airbnb:
     specifier: ^19.0.4
-    version: 19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.5.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0)
+    version: 19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0)
   eslint-config-airbnb-typescript:
     specifier: ^17.0.0
     version: 17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.16.0)
@@ -219,7 +219,7 @@ devDependencies:
     version: 4.0.3(eslint@8.16.0)
   eslint-plugin-jsx-a11y:
     specifier: ^6.5.1
-    version: 6.5.1(eslint@8.16.0)
+    version: 6.7.1(eslint@8.16.0)
   eslint-plugin-prettier:
     specifier: ^4.0.0
     version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.16.0)(prettier@2.8.4)
@@ -595,19 +595,17 @@ packages:
       '@babel/helper-plugin-utils': 7.18.6
     dev: false
 
-  /@babel/runtime-corejs3@7.14.6:
-    resolution: {integrity: sha512-Xl8SPYtdjcMoCsIM4teyVRg7jIcgl8F2kRtoCcXuHzXswt9UxZCS6BzRo8fcnCuP6u2XtPgvyonmEPF57Kxo9Q==}
+  /@babel/runtime@7.17.9:
+    resolution: {integrity: sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      core-js-pure: 3.14.0
       regenerator-runtime: 0.13.7
-    dev: true
 
-  /@babel/runtime@7.17.9:
-    resolution: {integrity: sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==}
+  /@babel/runtime@7.22.11:
+    resolution: {integrity: sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      regenerator-runtime: 0.13.7
+      regenerator-runtime: 0.14.0
 
   /@babel/template@7.18.6:
     resolution: {integrity: sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==}
@@ -1590,9 +1588,9 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@babel/runtime': 7.17.9
+      '@babel/runtime': 7.22.11
       '@types/aria-query': 4.2.2
-      aria-query: 5.0.0
+      aria-query: 5.3.0
       chalk: 4.1.2
       dom-accessibility-api: 0.5.10
       lz-string: 1.4.4
@@ -2153,26 +2151,42 @@ packages:
       tslib: 2.4.0
     dev: false
 
-  /aria-query@4.2.2:
-    resolution: {integrity: sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==}
+  /aria-query@5.0.0:
+    resolution: {integrity: sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==}
     engines: {node: '>=6.0'}
+
+  /aria-query@5.3.0:
+    resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
     dependencies:
-      '@babel/runtime': 7.17.9
-      '@babel/runtime-corejs3': 7.14.6
+      dequal: 2.0.3
     dev: true
 
-  /aria-query@5.0.0:
-    resolution: {integrity: sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==}
-    engines: {node: '>=6.0'}
+  /array-buffer-byte-length@1.0.0:
+    resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
+    dependencies:
+      call-bind: 1.0.2
+      is-array-buffer: 3.0.2
+    dev: true
 
   /array-includes@3.1.5:
     resolution: {integrity: sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
-      get-intrinsic: 1.1.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+      get-intrinsic: 1.2.1
+      is-string: 1.0.7
+    dev: true
+
+  /array-includes@3.1.6:
+    resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+      get-intrinsic: 1.2.1
       is-string: 1.0.7
     dev: true
 
@@ -2186,8 +2200,18 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+      es-shim-unscopables: 1.0.0
+    dev: true
+
+  /array.prototype.flat@1.3.1:
+    resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
       es-shim-unscopables: 1.0.0
     dev: true
 
@@ -2196,11 +2220,33 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
       es-shim-unscopables: 1.0.0
     dev: true
 
+  /array.prototype.flatmap@1.3.1:
+    resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+      es-shim-unscopables: 1.0.0
+    dev: true
+
+  /arraybuffer.prototype.slice@1.0.1:
+    resolution: {integrity: sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      array-buffer-byte-length: 1.0.0
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      get-intrinsic: 1.2.1
+      is-array-buffer: 3.0.2
+      is-shared-array-buffer: 1.0.2
+    dev: true
+
   /ast-types-flow@0.0.7:
     resolution: {integrity: sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==}
     dev: true
@@ -2213,8 +2259,13 @@ packages:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
     dev: true
 
-  /axe-core@4.3.5:
-    resolution: {integrity: sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==}
+  /available-typed-arrays@1.0.5:
+    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /axe-core@4.7.2:
+    resolution: {integrity: sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==}
     engines: {node: '>=4'}
     dev: true
 
@@ -2226,8 +2277,10 @@ packages:
       - debug
     dev: true
 
-  /axobject-query@2.2.0:
-    resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
+  /axobject-query@3.2.1:
+    resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==}
+    dependencies:
+      dequal: 2.0.3
     dev: true
 
   /babel-jest@29.6.4(@babel/core@7.18.9):
@@ -2390,7 +2443,7 @@ packages:
     resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
     dependencies:
       function-bind: 1.1.1
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.2.1
     dev: true
 
   /call-me-maybe@1.0.1:
@@ -2609,12 +2662,6 @@ packages:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
     dev: false
 
-  /core-js-pure@3.14.0:
-    resolution: {integrity: sha512-YVh+LN2FgNU0odThzm61BsdkwrbrchumFq3oztnE9vTKC4KS2fvnPmcx8t6jnqAyOTCTF4ZSiuK8Qhh7SNcL4g==}
-    deprecated: core-js-pure@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
-    requiresBuild: true
-    dev: true
-
   /core-js@3.14.0:
     resolution: {integrity: sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==}
     deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
@@ -2680,8 +2727,8 @@ packages:
   /csstype@3.1.2:
     resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
 
-  /damerau-levenshtein@1.0.7:
-    resolution: {integrity: sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==}
+  /damerau-levenshtein@1.0.8:
+    resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
     dev: true
 
   /data-urls@3.0.2:
@@ -2765,8 +2812,8 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /define-properties@1.1.4:
-    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
+  /define-properties@1.2.0:
+    resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-property-descriptors: 1.0.0
@@ -2778,6 +2825,11 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: true
 
+  /dequal@2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
+    dev: true
+
   /detect-newline@3.1.0:
     resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
     engines: {node: '>=8'}
@@ -2884,33 +2936,58 @@ packages:
     dependencies:
       is-arrayish: 0.2.1
 
-  /es-abstract@1.20.0:
-    resolution: {integrity: sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==}
+  /es-abstract@1.22.1:
+    resolution: {integrity: sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==}
     engines: {node: '>= 0.4'}
     dependencies:
+      array-buffer-byte-length: 1.0.0
+      arraybuffer.prototype.slice: 1.0.1
+      available-typed-arrays: 1.0.5
       call-bind: 1.0.2
+      es-set-tostringtag: 2.0.1
       es-to-primitive: 1.2.1
-      function-bind: 1.1.1
       function.prototype.name: 1.1.5
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.2.1
       get-symbol-description: 1.0.0
+      globalthis: 1.0.3
+      gopd: 1.0.1
       has: 1.0.3
       has-property-descriptors: 1.0.0
+      has-proto: 1.0.1
       has-symbols: 1.0.3
-      internal-slot: 1.0.3
-      is-callable: 1.2.4
+      internal-slot: 1.0.5
+      is-array-buffer: 3.0.2
+      is-callable: 1.2.7
       is-negative-zero: 2.0.2
       is-regex: 1.1.4
       is-shared-array-buffer: 1.0.2
       is-string: 1.0.7
+      is-typed-array: 1.1.12
       is-weakref: 1.0.2
-      object-inspect: 1.12.2
+      object-inspect: 1.12.3
       object-keys: 1.1.1
-      object.assign: 4.1.2
-      regexp.prototype.flags: 1.4.3
-      string.prototype.trimend: 1.0.5
-      string.prototype.trimstart: 1.0.5
+      object.assign: 4.1.4
+      regexp.prototype.flags: 1.5.0
+      safe-array-concat: 1.0.0
+      safe-regex-test: 1.0.0
+      string.prototype.trim: 1.2.7
+      string.prototype.trimend: 1.0.6
+      string.prototype.trimstart: 1.0.6
+      typed-array-buffer: 1.0.0
+      typed-array-byte-length: 1.0.0
+      typed-array-byte-offset: 1.0.0
+      typed-array-length: 1.0.4
       unbox-primitive: 1.0.2
+      which-typed-array: 1.1.11
+    dev: true
+
+  /es-set-tostringtag@2.0.1:
+    resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.1
+      has: 1.0.3
+      has-tostringtag: 1.0.0
     dev: true
 
   /es-shim-unscopables@1.0.0:
@@ -2923,7 +3000,7 @@ packages:
     resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      is-callable: 1.2.4
+      is-callable: 1.2.7
       is-date-object: 1.0.4
       is-symbol: 1.0.4
     dev: true
@@ -2997,8 +3074,8 @@ packages:
       confusing-browser-globals: 1.0.11
       eslint: 8.16.0
       eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
-      object.assign: 4.1.2
-      object.entries: 1.1.5
+      object.assign: 4.1.4
+      object.entries: 1.1.7
       semver: 6.3.1
     dev: true
 
@@ -3017,7 +3094,7 @@ packages:
       eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
     dev: true
 
-  /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.5.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0):
+  /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0):
     resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==}
     engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -3030,7 +3107,7 @@ packages:
       eslint: 8.16.0
       eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.16.0)
       eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
-      eslint-plugin-jsx-a11y: 6.5.1(eslint@8.16.0)
+      eslint-plugin-jsx-a11y: 6.7.1(eslint@8.16.0)
       eslint-plugin-react: 7.30.1(eslint@8.16.0)
       eslint-plugin-react-hooks: 4.6.0(eslint@8.16.0)
       object.assign: 4.1.2
@@ -3146,25 +3223,29 @@ packages:
       requireindex: 1.2.0
     dev: true
 
-  /eslint-plugin-jsx-a11y@6.5.1(eslint@8.16.0):
-    resolution: {integrity: sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==}
+  /eslint-plugin-jsx-a11y@6.7.1(eslint@8.16.0):
+    resolution: {integrity: sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==}
     engines: {node: '>=4.0'}
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
-      '@babel/runtime': 7.17.9
-      aria-query: 4.2.2
-      array-includes: 3.1.5
+      '@babel/runtime': 7.22.11
+      aria-query: 5.3.0
+      array-includes: 3.1.6
+      array.prototype.flatmap: 1.3.1
       ast-types-flow: 0.0.7
-      axe-core: 4.3.5
-      axobject-query: 2.2.0
-      damerau-levenshtein: 1.0.7
+      axe-core: 4.7.2
+      axobject-query: 3.2.1
+      damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
       eslint: 8.16.0
       has: 1.0.3
-      jsx-ast-utils: 3.3.0
+      jsx-ast-utils: 3.3.5
       language-tags: 1.0.5
       minimatch: 3.1.2
+      object.entries: 1.1.7
+      object.fromentries: 2.0.7
+      semver: 6.3.1
     dev: true
 
   /eslint-plugin-prettier@4.2.1(eslint-config-prettier@9.0.0)(eslint@8.16.0)(prettier@2.8.4):
@@ -3505,6 +3586,12 @@ packages:
         optional: true
     dev: true
 
+  /for-each@0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+    dependencies:
+      is-callable: 1.2.7
+    dev: true
+
   /form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
     engines: {node: '>= 6'}
@@ -3545,8 +3632,8 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
       functions-have-names: 1.2.3
     dev: true
 
@@ -3567,11 +3654,12 @@ packages:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
-  /get-intrinsic@1.1.1:
-    resolution: {integrity: sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==}
+  /get-intrinsic@1.2.1:
+    resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
     dependencies:
       function-bind: 1.1.1
       has: 1.0.3
+      has-proto: 1.0.1
       has-symbols: 1.0.3
     dev: true
 
@@ -3590,7 +3678,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.2.1
     dev: true
 
   /get-tsconfig@4.2.0:
@@ -3656,6 +3744,13 @@ packages:
       type-fest: 0.20.2
     dev: true
 
+  /globalthis@1.0.3:
+    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-properties: 1.2.0
+    dev: true
+
   /globalyzer@0.1.0:
     resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
     dev: true
@@ -3694,6 +3789,12 @@ packages:
       csstype: 3.1.2
     dev: false
 
+  /gopd@1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+    dependencies:
+      get-intrinsic: 1.2.1
+    dev: true
+
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
@@ -3712,7 +3813,12 @@ packages:
   /has-property-descriptors@1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.2.1
+    dev: true
+
+  /has-proto@1.0.1:
+    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
+    engines: {node: '>= 0.4'}
     dev: true
 
   /has-symbols@1.0.3:
@@ -3736,7 +3842,7 @@ packages:
   /history@5.3.0:
     resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==}
     dependencies:
-      '@babel/runtime': 7.17.9
+      '@babel/runtime': 7.22.11
     dev: false
 
   /hoist-non-react-statics@3.3.2:
@@ -3866,15 +3972,23 @@ packages:
       through: 2.3.8
     dev: true
 
-  /internal-slot@1.0.3:
-    resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==}
+  /internal-slot@1.0.5:
+    resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.2.1
       has: 1.0.3
       side-channel: 1.0.4
     dev: true
 
+  /is-array-buffer@3.0.2:
+    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.1
+      is-typed-array: 1.1.12
+    dev: true
+
   /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
 
@@ -3895,8 +4009,8 @@ packages:
       call-bind: 1.0.2
     dev: true
 
-  /is-callable@1.2.4:
-    resolution: {integrity: sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==}
+  /is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
     dev: true
 
@@ -4001,6 +4115,13 @@ packages:
       has-symbols: 1.0.3
     dev: true
 
+  /is-typed-array@1.1.12:
+    resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      which-typed-array: 1.1.11
+    dev: true
+
   /is-unicode-supported@0.1.0:
     resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
     engines: {node: '>=10'}
@@ -4019,6 +4140,10 @@ packages:
       is-docker: 2.2.1
     dev: true
 
+  /isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+    dev: true
+
   /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
@@ -4733,8 +4858,18 @@ packages:
     resolution: {integrity: sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q==}
     engines: {node: '>=4.0'}
     dependencies:
-      array-includes: 3.1.5
-      object.assign: 4.1.2
+      array-includes: 3.1.6
+      object.assign: 4.1.4
+    dev: true
+
+  /jsx-ast-utils@3.3.5:
+    resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
+    engines: {node: '>=4.0'}
+    dependencies:
+      array-includes: 3.1.6
+      array.prototype.flat: 1.3.1
+      object.assign: 4.1.4
+      object.values: 1.1.7
     dev: true
 
   /kleur@3.0.3:
@@ -4997,8 +5132,8 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
-  /object-inspect@1.12.2:
-    resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
+  /object-inspect@1.12.3:
+    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
     dev: true
 
   /object-keys@1.1.1:
@@ -5011,7 +5146,17 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
+      define-properties: 1.2.0
+      has-symbols: 1.0.3
+      object-keys: 1.1.1
+    dev: true
+
+  /object.assign@4.1.4:
+    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
       has-symbols: 1.0.3
       object-keys: 1.1.1
     dev: true
@@ -5021,8 +5166,17 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+    dev: true
+
+  /object.entries@1.1.7:
+    resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
     dev: true
 
   /object.fromentries@2.0.5:
@@ -5030,15 +5184,24 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+    dev: true
+
+  /object.fromentries@2.0.7:
+    resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
     dev: true
 
   /object.hasown@1.1.1:
     resolution: {integrity: sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==}
     dependencies:
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
     dev: true
 
   /object.values@1.1.5:
@@ -5046,8 +5209,17 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+    dev: true
+
+  /object.values@1.1.7:
+    resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
     dev: true
 
   /once@1.4.0:
@@ -5605,12 +5777,15 @@ packages:
   /regenerator-runtime@0.13.7:
     resolution: {integrity: sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==}
 
-  /regexp.prototype.flags@1.4.3:
-    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
+  /regenerator-runtime@0.14.0:
+    resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==}
+
+  /regexp.prototype.flags@1.5.0:
+    resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==}
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
+      define-properties: 1.2.0
       functions-have-names: 1.2.3
     dev: true
 
@@ -5754,6 +5929,16 @@ packages:
       tslib: 2.4.0
     dev: true
 
+  /safe-array-concat@1.0.0:
+    resolution: {integrity: sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==}
+    engines: {node: '>=0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.1
+      has-symbols: 1.0.3
+      isarray: 2.0.5
+    dev: true
+
   /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
     dev: false
@@ -5762,6 +5947,14 @@ packages:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: true
 
+  /safe-regex-test@1.0.0:
+    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.1
+      is-regex: 1.1.4
+    dev: true
+
   /safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
     dev: true
@@ -5823,8 +6016,8 @@ packages:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.1
-      object-inspect: 1.12.2
+      get-intrinsic: 1.2.1
+      object-inspect: 1.12.3
     dev: true
 
   /signal-exit@3.0.7:
@@ -5905,29 +6098,38 @@ packages:
     resolution: {integrity: sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
-      get-intrinsic: 1.1.1
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+      get-intrinsic: 1.2.1
       has-symbols: 1.0.3
-      internal-slot: 1.0.3
-      regexp.prototype.flags: 1.4.3
+      internal-slot: 1.0.5
+      regexp.prototype.flags: 1.5.0
       side-channel: 1.0.4
     dev: true
 
-  /string.prototype.trimend@1.0.5:
-    resolution: {integrity: sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==}
+  /string.prototype.trim@1.2.7:
+    resolution: {integrity: sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
+    dev: true
+
+  /string.prototype.trimend@1.0.6:
+    resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
     dev: true
 
-  /string.prototype.trimstart@1.0.5:
-    resolution: {integrity: sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==}
+  /string.prototype.trimstart@1.0.6:
+    resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.20.0
+      define-properties: 1.2.0
+      es-abstract: 1.22.1
     dev: true
 
   /string_decoder@1.3.0:
@@ -6264,6 +6466,44 @@ packages:
     engines: {node: '>=14.16'}
     dev: false
 
+  /typed-array-buffer@1.0.0:
+    resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.1
+      is-typed-array: 1.1.12
+    dev: true
+
+  /typed-array-byte-length@1.0.0:
+    resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      has-proto: 1.0.1
+      is-typed-array: 1.1.12
+    dev: true
+
+  /typed-array-byte-offset@1.0.0:
+    resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      has-proto: 1.0.1
+      is-typed-array: 1.1.12
+    dev: true
+
+  /typed-array-length@1.0.4:
+    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
+    dependencies:
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      is-typed-array: 1.1.12
+    dev: true
+
   /typescript@4.7.4:
     resolution: {integrity: sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==}
     engines: {node: '>=4.2.0'}
@@ -6492,6 +6732,17 @@ packages:
       is-symbol: 1.0.4
     dev: true
 
+  /which-typed-array@1.1.11:
+    resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.0
+    dev: true
+
   /which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
     engines: {node: '>= 8'}

From d2b0cc51e35c1d1edd4a9d1efc20c198cfc74360 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 17:42:35 +0400
Subject: [PATCH 714/734] Bump json-schema-faker from 0.5.0-rcv.44 to 0.5.3 in
 /kafka-ui-react-app (#4189)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 16bb652f0b9..5b9de2658ee 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -58,7 +58,7 @@ dependencies:
     version: 2.2.2(jest@29.6.4)
   json-schema-faker:
     specifier: ^0.5.0-rcv.44
-    version: 0.5.0-rcv.44
+    version: 0.5.3
   jsonpath-plus:
     specifier: ^7.2.0
     version: 7.2.0
@@ -4792,16 +4792,17 @@ packages:
   /json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
-  /json-schema-faker@0.5.0-rcv.44:
-    resolution: {integrity: sha512-MbDxYFsPXTVMawW1Y6zEU7QhfwsT+ZJ2d+LI8n57Y8+Xw1Cdx1hITgsFTLNOJ1lDMHZqWeXGGgMbc1hW0BGisg==}
+  /json-schema-faker@0.5.3:
+    resolution: {integrity: sha512-BeIrR0+YSrTbAR9dOMnjbFl1MvHyXnq+Wpdw1FpWZDHWKLzK229hZ5huyPcmzFUfVq1ODwf40WdGVoE266UBUg==}
     hasBin: true
     dependencies:
       json-schema-ref-parser: 6.1.0
-      jsonpath-plus: 5.1.0
+      jsonpath-plus: 7.2.0
     dev: false
 
   /json-schema-ref-parser@6.1.0:
     resolution: {integrity: sha512-pXe9H1m6IgIpXmE5JSb8epilNTGsmTb2iPohAXpOdhqGFbQjNeHHsZxU+C8w6T81GZxSPFLeUoqDJmzxx5IGuw==}
+    deprecated: Please switch to @apidevtools/json-schema-ref-parser
     dependencies:
       call-me-maybe: 1.0.1
       js-yaml: 3.14.1
@@ -4844,11 +4845,6 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
-  /jsonpath-plus@5.1.0:
-    resolution: {integrity: sha512-890w2Pjtj0iswAxalRlt2kHthi6HKrXEfZcn+ZNZptv7F3rUGIeDuZo+C+h4vXBHLEsVjJrHeCm35nYeZLzSBQ==}
-    engines: {node: '>=10.0.0'}
-    dev: false
-
   /jsonpath-plus@7.2.0:
     resolution: {integrity: sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==}
     engines: {node: '>=12.0.0'}

From ceb821acdf710ebb442b8849de8f24434dd43da1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 17:42:46 +0400
Subject: [PATCH 715/734] Bump sass from 1.52.3 to 1.66.1 in
 /kafka-ui-react-app (#4185)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 5b9de2658ee..6fe24c794e3 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -109,7 +109,7 @@ dependencies:
     version: 4.2.0
   sass:
     specifier: ^1.52.3
-    version: 1.52.3
+    version: 1.66.1
   styled-components:
     specifier: ^5.3.1
     version: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.2.0)
@@ -118,7 +118,7 @@ dependencies:
     version: 9.0.4(react@18.2.0)
   vite:
     specifier: ^4.0.0
-    version: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
+    version: 4.0.5(@types/node@16.11.7)(sass@1.66.1)
   vite-tsconfig-paths:
     specifier: ^4.0.2
     version: 4.2.0(typescript@4.7.4)(vite@4.0.5)
@@ -1994,7 +1994,7 @@ packages:
       vite: ^4.0.0
     dependencies:
       '@swc/core': 1.3.38
-      vite: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
+      vite: 4.0.5(@types/node@16.11.7)(sass@1.66.1)
     dev: true
 
   /abab@2.0.6:
@@ -5955,9 +5955,9 @@ packages:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
     dev: true
 
-  /sass@1.52.3:
-    resolution: {integrity: sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==}
-    engines: {node: '>=12.0.0'}
+  /sass@1.66.1:
+    resolution: {integrity: sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==}
+    engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
       chokidar: 3.5.2
@@ -6595,13 +6595,13 @@ packages:
       debug: 4.3.4(supports-color@5.5.0)
       globrex: 0.1.2
       tsconfck: 2.1.2(typescript@4.7.4)
-      vite: 4.0.5(@types/node@16.11.7)(sass@1.52.3)
+      vite: 4.0.5(@types/node@16.11.7)(sass@1.66.1)
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: false
 
-  /vite@4.0.5(@types/node@16.11.7)(sass@1.52.3):
+  /vite@4.0.5(@types/node@16.11.7)(sass@1.66.1):
     resolution: {integrity: sha512-7m87RC+caiAxG+8j3jObveRLqaWA/neAdCat6JAZwMkSWqFHOvg8MYe5fAQxVBRAuKAQ1S6XDh3CBQuLNbY33w==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -6631,7 +6631,7 @@ packages:
       postcss: 8.4.20
       resolve: 1.22.1
       rollup: 3.7.3
-      sass: 1.52.3
+      sass: 1.66.1
     optionalDependencies:
       fsevents: 2.3.2
 

From 145bf07b5d9d8d553e3fef46bbd395691f71eb9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 17:42:55 +0400
Subject: [PATCH 716/734] Bump jest-environment-jsdom from 29.5.0 to 29.6.4 in
 /kafka-ui-react-app (#4183)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 58 ++++---------------------------
 1 file changed, 7 insertions(+), 51 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 6fe24c794e3..c1c162d0938 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -231,7 +231,7 @@ devDependencies:
     version: 4.6.0(eslint@8.16.0)
   jest-environment-jsdom:
     specifier: ^29.4.3
-    version: 29.5.0
+    version: 29.6.4
   jest-sonar-reporter:
     specifier: ^2.0.0
     version: 2.0.0
@@ -1023,16 +1023,6 @@ packages:
       '@jest/types': 27.5.1
     dev: true
 
-  /@jest/environment@29.5.0:
-    resolution: {integrity: sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/fake-timers': 29.6.4
-      '@jest/types': 29.6.3
-      '@types/node': 16.11.7
-      jest-mock: 29.6.3
-    dev: true
-
   /@jest/environment@29.6.4:
     resolution: {integrity: sha512-sQ0SULEjA1XUTHmkBRl7A1dyITM9yb1yb3ZNKPX3KlTd6IG7mWUe3e2yfExtC2Zz1Q+mMckOLHmL/qLiuQJrBQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -1041,7 +1031,6 @@ packages:
       '@jest/types': 29.6.3
       '@types/node': 16.11.7
       jest-mock: 29.6.3
-    dev: false
 
   /@jest/expect-utils@29.6.4:
     resolution: {integrity: sha512-FEhkJhqtvBwgSpiTrocquJCdXPsyvNKcl/n7A3u7X4pVoF4bswm11c9d4AV+kfq2Gpv/mM8x7E7DsRvH+djkrg==}
@@ -1059,18 +1048,6 @@ packages:
       - supports-color
     dev: false
 
-  /@jest/fake-timers@29.5.0:
-    resolution: {integrity: sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/types': 29.6.3
-      '@sinonjs/fake-timers': 10.0.2
-      '@types/node': 16.11.7
-      jest-message-util: 29.6.3
-      jest-mock: 29.6.3
-      jest-util: 29.6.3
-    dev: true
-
   /@jest/fake-timers@29.6.4:
     resolution: {integrity: sha512-6UkCwzoBK60edXIIWb0/KWkuj7R7Qq91vVInOe3De6DSpaEiqjKcJw4F7XUet24Wupahj9J6PlR09JqJ5ySDHw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -4357,8 +4334,8 @@ packages:
       pretty-format: 29.6.3
     dev: false
 
-  /jest-environment-jsdom@29.5.0:
-    resolution: {integrity: sha512-/KG8yEK4aN8ak56yFVdqFDzKNHgF4BAymCx2LbPNPsUshUlfAl0eX402Xm1pt+eoG9SLZEUVifqXtX8SK74KCw==}
+  /jest-environment-jsdom@29.6.4:
+    resolution: {integrity: sha512-K6wfgUJ16DoMs02JYFid9lOsqfpoVtyJxpRlnTxUHzvZWBnnh2VNGRB9EC1Cro96TQdq5TtSjb3qUjNaJP9IyA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       canvas: ^2.5.0
@@ -4366,13 +4343,13 @@ packages:
       canvas:
         optional: true
     dependencies:
-      '@jest/environment': 29.5.0
-      '@jest/fake-timers': 29.5.0
+      '@jest/environment': 29.6.4
+      '@jest/fake-timers': 29.6.4
       '@jest/types': 29.6.3
       '@types/jsdom': 20.0.0
       '@types/node': 16.11.7
-      jest-mock: 29.5.0
-      jest-util: 29.5.0
+      jest-mock: 29.6.3
+      jest-util: 29.6.3
       jsdom: 20.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -4446,15 +4423,6 @@ packages:
       slash: 3.0.0
       stack-utils: 2.0.5
 
-  /jest-mock@29.5.0:
-    resolution: {integrity: sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/types': 29.6.3
-      '@types/node': 16.11.7
-      jest-util: 29.6.3
-    dev: true
-
   /jest-mock@29.6.3:
     resolution: {integrity: sha512-Z7Gs/mOyTSR4yPsaZ72a/MtuK6RnC3JYqWONe48oLaoEcYwEDxqvbXz85G4SJrm2Z5Ar9zp6MiHF4AlFlRM4Pg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -4614,18 +4582,6 @@ packages:
       styled-components: 5.3.1(react-dom@18.1.0)(react-is@18.2.0)(react@18.2.0)
     dev: true
 
-  /jest-util@29.5.0:
-    resolution: {integrity: sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==}
-    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-    dependencies:
-      '@jest/types': 29.6.3
-      '@types/node': 16.11.7
-      chalk: 4.1.2
-      ci-info: 3.3.1
-      graceful-fs: 4.2.10
-      picomatch: 2.3.1
-    dev: true
-
   /jest-util@29.6.3:
     resolution: {integrity: sha512-QUjna/xSy4B32fzcKTSz1w7YYzgiHrjjJjevdRf61HYk998R5vVMMNmrHESYZVDS5DSWs+1srPLPKxXPkeSDOA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}

From bbb739af926a492f5d8e38866ba356f13b031890 Mon Sep 17 00:00:00 2001
From: Mihai Alexandru Agache <40888485+MikeStrike101@users.noreply.github.com>
Date: Tue, 5 Sep 2023 17:01:45 +0300
Subject: [PATCH 717/734] FE: Fix dateTimeHelpers.spec.ts linter error (#4090)

Co-authored-by: Roman Zabaluev <rzabaluev@provectus.com>
---
 .../src/lib/hooks/__tests__/dateTimeHelpers.spec.ts           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/dateTimeHelpers.spec.ts b/kafka-ui-react-app/src/lib/hooks/__tests__/dateTimeHelpers.spec.ts
index 5ed95fa8515..ad5346283c6 100644
--- a/kafka-ui-react-app/src/lib/hooks/__tests__/dateTimeHelpers.spec.ts
+++ b/kafka-ui-react-app/src/lib/hooks/__tests__/dateTimeHelpers.spec.ts
@@ -13,10 +13,10 @@ describe('dateTimeHelpers', () => {
     it('should output the correct date', () => {
       const date = new Date();
       expect(formatTimestamp(date)).toBe(
-        date.toLocaleString([], { hour12: false })
+        date.toLocaleString([], { hourCycle: 'h23' })
       );
       expect(formatTimestamp(date.getTime())).toBe(
-        date.toLocaleString([], { hour12: false })
+        date.toLocaleString([], { hourCycle: 'h23' })
       );
     });
   });

From 59584ed369df485a74372bb7689c2d222c2ce8f5 Mon Sep 17 00:00:00 2001
From: Ilya Kuramshin <iliax@proton.me>
Date: Tue, 5 Sep 2023 18:03:09 +0400
Subject: [PATCH 718/734] BE: Add a common prefix for all app metrics (#4177)

Co-authored-by: iliax <ikuramshin@provectus.com>
---
 .../kafka/ui/util/ApplicationMetrics.java          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationMetrics.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationMetrics.java
index 841d5e87a51..811e6491804 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationMetrics.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/ApplicationMetrics.java
@@ -18,6 +18,10 @@
 @RequiredArgsConstructor(access = PRIVATE)
 public class ApplicationMetrics {
 
+  // kafka-ui specific metrics prefix. Added to make it easier to distinguish kui metrics from
+  // other metrics, exposed by spring boot (like http stats, jvm, etc.)
+  private static final String COMMON_PREFIX = "kui_";
+
   private final String clusterName;
   private final MeterRegistry registry;
 
@@ -40,7 +44,7 @@ public void meterPolledRecords(String topic, PolledRecords polled, boolean throt
   }
 
   private Counter polledRecords(String topic) {
-    return Counter.builder("topic_records_polled")
+    return Counter.builder(COMMON_PREFIX + "topic_records_polled")
         .description("Number of records polled from topic")
         .tag("cluster", clusterName)
         .tag("topic", topic)
@@ -48,7 +52,7 @@ private Counter polledRecords(String topic) {
   }
 
   private DistributionSummary polledBytes(String topic) {
-    return DistributionSummary.builder("topic_polled_bytes")
+    return DistributionSummary.builder(COMMON_PREFIX + "topic_polled_bytes")
         .description("Bytes polled from kafka topic")
         .tag("cluster", clusterName)
         .tag("topic", topic)
@@ -56,7 +60,7 @@ private DistributionSummary polledBytes(String topic) {
   }
 
   private Timer pollTimer(String topic) {
-    return Timer.builder("topic_poll_time")
+    return Timer.builder(COMMON_PREFIX + "topic_poll_time")
         .description("Time spend in polling for topic")
         .tag("cluster", clusterName)
         .tag("topic", topic)
@@ -64,7 +68,7 @@ private Timer pollTimer(String topic) {
   }
 
   private Counter pollThrottlingActivations() {
-    return Counter.builder("poll_throttling_activations")
+    return Counter.builder(COMMON_PREFIX + "poll_throttling_activations")
         .description("Number of poll throttling activations")
         .tag("cluster", clusterName)
         .register(registry);
@@ -72,7 +76,7 @@ private Counter pollThrottlingActivations() {
 
   public AtomicInteger activeConsumers() {
     var count = new AtomicInteger();
-    Gauge.builder("active_consumers", () -> count)
+    Gauge.builder(COMMON_PREFIX + "active_consumers", () -> count)
         .description("Number of active consumers")
         .tag("cluster", clusterName)
         .register(registry);

From 0616883feefa117e562ce510300a7bf4bc456a27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 14:33:49 +0400
Subject: [PATCH 719/734] Bump eslint from 8.16.0 to 8.48.0 in
 /kafka-ui-react-app (#4184)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 296 ++++++++++++++++++------------
 1 file changed, 179 insertions(+), 117 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index c1c162d0938..b836c25ace2 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -183,10 +183,10 @@ devDependencies:
     version: 5.1.18
   '@typescript-eslint/eslint-plugin':
     specifier: ^5.29.0
-    version: 5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.16.0)(typescript@4.7.4)
+    version: 5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.48.0)(typescript@4.7.4)
   '@typescript-eslint/parser':
     specifier: ^5.29.0
-    version: 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+    version: 5.29.0(eslint@8.48.0)(typescript@4.7.4)
   '@vitejs/plugin-react-swc':
     specifier: ^3.0.0
     version: 3.0.0(vite@4.0.5)
@@ -195,40 +195,40 @@ devDependencies:
     version: 16.0.1
   eslint:
     specifier: ^8.3.0
-    version: 8.16.0
+    version: 8.48.0
   eslint-config-airbnb:
     specifier: ^19.0.4
-    version: 19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0)
+    version: 19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.48.0)
   eslint-config-airbnb-typescript:
     specifier: ^17.0.0
-    version: 17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.16.0)
+    version: 17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.48.0)
   eslint-config-prettier:
     specifier: ^9.0.0
-    version: 9.0.0(eslint@8.16.0)
+    version: 9.0.0(eslint@8.48.0)
   eslint-import-resolver-node:
     specifier: ^0.3.6
     version: 0.3.9
   eslint-import-resolver-typescript:
     specifier: ^3.2.7
-    version: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.16.0)
+    version: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.48.0)
   eslint-plugin-import:
     specifier: ^2.26.0
-    version: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
+    version: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
   eslint-plugin-jest-dom:
     specifier: ^4.0.3
-    version: 4.0.3(eslint@8.16.0)
+    version: 4.0.3(eslint@8.48.0)
   eslint-plugin-jsx-a11y:
     specifier: ^6.5.1
-    version: 6.7.1(eslint@8.16.0)
+    version: 6.7.1(eslint@8.48.0)
   eslint-plugin-prettier:
     specifier: ^4.0.0
-    version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.16.0)(prettier@2.8.4)
+    version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.48.0)(prettier@2.8.4)
   eslint-plugin-react:
     specifier: ^7.30.1
-    version: 7.30.1(eslint@8.16.0)
+    version: 7.30.1(eslint@8.48.0)
   eslint-plugin-react-hooks:
     specifier: ^4.5.0
-    version: 4.6.0(eslint@8.16.0)
+    version: 4.6.0(eslint@8.48.0)
   jest-environment-jsdom:
     specifier: ^29.4.3
     version: 29.6.4
@@ -259,6 +259,11 @@ devDependencies:
 
 packages:
 
+  /@aashutoshrathi/word-wrap@1.2.6:
+    resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /@adobe/css-tools@4.2.0:
     resolution: {integrity: sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA==}
     dev: true
@@ -857,14 +862,29 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@eslint/eslintrc@1.3.0:
-    resolution: {integrity: sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==}
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.48.0):
+    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+    dependencies:
+      eslint: 8.48.0
+      eslint-visitor-keys: 3.4.3
+    dev: true
+
+  /@eslint-community/regexpp@4.8.0:
+    resolution: {integrity: sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+    dev: true
+
+  /@eslint/eslintrc@2.1.2:
+    resolution: {integrity: sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.4(supports-color@5.5.0)
-      espree: 9.3.2
-      globals: 13.15.0
+      espree: 9.6.1
+      globals: 13.21.0
       ignore: 5.2.0
       import-fresh: 3.3.0
       js-yaml: 4.1.0
@@ -874,6 +894,11 @@ packages:
       - supports-color
     dev: true
 
+  /@eslint/js@8.48.0:
+    resolution: {integrity: sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
   /@floating-ui/core@1.2.1:
     resolution: {integrity: sha512-LSqwPZkK3rYfD7GKoIeExXOyYx6Q1O4iqZWwIehDNuv3Dv425FIAE8PRwtAx1imEolFTHgBEcoFHm9MDnYgPCg==}
     dev: false
@@ -930,8 +955,8 @@ packages:
       react-hook-form: 7.43.1(react@18.2.0)
     dev: false
 
-  /@humanwhocodes/config-array@0.9.5:
-    resolution: {integrity: sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==}
+  /@humanwhocodes/config-array@0.11.11:
+    resolution: {integrity: sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -941,6 +966,11 @@ packages:
       - supports-color
     dev: true
 
+  /@humanwhocodes/module-importer@1.0.1:
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+    dev: true
+
   /@humanwhocodes/object-schema@1.2.1:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
     dev: true
@@ -1302,8 +1332,8 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
-  /@nodelib/fs.walk@1.2.7:
-    resolution: {integrity: sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==}
+  /@nodelib/fs.walk@1.2.8:
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
@@ -1839,7 +1869,7 @@ packages:
     dependencies:
       '@types/yargs-parser': 20.2.0
 
-  /@typescript-eslint/eslint-plugin@5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.16.0)(typescript@4.7.4):
+  /@typescript-eslint/eslint-plugin@5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.48.0)(typescript@4.7.4):
     resolution: {integrity: sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1850,12 +1880,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+      '@typescript-eslint/parser': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
       '@typescript-eslint/scope-manager': 5.29.0
-      '@typescript-eslint/type-utils': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
-      '@typescript-eslint/utils': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+      '@typescript-eslint/type-utils': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
+      '@typescript-eslint/utils': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 8.16.0
+      eslint: 8.48.0
       functional-red-black-tree: 1.0.1
       ignore: 5.2.0
       regexpp: 3.2.0
@@ -1866,7 +1896,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@5.29.0(eslint@8.16.0)(typescript@4.7.4):
+  /@typescript-eslint/parser@5.29.0(eslint@8.48.0)(typescript@4.7.4):
     resolution: {integrity: sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1880,7 +1910,7 @@ packages:
       '@typescript-eslint/types': 5.29.0
       '@typescript-eslint/typescript-estree': 5.29.0(typescript@4.7.4)
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 8.16.0
+      eslint: 8.48.0
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
@@ -1894,7 +1924,7 @@ packages:
       '@typescript-eslint/visitor-keys': 5.29.0
     dev: true
 
-  /@typescript-eslint/type-utils@5.29.0(eslint@8.16.0)(typescript@4.7.4):
+  /@typescript-eslint/type-utils@5.29.0(eslint@8.48.0)(typescript@4.7.4):
     resolution: {integrity: sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1904,9 +1934,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/utils': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+      '@typescript-eslint/utils': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
       debug: 4.3.4(supports-color@5.5.0)
-      eslint: 8.16.0
+      eslint: 8.48.0
       tsutils: 3.21.0(typescript@4.7.4)
       typescript: 4.7.4
     transitivePeerDependencies:
@@ -1939,7 +1969,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils@5.29.0(eslint@8.16.0)(typescript@4.7.4):
+  /@typescript-eslint/utils@5.29.0(eslint@8.48.0)(typescript@4.7.4):
     resolution: {integrity: sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1949,9 +1979,9 @@ packages:
       '@typescript-eslint/scope-manager': 5.29.0
       '@typescript-eslint/types': 5.29.0
       '@typescript-eslint/typescript-estree': 5.29.0(typescript@4.7.4)
-      eslint: 8.16.0
+      eslint: 8.48.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0(eslint@8.16.0)
+      eslint-utils: 3.0.0(eslint@8.48.0)
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -1962,7 +1992,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       '@typescript-eslint/types': 5.29.0
-      eslint-visitor-keys: 3.3.0
+      eslint-visitor-keys: 3.4.3
     dev: true
 
   /@vitejs/plugin-react-swc@3.0.0(vite@4.0.5):
@@ -1989,12 +2019,12 @@ packages:
       acorn-walk: 7.2.0
     dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.7.1):
+  /acorn-jsx@5.3.2(acorn@8.10.0):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.7.1
+      acorn: 8.10.0
     dev: true
 
   /acorn-walk@7.2.0:
@@ -2012,6 +2042,12 @@ packages:
     hasBin: true
     dev: true
 
+  /acorn@8.10.0:
+    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+    dev: true
+
   /acorn@8.7.1:
     resolution: {integrity: sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==}
     engines: {node: '>=0.4.0'}
@@ -3041,7 +3077,7 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.26.0)(eslint@8.16.0):
+  /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.26.0)(eslint@8.48.0):
     resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==}
     engines: {node: ^10.12.0 || >=12.0.0}
     peerDependencies:
@@ -3049,14 +3085,14 @@ packages:
       eslint-plugin-import: ^2.25.2
     dependencies:
       confusing-browser-globals: 1.0.11
-      eslint: 8.16.0
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
+      eslint: 8.48.0
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
       object.assign: 4.1.4
       object.entries: 1.1.7
       semver: 6.3.1
     dev: true
 
-  /eslint-config-airbnb-typescript@17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.16.0):
+  /eslint-config-airbnb-typescript@17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.48.0):
     resolution: {integrity: sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==}
     peerDependencies:
       '@typescript-eslint/eslint-plugin': ^5.13.0
@@ -3064,14 +3100,14 @@ packages:
       eslint: ^7.32.0 || ^8.2.0
       eslint-plugin-import: ^2.25.3
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.16.0)(typescript@4.7.4)
-      '@typescript-eslint/parser': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
-      eslint: 8.16.0
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.16.0)
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
+      '@typescript-eslint/eslint-plugin': 5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.48.0)(typescript@4.7.4)
+      '@typescript-eslint/parser': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
+      eslint: 8.48.0
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.48.0)
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
     dev: true
 
-  /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.16.0):
+  /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.48.0):
     resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==}
     engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -3081,23 +3117,23 @@ packages:
       eslint-plugin-react: ^7.28.0
       eslint-plugin-react-hooks: ^4.3.0
     dependencies:
-      eslint: 8.16.0
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.16.0)
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
-      eslint-plugin-jsx-a11y: 6.7.1(eslint@8.16.0)
-      eslint-plugin-react: 7.30.1(eslint@8.16.0)
-      eslint-plugin-react-hooks: 4.6.0(eslint@8.16.0)
+      eslint: 8.48.0
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.48.0)
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
+      eslint-plugin-jsx-a11y: 6.7.1(eslint@8.48.0)
+      eslint-plugin-react: 7.30.1(eslint@8.48.0)
+      eslint-plugin-react-hooks: 4.6.0(eslint@8.48.0)
       object.assign: 4.1.2
       object.entries: 1.1.5
     dev: true
 
-  /eslint-config-prettier@9.0.0(eslint@8.16.0):
+  /eslint-config-prettier@9.0.0(eslint@8.48.0):
     resolution: {integrity: sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 8.16.0
+      eslint: 8.48.0
     dev: true
 
   /eslint-import-resolver-node@0.3.9:
@@ -3110,7 +3146,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-import-resolver-typescript@3.2.7(eslint-plugin-import@2.26.0)(eslint@8.16.0):
+  /eslint-import-resolver-typescript@3.2.7(eslint-plugin-import@2.26.0)(eslint@8.48.0):
     resolution: {integrity: sha512-WvcsRy3aPmwVsuS/XVliAJWpIdTlaFXXZPZk3TCbvvF8RtaAkjAhcLL5bl5VEoTmE+XnTHjIbWMzNZcOQpK/DA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -3119,8 +3155,8 @@ packages:
     dependencies:
       debug: 4.3.4(supports-color@5.5.0)
       enhanced-resolve: 5.10.0
-      eslint: 8.16.0
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0)
+      eslint: 8.48.0
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
       get-tsconfig: 4.2.0
       globby: 13.1.2
       is-core-module: 2.9.0
@@ -3148,16 +3184,16 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+      '@typescript-eslint/parser': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
       debug: 3.2.7
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.16.0)
+      eslint-import-resolver-typescript: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.48.0)
       find-up: 2.1.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-plugin-import@2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.16.0):
+  /eslint-plugin-import@2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0):
     resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3167,12 +3203,12 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.29.0(eslint@8.16.0)(typescript@4.7.4)
+      '@typescript-eslint/parser': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
       array-includes: 3.1.5
       array.prototype.flat: 1.3.0
       debug: 2.6.9
       doctrine: 2.1.0
-      eslint: 8.16.0
+      eslint: 8.48.0
       eslint-import-resolver-node: 0.3.9
       eslint-module-utils: 2.7.3(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.2.7)
       has: 1.0.3
@@ -3188,7 +3224,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-jest-dom@4.0.3(eslint@8.16.0):
+  /eslint-plugin-jest-dom@4.0.3(eslint@8.48.0):
     resolution: {integrity: sha512-9j+n8uj0+V0tmsoS7bYC7fLhQmIvjRqRYEcbDSi+TKPsTThLLXCyj5swMSSf/hTleeMktACnn+HFqXBr5gbcbA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'}
     peerDependencies:
@@ -3196,11 +3232,11 @@ packages:
     dependencies:
       '@babel/runtime': 7.17.9
       '@testing-library/dom': 8.13.0
-      eslint: 8.16.0
+      eslint: 8.48.0
       requireindex: 1.2.0
     dev: true
 
-  /eslint-plugin-jsx-a11y@6.7.1(eslint@8.16.0):
+  /eslint-plugin-jsx-a11y@6.7.1(eslint@8.48.0):
     resolution: {integrity: sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -3215,7 +3251,7 @@ packages:
       axobject-query: 3.2.1
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
-      eslint: 8.16.0
+      eslint: 8.48.0
       has: 1.0.3
       jsx-ast-utils: 3.3.5
       language-tags: 1.0.5
@@ -3225,7 +3261,7 @@ packages:
       semver: 6.3.1
     dev: true
 
-  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@9.0.0)(eslint@8.16.0)(prettier@2.8.4):
+  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@9.0.0)(eslint@8.48.0)(prettier@2.8.4):
     resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -3236,22 +3272,22 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 8.16.0
-      eslint-config-prettier: 9.0.0(eslint@8.16.0)
+      eslint: 8.48.0
+      eslint-config-prettier: 9.0.0(eslint@8.48.0)
       prettier: 2.8.4
       prettier-linter-helpers: 1.0.0
     dev: true
 
-  /eslint-plugin-react-hooks@4.6.0(eslint@8.16.0):
+  /eslint-plugin-react-hooks@4.6.0(eslint@8.48.0):
     resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}
     engines: {node: '>=10'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
     dependencies:
-      eslint: 8.16.0
+      eslint: 8.48.0
     dev: true
 
-  /eslint-plugin-react@7.30.1(eslint@8.16.0):
+  /eslint-plugin-react@7.30.1(eslint@8.48.0):
     resolution: {integrity: sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3260,7 +3296,7 @@ packages:
       array-includes: 3.1.5
       array.prototype.flatmap: 1.3.0
       doctrine: 2.1.0
-      eslint: 8.16.0
+      eslint: 8.48.0
       estraverse: 5.3.0
       jsx-ast-utils: 3.3.0
       minimatch: 3.1.2
@@ -3282,21 +3318,21 @@ packages:
       estraverse: 4.3.0
     dev: true
 
-  /eslint-scope@7.1.1:
-    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
+  /eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils@3.0.0(eslint@8.16.0):
+  /eslint-utils@3.0.0(eslint@8.48.0):
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.16.0
+      eslint: 8.48.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -3305,62 +3341,64 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-visitor-keys@3.3.0:
-    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
+  /eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint@8.16.0:
-    resolution: {integrity: sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==}
+  /eslint@8.48.0:
+    resolution: {integrity: sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint/eslintrc': 1.3.0
-      '@humanwhocodes/config-array': 0.9.5
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0)
+      '@eslint-community/regexpp': 4.8.0
+      '@eslint/eslintrc': 2.1.2
+      '@eslint/js': 8.48.0
+      '@humanwhocodes/config-array': 0.11.11
+      '@humanwhocodes/module-importer': 1.0.1
+      '@nodelib/fs.walk': 1.2.8
       ajv: 6.12.6
       chalk: 4.1.2
       cross-spawn: 7.0.3
       debug: 4.3.4(supports-color@5.5.0)
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
-      eslint-scope: 7.1.1
-      eslint-utils: 3.0.0(eslint@8.16.0)
-      eslint-visitor-keys: 3.3.0
-      espree: 9.3.2
-      esquery: 1.4.0
+      eslint-scope: 7.2.2
+      eslint-visitor-keys: 3.4.3
+      espree: 9.6.1
+      esquery: 1.5.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
-      functional-red-black-tree: 1.0.1
+      find-up: 5.0.0
       glob-parent: 6.0.2
-      globals: 13.15.0
+      globals: 13.21.0
+      graphemer: 1.4.0
       ignore: 5.2.0
-      import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
+      is-path-inside: 3.0.3
       js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
       minimatch: 3.1.2
       natural-compare: 1.4.0
-      optionator: 0.9.1
-      regexpp: 3.2.0
+      optionator: 0.9.3
       strip-ansi: 6.0.1
-      strip-json-comments: 3.1.1
       text-table: 0.2.0
-      v8-compile-cache: 2.3.0
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /espree@9.3.2:
-    resolution: {integrity: sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==}
+  /espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.7.1
-      acorn-jsx: 5.3.2(acorn@8.7.1)
-      eslint-visitor-keys: 3.3.0
+      acorn: 8.10.0
+      acorn-jsx: 5.3.2(acorn@8.10.0)
+      eslint-visitor-keys: 3.4.3
     dev: true
 
   /esprima@4.0.1:
@@ -3368,8 +3406,8 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
-  /esquery@1.4.0:
-    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
+  /esquery@1.5.0:
+    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
@@ -3448,7 +3486,7 @@ packages:
     engines: {node: '>=8.6.0'}
     dependencies:
       '@nodelib/fs.stat': 2.0.5
-      '@nodelib/fs.walk': 1.2.7
+      '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
       micromatch: 4.0.5
@@ -3541,6 +3579,14 @@ packages:
       path-exists: 4.0.0
     dev: false
 
+  /find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+    dependencies:
+      locate-path: 6.0.0
+      path-exists: 4.0.0
+    dev: true
+
   /flat-cache@3.0.4:
     resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -3714,8 +3760,8 @@ packages:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
 
-  /globals@13.15.0:
-    resolution: {integrity: sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==}
+  /globals@13.21.0:
+    resolution: {integrity: sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
@@ -3775,6 +3821,10 @@ packages:
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
 
+  /graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+    dev: true
+
   /has-bigints@1.0.2:
     resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
     dev: true
@@ -4051,6 +4101,11 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
+  /is-path-inside@3.0.3:
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
+    dev: true
+
   /is-potential-custom-element-name@1.0.1:
     resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
     dev: true
@@ -4708,7 +4763,7 @@ packages:
         optional: true
     dependencies:
       abab: 2.0.6
-      acorn: 8.7.1
+      acorn: 8.10.0
       acorn-globals: 6.0.0
       cssom: 0.5.0
       cssstyle: 2.3.0
@@ -4878,6 +4933,13 @@ packages:
       p-locate: 4.1.0
     dev: false
 
+  /locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+    dependencies:
+      p-locate: 5.0.0
+    dev: true
+
   /lodash.get@4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
     dev: false
@@ -5212,16 +5274,16 @@ packages:
       word-wrap: 1.2.5
     dev: true
 
-  /optionator@0.9.1:
-    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
+  /optionator@0.9.3:
+    resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==}
     engines: {node: '>= 0.8.0'}
     dependencies:
+      '@aashutoshrathi/word-wrap': 1.2.6
       deep-is: 0.1.3
       fast-levenshtein: 2.0.6
       levn: 0.4.1
       prelude-ls: 1.2.1
       type-check: 0.4.0
-      word-wrap: 1.2.5
     dev: true
 
   /ora@5.4.1:
@@ -5263,7 +5325,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       yocto-queue: 0.1.0
-    dev: false
 
   /p-locate@2.0.0:
     resolution: {integrity: sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==}
@@ -5279,6 +5340,13 @@ packages:
       p-limit: 2.3.0
     dev: false
 
+  /p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+    dependencies:
+      p-limit: 3.1.0
+    dev: true
+
   /p-try@1.0.0:
     resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==}
     engines: {node: '>=4'}
@@ -5328,7 +5396,6 @@ packages:
   /path-exists@4.0.0:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
-    dev: false
 
   /path-is-absolute@1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
@@ -6521,10 +6588,6 @@ packages:
   /v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
-  /v8-compile-cache@2.3.0:
-    resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
-    dev: true
-
   /v8-to-istanbul@9.0.1:
     resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
     engines: {node: '>=10.12.0'}
@@ -6807,7 +6870,6 @@ packages:
   /yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
-    dev: false
 
   /yup@1.0.2:
     resolution: {integrity: sha512-Lpi8nITFKjWtCoK3yQP8MUk78LJmHWqbFd0OOMXTar+yjejlQ4OIIoZgnTW1bnEUKDw6dZBcy3/IdXnt2KDUow==}

From aca3d25dc8c131c408e31953e87c80fdd8db428e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 14:43:45 +0400
Subject: [PATCH 720/734] Bump ingestion-contract-client from 0.1.23 to 0.1.26
 (#4047)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 13197af5521..0420894a4d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
         <spring-boot.version>3.1.1</spring-boot.version>
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
         <odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
-        <odd-oddrn-client.version>0.1.23</odd-oddrn-client.version>
+        <odd-oddrn-client.version>0.1.26</odd-oddrn-client.version>
         <org.json.version>20230227</org.json.version>
 
         <!-- Test dependency versions -->

From 68a7268f8bc614cfe1c678822edb62b47a84204e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 14:44:34 +0400
Subject: [PATCH 721/734] Bump maven-surefire-plugin from 2.22.2 to 3.1.2
 (#4026)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0420894a4d1..0fbf9c383bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <openapi-generator-maven-plugin.version>6.6.0</openapi-generator-maven-plugin.version>
         <springdoc-openapi-webflux-ui.version>1.2.32</springdoc-openapi-webflux-ui.version>
     </properties>

From f66d234d8384e127cbc5ff5b1b08dd911d71867b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 14:44:51 +0400
Subject: [PATCH 722/734] Bump git-commit-id-plugin from 4.0.0 to 4.9.10
 (#4028)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 558a446e948..1e0f952eb16 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -394,7 +394,7 @@
                     <plugin>
                         <groupId>pl.project13.maven</groupId>
                         <artifactId>git-commit-id-plugin</artifactId>
-                        <version>4.0.0</version>
+                        <version>4.9.10</version>
                         <executions>
                             <execution>
                                 <id>get-the-git-infos</id>

From 39bb860f8e1451eb1e8b83d0f2356e42fa14c901 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Sep 2023 14:45:09 +0400
Subject: [PATCH 723/734] Bump allure.version from 2.22.2 to 2.23.0 (#4039)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-e2e-checks/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka-ui-e2e-checks/pom.xml b/kafka-ui-e2e-checks/pom.xml
index 71b3b96cbca..22c17bf9609 100644
--- a/kafka-ui-e2e-checks/pom.xml
+++ b/kafka-ui-e2e-checks/pom.xml
@@ -19,7 +19,7 @@
         <selenium.version>4.8.1</selenium.version>
         <selenide.version>6.12.3</selenide.version>
         <testng.version>7.7.1</testng.version>
-        <allure.version>2.22.2</allure.version>
+        <allure.version>2.23.0</allure.version>
         <qase.io.version>3.0.5</qase.io.version>
         <aspectj.version>1.9.9.1</aspectj.version>
         <assertj.version>3.24.2</assertj.version>

From 8a1e9ad8e8de172a74ee3019319649447b0d6e1e Mon Sep 17 00:00:00 2001
From: Victoria Miltcheva
 <12804086+victoria-miltcheva@users.noreply.github.com>
Date: Thu, 7 Sep 2023 13:26:16 -0500
Subject: [PATCH 724/734] Docs: Fix persistent installation link in README
 (#4207)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e3fa2ab9d2b..f6a16c862c3 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ docker run -it -p 8080:8080 -e DYNAMIC_CONFIG_ENABLED=true provectuslabs/kafka-u
 
 Then access the web UI at [http://localhost:8080](http://localhost:8080)
 
-The command is sufficient to try things out. When you're done trying things out, you can proceed with a [persistent installation](https://docs.kafka-ui.provectus.io/configuration/quick-start#persistent-start)
+The command is sufficient to try things out. When you're done trying things out, you can proceed with a [persistent installation](https://docs.kafka-ui.provectus.io/quick-start/persistent-start)
 
 ## Persistent installation
 

From c00cb320cde844bcefbde8fc2105d65b6e725b93 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:22:23 +0400
Subject: [PATCH 725/734] Bump @types/lossless-json from 1.0.1 to 1.0.2 in
 /kafka-ui-react-app (#4220)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index b836c25ace2..8cc9486a75a 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -162,7 +162,7 @@ devDependencies:
     version: 4.14.177
   '@types/lossless-json':
     specifier: ^1.0.1
-    version: 1.0.1
+    version: 1.0.2
   '@types/node':
     specifier: ^16.4.13
     version: 16.11.7
@@ -1776,8 +1776,8 @@ packages:
     resolution: {integrity: sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw==}
     dev: true
 
-  /@types/lossless-json@1.0.1:
-    resolution: {integrity: sha512-zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==}
+  /@types/lossless-json@1.0.2:
+    resolution: {integrity: sha512-RdV8M8qlWUpmk7gnY3fBB4TNn3Ab8hMMqhJC/sG77t8Zk+hjVwvZGTFv+upEBUkxXbq0+UxGAPhOml83w1IkIQ==}
     dev: true
 
   /@types/node@16.11.7:

From ff106a2061fa10847a2ae6f3ab38a23b433033b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:22:37 +0400
Subject: [PATCH 726/734] Bump @openapitools/openapi-generator-cli from 2.5.2
 to 2.7.0 in /kafka-ui-react-app (#4219)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 138 ++++++++++++++++--------------
 1 file changed, 75 insertions(+), 63 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 8cc9486a75a..2fd0da90c7e 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -138,7 +138,7 @@ devDependencies:
     version: 29.6.3
   '@openapitools/openapi-generator-cli':
     specifier: ^2.5.2
-    version: 2.5.2
+    version: 2.7.0
   '@swc/core':
     specifier: ^1.3.36
     version: 1.3.38
@@ -1257,14 +1257,34 @@ packages:
       '@jridgewell/resolve-uri': 3.1.1
       '@jridgewell/sourcemap-codec': 1.4.15
 
+  /@lukeed/csprng@1.1.0:
+    resolution: {integrity: sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==}
+    engines: {node: '>=8'}
+    dev: true
+
   /@microsoft/fetch-event-source@2.0.1:
     resolution: {integrity: sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==}
     dev: false
 
-  /@nestjs/common@8.4.4(reflect-metadata@0.1.13)(rxjs@7.5.5):
-    resolution: {integrity: sha512-QHi7QcgH/5Jinz+SCfIZJkFHc6Cch1YsAEGFEhi6wSp6MILb0sJMQ1CX06e9tCOAjSlBwaJj4PH0eFCVau5v9Q==}
+  /@nestjs/axios@0.1.0(@nestjs/common@9.3.11)(reflect-metadata@0.1.13)(rxjs@7.8.0):
+    resolution: {integrity: sha512-b2TT2X6BFbnNoeteiaxCIiHaFcSbVW+S5yygYqiIq5i6H77yIU3IVuLdpQkHq8/EqOWFwMopLN8jdkUT71Am9w==}
+    peerDependencies:
+      '@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0
+      reflect-metadata: ^0.1.12
+      rxjs: ^6.0.0 || ^7.0.0
+    dependencies:
+      '@nestjs/common': 9.3.11(reflect-metadata@0.1.13)(rxjs@7.8.0)
+      axios: 0.27.2
+      reflect-metadata: 0.1.13
+      rxjs: 7.8.0
+    transitivePeerDependencies:
+      - debug
+    dev: true
+
+  /@nestjs/common@9.3.11(reflect-metadata@0.1.13)(rxjs@7.8.0):
+    resolution: {integrity: sha512-IFZ2G/5UKWC2Uo7tJ4SxGed2+aiA+sJyWeWsGTogKVDhq90oxVBToh+uCDeI31HNUpqYGoWmkletfty42zUd8A==}
     peerDependencies:
-      cache-manager: '*'
+      cache-manager: <=5
       class-transformer: '*'
       class-validator: '*'
       reflect-metadata: ^0.1.12
@@ -1277,24 +1297,21 @@ packages:
       class-validator:
         optional: true
     dependencies:
-      axios: 0.26.1
       iterare: 1.2.1
       reflect-metadata: 0.1.13
-      rxjs: 7.5.5
-      tslib: 2.3.1
-      uuid: 8.3.2
-    transitivePeerDependencies:
-      - debug
+      rxjs: 7.8.0
+      tslib: 2.5.0
+      uid: 2.0.1
     dev: true
 
-  /@nestjs/core@8.4.4(@nestjs/common@8.4.4)(reflect-metadata@0.1.13)(rxjs@7.5.5):
-    resolution: {integrity: sha512-Ef3yJPuzAttpNfehnGqIV5kHIL9SHptB5F4ERxoU7pT61H3xiYpZw6hSjx68cJO7cc6rm7/N+b4zeuJvFHtvBg==}
+  /@nestjs/core@9.3.11(@nestjs/common@9.3.11)(reflect-metadata@0.1.13)(rxjs@7.8.0):
+    resolution: {integrity: sha512-CI27a2JFd5rvvbgkalWqsiwQNhcP4EAG5BUK8usjp29wVp1kx30ghfBT8FLqIgmkRVo65A0IcEnWsxeXMntkxQ==}
     requiresBuild: true
     peerDependencies:
-      '@nestjs/common': ^8.0.0
-      '@nestjs/microservices': ^8.0.0
-      '@nestjs/platform-express': ^8.0.0
-      '@nestjs/websockets': ^8.0.0
+      '@nestjs/common': ^9.0.0
+      '@nestjs/microservices': ^9.0.0
+      '@nestjs/platform-express': ^9.0.0
+      '@nestjs/websockets': ^9.0.0
       reflect-metadata: ^0.1.12
       rxjs: ^7.1.0
     peerDependenciesMeta:
@@ -1305,16 +1322,15 @@ packages:
       '@nestjs/websockets':
         optional: true
     dependencies:
-      '@nestjs/common': 8.4.4(reflect-metadata@0.1.13)(rxjs@7.5.5)
+      '@nestjs/common': 9.3.11(reflect-metadata@0.1.13)(rxjs@7.8.0)
       '@nuxtjs/opencollective': 0.3.2
       fast-safe-stringify: 2.1.1
       iterare: 1.2.1
-      object-hash: 3.0.0
       path-to-regexp: 3.2.0
       reflect-metadata: 0.1.13
-      rxjs: 7.5.5
-      tslib: 2.3.1
-      uuid: 8.3.2
+      rxjs: 7.8.0
+      tslib: 2.5.0
+      uid: 2.0.1
     transitivePeerDependencies:
       - encoding
     dev: true
@@ -1352,26 +1368,27 @@ packages:
       - encoding
     dev: true
 
-  /@openapitools/openapi-generator-cli@2.5.2:
-    resolution: {integrity: sha512-FLgkjzpDiHVsH821db0VDSElDoA6TcspGyq3RD4zLBJaJhbSsRwr4u87sNoyuHKBg4OMJbZMT4iJxAhkosKrzw==}
+  /@openapitools/openapi-generator-cli@2.7.0:
+    resolution: {integrity: sha512-ieEpHTA/KsDz7ANw03lLPYyjdedDEXYEyYoGBRWdduqXWSX65CJtttjqa8ZaB1mNmIjMtchUHwAYQmTLVQ8HYg==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     requiresBuild: true
     dependencies:
-      '@nestjs/common': 8.4.4(reflect-metadata@0.1.13)(rxjs@7.5.5)
-      '@nestjs/core': 8.4.4(@nestjs/common@8.4.4)(reflect-metadata@0.1.13)(rxjs@7.5.5)
+      '@nestjs/axios': 0.1.0(@nestjs/common@9.3.11)(reflect-metadata@0.1.13)(rxjs@7.8.0)
+      '@nestjs/common': 9.3.11(reflect-metadata@0.1.13)(rxjs@7.8.0)
+      '@nestjs/core': 9.3.11(@nestjs/common@9.3.11)(reflect-metadata@0.1.13)(rxjs@7.8.0)
       '@nuxtjs/opencollective': 0.3.2
       chalk: 4.1.2
       commander: 8.3.0
-      compare-versions: 4.1.3
+      compare-versions: 4.1.4
       concurrently: 6.5.1
       console.table: 0.10.0
-      fs-extra: 10.0.1
+      fs-extra: 10.1.0
       glob: 7.1.6
-      inquirer: 8.2.2
+      inquirer: 8.2.5
       lodash: 4.17.21
       reflect-metadata: 0.1.13
-      rxjs: 7.5.5
+      rxjs: 7.8.0
       tslib: 2.0.3
     transitivePeerDependencies:
       - '@nestjs/microservices'
@@ -1393,7 +1410,7 @@ packages:
       open: 8.4.0
       picocolors: 1.0.0
       tiny-glob: 0.2.9
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: true
 
   /@popperjs/core@2.9.2:
@@ -2161,7 +2178,7 @@ packages:
     dependencies:
       '@types/react': 18.2.21
       react: 18.2.0
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /aria-query@5.0.0:
@@ -2282,10 +2299,11 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /axios@0.26.1:
-    resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
+  /axios@0.27.2:
+    resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
-      follow-redirects: 1.14.8
+      follow-redirects: 1.15.2
+      form-data: 4.0.0
     transitivePeerDependencies:
       - debug
     dev: true
@@ -2628,8 +2646,8 @@ packages:
     engines: {node: '>= 12'}
     dev: true
 
-  /compare-versions@4.1.3:
-    resolution: {integrity: sha512-WQfnbDcrYnGr55UwbxKiQKASnTtNnaAWVi8jZyy8NTpVAXWACSne8lMD1iaIo9AiU6mnuLvSVshCzewVuWxHUg==}
+  /compare-versions@4.1.4:
+    resolution: {integrity: sha512-FemMreK9xNyL8gQevsdRMrvO4lFCkQP7qbuktn1q8ndcNk1+0mz7lgE7b/sNvbhVgY4w6tMN1FDp6aADjqw2rw==}
     dev: true
 
   /concat-map@0.0.1:
@@ -3599,8 +3617,8 @@ packages:
     resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==}
     dev: true
 
-  /follow-redirects@1.14.8:
-    resolution: {integrity: sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==}
+  /follow-redirects@1.15.2:
+    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
     engines: {node: '>=4.0'}
     peerDependencies:
       debug: '*'
@@ -3628,8 +3646,8 @@ packages:
     resolution: {integrity: sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==}
     dev: false
 
-  /fs-extra@10.0.1:
-    resolution: {integrity: sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==}
+  /fs-extra@10.1.0:
+    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
     engines: {node: '>=12'}
     dependencies:
       graceful-fs: 4.2.10
@@ -3979,8 +3997,8 @@ packages:
   /inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
-  /inquirer@8.2.2:
-    resolution: {integrity: sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==}
+  /inquirer@8.2.5:
+    resolution: {integrity: sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==}
     engines: {node: '>=12.0.0'}
     dependencies:
       ansi-escapes: 4.3.2
@@ -3993,10 +4011,11 @@ packages:
       mute-stream: 0.0.8
       ora: 5.4.1
       run-async: 2.4.1
-      rxjs: 7.5.5
+      rxjs: 7.8.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
       through: 2.3.8
+      wrap-ansi: 7.0.0
     dev: true
 
   /internal-slot@1.0.5:
@@ -5141,11 +5160,6 @@ packages:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
 
-  /object-hash@3.0.0:
-    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
-    engines: {node: '>= 6'}
-    dev: true
-
   /object-inspect@1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
     dev: true
@@ -5942,10 +5956,10 @@ packages:
       tslib: 1.13.0
     dev: true
 
-  /rxjs@7.5.5:
-    resolution: {integrity: sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==}
+  /rxjs@7.8.0:
+    resolution: {integrity: sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: true
 
   /safe-array-concat@1.0.0:
@@ -6249,7 +6263,7 @@ packages:
     engines: {node: ^14.18.0 || >=16.0.0}
     dependencies:
       '@pkgr/utils': 2.3.0
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: true
 
   /tabbable@6.1.1:
@@ -6431,12 +6445,8 @@ packages:
     resolution: {integrity: sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==}
     dev: true
 
-  /tslib@2.3.1:
-    resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==}
-    dev: true
-
-  /tslib@2.4.0:
-    resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
+  /tslib@2.5.0:
+    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
 
   /tsutils@3.21.0(typescript@4.7.4):
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
@@ -6528,6 +6538,13 @@ packages:
     engines: {node: '>=4.2.0'}
     hasBin: true
 
+  /uid@2.0.1:
+    resolution: {integrity: sha512-PF+1AnZgycpAIEmNtjxGBVmKbZAQguaa4pBUq6KNaGEcpzZ2klCNZLM34tsjp76maN00TttiiUf6zkIBpJQm2A==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@lukeed/csprng': 1.1.0
+    dev: true
+
   /unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
@@ -6580,11 +6597,6 @@ packages:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: true
 
-  /uuid@8.3.2:
-    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
-    hasBin: true
-    dev: true
-
   /v8-compile-cache-lib@3.0.1:
     resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 

From de2f06ccf891929043c11dd54a618daacfee55d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:22:49 +0400
Subject: [PATCH 727/734] Bump react-hot-toast from 2.4.0 to 2.4.1 in
 /kafka-ui-react-app (#4218)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 2fd0da90c7e..3ff245befd5 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -91,7 +91,7 @@ dependencies:
     version: 7.43.1(react@18.2.0)
   react-hot-toast:
     specifier: ^2.4.0
-    version: 2.4.0(csstype@3.1.2)(react-dom@18.1.0)(react@18.2.0)
+    version: 2.4.1(csstype@3.1.2)(react-dom@18.1.0)(react@18.2.0)
   react-is:
     specifier: ^18.2.0
     version: 18.2.0
@@ -5626,8 +5626,8 @@ packages:
       react: 18.2.0
     dev: false
 
-  /react-hot-toast@2.4.0(csstype@3.1.2)(react-dom@18.1.0)(react@18.2.0):
-    resolution: {integrity: sha512-qnnVbXropKuwUpriVVosgo8QrB+IaPJCpL8oBI6Ov84uvHZ5QQcTp2qg6ku2wNfgJl6rlQXJIQU5q+5lmPOutA==}
+  /react-hot-toast@2.4.1(csstype@3.1.2)(react-dom@18.1.0)(react@18.2.0):
+    resolution: {integrity: sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==}
     engines: {node: '>=10'}
     peerDependencies:
       react: '>=16'

From 5d5358010bfc1c4007de7c7a7672d48f874b4747 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:23:05 +0400
Subject: [PATCH 728/734] Bump @testing-library/dom from 9.0.0 to 9.3.1 in
 /kafka-ui-react-app (#4216)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 150 ++++++++++++++++++++----------
 1 file changed, 102 insertions(+), 48 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 3ff245befd5..a2fdcdcc260 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -147,13 +147,13 @@ devDependencies:
     version: 0.2.24(@swc/core@1.3.38)
   '@testing-library/dom':
     specifier: ^9.0.0
-    version: 9.0.0
+    version: 9.3.1
   '@testing-library/jest-dom':
     specifier: ^5.16.5
     version: 5.16.5
   '@testing-library/user-event':
     specifier: ^14.4.3
-    version: 14.4.3(@testing-library/dom@9.0.0)
+    version: 14.4.3(@testing-library/dom@9.3.1)
   '@types/eventsource':
     specifier: ^1.1.8
     version: 1.1.11
@@ -1617,21 +1617,21 @@ packages:
       aria-query: 5.3.0
       chalk: 4.1.2
       dom-accessibility-api: 0.5.10
-      lz-string: 1.4.4
+      lz-string: 1.5.0
       pretty-format: 27.5.1
     dev: true
 
-  /@testing-library/dom@9.0.0:
-    resolution: {integrity: sha512-+/TLgKNFsYUshOY/zXsQOk+PlFQK+eyJ9T13IDVNJEi+M+Un7xlJK+FZKkbGSnf0+7E1G6PlDhkSYQ/GFiruBQ==}
+  /@testing-library/dom@9.3.1:
+    resolution: {integrity: sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==}
     engines: {node: '>=14'}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@babel/runtime': 7.17.9
+      '@babel/runtime': 7.22.11
       '@types/aria-query': 5.0.1
-      aria-query: 5.0.0
+      aria-query: 5.1.3
       chalk: 4.1.2
       dom-accessibility-api: 0.5.10
-      lz-string: 1.4.4
+      lz-string: 1.5.0
       pretty-format: 27.5.1
 
   /@testing-library/jest-dom@5.16.5:
@@ -1657,19 +1657,19 @@ packages:
       react-dom: ^18.0.0
     dependencies:
       '@babel/runtime': 7.17.9
-      '@testing-library/dom': 9.0.0
+      '@testing-library/dom': 9.3.1
       '@types/react-dom': 18.0.5
       react: 18.2.0
       react-dom: 18.1.0(react@18.2.0)
     dev: false
 
-  /@testing-library/user-event@14.4.3(@testing-library/dom@9.0.0):
+  /@testing-library/user-event@14.4.3(@testing-library/dom@9.3.1):
     resolution: {integrity: sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
     dependencies:
-      '@testing-library/dom': 9.0.0
+      '@testing-library/dom': 9.3.1
     dev: true
 
   /@tootallnate/once@2.0.0:
@@ -2184,6 +2184,12 @@ packages:
   /aria-query@5.0.0:
     resolution: {integrity: sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==}
     engines: {node: '>=6.0'}
+    dev: true
+
+  /aria-query@5.1.3:
+    resolution: {integrity: sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==}
+    dependencies:
+      deep-equal: 2.2.2
 
   /aria-query@5.3.0:
     resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
@@ -2196,7 +2202,6 @@ packages:
     dependencies:
       call-bind: 1.0.2
       is-array-buffer: 3.0.2
-    dev: true
 
   /array-includes@3.1.5:
     resolution: {integrity: sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==}
@@ -2292,7 +2297,6 @@ packages:
   /available-typed-arrays@1.0.5:
     resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
     engines: {node: '>= 0.4'}
-    dev: true
 
   /axe-core@4.7.2:
     resolution: {integrity: sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==}
@@ -2475,7 +2479,6 @@ packages:
     dependencies:
       function-bind: 1.1.1
       get-intrinsic: 1.2.1
-    dev: true
 
   /call-me-maybe@1.0.1:
     resolution: {integrity: sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==}
@@ -2822,6 +2825,28 @@ packages:
         optional: true
     dev: false
 
+  /deep-equal@2.2.2:
+    resolution: {integrity: sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==}
+    dependencies:
+      array-buffer-byte-length: 1.0.0
+      call-bind: 1.0.2
+      es-get-iterator: 1.1.3
+      get-intrinsic: 1.2.1
+      is-arguments: 1.1.1
+      is-array-buffer: 3.0.2
+      is-date-object: 1.0.5
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.2
+      isarray: 2.0.5
+      object-is: 1.1.5
+      object-keys: 1.1.1
+      object.assign: 4.1.4
+      regexp.prototype.flags: 1.5.0
+      side-channel: 1.0.4
+      which-boxed-primitive: 1.0.2
+      which-collection: 1.0.1
+      which-typed-array: 1.1.11
+
   /deep-is@0.1.3:
     resolution: {integrity: sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw==}
     dev: true
@@ -2849,7 +2874,6 @@ packages:
     dependencies:
       has-property-descriptors: 1.0.0
       object-keys: 1.1.1
-    dev: true
 
   /delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
@@ -3012,6 +3036,19 @@ packages:
       which-typed-array: 1.1.11
     dev: true
 
+  /es-get-iterator@1.1.3:
+    resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.1
+      has-symbols: 1.0.3
+      is-arguments: 1.1.1
+      is-map: 2.0.2
+      is-set: 2.0.2
+      is-string: 1.0.7
+      isarray: 2.0.5
+      stop-iteration-iterator: 1.0.0
+
   /es-set-tostringtag@2.0.1:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
     engines: {node: '>= 0.4'}
@@ -3032,7 +3069,7 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       is-callable: 1.2.7
-      is-date-object: 1.0.4
+      is-date-object: 1.0.5
       is-symbol: 1.0.4
     dev: true
 
@@ -3631,7 +3668,6 @@ packages:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
     dependencies:
       is-callable: 1.2.7
-    dev: true
 
   /form-data@4.0.0:
     resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
@@ -3684,7 +3720,6 @@ packages:
 
   /functions-have-names@1.2.3:
     resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
-    dev: true
 
   /gensync@1.0.0-beta.2:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
@@ -3702,7 +3737,6 @@ packages:
       has: 1.0.3
       has-proto: 1.0.1
       has-symbols: 1.0.3
-    dev: true
 
   /get-package-type@0.1.0:
     resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
@@ -3834,7 +3868,6 @@ packages:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
       get-intrinsic: 1.2.1
-    dev: true
 
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
@@ -3859,24 +3892,20 @@ packages:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
       get-intrinsic: 1.2.1
-    dev: true
 
   /has-proto@1.0.1:
     resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
     engines: {node: '>= 0.4'}
-    dev: true
 
   /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
-    dev: true
 
   /has-tostringtag@1.0.0:
     resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
-    dev: true
 
   /has@1.0.3:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
@@ -4025,7 +4054,13 @@ packages:
       get-intrinsic: 1.2.1
       has: 1.0.3
       side-channel: 1.0.4
-    dev: true
+
+  /is-arguments@1.1.1:
+    resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      has-tostringtag: 1.0.0
 
   /is-array-buffer@3.0.2:
     resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
@@ -4033,14 +4068,12 @@ packages:
       call-bind: 1.0.2
       get-intrinsic: 1.2.1
       is-typed-array: 1.1.12
-    dev: true
 
   /is-arrayish@0.2.1:
     resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
 
   /is-bigint@1.0.2:
     resolution: {integrity: sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==}
-    dev: true
 
   /is-binary-path@2.1.0:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
@@ -4053,12 +4086,10 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       call-bind: 1.0.2
-    dev: true
 
   /is-callable@1.2.7:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
-    dev: true
 
   /is-core-module@2.13.0:
     resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==}
@@ -4071,10 +4102,11 @@ packages:
       has: 1.0.3
     dev: true
 
-  /is-date-object@1.0.4:
-    resolution: {integrity: sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==}
+  /is-date-object@1.0.5:
+    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
     engines: {node: '>= 0.4'}
-    dev: true
+    dependencies:
+      has-tostringtag: 1.0.0
 
   /is-docker@2.2.1:
     resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
@@ -4106,6 +4138,9 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /is-map@2.0.2:
+    resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}
+
   /is-negative-zero@2.0.2:
     resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
     engines: {node: '>= 0.4'}
@@ -4114,7 +4149,6 @@ packages:
   /is-number-object@1.0.5:
     resolution: {integrity: sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==}
     engines: {node: '>= 0.4'}
-    dev: true
 
   /is-number@7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
@@ -4135,13 +4169,14 @@ packages:
     dependencies:
       call-bind: 1.0.2
       has-tostringtag: 1.0.0
-    dev: true
+
+  /is-set@2.0.2:
+    resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}
 
   /is-shared-array-buffer@1.0.2:
     resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
       call-bind: 1.0.2
-    dev: true
 
   /is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
@@ -4153,7 +4188,6 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       has-tostringtag: 1.0.0
-    dev: true
 
   /is-subset@0.1.1:
     resolution: {integrity: sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==}
@@ -4164,26 +4198,33 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
-    dev: true
 
   /is-typed-array@1.1.12:
     resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}
     engines: {node: '>= 0.4'}
     dependencies:
       which-typed-array: 1.1.11
-    dev: true
 
   /is-unicode-supported@0.1.0:
     resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
     engines: {node: '>=10'}
     dev: true
 
+  /is-weakmap@2.0.1:
+    resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==}
+
   /is-weakref@1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
     dependencies:
       call-bind: 1.0.2
     dev: true
 
+  /is-weakset@2.0.2:
+    resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
+    dependencies:
+      call-bind: 1.0.2
+      get-intrinsic: 1.2.1
+
   /is-wsl@2.2.0:
     resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
     engines: {node: '>=8'}
@@ -4193,7 +4234,6 @@ packages:
 
   /isarray@2.0.5:
     resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
-    dev: true
 
   /isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
@@ -5007,8 +5047,8 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /lz-string@1.4.4:
-    resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
+  /lz-string@1.5.0:
+    resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
     hasBin: true
 
   /make-dir@3.1.0:
@@ -5162,12 +5202,17 @@ packages:
 
   /object-inspect@1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
-    dev: true
+
+  /object-is@1.1.5:
+    resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.2.0
 
   /object-keys@1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
     engines: {node: '>= 0.4'}
-    dev: true
 
   /object.assign@4.1.2:
     resolution: {integrity: sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==}
@@ -5187,7 +5232,6 @@ packages:
       define-properties: 1.2.0
       has-symbols: 1.0.3
       object-keys: 1.1.1
-    dev: true
 
   /object.entries@1.1.5:
     resolution: {integrity: sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==}
@@ -5820,7 +5864,6 @@ packages:
       call-bind: 1.0.2
       define-properties: 1.2.0
       functions-have-names: 1.2.3
-    dev: true
 
   /regexpp@3.2.0:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
@@ -6051,7 +6094,6 @@ packages:
       call-bind: 1.0.2
       get-intrinsic: 1.2.1
       object-inspect: 1.12.3
-    dev: true
 
   /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
@@ -6103,6 +6145,12 @@ packages:
     dependencies:
       escape-string-regexp: 2.0.0
 
+  /stop-iteration-iterator@1.0.0:
+    resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      internal-slot: 1.0.5
+
   /string-length@4.0.2:
     resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==}
     engines: {node: '>=10'}
@@ -6757,7 +6805,14 @@ packages:
       is-number-object: 1.0.5
       is-string: 1.0.7
       is-symbol: 1.0.4
-    dev: true
+
+  /which-collection@1.0.1:
+    resolution: {integrity: sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==}
+    dependencies:
+      is-map: 2.0.2
+      is-set: 2.0.2
+      is-weakmap: 2.0.1
+      is-weakset: 2.0.2
 
   /which-typed-array@1.1.11:
     resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==}
@@ -6768,7 +6823,6 @@ packages:
       for-each: 0.3.3
       gopd: 1.0.1
       has-tostringtag: 1.0.0
-    dev: true
 
   /which@2.0.2:
     resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}

From cc12814a9591761251af1847c2f2f0a6bf364b00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 18:23:14 +0400
Subject: [PATCH 729/734] Bump @typescript-eslint/parser from 5.29.0 to 5.62.0
 in /kafka-ui-react-app (#4214)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 88 +++++++++++++++++++++++--------
 1 file changed, 65 insertions(+), 23 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index a2fdcdcc260..3cba129ee97 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -183,10 +183,10 @@ devDependencies:
     version: 5.1.18
   '@typescript-eslint/eslint-plugin':
     specifier: ^5.29.0
-    version: 5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.48.0)(typescript@4.7.4)
+    version: 5.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@4.7.4)
   '@typescript-eslint/parser':
     specifier: ^5.29.0
-    version: 5.29.0(eslint@8.48.0)(typescript@4.7.4)
+    version: 5.62.0(eslint@8.48.0)(typescript@4.7.4)
   '@vitejs/plugin-react-swc':
     specifier: ^3.0.0
     version: 3.0.0(vite@4.0.5)
@@ -201,7 +201,7 @@ devDependencies:
     version: 19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.48.0)
   eslint-config-airbnb-typescript:
     specifier: ^17.0.0
-    version: 17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.48.0)
+    version: 17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.26.0)(eslint@8.48.0)
   eslint-config-prettier:
     specifier: ^9.0.0
     version: 9.0.0(eslint@8.48.0)
@@ -213,7 +213,7 @@ devDependencies:
     version: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.48.0)
   eslint-plugin-import:
     specifier: ^2.26.0
-    version: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
+    version: 2.26.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
   eslint-plugin-jest-dom:
     specifier: ^4.0.3
     version: 4.0.3(eslint@8.48.0)
@@ -1886,7 +1886,7 @@ packages:
     dependencies:
       '@types/yargs-parser': 20.2.0
 
-  /@typescript-eslint/eslint-plugin@5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.48.0)(typescript@4.7.4):
+  /@typescript-eslint/eslint-plugin@5.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@4.7.4):
     resolution: {integrity: sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -1897,7 +1897,7 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
+      '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@4.7.4)
       '@typescript-eslint/scope-manager': 5.29.0
       '@typescript-eslint/type-utils': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
       '@typescript-eslint/utils': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
@@ -1913,8 +1913,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@5.29.0(eslint@8.48.0)(typescript@4.7.4):
-    resolution: {integrity: sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==}
+  /@typescript-eslint/parser@5.62.0(eslint@8.48.0)(typescript@4.7.4):
+    resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -1923,9 +1923,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.29.0
-      '@typescript-eslint/types': 5.29.0
-      '@typescript-eslint/typescript-estree': 5.29.0(typescript@4.7.4)
+      '@typescript-eslint/scope-manager': 5.62.0
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.7.4)
       debug: 4.3.4(supports-color@5.5.0)
       eslint: 8.48.0
       typescript: 4.7.4
@@ -1941,6 +1941,14 @@ packages:
       '@typescript-eslint/visitor-keys': 5.29.0
     dev: true
 
+  /@typescript-eslint/scope-manager@5.62.0:
+    resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+    dev: true
+
   /@typescript-eslint/type-utils@5.29.0(eslint@8.48.0)(typescript@4.7.4):
     resolution: {integrity: sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1965,6 +1973,11 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
+  /@typescript-eslint/types@5.62.0:
+    resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dev: true
+
   /@typescript-eslint/typescript-estree@5.29.0(typescript@4.7.4):
     resolution: {integrity: sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1986,6 +1999,27 @@ packages:
       - supports-color
     dev: true
 
+  /@typescript-eslint/typescript-estree@5.62.0(typescript@4.7.4):
+    resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      '@typescript-eslint/visitor-keys': 5.62.0
+      debug: 4.3.4(supports-color@5.5.0)
+      globby: 11.1.0
+      is-glob: 4.0.3
+      semver: 7.5.4
+      tsutils: 3.21.0(typescript@4.7.4)
+      typescript: 4.7.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@typescript-eslint/utils@5.29.0(eslint@8.48.0)(typescript@4.7.4):
     resolution: {integrity: sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -2012,6 +2046,14 @@ packages:
       eslint-visitor-keys: 3.4.3
     dev: true
 
+  /@typescript-eslint/visitor-keys@5.62.0:
+    resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      '@typescript-eslint/types': 5.62.0
+      eslint-visitor-keys: 3.4.3
+    dev: true
+
   /@vitejs/plugin-react-swc@3.0.0(vite@4.0.5):
     resolution: {integrity: sha512-vYlodz/mjYRbxMGbHzDgR8aPR+z8n7K/enWkyBGH096xrL2DIPCuTvQVRYPTXGyy6wO7OFiMxZ3r4nKQD1sH0A==}
     peerDependencies:
@@ -3141,13 +3183,13 @@ packages:
     dependencies:
       confusing-browser-globals: 1.0.11
       eslint: 8.48.0
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
       object.assign: 4.1.4
       object.entries: 1.1.7
       semver: 6.3.1
     dev: true
 
-  /eslint-config-airbnb-typescript@17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.29.0)(eslint-plugin-import@2.26.0)(eslint@8.48.0):
+  /eslint-config-airbnb-typescript@17.0.0(@typescript-eslint/eslint-plugin@5.29.0)(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.26.0)(eslint@8.48.0):
     resolution: {integrity: sha512-elNiuzD0kPAPTXjFWg+lE24nMdHMtuxgYoD30OyMD6yrW1AhFZPAg27VX7d3tzOErw+dgJTNWfRSDqEcXb4V0g==}
     peerDependencies:
       '@typescript-eslint/eslint-plugin': ^5.13.0
@@ -3155,11 +3197,11 @@ packages:
       eslint: ^7.32.0 || ^8.2.0
       eslint-plugin-import: ^2.25.3
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.29.0(@typescript-eslint/parser@5.29.0)(eslint@8.48.0)(typescript@4.7.4)
-      '@typescript-eslint/parser': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
+      '@typescript-eslint/eslint-plugin': 5.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@4.7.4)
+      '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@4.7.4)
       eslint: 8.48.0
       eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.48.0)
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
     dev: true
 
   /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.26.0)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.30.1)(eslint@8.48.0):
@@ -3174,7 +3216,7 @@ packages:
     dependencies:
       eslint: 8.48.0
       eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.26.0)(eslint@8.48.0)
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
       eslint-plugin-jsx-a11y: 6.7.1(eslint@8.48.0)
       eslint-plugin-react: 7.30.1(eslint@8.48.0)
       eslint-plugin-react-hooks: 4.6.0(eslint@8.48.0)
@@ -3211,7 +3253,7 @@ packages:
       debug: 4.3.4(supports-color@5.5.0)
       enhanced-resolve: 5.10.0
       eslint: 8.48.0
-      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
+      eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0)
       get-tsconfig: 4.2.0
       globby: 13.1.2
       is-core-module: 2.9.0
@@ -3221,7 +3263,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-module-utils@2.7.3(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.2.7):
+  /eslint-module-utils@2.7.3(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.2.7):
     resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3239,7 +3281,7 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
+      '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@4.7.4)
       debug: 3.2.7
       eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.2.7(eslint-plugin-import@2.26.0)(eslint@8.48.0)
@@ -3248,7 +3290,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-import@2.26.0(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0):
+  /eslint-plugin-import@2.26.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.2.7)(eslint@8.48.0):
     resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==}
     engines: {node: '>=4'}
     peerDependencies:
@@ -3258,14 +3300,14 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.29.0(eslint@8.48.0)(typescript@4.7.4)
+      '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@4.7.4)
       array-includes: 3.1.5
       array.prototype.flat: 1.3.0
       debug: 2.6.9
       doctrine: 2.1.0
       eslint: 8.48.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.7.3(@typescript-eslint/parser@5.29.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.2.7)
+      eslint-module-utils: 2.7.3(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.2.7)
       has: 1.0.3
       is-core-module: 2.9.0
       is-glob: 4.0.3

From 68f08a0c9babfe16c442131cf7e567694b941f53 Mon Sep 17 00:00:00 2001
From: Edward Muller <me@freeformz.me>
Date: Wed, 13 Sep 2023 03:08:13 -0700
Subject: [PATCH 730/734] Bump Spring Boot (#4227)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0fbf9c383bb..aa02a56f0e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         <protobuf-java.version>3.23.3</protobuf-java.version>
         <scala-lang.library.version>2.13.9</scala-lang.library.version>
         <snakeyaml.version>2.0</snakeyaml.version>
-        <spring-boot.version>3.1.1</spring-boot.version>
+        <spring-boot.version>3.1.3</spring-boot.version>
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
         <odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
         <odd-oddrn-client.version>0.1.26</odd-oddrn-client.version>

From fc97dfa87484a5487b74523a079fee2affd029a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 14:17:26 +0400
Subject: [PATCH 731/734] Bump react-router-dom from 6.3.0 to 6.15.0 in
 /kafka-ui-react-app (#4217)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index 3cba129ee97..bac65e9bebd 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -103,7 +103,7 @@ dependencies:
     version: 8.0.2(@types/react-dom@18.0.5)(@types/react@18.2.21)(react-dom@18.1.0)(react@18.2.0)(redux@4.2.0)
   react-router-dom:
     specifier: ^6.3.0
-    version: 6.3.0(react-dom@18.1.0)(react@18.2.0)
+    version: 6.15.0(react-dom@18.1.0)(react@18.2.0)
   redux:
     specifier: ^4.2.0
     version: 4.2.0
@@ -1435,6 +1435,11 @@ packages:
       reselect: 4.1.5
     dev: false
 
+  /@remix-run/router@1.8.0:
+    resolution: {integrity: sha512-mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg==}
+    engines: {node: '>=14.0.0'}
+    dev: false
+
   /@sinclair/typebox@0.27.8:
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
 
@@ -3955,12 +3960,6 @@ packages:
     dependencies:
       function-bind: 1.1.1
 
-  /history@5.3.0:
-    resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==}
-    dependencies:
-      '@babel/runtime': 7.22.11
-    dev: false
-
   /hoist-non-react-statics@3.3.2:
     resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
     dependencies:
@@ -5815,24 +5814,26 @@ packages:
       use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
 
-  /react-router-dom@6.3.0(react-dom@18.1.0)(react@18.2.0):
-    resolution: {integrity: sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==}
+  /react-router-dom@6.15.0(react-dom@18.1.0)(react@18.2.0):
+    resolution: {integrity: sha512-aR42t0fs7brintwBGAv2+mGlCtgtFQeOzK0BM1/OiqEzRejOZtpMZepvgkscpMUnKb8YO84G7s3LsHnnDNonbQ==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
     dependencies:
-      history: 5.3.0
+      '@remix-run/router': 1.8.0
       react: 18.2.0
       react-dom: 18.1.0(react@18.2.0)
-      react-router: 6.3.0(react@18.2.0)
+      react-router: 6.15.0(react@18.2.0)
     dev: false
 
-  /react-router@6.3.0(react@18.2.0):
-    resolution: {integrity: sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==}
+  /react-router@6.15.0(react@18.2.0):
+    resolution: {integrity: sha512-NIytlzvzLwJkCQj2HLefmeakxxWHWAP+02EGqWEZy+DgfHHKQMUoBBjUQLOtFInBMhWtb3hiUy6MfFgwLjXhqg==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
     dependencies:
-      history: 5.3.0
+      '@remix-run/router': 1.8.0
       react: 18.2.0
     dev: false
 

From 53a6553765a806eda9905c43bfcfe09da6812035 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 14:17:40 +0400
Subject: [PATCH 732/734] Bump vite-tsconfig-paths from 4.2.0 to 4.2.1 in
 /kafka-ui-react-app (#4215)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 kafka-ui-react-app/pnpm-lock.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kafka-ui-react-app/pnpm-lock.yaml b/kafka-ui-react-app/pnpm-lock.yaml
index bac65e9bebd..01862dd3bbe 100644
--- a/kafka-ui-react-app/pnpm-lock.yaml
+++ b/kafka-ui-react-app/pnpm-lock.yaml
@@ -121,7 +121,7 @@ dependencies:
     version: 4.0.5(@types/node@16.11.7)(sass@1.66.1)
   vite-tsconfig-paths:
     specifier: ^4.0.2
-    version: 4.2.0(typescript@4.7.4)(vite@4.0.5)
+    version: 4.2.1(typescript@4.7.4)(vite@4.0.5)
   whatwg-fetch:
     specifier: ^3.6.2
     version: 3.6.2
@@ -6706,8 +6706,8 @@ packages:
       ejs: 3.1.8
     dev: true
 
-  /vite-tsconfig-paths@4.2.0(typescript@4.7.4)(vite@4.0.5):
-    resolution: {integrity: sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw==}
+  /vite-tsconfig-paths@4.2.1(typescript@4.7.4)(vite@4.0.5):
+    resolution: {integrity: sha512-GNUI6ZgPqT3oervkvzU+qtys83+75N/OuDaQl7HmOqFTb0pjZsuARrRipsyJhJ3enqV8beI1xhGbToR4o78nSQ==}
     peerDependencies:
       vite: '*'
     peerDependenciesMeta:

From 3dc4446321716016e4c2517be4e04a692cdee7a7 Mon Sep 17 00:00:00 2001
From: Vladysl <45620393+Vladysl@users.noreply.github.com>
Date: Mon, 8 Apr 2024 21:30:38 +0300
Subject: [PATCH 733/734] added env variable filtering.groovy.enabled which
 allows to enable/disable groovy script executions (#4426)

---
 .../kafka/ui/controller/MessagesController.java     |  7 +++++++
 .../kafka/ui/util/DynamicConfigOperations.java      | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
index 32d341e6134..50b36e14703 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/MessagesController.java
@@ -24,6 +24,7 @@
 import com.provectus.kafka.ui.model.rbac.permission.TopicAction;
 import com.provectus.kafka.ui.service.DeserializationService;
 import com.provectus.kafka.ui.service.MessagesService;
+import com.provectus.kafka.ui.util.DynamicConfigOperations;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -31,6 +32,7 @@
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.kafka.common.TopicPartition;
 import org.springframework.http.ResponseEntity;
@@ -47,6 +49,7 @@ public class MessagesController extends AbstractController implements MessagesAp
 
   private final MessagesService messagesService;
   private final DeserializationService deserializationService;
+  private final DynamicConfigOperations dynamicConfigOperations;
 
   @Override
   public Mono<ResponseEntity<Void>> deleteTopicMessages(
@@ -94,6 +97,10 @@ public Mono<ResponseEntity<Flux<TopicMessageEventDTO>>> getTopicMessages(String
         .topicActions(MESSAGES_READ)
         .operationName("getTopicMessages");
 
+    if (StringUtils.isNoneEmpty(q) && MessageFilterTypeDTO.GROOVY_SCRIPT == filterQueryType) {
+      dynamicConfigOperations.checkIfFilteringGroovyEnabled();
+    }
+
     if (auditService.isAuditTopic(getCluster(clusterName), topicName)) {
       contextBuilder.auditActions(AuditAction.VIEW);
     }
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
index 9b1e5017ba8..2a5532ca76a 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/DynamicConfigOperations.java
@@ -45,6 +45,7 @@
 public class DynamicConfigOperations {
 
   static final String DYNAMIC_CONFIG_ENABLED_ENV_PROPERTY = "dynamic.config.enabled";
+  static final String FILTERING_GROOVY_ENABLED_PROPERTY = "filtering.groovy.enabled";
   static final String DYNAMIC_CONFIG_PATH_ENV_PROPERTY = "dynamic.config.path";
   static final String DYNAMIC_CONFIG_PATH_ENV_PROPERTY_DEFAULT = "/etc/kafkaui/dynamic_config.yaml";
 
@@ -64,6 +65,10 @@ public boolean dynamicConfigEnabled() {
     return "true".equalsIgnoreCase(ctx.getEnvironment().getProperty(DYNAMIC_CONFIG_ENABLED_ENV_PROPERTY));
   }
 
+  public boolean filteringGroovyEnabled() {
+    return "true".equalsIgnoreCase(ctx.getEnvironment().getProperty(FILTERING_GROOVY_ENABLED_PROPERTY));
+  }
+
   private Path dynamicConfigFilePath() {
     return Paths.get(
         Optional.ofNullable(ctx.getEnvironment().getProperty(DYNAMIC_CONFIG_PATH_ENV_PROPERTY))
@@ -147,6 +152,14 @@ public Mono<Path> uploadConfigRelatedFile(FilePart file) {
         .onErrorMap(th -> new FileUploadException(targetFilePath, th));
   }
 
+  public void checkIfFilteringGroovyEnabled() {
+    if (!filteringGroovyEnabled()) {
+      throw new ValidationException(
+              "Groovy filters is not allowed. "
+                      + "Set filtering.groovy.enabled property to 'true' to enabled it.");
+    }
+  }
+
   private void checkIfDynamicConfigEnabled() {
     if (!dynamicConfigEnabled()) {
       throw new ValidationException(

From 83b5a60cc08501b570a0c4d0b4cdfceb1b88d6b7 Mon Sep 17 00:00:00 2001
From: Vladysl <45620393+Vladysl@users.noreply.github.com>
Date: Mon, 8 Apr 2024 21:46:54 +0300
Subject: [PATCH 734/734] added commons-collections4 library instead of
 commons-collections (#4427)

Co-authored-by: Narekmat <47845266+Narekmat@users.noreply.github.com>
---
 kafka-ui-api/pom.xml                                | 13 +++++++++++--
 .../provectus/kafka/ui/model/rbac/Permission.java   |  2 +-
 .../ui/service/integration/odd/ConnectorInfo.java   |  2 +-
 .../kafka/ui/service/rbac/AccessControlService.java |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index 1e0f952eb16..d572a4ffa34 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -81,6 +81,12 @@
             <groupId>io.confluent</groupId>
             <artifactId>kafka-json-schema-serializer</artifactId>
             <version>${confluent.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.confluent</groupId>
@@ -135,6 +141,11 @@
             <artifactId>commons-pool2</artifactId>
             <version>${apache.commons.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
@@ -238,8 +249,6 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-ldap</artifactId>
         </dependency>
-
-
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-jsr223</artifactId>
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
index 56b0a098026..69c16af5720 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/rbac/Permission.java
@@ -23,7 +23,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.util.Assert;
 
 @Getter
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorInfo.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorInfo.java
index a7844579bfd..daec183a4cc 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorInfo.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/integration/odd/ConnectorInfo.java
@@ -8,7 +8,7 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.opendatadiscovery.oddrn.JdbcUrlParser;
 import org.opendatadiscovery.oddrn.model.HivePath;
 import org.opendatadiscovery.oddrn.model.MysqlPath;
diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
index 4ff311ff910..62a2962bed9 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/rbac/AccessControlService.java
@@ -33,7 +33,7 @@
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.core.env.Environment;